spec/loose/default switch for template literal transform, update/re-o…

…rg tests
babel · Aug 23, 2017 · 96a3a11 · 96a3a11
1 parent 4577bd1
commit 96a3a11
Show file tree

Hide file tree

Showing 58 changed files with 10 additions and 63 deletions.
diff --git a/packages/babel-plugin-transform-es2015-template-literals/src/index.js b/packages/babel-plugin-transform-es2015-template-literals/src/index.js
@@ -75,13 +75,13 @@ export default function({ types: t }) {
         // since `+` is left-to-right associative
         // ensure the first node is a string if first/second isn't
         const considerSecondNode =
-          state.opts.spec || !t.isStringLiteral(nodes[1]);
+          !state.opts.loose || !t.isStringLiteral(nodes[1]);
         if (!t.isStringLiteral(nodes[0]) && considerSecondNode) {
           nodes.unshift(t.stringLiteral(""));
         }
         let root = nodes[0];
 
-        if (state.opts.spec) {
+        if (!state.opts.loose) {
           if (nodes.length > 1) {
             root = buildConcatCallExressions(nodes);
           }

diff --git a/...t/fixtures/normal/escape-quotes/actual.js → .../fixtures/default/escape-quotes/actual.js b/...t/fixtures/normal/escape-quotes/actual.js → .../fixtures/default/escape-quotes/actual.js
diff --git a/...t/fixtures/spec/escape-quotes/expected.js → ...ixtures/default/escape-quotes/expected.js b/...t/fixtures/spec/escape-quotes/expected.js → ...ixtures/default/escape-quotes/expected.js
diff --git a/.../test/fixtures/normal/functions/actual.js → ...test/fixtures/default/functions/actual.js b/.../test/fixtures/normal/functions/actual.js → ...test/fixtures/default/functions/actual.js
diff --git a/.../test/fixtures/spec/functions/expected.js → ...st/fixtures/default/functions/expected.js b/.../test/fixtures/spec/functions/expected.js → ...st/fixtures/default/functions/expected.js
diff --git a/...als/test/fixtures/spec/literals/actual.js → .../test/fixtures/default/literals/actual.js b/...als/test/fixtures/spec/literals/actual.js → .../test/fixtures/default/literals/actual.js
diff --git a/...s/test/fixtures/spec/literals/expected.js → ...est/fixtures/default/literals/expected.js b/...s/test/fixtures/spec/literals/expected.js → ...est/fixtures/default/literals/expected.js
diff --git a/.../test/fixtures/normal/multiline/actual.js → ...test/fixtures/default/multiline/actual.js b/.../test/fixtures/normal/multiline/actual.js → ...test/fixtures/default/multiline/actual.js
diff --git a/...est/fixtures/normal/multiline/expected.js → ...st/fixtures/default/multiline/expected.js b/...est/fixtures/normal/multiline/expected.js → ...st/fixtures/default/multiline/expected.js
diff --git a/...s/test/fixtures/normal/multiple/actual.js → .../test/fixtures/default/multiple/actual.js b/...s/test/fixtures/normal/multiple/actual.js → .../test/fixtures/default/multiple/actual.js
diff --git a/...s/test/fixtures/spec/multiple/expected.js → ...est/fixtures/default/multiple/expected.js b/...s/test/fixtures/spec/multiple/expected.js → ...est/fixtures/default/multiple/expected.js
diff --git a/...erals/test/fixtures/normal/none/actual.js → ...rals/test/fixtures/default/none/actual.js b/...erals/test/fixtures/normal/none/actual.js → ...rals/test/fixtures/default/none/actual.js
diff --git a/...als/test/fixtures/normal/none/expected.js → ...ls/test/fixtures/default/none/expected.js b/...als/test/fixtures/normal/none/expected.js → ...ls/test/fixtures/default/none/expected.js
diff --git a/...erals/test/fixtures/normal/only/actual.js → ...rals/test/fixtures/default/only/actual.js b/...erals/test/fixtures/normal/only/actual.js → ...rals/test/fixtures/default/only/actual.js
diff --git a/...erals/test/fixtures/spec/only/expected.js → ...ls/test/fixtures/default/only/expected.js b/...erals/test/fixtures/spec/only/expected.js → ...ls/test/fixtures/default/only/expected.js
diff --git a/...iterals/test/fixtures/normal/options.json → ...terals/test/fixtures/default/options.json b/...iterals/test/fixtures/normal/options.json → ...terals/test/fixtures/default/options.json
diff --git a/...literals/test/fixtures/spec/order/exec.js → ...erals/test/fixtures/default/order/exec.js b/...literals/test/fixtures/spec/order/exec.js → ...erals/test/fixtures/default/order/exec.js
diff --git a/...als/test/fixtures/spec/order/options.json → .../test/fixtures/default/order/options.json b/...als/test/fixtures/spec/order/options.json → .../test/fixtures/default/order/options.json
diff --git a/...iterals/test/fixtures/spec/order2/exec.js → ...rals/test/fixtures/default/order2/exec.js b/...iterals/test/fixtures/spec/order2/exec.js → ...rals/test/fixtures/default/order2/exec.js
diff --git a/...ls/test/fixtures/spec/order2/options.json → ...test/fixtures/default/order2/options.json b/...ls/test/fixtures/spec/order2/options.json → ...test/fixtures/default/order2/options.json
diff --git a/...als/test/fixtures/normal/single/actual.js → ...ls/test/fixtures/default/single/actual.js b/...als/test/fixtures/normal/single/actual.js → ...ls/test/fixtures/default/single/actual.js
diff --git a/...als/test/fixtures/spec/single/expected.js → .../test/fixtures/default/single/expected.js b/...als/test/fixtures/spec/single/expected.js → .../test/fixtures/default/single/expected.js
diff --git a/.../test/fixtures/normal/statement/actual.js → ...test/fixtures/default/statement/actual.js b/.../test/fixtures/normal/statement/actual.js → ...test/fixtures/default/statement/actual.js
diff --git a/.../test/fixtures/spec/statement/expected.js → ...st/fixtures/default/statement/expected.js b/.../test/fixtures/spec/statement/expected.js → ...st/fixtures/default/statement/expected.js
diff --git a/...iterals/test/fixtures/spec/symbol/exec.js → ...rals/test/fixtures/default/symbol/exec.js b/...iterals/test/fixtures/spec/symbol/exec.js → ...rals/test/fixtures/default/symbol/exec.js
diff --git a/.../normal/template-revision-loose/actual.js → ...tures/default/template-revision/actual.js b/.../normal/template-revision-loose/actual.js → ...tures/default/template-revision/actual.js
diff --git a/...ures/normal/template-revision/expected.js → ...res/default/template-revision/expected.js b/...ures/normal/template-revision/expected.js → ...res/default/template-revision/expected.js
diff --git a/...est/fixtures/spec/escape-quotes/actual.js → ...st/fixtures/loose/escape-quotes/actual.js b/...est/fixtures/spec/escape-quotes/actual.js → ...st/fixtures/loose/escape-quotes/actual.js
diff --git a/...fixtures/normal/escape-quotes/expected.js → .../fixtures/loose/escape-quotes/expected.js b/...fixtures/normal/escape-quotes/expected.js → .../fixtures/loose/escape-quotes/expected.js
diff --git a/...ixtures/normal/expression-first/actual.js → ...fixtures/loose/expression-first/actual.js b/...ixtures/normal/expression-first/actual.js → ...fixtures/loose/expression-first/actual.js
diff --git a/...tures/normal/expression-first/expected.js → ...xtures/loose/expression-first/expected.js b/...tures/normal/expression-first/expected.js → ...xtures/loose/expression-first/expected.js
diff --git a/...ls/test/fixtures/spec/functions/actual.js → ...s/test/fixtures/loose/functions/actual.js b/...ls/test/fixtures/spec/functions/actual.js → ...s/test/fixtures/loose/functions/actual.js
diff --git a/...est/fixtures/normal/functions/expected.js → ...test/fixtures/loose/functions/expected.js b/...est/fixtures/normal/functions/expected.js → ...test/fixtures/loose/functions/expected.js
diff --git a/...ls/test/fixtures/spec/multiline/actual.js → ...s/test/fixtures/loose/multiline/actual.js b/...ls/test/fixtures/spec/multiline/actual.js → ...s/test/fixtures/loose/multiline/actual.js
diff --git a/.../test/fixtures/spec/multiline/expected.js → ...test/fixtures/loose/multiline/expected.js b/.../test/fixtures/spec/multiline/expected.js → ...test/fixtures/loose/multiline/expected.js
diff --git a/...als/test/fixtures/spec/multiple/actual.js → ...ls/test/fixtures/loose/multiple/actual.js b/...als/test/fixtures/spec/multiple/actual.js → ...ls/test/fixtures/loose/multiple/actual.js
diff --git a/...test/fixtures/normal/multiple/expected.js → .../test/fixtures/loose/multiple/expected.js b/...test/fixtures/normal/multiple/expected.js → .../test/fixtures/loose/multiple/expected.js
diff --git a/...iterals/test/fixtures/spec/none/actual.js → ...terals/test/fixtures/loose/none/actual.js b/...iterals/test/fixtures/spec/none/actual.js → ...terals/test/fixtures/loose/none/actual.js
diff --git a/...erals/test/fixtures/spec/none/expected.js → ...rals/test/fixtures/loose/none/expected.js b/...erals/test/fixtures/spec/none/expected.js → ...rals/test/fixtures/loose/none/expected.js
diff --git a/...iterals/test/fixtures/spec/only/actual.js → ...terals/test/fixtures/loose/only/actual.js b/...iterals/test/fixtures/spec/only/actual.js → ...terals/test/fixtures/loose/only/actual.js
diff --git a/...als/test/fixtures/normal/only/expected.js → ...rals/test/fixtures/loose/only/expected.js b/...als/test/fixtures/normal/only/expected.js → ...rals/test/fixtures/loose/only/expected.js
diff --git a/packages/babel-plugin-transform-es2015-template-literals/test/fixtures/loose/options.json b/packages/babel-plugin-transform-es2015-template-literals/test/fixtures/loose/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["transform-es2015-template-literals", {"loose": true}]]
+}
diff --git a/...erals/test/fixtures/spec/single/actual.js → ...rals/test/fixtures/loose/single/actual.js b/...erals/test/fixtures/spec/single/actual.js → ...rals/test/fixtures/loose/single/actual.js
diff --git a/...s/test/fixtures/normal/single/expected.js → ...ls/test/fixtures/loose/single/expected.js b/...s/test/fixtures/normal/single/expected.js → ...ls/test/fixtures/loose/single/expected.js
diff --git a/...ls/test/fixtures/spec/statement/actual.js → ...s/test/fixtures/loose/statement/actual.js b/...ls/test/fixtures/spec/statement/actual.js → ...s/test/fixtures/loose/statement/actual.js
diff --git a/...est/fixtures/normal/statement/expected.js → ...test/fixtures/loose/statement/expected.js b/...est/fixtures/normal/statement/expected.js → ...test/fixtures/loose/statement/expected.js
diff --git a/...terals/test/fixtures/normal/tag/actual.js → ...iterals/test/fixtures/loose/tag/actual.js b/...terals/test/fixtures/normal/tag/actual.js → ...iterals/test/fixtures/loose/tag/actual.js
diff --git a/packages/babel-plugin-transform-es2015-template-literals/test/fixtures/loose/tag/expected.js b/packages/babel-plugin-transform-es2015-template-literals/test/fixtures/loose/tag/expected.js
@@ -0,0 +1,5 @@
+var _templateObject = _taggedTemplateLiteralLoose(["wow\na", "b ", ""], ["wow\\na", "b ", ""]);
+
+function _taggedTemplateLiteralLoose(strings, raw) { strings.raw = raw; return strings; }
+
+var foo = bar(_templateObject, 42, _.foobar());
diff --git a/...xtures/normal/template-revision/actual.js → ...ixtures/loose/template-revision/actual.js b/...xtures/normal/template-revision/actual.js → ...ixtures/loose/template-revision/actual.js
diff --git a/...ormal/template-revision-loose/expected.js → ...tures/loose/template-revision/expected.js b/...ormal/template-revision-loose/expected.js → ...tures/loose/template-revision/expected.js
diff --git a/.../babel-plugin-transform-es2015-template-literals/test/fixtures/normal/tag-loose/actual.js b/.../babel-plugin-transform-es2015-template-literals/test/fixtures/normal/tag-loose/actual.js
diff --git a/...abel-plugin-transform-es2015-template-literals/test/fixtures/normal/tag-loose/expected.js b/...abel-plugin-transform-es2015-template-literals/test/fixtures/normal/tag-loose/expected.js
diff --git a/...bel-plugin-transform-es2015-template-literals/test/fixtures/normal/tag-loose/options.json b/...bel-plugin-transform-es2015-template-literals/test/fixtures/normal/tag-loose/options.json
diff --git a/...ages/babel-plugin-transform-es2015-template-literals/test/fixtures/normal/tag/expected.js b/...ages/babel-plugin-transform-es2015-template-literals/test/fixtures/normal/tag/expected.js
diff --git a/...nsform-es2015-template-literals/test/fixtures/normal/template-revision-loose/options.json b/...nsform-es2015-template-literals/test/fixtures/normal/template-revision-loose/options.json
diff --git a/packages/babel-plugin-transform-es2015-template-literals/test/fixtures/spec/options.json b/packages/babel-plugin-transform-es2015-template-literals/test/fixtures/spec/options.json
diff --git a/...-plugin-transform-es2015-template-literals/test/fixtures/spec/template-revision/actual.js b/...-plugin-transform-es2015-template-literals/test/fixtures/spec/template-revision/actual.js
diff --git a/...lugin-transform-es2015-template-literals/test/fixtures/spec/template-revision/expected.js b/...lugin-transform-es2015-template-literals/test/fixtures/spec/template-revision/expected.js