Less reexports in index.ts (#1207)

* Change generation of reeхports on index.ts - to avoid collisions

Author: Igggr

packages/devextreme-angular-generator/spec/tests/metadata-generator.spec.js

@@ -210,7 +210,7 @@ describe("metadata-generator", function() {
         });
 
         it("should generate proper optionsTypeParams", function() {
-            expect(metas.DxTestWidget.optionsTypeParams).toBe(["T1", "T2"]);
+            expect(metas.DxTestWidget.optionsTypeParams).toEqual(["T1", "T2"]);
         });
 
         it("should detect editors", function() {

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

@@ -1,6 +1,7 @@
 import fs = require('fs');
 import path = require('path');
 import logger from './logger';
+import inflector = require('inflector-js');
 
 export default class FacadeGenerator {
     private _encoding = 'utf8';
@@ -10,17 +11,27 @@ export default class FacadeGenerator {
             let facadeConfig = config.facades[facadeFilePath],
                 resultContent = '';
 
-            resultContent += `export * from 'devextreme-angular/core'\n`;
-            resultContent += `export * from './ui/all'\n`;
+            resultContent += `export * from 'devextreme-angular/core';\n`;
+            resultContent += `export * from './ui/all';\n`;
             fs.readdirSync(facadeConfig.sourceDirectories[0])
                 .filter(fileName => fs.lstatSync(path.join(facadeConfig.sourceDirectories[0], fileName)).isFile())
                 .forEach(fileName => {
                     const { name } = path.parse(path.join(facadeConfig.sourceDirectories[0], fileName));
-                    resultContent += `export * from 'devextreme-angular/ui/${name}'\n`;
+                    const formattedName = formatName(name);
+                    const where = `'devextreme-angular/ui/${name}'`;
+                    resultContent += `export { Dx${formattedName}Component, Dx${formattedName}Module } from ${where};\n`;
                 });
 
             logger('Write result to ' + facadeFilePath);
             fs.writeFileSync(facadeFilePath, resultContent, { encoding: this._encoding });
         });
     }
 }
+
+
+function formatName(name: string): string {
+    if (!name.includes('-')) {
+        return inflector.camelize(name);
+    }
+    return name.split('-').map((n) => inflector.camelize(n)).join('');
+}

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

@@ -242,7 +242,7 @@ export default class DXComponentMetadataGenerator {
                 packageName: config.wrapperPackageName,
                 imports: buildImports(getValues(widget.Options), config.widgetPackageName),
                 nestedComponents: widgetNestedComponents,
-                optionsTypeParams: widget.OptionsTypeParams
+                optionsTypeParams: widget.OptionsTypeParams,
             };
 
             logger('Write metadata to file ' + outputFilePath);
@@ -327,12 +327,12 @@ export default class DXComponentMetadataGenerator {
         return result;
     }
 
-    private mergeArrayTypes(array1, array2) {
+    private mergeArrayTypes<T>(array1: T[], array2: T[]): T[] {
         let newTypes = array2.filter(type => array1.indexOf(type) === -1);
         return [].concat(array1, newTypes);
     }
 
-    private getExternalObjectInfo(metadata: Metadata, typeName) {
+    private getExternalObjectInfo(metadata: Metadata, typeName: string) {
         let externalObject = metadata.ExtraObjects[typeName];
 
         if (!externalObject) {
@@ -492,7 +492,7 @@ export default class DXComponentMetadataGenerator {
                 } else {
                     existingComponent.properties = existingComponent.properties
                         .concat(...component.properties)
-                        .reduce((properties, property) => {
+                        .reduce((properties: Property[], property) => {
                             if (properties.filter(p => p.name === property.name).length === 0) {
                                 properties.push(property);
                             } else {
@@ -515,7 +515,7 @@ export default class DXComponentMetadataGenerator {
 
                     existingComponent.events = existingComponent.events
                         .concat(...component.events)
-                        .reduce((events, event) => {
+                        .reduce((events: Event[], event) => {
                             if (events.filter(e => e.emit === event.emit).length === 0) {
                                 events.push(event);
                             }
@@ -535,7 +535,8 @@ export default class DXComponentMetadataGenerator {
             }, []);
 
         normalizedMetadata.forEach(component => {
-            component.collectionNestedComponents = component.collectionNestedComponents.reduce((result, nestedComponent) => {
+            component.collectionNestedComponents = component.collectionNestedComponents
+              .reduce((result: NestedComponent[], nestedComponent) => {
                 if (result.filter(c => nestedComponent.className === c.className).length === 0) {
                     result.push(nestedComponent);
                 }