update

node_modules/@babel/template/lib/builder.js

@@ -7,11 +7,9 @@ exports.default = createTemplateBuilder;
 
 var _options = require("./options");
 
-var _string = _interopRequireDefault(require("./string"));
+var _string = require("./string");
 
-var _literal = _interopRequireDefault(require("./literal"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _literal = require("./literal");
 
 const NO_PLACEHOLDER = (0, _options.validate)({
   placeholderPattern: false

node_modules/@babel/template/lib/formatters.js

@@ -3,7 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.program = exports.expression = exports.statement = exports.statements = exports.smart = void 0;
+exports.statements = exports.statement = exports.smart = exports.program = exports.expression = void 0;
+
+var _t = require("@babel/types");
+
+const {
+  assertExpressionStatement
+} = _t;
 
 function makeStatementFormatter(fn) {
   return {
@@ -39,20 +45,22 @@ const statement = makeStatementFormatter(body => {
 exports.statement = statement;
 const expression = {
   code: str => `(\n${str}\n)`,
-  validate: ({
-    program
-  }) => {
-    if (program.body.length > 1) {
+  validate: ast => {
+    if (ast.program.body.length > 1) {
       throw new Error("Found multiple statements but wanted one");
     }
 
-    const expression = program.body[0].expression;
-
-    if (expression.start === 0) {
+    if (expression.unwrap(ast).start === 0) {
       throw new Error("Parse result included parens.");
     }
   },
-  unwrap: ast => ast.program.body[0].expression
+  unwrap: ({
+    program
+  }) => {
+    const [stmt] = program.body;
+    assertExpressionStatement(stmt);
+    return stmt.expression;
+  }
 };
 exports.expression = expression;
 const program = {

node_modules/@babel/template/lib/index.js

@@ -3,17 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.program = exports.expression = exports.statements = exports.statement = exports.smart = void 0;
+exports.statements = exports.statement = exports.smart = exports.program = exports.expression = exports.default = void 0;
 
-var formatters = _interopRequireWildcard(require("./formatters"));
+var formatters = require("./formatters");
 
-var _builder = _interopRequireDefault(require("./builder"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var _builder = require("./builder");
 
 const smart = (0, _builder.default)(formatters.smart);
 exports.smart = smart;

node_modules/@babel/template/lib/literal.js

@@ -7,11 +7,9 @@ exports.default = literalTemplate;
 
 var _options = require("./options");
 
-var _parse = _interopRequireDefault(require("./parse"));
+var _parse = require("./parse");
 
-var _populate = _interopRequireDefault(require("./populate"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _populate = require("./populate");
 
 function literalTemplate(formatter, tpl, opts) {
   const {
@@ -19,10 +17,10 @@ function literalTemplate(formatter, tpl, opts) {
     names
   } = buildLiteralData(formatter, tpl, opts);
   return arg => {
-    const defaultReplacements = arg.reduce((acc, replacement, i) => {
-      acc[names[i]] = replacement;
-      return acc;
-    }, {});
+    const defaultReplacements = {};
+    arg.forEach((replacement, i) => {
+      defaultReplacements[names[i]] = replacement;
+    });
     return arg => {
       const replacements = (0, _options.normalizeReplacements)(arg);
 

node_modules/@babel/template/lib/options.js

@@ -4,8 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.merge = merge;
-exports.validate = validate;
 exports.normalizeReplacements = normalizeReplacements;
+exports.validate = validate;
+const _excluded = ["placeholderWhitelist", "placeholderPattern", "preserveComments", "syntacticPlaceholders"];
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
@@ -37,7 +38,7 @@ function validate(opts) {
     preserveComments,
     syntacticPlaceholders
   } = _ref,
-        parser = _objectWithoutPropertiesLoose(_ref, ["placeholderWhitelist", "placeholderPattern", "preserveComments", "syntacticPlaceholders"]);
+        parser = _objectWithoutPropertiesLoose(_ref, _excluded);
 
   if (placeholderWhitelist != null && !(placeholderWhitelist instanceof Set)) {
     throw new Error("'.placeholderWhitelist' must be a Set, null, or undefined");

node_modules/@babel/template/lib/parse.js

@@ -5,16 +5,25 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = parseAndBuildMetadata;
 
-var t = _interopRequireWildcard(require("@babel/types"));
+var _t = require("@babel/types");
 
 var _parser = require("@babel/parser");
 
 var _codeFrame = require("@babel/code-frame");
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+const {
+  isCallExpression,
+  isExpressionStatement,
+  isFunction,
+  isIdentifier,
+  isJSXIdentifier,
+  isNewExpression,
+  isPlaceholder,
+  isStatement,
+  isStringLiteral,
+  removePropertiesDeep,
+  traverse
+} = _t;
 const PATTERN = /^[_$A-Z0-9]+$/;
 
 function parseAndBuildMetadata(formatter, code, opts) {
@@ -25,7 +34,7 @@ function parseAndBuildMetadata(formatter, code, opts) {
     syntacticPlaceholders
   } = opts;
   const ast = parseWithCodeFrame(code, opts.parser, syntacticPlaceholders);
-  t.removePropertiesDeep(ast, {
+  removePropertiesDeep(ast, {
     preserveComments
   });
   formatter.validate(ast);
@@ -40,7 +49,7 @@ function parseAndBuildMetadata(formatter, code, opts) {
   const isLegacyRef = {
     value: undefined
   };
-  t.traverse(ast, placeholderVisitorHandler, {
+  traverse(ast, placeholderVisitorHandler, {
     syntactic,
     legacy,
     isLegacyRef,
@@ -58,7 +67,7 @@ function placeholderVisitorHandler(node, ancestors, state) {
 
   let name;
 
-  if (t.isPlaceholder(node)) {
+  if (isPlaceholder(node)) {
     if (state.syntacticPlaceholders === false) {
       throw new Error("%%foo%%-style placeholders can't be used when " + "'.syntacticPlaceholders' is false.");
     } else {
@@ -67,10 +76,10 @@ function placeholderVisitorHandler(node, ancestors, state) {
     }
   } else if (state.isLegacyRef.value === false || state.syntacticPlaceholders) {
     return;
-  } else if (t.isIdentifier(node) || t.isJSXIdentifier(node)) {
+  } else if (isIdentifier(node) || isJSXIdentifier(node)) {
     name = node.name;
     state.isLegacyRef.value = true;
-  } else if (t.isStringLiteral(node)) {
+  } else if (isStringLiteral(node)) {
     name = node.value;
     state.isLegacyRef.value = true;
   } else {
@@ -81,7 +90,7 @@ function placeholderVisitorHandler(node, ancestors, state) {
     throw new Error("'.placeholderWhitelist' and '.placeholderPattern' aren't compatible" + " with '.syntacticPlaceholders: true'");
   }
 
-  if (state.isLegacyRef.value && (state.placeholderPattern === false || !(state.placeholderPattern || PATTERN).test(name)) && !((_state$placeholderWhi = state.placeholderWhitelist) == null ? void 0 : _state$placeholderWhi.has(name))) {
+  if (state.isLegacyRef.value && (state.placeholderPattern === false || !(state.placeholderPattern || PATTERN).test(name)) && !((_state$placeholderWhi = state.placeholderWhitelist) != null && _state$placeholderWhi.has(name))) {
     return;
   }
 
@@ -92,16 +101,16 @@ function placeholderVisitorHandler(node, ancestors, state) {
   } = ancestors[ancestors.length - 1];
   let type;
 
-  if (t.isStringLiteral(node) || t.isPlaceholder(node, {
+  if (isStringLiteral(node) || isPlaceholder(node, {
     expectedNode: "StringLiteral"
   })) {
     type = "string";
-  } else if (t.isNewExpression(parent) && key === "arguments" || t.isCallExpression(parent) && key === "arguments" || t.isFunction(parent) && key === "params") {
+  } else if (isNewExpression(parent) && key === "arguments" || isCallExpression(parent) && key === "arguments" || isFunction(parent) && key === "params") {
     type = "param";
-  } else if (t.isExpressionStatement(parent) && !t.isPlaceholder(node)) {
+  } else if (isExpressionStatement(parent) && !isPlaceholder(node)) {
     type = "statement";
     ancestors = ancestors.slice(0, -1);
-  } else if (t.isStatement(node) && t.isPlaceholder(node)) {
+  } else if (isStatement(node) && isPlaceholder(node)) {
     type = "statement";
   } else {
     type = "other";

node_modules/@babel/template/lib/populate.js

@@ -5,14 +5,22 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = populatePlaceholders;
 
-var t = _interopRequireWildcard(require("@babel/types"));
+var _t = require("@babel/types");
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+const {
+  blockStatement,
+  cloneNode,
+  emptyStatement,
+  expressionStatement,
+  identifier,
+  isStatement,
+  isStringLiteral,
+  stringLiteral,
+  validate
+} = _t;
 
 function populatePlaceholders(metadata, replacements) {
-  const ast = t.cloneNode(metadata.ast);
+  const ast = cloneNode(metadata.ast);
 
   if (replacements) {
     metadata.placeholders.forEach(placeholder => {
@@ -45,9 +53,9 @@ function populatePlaceholders(metadata, replacements) {
 function applyReplacement(placeholder, ast, replacement) {
   if (placeholder.isDuplicate) {
     if (Array.isArray(replacement)) {
-      replacement = replacement.map(node => t.cloneNode(node));
+      replacement = replacement.map(node => cloneNode(node));
     } else if (typeof replacement === "object") {
-      replacement = t.cloneNode(replacement);
+      replacement = cloneNode(replacement);
     }
   }
 
@@ -59,43 +67,43 @@ function applyReplacement(placeholder, ast, replacement) {
 
   if (placeholder.type === "string") {
     if (typeof replacement === "string") {
-      replacement = t.stringLiteral(replacement);
+      replacement = stringLiteral(replacement);
     }
 
-    if (!replacement || !t.isStringLiteral(replacement)) {
+    if (!replacement || !isStringLiteral(replacement)) {
       throw new Error("Expected string substitution");
     }
   } else if (placeholder.type === "statement") {
     if (index === undefined) {
       if (!replacement) {
-        replacement = t.emptyStatement();
+        replacement = emptyStatement();
       } else if (Array.isArray(replacement)) {
-        replacement = t.blockStatement(replacement);
+        replacement = blockStatement(replacement);
       } else if (typeof replacement === "string") {
-        replacement = t.expressionStatement(t.identifier(replacement));
-      } else if (!t.isStatement(replacement)) {
-        replacement = t.expressionStatement(replacement);
+        replacement = expressionStatement(identifier(replacement));
+      } else if (!isStatement(replacement)) {
+        replacement = expressionStatement(replacement);
       }
     } else {
       if (replacement && !Array.isArray(replacement)) {
         if (typeof replacement === "string") {
-          replacement = t.identifier(replacement);
+          replacement = identifier(replacement);
         }
 
-        if (!t.isStatement(replacement)) {
-          replacement = t.expressionStatement(replacement);
+        if (!isStatement(replacement)) {
+          replacement = expressionStatement(replacement);
         }
       }
     }
   } else if (placeholder.type === "param") {
     if (typeof replacement === "string") {
-      replacement = t.identifier(replacement);
+      replacement = identifier(replacement);
     }
 
     if (index === undefined) throw new Error("Assertion failure.");
   } else {
     if (typeof replacement === "string") {
-      replacement = t.identifier(replacement);
+      replacement = identifier(replacement);
     }
 
     if (Array.isArray(replacement)) {
@@ -104,7 +112,7 @@ function applyReplacement(placeholder, ast, replacement) {
   }
 
   if (index === undefined) {
-    t.validate(parent, key, replacement);
+    validate(parent, key, replacement);
     parent[key] = replacement;
   } else {
     const items = parent[key].slice();
@@ -121,7 +129,7 @@ function applyReplacement(placeholder, ast, replacement) {
       items[index] = replacement;
     }
 
-    t.validate(parent, key, items);
+    validate(parent, key, items);
     parent[key] = items;
   }
 }

node_modules/@babel/template/lib/string.js

@@ -7,11 +7,9 @@ exports.default = stringTemplate;
 
 var _options = require("./options");
 
-var _parse = _interopRequireDefault(require("./parse"));
+var _parse = require("./parse");
 
-var _populate = _interopRequireDefault(require("./populate"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _populate = require("./populate");
 
 function stringTemplate(formatter, code, opts) {
   code = formatter.code(code);