@shiinasaku/github-card 4.1.0 → 5.0.0

package/src/utils/github-client.ts

@@ -1,9 +1,5 @@
 export class GitHubError extends Error {
-  constructor(
-    message: string,
-    public httpStatus?: number,
-    public errorCode?: string,
-  ) {
+  constructor(message: string) {
     super(message);
     this.name = "GitHubError";
   }
@@ -11,93 +7,48 @@ export class GitHubError extends Error {
 
 export class NotFoundError extends GitHubError {
   constructor(message = "Resource not found") {
-    super(message, 404, "NOT_FOUND");
+    super(message);
     this.name = "NotFoundError";
   }
 }
 
 export class RateLimitError extends GitHubError {
-  constructor(
-    message = "GitHub API rate limit exceeded",
-    public resetAt?: Date,
-  ) {
-    super(message, 429, "RATE_LIMITED");
+  constructor(message = "GitHub API rate limit exceeded") {
+    super(message);
     this.name = "RateLimitError";
   }
 }
 
 export class AuthError extends GitHubError {
   constructor(message = "GitHub authentication failed") {
-    super(message, 401, "UNAUTHENTICATED");
+    super(message);
     this.name = "AuthError";
   }
 }
 
-export class TimeoutError extends GitHubError {
-  constructor(message = "GitHub API request timed out") {
-    super(message, 408, "TIMEOUT");
+class TimeoutError extends GitHubError {
+  constructor() {
+    super("GitHub API request timed out");
     this.name = "TimeoutError";
   }
 }
 
-export interface GitHubClientOptions {
-  token?: string;
-  userAgent?: string;
-  timeoutMs?: number;
-  baseUrl?: string;
-}
-
-export interface RequestOptions extends Omit<RequestInit, "body"> {
-  variables?: Record<string, unknown>;
-  timeoutMs?: number;
-}
-
-/**
- * A next-generation, generic GitHub GraphQL client.
- * Designed to be robust, strongly typed, and publishable.
- */
 export class GitHubClient {
-  private readonly token: string;
-  private readonly userAgent: string;
-  private readonly timeoutMs: number;
-  private readonly baseUrl: string;
-
-  constructor(options: GitHubClientOptions = {}) {
-    const token =
-      options.token || (typeof process !== "undefined" ? process.env?.GITHUB_TOKEN : "") || "";
-    if (!token) {
-      console.warn(
-        "GitHubClient initialized without a token. Requests requiring authentication will fail.",
-      );
-    }
+  constructor(private readonly options: { token: string; userAgent: string }) {}
 
-    this.token = token;
-    this.userAgent = options.userAgent || "nextgen-github-client/1.0";
-    this.timeoutMs = options.timeoutMs || 10000;
-    this.baseUrl = options.baseUrl || "https://api.github.com/graphql";
-  }
-
-  /**
-   * Classifies fetch or API errors into distinct custom error classes.
-   */
-  private classifyError(message: string, status: number, headers?: Headers): never {
+  private classifyError(message: string, status: number): never {
     const lower = message.toLowerCase();
-
     if (status === 404 || lower.includes("not resolve to a user") || lower.includes("not found")) {
       throw new NotFoundError(message);
     }
-
     if (
       status === 429 ||
       status === 403 ||
       lower.includes("rate limit") ||
       lower.includes("abuse")
     ) {
-      const resetHeader = headers?.get("x-ratelimit-reset");
-      const resetAt = resetHeader ? new Date(parseInt(resetHeader, 10) * 1000) : undefined;
-      throw new RateLimitError(message, resetAt);
+      throw new RateLimitError(message);
     }
-
     if (
       status === 401 ||
       lower.includes("bad credentials") ||
@@ -105,89 +56,48 @@ export class GitHubClient {
     ) {
       throw new AuthError(message);
     }
-
-    throw new GitHubError(message || `GitHub API error (${status})`, status);
+    throw new GitHubError(message || `GitHub API error (${status})`);
   }
 
-  /**
-   * Executes a GraphQL query against the GitHub API.
-   *
-   * @param query The GraphQL query string.
-   * @param options Request options including variables and fetch options.
-   * @returns Strongly typed response data.
-   */
-  public async request<T = any>(query: string, options: RequestOptions = {}): Promise<T> {
-    const { variables, timeoutMs = this.timeoutMs, signal: userSignal, ...fetchOptions } = options;
-
-    const headers = new Headers(fetchOptions.headers);
-    if (this.token && !headers.has("Authorization")) {
-      headers.set("Authorization", `bearer ${this.token}`);
-    }
-    if (!headers.has("Content-Type")) {
-      headers.set("Content-Type", "application/json");
-    }
-    if (!headers.has("User-Agent")) {
-      headers.set("User-Agent", this.userAgent);
-    }
-
-    const abortController = new AbortController();
-    const timeoutId =
-      timeoutMs > 0
-        ? setTimeout(() => abortController.abort(new TimeoutError()), timeoutMs)
-        : undefined;
-
-    // Link user-provided signal if present
-    const onAbort = userSignal ? () => abortController.abort(userSignal.reason) : undefined;
-    if (userSignal) {
-      userSignal.addEventListener("abort", onAbort!);
-      if (userSignal.aborted) abortController.abort(userSignal.reason);
-    }
-
-    let response: Response;
-
+  async request<T>(
+    query: string,
+    { variables, timeoutMs }: { variables: Record<string, unknown>; timeoutMs: number },
+  ): Promise<T> {
     try {
-      response = await fetch(this.baseUrl, {
-        ...fetchOptions,
+      const response = await fetch("https://api.github.com/graphql", {
         method: "POST",
-        headers,
+        headers: {
+          Authorization: `bearer ${this.options.token}`,
+          "Content-Type": "application/json",
+          "User-Agent": this.options.userAgent,
+        },
         body: JSON.stringify({ query, variables }),
-        signal: abortController.signal,
+        signal: AbortSignal.timeout(timeoutMs),
       });
-    } catch (error: any) {
-      if (error.name === "AbortError" || error instanceof TimeoutError) {
-        throw new TimeoutError(error.message || "Request timed out");
-      }
-      throw new GitHubError(`Network error: ${error.message || "Unknown error"}`);
-    } finally {
-      if (timeoutId) clearTimeout(timeoutId);
-      if (userSignal) {
-        userSignal.removeEventListener("abort", onAbort!);
+      if (!response.ok) {
+        const message = await response.text();
+        this.classifyError(message || response.statusText, response.status);
       }
-    }
-
-    if (!response.ok) {
-      const errorText = await response.text().catch(() => "");
-      this.classifyError(errorText || response.statusText, response.status, response.headers);
-    }
-
-    const body = (await response.json().catch(() => ({}))) as any;
 
-    if (body.errors && body.errors.length > 0) {
-      // Throw the first error specifically, but could be enhanced to aggregate
-      const firstError = body.errors[0];
-      this.classifyError(firstError.message, response.status, response.headers);
-    }
-
-    if (!body.data) {
+      const body = (await response.json()) as { data?: T; errors?: { message: string }[] };
+      if (body.errors?.length) {
+        this.classifyError(body.errors[0]?.message || "GraphQL error", response.status);
+      }
+      if (body.data == null) {
+        throw new GitHubError("Invalid response: No data returned from GraphQL endpoint");
+      }
+      return body.data;
+    } catch (error) {
+      if (error instanceof GitHubError) throw error;
+      if (
+        error instanceof Error &&
+        (error.name === "AbortError" || error.name === "TimeoutError")
+      ) {
+        throw new TimeoutError();
+      }
       throw new GitHubError(
-        "Invalid response: No data returned from GraphQL endpoint",
-        response.status,
+        `Network error: ${error instanceof Error ? error.message : String(error)}`,
       );
     }
-
-    return body.data as T;
   }
 }
-
-// Export a default singleton instance for convenience
-export const githubClient = new GitHubClient();

package/src/utils/icons.ts

@@ -1,18 +1,39 @@
+import { escapeXml } from "./format";
+
 export const icons = {
-  star: `<path fill-rule="evenodd" d="M8 .25a.75.75 0 01.673.418l1.882 3.815 4.21.612a.75.75 0 01.416 1.279l-3.046 2.97.719 4.192a.75.75 0 01-1.088.791L8 12.347l-3.766 1.98a.75.75 0 01-1.088-.79l.72-4.194L.818 6.374a.75.75 0 01.416-1.28l4.21-.611L7.327.668A.75.75 0 018 .25zm0 2.445L6.615 5.5a.75.75 0 01-.564.41l-3.097.45 2.24 2.184a.75.75 0 01.216.664l-.528 3.084 2.769-1.456a.75.75 0 01.698 0l2.77 1.456-.53-3.084a.75.75 0 01.216-.664l2.24-2.183-3.096-.45a.75.75 0 01-.564-.41L8 2.694v.001z"/>`,
+  star: `<path d="M10.92 2.868a1.25 1.25 0 0 1 2.16 0l2.795 4.798l5.428 1.176a1.25 1.25 0 0 1 .667 2.054l-3.7 4.141l.56 5.525a1.25 1.25 0 0 1-1.748 1.27L12 19.592l-5.082 2.24a1.25 1.25 0 0 1-1.748-1.27l.56-5.525l-3.7-4.14a1.25 1.25 0 0 1 .667-2.055l5.428-1.176z"/>`,
   commit: `<path fill-rule="evenodd" d="M10.5 7.75a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0zm1.43.75a4.002 4.002 0 01-7.86 0H.75a.75.75 0 110-1.5h3.32a4.001 4.001 0 017.86 0h3.32a.75.75 0 110 1.5h-3.32z"/>`,
-  pr: `<path fill-rule="evenodd" d="M7.177 3.073L9.573.677A.25.25 0 0110 .854v4.792a.25.25 0 01-.427.177L7.177 3.427a.25.25 0 010-.354zM3.75 2.5a.75.75 0 100 1.5.75.75 0 000-1.5zm-2.25.75a2.25 2.25 0 113 2.122v5.256a2.251 2.251 0 11-1.5 0V5.372A2.25 2.25 0 011.5 3.25zM11 2.5h-1V4h1a1 1 0 011 1v5.628a2.251 2.251 0 101.5 0V5A2.5 2.5 0 0011 2.5zm1 10.25a.75.75 0 111.5 0 .75.75 0 01-1.5 0zM3.75 12a.75.75 0 100 1.5.75.75 0 000-1.5z"/>`,
-  issue: `<path fill-rule="evenodd" d="M8 1.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM0 8a8 8 0 1116 0A8 8 0 010 8zm9 3a1 1 0 11-2 0 1 1 0 012 0zm-.25-6.25a.75.75 0 00-1.5 0v3.5a.75.75 0 001.5 0v-3.5z"/>`,
-  repo: `<path fill-rule="evenodd" d="M5 3.25a.75.75 0 11-1.5 0 .75.75 0 011.5 0zm0 2.122a2.25 2.25 0 10-1.5 0v.878A2.25 2.25 0 005.75 8.5h1.5v2.128a2.251 2.251 0 101.5 0V8.5h1.5a2.25 2.25 0 002.25-2.25v-.878a2.25 2.25 0 10-1.5 0v.878a.75.75 0 01-.75.75h-4.5A.75.75 0 015 6.25v-.878zm3.75 7.378a.75.75 0 11-1.5 0 .75.75 0 011.5 0zm3-8.75a.75.75 0 100-1.5.75.75 0 000 1.5z"></path>`,
+  pr: `<path d="M4 18a2 2 0 1 0 4 0a2 2 0 1 0-4 0M4 6a2 2 0 1 0 4 0a2 2 0 1 0-4 0m12 12a2 2 0 1 0 4 0a2 2 0 1 0-4 0M6 8v8"/><path d="M11 6h5a2 2 0 0 1 2 2v8"/><path d="m14 9l-3-3l3-3"/>`,
+  issue: `<path d="M15.314 2a2 2 0 0 1 1.414.586l4.686 4.686A2 2 0 0 1 22 8.686v6.628a2 2 0 0 1-.586 1.414l-4.686 4.686a2 2 0 0 1-1.414.586H8.686a2 2 0 0 1-1.414-.586l-4.686-4.686A2 2 0 0 1 2 15.314V8.686a2 2 0 0 1 .586-1.414l4.686-4.686A2 2 0 0 1 8.686 2zm0 2H8.686L4 8.686v6.628L8.686 20h6.628L20 15.314V8.686zM12 15a1 1 0 1 1 0 2a1 1 0 0 1 0-2m0-9a1 1 0 0 1 1 1v6a1 1 0 1 1-2 0V7a1 1 0 0 1 1-1"/>`,
+  repo: `<path d="M6 19.623c-.69-.195-1.232-.491-1.682-.941C3 17.364 3 15.242 3 11s0-6.364 1.318-7.682S7.758 2 12 2s6.364 0 7.682 1.318S21 6.758 21 11s0 6.364-1.318 7.682c-.45.45-.993.746-1.682.941"/><path d="M12 20.193c-.414 0-.748.32-1.414.958c-.647.619-.97.929-1.242.831a.5.5 0 0 1-.096-.046C9 21.779 9 21.31 9 20.376v-3.125c0-1.532 0-2.299.44-2.775C9.878 14 10.585 14 12 14s2.121 0 2.56.476s.44 1.243.44 2.775v3.125c0 .935 0 1.403-.248 1.56a.5.5 0 0 1-.096.046c-.272.098-.595-.212-1.242-.831c-.666-.639-1-.958-1.414-.958M8 10h8M8 6h4"/>`,
   x: `<path d="M4 4l11.733 16h4.267l-11.733 -16l-4.267 0" /><path d="M4 20l6.768 -6.768m2.46 -2.46l6.772 -6.772" />`,
 };
 
-export function icon(name: keyof typeof icons, color: string, size = 16): string {
+type IconName = keyof typeof icons;
+
+const iconMeta: Record<
+  IconName,
+  { viewBox: string; kind: "fill" | "stroke"; strokeWidth?: string }
+> = {
+  star: { viewBox: "0 0 24 24", kind: "fill" },
+  commit: { viewBox: "0 0 16 16", kind: "fill" },
+  pr: { viewBox: "0 0 24 24", kind: "stroke", strokeWidth: "2" },
+  issue: { viewBox: "0 0 24 24", kind: "fill" },
+  repo: { viewBox: "0 0 24 24", kind: "stroke", strokeWidth: "1.5" },
+  x: { viewBox: "0 0 24 24", kind: "stroke", strokeWidth: "2" },
+};
+
+export function icon(name: IconName, color: string, size = 16): string {
   const path = icons[name];
   if (!path) return "";
-  const viewBox = name === "x" ? "0 0 24 24" : "0 0 16 16";
-  const colorStr = color.startsWith("#") ? color : `#${color}`;
-  const fill =
-    name === "x" ? `stroke="${colorStr}" stroke-width="2" fill="none"` : `fill="${colorStr}"`;
-  return `<svg width="${size}" height="${size}" viewBox="${viewBox}" ${fill} role="img">${path}</svg>`;
+  const meta = iconMeta[name];
+  const viewBox = meta?.viewBox ?? "0 0 16 16";
+  const colorStr = escapeXml(
+    /^(?:[\da-f]{3}|[\da-f]{4}|[\da-f]{6}|[\da-f]{8})$/i.test(color) ? `#${color}` : color,
+  );
+  const attrs =
+    meta?.kind === "stroke"
+      ? `fill="none" stroke="${colorStr}" stroke-width="${meta.strokeWidth ?? "1.8"}" stroke-linecap="round" stroke-linejoin="round"`
+      : `fill="${colorStr}"`;
+  return `<svg width="${size}" height="${size}" viewBox="${viewBox}" ${attrs} role="img">${path}</svg>`;
 }

package/src/utils/index.ts

@@ -1,6 +1,5 @@
-export { resolveColors, themes, type Theme } from "./themes";
-export { kFormat, escapeXml, wrapText } from "./format";
-export { getLangColor } from "./languages";
-export { icons, icon } from "./icons";
-export { FONT_FACE, FONT_FAMILY } from "./font";
-export * from "./colors";
+export { resolveColors, themes } from "./themes";
+export { kFormat, escapeXml, wrapText, measureText } from "./format";
+export { icon } from "./icons";
+export { FONT_FAMILY } from "./font";
+export { resolveTw } from "./colors";

package/src/utils/languages.ts

@@ -1,4 +1,4 @@
-export const langColors: Record<string, string> = {
+const langColors: Record<string, string> = {
   "1C Enterprise": "#814CCC",
   "2-Dimensional Array": "#38761D",
   "4D": "#004289",

package/src/env.d.ts

@@ -1,4 +0,0 @@
-declare module "*.css" {
-  const content: string;
-  export default content;
-}

package/src/input.css

@@ -1 +0,0 @@
-@import "tailwindcss";