packtory 0.0.71 → 0.0.72

package/linker/linker.js

@@ -25,7 +25,7 @@ function declarationCompanionRoots(contents, bundleDependencies) {
             return [];
         }
         return declarationCompanionCandidates(content.fileDescription.sourceFilePath).filter(function (candidate) {
-            return sourceFilePaths.has(candidate);
+            return sourceFilePaths.has(candidate) && !isSubstitutedBundleSourcePath(candidate, bundleDependencies);
         });
     });
 }
@@ -35,11 +35,12 @@ function flattenRootFilePaths(bundle, bundleDependencies) {
 export function createBundleLinker() {
     return {
         async linkBundle(options) {
-            const { bundle, bundleDependencies } = options;
+            const { bundle, bundleDependencies, bundlePeerDependencies } = options;
+            const substitutionSources = [...bundleDependencies, ...bundlePeerDependencies];
             const resourceGraph = createGraphFromResolvedBundle(bundle);
-            const substitutedGraph = substituteDependencies(resourceGraph, bundleDependencies);
+            const substitutedGraph = substituteDependencies(resourceGraph, bundleDependencies, bundlePeerDependencies);
             return {
-                ...substitutedGraph.flatten(flattenRootFilePaths(bundle, bundleDependencies)),
+                ...substitutedGraph.flatten(flattenRootFilePaths(bundle, substitutionSources)),
                 name: bundle.name,
                 exportPackageJson: bundle.exportPackageJson,
                 roots: bundle.roots,

package/linker/linker.js.map

@@ -1 +1 @@
-{"version":3,"file":"linker.js","sourceRoot":"","sources":["../../../../source/linker/linker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAuB,MAAM,yCAAyC,CAAC;AACtG,OAAO,EAAE,8BAA8B,EAAE,MAAM,0CAA0C,CAAC;AAC1F,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAWzD,SAAS,YAAY,CAAC,KAA8B;IAChD,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,UAAU,IAAI;QAC9C,IAAI,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC/B,OAAO,CAAE,IAAI,CAAC,EAAE,CAAC,cAAc,EAAE,IAAI,CAAC,eAAe,CAAC,cAAc,CAAE,CAAC;QAC3E,CAAC;QACD,OAAO,CAAE,IAAI,CAAC,EAAE,CAAC,cAAc,CAAE,CAAC;IACtC,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,6BAA6B,CAClC,cAAsB,EACtB,kBAAuD;IAEvD,OAAO,kBAAkB,CAAC,IAAI,CAAC,UAAU,gBAAgB;QACrD,OAAO,cAAc,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,yBAAyB,CAC9B,QAAoC,EACpC,kBAAuD;IAEvD,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,OAAO;QAC1D,OAAO,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC;IAClD,CAAC,CAAC,CAAC,CAAC;IACJ,OAAO,QAAQ,CAAC,OAAO,CAAC,UAAU,OAAO;QACrC,IAAI,6BAA6B,CAAC,OAAO,CAAC,eAAe,CAAC,cAAc,EAAE,kBAAkB,CAAC,EAAE,CAAC;YAC5F,OAAO,EAAE,CAAC;QACd,CAAC;QACD,OAAO,8BAA8B,CAAC,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,UAAU,SAAS;YACpG,OAAO,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,oBAAoB,CACzB,MAAsB,EACtB,kBAAuD;IAEvD,OAAO,CAAE,GAAG,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,yBAAyB,CAAC,MAAM,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAE,CAAC;AAChH,CAAC;AAED,MAAM,UAAU,kBAAkB;IAC9B,OAAO;QACH,KAAK,CAAC,UAAU,CAAC,OAAO;YACpB,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC;YAC/C,MAAM,aAAa,GAAG,6BAA6B,CAAC,MAAM,CAAC,CAAC;YAC5D,MAAM,gBAAgB,GAAG,sBAAsB,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC;YAEnF,OAAO;gBACH,GAAG,gBAAgB,CAAC,OAAO,CAAC,oBAAoB,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;gBAC7E,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;gBAC3C,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,OAAO,EAAE,MAAM,CAAC,OAAO;aAC1B,CAAC;QACN,CAAC;KACJ,CAAC;AACN,CAAC"}
+{"version":3,"file":"linker.js","sourceRoot":"","sources":["../../../../source/linker/linker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAuB,MAAM,yCAAyC,CAAC;AACtG,OAAO,EAAE,8BAA8B,EAAE,MAAM,0CAA0C,CAAC;AAC1F,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAYzD,SAAS,YAAY,CAAC,KAA8B;IAChD,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,UAAU,IAAI;QAC9C,IAAI,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC/B,OAAO,CAAE,IAAI,CAAC,EAAE,CAAC,cAAc,EAAE,IAAI,CAAC,eAAe,CAAC,cAAc,CAAE,CAAC;QAC3E,CAAC;QACD,OAAO,CAAE,IAAI,CAAC,EAAE,CAAC,cAAc,CAAE,CAAC;IACtC,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,6BAA6B,CAClC,cAAsB,EACtB,kBAAuD;IAEvD,OAAO,kBAAkB,CAAC,IAAI,CAAC,UAAU,gBAAgB;QACrD,OAAO,cAAc,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,yBAAyB,CAC9B,QAAoC,EACpC,kBAAuD;IAEvD,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,OAAO;QAC1D,OAAO,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC;IAClD,CAAC,CAAC,CAAC,CAAC;IACJ,OAAO,QAAQ,CAAC,OAAO,CAAC,UAAU,OAAO;QACrC,IAAI,6BAA6B,CAAC,OAAO,CAAC,eAAe,CAAC,cAAc,EAAE,kBAAkB,CAAC,EAAE,CAAC;YAC5F,OAAO,EAAE,CAAC;QACd,CAAC;QACD,OAAO,8BAA8B,CAAC,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,UAAU,SAAS;YACpG,OAAO,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,6BAA6B,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;QAC3G,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,oBAAoB,CACzB,MAAsB,EACtB,kBAAuD;IAEvD,OAAO,CAAE,GAAG,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,yBAAyB,CAAC,MAAM,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAE,CAAC;AAChH,CAAC;AAED,MAAM,UAAU,kBAAkB;IAC9B,OAAO;QACH,KAAK,CAAC,UAAU,CAAC,OAAO;YACpB,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC;YACvE,MAAM,mBAAmB,GAAG,CAAE,GAAG,kBAAkB,EAAE,GAAG,sBAAsB,CAAE,CAAC;YACjF,MAAM,aAAa,GAAG,6BAA6B,CAAC,MAAM,CAAC,CAAC;YAC5D,MAAM,gBAAgB,GAAG,sBAAsB,CAAC,aAAa,EAAE,kBAAkB,EAAE,sBAAsB,CAAC,CAAC;YAE3G,OAAO;gBACH,GAAG,gBAAgB,CAAC,OAAO,CAAC,oBAAoB,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;gBAC9E,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;gBAC3C,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,OAAO,EAAE,MAAM,CAAC,OAAO;aAC1B,CAAC;QACN,CAAC;KACJ,CAAC;AACN,CAAC"}

package/linker/replacement-lookup.js

@@ -1,41 +1,158 @@
-import { Maybe } from 'true-myth';
+import path from 'node:path';
+import { isDefined } from 'remeda';
+import { ts as typescript } from 'ts-morph';
+import { declarationCompanionCandidates } from "../common/declaration-companion-paths.js";
+import { rootSourceFilePaths } from "../package-surface/package-surface-index.js";
 import { getPublicModuleSpecifierForSourcePath } from "../package-surface/public-specifiers.js";
+import { getRoot } from "../package-surface/root-registry.js";
+import { toPackageSpecifier } from "../package-surface/specifier-syntax.js";
 export function ownsSourcePath(file, bundle) {
     return bundle.contents.some(function (content) {
         return content.fileDescription.sourceFilePath === file;
     });
 }
-function findReplacement(file, bundleDependencies) {
-    for (const bundle of bundleDependencies) {
-        const targetPath = getPublicModuleSpecifierForSourcePath(bundle, file);
+function needsImportReplacement(file) {
+    return !file.endsWith('.map');
+}
+function createContentLookup(bundle) {
+    const contentBySourcePath = new Map();
+    const sourcePathByTargetPath = new Map();
+    for (const content of bundle.contents) {
+        contentBySourcePath.set(content.fileDescription.sourceFilePath, content);
+        sourcePathByTargetPath.set(content.fileDescription.targetFilePath, content.fileDescription.sourceFilePath);
+    }
+    return { contentBySourcePath, sourcePathByTargetPath };
+}
+function exportDeclarationModuleSpecifier(statement) {
+    if (!typescript.isExportDeclaration(statement)) {
+        return undefined;
+    }
+    return statement;
+}
+function moduleSpecifierText(statement) {
+    const { moduleSpecifier } = statement;
+    if (moduleSpecifier === undefined) {
+        return undefined;
+    }
+    return typescript.isStringLiteral(moduleSpecifier) ? moduleSpecifier.text : undefined;
+}
+function exportedModuleSpecifiers(content) {
+    const sourceFile = typescript.createSourceFile(content, content, typescript.ScriptTarget.Latest);
+    return sourceFile
+        .statements
+        .map(exportDeclarationModuleSpecifier)
+        .filter(isDefined)
+        .map(moduleSpecifierText)
+        .filter(isDefined);
+}
+function exportedTargetPath(currentTargetFilePath, specifier) {
+    if (!specifier.startsWith('.')) {
+        return undefined;
+    }
+    return path.posix.normalize(path.posix.join(path.posix.dirname(currentTargetFilePath), specifier));
+}
+function enqueueExportedSourceFilePaths(lookup, pending, currentTargetFilePath, specifier) {
+    const targetPath = exportedTargetPath(currentTargetFilePath, specifier);
+    if (targetPath === undefined) {
+        return;
+    }
+    const sourcePaths = [targetPath, ...declarationCompanionCandidates(targetPath)]
+        .map(function (candidate) {
+        return lookup.sourcePathByTargetPath.get(candidate);
+    })
+        .filter(isDefined);
+    for (const sourcePath of sourcePaths) {
+        pending.push(sourcePath);
+    }
+}
+function publicExportedSourceFilePaths(initialSourceFilePaths, lookup) {
+    const pending = Array.from(initialSourceFilePaths);
+    const visited = new Set();
+    function visitSourceFilePath(sourceFilePath) {
+        const content = lookup.contentBySourcePath.get(sourceFilePath);
+        if (content !== undefined && !visited.has(sourceFilePath)) {
+            visited.add(sourceFilePath);
+            for (const specifier of exportedModuleSpecifiers(content.fileDescription.content)) {
+                enqueueExportedSourceFilePaths(lookup, pending, content.fileDescription.targetFilePath, specifier);
+            }
+        }
+    }
+    for (let next = pending.pop(); next !== undefined; next = pending.pop()) {
+        visitSourceFilePath(next);
+    }
+    return visited;
+}
+function recordShortestSpecifier(specifiersBySourcePath, sourceFilePaths, specifier) {
+    for (const sourceFilePath of sourceFilePaths) {
+        const current = specifiersBySourcePath.get(sourceFilePath);
+        if (current === undefined || specifier.length < current.length) {
+            specifiersBySourcePath.set(sourceFilePath, specifier);
+        }
+    }
+}
+function getExplicitPublicModuleSpecifierForSourcePath(bundle, surface, sourceFilePath) {
+    const lookup = createContentLookup(bundle);
+    const specifiersBySourcePath = new Map();
+    const moduleEntries = surface.packageInterface.modules ?? [];
+    for (const moduleEntry of moduleEntries) {
+        const root = getRoot(bundle, moduleEntry.root);
+        const rootPaths = rootSourceFilePaths(root);
+        recordShortestSpecifier(specifiersBySourcePath, publicExportedSourceFilePaths(rootPaths, lookup), toPackageSpecifier(bundle.name, moduleEntry.export));
+    }
+    return specifiersBySourcePath.get(sourceFilePath);
+}
+function getImplicitPublicModuleSpecifierForSourcePath(bundle, surface, sourceFilePath) {
+    const lookup = createContentLookup(bundle);
+    const specifiersBySourcePath = new Map();
+    const defaultRoot = getRoot(bundle, surface.defaultModuleRoot);
+    recordShortestSpecifier(specifiersBySourcePath, publicExportedSourceFilePaths(rootSourceFilePaths(defaultRoot), lookup), bundle.name);
+    for (const root of Object.values(bundle.roots)) {
+        recordShortestSpecifier(specifiersBySourcePath, publicExportedSourceFilePaths(rootSourceFilePaths(root), lookup), toPackageSpecifier(bundle.name, `./${root.js.targetFilePath}`));
+    }
+    return specifiersBySourcePath.get(sourceFilePath) ?? getPublicModuleSpecifierForSourcePath(bundle, sourceFilePath);
+}
+function getExistingPublicModuleSpecifierForSourcePath(bundle, sourceFilePath) {
+    const { surface } = bundle;
+    if (surface.mode === 'implicit') {
+        return getImplicitPublicModuleSpecifierForSourcePath(bundle, surface, sourceFilePath);
+    }
+    return getExplicitPublicModuleSpecifierForSourcePath(bundle, surface, sourceFilePath);
+}
+function findReplacementInBundles(file, bundles, getTargetPath) {
+    for (const bundle of bundles) {
+        const targetPath = getTargetPath(bundle, file);
         if (targetPath !== undefined) {
-            return Maybe.just({
+            return {
                 targetPath,
                 packageName: bundle.name
-            });
+            };
         }
-        if (ownsSourcePath(file, bundle)) {
+        if (needsImportReplacement(file) && ownsSourcePath(file, bundle)) {
             throw new Error(`Package "${bundle.name}" does not expose "${file}" for cross-package substitution`);
         }
     }
-    return Maybe.nothing();
+    return undefined;
 }
-export function findAllPathReplacements(files, bundleDependencies) {
-    const matched = files.flatMap(function (file) {
-        const result = findReplacement(file, bundleDependencies);
-        if (!result.isJust) {
-            return [];
+function findReplacement(file, bundleDependencies, bundlePeerDependencies) {
+    const dependencyReplacement = findReplacementInBundles(file, bundleDependencies, getPublicModuleSpecifierForSourcePath);
+    if (dependencyReplacement !== undefined) {
+        return dependencyReplacement;
+    }
+    return findReplacementInBundles(file, bundlePeerDependencies, getExistingPublicModuleSpecifierForSourcePath);
+}
+export function findAllPathReplacements(files, bundleDependencies, bundlePeerDependencies) {
+    const importPathReplacements = new Map();
+    const matchedBundleDependencies = [];
+    for (const file of files) {
+        const replacement = findReplacement(file, bundleDependencies, bundlePeerDependencies);
+        if (replacement !== undefined) {
+            importPathReplacements.set(file, replacement.targetPath);
+            matchedBundleDependencies.push(replacement.packageName);
         }
-        const { targetPath, packageName } = result.value;
-        return [{ file, targetPath, packageName }];
-    });
+    }
     return {
-        importPathReplacements: new Map(matched.map(function (entry) {
-            return [entry.file, entry.targetPath];
-        })),
-        bundleDependencies: matched.map(function (entry) {
-            return entry.packageName;
-        })
+        importPathReplacements,
+        bundleDependencies: matchedBundleDependencies
     };
 }
 //# sourceMappingURL=replacement-lookup.js.map

package/linker/replacement-lookup.js.map

@@ -1 +1 @@
-{"version":3,"file":"replacement-lookup.js","sourceRoot":"","sources":["../../../../source/linker/replacement-lookup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,qCAAqC,EAAE,MAAM,yCAAyC,CAAC;AAahG,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,MAAgC;IACzE,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,OAAO;QACzC,OAAO,OAAO,CAAC,eAAe,CAAC,cAAc,KAAK,IAAI,CAAC;IAC3D,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,eAAe,CAAC,IAAY,EAAE,kBAAuD;IAC1F,KAAK,MAAM,MAAM,IAAI,kBAAkB,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,qCAAqC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACvE,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC,IAAI,CAAC;gBACd,UAAU;gBACV,WAAW,EAAE,MAAM,CAAC,IAAI;aAC3B,CAAC,CAAC;QACP,CAAC;QACD,IAAI,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,YAAY,MAAM,CAAC,IAAI,sBAAsB,IAAI,kCAAkC,CAAC,CAAC;QACzG,CAAC;IACL,CAAC;IAED,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,uBAAuB,CACnC,KAAwB,EACxB,kBAAuD;IAEvD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,IAAI;QACxC,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QACzD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,EAAE,CAAC;QACd,CAAC;QACD,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC;QACjD,OAAO,CAAE,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,CAAE,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,OAAO;QACH,sBAAsB,EAAE,IAAI,GAAG,CAC3B,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK;YACvB,OAAO,CAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,CAAE,CAAC;QAC5C,CAAC,CAAC,CACL;QACD,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK;YAC3C,OAAO,KAAK,CAAC,WAAW,CAAC;QAC7B,CAAC,CAAC;KACL,CAAC;AACN,CAAC"}
+{"version":3,"file":"replacement-lookup.js","sourceRoot":"","sources":["../../../../source/linker/replacement-lookup.ts"],"names":[],"mappings":"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"}

package/linker/substitute-bundles.js

@@ -1,39 +1,52 @@
-import { findAllPathReplacements } from "./replacement-lookup.js";
+import { findAllPathReplacements, ownsSourcePath } from "./replacement-lookup.js";
 import { replaceImportPaths } from "./source-modifier/import-paths.js";
 import { createSubstitutedResourceGraph } from "./substituted-resource-graph.js";
-export function substituteDependencies(resourceGraph, bundleDependencies) {
+function isSubstitutionSourcePath(sourceFilePath, substitutionSources) {
+    return substitutionSources.some(function (bundle) {
+        return ownsSourcePath(sourceFilePath, bundle);
+    });
+}
+function recordUnreplacedConnections(outstandingConnections, fromNodeId, directDependencies, replacedPaths) {
+    for (const file of directDependencies) {
+        if (!replacedPaths.has(file)) {
+            outstandingConnections.push({ from: fromNodeId, to: file });
+        }
+    }
+}
+function contentWithReplacements(node, replacements) {
+    return replaceImportPaths(node.data.project, node.data.fileDescription.sourceFilePath, node.data.fileDescription.content, replacements.importPathReplacements);
+}
+function addNodeWithReplacements(substitutedGraph, node, replacements) {
+    const isSubstituted = replacements.importPathReplacements.size > 0;
+    const content = contentWithReplacements(node, replacements);
+    substitutedGraph.add(node.id, {
+        fileDescription: { ...node.data.fileDescription, content },
+        externalDependencies: node.data.externalDependencies,
+        bundleDependencies: isSubstituted ? replacements.bundleDependencies : [],
+        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();
-    function recordOutstandingConnections(fromNodeId, directDependencies, replacedPaths) {
-        for (const file of directDependencies) {
-            if (!replacedPaths.has(file)) {
-                outstandingConnections.push({ from: fromNodeId, to: file });
-            }
-        }
-    }
-    function contentWithReplacements(node, replacements) {
-        return replaceImportPaths(node.data.project, node.data.fileDescription.sourceFilePath, node.data.fileDescription.content, replacements.importPathReplacements);
-    }
-    resourceGraph.traverse(function (node) {
+    const substitutionSources = [...bundleDependencies, ...bundlePeerDependencies];
+    function substituteNode(node) {
         if (visited.has(node.id)) {
             return;
         }
         visited.add(node.id);
+        if (isSubstitutionSourcePath(node.id, substitutionSources)) {
+            return;
+        }
         const directDependencies = Array.from(node.adjacentNodeIds);
-        const replacements = findAllPathReplacements(directDependencies, bundleDependencies);
-        recordOutstandingConnections(node.id, directDependencies, replacements.importPathReplacements);
-        const isSubstituted = replacements.importPathReplacements.size > 0;
-        const content = contentWithReplacements(node, replacements);
-        substitutedGraph.add(node.id, {
-            fileDescription: { ...node.data.fileDescription, content },
-            externalDependencies: node.data.externalDependencies,
-            bundleDependencies: isSubstituted ? replacements.bundleDependencies : [],
-            isSubstituted,
-            isExplicitlyIncluded: node.data.isExplicitlyIncluded,
-            ...node.data.isGeneratedManifest ? { isGeneratedManifest: true } : {}
-        });
-    });
+        const replacements = findAllPathReplacements(directDependencies, bundleDependencies, bundlePeerDependencies);
+        recordUnreplacedConnections(outstandingConnections, node.id, directDependencies, replacements.importPathReplacements);
+        addNodeWithReplacements(substitutedGraph, node, replacements);
+    }
+    resourceGraph.traverse(substituteNode);
     for (const connection of outstandingConnections) {
         substitutedGraph.connect(connection.from, connection.to);
     }

package/linker/substitute-bundles.js.map

@@ -1 +1 @@
-{"version":3,"file":"substitute-bundles.js","sourceRoot":"","sources":["../../../../source/linker/substitute-bundles.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAqB,MAAM,yBAAyB,CAAC;AAErF,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,8BAA8B,EAAiC,MAAM,iCAAiC,CAAC;AAEhH,MAAM,UAAU,sBAAsB,CAClC,aAA4B,EAC5B,kBAAuD;IAEvD,MAAM,gBAAgB,GAAG,8BAA8B,EAAE,CAAC;IAC1D,MAAM,sBAAsB,GAAsD,EAAE,CAAC;IACrF,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAElC,SAAS,4BAA4B,CACjC,UAAkB,EAClB,kBAAqC,EACrC,aAAkE;QAElE,KAAK,MAAM,IAAI,IAAI,kBAAkB,EAAE,CAAC;YACpC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC3B,sBAAsB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;YAChE,CAAC;QACL,CAAC;IACL,CAAC;IAED,SAAS,uBAAuB,CAC5B,IAA6D,EAC7D,YAA0B;QAE1B,OAAO,kBAAkB,CACrB,IAAI,CAAC,IAAI,CAAC,OAAO,EACjB,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,cAAc,EACxC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,EACjC,YAAY,CAAC,sBAAsB,CACtC,CAAC;IACN,CAAC;IAED,aAAa,CAAC,QAAQ,CAAC,UAAU,IAAI;QACjC,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YACvB,OAAO;QACX,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAErB,MAAM,kBAAkB,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC5D,MAAM,YAAY,GAAG,uBAAuB,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC;QACrF,4BAA4B,CAAC,IAAI,CAAC,EAAE,EAAE,kBAAkB,EAAE,YAAY,CAAC,sBAAsB,CAAC,CAAC;QAE/F,MAAM,aAAa,GAAG,YAAY,CAAC,sBAAsB,CAAC,IAAI,GAAG,CAAC,CAAC;QACnE,MAAM,OAAO,GAAG,uBAAuB,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC5D,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE;YAC1B,eAAe,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,EAAE;YAC1D,oBAAoB,EAAE,IAAI,CAAC,IAAI,CAAC,oBAAoB;YACpD,kBAAkB,EAAE,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE;YACxE,aAAa;YACb,oBAAoB,EAAE,IAAI,CAAC,IAAI,CAAC,oBAAoB;YACpD,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;SACxE,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,KAAK,MAAM,UAAU,IAAI,sBAAsB,EAAE,CAAC;QAC9C,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"substitute-bundles.js","sourceRoot":"","sources":["../../../../source/linker/substitute-bundles.ts"],"names":[],"mappings":"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"}

package/package-surface/package-surface-index.js

@@ -40,7 +40,7 @@ function createPublicModuleIndexBuilder() {
         }
     };
 }
-function rootSourceFilePaths(root) {
+export function rootSourceFilePaths(root) {
     if (root.declarationFile === undefined) {
         return [root.js.sourceFilePath];
     }

package/package-surface/package-surface-index.js.map

@@ -1 +1 @@
-{"version":3,"file":"package-surface-index.js","sourceRoot":"","sources":["../../../../source/package-surface/package-surface-index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"package-surface-index.js","sourceRoot":"","sources":["../../../../source/package-surface/package-surface-index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -129,5 +129,5 @@
         "./tar/tarball-builder.js"
     ],
     "type": "module",
-    "version": "0.0.71"
+    "version": "0.0.72"
 }

package/packtory/package-processor-build.js

@@ -37,7 +37,8 @@ export function createResolveAndBuildOperations(dependencies) {
         dependencies.progressBroadcaster.emit('linking', { packageName: options.name });
         const linkedBundle = await dependencies.linker.linkBundle({
             bundle: resolvedBundle,
-            bundleDependencies: [...options.bundleDependencies, ...options.bundlePeerDependencies]
+            bundleDependencies: options.bundleDependencies,
+            bundlePeerDependencies: options.bundlePeerDependencies
         });
         maybeEmitLinkingCompleted(dependencies, options.name, linkedBundle);
         return linkedBundle;

package/packtory/package-processor-build.js.map

@@ -1 +1 @@
-{"version":3,"file":"package-processor-build.js","sourceRoot":"","sources":["../../../../source/packtory/package-processor-build.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"package-processor-build.js","sourceRoot":"","sources":["../../../../source/packtory/package-processor-build.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kDAAkD,CAAC;AAE1F,OAAO,EAAE,qBAAqB,EAAE,MAAM,iDAAiD,CAAC;AACxF,OAAO,EAAE,kBAAkB,EAA4B,MAAM,8CAA8C,CAAC;AAe5G,SAAS,wBAAwB,CAAC,eAAqC;IACnE,IAAI,eAAe,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAC7D,CAAC;AACL,CAAC;AAED,SAAS,sBAAsB,CAC3B,YAAsE,EACtE,WAAmB,EACnB,QAA6B;IAE7B,IAAI,YAAY,CAAC,mBAAmB,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE,CAAC;QACnE,YAAY,CAAC,mBAAmB,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,WAAW,EAAE,GAAG,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC7G,CAAC;AACL,CAAC;AAED,SAAS,yBAAyB,CAC9B,YAAsE,EACtE,WAAmB,EACnB,MAAoB;IAEpB,IAAI,YAAY,CAAC,mBAAmB,CAAC,cAAc,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACtE,YAAY,CAAC,mBAAmB,CAAC,IAAI,CAAC,kBAAkB,EAAE;YACtD,WAAW;YACX,QAAQ,EAAE,qBAAqB,CAAC,MAAM,CAAC;SAC1C,CAAC,CAAC;IACP,CAAC;AACL,CAAC;AAED,KAAK,UAAU,UAAU,CACrB,YAAqE,EACrE,YAA0B,EAC1B,sBAA+B,EAC/B,mBAA4D;IAE5D,MAAM,CAAE,cAAc,CAAE,GAAG,MAAM,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC;QACvE,EAAE,MAAM,EAAE,YAAY,EAAE,sBAAsB,EAAE,mBAAmB,EAAE;KACxE,CAAC,CAAC;IACH,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,gDAAgD,YAAY,CAAC,IAAI,GAAG,CAAC,CAAC;IAC1F,CAAC;IAED,OAAO,cAAc,CAAC;AAC1B,CAAC;AAOD,MAAM,UAAU,+BAA+B,CAAC,YAAyC;IACrF,KAAK,UAAU,cAAc,CAAC,OAA8B;QACxD,wBAAwB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAClD,YAAY,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAClF,MAAM,cAAc,GAAG,MAAM,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC5E,sBAAsB,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACnE,YAAY,CAAC,mBAAmB,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAChF,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC;YACtD,MAAM,EAAE,cAAc;YACtB,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;YAC9C,sBAAsB,EAAE,OAAO,CAAC,sBAAsB;SACzD,CAAC,CAAC;QACH,yBAAyB,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACpE,OAAO,YAAY,CAAC;IACxB,CAAC;IAED,KAAK,UAAU,KAAK,CAAC,OAAqB;QACtC,wBAAwB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAClD,MAAM,EACF,eAAe,EACf,kBAAkB,EAClB,sBAAsB,EACtB,qBAAqB,EACrB,IAAI,EACJ,aAAa,EAChB,GAAG,OAAO,CAAC;QACZ,MAAM,uBAAuB,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAChE,MAAM,YAAY,GAAG,MAAM,cAAc,CAAC;YACtC,IAAI;YACJ,aAAa;YACb,KAAK,EAAE,uBAAuB,CAAC,KAAK;YACpC,OAAO,EAAE,uBAAuB,CAAC,OAAO;YACxC,qBAAqB;YACrB,eAAe;YACf,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,8BAA8B,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE;YACrE,+BAA+B,EAAE,OAAO,CAAC,+BAA+B;YACxE,sBAAsB,EAAE,OAAO,CAAC,sBAAsB;YACtD,kBAAkB;YAClB,sBAAsB;SACzB,CAAC,CAAC;QAEH,MAAM,sBAAsB,GAAG,OAAO,CAAC,mBAAmB,EAAE,OAAO,IAAI,IAAI,CAAC;QAC5E,MAAM,cAAc,GAAG,MAAM,UAAU,CACnC,YAAY,EACZ,YAAY,EACZ,sBAAsB,EACtB,OAAO,CAAC,mBAAmB,CAC9B,CAAC;QACF,OAAO,YAAY,CAAC,cAAc,CAAC,UAAU,CAAC;YAC1C,MAAM,EAAE,cAAc;YACtB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;YAC9C,sBAAsB,EAAE,OAAO,CAAC,sBAAsB;YACtD,+BAA+B,EAAE,OAAO,CAAC,+BAA+B;YACxE,sBAAsB,EAAE,OAAO,CAAC,sBAAsB;SACzD,CAAC,CAAC;IACP,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC;AACrC,CAAC"}

package/sbom.cdx.json

@@ -16,9 +16,9 @@
         "component": {
             "type": "library",
             "name": "packtory",
-            "version": "0.0.71",
-            "bom-ref": "pkg:npm/packtory@0.0.71",
-            "purl": "pkg:npm/packtory@0.0.71"
+            "version": "0.0.72",
+            "bom-ref": "pkg:npm/packtory@0.0.72",
+            "purl": "pkg:npm/packtory@0.0.72"
         }
     },
     "components": [
@@ -392,7 +392,7 @@
             "ref": "pkg:npm/npm-registry-fetch@20.0.1"
         },
         {
-            "ref": "pkg:npm/packtory@0.0.71",
+            "ref": "pkg:npm/packtory@0.0.72",
             "dependsOn": [
                 "pkg:npm/@arethetypeswrong/core@0.18.5",
                 "pkg:npm/@cyclonedx/cyclonedx-library@10.1.0",