@dosgato/templating 0.0.42 → 0.0.45

package/dist/component.d.ts

@@ -92,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
@@ -105,8 +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;
-    renderComponents(components?: RenderedComponent[], opts?: {
+    renderVariation(extension: string): string;
+    renderComponents(components?: RenderedComponent[] | string, opts?: {
         hideInheritBars?: boolean;
     }): string;
     /**
@@ -131,12 +131,12 @@ export declare abstract class Component<DataType extends ComponentData = any, Fe
      *
      * For instance, you could return this.data.title
      */
-    editLabel(): undefined;
+    editLabel(): string | undefined;
     /**
      * Components may override this function to give their edit bars a custom
      * CSS class
      */
-    editClass(): undefined;
+    editClass(): string | undefined;
     /**
      * Components may override this function to give their new bars a custom
      * label
@@ -144,12 +144,12 @@ export declare abstract class Component<DataType extends ComponentData = any, Fe
      * For instance, an area that only accepts 'layout' components could
      * return "Add Layout"
      */
-    newLabel(areaName: string): undefined;
+    newLabel(areaName: string): string | undefined;
     /**
      * Components may override this function to give their new bars a custom
      * CSS class
      */
-    newClass(areaName: string): undefined;
+    newClass(areaName: string): string | undefined;
     /**
      * Components may override this function to provide a custom edit bar
      *
@@ -177,9 +177,9 @@ export declare abstract class Component<DataType extends ComponentData = any, Fe
     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
@@ -225,7 +225,7 @@ export interface EditBarOpts {
 }
 export interface RenderedComponent<C extends Component = Component> {
     component: C;
-    html: string;
+    output: string;
 }
 export declare abstract class Page<DataType extends PageData = any, FetchedType = any, RenderContextType extends ContextBase = any> extends Component<DataType, FetchedType, RenderContextType> {
     pagePath: string;

package/dist/component.js

@@ -79,13 +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('');
+    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.component.inheritedFrom && opts?.hideInheritBars ? [c.html] : [c.component.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
@@ -150,7 +152,7 @@ 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.areas.size > 1 ? `Add ${areaName} Content` : `Add ${this.autoLabel} Content`));
         opts.extraClass ?? (opts.extraClass = this.newClass(areaName));
         opts.editMode ?? (opts.editMode = this.editMode);
         opts.inheritedFrom ?? (opts.inheritedFrom = this.inheritedFrom);

package/dist/render.d.ts

@@ -1,5 +1,5 @@
 import { ContextBase, DataData, PageData, PageRecord } from './component.js';
-import { AssetLink, DataFolderLink, DataLink, LinkDefinition } from './links.js';
+import { AssetLink, DataFolderLink, DataLink, LinkDefinition, PageLink } from './links.js';
 export declare function printHeader(ctx: ContextBase, content: string): string;
 export declare function advanceHeader(ctx: ContextBase, content?: string): {
     headerLevel: number;
@@ -69,20 +69,21 @@ export interface APIClient {
      *
      * Will be dataloaded.
      */
-    getPageData: ({ id, path }: {
+    getPage: ({ id, path, link }: {
         id?: string;
         path?: string;
-    }) => Promise<PageData>;
+        link?: string | PageLink;
+    }) => Promise<PageRecord<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[]>;
+    }) => Promise<PageRecord<PageData>[]>;
     /** Get the pagetree root page from which the specified page descends. */
-    getRootPageData: ({ id, path }: {
+    getRootPage: ({ id, path }: {
         id?: string;
         path?: string;
-    }) => Promise<PageData>;
+    }) => Promise<PageRecord<PageData>>;
     /**
      * Get data entries by link or folder link
      *

package/package.json

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