@elliemae/ds-codemods 3.37.0-rc.1 → 3.37.0-rc.3

package/bin/cli/code-mods/command-logics/deprecated-components-usage-report/utils.mjs

@@ -46,6 +46,14 @@ import {
  *
  */
 
+const subStringAdhocDSMatcher = (str, substr) => {
+  if (str === substr) return true;
+  const substrRegExp = substr.startsWith('@elliemae/ds-')
+    ? new RegExp(`@\\belliemae\/ds-${substr.split('@elliemae/ds-')[1]}`, 'g')
+    : new RegExp(`\\b${substr}\\b`, 'g');
+  return str.match(substrRegExp) !== null;
+};
+
 // we generate some supporting data structures to make the matching more efficient from the existing constants...
 // we do this runtime because we want to avoid having to maintain this manually and this is a one time cost runtime wise with the cache...
 const runtimeDeprecatedDSReportCache = new Map();
@@ -93,19 +101,18 @@ const checkDeprecatedEffort = (importStatements, deprecatedEffortMap, effortCach
   importStatements.forEach((importStatement) => {
     const [fullMatch, importedComponent, packageName] = importStatement;
     // first we check if we need to care about this package at all
-    //  we do not care if the package is not in the list of packages that have small migration effort
-    // when the deprecation is in another package we know for sure that the statement is deprecated
+    //  we do not care if the package is not in the list of packages that are deprecated
+    // when the deprecated component and live components lives in different packages we know for sure that the statement is deprecated
     const statementIsDeprecatedForSure =
-      effortsDifferentPackageList.findIndex((pck) => pck.includes(packageName)) !== -1;
-    // when the deprecation is in the same package we need to check if the component itself is deprecated
+      effortsDifferentPackageList.findIndex((pck) => subStringAdhocDSMatcher(pck, packageName)) !== -1;
+    // when the new and old lives under the same package (E.G. tooltip -> tooltipv3 from ds-tooltip, buttonv2 -> buttonv3 from ds-button-v2 ...)
+    //  we need to check if the component itself is deprecated or not, just the "from ..." part is not enough
     const statementIsPotentiallyDeprecated =
-      effortsSamePackageList.findIndex((pck) => pck.includes(packageName)) !== -1;
+      effortsSamePackageList.findIndex((pck) => subStringAdhocDSMatcher(pck, packageName)) !== -1;
     let isStatementActuallyDeprecated = false;
     if (!statementIsDeprecatedForSure && statementIsPotentiallyDeprecated) {
       effortsSamePackageOldComponentsList.forEach((deprecatedComponent) => {
-        if (importedComponent.includes(deprecatedComponent)) {
-          isStatementActuallyDeprecated = true;
-        }
+        if (subStringAdhocDSMatcher(importedComponent, deprecatedComponent)) isStatementActuallyDeprecated = true;
       });
     }
     const statementIsDeprecated = statementIsDeprecatedForSure || isStatementActuallyDeprecated;
@@ -114,7 +121,7 @@ const checkDeprecatedEffort = (importStatements, deprecatedEffortMap, effortCach
       // we do this so we can reach the constant meta-informations (like the new package name, severityTags, etc...)
       // technically this is O(n * m) where n is ~<10 and m is ~<50 so even the worst case is not that bad...
       const matchingEffortMetainfoIndx = deprecatedEffortMap.findIndex((effortMetainfo) =>
-        importedComponent.includes(effortMetainfo.component),
+        subStringAdhocDSMatcher(importedComponent, effortMetainfo.component),
       );
       if (matchingEffortMetainfoIndx === -1) return;
       matchedEfforts.set(fullMatch, {
@@ -158,8 +165,11 @@ export const checkDeprecatedDismissed = (importStatements) => {
   const matchedEfforts = new Map();
   importStatements.forEach((importStatement) => {
     const [fullMatch, importedComponent, packageName] = importStatement;
-    const matchingEffortMetainfoIndx = DISMISSED_WITH_EXAMPLE.findIndex((effortMetainfo) =>
-      importedComponent.includes(effortMetainfo.component),
+    const matchingEffortMetainfoIndx = DISMISSED_WITH_EXAMPLE.findIndex(
+      (effortMetainfo) =>
+        subStringAdhocDSMatcher(importedComponent, effortMetainfo.component) &&
+        // {DSGroupBox} from 'ds-mobile' is not (yet) deprecated, DSGroupBox is a repeated component name, we need the extra package check
+        subStringAdhocDSMatcher(packageName, effortMetainfo.oldPackage),
     );
     if (matchingEffortMetainfoIndx === -1) return;
     matchedEfforts.set(fullMatch, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/ds-codemods",
-  "version": "3.37.0-rc.1",
+  "version": "3.37.0-rc.3",
   "license": "MIT",
   "description": "ICE MT - Dimsum - Code Mods",
   "files": [