@allocator-one/rcl 4.5.19 → 4.5.21
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/README.md +4 -3
- package/dist/converge/launch-guard.d.ts +2 -0
- package/dist/converge/launch-guard.js +15 -8
- package/dist/converge/launch-guard.js.map +1 -1
- package/dist/converge/ordinary-pending-export.js +1 -1
- package/dist/converge/ordinary-pending-export.js.map +1 -1
- package/dist/converge/ordinary-pending-package.js +3 -1
- package/dist/converge/ordinary-pending-package.js.map +1 -1
- package/dist/converge/pending-finalization-receipt.d.ts +6 -2
- package/dist/converge/pending-finalization-receipt.js +7 -3
- package/dist/converge/pending-finalization-receipt.js.map +1 -1
- package/dist/converge/pending-legacy-resume.d.ts +2 -0
- package/dist/converge/pending-legacy-resume.js +3 -1
- package/dist/converge/pending-legacy-resume.js.map +1 -1
- package/dist/index.js +36 -17
- package/dist/index.js.map +1 -1
- package/dist/resolver/git.d.ts +2 -0
- package/dist/resolver/git.js +6 -0
- package/dist/resolver/git.js.map +1 -1
- package/dist/resolver/github.js +5 -3
- package/dist/resolver/github.js.map +1 -1
- package/dist/resolver/target.d.ts +4 -1
- package/dist/resolver/target.js +13 -4
- package/dist/resolver/target.js.map +1 -1
- package/dist/resolver/types.d.ts +1 -1
- package/package.json +1 -1
package/dist/resolver/git.d.ts
CHANGED
|
@@ -6,6 +6,8 @@ export interface GitHeads {
|
|
|
6
6
|
/** Merge-base of HEAD with the remote default branch (`origin/HEAD`, then `origin/main`). */
|
|
7
7
|
baseSha?: string;
|
|
8
8
|
}
|
|
9
|
+
/** Resolve the actual common ancestor when both explicitly named commits are available locally. */
|
|
10
|
+
export declare function resolveGitMergeBase(baseSha: string, headSha: string, cwd?: string): Promise<string | undefined>;
|
|
9
11
|
/**
|
|
10
12
|
* Best-effort exact-head binding for local review modes (IO-12475 section
|
|
11
13
|
* 8.1). Never throws: outside a repository, on an unborn branch, or without
|
package/dist/resolver/git.js
CHANGED
|
@@ -44,6 +44,12 @@ async function revParse(cwd, ...args) {
|
|
|
44
44
|
* clones have no `origin/HEAD`, so the fallbacks carry real weight.
|
|
45
45
|
*/
|
|
46
46
|
const DEFAULT_BRANCH_FALLBACKS = ['origin/main', 'origin/master'];
|
|
47
|
+
/** Resolve the actual common ancestor when both explicitly named commits are available locally. */
|
|
48
|
+
export async function resolveGitMergeBase(baseSha, headSha, cwd = process.cwd()) {
|
|
49
|
+
if (!FULL_OBJECT_ID.test(baseSha) || !FULL_OBJECT_ID.test(headSha))
|
|
50
|
+
return undefined;
|
|
51
|
+
return revParse(cwd, 'merge-base', baseSha, headSha);
|
|
52
|
+
}
|
|
47
53
|
/**
|
|
48
54
|
* Best-effort exact-head binding for local review modes (IO-12475 section
|
|
49
55
|
* 8.1). Never throws: outside a repository, on an unborn branch, or without
|
package/dist/resolver/git.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/resolver/git.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/resolver/git.ts"],"names":[],"mappings":"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"}
|
package/dist/resolver/github.js
CHANGED
|
@@ -90,7 +90,9 @@ async function fetchChangedFiles(octokit, target, pr, requireMergeBase) {
|
|
|
90
90
|
basehead: `${pr.base.sha}...${pr.head.sha}`,
|
|
91
91
|
});
|
|
92
92
|
files = data.files ?? [];
|
|
93
|
-
|
|
93
|
+
const comparisonBase = data.merge_base_commit?.sha;
|
|
94
|
+
mergeBaseSha = typeof comparisonBase === 'string' && /^[a-f0-9]{40}$/.test(comparisonBase)
|
|
95
|
+
? comparisonBase : undefined;
|
|
94
96
|
}
|
|
95
97
|
catch {
|
|
96
98
|
// A compare the API refuses (e.g. an object id it cannot resolve for
|
|
@@ -104,7 +106,7 @@ async function fetchChangedFiles(octokit, target, pr, requireMergeBase) {
|
|
|
104
106
|
throw new Error("The exact PR comparison did not provide a valid effective merge base.");
|
|
105
107
|
}
|
|
106
108
|
if (files !== undefined && files.length === pr.changed_files)
|
|
107
|
-
return { files, ...(
|
|
109
|
+
return { files, ...(mergeBaseSha ? { mergeBaseSha } : {}) };
|
|
108
110
|
}
|
|
109
111
|
const listed = await octokit.paginate(octokit.pulls.listFiles, {
|
|
110
112
|
owner: target.owner,
|
|
@@ -121,7 +123,7 @@ async function fetchChangedFiles(octokit, target, pr, requireMergeBase) {
|
|
|
121
123
|
if (listed.length !== recheck.changed_files) {
|
|
122
124
|
throw new Error(`PR #${target.number} reports ${recheck.changed_files} changed files but the API listed ${listed.length} — the diff is incomplete (GitHub lists at most 3,000 files), refusing to review it as if it were whole.`);
|
|
123
125
|
}
|
|
124
|
-
return { files: listed, ...(
|
|
126
|
+
return { files: listed, ...(mergeBaseSha ? { mergeBaseSha } : {}) };
|
|
125
127
|
}
|
|
126
128
|
export async function fetchPRDiff(target, token, octokitClient, options = {}) {
|
|
127
129
|
const octokit = octokitClient ?? await createGitHubClient(token);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"github.js","sourceRoot":"","sources":["../../src/resolver/github.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"github.js","sourceRoot":"","sources":["../../src/resolver/github.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAc9E,2EAA2E;AAC3E,2EAA2E;AAC3E,4EAA4E;AAC5E,kDAAkD;AAClD,MAAM,CAAC,MAAM,oBAAoB,GAAG,8CAA8C,CAAC;AACnF,MAAM,CAAC,MAAM,mBAAmB,GAAG,iBAAiB,CAAC;AACrD,MAAM,QAAQ,GAAG,IAAI,MAAM,CAAC,IAAI,oBAAoB,GAAG,CAAC,CAAC;AACzD,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,IAAI,mBAAmB,GAAG,CAAC,CAAC;AAEvD,uFAAuF;AACvF,MAAM,UAAU,SAAS,CAAC,KAAa,EAAE,IAAY;IACnD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAC/F,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACzB,CAAC;AAED,kGAAkG;AAClG,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACrC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACpC,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,CAAE,EAAE,KAAK,CAAC,CAAC,CAAE,CAAC,CAAC;AACzC,CAAC;AAED,yEAAyE;AACzE,6EAA6E;AAC7E,0EAA0E;AAC1E,qEAAqE;AACrE,MAAM,MAAM,GACV,oHAAoH,CAAC;AACvH,MAAM,QAAQ,GAAG,gCAAgC,CAAC;AAElD;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,MAAc;IAC3C,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACtD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,MAAc;IAC9C,qEAAqE;IACrE,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACxC,IAAI,UAAU,EAAE,CAAC;QACf,OAAO;YACL,KAAK,EAAE,UAAU,CAAC,CAAC,CAAE;YACrB,IAAI,EAAE,UAAU,CAAC,CAAC,CAAE;YACpB,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAE,EAAE,EAAE,CAAC;SACrC,CAAC;IACJ,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC1C,IAAI,UAAU,EAAE,CAAC;QACf,OAAO;YACL,KAAK,EAAE,UAAU,CAAC,CAAC,CAAE;YACrB,IAAI,EAAE,UAAU,CAAC,CAAC,CAAE;YACpB,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAE,EAAE,EAAE,CAAC;SACrC,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,KAAK,CACb,2BAA2B,MAAM,2CAA2C,CAC7E,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAO7B;;;;;;;;;;;;;;GAcG;AACH,KAAK,UAAU,iBAAiB,CAC9B,OAAgB,EAChB,MAAoB,EACpB,EAAe,EACf,gBAAyB;IAEzB,IAAI,YAAgC,CAAC;IACrC,IAAI,gBAAgB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/F,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;IAC5F,CAAC;IACD,IAAI,gBAAgB,IAAI,EAAE,CAAC,aAAa,IAAI,gBAAgB,EAAE,CAAC;QAC7D,IAAI,KAAgC,CAAC;QACrC,IAAI,CAAC;YACH,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,0BAA0B,CAAC;gBAC9D,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;aAC5C,CAAC,CAAC;YACH,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YACzB,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,GAAG,CAAC;YACnD,YAAY,GAAG,OAAO,cAAc,KAAK,QAAQ,IAAI,gBAAgB,CAAC,IAAI,CAAC,cAAc,CAAC;gBACxF,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC;QACjC,CAAC;QAAC,MAAM,CAAC;YACP,qEAAqE;YACrE,mEAAmE;YACnE,kDAAkD;YAClD,KAAK,GAAG,SAAS,CAAC;QACpB,CAAC;QACD,yEAAyE;QACzE,qEAAqE;QACrE,IAAI,gBAAgB,IAAI,CAAC,OAAO,YAAY,KAAK,QAAQ,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC;YACnG,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAC;QAC3F,CAAC;QACD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,KAAK,EAAE,CAAC,aAAa;YAAE,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IAC5H,CAAC;IAED,MAAM,MAAM,GAAkB,MAAM,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE;QAC5E,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,WAAW,EAAE,MAAM,CAAC,MAAM;QAC1B,QAAQ,EAAE,GAAG;KACd,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,CAAC,MAAM,oBAAoB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IACnE,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,EAAE,CAAC,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACzE,MAAM,IAAI,KAAK,CACb,OAAO,MAAM,CAAC,MAAM,WAAW,EAAE,CAAC,IAAI,CAAC,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,eAAe,MAAM,CAAC,MAAM,8CAA8C,CAClL,CAAC;IACJ,CAAC;IACD,0EAA0E;IAC1E,0EAA0E;IAC1E,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,CAAC,aAAa,EAAE,CAAC;QAC5C,MAAM,IAAI,KAAK,CACb,OAAO,MAAM,CAAC,MAAM,YAAY,OAAO,CAAC,aAAa,qCAAqC,MAAM,CAAC,MAAM,0GAA0G,CAClN,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;AACtE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,MAAoB,EACpB,KAAc,EACd,aAAuB,EACvB,UAA0C,EAAE;IAE5C,MAAM,OAAO,GAAG,aAAa,IAAI,MAAM,kBAAkB,CAAC,KAAK,CAAC,CAAC;IACjE,MAAM,EAAE,GAAG,CAAC,MAAM,oBAAoB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IAE9D,2EAA2E;IAC3E,0EAA0E;IAC1E,2EAA2E;IAC3E,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,MAAM,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,CAAC,gBAAgB,KAAK,IAAI,CAAC,CAAC;IAEhH,MAAM,QAAQ,GAAe;QAC3B,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,KAAK,EAAE,EAAE,CAAC,KAAK;QACf,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,EAAE;QACnB,MAAM,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,IAAI,SAAS;QACnC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG;QACjB,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG;QACjB,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG;QACpB,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG;QACpB,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzC,GAAG,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,EAAE,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,GAAG,EAAE,EAAE,CAAC,QAAQ;QAChB,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACpC,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,KAAK;KACzB,CAAC;IAEF,MAAM,WAAW,GAAiB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAClD,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,MAAM,EAAE,CAAC,CAAC,MAA8B;QACxC,SAAS,EAAE,CAAC,CAAC,SAAS;QACtB,SAAS,EAAE,CAAC,CAAC,SAAS;QACtB,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,EAAE;QACpB,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC;QACpC,gBAAgB,EAAE,CAAC,CAAC,iBAAiB;QACrC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACrC,CAAC,CAAC,CAAC;IAEJ,OAAO;QACL,KAAK,EAAE,WAAW;QAClB,QAAQ;QACR,MAAM,EAAE,QAAQ;KACjB,CAAC;AACJ,CAAC"}
|
|
@@ -3,7 +3,7 @@ import type { GitHeads } from './git.js';
|
|
|
3
3
|
import { type RunHeaderInput } from '../report/run-header.js';
|
|
4
4
|
/**
|
|
5
5
|
* Exact-head binding (IO-12475 section 8.1): which commit a diff belongs
|
|
6
|
-
* to. PR mode takes
|
|
6
|
+
* to. PR mode takes GitHub's head and comparison merge base; git modes use the
|
|
7
7
|
* HEAD the caller resolved around the diff read (see `runReview`); a patch
|
|
8
8
|
* file carries only its digest unless the caller vouches for its head with
|
|
9
9
|
* --head-sha — the file could have come from anywhere, so rcl never guesses
|
|
@@ -14,6 +14,8 @@ export type GitDiffMode = 'staged' | 'working-tree';
|
|
|
14
14
|
export interface TargetOverrides {
|
|
15
15
|
headSha?: string;
|
|
16
16
|
baseSha?: string;
|
|
17
|
+
/** Internal non-dispatching export/finalization only; retained evidence authenticates the historical base. */
|
|
18
|
+
historicalPendingRecovery?: boolean;
|
|
17
19
|
/**
|
|
18
20
|
* The pull request a patch-file review is evidence for (`owner/repo#N` or a
|
|
19
21
|
* pull request URL), so Harness can verify its head and count the run for
|
|
@@ -26,6 +28,7 @@ export interface TargetOverrides {
|
|
|
26
28
|
export declare function resolveReviewTarget(diff: Diff, gitMode: GitDiffMode | undefined, opts: TargetOverrides, deps?: {
|
|
27
29
|
gitHeads?: GitHeads;
|
|
28
30
|
resolveGitHeads?: () => Promise<GitHeads>;
|
|
31
|
+
resolveMergeBase?: (baseSha: string, headSha: string) => Promise<string | undefined>;
|
|
29
32
|
}): Promise<ReviewTarget>;
|
|
30
33
|
/**
|
|
31
34
|
* `--expect-head-sha`: refuse to review a target whose head is not the one
|
package/dist/resolver/target.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { resolveGitHeads } from './git.js';
|
|
1
|
+
import { resolveGitHeads, resolveGitMergeBase } from './git.js';
|
|
2
2
|
import { validateSha } from '../report/run-header.js';
|
|
3
3
|
import { isGitHubTarget, parseGitHubTarget } from './github.js';
|
|
4
4
|
import { parseRepoName } from './github.js';
|
|
@@ -20,7 +20,7 @@ export async function resolveReviewTarget(diff, gitMode, opts, deps = {}) {
|
|
|
20
20
|
prNumber: m.number,
|
|
21
21
|
url: m.url,
|
|
22
22
|
headSha: m.headSha,
|
|
23
|
-
baseSha: m.baseSha,
|
|
23
|
+
baseSha: m.mergeBaseSha ?? m.baseSha,
|
|
24
24
|
headRef: m.head,
|
|
25
25
|
baseRef: m.base,
|
|
26
26
|
};
|
|
@@ -41,11 +41,20 @@ export async function resolveReviewTarget(diff, gitMode, opts, deps = {}) {
|
|
|
41
41
|
throw new Error('A patch review bound to a pull request by --for-pr needs --head-sha: evidence binds to the commit it reviewed.');
|
|
42
42
|
}
|
|
43
43
|
const pr = attributed && opts.headSha !== undefined ? attributed : undefined;
|
|
44
|
+
const headSha = opts.headSha === undefined ? undefined : validateSha(opts.headSha, '--head-sha');
|
|
45
|
+
const baseSha = opts.baseSha === undefined ? undefined : validateSha(opts.baseSha, '--base-sha');
|
|
46
|
+
if (pr && headSha && baseSha && !opts.historicalPendingRecovery) {
|
|
47
|
+
const mergeBase = await (deps.resolveMergeBase ?? resolveGitMergeBase)(baseSha, headSha);
|
|
48
|
+
if (mergeBase !== undefined && mergeBase !== baseSha) {
|
|
49
|
+
throw new Error(`The supplied patch base ${baseSha} is not its merge base ${mergeBase}. ` +
|
|
50
|
+
'Recapture the PR patch from git merge-base(base, head) and pass that commit as --base-sha.');
|
|
51
|
+
}
|
|
52
|
+
}
|
|
44
53
|
return {
|
|
45
54
|
kind: 'patch',
|
|
46
55
|
...(pr ? { repo: `${pr.owner}/${pr.repo}`, prNumber: pr.number, url: `https://github.com/${pr.owner}/${pr.repo}/pull/${pr.number}` } : {}),
|
|
47
|
-
...(
|
|
48
|
-
...(
|
|
56
|
+
...(headSha !== undefined ? { headSha } : {}),
|
|
57
|
+
...(baseSha !== undefined ? { baseSha } : {}),
|
|
49
58
|
};
|
|
50
59
|
}
|
|
51
60
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"target.js","sourceRoot":"","sources":["../../src/resolver/target.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"target.js","sourceRoot":"","sources":["../../src/resolver/target.ts"],"names":[],"mappings":"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"}
|
package/dist/resolver/types.d.ts
CHANGED
|
@@ -28,7 +28,7 @@ export interface PRMetadata {
|
|
|
28
28
|
*/
|
|
29
29
|
headSha: string;
|
|
30
30
|
baseSha: string;
|
|
31
|
-
/** Actual
|
|
31
|
+
/** Actual comparison merge base; baseSha remains the target-branch tip. */
|
|
32
32
|
mergeBaseSha?: string;
|
|
33
33
|
mergeCommitSha?: string;
|
|
34
34
|
url: string;
|