@danielx/civet 0.8.2 → 0.8.3

package/CHANGELOG.md

@@ -4,6 +4,9 @@ This changelog is generated automatically by [`build/changelog.civet`](build/cha
 For each version of Civet, it lists and links to all incorporated PRs,
 as well as a full diff and commit list.
 
+## 0.8.3 (2024-10-15, [diff](https://github.com/DanielXMoore/Civet/compare/v0.8.2...v0.8.3), [commits](https://github.com/DanielXMoore/Civet/commits/v0.8.3))
+* Automatically type fields using `@arg` in constructor [[#1469](https://github.com/DanielXMoore/Civet/pull/1469)]
+
 ## 0.8.2 (2024-10-14, [diff](https://github.com/DanielXMoore/Civet/compare/v0.8.1...v0.8.2), [commits](https://github.com/DanielXMoore/Civet/commits/v0.8.2))
 * Compiler directives `iife` and `repl` for wrapping program, fix `comptime` implicitly returned from function [[#1463](https://github.com/DanielXMoore/Civet/pull/1463)]
 * `repl` directive hoists function and class declarations too, fix one-line declarations in `if` [[#1466](https://github.com/DanielXMoore/Civet/pull/1466)]

package/dist/browser.js

@@ -2855,12 +2855,13 @@ ${js}`
     if (type === "ArrowFunction" && parameters && parameters.tp && parameters.tp.parameters.length === 1) {
       parameters.tp.parameters.push(",");
     }
-    if (!block)
+    if (!block) {
       return;
+    }
     const { expressions } = block;
-    if (!expressions)
+    if (!expressions) {
       return;
-    const { blockPrefix } = parameters;
+    }
     let indent;
     if (!expressions.length) {
       indent = "";
@@ -2870,6 +2871,45 @@ ${js}`
     const [splices, thisAssignments] = gatherBindingCode(parameters, {
       injectParamProps: isConstructor
     });
+    if (isConstructor) {
+      const { ancestor } = findAncestor(f, ($4) => $4.type === "ClassExpression");
+      if (ancestor != null) {
+        const fields = new Set(gatherRecursiveWithinFunction(ancestor, ($5) => $5.type === "FieldDefinition").map(($6) => $6.id).filter((a) => typeof a === "object" && a != null && "type" in a && a.type === "Identifier").map(($7) => $7.name));
+        const classExpressions = ancestor.body.expressions;
+        let index = findChildIndex(classExpressions, f);
+        assert.notEqual(index, -1, "Could not find constructor in class");
+        let m2;
+        while (m2 = classExpressions[index - 1]?.[1], typeof m2 === "object" && m2 != null && "type" in m2 && m2.type === "MethodDefinition" && "name" in m2 && m2.name === "constructor") {
+          index--;
+        }
+        const fStatement = classExpressions[index];
+        for (let ref8 = gatherRecursive(parameters, ($8) => $8.type === "Parameter"), i1 = 0, len3 = ref8.length; i1 < len3; i1++) {
+          const parameter = ref8[i1];
+          if (!parameter.typeSuffix) {
+            continue;
+          }
+          for (let ref9 = gatherRecursive(parameter, ($9) => $9.type === "AtBinding"), i2 = 0, len1 = ref9.length; i2 < len1; i2++) {
+            const binding = ref9[i2];
+            const typeSuffix = binding.parent?.typeSuffix;
+            if (!typeSuffix) {
+              continue;
+            }
+            const id = binding.ref.id;
+            if (fields.has(id)) {
+              continue;
+            }
+            classExpressions.splice(index++, 0, [fStatement[0], {
+              type: "FieldDefinition",
+              ts: true,
+              id,
+              typeSuffix,
+              children: [id, typeSuffix]
+            }, ";"]);
+            fStatement[0] = "";
+          }
+        }
+      }
+    }
     const delimiter = {
       type: "SemicolonDelimiter",
       children: [";"]
@@ -2881,15 +2921,16 @@ ${js}`
         children: [indent, ...s.children, delimiter]
       } : [indent, s, delimiter]
     );
-    if (!prefix.length)
+    if (!prefix.length) {
       return;
+    }
     if (isConstructor) {
       const superCalls = gatherNodes(
         expressions,
-        (a) => typeof a === "object" && a != null && "type" in a && a.type === "CallExpression" && "children" in a && Array.isArray(a.children) && a.children.length >= 1 && typeof a.children[0] === "object" && a.children[0] != null && "token" in a.children[0] && a.children[0].token === "super"
+        (a1) => typeof a1 === "object" && a1 != null && "type" in a1 && a1.type === "CallExpression" && "children" in a1 && Array.isArray(a1.children) && a1.children.length >= 1 && typeof a1.children[0] === "object" && a1.children[0] != null && "token" in a1.children[0] && a1.children[0].token === "super"
       );
       if (superCalls.length) {
-        const { child } = findAncestor(superCalls[0], (a1) => a1 === block);
+        const { child } = findAncestor(superCalls[0], (a2) => a2 === block);
         const index = findChildIndex(expressions, child);
         if (index < 0) {
           throw new Error("Could not find super call within top-level expressions");
@@ -2908,8 +2949,8 @@ ${js}`
     }
     if (hasYield(block) && !f.generator?.length) {
       if (f.type === "ArrowFunction") {
-        gatherRecursiveWithinFunction(block, ($4) => $4.type === "YieldExpression").forEach((y) => {
-          const i = y.children.findIndex(($5) => $5.type === "Yield");
+        gatherRecursiveWithinFunction(block, ($10) => $10.type === "YieldExpression").forEach((y) => {
+          const i = y.children.findIndex(($11) => $11.type === "Yield");
           return y.children.splice(i + 1, 0, {
             type: "Error",
             message: "Can't use yield inside of => arrow function"
@@ -3010,21 +3051,21 @@ ${js}`
         ...parameters,
         children: (() => {
           const results1 = [];
-          for (let ref8 = parameters.children, i1 = 0, len3 = ref8.length; i1 < len3; i1++) {
-            let parameter = ref8[i1];
+          for (let ref10 = parameters.children, i3 = 0, len22 = ref10.length; i3 < len22; i3++) {
+            let parameter = ref10[i3];
             if (typeof parameter === "object" && parameter != null && "type" in parameter && parameter.type === "Parameter") {
-              let ref9;
-              if (ref9 = parameter.initializer) {
-                const initializer = ref9;
+              let ref11;
+              if (ref11 = parameter.initializer) {
+                const initializer = ref11;
                 args.push(initializer.expression, parameter.delim);
                 parameter = {
                   ...parameter,
                   initializer: void 0,
-                  children: parameter.children.filter((a2) => a2 !== initializer)
+                  children: parameter.children.filter((a3) => a3 !== initializer)
                 };
               } else {
                 args.push(parameter.children.filter(
-                  (a3) => a3 !== parameter.typeSuffix
+                  (a4) => a4 !== parameter.typeSuffix
                 ));
               }
             }
@@ -3036,7 +3077,7 @@ ${js}`
       expression = {
         ...expression,
         parameters: newParameters,
-        children: expression.children.map(($6) => $6 === parameters ? newParameters : $6)
+        children: expression.children.map(($12) => $12 === parameters ? newParameters : $12)
       };
     }
     return {
@@ -3058,7 +3099,7 @@ ${js}`
       ref = makeRef("$");
       inplacePrepend(ref, body);
     }
-    if (startsWithPredicate(body, ($7) => $7.type === "ObjectExpression")) {
+    if (startsWithPredicate(body, ($13) => $13.type === "ObjectExpression")) {
       body = makeLeftHandSideExpression(body);
     }
     const parameters = makeNode({
@@ -3097,7 +3138,7 @@ ${js}`
     }
     if (gatherRecursiveWithinFunction(
       block,
-      (a4) => a4 === ref
+      (a5) => a5 === ref
     ).length > 1) {
       fn.ampersandBlock = false;
     }
@@ -9386,12 +9427,15 @@ ${js}`
       default:
         return {
           type: "FieldDefinition",
+          id,
           children: [id, " = ", exp]
         };
     }
   });
   var FieldDefinition$1 = (0, import_lib4.$TS)((0, import_lib4.$S)(InsertReadonly, ClassElementName, (0, import_lib4.$E)(TypeSuffix), __, ConstAssignment, MaybeNestedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
     var r = $1;
+    var id = $2;
+    var typeSuffix = $3;
     var ca = $5;
     r.children[0].$loc = {
       pos: ca.$loc.pos - 1,
@@ -9399,15 +9443,20 @@ ${js}`
     };
     return {
       type: "FieldDefinition",
+      id,
+      typeSuffix,
       children: $0
     };
   });
   var FieldDefinition$2 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)((0, import_lib4.$S)(Abstract, (0, import_lib4.$E)(_))), (0, import_lib4.$E)((0, import_lib4.$S)(Readonly, (0, import_lib4.$E)(_))), ClassElementName, (0, import_lib4.$E)(TypeSuffix), (0, import_lib4.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-    if ($1)
-      return { children: $0, ts: true };
+    var id = $3;
+    var typeSuffix = $4;
     return {
       type: "FieldDefinition",
-      children: $0
+      children: $0,
+      ts: $1 ? true : void 0,
+      id,
+      typeSuffix
     };
   });
   var FieldDefinition$$ = [FieldDefinition$0, FieldDefinition$1, FieldDefinition$2];
@@ -10142,7 +10191,8 @@ ${js}`
       typeSuffix,
       accessModifier,
       initializer,
-      delim
+      delim,
+      binding
     };
   });
   function ParameterElement(ctx, state2) {

package/dist/main.js

@@ -2831,12 +2831,13 @@ function processParams(f) {
   if (type === "ArrowFunction" && parameters && parameters.tp && parameters.tp.parameters.length === 1) {
     parameters.tp.parameters.push(",");
   }
-  if (!block)
+  if (!block) {
     return;
+  }
   const { expressions } = block;
-  if (!expressions)
+  if (!expressions) {
     return;
-  const { blockPrefix } = parameters;
+  }
   let indent;
   if (!expressions.length) {
     indent = "";
@@ -2846,6 +2847,45 @@ function processParams(f) {
   const [splices, thisAssignments] = gatherBindingCode(parameters, {
     injectParamProps: isConstructor
   });
+  if (isConstructor) {
+    const { ancestor } = findAncestor(f, ($4) => $4.type === "ClassExpression");
+    if (ancestor != null) {
+      const fields = new Set(gatherRecursiveWithinFunction(ancestor, ($5) => $5.type === "FieldDefinition").map(($6) => $6.id).filter((a) => typeof a === "object" && a != null && "type" in a && a.type === "Identifier").map(($7) => $7.name));
+      const classExpressions = ancestor.body.expressions;
+      let index = findChildIndex(classExpressions, f);
+      assert.notEqual(index, -1, "Could not find constructor in class");
+      let m2;
+      while (m2 = classExpressions[index - 1]?.[1], typeof m2 === "object" && m2 != null && "type" in m2 && m2.type === "MethodDefinition" && "name" in m2 && m2.name === "constructor") {
+        index--;
+      }
+      const fStatement = classExpressions[index];
+      for (let ref8 = gatherRecursive(parameters, ($8) => $8.type === "Parameter"), i1 = 0, len3 = ref8.length; i1 < len3; i1++) {
+        const parameter = ref8[i1];
+        if (!parameter.typeSuffix) {
+          continue;
+        }
+        for (let ref9 = gatherRecursive(parameter, ($9) => $9.type === "AtBinding"), i2 = 0, len1 = ref9.length; i2 < len1; i2++) {
+          const binding = ref9[i2];
+          const typeSuffix = binding.parent?.typeSuffix;
+          if (!typeSuffix) {
+            continue;
+          }
+          const id = binding.ref.id;
+          if (fields.has(id)) {
+            continue;
+          }
+          classExpressions.splice(index++, 0, [fStatement[0], {
+            type: "FieldDefinition",
+            ts: true,
+            id,
+            typeSuffix,
+            children: [id, typeSuffix]
+          }, ";"]);
+          fStatement[0] = "";
+        }
+      }
+    }
+  }
   const delimiter = {
     type: "SemicolonDelimiter",
     children: [";"]
@@ -2857,15 +2897,16 @@ function processParams(f) {
       children: [indent, ...s.children, delimiter]
     } : [indent, s, delimiter]
   );
-  if (!prefix.length)
+  if (!prefix.length) {
     return;
+  }
   if (isConstructor) {
     const superCalls = gatherNodes(
       expressions,
-      (a) => typeof a === "object" && a != null && "type" in a && a.type === "CallExpression" && "children" in a && Array.isArray(a.children) && a.children.length >= 1 && typeof a.children[0] === "object" && a.children[0] != null && "token" in a.children[0] && a.children[0].token === "super"
+      (a1) => typeof a1 === "object" && a1 != null && "type" in a1 && a1.type === "CallExpression" && "children" in a1 && Array.isArray(a1.children) && a1.children.length >= 1 && typeof a1.children[0] === "object" && a1.children[0] != null && "token" in a1.children[0] && a1.children[0].token === "super"
     );
     if (superCalls.length) {
-      const { child } = findAncestor(superCalls[0], (a1) => a1 === block);
+      const { child } = findAncestor(superCalls[0], (a2) => a2 === block);
       const index = findChildIndex(expressions, child);
       if (index < 0) {
         throw new Error("Could not find super call within top-level expressions");
@@ -2884,8 +2925,8 @@ function processSignature(f) {
   }
   if (hasYield(block) && !f.generator?.length) {
     if (f.type === "ArrowFunction") {
-      gatherRecursiveWithinFunction(block, ($4) => $4.type === "YieldExpression").forEach((y) => {
-        const i = y.children.findIndex(($5) => $5.type === "Yield");
+      gatherRecursiveWithinFunction(block, ($10) => $10.type === "YieldExpression").forEach((y) => {
+        const i = y.children.findIndex(($11) => $11.type === "Yield");
         return y.children.splice(i + 1, 0, {
           type: "Error",
           message: "Can't use yield inside of => arrow function"
@@ -2986,21 +3027,21 @@ function processCoffeeDo(ws, expression) {
       ...parameters,
       children: (() => {
         const results1 = [];
-        for (let ref8 = parameters.children, i1 = 0, len3 = ref8.length; i1 < len3; i1++) {
-          let parameter = ref8[i1];
+        for (let ref10 = parameters.children, i3 = 0, len22 = ref10.length; i3 < len22; i3++) {
+          let parameter = ref10[i3];
           if (typeof parameter === "object" && parameter != null && "type" in parameter && parameter.type === "Parameter") {
-            let ref9;
-            if (ref9 = parameter.initializer) {
-              const initializer = ref9;
+            let ref11;
+            if (ref11 = parameter.initializer) {
+              const initializer = ref11;
               args.push(initializer.expression, parameter.delim);
               parameter = {
                 ...parameter,
                 initializer: void 0,
-                children: parameter.children.filter((a2) => a2 !== initializer)
+                children: parameter.children.filter((a3) => a3 !== initializer)
               };
             } else {
               args.push(parameter.children.filter(
-                (a3) => a3 !== parameter.typeSuffix
+                (a4) => a4 !== parameter.typeSuffix
               ));
             }
           }
@@ -3012,7 +3053,7 @@ function processCoffeeDo(ws, expression) {
     expression = {
       ...expression,
       parameters: newParameters,
-      children: expression.children.map(($6) => $6 === parameters ? newParameters : $6)
+      children: expression.children.map(($12) => $12 === parameters ? newParameters : $12)
     };
   }
   return {
@@ -3034,7 +3075,7 @@ function makeAmpersandFunction(rhs) {
     ref = makeRef("$");
     inplacePrepend(ref, body);
   }
-  if (startsWithPredicate(body, ($7) => $7.type === "ObjectExpression")) {
+  if (startsWithPredicate(body, ($13) => $13.type === "ObjectExpression")) {
     body = makeLeftHandSideExpression(body);
   }
   const parameters = makeNode({
@@ -3073,7 +3114,7 @@ function makeAmpersandFunction(rhs) {
   }
   if (gatherRecursiveWithinFunction(
     block,
-    (a4) => a4 === ref
+    (a5) => a5 === ref
   ).length > 1) {
     fn.ampersandBlock = false;
   }
@@ -9362,12 +9403,15 @@ var FieldDefinition$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(CoffeeClassesEn
     default:
       return {
         type: "FieldDefinition",
+        id,
         children: [id, " = ", exp]
       };
   }
 });
 var FieldDefinition$1 = (0, import_lib4.$TS)((0, import_lib4.$S)(InsertReadonly, ClassElementName, (0, import_lib4.$E)(TypeSuffix), __, ConstAssignment, MaybeNestedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
   var r = $1;
+  var id = $2;
+  var typeSuffix = $3;
   var ca = $5;
   r.children[0].$loc = {
     pos: ca.$loc.pos - 1,
@@ -9375,15 +9419,20 @@ var FieldDefinition$1 = (0, import_lib4.$TS)((0, import_lib4.$S)(InsertReadonly,
   };
   return {
     type: "FieldDefinition",
+    id,
+    typeSuffix,
     children: $0
   };
 });
 var FieldDefinition$2 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)((0, import_lib4.$S)(Abstract, (0, import_lib4.$E)(_))), (0, import_lib4.$E)((0, import_lib4.$S)(Readonly, (0, import_lib4.$E)(_))), ClassElementName, (0, import_lib4.$E)(TypeSuffix), (0, import_lib4.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-  if ($1)
-    return { children: $0, ts: true };
+  var id = $3;
+  var typeSuffix = $4;
   return {
     type: "FieldDefinition",
-    children: $0
+    children: $0,
+    ts: $1 ? true : void 0,
+    id,
+    typeSuffix
   };
 });
 var FieldDefinition$$ = [FieldDefinition$0, FieldDefinition$1, FieldDefinition$2];
@@ -10118,7 +10167,8 @@ var ParameterElement$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib
     typeSuffix,
     accessModifier,
     initializer,
-    delim
+    delim,
+    binding
   };
 });
 function ParameterElement(ctx, state2) {

package/dist/main.mjs

@@ -2811,12 +2811,13 @@ function processParams(f) {
   if (type === "ArrowFunction" && parameters && parameters.tp && parameters.tp.parameters.length === 1) {
     parameters.tp.parameters.push(",");
   }
-  if (!block)
+  if (!block) {
     return;
+  }
   const { expressions } = block;
-  if (!expressions)
+  if (!expressions) {
     return;
-  const { blockPrefix } = parameters;
+  }
   let indent;
   if (!expressions.length) {
     indent = "";
@@ -2826,6 +2827,45 @@ function processParams(f) {
   const [splices, thisAssignments] = gatherBindingCode(parameters, {
     injectParamProps: isConstructor
   });
+  if (isConstructor) {
+    const { ancestor } = findAncestor(f, ($4) => $4.type === "ClassExpression");
+    if (ancestor != null) {
+      const fields = new Set(gatherRecursiveWithinFunction(ancestor, ($5) => $5.type === "FieldDefinition").map(($6) => $6.id).filter((a) => typeof a === "object" && a != null && "type" in a && a.type === "Identifier").map(($7) => $7.name));
+      const classExpressions = ancestor.body.expressions;
+      let index = findChildIndex(classExpressions, f);
+      assert.notEqual(index, -1, "Could not find constructor in class");
+      let m2;
+      while (m2 = classExpressions[index - 1]?.[1], typeof m2 === "object" && m2 != null && "type" in m2 && m2.type === "MethodDefinition" && "name" in m2 && m2.name === "constructor") {
+        index--;
+      }
+      const fStatement = classExpressions[index];
+      for (let ref8 = gatherRecursive(parameters, ($8) => $8.type === "Parameter"), i1 = 0, len3 = ref8.length; i1 < len3; i1++) {
+        const parameter = ref8[i1];
+        if (!parameter.typeSuffix) {
+          continue;
+        }
+        for (let ref9 = gatherRecursive(parameter, ($9) => $9.type === "AtBinding"), i2 = 0, len1 = ref9.length; i2 < len1; i2++) {
+          const binding = ref9[i2];
+          const typeSuffix = binding.parent?.typeSuffix;
+          if (!typeSuffix) {
+            continue;
+          }
+          const id = binding.ref.id;
+          if (fields.has(id)) {
+            continue;
+          }
+          classExpressions.splice(index++, 0, [fStatement[0], {
+            type: "FieldDefinition",
+            ts: true,
+            id,
+            typeSuffix,
+            children: [id, typeSuffix]
+          }, ";"]);
+          fStatement[0] = "";
+        }
+      }
+    }
+  }
   const delimiter = {
     type: "SemicolonDelimiter",
     children: [";"]
@@ -2837,15 +2877,16 @@ function processParams(f) {
       children: [indent, ...s.children, delimiter]
     } : [indent, s, delimiter]
   );
-  if (!prefix.length)
+  if (!prefix.length) {
     return;
+  }
   if (isConstructor) {
     const superCalls = gatherNodes(
       expressions,
-      (a) => typeof a === "object" && a != null && "type" in a && a.type === "CallExpression" && "children" in a && Array.isArray(a.children) && a.children.length >= 1 && typeof a.children[0] === "object" && a.children[0] != null && "token" in a.children[0] && a.children[0].token === "super"
+      (a1) => typeof a1 === "object" && a1 != null && "type" in a1 && a1.type === "CallExpression" && "children" in a1 && Array.isArray(a1.children) && a1.children.length >= 1 && typeof a1.children[0] === "object" && a1.children[0] != null && "token" in a1.children[0] && a1.children[0].token === "super"
     );
     if (superCalls.length) {
-      const { child } = findAncestor(superCalls[0], (a1) => a1 === block);
+      const { child } = findAncestor(superCalls[0], (a2) => a2 === block);
       const index = findChildIndex(expressions, child);
       if (index < 0) {
         throw new Error("Could not find super call within top-level expressions");
@@ -2864,8 +2905,8 @@ function processSignature(f) {
   }
   if (hasYield(block) && !f.generator?.length) {
     if (f.type === "ArrowFunction") {
-      gatherRecursiveWithinFunction(block, ($4) => $4.type === "YieldExpression").forEach((y) => {
-        const i = y.children.findIndex(($5) => $5.type === "Yield");
+      gatherRecursiveWithinFunction(block, ($10) => $10.type === "YieldExpression").forEach((y) => {
+        const i = y.children.findIndex(($11) => $11.type === "Yield");
         return y.children.splice(i + 1, 0, {
           type: "Error",
           message: "Can't use yield inside of => arrow function"
@@ -2966,21 +3007,21 @@ function processCoffeeDo(ws, expression) {
       ...parameters,
       children: (() => {
         const results1 = [];
-        for (let ref8 = parameters.children, i1 = 0, len3 = ref8.length; i1 < len3; i1++) {
-          let parameter = ref8[i1];
+        for (let ref10 = parameters.children, i3 = 0, len22 = ref10.length; i3 < len22; i3++) {
+          let parameter = ref10[i3];
           if (typeof parameter === "object" && parameter != null && "type" in parameter && parameter.type === "Parameter") {
-            let ref9;
-            if (ref9 = parameter.initializer) {
-              const initializer = ref9;
+            let ref11;
+            if (ref11 = parameter.initializer) {
+              const initializer = ref11;
               args.push(initializer.expression, parameter.delim);
               parameter = {
                 ...parameter,
                 initializer: void 0,
-                children: parameter.children.filter((a2) => a2 !== initializer)
+                children: parameter.children.filter((a3) => a3 !== initializer)
               };
             } else {
               args.push(parameter.children.filter(
-                (a3) => a3 !== parameter.typeSuffix
+                (a4) => a4 !== parameter.typeSuffix
               ));
             }
           }
@@ -2992,7 +3033,7 @@ function processCoffeeDo(ws, expression) {
     expression = {
       ...expression,
       parameters: newParameters,
-      children: expression.children.map(($6) => $6 === parameters ? newParameters : $6)
+      children: expression.children.map(($12) => $12 === parameters ? newParameters : $12)
     };
   }
   return {
@@ -3014,7 +3055,7 @@ function makeAmpersandFunction(rhs) {
     ref = makeRef("$");
     inplacePrepend(ref, body);
   }
-  if (startsWithPredicate(body, ($7) => $7.type === "ObjectExpression")) {
+  if (startsWithPredicate(body, ($13) => $13.type === "ObjectExpression")) {
     body = makeLeftHandSideExpression(body);
   }
   const parameters = makeNode({
@@ -3053,7 +3094,7 @@ function makeAmpersandFunction(rhs) {
   }
   if (gatherRecursiveWithinFunction(
     block,
-    (a4) => a4 === ref
+    (a5) => a5 === ref
   ).length > 1) {
     fn.ampersandBlock = false;
   }
@@ -9342,12 +9383,15 @@ var FieldDefinition$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(CoffeeClassesEn
     default:
       return {
         type: "FieldDefinition",
+        id,
         children: [id, " = ", exp]
       };
   }
 });
 var FieldDefinition$1 = (0, import_lib4.$TS)((0, import_lib4.$S)(InsertReadonly, ClassElementName, (0, import_lib4.$E)(TypeSuffix), __, ConstAssignment, MaybeNestedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
   var r = $1;
+  var id = $2;
+  var typeSuffix = $3;
   var ca = $5;
   r.children[0].$loc = {
     pos: ca.$loc.pos - 1,
@@ -9355,15 +9399,20 @@ var FieldDefinition$1 = (0, import_lib4.$TS)((0, import_lib4.$S)(InsertReadonly,
   };
   return {
     type: "FieldDefinition",
+    id,
+    typeSuffix,
     children: $0
   };
 });
 var FieldDefinition$2 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)((0, import_lib4.$S)(Abstract, (0, import_lib4.$E)(_))), (0, import_lib4.$E)((0, import_lib4.$S)(Readonly, (0, import_lib4.$E)(_))), ClassElementName, (0, import_lib4.$E)(TypeSuffix), (0, import_lib4.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-  if ($1)
-    return { children: $0, ts: true };
+  var id = $3;
+  var typeSuffix = $4;
   return {
     type: "FieldDefinition",
-    children: $0
+    children: $0,
+    ts: $1 ? true : void 0,
+    id,
+    typeSuffix
   };
 });
 var FieldDefinition$$ = [FieldDefinition$0, FieldDefinition$1, FieldDefinition$2];
@@ -10098,7 +10147,8 @@ var ParameterElement$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib
     typeSuffix,
     accessModifier,
     initializer,
-    delim
+    delim,
+    binding
   };
 });
 function ParameterElement(ctx, state2) {

package/package.json

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