packtory 0.0.51 → 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 +12 -3
- package/packages/package-processor.composition.js +5 -15
- package/packages/package-processor.composition.js.map +1 -1
- package/packtory/changelog-source-attribution.js +53 -8
- 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 +53 -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 +29 -23
- 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 +4 -4
- 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 +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);
|
package/tar/extract-tar.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract-tar.js","sourceRoot":"","sources":["../../../../source/tar/extract-tar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,OAAO,EAAmC,MAAM,YAAY,CAAC;AA6BtE,
|
|
1
|
+
{"version":3,"file":"extract-tar.js","sourceRoot":"","sources":["../../../../source/tar/extract-tar.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vendor-materializer.d.ts","sourceRoot":"","sources":["../../../../source/vendor-materializer/vendor-materializer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW;
|
|
1
|
+
{"version":3,"file":"vendor-materializer.d.ts","sourceRoot":"","sources":["../../../../source/vendor-materializer/vendor-materializer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW;AAWlC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
|
-
import
|
|
2
|
+
import parsePackageArgument from 'npm-package-arg';
|
|
3
3
|
import { Result } from 'true-myth';
|
|
4
|
+
import { tryOr } from 'true-myth/result';
|
|
4
5
|
import { z } from 'zod/mini';
|
|
5
6
|
import { safeParse } from "../common/schema-validation.js";
|
|
6
7
|
import { ancestorInstalledDependencyPathCandidates, bundledInstalledDependencyPath, installedDependenciesFolderName, packageManifestPathIn } from "../common/package-layout.js";
|
|
@@ -16,14 +17,15 @@ function packageManifestSchema() {
|
|
|
16
17
|
peerDependencies: dependencyMapSchema
|
|
17
18
|
});
|
|
18
19
|
}
|
|
20
|
+
function getPackageArgumentName(name) {
|
|
21
|
+
const parsed = tryOr(undefined, function () {
|
|
22
|
+
return parsePackageArgument(name).name ?? undefined;
|
|
23
|
+
});
|
|
24
|
+
return parsed.isOk ? parsed.value : undefined;
|
|
25
|
+
}
|
|
19
26
|
function findFirstInvalidDependencyName(names) {
|
|
20
27
|
for (const name of names) {
|
|
21
|
-
|
|
22
|
-
if (npa(name).name !== name) {
|
|
23
|
-
return name;
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
catch {
|
|
28
|
+
if (getPackageArgumentName(name) !== name) {
|
|
27
29
|
return name;
|
|
28
30
|
}
|
|
29
31
|
}
|
|
@@ -50,31 +52,41 @@ function parseManifestSummary(sourcePackageName, content) {
|
|
|
50
52
|
peerDependencyNames
|
|
51
53
|
});
|
|
52
54
|
}
|
|
55
|
+
async function getResolvedTargetPath(walker, absoluteEntryPath) {
|
|
56
|
+
try {
|
|
57
|
+
return Result.ok(await walker.getRealPath(absoluteEntryPath));
|
|
58
|
+
}
|
|
59
|
+
catch {
|
|
60
|
+
return Result.err(absoluteEntryPath);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
function isPathInsideRoot(rootDirectory, candidatePath) {
|
|
64
|
+
const normalizedRoot = path.resolve(rootDirectory);
|
|
65
|
+
const normalizedCandidate = path.resolve(candidatePath);
|
|
66
|
+
return normalizedCandidate === normalizedRoot || normalizedCandidate.startsWith(`${normalizedRoot}${path.sep}`);
|
|
67
|
+
}
|
|
53
68
|
async function checkSymlinkInsidePackage(walker, rootDirectory, packageName, relativeEntryPath) {
|
|
54
69
|
const absoluteEntryPath = path.join(rootDirectory, relativeEntryPath);
|
|
55
70
|
const normalizedEntryRelativePath = relativeEntryPath.split(path.sep).join('/');
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
resolvedTargetPath
|
|
66
|
-
});
|
|
67
|
-
}
|
|
68
|
-
return Result.ok(undefined);
|
|
71
|
+
const resolvedTarget = await getResolvedTargetPath(walker, absoluteEntryPath);
|
|
72
|
+
const resolvedTargetPath = resolvedTarget.isOk ? resolvedTarget.value : resolvedTarget.error;
|
|
73
|
+
if (resolvedTarget.isErr) {
|
|
74
|
+
return Result.err({
|
|
75
|
+
type: vendorMaterializerFailureType.symlinkTargetOutsidePackage,
|
|
76
|
+
packageName,
|
|
77
|
+
entryRelativePath: normalizedEntryRelativePath,
|
|
78
|
+
resolvedTargetPath
|
|
79
|
+
});
|
|
69
80
|
}
|
|
70
|
-
|
|
81
|
+
if (!isPathInsideRoot(rootDirectory, resolvedTargetPath)) {
|
|
71
82
|
return Result.err({
|
|
72
83
|
type: vendorMaterializerFailureType.symlinkTargetOutsidePackage,
|
|
73
84
|
packageName,
|
|
74
85
|
entryRelativePath: normalizedEntryRelativePath,
|
|
75
|
-
resolvedTargetPath
|
|
86
|
+
resolvedTargetPath
|
|
76
87
|
});
|
|
77
88
|
}
|
|
89
|
+
return Result.ok(undefined);
|
|
78
90
|
}
|
|
79
91
|
async function validatePackageDirectoryEntry(walker, packageDirectory, relativeEntryPath, entry) {
|
|
80
92
|
if (!entry.isSymbolicLink) {
|
|
@@ -82,10 +94,10 @@ async function validatePackageDirectoryEntry(walker, packageDirectory, relativeE
|
|
|
82
94
|
}
|
|
83
95
|
return checkSymlinkInsidePackage(walker, packageDirectory.rootDirectory, packageDirectory.packageName, relativeEntryPath);
|
|
84
96
|
}
|
|
85
|
-
const walkPackageDirectory = async (walker, state, relativeDirectory)
|
|
97
|
+
const walkPackageDirectory = async function (walker, state, relativeDirectory) {
|
|
86
98
|
const absoluteDirectory = path.join(state.packageDirectory.rootDirectory, relativeDirectory);
|
|
87
99
|
const entries = await walker.listDirectoryEntries(absoluteDirectory);
|
|
88
|
-
const collectDirectoryEntry = async (entry)
|
|
100
|
+
const collectDirectoryEntry = async function (entry) {
|
|
89
101
|
if (entry.name === installedDependenciesFolderName) {
|
|
90
102
|
return Result.ok(undefined);
|
|
91
103
|
}
|
|
@@ -116,7 +128,7 @@ const walkPackageDirectory = async (walker, state, relativeDirectory) => {
|
|
|
116
128
|
export function createVendorMaterializer(dependencies) {
|
|
117
129
|
const { fileManager } = dependencies;
|
|
118
130
|
function scheduleTransitiveDependencies(closure, fromFolder, dependencyNames) {
|
|
119
|
-
closure.pendingPackages.scheduleAll(dependencyNames.map((dependencyName)
|
|
131
|
+
closure.pendingPackages.scheduleAll(dependencyNames.map(function (dependencyName) {
|
|
120
132
|
return { name: dependencyName, fromFolder };
|
|
121
133
|
}));
|
|
122
134
|
}
|
|
@@ -126,7 +138,7 @@ export function createVendorMaterializer(dependencies) {
|
|
|
126
138
|
if (walkResult.isErr) {
|
|
127
139
|
return Result.err(walkResult.error);
|
|
128
140
|
}
|
|
129
|
-
return Result.ok(collected);
|
|
141
|
+
return Result.ok(Array.from(collected));
|
|
130
142
|
}
|
|
131
143
|
async function readManifestSummary(packageName, realPath) {
|
|
132
144
|
const manifestPath = packageManifestPathIn(realPath);
|
|
@@ -186,10 +198,11 @@ export function createVendorMaterializer(dependencies) {
|
|
|
186
198
|
invalidDependencyName: invalidInitialName
|
|
187
199
|
});
|
|
188
200
|
}
|
|
201
|
+
const entries = [];
|
|
189
202
|
const closure = {
|
|
190
203
|
visited: new Set(),
|
|
191
|
-
entries
|
|
192
|
-
pendingPackages: createWorklist(options.initialDependencyNames.map((name)
|
|
204
|
+
entries,
|
|
205
|
+
pendingPackages: createWorklist(options.initialDependencyNames.map(function (name) {
|
|
193
206
|
return { name, fromFolder: options.projectFolder };
|
|
194
207
|
})),
|
|
195
208
|
peerRequirements: new Map()
|
|
@@ -199,9 +212,9 @@ export function createVendorMaterializer(dependencies) {
|
|
|
199
212
|
return Result.err(drained.error);
|
|
200
213
|
}
|
|
201
214
|
return Result.ok({
|
|
202
|
-
entries: closure.entries,
|
|
215
|
+
entries: Array.from(closure.entries),
|
|
203
216
|
packageNames: Array.from(closure.visited),
|
|
204
|
-
peerRequirements: closure.peerRequirements
|
|
217
|
+
peerRequirements: new Map(closure.peerRequirements)
|
|
205
218
|
});
|
|
206
219
|
}
|
|
207
220
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vendor-materializer.js","sourceRoot":"","sources":["../../../../source/vendor-materializer/vendor-materializer.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,
|
|
1
|
+
{"version":3,"file":"vendor-materializer.js","sourceRoot":"","sources":["../../../../source/vendor-materializer/vendor-materializer.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,8 +9,14 @@ function matchingGroupedDependency(groupedDependenciesByName, dependencyName) {
|
|
|
9
9
|
}
|
|
10
10
|
return undefined;
|
|
11
11
|
}
|
|
12
|
+
function createDependencyRecord() {
|
|
13
|
+
return {};
|
|
14
|
+
}
|
|
12
15
|
export function groupBundleDependencies(bundle, bundlePeerDependencies, bundleDependencies) {
|
|
13
|
-
const grouped = {
|
|
16
|
+
const grouped = {
|
|
17
|
+
dependencies: createDependencyRecord(),
|
|
18
|
+
peerDependencies: createDependencyRecord()
|
|
19
|
+
};
|
|
14
20
|
const groupedDependenciesByName = {
|
|
15
21
|
[bundledDependencyGroup.bundle.propertyName]: packageNameMap(bundleDependencies),
|
|
16
22
|
[bundledDependencyGroup.peer.propertyName]: packageNameMap(bundlePeerDependencies)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle-dependency-grouping.js","sourceRoot":"","sources":["../../../../../source/version-manager/dependencies/bundle-dependency-grouping.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,4BAA4B,EAAE,MAAM,2CAA2C,CAAC;AACjH,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAkBlE,SAAS,yBAAyB,CAC9B,yBAAoD,EACpD,cAAsB;IAEtB,KAAK,MAAM,KAAK,IAAI,4BAA4B,EAAE,EAAE,CAAC;QACjD,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC7F,IAAI,kBAAkB,KAAK,SAAS,EAAE,CAAC;YACnC,OAAO,EAAE,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,EAAE,OAAO,EAAE,kBAAkB,CAAC,OAAO,EAAE,CAAC;QAC7F,CAAC;IACL,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,uBAAuB,CACnC,MAAwD,EACxD,sBAAsD,EACtD,kBAAkD;IAElD,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"bundle-dependency-grouping.js","sourceRoot":"","sources":["../../../../../source/version-manager/dependencies/bundle-dependency-grouping.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,4BAA4B,EAAE,MAAM,2CAA2C,CAAC;AACjH,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAkBlE,SAAS,yBAAyB,CAC9B,yBAAoD,EACpD,cAAsB;IAEtB,KAAK,MAAM,KAAK,IAAI,4BAA4B,EAAE,EAAE,CAAC;QACjD,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC7F,IAAI,kBAAkB,KAAK,SAAS,EAAE,CAAC;YACnC,OAAO,EAAE,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,EAAE,OAAO,EAAE,kBAAkB,CAAC,OAAO,EAAE,CAAC;QAC7F,CAAC;IACL,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAS,sBAAsB;IAC3B,OAAO,EAAE,CAAC;AACd,CAAC;AAED,MAAM,UAAU,uBAAuB,CACnC,MAAwD,EACxD,sBAAsD,EACtD,kBAAkD;IAElD,MAAM,OAAO,GAAG;QACZ,YAAY,EAAE,sBAAsB,EAAE;QACtC,gBAAgB,EAAE,sBAAsB,EAAE;KAC7C,CAAC;IACF,MAAM,yBAAyB,GAAG;QAC9B,CAAC,sBAAsB,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,kBAAkB,CAAC;QAChF,CAAC,sBAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,sBAAsB,CAAC;KACrF,CAAC;IAEF,KAAK,MAAM,cAAc,IAAI,MAAM,CAAC,wBAAwB,CAAC,IAAI,EAAE,EAAE,CAAC;QAClE,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,yBAAyB,EAAE,cAAc,CAAC,CAAC;QAChG,IAAI,kBAAkB,KAAK,SAAS,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,0DAA0D,cAAc,EAAE,CAAC,CAAC;QAChG,CAAC;QAED,OAAO,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC;IAC9F,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { mergeAll } from 'remeda';
|
|
2
2
|
export function mergeDependencyGroups(...groups) {
|
|
3
3
|
return {
|
|
4
|
-
dependencies: mergeAll(groups.map((group)
|
|
4
|
+
dependencies: mergeAll(groups.map(function (group) {
|
|
5
5
|
return group.dependencies;
|
|
6
6
|
})),
|
|
7
|
-
peerDependencies: mergeAll(groups.map((group)
|
|
7
|
+
peerDependencies: mergeAll(groups.map(function (group) {
|
|
8
8
|
return group.peerDependencies;
|
|
9
9
|
}))
|
|
10
10
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependency-groups.js","sourceRoot":"","sources":["../../../../../source/version-manager/dependencies/dependency-groups.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAOlC,MAAM,UAAU,qBAAqB,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"dependency-groups.js","sourceRoot":"","sources":["../../../../../source/version-manager/dependencies/dependency-groups.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAOlC,MAAM,UAAU,qBAAqB,CAAC,GAAG,MAAsC;IAC3E,OAAO;QACH,YAAY,EAAE,QAAQ,CAClB,MAAM,CAAC,GAAG,CAAC,UAAU,KAAK;YACtB,OAAO,KAAK,CAAC,YAAY,CAAC;QAC9B,CAAC,CAAC,CACL;QACD,gBAAgB,EAAE,QAAQ,CACtB,MAAM,CAAC,GAAG,CAAC,UAAU,KAAK;YACtB,OAAO,KAAK,CAAC,gBAAgB,CAAC;QAClC,CAAC,CAAC,CACL;KACJ,CAAC;AACN,CAAC"}
|