packtory 0.0.40 → 0.0.42
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/bundle-emitter/release-artifact-canonicalizer.js +2 -2
- package/bundle-emitter/release-artifact-canonicalizer.js.map +1 -1
- package/common/package-layout.js +1 -0
- package/common/package-layout.js.map +1 -1
- package/package.json +2 -2
- package/packtory/release-analysis.js +2 -3
- package/packtory/release-analysis.js.map +1 -1
- package/sbom/sbom-canonicalizer.js +2 -2
- package/sbom/sbom-canonicalizer.js.map +1 -1
- package/sbom/sbom-file.d.ts.map +1 -1
- package/sbom/sbom-file.js +2 -4
- package/sbom/sbom-file.js.map +1 -1
- package/sbom.cdx.json +10 -10
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { isPlainObject } from 'remeda';
|
|
2
|
+
import { bundleRelativePath, packageManifestFilePath } from "../common/package-layout.js";
|
|
2
3
|
import { serializeStableJson } from "../common/stable-json.js";
|
|
3
4
|
import { canonicalizeSbomInFileSet } from "../sbom/sbom-canonicalizer.js";
|
|
4
|
-
const manifestPaths = new Set(['package.json', 'package/package.json']);
|
|
5
5
|
function canonicalizeManifestContent(content) {
|
|
6
6
|
try {
|
|
7
7
|
const parsed = JSON.parse(content);
|
|
@@ -18,7 +18,7 @@ function canonicalizeManifestContent(content) {
|
|
|
18
18
|
}
|
|
19
19
|
function canonicalizePackageManifestInFileSet(files) {
|
|
20
20
|
return files.map((file) => {
|
|
21
|
-
if (
|
|
21
|
+
if (bundleRelativePath(file.filePath) !== packageManifestFilePath) {
|
|
22
22
|
return file;
|
|
23
23
|
}
|
|
24
24
|
return { ...file, content: canonicalizeManifestContent(file.content) };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"release-artifact-canonicalizer.js","sourceRoot":"","sources":["../../../../source/bundle-emitter/release-artifact-canonicalizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAE1E,
|
|
1
|
+
{"version":3,"file":"release-artifact-canonicalizer.js","sourceRoot":"","sources":["../../../../source/bundle-emitter/release-artifact-canonicalizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC1F,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAE1E,SAAS,2BAA2B,CAAC,OAAe;IAChD,IAAI,CAAC;QACD,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5C,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;YACzB,OAAO,OAAO,CAAC;QACnB,CAAC;QACD,MAAM,cAAc,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;QACrC,OAAO,cAAc,CAAC,OAAO,CAAC;QAC9B,OAAO,mBAAmB,CAAC,cAAc,CAAC,CAAC;IAC/C,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,OAAO,CAAC;IACnB,CAAC;AACL,CAAC;AAED,SAAS,oCAAoC,CAAC,KAAiC;IAC3E,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACtB,IAAI,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,uBAAuB,EAAE,CAAC;YAChE,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,2BAA2B,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;IAC3E,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,gCAAgC,CAAC,KAAiC;IAC9E,OAAO,oCAAoC,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC,CAAC;AAClF,CAAC"}
|
package/common/package-layout.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
2
|
export const packageManifestFilePath = 'package.json';
|
|
3
|
+
export const sbomArtifactFilePath = 'sbom.cdx.json';
|
|
3
4
|
export const installedDependenciesFolderName = 'node_modules';
|
|
4
5
|
const tarballPackageRootPrefix = 'package/';
|
|
5
6
|
export function bundleRelativePath(filePath) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-layout.js","sourceRoot":"","sources":["../../../../source/common/package-layout.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"package-layout.js","sourceRoot":"","sources":["../../../../source/common/package-layout.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"Christian Rackerseder <github@echooff.de>"
|
|
5
5
|
],
|
|
6
6
|
"dependencies": {
|
|
7
|
-
"@arethetypeswrong/core": "0.18.
|
|
7
|
+
"@arethetypeswrong/core": "0.18.4",
|
|
8
8
|
"@cyclonedx/cyclonedx-library": "10.1.0",
|
|
9
9
|
"@jridgewell/gen-mapping": "0.3.13",
|
|
10
10
|
"@jridgewell/trace-mapping": "0.3.31",
|
|
@@ -113,5 +113,5 @@
|
|
|
113
113
|
"./tar/tarball-builder.js"
|
|
114
114
|
],
|
|
115
115
|
"type": "module",
|
|
116
|
-
"version": "0.0.
|
|
116
|
+
"version": "0.0.42"
|
|
117
117
|
}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { isDeepStrictEqual } from 'node:util';
|
|
2
2
|
import { maxDate } from "../common/max-date.js";
|
|
3
|
-
import { bundleRelativePath, packageManifestFilePath } from "../common/package-layout.js";
|
|
4
|
-
import { sbomFilePath } from "../sbom/sbom-file.js";
|
|
3
|
+
import { bundleRelativePath, packageManifestFilePath, sbomArtifactFilePath } from "../common/package-layout.js";
|
|
5
4
|
import { releaseAnalysisClassification } from "./packtory-results.js";
|
|
6
5
|
import { publishedReleaseStatus } from "./published-release-state.js";
|
|
7
6
|
function dependencyOnlyPackageJsonFields() {
|
|
@@ -54,7 +53,7 @@ function normalizePackageJsonForDependencyComparison(value) {
|
|
|
54
53
|
}));
|
|
55
54
|
}
|
|
56
55
|
function isDependencyDerivedFilePath(filePath) {
|
|
57
|
-
return filePath === packageManifestFilePath || filePath ===
|
|
56
|
+
return filePath === packageManifestFilePath || filePath === sbomArtifactFilePath;
|
|
58
57
|
}
|
|
59
58
|
function nonDependencyDerivedFilesMatch(previousIndex, newIndex) {
|
|
60
59
|
for (const [filePath, previousFile] of previousIndex.entries()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"release-analysis.js","sourceRoot":"","sources":["../../../../source/packtory/release-analysis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,
|
|
1
|
+
{"version":3,"file":"release-analysis.js","sourceRoot":"","sources":["../../../../source/packtory/release-analysis.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { isArray, isPlainObject } from 'remeda';
|
|
2
|
+
import { bundleRelativePath, sbomArtifactFilePath } from "../common/package-layout.js";
|
|
2
3
|
import { serializeStableJson } from "../common/stable-json.js";
|
|
3
|
-
const sbomFilePath = 'sbom.cdx.json';
|
|
4
4
|
const packtoryToolName = 'packtory';
|
|
5
5
|
function pluckObjectField(value, key) {
|
|
6
6
|
if (!isPlainObject(value)) {
|
|
@@ -37,7 +37,7 @@ function canonicalizeSbomContent(content) {
|
|
|
37
37
|
}
|
|
38
38
|
export function canonicalizeSbomInFileSet(files) {
|
|
39
39
|
return files.map((file) => {
|
|
40
|
-
if (file.filePath !==
|
|
40
|
+
if (bundleRelativePath(file.filePath) !== sbomArtifactFilePath) {
|
|
41
41
|
return file;
|
|
42
42
|
}
|
|
43
43
|
return { ...file, content: canonicalizeSbomContent(file.content) };
|
|
@@ -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,
|
|
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,CAAC,IAAI,EAAE,EAAE;QACtB,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.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sbom-file.d.ts","sourceRoot":"","sources":["../../../../source/sbom/sbom-file.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sbom-file.d.ts","sourceRoot":"","sources":["../../../../source/sbom/sbom-file.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B;AACpE,OAAO,EAAyB,KAAK,eAAe,EAAE,MAAM,qCAAqC;AACjG,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,2CAA2C;AAEhG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB;AAY1D,MAAM,MAAM,eAAe,GAAG;IAC1B,QAAQ,EAAE,CACN,MAAM,EAAE,WAAW,EACnB,QAAQ,EAAE,SAAS,kBAAkB,EAAE,EACvC,eAAe,EAAE,eAAe,KAC/B,OAAO,CAAC,SAAS,eAAe,EAAE,GAAG,SAAS,CAAC,CAAC;CACxD"}
|
package/sbom/sbom-file.js
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import * as cdx from '@cyclonedx/cyclonedx-library';
|
|
2
|
+
import { sbomArtifactFilePath } from "../common/package-layout.js";
|
|
2
3
|
import { createFileDescription } from "../file-manager/file-description.js";
|
|
3
4
|
import { extractLicenseFromManifest } from "./extract-license.js";
|
|
4
5
|
import { buildSbom } from "./sbom-builder.js";
|
|
5
|
-
export function sbomFilePath() {
|
|
6
|
-
return 'sbom.cdx.json';
|
|
7
|
-
}
|
|
8
6
|
function isSbomEnabled(publishSettings) {
|
|
9
7
|
return publishSettings.sbom?.enabled ?? true;
|
|
10
8
|
}
|
|
@@ -43,7 +41,7 @@ export function createSbomFileBuilder(dependencies) {
|
|
|
43
41
|
rootComponent: { name: bundle.packageJson.name, version: bundle.packageJson.version },
|
|
44
42
|
dependencies: sbomDependencies
|
|
45
43
|
});
|
|
46
|
-
return createFileDescription(
|
|
44
|
+
return createFileDescription(sbomArtifactFilePath, sbomSerializer.serialize(bom));
|
|
47
45
|
}
|
|
48
46
|
return {
|
|
49
47
|
async generate(bundle, siblings, publishSettings) {
|
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;
|
|
1
|
+
{"version":3,"file":"sbom-file.js","sourceRoot":"","sources":["../../../../source/sbom/sbom-file.ts"],"names":[],"mappings":"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"}
|
package/sbom.cdx.json
CHANGED
|
@@ -9,31 +9,31 @@
|
|
|
9
9
|
{
|
|
10
10
|
"type": "application",
|
|
11
11
|
"name": "packtory",
|
|
12
|
-
"version": "0.0.
|
|
12
|
+
"version": "0.0.41"
|
|
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.42",
|
|
20
|
+
"bom-ref": "pkg:npm/packtory@0.0.42",
|
|
21
|
+
"purl": "pkg:npm/packtory@0.0.42"
|
|
22
22
|
}
|
|
23
23
|
},
|
|
24
24
|
"components": [
|
|
25
25
|
{
|
|
26
26
|
"type": "library",
|
|
27
27
|
"name": "@arethetypeswrong/core",
|
|
28
|
-
"version": "0.18.
|
|
29
|
-
"bom-ref": "pkg:npm/@arethetypeswrong/core@0.18.
|
|
28
|
+
"version": "0.18.4",
|
|
29
|
+
"bom-ref": "pkg:npm/@arethetypeswrong/core@0.18.4",
|
|
30
30
|
"scope": "required",
|
|
31
31
|
"licenses": [
|
|
32
32
|
{
|
|
33
33
|
"expression": "MIT"
|
|
34
34
|
}
|
|
35
35
|
],
|
|
36
|
-
"purl": "pkg:npm/@arethetypeswrong/core@0.18.
|
|
36
|
+
"purl": "pkg:npm/@arethetypeswrong/core@0.18.4"
|
|
37
37
|
},
|
|
38
38
|
{
|
|
39
39
|
"type": "library",
|
|
@@ -337,7 +337,7 @@
|
|
|
337
337
|
],
|
|
338
338
|
"dependencies": [
|
|
339
339
|
{
|
|
340
|
-
"ref": "pkg:npm/@arethetypeswrong/core@0.18.
|
|
340
|
+
"ref": "pkg:npm/@arethetypeswrong/core@0.18.4"
|
|
341
341
|
},
|
|
342
342
|
{
|
|
343
343
|
"ref": "pkg:npm/@cyclonedx/cyclonedx-library@10.1.0"
|
|
@@ -379,9 +379,9 @@
|
|
|
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.42",
|
|
383
383
|
"dependsOn": [
|
|
384
|
-
"pkg:npm/@arethetypeswrong/core@0.18.
|
|
384
|
+
"pkg:npm/@arethetypeswrong/core@0.18.4",
|
|
385
385
|
"pkg:npm/@cyclonedx/cyclonedx-library@10.1.0",
|
|
386
386
|
"pkg:npm/@jridgewell/gen-mapping@0.3.13",
|
|
387
387
|
"pkg:npm/@jridgewell/trace-mapping@0.3.31",
|