Refactored blueprints-addon

.changeset/eleven-monkeys-admire.md

@@ -0,0 +1,5 @@
+---
+"create-v2-addon-repo": patch
+---
+
+Refactored blueprints-addon

packages/blueprints-addon/src/steps/run-destroy/update-test-app/remove-test-file.ts

@@ -26,7 +26,9 @@ function getPattern(options: Options): string {
 }
 
 export function removeTestFile(options: Options): void {
-  const testAppRoot = join(options.projectRoot, options.testApp.location);
+  const { projectRoot, testApp } = options;
+
+  const testAppRoot = join(projectRoot, testApp.location);
 
   const filePaths = findFiles(getPattern(options), {
     projectRoot: testAppRoot,

packages/blueprints-addon/src/steps/run-generate/create-options.ts

@@ -1,14 +1,12 @@
+import { join } from 'node:path';
+
 import { classify, doubleColonize } from '@codemod-utils/ember-cli-string';
 import { readPackageJson } from '@codemod-utils/json';
 
 import type { CodemodOptions, Options } from '../../types/run-generate.js';
 
-function getAddonName(codemodOptions: CodemodOptions): string {
-  const { projectRoot } = codemodOptions;
-
-  const packageJson = readPackageJson({
-    projectRoot,
-  });
+function getPackageName(projectRoot: string): string {
+  const packageJson = readPackageJson({ projectRoot });
 
   return packageJson['name']!;
 }
@@ -22,7 +20,7 @@ export function createOptions(codemodOptions: CodemodOptions): Options {
 
   return {
     addon: {
-      name: getAddonName(codemodOptions),
+      name: getPackageName(projectRoot),
     },
     entity: {
       ...entity,
@@ -33,7 +31,7 @@ export function createOptions(codemodOptions: CodemodOptions): Options {
     projectRoot,
     testApp: {
       location: testAppLocation,
-      name: 'test-app',
+      name: getPackageName(join(projectRoot, testAppLocation)),
       useTemplateTag: true,
     },
   };

packages/blueprints-addon/src/steps/run-generate/update-addon/create-entity.ts

@@ -7,12 +7,10 @@ import { createFiles, findFiles, parseFilePath } from '@codemod-utils/files';
 import type { Options } from '../../../types/run-generate.js';
 import { blueprintsRoot } from '../../../utils/blueprints.js';
 
-function getData(options: Options) {
-  const { name: localFileName } = parseFilePath(options.entity.name);
+function getLocalFileName(entityName: string): string {
+  const { name } = parseFilePath(entityName);
 
-  return {
-    localFileName,
-  };
+  return name;
 }
 
 function resolveBlueprintFilePath(
@@ -28,25 +26,31 @@ function resolveBlueprintFilePath(
 }
 
 export function createEntity(options: Options): void {
+  const { entity } = options;
+
   const cwd = join(
     blueprintsRoot,
     'run-generate',
-    options.entity.type,
-    options.entity.blueprint,
+    entity.type,
+    entity.blueprint,
   );
 
   const blueprintFilePaths = findFiles('**/*', {
     projectRoot: cwd,
   });
 
+  const data = {
+    localFileName: getLocalFileName(entity.name),
+  };
+
   const fileMap = new Map(
     blueprintFilePaths.map((blueprintFilePath) => {
       const filePath = resolveBlueprintFilePath(blueprintFilePath, options);
 
       const blueprintFile = readFileSync(join(cwd, blueprintFilePath), 'utf8');
 
       const file = processTemplate(blueprintFile, {
-        data: getData(options),
+        data,
         options,
       });
 

packages/blueprints-addon/src/steps/run-generate/update-test-app/create-test-file.ts

@@ -56,12 +56,14 @@ function resolveBlueprintFilePath(
 }
 
 export function createTestFile(options: Options): void {
+  const { entity, projectRoot, testApp } = options;
+
   const filesToSkip = getFilesToSkip(options);
 
   const cwd = join(
     blueprintsRoot,
     'run-generate',
-    options.entity.type,
+    entity.type,
     '__testAppLocation__',
   );
 
@@ -85,6 +87,6 @@ export function createTestFile(options: Options): void {
   );
 
   createFiles(fileMap, {
-    projectRoot: join(options.projectRoot, options.testApp.location),
+    projectRoot: join(projectRoot, testApp.location),
   });
 }

packages/blueprints-addon/src/steps/run-new/create-options.ts

@@ -11,7 +11,7 @@ function pascalCase(packageName: string): string {
 
   return dasherizedName
     .split('-')
-    .map((token) => token.charAt(0).toUpperCase() + token.substring(1))
+    .map((token) => `${token.charAt(0).toUpperCase()}${token.substring(1)}`)
     .join('');
 }
 

packages/create-v2-addon-repo/src/blueprints/blueprints-addon/src/steps/run-destroy/update-test-app/remove-test-file.ts

@@ -26,7 +26,9 @@ function getPattern(options: Options): string {
 }
 
 export function removeTestFile(options: Options): void {
-  const testAppRoot = join(options.projectRoot, options.testApp.location);
+  const { projectRoot, testApp } = options;
+
+  const testAppRoot = join(projectRoot, testApp.location);
 
   const filePaths = findFiles(getPattern(options), {
     projectRoot: testAppRoot,

packages/create-v2-addon-repo/src/blueprints/blueprints-addon/src/steps/run-generate/create-options.ts

@@ -1,14 +1,12 @@
+import { join } from 'node:path';
+
 import { classify, doubleColonize } from '@codemod-utils/ember-cli-string';
 import { readPackageJson } from '@codemod-utils/json';
 
 import type { CodemodOptions, Options } from '../../types/run-generate.js';
 
-function getAddonName(codemodOptions: CodemodOptions): string {
-  const { projectRoot } = codemodOptions;
-
-  const packageJson = readPackageJson({
-    projectRoot,
-  });
+function getPackageName(projectRoot: string): string {
+  const packageJson = readPackageJson({ projectRoot });
 
   return packageJson['name']!;
 }
@@ -22,7 +20,7 @@ export function createOptions(codemodOptions: CodemodOptions): Options {
 
   return {
     addon: {
-      name: getAddonName(codemodOptions),
+      name: getPackageName(projectRoot),
     },
     entity: {
       ...entity,
@@ -33,7 +31,7 @@ export function createOptions(codemodOptions: CodemodOptions): Options {
     projectRoot,
     testApp: {
       location: testAppLocation,
-      name: 'test-app',
+      name: getPackageName(join(projectRoot, testAppLocation)),
       useTemplateTag: true,
     },
   };

packages/create-v2-addon-repo/src/blueprints/blueprints-addon/src/steps/run-generate/update-addon/create-entity.ts

@@ -7,12 +7,10 @@ import { createFiles, findFiles, parseFilePath } from '@codemod-utils/files';
 import type { Options } from '../../../types/run-generate.js';
 import { blueprintsRoot } from '../../../utils/blueprints.js';
 
-function getData(options: Options) {
-  const { name: localFileName } = parseFilePath(options.entity.name);
+function getLocalFileName(entityName: string): string {
+  const { name } = parseFilePath(entityName);
 
-  return {
-    localFileName,
-  };
+  return name;
 }
 
 function resolveBlueprintFilePath(
@@ -28,25 +26,31 @@ function resolveBlueprintFilePath(
 }
 
 export function createEntity(options: Options): void {
+  const { entity } = options;
+
   const cwd = join(
     blueprintsRoot,
     'run-generate',
-    options.entity.type,
-    options.entity.blueprint,
+    entity.type,
+    entity.blueprint,
   );
 
   const blueprintFilePaths = findFiles('**/*', {
     projectRoot: cwd,
   });
 
+  const data = {
+    localFileName: getLocalFileName(entity.name),
+  };
+
   const fileMap = new Map(
     blueprintFilePaths.map((blueprintFilePath) => {
       const filePath = resolveBlueprintFilePath(blueprintFilePath, options);
 
       const blueprintFile = readFileSync(join(cwd, blueprintFilePath), 'utf8');
 
       const file = processTemplate(blueprintFile, {
-        data: getData(options),
+        data,
         options,
       });
 

packages/create-v2-addon-repo/src/blueprints/blueprints-addon/src/steps/run-generate/update-test-app/create-test-file.ts

@@ -56,12 +56,14 @@ function resolveBlueprintFilePath(
 }
 
 export function createTestFile(options: Options): void {
+  const { entity, projectRoot, testApp } = options;
+
   const filesToSkip = getFilesToSkip(options);
 
   const cwd = join(
     blueprintsRoot,
     'run-generate',
-    options.entity.type,
+    entity.type,
     '__testAppLocation__',
   );
 
@@ -85,6 +87,6 @@ export function createTestFile(options: Options): void {
   );
 
   createFiles(fileMap, {
-    projectRoot: join(options.projectRoot, options.testApp.location),
+    projectRoot: join(projectRoot, testApp.location),
   });
 }

packages/create-v2-addon-repo/src/blueprints/blueprints-addon/src/steps/run-new/create-options.ts

@@ -11,7 +11,7 @@ function pascalCase(packageName: string): string {
 
   return dasherizedName
     .split('-')
-    .map((token) => token.charAt(0).toUpperCase() + token.substring(1))
+    .map((token) => `${token.charAt(0).toUpperCase()}${token.substring(1)}`)
     .join('');
 }
 

packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints-addon/src/steps/run-destroy/update-test-app/remove-test-file.ts

@@ -26,7 +26,9 @@ function getPattern(options: Options): string {
 }
 
 export function removeTestFile(options: Options): void {
-  const testAppRoot = join(options.projectRoot, options.testApp.location);
+  const { projectRoot, testApp } = options;
+
+  const testAppRoot = join(projectRoot, testApp.location);
 
   const filePaths = findFiles(getPattern(options), {
     projectRoot: testAppRoot,

packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints-addon/src/steps/run-generate/create-options.ts

@@ -1,14 +1,12 @@
+import { join } from 'node:path';
+
 import { classify, doubleColonize } from '@codemod-utils/ember-cli-string';
 import { readPackageJson } from '@codemod-utils/json';
 
 import type { CodemodOptions, Options } from '../../types/run-generate.js';
 
-function getAddonName(codemodOptions: CodemodOptions): string {
-  const { projectRoot } = codemodOptions;
-
-  const packageJson = readPackageJson({
-    projectRoot,
-  });
+function getPackageName(projectRoot: string): string {
+  const packageJson = readPackageJson({ projectRoot });
 
   return packageJson['name']!;
 }
@@ -22,7 +20,7 @@ export function createOptions(codemodOptions: CodemodOptions): Options {
 
   return {
     addon: {
-      name: getAddonName(codemodOptions),
+      name: getPackageName(projectRoot),
     },
     entity: {
       ...entity,
@@ -33,7 +31,7 @@ export function createOptions(codemodOptions: CodemodOptions): Options {
     projectRoot,
     testApp: {
       location: testAppLocation,
-      name: 'test-app',
+      name: getPackageName(join(projectRoot, testAppLocation)),
       useTemplateTag: true,
     },
   };

packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints-addon/src/steps/run-generate/update-addon/create-entity.ts

@@ -7,12 +7,10 @@ import { createFiles, findFiles, parseFilePath } from '@codemod-utils/files';
 import type { Options } from '../../../types/run-generate.js';
 import { blueprintsRoot } from '../../../utils/blueprints.js';
 
-function getData(options: Options) {
-  const { name: localFileName } = parseFilePath(options.entity.name);
+function getLocalFileName(entityName: string): string {
+  const { name } = parseFilePath(entityName);
 
-  return {
-    localFileName,
-  };
+  return name;
 }
 
 function resolveBlueprintFilePath(
@@ -28,25 +26,31 @@ function resolveBlueprintFilePath(
 }
 
 export function createEntity(options: Options): void {
+  const { entity } = options;
+
   const cwd = join(
     blueprintsRoot,
     'run-generate',
-    options.entity.type,
-    options.entity.blueprint,
+    entity.type,
+    entity.blueprint,
   );
 
   const blueprintFilePaths = findFiles('**/*', {
     projectRoot: cwd,
   });
 
+  const data = {
+    localFileName: getLocalFileName(entity.name),
+  };
+
   const fileMap = new Map(
     blueprintFilePaths.map((blueprintFilePath) => {
       const filePath = resolveBlueprintFilePath(blueprintFilePath, options);
 
       const blueprintFile = readFileSync(join(cwd, blueprintFilePath), 'utf8');
 
       const file = processTemplate(blueprintFile, {
-        data: getData(options),
+        data,
         options,
       });
 

packages/create-v2-addon-repo/tests/fixtures/typescript/output/my-repo/blueprints-addon/src/steps/run-generate/update-test-app/create-test-file.ts

@@ -56,12 +56,14 @@ function resolveBlueprintFilePath(
 }
 
 export function createTestFile(options: Options): void {
+  const { entity, projectRoot, testApp } = options;
+
   const filesToSkip = getFilesToSkip(options);
 
   const cwd = join(
     blueprintsRoot,
     'run-generate',
-    options.entity.type,
+    entity.type,
     '__testAppLocation__',
   );
 
@@ -85,6 +87,6 @@ export function createTestFile(options: Options): void {
   );
 
   createFiles(fileMap, {
-    projectRoot: join(options.projectRoot, options.testApp.location),
+    projectRoot: join(projectRoot, testApp.location),
   });
 }