refactor: Simplified Options['packageManager']

ijlee2 · Apr 26, 2024 · b102ca0 · b102ca0
1 parent 28d104f
commit b102ca0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 26 deletions.
diff --git a/src/blueprints/ember-addon/package.json b/src/blueprints/ember-addon/package.json
@@ -1,4 +1,4 @@
-<% if (options.packageManager.isNpm) { %>{
+<% if (options.packageManager === 'npm') { %>{
   "name": "workspace-root",
   "version": "<%= options.packages.addon.version %>",
   "private": true,
@@ -22,7 +22,7 @@
   "devDependencies": {
     "concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>"
   }
-}<% } else if (options.packageManager.isPnpm) { %>{
+}<% } else if (options.packageManager === 'pnpm') { %>{
   "name": "workspace-root",
   "version": "<%= options.packages.addon.version %>",
   "private": true,
@@ -42,7 +42,7 @@
   "devDependencies": {
     "concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>"
   }
-}<% } else if (options.packageManager.isYarn) { %>{
+}<% } else if (options.packageManager === 'yarn') { %>{
   "name": "workspace-root",
   "version": "<%= options.packages.addon.version %>",
   "private": true,

diff --git a/src/steps/create-files-from-blueprints.ts b/src/steps/create-files-from-blueprints.ts
@@ -18,7 +18,7 @@ function getFilesToSkip(options: Options): string[] {
     files.add('__testAppLocation__/types/global.d.ts');
   }
 
-  if (!packageManager.isPnpm) {
+  if (packageManager !== 'pnpm') {
     files.add('pnpm-workspace.yaml');
   }
 

diff --git a/src/steps/create-options.ts b/src/steps/create-options.ts
@@ -39,13 +39,13 @@ function analyzePackageJson(codemodOptions: CodemodOptions): AddonPackage {
 function analyzePackageManager(codemodOptions: CodemodOptions): PackageManager {
   const { projectRoot } = codemodOptions;
 
-  const mapping = new Map([
-    ['package-lock.json', 'npm'],
-    ['pnpm-lock.yaml', 'pnpm'],
-    ['yarn.lock', 'yarn'],
-  ]);
+  const mapping = {
+    'package-lock.json': 'npm',
+    'pnpm-lock.yaml': 'pnpm',
+    'yarn.lock': 'yarn',
+  } as const;
 
-  const lockFiles = Array.from(mapping.keys());
+  const lockFiles = Object.keys(mapping);
 
   const filePaths = findFiles(lockFiles, {
     projectRoot,
@@ -54,20 +54,12 @@ function analyzePackageManager(codemodOptions: CodemodOptions): PackageManager {
   if (filePaths.length !== 1) {
     console.warn('WARNING: Package manager is unknown. Yarn will be assumed.');
 
-    return {
-      isNpm: false,
-      isPnpm: false,
-      isYarn: true,
-    };
+    return 'yarn';
   }
 
-  const packageManager = mapping.get(filePaths[0]!);
+  const lockfile = filePaths[0] as keyof typeof mapping;
 
-  return {
-    isNpm: packageManager === 'npm',
-    isPnpm: packageManager === 'pnpm',
-    isYarn: packageManager === 'yarn',
-  };
+  return mapping[lockfile];
 }
 
 function deriveAddonLocation(addonPackage: AddonPackage): string {

diff --git a/src/types/index.ts b/src/types/index.ts
@@ -22,11 +22,7 @@ type Options = {
     addon: string;
     testApp: string;
   };
-  packageManager: {
-    isNpm: boolean;
-    isPnpm: boolean;
-    isYarn: boolean;
-  };
+  packageManager: 'npm' | 'pnpm' | 'yarn';
   packages: {
     addon: {
       dependencies: Map<string, string>;