@dosgato/templating 0.0.42 → 0.0.43

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;
     /**
@@ -177,6 +177,7 @@ 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;
@@ -225,7 +226,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

package/package.json

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