devextreme-internal-tools 14.0.0 → 16.0.0-beta.2

package/package.json

@@ -2,7 +2,7 @@
   "name": "devextreme-internal-tools",
   "description": "DevExtreme internal tools",
   "author": "Developer Express Inc.",
-  "version": "14.0.0",
+  "version": "16.0.0-beta.2",
   "license": "MIT",
   "main": "./index.js",
   "bin": {

package/ts/angular-components-generator/dot-generator.d.ts

@@ -3,6 +3,8 @@ export declare class DotGenerator {
     private _encoding;
     createTemplate(templateFilePath: string): any;
     generate(config: any): void;
-    private generateTemplate;
+    private applyTemplate;
+    private generateComponent;
+    private generateLegacyComponents;
     private createEntryPoint;
 }

package/ts/angular-components-generator/dot-generator.js

@@ -33,12 +33,52 @@ var DotGenerator = (function () {
         return createTemplateFromString(templateString);
     };
     DotGenerator.prototype.generate = function (config) {
-        this.generateTemplate(config.templateFilePath || path.join(__dirname, './templates/component.tst'), config.metadataFolderPath, config.outputFolderPath, true);
-        this.generateTemplate(config.nestedTemplateFilePath || path.join(__dirname, './templates/nested-component.tst'), path.join(config.metadataFolderPath, config.nestedPathPart), path.join(config.outputFolderPath, config.nestedPathPart));
-        this.generateTemplate(config.baseNestedTemplateFilePath || path.join(__dirname, './templates/base-nested-component.tst'), path.join(config.metadataFolderPath, config.nestedPathPart, config.basePathPart), path.join(config.outputFolderPath, config.nestedPathPart, config.basePathPart));
-        this.createEntryPoint(config.outputFolderPath, 'nested');
+        var _this = this;
+        var outputFolderPath = config.outputFolderPath, metadataFolderPath = config.metadataFolderPath, nestedPathPart = config.nestedPathPart;
+        mkdirp.sync(outputFolderPath);
+        var componentTemplate = this.createTemplate(config.templateFilePath || path.join(__dirname, './templates/component.tst'));
+        var nestedComponentTemplate = this.createTemplate(config.nestedTemplateFilePath || path.join(__dirname, './templates/nested-component.tst'));
+        (0, logger_1.default)("List directory: ".concat(metadataFolderPath));
+        fs.readdirSync(metadataFolderPath)
+            .filter(function (d) { return d !== 'nested'; })
+            .forEach(function (dirname) {
+            var componentName = dirname;
+            var componentMetaPath = path.join(metadataFolderPath, componentName, "".concat(componentName, ".json"));
+            var componentOutputPath = path.join(outputFolderPath, componentName, 'index.ts');
+            _this.generateComponent(componentMetaPath, componentOutputPath, componentTemplate);
+            _this.createEntryPoint(path.dirname(componentOutputPath));
+            var nestedComponentsFolder = path.join(metadataFolderPath, componentName, nestedPathPart);
+            if (fs.existsSync(nestedComponentsFolder)) {
+                var names_1 = [];
+                fs.readdirSync(nestedComponentsFolder)
+                    .filter(function (f) { return fs.lstatSync(path.join(nestedComponentsFolder, f)).isFile(); })
+                    .forEach(function (fileName) {
+                    var nestedComponentName = path.parse(fileName).name;
+                    var nestedComponentOutputPath = path.join(outputFolderPath, componentName, nestedPathPart, "".concat(nestedComponentName, ".ts"));
+                    names_1.push(nestedComponentName);
+                    _this.generateComponent(path.join(nestedComponentsFolder, fileName), nestedComponentOutputPath, nestedComponentTemplate);
+                });
+                var indexFilePath = path.join(outputFolderPath, componentName, nestedPathPart, 'index.ts');
+                fs.writeFileSync(indexFilePath, "".concat(names_1.map(function (name) { return "export * from './".concat(name, "';\n"); }).join(''), "\n"), { encoding: _this._encoding });
+                _this.createEntryPoint(path.dirname(indexFilePath));
+            }
+        });
+        this.generateLegacyComponents(config.nestedTemplateFilePath || path.join(__dirname, './templates/nested-component.tst'), path.join(config.metadataFolderPath, config.nestedPathPart), path.join(config.outputFolderPath, config.nestedPathPart));
+        this.generateLegacyComponents(config.baseNestedTemplateFilePath || path.join(__dirname, './templates/base-nested-component.tst'), path.join(config.metadataFolderPath, config.nestedPathPart, config.basePathPart), path.join(config.outputFolderPath, config.nestedPathPart, config.basePathPart));
+        this.createEntryPoint(path.join(config.outputFolderPath, 'nested'));
+    };
+    DotGenerator.prototype.applyTemplate = function (metadataFilePath, template) {
+        (0, logger_1.default)("Read data from ".concat(metadataFilePath));
+        var data = fs.readFileSync(metadataFilePath, { encoding: this._encoding });
+        (0, logger_1.default)('Apply template');
+        return template(JSON.parse(data));
+    };
+    DotGenerator.prototype.generateComponent = function (metadataPath, outputPath, template) {
+        var result = this.applyTemplate(metadataPath, template);
+        fs.mkdirSync(path.dirname(outputPath), { recursive: true });
+        fs.writeFileSync(outputPath, result, { encoding: this._encoding });
     };
-    DotGenerator.prototype.generateTemplate = function (templateFilePath, metadataFolderPath, outputFolderPath, isSecondaryEntryPoint) {
+    DotGenerator.prototype.generateLegacyComponents = function (templateFilePath, metadataFolderPath, outputFolderPath, isSecondaryEntryPoint) {
         var _this = this;
         if (isSecondaryEntryPoint === void 0) { isSecondaryEntryPoint = false; }
         var template = this.createTemplate(templateFilePath);
@@ -49,17 +89,13 @@ var DotGenerator = (function () {
             .filter(function (fileName) { return fs.lstatSync(path.join(metadataFolderPath, fileName)).isFile(); })
             .forEach(function (fileName) {
             var filePath = path.join(metadataFolderPath, fileName);
-            (0, logger_1.default)("Read data from ".concat(filePath));
-            var data = fs.readFileSync(filePath, { encoding: _this._encoding });
-            (0, logger_1.default)('Apply template');
-            var result = template(JSON.parse(data));
+            var result = _this.applyTemplate(filePath, template);
             var widgetName = path.parse(filePath).name;
             names.push(widgetName);
             var resultFilePath;
             if (isSecondaryEntryPoint) {
                 fs.mkdirSync(path.join(outputFolderPath, widgetName));
                 resultFilePath = path.join(outputFolderPath, "".concat(widgetName, "/index.ts"));
-                _this.createEntryPoint(outputFolderPath, widgetName);
             }
             else {
                 resultFilePath = path.join(outputFolderPath, "".concat(widgetName, ".ts"));
@@ -71,8 +107,8 @@ var DotGenerator = (function () {
             fs.writeFileSync("".concat(outputFolderPath, "/index.ts"), "".concat(names.map(function (name) { return "export * from './".concat(name, "';\n"); }).join(''), "\n"), { encoding: this._encoding });
         }
     };
-    DotGenerator.prototype.createEntryPoint = function (outputFolderPath, entryPoint) {
-        fs.writeFileSync(path.join(outputFolderPath, "".concat(entryPoint, "/ng-package.json")), JSON.stringify({
+    DotGenerator.prototype.createEntryPoint = function (outputFolderPath) {
+        fs.writeFileSync(path.join(outputFolderPath, 'ng-package.json'), JSON.stringify({
             lib: {
                 entryFile: 'index.ts',
             },

package/ts/angular-components-generator/dot-generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"dot-generator.js","sourceRoot":"","sources":["../../../ts/angular-components-generator/dot-generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dot-generator.js","sourceRoot":"","sources":["../../../ts/angular-components-generator/dot-generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,uBAAyB;AACzB,2BAA6B;AAC7B,+BAAiC;AACjC,yBAA2B;AAC3B,mCAA8B;AAE9B,8DAA2E;AAE3E,GAAG,CAAC,gBAAgB,cAClB,MAAM,EAAE,IAAI,EACZ,aAAa,EAAE,KAAK,IACjB,iCAAsB,CAC1B,CAAC;AAEF,SAAgB,wBAAwB,CAAC,cAAsB;IAC7D,OAAO,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AACtC,CAAC;AAFD,4DAEC;AAED;IAAA;QACU,cAAS,GAAmB,MAAM,CAAC;IA8H7C,CAAC;IA5HC,qCAAc,GAAd,UAAe,gBAAwB;QACrC,IAAA,gBAAM,EAAC,mCAA4B,gBAAgB,CAAE,CAAC,CAAC;QACvD,IAAM,cAAc,GAAG,EAAE,CAAC,YAAY,CAAC,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACzE,OAAO,wBAAwB,CAAC,cAAc,CAAC,CAAC;IAClD,CAAC;IAED,+BAAQ,GAAR,UAAS,MAAM;QAAf,iBAwDC;QAvDS,IAAA,gBAAgB,GAAyC,MAAM,iBAA/C,EAAE,kBAAkB,GAAqB,MAAM,mBAA3B,EAAE,cAAc,GAAK,MAAM,eAAX,CAAY;QACxE,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAE9B,IAAM,iBAAiB,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,gBAAgB,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,2BAA2B,CAAC,CAAC,CAAC;QAC5H,IAAM,uBAAuB,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,sBAAsB,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,kCAAkC,CAAC,CAAC,CAAC;QAE/I,IAAA,gBAAM,EAAC,0BAAmB,kBAAkB,CAAE,CAAC,CAAC;QAEhD,EAAE,CAAC,WAAW,CAAC,kBAAkB,CAAC;aAC/B,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,KAAK,QAAQ,EAAd,CAAc,CAAC;aAC7B,OAAO,CAAC,UAAC,OAAO;YACf,IAAM,aAAa,GAAG,OAAO,CAAC;YAE9B,IAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,aAAa,EAAE,UAAG,aAAa,UAAO,CAAC,CAAC;YAChG,IAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;YAEnF,KAAI,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,mBAAmB,EAAE,iBAAiB,CAAC,CAAC;YAClF,KAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC;YAEzD,IAAM,sBAAsB,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;YAC5F,IAAI,EAAE,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE;gBACzC,IAAM,OAAK,GAAG,EAAE,CAAC;gBACjB,EAAE,CAAC,WAAW,CAAC,sBAAsB,CAAC;qBACnC,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,EAA3D,CAA2D,CAAC;qBAC1E,OAAO,CAAC,UAAC,QAAQ;oBAChB,IAAM,mBAAmB,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC;oBACtD,IAAM,yBAAyB,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,aAAa,EAAE,cAAc,EAAE,UAAG,mBAAmB,QAAK,CAAC,CAAC;oBAE1H,OAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;oBAChC,KAAI,CAAC,iBAAiB,CACpB,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,QAAQ,CAAC,EAC3C,yBAAyB,EACzB,uBAAuB,CACxB,CAAC;gBACJ,CAAC,CAAC,CAAC;gBAEL,IAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,aAAa,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;gBAC7F,EAAE,CAAC,aAAa,CACd,aAAa,EACb,UAAG,OAAK,CAAC,GAAG,CAAC,UAAC,IAAI,IAAK,OAAA,2BAAoB,IAAI,SAAM,EAA9B,CAA8B,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,OAAI,EACnE,EAAE,QAAQ,EAAE,KAAI,CAAC,SAAS,EAAE,CAC7B,CAAC;gBACF,KAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;aACpD;QACH,CAAC,CAAC,CAAC;QAEL,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,sBAAsB,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,kCAAkC,CAAC,EACrH,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAAC,cAAc,CAAC,EAC3D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;QAE7D,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,0BAA0B,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,uCAAuC,CAAC,EAC9H,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,YAAY,CAAC,EAChF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;QAElF,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC,CAAC;IACtE,CAAC;IAEO,oCAAa,GAArB,UAAsB,gBAAwB,EAAE,QAAQ;QACtD,IAAA,gBAAM,EAAC,yBAAkB,gBAAgB,CAAE,CAAC,CAAC;QAC7C,IAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,gBAAgB,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;QAC7E,IAAA,gBAAM,EAAC,gBAAgB,CAAC,CAAC;QACzB,OAAO,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IACpC,CAAC;IAEO,wCAAiB,GAAzB,UAA0B,YAAoB,EAAE,UAAkB,EAAE,QAAQ;QAC1E,IAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAC1D,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5D,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;IACrE,CAAC;IAEO,+CAAwB,GAAhC,UACE,gBAAwB,EACxB,kBAA0B,EAC1B,gBAAwB,EACxB,qBAA6B;QAJ/B,iBAqCC;QAjCC,sCAAA,EAAA,6BAA6B;QAE7B,IAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;QACvD,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAE9B,IAAA,gBAAM,EAAC,0BAAmB,kBAAkB,CAAE,CAAC,CAAC;QAChD,IAAM,KAAK,GAAG,EAAE,CAAC;QACjB,EAAE,CAAC,WAAW,CAAC,kBAAkB,CAAC;aAC/B,MAAM,CAAC,UAAC,QAAQ,IAAK,OAAA,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,EAA9D,CAA8D,CAAC;aACpF,OAAO,CAAC,UAAC,QAAQ;YAChB,IAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;YACzD,IAAM,MAAM,GAAG,KAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACtD,IAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC;YAC7C,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACvB,IAAI,cAAc,CAAC;YACnB,IAAI,qBAAqB,EAAE;gBACzB,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC,CAAC;gBACtD,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,UAAG,UAAU,cAAW,CAAC,CAAC;aACxE;iBAAM;gBACL,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,UAAG,UAAU,QAAK,CAAC,CAAC;aAClE;YAED,IAAA,gBAAM,EAAC,0BAAmB,cAAc,CAAE,CAAC,CAAC;YAC5C,EAAE,CAAC,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,KAAI,CAAC,SAAS,EAAE,CAAC,CAAC;QACzE,CAAC,CAAC,CAAC;QAEL,IAAI,CAAC,qBAAqB,EAAE;YAC1B,EAAE,CAAC,aAAa,CACd,UAAG,gBAAgB,cAAW,EAC9B,UAAG,KAAK,CAAC,GAAG,CAAC,UAAC,IAAI,IAAK,OAAA,2BAAoB,IAAI,SAAM,EAA9B,CAA8B,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,OAAI,EACnE,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,CAC7B,CAAC;SACH;IACH,CAAC;IAEO,uCAAgB,GAAxB,UAAyB,gBAAwB;QAC/C,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,EAC7D,IAAI,CAAC,SAAS,CAAC;YACb,GAAG,EAAE;gBACH,SAAS,EAAE,UAAU;aACtB;SACF,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;IAClD,CAAC;IACH,mBAAC;AAAD,CAAC,AA/HD,IA+HC;AA/HY,oCAAY"}

package/ts/angular-components-generator/facade-generator.js

@@ -22,11 +22,11 @@ var FacadeGenerator = (function () {
                 resultContent += "import '".concat(i, "';\n");
             });
             var reexports = fs.readdirSync(facadeConfig.sourceDirectories[0])
-                .filter(function (fileName) { return fs
-                .lstatSync(path.join(facadeConfig.sourceDirectories[0], fileName))
-                .isFile(); })
-                .map(function (fileName) {
-                var name = path.parse(path.join(facadeConfig.sourceDirectories[0], fileName)).name;
+                .filter(function (dirName) { return (fs
+                .lstatSync(path.join(facadeConfig.sourceDirectories[0], dirName))
+                .isDirectory() && dirName !== 'nested'); })
+                .map(function (dirName) {
+                var name = path.parse(path.join(facadeConfig.sourceDirectories[0], dirName)).name;
                 var formattedName = formatName(name);
                 return {
                     names: ["Dx".concat(formattedName, "Component"), "Dx".concat(formattedName, "Module")],

package/ts/angular-components-generator/facade-generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"facade-generator.js","sourceRoot":"","sources":["../../../ts/angular-components-generator/facade-generator.ts"],"names":[],"mappings":";;;AAAA,uBAAyB;AACzB,2BAA6B;AAC7B,wCAA0C;AAC1C,mCAA8B;AAE9B,oFAA6E;AAE7E;IAAA;QACU,aAAQ,GAAmB,MAAM,CAAC;IAmC5C,CAAC;IAjCC,kCAAQ,GAAR,UAAS,MAAM;QAAf,iBAgCC;QA/BC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,UAAC,cAAc;YACjD,IAAA,gBAAM,EAAC,2BAAoB,cAAc,CAAE,CAAC,CAAC;YAC7C,IAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YACpD,IAAI,aAAa,GAAG,EAAE,CAAC;YAEvB,aAAa,IAAI,8CAA8C,CAAC;YAChE,aAAa,IAAI,+BAA+B,CAAC;YAEjD,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,UAAC,CAAC;gBAC7B,aAAa,IAAI,kBAAW,CAAC,SAAM,CAAC;YACtC,CAAC,CAAC,CAAC;YAEH,IAAM,SAAS,GAAG,EAAE,CAAC,WAAW,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;iBAChE,MAAM,CAAC,UAAC,QAAQ,IAAK,OAAA,EAAE;iBACrB,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;iBACjE,MAAM,EAAE,EAFW,CAEX,CAAC;iBACX,GAAG,CAAC,UAAC,QAAQ;gBACJ,IAAA,IAAI,GAAK,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,KAAvE,CAAwE;gBACpF,IAAM,aAAa,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;gBAEvC,OAAO;oBACL,KAAK,EAAE,CAAC,YAAK,aAAa,cAAW,EAAE,YAAK,aAAa,WAAQ,CAAC;oBAClE,IAAI,EAAE,gCAAyB,IAAI,CAAE;iBACtC,CAAC;YACJ,CAAC,CAAC,CAAC;YAEL,aAAa,IAAI,IAAA,6BAAiB,EAAC,SAAS,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;YAEpE,IAAA,gBAAM,EAAC,0BAAmB,cAAc,CAAE,CAAC,CAAC;YAC5C,EAAE,CAAC,aAAa,CAAC,cAAc,EAAE,aAAa,EAAE,EAAE,QAAQ,EAAE,KAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC/E,CAAC,CAAC,CAAC;IACL,CAAC;IACH,sBAAC;AAAD,CAAC,AApCD,IAoCC;AApCY,0CAAe;AAsC5B,SAAS,UAAU,CAAC,IAAY;IAC9B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACvB,OAAO,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;KACjC;IACD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,EAArB,CAAqB,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACpE,CAAC"}
+{"version":3,"file":"facade-generator.js","sourceRoot":"","sources":["../../../ts/angular-components-generator/facade-generator.ts"],"names":[],"mappings":";;;AAAA,uBAAyB;AACzB,2BAA6B;AAC7B,wCAA0C;AAC1C,mCAA8B;AAE9B,oFAA6E;AAE7E;IAAA;QACU,aAAQ,GAAmB,MAAM,CAAC;IAmC5C,CAAC;IAjCC,kCAAQ,GAAR,UAAS,MAAM;QAAf,iBAgCC;QA/BC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,UAAC,cAAc;YACjD,IAAA,gBAAM,EAAC,2BAAoB,cAAc,CAAE,CAAC,CAAC;YAC7C,IAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YACpD,IAAI,aAAa,GAAG,EAAE,CAAC;YAEvB,aAAa,IAAI,8CAA8C,CAAC;YAChE,aAAa,IAAI,+BAA+B,CAAC;YAEjD,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,UAAC,CAAC;gBAC7B,aAAa,IAAI,kBAAW,CAAC,SAAM,CAAC;YACtC,CAAC,CAAC,CAAC;YAEH,IAAM,SAAS,GAAG,EAAE,CAAC,WAAW,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;iBAChE,MAAM,CAAC,UAAC,OAAO,IAAK,OAAA,CAAC,EAAE;iBACrB,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;iBAChE,WAAW,EAAE,IAAI,OAAO,KAAK,QAAQ,CAAC,EAFpB,CAEoB,CAAC;iBACzC,GAAG,CAAC,UAAC,OAAO;gBACH,IAAA,IAAI,GAAK,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,KAAtE,CAAuE;gBACnF,IAAM,aAAa,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;gBAEvC,OAAO;oBACL,KAAK,EAAE,CAAC,YAAK,aAAa,cAAW,EAAE,YAAK,aAAa,WAAQ,CAAC;oBAClE,IAAI,EAAE,gCAAyB,IAAI,CAAE;iBACtC,CAAC;YACJ,CAAC,CAAC,CAAC;YAEL,aAAa,IAAI,IAAA,6BAAiB,EAAC,SAAS,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;YAEpE,IAAA,gBAAM,EAAC,0BAAmB,cAAc,CAAE,CAAC,CAAC;YAC5C,EAAE,CAAC,aAAa,CAAC,cAAc,EAAE,aAAa,EAAE,EAAE,QAAQ,EAAE,KAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC/E,CAAC,CAAC,CAAC;IACL,CAAC;IACH,sBAAC;AAAD,CAAC,AApCD,IAoCC;AApCY,0CAAe;AAsC5B,SAAS,UAAU,CAAC,IAAY;IAC9B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACvB,OAAO,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;KACjC;IACD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,EAArB,CAAqB,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACpE,CAAC"}

package/ts/angular-components-generator/metadata-generator.d.ts

@@ -1,4 +1,14 @@
 import { Metadata } from './metadata-model';
+interface Config {
+    sourceMetadataFilePath: string;
+    deprecatedMetadataFilePath: string;
+    outputFolderPath: string;
+    nestedPathPart: string;
+    basePathPart: string;
+    widgetPackageName: string;
+    wrapperPackageName: string;
+    generateReexports: boolean;
+}
 export interface IObjectStore {
     read(name: string): Metadata;
     write(name: string, data: Record<string, any>): void;
@@ -11,8 +21,9 @@ export declare class FSObjectStore implements IObjectStore {
 export declare class ComponentMetadataGenerator {
     private store?;
     constructor(store?: IObjectStore);
-    generate(config: any): void;
+    generate(config: Config): void;
     private createEvent;
+    private filterWidgetNestedComponents;
     private getTypesDescription;
     private getTypeParts;
     private getObjectType;
@@ -23,5 +34,10 @@ export declare class ComponentMetadataGenerator {
     private generateComplexOptionByType;
     private generateComplexOption;
     private getBaseComponentPath;
-    private generateNestedOptions;
+    private getNewNestedClassname;
+    private mergeNestedComponents;
+    private prepareComponentNestedOptionsMetadata;
+    private prepareCommonNestedOptionsMetadata;
+    private writeNestedOptionsMetadata;
 }
+export {};

package/ts/angular-components-generator/metadata-generator.js

@@ -21,6 +21,15 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComponentMetadataGenerator = exports.FSObjectStore = void 0;
 var fs = require("fs");
@@ -31,9 +40,13 @@ var inflector = require("inflector-js");
 var logger_1 = require("./logger");
 var import_helper_1 = require("./import-helper");
 var helpers_1 = require("./helpers");
+var utils_1 = require("../common/utils");
 var OPTION_COMPONENT_PREFIX = 'Dxo';
 var ITEM_COMPONENT_PREFIX = 'Dxi';
-var TYPES_SEPORATOR = ' | ';
+var TYPES_SEPARATOR = ' | ';
+var NON_EXPORTED_NESTED_COMPONENTS = [
+    'DxiToolbarItem',
+];
 function trimDx(value) {
     return trimPrefix('dx-', value);
 }
@@ -56,6 +69,7 @@ var FSObjectStore = (function () {
     FSObjectStore.prototype.write = function (filePath, data) {
         (0, logger_1.default)("Write data to file ".concat(filePath));
         var dataString = JSON.stringify(data, null, 4);
+        fs.mkdirSync(path.dirname(filePath), { recursive: true });
         fs.writeFileSync(filePath, dataString, { encoding: this.encoding });
     };
     return FSObjectStore;
@@ -78,12 +92,12 @@ var ComponentMetadataGenerator = (function () {
         mkdirp.sync(config.outputFolderPath);
         mkdirp.sync(path.join(config.outputFolderPath, config.nestedPathPart));
         mkdirp.sync(path.join(config.outputFolderPath, config.nestedPathPart, config.basePathPart));
-        var _loop_1 = function (widgetName) {
+        for (var widgetName in widgetsMetadata) {
             var widget = widgetsMetadata[widgetName];
             var nestedComponents = [];
             if (!widget.Module) {
                 (0, logger_1.default)("Skipping metadata for ".concat(widgetName));
-                return "continue";
+                continue;
             }
             (0, logger_1.default)("Generate metadata for ".concat(widgetName));
             var isTranscludedContent = widget.IsTranscludedContent;
@@ -91,7 +105,7 @@ var ComponentMetadataGenerator = (function () {
             var isExtension = widget.IsExtensionComponent || false;
             var className = inflector.camelize(widgetName);
             var dasherizedWidgetName = inflector.dasherize(inflector.underscore(widgetName));
-            var outputFilePath = path.join(config.outputFolderPath, "".concat(trimDx(dasherizedWidgetName), ".json"));
+            var outputFilePath = path.join(config.outputFolderPath, trimDx(dasherizedWidgetName), "".concat(trimDx(dasherizedWidgetName), ".json"));
             var events = [];
             var changeEvents = [];
             var properties = [];
@@ -110,8 +124,8 @@ var ComponentMetadataGenerator = (function () {
                     });
                 }
                 else {
-                    var typesDescription = this_1.getTypesDescription(option);
-                    var finalizedType = this_1.getType(typesDescription);
+                    var typesDescription = this.getTypesDescription(option);
+                    var finalizedType = this.getType(typesDescription);
                     var property = {
                         docID: option.DocID,
                         isDeprecated: option.IsDeprecated,
@@ -124,8 +138,8 @@ var ComponentMetadataGenerator = (function () {
                         property.isCollection = true;
                     }
                     properties.push(property);
-                    changeEvents.push(this_1.createEvent(optionName, finalizedType, option));
-                    var components = this_1.generateComplexOptionByType(metadata, option, optionName, [], config);
+                    changeEvents.push(this.createEvent(optionName, finalizedType, option));
+                    var components = this.generateComplexOptionByType(metadata, option, optionName, [], config);
                     nestedComponents = nestedComponents.concat.apply(nestedComponents, components);
                 }
             }
@@ -133,21 +147,11 @@ var ComponentMetadataGenerator = (function () {
             if (isEditor) {
                 allEvents.push({ emit: 'onBlur', type: 'EventEmitter<any>' });
             }
-            var widgetNestedComponents = nestedComponents
-                .reduce(function (result, component) {
-                if (result.filter(function (c) { return c.className === component.className; }).length === 0) {
-                    result.push({
-                        path: component.path,
-                        propertyName: component.propertyName,
-                        className: component.className,
-                        events: component.events,
-                        isCollection: component.isCollection,
-                        hasTemplate: component.hasTemplate,
-                        root: properties.filter(function (p) { return p.name === component.propertyName; }).length === 1 ? true : undefined,
-                    });
-                }
-                return result;
-            }, []);
+            var parentName = trimDx(dasherizedWidgetName);
+            var componentNestedOptions = this.prepareComponentNestedOptionsMetadata(config, nestedComponents, parentName);
+            var widgetNestedComponents = this.filterWidgetNestedComponents(componentNestedOptions, properties);
+            var widgetLegacyNestedComponents = this.filterWidgetNestedComponents(nestedComponents, properties)
+                .filter(function (component) { return !NON_EXPORTED_NESTED_COMPONENTS.includes(component.className); });
             var containsReexports = !!((_b = widget.Reexports) === null || _b === void 0 ? void 0 : _b.filter(function (r) { return r !== 'default'; }).length);
             var widgetMetadata = {
                 docID: widget.DocID,
@@ -158,6 +162,7 @@ var ComponentMetadataGenerator = (function () {
                 isViz: isViz,
                 isExtension: isExtension,
                 selector: dasherizedWidgetName,
+                path: trimDx(dasherizedWidgetName),
                 events: allEvents,
                 properties: properties,
                 isEditor: isEditor,
@@ -165,18 +170,17 @@ var ComponentMetadataGenerator = (function () {
                 packageName: config.wrapperPackageName,
                 imports: (0, import_helper_1.buildImports)((0, helpers_1.getValues)(widget.Options), config.widgetPackageName),
                 nestedComponents: widgetNestedComponents,
+                legacyNestedComponents: widgetLegacyNestedComponents,
                 optionsTypeParams: widget.OptionsTypeParams,
                 renderReexports: config.generateReexports && containsReexports,
             };
             (0, logger_1.default)("Write metadata to file ".concat(outputFilePath));
-            this_1.store.write(outputFilePath, normalizeMeta(widgetMetadata));
+            this.store.write(outputFilePath, normalizeMeta(widgetMetadata));
+            this.writeNestedOptionsMetadata(componentNestedOptions, path.join(config.outputFolderPath, parentName, config.nestedPathPart));
             allNestedComponents = allNestedComponents.concat.apply(allNestedComponents, nestedComponents);
-        };
-        var this_1 = this;
-        for (var widgetName in widgetsMetadata) {
-            _loop_1(widgetName);
         }
-        this.generateNestedOptions(config, allNestedComponents);
+        var commonNestedOptions = this.prepareCommonNestedOptionsMetadata(config, allNestedComponents);
+        this.writeNestedOptionsMetadata(commonNestedOptions, path.join(config.outputFolderPath, config.nestedPathPart));
     };
     ComponentMetadataGenerator.prototype.createEvent = function (name, type, option) {
         return {
@@ -186,6 +190,18 @@ var ComponentMetadataGenerator = (function () {
             option: option,
         };
     };
+    ComponentMetadataGenerator.prototype.filterWidgetNestedComponents = function (nestedComponents, widgetProperties) {
+        return (0, utils_1.distinctByProperty)(nestedComponents, 'className')
+            .map(function (component) { return ({
+            path: component.path,
+            propertyName: component.propertyName,
+            className: component.className,
+            events: component.events,
+            isCollection: component.isCollection,
+            hasTemplate: component.hasTemplate,
+            root: widgetProperties.filter(function (p) { return p.name === component.propertyName; }).length === 1 ? true : undefined,
+        }); });
+    };
     ComponentMetadataGenerator.prototype.getTypesDescription = function (optionMetadata) {
         var typeParts = this.getTypeParts(optionMetadata);
         return {
@@ -198,7 +214,7 @@ var ComponentMetadataGenerator = (function () {
         var arrayTypes = [];
         if (optionMetadata.ItemPrimitiveTypes) {
             if (optionMetadata.IsPromise) {
-                var promiseType = optionMetadata.ItemPrimitiveTypes.join(TYPES_SEPORATOR);
+                var promiseType = optionMetadata.ItemPrimitiveTypes.join(TYPES_SEPARATOR);
                 primitiveTypes.push("Promise<".concat(promiseType, "> & JQueryPromise<").concat(promiseType, ">"));
             }
             else {
@@ -236,10 +252,10 @@ var ComponentMetadataGenerator = (function () {
         var primitiveTypes = typesDescription.primitiveTypes.slice(0);
         var result = 'any';
         if (typesDescription.arrayTypes.length) {
-            primitiveTypes.push("Array<".concat(typesDescription.arrayTypes.join(TYPES_SEPORATOR), ">"));
+            primitiveTypes.push("Array<".concat(typesDescription.arrayTypes.join(TYPES_SEPARATOR), ">"));
         }
         if (primitiveTypes.length) {
-            result = primitiveTypes.join(TYPES_SEPORATOR);
+            result = primitiveTypes.join(TYPES_SEPARATOR);
         }
         return result;
     };
@@ -334,7 +350,7 @@ var ComponentMetadataGenerator = (function () {
             var nestedOption = nestedOptions[optName];
             var typesDescription = this.getTypesDescription(nestedOption);
             var propertyType = this.getType(typesDescription);
-            if (nestedOption.IsEvent && nestedOption.IsEvent && ((_b = nestedOption.TypeImports) === null || _b === void 0 ? void 0 : _b.length)) {
+            if (nestedOption.IsEvent && ((_b = nestedOption.TypeImports) === null || _b === void 0 ? void 0 : _b.length)) {
                 propertyType = "((e: ".concat(nestedOption.TypeImports[0].Name, ") => void)");
             }
             var property = {
@@ -371,25 +387,34 @@ var ComponentMetadataGenerator = (function () {
     ComponentMetadataGenerator.prototype.getBaseComponentPath = function (component) {
         return component.basePath + (component.isCollection ? '-dxi' : '');
     };
-    ComponentMetadataGenerator.prototype.generateNestedOptions = function (config, metadata) {
+    ComponentMetadataGenerator.prototype.getNewNestedClassname = function (className, parentName) {
+        var _a = inflector.underscore(className).split('_'), prefix = _a[0], rest = _a.slice(1);
+        return inflector.camelize(__spreadArray([prefix, inflector.camelize(parentName.replaceAll('-', '_'))], rest, true).join('_'));
+    };
+    ComponentMetadataGenerator.prototype.mergeNestedComponents = function (components) {
         var _this = this;
-        var normalizedMetadata = metadata
-            .reduce(function (result, component) {
+        var mergedNestedComponents = {};
+        components.forEach(function (component) {
             var _a, _b, _c, _d;
-            var existingComponent = result.filter(function (c) { return c.className === component.className; })[0];
-            if (!existingComponent) {
-                component.options = component.properties.map(function (p) { return p.option; });
-                result.push(component);
+            if (!mergedNestedComponents[component.className]) {
+                mergedNestedComponents[component.className] = __assign(__assign({}, component), { options: component.properties.map(function (p) { return p.option; }) });
             }
             else {
-                existingComponent.properties = (_a = existingComponent.properties)
+                var mergedComponent = mergedNestedComponents[component.className];
+                mergedComponent.properties = (_a = mergedComponent.properties)
                     .concat.apply(_a, component.properties).reduce(function (properties, property) {
                     var _a;
-                    if (properties.filter(function (p) { return p.name === property.name; }).length === 0) {
+                    if (!properties.some(function (_a) {
+                        var name = _a.name;
+                        return name === property.name;
+                    })) {
                         properties.push(property);
                     }
                     else {
-                        var existingProperty = properties.filter(function (p) { return p.name === property.name; })[0];
+                        var existingProperty = properties.find(function (_a) {
+                            var name = _a.name;
+                            return name === property.name;
+                        });
                         var typesDescription = existingProperty.typesDescription;
                         typesDescription.primitiveTypes = _this.mergeArrayTypes(typesDescription.primitiveTypes, property.typesDescription.primitiveTypes);
                         typesDescription.arrayTypes = _this.mergeArrayTypes(typesDescription.arrayTypes, property.typesDescription.arrayTypes);
@@ -399,32 +424,48 @@ var ComponentMetadataGenerator = (function () {
                     }
                     return properties;
                 }, []);
-                existingComponent.events = (_b = existingComponent.events)
-                    .concat.apply(_b, component.events).reduce(function (events, event) {
-                    if (events.filter(function (e) { return e.emit === event.emit; }).length === 0) {
-                        events.push(event);
-                    }
-                    return events;
-                }, []);
-                existingComponent.baseClass = existingComponent.baseClass || component.baseClass;
-                existingComponent.basePath = existingComponent.basePath || component.basePath;
-                (_c = existingComponent.collectionNestedComponents).push.apply(_c, component.collectionNestedComponents);
-                (_d = existingComponent.options).push.apply(_d, component.properties.map(function (p) { return p.option; }));
-            }
-            return result;
-        }, []);
-        normalizedMetadata.forEach(function (component) {
-            component.collectionNestedComponents = component.collectionNestedComponents
-                .reduce(function (result, nestedComponent) {
-                if (result.filter(function (c) { return nestedComponent.className === c.className; }).length === 0) {
-                    result.push(nestedComponent);
+                if (mergedComponent.events != null) {
+                    mergedComponent.events = (0, utils_1.distinctByProperty)((_b = mergedComponent.events).concat.apply(_b, component.events), 'emit');
                 }
-                return result;
-            }, []);
+                mergedComponent.baseClass = mergedComponent.baseClass || component.baseClass;
+                mergedComponent.basePath = mergedComponent.basePath || component.basePath;
+                mergedComponent.hasTemplate = mergedComponent.hasTemplate || component.hasTemplate;
+                (_c = mergedComponent.collectionNestedComponents).push.apply(_c, component.collectionNestedComponents);
+                (_d = mergedComponent.options).push.apply(_d, component.properties.map(function (p) { return p.option; }));
+            }
         });
-        normalizedMetadata
+        return Object.values(mergedNestedComponents);
+    };
+    ComponentMetadataGenerator.prototype.prepareComponentNestedOptionsMetadata = function (config, nestedComponents, parentName) {
+        var _this = this;
+        var componentNestedOptions = this.mergeNestedComponents(structuredClone(nestedComponents));
+        componentNestedOptions.forEach(function (component) {
+            component.collectionNestedComponents = (0, utils_1.distinctByProperty)(component.collectionNestedComponents, 'className')
+                .map(function (c) { return (__assign(__assign({}, c), { className: _this.getNewNestedClassname(c.className, parentName) })); });
+        });
+        return componentNestedOptions
+            .map(function (component) {
+            if (component.events && !component.events.length) {
+                delete component.events;
+            }
+            var _a = component.selector.split('-'), prefix = _a[0], rest = _a.slice(1);
+            component.selector = __spreadArray([prefix, parentName], rest, true).join('-');
+            component.className = _this.getNewNestedClassname(component.className, parentName);
+            component.baseClass = component.isCollection ? 'CollectionNestedOption' : 'NestedOption';
+            component.basePath = 'devextreme-angular/core';
+            component.imports = (0, import_helper_1.buildImports)(component.options, config.widgetPackageName);
+            return component;
+        });
+    };
+    ComponentMetadataGenerator.prototype.prepareCommonNestedOptionsMetadata = function (config, metadata) {
+        var _this = this;
+        var commonNestedOptions = this.mergeNestedComponents(metadata);
+        commonNestedOptions.forEach(function (component) {
+            component.collectionNestedComponents = (0, utils_1.distinctByProperty)(component.collectionNestedComponents, 'className');
+        });
+        commonNestedOptions
             .reduce(function (result, component) {
-            var existingComponent = result.filter(function (c) { return c.className === component.baseClass; })[0];
+            var existingComponent = result.find(function (c) { return c.className === component.baseClass; });
             if (!existingComponent && component.baseClass) {
                 var nestedComponent = {
                     properties: component.properties,
@@ -443,7 +484,7 @@ var ComponentMetadataGenerator = (function () {
             var outputFilePath = path.join(config.outputFolderPath, config.nestedPathPart, config.basePathPart, "".concat(component.path, ".json"));
             _this.store.write(outputFilePath, normalizeMeta(component));
         });
-        normalizedMetadata
+        return commonNestedOptions
             .map(function (component) {
             if (component.events && !component.events.length) {
                 delete component.events;
@@ -463,9 +504,12 @@ var ComponentMetadataGenerator = (function () {
                 component.imports = (0, import_helper_1.buildImports)(component.options, config.widgetPackageName);
             }
             return component;
-        })
-            .forEach(function (component) {
-            var outputFilePath = path.join(config.outputFolderPath, config.nestedPathPart, "".concat(component.path, ".json"));
+        });
+    };
+    ComponentMetadataGenerator.prototype.writeNestedOptionsMetadata = function (components, outputDir) {
+        var _this = this;
+        components.forEach(function (component) {
+            var outputFilePath = path.join(outputDir, "".concat(component.path, ".json"));
             _this.store.write(outputFilePath, normalizeMeta(component));
         });
     };