@dosgato/templating 0.0.124 → 0.0.125

package/dist/component.js

@@ -1,4 +1,4 @@
-import { get, isNotBlank, printIf, titleCase } from 'txstate-utils';
+import { get, isNotBlank, titleCase } from 'txstate-utils';
 import { ResourceProvider } from './provider.js';
 function defaultWrap(info) { return info.output; }
 /**
@@ -286,7 +286,7 @@ export class Page extends Component {
      * Get a URL for the current page with a different extension
      */
     variationUrl(extension) {
-        return `${this.url.replace(/\.\w+$/, '')}.${extension}${printIf(this.url.startsWith('/.edit/'), `?token=${this.reqQuery.token ?? ''}`)}`;
+        return `${this.url.replace(/\.\w+$/, '')}.${extension}`;
     }
     passError(e, path) {
         console.warn(`Recoverable issue occured during render of ${this.pageInfo.path}. Component at ${path} threw the following error:`, e);

package/dist/links.js

@@ -1,6 +1,15 @@
-import { htmlDecode } from 'txstate-utils';
-const LinkRegex = /{[^}]*"type"\s?:\s?"\w+"[^}]*}/g;
-const HTMLEscapedLinkRegex = /{[^}]*"type"\s?:\s?"\w+"[^}]*}/g;
+import { htmlDecode, isNotNull } from 'txstate-utils';
+const LinkRegex = /{[^{}]*"type"\s?:\s?"\w+"[^{}]*}/g;
+const HTMLEscapedLinkRegex = /{[^{}]*"type"\s?:\s?"\w+"[^{}]*}/g;
+function safeParse(json) {
+    try {
+        return JSON.parse(json);
+    }
+    catch (e) {
+        console.error(e, json);
+        return undefined;
+    }
+}
 /**
  * This function is used by template definitions to help them identify links inside large blocks
  * of text and return them for indexing, and by render definitions to help replace them with the actual URLs.
@@ -9,13 +18,13 @@ const HTMLEscapedLinkRegex = /{[^}]*"type"\s?:\s?"\w+"[^}]*}
 export function extractLinksFromText(text) {
     if (!text)
         return [];
-    const matches = Array.from(text.matchAll(LinkRegex)).map(m => JSON.parse(m[0]));
-    const morematches = Array.from(text.matchAll(HTMLEscapedLinkRegex)).map(m => JSON.parse(htmlDecode(m[0])));
+    const matches = Array.from(text.matchAll(LinkRegex)).map(m => safeParse(m[0])).filter(isNotNull);
+    const morematches = Array.from(text.matchAll(HTMLEscapedLinkRegex)).map(m => safeParse(htmlDecode(m[0]))).filter(isNotNull);
     return matches.concat(morematches);
 }
 /**
  * This function is used by render definitions to replace `LinkDefinition` conformant link object text in large
  * blocks with the actual URLs they point to at render time. */
 export function replaceLinksInText(text, resolved) {
-    return text.replace(LinkRegex, m => resolved.get(m) ?? 'dg-broken-link').replace(HTMLEscapedLinkRegex, m => resolved.get(htmlDecode(m)) ?? 'dg-broken-link');
+    return text.replace(LinkRegex, m => resolved.get(m) ?? safeParse(m)?.path ?? 'dg-broken-link').replace(HTMLEscapedLinkRegex, m => resolved.get(htmlDecode(m)) ?? safeParse(htmlDecode(m))?.path ?? 'dg-broken-link');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dosgato/templating",
-  "version": "0.0.124",
+  "version": "0.0.125",
   "description": "A library to support building templates for dosgato CMS.",
   "type": "module",
   "exports": {