fix: Pnpm and apt tests

Author: kevinwang5658

package-lock.json

@@ -57,7 +57,7 @@
   "devDependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.97",
     "@apidevtools/json-schema-ref-parser": "^11.7.2",
-    "@codifycli/plugin-test": "1.1.0-beta6",
+    "@codifycli/plugin-test": "1.1.0-beta7",
     "@fastify/merge-json-schemas": "^0.2.0",
     "@oclif/prettier-config": "^0.2.1",
     "@oclif/test": "^3",

package.json

@@ -15,13 +15,18 @@ export class PnpmGlobalEnvStatefulParameter extends StatefulParameter<PnpmConfig
   async refresh(): Promise<null | string> {
     const pty = getPty()
 
-    const { data: path } = await pty.spawnSafe('echo $PNPM_HOME/node')
-    if (!path || !(await FileUtils.fileExists(path))) {
+    const { data: nodejsDir } = await pty.spawnSafe('echo $PNPM_HOME/bin', { interactive: true })
+    if (!nodejsDir?.trim() || !(await FileUtils.dirExists(nodejsDir.trim()))) {
       return null;
     }
 
-    const { data: version } = await pty.spawn(`${path} -v`)
-    return version.trim().slice(1);
+    const nodeBin = `${nodejsDir.trim()}/node`
+    if (!(await FileUtils.fileExists(nodeBin))) {
+      return null;
+    }
+
+    const { data: version } = await pty.spawn(`${nodeBin} -v`)
+    return version.trim().replace(/^v/, '');
   }
 
   async add(valueToAdd: string): Promise<void> {
@@ -31,12 +36,12 @@ export class PnpmGlobalEnvStatefulParameter extends StatefulParameter<PnpmConfig
 
   async modify(newValue: string): Promise<void> {
     const $ = getPty();
-    await $.spawn(`pnpm runtime set node -g  ${newValue}`, { interactive: true })
+    await $.spawn(`pnpm runtime set node -g ${newValue}`, { interactive: true })
   }
 
   async remove(): Promise<void> {
     const $ = getPty();
-    const { data: path } = await $.spawn('echo $PNPM_HOME/nodejs', { interactive: true })
-    await fs.rm(path!, { recursive: true, force: true });
+    const { data: nodejsDir } = await $.spawn('echo $PNPM_HOME/nodejs', { interactive: true })
+    await fs.rm(nodejsDir.trim(), { recursive: true, force: true });
   }
 }

src/resources/javascript/pnpm/pnpm-global-env-stateful-parameter.ts

@@ -73,26 +73,40 @@ export class Pnpm extends Resource<PnpmConfig> {
       : path.join(os.homedir(), '.local', 'share', 'pnpm');
 
     const { data: pnpmLocation } = await $.spawn('which pnpm', { interactive: true });
-    if (pnpmLocation.trim().toLowerCase() !== path.join(expectedPnpmHome, 'pnpm').trim().toLowerCase()) {
-      throw new Error('pnpm was installed outside of Codify. Please uninstall manually and re-run Codify');
-    }
+    const actual = pnpmLocation.trim().toLowerCase();
 
-    const { data: pnpmHome } = await $.spawnSafe('echo $PNPM_HOME', { interactive: true });
-    if (!pnpmHome) {
-      throw new Error('$PNPM_HOME variable is not set. Unable to determine how to uninstall pnpm. Please uninstall manually and re-run Codify.')
-    }
+    const expectedPnpmBin = path.join(expectedPnpmHome, 'bin', 'pnpm').toLowerCase();
+    const expectedPnpmBinFallback = path.join(expectedPnpmHome, 'pnpm').toLowerCase();
+    const isInstalledByScript = actual === expectedPnpmBin || actual === expectedPnpmBinFallback;
+    const isInstalledByNpm = actual.includes('node_modules/.bin/pnpm') || actual.includes('node_modules/pnpm');
+    const isInstalledByHomebrew = actual.includes('/homebrew/') || actual.includes('/linuxbrew/') || actual.includes('/opt/homebrew/');
 
-    await fs.rm(pnpmHome, { recursive: true, force: true });
-    console.log('Successfully uninstalled pnpm');
+    if (isInstalledByScript) {
+      const { data: pnpmHome } = await $.spawnSafe('echo $PNPM_HOME', { interactive: true });
+      await fs.rm(pnpmHome?.trim() || expectedPnpmHome, { recursive: true, force: true });
 
-    const shellRc = Utils.getPrimaryShellRc();
-    await FileUtils.removeLineFromStartupFile('# pnpm')
-    await FileUtils.removeLineFromStartupFile(`export PNPM_HOME="${expectedPnpmHome}"`)
-    await FileUtils.removeFromFile(shellRc,
+      const shellRc = Utils.getPrimaryShellRc();
+      await FileUtils.removeLineFromStartupFile('# pnpm')
+      await FileUtils.removeLineFromStartupFile(`export PNPM_HOME="${expectedPnpmHome}"`)
+      await FileUtils.removeFromFile(shellRc,
+`case ":$PATH:" in
+  *":$PNPM_HOME/bin:"*) ;;
+  *) export PATH="$PNPM_HOME/bin:$PATH" ;;
+esac`)
+      await FileUtils.removeFromFile(shellRc,
 `case ":$PATH:" in
   *":$PNPM_HOME:"*) ;;
   *) export PATH="$PNPM_HOME:$PATH" ;;
 esac`)
-    await FileUtils.removeLineFromStartupFile('# pnpm end')
+      await FileUtils.removeLineFromStartupFile('# pnpm end')
+    } else if (isInstalledByNpm) {
+      await $.spawn('npm uninstall -g pnpm', { interactive: true });
+    } else if (isInstalledByHomebrew) {
+      await Utils.uninstallViaPkgMgr('pnpm');
+    } else {
+      throw new Error(`pnpm is installed at an unrecognized location: ${actual}. Please uninstall manually and re-run Codify`);
+    }
+
+    console.log('Successfully uninstalled pnpm');
   }
 }

src/resources/javascript/pnpm/pnpm.ts

@@ -50,20 +50,22 @@ describe('Apt resource integration tests', { skip: !Utils.isLinux() }, () => {
   });
 
   it('Can install packages with specific versions', { timeout: 300000 }, async () => {
-    // Get available version of a package
-    const { data: availableVersions } = await testSpawn('apt-cache madison curl | head -1 | awk \'{print $3}\'');
+    // Use the currently installed version (or latest available if not installed) to test version-pinned syntax
+    const { data: installedVer } = await testSpawn('dpkg-query -W -f=\'${Version}\' curl 2>/dev/null || true');
+    const { data: availableVer } = await testSpawn('apt-cache madison curl | head -1 | awk \'{print $3}\'');
+    const pinnedVersion = installedVer.trim() || availableVer.trim();
 
     await PluginTester.fullTest(pluginPath, [{
       type: 'apt',
       install: [
-        `curl=${availableVersions}`
+        `curl=${pinnedVersion}`
       ]
     }], {
       skipUninstall: true,
       validateApply: async () => {
         expect(await testSpawn('which curl')).toMatchObject({ status: SpawnStatus.SUCCESS });
-        const { data: installedVersion } = await testSpawn('dpkg-query -W -f=\'${Version}\' curl');
-        expect(installedVersion).toBe(availableVersions);
+        const { data: actualVersion } = await testSpawn('dpkg-query -W -f=\'${Version}\' curl');
+        expect(actualVersion).toBe(pinnedVersion);
       },
     });
   });