@wwkit/opm 1.0.8 → 1.0.9

package/src/managers/npm.js

@@ -290,8 +290,31 @@ export class NpmManager extends PackageManager {
     return null
   }
 
+  /**
+   * 通过 PATH 查找 bin 路径（Linux: which / Windows: where）
+   * @param {string} name - bin 名
+   * @returns {string|null} bin 路径或 null
+   * @private
+   */
+  _whichBin(name) {
+    const cmd = process.platform === 'win32' ? `where ${name}` : `which ${name}`
+    try {
+      const out = execSync(cmd, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] })
+      const lines = out.trim().split(/\r?\n/).filter(Boolean)
+      return lines[0] || null
+    } catch {
+      return null
+    }
+  }
+
   /**
    * 查询全局安装的包
+   *
+   * 三段式检查：
+   * 1. npm list -g <name>（当前激活 node 全局）
+   * 2. npm root -g 目录直查（同上，兜底）
+   * 3. PATH 回退：which <name> → realpath → 推导全局 node_modules
+   *    覆盖通过其他 node 版本/路径安装的包（如非 nvm 管理的独立 node）
    * @param {string} name - 包名
    * @returns {Promise<InstalledResult>}
    * @private
@@ -316,6 +339,30 @@ export class NpmManager extends PackageManager {
       }
     } catch {}
 
+    // PATH 回退：which <name> → realpath → 推导全局 node_modules
+    try {
+      const binPath = this._whichBin(name)
+      if (binPath) {
+        const realBin = fs.realpathSync(binPath)
+        const binDir = path.dirname(realBin)
+        const candidates = [
+          path.join(binDir, '..', 'package.json'),
+          path.join(binDir, '..', 'lib', 'node_modules', name, 'package.json'),
+          path.join(binDir, '..', 'node_modules', name, 'package.json')
+        ]
+        for (const pkgPath of candidates) {
+          try {
+            if (fs.existsSync(pkgPath)) {
+              const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'))
+              return { name, installed: true, version: pkg.version, path: path.dirname(pkgPath), global: true }
+            }
+          } catch {}
+        }
+        // 找到 bin 但推导不到 package.json（极端情况）
+        return { name, installed: true, global: true }
+      }
+    } catch {}
+
     return { name, installed: false, global: true }
   }
 
@@ -375,48 +422,6 @@ export class NpmManager extends PackageManager {
     return { name, versions: [], registry }
   }
 
-  async listInstalled(opts = {}) {
-    if (opts.global) {
-      try {
-        const data = this._execJson(['list', '-g', '--depth=0'])
-        const deps = data?.dependencies || {}
-        return Object.entries(deps)
-          .filter(([, info]) => info && info.version)
-          .map(([name, info]) => ({ name, version: info.version, global: true }))
-      } catch (err) {
-        throw new Error(`npm list -g failed: ${err.message}`)
-      }
-    }
-
-    const declared = this._readDeclaredDeps()
-    const workspaces = this._readWorkspacePackages()
-    const items = []
-    const seen = new Set()
-
-    for (const { name, version, dir } of workspaces) {
-      if (seen.has(name)) continue
-      seen.add(name)
-      const resolved = this._resolveInstalled(name)
-      items.push({
-        name,
-        version: resolved ? resolved.version : version,
-        path: resolved ? resolved.path : dir
-      })
-    }
-
-    for (const [name, declaredVersion] of Object.entries(declared)) {
-      if (seen.has(name)) continue
-      seen.add(name)
-      const resolved = this._resolveInstalled(name)
-      items.push({
-        name,
-        version: resolved ? resolved.version : declaredVersion
-      })
-    }
-
-    return items
-  }
-
   async listOutdated(opts = {}) {
     try {
       const args = ['outdated']
@@ -455,7 +460,8 @@ export class NpmManager extends PackageManager {
 
   /**
    * 构造 --dangerously-allow-all-scripts 参数（仅 npm >= 11 支持）
-   * npm < 11 默认放行所有脚本，无需此 flag；npm >= 11 默认阻止，需显式放行
+   * npm < 11 默认放行所有脚本，无需此 flag；npm >= 11 默认阻止，需显式放行。
+   * install/upgrade 始终追加，保持与 npm < 11 一致的脚本行为（postinstall 可执行）。
    * @param {string} name - 包名（保留签名兼容，未使用）
    * @returns {string[]}
    * @private
@@ -470,7 +476,7 @@ export class NpmManager extends PackageManager {
     if (opts.global) args.push('-g')
     args.push(...this._proxyArgs(opts.proxy))
     args.push(...this._registryArgs())
-    if (opts.allowScripts) args.push(...this._allowScriptsArgs(name))
+    args.push(...this._allowScriptsArgs(name))
 
     this._execInherit(args)
     return { name, version: version || 'latest', action: 'installed' }
@@ -489,7 +495,7 @@ export class NpmManager extends PackageManager {
     if (opts.global) args.push('-g')
     args.push(...this._proxyArgs(opts.proxy))
     args.push(...this._registryArgs())
-    if (opts.allowScripts) args.push(...this._allowScriptsArgs(name))
+    args.push(...this._allowScriptsArgs(name))
 
     this._execInherit(args)
     return { name, version: 'latest', action: 'upgraded' }

package/src/managers/pip.js

@@ -429,6 +429,23 @@ export class PipManager extends PackageManager {
     return null
   }
 
+  /**
+   * 通过 PATH 查找 bin 路径（Linux: which / Windows: where）
+   * @param {string} name - bin 名
+   * @returns {string|null} bin 路径或 null
+   * @private
+   */
+  _whichBin(name) {
+    const cmd = process.platform === 'win32' ? `where ${name}` : `which ${name}`
+    try {
+      const out = execSync(cmd, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] })
+      const lines = out.trim().split(/\r?\n/).filter(Boolean)
+      return lines[0] || null
+    } catch {
+      return null
+    }
+  }
+
   async isInstalled(name, opts = {}) {
     const info = this._parsePipShow(name, opts)
     if (info) {
@@ -441,6 +458,13 @@ export class PipManager extends PackageManager {
       }
     }
 
+    if (opts.global) {
+      const binPath = this._whichBin(name)
+      if (binPath) {
+        return { name, installed: true, global: true, path: binPath }
+      }
+    }
+
     return { name, installed: false, ...(opts.global ? { global: true } : {}) }
   }
 
@@ -487,24 +511,6 @@ export class PipManager extends PackageManager {
     return { name, versions: [], registry }
   }
 
-  async listInstalled(opts = {}) {
-    try {
-      const out = this._execPip(['list', '--format=freeze'], opts)
-      const items = []
-      for (const line of out.split('\n')) {
-        const trimmed = line.trim()
-        if (!trimmed) continue
-        const match = trimmed.match(/^([a-zA-Z0-9_-]+)==(.+)$/)
-        if (match) {
-          items.push({ name: match[1], version: match[2], ...(opts.global ? { global: true } : {}) })
-        }
-      }
-      return items
-    } catch (err) {
-      throw new Error(`pip list failed: ${err.message}`)
-    }
-  }
-
   async listOutdated(opts = {}) {
     try {
       const args = ['list', '--outdated', '--format=json']

package/src/managers/winget.js

@@ -175,6 +175,9 @@ export class WingetManager extends PackageManager {
   }
 
   async isInstalled(name, opts = {}) {
+    if (opts.global === false) {
+      return { name, installed: false, hint: 'no project scope (system-level manager)' }
+    }
     const out = this._exec(
       ['list', name, '--accept-source-agreements', '--disable-interactivity'],
       { allowNonZero: true }
@@ -218,19 +221,6 @@ export class WingetManager extends PackageManager {
     }
   }
 
-  async listInstalled(opts = {}) {
-    const out = this._exec(
-      ['list', '--accept-source-agreements', '--disable-interactivity'],
-      { allowNonZero: true }
-    )
-    return this._parseTable(out).map((r) => ({
-      name: r.Name || r.Id,
-      id: r.Id,
-      version: r.Version || 'unknown',
-      source: r.Source || '',
-    }))
-  }
-
   async listOutdated(opts = {}) {
     const out = this._exec(
       ['list', '--upgrade-available', '--accept-source-agreements', '--disable-interactivity'],