packtory 0.0.10 → 0.0.11
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/artifacts/artifacts-builder.d.ts +0 -14
- package/artifacts/artifacts-builder.d.ts.map +1 -1
- package/artifacts/artifacts-builder.js +75 -0
- package/artifacts/artifacts-builder.js.map +1 -1
- package/bundle-emitter/emitter.d.ts +0 -30
- package/bundle-emitter/emitter.d.ts.map +1 -1
- package/bundle-emitter/emitter.js +34 -0
- package/bundle-emitter/emitter.js.map +1 -1
- package/bundle-emitter/extract-package-tarball.js +11 -0
- package/bundle-emitter/extract-package-tarball.js.map +1 -1
- package/bundle-emitter/registry-client.d.ts +0 -21
- package/bundle-emitter/registry-client.d.ts.map +1 -1
- package/bundle-emitter/registry-client.js +261 -0
- package/bundle-emitter/registry-client.js.map +1 -1
- package/bundle-emitter/repository-url-normalizer.js +36 -0
- package/bundle-emitter/repository-url-normalizer.js.map +1 -1
- package/checks/check-runner.js +5 -0
- package/checks/check-runner.js.map +1 -1
- package/checks/rules/registry.js +9 -0
- package/checks/rules/registry.js.map +1 -1
- package/common/clock.d.ts +0 -6
- package/common/clock.d.ts.map +1 -1
- package/common/code-files.js +4 -0
- package/common/code-files.js.map +1 -1
- package/config/additional-files.js +4 -0
- package/config/additional-files.js.map +1 -1
- package/config/automatic-versioning-settings.js +4 -0
- package/config/automatic-versioning-settings.js.map +1 -1
- package/config/config.js +2 -0
- package/config/config.js.map +1 -1
- package/config/dead-code-elimination-settings.d.ts +0 -1
- package/config/dead-code-elimination-settings.d.ts.map +1 -1
- package/config/dead-code-elimination-settings.js +19 -0
- package/config/dead-code-elimination-settings.js.map +1 -1
- package/config/dependency-policy.js +3 -0
- package/config/dependency-policy.js.map +1 -1
- package/config/main-package-json-schema.js +1 -0
- package/config/main-package-json-schema.js.map +1 -1
- package/config/manual-versioning-settings.js +4 -0
- package/config/manual-versioning-settings.js.map +1 -1
- package/config/package-config.js +6 -0
- package/config/package-config.js.map +1 -1
- package/config/package-interface.js +26 -0
- package/config/package-interface.js.map +1 -1
- package/config/package-json.d.ts +0 -1
- package/config/package-json.d.ts.map +1 -1
- package/config/package-json.js +16 -0
- package/config/package-json.js.map +1 -1
- package/config/packtory-config-schema.js +3 -0
- package/config/packtory-config-schema.js.map +1 -1
- package/config/publish-settings.js +22 -0
- package/config/publish-settings.js.map +1 -1
- package/config/registry-settings.d.ts +0 -18
- package/config/registry-settings.d.ts.map +1 -1
- package/config/registry-settings.js +38 -0
- package/config/registry-settings.js.map +1 -1
- package/config/root.js +4 -0
- package/config/root.js.map +1 -1
- package/config/sbom-settings.js +3 -0
- package/config/sbom-settings.js.map +1 -1
- package/config/validation.d.ts +0 -18
- package/config/validation.d.ts.map +1 -1
- package/config/validation.js +254 -0
- package/config/validation.js.map +1 -1
- package/config/versioning-settings.js +1 -0
- package/config/versioning-settings.js.map +1 -1
- package/dead-code-eliminator/analyzed-bundle.d.ts +0 -9
- package/dead-code-eliminator/analyzed-bundle.d.ts.map +1 -1
- package/dead-code-eliminator/analyzed-bundle.js +7 -0
- package/dead-code-eliminator/analyzed-bundle.js.map +1 -1
- package/dead-code-eliminator/eliminator.js +12 -1
- package/dead-code-eliminator/eliminator.js.map +1 -1
- package/dead-code-eliminator/load-bundle.js +10 -5
- package/dead-code-eliminator/load-bundle.js.map +1 -1
- package/dead-code-eliminator/reachability/binding-extractor.js +20 -7
- package/dead-code-eliminator/reachability/binding-extractor.js.map +1 -1
- package/dead-code-eliminator/reachability/reachability.js +1 -1
- package/dead-code-eliminator/reachability/reachability.js.map +1 -1
- package/dead-code-eliminator/transform/declaration-remover.js +3 -2
- package/dead-code-eliminator/transform/declaration-remover.js.map +1 -1
- package/dead-code-eliminator/variable-declaration-bindings.js +34 -0
- package/dead-code-eliminator/variable-declaration-bindings.js.map +1 -0
- package/dependency-scanner/dependency-graph.d.ts +0 -27
- package/dependency-scanner/dependency-graph.d.ts.map +1 -1
- package/dependency-scanner/dependency-graph.js +73 -0
- package/dependency-scanner/dependency-graph.js.map +1 -1
- package/dependency-scanner/external-dependencies.js +16 -0
- package/dependency-scanner/external-dependencies.js.map +1 -1
- package/dependency-scanner/scanner.d.ts +0 -13
- package/dependency-scanner/scanner.d.ts.map +1 -1
- package/dependency-scanner/scanner.js +69 -0
- package/dependency-scanner/scanner.js.map +1 -1
- package/dependency-scanner/source-file-references.js +10 -0
- package/dependency-scanner/source-file-references.js.map +1 -1
- package/dependency-scanner/source-map-file-locator.d.ts +0 -7
- package/dependency-scanner/source-map-file-locator.d.ts.map +1 -1
- package/dependency-scanner/source-map-file-locator.js +27 -0
- package/dependency-scanner/source-map-file-locator.js.map +1 -1
- package/dependency-scanner/typescript-file-host.d.ts +0 -9
- package/dependency-scanner/typescript-file-host.d.ts.map +1 -1
- package/dependency-scanner/typescript-file-host.js +114 -0
- package/dependency-scanner/typescript-file-host.js.map +1 -1
- package/dependency-scanner/typescript-project-analyzer.d.ts +0 -17
- package/dependency-scanner/typescript-project-analyzer.d.ts.map +1 -1
- package/dependency-scanner/typescript-project-analyzer.js +52 -0
- package/dependency-scanner/typescript-project-analyzer.js.map +1 -1
- package/directed-graph/graph.d.ts +0 -26
- package/directed-graph/graph.d.ts.map +1 -1
- package/directed-graph/graph.js +229 -0
- package/directed-graph/graph.js.map +1 -1
- package/file-manager/compare.js +17 -0
- package/file-manager/compare.js.map +1 -1
- package/file-manager/equal.js +5 -0
- package/file-manager/equal.js.map +1 -1
- package/file-manager/file-manager.d.ts +0 -15
- package/file-manager/file-manager.d.ts.map +1 -1
- package/file-manager/file-manager.js +52 -0
- package/file-manager/file-manager.js.map +1 -1
- package/file-manager/permissions.js +26 -0
- package/file-manager/permissions.js.map +1 -1
- package/linker/linker.d.ts +0 -8
- package/linker/linker.d.ts.map +1 -1
- package/linker/linker.js +23 -0
- package/linker/linker.js.map +1 -1
- package/linker/resource-graph.js +25 -0
- package/linker/resource-graph.js.map +1 -1
- package/linker/source-modifier/import-paths.js +22 -0
- package/linker/source-modifier/import-paths.js.map +1 -1
- package/linker/substitute-bundles.js +84 -0
- package/linker/substitute-bundles.js.map +1 -1
- package/linker/substituted-resource-graph.js +72 -0
- package/linker/substituted-resource-graph.js.map +1 -1
- package/package-surface/modules.js +232 -5
- package/package-surface/modules.js.map +1 -1
- package/package-surface/surface.d.ts +0 -1
- package/package-surface/surface.d.ts.map +1 -1
- package/package-surface/surface.js +15 -0
- package/package-surface/surface.js.map +1 -1
- package/package.json +1 -1
- package/packtory/map-config.d.ts +0 -10
- package/packtory/map-config.d.ts.map +1 -1
- package/packtory/map-config.js +14 -0
- package/packtory/map-config.js.map +1 -1
- package/packtory/normalize-paths.js +24 -0
- package/packtory/normalize-paths.js.map +1 -1
- package/packtory/package-processor-build.js +72 -0
- package/packtory/package-processor-build.js.map +1 -1
- package/packtory/package-processor-publish.d.ts +0 -5
- package/packtory/package-processor-publish.d.ts.map +1 -1
- package/packtory/package-processor-publish.js +133 -0
- package/packtory/package-processor-publish.js.map +1 -1
- package/packtory/package-processor.d.ts +0 -17
- package/packtory/package-processor.d.ts.map +1 -1
- package/packtory/package-processor.js +8 -0
- package/packtory/package-processor.js.map +1 -1
- package/packtory/packtory-results.d.ts +0 -10
- package/packtory/packtory-results.d.ts.map +1 -1
- package/packtory/packtory-results.js +15 -0
- package/packtory/packtory-results.js.map +1 -1
- package/packtory/packtory.d.ts +0 -8
- package/packtory/packtory.d.ts.map +1 -1
- package/packtory/prepare-package-options.d.ts +0 -2
- package/packtory/prepare-package-options.d.ts.map +1 -1
- package/packtory/prepare-package-options.js +122 -0
- package/packtory/prepare-package-options.js.map +1 -1
- package/packtory/resolved-package.d.ts +0 -2
- package/packtory/resolved-package.d.ts.map +1 -1
- package/packtory/resolved-package.js +31 -0
- package/packtory/resolved-package.js.map +1 -1
- package/packtory/scheduler.d.ts +0 -37
- package/packtory/scheduler.d.ts.map +1 -1
- package/progress/progress-broadcaster.d.ts +0 -13
- package/progress/progress-broadcaster.d.ts.map +1 -1
- package/progress/progress-broadcaster.js +45 -0
- package/progress/progress-broadcaster.js.map +1 -1
- package/report/artifact-entry-merger.js +20 -0
- package/report/artifact-entry-merger.js.map +1 -1
- package/report/inspectors.js +73 -0
- package/report/inspectors.js.map +1 -1
- package/report/report-aggregator.d.ts +0 -5
- package/report/report-aggregator.d.ts.map +1 -1
- package/report/report-aggregator.js +185 -0
- package/report/report-aggregator.js.map +1 -1
- package/resource-resolver/content.js +53 -0
- package/resource-resolver/content.js.map +1 -1
- package/resource-resolver/resolved-bundle.d.ts +0 -10
- package/resource-resolver/resolved-bundle.d.ts.map +1 -1
- package/resource-resolver/resource-resolve-options.d.ts +0 -4
- package/resource-resolver/resource-resolve-options.d.ts.map +1 -1
- package/resource-resolver/resource-resolve-options.js +12 -0
- package/resource-resolver/resource-resolve-options.js.map +1 -1
- package/resource-resolver/resource-resolver.d.ts +0 -8
- package/resource-resolver/resource-resolver.d.ts.map +1 -1
- package/resource-resolver/resource-resolver.js +78 -0
- package/resource-resolver/resource-resolver.js.map +1 -1
- package/sbom/extract-license.js +10 -0
- package/sbom/extract-license.js.map +1 -1
- package/sbom/license-resolver.d.ts +0 -11
- package/sbom/license-resolver.d.ts.map +1 -1
- package/sbom/license-resolver.js +19 -0
- package/sbom/license-resolver.js.map +1 -1
- package/sbom/sbom-file.d.ts +0 -12
- package/sbom/sbom-file.d.ts.map +1 -1
- package/sbom/sbom-file.js +54 -0
- package/sbom/sbom-file.js.map +1 -1
- package/sbom/sbom-serializer.d.ts +0 -4
- package/sbom/sbom-serializer.d.ts.map +1 -1
- package/sbom/sbom-serializer.js +9 -0
- package/sbom/sbom-serializer.js.map +1 -1
- package/tar/extract-tar.js +38 -0
- package/tar/extract-tar.js.map +1 -1
- package/tar/tarball-builder.d.ts +0 -4
- package/tar/tarball-builder.d.ts.map +1 -1
- package/version-manager/manager.d.ts +0 -4
- package/version-manager/manager.d.ts.map +1 -1
- package/version-manager/manager.js +46 -0
- package/version-manager/manager.js.map +1 -1
- package/version-manager/manifest/builder.js +56 -0
- package/version-manager/manifest/builder.js.map +1 -1
- package/version-manager/manifest/serialize.js +46 -0
- package/version-manager/manifest/serialize.js.map +1 -1
- package/version-manager/manifest/sort-values.js +16 -0
- package/version-manager/manifest/sort-values.js.map +1 -1
- package/version-manager/specifier-classifier.js +33 -0
- package/version-manager/specifier-classifier.js.map +1 -1
- package/version-manager/specifier-errors.js +43 -0
- package/version-manager/specifier-errors.js.map +1 -1
- package/version-manager/versioned-bundle-dependencies.js +107 -0
- package/version-manager/versioned-bundle-dependencies.js.map +1 -1
- package/version-manager/versioned-bundle-imports.js +72 -0
- package/version-manager/versioned-bundle-imports.js.map +1 -1
- package/version-manager/versioned-bundle.js +60 -0
- package/version-manager/versioned-bundle.js.map +1 -1
- package/sbom.cdx.json +0 -390
package/config/validation.js
CHANGED
|
@@ -5,4 +5,258 @@ import { createDirectedGraph } from "../directed-graph/graph.js";
|
|
|
5
5
|
import { getBundledDependencies } from "./config.js";
|
|
6
6
|
import { packtoryConfigSchema } from "./packtory-config-schema.js";
|
|
7
7
|
import { packtoryConfigWithoutRegistrySchema } from "./packtory-config-without-registry-schema.js";
|
|
8
|
+
function buildPackageGraph(packages) {
|
|
9
|
+
const graph = createDirectedGraph();
|
|
10
|
+
for (const packageConfig of Object.values(packages)) {
|
|
11
|
+
graph.addNode(packageConfig.name, undefined);
|
|
12
|
+
}
|
|
13
|
+
for (const packageConfig of Object.values(packages)) {
|
|
14
|
+
for (const dependency of getBundledDependencies(packageConfig)) {
|
|
15
|
+
graph.connect({ from: packageConfig.name, to: dependency });
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
return graph;
|
|
19
|
+
}
|
|
20
|
+
function validateDependenciesExistForSinglePackage(packageName, allKnownPackageNames, dependencies, isPeer) {
|
|
21
|
+
const prefix = isPeer ? 'Bundle peer' : 'Bundle';
|
|
22
|
+
return dependencies
|
|
23
|
+
.filter((dependency) => {
|
|
24
|
+
return !allKnownPackageNames.includes(dependency);
|
|
25
|
+
})
|
|
26
|
+
.map((dependency) => {
|
|
27
|
+
return `${prefix} dependency "${dependency}" referenced in "${packageName}" does not exist`;
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
function validateDependenciesExist(packageConfigs) {
|
|
31
|
+
const knownPackageNames = Object.keys(packageConfigs);
|
|
32
|
+
return Object.values(packageConfigs).flatMap((packageConfig) => {
|
|
33
|
+
return [
|
|
34
|
+
...validateDependenciesExistForSinglePackage(packageConfig.name, knownPackageNames, packageConfig.bundleDependencies ?? [], false),
|
|
35
|
+
...validateDependenciesExistForSinglePackage(packageConfig.name, knownPackageNames, packageConfig.bundlePeerDependencies ?? [], true)
|
|
36
|
+
];
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
function validateDuplicateRootJavaScriptTargets(packageConfig) {
|
|
40
|
+
const issues = [];
|
|
41
|
+
const rootEntries = Object.entries(packageConfig.roots);
|
|
42
|
+
const jsPaths = new Map();
|
|
43
|
+
for (const [rootId, root] of rootEntries) {
|
|
44
|
+
const previous = jsPaths.get(root.js);
|
|
45
|
+
if (previous === undefined) {
|
|
46
|
+
jsPaths.set(root.js, rootId);
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
issues.push(`Package "${packageConfig.name}" maps both root "${previous}" and "${rootId}" to "${root.js}"`);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
return issues;
|
|
53
|
+
}
|
|
54
|
+
function validateImplicitRootConfiguration(packageConfig) {
|
|
55
|
+
const rootIds = Object.keys(packageConfig.roots);
|
|
56
|
+
const issues = [];
|
|
57
|
+
const { defaultModuleRoot } = packageConfig;
|
|
58
|
+
if (rootIds.length > 1 && defaultModuleRoot === undefined) {
|
|
59
|
+
issues.push(`Package "${packageConfig.name}" must define defaultModuleRoot when multiple roots exist`);
|
|
60
|
+
}
|
|
61
|
+
if (defaultModuleRoot !== undefined && packageConfig.roots[defaultModuleRoot] === undefined) {
|
|
62
|
+
issues.push(`Package "${packageConfig.name}" references unknown defaultModuleRoot "${defaultModuleRoot}"`);
|
|
63
|
+
}
|
|
64
|
+
return issues;
|
|
65
|
+
}
|
|
66
|
+
function createExplicitValidationState() {
|
|
67
|
+
return {
|
|
68
|
+
usedRootIds: new Set(),
|
|
69
|
+
publicRootIds: new Set(),
|
|
70
|
+
seenExportKeys: new Set(),
|
|
71
|
+
seenBinNames: new Set(),
|
|
72
|
+
seenPrivateRootIds: new Set()
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
function validateExplicitModules(packageConfig, state) {
|
|
76
|
+
const issues = [];
|
|
77
|
+
for (const entry of packageConfig.packageInterface.modules ?? []) {
|
|
78
|
+
if (packageConfig.roots[entry.root] === undefined) {
|
|
79
|
+
issues.push([
|
|
80
|
+
`Package "${packageConfig.name}" module export "${entry.export}"`,
|
|
81
|
+
`references unknown root "${entry.root}"`
|
|
82
|
+
].join(' '));
|
|
83
|
+
}
|
|
84
|
+
if (state.seenExportKeys.has(entry.export)) {
|
|
85
|
+
issues.push(`Package "${packageConfig.name}" declares duplicate export key "${entry.export}"`);
|
|
86
|
+
}
|
|
87
|
+
state.seenExportKeys.add(entry.export);
|
|
88
|
+
state.usedRootIds.add(entry.root);
|
|
89
|
+
state.publicRootIds.add(entry.root);
|
|
90
|
+
}
|
|
91
|
+
return issues;
|
|
92
|
+
}
|
|
93
|
+
function validateExplicitBins(packageConfig, state) {
|
|
94
|
+
const issues = [];
|
|
95
|
+
for (const entry of packageConfig.packageInterface.bins ?? []) {
|
|
96
|
+
if (packageConfig.roots[entry.root] === undefined) {
|
|
97
|
+
issues.push(`Package "${packageConfig.name}" bin "${entry.name}" references unknown root "${entry.root}"`);
|
|
98
|
+
}
|
|
99
|
+
if (state.seenBinNames.has(entry.name)) {
|
|
100
|
+
issues.push(`Package "${packageConfig.name}" declares duplicate bin name "${entry.name}"`);
|
|
101
|
+
}
|
|
102
|
+
state.seenBinNames.add(entry.name);
|
|
103
|
+
state.usedRootIds.add(entry.root);
|
|
104
|
+
state.publicRootIds.add(entry.root);
|
|
105
|
+
}
|
|
106
|
+
return issues;
|
|
107
|
+
}
|
|
108
|
+
function validateExplicitPrivateRoots(packageConfig, state) {
|
|
109
|
+
const issues = [];
|
|
110
|
+
for (const rootId of packageConfig.packageInterface.privateRoots ?? []) {
|
|
111
|
+
if (packageConfig.roots[rootId] === undefined) {
|
|
112
|
+
issues.push(`Package "${packageConfig.name}" private root "${rootId}" references unknown root "${rootId}"`);
|
|
113
|
+
}
|
|
114
|
+
if (state.seenPrivateRootIds.has(rootId)) {
|
|
115
|
+
issues.push(`Package "${packageConfig.name}" declares duplicate private root "${rootId}"`);
|
|
116
|
+
}
|
|
117
|
+
if (state.publicRootIds.has(rootId)) {
|
|
118
|
+
issues.push(`Package "${packageConfig.name}" root "${rootId}" cannot be both public and private`);
|
|
119
|
+
}
|
|
120
|
+
state.seenPrivateRootIds.add(rootId);
|
|
121
|
+
state.usedRootIds.add(rootId);
|
|
122
|
+
}
|
|
123
|
+
return issues;
|
|
124
|
+
}
|
|
125
|
+
function validateExplicitUnusedRoots(packageConfig, state) {
|
|
126
|
+
return Object.keys(packageConfig.roots).flatMap((rootId) => {
|
|
127
|
+
if (state.usedRootIds.has(rootId)) {
|
|
128
|
+
return [];
|
|
129
|
+
}
|
|
130
|
+
return [`Package "${packageConfig.name}" defines unused root "${rootId}" in explicit mode`];
|
|
131
|
+
});
|
|
132
|
+
}
|
|
133
|
+
function validateExplicitRootConfiguration(packageConfig) {
|
|
134
|
+
const state = createExplicitValidationState();
|
|
135
|
+
return [
|
|
136
|
+
...validateExplicitModules(packageConfig, state),
|
|
137
|
+
...validateExplicitBins(packageConfig, state),
|
|
138
|
+
...validateExplicitPrivateRoots(packageConfig, state),
|
|
139
|
+
...validateExplicitUnusedRoots(packageConfig, state)
|
|
140
|
+
];
|
|
141
|
+
}
|
|
142
|
+
function buildMutualExclusionIssues(packageName, defaultModuleRoot) {
|
|
143
|
+
if (defaultModuleRoot === undefined) {
|
|
144
|
+
return [];
|
|
145
|
+
}
|
|
146
|
+
return [
|
|
147
|
+
[
|
|
148
|
+
`Package "${packageName}" cannot combine defaultModuleRoot with packageInterface;`,
|
|
149
|
+
'remove defaultModuleRoot in explicit mode'
|
|
150
|
+
].join(' ')
|
|
151
|
+
];
|
|
152
|
+
}
|
|
153
|
+
function validateRootConfiguration(packageConfig) {
|
|
154
|
+
const duplicateRootIssues = validateDuplicateRootJavaScriptTargets(packageConfig);
|
|
155
|
+
if (packageConfig.packageInterface === undefined) {
|
|
156
|
+
return [...duplicateRootIssues, ...validateImplicitRootConfiguration(packageConfig)];
|
|
157
|
+
}
|
|
158
|
+
const packageConfigWithBothFields = packageConfig;
|
|
159
|
+
const mutualExclusionIssues = buildMutualExclusionIssues(packageConfig.name, packageConfigWithBothFields.defaultModuleRoot);
|
|
160
|
+
return [...duplicateRootIssues, ...mutualExclusionIssues, ...validateExplicitRootConfiguration(packageConfig)];
|
|
161
|
+
}
|
|
162
|
+
function packageListToRecord(packages) {
|
|
163
|
+
return indexBy(packages, (packageConfig) => {
|
|
164
|
+
return packageConfig.name;
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
function validateDuplicatePackages(packages) {
|
|
168
|
+
const knownPackageNames = new Set();
|
|
169
|
+
const issues = [];
|
|
170
|
+
packages.forEach((packageConfig) => {
|
|
171
|
+
if (knownPackageNames.has(packageConfig.name)) {
|
|
172
|
+
issues.push(`Duplicate package definition with the name "${packageConfig.name}"`);
|
|
173
|
+
}
|
|
174
|
+
knownPackageNames.add(packageConfig.name);
|
|
175
|
+
});
|
|
176
|
+
return issues;
|
|
177
|
+
}
|
|
178
|
+
function validateCyclicDependencies(packageGraph) {
|
|
179
|
+
const cycles = packageGraph.detectCycles();
|
|
180
|
+
return cycles.map((cycle) => {
|
|
181
|
+
return `Unexpected cyclic dependency path: [${cycle.join('→')}]`;
|
|
182
|
+
});
|
|
183
|
+
}
|
|
184
|
+
function validatePublishSettingsArePlaced(packtoryConfig) {
|
|
185
|
+
if (packtoryConfig.commonPackageSettings?.publishSettings !== undefined) {
|
|
186
|
+
return [];
|
|
187
|
+
}
|
|
188
|
+
const everyPackageHasIt = packtoryConfig.packages.every((packageConfig) => {
|
|
189
|
+
return packageConfig.publishSettings !== undefined;
|
|
190
|
+
});
|
|
191
|
+
if (everyPackageHasIt) {
|
|
192
|
+
return [];
|
|
193
|
+
}
|
|
194
|
+
return ['publishSettings must be set in commonPackageSettings or in every package'];
|
|
195
|
+
}
|
|
196
|
+
function validatePackageSurfaceRules(packageConfigs) {
|
|
197
|
+
return Object.values(packageConfigs).flatMap(validateRootConfiguration);
|
|
198
|
+
}
|
|
199
|
+
function validateAllowScriptsConsistency(packtoryConfig) {
|
|
200
|
+
const commonAttributes = packtoryConfig.commonPackageSettings?.additionalPackageJsonAttributes;
|
|
201
|
+
const commonPublishSettings = packtoryConfig.commonPackageSettings?.publishSettings;
|
|
202
|
+
return packtoryConfig.packages.flatMap((packageConfig) => {
|
|
203
|
+
const mergedAttributes = { ...commonAttributes, ...packageConfig.additionalPackageJsonAttributes };
|
|
204
|
+
const resolvedPublishSettings = packageConfig.publishSettings ?? commonPublishSettings;
|
|
205
|
+
if (!('scripts' in mergedAttributes)) {
|
|
206
|
+
return [];
|
|
207
|
+
}
|
|
208
|
+
if (resolvedPublishSettings?.allowScripts === true) {
|
|
209
|
+
return [];
|
|
210
|
+
}
|
|
211
|
+
const prefix = `Package "${packageConfig.name}": "scripts" in additionalPackageJsonAttributes`;
|
|
212
|
+
return [`${prefix} requires "publishSettings.allowScripts: true"`];
|
|
213
|
+
});
|
|
214
|
+
}
|
|
215
|
+
function validatePreGraphGenerationWithSchema(schema, config) {
|
|
216
|
+
const schemaValidationResult = safeParse(schema, config);
|
|
217
|
+
if (!schemaValidationResult.success) {
|
|
218
|
+
return Result.err(schemaValidationResult.error.issues);
|
|
219
|
+
}
|
|
220
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- callers bind the expected config type for this schema
|
|
221
|
+
const packtoryConfig = schemaValidationResult.data;
|
|
222
|
+
const packageConfigs = packageListToRecord(packtoryConfig.packages);
|
|
223
|
+
const preGraphIssues = [
|
|
224
|
+
...validatePublishSettingsArePlaced(packtoryConfig),
|
|
225
|
+
...validateAllowScriptsConsistency(packtoryConfig),
|
|
226
|
+
...validateDependenciesExist(packageConfigs),
|
|
227
|
+
...validatePackageSurfaceRules(packageConfigs)
|
|
228
|
+
];
|
|
229
|
+
if (preGraphIssues.length > 0) {
|
|
230
|
+
return Result.err([...validateDuplicatePackages(packtoryConfig.packages), ...preGraphIssues]);
|
|
231
|
+
}
|
|
232
|
+
return Result.ok({
|
|
233
|
+
packtoryConfig,
|
|
234
|
+
packageConfigs
|
|
235
|
+
});
|
|
236
|
+
}
|
|
237
|
+
function finalizeValidation(result) {
|
|
238
|
+
if (result.isErr) {
|
|
239
|
+
return Result.err(result.error);
|
|
240
|
+
}
|
|
241
|
+
const { packageConfigs, packtoryConfig } = result.value;
|
|
242
|
+
const packageGraph = buildPackageGraph(packageConfigs);
|
|
243
|
+
const issues = Array.from(validateDuplicatePackages(packtoryConfig.packages));
|
|
244
|
+
issues.push(...validateCyclicDependencies(packageGraph));
|
|
245
|
+
if (issues.length > 0) {
|
|
246
|
+
return Result.err(issues);
|
|
247
|
+
}
|
|
248
|
+
return Result.ok({
|
|
249
|
+
packtoryConfig,
|
|
250
|
+
packageConfigs,
|
|
251
|
+
packageGraph
|
|
252
|
+
});
|
|
253
|
+
}
|
|
254
|
+
export function validateConfig(config) {
|
|
255
|
+
const result = validatePreGraphGenerationWithSchema(packtoryConfigSchema, config);
|
|
256
|
+
return finalizeValidation(result);
|
|
257
|
+
}
|
|
258
|
+
export function validateConfigWithoutRegistry(config) {
|
|
259
|
+
const result = validatePreGraphGenerationWithSchema(packtoryConfigWithoutRegistrySchema, config);
|
|
260
|
+
return finalizeValidation(result);
|
|
261
|
+
}
|
|
8
262
|
//# sourceMappingURL=validation.js.map
|
package/config/validation.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../source/config/validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW;
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../source/config/validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { z } from 'zod/mini';
|
|
2
2
|
import { automaticVersioningSettingsSchema } from "./automatic-versioning-settings.js";
|
|
3
3
|
import { manualVersioningSettingsSchema } from "./manual-versioning-settings.js";
|
|
4
|
+
export const versioningSettingsSchema = z.readonly(z.discriminatedUnion('automatic', [automaticVersioningSettingsSchema, manualVersioningSettingsSchema]));
|
|
4
5
|
//# sourceMappingURL=versioning-settings.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versioning-settings.js","sourceRoot":"","sources":["../../../../source/config/versioning-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,UAAU;
|
|
1
|
+
{"version":3,"file":"versioning-settings.js","sourceRoot":"","sources":["../../../../source/config/versioning-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,UAAU,CAAC;AAC7B,OAAO,EAAE,iCAAiC,EAAE,MAAM,oCAAoC,CAAC;AACvF,OAAO,EAAE,8BAA8B,EAAE,MAAM,iCAAiC,CAAC;AAEjF,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,CAAC,QAAQ,CAC9C,CAAC,CAAC,kBAAkB,CAAC,WAAW,EAAE,CAAC,iCAAiC,EAAE,8BAA8B,CAAC,CAAC,CACzG,CAAC"}
|
|
@@ -17,13 +17,4 @@ export type AnalyzedBundle = Except<LinkedBundle, 'contents'> & {
|
|
|
17
17
|
readonly contents: readonly AnalyzedBundleResource[];
|
|
18
18
|
readonly sideEffectsField: readonly string[] | false | undefined;
|
|
19
19
|
};
|
|
20
|
-
export type EliminationInput = {
|
|
21
|
-
readonly bundle: LinkedBundle;
|
|
22
|
-
readonly transformationsEnabled: boolean;
|
|
23
|
-
readonly deadCodeElimination?: DeadCodeEliminationSettings | undefined;
|
|
24
|
-
};
|
|
25
|
-
export type DeadCodeEliminator = {
|
|
26
|
-
eliminate: (inputs: readonly EliminationInput[]) => Promise<readonly AnalyzedBundle[]>;
|
|
27
|
-
};
|
|
28
|
-
export declare function createEmptyFileAnalysis(): FileAnalysis;
|
|
29
20
|
//# sourceMappingURL=analyzed-bundle.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyzed-bundle.d.ts","sourceRoot":"","sources":["../../../../source/dead-code-eliminator/analyzed-bundle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW
|
|
1
|
+
{"version":3,"file":"analyzed-bundle.d.ts","sourceRoot":"","sources":["../../../../source/dead-code-eliminator/analyzed-bundle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW;AACvC,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,6CAA6C;AAC9F,OAAO,KAAK,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,4BAA4B;AAEpF,MAAM,MAAM,mBAAmB,GAAG;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,MAAM,YAAY,GAAG;IACvB,QAAQ,CAAC,iBAAiB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAChD,QAAQ,CAAC,oBAAoB,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAC9D,QAAQ,CAAC,iBAAiB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CACnD;AAED,MAAM,MAAM,sBAAsB,GAAG,oBAAoB,GAAG;IACxD,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC;CACnC;AAED,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC,GAAG;IAC5D,QAAQ,CAAC,QAAQ,EAAE,SAAS,sBAAsB,EAAE,CAAC;IACrD,QAAQ,CAAC,gBAAgB,EAAE,SAAS,MAAM,EAAE,GAAG,KAAK,GAAG,SAAS,CAAC;CACpE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyzed-bundle.js","sourceRoot":"","sources":["../../../../source/dead-code-eliminator/analyzed-bundle.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"analyzed-bundle.js","sourceRoot":"","sources":["../../../../source/dead-code-eliminator/analyzed-bundle.ts"],"names":[],"mappings":"AAkCA,MAAM,UAAU,uBAAuB;IACnC,OAAO;QACH,iBAAiB,EAAE,IAAI,GAAG,EAAU;QACpC,oBAAoB,EAAE,EAAE;QACxB,iBAAiB,EAAE,IAAI,GAAG,EAAU;KACvC,CAAC;AACN,CAAC"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import { Node as TsMorphNode, SyntaxKind } from 'ts-morph';
|
|
1
2
|
import { createEmptyFileAnalysis } from "./analyzed-bundle.js";
|
|
2
3
|
import { maybeEmitElimination } from "./elimination-emitter.js";
|
|
3
4
|
import { buildCrossBundleSeeds } from "./cross-bundle/cross-bundle-seeds.js";
|
|
5
|
+
import { variableDeclarationSurvives } from "./variable-declaration-bindings.js";
|
|
4
6
|
import { loadBundle } from "./load-bundle.js";
|
|
5
7
|
import { bindingId } from "./reachability/reachability.js";
|
|
6
8
|
import { classifySideEffects } from "./side-effect-classifier.js";
|
|
@@ -16,9 +18,18 @@ function allBindingNamesFor(loaded) {
|
|
|
16
18
|
}
|
|
17
19
|
function reachableBindingsFor(loaded, reachable) {
|
|
18
20
|
const { sourceFilePath } = loaded.resource.fileDescription;
|
|
19
|
-
const
|
|
21
|
+
const directlyReachable = new Set();
|
|
20
22
|
for (const binding of loaded.bindings) {
|
|
21
23
|
if (reachable.has(bindingId(sourceFilePath, binding.name))) {
|
|
24
|
+
directlyReachable.add(binding.name);
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
const surviving = new Set(directlyReachable);
|
|
28
|
+
for (const binding of loaded.bindings) {
|
|
29
|
+
const declarator = TsMorphNode.isVariableDeclaration(binding.declarationNode)
|
|
30
|
+
? binding.declarationNode
|
|
31
|
+
: binding.declarationNode.getFirstAncestorByKind(SyntaxKind.VariableDeclaration);
|
|
32
|
+
if (declarator !== undefined && variableDeclarationSurvives(declarator, directlyReachable)) {
|
|
22
33
|
surviving.add(binding.name);
|
|
23
34
|
}
|
|
24
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eliminator.js","sourceRoot":"","sources":["../../../../source/dead-code-eliminator/eliminator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"eliminator.js","sourceRoot":"","sources":["../../../../source/dead-code-eliminator/eliminator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,15 @@
|
|
|
1
|
-
import { isCodeFile } from "../common/code-files.js";
|
|
1
|
+
import { isCodeFile, isDeclarationCodeFile } from "../common/code-files.js";
|
|
2
2
|
import { getEntryRootIds } from "../package-surface/modules.js";
|
|
3
3
|
import { extractTopLevelBindings } from "./reachability/binding-extractor.js";
|
|
4
4
|
import { buildReachabilityIndex } from "./reachability/reachability.js";
|
|
5
|
-
function
|
|
5
|
+
function projectForResource(runtimeProject, declarationProject, resource) {
|
|
6
|
+
return isDeclarationCodeFile(resource.fileDescription.targetFilePath) ? declarationProject : runtimeProject;
|
|
7
|
+
}
|
|
8
|
+
function loadResource(runtimeProject, declarationProject, resource) {
|
|
6
9
|
if (!isCodeFile(resource.fileDescription.targetFilePath)) {
|
|
7
10
|
return { resource };
|
|
8
11
|
}
|
|
12
|
+
const project = projectForResource(runtimeProject, declarationProject, resource);
|
|
9
13
|
const sourceFile = project.createSourceFile(resource.fileDescription.sourceFilePath, resource.fileDescription.content);
|
|
10
14
|
return { resource, sourceFile, bindings: extractTopLevelBindings(sourceFile) };
|
|
11
15
|
}
|
|
@@ -38,9 +42,10 @@ function entryRootFilePathsFor(bundle) {
|
|
|
38
42
|
return paths;
|
|
39
43
|
}
|
|
40
44
|
export function loadBundle(createProject, input) {
|
|
41
|
-
const
|
|
45
|
+
const runtimeProject = createProject();
|
|
46
|
+
const declarationProject = createProject();
|
|
42
47
|
const loaded = input.bundle.contents.map((resource) => {
|
|
43
|
-
return loadResource(
|
|
48
|
+
return loadResource(runtimeProject, declarationProject, resource);
|
|
44
49
|
});
|
|
45
50
|
const fileBindings = buildFileBindings(loaded);
|
|
46
51
|
const reachability = buildReachabilityIndex({
|
|
@@ -48,6 +53,6 @@ export function loadBundle(createProject, input) {
|
|
|
48
53
|
entryPointFilePaths: entryRootFilePathsFor(input.bundle),
|
|
49
54
|
deadCodeElimination: input.deadCodeElimination
|
|
50
55
|
});
|
|
51
|
-
return { input,
|
|
56
|
+
return { input, loaded, fileBindings, reachability };
|
|
52
57
|
}
|
|
53
58
|
//# sourceMappingURL=load-bundle.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-bundle.js","sourceRoot":"","sources":["../../../../source/dead-code-eliminator/load-bundle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"load-bundle.js","sourceRoot":"","sources":["../../../../source/dead-code-eliminator/load-bundle.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Node as TsMorphNode } from 'ts-morph';
|
|
2
|
+
import { collectVariableDeclarationBindings } from "../variable-declaration-bindings.js";
|
|
2
3
|
function isNamedDeclaration(statement) {
|
|
3
4
|
return (TsMorphNode.isFunctionDeclaration(statement) ||
|
|
4
5
|
TsMorphNode.isClassDeclaration(statement) ||
|
|
@@ -13,12 +14,20 @@ function bindingsFromNamedDeclaration(statement) {
|
|
|
13
14
|
return [];
|
|
14
15
|
}
|
|
15
16
|
const isExported = statement.isExported() || statement.isDefaultExport();
|
|
16
|
-
return [{ name, isExported, statement, declarationNode: statement }];
|
|
17
|
+
return [{ name, isExported, statement, declarationNode: statement, referenceNode: statement }];
|
|
17
18
|
}
|
|
18
19
|
function bindingsFromVariableStatement(statement) {
|
|
19
20
|
const isExported = statement.isExported();
|
|
20
|
-
return statement.getDeclarations().
|
|
21
|
-
return
|
|
21
|
+
return statement.getDeclarations().flatMap((declarator) => {
|
|
22
|
+
return collectVariableDeclarationBindings(declarator).map((binding) => {
|
|
23
|
+
return {
|
|
24
|
+
name: binding.name,
|
|
25
|
+
isExported,
|
|
26
|
+
statement,
|
|
27
|
+
declarationNode: binding.declarationNode,
|
|
28
|
+
referenceNode: binding.referenceNode
|
|
29
|
+
};
|
|
30
|
+
});
|
|
22
31
|
});
|
|
23
32
|
}
|
|
24
33
|
function localNameOfNamedImport(namedImport) {
|
|
@@ -32,7 +41,8 @@ function bindingsFromImportDeclaration(statement) {
|
|
|
32
41
|
name: defaultImport.getText(),
|
|
33
42
|
isExported: false,
|
|
34
43
|
statement,
|
|
35
|
-
declarationNode: defaultImport.getParent()
|
|
44
|
+
declarationNode: defaultImport.getParent(),
|
|
45
|
+
referenceNode: defaultImport.getParent()
|
|
36
46
|
});
|
|
37
47
|
}
|
|
38
48
|
const namespaceImport = statement.getNamespaceImport();
|
|
@@ -41,7 +51,8 @@ function bindingsFromImportDeclaration(statement) {
|
|
|
41
51
|
name: namespaceImport.getText(),
|
|
42
52
|
isExported: false,
|
|
43
53
|
statement,
|
|
44
|
-
declarationNode: namespaceImport.getParent()
|
|
54
|
+
declarationNode: namespaceImport.getParent(),
|
|
55
|
+
referenceNode: namespaceImport.getParent()
|
|
45
56
|
});
|
|
46
57
|
}
|
|
47
58
|
for (const namedImport of statement.getNamedImports()) {
|
|
@@ -49,7 +60,8 @@ function bindingsFromImportDeclaration(statement) {
|
|
|
49
60
|
name: localNameOfNamedImport(namedImport),
|
|
50
61
|
isExported: false,
|
|
51
62
|
statement,
|
|
52
|
-
declarationNode: namedImport
|
|
63
|
+
declarationNode: namedImport,
|
|
64
|
+
referenceNode: namedImport
|
|
53
65
|
});
|
|
54
66
|
}
|
|
55
67
|
return result;
|
|
@@ -63,7 +75,8 @@ function bindingsFromExportAssignment(statement) {
|
|
|
63
75
|
name: 'default',
|
|
64
76
|
isExported: true,
|
|
65
77
|
statement,
|
|
66
|
-
declarationNode: statement
|
|
78
|
+
declarationNode: statement,
|
|
79
|
+
referenceNode: statement
|
|
67
80
|
}
|
|
68
81
|
];
|
|
69
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"binding-extractor.js","sourceRoot":"","sources":["../../../../../source/dead-code-eliminator/reachability/binding-extractor.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,IAAI,IAAI,WAAW,EAYtB,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"binding-extractor.js","sourceRoot":"","sources":["../../../../../source/dead-code-eliminator/reachability/binding-extractor.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ function buildNodeById(files) {
|
|
|
27
27
|
const map = new Map();
|
|
28
28
|
for (const file of files) {
|
|
29
29
|
for (const binding of file.bindings) {
|
|
30
|
-
map.set(bindingId(file.sourceFilePath, binding.name), binding.
|
|
30
|
+
map.set(bindingId(file.sourceFilePath, binding.name), binding.referenceNode);
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
33
|
return map;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reachability.js","sourceRoot":"","sources":["../../../../../source/dead-code-eliminator/reachability/reachability.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA8E,MAAM,UAAU,CAAC;AAGlH,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAuBjE,MAAM,UAAU,SAAS,CAAC,QAAgB,EAAE,IAAY;IACpD,OAAO,GAAG,QAAQ,KAAK,IAAI,EAAE,CAAC;AAClC,CAAC;AAED,SAAS,yBAAyB,CAAC,KAA8B;IAC7D,MAAM,KAAK,GAAG,IAAI,GAAG,EAAuB,CAAC;IAC7C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,SAAS,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACrF,CAAC;IACL,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,mBAAmB,CAAC,KAA8B;IACvD,MAAM,GAAG,GAAG,IAAI,GAAG,EAAuB,CAAC;IAC3C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,MAAM,GAAG,GAAG,IAAI,GAAG,EAAU,CAAC;QAC9B,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1D,CAAC;QACD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,GAAG,CAAC;AACf,CAAC;AAED,SAAS,aAAa,CAAC,KAA8B;IACjD,MAAM,GAAG,GAAG,IAAI,GAAG,EAAuB,CAAC;IAC3C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"reachability.js","sourceRoot":"","sources":["../../../../../source/dead-code-eliminator/reachability/reachability.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Node as TsMorphNode, SyntaxKind } from 'ts-morph';
|
|
2
|
+
import { variableDeclarationSurvives } from "../variable-declaration-bindings.js";
|
|
2
3
|
const namedDeclarationKinds = new Set([
|
|
3
4
|
SyntaxKind.FunctionDeclaration,
|
|
4
5
|
SyntaxKind.ClassDeclaration,
|
|
@@ -23,7 +24,7 @@ function captureNamedDeclarationSurvivor(statement, survivingNames) {
|
|
|
23
24
|
function captureVariableStatementSurvivors(statement, survivingNames) {
|
|
24
25
|
const declarators = statement.getDeclarations();
|
|
25
26
|
const survivingDeclarators = declarators.filter((declarator) => {
|
|
26
|
-
return
|
|
27
|
+
return variableDeclarationSurvives(declarator, survivingNames);
|
|
27
28
|
});
|
|
28
29
|
if (survivingDeclarators.length === declarators.length) {
|
|
29
30
|
return [captureSurvivor(statement)];
|
|
@@ -56,7 +57,7 @@ function processVariableStatement(statement, survivingNames) {
|
|
|
56
57
|
}
|
|
57
58
|
let mutated = false;
|
|
58
59
|
for (const declarator of statement.getDeclarations()) {
|
|
59
|
-
if (!
|
|
60
|
+
if (!variableDeclarationSurvives(declarator, survivingNames)) {
|
|
60
61
|
declarator.remove();
|
|
61
62
|
mutated = true;
|
|
62
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"declaration-remover.js","sourceRoot":"","sources":["../../../../../source/dead-code-eliminator/transform/declaration-remover.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,IAAI,IAAI,WAAW,EACnB,UAAU,EAKb,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"declaration-remover.js","sourceRoot":"","sources":["../../../../../source/dead-code-eliminator/transform/declaration-remover.ts"],"names":[],"mappings":"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"}
|