@packtory/cli 0.0.55 → 0.0.56
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/command-line-interface/runner/github-api-request.js +31 -1
- package/command-line-interface/runner/github-api-request.js.map +1 -1
- package/command-line-interface/runner/release-pr-branch-commit.js +33 -13
- package/command-line-interface/runner/release-pr-branch-commit.js.map +1 -1
- package/package.json +1 -1
- package/sbom.cdx.json +4 -4
|
@@ -12,8 +12,38 @@ function readGitHubErrorPath(error) {
|
|
|
12
12
|
const parsedUrl = new URL(url);
|
|
13
13
|
return `${parsedUrl.pathname}${parsedUrl.search}`;
|
|
14
14
|
}
|
|
15
|
+
function readStringProperty(value, property) {
|
|
16
|
+
const propertyValue = readReflectedProperty(value, property);
|
|
17
|
+
return typeof propertyValue === 'string' && propertyValue.length > 0 ? propertyValue : undefined;
|
|
18
|
+
}
|
|
19
|
+
function readGitHubErrorMessages(value) {
|
|
20
|
+
if (!Array.isArray(value)) {
|
|
21
|
+
return [];
|
|
22
|
+
}
|
|
23
|
+
return value.map(function (item) {
|
|
24
|
+
return readStringProperty(item, 'message');
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
function uniqueMessages(messages) {
|
|
28
|
+
return Array.from(new Set(messages.filter(function (message) {
|
|
29
|
+
return message !== undefined;
|
|
30
|
+
})));
|
|
31
|
+
}
|
|
32
|
+
function readGitHubErrorDetails(error) {
|
|
33
|
+
const response = readReflectedProperty(error, 'response');
|
|
34
|
+
const responseData = readReflectedProperty(response, 'data');
|
|
35
|
+
return uniqueMessages([
|
|
36
|
+
readStringProperty(error, 'message'),
|
|
37
|
+
readStringProperty(responseData, 'message'),
|
|
38
|
+
...readGitHubErrorMessages(readReflectedProperty(error, 'errors')),
|
|
39
|
+
...readGitHubErrorMessages(readReflectedProperty(response, 'errors')),
|
|
40
|
+
...readGitHubErrorMessages(readReflectedProperty(responseData, 'errors'))
|
|
41
|
+
]);
|
|
42
|
+
}
|
|
15
43
|
function createGitHubRequestError(error) {
|
|
16
|
-
|
|
44
|
+
const details = readGitHubErrorDetails(error);
|
|
45
|
+
const detailText = details.length === 0 ? '' : `: ${details.join('; ')}`;
|
|
46
|
+
return new Error(`GitHub API request failed (${String(readGitHubErrorStatus(error))}) for ${readGitHubErrorPath(error)}${detailText}`, {
|
|
17
47
|
cause: error
|
|
18
48
|
});
|
|
19
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"github-api-request.js","sourceRoot":"","sources":["../../../../../source/command-line-interface/runner/github-api-request.ts"],"names":[],"mappings":"AAAA,SAAS,uBAAuB;IAC5B,OAAO,YAAY,CAAC;AACxB,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAc,EAAE,QAAgB;IAC3D,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAY,CAAC;AAC/D,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAc;IACzC,OAAO,MAAM,CAAC,qBAAqB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAc;IACvC,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,qBAAqB,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;IAC1F,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IAC/B,OAAO,GAAG,SAAS,CAAC,QAAQ,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC;AACtD,CAAC;AAED,SAAS,wBAAwB,CAAC,KAAc;IAC5C,OAAO,IAAI,KAAK,CACZ,8BAA8B,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"github-api-request.js","sourceRoot":"","sources":["../../../../../source/command-line-interface/runner/github-api-request.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import { resolveGitHubResponse, resolveOptionalGitHubResponse } from "./github-api-request.js";
|
|
2
2
|
const missingGitHubResourceStatusCode = 404;
|
|
3
|
+
const temporaryBranchHeadLength = 12;
|
|
4
|
+
function temporaryBranchName(branch, expectedHeadOid) {
|
|
5
|
+
return `${branch}/packtory-staging-${expectedHeadOid.slice(0, temporaryBranchHeadLength)}`;
|
|
6
|
+
}
|
|
3
7
|
function createCommitOnBranchMutation() {
|
|
4
8
|
return `
|
|
5
9
|
mutation CreateCommitOnBranch(
|
|
@@ -32,7 +36,7 @@ export function createReleasePullRequestCommitClient(dependencies) {
|
|
|
32
36
|
}), missingGitHubResourceStatusCode);
|
|
33
37
|
return response?.data;
|
|
34
38
|
}
|
|
35
|
-
async function pointBranchAtHead(branch,
|
|
39
|
+
async function pointBranchAtHead(branch, targetHeadOid) {
|
|
36
40
|
const branchRef = await readBranchRef(branch);
|
|
37
41
|
if (branchRef === undefined) {
|
|
38
42
|
await resolveGitHubResponse(dependencies.git.createRef({
|
|
@@ -40,11 +44,11 @@ export function createReleasePullRequestCommitClient(dependencies) {
|
|
|
40
44
|
owner: dependencies.owner,
|
|
41
45
|
ref: `refs/heads/${branch}`,
|
|
42
46
|
repo: dependencies.repo,
|
|
43
|
-
sha:
|
|
47
|
+
sha: targetHeadOid
|
|
44
48
|
}));
|
|
45
49
|
return;
|
|
46
50
|
}
|
|
47
|
-
if (branchRef.object.sha ===
|
|
51
|
+
if (branchRef.object.sha === targetHeadOid) {
|
|
48
52
|
return;
|
|
49
53
|
}
|
|
50
54
|
await resolveGitHubResponse(dependencies.git.updateRef({
|
|
@@ -53,20 +57,36 @@ export function createReleasePullRequestCommitClient(dependencies) {
|
|
|
53
57
|
owner: dependencies.owner,
|
|
54
58
|
ref: `heads/${branch}`,
|
|
55
59
|
repo: dependencies.repo,
|
|
56
|
-
sha:
|
|
60
|
+
sha: targetHeadOid
|
|
57
61
|
}));
|
|
58
62
|
}
|
|
63
|
+
async function deleteBranchRef(branch) {
|
|
64
|
+
await resolveOptionalGitHubResponse(dependencies.git.deleteRef({
|
|
65
|
+
headers: dependencies.headers,
|
|
66
|
+
owner: dependencies.owner,
|
|
67
|
+
repo: dependencies.repo,
|
|
68
|
+
ref: `heads/${branch}`
|
|
69
|
+
}), missingGitHubResourceStatusCode);
|
|
70
|
+
}
|
|
59
71
|
return {
|
|
60
72
|
async createCommitOnBranch(input) {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
73
|
+
const temporaryBranch = temporaryBranchName(input.branch, input.expectedHeadOid);
|
|
74
|
+
await pointBranchAtHead(temporaryBranch, input.expectedHeadOid);
|
|
75
|
+
try {
|
|
76
|
+
const response = await resolveGitHubResponse(dependencies.graphql(createCommitOnBranchMutation(), {
|
|
77
|
+
additions: input.additions,
|
|
78
|
+
branchName: temporaryBranch,
|
|
79
|
+
expectedHeadOid: input.expectedHeadOid,
|
|
80
|
+
headline: input.message,
|
|
81
|
+
repositoryNameWithOwner: dependencies.repositoryNameWithOwner
|
|
82
|
+
}));
|
|
83
|
+
const releaseHead = response.createCommitOnBranch.commit.oid;
|
|
84
|
+
await pointBranchAtHead(input.branch, releaseHead);
|
|
85
|
+
return releaseHead;
|
|
86
|
+
}
|
|
87
|
+
finally {
|
|
88
|
+
await deleteBranchRef(temporaryBranch);
|
|
89
|
+
}
|
|
70
90
|
}
|
|
71
91
|
};
|
|
72
92
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"release-pr-branch-commit.js","sourceRoot":"","sources":["../../../../../source/command-line-interface/runner/release-pr-branch-commit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"release-pr-branch-commit.js","sourceRoot":"","sources":["../../../../../source/command-line-interface/runner/release-pr-branch-commit.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/sbom.cdx.json
CHANGED
|
@@ -16,9 +16,9 @@
|
|
|
16
16
|
"component": {
|
|
17
17
|
"type": "library",
|
|
18
18
|
"name": "@packtory/cli",
|
|
19
|
-
"version": "0.0.
|
|
20
|
-
"bom-ref": "pkg:npm/@packtory/cli@0.0.
|
|
21
|
-
"purl": "pkg:npm/@packtory/cli@0.0.
|
|
19
|
+
"version": "0.0.56",
|
|
20
|
+
"bom-ref": "pkg:npm/@packtory/cli@0.0.56",
|
|
21
|
+
"purl": "pkg:npm/@packtory/cli@0.0.56"
|
|
22
22
|
}
|
|
23
23
|
},
|
|
24
24
|
"components": [
|
|
@@ -203,7 +203,7 @@
|
|
|
203
203
|
"ref": "pkg:npm/@octokit/plugin-rest-endpoint-methods@17.0.0"
|
|
204
204
|
},
|
|
205
205
|
{
|
|
206
|
-
"ref": "pkg:npm/@packtory/cli@0.0.
|
|
206
|
+
"ref": "pkg:npm/@packtory/cli@0.0.56",
|
|
207
207
|
"dependsOn": [
|
|
208
208
|
"pkg:npm/@octokit/core@7.0.6",
|
|
209
209
|
"pkg:npm/@octokit/plugin-paginate-rest@14.0.0",
|