@shiinasaku/github-card 4.2.0 → 5.0.0

package/src/utils/format.ts

@@ -16,7 +16,7 @@ export function kFormat(num: number): string {
  */
 export function measureText(text: string, size: number, weight = 400): number {
   if (!text) return 0;
-  const factor = size / 16;
+  const factor = size;
   const weightFactor = weight >= 700 ? 1.08 : weight >= 600 ? 1.04 : 1;
   let width = 0;
   for (const ch of text) {
@@ -45,6 +45,7 @@ export function measureText(text: string, size: number, weight = 400): number {
 
 export function escapeXml(str: string): string {
   return str
+    .replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\ufffe\uffff\ud800-\udfff]/gu, "")
     .replace(/&/g, "&")
     .replace(/</g, "&lt;")
     .replace(/>/g, "&gt;")
@@ -53,28 +54,29 @@ export function escapeXml(str: string): string {
 }
 
 export function wrapText(input: string, maxLen: number, maxLines: number): string[] {
-  const words = input.split(/\s+/).filter(Boolean);
+  if (maxLen < 1 || maxLines < 1) return [];
+  let remaining = Array.from(input.trim().replace(/\s+/g, " "));
   const lines: string[] = [];
-  let current = "";
 
-  for (const word of words) {
-    const next = current ? `${current} ${word}` : word;
-    if (next.length <= maxLen) {
-      current = next;
-      continue;
+  while (remaining.length && lines.length < maxLines) {
+    if (remaining.length <= maxLen) {
+      lines.push(remaining.join(""));
+      break;
     }
-    if (current) lines.push(current);
-    if (lines.length === maxLines) break;
-    current = word.length > maxLen ? word.slice(0, maxLen) : word;
-  }
-  if (current && lines.length < maxLines) lines.push(current);
-
-  // Truncated? Mark the last line with an ellipsis.
-  const consumed = lines.join(" ").length;
-  if (lines.length > 0 && consumed < input.trim().length) {
-    const last = lines[lines.length - 1]!;
-    lines[lines.length - 1] =
-      (last.length >= maxLen ? last.slice(0, Math.max(0, maxLen - 1)) : last) + "…";
+    if (lines.length === maxLines - 1) {
+      lines.push(
+        remaining
+          .slice(0, maxLen - 1)
+          .join("")
+          .trimEnd() + "…",
+      );
+      break;
+    }
+    const space = remaining.lastIndexOf(" ", maxLen);
+    const end = space > 0 ? space : maxLen;
+    lines.push(remaining.slice(0, end).join(""));
+    remaining = remaining.slice(end);
+    if (remaining[0] === " ") remaining.shift();
   }
   return lines;
 }

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,94 +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 = unknown>(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: unknown) {
-      const message = error instanceof Error ? error.message : String(error);
-      const name = error instanceof Error ? error.name : "";
-      if (name === "AbortError" || error instanceof TimeoutError) {
-        throw new TimeoutError(message || "Request timed out");
-      }
-      throw new GitHubError(`Network 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 {
-      data?: T;
-      errors?: { message: string }[];
-    };
 
-    if (body.errors && body.errors.length > 0) {
-      const firstError = body.errors[0];
-      const message = firstError?.message ?? "GraphQL error";
-      this.classifyError(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,3 +1,5 @@
+import { escapeXml } from "./format";
+
 export const icons = {
   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"/>`,
@@ -26,7 +28,9 @@ export function icon(name: IconName, color: string, size = 16): string {
   if (!path) return "";
   const meta = iconMeta[name];
   const viewBox = meta?.viewBox ?? "0 0 16 16";
-  const colorStr = color.startsWith("#") ? color : `#${color}`;
+  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"`

package/src/utils/index.ts

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