@pnpm/lockfile.filtering 1100.1.13 → 1100.1.14

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @pnpm/filter-lockfile
 
+## 1100.1.14
+
+### Patch Changes
+
+- Republished every package: the tarballs published by the v11.13.1 through v11.16.0 releases were missing most of their compiled files due to a packing bug [#13164](https://github.com/pnpm/pnpm/issues/13164).
+
+- Updated dependencies:
+  - @pnpm/config.package-is-installable@1100.0.16
+  - @pnpm/constants@1100.0.1
+  - @pnpm/deps.path@1100.0.11
+  - @pnpm/error@1100.1.0
+  - @pnpm/lockfile.types@1100.0.16
+  - @pnpm/lockfile.utils@1100.1.5
+  - @pnpm/lockfile.walker@1100.0.16
+  - @pnpm/types@1101.6.0
+
 ## 1100.1.13
 
 ### Patch Changes

package/lib/filterImporter.d.ts

@@ -0,0 +1,7 @@
+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

@@ -0,0 +1,23 @@
+export function filterImporter(importer, include, opts) {
+    const skipRuntimes = opts?.skipRuntimes === true;
+    return {
+        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

@@ -0,0 +1,9 @@
+import type { LockfileObject } from '@pnpm/lockfile.types';
+import type { DependenciesField, DepPath } from '@pnpm/types';
+export declare function filterLockfile(lockfile: LockfileObject, opts: {
+    include: {
+        [dependenciesField in DependenciesField]: boolean;
+    };
+    skipped: Set<DepPath>;
+    skipRuntimes?: boolean;
+}): LockfileObject;

package/lib/filterLockfile.js

@@ -0,0 +1,8 @@
+import { filterLockfileByImporters } from './filterLockfileByImporters.js';
+export function filterLockfile(lockfile, opts) {
+    return filterLockfileByImporters(lockfile, Object.keys(lockfile.importers), {
+        ...opts,
+        failOnMissingDependencies: false,
+    });
+}
+//# sourceMappingURL=filterLockfile.js.map

package/lib/filterLockfileByImporters.d.ts

@@ -0,0 +1,10 @@
+import type { LockfileObject } from '@pnpm/lockfile.types';
+import type { DependenciesField, DepPath, ProjectId } from '@pnpm/types';
+export declare function filterLockfileByImporters(lockfile: LockfileObject, importerIds: ProjectId[], opts: {
+    include: {
+        [dependenciesField in DependenciesField]: boolean;
+    };
+    skipped: Set<DepPath>;
+    skipRuntimes?: boolean;
+    failOnMissingDependencies: boolean;
+}): LockfileObject;

package/lib/filterLockfileByImporters.js

@@ -0,0 +1,36 @@
+import { WANTED_LOCKFILE } from '@pnpm/constants';
+import { LockfileMissingDependencyError } from '@pnpm/error';
+import { lockfileWalker } from '@pnpm/lockfile.walker';
+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, importers }, importerIds, { include: opts.include, skipped: opts.skipped }).step, packages, {
+            failOnMissingDependencies: opts.failOnMissingDependencies,
+        });
+    }
+    return {
+        ...lockfile,
+        importers,
+        packages,
+    };
+}
+function pkgAllDeps(step, pickedPackages, opts) {
+    for (const { pkgSnapshot, depPath, next } of step.dependencies) {
+        pickedPackages[depPath] = pkgSnapshot;
+        pkgAllDeps(next(), pickedPackages, opts);
+    }
+    for (const depPath of step.missing) {
+        if (opts.failOnMissingDependencies) {
+            throw new LockfileMissingDependencyError(depPath);
+        }
+        lockfileLogger.debug(`No entry for "${depPath}" in ${WANTED_LOCKFILE}`);
+    }
+}
+//# sourceMappingURL=filterLockfileByImporters.js.map

package/lib/filterLockfileByImportersAndEngine.d.ts

@@ -0,0 +1,24 @@
+import type { LockfileObject } from '@pnpm/lockfile.types';
+import type { DependenciesField, ProjectId, SupportedArchitectures } from '@pnpm/types';
+export interface FilterLockfileResult {
+    lockfile: LockfileObject;
+    selectedImporterIds: ProjectId[];
+}
+export declare function filterLockfileByEngine(lockfile: LockfileObject, opts: FilterLockfileOptions): FilterLockfileResult;
+export interface FilterLockfileOptions {
+    currentEngine: {
+        nodeVersion?: string;
+        pnpmVersion: string;
+    };
+    engineStrict: boolean;
+    include: {
+        [dependenciesField in DependenciesField]: boolean;
+    };
+    includeIncompatiblePackages?: boolean;
+    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

@@ -0,0 +1,165 @@
+import { packageIsInstallable } from '@pnpm/config.package-is-installable';
+import { WANTED_LOCKFILE } from '@pnpm/constants';
+import * as dp from '@pnpm/deps.path';
+import { LockfileMissingDependencyError } from '@pnpm/error';
+import { nameVerFromPkgSnapshot } from '@pnpm/lockfile.utils';
+import { logger } from '@pnpm/logger';
+import { map as mapValues, pickBy, unnest } from 'ramda';
+import { filterImporter } from './filterImporter.js';
+const lockfileLogger = logger('lockfile');
+export function filterLockfileByEngine(lockfile, opts) {
+    const importerIds = Object.keys(lockfile.importers);
+    return filterLockfileByImportersAndEngine(lockfile, importerIds, opts);
+}
+export function filterLockfileByImportersAndEngine(lockfile, importerIds, opts) {
+    const importerIdSet = new Set(importerIds);
+    const directDepPaths = toImporterDepPaths(lockfile, importerIds, {
+        include: opts.include,
+        importerIdSet,
+        skipRuntimes: opts.skipRuntimes,
+    });
+    const packages = lockfile.packages != null
+        ? pickPkgsWithAllDeps(lockfile, directDepPaths, importerIdSet, {
+            currentEngine: opts.currentEngine,
+            engineStrict: opts.engineStrict,
+            failOnMissingDependencies: opts.failOnMissingDependencies,
+            include: opts.include,
+            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, { skipRuntimes: opts.skipRuntimes });
+        if (newImporter.optionalDependencies != null) {
+            newImporter.optionalDependencies = pickBy((ref, depName) => {
+                const depPath = dp.refToRelative(ref, depName);
+                return !depPath || packages[depPath] != null;
+            }, newImporter.optionalDependencies);
+        }
+        return newImporter;
+    }, lockfile.importers);
+    return {
+        lockfile: {
+            ...lockfile,
+            importers,
+            packages,
+        },
+        selectedImporterIds: Array.from(importerIdSet),
+    };
+}
+function pickPkgsWithAllDeps(lockfile, depPaths, importerIdSet, opts) {
+    const pickedPackages = {};
+    pkgAllDeps({ lockfile, pickedPackages, importerIdSet }, depPaths, true, opts);
+    return pickedPackages;
+}
+function pkgAllDeps(ctx, depPaths, parentIsInstallable, opts) {
+    for (const depPath of depPaths) {
+        if (ctx.pickedPackages[depPath])
+            continue;
+        const pkgSnapshot = ctx.lockfile.packages[depPath];
+        if (!pkgSnapshot && !depPath.startsWith('link:')) {
+            if (opts.failOnMissingDependencies) {
+                throw new LockfileMissingDependencyError(depPath);
+            }
+            lockfileLogger.debug(`No entry for "${depPath}" in ${WANTED_LOCKFILE}`);
+            continue;
+        }
+        let installable;
+        if (!parentIsInstallable) {
+            installable = false;
+            if (!ctx.pickedPackages[depPath] && pkgSnapshot.optional === true) {
+                opts.skipped.add(depPath);
+            }
+        }
+        else {
+            const pkg = {
+                ...nameVerFromPkgSnapshot(depPath, pkgSnapshot),
+                cpu: pkgSnapshot.cpu,
+                engines: pkgSnapshot.engines,
+                os: pkgSnapshot.os,
+                libc: pkgSnapshot.libc,
+            };
+            // TODO: depPath is not the package ID. Should be fixed
+            installable =
+                opts.includeIncompatiblePackages ||
+                    packageIsInstallable(pkgSnapshot.id ?? depPath, pkg, {
+                        engineStrict: opts.engineStrict,
+                        lockfileDir: opts.lockfileDir,
+                        nodeVersion: opts.currentEngine.nodeVersion,
+                        optional: pkgSnapshot.optional === true,
+                        supportedArchitectures: opts.supportedArchitectures,
+                    }) !== false;
+            if (!installable) {
+                if (!ctx.pickedPackages[depPath] && pkgSnapshot.optional === true) {
+                    opts.skipped.add(depPath);
+                }
+            }
+            else {
+                opts.skipped.delete(depPath);
+            }
+        }
+        ctx.pickedPackages[depPath] = pkgSnapshot;
+        const { depPaths: nextRelDepPaths, importerIds: additionalImporterIds } = parseDepRefs(Object.entries({
+            ...pkgSnapshot.dependencies,
+            ...(opts.include.optionalDependencies
+                ? pkgSnapshot.optionalDependencies
+                : {}),
+        }), ctx.lockfile);
+        additionalImporterIds.forEach((importerId) => ctx.importerIdSet.add(importerId));
+        nextRelDepPaths.push(...toImporterDepPaths(ctx.lockfile, additionalImporterIds, {
+            include: opts.include,
+            importerIdSet: ctx.importerIdSet,
+            skipRuntimes: opts.skipRuntimes,
+        }));
+        pkgAllDeps(ctx, nextRelDepPaths, installable, opts);
+    }
+}
+function toImporterDepPaths(lockfile, importerIds, opts) {
+    const importerDeps = importerIds
+        .map(importerId => lockfile.importers[importerId])
+        .map(importer => ({
+        ...(opts.include.dependencies ? importer.dependencies : {}),
+        ...(opts.include.devDependencies ? importer.devDependencies : {}),
+        ...(opts.include.optionalDependencies
+            ? importer.optionalDependencies
+            : {}),
+    }))
+        .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;
+    }
+    nextImporterIds = nextImporterIds.filter(importerId => !opts.importerIdSet.has(importerId));
+    for (const importerId of nextImporterIds) {
+        opts.importerIdSet.add(importerId);
+    }
+    return [
+        ...depPaths,
+        ...toImporterDepPaths(lockfile, nextImporterIds, opts),
+    ];
+}
+function parseDepRefs(refsByPkgNames, lockfile) {
+    const acc = {
+        depPaths: [],
+        importerIds: [],
+    };
+    for (const [pkgName, ref] of refsByPkgNames) {
+        if (ref.startsWith('link:')) {
+            const importerId = ref.substring(5);
+            if (lockfile.importers[importerId]) {
+                acc.importerIds.push(importerId);
+            }
+            continue;
+        }
+        const depPath = dp.refToRelative(ref, pkgName);
+        if (depPath == null)
+            continue;
+        acc.depPaths.push(depPath);
+    }
+    return acc;
+}
+//# sourceMappingURL=filterLockfileByImportersAndEngine.js.map

package/lib/index.d.ts

@@ -0,0 +1,3 @@
+export { filterLockfile } from './filterLockfile.js';
+export { filterLockfileByImporters } from './filterLockfileByImporters.js';
+export { filterLockfileByEngine, filterLockfileByImportersAndEngine } from './filterLockfileByImportersAndEngine.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/lockfile.filtering",
-  "version": "1100.1.13",
+  "version": "1100.1.14",
   "description": "Filters a lockfile",
   "keywords": [
     "pnpm",
@@ -29,14 +29,14 @@
     "!*.map"
   ],
   "dependencies": {
-    "@pnpm/config.package-is-installable": "1100.0.15",
-    "@pnpm/constants": "1100.0.0",
-    "@pnpm/deps.path": "1100.0.10",
-    "@pnpm/error": "1100.0.1",
-    "@pnpm/lockfile.types": "1100.0.15",
-    "@pnpm/lockfile.utils": "1100.1.4",
-    "@pnpm/lockfile.walker": "1100.0.15",
-    "@pnpm/types": "1101.5.0",
+    "@pnpm/config.package-is-installable": "1100.0.16",
+    "@pnpm/constants": "1100.0.1",
+    "@pnpm/deps.path": "1100.0.11",
+    "@pnpm/error": "1100.1.0",
+    "@pnpm/lockfile.types": "1100.0.16",
+    "@pnpm/lockfile.utils": "1100.1.5",
+    "@pnpm/lockfile.walker": "1100.0.16",
+    "@pnpm/types": "1101.6.0",
     "ramda": "npm:@pnpm/ramda@0.28.1"
   },
   "peerDependencies": {
@@ -44,7 +44,7 @@
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
-    "@pnpm/lockfile.filtering": "1100.1.13",
+    "@pnpm/lockfile.filtering": "1100.1.14",
     "@pnpm/logger": "1100.0.0",
     "@types/ramda": "0.31.1",
     "detect-libc": "^2.1.2",