devextreme-internal-tools 16.0.0-beta.8 → 16.0.0

package/integration-data-model.d.ts

@@ -53,6 +53,7 @@ export interface ICustomType {
 }
 export interface ITypeDescr {
     acceptableValues: string[];
+    acceptableValueType: string;
     importPath: string;
     isCustomType: boolean;
     isImportedType: boolean;

package/package.json

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

package/ts/angular-components-generator/common-reexports-generator.d.ts

@@ -1,4 +1,12 @@
+import { IModel } from '../../integration-data-model';
+import { TemplatingOptions } from '../components-generation/template';
+interface Config {
+    metadata: IModel;
+    outputPath: string;
+    widgetsPackage: string;
+    templatingOptions: TemplatingOptions;
+}
 export declare class CommonReexportsGenerator {
-    generate(config: any): void;
-    private generateReexports;
+    static generate({ metadata, widgetsPackage, outputPath, templatingOptions, }: Config): void;
 }
+export {};

package/ts/angular-components-generator/common-reexports-generator.js

@@ -3,40 +3,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommonReexportsGenerator = void 0;
 var fs_1 = require("fs");
 var path_1 = require("path");
-var dot_generator_1 = require("./dot-generator");
-var render = (0, dot_generator_1.createTemplateFromString)("\nexport {<#~ it.reexports :reExport #>\n    <#= reExport #>,<#~#>\n} from '<#= it.module #>';\n".trimLeft());
+var common_reexports_generator_1 = require("../components-generation/common-reexports-generator");
+var logging_1 = require("../logging");
+var file_helpers_1 = require("../components-generation/file-helpers");
 var CommonReexportsGenerator = (function () {
     function CommonReexportsGenerator() {
     }
-    CommonReexportsGenerator.prototype.generate = function (config) {
-        var _this = this;
-        var _a;
-        var metadata = JSON.parse((0, fs_1.readFileSync)(config.metadataPath).toString());
-        var widgetsPackage = (_a = config.widgetsPackage) !== null && _a !== void 0 ? _a : 'devextreme';
-        if (!metadata.CommonReexports) {
+    CommonReexportsGenerator.generate = function (_a) {
+        var metadata = _a.metadata, _b = _a.widgetsPackage, widgetsPackage = _b === void 0 ? 'devextreme' : _b, outputPath = _a.outputPath, _c = _a.templatingOptions, templatingOptions = _c === void 0 ? { quotes: 'single', excplicitIndexInImports: false } : _c;
+        if (!metadata) {
+            (0, logging_1.log)('Metadata is undefined', { lvl: 'error' });
             return;
         }
-        var commonTargetFolderName = 'common';
-        var commonPath = (0, path_1.join)(config.outputPath, commonTargetFolderName);
-        if (!(0, fs_1.existsSync)(commonPath)) {
-            (0, fs_1.mkdirSync)(commonPath);
+        if (!metadata.commonReexports) {
+            (0, logging_1.log)('commonReexports not found', { lvl: 'error' });
+            return;
         }
-        Object.keys(metadata.CommonReexports).forEach(function (key) {
-            var targetFolder = (0, path_1.join)(config.outputPath, key);
-            (0, fs_1.mkdirSync)(targetFolder, { recursive: true });
-            var fileContent = _this.generateReexports("".concat(widgetsPackage, "/").concat(key), metadata.CommonReexports[key]);
-            (0, fs_1.writeFileSync)((0, path_1.join)(targetFolder, 'index.ts'), fileContent, { encoding: 'utf8' });
-            (0, fs_1.writeFileSync)((0, path_1.join)(targetFolder, 'ng-package.json'), JSON.stringify({
-                lib: {
-                    entryFile: 'index.ts',
-                },
-            }, null, '  '), { encoding: 'utf8' });
+        (0, common_reexports_generator_1.generateCommonReexports)({
+            commonReexports: metadata.commonReexports,
+            widgetsPackage: widgetsPackage,
+            templatingOptions: templatingOptions,
+            writeFile: function (path, content) {
+                var dirPath = (0, path_1.join)(outputPath, path);
+                var indexFilePath = (0, path_1.join)(dirPath, 'index.ts');
+                var packageFilePath = (0, path_1.join)(dirPath, 'ng-package.json');
+                (0, fs_1.mkdirSync)(dirPath, { recursive: true });
+                (0, file_helpers_1.writeFileSafe)(indexFilePath, content);
+                (0, file_helpers_1.writeFileSafe)(packageFilePath, JSON.stringify({
+                    lib: {
+                        entryFile: 'index.ts',
+                    },
+                }, null, '  '));
+            },
         });
     };
-    CommonReexportsGenerator.prototype.generateReexports = function (module, reexports) {
-        var result = render({ module: module, reexports: reexports });
-        return result;
-    };
     return CommonReexportsGenerator;
 }());
 exports.CommonReexportsGenerator = CommonReexportsGenerator;

package/ts/angular-components-generator/common-reexports-generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"common-reexports-generator.js","sourceRoot":"","sources":["../../../ts/angular-components-generator/common-reexports-generator.ts"],"names":[],"mappings":";;;AAAA,yBAEY;AACZ,6BAAyC;AACzC,iDAA2D;AAE3D,IAAM,MAAM,GAA+D,IAAA,wCAAwB,EAAC,kGAInG,CAAC,QAAQ,EAAE,CAAC,CAAC;AAEd;IAAA;IA0CA,CAAC;IAzCC,2CAAQ,GAAR,UAAS,MAAM;QAAf,iBAkCC;;QAjCC,IAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1E,IAAM,cAAc,GAAG,MAAA,MAAM,CAAC,cAAc,mCAAI,YAAY,CAAC;QAE7D,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE;YAC7B,OAAO;SACR;QAED,IAAM,sBAAsB,GAAG,QAAQ,CAAC;QACxC,IAAM,UAAU,GAAG,IAAA,WAAS,EAAC,MAAM,CAAC,UAAU,EAAE,sBAAsB,CAAC,CAAC;QAExE,IAAI,CAAC,IAAA,eAAU,EAAC,UAAU,CAAC,EAAE;YAC3B,IAAA,cAAS,EAAC,UAAU,CAAC,CAAC;SACvB;QAED,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,UAAC,GAAG;YAChD,IAAM,YAAY,GAAG,IAAA,WAAS,EAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YAEvD,IAAA,cAAS,EAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAE7C,IAAM,WAAW,GAAG,KAAI,CAAC,iBAAiB,CAAC,UAAG,cAAc,cAAI,GAAG,CAAE,EAAE,QAAQ,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC;YAEtG,IAAA,kBAAa,EACX,IAAA,WAAS,EAAC,YAAY,EAAE,UAAU,CAAC,EACnC,WAAW,EACX,EAAE,QAAQ,EAAE,MAAM,EAAE,CACrB,CAAC;YAEF,IAAA,kBAAa,EAAC,IAAA,WAAS,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC;gBACvE,GAAG,EAAE;oBACH,SAAS,EAAE,UAAU;iBACtB;aACF,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACL,CAAC;IAGO,oDAAiB,GAAzB,UAA0B,MAAc,EAAE,SAAmB;QAC3D,IAAM,MAAM,GAAG,MAAM,CAAC,EAAE,MAAM,QAAA,EAAE,SAAS,WAAA,EAAE,CAAC,CAAC;QAC7C,OAAO,MAAM,CAAC;IAChB,CAAC;IACH,+BAAC;AAAD,CAAC,AA1CD,IA0CC;AA1CY,4DAAwB"}
+{"version":3,"file":"common-reexports-generator.js","sourceRoot":"","sources":["../../../ts/angular-components-generator/common-reexports-generator.ts"],"names":[],"mappings":";;;AAAA,yBAEY;AAEZ,6BAEc;AAEd,kGAE6D;AAE7D,sCAAiC;AACjC,sEAAsE;AAUtE;IAAA;IAqCA,CAAC;IApCQ,iCAAQ,GAAf,UAAgB,EAKP;YAJP,QAAQ,cAAA,EACR,sBAA6B,EAA7B,cAAc,mBAAG,YAAY,KAAA,EAC7B,UAAU,gBAAA,EACV,yBAAwE,EAAxE,iBAAiB,mBAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,uBAAuB,EAAE,KAAK,EAAE,KAAA;QAExE,IAAI,CAAC,QAAQ,EAAE;YACb,IAAA,aAAG,EAAC,uBAAuB,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;YAC/C,OAAO;SACR;QACD,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE;YAC7B,IAAA,aAAG,EAAC,2BAA2B,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;YACnD,OAAO;SACR;QAED,IAAA,oDAAuB,EAAC;YACtB,eAAe,EAAE,QAAQ,CAAC,eAAe;YACzC,cAAc,gBAAA;YACd,iBAAiB,mBAAA;YACjB,SAAS,YAAC,IAAI,EAAE,OAAO;gBACrB,IAAM,OAAO,GAAG,IAAA,WAAS,EAAC,UAAU,EAAE,IAAI,CAAC,CAAC;gBAC5C,IAAM,aAAa,GAAG,IAAA,WAAS,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;gBACrD,IAAM,eAAe,GAAG,IAAA,WAAS,EAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;gBAE9D,IAAA,cAAS,EAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBAExC,IAAA,4BAAa,EAAC,aAAa,EAAE,OAAO,CAAC,CAAC;gBAEtC,IAAA,4BAAa,EAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC;oBAC5C,GAAG,EAAE;wBACH,SAAS,EAAE,UAAU;qBACtB;iBACF,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;YAClB,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IACH,+BAAC;AAAD,CAAC,AArCD,IAqCC;AArCY,4DAAwB"}

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

@@ -1,4 +1,11 @@
+import { TemplatingOptions } from '../components-generation/template';
+interface Config {
+    facades: string;
+    commonImports: string[];
+    templatingOptions?: TemplatingOptions;
+}
 export declare class FacadeGenerator {
     private encoding;
-    generate(config: any): void;
+    generate({ facades, commonImports, templatingOptions, }: Config): void;
 }
+export {};

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

@@ -6,19 +6,25 @@ var path = require("path");
 var inflector = require("inflector-js");
 var logger_1 = require("./logger");
 var reexports_generator_1 = require("../components-generation/reexports-generator");
+var common_reexports_generator_1 = require("../components-generation/common-reexports-generator");
+var defaultTemplatingOptions = {
+    quotes: 'single',
+    excplicitIndexInImports: false,
+};
 var FacadeGenerator = (function () {
     function FacadeGenerator() {
         this.encoding = 'utf8';
     }
-    FacadeGenerator.prototype.generate = function (config) {
+    FacadeGenerator.prototype.generate = function (_a) {
         var _this = this;
-        Object.keys(config.facades).forEach(function (facadeFilePath) {
+        var facades = _a.facades, commonImports = _a.commonImports, _b = _a.templatingOptions, templatingOptions = _b === void 0 ? defaultTemplatingOptions : _b;
+        Object.keys(facades).forEach(function (facadeFilePath) {
             (0, logger_1.default)("Generate facade: ".concat(facadeFilePath));
-            var facadeConfig = config.facades[facadeFilePath];
+            var facadeConfig = facades[facadeFilePath];
             var resultContent = '';
             resultContent += 'export * from \'devextreme-angular/core\';\n';
             resultContent += 'export * from \'./ui/all\';\n';
-            config.commonImports.forEach(function (i) {
+            commonImports.forEach(function (i) {
                 resultContent += "import '".concat(i, "';\n");
             });
             var reexports = fs.readdirSync(facadeConfig.sourceDirectories[0])
@@ -33,7 +39,8 @@ var FacadeGenerator = (function () {
                     path: "devextreme-angular/ui/".concat(name),
                 };
             });
-            resultContent += (0, reexports_generator_1.default)(reexports, { quotes: 'single' });
+            resultContent += (0, reexports_generator_1.default)(reexports, { templatingOptions: templatingOptions });
+            resultContent += (0, common_reexports_generator_1.generateRootCommonReexport)(templatingOptions);
             (0, logger_1.default)("Write result to ".concat(facadeFilePath));
             fs.writeFileSync(facadeFilePath, resultContent, { encoding: _this.encoding });
         });

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,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"}
+{"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;AAC7E,kGAAiG;AASjG,IAAM,wBAAwB,GAAsB;IAClD,MAAM,EAAE,QAAQ;IAChB,uBAAuB,EAAE,KAAK;CAC/B,CAAC;AAEF;IAAA;QACU,aAAQ,GAAmB,MAAM,CAAC;IAyC5C,CAAC;IAvCC,kCAAQ,GAAR,UAAS,EAIA;QAJT,iBAsCC;YArCC,OAAO,aAAA,EACP,aAAa,mBAAA,EACb,yBAA4C,EAA5C,iBAAiB,mBAAG,wBAAwB,KAAA;QAE5C,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,UAAC,cAAc;YAC1C,IAAA,gBAAM,EAAC,2BAAoB,cAAc,CAAE,CAAC,CAAC;YAC7C,IAAM,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;YAC7C,IAAI,aAAa,GAAG,EAAE,CAAC;YAEvB,aAAa,IAAI,8CAA8C,CAAC;YAChE,aAAa,IAAI,+BAA+B,CAAC;YAEjD,aAAa,CAAC,OAAO,CAAC,UAAC,CAAC;gBACtB,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,iBAAiB,mBAAA,EAAE,CAAC,CAAC;YAErE,aAAa,IAAI,IAAA,uDAA0B,EAAC,iBAAiB,CAAC,CAAC;YAE/D,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,AA1CD,IA0CC;AA1CY,0CAAe;AA4C5B,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,7 +1,8 @@
 import { Metadata } from './metadata-model';
+import { IModel } from '../../integration-data-model';
 interface Config {
     sourceMetadataFilePath: string;
-    deprecatedMetadataFilePath: string;
+    imdMetadataFilePath: string;
     outputFolderPath: string;
     nestedPathPart: string;
     basePathPart: string;
@@ -10,7 +11,7 @@ interface Config {
     generateReexports: boolean;
 }
 export interface IObjectStore {
-    read(name: string): Metadata;
+    read(name: string): Metadata | IModel;
     write(name: string, data: Record<string, any>): void;
 }
 export declare class FSObjectStore implements IObjectStore {
@@ -34,9 +35,8 @@ export declare class ComponentMetadataGenerator {
     private generateComplexOptionByType;
     private generateComplexOption;
     private getBaseComponentPath;
-    private getNewNestedClassname;
     private mergeNestedComponents;
-    private prepareComponentNestedOptionsMetadata;
+    private generateIMDComponentNestedOptions;
     private prepareCommonNestedOptionsMetadata;
     private writeNestedOptionsMetadata;
 }