@chisquare-tech/origine-ngx-apps-code 0.12.0 → 0.13.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chisquare-tech/origine-ngx-apps-code",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "Origine's Code module screens: repositories, files, commits, branches, pull requests and review, repository settings.",
   "repository": {
     "type": "git",

package/types/chisquare-tech-origine-ngx-apps-code.d.ts

@@ -68,6 +68,57 @@ interface Repo {
     /** The caller's collaborator permission on this repository (read, write or maintain), if any. */
     collaborator?: string;
     createdAt?: string;
+    /** The repository is a pull mirror of its import source, read-only for pushes (V6-01). */
+    mirror?: boolean;
+}
+/** A repository's pull mirror (V6-01). */
+interface Mirror {
+    source: string;
+    intervalMinutes: number;
+    /** Whom the mirror syncs as: who set it up, or last saved it. */
+    setBy: string;
+    nextSyncAt: string;
+    lastSyncAt?: string;
+    lastSuccessAt?: string;
+    lastError?: string;
+    lfsMissing?: number;
+    hasCredentials: boolean;
+    waiting: boolean;
+    syncing: boolean;
+}
+/** One conflicted file of a pull request, for the resolver (V6-03). */
+interface ConflictFile {
+    path: string;
+    /** content (resolvable here), binary, modify/delete, rename, large, lfs or other. */
+    kind: string;
+    resolvable: boolean;
+    message?: string;
+    base?: string;
+    ours?: string;
+    theirs?: string;
+    merged?: string;
+}
+/** A pull request's conflicts with its target (V6-03). */
+interface Conflicts {
+    number: number;
+    source: string;
+    target: string;
+    headSha: string;
+    baseSha: string;
+    files: ConflictFile[];
+    resolvable: boolean;
+    canResolve: boolean;
+    /** The resolution lands on the head branch; else on a new branch with a pull request into it. */
+    direct: boolean;
+}
+/** Where a resolution went (V6-03). */
+interface Resolution {
+    branch: string;
+    commit: {
+        oid: string;
+        short: string;
+    };
+    pull?: number;
 }
 interface GitPerson {
     name: string;
@@ -475,7 +526,22 @@ declare class CodeApi {
         token?: string;
         description?: string;
         visibility?: string;
+        mirror?: boolean;
+        intervalMinutes?: number;
     }): Observable<Repo>;
+    /** A repository's pull mirror (V6-01). */
+    mirror(project: string, name: string): Observable<Mirror>;
+    /** Changes the mirror's source, credentials or interval; the saver becomes whom it syncs as. */
+    updateMirror(project: string, name: string, body: Partial<{
+        url: string;
+        username: string;
+        token: string;
+        clearCredentials: boolean;
+        intervalMinutes: number;
+    }>): Observable<Mirror>;
+    syncMirror(project: string, name: string): Observable<Mirror>;
+    /** Stops mirroring: an ordinary repository that takes pushes. */
+    stopMirror(project: string, name: string): Observable<Repo>;
     repo(project: string, name: string): Observable<Repo>;
     update(project: string, name: string, body: Partial<{
         name: string;
@@ -577,6 +643,15 @@ declare class CodeApi {
         deleteBranch?: boolean;
         expectHead?: string;
     }): Observable<Pull>;
+    /** A pull request's conflicts with its target, for the resolver (V6-03). */
+    conflicts(project: string, name: string, n: number): Observable<Conflicts>;
+    /** Commits a resolution of the conflicts (V6-03). */
+    resolveConflicts(project: string, name: string, n: number, body: {
+        files: Record<string, string>;
+        message?: string;
+        expectHead: string;
+        expectBase: string;
+    }): Observable<Resolution>;
     conversation(project: string, name: string, n: number): Observable<Timeline>;
     comment(project: string, name: string, n: number, c: NewComment): Observable<PRComment>;
     /** Arms (method) or disarms (null) auto-merge on a pull request (DEV-25). */
@@ -624,6 +699,17 @@ declare class CurrentRepo {
  * component's encapsulation, hence ::ng-deep.
  */
 declare const TOKEN_CSS = "\n  :host ::ng-deep [class^=\"tk-k\"]{color:var(--o-tk-k)}\n  :host ::ng-deep [class^=\"tk-s\"], :host ::ng-deep [class^=\"tk-l\"]{color:var(--o-tk-s)}\n  :host ::ng-deep [class^=\"tk-c\"]{color:var(--o-tk-c);font-style:italic}\n  :host ::ng-deep [class^=\"tk-m\"]{color:var(--o-tk-n)}\n  :host ::ng-deep .tk-nf, :host ::ng-deep .tk-nx, :host ::ng-deep .tk-fm{color:var(--o-tk-f)}\n  :host ::ng-deep .tk-nb, :host ::ng-deep .tk-nt, :host ::ng-deep .tk-bp{color:var(--o-tk-p)}\n  :host ::ng-deep .tk-gi{color:var(--o-add)} :host ::ng-deep .tk-gd{color:var(--o-bad-tx)}\n";
+/** A commit's verification badge (DEV-31, V6-04): commits Origine made read "Verified · Origine". */
+declare function verifyLabel(v: {
+    verified: boolean;
+    signer?: string;
+}): string;
+/** The badge's hover text: whose key signed it, or why it is not verified. */
+declare function verifyTitle(v: {
+    verified: boolean;
+    reason: string;
+    signer?: string;
+}, name: (id: string) => string): string;
 /** Why a signed commit is not verified (DEV-31). */
 declare function verifyWhy(reason: string): string;
 
@@ -643,8 +729,15 @@ declare abstract class RepoPage {
     protected readonly note: _angular_core.WritableSignal<string>;
     protected readonly people: _angular_core.Signal<People>;
     protected readonly verifyWhy: typeof verifyWhy;
+    protected readonly verifyLabel: typeof verifyLabel;
+    protected verifyTitle(v: {
+        verified: boolean;
+        reason: string;
+        signer?: string;
+    }): string;
     /** Whether the caller holds code capability id on this repository (V4-01): its caps, a collaborator row included. */
     protected can(id: string): boolean;
+    /** Takes writes: not archived, and not a pull mirror (V6-01). */
     private readonly live;
     protected readonly canWrite: _angular_core.Signal<boolean>;
     /** Every repository setting, a rename and the visibility included. */
@@ -810,6 +903,8 @@ declare class NewRepoPage {
     protected url_: string;
     protected user: string;
     protected token: string;
+    protected mirror: boolean;
+    protected interval: number;
     constructor();
     protected nameFromUrl(): void;
     protected copyUrl(): void;
@@ -1094,6 +1189,10 @@ declare class PullPage extends RepoPage {
     protected readonly method: _angular_core.WritableSignal<string>;
     protected readonly delBranch: _angular_core.WritableSignal<boolean>;
     private number;
+    /** The conflict resolver (V6-03): the conflicts, and each file's resolution as edited. */
+    protected readonly resolver: _angular_core.WritableSignal<Conflicts | null>;
+    protected readonly resolved: _angular_core.WritableSignal<Record<string, string>>;
+    protected readonly resolutionReady: _angular_core.Signal<boolean>;
     protected readonly ago: (s?: string) => string;
     protected readonly initials: typeof initials;
     protected readonly dot: typeof checkDot;
@@ -1164,6 +1263,11 @@ declare class PullPage extends RepoPage {
         resolved: boolean;
     }): void;
     protected merge(): void;
+    protected openResolver(): void;
+    protected take(path: string, text: string): void;
+    protected hasMarkers(text?: string): boolean;
+    protected conflictKind(kind: string): string;
+    protected commitResolution(): void;
     protected close(reopen: boolean): void;
     protected outside(e: MouseEvent): void;
     private sendReview;
@@ -1173,7 +1277,7 @@ declare class PullPage extends RepoPage {
     static ɵcmp: _angular_core.ɵɵComponentDeclaration<PullPage, "o-code-pull", never, {}, {}, never, never, true, never>;
 }
 
-type Section = 'general' | 'protect' | 'collab' | 'danger';
+type Section = 'general' | 'mirror' | 'protect' | 'collab' | 'danger';
 interface RuleForm {
     id: string;
     pattern: string;
@@ -1223,6 +1327,18 @@ declare class RepoSettingsPage extends RepoPage {
         label: string;
     }[]>;
     constructor();
+    protected readonly ago: typeof ago;
+    protected readonly mirror: _angular_core.WritableSignal<Mirror | null>;
+    protected mf: {
+        url: string;
+        username: string;
+        token: string;
+        interval: number;
+    };
+    private loadMirror;
+    protected syncNow(): void;
+    protected saveMirror(): void;
+    protected stopMirror(): void;
     protected readonly collabs: _angular_core.WritableSignal<Collaborator[]>;
     protected readonly perms: {
         id: string;
@@ -1348,5 +1464,5 @@ declare class CodeSearchPage extends RepoPage {
     static ɵcmp: _angular_core.ɵɵComponentDeclaration<CodeSearchPage, "o-code-search", never, {}, {}, never, never, true, never>;
 }
 
-export { BranchesPage, CodeApi, CodeHost, CodeSearchPage, CommitBox, CommitPage, CommitsPage, CurrentRepo, CurrentRepoPage, DiffView, FilePage, NewFilePage, NewRepoPage, People, PullPage, PullsPage, RefPicker, ReleasesPage, RepoHomePage, RepoPage, RepoSettingsPage, ReposPage, TOKEN_CSS, ago, apiMessage, checkDot, copy, dayLabel, initials, langColour, matchesPattern, pair, shortDate, size, verifyWhy };
-export type { BlameHunk, Blob, BlobTable, CheckStatus, CodeHit, CodePerson, CodeProject, Collaborator, Commit, CommitChoice, CommitDetail, CommitRequest, CommitResult, Comparison, DiffHunk, DiffLine, Entry, FileChange, FileDiff, Gate, GateRow, GitPerson, Language, LfsObject, LineComment, NewComment, PRComment, Protection, Pull, PullBrief, Ref, Release, ReleaseAsset, ReleaseInput, Repo, Review, ReviewBrief, SplitRow, Thread, ThreadReply, Timeline, Tree };
+export { BranchesPage, CodeApi, CodeHost, CodeSearchPage, CommitBox, CommitPage, CommitsPage, CurrentRepo, CurrentRepoPage, DiffView, FilePage, NewFilePage, NewRepoPage, People, PullPage, PullsPage, RefPicker, ReleasesPage, RepoHomePage, RepoPage, RepoSettingsPage, ReposPage, TOKEN_CSS, ago, apiMessage, checkDot, copy, dayLabel, initials, langColour, matchesPattern, pair, shortDate, size, verifyLabel, verifyTitle, verifyWhy };
+export type { BlameHunk, Blob, BlobTable, CheckStatus, CodeHit, CodePerson, CodeProject, Collaborator, Commit, CommitChoice, CommitDetail, CommitRequest, CommitResult, Comparison, ConflictFile, Conflicts, DiffHunk, DiffLine, Entry, FileChange, FileDiff, Gate, GateRow, GitPerson, Language, LfsObject, LineComment, Mirror, NewComment, PRComment, Protection, Pull, PullBrief, Ref, Release, ReleaseAsset, ReleaseInput, Repo, Resolution, Review, ReviewBrief, SplitRow, Thread, ThreadReply, Timeline, Tree };