@itrocks/template 0.0.25 → 0.0.27

package/README.md

@@ -377,13 +377,27 @@ Result:
 
 ### Including Another Template
 
-Any expression starting with `./` or `../` is considered a template include:
+Any expression starting with `/`, `./` or `../` is considered a template include:
 ```html
 <div>
 	{./another-template.html}
 </div>
 ```
 
+The default contextual data is the one in the current scope.
+
+You can pass parent or sub-data to your included template as an alternative context:
+```html
+<div>
+  <!--subData-->
+  {./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.
+
 #### Delimiting Rendered Content in an Included Template
 
 To keep templates W3C-compliant and browser-viewable, each HTML template may contain full HTML structure.

package/cjs/template.d.ts

@@ -1,11 +1,12 @@
 import { SortedArray } from '@itrocks/sorted-array';
-type BlockStack = {
+type BlockStackEntry = {
     blockStart: number;
     collection: any[];
+    condition?: boolean;
     data: any;
     iteration: number;
     iterations: number;
-}[];
+};
 export type VariableParser = [parser: string, (variable: string, data: any) => any];
 export declare const frontScripts: SortedArray<string>;
 export { Template };
@@ -13,7 +14,7 @@ export default class Template {
     data?: any;
     containerData?: any;
     blockBack: number;
-    blockStack: BlockStack;
+    blockStack: BlockStackEntry[];
     doExpression: boolean;
     index: number;
     length: number;

package/cjs/template.js

@@ -16,7 +16,7 @@ class Template {
     containerData;
     // block stack
     blockBack = 0;
-    blockStack;
+    blockStack = [];
     // parser
     doExpression = true;
     index = 0;
@@ -65,7 +65,6 @@ class Template {
         this.addLinks.distinct = true;
         this.doneLinks.distinct = true;
         this.headLinks.distinct = true;
-        this.blockStack = [];
         if (containerData) {
             this.blockStack.push({ blockStart: 0, collection: [], data: containerData, iteration: 0, iterations: 1 });
         }
@@ -177,7 +176,11 @@ class Template {
         }
         this.headLinks.push(...template.headLinks);
         this.headTitle = template.headTitle;
-        return parsed.substring(parsed.indexOf('<!--BEGIN-->') + 12, parsed.indexOf('<!--END-->'));
+        const beginPosition = parsed.indexOf('<!--BEGIN-->');
+        const endPosition = parsed.indexOf('<!--END-->');
+        return (beginPosition > -1)
+            ? parsed.slice(beginPosition + 12, (endPosition > -1) ? endPosition : parsed.length)
+            : parsed;
     }
     isContextClean() {
         const clean = this.getCleanContext();
@@ -301,7 +304,7 @@ class Template {
                 if (conditional && !parsed) {
                     if ((typeof this.target)[0] === 's') {
                         this.target = this.target.substring(0, this.target.lastIndexOf(' '));
-                        while ((this.index < this.length) && !' \n\r\t\f'.includes(this.source[this.index])) {
+                        while ((this.index < this.length) && !' >\n\r\t\f'.includes(this.source[this.index])) {
                             this.index++;
                             this.start++;
                         }
@@ -344,7 +347,23 @@ class Template {
         if (expression === '') {
             return undefined;
         }
-        if ((expression[0] === '.') && (expression.startsWith('./') || expression.startsWith('../'))) {
+        if (((expression[0] === '.') && ((expression[1] === '/') || ((expression[1] === '.') && (expression[2] === '/'))))
+            || (expression[0] === '/')) {
+            let expressionEnd = expression.length - 1;
+            if (expression[expressionEnd] === '-') {
+                let blockBack = 1;
+                expressionEnd--;
+                while (expression[expressionEnd] === '-') {
+                    blockBack++;
+                    expressionEnd--;
+                }
+                const blockStack = this.blockStack;
+                return this.include(expression.slice(0, expressionEnd), blockStack[blockStack.length - blockBack].data);
+            }
+            if (expression[expressionEnd] === ')') {
+                const openPosition = expression.lastIndexOf('(');
+                return this.include(expression.slice(0, openPosition), await this.parsePath(expression.slice(openPosition + 1, expression.length - 1), data));
+            }
             return this.include(expression, data);
         }
         this.blockBack = 0;
@@ -355,7 +374,7 @@ class Template {
     }
     async parseVariable(variable, data) {
         if (variable === '') {
-            return (typeof data === 'function')
+            return (((typeof data)[0] === 'f') && ((data + '')[0] !== 'c'))
                 ? data.call()
                 : data;
         }
@@ -371,8 +390,12 @@ class Template {
             return variable.substring(1, variable.length - 1);
         }
         if (firstChar === '-') {
-            this.blockBack++;
-            return this.blockStack[this.blockStack.length - this.blockBack].data;
+            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) {
@@ -383,7 +406,7 @@ class Template {
             data = new rename_1.default(data);
         }
         let value = data[variable];
-        return ((typeof value === 'function') && !value.prototype)
+        return (((typeof value)[0] === 'f') && ((value + '')[0] !== 'c'))
             ? value.call(data)
             : value;
     }
@@ -435,8 +458,7 @@ class Template {
                         continue;
                     }
                     // end condition / loop block
-                    if ('eE'.includes(firstChar)
-                        && ['end-->', 'END-->'].includes(this.source.substring(this.index, this.index + 6))) {
+                    if ((firstChar === 'e') && (this.source.substring(this.index, this.index + 6) === 'end-->')) {
                         this.target += this.trimEndLine(this.source.substring(this.start, tagIndex));
                         iteration++;
                         if (iteration < iterations) {
@@ -457,7 +479,6 @@ class Template {
                         continue;
                     }
                     // begin condition / loop block
-                    this.blockStack.push({ blockStart, collection, data, iteration, iterations });
                     if (tagIndex > this.start) {
                         this.target += this.trimEndLine(this.source.substring(this.start, tagIndex));
                         this.start = tagIndex;
@@ -468,6 +489,7 @@ class Template {
                     this.target = '';
                     this.inLiteral = false;
                     const condition = await this.parseExpression(data, '}', '-->');
+                    this.blockStack.push({ blockStart, collection, condition, data, iteration, iterations });
                     let blockData = condition ? (this.target ? data : undefined) : this.target;
                     blockStart = this.index;
                     iteration = 0;

package/esm/template.d.ts

@@ -1,11 +1,12 @@
 import { SortedArray } from '@itrocks/sorted-array';
-type BlockStack = {
+type BlockStackEntry = {
     blockStart: number;
     collection: any[];
+    condition?: boolean;
     data: any;
     iteration: number;
     iterations: number;
-}[];
+};
 export type VariableParser = [parser: string, (variable: string, data: any) => any];
 export declare const frontScripts: SortedArray<string>;
 export { Template };
@@ -13,7 +14,7 @@ export default class Template {
     data?: any;
     containerData?: any;
     blockBack: number;
-    blockStack: BlockStack;
+    blockStack: BlockStackEntry[];
     doExpression: boolean;
     index: number;
     length: number;

package/esm/template.js

@@ -11,7 +11,7 @@ export default class Template {
     containerData;
     // block stack
     blockBack = 0;
-    blockStack;
+    blockStack = [];
     // parser
     doExpression = true;
     index = 0;
@@ -60,7 +60,6 @@ export default class Template {
         this.addLinks.distinct = true;
         this.doneLinks.distinct = true;
         this.headLinks.distinct = true;
-        this.blockStack = [];
         if (containerData) {
             this.blockStack.push({ blockStart: 0, collection: [], data: containerData, iteration: 0, iterations: 1 });
         }
@@ -172,7 +171,11 @@ export default class Template {
         }
         this.headLinks.push(...template.headLinks);
         this.headTitle = template.headTitle;
-        return parsed.substring(parsed.indexOf('<!--BEGIN-->') + 12, parsed.indexOf('<!--END-->'));
+        const beginPosition = parsed.indexOf('<!--BEGIN-->');
+        const endPosition = parsed.indexOf('<!--END-->');
+        return (beginPosition > -1)
+            ? parsed.slice(beginPosition + 12, (endPosition > -1) ? endPosition : parsed.length)
+            : parsed;
     }
     isContextClean() {
         const clean = this.getCleanContext();
@@ -296,7 +299,7 @@ export default class Template {
                 if (conditional && !parsed) {
                     if ((typeof this.target)[0] === 's') {
                         this.target = this.target.substring(0, this.target.lastIndexOf(' '));
-                        while ((this.index < this.length) && !' \n\r\t\f'.includes(this.source[this.index])) {
+                        while ((this.index < this.length) && !' >\n\r\t\f'.includes(this.source[this.index])) {
                             this.index++;
                             this.start++;
                         }
@@ -339,7 +342,23 @@ export default class Template {
         if (expression === '') {
             return undefined;
         }
-        if ((expression[0] === '.') && (expression.startsWith('./') || expression.startsWith('../'))) {
+        if (((expression[0] === '.') && ((expression[1] === '/') || ((expression[1] === '.') && (expression[2] === '/'))))
+            || (expression[0] === '/')) {
+            let expressionEnd = expression.length - 1;
+            if (expression[expressionEnd] === '-') {
+                let blockBack = 1;
+                expressionEnd--;
+                while (expression[expressionEnd] === '-') {
+                    blockBack++;
+                    expressionEnd--;
+                }
+                const blockStack = this.blockStack;
+                return this.include(expression.slice(0, expressionEnd), blockStack[blockStack.length - blockBack].data);
+            }
+            if (expression[expressionEnd] === ')') {
+                const openPosition = expression.lastIndexOf('(');
+                return this.include(expression.slice(0, openPosition), await this.parsePath(expression.slice(openPosition + 1, expression.length - 1), data));
+            }
             return this.include(expression, data);
         }
         this.blockBack = 0;
@@ -350,7 +369,7 @@ export default class Template {
     }
     async parseVariable(variable, data) {
         if (variable === '') {
-            return (typeof data === 'function')
+            return (((typeof data)[0] === 'f') && ((data + '')[0] !== 'c'))
                 ? data.call()
                 : data;
         }
@@ -366,8 +385,12 @@ export default class Template {
             return variable.substring(1, variable.length - 1);
         }
         if (firstChar === '-') {
-            this.blockBack++;
-            return this.blockStack[this.blockStack.length - this.blockBack].data;
+            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) {
@@ -378,7 +401,7 @@ export default class Template {
             data = new Str(data);
         }
         let value = data[variable];
-        return ((typeof value === 'function') && !value.prototype)
+        return (((typeof value)[0] === 'f') && ((value + '')[0] !== 'c'))
             ? value.call(data)
             : value;
     }
@@ -430,8 +453,7 @@ export default class Template {
                         continue;
                     }
                     // end condition / loop block
-                    if ('eE'.includes(firstChar)
-                        && ['end-->', 'END-->'].includes(this.source.substring(this.index, this.index + 6))) {
+                    if ((firstChar === 'e') && (this.source.substring(this.index, this.index + 6) === 'end-->')) {
                         this.target += this.trimEndLine(this.source.substring(this.start, tagIndex));
                         iteration++;
                         if (iteration < iterations) {
@@ -452,7 +474,6 @@ export default class Template {
                         continue;
                     }
                     // begin condition / loop block
-                    this.blockStack.push({ blockStart, collection, data, iteration, iterations });
                     if (tagIndex > this.start) {
                         this.target += this.trimEndLine(this.source.substring(this.start, tagIndex));
                         this.start = tagIndex;
@@ -463,6 +484,7 @@ export default class Template {
                     this.target = '';
                     this.inLiteral = false;
                     const condition = await this.parseExpression(data, '}', '-->');
+                    this.blockStack.push({ blockStart, collection, condition, data, iteration, iterations });
                     let blockData = condition ? (this.target ? data : undefined) : this.target;
                     blockStart = this.index;
                     iteration = 0;

package/package.json

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