@dosgato/templating 0.0.40 → 0.0.43

package/dist/apitemplate.d.ts

@@ -188,11 +188,6 @@ export declare type AnyMigration = ComponentMigration | PageMigration | DataMigr
 export declare type LinkGatheringFn = (data: any) => LinkDefinition[];
 export declare type FulltextGatheringFn = (data: any) => string[];
 export declare type GraphQLQueryFn = <T>(query: string, variables?: any) => Promise<T>;
-/**
- * This function is used by API template definitions to help them identify links inside large blocks
- * of text and return them for indexing.
- */
-export declare function extractLinksFromText(text: string | undefined): LinkDefinition[];
 /**
  * This function is used by API template definitions to help them identify all the searchable
  * words in a large block of text and return them for indexing.

package/dist/apitemplate.js

@@ -5,16 +5,6 @@ export var ValidationMessageType;
     ValidationMessageType["WARNING"] = "warning";
     ValidationMessageType["SUCCESS"] = "success";
 })(ValidationMessageType || (ValidationMessageType = {}));
-/**
- * This function is used by API template definitions to help them identify links inside large blocks
- * of text and return them for indexing.
- */
-export function extractLinksFromText(text) {
-    if (!text)
-        return [];
-    const matches = text.matchAll(/{.*"type"\s?:\s+"\w+".*?}/gi);
-    return Array.from(matches).map(m => JSON.parse(m[0]));
-}
 /**
  * This function is used by API template definitions to help them identify all the searchable
  * words in a large block of text and return them for indexing.

package/dist/component.d.ts

@@ -12,39 +12,6 @@ export declare abstract class Component<DataType extends ComponentData = any, Fe
      * Provide this when you create a template to identify what you are defining.
      */
     static templateKey: string;
-    /**
-     * These functions will be provided by the rendering server
-     */
-    static editBar: (path: string, opts: EditBarOpts) => string;
-    static newBar: (path: string, opts: EditBarOpts) => string;
-    areas: Map<string, Component<any, any, any>[]>;
-    data: Omit<DataType, 'areas'>;
-    fetched: FetchedType;
-    renderCtx: RenderContextType;
-    path: string;
-    parent?: Component;
-    page?: Page;
-    hadError: boolean;
-    autoLabel: () => string;
-    autoNewLabel: () => string;
-    /**
-     * When hydrating an inherited component, the renderer will set this to the id of the page it
-     * came from. You may use this information in any of the phases to alter your behavior if needed.
-     *
-     * For instance, you may decide that your fetch function needs some extra information from the
-     * originating page instead of the page you're being inherited into (your `this.page` will
-     * be the page currently being rendered, NOT the page the inheritable component came from).
-     *
-     * This property is also used to alter the edit bar. Inherited components may never be edited
-     * except on their original page, so the edit bar will render with a link to the original page.
-     */
-    inheritedFrom?: string;
-    /**
-     * This property will be set during page render and you may refer to it at any time to
-     * determine whether you are doing your work in edit mode or regular rendering mode.
-     * The editBar and newBar methods will automatically use it to blank out the editing UI.
-     */
-    editMode: boolean;
     /**
      * The rendering server will provide an instance of the APIClient interface so that
      * you can run any API GraphQL query you like in your `fetch` function. There are also
@@ -56,32 +23,23 @@ export declare abstract class Component<DataType extends ComponentData = any, Fe
      */
     api: APIClient;
     /**
-     * Retrieve the data for the root page of the page this component is on. Useful for
-     * implementing inheritance schemes.
-     *
-     * This function will be provided by the rendering service.
-     *
-     * Do NOT mutate the data returned by this function, as it may be cached and given to
-     * other Component instances.
+     * This property will be set during page render and you may refer to it at any time to
+     * determine whether you are doing your work in edit mode or regular rendering mode.
+     * The editBar and newBar methods will automatically use it to blank out the editing UI.
      */
-    getRootPageData: () => Promise<PageData>;
+    editMode: boolean;
     /**
-     * Retrieve the data for all ancestor pages of the page this component is on. Useful
-     * for implementing inheritance schemes.
+     * When hydrating an inherited component, the renderer will set this to the id of the page it
+     * came from. You may use this information in any of the phases to alter your behavior if needed.
      *
-     * This function will be provided by the rendering service.
+     * For instance, you may decide that your fetch function needs some extra information from the
+     * originating page instead of the page you're being inherited into (your `this.page` will
+     * be the page currently being rendered, NOT the page the inheritable component came from).
      *
-     * Do NOT mutate the data returned by this function, as it may be cached and given to
-     * other Component instances.
-     */
-    getAncestorPageData: () => Promise<PageData[]>;
-    /**
-     * Some components may be inheritable to subpages within the same site. For instance, a site's
-     * social media links may appear on every page's footer. To accomplish this in your template,
-     * you need to fetch the data in your fetch phase and then call this function within your fetch
-     * to let the renderer know it needs to hydrate them and include them in the render.
+     * This property is also used to alter the edit bar. Inherited components may never be edited
+     * except on their original page, so the edit bar will render with a link to the original page.
      */
-    registerInherited: (area: string, components: ComponentData[], top?: true) => void;
+    inheritedFrom?: string;
     /**
      * The first phase of rendering a component is the fetch phase. Each component may
      * provide a fetch method that looks up data it needs from external sources. This step
@@ -91,12 +49,27 @@ export declare abstract class Component<DataType extends ComponentData = any, Fe
      * Place any needed data into the return object, and it will be available to you as `this.fetched`
      * during the rendering phase.
      *
-     * Note that this.page will be available, and getRootPageData and getAncestorPageData are
-     * available in case there is a need for inheritance. If you need to inherit entire components,
-     * you may add them to your this.areas map, e.g.
-     * `this.areas.get('myarea').push(new Component(inheritedData, this.path + '/myarea/inherit1', this))`
+     * Note that `this.page` will be available, and `this.api` has dataloaded methods for retrieving
+     * data from the API if, for instance, you need to inherit information from a parent or root
+     * page. If you need to inherit and render entire components from ancestor pages,
+     * you must register them. See the comment for `this.registerInherited`
+     *
+     * Try to minimize the number of round trips you make here, make use of Promise.all and such;
+     * remember that the api functions are mostly dataloaded so calling them simultaneously is
+     * advantageous where possible.
      */
     fetch(): Promise<FetchedType>;
+    /**
+     * Some components may be inheritable to subpages within the same site. For instance, a site's
+     * social media links may appear on every page's footer. To accomplish this in your template,
+     * you need to fetch ancestor page data in your fetch phase, identify the component data you want
+     * to inherit, and then call this function within your fetch to let the renderer know it needs to
+     * process those components (hydrate them, call their fetch functions, and include them in the render).
+     *
+     * The inherited components will be added to the appropriate area's array in the renderedAreas
+     * parameter of your render function.
+     */
+    registerInherited: (area: string, components: ComponentData[], top?: true) => void;
     /**
      * The second phase of rendering a component is the context phase. This step is TOP-DOWN and
      * NON-MUTATING. Each component will receive the parent component's context and then pass a
@@ -119,7 +92,7 @@ export declare abstract class Component<DataType extends ComponentData = any, Fe
      * render will be passed to parent components so that the HTML can be included during the
      * render of the parent component.
      */
-    abstract render(renderedAreas: Map<string, RenderedComponent[]>): string;
+    abstract render(): string;
     /**
      * Sometimes pages are requested with an alternate extension like .rss or .ics. In these
      * situations, each component should consider whether it should output anything. For
@@ -132,16 +105,8 @@ export declare abstract class Component<DataType extends ComponentData = any, Fe
      * This function will be run after the fetch phase. The context and html rendering phases
      * will be skipped.
      */
-    renderVariation(extension: string, renderedAreas: Map<string, string>): string;
-    constructor(data: DataType, path: string, parent: Component | undefined, editMode: boolean);
-    /**
-     * For logging errors during rendering without crashing the render. If your fetch, setContext,
-     * render, or renderVariation functions throw, the error will be logged but the page render will
-     * continue. You generally do not need to use this function, just throw when appropriate.
-     */
-    logError(e: Error): void;
-    protected passError(e: Error, path: string): void;
-    renderComponents(components?: RenderedComponent[], opts?: {
+    renderVariation(extension: string): string;
+    renderComponents(components?: RenderedComponent[] | string, opts?: {
         hideInheritBars?: boolean;
     }): string;
     /**
@@ -152,6 +117,8 @@ export declare abstract class Component<DataType extends ComponentData = any, Fe
      *
      * This is evaluated after the fetch and context phases but before the rendering phase. If you
      * need any async data to make this determination, be sure to fetch it during the fetch phase.
+     *
+     * You should check `this.editMode` if you need to load CSS that alters edit bars.
      */
     cssBlocks(): string[];
     /**
@@ -195,6 +162,32 @@ export declare abstract class Component<DataType extends ComponentData = any, Fe
      * Generally should not be overridden - override newLabel and newClass instead
      */
     newBar(areaName: string, opts?: EditBarOpts): string;
+    /**
+     * These functions will be provided by the rendering server to assist in the
+     * rendering process.
+     */
+    static editBar: (path: string, opts: EditBarOpts) => string;
+    static newBar: (path: string, opts: EditBarOpts) => string;
+    static repairHTML: (html: string) => string;
+    constructor(data: DataType, path: string, parent: Component | undefined, editMode: boolean);
+    areas: Map<string, Component<any, any, any>[]>;
+    data: Omit<DataType, 'areas'>;
+    fetched: FetchedType;
+    renderCtx: RenderContextType;
+    path: string;
+    parent?: Component;
+    page?: Page;
+    renderedAreas: Map<string, RenderedComponent[]>;
+    hadError: boolean;
+    autoLabel: string;
+    autoNewLabel: string;
+    /**
+     * For logging errors during rendering without crashing the render. If your fetch, setContext,
+     * render, or renderVariation functions throw, the error will be logged but the page render will
+     * continue. You generally do not need to use this function, just throw when appropriate.
+     */
+    logError(e: Error): void;
+    protected passError(e: Error, path: string): void;
 }
 export interface PageRecord<DataType extends PageData = PageData> {
     id: string;
@@ -231,17 +224,25 @@ export interface EditBarOpts {
     editMode?: boolean;
     inheritedFrom?: string;
 }
-export interface RenderedComponent {
-    inherited: boolean;
-    html: string;
-    editbar: string;
+export interface RenderedComponent<C extends Component = Component> {
+    component: C;
+    output: string;
 }
 export declare abstract class Page<DataType extends PageData = any, FetchedType = any, RenderContextType extends ContextBase = any> extends Component<DataType, FetchedType, RenderContextType> {
     pagePath: string;
     /**
-     * we will fill this before rendering, stuff that dosgato knows needs to be added to
-     * the <head> element
-     * the page's render function must include it
+     * This will be filled by the rendering server. The template properties are described
+     * over in apitemplate.ts in the comment for APIPageTemplate.templateProperties.
+     *
+     * The properties will appear in the GraphQL API and the rendering server will automatically
+     * download them and provide them here so all you need to do as a template developer is
+     * reference the values in your fetch/setContext/render functions.
+     */
+    templateProperties: any;
+    /**
+     * This is a bunch of javascript and CSS and meta tags managed by the DosGato engine. It will
+     * be filled by the rendering server and your render function for your page template
+     * should place include it in the <head> element
      */
     headContent: string;
     protected passError(e: Error, path: string): void;

package/dist/component.js

@@ -12,9 +12,9 @@ export class Component extends ResourceProvider {
     // a Component will also construct/hydrate all its child components
     constructor(data, path, parent, editMode) {
         super();
-        // properties for use during hydration, you do not have to provide these when
+        // Properties provided during the rendering process. You do not have to provide these when
         // building a template, but you can use them in the functions you do provide
-        this.areas = new Map();
+        this.areas = new Map(); // a Map of area names and the array of hydrated components in each
         this.editMode = editMode;
         this.parent = parent;
         const { areas, ...ownData } = data;
@@ -37,10 +37,14 @@ export class Component extends ResourceProvider {
      * Place any needed data into the return object, and it will be available to you as `this.fetched`
      * during the rendering phase.
      *
-     * Note that this.page will be available, and getRootPageData and getAncestorPageData are
-     * available in case there is a need for inheritance. If you need to inherit entire components,
-     * you may add them to your this.areas map, e.g.
-     * `this.areas.get('myarea').push(new Component(inheritedData, this.path + '/myarea/inherit1', this))`
+     * Note that `this.page` will be available, and `this.api` has dataloaded methods for retrieving
+     * data from the API if, for instance, you need to inherit information from a parent or root
+     * page. If you need to inherit and render entire components from ancestor pages,
+     * you must register them. See the comment for `this.registerInherited`
+     *
+     * Try to minimize the number of round trips you make here, make use of Promise.all and such;
+     * remember that the api functions are mostly dataloaded so calling them simultaneously is
+     * advantageous where possible.
      */
     async fetch() {
         return undefined;
@@ -75,26 +79,15 @@ export class Component extends ResourceProvider {
      * This function will be run after the fetch phase. The context and html rendering phases
      * will be skipped.
      */
-    renderVariation(extension, renderedAreas) {
-        return Array.from(renderedAreas.values()).join('');
-    }
-    /**
-     * For logging errors during rendering without crashing the render. If your fetch, setContext,
-     * render, or renderVariation functions throw, the error will be logged but the page render will
-     * continue. You generally do not need to use this function, just throw when appropriate.
-     */
-    logError(e) {
-        this.hadError = true;
-        this.passError(e, this.path);
-    }
-    // helper function for recursively passing the error up until it reaches the page
-    passError(e, path) {
-        this.parent?.passError(e, path);
+    renderVariation(extension) {
+        return Array.from(this.renderedAreas.values()).flatMap(ras => ras.map(ra => ra.output)).join('');
     }
     // helper function to help you print an area, but you can also override this if you
     // need to do something advanced like wrap each component in a div
     renderComponents(components = [], opts) {
-        return components.flatMap(c => c.inherited && opts?.hideInheritBars ? [c.html] : [c.editbar, c.html]).join('');
+        if (!Array.isArray(components))
+            components = this.renderedAreas.get(components) ?? [];
+        return components.flatMap(c => c.component.inheritedFrom && opts?.hideInheritBars ? [c.output] : [c.component.editBar(), c.output]).join('');
     }
     /**
      * During rendering, each component should determine the CSS blocks that it needs. This may
@@ -104,6 +97,8 @@ export class Component extends ResourceProvider {
      *
      * This is evaluated after the fetch and context phases but before the rendering phase. If you
      * need any async data to make this determination, be sure to fetch it during the fetch phase.
+     *
+     * You should check `this.editMode` if you need to load CSS that alters edit bars.
      */
     cssBlocks() {
         return Array.from(this.constructor.cssBlocks.keys());
@@ -120,16 +115,12 @@ export class Component extends ResourceProvider {
      *
      * For instance, you could return this.data.title
      */
-    editLabel() {
-        return undefined;
-    }
+    editLabel() { return undefined; }
     /**
      * Components may override this function to give their edit bars a custom
      * CSS class
      */
-    editClass() {
-        return undefined;
-    }
+    editClass() { return undefined; }
     /**
      * Components may override this function to give their new bars a custom
      * label
@@ -137,23 +128,19 @@ export class Component extends ResourceProvider {
      * For instance, an area that only accepts 'layout' components could
      * return "Add Layout"
      */
-    newLabel(areaName) {
-        return undefined;
-    }
+    newLabel(areaName) { return undefined; }
     /**
      * Components may override this function to give their new bars a custom
      * CSS class
      */
-    newClass(areaName) {
-        return undefined;
-    }
+    newClass(areaName) { return undefined; }
     /**
      * Components may override this function to provide a custom edit bar
      *
      * Generally should not be overridden - override editLabel and editClass instead
      */
     editBar(opts = {}) {
-        opts.label ?? (opts.label = this.editLabel() ?? this.autoLabel());
+        opts.label ?? (opts.label = this.editLabel() ?? this.autoLabel);
         opts.extraClass ?? (opts.extraClass = this.editClass());
         opts.editMode ?? (opts.editMode = this.editMode);
         opts.inheritedFrom ?? (opts.inheritedFrom = this.inheritedFrom);
@@ -165,12 +152,25 @@ export class Component extends ResourceProvider {
      * Generally should not be overridden - override newLabel and newClass instead
      */
     newBar(areaName, opts = {}) {
-        opts.label ?? (opts.label = this.newLabel(areaName) ?? this.autoNewLabel());
+        opts.label ?? (opts.label = this.newLabel(areaName) ?? this.autoNewLabel);
         opts.extraClass ?? (opts.extraClass = this.newClass(areaName));
         opts.editMode ?? (opts.editMode = this.editMode);
         opts.inheritedFrom ?? (opts.inheritedFrom = this.inheritedFrom);
         return Component.newBar([this.path, 'areas', areaName].filter(isNotBlank).join('.'), opts);
     }
+    /**
+     * For logging errors during rendering without crashing the render. If your fetch, setContext,
+     * render, or renderVariation functions throw, the error will be logged but the page render will
+     * continue. You generally do not need to use this function, just throw when appropriate.
+     */
+    logError(e) {
+        this.hadError = true;
+        this.passError(e, this.path);
+    }
+    // helper function for recursively passing the error up until it reaches the page
+    passError(e, path) {
+        this.parent?.passError(e, path);
+    }
 }
 export class Page extends Component {
     constructor(page, editMode) {

package/dist/links.d.ts

@@ -63,3 +63,13 @@ export interface DataFolderLink {
     path: string;
 }
 export declare type LinkDefinition = AssetLink | AssetFolderLink | PageLink | WebLink | DataLink | DataFolderLink;
+/**
+ * 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
+ */
+export declare function extractLinksFromText(text: string | undefined): LinkDefinition[];
+/**
+ * This function is used by render definitions to replace links in large blocks with the actual
+ * URLs they point to at render time.
+ */
+export declare function replaceLinksInText(text: string, resolved: Map<string, string>): string;

package/dist/links.js

@@ -1 +1,19 @@
-export {};
+const LinkRegex = /{.*"type"\s?:\s+"\w+".*?}/g;
+/**
+ * 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
+ */
+export function extractLinksFromText(text) {
+    if (!text)
+        return [];
+    const matches = text.matchAll(LinkRegex);
+    return Array.from(matches).map(m => JSON.parse(m[0]));
+}
+/**
+ * This function is used by render definitions to replace links in large blocks with the actual
+ * URLs they point to at render time.
+ */
+export function replaceLinksInText(text, resolved) {
+    // TODO: figure out a broken link to use instead of '#', so it can be detected later
+    return text.replace(LinkRegex, m => resolved.get(m) ?? '#');
+}

package/dist/render.d.ts

@@ -1,4 +1,4 @@
-import { ContextBase, DataData, PageData } from './component.js';
+import { ContextBase, DataData, PageData, PageRecord } from './component.js';
 import { AssetLink, DataFolderLink, DataLink, LinkDefinition } from './links.js';
 export declare function printHeader(ctx: ContextBase, content: string): string;
 export declare function advanceHeader(ctx: ContextBase, content?: string): {
@@ -42,7 +42,7 @@ export interface APIClient {
      */
     query: <T = any>(query: string, variables?: any) => Promise<T>;
     /**
-     * This function will be provided by the rendering server and should be used inside your fetch,
+     * This function will be provided by the rendering server and should be used inside your fetch
      * method to convert a link, as input by a user, into a URL suitable for an href, or optionally
      * an absolute URL suitable for a backend http request or non-HTML document like an RSS feed.
      */
@@ -61,23 +61,40 @@ export interface APIClient {
      * The alt text it returns will be the default alternative text from the asset repository. Alt
      * text gathered from a template's dialog should generally take precedence (though the dialog may
      * preload the alt text field with the asset repository default).
+     *
+     * Will be dataloaded.
      */
     getImgAttributes: (link: string | AssetLink, absolute?: boolean) => Promise<PictureAttributes>;
-    /** Get the data for a specific page. Will be dataloaded. */
+    /** Get the data for a specific page.
+     *
+     * Will be dataloaded.
+     */
     getPageData: ({ id, path }: {
         id?: string;
         path?: string;
     }) => Promise<PageData>;
+    /** Get all ancestor pages of a specific page. First array element will be the pagetree root page. */
+    getAncestors: ({ id, path }: {
+        id?: string;
+        path?: string;
+    }) => Promise<PageRecord[]>;
+    /** Get the pagetree root page from which the specified page descends. */
+    getRootPageData: ({ id, path }: {
+        id?: string;
+        path?: string;
+    }) => Promise<PageData>;
     /**
-     * Get data items
+     * 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.
      */
     getDataByLink: (link: string | DataLink | DataFolderLink) => Promise<DataData[]>;
     /**
-     * Get data 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.
+     * 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.
      */
     getDataByPath: (templateKey: string, path: string) => Promise<DataData[]>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dosgato/templating",
-  "version": "0.0.40",
+  "version": "0.0.43",
   "description": "A library to support building templates for dosgato CMS.",
   "type": "module",
   "exports": {
@@ -15,7 +15,7 @@
   "dependencies": {
     "@iconify/svelte": "^2.2.1",
     "svelte": "^3.48.0",
-    "txstate-utils": "^1.7.1"
+    "txstate-utils": "^1.7.4"
   },
   "devDependencies": {
     "eslint-config-standard-with-typescript": "^22.0.0",