@bsky.app/tapper 0.1.1 → 0.2.2

package/build/util.js

@@ -1,12 +1,28 @@
-export function parseNodesFromText(text, config, prevNodes) {
-    const allMatches = [];
+const WHITESPACE = /\s/;
+/**
+ * Pre-compile facet regexes once at init time. This avoids re-creating
+ * RegExp objects on every keystroke in parseNodesFromText. Each Tapper
+ * instance gets its own compiled copy so lastIndex state can't leak
+ * between instances.
+ */
+export function compileFacetRegexes(config) {
+    const compiled = new Map();
     for (const [name, def] of Object.entries(config)) {
-        const re = new RegExp(def.match.source, def.match.flags);
+        compiled.set(name, new RegExp(def.match.source, def.match.flags));
+    }
+    return compiled;
+}
+export function parseNodesFromText(text, regexes, prevNodes, cursor, triggers) {
+    const allMatches = [];
+    for (const [name, re] of regexes) {
+        // Reset lastIndex so stateful (global) regexes don't carry over
+        // match positions from the previous parse call.
+        re.lastIndex = 0;
         for (const m of text.matchAll(re)) {
             allMatches.push({
                 facetName: name,
                 fullMatch: m[0],
-                capture: m[0],
+                capture: m[1] ?? m[0],
                 index: m.index,
             });
         }
@@ -21,52 +37,108 @@ export function parseNodesFromText(text, config, prevNodes) {
         }
     }
     const nodes = [];
-    let cursor = 0;
+    let pos = 0;
     for (const m of accepted) {
-        if (m.index > cursor) {
+        if (m.index > pos) {
+            const raw = text.slice(pos, m.index);
             nodes.push({
                 type: 'text',
-                value: text.slice(cursor, m.index),
-                start: cursor,
+                raw,
+                value: raw,
+                start: pos,
                 end: m.index,
             });
         }
         nodes.push({
-            type: m.facetName,
+            type: 'facet',
+            facetType: m.facetName,
+            raw: m.fullMatch,
             value: m.capture,
             start: m.index,
             end: m.index + m.fullMatch.length,
         });
-        cursor = m.index + m.fullMatch.length;
+        pos = m.index + m.fullMatch.length;
     }
-    if (cursor < text.length) {
+    if (pos < text.length) {
+        const raw = text.slice(pos);
         nodes.push({
             type: 'text',
-            value: text.slice(cursor),
-            start: cursor,
+            raw,
+            value: raw,
+            start: pos,
             end: text.length,
         });
     }
-    // Transfer committed flags from previous nodes by type + occurrence index
+    // If the cursor is right after a trigger char that the regex didn't match,
+    // splice a 'trigger' node out of the containing text node.
+    if (cursor != null && triggers) {
+        for (let i = cursor - 1; i >= 0; i--) {
+            const ch = text[i];
+            if (WHITESPACE.test(ch))
+                break;
+            const facetType = triggers.get(ch);
+            if (facetType) {
+                // Only create a trigger node if the trigger is inside a text node
+                // (i.e. the regex didn't already match it as a facet)
+                const textNodeIdx = nodes.findIndex(n => n.type === 'text' && n.start <= i && n.end > i);
+                if (textNodeIdx !== -1) {
+                    const node = nodes[textNodeIdx];
+                    const spliced = [];
+                    if (node.start < i) {
+                        const raw = text.slice(node.start, i);
+                        spliced.push({
+                            type: 'text',
+                            raw,
+                            value: raw,
+                            start: node.start,
+                            end: i,
+                        });
+                    }
+                    const triggerRaw = text.slice(i, cursor);
+                    spliced.push({
+                        type: 'trigger',
+                        facetType,
+                        raw: triggerRaw,
+                        value: text.slice(i + ch.length, cursor),
+                        start: i,
+                        end: cursor,
+                    });
+                    if (cursor < node.end) {
+                        const raw = text.slice(cursor, node.end);
+                        spliced.push({
+                            type: 'text',
+                            raw,
+                            value: raw,
+                            start: cursor,
+                            end: node.end,
+                        });
+                    }
+                    nodes.splice(textNodeIdx, 1, ...spliced);
+                }
+                break;
+            }
+        }
+    }
+    // Transfer committed flags from previous nodes by facetType + occurrence index
     if (prevNodes) {
         const counts = new Map();
         const committedByTypeIndex = new Set();
         for (const node of prevNodes) {
-            if (node.type === 'text')
+            if (node.type !== 'facet')
                 continue;
-            const idx = counts.get(node.type) ?? 0;
-            counts.set(node.type, idx + 1);
+            const idx = counts.get(node.facetType) ?? 0;
+            counts.set(node.facetType, idx + 1);
             if (node.committed) {
-                committedByTypeIndex.add(`${node.type}:${idx}`);
+                committedByTypeIndex.add(`${node.facetType}:${idx}`);
             }
         }
         counts.clear();
         for (const node of nodes) {
-            if (node.type === 'text')
+            if (node.type !== 'facet')
                 continue;
-            const idx = counts.get(node.type) ?? 0;
-            counts.set(node.type, idx + 1);
-            if (committedByTypeIndex.has(`${node.type}:${idx}`)) {
+            const idx = counts.get(node.facetType) ?? 0;
+            counts.set(node.facetType, idx + 1);
+            if (committedByTypeIndex.has(`${node.facetType}:${idx}`)) {
                 node.committed = true;
             }
         }
@@ -82,12 +154,26 @@ export function deriveTriggers(config) {
     }
     return triggers;
 }
+export function nodeToFacet(node) {
+    return {
+        type: node.facetType,
+        value: node.value,
+        range: { start: node.start, end: node.end },
+    };
+}
 export function detectActiveFacet(nodes, text, cursor, triggers) {
     for (const node of nodes) {
-        if (node.type !== 'text' && node.start < cursor && cursor <= node.end) {
+        if (node.type === 'trigger' && node.start < cursor && cursor <= node.end) {
+            return {
+                type: node.facetType,
+                value: node.value,
+                range: { start: node.start, end: node.end },
+            };
+        }
+        if (node.type === 'facet' && node.start < cursor && cursor <= node.end) {
             return {
-                facetType: node.type,
-                query: node.value,
+                type: node.facetType,
+                value: node.value,
                 range: { start: node.start, end: node.end },
             };
         }
@@ -96,13 +182,13 @@ export function detectActiveFacet(nodes, text, cursor, triggers) {
     for (let i = cursor - 1; i >= 0; i--) {
         const ch = text[i];
         // Stop at whitespace — triggers don't span across words
-        if (/\s/.test(ch))
+        if (WHITESPACE.test(ch))
             break;
-        const facetType = triggers.get(ch);
-        if (facetType) {
+        const type = triggers.get(ch);
+        if (type) {
             return {
-                facetType,
-                query: text.slice(i + 1, cursor),
+                type,
+                value: text.slice(i + 1, cursor),
                 range: { start: i, end: cursor },
             };
         }

package/build/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  TapperFacetConfigMap,\n  TapperNode,\n  TapperFacet,\n} from './types'\n\nexport function parseNodesFromText(\n  text: string,\n  config: TapperFacetConfigMap,\n  prevNodes?: TapperNode[],\n): TapperNode[] {\n  const allMatches: {\n    facetName: string\n    fullMatch: string\n    capture: string\n    index: number\n  }[] = []\n\n  for (const [name, def] of Object.entries(config)) {\n    const re = new RegExp(def.match.source, def.match.flags)\n    for (const m of text.matchAll(re)) {\n      allMatches.push({\n        facetName: name,\n        fullMatch: m[0],\n        capture: m[0],\n        index: m.index,\n      })\n    }\n  }\n\n  allMatches.sort(\n    (a, b) => a.index - b.index || b.fullMatch.length - a.fullMatch.length,\n  )\n\n  const accepted: typeof allMatches = []\n  let lastEnd = 0\n  for (const m of allMatches) {\n    if (m.index >= lastEnd) {\n      accepted.push(m)\n      lastEnd = m.index + m.fullMatch.length\n    }\n  }\n\n  const nodes: TapperNode[] = []\n  let cursor = 0\n\n  for (const m of accepted) {\n    if (m.index > cursor) {\n      nodes.push({\n        type: 'text',\n        value: text.slice(cursor, m.index),\n        start: cursor,\n        end: m.index,\n      })\n    }\n    nodes.push({\n      type: m.facetName,\n      value: m.capture,\n      start: m.index,\n      end: m.index + m.fullMatch.length,\n    })\n    cursor = m.index + m.fullMatch.length\n  }\n\n  if (cursor < text.length) {\n    nodes.push({\n      type: 'text',\n      value: text.slice(cursor),\n      start: cursor,\n      end: text.length,\n    })\n  }\n\n  // Transfer committed flags from previous nodes by type + occurrence index\n  if (prevNodes) {\n    const counts = new Map<string, number>()\n    const committedByTypeIndex = new Set<string>()\n\n    for (const node of prevNodes) {\n      if (node.type === 'text') continue\n      const idx = counts.get(node.type) ?? 0\n      counts.set(node.type, idx + 1)\n      if (node.committed) {\n        committedByTypeIndex.add(`${node.type}:${idx}`)\n      }\n    }\n\n    counts.clear()\n    for (const node of nodes) {\n      if (node.type === 'text') continue\n      const idx = counts.get(node.type) ?? 0\n      counts.set(node.type, idx + 1)\n      if (committedByTypeIndex.has(`${node.type}:${idx}`)) {\n        node.committed = true\n      }\n    }\n  }\n\n  return nodes\n}\n\nexport function deriveTriggers(config: TapperFacetConfigMap): Map<string, string> {\n  const triggers = new Map<string, string>()\n  for (const [name, def] of Object.entries(config)) {\n    const m = def.match.source.match(/^[^\\\\([\\]{}.*+?^$|]+/)\n    if (m) triggers.set(m[0], name)\n  }\n  return triggers\n}\n\nexport function detectActiveFacet(\n  nodes: TapperNode[],\n  text: string,\n  cursor: number,\n  triggers: Map<string, string>,\n): TapperFacet | null {\n  for (const node of nodes) {\n    if (node.type !== 'text' && node.start < cursor && cursor <= node.end) {\n      return {\n        facetType: node.type,\n        query: node.value,\n        range: {start: node.start, end: node.end},\n      }\n    }\n  }\n\n  // Scan backward from cursor for a trigger char (partial facet not yet matched by regex)\n  for (let i = cursor - 1; i >= 0; i--) {\n    const ch = text[i]\n    // Stop at whitespace — triggers don't span across words\n    if (/\\s/.test(ch)) break\n    const facetType = triggers.get(ch)\n    if (facetType) {\n      return {\n        facetType,\n        query: text.slice(i + 1, cursor),\n        range: {start: i, end: cursor},\n      }\n    }\n  }\n\n  return null\n}\n"]}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,GAAG,IAAI,CAAA;AAIvB;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CACjC,MAA4B;IAE5B,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAA;IAC1C,KAAK,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACjD,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;IACnE,CAAC;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,IAAY,EACZ,OAA6B,EAC7B,SAAwB,EACxB,MAAe,EACf,QAA8B;IAE9B,MAAM,UAAU,GAKV,EAAE,CAAA;IAER,KAAK,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,OAAO,EAAE,CAAC;QACjC,gEAAgE;QAChE,gDAAgD;QAChD,EAAE,CAAC,SAAS,GAAG,CAAC,CAAA;QAChB,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;YAClC,UAAU,CAAC,IAAI,CAAC;gBACd,SAAS,EAAE,IAAI;gBACf,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;gBACf,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACrB,KAAK,EAAE,CAAC,CAAC,KAAK;aACf,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,UAAU,CAAC,IAAI,CACb,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,SAAS,CAAC,MAAM,CACvE,CAAA;IAED,MAAM,QAAQ,GAAsB,EAAE,CAAA;IACtC,IAAI,OAAO,GAAG,CAAC,CAAA;IACf,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;QAC3B,IAAI,CAAC,CAAC,KAAK,IAAI,OAAO,EAAE,CAAC;YACvB,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YAChB,OAAO,GAAG,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,SAAS,CAAC,MAAM,CAAA;QACxC,CAAC;IACH,CAAC;IAED,MAAM,KAAK,GAAiB,EAAE,CAAA;IAC9B,IAAI,GAAG,GAAG,CAAC,CAAA;IAEX,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;QACzB,IAAI,CAAC,CAAC,KAAK,GAAG,GAAG,EAAE,CAAC;YAClB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,CAAA;YACpC,KAAK,CAAC,IAAI,CAAC;gBACT,IAAI,EAAE,MAAM;gBACZ,GAAG;gBACH,KAAK,EAAE,GAAG;gBACV,KAAK,EAAE,GAAG;gBACV,GAAG,EAAE,CAAC,CAAC,KAAK;aACb,CAAC,CAAA;QACJ,CAAC;QACD,KAAK,CAAC,IAAI,CAAC;YACT,IAAI,EAAE,OAAO;YACb,SAAS,EAAE,CAAC,CAAC,SAAS;YACtB,GAAG,EAAE,CAAC,CAAC,SAAS;YAChB,KAAK,EAAE,CAAC,CAAC,OAAO;YAChB,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,GAAG,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,SAAS,CAAC,MAAM;SAClC,CAAC,CAAA;QACF,GAAG,GAAG,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,SAAS,CAAC,MAAM,CAAA;IACpC,CAAC;IAED,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QACtB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAC3B,KAAK,CAAC,IAAI,CAAC;YACT,IAAI,EAAE,MAAM;YACZ,GAAG;YACH,KAAK,EAAE,GAAG;YACV,KAAK,EAAE,GAAG;YACV,GAAG,EAAE,IAAI,CAAC,MAAM;SACjB,CAAC,CAAA;IACJ,CAAC;IAED,2EAA2E;IAC3E,2DAA2D;IAC3D,IAAI,MAAM,IAAI,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC/B,KAAK,IAAI,CAAC,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YACrC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;YAClB,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBAAE,MAAK;YAC9B,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;YAClC,IAAI,SAAS,EAAE,CAAC;gBACd,kEAAkE;gBAClE,sDAAsD;gBACtD,MAAM,WAAW,GAAG,KAAK,CAAC,SAAS,CACjC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC,CACpD,CAAA;gBACD,IAAI,WAAW,KAAK,CAAC,CAAC,EAAE,CAAC;oBACvB,MAAM,IAAI,GAAG,KAAK,CAAC,WAAW,CAAC,CAAA;oBAC/B,MAAM,OAAO,GAAiB,EAAE,CAAA;oBAChC,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;wBACnB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;wBACrC,OAAO,CAAC,IAAI,CAAC;4BACX,IAAI,EAAE,MAAM;4BACZ,GAAG;4BACH,KAAK,EAAE,GAAG;4BACV,KAAK,EAAE,IAAI,CAAC,KAAK;4BACjB,GAAG,EAAE,CAAC;yBACP,CAAC,CAAA;oBACJ,CAAC;oBACD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,CAAA;oBACxC,OAAO,CAAC,IAAI,CAAC;wBACX,IAAI,EAAE,SAAS;wBACf,SAAS;wBACT,GAAG,EAAE,UAAU;wBACf,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;wBACxC,KAAK,EAAE,CAAC;wBACR,GAAG,EAAE,MAAM;qBACZ,CAAC,CAAA;oBACF,IAAI,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;wBACtB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA;wBACxC,OAAO,CAAC,IAAI,CAAC;4BACX,IAAI,EAAE,MAAM;4BACZ,GAAG;4BACH,KAAK,EAAE,GAAG;4BACV,KAAK,EAAE,MAAM;4BACb,GAAG,EAAE,IAAI,CAAC,GAAG;yBACd,CAAC,CAAA;oBACJ,CAAC;oBACD,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,CAAA;gBAC1C,CAAC;gBACD,MAAK;YACP,CAAC;QACH,CAAC;IACH,CAAC;IAED,+EAA+E;IAC/E,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAA;QACxC,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAU,CAAA;QAE9C,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;YAC7B,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO;gBAAE,SAAQ;YACnC,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,SAAU,CAAC,IAAI,CAAC,CAAA;YAC5C,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,SAAU,EAAE,GAAG,GAAG,CAAC,CAAC,CAAA;YACpC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACnB,oBAAoB,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,IAAI,GAAG,EAAE,CAAC,CAAA;YACtD,CAAC;QACH,CAAC;QAED,MAAM,CAAC,KAAK,EAAE,CAAA;QACd,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO;gBAAE,SAAQ;YACnC,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,SAAU,CAAC,IAAI,CAAC,CAAA;YAC5C,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,SAAU,EAAE,GAAG,GAAG,CAAC,CAAC,CAAA;YACpC,IAAI,oBAAoB,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,IAAI,GAAG,EAAE,CAAC,EAAE,CAAC;gBACzD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;YACvB,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,MAA4B;IAE5B,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAA;IAC1C,KAAK,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACjD,MAAM,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;QACxD,IAAI,CAAC;YAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAA;IACjC,CAAC;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,IAAgB;IAC1C,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,SAAU;QACrB,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,KAAK,EAAE,EAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAC;KAC1C,CAAA;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,KAAmB,EACnB,IAAY,EACZ,MAAc,EACd,QAA6B;IAE7B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,GAAG,MAAM,IAAI,MAAM,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACzE,OAAO;gBACL,IAAI,EAAE,IAAI,CAAC,SAAS;gBACpB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,KAAK,EAAE,EAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAC;aAC1C,CAAA;QACH,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,KAAK,GAAG,MAAM,IAAI,MAAM,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACvE,OAAO;gBACL,IAAI,EAAE,IAAI,CAAC,SAAS;gBACpB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,KAAK,EAAE,EAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAC;aAC1C,CAAA;QACH,CAAC;IACH,CAAC;IAED,wFAAwF;IACxF,KAAK,IAAI,CAAC,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;QAClB,wDAAwD;QACxD,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAAE,MAAK;QAC9B,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QAC7B,IAAI,IAAI,EAAE,CAAC;YACT,OAAO;gBACL,IAAI;gBACJ,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;gBAChC,KAAK,EAAE,EAAC,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAC;aAC/B,CAAA;QACH,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC","sourcesContent":["import {TapperFacetConfigMap, TapperNode, TapperFacet} from './types'\n\nconst WHITESPACE = /\\s/\n\nexport type CompiledFacetRegexes = Map<string, RegExp>\n\n/**\n * Pre-compile facet regexes once at init time. This avoids re-creating\n * RegExp objects on every keystroke in parseNodesFromText. Each Tapper\n * instance gets its own compiled copy so lastIndex state can't leak\n * between instances.\n */\nexport function compileFacetRegexes(\n  config: TapperFacetConfigMap,\n): CompiledFacetRegexes {\n  const compiled = new Map<string, RegExp>()\n  for (const [name, def] of Object.entries(config)) {\n    compiled.set(name, new RegExp(def.match.source, def.match.flags))\n  }\n  return compiled\n}\n\nexport function parseNodesFromText(\n  text: string,\n  regexes: CompiledFacetRegexes,\n  prevNodes?: TapperNode[],\n  cursor?: number,\n  triggers?: Map<string, string>,\n): TapperNode[] {\n  const allMatches: {\n    facetName: string\n    fullMatch: string\n    capture: string\n    index: number\n  }[] = []\n\n  for (const [name, re] of regexes) {\n    // Reset lastIndex so stateful (global) regexes don't carry over\n    // match positions from the previous parse call.\n    re.lastIndex = 0\n    for (const m of text.matchAll(re)) {\n      allMatches.push({\n        facetName: name,\n        fullMatch: m[0],\n        capture: m[1] ?? m[0],\n        index: m.index,\n      })\n    }\n  }\n\n  allMatches.sort(\n    (a, b) => a.index - b.index || b.fullMatch.length - a.fullMatch.length,\n  )\n\n  const accepted: typeof allMatches = []\n  let lastEnd = 0\n  for (const m of allMatches) {\n    if (m.index >= lastEnd) {\n      accepted.push(m)\n      lastEnd = m.index + m.fullMatch.length\n    }\n  }\n\n  const nodes: TapperNode[] = []\n  let pos = 0\n\n  for (const m of accepted) {\n    if (m.index > pos) {\n      const raw = text.slice(pos, m.index)\n      nodes.push({\n        type: 'text',\n        raw,\n        value: raw,\n        start: pos,\n        end: m.index,\n      })\n    }\n    nodes.push({\n      type: 'facet',\n      facetType: m.facetName,\n      raw: m.fullMatch,\n      value: m.capture,\n      start: m.index,\n      end: m.index + m.fullMatch.length,\n    })\n    pos = m.index + m.fullMatch.length\n  }\n\n  if (pos < text.length) {\n    const raw = text.slice(pos)\n    nodes.push({\n      type: 'text',\n      raw,\n      value: raw,\n      start: pos,\n      end: text.length,\n    })\n  }\n\n  // If the cursor is right after a trigger char that the regex didn't match,\n  // splice a 'trigger' node out of the containing text node.\n  if (cursor != null && triggers) {\n    for (let i = cursor - 1; i >= 0; i--) {\n      const ch = text[i]\n      if (WHITESPACE.test(ch)) break\n      const facetType = triggers.get(ch)\n      if (facetType) {\n        // Only create a trigger node if the trigger is inside a text node\n        // (i.e. the regex didn't already match it as a facet)\n        const textNodeIdx = nodes.findIndex(\n          n => n.type === 'text' && n.start <= i && n.end > i,\n        )\n        if (textNodeIdx !== -1) {\n          const node = nodes[textNodeIdx]\n          const spliced: TapperNode[] = []\n          if (node.start < i) {\n            const raw = text.slice(node.start, i)\n            spliced.push({\n              type: 'text',\n              raw,\n              value: raw,\n              start: node.start,\n              end: i,\n            })\n          }\n          const triggerRaw = text.slice(i, cursor)\n          spliced.push({\n            type: 'trigger',\n            facetType,\n            raw: triggerRaw,\n            value: text.slice(i + ch.length, cursor),\n            start: i,\n            end: cursor,\n          })\n          if (cursor < node.end) {\n            const raw = text.slice(cursor, node.end)\n            spliced.push({\n              type: 'text',\n              raw,\n              value: raw,\n              start: cursor,\n              end: node.end,\n            })\n          }\n          nodes.splice(textNodeIdx, 1, ...spliced)\n        }\n        break\n      }\n    }\n  }\n\n  // Transfer committed flags from previous nodes by facetType + occurrence index\n  if (prevNodes) {\n    const counts = new Map<string, number>()\n    const committedByTypeIndex = new Set<string>()\n\n    for (const node of prevNodes) {\n      if (node.type !== 'facet') continue\n      const idx = counts.get(node.facetType!) ?? 0\n      counts.set(node.facetType!, idx + 1)\n      if (node.committed) {\n        committedByTypeIndex.add(`${node.facetType}:${idx}`)\n      }\n    }\n\n    counts.clear()\n    for (const node of nodes) {\n      if (node.type !== 'facet') continue\n      const idx = counts.get(node.facetType!) ?? 0\n      counts.set(node.facetType!, idx + 1)\n      if (committedByTypeIndex.has(`${node.facetType}:${idx}`)) {\n        node.committed = true\n      }\n    }\n  }\n\n  return nodes\n}\n\nexport function deriveTriggers(\n  config: TapperFacetConfigMap,\n): Map<string, string> {\n  const triggers = new Map<string, string>()\n  for (const [name, def] of Object.entries(config)) {\n    const m = def.match.source.match(/^[^\\\\([\\]{}.*+?^$|]+/)\n    if (m) triggers.set(m[0], name)\n  }\n  return triggers\n}\n\nexport function nodeToFacet(node: TapperNode): TapperFacet {\n  return {\n    type: node.facetType!,\n    value: node.value,\n    range: {start: node.start, end: node.end},\n  }\n}\n\nexport function detectActiveFacet(\n  nodes: TapperNode[],\n  text: string,\n  cursor: number,\n  triggers: Map<string, string>,\n): TapperFacet | null {\n  for (const node of nodes) {\n    if (node.type === 'trigger' && node.start < cursor && cursor <= node.end) {\n      return {\n        type: node.facetType,\n        value: node.value,\n        range: {start: node.start, end: node.end},\n      }\n    }\n    if (node.type === 'facet' && node.start < cursor && cursor <= node.end) {\n      return {\n        type: node.facetType,\n        value: node.value,\n        range: {start: node.start, end: node.end},\n      }\n    }\n  }\n\n  // Scan backward from cursor for a trigger char (partial facet not yet matched by regex)\n  for (let i = cursor - 1; i >= 0; i--) {\n    const ch = text[i]\n    // Stop at whitespace — triggers don't span across words\n    if (WHITESPACE.test(ch)) break\n    const type = triggers.get(ch)\n    if (type) {\n      return {\n        type,\n        value: text.slice(i + 1, cursor),\n        range: {start: i, end: cursor},\n      }\n    }\n  }\n\n  return null\n}\n"]}

package/package.json

@@ -1,28 +1,19 @@
 {
   "name": "@bsky.app/tapper",
-  "version": "0.1.1",
+  "version": "0.2.2",
+  "license": "MIT",
   "description": "A minimal rich text editor for React Native and web.",
+  "repository": "https://github.com/bluesky-social/toolbox",
+  "author": "Eric Bailey <git@esb.lol> (https://github.com/estrattonbailey)",
+  "homepage": "https://github.com/bluesky-social/toolbox/tree/main/packages/tapper",
   "main": "build/index.js",
   "types": "build/index.d.ts",
-  "scripts": {
-    "build": "expo-module build",
-    "clean": "expo-module clean",
-    "lint": "expo-module lint",
-    "test": "vitest run",
-    "prepare": "expo-module prepare",
-    "prepublishOnly": "expo-module prepublishOnly",
-    "expo-module": "expo-module",
-    "open:ios": "xed example/ios",
-    "open:android": "open -a \"Android Studio\" example/android"
-  },
   "keywords": [
     "react-native",
     "expo",
     "tapper",
     "Tapper"
   ],
-  "author": "Bluesky Social, PBLLC",
-  "license": "MIT",
   "dependencies": {},
   "devDependencies": {
     "@types/react": "~19.1.1",
@@ -35,5 +26,14 @@
     "expo": "*",
     "react": "*",
     "react-native": "*"
+  },
+  "scripts": {
+    "build": "expo-module build",
+    "clean": "expo-module clean",
+    "lint": "expo-module lint",
+    "test": "vitest run",
+    "expo-module": "expo-module",
+    "open:ios": "xed example/ios",
+    "open:android": "open -a \"Android Studio\" example/android"
   }
-}
+}

package/src/index.ts

@@ -1,20 +1,267 @@
-import {useTapperCore} from './core'
-import {type TapperConfig} from './types'
+import {useRef, useState, useSyncExternalStore} from 'react'
+
+import {
+  TapperConfig,
+  TapperEvents,
+  TapperNode,
+  TapperActiveFacet,
+  TapperSnapshot,
+} from './types'
+import {
+  parseNodesFromText,
+  detectActiveFacet,
+  deriveTriggers,
+  nodeToFacet,
+  compileFacetRegexes,
+  type CompiledFacetRegexes,
+} from './util'
 
 export * from './types'
-export * from './core'
+
+export class Tapper {
+  private facetRegexes: CompiledFacetRegexes
+  private triggers: Map<string, string>
+
+  // Event emitters
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  private listeners = new Map<keyof TapperEvents, Set<(data: any) => void>>()
+
+  // Public state
+  text = ''
+  cursor = 0
+  nodes: TapperNode[] = []
+  activeFacet: TapperActiveFacet | null = null
+
+  // Internal tracking
+  private updating = false
+  private pendingCursor: number | null = null
+
+  // useSyncExternalStore plumbing
+  private storeListeners = new Set<() => void>()
+  private snapshot: TapperSnapshot
+
+  constructor(config: TapperConfig) {
+    this.facetRegexes = compileFacetRegexes(config.facets)
+    this.triggers = deriveTriggers(config.facets)
+    this.snapshot = {
+      text: this.text,
+      cursor: this.cursor,
+      nodes: this.nodes,
+      activeFacet: this.activeFacet,
+    }
+    if (config.initialText) {
+      this.replaceText(config.initialText)
+    }
+  }
+
+  subscribe = (listener: () => void) => {
+    this.storeListeners.add(listener)
+    return () => this.storeListeners.delete(listener)
+  }
+
+  getSnapshot = (): TapperSnapshot => {
+    return this.snapshot
+  }
+
+  on = <K extends keyof TapperEvents>(
+    event: K,
+    cb: (data: TapperEvents[K]) => void,
+  ) => {
+    if (!this.listeners.has(event)) this.listeners.set(event, new Set())
+    this.listeners.get(event)!.add(cb)
+    return () => {
+      this.listeners.get(event)?.delete(cb)
+    }
+  }
+
+  private emit<K extends keyof TapperEvents>(event: K, data: TapperEvents[K]) {
+    this.listeners.get(event)?.forEach(cb => cb(data))
+  }
+
+  private notify() {
+    this.snapshot = {
+      text: this.text,
+      cursor: this.cursor,
+      nodes: this.nodes,
+      activeFacet: this.activeFacet,
+    }
+    this.storeListeners.forEach(l => l())
+  }
+
+  private update(newText: string, cursor: number) {
+    // guard against circular updates when commit() is called during an update cycle
+    if (this.updating) return
+    this.updating = true
+
+    const nodes =
+      newText === this.text
+        ? this.nodes
+        : parseNodesFromText(
+            newText,
+            this.facetRegexes,
+            this.nodes,
+            cursor,
+            this.triggers,
+          )
+    const prev = this.activeFacet
+    const detected = detectActiveFacet(nodes, newText, cursor, this.triggers)
+
+    // When cursor leaves a facet, commit it
+    let committedNode: TapperNode | null = null
+    if (prev && (!detected || detected.type !== prev.type)) {
+      for (const node of nodes) {
+        if (
+          node.type === 'facet' &&
+          node.facetType === prev.type &&
+          node.start === prev.range.start &&
+          node.end === prev.range.end
+        ) {
+          node.committed = true
+          committedNode = node
+          break
+        }
+      }
+    }
+
+    // Build activeFacet with commit() baked in
+    const active: TapperActiveFacet | null = detected
+      ? {...detected, insert: this.insert}
+      : null
+
+    this.text = newText
+    this.cursor = cursor
+    this.nodes = nodes
+    this.activeFacet = active
+
+    this.updating = false
+    this.notify()
+
+    // Fire events after state is finalized
+    const facetChanged =
+      active?.type !== prev?.type ||
+      active?.value !== prev?.value ||
+      active?.range.start !== prev?.range.start ||
+      active?.range.end !== prev?.range.end
+    if (facetChanged) {
+      this.emit('activeFacet', active)
+    }
+    if (committedNode) {
+      this.emit('facetCommitted', nodeToFacet(committedNode))
+    }
+  }
+
+  handleTextChange = (newText: string) => {
+    const diff = newText.length - this.text.length
+    let newCursor = Math.max(this.cursor + diff, 0)
+
+    // Atomic deletion: backspace into a facet from outside
+    if (diff === -1 && newCursor < this.cursor) {
+      for (const node of this.nodes) {
+        if (
+          node.type === 'facet' &&
+          node.committed &&
+          this.cursor === node.end
+        ) {
+          const remnant = node.end - node.start - 1
+          newText =
+            newText.slice(0, node.start) + newText.slice(node.start + remnant)
+          newCursor = node.start
+          this.pendingCursor = newCursor
+          break
+        }
+      }
+    }
+
+    this.update(newText, newCursor)
+  }
+
+  handleSelectionChange = (e: {nativeEvent: {selection: {start: number}}}) => {
+    const newCursor = e.nativeEvent.selection.start
+    // After atomic deletion, ignore stale cursor values from the DOM
+    if (this.pendingCursor !== null) {
+      if (newCursor !== this.pendingCursor) {
+        return
+      }
+      this.pendingCursor = null
+    }
+
+    if (newCursor === this.cursor) return
+
+    this.cursor = newCursor
+    this.update(this.text, newCursor)
+  }
+
+  replaceText = (text: string, cursor?: number) => {
+    const prevActive = this.activeFacet
+    const nodes = parseNodesFromText(text, this.facetRegexes)
+    // Mark all non-text nodes as committed (pre-existing facets)
+    const newlyCommitted: TapperNode[] = []
+    for (const node of nodes) {
+      if (node.type === 'facet') {
+        node.committed = true
+        newlyCommitted.push(node)
+      }
+    }
+
+    const pos = cursor ?? text.length
+    const detected = detectActiveFacet(nodes, text, pos, this.triggers)
+    const active: TapperActiveFacet | null = detected
+      ? {...detected, insert: this.insert}
+      : null
+
+    this.text = text
+    this.cursor = pos
+    this.nodes = nodes
+    this.activeFacet = active
+
+    this.notify()
+
+    if (active !== prevActive) {
+      this.emit('activeFacet', active)
+    }
+    for (const node of newlyCommitted) {
+      this.emit('facetCommitted', nodeToFacet(node))
+    }
+  }
+
+  private insert = (value: string, options?: {noTrailingSpace?: boolean}) => {
+    if (!this.activeFacet) return
+
+    const replacement = value + (options?.noTrailingSpace ? '' : ' ')
+    const newText =
+      this.text.slice(0, this.activeFacet.range.start) +
+      replacement +
+      this.text.slice(this.activeFacet.range.end)
+    const newCursor = this.activeFacet.range.start + replacement.length
+
+    if (this.activeFacet) {
+      this.activeFacet.value = value
+      this.activeFacet.range = {
+        start: this.activeFacet.range.start,
+        end: this.activeFacet.range.start + value.length,
+      }
+      this.emit('afterInsert', this.activeFacet)
+    }
+
+    this.update(newText, newCursor)
+  }
+}
 
 export function useTapper(config: TapperConfig) {
-  const tapper = useTapperCore(config)
+  const [store] = useState(() => new Tapper(config))
+  const state = useSyncExternalStore(store.subscribe, store.getSnapshot)
+  const inputRef = useRef<{focus(): void}>(null)
 
   return {
-    ...tapper,
+    ...state,
+    on: store.on,
+    focus: () => inputRef.current?.focus(),
     inputProps: {
-      value: tapper.text,
-      selection: {start: tapper.cursor, end: tapper.cursor},
-      onChangeText: tapper.store.handleTextChange,
-      onSelectionChange: (e: {nativeEvent: {selection: {start: number}}}) =>
-        tapper.store.handleSelectionChange(e.nativeEvent.selection.start),
+      ref: inputRef as React.RefObject<any>,
+      value: state.text,
+      selection: {start: state.cursor, end: state.cursor},
+      onChangeText: store.handleTextChange,
+      onSelectionChange: store.handleSelectionChange,
     },
   }
 }

package/src/types.ts

@@ -4,17 +4,38 @@ export type TapperFacetConfig = {
 
 export type TapperFacetConfigMap = Record<string, TapperFacetConfig>
 
-export type TapperNode = {
-  type: string
-  value: string
-  start: number
-  end: number
-  committed?: boolean
-}
+export type TapperNode =
+  | {
+      type: 'text'
+      raw: string
+      value: string
+      start: number
+      end: number
+      committed?: boolean
+      facetType?: undefined
+    }
+  | {
+      type: 'trigger'
+      raw: string
+      value: string
+      start: number
+      end: number
+      committed?: boolean
+      facetType: string
+    }
+  | {
+      type: 'facet'
+      raw: string
+      value: string
+      start: number
+      end: number
+      committed?: boolean
+      facetType: string
+    }
 
 export type TapperFacet = {
-  facetType: string
-  query: string
+  type: string
+  value: string
   range: {start: number; end: number}
 }
 
@@ -33,3 +54,9 @@ export type TapperConfig = {
   facets: TapperFacetConfigMap
   initialText?: string
 }
+
+export type TapperEvents = {
+  activeFacet: TapperActiveFacet | null
+  facetCommitted: TapperFacet
+  afterInsert: TapperFacet
+}