Skip to content

Commit

Permalink
Expose AST helpers in public API
Browse files Browse the repository at this point in the history
  • Loading branch information
kpdecker committed Dec 22, 2014
1 parent 6d2239d commit 9e907e6
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 21 deletions.
21 changes: 21 additions & 0 deletions lib/handlebars/compiler/ast.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,27 @@ var AST = {
this.type = 'HashPair';
this.key = key;
this.value = value;
},

// Public API used to evaluate derived attributes regarding AST nodes
helpers: {
// a mustache is definitely a helper if:
// * it is an eligible helper, and
// * it has at least one parameter or hash segment
// TODO: Make these public utility methods
helperExpression: function(sexpr) {
return !!(sexpr.isHelper || sexpr.params.length || sexpr.hash);
},

scopedId: function(path) {
return (/^\.|this\b/).test(path.original);
},

// an ID is simple if it only has one part, and that part is not
// `..` or `this`.
simpleId: function(path) {
return path.parts.length === 1 && !AST.helpers.scopedId(path) && !path.depth;
}
}
};

Expand Down
26 changes: 5 additions & 21 deletions lib/handlebars/compiler/compiler.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,10 @@
import Exception from "../exception";
import {isArray} from "../utils";
import AST from "./ast";

var slice = [].slice;


// a mustache is definitely a helper if:
// * it is an eligible helper, and
// * it has at least one parameter or hash segment
function helperExpr(sexpr) {
return !!(sexpr.isHelper || sexpr.params.length || sexpr.hash);
}

function scopedId(path) {
return (/^\.|this\b/).test(path.original);
}

// an ID is simple if it only has one part, and that part is not
// `..` or `this`.
function simpleId(path) {
return path.parts.length === 1 && !scopedId(path) && !path.depth;
}

export function Compiler() {}

// the foundHelper register will disambiguate helper lookup from finding a
Expand Down Expand Up @@ -239,7 +223,7 @@ Compiler.prototype = {
path.falsy = true;

this.accept(path);
this.opcode('invokeHelper', params.length, path.original, simpleId(path));
this.opcode('invokeHelper', params.length, path.original, AST.helpers.simpleId(path));
}
},

Expand All @@ -255,7 +239,7 @@ Compiler.prototype = {
this.options.data = true;
this.opcode('lookupData', path.depth, path.parts);
} else {
this.opcode('lookupOnContext', path.parts, path.falsy, scopedId(path));
this.opcode('lookupOnContext', path.parts, path.falsy, AST.helpers.scopedId(path));
}
},

Expand Down Expand Up @@ -301,12 +285,12 @@ Compiler.prototype = {
classifySexpr: function(sexpr) {
// a mustache is an eligible helper if:
// * its id is simple (a single part, not `this` or `..`)
var isHelper = helperExpr(sexpr);
var isHelper = AST.helpers.helperExpression(sexpr);

// if a mustache is an eligible helper but not a definite
// helper, it is ambiguous, and will be resolved in a later
// pass or at runtime.
var isEligible = isHelper || simpleId(sexpr.path);
var isEligible = isHelper || AST.helpers.simpleId(sexpr.path);

var options = this.options;

Expand Down

0 comments on commit 9e907e6

Please sign in to comment.