packtory 0.0.73 → 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/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/package.json +1 -1
- package/packtory/stages/package-resolution-stage.js +4 -4
- package/packtory/stages/package-resolution-stage.js.map +1 -1
- package/readme.md +36 -48
- 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
|
@@ -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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"}
|
package/package.json
CHANGED
|
@@ -37,7 +37,7 @@ function hasPromotionCandidates(promotedSourcePathsByPackageName) {
|
|
|
37
37
|
return sourceFilePaths.size > 0;
|
|
38
38
|
});
|
|
39
39
|
}
|
|
40
|
-
async function resolvePackagesWithPromotions(dependencies, config, promotedSourcePathsByPackageName) {
|
|
40
|
+
async function resolvePackagesWithPromotions(dependencies, config, promotedSourcePathsByPackageName, emitScheduledEvents) {
|
|
41
41
|
return dependencies.scheduler.runForEachScheduledPackage({
|
|
42
42
|
config,
|
|
43
43
|
createOptions(context) {
|
|
@@ -61,11 +61,11 @@ async function resolvePackagesWithPromotions(dependencies, config, promotedSourc
|
|
|
61
61
|
selectNext(input) {
|
|
62
62
|
return input.result.linkedBundle;
|
|
63
63
|
},
|
|
64
|
-
emitScheduledEvents
|
|
64
|
+
emitScheduledEvents
|
|
65
65
|
});
|
|
66
66
|
}
|
|
67
67
|
export async function resolvePackages(dependencies, config) {
|
|
68
|
-
const firstPassResult = await resolvePackagesWithPromotions(dependencies, config, new Map());
|
|
68
|
+
const firstPassResult = await resolvePackagesWithPromotions(dependencies, config, new Map(), true);
|
|
69
69
|
if (firstPassResult.isErr) {
|
|
70
70
|
return firstPassResult;
|
|
71
71
|
}
|
|
@@ -73,6 +73,6 @@ export async function resolvePackages(dependencies, config) {
|
|
|
73
73
|
if (!hasPromotionCandidates(promotedSourcePathsByPackageName)) {
|
|
74
74
|
return firstPassResult;
|
|
75
75
|
}
|
|
76
|
-
return await resolvePackagesWithPromotions(dependencies, config, promotedSourcePathsByPackageName);
|
|
76
|
+
return await resolvePackagesWithPromotions(dependencies, config, promotedSourcePathsByPackageName, false);
|
|
77
77
|
}
|
|
78
78
|
//# sourceMappingURL=package-resolution-stage.js.map
|
|
@@ -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;AAGnC,OAAO,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC7F,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,6BAA6B,EAA8B,MAAM,kBAAkB,CAAC;AAmB7F,SAAS,oBAAoB,CACzB,WAAmB,EACnB,QAAiC,EACjC,MAAwC;IAExC,OAAO,6BAA6B,CAAC,WAAW,EAAE,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;AAC9G,CAAC;AAED,SAAS,kBAAkB,CACvB,YAAwE,EACxE,OAA8B;IAE9B,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAC9E,OAAO;IACX,CAAC;IACD,MAAM,gBAAgB,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;IACzD,YAAY,CAAC,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,gBAAgB,EAAE;QAC7D,WAAW,EAAE,OAAO,CAAC,IAAI;QACzB,KAAK,EAAE,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,UAAU,IAAI;YACnD,OAAO,IAAI,CAAC,EAAE,CAAC;QACnB,CAAC,CAAC;QACF,eAAe,EAAE,CAAC;QAClB,eAAe,EAAE,EAAE;KACtB,CAAC,CAAC;AACP,CAAC;AAED,SAAS,uCAAuC,CAC5C,cAAwC;IAExC,MAAM,gCAAgC,GAAG,IAAI,GAAG,EAAuB,CAAC;IACxE,KAAK,MAAM,aAAa,IAAI,cAAc,EAAE,CAAC;QACzC,KACI,MAAM,CAAE,WAAW,EAAE,eAAe,CAAE,IAAI,aAAa,CAAC,YAAY,CAAC,uCAAuC,EAC9G,CAAC;YACC,MAAM,QAAQ,GAAG,gCAAgC,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,IAAI,GAAG,EAAU,CAAC;YACxF,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE,CAAC;gBAC3C,QAAQ,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YACjC,CAAC;YACD,gCAAgC,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAChE,CAAC;IACL,CAAC;IACD,OAAO,gCAAgC,CAAC;AAC5C,CAAC;AAED,SAAS,sBAAsB,CAAC,gCAA0E;IACtG,OAAO,KAAK,CAAC,IAAI,CAAC,gCAAgC,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,eAAe;QACvF,OAAO,eAAe,CAAC,IAAI,GAAG,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;AACP,CAAC;AAED,KAAK,UAAU,6BAA6B,CACxC,YAA2C,EAC3C,MAAwC,EACxC,gCAA0E;
|
|
1
|
+
{"version":3,"file":"package-resolution-stage.js","sourceRoot":"","sources":["../../../../../source/packtory/stages/package-resolution-stage.ts"],"names":[],"mappings":"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"}
|
package/readme.md
CHANGED
|
@@ -1,67 +1,55 @@
|
|
|
1
1
|
### packtory
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
This package provides an API for the `packtory` tool, enabling programmatic usage. It exposes the following functions:
|
|
6
|
-
|
|
7
|
-
- `buildAndPublishAll(config, options)` – validates the configuration, builds every package, runs the enabled checks, and (optionally) publishes the results.
|
|
8
|
-
- `resolveAndLinkAll(config)` – performs the validation, resolve, link, and checks phases without publishing. This is useful for custom workflows and integration tests that only need the prepared bundles.
|
|
9
|
-
- `diffAgainstLatestPublished(config)` – validates and builds every package without publishing, then per package computes the file-level diff between the bundle the next publish would produce and the version currently tagged `latest` on the configured registry.
|
|
10
|
-
- `planReleaseAgainstLatestPublished(config)` – validates and builds every package without publishing, then returns per-package release state, release classification, planned versions, artifact file paths, changed artifact file paths, registry metadata including `gitHead`, current `gitHead`, bundled source file paths, and changelog source file paths.
|
|
11
|
-
- `packPackage(config, options)` – validates the configuration, runs the same resolve / link / checks pipeline as `buildAndPublishAll`, and writes a single configured package to disk as a zip, tarball, or expanded folder. Useful when you need an artifact you control (Lambda zip, container build context, local inspection) instead of a registry publish.
|
|
12
|
-
|
|
13
|
-
**Installation:**
|
|
3
|
+
Programmatic API for building, checking, publishing, diffing, release planning, and packing configured npm packages.
|
|
14
4
|
|
|
15
5
|
```bash
|
|
16
6
|
npm install packtory
|
|
17
7
|
```
|
|
18
8
|
|
|
19
|
-
**Usage:**
|
|
20
|
-
|
|
21
9
|
```javascript
|
|
22
|
-
import {
|
|
10
|
+
import {
|
|
11
|
+
buildAndPublishAll,
|
|
12
|
+
diffAgainstLatestPublished,
|
|
13
|
+
packPackage,
|
|
14
|
+
planReleaseAgainstLatestPublished,
|
|
15
|
+
resolveAndLinkAll
|
|
16
|
+
} from 'packtory';
|
|
23
17
|
|
|
24
18
|
const config = {
|
|
25
19
|
/* your packtory configuration */
|
|
26
20
|
};
|
|
27
21
|
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
})
|
|
22
|
+
const publishOutcome = await buildAndPublishAll(config, { dryRun: true, stage: false });
|
|
23
|
+
const resolvedOutcome = await resolveAndLinkAll(config);
|
|
24
|
+
const releaseDiffOutcome = await diffAgainstLatestPublished(config);
|
|
25
|
+
const releasePlanOutcome = await planReleaseAgainstLatestPublished(config);
|
|
26
|
+
const packOutcome = await packPackage(config, {
|
|
27
|
+
packageName: 'image-resizer-cli',
|
|
28
|
+
format: 'zip',
|
|
29
|
+
outputPath: './dist/image-resizer-cli.zip',
|
|
30
|
+
version: '1.4.0',
|
|
31
|
+
vendorDependencies: true
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
console.log({
|
|
35
|
+
publishOutcome,
|
|
36
|
+
resolvedOutcome,
|
|
37
|
+
releaseDiffOutcome,
|
|
38
|
+
releasePlanOutcome,
|
|
39
|
+
packOutcome
|
|
40
|
+
});
|
|
47
41
|
```
|
|
48
42
|
|
|
49
|
-
|
|
43
|
+
Exports:
|
|
50
44
|
|
|
51
|
-
-
|
|
52
|
-
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
45
|
+
- `buildAndPublishAll(config, options)`: validates the configuration, builds packages, runs checks, and publishes or dry-runs every package.
|
|
46
|
+
- `resolveAndLinkAll(config, options?)`: runs validation, resolve, link, dead-code elimination, and checks without publishing.
|
|
47
|
+
- `diffAgainstLatestPublished(config)`: builds packages and compares the next artifact against the current `latest` registry version.
|
|
48
|
+
- `planReleaseAgainstLatestPublished(config)`: returns per-package release state, planned versions, artifact paths, source attribution, changelog dependency data, and registry metadata.
|
|
49
|
+
- `packPackage(config, options)`: writes one package as a zip, tarball, or folder after the same resolve, link, and check pipeline.
|
|
56
50
|
|
|
57
|
-
|
|
51
|
+
`registrySettings` is optional for dry-run publish, release diff, release planning, and pack flows that only need anonymous registry metadata. Non-dry-run publish requires publish auth.
|
|
58
52
|
|
|
59
|
-
|
|
60
|
-
Each successful item includes `publication`, which is `{ type: 'none' }` for dry-runs / already-up-to-date packages, `{ type: 'published' }` for direct publishes, or `{ type: 'staged', stageId }` for npm staged publishing.
|
|
61
|
-
- Stage mode is npm-only. The package must already exist on npm, and automatic versioning in stage mode must be able to list pending staged versions before choosing the next version. If publish auth uses npm OIDC/trusted publishing, provide token-based metadata auth for that lookup.
|
|
62
|
-
- `resolveAndLinkAll` returns a `ResolveAndLinkAllOutcome` whose `result` carries the resolved package information or details about the failure (validation errors, check failures, or partial execution issues).
|
|
63
|
-
- `diffAgainstLatestPublished` returns a `ReleaseDiffAllOutcome` whose `result` carries the per-package release diff list or a failure variant.
|
|
64
|
-
- `planReleaseAgainstLatestPublished` returns a `ReleasePlanOutcome` whose `result` carries `{ packages }` or a failure variant. Each package plan includes `previousVersion`, `nextVersion`, `artifactState`, `releaseClassification`, `changed`, `previousGitHead`, `currentGitHead`, `latestRegistryMetadata`, `artifactFiles`, `changedArtifactFiles`, `sourceFiles`, `changelogDependencyNames`, `changelogDependencyUpdates`, and `changelogSourceFiles`. `releaseClassification` matches the release analysis categories, including `dependency-only` for generated manifest and SBOM dependency changes. `sourceFiles` contains bundled source paths. `changelogSourceFiles` contains repository-relative files for changelog attribution, using readable JavaScript source maps when present. `changelogDependencyNames` contains generated package manifest dependencies whose published values changed. `changelogDependencyUpdates` contains the changed dependency names and current manifest specifiers used for dependency-only changelog titles. Package-level `additionalChangelogSourceFiles` can add other package attribution paths. `latestRegistryMetadata` includes the previous version, publish time, and previous registry `gitHead` when available.
|
|
65
|
-
- `packPackage` returns a `PackOutcome` whose `result` is `Ok(undefined)` on success or a `PackFailure`. `PackFailure` is a discriminated union covering configuration errors, check failures, partial resolve failures, and the pack-specific variants `package-not-found`, `bundle-dependencies-unsupported` (rejected when `vendorDependencies` is `false` and the target declares `bundleDependencies`), and `peer-dependencies-unsatisfied` (raised when a vendored dependency declares a peer that no other vendored package satisfies).
|
|
53
|
+
`packPackage` options are `{ packageName, format, outputPath, version, vendorDependencies }`. `format` is `'zip'`, `'tar'`, or `'folder'`; `version` stamps the generated manifest; `vendorDependencies` materializes the resolved `node_modules` tree for self-contained artifacts.
|
|
66
54
|
|
|
67
|
-
|
|
55
|
+
See the full configuration and workflow documentation in the repository readme.
|
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.74",
|
|
20
|
+
"bom-ref": "pkg:npm/packtory@0.0.74",
|
|
21
|
+
"purl": "pkg:npm/packtory@0.0.74"
|
|
22
22
|
}
|
|
23
23
|
},
|
|
24
24
|
"components": [
|
|
@@ -392,7 +392,7 @@
|
|
|
392
392
|
"ref": "pkg:npm/npm-registry-fetch@20.0.1"
|
|
393
393
|
},
|
|
394
394
|
{
|
|
395
|
-
"ref": "pkg:npm/packtory@0.0.
|
|
395
|
+
"ref": "pkg:npm/packtory@0.0.74",
|
|
396
396
|
"dependsOn": [
|
|
397
397
|
"pkg:npm/@arethetypeswrong/core@0.18.5",
|
|
398
398
|
"pkg:npm/@cyclonedx/cyclonedx-library@10.1.0",
|
|
@@ -1,33 +0,0 @@
|
|
|
1
|
-
import { Node as TsMorphNode } from 'ts-morph';
|
|
2
|
-
import { variableDeclarationSurvives } from "../variable-declaration-bindings.js";
|
|
3
|
-
import { isNamedDeclaration } from "./named-declaration-kinds.js";
|
|
4
|
-
function captureSurvivor(node) {
|
|
5
|
-
return { node, originalStart: node.getStart(), originalEnd: node.getEnd() };
|
|
6
|
-
}
|
|
7
|
-
function captureNamedDeclarationSurvivor(statement, survivingNames) {
|
|
8
|
-
const name = statement.getName();
|
|
9
|
-
if (name === undefined || survivingNames.has(name)) {
|
|
10
|
-
return [captureSurvivor(statement)];
|
|
11
|
-
}
|
|
12
|
-
return [];
|
|
13
|
-
}
|
|
14
|
-
function captureVariableStatementSurvivors(statement, survivingNames) {
|
|
15
|
-
const declarators = statement.getDeclarations();
|
|
16
|
-
const survivingDeclarators = declarators.filter(function (declarator) {
|
|
17
|
-
return variableDeclarationSurvives(declarator, survivingNames);
|
|
18
|
-
});
|
|
19
|
-
if (survivingDeclarators.length === declarators.length) {
|
|
20
|
-
return [captureSurvivor(statement)];
|
|
21
|
-
}
|
|
22
|
-
return survivingDeclarators.map(captureSurvivor);
|
|
23
|
-
}
|
|
24
|
-
export function captureSurvivorsForStatement(statement, survivingNames) {
|
|
25
|
-
if (isNamedDeclaration(statement)) {
|
|
26
|
-
return captureNamedDeclarationSurvivor(statement, survivingNames);
|
|
27
|
-
}
|
|
28
|
-
if (TsMorphNode.isVariableStatement(statement)) {
|
|
29
|
-
return captureVariableStatementSurvivors(statement, survivingNames);
|
|
30
|
-
}
|
|
31
|
-
return [captureSurvivor(statement)];
|
|
32
|
-
}
|
|
33
|
-
//# sourceMappingURL=survivor-capture.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"survivor-capture.js","sourceRoot":"","sources":["../../../../../source/dead-code-eliminator/transform/survivor-capture.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,IAAI,WAAW,EAAoE,MAAM,UAAU,CAAC;AACjH,OAAO,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAuB,MAAM,8BAA8B,CAAC;AAQvF,SAAS,eAAe,CAAC,IAAqC;IAC1D,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;AAChF,CAAC;AAED,SAAS,+BAA+B,CACpC,SAAyB,EACzB,cAAmC;IAEnC,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;IACjC,IAAI,IAAI,KAAK,SAAS,IAAI,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QACjD,OAAO,CAAE,eAAe,CAAC,SAAS,CAAC,CAAE,CAAC;IAC1C,CAAC;IACD,OAAO,EAAE,CAAC;AACd,CAAC;AAED,SAAS,iCAAiC,CACtC,SAA4B,EAC5B,cAAmC;IAEnC,MAAM,WAAW,GAAG,SAAS,CAAC,eAAe,EAAE,CAAC;IAChD,MAAM,oBAAoB,GAAG,WAAW,CAAC,MAAM,CAAC,UAAU,UAAU;QAChE,OAAO,2BAA2B,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IACH,IAAI,oBAAoB,CAAC,MAAM,KAAK,WAAW,CAAC,MAAM,EAAE,CAAC;QACrD,OAAO,CAAE,eAAe,CAAC,SAAS,CAAC,CAAE,CAAC;IAC1C,CAAC;IACD,OAAO,oBAAoB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,4BAA4B,CACxC,SAAoB,EACpB,cAAmC;IAEnC,IAAI,kBAAkB,CAAC,SAAS,CAAC,EAAE,CAAC;QAChC,OAAO,+BAA+B,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IACtE,CAAC;IACD,IAAI,WAAW,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,CAAC;QAC7C,OAAO,iCAAiC,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IACxE,CAAC;IACD,OAAO,CAAE,eAAe,CAAC,SAAS,CAAC,CAAE,CAAC;AAC1C,CAAC"}
|