Generate reexports in components (#1352)

Author: const314

package.json

@@ -23,7 +23,7 @@
   "author": "Developer Express Inc.",
   "license": "MIT",
   "devDependencies": {
-    "devextreme-internal-tools": "^9.4.2",
+    "devextreme-internal-tools": "^10.0.0-beta.2",
     "gulp": "^4.0.2",
     "gulp-tslint": "^7.1.0",
     "lerna": "^3.22.1",

packages/devextreme-angular-generator/package.json

@@ -1,7 +1,7 @@
 {
   "author": "Developer Express Inc.",
   "name": "devextreme-angular-generator",
-  "version": "1.2.1",
+  "version": "2.0.0",
   "description": "Angular UI and visualization components based on DevExtreme widgets",
   "repository": {
     "type": "git",

packages/devextreme-angular-generator/src/common-reexports-generator.ts

@@ -5,7 +5,7 @@ import { createTemplateFromString } from './dot-generator';
 const render: (model: { module: string, reexports: string[] }) => string = createTemplateFromString(`
 export {<#~ it.reexports :reExport #>
     <#= reExport #>,<#~#>
-} from "devextreme/<#= it.module #>";
+} from 'devextreme/<#= it.module #>';
 `.trimLeft());
 
 export default class CommonReexportsGenerator {

packages/devextreme-angular-generator/src/metadata-generator.ts

@@ -125,6 +125,10 @@ export class FSObjectStore implements IObjectStore {
     }
 }
 
+interface Reexports {
+    renderReexports?: boolean;
+}
+
 export default class DXComponentMetadataGenerator {
     constructor(private _store?: IObjectStore) {
         if (!this._store) {
@@ -226,7 +230,9 @@ export default class DXComponentMetadataGenerator {
                     return result;
                 }, []);
 
-            const widgetMetadata: WidgetComponent & File = {
+            const containsReexports = !!widget.Reexports?.filter((r) => r !== 'default').length;
+
+            const widgetMetadata: WidgetComponent & File & Reexports = {
                 docID: widget.DocID,
                 isDeprecated: widget.IsDeprecated,
                 className: className,
@@ -243,6 +249,7 @@ export default class DXComponentMetadataGenerator {
                 imports: buildImports(getValues(widget.Options), config.widgetPackageName),
                 nestedComponents: widgetNestedComponents,
                 optionsTypeParams: widget.OptionsTypeParams,
+                renderReexports: config.generateReexports && containsReexports,
             };
 
             logger('Write metadata to file ' + outputFilePath);
@@ -563,10 +570,10 @@ export default class DXComponentMetadataGenerator {
 
                 return result;
             }, [])
-            .forEach(componet => {
+            .forEach(component => {
                 let outputFilePath = path.join(config.outputFolderPath,
-                    config.nestedPathPart, config.basePathPart, componet.path + '.json');
-                this._store.write(outputFilePath, normalizeMeta(componet));
+                    config.nestedPathPart, config.basePathPart, component.path + '.json');
+                this._store.write(outputFilePath, normalizeMeta(component));
             });
 
         interface NestedComponentFile {
@@ -596,15 +603,15 @@ export default class DXComponentMetadataGenerator {
 
                 return component;
             })
-            .forEach(componet => {
-                let outputFilePath = path.join(config.outputFolderPath, config.nestedPathPart, componet.path + '.json');
-                this._store.write(outputFilePath, normalizeMeta(componet));
+            .forEach(component => {
+                let outputFilePath = path.join(config.outputFolderPath, config.nestedPathPart, component.path + '.json');
+                this._store.write(outputFilePath, normalizeMeta(component));
             });
     }
 }
 
-function normalizeMeta(meta: Container & File): Container & File {
-    const result: Container & File = {
+function normalizeMeta(meta: Container & File & Reexports): Container & File & Reexports {
+    const result: Container & File & Reexports = {
         ...meta,
         properties: meta.properties && meta.properties.map(({option, ...rest}) => ({ ...rest })),
         events: meta.events && meta.events.map(({option, ...rest}) => ({ ...rest }))
@@ -614,6 +621,6 @@ function normalizeMeta(meta: Container & File): Container & File {
         result.imports = undefined;
         delete result.imports;
     }
-
+    logger(result);
     return result;
 }

packages/devextreme-angular-generator/src/metadata-model.ts

@@ -45,6 +45,7 @@ export interface Metadata {
                 [optionName: string]: Option;
             };
             OptionsTypeParams: string[];
+            Reexports: string[];
         }
     };
     ExtraObjects: any[];

packages/devextreme-angular-generator/src/templates/component.tst

@@ -246,3 +246,8 @@ export class <#= it.className #>Component extends <#= baseClass #> <#? implement
   ]
 })
 export class <#= it.className #>Module { }
+<#? it.renderReexports #>
+import type * as <#= it.className #>Types from "<#= it.module #>_types";
+export { <#= it.className #>Types };
+<#?#>
+

packages/devextreme-angular/build.config.js

@@ -8,7 +8,8 @@ module.exports = {
             nestedPathPart: 'nested',
             basePathPart: 'base',
             widgetPackageName: "devextreme",
-            wrapperPackageName: 'devextreme-angular'
+            wrapperPackageName: 'devextreme-angular',
+            generateReexports: true,
         },
         componentGenerator: {
             importFrom: 'devextreme-angular-generator/dist/dot-generator',

packages/devextreme-angular/package.json

@@ -38,8 +38,8 @@
     "core-js": "^2.6.12",
     "del": "^2.2.2",
     "devextreme": "23.1-next",
-    "devextreme-angular-generator": "^1.0.0",
-    "devextreme-internal-tools": "^9.4.2",
+    "devextreme-angular-generator": "^2.0.0",
+    "devextreme-internal-tools": "^10.0.0-beta.2",
     "gulp": "^4.0.2",
     "gulp-header": "^1.8.12",
     "gulp-replace": "^0.6.1",