Allowed the analyze-addon step to define ember-addon.public-assets (#73)

* bugfix: Removed unused keys * chore: Removed unnecessary sorting * refactor: Allowed the analyze-addon step to define ember-addon.public-assets * chore: Updated test setups --------- Co-authored-by: ijlee2 <[email protected]>
ijlee2 · Dec 26, 2023 · 7175c1f · 7175c1f
1 parent 626298e
commit 7175c1f
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 49 deletions.
diff --git a/src/steps/analyze-addon.ts b/src/steps/analyze-addon.ts
@@ -1,4 +1,4 @@
-import { findFiles, renamePathByDirectory } from '@codemod-utils/files';
+import { findFiles } from '@codemod-utils/files';
 
 import type { Context, Options } from '../types/index.js';
 import { getVersion } from '../utils/blueprints.js';
@@ -11,21 +11,24 @@ function getProjectRootDevDependencies(
   };
 }
 
-function getPublicAssets(options: Options): string[] {
-  const { projectRoot } = options;
+function getPublicAssets(options: Options): Record<string, string> {
+  const { packages, projectRoot } = options;
 
   const filePaths = findFiles('public/**/*', {
     projectRoot,
   });
 
-  return filePaths
-    .map((filePath) => {
-      return renamePathByDirectory(filePath, {
-        from: 'public',
-        to: '',
-      });
-    })
-    .sort();
+  return filePaths.reduce(
+    (accumulator, filePath) => {
+      const from = `./${filePath}`;
+      const to = `/${packages.addon.name}/${filePath.replace(/^public\//, '')}`;
+
+      accumulator[from] = to;
+
+      return accumulator;
+    },
+    {} as Record<string, string>,
+  );
 }
 
 export function analyzeAddon(options: Options): Context {

diff --git a/src/steps/update-addon-package-json/update-other-fields.ts b/src/steps/update-addon-package-json/update-other-fields.ts
@@ -3,16 +3,17 @@ import type { Context, Options, PackageJson } from '../../types/index.js';
 type Data = {
   hasPublicAssets: boolean;
   hasTypeScript: boolean;
-  publicAssetMapping: Record<string, string>;
+  publicAssets: Record<string, string>;
 };
 
 function updateEmberAddon(packageJson: PackageJson, data: Data): void {
-  const { hasPublicAssets, publicAssetMapping } = data;
+  const { hasPublicAssets, publicAssets } = data;
 
-  if (!hasPublicAssets) {
+  if (hasPublicAssets) {
     packageJson['ember-addon'] = {
       'app-js': {},
       main: 'addon-main.cjs',
+      'public-assets': publicAssets,
       type: 'addon',
       version: 2,
     };
@@ -23,7 +24,6 @@ function updateEmberAddon(packageJson: PackageJson, data: Data): void {
   packageJson['ember-addon'] = {
     'app-js': {},
     main: 'addon-main.cjs',
-    'public-assets': publicAssetMapping,
     type: 'addon',
     version: 2,
   };
@@ -93,26 +93,15 @@ export function updateOtherFields(
   context: Context,
   options: Options,
 ): void {
+  const { addon } = context;
   const { packages } = options;
 
-  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>,
-  );
-
-  const hasPublicAssets = Object.keys(publicAssetMapping).length > 0;
+  const hasPublicAssets = Object.keys(addon.publicAssets).length > 0;
 
   const data = {
     hasPublicAssets,
     hasTypeScript: packages.addon.hasTypeScript,
-    publicAssetMapping,
+    publicAssets: addon.publicAssets,
   };
 
   updateEmberAddon(packageJson, data);

diff --git a/src/types/index.ts b/src/types/index.ts
@@ -9,7 +9,7 @@ type CodemodOptions = {
 
 type Context = {
   addon: {
-    publicAssets: string[];
+    publicAssets: Record<string, string>;
   };
   projectRoot: {
     devDependencies: Record<string, string>;

diff --git a/tests/helpers/shared-test-setups/customizations.ts b/tests/helpers/shared-test-setups/customizations.ts
@@ -13,7 +13,7 @@ const codemodOptions: CodemodOptions = {
 
 const context: Context = {
   addon: {
-    publicAssets: [],
+    publicAssets: {},
   },
   projectRoot: {
     devDependencies: {

diff --git a/tests/helpers/shared-test-setups/glint.ts b/tests/helpers/shared-test-setups/glint.ts
@@ -13,7 +13,7 @@ const codemodOptions: CodemodOptions = {
 
 const context: Context = {
   addon: {
-    publicAssets: [],
+    publicAssets: {},
   },
   projectRoot: {
     devDependencies: {

diff --git a/tests/helpers/shared-test-setups/javascript.ts b/tests/helpers/shared-test-setups/javascript.ts
@@ -13,7 +13,7 @@ const codemodOptions: CodemodOptions = {
 
 const context: Context = {
   addon: {
-    publicAssets: [],
+    publicAssets: {},
   },
   projectRoot: {
     devDependencies: {

diff --git a/tests/helpers/shared-test-setups/scoped.ts b/tests/helpers/shared-test-setups/scoped.ts
@@ -13,7 +13,7 @@ const codemodOptions: CodemodOptions = {
 
 const context: Context = {
   addon: {
-    publicAssets: [],
+    publicAssets: {},
   },
   projectRoot: {
     devDependencies: {

diff --git a/tests/helpers/shared-test-setups/typescript.ts b/tests/helpers/shared-test-setups/typescript.ts
@@ -13,7 +13,7 @@ const codemodOptions: CodemodOptions = {
 
 const context: Context = {
   addon: {
-    publicAssets: [],
+    publicAssets: {},
   },
   projectRoot: {
     devDependencies: {

diff --git a/tests/steps/analyze-addon/blueprints.test.ts b/tests/steps/analyze-addon/blueprints.test.ts
@@ -29,7 +29,7 @@ test('steps | analyze-addon > blueprints', function () {
 
   assert.deepStrictEqual(analyzeAddon(options), {
     addon: {
-      publicAssets: [],
+      publicAssets: {},
     },
     projectRoot: {
       devDependencies: {

diff --git a/tests/steps/analyze-addon/edge-case-folders-are-missing.test.ts b/tests/steps/analyze-addon/edge-case-folders-are-missing.test.ts
@@ -13,7 +13,7 @@ test('steps | analyze-addon > edge case (folders are missing)', function () {
 
   assert.deepStrictEqual(analyzeAddon(options), {
     addon: {
-      publicAssets: [],
+      publicAssets: {},
     },
     projectRoot: {
       devDependencies: {

diff --git a/tests/steps/analyze-addon/public-assets.test.ts b/tests/steps/analyze-addon/public-assets.test.ts
@@ -26,10 +26,12 @@ test('steps | analyze-addon > public-assets', function () {
 
   assert.deepStrictEqual(analyzeAddon(options), {
     addon: {
-      publicAssets: [
-        'assets/documents/some-file.pdf',
-        'assets/images/v1/some-file.svg',
-      ],
+      publicAssets: {
+        './public/assets/documents/some-file.pdf':
+          '/ember-container-query/assets/documents/some-file.pdf',
+        './public/assets/images/v1/some-file.svg':
+          '/ember-container-query/assets/images/v1/some-file.svg',
+      },
     },
     projectRoot: {
       devDependencies: {

diff --git a/tests/steps/analyze-addon/test-support.test.ts b/tests/steps/analyze-addon/test-support.test.ts
@@ -20,7 +20,7 @@ test('steps | analyze-addon > test-support', function () {
 
   assert.deepStrictEqual(analyzeAddon(options), {
     addon: {
-      publicAssets: [],
+      publicAssets: {},
     },
     projectRoot: {
       devDependencies: {

diff --git a/tests/steps/update-addon-package-json/public-assets.test.ts b/tests/steps/update-addon-package-json/public-assets.test.ts
@@ -6,6 +6,7 @@ import {
 } from '@codemod-utils/tests';
 
 import { updateAddonPackageJson } from '../../../src/steps/index.js';
+import type { Context } from '../../../src/types/index.js';
 import {
   codemodOptions,
   options,
@@ -20,14 +21,14 @@ test('steps | update-addon-package-json > public-assets', function () {
     'steps/update-addon-package-json/public-assets/output',
   );
 
-  const context = {
+  const context: Context = {
     addon: {
-      appReexports: [],
-      publicAssets: [
-        'assets/documents/some-file.pdf',
-        'assets/images/v1/some-file.svg',
-      ],
-      publicEntrypoints: [],
+      publicAssets: {
+        './public/assets/documents/some-file.pdf':
+          '/ember-container-query/assets/documents/some-file.pdf',
+        './public/assets/images/v1/some-file.svg':
+          '/ember-container-query/assets/images/v1/some-file.svg',
+      },
     },
     projectRoot: {
       devDependencies: {