@danielx/civet 0.6.72 → 0.6.73

package/dist/browser.js

@@ -2262,9 +2262,17 @@ var Civet = (() => {
       const isMethod = f.type === "MethodDefinition";
       const isConstructor = isMethod && name === "constructor";
       const isVoid = isVoidType(returnType2?.t) || async && isPromiseVoidType(returnType2?.t) || !async && generator && isGeneratorVoidType(returnType2?.t);
-      const isBlock = block?.type === "BlockStatement";
-      if (!isVoid && !set && !isConstructor && isBlock) {
-        insertReturn(block);
+      if (block?.type === "BlockStatement") {
+        if (isVoid || set || isConstructor) {
+          if (block.bare && block.implicitlyReturned) {
+            block.children = [" {", ...block.children, " }"];
+            block.bare = block.implicitlyReturned = false;
+          }
+        } else {
+          if (!block.implicitlyReturned) {
+            insertReturn(block);
+          }
+        }
       }
     }
   }
@@ -2671,8 +2679,8 @@ var Civet = (() => {
     }
   }
   function aggregateDuplicateBindings(bindings, ReservedWord) {
-    const props = gatherRecursiveAll(bindings, (n) => n.type === "BindingProperty");
-    const arrayBindings = gatherRecursiveAll(bindings, (n) => n.type === "ArrayBindingPattern");
+    const props = gatherRecursiveAll(bindings, ($3) => $3.type === "BindingProperty");
+    const arrayBindings = gatherRecursiveAll(bindings, ($4) => $4.type === "ArrayBindingPattern");
     arrayBindings.forEach((a) => {
       const { elements } = a;
       return elements.forEach((element) => {
@@ -2702,20 +2710,22 @@ var Civet = (() => {
       }
     }
     propsGroupedByName.forEach((shared, key) => {
-      if (!key)
+      if (!key) {
         return;
+      }
       if (ReservedWord({ fail() {
       } }, {
         pos: 0,
         input: key
       })) {
-        shared.forEach((p) => ({
-          aliasBinding: aliasBinding(p, makeRef(`_${key}`, key))
-        }));
+        shared.forEach((p) => {
+          return aliasBinding(p, makeRef(`_${key}`, key));
+        });
         return;
       }
-      if (shared.length === 1)
+      if (shared.length === 1) {
         return;
+      }
       const refs = shared.map((p) => {
         const ref = makeRef(key);
         aliasBinding(p, ref);
@@ -2728,7 +2738,7 @@ var Civet = (() => {
     return declarations;
   }
   function processPatternMatching(statements, ReservedWord) {
-    gatherRecursiveAll(statements, (n) => n.type === "SwitchStatement").forEach((s) => {
+    gatherRecursiveAll(statements, ($5) => $5.type === "SwitchStatement").forEach((s) => {
       const { caseBlock } = s;
       const { clauses } = caseBlock;
       for (const c of clauses) {
@@ -2742,7 +2752,7 @@ var Civet = (() => {
       }
       let errors = false;
       let isPattern = false;
-      if (clauses.some((c) => c.type === "PatternClause")) {
+      if (clauses.some(($6) => $6.type === "PatternClause")) {
         isPattern = true;
         clauses.forEach((c) => {
           if (!(c.type === "PatternClause" || c.type === "DefaultClause")) {
@@ -2756,8 +2766,9 @@ var Civet = (() => {
           return;
         });
       }
-      if (errors || !isPattern)
+      if (errors || !isPattern) {
         return;
+      }
       let { condition } = s;
       if (condition.type === "ParenthesizedExpression") {
         condition = condition.expression;
@@ -2969,7 +2980,7 @@ var Civet = (() => {
         };
       }
       children.push(arg);
-      if (!children.some(($3) => $3?.type === "ReturnStatement") && children.some(($4) => $4 === ",")) {
+      if (!children.some(($7) => $7?.type === "ReturnStatement") && children.some(($8) => $8 === ",")) {
         const { parent } = s;
         const parenthesizedExpression = makeLeftHandSideExpression({ ...s });
         Object.assign(s, parenthesizedExpression, {
@@ -3092,7 +3103,7 @@ var Civet = (() => {
     scopes.push(decs);
     const varIds = [];
     const assignmentStatements = findAssignments(statements, scopes);
-    const undeclaredIdentifiers = assignmentStatements.flatMap((a) => a.names);
+    const undeclaredIdentifiers = assignmentStatements.flatMap(($9) => $9?.names || []);
     undeclaredIdentifiers.filter((x, i, a) => {
       if (!hasDec(x))
         return a.indexOf(x) === i;
@@ -3398,7 +3409,8 @@ var Civet = (() => {
         ];
       }
       if (Array.isArray(rest.delim) && rest.delim.at(-1)?.token === ",") {
-        rest.delim.pop();
+        rest.delim = rest.delim.slice(0, -1);
+        rest.children = [...rest.children.slice(0, -1), rest.delim];
       }
       const children = [...props, ...after, rest];
       return {
@@ -4143,6 +4155,7 @@ ${input.slice(result.pos)}
         ArrowFunction,
         FatArrow,
         TrailingDeclaration,
+        TrailingPipe,
         FatArrowBody,
         ConditionalExpression,
         TernaryRest,
@@ -5760,12 +5773,23 @@ ${input.slice(result.pos)}
       function TrailingDeclaration(ctx, state) {
         return $EVENT(ctx, state, "TrailingDeclaration", TrailingDeclaration$0);
       }
-      var FatArrowBody$0 = $TS($S($N(EOS), NonPipelinePostfixedExpression, $N(TrailingDeclaration), $N(SemicolonDelimiter)), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var TrailingPipe$0 = $S($E(_), Pipe);
+      function TrailingPipe(ctx, state) {
+        return $EVENT(ctx, state, "TrailingPipe", TrailingPipe$0);
+      }
+      var FatArrowBody$0 = $TS($S($N(EOS), NonPipelinePostfixedExpression, $N(TrailingDeclaration), $N(TrailingPipe), $N(SemicolonDelimiter)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         var exp = $2;
         if (exp.type === "ObjectExpression") {
-          return makeLeftHandSideExpression(exp);
+          exp = makeLeftHandSideExpression(exp);
         }
-        return exp;
+        const expressions = [exp];
+        return {
+          type: "BlockStatement",
+          bare: true,
+          expressions,
+          children: [expressions],
+          implicitlyReturned: true
+        };
       });
       var FatArrowBody$1 = NoCommaBracedOrEmptyBlock;
       var FatArrowBody$$ = [FatArrowBody$0, FatArrowBody$1];
@@ -8332,14 +8356,17 @@ ${input.slice(result.pos)}
       function NestedImplicitPropertyDefinitions(ctx, state) {
         return $EVENT(ctx, state, "NestedImplicitPropertyDefinitions", NestedImplicitPropertyDefinitions$0);
       }
-      var NestedImplicitPropertyDefinition$0 = $TS($S(Nested, NamedProperty, ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3) {
-        var ws = $1;
-        var prop = $2;
-        var delimiter = $3;
-        return {
+      var NestedImplicitPropertyDefinition$0 = $TS($S(Nested, $P($S($E(_), NamedProperty, ObjectPropertyDelimiter))), function($skip, $loc, $0, $1, $2) {
+        var indent = $1;
+        var props = $2;
+        return props.map(([ws, prop, delimiter], i) => ({
           ...prop,
-          children: [...ws, ...prop.children, delimiter]
-        };
+          children: [
+            ...i === 0 ? [indent, ws] : [ws],
+            ...prop.children,
+            delimiter
+          ]
+        }));
       });
       function NestedImplicitPropertyDefinition(ctx, state) {
         return $EVENT(ctx, state, "NestedImplicitPropertyDefinition", NestedImplicitPropertyDefinition$0);
@@ -11199,7 +11226,7 @@ ${input.slice(result.pos)}
         var flags = $4;
         let hasSubstitutions = body.some((part) => part.type === "Substitution");
         if (hasSubstitutions) {
-          const result = [
+          const children = [
             { ...open, token: "RegExp(`" },
             // Escape backticks, backslashes, and '$' in the body text
             body.map(
@@ -11211,13 +11238,16 @@ ${input.slice(result.pos)}
             "`"
           ];
           if (flags.length) {
-            result.push(
+            children.push(
               ", ",
               JSON.stringify(flags)
             );
           }
-          result.push({ ...close, token: ")" });
-          return result;
+          children.push({ ...close, token: ")" });
+          return {
+            type: "RegularExpressionLiteral",
+            children
+          };
         }
         return {
           type: "RegularExpressionLiteral",
@@ -14410,6 +14440,7 @@ ${input.slice(result.pos)}
       exports.ArrowFunction = ArrowFunction;
       exports.FatArrow = FatArrow;
       exports.TrailingDeclaration = TrailingDeclaration;
+      exports.TrailingPipe = TrailingPipe;
       exports.FatArrowBody = FatArrowBody;
       exports.ConditionalExpression = ConditionalExpression;
       exports.TernaryRest = TernaryRest;

package/dist/main.js

@@ -2254,9 +2254,17 @@ function processReturn(f, implicitReturns) {
     const isMethod = f.type === "MethodDefinition";
     const isConstructor = isMethod && name === "constructor";
     const isVoid = isVoidType(returnType2?.t) || async && isPromiseVoidType(returnType2?.t) || !async && generator && isGeneratorVoidType(returnType2?.t);
-    const isBlock = block?.type === "BlockStatement";
-    if (!isVoid && !set && !isConstructor && isBlock) {
-      insertReturn(block);
+    if (block?.type === "BlockStatement") {
+      if (isVoid || set || isConstructor) {
+        if (block.bare && block.implicitlyReturned) {
+          block.children = [" {", ...block.children, " }"];
+          block.bare = block.implicitlyReturned = false;
+        }
+      } else {
+        if (!block.implicitlyReturned) {
+          insertReturn(block);
+        }
+      }
     }
   }
 }
@@ -2663,8 +2671,8 @@ function nonMatcherBindings(pattern) {
   }
 }
 function aggregateDuplicateBindings(bindings, ReservedWord) {
-  const props = gatherRecursiveAll(bindings, (n) => n.type === "BindingProperty");
-  const arrayBindings = gatherRecursiveAll(bindings, (n) => n.type === "ArrayBindingPattern");
+  const props = gatherRecursiveAll(bindings, ($3) => $3.type === "BindingProperty");
+  const arrayBindings = gatherRecursiveAll(bindings, ($4) => $4.type === "ArrayBindingPattern");
   arrayBindings.forEach((a) => {
     const { elements } = a;
     return elements.forEach((element) => {
@@ -2694,20 +2702,22 @@ function aggregateDuplicateBindings(bindings, ReservedWord) {
     }
   }
   propsGroupedByName.forEach((shared, key) => {
-    if (!key)
+    if (!key) {
       return;
+    }
     if (ReservedWord({ fail() {
     } }, {
       pos: 0,
       input: key
     })) {
-      shared.forEach((p) => ({
-        aliasBinding: aliasBinding(p, makeRef(`_${key}`, key))
-      }));
+      shared.forEach((p) => {
+        return aliasBinding(p, makeRef(`_${key}`, key));
+      });
       return;
     }
-    if (shared.length === 1)
+    if (shared.length === 1) {
       return;
+    }
     const refs = shared.map((p) => {
       const ref = makeRef(key);
       aliasBinding(p, ref);
@@ -2720,7 +2730,7 @@ function aggregateDuplicateBindings(bindings, ReservedWord) {
   return declarations;
 }
 function processPatternMatching(statements, ReservedWord) {
-  gatherRecursiveAll(statements, (n) => n.type === "SwitchStatement").forEach((s) => {
+  gatherRecursiveAll(statements, ($5) => $5.type === "SwitchStatement").forEach((s) => {
     const { caseBlock } = s;
     const { clauses } = caseBlock;
     for (const c of clauses) {
@@ -2734,7 +2744,7 @@ function processPatternMatching(statements, ReservedWord) {
     }
     let errors = false;
     let isPattern = false;
-    if (clauses.some((c) => c.type === "PatternClause")) {
+    if (clauses.some(($6) => $6.type === "PatternClause")) {
       isPattern = true;
       clauses.forEach((c) => {
         if (!(c.type === "PatternClause" || c.type === "DefaultClause")) {
@@ -2748,8 +2758,9 @@ function processPatternMatching(statements, ReservedWord) {
         return;
       });
     }
-    if (errors || !isPattern)
+    if (errors || !isPattern) {
       return;
+    }
     let { condition } = s;
     if (condition.type === "ParenthesizedExpression") {
       condition = condition.expression;
@@ -2961,7 +2972,7 @@ function processPipelineExpressions(statements) {
       };
     }
     children.push(arg);
-    if (!children.some(($3) => $3?.type === "ReturnStatement") && children.some(($4) => $4 === ",")) {
+    if (!children.some(($7) => $7?.type === "ReturnStatement") && children.some(($8) => $8 === ",")) {
       const { parent } = s;
       const parenthesizedExpression = makeLeftHandSideExpression({ ...s });
       Object.assign(s, parenthesizedExpression, {
@@ -3084,7 +3095,7 @@ function createVarDecs(statements, scopes, pushVar) {
   scopes.push(decs);
   const varIds = [];
   const assignmentStatements = findAssignments(statements, scopes);
-  const undeclaredIdentifiers = assignmentStatements.flatMap((a) => a.names);
+  const undeclaredIdentifiers = assignmentStatements.flatMap(($9) => $9?.names || []);
   undeclaredIdentifiers.filter((x, i, a) => {
     if (!hasDec(x))
       return a.indexOf(x) === i;
@@ -3390,7 +3401,8 @@ function reorderBindingRestProperty(props) {
       ];
     }
     if (Array.isArray(rest.delim) && rest.delim.at(-1)?.token === ",") {
-      rest.delim.pop();
+      rest.delim = rest.delim.slice(0, -1);
+      rest.children = [...rest.children.slice(0, -1), rest.delim];
     }
     const children = [...props, ...after, rest];
     return {
@@ -4135,6 +4147,7 @@ var require_parser = __commonJS({
       ArrowFunction,
       FatArrow,
       TrailingDeclaration,
+      TrailingPipe,
       FatArrowBody,
       ConditionalExpression,
       TernaryRest,
@@ -5752,12 +5765,23 @@ var require_parser = __commonJS({
     function TrailingDeclaration(ctx, state) {
       return $EVENT(ctx, state, "TrailingDeclaration", TrailingDeclaration$0);
     }
-    var FatArrowBody$0 = $TS($S($N(EOS), NonPipelinePostfixedExpression, $N(TrailingDeclaration), $N(SemicolonDelimiter)), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var TrailingPipe$0 = $S($E(_), Pipe);
+    function TrailingPipe(ctx, state) {
+      return $EVENT(ctx, state, "TrailingPipe", TrailingPipe$0);
+    }
+    var FatArrowBody$0 = $TS($S($N(EOS), NonPipelinePostfixedExpression, $N(TrailingDeclaration), $N(TrailingPipe), $N(SemicolonDelimiter)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var exp = $2;
       if (exp.type === "ObjectExpression") {
-        return makeLeftHandSideExpression(exp);
+        exp = makeLeftHandSideExpression(exp);
       }
-      return exp;
+      const expressions = [exp];
+      return {
+        type: "BlockStatement",
+        bare: true,
+        expressions,
+        children: [expressions],
+        implicitlyReturned: true
+      };
     });
     var FatArrowBody$1 = NoCommaBracedOrEmptyBlock;
     var FatArrowBody$$ = [FatArrowBody$0, FatArrowBody$1];
@@ -8324,14 +8348,17 @@ var require_parser = __commonJS({
     function NestedImplicitPropertyDefinitions(ctx, state) {
       return $EVENT(ctx, state, "NestedImplicitPropertyDefinitions", NestedImplicitPropertyDefinitions$0);
     }
-    var NestedImplicitPropertyDefinition$0 = $TS($S(Nested, NamedProperty, ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3) {
-      var ws = $1;
-      var prop = $2;
-      var delimiter = $3;
-      return {
+    var NestedImplicitPropertyDefinition$0 = $TS($S(Nested, $P($S($E(_), NamedProperty, ObjectPropertyDelimiter))), function($skip, $loc, $0, $1, $2) {
+      var indent = $1;
+      var props = $2;
+      return props.map(([ws, prop, delimiter], i) => ({
         ...prop,
-        children: [...ws, ...prop.children, delimiter]
-      };
+        children: [
+          ...i === 0 ? [indent, ws] : [ws],
+          ...prop.children,
+          delimiter
+        ]
+      }));
     });
     function NestedImplicitPropertyDefinition(ctx, state) {
       return $EVENT(ctx, state, "NestedImplicitPropertyDefinition", NestedImplicitPropertyDefinition$0);
@@ -11191,7 +11218,7 @@ var require_parser = __commonJS({
       var flags = $4;
       let hasSubstitutions = body.some((part) => part.type === "Substitution");
       if (hasSubstitutions) {
-        const result = [
+        const children = [
           { ...open, token: "RegExp(`" },
           // Escape backticks, backslashes, and '$' in the body text
           body.map(
@@ -11203,13 +11230,16 @@ var require_parser = __commonJS({
           "`"
         ];
         if (flags.length) {
-          result.push(
+          children.push(
             ", ",
             JSON.stringify(flags)
           );
         }
-        result.push({ ...close, token: ")" });
-        return result;
+        children.push({ ...close, token: ")" });
+        return {
+          type: "RegularExpressionLiteral",
+          children
+        };
       }
       return {
         type: "RegularExpressionLiteral",
@@ -14402,6 +14432,7 @@ var require_parser = __commonJS({
     exports2.ArrowFunction = ArrowFunction;
     exports2.FatArrow = FatArrow;
     exports2.TrailingDeclaration = TrailingDeclaration;
+    exports2.TrailingPipe = TrailingPipe;
     exports2.FatArrowBody = FatArrowBody;
     exports2.ConditionalExpression = ConditionalExpression;
     exports2.TernaryRest = TernaryRest;

package/dist/main.mjs

@@ -2252,9 +2252,17 @@ function processReturn(f, implicitReturns) {
     const isMethod = f.type === "MethodDefinition";
     const isConstructor = isMethod && name === "constructor";
     const isVoid = isVoidType(returnType2?.t) || async && isPromiseVoidType(returnType2?.t) || !async && generator && isGeneratorVoidType(returnType2?.t);
-    const isBlock = block?.type === "BlockStatement";
-    if (!isVoid && !set && !isConstructor && isBlock) {
-      insertReturn(block);
+    if (block?.type === "BlockStatement") {
+      if (isVoid || set || isConstructor) {
+        if (block.bare && block.implicitlyReturned) {
+          block.children = [" {", ...block.children, " }"];
+          block.bare = block.implicitlyReturned = false;
+        }
+      } else {
+        if (!block.implicitlyReturned) {
+          insertReturn(block);
+        }
+      }
     }
   }
 }
@@ -2661,8 +2669,8 @@ function nonMatcherBindings(pattern) {
   }
 }
 function aggregateDuplicateBindings(bindings, ReservedWord) {
-  const props = gatherRecursiveAll(bindings, (n) => n.type === "BindingProperty");
-  const arrayBindings = gatherRecursiveAll(bindings, (n) => n.type === "ArrayBindingPattern");
+  const props = gatherRecursiveAll(bindings, ($3) => $3.type === "BindingProperty");
+  const arrayBindings = gatherRecursiveAll(bindings, ($4) => $4.type === "ArrayBindingPattern");
   arrayBindings.forEach((a) => {
     const { elements } = a;
     return elements.forEach((element) => {
@@ -2692,20 +2700,22 @@ function aggregateDuplicateBindings(bindings, ReservedWord) {
     }
   }
   propsGroupedByName.forEach((shared, key) => {
-    if (!key)
+    if (!key) {
       return;
+    }
     if (ReservedWord({ fail() {
     } }, {
       pos: 0,
       input: key
     })) {
-      shared.forEach((p) => ({
-        aliasBinding: aliasBinding(p, makeRef(`_${key}`, key))
-      }));
+      shared.forEach((p) => {
+        return aliasBinding(p, makeRef(`_${key}`, key));
+      });
       return;
     }
-    if (shared.length === 1)
+    if (shared.length === 1) {
       return;
+    }
     const refs = shared.map((p) => {
       const ref = makeRef(key);
       aliasBinding(p, ref);
@@ -2718,7 +2728,7 @@ function aggregateDuplicateBindings(bindings, ReservedWord) {
   return declarations;
 }
 function processPatternMatching(statements, ReservedWord) {
-  gatherRecursiveAll(statements, (n) => n.type === "SwitchStatement").forEach((s) => {
+  gatherRecursiveAll(statements, ($5) => $5.type === "SwitchStatement").forEach((s) => {
     const { caseBlock } = s;
     const { clauses } = caseBlock;
     for (const c of clauses) {
@@ -2732,7 +2742,7 @@ function processPatternMatching(statements, ReservedWord) {
     }
     let errors = false;
     let isPattern = false;
-    if (clauses.some((c) => c.type === "PatternClause")) {
+    if (clauses.some(($6) => $6.type === "PatternClause")) {
       isPattern = true;
       clauses.forEach((c) => {
         if (!(c.type === "PatternClause" || c.type === "DefaultClause")) {
@@ -2746,8 +2756,9 @@ function processPatternMatching(statements, ReservedWord) {
         return;
       });
     }
-    if (errors || !isPattern)
+    if (errors || !isPattern) {
       return;
+    }
     let { condition } = s;
     if (condition.type === "ParenthesizedExpression") {
       condition = condition.expression;
@@ -2959,7 +2970,7 @@ function processPipelineExpressions(statements) {
       };
     }
     children.push(arg);
-    if (!children.some(($3) => $3?.type === "ReturnStatement") && children.some(($4) => $4 === ",")) {
+    if (!children.some(($7) => $7?.type === "ReturnStatement") && children.some(($8) => $8 === ",")) {
       const { parent } = s;
       const parenthesizedExpression = makeLeftHandSideExpression({ ...s });
       Object.assign(s, parenthesizedExpression, {
@@ -3082,7 +3093,7 @@ function createVarDecs(statements, scopes, pushVar) {
   scopes.push(decs);
   const varIds = [];
   const assignmentStatements = findAssignments(statements, scopes);
-  const undeclaredIdentifiers = assignmentStatements.flatMap((a) => a.names);
+  const undeclaredIdentifiers = assignmentStatements.flatMap(($9) => $9?.names || []);
   undeclaredIdentifiers.filter((x, i, a) => {
     if (!hasDec(x))
       return a.indexOf(x) === i;
@@ -3388,7 +3399,8 @@ function reorderBindingRestProperty(props) {
       ];
     }
     if (Array.isArray(rest.delim) && rest.delim.at(-1)?.token === ",") {
-      rest.delim.pop();
+      rest.delim = rest.delim.slice(0, -1);
+      rest.children = [...rest.children.slice(0, -1), rest.delim];
     }
     const children = [...props, ...after, rest];
     return {
@@ -4133,6 +4145,7 @@ var require_parser = __commonJS({
       ArrowFunction,
       FatArrow,
       TrailingDeclaration,
+      TrailingPipe,
       FatArrowBody,
       ConditionalExpression,
       TernaryRest,
@@ -5750,12 +5763,23 @@ var require_parser = __commonJS({
     function TrailingDeclaration(ctx, state) {
       return $EVENT(ctx, state, "TrailingDeclaration", TrailingDeclaration$0);
     }
-    var FatArrowBody$0 = $TS($S($N(EOS), NonPipelinePostfixedExpression, $N(TrailingDeclaration), $N(SemicolonDelimiter)), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var TrailingPipe$0 = $S($E(_), Pipe);
+    function TrailingPipe(ctx, state) {
+      return $EVENT(ctx, state, "TrailingPipe", TrailingPipe$0);
+    }
+    var FatArrowBody$0 = $TS($S($N(EOS), NonPipelinePostfixedExpression, $N(TrailingDeclaration), $N(TrailingPipe), $N(SemicolonDelimiter)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var exp = $2;
       if (exp.type === "ObjectExpression") {
-        return makeLeftHandSideExpression(exp);
+        exp = makeLeftHandSideExpression(exp);
       }
-      return exp;
+      const expressions = [exp];
+      return {
+        type: "BlockStatement",
+        bare: true,
+        expressions,
+        children: [expressions],
+        implicitlyReturned: true
+      };
     });
     var FatArrowBody$1 = NoCommaBracedOrEmptyBlock;
     var FatArrowBody$$ = [FatArrowBody$0, FatArrowBody$1];
@@ -8322,14 +8346,17 @@ var require_parser = __commonJS({
     function NestedImplicitPropertyDefinitions(ctx, state) {
       return $EVENT(ctx, state, "NestedImplicitPropertyDefinitions", NestedImplicitPropertyDefinitions$0);
     }
-    var NestedImplicitPropertyDefinition$0 = $TS($S(Nested, NamedProperty, ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3) {
-      var ws = $1;
-      var prop = $2;
-      var delimiter = $3;
-      return {
+    var NestedImplicitPropertyDefinition$0 = $TS($S(Nested, $P($S($E(_), NamedProperty, ObjectPropertyDelimiter))), function($skip, $loc, $0, $1, $2) {
+      var indent = $1;
+      var props = $2;
+      return props.map(([ws, prop, delimiter], i) => ({
         ...prop,
-        children: [...ws, ...prop.children, delimiter]
-      };
+        children: [
+          ...i === 0 ? [indent, ws] : [ws],
+          ...prop.children,
+          delimiter
+        ]
+      }));
     });
     function NestedImplicitPropertyDefinition(ctx, state) {
       return $EVENT(ctx, state, "NestedImplicitPropertyDefinition", NestedImplicitPropertyDefinition$0);
@@ -11189,7 +11216,7 @@ var require_parser = __commonJS({
       var flags = $4;
       let hasSubstitutions = body.some((part) => part.type === "Substitution");
       if (hasSubstitutions) {
-        const result = [
+        const children = [
           { ...open, token: "RegExp(`" },
           // Escape backticks, backslashes, and '$' in the body text
           body.map(
@@ -11201,13 +11228,16 @@ var require_parser = __commonJS({
           "`"
         ];
         if (flags.length) {
-          result.push(
+          children.push(
             ", ",
             JSON.stringify(flags)
           );
         }
-        result.push({ ...close, token: ")" });
-        return result;
+        children.push({ ...close, token: ")" });
+        return {
+          type: "RegularExpressionLiteral",
+          children
+        };
       }
       return {
         type: "RegularExpressionLiteral",
@@ -14400,6 +14430,7 @@ var require_parser = __commonJS({
     exports.ArrowFunction = ArrowFunction;
     exports.FatArrow = FatArrow;
     exports.TrailingDeclaration = TrailingDeclaration;
+    exports.TrailingPipe = TrailingPipe;
     exports.FatArrowBody = FatArrowBody;
     exports.ConditionalExpression = ConditionalExpression;
     exports.TernaryRest = TernaryRest;

package/package.json

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