Remove unnecessary inlined render function

Now that the template is largely just a data structure that describes
its statements and expressions, the `render` function is no longer
necessary.

Instead, the runtime `render` function uses the data structure to decide
what to do. At the moment, it simply delegates to the hooks that were
already there, but the plan is to allow runtimes to completely swap out
the expression visitor to do more exotic things like building and
caching streams.

Author: wycats

packages/htmlbars-compiler/lib/hydration-javascript-compiler.js

@@ -1,5 +1,5 @@
 import { processOpcodes } from "./utils";
-import { string, array } from "../htmlbars-util/quoting";
+import { array } from "../htmlbars-util/quoting";
 
 function HydrationJavaScriptCompiler() {
   this.stack = [];
@@ -86,106 +86,50 @@ prototype.compile = function(opcodes, options) {
 
 prototype.prepareArray = function(length) {
   var values = [];
-  var expressionValues = [];
 
   for (var i = 0; i < length; i++) {
-    values.push(this.stack.pop());
-    expressionValues.push(this.expressionStack.pop());
+    values.push(this.expressionStack.pop());
   }
 
-  this.expressionStack.push(expressionValues);
-  this.stack.push('[' + values.join(', ') + ']');
+  this.expressionStack.push(values);
 };
 
 prototype.prepareObject = function(size) {
   var pairs = [];
-  var expressionPairs = [];
 
   for (var i = 0; i < size; i++) {
-    pairs.push(this.stack.pop() + ': ' + this.stack.pop());
-    expressionPairs.push(this.expressionStack.pop(), this.expressionStack.pop());
+    pairs.push(this.expressionStack.pop(), this.expressionStack.pop());
   }
 
-  this.expressionStack.push(expressionPairs);
-  this.stack.push('{' + pairs.join(', ') + '}');
-};
-
-prototype.pushRaw = function(value) {
-  this.expressionStack.push(value);
-  this.stack.push(value);
+  this.expressionStack.push(pairs);
 };
 
 prototype.pushLiteral = function(value) {
   this.expressionStack.push(value);
-
-  if (typeof value === 'string') {
-    this.stack.push(string(value));
-  } else {
-    this.stack.push(value.toString());
-  }
-};
-
-prototype.pushHook = function(name, args) {
-  this.hooks[name] = true;
-  this.stack.push(name + '(' + args.join(', ') + ')');
 };
 
-prototype.pushGetHook = function(path, morphNum) {
+prototype.pushGetHook = function(path) {
   this.expressionStack.push([ 'get', path ]);
-
-  this.pushHook('get', [
-    'env',
-    'morphs[' + morphNum + ']',
-    'context',
-    string(path)
-  ]);
 };
 
-prototype.pushSexprHook = function(morphNum) {
+prototype.pushSexprHook = function() {
   this.expressionStack.push([
     'subexpr',
     this.expressionStack.pop(),
     this.expressionStack.pop(),
     this.expressionStack.pop()
   ]);
-
-  this.pushHook('subexpr', [
-    'env',
-    'morphs[' + morphNum + ']',
-    'context',
-    this.stack.pop(), // path
-    this.stack.pop(), // params
-    this.stack.pop() // hash
-  ]);
 };
 
-prototype.pushConcatHook = function(morphNum) {
+prototype.pushConcatHook = function() {
   this.expressionStack.push([ 'concat', this.expressionStack.pop() ]);
-
-  this.pushHook('concat', [
-    'env',
-    'morphs[' + morphNum + ']',
-    this.stack.pop() // parts
-  ]);
-};
-
-prototype.printHook = function(name, args) {
-  this.hooks[name] = true;
-  this.source.push(this.indent + '  ' + name + '(' + args.join(', ') + ');\n');
 };
 
-prototype.printSetHook = function(name, index) {
+prototype.printSetHook = function(name) {
   this.augmentContext.push(name);
-
-  this.printHook('set', [
-    'env',
-    'context',
-    string(name),
-    'blockArguments[' + index + ']'
-  ]);
 };
 
-prototype.printBlockHook = function(morphNum, templateId, inverseId) {
+prototype.printBlockHook = function(templateId, inverseId) {
   this.statements.push([
     'block',
     this.expressionStack.pop(), // path
@@ -194,100 +138,44 @@ prototype.printBlockHook = function(morphNum, templateId, inverseId) {
     templateId,
     inverseId
   ]);
-
-  this.printHook('block', [
-    'env',
-    'morphs[' + morphNum + ']',
-    'context',
-    this.stack.pop(), // path
-    this.stack.pop(), // params
-    this.stack.pop(), // hash
-    templateId === null ? 'null' : 'child' + templateId,
-    inverseId === null ? 'null' : 'child' + inverseId
-  ]);
 };
 
-prototype.printInlineHook = function(morphNum) {
-  var path = this.stack.pop();
-  var params = this.stack.pop();
-  var hash = this.stack.pop();
+prototype.printInlineHook = function() {
+  var path = this.expressionStack.pop();
+  var params = this.expressionStack.pop();
+  var hash = this.expressionStack.pop();
 
-  var exprPath = this.expressionStack.pop();
-  var exprParams = this.expressionStack.pop();
-  var exprHash = this.expressionStack.pop();
-
-  this.statements.push([ 'inline', exprPath, exprParams, exprHash ]);
-
-  this.printHook('inline', [
-    'env',
-    'morphs[' + morphNum + ']',
-    'context',
-    path,
-    params,
-    hash
-  ]);
+  this.statements.push([ 'inline', path, params, hash ]);
 };
 
-prototype.printContentHook = function(morphNum) {
+prototype.printContentHook = function() {
   this.statements.push([ 'content', this.expressionStack.pop() ]);
-
-  this.printHook('content', [
-    'env',
-    'morphs[' + morphNum + ']',
-    'context',
-    this.stack.pop() // path
-  ]);
 };
 
-prototype.printComponentHook = function(morphNum, templateId) {
+prototype.printComponentHook = function(templateId) {
   this.statements.push([
     'component',
     this.expressionStack.pop(), // path
     this.expressionStack.pop(), // attrs
     templateId
   ]);
-
-  this.printHook('component', [
-    'env',
-    'morphs[' + morphNum + ']',
-    'context',
-    this.stack.pop(), // path
-    this.stack.pop(), // attrs
-    templateId === null ? 'null' : 'child' + templateId
-  ]);
 };
 
-prototype.printAttributeHook = function(attrMorphNum) {
+prototype.printAttributeHook = function() {
   this.statements.push([
     'attribute',
     this.expressionStack.pop(), // name
     this.expressionStack.pop()  // value;
   ]);
-
-  this.printHook('attribute', [
-    'env',
-    'morphs[' + attrMorphNum + ']',
-    this.stack.pop(), // name
-    this.stack.pop() // value
-  ]);
 };
 
-prototype.printElementHook = function(morphNum) {
+prototype.printElementHook = function() {
   this.statements.push([
     'element',
     this.expressionStack.pop(), // path
     this.expressionStack.pop(), // params
     this.expressionStack.pop()  // hash
   ]);
-
-  this.printHook('element', [
-    'env',
-    'morphs[' + morphNum + ']',
-    'context',
-    this.stack.pop(), // path
-    this.stack.pop(), // params
-    this.stack.pop() // hash
-  ]);
 };
 
 prototype.createMorph = function(morphNum, parentPath, startIndex, endIndex, escaped) {

packages/htmlbars-compiler/lib/hydration-opcode-compiler.js

@@ -28,7 +28,6 @@ function HydrationOpcodeCompiler() {
   this.currentDOMChildIndex = 0;
   this.morphs = [];
   this.morphNum = 0;
-  this.elementMorphNum = null;
   this.element = null;
   this.elementNum = -1;
 }
@@ -136,7 +135,7 @@ HydrationOpcodeCompiler.prototype.mustache = function(mustache) {
   var end = this.currentDOMChildIndex;
   this.morphs.push([morphNum, this.paths.slice(), start, end, mustache.escaped]);
 
-  this.opcode(opcode, morphNum);
+  this.opcode(opcode);
 };
 
 HydrationOpcodeCompiler.prototype.block = function(block) {
@@ -153,7 +152,7 @@ HydrationOpcodeCompiler.prototype.block = function(block) {
   var templateId = this.templateId++;
   var inverseId = block.inverse === null ? null : this.templateId++;
 
-  this.opcode('printBlockHook', morphNum, templateId, inverseId);
+  this.opcode('printBlockHook', templateId, inverseId);
 };
 
 HydrationOpcodeCompiler.prototype.component = function(component) {
@@ -187,7 +186,7 @@ HydrationOpcodeCompiler.prototype.component = function(component) {
 
   this.opcode('prepareObject', attrs.length);
   this.opcode('pushLiteral', component.tag);
-  this.opcode('printComponentHook', morphNum, this.templateId++, blockParams.length);
+  this.opcode('printComponentHook', this.templateId++, blockParams.length);
 };
 
 HydrationOpcodeCompiler.prototype.attribute = function(attr) {
@@ -215,7 +214,7 @@ HydrationOpcodeCompiler.prototype.attribute = function(attr) {
   }
 
   this.opcode('createAttrMorph', attrMorphNum, this.elementNum, attr.name, escaped, namespace);
-  this.opcode('printAttributeHook', attrMorphNum);
+  this.opcode('printAttributeHook');
 };
 
 HydrationOpcodeCompiler.prototype.elementHelper = function(sexpr) {
@@ -227,7 +226,7 @@ HydrationOpcodeCompiler.prototype.elementHelper = function(sexpr) {
   }
 
   publishElementMorph(this);
-  this.opcode('printElementHook', this.elementMorphNum);
+  this.opcode('printElementHook');
 };
 
 HydrationOpcodeCompiler.prototype.pushMorphPlaceholderNode = function() {
@@ -236,11 +235,11 @@ HydrationOpcodeCompiler.prototype.pushMorphPlaceholderNode = function() {
 
 HydrationOpcodeCompiler.prototype.SubExpression = function(sexpr) {
   prepareSexpr(this, sexpr);
-  this.opcode('pushSexprHook', this.morphNum);
+  this.opcode('pushSexprHook');
 };
 
 HydrationOpcodeCompiler.prototype.PathExpression = function(path) {
-  this.opcode('pushGetHook', path.original, this.morphNum);
+  this.opcode('pushGetHook', path.original);
 };
 
 HydrationOpcodeCompiler.prototype.StringLiteral = function(node) {
@@ -294,7 +293,7 @@ function shareElement(compiler) {
 }
 
 function publishElementMorph(compiler) {
-  var morphNum = compiler.elementMorphNum = compiler.morphNum++;
+  var morphNum = compiler.morphNum++;
   compiler.opcode('createElementMorph', morphNum, compiler.elementNum);
 }