@danielx/civet 0.6.35 → 0.6.36

package/dist/browser.js

@@ -526,23 +526,16 @@ ${input.slice(result.pos)}
         }
       }
       function addPostfixStatement(statement, ws, post) {
-        let children, expressions;
-        const prefix = post.blockPrefix || post.condition?.expression.blockPrefix;
-        if (prefix?.length) {
-          const indent = prefix[0][0];
-          expressions = [...prefix, [indent, statement]];
-          children = [" {\n", ...expressions, "\n", indent?.slice?.(0, -2), "}"];
-        } else {
-          expressions = [["", statement]];
-          children = [" { ", ...expressions, " }"];
-        }
+        const expressions = [
+          ...post.blockPrefix || [],
+          ["", statement]
+        ];
         const block = {
           type: "BlockStatement",
-          children,
+          children: [" { ", expressions, " }"],
           expressions
         };
-        children = [...post.children];
-        children.push(block);
+        const children = [...post.children, block];
         if (!isWhitespaceOrEmpty(ws))
           children.push(ws);
         post = { ...post, children, block };
@@ -2118,6 +2111,81 @@ ${input.slice(result.pos)}
           children
         };
       }
+      function processDeclarationCondition(condition) {
+        if (!(condition.type === "DeclarationCondition")) {
+          return;
+        }
+        const ref = makeRef();
+        const { decl, bindings } = condition.declaration;
+        const binding = bindings[0];
+        const { pattern, suffix, initializer, splices, thisAssignments } = binding;
+        const initCondition = {
+          type: "AssignmentExpression",
+          children: [ref, initializer],
+          hoistDec: {
+            type: "Declaration",
+            children: ["let ", ref, suffix],
+            names: []
+          },
+          blockPrefix: [
+            ["", [decl, pattern, suffix, " = ", ref, ...splices], ";"],
+            ...thisAssignments
+          ],
+          pattern,
+          ref
+        };
+        Object.assign(condition, initCondition);
+      }
+      function processDeclarationConditions(node) {
+        gatherRecursiveAll(node, (n) => {
+          return n.type === "IfStatement" || n.type === "IterationStatement";
+        }).forEach(processDeclarationConditionStatement);
+      }
+      function processDeclarationConditionStatement(s) {
+        const { condition } = s;
+        if (!condition) {
+          return;
+        }
+        processDeclarationCondition(condition.expression);
+        const { ref, pattern } = condition.expression;
+        if (pattern) {
+          let conditions = [];
+          getPatternConditions(pattern, ref, conditions);
+          conditions = conditions.filter((c) => {
+            return !(c.length === 3 && c[0] === "typeof " && c[1] === ref && c[2] === " === 'object'") && !(c.length === 2 && c[0] === ref && c[1] === " != null");
+          });
+          if (conditions.length) {
+            condition.children.unshift("(");
+            conditions.forEach(function(c) {
+              return condition.children.push(" && ", c);
+            });
+            condition.children.push(")");
+          }
+        }
+        switch (s.type) {
+          case "IfStatement": {
+            const { else: e } = s;
+            const block = blockWithPrefix(condition.expression.blockPrefix, s.then);
+            s.then = block;
+            const toAdd = [block];
+            if (block.bare && e) {
+              toAdd.push(";");
+            }
+            s.children.splice(2, 1, ...toAdd);
+            updateParentPointers(block, s);
+            break;
+          }
+          case "IterationStatement": {
+            const { children, block } = s;
+            const newBlock = blockWithPrefix(condition.expression.blockPrefix, block);
+            s.children = children.map(function(c) {
+              return c.type === "BlockStatement" ? newBlock : c;
+            });
+            updateParentPointers(newBlock, s);
+            break;
+          }
+        }
+      }
       function implicitFunctionBlock(f) {
         if (f.abstract || f.block || f.signature?.optional)
           return;
@@ -2791,6 +2859,7 @@ ${input.slice(result.pos)}
         assert.equal(m.JSXTagStack.length, 1, "JSXTagStack");
         addParentPointers(root);
         const { expressions: statements } = root;
+        processDeclarationConditions(statements);
         processPipelineExpressions(statements);
         processAssignments(statements);
         processPatternMatching(statements, ReservedWord);
@@ -8096,16 +8165,10 @@ ${input.slice(result.pos)}
         var clause = $1;
         var block = $2;
         var e = $3;
-        const children = [...clause.children];
-        block = blockWithPrefix(clause.condition.expression.blockPrefix, block);
-        children.push(block);
-        if (block.bare && e)
-          children.push(";");
-        if (e)
-          children.push(e);
         return {
-          ...clause,
-          children,
+          type: "IfStatement",
+          children: [...clause.children, block, e],
+          condition: clause.condition,
           then: block,
           else: e
         };
@@ -8328,7 +8391,6 @@ ${input.slice(result.pos)}
       var WhileStatement$0 = $TS($S(WhileClause, Block), function($skip, $loc, $0, $1, $2) {
         var clause = $1;
         var block = $2;
-        block = blockWithPrefix(clause.condition.expression.blockPrefix, block);
         return {
           ...clause,
           children: [...clause.children, block],
@@ -8947,27 +9009,13 @@ ${input.slice(result.pos)}
         return $EVENT_C(ctx, state, "Condition", Condition$$);
       }
       var DeclarationCondition$0 = $TS($S(ForbidIndentedApplication, $E(LexicalDeclaration), RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3) {
-        var dec = $2;
-        if (!dec)
+        var declaration = $2;
+        if (!declaration)
           return $skip;
-        const ref = makeRef();
-        const { decl, bindings } = dec;
-        const binding = bindings[0];
-        const { pattern, suffix, initializer, splices, thisAssignments } = binding;
-        const initCondition = {
-          type: "AssignmentExpression",
-          children: [ref, initializer],
-          hoistDec: {
-            type: "Declaration",
-            children: ["let ", ref, suffix],
-            names: []
-          },
-          blockPrefix: [
-            ["", [decl, pattern, suffix, " = ", ref, ...splices], ";"],
-            ...thisAssignments
-          ]
+        return {
+          type: "DeclarationCondition",
+          declaration
         };
-        return initCondition;
       });
       function DeclarationCondition(ctx, state) {
         return $EVENT(ctx, state, "DeclarationCondition", DeclarationCondition$0);

package/dist/main.js

@@ -525,23 +525,16 @@ var require_lib = __commonJS({
       }
     }
     function addPostfixStatement(statement, ws, post) {
-      let children, expressions;
-      const prefix = post.blockPrefix || post.condition?.expression.blockPrefix;
-      if (prefix?.length) {
-        const indent = prefix[0][0];
-        expressions = [...prefix, [indent, statement]];
-        children = [" {\n", ...expressions, "\n", indent?.slice?.(0, -2), "}"];
-      } else {
-        expressions = [["", statement]];
-        children = [" { ", ...expressions, " }"];
-      }
+      const expressions = [
+        ...post.blockPrefix || [],
+        ["", statement]
+      ];
       const block = {
         type: "BlockStatement",
-        children,
+        children: [" { ", expressions, " }"],
         expressions
       };
-      children = [...post.children];
-      children.push(block);
+      const children = [...post.children, block];
       if (!isWhitespaceOrEmpty(ws))
         children.push(ws);
       post = { ...post, children, block };
@@ -2117,6 +2110,81 @@ var require_lib = __commonJS({
         children
       };
     }
+    function processDeclarationCondition(condition) {
+      if (!(condition.type === "DeclarationCondition")) {
+        return;
+      }
+      const ref = makeRef();
+      const { decl, bindings } = condition.declaration;
+      const binding = bindings[0];
+      const { pattern, suffix, initializer, splices, thisAssignments } = binding;
+      const initCondition = {
+        type: "AssignmentExpression",
+        children: [ref, initializer],
+        hoistDec: {
+          type: "Declaration",
+          children: ["let ", ref, suffix],
+          names: []
+        },
+        blockPrefix: [
+          ["", [decl, pattern, suffix, " = ", ref, ...splices], ";"],
+          ...thisAssignments
+        ],
+        pattern,
+        ref
+      };
+      Object.assign(condition, initCondition);
+    }
+    function processDeclarationConditions(node) {
+      gatherRecursiveAll(node, (n) => {
+        return n.type === "IfStatement" || n.type === "IterationStatement";
+      }).forEach(processDeclarationConditionStatement);
+    }
+    function processDeclarationConditionStatement(s) {
+      const { condition } = s;
+      if (!condition) {
+        return;
+      }
+      processDeclarationCondition(condition.expression);
+      const { ref, pattern } = condition.expression;
+      if (pattern) {
+        let conditions = [];
+        getPatternConditions(pattern, ref, conditions);
+        conditions = conditions.filter((c) => {
+          return !(c.length === 3 && c[0] === "typeof " && c[1] === ref && c[2] === " === 'object'") && !(c.length === 2 && c[0] === ref && c[1] === " != null");
+        });
+        if (conditions.length) {
+          condition.children.unshift("(");
+          conditions.forEach(function(c) {
+            return condition.children.push(" && ", c);
+          });
+          condition.children.push(")");
+        }
+      }
+      switch (s.type) {
+        case "IfStatement": {
+          const { else: e } = s;
+          const block = blockWithPrefix(condition.expression.blockPrefix, s.then);
+          s.then = block;
+          const toAdd = [block];
+          if (block.bare && e) {
+            toAdd.push(";");
+          }
+          s.children.splice(2, 1, ...toAdd);
+          updateParentPointers(block, s);
+          break;
+        }
+        case "IterationStatement": {
+          const { children, block } = s;
+          const newBlock = blockWithPrefix(condition.expression.blockPrefix, block);
+          s.children = children.map(function(c) {
+            return c.type === "BlockStatement" ? newBlock : c;
+          });
+          updateParentPointers(newBlock, s);
+          break;
+        }
+      }
+    }
     function implicitFunctionBlock(f) {
       if (f.abstract || f.block || f.signature?.optional)
         return;
@@ -2790,6 +2858,7 @@ var require_lib = __commonJS({
       assert.equal(m.JSXTagStack.length, 1, "JSXTagStack");
       addParentPointers(root);
       const { expressions: statements } = root;
+      processDeclarationConditions(statements);
       processPipelineExpressions(statements);
       processAssignments(statements);
       processPatternMatching(statements, ReservedWord);
@@ -8095,16 +8164,10 @@ var require_parser = __commonJS({
       var clause = $1;
       var block = $2;
       var e = $3;
-      const children = [...clause.children];
-      block = blockWithPrefix(clause.condition.expression.blockPrefix, block);
-      children.push(block);
-      if (block.bare && e)
-        children.push(";");
-      if (e)
-        children.push(e);
       return {
-        ...clause,
-        children,
+        type: "IfStatement",
+        children: [...clause.children, block, e],
+        condition: clause.condition,
         then: block,
         else: e
       };
@@ -8327,7 +8390,6 @@ var require_parser = __commonJS({
     var WhileStatement$0 = $TS($S(WhileClause, Block), function($skip, $loc, $0, $1, $2) {
       var clause = $1;
       var block = $2;
-      block = blockWithPrefix(clause.condition.expression.blockPrefix, block);
       return {
         ...clause,
         children: [...clause.children, block],
@@ -8946,27 +9008,13 @@ var require_parser = __commonJS({
       return $EVENT_C(ctx, state, "Condition", Condition$$);
     }
     var DeclarationCondition$0 = $TS($S(ForbidIndentedApplication, $E(LexicalDeclaration), RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3) {
-      var dec = $2;
-      if (!dec)
+      var declaration = $2;
+      if (!declaration)
         return $skip;
-      const ref = makeRef();
-      const { decl, bindings } = dec;
-      const binding = bindings[0];
-      const { pattern, suffix, initializer, splices, thisAssignments } = binding;
-      const initCondition = {
-        type: "AssignmentExpression",
-        children: [ref, initializer],
-        hoistDec: {
-          type: "Declaration",
-          children: ["let ", ref, suffix],
-          names: []
-        },
-        blockPrefix: [
-          ["", [decl, pattern, suffix, " = ", ref, ...splices], ";"],
-          ...thisAssignments
-        ]
+      return {
+        type: "DeclarationCondition",
+        declaration
       };
-      return initCondition;
     });
     function DeclarationCondition(ctx, state) {
       return $EVENT(ctx, state, "DeclarationCondition", DeclarationCondition$0);

package/dist/main.mjs

@@ -523,23 +523,16 @@ var require_lib = __commonJS({
       }
     }
     function addPostfixStatement(statement, ws, post) {
-      let children, expressions;
-      const prefix = post.blockPrefix || post.condition?.expression.blockPrefix;
-      if (prefix?.length) {
-        const indent = prefix[0][0];
-        expressions = [...prefix, [indent, statement]];
-        children = [" {\n", ...expressions, "\n", indent?.slice?.(0, -2), "}"];
-      } else {
-        expressions = [["", statement]];
-        children = [" { ", ...expressions, " }"];
-      }
+      const expressions = [
+        ...post.blockPrefix || [],
+        ["", statement]
+      ];
       const block = {
         type: "BlockStatement",
-        children,
+        children: [" { ", expressions, " }"],
         expressions
       };
-      children = [...post.children];
-      children.push(block);
+      const children = [...post.children, block];
       if (!isWhitespaceOrEmpty(ws))
         children.push(ws);
       post = { ...post, children, block };
@@ -2115,6 +2108,81 @@ var require_lib = __commonJS({
         children
       };
     }
+    function processDeclarationCondition(condition) {
+      if (!(condition.type === "DeclarationCondition")) {
+        return;
+      }
+      const ref = makeRef();
+      const { decl, bindings } = condition.declaration;
+      const binding = bindings[0];
+      const { pattern, suffix, initializer, splices, thisAssignments } = binding;
+      const initCondition = {
+        type: "AssignmentExpression",
+        children: [ref, initializer],
+        hoistDec: {
+          type: "Declaration",
+          children: ["let ", ref, suffix],
+          names: []
+        },
+        blockPrefix: [
+          ["", [decl, pattern, suffix, " = ", ref, ...splices], ";"],
+          ...thisAssignments
+        ],
+        pattern,
+        ref
+      };
+      Object.assign(condition, initCondition);
+    }
+    function processDeclarationConditions(node) {
+      gatherRecursiveAll(node, (n) => {
+        return n.type === "IfStatement" || n.type === "IterationStatement";
+      }).forEach(processDeclarationConditionStatement);
+    }
+    function processDeclarationConditionStatement(s) {
+      const { condition } = s;
+      if (!condition) {
+        return;
+      }
+      processDeclarationCondition(condition.expression);
+      const { ref, pattern } = condition.expression;
+      if (pattern) {
+        let conditions = [];
+        getPatternConditions(pattern, ref, conditions);
+        conditions = conditions.filter((c) => {
+          return !(c.length === 3 && c[0] === "typeof " && c[1] === ref && c[2] === " === 'object'") && !(c.length === 2 && c[0] === ref && c[1] === " != null");
+        });
+        if (conditions.length) {
+          condition.children.unshift("(");
+          conditions.forEach(function(c) {
+            return condition.children.push(" && ", c);
+          });
+          condition.children.push(")");
+        }
+      }
+      switch (s.type) {
+        case "IfStatement": {
+          const { else: e } = s;
+          const block = blockWithPrefix(condition.expression.blockPrefix, s.then);
+          s.then = block;
+          const toAdd = [block];
+          if (block.bare && e) {
+            toAdd.push(";");
+          }
+          s.children.splice(2, 1, ...toAdd);
+          updateParentPointers(block, s);
+          break;
+        }
+        case "IterationStatement": {
+          const { children, block } = s;
+          const newBlock = blockWithPrefix(condition.expression.blockPrefix, block);
+          s.children = children.map(function(c) {
+            return c.type === "BlockStatement" ? newBlock : c;
+          });
+          updateParentPointers(newBlock, s);
+          break;
+        }
+      }
+    }
     function implicitFunctionBlock(f) {
       if (f.abstract || f.block || f.signature?.optional)
         return;
@@ -2788,6 +2856,7 @@ var require_lib = __commonJS({
       assert.equal(m.JSXTagStack.length, 1, "JSXTagStack");
       addParentPointers(root);
       const { expressions: statements } = root;
+      processDeclarationConditions(statements);
       processPipelineExpressions(statements);
       processAssignments(statements);
       processPatternMatching(statements, ReservedWord);
@@ -8093,16 +8162,10 @@ var require_parser = __commonJS({
       var clause = $1;
       var block = $2;
       var e = $3;
-      const children = [...clause.children];
-      block = blockWithPrefix(clause.condition.expression.blockPrefix, block);
-      children.push(block);
-      if (block.bare && e)
-        children.push(";");
-      if (e)
-        children.push(e);
       return {
-        ...clause,
-        children,
+        type: "IfStatement",
+        children: [...clause.children, block, e],
+        condition: clause.condition,
         then: block,
         else: e
       };
@@ -8325,7 +8388,6 @@ var require_parser = __commonJS({
     var WhileStatement$0 = $TS($S(WhileClause, Block), function($skip, $loc, $0, $1, $2) {
       var clause = $1;
       var block = $2;
-      block = blockWithPrefix(clause.condition.expression.blockPrefix, block);
       return {
         ...clause,
         children: [...clause.children, block],
@@ -8944,27 +9006,13 @@ var require_parser = __commonJS({
       return $EVENT_C(ctx, state, "Condition", Condition$$);
     }
     var DeclarationCondition$0 = $TS($S(ForbidIndentedApplication, $E(LexicalDeclaration), RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3) {
-      var dec = $2;
-      if (!dec)
+      var declaration = $2;
+      if (!declaration)
         return $skip;
-      const ref = makeRef();
-      const { decl, bindings } = dec;
-      const binding = bindings[0];
-      const { pattern, suffix, initializer, splices, thisAssignments } = binding;
-      const initCondition = {
-        type: "AssignmentExpression",
-        children: [ref, initializer],
-        hoistDec: {
-          type: "Declaration",
-          children: ["let ", ref, suffix],
-          names: []
-        },
-        blockPrefix: [
-          ["", [decl, pattern, suffix, " = ", ref, ...splices], ";"],
-          ...thisAssignments
-        ]
+      return {
+        type: "DeclarationCondition",
+        declaration
       };
-      return initCondition;
     });
     function DeclarationCondition(ctx, state) {
       return $EVENT(ctx, state, "DeclarationCondition", DeclarationCondition$0);

package/package.json

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