ember-codemod-v1-to-v2 0.1.5 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-codemod-v1-to-v2",
-  "version": "0.1.5",
+  "version": "0.2.0",
   "description": "Codemod to convert Ember addons to v2 addon format",
   "keywords": [
     "codemod",

package/src/migration/ember-addon/steps/analyze-addon.js

@@ -1,17 +1,21 @@
-import { join } from 'node:path';
-
 import glob from 'glob';
 
 import { decideVersion } from '../../../utils/blueprints.js';
+import { renameDirectory } from '../../../utils/files.js';
 
 function getAppReexports(options) {
   const { projectRoot } = options;
 
-  const filePaths = glob.sync('**/*.js', {
-    cwd: join(projectRoot, 'app'),
+  const filePaths = glob.sync('app/**/*.js', {
+    cwd: projectRoot,
   });
 
-  return filePaths;
+  return filePaths.map((filePath) => {
+    return renameDirectory(filePath, {
+      from: 'app',
+      to: '',
+    });
+  });
 }
 
 function getProjectRootDevDependencies(options) {
@@ -24,11 +28,26 @@ function getProjectRootDevDependencies(options) {
 function getPublicEntrypoints(options) {
   const { projectRoot } = options;
 
-  const filePaths = glob.sync('**/*.{js,ts}', {
-    cwd: join(projectRoot, 'addon'),
+  const filePaths = glob.sync('{addon,addon-test-support}/**/*.{js,ts}', {
+    cwd: projectRoot,
   });
 
-  return filePaths.map((filePath) => filePath.replace(/ts$/, 'js'));
+  return filePaths
+    .map((filePath) => {
+      return renameDirectory(filePath, {
+        from: 'addon',
+        to: '',
+      });
+    })
+    .map((filePath) => {
+      return renameDirectory(filePath, {
+        from: 'addon-test-support',
+        to: 'test-support',
+      });
+    })
+    .map((filePath) => {
+      return filePath.replace(/ts$/, 'js');
+    });
 }
 
 export function analyzeAddon(options) {

package/src/utils/files/map-file-paths.js

@@ -1,20 +1,25 @@
-function changeDirectory(oldPath, from, to) {
-  if (!oldPath.startsWith(from)) {
-    throw new RangeError(
-      `The provided path \`${oldPath}\` does not start with \`${from}\`.`
-    );
+import { join } from 'node:path';
+
+export function renameDirectory(oldPath, { from, to }) {
+  if (from === '') {
+    return join(to, oldPath);
   }
 
-  const relativePath = oldPath.replace(new RegExp(`^${from}/`), '');
-  const newPath = `${to}/${relativePath}`;
+  if (!oldPath.startsWith(`${from}/`)) {
+    return oldPath;
+  }
 
-  return [oldPath, newPath];
+  return join(to, oldPath.replace(`${from}/`, ''));
 }
 
 export function mapFilePaths(filePaths, directory) {
   const { from, to } = directory;
 
   return new Map(
-    filePaths.map((filePath) => changeDirectory(filePath, from, to))
+    filePaths.map((filePath) => {
+      const newPath = renameDirectory(filePath, { from, to });
+
+      return [filePath, newPath];
+    })
   );
 }