cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Transform the template literals revision proposal (#5523)

Browse Source 
* Account for template literals revision

* extra tests

* update to babylon beta 7

* pr feedback (keep arr length the same)
This commit is contained in:
Henry Zhu 2017-03-22 16:07:36 -04:00 committed by GitHub
parent 492ee95f27
commit b638c8b3eb
15 changed files with 136 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/babel-core/package.json
View File

@ -34,7 +34,7 @@
"babel-register": "7.0.0-alpha.2",
"babel-traverse": "7.0.0-alpha.1",
"babel-types": "7.0.0-alpha.1",
"babylon": "7.0.0-beta.6",
"babylon": "7.0.0-beta.7",
"convert-source-map": "^1.1.0",
"debug": "^2.1.1",
"json5": "^0.5.0",

2
packages/babel-generator/package.json
View File

@ -21,6 +21,6 @@
},
"devDependencies": {
"babel-helper-fixtures": "7.0.0-alpha.1",
"babylon": "7.0.0-beta.4"
"babylon": "7.0.0-beta.7"
}
}

8
packages/babel-generator/test/fixtures/types/TemplateLiteral-TaggedTemplateExpression-TemplateElement/actual.js vendored
View File

@ -10,3 +10,11 @@ html`<b></b>`;
asdf
awer
erqer`;
tag`\unicode and \u{55}`;
tag`\01`;
tag`\xg${0}right`;
tag`left${0}\xg`;
tag`left${0}\xg${1}right`;
tag`left${0}\u000g${1}right`;
tag`left${0}\u{-0}${1}right`;

8
packages/babel-generator/test/fixtures/types/TemplateLiteral-TaggedTemplateExpression-TemplateElement/expected.js vendored
View File

@ -10,3 +10,11 @@ html`<b></b>`;
asdf
awer
erqer`;
tag`\unicode and \u{55}`;
tag`\01`;
tag`\xg${0}right`;
tag`left${0}\xg`;
tag`left${0}\xg${1}right`;
tag`left${0}\u000g${1}right`;
tag`left${0}\u{-0}${1}right`;

5
packages/babel-plugin-transform-es2015-template-literals/src/index.js
View File

@ -18,7 +18,10 @@ export default function ({ types: t }) {
let raw = [];
for (const elem of (quasi.quasis: Array)) {
strings.push(t.stringLiteral(elem.value.cooked));
const value = elem.value.cooked == null
? path.scope.buildUndefinedNode()
: t.stringLiteral(elem.value.cooked);
strings.push(value);
raw.push(t.stringLiteral(elem.value.raw));
}

13
packages/babel-plugin-transform-es2015-template-literals/test/fixtures/normal/template-revision-loose/actual.js vendored Normal file
View File

@ -0,0 +1,13 @@
tag`\unicode and \u{55}`;
tag`\01`;
tag`\xg${0}right`;
tag`left${0}\xg`;
tag`left${0}\xg${1}right`;
tag`left${0}\u000g${1}right`;
tag`left${0}\u{-0}${1}right`;
function a() {
var undefined = 4;
tag`\01`;
}

23
packages/babel-plugin-transform-es2015-template-literals/test/fixtures/normal/template-revision-loose/expected.js vendored Normal file
View File

@ -0,0 +1,23 @@
var _templateObject = _taggedTemplateLiteralLoose([void 0], ["\\unicode and \\u{55}"]),
_templateObject2 = _taggedTemplateLiteralLoose([void 0], ["\\01"]),
_templateObject3 = _taggedTemplateLiteralLoose([void 0, "right"], ["\\xg", "right"]),
_templateObject4 = _taggedTemplateLiteralLoose(["left", void 0], ["left", "\\xg"]),
_templateObject5 = _taggedTemplateLiteralLoose(["left", void 0, "right"], ["left", "\\xg", "right"]),
_templateObject6 = _taggedTemplateLiteralLoose(["left", void 0, "right"], ["left", "\\u000g", "right"]),
_templateObject7 = _taggedTemplateLiteralLoose(["left", void 0, "right"], ["left", "\\u{-0}", "right"]);
function _taggedTemplateLiteralLoose(strings, raw) { strings.raw = raw; return strings; }
tag(_templateObject);
tag(_templateObject2);
tag(_templateObject3, 0);
tag(_templateObject4, 0);
tag(_templateObject5, 0, 1);
tag(_templateObject6, 0, 1);
tag(_templateObject7, 0, 1);
function a() {
var undefined = 4;
tag(_templateObject2);
}

3
packages/babel-plugin-transform-es2015-template-literals/test/fixtures/normal/template-revision-loose/options.json vendored Normal file
View File

@ -0,0 +1,3 @@
{
"plugins": [["transform-es2015-template-literals", { "loose": true }]]
}

13
packages/babel-plugin-transform-es2015-template-literals/test/fixtures/normal/template-revision/actual.js vendored Normal file
View File

@ -0,0 +1,13 @@
tag`\unicode and \u{55}`;
tag`\01`;
tag`\xg${0}right`;
tag`left${0}\xg`;
tag`left${0}\xg${1}right`;
tag`left${0}\u000g${1}right`;
tag`left${0}\u{-0}${1}right`;
function a() {
var undefined = 4;
tag`\01`;
}

23
packages/babel-plugin-transform-es2015-template-literals/test/fixtures/normal/template-revision/expected.js vendored Normal file
View File

@ -0,0 +1,23 @@
var _templateObject = _taggedTemplateLiteral([void 0], ["\\unicode and \\u{55}"]),
_templateObject2 = _taggedTemplateLiteral([void 0], ["\\01"]),
_templateObject3 = _taggedTemplateLiteral([void 0, "right"], ["\\xg", "right"]),
_templateObject4 = _taggedTemplateLiteral(["left", void 0], ["left", "\\xg"]),
_templateObject5 = _taggedTemplateLiteral(["left", void 0, "right"], ["left", "\\xg", "right"]),
_templateObject6 = _taggedTemplateLiteral(["left", void 0, "right"], ["left", "\\u000g", "right"]),
_templateObject7 = _taggedTemplateLiteral(["left", void 0, "right"], ["left", "\\u{-0}", "right"]);
function _taggedTemplateLiteral(strings, raw) { return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
tag(_templateObject);
tag(_templateObject2);
tag(_templateObject3, 0);
tag(_templateObject4, 0);
tag(_templateObject5, 0, 1);
tag(_templateObject6, 0, 1);
tag(_templateObject7, 0, 1);
function a() {
var undefined = 4;
tag(_templateObject2);
}

13
packages/babel-plugin-transform-es2015-template-literals/test/fixtures/spec/template-revision/actual.js vendored Normal file
View File

@ -0,0 +1,13 @@
tag`\unicode and \u{55}`;
tag`\01`;
tag`\xg${0}right`;
tag`left${0}\xg`;
tag`left${0}\xg${1}right`;
tag`left${0}\u000g${1}right`;
tag`left${0}\u{-0}${1}right`;
function a() {
var undefined = 4;
tag`\01`;
}

23
packages/babel-plugin-transform-es2015-template-literals/test/fixtures/spec/template-revision/expected.js vendored Normal file
View File

@ -0,0 +1,23 @@
var _templateObject = _taggedTemplateLiteral([void 0], ["\\unicode and \\u{55}"]),
_templateObject2 = _taggedTemplateLiteral([void 0], ["\\01"]),
_templateObject3 = _taggedTemplateLiteral([void 0, "right"], ["\\xg", "right"]),
_templateObject4 = _taggedTemplateLiteral(["left", void 0], ["left", "\\xg"]),
_templateObject5 = _taggedTemplateLiteral(["left", void 0, "right"], ["left", "\\xg", "right"]),
_templateObject6 = _taggedTemplateLiteral(["left", void 0, "right"], ["left", "\\u000g", "right"]),
_templateObject7 = _taggedTemplateLiteral(["left", void 0, "right"], ["left", "\\u{-0}", "right"]);
function _taggedTemplateLiteral(strings, raw) { return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
tag(_templateObject);
tag(_templateObject2);
tag(_templateObject3, 0);
tag(_templateObject4, 0);
tag(_templateObject5, 0, 1);
tag(_templateObject6, 0, 1);
tag(_templateObject7, 0, 1);
function a() {
var undefined = 4;
tag(_templateObject2);
}

2
packages/babel-template/package.json
View File

@ -8,7 +8,7 @@
"repository": "https://github.com/babel/babel/tree/master/packages/babel-template",
"main": "lib/index.js",
"dependencies": {
"babylon": "7.0.0-beta.6",
"babylon": "7.0.0-beta.7",
"babel-traverse": "7.0.0-alpha.1",
"babel-types": "7.0.0-alpha.1",
"lodash": "^4.2.0"

2
packages/babel-traverse/package.json
View File

@ -11,7 +11,7 @@
"babel-code-frame": "7.0.0-alpha.1",
"babel-messages": "7.0.0-alpha.1",
"babel-types": "7.0.0-alpha.1",
"babylon": "7.0.0-beta.6",
"babylon": "7.0.0-beta.7",
"debug": "^2.2.0",
"globals": "^9.0.0",
"invariant": "^2.2.0",

2
packages/babel-types/package.json
View File

@ -13,6 +13,6 @@
"to-fast-properties": "^1.0.1"
},
"devDependencies": {
"babylon": "7.0.0-beta.4"
"babylon": "7.0.0-beta.7"
}
}