@danielx/civet 0.6.29 → 0.6.31

package/README.md

@@ -23,7 +23,7 @@ The modern way to write TypeScript.
   [Vite](https://github.com/lorefnon/vite-plugin-civet),
   -->
   [Babel](source/babel-plugin.mjs),
-  [Gulp](integrations/gulp),
+  [Gulp](integration/gulp),
   [ESM module resolution](source/esm.civet),
   [CJS](register.js),
   [Bun](source/bun-civet.coffee)

package/dist/browser.js

@@ -629,7 +629,8 @@ ${input.slice(result.pos)}
           aliasBinding(p.value, ref);
         } else {
           p.value = ref;
-          p.children.push(": ", ref);
+          const index = p.children.indexOf(p.name);
+          p.children.splice(index + 1, 0, ": ", ref);
         }
       }
       function arrayElementHasTrailingComma(elementNode) {
@@ -1912,7 +1913,7 @@ ${input.slice(result.pos)}
           } else if (modifier.async) {
             modifier = [modifier.children[0][0], " function ", ...modifier.children.slice(1)];
           } else {
-            modifier = ["function ", ...modifier.children];
+            modifier = ["function ", ...modifier.children || []];
           }
         } else {
           modifier = "function ";
@@ -1920,6 +1921,7 @@ ${input.slice(result.pos)}
         return {
           ...signature,
           id: signature.name,
+          signature,
           type: "FunctionExpression",
           children: [
             [modifier, ...signature.children.slice(1)],
@@ -2061,40 +2063,31 @@ ${input.slice(result.pos)}
           f.ts = false;
         }
       }
+      function processReturn(f, implicitReturns) {
+        if (!processReturnValue(f) && implicitReturns) {
+          const { signature, block } = f;
+          const { modifier, name, returnType } = signature;
+          const { async, set } = modifier;
+          const isMethod = f.type === "MethodDefinition";
+          const isConstructor = isMethod && name === "constructor";
+          const isVoid = isVoidType(returnType?.t) || async && isPromiseVoidType(returnType?.t);
+          const isBlock = block?.type === "BlockStatement";
+          if (!isVoid && !set && !isConstructor && isBlock) {
+            insertReturn(block);
+          }
+        }
+      }
       function processFunctions(statements, config) {
         gatherRecursiveAll(statements, ({ type }) => type === "FunctionExpression" || type === "ArrowFunction").forEach((f) => {
           if (f.type === "FunctionExpression")
             implicitFunctionBlock(f);
           processParams(f);
-          if (!processReturnValue(f) && config.implicitReturns) {
-            const { async, block, returnType } = f;
-            const isVoid = isVoidType(returnType?.t) || async && isPromiseVoidType(returnType?.t);
-            const isBlock = block?.type === "BlockStatement";
-            if (!isVoid && isBlock) {
-              return insertReturn(block);
-            }
-            ;
-            return;
-          }
-          ;
-          return;
+          return processReturn(f, config.implicitReturns);
         });
         gatherRecursiveAll(statements, ({ type }) => type === "MethodDefinition").forEach((f) => {
           implicitFunctionBlock(f);
           processParams(f);
-          if (!processReturnValue(f) && config.implicitReturns) {
-            const { signature, block } = f;
-            const isConstructor = signature.name === "constructor";
-            const isVoid = isVoidType(signature.returnType?.t);
-            const isSet = signature.modifier?.set;
-            if (!isConstructor && !isSet && !isVoid) {
-              return insertReturn(block);
-            }
-            ;
-            return;
-          }
-          ;
-          return;
+          return processReturn(f, config.implicitReturns);
         });
       }
       function processSwitchExpressions(statements) {
@@ -3419,6 +3412,8 @@ ${input.slice(result.pos)}
         ReturnValue,
         AfterReturnShorthand,
         Parameters,
+        ShortArrowParameters,
+        ArrowParameters,
         NonEmptyParameters,
         FunctionRestParameter,
         ParameterElement,
@@ -4734,7 +4729,7 @@ ${input.slice(result.pos)}
         return $EVENT_C(ctx, state, "YieldTail", YieldTail$$);
       }
       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 ArrowFunction$1 = $TS($S($E($S(Async, _)), ArrowParameters, $E(ReturnTypeSuffix), FatArrow, FatArrowBody), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         var async = $1;
         var parameters = $2;
         var suffix = $3;
@@ -4751,6 +4746,12 @@ ${input.slice(result.pos)}
         }
         return {
           type: "ArrowFunction",
+          signature: {
+            modifier: {
+              async: !!async
+            },
+            returnType: suffix
+          },
           parameters,
           returnType: suffix,
           ts: false,
@@ -4826,6 +4827,11 @@ ${input.slice(result.pos)}
           };
           return {
             type: "ArrowFunction",
+            signature: {
+              modifier: {
+                children: []
+              }
+            },
             children: [ref, " => ", arrowBody],
             ref,
             body: [arrowBody],
@@ -5525,6 +5531,24 @@ ${input.slice(result.pos)}
       function Parameters(ctx, state) {
         return $EVENT_C(ctx, state, "Parameters", Parameters$$);
       }
+      var ShortArrowParameters$0 = ObjectBindingPattern;
+      var ShortArrowParameters$1 = ArrayBindingPattern;
+      var ShortArrowParameters$$ = [ShortArrowParameters$0, ShortArrowParameters$1];
+      function ShortArrowParameters(ctx, state) {
+        return $EVENT_C(ctx, state, "ShortArrowParameters", ShortArrowParameters$$);
+      }
+      var ArrowParameters$0 = $TS($S(ShortArrowParameters), function($skip, $loc, $0, $1) {
+        return {
+          type: "Parameters",
+          children: ["(", $0, ")"],
+          names: $0.names
+        };
+      });
+      var ArrowParameters$1 = Parameters;
+      var ArrowParameters$$ = [ArrowParameters$0, ArrowParameters$1];
+      function ArrowParameters(ctx, state) {
+        return $EVENT_C(ctx, state, "ArrowParameters", ArrowParameters$$);
+      }
       var NonEmptyParameters$0 = $TS($S($E(TypeParameters), OpenParen, $E(ThisType), $Q(ParameterElement), $E(FunctionRestParameter), $Q(ParameterElement), $S(__, CloseParen)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
         var tp = $1;
         var open = $2;
@@ -5969,6 +5993,10 @@ ${input.slice(result.pos)}
           ts: false,
           async,
           generator,
+          modifier: {
+            async: !async.length,
+            generator: !generator.length
+          },
           block: null,
           children: !parameters.implicit ? [async, func, generator, wid, w, parameters, suffix] : [async, func, generator, wid, parameters, w, suffix]
         };
@@ -5983,6 +6011,7 @@ ${input.slice(result.pos)}
           return {
             ...signature,
             type: "FunctionExpression",
+            signature,
             ts: true
           };
         }
@@ -5995,6 +6024,7 @@ ${input.slice(result.pos)}
         return {
           ...signature,
           type: "FunctionExpression",
+          signature,
           children: [...signature.children, block],
           block
         };
@@ -6003,6 +6033,9 @@ ${input.slice(result.pos)}
         const ref = makeRef("$"), body = [ref];
         return {
           type: "ArrowFunction",
+          signature: {
+            modifier: {}
+          },
           children: [ref, " => ", body],
           ref,
           body,
@@ -6014,7 +6047,6 @@ ${input.slice(result.pos)}
         var id = $1;
         var ws = $4;
         var fn = $5;
-        debugger;
         return {
           ...fn,
           id,
@@ -6051,11 +6083,17 @@ ${input.slice(result.pos)}
           };
         }
         const children = [ref, " => ", body];
-        if (hasAwait(body)) {
+        const async = hasAwait(body);
+        if (async) {
           children.unshift("async ");
         }
         return {
           type: "ArrowFunction",
+          signature: {
+            modifier: {
+              async
+            }
+          },
           children,
           ref,
           body,
@@ -6079,6 +6117,7 @@ ${input.slice(result.pos)}
         return {
           ...signature,
           type: "FunctionExpression",
+          signature,
           children: [...signature.children, block],
           block,
           operator: true
@@ -6113,6 +6152,7 @@ ${input.slice(result.pos)}
         return {
           type: "FunctionSignature",
           id,
+          modifier: {},
           parameters,
           returnType: suffix,
           ts: false,
@@ -6165,7 +6205,7 @@ ${input.slice(result.pos)}
       function AmpersandUnaryPrefix(ctx, state) {
         return $EVENT(ctx, state, "AmpersandUnaryPrefix", AmpersandUnaryPrefix$0);
       }
-      var ThinArrowFunction$0 = $TS($S($E($S(Async, _)), Parameters, $E(ReturnTypeSuffix), $E(_), Arrow, BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+      var ThinArrowFunction$0 = $TS($S($E($S(Async, _)), ArrowParameters, $E(ReturnTypeSuffix), $E(_), Arrow, BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
         var async = $1;
         var parameters = $2;
         var suffix = $3;
@@ -6187,6 +6227,14 @@ ${input.slice(result.pos)}
           async,
           generator,
           block,
+          signature: {
+            name: void 0,
+            modifier: {
+              async: !!async,
+              generator: !!generator
+            },
+            returnType: suffix
+          },
           children: [
             async,
             { $loc: arrow.$loc, token: "function" },
@@ -7250,6 +7298,7 @@ ${input.slice(result.pos)}
           type: "MethodSignature",
           children: $0,
           name: $1.token,
+          modifier: {},
           returnType: void 0,
           parameters
         };
@@ -7267,6 +7316,7 @@ ${input.slice(result.pos)}
         }
         if (optional)
           $0[3] = optional = { ...optional, ts: true };
+        modifier = modifier || {};
         return {
           type: "MethodSignature",
           children: $0,
@@ -12371,6 +12421,8 @@ ${input.slice(result.pos)}
       exports.ReturnValue = ReturnValue;
       exports.AfterReturnShorthand = AfterReturnShorthand;
       exports.Parameters = Parameters;
+      exports.ShortArrowParameters = ShortArrowParameters;
+      exports.ArrowParameters = ArrowParameters;
       exports.NonEmptyParameters = NonEmptyParameters;
       exports.FunctionRestParameter = FunctionRestParameter;
       exports.ParameterElement = ParameterElement;

package/dist/main.js

@@ -628,7 +628,8 @@ var require_lib = __commonJS({
         aliasBinding(p.value, ref);
       } else {
         p.value = ref;
-        p.children.push(": ", ref);
+        const index = p.children.indexOf(p.name);
+        p.children.splice(index + 1, 0, ": ", ref);
       }
     }
     function arrayElementHasTrailingComma(elementNode) {
@@ -1911,7 +1912,7 @@ var require_lib = __commonJS({
         } else if (modifier.async) {
           modifier = [modifier.children[0][0], " function ", ...modifier.children.slice(1)];
         } else {
-          modifier = ["function ", ...modifier.children];
+          modifier = ["function ", ...modifier.children || []];
         }
       } else {
         modifier = "function ";
@@ -1919,6 +1920,7 @@ var require_lib = __commonJS({
       return {
         ...signature,
         id: signature.name,
+        signature,
         type: "FunctionExpression",
         children: [
           [modifier, ...signature.children.slice(1)],
@@ -2060,40 +2062,31 @@ var require_lib = __commonJS({
         f.ts = false;
       }
     }
+    function processReturn(f, implicitReturns) {
+      if (!processReturnValue(f) && implicitReturns) {
+        const { signature, block } = f;
+        const { modifier, name, returnType } = signature;
+        const { async, set } = modifier;
+        const isMethod = f.type === "MethodDefinition";
+        const isConstructor = isMethod && name === "constructor";
+        const isVoid = isVoidType(returnType?.t) || async && isPromiseVoidType(returnType?.t);
+        const isBlock = block?.type === "BlockStatement";
+        if (!isVoid && !set && !isConstructor && isBlock) {
+          insertReturn(block);
+        }
+      }
+    }
     function processFunctions(statements, config) {
       gatherRecursiveAll(statements, ({ type }) => type === "FunctionExpression" || type === "ArrowFunction").forEach((f) => {
         if (f.type === "FunctionExpression")
           implicitFunctionBlock(f);
         processParams(f);
-        if (!processReturnValue(f) && config.implicitReturns) {
-          const { async, block, returnType } = f;
-          const isVoid = isVoidType(returnType?.t) || async && isPromiseVoidType(returnType?.t);
-          const isBlock = block?.type === "BlockStatement";
-          if (!isVoid && isBlock) {
-            return insertReturn(block);
-          }
-          ;
-          return;
-        }
-        ;
-        return;
+        return processReturn(f, config.implicitReturns);
       });
       gatherRecursiveAll(statements, ({ type }) => type === "MethodDefinition").forEach((f) => {
         implicitFunctionBlock(f);
         processParams(f);
-        if (!processReturnValue(f) && config.implicitReturns) {
-          const { signature, block } = f;
-          const isConstructor = signature.name === "constructor";
-          const isVoid = isVoidType(signature.returnType?.t);
-          const isSet = signature.modifier?.set;
-          if (!isConstructor && !isSet && !isVoid) {
-            return insertReturn(block);
-          }
-          ;
-          return;
-        }
-        ;
-        return;
+        return processReturn(f, config.implicitReturns);
       });
     }
     function processSwitchExpressions(statements) {
@@ -3418,6 +3411,8 @@ var require_parser = __commonJS({
       ReturnValue,
       AfterReturnShorthand,
       Parameters,
+      ShortArrowParameters,
+      ArrowParameters,
       NonEmptyParameters,
       FunctionRestParameter,
       ParameterElement,
@@ -4733,7 +4728,7 @@ var require_parser = __commonJS({
       return $EVENT_C(ctx, state, "YieldTail", YieldTail$$);
     }
     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 ArrowFunction$1 = $TS($S($E($S(Async, _)), ArrowParameters, $E(ReturnTypeSuffix), FatArrow, FatArrowBody), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var async = $1;
       var parameters = $2;
       var suffix = $3;
@@ -4750,6 +4745,12 @@ var require_parser = __commonJS({
       }
       return {
         type: "ArrowFunction",
+        signature: {
+          modifier: {
+            async: !!async
+          },
+          returnType: suffix
+        },
         parameters,
         returnType: suffix,
         ts: false,
@@ -4825,6 +4826,11 @@ var require_parser = __commonJS({
         };
         return {
           type: "ArrowFunction",
+          signature: {
+            modifier: {
+              children: []
+            }
+          },
           children: [ref, " => ", arrowBody],
           ref,
           body: [arrowBody],
@@ -5524,6 +5530,24 @@ var require_parser = __commonJS({
     function Parameters(ctx, state) {
       return $EVENT_C(ctx, state, "Parameters", Parameters$$);
     }
+    var ShortArrowParameters$0 = ObjectBindingPattern;
+    var ShortArrowParameters$1 = ArrayBindingPattern;
+    var ShortArrowParameters$$ = [ShortArrowParameters$0, ShortArrowParameters$1];
+    function ShortArrowParameters(ctx, state) {
+      return $EVENT_C(ctx, state, "ShortArrowParameters", ShortArrowParameters$$);
+    }
+    var ArrowParameters$0 = $TS($S(ShortArrowParameters), function($skip, $loc, $0, $1) {
+      return {
+        type: "Parameters",
+        children: ["(", $0, ")"],
+        names: $0.names
+      };
+    });
+    var ArrowParameters$1 = Parameters;
+    var ArrowParameters$$ = [ArrowParameters$0, ArrowParameters$1];
+    function ArrowParameters(ctx, state) {
+      return $EVENT_C(ctx, state, "ArrowParameters", ArrowParameters$$);
+    }
     var NonEmptyParameters$0 = $TS($S($E(TypeParameters), OpenParen, $E(ThisType), $Q(ParameterElement), $E(FunctionRestParameter), $Q(ParameterElement), $S(__, CloseParen)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
       var tp = $1;
       var open = $2;
@@ -5968,6 +5992,10 @@ var require_parser = __commonJS({
         ts: false,
         async,
         generator,
+        modifier: {
+          async: !async.length,
+          generator: !generator.length
+        },
         block: null,
         children: !parameters.implicit ? [async, func, generator, wid, w, parameters, suffix] : [async, func, generator, wid, parameters, w, suffix]
       };
@@ -5982,6 +6010,7 @@ var require_parser = __commonJS({
         return {
           ...signature,
           type: "FunctionExpression",
+          signature,
           ts: true
         };
       }
@@ -5994,6 +6023,7 @@ var require_parser = __commonJS({
       return {
         ...signature,
         type: "FunctionExpression",
+        signature,
         children: [...signature.children, block],
         block
       };
@@ -6002,6 +6032,9 @@ var require_parser = __commonJS({
       const ref = makeRef("$"), body = [ref];
       return {
         type: "ArrowFunction",
+        signature: {
+          modifier: {}
+        },
         children: [ref, " => ", body],
         ref,
         body,
@@ -6013,7 +6046,6 @@ var require_parser = __commonJS({
       var id = $1;
       var ws = $4;
       var fn = $5;
-      debugger;
       return {
         ...fn,
         id,
@@ -6050,11 +6082,17 @@ var require_parser = __commonJS({
         };
       }
       const children = [ref, " => ", body];
-      if (hasAwait(body)) {
+      const async = hasAwait(body);
+      if (async) {
         children.unshift("async ");
       }
       return {
         type: "ArrowFunction",
+        signature: {
+          modifier: {
+            async
+          }
+        },
         children,
         ref,
         body,
@@ -6078,6 +6116,7 @@ var require_parser = __commonJS({
       return {
         ...signature,
         type: "FunctionExpression",
+        signature,
         children: [...signature.children, block],
         block,
         operator: true
@@ -6112,6 +6151,7 @@ var require_parser = __commonJS({
       return {
         type: "FunctionSignature",
         id,
+        modifier: {},
         parameters,
         returnType: suffix,
         ts: false,
@@ -6164,7 +6204,7 @@ var require_parser = __commonJS({
     function AmpersandUnaryPrefix(ctx, state) {
       return $EVENT(ctx, state, "AmpersandUnaryPrefix", AmpersandUnaryPrefix$0);
     }
-    var ThinArrowFunction$0 = $TS($S($E($S(Async, _)), Parameters, $E(ReturnTypeSuffix), $E(_), Arrow, BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var ThinArrowFunction$0 = $TS($S($E($S(Async, _)), ArrowParameters, $E(ReturnTypeSuffix), $E(_), Arrow, BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       var async = $1;
       var parameters = $2;
       var suffix = $3;
@@ -6186,6 +6226,14 @@ var require_parser = __commonJS({
         async,
         generator,
         block,
+        signature: {
+          name: void 0,
+          modifier: {
+            async: !!async,
+            generator: !!generator
+          },
+          returnType: suffix
+        },
         children: [
           async,
           { $loc: arrow.$loc, token: "function" },
@@ -7249,6 +7297,7 @@ var require_parser = __commonJS({
         type: "MethodSignature",
         children: $0,
         name: $1.token,
+        modifier: {},
         returnType: void 0,
         parameters
       };
@@ -7266,6 +7315,7 @@ var require_parser = __commonJS({
       }
       if (optional)
         $0[3] = optional = { ...optional, ts: true };
+      modifier = modifier || {};
       return {
         type: "MethodSignature",
         children: $0,
@@ -12370,6 +12420,8 @@ var require_parser = __commonJS({
     exports.ReturnValue = ReturnValue;
     exports.AfterReturnShorthand = AfterReturnShorthand;
     exports.Parameters = Parameters;
+    exports.ShortArrowParameters = ShortArrowParameters;
+    exports.ArrowParameters = ArrowParameters;
     exports.NonEmptyParameters = NonEmptyParameters;
     exports.FunctionRestParameter = FunctionRestParameter;
     exports.ParameterElement = ParameterElement;

package/dist/main.mjs

@@ -626,7 +626,8 @@ var require_lib = __commonJS({
         aliasBinding(p.value, ref);
       } else {
         p.value = ref;
-        p.children.push(": ", ref);
+        const index = p.children.indexOf(p.name);
+        p.children.splice(index + 1, 0, ": ", ref);
       }
     }
     function arrayElementHasTrailingComma(elementNode) {
@@ -1909,7 +1910,7 @@ var require_lib = __commonJS({
         } else if (modifier.async) {
           modifier = [modifier.children[0][0], " function ", ...modifier.children.slice(1)];
         } else {
-          modifier = ["function ", ...modifier.children];
+          modifier = ["function ", ...modifier.children || []];
         }
       } else {
         modifier = "function ";
@@ -1917,6 +1918,7 @@ var require_lib = __commonJS({
       return {
         ...signature,
         id: signature.name,
+        signature,
         type: "FunctionExpression",
         children: [
           [modifier, ...signature.children.slice(1)],
@@ -2058,40 +2060,31 @@ var require_lib = __commonJS({
         f.ts = false;
       }
     }
+    function processReturn(f, implicitReturns) {
+      if (!processReturnValue(f) && implicitReturns) {
+        const { signature, block } = f;
+        const { modifier, name, returnType } = signature;
+        const { async, set } = modifier;
+        const isMethod = f.type === "MethodDefinition";
+        const isConstructor = isMethod && name === "constructor";
+        const isVoid = isVoidType(returnType?.t) || async && isPromiseVoidType(returnType?.t);
+        const isBlock = block?.type === "BlockStatement";
+        if (!isVoid && !set && !isConstructor && isBlock) {
+          insertReturn(block);
+        }
+      }
+    }
     function processFunctions(statements, config) {
       gatherRecursiveAll(statements, ({ type }) => type === "FunctionExpression" || type === "ArrowFunction").forEach((f) => {
         if (f.type === "FunctionExpression")
           implicitFunctionBlock(f);
         processParams(f);
-        if (!processReturnValue(f) && config.implicitReturns) {
-          const { async, block, returnType } = f;
-          const isVoid = isVoidType(returnType?.t) || async && isPromiseVoidType(returnType?.t);
-          const isBlock = block?.type === "BlockStatement";
-          if (!isVoid && isBlock) {
-            return insertReturn(block);
-          }
-          ;
-          return;
-        }
-        ;
-        return;
+        return processReturn(f, config.implicitReturns);
       });
       gatherRecursiveAll(statements, ({ type }) => type === "MethodDefinition").forEach((f) => {
         implicitFunctionBlock(f);
         processParams(f);
-        if (!processReturnValue(f) && config.implicitReturns) {
-          const { signature, block } = f;
-          const isConstructor = signature.name === "constructor";
-          const isVoid = isVoidType(signature.returnType?.t);
-          const isSet = signature.modifier?.set;
-          if (!isConstructor && !isSet && !isVoid) {
-            return insertReturn(block);
-          }
-          ;
-          return;
-        }
-        ;
-        return;
+        return processReturn(f, config.implicitReturns);
       });
     }
     function processSwitchExpressions(statements) {
@@ -3416,6 +3409,8 @@ var require_parser = __commonJS({
       ReturnValue,
       AfterReturnShorthand,
       Parameters,
+      ShortArrowParameters,
+      ArrowParameters,
       NonEmptyParameters,
       FunctionRestParameter,
       ParameterElement,
@@ -4731,7 +4726,7 @@ var require_parser = __commonJS({
       return $EVENT_C(ctx, state, "YieldTail", YieldTail$$);
     }
     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 ArrowFunction$1 = $TS($S($E($S(Async, _)), ArrowParameters, $E(ReturnTypeSuffix), FatArrow, FatArrowBody), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var async = $1;
       var parameters = $2;
       var suffix = $3;
@@ -4748,6 +4743,12 @@ var require_parser = __commonJS({
       }
       return {
         type: "ArrowFunction",
+        signature: {
+          modifier: {
+            async: !!async
+          },
+          returnType: suffix
+        },
         parameters,
         returnType: suffix,
         ts: false,
@@ -4823,6 +4824,11 @@ var require_parser = __commonJS({
         };
         return {
           type: "ArrowFunction",
+          signature: {
+            modifier: {
+              children: []
+            }
+          },
           children: [ref, " => ", arrowBody],
           ref,
           body: [arrowBody],
@@ -5522,6 +5528,24 @@ var require_parser = __commonJS({
     function Parameters(ctx, state) {
       return $EVENT_C(ctx, state, "Parameters", Parameters$$);
     }
+    var ShortArrowParameters$0 = ObjectBindingPattern;
+    var ShortArrowParameters$1 = ArrayBindingPattern;
+    var ShortArrowParameters$$ = [ShortArrowParameters$0, ShortArrowParameters$1];
+    function ShortArrowParameters(ctx, state) {
+      return $EVENT_C(ctx, state, "ShortArrowParameters", ShortArrowParameters$$);
+    }
+    var ArrowParameters$0 = $TS($S(ShortArrowParameters), function($skip, $loc, $0, $1) {
+      return {
+        type: "Parameters",
+        children: ["(", $0, ")"],
+        names: $0.names
+      };
+    });
+    var ArrowParameters$1 = Parameters;
+    var ArrowParameters$$ = [ArrowParameters$0, ArrowParameters$1];
+    function ArrowParameters(ctx, state) {
+      return $EVENT_C(ctx, state, "ArrowParameters", ArrowParameters$$);
+    }
     var NonEmptyParameters$0 = $TS($S($E(TypeParameters), OpenParen, $E(ThisType), $Q(ParameterElement), $E(FunctionRestParameter), $Q(ParameterElement), $S(__, CloseParen)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
       var tp = $1;
       var open = $2;
@@ -5966,6 +5990,10 @@ var require_parser = __commonJS({
         ts: false,
         async,
         generator,
+        modifier: {
+          async: !async.length,
+          generator: !generator.length
+        },
         block: null,
         children: !parameters.implicit ? [async, func, generator, wid, w, parameters, suffix] : [async, func, generator, wid, parameters, w, suffix]
       };
@@ -5980,6 +6008,7 @@ var require_parser = __commonJS({
         return {
           ...signature,
           type: "FunctionExpression",
+          signature,
           ts: true
         };
       }
@@ -5992,6 +6021,7 @@ var require_parser = __commonJS({
       return {
         ...signature,
         type: "FunctionExpression",
+        signature,
         children: [...signature.children, block],
         block
       };
@@ -6000,6 +6030,9 @@ var require_parser = __commonJS({
       const ref = makeRef("$"), body = [ref];
       return {
         type: "ArrowFunction",
+        signature: {
+          modifier: {}
+        },
         children: [ref, " => ", body],
         ref,
         body,
@@ -6011,7 +6044,6 @@ var require_parser = __commonJS({
       var id = $1;
       var ws = $4;
       var fn = $5;
-      debugger;
       return {
         ...fn,
         id,
@@ -6048,11 +6080,17 @@ var require_parser = __commonJS({
         };
       }
       const children = [ref, " => ", body];
-      if (hasAwait(body)) {
+      const async = hasAwait(body);
+      if (async) {
         children.unshift("async ");
       }
       return {
         type: "ArrowFunction",
+        signature: {
+          modifier: {
+            async
+          }
+        },
         children,
         ref,
         body,
@@ -6076,6 +6114,7 @@ var require_parser = __commonJS({
       return {
         ...signature,
         type: "FunctionExpression",
+        signature,
         children: [...signature.children, block],
         block,
         operator: true
@@ -6110,6 +6149,7 @@ var require_parser = __commonJS({
       return {
         type: "FunctionSignature",
         id,
+        modifier: {},
         parameters,
         returnType: suffix,
         ts: false,
@@ -6162,7 +6202,7 @@ var require_parser = __commonJS({
     function AmpersandUnaryPrefix(ctx, state) {
       return $EVENT(ctx, state, "AmpersandUnaryPrefix", AmpersandUnaryPrefix$0);
     }
-    var ThinArrowFunction$0 = $TS($S($E($S(Async, _)), Parameters, $E(ReturnTypeSuffix), $E(_), Arrow, BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var ThinArrowFunction$0 = $TS($S($E($S(Async, _)), ArrowParameters, $E(ReturnTypeSuffix), $E(_), Arrow, BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       var async = $1;
       var parameters = $2;
       var suffix = $3;
@@ -6184,6 +6224,14 @@ var require_parser = __commonJS({
         async,
         generator,
         block,
+        signature: {
+          name: void 0,
+          modifier: {
+            async: !!async,
+            generator: !!generator
+          },
+          returnType: suffix
+        },
         children: [
           async,
           { $loc: arrow.$loc, token: "function" },
@@ -7247,6 +7295,7 @@ var require_parser = __commonJS({
         type: "MethodSignature",
         children: $0,
         name: $1.token,
+        modifier: {},
         returnType: void 0,
         parameters
       };
@@ -7264,6 +7313,7 @@ var require_parser = __commonJS({
       }
       if (optional)
         $0[3] = optional = { ...optional, ts: true };
+      modifier = modifier || {};
       return {
         type: "MethodSignature",
         children: $0,
@@ -12368,6 +12418,8 @@ var require_parser = __commonJS({
     exports.ReturnValue = ReturnValue;
     exports.AfterReturnShorthand = AfterReturnShorthand;
     exports.Parameters = Parameters;
+    exports.ShortArrowParameters = ShortArrowParameters;
+    exports.ArrowParameters = ArrowParameters;
     exports.NonEmptyParameters = NonEmptyParameters;
     exports.FunctionRestParameter = FunctionRestParameter;
     exports.ParameterElement = ParameterElement;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielx/civet",
-  "version": "0.6.29",
+  "version": "0.6.31",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",