@pnpm/lockfile.filtering 1100.0.7 → 1100.1.0

package/lib/filterImporter.d.ts

@@ -2,4 +2,6 @@ import type { ProjectSnapshot } from '@pnpm/lockfile.types';
 import type { DependenciesField } from '@pnpm/types';
 export declare function filterImporter(importer: ProjectSnapshot, include: {
     [dependenciesField in DependenciesField]: boolean;
+}, opts?: {
+    skipRuntimes?: boolean;
 }): ProjectSnapshot;

package/lib/filterImporter.js

@@ -1,9 +1,23 @@
-export function filterImporter(importer, include) {
+export function filterImporter(importer, include, opts) {
+    const skipRuntimes = opts?.skipRuntimes === true;
     return {
-        dependencies: !include.dependencies ? {} : importer.dependencies ?? {},
-        devDependencies: !include.devDependencies ? {} : importer.devDependencies ?? {},
-        optionalDependencies: !include.optionalDependencies ? {} : importer.optionalDependencies ?? {},
-        specifiers: importer.specifiers,
+        dependencies: !include.dependencies ? {} : pickNonRuntime(importer.dependencies, skipRuntimes),
+        devDependencies: !include.devDependencies ? {} : pickNonRuntime(importer.devDependencies, skipRuntimes),
+        optionalDependencies: !include.optionalDependencies ? {} : pickNonRuntime(importer.optionalDependencies, skipRuntimes),
+        specifiers: pickNonRuntime(importer.specifiers, skipRuntimes),
     };
 }
+function pickNonRuntime(deps, skipRuntimes) {
+    if (!deps)
+        return {};
+    if (!skipRuntimes)
+        return deps;
+    const result = {};
+    for (const [name, ref] of Object.entries(deps)) {
+        if (!ref.startsWith('runtime:')) {
+            result[name] = ref;
+        }
+    }
+    return result;
+}
 //# sourceMappingURL=filterImporter.js.map

package/lib/filterLockfile.d.ts

@@ -5,4 +5,5 @@ export declare function filterLockfile(lockfile: LockfileObject, opts: {
         [dependenciesField in DependenciesField]: boolean;
     };
     skipped: Set<DepPath>;
+    skipRuntimes?: boolean;
 }): LockfileObject;

package/lib/filterLockfileByImporters.d.ts

@@ -5,5 +5,6 @@ export declare function filterLockfileByImporters(lockfile: LockfileObject, impo
         [dependenciesField in DependenciesField]: boolean;
     };
     skipped: Set<DepPath>;
+    skipRuntimes?: boolean;
     failOnMissingDependencies: boolean;
 }): LockfileObject;

package/lib/filterLockfileByImporters.js

@@ -5,16 +5,16 @@ import { logger } from '@pnpm/logger';
 import { filterImporter } from './filterImporter.js';
 const lockfileLogger = logger('lockfile');
 export function filterLockfileByImporters(lockfile, importerIds, opts) {
+    const importers = { ...lockfile.importers };
+    for (const importerId of importerIds) {
+        importers[importerId] = filterImporter(lockfile.importers[importerId], opts.include, { skipRuntimes: opts.skipRuntimes });
+    }
     const packages = {};
     if (lockfile.packages != null) {
-        pkgAllDeps(lockfileWalker(lockfile, importerIds, { include: opts.include, skipped: opts.skipped }).step, packages, {
+        pkgAllDeps(lockfileWalker({ ...lockfile, importers }, importerIds, { include: opts.include, skipped: opts.skipped }).step, packages, {
             failOnMissingDependencies: opts.failOnMissingDependencies,
         });
     }
-    const importers = { ...lockfile.importers };
-    for (const importerId of importerIds) {
-        importers[importerId] = filterImporter(lockfile.importers[importerId], opts.include);
-    }
     return {
         ...lockfile,
         importers,

package/lib/filterLockfileByImportersAndEngine.d.ts

@@ -18,6 +18,7 @@ export interface FilterLockfileOptions {
     failOnMissingDependencies: boolean;
     lockfileDir: string;
     skipped: Set<string>;
+    skipRuntimes?: boolean;
     supportedArchitectures?: SupportedArchitectures;
 }
 export declare function filterLockfileByImportersAndEngine(lockfile: LockfileObject, importerIds: ProjectId[], opts: FilterLockfileOptions): FilterLockfileResult;

package/lib/filterLockfileByImportersAndEngine.js

@@ -16,6 +16,7 @@ export function filterLockfileByImportersAndEngine(lockfile, importerIds, opts)
     const directDepPaths = toImporterDepPaths(lockfile, importerIds, {
         include: opts.include,
         importerIdSet,
+        skipRuntimes: opts.skipRuntimes,
     });
     const packages = lockfile.packages != null
         ? pickPkgsWithAllDeps(lockfile, directDepPaths, importerIdSet, {
@@ -26,11 +27,12 @@ export function filterLockfileByImportersAndEngine(lockfile, importerIds, opts)
             includeIncompatiblePackages: opts.includeIncompatiblePackages === true,
             lockfileDir: opts.lockfileDir,
             skipped: opts.skipped,
+            skipRuntimes: opts.skipRuntimes,
             supportedArchitectures: opts.supportedArchitectures,
         })
         : {};
     const importers = mapValues((importer) => {
-        const newImporter = filterImporter(importer, opts.include);
+        const newImporter = filterImporter(importer, opts.include, { skipRuntimes: opts.skipRuntimes });
         if (newImporter.optionalDependencies != null) {
             newImporter.optionalDependencies = pickBy((ref, depName) => {
                 const depPath = dp.refToRelative(ref, depName);
@@ -110,6 +112,7 @@ function pkgAllDeps(ctx, depPaths, parentIsInstallable, opts) {
         nextRelDepPaths.push(...toImporterDepPaths(ctx.lockfile, additionalImporterIds, {
             include: opts.include,
             importerIdSet: ctx.importerIdSet,
+            skipRuntimes: opts.skipRuntimes,
         }));
         pkgAllDeps(ctx, nextRelDepPaths, installable, opts);
     }
@@ -124,7 +127,8 @@ function toImporterDepPaths(lockfile, importerIds, opts) {
             ? importer.optionalDependencies
             : {}),
     }))
-        .map(Object.entries);
+        .map(Object.entries)
+        .map(entries => opts.skipRuntimes ? entries.filter(([, ref]) => !ref.startsWith('runtime:')) : entries);
     let { depPaths, importerIds: nextImporterIds } = parseDepRefs(unnest(importerDeps), lockfile);
     if (!nextImporterIds.length) {
         return depPaths;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/lockfile.filtering",
-  "version": "1100.0.7",
+  "version": "1100.1.0",
   "description": "Filters a lockfile",
   "keywords": [
     "pnpm",
@@ -28,25 +28,25 @@
   "dependencies": {
     "ramda": "npm:@pnpm/ramda@0.28.1",
     "@pnpm/constants": "1100.0.0",
-    "@pnpm/config.package-is-installable": "1100.0.3",
-    "@pnpm/lockfile.utils": "1100.0.6",
-    "@pnpm/deps.path": "1100.0.2",
-    "@pnpm/lockfile.walker": "1100.0.4",
-    "@pnpm/lockfile.types": "1100.0.4",
+    "@pnpm/deps.path": "1100.0.3",
+    "@pnpm/config.package-is-installable": "1100.0.4",
+    "@pnpm/lockfile.utils": "1100.0.7",
+    "@pnpm/lockfile.walker": "1100.0.5",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/types": "1101.0.0"
+    "@pnpm/types": "1101.1.0",
+    "@pnpm/lockfile.types": "1100.0.5"
   },
   "peerDependencies": {
-    "@pnpm/logger": "^1001.0.1"
+    "@pnpm/logger": ">=1001.0.0 <1002.0.0"
   },
   "devDependencies": {
     "@jest/globals": "30.3.0",
     "@types/ramda": "0.31.1",
-    "detect-libc": "^2.1.2",
+    "detect-libc": "^2.0.3",
     "tempy": "3.0.0",
     "write-yaml-file": "^6.0.0",
     "yaml-tag": "1.1.0",
-    "@pnpm/lockfile.filtering": "1100.0.7",
+    "@pnpm/lockfile.filtering": "1100.1.0",
     "@pnpm/logger": "1100.0.0"
   },
   "engines": {