packtory 0.0.89 → 0.0.91
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/linker/replacement-lookup.js +196 -70
- package/linker/replacement-lookup.js.map +1 -1
- package/linker/substitute-bundles.js +70 -1
- package/linker/substitute-bundles.js.map +1 -1
- package/package.json +2 -2
- package/packtory/stages/package-resolution-stage.js +4 -1
- package/packtory/stages/package-resolution-stage.js.map +1 -1
- package/sbom.cdx.json +9 -9
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
|
-
import { isDefined } from 'remeda';
|
|
3
2
|
import { ts as typescript } from 'ts-morph';
|
|
4
|
-
import { declarationCompanionCandidates } from "../common/declaration-companion-paths.js";
|
|
3
|
+
import { declarationCompanionCandidates, isDeclarationCompanionFilePath } from "../common/declaration-companion-paths.js";
|
|
4
|
+
import { bfsClosure } from "../dead-code-eliminator/reachability/bfs-closure.js";
|
|
5
5
|
import { rootSourceFilePaths } from "../package-surface/package-surface-index.js";
|
|
6
6
|
import { getPublicModuleSpecifierForSourcePath } from "../package-surface/public-specifiers.js";
|
|
7
7
|
import { getRoot } from "../package-surface/root-registry.js";
|
|
@@ -14,6 +14,9 @@ export function ownsSourcePath(file, bundle) {
|
|
|
14
14
|
function needsImportReplacement(file) {
|
|
15
15
|
return !file.endsWith('.map');
|
|
16
16
|
}
|
|
17
|
+
function isDefined(value) {
|
|
18
|
+
return value !== undefined;
|
|
19
|
+
}
|
|
17
20
|
function createContentLookup(bundle) {
|
|
18
21
|
const contentBySourcePath = new Map();
|
|
19
22
|
const sourcePathByTargetPath = new Map();
|
|
@@ -23,7 +26,7 @@ function createContentLookup(bundle) {
|
|
|
23
26
|
}
|
|
24
27
|
return { contentBySourcePath, sourcePathByTargetPath };
|
|
25
28
|
}
|
|
26
|
-
function
|
|
29
|
+
function exportDeclaration(statement) {
|
|
27
30
|
if (!typescript.isExportDeclaration(statement)) {
|
|
28
31
|
return undefined;
|
|
29
32
|
}
|
|
@@ -34,131 +37,254 @@ function moduleSpecifierText(statement) {
|
|
|
34
37
|
if (moduleSpecifier === undefined) {
|
|
35
38
|
return undefined;
|
|
36
39
|
}
|
|
37
|
-
|
|
40
|
+
if (!typescript.isStringLiteral(moduleSpecifier) || !moduleSpecifier.text.startsWith('.')) {
|
|
41
|
+
return undefined;
|
|
42
|
+
}
|
|
43
|
+
return moduleSpecifier.text;
|
|
38
44
|
}
|
|
39
|
-
function
|
|
45
|
+
function exportDeclarations(content) {
|
|
40
46
|
const sourceFile = typescript.createSourceFile(content, content, typescript.ScriptTarget.Latest);
|
|
41
47
|
return sourceFile
|
|
42
48
|
.statements
|
|
43
|
-
.map(
|
|
44
|
-
.filter(isDefined)
|
|
45
|
-
.map(moduleSpecifierText)
|
|
49
|
+
.map(exportDeclaration)
|
|
46
50
|
.filter(isDefined);
|
|
47
51
|
}
|
|
48
52
|
function exportedTargetPath(currentTargetFilePath, specifier) {
|
|
49
|
-
if (!specifier.startsWith('.')) {
|
|
50
|
-
return undefined;
|
|
51
|
-
}
|
|
52
53
|
return path.posix.normalize(path.posix.join(path.posix.dirname(currentTargetFilePath), specifier));
|
|
53
54
|
}
|
|
54
|
-
function
|
|
55
|
+
function exportedSourceFilePaths(lookup, currentTargetFilePath, specifier) {
|
|
55
56
|
const targetPath = exportedTargetPath(currentTargetFilePath, specifier);
|
|
56
|
-
|
|
57
|
-
|
|
57
|
+
const sourceFilePaths = [];
|
|
58
|
+
for (const candidate of [targetPath, ...declarationCompanionCandidates(targetPath)]) {
|
|
59
|
+
for (const [targetFilePath, sourceFilePath] of lookup.sourcePathByTargetPath) {
|
|
60
|
+
if (targetFilePath === candidate) {
|
|
61
|
+
sourceFilePaths.push(sourceFilePath);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
58
64
|
}
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
pending.push(sourcePath);
|
|
65
|
+
return sourceFilePaths;
|
|
66
|
+
}
|
|
67
|
+
function namedExports(declaration) {
|
|
68
|
+
const { exportClause } = declaration;
|
|
69
|
+
if (exportClause === undefined || !typescript.isNamedExports(exportClause)) {
|
|
70
|
+
return [];
|
|
66
71
|
}
|
|
72
|
+
return Array.from(exportClause.elements);
|
|
67
73
|
}
|
|
68
|
-
function
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
74
|
+
function isExportStar(declaration) {
|
|
75
|
+
return declaration.exportClause === undefined;
|
|
76
|
+
}
|
|
77
|
+
function declarationSourceFilePaths(lookup, currentTargetFilePath, declaration) {
|
|
78
|
+
return exportedSourceFilePaths(lookup, currentTargetFilePath, moduleSpecifierText(declaration) ?? '');
|
|
79
|
+
}
|
|
80
|
+
const pathClosureDependencies = {
|
|
81
|
+
visitedHas(visited, value) {
|
|
82
|
+
return visited.has(value);
|
|
83
|
+
}
|
|
84
|
+
};
|
|
85
|
+
function exportStateValue(value, property) {
|
|
86
|
+
return Reflect.get(new Object(value), property);
|
|
87
|
+
}
|
|
88
|
+
function sourceFilePathForState(state) {
|
|
89
|
+
return state.sourceFilePath;
|
|
90
|
+
}
|
|
91
|
+
const exportClosureDependencies = {
|
|
92
|
+
visitedHas(visited, value) {
|
|
93
|
+
return Array.from(visited).some(function (state) {
|
|
94
|
+
return exportStateValue(state, 'sourceFilePath') === exportStateValue(value, 'sourceFilePath') &&
|
|
95
|
+
exportStateValue(state, 'exportName') === exportStateValue(value, 'exportName');
|
|
96
|
+
});
|
|
79
97
|
}
|
|
80
|
-
|
|
81
|
-
|
|
98
|
+
};
|
|
99
|
+
function exportedStateNames(lookup, state) {
|
|
100
|
+
const content = lookup.contentBySourcePath.get(sourceFilePathForState(state));
|
|
101
|
+
if (content === undefined) {
|
|
102
|
+
return Array.from(new Set());
|
|
82
103
|
}
|
|
83
|
-
return
|
|
104
|
+
return exportDeclarations(content.fileDescription.content).flatMap(function (declaration) {
|
|
105
|
+
const sourceFilePaths = declarationSourceFilePaths(lookup, content.fileDescription.targetFilePath, declaration);
|
|
106
|
+
const exportStarStates = sourceFilePaths
|
|
107
|
+
.filter(function () {
|
|
108
|
+
return state.exportName !== 'default' && isExportStar(declaration);
|
|
109
|
+
})
|
|
110
|
+
.map(function (nextSourceFilePath) {
|
|
111
|
+
return { sourceFilePath: nextSourceFilePath, exportName: state.exportName };
|
|
112
|
+
});
|
|
113
|
+
const namedExportStates = namedExports(declaration)
|
|
114
|
+
.filter(function (namedExport) {
|
|
115
|
+
return namedExport.name.text === state.exportName;
|
|
116
|
+
})
|
|
117
|
+
.flatMap(function (namedExport) {
|
|
118
|
+
const sourceExportName = namedExport.propertyName?.text ?? namedExport.name.text;
|
|
119
|
+
return sourceFilePaths.map(function (nextSourceFilePath) {
|
|
120
|
+
return { sourceFilePath: nextSourceFilePath, exportName: sourceExportName };
|
|
121
|
+
});
|
|
122
|
+
});
|
|
123
|
+
return [...exportStarStates, ...namedExportStates];
|
|
124
|
+
});
|
|
125
|
+
}
|
|
126
|
+
function publicModuleCanExport(rootSourceFilePathsForModule, lookup, request, exportName) {
|
|
127
|
+
const closure = bfsClosure(rootSourceFilePathsForModule.map(function (sourceFilePath) {
|
|
128
|
+
return { sourceFilePath, exportName };
|
|
129
|
+
}), function (state) {
|
|
130
|
+
return exportedStateNames(lookup, state);
|
|
131
|
+
}, new Set(), { dependencies: exportClosureDependencies, maximumNodeCount: lookup.contentBySourcePath.size });
|
|
132
|
+
return Array.from(closure).some(function (state) {
|
|
133
|
+
return sourceFilePathForState(state) === request.sourceFilePath;
|
|
134
|
+
});
|
|
135
|
+
}
|
|
136
|
+
function publicModuleReachesSourceFile(rootSourceFilePathsForModule, lookup, request) {
|
|
137
|
+
const closure = bfsClosure(rootSourceFilePathsForModule, function (sourceFilePath) {
|
|
138
|
+
const content = lookup.contentBySourcePath.get(sourceFilePath);
|
|
139
|
+
return content === undefined
|
|
140
|
+
? new Array()
|
|
141
|
+
: exportDeclarations(content.fileDescription.content).flatMap(function (declaration) {
|
|
142
|
+
return declarationSourceFilePaths(lookup, content.fileDescription.targetFilePath, declaration);
|
|
143
|
+
});
|
|
144
|
+
}, new Set(), { dependencies: pathClosureDependencies, maximumNodeCount: lookup.contentBySourcePath.size });
|
|
145
|
+
return closure.has(request.sourceFilePath);
|
|
84
146
|
}
|
|
85
|
-
function
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
147
|
+
function publicModuleCanSatisfyRequest(rootSourceFilePathsForModule, lookup, request) {
|
|
148
|
+
if (request.requiredExportNames.size === 0 && !request.requiresNamespaceExport) {
|
|
149
|
+
return publicModuleReachesSourceFile(rootSourceFilePathsForModule, lookup, request);
|
|
150
|
+
}
|
|
151
|
+
for (const exportName of request.requiredExportNames) {
|
|
152
|
+
if (!publicModuleCanExport(rootSourceFilePathsForModule, lookup, request, exportName)) {
|
|
153
|
+
return false;
|
|
90
154
|
}
|
|
91
155
|
}
|
|
156
|
+
if (!request.requiresNamespaceExport) {
|
|
157
|
+
return true;
|
|
158
|
+
}
|
|
159
|
+
return publicModuleCanExport(rootSourceFilePathsForModule, lookup, request, undefined);
|
|
92
160
|
}
|
|
93
|
-
function
|
|
161
|
+
function shortestSpecifier(specifiers) {
|
|
162
|
+
const [specifier] = specifiers.toSorted(function (left, right) {
|
|
163
|
+
return left.length - right.length;
|
|
164
|
+
});
|
|
165
|
+
return specifier;
|
|
166
|
+
}
|
|
167
|
+
function getExplicitPublicModuleSpecifierForSourcePath(bundle, surface, request) {
|
|
94
168
|
const lookup = createContentLookup(bundle);
|
|
95
|
-
const
|
|
169
|
+
const specifiers = [];
|
|
96
170
|
const moduleEntries = surface.packageInterface.modules ?? [];
|
|
97
171
|
for (const moduleEntry of moduleEntries) {
|
|
98
172
|
const root = getRoot(bundle, moduleEntry.root);
|
|
99
173
|
const rootPaths = rootSourceFilePaths(root);
|
|
100
|
-
|
|
174
|
+
const candidate = toPackageSpecifier(bundle.name, moduleEntry.export);
|
|
175
|
+
if (publicModuleCanSatisfyRequest(rootPaths, lookup, request)) {
|
|
176
|
+
specifiers.push(candidate);
|
|
177
|
+
}
|
|
101
178
|
}
|
|
102
|
-
return
|
|
179
|
+
return shortestSpecifier(specifiers);
|
|
103
180
|
}
|
|
104
|
-
function getImplicitPublicModuleSpecifierForSourcePath(bundle, surface,
|
|
181
|
+
function getImplicitPublicModuleSpecifierForSourcePath(bundle, surface, request) {
|
|
105
182
|
const lookup = createContentLookup(bundle);
|
|
106
|
-
const
|
|
183
|
+
const specifiers = [];
|
|
107
184
|
const defaultRoot = getRoot(bundle, surface.defaultModuleRoot);
|
|
108
|
-
|
|
185
|
+
if (publicModuleCanSatisfyRequest(rootSourceFilePaths(defaultRoot), lookup, request)) {
|
|
186
|
+
specifiers.push(bundle.name);
|
|
187
|
+
}
|
|
109
188
|
for (const root of Object.values(bundle.roots)) {
|
|
110
|
-
|
|
189
|
+
const candidate = toPackageSpecifier(bundle.name, `./${root.js.targetFilePath}`);
|
|
190
|
+
if (publicModuleCanSatisfyRequest(rootSourceFilePaths(root), lookup, request)) {
|
|
191
|
+
specifiers.push(candidate);
|
|
192
|
+
}
|
|
111
193
|
}
|
|
112
|
-
return
|
|
194
|
+
return shortestSpecifier(specifiers) ?? getPublicModuleSpecifierForSourcePath(bundle, request.sourceFilePath);
|
|
113
195
|
}
|
|
114
|
-
function getExistingPublicModuleSpecifierForSourcePath(bundle,
|
|
196
|
+
function getExistingPublicModuleSpecifierForSourcePath(bundle, request) {
|
|
115
197
|
const { surface } = bundle;
|
|
116
198
|
if (surface.mode === 'implicit') {
|
|
117
|
-
return getImplicitPublicModuleSpecifierForSourcePath(bundle, surface,
|
|
199
|
+
return getImplicitPublicModuleSpecifierForSourcePath(bundle, surface, request);
|
|
118
200
|
}
|
|
119
|
-
return getExplicitPublicModuleSpecifierForSourcePath(bundle, surface,
|
|
201
|
+
return getExplicitPublicModuleSpecifierForSourcePath(bundle, surface, request);
|
|
120
202
|
}
|
|
121
|
-
function findReplacementInBundles(
|
|
203
|
+
function findReplacementInBundles(request, bundles, getTargetPath) {
|
|
122
204
|
for (const bundle of bundles) {
|
|
123
|
-
const targetPath = getTargetPath(bundle,
|
|
205
|
+
const targetPath = getTargetPath(bundle, request);
|
|
124
206
|
if (targetPath !== undefined) {
|
|
125
207
|
return {
|
|
126
|
-
|
|
127
|
-
|
|
208
|
+
bundle,
|
|
209
|
+
replacement: {
|
|
210
|
+
emittedSpecifier: targetPath,
|
|
211
|
+
packageName: bundle.name
|
|
212
|
+
}
|
|
128
213
|
};
|
|
129
214
|
}
|
|
130
|
-
if (needsImportReplacement(
|
|
131
|
-
throw new Error(`Package "${bundle.name}" does not expose "${
|
|
215
|
+
if (needsImportReplacement(request.sourceFilePath) && ownsSourcePath(request.sourceFilePath, bundle)) {
|
|
216
|
+
throw new Error(`Package "${bundle.name}" does not expose "${request.sourceFilePath}" for cross-package substitution`);
|
|
132
217
|
}
|
|
133
218
|
}
|
|
134
219
|
return undefined;
|
|
135
220
|
}
|
|
136
|
-
function findReplacement(
|
|
137
|
-
const dependencyReplacement = findReplacementInBundles(
|
|
221
|
+
function findReplacement(request, bundleDependencies, bundlePeerDependencies) {
|
|
222
|
+
const dependencyReplacement = findReplacementInBundles(request, bundleDependencies, function (bundle, replacementRequest) {
|
|
223
|
+
return getPublicModuleSpecifierForSourcePath(bundle, replacementRequest.sourceFilePath);
|
|
224
|
+
});
|
|
138
225
|
if (dependencyReplacement !== undefined) {
|
|
139
226
|
return dependencyReplacement;
|
|
140
227
|
}
|
|
141
|
-
return findReplacementInBundles(
|
|
228
|
+
return findReplacementInBundles(request, bundlePeerDependencies, getExistingPublicModuleSpecifierForSourcePath);
|
|
142
229
|
}
|
|
143
230
|
function withSubstitutedSourcePath(substitutedSourceFilePathsByPackageName, packageName, file) {
|
|
144
|
-
if (declarationCompanionCandidates(file).length === 0) {
|
|
145
|
-
return substitutedSourceFilePathsByPackageName;
|
|
146
|
-
}
|
|
147
231
|
const existing = substitutedSourceFilePathsByPackageName.get(packageName) ?? [];
|
|
148
232
|
const updated = new Map(substitutedSourceFilePathsByPackageName);
|
|
149
233
|
updated.set(packageName, new Set([...existing, file]));
|
|
150
234
|
return updated;
|
|
151
235
|
}
|
|
152
|
-
|
|
236
|
+
function contentWithSourceFilePath(bundle, sourceFilePath) {
|
|
237
|
+
return bundle.contents.find(function (content) {
|
|
238
|
+
return content.fileDescription.sourceFilePath === sourceFilePath;
|
|
239
|
+
});
|
|
240
|
+
}
|
|
241
|
+
function runtimeSourceFilePathForDeclaration(bundle, declarationContent) {
|
|
242
|
+
const runtimeContent = bundle.contents.find(function (content) {
|
|
243
|
+
return declarationCompanionCandidates(content.fileDescription.targetFilePath)
|
|
244
|
+
.includes(declarationContent.fileDescription.targetFilePath);
|
|
245
|
+
});
|
|
246
|
+
return runtimeContent?.fileDescription.sourceFilePath;
|
|
247
|
+
}
|
|
248
|
+
function substitutedSourceFilePathsFor(bundle, file) {
|
|
249
|
+
const content = contentWithSourceFilePath(bundle, file);
|
|
250
|
+
if (content === undefined || !isDeclarationCompanionFilePath(content.fileDescription.targetFilePath)) {
|
|
251
|
+
return declarationCompanionCandidates(file).length === 0
|
|
252
|
+
? []
|
|
253
|
+
: [
|
|
254
|
+
file
|
|
255
|
+
];
|
|
256
|
+
}
|
|
257
|
+
const runtimeSourceFilePath = runtimeSourceFilePathForDeclaration(bundle, content);
|
|
258
|
+
if (runtimeSourceFilePath === undefined) {
|
|
259
|
+
return [
|
|
260
|
+
file
|
|
261
|
+
];
|
|
262
|
+
}
|
|
263
|
+
return [
|
|
264
|
+
runtimeSourceFilePath,
|
|
265
|
+
file
|
|
266
|
+
];
|
|
267
|
+
}
|
|
268
|
+
function withSubstitutedSourcePaths(substitutedSourceFilePathsByPackageName, match, request) {
|
|
269
|
+
let updated = substitutedSourceFilePathsByPackageName;
|
|
270
|
+
for (const sourceFilePath of substitutedSourceFilePathsFor(match.bundle, request.sourceFilePath)) {
|
|
271
|
+
updated = withSubstitutedSourcePath(updated, match.replacement.packageName, sourceFilePath);
|
|
272
|
+
}
|
|
273
|
+
return updated;
|
|
274
|
+
}
|
|
275
|
+
export function findAllPathReplacements(requests, bundleDependencies, bundlePeerDependencies) {
|
|
153
276
|
const importPathReplacements = new Map();
|
|
154
277
|
const matchedBundleDependencies = [];
|
|
155
278
|
let substitutedSourceFilePathsByPackageName = new Map();
|
|
156
|
-
|
|
157
|
-
|
|
279
|
+
function recordReplacement(match, request) {
|
|
280
|
+
importPathReplacements.set(request.sourceFilePath, match.replacement);
|
|
281
|
+
matchedBundleDependencies.push(match.replacement.packageName);
|
|
282
|
+
substitutedSourceFilePathsByPackageName = withSubstitutedSourcePaths(substitutedSourceFilePathsByPackageName, match, request);
|
|
283
|
+
}
|
|
284
|
+
for (const request of requests) {
|
|
285
|
+
const replacement = findReplacement(request, bundleDependencies, bundlePeerDependencies);
|
|
158
286
|
if (replacement !== undefined) {
|
|
159
|
-
|
|
160
|
-
matchedBundleDependencies.push(replacement.packageName);
|
|
161
|
-
substitutedSourceFilePathsByPackageName = withSubstitutedSourcePath(substitutedSourceFilePathsByPackageName, replacement.packageName, file);
|
|
287
|
+
recordReplacement(replacement, request);
|
|
162
288
|
}
|
|
163
289
|
}
|
|
164
290
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replacement-lookup.js","sourceRoot":"","sources":["../../../../source/linker/replacement-lookup.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"replacement-lookup.js","sourceRoot":"","sources":["../../../../source/linker/replacement-lookup.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,75 @@ function recordUnreplacedConnections(outstandingConnections, fromNodeId, directD
|
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
|
+
function createReplacementRequest(sourceFilePath) {
|
|
17
|
+
return {
|
|
18
|
+
sourceFilePath,
|
|
19
|
+
requiredExportNames: new Set(),
|
|
20
|
+
requiresNamespaceExport: false
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
function replacementRequestForSourceFilePath(requestsBySourceFilePath, sourceFilePath) {
|
|
24
|
+
return requestsBySourceFilePath.get(sourceFilePath) ?? createReplacementRequest(sourceFilePath);
|
|
25
|
+
}
|
|
26
|
+
function addRequiredExportName(requestsBySourceFilePath, sourceFilePath, requiredExportName) {
|
|
27
|
+
const request = replacementRequestForSourceFilePath(requestsBySourceFilePath, sourceFilePath);
|
|
28
|
+
requestsBySourceFilePath.set(sourceFilePath, {
|
|
29
|
+
...request,
|
|
30
|
+
requiredExportNames: new Set([...request.requiredExportNames, requiredExportName])
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
function requireNamespaceExport(requestsBySourceFilePath, sourceFilePath) {
|
|
34
|
+
const request = replacementRequestForSourceFilePath(requestsBySourceFilePath, sourceFilePath);
|
|
35
|
+
requestsBySourceFilePath.set(sourceFilePath, { ...request, requiresNamespaceExport: true });
|
|
36
|
+
}
|
|
37
|
+
function recordImportRequirements(requestsBySourceFilePath, declaration) {
|
|
38
|
+
const importedSourceFile = declaration.getModuleSpecifierSourceFile();
|
|
39
|
+
if (importedSourceFile === undefined) {
|
|
40
|
+
return;
|
|
41
|
+
}
|
|
42
|
+
const sourceFilePath = importedSourceFile.getFilePath();
|
|
43
|
+
if (declaration.getDefaultImport() !== undefined) {
|
|
44
|
+
addRequiredExportName(requestsBySourceFilePath, sourceFilePath, 'default');
|
|
45
|
+
}
|
|
46
|
+
if (declaration.getNamespaceImport() !== undefined) {
|
|
47
|
+
requireNamespaceExport(requestsBySourceFilePath, sourceFilePath);
|
|
48
|
+
}
|
|
49
|
+
for (const namedImport of declaration.getNamedImports()) {
|
|
50
|
+
addRequiredExportName(requestsBySourceFilePath, sourceFilePath, namedImport.getName());
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
function recordExportRequirements(requestsBySourceFilePath, declaration) {
|
|
54
|
+
const exportedSourceFile = declaration.getModuleSpecifierSourceFile();
|
|
55
|
+
if (exportedSourceFile === undefined) {
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
const sourceFilePath = exportedSourceFile.getFilePath();
|
|
59
|
+
if (declaration.isNamespaceExport()) {
|
|
60
|
+
requireNamespaceExport(requestsBySourceFilePath, sourceFilePath);
|
|
61
|
+
}
|
|
62
|
+
for (const namedExport of declaration.getNamedExports()) {
|
|
63
|
+
addRequiredExportName(requestsBySourceFilePath, sourceFilePath, namedExport.getName());
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
function recordStaticRequirements(requestsBySourceFilePath, sourceFile) {
|
|
67
|
+
for (const declaration of sourceFile.getImportDeclarations()) {
|
|
68
|
+
recordImportRequirements(requestsBySourceFilePath, declaration);
|
|
69
|
+
}
|
|
70
|
+
for (const declaration of sourceFile.getExportDeclarations()) {
|
|
71
|
+
recordExportRequirements(requestsBySourceFilePath, declaration);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
function collectImportRequirements(node) {
|
|
75
|
+
const requestsBySourceFilePath = new Map();
|
|
76
|
+
for (const sourceFilePath of node.adjacentNodeIds) {
|
|
77
|
+
requestsBySourceFilePath.set(sourceFilePath, createReplacementRequest(sourceFilePath));
|
|
78
|
+
}
|
|
79
|
+
const sourceFile = node.data.project?.getSourceFile(node.data.fileDescription.sourceFilePath);
|
|
80
|
+
if (sourceFile !== undefined) {
|
|
81
|
+
recordStaticRequirements(requestsBySourceFilePath, sourceFile);
|
|
82
|
+
}
|
|
83
|
+
return Array.from(requestsBySourceFilePath.values());
|
|
84
|
+
}
|
|
16
85
|
function contentWithReplacements(node, replacements) {
|
|
17
86
|
return replaceImportPathsWithTransform(node.data.project, node.data.fileDescription.sourceFilePath, node.data.fileDescription.content, replacements.importPathReplacements);
|
|
18
87
|
}
|
|
@@ -59,7 +128,7 @@ export function substituteDependencies(resourceGraph, bundleDependencies, bundle
|
|
|
59
128
|
return;
|
|
60
129
|
}
|
|
61
130
|
const directDependencies = Array.from(node.adjacentNodeIds);
|
|
62
|
-
const replacements = findAllPathReplacements(
|
|
131
|
+
const replacements = findAllPathReplacements(collectImportRequirements(node), bundleDependencies, bundlePeerDependencies);
|
|
63
132
|
recordUnreplacedConnections(outstandingConnections, node.id, directDependencies, replacements.importPathReplacements);
|
|
64
133
|
addNodeWithReplacements(substitutedGraph, node, replacements);
|
|
65
134
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"substitute-bundles.js","sourceRoot":"","sources":["../../../../source/linker/substitute-bundles.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"substitute-bundles.js","sourceRoot":"","sources":["../../../../source/linker/substitute-bundles.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"libnpmpublish": "12.0.0",
|
|
21
21
|
"npm-package-arg": "14.0.0",
|
|
22
22
|
"npm-registry-fetch": "20.0.1",
|
|
23
|
-
"remeda": "2.
|
|
23
|
+
"remeda": "2.43.0",
|
|
24
24
|
"semver": "7.8.5",
|
|
25
25
|
"spdx-expression-parse": "5.0.0",
|
|
26
26
|
"ssri": "14.0.0",
|
|
@@ -149,5 +149,5 @@
|
|
|
149
149
|
"./tar/tarball-builder.js"
|
|
150
150
|
],
|
|
151
151
|
"type": "module",
|
|
152
|
-
"version": "0.0.
|
|
152
|
+
"version": "0.0.91"
|
|
153
153
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { mapValues } from 'remeda';
|
|
2
|
+
import { declarationCompanionCandidates } from "../../common/declaration-companion-paths.js";
|
|
2
3
|
import { resolveRootsAndSurface } from "../../resource-resolver/resource-resolve-options.js";
|
|
3
4
|
import { withFailureCapture } from "../../report/decorators.js";
|
|
4
5
|
import { configToResolveAndLinkOptions } from "../map-config.js";
|
|
@@ -25,7 +26,9 @@ function collectPromotedSourcePathsByPackageName(linkedPackages) {
|
|
|
25
26
|
for (const [packageName, sourceFilePaths] of linkedPackage.linkedBundle.substitutedSourceFilePathsByPackageName) {
|
|
26
27
|
const existing = promotedSourcePathsByPackageName.get(packageName) ?? new Set();
|
|
27
28
|
for (const sourceFilePath of sourceFilePaths) {
|
|
28
|
-
|
|
29
|
+
if (declarationCompanionCandidates(sourceFilePath).length > 0) {
|
|
30
|
+
existing.add(sourceFilePath);
|
|
31
|
+
}
|
|
29
32
|
}
|
|
30
33
|
promotedSourcePathsByPackageName.set(packageName, existing);
|
|
31
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-resolution-stage.js","sourceRoot":"","sources":["../../../../../source/packtory/stages/package-resolution-stage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"package-resolution-stage.js","sourceRoot":"","sources":["../../../../../source/packtory/stages/package-resolution-stage.ts"],"names":[],"mappings":"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"}
|
package/sbom.cdx.json
CHANGED
|
@@ -16,9 +16,9 @@
|
|
|
16
16
|
"component": {
|
|
17
17
|
"type": "library",
|
|
18
18
|
"name": "packtory",
|
|
19
|
-
"version": "0.0.
|
|
20
|
-
"bom-ref": "pkg:npm/packtory@0.0.
|
|
21
|
-
"purl": "pkg:npm/packtory@0.0.
|
|
19
|
+
"version": "0.0.91",
|
|
20
|
+
"bom-ref": "pkg:npm/packtory@0.0.91",
|
|
21
|
+
"purl": "pkg:npm/packtory@0.0.91"
|
|
22
22
|
}
|
|
23
23
|
},
|
|
24
24
|
"components": [
|
|
@@ -194,15 +194,15 @@
|
|
|
194
194
|
{
|
|
195
195
|
"type": "library",
|
|
196
196
|
"name": "remeda",
|
|
197
|
-
"version": "2.
|
|
198
|
-
"bom-ref": "pkg:npm/remeda@2.
|
|
197
|
+
"version": "2.43.0",
|
|
198
|
+
"bom-ref": "pkg:npm/remeda@2.43.0",
|
|
199
199
|
"scope": "required",
|
|
200
200
|
"licenses": [
|
|
201
201
|
{
|
|
202
202
|
"expression": "MIT"
|
|
203
203
|
}
|
|
204
204
|
],
|
|
205
|
-
"purl": "pkg:npm/remeda@2.
|
|
205
|
+
"purl": "pkg:npm/remeda@2.43.0"
|
|
206
206
|
},
|
|
207
207
|
{
|
|
208
208
|
"type": "library",
|
|
@@ -376,7 +376,7 @@
|
|
|
376
376
|
"ref": "pkg:npm/npm-registry-fetch@20.0.1"
|
|
377
377
|
},
|
|
378
378
|
{
|
|
379
|
-
"ref": "pkg:npm/packtory@0.0.
|
|
379
|
+
"ref": "pkg:npm/packtory@0.0.91",
|
|
380
380
|
"dependsOn": [
|
|
381
381
|
"pkg:npm/@arethetypeswrong/core@0.18.5",
|
|
382
382
|
"pkg:npm/@cyclonedx/cyclonedx-library@10.2.0",
|
|
@@ -391,7 +391,7 @@
|
|
|
391
391
|
"pkg:npm/libnpmpublish@12.0.0",
|
|
392
392
|
"pkg:npm/npm-package-arg@14.0.0",
|
|
393
393
|
"pkg:npm/npm-registry-fetch@20.0.1",
|
|
394
|
-
"pkg:npm/remeda@2.
|
|
394
|
+
"pkg:npm/remeda@2.43.0",
|
|
395
395
|
"pkg:npm/semver@7.8.5",
|
|
396
396
|
"pkg:npm/spdx-expression-parse@5.0.0",
|
|
397
397
|
"pkg:npm/ssri@14.0.0",
|
|
@@ -405,7 +405,7 @@
|
|
|
405
405
|
]
|
|
406
406
|
},
|
|
407
407
|
{
|
|
408
|
-
"ref": "pkg:npm/remeda@2.
|
|
408
|
+
"ref": "pkg:npm/remeda@2.43.0"
|
|
409
409
|
},
|
|
410
410
|
{
|
|
411
411
|
"ref": "pkg:npm/semver@7.8.5"
|