@pixerate/editor 0.268.2 → 0.269.0

package/dist/{chunk-WIC7TG73.cjs → chunk-M4UQA2T4.cjs}

@@ -4,9 +4,9 @@ var _chunkN3KJFGXTcjs = require('./chunk-N3KJFGXT.cjs');
 
 
 
+var _chunkYBMUHIOMcjs = require('./chunk-YBMUHIOM.cjs');
 
 
-var _chunkNIBFDFYWcjs = require('./chunk-NIBFDFYW.cjs');
 
 
 
@@ -15,20 +15,20 @@ var _chunkNIBFDFYWcjs = require('./chunk-NIBFDFYW.cjs');
 
 
 
-var _chunkUWEQ55MYcjs = require('./chunk-UWEQ55MY.cjs');
+var _chunkN4KP3UQRcjs = require('./chunk-N4KP3UQR.cjs');
 
 // src/grammar/resolver.ts
 function resolveTemplates(text, templates = [], options) {
-  return _chunkNIBFDFYWcjs.resolvePrompt.call(void 0, text, templates, options).text;
+  return _chunkYBMUHIOMcjs.resolvePrompt.call(void 0, text, templates, options).text;
 }
 function resolveVariables(text, values) {
   if (!text) return "";
-  return _chunkNIBFDFYWcjs.resolvePrompt.call(void 0, text, [], { values }).text;
+  return _chunkYBMUHIOMcjs.resolvePrompt.call(void 0, text, [], { values }).text;
 }
 function extractTemplateNames(text) {
   if (!text) return [];
   const set = /* @__PURE__ */ new Set();
-  const regex = new RegExp(_chunkUWEQ55MYcjs.TEMPLATE_REGEX.source, _chunkUWEQ55MYcjs.TEMPLATE_REGEX.flags);
+  const regex = new RegExp(_chunkN4KP3UQRcjs.TEMPLATE_REGEX.source, _chunkN4KP3UQRcjs.TEMPLATE_REGEX.flags);
   let match;
   while ((match = regex.exec(text)) !== null) {
     set.add(match[1].trim());
@@ -38,17 +38,17 @@ function extractTemplateNames(text) {
 function extractVariableNames(text) {
   if (!text) return [];
   const set = /* @__PURE__ */ new Set();
-  const regex = new RegExp(_chunkUWEQ55MYcjs.VARIABLE_REGEX.source, _chunkUWEQ55MYcjs.VARIABLE_REGEX.flags);
+  const regex = new RegExp(_chunkN4KP3UQRcjs.VARIABLE_REGEX.source, _chunkN4KP3UQRcjs.VARIABLE_REGEX.flags);
   let comparisonStarts;
   let match;
   while ((match = regex.exec(text)) !== null) {
-    const parsed = _chunkUWEQ55MYcjs.parseVariableBody.call(void 0, match[1]);
+    const parsed = _chunkN4KP3UQRcjs.parseVariableBody.call(void 0, match[1]);
     let name = parsed.name;
     if (parsed.kind === "conditional" && parsed.conditional !== "end") {
-      const subject = _chunkUWEQ55MYcjs.conditionSubject.call(void 0, name);
+      const subject = _chunkN4KP3UQRcjs.conditionSubject.call(void 0, name);
       if (subject) {
         comparisonStarts ??= new Set(
-          _chunkNIBFDFYWcjs.tokenizePrompt.call(void 0, text).filter((token) => token.comparison).map((token) => token.start)
+          _chunkN4KP3UQRcjs.tokenizePrompt.call(void 0, text).filter((token) => token.comparison).map((token) => token.start)
         );
         if (comparisonStarts.has(match.index)) name = subject;
       }
@@ -60,7 +60,7 @@ function extractVariableNames(text) {
 function extractInstructionNames(text) {
   if (!text) return [];
   const set = /* @__PURE__ */ new Set();
-  const regex = new RegExp(_chunkUWEQ55MYcjs.INSTRUCTION_REGEX.source, _chunkUWEQ55MYcjs.INSTRUCTION_REGEX.flags);
+  const regex = new RegExp(_chunkN4KP3UQRcjs.INSTRUCTION_REGEX.source, _chunkN4KP3UQRcjs.INSTRUCTION_REGEX.flags);
   let match;
   while ((match = regex.exec(text)) !== null) {
     set.add(match[1].trim());
@@ -72,7 +72,7 @@ function extractInstructionNames(text) {
 function resolveTemplatesWithMapping(text, templates = [], templateBindings, options) {
   if (_optionalChain([options, 'optionalAccess', _2 => _2.values]) === void 0 && (!templates || templates.length === 0 || !text.includes("{{"))) {
     return {
-      diagnostics: _chunkNIBFDFYWcjs.getPromptDiagnostics.call(void 0, text),
+      diagnostics: _chunkN4KP3UQRcjs.getPromptDiagnostics.call(void 0, text),
       text,
       map: [
         {
@@ -85,7 +85,7 @@ function resolveTemplatesWithMapping(text, templates = [], templateBindings, opt
       ]
     };
   }
-  return _chunkNIBFDFYWcjs.resolvePrompt.call(void 0, text, templates, {
+  return _chunkYBMUHIOMcjs.resolvePrompt.call(void 0, text, templates, {
     bindings: templateBindings,
     maxDepth: _optionalChain([options, 'optionalAccess', _3 => _3.maxDepth]),
     values: _optionalChain([options, 'optionalAccess', _4 => _4.values])
@@ -152,7 +152,7 @@ function extractVariables(text, options = {}) {
     return descriptor;
   };
   const visit = (source, visited, depth, templateName) => {
-    for (const token of _chunkNIBFDFYWcjs.tokenizePrompt.call(void 0, source)) {
+    for (const token of _chunkN4KP3UQRcjs.tokenizePrompt.call(void 0, source)) {
       if (token.type === "variable") {
         const descriptor = describe(token.value, templateName);
         descriptor.usedAsValue = true;
@@ -171,7 +171,7 @@ function extractVariables(text, options = {}) {
         if (!template || visited.has(token.value) || depth + 1 > maxDepth) {
           continue;
         }
-        const body = _chunkNIBFDFYWcjs.getTemplateBody.call(void 0, template, options.bindings);
+        const body = _chunkYBMUHIOMcjs.getTemplateBody.call(void 0, template, options.bindings);
         if (body === void 0) continue;
         visit(body, new Set(visited).add(token.value), depth + 1, token.value);
       }
@@ -570,7 +570,7 @@ function mergeRecords(template, source, options = {}) {
   if (typeof options.skipIf === "function") {
     skip = options.skipIf;
   } else if (typeof options.skipIf === "string" && options.skipIf.trim()) {
-    const parsed = _chunkUWEQ55MYcjs.parseConditionExpression.call(void 0, options.skipIf);
+    const parsed = _chunkN4KP3UQRcjs.parseConditionExpression.call(void 0, options.skipIf);
     if ("error" in parsed) {
       diagnostics.push({
         code: "invalid-skip-condition",
@@ -580,12 +580,12 @@ function mergeRecords(template, source, options = {}) {
       const field = _nullishCoalesce(mapping[parsed.name], () => ( matchFields([parsed.name], data.fields).mapping[parsed.name]));
       skip = (record, values) => {
         if (field && !Object.prototype.hasOwnProperty.call(values, parsed.name) && Object.prototype.hasOwnProperty.call(record, field)) {
-          return _chunkUWEQ55MYcjs.evaluateConditionExpression.call(void 0, parsed, {
+          return _chunkN4KP3UQRcjs.evaluateConditionExpression.call(void 0, parsed, {
             ...values,
             [parsed.name]: record[field]
           });
         }
-        return _chunkUWEQ55MYcjs.evaluateConditionExpression.call(void 0, parsed, values);
+        return _chunkN4KP3UQRcjs.evaluateConditionExpression.call(void 0, parsed, values);
       };
     }
   }
@@ -619,7 +619,7 @@ function mergeRecords(template, source, options = {}) {
       });
       break;
     }
-    const resolved = _chunkNIBFDFYWcjs.resolvePrompt.call(void 0, template, options.templates, {
+    const resolved = _chunkYBMUHIOMcjs.resolvePrompt.call(void 0, template, options.templates, {
       bindings: options.bindings,
       maxDepth: options.maxDepth,
       values

package/dist/{chunk-ITURMC2M.js → chunk-N3UMQVKX.js}

@@ -24,11 +24,176 @@ import {
   safeMergeAttributes
 } from "./chunk-6IN474P4.js";
 
+// src/extensions/table/nesting.ts
+import { Fragment, Slice } from "@tiptap/pm/model";
+import { Plugin, PluginKey, Selection } from "@tiptap/pm/state";
+import {
+  CellSelection,
+  __pastedCells,
+  handlePaste as handleTablePaste
+} from "@tiptap/pm/tables";
+var ALLOW_NESTED_TABLES_META = "allowNestedTables";
+var tableNestingPluginKey = new PluginKey("tableNesting");
+var roleOf = (node) => node.type.spec.tableRole;
+var isTableNode = (node) => roleOf(node) === "table";
+function outermostTableDepth($pos) {
+  for (let d = 1; d <= $pos.depth; d++) if (isTableNode($pos.node(d))) return d;
+  return -1;
+}
+function isInTableCell($pos) {
+  for (let d = $pos.depth; d > 0; d--) {
+    const role = roleOf($pos.node(d));
+    if (role === "cell" || role === "header_cell") return true;
+  }
+  return false;
+}
+function sliceContainsTable(content) {
+  const fragment = content instanceof Slice ? content.content : content;
+  let found = false;
+  fragment.descendants((node) => {
+    if (found) return false;
+    if (isTableNode(node)) found = true;
+    return !found;
+  });
+  return found;
+}
+function insertSliceAfterTable(tr, from, to, slice) {
+  const $from = tr.doc.resolve(from);
+  const depth = outermostTableDepth($from);
+  if (depth < 0) return null;
+  const tableStart = $from.before(depth);
+  const tableEnd = $from.after(depth);
+  if (to > from && to < tableEnd) {
+    if (tr.selection instanceof CellSelection && tr.selection.from === from && tr.selection.to === to) {
+      tr.deleteSelection();
+    } else {
+      tr.delete(from, to);
+    }
+  }
+  const table = tr.doc.nodeAt(tableStart);
+  if (!table) return null;
+  const after = tableStart + table.nodeSize;
+  const before = tr.doc.content.size;
+  tr.replace(after, after, new Slice(slice.content, 0, 0));
+  return after + (tr.doc.content.size - before);
+}
+function handleTablePasteWithoutNesting(view, event, slice) {
+  const { state } = view;
+  const { selection } = state;
+  if (outermostTableDepth(selection.$from) < 0) return false;
+  if (selection instanceof CellSelection || __pastedCells(slice)) {
+    if (handleTablePaste(view, event, slice)) return true;
+  }
+  if (!sliceContainsTable(slice)) return false;
+  const tr = state.tr;
+  const end = insertSliceAfterTable(tr, selection.from, selection.to, slice);
+  if (end === null) return false;
+  tr.setSelection(Selection.near(tr.doc.resolve(end), -1));
+  view.dispatch(tr.scrollIntoView().setMeta("paste", true).setMeta("uiEvent", "paste"));
+  return true;
+}
+function changedRanges(transactions, skip2) {
+  let ranges = [];
+  for (const tr of transactions) {
+    const skipped = skip2(tr);
+    for (const step of tr.steps) {
+      const map = step.getMap();
+      ranges = ranges.map(([from, to]) => [map.map(from, 1), map.map(to, -1)]).filter(([from, to]) => to > from);
+      if (skipped) continue;
+      map.forEach((_oldStart, _oldEnd, newStart, newEnd) => {
+        if (newEnd > newStart) ranges.push([newStart, newEnd]);
+      });
+    }
+  }
+  return ranges;
+}
+function findNestedTables(doc, ranges) {
+  const found = /* @__PURE__ */ new Set();
+  for (const [from, to] of ranges) {
+    doc.nodesBetween(from, to, (node, pos) => {
+      if (!isTableNode(node) || pos < from) return true;
+      if (isInTableCell(doc.resolve(pos))) {
+        found.add(pos);
+        return false;
+      }
+      return true;
+    });
+  }
+  const sorted = [...found].sort((a, b) => a - b);
+  const outer = [];
+  for (const pos of sorted) {
+    const last = outer[outer.length - 1];
+    if (last === void 0 || pos >= last + doc.nodeAt(last).nodeSize) outer.push(pos);
+  }
+  return outer;
+}
+function unnestTables(tr, ranges) {
+  let changed = false;
+  for (let round = 0; round < 32 && ranges.length; round++) {
+    const nested = findNestedTables(tr.doc, ranges);
+    if (!nested.length) break;
+    const groups = /* @__PURE__ */ new Map();
+    for (const pos of nested) {
+      const $pos = tr.doc.resolve(pos);
+      const outer = $pos.before(outermostTableDepth($pos));
+      groups.set(outer, [...groups.get(outer) ?? [], pos]);
+    }
+    const next = [];
+    for (const outer of [...groups.keys()].sort((a, b) => b - a)) {
+      const positions = groups.get(outer);
+      const nodes = positions.map((pos) => tr.doc.nodeAt(pos));
+      for (let i = positions.length - 1; i >= 0; i--) {
+        const pos = positions[i];
+        const node = nodes[i];
+        const $pos = tr.doc.resolve(pos);
+        const parent = $pos.parent;
+        const filler = parent.childCount === 1 ? parent.type.contentMatch.defaultType?.createAndFill() : null;
+        if (filler) tr.replaceWith(pos, pos + node.nodeSize, filler);
+        else tr.delete(pos, pos + node.nodeSize);
+      }
+      const table = tr.doc.nodeAt(outer);
+      const after = outer + table.nodeSize;
+      const fragment = Fragment.fromArray(nodes);
+      tr.insert(after, fragment);
+      next.push([after, after + fragment.size]);
+      changed = true;
+    }
+    ranges = next;
+  }
+  return changed;
+}
+function replacesDocument(tr) {
+  return tr.steps.some((step, i) => {
+    const { from, to } = step;
+    return from === 0 && to !== void 0 && to >= tr.docs[i].content.size;
+  });
+}
+var skip = (tr) => !tr.docChanged || tr.getMeta(ALLOW_NESTED_TABLES_META) === true || // Undo/redo and remote collaborative changes restore what was there.
+!!tr.getMeta("history$") || !!tr.getMeta("y-sync$") || // Other plugins' housekeeping, e.g. Track Changes putting a deleted
+// (nested) table back so the deletion can be reviewed.
+!!tr.getMeta("appendedTransaction") || replacesDocument(tr);
+function createTableNestingPlugin() {
+  return new Plugin({
+    key: tableNestingPluginKey,
+    props: {
+      handlePaste: (view, event, slice) => handleTablePasteWithoutNesting(view, event, slice)
+    },
+    appendTransaction(transactions, _oldState, newState) {
+      if (transactions.every(skip)) return null;
+      const ranges = changedRanges(transactions, skip);
+      if (!ranges.length) return null;
+      const tr = newState.tr;
+      if (!unnestTables(tr, ranges)) return null;
+      return tr;
+    }
+  });
+}
+
 // src/extensions/comments.ts
 import { Mark } from "@tiptap/core";
-import { Plugin, PluginKey, TextSelection } from "@tiptap/pm/state";
+import { Plugin as Plugin2, PluginKey as PluginKey2, TextSelection } from "@tiptap/pm/state";
 import { Decoration, DecorationSet } from "@tiptap/pm/view";
-var commentsPluginKey = new PluginKey("comments");
+var commentsPluginKey = new PluginKey2("comments");
 var COMMENT_MARK_NAME = "comment";
 function findCommentRanges(doc) {
   const result = /* @__PURE__ */ new Map();
@@ -218,7 +383,7 @@ var Comments = Mark.create({
       return set;
     };
     return [
-      new Plugin({
+      new Plugin2({
         key: commentsPluginKey,
         props: {
           decorations: (state) => buildDecorations2(state.doc)
@@ -268,171 +433,6 @@ function getCommentAuthor(editor) {
   return ext ? resolveAuthor(ext.options.author) : null;
 }
 
-// src/extensions/table/nesting.ts
-import { Fragment, Slice } from "@tiptap/pm/model";
-import { Plugin as Plugin2, PluginKey as PluginKey2, Selection } from "@tiptap/pm/state";
-import {
-  CellSelection,
-  __pastedCells,
-  handlePaste as handleTablePaste
-} from "@tiptap/pm/tables";
-var ALLOW_NESTED_TABLES_META = "allowNestedTables";
-var tableNestingPluginKey = new PluginKey2("tableNesting");
-var roleOf = (node) => node.type.spec.tableRole;
-var isTableNode = (node) => roleOf(node) === "table";
-function outermostTableDepth($pos) {
-  for (let d = 1; d <= $pos.depth; d++) if (isTableNode($pos.node(d))) return d;
-  return -1;
-}
-function isInTableCell($pos) {
-  for (let d = $pos.depth; d > 0; d--) {
-    const role = roleOf($pos.node(d));
-    if (role === "cell" || role === "header_cell") return true;
-  }
-  return false;
-}
-function sliceContainsTable(content) {
-  const fragment = content instanceof Slice ? content.content : content;
-  let found = false;
-  fragment.descendants((node) => {
-    if (found) return false;
-    if (isTableNode(node)) found = true;
-    return !found;
-  });
-  return found;
-}
-function insertSliceAfterTable(tr, from, to, slice) {
-  const $from = tr.doc.resolve(from);
-  const depth = outermostTableDepth($from);
-  if (depth < 0) return null;
-  const tableStart = $from.before(depth);
-  const tableEnd = $from.after(depth);
-  if (to > from && to < tableEnd) {
-    if (tr.selection instanceof CellSelection && tr.selection.from === from && tr.selection.to === to) {
-      tr.deleteSelection();
-    } else {
-      tr.delete(from, to);
-    }
-  }
-  const table = tr.doc.nodeAt(tableStart);
-  if (!table) return null;
-  const after = tableStart + table.nodeSize;
-  const before = tr.doc.content.size;
-  tr.replace(after, after, new Slice(slice.content, 0, 0));
-  return after + (tr.doc.content.size - before);
-}
-function handleTablePasteWithoutNesting(view, event, slice) {
-  const { state } = view;
-  const { selection } = state;
-  if (outermostTableDepth(selection.$from) < 0) return false;
-  if (selection instanceof CellSelection || __pastedCells(slice)) {
-    if (handleTablePaste(view, event, slice)) return true;
-  }
-  if (!sliceContainsTable(slice)) return false;
-  const tr = state.tr;
-  const end = insertSliceAfterTable(tr, selection.from, selection.to, slice);
-  if (end === null) return false;
-  tr.setSelection(Selection.near(tr.doc.resolve(end), -1));
-  view.dispatch(tr.scrollIntoView().setMeta("paste", true).setMeta("uiEvent", "paste"));
-  return true;
-}
-function changedRanges(transactions, skip2) {
-  let ranges = [];
-  for (const tr of transactions) {
-    const skipped = skip2(tr);
-    for (const step of tr.steps) {
-      const map = step.getMap();
-      ranges = ranges.map(([from, to]) => [map.map(from, 1), map.map(to, -1)]).filter(([from, to]) => to > from);
-      if (skipped) continue;
-      map.forEach((_oldStart, _oldEnd, newStart, newEnd) => {
-        if (newEnd > newStart) ranges.push([newStart, newEnd]);
-      });
-    }
-  }
-  return ranges;
-}
-function findNestedTables(doc, ranges) {
-  const found = /* @__PURE__ */ new Set();
-  for (const [from, to] of ranges) {
-    doc.nodesBetween(from, to, (node, pos) => {
-      if (!isTableNode(node) || pos < from) return true;
-      if (isInTableCell(doc.resolve(pos))) {
-        found.add(pos);
-        return false;
-      }
-      return true;
-    });
-  }
-  const sorted = [...found].sort((a, b) => a - b);
-  const outer = [];
-  for (const pos of sorted) {
-    const last = outer[outer.length - 1];
-    if (last === void 0 || pos >= last + doc.nodeAt(last).nodeSize) outer.push(pos);
-  }
-  return outer;
-}
-function unnestTables(tr, ranges) {
-  let changed = false;
-  for (let round = 0; round < 32 && ranges.length; round++) {
-    const nested = findNestedTables(tr.doc, ranges);
-    if (!nested.length) break;
-    const groups = /* @__PURE__ */ new Map();
-    for (const pos of nested) {
-      const $pos = tr.doc.resolve(pos);
-      const outer = $pos.before(outermostTableDepth($pos));
-      groups.set(outer, [...groups.get(outer) ?? [], pos]);
-    }
-    const next = [];
-    for (const outer of [...groups.keys()].sort((a, b) => b - a)) {
-      const positions = groups.get(outer);
-      const nodes = positions.map((pos) => tr.doc.nodeAt(pos));
-      for (let i = positions.length - 1; i >= 0; i--) {
-        const pos = positions[i];
-        const node = nodes[i];
-        const $pos = tr.doc.resolve(pos);
-        const parent = $pos.parent;
-        const filler = parent.childCount === 1 ? parent.type.contentMatch.defaultType?.createAndFill() : null;
-        if (filler) tr.replaceWith(pos, pos + node.nodeSize, filler);
-        else tr.delete(pos, pos + node.nodeSize);
-      }
-      const table = tr.doc.nodeAt(outer);
-      const after = outer + table.nodeSize;
-      const fragment = Fragment.fromArray(nodes);
-      tr.insert(after, fragment);
-      next.push([after, after + fragment.size]);
-      changed = true;
-    }
-    ranges = next;
-  }
-  return changed;
-}
-function replacesDocument(tr) {
-  return tr.steps.some((step, i) => {
-    const { from, to } = step;
-    return from === 0 && to !== void 0 && to >= tr.docs[i].content.size;
-  });
-}
-var skip = (tr) => !tr.docChanged || tr.getMeta(ALLOW_NESTED_TABLES_META) === true || // Undo/redo and remote collaborative changes restore what was there.
-!!tr.getMeta("history$") || !!tr.getMeta("y-sync$") || // Other plugins' housekeeping, e.g. Track Changes putting a deleted
-// (nested) table back so the deletion can be reviewed.
-!!tr.getMeta("appendedTransaction") || replacesDocument(tr);
-function createTableNestingPlugin() {
-  return new Plugin2({
-    key: tableNestingPluginKey,
-    props: {
-      handlePaste: (view, event, slice) => handleTablePasteWithoutNesting(view, event, slice)
-    },
-    appendTransaction(transactions, _oldState, newState) {
-      if (transactions.every(skip)) return null;
-      const ranges = changedRanges(transactions, skip);
-      if (!ranges.length) return null;
-      const tr = newState.tr;
-      if (!unnestTables(tr, ranges)) return null;
-      return tr;
-    }
-  });
-}
-
 // src/extensions/find-replace/pattern.ts
 var FIND_PARAGRAPH_MARK = "\r";
 var MAX_FIND_PATTERN_LENGTH = 1024;
@@ -2463,14 +2463,6 @@ async function typeAgentText(editor, options) {
 }
 
 export {
-  commentsPluginKey,
-  COMMENT_MARK_NAME,
-  findCommentRanges,
-  getCommentAnchors,
-  getCommentIdsAt,
-  getCommentStore,
-  Comments,
-  getCommentAuthor,
   ALLOW_NESTED_TABLES_META,
   tableNestingPluginKey,
   outermostTableDepth,
@@ -2480,6 +2472,14 @@ export {
   handleTablePasteWithoutNesting,
   unnestTables,
   createTableNestingPlugin,
+  commentsPluginKey,
+  COMMENT_MARK_NAME,
+  findCommentRanges,
+  getCommentAnchors,
+  getCommentIdsAt,
+  getCommentStore,
+  Comments,
+  getCommentAuthor,
   generateStructureId,
   presenceStateSpec,
   arraysEqual,

package/dist/{chunk-UWEQ55MY.cjs → chunk-N4KP3UQR.cjs}

@@ -230,6 +230,162 @@ function matchConditionalTags(tags) {
   return result;
 }
 
+// src/grammar/tokenizer.ts
+function tokenizePrompt(text) {
+  return tokenizePromptWithDiagnostics(text).tokens;
+}
+function getPromptDiagnostics(text) {
+  return tokenizePromptWithDiagnostics(text).diagnostics;
+}
+function tokenizePromptWithDiagnostics(text) {
+  if (!text) {
+    return { tokens: [], diagnostics: [] };
+  }
+  const rawMatches = [];
+  const tmplRegex = new RegExp(TEMPLATE_REGEX.source, TEMPLATE_REGEX.flags);
+  let match;
+  while ((match = tmplRegex.exec(text)) !== null) {
+    rawMatches.push({
+      type: "template",
+      raw: match[0],
+      value: match[1].trim(),
+      start: match.index,
+      end: match.index + match[0].length
+    });
+  }
+  const varRegex = new RegExp(VARIABLE_REGEX.source, VARIABLE_REGEX.flags);
+  while ((match = varRegex.exec(text)) !== null) {
+    const start = match.index;
+    const end = start + match[0].length;
+    const overlaps = rawMatches.some(
+      (m) => !(end <= m.start || start >= m.end)
+    );
+    if (!overlaps) {
+      const parsed = parseVariableBody(match[1]);
+      if (parsed.kind === "conditional") {
+        rawMatches.push({
+          type: "conditional",
+          raw: match[0],
+          value: parsed.name,
+          start,
+          end,
+          conditional: parsed.conditional
+        });
+      } else {
+        const token = {
+          type: "variable",
+          raw: match[0],
+          value: parsed.name,
+          start,
+          end
+        };
+        if (parsed.defaultValue !== void 0) {
+          token.defaultValue = parsed.defaultValue;
+        }
+        if (parsed.description !== void 0) {
+          token.description = parsed.description;
+        }
+        rawMatches.push(token);
+      }
+    }
+  }
+  const instRegex = new RegExp(
+    INSTRUCTION_REGEX.source,
+    INSTRUCTION_REGEX.flags
+  );
+  while ((match = instRegex.exec(text)) !== null) {
+    const start = match.index;
+    const end = start + match[0].length;
+    const overlaps = rawMatches.some(
+      (m) => !(end <= m.start || start >= m.end)
+    );
+    if (!overlaps) {
+      rawMatches.push({
+        type: "instruction",
+        raw: match[0],
+        value: match[1].trim(),
+        start,
+        end
+      });
+    }
+  }
+  rawMatches.sort((a, b) => a.start - b.start);
+  const diagnostics = [];
+  const literal = /* @__PURE__ */ new Set();
+  const conditionals = rawMatches.filter(
+    (m) => m.type === "conditional"
+  );
+  matchConditionalTags(
+    conditionals.map((m) => ({ conditional: m.conditional, name: m.value }))
+  ).forEach((result, i) => {
+    const tag = conditionals[i];
+    const parsed = result.comparison;
+    if (!result.error) {
+      if (_optionalChain([parsed, 'optionalAccess', _2 => _2.comparison]) && tag.conditional !== "end") {
+        tag.value = parsed.subject;
+        tag.comparison = parsed.comparison;
+      }
+      return;
+    }
+    literal.add(tag);
+    if (result.error === "invalid-condition") {
+      if (tag.conditional === "end") return;
+      diagnostics.push({
+        code: result.error,
+        message: `Invalid condition "${tag.raw}": ${_nullishCoalesce(_optionalChain([parsed, 'optionalAccess', _3 => _3.error]), () => ( "malformed comparison"))}`,
+        name: _nullishCoalesce(_optionalChain([parsed, 'optionalAccess', _4 => _4.subject]), () => ( tag.value)),
+        start: tag.start,
+        end: tag.end
+      });
+      return;
+    }
+    diagnostics.push({
+      code: result.error,
+      message: result.error === "unclosed-section" ? `Section "${tag.raw}" is never closed with "{/${tag.value}}"` : `"${tag.raw}" does not close any open section`,
+      name: tag.value,
+      start: tag.start,
+      end: tag.end
+    });
+  });
+  diagnostics.sort((a, b) => a.start - b.start);
+  const tokens = [];
+  let currentIdx = 0;
+  const pushText = (start, end) => {
+    const previous = tokens[tokens.length - 1];
+    if (_optionalChain([previous, 'optionalAccess', _5 => _5.type]) === "text" && previous.end === start) {
+      previous.raw = previous.value = text.slice(previous.start, end);
+      previous.end = end;
+      return;
+    }
+    const textChunk = text.slice(start, end);
+    tokens.push({
+      type: "text",
+      raw: textChunk,
+      value: textChunk,
+      start,
+      end
+    });
+  };
+  for (const m of rawMatches) {
+    if (m.start > currentIdx) {
+      pushText(currentIdx, m.start);
+    }
+    if (literal.has(m)) {
+      pushText(m.start, m.end);
+    } else {
+      tokens.push({ ...m });
+    }
+    currentIdx = m.end;
+  }
+  if (currentIdx < text.length) {
+    pushText(currentIdx, text.length);
+  }
+  return { tokens, diagnostics };
+}
+
+
+
+
 
 
 
@@ -252,4 +408,4 @@ function matchConditionalTags(tags) {
 
 
 
-exports.TEMPLATE_REGEX = TEMPLATE_REGEX; exports.VARIABLE_REGEX = VARIABLE_REGEX; exports.INSTRUCTION_REGEX = INSTRUCTION_REGEX; exports.templateRegex = templateRegex; exports.variableRegex = variableRegex; exports.instructionRegex = instructionRegex; exports.unescapeVariableText = unescapeVariableText; exports.escapeVariableText = escapeVariableText; exports.parseVariableBody = parseVariableBody; exports.isPromptValueSet = isPromptValueSet; exports.getSuppliedValue = getSuppliedValue; exports.evaluateCondition = evaluateCondition; exports.compareConditionValues = compareConditionValues; exports.conditionSubject = conditionSubject; exports.parseComparison = parseComparison; exports.formatComparisonOperand = formatComparisonOperand; exports.formatConditionalTag = formatConditionalTag; exports.describeConditionalTag = describeConditionalTag; exports.parseConditionExpression = parseConditionExpression; exports.evaluateConditionExpression = evaluateConditionExpression; exports.matchConditionalTags = matchConditionalTags;
+exports.TEMPLATE_REGEX = TEMPLATE_REGEX; exports.VARIABLE_REGEX = VARIABLE_REGEX; exports.INSTRUCTION_REGEX = INSTRUCTION_REGEX; exports.templateRegex = templateRegex; exports.variableRegex = variableRegex; exports.instructionRegex = instructionRegex; exports.unescapeVariableText = unescapeVariableText; exports.escapeVariableText = escapeVariableText; exports.parseVariableBody = parseVariableBody; exports.isPromptValueSet = isPromptValueSet; exports.getSuppliedValue = getSuppliedValue; exports.evaluateCondition = evaluateCondition; exports.compareConditionValues = compareConditionValues; exports.conditionSubject = conditionSubject; exports.parseComparison = parseComparison; exports.formatComparisonOperand = formatComparisonOperand; exports.formatConditionalTag = formatConditionalTag; exports.describeConditionalTag = describeConditionalTag; exports.parseConditionExpression = parseConditionExpression; exports.evaluateConditionExpression = evaluateConditionExpression; exports.matchConditionalTags = matchConditionalTags; exports.tokenizePrompt = tokenizePrompt; exports.getPromptDiagnostics = getPromptDiagnostics; exports.tokenizePromptWithDiagnostics = tokenizePromptWithDiagnostics;