packtory 0.0.95 → 0.0.97

package/linker/source-modifier/import-paths.js

@@ -1,4 +1,77 @@
-import "../../dead-code-eliminator/transform/line-index.js";
-import "../../dependency-scanner/source-file-references.js";
-import "../../dependency-scanner/typescript-project-analyzer.js";
+import { buildLineIndex } from "../../dead-code-eliminator/transform/line-index.js";
+import { getModuleReferenceLiterals, resolveSourceFileForLiteral } from "../../dependency-scanner/source-file-references.js";
+import { getSourcePathFromSourceFile } from "../../dependency-scanner/typescript-project-analyzer.js";
+function collectImportPathEdits(sourceFile, replacements) {
+    const edits = [];
+    const literals = getModuleReferenceLiterals(sourceFile);
+    for (const literal of literals) {
+        const resolvedSourceFile = resolveSourceFileForLiteral(literal, sourceFile);
+        if (resolvedSourceFile !== undefined) {
+            const replacement = replacements.get(getSourcePathFromSourceFile(resolvedSourceFile));
+            if (replacement !== undefined) {
+                edits.push({
+                    start: literal.getStart() + 1,
+                    end: literal.getEnd() - 1,
+                    reference: {
+                        name: replacement.packageName,
+                        sourceSpecifier: literal.getLiteralValue(),
+                        emittedSpecifier: replacement.emittedSpecifier
+                    }
+                });
+            }
+        }
+    }
+    return edits.toSorted(function (left, right) {
+        return left.start - right.start;
+    });
+}
+function applyEdits(sourceContent, edits) {
+    let content = '';
+    let originalOffset = 0;
+    const atoms = [];
+    function appendEdit(edit) {
+        const newStart = content.length;
+        content += sourceContent.slice(originalOffset, edit.start) + edit.reference.emittedSpecifier;
+        atoms.push({ originalStart: originalOffset, originalEnd: edit.start, newStart });
+        originalOffset = edit.end;
+    }
+    function appendTail() {
+        const tailStart = content.length;
+        content += sourceContent.slice(originalOffset);
+        atoms.push({
+            originalStart: originalOffset,
+            originalEnd: sourceContent.length,
+            newStart: tailStart
+        });
+    }
+    for (const edit of edits) {
+        appendEdit(edit);
+    }
+    appendTail();
+    return {
+        content,
+        dependencyReferences: edits.map(function (edit) {
+            return edit.reference;
+        }),
+        sourceMapTransform: {
+            originalLineIndex: buildLineIndex(sourceContent),
+            transformedLineIndex: buildLineIndex(content),
+            atoms
+        }
+    };
+}
+export function replaceImportPathsWithTransform(project, inputFilePath, sourceContent, replacements) {
+    if (project === undefined) {
+        return { content: sourceContent, dependencyReferences: [], sourceMapTransform: undefined };
+    }
+    const sourceFile = project.getSourceFile(inputFilePath);
+    if (sourceFile === undefined) {
+        return { content: sourceContent, dependencyReferences: [], sourceMapTransform: undefined };
+    }
+    const edits = collectImportPathEdits(sourceFile, replacements);
+    if (edits.length === 0) {
+        return { content: sourceContent, dependencyReferences: [], sourceMapTransform: undefined };
+    }
+    return applyEdits(sourceContent, edits);
+}
 //# sourceMappingURL=import-paths.js.map

package/linker/source-modifier/import-paths.js.map

@@ -1 +1 @@
-{"version":3,"file":"import-paths.js","sourceRoot":"","sources":["../../../../../source/linker/source-modifier/import-paths.ts"],"names":[],"mappings":"AACA,OAA+B,oDAAoD,CAAC;AAEpF,OAGO,oDAAoD,CAAC;AAC5D,OAA4C,yDAAyD,CAAC"}
+{"version":3,"file":"import-paths.js","sourceRoot":"","sources":["../../../../../source/linker/source-modifier/import-paths.ts"],"names":[],"mappings":"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"}

package/linker/substitute-bundles.js

@@ -1,4 +1,167 @@
-import "./replacement-lookup.js";
-import "./source-modifier/import-paths.js";
-import "./substituted-resource-graph.js";
+import { findAllPathReplacements, ownsSourcePath } from "./replacement-lookup.js";
+import { replaceImportPathsWithTransform } from "./source-modifier/import-paths.js";
+import { createSubstitutedResourceGraph } from "./substituted-resource-graph.js";
+function isSubstitutionSourcePath(inputFilePath, substitutionSources) {
+    return substitutionSources.some(function (bundle) {
+        return ownsSourcePath(inputFilePath, bundle);
+    });
+}
+function recordUnreplacedConnections(outstandingConnections, fromNodeId, directDependencies, replacedPaths) {
+    for (const file of directDependencies) {
+        if (!replacedPaths.has(file)) {
+            outstandingConnections.push({ from: fromNodeId, to: file });
+        }
+    }
+}
+function createReplacementRequest(inputFilePath) {
+    return {
+        inputFilePath,
+        requiredExportNames: new Set(),
+        requiresNamespaceExport: false
+    };
+}
+function replacementRequestForInputFilePath(requestsByInputFilePath, inputFilePath) {
+    return requestsByInputFilePath.get(inputFilePath) ?? createReplacementRequest(inputFilePath);
+}
+function addRequiredExportName(requestsByInputFilePath, inputFilePath, requiredExportName) {
+    const request = replacementRequestForInputFilePath(requestsByInputFilePath, inputFilePath);
+    requestsByInputFilePath.set(inputFilePath, {
+        ...request,
+        requiredExportNames: new Set([...request.requiredExportNames, requiredExportName])
+    });
+}
+function requireNamespaceExport(requestsByInputFilePath, inputFilePath) {
+    const request = replacementRequestForInputFilePath(requestsByInputFilePath, inputFilePath);
+    requestsByInputFilePath.set(inputFilePath, { ...request, requiresNamespaceExport: true });
+}
+function recordImportRequirements(requestsByInputFilePath, declaration) {
+    const importedSourceFile = declaration.getModuleSpecifierSourceFile();
+    if (importedSourceFile === undefined) {
+        return;
+    }
+    const inputFilePath = importedSourceFile.getFilePath();
+    if (declaration.getDefaultImport() !== undefined) {
+        addRequiredExportName(requestsByInputFilePath, inputFilePath, 'default');
+    }
+    if (declaration.getNamespaceImport() !== undefined) {
+        requireNamespaceExport(requestsByInputFilePath, inputFilePath);
+    }
+    for (const namedImport of declaration.getNamedImports()) {
+        addRequiredExportName(requestsByInputFilePath, inputFilePath, namedImport.getName());
+    }
+}
+function recordExportRequirements(requestsByInputFilePath, declaration) {
+    const exportedSourceFile = declaration.getModuleSpecifierSourceFile();
+    if (exportedSourceFile === undefined) {
+        return;
+    }
+    const inputFilePath = exportedSourceFile.getFilePath();
+    if (declaration.isNamespaceExport()) {
+        requireNamespaceExport(requestsByInputFilePath, inputFilePath);
+    }
+    for (const namedExport of declaration.getNamedExports()) {
+        addRequiredExportName(requestsByInputFilePath, inputFilePath, namedExport.getName());
+    }
+}
+function recordStaticRequirements(requestsByInputFilePath, sourceFile) {
+    for (const declaration of sourceFile.getImportDeclarations()) {
+        recordImportRequirements(requestsByInputFilePath, declaration);
+    }
+    for (const declaration of sourceFile.getExportDeclarations()) {
+        recordExportRequirements(requestsByInputFilePath, declaration);
+    }
+}
+function collectImportRequirements(node) {
+    const requestsByInputFilePath = new Map();
+    for (const inputFilePath of node.adjacentNodeIds) {
+        requestsByInputFilePath.set(inputFilePath, createReplacementRequest(inputFilePath));
+    }
+    const sourceFile = node.data.project?.getSourceFile(node.data.fileDescription.inputFilePath);
+    if (sourceFile !== undefined) {
+        recordStaticRequirements(requestsByInputFilePath, sourceFile);
+    }
+    return Array.from(requestsByInputFilePath.values());
+}
+function contentWithReplacements(node, replacements) {
+    return replaceImportPathsWithTransform(node.data.project, node.data.fileDescription.inputFilePath, node.data.fileDescription.content, replacements.importPathReplacements);
+}
+function fallbackDependencyReferences(replacements) {
+    return Array.from(replacements.importPathReplacements.values(), function (replacement) {
+        return {
+            name: replacement.packageName,
+            sourceSpecifier: replacement.emittedSpecifier,
+            emittedSpecifier: replacement.emittedSpecifier
+        };
+    });
+}
+function referenceWithReplacement(reference, replacements, inputFilePathByTargetFilePath) {
+    if (reference.type !== 'local-code' &&
+        reference.type !== 'local-asset' &&
+        reference.type !== 'generated-manifest') {
+        return reference;
+    }
+    const inputFilePath = inputFilePathByTargetFilePath.get(reference.targetFilePath);
+    const replacementLookupPath = inputFilePath ?? reference.targetFilePath;
+    const replacement = replacements.importPathReplacements.get(replacementLookupPath);
+    if (replacement === undefined) {
+        return reference;
+    }
+    return {
+        type: 'linked-code',
+        sourceSpecifier: reference.sourceSpecifier,
+        emittedSpecifier: replacement.emittedSpecifier,
+        packageName: replacement.packageName,
+        targetFilePath: reference.targetFilePath
+    };
+}
+function moduleReferencesWithReplacements(node, replacements, inputFilePathByTargetFilePath) {
+    return node.data.moduleReferences.map(function (reference) {
+        return referenceWithReplacement(reference, replacements, inputFilePathByTargetFilePath);
+    });
+}
+function addNodeWithReplacements(substitutedGraph, node, replacements, inputFilePathByTargetFilePath) {
+    const isSubstituted = replacements.importPathReplacements.size > 0;
+    const replacementResult = contentWithReplacements(node, replacements);
+    const dependencyReferences = replacementResult.dependencyReferences.length === 0
+        ? fallbackDependencyReferences(replacements)
+        : replacementResult.dependencyReferences;
+    const sourceMapTransformsByTargetPath = replacementResult.sourceMapTransform === undefined
+        ? new Map()
+        : new Map([[node.data.fileDescription.targetFilePath, [replacementResult.sourceMapTransform]]]);
+    substitutedGraph.add(node.id, {
+        fileDescription: { ...node.data.fileDescription, content: replacementResult.content },
+        moduleReferences: moduleReferencesWithReplacements(node, replacements, inputFilePathByTargetFilePath),
+        externalDependencies: node.data.externalDependencies,
+        bundleDependencies: isSubstituted ? dependencyReferences : [],
+        substitutedInputFilePathsByPackageName: replacements.substitutedInputFilePathsByPackageName,
+        sourceMapTransformsByTargetPath,
+        isSubstituted,
+        isExplicitlyIncluded: node.data.isExplicitlyIncluded,
+        ...node.data.isGeneratedManifest ? { isGeneratedManifest: true } : {}
+    });
+}
+export function substituteDependencies(resourceGraph, bundleDependencies, bundlePeerDependencies) {
+    const substitutedGraph = createSubstitutedResourceGraph();
+    const outstandingConnections = [];
+    const visited = new Set();
+    const substitutionSources = [...bundleDependencies, ...bundlePeerDependencies];
+    function substituteNode(node) {
+        if (visited.has(node.id)) {
+            return;
+        }
+        visited.add(node.id);
+        if (!node.data.isExplicitlyIncluded && isSubstitutionSourcePath(node.id, substitutionSources)) {
+            return;
+        }
+        const directDependencies = Array.from(node.adjacentNodeIds);
+        const replacements = findAllPathReplacements(collectImportRequirements(node), bundleDependencies, bundlePeerDependencies);
+        recordUnreplacedConnections(outstandingConnections, node.id, directDependencies, replacements.importPathReplacements);
+        addNodeWithReplacements(substitutedGraph, node, replacements, resourceGraph.inputFilePathByTargetFilePath);
+    }
+    resourceGraph.traverse(substituteNode);
+    for (const connection of outstandingConnections) {
+        substitutedGraph.connect(connection.from, connection.to);
+    }
+    return substitutedGraph;
+}
 //# sourceMappingURL=substitute-bundles.js.map

package/linker/substitute-bundles.js.map

@@ -1 +1 @@
-{"version":3,"file":"substitute-bundles.js","sourceRoot":"","sources":["../../../../source/linker/substitute-bundles.ts"],"names":[],"mappings":"AAEA,OAKO,yBAAyB,CAAC;AAEjC,OAIO,mCAAmC,CAAC;AAC3C,OAA8E,iCAAiC,CAAC"}
+{"version":3,"file":"substitute-bundles.js","sourceRoot":"","sources":["../../../../source/linker/substitute-bundles.ts"],"names":[],"mappings":"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"}

package/linker/substituted-resource-graph.js

@@ -1,3 +1,112 @@
-import "../dependency-scanner/external-dependencies.js";
-import "../directed-graph/graph.js";
+import { mergeExternalDependencyReference } from "../dependency-scanner/external-dependencies.js";
+import { createDirectedGraph } from "../directed-graph/graph.js";
+function collectLinkedBundleDependencies(linkedBundleDependencies, bundleDependencies, filePath) {
+    for (const bundleDependencyReference of bundleDependencies) {
+        const bundleDependency = linkedBundleDependencies.get(bundleDependencyReference.name);
+        linkedBundleDependencies.set(bundleDependencyReference.name, mergeExternalDependencyReference(bundleDependencyReference, filePath, bundleDependency));
+    }
+}
+function collectSubstitutedInputFilePaths(target, source) {
+    const result = new Map(target);
+    for (const [packageName, inputFilePaths] of source) {
+        const existing = result.get(packageName) ?? [];
+        result.set(packageName, new Set([...existing, ...inputFilePaths]));
+    }
+    return Array.from(result);
+}
+function collectExternalDependencies(externalDependencies, dependencies, filePath) {
+    for (const dependencyReference of dependencies) {
+        const externalDependency = externalDependencies.get(dependencyReference.name);
+        externalDependencies.set(dependencyReference.name, mergeExternalDependencyReference(dependencyReference, filePath, externalDependency));
+    }
+}
+function directDependencyTargetPaths(directDependencies, targetFilePathByInputFilePath) {
+    return new Set(Array.from(directDependencies, function (inputFilePath) {
+        return targetFilePathByInputFilePath.get(inputFilePath) ?? inputFilePath;
+    }));
+}
+function collectSourceMapTransforms(sourceMapTransformsByTargetPath, source) {
+    for (const [targetPath, transforms] of source) {
+        const existing = sourceMapTransformsByTargetPath.get(targetPath) ?? [];
+        sourceMapTransformsByTargetPath.set(targetPath, [...existing, ...transforms]);
+    }
+}
+function createFlattenCollectors() {
+    const contents = [];
+    const linkedBundleDependencies = new Map();
+    const substitutedInputFilePathsByPackageName = new Map();
+    const sourceMapTransformsByTargetPath = new Map();
+    const externalDependencies = new Map();
+    const visited = new Set();
+    function collect(filePath, data, directDependencies, targetFilePathByInputFilePath) {
+        if (visited.has(filePath)) {
+            return;
+        }
+        visited.add(filePath);
+        contents.push({
+            fileDescription: data.fileDescription,
+            directDependencies: directDependencyTargetPaths(directDependencies, targetFilePathByInputFilePath),
+            moduleReferences: data.moduleReferences,
+            isSubstituted: data.isSubstituted,
+            isExplicitlyIncluded: data.isExplicitlyIncluded,
+            ...data.isGeneratedManifest ? { isGeneratedManifest: true } : {}
+        });
+        collectLinkedBundleDependencies(linkedBundleDependencies, data.bundleDependencies, data.fileDescription.targetFilePath);
+        for (const [packageName, inputFilePaths] of collectSubstitutedInputFilePaths(substitutedInputFilePathsByPackageName, data.substitutedInputFilePathsByPackageName)) {
+            substitutedInputFilePathsByPackageName.set(packageName, new Set(inputFilePaths));
+        }
+        collectSourceMapTransforms(sourceMapTransformsByTargetPath, data.sourceMapTransformsByTargetPath);
+        collectExternalDependencies(externalDependencies, data.externalDependencies, data.fileDescription.targetFilePath);
+    }
+    return {
+        collect,
+        contents,
+        linkedBundleDependencies,
+        substitutedInputFilePathsByPackageName,
+        sourceMapTransformsByTargetPath,
+        externalDependencies
+    };
+}
+export function createSubstitutedResourceGraph() {
+    const graph = createDirectedGraph();
+    const nodeDataByFilePath = new Map();
+    function targetFilePathByInputFilePath() {
+        return new Map(Array.from(nodeDataByFilePath, function ([filePath, data]) {
+            return [filePath, data.fileDescription.targetFilePath];
+        }));
+    }
+    return {
+        add(filePath, data) {
+            graph.addNode(filePath, data);
+            nodeDataByFilePath.set(filePath, data);
+        },
+        isKnown: graph.hasNode,
+        connect(fromFilePath, toFilePath) {
+            graph.connect({ from: fromFilePath, to: toFilePath });
+        },
+        flatten(rootFilePaths) {
+            const { collect, contents, linkedBundleDependencies, substitutedInputFilePathsByPackageName, sourceMapTransformsByTargetPath, externalDependencies } = createFlattenCollectors();
+            const targetPaths = targetFilePathByInputFilePath();
+            for (const rootFilePath of rootFilePaths) {
+                graph.visitBreadthFirstSearch(rootFilePath, function (node) {
+                    collect(node.id, node.data, node.adjacentNodeIds, targetPaths);
+                });
+            }
+            const includedNodes = Array.from(nodeDataByFilePath).filter(function ([, data]) {
+                return data.isExplicitlyIncluded;
+            });
+            for (const [filePath, data] of includedNodes) {
+                const directDependencies = graph.getAdjacentIds(filePath);
+                collect(filePath, data, directDependencies, targetPaths);
+            }
+            return {
+                contents,
+                linkedBundleDependencies,
+                substitutedInputFilePathsByPackageName,
+                sourceMapTransformsByTargetPath,
+                externalDependencies
+            };
+        }
+    };
+}
 //# sourceMappingURL=substituted-resource-graph.js.map

package/linker/substituted-resource-graph.js.map

@@ -1 +1 @@
-{"version":3,"file":"substituted-resource-graph.js","sourceRoot":"","sources":["../../../../source/linker/substituted-resource-graph.ts"],"names":[],"mappings":"AAEA,OAIO,gDAAgD,CAAC;AACxD,OAAoC,4BAA4B,CAAC"}
+{"version":3,"file":"substituted-resource-graph.js","sourceRoot":"","sources":["../../../../source/linker/substituted-resource-graph.ts"],"names":[],"mappings":"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"}

package/npm-oidc-id-token-resolver.js

@@ -1 +1,83 @@
+function isRecord(value) {
+    return value instanceof Object && !Array.isArray(value);
+}
+function githubActionsAudience() {
+    return 'npm:registry.npmjs.org';
+}
+function defaultOidcIdTokenEnvVariableName() {
+    return 'NPM_ID_TOKEN';
+}
+function trustedOidcRequestSuffix() {
+    return '.actions.githubusercontent.com';
+}
+function parseOidcRequestUrl(value) {
+    try {
+        return new URL(value);
+    }
+    catch {
+        throw new Error(`ACTIONS_ID_TOKEN_REQUEST_URL is not a valid URL: "${value}"`);
+    }
+}
+function buildOidcHostnameMismatchMessage(actualHostname) {
+    return (`ACTIONS_ID_TOKEN_REQUEST_URL hostname must end with "${trustedOidcRequestSuffix()}", ` +
+        `got "${actualHostname}". A non-GitHub host would receive the GitHub-issued OIDC bearer.`);
+}
+function assertTrustedOidcRequestUrl(value) {
+    const parsed = parseOidcRequestUrl(value);
+    if (parsed.protocol !== 'https:') {
+        throw new Error(`ACTIONS_ID_TOKEN_REQUEST_URL must use https, got: "${value}"`);
+    }
+    if (!parsed.hostname.endsWith(trustedOidcRequestSuffix())) {
+        throw new Error(buildOidcHostnameMismatchMessage(parsed.hostname));
+    }
+    return parsed;
+}
+function getGitHubActionsRequestConfig(getEnvironmentVariable) {
+    const requestUrl = getEnvironmentVariable('ACTIONS_ID_TOKEN_REQUEST_URL');
+    const requestToken = getEnvironmentVariable('ACTIONS_ID_TOKEN_REQUEST_TOKEN');
+    if (requestUrl === undefined || requestToken === undefined) {
+        throw new Error('GitHub Actions OIDC requires ACTIONS_ID_TOKEN_REQUEST_URL and ACTIONS_ID_TOKEN_REQUEST_TOKEN');
+    }
+    return { requestUrl: assertTrustedOidcRequestUrl(requestUrl), requestToken };
+}
+function parseGitHubActionsIdTokenResponse(body) {
+    if (!isRecord(body)) {
+        throw new Error('GitHub Actions OIDC token response did not contain a usable id_token');
+    }
+    const { value } = body;
+    if (typeof value !== 'string' || value.length === 0) {
+        throw new Error('GitHub Actions OIDC token response did not contain a usable id_token');
+    }
+    return value;
+}
+function usesGitHubActionsProvider(auth, getEnvironmentVariable) {
+    const provider = auth.provider ?? 'auto';
+    const runsInGitHubActions = getEnvironmentVariable('GITHUB_ACTIONS') === 'true';
+    return provider === 'github-actions' || provider === 'auto' && runsInGitHubActions;
+}
+export function createNpmOidcIdTokenResolver(dependencies) {
+    const { fetch: fetchImplementation, getEnvironmentVariable } = dependencies;
+    async function fetchGitHubActionsIdToken() {
+        const { requestUrl, requestToken } = getGitHubActionsRequestConfig(getEnvironmentVariable);
+        requestUrl.searchParams.set('audience', githubActionsAudience());
+        const response = await fetchImplementation(requestUrl, {
+            headers: { Authorization: `Bearer ${requestToken}` }
+        });
+        if (!response.ok) {
+            throw new Error(`GitHub Actions OIDC token request failed with status ${response.status}`);
+        }
+        return parseGitHubActionsIdTokenResponse(await response.json());
+    }
+    return async function (auth) {
+        if (usesGitHubActionsProvider(auth, getEnvironmentVariable)) {
+            return fetchGitHubActionsIdToken();
+        }
+        const variableName = auth.idTokenEnvVar ?? defaultOidcIdTokenEnvVariableName();
+        const value = getEnvironmentVariable(variableName);
+        if (value === undefined) {
+            throw new Error(`OIDC id_token environment variable "${variableName}" is missing`);
+        }
+        return value;
+    };
+}
 //# sourceMappingURL=npm-oidc-id-token-resolver.js.map

package/npm-oidc-id-token-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"npm-oidc-id-token-resolver.js","sourceRoot":"","sources":["../../../source/npm-oidc-id-token-resolver.ts"],"names":[],"mappings":""}
+{"version":3,"file":"npm-oidc-id-token-resolver.js","sourceRoot":"","sources":["../../../source/npm-oidc-id-token-resolver.ts"],"names":[],"mappings":"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"}

package/pack-emitter/pack-emitter.d.ts

@@ -1,3 +1,23 @@
+import type { ArtifactsBuilder } from '../artifacts/artifacts-builder.ts';
+import type { FileDescription } from '../file-manager/file-description.ts';
+import type { FileManager } from '../file-manager/file-manager.ts';
+import type { ArtifactSourcePackage } from '../published-package/published-package.ts';
+import type { VendorEntry } from '../vendor-materializer/vendor-entry.ts';
 export type PackFormat = 'folder' | 'tar' | 'zip';
+type PackOptions = {
+    readonly bundle: ArtifactSourcePackage;
+    readonly format: PackFormat;
+    readonly outputPath: string;
+    readonly vendorEntries: readonly VendorEntry[];
+    readonly extraFiles: readonly FileDescription[];
+};
+export type PackEmitter = {
+    pack: (options: PackOptions) => Promise<void>;
+};
+export type PackEmitterDependencies = {
+    readonly artifactsBuilder: Pick<ArtifactsBuilder, 'buildFolder' | 'buildTarball' | 'buildZip'>;
+    readonly fileManager: Pick<FileManager, 'writeBinaryFile'>;
+};
+export declare function createPackEmitter(dependencies: PackEmitterDependencies): PackEmitter;
 export {};
 //# sourceMappingURL=pack-emitter.d.ts.map

package/pack-emitter/pack-emitter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pack-emitter.d.ts","sourceRoot":"","sources":["../../../../source/pack-emitter/pack-emitter.ts"],"names":[],"mappings":"MAMM,MAAM,UAAU,GAAG,QAAQ,GAAG,KAAK,GAAG,KAAK,CAAC;MAU5C,CAAoB,EAEzB,CAAC"}
+{"version":3,"file":"pack-emitter.d.ts","sourceRoot":"","sources":["../../../../source/pack-emitter/pack-emitter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AACvF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AAE1E,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,KAAK,GAAG,KAAK,CAAC;AAElD,KAAK,WAAW,GAAG;IACf,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC;IACvC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,aAAa,EAAE,SAAS,WAAW,EAAE,CAAC;IAC/C,QAAQ,CAAC,UAAU,EAAE,SAAS,eAAe,EAAE,CAAC;CACnD,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACtB,IAAI,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACjD,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IAClC,QAAQ,CAAC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EAAE,aAAa,GAAG,cAAc,GAAG,UAAU,CAAC,CAAC;IAC/F,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;CAC9D,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,uBAAuB,GAAG,WAAW,CAuCpF"}

package/pack-emitter/pack-emitter.js

@@ -1 +1,28 @@
+export function createPackEmitter(dependencies) {
+    const { artifactsBuilder, fileManager } = dependencies;
+    async function packZip(options) {
+        const { zipData } = await artifactsBuilder.buildZip(options.bundle, options.extraFiles, options.vendorEntries);
+        await fileManager.writeBinaryFile(options.outputPath, zipData);
+    }
+    async function packTarball(options) {
+        const { tarData } = await artifactsBuilder.buildTarball(options.bundle, options.extraFiles, options.vendorEntries);
+        await fileManager.writeBinaryFile(options.outputPath, tarData);
+    }
+    async function packFolder(options) {
+        await artifactsBuilder.buildFolder(options.bundle, options.outputPath, options.extraFiles, options.vendorEntries);
+    }
+    return {
+        async pack(options) {
+            if (options.format === 'zip') {
+                await packZip(options);
+                return;
+            }
+            if (options.format === 'tar') {
+                await packTarball(options);
+                return;
+            }
+            await packFolder(options);
+        }
+    };
+}
 //# sourceMappingURL=pack-emitter.js.map

package/pack-emitter/pack-emitter.js.map

@@ -1 +1 @@
-{"version":3,"file":"pack-emitter.js","sourceRoot":"","sources":["../../../../source/pack-emitter/pack-emitter.ts"],"names":[],"mappings":""}
+{"version":3,"file":"pack-emitter.js","sourceRoot":"","sources":["../../../../source/pack-emitter/pack-emitter.ts"],"names":[],"mappings":"AAyBA,MAAM,UAAU,iBAAiB,CAAC,YAAqC;IACnE,MAAM,EAAE,gBAAgB,EAAE,WAAW,EAAE,GAAG,YAAY,CAAC;IAEvD,KAAK,UAAU,OAAO,CAAC,OAAoB;QACvC,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;QAC/G,MAAM,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,UAAU,WAAW,CAAC,OAAoB;QAC3C,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,gBAAgB,CAAC,YAAY,CACnD,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,aAAa,CACxB,CAAC;QACF,MAAM,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,UAAU,UAAU,CAAC,OAAoB;QAC1C,MAAM,gBAAgB,CAAC,WAAW,CAC9B,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,aAAa,CACxB,CAAC;IACN,CAAC;IAED,OAAO;QACH,KAAK,CAAC,IAAI,CAAC,OAAO;YACd,IAAI,OAAO,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;gBAC3B,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;gBACvB,OAAO;YACX,CAAC;YACD,IAAI,OAAO,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;gBAC3B,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;gBAC3B,OAAO;YACX,CAAC;YACD,MAAM,UAAU,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC;KACJ,CAAC;AACN,CAAC"}

package/package-surface/bin-field.js

@@ -1,3 +1,9 @@
-import "./explicit-bin.js";
-import "./implicit-bin.js";
+import { buildExplicitBinField } from "./explicit-bin.js";
+import { buildImplicitBinField } from "./implicit-bin.js";
+export function buildBinField(bundle) {
+    if (bundle.surface.mode === 'explicit') {
+        return buildExplicitBinField(bundle, bundle.surface);
+    }
+    return buildImplicitBinField(bundle);
+}
 //# sourceMappingURL=bin-field.js.map

package/package-surface/bin-field.js.map

@@ -1 +1 @@
-{"version":3,"file":"bin-field.js","sourceRoot":"","sources":["../../../../source/package-surface/bin-field.ts"],"names":[],"mappings":"AACA,OAAsC,mBAAmB,CAAC;AAC1D,OAAsC,mBAAmB,CAAC"}
+{"version":3,"file":"bin-field.js","sourceRoot":"","sources":["../../../../source/package-surface/bin-field.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAK1D,MAAM,UAAU,aAAa,CAAC,MAAyB;IACnD,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QACrC,OAAO,qBAAqB,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACzD,CAAC;IACD,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAC;AACzC,CAAC"}

package/package-surface/explicit-bin.js

@@ -1,3 +1,25 @@
-import "./package-shape.js";
-import "./root-registry.js";
+import { toImportTarget } from "./package-shape.js";
+import { getRoot } from "./root-registry.js";
+function isShebangContent(content) {
+    return content.startsWith('#!');
+}
+function validateShebangRoot(bundleName, entryName, root) {
+    if (!isShebangContent(root.js.content)) {
+        throw new Error(`Package "${bundleName}" bin "${entryName}" must point to a root with a shebang`);
+    }
+    return root;
+}
+function buildEntries(bundle, bins) {
+    return bins.map(function (entry) {
+        const root = validateShebangRoot(bundle.name, entry.name, getRoot(bundle, entry.root));
+        return [entry.name, toImportTarget(root.js.targetFilePath)];
+    });
+}
+export function buildExplicitBinField(bundle, surface) {
+    const { bins } = surface.packageInterface;
+    if (bins === undefined) {
+        return undefined;
+    }
+    return Object.fromEntries(buildEntries(bundle, bins));
+}
 //# sourceMappingURL=explicit-bin.js.map

package/package-surface/explicit-bin.js.map

@@ -1 +1 @@
-{"version":3,"file":"explicit-bin.js","sourceRoot":"","sources":["../../../../source/package-surface/explicit-bin.ts"],"names":[],"mappings":"AACA,OAAgG,oBAAoB,CAAC;AACrH,OAAwB,oBAAoB,CAAC"}
+{"version":3,"file":"explicit-bin.js","sourceRoot":"","sources":["../../../../source/package-surface/explicit-bin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAmE,MAAM,oBAAoB,CAAC;AACrH,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAK7C,SAAS,gBAAgB,CAAC,OAAe;IACrC,OAAO,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,mBAAmB,CAAC,UAAkB,EAAE,SAAiB,EAAE,IAAyB;IACzF,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,YAAY,UAAU,UAAU,SAAS,uCAAuC,CAAC,CAAC;IACtG,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,YAAY,CAAC,MAAyB,EAAE,IAAgB;IAC7D,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,KAAK;QAC3B,MAAM,IAAI,GAAG,mBAAmB,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QACvF,OAAO,CAAE,KAAK,CAAC,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,CAAE,CAAC;IAClE,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,qBAAqB,CACjC,MAAyB,EACzB,OAAwB;IAExB,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAC1C,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACrB,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,OAAO,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;AAC1D,CAAC"}