@putout/babel 3.1.1 → 3.2.0

package/README.md

@@ -3,7 +3,7 @@
 [NPMIMGURL]: https://img.shields.io/npm/v/@putout/babel.svg?style=flat&longCache=true
 [NPMURL]: https://npmjs.org/package/@putout/babel "npm"
 
-**CommonJS** pre-builts of Babel 8: if you want to migrate to [v8](https://github.com/babel/babel/releases/tag/v8.0.0-alpha.16), but cannot support **ESM** right now.
+**CommonJS** pre-builts of Babel 8: if you want to migrate to [v8](https://github.com/babel/babel/releases/tag/v8.0.0-alpha.17), but cannot support **ESM** right now.
 
 Usage
 

package/bundle/index.js

@@ -140,9 +140,9 @@ var require_picocolors = __commonJS({
   }
 });
 
-// node_modules/@babel/code-frame/node_modules/js-tokens/index.js
+// node_modules/js-tokens/index.js
 var require_js_tokens = __commonJS({
-  "node_modules/@babel/code-frame/node_modules/js-tokens/index.js"(exports2, module2) {
+  "node_modules/js-tokens/index.js"(exports2, module2) {
     var Identifier2;
     var JSXIdentifier2;
     var JSXPunctuator;
@@ -1294,11 +1294,12 @@ var require_browser = __commonJS({
 var require_has_flag = __commonJS({
   "node_modules/has-flag/index.js"(exports2, module2) {
     "use strict";
-    module2.exports = (flag, argv = process.argv) => {
+    module2.exports = (flag, argv) => {
+      argv = argv || process.argv;
       const prefix2 = flag.startsWith("-") ? "" : flag.length === 1 ? "-" : "--";
-      const position = argv.indexOf(prefix2 + flag);
-      const terminatorPosition = argv.indexOf("--");
-      return position !== -1 && (terminatorPosition === -1 || position < terminatorPosition);
+      const pos = argv.indexOf(prefix2 + flag);
+      const terminatorPos = argv.indexOf("--");
+      return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
     };
   }
 });
@@ -1308,23 +1309,16 @@ var require_supports_color = __commonJS({
   "node_modules/supports-color/index.js"(exports2, module2) {
     "use strict";
     var os = require("os");
-    var tty = require("tty");
     var hasFlag = require_has_flag();
-    var { env } = process;
+    var env = process.env;
     var forceColor;
-    if (hasFlag("no-color") || hasFlag("no-colors") || hasFlag("color=false") || hasFlag("color=never")) {
-      forceColor = 0;
+    if (hasFlag("no-color") || hasFlag("no-colors") || hasFlag("color=false")) {
+      forceColor = false;
     } else if (hasFlag("color") || hasFlag("colors") || hasFlag("color=true") || hasFlag("color=always")) {
-      forceColor = 1;
+      forceColor = true;
     }
     if ("FORCE_COLOR" in env) {
-      if (env.FORCE_COLOR === "true") {
-        forceColor = 1;
-      } else if (env.FORCE_COLOR === "false") {
-        forceColor = 0;
-      } else {
-        forceColor = env.FORCE_COLOR.length === 0 ? 1 : Math.min(parseInt(env.FORCE_COLOR, 10), 3);
-      }
+      forceColor = env.FORCE_COLOR.length === 0 || parseInt(env.FORCE_COLOR, 10) !== 0;
     }
     function translateLevel(level) {
       if (level === 0) {
@@ -1337,8 +1331,8 @@ var require_supports_color = __commonJS({
         has16m: level >= 3
       };
     }
-    function supportsColor(haveStream, streamIsTTY) {
-      if (forceColor === 0) {
+    function supportsColor(stream) {
+      if (forceColor === false) {
         return 0;
       }
       if (hasFlag("color=16m") || hasFlag("color=full") || hasFlag("color=truecolor")) {
@@ -1347,22 +1341,19 @@ var require_supports_color = __commonJS({
       if (hasFlag("color=256")) {
         return 2;
       }
-      if (haveStream && !streamIsTTY && forceColor === void 0) {
+      if (stream && !stream.isTTY && forceColor !== true) {
         return 0;
       }
-      const min = forceColor || 0;
-      if (env.TERM === "dumb") {
-        return min;
-      }
+      const min = forceColor ? 1 : 0;
       if (process.platform === "win32") {
         const osRelease = os.release().split(".");
-        if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
+        if (Number(process.versions.node.split(".")[0]) >= 8 && Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
           return Number(osRelease[2]) >= 14931 ? 3 : 2;
         }
         return 1;
       }
       if ("CI" in env) {
-        if (["TRAVIS", "CIRCLECI", "APPVEYOR", "GITLAB_CI", "GITHUB_ACTIONS", "BUILDKITE"].some((sign) => sign in env) || env.CI_NAME === "codeship") {
+        if (["TRAVIS", "CIRCLECI", "APPVEYOR", "GITLAB_CI"].some((sign) => sign in env) || env.CI_NAME === "codeship") {
           return 1;
         }
         return min;
@@ -1391,16 +1382,19 @@ var require_supports_color = __commonJS({
       if ("COLORTERM" in env) {
         return 1;
       }
+      if (env.TERM === "dumb") {
+        return min;
+      }
       return min;
     }
     function getSupportLevel(stream) {
-      const level = supportsColor(stream, stream && stream.isTTY);
+      const level = supportsColor(stream);
       return translateLevel(level);
     }
     module2.exports = {
       supportsColor: getSupportLevel,
-      stdout: translateLevel(supportsColor(true, tty.isatty(1))),
-      stderr: translateLevel(supportsColor(true, tty.isatty(2)))
+      stdout: getSupportLevel(process.stdout),
+      stderr: getSupportLevel(process.stderr)
     };
   }
 });
@@ -11770,7 +11764,7 @@ defineType("TSLiteralType", {
     aliases: ["TSType"],
     visitor: ["expression", "typeArguments"],
     fields: {
-      expression: validateType("TSEntityName"),
+      expression: validateType("Expression"),
       typeArguments: validateOptionalType("TSTypeParameterInstantiation")
     }
   });
@@ -11778,7 +11772,7 @@ defineType("TSLiteralType", {
     aliases: ["TSType"],
     visitor: ["expression", "typeArguments"],
     fields: {
-      expression: validateType("TSEntityName"),
+      expression: validateType("Expression"),
       typeArguments: validateOptionalType("TSTypeParameterInstantiation")
     }
   });
@@ -16664,7 +16658,7 @@ function _objectWithoutPropertiesLoose(r, e) {
   if (null == r) return {};
   var t = {};
   for (var n2 in r) if ({}.hasOwnProperty.call(r, n2)) {
-    if (e.includes(n2)) continue;
+    if (-1 !== e.indexOf(n2)) continue;
     t[n2] = r[n2];
   }
   return t;
@@ -23740,14 +23734,7 @@ var LValParser = class extends NodeUtils {
     for (let i = 0; i <= end; i++) {
       const elt = exprList[i];
       if (!elt) continue;
-      if (elt.type === "SpreadElement") {
-        elt.type = "RestElement";
-        const arg = elt.argument;
-        this.checkToRestConversion(arg, true);
-        this.toAssignable(arg, isLHS);
-      } else {
-        this.toAssignable(elt, isLHS);
-      }
+      this.toAssignableListItem(exprList, i, isLHS);
       if (elt.type === "RestElement") {
         if (i < end) {
           this.raise(Errors.RestTrailingComma, elt);
@@ -23757,6 +23744,17 @@ var LValParser = class extends NodeUtils {
       }
     }
   }
+  toAssignableListItem(exprList, index2, isLHS) {
+    const node = exprList[index2];
+    if (node.type === "SpreadElement") {
+      node.type = "RestElement";
+      const arg = node.argument;
+      this.checkToRestConversion(arg, true);
+      this.toAssignable(arg, isLHS);
+    } else {
+      this.toAssignable(node, isLHS);
+    }
+  }
   isAssignable(node, isBinding3) {
     switch (node.type) {
       case "Identifier":
@@ -23850,13 +23848,15 @@ var LValParser = class extends NodeUtils {
         }
       } else {
         const decorators = [];
-        if (this.match(26) && this.hasPlugin("decorators")) {
-          this.raise(Errors.UnsupportedParameterDecorator, this.state.startLoc);
-        }
-        while (this.match(26)) {
-          decorators.push(this.parseDecorator());
+        if (flags & 2) {
+          if (this.match(26) && this.hasPlugin("decorators")) {
+            this.raise(Errors.UnsupportedParameterDecorator, this.state.startLoc);
+          }
+          while (this.match(26)) {
+            decorators.push(this.parseDecorator());
+          }
         }
-        elts.push(this.parseAssignableListItem(flags, decorators));
+        elts.push(this.parseBindingElement(flags, decorators));
       }
     }
     return elts;
@@ -23886,7 +23886,7 @@ var LValParser = class extends NodeUtils {
     prop.method = false;
     return this.parseObjPropValue(prop, startLoc, false, false, true, false);
   }
-  parseAssignableListItem(flags, decorators) {
+  parseBindingElement(flags, decorators) {
     const left = this.parseMaybeDefault();
     if (flags & 2) {
       this.parseFunctionParamType(left);
@@ -24092,6 +24092,9 @@ var TSErrors = ParseErrorEnum`typescript`({
   IndexSignatureHasOverride: "'override' modifier cannot appear on an index signature.",
   IndexSignatureHasStatic: "Index signatures cannot have the 'static' modifier.",
   InitializerNotAllowedInAmbientContext: "Initializers are not allowed in ambient contexts.",
+  InvalidHeritageClauseType: ({
+    token
+  }) => `'${token}' list can only include identifiers or qualified-names with optional type arguments.`,
   InvalidModifierOnTypeMember: ({
     modifier
   }) => `'${modifier}' modifier cannot appear on a type member.`,
@@ -24173,6 +24176,22 @@ function tsIsAccessModifier(modifier) {
 function tsIsVarianceAnnotations(modifier) {
   return modifier === "in" || modifier === "out";
 }
+function tsIsEntityName(node) {
+  var _a;
+  if ((_a = node.extra) == null ? void 0 : _a.parenthesized) {
+    return false;
+  }
+  switch (node.type) {
+    case "Identifier":
+      return true;
+    case "MemberExpression":
+      return !node.computed && tsIsEntityName(node.object);
+    case "TSInstantiationExpression":
+      return tsIsEntityName(node.expression);
+    default:
+      return false;
+  }
+}
 var typescript = (superClass) => class TypeScriptParserMixin extends superClass {
   constructor() {
     super(...arguments);
@@ -25171,13 +25190,24 @@ var typescript = (superClass) => class TypeScriptParserMixin extends superClass
   tsParseHeritageClause(token) {
     const originalStartLoc = this.state.startLoc;
     const delimitedList = this.tsParseDelimitedList("HeritageClauseElement", () => {
-      const node = this.startNode();
       {
-        node.expression = this.tsParseEntityName(1);
-        if (this.match(47)) {
-          node.typeArguments = this.tsParseTypeArguments();
+        const expression2 = super.parseExprSubscripts();
+        if (!tsIsEntityName(expression2)) {
+          this.raise(TSErrors.InvalidHeritageClauseType, expression2.loc.start, {
+            token
+          });
+        }
+        const nodeType = token === "extends" ? "TSInterfaceHeritage" : "TSClassImplements";
+        if (expression2.type === "TSInstantiationExpression") {
+          expression2.type = nodeType;
+          return expression2;
+        }
+        const node = this.startNodeAtNode(expression2);
+        node.expression = expression2;
+        if (this.match(47) || this.match(51)) {
+          node.typeArguments = this.tsParseTypeArgumentsInExpression();
         }
-        return this.finishNode(node, token === "extends" ? "TSInterfaceHeritage" : "TSClassImplements");
+        return this.finishNode(node, nodeType);
       }
     });
     if (!delimitedList.length) {
@@ -25555,7 +25585,7 @@ var typescript = (superClass) => class TypeScriptParserMixin extends superClass
     if (this.tsIsDeclarationStart()) return false;
     return super.isExportDefaultSpecifier();
   }
-  parseAssignableListItem(flags, decorators) {
+  parseBindingElement(flags, decorators) {
     const startLoc = this.state.startLoc;
     const modified = {};
     this.tsParseModifiers({
@@ -25984,18 +26014,15 @@ var typescript = (superClass) => class TypeScriptParserMixin extends superClass
     return super.shouldParseExportDeclaration();
   }
   parseConditional(expr, startLoc, refExpressionErrors) {
-    if (!this.state.maybeInArrowParameters || !this.match(17)) {
-      return super.parseConditional(expr, startLoc, refExpressionErrors);
-    }
-    const result = this.tryParse(() => super.parseConditional(expr, startLoc));
-    if (!result.node) {
-      if (result.error) {
-        super.setOptionalParametersError(refExpressionErrors, result.error);
+    if (!this.match(17)) return expr;
+    if (this.state.maybeInArrowParameters) {
+      const nextCh = this.lookaheadCharCode();
+      if (nextCh === 44 || nextCh === 61 || nextCh === 58 || nextCh === 41) {
+        this.setOptionalParametersError(refExpressionErrors);
+        return expr;
       }
-      return expr;
     }
-    if (result.error) this.state = result.failState;
-    return result.node;
+    return super.parseConditional(expr, startLoc, refExpressionErrors);
   }
   parseParenItem(node, startLoc) {
     const newNode = super.parseParenItem(node, startLoc);
@@ -26322,7 +26349,6 @@ var typescript = (superClass) => class TypeScriptParserMixin extends superClass
       case "TSParameterProperty":
         return "parameter";
       case "TSNonNullExpression":
-      case "TSInstantiationExpression":
         return "expression";
       case "TSAsExpression":
       case "TSSatisfiesExpression":
@@ -26408,14 +26434,12 @@ var typescript = (superClass) => class TypeScriptParserMixin extends superClass
     }
     return type;
   }
-  toAssignableList(exprList, trailingCommaLoc, isLHS) {
-    for (let i = 0; i < exprList.length; i++) {
-      const expr = exprList[i];
-      if ((expr == null ? void 0 : expr.type) === "TSTypeCastExpression") {
-        exprList[i] = this.typeCastToParameter(expr);
-      }
+  toAssignableListItem(exprList, index2, isLHS) {
+    const node = exprList[index2];
+    if (node.type === "TSTypeCastExpression") {
+      exprList[index2] = this.typeCastToParameter(node);
     }
-    super.toAssignableList(exprList, trailingCommaLoc, isLHS);
+    super.toAssignableListItem(exprList, index2, isLHS);
   }
   typeCastToParameter(node) {
     node.expression.typeAnnotation = node.typeAnnotation;
@@ -26984,18 +27008,18 @@ var mixinPlugins = {
 };
 var mixinPluginNames = Object.keys(mixinPlugins);
 var ExpressionParser = class extends LValParser {
-  checkProto(prop, isRecord, protoRef, refExpressionErrors) {
+  checkProto(prop, isRecord, sawProto, refExpressionErrors) {
     if (prop.type === "SpreadElement" || this.isObjectMethod(prop) || prop.computed || prop.shorthand) {
-      return;
+      return sawProto;
     }
     const key = prop.key;
     const name = key.type === "Identifier" ? key.name : key.value;
     if (name === "__proto__") {
       if (isRecord) {
         this.raise(Errors.RecordNoProto, key);
-        return;
+        return true;
       }
-      if (protoRef.used) {
+      if (sawProto) {
         if (refExpressionErrors) {
           if (refExpressionErrors.doubleProtoLoc === null) {
             refExpressionErrors.doubleProtoLoc = key.loc.start;
@@ -27004,8 +27028,9 @@ var ExpressionParser = class extends LValParser {
           this.raise(Errors.DuplicateProto, key);
         }
       }
-      protoRef.used = true;
+      return true;
     }
+    return sawProto;
   }
   shouldExitDescending(expr, potentialArrowAt) {
     return expr.type === "ArrowFunctionExpression" && this.offsetToSourcePos(expr.start) === potentialArrowAt;
@@ -27051,9 +27076,8 @@ var ExpressionParser = class extends LValParser {
   parseMaybeAssignAllowIn(refExpressionErrors, afterLeftParse) {
     return this.allowInAnd(() => this.parseMaybeAssign(refExpressionErrors, afterLeftParse));
   }
-  setOptionalParametersError(refExpressionErrors, resultError) {
-    var _a;
-    refExpressionErrors.optionalParametersLoc = (_a = resultError == null ? void 0 : resultError.loc) != null ? _a : this.state.startLoc;
+  setOptionalParametersError(refExpressionErrors) {
+    refExpressionErrors.optionalParametersLoc = this.state.startLoc;
   }
   parseMaybeAssign(refExpressionErrors, afterLeftParse) {
     const startLoc = this.state.startLoc;
@@ -28016,7 +28040,7 @@ var ExpressionParser = class extends LValParser {
     }
     const oldInFSharpPipelineDirectBody = this.state.inFSharpPipelineDirectBody;
     this.state.inFSharpPipelineDirectBody = false;
-    const propHash = /* @__PURE__ */ Object.create(null);
+    let sawProto = false;
     let first = true;
     const node = this.startNode();
     node.properties = [];
@@ -28036,7 +28060,7 @@ var ExpressionParser = class extends LValParser {
         prop = this.parseBindingProperty();
       } else {
         prop = this.parsePropertyDefinition(refExpressionErrors);
-        this.checkProto(prop, isRecord, propHash, refExpressionErrors);
+        sawProto = this.checkProto(prop, isRecord, sawProto, refExpressionErrors);
       }
       if (isRecord && !this.isObjectProperty(prop) && prop.type !== "SpreadElement") {
         this.raise(Errors.InvalidRecordProperty, prop);
@@ -28912,14 +28936,8 @@ var StatementParser = class extends ExpressionParser {
         let result;
         if (startType === 83) {
           result = this.parseImport(node);
-          if (result.type === "ImportDeclaration" && (!result.importKind || result.importKind === "value")) {
-            this.sawUnambiguousESM = true;
-          }
         } else {
           result = this.parseExport(node, decorators);
-          if (result.type === "ExportNamedDeclaration" && (!result.exportKind || result.exportKind === "value") || result.type === "ExportAllDeclaration" && (!result.exportKind || result.exportKind === "value") || result.type === "ExportDefaultDeclaration") {
-            this.sawUnambiguousESM = true;
-          }
         }
         this.assertModuleNodeAllowed(result);
         return result;
@@ -29831,6 +29849,7 @@ var StatementParser = class extends ExpressionParser {
         throw this.raise(Errors.UnsupportedDecoratorExport, node);
       }
       this.parseExportFrom(node, true);
+      this.sawUnambiguousESM = true;
       return this.finishNode(node, "ExportAllDeclaration");
     }
     const hasSpecifiers = this.maybeParseExportNamedSpecifiers(node);
@@ -29858,6 +29877,7 @@ var StatementParser = class extends ExpressionParser {
       } else if (decorators) {
         throw this.raise(Errors.UnsupportedDecoratorExport, node);
       }
+      this.sawUnambiguousESM = true;
       return this.finishNode(node2, "ExportNamedDeclaration");
     }
     if (this.eat(65)) {
@@ -29870,6 +29890,7 @@ var StatementParser = class extends ExpressionParser {
         throw this.raise(Errors.UnsupportedDecoratorExport, node);
       }
       this.checkExport(node2, true, true);
+      this.sawUnambiguousESM = true;
       return this.finishNode(node2, "ExportDefaultDeclaration");
     }
     this.unexpected(null, 5);
@@ -29907,6 +29928,9 @@ var StatementParser = class extends ExpressionParser {
       const isTypeExport = node2.exportKind === "type";
       node2.specifiers.push(...this.parseExportSpecifiers(isTypeExport));
       node2.source = null;
+      {
+        node2.attributes = [];
+      }
       node2.declaration = null;
       return true;
     }
@@ -29916,6 +29940,9 @@ var StatementParser = class extends ExpressionParser {
     if (this.shouldParseExportDeclaration()) {
       node.specifiers = [];
       node.source = null;
+      {
+        node.attributes = [];
+      }
       node.declaration = this.parseExportDeclaration(node);
       return true;
     }
@@ -30274,6 +30301,7 @@ var StatementParser = class extends ExpressionParser {
     this.checkImportReflection(node);
     this.checkJSONModuleImport(node);
     this.semicolon();
+    this.sawUnambiguousESM = true;
     return this.finishNode(node, "ImportDeclaration");
   }
   parseImportSource() {
@@ -30890,7 +30918,7 @@ function _objectWithoutPropertiesLoose2(r, e) {
   if (null == r) return {};
   var t = {};
   for (var n2 in r) if ({}.hasOwnProperty.call(r, n2)) {
-    if (e.includes(n2)) continue;
+    if (-1 !== e.indexOf(n2)) continue;
     t[n2] = r[n2];
   }
   return t;
@@ -35834,7 +35862,7 @@ function tsPrintClassMemberModifiers(node) {
     this.word("static");
     this.space();
   }
-  printModifiersList(this, node, [!isPrivateField && node.override && "override", !isPrivateField && node.abstract && "abstract", (isPublicField || isPrivateField) && node.readonly && "readonly"]);
+  printModifiersList(this, node, [!isPrivateField && node.abstract && "abstract", !isPrivateField && node.override && "override", (isPublicField || isPrivateField) && node.readonly && "readonly"]);
 }
 function printBraced(printer, node, cb) {
   printer.token("{");
@@ -37257,7 +37285,7 @@ function verify$1(visitor) {
     }
     if (shouldIgnoreKey(nodeType)) continue;
     if (!TYPES2.includes(nodeType)) {
-      throw new Error(`You gave us a visitor for the node type ${nodeType} but it's not a valid type in @babel/traverse ${"8.0.0-alpha.16"}`);
+      throw new Error(`You gave us a visitor for the node type ${nodeType} but it's not a valid type in @babel/traverse ${"8.0.0-alpha.17"}`);
     }
     const visitors2 = visitor[nodeType];
     if (typeof visitors2 === "object") {
@@ -39696,6 +39724,7 @@ function evaluateCached(path, state) {
   }
 }
 function _evaluate(path, state) {
+  var _a;
   if (!state.confident) return;
   if (path.isSequenceExpression()) {
     const exprs = path.get("expressions");
@@ -39761,6 +39790,22 @@ function _evaluate(path, state) {
         deopt(binding.path, state);
         return;
       }
+      const bindingPathScope = binding.path.scope;
+      if (binding.kind === "var" && bindingPathScope !== binding.scope) {
+        let hasUnsafeBlock = !bindingPathScope.path.parentPath.isBlockStatement();
+        for (let scope2 = bindingPathScope.parent; scope2; scope2 = scope2.parent) {
+          if (scope2 === path.scope) {
+            if (hasUnsafeBlock) {
+              deopt(binding.path, state);
+              return;
+            }
+            break;
+          }
+          if ((_a = scope2.path.parentPath) == null ? void 0 : _a.isBlockStatement()) {
+            hasUnsafeBlock = true;
+          }
+        }
+      }
       if (binding.hasValue) {
         return binding.value;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/babel",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Babel 8 in CommonJS",
@@ -44,12 +44,12 @@
     "commonjs"
   ],
   "devDependencies": {
-    "@babel/code-frame": "^8.0.0-alpha.16",
-    "@babel/generator": "^8.0.0-alpha.16",
-    "@babel/parser": "^8.0.0-alpha.16",
-    "@babel/template": "^8.0.0-alpha.16",
-    "@babel/traverse": "^8.0.0-alpha.16",
-    "@babel/types": "^8.0.0-alpha.16",
+    "@babel/code-frame": "^8.0.0-alpha.17",
+    "@babel/generator": "^8.0.0-alpha.17",
+    "@babel/parser": "^8.0.0-alpha.17",
+    "@babel/template": "^8.0.0-alpha.17",
+    "@babel/traverse": "^8.0.0-alpha.17",
+    "@babel/types": "^8.0.0-alpha.17",
     "@swc/core": "^1.3.101",
     "@types/node": "^22.10.1",
     "acorn-stage3": "^4.0.0",