@foss.global/codefeed 1.10.5 → 1.11.0
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 +15 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.gitmanagerpublicclient.d.ts +4 -1
- package/dist_ts/classes.gitmanagerpublicclient.js +65 -20
- package/package.json +2 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.gitmanagerpublicclient.ts +74 -18
package/changelog.md
CHANGED
|
@@ -1,5 +1,20 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-07-21 - 1.11.0
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
- expose visibility-checked pull request diffs (pull-request-diff)
|
|
8
|
+
- Read exact base-to-head GitManager diffs only after the repository passes the public visibility predicate.
|
|
9
|
+
- Reuse the canonical public file, hunk, line, language, and status mapping used by commit details.
|
|
10
|
+
|
|
11
|
+
## 2026-07-21 - 1.10.6
|
|
12
|
+
|
|
13
|
+
### Features
|
|
14
|
+
|
|
15
|
+
- expose canonical pull request fields in GitManager public repository responses (pulls)
|
|
16
|
+
- Align the public read client with `@foss.global/interfaces` 0.10.0 and provide empty pull request collections for the collaboration layer to populate.
|
|
17
|
+
|
|
3
18
|
## 2026-07-21 - 1.10.5
|
|
4
19
|
|
|
5
20
|
### Fixes
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@foss.global/codefeed',
|
|
6
|
-
version: '1.
|
|
6
|
+
version: '1.11.0',
|
|
7
7
|
description: 'The @foss.global/codefeed module generates commit/activity feeds from forge providers including Gitea and GitManager.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx1QkFBdUI7SUFDN0IsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHVIQUF1SDtDQUNySSxDQUFBIn0=
|
|
@@ -31,9 +31,10 @@ export declare class GitManagerPublicReadClient {
|
|
|
31
31
|
constructor(optionsArg: IGitManagerPublicReadClientOptions);
|
|
32
32
|
getOverview(queryArg?: string): Promise<plugins.fossInterfaces.IReq_PublicOverview['response']>;
|
|
33
33
|
getOrg(orgArg: string): Promise<plugins.fossInterfaces.IReq_PublicOrg['response']>;
|
|
34
|
-
getRepo(orgArg: string, repoArg: string, pathArg?: string, _issueNumberArg?: number): Promise<plugins.fossInterfaces.IReq_PublicRepo['response']>;
|
|
34
|
+
getRepo(orgArg: string, repoArg: string, pathArg?: string, _issueNumberArg?: number, _pullRequestNumberArg?: number): Promise<plugins.fossInterfaces.IReq_PublicRepo['response']>;
|
|
35
35
|
getFile(orgArg: string, repoArg: string, pathArg: string): Promise<plugins.fossInterfaces.IReq_PublicFile['response']>;
|
|
36
36
|
getCommits(orgArg: string, repoArg: string, shaArg?: string): Promise<plugins.fossInterfaces.IReq_PublicCommits['response']>;
|
|
37
|
+
getPullRequestDiff(orgArg: string, repoArg: string, baseObjectIdArg: string, headObjectIdArg: string): Promise<plugins.fossInterfaces.IPublicPullRequestDiff | null>;
|
|
37
38
|
private listVisibleRepositories;
|
|
38
39
|
private findVisibleRepository;
|
|
39
40
|
private mapOrganizations;
|
|
@@ -41,6 +42,7 @@ export declare class GitManagerPublicReadClient {
|
|
|
41
42
|
private getCommitFeed;
|
|
42
43
|
private mapCommit;
|
|
43
44
|
private getCommitDetail;
|
|
45
|
+
private mapDiffFiles;
|
|
44
46
|
private mapContent;
|
|
45
47
|
private mapRelease;
|
|
46
48
|
private mapActivity;
|
|
@@ -51,6 +53,7 @@ export declare class GitManagerPublicReadClient {
|
|
|
51
53
|
private languageForPath;
|
|
52
54
|
private getActivityKind;
|
|
53
55
|
private mapDiffStatus;
|
|
56
|
+
private validateObjectId;
|
|
54
57
|
private repoPathUrl;
|
|
55
58
|
private stableId;
|
|
56
59
|
private normalizeBaseUrl;
|
|
@@ -74,7 +74,7 @@ export class GitManagerPublicReadClient {
|
|
|
74
74
|
stats: this.getStats(mappedOrg ? [mappedOrg] : [], repos),
|
|
75
75
|
};
|
|
76
76
|
}
|
|
77
|
-
async getRepo(orgArg, repoArg, pathArg = '', _issueNumberArg = 0) {
|
|
77
|
+
async getRepo(orgArg, repoArg, pathArg = '', _issueNumberArg = 0, _pullRequestNumberArg = 0) {
|
|
78
78
|
const repository = await this.findVisibleRepository(orgArg, repoArg);
|
|
79
79
|
if (!repository) {
|
|
80
80
|
return {
|
|
@@ -86,6 +86,12 @@ export class GitManagerPublicReadClient {
|
|
|
86
86
|
issues: [],
|
|
87
87
|
selectedIssue: null,
|
|
88
88
|
selectedIssueComments: [],
|
|
89
|
+
pullRequests: [],
|
|
90
|
+
selectedPullRequest: null,
|
|
91
|
+
selectedPullRequestComments: [],
|
|
92
|
+
selectedPullRequestReviews: [],
|
|
93
|
+
selectedPullRequestReviewComments: [],
|
|
94
|
+
selectedPullRequestDiff: null,
|
|
89
95
|
commits: [],
|
|
90
96
|
languages: {},
|
|
91
97
|
};
|
|
@@ -129,6 +135,12 @@ export class GitManagerPublicReadClient {
|
|
|
129
135
|
issues: [],
|
|
130
136
|
selectedIssue: null,
|
|
131
137
|
selectedIssueComments: [],
|
|
138
|
+
pullRequests: [],
|
|
139
|
+
selectedPullRequest: null,
|
|
140
|
+
selectedPullRequestComments: [],
|
|
141
|
+
selectedPullRequestReviews: [],
|
|
142
|
+
selectedPullRequestReviewComments: [],
|
|
143
|
+
selectedPullRequestDiff: null,
|
|
132
144
|
commits,
|
|
133
145
|
languages,
|
|
134
146
|
};
|
|
@@ -202,6 +214,29 @@ export class GitManagerPublicReadClient {
|
|
|
202
214
|
selectedCommit,
|
|
203
215
|
};
|
|
204
216
|
}
|
|
217
|
+
async getPullRequestDiff(orgArg, repoArg, baseObjectIdArg, headObjectIdArg) {
|
|
218
|
+
const repository = await this.findVisibleRepository(orgArg, repoArg);
|
|
219
|
+
if (!repository) {
|
|
220
|
+
return null;
|
|
221
|
+
}
|
|
222
|
+
const baseObjectId = this.validateObjectId(baseObjectIdArg, 'base object ID');
|
|
223
|
+
const headObjectId = this.validateObjectId(headObjectIdArg, 'head object ID');
|
|
224
|
+
const diff = await this.gitManager.getDiff({
|
|
225
|
+
org: repository.org,
|
|
226
|
+
repo: repository.repo,
|
|
227
|
+
baseRef: baseObjectId,
|
|
228
|
+
headRef: headObjectId,
|
|
229
|
+
});
|
|
230
|
+
return {
|
|
231
|
+
baseObjectId,
|
|
232
|
+
headObjectId,
|
|
233
|
+
filesChanged: diff.filesChanged,
|
|
234
|
+
additions: diff.additions,
|
|
235
|
+
deletions: diff.deletions,
|
|
236
|
+
truncated: diff.truncated,
|
|
237
|
+
files: this.mapDiffFiles(diff.files),
|
|
238
|
+
};
|
|
239
|
+
}
|
|
205
240
|
async listVisibleRepositories() {
|
|
206
241
|
const repositories = await this.gitManager.listRepositories();
|
|
207
242
|
if (this.allowAllRepositories) {
|
|
@@ -354,27 +389,30 @@ export class GitManagerPublicReadClient {
|
|
|
354
389
|
parents: commit.parents.map((parent) => parent.sha),
|
|
355
390
|
additions: diff.additions,
|
|
356
391
|
deletions: diff.deletions,
|
|
357
|
-
files: diff.files
|
|
358
|
-
path: file.newPath || file.oldPath,
|
|
359
|
-
previousPath: file.oldPath,
|
|
360
|
-
status: this.mapDiffStatus(file.status),
|
|
361
|
-
language: this.languageForPath(file.newPath || file.oldPath),
|
|
362
|
-
additions: file.additions,
|
|
363
|
-
deletions: file.deletions,
|
|
364
|
-
isBinary: file.isBinary,
|
|
365
|
-
hunks: file.hunks.map((hunk) => ({
|
|
366
|
-
header: hunk.header,
|
|
367
|
-
lines: hunk.lines.map((line) => ({
|
|
368
|
-
kind: line.kind,
|
|
369
|
-
content: line.content,
|
|
370
|
-
oldNumber: line.oldNumber,
|
|
371
|
-
newNumber: line.newNumber,
|
|
372
|
-
})),
|
|
373
|
-
})),
|
|
374
|
-
})),
|
|
392
|
+
files: this.mapDiffFiles(diff.files),
|
|
375
393
|
diffTruncated: diff.truncated,
|
|
376
394
|
};
|
|
377
395
|
}
|
|
396
|
+
mapDiffFiles(filesArg) {
|
|
397
|
+
return filesArg.map((file) => ({
|
|
398
|
+
path: file.newPath || file.oldPath,
|
|
399
|
+
previousPath: file.oldPath,
|
|
400
|
+
status: this.mapDiffStatus(file.status),
|
|
401
|
+
language: this.languageForPath(file.newPath || file.oldPath),
|
|
402
|
+
additions: file.additions,
|
|
403
|
+
deletions: file.deletions,
|
|
404
|
+
isBinary: file.isBinary,
|
|
405
|
+
hunks: file.hunks.map((hunk) => ({
|
|
406
|
+
header: hunk.header,
|
|
407
|
+
lines: hunk.lines.map((line) => ({
|
|
408
|
+
kind: line.kind,
|
|
409
|
+
content: line.content,
|
|
410
|
+
oldNumber: line.oldNumber,
|
|
411
|
+
newNumber: line.newNumber,
|
|
412
|
+
})),
|
|
413
|
+
})),
|
|
414
|
+
}));
|
|
415
|
+
}
|
|
378
416
|
mapContent(repositoryArg, entryArg, latestCommitArg) {
|
|
379
417
|
const type = entryArg.entryType === 'other' ? 'file' : entryArg.entryType;
|
|
380
418
|
return {
|
|
@@ -554,6 +592,13 @@ export class GitManagerPublicReadClient {
|
|
|
554
592
|
return 'modified';
|
|
555
593
|
}
|
|
556
594
|
}
|
|
595
|
+
validateObjectId(valueArg, labelArg) {
|
|
596
|
+
const value = valueArg.trim();
|
|
597
|
+
if (!/^[0-9a-fA-F]{40,64}$/.test(value)) {
|
|
598
|
+
throw new Error(`Invalid ${labelArg}`);
|
|
599
|
+
}
|
|
600
|
+
return value.toLowerCase();
|
|
601
|
+
}
|
|
557
602
|
repoPathUrl(repositoryArg, suffixArg) {
|
|
558
603
|
const encodedSuffix = suffixArg
|
|
559
604
|
.split('/')
|
|
@@ -645,4 +690,4 @@ export class GitManagerPublicReadClient {
|
|
|
645
690
|
return results;
|
|
646
691
|
}
|
|
647
692
|
}
|
|
648
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.gitmanagerpublicclient.js","sourceRoot":"","sources":["../ts/classes.gitmanagerpublicclient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAsBxC,MAAM,OAAO,0BAA0B;IAuBrC,YAAY,UAA8C;QACxD,IAAI,CAAC,UAAU,CAAC,oBAAoB,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC;YACvE,MAAM,IAAI,KAAK,CACb,2GAA2G,CAC5G,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;QACxC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,gBAAgB,CACxC,UAAU,CAAC,aAAa,IAAI,qBAAqB,EACjD,CAAC,OAAO,EAAE,QAAQ,CAAC,CACpB,CAAC;QACF,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAC3C,UAAU,CAAC,gBAAgB,IAAI,IAAI,CAAC,aAAa,EACjD,CAAC,OAAO,EAAE,QAAQ,CAAC,CACpB,CAAC;QACF,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,gBAAgB,CACrC,UAAU,CAAC,UAAU,IAAI,kCAAkC,EAC3D,CAAC,MAAM,CAAC,CACT,CAAC;QACF,IAAI,CAAC,oBAAoB,GAAG,UAAU,CAAC,oBAAoB,IAAI,KAAK,CAAC;QACrE,IAAI,CAAC,kBAAkB,GAAG,UAAU,CAAC,kBAAkB,CAAC;QACxD,IAAI,CAAC,oBAAoB,GAAG,UAAU,CAAC,oBAAoB,CAAC;QAC5D,IAAI,CAAC,kBAAkB,GAAG,UAAU,CAAC,kBAAkB,CAAC;QACxD,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC;QAC5C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,UAAU,IAAI,EAAE,EAAE,YAAY,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;QACzF,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,WAAW,IAAI,EAAE,EAAE,aAAa,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;QAC5F,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,aAAa,CACxC,UAAU,CAAC,gBAAgB,IAAI,IAAI,EACnC,kBAAkB,EAClB,CAAC,EACD,MAAM,CACP,CAAC;QACF,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,aAAa,CACtC,UAAU,CAAC,cAAc,IAAI,CAAC,EAC9B,gBAAgB,EAChB,CAAC,EACD,EAAE,CACH,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,WAAW,CACtB,QAAQ,GAAG,EAAE;QAEb,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC5C,IAAI,KAAK,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;QACzD,CAAC;QACD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC7D,MAAM,aAAa,GAAG,KAAK;YACzB,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CACpC,GAAG,UAAU,CAAC,GAAG,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CACrE;YACH,CAAC,CAAC,eAAe,CAAC;QACpB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,CACzC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EACxC,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAC/C,CAAC;QACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;QAC1D,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3E,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;QACnF,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACjE,OAAO;YACL,IAAI,EAAE,KAAK;gBACT,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAC9D,CAAC,CAAC,IAAI;YACR,KAAK;YACL,QAAQ;YACR,UAAU;YACV,IAAI;YACJ,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;SAClC,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,MAAM,CACjB,MAAc;QAEd,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,CAAC,CAAC;QAC3D,MAAM,eAAe,GAAG,CAAC,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC,MAAM,CACnE,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,KAAK,GAAG,CACvC,CAAC;QACF,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO;gBACL,GAAG,EAAE,IAAI;gBACT,KAAK,EAAE,EAAE;gBACT,OAAO,EAAE,EAAE;gBACX,QAAQ,EAAE,EAAE;gBACZ,UAAU,EAAE,EAAE;gBACd,KAAK,EAAE;oBACL,QAAQ,EAAE,CAAC;oBACX,SAAS,EAAE,CAAC;oBACZ,YAAY,EAAE,CAAC;oBACf,cAAc,EAAE,CAAC;iBAClB;aACF,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,eAAe,EAAE,CAAC,UAAU,EAAE,EAAE,CAC1E,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAC/B,CAAC;QACF,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,eAAe,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACxE,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC7E,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;QACnF,OAAO;YACL,GAAG,EAAE,SAAS,IAAI,IAAI;YACtB,KAAK;YACL,OAAO,EAAE,EAAE;YACX,QAAQ;YACR,UAAU;YACV,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC;SAC1D,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,OAAO,CAClB,MAAc,EACd,OAAe,EACf,OAAO,GAAG,EAAE,EACZ,eAAe,GAAG,CAAC;QAEnB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACrE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO;gBACL,IAAI,EAAE,IAAI;gBACV,QAAQ,EAAE,EAAE;gBACZ,MAAM,EAAE,EAAE;gBACV,QAAQ,EAAE,EAAE;gBACZ,QAAQ,EAAE,EAAE;gBACZ,MAAM,EAAE,EAAE;gBACV,aAAa,EAAE,IAAI;gBACnB,qBAAqB,EAAE,EAAE;gBACzB,OAAO,EAAE,EAAE;gBACX,SAAS,EAAE,EAAE;aACd,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACxC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACzE,IAAI,CAAC,YAAY,CACf,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;gBAC7B,GAAG,EAAE,UAAU,CAAC,GAAG;gBACnB,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,GAAG,EAAE,UAAU,CAAC,aAAa;gBAC7B,IAAI,EAAE,IAAI,IAAI,SAAS;aACxB,CAAC,EACF,EAAE,CACH;YACD,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;YACxD,IAAI,CAAC,YAAY,CACf,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;gBAC7B,GAAG,EAAE,UAAU,CAAC,GAAG;gBACnB,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,KAAK,EAAE,IAAI,CAAC,WAAW;aACxB,CAAC,EACF,EAAE,CACH;YACD,IAAI,CAAC,YAAY,CACf,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;gBAChC,GAAG,EAAE,UAAU,CAAC,GAAG;gBACnB,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,GAAG,EAAE,UAAU,CAAC,aAAa;gBAC7B,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC;aACrC,CAAC,EACF,EAAE,CACH;YACD,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;SAC/B,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QACxE,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAClD,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC;QACpC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QACnD,OAAO;YACL,IAAI;YACJ,QAAQ,EAAE,IAAI;iBACX,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,KAAK,OAAO,CAAC;iBAC9C,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;YACnE,MAAM;YACN,QAAQ;YACR,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YAC3D,MAAM,EAAE,EAAE;YACV,aAAa,EAAE,IAAI;YACnB,qBAAqB,EAAE,EAAE;YACzB,OAAO;YACP,SAAS;SACV,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,OAAO,CAClB,MAAc,EACd,OAAe,EACf,OAAe;QAEf,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACrE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QAC/D,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC/C,MAAM,CAAC,IAAI,EAAE,eAAe,EAAE,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACtD,IAAI,CAAC,YAAY,CACf,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;gBAC7B,GAAG,EAAE,UAAU,CAAC,GAAG;gBACnB,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,GAAG,EAAE,UAAU,CAAC,aAAa;gBAC7B,IAAI;aACL,CAAC,EACF,IAAI,CACL;YACD,IAAI,CAAC,YAAY,CACf,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;gBAChC,GAAG,EAAE,UAAU,CAAC,GAAG;gBACnB,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,GAAG,EAAE,UAAU,CAAC,aAAa;gBAC7B,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;aACpC,CAAC,EACF,EAAE,CACH;YACD,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;SAC/B,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QACxE,OAAO;YACL,IAAI;YACJ,IAAI,EAAE,IAAI;gBACR,CAAC,CAAC;oBACE,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,IAAI;oBAC7C,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,UAAU,CAAC,aAAa,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBACrF,WAAW,EAAE,EAAE;oBACf,OAAO,EAAE,IAAI,CAAC,QAAQ;wBACpB,CAAC,CAAC,EAAE;wBACJ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;oBAC9D,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,SAAS,EAAE,KAAK;iBACjB;gBACH,CAAC,CAAC,IAAI;YACR,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YAC3D,OAAO;SACR,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,UAAU,CACrB,MAAc,EACd,OAAe,EACf,MAAM,GAAG,EAAE;QAEX,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACrE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;QAC3D,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;QAC1B,IAAI,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACxC,CAAC;QACD,MAAM,CAAC,IAAI,EAAE,eAAe,EAAE,cAAc,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAChE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;YAC9B,IAAI,CAAC,YAAY,CACf,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;gBAChC,GAAG,EAAE,UAAU,CAAC,GAAG;gBACnB,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,GAAG,EAAE,UAAU,CAAC,aAAa;gBAC7B,KAAK,EAAE,IAAI,CAAC,UAAU;aACvB,CAAC,EACF,EAAE,CACH;YACD,GAAG;gBACD,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC;gBACtE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;SAC1B,CAAC,CAAC;QACH,OAAO;YACL,IAAI;YACJ,OAAO,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YAChE,cAAc;SACf,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,uBAAuB;QACnC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC;QAC9D,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC9B,OAAO,YAAY,CAAC;QACtB,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;YACpF,UAAU;YACV,OAAO,EAAE,MAAM,IAAI,CAAC,kBAAmB,CAAC,UAAU,CAAC;SACpD,CAAC,CAAC,CAAC;QACJ,OAAO,UAAU;aACd,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;aAChC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACtC,CAAC;IAEO,KAAK,CAAC,qBAAqB,CACjC,MAAc,EACd,OAAe;QAEf,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,cAAc,EAAE,GAAG,CAAC,CAAC;QAC3D,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;QAC3D,OAAO,CAAC,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC,IAAI,CAChD,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,KAAK,GAAG,IAAI,UAAU,CAAC,IAAI,KAAK,IAAI,CACnE,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC5B,eAAoD,EACpD,eAA0B;QAE1B,MAAM,QAAQ,GAAG,eAAe;eAC3B,CAAC,GAAG,IAAI,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACvE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YAClE,MAAM,YAAY,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;YACrF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC,IAAI,CAAC,CAAC;YACzD,MAAM,IAAI,GAAsC;gBAC9C,IAAI;gBACJ,QAAQ,EAAE,IAAI;gBACd,WAAW,EAAE,EAAE;gBACf,OAAO,EAAE,EAAE;gBACX,QAAQ,EAAE,EAAE;gBACZ,SAAS,EAAE,EAAE;gBACb,OAAO,EAAE,GAAG,IAAI,CAAC,aAAa,IAAI,IAAI,EAAE;gBACxC,SAAS,EAAE,YAAY,CAAC,MAAM;gBAC9B,UAAU,EAAE,CAAC;gBACb,WAAW,EAAE,CAAC;gBACd,SAAS,EAAE,EAAE;aACd,CAAC;YACF,OAAO;gBACL,GAAG,IAAI;gBACP,GAAG,QAAQ;gBACX,IAAI;gBACJ,SAAS,EAAE,YAAY,CAAC,MAAM;aAC/B,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACvE,CAAC;IAEO,KAAK,CAAC,aAAa,CACzB,aAAgD;QAEhD,MAAM,CAAC,YAAY,CAAC,GAAG,MAAM,IAAI,CAAC,YAAY,CAC5C,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;YAChC,GAAG,EAAE,aAAa,CAAC,GAAG;YACtB,IAAI,EAAE,aAAa,CAAC,IAAI;YACxB,GAAG,EAAE,aAAa,CAAC,aAAa;YAChC,KAAK,EAAE,CAAC;SACT,CAAC,EACF,EAAE,CACH,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC,aAAa,CAAC,CAAC;QAChE,MAAM,IAAI,GAAG,GAAG,aAAa,CAAC,GAAG,IAAI,aAAa,CAAC,IAAI,EAAE,CAAC;QAC1D,MAAM,IAAI,GAAuC;YAC/C,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YACvB,GAAG,EAAE,aAAa,CAAC,GAAG;YACtB,IAAI,EAAE,aAAa,CAAC,IAAI;YACxB,IAAI;YACJ,YAAY,EAAE,EAAE;YAChB,WAAW,EAAE,EAAE;YACf,QAAQ,EAAE,EAAE;YACZ,OAAO,EAAE,GAAG,IAAI,CAAC,aAAa,IAAI,IAAI,EAAE;YACxC,QAAQ,EAAE,GAAG,IAAI,CAAC,gBAAgB,IAAI,IAAI,MAAM;YAChD,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,MAAM;YACxC,UAAU,EAAE,CAAC;YACb,UAAU,EAAE,CAAC;YACb,aAAa,EAAE,CAAC;YAChB,eAAe,EAAE,CAAC;YAClB,WAAW,EAAE,CAAC;YACd,YAAY,EAAE,CAAC;YACf,IAAI,EAAE,CAAC;YACP,aAAa,EAAE,aAAa,CAAC,aAAa;YAC1C,SAAS,EAAE,YAAY,EAAE,SAAS,IAAI,EAAE;YACxC,SAAS,EAAE,YAAY,EAAE,SAAS,IAAI,EAAE;YACxC,QAAQ,EAAE,KAAK;YACf,MAAM,EAAE,EAAE;SACX,CAAC;QACF,OAAO;YACL,GAAG,IAAI;YACP,GAAG,QAAQ;YACX,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YACvB,GAAG,EAAE,aAAa,CAAC,GAAG;YACtB,IAAI,EAAE,aAAa,CAAC,IAAI;YACxB,IAAI;YACJ,aAAa,EAAE,aAAa,CAAC,aAAa;SAC3C,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,aAAa,CACzB,eAAoD,EACpD,qBAA6B;QAE7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,eAAe,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;YACjF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CACrC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;gBAChC,GAAG,EAAE,UAAU,CAAC,GAAG;gBACnB,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,GAAG,EAAE,UAAU,CAAC,aAAa;gBAC7B,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,qBAAqB,CAAC;aACxD,CAAC,EACF,EAAE,CACH,CAAC;YACF,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;QACH,OAAO,MAAM;aACV,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;aAC9E,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC/B,CAAC;IAEO,SAAS,CACf,SAA2C;QAE3C,OAAO;YACL,GAAG,EAAE,SAAS,CAAC,GAAG;YAClB,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,OAAO,EAAE,SAAS,CAAC,OAAO;YAC1B,KAAK,EAAE,SAAS,CAAC,OAAO;YACxB,IAAI,EAAE,EAAE;YACR,OAAO,EAAE,IAAI,CAAC,WAAW,CACvB,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,EAC5C,UAAU,SAAS,CAAC,GAAG,EAAE,CAC1B;YACD,SAAS,EAAE,SAAS,CAAC,SAAS;YAC9B,UAAU,EAAE,SAAS,CAAC,UAAU;YAChC,WAAW,EAAE,EAAE;YACf,eAAe,EAAE,EAAE;YACnB,QAAQ,EAAE,GAAG,SAAS,CAAC,GAAG,IAAI,SAAS,CAAC,IAAI,EAAE;YAC9C,KAAK,EAAE,EAAE;YACT,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,CAAC;YACZ,QAAQ,EAAE,KAAK;YACf,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,OAAO,CAAC;SAC9C,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,eAAe,CAC3B,aAAgD,EAChD,MAAc;QAEd,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACvC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;gBACxB,GAAG,EAAE,aAAa,CAAC,GAAG;gBACtB,IAAI,EAAE,aAAa,CAAC,IAAI;gBACxB,GAAG,EAAE,MAAM;aACZ,CAAC;YACF,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;gBACtB,GAAG,EAAE,aAAa,CAAC,GAAG;gBACtB,IAAI,EAAE,aAAa,CAAC,IAAI;gBACxB,OAAO,EAAE,MAAM;aAChB,CAAC;SACH,CAAC,CAAC;QACH,OAAO;YACL,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,KAAK,EAAE,MAAM,CAAC,OAAO;YACrB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,UAAU,MAAM,CAAC,GAAG,EAAE,CAAC;YAChE,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI;YAC9B,WAAW,EAAE,EAAE;YACf,eAAe,EAAE,EAAE;YACnB,QAAQ,EAAE,KAAK;YACf,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC;YACnD,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC/B,IAAI,EAAE,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO;gBAClC,YAAY,EAAE,IAAI,CAAC,OAAO;gBAC1B,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC;gBACvC,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC;gBAC5D,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBAC/B,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;wBAC/B,IAAI,EAAE,IAAI,CAAC,IAAI;wBACf,OAAO,EAAE,IAAI,CAAC,OAAO;wBACrB,SAAS,EAAE,IAAI,CAAC,SAAS;wBACzB,SAAS,EAAE,IAAI,CAAC,SAAS;qBAC1B,CAAC,CAAC;iBACJ,CAAC,CAAC;aACJ,CAAC,CAAC;YACH,aAAa,EAAE,IAAI,CAAC,SAAS;SAC9B,CAAC;IACJ,CAAC;IAEO,UAAU,CAChB,aAAgD,EAChD,QAAsC,EACtC,eAAsD;QAEtD,MAAM,IAAI,GAAG,QAAQ,CAAC,SAAS,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC;QAC1E,OAAO;YACL,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,IAAI;YACJ,IAAI,EAAE,QAAQ,CAAC,IAAI,IAAI,CAAC;YACxB,OAAO,EAAE,IAAI,CAAC,WAAW,CACvB,aAAa,EACb,OAAO,aAAa,CAAC,aAAa,IAAI,QAAQ,CAAC,IAAI,EAAE,CACtD;YACD,WAAW,EAAE,EAAE;YACf,aAAa,EAAE,eAAe,EAAE,GAAG,IAAI,EAAE;YACzC,cAAc,EAAE,eAAe,EAAE,SAAS,IAAI,EAAE;YAChD,iBAAiB,EAAE,eAAe,EAAE,KAAK,IAAI,EAAE;SAChD,CAAC;IACJ,CAAC;IAEO,UAAU,CAChB,aAAgD,EAChD,MAA8B;QAE9B,OAAO;YACL,OAAO,EAAE,MAAM,CAAC,IAAI;YACpB,IAAI,EAAE,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI;YACnC,IAAI,EAAE,MAAM,CAAC,OAAO;YACpB,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,gBAAgB,MAAM,CAAC,IAAI,EAAE,CAAC;YACvE,WAAW,EAAE,MAAM,CAAC,QAAQ;YAC5B,UAAU,EAAE,sCAAsC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;YACpE,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE;gBACN,KAAK,EAAE,EAAE;gBACT,QAAQ,EAAE,MAAM,CAAC,UAAU;gBAC3B,WAAW,EAAE,EAAE;gBACf,OAAO,EAAE,EAAE;gBACX,QAAQ,EAAE,EAAE;gBACZ,SAAS,EAAE,EAAE;gBACb,OAAO,EAAE,EAAE;gBACX,SAAS,EAAE,EAAE;aACd;YACD,MAAM,EAAE,EAAE;SACX,CAAC;IACJ,CAAC;IAEO,WAAW,CACjB,SAA+C;QAE/C,OAAO;YACL,EAAE,EAAE,SAAS,CAAC,GAAG;YACjB,GAAG,EAAE,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;YAC3C,IAAI,EAAE,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;YAC5C,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,OAAO,EAAE,EAAE;YACX,OAAO,EAAE,EAAE;YACX,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,KAAK,EAAE,SAAS,CAAC,KAAK;YACtB,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,SAAS,EAAE,SAAS,CAAC,SAAS;SAC/B,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,aAAgD;QACvE,KAAK,MAAM,IAAI,IAAI,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,CAAC;YAC3D,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;oBAC1C,GAAG,EAAE,aAAa,CAAC,GAAG;oBACtB,IAAI,EAAE,aAAa,CAAC,IAAI;oBACxB,GAAG,EAAE,aAAa,CAAC,aAAa;oBAChC,IAAI;iBACL,CAAC,CAAC;gBACH,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACnB,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACpE,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,SAAS;YACX,CAAC;QACH,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAEO,KAAK,CAAC,aAAa,CACzB,aAAgD;QAEhD,MAAM,SAAS,GAA2B,EAAE,CAAC;QAC7C,MAAM,YAAY,GAAG,CAAC,EAAE,CAAC,CAAC;QAC1B,IAAI,SAAS,GAAG,CAAC,CAAC;QAClB,IAAI,iBAAiB,GAAG,CAAC,CAAC;QAC1B,OAAO,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC5E,MAAM,IAAI,GAAG,YAAY,CAAC,KAAK,EAAG,CAAC;YACnC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CACrC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;gBAC7B,GAAG,EAAE,aAAa,CAAC,GAAG;gBACtB,IAAI,EAAE,aAAa,CAAC,IAAI;gBACxB,GAAG,EAAE,aAAa,CAAC,aAAa;gBAChC,IAAI,EAAE,IAAI,IAAI,SAAS;aACxB,CAAC,EACF,EAAE,CACH,CAAC;YACF,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAC5B,IAAI,iBAAiB,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;oBAC/C,MAAM;gBACR,CAAC;gBACD,iBAAiB,IAAI,CAAC,CAAC;gBACvB,IAAI,KAAK,CAAC,SAAS,KAAK,KAAK,EAAE,CAAC;oBAC9B,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;wBACvC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAChC,CAAC;oBACD,SAAS;gBACX,CAAC;gBACD,IAAI,KAAK,CAAC,SAAS,KAAK,MAAM,IAAI,SAAS,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;oBACrE,SAAS;gBACX,CAAC;gBACD,SAAS,IAAI,CAAC,CAAC;gBACf,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAClD,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;YACvE,CAAC;QACH,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,QAAQ,CACd,OAA4C,EAC5C,QAA8C;QAE9C,OAAO;YACL,QAAQ,EAAE,OAAO,CAAC,MAAM;YACxB,SAAS,EAAE,QAAQ,CAAC,MAAM;YAC1B,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;YACxE,cAAc,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;SAC9E,CAAC;IACJ,CAAC;IAEO,kBAAkB,CAAC,YAAoC;QAC7D,OAAO,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC;aAChC,IAAI,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACzG,CAAC;IAEO,eAAe,CAAC,OAAe;QACrC,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;QAC/D,MAAM,SAAS,GAA2B;YACxC,EAAE,EAAE,YAAY;YAChB,GAAG,EAAE,YAAY;YACjB,EAAE,EAAE,YAAY;YAChB,GAAG,EAAE,YAAY;YACjB,GAAG,EAAE,YAAY;YACjB,GAAG,EAAE,YAAY;YACjB,EAAE,EAAE,MAAM;YACV,EAAE,EAAE,IAAI;YACR,EAAE,EAAE,QAAQ;YACZ,IAAI,EAAE,MAAM;YACZ,EAAE,EAAE,QAAQ;YACZ,EAAE,EAAE,MAAM;YACV,GAAG,EAAE,KAAK;YACV,CAAC,EAAE,GAAG;YACN,CAAC,EAAE,GAAG;YACN,EAAE,EAAE,KAAK;YACT,GAAG,EAAE,KAAK;YACV,GAAG,EAAE,KAAK;YACV,EAAE,EAAE,IAAI;YACR,KAAK,EAAE,OAAO;YACd,EAAE,EAAE,OAAO;YACX,IAAI,EAAE,OAAO;YACb,GAAG,EAAE,OAAO;YACZ,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,KAAK;YACV,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,KAAK;YACV,MAAM,EAAE,QAAQ;SACjB,CAAC;QACF,OAAO,SAAS,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC;IACzC,CAAC;IAEO,eAAe,CAAC,UAAkB;QACxC,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,6BAA6B,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACzF,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,MAAM,CAAC;YACZ,KAAK,KAAK,CAAC;YACX,KAAK,MAAM,CAAC;YACZ,KAAK,MAAM,CAAC;YACZ,KAAK,MAAM,CAAC;YACZ,KAAK,UAAU,CAAC;YAChB,KAAK,OAAO,CAAC;YACb,KAAK,IAAI,CAAC;YACV,KAAK,OAAO;gBACV,OAAO,MAAM,CAAC;YAChB,KAAK,SAAS,CAAC;YACf,KAAK,KAAK;gBACR,OAAO,KAAK,CAAC;YACf;gBACE,OAAO,MAAM,CAAC;QAClB,CAAC;IACH,CAAC;IAEO,aAAa,CACnB,SAA6D;QAE7D,QAAQ,SAAS,EAAE,CAAC;YAClB,KAAK,OAAO,CAAC;YACb,KAAK,SAAS,CAAC;YACf,KAAK,SAAS;gBACZ,OAAO,SAAS,CAAC;YACnB;gBACE,OAAO,UAAU,CAAC;QACtB,CAAC;IACH,CAAC;IAEO,WAAW,CACjB,aAAsE,EACtE,SAAiB;QAEjB,MAAM,aAAa,GAAG,SAAS;aAC5B,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;aAC7C,IAAI,CAAC,GAAG,CAAC,CAAC;QACb,OAAO,GAAG,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,GAAG,IAAI,aAAa,CAAC,IAAI,IAAI,aAAa,EAAE,CAAC;IAC7F,CAAC;IAEO,QAAQ,CAAC,QAAgB;QAC/B,IAAI,IAAI,GAAG,UAAU,CAAC;QACtB,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;YAC5B,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAC3B,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACnC,CAAC;QACD,OAAO,IAAI,KAAK,CAAC,CAAC;IACpB,CAAC;IAEO,gBAAgB,CAAC,QAAgB,EAAE,mBAA6B;QACtE,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAClD,IACE,CAAC,KAAK;eACH,KAAK,CAAC,MAAM,GAAG,IAAI;eACnB,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,EACtC,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtC,CAAC;QACD,IAAI,MAAW,CAAC;QAChB,IAAI,CAAC;YACH,MAAM,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;QAC1B,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtC,CAAC;QACD,IACE,CAAC,mBAAmB,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC;eAC3C,MAAM,CAAC,QAAQ;eACf,MAAM,CAAC,MAAM;eACb,MAAM,CAAC,IAAI,EACd,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,YAAY,CAAC,QAAgB,EAAE,QAAgB,EAAE,YAAoB;QAC3E,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC9B,IACE,CAAC,KAAK;eACH,KAAK,CAAC,MAAM,GAAG,YAAY;eAC3B,KAAK,KAAK,GAAG;eACb,KAAK,KAAK,IAAI;eACd,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,EACnC,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,WAAW,QAAQ,EAAE,CAAC,CAAC;QACzC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,YAAY,CAAC,QAAgB,EAAE,aAAa,GAAG,IAAI;QACzD,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QACvD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,aAAa,EAAE,CAAC;gBAClB,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtC,CAAC;QACD,IACE,IAAI,CAAC,MAAM,GAAG,GAAG;eACd,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;eACnB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,IAAI,OAAO,KAAK,GAAG,IAAI,OAAO,KAAK,IAAI,CAAC,EACrF,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;QAClC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,aAAa,CACnB,QAAgB,EAChB,QAAgB,EAChB,UAAkB,EAClB,UAAkB;QAElB,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,QAAQ,GAAG,UAAU,IAAI,QAAQ,GAAG,UAAU,EAAE,CAAC;YACtF,MAAM,IAAI,KAAK,CAAC,GAAG,QAAQ,+BAA+B,UAAU,QAAQ,UAAU,EAAE,CAAC,CAAC;QAC5F,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEO,KAAK,CAAC,YAAY,CACxB,YAAmC,EACnC,WAAmB;QAEnB,IAAI,CAAC;YACH,OAAO,MAAM,YAAY,EAAE,CAAC;QAC9B,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,WAAW,CAAC;QACrB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAC9B,QAAkB,EAClB,SAAgD;QAEhD,MAAM,OAAO,GAAG,IAAI,KAAK,CAAU,QAAQ,CAAC,MAAM,CAAC,CAAC;QACpD,IAAI,SAAS,GAAG,CAAC,CAAC;QAClB,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CACxB,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,EAC1D,KAAK,IAAI,EAAE;YACT,OAAO,SAAS,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACnC,MAAM,KAAK,GAAG,SAAS,CAAC;gBACxB,SAAS,IAAI,CAAC,CAAC;gBACf,OAAO,CAAC,KAAK,CAAC,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;YACpD,CAAC;QACH,CAAC,CACF,CAAC;QACF,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3B,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}
|
|
693
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.gitmanagerpublicclient.js","sourceRoot":"","sources":["../ts/classes.gitmanagerpublicclient.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@foss.global/codefeed",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.11.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The @foss.global/codefeed module generates commit/activity feeds from forge providers including Gitea and GitManager.",
|
|
6
6
|
"exports": {
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
21
|
"@foss.global/gitmanager": "^1.0.0",
|
|
22
|
-
"@foss.global/interfaces": "^0.
|
|
22
|
+
"@foss.global/interfaces": "^0.11.0",
|
|
23
23
|
"@push.rocks/lik": "^6.2.2",
|
|
24
24
|
"@push.rocks/qenv": "^6.1.3",
|
|
25
25
|
"@push.rocks/smartnpm": "^2.0.6",
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -159,6 +159,7 @@ export class GitManagerPublicReadClient {
|
|
|
159
159
|
repoArg: string,
|
|
160
160
|
pathArg = '',
|
|
161
161
|
_issueNumberArg = 0,
|
|
162
|
+
_pullRequestNumberArg = 0,
|
|
162
163
|
): Promise<plugins.fossInterfaces.IReq_PublicRepo['response']> {
|
|
163
164
|
const repository = await this.findVisibleRepository(orgArg, repoArg);
|
|
164
165
|
if (!repository) {
|
|
@@ -171,6 +172,12 @@ export class GitManagerPublicReadClient {
|
|
|
171
172
|
issues: [],
|
|
172
173
|
selectedIssue: null,
|
|
173
174
|
selectedIssueComments: [],
|
|
175
|
+
pullRequests: [],
|
|
176
|
+
selectedPullRequest: null,
|
|
177
|
+
selectedPullRequestComments: [],
|
|
178
|
+
selectedPullRequestReviews: [],
|
|
179
|
+
selectedPullRequestReviewComments: [],
|
|
180
|
+
selectedPullRequestDiff: null,
|
|
174
181
|
commits: [],
|
|
175
182
|
languages: {},
|
|
176
183
|
};
|
|
@@ -223,6 +230,12 @@ export class GitManagerPublicReadClient {
|
|
|
223
230
|
issues: [],
|
|
224
231
|
selectedIssue: null,
|
|
225
232
|
selectedIssueComments: [],
|
|
233
|
+
pullRequests: [],
|
|
234
|
+
selectedPullRequest: null,
|
|
235
|
+
selectedPullRequestComments: [],
|
|
236
|
+
selectedPullRequestReviews: [],
|
|
237
|
+
selectedPullRequestReviewComments: [],
|
|
238
|
+
selectedPullRequestDiff: null,
|
|
226
239
|
commits,
|
|
227
240
|
languages,
|
|
228
241
|
};
|
|
@@ -316,6 +329,35 @@ export class GitManagerPublicReadClient {
|
|
|
316
329
|
};
|
|
317
330
|
}
|
|
318
331
|
|
|
332
|
+
public async getPullRequestDiff(
|
|
333
|
+
orgArg: string,
|
|
334
|
+
repoArg: string,
|
|
335
|
+
baseObjectIdArg: string,
|
|
336
|
+
headObjectIdArg: string,
|
|
337
|
+
): Promise<plugins.fossInterfaces.IPublicPullRequestDiff | null> {
|
|
338
|
+
const repository = await this.findVisibleRepository(orgArg, repoArg);
|
|
339
|
+
if (!repository) {
|
|
340
|
+
return null;
|
|
341
|
+
}
|
|
342
|
+
const baseObjectId = this.validateObjectId(baseObjectIdArg, 'base object ID');
|
|
343
|
+
const headObjectId = this.validateObjectId(headObjectIdArg, 'head object ID');
|
|
344
|
+
const diff = await this.gitManager.getDiff({
|
|
345
|
+
org: repository.org,
|
|
346
|
+
repo: repository.repo,
|
|
347
|
+
baseRef: baseObjectId,
|
|
348
|
+
headRef: headObjectId,
|
|
349
|
+
});
|
|
350
|
+
return {
|
|
351
|
+
baseObjectId,
|
|
352
|
+
headObjectId,
|
|
353
|
+
filesChanged: diff.filesChanged,
|
|
354
|
+
additions: diff.additions,
|
|
355
|
+
deletions: diff.deletions,
|
|
356
|
+
truncated: diff.truncated,
|
|
357
|
+
files: this.mapDiffFiles(diff.files),
|
|
358
|
+
};
|
|
359
|
+
}
|
|
360
|
+
|
|
319
361
|
private async listVisibleRepositories(): Promise<plugins.TGitManagerRepositoryInfo[]> {
|
|
320
362
|
const repositories = await this.gitManager.listRepositories();
|
|
321
363
|
if (this.allowAllRepositories) {
|
|
@@ -501,28 +543,34 @@ export class GitManagerPublicReadClient {
|
|
|
501
543
|
parents: commit.parents.map((parent) => parent.sha),
|
|
502
544
|
additions: diff.additions,
|
|
503
545
|
deletions: diff.deletions,
|
|
504
|
-
files: diff.files
|
|
505
|
-
path: file.newPath || file.oldPath,
|
|
506
|
-
previousPath: file.oldPath,
|
|
507
|
-
status: this.mapDiffStatus(file.status),
|
|
508
|
-
language: this.languageForPath(file.newPath || file.oldPath),
|
|
509
|
-
additions: file.additions,
|
|
510
|
-
deletions: file.deletions,
|
|
511
|
-
isBinary: file.isBinary,
|
|
512
|
-
hunks: file.hunks.map((hunk) => ({
|
|
513
|
-
header: hunk.header,
|
|
514
|
-
lines: hunk.lines.map((line) => ({
|
|
515
|
-
kind: line.kind,
|
|
516
|
-
content: line.content,
|
|
517
|
-
oldNumber: line.oldNumber,
|
|
518
|
-
newNumber: line.newNumber,
|
|
519
|
-
})),
|
|
520
|
-
})),
|
|
521
|
-
})),
|
|
546
|
+
files: this.mapDiffFiles(diff.files),
|
|
522
547
|
diffTruncated: diff.truncated,
|
|
523
548
|
};
|
|
524
549
|
}
|
|
525
550
|
|
|
551
|
+
private mapDiffFiles(
|
|
552
|
+
filesArg: plugins.TGitManagerDiff['files'],
|
|
553
|
+
): plugins.fossInterfaces.IPublicDiffFile[] {
|
|
554
|
+
return filesArg.map((file) => ({
|
|
555
|
+
path: file.newPath || file.oldPath,
|
|
556
|
+
previousPath: file.oldPath,
|
|
557
|
+
status: this.mapDiffStatus(file.status),
|
|
558
|
+
language: this.languageForPath(file.newPath || file.oldPath),
|
|
559
|
+
additions: file.additions,
|
|
560
|
+
deletions: file.deletions,
|
|
561
|
+
isBinary: file.isBinary,
|
|
562
|
+
hunks: file.hunks.map((hunk) => ({
|
|
563
|
+
header: hunk.header,
|
|
564
|
+
lines: hunk.lines.map((line) => ({
|
|
565
|
+
kind: line.kind,
|
|
566
|
+
content: line.content,
|
|
567
|
+
oldNumber: line.oldNumber,
|
|
568
|
+
newNumber: line.newNumber,
|
|
569
|
+
})),
|
|
570
|
+
})),
|
|
571
|
+
}));
|
|
572
|
+
}
|
|
573
|
+
|
|
526
574
|
private mapContent(
|
|
527
575
|
repositoryArg: plugins.TGitManagerRepositoryInfo,
|
|
528
576
|
entryArg: plugins.TGitManagerTreeEntry,
|
|
@@ -733,6 +781,14 @@ export class GitManagerPublicReadClient {
|
|
|
733
781
|
}
|
|
734
782
|
}
|
|
735
783
|
|
|
784
|
+
private validateObjectId(valueArg: string, labelArg: string): string {
|
|
785
|
+
const value = valueArg.trim();
|
|
786
|
+
if (!/^[0-9a-fA-F]{40,64}$/.test(value)) {
|
|
787
|
+
throw new Error(`Invalid ${labelArg}`);
|
|
788
|
+
}
|
|
789
|
+
return value.toLowerCase();
|
|
790
|
+
}
|
|
791
|
+
|
|
736
792
|
private repoPathUrl(
|
|
737
793
|
repositoryArg: Pick<plugins.TGitManagerRepositoryInfo, 'org' | 'repo'>,
|
|
738
794
|
suffixArg: string,
|