@pixerate/editor 0.13.0 → 0.14.0

package/dist/index.cjs

@@ -66,6 +66,8 @@ __export(src_exports, {
   SmilieReplacer: () => SmilieReplacer,
   SpreadsheetController: () => SpreadsheetController,
   StreamingLayoutManager: () => StreamingLayoutManager,
+  TEMPLATE_DEPTH_ERROR: () => TEMPLATE_DEPTH_ERROR,
+  TEMPLATE_LOOP_ERROR: () => TEMPLATE_LOOP_ERROR,
   TEMPLATE_REGEX: () => TEMPLATE_REGEX,
   TemplateSuggestions: () => TemplateSuggestions,
   VARIABLE_REGEX: () => VARIABLE_REGEX,
@@ -111,6 +113,7 @@ __export(src_exports, {
   getEditorText: () => getEditorText,
   getLatestVersion: () => getLatestVersion,
   getLayoutedNodes: () => getLayoutedNodes,
+  getTemplateBody: () => getTemplateBody,
   getViewportMetrics: () => getViewportMetrics,
   globalImageCache: () => globalImageCache,
   handleImageInsertion: () => handleImageInsertion,
@@ -280,6 +283,18 @@ function getLatestVersion(template) {
   }
   return template.versions[template.versions.length - 1];
 }
+var TEMPLATE_LOOP_ERROR = "[Template loop detected]";
+var TEMPLATE_DEPTH_ERROR = "[Template max depth exceeded]";
+function getTemplateBody(template, bindings) {
+  const boundVersionId = bindings?.[template.name];
+  if (boundVersionId && template.versions) {
+    const boundVersion = template.versions.find(
+      (v) => v.id === boundVersionId || v.version === boundVersionId
+    );
+    return boundVersion?.body;
+  }
+  return getLatestVersion(template)?.body ?? template.body;
+}
 function resolveTemplates(text, templates = [], options) {
   const templateMap = /* @__PURE__ */ new Map();
   for (const t of templates) {
@@ -287,50 +302,27 @@ function resolveTemplates(text, templates = [], options) {
   }
   const maxDepth = options?.maxDepth ?? 10;
   function resolveRecursive(currentText, visited, depth) {
-    if (depth > maxDepth) {
-      return "[Template max depth exceeded]";
-    }
-    let result = currentText;
     const regex = new RegExp(TEMPLATE_REGEX.source, TEMPLATE_REGEX.flags);
-    let match;
-    while ((match = regex.exec(result)) !== null) {
-      const [fullMatch, rawTemplateName] = match;
+    return currentText.replace(regex, (fullMatch, rawTemplateName) => {
       const templateName = rawTemplateName.trim();
       if (visited.has(templateName)) {
-        return "[Template loop detected]";
+        return TEMPLATE_LOOP_ERROR;
       }
       const template = templateMap.get(templateName);
       if (!template) {
-        continue;
-      }
-      let versionBody;
-      const boundVersionId = options?.bindings?.[templateName];
-      if (boundVersionId && template.versions) {
-        const boundVersion = template.versions.find(
-          (v) => v.id === boundVersionId || v.version === boundVersionId
-        );
-        versionBody = boundVersion?.body;
-      } else {
-        const latest = getLatestVersion(template);
-        versionBody = latest?.body ?? template.body;
+        return fullMatch;
       }
+      const versionBody = getTemplateBody(template, options?.bindings);
       if (versionBody === void 0) {
-        continue;
+        return fullMatch;
+      }
+      if (depth + 1 > maxDepth) {
+        return TEMPLATE_DEPTH_ERROR;
       }
       const nextVisited = new Set(visited);
       nextVisited.add(templateName);
-      const resolvedBody = resolveRecursive(
-        versionBody,
-        nextVisited,
-        depth + 1
-      );
-      if (resolvedBody === "[Template loop detected]" || resolvedBody === "[Template max depth exceeded]") {
-        return resolvedBody;
-      }
-      result = result.replace(fullMatch, resolvedBody);
-      regex.lastIndex = 0;
-    }
-    return result;
+      return resolveRecursive(versionBody, nextVisited, depth + 1);
+    });
   }
   return resolveRecursive(text, /* @__PURE__ */ new Set(), 0);
 }
@@ -379,7 +371,7 @@ function extractInstructionNames(text) {
 }
 
 // src/grammar/sourcemap.ts
-function resolveTemplatesWithMapping(text, templates = [], templateBindings) {
+function resolveTemplatesWithMapping(text, templates = [], templateBindings, options) {
   if (!templates || templates.length === 0 || !text.includes("{{")) {
     return {
       text,
@@ -395,7 +387,7 @@ function resolveTemplatesWithMapping(text, templates = [], templateBindings) {
     };
   }
   const templateMap = new Map(templates.map((t) => [t.name, t]));
-  const regex = /{{\s*([^}]+?)\s*}}/g;
+  const regex = new RegExp(TEMPLATE_REGEX.source, TEMPLATE_REGEX.flags);
   let match;
   let lastIndex = 0;
   let resolvedText = "";
@@ -417,25 +409,13 @@ function resolveTemplatesWithMapping(text, templates = [], templateBindings) {
     }
     let resolvedBody = fullMatch;
     let isTemplate = false;
-    if (templateMap.has(templateName)) {
-      const template = templateMap.get(templateName);
-      let versionBody;
-      const boundVersionId = templateBindings?.[templateName];
-      if (boundVersionId && template.versions) {
-        const boundVersion = template.versions.find(
-          (v) => v.id === boundVersionId || v.version === boundVersionId
-        );
-        versionBody = boundVersion?.body;
-      } else {
-        const latestVersion = getLatestVersion(template);
-        versionBody = latestVersion?.body ?? template.body;
-      }
-      if (versionBody !== void 0) {
-        resolvedBody = resolveTemplates(versionBody, templates, {
-          bindings: templateBindings
-        });
-        isTemplate = true;
-      }
+    const template = templateMap.get(templateName);
+    if (template && getTemplateBody(template, templateBindings) !== void 0) {
+      resolvedBody = resolveTemplates(fullMatch, templates, {
+        bindings: templateBindings,
+        maxDepth: options?.maxDepth
+      });
+      isTemplate = true;
     }
     if (isTemplate) {
       map.push({
@@ -480,9 +460,11 @@ function mapResolvedOffsetToRaw(resolvedOffset, map) {
     if (inRange) {
       if (seg.source === "raw") {
         return seg.rawStart + (resolvedOffset - seg.resolvedStart);
-      } else {
-        return seg.rawStart;
       }
+      if (resolvedOffset === seg.resolvedEnd) {
+        return seg.rawEnd;
+      }
+      return seg.rawStart;
     }
   }
   return resolvedOffset;
@@ -495,9 +477,11 @@ function mapRawOffsetToResolved(rawOffset, map) {
     if (inRange) {
       if (seg.source === "raw") {
         return seg.resolvedStart + (rawOffset - seg.rawStart);
-      } else {
-        return seg.resolvedStart;
       }
+      if (rawOffset === seg.rawEnd) {
+        return seg.resolvedEnd;
+      }
+      return seg.resolvedStart;
     }
   }
   return rawOffset;
@@ -7025,6 +7009,8 @@ function hitTestAnnotation(imgPt, ann, padding = 10) {
   SmilieReplacer,
   SpreadsheetController,
   StreamingLayoutManager,
+  TEMPLATE_DEPTH_ERROR,
+  TEMPLATE_LOOP_ERROR,
   TEMPLATE_REGEX,
   TemplateSuggestions,
   VARIABLE_REGEX,
@@ -7070,6 +7056,7 @@ function hitTestAnnotation(imgPt, ann, padding = 10) {
   getEditorText,
   getLatestVersion,
   getLayoutedNodes,
+  getTemplateBody,
   getViewportMetrics,
   globalImageCache,
   handleImageInsertion,