@danielx/civet 0.6.69 → 0.6.70

package/dist/browser.js

@@ -685,7 +685,7 @@ var Civet = (() => {
           commaCount ? {
             type: "ParenthesizedExpression",
             children: ["(", call, ")"]
-          } : call
+          } : { ...call, type: "ParenthesizedExpression" }
         );
       }
     }
@@ -1958,7 +1958,7 @@ var Civet = (() => {
       children
     };
   }
-  function makeGetterMethod(name, ws, value, block, kind = { token: "get" }, autoReturn = true) {
+  function makeGetterMethod(name, ws, value, returnType, block, kind = { token: "get" }, autoReturn = true) {
     const { token } = kind;
     ws = insertTrimmingSpace(ws, "");
     let setVal;
@@ -1989,7 +1989,7 @@ var Civet = (() => {
       const finalStatement = token === "get" ? [[expressions[0]?.[0] || "", ws], wrapWithReturn(value)] : [[expressions[0]?.[0] || "", ws], [value, " = ", setVal]];
       expressions.push(finalStatement);
     }
-    const children = [kind, " ", name, parameters, block];
+    const children = [kind, " ", name, parameters, returnType, block];
     return {
       type: "MethodDefinition",
       children,
@@ -2002,7 +2002,7 @@ var Civet = (() => {
           async: false
         },
         name,
-        returnType: void 0
+        returnType
       },
       block,
       parameters
@@ -5814,7 +5814,9 @@ ${input.slice(result.pos)}
       }
       var PipelineTailItem$0 = Await;
       var PipelineTailItem$1 = Yield;
-      var PipelineTailItem$2 = Return;
+      var PipelineTailItem$2 = $T($S(Return, $N(AccessStart)), function(value) {
+        return value[0];
+      });
       var PipelineTailItem$3 = AmpersandFunctionExpression;
       var PipelineTailItem$4 = $T($S($N(Ampersand), PipelineHeadItem), function(value) {
         return value[1];
@@ -6048,7 +6050,7 @@ ${input.slice(result.pos)}
       var ClassElement$0 = $TS($S($E(Decorators), $E(AccessModifier), $E($S(Static, $E(_))), ClassElementDefinition), function($skip, $loc, $0, $1, $2, $3, $4) {
         var decorators = $1;
         var definition = $4;
-        if (definition.type === "ShorthandMethodDefinition") {
+        if (definition.type === "MultiMethodDefinition") {
           return {
             ...definition,
             children: definition.children.map((c) => {
@@ -8411,6 +8413,11 @@ ${input.slice(result.pos)}
       var PropertyDefinition$2 = $TS($S($E(_), MethodDefinition), function($skip, $loc, $0, $1, $2) {
         var ws = $1;
         var def = $2;
+        if (def.type === "MultiMethodDefinition") {
+          return {
+            children: def.children.flatMap((c, i) => i ? [",", c] : [c])
+          };
+        }
         if (!def.block || def.block.empty)
           return $skip;
         return {
@@ -8645,16 +8652,16 @@ ${input.slice(result.pos)}
           parameters: signature.parameters
         };
       });
-      var MethodDefinition$2 = $TS($S(GetOrSet, $E(_), ForbidIndentedApplication, $E($S(MemberBase, $Q(CallExpressionRest))), RestoreIndentedApplication, $E(BracedBlock)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+      var MethodDefinition$2 = $TS($S(GetOrSet, $E(_), ForbidIndentedApplication, $E($S(MemberBase, $Q(CallExpressionRest), $E(ReturnTypeSuffix))), RestoreIndentedApplication, $E(BracedBlock)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
         var kind = $1;
         var ws = $2;
-        var value = $4;
+        var content = $4;
         var block = $6;
-        if (!value)
+        if (!content)
           return $skip;
-        const rest = value[1];
+        const [base, rest, returnType] = content;
+        const value = [base, rest];
         if (!rest.length) {
-          const base = value[0];
           let name2;
           if (base.type === "MemberExpression") {
             const lastAccess2 = lastAccessInCallExpression(base);
@@ -8669,7 +8676,7 @@ ${input.slice(result.pos)}
           if (name2[0] === "#")
             name2 = name2.slice(1);
           const autoReturn = !block || base.type !== "Identifier";
-          return makeGetterMethod(name2, ws, base, block, kind, autoReturn);
+          return makeGetterMethod(name2, ws, base, returnType, block, kind, autoReturn);
         }
         let last = rest[rest.length - 1];
         while (Array.isArray(last)) {
@@ -8680,10 +8687,10 @@ ${input.slice(result.pos)}
             return $skip;
           case "PropertyAccess":
             const { name: name2 } = last;
-            return makeGetterMethod(name2, ws, value, block, kind);
+            return makeGetterMethod(name2, ws, value, returnType, block, kind);
           case "PropertyGlob":
             return {
-              type: "ShorthandMethodDefinition",
+              type: "MultiMethodDefinition",
               children: last.object.properties.map((p) => {
                 const { name: name3, type } = p;
                 let v;
@@ -8697,7 +8704,7 @@ ${input.slice(result.pos)}
                 }
                 const exp = processCallMemberExpression({
                   type: "CallExpression",
-                  children: [value[0], ...value[1].slice(0, -1), {
+                  children: [base, ...rest.slice(0, -1), {
                     type: "PropertyAccess",
                     children: [last.dot, {
                       ...v,
@@ -8706,13 +8713,13 @@ ${input.slice(result.pos)}
                     }]
                   }]
                 });
-                return makeGetterMethod(name3, ws, exp, block, kind);
+                return makeGetterMethod(name3, ws, exp, returnType, block, kind);
               })
             };
         }
         const lastAccess = lastAccessInCallExpression({ children: rest });
         const { name } = lastAccess;
-        return makeGetterMethod(name, ws, value, block, kind);
+        return makeGetterMethod(name, ws, value, returnType, block, kind);
       });
       var MethodDefinition$$ = [MethodDefinition$0, MethodDefinition$1, MethodDefinition$2];
       function MethodDefinition(ctx, state) {

package/dist/civet

@@ -28,15 +28,9 @@ var import_main = require("./main.js");
 var import_config = require("./config.js");
 var import_promises = __toESM(require("fs/promises"));
 var import_path = __toESM(require("path"));
-var version;
-var parseArgs;
-var readFiles;
-var repl;
-var cli;
-var indexOf = [].indexOf;
-version = function() {
+function version() {
   return require("../package.json").version;
-};
+}
 if (process.argv.includes("--version")) {
   console.log(version());
   process.exit(0);
@@ -80,37 +74,35 @@ You can use - to read from stdin or (prefixed by -o) write to stdout.
   process.exit(0);
 }
 var encoding = "utf8";
-parseArgs = function(args) {
-  var options, filenames, scriptArgs, i, endOfArgs, arg;
-  options = {};
+function parseArgs(args) {
+  const options = {};
   Object.defineProperty(options, "run", {
     get: function() {
       return !(this.ast || this.compile);
     }
   });
-  filenames = [];
-  scriptArgs = null;
-  i = 0;
-  endOfArgs = function(j) {
+  const filenames = [];
+  let scriptArgs = [];
+  let i = 0;
+  function endOfArgs(j) {
     i = args.length;
     if (j >= args.length) {
       return;
     }
     if (options.run) {
       filenames.push(args[j]);
-      return scriptArgs = args.slice(j + 1);
+      scriptArgs = args.slice(j + 1);
     } else {
-      return filenames.push(...args.slice(j));
+      filenames.push(...args.slice(j));
     }
-  };
+  }
   while (i < args.length) {
-    arg = args[i];
+    const arg = args[i];
     if (/^-\w{2,}$/.test(arg)) {
       args.splice(i, 1 + i - i, ...(() => {
-        var char;
         const results = [];
         for (let ref = arg.slice(1), i1 = 0, len = ref.length; i1 < len; i1++) {
-          char = ref[i1];
+          const char = ref[i1];
           results.push(`-${char}`);
         }
         return results;
@@ -178,14 +170,14 @@ parseArgs = function(args) {
     i++;
   }
   return { filenames, scriptArgs, options };
-};
-readFiles = async function* (filenames, options) {
-  var filename, stdin, lines, rl, content;
+}
+async function* readFiles(filenames) {
   const results1 = [];
   for (let i2 = 0, len1 = filenames.length; i2 < len1; i2++) {
-    filename = filenames[i2];
-    stdin = filename === "-";
+    let filename = filenames[i2];
+    const stdin = filename === "-";
     try {
+      let content;
       if (stdin) {
         process.stdin.setEncoding(encoding);
         filename = "<stdin>";
@@ -194,24 +186,21 @@ readFiles = async function* (filenames, options) {
         } catch (e) {
         }
         if (process.stdin.isTTY) {
-          lines = [];
-          rl = require("readline").createInterface(process.stdin, process.stdout);
-          rl.on("line", function(buffer) {
-            return lines.push(buffer + "\n");
-          });
-          content = await new Promise(function(resolve, reject) {
-            rl.on("SIGINT", function() {
+          const lines = [];
+          const rl = (await import("readline")).createInterface(process.stdin, process.stdout);
+          rl.on("line", (buffer) => lines.push(buffer + "\n"));
+          content = await new Promise((resolve, reject) => {
+            rl.on("SIGINT", () => {
               return reject("^C");
             });
-            return rl.on("close", function() {
+            return rl.on("close", () => {
               return resolve(lines.join(""));
             });
           });
         } else {
           content = (await (async () => {
-            var chunk;
             const results2 = [];
-            for await (chunk of process.stdin) {
+            for await (const chunk of process.stdin) {
               results2.push(chunk);
             }
             return results2;
@@ -227,9 +216,8 @@ readFiles = async function* (filenames, options) {
   }
   ;
   return results1;
-};
-repl = function(options) {
-  var nodeRepl, vm, r;
+}
+async function repl(options) {
   console.log(`Civet ${version()} REPL.  Enter a blank line to ${(() => {
     switch (false) {
       case !options.ast: {
@@ -243,12 +231,10 @@ repl = function(options) {
       }
     }
   })()} code.`);
-  global.quit = global.exit = function() {
-    return process.exit(0);
-  };
-  nodeRepl = require("repl");
-  vm = require("vm");
-  return r = nodeRepl.start({
+  global.quit = global.exit = () => process.exit(0);
+  const nodeRepl = await import("repl");
+  const vm = await import("vm");
+  const r = nodeRepl.start({
     prompt: (() => {
       switch (false) {
         case !options.ast: {
@@ -262,53 +248,54 @@ repl = function(options) {
         }
       }
     })(),
-    writer: options.ast ? function(obj) {
+    writer: options.ast ? (obj) => {
       try {
         return JSON.stringify(obj, null, 2);
       } catch (e) {
         console.log(`Failed to stringify: ${e}`);
-        return obj;
+        return "";
       }
-    } : options.compile ? function(obj) {
+    } : options.compile ? (obj) => {
       if (typeof obj === "string") {
         return obj?.replace(/\n*$/, "");
       } else {
-        return obj;
+        return "";
       }
     } : void 0,
     eval: function(input, context, filename, callback) {
-      var output, result;
       if (input === "\n") {
-        return callback(null);
-      } else if (indexOf.call(["quit\n", "exit\n", "quit()\n", "exit()\n"], input) >= 0) {
+        return callback(null, void 0);
+      } else if (input in ["quit\n", "exit\n", "quit()\n", "exit()\n"]) {
         return process.exit(0);
       } else if (input.endsWith("\n\n")) {
+        let output;
         try {
           output = (0, import_main.compile)(input, { ...options, filename });
         } catch (error) {
           console.error(error);
-          return callback("");
+          return callback(null, void 0);
         }
         if (options.compile || options.ast) {
           return callback(null, output);
         } else {
+          let result;
           try {
             result = vm.runInContext(output, context, { filename });
           } catch (error) {
-            return callback(error);
+            return callback(error, void 0);
           }
           return callback(null, result);
         }
       } else {
-        return callback(new nodeRepl.Recoverable("Enter a blank line to execute code."));
+        return callback(new nodeRepl.Recoverable(new Error("Enter a blank line to execute code.")), null);
       }
     }
   });
-};
-cli = async function() {
-  var argv, filenames, scriptArgs, options, filename, error, content, stdin, output, outputPath, outputFilename, optionsPath, stat, esm, execArgv, debugRe, isDebug, child;
-  argv = process.argv;
-  ({ filenames, scriptArgs, options } = parseArgs(argv.slice(2)));
+  return r;
+}
+async function cli() {
+  const argv = process.argv;
+  let { filenames, scriptArgs, options } = parseArgs(argv.slice(2));
   if (options.config !== false) {
     options.config ??= await (0, import_config.findConfig)(process.cwd());
   }
@@ -334,12 +321,13 @@ cli = async function() {
     return repl(options);
   }
   const results3 = [];
-  for await ({ filename, error, content, stdin } of readFiles(filenames, options)) {
+  for await (const { filename, error, content, stdin } of readFiles(filenames)) {
     if (error) {
       console.error(`${filename} failed to load:`);
       console.error(error);
       continue;
     }
+    let output;
     try {
       output = (0, import_main.compile)(content, { ...options, filename });
     } catch (error2) {
@@ -352,7 +340,7 @@ cli = async function() {
       if (stdin && !options.output || options.output === "-") {
         results3.push(process.stdout.write(output));
       } else {
-        outputPath = import_path.default.parse(filename);
+        let outputPath = import_path.default.parse(filename);
         delete outputPath.base;
         if (options.js) {
           outputPath.ext += ".jsx";
@@ -360,7 +348,8 @@ cli = async function() {
           outputPath.ext += ".tsx";
         }
         if (options.output) {
-          optionsPath = import_path.default.parse(options.output);
+          const optionsPath = import_path.default.parse(options.output);
+          let stat;
           try {
             stat = await import_promises.default.stat(options.output);
           } catch {
@@ -380,7 +369,7 @@ cli = async function() {
         if (outputPath.dir) {
           import_promises.default.mkdir(outputPath.dir, { recursive: true });
         }
-        outputFilename = import_path.default.format(outputPath);
+        const outputFilename = import_path.default.format(outputPath);
         try {
           results3.push(await import_promises.default.writeFile(outputFilename, output));
         } catch (error2) {
@@ -389,35 +378,35 @@ cli = async function() {
         }
       }
     } else {
-      esm = /^\s*(import|export)\b/m.test(output);
+      const esm = /^\s*(import|export)\b/m.test(output);
       if (esm) {
         if (stdin) {
-          filename = `.stdin-${process.pid}.civet`;
+          const filename2 = `.stdin-${process.pid}.civet`;
           try {
-            await import_promises.default.writeFile(filename, content, { encoding });
+            await import_promises.default.writeFile(filename2, content, { encoding });
           } catch (e) {
-            console.error(`Could not write ${filename} for Civet ESM mode:`);
+            console.error(`Could not write ${filename2} for Civet ESM mode:`);
             console.error(e);
             process.exit(1);
           }
         }
         const { fork } = await import("child_process");
-        execArgv = ["--loader", "@danielx/civet/esm"];
-        debugRe = /--debug|--inspect/;
-        isDebug = typeof v8debug === "object" || debugRe.test(process.execArgv.join(" ")) || debugRe.test(process.env.NODE_OPTIONS);
+        const execArgv = ["--loader", "@danielx/civet/esm"];
+        const debugRe = /--debug|--inspect/;
+        const isDebug = typeof v8debug === "object" || debugRe.test(process.execArgv.join(" ")) || debugRe.test(process.env.NODE_OPTIONS ?? "");
         if (process.env.NODE_OPTIONS) {
           execArgv.push(process.env.NODE_OPTIONS);
         }
         if (isDebug) {
           execArgv.push("--inspect=" + (process.debugPort + 1));
         }
-        child = fork(filename, [
+        const child = fork(filename, [
           ...scriptArgs
         ], {
           execArgv,
           stdio: "inherit"
         });
-        results3.push(child.on("exit", async function(code) {
+        results3.push(child.on("exit", async (code) => {
           if (stdin) {
             await import_promises.default.unlink(filename);
           }
@@ -444,7 +433,7 @@ cli = async function() {
   }
   ;
   return results3;
-};
+}
 if (require.main === module) {
   cli();
 }

package/dist/main.js

@@ -677,7 +677,7 @@ function processCallMemberExpression(node) {
         commaCount ? {
           type: "ParenthesizedExpression",
           children: ["(", call, ")"]
-        } : call
+        } : { ...call, type: "ParenthesizedExpression" }
       );
     }
   }
@@ -1950,7 +1950,7 @@ function duplicateBlock(block) {
     children
   };
 }
-function makeGetterMethod(name, ws, value, block, kind = { token: "get" }, autoReturn = true) {
+function makeGetterMethod(name, ws, value, returnType, block, kind = { token: "get" }, autoReturn = true) {
   const { token } = kind;
   ws = insertTrimmingSpace(ws, "");
   let setVal;
@@ -1981,7 +1981,7 @@ function makeGetterMethod(name, ws, value, block, kind = { token: "get" }, autoR
     const finalStatement = token === "get" ? [[expressions[0]?.[0] || "", ws], wrapWithReturn(value)] : [[expressions[0]?.[0] || "", ws], [value, " = ", setVal]];
     expressions.push(finalStatement);
   }
-  const children = [kind, " ", name, parameters, block];
+  const children = [kind, " ", name, parameters, returnType, block];
   return {
     type: "MethodDefinition",
     children,
@@ -1994,7 +1994,7 @@ function makeGetterMethod(name, ws, value, block, kind = { token: "get" }, autoR
         async: false
       },
       name,
-      returnType: void 0
+      returnType
     },
     block,
     parameters
@@ -5806,7 +5806,9 @@ var require_parser = __commonJS({
     }
     var PipelineTailItem$0 = Await;
     var PipelineTailItem$1 = Yield;
-    var PipelineTailItem$2 = Return;
+    var PipelineTailItem$2 = $T($S(Return, $N(AccessStart)), function(value) {
+      return value[0];
+    });
     var PipelineTailItem$3 = AmpersandFunctionExpression;
     var PipelineTailItem$4 = $T($S($N(Ampersand), PipelineHeadItem), function(value) {
       return value[1];
@@ -6040,7 +6042,7 @@ var require_parser = __commonJS({
     var ClassElement$0 = $TS($S($E(Decorators), $E(AccessModifier), $E($S(Static, $E(_))), ClassElementDefinition), function($skip, $loc, $0, $1, $2, $3, $4) {
       var decorators = $1;
       var definition = $4;
-      if (definition.type === "ShorthandMethodDefinition") {
+      if (definition.type === "MultiMethodDefinition") {
         return {
           ...definition,
           children: definition.children.map((c) => {
@@ -8403,6 +8405,11 @@ var require_parser = __commonJS({
     var PropertyDefinition$2 = $TS($S($E(_), MethodDefinition), function($skip, $loc, $0, $1, $2) {
       var ws = $1;
       var def = $2;
+      if (def.type === "MultiMethodDefinition") {
+        return {
+          children: def.children.flatMap((c, i) => i ? [",", c] : [c])
+        };
+      }
       if (!def.block || def.block.empty)
         return $skip;
       return {
@@ -8637,16 +8644,16 @@ var require_parser = __commonJS({
         parameters: signature.parameters
       };
     });
-    var MethodDefinition$2 = $TS($S(GetOrSet, $E(_), ForbidIndentedApplication, $E($S(MemberBase, $Q(CallExpressionRest))), RestoreIndentedApplication, $E(BracedBlock)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var MethodDefinition$2 = $TS($S(GetOrSet, $E(_), ForbidIndentedApplication, $E($S(MemberBase, $Q(CallExpressionRest), $E(ReturnTypeSuffix))), RestoreIndentedApplication, $E(BracedBlock)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       var kind = $1;
       var ws = $2;
-      var value = $4;
+      var content = $4;
       var block = $6;
-      if (!value)
+      if (!content)
         return $skip;
-      const rest = value[1];
+      const [base, rest, returnType] = content;
+      const value = [base, rest];
       if (!rest.length) {
-        const base = value[0];
         let name2;
         if (base.type === "MemberExpression") {
           const lastAccess2 = lastAccessInCallExpression(base);
@@ -8661,7 +8668,7 @@ var require_parser = __commonJS({
         if (name2[0] === "#")
           name2 = name2.slice(1);
         const autoReturn = !block || base.type !== "Identifier";
-        return makeGetterMethod(name2, ws, base, block, kind, autoReturn);
+        return makeGetterMethod(name2, ws, base, returnType, block, kind, autoReturn);
       }
       let last = rest[rest.length - 1];
       while (Array.isArray(last)) {
@@ -8672,10 +8679,10 @@ var require_parser = __commonJS({
           return $skip;
         case "PropertyAccess":
           const { name: name2 } = last;
-          return makeGetterMethod(name2, ws, value, block, kind);
+          return makeGetterMethod(name2, ws, value, returnType, block, kind);
         case "PropertyGlob":
           return {
-            type: "ShorthandMethodDefinition",
+            type: "MultiMethodDefinition",
             children: last.object.properties.map((p) => {
               const { name: name3, type } = p;
               let v;
@@ -8689,7 +8696,7 @@ var require_parser = __commonJS({
               }
               const exp = processCallMemberExpression({
                 type: "CallExpression",
-                children: [value[0], ...value[1].slice(0, -1), {
+                children: [base, ...rest.slice(0, -1), {
                   type: "PropertyAccess",
                   children: [last.dot, {
                     ...v,
@@ -8698,13 +8705,13 @@ var require_parser = __commonJS({
                   }]
                 }]
               });
-              return makeGetterMethod(name3, ws, exp, block, kind);
+              return makeGetterMethod(name3, ws, exp, returnType, block, kind);
             })
           };
       }
       const lastAccess = lastAccessInCallExpression({ children: rest });
       const { name } = lastAccess;
-      return makeGetterMethod(name, ws, value, block, kind);
+      return makeGetterMethod(name, ws, value, returnType, block, kind);
     });
     var MethodDefinition$$ = [MethodDefinition$0, MethodDefinition$1, MethodDefinition$2];
     function MethodDefinition(ctx, state) {

package/dist/main.mjs

@@ -675,7 +675,7 @@ function processCallMemberExpression(node) {
         commaCount ? {
           type: "ParenthesizedExpression",
           children: ["(", call, ")"]
-        } : call
+        } : { ...call, type: "ParenthesizedExpression" }
       );
     }
   }
@@ -1948,7 +1948,7 @@ function duplicateBlock(block) {
     children
   };
 }
-function makeGetterMethod(name, ws, value, block, kind = { token: "get" }, autoReturn = true) {
+function makeGetterMethod(name, ws, value, returnType, block, kind = { token: "get" }, autoReturn = true) {
   const { token } = kind;
   ws = insertTrimmingSpace(ws, "");
   let setVal;
@@ -1979,7 +1979,7 @@ function makeGetterMethod(name, ws, value, block, kind = { token: "get" }, autoR
     const finalStatement = token === "get" ? [[expressions[0]?.[0] || "", ws], wrapWithReturn(value)] : [[expressions[0]?.[0] || "", ws], [value, " = ", setVal]];
     expressions.push(finalStatement);
   }
-  const children = [kind, " ", name, parameters, block];
+  const children = [kind, " ", name, parameters, returnType, block];
   return {
     type: "MethodDefinition",
     children,
@@ -1992,7 +1992,7 @@ function makeGetterMethod(name, ws, value, block, kind = { token: "get" }, autoR
         async: false
       },
       name,
-      returnType: void 0
+      returnType
     },
     block,
     parameters
@@ -5804,7 +5804,9 @@ var require_parser = __commonJS({
     }
     var PipelineTailItem$0 = Await;
     var PipelineTailItem$1 = Yield;
-    var PipelineTailItem$2 = Return;
+    var PipelineTailItem$2 = $T($S(Return, $N(AccessStart)), function(value) {
+      return value[0];
+    });
     var PipelineTailItem$3 = AmpersandFunctionExpression;
     var PipelineTailItem$4 = $T($S($N(Ampersand), PipelineHeadItem), function(value) {
       return value[1];
@@ -6038,7 +6040,7 @@ var require_parser = __commonJS({
     var ClassElement$0 = $TS($S($E(Decorators), $E(AccessModifier), $E($S(Static, $E(_))), ClassElementDefinition), function($skip, $loc, $0, $1, $2, $3, $4) {
       var decorators = $1;
       var definition = $4;
-      if (definition.type === "ShorthandMethodDefinition") {
+      if (definition.type === "MultiMethodDefinition") {
         return {
           ...definition,
           children: definition.children.map((c) => {
@@ -8401,6 +8403,11 @@ var require_parser = __commonJS({
     var PropertyDefinition$2 = $TS($S($E(_), MethodDefinition), function($skip, $loc, $0, $1, $2) {
       var ws = $1;
       var def = $2;
+      if (def.type === "MultiMethodDefinition") {
+        return {
+          children: def.children.flatMap((c, i) => i ? [",", c] : [c])
+        };
+      }
       if (!def.block || def.block.empty)
         return $skip;
       return {
@@ -8635,16 +8642,16 @@ var require_parser = __commonJS({
         parameters: signature.parameters
       };
     });
-    var MethodDefinition$2 = $TS($S(GetOrSet, $E(_), ForbidIndentedApplication, $E($S(MemberBase, $Q(CallExpressionRest))), RestoreIndentedApplication, $E(BracedBlock)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var MethodDefinition$2 = $TS($S(GetOrSet, $E(_), ForbidIndentedApplication, $E($S(MemberBase, $Q(CallExpressionRest), $E(ReturnTypeSuffix))), RestoreIndentedApplication, $E(BracedBlock)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       var kind = $1;
       var ws = $2;
-      var value = $4;
+      var content = $4;
       var block = $6;
-      if (!value)
+      if (!content)
         return $skip;
-      const rest = value[1];
+      const [base, rest, returnType] = content;
+      const value = [base, rest];
       if (!rest.length) {
-        const base = value[0];
         let name2;
         if (base.type === "MemberExpression") {
           const lastAccess2 = lastAccessInCallExpression(base);
@@ -8659,7 +8666,7 @@ var require_parser = __commonJS({
         if (name2[0] === "#")
           name2 = name2.slice(1);
         const autoReturn = !block || base.type !== "Identifier";
-        return makeGetterMethod(name2, ws, base, block, kind, autoReturn);
+        return makeGetterMethod(name2, ws, base, returnType, block, kind, autoReturn);
       }
       let last = rest[rest.length - 1];
       while (Array.isArray(last)) {
@@ -8670,10 +8677,10 @@ var require_parser = __commonJS({
           return $skip;
         case "PropertyAccess":
           const { name: name2 } = last;
-          return makeGetterMethod(name2, ws, value, block, kind);
+          return makeGetterMethod(name2, ws, value, returnType, block, kind);
         case "PropertyGlob":
           return {
-            type: "ShorthandMethodDefinition",
+            type: "MultiMethodDefinition",
             children: last.object.properties.map((p) => {
               const { name: name3, type } = p;
               let v;
@@ -8687,7 +8694,7 @@ var require_parser = __commonJS({
               }
               const exp = processCallMemberExpression({
                 type: "CallExpression",
-                children: [value[0], ...value[1].slice(0, -1), {
+                children: [base, ...rest.slice(0, -1), {
                   type: "PropertyAccess",
                   children: [last.dot, {
                     ...v,
@@ -8696,13 +8703,13 @@ var require_parser = __commonJS({
                   }]
                 }]
               });
-              return makeGetterMethod(name3, ws, exp, block, kind);
+              return makeGetterMethod(name3, ws, exp, returnType, block, kind);
             })
           };
       }
       const lastAccess = lastAccessInCallExpression({ children: rest });
       const { name } = lastAccess;
-      return makeGetterMethod(name, ws, value, block, kind);
+      return makeGetterMethod(name, ws, value, returnType, block, kind);
     });
     var MethodDefinition$$ = [MethodDefinition$0, MethodDefinition$1, MethodDefinition$2];
     function MethodDefinition(ctx, state) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.6.69",
+  "version": "0.6.70",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",