packtory 0.0.96 → 0.0.98

package/sbom.cdx.json

@@ -9,16 +9,16 @@
                 {
                     "type": "application",
                     "name": "packtory",
-                    "version": "0.0.99"
+                    "version": "0.0.108"
                 }
             ]
         },
         "component": {
             "type": "library",
             "name": "packtory",
-            "version": "0.0.96",
-            "bom-ref": "pkg:npm/packtory@0.0.96",
-            "purl": "pkg:npm/packtory@0.0.96"
+            "version": "0.0.98",
+            "bom-ref": "pkg:npm/packtory@0.0.98",
+            "purl": "pkg:npm/packtory@0.0.98"
         }
     },
     "components": [
@@ -194,15 +194,15 @@
         {
             "type": "library",
             "name": "remeda",
-            "version": "2.45.0",
-            "bom-ref": "pkg:npm/remeda@2.45.0",
+            "version": "2.46.0",
+            "bom-ref": "pkg:npm/remeda@2.46.0",
             "scope": "required",
             "licenses": [
                 {
                     "expression": "MIT"
                 }
             ],
-            "purl": "pkg:npm/remeda@2.45.0"
+            "purl": "pkg:npm/remeda@2.46.0"
         },
         {
             "type": "library",
@@ -376,7 +376,7 @@
             "ref": "pkg:npm/npm-registry-fetch@20.0.1"
         },
         {
-            "ref": "pkg:npm/packtory@0.0.96",
+            "ref": "pkg:npm/packtory@0.0.98",
             "dependsOn": [
                 "pkg:npm/@arethetypeswrong/core@0.18.5",
                 "pkg:npm/@cyclonedx/cyclonedx-library@10.2.0",
@@ -391,7 +391,7 @@
                 "pkg:npm/libnpmpublish@12.0.0",
                 "pkg:npm/npm-package-arg@14.0.0",
                 "pkg:npm/npm-registry-fetch@20.0.1",
-                "pkg:npm/remeda@2.45.0",
+                "pkg:npm/remeda@2.46.0",
                 "pkg:npm/semver@7.8.5",
                 "pkg:npm/spdx-expression-parse@5.0.0",
                 "pkg:npm/ssri@14.0.0",
@@ -405,7 +405,7 @@
             ]
         },
         {
-            "ref": "pkg:npm/remeda@2.45.0"
+            "ref": "pkg:npm/remeda@2.46.0"
         },
         {
             "ref": "pkg:npm/semver@7.8.5"

package/tar/extract-tar.js

@@ -1,4 +1,84 @@
-import 'node:zlib';
-import 'node:stream';
-import 'tar-stream';
+import { createGunzip } from 'node:zlib';
+import { Readable } from 'node:stream';
+import { extract } from 'tar-stream';
+function defaultExtractTarLimits() {
+    return {
+        maxEntryCount: 50_000,
+        maxEntryPathLength: 4096,
+        maxExtractedBytes: 1_073_741_824
+    };
+}
+function toError(error) {
+    return error instanceof Error ? error : new Error(String(error));
+}
+function assertWithinEntryCountLimit(entries, limits) {
+    if (entries.length >= limits.maxEntryCount) {
+        throw new Error(`Refusing to extract tarball with more than ${limits.maxEntryCount} entries`);
+    }
+}
+function assertWithinEntryPathLimit(entry, limits) {
+    if (entry.header.name.length > limits.maxEntryPathLength) {
+        throw new Error(`Refusing to extract tarball entry with path longer than ${limits.maxEntryPathLength} characters`);
+    }
+}
+function assertWithinExtractedSizeLimit(extractedBytes, limits) {
+    if (extractedBytes > limits.maxExtractedBytes) {
+        throw new Error(`Refusing to extract tarball larger than ${limits.maxExtractedBytes} bytes`);
+    }
+}
+async function readEntryContent(entry, currentExtractedBytes, limits) {
+    let result = '';
+    let extractedBytes = currentExtractedBytes;
+    for await (const chunk of entry) {
+        extractedBytes += chunk.length;
+        assertWithinExtractedSizeLimit(extractedBytes, limits);
+        result += chunk.toString();
+    }
+    return { content: result, extractedBytes };
+}
+function stableTarHeader(header) {
+    const contentHeader = { ...header };
+    Reflect.deleteProperty(contentHeader, 'byteOffset');
+    return contentHeader;
+}
+async function collectTarEntries(stream, limits) {
+    const entries = [];
+    let extractedBytes = 0;
+    for await (const entry of stream) {
+        assertWithinEntryCountLimit(entries, limits);
+        assertWithinEntryPathLimit(entry, limits);
+        const content = await readEntryContent(entry, extractedBytes, limits);
+        extractedBytes = content.extractedBytes;
+        entries.push({ header: stableTarHeader(entry.header), content: content.content });
+    }
+    return entries;
+}
+async function waitForStreamError(stream) {
+    return await new Promise(function (_resolve, reject) {
+        stream.once('error', function (error) {
+            reject(toError(error));
+        });
+    });
+}
+function appendOutcome(outcomes, outcome) {
+    outcomes.add(outcome);
+    return outcomes;
+}
+async function raceExtractionOutcomes(streams, limits) {
+    const entries = await Promise.race(appendOutcome(appendOutcome(appendOutcome(appendOutcome(new Set(), collectTarEntries(streams.tarEntries, limits)), waitForStreamError(streams.source)), waitForStreamError(streams.gunzip)), waitForStreamError(streams.extractStream)));
+    return Array.from(entries);
+}
+export async function extractTarEntries(buffer, dependencies = {}, limits = defaultExtractTarLimits()) {
+    const createSource = dependencies.createSource ?? Readable.from;
+    const extractStream = extract();
+    const source = createSource(buffer);
+    const gunzip = createGunzip();
+    const tarEntries = source.pipe(gunzip).pipe(extractStream);
+    try {
+        return await raceExtractionOutcomes({ extractStream, gunzip, source, tarEntries }, limits);
+    }
+    catch (error) {
+        throw toError(error);
+    }
+}
 //# sourceMappingURL=extract-tar.js.map

package/tar/extract-tar.js.map

@@ -1 +1 @@
-{"version":3,"file":"extract-tar.js","sourceRoot":"","sources":["../../../../source/tar/extract-tar.ts"],"names":[],"mappings":"AAAA,OAA6B,WAAW,CAAC;AACzC,OAAyB,aAAa,CAAC;AACvC,OAAyD,YAAY,CAAC"}
+{"version":3,"file":"extract-tar.js","sourceRoot":"","sources":["../../../../source/tar/extract-tar.ts"],"names":[],"mappings":"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"}

package/tar/gzipped-pack.js

@@ -1 +1,21 @@
+const gzipHeaderOperatingSystemFieldIndex = 9;
+const gzipHeaderOperatingSystemUnknown = 255;
+function normalizeGzipHeader(data) {
+    const normalized = Buffer.from(data);
+    normalized[gzipHeaderOperatingSystemFieldIndex] = gzipHeaderOperatingSystemUnknown;
+    return normalized;
+}
+function gzipStreamChunkToBuffer(chunk) {
+    if (typeof chunk === 'string' || chunk instanceof Uint8Array) {
+        return Buffer.from(chunk);
+    }
+    throw new TypeError('Expected gzip stream to yield Buffer, Uint8Array, or string chunks');
+}
+export async function collectGzippedPack(pack, gzip) {
+    const chunks = [];
+    for await (const chunk of pack.pipe(gzip)) {
+        chunks.push(gzipStreamChunkToBuffer(chunk));
+    }
+    return normalizeGzipHeader(Buffer.concat(chunks));
+}
 //# sourceMappingURL=gzipped-pack.js.map

package/tar/gzipped-pack.js.map

@@ -1 +1 @@
-{"version":3,"file":"gzipped-pack.js","sourceRoot":"","sources":["../../../../source/tar/gzipped-pack.ts"],"names":[],"mappings":""}
+{"version":3,"file":"gzipped-pack.js","sourceRoot":"","sources":["../../../../source/tar/gzipped-pack.ts"],"names":[],"mappings":"AAGA,MAAM,mCAAmC,GAAG,CAAC,CAAC;AAC9C,MAAM,gCAAgC,GAAG,GAAG,CAAC;AAE7C,SAAS,mBAAmB,CAAC,IAAY;IACrC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrC,UAAU,CAAC,mCAAmC,CAAC,GAAG,gCAAgC,CAAC;IACnF,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAS,uBAAuB,CAAC,KAAc;IAC3C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,YAAY,UAAU,EAAE,CAAC;QAC3D,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IACD,MAAM,IAAI,SAAS,CAAC,oEAAoE,CAAC,CAAC;AAC9F,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACpC,IAAwB,EACxB,IAAwC;IAExC,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACxC,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;AACtD,CAAC"}

package/tar/tarball-builder.js

@@ -1,6 +1,46 @@
-import 'node:zlib';
-import 'tar-stream';
-import "../vendor-materializer/vendor-entry.js";
-import "./gzipped-pack.js";
+import zlib from 'node:zlib';
+import tar, {} from 'tar-stream';
+import { validateVendorEntrySource } from "../vendor-materializer/vendor-entry.js";
+import { collectGzippedPack } from "./gzipped-pack.js";
 const staticFileModificationTime = new Date(0);
+const executableFileMode = 493;
+const nonExecutableFileMode = 420;
+export function createTarballBuilder(dependencies = {}) {
+    const createGzip = dependencies.createGzip ?? zlib.createGzip;
+    const fileManager = dependencies.fileManager ?? {
+        async getRealPath(filePath) {
+            return filePath;
+        },
+        async readFileBytes() {
+            throw new Error('readFileBytes is required to materialize vendor entries into the tarball');
+        }
+    };
+    function addEntry(pack, filePath, isExecutable, payload) {
+        const entry = pack.entry({
+            name: filePath,
+            mtime: staticFileModificationTime,
+            mode: isExecutable ? executableFileMode : nonExecutableFileMode
+        }, payload);
+        entry.end();
+    }
+    async function createPack(fileDescriptions, vendorEntries) {
+        const pack = tar.pack();
+        for (const fileDescription of fileDescriptions) {
+            addEntry(pack, fileDescription.filePath, fileDescription.isExecutable, fileDescription.content);
+        }
+        for (const vendorEntry of vendorEntries) {
+            await validateVendorEntrySource(fileManager, vendorEntry);
+            const payload = await fileManager.readFileBytes(vendorEntry.sourceAbsolutePath);
+            addEntry(pack, vendorEntry.targetRelativePath, vendorEntry.isExecutable, payload);
+        }
+        pack.finalize();
+        return pack;
+    }
+    return {
+        async build(fileDescriptions, vendorEntries = []) {
+            const pack = await createPack(fileDescriptions, vendorEntries);
+            return collectGzippedPack(pack, createGzip({ level: 9 }));
+        }
+    };
+}
 //# sourceMappingURL=tarball-builder.js.map

package/tar/tarball-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"tarball-builder.js","sourceRoot":"","sources":["../../../../source/tar/tarball-builder.ts"],"names":[],"mappings":"AAAA,OAAiB,WAAW,CAAC;AAC7B,OAA+B,YAAY,CAAC;AAG5C,OAA4D,wCAAwC,CAAC;AACrG,OAAmC,mBAAmB,CAAC;AAWvD,MAAM,0BAA0B,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"tarball-builder.js","sourceRoot":"","sources":["../../../../source/tar/tarball-builder.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,GAAG,EAAE,EAAa,MAAM,YAAY,CAAC;AAG5C,OAAO,EAAE,yBAAyB,EAAoB,MAAM,wCAAwC,CAAC;AACrG,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAWvD,MAAM,0BAA0B,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;AAC/C,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAC/B,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAElC,MAAM,UAAU,oBAAoB,CAAC,eAAoD,EAAE;IACvF,MAAM,UAAU,GAAG,YAAY,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC;IAC9D,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,IAAI;QAC5C,KAAK,CAAC,WAAW,CAAC,QAAgB;YAC9B,OAAO,QAAQ,CAAC;QACpB,CAAC;QACD,KAAK,CAAC,aAAa;YACf,MAAM,IAAI,KAAK,CAAC,0EAA0E,CAAC,CAAC;QAChG,CAAC;KACJ,CAAC;IAEF,SAAS,QAAQ,CAAC,IAAU,EAAE,QAAgB,EAAE,YAAqB,EAAE,OAAwB;QAC3F,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CACpB;YACI,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,0BAA0B;YACjC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,qBAAqB;SAClE,EACD,OAAO,CACV,CAAC;QACF,KAAK,CAAC,GAAG,EAAE,CAAC;IAChB,CAAC;IAED,KAAK,UAAU,UAAU,CACrB,gBAA4C,EAC5C,aAAqC;QAErC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;QAExB,KAAK,MAAM,eAAe,IAAI,gBAAgB,EAAE,CAAC;YAC7C,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC,QAAQ,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC;QACpG,CAAC;QACD,KAAK,MAAM,WAAW,IAAI,aAAa,EAAE,CAAC;YACtC,MAAM,yBAAyB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;YAC1D,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,aAAa,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;YAChF,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,kBAAkB,EAAE,WAAW,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QACtF,CAAC;QAED,IAAI,CAAC,QAAQ,EAAE,CAAC;QAEhB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO;QACH,KAAK,CAAC,KAAK,CAAC,gBAAgB,EAAE,aAAa,GAAG,EAAE;YAC5C,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC;YAC/D,OAAO,kBAAkB,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9D,CAAC;KACJ,CAAC;AACN,CAAC"}

package/vendor-materializer/vendor-entry.js

@@ -1,2 +1,21 @@
-import 'node:path';
+import path from 'node:path';
+function isInFolder(folder, candidate) {
+    const relativePath = path.relative(folder, candidate);
+    return !relativePath.startsWith('..') && !path.isAbsolute(relativePath);
+}
+export async function validateVendorEntrySource(validator, entry) {
+    const rootPath = path.resolve(entry.sourcePackageRootPath);
+    const realSourcePath = await validator.getRealPath(entry.sourceAbsolutePath);
+    if (!isInFolder(rootPath, path.resolve(realSourcePath))) {
+        throw new Error(`Vendored file "${entry.sourceAbsolutePath}" resolved outside package root "${entry.sourcePackageRootPath}"`);
+    }
+}
+export function applyPrefixToVendorEntry(prefix, entry) {
+    return {
+        sourceAbsolutePath: entry.sourceAbsolutePath,
+        sourcePackageRootPath: entry.sourcePackageRootPath,
+        targetRelativePath: `${prefix}/${entry.targetRelativePath}`,
+        isExecutable: entry.isExecutable
+    };
+}
 //# sourceMappingURL=vendor-entry.js.map

package/vendor-materializer/vendor-entry.js.map

@@ -1 +1 @@
-{"version":3,"file":"vendor-entry.js","sourceRoot":"","sources":["../../../../source/vendor-materializer/vendor-entry.ts"],"names":[],"mappings":"AAAA,OAAiB,WAAW,CAAC"}
+{"version":3,"file":"vendor-entry.js","sourceRoot":"","sources":["../../../../source/vendor-materializer/vendor-entry.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAY7B,SAAS,UAAU,CAAC,MAAc,EAAE,SAAiB;IACjD,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACtD,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;AAC5E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC3C,SAAqC,EACrC,KAAkB;IAElB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAC3D,MAAM,cAAc,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAE7E,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;QACtD,MAAM,IAAI,KAAK,CACX,kBAAkB,KAAK,CAAC,kBAAkB,oCAAoC,KAAK,CAAC,qBAAqB,GAAG,CAC/G,CAAC;IACN,CAAC;AACL,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,MAAc,EAAE,KAAkB;IACvE,OAAO;QACH,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;QAC5C,qBAAqB,EAAE,KAAK,CAAC,qBAAqB;QAClD,kBAAkB,EAAE,GAAG,MAAM,IAAI,KAAK,CAAC,kBAAkB,EAAE;QAC3D,YAAY,EAAE,KAAK,CAAC,YAAY;KACnC,CAAC;AACN,CAAC"}

package/vendor-materializer/vendor-materializer.js

@@ -1,9 +1,241 @@
-import 'node:path';
-import 'npm-package-arg';
-import 'true-myth';
-import 'true-myth/result';
-import 'zod/mini';
-import "../common/schema-validation.js";
-import "../common/package-layout.js";
-import "../common/worklist.js";
+import path from 'node:path';
+import parsePackageArgument from 'npm-package-arg';
+import { Result } from 'true-myth';
+import { tryOr } from 'true-myth/result';
+import { z } from 'zod/mini';
+import { safeParse } from "../common/schema-validation.js";
+import { ancestorInstalledDependencyPathCandidates, bundledInstalledDependencyPath, installedDependenciesFolderName, packageManifestPathIn } from "../common/package-layout.js";
+import { createWorklist } from "../common/worklist.js";
+export const vendorMaterializerFailureType = {
+    dependencyNotFound: 'dependency-not-found',
+    invalidDependencyName: 'invalid-dependency-name',
+    symlinkTargetOutsidePackage: 'symlink-target-outside-package'
+};
+const dependencyMapSchema = z.optional(z.record(z.string(), z.string()));
+function packageManifestSchema() {
+    return z.object({
+        dependencies: dependencyMapSchema,
+        peerDependencies: dependencyMapSchema
+    });
+}
+function getPackageArgumentName(name) {
+    const parsed = tryOr(undefined, function () {
+        return parsePackageArgument(name).name ?? undefined;
+    });
+    return parsed.isOk ? parsed.value : undefined;
+}
+function findFirstInvalidDependencyName(names) {
+    for (const name of names) {
+        if (getPackageArgumentName(name) !== name) {
+            return name;
+        }
+    }
+    return undefined;
+}
+function parseManifestSummary(sourcePackageName, content) {
+    const parsed = safeParse(packageManifestSchema(), JSON.parse(content));
+    if (!parsed.success) {
+        return Result.ok({ dependencies: [], peers: [] });
+    }
+    const dependencyNames = Object.keys(parsed.data.dependencies ?? {});
+    const peerDependencyNames = Object.keys(parsed.data.peerDependencies ?? {});
+    const invalidDependencyName = findFirstInvalidDependencyName(dependencyNames.concat(peerDependencyNames));
+    if (invalidDependencyName !== undefined) {
+        return Result.err({
+            type: vendorMaterializerFailureType.invalidDependencyName,
+            sourcePackageName,
+            invalidDependencyName
+        });
+    }
+    return Result.ok({
+        dependencies: dependencyNames,
+        peers: peerDependencyNames
+    });
+}
+async function collectPackageFileEntry(walker, state, relativeEntryPath) {
+    const sourceAbsolutePath = path.join(state.packageDirectory.rootDirectory, relativeEntryPath);
+    const targetRelativePath = bundledInstalledDependencyPath(state.packageDirectory.packageName, relativeEntryPath);
+    const fileDescription = await walker.getTransferableFileDescriptionFromPath(sourceAbsolutePath, targetRelativePath);
+    state.collected.push({
+        sourceAbsolutePath,
+        sourcePackageRootPath: state.packageDirectory.rootDirectory,
+        targetRelativePath,
+        isExecutable: fileDescription.isExecutable
+    });
+}
+async function getResolvedTargetPath(walker, absoluteEntryPath) {
+    try {
+        return Result.ok(await walker.getRealPath(absoluteEntryPath));
+    }
+    catch {
+        return Result.err(absoluteEntryPath);
+    }
+}
+function isPathInsideRoot(rootDirectory, candidatePath) {
+    const normalizedRoot = path.resolve(rootDirectory);
+    const normalizedCandidate = path.resolve(candidatePath);
+    return normalizedCandidate === normalizedRoot || normalizedCandidate.startsWith(`${normalizedRoot}${path.sep}`);
+}
+async function checkSymlinkInsidePackage(walker, rootDirectory, packageName, relativeEntryPath) {
+    const absoluteEntryPath = path.join(rootDirectory, relativeEntryPath);
+    const normalizedEntryRelativePath = relativeEntryPath.split(path.sep).join('/');
+    const resolvedTarget = await getResolvedTargetPath(walker, absoluteEntryPath);
+    const resolvedTargetPath = resolvedTarget.isOk ? resolvedTarget.value : resolvedTarget.error;
+    if (resolvedTarget.isErr) {
+        return Result.err({
+            type: vendorMaterializerFailureType.symlinkTargetOutsidePackage,
+            packageName,
+            entryRelativePath: normalizedEntryRelativePath,
+            resolvedTargetPath
+        });
+    }
+    if (!isPathInsideRoot(rootDirectory, resolvedTargetPath)) {
+        return Result.err({
+            type: vendorMaterializerFailureType.symlinkTargetOutsidePackage,
+            packageName,
+            entryRelativePath: normalizedEntryRelativePath,
+            resolvedTargetPath
+        });
+    }
+    return Result.ok(undefined);
+}
+async function validatePackageDirectoryEntry(walker, packageDirectory, relativeEntryPath, entry) {
+    if (!entry.isSymbolicLink) {
+        return Result.ok(undefined);
+    }
+    return checkSymlinkInsidePackage(walker, packageDirectory.rootDirectory, packageDirectory.packageName, relativeEntryPath);
+}
+const walkPackageDirectory = async function (walker, state, relativeDirectory) {
+    const absoluteDirectory = path.join(state.packageDirectory.rootDirectory, relativeDirectory);
+    const entries = await walker.listDirectoryEntries(absoluteDirectory);
+    const collectDirectoryEntry = async function (entry) {
+        if (entry.name === installedDependenciesFolderName) {
+            return Result.ok(undefined);
+        }
+        const relativeEntryPath = path.join(relativeDirectory, entry.name);
+        const symlinkCheck = await validatePackageDirectoryEntry(walker, state.packageDirectory, relativeEntryPath, entry);
+        if (symlinkCheck.isErr) {
+            return symlinkCheck;
+        }
+        if (entry.isDirectory) {
+            return walkPackageDirectory(walker, state, relativeEntryPath);
+        }
+        await collectPackageFileEntry(walker, state, relativeEntryPath);
+        return Result.ok(undefined);
+    };
+    for (const entry of entries) {
+        const result = await collectDirectoryEntry(entry);
+        if (result.isErr) {
+            return result;
+        }
+    }
+    return Result.ok(undefined);
+};
+export function createVendorMaterializer(dependencies) {
+    const { fileManager } = dependencies;
+    function queueItem(name, fromFolder, sourcePackageName, required) {
+        return { name, fromFolder, required, sourcePackageName };
+    }
+    function scheduleManifestDependencies(closure, name, realPath, summary) {
+        closure.pendingPackages.scheduleAll(summary.dependencies.map(function (dependencyName) {
+            return queueItem(dependencyName, realPath, name, true);
+        }));
+        closure.pendingPackages.scheduleAll(summary.peers.map(function (dependencyName) {
+            return queueItem(dependencyName, realPath, name, false);
+        }));
+    }
+    async function collectVendorEntries(packageName, realPath) {
+        const collected = [];
+        const walkResult = await walkPackageDirectory(fileManager, { packageDirectory: { rootDirectory: realPath, packageName }, collected }, '');
+        if (walkResult.isErr) {
+            return Result.err(walkResult.error);
+        }
+        return Result.ok(Array.from(collected));
+    }
+    async function readManifestSummary(packageName, realPath) {
+        const manifestPath = packageManifestPathIn(realPath);
+        const content = await fileManager.readFile(manifestPath);
+        return parseManifestSummary(packageName, content);
+    }
+    async function findPackageRealPath(packageName, startFolder) {
+        for (const candidatePath of ancestorInstalledDependencyPathCandidates(startFolder, packageName)) {
+            const readability = await fileManager.checkReadability(candidatePath);
+            if (readability.isReadable) {
+                return await fileManager.getRealPath(candidatePath);
+            }
+        }
+        return undefined;
+    }
+    async function ingestResolvedPackage(closure, name, realPath) {
+        const summaryResult = await readManifestSummary(name, realPath);
+        if (summaryResult.isErr) {
+            return Result.err(summaryResult.error);
+        }
+        scheduleManifestDependencies(closure, name, realPath, summaryResult.value);
+        closure.peerRequirements.set(name, summaryResult.value.peers);
+        const collectedResult = await collectVendorEntries(name, realPath);
+        if (collectedResult.isErr) {
+            return Result.err(collectedResult.error);
+        }
+        closure.entries.push(...collectedResult.value);
+        return Result.ok(undefined);
+    }
+    async function processPendingPackageItem(closure, item) {
+        if (closure.visited.has(item.name)) {
+            return Result.ok(undefined);
+        }
+        const realPath = await findPackageRealPath(item.name, item.fromFolder);
+        if (realPath === undefined) {
+            if (item.required) {
+                return Result.err({
+                    type: vendorMaterializerFailureType.dependencyNotFound,
+                    sourcePackageName: item.sourcePackageName,
+                    dependencyName: item.name
+                });
+            }
+            return Result.ok(undefined);
+        }
+        closure.visited.add(item.name);
+        return ingestResolvedPackage(closure, item.name, realPath);
+    }
+    async function drainPendingPackages(closure) {
+        for (let item = closure.pendingPackages.takeNext(); item !== undefined; item = closure.pendingPackages.takeNext()) {
+            const processed = await processPendingPackageItem(closure, item);
+            if (processed.isErr) {
+                return processed;
+            }
+        }
+        return Result.ok(undefined);
+    }
+    return {
+        async materializeExternals(options) {
+            const invalidInitialName = findFirstInvalidDependencyName(options.initialDependencyNames);
+            if (invalidInitialName !== undefined) {
+                return Result.err({
+                    type: vendorMaterializerFailureType.invalidDependencyName,
+                    sourcePackageName: undefined,
+                    invalidDependencyName: invalidInitialName
+                });
+            }
+            const entries = [];
+            const closure = {
+                visited: new Set(),
+                entries,
+                pendingPackages: createWorklist(options.initialDependencyNames.map(function (name) {
+                    return queueItem(name, options.projectFolder, undefined, true);
+                })),
+                peerRequirements: new Map()
+            };
+            const drained = await drainPendingPackages(closure);
+            if (drained.isErr) {
+                return Result.err(drained.error);
+            }
+            return Result.ok({
+                entries: Array.from(closure.entries),
+                packageNames: Array.from(closure.visited),
+                peerRequirements: new Map(closure.peerRequirements)
+            });
+        }
+    };
+}
 //# sourceMappingURL=vendor-materializer.js.map

package/vendor-materializer/vendor-materializer.js.map

@@ -1 +1 @@
-{"version":3,"file":"vendor-materializer.js","sourceRoot":"","sources":["../../../../source/vendor-materializer/vendor-materializer.ts"],"names":[],"mappings":"AAAA,OAAiB,WAAW,CAAC;AAC7B,OAAiC,iBAAiB,CAAC;AACnD,OAAuB,WAAW,CAAC;AACnC,OAAsB,kBAAkB,CAAC;AACzC,OAAkB,UAAU,CAAC;AAC7B,OAA0B,gCAAgC,CAAC;AAC3D,OAKO,6BAA6B,CAAC;AACrC,OAA8C,uBAAuB,CAAC"}
+{"version":3,"file":"vendor-materializer.js","sourceRoot":"","sources":["../../../../source/vendor-materializer/vendor-materializer.ts"],"names":[],"mappings":"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"}

package/version-manager/dependencies/bundle-dependency-grouping.js

@@ -1,3 +1,33 @@
-import "../../common/bundled-dependency-groups.js";
-import "../../common/package-name-map.js";
+import { bundledDependencyGroup, bundledDependencyLookupOrder } from "../../common/bundled-dependency-groups.js";
+import { packageNameMap } from "../../common/package-name-map.js";
+function matchingGroupedDependency(groupedDependenciesByName, dependencyName) {
+    for (const group of bundledDependencyLookupOrder()) {
+        const matchingDependency = groupedDependenciesByName[group.propertyName].get(dependencyName);
+        if (matchingDependency !== undefined) {
+            return { manifestProperty: group.manifestProperty, version: matchingDependency.version };
+        }
+    }
+    return undefined;
+}
+function createDependencyRecord() {
+    return {};
+}
+export function groupBundleDependencies(bundle, bundlePeerDependencies, bundleDependencies) {
+    const grouped = {
+        dependencies: createDependencyRecord(),
+        peerDependencies: createDependencyRecord()
+    };
+    const groupedDependenciesByName = {
+        [bundledDependencyGroup.bundle.propertyName]: packageNameMap(bundleDependencies),
+        [bundledDependencyGroup.peer.propertyName]: packageNameMap(bundlePeerDependencies)
+    };
+    for (const dependencyName of bundle.linkedBundleDependencies.keys()) {
+        const matchingDependency = matchingGroupedDependency(groupedDependenciesByName, dependencyName);
+        if (matchingDependency === undefined) {
+            throw new Error(`Couldn’t determine version number of bundle dependency ${dependencyName}`);
+        }
+        grouped[matchingDependency.manifestProperty][dependencyName] = matchingDependency.version;
+    }
+    return grouped;
+}
 //# sourceMappingURL=bundle-dependency-grouping.js.map

package/version-manager/dependencies/bundle-dependency-grouping.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundle-dependency-grouping.js","sourceRoot":"","sources":["../../../../../source/version-manager/dependencies/bundle-dependency-grouping.ts"],"names":[],"mappings":"AACA,OAAqE,2CAA2C,CAAC;AACjH,OAA+B,kCAAkC,CAAC"}
+{"version":3,"file":"bundle-dependency-grouping.js","sourceRoot":"","sources":["../../../../../source/version-manager/dependencies/bundle-dependency-grouping.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,4BAA4B,EAAE,MAAM,2CAA2C,CAAC;AACjH,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAkBlE,SAAS,yBAAyB,CAC9B,yBAAoD,EACpD,cAAsB;IAEtB,KAAK,MAAM,KAAK,IAAI,4BAA4B,EAAE,EAAE,CAAC;QACjD,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC7F,IAAI,kBAAkB,KAAK,SAAS,EAAE,CAAC;YACnC,OAAO,EAAE,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,EAAE,OAAO,EAAE,kBAAkB,CAAC,OAAO,EAAE,CAAC;QAC7F,CAAC;IACL,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAS,sBAAsB;IAC3B,OAAO,EAAE,CAAC;AACd,CAAC;AAED,MAAM,UAAU,uBAAuB,CACnC,MAAwD,EACxD,sBAAsD,EACtD,kBAAkD;IAElD,MAAM,OAAO,GAAG;QACZ,YAAY,EAAE,sBAAsB,EAAE;QACtC,gBAAgB,EAAE,sBAAsB,EAAE;KAC7C,CAAC;IACF,MAAM,yBAAyB,GAAG;QAC9B,CAAC,sBAAsB,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,kBAAkB,CAAC;QAChF,CAAC,sBAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,sBAAsB,CAAC;KACrF,CAAC;IAEF,KAAK,MAAM,cAAc,IAAI,MAAM,CAAC,wBAAwB,CAAC,IAAI,EAAE,EAAE,CAAC;QAClE,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,yBAAyB,EAAE,cAAc,CAAC,CAAC;QAChG,IAAI,kBAAkB,KAAK,SAAS,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,0DAA0D,cAAc,EAAE,CAAC,CAAC;QAChG,CAAC;QAED,OAAO,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC;IAC9F,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC"}

package/version-manager/dependencies/dependency-groups.js

@@ -1,2 +1,12 @@
-import 'remeda';
+import { mergeAll } from 'remeda';
+export function mergeDependencyGroups(...groups) {
+    return {
+        dependencies: mergeAll(groups.map(function (group) {
+            return group.dependencies;
+        })),
+        peerDependencies: mergeAll(groups.map(function (group) {
+            return group.peerDependencies;
+        }))
+    };
+}
 //# sourceMappingURL=dependency-groups.js.map

package/version-manager/dependencies/dependency-groups.js.map

@@ -1 +1 @@
-{"version":3,"file":"dependency-groups.js","sourceRoot":"","sources":["../../../../../source/version-manager/dependencies/dependency-groups.ts"],"names":[],"mappings":"AAAA,OAAyB,QAAQ,CAAC"}
+{"version":3,"file":"dependency-groups.js","sourceRoot":"","sources":["../../../../../source/version-manager/dependencies/dependency-groups.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAOlC,MAAM,UAAU,qBAAqB,CAAC,GAAG,MAAsC;IAC3E,OAAO;QACH,YAAY,EAAE,QAAQ,CAClB,MAAM,CAAC,GAAG,CAAC,UAAU,KAAK;YACtB,OAAO,KAAK,CAAC,YAAY,CAAC;QAC9B,CAAC,CAAC,CACL;QACD,gBAAgB,EAAE,QAAQ,CACtB,MAAM,CAAC,GAAG,CAAC,UAAU,KAAK;YACtB,OAAO,KAAK,CAAC,gBAAgB,CAAC;QAClC,CAAC,CAAC,CACL;KACJ,CAAC;AACN,CAAC"}