@elliemae/ds-codemods 3.0.0-next.49 → 3.0.0-next.52

package/bin/cli/code-mods/command-logics/help-migrate-to-v3/constants.js

@@ -278,7 +278,7 @@ export const COMPONENT_MAP = {
 // E.G. 2
 //    import { DSAccordion, DSAccordionItem} from '@elliemae/ds-accordion'
 //      catches:   [] ( because @elliemae\/ds-basic is never matched )
-//                  https://regex101.com/r/T2CzCJ/1
+//                  https://regex101.com/r/vcwW0S/1
 export const problematicImportRegexp =
   // /(?<=(import))(((?!import).)*?)(?<=(\s?from\s)?)(['"]@elliemae\/ds-basic(\/\S+)?['"])/gms;
-  /(import)\s?((?:(?!import).)*?)(\s?from\s)(['"]@elliemae\/ds-basic(\/\S+)?['"])/gms;
+  /(import)\s?((?:(?!import).)*?)(\s?from\s)(['"]@elliemae\/ds-basic(\/(?:(?!form)\S)+)?['"])/gms;

package/bin/cli/code-mods/command-logics/help-migrate-to-v3/getSolutions.js

@@ -34,7 +34,7 @@ export const mapComponentsToImportStatement = (fullMatch, components) => {
   if (entries.length > 0)
     entries.forEach(([fromPackage, comps]) => {
       if (fromPackage !== 'undefined') {
-        autoSolutions.push(`import { ${comps.join(', ')} } from '${fromPackage}';`);
+        autoSolutions.push(`import { ${comps.join(', ')} } from '${fromPackage}'`);
       } else {
         hasUnfixables = true;
         unAutoFixables.push({ fromPackage, comps });
@@ -66,32 +66,41 @@ export const mapComponentsToImportStatement = (fullMatch, components) => {
   return {
     solution,
     unfixable,
+    importStatementsMap,
   };
 };
 
 export const getSubFolderSolution = (fullMatch, components, fullFromPack) => ({
-  fullMatch,
-  solution: `import ${components} from '${SUGGESTABLE_MAP[fullFromPack]}';`,
-  solutionType: SOLUTIONS_TYPES.SUB_FOLDER,
+  solution: {
+    fullMatch,
+    solution: `import ${components} from '${SUGGESTABLE_MAP[fullFromPack]}'`,
+    solutionType: SOLUTIONS_TYPES.SUB_FOLDER,
+  },
+  fromPackage: SUGGESTABLE_MAP[fullFromPack],
 });
 
 export const getSolutions = (fileContent) => {
   const matches = matchDsBasicImports(fileContent);
   const solutions = [];
   const unfixables = [];
+  let newPackagesMap = {};
   let hasErrors = false;
   if (matches.length > 0) {
     hasErrors = true;
     matches.forEach((match) => {
       const { fullMatch, componentVariable, fullFromPack, optionalSubfolder } = match;
-      if (optionalSubfolder !== '') solutions.push(getSubFolderSolution(fullMatch, componentVariable, fullFromPack));
-      else {
+      if (optionalSubfolder !== '') {
+        const { solution, fromPackage } = getSubFolderSolution(fullMatch, componentVariable, fullFromPack);
+        solutions.push(solution);
+        newPackagesMap[fromPackage] = componentVariable;
+      } else {
         const csvComponents = componentVariable.replace(/{+/g, '').replace(/}+/g, '').replace(/\s+/gms, '').split(',');
-        const { solution, unfixable } = mapComponentsToImportStatement(fullMatch, csvComponents);
+        const { solution, unfixable, importStatementsMap } = mapComponentsToImportStatement(fullMatch, csvComponents);
         if (solution) solutions.push(solution);
         if (unfixable) unfixables.push(unfixable);
+        newPackagesMap = { ...newPackagesMap, ...importStatementsMap };
       }
     });
   }
-  return { solutions, unfixables, hasErrors };
+  return { solutions, unfixables, hasErrors, newPackages: Object.keys(newPackagesMap), newPackagesMap };
 };

package/bin/cli/code-mods/command-logics/help-migrate-to-v3/index.js

@@ -23,6 +23,7 @@ export const helpMigrateToV3 = (options) => {
     listOfAllFilesWithErrors: [],
     listOfFixedFiles: [],
     listOfUnfixableFiles: [],
+    convertedPackagesMap: {},
   };
 
   pathToFileToProcess.forEach((path) => {
@@ -31,7 +32,7 @@ export const helpMigrateToV3 = (options) => {
       flag: 'r',
     });
     if (fileContent && typeof fileContent === 'string') {
-      const { solutions, unfixables, hasErrors } = getSolutions(fileContent);
+      const { solutions, unfixables, hasErrors, newPackagesMap } = getSolutions(fileContent);
       if (hasErrors) {
         totals.listOfAllFilesWithErrors.push(path);
         totals.hasErrors = true;
@@ -45,27 +46,39 @@ export const helpMigrateToV3 = (options) => {
           totals.listOfFixedFiles.push(path);
           totals.totalAppliedFixes += solutions.length;
         }
+        if (Object.keys(newPackagesMap).length) {
+          totals.convertedPackagesMap = { ...totals.convertedPackagesMap, ...newPackagesMap };
+        }
       }
     }
   });
   if (totals.hasErrors) {
+    console.log('\n');
     console.log(chalk.magentaBright('# Found outdated import statement in:'));
     console.log('```');
     console.log(totals.listOfAllFilesWithErrors);
     console.log('```');
+    console.log('\n');
     console.log(chalk.bold.green('## The following files were auto-fixed'));
     console.log('```');
     console.log(totals.listOfFixedFiles);
     console.log('```');
     console.log(chalk.bold.green(`a total of ${totals.totalAppliedFixes} fixes were applied`));
     if (totals.hasUnfixables) {
+      console.log('\n');
       console.log(chalk.redBright('## found some problems that can not be autofixed '));
       console.log('```');
       console.log(util.inspect(totals.listOfUnfixableFiles, { showHidden: false, depth: null, colors: true }));
       console.log('```');
+      console.log('\n');
       console.log(chalk.redBright('you must manually solve those import statements'));
       console.log('check https://qa.dimsum.rd.elliemae.io/ documentation to find your new import statements');
     }
   }
+  console.log('\n');
+  console.log(chalk.yellowBright('# You must ensure following dependencies are present in your package.json:'));
+  console.log('```');
+  console.log(util.inspect(Object.keys(totals.convertedPackagesMap), { showHidden: false, depth: null, colors: true }));
+  console.log('```');
   console.log(chalk.cyanBright('Done.'));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/ds-codemods",
-  "version": "3.0.0-next.49",
+  "version": "3.0.0-next.52",
   "license": "MIT",
   "description": "ICE MT - Dimsum - Code Mods",
   "files": [
@@ -29,6 +29,12 @@
     "reportFile": "tests.xml",
     "indent": 4
   },
+  "scripts": {
+    "try-codemods": "npx ./",
+    "try-check-deprecated-packages": "npx ./ check-deprecated-packages --cwd=\"test-ables/check-deprecated-packages/with-deprecated\"",
+    "try-check-deprecated-packages-no-dimsum": "npx ./ check-deprecated-packages --cwd=\"test-ables/check-deprecated-packages/without-dimsum-packages\"",
+    "try-help-migrate-to-v3": "npx ./ help-migrate-to-v3 --globPattern=\"test-ables/help-migrate-to-v3/**/*.js,./**/*.jsx,./**/*.ts,./**/*.tsx\" --globPatternIgnore=\"**/node_modules/**/*\""
+  },
   "dependencies": {
     "arg": "~5.0.1",
     "chalk": "~4.1.2",
@@ -44,11 +50,5 @@
   "publishConfig": {
     "access": "public",
     "typeSafety": false
-  },
-  "scripts": {
-    "try-codemods": "npx ./",
-    "try-check-deprecated-packages": "npx ./ check-deprecated-packages --cwd=\"test-ables/check-deprecated-packages/with-deprecated\"",
-    "try-check-deprecated-packages-no-dimsum": "npx ./ check-deprecated-packages --cwd=\"test-ables/check-deprecated-packages/without-dimsum-packages\"",
-    "try-help-migrate-to-v3": "npx ./ help-migrate-to-v3 --globPattern=\"test-ables/help-migrate-to-v3/**/*.js,./**/*.jsx,./**/*.ts,./**/*.tsx\" --globPatternIgnore=\"**/node_modules/**/*\""
   }
-}
+}