@danielx/civet 0.6.4 → 0.6.6

package/dist/browser.js

@@ -193,13 +193,6 @@ var Civet = (() => {
         }
         return block;
       }
-      function closest(node, types) {
-        do {
-          if (types.includes(node.type)) {
-            return node;
-          }
-        } while (node = node.parent);
-      }
       function clone(node) {
         removeParentPointers(node);
         return deepCopy(node);
@@ -436,8 +429,26 @@ var Civet = (() => {
         for (let i = 0; i < children.length; i++) {
           const glob = children[i];
           if (glob?.type === "PropertyGlob") {
-            const prefix = children.slice(0, i).concat(glob.dot);
+            let prefix = children.slice(0, i);
             const parts = [];
+            let hoistDec, refAssignment = [];
+            if (prefix.length > 1) {
+              const ref = {
+                type: "Ref",
+                base: "ref"
+              };
+              hoistDec = {
+                type: "Declaration",
+                children: ["let ", ref],
+                names: []
+              };
+              refAssignment = [{
+                type: "AssignmentExpression",
+                children: [ref, " = ", prefix]
+              }, ","];
+              prefix = [ref];
+            }
+            prefix = prefix.concat(glob.dot);
             for (const part of glob.object.properties) {
               if (part.type === "MethodDefinition") {
                 throw new Error("Glob pattern cannot have method definition");
@@ -480,11 +491,13 @@ var Civet = (() => {
             const object = {
               type: "ObjectExpression",
               children: [
+                ...refAssignment,
                 glob.object.children[0],
                 ...parts,
                 glob.object.children.at(-1)
               ],
-              properties: parts
+              properties: parts,
+              hoistDec
             };
             if (i === children.length - 1)
               return object;
@@ -786,29 +799,26 @@ var Civet = (() => {
       function hoistRefDecs(statements) {
         gatherRecursiveAll(statements, (s) => s.hoistDec).forEach((node) => {
           const { hoistDec } = node;
-          let outer = closest(node, ["IfStatement", "IterationStatement"]);
-          if (!outer) {
-            node.children.push({
-              type: "Error",
-              message: "Can't hoist declarations inside expressions yet."
-            });
-            return;
-          }
-          let block = outer.parent;
-          if (block.type === "PatternMatchingStatement") {
-            outer = block;
-            block = block.parent;
-          }
-          const { expressions } = block;
-          const index = expressions.findIndex(([, s]) => outer === s);
-          if (index < 0)
-            throw new Error("Couldn't find expression in block for hoistable declaration.");
-          const indent = expressions[index][0];
-          hoistDec[0][0] = indent;
-          expressions.splice(index, 0, hoistDec);
           node.hoistDec = null;
+          while (node.parent?.type !== "BlockStatement") {
+            node = node.parent;
+          }
+          if (node.parent) {
+            insertHoistDec(node.parent, node, hoistDec);
+          } else {
+            throw new Error("Couldn't find block to hoist declaration into.");
+          }
+          return;
         });
       }
+      function insertHoistDec(block, node, dec) {
+        const { expressions } = block;
+        const index = expressions.findIndex(([, s]) => node === s);
+        if (index < 0)
+          throw new Error("Couldn't find expression in block for hoistable declaration.");
+        const indent = expressions[index][0];
+        expressions.splice(index, 0, [indent, dec, ";"]);
+      }
       function insertReturn(node) {
         if (!node)
           return;
@@ -1726,8 +1736,18 @@ var Civet = (() => {
           if (expression.type === "ParenthesizedExpression") {
             expression = expression.expression;
           }
-          let ref = needsRef(expression, "m") || expression;
-          let hoistDec = ref !== expression ? [["", ["const ", ref, " = ", expression], ";"]] : void 0;
+          let hoistDec, refAssignment = [], ref = needsRef(expression, "m") || expression;
+          if (ref !== expression) {
+            hoistDec = {
+              type: "Declaration",
+              children: ["let ", ref],
+              names: []
+            };
+            refAssignment = [{
+              type: "AssignmentExpression",
+              children: [ref, " = ", expression]
+            }, ","];
+          }
           let prev = [], root = prev;
           const l = clauses.length;
           clauses.forEach((c, i) => {
@@ -1755,7 +1775,7 @@ var Civet = (() => {
             });
             const condition = {
               type: "ParenthesizedExpression",
-              children: ["(", conditionExpression, ")"],
+              children: ["(", ...refAssignment, conditionExpression, ")"],
               expression: conditionExpression
             };
             const prefix = [];
@@ -1794,6 +1814,7 @@ var Civet = (() => {
               hoistDec
             }]);
             hoistDec = void 0;
+            refAssignment = [];
             prev = next;
           });
           if (s.type === "SwitchExpression") {
@@ -2442,6 +2463,7 @@ var Civet = (() => {
         literalValue,
         makeAsConst,
         makeLeftHandSideExpression,
+        maybeRef,
         modifyString,
         needsRef,
         processBinaryOpExpression,
@@ -6309,11 +6331,11 @@ ${input.slice(result.pos)}
       }
       var MemberBracketContent$0 = $TS($S(OpenBracket, $C(SliceParameters, PostfixedExpression), __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
         var open = $1;
-        var exp = $2;
+        var expression = $2;
         var ws = $3;
         var close = $4;
-        if (exp.type === "SliceParameters") {
-          const { start, end, children } = exp;
+        if (expression.type === "SliceParameters") {
+          const { start, end, children } = expression;
           return {
             type: "SliceExpression",
             start,
@@ -6327,7 +6349,8 @@ ${input.slice(result.pos)}
         }
         return {
           type: "Index",
-          children: $0
+          children: $0,
+          expression
         };
       });
       var MemberBracketContent$1 = $TS($S(Dot, $C(TemplateLiteral, StringLiteral)), function($skip, $loc, $0, $1, $2) {
@@ -9718,12 +9741,40 @@ ${input.slice(result.pos)}
         const last = lastAccessInCallExpression(value);
         if (!last)
           return $skip;
-        let name;
-        if (last.type === "Index") {
-          name = {
-            type: "ComputedPropertyName",
-            children: last.children
-          };
+        let name, hoistDec, ref, refAssignment;
+        const { expression, type } = last;
+        if (type === "Index") {
+          ref = maybeRef(expression);
+          if (ref !== expression) {
+            hoistDec = {
+              type: "Declaration",
+              children: ["let ", ref]
+            };
+            refAssignment = {
+              type: "Assignment",
+              children: [ref, " = ", expression]
+            };
+            name = {
+              type: "ComputedPropertyName",
+              children: [last.children[0], "(", refAssignment, ",", ref, ")", ...last.children.slice(-2)]
+            };
+            value = {
+              ...value,
+              children: value.children.map((c) => {
+                if (c === last)
+                  return {
+                    type: "Index",
+                    children: ["[", ref, "]"]
+                  };
+                return c;
+              })
+            };
+          } else {
+            name = {
+              type: "ComputedPropertyName",
+              children: last.children
+            };
+          }
         } else {
           ({ name } = last);
           if (!name)
@@ -9734,7 +9785,8 @@ ${input.slice(result.pos)}
           children: [ws, name, ": ", value],
           name,
           value,
-          names: []
+          names: [],
+          hoistDec
         };
       });
       function PropertyDefinition(state) {
@@ -12882,7 +12934,11 @@ ${input.slice(result.pos)}
         const initCondition = {
           type: "AssignmentExpression",
           children: [ref, " ", initializer],
-          hoistDec: [["", ["let ", ref], ";"]],
+          hoistDec: {
+            type: "Declaration",
+            children: ["let ", ref],
+            names: []
+          },
           blockPrefix: [
             ["", [binding, "= ", ref, ...splices], ";"],
             ...thisAssignments
@@ -23350,6 +23406,7 @@ ${input.slice(result.pos)}
         lastAccessInCallExpression,
         literalValue,
         makeLeftHandSideExpression,
+        maybeRef,
         modifyString,
         processBinaryOpExpression,
         processCallMemberExpression,

package/dist/main.js

@@ -192,13 +192,6 @@ var require_lib = __commonJS({
       }
       return block;
     }
-    function closest(node, types) {
-      do {
-        if (types.includes(node.type)) {
-          return node;
-        }
-      } while (node = node.parent);
-    }
     function clone(node) {
       removeParentPointers(node);
       return deepCopy(node);
@@ -435,8 +428,26 @@ var require_lib = __commonJS({
       for (let i = 0; i < children.length; i++) {
         const glob = children[i];
         if (glob?.type === "PropertyGlob") {
-          const prefix = children.slice(0, i).concat(glob.dot);
+          let prefix = children.slice(0, i);
           const parts = [];
+          let hoistDec, refAssignment = [];
+          if (prefix.length > 1) {
+            const ref = {
+              type: "Ref",
+              base: "ref"
+            };
+            hoistDec = {
+              type: "Declaration",
+              children: ["let ", ref],
+              names: []
+            };
+            refAssignment = [{
+              type: "AssignmentExpression",
+              children: [ref, " = ", prefix]
+            }, ","];
+            prefix = [ref];
+          }
+          prefix = prefix.concat(glob.dot);
           for (const part of glob.object.properties) {
             if (part.type === "MethodDefinition") {
               throw new Error("Glob pattern cannot have method definition");
@@ -479,11 +490,13 @@ var require_lib = __commonJS({
           const object = {
             type: "ObjectExpression",
             children: [
+              ...refAssignment,
               glob.object.children[0],
               ...parts,
               glob.object.children.at(-1)
             ],
-            properties: parts
+            properties: parts,
+            hoistDec
           };
           if (i === children.length - 1)
             return object;
@@ -785,29 +798,26 @@ var require_lib = __commonJS({
     function hoistRefDecs(statements) {
       gatherRecursiveAll(statements, (s) => s.hoistDec).forEach((node) => {
         const { hoistDec } = node;
-        let outer = closest(node, ["IfStatement", "IterationStatement"]);
-        if (!outer) {
-          node.children.push({
-            type: "Error",
-            message: "Can't hoist declarations inside expressions yet."
-          });
-          return;
-        }
-        let block = outer.parent;
-        if (block.type === "PatternMatchingStatement") {
-          outer = block;
-          block = block.parent;
-        }
-        const { expressions } = block;
-        const index = expressions.findIndex(([, s]) => outer === s);
-        if (index < 0)
-          throw new Error("Couldn't find expression in block for hoistable declaration.");
-        const indent = expressions[index][0];
-        hoistDec[0][0] = indent;
-        expressions.splice(index, 0, hoistDec);
         node.hoistDec = null;
+        while (node.parent?.type !== "BlockStatement") {
+          node = node.parent;
+        }
+        if (node.parent) {
+          insertHoistDec(node.parent, node, hoistDec);
+        } else {
+          throw new Error("Couldn't find block to hoist declaration into.");
+        }
+        return;
       });
     }
+    function insertHoistDec(block, node, dec) {
+      const { expressions } = block;
+      const index = expressions.findIndex(([, s]) => node === s);
+      if (index < 0)
+        throw new Error("Couldn't find expression in block for hoistable declaration.");
+      const indent = expressions[index][0];
+      expressions.splice(index, 0, [indent, dec, ";"]);
+    }
     function insertReturn(node) {
       if (!node)
         return;
@@ -1725,8 +1735,18 @@ var require_lib = __commonJS({
         if (expression.type === "ParenthesizedExpression") {
           expression = expression.expression;
         }
-        let ref = needsRef(expression, "m") || expression;
-        let hoistDec = ref !== expression ? [["", ["const ", ref, " = ", expression], ";"]] : void 0;
+        let hoistDec, refAssignment = [], ref = needsRef(expression, "m") || expression;
+        if (ref !== expression) {
+          hoistDec = {
+            type: "Declaration",
+            children: ["let ", ref],
+            names: []
+          };
+          refAssignment = [{
+            type: "AssignmentExpression",
+            children: [ref, " = ", expression]
+          }, ","];
+        }
         let prev = [], root = prev;
         const l = clauses.length;
         clauses.forEach((c, i) => {
@@ -1754,7 +1774,7 @@ var require_lib = __commonJS({
           });
           const condition = {
             type: "ParenthesizedExpression",
-            children: ["(", conditionExpression, ")"],
+            children: ["(", ...refAssignment, conditionExpression, ")"],
             expression: conditionExpression
           };
           const prefix = [];
@@ -1793,6 +1813,7 @@ var require_lib = __commonJS({
             hoistDec
           }]);
           hoistDec = void 0;
+          refAssignment = [];
           prev = next;
         });
         if (s.type === "SwitchExpression") {
@@ -2441,6 +2462,7 @@ var require_lib = __commonJS({
       literalValue,
       makeAsConst,
       makeLeftHandSideExpression,
+      maybeRef,
       modifyString,
       needsRef,
       processBinaryOpExpression,
@@ -6308,11 +6330,11 @@ ${input.slice(result.pos)}
     }
     var MemberBracketContent$0 = $TS($S(OpenBracket, $C(SliceParameters, PostfixedExpression), __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
       var open = $1;
-      var exp = $2;
+      var expression = $2;
       var ws = $3;
       var close = $4;
-      if (exp.type === "SliceParameters") {
-        const { start, end, children } = exp;
+      if (expression.type === "SliceParameters") {
+        const { start, end, children } = expression;
         return {
           type: "SliceExpression",
           start,
@@ -6326,7 +6348,8 @@ ${input.slice(result.pos)}
       }
       return {
         type: "Index",
-        children: $0
+        children: $0,
+        expression
       };
     });
     var MemberBracketContent$1 = $TS($S(Dot, $C(TemplateLiteral, StringLiteral)), function($skip, $loc, $0, $1, $2) {
@@ -9717,12 +9740,40 @@ ${input.slice(result.pos)}
       const last = lastAccessInCallExpression(value);
       if (!last)
         return $skip;
-      let name;
-      if (last.type === "Index") {
-        name = {
-          type: "ComputedPropertyName",
-          children: last.children
-        };
+      let name, hoistDec, ref, refAssignment;
+      const { expression, type } = last;
+      if (type === "Index") {
+        ref = maybeRef(expression);
+        if (ref !== expression) {
+          hoistDec = {
+            type: "Declaration",
+            children: ["let ", ref]
+          };
+          refAssignment = {
+            type: "Assignment",
+            children: [ref, " = ", expression]
+          };
+          name = {
+            type: "ComputedPropertyName",
+            children: [last.children[0], "(", refAssignment, ",", ref, ")", ...last.children.slice(-2)]
+          };
+          value = {
+            ...value,
+            children: value.children.map((c) => {
+              if (c === last)
+                return {
+                  type: "Index",
+                  children: ["[", ref, "]"]
+                };
+              return c;
+            })
+          };
+        } else {
+          name = {
+            type: "ComputedPropertyName",
+            children: last.children
+          };
+        }
       } else {
         ({ name } = last);
         if (!name)
@@ -9733,7 +9784,8 @@ ${input.slice(result.pos)}
         children: [ws, name, ": ", value],
         name,
         value,
-        names: []
+        names: [],
+        hoistDec
       };
     });
     function PropertyDefinition(state) {
@@ -12881,7 +12933,11 @@ ${input.slice(result.pos)}
       const initCondition = {
         type: "AssignmentExpression",
         children: [ref, " ", initializer],
-        hoistDec: [["", ["let ", ref], ";"]],
+        hoistDec: {
+          type: "Declaration",
+          children: ["let ", ref],
+          names: []
+        },
         blockPrefix: [
           ["", [binding, "= ", ref, ...splices], ";"],
           ...thisAssignments
@@ -23349,6 +23405,7 @@ ${input.slice(result.pos)}
       lastAccessInCallExpression,
       literalValue,
       makeLeftHandSideExpression,
+      maybeRef,
       modifyString,
       processBinaryOpExpression,
       processCallMemberExpression,

package/dist/main.mjs

@@ -190,13 +190,6 @@ var require_lib = __commonJS({
       }
       return block;
     }
-    function closest(node, types) {
-      do {
-        if (types.includes(node.type)) {
-          return node;
-        }
-      } while (node = node.parent);
-    }
     function clone(node) {
       removeParentPointers(node);
       return deepCopy(node);
@@ -433,8 +426,26 @@ var require_lib = __commonJS({
       for (let i = 0; i < children.length; i++) {
         const glob = children[i];
         if (glob?.type === "PropertyGlob") {
-          const prefix = children.slice(0, i).concat(glob.dot);
+          let prefix = children.slice(0, i);
           const parts = [];
+          let hoistDec, refAssignment = [];
+          if (prefix.length > 1) {
+            const ref = {
+              type: "Ref",
+              base: "ref"
+            };
+            hoistDec = {
+              type: "Declaration",
+              children: ["let ", ref],
+              names: []
+            };
+            refAssignment = [{
+              type: "AssignmentExpression",
+              children: [ref, " = ", prefix]
+            }, ","];
+            prefix = [ref];
+          }
+          prefix = prefix.concat(glob.dot);
           for (const part of glob.object.properties) {
             if (part.type === "MethodDefinition") {
               throw new Error("Glob pattern cannot have method definition");
@@ -477,11 +488,13 @@ var require_lib = __commonJS({
           const object = {
             type: "ObjectExpression",
             children: [
+              ...refAssignment,
               glob.object.children[0],
               ...parts,
               glob.object.children.at(-1)
             ],
-            properties: parts
+            properties: parts,
+            hoistDec
           };
           if (i === children.length - 1)
             return object;
@@ -783,29 +796,26 @@ var require_lib = __commonJS({
     function hoistRefDecs(statements) {
       gatherRecursiveAll(statements, (s) => s.hoistDec).forEach((node) => {
         const { hoistDec } = node;
-        let outer = closest(node, ["IfStatement", "IterationStatement"]);
-        if (!outer) {
-          node.children.push({
-            type: "Error",
-            message: "Can't hoist declarations inside expressions yet."
-          });
-          return;
-        }
-        let block = outer.parent;
-        if (block.type === "PatternMatchingStatement") {
-          outer = block;
-          block = block.parent;
-        }
-        const { expressions } = block;
-        const index = expressions.findIndex(([, s]) => outer === s);
-        if (index < 0)
-          throw new Error("Couldn't find expression in block for hoistable declaration.");
-        const indent = expressions[index][0];
-        hoistDec[0][0] = indent;
-        expressions.splice(index, 0, hoistDec);
         node.hoistDec = null;
+        while (node.parent?.type !== "BlockStatement") {
+          node = node.parent;
+        }
+        if (node.parent) {
+          insertHoistDec(node.parent, node, hoistDec);
+        } else {
+          throw new Error("Couldn't find block to hoist declaration into.");
+        }
+        return;
       });
     }
+    function insertHoistDec(block, node, dec) {
+      const { expressions } = block;
+      const index = expressions.findIndex(([, s]) => node === s);
+      if (index < 0)
+        throw new Error("Couldn't find expression in block for hoistable declaration.");
+      const indent = expressions[index][0];
+      expressions.splice(index, 0, [indent, dec, ";"]);
+    }
     function insertReturn(node) {
       if (!node)
         return;
@@ -1723,8 +1733,18 @@ var require_lib = __commonJS({
         if (expression.type === "ParenthesizedExpression") {
           expression = expression.expression;
         }
-        let ref = needsRef(expression, "m") || expression;
-        let hoistDec = ref !== expression ? [["", ["const ", ref, " = ", expression], ";"]] : void 0;
+        let hoistDec, refAssignment = [], ref = needsRef(expression, "m") || expression;
+        if (ref !== expression) {
+          hoistDec = {
+            type: "Declaration",
+            children: ["let ", ref],
+            names: []
+          };
+          refAssignment = [{
+            type: "AssignmentExpression",
+            children: [ref, " = ", expression]
+          }, ","];
+        }
         let prev = [], root = prev;
         const l = clauses.length;
         clauses.forEach((c, i) => {
@@ -1752,7 +1772,7 @@ var require_lib = __commonJS({
           });
           const condition = {
             type: "ParenthesizedExpression",
-            children: ["(", conditionExpression, ")"],
+            children: ["(", ...refAssignment, conditionExpression, ")"],
             expression: conditionExpression
           };
           const prefix = [];
@@ -1791,6 +1811,7 @@ var require_lib = __commonJS({
             hoistDec
           }]);
           hoistDec = void 0;
+          refAssignment = [];
           prev = next;
         });
         if (s.type === "SwitchExpression") {
@@ -2439,6 +2460,7 @@ var require_lib = __commonJS({
       literalValue,
       makeAsConst,
       makeLeftHandSideExpression,
+      maybeRef,
       modifyString,
       needsRef,
       processBinaryOpExpression,
@@ -6306,11 +6328,11 @@ ${input.slice(result.pos)}
     }
     var MemberBracketContent$0 = $TS($S(OpenBracket, $C(SliceParameters, PostfixedExpression), __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
       var open = $1;
-      var exp = $2;
+      var expression = $2;
       var ws = $3;
       var close = $4;
-      if (exp.type === "SliceParameters") {
-        const { start, end, children } = exp;
+      if (expression.type === "SliceParameters") {
+        const { start, end, children } = expression;
         return {
           type: "SliceExpression",
           start,
@@ -6324,7 +6346,8 @@ ${input.slice(result.pos)}
       }
       return {
         type: "Index",
-        children: $0
+        children: $0,
+        expression
       };
     });
     var MemberBracketContent$1 = $TS($S(Dot, $C(TemplateLiteral, StringLiteral)), function($skip, $loc, $0, $1, $2) {
@@ -9715,12 +9738,40 @@ ${input.slice(result.pos)}
       const last = lastAccessInCallExpression(value);
       if (!last)
         return $skip;
-      let name;
-      if (last.type === "Index") {
-        name = {
-          type: "ComputedPropertyName",
-          children: last.children
-        };
+      let name, hoistDec, ref, refAssignment;
+      const { expression, type } = last;
+      if (type === "Index") {
+        ref = maybeRef(expression);
+        if (ref !== expression) {
+          hoistDec = {
+            type: "Declaration",
+            children: ["let ", ref]
+          };
+          refAssignment = {
+            type: "Assignment",
+            children: [ref, " = ", expression]
+          };
+          name = {
+            type: "ComputedPropertyName",
+            children: [last.children[0], "(", refAssignment, ",", ref, ")", ...last.children.slice(-2)]
+          };
+          value = {
+            ...value,
+            children: value.children.map((c) => {
+              if (c === last)
+                return {
+                  type: "Index",
+                  children: ["[", ref, "]"]
+                };
+              return c;
+            })
+          };
+        } else {
+          name = {
+            type: "ComputedPropertyName",
+            children: last.children
+          };
+        }
       } else {
         ({ name } = last);
         if (!name)
@@ -9731,7 +9782,8 @@ ${input.slice(result.pos)}
         children: [ws, name, ": ", value],
         name,
         value,
-        names: []
+        names: [],
+        hoistDec
       };
     });
     function PropertyDefinition(state) {
@@ -12879,7 +12931,11 @@ ${input.slice(result.pos)}
       const initCondition = {
         type: "AssignmentExpression",
         children: [ref, " ", initializer],
-        hoistDec: [["", ["let ", ref], ";"]],
+        hoistDec: {
+          type: "Declaration",
+          children: ["let ", ref],
+          names: []
+        },
         blockPrefix: [
           ["", [binding, "= ", ref, ...splices], ";"],
           ...thisAssignments
@@ -23347,6 +23403,7 @@ ${input.slice(result.pos)}
       lastAccessInCallExpression,
       literalValue,
       makeLeftHandSideExpression,
+      maybeRef,
       modifyString,
       processBinaryOpExpression,
       processCallMemberExpression,

package/package.json

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