Skip to content

Commit 95d84ba

Browse files
kpdeckerkpdecker
committed
Drop AST constructors in favor of JSON
These were little more than object literal statements that were less clear due to their use of index-based arguments. Fixes #1077
1 parent 9a2d1d6 commit 95d84ba

10 files changed

Lines changed: 141 additions & 299 deletions

File tree

‎lib/handlebars/compiler/ast.js‎

Lines changed: 0 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -1,130 +1,4 @@
11
let AST = {
2-
Program: function(statements, blockParams, strip, locInfo) {
3-
this.loc = locInfo;
4-
this.type = 'Program';
5-
this.body = statements;
6-
7-
this.blockParams = blockParams;
8-
this.strip = strip;
9-
},
10-
11-
MustacheStatement: function(path, params, hash, escaped, strip, locInfo) {
12-
this.loc = locInfo;
13-
this.type = 'MustacheStatement';
14-
15-
this.path = path;
16-
this.params = params || [];
17-
this.hash = hash;
18-
this.escaped = escaped;
19-
20-
this.strip = strip;
21-
},
22-
23-
BlockStatement: function(path, params, hash, program, inverse, openStrip, inverseStrip, closeStrip, locInfo) {
24-
this.loc = locInfo;
25-
this.type = 'BlockStatement';
26-
27-
this.path = path;
28-
this.params = params || [];
29-
this.hash = hash;
30-
this.program = program;
31-
this.inverse = inverse;
32-
33-
this.openStrip = openStrip;
34-
this.inverseStrip = inverseStrip;
35-
this.closeStrip = closeStrip;
36-
},
37-
38-
PartialStatement: function(name, params, hash, strip, locInfo) {
39-
this.loc = locInfo;
40-
this.type = 'PartialStatement';
41-
42-
this.name = name;
43-
this.params = params || [];
44-
this.hash = hash;
45-
46-
this.indent = '';
47-
this.strip = strip;
48-
},
49-
50-
ContentStatement: function(string, locInfo) {
51-
this.loc = locInfo;
52-
this.type = 'ContentStatement';
53-
this.original = this.value = string;
54-
},
55-
56-
CommentStatement: function(comment, strip, locInfo) {
57-
this.loc = locInfo;
58-
this.type = 'CommentStatement';
59-
this.value = comment;
60-
61-
this.strip = strip;
62-
},
63-
64-
SubExpression: function(path, params, hash, locInfo) {
65-
this.loc = locInfo;
66-
67-
this.type = 'SubExpression';
68-
this.path = path;
69-
this.params = params || [];
70-
this.hash = hash;
71-
},
72-
73-
PathExpression: function(data, depth, parts, original, locInfo) {
74-
this.loc = locInfo;
75-
this.type = 'PathExpression';
76-
77-
this.data = data;
78-
this.original = original;
79-
this.parts = parts;
80-
this.depth = depth;
81-
},
82-
83-
StringLiteral: function(string, locInfo) {
84-
this.loc = locInfo;
85-
this.type = 'StringLiteral';
86-
this.original =
87-
this.value = string;
88-
},
89-
90-
NumberLiteral: function(number, locInfo) {
91-
this.loc = locInfo;
92-
this.type = 'NumberLiteral';
93-
this.original =
94-
this.value = Number(number);
95-
},
96-
97-
BooleanLiteral: function(bool, locInfo) {
98-
this.loc = locInfo;
99-
this.type = 'BooleanLiteral';
100-
this.original =
101-
this.value = bool === 'true';
102-
},
103-
104-
UndefinedLiteral: function(locInfo) {
105-
this.loc = locInfo;
106-
this.type = 'UndefinedLiteral';
107-
this.original = this.value = undefined;
108-
},
109-
110-
NullLiteral: function(locInfo) {
111-
this.loc = locInfo;
112-
this.type = 'NullLiteral';
113-
this.original = this.value = null;
114-
},
115-
116-
Hash: function(pairs, locInfo) {
117-
this.loc = locInfo;
118-
this.type = 'Hash';
119-
this.pairs = pairs;
120-
},
121-
HashPair: function(key, value, locInfo) {
122-
this.loc = locInfo;
123-
this.type = 'HashPair';
124-
this.key = key;
125-
this.value = value;
126-
},
127-
1282
// Public API used to evaluate derived attributes regarding AST nodes
1293
helpers: {
1304
// a mustache is definitely a helper if:

‎lib/handlebars/compiler/base.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import parser from './parser';
2-
import AST from './ast';
32
import WhitespaceControl from './whitespace-control';
43
import * as Helpers from './helpers';
54
import { extend } from '../utils';
65

76
export { parser };
87

98
let yy = {};
10-
extend(yy, Helpers, AST);
9+
extend(yy, Helpers);
1110

1211
export function parse(input, options) {
1312
// Just return if an already-compiled AST was passed in.

‎lib/handlebars/compiler/compiler.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,13 @@ function transformLiteralToPath(sexpr) {
514514
let literal = sexpr.path;
515515
// Casting to string here to make false and 0 literal values play nicely with the rest
516516
// of the system.
517-
sexpr.path = new AST.PathExpression(false, 0, [literal.original + ''], literal.original + '', literal.loc);
517+
sexpr.path = {
518+
type: 'PathExpression',
519+
data: false,
520+
depth: 0,
521+
parts: [literal.original + ''],
522+
original: literal.original + '',
523+
loc: literal.loc
524+
};
518525
}
519526
}

‎lib/handlebars/compiler/helpers.js‎

Lines changed: 55 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ export function stripComment(comment) {
3232
.replace(/-?-?~?\}\}$/, '');
3333
}
3434

35-
export function preparePath(data, parts, locInfo) {
36-
locInfo = this.locInfo(locInfo);
35+
export function preparePath(data, parts, loc) {
36+
loc = this.locInfo(loc);
3737

3838
let original = data ? '@' : '',
3939
dig = [],
@@ -49,7 +49,7 @@ export function preparePath(data, parts, locInfo) {
4949

5050
if (!isLiteral && (part === '..' || part === '.' || part === 'this')) {
5151
if (dig.length > 0) {
52-
throw new Exception('Invalid path: ' + original, {loc: locInfo});
52+
throw new Exception('Invalid path: ' + original, {loc});
5353
} else if (part === '..') {
5454
depth++;
5555
depthString += '../';
@@ -59,15 +59,30 @@ export function preparePath(data, parts, locInfo) {
5959
}
6060
}
6161

62-
return new this.PathExpression(data, depth, dig, original, locInfo);
62+
return {
63+
type: 'PathExpression',
64+
data,
65+
depth,
66+
parts: dig,
67+
original,
68+
loc
69+
};
6370
}
6471

6572
export function prepareMustache(path, params, hash, open, strip, locInfo) {
6673
// Must use charAt to support IE pre-10
6774
let escapeFlag = open.charAt(3) || open.charAt(2),
6875
escaped = escapeFlag !== '{' && escapeFlag !== '&';
6976

70-
return new this.MustacheStatement(path, params, hash, escaped, strip, this.locInfo(locInfo));
77+
return {
78+
type: 'MustacheStatement',
79+
path,
80+
params,
81+
hash,
82+
escaped,
83+
strip,
84+
loc: this.locInfo(locInfo)
85+
};
7186
}
7287

7388
export function prepareRawBlock(openRawBlock, contents, close, locInfo) {
@@ -78,13 +93,24 @@ export function prepareRawBlock(openRawBlock, contents, close, locInfo) {
7893
}
7994

8095
locInfo = this.locInfo(locInfo);
81-
let program = new this.Program(contents, null, {}, locInfo);
96+
let program = {
97+
type: 'Program',
98+
body: contents,
99+
strip: {},
100+
loc: locInfo
101+
};
82102

83-
return new this.BlockStatement(
84-
openRawBlock.path, openRawBlock.params, openRawBlock.hash,
85-
program, undefined,
86-
{}, {}, {},
87-
locInfo);
103+
return {
104+
type: 'BlockStatement',
105+
path: openRawBlock.path,
106+
params: openRawBlock.params,
107+
hash: openRawBlock.hash,
108+
program,
109+
openStrip: {},
110+
inverseStrip: {},
111+
closeStrip: {},
112+
loc: locInfo
113+
};
88114
}
89115

90116
export function prepareBlock(openBlock, program, inverseAndProgram, close, inverted, locInfo) {
@@ -115,11 +141,18 @@ export function prepareBlock(openBlock, program, inverseAndProgram, close, inver
115141
program = inverted;
116142
}
117143

118-
return new this.BlockStatement(
119-
openBlock.path, openBlock.params, openBlock.hash,
120-
program, inverse,
121-
openBlock.strip, inverseStrip, close && close.strip,
122-
this.locInfo(locInfo));
144+
return {
145+
type: 'BlockStatement',
146+
path: openBlock.path,
147+
params: openBlock.params,
148+
hash: openBlock.hash,
149+
program,
150+
inverse,
151+
openStrip: openBlock.strip,
152+
inverseStrip,
153+
closeStrip: close && close.strip,
154+
loc: this.locInfo(locInfo)
155+
};
123156
}
124157

125158
export function prepareProgram(statements, loc) {
@@ -143,7 +176,12 @@ export function prepareProgram(statements, loc) {
143176
}
144177
}
145178

146-
return new this.Program(statements, null, {}, loc);
179+
return {
180+
type: 'Program',
181+
body: statements,
182+
strip: {},
183+
loc: loc
184+
};
147185
}
148186

149187

‎lib/handlebars/compiler/visitor.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import Exception from '../exception';
2-
import AST from './ast';
32

43
function Visitor() {
54
this.parents = [];
@@ -14,7 +13,7 @@ Visitor.prototype = {
1413
let value = this.accept(node[name]);
1514
if (this.mutating) {
1615
// Hacky sanity check:
17-
if (value && (!value.type || !AST[value.type])) {
16+
if (value && typeof value.type !== 'string') {
1817
throw new Exception('Unexpected node type "' + value.type + '" found when accepting ' + name + ' on ' + node.type);
1918
}
2019
node[name] = value;

0 commit comments

Comments
 (0)