@danielx/civet 0.6.48 → 0.6.49

package/dist/browser.js

@@ -506,6 +506,7 @@ ${input.slice(result.pos)}
           }
           return;
         }
+        node = node;
         node.parent = parent;
         if (node.children) {
           for (const child of node.children) {
@@ -524,6 +525,7 @@ ${input.slice(result.pos)}
           }
           return;
         }
+        node = node;
         if (parent != null)
           node.parent = parent;
         if (depth && node.children) {
@@ -532,20 +534,24 @@ ${input.slice(result.pos)}
           }
         }
       }
+      function makeNode(node) {
+        updateParentPointers(node);
+        return node;
+      }
       function addPostfixStatement(statement, ws, post) {
         const expressions = [
           ...post.blockPrefix || [],
           ["", statement]
         ];
-        const block = {
+        const block = makeNode({
           type: "BlockStatement",
           children: [" { ", expressions, " }"],
           expressions
-        };
+        });
         const children = [...post.children, block];
         if (!isWhitespaceOrEmpty(ws))
           children.push(ws);
-        post = { ...post, children, block };
+        post = makeNode({ ...post, children, block });
         if (post.type === "IfStatement") {
           post.then = block;
         }
@@ -659,6 +665,7 @@ ${input.slice(result.pos)}
             });
           }
           const expressions = [...prefixStatements, ...block.expressions];
+          addParentPointers(prefixStatements, block);
           block = {
             ...block,
             expressions,
@@ -668,6 +675,7 @@ ${input.slice(result.pos)}
             block.children = [[" {"], ...block.children, "}"];
             block.bare = false;
           }
+          updateParentPointers(block);
         }
         return block;
       }
@@ -685,10 +693,11 @@ ${input.slice(result.pos)}
           const { ref, body } = expr;
           ref.type = "PipedExpression";
           ref.children = [makeLeftHandSideExpression(arg)];
-          return {
+          updateParentPointers(ref);
+          return makeNode({
             type: "UnwrappedExpression",
             children: [skipIfOnlyWS(fn.leadingComment), body, skipIfOnlyWS(fn.trailingComment)]
-          };
+          });
         }
         expr = fn.expr;
         const lhs = makeLeftHandSideExpression(expr);
@@ -902,6 +911,7 @@ ${input.slice(result.pos)}
         if (subtype === "DoStatement") {
           insertReturn(block);
           children.splice(i, 1, ...wrapIIFE(["", statement, void 0], async));
+          updateParentPointers(exp);
           return;
         }
         const resultsRef = makeRef("results");
@@ -916,6 +926,7 @@ ${input.slice(result.pos)}
             ["", wrapWithReturn(resultsRef)]
           ], async)
         );
+        updateParentPointers(exp);
       }
       function processBinaryOpExpression($0) {
         const expandedOps = expandChainedComparisons($0);
@@ -1209,10 +1220,10 @@ ${input.slice(result.pos)}
       }
       function wrapWithReturn(expression) {
         const children = expression ? ["return ", expression] : ["return"];
-        return {
+        return makeNode({
           type: "ReturnStatement",
           children
-        };
+        });
       }
       function isExistence(exp) {
         if (exp.type === "ParenthesizedExpression" && exp.implicit) {
@@ -1507,6 +1518,7 @@ ${input.slice(result.pos)}
           const indent = expressions[index][0];
           expressions.splice(index, 0, [indent, dec, ";"]);
         }
+        addParentPointers(dec, block);
       }
       function patternAsValue(pattern) {
         switch (pattern.type) {
@@ -1585,7 +1597,8 @@ ${input.slice(result.pos)}
           case "Declaration":
             exp.children.push(["", {
               type: "ReturnStatement",
-              children: [";return ", patternAsValue(exp.bindings.at(-1).pattern)]
+              children: [";return ", patternAsValue(exp.bindings.at(-1).pattern)],
+              parent: exp
             }]);
             return;
           case "FunctionExpression":
@@ -1594,7 +1607,8 @@ ${input.slice(result.pos)}
                 "",
                 {
                   type: "ReturnStatement",
-                  children: [";return ", exp.id]
+                  children: [";return ", exp.id],
+                  parent: exp
                 }
               ]);
               return;
@@ -1616,7 +1630,8 @@ ${input.slice(result.pos)}
               exp.children.push(["", {
                 type: "ReturnStatement",
                 // NOTE: add a prefixed semi-colon because the if block may not be braced
-                children: [";return"]
+                children: [";return"],
+                parent: exp
               }]);
             return;
           case "PatternMatchingStatement":
@@ -2036,14 +2051,13 @@ ${input.slice(result.pos)}
           case "ThrowExpression":
           case "TryExpression":
             return expression;
-          default:
-            return {
-              type: "ParenthesizedExpression",
-              children: ["(", expression, ")"],
-              expression,
-              implicit: true
-            };
         }
+        return makeNode({
+          type: "ParenthesizedExpression",
+          children: ["(", expression, ")"],
+          expression,
+          implicit: true
+        });
       }
       function modifyString(str) {
         return str.replace(/(^.?|[^\\]{2})(\\\\)*\n/g, "$1$2\\n");
@@ -2250,7 +2264,7 @@ ${input.slice(result.pos)}
         splices = splices.map((s) => [", ", s]);
         thisAssignments = thisAssignments.map((a) => ["", a, ";"]);
         const initializer = [ws, assign, e];
-        const binding = {
+        const binding = makeNode({
           type: "Binding",
           pattern: id,
           initializer,
@@ -2258,9 +2272,9 @@ ${input.slice(result.pos)}
           suffix,
           thisAssignments,
           children: [id, suffix, initializer]
-        };
+        });
         const children = [decl, binding];
-        return {
+        return makeNode({
           type: "Declaration",
           names: id.names,
           decl,
@@ -2268,9 +2282,9 @@ ${input.slice(result.pos)}
           splices,
           thisAssignments,
           children
-        };
+        });
       }
-      function processDeclarationCondition(condition, rootCondition) {
+      function processDeclarationCondition(condition, rootCondition, parent) {
         if (!(condition.type === "DeclarationCondition")) {
           return;
         }
@@ -2289,6 +2303,7 @@ ${input.slice(result.pos)}
           pattern,
           ref
         });
+        addParentPointers(condition, parent);
         Object.assign(rootCondition, {
           blockPrefix: [
             ["", [decl, pattern, suffix, " = ", ref, ...splices], ";"],
@@ -2312,7 +2327,7 @@ ${input.slice(result.pos)}
           const type = [type1, type2];
           expression = expression2;
         }
-        processDeclarationCondition(expression, condition.expression);
+        processDeclarationCondition(expression, condition.expression, s);
         const { ref, pattern } = expression;
         if (pattern) {
           let conditions = [];
@@ -2362,10 +2377,12 @@ ${input.slice(result.pos)}
               parent: s
             };
             s.children[1] = s.condition;
+            updateParentPointers(s);
             const block = blockWithPrefix([["", [{
               type: "Declaration",
               children: ["let ", ...condition.expression.children]
             }], ";"], ...blockPrefix], makeEmptyBlock());
+            updateParentPointers(block, s.parent);
             replaceBlockExpression(s.parent, s, block);
             block.expressions.push(["", s]);
             s.parent = block;
@@ -3598,12 +3615,12 @@ ${input.slice(result.pos)}
             children: ["await "]
           };
         }
-        const block = {
+        const block = makeNode({
           type: "BlockStatement",
           expressions,
           children: ["{", expressions, "}"],
           bare: false
-        };
+        });
         const parameters = {
           type: "Parameters",
           children: ["()"],
@@ -3615,7 +3632,7 @@ ${input.slice(result.pos)}
           },
           returnType: void 0
         };
-        const fn = {
+        const fn = makeNode({
           type: "ArrowFunction",
           signature,
           parameters,
@@ -3624,12 +3641,11 @@ ${input.slice(result.pos)}
           async,
           block,
           children: [async, parameters, "=>", block]
-        };
-        updateParentPointers(block, fn);
-        const exp = {
+        });
+        const exp = makeNode({
           type: "CallExpression",
           children: [makeLeftHandSideExpression(fn), "()"]
-        };
+        });
         if (prefix) {
           return [makeLeftHandSideExpression([prefix, exp])];
         }

package/dist/main.js

@@ -498,6 +498,7 @@ var require_lib = __commonJS({
         }
         return;
       }
+      node = node;
       node.parent = parent;
       if (node.children) {
         for (const child of node.children) {
@@ -516,6 +517,7 @@ var require_lib = __commonJS({
         }
         return;
       }
+      node = node;
       if (parent != null)
         node.parent = parent;
       if (depth && node.children) {
@@ -524,20 +526,24 @@ var require_lib = __commonJS({
         }
       }
     }
+    function makeNode(node) {
+      updateParentPointers(node);
+      return node;
+    }
     function addPostfixStatement(statement, ws, post) {
       const expressions = [
         ...post.blockPrefix || [],
         ["", statement]
       ];
-      const block = {
+      const block = makeNode({
         type: "BlockStatement",
         children: [" { ", expressions, " }"],
         expressions
-      };
+      });
       const children = [...post.children, block];
       if (!isWhitespaceOrEmpty(ws))
         children.push(ws);
-      post = { ...post, children, block };
+      post = makeNode({ ...post, children, block });
       if (post.type === "IfStatement") {
         post.then = block;
       }
@@ -651,6 +657,7 @@ var require_lib = __commonJS({
           });
         }
         const expressions = [...prefixStatements, ...block.expressions];
+        addParentPointers(prefixStatements, block);
         block = {
           ...block,
           expressions,
@@ -660,6 +667,7 @@ var require_lib = __commonJS({
           block.children = [[" {"], ...block.children, "}"];
           block.bare = false;
         }
+        updateParentPointers(block);
       }
       return block;
     }
@@ -677,10 +685,11 @@ var require_lib = __commonJS({
         const { ref, body } = expr;
         ref.type = "PipedExpression";
         ref.children = [makeLeftHandSideExpression(arg)];
-        return {
+        updateParentPointers(ref);
+        return makeNode({
           type: "UnwrappedExpression",
           children: [skipIfOnlyWS(fn.leadingComment), body, skipIfOnlyWS(fn.trailingComment)]
-        };
+        });
       }
       expr = fn.expr;
       const lhs = makeLeftHandSideExpression(expr);
@@ -894,6 +903,7 @@ var require_lib = __commonJS({
       if (subtype === "DoStatement") {
         insertReturn(block);
         children.splice(i, 1, ...wrapIIFE(["", statement, void 0], async));
+        updateParentPointers(exp);
         return;
       }
       const resultsRef = makeRef("results");
@@ -908,6 +918,7 @@ var require_lib = __commonJS({
           ["", wrapWithReturn(resultsRef)]
         ], async)
       );
+      updateParentPointers(exp);
     }
     function processBinaryOpExpression($0) {
       const expandedOps = expandChainedComparisons($0);
@@ -1201,10 +1212,10 @@ var require_lib = __commonJS({
     }
     function wrapWithReturn(expression) {
       const children = expression ? ["return ", expression] : ["return"];
-      return {
+      return makeNode({
         type: "ReturnStatement",
         children
-      };
+      });
     }
     function isExistence(exp) {
       if (exp.type === "ParenthesizedExpression" && exp.implicit) {
@@ -1499,6 +1510,7 @@ var require_lib = __commonJS({
         const indent = expressions[index][0];
         expressions.splice(index, 0, [indent, dec, ";"]);
       }
+      addParentPointers(dec, block);
     }
     function patternAsValue(pattern) {
       switch (pattern.type) {
@@ -1577,7 +1589,8 @@ var require_lib = __commonJS({
         case "Declaration":
           exp.children.push(["", {
             type: "ReturnStatement",
-            children: [";return ", patternAsValue(exp.bindings.at(-1).pattern)]
+            children: [";return ", patternAsValue(exp.bindings.at(-1).pattern)],
+            parent: exp
           }]);
           return;
         case "FunctionExpression":
@@ -1586,7 +1599,8 @@ var require_lib = __commonJS({
               "",
               {
                 type: "ReturnStatement",
-                children: [";return ", exp.id]
+                children: [";return ", exp.id],
+                parent: exp
               }
             ]);
             return;
@@ -1608,7 +1622,8 @@ var require_lib = __commonJS({
             exp.children.push(["", {
               type: "ReturnStatement",
               // NOTE: add a prefixed semi-colon because the if block may not be braced
-              children: [";return"]
+              children: [";return"],
+              parent: exp
             }]);
           return;
         case "PatternMatchingStatement":
@@ -2028,14 +2043,13 @@ var require_lib = __commonJS({
         case "ThrowExpression":
         case "TryExpression":
           return expression;
-        default:
-          return {
-            type: "ParenthesizedExpression",
-            children: ["(", expression, ")"],
-            expression,
-            implicit: true
-          };
       }
+      return makeNode({
+        type: "ParenthesizedExpression",
+        children: ["(", expression, ")"],
+        expression,
+        implicit: true
+      });
     }
     function modifyString(str) {
       return str.replace(/(^.?|[^\\]{2})(\\\\)*\n/g, "$1$2\\n");
@@ -2242,7 +2256,7 @@ var require_lib = __commonJS({
       splices = splices.map((s) => [", ", s]);
       thisAssignments = thisAssignments.map((a) => ["", a, ";"]);
       const initializer = [ws, assign, e];
-      const binding = {
+      const binding = makeNode({
         type: "Binding",
         pattern: id,
         initializer,
@@ -2250,9 +2264,9 @@ var require_lib = __commonJS({
         suffix,
         thisAssignments,
         children: [id, suffix, initializer]
-      };
+      });
       const children = [decl, binding];
-      return {
+      return makeNode({
         type: "Declaration",
         names: id.names,
         decl,
@@ -2260,9 +2274,9 @@ var require_lib = __commonJS({
         splices,
         thisAssignments,
         children
-      };
+      });
     }
-    function processDeclarationCondition(condition, rootCondition) {
+    function processDeclarationCondition(condition, rootCondition, parent) {
       if (!(condition.type === "DeclarationCondition")) {
         return;
       }
@@ -2281,6 +2295,7 @@ var require_lib = __commonJS({
         pattern,
         ref
       });
+      addParentPointers(condition, parent);
       Object.assign(rootCondition, {
         blockPrefix: [
           ["", [decl, pattern, suffix, " = ", ref, ...splices], ";"],
@@ -2304,7 +2319,7 @@ var require_lib = __commonJS({
         const type = [type1, type2];
         expression = expression2;
       }
-      processDeclarationCondition(expression, condition.expression);
+      processDeclarationCondition(expression, condition.expression, s);
       const { ref, pattern } = expression;
       if (pattern) {
         let conditions = [];
@@ -2354,10 +2369,12 @@ var require_lib = __commonJS({
             parent: s
           };
           s.children[1] = s.condition;
+          updateParentPointers(s);
           const block = blockWithPrefix([["", [{
             type: "Declaration",
             children: ["let ", ...condition.expression.children]
           }], ";"], ...blockPrefix], makeEmptyBlock());
+          updateParentPointers(block, s.parent);
           replaceBlockExpression(s.parent, s, block);
           block.expressions.push(["", s]);
           s.parent = block;
@@ -3590,12 +3607,12 @@ var require_lib = __commonJS({
           children: ["await "]
         };
       }
-      const block = {
+      const block = makeNode({
         type: "BlockStatement",
         expressions,
         children: ["{", expressions, "}"],
         bare: false
-      };
+      });
       const parameters = {
         type: "Parameters",
         children: ["()"],
@@ -3607,7 +3624,7 @@ var require_lib = __commonJS({
         },
         returnType: void 0
       };
-      const fn = {
+      const fn = makeNode({
         type: "ArrowFunction",
         signature,
         parameters,
@@ -3616,12 +3633,11 @@ var require_lib = __commonJS({
         async,
         block,
         children: [async, parameters, "=>", block]
-      };
-      updateParentPointers(block, fn);
-      const exp = {
+      });
+      const exp = makeNode({
         type: "CallExpression",
         children: [makeLeftHandSideExpression(fn), "()"]
-      };
+      });
       if (prefix) {
         return [makeLeftHandSideExpression([prefix, exp])];
       }

package/dist/main.mjs

@@ -496,6 +496,7 @@ var require_lib = __commonJS({
         }
         return;
       }
+      node = node;
       node.parent = parent;
       if (node.children) {
         for (const child of node.children) {
@@ -514,6 +515,7 @@ var require_lib = __commonJS({
         }
         return;
       }
+      node = node;
       if (parent != null)
         node.parent = parent;
       if (depth && node.children) {
@@ -522,20 +524,24 @@ var require_lib = __commonJS({
         }
       }
     }
+    function makeNode(node) {
+      updateParentPointers(node);
+      return node;
+    }
     function addPostfixStatement(statement, ws, post) {
       const expressions = [
         ...post.blockPrefix || [],
         ["", statement]
       ];
-      const block = {
+      const block = makeNode({
         type: "BlockStatement",
         children: [" { ", expressions, " }"],
         expressions
-      };
+      });
       const children = [...post.children, block];
       if (!isWhitespaceOrEmpty(ws))
         children.push(ws);
-      post = { ...post, children, block };
+      post = makeNode({ ...post, children, block });
       if (post.type === "IfStatement") {
         post.then = block;
       }
@@ -649,6 +655,7 @@ var require_lib = __commonJS({
           });
         }
         const expressions = [...prefixStatements, ...block.expressions];
+        addParentPointers(prefixStatements, block);
         block = {
           ...block,
           expressions,
@@ -658,6 +665,7 @@ var require_lib = __commonJS({
           block.children = [[" {"], ...block.children, "}"];
           block.bare = false;
         }
+        updateParentPointers(block);
       }
       return block;
     }
@@ -675,10 +683,11 @@ var require_lib = __commonJS({
         const { ref, body } = expr;
         ref.type = "PipedExpression";
         ref.children = [makeLeftHandSideExpression(arg)];
-        return {
+        updateParentPointers(ref);
+        return makeNode({
           type: "UnwrappedExpression",
           children: [skipIfOnlyWS(fn.leadingComment), body, skipIfOnlyWS(fn.trailingComment)]
-        };
+        });
       }
       expr = fn.expr;
       const lhs = makeLeftHandSideExpression(expr);
@@ -892,6 +901,7 @@ var require_lib = __commonJS({
       if (subtype === "DoStatement") {
         insertReturn(block);
         children.splice(i, 1, ...wrapIIFE(["", statement, void 0], async));
+        updateParentPointers(exp);
         return;
       }
       const resultsRef = makeRef("results");
@@ -906,6 +916,7 @@ var require_lib = __commonJS({
           ["", wrapWithReturn(resultsRef)]
         ], async)
       );
+      updateParentPointers(exp);
     }
     function processBinaryOpExpression($0) {
       const expandedOps = expandChainedComparisons($0);
@@ -1199,10 +1210,10 @@ var require_lib = __commonJS({
     }
     function wrapWithReturn(expression) {
       const children = expression ? ["return ", expression] : ["return"];
-      return {
+      return makeNode({
         type: "ReturnStatement",
         children
-      };
+      });
     }
     function isExistence(exp) {
       if (exp.type === "ParenthesizedExpression" && exp.implicit) {
@@ -1497,6 +1508,7 @@ var require_lib = __commonJS({
         const indent = expressions[index][0];
         expressions.splice(index, 0, [indent, dec, ";"]);
       }
+      addParentPointers(dec, block);
     }
     function patternAsValue(pattern) {
       switch (pattern.type) {
@@ -1575,7 +1587,8 @@ var require_lib = __commonJS({
         case "Declaration":
           exp.children.push(["", {
             type: "ReturnStatement",
-            children: [";return ", patternAsValue(exp.bindings.at(-1).pattern)]
+            children: [";return ", patternAsValue(exp.bindings.at(-1).pattern)],
+            parent: exp
           }]);
           return;
         case "FunctionExpression":
@@ -1584,7 +1597,8 @@ var require_lib = __commonJS({
               "",
               {
                 type: "ReturnStatement",
-                children: [";return ", exp.id]
+                children: [";return ", exp.id],
+                parent: exp
               }
             ]);
             return;
@@ -1606,7 +1620,8 @@ var require_lib = __commonJS({
             exp.children.push(["", {
               type: "ReturnStatement",
               // NOTE: add a prefixed semi-colon because the if block may not be braced
-              children: [";return"]
+              children: [";return"],
+              parent: exp
             }]);
           return;
         case "PatternMatchingStatement":
@@ -2026,14 +2041,13 @@ var require_lib = __commonJS({
         case "ThrowExpression":
         case "TryExpression":
           return expression;
-        default:
-          return {
-            type: "ParenthesizedExpression",
-            children: ["(", expression, ")"],
-            expression,
-            implicit: true
-          };
       }
+      return makeNode({
+        type: "ParenthesizedExpression",
+        children: ["(", expression, ")"],
+        expression,
+        implicit: true
+      });
     }
     function modifyString(str) {
       return str.replace(/(^.?|[^\\]{2})(\\\\)*\n/g, "$1$2\\n");
@@ -2240,7 +2254,7 @@ var require_lib = __commonJS({
       splices = splices.map((s) => [", ", s]);
       thisAssignments = thisAssignments.map((a) => ["", a, ";"]);
       const initializer = [ws, assign, e];
-      const binding = {
+      const binding = makeNode({
         type: "Binding",
         pattern: id,
         initializer,
@@ -2248,9 +2262,9 @@ var require_lib = __commonJS({
         suffix,
         thisAssignments,
         children: [id, suffix, initializer]
-      };
+      });
       const children = [decl, binding];
-      return {
+      return makeNode({
         type: "Declaration",
         names: id.names,
         decl,
@@ -2258,9 +2272,9 @@ var require_lib = __commonJS({
         splices,
         thisAssignments,
         children
-      };
+      });
     }
-    function processDeclarationCondition(condition, rootCondition) {
+    function processDeclarationCondition(condition, rootCondition, parent) {
       if (!(condition.type === "DeclarationCondition")) {
         return;
       }
@@ -2279,6 +2293,7 @@ var require_lib = __commonJS({
         pattern,
         ref
       });
+      addParentPointers(condition, parent);
       Object.assign(rootCondition, {
         blockPrefix: [
           ["", [decl, pattern, suffix, " = ", ref, ...splices], ";"],
@@ -2302,7 +2317,7 @@ var require_lib = __commonJS({
         const type = [type1, type2];
         expression = expression2;
       }
-      processDeclarationCondition(expression, condition.expression);
+      processDeclarationCondition(expression, condition.expression, s);
       const { ref, pattern } = expression;
       if (pattern) {
         let conditions = [];
@@ -2352,10 +2367,12 @@ var require_lib = __commonJS({
             parent: s
           };
           s.children[1] = s.condition;
+          updateParentPointers(s);
           const block = blockWithPrefix([["", [{
             type: "Declaration",
             children: ["let ", ...condition.expression.children]
           }], ";"], ...blockPrefix], makeEmptyBlock());
+          updateParentPointers(block, s.parent);
           replaceBlockExpression(s.parent, s, block);
           block.expressions.push(["", s]);
           s.parent = block;
@@ -3588,12 +3605,12 @@ var require_lib = __commonJS({
           children: ["await "]
         };
       }
-      const block = {
+      const block = makeNode({
         type: "BlockStatement",
         expressions,
         children: ["{", expressions, "}"],
         bare: false
-      };
+      });
       const parameters = {
         type: "Parameters",
         children: ["()"],
@@ -3605,7 +3622,7 @@ var require_lib = __commonJS({
         },
         returnType: void 0
       };
-      const fn = {
+      const fn = makeNode({
         type: "ArrowFunction",
         signature,
         parameters,
@@ -3614,12 +3631,11 @@ var require_lib = __commonJS({
         async,
         block,
         children: [async, parameters, "=>", block]
-      };
-      updateParentPointers(block, fn);
-      const exp = {
+      });
+      const exp = makeNode({
         type: "CallExpression",
         children: [makeLeftHandSideExpression(fn), "()"]
-      };
+      });
       if (prefix) {
         return [makeLeftHandSideExpression([prefix, exp])];
       }

package/package.json

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