@danielx/civet 0.10.3 → 0.10.5

package/dist/unplugin/unplugin.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/unplugin.civet.jsx
 import { createUnplugin } from "unplugin";
 import civet, { lib, SourceMap } from "@danielx/civet";
 import { findInDir, loadConfig } from "@danielx/civet/config";
@@ -14,24 +14,26 @@ import os from "os";
 // source/unplugin/constants.mjs
 var DEFAULT_EXTENSIONS = [".mjs", ".js", ".mts", ".ts", ".jsx", ".tsx", ".json"];
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/unplugin.civet.jsx
 var DiagnosticCategory = {};
 DiagnosticCategory[DiagnosticCategory["Warning"] = 0] = "Warning";
 DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error";
 DiagnosticCategory[DiagnosticCategory["Suggestion"] = 2] = "Suggestion";
 DiagnosticCategory[DiagnosticCategory["Message"] = 3] = "Message";
-var civetExtension = /\.civet$/;
-var isCivetTranspiled = /(\.civet)(\.[jt]sx)?([?#].*)?$/;
 var postfixRE = /[?#].*$/s;
 var isWindows = os.platform() === "win32";
 var windowsSlashRE = /\\/g;
-function cleanCivetId(id) {
+var civetSuffix = ".civet";
+function extractCivetFilename(id, outputExtension) {
   let postfix = "";
-  id = id.replace(postfixRE, (match) => {
+  let filename = id.replace(postfixRE, (match) => {
     postfix = match;
     return "";
-  }).replace(/\.[jt]sx$/, "");
-  return { id, postfix };
+  });
+  if (filename.endsWith(outputExtension)) {
+    filename = filename.slice(0, -outputExtension.length);
+  }
+  return { filename, postfix };
 }
 function tryStatSync(file) {
   try {
@@ -327,10 +329,8 @@ var rawPlugin = (options = {}, meta) => {
                   } else {
                     console.log(`WARNING: No .d.ts extension in ${filePath}`);
                   }
-                  let ref1;
-                  if (ref1 = filePath.match(civetExtension)) {
-                    const match = ref1;
-                    filePath = filePath.slice(0, -match[0].length);
+                  if (filePath.endsWith(civetSuffix)) {
+                    filePath = filePath.slice(0, -civetSuffix.length);
                   } else {
                     console.log(`WARNING: No .civet extension in ${filePath}`);
                   }
@@ -363,38 +363,36 @@ var rawPlugin = (options = {}, meta) => {
         id = aliasResolver(id);
       }
       if (/\0/.test(id)) return null;
-      let postfix;
-      ({ id, postfix } = cleanCivetId(id));
-      let ref2;
-      if (path.isAbsolute(id)) {
-        ref2 = resolveAbsolutePath(rootDir, id, implicitExtension);
+      const { filename, postfix } = extractCivetFilename(id, outExt);
+      let ref1;
+      if (path.isAbsolute(filename)) {
+        ref1 = resolveAbsolutePath(rootDir, filename, implicitExtension);
       } else {
-        ref2 = path.resolve(path.dirname(importer ?? ""), id);
+        ref1 = path.resolve(path.dirname(importer ?? ""), filename);
       }
       ;
-      let resolvedId = ref2;
-      if (!resolvedId) return null;
-      if (!resolvedId.endsWith(".civet")) {
+      let resolved = ref1;
+      if (!resolved) return null;
+      if (!resolved.endsWith(civetSuffix)) {
         if (!implicitExtension) return null;
-        const implicitId = implicitCivet(resolvedId);
+        const implicitId = implicitCivet(resolved);
         if (!implicitId) return null;
-        resolvedId = implicitId;
+        resolved = implicitId;
       }
       if (options2.scan && meta.framework === "vite") {
-        resolvedId = `\0${resolvedId}`;
+        resolved = `\0${resolved}`;
       }
-      return resolvedId + outExt + postfix;
+      return resolved + outExt + postfix;
     },
     loadInclude(id) {
-      return isCivetTranspiled.test(id);
+      return extractCivetFilename(id, outExt).filename.endsWith(civetSuffix);
     },
     async load(id) {
-      const match = isCivetTranspiled.exec(id);
-      if (!match) {
+      let { filename } = extractCivetFilename(id, outExt);
+      if (!filename.endsWith(civetSuffix)) {
         return null;
       }
-      const basename = id.slice(0, match.index + match[1].length);
-      const filename = path.resolve(rootDir, basename);
+      filename = path.resolve(rootDir, filename);
       this.addWatchFile(filename);
       let mtime, cached, resolve;
       if (cache != null) {
@@ -408,9 +406,9 @@ var rawPlugin = (options = {}, meta) => {
             if (cached.promise) {
               await cached.promise;
             }
-            let ref3;
-            if ((ref3 = cached.result) != null) {
-              const result = ref3;
+            let ref2;
+            if ((ref2 = cached.result) != null) {
+              const result = ref2;
               return result;
             }
           }
@@ -486,8 +484,8 @@ var rawPlugin = (options = {}, meta) => {
           }
         }
         if (transformTS) {
-          for (let ref4 = lib.gatherRecursive(ast, ($) => $.type === "ModuleSpecifier"), i = 0, len = ref4.length; i < len; i++) {
-            const _spec = ref4[i];
+          for (let ref3 = lib.gatherRecursive(ast, ($) => $.type === "ModuleSpecifier"), i = 0, len = ref3.length; i < len; i++) {
+            const _spec = ref3[i];
             const spec = _spec;
             if (spec.module?.input) {
               spec.module.token = spec.module.input.replace(/\.([mc])?ts(['"])$/, ".$1js$2");
@@ -590,9 +588,9 @@ var rawPlugin = (options = {}, meta) => {
         compiler.options.resolve.extensions.unshift(".civet");
       }
       return aliasResolver = (id) => {
-        let ref5;
-        for (const key in ref5 = compiler.options.resolve.alias) {
-          const value = ref5[key];
+        let ref4;
+        for (const key in ref4 = compiler.options.resolve.alias) {
+          const value = ref4[key];
           if (key.endsWith("$")) {
             if (id === key.slice(0, -1)) {
               return typeof value === "string" ? value : "\0";

package/dist/unplugin/vite.js

@@ -26,7 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\vite.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/vite.civet.jsx
 var vite_civet_exports = {};
 __export(vite_civet_exports, {
   default: () => vite_civet_default

package/dist/unplugin/vite.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\vite.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/vite.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var vite_civet_default = civetUnplugin.vite;
 export {

package/dist/unplugin/webpack.js

@@ -26,7 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\webpack.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/webpack.civet.jsx
 var webpack_civet_exports = {};
 __export(webpack_civet_exports, {
   default: () => webpack_civet_default

package/dist/unplugin/webpack.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\webpack.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/webpack.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var webpack_civet_default = civetUnplugin.webpack;
 export {

package/package.json

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