@danielx/civet 0.6.10 → 0.6.12

package/dist/browser.js

@@ -431,7 +431,7 @@ var Civet = (() => {
           if (glob?.type === "PropertyGlob") {
             let prefix = children.slice(0, i);
             const parts = [];
-            let hoistDec, refAssignment = [];
+            let hoistDec, refAssignment;
             if (prefix.length > 1) {
               const ref = {
                 type: "Ref",
@@ -488,10 +488,9 @@ var Civet = (() => {
                 });
               }
             }
-            const object = {
+            let object = {
               type: "ObjectExpression",
               children: [
-                ...refAssignment,
                 glob.object.children[0],
                 ...parts,
                 glob.object.children.at(-1)
@@ -499,6 +498,13 @@ var Civet = (() => {
               properties: parts,
               hoistDec
             };
+            if (refAssignment) {
+              object = {
+                type: "ParenthesizedExpression",
+                children: ["(", ...refAssignment, object, ")"],
+                expression: object
+              };
+            }
             if (i === children.length - 1)
               return object;
             return processCallMemberExpression({
@@ -658,12 +664,12 @@ var Civet = (() => {
               } else {
                 endIndex = i + 1;
               }
-              results = results.concat(first, ...binops.slice(start, endIndex));
+              results.push(first, ...binops.slice(start, endIndex).flat());
               first = [exp].concat(binops.slice(index + 1, endIndex));
               start = endIndex;
             });
           } else {
-            results = results.concat(first, ...binops.slice(start, i + 1));
+            results.push(first, ...binops.slice(start, i + 1).flat());
             start = i + 1;
           }
           chains.length = 0;
@@ -1172,7 +1178,9 @@ var Civet = (() => {
       }
       function convertMethodToFunction(method) {
         const { signature, block } = method;
-        let { modifier } = signature;
+        let { modifier, optional } = signature;
+        if (optional)
+          return;
         if (modifier) {
           if (modifier.get || modifier.set) {
             return;
@@ -1337,7 +1345,7 @@ var Civet = (() => {
         };
       }
       function implicitFunctionBlock(f) {
-        if (f.abstract || f.block)
+        if (f.abstract || f.block || f.signature?.optional)
           return;
         const { name, parent } = f;
         const expressions = parent?.expressions ?? parent?.elements;
@@ -1578,11 +1586,20 @@ var Civet = (() => {
             });
             break;
           }
-          case "ConditionFragment":
+          case "ConditionFragment": {
+            let { children } = pattern;
+            if (children.length) {
+              let [first, ...rest] = children;
+              let [ws, ...op] = first;
+              ws = [" "].concat(ws);
+              first = [ws, ...op];
+              children = [first, ...rest];
+            }
             conditions.push(
-              [ref, " ", pattern.children]
+              processBinaryOpExpression([ref, children])
             );
             break;
+          }
           case "RegularExpressionLiteral": {
             conditions.push(
               ["typeof ", ref, " === 'string'"],
@@ -8202,7 +8219,7 @@ ${input.slice(result.pos)}
         return {
           type: "BlockStatement",
           expressions,
-          children: [$1, expressions, $2],
+          children: [$1, $2, expressions, $3, $4],
           bare: false,
           empty: true
         };
@@ -8270,8 +8287,8 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Block$0 = ExplicitBlock;
-      var Block$1 = ImplicitNestedBlock;
+      var Block$0 = ImplicitNestedBlock;
+      var Block$1 = ExplicitBlock;
       var Block$2 = ThenClause;
       var Block$3 = $TS($S($E(_), $N(EOS), Statement), function($skip, $loc, $0, $1, $2, $3) {
         var ws = $1;
@@ -10276,20 +10293,24 @@ ${input.slice(result.pos)}
           parameters
         };
       });
-      var MethodSignature$1 = $TS($S($E(MethodModifier), ClassElementName, $E(_), NonEmptyParameters, $E(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var MethodSignature$1 = $TS($S($E(MethodModifier), ClassElementName, $E(_), $E(QuestionMark), $E(_), NonEmptyParameters, $E(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
         var modifier = $1;
         var name = $2;
-        var parameters = $4;
-        var returnType = $5;
+        var optional = $4;
+        var parameters = $6;
+        var returnType = $7;
         if (name.name) {
           name = name.name;
         } else if (name.token) {
           name = name.token.match(/^(?:"|')/) ? name.token.slice(1, -1) : name.token;
         }
+        if (optional)
+          $0[3] = optional = { ...optional, ts: true };
         return {
           type: "MethodSignature",
           children: $0,
           name,
+          optional,
           modifier,
           returnType,
           parameters
@@ -21692,8 +21713,8 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var FunctionType$0 = $TS($S(Parameters, __, TypeArrowFunction, $E(Type)), function($skip, $loc, $0, $1, $2, $3, $4) {
-        var type = $4;
+      var FunctionType$0 = $TS($S($E($S(New, $E(_))), Parameters, __, TypeArrowFunction, $E(Type)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+        var type = $5;
         if (type) {
           return $0;
         }

package/dist/main.js

@@ -430,7 +430,7 @@ var require_lib = __commonJS({
         if (glob?.type === "PropertyGlob") {
           let prefix = children.slice(0, i);
           const parts = [];
-          let hoistDec, refAssignment = [];
+          let hoistDec, refAssignment;
           if (prefix.length > 1) {
             const ref = {
               type: "Ref",
@@ -487,10 +487,9 @@ var require_lib = __commonJS({
               });
             }
           }
-          const object = {
+          let object = {
             type: "ObjectExpression",
             children: [
-              ...refAssignment,
               glob.object.children[0],
               ...parts,
               glob.object.children.at(-1)
@@ -498,6 +497,13 @@ var require_lib = __commonJS({
             properties: parts,
             hoistDec
           };
+          if (refAssignment) {
+            object = {
+              type: "ParenthesizedExpression",
+              children: ["(", ...refAssignment, object, ")"],
+              expression: object
+            };
+          }
           if (i === children.length - 1)
             return object;
           return processCallMemberExpression({
@@ -657,12 +663,12 @@ var require_lib = __commonJS({
             } else {
               endIndex = i + 1;
             }
-            results = results.concat(first, ...binops.slice(start, endIndex));
+            results.push(first, ...binops.slice(start, endIndex).flat());
             first = [exp].concat(binops.slice(index + 1, endIndex));
             start = endIndex;
           });
         } else {
-          results = results.concat(first, ...binops.slice(start, i + 1));
+          results.push(first, ...binops.slice(start, i + 1).flat());
           start = i + 1;
         }
         chains.length = 0;
@@ -1171,7 +1177,9 @@ var require_lib = __commonJS({
     }
     function convertMethodToFunction(method) {
       const { signature, block } = method;
-      let { modifier } = signature;
+      let { modifier, optional } = signature;
+      if (optional)
+        return;
       if (modifier) {
         if (modifier.get || modifier.set) {
           return;
@@ -1336,7 +1344,7 @@ var require_lib = __commonJS({
       };
     }
     function implicitFunctionBlock(f) {
-      if (f.abstract || f.block)
+      if (f.abstract || f.block || f.signature?.optional)
         return;
       const { name, parent } = f;
       const expressions = parent?.expressions ?? parent?.elements;
@@ -1577,11 +1585,20 @@ var require_lib = __commonJS({
           });
           break;
         }
-        case "ConditionFragment":
+        case "ConditionFragment": {
+          let { children } = pattern;
+          if (children.length) {
+            let [first, ...rest] = children;
+            let [ws, ...op] = first;
+            ws = [" "].concat(ws);
+            first = [ws, ...op];
+            children = [first, ...rest];
+          }
           conditions.push(
-            [ref, " ", pattern.children]
+            processBinaryOpExpression([ref, children])
           );
           break;
+        }
         case "RegularExpressionLiteral": {
           conditions.push(
             ["typeof ", ref, " === 'string'"],
@@ -8201,7 +8218,7 @@ ${input.slice(result.pos)}
       return {
         type: "BlockStatement",
         expressions,
-        children: [$1, expressions, $2],
+        children: [$1, $2, expressions, $3, $4],
         bare: false,
         empty: true
       };
@@ -8269,8 +8286,8 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Block$0 = ExplicitBlock;
-    var Block$1 = ImplicitNestedBlock;
+    var Block$0 = ImplicitNestedBlock;
+    var Block$1 = ExplicitBlock;
     var Block$2 = ThenClause;
     var Block$3 = $TS($S($E(_), $N(EOS), Statement), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
@@ -10275,20 +10292,24 @@ ${input.slice(result.pos)}
         parameters
       };
     });
-    var MethodSignature$1 = $TS($S($E(MethodModifier), ClassElementName, $E(_), NonEmptyParameters, $E(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var MethodSignature$1 = $TS($S($E(MethodModifier), ClassElementName, $E(_), $E(QuestionMark), $E(_), NonEmptyParameters, $E(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
       var modifier = $1;
       var name = $2;
-      var parameters = $4;
-      var returnType = $5;
+      var optional = $4;
+      var parameters = $6;
+      var returnType = $7;
       if (name.name) {
         name = name.name;
       } else if (name.token) {
         name = name.token.match(/^(?:"|')/) ? name.token.slice(1, -1) : name.token;
       }
+      if (optional)
+        $0[3] = optional = { ...optional, ts: true };
       return {
         type: "MethodSignature",
         children: $0,
         name,
+        optional,
         modifier,
         returnType,
         parameters
@@ -21691,8 +21712,8 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var FunctionType$0 = $TS($S(Parameters, __, TypeArrowFunction, $E(Type)), function($skip, $loc, $0, $1, $2, $3, $4) {
-      var type = $4;
+    var FunctionType$0 = $TS($S($E($S(New, $E(_))), Parameters, __, TypeArrowFunction, $E(Type)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var type = $5;
       if (type) {
         return $0;
       }

package/dist/main.mjs

@@ -428,7 +428,7 @@ var require_lib = __commonJS({
         if (glob?.type === "PropertyGlob") {
           let prefix = children.slice(0, i);
           const parts = [];
-          let hoistDec, refAssignment = [];
+          let hoistDec, refAssignment;
           if (prefix.length > 1) {
             const ref = {
               type: "Ref",
@@ -485,10 +485,9 @@ var require_lib = __commonJS({
               });
             }
           }
-          const object = {
+          let object = {
             type: "ObjectExpression",
             children: [
-              ...refAssignment,
               glob.object.children[0],
               ...parts,
               glob.object.children.at(-1)
@@ -496,6 +495,13 @@ var require_lib = __commonJS({
             properties: parts,
             hoistDec
           };
+          if (refAssignment) {
+            object = {
+              type: "ParenthesizedExpression",
+              children: ["(", ...refAssignment, object, ")"],
+              expression: object
+            };
+          }
           if (i === children.length - 1)
             return object;
           return processCallMemberExpression({
@@ -655,12 +661,12 @@ var require_lib = __commonJS({
             } else {
               endIndex = i + 1;
             }
-            results = results.concat(first, ...binops.slice(start, endIndex));
+            results.push(first, ...binops.slice(start, endIndex).flat());
             first = [exp].concat(binops.slice(index + 1, endIndex));
             start = endIndex;
           });
         } else {
-          results = results.concat(first, ...binops.slice(start, i + 1));
+          results.push(first, ...binops.slice(start, i + 1).flat());
           start = i + 1;
         }
         chains.length = 0;
@@ -1169,7 +1175,9 @@ var require_lib = __commonJS({
     }
     function convertMethodToFunction(method) {
       const { signature, block } = method;
-      let { modifier } = signature;
+      let { modifier, optional } = signature;
+      if (optional)
+        return;
       if (modifier) {
         if (modifier.get || modifier.set) {
           return;
@@ -1334,7 +1342,7 @@ var require_lib = __commonJS({
       };
     }
     function implicitFunctionBlock(f) {
-      if (f.abstract || f.block)
+      if (f.abstract || f.block || f.signature?.optional)
         return;
       const { name, parent } = f;
       const expressions = parent?.expressions ?? parent?.elements;
@@ -1575,11 +1583,20 @@ var require_lib = __commonJS({
           });
           break;
         }
-        case "ConditionFragment":
+        case "ConditionFragment": {
+          let { children } = pattern;
+          if (children.length) {
+            let [first, ...rest] = children;
+            let [ws, ...op] = first;
+            ws = [" "].concat(ws);
+            first = [ws, ...op];
+            children = [first, ...rest];
+          }
           conditions.push(
-            [ref, " ", pattern.children]
+            processBinaryOpExpression([ref, children])
           );
           break;
+        }
         case "RegularExpressionLiteral": {
           conditions.push(
             ["typeof ", ref, " === 'string'"],
@@ -8199,7 +8216,7 @@ ${input.slice(result.pos)}
       return {
         type: "BlockStatement",
         expressions,
-        children: [$1, expressions, $2],
+        children: [$1, $2, expressions, $3, $4],
         bare: false,
         empty: true
       };
@@ -8267,8 +8284,8 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Block$0 = ExplicitBlock;
-    var Block$1 = ImplicitNestedBlock;
+    var Block$0 = ImplicitNestedBlock;
+    var Block$1 = ExplicitBlock;
     var Block$2 = ThenClause;
     var Block$3 = $TS($S($E(_), $N(EOS), Statement), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
@@ -10273,20 +10290,24 @@ ${input.slice(result.pos)}
         parameters
       };
     });
-    var MethodSignature$1 = $TS($S($E(MethodModifier), ClassElementName, $E(_), NonEmptyParameters, $E(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var MethodSignature$1 = $TS($S($E(MethodModifier), ClassElementName, $E(_), $E(QuestionMark), $E(_), NonEmptyParameters, $E(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
       var modifier = $1;
       var name = $2;
-      var parameters = $4;
-      var returnType = $5;
+      var optional = $4;
+      var parameters = $6;
+      var returnType = $7;
       if (name.name) {
         name = name.name;
       } else if (name.token) {
         name = name.token.match(/^(?:"|')/) ? name.token.slice(1, -1) : name.token;
       }
+      if (optional)
+        $0[3] = optional = { ...optional, ts: true };
       return {
         type: "MethodSignature",
         children: $0,
         name,
+        optional,
         modifier,
         returnType,
         parameters
@@ -21689,8 +21710,8 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var FunctionType$0 = $TS($S(Parameters, __, TypeArrowFunction, $E(Type)), function($skip, $loc, $0, $1, $2, $3, $4) {
-      var type = $4;
+    var FunctionType$0 = $TS($S($E($S(New, $E(_))), Parameters, __, TypeArrowFunction, $E(Type)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var type = $5;
       if (type) {
         return $0;
       }

package/package.json

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