@danielx/civet 0.5.81 → 0.5.83

package/dist/browser.js

@@ -116,12 +116,29 @@ var Civet = (() => {
         }
         return nodes;
       }
+      function hasAwait(exp) {
+        return gatherRecursiveWithinFunction(exp, ({ type }) => type === "Await").length > 0;
+      }
+      function hasYield(exp) {
+        return gatherRecursiveWithinFunction(exp, ({ type }) => type === "Yield").length > 0;
+      }
+      function isFunction(node) {
+        const { type } = node;
+        return type === "FunctionExpression" || type === "ArrowFunction" || type === "MethodDefinition" || node.async;
+      }
+      function gatherRecursiveWithinFunction(node, predicate) {
+        return gatherRecursive(node, predicate, isFunction);
+      }
       module.exports = {
         clone,
         deepCopy,
         gatherNodes,
         gatherRecursive,
         gatherRecursiveAll,
+        gatherRecursiveWithinFunction,
+        hasAwait,
+        hasYield,
+        isFunction,
         removeParentPointers
       };
     }
@@ -569,7 +586,6 @@ ${input.slice(result.pos)}
         YieldExpression,
         YieldTail,
         ArrowFunction,
-        ArrowFunctionTail,
         FatArrow,
         FatArrowBody,
         ConditionalExpression,
@@ -805,6 +821,7 @@ ${input.slice(result.pos)}
         ForbidClassImplicitCall,
         AllowClassImplicitCall,
         RestoreClassImplicitCall,
+        ClassImplicitCallForbidden,
         ForbidIndentedApplication,
         AllowIndentedApplication,
         RestoreIndentedApplication,
@@ -1841,7 +1858,7 @@ ${input.slice(result.pos)}
       }
       var ForbiddenImplicitCalls$0 = $R$0($EXPECT($R0, fail, "ForbiddenImplicitCalls /(as|of|satisfies|then|when|implements|xor|xnor)(?!\\p{ID_Continue}|[\\u200C\\u200D$])/"));
       var ForbiddenImplicitCalls$1 = $EXPECT($L1, fail, 'ForbiddenImplicitCalls "/ "');
-      var ForbiddenImplicitCalls$2 = $S(ForbidClassImplicitCall, Class);
+      var ForbiddenImplicitCalls$2 = $S(ClassImplicitCallForbidden, Class);
       var ForbiddenImplicitCalls$3 = AtAt;
       var ForbiddenImplicitCalls$4 = $S(Identifier, $EXPECT($L2, fail, 'ForbiddenImplicitCalls "="'), Whitespace);
       var ForbiddenImplicitCalls$5 = $TS($S(Identifier, $N($EXPECT($L3, fail, 'ForbiddenImplicitCalls "("'))), function($skip, $loc, $0, $1, $2) {
@@ -2589,53 +2606,36 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var ArrowFunction$0 = $TS($S($E($S(Async, __)), ArrowFunctionTail), function($skip, $loc, $0, $1, $2) {
-        var tail = $2;
-        return {
-          ...tail,
-          children: [...$1 || [], ...tail.children]
-        };
-      });
-      function ArrowFunction(state) {
-        let eventData;
-        if (state.events) {
-          const result = state.events.enter?.("ArrowFunction", state);
-          if (result) {
-            if (result.cache)
-              return result.cache;
-            eventData = result.data;
-          }
+      var ArrowFunction$0 = ThinArrowFunction;
+      var ArrowFunction$1 = $TS($S($E($S(Async, _)), Parameters, $E(ReturnTypeSuffix), FatArrow, FatArrowBody), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+        var async = $1;
+        var parameters = $2;
+        var suffix = $3;
+        var expOrBlock = $5;
+        if (hasAwait(expOrBlock) && !async) {
+          async = "async ";
         }
-        if (state.tokenize) {
-          const result = $TOKEN("ArrowFunction", state, ArrowFunction$0(state));
-          if (state.events)
-            state.events.exit?.("ArrowFunction", state, result, eventData);
-          return result;
-        } else {
-          const result = ArrowFunction$0(state);
-          if (state.events)
-            state.events.exit?.("ArrowFunction", state, result, eventData);
-          return result;
+        let error;
+        if (hasYield(expOrBlock)) {
+          error = {
+            type: "Error",
+            message: "Can't use yield inside of => arrow function"
+          };
         }
-      }
-      var ArrowFunctionTail$0 = ThinArrowFunction;
-      var ArrowFunctionTail$1 = $TS($S(Parameters, $E(ReturnTypeSuffix), FatArrow, FatArrowBody), function($skip, $loc, $0, $1, $2, $3, $4) {
-        var parameters = $1;
-        var suffix = $2;
-        var expOrBlock = $4;
         return {
           type: "ArrowFunction",
           parameters,
           returnType: suffix,
           ts: false,
+          async,
           block: expOrBlock,
-          children: $0
+          children: [async, $0.slice(1), error]
         };
       });
-      function ArrowFunctionTail(state) {
+      function ArrowFunction(state) {
         let eventData;
         if (state.events) {
-          const result = state.events.enter?.("ArrowFunctionTail", state);
+          const result = state.events.enter?.("ArrowFunction", state);
           if (result) {
             if (result.cache)
               return result.cache;
@@ -2643,14 +2643,14 @@ ${input.slice(result.pos)}
           }
         }
         if (state.tokenize) {
-          const result = $TOKEN("ArrowFunctionTail", state, ArrowFunctionTail$0(state) || ArrowFunctionTail$1(state));
+          const result = $TOKEN("ArrowFunction", state, ArrowFunction$0(state) || ArrowFunction$1(state));
           if (state.events)
-            state.events.exit?.("ArrowFunctionTail", state, result, eventData);
+            state.events.exit?.("ArrowFunction", state, result, eventData);
           return result;
         } else {
-          const result = ArrowFunctionTail$0(state) || ArrowFunctionTail$1(state);
+          const result = ArrowFunction$0(state) || ArrowFunction$1(state);
           if (state.events)
-            state.events.exit?.("ArrowFunctionTail", state, result, eventData);
+            state.events.exit?.("ArrowFunction", state, result, eventData);
           return result;
         }
       }
@@ -3561,9 +3561,16 @@ ${input.slice(result.pos)}
         var exp = $6;
         switch (exp.type) {
           case "FunctionExpression":
+            const fnTokenIndex = exp.children.findIndex((c) => c?.token?.startsWith("function"));
+            const children = exp.children.slice();
+            if (exp.generator) {
+              children.splice(fnTokenIndex, 2, children[fnTokenIndex + 1], id);
+            } else {
+              children.splice(fnTokenIndex, 1, id);
+            }
             return {
               ...exp,
-              children: [id, ...exp.children.slice(1)]
+              children
             };
           default:
             return [id, " = ", exp];
@@ -5664,22 +5671,28 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var FunctionSignature$0 = $TS($S($E($S(Async, $E(_))), Function, $E($S($E(_), Star)), $E($S($E(_), NWBindingIdentifier)), $E(_), Parameters, $E(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+      var FunctionSignature$0 = $TS($S($E($S(Async, _)), Function, $E($S($E(_), Star)), $E($S($E(_), NWBindingIdentifier)), $E(_), Parameters, $E(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
         var async = $1;
         var func = $2;
-        var star = $3;
+        var generator = $3;
         var wid = $4;
         var w = $5;
         var parameters = $6;
         var suffix = $7;
+        if (!async)
+          async = [];
+        if (!generator)
+          generator = [];
         return {
           type: "FunctionSignature",
           id: wid?.[1],
           parameters,
           returnType: suffix,
           ts: false,
+          async,
+          generator,
           block: null,
-          children: !parameters.implicit ? $0 : [async, func, star, wid, parameters, w, suffix]
+          children: !parameters.implicit ? $0 : [async, func, generator, wid, parameters, w, suffix]
         };
       });
       function FunctionSignature(state) {
@@ -5711,6 +5724,12 @@ ${input.slice(result.pos)}
           signature.ts = true;
           return signature;
         }
+        if (hasAwait(block) && !signature.async.length) {
+          signature.async.push("async ");
+        }
+        if (hasYield(block) && !signature.generator.length) {
+          signature.generator.push("*");
+        }
         return {
           ...signature,
           type: "FunctionExpression",
@@ -5759,7 +5778,7 @@ ${input.slice(result.pos)}
           body = [prefix, rhs];
         }
         const children = [ref, " => ", ...body];
-        if (module.hasAwait(body)) {
+        if (hasAwait(body)) {
           children.unshift("async ");
         }
         return {
@@ -5959,20 +5978,32 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var ThinArrowFunction$0 = $TS($S(Parameters, $E(ReturnTypeSuffix), $Q(_), Arrow, BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-        var parameters = $1;
-        var suffix = $2;
-        var arrow = $4;
-        var block = $5;
+      var ThinArrowFunction$0 = $TS($S($E($S(Async, _)), Parameters, $E(ReturnTypeSuffix), $Q(_), Arrow, BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+        var async = $1;
+        var parameters = $2;
+        var suffix = $3;
+        var arrow = $5;
+        var block = $6;
+        if (hasAwait(block) && !async) {
+          async = "async ";
+        }
+        let generator;
+        if (hasYield(block)) {
+          generator = "*";
+        }
         return {
           type: "FunctionExpression",
           id: void 0,
           parameters,
           returnType: suffix,
           ts: false,
+          async,
+          generator,
           block,
           children: [
+            async,
             { $loc: arrow.$loc, token: "function" },
+            generator,
             parameters,
             suffix,
             block
@@ -7939,9 +7970,38 @@ ${input.slice(result.pos)}
       var MethodDefinition$1 = $TS($S(MethodSignature, $N(PropertyAccess), BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3) {
         var signature = $1;
         var block = $3;
+        let children = $0;
+        let generatorPos = 0;
+        const { modifier } = signature;
+        if (hasAwait(block)) {
+          generatorPos++;
+          children = children.slice();
+          if (modifier?.get || modifier?.set) {
+            children.push({
+              type: "Error",
+              message: "Getters and setters cannot be async"
+            });
+          } else if (modifier?.async) {
+          } else {
+            children.unshift("async ");
+          }
+        }
+        if (hasYield(block)) {
+          if (children === $0)
+            children = children.slice();
+          if (modifier?.get || modifier?.set) {
+            children.push({
+              type: "Error",
+              message: "Getters and setters cannot be generators"
+            });
+          } else if (modifier?.generator) {
+          } else {
+            children.splice(generatorPos, 0, "*");
+          }
+        }
         return {
           type: "MethodDefinition",
-          children: $0,
+          children,
           name: signature.name,
           signature,
           block,
@@ -7970,9 +8030,37 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var MethodModifier$0 = $S(GetOrSet, $E(_));
-      var MethodModifier$1 = $S($S(Async, __), $E($S(Star, __)));
-      var MethodModifier$2 = $S(Star, __);
+      var MethodModifier$0 = $TS($S(GetOrSet, $E(_)), function($skip, $loc, $0, $1, $2) {
+        var kind = $1;
+        return {
+          type: "MethodModifier",
+          async: false,
+          generator: false,
+          get: kind.token === "get",
+          set: kind.token === "set",
+          children: $0
+        };
+      });
+      var MethodModifier$1 = $TS($S($S(Async, __), $E($S(Star, __))), function($skip, $loc, $0, $1, $2) {
+        return {
+          type: "MethodModifier",
+          async: true,
+          get: false,
+          set: false,
+          generator: !!$1,
+          children: $0
+        };
+      });
+      var MethodModifier$2 = $TS($S(Star, __), function($skip, $loc, $0, $1, $2) {
+        return {
+          type: "MethodModifier",
+          async: false,
+          get: false,
+          set: false,
+          generator: true,
+          children: $0
+        };
+      });
       function MethodModifier(state) {
         let eventData;
         if (state.events) {
@@ -8005,7 +8093,8 @@ ${input.slice(result.pos)}
           parameters
         };
       });
-      var MethodSignature$1 = $TS($S($E(MethodModifier), ClassElementName, $Q(_), NonEmptyParameters, $E(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var MethodSignature$1 = $TS($S($E(MethodModifier), ClassElementName, $E(_), NonEmptyParameters, $E(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+        var modifier = $1;
         var name = $2;
         var parameters = $4;
         var suffix = $5;
@@ -8018,7 +8107,7 @@ ${input.slice(result.pos)}
           type: "MethodSignature",
           children: $0,
           name,
-          modifier: $1?.[0]?.token,
+          modifier,
           returnType: suffix,
           parameters
         };
@@ -10702,6 +10791,33 @@ ${input.slice(result.pos)}
           return result;
         }
       }
+      var ClassImplicitCallForbidden$0 = $TV($EXPECT($L0, fail, 'ClassImplicitCallForbidden ""'), function($skip, $loc, $0, $1) {
+        if (module.classImplicitCallForbidden)
+          return $skip;
+        return;
+      });
+      function ClassImplicitCallForbidden(state) {
+        let eventData;
+        if (state.events) {
+          const result = state.events.enter?.("ClassImplicitCallForbidden", state);
+          if (result) {
+            if (result.cache)
+              return result.cache;
+            eventData = result.data;
+          }
+        }
+        if (state.tokenize) {
+          const result = $TOKEN("ClassImplicitCallForbidden", state, ClassImplicitCallForbidden$0(state));
+          if (state.events)
+            state.events.exit?.("ClassImplicitCallForbidden", state, result, eventData);
+          return result;
+        } else {
+          const result = ClassImplicitCallForbidden$0(state);
+          if (state.events)
+            state.events.exit?.("ClassImplicitCallForbidden", state, result, eventData);
+          return result;
+        }
+      }
       var ForbidIndentedApplication$0 = $TV($EXPECT($L0, fail, 'ForbidIndentedApplication ""'), function($skip, $loc, $0, $1) {
         module.forbidIndentedApplication.push(true);
       });
@@ -15886,7 +16002,7 @@ ${input.slice(result.pos)}
         }
       }
       var Yield$0 = $TS($S($EXPECT($L164, fail, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
-        return { $loc, token: $1 };
+        return { $loc, token: $1, type: "Yield" };
       });
       function Yield(state) {
         let eventData;
@@ -20698,15 +20814,12 @@ ${input.slice(result.pos)}
             ], exp.async)
           );
         }
-        module.hasAwait = (exp) => {
-          return gatherRecursiveWithinFunction(exp, ({ type }) => type === "Await").length > 0;
-        };
         module.wrapIIFE = (exp, async) => {
           let prefix, suffix;
           if (async) {
             prefix = "(async ()=>{";
             suffix = "})()";
-          } else if (module.hasAwait(exp)) {
+          } else if (hasAwait(exp)) {
             prefix = "(await (async ()=>{";
             suffix = "})())";
           } else {
@@ -21280,13 +21393,6 @@ ${input.slice(result.pos)}
             }, props2]
           };
         };
-        function isFunction(node) {
-          const { type } = node;
-          return type === "FunctionExpression" || type === "ArrowFunction" || type === "MethodDefinition" || node.async;
-        }
-        function gatherRecursiveWithinFunction(node, predicate) {
-          return gatherRecursive(node, predicate, isFunction);
-        }
         function addParentPointers(node, parent) {
           if (node == null)
             return;
@@ -21458,7 +21564,7 @@ ${input.slice(result.pos)}
               const { signature, block } = f;
               const isConstructor = signature.name === "constructor";
               const isVoid = isVoidType(signature.returnType?.t);
-              const isSet = signature.modifier === "set";
+              const isSet = signature.modifier?.set;
               if (!isConstructor && !isSet && !isVoid) {
                 insertReturn(block);
               }
@@ -21619,24 +21725,24 @@ ${input.slice(result.pos)}
         };
         module.convertMethodToFunction = function(method) {
           const { signature, block } = method;
-          let opening = signature.children[0];
-          if (opening) {
-            if (opening[0].type === "GetOrSet") {
+          let { modifier } = signature;
+          if (modifier) {
+            if (modifier.get || modifier.set) {
               throw new Error("cannot convert get/set method to function");
-            } else if (opening[0][0]?.type === "Async") {
-              opening = [opening[0][0], " function ", ...opening.slice(1)];
+            } else if (modifier.async) {
+              modifier = [modifier.children[0][0], " function ", ...modifier.children.slice(1)];
             } else {
-              opening = ["function ", ...opening];
+              modifier = ["function ", ...modifier.children];
             }
           } else {
-            opening = "function ";
+            modifier = "function ";
           }
           return {
             ...signature,
             id: signature.name,
             type: "FunctionExpression",
             children: [
-              [opening, ...signature.children.slice(1)],
+              [modifier, ...signature.children.slice(1)],
               block
             ],
             block
@@ -22611,6 +22717,10 @@ ${input.slice(result.pos)}
         gatherNodes,
         gatherRecursive,
         gatherRecursiveAll,
+        gatherRecursiveWithinFunction,
+        hasAwait,
+        hasYield,
+        isFunction,
         removeParentPointers
       } = require_lib();
     }
@@ -23049,7 +23159,7 @@ ${input.slice(result.pos)}
   var uncacheable;
   ({ parse } = import_parser.default);
   ({ SourceMap: SourceMap2, base64Encode: base64Encode2 } = util_exports);
-  uncacheable = /* @__PURE__ */ new Set(["ActualAssignment", "AllowAll", "AllowIndentedApplication", "AllowTrailingMemberProperty", "AllowedTrailingMemberExpressions", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "CoffeeCommentEnabled", "CommaDelimiter", "ConditionalExpression", "Declaration", "Debugger", "ElementListWithIndentedApplicationForbidden", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationForbidden", "ExtendedExpression", "FatArrowBody", "ForbidIndentedApplication", "ForbidTrailingMemberProperty", "FunctionDeclaration", "FunctionExpression", "HoistableDeclaration", "ImplicitArguments", "ImplicitInlineObjectPropertyDelimiter", "ImplicitNestedBlock", "IndentedApplicationAllowed", "IndentedFurther", "IndentedJSXChildExpression", "InlineObjectLiteral", "InsertIndent", "JSXChild", "JSXChildren", "JSXElement", "JSXFragment", "JSXImplicitFragment", "JSXMixedChildren", "JSXNested", "JSXNestedChildren", "JSXOptionalClosingElement", "JSXOptionalClosingFragment", "JSXTag", "LeftHandSideExpression", "MemberExpression", "MemberExpressionRest", "Nested", "NestedBindingElement", "NestedBindingElements", "NestedBlockExpression", "NestedBlockExpression", "NestedBlockStatement", "NestedBlockStatements", "NestedClassSignatureElement", "NestedClassSignatureElements", "NestedDeclareElement", "NestedDeclareElements", "NestedElement", "NestedElementList", "NestedImplicitObjectLiteral", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedInterfaceProperty", "NestedJSXChildExpression", "NestedModuleItem", "NestedModuleItems", "NestedObject", "NestedPropertyDefinitions", "NonSingleBracedBlock", "NotDedented", "ObjectLiteral", "PopIndent", "PopJSXStack", "PostfixedExpression", "PostfixedStatement", "PrimaryExpression", "PushIndent", "PushJSXOpeningElement", "PushJSXOpeningFragment", "RestoreAll", "RestoreIndentedApplication", "RestoreTrailingMemberProperty", "RHS", "Samedent", "ShortCircuitExpression", "SingleLineAssignmentExpression", "SingleLineComment", "SingleLineStatements", "SnugNamedProperty", "Statement", "StatementListItem", "SuffixedExpression", "SuffixedStatement", "ThinArrowFunction", "TrackIndented", "TrailingMemberExpressions", "TrailingMemberPropertyAllowed", "TypedJSXElement", "TypedJSXFragment", "UnaryExpression", "UpdateExpression"]);
+  uncacheable = /* @__PURE__ */ new Set(["ActualAssignment", "AllowAll", "AllowClassImplicitCall", "AllowIndentedApplication", "AllowTrailingMemberProperty", "AllowedTrailingMemberExpressions", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "ClassImplicitCallForbidden", "CoffeeCommentEnabled", "CommaDelimiter", "ConditionalExpression", "Declaration", "Debugger", "ElementListWithIndentedApplicationForbidden", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationForbidden", "ExtendedExpression", "FatArrowBody", "ForbidClassImplicitCall", "ForbidIndentedApplication", "ForbidTrailingMemberProperty", "FunctionDeclaration", "FunctionExpression", "HoistableDeclaration", "ImplicitArguments", "ImplicitInlineObjectPropertyDelimiter", "ImplicitNestedBlock", "IndentedApplicationAllowed", "IndentedFurther", "IndentedJSXChildExpression", "InlineObjectLiteral", "InsertIndent", "JSXChild", "JSXChildren", "JSXElement", "JSXFragment", "JSXImplicitFragment", "JSXMixedChildren", "JSXNested", "JSXNestedChildren", "JSXOptionalClosingElement", "JSXOptionalClosingFragment", "JSXTag", "LeftHandSideExpression", "MemberExpression", "MemberExpressionRest", "Nested", "NestedBindingElement", "NestedBindingElements", "NestedBlockExpression", "NestedBlockExpression", "NestedBlockStatement", "NestedBlockStatements", "NestedClassSignatureElement", "NestedClassSignatureElements", "NestedDeclareElement", "NestedDeclareElements", "NestedElement", "NestedElementList", "NestedImplicitObjectLiteral", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedInterfaceProperty", "NestedJSXChildExpression", "NestedModuleItem", "NestedModuleItems", "NestedObject", "NestedPropertyDefinitions", "NonSingleBracedBlock", "NotDedented", "ObjectLiteral", "PopIndent", "PopJSXStack", "PostfixedExpression", "PostfixedStatement", "PrimaryExpression", "PushIndent", "PushJSXOpeningElement", "PushJSXOpeningFragment", "RestoreAll", "RestoreClassImplicitCall", "RestoreIndentedApplication", "RestoreTrailingMemberProperty", "RHS", "Samedent", "ShortCircuitExpression", "SingleLineAssignmentExpression", "SingleLineComment", "SingleLineStatements", "SnugNamedProperty", "Statement", "StatementListItem", "SuffixedExpression", "SuffixedStatement", "ThinArrowFunction", "TrackIndented", "TrailingMemberExpressions", "TrailingMemberPropertyAllowed", "TypedJSXElement", "TypedJSXFragment", "UnaryExpression", "UpdateExpression"]);
   var compile = function(src, options) {
     var ast, code, events, filename, ref, result, sm, srcMapJSON;
     if (!options) {