standup-mr 0.1.2 → 0.2.0

package/dist/cli.js

@@ -1,15 +1,11 @@
 #!/usr/bin/env node
 import {
   ConfigError,
-  GitLabProvider,
   buildReport,
-  glabHosts,
-  glabToken,
+  connect,
   postWebhook,
-  resolveHost,
-  resolveToken,
   toMarkdown
-} from "./chunk-SKCJT2AY.js";
+} from "./chunk-MIQ7FQS6.js";
 
 // src/cli/cli.ts
 import { realpathSync } from "fs";
@@ -20,10 +16,15 @@ import { parseArgs } from "util";
 var USAGE = `standup \u2014 standup notes from merge request state
 
 Usage:
-  standup fetch [--host H] [--token T] [--lang en|tr] [--markdown]
+  standup fetch [--provider github|gitlab] [--host H] [--token T]
+                [--lang en|tr] [--markdown]
   standup post (--slack URL | --discord URL) [--text TEXT]
 
-Credentials resolve as: flag, then GITLAB_HOST / GITLAB_TOKEN, then glab config.
+The provider is taken from --provider, then STANDUP_PROVIDER, then whichever of
+GITHUB_* / GITLAB_* is set, then whichever of gh / glab is logged in.
+
+Credentials resolve as: flag, then GITHUB_HOST / GITHUB_TOKEN (or GITLAB_HOST /
+GITLAB_TOKEN), then the gh or glab config.
 --text defaults to '-', meaning read stdin.`;
 
 // src/cli/cli.ts
@@ -32,11 +33,6 @@ async function readStdin() {
   for await (const chunk of process.stdin) chunks.push(Buffer.from(chunk));
   return Buffer.concat(chunks).toString("utf8");
 }
-function connect(values) {
-  const host = resolveHost(values.host, process.env.GITLAB_HOST, glabHosts());
-  const token = resolveToken(host, values.token, process.env.GITLAB_TOKEN, glabToken);
-  return new GitLabProvider(host, token);
-}
 async function main(argv) {
   const [command, ...rest] = argv;
   if (!command || command === "--help" || command === "-h") {
@@ -49,6 +45,7 @@ async function main(argv) {
       const { values } = parseArgs({
         args: rest,
         options: {
+          provider: { type: "string" },
           host: { type: "string" },
           token: { type: "string" },
           lang: { type: "string", default: "en" },

package/dist/index.d.ts

@@ -10,6 +10,7 @@ interface PipelineInput {
     pipelineMissing?: boolean;
 }
 
+type ProviderKind = 'gitlab' | 'github';
 type FetchLike = (url: string, init?: RequestInit) => Promise<Response>;
 type Bucket = 'ready' | 'blocked' | 'draft' | 'stale';
 interface Identity {
@@ -27,6 +28,7 @@ interface ActivityEvent {
     commitTitle: string;
 }
 interface MergeRequest {
+    provider: ProviderKind;
     project: string;
     projectId: number;
     iid: number;
@@ -44,6 +46,7 @@ interface MergeRequest {
     bucket: Bucket;
 }
 interface Review {
+    provider: ProviderKind;
     project: string;
     iid: number;
     title: string;
@@ -55,6 +58,7 @@ interface Review {
     approvedByMe: boolean;
 }
 interface Blocker {
+    provider: ProviderKind;
     project: string;
     mr: number;
     title: string;
@@ -63,19 +67,20 @@ interface Blocker {
     url: string;
     errors: string[];
 }
+interface ActiveDay {
+    date: string;
+    label: string;
+    gapDays: number;
+    events: ActivityEvent[];
+}
 interface StandupReport {
+    provider: ProviderKind;
     user: string;
     today: {
         date: string;
         label: string;
     };
-    previous: {
-        date: string | null;
-        label: string | null;
-        gapDays: number | null;
-        eventCount: number;
-    };
-    previousEvents: ActivityEvent[];
+    previousDays: ActiveDay[];
     todayEvents: ActivityEvent[];
     myMrs: MergeRequest[];
     reviews: Review[];
@@ -91,17 +96,31 @@ declare const STALE_DAYS = 14;
 declare class ConfigError extends Error {
     constructor(message: string);
 }
-declare function resolveHost(cliHost?: string, envHost?: string, glabHostList?: string[]): string;
-declare function resolveToken(host: string, cliToken?: string, envToken?: string, glabLookup?: (host: string) => string): string;
+interface ProviderLabels {
+    name: string;
+    cli: string;
+    envHost: string;
+    envToken: string;
+    login: (host: string) => string;
+}
+declare const GITLAB_LABELS: ProviderLabels;
+declare const GITHUB_LABELS: ProviderLabels;
+declare function resolveHost(cliHost?: string, envHost?: string, hostList?: string[], labels?: ProviderLabels): string;
+declare function resolveToken(host: string, cliToken?: string, envToken?: string, lookup?: (host: string) => string, labels?: ProviderLabels): string;
+declare function parseLoggedInHosts(statusOutput: string): string[];
+declare const parseGlabHosts: typeof parseLoggedInHosts;
 declare function glabHosts(): string[];
 declare function glabToken(host: string): string;
+declare function ghHosts(): string[];
+declare function ghToken(host: string): string;
 
 declare function isoDay(day: Date): string;
+declare function localAt(iso: string): string;
 declare function label(day: Date, lang?: string): string;
-declare function previousActiveDay(eventDates: Set<string>, today: Date): {
-    date: string | null;
-    gapDays: number | null;
-};
+declare function previousActiveDays(eventDates: Set<string>, today: Date): Array<{
+    date: string;
+    gapDays: number;
+}>;
 
 declare const PAYLOAD_FIELD: {
     readonly slack: "text";
@@ -113,21 +132,110 @@ type WebhookKind = keyof typeof PAYLOAD_FIELD;
 declare function postWebhook(url: string, text: string, kind?: WebhookKind, fetchImpl?: FetchLike): Promise<void>;
 
 interface Provider {
+    readonly kind: ProviderKind;
+    getIdentity(): Promise<Identity>;
+    getEvents(since: Date): Promise<ActivityEvent[]>;
+    getMyMrs(today: Date): Promise<MergeRequest[]>;
+    getReviews(identity: Identity, today: Date): Promise<Review[]>;
+    getBlockers(mrs: MergeRequest[]): Promise<Blocker[]>;
+}
+
+declare function buildUrl(api: string, path: string, params?: Record<string, string | number>): string;
+declare class ApiError extends Error {
+    constructor(message: string);
+}
+declare function assertUsable(response: Response, host: string): void;
+declare function unreachable(host: string, cause: unknown): ApiError;
+
+type Params$1 = Record<string, string | number>;
+declare class GitHubProvider implements Provider {
+    readonly kind: "github";
+    readonly host: string;
+    readonly api: string;
+    private readonly token;
+    private readonly fetchImpl;
+    private identity;
+    constructor(host: string, token: string, fetchImpl?: FetchLike);
+    private headers;
+    private send;
+    getJson<T>(path: string, params?: Params$1): Promise<T | null>;
+    getPaged<T>(path: string, params?: Params$1, cap?: number): Promise<T[]>;
+    getSearch<T>(query: string, cap?: number): Promise<T[]>;
+    getLogText(path: string): Promise<string>;
     getIdentity(): Promise<Identity>;
     getEvents(since: Date): Promise<ActivityEvent[]>;
+    private shapePr;
     getMyMrs(today: Date): Promise<MergeRequest[]>;
-    getReviews(uid: number, today: Date): Promise<Review[]>;
+    getReviews(identity: Identity, today: Date): Promise<Review[]>;
+    private actionsBlocker;
+    private checkRunBlocker;
+    private diagnose;
     getBlockers(mrs: MergeRequest[]): Promise<Blocker[]>;
 }
 
+interface RawCommit {
+    message?: string;
+}
+interface RawEvent {
+    type?: string;
+    created_at: string;
+    repo?: {
+        name?: string;
+    };
+    payload?: {
+        action?: string;
+        ref?: string;
+        size?: number;
+        commits?: RawCommit[];
+        pull_request?: {
+            title?: string;
+        };
+        issue?: {
+            title?: string;
+        };
+    };
+}
+interface PullReview {
+    state: string;
+    submitted_at?: string;
+    user?: {
+        login?: string;
+    };
+}
+interface CheckRun {
+    id: number;
+    name: string;
+    status: string;
+    conclusion: string | null;
+    app?: {
+        slug?: string;
+    } | null;
+    output?: {
+        summary?: string | null;
+        text?: string | null;
+    } | null;
+}
+
+declare function repoFromUrl(repositoryUrl: string): string;
+declare function mapEvent(raw: RawEvent): ActivityEvent;
+
+declare function normalizeChecks(runs: CheckRun[]): {
+    pipeline: string | null;
+    pipelineId: number | null;
+};
+declare function latestStateByReviewer(reviews: PullReview[]): Map<string, string>;
+declare function countChangesRequested(reviews: PullReview[]): number;
+declare function approvedBy(reviews: PullReview[], login: string): boolean;
+
 type Params = Record<string, string | number>;
 declare class GitLabProvider implements Provider {
+    readonly kind: "gitlab";
     readonly host: string;
     readonly api: string;
     private readonly token;
     private readonly fetchImpl;
     constructor(host: string, token: string, fetchImpl?: FetchLike);
-    private url;
+    private send;
     getJson<T>(path: string, params?: Params): Promise<T | null>;
     getText(path: string): Promise<string>;
     getPaged<T>(path: string, params?: Params, cap?: number): Promise<T[]>;
@@ -138,14 +246,27 @@ declare class GitLabProvider implements Provider {
     private shapeMr;
     getMyMrs(today: Date): Promise<MergeRequest[]>;
     private approvedByMe;
-    getReviews(uid: number, today: Date): Promise<Review[]>;
+    getReviews(identity: Identity, today: Date): Promise<Review[]>;
     getBlockers(mrs: MergeRequest[]): Promise<Blocker[]>;
 }
 
+interface SelectOptions {
+    provider?: string;
+    host?: string;
+    token?: string;
+    env?: Record<string, string | undefined>;
+    probe?: {
+        gitlab: () => string[];
+        github: () => string[];
+    };
+}
+declare function chooseKind(options?: SelectOptions): ProviderKind;
+declare function connect(options?: SelectOptions): Provider;
+
 declare function toMarkdown(report: StandupReport, lang?: string): string;
 
 declare function buildReport(provider: Provider, today: Date, lang?: string, lookbackDays?: number): Promise<StandupReport>;
 
 declare function extractErrors(rawTrace: string, limit?: number): string[];
 
-export { type ActivityEvent, type Blocker, type Bucket, ConfigError, type FetchLike, GitLabProvider, type Identity, type MergeRequest, type Provider, type Review, STALE_DAYS, type StandupReport, buildReport, classify, extractErrors, glabHosts, glabToken, isoDay, label, markMissingPipelines, postWebhook, previousActiveDay, resolveHost, resolveToken, toMarkdown };
+export { type ActiveDay, type ActivityEvent, ApiError, type Blocker, type Bucket, ConfigError, type FetchLike, GITHUB_LABELS, GITLAB_LABELS, GitHubProvider, GitLabProvider, type Identity, type MergeRequest, type Provider, type ProviderKind, type ProviderLabels, type Review, STALE_DAYS, type SelectOptions, type StandupReport, approvedBy, assertUsable, buildReport, buildUrl, chooseKind, classify, connect, countChangesRequested, extractErrors, ghHosts, ghToken, glabHosts, glabToken, isoDay, label, latestStateByReviewer, localAt, mapEvent, markMissingPipelines, normalizeChecks, parseGlabHosts, parseLoggedInHosts, postWebhook, previousActiveDays, repoFromUrl, resolveHost, resolveToken, toMarkdown, unreachable };

package/dist/index.js

@@ -1,37 +1,77 @@
 #!/usr/bin/env node
 import {
+  ApiError,
   ConfigError,
+  GITHUB_LABELS,
+  GITLAB_LABELS,
+  GitHubProvider,
   GitLabProvider,
   STALE_DAYS,
+  approvedBy,
+  assertUsable,
   buildReport,
+  buildUrl,
+  chooseKind,
   classify,
+  connect,
+  countChangesRequested,
   extractErrors,
+  ghHosts,
+  ghToken,
   glabHosts,
   glabToken,
   isoDay,
   label,
+  latestStateByReviewer,
+  localAt,
+  mapEvent,
   markMissingPipelines,
+  normalizeChecks,
+  parseGlabHosts,
+  parseLoggedInHosts,
   postWebhook,
-  previousActiveDay,
+  previousActiveDays,
+  repoFromUrl,
   resolveHost,
   resolveToken,
-  toMarkdown
-} from "./chunk-SKCJT2AY.js";
+  toMarkdown,
+  unreachable
+} from "./chunk-MIQ7FQS6.js";
 export {
+  ApiError,
   ConfigError,
+  GITHUB_LABELS,
+  GITLAB_LABELS,
+  GitHubProvider,
   GitLabProvider,
   STALE_DAYS,
+  approvedBy,
+  assertUsable,
   buildReport,
+  buildUrl,
+  chooseKind,
   classify,
+  connect,
+  countChangesRequested,
   extractErrors,
+  ghHosts,
+  ghToken,
   glabHosts,
   glabToken,
   isoDay,
   label,
+  latestStateByReviewer,
+  localAt,
+  mapEvent,
   markMissingPipelines,
+  normalizeChecks,
+  parseGlabHosts,
+  parseLoggedInHosts,
   postWebhook,
-  previousActiveDay,
+  previousActiveDays,
+  repoFromUrl,
   resolveHost,
   resolveToken,
-  toMarkdown
+  toMarkdown,
+  unreachable
 };