@danielx/civet 0.6.24 → 0.6.26

package/README.md

@@ -17,6 +17,7 @@ The modern way to write TypeScript.
 - Plugins for
   [esbuild](source/esbuild-plugin.civet),
   [Vite](https://github.com/lorefnon/vite-plugin-civet),
+  [Babel](source/babel-plugin.mjs),
   [Gulp](integrations/gulp),
   [ESM module resolution](source/esm.civet),
   [CJS](register.js),

package/dist/babel-plugin.mjs

@@ -1,3 +1,18 @@
+// Babel plugin for compiling .civet files
+
+/* Example babel.config.json:
+
+{
+  "plugins": [
+    [
+      "@danielx/civet/babel-plugin"
+    ]
+  ],
+  "sourceMaps": "inline"
+}
+
+*/
+
 import { compile } from "./main.mjs"
 
 export default function (api, civetOptions) {

package/dist/browser.js

@@ -1534,12 +1534,7 @@ var Civet = (() => {
               ...exp,
               children: [...exp.children.slice(0, i), " ", id, suffix, ws, ...exp.children.slice(i)]
             };
-            return {
-              type: "Declaration",
-              decl,
-              children: [exp],
-              names: id.names
-            };
+            return exp;
           }
         }
         let [splices, thisAssignments] = gatherBindingCode(id);
@@ -2106,8 +2101,7 @@ var Civet = (() => {
           const [ws, , body] = s.children;
           let [, arg] = s.children;
           let i = 0, l = body.length;
-          const refDec = [];
-          const children = [ws, refDec];
+          const children = [ws];
           let usingRef = null;
           for (i = 0; i < l; i++) {
             const step = body[i];
@@ -2148,9 +2142,8 @@ var Civet = (() => {
                       };
                       break;
                   }
-                children.pop();
                 const lhs = [[
-                  [refDec, initRef],
+                  [initRef],
                   arg,
                   [],
                   { token: "=", children: [" = "] }
@@ -2220,7 +2213,11 @@ var Civet = (() => {
             }
           }
           if (usingRef) {
-            refDec.unshift("let ", usingRef, ";");
+            s.hoistDec = {
+              type: "Declaration",
+              children: ["let ", usingRef],
+              names: []
+            };
           }
           children.push(arg);
           addParentPointers(s, s.parent);
@@ -2238,14 +2235,16 @@ var Civet = (() => {
         processPipelineExpressions(statements);
         processAssignments(statements);
         processPatternMatching(statements, ReservedWord);
-        processFunctions(statements, config);
         processSwitchExpressions(statements);
         processTryExpressions(statements);
         gatherRecursiveAll(statements, (n) => n.type === "IterationExpression").forEach((e) => expressionizeIteration(e));
         hoistRefDecs(statements);
+        processFunctions(statements, config);
         statements.unshift(...m.prelude);
         if (config.autoLet) {
-          createLetDecs(statements, []);
+          createConstLetDecs(statements, [], "let");
+        } else if (config.autoConst) {
+          createConstLetDecs(statements, [], "const");
         } else if (config.autoVar) {
           createVarDecs(statements, []);
         }
@@ -2333,7 +2332,7 @@ var Civet = (() => {
         }
         scopes.pop();
       }
-      function createLetDecs(statements, scopes) {
+      function createConstLetDecs(statements, scopes, letOrConst) {
         function findVarDecs(statements2, decs) {
           const declarationNames = gatherRecursive(
             statements2,
@@ -2370,14 +2369,14 @@ var Civet = (() => {
               let forNode = forNodes.find((forNode2) => forNode2.block === block);
               if (fnNode != null) {
                 scopes.push(new Set(fnNode.parameters.names));
-                createLetDecs(block.expressions, scopes);
+                createConstLetDecs(block.expressions, scopes, letOrConst);
                 scopes.pop();
               } else if (forNode != null) {
                 scopes.push(new Set(forNode.declaration.names));
-                createLetDecs(block.expressions, scopes);
+                createConstLetDecs(block.expressions, scopes, letOrConst);
                 scopes.pop();
               } else
-                createLetDecs(block.expressions, scopes);
+                createConstLetDecs(block.expressions, scopes, letOrConst);
               continue;
             }
             if (node.names == null)
@@ -2391,12 +2390,12 @@ var Civet = (() => {
             let indent = statement[0];
             let firstIdentifier = gatherNodes(statement[1], (node) => node.type == "Identifier")[0];
             if (undeclaredIdentifiers.length == 1 && statement[1].type == "AssignmentExpression" && statement[1].names.length == 1 && statement[1].names[0] == undeclaredIdentifiers[0] && firstIdentifier && firstIdentifier.names == undeclaredIdentifiers[0] && gatherNodes(statement[1], (node) => node.type === "ObjectBindingPattern").length == 0)
-              statement[1].children.unshift(["let "]);
+              statement[1].children.unshift([`${letOrConst} `]);
             else {
               let tail = "\n";
               if (gatherNodes(indent, (node) => node.token && node.token.endsWith("\n")).length > 0)
                 tail = void 0;
-              targetStatements.push([indent, "let ", undeclaredIdentifiers.join(", "), tail]);
+              targetStatements.push([indent, `let `, undeclaredIdentifiers.join(", "), tail]);
             }
           }
           targetStatements.push(statement);
@@ -3216,6 +3215,7 @@ ${input.slice(result.pos)}
         YieldTail,
         ArrowFunction,
         FatArrow,
+        TrailingDeclaration,
         FatArrowBody,
         ConditionalExpression,
         TernaryRest,
@@ -3319,6 +3319,7 @@ ${input.slice(result.pos)}
         BracedBlock,
         NoPostfixBracedBlock,
         NonSingleBracedBlock,
+        DeclarationOrStatement,
         SingleLineStatements,
         PostfixedSingleLineStatements,
         BracedContent,
@@ -5540,7 +5541,30 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var FatArrowBody$0 = $T($S($N(EOS), NonPipelinePostfixedExpression, $N(SemicolonDelimiter)), function(value) {
+      var TrailingDeclaration$0 = $S($Q(_), $C(ConstAssignment, LetAssignment));
+      function TrailingDeclaration(state) {
+        let eventData;
+        if (state.events) {
+          const result = state.events.enter?.("TrailingDeclaration", state);
+          if (result) {
+            if ("cache" in result)
+              return result.cache;
+            eventData = result.data;
+          }
+        }
+        if (state.tokenize) {
+          const result = $TOKEN("TrailingDeclaration", state, TrailingDeclaration$0(state));
+          if (state.events)
+            state.events.exit?.("TrailingDeclaration", state, result, eventData);
+          return result;
+        } else {
+          const result = TrailingDeclaration$0(state);
+          if (state.events)
+            state.events.exit?.("TrailingDeclaration", state, result, eventData);
+          return result;
+        }
+      }
+      var FatArrowBody$0 = $T($S($N(EOS), NonPipelinePostfixedExpression, $N(TrailingDeclaration), $N(SemicolonDelimiter)), function(value) {
         var exp = value[1];
         return exp;
       });
@@ -9014,7 +9038,31 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var SingleLineStatements$0 = $TS($S(ForbidNewlineBinaryOp, $Q($S($S($E(_), $N(EOS)), Statement, SemicolonDelimiter)), $E($S($S($E(_), $N(EOS)), Statement, $E(SemicolonDelimiter))), RestoreNewlineBinaryOp), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var DeclarationOrStatement$0 = Declaration;
+      var DeclarationOrStatement$1 = Statement;
+      function DeclarationOrStatement(state) {
+        let eventData;
+        if (state.events) {
+          const result = state.events.enter?.("DeclarationOrStatement", state);
+          if (result) {
+            if ("cache" in result)
+              return result.cache;
+            eventData = result.data;
+          }
+        }
+        if (state.tokenize) {
+          const result = $TOKEN("DeclarationOrStatement", state, DeclarationOrStatement$0(state) || DeclarationOrStatement$1(state));
+          if (state.events)
+            state.events.exit?.("DeclarationOrStatement", state, result, eventData);
+          return result;
+        } else {
+          const result = DeclarationOrStatement$0(state) || DeclarationOrStatement$1(state);
+          if (state.events)
+            state.events.exit?.("DeclarationOrStatement", state, result, eventData);
+          return result;
+        }
+      }
+      var SingleLineStatements$0 = $TS($S(ForbidNewlineBinaryOp, $Q($S($S($E(_), $N(EOS)), DeclarationOrStatement, SemicolonDelimiter)), $E($S($S($E(_), $N(EOS)), DeclarationOrStatement, $E(SemicolonDelimiter))), RestoreNewlineBinaryOp), function($skip, $loc, $0, $1, $2, $3, $4) {
         var stmts = $2;
         var last = $3;
         const expressions = [...stmts];
@@ -9049,7 +9097,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var PostfixedSingleLineStatements$0 = $TS($S($Q($S($S($E(_), $N(EOS)), PostfixedStatement, SemicolonDelimiter)), $E($S($S($E(_), $N(EOS)), PostfixedStatement, $E(SemicolonDelimiter)))), function($skip, $loc, $0, $1, $2) {
+      var PostfixedSingleLineStatements$0 = $TS($S($Q($S($S($E(_), $N(EOS)), StatementListItem, SemicolonDelimiter)), $E($S($S($E(_), $N(EOS)), StatementListItem, $E(SemicolonDelimiter)))), function($skip, $loc, $0, $1, $2) {
         var stmts = $1;
         var last = $2;
         const children = [...stmts];
@@ -9085,14 +9133,7 @@ ${input.slice(result.pos)}
         }
       }
       var BracedContent$0 = NestedBlockStatements;
-      var BracedContent$1 = $TS($S($E(_), Statement), function($skip, $loc, $0, $1, $2) {
-        const expressions = [["", $2]];
-        return {
-          type: "BlockStatement",
-          expressions,
-          children: [$1, expressions]
-        };
-      });
+      var BracedContent$1 = SingleLineStatements;
       var BracedContent$2 = $TV($Y($S(__, $EXPECT($L24, fail, 'BracedContent "}"'))), function($skip, $loc, $0, $1) {
         const expressions = [];
         return {
@@ -16808,6 +16849,7 @@ ${input.slice(result.pos)}
       var StatementDelimiter$0 = SemicolonDelimiter;
       var StatementDelimiter$1 = $S($Y($S(Nested, $C($EXPECT($L4, fail, 'StatementDelimiter "("'), $EXPECT($L111, fail, 'StatementDelimiter "["'), $EXPECT($L112, fail, 'StatementDelimiter "`"'), $EXPECT($L57, fail, 'StatementDelimiter "+"'), $EXPECT($L18, fail, 'StatementDelimiter "-"'), $EXPECT($L53, fail, 'StatementDelimiter "*"'), $EXPECT($L54, fail, 'StatementDelimiter "/"'), ObjectLiteral, Arrow, FatArrow, $S(Function, $E($S($E(_), Star)), $E(_), $EXPECT($L4, fail, 'StatementDelimiter "("'))))), InsertSemicolon);
       var StatementDelimiter$2 = $Y(EOS);
+      var StatementDelimiter$3 = $Y($S($Q(_), $EXPECT($L24, fail, 'StatementDelimiter "}"')));
       function StatementDelimiter(state) {
         let eventData;
         if (state.events) {
@@ -16819,12 +16861,12 @@ ${input.slice(result.pos)}
           }
         }
         if (state.tokenize) {
-          const result = $TOKEN("StatementDelimiter", state, StatementDelimiter$0(state) || StatementDelimiter$1(state) || StatementDelimiter$2(state));
+          const result = $TOKEN("StatementDelimiter", state, StatementDelimiter$0(state) || StatementDelimiter$1(state) || StatementDelimiter$2(state) || StatementDelimiter$3(state));
           if (state.events)
             state.events.exit?.("StatementDelimiter", state, result, eventData);
           return result;
         } else {
-          const result = StatementDelimiter$0(state) || StatementDelimiter$1(state) || StatementDelimiter$2(state);
+          const result = StatementDelimiter$0(state) || StatementDelimiter$1(state) || StatementDelimiter$2(state) || StatementDelimiter$3(state);
           if (state.events)
             state.events.exit?.("StatementDelimiter", state, result, eventData);
           return result;
@@ -21282,8 +21324,6 @@ ${input.slice(result.pos)}
           ts: true,
           children: $0
         };
-        if (isConst)
-          return ts;
         const names = new Set(block.properties.map((p) => p.name.name));
         return [
           ts,
@@ -23780,6 +23820,7 @@ ${input.slice(result.pos)}
           });
         }
         module.config = {
+          autoConst: false,
           autoVar: false,
           autoLet: false,
           coffeeBinaryExistential: false,

package/dist/main.js

@@ -1533,12 +1533,7 @@ var require_lib = __commonJS({
             ...exp,
             children: [...exp.children.slice(0, i), " ", id, suffix, ws, ...exp.children.slice(i)]
           };
-          return {
-            type: "Declaration",
-            decl,
-            children: [exp],
-            names: id.names
-          };
+          return exp;
         }
       }
       let [splices, thisAssignments] = gatherBindingCode(id);
@@ -2105,8 +2100,7 @@ var require_lib = __commonJS({
         const [ws, , body] = s.children;
         let [, arg] = s.children;
         let i = 0, l = body.length;
-        const refDec = [];
-        const children = [ws, refDec];
+        const children = [ws];
         let usingRef = null;
         for (i = 0; i < l; i++) {
           const step = body[i];
@@ -2147,9 +2141,8 @@ var require_lib = __commonJS({
                     };
                     break;
                 }
-              children.pop();
               const lhs = [[
-                [refDec, initRef],
+                [initRef],
                 arg,
                 [],
                 { token: "=", children: [" = "] }
@@ -2219,7 +2212,11 @@ var require_lib = __commonJS({
           }
         }
         if (usingRef) {
-          refDec.unshift("let ", usingRef, ";");
+          s.hoistDec = {
+            type: "Declaration",
+            children: ["let ", usingRef],
+            names: []
+          };
         }
         children.push(arg);
         addParentPointers(s, s.parent);
@@ -2237,14 +2234,16 @@ var require_lib = __commonJS({
       processPipelineExpressions(statements);
       processAssignments(statements);
       processPatternMatching(statements, ReservedWord);
-      processFunctions(statements, config);
       processSwitchExpressions(statements);
       processTryExpressions(statements);
       gatherRecursiveAll(statements, (n) => n.type === "IterationExpression").forEach((e) => expressionizeIteration(e));
       hoistRefDecs(statements);
+      processFunctions(statements, config);
       statements.unshift(...m.prelude);
       if (config.autoLet) {
-        createLetDecs(statements, []);
+        createConstLetDecs(statements, [], "let");
+      } else if (config.autoConst) {
+        createConstLetDecs(statements, [], "const");
       } else if (config.autoVar) {
         createVarDecs(statements, []);
       }
@@ -2332,7 +2331,7 @@ var require_lib = __commonJS({
       }
       scopes.pop();
     }
-    function createLetDecs(statements, scopes) {
+    function createConstLetDecs(statements, scopes, letOrConst) {
       function findVarDecs(statements2, decs) {
         const declarationNames = gatherRecursive(
           statements2,
@@ -2369,14 +2368,14 @@ var require_lib = __commonJS({
             let forNode = forNodes.find((forNode2) => forNode2.block === block);
             if (fnNode != null) {
               scopes.push(new Set(fnNode.parameters.names));
-              createLetDecs(block.expressions, scopes);
+              createConstLetDecs(block.expressions, scopes, letOrConst);
               scopes.pop();
             } else if (forNode != null) {
               scopes.push(new Set(forNode.declaration.names));
-              createLetDecs(block.expressions, scopes);
+              createConstLetDecs(block.expressions, scopes, letOrConst);
               scopes.pop();
             } else
-              createLetDecs(block.expressions, scopes);
+              createConstLetDecs(block.expressions, scopes, letOrConst);
             continue;
           }
           if (node.names == null)
@@ -2390,12 +2389,12 @@ var require_lib = __commonJS({
           let indent = statement[0];
           let firstIdentifier = gatherNodes(statement[1], (node) => node.type == "Identifier")[0];
           if (undeclaredIdentifiers.length == 1 && statement[1].type == "AssignmentExpression" && statement[1].names.length == 1 && statement[1].names[0] == undeclaredIdentifiers[0] && firstIdentifier && firstIdentifier.names == undeclaredIdentifiers[0] && gatherNodes(statement[1], (node) => node.type === "ObjectBindingPattern").length == 0)
-            statement[1].children.unshift(["let "]);
+            statement[1].children.unshift([`${letOrConst} `]);
           else {
             let tail = "\n";
             if (gatherNodes(indent, (node) => node.token && node.token.endsWith("\n")).length > 0)
               tail = void 0;
-            targetStatements.push([indent, "let ", undeclaredIdentifiers.join(", "), tail]);
+            targetStatements.push([indent, `let `, undeclaredIdentifiers.join(", "), tail]);
           }
         }
         targetStatements.push(statement);
@@ -3215,6 +3214,7 @@ ${input.slice(result.pos)}
       YieldTail,
       ArrowFunction,
       FatArrow,
+      TrailingDeclaration,
       FatArrowBody,
       ConditionalExpression,
       TernaryRest,
@@ -3318,6 +3318,7 @@ ${input.slice(result.pos)}
       BracedBlock,
       NoPostfixBracedBlock,
       NonSingleBracedBlock,
+      DeclarationOrStatement,
       SingleLineStatements,
       PostfixedSingleLineStatements,
       BracedContent,
@@ -5539,7 +5540,30 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var FatArrowBody$0 = $T($S($N(EOS), NonPipelinePostfixedExpression, $N(SemicolonDelimiter)), function(value) {
+    var TrailingDeclaration$0 = $S($Q(_), $C(ConstAssignment, LetAssignment));
+    function TrailingDeclaration(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("TrailingDeclaration", state);
+        if (result) {
+          if ("cache" in result)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("TrailingDeclaration", state, TrailingDeclaration$0(state));
+        if (state.events)
+          state.events.exit?.("TrailingDeclaration", state, result, eventData);
+        return result;
+      } else {
+        const result = TrailingDeclaration$0(state);
+        if (state.events)
+          state.events.exit?.("TrailingDeclaration", state, result, eventData);
+        return result;
+      }
+    }
+    var FatArrowBody$0 = $T($S($N(EOS), NonPipelinePostfixedExpression, $N(TrailingDeclaration), $N(SemicolonDelimiter)), function(value) {
       var exp = value[1];
       return exp;
     });
@@ -9013,7 +9037,31 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var SingleLineStatements$0 = $TS($S(ForbidNewlineBinaryOp, $Q($S($S($E(_), $N(EOS)), Statement, SemicolonDelimiter)), $E($S($S($E(_), $N(EOS)), Statement, $E(SemicolonDelimiter))), RestoreNewlineBinaryOp), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var DeclarationOrStatement$0 = Declaration;
+    var DeclarationOrStatement$1 = Statement;
+    function DeclarationOrStatement(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("DeclarationOrStatement", state);
+        if (result) {
+          if ("cache" in result)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("DeclarationOrStatement", state, DeclarationOrStatement$0(state) || DeclarationOrStatement$1(state));
+        if (state.events)
+          state.events.exit?.("DeclarationOrStatement", state, result, eventData);
+        return result;
+      } else {
+        const result = DeclarationOrStatement$0(state) || DeclarationOrStatement$1(state);
+        if (state.events)
+          state.events.exit?.("DeclarationOrStatement", state, result, eventData);
+        return result;
+      }
+    }
+    var SingleLineStatements$0 = $TS($S(ForbidNewlineBinaryOp, $Q($S($S($E(_), $N(EOS)), DeclarationOrStatement, SemicolonDelimiter)), $E($S($S($E(_), $N(EOS)), DeclarationOrStatement, $E(SemicolonDelimiter))), RestoreNewlineBinaryOp), function($skip, $loc, $0, $1, $2, $3, $4) {
       var stmts = $2;
       var last = $3;
       const expressions = [...stmts];
@@ -9048,7 +9096,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var PostfixedSingleLineStatements$0 = $TS($S($Q($S($S($E(_), $N(EOS)), PostfixedStatement, SemicolonDelimiter)), $E($S($S($E(_), $N(EOS)), PostfixedStatement, $E(SemicolonDelimiter)))), function($skip, $loc, $0, $1, $2) {
+    var PostfixedSingleLineStatements$0 = $TS($S($Q($S($S($E(_), $N(EOS)), StatementListItem, SemicolonDelimiter)), $E($S($S($E(_), $N(EOS)), StatementListItem, $E(SemicolonDelimiter)))), function($skip, $loc, $0, $1, $2) {
       var stmts = $1;
       var last = $2;
       const children = [...stmts];
@@ -9084,14 +9132,7 @@ ${input.slice(result.pos)}
       }
     }
     var BracedContent$0 = NestedBlockStatements;
-    var BracedContent$1 = $TS($S($E(_), Statement), function($skip, $loc, $0, $1, $2) {
-      const expressions = [["", $2]];
-      return {
-        type: "BlockStatement",
-        expressions,
-        children: [$1, expressions]
-      };
-    });
+    var BracedContent$1 = SingleLineStatements;
     var BracedContent$2 = $TV($Y($S(__, $EXPECT($L24, fail, 'BracedContent "}"'))), function($skip, $loc, $0, $1) {
       const expressions = [];
       return {
@@ -16807,6 +16848,7 @@ ${input.slice(result.pos)}
     var StatementDelimiter$0 = SemicolonDelimiter;
     var StatementDelimiter$1 = $S($Y($S(Nested, $C($EXPECT($L4, fail, 'StatementDelimiter "("'), $EXPECT($L111, fail, 'StatementDelimiter "["'), $EXPECT($L112, fail, 'StatementDelimiter "`"'), $EXPECT($L57, fail, 'StatementDelimiter "+"'), $EXPECT($L18, fail, 'StatementDelimiter "-"'), $EXPECT($L53, fail, 'StatementDelimiter "*"'), $EXPECT($L54, fail, 'StatementDelimiter "/"'), ObjectLiteral, Arrow, FatArrow, $S(Function, $E($S($E(_), Star)), $E(_), $EXPECT($L4, fail, 'StatementDelimiter "("'))))), InsertSemicolon);
     var StatementDelimiter$2 = $Y(EOS);
+    var StatementDelimiter$3 = $Y($S($Q(_), $EXPECT($L24, fail, 'StatementDelimiter "}"')));
     function StatementDelimiter(state) {
       let eventData;
       if (state.events) {
@@ -16818,12 +16860,12 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("StatementDelimiter", state, StatementDelimiter$0(state) || StatementDelimiter$1(state) || StatementDelimiter$2(state));
+        const result = $TOKEN("StatementDelimiter", state, StatementDelimiter$0(state) || StatementDelimiter$1(state) || StatementDelimiter$2(state) || StatementDelimiter$3(state));
         if (state.events)
           state.events.exit?.("StatementDelimiter", state, result, eventData);
         return result;
       } else {
-        const result = StatementDelimiter$0(state) || StatementDelimiter$1(state) || StatementDelimiter$2(state);
+        const result = StatementDelimiter$0(state) || StatementDelimiter$1(state) || StatementDelimiter$2(state) || StatementDelimiter$3(state);
         if (state.events)
           state.events.exit?.("StatementDelimiter", state, result, eventData);
         return result;
@@ -21281,8 +21323,6 @@ ${input.slice(result.pos)}
         ts: true,
         children: $0
       };
-      if (isConst)
-        return ts;
       const names = new Set(block.properties.map((p) => p.name.name));
       return [
         ts,
@@ -23779,6 +23819,7 @@ ${input.slice(result.pos)}
         });
       }
       module2.config = {
+        autoConst: false,
         autoVar: false,
         autoLet: false,
         coffeeBinaryExistential: false,

package/dist/main.mjs

@@ -1531,12 +1531,7 @@ var require_lib = __commonJS({
             ...exp,
             children: [...exp.children.slice(0, i), " ", id, suffix, ws, ...exp.children.slice(i)]
           };
-          return {
-            type: "Declaration",
-            decl,
-            children: [exp],
-            names: id.names
-          };
+          return exp;
         }
       }
       let [splices, thisAssignments] = gatherBindingCode(id);
@@ -2103,8 +2098,7 @@ var require_lib = __commonJS({
         const [ws, , body] = s.children;
         let [, arg] = s.children;
         let i = 0, l = body.length;
-        const refDec = [];
-        const children = [ws, refDec];
+        const children = [ws];
         let usingRef = null;
         for (i = 0; i < l; i++) {
           const step = body[i];
@@ -2145,9 +2139,8 @@ var require_lib = __commonJS({
                     };
                     break;
                 }
-              children.pop();
               const lhs = [[
-                [refDec, initRef],
+                [initRef],
                 arg,
                 [],
                 { token: "=", children: [" = "] }
@@ -2217,7 +2210,11 @@ var require_lib = __commonJS({
           }
         }
         if (usingRef) {
-          refDec.unshift("let ", usingRef, ";");
+          s.hoistDec = {
+            type: "Declaration",
+            children: ["let ", usingRef],
+            names: []
+          };
         }
         children.push(arg);
         addParentPointers(s, s.parent);
@@ -2235,14 +2232,16 @@ var require_lib = __commonJS({
       processPipelineExpressions(statements);
       processAssignments(statements);
       processPatternMatching(statements, ReservedWord);
-      processFunctions(statements, config);
       processSwitchExpressions(statements);
       processTryExpressions(statements);
       gatherRecursiveAll(statements, (n) => n.type === "IterationExpression").forEach((e) => expressionizeIteration(e));
       hoistRefDecs(statements);
+      processFunctions(statements, config);
       statements.unshift(...m.prelude);
       if (config.autoLet) {
-        createLetDecs(statements, []);
+        createConstLetDecs(statements, [], "let");
+      } else if (config.autoConst) {
+        createConstLetDecs(statements, [], "const");
       } else if (config.autoVar) {
         createVarDecs(statements, []);
       }
@@ -2330,7 +2329,7 @@ var require_lib = __commonJS({
       }
       scopes.pop();
     }
-    function createLetDecs(statements, scopes) {
+    function createConstLetDecs(statements, scopes, letOrConst) {
       function findVarDecs(statements2, decs) {
         const declarationNames = gatherRecursive(
           statements2,
@@ -2367,14 +2366,14 @@ var require_lib = __commonJS({
             let forNode = forNodes.find((forNode2) => forNode2.block === block);
             if (fnNode != null) {
               scopes.push(new Set(fnNode.parameters.names));
-              createLetDecs(block.expressions, scopes);
+              createConstLetDecs(block.expressions, scopes, letOrConst);
               scopes.pop();
             } else if (forNode != null) {
               scopes.push(new Set(forNode.declaration.names));
-              createLetDecs(block.expressions, scopes);
+              createConstLetDecs(block.expressions, scopes, letOrConst);
               scopes.pop();
             } else
-              createLetDecs(block.expressions, scopes);
+              createConstLetDecs(block.expressions, scopes, letOrConst);
             continue;
           }
           if (node.names == null)
@@ -2388,12 +2387,12 @@ var require_lib = __commonJS({
           let indent = statement[0];
           let firstIdentifier = gatherNodes(statement[1], (node) => node.type == "Identifier")[0];
           if (undeclaredIdentifiers.length == 1 && statement[1].type == "AssignmentExpression" && statement[1].names.length == 1 && statement[1].names[0] == undeclaredIdentifiers[0] && firstIdentifier && firstIdentifier.names == undeclaredIdentifiers[0] && gatherNodes(statement[1], (node) => node.type === "ObjectBindingPattern").length == 0)
-            statement[1].children.unshift(["let "]);
+            statement[1].children.unshift([`${letOrConst} `]);
           else {
             let tail = "\n";
             if (gatherNodes(indent, (node) => node.token && node.token.endsWith("\n")).length > 0)
               tail = void 0;
-            targetStatements.push([indent, "let ", undeclaredIdentifiers.join(", "), tail]);
+            targetStatements.push([indent, `let `, undeclaredIdentifiers.join(", "), tail]);
           }
         }
         targetStatements.push(statement);
@@ -3213,6 +3212,7 @@ ${input.slice(result.pos)}
       YieldTail,
       ArrowFunction,
       FatArrow,
+      TrailingDeclaration,
       FatArrowBody,
       ConditionalExpression,
       TernaryRest,
@@ -3316,6 +3316,7 @@ ${input.slice(result.pos)}
       BracedBlock,
       NoPostfixBracedBlock,
       NonSingleBracedBlock,
+      DeclarationOrStatement,
       SingleLineStatements,
       PostfixedSingleLineStatements,
       BracedContent,
@@ -5537,7 +5538,30 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var FatArrowBody$0 = $T($S($N(EOS), NonPipelinePostfixedExpression, $N(SemicolonDelimiter)), function(value) {
+    var TrailingDeclaration$0 = $S($Q(_), $C(ConstAssignment, LetAssignment));
+    function TrailingDeclaration(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("TrailingDeclaration", state);
+        if (result) {
+          if ("cache" in result)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("TrailingDeclaration", state, TrailingDeclaration$0(state));
+        if (state.events)
+          state.events.exit?.("TrailingDeclaration", state, result, eventData);
+        return result;
+      } else {
+        const result = TrailingDeclaration$0(state);
+        if (state.events)
+          state.events.exit?.("TrailingDeclaration", state, result, eventData);
+        return result;
+      }
+    }
+    var FatArrowBody$0 = $T($S($N(EOS), NonPipelinePostfixedExpression, $N(TrailingDeclaration), $N(SemicolonDelimiter)), function(value) {
       var exp = value[1];
       return exp;
     });
@@ -9011,7 +9035,31 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var SingleLineStatements$0 = $TS($S(ForbidNewlineBinaryOp, $Q($S($S($E(_), $N(EOS)), Statement, SemicolonDelimiter)), $E($S($S($E(_), $N(EOS)), Statement, $E(SemicolonDelimiter))), RestoreNewlineBinaryOp), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var DeclarationOrStatement$0 = Declaration;
+    var DeclarationOrStatement$1 = Statement;
+    function DeclarationOrStatement(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("DeclarationOrStatement", state);
+        if (result) {
+          if ("cache" in result)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("DeclarationOrStatement", state, DeclarationOrStatement$0(state) || DeclarationOrStatement$1(state));
+        if (state.events)
+          state.events.exit?.("DeclarationOrStatement", state, result, eventData);
+        return result;
+      } else {
+        const result = DeclarationOrStatement$0(state) || DeclarationOrStatement$1(state);
+        if (state.events)
+          state.events.exit?.("DeclarationOrStatement", state, result, eventData);
+        return result;
+      }
+    }
+    var SingleLineStatements$0 = $TS($S(ForbidNewlineBinaryOp, $Q($S($S($E(_), $N(EOS)), DeclarationOrStatement, SemicolonDelimiter)), $E($S($S($E(_), $N(EOS)), DeclarationOrStatement, $E(SemicolonDelimiter))), RestoreNewlineBinaryOp), function($skip, $loc, $0, $1, $2, $3, $4) {
       var stmts = $2;
       var last = $3;
       const expressions = [...stmts];
@@ -9046,7 +9094,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var PostfixedSingleLineStatements$0 = $TS($S($Q($S($S($E(_), $N(EOS)), PostfixedStatement, SemicolonDelimiter)), $E($S($S($E(_), $N(EOS)), PostfixedStatement, $E(SemicolonDelimiter)))), function($skip, $loc, $0, $1, $2) {
+    var PostfixedSingleLineStatements$0 = $TS($S($Q($S($S($E(_), $N(EOS)), StatementListItem, SemicolonDelimiter)), $E($S($S($E(_), $N(EOS)), StatementListItem, $E(SemicolonDelimiter)))), function($skip, $loc, $0, $1, $2) {
       var stmts = $1;
       var last = $2;
       const children = [...stmts];
@@ -9082,14 +9130,7 @@ ${input.slice(result.pos)}
       }
     }
     var BracedContent$0 = NestedBlockStatements;
-    var BracedContent$1 = $TS($S($E(_), Statement), function($skip, $loc, $0, $1, $2) {
-      const expressions = [["", $2]];
-      return {
-        type: "BlockStatement",
-        expressions,
-        children: [$1, expressions]
-      };
-    });
+    var BracedContent$1 = SingleLineStatements;
     var BracedContent$2 = $TV($Y($S(__, $EXPECT($L24, fail, 'BracedContent "}"'))), function($skip, $loc, $0, $1) {
       const expressions = [];
       return {
@@ -16805,6 +16846,7 @@ ${input.slice(result.pos)}
     var StatementDelimiter$0 = SemicolonDelimiter;
     var StatementDelimiter$1 = $S($Y($S(Nested, $C($EXPECT($L4, fail, 'StatementDelimiter "("'), $EXPECT($L111, fail, 'StatementDelimiter "["'), $EXPECT($L112, fail, 'StatementDelimiter "`"'), $EXPECT($L57, fail, 'StatementDelimiter "+"'), $EXPECT($L18, fail, 'StatementDelimiter "-"'), $EXPECT($L53, fail, 'StatementDelimiter "*"'), $EXPECT($L54, fail, 'StatementDelimiter "/"'), ObjectLiteral, Arrow, FatArrow, $S(Function, $E($S($E(_), Star)), $E(_), $EXPECT($L4, fail, 'StatementDelimiter "("'))))), InsertSemicolon);
     var StatementDelimiter$2 = $Y(EOS);
+    var StatementDelimiter$3 = $Y($S($Q(_), $EXPECT($L24, fail, 'StatementDelimiter "}"')));
     function StatementDelimiter(state) {
       let eventData;
       if (state.events) {
@@ -16816,12 +16858,12 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("StatementDelimiter", state, StatementDelimiter$0(state) || StatementDelimiter$1(state) || StatementDelimiter$2(state));
+        const result = $TOKEN("StatementDelimiter", state, StatementDelimiter$0(state) || StatementDelimiter$1(state) || StatementDelimiter$2(state) || StatementDelimiter$3(state));
         if (state.events)
           state.events.exit?.("StatementDelimiter", state, result, eventData);
         return result;
       } else {
-        const result = StatementDelimiter$0(state) || StatementDelimiter$1(state) || StatementDelimiter$2(state);
+        const result = StatementDelimiter$0(state) || StatementDelimiter$1(state) || StatementDelimiter$2(state) || StatementDelimiter$3(state);
         if (state.events)
           state.events.exit?.("StatementDelimiter", state, result, eventData);
         return result;
@@ -21279,8 +21321,6 @@ ${input.slice(result.pos)}
         ts: true,
         children: $0
       };
-      if (isConst)
-        return ts;
       const names = new Set(block.properties.map((p) => p.name.name));
       return [
         ts,
@@ -23777,6 +23817,7 @@ ${input.slice(result.pos)}
         });
       }
       module.config = {
+        autoConst: false,
         autoVar: false,
         autoLet: false,
         coffeeBinaryExistential: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielx/civet",
-  "version": "0.6.24",
+  "version": "0.6.26",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -9,9 +9,10 @@
       "import": "./dist/main.mjs",
       "require": "./dist/main.js"
     },
+    "./babel-plugin": "./dist/babel-plugin.mjs",
+    "./bun-civet": "./dist/bun-civet.mjs",
     "./esm": "./dist/esm.mjs",
     "./esbuild-plugin": "./dist/esbuild-plugin.js",
-    "./bun-civet": "./dist/bun-civet.mjs",
     "./register": "./register.js",
     "./config": "./dist/config.js",
     "./*": "./*",