packtory 0.0.52 → 0.0.53
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.js +1 -1
- package/artifacts/artifacts-builder.js.map +1 -1
- package/artifacts/content-collection.js +10 -10
- package/artifacts/content-collection.js.map +1 -1
- package/bundle-emitter/emitter.d.ts +6 -3
- package/bundle-emitter/emitter.d.ts.map +1 -1
- package/bundle-emitter/emitter.js +4 -3
- package/bundle-emitter/emitter.js.map +1 -1
- package/bundle-emitter/publication-outcome.d.ts +7 -3
- package/bundle-emitter/publication-outcome.d.ts.map +1 -1
- package/bundle-emitter/publication-outcome.js.map +1 -1
- package/bundle-emitter/publish-error/file-mode-error-matching.js.map +1 -1
- package/bundle-emitter/publish-error/publish-error-messages.js +1 -1
- package/bundle-emitter/publish-error/publish-error-messages.js.map +1 -1
- package/bundle-emitter/registry/metadata-auth-retry.js +1 -1
- package/bundle-emitter/registry/metadata-auth-retry.js.map +1 -1
- package/bundle-emitter/registry/oidc-token-exchange.js +3 -2
- package/bundle-emitter/registry/oidc-token-exchange.js.map +1 -1
- package/bundle-emitter/registry/package-metadata-fetcher.d.ts +2 -0
- package/bundle-emitter/registry/package-metadata-fetcher.d.ts.map +1 -1
- package/bundle-emitter/registry/package-metadata-fetcher.js +38 -26
- package/bundle-emitter/registry/package-metadata-fetcher.js.map +1 -1
- package/bundle-emitter/registry/registry-auth-config.d.ts +3 -0
- package/bundle-emitter/registry/registry-auth-config.d.ts.map +1 -0
- package/bundle-emitter/registry/registry-auth-config.js +12 -8
- package/bundle-emitter/registry/registry-auth-config.js.map +1 -1
- package/bundle-emitter/registry/registry-client.d.ts.map +1 -1
- package/bundle-emitter/registry/registry-client.js +27 -15
- package/bundle-emitter/registry/registry-client.js.map +1 -1
- package/bundle-emitter/registry/registry-response-schemas.js +6 -0
- package/bundle-emitter/registry/registry-response-schemas.js.map +1 -1
- package/bundle-emitter/registry/validate-tarball-host.js +4 -2
- package/bundle-emitter/registry/validate-tarball-host.js.map +1 -1
- package/bundle-emitter/release-artifact-canonicalizer.js +12 -10
- package/bundle-emitter/release-artifact-canonicalizer.js.map +1 -1
- package/bundle-emitter/repository-coherence.js.map +1 -1
- package/checks/check-runner.js +1 -1
- package/checks/check-runner.js.map +1 -1
- package/checks/rules/are-the-types-wrong.js +26 -19
- package/checks/rules/are-the-types-wrong.js.map +1 -1
- package/checks/rules/duplicate-detection.js +3 -3
- package/checks/rules/duplicate-detection.js.map +1 -1
- package/checks/rules/duplicate-messages.js +3 -3
- package/checks/rules/duplicate-messages.js.map +1 -1
- package/checks/rules/max-bundle-size.js +24 -12
- package/checks/rules/max-bundle-size.js.map +1 -1
- package/checks/rules/no-dev-dependency-imports.js +23 -8
- package/checks/rules/no-dev-dependency-imports.js.map +1 -1
- package/checks/rules/no-duplicated-files.js +20 -8
- package/checks/rules/no-duplicated-files.js.map +1 -1
- package/checks/rules/no-side-effects.js +3 -3
- package/checks/rules/no-side-effects.js.map +1 -1
- package/checks/rules/no-unused-bundle-dependencies.js +3 -2
- package/checks/rules/no-unused-bundle-dependencies.js.map +1 -1
- package/checks/rules/required-files.js +5 -5
- package/checks/rules/required-files.js.map +1 -1
- package/checks/rules/unique-target-paths.js +4 -4
- package/checks/rules/unique-target-paths.js.map +1 -1
- package/common/bundled-dependency-groups.js +1 -1
- package/common/bundled-dependency-groups.js.map +1 -1
- package/common/code-files.js +1 -1
- package/common/code-files.js.map +1 -1
- package/common/max-date.js +1 -1
- package/common/max-date.js.map +1 -1
- package/common/package-layout.js +10 -14
- package/common/package-layout.js.map +1 -1
- package/common/package-name-map.js.map +1 -1
- package/common/schema-validation.js +3 -3
- package/common/schema-validation.js.map +1 -1
- package/common/stable-json.js +6 -5
- package/common/stable-json.js.map +1 -1
- package/config/additional-package-json-attributes-schema.js +1 -1
- package/config/additional-package-json-attributes-schema.js.map +1 -1
- package/config/changelog-settings.js +24 -17
- package/config/changelog-settings.js.map +1 -1
- package/config/checks-schema.d.ts +46 -46
- package/config/checks-schema.d.ts.map +1 -1
- package/config/checks-schema.js +4 -4
- package/config/checks-schema.js.map +1 -1
- package/config/cross-package-validation.js +2 -2
- package/config/cross-package-validation.js.map +1 -1
- package/config/dead-code-elimination-settings.d.ts +2 -2
- package/config/dead-code-elimination-settings.d.ts.map +1 -1
- package/config/dead-code-elimination-settings.js +2 -2
- package/config/dead-code-elimination-settings.js.map +1 -1
- package/config/dependency-existence-validation.js +2 -1
- package/config/dependency-existence-validation.js.map +1 -1
- package/config/main-package-json-schema.js.map +1 -1
- package/config/manual-versioning-settings.d.ts +3 -3
- package/config/manual-versioning-settings.d.ts.map +1 -1
- package/config/manual-versioning-settings.js +1 -1
- package/config/manual-versioning-settings.js.map +1 -1
- package/config/package-interface.js +2 -2
- package/config/package-interface.js.map +1 -1
- package/config/package-json.js.map +1 -1
- package/config/packtory-config-without-registry-schema.js.map +1 -1
- package/config/pre-graph-validation.js +1 -1
- package/config/pre-graph-validation.js.map +1 -1
- package/config/publish-settings.report.js.map +1 -1
- package/config/registry-settings.js.map +1 -1
- package/config/registry-settings.report.js +16 -10
- package/config/registry-settings.report.js.map +1 -1
- package/config/root-config-validation.js +57 -46
- package/config/root-config-validation.js.map +1 -1
- package/config/settings-validation.js +3 -3
- package/config/settings-validation.js.map +1 -1
- package/config/validation.js +4 -1
- package/config/validation.js.map +1 -1
- package/config/versioning-settings.js +2 -2
- package/config/versioning-settings.js.map +1 -1
- package/dead-code-eliminator/class-purity.js +1 -1
- package/dead-code-eliminator/class-purity.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/cross-bundle/bundle-index.js +1 -1
- package/dead-code-eliminator/cross-bundle/bundle-index.js.map +1 -1
- package/dead-code-eliminator/cross-bundle/cross-bundle-seeds.js +2 -2
- package/dead-code-eliminator/cross-bundle/cross-bundle-seeds.js.map +1 -1
- package/dead-code-eliminator/cross-bundle/import-export-walker.js +21 -16
- package/dead-code-eliminator/cross-bundle/import-export-walker.js.map +1 -1
- package/dead-code-eliminator/cross-bundle/seed-store.js +8 -4
- package/dead-code-eliminator/cross-bundle/seed-store.js.map +1 -1
- package/dead-code-eliminator/elimination-emitter.js +3 -3
- package/dead-code-eliminator/elimination-emitter.js.map +1 -1
- package/dead-code-eliminator/eliminator.js +5 -5
- package/dead-code-eliminator/eliminator.js.map +1 -1
- package/dead-code-eliminator/imported-expression-origin.js +2 -2
- package/dead-code-eliminator/imported-expression-origin.js.map +1 -1
- package/dead-code-eliminator/load-bundle.js +1 -1
- package/dead-code-eliminator/load-bundle.js.map +1 -1
- package/dead-code-eliminator/pure-expression.js +4 -4
- package/dead-code-eliminator/pure-expression.js.map +1 -1
- package/dead-code-eliminator/reachability/bfs-closure.js +41 -37
- package/dead-code-eliminator/reachability/bfs-closure.js.map +1 -1
- package/dead-code-eliminator/reachability/binding-extractor.js +2 -2
- package/dead-code-eliminator/reachability/binding-extractor.js.map +1 -1
- package/dead-code-eliminator/reachability/identifier-target-collector.js +19 -15
- package/dead-code-eliminator/reachability/identifier-target-collector.js.map +1 -1
- package/dead-code-eliminator/reachability/impure-statements.js +1 -1
- package/dead-code-eliminator/reachability/impure-statements.js.map +1 -1
- package/dead-code-eliminator/reachability/local-seed-gathering.js +28 -21
- package/dead-code-eliminator/reachability/local-seed-gathering.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/side-effect-classifier.js +1 -1
- package/dead-code-eliminator/side-effect-classifier.js.map +1 -1
- package/dead-code-eliminator/side-effects-field.js +3 -4
- package/dead-code-eliminator/side-effects-field.js.map +1 -1
- package/dead-code-eliminator/source-map-recomposition.js +3 -3
- package/dead-code-eliminator/source-map-recomposition.js.map +1 -1
- package/dead-code-eliminator/transform/atom-translator.js +1 -1
- package/dead-code-eliminator/transform/atom-translator.js.map +1 -1
- package/dead-code-eliminator/transform/declaration-remover.js +2 -2
- package/dead-code-eliminator/transform/declaration-remover.js.map +1 -1
- package/dead-code-eliminator/transform/line-index.js +1 -1
- package/dead-code-eliminator/transform/line-index.js.map +1 -1
- package/dead-code-eliminator/transform/source-map-composer.js +1 -1
- package/dead-code-eliminator/transform/source-map-composer.js.map +1 -1
- package/dead-code-eliminator/transform/survivor-capture.js +1 -1
- package/dead-code-eliminator/transform/survivor-capture.js.map +1 -1
- package/dead-code-eliminator/variable-declaration-bindings.js +4 -4
- package/dead-code-eliminator/variable-declaration-bindings.js.map +1 -1
- package/dependency-scanner/dependency-graph.js +34 -42
- package/dependency-scanner/dependency-graph.js.map +1 -1
- package/dependency-scanner/external-dependencies.js +1 -1
- package/dependency-scanner/external-dependencies.js.map +1 -1
- package/dependency-scanner/host-method-binding.js +1 -1
- package/dependency-scanner/host-method-binding.js.map +1 -1
- package/dependency-scanner/node-modules-manifest-synthesizer.js +13 -12
- package/dependency-scanner/node-modules-manifest-synthesizer.js.map +1 -1
- package/dependency-scanner/scanner.js.map +1 -1
- package/dependency-scanner/source-file-references.js +4 -2
- package/dependency-scanner/source-file-references.js.map +1 -1
- package/dependency-scanner/source-map-file-locator.js +1 -1
- package/dependency-scanner/source-map-file-locator.js.map +1 -1
- package/dependency-scanner/typescript-file-host.js +4 -4
- package/dependency-scanner/typescript-file-host.js.map +1 -1
- package/dependency-scanner/typescript-project-analyzer.js.map +1 -1
- package/dependency-scanner/virtual-package-json-host.js +4 -4
- package/dependency-scanner/virtual-package-json-host.js.map +1 -1
- package/directed-graph/graph.js +229 -175
- package/directed-graph/graph.js.map +1 -1
- package/file-manager/compare.js +1 -1
- package/file-manager/compare.js.map +1 -1
- package/file-manager/file-manager.js +1 -1
- package/file-manager/file-manager.js.map +1 -1
- package/file-manager/permissions.js.map +1 -1
- package/git/current-git-head.d.ts +1 -0
- package/git/current-git-head.js +21 -12
- package/git/current-git-head.js.map +1 -1
- package/git/git-command.js +55 -0
- package/git/git-command.js.map +1 -0
- package/linker/linked-bundle.d.ts +1 -0
- package/linker/linked-bundle.js +1 -1
- package/linker/linked-bundle.js.map +1 -1
- package/linker/linker.js +1 -1
- package/linker/linker.js.map +1 -1
- package/linker/replacement-lookup.js +4 -4
- package/linker/replacement-lookup.js.map +1 -1
- package/linker/resource-graph.js +3 -3
- package/linker/resource-graph.js.map +1 -1
- package/linker/substitute-bundles.js +2 -2
- package/linker/substitute-bundles.js.map +1 -1
- package/linker/substituted-resource-graph.js +2 -2
- package/linker/substituted-resource-graph.js.map +1 -1
- package/npm-oidc-id-token-resolver.js +7 -5
- package/npm-oidc-id-token-resolver.js.map +1 -1
- package/package-surface/explicit-bin.js +1 -1
- package/package-surface/explicit-bin.js.map +1 -1
- package/package-surface/explicit-exports.js +5 -2
- package/package-surface/explicit-exports.js.map +1 -1
- package/package-surface/export-map.js.map +1 -1
- package/package-surface/implicit-bin.js +1 -1
- package/package-surface/implicit-bin.js.map +1 -1
- package/package-surface/implicit-root-exports.js.map +1 -1
- package/package-surface/package-json-export.js +0 -1
- package/package-surface/package-json-export.js.map +1 -1
- package/package-surface/package-surface-index.js +44 -41
- package/package-surface/package-surface-index.js.map +1 -1
- package/package-surface/public-module-usage.js +25 -16
- package/package-surface/public-module-usage.js.map +1 -1
- package/package-surface/root-registry.js +5 -3
- package/package-surface/root-registry.js.map +1 -1
- package/package-surface/substitution-exports.js.map +1 -1
- package/package.json +10 -5
- package/packages/package-processor.composition.js +5 -15
- package/packages/package-processor.composition.js.map +1 -1
- package/packtory/changelog-source-attribution.js +23 -20
- package/packtory/changelog-source-attribution.js.map +1 -1
- package/packtory/generated-attribution-paths.js +9 -7
- package/packtory/generated-attribution-paths.js.map +1 -1
- package/packtory/map-config.d.ts.map +1 -1
- package/packtory/map-config.js.map +1 -1
- package/packtory/options/bundle-dependency-resolution.js +1 -1
- package/packtory/options/bundle-dependency-resolution.js.map +1 -1
- package/packtory/options/dead-code-elimination-resolution.js +1 -1
- package/packtory/options/dead-code-elimination-resolution.js.map +1 -1
- package/packtory/options/prepare-package-options.d.ts +10 -6
- package/packtory/options/prepare-package-options.d.ts.map +1 -1
- package/packtory/options/prepare-package-options.js +2 -2
- package/packtory/options/prepare-package-options.js.map +1 -1
- package/packtory/options/required-value-helpers.js.map +1 -1
- package/packtory/options/setting-resolvers.js +1 -1
- package/packtory/options/setting-resolvers.js.map +1 -1
- package/packtory/options/surface-resolution.js.map +1 -1
- package/packtory/package-processor-build.js.map +1 -1
- package/packtory/package-processor-publish.d.ts +3 -3
- package/packtory/package-processor-publish.d.ts.map +1 -1
- package/packtory/package-processor-publish.js.map +1 -1
- package/packtory/packtory-pack.js +28 -27
- package/packtory/packtory-pack.js.map +1 -1
- package/packtory/packtory-release-analysis.js +7 -4
- package/packtory/packtory-release-analysis.js.map +1 -1
- package/packtory/packtory-release-diff.js.map +1 -1
- package/packtory/packtory-release-plan.js +6 -6
- package/packtory/packtory-release-plan.js.map +1 -1
- package/packtory/packtory-results.d.ts +52 -19
- package/packtory/packtory-results.d.ts.map +1 -1
- package/packtory/packtory-results.js.map +1 -1
- package/packtory/packtory.js +16 -13
- package/packtory/packtory.js.map +1 -1
- package/packtory/partial-result.js +5 -2
- package/packtory/partial-result.js.map +1 -1
- package/packtory/published-release-state.js.map +1 -1
- package/packtory/release-analysis.js +7 -6
- package/packtory/release-analysis.js.map +1 -1
- package/packtory/release-plan.js +6 -6
- package/packtory/release-plan.js.map +1 -1
- package/packtory/resolved-package.js +5 -5
- package/packtory/resolved-package.js.map +1 -1
- package/packtory/scheduler.js +43 -51
- package/packtory/scheduler.js.map +1 -1
- package/packtory/stages/package-analysis-stage.js +2 -2
- package/packtory/stages/package-analysis-stage.js.map +1 -1
- package/packtory/stages/package-resolution-stage.js +4 -4
- package/packtory/stages/package-resolution-stage.js.map +1 -1
- package/packtory/stages/publish-stage.js +4 -4
- package/packtory/stages/publish-stage.js.map +1 -1
- package/packtory/stages/release-diff-stage.js +4 -4
- package/packtory/stages/release-diff-stage.js.map +1 -1
- package/progress/progress-broadcaster.d.ts +11 -1
- package/progress/progress-broadcaster.d.ts.map +1 -1
- package/progress/progress-broadcaster.js +5 -5
- package/progress/progress-broadcaster.js.map +1 -1
- package/published-package/published-package.d.ts +2 -2
- package/published-package/published-package.d.ts.map +1 -1
- package/published-package/published-package.js +1 -1
- package/published-package/published-package.js.map +1 -1
- package/readme.md +3 -3
- package/report/aggregator/package-report-materialization.js +3 -4
- package/report/aggregator/package-report-materialization.js.map +1 -1
- package/report/aggregator/report-aggregator.js +5 -3
- package/report/aggregator/report-aggregator.js.map +1 -1
- package/report/aggregator/report-event-handlers.js +91 -52
- package/report/aggregator/report-event-handlers.js.map +1 -1
- package/report/aggregator/report-types.d.ts.map +1 -1
- package/report/config-redactor.js +4 -2
- package/report/config-redactor.js.map +1 -1
- package/report/decorators.js +1 -1
- package/report/decorators.js.map +1 -1
- package/report/inspectors/inspect-artifact-sizes.js +5 -8
- package/report/inspectors/inspect-artifact-sizes.js.map +1 -1
- package/report/inspectors/inspect-linker-rewrites.js +2 -2
- package/report/inspectors/inspect-linker-rewrites.js.map +1 -1
- package/report/inspectors/inspect-package-json-provenance.js +2 -2
- package/report/inspectors/inspect-package-json-provenance.js.map +1 -1
- package/report/inspectors/inspect-scan-results.js +2 -2
- package/report/inspectors/inspect-scan-results.js.map +1 -1
- package/report/preview/preview-document-diff.js +4 -3
- package/report/preview/preview-document-diff.js.map +1 -1
- package/report/release-diff/file-set-diff.d.ts +11 -3
- package/report/release-diff/file-set-diff.d.ts.map +1 -1
- package/report/release-diff/file-set-diff.js +21 -6
- package/report/release-diff/file-set-diff.js.map +1 -1
- package/resource-resolver/bundle-resource-lookup.js +5 -3
- package/resource-resolver/bundle-resource-lookup.js.map +1 -1
- package/resource-resolver/content.js +6 -5
- package/resource-resolver/content.js.map +1 -1
- package/resource-resolver/resolved-bundle.d.ts +2 -2
- package/resource-resolver/resolved-bundle.d.ts.map +1 -1
- package/resource-resolver/resource-resolve-options.js.map +1 -1
- package/resource-resolver/resource-resolver.js +2 -2
- package/resource-resolver/resource-resolver.js.map +1 -1
- package/sbom/license-resolver.js +4 -2
- package/sbom/license-resolver.js.map +1 -1
- package/sbom/sbom-builder.js +8 -11
- package/sbom/sbom-builder.js.map +1 -1
- package/sbom/sbom-canonicalizer.js +1 -1
- package/sbom/sbom-canonicalizer.js.map +1 -1
- package/sbom/sbom-file.js +4 -4
- package/sbom/sbom-file.js.map +1 -1
- package/sbom/sbom-serializer.d.ts +1 -0
- package/sbom/sbom-serializer.js +2 -2
- package/sbom/sbom-serializer.js.map +1 -1
- package/sbom/tool-version.js +3 -3
- package/sbom/tool-version.js.map +1 -1
- package/sbom.cdx.json +5 -5
- package/tar/extract-tar.js +12 -9
- package/tar/extract-tar.js.map +1 -1
- package/vendor-materializer/vendor-materializer.d.ts.map +1 -1
- package/vendor-materializer/vendor-materializer.js +43 -30
- package/vendor-materializer/vendor-materializer.js.map +1 -1
- package/version-manager/dependencies/bundle-dependency-grouping.js +7 -1
- package/version-manager/dependencies/bundle-dependency-grouping.js.map +1 -1
- package/version-manager/dependencies/dependency-groups.js +2 -2
- package/version-manager/dependencies/dependency-groups.js.map +1 -1
- package/version-manager/dependencies/external-dependency-classification.js +35 -26
- package/version-manager/dependencies/external-dependency-classification.js.map +1 -1
- package/version-manager/imports/imports-key-matcher.js +6 -4
- package/version-manager/imports/imports-key-matcher.js.map +1 -1
- package/version-manager/imports/versioned-bundle-imports.js.map +1 -1
- package/version-manager/manifest/builder.js +7 -12
- package/version-manager/manifest/builder.js.map +1 -1
- package/version-manager/manifest/serialize.js.map +1 -1
- package/version-manager/optional-bundle-fields.js.map +1 -1
- package/version-manager/specifier-classifier.js +5 -5
- package/version-manager/specifier-classifier.js.map +1 -1
- package/version-manager/specifier-errors.js +20 -16
- package/version-manager/specifier-errors.js.map +1 -1
- package/version-manager/versioned-bundle.d.ts +2 -1
- package/version-manager/versioned-bundle.d.ts.map +1 -1
- package/zip/zip-builder.js +6 -4
- package/zip/zip-builder.js.map +1 -1
- package/packtory/changelog-source-attribution.d.ts +0 -4
- package/packtory/changelog-source-attribution.d.ts.map +0 -1
- package/packtory/options/version-provider-context.d.ts +0 -5
- package/packtory/options/version-provider-context.d.ts.map +0 -1
- package/packtory/options/version-trigger.d.ts +0 -5
- package/packtory/options/version-trigger.d.ts.map +0 -1
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
export function inspectPackageJsonProvenance(assembled, mainPackageJson, additionalAttributes) {
|
|
2
2
|
const result = {};
|
|
3
3
|
for (const key of Object.keys(assembled)) {
|
|
4
|
-
if (additionalAttributes !== undefined && key
|
|
4
|
+
if (additionalAttributes !== undefined && Object.hasOwn(additionalAttributes, key)) {
|
|
5
5
|
result[key] = { source: 'additionalAttributes' };
|
|
6
6
|
}
|
|
7
|
-
else if (key
|
|
7
|
+
else if (Object.hasOwn(mainPackageJson, key)) {
|
|
8
8
|
result[key] = { source: 'mainPackageJson' };
|
|
9
9
|
}
|
|
10
10
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspect-package-json-provenance.js","sourceRoot":"","sources":["../../../../../source/report/inspectors/inspect-package-json-provenance.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,4BAA4B,CACxC,SAA4C,EAC5C,eAAkD,EAClD,oBAAmE;IAEnE,MAAM,MAAM,GAAoC,EAAE,CAAC;IACnD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;QACvC,IAAI,oBAAoB,KAAK,SAAS,IAAI,
|
|
1
|
+
{"version":3,"file":"inspect-package-json-provenance.js","sourceRoot":"","sources":["../../../../../source/report/inspectors/inspect-package-json-provenance.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,4BAA4B,CACxC,SAA4C,EAC5C,eAAkD,EAClD,oBAAmE;IAEnE,MAAM,MAAM,GAAoC,EAAE,CAAC;IACnD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;QACvC,IAAI,oBAAoB,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,oBAAoB,EAAE,GAAG,CAAC,EAAE,CAAC;YACjF,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,sBAAsB,EAAE,CAAC;QACrD,CAAC;aAAM,IAAI,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,GAAG,CAAC,EAAE,CAAC;YAC7C,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC;QAChD,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;QACxC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
export function inspectScanResults(bundle) {
|
|
2
|
-
const included = bundle.contents.map((entry)
|
|
2
|
+
const included = bundle.contents.map(function (entry) {
|
|
3
3
|
return {
|
|
4
4
|
path: entry.fileDescription.sourceFilePath,
|
|
5
5
|
reason: 'reachable-from-entry'
|
|
6
6
|
};
|
|
7
7
|
});
|
|
8
|
-
const excluded = Array.from(bundle.externalDependencies.keys(), (specifier)
|
|
8
|
+
const excluded = Array.from(bundle.externalDependencies.keys(), function (specifier) {
|
|
9
9
|
return {
|
|
10
10
|
specifier,
|
|
11
11
|
reason: 'external-module'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspect-scan-results.js","sourceRoot":"","sources":["../../../../../source/report/inspectors/inspect-scan-results.ts"],"names":[],"mappings":"AAYA,MAAM,UAAU,kBAAkB,CAAC,MAA2B;IAC1D,MAAM,QAAQ,GAAmB,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"inspect-scan-results.js","sourceRoot":"","sources":["../../../../../source/report/inspectors/inspect-scan-results.ts"],"names":[],"mappings":"AAYA,MAAM,UAAU,kBAAkB,CAAC,MAA2B;IAC1D,MAAM,QAAQ,GAAmB,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,KAAK;QAChE,OAAO;YACH,IAAI,EAAE,KAAK,CAAC,eAAe,CAAC,cAAc;YAC1C,MAAM,EAAE,sBAAsB;SACjC,CAAC;IACN,CAAC,CAAC,CAAC;IACH,MAAM,QAAQ,GAAmB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,IAAI,EAAE,EAAE,UAAU,SAAS;QAC/F,OAAO;YACH,SAAS;YACT,MAAM,EAAE,iBAAiB;SAC5B,CAAC;IACN,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;AAClC,CAAC"}
|
|
@@ -22,11 +22,12 @@ function toDiffLineType(line) {
|
|
|
22
22
|
export function toPreviewDiffHunk(hunk) {
|
|
23
23
|
return {
|
|
24
24
|
header: `@@ -${hunk.oldStart},${hunk.oldLines} +${hunk.newStart},${hunk.newLines} @@`,
|
|
25
|
-
lines: hunk
|
|
26
|
-
.
|
|
25
|
+
lines: hunk
|
|
26
|
+
.lines
|
|
27
|
+
.filter(function (line) {
|
|
27
28
|
return !line.startsWith('\\');
|
|
28
29
|
})
|
|
29
|
-
.map((line)
|
|
30
|
+
.map(function (line) {
|
|
30
31
|
return { type: toDiffLineType(line), text: line };
|
|
31
32
|
})
|
|
32
33
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preview-document-diff.js","sourceRoot":"","sources":["../../../../../source/report/preview/preview-document-diff.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAGxD,MAAM,CAAC,MAAM,mBAAmB,GAAG;IAC/B,GAAG,EAAE,KAAK;IACV,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,QAAQ;CACV,CAAC;AAgBX,MAAM,UAAU,kBAAkB,CAAC,KAAoB;IACnD,OAAO,CACH,KAAK,CAAC,UAAU,KAAK,SAAS;QAC9B,KAAK,CAAC,MAAM,KAAK,SAAS;QAC1B,KAAK,CAAC,IAAI,KAAK,QAAQ;QACvB,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CACzB,CAAC;AACN,CAAC;AAED,SAAS,cAAc,CAAC,IAAY;IAChC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,mBAAmB,CAAC,GAAG,CAAC;IACnC,CAAC;IACD,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,mBAAmB,CAAC,MAAM,CAAC;IACtC,CAAC;IACD,OAAO,mBAAmB,CAAC,OAAO,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,IAAoB;IAClD,OAAO;QACH,MAAM,EAAE,OAAO,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,KAAK;QACrF,KAAK,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"preview-document-diff.js","sourceRoot":"","sources":["../../../../../source/report/preview/preview-document-diff.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAGxD,MAAM,CAAC,MAAM,mBAAmB,GAAG;IAC/B,GAAG,EAAE,KAAK;IACV,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,QAAQ;CACV,CAAC;AAgBX,MAAM,UAAU,kBAAkB,CAAC,KAAoB;IACnD,OAAO,CACH,KAAK,CAAC,UAAU,KAAK,SAAS;QAC9B,KAAK,CAAC,MAAM,KAAK,SAAS;QAC1B,KAAK,CAAC,IAAI,KAAK,QAAQ;QACvB,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CACzB,CAAC;AACN,CAAC;AAED,SAAS,cAAc,CAAC,IAAY;IAChC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,mBAAmB,CAAC,GAAG,CAAC;IACnC,CAAC;IACD,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,mBAAmB,CAAC,MAAM,CAAC;IACtC,CAAC;IACD,OAAO,mBAAmB,CAAC,OAAO,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,IAAoB;IAClD,OAAO;QACH,MAAM,EAAE,OAAO,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,KAAK;QACrF,KAAK,EAAE,IAAI;aACN,KAAK;aACL,MAAM,CAAC,UAAU,IAAI;YAClB,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC,CAAC;aACD,GAAG,CAAC,UAAU,IAAI;YACf,OAAO,EAAE,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QACtD,CAAC,CAAC;KACT,CAAC;AACN,CAAC"}
|
|
@@ -25,14 +25,22 @@ type UnchangedFile = {
|
|
|
25
25
|
readonly sizeBytes: number;
|
|
26
26
|
readonly isExecutable: boolean;
|
|
27
27
|
};
|
|
28
|
-
type
|
|
28
|
+
type BinaryContentChange = {
|
|
29
29
|
readonly kind: typeof modifiedFileContentChangeKind.binary;
|
|
30
|
-
}
|
|
30
|
+
};
|
|
31
|
+
type ModeOnlyContentChange = {
|
|
31
32
|
readonly kind: typeof modifiedFileContentChangeKind.modeOnly;
|
|
32
|
-
}
|
|
33
|
+
};
|
|
34
|
+
type TextContentChange = {
|
|
33
35
|
readonly kind: typeof modifiedFileContentChangeKind.text;
|
|
34
36
|
readonly hunks: readonly PreviewDiffHunk[];
|
|
35
37
|
};
|
|
38
|
+
type ModifiedFileContentChanges = readonly [
|
|
39
|
+
BinaryContentChange,
|
|
40
|
+
ModeOnlyContentChange,
|
|
41
|
+
TextContentChange
|
|
42
|
+
];
|
|
43
|
+
type ModifiedFileContentChange = ModifiedFileContentChanges[number];
|
|
36
44
|
export type ModifiedFile = {
|
|
37
45
|
readonly path: string;
|
|
38
46
|
readonly oldSizeBytes: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-set-diff.d.ts","sourceRoot":"","sources":["../../../../../source/report/release-diff/file-set-diff.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wCAAwC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC;AAG1E,eAAO,MAAM,6BAA6B;;;;CAIhC;AAEV,eAAO,MAAM,uBAAuB;;;;CAI1B;AAEV,MAAM,MAAM,SAAS,GAAG;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;CAClC;AAED,MAAM,MAAM,WAAW,GAAG;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;CAClC;AAED,KAAK,aAAa,GAAG;IACjB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;CAClC;AAED,KAAK,
|
|
1
|
+
{"version":3,"file":"file-set-diff.d.ts","sourceRoot":"","sources":["../../../../../source/report/release-diff/file-set-diff.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wCAAwC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC;AAG1E,eAAO,MAAM,6BAA6B;;;;CAIhC;AAEV,eAAO,MAAM,uBAAuB;;;;CAI1B;AAEV,MAAM,MAAM,SAAS,GAAG;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;CAClC;AAED,MAAM,MAAM,WAAW,GAAG;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;CAClC;AAED,KAAK,aAAa,GAAG;IACjB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;CAClC;AAED,KAAK,mBAAmB,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,6BAA6B,CAAC,MAAM,CAAC;CAAE;AAC1F,KAAK,qBAAqB,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,6BAA6B,CAAC,QAAQ,CAAC;CAAE;AAC9F,KAAK,iBAAiB,GAAG;IACrB,QAAQ,CAAC,IAAI,EAAE,OAAO,6BAA6B,CAAC,IAAI,CAAC;IACzD,QAAQ,CAAC,KAAK,EAAE,SAAS,eAAe,EAAE,CAAC;CAC9C;AACD,KAAK,0BAA0B,GAAG,SAAS;IACvC,mBAAmB;IACnB,qBAAqB;IACrB,iBAAiB;CACpB;AACD,KAAK,yBAAyB,GAAG,0BAA0B,CAAC,MAAM,CAAC;AAEnE,MAAM,MAAM,YAAY,GAAG;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,aAAa,EAAE,yBAAyB,CAAC;CACrD;AAED,MAAM,MAAM,WAAW,GAAG;IACtB,QAAQ,CAAC,KAAK,EAAE,SAAS,SAAS,EAAE,CAAC;IACrC,QAAQ,CAAC,OAAO,EAAE,SAAS,WAAW,EAAE,CAAC;IACzC,QAAQ,CAAC,QAAQ,EAAE,SAAS,YAAY,EAAE,CAAC;IAC3C,QAAQ,CAAC,SAAS,EAAE,SAAS,aAAa,EAAE,CAAC;CAChD;AAED,KAAK,uBAAuB,GAAG,CAAC,OAAO,uBAAuB,CAAC,CAAC,MAAM,OAAO,uBAAuB,CAAC;AAErG,MAAM,MAAM,kBAAkB,GAAG;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,uBAAuB,CAAC;IACxC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;CAC/B"}
|
|
@@ -43,21 +43,36 @@ function toModified(previous, current) {
|
|
|
43
43
|
function isEqual(previous, current, path) {
|
|
44
44
|
return areFileDescriptionEqual({ ...previous, filePath: path }, { ...current, filePath: path });
|
|
45
45
|
}
|
|
46
|
-
function
|
|
46
|
+
function createFileSetDiffBuckets() {
|
|
47
|
+
const added = [];
|
|
48
|
+
const removed = [];
|
|
49
|
+
const modified = [];
|
|
50
|
+
const unchanged = [];
|
|
51
|
+
return {
|
|
52
|
+
added,
|
|
53
|
+
removed,
|
|
54
|
+
modified,
|
|
55
|
+
unchanged,
|
|
56
|
+
toDiff() {
|
|
57
|
+
return { added, removed, modified, unchanged };
|
|
58
|
+
}
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
function appendComparedFile(collectors, path, previous, current) {
|
|
47
62
|
if (current === undefined) {
|
|
48
|
-
|
|
63
|
+
collectors.removed.push(toSizedFile(previous));
|
|
49
64
|
return;
|
|
50
65
|
}
|
|
51
66
|
if (isEqual(previous, current, path)) {
|
|
52
|
-
|
|
67
|
+
collectors.unchanged.push(toSizedFile(current));
|
|
53
68
|
return;
|
|
54
69
|
}
|
|
55
|
-
|
|
70
|
+
collectors.modified.push(toModified(previous, current));
|
|
56
71
|
}
|
|
57
72
|
export function buildFileSetDiff(previousFiles, newFiles) {
|
|
58
73
|
const previousIndex = fileDescriptionByPath(previousFiles);
|
|
59
74
|
const newIndex = fileDescriptionByPath(newFiles);
|
|
60
|
-
const buckets =
|
|
75
|
+
const buckets = createFileSetDiffBuckets();
|
|
61
76
|
for (const [previousPath, previous] of previousIndex) {
|
|
62
77
|
appendComparedFile(buckets, previousPath, previous, newIndex.get(previousPath));
|
|
63
78
|
}
|
|
@@ -66,6 +81,6 @@ export function buildFileSetDiff(previousFiles, newFiles) {
|
|
|
66
81
|
buckets.added.push(toSizedFile(current));
|
|
67
82
|
}
|
|
68
83
|
}
|
|
69
|
-
return buckets;
|
|
84
|
+
return buckets.toDiff();
|
|
70
85
|
}
|
|
71
86
|
//# sourceMappingURL=file-set-diff.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-set-diff.js","sourceRoot":"","sources":["../../../../../source/report/release-diff/file-set-diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AAGvF,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,MAAM,CAAC,MAAM,6BAA6B,GAAG;IACzC,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,WAAW;IACrB,IAAI,EAAE,MAAM;CACN,CAAC;AAEX,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACnC,OAAO,EAAE,SAAS;IAClB,YAAY,EAAE,eAAe;IAC7B,SAAS,EAAE,WAAW;CAChB,CAAC;
|
|
1
|
+
{"version":3,"file":"file-set-diff.js","sourceRoot":"","sources":["../../../../../source/report/release-diff/file-set-diff.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
function requireFileDescriptionBySourcePath(filePath, resources) {
|
|
2
|
-
const matchingResource = resources.find((resource)
|
|
2
|
+
const matchingResource = resources.find(function (resource) {
|
|
3
3
|
return resource.fileDescription.sourceFilePath === filePath;
|
|
4
4
|
});
|
|
5
5
|
if (matchingResource === undefined) {
|
|
@@ -8,9 +8,11 @@ function requireFileDescriptionBySourcePath(filePath, resources) {
|
|
|
8
8
|
return matchingResource.fileDescription;
|
|
9
9
|
}
|
|
10
10
|
function resolveDeclarationFileResource(declarationFilePath, contents) {
|
|
11
|
-
return contents
|
|
11
|
+
return contents
|
|
12
|
+
.find(function (resource) {
|
|
12
13
|
return resource.fileDescription.sourceFilePath === declarationFilePath;
|
|
13
|
-
})
|
|
14
|
+
})
|
|
15
|
+
?.fileDescription;
|
|
14
16
|
}
|
|
15
17
|
export function buildResolvedRoots(normalized, contents) {
|
|
16
18
|
const resolvedRoots = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle-resource-lookup.js","sourceRoot":"","sources":["../../../../source/resource-resolver/bundle-resource-lookup.ts"],"names":[],"mappings":"AAIA,SAAS,kCAAkC,CACvC,QAAgB,EAChB,SAAoC;IAEpC,MAAM,gBAAgB,GAAG,SAAS,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"bundle-resource-lookup.js","sourceRoot":"","sources":["../../../../source/resource-resolver/bundle-resource-lookup.ts"],"names":[],"mappings":"AAIA,SAAS,kCAAkC,CACvC,QAAgB,EAChB,SAAoC;IAEpC,MAAM,gBAAgB,GAAG,SAAS,CAAC,IAAI,CAAC,UAAU,QAAQ;QACtD,OAAO,QAAQ,CAAC,eAAe,CAAC,cAAc,KAAK,QAAQ,CAAC;IAChE,CAAC,CAAC,CAAC;IACH,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,uCAAuC,QAAQ,EAAE,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,gBAAgB,CAAC,eAAe,CAAC;AAC5C,CAAC;AAED,SAAS,8BAA8B,CACnC,mBAAuC,EACvC,QAAmC;IAEnC,OAAO,QAAQ;SACV,IAAI,CAAC,UAAU,QAAQ;QACpB,OAAO,QAAQ,CAAC,eAAe,CAAC,cAAc,KAAK,mBAAmB,CAAC;IAC3E,CAAC,CAAC;QACF,EAAE,eAAe,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,kBAAkB,CAC9B,UAAmC,EACnC,QAAmC;IAEnC,MAAM,aAAa,GAGf,EAAE,CAAC;IACP,KAAK,MAAM,CAAE,MAAM,EAAE,IAAI,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9D,MAAM,UAAU,GAAG,kCAAkC,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QACzE,MAAM,eAAe,GAAG,8BAA8B,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QACvF,aAAa,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,UAAU,EAAE,eAAe,EAAE,CAAC;IAChE,CAAC;IAED,OAAO,aAAa,CAAC;AACzB,CAAC"}
|
|
@@ -15,7 +15,8 @@ function rejectCodeFile(targetFilePath) {
|
|
|
15
15
|
'dependency, side-effect and dead-code analyses can run on it.',
|
|
16
16
|
'If you intend to ship code as a static asset (e.g. a template),',
|
|
17
17
|
'use a non-code extension like .txt.'
|
|
18
|
-
]
|
|
18
|
+
]
|
|
19
|
+
.join(' ');
|
|
19
20
|
throw new Error(errorMessage);
|
|
20
21
|
}
|
|
21
22
|
}
|
|
@@ -27,7 +28,7 @@ function toSourceRelativeTargetPath(sourcesFolder, filePath) {
|
|
|
27
28
|
return targetFilePath;
|
|
28
29
|
}
|
|
29
30
|
export function combineAllBundleFiles(sourcesFolder, localDependencies, additionalFiles) {
|
|
30
|
-
const resolvedLocalFiles = localDependencies.map((localFile)
|
|
31
|
+
const resolvedLocalFiles = localDependencies.map(function (localFile) {
|
|
31
32
|
const targetFilePath = localFile.isGeneratedManifest
|
|
32
33
|
? packageManifestFilePath
|
|
33
34
|
: toSourceRelativeTargetPath(sourcesFolder, localFile.filePath);
|
|
@@ -35,13 +36,13 @@ export function combineAllBundleFiles(sourcesFolder, localDependencies, addition
|
|
|
35
36
|
sourceFilePath: localFile.filePath,
|
|
36
37
|
targetFilePath,
|
|
37
38
|
directDependencies: localFile.directDependencies,
|
|
38
|
-
...
|
|
39
|
+
...localFile.project !== undefined && { project: localFile.project },
|
|
39
40
|
isExplicitlyIncluded: false,
|
|
40
|
-
...
|
|
41
|
+
...localFile.isGeneratedManifest && { isGeneratedManifest: true }
|
|
41
42
|
};
|
|
42
43
|
return resolvedBundleFile;
|
|
43
44
|
});
|
|
44
|
-
const additionalContents = additionalFiles.map((additionalFile)
|
|
45
|
+
const additionalContents = additionalFiles.map(function (additionalFile) {
|
|
45
46
|
if (typeof additionalFile === 'string') {
|
|
46
47
|
rejectCodeFile(additionalFile);
|
|
47
48
|
const sourceFilePath = path.join(sourcesFolder, additionalFile);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content.js","sourceRoot":"","sources":["../../../../source/resource-resolver/content.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAItE,SAAS,+BAA+B,CAAC,aAAqB,EAAE,QAAgB;IAC5E,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED,SAAS,cAAc,CAAC,cAAsB;IAC1C,IAAI,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QAC7B,MAAM,YAAY,GAAG;YACjB,0DAA0D,cAAc,IAAI;YAC5E,sEAAsE;YACtE,+DAA+D;YAC/D,iEAAiE;YACjE,qCAAqC;SACxC,
|
|
1
|
+
{"version":3,"file":"content.js","sourceRoot":"","sources":["../../../../source/resource-resolver/content.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ export type BundleResource = {
|
|
|
9
9
|
readonly isGeneratedManifest?: true | undefined;
|
|
10
10
|
};
|
|
11
11
|
export type RootFileDescription = {
|
|
12
|
-
js: TransferableFileDescription;
|
|
13
|
-
declarationFile?: TransferableFileDescription | undefined;
|
|
12
|
+
readonly js: TransferableFileDescription;
|
|
13
|
+
readonly declarationFile?: TransferableFileDescription | undefined;
|
|
14
14
|
};
|
|
15
15
|
//# sourceMappingURL=resolved-bundle.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolved-bundle.d.ts","sourceRoot":"","sources":["../../../../source/resource-resolver/resolved-bundle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU;AACvC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gDAAgD;AAC1F,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,qCAAqC;AACtF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B;AAEnE,MAAM,MAAM,cAAc,GAAG;IACzB,QAAQ,CAAC,eAAe,EAAE,2BAA2B,CAAC;IACtD,QAAQ,CAAC,kBAAkB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjD,QAAQ,CAAC,oBAAoB,EAAE,OAAO,CAAC;IACvC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;CACnD;AAMD,MAAM,MAAM,mBAAmB,GAAG;IAC9B,EAAE,EAAE,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"resolved-bundle.d.ts","sourceRoot":"","sources":["../../../../source/resource-resolver/resolved-bundle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU;AACvC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gDAAgD;AAC1F,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,qCAAqC;AACtF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B;AAEnE,MAAM,MAAM,cAAc,GAAG;IACzB,QAAQ,CAAC,eAAe,EAAE,2BAA2B,CAAC;IACtD,QAAQ,CAAC,kBAAkB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjD,QAAQ,CAAC,oBAAoB,EAAE,OAAO,CAAC;IACvC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;CACnD;AAMD,MAAM,MAAM,mBAAmB,GAAG;IAC9B,QAAQ,CAAC,EAAE,EAAE,2BAA2B,CAAC;IACzC,QAAQ,CAAC,eAAe,CAAC,EAAE,2BAA2B,GAAG,SAAS,CAAC;CACtE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource-resolve-options.js","sourceRoot":"","sources":["../../../../source/resource-resolver/resource-resolve-options.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAuB,MAAM,+BAA+B,CAAC;AAoB5F,MAAM,UAAU,sBAAsB,CAAC,OAA+B;IAClE,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,
|
|
1
|
+
{"version":3,"file":"resource-resolve-options.js","sourceRoot":"","sources":["../../../../source/resource-resolver/resource-resolve-options.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAuB,MAAM,+BAA+B,CAAC;AAoB5F,MAAM,UAAU,sBAAsB,CAAC,OAA+B;IAClE,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,CAAE,cAAc,CAAE,GAAG,WAAW,CAAC;IACvC,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,YAAY,OAAO,CAAC,IAAI,iCAAiC,CAAC,CAAC;IAC/E,CAAC;IAED,MAAM,CAAE,WAAW,CAAE,GAAG,cAAc,CAAC;IACvC,OAAO;QACH,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,sBAAsB,CAAC,WAAW,CAAC;KAClE,CAAC;AACN,CAAC"}
|
|
@@ -24,14 +24,14 @@ export function createResourceResolver(dependencies) {
|
|
|
24
24
|
const normalized = resolveRootsAndSurface(options);
|
|
25
25
|
const resolvedDependencies = await resolveDependenciesForAllRoots(dependencyScanner, options);
|
|
26
26
|
const bundleFiles = combineAllBundleFiles(options.sourcesFolder, resolvedDependencies.localFiles, options.additionalFiles);
|
|
27
|
-
const contents = await Promise.all(bundleFiles.map(async (bundleFile)
|
|
27
|
+
const contents = await Promise.all(bundleFiles.map(async function (bundleFile) {
|
|
28
28
|
const fileDescription = await resolveFileDescription(fileManager, bundleFile, options.mainPackageJson);
|
|
29
29
|
return {
|
|
30
30
|
fileDescription,
|
|
31
31
|
directDependencies: bundleFile.directDependencies,
|
|
32
32
|
project: bundleFile.project,
|
|
33
33
|
isExplicitlyIncluded: bundleFile.isExplicitlyIncluded,
|
|
34
|
-
...
|
|
34
|
+
...bundleFile.isGeneratedManifest && { isGeneratedManifest: true }
|
|
35
35
|
};
|
|
36
36
|
}));
|
|
37
37
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource-resolver.js","sourceRoot":"","sources":["../../../../source/resource-resolver/resource-resolver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,8BAA8B,EAAE,MAAM,mCAAmC,CAAC;AAEnF,OAAO,EAAE,sBAAsB,EAA+B,MAAM,+BAA+B,CAAC;AAWpG,MAAM,4BAA4B,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"resource-resolver.js","sourceRoot":"","sources":["../../../../source/resource-resolver/resource-resolver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,8BAA8B,EAAE,MAAM,mCAAmC,CAAC;AAEnF,OAAO,EAAE,sBAAsB,EAA+B,MAAM,+BAA+B,CAAC;AAWpG,MAAM,4BAA4B,GAAG,CAAC,CAAC;AAQvC,SAAS,wBAAwB,CAAC,eAA0D;IACxF,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,EAAE,4BAA4B,CAAC,IAAI,CAAC;AACtF,CAAC;AAED,KAAK,UAAU,sBAAsB,CACjC,WAAwB,EACxB,UAAsC,EACtC,eAA0D;IAE1D,IAAI,UAAU,CAAC,mBAAmB,EAAE,CAAC;QACjC,OAAO;YACH,OAAO,EAAE,wBAAwB,CAAC,eAAe,CAAC;YAClD,YAAY,EAAE,KAAK;YACnB,cAAc,EAAE,UAAU,CAAC,cAAc;YACzC,cAAc,EAAE,UAAU,CAAC,cAAc;SAC5C,CAAC;IACN,CAAC;IAED,OAAO,MAAM,WAAW,CAAC,sCAAsC,CAC3D,UAAU,CAAC,cAAc,EACzB,UAAU,CAAC,cAAc,CAC5B,CAAC;AACN,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,YAA0C;IAC7E,MAAM,EAAE,iBAAiB,EAAE,WAAW,EAAE,GAAG,YAAY,CAAC;IAExD,OAAO;QACH,KAAK,CAAC,OAAO,CAAC,OAAO;YACjB,MAAM,UAAU,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;YACnD,MAAM,oBAAoB,GAAG,MAAM,8BAA8B,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;YAE9F,MAAM,WAAW,GAAG,qBAAqB,CACrC,OAAO,CAAC,aAAa,EACrB,oBAAoB,CAAC,UAAU,EAC/B,OAAO,CAAC,eAAe,CAC1B,CAAC;YAEF,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAC9B,WAAW,CAAC,GAAG,CAAC,KAAK,WAAW,UAAU;gBACtC,MAAM,eAAe,GAAG,MAAM,sBAAsB,CAChD,WAAW,EACX,UAAU,EACV,OAAO,CAAC,eAAe,CAC1B,CAAC;gBAEF,OAAO;oBACH,eAAe;oBACf,kBAAkB,EAAE,UAAU,CAAC,kBAAkB;oBACjD,OAAO,EAAE,UAAU,CAAC,OAAO;oBAC3B,oBAAoB,EAAE,UAAU,CAAC,oBAAoB;oBACrD,GAAG,UAAU,CAAC,mBAAmB,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE;iBACrE,CAAC;YACN,CAAC,CAAC,CACL,CAAC;YAEF,OAAO;gBACH,QAAQ;gBACR,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,oBAAoB,EAAE,oBAAoB,CAAC,oBAAoB;gBAC/D,KAAK,EAAE,kBAAkB,CAAC,UAAU,EAAE,QAAQ,CAAC;aAClD,CAAC;QACN,CAAC;KACJ,CAAC;AACN,CAAC"}
|
package/sbom/license-resolver.js
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { installedDependenciesFolderName, installedDependencyManifestPathIn } from "../common/package-layout.js";
|
|
2
2
|
import { extractLicenseFromManifest } from "./extract-license.js";
|
|
3
|
+
function parseJsonString(content) {
|
|
4
|
+
return JSON.parse(content);
|
|
5
|
+
}
|
|
3
6
|
export function createLicenseResolver(dependencies) {
|
|
4
7
|
const { fileManager } = dependencies;
|
|
5
8
|
function buildMissingDependencyMessage(dependencyName) {
|
|
@@ -13,8 +16,7 @@ export function createLicenseResolver(dependencies) {
|
|
|
13
16
|
if (!readability.isReadable) {
|
|
14
17
|
throw new Error(buildMissingDependencyMessage(dependencyName));
|
|
15
18
|
}
|
|
16
|
-
const
|
|
17
|
-
const parsed = JSON.parse(content);
|
|
19
|
+
const parsed = parseJsonString(await fileManager.readFile(packageJsonPath));
|
|
18
20
|
return extractLicenseFromManifest(parsed);
|
|
19
21
|
}
|
|
20
22
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"license-resolver.js","sourceRoot":"","sources":["../../../../source/sbom/license-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,iCAAiC,EAAE,MAAM,6BAA6B,CAAC;AAEjH,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAelE,MAAM,UAAU,qBAAqB,CAAC,YAAyC;IAC3E,MAAM,EAAE,WAAW,EAAE,GAAG,YAAY,CAAC;IAErC,SAAS,6BAA6B,CAAC,cAAsB;QACzD,MAAM,KAAK,GAAG,eAAe,cAAc,yCAAyC,CAAC;QACrF,OAAO,GAAG,KAAK,4BAA4B,+BAA+B,EAAE,CAAC;IACjF,CAAC;IAED,OAAO;QACH,KAAK,CAAC,cAAc,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE;YAClD,MAAM,eAAe,GAAG,iCAAiC,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;YACzF,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;YACxE,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;gBAC1B,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,cAAc,CAAC,CAAC,CAAC;YACnE,CAAC;YAED,MAAM,
|
|
1
|
+
{"version":3,"file":"license-resolver.js","sourceRoot":"","sources":["../../../../source/sbom/license-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,iCAAiC,EAAE,MAAM,6BAA6B,CAAC;AAEjH,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAelE,SAAS,eAAe,CAAC,OAAe;IACpC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAY,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,YAAyC;IAC3E,MAAM,EAAE,WAAW,EAAE,GAAG,YAAY,CAAC;IAErC,SAAS,6BAA6B,CAAC,cAAsB;QACzD,MAAM,KAAK,GAAG,eAAe,cAAc,yCAAyC,CAAC;QACrF,OAAO,GAAG,KAAK,4BAA4B,+BAA+B,EAAE,CAAC;IACjF,CAAC;IAED,OAAO;QACH,KAAK,CAAC,cAAc,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE;YAClD,MAAM,eAAe,GAAG,iCAAiC,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;YACzF,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;YACxE,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;gBAC1B,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,cAAc,CAAC,CAAC,CAAC;YACnE,CAAC;YAED,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,WAAW,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC;YAC5E,OAAO,0BAA0B,CAAC,MAAM,CAAC,CAAC;QAC9C,CAAC;KACJ,CAAC;AACN,CAAC"}
|
package/sbom/sbom-builder.js
CHANGED
|
@@ -12,16 +12,6 @@ function isParseableSpdxExpression(value) {
|
|
|
12
12
|
function buildPurl(name, versionOrSpecifier) {
|
|
13
13
|
return `pkg:npm/${name}@${encodeURIComponent(versionOrSpecifier)}`;
|
|
14
14
|
}
|
|
15
|
-
function attachLicense(component, license) {
|
|
16
|
-
if (license === undefined) {
|
|
17
|
-
return;
|
|
18
|
-
}
|
|
19
|
-
if (isParseableSpdxExpression(license)) {
|
|
20
|
-
component.licenses.add(new cdx.Models.LicenseExpression(license));
|
|
21
|
-
return;
|
|
22
|
-
}
|
|
23
|
-
component.licenses.add(new cdx.Models.NamedLicense(license));
|
|
24
|
-
}
|
|
25
15
|
function buildRootComponent(rootComponent) {
|
|
26
16
|
const purl = buildPurl(rootComponent.name, rootComponent.version);
|
|
27
17
|
return new cdx.Models.Component(cdx.Enums.ComponentType.Library, rootComponent.name, {
|
|
@@ -38,7 +28,14 @@ function buildDependencyComponent(dependency) {
|
|
|
38
28
|
purl,
|
|
39
29
|
scope: dependency.scope
|
|
40
30
|
});
|
|
41
|
-
|
|
31
|
+
if (dependency.license === undefined) {
|
|
32
|
+
return component;
|
|
33
|
+
}
|
|
34
|
+
if (isParseableSpdxExpression(dependency.license)) {
|
|
35
|
+
component.licenses.add(new cdx.Models.LicenseExpression(dependency.license));
|
|
36
|
+
return component;
|
|
37
|
+
}
|
|
38
|
+
component.licenses.add(new cdx.Models.NamedLicense(dependency.license));
|
|
42
39
|
return component;
|
|
43
40
|
}
|
|
44
41
|
function buildToolComponent(toolVersion) {
|
package/sbom/sbom-builder.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sbom-builder.js","sourceRoot":"","sources":["../../../../source/sbom/sbom-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,8BAA8B,CAAC;AACpD,OAAO,SAAS,MAAM,uBAAuB,CAAC;AAoB9C,SAAS,yBAAyB,CAAC,KAAa;IAC5C,IAAI,CAAC;QACD,SAAS,CAAC,KAAK,CAAC,CAAC;IACrB,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,SAAS,CAAC,IAAY,EAAE,kBAA0B;IACvD,OAAO,WAAW,IAAI,IAAI,kBAAkB,CAAC,kBAAkB,CAAC,EAAE,CAAC;AACvE,CAAC;AAED,SAAS,
|
|
1
|
+
{"version":3,"file":"sbom-builder.js","sourceRoot":"","sources":["../../../../source/sbom/sbom-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,7 @@ function canonicalizeSbomContent(content) {
|
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
38
|
export function canonicalizeSbomInFileSet(files) {
|
|
39
|
-
return files.map((file)
|
|
39
|
+
return files.map(function (file) {
|
|
40
40
|
if (bundleRelativePath(file.filePath) !== sbomArtifactFilePath) {
|
|
41
41
|
return file;
|
|
42
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sbom-canonicalizer.js","sourceRoot":"","sources":["../../../../source/sbom/sbom-canonicalizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACvF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAG/D,MAAM,gBAAgB,GAAG,UAAU,CAAC;AAEpC,SAAS,gBAAgB,CAAC,KAAc,EAAE,GAAW;IACjD,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,qBAAqB,CAAC,MAAe;IAC1C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG,gBAAgB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAClD,MAAM,UAAU,GAAG,gBAAgB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IACzD,OAAO,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;AACxD,CAAC;AAED,SAAS,oBAAoB,CAAC,MAAe;IACzC,MAAM,UAAU,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;IACjD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO;IACX,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;QAC7B,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;YAC1D,OAAO,KAAK,CAAC,OAAO,CAAC;QACzB,CAAC;IACL,CAAC;AACL,CAAC;AAED,SAAS,uBAAuB,CAAC,OAAe;IAC5C,IAAI,CAAC;QACD,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5C,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAC7B,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,OAAO,CAAC;IACnB,CAAC;AACL,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,KAAiC;IACvE,OAAO,KAAK,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"sbom-canonicalizer.js","sourceRoot":"","sources":["../../../../source/sbom/sbom-canonicalizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACvF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAG/D,MAAM,gBAAgB,GAAG,UAAU,CAAC;AAEpC,SAAS,gBAAgB,CAAC,KAAc,EAAE,GAAW;IACjD,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,qBAAqB,CAAC,MAAe;IAC1C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG,gBAAgB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAClD,MAAM,UAAU,GAAG,gBAAgB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IACzD,OAAO,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;AACxD,CAAC;AAED,SAAS,oBAAoB,CAAC,MAAe;IACzC,MAAM,UAAU,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;IACjD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO;IACX,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;QAC7B,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;YAC1D,OAAO,KAAK,CAAC,OAAO,CAAC;QACzB,CAAC;IACL,CAAC;AACL,CAAC;AAED,SAAS,uBAAuB,CAAC,OAAe;IAC5C,IAAI,CAAC;QACD,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5C,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAC7B,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,OAAO,CAAC;IACnB,CAAC;AACL,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,KAAiC;IACvE,OAAO,KAAK,CAAC,GAAG,CAAC,UAAU,IAAI;QAC3B,IAAI,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,oBAAoB,EAAE,CAAC;YAC7D,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,uBAAuB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;IACvE,CAAC,CAAC,CAAC;AACP,CAAC"}
|
package/sbom/sbom-file.js
CHANGED
|
@@ -8,10 +8,10 @@ function isSbomEnabled(publishSettings) {
|
|
|
8
8
|
}
|
|
9
9
|
function listDependencyEntries(bundle) {
|
|
10
10
|
return [
|
|
11
|
-
...Object.entries(bundle.dependencies).map(([name, specifier])
|
|
11
|
+
...Object.entries(bundle.dependencies).map(function ([name, specifier]) {
|
|
12
12
|
return { name, specifier, scope: cdx.Enums.ComponentScope.Required };
|
|
13
13
|
}),
|
|
14
|
-
...Object.entries(bundle.peerDependencies).map(([name, specifier])
|
|
14
|
+
...Object.entries(bundle.peerDependencies).map(function ([name, specifier]) {
|
|
15
15
|
return { name, specifier, scope: cdx.Enums.ComponentScope.Optional };
|
|
16
16
|
})
|
|
17
17
|
];
|
|
@@ -19,11 +19,11 @@ function listDependencyEntries(bundle) {
|
|
|
19
19
|
export function createSbomFileBuilder(dependencies) {
|
|
20
20
|
const { licenseResolver, sbomSerializer, toolVersionProvider, projectFolder } = dependencies;
|
|
21
21
|
async function resolveDependencyEntries(bundle, siblings) {
|
|
22
|
-
const siblingsByName = new Map(siblings.map((sibling)
|
|
22
|
+
const siblingsByName = new Map(siblings.map(function (sibling) {
|
|
23
23
|
return [sibling.name, sibling];
|
|
24
24
|
}));
|
|
25
25
|
const entries = listDependencyEntries(bundle);
|
|
26
|
-
return Promise.all(entries.map(async (entry)
|
|
26
|
+
return Promise.all(entries.map(async function (entry) {
|
|
27
27
|
const sibling = siblingsByName.get(entry.name);
|
|
28
28
|
const license = sibling === undefined
|
|
29
29
|
? await licenseResolver.resolveLicense({ projectFolder, dependencyName: entry.name })
|
package/sbom/sbom-file.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sbom-file.js","sourceRoot":"","sources":["../../../../source/sbom/sbom-file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,8BAA8B,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,OAAO,EAAE,qBAAqB,EAAwB,MAAM,qCAAqC,CAAC;AAElG,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAGlE,OAAO,EAAE,SAAS,EAAuB,MAAM,mBAAmB,CAAC;AAyBnE,SAAS,aAAa,CAAC,eAAgC;IACnD,OAAO,eAAe,CAAC,IAAI,EAAE,OAAO,IAAI,IAAI,CAAC;AACjD,CAAC;AAED,SAAS,qBAAqB,CAAC,MAAmB;IAC9C,OAAO;QACH,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,CAAkB,
|
|
1
|
+
{"version":3,"file":"sbom-file.js","sourceRoot":"","sources":["../../../../source/sbom/sbom-file.ts"],"names":[],"mappings":"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"}
|
package/sbom/sbom-serializer.js
CHANGED
|
@@ -3,11 +3,11 @@ function createCycloneDxJsonSerializer() {
|
|
|
3
3
|
return new cdx.Serialize.JsonSerializer(new cdx.Serialize.JSON.Normalize.Factory(cdx.Spec.Spec1dot6));
|
|
4
4
|
}
|
|
5
5
|
function serializeBom(serializer, bom) {
|
|
6
|
-
return serializer.serialize
|
|
6
|
+
return String(Reflect.apply(serializer.serialize, serializer, [bom, { sortLists: true, space: 4 }]));
|
|
7
7
|
}
|
|
8
8
|
export function createSbomSerializer() {
|
|
9
9
|
const serializer = createCycloneDxJsonSerializer();
|
|
10
|
-
const serialize = (bom)
|
|
10
|
+
const serialize = function (bom) {
|
|
11
11
|
return serializeBom(serializer, bom);
|
|
12
12
|
};
|
|
13
13
|
return { serialize };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sbom-serializer.js","sourceRoot":"","sources":["../../../../source/sbom/sbom-serializer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"sbom-serializer.js","sourceRoot":"","sources":["../../../../source/sbom/sbom-serializer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,8BAA8B,CAAC;AAQpD,SAAS,6BAA6B;IAClC,OAAO,IAAI,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;AAC1G,CAAC;AAED,SAAS,YAAY,CAAC,UAAwC,EAAE,GAAoB;IAChF,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,EAAE,CAAE,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAE,CAAC,CAAC,CAAC;AAC3G,CAAC;AAED,MAAM,UAAU,oBAAoB;IAChC,MAAM,UAAU,GAAG,6BAA6B,EAAE,CAAC;IACnD,MAAM,SAAS,GAAG,UAAU,GAAoB;QAC5C,OAAO,YAAY,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;IACzC,CAAC,CAAC;IAEF,OAAO,EAAE,SAAS,EAAE,CAAC;AACzB,CAAC"}
|
package/sbom/tool-version.js
CHANGED
|
@@ -8,14 +8,14 @@ function isCandidatePackageName(value) {
|
|
|
8
8
|
return value === '@packtory/cli' || value === 'packtory';
|
|
9
9
|
}
|
|
10
10
|
function isImportResolutionError(error) {
|
|
11
|
-
if (!isObjectType(error) || !('code'
|
|
11
|
+
if (!isObjectType(error) || !Object.hasOwn(error, 'code')) {
|
|
12
12
|
return false;
|
|
13
13
|
}
|
|
14
|
-
const
|
|
14
|
+
const code = Reflect.get(error, 'code');
|
|
15
15
|
return code === 'ERR_MODULE_NOT_FOUND' || code === 'ERR_PACKAGE_PATH_NOT_EXPORTED';
|
|
16
16
|
}
|
|
17
17
|
function unwrapJsonModule(importedModule) {
|
|
18
|
-
if (!isPlainObject(importedModule) || !('default'
|
|
18
|
+
if (!isPlainObject(importedModule) || !Object.hasOwn(importedModule, 'default')) {
|
|
19
19
|
return importedModule;
|
|
20
20
|
}
|
|
21
21
|
return importedModule.default;
|
package/sbom/tool-version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-version.js","sourceRoot":"","sources":["../../../../source/sbom/tool-version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAErD,MAAM,qBAAqB,GAAG,
|
|
1
|
+
{"version":3,"file":"tool-version.js","sourceRoot":"","sources":["../../../../source/sbom/tool-version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAErD,MAAM,qBAAqB,GAAG,CAAE,eAAe,EAAE,UAAU,CAAW,CAAC;AAQvE,SAAS,wBAAwB;IAC7B,MAAM,KAAK,GAAG,+FAA+F,CAAC;IAC9G,OAAO,GAAG,KAAK,4DAA4D,CAAC;AAChF,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAc;IAC1C,OAAO,KAAK,KAAK,eAAe,IAAI,KAAK,KAAK,UAAU,CAAC;AAC7D,CAAC;AAED,SAAS,uBAAuB,CAAC,KAAc;IAC3C,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC;QACxD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,IAAI,GAAY,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACjD,OAAO,IAAI,KAAK,sBAAsB,IAAI,IAAI,KAAK,+BAA+B,CAAC;AACvF,CAAC;AAED,SAAS,gBAAgB,CAAC,cAAuB;IAC7C,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,SAAS,CAAC,EAAE,CAAC;QAC9E,OAAO,cAAc,CAAC;IAC1B,CAAC;IAED,OAAO,cAAc,CAAC,OAAO,CAAC;AAClC,CAAC;AAED,SAAS,oBAAoB,CAAC,SAAiB,EAAE,cAAuB;IACpE,MAAM,MAAM,GAAG,gBAAgB,CAAC,cAAc,CAAC,CAAC;IAChD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QAC/D,MAAM,IAAI,KAAK,CAAC,wCAAwC,SAAS,8BAA8B,CAAC,CAAC;IACrG,CAAC;IACD,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QACvC,MAAM,IAAI,KAAK,CAAC,wCAAwC,SAAS,+BAA+B,CAAC,CAAC;IACtG,CAAC;IACD,OAAO,MAAM,CAAC,OAAO,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,iCAAiC,CAC7C,YAA6C;IAE7C,MAAM,EAAE,iBAAiB,EAAE,GAAG,YAAY,CAAC;IAE3C,OAAO,KAAK,UAAU,0BAA0B;QAC5C,KAAK,MAAM,oBAAoB,IAAI,qBAAqB,EAAE,CAAC;YACvD,MAAM,SAAS,GAAG,GAAG,oBAAoB,eAAe,CAAC;YACzD,IAAI,CAAC;gBACD,OAAO,oBAAoB,CAAC,SAAS,EAAE,MAAM,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC;YAC/E,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACtB,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,EAAE,CAAC;oBAClC,MAAM,KAAK,CAAC;gBAChB,CAAC;YACL,CAAC;QACL,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,wBAAwB,EAAE,CAAC,CAAC;IAChD,CAAC,CAAC;AACN,CAAC"}
|
package/sbom.cdx.json
CHANGED
|
@@ -9,16 +9,16 @@
|
|
|
9
9
|
{
|
|
10
10
|
"type": "application",
|
|
11
11
|
"name": "packtory",
|
|
12
|
-
"version": "0.0.
|
|
12
|
+
"version": "0.0.51"
|
|
13
13
|
}
|
|
14
14
|
]
|
|
15
15
|
},
|
|
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.53",
|
|
20
|
+
"bom-ref": "pkg:npm/packtory@0.0.53",
|
|
21
|
+
"purl": "pkg:npm/packtory@0.0.53"
|
|
22
22
|
}
|
|
23
23
|
},
|
|
24
24
|
"components": [
|
|
@@ -379,7 +379,7 @@
|
|
|
379
379
|
"ref": "pkg:npm/npm-registry-fetch@20.0.1"
|
|
380
380
|
},
|
|
381
381
|
{
|
|
382
|
-
"ref": "pkg:npm/packtory@0.0.
|
|
382
|
+
"ref": "pkg:npm/packtory@0.0.53",
|
|
383
383
|
"dependsOn": [
|
|
384
384
|
"pkg:npm/@arethetypeswrong/core@0.18.4",
|
|
385
385
|
"pkg:npm/@cyclonedx/cyclonedx-library@10.1.0",
|
package/tar/extract-tar.js
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { createGunzip } from 'node:zlib';
|
|
2
2
|
import { Readable } from 'node:stream';
|
|
3
3
|
import { extract } from 'tar-stream';
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
4
|
+
function defaultExtractTarLimits() {
|
|
5
|
+
return {
|
|
6
|
+
maxEntryCount: 50_000,
|
|
7
|
+
maxEntryPathLength: 4096,
|
|
8
|
+
maxExtractedBytes: 1_073_741_824
|
|
9
|
+
};
|
|
10
|
+
}
|
|
9
11
|
function toError(error) {
|
|
10
12
|
return error instanceof Error ? error : new Error(String(error));
|
|
11
13
|
}
|
|
@@ -47,8 +49,8 @@ async function collectTarEntries(stream, limits) {
|
|
|
47
49
|
return entries;
|
|
48
50
|
}
|
|
49
51
|
async function waitForStreamError(stream) {
|
|
50
|
-
return await new Promise((_resolve, reject)
|
|
51
|
-
stream.once('error', (error)
|
|
52
|
+
return await new Promise(function (_resolve, reject) {
|
|
53
|
+
stream.once('error', function (error) {
|
|
52
54
|
reject(toError(error));
|
|
53
55
|
});
|
|
54
56
|
});
|
|
@@ -58,9 +60,10 @@ function appendOutcome(outcomes, outcome) {
|
|
|
58
60
|
return outcomes;
|
|
59
61
|
}
|
|
60
62
|
async function raceExtractionOutcomes(streams, limits) {
|
|
61
|
-
|
|
63
|
+
const entries = await Promise.race(appendOutcome(appendOutcome(appendOutcome(appendOutcome(new Set(), collectTarEntries(streams.tarEntries, limits)), waitForStreamError(streams.source)), waitForStreamError(streams.gunzip)), waitForStreamError(streams.extractStream)));
|
|
64
|
+
return Array.from(entries);
|
|
62
65
|
}
|
|
63
|
-
export async function extractTarEntries(buffer, dependencies = {}, limits = defaultExtractTarLimits) {
|
|
66
|
+
export async function extractTarEntries(buffer, dependencies = {}, limits = defaultExtractTarLimits()) {
|
|
64
67
|
const createSource = dependencies.createSource ?? Readable.from;
|
|
65
68
|
const extractStream = extract();
|
|
66
69
|
const source = createSource(buffer);
|