@ukic/codemod 1.0.0-alpha.2 → 1.0.0-alpha.3

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.0.0-alpha.3](https://github.com/mi6/ic-ui-kit/compare/@ukic/codemod@1.0.0-alpha.2...@ukic/codemod@1.0.0-alpha.3) (2025-02-05)
+
+### Features
+
+- **codemod:** added json data and combine both versions of data for component serach ([0faeee1](https://github.com/mi6/ic-ui-kit/commit/0faeee11b54c4582c3a6b2d0186372ae16afa447))
+
 # [1.0.0-alpha.2](https://github.com/mi6/ic-ui-kit/compare/@ukic/codemod@1.0.0-alpha.1...@ukic/codemod@1.0.0-alpha.2) (2025-01-24)
 
 **Note:** Version bump only for package @ukic/codemod

package/README.md

@@ -29,17 +29,14 @@ This package will be usable as an executable requiring a directory and optional
 ```
 
 ### Examples:
+With tests
 ```console
 - npx @ukic/codemod --dir ./#path/app/src/components --test true
 ```
-
-or run locally via 
-
+Without tests
 ```console
-- npm @ukic/codemod 
-- cd to codemod files
-- node ./codemod --dir ./#path/app/src/components --test false
-```  
+- npx @ukic/codemod --dir ./#path/app/src/components
+```
 
 ## Contributing
 

package/codemod.js

@@ -34,7 +34,6 @@ const main = async (path, test = false) => {
   const files = await searchDirectory(path);
   files.forEach((file) => {
     const linesArray = readFileLinesToArray(file);
-    const isReact = file.includes(".tsx") || file.includes(".jsx");
     if (test && (file.includes(".spec.") || file.includes(".test."))) {
       const changedFile = simpleTestComparison(linesArray, [
         ...htmlData,
@@ -46,20 +45,11 @@ const main = async (path, test = false) => {
           console.log(`${file.split("\\").slice(-1)} modified successfully`);
         });
       }
-    }
-    if (file.includes(`.cy.`)) {
-      const changedFile = compareComponent(linesArray, htmlData);
-      if (changedFile !== linesArray) {
-        fs.writeFile(file, changedFile, (err) => {
-          if (err) return console.log(err);
-          console.log(`${file.split("\\").slice(-1)} modified successfully`);
-        });
-      }
     } else {
-      const changedComponentFile = compareComponent(
-        linesArray,
-        isReact ? reactData : htmlData
-      );
+      const changedComponentFile = compareComponent(linesArray, [
+        ...htmlData,
+        ...reactData,
+      ]);
       if (changedComponentFile !== linesArray) {
         fs.writeFile(file, String(changedComponentFile), (err) => {
           if (err) return console.log(err);

package/data/changes.js

@@ -6,22 +6,28 @@ export default [
     type: "prop",
   },
   {
-    v2Name: "small",
+    v2Name: `small\\b[^'"]`,
     v3Name: 'size="small"',
     componentsAffected: "ic-select",
     type: "absolute",
   },
   {
-    v2Name: 'size="default"',
+    v2Name: `size=[{]?["']default['"][}]?`,
     v3Name: 'size="medium"',
     componentsAffected: "ic-status-tag",
-    type: "prop",
+    type: "absolute",
+  },
+  {
+    v2Name: `size=[{]?["']default['"][}]?`,
+    v3Name: 'size="medium"',
+    componentsAffected: "ic-dialog",
+    type: "absolute",
   },
   {
-    v2Name: 'size="default"',
+    v2Name: `size=[{]?["']default['"][}]?`,
     v3Name: 'size="medium"',
     componentsAffected: "ic-switch",
-    type: "prop",
+    type: "absolute",
   },
   {
     v2Name: "group-title",

package/data/reactChanges.js

@@ -6,7 +6,7 @@ export default [
     type: "prop",
   },
   {
-    v2Name: "small",
+    v2Name: `small\\b[^'"]`,
     v3Name: "size={'small'}",
     componentsAffected: "IcSelect",
     type: "absolute",
@@ -18,16 +18,22 @@ export default [
     type: "prop",
   },
   {
-    v2Name: "size={'default'}",
+    v2Name: `size=[{]?["']default['"][}]?`,
     v3Name: "size={'medium'}",
     componentsAffected: "IcStatusTag",
-    type: "prop",
+    type: "absolute",
   },
   {
-    v2Name: "size={'default'}",
+    v2Name: `size=[{]?["']default['"][}]?`,
     v3Name: "size={'medium'}",
     componentsAffected: "IcSwitch",
-    type: "prop",
+    type: "absolute",
+  },
+  {
+    v2Name: `size=[{]?["']default['"][}]?`,
+    v3Name: "size={'medium'}",
+    componentsAffected: "IcDialog",
+    type: "absolute",
   },
   {
     v2Name: "groupTitle",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukic/codemod",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.3",
   "description": "Codemod tool to help assist users upgrading from v2 to v3 of the UKIC design system",
   "bin": "./codemod.js",
   "author": "mi6",
@@ -19,5 +19,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "aadff337c20cb1dee5e221f7e88179dc8242789e"
+  "gitHead": "c4ead3a55cd2fcb22af6e0e92a46f99c89cb194f"
 }

package/sections/component-changes.js

@@ -33,8 +33,12 @@ export function compareComponent(stringArray, jsonData) {
           if (newProp.type === "absolute") {
             const regex = generateRegex(newProp.v2Name, "absolute-props");
             const exactMatch = String(newComponent).match(regex);
-            if (exactMatch)
-              newComponent = newComponent.replace(prop, newProp.v3Name);
+            if (exactMatch) {
+              newComponent = newComponent.replace(
+                exactMatch[0],
+                newProp.v3Name
+              );
+            }
           } else newComponent = newComponent.replace(prop, newProp.v3Name);
         });
         fileString = fileString.replace(component, newComponent);

package/sections/generate-regex.js

@@ -8,15 +8,15 @@
 function generateRegex(component, style) {
   switch (style) {
     case "prop":
-      return new RegExp(`<${component}([^>]+)>`, "gm");
+      return new RegExp(`<${component}[^\/|<]+`, "gm");
     case "component":
       return new RegExp(`${component}\\W`, "gm");
     case "web-component":
       return new RegExp(`${component}\\b[^-]`, "gm");
     case "absolute":
-      return new RegExp(`<${component}([^>]+)>`, "gm");
+      return new RegExp(`<${component}[^\/|<]+`, "gm");
     case "absolute-props":
-      return new RegExp(`${component}\\b[^'"]`, "gm");
+      return new RegExp(`${component}`, "gm");
     case "test-simple":
       return new RegExp(`[[.]${component}\\b`, "gm");
   }