@danielx/civet 0.6.33 → 0.6.35

package/dist/browser.js

@@ -1983,6 +1983,66 @@ ${input.slice(result.pos)}
         }
         return parts;
       }
+      function duplicateBlock(block) {
+        const expressions = [...block.expressions];
+        const children = [...block.children];
+        children.splice(children.indexOf(block.expressions), 1, expressions);
+        return {
+          ...block,
+          expressions,
+          children
+        };
+      }
+      function makeGetterMethod(name, ws, value, block, kind = { token: "get" }, autoReturn = true) {
+        const { token } = kind;
+        ws = insertTrimmingSpace(ws, "");
+        let setVal;
+        const parameters = token === "get" ? {
+          type: "Parameters",
+          children: ["()"],
+          names: [],
+          implicit: true
+        } : {
+          type: "Parameters",
+          children: ["(", setVal = makeRef("value"), ")"],
+          names: [],
+          implicit: false
+        };
+        let expressions;
+        if (block) {
+          block = duplicateBlock(block);
+          expressions = block.expressions;
+        } else {
+          expressions = [];
+          block = {
+            type: "BlockStatement",
+            expressions,
+            children: ["{ ", expressions, " }"]
+          };
+        }
+        if (autoReturn) {
+          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];
+        return {
+          type: "MethodDefinition",
+          children,
+          name,
+          signature: {
+            type: "MethodSignature",
+            modifier: {
+              get: token === "get",
+              set: token === "set",
+              async: false
+            },
+            name,
+            returnType: void 0
+          },
+          block,
+          parameters
+        };
+      }
       function needsRef(expression, base = "ref") {
         switch (expression.type) {
           case "Ref":
@@ -3281,6 +3341,7 @@ ${input.slice(result.pos)}
         literalValue,
         makeAsConst,
         makeEmptyBlock,
+        makeGetterMethod,
         makeLeftHandSideExpression,
         makeRef,
         maybeRef,
@@ -3376,6 +3437,9 @@ ${input.slice(result.pos)}
         RHS,
         ParenthesizedAssignment,
         UnaryExpression,
+        UnaryWithoutParenthesizedAssignment,
+        UnaryBody,
+        UnaryWithoutParenthesizedAssignmentBody,
         UnaryPostfix,
         UpdateExpression,
         UpdateExpressionSymbol,
@@ -3432,6 +3496,7 @@ ${input.slice(result.pos)}
         OptionalDot,
         NonNullAssertion,
         MemberExpression,
+        MemberBase,
         MemberExpressionRest,
         MemberExpressionRestBody,
         MemberBracketContent,
@@ -4650,7 +4715,7 @@ ${input.slice(result.pos)}
       function ParenthesizedAssignment(ctx, state) {
         return $EVENT(ctx, state, "ParenthesizedAssignment", ParenthesizedAssignment$0);
       }
-      var UnaryExpression$0 = $TS($S($Q(UnaryOp), $C(UpdateExpression, NestedNonAssignmentExtendedExpression), $E(UnaryPostfix)), function($skip, $loc, $0, $1, $2, $3) {
+      var UnaryExpression$0 = $TS($S($Q(UnaryOp), UnaryBody, $E(UnaryPostfix)), function($skip, $loc, $0, $1, $2, $3) {
         var pre = $1;
         var exp = $2;
         var post = $3;
@@ -4666,6 +4731,30 @@ ${input.slice(result.pos)}
       function UnaryExpression(ctx, state) {
         return $EVENT_C(ctx, state, "UnaryExpression", UnaryExpression$$);
       }
+      var UnaryWithoutParenthesizedAssignment$0 = $TS($S($Q(UnaryOp), UnaryWithoutParenthesizedAssignmentBody, $E(UnaryPostfix)), function($skip, $loc, $0, $1, $2, $3) {
+        var pre = $1;
+        var exp = $2;
+        var post = $3;
+        return processUnaryExpression(pre, exp, post);
+      });
+      function UnaryWithoutParenthesizedAssignment(ctx, state) {
+        return $EVENT(ctx, state, "UnaryWithoutParenthesizedAssignment", UnaryWithoutParenthesizedAssignment$0);
+      }
+      var UnaryBody$0 = ParenthesizedAssignment;
+      var UnaryBody$1 = UpdateExpression;
+      var UnaryBody$2 = ExpressionizedStatementWithTrailingCallExpressions;
+      var UnaryBody$3 = NestedNonAssignmentExtendedExpression;
+      var UnaryBody$$ = [UnaryBody$0, UnaryBody$1, UnaryBody$2, UnaryBody$3];
+      function UnaryBody(ctx, state) {
+        return $EVENT_C(ctx, state, "UnaryBody", UnaryBody$$);
+      }
+      var UnaryWithoutParenthesizedAssignmentBody$0 = UpdateExpression;
+      var UnaryWithoutParenthesizedAssignmentBody$1 = ExpressionizedStatementWithTrailingCallExpressions;
+      var UnaryWithoutParenthesizedAssignmentBody$2 = NestedNonAssignmentExtendedExpression;
+      var UnaryWithoutParenthesizedAssignmentBody$$ = [UnaryWithoutParenthesizedAssignmentBody$0, UnaryWithoutParenthesizedAssignmentBody$1, UnaryWithoutParenthesizedAssignmentBody$2];
+      function UnaryWithoutParenthesizedAssignmentBody(ctx, state) {
+        return $EVENT_C(ctx, state, "UnaryWithoutParenthesizedAssignmentBody", UnaryWithoutParenthesizedAssignmentBody$$);
+      }
       var UnaryPostfix$0 = QuestionMark;
       var UnaryPostfix$1 = $T($P($S(__, $C(As, Satisfies), Type)), function(value) {
         return { "ts": true, "children": value };
@@ -4674,7 +4763,7 @@ ${input.slice(result.pos)}
       function UnaryPostfix(ctx, state) {
         return $EVENT_C(ctx, state, "UnaryPostfix", UnaryPostfix$$);
       }
-      var UpdateExpression$0 = $TS($S(UpdateExpressionSymbol, UnaryExpression), function($skip, $loc, $0, $1, $2) {
+      var UpdateExpression$0 = $TS($S(UpdateExpressionSymbol, UnaryWithoutParenthesizedAssignment), function($skip, $loc, $0, $1, $2) {
         return {
           type: "UpdateExpression",
           assigned: $2,
@@ -5067,10 +5156,22 @@ ${input.slice(result.pos)}
         return $EVENT(ctx, state, "NestedClassElement", NestedClassElement$0);
       }
       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") {
+          return {
+            ...definition,
+            children: definition.children.map((c) => {
+              return {
+                ...c,
+                children: [decorators, ...c.children]
+              };
+            })
+          };
+        }
         return {
           ...definition,
-          children: [$1, $2, $3, ...definition.children]
+          children: [decorators, $2, $3, ...definition.children]
         };
       });
       var ClassElement$1 = $TS($S(Static, BracedBlock), function($skip, $loc, $0, $1, $2) {
@@ -5180,7 +5281,14 @@ ${input.slice(result.pos)}
       var ThisLiteral$1 = $TS($S(AtThis, $TEXT($S($E(Hash), IdentifierName))), function($skip, $loc, $0, $1, $2) {
         var at = $1;
         var id = $2;
-        return [at, ".", id];
+        return {
+          type: "MemberExpression",
+          children: [at, {
+            type: "PropertyAccess",
+            name: id,
+            children: [".", id]
+          }]
+        };
       });
       var ThisLiteral$2 = AtThis;
       var ThisLiteral$3 = PrivateThis;
@@ -5194,7 +5302,14 @@ ${input.slice(result.pos)}
       });
       var PrivateThis$1 = $TV(PrivateIdentifier, function($skip, $loc, $0, $1) {
         var id = $0;
-        return ["this.", id];
+        return {
+          type: "MemberExpression",
+          children: ["this", {
+            type: "PropertyAccess",
+            name: id.name,
+            children: [".", id]
+          }]
+        };
       });
       var PrivateThis$$ = [PrivateThis$0, PrivateThis$1];
       function PrivateThis(ctx, state) {
@@ -5281,7 +5396,7 @@ ${input.slice(result.pos)}
       function NonNullAssertion(ctx, state) {
         return $EVENT(ctx, state, "NonNullAssertion", NonNullAssertion$0);
       }
-      var MemberExpression$0 = $TS($S($C(PrimaryExpression, SuperProperty, MetaProperty), $Q(MemberExpressionRest)), function($skip, $loc, $0, $1, $2) {
+      var MemberExpression$0 = $TS($S(MemberBase, $Q(MemberExpressionRest)), function($skip, $loc, $0, $1, $2) {
         var rest = $2;
         if (rest.length || Array.isArray($1)) {
           return processCallMemberExpression({
@@ -5294,6 +5409,13 @@ ${input.slice(result.pos)}
       function MemberExpression(ctx, state) {
         return $EVENT(ctx, state, "MemberExpression", MemberExpression$0);
       }
+      var MemberBase$0 = PrimaryExpression;
+      var MemberBase$1 = SuperProperty;
+      var MemberBase$2 = MetaProperty;
+      var MemberBase$$ = [MemberBase$0, MemberBase$1, MemberBase$2];
+      function MemberBase(ctx, state) {
+        return $EVENT_C(ctx, state, "MemberBase", MemberBase$$);
+      }
       var MemberExpressionRest$0 = $TS($S($Q(MultiLineComment), MemberExpressionRestBody), function($skip, $loc, $0, $1, $2) {
         var comments = $1;
         var body = $2;
@@ -5497,7 +5619,7 @@ ${input.slice(result.pos)}
       function PropertyAccess(ctx, state) {
         return $EVENT_C(ctx, state, "PropertyAccess", PropertyAccess$$);
       }
-      var PropertyGlob$0 = $TS($S(OptionalDot, $Q(MultiLineComment), BracedObjectLiteral), function($skip, $loc, $0, $1, $2, $3) {
+      var PropertyGlob$0 = $TS($S($S($E($C(QuestionMark, NonNullAssertion)), OptionalDot), $Q(MultiLineComment), BracedObjectLiteral), function($skip, $loc, $0, $1, $2, $3) {
         var dot = $1;
         var object = $3;
         return {
@@ -7303,7 +7425,76 @@ ${input.slice(result.pos)}
           parameters: signature.parameters
         };
       });
-      var MethodDefinition$$ = [MethodDefinition$0, MethodDefinition$1];
+      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 kind = $1;
+        var ws = $2;
+        var value = $4;
+        var block = $6;
+        if (!value)
+          return $skip;
+        const rest = value[1];
+        if (!rest.length) {
+          const base = value[0];
+          let name2;
+          if (base.type === "MemberExpression") {
+            const lastAccess2 = lastAccessInCallExpression(base);
+            if (lastAccess2) {
+              ({ name: name2 } = lastAccess2);
+            }
+          }
+          if (!name2)
+            ({ name: name2 } = base);
+          if (!name2)
+            return $skip;
+          if (name2[0] === "#")
+            name2 = name2.slice(1);
+          const autoReturn = !block || base.type !== "Identifier";
+          return makeGetterMethod(name2, ws, base, block, kind, autoReturn);
+        }
+        let last = rest[rest.length - 1];
+        while (Array.isArray(last)) {
+          last = last[last.length - 1];
+        }
+        switch (last.type) {
+          case "Call":
+            return $skip;
+          case "PropertyAccess":
+            const { name: name2 } = last;
+            return makeGetterMethod(name2, ws, value, block, kind);
+          case "PropertyGlob":
+            return {
+              type: "ShorthandMethodDefinition",
+              children: last.object.properties.map((p) => {
+                const { name: name3, type } = p;
+                let v;
+                switch (type) {
+                  case "Identifier":
+                    v = insertTrimmingSpace(p, "");
+                    break;
+                  case "Property":
+                    v = insertTrimmingSpace(p.value, "");
+                    break;
+                }
+                const exp = processCallMemberExpression({
+                  type: "CallExpression",
+                  children: [value[0], ...value[1].slice(0, -1), {
+                    type: "PropertyAccess",
+                    children: [last.dot, {
+                      ...v,
+                      children: [v.children.slice(0, 2)]
+                      // Remove potential delimiter
+                    }]
+                  }]
+                });
+                return makeGetterMethod(name3, ws, exp, block, kind);
+              })
+            };
+        }
+        const lastAccess = lastAccessInCallExpression({ children: rest });
+        const { name } = lastAccess;
+        return makeGetterMethod(name, ws, value, block, kind);
+      });
+      var MethodDefinition$$ = [MethodDefinition$0, MethodDefinition$1, MethodDefinition$2];
       function MethodDefinition(ctx, state) {
         return $EVENT_C(ctx, state, "MethodDefinition", MethodDefinition$$);
       }
@@ -7389,13 +7580,14 @@ ${input.slice(result.pos)}
         return $EVENT_C(ctx, state, "ClassElementName", ClassElementName$$);
       }
       var PrivateIdentifier$0 = $TV($TEXT($S(Hash, IdentifierName)), function($skip, $loc, $0, $1) {
+        var id = $0;
         return {
           type: "Identifier",
-          name: $0,
-          names: [$0],
+          name: id,
+          names: [id],
           children: [{
             $loc,
-            token: $0
+            token: id
           }]
         };
       });
@@ -12431,6 +12623,9 @@ ${input.slice(result.pos)}
       exports.RHS = RHS;
       exports.ParenthesizedAssignment = ParenthesizedAssignment;
       exports.UnaryExpression = UnaryExpression;
+      exports.UnaryWithoutParenthesizedAssignment = UnaryWithoutParenthesizedAssignment;
+      exports.UnaryBody = UnaryBody;
+      exports.UnaryWithoutParenthesizedAssignmentBody = UnaryWithoutParenthesizedAssignmentBody;
       exports.UnaryPostfix = UnaryPostfix;
       exports.UpdateExpression = UpdateExpression;
       exports.UpdateExpressionSymbol = UpdateExpressionSymbol;
@@ -12487,6 +12682,7 @@ ${input.slice(result.pos)}
       exports.OptionalDot = OptionalDot;
       exports.NonNullAssertion = NonNullAssertion;
       exports.MemberExpression = MemberExpression;
+      exports.MemberBase = MemberBase;
       exports.MemberExpressionRest = MemberExpressionRest;
       exports.MemberExpressionRestBody = MemberExpressionRestBody;
       exports.MemberBracketContent = MemberBracketContent;
@@ -13083,6 +13279,7 @@ ${input.slice(result.pos)}
         lastAccessInCallExpression,
         literalValue,
         makeEmptyBlock,
+        makeGetterMethod,
         makeLeftHandSideExpression,
         makeRef,
         maybeRef,

package/dist/civet

@@ -64,7 +64,7 @@ encoding = "utf8";
 fs = require("fs/promises");
 path = require("path");
 parseArgs = function(args) {
-  var options, filenames, scriptArgs, i, endOfArgs, arg, char;
+  var options, filenames, scriptArgs, i, endOfArgs, arg;
   options = {};
   Object.defineProperty(options, "run", {
     get: function() {
@@ -90,6 +90,7 @@ parseArgs = function(args) {
     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];
@@ -156,7 +157,7 @@ parseArgs = function(args) {
   return { filenames, scriptArgs, options };
 };
 readFiles = async function* (filenames, options) {
-  var filename, stdin, lines, rl, content, chunk;
+  var filename, stdin, lines, rl, content;
   const results1 = [];
   for (let i2 = 0, len1 = filenames.length; i2 < len1; i2++) {
     filename = filenames[i2];
@@ -185,6 +186,7 @@ readFiles = async function* (filenames, options) {
           });
         } else {
           content = (await (async () => {
+            var chunk;
             const results2 = [];
             for await (chunk of process.stdin) {
               results2.push(chunk);

package/dist/esbuild-plugin.js

@@ -130,3 +130,4 @@ civet.setup = defaultPlugin.setup;
 var esbuild_plugin_default = civet;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});
+module.exports = module.exports.default;

package/dist/main.js

@@ -1982,6 +1982,66 @@ var require_lib = __commonJS({
       }
       return parts;
     }
+    function duplicateBlock(block) {
+      const expressions = [...block.expressions];
+      const children = [...block.children];
+      children.splice(children.indexOf(block.expressions), 1, expressions);
+      return {
+        ...block,
+        expressions,
+        children
+      };
+    }
+    function makeGetterMethod(name, ws, value, block, kind = { token: "get" }, autoReturn = true) {
+      const { token } = kind;
+      ws = insertTrimmingSpace(ws, "");
+      let setVal;
+      const parameters = token === "get" ? {
+        type: "Parameters",
+        children: ["()"],
+        names: [],
+        implicit: true
+      } : {
+        type: "Parameters",
+        children: ["(", setVal = makeRef("value"), ")"],
+        names: [],
+        implicit: false
+      };
+      let expressions;
+      if (block) {
+        block = duplicateBlock(block);
+        expressions = block.expressions;
+      } else {
+        expressions = [];
+        block = {
+          type: "BlockStatement",
+          expressions,
+          children: ["{ ", expressions, " }"]
+        };
+      }
+      if (autoReturn) {
+        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];
+      return {
+        type: "MethodDefinition",
+        children,
+        name,
+        signature: {
+          type: "MethodSignature",
+          modifier: {
+            get: token === "get",
+            set: token === "set",
+            async: false
+          },
+          name,
+          returnType: void 0
+        },
+        block,
+        parameters
+      };
+    }
     function needsRef(expression, base = "ref") {
       switch (expression.type) {
         case "Ref":
@@ -3280,6 +3340,7 @@ var require_lib = __commonJS({
       literalValue,
       makeAsConst,
       makeEmptyBlock,
+      makeGetterMethod,
       makeLeftHandSideExpression,
       makeRef,
       maybeRef,
@@ -3375,6 +3436,9 @@ var require_parser = __commonJS({
       RHS,
       ParenthesizedAssignment,
       UnaryExpression,
+      UnaryWithoutParenthesizedAssignment,
+      UnaryBody,
+      UnaryWithoutParenthesizedAssignmentBody,
       UnaryPostfix,
       UpdateExpression,
       UpdateExpressionSymbol,
@@ -3431,6 +3495,7 @@ var require_parser = __commonJS({
       OptionalDot,
       NonNullAssertion,
       MemberExpression,
+      MemberBase,
       MemberExpressionRest,
       MemberExpressionRestBody,
       MemberBracketContent,
@@ -4649,7 +4714,7 @@ var require_parser = __commonJS({
     function ParenthesizedAssignment(ctx, state) {
       return $EVENT(ctx, state, "ParenthesizedAssignment", ParenthesizedAssignment$0);
     }
-    var UnaryExpression$0 = $TS($S($Q(UnaryOp), $C(UpdateExpression, NestedNonAssignmentExtendedExpression), $E(UnaryPostfix)), function($skip, $loc, $0, $1, $2, $3) {
+    var UnaryExpression$0 = $TS($S($Q(UnaryOp), UnaryBody, $E(UnaryPostfix)), function($skip, $loc, $0, $1, $2, $3) {
       var pre = $1;
       var exp = $2;
       var post = $3;
@@ -4665,6 +4730,30 @@ var require_parser = __commonJS({
     function UnaryExpression(ctx, state) {
       return $EVENT_C(ctx, state, "UnaryExpression", UnaryExpression$$);
     }
+    var UnaryWithoutParenthesizedAssignment$0 = $TS($S($Q(UnaryOp), UnaryWithoutParenthesizedAssignmentBody, $E(UnaryPostfix)), function($skip, $loc, $0, $1, $2, $3) {
+      var pre = $1;
+      var exp = $2;
+      var post = $3;
+      return processUnaryExpression(pre, exp, post);
+    });
+    function UnaryWithoutParenthesizedAssignment(ctx, state) {
+      return $EVENT(ctx, state, "UnaryWithoutParenthesizedAssignment", UnaryWithoutParenthesizedAssignment$0);
+    }
+    var UnaryBody$0 = ParenthesizedAssignment;
+    var UnaryBody$1 = UpdateExpression;
+    var UnaryBody$2 = ExpressionizedStatementWithTrailingCallExpressions;
+    var UnaryBody$3 = NestedNonAssignmentExtendedExpression;
+    var UnaryBody$$ = [UnaryBody$0, UnaryBody$1, UnaryBody$2, UnaryBody$3];
+    function UnaryBody(ctx, state) {
+      return $EVENT_C(ctx, state, "UnaryBody", UnaryBody$$);
+    }
+    var UnaryWithoutParenthesizedAssignmentBody$0 = UpdateExpression;
+    var UnaryWithoutParenthesizedAssignmentBody$1 = ExpressionizedStatementWithTrailingCallExpressions;
+    var UnaryWithoutParenthesizedAssignmentBody$2 = NestedNonAssignmentExtendedExpression;
+    var UnaryWithoutParenthesizedAssignmentBody$$ = [UnaryWithoutParenthesizedAssignmentBody$0, UnaryWithoutParenthesizedAssignmentBody$1, UnaryWithoutParenthesizedAssignmentBody$2];
+    function UnaryWithoutParenthesizedAssignmentBody(ctx, state) {
+      return $EVENT_C(ctx, state, "UnaryWithoutParenthesizedAssignmentBody", UnaryWithoutParenthesizedAssignmentBody$$);
+    }
     var UnaryPostfix$0 = QuestionMark;
     var UnaryPostfix$1 = $T($P($S(__, $C(As, Satisfies), Type)), function(value) {
       return { "ts": true, "children": value };
@@ -4673,7 +4762,7 @@ var require_parser = __commonJS({
     function UnaryPostfix(ctx, state) {
       return $EVENT_C(ctx, state, "UnaryPostfix", UnaryPostfix$$);
     }
-    var UpdateExpression$0 = $TS($S(UpdateExpressionSymbol, UnaryExpression), function($skip, $loc, $0, $1, $2) {
+    var UpdateExpression$0 = $TS($S(UpdateExpressionSymbol, UnaryWithoutParenthesizedAssignment), function($skip, $loc, $0, $1, $2) {
       return {
         type: "UpdateExpression",
         assigned: $2,
@@ -5066,10 +5155,22 @@ var require_parser = __commonJS({
       return $EVENT(ctx, state, "NestedClassElement", NestedClassElement$0);
     }
     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") {
+        return {
+          ...definition,
+          children: definition.children.map((c) => {
+            return {
+              ...c,
+              children: [decorators, ...c.children]
+            };
+          })
+        };
+      }
       return {
         ...definition,
-        children: [$1, $2, $3, ...definition.children]
+        children: [decorators, $2, $3, ...definition.children]
       };
     });
     var ClassElement$1 = $TS($S(Static, BracedBlock), function($skip, $loc, $0, $1, $2) {
@@ -5179,7 +5280,14 @@ var require_parser = __commonJS({
     var ThisLiteral$1 = $TS($S(AtThis, $TEXT($S($E(Hash), IdentifierName))), function($skip, $loc, $0, $1, $2) {
       var at = $1;
       var id = $2;
-      return [at, ".", id];
+      return {
+        type: "MemberExpression",
+        children: [at, {
+          type: "PropertyAccess",
+          name: id,
+          children: [".", id]
+        }]
+      };
     });
     var ThisLiteral$2 = AtThis;
     var ThisLiteral$3 = PrivateThis;
@@ -5193,7 +5301,14 @@ var require_parser = __commonJS({
     });
     var PrivateThis$1 = $TV(PrivateIdentifier, function($skip, $loc, $0, $1) {
       var id = $0;
-      return ["this.", id];
+      return {
+        type: "MemberExpression",
+        children: ["this", {
+          type: "PropertyAccess",
+          name: id.name,
+          children: [".", id]
+        }]
+      };
     });
     var PrivateThis$$ = [PrivateThis$0, PrivateThis$1];
     function PrivateThis(ctx, state) {
@@ -5280,7 +5395,7 @@ var require_parser = __commonJS({
     function NonNullAssertion(ctx, state) {
       return $EVENT(ctx, state, "NonNullAssertion", NonNullAssertion$0);
     }
-    var MemberExpression$0 = $TS($S($C(PrimaryExpression, SuperProperty, MetaProperty), $Q(MemberExpressionRest)), function($skip, $loc, $0, $1, $2) {
+    var MemberExpression$0 = $TS($S(MemberBase, $Q(MemberExpressionRest)), function($skip, $loc, $0, $1, $2) {
       var rest = $2;
       if (rest.length || Array.isArray($1)) {
         return processCallMemberExpression({
@@ -5293,6 +5408,13 @@ var require_parser = __commonJS({
     function MemberExpression(ctx, state) {
       return $EVENT(ctx, state, "MemberExpression", MemberExpression$0);
     }
+    var MemberBase$0 = PrimaryExpression;
+    var MemberBase$1 = SuperProperty;
+    var MemberBase$2 = MetaProperty;
+    var MemberBase$$ = [MemberBase$0, MemberBase$1, MemberBase$2];
+    function MemberBase(ctx, state) {
+      return $EVENT_C(ctx, state, "MemberBase", MemberBase$$);
+    }
     var MemberExpressionRest$0 = $TS($S($Q(MultiLineComment), MemberExpressionRestBody), function($skip, $loc, $0, $1, $2) {
       var comments = $1;
       var body = $2;
@@ -5496,7 +5618,7 @@ var require_parser = __commonJS({
     function PropertyAccess(ctx, state) {
       return $EVENT_C(ctx, state, "PropertyAccess", PropertyAccess$$);
     }
-    var PropertyGlob$0 = $TS($S(OptionalDot, $Q(MultiLineComment), BracedObjectLiteral), function($skip, $loc, $0, $1, $2, $3) {
+    var PropertyGlob$0 = $TS($S($S($E($C(QuestionMark, NonNullAssertion)), OptionalDot), $Q(MultiLineComment), BracedObjectLiteral), function($skip, $loc, $0, $1, $2, $3) {
       var dot = $1;
       var object = $3;
       return {
@@ -7302,7 +7424,76 @@ var require_parser = __commonJS({
         parameters: signature.parameters
       };
     });
-    var MethodDefinition$$ = [MethodDefinition$0, MethodDefinition$1];
+    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 kind = $1;
+      var ws = $2;
+      var value = $4;
+      var block = $6;
+      if (!value)
+        return $skip;
+      const rest = value[1];
+      if (!rest.length) {
+        const base = value[0];
+        let name2;
+        if (base.type === "MemberExpression") {
+          const lastAccess2 = lastAccessInCallExpression(base);
+          if (lastAccess2) {
+            ({ name: name2 } = lastAccess2);
+          }
+        }
+        if (!name2)
+          ({ name: name2 } = base);
+        if (!name2)
+          return $skip;
+        if (name2[0] === "#")
+          name2 = name2.slice(1);
+        const autoReturn = !block || base.type !== "Identifier";
+        return makeGetterMethod(name2, ws, base, block, kind, autoReturn);
+      }
+      let last = rest[rest.length - 1];
+      while (Array.isArray(last)) {
+        last = last[last.length - 1];
+      }
+      switch (last.type) {
+        case "Call":
+          return $skip;
+        case "PropertyAccess":
+          const { name: name2 } = last;
+          return makeGetterMethod(name2, ws, value, block, kind);
+        case "PropertyGlob":
+          return {
+            type: "ShorthandMethodDefinition",
+            children: last.object.properties.map((p) => {
+              const { name: name3, type } = p;
+              let v;
+              switch (type) {
+                case "Identifier":
+                  v = insertTrimmingSpace(p, "");
+                  break;
+                case "Property":
+                  v = insertTrimmingSpace(p.value, "");
+                  break;
+              }
+              const exp = processCallMemberExpression({
+                type: "CallExpression",
+                children: [value[0], ...value[1].slice(0, -1), {
+                  type: "PropertyAccess",
+                  children: [last.dot, {
+                    ...v,
+                    children: [v.children.slice(0, 2)]
+                    // Remove potential delimiter
+                  }]
+                }]
+              });
+              return makeGetterMethod(name3, ws, exp, block, kind);
+            })
+          };
+      }
+      const lastAccess = lastAccessInCallExpression({ children: rest });
+      const { name } = lastAccess;
+      return makeGetterMethod(name, ws, value, block, kind);
+    });
+    var MethodDefinition$$ = [MethodDefinition$0, MethodDefinition$1, MethodDefinition$2];
     function MethodDefinition(ctx, state) {
       return $EVENT_C(ctx, state, "MethodDefinition", MethodDefinition$$);
     }
@@ -7388,13 +7579,14 @@ var require_parser = __commonJS({
       return $EVENT_C(ctx, state, "ClassElementName", ClassElementName$$);
     }
     var PrivateIdentifier$0 = $TV($TEXT($S(Hash, IdentifierName)), function($skip, $loc, $0, $1) {
+      var id = $0;
       return {
         type: "Identifier",
-        name: $0,
-        names: [$0],
+        name: id,
+        names: [id],
         children: [{
           $loc,
-          token: $0
+          token: id
         }]
       };
     });
@@ -12430,6 +12622,9 @@ var require_parser = __commonJS({
     exports.RHS = RHS;
     exports.ParenthesizedAssignment = ParenthesizedAssignment;
     exports.UnaryExpression = UnaryExpression;
+    exports.UnaryWithoutParenthesizedAssignment = UnaryWithoutParenthesizedAssignment;
+    exports.UnaryBody = UnaryBody;
+    exports.UnaryWithoutParenthesizedAssignmentBody = UnaryWithoutParenthesizedAssignmentBody;
     exports.UnaryPostfix = UnaryPostfix;
     exports.UpdateExpression = UpdateExpression;
     exports.UpdateExpressionSymbol = UpdateExpressionSymbol;
@@ -12486,6 +12681,7 @@ var require_parser = __commonJS({
     exports.OptionalDot = OptionalDot;
     exports.NonNullAssertion = NonNullAssertion;
     exports.MemberExpression = MemberExpression;
+    exports.MemberBase = MemberBase;
     exports.MemberExpressionRest = MemberExpressionRest;
     exports.MemberExpressionRestBody = MemberExpressionRestBody;
     exports.MemberBracketContent = MemberBracketContent;
@@ -13082,6 +13278,7 @@ var require_parser = __commonJS({
       lastAccessInCallExpression,
       literalValue,
       makeEmptyBlock,
+      makeGetterMethod,
       makeLeftHandSideExpression,
       makeRef,
       maybeRef,

package/dist/main.mjs

@@ -1980,6 +1980,66 @@ var require_lib = __commonJS({
       }
       return parts;
     }
+    function duplicateBlock(block) {
+      const expressions = [...block.expressions];
+      const children = [...block.children];
+      children.splice(children.indexOf(block.expressions), 1, expressions);
+      return {
+        ...block,
+        expressions,
+        children
+      };
+    }
+    function makeGetterMethod(name, ws, value, block, kind = { token: "get" }, autoReturn = true) {
+      const { token } = kind;
+      ws = insertTrimmingSpace(ws, "");
+      let setVal;
+      const parameters = token === "get" ? {
+        type: "Parameters",
+        children: ["()"],
+        names: [],
+        implicit: true
+      } : {
+        type: "Parameters",
+        children: ["(", setVal = makeRef("value"), ")"],
+        names: [],
+        implicit: false
+      };
+      let expressions;
+      if (block) {
+        block = duplicateBlock(block);
+        expressions = block.expressions;
+      } else {
+        expressions = [];
+        block = {
+          type: "BlockStatement",
+          expressions,
+          children: ["{ ", expressions, " }"]
+        };
+      }
+      if (autoReturn) {
+        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];
+      return {
+        type: "MethodDefinition",
+        children,
+        name,
+        signature: {
+          type: "MethodSignature",
+          modifier: {
+            get: token === "get",
+            set: token === "set",
+            async: false
+          },
+          name,
+          returnType: void 0
+        },
+        block,
+        parameters
+      };
+    }
     function needsRef(expression, base = "ref") {
       switch (expression.type) {
         case "Ref":
@@ -3278,6 +3338,7 @@ var require_lib = __commonJS({
       literalValue,
       makeAsConst,
       makeEmptyBlock,
+      makeGetterMethod,
       makeLeftHandSideExpression,
       makeRef,
       maybeRef,
@@ -3373,6 +3434,9 @@ var require_parser = __commonJS({
       RHS,
       ParenthesizedAssignment,
       UnaryExpression,
+      UnaryWithoutParenthesizedAssignment,
+      UnaryBody,
+      UnaryWithoutParenthesizedAssignmentBody,
       UnaryPostfix,
       UpdateExpression,
       UpdateExpressionSymbol,
@@ -3429,6 +3493,7 @@ var require_parser = __commonJS({
       OptionalDot,
       NonNullAssertion,
       MemberExpression,
+      MemberBase,
       MemberExpressionRest,
       MemberExpressionRestBody,
       MemberBracketContent,
@@ -4647,7 +4712,7 @@ var require_parser = __commonJS({
     function ParenthesizedAssignment(ctx, state) {
       return $EVENT(ctx, state, "ParenthesizedAssignment", ParenthesizedAssignment$0);
     }
-    var UnaryExpression$0 = $TS($S($Q(UnaryOp), $C(UpdateExpression, NestedNonAssignmentExtendedExpression), $E(UnaryPostfix)), function($skip, $loc, $0, $1, $2, $3) {
+    var UnaryExpression$0 = $TS($S($Q(UnaryOp), UnaryBody, $E(UnaryPostfix)), function($skip, $loc, $0, $1, $2, $3) {
       var pre = $1;
       var exp = $2;
       var post = $3;
@@ -4663,6 +4728,30 @@ var require_parser = __commonJS({
     function UnaryExpression(ctx, state) {
       return $EVENT_C(ctx, state, "UnaryExpression", UnaryExpression$$);
     }
+    var UnaryWithoutParenthesizedAssignment$0 = $TS($S($Q(UnaryOp), UnaryWithoutParenthesizedAssignmentBody, $E(UnaryPostfix)), function($skip, $loc, $0, $1, $2, $3) {
+      var pre = $1;
+      var exp = $2;
+      var post = $3;
+      return processUnaryExpression(pre, exp, post);
+    });
+    function UnaryWithoutParenthesizedAssignment(ctx, state) {
+      return $EVENT(ctx, state, "UnaryWithoutParenthesizedAssignment", UnaryWithoutParenthesizedAssignment$0);
+    }
+    var UnaryBody$0 = ParenthesizedAssignment;
+    var UnaryBody$1 = UpdateExpression;
+    var UnaryBody$2 = ExpressionizedStatementWithTrailingCallExpressions;
+    var UnaryBody$3 = NestedNonAssignmentExtendedExpression;
+    var UnaryBody$$ = [UnaryBody$0, UnaryBody$1, UnaryBody$2, UnaryBody$3];
+    function UnaryBody(ctx, state) {
+      return $EVENT_C(ctx, state, "UnaryBody", UnaryBody$$);
+    }
+    var UnaryWithoutParenthesizedAssignmentBody$0 = UpdateExpression;
+    var UnaryWithoutParenthesizedAssignmentBody$1 = ExpressionizedStatementWithTrailingCallExpressions;
+    var UnaryWithoutParenthesizedAssignmentBody$2 = NestedNonAssignmentExtendedExpression;
+    var UnaryWithoutParenthesizedAssignmentBody$$ = [UnaryWithoutParenthesizedAssignmentBody$0, UnaryWithoutParenthesizedAssignmentBody$1, UnaryWithoutParenthesizedAssignmentBody$2];
+    function UnaryWithoutParenthesizedAssignmentBody(ctx, state) {
+      return $EVENT_C(ctx, state, "UnaryWithoutParenthesizedAssignmentBody", UnaryWithoutParenthesizedAssignmentBody$$);
+    }
     var UnaryPostfix$0 = QuestionMark;
     var UnaryPostfix$1 = $T($P($S(__, $C(As, Satisfies), Type)), function(value) {
       return { "ts": true, "children": value };
@@ -4671,7 +4760,7 @@ var require_parser = __commonJS({
     function UnaryPostfix(ctx, state) {
       return $EVENT_C(ctx, state, "UnaryPostfix", UnaryPostfix$$);
     }
-    var UpdateExpression$0 = $TS($S(UpdateExpressionSymbol, UnaryExpression), function($skip, $loc, $0, $1, $2) {
+    var UpdateExpression$0 = $TS($S(UpdateExpressionSymbol, UnaryWithoutParenthesizedAssignment), function($skip, $loc, $0, $1, $2) {
       return {
         type: "UpdateExpression",
         assigned: $2,
@@ -5064,10 +5153,22 @@ var require_parser = __commonJS({
       return $EVENT(ctx, state, "NestedClassElement", NestedClassElement$0);
     }
     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") {
+        return {
+          ...definition,
+          children: definition.children.map((c) => {
+            return {
+              ...c,
+              children: [decorators, ...c.children]
+            };
+          })
+        };
+      }
       return {
         ...definition,
-        children: [$1, $2, $3, ...definition.children]
+        children: [decorators, $2, $3, ...definition.children]
       };
     });
     var ClassElement$1 = $TS($S(Static, BracedBlock), function($skip, $loc, $0, $1, $2) {
@@ -5177,7 +5278,14 @@ var require_parser = __commonJS({
     var ThisLiteral$1 = $TS($S(AtThis, $TEXT($S($E(Hash), IdentifierName))), function($skip, $loc, $0, $1, $2) {
       var at = $1;
       var id = $2;
-      return [at, ".", id];
+      return {
+        type: "MemberExpression",
+        children: [at, {
+          type: "PropertyAccess",
+          name: id,
+          children: [".", id]
+        }]
+      };
     });
     var ThisLiteral$2 = AtThis;
     var ThisLiteral$3 = PrivateThis;
@@ -5191,7 +5299,14 @@ var require_parser = __commonJS({
     });
     var PrivateThis$1 = $TV(PrivateIdentifier, function($skip, $loc, $0, $1) {
       var id = $0;
-      return ["this.", id];
+      return {
+        type: "MemberExpression",
+        children: ["this", {
+          type: "PropertyAccess",
+          name: id.name,
+          children: [".", id]
+        }]
+      };
     });
     var PrivateThis$$ = [PrivateThis$0, PrivateThis$1];
     function PrivateThis(ctx, state) {
@@ -5278,7 +5393,7 @@ var require_parser = __commonJS({
     function NonNullAssertion(ctx, state) {
       return $EVENT(ctx, state, "NonNullAssertion", NonNullAssertion$0);
     }
-    var MemberExpression$0 = $TS($S($C(PrimaryExpression, SuperProperty, MetaProperty), $Q(MemberExpressionRest)), function($skip, $loc, $0, $1, $2) {
+    var MemberExpression$0 = $TS($S(MemberBase, $Q(MemberExpressionRest)), function($skip, $loc, $0, $1, $2) {
       var rest = $2;
       if (rest.length || Array.isArray($1)) {
         return processCallMemberExpression({
@@ -5291,6 +5406,13 @@ var require_parser = __commonJS({
     function MemberExpression(ctx, state) {
       return $EVENT(ctx, state, "MemberExpression", MemberExpression$0);
     }
+    var MemberBase$0 = PrimaryExpression;
+    var MemberBase$1 = SuperProperty;
+    var MemberBase$2 = MetaProperty;
+    var MemberBase$$ = [MemberBase$0, MemberBase$1, MemberBase$2];
+    function MemberBase(ctx, state) {
+      return $EVENT_C(ctx, state, "MemberBase", MemberBase$$);
+    }
     var MemberExpressionRest$0 = $TS($S($Q(MultiLineComment), MemberExpressionRestBody), function($skip, $loc, $0, $1, $2) {
       var comments = $1;
       var body = $2;
@@ -5494,7 +5616,7 @@ var require_parser = __commonJS({
     function PropertyAccess(ctx, state) {
       return $EVENT_C(ctx, state, "PropertyAccess", PropertyAccess$$);
     }
-    var PropertyGlob$0 = $TS($S(OptionalDot, $Q(MultiLineComment), BracedObjectLiteral), function($skip, $loc, $0, $1, $2, $3) {
+    var PropertyGlob$0 = $TS($S($S($E($C(QuestionMark, NonNullAssertion)), OptionalDot), $Q(MultiLineComment), BracedObjectLiteral), function($skip, $loc, $0, $1, $2, $3) {
       var dot = $1;
       var object = $3;
       return {
@@ -7300,7 +7422,76 @@ var require_parser = __commonJS({
         parameters: signature.parameters
       };
     });
-    var MethodDefinition$$ = [MethodDefinition$0, MethodDefinition$1];
+    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 kind = $1;
+      var ws = $2;
+      var value = $4;
+      var block = $6;
+      if (!value)
+        return $skip;
+      const rest = value[1];
+      if (!rest.length) {
+        const base = value[0];
+        let name2;
+        if (base.type === "MemberExpression") {
+          const lastAccess2 = lastAccessInCallExpression(base);
+          if (lastAccess2) {
+            ({ name: name2 } = lastAccess2);
+          }
+        }
+        if (!name2)
+          ({ name: name2 } = base);
+        if (!name2)
+          return $skip;
+        if (name2[0] === "#")
+          name2 = name2.slice(1);
+        const autoReturn = !block || base.type !== "Identifier";
+        return makeGetterMethod(name2, ws, base, block, kind, autoReturn);
+      }
+      let last = rest[rest.length - 1];
+      while (Array.isArray(last)) {
+        last = last[last.length - 1];
+      }
+      switch (last.type) {
+        case "Call":
+          return $skip;
+        case "PropertyAccess":
+          const { name: name2 } = last;
+          return makeGetterMethod(name2, ws, value, block, kind);
+        case "PropertyGlob":
+          return {
+            type: "ShorthandMethodDefinition",
+            children: last.object.properties.map((p) => {
+              const { name: name3, type } = p;
+              let v;
+              switch (type) {
+                case "Identifier":
+                  v = insertTrimmingSpace(p, "");
+                  break;
+                case "Property":
+                  v = insertTrimmingSpace(p.value, "");
+                  break;
+              }
+              const exp = processCallMemberExpression({
+                type: "CallExpression",
+                children: [value[0], ...value[1].slice(0, -1), {
+                  type: "PropertyAccess",
+                  children: [last.dot, {
+                    ...v,
+                    children: [v.children.slice(0, 2)]
+                    // Remove potential delimiter
+                  }]
+                }]
+              });
+              return makeGetterMethod(name3, ws, exp, block, kind);
+            })
+          };
+      }
+      const lastAccess = lastAccessInCallExpression({ children: rest });
+      const { name } = lastAccess;
+      return makeGetterMethod(name, ws, value, block, kind);
+    });
+    var MethodDefinition$$ = [MethodDefinition$0, MethodDefinition$1, MethodDefinition$2];
     function MethodDefinition(ctx, state) {
       return $EVENT_C(ctx, state, "MethodDefinition", MethodDefinition$$);
     }
@@ -7386,13 +7577,14 @@ var require_parser = __commonJS({
       return $EVENT_C(ctx, state, "ClassElementName", ClassElementName$$);
     }
     var PrivateIdentifier$0 = $TV($TEXT($S(Hash, IdentifierName)), function($skip, $loc, $0, $1) {
+      var id = $0;
       return {
         type: "Identifier",
-        name: $0,
-        names: [$0],
+        name: id,
+        names: [id],
         children: [{
           $loc,
-          token: $0
+          token: id
         }]
       };
     });
@@ -12428,6 +12620,9 @@ var require_parser = __commonJS({
     exports.RHS = RHS;
     exports.ParenthesizedAssignment = ParenthesizedAssignment;
     exports.UnaryExpression = UnaryExpression;
+    exports.UnaryWithoutParenthesizedAssignment = UnaryWithoutParenthesizedAssignment;
+    exports.UnaryBody = UnaryBody;
+    exports.UnaryWithoutParenthesizedAssignmentBody = UnaryWithoutParenthesizedAssignmentBody;
     exports.UnaryPostfix = UnaryPostfix;
     exports.UpdateExpression = UpdateExpression;
     exports.UpdateExpressionSymbol = UpdateExpressionSymbol;
@@ -12484,6 +12679,7 @@ var require_parser = __commonJS({
     exports.OptionalDot = OptionalDot;
     exports.NonNullAssertion = NonNullAssertion;
     exports.MemberExpression = MemberExpression;
+    exports.MemberBase = MemberBase;
     exports.MemberExpressionRest = MemberExpressionRest;
     exports.MemberExpressionRestBody = MemberExpressionRestBody;
     exports.MemberBracketContent = MemberBracketContent;
@@ -13080,6 +13276,7 @@ var require_parser = __commonJS({
       lastAccessInCallExpression,
       literalValue,
       makeEmptyBlock,
+      makeGetterMethod,
       makeLeftHandSideExpression,
       makeRef,
       maybeRef,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.6.33",
+  "version": "0.6.35",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -66,7 +66,7 @@
     "unplugin": "^1.4.0"
   },
   "devDependencies": {
-    "@danielx/civet": "^0.6.26",
+    "@danielx/civet": "0.6.34",
     "@danielx/hera": "^0.8.10",
     "@types/assert": "^1.5.6",
     "@types/mocha": "^9.1.1",