ember-codemod-add-component-signatures 5.0.0 → 5.1.0

package/README.md

@@ -40,7 +40,7 @@ Step 1. Quickly migrate.
 
 ```sh
 cd <path/to/your/project>
-npx ember-codemod-add-component-signatures <arguments>
+pnpx ember-codemod-add-component-signatures <arguments>
 ```
 
 Step 2. Review the package.
@@ -64,14 +64,6 @@ Nice to do:
 
 ### Arguments
 
-You must pass `--type` to indicate what type of project you have.
-
-```sh
-npx ember-codemod-add-component-signatures --type app
-npx ember-codemod-add-component-signatures --type v1-addon
-npx ember-codemod-add-component-signatures --type v2-addon
-```
-
 <details>
 
 <summary>Optional: Specify the component structure</summary>
@@ -79,7 +71,7 @@ npx ember-codemod-add-component-signatures --type v2-addon
 By default, an Octane project has the flat component structure. Pass `--component-structure` to indicate otherwise.
 
 ```sh
-npx ember-codemod-add-component-signatures --component-structure nested
+pnpx ember-codemod-add-component-signatures --component-structure nested
 ```
 
 </details>
@@ -91,7 +83,7 @@ npx ember-codemod-add-component-signatures --component-structure nested
 By default, the codemod ignores component classes written in `*.{js,gjs}`. Pass `--convert-javascript` to allow the codemod to change the file extension to `*.{ts,gts}` and add the component signature.
 
 ```sh
-npx ember-codemod-add-component-signatures --convert-javascript
+pnpx ember-codemod-add-component-signatures --convert-javascript
 ```
 
 </details>
@@ -103,7 +95,7 @@ npx ember-codemod-add-component-signatures --convert-javascript
 Pass `--root` to run the codemod on a project somewhere else (i.e. not in the current directory).
 
 ```sh
-npx ember-codemod-add-component-signatures --root <path/to/your/project>
+pnpx ember-codemod-add-component-signatures --root <path/to/your/project>
 ```
 
 </details>

package/dist/bin/ember-codemod-add-component-signatures.js

@@ -21,18 +21,11 @@ const argv = yargs(hideBin(process.argv))
     .option('root', {
     describe: 'Location of your Ember project',
     type: 'string',
-})
-    .option('type', {
-    choices: ['app', 'v1-addon', 'v2-addon'],
-    demandOption: true,
-    describe: 'Type of your Ember project',
-    type: 'string',
 })
     .parseSync();
 const codemodOptions = {
     componentStructure: argv['component-structure'],
     convertJavaScript: argv['convert-javascript'],
     projectRoot: argv['root'] ?? process.cwd(),
-    projectType: argv['type'],
 };
 runCodemod(codemodOptions);

package/dist/src/steps/analyze-project/find-components.js

@@ -8,12 +8,12 @@ function normalizeComponentNames(extensionMap) {
 }
 export function findComponents(options) {
     const { componentStructure, projectRoot, src } = options;
-    const filePaths = findFiles(`${src}/**/*.{gjs,gts,hbs,js,ts}`, {
+    const filePaths = findFiles(`${src}/components/**/*.{gjs,gts,hbs,js,ts}`, {
         ignoreList: ['**/*.d.ts'],
         projectRoot,
     }).map((filePath) => {
         return renamePathByDirectory(filePath, {
-            from: src,
+            from: `${src}/components`,
             to: '',
         });
     });

package/dist/src/steps/convert-to-typescript.js

@@ -4,7 +4,7 @@ export function convertToTypeScript(options) {
     if (!convertJavaScript) {
         return;
     }
-    const filePaths = findFiles(`${src}/**/*.{gjs,js}`, {
+    const filePaths = findFiles(`${src}/components/**/*.{gjs,js}`, {
         projectRoot,
     });
     const filePathMap = filePaths.reduce((accumulator, filePath) => {

package/dist/src/steps/create-options.js

@@ -1,22 +1,17 @@
-function getSrc(projectType) {
-    switch (projectType) {
-        case 'app': {
-            return 'app/components';
-        }
-        case 'v1-addon': {
-            return 'addon/components';
-        }
-        case 'v2-addon': {
-            return 'src/components';
-        }
-    }
-}
+import { getPackageType, readPackageJson } from '@codemod-utils/package-json';
+import { SOURCE_DIRECTORY } from '../utils/ember.js';
 export function createOptions(codemodOptions) {
-    const { componentStructure, convertJavaScript, projectRoot, projectType } = codemodOptions;
+    const { componentStructure, convertJavaScript, projectRoot } = codemodOptions;
+    const packageJson = readPackageJson({ projectRoot });
+    const packageType = getPackageType(packageJson);
+    if (packageType === 'node') {
+        throw new Error('Ember package not found');
+    }
+    const src = SOURCE_DIRECTORY[packageType];
     return {
         componentStructure,
         convertJavaScript,
         projectRoot,
-        src: getSrc(projectType),
+        src,
     };
 }

package/dist/src/utils/blueprints/blueprints-root.js

@@ -1,4 +1,3 @@
 import { join } from 'node:path';
 import { getFilePath } from '@codemod-utils/blueprints';
-const fileURL = import.meta.url;
-export const blueprintsRoot = join(getFilePath(fileURL), '../../blueprints');
+export const blueprintsRoot = join(getFilePath(import.meta.url), '../../blueprints');

package/dist/src/utils/components/get-class-path.js

@@ -2,8 +2,8 @@ import { join } from 'node:path';
 export function getClassPath(componentName, extensions, options) {
     const { componentStructure, src } = options;
     const filePath = componentStructure === 'nested'
-        ? join(src, componentName, 'index')
-        : join(src, componentName);
+        ? join(src, 'components', componentName, 'index')
+        : join(src, 'components', componentName);
     if (extensions.has('.gts')) {
         return `${filePath}.gts`;
     }

package/dist/src/utils/components/get-template-path.js

@@ -2,8 +2,8 @@ import { join } from 'node:path';
 export function getTemplatePath(componentName, extensions, options) {
     const { componentStructure, src } = options;
     const filePath = componentStructure === 'nested'
-        ? join(src, componentName, 'index')
-        : join(src, componentName);
+        ? join(src, 'components', componentName, 'index')
+        : join(src, 'components', componentName);
     if (!extensions.has('.hbs')) {
         throw new RangeError('extensions must include `.hbs`');
     }

package/dist/src/utils/ember.js

@@ -0,0 +1,6 @@
+export const SOURCE_DIRECTORY = {
+    'v1-addon': 'addon',
+    'v1-app': 'app',
+    'v2-addon': 'src',
+    'v2-app': 'app',
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-codemod-add-component-signatures",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "description": "Codemod to add component signatures",
   "keywords": [
     "codemod",
@@ -27,17 +27,18 @@
     "@codemod-utils/ast-javascript": "^3.0.0",
     "@codemod-utils/ast-template": "^3.0.0",
     "@codemod-utils/ast-template-tag": "^2.0.0",
-    "@codemod-utils/blueprints": "^3.0.0",
-    "@codemod-utils/ember": "^4.0.0",
+    "@codemod-utils/blueprints": "^3.0.1",
+    "@codemod-utils/ember": "^4.1.0",
     "@codemod-utils/files": "^4.0.0",
+    "@codemod-utils/package-json": "^4.0.0",
     "yargs": "^18.0.0"
   },
   "devDependencies": {
     "@changesets/cli": "^2.29.8",
     "@codemod-utils/tests": "^3.0.0",
     "@ijlee2-frontend-configs/changesets": "^2.0.0",
-    "@ijlee2-frontend-configs/eslint-config-node": "^3.0.0",
-    "@ijlee2-frontend-configs/prettier": "^3.0.0",
+    "@ijlee2-frontend-configs/eslint-config-node": "^3.0.1",
+    "@ijlee2-frontend-configs/prettier": "^3.0.1",
     "@sondr3/minitest": "^0.1.2",
     "@tsconfig/node22": "^22.0.5",
     "@tsconfig/strictest": "^2.0.8",