From 3bd962a6d7f61239c020e2dbbeb7341e5b842dd1 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期二, 21 四月 2026 11:46:41 +0800
Subject: [PATCH] 推送
---
node_modules/@babel/parser/lib/index.js | 530 +++++++++++++++++++++++++---------------------------------
1 files changed, 225 insertions(+), 305 deletions(-)
diff --git a/node_modules/@babel/parser/lib/index.js b/node_modules/@babel/parser/lib/index.js
index 1c6ff4c..154aba2 100644
--- a/node_modules/@babel/parser/lib/index.js
+++ b/node_modules/@babel/parser/lib/index.js
@@ -350,18 +350,16 @@
syntaxPlugin
}) {
const hasMissingPlugin = reasonCode === "MissingPlugin" || reasonCode === "MissingOneOfPlugins";
- {
- const oldReasonCodes = {
- AccessorCannotDeclareThisParameter: "AccesorCannotDeclareThisParameter",
- AccessorCannotHaveTypeParameters: "AccesorCannotHaveTypeParameters",
- ConstInitializerMustBeStringOrNumericLiteralOrLiteralEnumReference: "ConstInitiailizerMustBeStringOrNumericLiteralOrLiteralEnumReference",
- SetAccessorCannotHaveOptionalParameter: "SetAccesorCannotHaveOptionalParameter",
- SetAccessorCannotHaveRestParameter: "SetAccesorCannotHaveRestParameter",
- SetAccessorCannotHaveReturnType: "SetAccesorCannotHaveReturnType"
- };
- if (oldReasonCodes[reasonCode]) {
- reasonCode = oldReasonCodes[reasonCode];
- }
+ const oldReasonCodes = {
+ AccessorCannotDeclareThisParameter: "AccesorCannotDeclareThisParameter",
+ AccessorCannotHaveTypeParameters: "AccesorCannotHaveTypeParameters",
+ ConstInitializerMustBeStringOrNumericLiteralOrLiteralEnumReference: "ConstInitiailizerMustBeStringOrNumericLiteralOrLiteralEnumReference",
+ SetAccessorCannotHaveOptionalParameter: "SetAccesorCannotHaveOptionalParameter",
+ SetAccessorCannotHaveRestParameter: "SetAccesorCannotHaveRestParameter",
+ SetAccessorCannotHaveReturnType: "SetAccesorCannotHaveReturnType"
+ };
+ if (oldReasonCodes[reasonCode]) {
+ reasonCode = oldReasonCodes[reasonCode];
}
return function constructor(loc, details) {
const error = new SyntaxError();
@@ -622,10 +620,8 @@
}
parsePrivateName() {
const node = super.parsePrivateName();
- {
- if (!this.getPluginOption("estree", "classFeatures")) {
- return node;
- }
+ if (!this.getPluginOption("estree", "classFeatures")) {
+ return node;
}
return this.convertPrivateNameToPrivateIdentifier(node);
}
@@ -636,18 +632,14 @@
return this.castNodeTo(node, "PrivateIdentifier");
}
isPrivateName(node) {
- {
- if (!this.getPluginOption("estree", "classFeatures")) {
- return super.isPrivateName(node);
- }
+ if (!this.getPluginOption("estree", "classFeatures")) {
+ return super.isPrivateName(node);
}
return node.type === "PrivateIdentifier";
}
getPrivateNameSV(node) {
- {
- if (!this.getPluginOption("estree", "classFeatures")) {
- return super.getPrivateNameSV(node);
- }
+ if (!this.getPluginOption("estree", "classFeatures")) {
+ return super.getPrivateNameSV(node);
}
return node.name;
}
@@ -695,35 +687,25 @@
}
parseClassProperty(...args) {
const propertyNode = super.parseClassProperty(...args);
- {
- if (!this.getPluginOption("estree", "classFeatures")) {
- return propertyNode;
- }
+ if (!this.getPluginOption("estree", "classFeatures")) {
+ return propertyNode;
}
- {
- this.castNodeTo(propertyNode, "PropertyDefinition");
- }
+ this.castNodeTo(propertyNode, "PropertyDefinition");
return propertyNode;
}
parseClassPrivateProperty(...args) {
const propertyNode = super.parseClassPrivateProperty(...args);
- {
- if (!this.getPluginOption("estree", "classFeatures")) {
- return propertyNode;
- }
+ if (!this.getPluginOption("estree", "classFeatures")) {
+ return propertyNode;
}
- {
- this.castNodeTo(propertyNode, "PropertyDefinition");
- }
+ this.castNodeTo(propertyNode, "PropertyDefinition");
propertyNode.computed = false;
return propertyNode;
}
parseClassAccessorProperty(node) {
const accessorPropertyNode = super.parseClassAccessorProperty(node);
- {
- if (!this.getPluginOption("estree", "classFeatures")) {
- return accessorPropertyNode;
- }
+ if (!this.getPluginOption("estree", "classFeatures")) {
+ return accessorPropertyNode;
}
if (accessorPropertyNode.abstract && this.hasPlugin("typescript")) {
delete accessorPropertyNode.abstract;
@@ -780,14 +762,11 @@
finishCallExpression(unfinished, optional) {
const node = super.finishCallExpression(unfinished, optional);
if (node.callee.type === "Import") {
- var _ref;
+ var _ref, _ref2;
this.castNodeTo(node, "ImportExpression");
node.source = node.arguments[0];
node.options = (_ref = node.arguments[1]) != null ? _ref : null;
- {
- var _ref2;
- node.attributes = (_ref2 = node.arguments[1]) != null ? _ref2 : null;
- }
+ node.attributes = (_ref2 = node.arguments[1]) != null ? _ref2 : null;
delete node.arguments;
delete node.callee;
} else if (node.type === "OptionalCallExpression") {
@@ -911,9 +890,7 @@
j_cTag: new TokContext("</tag"),
j_expr: new TokContext("<tag>...</tag>", true)
};
-{
- types.template = new TokContext("`", true);
-}
+types.template = new TokContext("`", true);
const beforeExpr = true;
const startsExpr = true;
const isLoop = true;
@@ -942,9 +919,7 @@
this.prefix = !!conf.prefix;
this.postfix = !!conf.postfix;
this.binop = conf.binop != null ? conf.binop : null;
- {
- this.updateContext = null;
- }
+ this.updateContext = null;
}
}
const keywords$1 = new Map();
@@ -1445,24 +1420,22 @@
function getExportedToken(token) {
return tokenTypes[token];
}
-{
- tokenTypes[8].updateContext = context => {
+tokenTypes[8].updateContext = context => {
+ context.pop();
+};
+tokenTypes[5].updateContext = tokenTypes[7].updateContext = tokenTypes[23].updateContext = context => {
+ context.push(types.brace);
+};
+tokenTypes[22].updateContext = context => {
+ if (context[context.length - 1] === types.template) {
context.pop();
- };
- tokenTypes[5].updateContext = tokenTypes[7].updateContext = tokenTypes[23].updateContext = context => {
- context.push(types.brace);
- };
- tokenTypes[22].updateContext = context => {
- if (context[context.length - 1] === types.template) {
- context.pop();
- } else {
- context.push(types.template);
- }
- };
- tokenTypes[143].updateContext = context => {
- context.push(types.j_expr, types.j_oTag);
- };
-}
+ } else {
+ context.push(types.template);
+ }
+};
+tokenTypes[143].updateContext = context => {
+ context.push(types.j_expr, types.j_oTag);
+};
let nonASCIIidentifierStartChars = "\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u037f\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u052f\u0531-\u0556\u0559\u0560-\u0588\u05d0-\u05ea\u05ef-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u0860-\u086a\u0870-\u0887\u0889-\u088f\u08a0-\u08c9\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u09fc\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0af9\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c39\u0c3d\u0c58-\u0c5a\u0c5c\u0c5d\u0c60\u0c61\u0c80\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cdc-\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d04-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d54-\u0d56\u0d5f-\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e86-\u0e8a\u0e8c-\u0ea3\u0ea5\u0ea7-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f5\u13f8-\u13fd\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f8\u1700-\u1711\u171f-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1878\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191e\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19b0-\u19c9\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4c\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1c80-\u1c8a\u1c90-\u1cba\u1cbd-\u1cbf\u1ce9-\u1cec\u1cee-\u1cf3\u1cf5\u1cf6\u1cfa\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2118-\u211d\u2124\u2126\u2128\u212a-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309b-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312f\u3131-\u318e\u31a0-\u31bf\u31f0-\u31ff\u3400-\u4dbf\u4e00-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua69d\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua7dc\ua7f1-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua8fd\ua8fe\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\ua9e0-\ua9e4\ua9e6-\ua9ef\ua9fa-\ua9fe\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa7e-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uab30-\uab5a\uab5c-\uab69\uab70-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc";
let nonASCIIidentifierChars = "\xb7\u0300-\u036f\u0387\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u0669\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u06f0-\u06f9\u0711\u0730-\u074a\u07a6-\u07b0\u07c0-\u07c9\u07eb-\u07f3\u07fd\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u0897-\u089f\u08ca-\u08e1\u08e3-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u09e6-\u09ef\u09fe\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0ae6-\u0aef\u0afa-\u0aff\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b55-\u0b57\u0b62\u0b63\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c00-\u0c04\u0c3c\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c66-\u0c6f\u0c81-\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0ce6-\u0cef\u0cf3\u0d00-\u0d03\u0d3b\u0d3c\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d66-\u0d6f\u0d81-\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0de6-\u0def\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0e50-\u0e59\u0eb1\u0eb4-\u0ebc\u0ec8-\u0ece\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1040-\u1049\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u1369-\u1371\u1712-\u1715\u1732-\u1734\u1752\u1753\u1772\u1773\u17b4-\u17d3\u17dd\u17e0-\u17e9\u180b-\u180d\u180f-\u1819\u18a9\u1920-\u192b\u1930-\u193b\u1946-\u194f\u19d0-\u19da\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1ab0-\u1abd\u1abf-\u1add\u1ae0-\u1aeb\u1b00-\u1b04\u1b34-\u1b44\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1bad\u1bb0-\u1bb9\u1be6-\u1bf3\u1c24-\u1c37\u1c40-\u1c49\u1c50-\u1c59\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf4\u1cf7-\u1cf9\u1dc0-\u1dff\u200c\u200d\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\u30fb\ua620-\ua629\ua66f\ua674-\ua67d\ua69e\ua69f\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua82c\ua880\ua881\ua8b4-\ua8c5\ua8d0-\ua8d9\ua8e0-\ua8f1\ua8ff-\ua909\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\ua9d0-\ua9d9\ua9e5\ua9f0-\ua9f9\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa50-\uaa59\uaa7b-\uaa7d\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uaaeb-\uaaef\uaaf5\uaaf6\uabe3-\uabea\uabec\uabed\uabf0-\uabf9\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f\uff65";
const nonASCIIidentifierStart = new RegExp("[" + nonASCIIidentifierStartChars + "]");
@@ -3321,9 +3294,7 @@
parseClassSuper(node) {
super.parseClassSuper(node);
if (node.superClass && (this.match(47) || this.match(51))) {
- {
- node.superTypeParameters = this.flowParseTypeParameterInstantiationInExpression();
- }
+ node.superTypeParameters = this.flowParseTypeParameterInstantiationInExpression();
}
if (this.isContextual(113)) {
this.next();
@@ -5119,7 +5090,6 @@
switch (node.type) {
case "ObjectExpression":
case "ObjectPattern":
- case "RecordExpression":
adjustInnerComments(node, node.properties, commentWS);
break;
case "CallExpression":
@@ -5139,7 +5109,6 @@
break;
case "ArrayExpression":
case "ArrayPattern":
- case "TupleExpression":
adjustInnerComments(node, node.elements, commentWS);
break;
case "ExportNamedDeclaration":
@@ -5147,15 +5116,21 @@
adjustInnerComments(node, node.specifiers, commentWS);
break;
case "TSEnumDeclaration":
- {
- adjustInnerComments(node, node.members, commentWS);
- }
+ adjustInnerComments(node, node.members, commentWS);
break;
case "TSEnumBody":
adjustInnerComments(node, node.members, commentWS);
break;
default:
{
+ if (node.type === "RecordExpression") {
+ adjustInnerComments(node, node.properties, commentWS);
+ break;
+ }
+ if (node.type === "TupleExpression") {
+ adjustInnerComments(node, node.elements, commentWS);
+ break;
+ }
setInnerComments(node, comments);
}
}
@@ -7097,19 +7072,17 @@
}
}
const NodePrototype = Node.prototype;
-{
- NodePrototype.__clone = function () {
- const newNode = new Node(undefined, this.start, this.loc.start);
- const keys = Object.keys(this);
- for (let i = 0, length = keys.length; i < length; i++) {
- const key = keys[i];
- if (key !== "leadingComments" && key !== "trailingComments" && key !== "innerComments") {
- newNode[key] = this[key];
- }
+NodePrototype.__clone = function () {
+ const newNode = new Node(undefined, this.start, this.loc.start);
+ const keys = Object.keys(this);
+ for (let i = 0, length = keys.length; i < length; i++) {
+ const key = keys[i];
+ if (key !== "leadingComments" && key !== "trailingComments" && key !== "innerComments") {
+ newNode[key] = this[key];
}
- return newNode;
- };
-}
+ }
+ return newNode;
+};
class NodeUtils extends UtilParser {
startNode() {
const loc = this.state.startLoc;
@@ -7961,13 +7934,9 @@
this.expect(10);
if (!this.match(134)) {
this.raise(TSErrors.UnsupportedImportTypeArgument, this.state.startLoc);
- {
- node.argument = super.parseExprAtom();
- }
+ node.argument = super.parseExprAtom();
} else {
- {
- node.argument = this.parseStringLiteral(this.state.value);
- }
+ node.argument = this.parseStringLiteral(this.state.value);
}
if (this.eat(12)) {
node.options = this.tsParseImportTypeOptions();
@@ -7979,9 +7948,7 @@
node.qualifier = this.tsParseEntityName(1 | 2);
}
if (this.match(47)) {
- {
- node.typeParameters = this.tsParseTypeArguments();
- }
+ node.typeParameters = this.tsParseTypeArguments();
}
return this.finishNode(node, "TSImportType");
}
@@ -8046,9 +8013,7 @@
const node = this.startNode();
node.typeName = this.tsParseEntityName(1);
if (!this.hasPrecedingLineBreak() && this.match(47)) {
- {
- node.typeParameters = this.tsParseTypeArguments();
- }
+ node.typeParameters = this.tsParseTypeArguments();
}
return this.finishNode(node, "TSTypeReference");
}
@@ -8071,14 +8036,10 @@
if (this.match(83)) {
node.exprName = this.tsParseImportType();
} else {
- {
- node.exprName = this.tsParseEntityName(1 | 2);
- }
+ node.exprName = this.tsParseEntityName(1 | 2);
}
if (!this.hasPrecedingLineBreak() && this.match(47)) {
- {
- node.typeParameters = this.tsParseTypeArguments();
- }
+ node.typeParameters = this.tsParseTypeArguments();
}
return this.finishNode(node, "TSTypeQuery");
}
@@ -8299,12 +8260,10 @@
node.readonly = true;
}
this.expect(0);
- {
- const typeParameter = this.startNode();
- typeParameter.name = this.tsParseTypeParameterName();
- typeParameter.constraint = this.tsExpectThenParseType(58);
- node.typeParameter = this.finishNode(typeParameter, "TSTypeParameter");
- }
+ const typeParameter = this.startNode();
+ typeParameter.name = this.tsParseTypeParameterName();
+ typeParameter.constraint = this.tsExpectThenParseType(58);
+ node.typeParameter = this.finishNode(typeParameter, "TSTypeParameter");
node.nameType = this.eatContextual(93) ? this.tsParseType() : null;
this.expect(3);
if (this.match(53)) {
@@ -8436,11 +8395,9 @@
return this.finishNode(node, "TSLiteralType");
}
tsParseTemplateLiteralType() {
- {
- const node = this.startNode();
- node.literal = super.parseTemplate(false);
- return this.finishNode(node, "TSLiteralType");
- }
+ const node = this.startNode();
+ node.literal = super.parseTemplate(false);
+ return this.finishNode(node, "TSLiteralType");
}
parseTemplateSubstitution() {
if (this.state.inType) return this.tsParseType();
@@ -8770,14 +8727,12 @@
tsParseHeritageClause(token) {
const originalStartLoc = this.state.startLoc;
const delimitedList = this.tsParseDelimitedList("HeritageClauseElement", () => {
- {
- const node = this.startNode();
- node.expression = this.tsParseEntityName(1 | 2);
- if (this.match(47)) {
- node.typeParameters = this.tsParseTypeArguments();
- }
- return this.finishNode(node, "TSExpressionWithTypeArguments");
+ const node = this.startNode();
+ node.expression = this.tsParseEntityName(1 | 2);
+ if (this.match(47)) {
+ node.typeParameters = this.tsParseTypeArguments();
}
+ return this.finishNode(node, "TSExpressionWithTypeArguments");
});
if (!delimitedList.length) {
this.raise(TSErrors.EmptyHeritageClauseType, originalStartLoc, {
@@ -8893,11 +8848,9 @@
this.expectContextual(126);
node.id = this.parseIdentifier();
this.checkIdentifier(node.id, node.const ? 8971 : 8459);
- {
- this.expect(5);
- node.members = this.tsParseDelimitedList("EnumMembers", this.tsParseEnumMember.bind(this));
- this.expect(8);
- }
+ this.expect(5);
+ node.members = this.tsParseDelimitedList("EnumMembers", this.tsParseEnumMember.bind(this));
+ this.expect(8);
return this.finishNode(node, "TSEnumDeclaration");
}
tsParseEnumBody() {
@@ -8936,9 +8889,7 @@
tsParseAmbientExternalModuleDeclaration(node) {
if (this.isContextual(112)) {
node.kind = "global";
- {
- node.global = true;
- }
+ node.global = true;
node.id = this.parseIdentifier();
} else if (this.match(134)) {
node.kind = "module";
@@ -8958,9 +8909,7 @@
return this.finishNode(node, "TSModuleDeclaration");
}
tsParseImportEqualsDeclaration(node, maybeDefaultIdentifier, isExport) {
- {
- node.isExport = isExport || false;
- }
+ node.isExport = isExport || false;
node.id = maybeDefaultIdentifier || this.parseIdentifier();
this.checkIdentifier(node.id, 4096);
this.expect(29);
@@ -9282,9 +9231,7 @@
}
if (tokenIsTemplate(this.state.type)) {
const result = super.parseTaggedTemplateExpression(base, startLoc, state);
- {
- result.typeParameters = typeArguments;
- }
+ result.typeParameters = typeArguments;
return result;
}
if (!noCalls && this.eat(10)) {
@@ -9292,23 +9239,19 @@
node.callee = base;
node.arguments = this.parseCallExpressionArguments();
this.tsCheckForInvalidTypeCasts(node.arguments);
- {
- node.typeParameters = typeArguments;
- }
+ node.typeParameters = typeArguments;
if (state.optionalChainMember) {
node.optional = isOptionalCall;
}
return this.finishCallExpression(node, state.optionalChainMember);
}
const tokenType = this.state.type;
- if (tokenType === 48 || tokenType === 52 || tokenType !== 10 && tokenCanStartExpression(tokenType) && !this.hasPrecedingLineBreak()) {
+ if (tokenType === 48 || tokenType === 52 || tokenType !== 10 && tokenType !== 93 && tokenType !== 120 && tokenCanStartExpression(tokenType) && !this.hasPrecedingLineBreak()) {
return;
}
const node = this.startNodeAt(startLoc);
node.expression = base;
- {
- node.typeParameters = typeArguments;
- }
+ node.typeParameters = typeArguments;
return this.finishNode(node, "TSInstantiationExpression");
});
if (missingParenErrorLoc) {
@@ -9335,9 +9278,7 @@
callee
} = node;
if (callee.type === "TSInstantiationExpression" && !((_callee$extra = callee.extra) != null && _callee$extra.parenthesized)) {
- {
- node.typeParameters = callee.typeParameters;
- }
+ node.typeParameters = callee.typeParameters;
node.callee = callee.expression;
}
}
@@ -9427,9 +9368,7 @@
nodeImportEquals.importKind = "value";
}
const declaration = this.tsParseImportEqualsDeclaration(nodeImportEquals, maybeDefaultIdentifier, true);
- {
- return declaration;
- }
+ return declaration;
} else if (this.eat(29)) {
const assign = node;
assign.expression = super.parseExpression();
@@ -9782,8 +9721,16 @@
}
parseClassSuper(node) {
super.parseClassSuper(node);
- if (node.superClass && (this.match(47) || this.match(51))) {
- {
+ if (node.superClass) {
+ if (node.superClass.type === "TSInstantiationExpression") {
+ const tsInstantiationExpression = node.superClass;
+ const superClass = tsInstantiationExpression.expression;
+ this.takeSurroundingComments(superClass, superClass.start, superClass.end);
+ const superTypeArguments = tsInstantiationExpression.typeParameters;
+ this.takeSurroundingComments(superTypeArguments, superTypeArguments.start, superTypeArguments.end);
+ node.superClass = superClass;
+ node.superTypeParameters = superTypeArguments;
+ } else if (this.match(47) || this.match(51)) {
node.superTypeParameters = this.tsParseTypeArgumentsInExpression();
}
}
@@ -9999,9 +9946,7 @@
const typeArguments = this.tsParseTypeArgumentsInExpression();
if (this.match(10)) {
const call = super.parseMaybeDecoratorArguments(expr, startLoc);
- {
- call.typeParameters = typeArguments;
- }
+ call.typeParameters = typeArguments;
return call;
}
this.unexpected(null, 10);
@@ -10092,9 +10037,7 @@
if (this.match(47) || this.match(51)) {
const typeArguments = this.tsTryParseAndCatch(() => this.tsParseTypeArgumentsInExpression());
if (typeArguments) {
- {
- node.typeParameters = typeArguments;
- }
+ node.typeParameters = typeArguments;
}
}
return super.jsxParseOpeningElementAfterName(node);
@@ -10542,7 +10485,8 @@
return false;
}
verifyBreakContinue(node, isBreak) {
- if (node.label && node.label.type === "Placeholder") return;
+ var _node$label;
+ if (((_node$label = node.label) == null ? void 0 : _node$label.type) === "Placeholder") return;
super.verifyBreakContinue(node, isBreak);
}
parseExpressionStatement(node, expr) {
@@ -10715,6 +10659,7 @@
throw new Error(`"pipelineOperator" requires "proposal" option whose value must be one of: ${proposalList}.`);
}
if (proposal === "hack") {
+ var _pluginsMap$get;
if (pluginsMap.has("placeholders")) {
throw new Error("Cannot combine placeholders plugin and Hack-style pipes.");
}
@@ -10726,25 +10671,20 @@
const tokenList = TOPIC_TOKENS.map(t => `"${t}"`).join(", ");
throw new Error(`"pipelineOperator" in "proposal": "hack" mode also requires a "topicToken" option whose value must be one of: ${tokenList}.`);
}
- {
- var _pluginsMap$get;
- if (topicToken === "#" && ((_pluginsMap$get = pluginsMap.get("recordAndTuple")) == null ? void 0 : _pluginsMap$get.syntaxType) === "hash") {
- throw new Error(`Plugin conflict between \`["pipelineOperator", { proposal: "hack", topicToken: "#" }]\` and \`${JSON.stringify(["recordAndTuple", pluginsMap.get("recordAndTuple")])}\`.`);
- }
+ if (topicToken === "#" && ((_pluginsMap$get = pluginsMap.get("recordAndTuple")) == null ? void 0 : _pluginsMap$get.syntaxType) === "hash") {
+ throw new Error(`Plugin conflict between \`["pipelineOperator", { proposal: "hack", topicToken: "#" }]\` and \`${JSON.stringify(["recordAndTuple", pluginsMap.get("recordAndTuple")])}\`.`);
}
} else if (proposal === "smart" && ((_pluginsMap$get2 = pluginsMap.get("recordAndTuple")) == null ? void 0 : _pluginsMap$get2.syntaxType) === "hash") {
throw new Error(`Plugin conflict between \`["pipelineOperator", { proposal: "smart" }]\` and \`${JSON.stringify(["recordAndTuple", pluginsMap.get("recordAndTuple")])}\`.`);
}
}
if (pluginsMap.has("moduleAttributes")) {
- {
- if (pluginsMap.has("deprecatedImportAssert") || pluginsMap.has("importAssertions")) {
- throw new Error("Cannot combine importAssertions, deprecatedImportAssert and moduleAttributes plugins.");
- }
- const moduleAttributesVersionPluginOption = pluginsMap.get("moduleAttributes").version;
- if (moduleAttributesVersionPluginOption !== "may-2020") {
- throw new Error("The 'moduleAttributes' plugin requires a 'version' option," + " representing the last proposal update. Currently, the" + " only supported value is 'may-2020'.");
- }
+ if (pluginsMap.has("deprecatedImportAssert") || pluginsMap.has("importAssertions")) {
+ throw new Error("Cannot combine importAssertions, deprecatedImportAssert and moduleAttributes plugins.");
+ }
+ const moduleAttributesVersionPluginOption = pluginsMap.get("moduleAttributes").version;
+ if (moduleAttributesVersionPluginOption !== "may-2020") {
+ throw new Error("The 'moduleAttributes' plugin requires a 'version' option," + " representing the last proposal update. Currently, the" + " only supported value is 'may-2020'.");
}
}
if (pluginsMap.has("importAssertions")) {
@@ -10752,19 +10692,15 @@
throw new Error("Cannot combine importAssertions and deprecatedImportAssert plugins.");
}
}
- if (!pluginsMap.has("deprecatedImportAssert") && pluginsMap.has("importAttributes") && pluginsMap.get("importAttributes").deprecatedAssertSyntax) {
- {
- pluginsMap.set("deprecatedImportAssert", {});
- }
+ if (pluginsMap.has("deprecatedImportAssert")) ;else if (pluginsMap.has("importAttributes") && pluginsMap.get("importAttributes").deprecatedAssertSyntax) {
+ pluginsMap.set("deprecatedImportAssert", {});
}
if (pluginsMap.has("recordAndTuple")) {
- {
- const syntaxType = pluginsMap.get("recordAndTuple").syntaxType;
- if (syntaxType != null) {
- const RECORD_AND_TUPLE_SYNTAX_TYPES = ["hash", "bar"];
- if (!RECORD_AND_TUPLE_SYNTAX_TYPES.includes(syntaxType)) {
- throw new Error("The 'syntaxType' option of the 'recordAndTuple' plugin must be one of: " + RECORD_AND_TUPLE_SYNTAX_TYPES.map(p => `'${p}'`).join(", "));
- }
+ const syntaxType = pluginsMap.get("recordAndTuple").syntaxType;
+ if (syntaxType != null) {
+ const RECORD_AND_TUPLE_SYNTAX_TYPES = ["hash", "bar"];
+ if (!RECORD_AND_TUPLE_SYNTAX_TYPES.includes(syntaxType)) {
+ throw new Error("The 'syntaxType' option of the 'recordAndTuple' plugin must be one of: " + RECORD_AND_TUPLE_SYNTAX_TYPES.map(p => `'${p}'`).join(", "));
}
}
}
@@ -11464,14 +11400,12 @@
throw this.unexpected();
}
default:
- {
- if (type === 137) {
- return this.parseDecimalLiteral(this.state.value);
- } else if (type === 2 || type === 1) {
- return this.parseArrayLike(this.state.type === 2 ? 4 : 3, true);
- } else if (type === 6 || type === 7) {
- return this.parseObjectLike(this.state.type === 6 ? 9 : 8, false, true);
- }
+ if (type === 137) {
+ return this.parseDecimalLiteral(this.state.value);
+ } else if (type === 2 || type === 1) {
+ return this.parseArrayLike(this.state.type === 2 ? 4 : 3, true);
+ } else if (type === 6 || type === 7) {
+ return this.parseObjectLike(this.state.type === 6 ? 9 : 8, false, true);
}
if (tokenIsIdentifier(type)) {
if (this.isContextual(127) && this.lookaheadInLineCharCode() === 123) {
@@ -11489,7 +11423,7 @@
this.next();
return this.parseAsyncFunctionExpression(this.startNodeAtNode(id));
} else if (tokenIsIdentifier(type)) {
- if (this.lookaheadCharCode() === 61) {
+ if (canBeArrow && this.lookaheadCharCode() === 61) {
return this.parseAsyncArrowUnaryFunction(this.startNodeAtNode(id));
} else {
return id;
@@ -11596,16 +11530,12 @@
const node = this.startNode();
this.next();
if (this.match(10) && !this.scope.allowDirectSuper) {
- {
- if (!(this.optionFlags & 16)) {
- this.raise(Errors.SuperNotAllowed, node);
- }
+ if (!(this.optionFlags & 16)) {
+ this.raise(Errors.SuperNotAllowed, node);
}
} else if (!this.scope.allowSuper) {
- {
- if (!(this.optionFlags & 16)) {
- this.raise(Errors.UnexpectedSuper, node);
- }
+ if (!(this.optionFlags & 16)) {
+ this.raise(Errors.UnexpectedSuper, node);
}
}
if (!this.match(10) && !this.match(0) && !this.match(16)) {
@@ -11685,9 +11615,7 @@
return this.parseLiteral(value, "NumericLiteral");
}
parseBigIntLiteral(value) {
- {
- return this.parseLiteral(value, "BigIntLiteral");
- }
+ return this.parseLiteral(value, "BigIntLiteral");
}
parseDecimalLiteral(value) {
return this.parseLiteral(value, "DecimalLiteral");
@@ -11907,10 +11835,8 @@
if (isRecord && !this.isObjectProperty(prop) && prop.type !== "SpreadElement") {
this.raise(Errors.InvalidRecordProperty, prop);
}
- {
- if (prop.shorthand) {
- this.addExtra(prop, "shorthand", true);
- }
+ if (prop.shorthand) {
+ this.addExtra(prop, "shorthand", true);
}
node.properties.push(prop);
}
@@ -12583,100 +12509,98 @@
type
} = token;
if (typeof type === "number") {
- {
- if (type === 139) {
- const {
- loc,
- start,
- value,
- end
- } = token;
- const hashEndPos = start + 1;
- const hashEndLoc = createPositionWithColumnOffset(loc.start, 1);
- tokens.splice(i, 1, new Token({
- type: getExportedToken(27),
- value: "#",
+ if (type === 139) {
+ const {
+ loc,
+ start,
+ value,
+ end
+ } = token;
+ const hashEndPos = start + 1;
+ const hashEndLoc = createPositionWithColumnOffset(loc.start, 1);
+ tokens.splice(i, 1, new Token({
+ type: getExportedToken(27),
+ value: "#",
+ start: start,
+ end: hashEndPos,
+ startLoc: loc.start,
+ endLoc: hashEndLoc
+ }), new Token({
+ type: getExportedToken(132),
+ value: value,
+ start: hashEndPos,
+ end: end,
+ startLoc: hashEndLoc,
+ endLoc: loc.end
+ }));
+ i++;
+ continue;
+ }
+ if (tokenIsTemplate(type)) {
+ const {
+ loc,
+ start,
+ value,
+ end
+ } = token;
+ const backquoteEnd = start + 1;
+ const backquoteEndLoc = createPositionWithColumnOffset(loc.start, 1);
+ let startToken;
+ if (input.charCodeAt(start - startIndex) === 96) {
+ startToken = new Token({
+ type: getExportedToken(22),
+ value: "`",
start: start,
- end: hashEndPos,
+ end: backquoteEnd,
startLoc: loc.start,
- endLoc: hashEndLoc
- }), new Token({
- type: getExportedToken(132),
- value: value,
- start: hashEndPos,
+ endLoc: backquoteEndLoc
+ });
+ } else {
+ startToken = new Token({
+ type: getExportedToken(8),
+ value: "}",
+ start: start,
+ end: backquoteEnd,
+ startLoc: loc.start,
+ endLoc: backquoteEndLoc
+ });
+ }
+ let templateValue, templateElementEnd, templateElementEndLoc, endToken;
+ if (type === 24) {
+ templateElementEnd = end - 1;
+ templateElementEndLoc = createPositionWithColumnOffset(loc.end, -1);
+ templateValue = value === null ? null : value.slice(1, -1);
+ endToken = new Token({
+ type: getExportedToken(22),
+ value: "`",
+ start: templateElementEnd,
end: end,
- startLoc: hashEndLoc,
+ startLoc: templateElementEndLoc,
endLoc: loc.end
- }));
- i++;
- continue;
+ });
+ } else {
+ templateElementEnd = end - 2;
+ templateElementEndLoc = createPositionWithColumnOffset(loc.end, -2);
+ templateValue = value === null ? null : value.slice(1, -2);
+ endToken = new Token({
+ type: getExportedToken(23),
+ value: "${",
+ start: templateElementEnd,
+ end: end,
+ startLoc: templateElementEndLoc,
+ endLoc: loc.end
+ });
}
- if (tokenIsTemplate(type)) {
- const {
- loc,
- start,
- value,
- end
- } = token;
- const backquoteEnd = start + 1;
- const backquoteEndLoc = createPositionWithColumnOffset(loc.start, 1);
- let startToken;
- if (input.charCodeAt(start - startIndex) === 96) {
- startToken = new Token({
- type: getExportedToken(22),
- value: "`",
- start: start,
- end: backquoteEnd,
- startLoc: loc.start,
- endLoc: backquoteEndLoc
- });
- } else {
- startToken = new Token({
- type: getExportedToken(8),
- value: "}",
- start: start,
- end: backquoteEnd,
- startLoc: loc.start,
- endLoc: backquoteEndLoc
- });
- }
- let templateValue, templateElementEnd, templateElementEndLoc, endToken;
- if (type === 24) {
- templateElementEnd = end - 1;
- templateElementEndLoc = createPositionWithColumnOffset(loc.end, -1);
- templateValue = value === null ? null : value.slice(1, -1);
- endToken = new Token({
- type: getExportedToken(22),
- value: "`",
- start: templateElementEnd,
- end: end,
- startLoc: templateElementEndLoc,
- endLoc: loc.end
- });
- } else {
- templateElementEnd = end - 2;
- templateElementEndLoc = createPositionWithColumnOffset(loc.end, -2);
- templateValue = value === null ? null : value.slice(1, -2);
- endToken = new Token({
- type: getExportedToken(23),
- value: "${",
- start: templateElementEnd,
- end: end,
- startLoc: templateElementEndLoc,
- endLoc: loc.end
- });
- }
- tokens.splice(i, 1, startToken, new Token({
- type: getExportedToken(20),
- value: templateValue,
- start: backquoteEnd,
- end: templateElementEnd,
- startLoc: backquoteEndLoc,
- endLoc: templateElementEndLoc
- }), endToken);
- i += 2;
- continue;
- }
+ tokens.splice(i, 1, startToken, new Token({
+ type: getExportedToken(20),
+ value: templateValue,
+ start: backquoteEnd,
+ end: templateElementEnd,
+ startLoc: backquoteEndLoc,
+ endLoc: templateElementEndLoc
+ }), endToken);
+ i += 2;
+ continue;
}
token.type = getExportedToken(type);
}
@@ -14401,9 +14325,7 @@
}
maybeParseImportAttributes(node) {
let attributes;
- {
- var useWith = false;
- }
+ var useWith = false;
if (this.match(76)) {
if (this.hasPrecedingLineBreak() && this.lookaheadCharCode() === 40) {
return;
@@ -14415,9 +14337,7 @@
} else {
attributes = this.parseImportAttributes();
}
- {
- useWith = true;
- }
+ useWith = true;
} else if (this.isContextual(94) && !this.hasPrecedingLineBreak()) {
if (!this.hasPlugin("deprecatedImportAssert") && !this.hasPlugin("importAssertions")) {
this.raise(Errors.ImportAttributesUseAssert, this.state.startLoc);
--
Gitblit v1.9.3