Merge pull request #269 from oceanbase/dengfuping-codemod

fix(codemod): should import ~@oceanbase/design/es/theme/index.less for existed token
oceanbase · Nov 7, 2023 · 30b2f58 · 30b2f58
2 parents e810269 + 6bd7b5a
commit 30b2f58
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 7 deletions.
diff --git a/...ges/codemod/transforms/__testfixtures__/less-to-token/obui-less-token-to-token.input.less b/...ges/codemod/transforms/__testfixtures__/less-to-token/obui-less-token-to-token.input.less
@@ -0,0 +1,8 @@
+@import '~@alipay/ob-ui/es/theme/index.less';
+
+.container {
+  color: @colorInfo;
+  background: @colorSuccess;
+  background-color: @colorWarning;
+  border-color: @colorError;
+}
diff --git a/...es/codemod/transforms/__testfixtures__/less-to-token/obui-less-token-to-token.output.less b/...es/codemod/transforms/__testfixtures__/less-to-token/obui-less-token-to-token.output.less
@@ -0,0 +1,7 @@
+@import '~@oceanbase/design/es/theme/index.less';
+.container {
+  color: @colorInfo;
+  background: @colorSuccess;
+  background-color: @colorWarning;
+  border-color: @colorError;
+}
diff --git a/packages/codemod/transforms/__tests__/less-to-token.test.ts b/packages/codemod/transforms/__tests__/less-to-token.test.ts
@@ -3,7 +3,13 @@ import path from 'path';
 import { transform } from '../less-to-token';
 
 const testUnit = 'less-to-token';
-const tests = ['antd-v4-less-to-token', 'obui-less-to-token', 'case-insensitive', 'mixin'];
+const tests = [
+  'antd-v4-less-to-token',
+  'obui-less-to-token',
+  'case-insensitive',
+  'mixin',
+  'obui-less-token-to-token',
+];
 
 describe(testUnit, () => {
   tests.forEach(test => {

diff --git a/packages/codemod/transforms/less-to-token.js b/packages/codemod/transforms/less-to-token.js
@@ -37,14 +37,18 @@ async function transform(file) {
   const { root: ast } = await postcss([]).process(content, {
     syntax: postcssLess,
   });
-  let modified = false;
+  let hasToken = false;
   let tokenLessImported = false;
   // 遍历 AST
   ast.walk(node => {
-    const { key, token, formattedValue } = tokenParse(node.value);
-    if (node.type === 'decl' && token) {
-      node.value = formattedValue.replace(key, `@${token}`);
-      modified = true;
+    if (node.type === 'decl') {
+      const { key, token, formattedValue } = tokenParse(node.value);
+      if (token) {
+        node.value = formattedValue.replace(key, `@${token}`);
+        hasToken = true;
+      } else if (node.value?.includes('@')) {
+        hasToken = true;
+      }
     } else if (node.type === 'atrule' && node.name === 'import') {
       if (node.params === "'~@oceanbase/design/es/theme/index.less'") {
         tokenLessImported = true;
@@ -54,7 +58,7 @@ async function transform(file) {
     }
   });
   // prepend @import '~@oceanbase/design/es/theme/index.less';
-  if (modified && !tokenLessImported) {
+  if (hasToken && !tokenLessImported) {
     ast.prepend({
       name: 'import',
       params: "'~@oceanbase/design/es/theme/index.less'",