@danielx/civet 0.6.15 → 0.6.16

package/dist/browser.js

@@ -745,12 +745,15 @@ var Civet = (() => {
         }
       }
       function findAncestor(node, predicate, stopPredicate) {
-        node = node.parent;
-        while (node && !stopPredicate?.(node)) {
-          if (predicate(node))
-            return node;
-          node = node.parent;
+        let { parent } = node;
+        while (parent && !stopPredicate?.(parent, node)) {
+          if (predicate(parent, node)) {
+            return { ancestor: parent, child: node };
+          }
+          node = parent;
+          parent = node.parent;
         }
+        return { ancestor: void 0, child: node };
       }
       function gatherNodes(node, predicate) {
         if (node == null)
@@ -823,14 +826,11 @@ var Civet = (() => {
       }
       function hoistRefDecs(statements) {
         gatherRecursiveAll(statements, (s) => s.hoistDec).forEach((node) => {
-          let { hoistDec, parent } = node;
+          let { hoistDec } = node;
           node.hoistDec = null;
-          while (parent?.type !== "BlockStatement" || parent.bare && !parent.root) {
-            node = parent;
-            parent = node.parent;
-          }
-          if (parent) {
-            insertHoistDec(parent, node, hoistDec);
+          const { ancestor, child } = findAncestor(node, (ancestor2) => ancestor2.type === "BlockStatement" && (!ancestor2.bare || ancestor2.root));
+          if (ancestor) {
+            insertHoistDec(ancestor, child, hoistDec);
           } else {
             throw new Error("Couldn't find block to hoist declaration into.");
           }
@@ -1370,6 +1370,8 @@ var Civet = (() => {
         if (f.abstract || f.block || f.signature?.optional)
           return;
         const { name, parent } = f;
+        if (parent?.type === "ExportDeclaration")
+          return;
         const expressions = parent?.expressions ?? parent?.elements;
         const currentIndex = expressions?.findIndex(([, def]) => def === f);
         const following = currentIndex >= 0 && expressions[currentIndex + 1]?.[1];
@@ -2227,7 +2229,7 @@ var Civet = (() => {
         let declared;
         values.forEach((value) => {
           value.children = [ref];
-          const ancestor = findAncestor(
+          const { ancestor } = findAncestor(
             value,
             ({ type }) => type === "Declaration",
             isFunction
@@ -14732,14 +14734,15 @@ ${input.slice(result.pos)}
         }
       }
       var ExportDeclaration$0 = $TS($S($E(Decorators), Export, __, Default, __, $C(HoistableDeclaration, ClassDeclaration, ExtendedExpression)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
-        return { type: "ExportDeclaration", children: $0 };
+        var declaration = $6;
+        return { type: "ExportDeclaration", declaration, children: $0 };
       });
       var ExportDeclaration$1 = $TS($S(Export, __, ExportFromClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         return { type: "ExportDeclaration", ts: $3.ts, children: $0 };
       });
       var ExportDeclaration$2 = $TS($S($E(Decorators), Export, __, $C(Declaration, VariableStatement, TypeAndNamedExports, ExportVarDec)), function($skip, $loc, $0, $1, $2, $3, $4) {
-        var decl = $4;
-        return { type: "ExportDeclaration", ts: decl.ts, children: $0 };
+        var declaration = $4;
+        return { type: "ExportDeclaration", declaration, ts: declaration.ts, children: $0 };
       });
       function ExportDeclaration(state) {
         let eventData;

package/dist/main.js

@@ -744,12 +744,15 @@ var require_lib = __commonJS({
       }
     }
     function findAncestor(node, predicate, stopPredicate) {
-      node = node.parent;
-      while (node && !stopPredicate?.(node)) {
-        if (predicate(node))
-          return node;
-        node = node.parent;
+      let { parent } = node;
+      while (parent && !stopPredicate?.(parent, node)) {
+        if (predicate(parent, node)) {
+          return { ancestor: parent, child: node };
+        }
+        node = parent;
+        parent = node.parent;
       }
+      return { ancestor: void 0, child: node };
     }
     function gatherNodes(node, predicate) {
       if (node == null)
@@ -822,14 +825,11 @@ var require_lib = __commonJS({
     }
     function hoistRefDecs(statements) {
       gatherRecursiveAll(statements, (s) => s.hoistDec).forEach((node) => {
-        let { hoistDec, parent } = node;
+        let { hoistDec } = node;
         node.hoistDec = null;
-        while (parent?.type !== "BlockStatement" || parent.bare && !parent.root) {
-          node = parent;
-          parent = node.parent;
-        }
-        if (parent) {
-          insertHoistDec(parent, node, hoistDec);
+        const { ancestor, child } = findAncestor(node, (ancestor2) => ancestor2.type === "BlockStatement" && (!ancestor2.bare || ancestor2.root));
+        if (ancestor) {
+          insertHoistDec(ancestor, child, hoistDec);
         } else {
           throw new Error("Couldn't find block to hoist declaration into.");
         }
@@ -1369,6 +1369,8 @@ var require_lib = __commonJS({
       if (f.abstract || f.block || f.signature?.optional)
         return;
       const { name, parent } = f;
+      if (parent?.type === "ExportDeclaration")
+        return;
       const expressions = parent?.expressions ?? parent?.elements;
       const currentIndex = expressions?.findIndex(([, def]) => def === f);
       const following = currentIndex >= 0 && expressions[currentIndex + 1]?.[1];
@@ -2226,7 +2228,7 @@ var require_lib = __commonJS({
       let declared;
       values.forEach((value) => {
         value.children = [ref];
-        const ancestor = findAncestor(
+        const { ancestor } = findAncestor(
           value,
           ({ type }) => type === "Declaration",
           isFunction
@@ -14731,14 +14733,15 @@ ${input.slice(result.pos)}
       }
     }
     var ExportDeclaration$0 = $TS($S($E(Decorators), Export, __, Default, __, $C(HoistableDeclaration, ClassDeclaration, ExtendedExpression)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
-      return { type: "ExportDeclaration", children: $0 };
+      var declaration = $6;
+      return { type: "ExportDeclaration", declaration, children: $0 };
     });
     var ExportDeclaration$1 = $TS($S(Export, __, ExportFromClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       return { type: "ExportDeclaration", ts: $3.ts, children: $0 };
     });
     var ExportDeclaration$2 = $TS($S($E(Decorators), Export, __, $C(Declaration, VariableStatement, TypeAndNamedExports, ExportVarDec)), function($skip, $loc, $0, $1, $2, $3, $4) {
-      var decl = $4;
-      return { type: "ExportDeclaration", ts: decl.ts, children: $0 };
+      var declaration = $4;
+      return { type: "ExportDeclaration", declaration, ts: declaration.ts, children: $0 };
     });
     function ExportDeclaration(state) {
       let eventData;

package/dist/main.mjs

@@ -742,12 +742,15 @@ var require_lib = __commonJS({
       }
     }
     function findAncestor(node, predicate, stopPredicate) {
-      node = node.parent;
-      while (node && !stopPredicate?.(node)) {
-        if (predicate(node))
-          return node;
-        node = node.parent;
+      let { parent } = node;
+      while (parent && !stopPredicate?.(parent, node)) {
+        if (predicate(parent, node)) {
+          return { ancestor: parent, child: node };
+        }
+        node = parent;
+        parent = node.parent;
       }
+      return { ancestor: void 0, child: node };
     }
     function gatherNodes(node, predicate) {
       if (node == null)
@@ -820,14 +823,11 @@ var require_lib = __commonJS({
     }
     function hoistRefDecs(statements) {
       gatherRecursiveAll(statements, (s) => s.hoistDec).forEach((node) => {
-        let { hoistDec, parent } = node;
+        let { hoistDec } = node;
         node.hoistDec = null;
-        while (parent?.type !== "BlockStatement" || parent.bare && !parent.root) {
-          node = parent;
-          parent = node.parent;
-        }
-        if (parent) {
-          insertHoistDec(parent, node, hoistDec);
+        const { ancestor, child } = findAncestor(node, (ancestor2) => ancestor2.type === "BlockStatement" && (!ancestor2.bare || ancestor2.root));
+        if (ancestor) {
+          insertHoistDec(ancestor, child, hoistDec);
         } else {
           throw new Error("Couldn't find block to hoist declaration into.");
         }
@@ -1367,6 +1367,8 @@ var require_lib = __commonJS({
       if (f.abstract || f.block || f.signature?.optional)
         return;
       const { name, parent } = f;
+      if (parent?.type === "ExportDeclaration")
+        return;
       const expressions = parent?.expressions ?? parent?.elements;
       const currentIndex = expressions?.findIndex(([, def]) => def === f);
       const following = currentIndex >= 0 && expressions[currentIndex + 1]?.[1];
@@ -2224,7 +2226,7 @@ var require_lib = __commonJS({
       let declared;
       values.forEach((value) => {
         value.children = [ref];
-        const ancestor = findAncestor(
+        const { ancestor } = findAncestor(
           value,
           ({ type }) => type === "Declaration",
           isFunction
@@ -14729,14 +14731,15 @@ ${input.slice(result.pos)}
       }
     }
     var ExportDeclaration$0 = $TS($S($E(Decorators), Export, __, Default, __, $C(HoistableDeclaration, ClassDeclaration, ExtendedExpression)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
-      return { type: "ExportDeclaration", children: $0 };
+      var declaration = $6;
+      return { type: "ExportDeclaration", declaration, children: $0 };
     });
     var ExportDeclaration$1 = $TS($S(Export, __, ExportFromClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       return { type: "ExportDeclaration", ts: $3.ts, children: $0 };
     });
     var ExportDeclaration$2 = $TS($S($E(Decorators), Export, __, $C(Declaration, VariableStatement, TypeAndNamedExports, ExportVarDec)), function($skip, $loc, $0, $1, $2, $3, $4) {
-      var decl = $4;
-      return { type: "ExportDeclaration", ts: decl.ts, children: $0 };
+      var declaration = $4;
+      return { type: "ExportDeclaration", declaration, ts: declaration.ts, children: $0 };
     });
     function ExportDeclaration(state) {
       let eventData;

package/package.json

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