@danielx/civet 0.7.32 → 0.7.34

package/dist/types.d.ts

@@ -20,6 +20,7 @@ declare module "@danielx/civet" {
     coffeeOf: boolean
     coffeePrototype: boolean
     defaultElement: string
+    globals: string[]
     implicitReturns: boolean
     jsxCode: boolean
     objectIs: boolean

package/dist/unplugin/astro.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:/home/daniel/apps/Civet/source/unplugin/astro.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\astro.civet.jsx
 var astro_civet_exports = {};
 __export(astro_civet_exports, {
   default: () => astro_civet_default

package/dist/unplugin/astro.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/astro.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\astro.civet.jsx
 import civetUnplugin, {} from "./unplugin.mjs";
 var astro_civet_default = function(opts = {}) {
   return {

package/dist/unplugin/esbuild.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:/home/daniel/apps/Civet/source/unplugin/esbuild.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\esbuild.civet.jsx
 var esbuild_civet_exports = {};
 __export(esbuild_civet_exports, {
   default: () => esbuild_civet_default

package/dist/unplugin/esbuild.mjs

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

package/dist/unplugin/rollup.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (options: import("./unplugin.js").PluginOptions) => import("rollup").Plugin | import("rollup").Plugin[];
+declare const _default: (options: import("./unplugin.js").PluginOptions) => import("rollup").Plugin<any> | import("rollup").Plugin<any>[];
 export default _default;

package/dist/unplugin/rollup.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:/home/daniel/apps/Civet/source/unplugin/rollup.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rollup.civet.jsx
 var rollup_civet_exports = {};
 __export(rollup_civet_exports, {
   default: () => rollup_civet_default

package/dist/unplugin/rollup.mjs

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

package/dist/unplugin/unplugin.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:/home/daniel/apps/Civet/source/unplugin/unplugin.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
 var unplugin_civet_exports = {};
 __export(unplugin_civet_exports, {
   default: () => unplugin_civet_default,
@@ -46,7 +46,7 @@ var import_os = __toESM(require("os"));
 // source/unplugin/constants.mjs
 var DEFAULT_EXTENSIONS = [".mjs", ".js", ".mts", ".ts", ".jsx", ".tsx", ".json"];
 
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/unplugin.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
 var DiagnosticCategory = {};
 DiagnosticCategory[DiagnosticCategory["Warning"] = 0] = "Warning";
 DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error";
@@ -57,7 +57,12 @@ var postfixRE = /[?#].*$/s;
 var isWindows = import_os.default.platform() === "win32";
 var windowsSlashRE = /\\/g;
 function cleanCivetId(id) {
-  return id.replace(postfixRE, "").replace(/\.[jt]sx$/, "");
+  let postfix = "";
+  id = id.replace(postfixRE, (match) => {
+    postfix = match;
+    return "";
+  }).replace(/\.[jt]sx$/, "");
+  return { id, postfix };
 }
 function tryStatSync(file) {
   try {
@@ -357,8 +362,16 @@ var rawPlugin = (options = {}, meta) => {
     resolveId(id, importer, options2) {
       if (/\0/.test(id))
         return null;
-      id = cleanCivetId(id);
-      let resolvedId = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+      let postfix;
+      ({ id, postfix } = cleanCivetId(id));
+      let ref;
+      if (import_path.default.isAbsolute(id)) {
+        ref = resolveAbsolutePath(rootDir, id, implicitExtension);
+      } else {
+        ref = import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+      }
+      ;
+      let resolvedId = ref;
       if (!resolvedId)
         return null;
       if (!resolvedId.endsWith(".civet")) {
@@ -372,7 +385,7 @@ var rawPlugin = (options = {}, meta) => {
       if (options2.scan && meta.framework === "vite") {
         resolvedId = `\0${resolvedId}`;
       }
-      return resolvedId + outExt;
+      return resolvedId + outExt + postfix;
     },
     loadInclude(id) {
       return isCivetTranspiled.test(id);

package/dist/unplugin/unplugin.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/unplugin.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
 import { createUnplugin } from "unplugin";
 import civet, { SourceMap } from "@danielx/civet";
 import { findInDir, loadConfig } from "@danielx/civet/config";
@@ -14,7 +14,7 @@ import os from "os";
 // source/unplugin/constants.mjs
 var DEFAULT_EXTENSIONS = [".mjs", ".js", ".mts", ".ts", ".jsx", ".tsx", ".json"];
 
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/unplugin.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
 var DiagnosticCategory = {};
 DiagnosticCategory[DiagnosticCategory["Warning"] = 0] = "Warning";
 DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error";
@@ -25,7 +25,12 @@ var postfixRE = /[?#].*$/s;
 var isWindows = os.platform() === "win32";
 var windowsSlashRE = /\\/g;
 function cleanCivetId(id) {
-  return id.replace(postfixRE, "").replace(/\.[jt]sx$/, "");
+  let postfix = "";
+  id = id.replace(postfixRE, (match) => {
+    postfix = match;
+    return "";
+  }).replace(/\.[jt]sx$/, "");
+  return { id, postfix };
 }
 function tryStatSync(file) {
   try {
@@ -325,8 +330,16 @@ var rawPlugin = (options = {}, meta) => {
     resolveId(id, importer, options2) {
       if (/\0/.test(id))
         return null;
-      id = cleanCivetId(id);
-      let resolvedId = path.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : path.resolve(path.dirname(importer ?? ""), id);
+      let postfix;
+      ({ id, postfix } = cleanCivetId(id));
+      let ref;
+      if (path.isAbsolute(id)) {
+        ref = resolveAbsolutePath(rootDir, id, implicitExtension);
+      } else {
+        ref = path.resolve(path.dirname(importer ?? ""), id);
+      }
+      ;
+      let resolvedId = ref;
       if (!resolvedId)
         return null;
       if (!resolvedId.endsWith(".civet")) {
@@ -340,7 +353,7 @@ var rawPlugin = (options = {}, meta) => {
       if (options2.scan && meta.framework === "vite") {
         resolvedId = `\0${resolvedId}`;
       }
-      return resolvedId + outExt;
+      return resolvedId + outExt + postfix;
     },
     loadInclude(id) {
       return isCivetTranspiled.test(id);

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:/home/daniel/apps/Civet/source/unplugin/vite.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\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:/home/daniel/apps/Civet/source/unplugin/vite.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\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:/home/daniel/apps/Civet/source/unplugin/webpack.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\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:/home/daniel/apps/Civet/source/unplugin/webpack.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\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.7.32",
+  "version": "0.7.34",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -99,12 +99,12 @@
     "@danielx/hera": "^0.8.16",
     "@prettier/sync": "^0.5.2",
     "@types/assert": "^1.5.6",
-    "@types/mocha": "^9.1.1",
+    "@types/mocha": "^10.0.8",
     "@types/node": "^20.12.2",
     "c8": "^7.12.0",
     "esbuild": "0.20.0",
     "marked": "^4.2.4",
-    "mocha": "^10.0.0",
+    "mocha": "^10.7.3",
     "prettier": "^3.2.5",
     "terser": "^5.16.1",
     "ts-node": "^10.9.1",