packtory 0.0.38 → 0.0.40
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/config/changelog-settings.d.ts +12 -2
- package/config/changelog-settings.d.ts.map +1 -1
- package/config/changelog-settings.js +55 -15
- package/config/changelog-settings.js.map +1 -1
- package/git/current-git-head.js +0 -9
- package/git/current-git-head.js.map +1 -1
- package/package.json +2 -6
- package/packages/package-processor.composition.js +3 -3
- package/packages/package-processor.composition.js.map +1 -1
- package/packtory/changelog-source-attribution.js +7 -7
- package/packtory/changelog-source-attribution.js.map +1 -1
- package/report/preview/preview-document-diff.d.ts +1 -1
- package/report/preview/preview-document-diff.d.ts.map +1 -1
- package/report/preview/preview-document-diff.js.map +1 -1
- package/report/release-diff/file-hunks.js +2 -2
- package/report/release-diff/file-hunks.js.map +1 -1
- package/sbom.cdx.json +10 -10
- package/common/typed-diff.d.ts +0 -3
- package/common/typed-diff.d.ts.map +0 -1
- package/common/typed-diff.js +0 -5
- package/common/typed-diff.js.map +0 -1
|
@@ -1,11 +1,16 @@
|
|
|
1
1
|
import { z } from 'zod/mini';
|
|
2
2
|
export declare const changelogSettingsSchema: z.ZodMiniReadonly<z.ZodMiniObject<{
|
|
3
|
-
|
|
3
|
+
explicitBaseRef: z.ZodMiniOptional<z.ZodMiniString<string>>;
|
|
4
|
+
labels: z.ZodMiniOptional<z.ZodMiniReadonly<z.ZodMiniRecord<z.ZodMiniString<string>, z.ZodMiniString<string>>>>;
|
|
5
|
+
outputs: z.ZodMiniOptional<z.ZodMiniReadonly<z.ZodMiniTuple<readonly [z.ZodMiniUnion<readonly [z.ZodMiniReadonly<z.ZodMiniObject<{
|
|
4
6
|
kind: z.ZodMiniLiteral<"repository-file">;
|
|
5
7
|
path: z.ZodMiniString<string>;
|
|
6
8
|
}, z.core.$strict>>, z.ZodMiniReadonly<z.ZodMiniObject<{
|
|
7
9
|
kind: z.ZodMiniLiteral<"package-file">;
|
|
8
10
|
path: z.ZodMiniString<string>;
|
|
11
|
+
}, z.core.$strict>>, z.ZodMiniReadonly<z.ZodMiniObject<{
|
|
12
|
+
kind: z.ZodMiniLiteral<"package-file">;
|
|
13
|
+
paths: z.ZodMiniReadonly<z.ZodMiniRecord<z.ZodMiniString<string>, z.ZodMiniString<string>>>;
|
|
9
14
|
}, z.core.$strict>>, z.ZodMiniReadonly<z.ZodMiniObject<{
|
|
10
15
|
kind: z.ZodMiniLiteral<"github-release">;
|
|
11
16
|
}, z.core.$strict>>]>], z.ZodMiniUnion<readonly [z.ZodMiniReadonly<z.ZodMiniObject<{
|
|
@@ -14,9 +19,14 @@ export declare const changelogSettingsSchema: z.ZodMiniReadonly<z.ZodMiniObject<
|
|
|
14
19
|
}, z.core.$strict>>, z.ZodMiniReadonly<z.ZodMiniObject<{
|
|
15
20
|
kind: z.ZodMiniLiteral<"package-file">;
|
|
16
21
|
path: z.ZodMiniString<string>;
|
|
22
|
+
}, z.core.$strict>>, z.ZodMiniReadonly<z.ZodMiniObject<{
|
|
23
|
+
kind: z.ZodMiniLiteral<"package-file">;
|
|
24
|
+
paths: z.ZodMiniReadonly<z.ZodMiniRecord<z.ZodMiniString<string>, z.ZodMiniString<string>>>;
|
|
17
25
|
}, z.core.$strict>>, z.ZodMiniReadonly<z.ZodMiniObject<{
|
|
18
26
|
kind: z.ZodMiniLiteral<"github-release">;
|
|
19
|
-
}, z.core.$strict>>]
|
|
27
|
+
}, z.core.$strict>>]>>>>;
|
|
28
|
+
packageTagFormat: z.ZodMiniOptional<z.ZodMiniString<string>>;
|
|
29
|
+
targetScopedLabelPattern: z.ZodMiniOptional<z.ZodMiniString<string>>;
|
|
20
30
|
}, z.core.$strict>>;
|
|
21
31
|
export type ChangelogSettings = z.infer<typeof changelogSettingsSchema>;
|
|
22
32
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"changelog-settings.d.ts","sourceRoot":"","sources":["../../../../source/config/changelog-settings.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,UAAU;
|
|
1
|
+
{"version":3,"file":"changelog-settings.d.ts","sourceRoot":"","sources":["../../../../source/config/changelog-settings.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,UAAU;AA0C5B,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAQnC;AAGD,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
2
|
import { z } from 'zod/mini';
|
|
3
|
-
import { bundleRelativePathSchema } from "./base-validations.js";
|
|
3
|
+
import { bundleRelativePathSchema, nonEmptyStringSchema } from "./base-validations.js";
|
|
4
4
|
const repositoryFileOutputSchema = z.readonly(z.strictObject({
|
|
5
5
|
kind: z.literal('repository-file'),
|
|
6
6
|
path: bundleRelativePathSchema
|
|
@@ -9,18 +9,37 @@ const packageFileOutputSchema = z.readonly(z.strictObject({
|
|
|
9
9
|
kind: z.literal('package-file'),
|
|
10
10
|
path: bundleRelativePathSchema
|
|
11
11
|
}));
|
|
12
|
+
const explicitPackageFileOutputSchema = z.readonly(z.strictObject({
|
|
13
|
+
kind: z.literal('package-file'),
|
|
14
|
+
paths: z.readonly(z.record(nonEmptyStringSchema, bundleRelativePathSchema)).check(z.refine((value) => {
|
|
15
|
+
return Object.keys(value).length > 0;
|
|
16
|
+
}))
|
|
17
|
+
}));
|
|
12
18
|
const githubReleaseOutputSchema = z.readonly(z.strictObject({
|
|
13
19
|
kind: z.literal('github-release')
|
|
14
20
|
}));
|
|
15
|
-
const changelogOutputSchema = z.union([
|
|
21
|
+
const changelogOutputSchema = z.union([
|
|
22
|
+
repositoryFileOutputSchema,
|
|
23
|
+
packageFileOutputSchema,
|
|
24
|
+
explicitPackageFileOutputSchema,
|
|
25
|
+
githubReleaseOutputSchema
|
|
26
|
+
]);
|
|
27
|
+
const validLabelsSchema = z.readonly(z.record(nonEmptyStringSchema, nonEmptyStringSchema));
|
|
16
28
|
export const changelogSettingsSchema = z.readonly(z.strictObject({
|
|
17
|
-
|
|
29
|
+
explicitBaseRef: z.optional(nonEmptyStringSchema),
|
|
30
|
+
labels: z.optional(validLabelsSchema),
|
|
31
|
+
outputs: z.optional(z.readonly(z.tuple([changelogOutputSchema], changelogOutputSchema))),
|
|
32
|
+
packageTagFormat: z.optional(nonEmptyStringSchema),
|
|
33
|
+
targetScopedLabelPattern: z.optional(nonEmptyStringSchema)
|
|
18
34
|
}));
|
|
19
|
-
function
|
|
35
|
+
function normalizeRelativePath(filePath) {
|
|
20
36
|
return filePath.split(/[/\\]/u).join('/');
|
|
21
37
|
}
|
|
22
|
-
function
|
|
23
|
-
return path.normalize(path.join(...filePathSegments.map(
|
|
38
|
+
function normalizeFilePath(...filePathSegments) {
|
|
39
|
+
return path.normalize(path.join(...filePathSegments.map(normalizeRelativePath)));
|
|
40
|
+
}
|
|
41
|
+
function normalizeChangelogOutputPath(filePath) {
|
|
42
|
+
return path.normalize(normalizeRelativePath(filePath));
|
|
24
43
|
}
|
|
25
44
|
function pushDuplicateValueIssues(issues, values, messageFor) {
|
|
26
45
|
const seenValues = new Set();
|
|
@@ -33,23 +52,34 @@ function pushDuplicateValueIssues(issues, values, messageFor) {
|
|
|
33
52
|
seenValues.add(value);
|
|
34
53
|
}
|
|
35
54
|
}
|
|
36
|
-
function
|
|
55
|
+
function resolveSourcesFolder(packageConfig, packtoryConfig) {
|
|
37
56
|
return packageConfig.sourcesFolder ?? packtoryConfig.commonPackageSettings?.sourcesFolder;
|
|
38
57
|
}
|
|
39
|
-
function
|
|
58
|
+
function collectPackageFileDestinationPaths(packtoryConfig, output) {
|
|
59
|
+
if (output.kind !== 'package-file') {
|
|
60
|
+
return [];
|
|
61
|
+
}
|
|
62
|
+
if ('paths' in output) {
|
|
63
|
+
return Object.values(output.paths).map(normalizeChangelogOutputPath);
|
|
64
|
+
}
|
|
40
65
|
return packtoryConfig.packages.flatMap((packageConfig) => {
|
|
41
|
-
const sourcesFolder =
|
|
66
|
+
const sourcesFolder = resolveSourcesFolder(packageConfig, packtoryConfig);
|
|
42
67
|
if (sourcesFolder === undefined) {
|
|
43
68
|
return [];
|
|
44
69
|
}
|
|
45
|
-
return [
|
|
70
|
+
return [normalizeFilePath(sourcesFolder, output.path)];
|
|
46
71
|
});
|
|
47
72
|
}
|
|
48
|
-
|
|
49
|
-
if (
|
|
73
|
+
function validateTargetScopedLabelPattern(pattern) {
|
|
74
|
+
if (pattern === undefined) {
|
|
50
75
|
return [];
|
|
51
76
|
}
|
|
52
|
-
|
|
77
|
+
if (!pattern.includes('{targetName}') || !pattern.includes('{label}')) {
|
|
78
|
+
return ['changelog.targetScopedLabelPattern must contain {targetName} and {label}'];
|
|
79
|
+
}
|
|
80
|
+
return [];
|
|
81
|
+
}
|
|
82
|
+
function collectChangelogOutputIssues(packtoryConfig, outputs) {
|
|
53
83
|
const issues = [];
|
|
54
84
|
const githubReleaseCount = outputs.filter((output) => {
|
|
55
85
|
return output.kind === 'github-release';
|
|
@@ -58,12 +88,12 @@ export function validateChangelogSettings(packtoryConfig) {
|
|
|
58
88
|
issues.push('changelog.outputs must not contain duplicate github-release outputs');
|
|
59
89
|
}
|
|
60
90
|
pushDuplicateValueIssues(issues, outputs.flatMap((output) => {
|
|
61
|
-
return output.kind === 'repository-file' ? [
|
|
91
|
+
return output.kind === 'repository-file' ? [normalizeRelativePath(output.path)] : [];
|
|
62
92
|
}), (duplicatePath) => {
|
|
63
93
|
return `changelog.outputs must not contain duplicate repository-file path "${duplicatePath}"`;
|
|
64
94
|
});
|
|
65
95
|
pushDuplicateValueIssues(issues, outputs.flatMap((output) => {
|
|
66
|
-
return
|
|
96
|
+
return collectPackageFileDestinationPaths(packtoryConfig, output);
|
|
67
97
|
}), (duplicatePath) => {
|
|
68
98
|
return [
|
|
69
99
|
'changelog.outputs package-file destinations must resolve to unique files;',
|
|
@@ -72,4 +102,14 @@ export function validateChangelogSettings(packtoryConfig) {
|
|
|
72
102
|
});
|
|
73
103
|
return issues;
|
|
74
104
|
}
|
|
105
|
+
export function validateChangelogSettings(packtoryConfig) {
|
|
106
|
+
if (packtoryConfig.changelog === undefined) {
|
|
107
|
+
return [];
|
|
108
|
+
}
|
|
109
|
+
const patternIssues = validateTargetScopedLabelPattern(packtoryConfig.changelog.targetScopedLabelPattern);
|
|
110
|
+
const { outputs } = packtoryConfig.changelog;
|
|
111
|
+
return outputs === undefined
|
|
112
|
+
? patternIssues
|
|
113
|
+
: [...patternIssues, ...collectChangelogOutputIssues(packtoryConfig, outputs)];
|
|
114
|
+
}
|
|
75
115
|
//# sourceMappingURL=changelog-settings.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"changelog-settings.js","sourceRoot":"","sources":["../../../../source/config/changelog-settings.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,CAAC,EAAE,MAAM,UAAU,CAAC;AAC7B,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"changelog-settings.js","sourceRoot":"","sources":["../../../../source/config/changelog-settings.ts"],"names":[],"mappings":"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"}
|
package/git/current-git-head.js
CHANGED
|
@@ -13,13 +13,4 @@ export function createCurrentGitHeadReader(dependencies) {
|
|
|
13
13
|
return currentGitHead.length === 0 ? undefined : currentGitHead;
|
|
14
14
|
};
|
|
15
15
|
}
|
|
16
|
-
export function createCachedCurrentGitHeadReader(readCurrentGitHead) {
|
|
17
|
-
let currentGitHead = null;
|
|
18
|
-
return async () => {
|
|
19
|
-
if (currentGitHead === null) {
|
|
20
|
-
currentGitHead = { value: readCurrentGitHead() };
|
|
21
|
-
}
|
|
22
|
-
return currentGitHead.value;
|
|
23
|
-
};
|
|
24
|
-
}
|
|
25
16
|
//# sourceMappingURL=current-git-head.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"current-git-head.js","sourceRoot":"","sources":["../../../../source/git/current-git-head.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,0BAA0B,CAAC,YAG1C;IACG,OAAO,KAAK,IAAI,EAAE;QACd,SAAS,cAAc;YACnB,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,YAAY;aAC5B,aAAa,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,YAAY,CAAC,gBAAgB,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;aAC5F,KAAK,CAAC,cAAc,CAAC,CAAC;QAC3B,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YAClB,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAC5C,OAAO,cAAc,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC;IACpE,CAAC,CAAC;AACN,CAAC
|
|
1
|
+
{"version":3,"file":"current-git-head.js","sourceRoot":"","sources":["../../../../source/git/current-git-head.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,0BAA0B,CAAC,YAG1C;IACG,OAAO,KAAK,IAAI,EAAE;QACd,SAAS,cAAc;YACnB,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,YAAY;aAC5B,aAAa,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,YAAY,CAAC,gBAAgB,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;aAC5F,KAAK,CAAC,cAAc,CAAC,CAAC;QAC3B,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YAClB,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAC5C,OAAO,cAAc,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC;IACpE,CAAC,CAAC;AACN,CAAC"}
|
package/package.json
CHANGED
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"npm-package-arg": "14.0.0",
|
|
20
20
|
"npm-registry-fetch": "20.0.1",
|
|
21
21
|
"remeda": "2.39.0",
|
|
22
|
-
"semver": "7.8.
|
|
22
|
+
"semver": "7.8.5",
|
|
23
23
|
"spdx-expression-parse": "4.0.0",
|
|
24
24
|
"tar-stream": "3.1.8",
|
|
25
25
|
"true-myth": "9.4.0",
|
|
@@ -57,10 +57,6 @@
|
|
|
57
57
|
"./common/sort-values.js": {
|
|
58
58
|
"import": "./common/sort-values.js"
|
|
59
59
|
},
|
|
60
|
-
"./common/typed-diff.js": {
|
|
61
|
-
"import": "./common/typed-diff.js",
|
|
62
|
-
"types": "./common/typed-diff.d.ts"
|
|
63
|
-
},
|
|
64
60
|
"./config/packtory-config-schema.js": {
|
|
65
61
|
"import": "./config/packtory-config-schema.js"
|
|
66
62
|
},
|
|
@@ -117,5 +113,5 @@
|
|
|
117
113
|
"./tar/tarball-builder.js"
|
|
118
114
|
],
|
|
119
115
|
"type": "module",
|
|
120
|
-
"version": "0.0.
|
|
116
|
+
"version": "0.0.40"
|
|
121
117
|
}
|
|
@@ -34,7 +34,7 @@ import { createTarballBuilder } from "../tar/tarball-builder.js";
|
|
|
34
34
|
import { createZipBuilder } from "../zip/zip-builder.js";
|
|
35
35
|
import { createVersionManager } from "../version-manager/manager.js";
|
|
36
36
|
import { createClock } from "../common/clock.js";
|
|
37
|
-
import {
|
|
37
|
+
import { createCurrentGitHeadReader } from "../git/current-git-head.js";
|
|
38
38
|
import { createNpmOidcIdTokenResolver } from "../npm-oidc-id-token-resolver.js";
|
|
39
39
|
import { createLicenseResolver } from "../sbom/license-resolver.js";
|
|
40
40
|
import { createSbomFileBuilder } from "../sbom/sbom-file.js";
|
|
@@ -120,10 +120,10 @@ function buildDeadCodeEliminator(progressBroadcaster) {
|
|
|
120
120
|
function buildCompositionParts(options) {
|
|
121
121
|
const repositoryFolder = options.repositoryFolder ?? process.cwd();
|
|
122
122
|
const fileManager = createFileManager({ hostFileSystem: fs.promises });
|
|
123
|
-
const readCurrentGitHead =
|
|
123
|
+
const readCurrentGitHead = createCurrentGitHeadReader({
|
|
124
124
|
repositoryFolder,
|
|
125
125
|
runGitCommand
|
|
126
|
-
})
|
|
126
|
+
});
|
|
127
127
|
const dependencyScanner = createDependencyScannerWith(fileManager);
|
|
128
128
|
const progressBroadcaster = createProgressBroadcaster();
|
|
129
129
|
const artifactsBuilder = createArtifactsBuilder({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-processor.composition.js","sourceRoot":"","sources":["../../../../source/packages/package-processor.composition.ts"],"names":[],"mappings":";;;;;;;;AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,QAAQ,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACnF,OAAO,EAAE,sBAAsB,EAAyB,MAAM,mCAAmC,CAAC;AAClG,OAAO,EAAE,mBAAmB,EAAsB,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,oBAAoB,EAAuB,MAAM,+CAA+C,CAAC;AAC1G,OAAO,EAAE,iBAAiB,EAAoB,MAAM,iCAAiC,CAAC;AACtF,OAAO,EAAE,wBAAwB,EAA2B,MAAM,+CAA+C,CAAC;AAClH,OAAO,EAAE,kBAAkB,EAAsB,MAAM,2CAA2C,CAAC;AAEnG,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,uBAAuB,EAA0B,MAAM,kCAAkC,CAAC;AACnG,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AACvF,OAAO,EAAE,0BAA0B,EAAE,MAAM,kDAAkD,CAAC;AAC9F,OAAO,EAAE,wBAAwB,EAAE,MAAM,+CAA+C,CAAC;AACzF,OAAO,EAAE,+BAA+B,EAAE,MAAM,sDAAsD,CAAC;AACvG,OAAO,EAAE,iBAAiB,EAAoB,MAAM,iCAAiC,CAAC;AACtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAyB,MAAM,kCAAkC,CAAC;AACjG,OAAO,EAAE,yBAAyB,EAA4B,MAAM,qCAAqC,CAAC;AAC1G,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAyB,MAAM,2CAA2C,CAAC;AAC1G,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,WAAW,EAAc,MAAM,oBAAoB,CAAC;AAC7D,OAAO,
|
|
1
|
+
{"version":3,"file":"package-processor.composition.js","sourceRoot":"","sources":["../../../../source/packages/package-processor.composition.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { TraceMap } from '@jridgewell/trace-mapping';
|
|
|
3
3
|
import { compareValues } from "../common/sort-values.js";
|
|
4
4
|
const sourceMappingPrefix = '//# sourceMappingURL=';
|
|
5
5
|
const javaScriptFilePattern = /\.[cm]?jsx?$/u;
|
|
6
|
-
function
|
|
6
|
+
function sortUniqueValues(values) {
|
|
7
7
|
return Array.from(new Set(values)).toSorted(compareValues);
|
|
8
8
|
}
|
|
9
9
|
function isJavaScriptFile(filePath) {
|
|
@@ -16,7 +16,7 @@ function toRepositoryRelativePath(repositoryFolder, filePath) {
|
|
|
16
16
|
}
|
|
17
17
|
return relativePath.split(path.sep).join('/');
|
|
18
18
|
}
|
|
19
|
-
function
|
|
19
|
+
function collectSourceMappingUrls(fileContent) {
|
|
20
20
|
return fileContent.split('\n').flatMap((line) => {
|
|
21
21
|
if (!line.startsWith(sourceMappingPrefix)) {
|
|
22
22
|
return [];
|
|
@@ -39,7 +39,7 @@ function resolveMapSource(mapFilePath, traceMap, source) {
|
|
|
39
39
|
}
|
|
40
40
|
return path.resolve(path.dirname(mapFilePath), traceMap.sourceRoot ?? '', source);
|
|
41
41
|
}
|
|
42
|
-
function
|
|
42
|
+
function resolveSingleSourceMappingUrl(sourceFilePath, sourceMappingUrls) {
|
|
43
43
|
if (sourceMappingUrls.length > 1) {
|
|
44
44
|
throw new Error(`Multiple sourceMappingURL references found in "${sourceFilePath}"`);
|
|
45
45
|
}
|
|
@@ -53,7 +53,7 @@ async function ensureMapIsReadable(dependencies, sourceFilePath, mapFilePath) {
|
|
|
53
53
|
}
|
|
54
54
|
async function readReferencedMap(dependencies, sourceFilePath) {
|
|
55
55
|
const fileContent = await dependencies.fileManager.readFile(sourceFilePath);
|
|
56
|
-
const sourceMappingUrl =
|
|
56
|
+
const sourceMappingUrl = resolveSingleSourceMappingUrl(sourceFilePath, collectSourceMappingUrls(fileContent));
|
|
57
57
|
if (sourceMappingUrl === undefined) {
|
|
58
58
|
return undefined;
|
|
59
59
|
}
|
|
@@ -74,7 +74,7 @@ async function attributeJavaScriptFile(dependencies, sourceFilePath) {
|
|
|
74
74
|
return toRepositoryRelativePath(dependencies.repositoryFolder, resolveMapSource(referencedMap.mapFilePath, traceMap, source));
|
|
75
75
|
});
|
|
76
76
|
}
|
|
77
|
-
async function
|
|
77
|
+
async function collectAttributedFiles(dependencies, entry) {
|
|
78
78
|
const { fileDescription: { sourceFilePath } } = entry;
|
|
79
79
|
if (isJavaScriptFile(sourceFilePath)) {
|
|
80
80
|
return attributeJavaScriptFile(dependencies, sourceFilePath);
|
|
@@ -85,9 +85,9 @@ export async function attributeChangelogSourceFiles(dependencies, analyzedBundle
|
|
|
85
85
|
const attributedFiles = [];
|
|
86
86
|
for (const entry of analyzedBundle.contents) {
|
|
87
87
|
if (!entry.isGeneratedManifest) {
|
|
88
|
-
attributedFiles.push(...(await
|
|
88
|
+
attributedFiles.push(...(await collectAttributedFiles(dependencies, entry)));
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
|
-
return
|
|
91
|
+
return sortUniqueValues(attributedFiles);
|
|
92
92
|
}
|
|
93
93
|
//# sourceMappingURL=changelog-source-attribution.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"changelog-source-attribution.js","sourceRoot":"","sources":["../../../../source/packtory/changelog-source-attribution.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAczD,MAAM,mBAAmB,GAAG,uBAAuB,CAAC;AACpD,MAAM,qBAAqB,GAAG,eAAe,CAAC;AAE9C,SAAS,
|
|
1
|
+
{"version":3,"file":"changelog-source-attribution.js","sourceRoot":"","sources":["../../../../source/packtory/changelog-source-attribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preview-document-diff.d.ts","sourceRoot":"","sources":["../../../../../source/report/preview/preview-document-diff.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"preview-document-diff.d.ts","sourceRoot":"","sources":["../../../../../source/report/preview/preview-document-diff.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM;AAE3C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wCAAwC;AAE3E,eAAO,MAAM,mBAAmB;;;;CAItB;AAEV,KAAK,mBAAmB,GAAG,CAAC,OAAO,mBAAmB,CAAC,CAAC,MAAM,OAAO,mBAAmB,CAAC;AAEzF,MAAM,MAAM,eAAe,GAAG;IAC1B,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAC;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,MAAM,eAAe,GAAG;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,SAAS,eAAe,EAAE,CAAC;CAC9C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preview-document-diff.js","sourceRoot":"","sources":["../../../../../source/report/preview/preview-document-diff.ts"],"names":[],"mappings":"
|
|
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,CAAC,KAAK;aACZ,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YACb,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC,CAAC;aACD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACV,OAAO,EAAE,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QACtD,CAAC,CAAC;KACT,CAAC;AACN,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { structuredPatch } from 'diff';
|
|
2
2
|
import { toPreviewDiffHunk } from "../preview/preview-document-diff.js";
|
|
3
3
|
const diffContextLines = 3;
|
|
4
4
|
export function buildFileHunks(path, previousContent, newContent) {
|
|
5
|
-
const patch =
|
|
5
|
+
const patch = structuredPatch(path, path, previousContent, newContent, undefined, undefined, {
|
|
6
6
|
context: diffContextLines
|
|
7
7
|
});
|
|
8
8
|
return patch.hunks.map(toPreviewDiffHunk);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-hunks.js","sourceRoot":"","sources":["../../../../../source/report/release-diff/file-hunks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"file-hunks.js","sourceRoot":"","sources":["../../../../../source/report/release-diff/file-hunks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAwB,MAAM,qCAAqC,CAAC;AAE9F,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAE3B,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,eAAuB,EAAE,UAAkB;IACpF,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE;QACzF,OAAO,EAAE,gBAAgB;KAC5B,CAAC,CAAC;IACH,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAC9C,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.39"
|
|
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.40",
|
|
20
|
+
"bom-ref": "pkg:npm/packtory@0.0.40",
|
|
21
|
+
"purl": "pkg:npm/packtory@0.0.40"
|
|
22
22
|
}
|
|
23
23
|
},
|
|
24
24
|
"components": [
|
|
@@ -220,15 +220,15 @@
|
|
|
220
220
|
{
|
|
221
221
|
"type": "library",
|
|
222
222
|
"name": "semver",
|
|
223
|
-
"version": "7.8.
|
|
224
|
-
"bom-ref": "pkg:npm/semver@7.8.
|
|
223
|
+
"version": "7.8.5",
|
|
224
|
+
"bom-ref": "pkg:npm/semver@7.8.5",
|
|
225
225
|
"scope": "required",
|
|
226
226
|
"licenses": [
|
|
227
227
|
{
|
|
228
228
|
"expression": "ISC"
|
|
229
229
|
}
|
|
230
230
|
],
|
|
231
|
-
"purl": "pkg:npm/semver@7.8.
|
|
231
|
+
"purl": "pkg:npm/semver@7.8.5"
|
|
232
232
|
},
|
|
233
233
|
{
|
|
234
234
|
"type": "library",
|
|
@@ -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.40",
|
|
383
383
|
"dependsOn": [
|
|
384
384
|
"pkg:npm/@arethetypeswrong/core@0.18.3",
|
|
385
385
|
"pkg:npm/@cyclonedx/cyclonedx-library@10.1.0",
|
|
@@ -396,7 +396,7 @@
|
|
|
396
396
|
"pkg:npm/npm-package-arg@14.0.0",
|
|
397
397
|
"pkg:npm/npm-registry-fetch@20.0.1",
|
|
398
398
|
"pkg:npm/remeda@2.39.0",
|
|
399
|
-
"pkg:npm/semver@7.8.
|
|
399
|
+
"pkg:npm/semver@7.8.5",
|
|
400
400
|
"pkg:npm/spdx-expression-parse@4.0.0",
|
|
401
401
|
"pkg:npm/tar-stream@3.1.8",
|
|
402
402
|
"pkg:npm/true-myth@9.4.0",
|
|
@@ -411,7 +411,7 @@
|
|
|
411
411
|
"ref": "pkg:npm/remeda@2.39.0"
|
|
412
412
|
},
|
|
413
413
|
{
|
|
414
|
-
"ref": "pkg:npm/semver@7.8.
|
|
414
|
+
"ref": "pkg:npm/semver@7.8.5"
|
|
415
415
|
},
|
|
416
416
|
{
|
|
417
417
|
"ref": "pkg:npm/spdx-expression-parse@4.0.0"
|
package/common/typed-diff.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"typed-diff.d.ts","sourceRoot":"","sources":["../../../../source/common/typed-diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,eAAe,EAAE,KAAK,kCAAkC,EAAE,MAAM,MAAM"}
|
package/common/typed-diff.js
DELETED
package/common/typed-diff.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"typed-diff.js","sourceRoot":"","sources":["../../../../source/common/typed-diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAiE,MAAM,MAAM,CAAC;AAYtG,MAAM,UAAU,qBAAqB,CAAC,GAAG,IAAyB;IAC9D,OAAO,eAAe,CAAC,GAAG,IAAI,CAAC,CAAC;AACpC,CAAC"}
|