fix: preferred pm logic enhancement

packages/api/src/codegen/languages/typescript/index.ts

@@ -80,8 +80,10 @@ function handleExecFailure(err: Error, opts: InstallerOptions = {}) {
   throw err;
 }
 
-async function detectPackageManager(installDir: string) {
-  const pm = await preferredPM(installDir);
+async function detectPackageManager() {
+  const projectDir = Storage.getProjectDir();
+
+  const pm = await preferredPM(projectDir);
   if (pm) {
     return pm.name;
   }
@@ -162,7 +164,7 @@ export default class TSGenerator extends CodeGenerator {
   // eslint-disable-next-line class-methods-use-this
   async install(storage: Storage, opts: InstallerOptions = {}): Promise<void> {
     const installDir = storage.getIdentifierStorageDir();
-    const packageManager = await detectPackageManager(installDir);
+    const packageManager = await detectPackageManager();
 
     const installCommand = ['install', '--save', opts.dryRun ? '--dry-run' : ''].filter(Boolean);
 
@@ -189,8 +191,7 @@ export default class TSGenerator extends CodeGenerator {
 
   static async uninstall(storage: Storage, opts: InstallerOptions = {}): Promise<void> {
     const pkgName = storage.getPackageName() as string;
-    const installDir = storage.getIdentifierStorageDir();
-    const packageManager = await detectPackageManager(installDir);
+    const packageManager = await detectPackageManager();
 
     const args = ['uninstall', pkgName, opts.dryRun ? '--dry-run' : ''].filter(Boolean);
     return execa(packageManager, args)

packages/api/src/storage.ts

@@ -79,6 +79,21 @@ export default class Storage {
     fs.mkdirSync(Storage.getAPIsDir(), { recursive: true });
   }
 
+  /**
+   * Retrieves the project's root directory path.
+   *
+   * If a storage directory has not been explicitly set, this method will default it to
+   * the current working directory. It then returns the directory name of the storage path.
+   *
+   */
+  static getProjectDir() {
+    if (!Storage.dir) {
+      Storage.setStorageDir();
+    }
+
+    return path.dirname(Storage.dir);
+  }
+
   /**
    * Reset the state of the entire storage system.
    *

packages/api/test/storage.test.ts

@@ -64,6 +64,22 @@ describe('storage', () => {
     });
   });
 
+  describe('#getProjectDir', () => {
+    it('should return the parent directory of the storage directory', () => {
+      Storage.setStorageDir(uniqueTempDir());
+      const projectDir = Storage.getProjectDir();
+      expect(projectDir).toBe(path.dirname(Storage.dir));
+    });
+
+    it('should set and return default storage directory if none is set', () => {
+      Storage.dir = '';
+      const projectDir = Storage.getProjectDir();
+      expect(Storage.dir).toBe(path.join(process.cwd(), '.api'));
+      expect(projectDir).toBe(path.dirname(Storage.dir));
+      expect(projectDir).toBe(process.cwd());
+    });
+  });
+
   describe('#generateIntegrityHash', () => {
     it('should generate an integrity hash for an API definition', () => {
       expect(Storage.generateIntegrityHash(petstoreSimple as OASDocument)).toBe(