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

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

@@ -46,6 +46,11 @@ import {
  *
  */
 
+const strStrictIncludes = (str, substr) => {
+  const substrRegExp = 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();
@@ -96,16 +101,15 @@ const checkDeprecatedEffort = (importStatements, deprecatedEffortMap, effortCach
     //  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
     const statementIsDeprecatedForSure =
-      effortsDifferentPackageList.findIndex((pck) => pck.includes(packageName)) !== -1;
+      effortsDifferentPackageList.findIndex((pck) => strStrictIncludes(pck, packageName)) !== -1;
     // when the deprecation is in the same package we need to check if the component itself is deprecated
     const statementIsPotentiallyDeprecated =
-      effortsSamePackageList.findIndex((pck) => pck.includes(packageName)) !== -1;
+      effortsSamePackageList.findIndex((pck) => strStrictIncludes(pck, packageName)) !== -1;
     let isStatementActuallyDeprecated = false;
     if (!statementIsDeprecatedForSure && statementIsPotentiallyDeprecated) {
       effortsSamePackageOldComponentsList.forEach((deprecatedComponent) => {
-        if (importedComponent.includes(deprecatedComponent)) {
-          isStatementActuallyDeprecated = true;
-        }
+        if (strStrictIncludes(importedComponent, deprecatedComponent)) return;
+        isStatementActuallyDeprecated = true;
       });
     }
     const statementIsDeprecated = statementIsDeprecatedForSure || isStatementActuallyDeprecated;
@@ -114,7 +118,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),
+        strStrictIncludes(importedComponent, effortMetainfo.component),
       );
       if (matchingEffortMetainfoIndx === -1) return;
       matchedEfforts.set(fullMatch, {
@@ -159,7 +163,7 @@ export const checkDeprecatedDismissed = (importStatements) => {
   importStatements.forEach((importStatement) => {
     const [fullMatch, importedComponent, packageName] = importStatement;
     const matchingEffortMetainfoIndx = DISMISSED_WITH_EXAMPLE.findIndex((effortMetainfo) =>
-      importedComponent.includes(effortMetainfo.component),
+      strStrictIncludes(importedComponent, effortMetainfo.component),
     );
     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.2",
   "license": "MIT",
   "description": "ICE MT - Dimsum - Code Mods",
   "files": [