@danielx/civet 0.6.55 → 0.6.56

package/dist/browser.js

@@ -2428,6 +2428,32 @@ ${input.slice(result.pos)}
           }
         }
       }
+      function processDeclarations(statements) {
+        gatherRecursiveAll(statements, (n) => {
+          return n.type === "Declaration";
+        }).forEach(({ bindings }) => {
+          return bindings?.forEach((binding) => {
+            const { initializer } = binding;
+            if (!initializer) {
+              return;
+            }
+            const exp = initializer[2];
+            if (exp?.type === "PipelineExpression") {
+              if (exp.children.at(-2) === ",") {
+                const { parent } = exp;
+                const parenthesizedExpression = makeLeftHandSideExpression(exp);
+                parenthesizedExpression.parent = parent;
+                exp.parent = parenthesizedExpression;
+                return initializer[2] = parenthesizedExpression;
+              }
+              ;
+              return;
+            }
+            ;
+            return;
+          });
+        });
+      }
       function implicitFunctionBlock(f) {
         if (f.abstract || f.block || f.signature?.optional)
           return;
@@ -3164,6 +3190,7 @@ ${input.slice(result.pos)}
         const { expressions: statements } = root;
         processDeclarationConditions(statements);
         processPipelineExpressions(statements);
+        processDeclarations(statements);
         processAssignments(statements);
         processPatternMatching(statements, ReservedWord);
         gatherRecursiveAll(statements, (n) => n.type === "IterationExpression").forEach((e) => expressionizeIteration(e));
@@ -7279,11 +7306,19 @@ ${input.slice(result.pos)}
         const expressions = [...stmts];
         if (last)
           expressions.push(last);
+        const maybeComment = expressions.at(-1)?.[2]?.children?.[2]?.at(-1);
+        let hasTrailingComment = false;
+        if (maybeComment?.type === "Comment" && maybeComment.token.startsWith("//")) {
+          hasTrailingComment = true;
+        }
+        const children = [expressions];
+        if (hasTrailingComment) {
+          children.push("\n");
+        }
         return {
           type: "BlockStatement",
           expressions,
-          children: [expressions],
-          // avoid aliasing
+          children,
           bare: true
         };
       });
@@ -9633,7 +9668,7 @@ ${input.slice(result.pos)}
         return $EVENT(ctx, state, "CatchClause", CatchClause$0);
       }
       var CatchBind$0 = $S($E(_), OpenParen, __, CatchParameter, __, CloseParen);
-      var CatchBind$1 = $S(_, InsertOpenParen, CatchParameter, InsertCloseParen);
+      var CatchBind$1 = $S(_, InsertOpenParen, $N(EOS), CatchParameter, InsertCloseParen);
       var CatchBind$$ = [CatchBind$0, CatchBind$1];
       function CatchBind(ctx, state) {
         return $EVENT_C(ctx, state, "CatchBind", CatchBind$$);

package/dist/esbuild.js

@@ -280,7 +280,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
           }
         }
       }
-      const jsonSourceMap = typeof compiled.sourceMap == "string" ? compiled.sourceMap : compiled.sourceMap.json(
+      const jsonSourceMap = typeof compiled.sourceMap == "string" ? JSON.parse(compiled.sourceMap) : compiled.sourceMap.json(
         import_path.default.basename(id.replace(/\.[jt]sx$/, "")),
         import_path.default.basename(id)
       );

package/dist/main.js

@@ -2420,6 +2420,32 @@ var require_lib = __commonJS({
         }
       }
     }
+    function processDeclarations(statements) {
+      gatherRecursiveAll(statements, (n) => {
+        return n.type === "Declaration";
+      }).forEach(({ bindings }) => {
+        return bindings?.forEach((binding) => {
+          const { initializer } = binding;
+          if (!initializer) {
+            return;
+          }
+          const exp = initializer[2];
+          if (exp?.type === "PipelineExpression") {
+            if (exp.children.at(-2) === ",") {
+              const { parent } = exp;
+              const parenthesizedExpression = makeLeftHandSideExpression(exp);
+              parenthesizedExpression.parent = parent;
+              exp.parent = parenthesizedExpression;
+              return initializer[2] = parenthesizedExpression;
+            }
+            ;
+            return;
+          }
+          ;
+          return;
+        });
+      });
+    }
     function implicitFunctionBlock(f) {
       if (f.abstract || f.block || f.signature?.optional)
         return;
@@ -3156,6 +3182,7 @@ var require_lib = __commonJS({
       const { expressions: statements } = root;
       processDeclarationConditions(statements);
       processPipelineExpressions(statements);
+      processDeclarations(statements);
       processAssignments(statements);
       processPatternMatching(statements, ReservedWord);
       gatherRecursiveAll(statements, (n) => n.type === "IterationExpression").forEach((e) => expressionizeIteration(e));
@@ -7271,11 +7298,19 @@ var require_parser = __commonJS({
       const expressions = [...stmts];
       if (last)
         expressions.push(last);
+      const maybeComment = expressions.at(-1)?.[2]?.children?.[2]?.at(-1);
+      let hasTrailingComment = false;
+      if (maybeComment?.type === "Comment" && maybeComment.token.startsWith("//")) {
+        hasTrailingComment = true;
+      }
+      const children = [expressions];
+      if (hasTrailingComment) {
+        children.push("\n");
+      }
       return {
         type: "BlockStatement",
         expressions,
-        children: [expressions],
-        // avoid aliasing
+        children,
         bare: true
       };
     });
@@ -9625,7 +9660,7 @@ var require_parser = __commonJS({
       return $EVENT(ctx, state, "CatchClause", CatchClause$0);
     }
     var CatchBind$0 = $S($E(_), OpenParen, __, CatchParameter, __, CloseParen);
-    var CatchBind$1 = $S(_, InsertOpenParen, CatchParameter, InsertCloseParen);
+    var CatchBind$1 = $S(_, InsertOpenParen, $N(EOS), CatchParameter, InsertCloseParen);
     var CatchBind$$ = [CatchBind$0, CatchBind$1];
     function CatchBind(ctx, state) {
       return $EVENT_C(ctx, state, "CatchBind", CatchBind$$);

package/dist/main.mjs

@@ -2418,6 +2418,32 @@ var require_lib = __commonJS({
         }
       }
     }
+    function processDeclarations(statements) {
+      gatherRecursiveAll(statements, (n) => {
+        return n.type === "Declaration";
+      }).forEach(({ bindings }) => {
+        return bindings?.forEach((binding) => {
+          const { initializer } = binding;
+          if (!initializer) {
+            return;
+          }
+          const exp = initializer[2];
+          if (exp?.type === "PipelineExpression") {
+            if (exp.children.at(-2) === ",") {
+              const { parent } = exp;
+              const parenthesizedExpression = makeLeftHandSideExpression(exp);
+              parenthesizedExpression.parent = parent;
+              exp.parent = parenthesizedExpression;
+              return initializer[2] = parenthesizedExpression;
+            }
+            ;
+            return;
+          }
+          ;
+          return;
+        });
+      });
+    }
     function implicitFunctionBlock(f) {
       if (f.abstract || f.block || f.signature?.optional)
         return;
@@ -3154,6 +3180,7 @@ var require_lib = __commonJS({
       const { expressions: statements } = root;
       processDeclarationConditions(statements);
       processPipelineExpressions(statements);
+      processDeclarations(statements);
       processAssignments(statements);
       processPatternMatching(statements, ReservedWord);
       gatherRecursiveAll(statements, (n) => n.type === "IterationExpression").forEach((e) => expressionizeIteration(e));
@@ -7269,11 +7296,19 @@ var require_parser = __commonJS({
       const expressions = [...stmts];
       if (last)
         expressions.push(last);
+      const maybeComment = expressions.at(-1)?.[2]?.children?.[2]?.at(-1);
+      let hasTrailingComment = false;
+      if (maybeComment?.type === "Comment" && maybeComment.token.startsWith("//")) {
+        hasTrailingComment = true;
+      }
+      const children = [expressions];
+      if (hasTrailingComment) {
+        children.push("\n");
+      }
       return {
         type: "BlockStatement",
         expressions,
-        children: [expressions],
-        // avoid aliasing
+        children,
         bare: true
       };
     });
@@ -9623,7 +9658,7 @@ var require_parser = __commonJS({
       return $EVENT(ctx, state, "CatchClause", CatchClause$0);
     }
     var CatchBind$0 = $S($E(_), OpenParen, __, CatchParameter, __, CloseParen);
-    var CatchBind$1 = $S(_, InsertOpenParen, CatchParameter, InsertCloseParen);
+    var CatchBind$1 = $S(_, InsertOpenParen, $N(EOS), CatchParameter, InsertCloseParen);
     var CatchBind$$ = [CatchBind$0, CatchBind$1];
     function CatchBind(ctx, state) {
       return $EVENT_C(ctx, state, "CatchBind", CatchBind$$);

package/dist/rollup.js

@@ -280,7 +280,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
           }
         }
       }
-      const jsonSourceMap = typeof compiled.sourceMap == "string" ? compiled.sourceMap : compiled.sourceMap.json(
+      const jsonSourceMap = typeof compiled.sourceMap == "string" ? JSON.parse(compiled.sourceMap) : compiled.sourceMap.json(
         import_path.default.basename(id.replace(/\.[jt]sx$/, "")),
         import_path.default.basename(id)
       );

package/dist/unplugin-shared.mjs

@@ -1,7 +1,5 @@
 // src/index.ts
-import {
-  createUnplugin
-} from "unplugin";
+import { createUnplugin } from "unplugin";
 import civet from "@danielx/civet";
 import {
   remapRange,
@@ -249,7 +247,7 @@ var civetUnplugin = createUnplugin((options = {}) => {
           }
         }
       }
-      const jsonSourceMap = typeof compiled.sourceMap == "string" ? compiled.sourceMap : compiled.sourceMap.json(
+      const jsonSourceMap = typeof compiled.sourceMap == "string" ? JSON.parse(compiled.sourceMap) : compiled.sourceMap.json(
         path.basename(id.replace(/\.[jt]sx$/, "")),
         path.basename(id)
       );

package/dist/unplugin.js

@@ -279,7 +279,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
           }
         }
       }
-      const jsonSourceMap = typeof compiled.sourceMap == "string" ? compiled.sourceMap : compiled.sourceMap.json(
+      const jsonSourceMap = typeof compiled.sourceMap == "string" ? JSON.parse(compiled.sourceMap) : compiled.sourceMap.json(
         import_path.default.basename(id.replace(/\.[jt]sx$/, "")),
         import_path.default.basename(id)
       );

package/dist/vite.js

@@ -280,7 +280,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
           }
         }
       }
-      const jsonSourceMap = typeof compiled.sourceMap == "string" ? compiled.sourceMap : compiled.sourceMap.json(
+      const jsonSourceMap = typeof compiled.sourceMap == "string" ? JSON.parse(compiled.sourceMap) : compiled.sourceMap.json(
         import_path.default.basename(id.replace(/\.[jt]sx$/, "")),
         import_path.default.basename(id)
       );

package/dist/webpack.js

@@ -280,7 +280,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
           }
         }
       }
-      const jsonSourceMap = typeof compiled.sourceMap == "string" ? compiled.sourceMap : compiled.sourceMap.json(
+      const jsonSourceMap = typeof compiled.sourceMap == "string" ? JSON.parse(compiled.sourceMap) : compiled.sourceMap.json(
         import_path.default.basename(id.replace(/\.[jt]sx$/, "")),
         import_path.default.basename(id)
       );

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.6.55",
+  "version": "0.6.56",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -72,6 +72,7 @@
   "devDependencies": {
     "@danielx/civet": "0.6.45",
     "@danielx/hera": "^0.8.10",
+    "@prettier/sync": "^0.3.0",
     "@types/assert": "^1.5.6",
     "@types/mocha": "^9.1.1",
     "@types/node": "^20.5.1",
@@ -80,13 +81,13 @@
     "esbuild": "0.16.17",
     "marked": "^4.2.4",
     "mocha": "^10.0.0",
-    "prettier": "^2.8.1",
+    "prettier": "^3.1.1",
     "terser": "^5.16.1",
     "ts-node": "^10.9.1",
     "tslib": "^2.4.0",
     "tsup": "^7.2.0",
     "typescript": "^5.2.2",
-    "vite": "^4.4.9",
+    "vite": "^4.4.12",
     "vitepress": "^1.0.0-alpha.35",
     "vscode-languageserver": "^8.1.0",
     "vscode-languageserver-textdocument": "^1.0.8",