Update to 2.15.1

andr-bot1 · andr-bot1 · commit a95da86eb148 · 2025-01-14T13:40:07.000+02:00
diff --git a/examples/htmlserverload/html/head.html b/examples/htmlserverload/html/head.html
@@ -2,4 +2,6 @@
 	<title>HTML Server Test</title>
 	<link prefix="/assets" href="./style.css" rel="stylesheet" type="text/css"/>
 	<script prefix="/assets" src="./app.js" supername="zetaret.node.examples.htmlserverload.html::app" type="text/javascript"></script>
+	<script id="data-addon" exe="node" js="addDataHeadScript"></script>
+	<script id="data-addon-pretty" exe="node" js="addDataHeadScript2"></script>
 </head>
diff --git a/examples/htmlserverload/html/home.html b/examples/htmlserverload/html/home.html
@@ -2,7 +2,8 @@
 <#template section="head" #>
 <body>
 <span>HTML Server Load Example</span>
-<div>Hello, {{profileName}}</div>
+<div id="profile-name">Hello, {{profileName}}</div>
+<div id="profile-description" exe="node" js="exeProfileDescription">Description: {{profileDescription}}</div>
 <div id="app-screen" exe="node" js="exeAppScreen">
 </div>
 </body>
diff --git a/examples/htmlserverload/server_example.js b/examples/htmlserverload/server_example.js
@@ -44,16 +44,35 @@ for (var p in PAGES) {
 	};
 }
 
-var currentSessionData = { profileName: "LoggedUser1" };
+function exportServerVar(name, json, pretty) {
+	return "var " + name + "=" + JSON.stringify(json, null, pretty ? 2 : null);
+}
+
+var currentSessionData = { profileName: "LoggedUser1", profileDescription: "Logged User Description" };
 
 const watchers = htcache.getWatchers(null, 500, true, true);
-function decorateParser(hpinst, o, p, op, pages) {
+function decorateParser(hpinst, o, p, op) {
 	hpinst.jsonSpace = 2;
-	hpinst.exeMethods.exeAppScreen = function (el, htcache, hpinst, p, op, pages) {
-		console.log("#exe", el);
+	//hpinst.exeDeleteOnSet = true;
+	hpinst.exeMethods.addDataHeadScript = function (el, htcache, hpinst, p, op) {
+		console.log("#addDataHeadScript", p, el);
+		let expvar = { any: { name: "server" }, num: 3, bool: true, tostr: "string", time: new Date().toISOString() };
+		el.elements.push(exportServerVar("exportedVar", expvar));
+	};
+	hpinst.exeMethods.addDataHeadScript2 = function (el, htcache, hpinst, p, op) {
+		console.log("#addDataHeadScript2", p, el);
+		let expvar = { anyData2: { name2: "fromServer" }, num2: 3, bool2: true, tostr2: "string" };
+		el.elements.push(exportServerVar("exportedVar2", expvar, true));
+	};
+	hpinst.exeMethods.exeAppScreen = function (el, htcache, hpinst, p, op) {
+		console.log("#exeAppScreen", p, el);
 		el.elements.push(hpinst.getElement("div", false, { id: "app-screen-inset" }));
 		el.elements.push("\n");
 	};
+	hpinst.exeMethods.exeProfileDescription = function (el, htcache, hpinst, p, op) {
+		console.log("#exeProfileDescription", p, el);
+		el.elements[0] = replaceParams(el.elements[0], currentSessionData);
+	};
 }
 htcache.setPages(PAGES, htmlparser.HTMLParser, watchers, true, decorateParser);
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "protoss-nodejs-basic",
-	"version": "2.15.0",
+	"version": "2.15.1",
 	"author": "Zeta Ret",
 	"license": "MIT",
 	"type": "commonjs",
diff --git a/protossdox.json b/protossdox.json
@@ -9,6 +9,6 @@
 	"relative": true,
 	"markdown": true,
 	"ext": ["js", "ts"],
-	"version": "2.15.0",
+	"version": "2.15.1",
 	"license": "MIT"
 }
diff --git a/utils/html/HTMLCache.js b/utils/html/HTMLCache.js
@@ -86,6 +86,7 @@ class HTMLCache {
 		pdata.execfg = cfg;
 		pdata.binders = {};
 		pdata.content = "";
+		o.execDom(hpinst, page, pdata);
 		o.resetBinders(page);
 		if (cfg.swapjs) o.swapJS(page, cfg.jsh, cfg.despacejs);
 		if (cfg.swapcss) o.swapCSS(page, cfg.cssh, cfg.despacecss);
@@ -127,29 +128,37 @@ class HTMLCache {
 		o.exePage(page, pdata.execfg);
 	}
 
+	execDom(hpinst, id, pdata) {
+		var o = this;
+		var exes = hpinst.search(null, hpinst.exeOn, hpinst.exeAttr);
+		if (exes.length > 0) {
+			exes.forEach((el) => {
+				let method = el.attr[hpinst.exeJS];
+				if (hpinst.exeMethods[method]) {
+					hpinst.exeMethods[method](el, o, hpinst, id, pdata);
+				}
+				if (hpinst.exeDeleteOnSet) {
+					delete el.attr[hpinst.exeOn];
+					delete el.attr[hpinst.exeJS];
+				}
+			});
+		}
+	}
+
 	setPages(pages, HTMLParser, watchers, log, decorateParser) {
 		var o = this;
 		var hpinst, p, op;
 
 		for (p in pages) {
 			op = pages[p];
 			hpinst = new HTMLParser();
-			if (decorateParser) decorateParser(hpinst, o, p, op, pages);
+			if (decorateParser) decorateParser(hpinst, o, p, op);
 			hpinst.useAutomaton = op.useAutomaton || false;
 			hpinst.debug = op.debug || false;
 			if (op.closeTags) hpinst.closeTags = op.closeTags;
 			if (op.cfgParser) op.cfgParser(hpinst, p, op);
 			hpinst.parseFromFile(op.hfile, op.dir);
 			o.addPage(op.id, hpinst, op.hfile, op.dir);
-			var exes = hpinst.search(null, hpinst.exeOn, hpinst.exeAttr);
-			if (exes.length > 0) {
-				exes.forEach((el) => {
-					let method = el.attr[hpinst.exeJS];
-					if (hpinst.exeMethods[method]) {
-						hpinst.exeMethods[method](el, o, hpinst, p, op, pages);
-					}
-				});
-			}
 			if (log) {
 				console.log("\x1b[34m #Get Dom JSON:\x1b[0m");
 				console.log(hpinst.getDomJSON());
diff --git a/utils/html/HTMLCache.json b/utils/html/HTMLCache.json
@@ -3,7 +3,7 @@
 	"description": "HTML page cache utility",
 	"text": "Swap JS/CSS from filepath into tag as relative, cache as page content",
 	"requires": "fs, path, events",
-	"version": "1.8.2",
+	"version": "1.8.3",
 	"date": "2019 - Today",
 	"supername": "zetaret.node.utils.html::HTMLCache",
 	"inherits": null,
@@ -42,7 +42,7 @@
 		"renderContent": "page*: String; return String",
 		"resetBinders": "page*: String",
 		"recache": "page*: String",
-		"setPages": "pages*: Object, HTMLParser*: zetaret.node.utils.html.HTMLParser, watchers: Object, log: Boolean",
+		"setPages": "pages*: Object, HTMLParser*: zetaret.node.utils.html.HTMLParser, watchers: Object, log: Boolean, decorateParser: Function",
 		"swapCSS": "page*: String, handler: Function",
 		"swapJS": "page*: String, handler: Function",
 		"defaultRenderTemplate": "hcache*: zetaret.node.utils.html.HTMLCache, page*: String, pdata*: Object, hpinst*: zetaret.node.utils.html.HTMLParser, cfg*: Object",
diff --git a/utils/html/HTMLCache.md b/utils/html/HTMLCache.md
@@ -2,7 +2,7 @@
 > __HTML page cache utility__  
 # Swap JS/CSS from filepath into tag as relative, cache as page content  
 > *Requires: fs, path, events*  
-> *Version: 1.8.2*  
+> *Version: 1.8.3*  
 > *Date: 2019 - Today*  
 
 __required*__
@@ -132,12 +132,13 @@ __recache(*String* page) : *void*__
 > *return __void__*  
 
 ##  
-__setPages(*Object* pages, *zetaret.node.utils.html.HTMLParser* HTMLParser, *Object* watchers, *Boolean* log) : *void*__  
+__setPages(*Object* pages, *zetaret.node.utils.html.HTMLParser* HTMLParser, *Object* watchers, *Boolean* log, *Function* decorateParser) : *void*__  
   
 - __pages*__ - __*Object*__,   
 - __HTMLParser*__ - __*zetaret.node.utils.html.HTMLParser*__,   
 - watchers - __*Object*__,   
 - log - __*Boolean*__,   
+- decorateParser - __*Function*__,   
 > *return __void__*  
 
 ##  
diff --git a/utils/html/HTMLParser.js b/utils/html/HTMLParser.js
@@ -61,6 +61,7 @@ class HTMLParser {
 		o.exeOn = "exe";
 		o.exeAttr = "node";
 		o.exeJS = "js";
+		o.exeDeleteOnSet = false;
 		o.jsonReplacer = null;
 		o.jsonSpace = null;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "protoss-nodejs-basic",`
`3`		`- "version": "2.15.0",`
	`3`	`+ "version": "2.15.1",`
`4`	`4`	`"author": "Zeta Ret",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"type": "commonjs",`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@`
`9`	`9`	`"relative": true,`
`10`	`10`	`"markdown": true,`
`11`	`11`	`"ext": ["js", "ts"],`
`12`		`- "version": "2.15.0",`
	`12`	`+ "version": "2.15.1",`
`13`	`13`	`"license": "MIT"`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ class HTMLParser {`
`61`	`61`	`o.exeOn = "exe";`
`62`	`62`	`o.exeAttr = "node";`
`63`	`63`	`o.exeJS = "js";`
	`64`	`+ o.exeDeleteOnSet = false;`
`64`	`65`	`o.jsonReplacer = null;`
`65`	`66`	`o.jsonSpace = null;`
`66`	`67`	`}`