@gitkraken/core-gitlens 0.3.0 → 0.3.1
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/CHANGELOG.md +8 -1
- package/dist/git/cache.d.ts +12 -6
- package/dist/git/cache.d.ts.map +1 -1
- package/dist/git/cache.js +40 -39
- package/dist/git/cache.js.map +1 -1
- package/dist/git/context.d.ts +19 -0
- package/dist/git/context.d.ts.map +1 -1
- package/dist/git/context.js.map +1 -1
- package/dist/git/features.d.ts +1 -1
- package/dist/git/features.d.ts.map +1 -1
- package/dist/git/features.js +1 -0
- package/dist/git/features.js.map +1 -1
- package/dist/git/models/graph.d.ts +96 -0
- package/dist/git/models/graph.d.ts.map +1 -1
- package/dist/git/models/graph.js +24 -1
- package/dist/git/models/graph.js.map +1 -1
- package/dist/git/models/remoteProvider.d.ts +1 -0
- package/dist/git/models/remoteProvider.d.ts.map +1 -1
- package/dist/git/models/remoteProvider.js.map +1 -1
- package/dist/git/models/repository.d.ts +21 -12
- package/dist/git/models/repository.d.ts.map +1 -1
- package/dist/git/models/repository.js +70 -84
- package/dist/git/models/repository.js.map +1 -1
- package/dist/git/models/statusFile.d.ts +9 -0
- package/dist/git/models/statusFile.d.ts.map +1 -1
- package/dist/git/models/statusFile.js +11 -0
- package/dist/git/models/statusFile.js.map +1 -1
- package/dist/git/providers/commits.d.ts +4 -0
- package/dist/git/providers/commits.d.ts.map +1 -1
- package/dist/git/providers/config.d.ts +1 -3
- package/dist/git/providers/config.d.ts.map +1 -1
- package/dist/git/providers/operations.d.ts +39 -13
- package/dist/git/providers/operations.d.ts.map +1 -1
- package/dist/git/remotes/custom.d.ts +2 -0
- package/dist/git/remotes/custom.d.ts.map +1 -1
- package/dist/git/remotes/custom.js +20 -0
- package/dist/git/remotes/custom.js.map +1 -1
- package/dist/git/utils/contributor.utils.d.ts +3 -0
- package/dist/git/utils/contributor.utils.d.ts.map +1 -1
- package/dist/git/utils/contributor.utils.js +22 -0
- package/dist/git/utils/contributor.utils.js.map +1 -1
- package/dist/git/utils/reachability.utils.d.ts +37 -0
- package/dist/git/utils/reachability.utils.d.ts.map +1 -0
- package/dist/git/utils/reachability.utils.js +96 -0
- package/dist/git/utils/reachability.utils.js.map +1 -0
- package/dist/git/watching/watchService.d.ts +4 -2
- package/dist/git/watching/watchService.d.ts.map +1 -1
- package/dist/git/watching/watchService.js +8 -3
- package/dist/git/watching/watchService.js.map +1 -1
- package/dist/git/watching/watchSession.d.ts +14 -12
- package/dist/git/watching/watchSession.d.ts.map +1 -1
- package/dist/git/watching/watchSession.js +56 -55
- package/dist/git/watching/watchSession.js.map +1 -1
- package/dist/git-cli/providers/branches.d.ts.map +1 -1
- package/dist/git-cli/providers/branches.js +1 -0
- package/dist/git-cli/providers/branches.js.map +1 -1
- package/dist/git-cli/providers/commits.d.ts +1 -0
- package/dist/git-cli/providers/commits.d.ts.map +1 -1
- package/dist/git-cli/providers/commits.js +12 -0
- package/dist/git-cli/providers/commits.js.map +1 -1
- package/dist/git-cli/providers/config.d.ts +8 -4
- package/dist/git-cli/providers/config.d.ts.map +1 -1
- package/dist/git-cli/providers/config.js +62 -39
- package/dist/git-cli/providers/config.js.map +1 -1
- package/dist/git-cli/providers/diff.d.ts.map +1 -1
- package/dist/git-cli/providers/diff.js +1 -1
- package/dist/git-cli/providers/diff.js.map +1 -1
- package/dist/git-cli/providers/graph.d.ts.map +1 -1
- package/dist/git-cli/providers/graph.js +132 -14
- package/dist/git-cli/providers/graph.js.map +1 -1
- package/dist/git-cli/providers/operations.d.ts +6 -5
- package/dist/git-cli/providers/operations.d.ts.map +1 -1
- package/dist/git-cli/providers/operations.js +97 -95
- package/dist/git-cli/providers/operations.js.map +1 -1
- package/dist/git-cli/providers/stash.d.ts.map +1 -1
- package/dist/git-cli/providers/stash.js +20 -2
- package/dist/git-cli/providers/stash.js.map +1 -1
- package/dist/git-cli/providers/status.d.ts.map +1 -1
- package/dist/git-cli/providers/status.js +5 -2
- package/dist/git-cli/providers/status.js.map +1 -1
- package/dist/ipc/discovery.d.ts +22 -0
- package/dist/ipc/discovery.d.ts.map +1 -1
- package/dist/ipc/discovery.js +111 -2
- package/dist/ipc/discovery.js.map +1 -1
- package/dist/plus/agents/providers/claudeCodeProvider.d.ts +73 -20
- package/dist/plus/agents/providers/claudeCodeProvider.d.ts.map +1 -1
- package/dist/plus/agents/providers/claudeCodeProvider.js +394 -88
- package/dist/plus/agents/providers/claudeCodeProvider.js.map +1 -1
- package/dist/plus/agents/types.d.ts +62 -11
- package/dist/plus/agents/types.d.ts.map +1 -1
- package/dist/plus/ai/models/model.d.ts +1 -1
- package/dist/plus/ai/models/model.d.ts.map +1 -1
- package/dist/plus/ai/models/model.js.map +1 -1
- package/dist/plus/ai/models/provider.d.ts +3 -0
- package/dist/plus/ai/models/provider.d.ts.map +1 -1
- package/dist/plus/ai/providers/gitkrakenProvider.d.ts +1 -1
- package/dist/plus/ai/providers/gitkrakenProvider.d.ts.map +1 -1
- package/dist/plus/ai/providers/gitkrakenProvider.js +4 -1
- package/dist/plus/ai/providers/gitkrakenProvider.js.map +1 -1
- package/dist/plus/ai/providers/openAICompatibleProviderBase.d.ts +4 -3
- package/dist/plus/ai/providers/openAICompatibleProviderBase.d.ts.map +1 -1
- package/dist/plus/ai/providers/openAICompatibleProviderBase.js +9 -6
- package/dist/plus/ai/providers/openAICompatibleProviderBase.js.map +1 -1
- package/dist/plus/ai/utils/ai.utils.d.ts.map +1 -1
- package/dist/plus/ai/utils/ai.utils.js +2 -0
- package/dist/plus/ai/utils/ai.utils.js.map +1 -1
- package/dist/plus/git-github/api/github.d.ts +2 -0
- package/dist/plus/git-github/api/github.d.ts.map +1 -1
- package/dist/plus/git-github/api/github.js +93 -6
- package/dist/plus/git-github/api/github.js.map +1 -1
- package/dist/plus/git-github/providers/github/refs.js +1 -1
- package/dist/utils/date.d.ts.map +1 -1
- package/dist/utils/date.js +6 -0
- package/dist/utils/date.js.map +1 -1
- package/dist/utils/debounce.js +1 -1
- package/dist/utils/iterable.d.ts +7 -1
- package/dist/utils/iterable.d.ts.map +1 -1
- package/dist/utils/iterable.js +12 -4
- package/dist/utils/iterable.js.map +1 -1
- package/dist/utils/object.d.ts +22 -1
- package/dist/utils/object.d.ts.map +1 -1
- package/dist/utils/object.js +56 -3
- package/dist/utils/object.js.map +1 -1
- package/dist/utils/paging.js +14 -15
- package/dist/utils/paging.js.map +1 -1
- package/dist/utils/promiseCache.d.ts.map +1 -1
- package/dist/utils/promiseCache.js +12 -4
- package/dist/utils/promiseCache.js.map +1 -1
- package/dist/utils/string.js +1 -1
- package/package.json +1 -1
- package/src/git/cache.ts +58 -70
- package/src/git/context.ts +21 -0
- package/src/git/features.ts +2 -0
- package/src/git/models/graph.ts +97 -0
- package/src/git/models/remoteProvider.ts +1 -0
- package/src/git/models/repository.ts +84 -93
- package/src/git/models/statusFile.ts +12 -0
- package/src/git/providers/commits.ts +4 -0
- package/src/git/providers/config.ts +1 -5
- package/src/git/providers/operations.ts +42 -22
- package/src/git/remotes/custom.ts +23 -0
- package/src/git/utils/contributor.utils.ts +24 -0
- package/src/git/utils/reachability.utils.ts +109 -0
- package/src/git/watching/watchService.ts +9 -4
- package/src/git/watching/watchSession.ts +61 -55
- package/src/git-cli/providers/branches.ts +1 -0
- package/src/git-cli/providers/commits.ts +24 -0
- package/src/git-cli/providers/config.ts +63 -49
- package/src/git-cli/providers/diff.ts +2 -1
- package/src/git-cli/providers/graph.ts +145 -14
- package/src/git-cli/providers/operations.ts +118 -130
- package/src/git-cli/providers/stash.ts +20 -2
- package/src/git-cli/providers/status.ts +11 -3
- package/src/ipc/discovery.ts +132 -2
- package/src/plus/agents/providers/claudeCodeProvider.ts +430 -90
- package/src/plus/agents/types.ts +59 -11
- package/src/plus/ai/models/model.ts +1 -0
- package/src/plus/ai/models/provider.ts +7 -1
- package/src/plus/ai/providers/gitkrakenProvider.ts +4 -0
- package/src/plus/ai/providers/openAICompatibleProviderBase.ts +21 -4
- package/src/plus/ai/utils/ai.utils.ts +2 -0
- package/src/plus/git-github/api/github.ts +120 -8
- package/src/plus/git-github/providers/github/refs.ts +1 -1
- package/src/utils/date.ts +5 -0
- package/src/utils/debounce.ts +1 -1
- package/src/utils/iterable.ts +14 -3
- package/src/utils/object.ts +55 -4
- package/src/utils/paging.ts +14 -14
- package/src/utils/promiseCache.ts +24 -16
- package/src/utils/string.ts +1 -1
package/dist/utils/object.d.ts
CHANGED
|
@@ -1,4 +1,25 @@
|
|
|
1
|
-
|
|
1
|
+
/**
|
|
2
|
+
* Structural deep-equality. Walks both values and short-circuits on the first difference without
|
|
3
|
+
* serializing to a string (unlike a `JSON.stringify` compare): the `a === b` fast path skips
|
|
4
|
+
* unchanged shared subtrees, and unequal values bail at the first mismatched field. Handles
|
|
5
|
+
* primitives, `null`/`undefined`, `Date` (by timestamp), arrays, and plain objects.
|
|
6
|
+
*
|
|
7
|
+
* Differs from the prior `JSON.stringify` compare in three ways — each intended or matching the old
|
|
8
|
+
* behavior:
|
|
9
|
+
* - Key-order-insensitive (the old compare was order-sensitive). Observable at one caller
|
|
10
|
+
* (`configuration.update`, when a config value equals its schema default but with different key
|
|
11
|
+
* order), where it harmlessly treats the value as the default rather than persisting a redundant
|
|
12
|
+
* override.
|
|
13
|
+
* - A present-but-`undefined` key is distinct from an absent key (the old compare dropped
|
|
14
|
+
* `undefined` keys).
|
|
15
|
+
* - `Map`/`Set`/`RegExp` and other exotic objects are NOT deep-compared — they reduce to their
|
|
16
|
+
* own-enumerable keys (so two are effectively always-equal), same as the old stringify behavior.
|
|
17
|
+
* No caller compares those.
|
|
18
|
+
*
|
|
19
|
+
* Assumes acyclic input — it recurses without a cycle guard (a self-referential value would
|
|
20
|
+
* overflow the stack). Every caller compares JSON-origin or same-shape data.
|
|
21
|
+
*/
|
|
22
|
+
export declare function areEqual(a: unknown, b: unknown): boolean;
|
|
2
23
|
type Primitive = string | number | boolean;
|
|
3
24
|
type FlattenedValue = string | number | boolean;
|
|
4
25
|
type AddPrefix<P extends string | undefined, K extends string> = P extends '' | undefined ? K : `${P}.${K}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../../src/utils/object.ts"],"names":[],"mappings":"AAAA,wBAAgB,QAAQ,CAAC,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../../src/utils/object.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/object.js
CHANGED
|
@@ -1,12 +1,65 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Structural deep-equality. Walks both values and short-circuits on the first difference without
|
|
3
|
+
* serializing to a string (unlike a `JSON.stringify` compare): the `a === b` fast path skips
|
|
4
|
+
* unchanged shared subtrees, and unequal values bail at the first mismatched field. Handles
|
|
5
|
+
* primitives, `null`/`undefined`, `Date` (by timestamp), arrays, and plain objects.
|
|
6
|
+
*
|
|
7
|
+
* Differs from the prior `JSON.stringify` compare in three ways — each intended or matching the old
|
|
8
|
+
* behavior:
|
|
9
|
+
* - Key-order-insensitive (the old compare was order-sensitive). Observable at one caller
|
|
10
|
+
* (`configuration.update`, when a config value equals its schema default but with different key
|
|
11
|
+
* order), where it harmlessly treats the value as the default rather than persisting a redundant
|
|
12
|
+
* override.
|
|
13
|
+
* - A present-but-`undefined` key is distinct from an absent key (the old compare dropped
|
|
14
|
+
* `undefined` keys).
|
|
15
|
+
* - `Map`/`Set`/`RegExp` and other exotic objects are NOT deep-compared — they reduce to their
|
|
16
|
+
* own-enumerable keys (so two are effectively always-equal), same as the old stringify behavior.
|
|
17
|
+
* No caller compares those.
|
|
18
|
+
*
|
|
19
|
+
* Assumes acyclic input — it recurses without a cycle guard (a self-referential value would
|
|
20
|
+
* overflow the stack). Every caller compares JSON-origin or same-shape data.
|
|
21
|
+
*/
|
|
1
22
|
export function areEqual(a, b) {
|
|
2
23
|
if (a === b)
|
|
3
24
|
return true;
|
|
4
25
|
if (a == null || b == null)
|
|
5
26
|
return false;
|
|
6
|
-
const
|
|
7
|
-
if (
|
|
27
|
+
const type = typeof a;
|
|
28
|
+
if (type !== typeof b || type !== 'object')
|
|
29
|
+
return false;
|
|
30
|
+
// Both are non-null objects from here.
|
|
31
|
+
if (a instanceof Date)
|
|
32
|
+
return b instanceof Date && a.getTime() === b.getTime();
|
|
33
|
+
if (b instanceof Date)
|
|
8
34
|
return false;
|
|
9
|
-
|
|
35
|
+
const aIsArray = Array.isArray(a);
|
|
36
|
+
if (aIsArray !== Array.isArray(b))
|
|
37
|
+
return false;
|
|
38
|
+
if (aIsArray) {
|
|
39
|
+
const arrA = a;
|
|
40
|
+
const arrB = b;
|
|
41
|
+
if (arrA.length !== arrB.length)
|
|
42
|
+
return false;
|
|
43
|
+
for (let i = 0; i < arrA.length; i++) {
|
|
44
|
+
if (!areEqual(arrA[i], arrB[i]))
|
|
45
|
+
return false;
|
|
46
|
+
}
|
|
47
|
+
return true;
|
|
48
|
+
}
|
|
49
|
+
const objA = a;
|
|
50
|
+
const objB = b;
|
|
51
|
+
const keysA = Object.keys(objA);
|
|
52
|
+
if (keysA.length !== Object.keys(objB).length)
|
|
53
|
+
return false;
|
|
54
|
+
// Equal key COUNT alone doesn't prove equal key SETS — without the `hasOwn` check,
|
|
55
|
+
// `{ a: 1, b: undefined }` and `{ a: 1, c: undefined }` would falsely compare equal (each
|
|
56
|
+
// missing key reads as `undefined`). The count check plus "every A-key is an own-key of B"
|
|
57
|
+
// together guarantee identical key sets.
|
|
58
|
+
for (const key of keysA) {
|
|
59
|
+
if (!Object.hasOwn(objB, key) || !areEqual(objA[key], objB[key]))
|
|
60
|
+
return false;
|
|
61
|
+
}
|
|
62
|
+
return true;
|
|
10
63
|
}
|
|
11
64
|
export function flatten(o, prefix, options) {
|
|
12
65
|
const joinArrays = options?.joinArrays ?? false;
|
package/dist/utils/object.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"object.js","sourceRoot":"","sources":["../../src/utils/object.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"object.js","sourceRoot":"","sources":["../../src/utils/object.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,UAAU,QAAQ,CAAC,CAAU,EAAE,CAAU;IAC9C,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACzB,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI;QAAE,OAAO,KAAK,CAAC;IAEzC,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC;IACtB,IAAI,IAAI,KAAK,OAAO,CAAC,IAAI,IAAI,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAEzD,uCAAuC;IACvC,IAAI,CAAC,YAAY,IAAI;QAAE,OAAO,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/E,IAAI,CAAC,YAAY,IAAI;QAAE,OAAO,KAAK,CAAC;IAEpC,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAClC,IAAI,QAAQ,KAAK,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IAEhD,IAAI,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,GAAG,CAAc,CAAC;QAC5B,MAAM,IAAI,GAAG,CAAc,CAAC;QAC5B,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QAE9C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACtC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;gBAAE,OAAO,KAAK,CAAC;QAC/C,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,MAAM,IAAI,GAAG,CAA4B,CAAC;IAC1C,MAAM,IAAI,GAAG,CAA4B,CAAC;IAC1C,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAE5D,mFAAmF;IACnF,0FAA0F;IAC1F,2FAA2F;IAC3F,yCAAyC;IACzC,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;IAChF,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAsDD,MAAM,UAAU,OAAO,CACtB,CAAI,EACJ,MAAU,EACV,OAAW;IAEX,MAAM,UAAU,GAAG,OAAO,EAAE,UAAU,IAAI,KAAK,CAAC;IAEhD,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,EAAE,MAAM;QAC3C,CAAC,CAAC,MAAM;YACP,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC;YAC9C,CAAC,CAAC,OAAO,CAAC,SAAS;QACpB,CAAC,CAAC,SAAS,CAAC;IAEb,SAAS,WAAW,CAAC,SAA8B,EAAE,GAAW,EAAE,KAAU;QAC3E,IAAI,SAAS,EAAE,QAAQ,CAAC,GAAG,CAAC;YAAE,OAAO;QAErC,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,EAAE,CAAC;YAC7B,IAAI,KAAK,IAAI,IAAI;gBAAE,OAAO;YAE1B,SAAS,CAAC,GAAG,CAAC;gBACb,OAAO,KAAK,KAAK,QAAQ;oBACxB,CAAC,CAAC,KAAK;oBACP,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,SAAS;wBACxD,CAAC,CAAC,KAAK;wBACP,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACjC,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC;YACzB,IAAI,GAAG,KAAK,CAAC;gBAAE,OAAO;YAEtB,IAAI,UAAU,EAAE,CAAC;gBAChB,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAClC,CAAC;iBAAM,CAAC;gBACP,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;oBAC9B,WAAW,CAAC,SAAS,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBAClD,CAAC;YACF,CAAC;QACF,CAAC;aAAM,CAAC;YACP,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACtC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO;YAEjC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC;gBAC9B,WAAW,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACpD,CAAC;QACF,CAAC;IACF,CAAC;IAED,MAAM,SAAS,GAAwB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC3D,WAAW,CAAC,SAAS,EAAE,MAAM,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;IACxC,OAAO,SAAoF,CAAC;AAC7F,CAAC;AAED,MAAM,UAAU,SAAS,CACxB,CAAgC,EAChC,eAAsE;IAEtE,IAAI,CAAC,IAAI,IAAI;QAAE,OAAO,EAAE,CAAC;IAEzB,MAAM,MAAM,GAA4B,EAAE,CAAC;IAC3C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9C,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC3C,IAAI,MAAM,IAAI,IAAI;YAAE,SAAS;QAE7B,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;IACtB,CAAC;IACD,OAAO,MAAM,CAAC;AACf,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC/B,CAAgC,EAChC,eAAsE;IAEtE,IAAI,CAAC,IAAI,IAAI;QAAE,OAAO,EAAE,CAAC;IAEzB,MAAM,MAAM,GAAwB,EAAE,CAAC;IACvC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9C,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC3C,IAAI,MAAM,IAAI,IAAI;YAAE,SAAS;QAE7B,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,MAAM,CAAC;AACf,CAAC;AAED,MAAM,UAAU,eAAe,CAC9B,CAAgC,EAChC,eAAyD;IAEzD,IAAI,CAAC,IAAI,IAAI;QAAE,OAAO,EAAE,CAAC;IAEzB,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,KAAK,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;QACrB,MAAM,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACvC,IAAI,MAAM,IAAI,IAAI;YAAE,SAAS;QAE7B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrB,CAAC;IACD,OAAO,MAAM,CAAC;AACf,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,CAAsB,EAAE,IAAa;IAC1D,MAAM,OAAO,GAAG,EAAE,CAAC;IAEnB,KAAK,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;QACrB,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QACrB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC/B,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,KAAK,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC;QAC5E,CAAC;aAAM,CAAC;YACP,OAAO,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC,CAAC;QAC3D,CAAC;IACF,CAAC;IAED,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAChC,CAAgC,EAChC,GAAW,EACX,KAAoB;IAEpB,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAsB,CAAC;IAE/C,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,EAAE,CAAC;QAC5D,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC/B,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;QACvB,CAAC;aAAM,CAAC;YACP,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAChB,CAAC;IACF,CAAC;SAAM,CAAC;QACP,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,CAAC,CAAC;QAChC,CAAC,GAAG,IAAI,CAAC;IACV,CAAC;IACD,OAAO,CAAC,CAAC;AACV,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,OAAO,CAAC,CAAyC;IAChE,KAAK,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QACnB,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;IACtC,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAC5B,CAAyC,EACzC,WAAmB,CAAC;IAEpB,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QACnB,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACjC,KAAK,EAAE,CAAC;YACR,IAAI,KAAK,IAAI,QAAQ;gBAAE,OAAO,IAAI,CAAC,CAAC,yCAAyC;QAC9E,CAAC;IACF,CAAC;IACD,OAAO,KAAK,IAAI,QAAQ,CAAC;AAC1B,CAAC"}
|
package/dist/utils/paging.js
CHANGED
|
@@ -8,22 +8,21 @@ export class PageableResult {
|
|
|
8
8
|
this.cached = seed;
|
|
9
9
|
}
|
|
10
10
|
async *values() {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
11
|
+
let page = this.cached;
|
|
12
|
+
if (page == null) {
|
|
13
|
+
// No seed or cached results yet, so perform the initial fetch
|
|
14
|
+
page = await this.fetch(undefined);
|
|
15
|
+
this.cached = page;
|
|
15
16
|
}
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
}
|
|
26
|
-
for (const value of results.values) {
|
|
17
|
+
const cached = page; // memoized accumulator (the first page)
|
|
18
|
+
for (const value of cached.values) {
|
|
19
|
+
yield value;
|
|
20
|
+
}
|
|
21
|
+
while (page.paging?.more) {
|
|
22
|
+
page = await this.fetch(page.paging);
|
|
23
|
+
cached.values.push(...page.values);
|
|
24
|
+
cached.paging = page.paging;
|
|
25
|
+
for (const value of page.values) {
|
|
27
26
|
yield value;
|
|
28
27
|
}
|
|
29
28
|
}
|
package/dist/utils/paging.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paging.js","sourceRoot":"","sources":["../../src/utils/paging.ts"],"names":[],"mappings":"AAUA,uFAAuF;AACvF,MAAM,CAAC,MAAM,gBAAgB,GAAqB,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;AAMhF,MAAM,OAAO,cAAc;IAIR;IAHV,MAAM,CAAsC;IAEpD,YACkB,KAAoE,EACrF,IAAqB;QADJ,UAAK,GAAL,KAAK,CAA+D;QAGrF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,CAAC,MAAM;QACZ,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"paging.js","sourceRoot":"","sources":["../../src/utils/paging.ts"],"names":[],"mappings":"AAUA,uFAAuF;AACvF,MAAM,CAAC,MAAM,gBAAgB,GAAqB,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;AAMhF,MAAM,OAAO,cAAc;IAIR;IAHV,MAAM,CAAsC;IAEpD,YACkB,KAAoE,EACrF,IAAqB;QADJ,UAAK,GAAL,KAAK,CAA+D;QAGrF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,CAAC,MAAM;QACZ,IAAI,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC;QACvB,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YAClB,8DAA8D;YAC9D,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACnC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACpB,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,wCAAwC;QAC7D,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YACnC,MAAM,KAAK,CAAC;QACb,CAAC;QAED,OAAO,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC;YAC1B,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACrC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;YACnC,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;YAE5B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBACjC,MAAM,KAAK,CAAC;YACb,CAAC;QACF,CAAC;IACF,CAAC;CACD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promiseCache.d.ts","sourceRoot":"","sources":["../../src/utils/promiseCache.ts"],"names":[],"mappings":"AAWA,qBAAa,eAAe;;IAE3B,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,UAAU,IAAI,IAAI;CAGlB;AAED,UAAU,mBAAmB;IAC5B,wDAAwD;IACxD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2DAA2D;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,uEAAuE;IACvE,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0EAA0E;IAC1E,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,YAAY,CAAC,CAAC,EAAE,CAAC;IAC7B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA+B;IACrD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgC;IACvD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAiC;IAC7D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;gBAElC,OAAO,CAAC,EAAE,mBAAmB;IAIzC,KAAK,IAAI,IAAI;IASb,MAAM,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI;IAOpB;;;;;;;;;OASG;IACH,UAAU,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI;IAQxB,IAAI,IAAI,gBAAgB,CAAC,CAAC,CAAC;IAI3B;;;;OAIG;IACH,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS;IAYnC;;;;;;;;;;;;OAYG;IACG,WAAW,CAChB,GAAG,EAAE,CAAC,EACN,OAAO,EAAE,CAAC,SAAS,EAAE,eAAe,EAAE,YAAY,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,EAC/E,OAAO,CAAC,EAAE;QACT,gHAAgH;QAChH,YAAY,CAAC,EAAE,WAAW,CAAC;QAC3B,wDAAwD;QACxD,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,2DAA2D;QAC3D,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,uDAAuD;QACvD,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB;;;;;WAKG;QACH,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB;;;;;;WAMG;QACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK;YAAE,KAAK,EAAE,CAAC,CAAC;YAAC,SAAS,CAAC,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;SAAE,GAAG,SAAS,CAAC;KAC/F,GACC,OAAO,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"promiseCache.d.ts","sourceRoot":"","sources":["../../src/utils/promiseCache.ts"],"names":[],"mappings":"AAWA,qBAAa,eAAe;;IAE3B,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,UAAU,IAAI,IAAI;CAGlB;AAED,UAAU,mBAAmB;IAC5B,wDAAwD;IACxD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2DAA2D;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,uEAAuE;IACvE,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0EAA0E;IAC1E,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,YAAY,CAAC,CAAC,EAAE,CAAC;IAC7B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA+B;IACrD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgC;IACvD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAiC;IAC7D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;gBAElC,OAAO,CAAC,EAAE,mBAAmB;IAIzC,KAAK,IAAI,IAAI;IASb,MAAM,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI;IAOpB;;;;;;;;;OASG;IACH,UAAU,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI;IAQxB,IAAI,IAAI,gBAAgB,CAAC,CAAC,CAAC;IAI3B;;;;OAIG;IACH,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS;IAYnC;;;;;;;;;;;;OAYG;IACG,WAAW,CAChB,GAAG,EAAE,CAAC,EACN,OAAO,EAAE,CAAC,SAAS,EAAE,eAAe,EAAE,YAAY,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,EAC/E,OAAO,CAAC,EAAE;QACT,gHAAgH;QAChH,YAAY,CAAC,EAAE,WAAW,CAAC;QAC3B,wDAAwD;QACxD,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,2DAA2D;QAC3D,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,uDAAuD;QACvD,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB;;;;;WAKG;QACH,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB;;;;;;WAMG;QACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK;YAAE,KAAK,EAAE,CAAC,CAAC;YAAC,SAAS,CAAC,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;SAAE,GAAG,SAAS,CAAC;KAC/F,GACC,OAAO,CAAC,CAAC,CAAC;IAqHb,OAAO,CAAC,qBAAqB;IAe7B,OAAO,CAAC,OAAO;IAoCf,OAAO,CAAC,OAAO;IAOf;;;;;;;OAOG;IACH,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;CAe5F;AAED;;;GAGG;AACH,qBAAa,UAAU,CAAC,CAAC,EAAE,CAAC;IAC3B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA4B;IAClD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgC;IACvD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAiC;IAE7D,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAEjC;IAED;;;;;;;;;;;;OAYG;IACH,WAAW,CACV,GAAG,EAAE,CAAC,EACN,OAAO,EAAE,CAAC,SAAS,EAAE,eAAe,EAAE,YAAY,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,EAC/E,YAAY,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,CAAC,CAAC;IAyCb,OAAO,CAAC,qBAAqB;IAe7B;;;;;;;;;OASG;IACH,UAAU,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI;IAQxB;;OAEG;IACH,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS;IAInC;;OAEG;IACH,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI;IAWtC;;OAEG;IACH,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,OAAO;IAIpB;;OAEG;IACH,MAAM,CAAC,GAAG,EAAE,CAAC,GAAG,OAAO;IAOvB;;OAEG;IACH,KAAK,IAAI,IAAI;IASb;;OAEG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;OAEG;IACH,IAAI,IAAI,gBAAgB,CAAC,CAAC,CAAC;IAI3B;;OAEG;IACH,MAAM,IAAI,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAItC;;OAEG;IACH,OAAO,IAAI,gBAAgB,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAI5C;;OAEG;IACH,OAAO,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,IAAI;IAItG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;CAGtD;AAED;;;;;;GAMG;AACH,qBAAa,mBAAmB,CAAC,CAAC,EAAE,CAAC;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAyC;IAC/D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;gBAElC,OAAO,CAAC,EAAE,mBAAmB;IAIzC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAEjC;IAED;;;;;;;;OAQG;IACH,WAAW,CACV,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,CAAC,EACN,OAAO,EAAE,CAAC,SAAS,EAAE,eAAe,EAAE,YAAY,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,EAC/E,OAAO,CAAC,EAAE;QACT,gHAAgH;QAChH,YAAY,CAAC,EAAE,WAAW,CAAC;QAC3B,wDAAwD;QACxD,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,2DAA2D;QAC3D,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,uDAAuD;QACvD,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB;;;;;WAKG;QACH,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB;;;;;;WAMG;QACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK;YAAE,KAAK,EAAE,CAAC,CAAC;YAAC,SAAS,CAAC,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;SAAE,GAAG,SAAS,CAAC;KAC/F,GACC,OAAO,CAAC,CAAC,CAAC;IAUb;;;;;;OAMG;IACH,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS;IAOrD;;;;;;;OAOG;IACH,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAU9G;;;;;;OAMG;IACH,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO;IAY1C;;;;;OAKG;IACH,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI;IAa3C;;;;;OAKG;IACH,iBAAiB,CAAC,IAAI,EAAE,mBAAmB,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAclG;;;;;;;;OAQG;IACH,qBAAqB,CAAC,IAAI,EAAE,mBAAmB,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IActG;;OAEG;IACH,KAAK,IAAI,IAAI;IAIb;;OAEG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;CACD;AAED;;;;;;GAMG;AACH,qBAAa,cAAc,CAAC,CAAC,EAAE,CAAC;IAC/B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAuC;IAE7D,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAEjC;IAED;;;;;;;OAOG;IACH,WAAW,CACV,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,CAAC,EACN,OAAO,EAAE,CAAC,SAAS,EAAE,eAAe,EAAE,YAAY,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,EAC/E,YAAY,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,CAAC,CAAC;IAUb;;;;;;OAMG;IACH,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS;IAKrD;;;;;;OAMG;IACH,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO;IAW1C;;;;;OAKG;IACH,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI;IAa3C;;OAEG;IACH,KAAK,IAAI,IAAI;IAIb;;OAEG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;CACD"}
|
|
@@ -102,14 +102,18 @@ export class PromiseCache {
|
|
|
102
102
|
this.aborts.set(key, abortAgg);
|
|
103
103
|
this.controllers.set(key, cacheable);
|
|
104
104
|
const promise = factory(cacheable, abortAgg.signal);
|
|
105
|
-
void promise
|
|
105
|
+
void promise
|
|
106
|
+
.finally(() => {
|
|
106
107
|
if (cacheable.invalidated) {
|
|
107
108
|
this.cache.delete(key);
|
|
108
109
|
}
|
|
109
110
|
abortAgg.dispose();
|
|
110
111
|
this.aborts.delete(key);
|
|
111
112
|
this.controllers.delete(key);
|
|
112
|
-
})
|
|
113
|
+
})
|
|
114
|
+
// Swallow the cleanup chain's rejection so it doesn't surface as an unhandled rejection
|
|
115
|
+
// separate from the caller-facing promise's own handling (e.g. on cancellation).
|
|
116
|
+
.catch(() => { });
|
|
113
117
|
if (options?.onError != null) {
|
|
114
118
|
// Wrap the promise to handle errors with the onError callback
|
|
115
119
|
const errorHandled = promise.catch((ex) => {
|
|
@@ -298,14 +302,18 @@ export class PromiseMap {
|
|
|
298
302
|
const promise = factory(cacheable, aborts.signal);
|
|
299
303
|
// Automatically remove failed promises from the cache
|
|
300
304
|
promise.catch(() => this.cache.delete(key));
|
|
301
|
-
void promise
|
|
305
|
+
void promise
|
|
306
|
+
.finally(() => {
|
|
302
307
|
if (cacheable.invalidated) {
|
|
303
308
|
this.cache.delete(key);
|
|
304
309
|
}
|
|
305
310
|
aborts.dispose();
|
|
306
311
|
this.aborts.delete(key);
|
|
307
312
|
this.controllers.delete(key);
|
|
308
|
-
})
|
|
313
|
+
})
|
|
314
|
+
// Swallow the cleanup chain's rejection so it doesn't surface as an unhandled rejection
|
|
315
|
+
// separate from the caller-facing promise's own handling (e.g. on cancellation).
|
|
316
|
+
.catch(() => { });
|
|
309
317
|
this.cache.set(key, promise);
|
|
310
318
|
return this.attachCallerLifecycle(promise, cancellation, cleanup);
|
|
311
319
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promiseCache.js","sourceRoot":"","sources":["../../src/utils/promiseCache.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"promiseCache.js","sourceRoot":"","sources":["../../src/utils/promiseCache.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/string.js
CHANGED
|
@@ -630,7 +630,7 @@ export function pluralize(s, count, options) {
|
|
|
630
630
|
return `${result}${options.infix ?? ' '}${suffix}`;
|
|
631
631
|
}
|
|
632
632
|
// Removes \ / : * ? " < > | and C0 and C1 control codes
|
|
633
|
-
//
|
|
633
|
+
// oxlint-disable-next-line no-control-regex
|
|
634
634
|
const illegalCharsForFSRegex = /[\\/:*?"<>|\x00-\x1f\x80-\x9f]/g;
|
|
635
635
|
export function sanitizeForFileSystem(s, replacement = '_') {
|
|
636
636
|
if (!s)
|
package/package.json
CHANGED
package/src/git/cache.ts
CHANGED
|
@@ -115,8 +115,7 @@ interface SharedCaches {
|
|
|
115
115
|
contributorsStats: RepoPromiseCacheMap<string, GitContributorsStats | undefined> | undefined;
|
|
116
116
|
defaultBranchName: RepoPromiseCacheMap<string, string | undefined> | undefined;
|
|
117
117
|
gitResults: RepoPromiseCacheMap<string, GitResult> | undefined;
|
|
118
|
-
|
|
119
|
-
gkConfigPatterns: RepoPromiseCacheMap<string, Map<string, string>> | undefined;
|
|
118
|
+
gkConfigMap: PromiseMap<RepoPath, Map<string, string>> | undefined;
|
|
120
119
|
initialCommitSha: PromiseMap<RepoPath, string | undefined> | undefined;
|
|
121
120
|
/** Keyed by commonPath — `FETCH_HEAD` lives in the common git dir, shared across worktrees. */
|
|
122
121
|
lastFetched: PromiseCache<RepoPath, number | undefined> | undefined;
|
|
@@ -147,8 +146,7 @@ const sharedCacheKeys: ReadonlySet<keyof AllCaches> = new Set(
|
|
|
147
146
|
'contributorsStats',
|
|
148
147
|
'defaultBranchName',
|
|
149
148
|
'gitResults',
|
|
150
|
-
'
|
|
151
|
-
'gkConfigPatterns',
|
|
149
|
+
'gkConfigMap',
|
|
152
150
|
'initialCommitSha',
|
|
153
151
|
'lastFetched',
|
|
154
152
|
'logShas',
|
|
@@ -192,8 +190,7 @@ function createEmptyCaches(): AllCaches {
|
|
|
192
190
|
gitDir: undefined,
|
|
193
191
|
gitIgnore: undefined,
|
|
194
192
|
gitResults: undefined,
|
|
195
|
-
|
|
196
|
-
gkConfigPatterns: undefined,
|
|
193
|
+
gkConfigMap: undefined,
|
|
197
194
|
initialCommitSha: undefined,
|
|
198
195
|
lastFetched: undefined,
|
|
199
196
|
logShas: undefined,
|
|
@@ -301,12 +298,8 @@ export class Cache implements Disposable {
|
|
|
301
298
|
}));
|
|
302
299
|
}
|
|
303
300
|
|
|
304
|
-
private get
|
|
305
|
-
return (this._caches.
|
|
306
|
-
}
|
|
307
|
-
|
|
308
|
-
private get gkConfigPatterns(): RepoPromiseCacheMap<string, Map<string, string>> {
|
|
309
|
-
return (this._caches.gkConfigPatterns ??= new RepoPromiseCacheMap<string, Map<string, string>>());
|
|
301
|
+
private get gkConfigMap(): PromiseMap<RepoPath, Map<string, string>> {
|
|
302
|
+
return (this._caches.gkConfigMap ??= new PromiseMap<RepoPath, Map<string, string>>());
|
|
310
303
|
}
|
|
311
304
|
|
|
312
305
|
get currentBranchReference(): PromiseCache<RepoPath, GitBranchReference | undefined> {
|
|
@@ -548,7 +541,10 @@ export class Cache implements Disposable {
|
|
|
548
541
|
keysToClear.add('configPatterns');
|
|
549
542
|
keysToClear.add('currentBranchReference');
|
|
550
543
|
keysToClear.add('currentUser');
|
|
551
|
-
|
|
544
|
+
// `gitDir` is immutable repo topology (toplevel/git-dir/common-dir/superproject) — a
|
|
545
|
+
// `.git/config` content change never relocates it, and it's owned by the repo lifecycle
|
|
546
|
+
// (registerRepoPath/unregisterRepoPath). Clearing it here forced a redundant `git rev-parse`
|
|
547
|
+
// re-spawn (gitDir is read by getGkConfigPath→getGitDir on every gk op), so leave it warm.
|
|
552
548
|
}
|
|
553
549
|
|
|
554
550
|
if (types.includes('contributors')) {
|
|
@@ -563,8 +559,7 @@ export class Cache implements Disposable {
|
|
|
563
559
|
}
|
|
564
560
|
|
|
565
561
|
if (types.includes('gkConfig')) {
|
|
566
|
-
keysToClear.add('
|
|
567
|
-
keysToClear.add('gkConfigPatterns');
|
|
562
|
+
keysToClear.add('gkConfigMap');
|
|
568
563
|
// Derived from `branch.<ref>.gk-merge-base`/`vscode-merge-base`; clear so external
|
|
569
564
|
// gkConfig mutations don't leave stale base-branch resolutions cached.
|
|
570
565
|
keysToClear.add('baseBranchName');
|
|
@@ -875,14 +870,18 @@ export class Cache implements Disposable {
|
|
|
875
870
|
// On factory invalidation, propagate to the derived per-worktree mapper entries
|
|
876
871
|
// via soft-invalidate — existing waiters on the mapper complete, and the entry
|
|
877
872
|
// self-evicts on mapper settle so the next callers build fresh derived entries.
|
|
878
|
-
void p
|
|
879
|
-
|
|
880
|
-
|
|
881
|
-
|
|
882
|
-
this.
|
|
873
|
+
void p
|
|
874
|
+
.finally(() => {
|
|
875
|
+
if (cacheable.invalidated) {
|
|
876
|
+
this.branches.invalidate(commonPath);
|
|
877
|
+
for (const worktreePath of this.getWorktreePaths(commonPath)) {
|
|
878
|
+
this.branches.invalidate(worktreePath);
|
|
879
|
+
}
|
|
883
880
|
}
|
|
884
|
-
}
|
|
885
|
-
|
|
881
|
+
})
|
|
882
|
+
// Swallow the cleanup chain's rejection so a rejected factory (e.g. cancellation)
|
|
883
|
+
// doesn't surface as an unhandled rejection; the caller-facing promise handles it.
|
|
884
|
+
.catch(() => {});
|
|
886
885
|
return p;
|
|
887
886
|
},
|
|
888
887
|
cancellation,
|
|
@@ -944,43 +943,25 @@ export class Cache implements Disposable {
|
|
|
944
943
|
this._caches.configPatterns?.delete(cacheKey);
|
|
945
944
|
}
|
|
946
945
|
|
|
947
|
-
|
|
948
|
-
|
|
949
|
-
|
|
950
|
-
|
|
951
|
-
|
|
952
|
-
|
|
953
|
-
|
|
954
|
-
const result = this.gkConfigKeys.get(cacheKey, key);
|
|
955
|
-
if (result != null) return result;
|
|
956
|
-
|
|
957
|
-
const factoryPromise = Promise.resolve(factory());
|
|
958
|
-
this.gkConfigKeys.set(cacheKey, key, factoryPromise);
|
|
959
|
-
return factoryPromise;
|
|
960
|
-
}
|
|
961
|
-
|
|
962
|
-
getGkConfigRegex(
|
|
963
|
-
repoPath: string,
|
|
964
|
-
pattern: string,
|
|
965
|
-
factory: () => PromiseOrValue<Map<string, string>>,
|
|
966
|
-
): Promise<Map<string, string>> {
|
|
967
|
-
const cacheKey = this.getCommonPath(repoPath);
|
|
968
|
-
|
|
969
|
-
const result = this.gkConfigPatterns.get(cacheKey, pattern);
|
|
970
|
-
if (result != null) return result;
|
|
971
|
-
|
|
972
|
-
const factoryPromise = Promise.resolve(factory());
|
|
973
|
-
this.gkConfigPatterns.set(cacheKey, pattern, factoryPromise);
|
|
974
|
-
return factoryPromise;
|
|
946
|
+
/**
|
|
947
|
+
* The whole `.git/gk/config` is read once and cached as a single map per commonPath; per-key and
|
|
948
|
+
* per-namespace gk lookups are served from it in-memory (see `getGkConfigMap` in the CLI config
|
|
949
|
+
* sub-provider). Invalidated by `deleteGkConfig` (write) and the coarse `'gkConfig'` clear (watcher).
|
|
950
|
+
*/
|
|
951
|
+
getGkConfigMap(repoPath: string, factory: () => PromiseOrValue<Map<string, string>>): Promise<Map<string, string>> {
|
|
952
|
+
return this.getSharedSimple(this.gkConfigMap, repoPath, factory);
|
|
975
953
|
}
|
|
976
954
|
|
|
977
955
|
/**
|
|
956
|
+
* Clears the cached `.git/gk/config` map and invalidates the derived caches
|
|
957
|
+
* (`baseBranchName`/`branchOverviews`) for the written key's ref.
|
|
958
|
+
*
|
|
978
959
|
* @param options.skipInvalidation Downstream caches the caller wants preserved despite this
|
|
979
960
|
* write. Use when the value being written is exactly what was just resolved — e.g. the Tier 2
|
|
980
961
|
* `storeMergeTargetBranchName` self-write inside `getBranchContributionsOverview` (skip
|
|
981
962
|
* `'branchOverviews'`) or the Tier 3 `storeBaseBranchName` self-write inside `getBaseBranchName`
|
|
982
|
-
* (skip both `'baseBranchName'` and `'branchOverviews'`). The
|
|
983
|
-
*
|
|
963
|
+
* (skip both `'baseBranchName'` and `'branchOverviews'`). The bulk `gkConfigMap` map always
|
|
964
|
+
* invalidates so subsequent reads see the new value.
|
|
984
965
|
*/
|
|
985
966
|
deleteGkConfig(
|
|
986
967
|
repoPath: string,
|
|
@@ -988,8 +969,7 @@ export class Cache implements Disposable {
|
|
|
988
969
|
options?: { skipInvalidation?: readonly GkConfigInvalidationTarget[] },
|
|
989
970
|
): void {
|
|
990
971
|
const cacheKey = this.getCommonPath(repoPath);
|
|
991
|
-
this._caches.
|
|
992
|
-
this._caches.gkConfigPatterns?.delete(cacheKey);
|
|
972
|
+
this._caches.gkConfigMap?.delete(cacheKey);
|
|
993
973
|
|
|
994
974
|
const refMatch = key.match(branchOverviewGkConfigKeysRegex);
|
|
995
975
|
if (refMatch == null) return;
|
|
@@ -1308,15 +1288,19 @@ export class Cache implements Disposable {
|
|
|
1308
1288
|
// On factory invalidation (without rejection), propagate to the derived per-worktree
|
|
1309
1289
|
// mapper entries so they don't persist past the shared factory's settle. Mapper
|
|
1310
1290
|
// entries cached via `cache.set()` have no controller, so `invalidate` hard-deletes.
|
|
1311
|
-
void p
|
|
1312
|
-
|
|
1313
|
-
|
|
1314
|
-
|
|
1315
|
-
|
|
1316
|
-
|
|
1291
|
+
void p
|
|
1292
|
+
.finally(() => {
|
|
1293
|
+
if (cacheable.invalidated) {
|
|
1294
|
+
for (const worktreePath of this.getWorktreePaths(commonPath)) {
|
|
1295
|
+
if (worktreePath === commonPath) continue;
|
|
1296
|
+
|
|
1297
|
+
cache.invalidate(worktreePath);
|
|
1298
|
+
}
|
|
1317
1299
|
}
|
|
1318
|
-
}
|
|
1319
|
-
|
|
1300
|
+
})
|
|
1301
|
+
// Swallow the cleanup chain's rejection so a rejected factory (e.g. cancellation)
|
|
1302
|
+
// doesn't surface as an unhandled rejection; the caller-facing promise handles it.
|
|
1303
|
+
.catch(() => {});
|
|
1320
1304
|
return p;
|
|
1321
1305
|
},
|
|
1322
1306
|
cancellation,
|
|
@@ -1365,15 +1349,19 @@ export class Cache implements Disposable {
|
|
|
1365
1349
|
// mapper entries for this `cacheKey` so they don't persist past the shared factory's
|
|
1366
1350
|
// settle. Mapper entries cached via `cache.set()` have no controller, so `invalidate`
|
|
1367
1351
|
// hard-deletes.
|
|
1368
|
-
void p
|
|
1369
|
-
|
|
1370
|
-
|
|
1371
|
-
|
|
1372
|
-
|
|
1373
|
-
|
|
1352
|
+
void p
|
|
1353
|
+
.finally(() => {
|
|
1354
|
+
if (cacheable.invalidated) {
|
|
1355
|
+
for (const worktreePath of this.getWorktreePaths(commonPath)) {
|
|
1356
|
+
if (worktreePath === commonPath) continue;
|
|
1357
|
+
|
|
1358
|
+
cache.invalidate(worktreePath, cacheKey);
|
|
1359
|
+
}
|
|
1374
1360
|
}
|
|
1375
|
-
}
|
|
1376
|
-
|
|
1361
|
+
})
|
|
1362
|
+
// Swallow the cleanup chain's rejection so a rejected factory (e.g. cancellation)
|
|
1363
|
+
// doesn't surface as an unhandled rejection; the caller-facing promise handles it.
|
|
1364
|
+
.catch(() => {});
|
|
1377
1365
|
return p;
|
|
1378
1366
|
},
|
|
1379
1367
|
options,
|
package/src/git/context.ts
CHANGED
|
@@ -85,6 +85,27 @@ export interface GitServiceConfig {
|
|
|
85
85
|
/** Maximum search items (0 = unlimited). */
|
|
86
86
|
readonly maxSearchItems?: number;
|
|
87
87
|
};
|
|
88
|
+
|
|
89
|
+
/** Force-push preferences. */
|
|
90
|
+
readonly push?: {
|
|
91
|
+
/** Whether to use `--force-with-lease` instead of a plain `--force` when force-pushing. Defaults to `true`. */
|
|
92
|
+
readonly useForceWithLease?: boolean;
|
|
93
|
+
/**
|
|
94
|
+
* Whether to add `--force-if-includes` when force-pushing. Only applies when `useForceWithLease` is `true`
|
|
95
|
+
* and the installed Git supports it. Defaults to `true`.
|
|
96
|
+
*/
|
|
97
|
+
readonly useForceIfIncludes?: boolean;
|
|
98
|
+
};
|
|
99
|
+
|
|
100
|
+
/** Commit-signing preferences. */
|
|
101
|
+
readonly signing?: {
|
|
102
|
+
/**
|
|
103
|
+
* Host-level override for whether commit signing is enabled (e.g. VS Code's `git.enableCommitSigning`).
|
|
104
|
+
* When `true`, signing is treated as enabled even if the repo's `commit.gpgsign` is unset/false. It never
|
|
105
|
+
* forces signing off.
|
|
106
|
+
*/
|
|
107
|
+
readonly enabled?: boolean;
|
|
108
|
+
};
|
|
88
109
|
}
|
|
89
110
|
|
|
90
111
|
/** Git command types that can produce conflicts. */
|
package/src/git/features.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// GitFeature's must start with `git:` to be recognized in all usages
|
|
2
2
|
export type GitFeatures =
|
|
3
|
+
| 'git:checkout:pathspec-from-file'
|
|
3
4
|
| 'git:for-each-ref:worktreePath'
|
|
4
5
|
| 'git:ignoreRevsFile'
|
|
5
6
|
| 'git:merge-tree'
|
|
@@ -28,6 +29,7 @@ export type FilteredGitFeatures<T extends GitFeatureOrPrefix> = T extends GitFea
|
|
|
28
29
|
|
|
29
30
|
export const gitMinimumVersion = '2.7.2';
|
|
30
31
|
export const gitFeaturesByVersion = new Map<GitFeatures, string>([
|
|
32
|
+
['git:checkout:pathspec-from-file', '2.26'],
|
|
31
33
|
['git:for-each-ref:worktreePath', '2.23'],
|
|
32
34
|
['git:ignoreRevsFile', '2.23'],
|
|
33
35
|
['git:merge-tree', '2.33'],
|