@danielx/civet 0.6.77 → 0.6.78

package/dist/browser.js

@@ -1432,16 +1432,15 @@ var Civet = (() => {
     switch (node.type) {
       case "BlockStatement":
         if (node.expressions.length) {
-          const last = node.expressions[node.expressions.length - 1];
-          insertPush(last, ref);
+          insertPush(node.expressions.at(-1), ref);
         } else {
           node.expressions.push([ref, ".push(void 0);"]);
         }
         return;
       case "CaseBlock":
-        node.clauses.forEach((clause) => ({
-          insertPush: insertPush(clause, ref)
-        }));
+        node.clauses.forEach((clause) => {
+          return insertPush(clause, ref);
+        });
         return;
       case "WhenClause":
         insertPush(node.block, ref);
@@ -1490,8 +1489,8 @@ var Civet = (() => {
         return;
       case "IfStatement":
         insertPush(exp.then, ref);
-        if (exp.then.bare) {
-          exp.then.children.push(";");
+        if (exp.then.bare && !exp.then.semicolon) {
+          exp.then.children.push(exp.then.semicolon = ";");
         }
         if (exp.else)
           insertPush(exp.else[2], ref);
@@ -2468,11 +2467,10 @@ var Civet = (() => {
         const { else: e } = s;
         const block = blockWithPrefix(condition.expression.blockPrefix, s.then);
         s.then = block;
-        const toAdd = [block];
-        if (block.bare && e) {
-          toAdd.push(";");
+        if (block.bare && e && !block.semicolon) {
+          block.children.push(block.semicolon = ";");
         }
-        s.children.splice(2, 1, ...toAdd);
+        s.children.splice(2, 1, block);
         updateParentPointers(block, s);
         break;
       }

package/dist/civet

@@ -347,7 +347,7 @@ async function cli() {
     };
     (unpluginOptions.parseOptions ??= {}).rewriteCivetImports = ".civet.tsx";
     unplugin = (0, import_unplugin.rawPlugin)(unpluginOptions, { framework: "civet-cli" });
-    unplugin.buildStart();
+    await unplugin.buildStart();
   }
   if (options.run) {
     options.js = true;

package/dist/main.js

@@ -1424,16 +1424,15 @@ function insertPush(node, ref) {
   switch (node.type) {
     case "BlockStatement":
       if (node.expressions.length) {
-        const last = node.expressions[node.expressions.length - 1];
-        insertPush(last, ref);
+        insertPush(node.expressions.at(-1), ref);
       } else {
         node.expressions.push([ref, ".push(void 0);"]);
       }
       return;
     case "CaseBlock":
-      node.clauses.forEach((clause) => ({
-        insertPush: insertPush(clause, ref)
-      }));
+      node.clauses.forEach((clause) => {
+        return insertPush(clause, ref);
+      });
       return;
     case "WhenClause":
       insertPush(node.block, ref);
@@ -1482,8 +1481,8 @@ function insertPush(node, ref) {
       return;
     case "IfStatement":
       insertPush(exp.then, ref);
-      if (exp.then.bare) {
-        exp.then.children.push(";");
+      if (exp.then.bare && !exp.then.semicolon) {
+        exp.then.children.push(exp.then.semicolon = ";");
       }
       if (exp.else)
         insertPush(exp.else[2], ref);
@@ -2460,11 +2459,10 @@ function processDeclarationConditionStatement(s) {
       const { else: e } = s;
       const block = blockWithPrefix(condition.expression.blockPrefix, s.then);
       s.then = block;
-      const toAdd = [block];
-      if (block.bare && e) {
-        toAdd.push(";");
+      if (block.bare && e && !block.semicolon) {
+        block.children.push(block.semicolon = ";");
       }
-      s.children.splice(2, 1, ...toAdd);
+      s.children.splice(2, 1, block);
       updateParentPointers(block, s);
       break;
     }

package/dist/main.mjs

@@ -1422,16 +1422,15 @@ function insertPush(node, ref) {
   switch (node.type) {
     case "BlockStatement":
       if (node.expressions.length) {
-        const last = node.expressions[node.expressions.length - 1];
-        insertPush(last, ref);
+        insertPush(node.expressions.at(-1), ref);
       } else {
         node.expressions.push([ref, ".push(void 0);"]);
       }
       return;
     case "CaseBlock":
-      node.clauses.forEach((clause) => ({
-        insertPush: insertPush(clause, ref)
-      }));
+      node.clauses.forEach((clause) => {
+        return insertPush(clause, ref);
+      });
       return;
     case "WhenClause":
       insertPush(node.block, ref);
@@ -1480,8 +1479,8 @@ function insertPush(node, ref) {
       return;
     case "IfStatement":
       insertPush(exp.then, ref);
-      if (exp.then.bare) {
-        exp.then.children.push(";");
+      if (exp.then.bare && !exp.then.semicolon) {
+        exp.then.children.push(exp.then.semicolon = ";");
       }
       if (exp.else)
         insertPush(exp.else[2], ref);
@@ -2458,11 +2457,10 @@ function processDeclarationConditionStatement(s) {
       const { else: e } = s;
       const block = blockWithPrefix(condition.expression.blockPrefix, s.then);
       s.then = block;
-      const toAdd = [block];
-      if (block.bare && e) {
-        toAdd.push(";");
+      if (block.bare && e && !block.semicolon) {
+        block.children.push(block.semicolon = ";");
       }
-      s.children.splice(2, 1, ...toAdd);
+      s.children.splice(2, 1, block);
       updateParentPointers(block, s);
       break;
     }

package/package.json

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