@danielx/civet 0.6.77 → 0.6.79

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/esbuild.js

@@ -239,20 +239,18 @@ var rawPlugin = (options = {}, meta) => {
       if (/\0/.test(id))
         return null;
       id = cleanCivetId(id);
-      const absolutePath = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
-      if (!absolutePath)
+      let resolvedId = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+      if (!resolvedId)
         return null;
-      let relativeId = import_path.default.relative(process.cwd(), absolutePath);
-      if (!relativeId.endsWith(".civet")) {
+      if (!resolvedId.endsWith(".civet")) {
         if (!implicitExtension)
           return null;
-        const implicitId = implicitCivet(relativeId);
+        const implicitId = implicitCivet(resolvedId);
         if (!implicitId)
           return null;
-        relativeId = implicitId;
+        resolvedId = implicitId;
       }
-      const relativePath = relativeId + outExt;
-      return relativePath;
+      return resolvedId + outExt;
     },
     loadInclude(id) {
       return isCivetTranspiled(id);
@@ -260,7 +258,7 @@ var rawPlugin = (options = {}, meta) => {
     async load(id) {
       if (!isCivetTranspiled(id))
         return null;
-      const filename = import_path.default.resolve(process.cwd(), id.slice(0, -outExt.length));
+      const filename = import_path.default.resolve(rootDir, id.slice(0, -outExt.length));
       const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
       this.addWatchFile(filename);
       let compiled;
@@ -380,10 +378,10 @@ var rawPlugin = (options = {}, meta) => {
       handleHotUpdate({ file, server, modules }) {
         if (!file.endsWith(".civet"))
           return;
-        const relativeId = slash(import_path.default.relative(process.cwd(), file) + outExt);
-        const module2 = server.moduleGraph.getModuleById(relativeId);
+        const resolvedId = slash(import_path.default.resolve(file) + outExt);
+        const module2 = server.moduleGraph.getModuleById(resolvedId);
         if (module2) {
-          server.moduleGraph.onFileChange(relativeId);
+          server.moduleGraph.onFileChange(resolvedId);
           return [...modules, module2];
         }
         return modules;

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/dist/rollup.js

@@ -239,20 +239,18 @@ var rawPlugin = (options = {}, meta) => {
       if (/\0/.test(id))
         return null;
       id = cleanCivetId(id);
-      const absolutePath = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
-      if (!absolutePath)
+      let resolvedId = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+      if (!resolvedId)
         return null;
-      let relativeId = import_path.default.relative(process.cwd(), absolutePath);
-      if (!relativeId.endsWith(".civet")) {
+      if (!resolvedId.endsWith(".civet")) {
         if (!implicitExtension)
           return null;
-        const implicitId = implicitCivet(relativeId);
+        const implicitId = implicitCivet(resolvedId);
         if (!implicitId)
           return null;
-        relativeId = implicitId;
+        resolvedId = implicitId;
       }
-      const relativePath = relativeId + outExt;
-      return relativePath;
+      return resolvedId + outExt;
     },
     loadInclude(id) {
       return isCivetTranspiled(id);
@@ -260,7 +258,7 @@ var rawPlugin = (options = {}, meta) => {
     async load(id) {
       if (!isCivetTranspiled(id))
         return null;
-      const filename = import_path.default.resolve(process.cwd(), id.slice(0, -outExt.length));
+      const filename = import_path.default.resolve(rootDir, id.slice(0, -outExt.length));
       const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
       this.addWatchFile(filename);
       let compiled;
@@ -380,10 +378,10 @@ var rawPlugin = (options = {}, meta) => {
       handleHotUpdate({ file, server, modules }) {
         if (!file.endsWith(".civet"))
           return;
-        const relativeId = slash(import_path.default.relative(process.cwd(), file) + outExt);
-        const module2 = server.moduleGraph.getModuleById(relativeId);
+        const resolvedId = slash(import_path.default.resolve(file) + outExt);
+        const module2 = server.moduleGraph.getModuleById(resolvedId);
         if (module2) {
-          server.moduleGraph.onFileChange(relativeId);
+          server.moduleGraph.onFileChange(resolvedId);
           return [...modules, module2];
         }
         return modules;

package/dist/unplugin-shared.mjs

@@ -206,20 +206,18 @@ var rawPlugin = (options = {}, meta) => {
       if (/\0/.test(id))
         return null;
       id = cleanCivetId(id);
-      const absolutePath = path.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : path.resolve(path.dirname(importer ?? ""), id);
-      if (!absolutePath)
+      let resolvedId = path.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : path.resolve(path.dirname(importer ?? ""), id);
+      if (!resolvedId)
         return null;
-      let relativeId = path.relative(process.cwd(), absolutePath);
-      if (!relativeId.endsWith(".civet")) {
+      if (!resolvedId.endsWith(".civet")) {
         if (!implicitExtension)
           return null;
-        const implicitId = implicitCivet(relativeId);
+        const implicitId = implicitCivet(resolvedId);
         if (!implicitId)
           return null;
-        relativeId = implicitId;
+        resolvedId = implicitId;
       }
-      const relativePath = relativeId + outExt;
-      return relativePath;
+      return resolvedId + outExt;
     },
     loadInclude(id) {
       return isCivetTranspiled(id);
@@ -227,7 +225,7 @@ var rawPlugin = (options = {}, meta) => {
     async load(id) {
       if (!isCivetTranspiled(id))
         return null;
-      const filename = path.resolve(process.cwd(), id.slice(0, -outExt.length));
+      const filename = path.resolve(rootDir, id.slice(0, -outExt.length));
       const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
       this.addWatchFile(filename);
       let compiled;
@@ -347,10 +345,10 @@ var rawPlugin = (options = {}, meta) => {
       handleHotUpdate({ file, server, modules }) {
         if (!file.endsWith(".civet"))
           return;
-        const relativeId = slash(path.relative(process.cwd(), file) + outExt);
-        const module = server.moduleGraph.getModuleById(relativeId);
+        const resolvedId = slash(path.resolve(file) + outExt);
+        const module = server.moduleGraph.getModuleById(resolvedId);
         if (module) {
-          server.moduleGraph.onFileChange(relativeId);
+          server.moduleGraph.onFileChange(resolvedId);
           return [...modules, module];
         }
         return modules;

package/dist/unplugin.js

@@ -239,20 +239,18 @@ var rawPlugin = (options = {}, meta) => {
       if (/\0/.test(id))
         return null;
       id = cleanCivetId(id);
-      const absolutePath = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
-      if (!absolutePath)
+      let resolvedId = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+      if (!resolvedId)
         return null;
-      let relativeId = import_path.default.relative(process.cwd(), absolutePath);
-      if (!relativeId.endsWith(".civet")) {
+      if (!resolvedId.endsWith(".civet")) {
         if (!implicitExtension)
           return null;
-        const implicitId = implicitCivet(relativeId);
+        const implicitId = implicitCivet(resolvedId);
         if (!implicitId)
           return null;
-        relativeId = implicitId;
+        resolvedId = implicitId;
       }
-      const relativePath = relativeId + outExt;
-      return relativePath;
+      return resolvedId + outExt;
     },
     loadInclude(id) {
       return isCivetTranspiled(id);
@@ -260,7 +258,7 @@ var rawPlugin = (options = {}, meta) => {
     async load(id) {
       if (!isCivetTranspiled(id))
         return null;
-      const filename = import_path.default.resolve(process.cwd(), id.slice(0, -outExt.length));
+      const filename = import_path.default.resolve(rootDir, id.slice(0, -outExt.length));
       const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
       this.addWatchFile(filename);
       let compiled;
@@ -380,10 +378,10 @@ var rawPlugin = (options = {}, meta) => {
       handleHotUpdate({ file, server, modules }) {
         if (!file.endsWith(".civet"))
           return;
-        const relativeId = slash(import_path.default.relative(process.cwd(), file) + outExt);
-        const module2 = server.moduleGraph.getModuleById(relativeId);
+        const resolvedId = slash(import_path.default.resolve(file) + outExt);
+        const module2 = server.moduleGraph.getModuleById(resolvedId);
         if (module2) {
-          server.moduleGraph.onFileChange(relativeId);
+          server.moduleGraph.onFileChange(resolvedId);
           return [...modules, module2];
         }
         return modules;

package/dist/vite.js

@@ -239,20 +239,18 @@ var rawPlugin = (options = {}, meta) => {
       if (/\0/.test(id))
         return null;
       id = cleanCivetId(id);
-      const absolutePath = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
-      if (!absolutePath)
+      let resolvedId = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+      if (!resolvedId)
         return null;
-      let relativeId = import_path.default.relative(process.cwd(), absolutePath);
-      if (!relativeId.endsWith(".civet")) {
+      if (!resolvedId.endsWith(".civet")) {
         if (!implicitExtension)
           return null;
-        const implicitId = implicitCivet(relativeId);
+        const implicitId = implicitCivet(resolvedId);
         if (!implicitId)
           return null;
-        relativeId = implicitId;
+        resolvedId = implicitId;
       }
-      const relativePath = relativeId + outExt;
-      return relativePath;
+      return resolvedId + outExt;
     },
     loadInclude(id) {
       return isCivetTranspiled(id);
@@ -260,7 +258,7 @@ var rawPlugin = (options = {}, meta) => {
     async load(id) {
       if (!isCivetTranspiled(id))
         return null;
-      const filename = import_path.default.resolve(process.cwd(), id.slice(0, -outExt.length));
+      const filename = import_path.default.resolve(rootDir, id.slice(0, -outExt.length));
       const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
       this.addWatchFile(filename);
       let compiled;
@@ -380,10 +378,10 @@ var rawPlugin = (options = {}, meta) => {
       handleHotUpdate({ file, server, modules }) {
         if (!file.endsWith(".civet"))
           return;
-        const relativeId = slash(import_path.default.relative(process.cwd(), file) + outExt);
-        const module2 = server.moduleGraph.getModuleById(relativeId);
+        const resolvedId = slash(import_path.default.resolve(file) + outExt);
+        const module2 = server.moduleGraph.getModuleById(resolvedId);
         if (module2) {
-          server.moduleGraph.onFileChange(relativeId);
+          server.moduleGraph.onFileChange(resolvedId);
           return [...modules, module2];
         }
         return modules;

package/dist/webpack.js

@@ -239,20 +239,18 @@ var rawPlugin = (options = {}, meta) => {
       if (/\0/.test(id))
         return null;
       id = cleanCivetId(id);
-      const absolutePath = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
-      if (!absolutePath)
+      let resolvedId = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+      if (!resolvedId)
         return null;
-      let relativeId = import_path.default.relative(process.cwd(), absolutePath);
-      if (!relativeId.endsWith(".civet")) {
+      if (!resolvedId.endsWith(".civet")) {
         if (!implicitExtension)
           return null;
-        const implicitId = implicitCivet(relativeId);
+        const implicitId = implicitCivet(resolvedId);
         if (!implicitId)
           return null;
-        relativeId = implicitId;
+        resolvedId = implicitId;
       }
-      const relativePath = relativeId + outExt;
-      return relativePath;
+      return resolvedId + outExt;
     },
     loadInclude(id) {
       return isCivetTranspiled(id);
@@ -260,7 +258,7 @@ var rawPlugin = (options = {}, meta) => {
     async load(id) {
       if (!isCivetTranspiled(id))
         return null;
-      const filename = import_path.default.resolve(process.cwd(), id.slice(0, -outExt.length));
+      const filename = import_path.default.resolve(rootDir, id.slice(0, -outExt.length));
       const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
       this.addWatchFile(filename);
       let compiled;
@@ -380,10 +378,10 @@ var rawPlugin = (options = {}, meta) => {
       handleHotUpdate({ file, server, modules }) {
         if (!file.endsWith(".civet"))
           return;
-        const relativeId = slash(import_path.default.relative(process.cwd(), file) + outExt);
-        const module2 = server.moduleGraph.getModuleById(relativeId);
+        const resolvedId = slash(import_path.default.resolve(file) + outExt);
+        const module2 = server.moduleGraph.getModuleById(resolvedId);
         if (module2) {
-          server.moduleGraph.onFileChange(relativeId);
+          server.moduleGraph.onFileChange(resolvedId);
           return [...modules, module2];
         }
         return modules;

package/package.json

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