restty 0.1.20 → 0.1.21

package/README.md

@@ -5,6 +5,7 @@
 [![CI](https://img.shields.io/github/actions/workflow/status/wiedymi/restty/ci.yml?branch=main&style=flat-square)](https://github.com/wiedymi/restty/actions/workflows/ci.yml)
 [![Publish](https://img.shields.io/github/actions/workflow/status/wiedymi/restty/publish.yml?style=flat-square&label=publish)](https://github.com/wiedymi/restty/actions/workflows/publish.yml)
 [![Demo](https://img.shields.io/badge/demo-restty.pages.dev-0ea5e9?style=flat-square)](https://restty.pages.dev/)
+
 [![GitHub](https://img.shields.io/badge/-GitHub-181717?style=flat-square&logo=github&logoColor=white)](https://github.com/wiedymi)
 [![Twitter](https://img.shields.io/badge/-Twitter-1DA1F2?style=flat-square&logo=twitter&logoColor=white)](https://x.com/wiedymi)
 [![Email](https://img.shields.io/badge/-Email-EA4335?style=flat-square&logo=gmail&logoColor=white)](mailto:contact@wiedymi.com)

package/dist/{chunk-ef12eja6.js → chunk-ym658zhj.js}

@@ -9095,6 +9095,37 @@ function isLikelyEmojiCodepoint(cp) {
     return true;
   return false;
 }
+function isVariationSelectorCodepoint(cp) {
+  if (cp >= 65024 && cp <= 65039)
+    return true;
+  if (cp >= 917760 && cp <= 917999)
+    return true;
+  return false;
+}
+function isCombiningMarkCodepoint(cp) {
+  if (cp >= 768 && cp <= 879)
+    return true;
+  if (cp >= 6832 && cp <= 6911)
+    return true;
+  if (cp >= 7616 && cp <= 7679)
+    return true;
+  if (cp >= 8400 && cp <= 8447)
+    return true;
+  if (cp >= 65056 && cp <= 65071)
+    return true;
+  return false;
+}
+function isCoverageIgnorableCodepoint(cp) {
+  if (cp === 8204 || cp === 8205)
+    return true;
+  if (isVariationSelectorCodepoint(cp))
+    return true;
+  if (isCombiningMarkCodepoint(cp))
+    return true;
+  if (cp >= 917536 && cp <= 917631)
+    return true;
+  return false;
+}
 function resolvePresentationPreference(text, chars) {
   if (text.includes("️"))
     return "emoji";
@@ -9109,7 +9140,7 @@ function resolvePresentationPreference(text, chars) {
   }
   return "auto";
 }
-function pickFontIndexForText(state, text, expectedSpan, shapeClusterWithFont) {
+function pickFontIndexForText(state, text, expectedSpan) {
   if (!state.fonts.length)
     return 0;
   const cacheKey = `${expectedSpan}:${text}`;
@@ -9117,6 +9148,10 @@ function pickFontIndexForText(state, text, expectedSpan, shapeClusterWithFont) {
   if (cached !== undefined)
     return cached;
   const chars = Array.from(text);
+  const requiredChars = chars.filter((ch) => {
+    const cp = ch.codePointAt(0) ?? 0;
+    return !isCoverageIgnorableCodepoint(cp);
+  });
   const firstCp = text.codePointAt(0) ?? 0;
   const nerdSymbol = isNerdSymbolCodepoint(firstCp);
   const presentation = resolvePresentationPreference(text, chars);
@@ -9128,7 +9163,7 @@ function pickFontIndexForText(state, text, expectedSpan, shapeClusterWithFont) {
       if (predicate && !predicate(entry))
         continue;
       let ok = true;
-      for (const ch of chars) {
+      for (const ch of requiredChars) {
         if (!fontHasGlyph(entry.font, ch)) {
           ok = false;
           break;
@@ -53715,6 +53750,51 @@ function createResttyApp(options) {
       return true;
     return false;
   }
+  function isVariationSelectorCodepoint2(cp) {
+    if (cp >= 65024 && cp <= 65039)
+      return true;
+    if (cp >= 917760 && cp <= 917999)
+      return true;
+    return false;
+  }
+  function isCombiningMarkCodepoint2(cp) {
+    if (cp >= 768 && cp <= 879)
+      return true;
+    if (cp >= 6832 && cp <= 6911)
+      return true;
+    if (cp >= 7616 && cp <= 7679)
+      return true;
+    if (cp >= 8400 && cp <= 8447)
+      return true;
+    if (cp >= 65056 && cp <= 65071)
+      return true;
+    return false;
+  }
+  function isEmojiModifierCodepoint(cp) {
+    return cp >= 127995 && cp <= 127999;
+  }
+  function isCoverageIgnorableCodepoint2(cp) {
+    if (cp === 8204 || cp === 8205)
+      return true;
+    if (isVariationSelectorCodepoint2(cp))
+      return true;
+    if (isCombiningMarkCodepoint2(cp))
+      return true;
+    if (cp >= 917536 && cp <= 917631)
+      return true;
+    return false;
+  }
+  function shouldMergeTrailingClusterCodepoint(cp) {
+    if (cp === 8204 || cp === 8205)
+      return true;
+    if (isVariationSelectorCodepoint2(cp))
+      return true;
+    if (isCombiningMarkCodepoint2(cp))
+      return true;
+    if (isEmojiModifierCodepoint(cp))
+      return true;
+    return false;
+  }
   function resolvePresentationPreference2(text, chars) {
     if (text.includes("️"))
       return "emoji";
@@ -53737,6 +53817,10 @@ function createResttyApp(options) {
     if (cached !== undefined)
       return cached;
     const chars = Array.from(text);
+    const requiredChars = chars.filter((ch) => {
+      const cp = ch.codePointAt(0) ?? 0;
+      return !isCoverageIgnorableCodepoint2(cp);
+    });
     const firstCp = text.codePointAt(0) ?? 0;
     const nerdSymbol = isNerdSymbolCodepoint(firstCp);
     const presentation = resolvePresentationPreference2(text, chars);
@@ -53751,7 +53835,7 @@ function createResttyApp(options) {
       (entry) => hasItalicHint(entry) && !hasBoldHint(entry),
       (entry) => hasItalicHint(entry)
     ] : [];
-    const pickFirstMatch = (predicate) => {
+    const pickFirstMatch = (predicate, allowSequenceShapingFallback = false) => {
       for (let i3 = 0;i3 < fontState.fonts.length; i3 += 1) {
         const entry = fontState.fonts[i3];
         if (!entry?.font)
@@ -53759,18 +53843,22 @@ function createResttyApp(options) {
         if (predicate && !predicate(entry))
           continue;
         let ok = true;
-        for (const ch of chars) {
+        for (const ch of requiredChars) {
           if (!fontHasGlyph2(entry.font, ch)) {
             ok = false;
             break;
           }
         }
+        if (!ok && allowSequenceShapingFallback) {
+          const shaped = shapeClusterWithFont(entry, text);
+          ok = shaped.glyphs.some((glyph) => (glyph.glyphId ?? 0) !== 0);
+        }
         if (ok)
           return i3;
       }
       return -1;
     };
-    const pickWithStyle = (predicate) => {
+    const pickWithStyle = (predicate, allowSequenceShapingFallback = false) => {
       if (styleHintsEnabled) {
         for (let i3 = 0;i3 < stylePredicates.length; i3 += 1) {
           const stylePredicate = stylePredicates[i3];
@@ -53778,12 +53866,12 @@ function createResttyApp(options) {
             if (!stylePredicate(entry))
               return false;
             return predicate ? !!predicate(entry) : true;
-          });
+          }, allowSequenceShapingFallback);
           if (styledIndex >= 0)
             return styledIndex;
         }
       }
-      return pickFirstMatch(predicate);
+      return pickFirstMatch(predicate, allowSequenceShapingFallback);
     };
     const tryIndex = (index) => {
       if (index < 0)
@@ -53798,7 +53886,7 @@ function createResttyApp(options) {
         return result;
     }
     if (presentation === "emoji") {
-      const emojiIndex = pickFirstMatch((entry) => isColorEmojiFont(entry));
+      const emojiIndex = pickFirstMatch((entry) => isColorEmojiFont(entry), true);
       const result = tryIndex(emojiIndex);
       if (result !== null)
         return result;
@@ -54508,10 +54596,13 @@ function createResttyApp(options) {
         }
         let nextSeqIdx = idx + baseSpan;
         let guard = 0;
-        while ((text.codePointAt(text.length - 1) ?? 0) === 8205 && nextSeqIdx < rowEnd && guard < 8) {
+        while (nextSeqIdx < rowEnd && guard < 12) {
           const next = readCellCluster(nextSeqIdx);
           if (!next || !next.cp || isSpaceCp(next.cp))
             break;
+          const shouldMerge = text.endsWith("‍") || shouldMergeTrailingClusterCodepoint(next.cp);
+          if (!shouldMerge)
+            break;
           text += next.text;
           baseSpan += next.span;
           mergedEmojiSkip[nextSeqIdx] = 1;
@@ -55374,10 +55465,13 @@ function createResttyApp(options) {
         }
         let nextSeqIdx = idx + baseSpan;
         let guard = 0;
-        while ((text.codePointAt(text.length - 1) ?? 0) === 8205 && nextSeqIdx < rowEnd && guard < 8) {
+        while (nextSeqIdx < rowEnd && guard < 12) {
           const next = readCellCluster(nextSeqIdx);
           if (!next || !next.cp || isSpaceCp(next.cp))
             break;
+          const shouldMerge = text.endsWith("‍") || shouldMergeTrailingClusterCodepoint(next.cp);
+          if (!shouldMerge)
+            break;
           text += next.text;
           baseSpan += next.span;
           mergedEmojiSkip[nextSeqIdx] = 1;

package/dist/fonts/manager.d.ts

@@ -27,7 +27,7 @@ export declare function glyphWidthUnits(entry: FontEntry, glyphId: number | unde
  * Select the best font index from the manager's font list for rendering the
  * given text cluster, searching in fallback order similar to Ghostty.
  */
-export declare function pickFontIndexForText(state: FontManagerState, text: string, expectedSpan: number, shapeClusterWithFont: (entry: FontEntry, text: string) => ShapedCluster): number;
+export declare function pickFontIndexForText(state: FontManagerState, text: string, expectedSpan: number): number;
 /** Fetch a font file from a URL and return its ArrayBuffer, or null on failure. */
 export declare function tryFetchFontBuffer(url: string): Promise<ArrayBuffer | null>;
 /** Query locally installed fonts via the Local Font Access API and return the first match, or null. */

package/dist/internal.js

@@ -89,7 +89,7 @@ import {
   updateComposition,
   updateGridState,
   updateImePosition
-} from "./chunk-ef12eja6.js";
+} from "./chunk-ym658zhj.js";
 // src/selection/selection.ts
 function createSelectionState() {
   return {

package/dist/restty.js

@@ -7,7 +7,7 @@ import {
   isBuiltinThemeName,
   listBuiltinThemeNames,
   parseGhosttyTheme
-} from "./chunk-ef12eja6.js";
+} from "./chunk-ym658zhj.js";
 export {
   parseGhosttyTheme,
   listBuiltinThemeNames,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "restty",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "description": "Browser terminal rendering library powered by WASM, WebGPU/WebGL2, and TypeScript text shaping.",
   "keywords": [
     "terminal",