@itrocks/template 0.0.27 → 0.0.29

package/README.md

@@ -330,13 +330,13 @@ Result:
 
 ### Climbing Back Up the Data Structure
 
-Use `-` to go back up one level in the data context:
+Begin with a dot (`.`) to navigate up one level in the data context:
 ```ts
 new Template({ name: 'Eddie', data: { age: 30, status: 'well' } })
 	.parseBuffer(`
 		<!--data-->
 		<ol>
-			<li>name: {-.name}</li>
+			<li>name: {.name}</li>
 			<li>age: {age}</li>
 			<li>status: {status}</li>
 		</ol>
@@ -349,6 +349,13 @@ Result:
 <ol><li>name: Eddie</li><li>age: 30</li><li>status: well</li></ol>
 ```
 
+- To climb multiple levels up, add more dots (`.`).
+  Example: `{...name}` moves up three levels before retrieving `name`.
+- dots (`.`) used alone indicate how many levels to move up:
+  - `{.}` refers to the current context (does not move up).
+  - `{..}` moves up one level (parent context).
+  - `{...}` moves up two levels.
+
 ### Simple Literals
 
 Values in quotes inside `{}` are treated as literals:
@@ -390,13 +397,12 @@ You can pass parent or sub-data to your included template as an alternative cont
 ```html
 <div>
   <!--subData-->
-  {./another-template.html-}
-  {./another-template.html(-)}
+  {./another-template.html(..)}
   <!--end-->
   {./another-template.html(subData)}
 </div>
 ```
-In this example, `-` refers to the parent block context. Parentheses are optional in this specific case.
+In this example, `..` refers to the parent context. Parentheses are optional in this specific case.
 
 #### Delimiting Rendered Content in an Included Template
 
@@ -551,7 +557,7 @@ When the template encounters something like {@userId}, it will call myParser to
 
 #### doExpression (boolean)
 
-By default, the template engine attempts to interpret `{...}` and `<!--...-->` blocks as expressions or directives.
+By default, the template engine attempts to interpret `{foo}` and `<!--bar-->` blocks as expressions or directives.
 If you disable `doExpression`, the engine will treat them as literal text and not attempt to parse them.
 
 - Set `template.doExpression = false` if you only want to read the template as-is without any dynamic substitution.

package/cjs/template.js

@@ -1,11 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Template = exports.frontScripts = void 0;
-const rename_1 = __importDefault(require("@itrocks/rename"));
-const app_dir_1 = __importDefault(require("@itrocks/app-dir"));
+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");
@@ -366,6 +363,21 @@ class Template {
             }
             return this.include(expression, data);
         }
+        let onlyDots = true;
+        for (const c of expression) {
+            if (c === '.')
+                continue;
+            onlyDots = false;
+            break;
+        }
+        if (onlyDots) {
+            if (expression.length <= 1) {
+                return (((typeof data)[0] === 'f') && ((data + '')[0] !== 'c'))
+                    ? data.call()
+                    : data;
+            }
+            expression = expression.slice(2);
+        }
         this.blockBack = 0;
         for (const variable of expression.split('.')) {
             data = await this.parseVariable(variable, data);
@@ -374,9 +386,12 @@ class Template {
     }
     async parseVariable(variable, data) {
         if (variable === '') {
-            return (((typeof data)[0] === 'f') && ((data + '')[0] !== 'c'))
-                ? data.call()
-                : data;
+            let dataBack;
+            do {
+                this.blockBack++;
+                dataBack = this.blockStack[this.blockStack.length - this.blockBack];
+            } while (dataBack.condition);
+            return dataBack.data;
         }
         if (variable === '*') {
             return (typeof data === 'object') ? Object.values(data) : data;
@@ -389,21 +404,13 @@ class Template {
             || ((firstChar === "'") && (variable[variable.length - 1] === "'"))) {
             return variable.substring(1, variable.length - 1);
         }
-        if (firstChar === '-') {
-            let dataBack;
-            do {
-                this.blockBack++;
-                dataBack = this.blockStack[this.blockStack.length - this.blockBack];
-            } while (dataBack.condition);
-            return dataBack.data;
-        }
         for (const [prefix, callback] of this.parsers) {
             if (firstChar === prefix) {
                 return callback(variable, data);
             }
         }
         if (data[variable] === undefined) {
-            data = new rename_1.default(data);
+            data = new rename_1.Str(data);
         }
         let value = data[variable];
         return (((typeof value)[0] === 'f') && ((value + '')[0] !== 'c'))
@@ -659,7 +666,7 @@ class Template {
                             }
                             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))
-                                    .substring(app_dir_1.default.length);
+                                    .substring(app_dir_1.appDir.length);
                                 if (node_path_1.sep !== '/') {
                                     frontStyle = frontStyle.replaceAll(node_path_1.sep, '/');
                                 }
@@ -668,7 +675,7 @@ class Template {
                             }
                             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))
-                                    .substring(app_dir_1.default.length);
+                                    .substring(app_dir_1.appDir.length);
                                 if (node_path_1.sep !== '/') {
                                     frontScript = frontScript.replaceAll(node_path_1.sep, '/');
                                 }
@@ -810,7 +817,7 @@ class Template {
         this.start = this.index;
     }
     startsExpression(char, open = '{', close = '}') {
-        return RegExp('[a-z0-9"*.?\'' + open + close + this.prefixes + '-]', 'i').test(char);
+        return RegExp('[a-z0-9"*.?\'' + open + close + this.prefixes + ']', 'i').test(char);
     }
     trimEndLine(string) {
         let index = string.length;

package/esm/template.js

@@ -1,5 +1,5 @@
-import Str from '@itrocks/rename';
-import appDir from '@itrocks/app-dir';
+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';
@@ -361,6 +361,21 @@ export default class Template {
             }
             return this.include(expression, data);
         }
+        let onlyDots = true;
+        for (const c of expression) {
+            if (c === '.')
+                continue;
+            onlyDots = false;
+            break;
+        }
+        if (onlyDots) {
+            if (expression.length <= 1) {
+                return (((typeof data)[0] === 'f') && ((data + '')[0] !== 'c'))
+                    ? data.call()
+                    : data;
+            }
+            expression = expression.slice(2);
+        }
         this.blockBack = 0;
         for (const variable of expression.split('.')) {
             data = await this.parseVariable(variable, data);
@@ -369,9 +384,12 @@ export default class Template {
     }
     async parseVariable(variable, data) {
         if (variable === '') {
-            return (((typeof data)[0] === 'f') && ((data + '')[0] !== 'c'))
-                ? data.call()
-                : data;
+            let dataBack;
+            do {
+                this.blockBack++;
+                dataBack = this.blockStack[this.blockStack.length - this.blockBack];
+            } while (dataBack.condition);
+            return dataBack.data;
         }
         if (variable === '*') {
             return (typeof data === 'object') ? Object.values(data) : data;
@@ -384,14 +402,6 @@ export default class Template {
             || ((firstChar === "'") && (variable[variable.length - 1] === "'"))) {
             return variable.substring(1, variable.length - 1);
         }
-        if (firstChar === '-') {
-            let dataBack;
-            do {
-                this.blockBack++;
-                dataBack = this.blockStack[this.blockStack.length - this.blockBack];
-            } while (dataBack.condition);
-            return dataBack.data;
-        }
         for (const [prefix, callback] of this.parsers) {
             if (firstChar === prefix) {
                 return callback(variable, data);
@@ -805,7 +815,7 @@ export default class Template {
         this.start = this.index;
     }
     startsExpression(char, open = '{', close = '}') {
-        return RegExp('[a-z0-9"*.?\'' + open + close + this.prefixes + '-]', 'i').test(char);
+        return RegExp('[a-z0-9"*.?\'' + open + close + this.prefixes + ']', 'i').test(char);
     }
     trimEndLine(string) {
         let index = string.length;

package/package.json

@@ -67,5 +67,5 @@
 		"test": "jest"
 	},
 	"types": "./esm/template.d.ts",
-	"version": "0.0.27"
+	"version": "0.0.29"
 }