@danielx/civet 0.7.17 → 0.7.18

package/README.md

@@ -16,13 +16,14 @@ The modern way to write TypeScript.
 - [Civet VSCode Extension](https://marketplace.visualstudio.com/items?itemName=DanielX.civet)
 - [Discord Server](https://discord.gg/xkrW9GebBc)
 - Plugins for
-  [Vite, esbuild, Astro, Rollup, Webpack, Rspack](integration/unplugin)
+  [Vite, esbuild, Astro, Rollup, Webpack, Rspack](source/unplugin),
   <!--
   [esbuild](source/esbuild-plugin.civet),
   [Vite](https://github.com/edemaine/vite-plugin-civet),
   -->
   [ESM/CJS loader](source/esm.civet),
   [Babel](source/babel-plugin.mjs),
+  [Jest](https://github.com/DanielXMoore/Civet/blob/main/integration/jest),
   [Gulp](integration/gulp),
   [Bun](source/bun-civet.civet)
 - Starter templates for [Solid](https://github.com/orenelbaum/solid-civet-template) and [Solid Start](https://github.com/orenelbaum/solid-start-civet-template)

package/dist/browser.js

@@ -5653,6 +5653,7 @@ ${js}`
             }
           }
         }
+        const refsToDeclare = /* @__PURE__ */ new Set();
         i = len3 - 1;
         while (i >= 0) {
           const lastAssignment = $1[i];
@@ -5686,6 +5687,7 @@ ${js}`
               }
             } else if (m2 = lhs.type, m2 === "ObjectBindingPattern" || m2 === "ArrayBindingPattern") {
               processBindingPatternLHS(lhs, tail);
+              gatherRecursiveAll(lhs, ($5) => $5.type === "Ref").forEach(refsToDeclare.add.bind(refsToDeclare));
             }
           }
           i--;
@@ -5716,6 +5718,17 @@ ${js}`
           }
           i--;
         }
+        if (refsToDeclare.size) {
+          if (exp.hoistDec) {
+            exp.hoistDec.children.push([...refsToDeclare].map(($6) => [",", $6]));
+          } else {
+            exp.hoistDec = {
+              type: "Declaration",
+              children: ["let ", [...refsToDeclare].map((r, i2) => i2 ? [",", r] : r)],
+              names: []
+            };
+          }
+        }
         exp.names = $1.flatMap(([, l]) => l.names || []);
         if (tail.length) {
           const index = exp.children.indexOf($2);
@@ -5852,7 +5865,7 @@ ${js}`
     });
   }
   function processStatementExpressions(statements) {
-    gatherRecursiveAll(statements, ($5) => $5.type === "StatementExpression").forEach((_exp) => {
+    gatherRecursiveAll(statements, ($7) => $7.type === "StatementExpression").forEach((_exp) => {
       const exp = _exp;
       const { statement } = exp;
       let ref11;
@@ -5982,11 +5995,11 @@ ${js}`
   function processPlaceholders(statements) {
     const placeholderMap = /* @__PURE__ */ new Map();
     const liftedIfs = /* @__PURE__ */ new Set();
-    gatherRecursiveAll(statements, ($6) => $6.type === "Placeholder").forEach((_exp) => {
+    gatherRecursiveAll(statements, ($8) => $8.type === "Placeholder").forEach((_exp) => {
       const exp = _exp;
       let ancestor;
       if (exp.subtype === ".") {
-        ({ ancestor } = findAncestor(exp, ($7) => $7.type === "Call"));
+        ({ ancestor } = findAncestor(exp, ($9) => $9.type === "Call"));
         ancestor = ancestor?.parent;
         while (ancestor?.parent?.type === "UnaryExpression" || ancestor?.parent?.type === "NewExpression") {
           ancestor = ancestor.parent;

package/dist/civet

@@ -516,10 +516,17 @@ You can override this behavior via: --civet rewriteCivetImports=.ext
     options.config ??= await (0, import_config.findConfig)(process.cwd());
   }
   if (options.config) {
+    const parsed = await (0, import_config.loadConfig)(options.config);
     options = {
-      ...await (0, import_config.loadConfig)(options.config),
+      ...parsed,
       ...options
     };
+    if (parsed.parseOptions && options.parseOptions) {
+      options.parseOptions = {
+        ...parsed.parseOptions,
+        ...options.parseOptions
+      };
+    }
   }
   if (options.typescript) {
     const unpluginOptions = {

package/dist/main.js

@@ -5631,6 +5631,7 @@ function processAssignments(statements) {
           }
         }
       }
+      const refsToDeclare = /* @__PURE__ */ new Set();
       i = len3 - 1;
       while (i >= 0) {
         const lastAssignment = $1[i];
@@ -5664,6 +5665,7 @@ function processAssignments(statements) {
             }
           } else if (m2 = lhs.type, m2 === "ObjectBindingPattern" || m2 === "ArrayBindingPattern") {
             processBindingPatternLHS(lhs, tail);
+            gatherRecursiveAll(lhs, ($5) => $5.type === "Ref").forEach(refsToDeclare.add.bind(refsToDeclare));
           }
         }
         i--;
@@ -5694,6 +5696,17 @@ function processAssignments(statements) {
         }
         i--;
       }
+      if (refsToDeclare.size) {
+        if (exp.hoistDec) {
+          exp.hoistDec.children.push([...refsToDeclare].map(($6) => [",", $6]));
+        } else {
+          exp.hoistDec = {
+            type: "Declaration",
+            children: ["let ", [...refsToDeclare].map((r, i2) => i2 ? [",", r] : r)],
+            names: []
+          };
+        }
+      }
       exp.names = $1.flatMap(([, l]) => l.names || []);
       if (tail.length) {
         const index = exp.children.indexOf($2);
@@ -5830,7 +5843,7 @@ function processTypes(node) {
   });
 }
 function processStatementExpressions(statements) {
-  gatherRecursiveAll(statements, ($5) => $5.type === "StatementExpression").forEach((_exp) => {
+  gatherRecursiveAll(statements, ($7) => $7.type === "StatementExpression").forEach((_exp) => {
     const exp = _exp;
     const { statement } = exp;
     let ref11;
@@ -5960,11 +5973,11 @@ function populateRefs(statements) {
 function processPlaceholders(statements) {
   const placeholderMap = /* @__PURE__ */ new Map();
   const liftedIfs = /* @__PURE__ */ new Set();
-  gatherRecursiveAll(statements, ($6) => $6.type === "Placeholder").forEach((_exp) => {
+  gatherRecursiveAll(statements, ($8) => $8.type === "Placeholder").forEach((_exp) => {
     const exp = _exp;
     let ancestor;
     if (exp.subtype === ".") {
-      ({ ancestor } = findAncestor(exp, ($7) => $7.type === "Call"));
+      ({ ancestor } = findAncestor(exp, ($9) => $9.type === "Call"));
       ancestor = ancestor?.parent;
       while (ancestor?.parent?.type === "UnaryExpression" || ancestor?.parent?.type === "NewExpression") {
         ancestor = ancestor.parent;

package/dist/main.mjs

@@ -5611,6 +5611,7 @@ function processAssignments(statements) {
           }
         }
       }
+      const refsToDeclare = /* @__PURE__ */ new Set();
       i = len3 - 1;
       while (i >= 0) {
         const lastAssignment = $1[i];
@@ -5644,6 +5645,7 @@ function processAssignments(statements) {
             }
           } else if (m2 = lhs.type, m2 === "ObjectBindingPattern" || m2 === "ArrayBindingPattern") {
             processBindingPatternLHS(lhs, tail);
+            gatherRecursiveAll(lhs, ($5) => $5.type === "Ref").forEach(refsToDeclare.add.bind(refsToDeclare));
           }
         }
         i--;
@@ -5674,6 +5676,17 @@ function processAssignments(statements) {
         }
         i--;
       }
+      if (refsToDeclare.size) {
+        if (exp.hoistDec) {
+          exp.hoistDec.children.push([...refsToDeclare].map(($6) => [",", $6]));
+        } else {
+          exp.hoistDec = {
+            type: "Declaration",
+            children: ["let ", [...refsToDeclare].map((r, i2) => i2 ? [",", r] : r)],
+            names: []
+          };
+        }
+      }
       exp.names = $1.flatMap(([, l]) => l.names || []);
       if (tail.length) {
         const index = exp.children.indexOf($2);
@@ -5810,7 +5823,7 @@ function processTypes(node) {
   });
 }
 function processStatementExpressions(statements) {
-  gatherRecursiveAll(statements, ($5) => $5.type === "StatementExpression").forEach((_exp) => {
+  gatherRecursiveAll(statements, ($7) => $7.type === "StatementExpression").forEach((_exp) => {
     const exp = _exp;
     const { statement } = exp;
     let ref11;
@@ -5940,11 +5953,11 @@ function populateRefs(statements) {
 function processPlaceholders(statements) {
   const placeholderMap = /* @__PURE__ */ new Map();
   const liftedIfs = /* @__PURE__ */ new Set();
-  gatherRecursiveAll(statements, ($6) => $6.type === "Placeholder").forEach((_exp) => {
+  gatherRecursiveAll(statements, ($8) => $8.type === "Placeholder").forEach((_exp) => {
     const exp = _exp;
     let ancestor;
     if (exp.subtype === ".") {
-      ({ ancestor } = findAncestor(exp, ($7) => $7.type === "Call"));
+      ({ ancestor } = findAncestor(exp, ($9) => $9.type === "Call"));
       ancestor = ancestor?.parent;
       while (ancestor?.parent?.type === "UnaryExpression" || ancestor?.parent?.type === "NewExpression") {
         ancestor = ancestor.parent;

package/package.json

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