Generate common modules reexports, remove deprecated ui folder rendering (#807)

Author: const314

package.json

@@ -13,7 +13,7 @@
     "@typescript-eslint/parser": "^4.33.0",
     "cpy-cli": "^3.1.1",
     "del-cli": "^3.0.1",
-    "devextreme-internal-tools": "^9.3.0",
+    "devextreme-internal-tools": "^9.4.0",
     "eslint": "^7.32.0",
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-config-airbnb-typescript": "^12.3.1",

packages/devextreme-react-generator/package.json

@@ -1,7 +1,7 @@
 {
   "author": "Developer Express Inc.",
   "name": "devextreme-react-generator",
-  "version": "1.3.6",
+  "version": "2.0.0",
   "description": "DevExtreme React UI and Visualization Components",
   "repository": {
     "type": "git",
@@ -27,7 +27,7 @@
   "license": "MIT",
   "dependencies": {
     "dasherize": "^2.0.0",
-    "devextreme-internal-tools": "^9.3.0",
+    "devextreme-internal-tools": "^9.4.0",
     "dot": "^1.1.3"
   },
   "devDependencies": {

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

@@ -0,0 +1,14 @@
+import { createTempate } from './template';
+
+const render: (model: { module: string, reexports: string[] }) => string = createTempate(`
+export {<#~ it.reexports :reExport #>
+    <#= reExport #>,<#~#>
+} from "devextreme/<#= it.module #>";
+`.trimStart());
+
+function generate(module: string, reexports: string[]): string {
+  const result = render({ module, reexports });
+  return result;
+}
+
+export default generate;

packages/devextreme-react-generator/src/component-generator.ts

@@ -102,16 +102,6 @@ function getIndent(indent: number) {
   return Array(indent * 2 + 1).join(' ');
 }
 
-const renderReExport: (model: { path: string, fileName: string }) => string = createTempate(
-  '/** @deprecated Use \'devextreme-react/<#= it.fileName #>\' file instead */\n'
-+ 'export * from "<#= it.path #>";\n'
-+ 'export { default } from "<#= it.path #>";\n',
-);
-
-function generateReExport(path: string, fileName: string): string {
-  return renderReExport({ path, fileName });
-}
-
 const renderObjectEntry: (model: {
   key: string;
   value: string;
@@ -619,5 +609,4 @@ export {
   IOption,
   ISubscribableOption,
   IPropTyping,
-  generateReExport,
 };

packages/devextreme-react-generator/src/generator.ts

@@ -1,9 +1,8 @@
-import { writeFileSync as writeFile } from 'fs';
+import { writeFileSync as writeFile, existsSync, mkdirSync } from 'fs';
 
 import {
   dirname as getDirName,
   join as joinPaths,
-  normalize as normalizePath,
   relative as getRelativePath,
   sep as pathSeparator,
 } from 'path';
@@ -19,9 +18,9 @@ import {
 
 import { convertTypes } from './converter';
 import generateIndex, { IReExport } from './index-generator';
+import generateCommonReexports from './common-reexports-generator';
 
 import generateComponent, {
-  generateReExport,
   IComponent,
   IIndependentEvents,
   INestedComponent,
@@ -239,6 +238,7 @@ function generate({
   components: { baseComponent, extensionComponent, configComponent },
   out,
   widgetsPackage,
+  generateReexports,
 }: {
   metaData: IModel,
   components: {
@@ -248,10 +248,10 @@ function generate({
   },
   out: {
     componentsDir: string,
-    oldComponentsDir: string,
     indexFileName: string
   },
-  widgetsPackage: string
+  widgetsPackage: string,
+  generateReexports?: boolean
 }): void {
   const modulePaths: IReExport[] = [];
   rawData.widgets.forEach((data) => {
@@ -271,18 +271,23 @@ function generate({
       name: widgetFile.component.name,
       path: `./${removeExtension(getRelativePath(indexFileDir, widgetFilePath)).replace(pathSeparator, '/')}`,
     });
-
-    writeFile(
-      joinPaths(out.oldComponentsDir, widgetFile.fileName),
-      generateReExport(
-        normalizePath(`./${removeExtension(getRelativePath(out.oldComponentsDir, widgetFilePath))}`)
-          .replace(pathSeparator, '/'),
-        removeExtension(widgetFile.fileName),
-      ),
-    );
   });
 
   writeFile(out.indexFileName, generateIndex(modulePaths), { encoding: 'utf8' });
+
+  if (generateReexports && rawData.commonReexports) {
+    const commonPath = joinPaths(out.componentsDir, 'common');
+    if (!existsSync(commonPath)) {
+      mkdirSync(commonPath);
+    }
+    Object.keys(rawData.commonReexports).forEach((key) => {
+      writeFile(
+        joinPaths(commonPath, `${key.replace('common/', '')}.ts`),
+        generateCommonReexports(key, rawData.commonReexports[key]),
+        { encoding: 'utf8' },
+      );
+    });
+  }
 }
 
 export default generate;

packages/devextreme-react/build.config.js

@@ -11,7 +11,6 @@ module.exports = {
   metadataPath: './metadata/integration-data.json',
   generatedComponentsDir: './src',
   coreComponentsDir: './src/core',
-  oldComponentsDir: './src/ui',
   indexFileName: './src/index.ts',
   baseComponent: './core/component',
   extensionComponent: './core/extension-component',

packages/devextreme-react/gulpfile.js

@@ -14,7 +14,6 @@ const generateSync = require('devextreme-react-generator').default;
 const GENERATE = 'generate';
 const CLEAN = 'clean';
 
-const OLD_OUTPUTDIR_CREATE = 'output-dir.create';
 const GEN_RUN = 'generator.run';
 
 const NPM_CLEAN = 'npm.clean';
@@ -29,10 +28,6 @@ gulp.task(CLEAN, (c) =>
   del([`${config.generatedComponentsDir}\\*`, `!${config.coreComponentsDir}`], c)
 );
 
-gulp.task(OLD_OUTPUTDIR_CREATE, (done) =>
-  mkdir(config.oldComponentsDir, {}, done)
-);
-
 gulp.task(GEN_RUN, (done) => {
   generateSync({
     metaData: JSON.parse(fs.readFileSync(config.metadataPath).toString()),
@@ -43,18 +38,17 @@ gulp.task(GEN_RUN, (done) => {
     },
     out: {
       componentsDir: config.generatedComponentsDir,
-      oldComponentsDir: config.oldComponentsDir,
       indexFileName: config.indexFileName
     },
-    widgetsPackage: 'devextreme'
+    widgetsPackage: 'devextreme',
+    generateReexports: true,
   });
 
   done();
 });
 
 gulp.task(GENERATE, gulp.series(
   CLEAN,
-  OLD_OUTPUTDIR_CREATE,
   GEN_RUN
 ));
 

packages/devextreme-react/package.json

@@ -35,7 +35,7 @@
     "@types/react-dom": "^16.9.16",
     "del": "^3.0.0",
     "devextreme": "23.1-next",
-    "devextreme-react-generator": "^1.3.0",
+    "devextreme-react-generator": "^2.0.0",
     "gulp": "^4.0.2",
     "jest": "^25.0.0",
     "react": "~18.0.0",