devextreme-internal-tools 12.0.0-beta.4 → 12.0.0-beta.6

package/bin/DevExtreme.Declarations.Discoverer.runtimeconfig.json

@@ -1,12 +1,12 @@
-{
-  "runtimeOptions": {
-    "tfm": "net6.0",
-    "framework": {
-      "name": "Microsoft.NETCore.App",
-      "version": "6.0.0"
-    },
-    "configProperties": {
-      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
-    }
-  }
+{
+  "runtimeOptions": {
+    "tfm": "net6.0",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "6.0.0"
+    },
+    "configProperties": {
+      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
+    }
+  }
 }

package/bin/DevExtreme.Declarations.IntegrityValidator.runtimeconfig.json

@@ -1,12 +1,12 @@
-{
-  "runtimeOptions": {
-    "tfm": "net6.0",
-    "framework": {
-      "name": "Microsoft.NETCore.App",
-      "version": "6.0.0"
-    },
-    "configProperties": {
-      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
-    }
-  }
+{
+  "runtimeOptions": {
+    "tfm": "net6.0",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "6.0.0"
+    },
+    "configProperties": {
+      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
+    }
+  }
 }

package/bin/DevExtreme.Descriptions.Injector.runtimeconfig.json

@@ -1,12 +1,12 @@
-{
-  "runtimeOptions": {
-    "tfm": "net6.0",
-    "framework": {
-      "name": "Microsoft.NETCore.App",
-      "version": "6.0.0"
-    },
-    "configProperties": {
-      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
-    }
-  }
+{
+  "runtimeOptions": {
+    "tfm": "net6.0",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "6.0.0"
+    },
+    "configProperties": {
+      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
+    }
+  }
 }

package/bin/DevExtreme.IntegrationDataGenerator.runtimeconfig.json

@@ -1,12 +1,12 @@
-{
-  "runtimeOptions": {
-    "tfm": "net6.0",
-    "framework": {
-      "name": "Microsoft.NETCore.App",
-      "version": "6.0.0"
-    },
-    "configProperties": {
-      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
-    }
-  }
+{
+  "runtimeOptions": {
+    "tfm": "net6.0",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "6.0.0"
+    },
+    "configProperties": {
+      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
+    }
+  }
 }

package/bin/DevExtreme.NgSmdGenerator.runtimeconfig.json

@@ -1,12 +1,12 @@
-{
-  "runtimeOptions": {
-    "tfm": "net6.0",
-    "framework": {
-      "name": "Microsoft.NETCore.App",
-      "version": "6.0.0"
-    },
-    "configProperties": {
-      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
-    }
-  }
+{
+  "runtimeOptions": {
+    "tfm": "net6.0",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "6.0.0"
+    },
+    "configProperties": {
+      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
+    }
+  }
 }

package/bin/DevExtreme.StrongMetaDataGenerator.runtimeconfig.json

@@ -1,12 +1,12 @@
-{
-  "runtimeOptions": {
-    "tfm": "net6.0",
-    "framework": {
-      "name": "Microsoft.NETCore.App",
-      "version": "6.0.0"
-    },
-    "configProperties": {
-      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
-    }
-  }
+{
+  "runtimeOptions": {
+    "tfm": "net6.0",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "6.0.0"
+    },
+    "configProperties": {
+      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
+    }
+  }
 }

package/bin/DevExtreme.Topics.ExtraFilesGenerator.runtimeconfig.json

@@ -1,12 +1,12 @@
-{
-  "runtimeOptions": {
-    "tfm": "net6.0",
-    "framework": {
-      "name": "Microsoft.NETCore.App",
-      "version": "6.0.0"
-    },
-    "configProperties": {
-      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
-    }
-  }
+{
+  "runtimeOptions": {
+    "tfm": "net6.0",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "6.0.0"
+    },
+    "configProperties": {
+      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
+    }
+  }
 }

package/bin/DevExtreme.Topics.Generator.runtimeconfig.json

@@ -1,12 +1,12 @@
-{
-  "runtimeOptions": {
-    "tfm": "net6.0",
-    "framework": {
-      "name": "Microsoft.NETCore.App",
-      "version": "6.0.0"
-    },
-    "configProperties": {
-      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
-    }
-  }
+{
+  "runtimeOptions": {
+    "tfm": "net6.0",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "6.0.0"
+    },
+    "configProperties": {
+      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
+    }
+  }
 }

package/bin/DevExtreme.Topics.ModulesGuideValidator.runtimeconfig.json

@@ -1,12 +1,12 @@
-{
-  "runtimeOptions": {
-    "tfm": "net6.0",
-    "framework": {
-      "name": "Microsoft.NETCore.App",
-      "version": "6.0.0"
-    },
-    "configProperties": {
-      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
-    }
-  }
+{
+  "runtimeOptions": {
+    "tfm": "net6.0",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "6.0.0"
+    },
+    "configProperties": {
+      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
+    }
+  }
 }

package/bin/DevExtreme.Topics.Validation.runtimeconfig.json

@@ -1,12 +1,12 @@
-{
-  "runtimeOptions": {
-    "tfm": "net6.0",
-    "framework": {
-      "name": "Microsoft.NETCore.App",
-      "version": "6.0.0"
-    },
-    "configProperties": {
-      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
-    }
-  }
+{
+  "runtimeOptions": {
+    "tfm": "net6.0",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "6.0.0"
+    },
+    "configProperties": {
+      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
+    }
+  }
 }

package/bin/DevExtreme.WebSite.ContentMapCreator.runtimeconfig.json

@@ -1,12 +1,12 @@
-{
-  "runtimeOptions": {
-    "tfm": "net6.0",
-    "framework": {
-      "name": "Microsoft.NETCore.App",
-      "version": "6.0.0"
-    },
-    "configProperties": {
-      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
-    }
-  }
+{
+  "runtimeOptions": {
+    "tfm": "net6.0",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "6.0.0"
+    },
+    "configProperties": {
+      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
+    }
+  }
 }

package/bin/DevExtreme.WebSite.LinksConverter.runtimeconfig.json

@@ -1,12 +1,12 @@
-{
-  "runtimeOptions": {
-    "tfm": "net6.0",
-    "framework": {
-      "name": "Microsoft.NETCore.App",
-      "version": "6.0.0"
-    },
-    "configProperties": {
-      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
-    }
-  }
+{
+  "runtimeOptions": {
+    "tfm": "net6.0",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "6.0.0"
+    },
+    "configProperties": {
+      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
+    }
+  }
 }

package/bin/DevExtreme.WebSite.SyntaxDataGenerator.runtimeconfig.json

@@ -1,12 +1,12 @@
-{
-  "runtimeOptions": {
-    "tfm": "net6.0",
-    "framework": {
-      "name": "Microsoft.NETCore.App",
-      "version": "6.0.0"
-    },
-    "configProperties": {
-      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
-    }
-  }
+{
+  "runtimeOptions": {
+    "tfm": "net6.0",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "6.0.0"
+    },
+    "configProperties": {
+      "System.Reflection.Metadata.MetadataUpdater.IsSupported": false
+    }
+  }
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "devextreme-internal-tools",
   "description": "DevExtreme internal tools",
   "author": "Developer Express Inc.",
-  "version": "12.0.0-beta.4",
+  "version": "12.0.0-beta.6",
   "license": "MIT",
   "main": "./index.js",
   "bin": {
@@ -36,30 +36,23 @@
     "deepmerge": "4.3.1",
     "dot": "1.1.3",
     "inflector-js": "1.0.1",
-    "logform": "2.4.2",
     "mkdirp": "3.0.1",
     "prettier": "2.3.2",
     "shelljs": "^0.8.3",
     "typescript": "5.1.6",
-    "winston": "~3.4.0",
+    "winston": "~3.10.0",
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@types/jest": "29.5.4",
-    "@types/node": "13.13.52",
-    "@types/shelljs": "0.8.12",
-    "@typescript-eslint/eslint-plugin": "5.62.0",
-    "@typescript-eslint/parser": "5.62.0",
+    "@types/jest": "29.5.5",
+    "@types/node": "18.18.3",
+    "@types/shelljs": "0.8.13",
     "eslint": "7.32.0",
-    "eslint-config-airbnb-typescript": "12.3.1",
     "eslint-config-devextreme": "0.1.41",
-    "eslint-plugin-import": "2.28.1",
-    "eslint-plugin-jsx-a11y": "6.7.1",
     "eslint-plugin-node": "11.1.0",
-    "eslint-plugin-react": "7.33.2",
     "fs": "0.0.1-security",
     "jest": "29.7.0",
-    "nodemon": "2.0.22",
+    "nodemon": "3.0.1",
     "path": "0.12.7",
     "ts-jest": "29.1.1"
   }

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

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DotGenerator = exports.createTemplateFromString = void 0;
 var fs = require("fs");
@@ -6,19 +17,8 @@ var path = require("path");
 var mkdirp = require("mkdirp");
 var doT = require("dot");
 var logger_1 = require("./logger");
-doT.templateSettings = {
-    evaluate: /\<#([\s\S]+?)#\>/g,
-    interpolate: /\<#=([\s\S]+?)#\>/g,
-    encode: /\<#!([\s\S]+?)#\>/g,
-    use: /\<##([\s\S]+?)#\>/g,
-    define: /\<###\s*([\w\.$]+)\s*(\:|=)([\s\S]+?)##\>/g,
-    conditional: /\<#\?(\?)?\s*([\s\S]*?)\s*#\>/g,
-    iterate: /\<#~\s*(?:#\>|([\s\S]+?)\s*\:\s*([\w$]+)\s*(?:\:\s*([\w$]+))?\s*#\>)/g,
-    varname: 'it',
-    strip: false,
-    append: true,
-    selfcontained: false,
-};
+var template_1 = require("../components-generation/template");
+doT.templateSettings = __assign({ append: true, selfcontained: false }, template_1.commonTemplateSettings);
 function createTemplateFromString(templateString) {
     return doT.template(templateString);
 }

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":"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"}

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

@@ -5,6 +5,7 @@ var fs = require("fs");
 var path = require("path");
 var inflector = require("inflector-js");
 var logger_1 = require("./logger");
+var reexports_generator_1 = require("../components-generation/reexports-generator");
 var FacadeGenerator = (function () {
     function FacadeGenerator() {
         this.encoding = 'utf8';
@@ -20,15 +21,19 @@ var FacadeGenerator = (function () {
             config.commonImports.forEach(function (i) {
                 resultContent += "import '".concat(i, "';\n");
             });
-            fs.readdirSync(facadeConfig.sourceDirectories[0])
+            var reexports = fs.readdirSync(facadeConfig.sourceDirectories[0])
                 .filter(function (fileName) { return fs
                 .lstatSync(path.join(facadeConfig.sourceDirectories[0], fileName))
-                .isFile(); }).forEach(function (fileName) {
+                .isFile(); })
+                .map(function (fileName) {
                 var name = path.parse(path.join(facadeConfig.sourceDirectories[0], fileName)).name;
                 var formattedName = formatName(name);
-                var where = "'devextreme-angular/ui/".concat(name, "'");
-                resultContent += "export { Dx".concat(formattedName, "Component, Dx").concat(formattedName, "Module } from ").concat(where, ";\n");
+                return {
+                    names: ["Dx".concat(formattedName, "Component"), "Dx".concat(formattedName, "Module")],
+                    path: "devextreme-angular/ui/".concat(name),
+                };
             });
+            resultContent += (0, reexports_generator_1.default)(reexports, { quotes: 'single' });
             (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;IAAA;QACU,aAAQ,GAAmB,MAAM,CAAC;IA6B5C,CAAC;IA3BC,kCAAQ,GAAR,UAAS,MAAM;QAAf,iBA0BC;QAzBC,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,EAAE,CAAC,WAAW,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;iBAC9C,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,CAAC,OAAO,CAAC,UAAC,QAAQ;gBACpB,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;gBACvC,IAAM,KAAK,GAAG,iCAA0B,IAAI,MAAG,CAAC;gBAChD,aAAa,IAAI,qBAAc,aAAa,0BAAgB,aAAa,2BAAiB,KAAK,QAAK,CAAC;YACvG,CAAC,CAAC,CAAC;YAEL,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,AA9BD,IA8BC;AA9BY,0CAAe;AAgC5B,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,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"}

package/ts/angular-components-generator/templates/component.tst

@@ -3,7 +3,9 @@
 var collectionProperties = it.properties.filter(item => item.isCollection).map(item => item.name);
 var collectionNestedComponents = it.nestedComponents.filter(item => item.isCollection && item.root);
 var baseClass = it.isExtension ? 'DxComponentExtension' : 'DxComponent';
-var reExportExplicitTypes = it.optionsTypeParams && it.optionsTypeParams.length;
+var optionsHaveTypeParams = it.optionsTypeParams && it.optionsTypeParams.length;
+var componentTypeParams = optionsHaveTypeParams ? '<' + it.optionsTypeParams.map(item => item + ' = any').join(', ') + '>' : '';
+var instanceTypeParams = optionsHaveTypeParams ? '<' + it.optionsTypeParams.join(', ') + '>' : '';
 
 var implementedInterfaces = ['OnDestroy'];
 
@@ -37,7 +39,7 @@ import {
     QueryList<#?#>
 } from '@angular/core';
 
-<#? reExportExplicitTypes #>export { ExplicitTypes } from '<#= it.module #>';
+<#? optionsHaveTypeParams #>export { ExplicitTypes } from '<#= it.module #>';
 <#?#>
 <#? it.imports #><#~ it.imports :file #>import <#= file.importString #> from '<#= file.path #>';
 <#~#><#?#>
@@ -88,8 +90,8 @@ const CUSTOM_VALUE_ACCESSOR_PROVIDER = {
         IterableDifferHelper<#?#>
     ]
 })
-export class <#= it.className #>Component extends <#= baseClass #> <#? implementedInterfaces.length #>implements <#= implementedInterfaces.join(', ') #> <#?#>{
-    instance: <#= it.className #>;
+export class <#= it.className #>Component<#= componentTypeParams #> extends <#= baseClass #> <#? implementedInterfaces.length #>implements <#= implementedInterfaces.join(', ') #> <#?#>{
+    instance: <#= it.className #><#= instanceTypeParams #>;
 <#~ it.properties :prop:i #>
     /**
      * [descr:<#= prop.docID #>]

package/ts/components-generation/reexports-generator.d.ts

@@ -0,0 +1,10 @@
+interface IReExport {
+    names: string[];
+    path: string;
+}
+declare function generate(reexports: IReExport[], { multiline, quotes }?: {
+    multiline?: boolean;
+    quotes?: 'single' | 'double';
+}): string;
+export default generate;
+export { IReExport, };

package/ts/components-generation/reexports-generator.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var template_1 = require("./template");
+var render = (0, template_1.createTemplate)("<#~ it.reexports :reExport #>export {"
+    + "<#? it.multiline #>"
+    + "<#~ reExport.names: name #>".concat(template_1.L2, "<#= name #>") + ","
+    + "<#~#>"
+    + "\n"
+    + '<#??#>'
+    + ' ' + "<#= reExport.names.join(', ') #>" + ' '
+    + '<#?#>'
+    + "} from <#= it.quotesChar #><#= reExport.path #><#= it.quotesChar #>;\n<#~#>\n".trim());
+function generate(reexports, _a) {
+    var _b = _a === void 0 ? {} : _a, _c = _b.multiline, multiline = _c === void 0 ? false : _c, _d = _b.quotes, quotes = _d === void 0 ? 'double' : _d;
+    return render({ reexports: reexports, multiline: multiline, quotesChar: quotes === 'single' ? "'" : "\"" });
+}
+exports.default = generate;
+//# sourceMappingURL=reexports-generator.js.map

package/ts/components-generation/reexports-generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reexports-generator.js","sourceRoot":"","sources":["../../../ts/components-generation/reexports-generator.ts"],"names":[],"mappings":";;AAAA,uCAAgD;AAYhD,IAAM,MAAM,GAIG,IAAA,yBAAc,EAC7B,uCAAuC;MAErC,qBAAqB;MACnB,qCAA8B,aAAE,gBAAa,GAAG,GAAG;MACnD,OAAO;MACP,IAAI;MACN,QAAQ;MACN,GAAG,GAAG,kCAAkC,GAAG,GAAG;MAChD,OAAO;MAEP,+EAED,CAAC,IAAI,EAAE,CAAC,CAAC;AAOV,SAAS,QAAQ,CACf,SAAsB,EACtB,EAAoG;QAApG,qBAAkG,EAAE,KAAA,EAAlG,iBAAiB,EAAjB,SAAS,mBAAG,KAAK,KAAA,EAAE,cAAiB,EAAjB,MAAM,mBAAG,QAAQ,KAAA;IAGtC,OAAO,MAAM,CAAC,EAAE,SAAS,WAAA,EAAE,SAAS,WAAA,EAAE,UAAU,EAAE,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAG,EAAE,CAAC,CAAC;AACvF,CAAC;AAED,kBAAe,QAAQ,CAAC"}