@itrocks/template 0.0.41 → 0.1.0

package/cjs/template.d.ts

@@ -1,4 +1,8 @@
 import { SortedArray } from '@itrocks/sorted-array';
+export type Dependencies = {
+    toString: (value: any) => Promise<string>;
+};
+export declare const depends: Dependencies;
 type BlockStackEntry = {
     blockStart: number;
     condition?: boolean;
@@ -14,6 +18,13 @@ type Final = '' | '-->';
 type Open = '(' | '{';
 export type VariableParser = [parser: string, (variable: string, data: any) => any];
 export declare const frontScripts: SortedArray<string>;
+export declare function templateDependsOn(dependencies: Partial<Dependencies>): void;
+export declare class HtmlResponse {
+    html: string;
+    dependencies: string[];
+    constructor(html: string, ...dependencies: string[]);
+    toString(): string;
+}
 export declare class Template {
     data?: any;
     containerData?: any;
@@ -60,6 +71,7 @@ export declare class Template {
     closeTag(shouldInLiteral: boolean, targetIndex: number): boolean;
     combineLiterals(text: string, parts?: string[]): string;
     debugEvents(): void;
+    embedHtmlResponse(htmlResponse: HtmlResponse): void;
     getCleanContext(): {
         addLinks: SortedArray<string>;
         doHeadLinks: boolean;

package/cjs/template.js

@@ -1,14 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Template = exports.frontScripts = void 0;
+exports.Template = exports.HtmlResponse = exports.frontScripts = exports.depends = void 0;
+exports.templateDependsOn = templateDependsOn;
 const app_dir_1 = require("@itrocks/app-dir");
 const rename_1 = require("@itrocks/rename");
 const sorted_array_1 = require("@itrocks/sorted-array");
 const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
+const node_path_2 = require("node:path");
+exports.depends = {
+    toString: async (value) => '' + value
+};
 const done = { done: true };
 exports.frontScripts = new sorted_array_1.SortedArray();
 exports.frontScripts.distinct = true;
+function templateDependsOn(dependencies) {
+    Object.assign(exports.depends, dependencies);
+}
+class HtmlResponse {
+    html;
+    dependencies;
+    constructor(html, ...dependencies) {
+        this.html = html;
+        this.dependencies = dependencies;
+    }
+    toString() { return this.html; }
+}
+exports.HtmlResponse = HtmlResponse;
 class Template {
     data;
     containerData;
@@ -111,6 +129,28 @@ class Template {
         this.onTagOpened = (name) => console.log('tag.opened =', name);
         this.onTagClose = (name) => console.log('tag.closed =', name);
     }
+    embedHtmlResponse(htmlResponse) {
+        for (let dependency of htmlResponse.dependencies) {
+            if (dependency[0] === '<') {
+                const script = dependency.match(/<script[^>]*\bsrc=["']([^"']+)["']/i)?.[1];
+                if (script) {
+                    exports.frontScripts.insert(script);
+                }
+                this.headLinks.insert(dependency);
+                continue;
+            }
+            dependency = (0, node_path_1.normalize)(dependency).slice(app_dir_1.appDir.length);
+            switch (dependency.slice(dependency.lastIndexOf('.') + 1)) {
+                case 'css':
+                    this.headLinks.insert('<link href="' + dependency + '" rel="stylesheet">');
+                    continue;
+                case 'js':
+                    exports.frontScripts.insert(dependency);
+                    this.headLinks.insert('<script src="' + dependency + '" type="module"></script>');
+                    continue;
+            }
+        }
+    }
     getCleanContext() {
         const addLinks = new sorted_array_1.SortedArray;
         const doneLinks = new sorted_array_1.SortedArray;
@@ -166,9 +206,9 @@ class Template {
         template.onTagOpen = this.onTagOpen;
         template.onTagOpened = this.onTagOpened;
         template.parsers = this.parsers;
-        const parsed = await template.parseFile(((path[0] === node_path_1.sep) || (path[1] === ':'))
+        const parsed = await template.parseFile(((path[0] === node_path_2.sep) || (path[1] === ':'))
             ? path
-            : (this.filePath + node_path_1.sep + path));
+            : (this.filePath + node_path_2.sep + path));
         if (!this.doHeadLinks) {
             this.addLinks.push(...template.headLinks);
             this.headTitle = template.headTitle;
@@ -342,8 +382,8 @@ class Template {
             this.data = Object.assign({ content: () => this.include(fileName, data) }, this.blockStack[0]?.data);
             return this.parseFile((0, node_path_1.normalize)(containerFileName));
         }
-        this.fileName = fileName.substring(fileName.lastIndexOf(node_path_1.sep) + 1);
-        this.filePath = fileName.substring(0, fileName.lastIndexOf(node_path_1.sep));
+        this.fileName = fileName.substring(fileName.lastIndexOf(node_path_2.sep) + 1);
+        this.filePath = fileName.substring(0, fileName.lastIndexOf(node_path_2.sep));
         return this.parseBuffer(await (0, promises_1.readFile)(fileName, 'utf-8'));
     }
     async parsePath(expression, data) {
@@ -388,6 +428,9 @@ class Template {
         for (const variable of expression.split('.')) {
             data = await this.parseVariable(variable, data);
         }
+        if (data instanceof HtmlResponse) {
+            this.embedHtmlResponse(data);
+        }
         return data;
     }
     async parseVariable(variable, data) {
@@ -416,7 +459,7 @@ class Template {
             }
         }
         if (data[variable] === undefined) {
-            data = new rename_1.Str(data);
+            data = new rename_1.Str(await exports.depends.toString(data));
         }
         let value = data[variable];
         return (((typeof value)[0] === 'f') && ((value + '')[0] !== 'c'))
@@ -675,19 +718,19 @@ class Template {
                                 this.literalTarget(this.index);
                             }
                             if (inLinkHRef && attributeValue.endsWith('.css')) {
-                                let frontStyle = (0, node_path_1.normalize)(this.filePath + node_path_1.sep + this.source.substring(this.start, this.index))
+                                let frontStyle = (0, node_path_1.normalize)(this.filePath + node_path_2.sep + this.source.substring(this.start, this.index))
                                     .substring(app_dir_1.appDir.length);
-                                if (node_path_1.sep !== '/') {
-                                    frontStyle = frontStyle.replaceAll(node_path_1.sep, '/');
+                                if (node_path_2.sep !== '/') {
+                                    frontStyle = frontStyle.replaceAll(node_path_2.sep, '/');
                                 }
                                 this.target += frontStyle;
                                 this.start = this.index;
                             }
                             if (inScriptSrc && attributeValue.endsWith('.js')) {
-                                let frontScript = (0, node_path_1.normalize)(this.filePath + node_path_1.sep + this.source.substring(this.start, this.index))
+                                let frontScript = (0, node_path_1.normalize)(this.filePath + node_path_2.sep + this.source.substring(this.start, this.index))
                                     .substring(app_dir_1.appDir.length);
-                                if (node_path_1.sep !== '/') {
-                                    frontScript = frontScript.replaceAll(node_path_1.sep, '/');
+                                if (node_path_2.sep !== '/') {
+                                    frontScript = frontScript.replaceAll(node_path_2.sep, '/');
                                 }
                                 exports.frontScripts.insert(frontScript);
                                 this.target += frontScript;
@@ -725,7 +768,7 @@ class Template {
                         this.index = this.source.indexOf('data-end', this.index) + 8;
                         if (this.index < 8) {
                             throw 'Missing data-end matching data-if at position ' + attributePosition
-                                + ' into template file ' + this.filePath + node_path_1.sep + this.fileName;
+                                + ' into template file ' + this.filePath + node_path_2.sep + this.fileName;
                         }
                     }
                     this.start = this.index;

package/esm/template.d.ts

@@ -1,4 +1,8 @@
 import { SortedArray } from '@itrocks/sorted-array';
+export type Dependencies = {
+    toString: (value: any) => Promise<string>;
+};
+export declare const depends: Dependencies;
 type BlockStackEntry = {
     blockStart: number;
     condition?: boolean;
@@ -14,6 +18,13 @@ type Final = '' | '-->';
 type Open = '(' | '{';
 export type VariableParser = [parser: string, (variable: string, data: any) => any];
 export declare const frontScripts: SortedArray<string>;
+export declare function templateDependsOn(dependencies: Partial<Dependencies>): void;
+export declare class HtmlResponse {
+    html: string;
+    dependencies: string[];
+    constructor(html: string, ...dependencies: string[]);
+    toString(): string;
+}
 export declare class Template {
     data?: any;
     containerData?: any;
@@ -60,6 +71,7 @@ export declare class Template {
     closeTag(shouldInLiteral: boolean, targetIndex: number): boolean;
     combineLiterals(text: string, parts?: string[]): string;
     debugEvents(): void;
+    embedHtmlResponse(htmlResponse: HtmlResponse): void;
     getCleanContext(): {
         addLinks: SortedArray<string>;
         doHeadLinks: boolean;

package/esm/template.js

@@ -2,10 +2,26 @@ import { appDir } from '@itrocks/app-dir';
 import { Str } from '@itrocks/rename';
 import { SortedArray } from '@itrocks/sorted-array';
 import { readFile } from 'node:fs/promises';
-import { normalize, sep } from 'node:path';
+import { normalize } from 'node:path';
+import { sep } from 'node:path';
+export const depends = {
+    toString: async (value) => '' + value
+};
 const done = { done: true };
 export const frontScripts = new SortedArray();
 frontScripts.distinct = true;
+export function templateDependsOn(dependencies) {
+    Object.assign(depends, dependencies);
+}
+export class HtmlResponse {
+    html;
+    dependencies;
+    constructor(html, ...dependencies) {
+        this.html = html;
+        this.dependencies = dependencies;
+    }
+    toString() { return this.html; }
+}
 export class Template {
     data;
     containerData;
@@ -108,6 +124,28 @@ export class Template {
         this.onTagOpened = (name) => console.log('tag.opened =', name);
         this.onTagClose = (name) => console.log('tag.closed =', name);
     }
+    embedHtmlResponse(htmlResponse) {
+        for (let dependency of htmlResponse.dependencies) {
+            if (dependency[0] === '<') {
+                const script = dependency.match(/<script[^>]*\bsrc=["']([^"']+)["']/i)?.[1];
+                if (script) {
+                    frontScripts.insert(script);
+                }
+                this.headLinks.insert(dependency);
+                continue;
+            }
+            dependency = normalize(dependency).slice(appDir.length);
+            switch (dependency.slice(dependency.lastIndexOf('.') + 1)) {
+                case 'css':
+                    this.headLinks.insert('<link href="' + dependency + '" rel="stylesheet">');
+                    continue;
+                case 'js':
+                    frontScripts.insert(dependency);
+                    this.headLinks.insert('<script src="' + dependency + '" type="module"></script>');
+                    continue;
+            }
+        }
+    }
     getCleanContext() {
         const addLinks = new SortedArray;
         const doneLinks = new SortedArray;
@@ -385,6 +423,9 @@ export class Template {
         for (const variable of expression.split('.')) {
             data = await this.parseVariable(variable, data);
         }
+        if (data instanceof HtmlResponse) {
+            this.embedHtmlResponse(data);
+        }
         return data;
     }
     async parseVariable(variable, data) {
@@ -413,7 +454,7 @@ export class Template {
             }
         }
         if (data[variable] === undefined) {
-            data = new Str(data);
+            data = new Str(await depends.toString(data));
         }
         let value = data[variable];
         return (((typeof value)[0] === 'f') && ((value + '')[0] !== 'c'))

package/package.json

@@ -69,5 +69,5 @@
 		"test": "test/test"
 	},
 	"types": "./esm/template.d.ts",
-	"version": "0.0.41"
+	"version": "0.1.0"
 }