Merge pull request #48 from IgniteUI/source-file-extraction

fix(file-operations): source file extraction
IgniteUI · Feb 24, 2020 · 486398f · 486398f
2 parents fcdb5b1 + 02a8ba8
commit 486398f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 31 deletions.
diff --git a/components/convert-component.ts b/components/convert-component.ts
@@ -82,19 +82,14 @@ export class ConvertComponent extends ConverterComponent {
 
 
     private onResolveBegin(context) {
-        const files = context.project.files;
-        /**
-         * Creates the directory structure of the json's generetion.
-         */
-        this.fileOperations.prepareOutputDirectory(this.mainDirToExport, files);
         /**
          * Create main file which would contains all global functions.
          */
         this.fileOperations.createFile(this.mainDirToExport, null, Constants.GLOBAL_FUNCS_FILE_NAME, 'json');
         this.fileOperations.appendFileData(this.mainDirToExport, null, Constants.GLOBAL_FUNCS_FILE_NAME, 'json', {});
     }
 
-    private onResolveEnd(...rest) {
+    private onResolveEnd() {
         /**
          * Write the last built json file.
          * 
@@ -104,7 +99,9 @@ export class ConvertComponent extends ConverterComponent {
          */
         if (this.factoryInstance && !this.factoryInstance.isEmpty()) {
             const filePath = this.reflection.sources[0].fileName;
-            this.fileOperations.appendFileData(this.mainDirToExport, filePath, this.jsonObjectName, 'json', this.factoryInstance.getJsonContent());
+            const processedDir = this.fileOperations.getFileDir(filePath);
+            this.fileOperations.createFile(this.mainDirToExport, processedDir, this.jsonObjectName, 'json');
+            this.fileOperations.appendFileData(this.mainDirToExport, processedDir, this.jsonObjectName, 'json', this.factoryInstance.getJsonContent());
         }
 
         /**
@@ -132,8 +129,10 @@ export class ConvertComponent extends ConverterComponent {
                  */
                 if (this.jsonObjectName !== reflection.name && this.jsonObjectName !== undefined) {
                     if (!this.factoryInstance.isEmpty()) {
-                        const filePath = this.reflection.sources[0].fileName
-                        this.fileOperations.appendFileData(this.mainDirToExport, filePath, this.jsonObjectName, 'json', this.factoryInstance.getJsonContent());
+                        const filePath = this.reflection.sources[0].fileName;
+                        const processedDir = this.fileOperations.getFileDir(filePath);
+                        this.fileOperations.createFile(this.mainDirToExport, processedDir, this.jsonObjectName, 'json');
+                        this.fileOperations.appendFileData(this.mainDirToExport, processedDir, this.jsonObjectName, 'json', this.factoryInstance.getJsonContent());
                     }
                 }
 

diff --git a/components/render-component.ts b/components/render-component.ts
@@ -28,6 +28,10 @@ export class RenderComponenet extends RendererComponent {
      */
     parser: Parser;
 
+    public constructor(owner) {
+      super(owner)
+    }
+
     public initialize() {
         this.listenTo(this.owner, {
             [RendererEvent.BEGIN]: this.onRenderBegin,
@@ -65,7 +69,7 @@ export class RenderComponenet extends RendererComponent {
             case ReflectionKind.Interface:
                     const filePath = reflection.sources[0].fileName;
                     let processedDir = this.mainDirOfJsons;
-                    const parsedPath = this.fileOperations.getProcessedDir(filePath);
+                    const parsedPath = this.fileOperations.getFileDir(filePath);
                     if (parsedPath) {
                         processedDir = path.join(processedDir, parsedPath);
                     }

diff --git a/index.ts b/index.ts
@@ -11,16 +11,19 @@ import { ThemeComponent } from './components/theme-component';
 import { pluginOptions } from './utils/options';
 
 module.exports = (PluginHost: Application) => {
-    const app = PluginHost.owner; 
-
+    const app = PluginHost.owner;
     /**
      * Add Options register Component.
      */
-    pluginOptions(app.options)
+    pluginOptions(app.options);
 
     let startConverter = false; 
     let startRenderer = false;
 
+    app.inputFiles.forEach(f => {
+      f = f.toLocaleLowerCase().includes(app.project) ? f.substring(app.project.length + 1, f.length) : f;
+    });
+
     const processArgs = process.argv;
     /**
      * Determines it it is necessary to run Conversion or Render process based on the 

diff --git a/utils/file-operations.ts b/utils/file-operations.ts
@@ -3,7 +3,6 @@ import * as path from 'path';
 import { Logger } from 'typedoc/dist/lib/utils/loggers';
 
 export class FileOperations {
-
     public logger;
 
     constructor(logger: Logger) {
@@ -87,22 +86,9 @@ export class FileOperations {
         });
     }
 
-    public getProcessedDir(filePath) {
-        if (!filePath) {
-            return;
-        }
-
+    public getFileDir(filePath: string) {
         const parsedPath = path.parse(filePath);
-        const splitPath = parsedPath.dir.split('/');
-        const fileStructureDir = splitPath[0];
-        const componentDir = splitPath[1];
-        if (fileStructureDir === "" && componentDir === undefined || parsedPath.root) {
-            return null;
-        } else if (fileStructureDir && componentDir === undefined) {
-            return fileStructureDir;
-        }
-
-        return path.join(fileStructureDir, componentDir);
+        return parsedPath.dir;
     }
 
     public appendFileData(mainDir, filePath, fileName, extension, data) {
@@ -131,8 +117,8 @@ export class FileOperations {
         return fs.readJsonSync(jsonFilePath);
     }
 
-    private constructFilePath(mainDir, filePath) {
-        const processedPath = this.getProcessedDir(filePath);
+    private constructFilePath(mainDir, filePath: string) {
+        const processedPath = filePath ? path.normalize(filePath).toString() : filePath;
         let filePathBuilder = mainDir;
         if (processedPath) {
             filePathBuilder = path.join(filePathBuilder, processedPath);