packtory 0.0.72 → 0.0.74
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/checks/rules/type-script-integrity.js +19 -4
- package/checks/rules/type-script-integrity.js.map +1 -1
- package/dead-code-eliminator/code-file-analyzer.js +1 -1
- package/dead-code-eliminator/code-file-analyzer.js.map +1 -1
- package/dead-code-eliminator/source-map-recomposition.js +1 -3
- package/dead-code-eliminator/source-map-recomposition.js.map +1 -1
- package/dead-code-eliminator/transform/atom-translator.js +35 -0
- package/dead-code-eliminator/transform/atom-translator.js.map +1 -1
- package/dead-code-eliminator/transform/declaration-removal.js +100 -1
- package/dead-code-eliminator/transform/declaration-removal.js.map +1 -1
- package/dead-code-eliminator/transform/declaration-remover.js +8 -13
- package/dead-code-eliminator/transform/declaration-remover.js.map +1 -1
- package/dead-code-eliminator/transform/source-map-composer.js +5 -5
- package/dead-code-eliminator/transform/source-map-composer.js.map +1 -1
- package/linker/linked-bundle.d.ts +1 -0
- package/linker/linked-bundle.d.ts.map +1 -1
- package/linker/linked-bundle.js.map +1 -1
- package/linker/replacement-lookup.js +13 -1
- package/linker/replacement-lookup.js.map +1 -1
- package/linker/substitute-bundles.js +1 -0
- package/linker/substitute-bundles.js.map +1 -1
- package/linker/substituted-resource-graph.js +34 -9
- package/linker/substituted-resource-graph.js.map +1 -1
- package/package-surface/explicit-exports.js +16 -4
- package/package-surface/explicit-exports.js.map +1 -1
- package/package.json +1 -1
- package/packtory/package-processor-build.js +20 -5
- package/packtory/package-processor-build.js.map +1 -1
- package/packtory/package-processor.js.map +1 -1
- package/packtory/stages/package-resolution-stage.js +37 -3
- package/packtory/stages/package-resolution-stage.js.map +1 -1
- package/readme.md +36 -48
- package/report/decorators.js +9 -0
- package/report/decorators.js.map +1 -1
- package/resource-resolver/dependency-resolution-walker.js +5 -35
- package/resource-resolver/dependency-resolution-walker.js.map +1 -1
- package/resource-resolver/resource-resolver.d.ts.map +1 -1
- package/resource-resolver/resource-resolver.js +57 -21
- package/resource-resolver/resource-resolver.js.map +1 -1
- package/sbom.cdx.json +4 -4
- package/dead-code-eliminator/transform/survivor-capture.js +0 -33
- package/dead-code-eliminator/transform/survivor-capture.js.map +0 -1
|
@@ -13,6 +13,15 @@ export const typeScriptIntegritySchemas = {
|
|
|
13
13
|
globalSchema,
|
|
14
14
|
perPackageSchema
|
|
15
15
|
};
|
|
16
|
+
function isBinOnlyPackage(bundle) {
|
|
17
|
+
return bundle.surface.mode === 'explicit' &&
|
|
18
|
+
bundle.surface.packageInterface.modules === undefined;
|
|
19
|
+
}
|
|
20
|
+
function hasBinDeclarations(bundle) {
|
|
21
|
+
return bundle.surface.packageInterface.bins?.some(function (entry) {
|
|
22
|
+
return bundle.roots[entry.root]?.declarationFile !== undefined;
|
|
23
|
+
}) === true;
|
|
24
|
+
}
|
|
16
25
|
export function createTypeScriptIntegrityRule(dependencies) {
|
|
17
26
|
const { analyzePackageResolution, summarizeDeclarationIntegrity } = dependencies;
|
|
18
27
|
async function summarizePackageResolution(packageName, publishedPackage) {
|
|
@@ -24,10 +33,16 @@ export function createTypeScriptIntegrityRule(dependencies) {
|
|
|
24
33
|
return [`Package "${packageName}" failed TypeScript integrity: ${String(error)}`];
|
|
25
34
|
}
|
|
26
35
|
}
|
|
27
|
-
async function runForPackage(
|
|
36
|
+
async function runForPackage(bundle, publishedPackage, publishedPackages, declarationMode) {
|
|
37
|
+
const { name } = bundle;
|
|
38
|
+
if (isBinOnlyPackage(bundle)) {
|
|
39
|
+
return hasBinDeclarations(bundle)
|
|
40
|
+
? summarizeDeclarationIntegrity(name, publishedPackage, declarationMode, publishedPackages)
|
|
41
|
+
: [];
|
|
42
|
+
}
|
|
28
43
|
return [
|
|
29
|
-
...await summarizePackageResolution(
|
|
30
|
-
...summarizeDeclarationIntegrity(
|
|
44
|
+
...await summarizePackageResolution(name, publishedPackage),
|
|
45
|
+
...summarizeDeclarationIntegrity(name, publishedPackage, declarationMode, publishedPackages)
|
|
31
46
|
];
|
|
32
47
|
}
|
|
33
48
|
async function run(input) {
|
|
@@ -45,7 +60,7 @@ export function createTypeScriptIntegrityRule(dependencies) {
|
|
|
45
60
|
if (publishedPackage === undefined) {
|
|
46
61
|
throw new Error(`Published package missing for "${bundle.name}"`);
|
|
47
62
|
}
|
|
48
|
-
return await runForPackage(bundle
|
|
63
|
+
return await runForPackage(bundle, publishedPackage, publishedPackages, declarationMode);
|
|
49
64
|
}));
|
|
50
65
|
return issuesByBundle.flat();
|
|
51
66
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-script-integrity.js","sourceRoot":"","sources":["../../../../../source/checks/rules/type-script-integrity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,UAAU,CAAC;AAK7B,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAEhF,MAAM,QAAQ,GAAG,qBAAqB,CAAC;AACvC,MAAM,sBAAsB,GAA8B,CAAE,YAAY,EAAE,SAAS,CAAE,CAAC;AACtF,MAAM,qBAAqB,GAAqD,CAAE,KAAK,EAAE,eAAe,CAAE,CAAC;AAC3G,MAAM,sBAAsB,GAAoB,KAAK,CAAC;AAEtD,MAAM,YAAY,GAAG,CAAC,CAAC,YAAY,CAAC;IAChC,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE;IACpB,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;CAC1D,CAAC,CAAC;AAEH,MAAM,gBAAgB,GAAG,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"type-script-integrity.js","sourceRoot":"","sources":["../../../../../source/checks/rules/type-script-integrity.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,7 +50,7 @@ export function buildAnalyzedResource(loaded, context) {
|
|
|
50
50
|
fileDescription: { ...loaded.resource.fileDescription, content: transformedCode },
|
|
51
51
|
analysis
|
|
52
52
|
},
|
|
53
|
-
transforms: [{ originalCode, transformedCode, atoms }]
|
|
53
|
+
transforms: [{ textTransform: { originalCode, transformedCode, atoms } }]
|
|
54
54
|
};
|
|
55
55
|
}
|
|
56
56
|
//# sourceMappingURL=code-file-analyzer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code-file-analyzer.js","sourceRoot":"","sources":["../../../../source/dead-code-eliminator/code-file-analyzer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAkD,MAAM,sBAAsB,CAAC;AAE/G,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"code-file-analyzer.js","sourceRoot":"","sources":["../../../../source/dead-code-eliminator/code-file-analyzer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAkD,MAAM,sBAAsB,CAAC;AAE/G,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAsBtE,MAAM,YAAY,GAA+B,EAAE,CAAC;AAEpD,SAAS,kBAAkB,CAAC,MAA0B;IAClD,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,oBAAoB,CAAC,MAA0B,EAAE,SAA8B;IACpF,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC;IAC3D,OAAO,IAAI,GAAG,CACV,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,OAAO;QACrC,OAAO,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAE,OAAO,CAAC,IAAI,CAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1F,CAAC,CAAC,CACL,CAAC;AACN,CAAC;AAED,SAAS,mBAAmB,CACxB,UAAsB,EACtB,SAA8B;IAE9B,MAAM,MAAM,GAAG,gBAAgB,CAAC,UAAU,EAAE,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC,CAAC;IAC3E,OAAO,EAAE,eAAe,EAAE,UAAU,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;AAC9E,CAAC;AAQD,SAAS,eAAe,CAAC,MAA0B,EAAE,OAAwB;IACzE,MAAM,oBAAoB,GAAG,mBAAmB,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACjG,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC1E,MAAM,eAAe,GAAG,OAAO,CAAC,sBAAsB,IAAI,oBAAoB,CAAC,MAAM,KAAK,CAAC,CAAC;IAC5F,MAAM,iBAAiB,GAAG,eAAe,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC3F,OAAO;QACH,QAAQ,EAAE,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,IAAI,GAAG,EAAU,EAAE;QAC3F,iBAAiB;QACjB,eAAe;KAClB,CAAC;AACN,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,MAAsB,EAAE,OAAwB;IAClF,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QAClC,OAAO,EAAE,QAAQ,EAAE,EAAE,GAAG,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,uBAAuB,EAAE,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC;IAC/G,CAAC;IACD,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,eAAe,EAAE,GAAG,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1F,IAAI,CAAC,eAAe,EAAE,CAAC;QACnB,OAAO,EAAE,QAAQ,EAAE,EAAE,GAAG,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC;IACpF,CAAC;IACD,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC;IAC7D,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,GAAG,mBAAmB,CAAC,MAAM,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;IAC7F,IAAI,eAAe,KAAK,YAAY,EAAE,CAAC;QACnC,OAAO,EAAE,QAAQ,EAAE,EAAE,GAAG,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC;IACpF,CAAC;IACD,OAAO;QACH,QAAQ,EAAE;YACN,GAAG,MAAM,CAAC,QAAQ;YAClB,eAAe,EAAE,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,OAAO,EAAE,eAAe,EAAE;YACjF,QAAQ;SACX;QACD,UAAU,EAAE,CAAE,EAAE,aAAa,EAAE,EAAE,YAAY,EAAE,eAAe,EAAE,KAAK,EAAE,EAAE,CAAE;KAC9E,CAAC;AACN,CAAC"}
|
|
@@ -14,9 +14,7 @@ export function recomposePairedSourceMaps(contents, transformsByMapPath) {
|
|
|
14
14
|
}
|
|
15
15
|
const recomposed = recomposeSourceMap({
|
|
16
16
|
originalMap: resource.fileDescription.content,
|
|
17
|
-
|
|
18
|
-
transformedCode: transform.transformedCode,
|
|
19
|
-
atoms: transform.atoms
|
|
17
|
+
textTransform: transform.textTransform
|
|
20
18
|
});
|
|
21
19
|
return {
|
|
22
20
|
...resource,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"source-map-recomposition.js","sourceRoot":"","sources":["../../../../source/dead-code-eliminator/source-map-recomposition.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAExE,MAAM,UAAU,0BAA0B,CACtC,OAA0C;IAE1C,OAAO,IAAI,GAAG,CACV,OAAO,CAAC,OAAO,CAAC,UAAU,MAAM;QAC5B,OAAO,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,SAAS;YAC5C,OAAO,CAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,cAAc,MAAM,EAAE,SAAS,CAAW,CAAC;QAC3F,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CACL,CAAC;AACN,CAAC;AAED,MAAM,UAAU,yBAAyB,CACrC,QAA2C,EAC3C,mBAAyD;IAEzD,OAAO,QAAQ,CAAC,GAAG,CAAC,UAAU,QAAQ;QAClC,MAAM,SAAS,GAAG,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;QACnF,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO,QAAQ,CAAC;QACpB,CAAC;QACD,MAAM,UAAU,GAAG,kBAAkB,CAAC;YAClC,WAAW,EAAE,QAAQ,CAAC,eAAe,CAAC,OAAO;YAC7C,
|
|
1
|
+
{"version":3,"file":"source-map-recomposition.js","sourceRoot":"","sources":["../../../../source/dead-code-eliminator/source-map-recomposition.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAExE,MAAM,UAAU,0BAA0B,CACtC,OAA0C;IAE1C,OAAO,IAAI,GAAG,CACV,OAAO,CAAC,OAAO,CAAC,UAAU,MAAM;QAC5B,OAAO,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,SAAS;YAC5C,OAAO,CAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,cAAc,MAAM,EAAE,SAAS,CAAW,CAAC;QAC3F,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CACL,CAAC;AACN,CAAC;AAED,MAAM,UAAU,yBAAyB,CACrC,QAA2C,EAC3C,mBAAyD;IAEzD,OAAO,QAAQ,CAAC,GAAG,CAAC,UAAU,QAAQ;QAClC,MAAM,SAAS,GAAG,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;QACnF,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO,QAAQ,CAAC;QACpB,CAAC;QACD,MAAM,UAAU,GAAG,kBAAkB,CAAC;YAClC,WAAW,EAAE,QAAQ,CAAC,eAAe,CAAC,OAAO;YAC7C,aAAa,EAAE,SAAS,CAAC,aAAa;SACzC,CAAC,CAAC;QACH,OAAO;YACH,GAAG,QAAQ;YACX,eAAe,EAAE,EAAE,GAAG,QAAQ,CAAC,eAAe,EAAE,OAAO,EAAE,UAAU,EAAE;SACxE,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1,3 +1,38 @@
|
|
|
1
|
+
import { diffChars } from 'diff';
|
|
2
|
+
const initialState = {
|
|
3
|
+
originalOffset: 0,
|
|
4
|
+
transformedOffset: 0,
|
|
5
|
+
atoms: []
|
|
6
|
+
};
|
|
7
|
+
function appendAtom(state, length) {
|
|
8
|
+
return {
|
|
9
|
+
originalOffset: state.originalOffset + length,
|
|
10
|
+
transformedOffset: state.transformedOffset + length,
|
|
11
|
+
atoms: [
|
|
12
|
+
...state.atoms,
|
|
13
|
+
{
|
|
14
|
+
originalStart: state.originalOffset,
|
|
15
|
+
originalEnd: state.originalOffset + length,
|
|
16
|
+
newStart: state.transformedOffset
|
|
17
|
+
}
|
|
18
|
+
]
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
function shiftOffsets(state, change, length) {
|
|
22
|
+
return {
|
|
23
|
+
originalOffset: state.originalOffset + (change.removed ? length : 0),
|
|
24
|
+
transformedOffset: state.transformedOffset + (change.added ? length : 0),
|
|
25
|
+
atoms: state.atoms
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
function appendChange(state, change) {
|
|
29
|
+
const { length } = change.value;
|
|
30
|
+
return change.added || change.removed ? shiftOffsets(state, change, length) : appendAtom(state, length);
|
|
31
|
+
}
|
|
32
|
+
export function buildTextTransformMap(originalCode, transformedCode) {
|
|
33
|
+
const state = diffChars(originalCode, transformedCode).reduce(appendChange, initialState);
|
|
34
|
+
return { originalCode, transformedCode, atoms: state.atoms };
|
|
35
|
+
}
|
|
1
36
|
function findAtomFor(atoms, offset) {
|
|
2
37
|
return atoms.find(function (atom) {
|
|
3
38
|
return offset >= atom.originalStart && offset < atom.originalEnd;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"atom-translator.js","sourceRoot":"","sources":["../../../../../source/dead-code-eliminator/transform/atom-translator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"atom-translator.js","sourceRoot":"","sources":["../../../../../source/dead-code-eliminator/transform/atom-translator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAsBjC,MAAM,YAAY,GAAc;IAC5B,cAAc,EAAE,CAAC;IACjB,iBAAiB,EAAE,CAAC;IACpB,KAAK,EAAE,EAAE;CACZ,CAAC;AAEF,SAAS,UAAU,CAAC,KAAgB,EAAE,MAAc;IAChD,OAAO;QACH,cAAc,EAAE,KAAK,CAAC,cAAc,GAAG,MAAM;QAC7C,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,GAAG,MAAM;QACnD,KAAK,EAAE;YACH,GAAG,KAAK,CAAC,KAAK;YACd;gBACI,aAAa,EAAE,KAAK,CAAC,cAAc;gBACnC,WAAW,EAAE,KAAK,CAAC,cAAc,GAAG,MAAM;gBAC1C,QAAQ,EAAE,KAAK,CAAC,iBAAiB;aACpC;SACJ;KACJ,CAAC;AACN,CAAC;AAED,SAAS,YAAY,CAAC,KAAgB,EAAE,MAAkB,EAAE,MAAc;IACtE,OAAO;QACH,cAAc,EAAE,KAAK,CAAC,cAAc,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACxE,KAAK,EAAE,KAAK,CAAC,KAAK;KACrB,CAAC;AACN,CAAC;AAED,SAAS,YAAY,CAAC,KAAgB,EAAE,MAAkB;IACtD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC;IAChC,OAAO,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC5G,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,YAAoB,EAAE,eAAuB;IAC/E,MAAM,KAAK,GAAG,SAAS,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC,MAAM,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;IAC1F,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;AACjE,CAAC;AAED,SAAS,WAAW,CAAC,KAA8B,EAAE,MAAc;IAC/D,OAAO,KAAK,CAAC,IAAI,CAAC,UAAU,IAAI;QAC5B,OAAO,MAAM,IAAI,IAAI,CAAC,aAAa,IAAI,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC;IACrE,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,MAAc,EAAE,KAA8B;IACnF,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACxC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACrB,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,OAAO,IAAI,CAAC,QAAQ,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;AACzD,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Node as TsMorphNode } from 'ts-morph';
|
|
1
|
+
import { Node as TsMorphNode, SyntaxKind } from 'ts-morph';
|
|
2
2
|
import { variableDeclarationSurvives } from "../variable-declaration-bindings.js";
|
|
3
3
|
import { isNamedDeclaration } from "./named-declaration-kinds.js";
|
|
4
4
|
function processNamedDeclaration(statement, survivingNames) {
|
|
@@ -30,4 +30,103 @@ export function processStatement(statement, survivingNames) {
|
|
|
30
30
|
}
|
|
31
31
|
return processVariableStatement(statement, survivingNames);
|
|
32
32
|
}
|
|
33
|
+
function importName(binding) {
|
|
34
|
+
return binding.getAliasNode()?.getText() ?? binding.getName();
|
|
35
|
+
}
|
|
36
|
+
function hasRuntime(declaration) {
|
|
37
|
+
if (declaration.isTypeOnly()) {
|
|
38
|
+
return false;
|
|
39
|
+
}
|
|
40
|
+
const runtimeNamedCount = declaration
|
|
41
|
+
.getNamedImports()
|
|
42
|
+
.filter(function (binding) {
|
|
43
|
+
return !binding.isTypeOnly();
|
|
44
|
+
})
|
|
45
|
+
.length;
|
|
46
|
+
return (declaration.getDefaultImport() !== undefined ||
|
|
47
|
+
declaration.getNamespaceImport() !== undefined ||
|
|
48
|
+
runtimeNamedCount > 0);
|
|
49
|
+
}
|
|
50
|
+
function bindingCount(declaration) {
|
|
51
|
+
return [declaration.getDefaultImport(), declaration.getNamespaceImport(), ...declaration.getNamedImports()]
|
|
52
|
+
.filter(Boolean)
|
|
53
|
+
.length;
|
|
54
|
+
}
|
|
55
|
+
function bareText(declaration) {
|
|
56
|
+
const start = declaration.getStart();
|
|
57
|
+
const specifier = declaration.getModuleSpecifier();
|
|
58
|
+
const specifierEnd = specifier.getEnd() - start;
|
|
59
|
+
return `import ${specifier.getText()}${declaration.getText().slice(specifierEnd)}`;
|
|
60
|
+
}
|
|
61
|
+
function dropDefault(declaration, live) {
|
|
62
|
+
const binding = declaration.getDefaultImport();
|
|
63
|
+
if (binding !== undefined && !live.has(binding.getText())) {
|
|
64
|
+
declaration.removeDefaultImport();
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
function dropNamespace(declaration, live) {
|
|
68
|
+
const binding = declaration.getNamespaceImport();
|
|
69
|
+
if (binding !== undefined && !live.has(binding.getText())) {
|
|
70
|
+
declaration.removeNamespaceImport();
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
function dropNamed(declaration, live) {
|
|
74
|
+
const deadBindings = declaration.getNamedImports().filter(function (binding) {
|
|
75
|
+
return !live.has(importName(binding));
|
|
76
|
+
});
|
|
77
|
+
for (const binding of deadBindings) {
|
|
78
|
+
binding.remove();
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
function dropBindings(declaration, live) {
|
|
82
|
+
dropDefault(declaration, live);
|
|
83
|
+
dropNamespace(declaration, live);
|
|
84
|
+
dropNamed(declaration, live);
|
|
85
|
+
}
|
|
86
|
+
function repairEmpty(declaration, runtime) {
|
|
87
|
+
if (runtime) {
|
|
88
|
+
declaration.replaceWithText(bareText(declaration));
|
|
89
|
+
return;
|
|
90
|
+
}
|
|
91
|
+
declaration.remove();
|
|
92
|
+
}
|
|
93
|
+
function repairImport(declaration, live) {
|
|
94
|
+
if (bindingCount(declaration) === 0) {
|
|
95
|
+
return;
|
|
96
|
+
}
|
|
97
|
+
const runtime = hasRuntime(declaration);
|
|
98
|
+
dropBindings(declaration, live);
|
|
99
|
+
if (bindingCount(declaration) > 0) {
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
102
|
+
repairEmpty(declaration, runtime);
|
|
103
|
+
}
|
|
104
|
+
function hasExport(statement) {
|
|
105
|
+
return TsMorphNode.isModifierable(statement) && statement.hasModifier(SyntaxKind.ExportKeyword);
|
|
106
|
+
}
|
|
107
|
+
function hasModuleSyntax(sourceFile) {
|
|
108
|
+
if (sourceFile.getImportDeclarations().length > 0 ||
|
|
109
|
+
sourceFile.getExportDeclarations().length > 0 ||
|
|
110
|
+
sourceFile.getExportAssignments().length > 0) {
|
|
111
|
+
return true;
|
|
112
|
+
}
|
|
113
|
+
return sourceFile.getStatements().some(hasExport);
|
|
114
|
+
}
|
|
115
|
+
function repairImports(sourceFile, live) {
|
|
116
|
+
for (const declaration of sourceFile.getImportDeclarations()) {
|
|
117
|
+
repairImport(declaration, live);
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
function preserveModuleStatus(sourceFile, wasModule) {
|
|
121
|
+
if (wasModule && !hasModuleSyntax(sourceFile)) {
|
|
122
|
+
sourceFile.insertStatements(0, 'export {};');
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
export function repairImportDeclarations(sourceFile, survivingNames) {
|
|
126
|
+
const originalText = sourceFile.getFullText();
|
|
127
|
+
const wasModule = hasModuleSyntax(sourceFile);
|
|
128
|
+
repairImports(sourceFile, survivingNames);
|
|
129
|
+
preserveModuleStatus(sourceFile, wasModule);
|
|
130
|
+
return sourceFile.getFullText() !== originalText;
|
|
131
|
+
}
|
|
33
132
|
//# sourceMappingURL=declaration-removal.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"declaration-removal.js","sourceRoot":"","sources":["../../../../../source/dead-code-eliminator/transform/declaration-removal.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"declaration-removal.js","sourceRoot":"","sources":["../../../../../source/dead-code-eliminator/transform/declaration-removal.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,23 +1,18 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { buildTextTransformMap } from "./atom-translator.js";
|
|
2
|
+
import { processStatement, repairImportDeclarations } from "./declaration-removal.js";
|
|
3
3
|
export function applyRemovalPlan(sourceFile, plan) {
|
|
4
|
+
const originalCode = sourceFile.getFullText();
|
|
4
5
|
const statements = sourceFile.getStatements();
|
|
5
|
-
const survivors = statements.flatMap(function (statement) {
|
|
6
|
-
return captureSurvivorsForStatement(statement, plan.survivingNames);
|
|
7
|
-
});
|
|
8
6
|
let mutated = false;
|
|
9
7
|
for (const statement of statements) {
|
|
10
8
|
if (processStatement(statement, plan.survivingNames)) {
|
|
11
9
|
mutated = true;
|
|
12
10
|
}
|
|
13
11
|
}
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
};
|
|
20
|
-
});
|
|
21
|
-
return { mutated, atoms };
|
|
12
|
+
if (repairImportDeclarations(sourceFile, plan.survivingNames)) {
|
|
13
|
+
mutated = true;
|
|
14
|
+
}
|
|
15
|
+
const transformedCode = sourceFile.getFullText();
|
|
16
|
+
return { mutated, atoms: buildTextTransformMap(originalCode, transformedCode).atoms };
|
|
22
17
|
}
|
|
23
18
|
//# sourceMappingURL=declaration-remover.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"declaration-remover.js","sourceRoot":"","sources":["../../../../../source/dead-code-eliminator/transform/declaration-remover.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"declaration-remover.js","sourceRoot":"","sources":["../../../../../source/dead-code-eliminator/transform/declaration-remover.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAqB,MAAM,sBAAsB,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAWtF,MAAM,UAAU,gBAAgB,CAAC,UAAsB,EAAE,IAAiB;IACtE,MAAM,YAAY,GAAG,UAAU,CAAC,WAAW,EAAE,CAAC;IAC9C,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,EAAE,CAAC;IAC9C,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACjC,IAAI,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;YACnD,OAAO,GAAG,IAAI,CAAC;QACnB,CAAC;IACL,CAAC;IACD,IAAI,wBAAwB,CAAC,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;QAC5D,OAAO,GAAG,IAAI,CAAC;IACnB,CAAC;IACD,MAAM,eAAe,GAAG,UAAU,CAAC,WAAW,EAAE,CAAC;IACjD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,qBAAqB,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC,KAAK,EAAE,CAAC;AAC1F,CAAC"}
|
|
@@ -8,12 +8,12 @@ function omitNull(value) {
|
|
|
8
8
|
}
|
|
9
9
|
return value;
|
|
10
10
|
}
|
|
11
|
-
function translateMapping(mapping, originalIndex, transformedIndex,
|
|
11
|
+
function translateMapping(mapping, originalIndex, transformedIndex, textTransform) {
|
|
12
12
|
if (mapping.source === null) {
|
|
13
13
|
return undefined;
|
|
14
14
|
}
|
|
15
15
|
const oldOffset = lineColumnToOffset(originalIndex, mapping.generatedLine, mapping.generatedColumn);
|
|
16
|
-
const newOffset = translateGeneratedOffset(oldOffset, atoms);
|
|
16
|
+
const newOffset = translateGeneratedOffset(oldOffset, textTransform.atoms);
|
|
17
17
|
if (newOffset === undefined) {
|
|
18
18
|
return undefined;
|
|
19
19
|
}
|
|
@@ -54,11 +54,11 @@ export function recomposeSourceMap(input) {
|
|
|
54
54
|
if (traceMap === null) {
|
|
55
55
|
return input.originalMap;
|
|
56
56
|
}
|
|
57
|
-
const originalIndex = buildLineIndex(input.originalCode);
|
|
58
|
-
const transformedIndex = buildLineIndex(input.transformedCode);
|
|
57
|
+
const originalIndex = buildLineIndex(input.textTransform.originalCode);
|
|
58
|
+
const transformedIndex = buildLineIndex(input.textTransform.transformedCode);
|
|
59
59
|
const mappingsBuilder = new GenMapping();
|
|
60
60
|
eachMapping(traceMap, function (mapping) {
|
|
61
|
-
const translated = translateMapping(mapping, originalIndex, transformedIndex, input.
|
|
61
|
+
const translated = translateMapping(mapping, originalIndex, transformedIndex, input.textTransform);
|
|
62
62
|
if (translated !== undefined) {
|
|
63
63
|
appendMapping(mappingsBuilder, translated);
|
|
64
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"source-map-composer.js","sourceRoot":"","sources":["../../../../../source/dead-code-eliminator/transform/source-map-composer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAoB,MAAM,2BAA2B,CAAC;AACpF,OAAO,EAAE,wBAAwB,
|
|
1
|
+
{"version":3,"file":"source-map-composer.js","sourceRoot":"","sources":["../../../../../source/dead-code-eliminator/transform/source-map-composer.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ export type LinkedBundle = {
|
|
|
11
11
|
readonly surface: PackageSurface;
|
|
12
12
|
readonly exportPackageJson?: true | undefined;
|
|
13
13
|
readonly linkedBundleDependencies: ExternalDependencies;
|
|
14
|
+
readonly substitutedSourceFilePathsByPackageName: ReadonlyMap<string, ReadonlySet<string>>;
|
|
14
15
|
readonly externalDependencies: ExternalDependencies;
|
|
15
16
|
};
|
|
16
17
|
export type BundleSubstitutionSource = Pick<LinkedBundle, 'contents' | 'name' | 'roots' | 'surface'>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linked-bundle.d.ts","sourceRoot":"","sources":["../../../../source/linker/linked-bundle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gDAAgD;AAC1F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,yCAAyC;AAElG,MAAM,MAAM,oBAAoB,GAAG,cAAc,GAAG;IAChD,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;CACnC;AAED,MAAM,MAAM,YAAY,GAAG;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,SAAS,oBAAoB,EAAE,CAAC;IACnD,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAC9D,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;IAC9C,QAAQ,CAAC,wBAAwB,EAAE,oBAAoB,CAAC;IACxD,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;CACvD;AAED,MAAM,MAAM,wBAAwB,GAAG,IAAI,CAAC,YAAY,EAAE,UAAU,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC"}
|
|
1
|
+
{"version":3,"file":"linked-bundle.d.ts","sourceRoot":"","sources":["../../../../source/linker/linked-bundle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gDAAgD;AAC1F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,yCAAyC;AAElG,MAAM,MAAM,oBAAoB,GAAG,cAAc,GAAG;IAChD,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;CACnC;AAED,MAAM,MAAM,YAAY,GAAG;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,SAAS,oBAAoB,EAAE,CAAC;IACnD,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAC9D,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;IAC9C,QAAQ,CAAC,wBAAwB,EAAE,oBAAoB,CAAC;IACxD,QAAQ,CAAC,uCAAuC,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3F,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;CACvD;AAED,MAAM,MAAM,wBAAwB,GAAG,IAAI,CAAC,YAAY,EAAE,UAAU,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linked-bundle.js","sourceRoot":"","sources":["../../../../source/linker/linked-bundle.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"linked-bundle.js","sourceRoot":"","sources":["../../../../source/linker/linked-bundle.ts"],"names":[],"mappings":"AAwBA,MAAM,UAAU,uBAAuB,CACnC,MAAqC;IAErC,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,QAAQ;QAC5C,OAAO,QAAQ,CAAC,aAAa,CAAC;IAClC,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -140,19 +140,31 @@ function findReplacement(file, bundleDependencies, bundlePeerDependencies) {
|
|
|
140
140
|
}
|
|
141
141
|
return findReplacementInBundles(file, bundlePeerDependencies, getExistingPublicModuleSpecifierForSourcePath);
|
|
142
142
|
}
|
|
143
|
+
function withSubstitutedSourcePath(substitutedSourceFilePathsByPackageName, packageName, file) {
|
|
144
|
+
if (declarationCompanionCandidates(file).length === 0) {
|
|
145
|
+
return substitutedSourceFilePathsByPackageName;
|
|
146
|
+
}
|
|
147
|
+
const existing = substitutedSourceFilePathsByPackageName.get(packageName) ?? [];
|
|
148
|
+
const updated = new Map(substitutedSourceFilePathsByPackageName);
|
|
149
|
+
updated.set(packageName, new Set([...existing, file]));
|
|
150
|
+
return updated;
|
|
151
|
+
}
|
|
143
152
|
export function findAllPathReplacements(files, bundleDependencies, bundlePeerDependencies) {
|
|
144
153
|
const importPathReplacements = new Map();
|
|
145
154
|
const matchedBundleDependencies = [];
|
|
155
|
+
let substitutedSourceFilePathsByPackageName = new Map();
|
|
146
156
|
for (const file of files) {
|
|
147
157
|
const replacement = findReplacement(file, bundleDependencies, bundlePeerDependencies);
|
|
148
158
|
if (replacement !== undefined) {
|
|
149
159
|
importPathReplacements.set(file, replacement.targetPath);
|
|
150
160
|
matchedBundleDependencies.push(replacement.packageName);
|
|
161
|
+
substitutedSourceFilePathsByPackageName = withSubstitutedSourcePath(substitutedSourceFilePathsByPackageName, replacement.packageName, file);
|
|
151
162
|
}
|
|
152
163
|
}
|
|
153
164
|
return {
|
|
154
165
|
importPathReplacements,
|
|
155
|
-
bundleDependencies: matchedBundleDependencies
|
|
166
|
+
bundleDependencies: matchedBundleDependencies,
|
|
167
|
+
substitutedSourceFilePathsByPackageName
|
|
156
168
|
};
|
|
157
169
|
}
|
|
158
170
|
//# sourceMappingURL=replacement-lookup.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replacement-lookup.js","sourceRoot":"","sources":["../../../../source/linker/replacement-lookup.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,EAAE,IAAI,UAAU,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,8BAA8B,EAAE,MAAM,0CAA0C,CAAC;AAE1F,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAClF,OAAO,EAAE,qCAAqC,EAAE,MAAM,yCAAyC,CAAC;AAChG,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"replacement-lookup.js","sourceRoot":"","sources":["../../../../source/linker/replacement-lookup.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,7 @@ function addNodeWithReplacements(substitutedGraph, node, replacements) {
|
|
|
23
23
|
fileDescription: { ...node.data.fileDescription, content },
|
|
24
24
|
externalDependencies: node.data.externalDependencies,
|
|
25
25
|
bundleDependencies: isSubstituted ? replacements.bundleDependencies : [],
|
|
26
|
+
substitutedSourceFilePathsByPackageName: replacements.substitutedSourceFilePathsByPackageName,
|
|
26
27
|
isSubstituted,
|
|
27
28
|
isExplicitlyIncluded: node.data.isExplicitlyIncluded,
|
|
28
29
|
...node.data.isGeneratedManifest ? { isGeneratedManifest: true } : {}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"substitute-bundles.js","sourceRoot":"","sources":["../../../../source/linker/substitute-bundles.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"substitute-bundles.js","sourceRoot":"","sources":["../../../../source/linker/substitute-bundles.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,9 +12,30 @@ function addOrCreateReference(externalDependencyName, reference, externalDepende
|
|
|
12
12
|
referencedFrom: unique([...externalDependency.referencedFrom, reference])
|
|
13
13
|
};
|
|
14
14
|
}
|
|
15
|
+
function collectLinkedBundleDependencies(linkedBundleDependencies, bundleDependencies, filePath) {
|
|
16
|
+
for (const bundleDependencyName of bundleDependencies) {
|
|
17
|
+
const bundleDependency = linkedBundleDependencies.get(bundleDependencyName);
|
|
18
|
+
linkedBundleDependencies.set(bundleDependencyName, addOrCreateReference(bundleDependencyName, filePath, bundleDependency));
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
function collectSubstitutedSourceFilePaths(target, source) {
|
|
22
|
+
const result = new Map(target);
|
|
23
|
+
for (const [packageName, sourceFilePaths] of source) {
|
|
24
|
+
const existing = result.get(packageName) ?? [];
|
|
25
|
+
result.set(packageName, new Set([...existing, ...sourceFilePaths]));
|
|
26
|
+
}
|
|
27
|
+
return Array.from(result);
|
|
28
|
+
}
|
|
29
|
+
function collectExternalDependencies(externalDependencies, dependencyNames, filePath) {
|
|
30
|
+
for (const externalDependencyName of dependencyNames) {
|
|
31
|
+
const externalDependency = externalDependencies.get(externalDependencyName);
|
|
32
|
+
externalDependencies.set(externalDependencyName, addOrCreateReference(externalDependencyName, filePath, externalDependency));
|
|
33
|
+
}
|
|
34
|
+
}
|
|
15
35
|
function createFlattenCollectors() {
|
|
16
36
|
const contents = [];
|
|
17
37
|
const linkedBundleDependencies = new Map();
|
|
38
|
+
const substitutedSourceFilePathsByPackageName = new Map();
|
|
18
39
|
const externalDependencies = new Map();
|
|
19
40
|
const visited = new Set();
|
|
20
41
|
function collect(filePath, data, directDependencies) {
|
|
@@ -29,16 +50,19 @@ function createFlattenCollectors() {
|
|
|
29
50
|
isExplicitlyIncluded: data.isExplicitlyIncluded,
|
|
30
51
|
...data.isGeneratedManifest ? { isGeneratedManifest: true } : {}
|
|
31
52
|
});
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
}
|
|
36
|
-
for (const externalDependencyName of data.externalDependencies) {
|
|
37
|
-
const externalDependency = externalDependencies.get(externalDependencyName);
|
|
38
|
-
externalDependencies.set(externalDependencyName, addOrCreateReference(externalDependencyName, filePath, externalDependency));
|
|
53
|
+
collectLinkedBundleDependencies(linkedBundleDependencies, data.bundleDependencies, filePath);
|
|
54
|
+
for (const [packageName, sourceFilePaths] of collectSubstitutedSourceFilePaths(substitutedSourceFilePathsByPackageName, data.substitutedSourceFilePathsByPackageName)) {
|
|
55
|
+
substitutedSourceFilePathsByPackageName.set(packageName, new Set(sourceFilePaths));
|
|
39
56
|
}
|
|
57
|
+
collectExternalDependencies(externalDependencies, data.externalDependencies, filePath);
|
|
40
58
|
}
|
|
41
|
-
return {
|
|
59
|
+
return {
|
|
60
|
+
collect,
|
|
61
|
+
contents,
|
|
62
|
+
linkedBundleDependencies,
|
|
63
|
+
substitutedSourceFilePathsByPackageName,
|
|
64
|
+
externalDependencies
|
|
65
|
+
};
|
|
42
66
|
}
|
|
43
67
|
export function createSubstitutedResourceGraph() {
|
|
44
68
|
const graph = createDirectedGraph();
|
|
@@ -53,7 +77,7 @@ export function createSubstitutedResourceGraph() {
|
|
|
53
77
|
graph.connect({ from: fromFilePath, to: toFilePath });
|
|
54
78
|
},
|
|
55
79
|
flatten(rootFilePaths) {
|
|
56
|
-
const { collect, contents, linkedBundleDependencies, externalDependencies } = createFlattenCollectors();
|
|
80
|
+
const { collect, contents, linkedBundleDependencies, substitutedSourceFilePathsByPackageName, externalDependencies } = createFlattenCollectors();
|
|
57
81
|
for (const rootFilePath of rootFilePaths) {
|
|
58
82
|
graph.visitBreadthFirstSearch(rootFilePath, function (node) {
|
|
59
83
|
collect(node.id, node.data, node.adjacentNodeIds);
|
|
@@ -69,6 +93,7 @@ export function createSubstitutedResourceGraph() {
|
|
|
69
93
|
return {
|
|
70
94
|
contents,
|
|
71
95
|
linkedBundleDependencies,
|
|
96
|
+
substitutedSourceFilePathsByPackageName,
|
|
72
97
|
externalDependencies
|
|
73
98
|
};
|
|
74
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"substituted-resource-graph.js","sourceRoot":"","sources":["../../../../source/linker/substituted-resource-graph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"substituted-resource-graph.js","sourceRoot":"","sources":["../../../../source/linker/substituted-resource-graph.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,25 @@
|
|
|
1
1
|
import { decorateWithPackageJsonExport } from "./package-json-export.js";
|
|
2
|
-
import { buildExportEntry } from "./package-shape.js";
|
|
2
|
+
import { buildExportEntry, toImportTarget } from "./package-shape.js";
|
|
3
3
|
import { getRoot } from "./root-registry.js";
|
|
4
4
|
function buildExplicitExportEntry(bundle, entry) {
|
|
5
5
|
return [entry.export, buildExportEntry(getRoot(bundle, entry.root))];
|
|
6
6
|
}
|
|
7
7
|
function buildEntries(bundle, surface) {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
const moduleEntries = surface.packageInterface.modules;
|
|
9
|
+
if (moduleEntries !== undefined) {
|
|
10
|
+
return moduleEntries.map(function (entry) {
|
|
11
|
+
return buildExplicitExportEntry(bundle, entry);
|
|
12
|
+
});
|
|
13
|
+
}
|
|
14
|
+
const [binEntry] = surface.packageInterface.bins ?? [];
|
|
15
|
+
if (binEntry === undefined) {
|
|
16
|
+
return [];
|
|
17
|
+
}
|
|
18
|
+
const { declarationFile } = getRoot(bundle, binEntry.root);
|
|
19
|
+
if (declarationFile === undefined) {
|
|
20
|
+
return [];
|
|
21
|
+
}
|
|
22
|
+
return [['.', { types: toImportTarget(declarationFile.targetFilePath) }]];
|
|
11
23
|
}
|
|
12
24
|
export function buildExplicitExportsField(bundle, surface) {
|
|
13
25
|
return decorateWithPackageJsonExport(bundle, Object.fromEntries(buildEntries(bundle, surface)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"explicit-exports.js","sourceRoot":"","sources":["../../../../source/package-surface/explicit-exports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,
|
|
1
|
+
{"version":3,"file":"explicit-exports.js","sourceRoot":"","sources":["../../../../source/package-surface/explicit-exports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EACH,gBAAgB,EAChB,cAAc,EAIjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAI7C,SAAS,wBAAwB,CAC7B,MAA6B,EAC7B,KAA0E;IAE1E,OAAO,CAAE,KAAK,CAAC,MAAM,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC;AAC3E,CAAC;AAED,SAAS,YAAY,CACjB,MAA6B,EAC7B,OAAwB;IAExB,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACvD,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO,aAAa,CAAC,GAAG,CAAC,UAAU,KAAK;YACpC,OAAO,wBAAwB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAE,QAAQ,CAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,IAAI,IAAI,EAAE,CAAC;IACzD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC3D,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;QAChC,OAAO,EAAE,CAAC;IACd,CAAC;IAED,OAAO,CAAE,CAAE,GAAG,EAAE,EAAE,KAAK,EAAE,cAAc,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE,CAAE,CAAE,CAAC;AAClF,CAAC;AAED,MAAM,UAAU,yBAAyB,CACrC,MAA6B,EAC7B,OAAwB;IAExB,OAAO,6BAA6B,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;AACpG,CAAC"}
|