@danielx/civet 0.6.2 → 0.6.3

package/dist/browser.js

@@ -43,6 +43,17 @@ var Civet = (() => {
           p.children.push(": ", ref);
         }
       }
+      function arrayElementHasTrailingComma(elementNode) {
+        const { children } = elementNode, { length } = children;
+        const lastChild = children[length - 1];
+        if (lastChild) {
+          const l2 = lastChild.length;
+          if (lastChild[l2 - 1]?.token === ",") {
+            return true;
+          }
+        }
+        return false;
+      }
       function blockWithPrefix(prefixStatements, block) {
         if (prefixStatements && prefixStatements.length) {
           const indent = getIndent(block.expressions[0]);
@@ -185,7 +196,7 @@ var Civet = (() => {
       function hoistRefDecs(statements) {
         gatherRecursiveAll(statements, (s) => s.hoistDec).forEach((node) => {
           const { hoistDec } = node;
-          const outer = closest(node, ["IfStatement", "IterationStatement"]);
+          let outer = closest(node, ["IfStatement", "IterationStatement"]);
           if (!outer) {
             node.children.push({
               type: "Error",
@@ -193,7 +204,11 @@ var Civet = (() => {
             });
             return;
           }
-          const block = outer.parent;
+          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)
@@ -621,6 +636,7 @@ var Civet = (() => {
       }
       module.exports = {
         aliasBinding,
+        arrayElementHasTrailingComma,
         blockWithPrefix,
         clone,
         convertMethodToFunction,
@@ -19273,7 +19289,10 @@ ${input.slice(result.pos)}
         var dots = $2;
         if (!dots)
           return type;
-        return [dots, type];
+        const ws = getTrimmingSpace(type);
+        if (!ws)
+          return [dots[1], dots[0], type];
+        return [ws, dots[1], dots[0], insertTrimmingSpace(type, "")];
       });
       function TypeElement(state) {
         let eventData;
@@ -21435,20 +21454,27 @@ ${input.slice(result.pos)}
         module.wrapIIFE = (exp, async) => {
           let prefix, suffix;
           if (async) {
-            prefix = "(async ()=>{";
-            suffix = "})()";
+            prefix = "(async ()=>";
+            suffix = ")()";
           } else if (hasAwait(exp)) {
-            prefix = "(await (async ()=>{";
-            suffix = "})())";
-          } else {
-            prefix = "(()=>{";
-            suffix = "})()";
-          }
-          if (Array.isArray(exp)) {
-            return [prefix, ...exp, suffix];
+            prefix = "(await (async ()=>";
+            suffix = ")())";
           } else {
-            return [prefix, exp, suffix];
+            prefix = "(()=>";
+            suffix = ")()";
           }
+          const expressions = Array.isArray(exp) ? [[...exp]] : [exp];
+          const block = {
+            type: "BlockStatement",
+            expressions,
+            children: ["{", expressions, "}"],
+            bare: false
+          };
+          return [
+            prefix,
+            block,
+            suffix
+          ];
         };
         function wrapIterationReturningResults(statement, outerRef) {
           if (statement.type === "DoStatement") {
@@ -21905,10 +21931,13 @@ ${input.slice(result.pos)}
             const after = elements.slice(restIndex + 1);
             const restIdentifier = rest.binding.ref || rest.binding;
             names.push(...rest.names || []);
-            if (after.length) {
+            let l = after.length;
+            if (l) {
+              if (arrayElementHasTrailingComma(after[l - 1]))
+                l++;
               blockPrefix = {
                 type: "PostRestBindingElements",
-                children: ["[", insertTrimmingSpace(after, ""), "] = ", restIdentifier, ".splice(-", after.length.toString(), ")"],
+                children: ["[", insertTrimmingSpace(after, ""), "] = ", restIdentifier, ".splice(-", l.toString(), ")"],
                 names: after.flatMap((p) => p.names)
               };
             }
@@ -22541,6 +22570,7 @@ ${input.slice(result.pos)}
               expression = expression.expression;
             }
             let ref = module.needsRef(expression, "m") || expression;
+            let hoistDec = ref !== expression ? [["", ["const ", ref, " = ", expression], ";"]] : void 0;
             let prev = [], root = prev;
             const l = clauses.length;
             clauses.forEach((c, i) => {
@@ -22603,8 +22633,10 @@ ${input.slice(result.pos)}
                 type: "IfStatement",
                 children: ["if", condition, block, next],
                 then: block,
-                else: next
+                else: next,
+                hoistDec
               }]);
+              hoistDec = void 0;
               prev = next;
             });
             if (module.config.implicitReturns && s.type === "SwitchExpression") {
@@ -23284,6 +23316,7 @@ ${input.slice(result.pos)}
       exports.default = { parse: parse2 };
       var {
         aliasBinding,
+        arrayElementHasTrailingComma,
         blockWithPrefix,
         clone,
         convertMethodToFunction,

package/dist/main.js

@@ -42,6 +42,17 @@ var require_lib = __commonJS({
         p.children.push(": ", ref);
       }
     }
+    function arrayElementHasTrailingComma(elementNode) {
+      const { children } = elementNode, { length } = children;
+      const lastChild = children[length - 1];
+      if (lastChild) {
+        const l2 = lastChild.length;
+        if (lastChild[l2 - 1]?.token === ",") {
+          return true;
+        }
+      }
+      return false;
+    }
     function blockWithPrefix(prefixStatements, block) {
       if (prefixStatements && prefixStatements.length) {
         const indent = getIndent(block.expressions[0]);
@@ -184,7 +195,7 @@ var require_lib = __commonJS({
     function hoistRefDecs(statements) {
       gatherRecursiveAll(statements, (s) => s.hoistDec).forEach((node) => {
         const { hoistDec } = node;
-        const outer = closest(node, ["IfStatement", "IterationStatement"]);
+        let outer = closest(node, ["IfStatement", "IterationStatement"]);
         if (!outer) {
           node.children.push({
             type: "Error",
@@ -192,7 +203,11 @@ var require_lib = __commonJS({
           });
           return;
         }
-        const block = outer.parent;
+        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)
@@ -620,6 +635,7 @@ var require_lib = __commonJS({
     }
     module2.exports = {
       aliasBinding,
+      arrayElementHasTrailingComma,
       blockWithPrefix,
       clone,
       convertMethodToFunction,
@@ -19272,7 +19288,10 @@ ${input.slice(result.pos)}
       var dots = $2;
       if (!dots)
         return type;
-      return [dots, type];
+      const ws = getTrimmingSpace(type);
+      if (!ws)
+        return [dots[1], dots[0], type];
+      return [ws, dots[1], dots[0], insertTrimmingSpace(type, "")];
     });
     function TypeElement(state) {
       let eventData;
@@ -21434,20 +21453,27 @@ ${input.slice(result.pos)}
       module2.wrapIIFE = (exp, async) => {
         let prefix, suffix;
         if (async) {
-          prefix = "(async ()=>{";
-          suffix = "})()";
+          prefix = "(async ()=>";
+          suffix = ")()";
         } else if (hasAwait(exp)) {
-          prefix = "(await (async ()=>{";
-          suffix = "})())";
-        } else {
-          prefix = "(()=>{";
-          suffix = "})()";
-        }
-        if (Array.isArray(exp)) {
-          return [prefix, ...exp, suffix];
+          prefix = "(await (async ()=>";
+          suffix = ")())";
         } else {
-          return [prefix, exp, suffix];
+          prefix = "(()=>";
+          suffix = ")()";
         }
+        const expressions = Array.isArray(exp) ? [[...exp]] : [exp];
+        const block = {
+          type: "BlockStatement",
+          expressions,
+          children: ["{", expressions, "}"],
+          bare: false
+        };
+        return [
+          prefix,
+          block,
+          suffix
+        ];
       };
       function wrapIterationReturningResults(statement, outerRef) {
         if (statement.type === "DoStatement") {
@@ -21904,10 +21930,13 @@ ${input.slice(result.pos)}
           const after = elements.slice(restIndex + 1);
           const restIdentifier = rest.binding.ref || rest.binding;
           names.push(...rest.names || []);
-          if (after.length) {
+          let l = after.length;
+          if (l) {
+            if (arrayElementHasTrailingComma(after[l - 1]))
+              l++;
             blockPrefix = {
               type: "PostRestBindingElements",
-              children: ["[", insertTrimmingSpace(after, ""), "] = ", restIdentifier, ".splice(-", after.length.toString(), ")"],
+              children: ["[", insertTrimmingSpace(after, ""), "] = ", restIdentifier, ".splice(-", l.toString(), ")"],
               names: after.flatMap((p) => p.names)
             };
           }
@@ -22540,6 +22569,7 @@ ${input.slice(result.pos)}
             expression = expression.expression;
           }
           let ref = module2.needsRef(expression, "m") || expression;
+          let hoistDec = ref !== expression ? [["", ["const ", ref, " = ", expression], ";"]] : void 0;
           let prev = [], root = prev;
           const l = clauses.length;
           clauses.forEach((c, i) => {
@@ -22602,8 +22632,10 @@ ${input.slice(result.pos)}
               type: "IfStatement",
               children: ["if", condition, block, next],
               then: block,
-              else: next
+              else: next,
+              hoistDec
             }]);
+            hoistDec = void 0;
             prev = next;
           });
           if (module2.config.implicitReturns && s.type === "SwitchExpression") {
@@ -23283,6 +23315,7 @@ ${input.slice(result.pos)}
     exports.default = { parse: parse2 };
     var {
       aliasBinding,
+      arrayElementHasTrailingComma,
       blockWithPrefix,
       clone,
       convertMethodToFunction,

package/dist/main.mjs

@@ -40,6 +40,17 @@ var require_lib = __commonJS({
         p.children.push(": ", ref);
       }
     }
+    function arrayElementHasTrailingComma(elementNode) {
+      const { children } = elementNode, { length } = children;
+      const lastChild = children[length - 1];
+      if (lastChild) {
+        const l2 = lastChild.length;
+        if (lastChild[l2 - 1]?.token === ",") {
+          return true;
+        }
+      }
+      return false;
+    }
     function blockWithPrefix(prefixStatements, block) {
       if (prefixStatements && prefixStatements.length) {
         const indent = getIndent(block.expressions[0]);
@@ -182,7 +193,7 @@ var require_lib = __commonJS({
     function hoistRefDecs(statements) {
       gatherRecursiveAll(statements, (s) => s.hoistDec).forEach((node) => {
         const { hoistDec } = node;
-        const outer = closest(node, ["IfStatement", "IterationStatement"]);
+        let outer = closest(node, ["IfStatement", "IterationStatement"]);
         if (!outer) {
           node.children.push({
             type: "Error",
@@ -190,7 +201,11 @@ var require_lib = __commonJS({
           });
           return;
         }
-        const block = outer.parent;
+        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)
@@ -618,6 +633,7 @@ var require_lib = __commonJS({
     }
     module.exports = {
       aliasBinding,
+      arrayElementHasTrailingComma,
       blockWithPrefix,
       clone,
       convertMethodToFunction,
@@ -19270,7 +19286,10 @@ ${input.slice(result.pos)}
       var dots = $2;
       if (!dots)
         return type;
-      return [dots, type];
+      const ws = getTrimmingSpace(type);
+      if (!ws)
+        return [dots[1], dots[0], type];
+      return [ws, dots[1], dots[0], insertTrimmingSpace(type, "")];
     });
     function TypeElement(state) {
       let eventData;
@@ -21432,20 +21451,27 @@ ${input.slice(result.pos)}
       module.wrapIIFE = (exp, async) => {
         let prefix, suffix;
         if (async) {
-          prefix = "(async ()=>{";
-          suffix = "})()";
+          prefix = "(async ()=>";
+          suffix = ")()";
         } else if (hasAwait(exp)) {
-          prefix = "(await (async ()=>{";
-          suffix = "})())";
-        } else {
-          prefix = "(()=>{";
-          suffix = "})()";
-        }
-        if (Array.isArray(exp)) {
-          return [prefix, ...exp, suffix];
+          prefix = "(await (async ()=>";
+          suffix = ")())";
         } else {
-          return [prefix, exp, suffix];
+          prefix = "(()=>";
+          suffix = ")()";
         }
+        const expressions = Array.isArray(exp) ? [[...exp]] : [exp];
+        const block = {
+          type: "BlockStatement",
+          expressions,
+          children: ["{", expressions, "}"],
+          bare: false
+        };
+        return [
+          prefix,
+          block,
+          suffix
+        ];
       };
       function wrapIterationReturningResults(statement, outerRef) {
         if (statement.type === "DoStatement") {
@@ -21902,10 +21928,13 @@ ${input.slice(result.pos)}
           const after = elements.slice(restIndex + 1);
           const restIdentifier = rest.binding.ref || rest.binding;
           names.push(...rest.names || []);
-          if (after.length) {
+          let l = after.length;
+          if (l) {
+            if (arrayElementHasTrailingComma(after[l - 1]))
+              l++;
             blockPrefix = {
               type: "PostRestBindingElements",
-              children: ["[", insertTrimmingSpace(after, ""), "] = ", restIdentifier, ".splice(-", after.length.toString(), ")"],
+              children: ["[", insertTrimmingSpace(after, ""), "] = ", restIdentifier, ".splice(-", l.toString(), ")"],
               names: after.flatMap((p) => p.names)
             };
           }
@@ -22538,6 +22567,7 @@ ${input.slice(result.pos)}
             expression = expression.expression;
           }
           let ref = module.needsRef(expression, "m") || expression;
+          let hoistDec = ref !== expression ? [["", ["const ", ref, " = ", expression], ";"]] : void 0;
           let prev = [], root = prev;
           const l = clauses.length;
           clauses.forEach((c, i) => {
@@ -22600,8 +22630,10 @@ ${input.slice(result.pos)}
               type: "IfStatement",
               children: ["if", condition, block, next],
               then: block,
-              else: next
+              else: next,
+              hoistDec
             }]);
+            hoistDec = void 0;
             prev = next;
           });
           if (module.config.implicitReturns && s.type === "SwitchExpression") {
@@ -23281,6 +23313,7 @@ ${input.slice(result.pos)}
     exports.default = { parse: parse2 };
     var {
       aliasBinding,
+      arrayElementHasTrailingComma,
       blockWithPrefix,
       clone,
       convertMethodToFunction,

package/package.json

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