ink-sdl 0.3.2 → 0.4.0

package/dist/{chunk-BOQYTA3S.js → chunk-YE6CUIKT.js}

@@ -4,9 +4,18 @@ import { pickBy, isDefined } from "remeda";
 
 // src/Sdl2/index.ts
 import koffi from "koffi";
-import { platform } from "os";
+
+// src/utils/findLibrary/index.ts
 import { existsSync } from "fs";
+import { platform } from "os";
 import { find, last } from "remeda";
+var isSystemPath = (p) => !p.includes("/") && !p.includes("\\");
+var findLibrary = (pathMap) => {
+  const plat = platform();
+  const paths = pathMap[plat] ?? [];
+  const foundPath = find(paths, (p) => isSystemPath(p) || existsSync(p));
+  return foundPath ?? last(paths) ?? null;
+};
 
 // src/Sdl2/consts.ts
 var SDL_INIT_VIDEO = 32;
@@ -94,13 +103,6 @@ var SDL_LIB_PATHS = {
   ],
   win32: ["SDL2.dll", "C:\\Windows\\System32\\SDL2.dll"]
 };
-var isSystemPath = (p) => !p.includes("/") && !p.includes("\\");
-var findLibrary = (pathMap) => {
-  const plat = platform();
-  const paths = pathMap[plat] ?? [];
-  const foundPath = find(paths, (p) => isSystemPath(p) || existsSync(p));
-  return foundPath ?? last(paths) ?? null;
-};
 var findSDLLibrary = () => {
   return findLibrary(SDL_LIB_PATHS);
 };
@@ -962,15 +964,12 @@ var AnsiParser = class {
 // src/TextRenderer/index.ts
 import { resolve, dirname, join } from "path";
 import { fileURLToPath } from "url";
-import { existsSync as existsSync3 } from "fs";
-import { platform as platform3, homedir } from "os";
-import { sortBy, take } from "remeda";
+import { existsSync as existsSync2 } from "fs";
+import { platform as platform2, homedir } from "os";
+import { flatMap, sortBy, take } from "remeda";
 
 // src/SdlTtf/index.ts
 import koffi2 from "koffi";
-import { platform as platform2 } from "os";
-import { existsSync as existsSync2 } from "fs";
-import { find as find2, last as last2 } from "remeda";
 var SDL_TTF_LIB_PATHS = {
   darwin: [
     "/opt/homebrew/lib/libSDL2_ttf.dylib",
@@ -996,15 +995,8 @@ var SDL_TTF_LIB_PATHS = {
   ],
   win32: ["SDL2_ttf.dll", "C:\\Windows\\System32\\SDL2_ttf.dll"]
 };
-var isSystemPath2 = (p) => !p.includes("/") && !p.includes("\\");
-var findLibrary2 = (pathMap) => {
-  const plat = platform2();
-  const paths = pathMap[plat] ?? [];
-  const foundPath = find2(paths, (p) => isSystemPath2(p) || existsSync2(p));
-  return foundPath ?? last2(paths) ?? null;
-};
 var findSDLTtfLibrary = () => {
-  return findLibrary2(SDL_TTF_LIB_PATHS);
+  return findLibrary(SDL_TTF_LIB_PATHS);
 };
 var SdlTtf = class {
   lib;
@@ -1214,6 +1206,21 @@ var EMOJI_FONTS = {
 var EMOJI_FONT_SCALE = 0.75;
 
 // src/TextRenderer/index.ts
+var findFirstExisting = (paths) => {
+  for (const p of paths) {
+    try {
+      if (existsSync2(p)) {
+        return p;
+      }
+    } catch {
+    }
+  }
+  return null;
+};
+var getPlatformPaths = (pathMap) => {
+  const plat = platform2();
+  return [...pathMap[plat] ?? []];
+};
 var TextRenderer = class {
   sdl = getSdl2();
   ttf = getSdlTtf();
@@ -1252,7 +1259,7 @@ var TextRenderer = class {
    */
   getSystemFontDirectories() {
     const home = homedir();
-    const plat = platform3();
+    const plat = platform2();
     if (plat === "darwin") {
       return [
         join(home, "Library/Fonts"),
@@ -1291,16 +1298,13 @@ var TextRenderer = class {
   findFontByName(fontName) {
     const extensions = [".ttf", ".ttc", ".otf", ".TTC", ".TTF", ".OTF"];
     const directories = this.getSystemFontDirectories();
-    for (const dir of directories) {
-      for (const ext of extensions) {
-        const fontPath = join(dir, `${fontName}${ext}`);
-        try {
-          if (existsSync3(fontPath)) {
-            return fontPath;
-          }
-        } catch {
-        }
-      }
+    const paths = flatMap(
+      directories,
+      (dir) => extensions.map((ext) => join(dir, `${fontName}${ext}`))
+    );
+    const fontPath = findFirstExisting(paths);
+    if (fontPath) {
+      return fontPath;
     }
     throw new Error(
       `Font "${fontName}" not found in system font directories.
@@ -1313,13 +1317,9 @@ Tried extensions: ${extensions.join(", ")}`
    * Get the path to the Cozette font (system or bundled)
    */
   getDefaultFontPath() {
-    for (const p of this.getSystemFontPaths()) {
-      try {
-        if (existsSync3(p)) {
-          return p;
-        }
-      } catch {
-      }
+    const systemPath = findFirstExisting(this.getSystemFontPaths());
+    if (systemPath) {
+      return systemPath;
     }
     const currentFilename = fileURLToPath(import.meta.url);
     const currentDirname = dirname(currentFilename);
@@ -1331,96 +1331,38 @@ Tried extensions: ${extensions.join(", ")}`
       resolve(currentDirname, "../fonts", DEFAULT_FONT_FILENAME)
       // Alternate
     ];
-    for (const p of bundledPaths) {
-      try {
-        if (existsSync3(p)) {
-          return p;
-        }
-      } catch {
-      }
-    }
-    return bundledPaths[0];
+    return findFirstExisting(bundledPaths) ?? bundledPaths[0];
   }
   /**
    * Get fallback fonts for the current platform
    */
   getFallbackFontPaths() {
-    const plat = platform3();
-    if (plat === "darwin") {
-      return [...FALLBACK_FONTS.darwin];
-    }
-    if (plat === "linux") {
-      return [...FALLBACK_FONTS.linux];
-    }
-    if (plat === "win32") {
-      return [...FALLBACK_FONTS.win32];
-    }
-    return [];
+    return getPlatformPaths(FALLBACK_FONTS);
   }
   /**
    * Find an available font, trying default first then fallbacks
    */
   findAvailableFont() {
     const defaultPath = this.getDefaultFontPath();
-    try {
-      if (existsSync3(defaultPath)) {
-        return defaultPath;
-      }
-    } catch {
-    }
-    for (const fallbackPath of this.getFallbackFontPaths()) {
-      try {
-        if (existsSync3(fallbackPath)) {
-          return fallbackPath;
-        }
-      } catch {
-      }
-    }
-    return defaultPath;
+    return findFirstExisting([defaultPath, ...this.getFallbackFontPaths()]) ?? defaultPath;
   }
   /**
    * Find a system font, skipping the default bundled font
    */
   findSystemFont() {
-    for (const fallbackPath of this.getFallbackFontPaths()) {
-      try {
-        if (existsSync3(fallbackPath)) {
-          return fallbackPath;
-        }
-      } catch {
-      }
-    }
-    return this.getDefaultFontPath();
+    return findFirstExisting(this.getFallbackFontPaths()) ?? this.getDefaultFontPath();
   }
   /**
    * Get emoji font paths for the current platform
    */
   getEmojiFontPaths() {
-    const plat = platform3();
-    if (plat === "darwin") {
-      return [...EMOJI_FONTS.darwin];
-    }
-    if (plat === "linux") {
-      return [...EMOJI_FONTS.linux];
-    }
-    if (plat === "win32") {
-      return [...EMOJI_FONTS.win32];
-    }
-    return [];
+    return getPlatformPaths(EMOJI_FONTS);
   }
   /**
    * Find an available emoji font
    */
   findEmojiFont() {
-    for (const fontPath of this.getEmojiFontPaths()) {
-      try {
-        if (existsSync3(fontPath)) {
-          return fontPath;
-        }
-      } catch {
-      }
-    }
-    return null;
+    return findFirstExisting(this.getEmojiFontPaths());
   }
   /**
    * Load the fallback emoji font if available
@@ -1912,6 +1854,11 @@ var TEXT_DECORATION_THICKNESS = 0.08;
 var DEFAULT_BG2 = { r: 0, g: 0, b: 0 };
 var DEFAULT_FG2 = { r: 255, g: 255, b: 255 };
 var MIN_BRIGHTNESS = 100;
+var adjustBrightness = (color, multiplier, clamp = true) => ({
+  r: clamp ? Math.min(COLOR_CHANNEL_MAX, Math.floor(color.r * multiplier)) : Math.floor(color.r * multiplier),
+  g: clamp ? Math.min(COLOR_CHANNEL_MAX, Math.floor(color.g * multiplier)) : Math.floor(color.g * multiplier),
+  b: clamp ? Math.min(COLOR_CHANNEL_MAX, Math.floor(color.b * multiplier)) : Math.floor(color.b * multiplier)
+});
 var HEX_COLOR_LENGTH = 6;
 var HEX_R_END = 2;
 var HEX_G_END = 4;
@@ -2026,13 +1973,7 @@ var SdlUiRenderer = class {
     this.charHeight = charDims.height;
     this.updateTerminalDimensions();
     this.createRenderTarget();
-    this.sdl.setRenderDrawColor(
-      this.renderer,
-      this.defaultBgColor.r,
-      this.defaultBgColor.g,
-      this.defaultBgColor.b,
-      COLOR_CHANNEL_MAX
-    );
+    this.setDrawColor(this.defaultBgColor);
     this.sdl.setRenderTarget(this.renderer, this.renderTarget);
     this.sdl.renderClear(this.renderer);
     this.sdl.setRenderTarget(this.renderer, null);
@@ -2130,13 +2071,7 @@ var SdlUiRenderer = class {
         this.renderText(cmd);
         break;
       case "clear_screen":
-        this.sdl.setRenderDrawColor(
-          this.renderer,
-          this.defaultBgColor.r,
-          this.defaultBgColor.g,
-          this.defaultBgColor.b,
-          COLOR_CHANNEL_MAX
-        );
+        this.setDrawColor(this.defaultBgColor);
         this.sdl.renderClear(this.renderer);
         this.ansiParser.reset();
         break;
@@ -2200,50 +2135,22 @@ var SdlUiRenderer = class {
     let fg = this.reverse ? this.bgColor : this.fgColor;
     const bg = this.reverse ? this.fgColor : this.bgColor;
     if (this.bold) {
-      fg = {
-        r: Math.min(
-          COLOR_CHANNEL_MAX,
-          Math.floor(fg.r * BOLD_BRIGHTNESS_MULTIPLIER)
-        ),
-        g: Math.min(
-          COLOR_CHANNEL_MAX,
-          Math.floor(fg.g * BOLD_BRIGHTNESS_MULTIPLIER)
-        ),
-        b: Math.min(
-          COLOR_CHANNEL_MAX,
-          Math.floor(fg.b * BOLD_BRIGHTNESS_MULTIPLIER)
-        )
-      };
+      fg = adjustBrightness(fg, BOLD_BRIGHTNESS_MULTIPLIER);
     }
     if (this.dim) {
-      fg = {
-        r: Math.floor(fg.r * DIM_BRIGHTNESS_MULTIPLIER),
-        g: Math.floor(fg.g * DIM_BRIGHTNESS_MULTIPLIER),
-        b: Math.floor(fg.b * DIM_BRIGHTNESS_MULTIPLIER)
-      };
+      fg = adjustBrightness(fg, DIM_BRIGHTNESS_MULTIPLIER, false);
     }
     const brightness = Math.max(fg.r, fg.g, fg.b);
     if (brightness < MIN_BRIGHTNESS) {
       if (brightness === 0) {
         fg = { r: MIN_BRIGHTNESS, g: MIN_BRIGHTNESS, b: MIN_BRIGHTNESS };
       } else {
-        const scale = MIN_BRIGHTNESS / brightness;
-        fg = {
-          r: Math.min(COLOR_CHANNEL_MAX, Math.floor(fg.r * scale)),
-          g: Math.min(COLOR_CHANNEL_MAX, Math.floor(fg.g * scale)),
-          b: Math.min(COLOR_CHANNEL_MAX, Math.floor(fg.b * scale))
-        };
+        fg = adjustBrightness(fg, MIN_BRIGHTNESS / brightness);
       }
     }
     const textWidth = text.length * this.charWidth;
     const bgRect = createSDLRect(x, y, textWidth, this.charHeight);
-    this.sdl.setRenderDrawColor(
-      this.renderer,
-      bg.r,
-      bg.g,
-      bg.b,
-      COLOR_CHANNEL_MAX
-    );
+    this.setDrawColor(bg);
     this.sdl.renderFillRect(this.renderer, bgRect);
     this.textRenderer.renderText(text, x, y, fg, this.italic);
     if (this.underline || this.strikethrough) {
@@ -2251,13 +2158,7 @@ var SdlUiRenderer = class {
         1,
         Math.round(this.charHeight * TEXT_DECORATION_THICKNESS)
       );
-      this.sdl.setRenderDrawColor(
-        this.renderer,
-        fg.r,
-        fg.g,
-        fg.b,
-        COLOR_CHANNEL_MAX
-      );
+      this.setDrawColor(fg);
       if (this.underline) {
         const underlineY = y + Math.round(this.charHeight * UNDERLINE_POSITION);
         const underlineRect = createSDLRect(
@@ -2283,16 +2184,22 @@ var SdlUiRenderer = class {
       return;
     }
     this.sdl.setRenderTarget(this.renderer, this.renderTarget);
+    this.setDrawColor(this.defaultBgColor);
+    this.sdl.renderClear(this.renderer);
+    this.sdl.setRenderTarget(this.renderer, null);
+    this.ansiParser.reset();
+  }
+  /**
+   * Set the SDL render draw color
+   */
+  setDrawColor(color) {
     this.sdl.setRenderDrawColor(
       this.renderer,
-      this.defaultBgColor.r,
-      this.defaultBgColor.g,
-      this.defaultBgColor.b,
+      color.r,
+      color.g,
+      color.b,
       COLOR_CHANNEL_MAX
     );
-    this.sdl.renderClear(this.renderer);
-    this.sdl.setRenderTarget(this.renderer, null);
-    this.ansiParser.reset();
   }
   /**
    * Clear a line from a specific position
@@ -2306,13 +2213,7 @@ var SdlUiRenderer = class {
     const drawable = this.sdl.getDrawableSize(this.window);
     const clearWidth = drawable.width - x;
     const rect = createSDLRect(x, y, clearWidth, this.charHeight);
-    this.sdl.setRenderDrawColor(
-      this.renderer,
-      this.bgColor.r,
-      this.bgColor.g,
-      this.bgColor.b,
-      COLOR_CHANNEL_MAX
-    );
+    this.setDrawColor(this.bgColor);
     this.sdl.renderFillRect(this.renderer, rect);
   }
   /**

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   createSdlStreams
-} from "./chunk-BOQYTA3S.js";
+} from "./chunk-YE6CUIKT.js";
 
 // src/cli.tsx
 import { parseArgs } from "util";

package/dist/index.d.ts

@@ -334,6 +334,10 @@ declare class SdlUiRenderer {
      * Clear the entire screen
      */
     clear(): void;
+    /**
+     * Set the SDL render draw color
+     */
+    private setDrawColor;
     /**
      * Clear a line from a specific position
      */

package/dist/index.js

@@ -15,7 +15,7 @@ import {
   isSdl2Available,
   isSdlAvailable,
   isSdlTtfAvailable
-} from "./chunk-BOQYTA3S.js";
+} from "./chunk-YE6CUIKT.js";
 export {
   AnsiParser,
   InputBridge,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ink-sdl",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "Render Ink terminal apps in native SDL windows",
   "type": "module",
   "main": "dist/index.js",