@dosgato/templating 0.0.124 → 0.0.126

package/dist/apitemplate.d.ts

@@ -1,5 +1,5 @@
-import { ComponentData, DataData, PageData } from './component.js';
-import { LinkDefinition } from './links.js';
+import type { ComponentData, DataData, PageData } from './component.js';
+import { type LinkDefinition } from './links.js';
 export type APITemplateType = 'page' | 'component' | 'data';
 export declare enum ValidationMessageType {
     ERROR = "error",

package/dist/component.d.ts

@@ -3,7 +3,7 @@
 import type { IncomingHttpHeaders } from 'http';
 import type { ParsedUrlQuery } from 'querystring';
 import { ResourceProvider } from './provider.js';
-import { APIClient } from './render.js';
+import { type APIClient } from './render.js';
 /**
  * This is the primary templating class to build your templates. Subclass it and provide
  * at least a render function.

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/dist/provider.js

@@ -8,7 +8,7 @@
  *
  * If you do this, don't forget to register the provider along with your templates!
  */
-export class ResourceProvider {
+class ResourceProvider {
     static webpath(name) { return this.webpaths.get(name); }
 }
 /**
@@ -86,3 +86,4 @@ ResourceProvider.files = new Map();
  * `<img src="${TemplateClass.webpath('keyname')}">`
  */
 ResourceProvider.webpaths = new Map();
+export { ResourceProvider };

package/dist/render.d.ts

@@ -1,5 +1,5 @@
-import { ContextBase, DataData, PageData, PageRecord, PageRecordOptionalData } from './component.js';
-import { AssetFolderLink, AssetLink, DataFolderLink, DataLink, LinkDefinition, PageLink } from './links.js';
+import type { ContextBase, DataData, PageData, PageRecord, PageRecordOptionalData } from './component.js';
+import type { AssetFolderLink, AssetLink, DataFolderLink, DataLink, LinkDefinition, PageLink } from './links.js';
 /**
  * Safely encapsulates `content` in header tags based on the `ctx` context passed and adds any passed `attributes` to the header tagging.
  * If the headerLevel passed through `ctx` is outside the range of 1..6 the header tag generated is normalized to the nearest value of 1 or 6.
@@ -52,6 +52,14 @@ export interface AssetRecord {
     downloadLink: string;
     image?: PictureAttributes;
 }
+export interface DataRecord {
+    id: string;
+    path: string;
+    name: string;
+    modifiedAt?: Date;
+    publishedAt?: Date;
+    data: DataData;
+}
 export interface PageForNavigation {
     id: string;
     name: string;
@@ -249,14 +257,22 @@ export interface APIClient {
      * Get data entries by link or folder link
      *
      * Returns an array in case link is a DataFolderLink. If link is a DataLink, will return an
-     * array with length <= 1.
+     * array with length <= 1. If link is a DataFolderLink to a DataRoot, returns all descendant data
+     * recursively.
+     *
+     * Never returns deleted or unpublished data, and only returns the published version
+     * of a piece of data, even in edit mode.
      */
-    getDataByLink: (link: string | DataLink | DataFolderLink) => Promise<DataData[]>;
+    getDataByLink: (link: string | DataLink | DataFolderLink) => Promise<DataRecord[]>;
     /**
      * Get data entries by full path including site
      *
      * Use '/global' for global data. If path refers to a specific data item, will return
-     * an array with length <= 1.
+     * an array with length <= 1. If path refers to a DataRoot, returns all descendant
+     * data recursively.
+     *
+     * Never returns deleted or unpublished data, and only returns the published version
+     * of a piece of data, even in edit mode.
      */
-    getDataByPath: (templateKey: string, path: string) => Promise<DataData[]>;
+    getDataByPath: (templateKey: string, path: string) => Promise<DataRecord[]>;
 }

package/dist/uitemplate.d.ts

@@ -1,4 +1,4 @@
-import { ComponentData, PageData } from './component.js';
+import type { ComponentData, PageData } from './component.js';
 interface IconifyIcon {
     body: string;
     rotate?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dosgato/templating",
-  "version": "0.0.124",
+  "version": "0.0.126",
   "description": "A library to support building templates for dosgato CMS.",
   "type": "module",
   "exports": {
@@ -18,8 +18,8 @@
   },
   "devDependencies": {
     "@types/node": "^18.7.11",
-    "eslint-config-standard-with-typescript": "^26.0.0",
-    "typescript": "^4.4.2"
+    "eslint-config-standard-with-typescript": "^34.0.0",
+    "typescript": "^5.0.4"
   },
   "repository": {
     "type": "git",