@danielx/civet 0.6.7 → 0.6.8

package/dist/babel-plugin.mjs

@@ -0,0 +1,25 @@
+import { compile } from "./main.mjs"
+
+export default function (api, civetOptions) {
+  return {
+    parserOverride(code, opts, parse) {
+      let src
+      if (opts.sourceFileName.endsWith(".civet")) {
+        const config = Object.assign({}, civetOptions, {
+          filename: opts.sourceFileName,
+          sourceMap: opts.sourceMaps ?? true,
+        })
+
+        if (config.sourceMap) {
+          ({ code: src } = compile(code, config))
+        } else {
+          src = compile(code, config)
+        }
+      } else {
+        src = code
+      }
+      const ast = parse(src, opts)
+      return ast
+    }
+  }
+}

package/dist/browser.js

@@ -798,13 +798,14 @@ var Civet = (() => {
       }
       function hoistRefDecs(statements) {
         gatherRecursiveAll(statements, (s) => s.hoistDec).forEach((node) => {
-          const { hoistDec } = node;
+          let { hoistDec, parent } = node;
           node.hoistDec = null;
-          while (node.parent?.type !== "BlockStatement") {
-            node = node.parent;
+          while (parent?.type !== "BlockStatement" || parent.bare && !parent.root) {
+            node = parent;
+            parent = node.parent;
           }
-          if (node.parent) {
-            insertHoistDec(node.parent, node, hoistDec);
+          if (parent) {
+            insertHoistDec(parent, node, hoistDec);
           } else {
             throw new Error("Couldn't find block to hoist declaration into.");
           }
@@ -1331,8 +1332,27 @@ var Civet = (() => {
           thisAssignments
         };
       }
+      function implicitFunctionBlock(f) {
+        if (f.abstract || f.block)
+          return;
+        const { name, parent } = f;
+        const expressions = parent?.expressions ?? parent?.elements;
+        const currentIndex = expressions?.findIndex(([, def]) => def === f);
+        const following = currentIndex >= 0 && expressions[currentIndex + 1]?.[1];
+        if (f.type === following?.type && name && name === following.name) {
+          f.ts = true;
+        } else {
+          const block = makeEmptyBlock();
+          block.parent = f;
+          f.block = block;
+          f.children.push(block);
+          f.ts = false;
+        }
+      }
       function processFunctions(statements, config) {
         gatherRecursiveAll(statements, ({ type }) => type === "FunctionExpression" || type === "ArrowFunction").forEach((f) => {
+          if (f.type === "FunctionExpression")
+            implicitFunctionBlock(f);
           processParams(f);
           if (!processReturnValue(f) && config.implicitReturns) {
             const { block, returnType } = f;
@@ -1344,25 +1364,15 @@ 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);
-            }
-          }
+          implicitFunctionBlock(f);
           processParams(f);
           if (!processReturnValue(f) && config.implicitReturns) {
-            const { signature: signature2, block: block2 } = f;
-            const isConstructor = signature2.name === "constructor";
-            const isVoid = isVoidType(signature2.returnType?.t);
-            const isSet = signature2.modifier?.set;
+            const { signature, block } = f;
+            const isConstructor = signature.name === "constructor";
+            const isVoid = isVoidType(signature.returnType?.t);
+            const isSet = signature.modifier?.set;
             if (!isConstructor && !isSet && !isVoid) {
-              insertReturn(block2);
+              insertReturn(block);
             }
           }
         });
@@ -3457,6 +3467,7 @@ ${input.slice(result.pos)}
         NestedEnumProperties,
         NestedEnumProperty,
         EnumProperty,
+        TypeProperty,
         TypeIndexSignature,
         TypeIndex,
         TypeSuffix,
@@ -4256,10 +4267,9 @@ ${input.slice(result.pos)}
       }
       var ForbiddenImplicitCalls$0 = $R$0($EXPECT($R0, fail, "ForbiddenImplicitCalls /(as|of|satisfies|then|when|implements|xor|xnor)(?!\\p{ID_Continue}|[\\u200C\\u200D$])/"));
       var ForbiddenImplicitCalls$1 = $EXPECT($L1, fail, 'ForbiddenImplicitCalls "/ "');
-      var ForbiddenImplicitCalls$2 = $S(ClassImplicitCallForbidden, Class);
-      var ForbiddenImplicitCalls$3 = AtAt;
-      var ForbiddenImplicitCalls$4 = $S(Identifier, $EXPECT($L2, fail, 'ForbiddenImplicitCalls "="'), Whitespace);
-      var ForbiddenImplicitCalls$5 = $TS($S(Identifier, $N($EXPECT($L3, fail, 'ForbiddenImplicitCalls "("'))), function($skip, $loc, $0, $1, $2) {
+      var ForbiddenImplicitCalls$2 = $S(ClassImplicitCallForbidden, $C(Class, AtAt));
+      var ForbiddenImplicitCalls$3 = $S(Identifier, $EXPECT($L2, fail, 'ForbiddenImplicitCalls "="'), Whitespace);
+      var ForbiddenImplicitCalls$4 = $TS($S(Identifier, $N($EXPECT($L3, fail, 'ForbiddenImplicitCalls "("'))), function($skip, $loc, $0, $1, $2) {
         if (module.operators.has($1.name))
           return $1;
         return $skip;
@@ -4275,12 +4285,12 @@ ${input.slice(result.pos)}
           }
         }
         if (state.tokenize) {
-          const result = $TOKEN("ForbiddenImplicitCalls", state, ForbiddenImplicitCalls$0(state) || ForbiddenImplicitCalls$1(state) || ForbiddenImplicitCalls$2(state) || ForbiddenImplicitCalls$3(state) || ForbiddenImplicitCalls$4(state) || ForbiddenImplicitCalls$5(state));
+          const result = $TOKEN("ForbiddenImplicitCalls", state, ForbiddenImplicitCalls$0(state) || ForbiddenImplicitCalls$1(state) || ForbiddenImplicitCalls$2(state) || ForbiddenImplicitCalls$3(state) || ForbiddenImplicitCalls$4(state));
           if (state.events)
             state.events.exit?.("ForbiddenImplicitCalls", state, result, eventData);
           return result;
         } else {
-          const result = ForbiddenImplicitCalls$0(state) || ForbiddenImplicitCalls$1(state) || ForbiddenImplicitCalls$2(state) || ForbiddenImplicitCalls$3(state) || ForbiddenImplicitCalls$4(state) || ForbiddenImplicitCalls$5(state);
+          const result = ForbiddenImplicitCalls$0(state) || ForbiddenImplicitCalls$1(state) || ForbiddenImplicitCalls$2(state) || ForbiddenImplicitCalls$3(state) || ForbiddenImplicitCalls$4(state);
           if (state.events)
             state.events.exit?.("ForbiddenImplicitCalls", state, result, eventData);
           return result;
@@ -5984,7 +5994,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var AccessModifier$0 = $TS($S($E($S($C(Public, Private, Protected), __)), $E($S(Readonly, __))), function($skip, $loc, $0, $1, $2) {
+      var AccessModifier$0 = $TS($S($E($S($C(Public, Private, Protected), NotDedented)), $E($S(Readonly, NotDedented))), function($skip, $loc, $0, $1, $2) {
         if (!($1 || $2))
           return $skip;
         return {
@@ -7740,9 +7750,11 @@ ${input.slice(result.pos)}
           async = [];
         if (!generator)
           generator = [];
+        const id = wid?.[1];
         return {
           type: "FunctionSignature",
-          id: wid?.[1],
+          id,
+          name: id?.name,
           parameters,
           returnType: suffix,
           ts: false,
@@ -7778,8 +7790,11 @@ ${input.slice(result.pos)}
         var signature = $1;
         var block = $2;
         if (!block) {
-          signature.ts = true;
-          return signature;
+          return {
+            ...signature,
+            type: "FunctionExpression",
+            ts: true
+          };
         }
         if (hasAwait(block) && !signature.async.length) {
           signature.async.push("async ");
@@ -13047,7 +13062,7 @@ ${input.slice(result.pos)}
         }
       }
       var ForbidClassImplicitCall$0 = $TV($EXPECT($L0, fail, 'ForbidClassImplicitCall ""'), function($skip, $loc, $0, $1) {
-        module.forbidIndentedApplication.push(true);
+        module.forbidClassImplicitCall.push(true);
       });
       function ForbidClassImplicitCall(state) {
         let eventData;
@@ -13072,7 +13087,7 @@ ${input.slice(result.pos)}
         }
       }
       var AllowClassImplicitCall$0 = $TV($EXPECT($L0, fail, 'AllowClassImplicitCall ""'), function($skip, $loc, $0, $1) {
-        module.forbidIndentedApplication.push(false);
+        module.forbidClassImplicitCall.push(false);
       });
       function AllowClassImplicitCall(state) {
         let eventData;
@@ -13097,7 +13112,7 @@ ${input.slice(result.pos)}
         }
       }
       var RestoreClassImplicitCall$0 = $TV($EXPECT($L0, fail, 'RestoreClassImplicitCall ""'), function($skip, $loc, $0, $1) {
-        module.forbidIndentedApplication.pop();
+        module.forbidClassImplicitCall.pop();
       });
       function RestoreClassImplicitCall(state) {
         let eventData;
@@ -13122,7 +13137,7 @@ ${input.slice(result.pos)}
         }
       }
       var ClassImplicitCallForbidden$0 = $TV($EXPECT($L0, fail, 'ClassImplicitCallForbidden ""'), function($skip, $loc, $0, $1) {
-        if (module.classImplicitCallForbidden)
+        if (!module.classImplicitCallForbidden)
           return $skip;
         return;
       });
@@ -20331,7 +20346,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var BasicInterfaceProperty$0 = $S($C(TypeIndexSignature, PropertyName), TypeSuffix, InterfacePropertyDelimiter);
+      var BasicInterfaceProperty$0 = $S($C(TypeIndexSignature, TypeProperty), $E(_), TypeSuffix, InterfacePropertyDelimiter);
       function BasicInterfaceProperty(state) {
         let eventData;
         if (state.events) {
@@ -20772,7 +20787,30 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R58, fail, "TypeIndexSignature /[+-]?/")), $EXPECT($L141, fail, 'TypeIndexSignature "readonly"'), __)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R59, fail, "TypeIndexSignature /[+-]/")), QuestionMark)));
+      var TypeProperty$0 = $S($E($S(Readonly, NotDedented)), PropertyName);
+      function TypeProperty(state) {
+        let eventData;
+        if (state.events) {
+          const result = state.events.enter?.("TypeProperty", state);
+          if (result) {
+            if (result.cache)
+              return result.cache;
+            eventData = result.data;
+          }
+        }
+        if (state.tokenize) {
+          const result = $TOKEN("TypeProperty", state, TypeProperty$0(state));
+          if (state.events)
+            state.events.exit?.("TypeProperty", state, result, eventData);
+          return result;
+        } else {
+          const result = TypeProperty$0(state);
+          if (state.events)
+            state.events.exit?.("TypeProperty", state, result, eventData);
+          return result;
+        }
+      }
+      var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R58, fail, "TypeIndexSignature /[+-]?/")), Readonly, NotDedented)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R59, fail, "TypeIndexSignature /[+-]/")), $Y($S($E(_), QuestionMark)))));
       function TypeIndexSignature(state) {
         let eventData;
         if (state.events) {
@@ -21456,7 +21494,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var InlineBasicInterfaceProperty$0 = $S($C(TypeIndexSignature, PropertyName), $E(QuestionMark), Colon, Type, InlineInterfacePropertyDelimiter);
+      var InlineBasicInterfaceProperty$0 = $S($C(TypeIndexSignature, TypeProperty), $E(QuestionMark), Colon, Type, InlineInterfacePropertyDelimiter);
       function InlineBasicInterfaceProperty(state) {
         let eventData;
         if (state.events) {

package/dist/main.js

@@ -797,13 +797,14 @@ var require_lib = __commonJS({
     }
     function hoistRefDecs(statements) {
       gatherRecursiveAll(statements, (s) => s.hoistDec).forEach((node) => {
-        const { hoistDec } = node;
+        let { hoistDec, parent } = node;
         node.hoistDec = null;
-        while (node.parent?.type !== "BlockStatement") {
-          node = node.parent;
+        while (parent?.type !== "BlockStatement" || parent.bare && !parent.root) {
+          node = parent;
+          parent = node.parent;
         }
-        if (node.parent) {
-          insertHoistDec(node.parent, node, hoistDec);
+        if (parent) {
+          insertHoistDec(parent, node, hoistDec);
         } else {
           throw new Error("Couldn't find block to hoist declaration into.");
         }
@@ -1330,8 +1331,27 @@ var require_lib = __commonJS({
         thisAssignments
       };
     }
+    function implicitFunctionBlock(f) {
+      if (f.abstract || f.block)
+        return;
+      const { name, parent } = f;
+      const expressions = parent?.expressions ?? parent?.elements;
+      const currentIndex = expressions?.findIndex(([, def]) => def === f);
+      const following = currentIndex >= 0 && expressions[currentIndex + 1]?.[1];
+      if (f.type === following?.type && name && name === following.name) {
+        f.ts = true;
+      } else {
+        const block = makeEmptyBlock();
+        block.parent = f;
+        f.block = block;
+        f.children.push(block);
+        f.ts = false;
+      }
+    }
     function processFunctions(statements, config) {
       gatherRecursiveAll(statements, ({ type }) => type === "FunctionExpression" || type === "ArrowFunction").forEach((f) => {
+        if (f.type === "FunctionExpression")
+          implicitFunctionBlock(f);
         processParams(f);
         if (!processReturnValue(f) && config.implicitReturns) {
           const { block, returnType } = f;
@@ -1343,25 +1363,15 @@ 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);
-          }
-        }
+        implicitFunctionBlock(f);
         processParams(f);
         if (!processReturnValue(f) && config.implicitReturns) {
-          const { signature: signature2, block: block2 } = f;
-          const isConstructor = signature2.name === "constructor";
-          const isVoid = isVoidType(signature2.returnType?.t);
-          const isSet = signature2.modifier?.set;
+          const { signature, block } = f;
+          const isConstructor = signature.name === "constructor";
+          const isVoid = isVoidType(signature.returnType?.t);
+          const isSet = signature.modifier?.set;
           if (!isConstructor && !isSet && !isVoid) {
-            insertReturn(block2);
+            insertReturn(block);
           }
         }
       });
@@ -3456,6 +3466,7 @@ ${input.slice(result.pos)}
       NestedEnumProperties,
       NestedEnumProperty,
       EnumProperty,
+      TypeProperty,
       TypeIndexSignature,
       TypeIndex,
       TypeSuffix,
@@ -4255,10 +4266,9 @@ ${input.slice(result.pos)}
     }
     var ForbiddenImplicitCalls$0 = $R$0($EXPECT($R0, fail, "ForbiddenImplicitCalls /(as|of|satisfies|then|when|implements|xor|xnor)(?!\\p{ID_Continue}|[\\u200C\\u200D$])/"));
     var ForbiddenImplicitCalls$1 = $EXPECT($L1, fail, 'ForbiddenImplicitCalls "/ "');
-    var ForbiddenImplicitCalls$2 = $S(ClassImplicitCallForbidden, Class);
-    var ForbiddenImplicitCalls$3 = AtAt;
-    var ForbiddenImplicitCalls$4 = $S(Identifier, $EXPECT($L2, fail, 'ForbiddenImplicitCalls "="'), Whitespace);
-    var ForbiddenImplicitCalls$5 = $TS($S(Identifier, $N($EXPECT($L3, fail, 'ForbiddenImplicitCalls "("'))), function($skip, $loc, $0, $1, $2) {
+    var ForbiddenImplicitCalls$2 = $S(ClassImplicitCallForbidden, $C(Class, AtAt));
+    var ForbiddenImplicitCalls$3 = $S(Identifier, $EXPECT($L2, fail, 'ForbiddenImplicitCalls "="'), Whitespace);
+    var ForbiddenImplicitCalls$4 = $TS($S(Identifier, $N($EXPECT($L3, fail, 'ForbiddenImplicitCalls "("'))), function($skip, $loc, $0, $1, $2) {
       if (module2.operators.has($1.name))
         return $1;
       return $skip;
@@ -4274,12 +4284,12 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("ForbiddenImplicitCalls", state, ForbiddenImplicitCalls$0(state) || ForbiddenImplicitCalls$1(state) || ForbiddenImplicitCalls$2(state) || ForbiddenImplicitCalls$3(state) || ForbiddenImplicitCalls$4(state) || ForbiddenImplicitCalls$5(state));
+        const result = $TOKEN("ForbiddenImplicitCalls", state, ForbiddenImplicitCalls$0(state) || ForbiddenImplicitCalls$1(state) || ForbiddenImplicitCalls$2(state) || ForbiddenImplicitCalls$3(state) || ForbiddenImplicitCalls$4(state));
         if (state.events)
           state.events.exit?.("ForbiddenImplicitCalls", state, result, eventData);
         return result;
       } else {
-        const result = ForbiddenImplicitCalls$0(state) || ForbiddenImplicitCalls$1(state) || ForbiddenImplicitCalls$2(state) || ForbiddenImplicitCalls$3(state) || ForbiddenImplicitCalls$4(state) || ForbiddenImplicitCalls$5(state);
+        const result = ForbiddenImplicitCalls$0(state) || ForbiddenImplicitCalls$1(state) || ForbiddenImplicitCalls$2(state) || ForbiddenImplicitCalls$3(state) || ForbiddenImplicitCalls$4(state);
         if (state.events)
           state.events.exit?.("ForbiddenImplicitCalls", state, result, eventData);
         return result;
@@ -5983,7 +5993,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var AccessModifier$0 = $TS($S($E($S($C(Public, Private, Protected), __)), $E($S(Readonly, __))), function($skip, $loc, $0, $1, $2) {
+    var AccessModifier$0 = $TS($S($E($S($C(Public, Private, Protected), NotDedented)), $E($S(Readonly, NotDedented))), function($skip, $loc, $0, $1, $2) {
       if (!($1 || $2))
         return $skip;
       return {
@@ -7739,9 +7749,11 @@ ${input.slice(result.pos)}
         async = [];
       if (!generator)
         generator = [];
+      const id = wid?.[1];
       return {
         type: "FunctionSignature",
-        id: wid?.[1],
+        id,
+        name: id?.name,
         parameters,
         returnType: suffix,
         ts: false,
@@ -7777,8 +7789,11 @@ ${input.slice(result.pos)}
       var signature = $1;
       var block = $2;
       if (!block) {
-        signature.ts = true;
-        return signature;
+        return {
+          ...signature,
+          type: "FunctionExpression",
+          ts: true
+        };
       }
       if (hasAwait(block) && !signature.async.length) {
         signature.async.push("async ");
@@ -13046,7 +13061,7 @@ ${input.slice(result.pos)}
       }
     }
     var ForbidClassImplicitCall$0 = $TV($EXPECT($L0, fail, 'ForbidClassImplicitCall ""'), function($skip, $loc, $0, $1) {
-      module2.forbidIndentedApplication.push(true);
+      module2.forbidClassImplicitCall.push(true);
     });
     function ForbidClassImplicitCall(state) {
       let eventData;
@@ -13071,7 +13086,7 @@ ${input.slice(result.pos)}
       }
     }
     var AllowClassImplicitCall$0 = $TV($EXPECT($L0, fail, 'AllowClassImplicitCall ""'), function($skip, $loc, $0, $1) {
-      module2.forbidIndentedApplication.push(false);
+      module2.forbidClassImplicitCall.push(false);
     });
     function AllowClassImplicitCall(state) {
       let eventData;
@@ -13096,7 +13111,7 @@ ${input.slice(result.pos)}
       }
     }
     var RestoreClassImplicitCall$0 = $TV($EXPECT($L0, fail, 'RestoreClassImplicitCall ""'), function($skip, $loc, $0, $1) {
-      module2.forbidIndentedApplication.pop();
+      module2.forbidClassImplicitCall.pop();
     });
     function RestoreClassImplicitCall(state) {
       let eventData;
@@ -13121,7 +13136,7 @@ ${input.slice(result.pos)}
       }
     }
     var ClassImplicitCallForbidden$0 = $TV($EXPECT($L0, fail, 'ClassImplicitCallForbidden ""'), function($skip, $loc, $0, $1) {
-      if (module2.classImplicitCallForbidden)
+      if (!module2.classImplicitCallForbidden)
         return $skip;
       return;
     });
@@ -20330,7 +20345,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var BasicInterfaceProperty$0 = $S($C(TypeIndexSignature, PropertyName), TypeSuffix, InterfacePropertyDelimiter);
+    var BasicInterfaceProperty$0 = $S($C(TypeIndexSignature, TypeProperty), $E(_), TypeSuffix, InterfacePropertyDelimiter);
     function BasicInterfaceProperty(state) {
       let eventData;
       if (state.events) {
@@ -20771,7 +20786,30 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R58, fail, "TypeIndexSignature /[+-]?/")), $EXPECT($L141, fail, 'TypeIndexSignature "readonly"'), __)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R59, fail, "TypeIndexSignature /[+-]/")), QuestionMark)));
+    var TypeProperty$0 = $S($E($S(Readonly, NotDedented)), PropertyName);
+    function TypeProperty(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("TypeProperty", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("TypeProperty", state, TypeProperty$0(state));
+        if (state.events)
+          state.events.exit?.("TypeProperty", state, result, eventData);
+        return result;
+      } else {
+        const result = TypeProperty$0(state);
+        if (state.events)
+          state.events.exit?.("TypeProperty", state, result, eventData);
+        return result;
+      }
+    }
+    var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R58, fail, "TypeIndexSignature /[+-]?/")), Readonly, NotDedented)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R59, fail, "TypeIndexSignature /[+-]/")), $Y($S($E(_), QuestionMark)))));
     function TypeIndexSignature(state) {
       let eventData;
       if (state.events) {
@@ -21455,7 +21493,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InlineBasicInterfaceProperty$0 = $S($C(TypeIndexSignature, PropertyName), $E(QuestionMark), Colon, Type, InlineInterfacePropertyDelimiter);
+    var InlineBasicInterfaceProperty$0 = $S($C(TypeIndexSignature, TypeProperty), $E(QuestionMark), Colon, Type, InlineInterfacePropertyDelimiter);
     function InlineBasicInterfaceProperty(state) {
       let eventData;
       if (state.events) {

package/dist/main.mjs

@@ -795,13 +795,14 @@ var require_lib = __commonJS({
     }
     function hoistRefDecs(statements) {
       gatherRecursiveAll(statements, (s) => s.hoistDec).forEach((node) => {
-        const { hoistDec } = node;
+        let { hoistDec, parent } = node;
         node.hoistDec = null;
-        while (node.parent?.type !== "BlockStatement") {
-          node = node.parent;
+        while (parent?.type !== "BlockStatement" || parent.bare && !parent.root) {
+          node = parent;
+          parent = node.parent;
         }
-        if (node.parent) {
-          insertHoistDec(node.parent, node, hoistDec);
+        if (parent) {
+          insertHoistDec(parent, node, hoistDec);
         } else {
           throw new Error("Couldn't find block to hoist declaration into.");
         }
@@ -1328,8 +1329,27 @@ var require_lib = __commonJS({
         thisAssignments
       };
     }
+    function implicitFunctionBlock(f) {
+      if (f.abstract || f.block)
+        return;
+      const { name, parent } = f;
+      const expressions = parent?.expressions ?? parent?.elements;
+      const currentIndex = expressions?.findIndex(([, def]) => def === f);
+      const following = currentIndex >= 0 && expressions[currentIndex + 1]?.[1];
+      if (f.type === following?.type && name && name === following.name) {
+        f.ts = true;
+      } else {
+        const block = makeEmptyBlock();
+        block.parent = f;
+        f.block = block;
+        f.children.push(block);
+        f.ts = false;
+      }
+    }
     function processFunctions(statements, config) {
       gatherRecursiveAll(statements, ({ type }) => type === "FunctionExpression" || type === "ArrowFunction").forEach((f) => {
+        if (f.type === "FunctionExpression")
+          implicitFunctionBlock(f);
         processParams(f);
         if (!processReturnValue(f) && config.implicitReturns) {
           const { block, returnType } = f;
@@ -1341,25 +1361,15 @@ 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);
-          }
-        }
+        implicitFunctionBlock(f);
         processParams(f);
         if (!processReturnValue(f) && config.implicitReturns) {
-          const { signature: signature2, block: block2 } = f;
-          const isConstructor = signature2.name === "constructor";
-          const isVoid = isVoidType(signature2.returnType?.t);
-          const isSet = signature2.modifier?.set;
+          const { signature, block } = f;
+          const isConstructor = signature.name === "constructor";
+          const isVoid = isVoidType(signature.returnType?.t);
+          const isSet = signature.modifier?.set;
           if (!isConstructor && !isSet && !isVoid) {
-            insertReturn(block2);
+            insertReturn(block);
           }
         }
       });
@@ -3454,6 +3464,7 @@ ${input.slice(result.pos)}
       NestedEnumProperties,
       NestedEnumProperty,
       EnumProperty,
+      TypeProperty,
       TypeIndexSignature,
       TypeIndex,
       TypeSuffix,
@@ -4253,10 +4264,9 @@ ${input.slice(result.pos)}
     }
     var ForbiddenImplicitCalls$0 = $R$0($EXPECT($R0, fail, "ForbiddenImplicitCalls /(as|of|satisfies|then|when|implements|xor|xnor)(?!\\p{ID_Continue}|[\\u200C\\u200D$])/"));
     var ForbiddenImplicitCalls$1 = $EXPECT($L1, fail, 'ForbiddenImplicitCalls "/ "');
-    var ForbiddenImplicitCalls$2 = $S(ClassImplicitCallForbidden, Class);
-    var ForbiddenImplicitCalls$3 = AtAt;
-    var ForbiddenImplicitCalls$4 = $S(Identifier, $EXPECT($L2, fail, 'ForbiddenImplicitCalls "="'), Whitespace);
-    var ForbiddenImplicitCalls$5 = $TS($S(Identifier, $N($EXPECT($L3, fail, 'ForbiddenImplicitCalls "("'))), function($skip, $loc, $0, $1, $2) {
+    var ForbiddenImplicitCalls$2 = $S(ClassImplicitCallForbidden, $C(Class, AtAt));
+    var ForbiddenImplicitCalls$3 = $S(Identifier, $EXPECT($L2, fail, 'ForbiddenImplicitCalls "="'), Whitespace);
+    var ForbiddenImplicitCalls$4 = $TS($S(Identifier, $N($EXPECT($L3, fail, 'ForbiddenImplicitCalls "("'))), function($skip, $loc, $0, $1, $2) {
       if (module.operators.has($1.name))
         return $1;
       return $skip;
@@ -4272,12 +4282,12 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("ForbiddenImplicitCalls", state, ForbiddenImplicitCalls$0(state) || ForbiddenImplicitCalls$1(state) || ForbiddenImplicitCalls$2(state) || ForbiddenImplicitCalls$3(state) || ForbiddenImplicitCalls$4(state) || ForbiddenImplicitCalls$5(state));
+        const result = $TOKEN("ForbiddenImplicitCalls", state, ForbiddenImplicitCalls$0(state) || ForbiddenImplicitCalls$1(state) || ForbiddenImplicitCalls$2(state) || ForbiddenImplicitCalls$3(state) || ForbiddenImplicitCalls$4(state));
         if (state.events)
           state.events.exit?.("ForbiddenImplicitCalls", state, result, eventData);
         return result;
       } else {
-        const result = ForbiddenImplicitCalls$0(state) || ForbiddenImplicitCalls$1(state) || ForbiddenImplicitCalls$2(state) || ForbiddenImplicitCalls$3(state) || ForbiddenImplicitCalls$4(state) || ForbiddenImplicitCalls$5(state);
+        const result = ForbiddenImplicitCalls$0(state) || ForbiddenImplicitCalls$1(state) || ForbiddenImplicitCalls$2(state) || ForbiddenImplicitCalls$3(state) || ForbiddenImplicitCalls$4(state);
         if (state.events)
           state.events.exit?.("ForbiddenImplicitCalls", state, result, eventData);
         return result;
@@ -5981,7 +5991,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var AccessModifier$0 = $TS($S($E($S($C(Public, Private, Protected), __)), $E($S(Readonly, __))), function($skip, $loc, $0, $1, $2) {
+    var AccessModifier$0 = $TS($S($E($S($C(Public, Private, Protected), NotDedented)), $E($S(Readonly, NotDedented))), function($skip, $loc, $0, $1, $2) {
       if (!($1 || $2))
         return $skip;
       return {
@@ -7737,9 +7747,11 @@ ${input.slice(result.pos)}
         async = [];
       if (!generator)
         generator = [];
+      const id = wid?.[1];
       return {
         type: "FunctionSignature",
-        id: wid?.[1],
+        id,
+        name: id?.name,
         parameters,
         returnType: suffix,
         ts: false,
@@ -7775,8 +7787,11 @@ ${input.slice(result.pos)}
       var signature = $1;
       var block = $2;
       if (!block) {
-        signature.ts = true;
-        return signature;
+        return {
+          ...signature,
+          type: "FunctionExpression",
+          ts: true
+        };
       }
       if (hasAwait(block) && !signature.async.length) {
         signature.async.push("async ");
@@ -13044,7 +13059,7 @@ ${input.slice(result.pos)}
       }
     }
     var ForbidClassImplicitCall$0 = $TV($EXPECT($L0, fail, 'ForbidClassImplicitCall ""'), function($skip, $loc, $0, $1) {
-      module.forbidIndentedApplication.push(true);
+      module.forbidClassImplicitCall.push(true);
     });
     function ForbidClassImplicitCall(state) {
       let eventData;
@@ -13069,7 +13084,7 @@ ${input.slice(result.pos)}
       }
     }
     var AllowClassImplicitCall$0 = $TV($EXPECT($L0, fail, 'AllowClassImplicitCall ""'), function($skip, $loc, $0, $1) {
-      module.forbidIndentedApplication.push(false);
+      module.forbidClassImplicitCall.push(false);
     });
     function AllowClassImplicitCall(state) {
       let eventData;
@@ -13094,7 +13109,7 @@ ${input.slice(result.pos)}
       }
     }
     var RestoreClassImplicitCall$0 = $TV($EXPECT($L0, fail, 'RestoreClassImplicitCall ""'), function($skip, $loc, $0, $1) {
-      module.forbidIndentedApplication.pop();
+      module.forbidClassImplicitCall.pop();
     });
     function RestoreClassImplicitCall(state) {
       let eventData;
@@ -13119,7 +13134,7 @@ ${input.slice(result.pos)}
       }
     }
     var ClassImplicitCallForbidden$0 = $TV($EXPECT($L0, fail, 'ClassImplicitCallForbidden ""'), function($skip, $loc, $0, $1) {
-      if (module.classImplicitCallForbidden)
+      if (!module.classImplicitCallForbidden)
         return $skip;
       return;
     });
@@ -20328,7 +20343,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var BasicInterfaceProperty$0 = $S($C(TypeIndexSignature, PropertyName), TypeSuffix, InterfacePropertyDelimiter);
+    var BasicInterfaceProperty$0 = $S($C(TypeIndexSignature, TypeProperty), $E(_), TypeSuffix, InterfacePropertyDelimiter);
     function BasicInterfaceProperty(state) {
       let eventData;
       if (state.events) {
@@ -20769,7 +20784,30 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R58, fail, "TypeIndexSignature /[+-]?/")), $EXPECT($L141, fail, 'TypeIndexSignature "readonly"'), __)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R59, fail, "TypeIndexSignature /[+-]/")), QuestionMark)));
+    var TypeProperty$0 = $S($E($S(Readonly, NotDedented)), PropertyName);
+    function TypeProperty(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("TypeProperty", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("TypeProperty", state, TypeProperty$0(state));
+        if (state.events)
+          state.events.exit?.("TypeProperty", state, result, eventData);
+        return result;
+      } else {
+        const result = TypeProperty$0(state);
+        if (state.events)
+          state.events.exit?.("TypeProperty", state, result, eventData);
+        return result;
+      }
+    }
+    var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R58, fail, "TypeIndexSignature /[+-]?/")), Readonly, NotDedented)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R59, fail, "TypeIndexSignature /[+-]/")), $Y($S($E(_), QuestionMark)))));
     function TypeIndexSignature(state) {
       let eventData;
       if (state.events) {
@@ -21453,7 +21491,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InlineBasicInterfaceProperty$0 = $S($C(TypeIndexSignature, PropertyName), $E(QuestionMark), Colon, Type, InlineInterfacePropertyDelimiter);
+    var InlineBasicInterfaceProperty$0 = $S($C(TypeIndexSignature, TypeProperty), $E(QuestionMark), Colon, Type, InlineInterfacePropertyDelimiter);
     function InlineBasicInterfaceProperty(state) {
       let eventData;
       if (state.events) {

package/package.json

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