Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid assuming ember-template-compiler result is JSON #216

Merged
merged 1 commit into from
May 7, 2020
Merged

Avoid assuming ember-template-compiler result is JSON #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions __tests__/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,24 @@ describe('htmlbars-inline-precompile', function () {
];
});

it('supports compilation that returns a non-JSON.parseable object', function () {
precompile = (template) => {
return `function() { return "${template}"; }`;
};

let transpiled = transform(
"import hbs from 'htmlbars-inline-precompile';\nvar compiled = hbs`hello`;"
);

expect(transpiled).toMatchInlineSnapshot(`
"var compiled = Ember.HTMLBars.template(
/*
hello
*/
function() { return \\"hello\\"; });"
`);
});

it('passes options when used as a call expression', function () {
let source = 'hello';
transform(`import hbs from 'htmlbars-inline-precompile';\nvar compiled = hbs('${source}');`);
Expand Down
46 changes: 4 additions & 42 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,45 +6,7 @@ module.exports = function (babel) {
const runtimeErrorIIFE = babel.template(
`(function() {\n throw new Error('ERROR_MESSAGE');\n})();`
);

function buildExpression(value) {
switch (typeof value) {
case 'string':
return t.stringLiteral(value);
case 'number':
return t.numberLiteral(value);
case 'boolean':
return t.booleanLiteral(value);
case 'object': {
if (Array.isArray(value)) {
return buildArrayExpression(value);
} else {
return buildObjectExpression(value);
}
}
default:
throw new Error(
`hbs compilation error; unexpected type from precompiler: ${typeof value} for ${JSON.stringify(
value
)}`
);
}
}

function buildObjectExpression(object) {
let properties = [];
for (let key in object) {
let value = object[key];

properties.push(t.objectProperty(t.identifier(key), buildExpression(value)));
}

return t.objectExpression(properties);
}

function buildArrayExpression(array) {
return t.arrayExpression(array.map((i) => buildExpression(i)));
}
const parsePrecompiledTemplate = babel.template('PRECOMPILED');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yay ✂️ ✂️


function parseExpression(buildError, node) {
switch (node.type) {
Expand Down Expand Up @@ -104,9 +66,9 @@ module.exports = function (babel) {
precompileResult = precompile(template, options);
}

let precompiled = JSON.parse(precompileResult);

let templateExpression = buildExpression(precompiled);
let templateExpression = parsePrecompiledTemplate({
PRECOMPILED: precompileResult,
}).expression;

t.addComment(
templateExpression,
Expand Down