Disable caching, evaluate directly

Author: jviide

src/build.mjs

@@ -1,95 +1,65 @@
-const TAG_SET = 0;
-const PROPS_SET = 1;
-const PROPS_ASSIGN = 2;
-const CHILD_RECURSE = 3;
-const CHILD_APPEND = 4;
-
 const MODE_SLASH = 0;
 const MODE_TEXT = 1;
-const MODE_WHITESPACE = 3;
-const MODE_TAGNAME = 4;
-const MODE_ATTRIBUTE = 5;
-
-export const evaluate = (h, current, fields) => {
-	const args = ['', null];
-
-	for (let i = 1; i < current.length; i++) {
-		const field = current[i++];
-		const value = field ? fields[field] : current[i];
-		
-		const code = current[++i];
-		if (code === TAG_SET) {
-			args[0] = value;
-		}
-		else if (code === PROPS_SET) {
-			(args[1] = args[1] || {})[current[++i]] = value;
-		}
-		else if (code === PROPS_ASSIGN) {
-			args[1] = Object.assign(args[1] || {}, value);
-		}
-		else if (code === CHILD_RECURSE) {
-			args.push(evaluate(h, value, fields));
-		}
-		else { 	// code === CHILD_APPEND
-			args.push(value);
-		}
-	}
-
-	// eslint-disable-next-line prefer-spread
-	return h.apply(null, args);
-};
+const MODE_WHITESPACE = 2;
+const MODE_TAGNAME = 3;
+const MODE_ATTRIBUTE = 4;
 
-/** Create a template function given strings from a tagged template. */
-export const build = (statics) => {
+export const build = (h, fields) => {
+	const root = [];
+	const stack = [];
 	let mode = MODE_TEXT;
 	let buffer = '';
 	let quote = '';
-	let fallbackPropValue = true;
-	let current = [];
+	let args = root;
 	let char, propName, idx;
 
-	const commit = field => {
-		if (mode === MODE_TEXT) {
-			if (field || (buffer = buffer.replace(/^\s*\n\s*|\s*\n\s*$/g,''))) {
-				current.push(field, buffer, CHILD_APPEND);
-			}
+	const commit = () => {
+		if (mode === MODE_TEXT && (buffer = buffer.replace(/^\s*\n\s*|\s*\n\s*$/g, ''))) {
+			args.push(buffer);
 		}
-		else if (mode === MODE_TAGNAME && (field || buffer)) {
-			current.push(field, buffer, TAG_SET);
+		if (mode === MODE_TAGNAME && buffer) {
+			args[0] = buffer;
 			mode = MODE_WHITESPACE;
 		}
-		else if (mode === MODE_WHITESPACE && buffer === '...') {
-			current.push(field, 0, PROPS_ASSIGN);
+		else if (mode === MODE_WHITESPACE && buffer) {
+			(args[1] = args[1] || {})[buffer] = true;
 		}
-		else if (mode) {	// mode === MODE_ATTRIBUTE || mode === MODE_WHITESPACE
-			if (mode === MODE_WHITESPACE) {
-				propName = buffer;
-				buffer = '';
-			}
-			if (propName) {
-				current.push(field, buffer || fallbackPropValue, PROPS_SET, propName);
-				propName = '';
-			}
-			fallbackPropValue = true;
+		else if (mode === MODE_ATTRIBUTE && propName) {
+			(args[1] = args[1] || {})[propName] = buffer;
+			propName = '';
 		}
 		buffer = '';
 	};
 
-	for (let i=0; i<statics.length; i++) {
+	for (let i=0; i<fields[0].length; i++) {
 		if (i) {
 			if (mode === MODE_TEXT) {
 				commit();
+				args.push(fields[i]);
+			}
+			else if (mode === MODE_TAGNAME) {
+				args[0] = fields[i];
+				mode = MODE_WHITESPACE;
+			}
+			else if (mode === MODE_WHITESPACE && buffer === '...') {
+				args[1] = Object.assign(args[1] || {}, fields[i]);
 			}
-			commit(i);
+			else if (mode === MODE_ATTRIBUTE && propName) {
+				(args[1] = args[1] || {})[propName] = fields[i];
+				propName = '';
+			}
+			buffer = '';
 		}
 
-		for (let j=0; j<statics[i].length; j++) {
-			char = statics[i][j];
+		for (let j=0; j<fields[0][i].length; j++) {
+			char = fields[0][i][j];
 
 			if (mode === MODE_TEXT && char === '<') {
 				// commit buffer
 				commit();
-				current = [current];
+				stack.push(args);
+				args = ['', null];
+				buffer = '';
 				mode = MODE_TAGNAME;
 			}
 			else if (mode !== MODE_TEXT && (char === quote || !quote) && (idx = '\'">=/\t\n\r '.indexOf(char)) >= 0) {
@@ -100,31 +70,29 @@ export const build = (statics) => {
 				else if (idx === 2) {
 					// char === '>'
 					commit();
-
-					if (!mode) {
-						// encountered a slash in current tag
-												
-						if (current.length === 1) {
-							// no tag name or attributes before the slash
-							current = current[0];
-						}
-						current[0].push(0, current, CHILD_RECURSE);
-						current = current[0];
-					}
 					mode = MODE_TEXT;
 				}
 				else if (idx === 3) {
 					// char === '='
 					if (mode) {
 						mode = MODE_ATTRIBUTE;
 						propName = buffer;
-						buffer = fallbackPropValue = '';
+						buffer = '';
 					}
 				}
 				else if (idx === 4) {
 					// char === '/'
-					commit();
-					mode = MODE_SLASH;
+					if (mode) {
+						commit();
+						if (mode === MODE_TAGNAME) {
+							// no tag name before the slash
+							args = stack.pop();
+						}
+						// eslint-disable-next-line prefer-spread
+						mode = h.apply(null, args); // Use 'mode' as a temporary variable
+						(args = stack.pop()).push(mode);
+						mode = MODE_SLASH;
+					}
 				}
 				else if (mode) {
 					// char is a whitespace
@@ -139,5 +107,5 @@ export const build = (statics) => {
 		}
 	}
 	commit();
-	return current;
+	return root.length < 2 ? root[0] : root;
 };

src/index.mjs

@@ -11,21 +11,9 @@
  * limitations under the License.
  */
 
-import { build, evaluate } from './build.mjs';
+import { build } from './build.mjs';
 
-const CACHE = {};
-
-export default function html(statics) {
-	let key = '.';
-	for (let i=0; i<statics.length; i++) {
-		key += statics[i].length + ',' + statics[i];
-	}
-	const tpl = CACHE[key] || (CACHE[key] = build(statics));
-
-	const res = [];
-	for (let i=1; i<tpl.length; i+=3) {
-		// eslint-disable-next-line prefer-rest-params
-		res.push(evaluate(this, tpl[i], arguments));
-	}
-	return res.length > 1 ? res : res[0];
+export default function html() {
+	// eslint-disable-next-line prefer-rest-params
+	return build(this, arguments);
 }