Refactored code (#52)

* refactor: Updated regular expressions to be explicit about intent

* chore: Fixed linting errors (create-options)

* refactor: Simplified data structure (move-project-root-files)

* refactor: Extracted functions (update-addon-package-json)

* refactor: Removed unnecessary sorting (sorting is handled by convertToObject)

* refactor: Extracted functions (update-other-fields)

* refactor: Extracted functions (update-test-app-package-json)

---------

Co-authored-by: ijlee2 <[email protected]>

Author: ijlee2

.eslintrc.cjs

@@ -37,6 +37,7 @@ module.exports = {
       ],
       rules: {
         '@typescript-eslint/array-type': 'error',
+        '@typescript-eslint/no-non-null-assertion': 'off',
       },
     },
     // TypeScript and JavaScript files

src/migration/ember-addon/steps/analyze-addon.ts

@@ -66,7 +66,7 @@ function getPublicEntrypoints(options: Options): string[] {
       });
     })
     .map((filePath) => {
-      return filePath.replace(/ts$/, 'js');
+      return filePath.replace(/(?<!\.d)\.ts$/, '.js');
     })
     .sort();
 }

src/migration/ember-addon/steps/create-options.ts

@@ -21,19 +21,19 @@ function analyzePackageJson(codemodOptions: CodemodOptions): AddonPackage {
     version,
   } = packageJson;
 
-  const projectDependencies = new Map([
-    ...Object.entries(dependencies ?? {}),
-    ...Object.entries(devDependencies ?? {}),
+  const projectDependencies = new Map<string, string>([
+    ...(Object.entries(dependencies ?? {}) as [string, string][]),
+    ...(Object.entries(devDependencies ?? {}) as [string, string][]),
   ]);
 
   return {
     dependencies: projectDependencies,
     hasGlint: projectDependencies.has('@glint/core'),
     hasTypeScript: projectDependencies.has('typescript'),
     isV1Addon: Boolean(emberAddon),
-    name,
-    version,
-  } as unknown as AddonPackage;
+    name: name!,
+    version: version!,
+  };
 }
 
 function analyzePackageManager(codemodOptions: CodemodOptions): PackageManager {
@@ -77,10 +77,9 @@ function deriveAddonLocation(addonPackage: AddonPackage): string {
     return addonPackage.name;
   }
 
-  // eslint-disable-next-line no-unused-vars
-  const [_scope, packageName] = addonPackage.name.split('/');
+  const packageName = addonPackage.name.split('/')[1]!;
 
-  return packageName!;
+  return packageName;
 }
 
 export function createOptions(codemodOptions: CodemodOptions): Options {

src/migration/ember-addon/steps/move-project-root-files.ts

@@ -27,9 +27,9 @@ function copyToAddon(options: Options): void {
 }
 
 function moveToAddonAndTestApp(options: Options): void {
-  const { locations, packages, projectRoot } = options;
+  const { locations, projectRoot } = options;
 
-  const files = new Set([
+  const files = [
     '.eslintignore',
     '.eslintrc.cjs',
     '.eslintrc.js',
@@ -43,13 +43,10 @@ function moveToAddonAndTestApp(options: Options): void {
     '.template-lintrc.cjs',
     '.template-lintrc.js',
     'package.json',
-  ]);
-
-  if (packages.addon.hasTypeScript) {
-    files.add('tsconfig.json');
-  }
+    'tsconfig.json',
+  ];
 
-  const filePaths = findFiles(unionize(Array.from(files)), {
+  const filePaths = findFiles(unionize(files), {
     projectRoot,
   });
 

src/migration/ember-addon/steps/move-test-app-files.ts

@@ -76,10 +76,7 @@ function renameDummy(options: Options): void {
     const oldPath = join(projectRoot, filePath);
     const oldFile = readFileSync(oldPath, 'utf8');
 
-    const newFile = oldFile.replace(
-      new RegExp('dummy', 'g'),
-      packages.testApp.name,
-    );
+    const newFile = oldFile.replace(/dummy/g, packages.testApp.name);
 
     writeFileSync(oldPath, newFile, 'utf8');
   });

src/migration/ember-addon/steps/update-addon-package-json.ts

@@ -1,214 +1,15 @@
 import { writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 
-import {
-  convertToMap,
-  convertToObject,
-  readPackageJson,
-} from '@codemod-utils/json';
-
-import type { Context, Options, PackageJson } from '../../../types/index.js';
-import { getVersion } from '../../../utils/blueprints.js';
-
-function updateDependencies(packageJson: PackageJson, options: Options): void {
-  const dependencies = convertToMap(packageJson['dependencies']);
-
-  const packagesToDelete = [
-    '@embroider/macros',
-    'ember-auto-import',
-    'ember-cli-babel',
-    'ember-cli-htmlbars',
-  ];
-
-  packagesToDelete.forEach((packageName) => {
-    dependencies.delete(packageName);
-  });
-
-  const packagesToInstall = ['@embroider/addon-shim'];
-
-  packagesToInstall.sort().forEach((packageName) => {
-    const version = getVersion(packageName, options);
-
-    dependencies.set(packageName, version);
-  });
-
-  packageJson['dependencies'] = convertToObject(dependencies);
-}
-
-function updateDevDependencies(
-  packageJson: PackageJson,
-  options: Options,
-): void {
-  const { packages } = options;
-
-  const devDependencies = convertToMap(packageJson['devDependencies']);
-
-  /*
-    For the time being, we'll take the approach of starting over and
-    adding back the development dependencies that are required. For
-    a more conservative approach, we could delete only the following:
-
-      - @embroider/macros
-      - ember-auto-import
-      - ember-cli-babel
-      - ember-cli-htmlbars
-  */
-  devDependencies.clear();
-
-  const packagesToInstall = new Set([
-    '@babel/core',
-    '@babel/plugin-proposal-class-properties',
-    '@babel/plugin-proposal-decorators',
-    '@babel/runtime',
-    '@embroider/addon-dev',
-    '@rollup/plugin-babel',
-    '@rollup/plugin-node-resolve',
-    'concurrently',
-    'rollup',
-    'rollup-plugin-copy',
-  ]);
-
-  if (packages.addon.hasTypeScript) {
-    packagesToInstall.add('@babel/preset-typescript');
-  }
-
-  Array.from(packagesToInstall)
-    .sort()
-    .forEach((packageName) => {
-      const version = getVersion(packageName, options);
-
-      devDependencies.set(packageName, version);
-    });
-
-  packageJson['devDependencies'] = convertToObject(devDependencies);
-}
+import { readPackageJson } from '@codemod-utils/json';
 
-function updateOtherFields(
-  packageJson: PackageJson,
-  context: Context,
-  options: Options,
-): void {
-  const { packages } = options;
-  const hasPublicAssets = context.addon.publicAssets.length > 0;
-
-  if (hasPublicAssets) {
-    const publicAssetMapping = context.addon.publicAssets.reduce(
-      (accumulator, filePath) => {
-        const from = `./public/${filePath}`;
-        const to = `/${packages.addon.name}/${filePath}`;
-
-        accumulator[from] = to;
-
-        return accumulator;
-      },
-      {} as Record<string, string>,
-    );
-
-    packageJson['ember-addon'] = {
-      'app-js': {},
-      main: 'addon-main.cjs',
-      'public-assets': publicAssetMapping,
-      type: 'addon',
-      version: 2,
-    };
-  } else {
-    packageJson['ember-addon'] = {
-      'app-js': {},
-      main: 'addon-main.cjs',
-      type: 'addon',
-      version: 2,
-    };
-  }
-
-  if (packages.addon.hasTypeScript) {
-    packageJson['exports'] = {
-      '.': {
-        types: './declarations/index.d.ts',
-        default: './dist/index.js',
-      },
-      './*': {
-        /*
-          This object has an order dependency. The `default` key must appear last.
-        */
-        types: './declarations/*.d.ts',
-        default: './dist/*.js',
-      },
-      './addon-main.js': './addon-main.cjs',
-    };
-  } else {
-    packageJson['exports'] = {
-      '.': './dist/index.js',
-      './*': './dist/*.js',
-      './addon-main.js': './addon-main.cjs',
-    };
-  }
-
-  const files = new Set(['addon-main.cjs', 'dist']);
-
-  if (hasPublicAssets) {
-    files.add('public');
-  }
-
-  if (packages.addon.hasTypeScript) {
-    files.add('declarations');
-  }
-
-  packageJson['files'] = Array.from(files).sort();
-
-  if (packages.addon.hasTypeScript) {
-    packageJson['typesVersions'] = {
-      '*': {
-        '*': ['declarations/*'],
-      },
-    };
-  }
-}
-
-function updateScripts(packageJson: PackageJson, options: Options): void {
-  const { packages } = options;
-
-  const scripts = convertToMap(packageJson['scripts']);
-
-  if (packages.addon.hasTypeScript) {
-    scripts.set('build', 'concurrently "npm:build:*" --names "build:"');
-    scripts.set('build:js', 'rollup --config');
-    scripts.set(
-      'build:types',
-      packages.addon.hasGlint ? 'glint --declaration' : 'tsc',
-    );
-
-    scripts.set(
-      'lint:types',
-      packages.addon.hasGlint
-        ? 'glint'
-        : 'tsc --emitDeclarationOnly false --noEmit',
-    );
-
-    scripts.set('prepack', 'rollup --config');
-
-    scripts.set('start', 'concurrently "npm:start:*" --names "start:"');
-    scripts.set('start:js', 'rollup --config --watch --no-watch.clearScreen');
-    scripts.set(
-      'start:types',
-      packages.addon.hasGlint ? 'glint --declaration --watch' : 'tsc --watch',
-    );
-
-    scripts.set(
-      'test',
-      "echo 'A v2 addon does not have tests, run tests in test-app'",
-    );
-  } else {
-    scripts.set('build', 'rollup --config');
-    scripts.set('prepack', 'rollup --config');
-    scripts.set('start', 'rollup --config --watch');
-    scripts.set(
-      'test',
-      "echo 'A v2 addon does not have tests, run tests in test-app'",
-    );
-  }
-
-  packageJson['scripts'] = convertToObject(scripts);
-}
+import type { Context, Options } from '../../../types/index.js';
+import {
+  updateDependencies,
+  updateDevDependencies,
+  updateOtherFields,
+  updateScripts,
+} from './update-addon-package-json/index.js';
 
 export function updateAddonPackageJson(
   context: Context,

src/migration/ember-addon/steps/update-addon-package-json/index.ts

@@ -0,0 +1,4 @@
+export * from './update-dependencies.js';
+export * from './update-dev-dependencies.js';
+export * from './update-other-fields.js';
+export * from './update-scripts.js';

src/migration/ember-addon/steps/update-addon-package-json/update-dependencies.ts

@@ -0,0 +1,32 @@
+import { convertToMap, convertToObject } from '@codemod-utils/json';
+
+import type { Options, PackageJson } from '../../../../types/index.js';
+import { getVersion } from '../../../../utils/blueprints.js';
+
+export function updateDependencies(
+  packageJson: PackageJson,
+  options: Options,
+): void {
+  const dependencies = convertToMap(packageJson['dependencies']);
+
+  const packagesToDelete = [
+    '@embroider/macros',
+    'ember-auto-import',
+    'ember-cli-babel',
+    'ember-cli-htmlbars',
+  ];
+
+  packagesToDelete.forEach((packageName) => {
+    dependencies.delete(packageName);
+  });
+
+  const packagesToInstall = ['@embroider/addon-shim'];
+
+  packagesToInstall.forEach((packageName) => {
+    const version = getVersion(packageName, options);
+
+    dependencies.set(packageName, version);
+  });
+
+  packageJson['dependencies'] = convertToObject(dependencies);
+}