@oceanbase/codemod 0.2.4 → 0.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oceanbase/codemod",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "Codemod for OceanBase Design upgrade",
   "keywords": [
     "oceanbase",
@@ -27,11 +27,11 @@
     "command-exists": "^1.2.9",
     "execa": "^5.1.1",
     "find-up": "^4.1.0",
-    "glob": "^8.0.3",
+    "glob": "^10.3.10",
     "is-directory": "^0.3.1",
     "is-git-clean": "^1.1.0",
     "jscodeshift": "^0.15.0",
-    "lodash": "^4.17.15",
+    "lodash": "^4.17.21",
     "prettier": "^3.0.3",
     "read-pkg-up": "^9.1.0",
     "semver": "^7.5.4",
@@ -41,8 +41,8 @@
   "devDependencies": {
     "@types/jest": "^29.5.5",
     "@types/jscodeshift": "^0.11.7",
-    "enzyme": "^3.0.0",
+    "enzyme": "^3.11.0",
     "enzyme-to-json": "^3.6.2"
   },
-  "gitHead": "38becd333620011d0d084df62b1131135a396abb"
+  "gitHead": "1138341df7a35d3d4939ccea79225ddf220de2cc"
 }

package/transforms/__testfixtures__/obui-to-oceanbase-design-and-ui/locale.input.js

@@ -0,0 +1,8 @@
+import enUS from '@alipay/ob-ui/es/locale/en-US';
+import zhCN from '@alipay/ob-ui/es/locale/zh-CN';
+
+const Demo = () => {
+  return <div />;
+};
+
+export default Demo;

package/transforms/__testfixtures__/obui-to-oceanbase-design-and-ui/locale.output.js

@@ -0,0 +1,8 @@
+import enUS from '@oceanbase/ui/es/locale/en-US';
+import zhCN from '@oceanbase/ui/es/locale/zh-CN';
+
+const Demo = () => {
+  return <div />;
+};
+
+export default Demo;

package/transforms/__testfixtures__/obui-to-oceanbase-design-and-ui/obui.input.js

@@ -1,5 +1,6 @@
 import React from 'react';
-import { Alert, Button, BasicLayout, Login, PageContainer } from '@alipay/ob-ui';
+import { Alert, Button, BackgroundTaskManager, BackgroundTaskManagerConstants, BasicLayout, Boundary, ConfigProvider, ContentWithQuestion, IconFont, Login, PageContainer, Ranger, theme, TreeSearch } from '@alipay/ob-ui';
+import type { BackgroundTaskManagerRef, ITaskMgrPreset, ITaskMgrQueue, TaskMgrID } from '@alipay/ob-ui';
 import type { BasicLayoutProps } from '@alipay/ob-ui/es/BasicLayout';
 import type { LoginProps } from '@alipay/ob-ui/es/Login';
 import type { PageContainerProps } from '@alipay/ob-ui/es/PageContainer';

package/transforms/__testfixtures__/obui-to-oceanbase-design-and-ui/obui.output.js

@@ -1,6 +1,7 @@
 import React from 'react';
-import { Alert, Button } from '@oceanbase/design';
-import { BasicLayout, Login, PageContainer } from '@oceanbase/ui';
+import { Alert, Button, ConfigProvider, theme } from '@oceanbase/design';
+import { BackgroundTaskManager, BackgroundTaskManagerConstants, BasicLayout, Boundary, ContentWithQuestion, IconFont, Login, PageContainer, Ranger, TreeSearch } from '@oceanbase/ui';
+import type { BackgroundTaskManagerRef, ITaskMgrPreset, ITaskMgrQueue, TaskMgrID } from '@oceanbase/ui';
 import type { BasicLayoutProps } from '@oceanbase/ui/es/BasicLayout';
 import type { LoginProps } from '@oceanbase/ui/es/Login';
 import type { PageContainerProps } from '@oceanbase/ui/es/PageContainer';

package/transforms/__tests__/obui-to-oceanbase-design-and-ui.test.ts

@@ -1,7 +1,7 @@
 import { defineTest } from 'jscodeshift/src/testUtils';
 
 const testUnit = 'obui-to-oceanbase-design-and-ui';
-const tests = ['obui'];
+const tests = ['obui', 'locale'];
 
 describe(testUnit, () => {
   tests.forEach(test =>

package/transforms/obui-to-oceanbase-design-and-ui.js

@@ -12,32 +12,62 @@ module.exports = (file, api, options) => {
           'PageContainer',
           'Action',
           'BackgroundTaskManager',
+          'BackgroundTaskManagerConstants',
           'BasicLayout',
           'BatchOperationBar',
           'Boundary',
           'ContentWithQuestion',
           'Dialog',
           'DocDialog',
+          'FullscreenBox',
+          'Highlight',
           'GraphToolbar',
+          'IconFont',
           'Login',
           'Lottie',
           'NavMenu',
+          'Password',
+          'Ranger',
+          'SideTip',
+          'TaskGraph',
+          'TreeSearch',
+          'Welcome',
         ],
         types: [
           'PageContainerProps',
           'ActionProps',
+          // BackgroundTaskManager
           'BackgroundTaskManagerProps',
+          'BackgroundTaskManagerRef',
+          'ITaskMgrPreset',
+          'ITaskMgrQueue',
+          'TaskMgrID',
           'BasicLayoutProps',
           'BatchOperationBarProps',
           'BoundaryProps',
           'ContentWithQuestionProps',
           'DialogProps',
           'DocDialogProps',
+          'FullscreenBoxProps',
           'GraphToolbarProps',
+          'HighlightProps',
+          'IconFontProps',
           'LoginProps',
           'LottieProps',
           'NavMenuProps',
+          'PasswordProps',
+          // Ranger
+          'RangerProps',
+          'QuickPickerProps',
+          'SideTipProps',
+          'TaskGraphProps',
+          // TreeSearch
+          'TreeSearchProps',
+          'TreeSearchRef',
+          'Node',
+          'WelcomeProps',
         ],
+        paths: ['/locale/', '/locale/'],
       },
       {
         name: '@oceanbase/design',

package/transforms/utils/config.js

@@ -1,6 +1,7 @@
 // https://github.com/benjamn/recast/blob/master/lib/options.ts
 const printOptions = {
   quote: 'single',
+  wrapColumn: 500,
 };
 
 module.exports = {

package/transforms/utils/import-component.js

@@ -3,6 +3,7 @@ const { markDependency } = require('./marker');
 const { printOptions } = require('./config');
 const { isPlainObject } = require('lodash');
 const { flatten } = require('lodash');
+const { some } = require('lodash');
 
 function importComponent(j, root, options) {
   const { fromPkgNames, toPkgList } = options;
@@ -19,15 +20,18 @@ function importComponent(j, root, options) {
       path.value.specifiers.forEach(specifier => {
         const toPkgByComponents = toPkgList.find(
           toPkg =>
-            toPkg.components?.includes(specifier.imported.name) ||
-            toPkg.components?.find(component => component[specifier.imported.name])
+            toPkg.components?.includes(specifier.imported?.name) ||
+            toPkg.components?.find(component => component[specifier.imported?.name])
         );
         const toPkgByTypes = toPkgList.find(
           toPkg =>
-            toPkg.types?.includes(specifier.imported.name) ||
-            toPkg.types?.find(type => type[specifier.imported.name])
+            toPkg.types?.includes(specifier.imported?.name) ||
+            toPkg.types?.find(type => type[specifier.imported?.name])
         );
-        const toPkg = toPkgByComponents || toPkgByTypes;
+        const toPkgByPaths = toPkgList.find(toPkg =>
+          some(toPkg.paths, pathString => path.value.source.value?.includes(pathString))
+        );
+        const toPkg = toPkgByComponents || toPkgByTypes || toPkgByPaths;
         if (toPkg) {
           // replace to toPkg for xxx/es/xxx、xxx/lib/xxx
           if (new RegExp(`${fromPkgName}/(es|lib|locale)/`).test(path.value.source.value)) {
@@ -35,17 +39,17 @@ function importComponent(j, root, options) {
           } else {
             // remove old imports
             path.value.specifiers = path.value.specifiers.filter(
-              item => !item.imported || item.imported.name !== specifier.imported.name
+              item => !item.imported || item.imported?.name !== specifier.imported?.name
             );
             const renameComponent = toPkg.components?.find(
-              component => component[specifier.imported.name]
+              component => component[specifier.imported?.name]
             );
-            const renameType = toPkg.types?.find(type => type[specifier.imported.name]);
+            const renameType = toPkg.types?.find(type => type[specifier.imported?.name]);
             const rename = renameComponent || renameType;
             // add and rename new imports
             addSubmoduleImport(j, root, {
               moduleName: toPkg.name,
-              importedName: rename ? rename[specifier.imported.name] : specifier.imported.name,
+              importedName: rename ? rename[specifier.imported?.name] : specifier.imported?.name,
               importKind: toPkgByTypes ? 'type' : 'value',
               after: fromPkgName,
             });
@@ -53,10 +57,10 @@ function importComponent(j, root, options) {
             if (rename) {
               root
                 .find(j.Identifier, {
-                  name: specifier.imported.name,
+                  name: specifier.imported?.name,
                 })
                 .forEach(path => {
-                  path.node.name = rename[specifier.imported.name];
+                  path.node.name = rename[specifier.imported?.name];
                 });
             }
           }

package/transforms/utils/index.js

@@ -138,7 +138,9 @@ function addModuleImport(j, root, { pkgName, importSpecifier, importKind, before
 
           return a.imported.name.localeCompare(b.imported.name);
         });
-        return j.importDeclaration(mergedImportSpecifiers, j.literal(pkgName));
+        const importStatement = j.importDeclaration(mergedImportSpecifiers, j.literal(pkgName));
+        importStatement.importKind = importKind;
+        return importStatement;
       });
     return true;
   }