@epic-web/workshop-utils 6.74.3 → 6.75.0

package/dist/launch-editor.server.js

@@ -165,6 +165,32 @@ function getArgumentsForLineNumber(editor, fileName, lineNumber, colNumber, work
     // can result in errors or confusing behavior.
     return [fileName];
 }
+function getWindowsProcessPaths() {
+    const systemRoot = process.env.SystemRoot ?? process.env.WINDIR;
+    const wmicPath = systemRoot
+        ? path.join(systemRoot, 'System32', 'wbem', 'wmic.exe')
+        : null;
+    if (wmicPath && fs.existsSync(wmicPath)) {
+        try {
+            const output = child_process
+                .execSync(`"${wmicPath}" process where "executablepath is not null" get executablepath`, { stdio: ['ignore', 'pipe', 'ignore'] })
+                .toString();
+            return output.split(/\r?\n/);
+        }
+        catch {
+            // Fall through to PowerShell
+        }
+    }
+    try {
+        const output = child_process
+            .execSync('powershell.exe -NoProfile -Command "Get-Process | Where-Object { $_.Path } | ForEach-Object { $_.Path }"', { stdio: ['ignore', 'pipe', 'ignore'] })
+            .toString();
+        return output.split(/\r?\n/);
+    }
+    catch {
+        return [];
+    }
+}
 function guessEditor() {
     // Explicit config always wins
     if (process.env.EPICSHOP_EDITOR) {
@@ -188,10 +214,7 @@ function guessEditor() {
         else if (process.platform === 'win32') {
             // Some processes need elevated rights to get its executable path.
             // Just filter them out upfront. This also saves 10-20ms on the command.
-            const output = child_process
-                .execSync('wmic process where "executablepath is not null" get executablepath')
-                .toString();
-            const runningProcesses = output.split('\r\n');
+            const runningProcesses = getWindowsProcessPaths();
             for (let i = 0; i < runningProcesses.length; i++) {
                 const processPath = runningProcesses[i]?.trim();
                 if (!processPath)

package/dist/package-install/package-install-check.server.d.ts

@@ -7,7 +7,7 @@ export type RootPackageInstallStatus = {
     missingDependencies: Array<string>;
     missingDevDependencies: Array<string>;
     missingOptionalDependencies: Array<string>;
-    reason: 'missing-node-modules' | 'missing-dependencies' | 'package-json-unreadable' | 'up-to-date';
+    reason: 'missing-dependencies' | 'package-json-unreadable' | 'up-to-date';
 };
 export type WorkspaceInstallStatus = {
     roots: Array<RootPackageInstallStatus>;

package/dist/package-install/package-install-check.server.js

@@ -1,6 +1,7 @@
 import { createHash } from 'node:crypto';
 import fs from 'node:fs/promises';
 import path from 'node:path';
+import { execa } from 'execa';
 import { globby } from 'globby';
 import { getErrorMessage } from "../utils.js";
 const workspaceIgnorePatterns = [
@@ -76,39 +77,53 @@ async function listPackageJsonPaths(cwd) {
         ignore: workspaceIgnorePatterns,
     });
 }
-async function listInstalledPackages(nodeModulesPath) {
+function parseNpmLsOutput(raw) {
+    const trimmed = raw.trim();
+    if (!trimmed)
+        return null;
     try {
-        const entries = await fs.readdir(nodeModulesPath, { withFileTypes: true });
-        const packages = new Set();
-        for (const entry of entries) {
-            if (entry.name.startsWith('.'))
-                continue;
-            if (entry.name.startsWith('@')) {
-                if (!entry.isDirectory())
-                    continue;
-                const scopePath = path.join(nodeModulesPath, entry.name);
-                const scopeEntries = await fs.readdir(scopePath, {
-                    withFileTypes: true,
-                });
-                for (const scopedEntry of scopeEntries) {
-                    if (scopedEntry.name.startsWith('.'))
-                        continue;
-                    if (scopedEntry.isDirectory() || scopedEntry.isSymbolicLink()) {
-                        packages.add(`${entry.name}/${scopedEntry.name}`);
-                    }
-                }
-                continue;
-            }
-            if (entry.isDirectory() || entry.isSymbolicLink()) {
-                packages.add(entry.name);
-            }
-        }
-        return packages;
+        return JSON.parse(trimmed);
     }
     catch {
         return null;
     }
 }
+function getFailingDependencies(expectedDependencies, output) {
+    if (!output?.dependencies)
+        return expectedDependencies;
+    return expectedDependencies.filter((dependency) => {
+        const entry = output.dependencies?.[dependency];
+        if (!entry)
+            return true;
+        return Boolean(entry.missing || entry.invalid);
+    });
+}
+async function checkDependenciesWithNpmLs(rootDir, expectedDependencies, packageManager) {
+    if (expectedDependencies.length === 0) {
+        return { ok: true, failingDependencies: [] };
+    }
+    // Use the detected package manager, defaulting to npm
+    // pnpm has compatible ls output format
+    const command = packageManager === 'pnpm' ? 'pnpm' : 'npm';
+    try {
+        const result = await execa(command, ['ls', '--depth=0', '--json', ...expectedDependencies], { cwd: rootDir, reject: false });
+        const output = parseNpmLsOutput(result.stdout);
+        const ok = result.exitCode === 0;
+        const failingDependencies = ok
+            ? []
+            : getFailingDependencies(expectedDependencies, output);
+        return {
+            ok,
+            failingDependencies: ok || failingDependencies.length > 0
+                ? failingDependencies
+                : expectedDependencies,
+        };
+    }
+    catch (error) {
+        console.warn(`⚠️  Failed to run npm ls in ${rootDir}:`, getErrorMessage(error));
+        return { ok: false, failingDependencies: expectedDependencies };
+    }
+}
 function getExpectedDependencies(dependencies) {
     return Object.keys(dependencies ?? {}).sort();
 }
@@ -148,11 +163,7 @@ export async function getRootPackageInstallStatus(packageJsonPath) {
     const dependencies = getExpectedDependencies(packageJson.dependencies);
     const devDependencies = getExpectedDependencies(packageJson.devDependencies);
     const optionalDependencies = getExpectedDependencies(packageJson.optionalDependencies);
-    const expectedDependencies = [
-        ...dependencies,
-        ...devDependencies,
-        ...optionalDependencies,
-    ];
+    const expectedDependencies = Array.from(new Set([...dependencies, ...devDependencies, ...optionalDependencies]));
     if (expectedDependencies.length === 0) {
         return {
             rootDir,
@@ -166,23 +177,12 @@ export async function getRootPackageInstallStatus(packageJsonPath) {
             reason: 'up-to-date',
         };
     }
-    const installedPackages = await listInstalledPackages(path.join(rootDir, 'node_modules'));
-    if (!installedPackages) {
-        return {
-            rootDir,
-            packageJsonPath,
-            packageManager,
-            dependencyHash,
-            dependenciesNeedInstall: true,
-            missingDependencies: dependencies,
-            missingDevDependencies: devDependencies,
-            missingOptionalDependencies: optionalDependencies,
-            reason: 'missing-node-modules',
-        };
-    }
-    const missingDependencies = dependencies.filter((dep) => !installedPackages.has(dep));
-    const missingDevDependencies = devDependencies.filter((dep) => !installedPackages.has(dep));
-    const missingOptionalDependencies = optionalDependencies.filter((dep) => !installedPackages.has(dep));
+    const npmLsResult = await checkDependenciesWithNpmLs(rootDir, expectedDependencies, packageManager);
+    const failingDependencies = new Set(npmLsResult.failingDependencies);
+    const missingDependencies = dependencies.filter((dep) => failingDependencies.has(dep));
+    const missingDevDependencies = devDependencies.filter((dep) => failingDependencies.has(dep));
+    const missingOptionalDependencies = optionalDependencies.filter((dep) => failingDependencies.has(dep));
+    // Optional dependencies should not trigger install requirement
     const dependenciesNeedInstall = missingDependencies.length > 0 || missingDevDependencies.length > 0;
     return {
         rootDir,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@epic-web/workshop-utils",
-  "version": "6.74.3",
+  "version": "6.75.0",
   "publishConfig": {
     "access": "public"
   },