@danielx/civet 0.6.5 → 0.6.7

package/dist/browser.js

@@ -1106,6 +1106,16 @@ var Civet = (() => {
         }
         return node;
       }
+      function makeEmptyBlock() {
+        const expressions = [];
+        return {
+          type: "BlockStatement",
+          expressions,
+          children: ["{", expressions, "}"],
+          bare: false,
+          empty: true
+        };
+      }
       function makeLeftHandSideExpression(expression) {
         switch (expression.type) {
           case "Ref":
@@ -1334,14 +1344,25 @@ var Civet = (() => {
           }
         });
         gatherRecursiveAll(statements, ({ type }) => type === "MethodDefinition").forEach((f) => {
+          const { abstract, block, signature } = f;
+          if (!abstract && !block) {
+            const { name } = signature, { parent } = f, { elements } = parent, currentIndex = elements.findIndex(([, def]) => def === f);
+            const following = elements[currentIndex + 1]?.[1];
+            if (following?.signature?.name !== name) {
+              const block2 = makeEmptyBlock();
+              block2.parent = f;
+              f.block = block2;
+              f.children.push(block2);
+            }
+          }
           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;
+            const { signature: signature2, block: block2 } = f;
+            const isConstructor = signature2.name === "constructor";
+            const isVoid = isVoidType(signature2.returnType?.t);
+            const isSet = signature2.modifier?.set;
             if (!isConstructor && !isSet && !isVoid) {
-              insertReturn(block);
+              insertReturn(block2);
             }
           }
         });
@@ -2462,7 +2483,9 @@ var Civet = (() => {
         lastAccessInCallExpression,
         literalValue,
         makeAsConst,
+        makeEmptyBlock,
         makeLeftHandSideExpression,
+        maybeRef,
         modifyString,
         needsRef,
         processBinaryOpExpression,
@@ -5691,8 +5714,22 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var ClassBody$0 = $S(__, OpenBrace, $E(NestedClassElements), __, CloseBrace);
-      var ClassBody$1 = $S(InsertOpenBrace, $E(NestedClassElements), InsertNewline, InsertIndent, InsertCloseBrace);
+      var ClassBody$0 = $TS($S(__, OpenBrace, $E(NestedClassElements), __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+        var elements = $3;
+        return {
+          type: "ClassBody",
+          children: $0,
+          elements
+        };
+      });
+      var ClassBody$1 = $TS($S(InsertOpenBrace, $E(NestedClassElements), InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+        var elements = $2;
+        return {
+          type: "ClassBody",
+          children: $0,
+          elements
+        };
+      });
       function ClassBody(state) {
         let eventData;
         if (state.events) {
@@ -5766,8 +5803,19 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var ClassElement$0 = $S($E(Decorators), $E(AccessModifier), $E($S(Static, $E(_))), ClassElementDefinition);
-      var ClassElement$1 = $S(Static, BracedBlock);
+      var ClassElement$0 = $TS($S($E(Decorators), $E(AccessModifier), $E($S(Static, $E(_))), ClassElementDefinition), function($skip, $loc, $0, $1, $2, $3, $4) {
+        var definition = $4;
+        return {
+          ...definition,
+          children: [$1, $2, $3, ...definition.children]
+        };
+      });
+      var ClassElement$1 = $TS($S(Static, BracedBlock), function($skip, $loc, $0, $1, $2) {
+        return {
+          type: "ClassStaticBlock",
+          children: $0
+        };
+      });
       function ClassElement(state) {
         let eventData;
         if (state.events) {
@@ -5983,7 +6031,10 @@ ${input.slice(result.pos)}
               children
             };
           default:
-            return [id, " = ", exp];
+            return {
+              type: "FieldDefinition",
+              children: [id, " = ", exp]
+            };
         }
       });
       var FieldDefinition$1 = $TS($S(InsertReadonly, ClassElementName, $E(TypeSuffix), __, ConstAssignment, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
@@ -5993,12 +6044,18 @@ ${input.slice(result.pos)}
           pos: ca.$loc.pos - 1,
           length: ca.$loc.length + 1
         };
-        return $0;
+        return {
+          type: "FieldDefinition",
+          children: $0
+        };
       });
       var FieldDefinition$2 = $TS($S($E($S(Abstract, $E(_))), $E($S(Readonly, $E(_))), ClassElementName, $E(TypeSuffix), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         if ($1)
           return { children: $0, ts: true };
-        return $0;
+        return {
+          type: "FieldDefinition",
+          children: $0
+        };
       });
       function FieldDefinition(state) {
         let eventData;
@@ -6330,11 +6387,11 @@ ${input.slice(result.pos)}
       }
       var MemberBracketContent$0 = $TS($S(OpenBracket, $C(SliceParameters, PostfixedExpression), __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
         var open = $1;
-        var exp = $2;
+        var expression = $2;
         var ws = $3;
         var close = $4;
-        if (exp.type === "SliceParameters") {
-          const { start, end, children } = exp;
+        if (expression.type === "SliceParameters") {
+          const { start, end, children } = expression;
           return {
             type: "SliceExpression",
             start,
@@ -6348,7 +6405,8 @@ ${input.slice(result.pos)}
         }
         return {
           type: "Index",
-          children: $0
+          children: $0,
+          expression
         };
       });
       var MemberBracketContent$1 = $TS($S(Dot, $C(TemplateLiteral, StringLiteral)), function($skip, $loc, $0, $1, $2) {
@@ -9711,7 +9769,7 @@ ${input.slice(result.pos)}
       var PropertyDefinition$3 = $TS($S(__, MethodDefinition), function($skip, $loc, $0, $1, $2) {
         var ws = $1;
         var def = $2;
-        if (def.block.empty)
+        if (!def.block || def.block.empty)
           return $skip;
         return {
           ...def,
@@ -9739,12 +9797,40 @@ ${input.slice(result.pos)}
         const last = lastAccessInCallExpression(value);
         if (!last)
           return $skip;
-        let name;
-        if (last.type === "Index") {
-          name = {
-            type: "ComputedPropertyName",
-            children: last.children
-          };
+        let name, hoistDec, ref, refAssignment;
+        const { expression, type } = last;
+        if (type === "Index") {
+          ref = maybeRef(expression);
+          if (ref !== expression) {
+            hoistDec = {
+              type: "Declaration",
+              children: ["let ", ref]
+            };
+            refAssignment = {
+              type: "Assignment",
+              children: [ref, " = ", expression]
+            };
+            name = {
+              type: "ComputedPropertyName",
+              children: [last.children[0], "(", refAssignment, ",", ref, ")", ...last.children.slice(-2)]
+            };
+            value = {
+              ...value,
+              children: value.children.map((c) => {
+                if (c === last)
+                  return {
+                    type: "Index",
+                    children: ["[", ref, "]"]
+                  };
+                return c;
+              })
+            };
+          } else {
+            name = {
+              type: "ComputedPropertyName",
+              children: last.children
+            };
+          }
         } else {
           ({ name } = last);
           if (!name)
@@ -9755,7 +9841,8 @@ ${input.slice(result.pos)}
           children: [ws, name, ": ", value],
           name,
           value,
-          names: []
+          names: [],
+          hoistDec
         };
       });
       function PropertyDefinition(state) {
@@ -10005,12 +10092,13 @@ ${input.slice(result.pos)}
           type: "MethodDefinition",
           children: $0,
           name: signature.name,
+          abstract: true,
           signature,
           parameters: signature.parameters,
           ts: true
         };
       });
-      var MethodDefinition$1 = $TS($S(MethodSignature, $N(PropertyAccess), BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3) {
+      var MethodDefinition$1 = $TS($S(MethodSignature, $N(PropertyAccess), $E(BracedBlock)), function($skip, $loc, $0, $1, $2, $3) {
         var signature = $1;
         var block = $3;
         let children = $0;
@@ -10140,7 +10228,7 @@ ${input.slice(result.pos)}
         var modifier = $1;
         var name = $2;
         var parameters = $4;
-        var suffix = $5;
+        var returnType = $5;
         if (name.name) {
           name = name.name;
         } else if (name.token) {
@@ -10151,7 +10239,7 @@ ${input.slice(result.pos)}
           children: $0,
           name,
           modifier,
-          returnType: suffix,
+          returnType,
           parameters
         };
       });
@@ -12653,14 +12741,7 @@ ${input.slice(result.pos)}
         var c = $4;
         var f = $5;
         if (!c && !f) {
-          const e = [];
-          const emptyCatchBlock = {
-            type: "BlockStatement",
-            expressions: e,
-            children: ["{", e, "}"],
-            bare: false,
-            empty: true
-          };
+          const emptyCatchBlock = makeEmptyBlock();
           c = {
             type: "CatchClause",
             children: [" catch(e) ", emptyCatchBlock],
@@ -23374,7 +23455,9 @@ ${input.slice(result.pos)}
         isWhitespaceOrEmpty,
         lastAccessInCallExpression,
         literalValue,
+        makeEmptyBlock,
         makeLeftHandSideExpression,
+        maybeRef,
         modifyString,
         processBinaryOpExpression,
         processCallMemberExpression,

package/dist/main.js

@@ -1105,6 +1105,16 @@ var require_lib = __commonJS({
       }
       return node;
     }
+    function makeEmptyBlock() {
+      const expressions = [];
+      return {
+        type: "BlockStatement",
+        expressions,
+        children: ["{", expressions, "}"],
+        bare: false,
+        empty: true
+      };
+    }
     function makeLeftHandSideExpression(expression) {
       switch (expression.type) {
         case "Ref":
@@ -1333,14 +1343,25 @@ var require_lib = __commonJS({
         }
       });
       gatherRecursiveAll(statements, ({ type }) => type === "MethodDefinition").forEach((f) => {
+        const { abstract, block, signature } = f;
+        if (!abstract && !block) {
+          const { name } = signature, { parent } = f, { elements } = parent, currentIndex = elements.findIndex(([, def]) => def === f);
+          const following = elements[currentIndex + 1]?.[1];
+          if (following?.signature?.name !== name) {
+            const block2 = makeEmptyBlock();
+            block2.parent = f;
+            f.block = block2;
+            f.children.push(block2);
+          }
+        }
         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;
+          const { signature: signature2, block: block2 } = f;
+          const isConstructor = signature2.name === "constructor";
+          const isVoid = isVoidType(signature2.returnType?.t);
+          const isSet = signature2.modifier?.set;
           if (!isConstructor && !isSet && !isVoid) {
-            insertReturn(block);
+            insertReturn(block2);
           }
         }
       });
@@ -2461,7 +2482,9 @@ var require_lib = __commonJS({
       lastAccessInCallExpression,
       literalValue,
       makeAsConst,
+      makeEmptyBlock,
       makeLeftHandSideExpression,
+      maybeRef,
       modifyString,
       needsRef,
       processBinaryOpExpression,
@@ -5690,8 +5713,22 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ClassBody$0 = $S(__, OpenBrace, $E(NestedClassElements), __, CloseBrace);
-    var ClassBody$1 = $S(InsertOpenBrace, $E(NestedClassElements), InsertNewline, InsertIndent, InsertCloseBrace);
+    var ClassBody$0 = $TS($S(__, OpenBrace, $E(NestedClassElements), __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var elements = $3;
+      return {
+        type: "ClassBody",
+        children: $0,
+        elements
+      };
+    });
+    var ClassBody$1 = $TS($S(InsertOpenBrace, $E(NestedClassElements), InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var elements = $2;
+      return {
+        type: "ClassBody",
+        children: $0,
+        elements
+      };
+    });
     function ClassBody(state) {
       let eventData;
       if (state.events) {
@@ -5765,8 +5802,19 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ClassElement$0 = $S($E(Decorators), $E(AccessModifier), $E($S(Static, $E(_))), ClassElementDefinition);
-    var ClassElement$1 = $S(Static, BracedBlock);
+    var ClassElement$0 = $TS($S($E(Decorators), $E(AccessModifier), $E($S(Static, $E(_))), ClassElementDefinition), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var definition = $4;
+      return {
+        ...definition,
+        children: [$1, $2, $3, ...definition.children]
+      };
+    });
+    var ClassElement$1 = $TS($S(Static, BracedBlock), function($skip, $loc, $0, $1, $2) {
+      return {
+        type: "ClassStaticBlock",
+        children: $0
+      };
+    });
     function ClassElement(state) {
       let eventData;
       if (state.events) {
@@ -5982,7 +6030,10 @@ ${input.slice(result.pos)}
             children
           };
         default:
-          return [id, " = ", exp];
+          return {
+            type: "FieldDefinition",
+            children: [id, " = ", exp]
+          };
       }
     });
     var FieldDefinition$1 = $TS($S(InsertReadonly, ClassElementName, $E(TypeSuffix), __, ConstAssignment, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
@@ -5992,12 +6043,18 @@ ${input.slice(result.pos)}
         pos: ca.$loc.pos - 1,
         length: ca.$loc.length + 1
       };
-      return $0;
+      return {
+        type: "FieldDefinition",
+        children: $0
+      };
     });
     var FieldDefinition$2 = $TS($S($E($S(Abstract, $E(_))), $E($S(Readonly, $E(_))), ClassElementName, $E(TypeSuffix), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       if ($1)
         return { children: $0, ts: true };
-      return $0;
+      return {
+        type: "FieldDefinition",
+        children: $0
+      };
     });
     function FieldDefinition(state) {
       let eventData;
@@ -6329,11 +6386,11 @@ ${input.slice(result.pos)}
     }
     var MemberBracketContent$0 = $TS($S(OpenBracket, $C(SliceParameters, PostfixedExpression), __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
       var open = $1;
-      var exp = $2;
+      var expression = $2;
       var ws = $3;
       var close = $4;
-      if (exp.type === "SliceParameters") {
-        const { start, end, children } = exp;
+      if (expression.type === "SliceParameters") {
+        const { start, end, children } = expression;
         return {
           type: "SliceExpression",
           start,
@@ -6347,7 +6404,8 @@ ${input.slice(result.pos)}
       }
       return {
         type: "Index",
-        children: $0
+        children: $0,
+        expression
       };
     });
     var MemberBracketContent$1 = $TS($S(Dot, $C(TemplateLiteral, StringLiteral)), function($skip, $loc, $0, $1, $2) {
@@ -9710,7 +9768,7 @@ ${input.slice(result.pos)}
     var PropertyDefinition$3 = $TS($S(__, MethodDefinition), function($skip, $loc, $0, $1, $2) {
       var ws = $1;
       var def = $2;
-      if (def.block.empty)
+      if (!def.block || def.block.empty)
         return $skip;
       return {
         ...def,
@@ -9738,12 +9796,40 @@ ${input.slice(result.pos)}
       const last = lastAccessInCallExpression(value);
       if (!last)
         return $skip;
-      let name;
-      if (last.type === "Index") {
-        name = {
-          type: "ComputedPropertyName",
-          children: last.children
-        };
+      let name, hoistDec, ref, refAssignment;
+      const { expression, type } = last;
+      if (type === "Index") {
+        ref = maybeRef(expression);
+        if (ref !== expression) {
+          hoistDec = {
+            type: "Declaration",
+            children: ["let ", ref]
+          };
+          refAssignment = {
+            type: "Assignment",
+            children: [ref, " = ", expression]
+          };
+          name = {
+            type: "ComputedPropertyName",
+            children: [last.children[0], "(", refAssignment, ",", ref, ")", ...last.children.slice(-2)]
+          };
+          value = {
+            ...value,
+            children: value.children.map((c) => {
+              if (c === last)
+                return {
+                  type: "Index",
+                  children: ["[", ref, "]"]
+                };
+              return c;
+            })
+          };
+        } else {
+          name = {
+            type: "ComputedPropertyName",
+            children: last.children
+          };
+        }
       } else {
         ({ name } = last);
         if (!name)
@@ -9754,7 +9840,8 @@ ${input.slice(result.pos)}
         children: [ws, name, ": ", value],
         name,
         value,
-        names: []
+        names: [],
+        hoistDec
       };
     });
     function PropertyDefinition(state) {
@@ -10004,12 +10091,13 @@ ${input.slice(result.pos)}
         type: "MethodDefinition",
         children: $0,
         name: signature.name,
+        abstract: true,
         signature,
         parameters: signature.parameters,
         ts: true
       };
     });
-    var MethodDefinition$1 = $TS($S(MethodSignature, $N(PropertyAccess), BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3) {
+    var MethodDefinition$1 = $TS($S(MethodSignature, $N(PropertyAccess), $E(BracedBlock)), function($skip, $loc, $0, $1, $2, $3) {
       var signature = $1;
       var block = $3;
       let children = $0;
@@ -10139,7 +10227,7 @@ ${input.slice(result.pos)}
       var modifier = $1;
       var name = $2;
       var parameters = $4;
-      var suffix = $5;
+      var returnType = $5;
       if (name.name) {
         name = name.name;
       } else if (name.token) {
@@ -10150,7 +10238,7 @@ ${input.slice(result.pos)}
         children: $0,
         name,
         modifier,
-        returnType: suffix,
+        returnType,
         parameters
       };
     });
@@ -12652,14 +12740,7 @@ ${input.slice(result.pos)}
       var c = $4;
       var f = $5;
       if (!c && !f) {
-        const e = [];
-        const emptyCatchBlock = {
-          type: "BlockStatement",
-          expressions: e,
-          children: ["{", e, "}"],
-          bare: false,
-          empty: true
-        };
+        const emptyCatchBlock = makeEmptyBlock();
         c = {
           type: "CatchClause",
           children: [" catch(e) ", emptyCatchBlock],
@@ -23373,7 +23454,9 @@ ${input.slice(result.pos)}
       isWhitespaceOrEmpty,
       lastAccessInCallExpression,
       literalValue,
+      makeEmptyBlock,
       makeLeftHandSideExpression,
+      maybeRef,
       modifyString,
       processBinaryOpExpression,
       processCallMemberExpression,

package/dist/main.mjs

@@ -1103,6 +1103,16 @@ var require_lib = __commonJS({
       }
       return node;
     }
+    function makeEmptyBlock() {
+      const expressions = [];
+      return {
+        type: "BlockStatement",
+        expressions,
+        children: ["{", expressions, "}"],
+        bare: false,
+        empty: true
+      };
+    }
     function makeLeftHandSideExpression(expression) {
       switch (expression.type) {
         case "Ref":
@@ -1331,14 +1341,25 @@ var require_lib = __commonJS({
         }
       });
       gatherRecursiveAll(statements, ({ type }) => type === "MethodDefinition").forEach((f) => {
+        const { abstract, block, signature } = f;
+        if (!abstract && !block) {
+          const { name } = signature, { parent } = f, { elements } = parent, currentIndex = elements.findIndex(([, def]) => def === f);
+          const following = elements[currentIndex + 1]?.[1];
+          if (following?.signature?.name !== name) {
+            const block2 = makeEmptyBlock();
+            block2.parent = f;
+            f.block = block2;
+            f.children.push(block2);
+          }
+        }
         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;
+          const { signature: signature2, block: block2 } = f;
+          const isConstructor = signature2.name === "constructor";
+          const isVoid = isVoidType(signature2.returnType?.t);
+          const isSet = signature2.modifier?.set;
           if (!isConstructor && !isSet && !isVoid) {
-            insertReturn(block);
+            insertReturn(block2);
           }
         }
       });
@@ -2459,7 +2480,9 @@ var require_lib = __commonJS({
       lastAccessInCallExpression,
       literalValue,
       makeAsConst,
+      makeEmptyBlock,
       makeLeftHandSideExpression,
+      maybeRef,
       modifyString,
       needsRef,
       processBinaryOpExpression,
@@ -5688,8 +5711,22 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ClassBody$0 = $S(__, OpenBrace, $E(NestedClassElements), __, CloseBrace);
-    var ClassBody$1 = $S(InsertOpenBrace, $E(NestedClassElements), InsertNewline, InsertIndent, InsertCloseBrace);
+    var ClassBody$0 = $TS($S(__, OpenBrace, $E(NestedClassElements), __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var elements = $3;
+      return {
+        type: "ClassBody",
+        children: $0,
+        elements
+      };
+    });
+    var ClassBody$1 = $TS($S(InsertOpenBrace, $E(NestedClassElements), InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var elements = $2;
+      return {
+        type: "ClassBody",
+        children: $0,
+        elements
+      };
+    });
     function ClassBody(state) {
       let eventData;
       if (state.events) {
@@ -5763,8 +5800,19 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ClassElement$0 = $S($E(Decorators), $E(AccessModifier), $E($S(Static, $E(_))), ClassElementDefinition);
-    var ClassElement$1 = $S(Static, BracedBlock);
+    var ClassElement$0 = $TS($S($E(Decorators), $E(AccessModifier), $E($S(Static, $E(_))), ClassElementDefinition), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var definition = $4;
+      return {
+        ...definition,
+        children: [$1, $2, $3, ...definition.children]
+      };
+    });
+    var ClassElement$1 = $TS($S(Static, BracedBlock), function($skip, $loc, $0, $1, $2) {
+      return {
+        type: "ClassStaticBlock",
+        children: $0
+      };
+    });
     function ClassElement(state) {
       let eventData;
       if (state.events) {
@@ -5980,7 +6028,10 @@ ${input.slice(result.pos)}
             children
           };
         default:
-          return [id, " = ", exp];
+          return {
+            type: "FieldDefinition",
+            children: [id, " = ", exp]
+          };
       }
     });
     var FieldDefinition$1 = $TS($S(InsertReadonly, ClassElementName, $E(TypeSuffix), __, ConstAssignment, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
@@ -5990,12 +6041,18 @@ ${input.slice(result.pos)}
         pos: ca.$loc.pos - 1,
         length: ca.$loc.length + 1
       };
-      return $0;
+      return {
+        type: "FieldDefinition",
+        children: $0
+      };
     });
     var FieldDefinition$2 = $TS($S($E($S(Abstract, $E(_))), $E($S(Readonly, $E(_))), ClassElementName, $E(TypeSuffix), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       if ($1)
         return { children: $0, ts: true };
-      return $0;
+      return {
+        type: "FieldDefinition",
+        children: $0
+      };
     });
     function FieldDefinition(state) {
       let eventData;
@@ -6327,11 +6384,11 @@ ${input.slice(result.pos)}
     }
     var MemberBracketContent$0 = $TS($S(OpenBracket, $C(SliceParameters, PostfixedExpression), __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
       var open = $1;
-      var exp = $2;
+      var expression = $2;
       var ws = $3;
       var close = $4;
-      if (exp.type === "SliceParameters") {
-        const { start, end, children } = exp;
+      if (expression.type === "SliceParameters") {
+        const { start, end, children } = expression;
         return {
           type: "SliceExpression",
           start,
@@ -6345,7 +6402,8 @@ ${input.slice(result.pos)}
       }
       return {
         type: "Index",
-        children: $0
+        children: $0,
+        expression
       };
     });
     var MemberBracketContent$1 = $TS($S(Dot, $C(TemplateLiteral, StringLiteral)), function($skip, $loc, $0, $1, $2) {
@@ -9708,7 +9766,7 @@ ${input.slice(result.pos)}
     var PropertyDefinition$3 = $TS($S(__, MethodDefinition), function($skip, $loc, $0, $1, $2) {
       var ws = $1;
       var def = $2;
-      if (def.block.empty)
+      if (!def.block || def.block.empty)
         return $skip;
       return {
         ...def,
@@ -9736,12 +9794,40 @@ ${input.slice(result.pos)}
       const last = lastAccessInCallExpression(value);
       if (!last)
         return $skip;
-      let name;
-      if (last.type === "Index") {
-        name = {
-          type: "ComputedPropertyName",
-          children: last.children
-        };
+      let name, hoistDec, ref, refAssignment;
+      const { expression, type } = last;
+      if (type === "Index") {
+        ref = maybeRef(expression);
+        if (ref !== expression) {
+          hoistDec = {
+            type: "Declaration",
+            children: ["let ", ref]
+          };
+          refAssignment = {
+            type: "Assignment",
+            children: [ref, " = ", expression]
+          };
+          name = {
+            type: "ComputedPropertyName",
+            children: [last.children[0], "(", refAssignment, ",", ref, ")", ...last.children.slice(-2)]
+          };
+          value = {
+            ...value,
+            children: value.children.map((c) => {
+              if (c === last)
+                return {
+                  type: "Index",
+                  children: ["[", ref, "]"]
+                };
+              return c;
+            })
+          };
+        } else {
+          name = {
+            type: "ComputedPropertyName",
+            children: last.children
+          };
+        }
       } else {
         ({ name } = last);
         if (!name)
@@ -9752,7 +9838,8 @@ ${input.slice(result.pos)}
         children: [ws, name, ": ", value],
         name,
         value,
-        names: []
+        names: [],
+        hoistDec
       };
     });
     function PropertyDefinition(state) {
@@ -10002,12 +10089,13 @@ ${input.slice(result.pos)}
         type: "MethodDefinition",
         children: $0,
         name: signature.name,
+        abstract: true,
         signature,
         parameters: signature.parameters,
         ts: true
       };
     });
-    var MethodDefinition$1 = $TS($S(MethodSignature, $N(PropertyAccess), BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3) {
+    var MethodDefinition$1 = $TS($S(MethodSignature, $N(PropertyAccess), $E(BracedBlock)), function($skip, $loc, $0, $1, $2, $3) {
       var signature = $1;
       var block = $3;
       let children = $0;
@@ -10137,7 +10225,7 @@ ${input.slice(result.pos)}
       var modifier = $1;
       var name = $2;
       var parameters = $4;
-      var suffix = $5;
+      var returnType = $5;
       if (name.name) {
         name = name.name;
       } else if (name.token) {
@@ -10148,7 +10236,7 @@ ${input.slice(result.pos)}
         children: $0,
         name,
         modifier,
-        returnType: suffix,
+        returnType,
         parameters
       };
     });
@@ -12650,14 +12738,7 @@ ${input.slice(result.pos)}
       var c = $4;
       var f = $5;
       if (!c && !f) {
-        const e = [];
-        const emptyCatchBlock = {
-          type: "BlockStatement",
-          expressions: e,
-          children: ["{", e, "}"],
-          bare: false,
-          empty: true
-        };
+        const emptyCatchBlock = makeEmptyBlock();
         c = {
           type: "CatchClause",
           children: [" catch(e) ", emptyCatchBlock],
@@ -23371,7 +23452,9 @@ ${input.slice(result.pos)}
       isWhitespaceOrEmpty,
       lastAccessInCallExpression,
       literalValue,
+      makeEmptyBlock,
       makeLeftHandSideExpression,
+      maybeRef,
       modifyString,
       processBinaryOpExpression,
       processCallMemberExpression,

package/package.json

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