@danielx/civet 0.6.50 → 0.6.52

package/dist/unplugin.js

@@ -30,7 +30,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  default: () => src_default
+  default: () => src_default,
+  slash: () => slash
 });
 module.exports = __toCommonJS(src_exports);
 var import_unplugin = require("unplugin");
@@ -40,14 +41,46 @@ var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_typescript = __toESM(require("typescript"));
 var tsvfs = __toESM(require("@typescript/vfs"));
+var import_os = __toESM(require("os"));
 var formatHost = {
   getCurrentDirectory: () => import_typescript.default.sys.getCurrentDirectory(),
   getNewLine: () => import_typescript.default.sys.newLine,
   getCanonicalFileName: import_typescript.default.sys.useCaseSensitiveFileNames ? (f) => f : (f) => f.toLowerCase()
 };
 var isCivet = (id) => /\.civet$/.test(id);
-var isCivetTranspiled = (id) => /\.civet\.(m?)(j|t)s(x?)(\?transform)?$/.test(id);
-var isCivetTranspiledTS = (id) => /\.civet\.(m?)ts(x?)$/.test(id);
+var isCivetTranspiled = (id) => /\.civet\.[jt]sx(\?transform)?$/.test(id);
+var isCivetTranspiledTS = (id) => /\.civet\.tsx$/.test(id);
+var postfixRE = /(\.[jt]sx)?[?#].*$/s;
+var isWindows = import_os.default.platform() === "win32";
+var windowsSlashRE = /\\/g;
+function cleanCivetId(id) {
+  return id.replace(postfixRE, "");
+}
+function tryStatSync(file) {
+  try {
+    return fs.statSync(file, { throwIfNoEntry: false });
+  } catch {
+    return void 0;
+  }
+}
+function slash(p) {
+  return p.replace(windowsSlashRE, "/");
+}
+function normalizePath(id) {
+  return import_path.default.posix.normalize(isWindows ? slash(id) : id);
+}
+function tryFsResolve(file) {
+  const fileStat = tryStatSync(file);
+  if (fileStat?.isFile())
+    return normalizePath(file);
+  return void 0;
+}
+function resolveAbsolutePath(rootDir, id) {
+  const resolved = tryFsResolve(import_path.default.join(rootDir, id));
+  if (!resolved)
+    return tryFsResolve(id);
+  return resolved;
+}
 var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
   if (options.dts && options.js) {
     throw new Error("Can't have both `dts` and `js` be set to `true`.");
@@ -60,7 +93,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
   let compilerOptions;
-  let rootDir;
+  let rootDir = process.cwd();
   return {
     name: "unplugin-civet",
     enforce: "pre",
@@ -160,10 +193,11 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
         return null;
       if (!isCivet(id) && !isCivetTranspiled(id))
         return null;
-      const absolutePath = rootDir != null && import_path.default.isAbsolute(id) ? import_path.default.join(rootDir, id) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+      id = cleanCivetId(id);
+      const absolutePath = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+      if (!absolutePath)
+        return null;
       const relativeId = import_path.default.relative(process.cwd(), absolutePath);
-      if (isCivetTranspiled(id))
-        return relativeId.replace(/\?transform$/, "");
       const relativePath = relativeId + outExt;
       return relativePath;
     },
@@ -204,9 +238,9 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
       if (options.dts || options.typecheck) {
         const resolved = import_path.default.resolve(process.cwd(), id);
         fsMap.set(resolved, code);
-        const slash = resolved.replace(/\\/g, "/");
-        if (resolved !== slash)
-          fsMap.set(slash, code);
+        const slashed = slash(resolved);
+        if (resolved !== slashed)
+          fsMap.set(slashed, code);
       }
       return null;
     },
@@ -245,3 +279,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
   };
 });
 var src_default = civetUnplugin;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  slash
+});

package/dist/unplugin.mjs

@@ -1,6 +1,8 @@
 import {
+  slash,
   src_default
 } from "./unplugin-shared.mjs";
 export {
-  src_default as default
+  src_default as default,
+  slash
 };

package/dist/vite.js

@@ -42,14 +42,46 @@ var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_typescript = __toESM(require("typescript"));
 var tsvfs = __toESM(require("@typescript/vfs"));
+var import_os = __toESM(require("os"));
 var formatHost = {
   getCurrentDirectory: () => import_typescript.default.sys.getCurrentDirectory(),
   getNewLine: () => import_typescript.default.sys.newLine,
   getCanonicalFileName: import_typescript.default.sys.useCaseSensitiveFileNames ? (f) => f : (f) => f.toLowerCase()
 };
 var isCivet = (id) => /\.civet$/.test(id);
-var isCivetTranspiled = (id) => /\.civet\.(m?)(j|t)s(x?)(\?transform)?$/.test(id);
-var isCivetTranspiledTS = (id) => /\.civet\.(m?)ts(x?)$/.test(id);
+var isCivetTranspiled = (id) => /\.civet\.[jt]sx(\?transform)?$/.test(id);
+var isCivetTranspiledTS = (id) => /\.civet\.tsx$/.test(id);
+var postfixRE = /(\.[jt]sx)?[?#].*$/s;
+var isWindows = import_os.default.platform() === "win32";
+var windowsSlashRE = /\\/g;
+function cleanCivetId(id) {
+  return id.replace(postfixRE, "");
+}
+function tryStatSync(file) {
+  try {
+    return fs.statSync(file, { throwIfNoEntry: false });
+  } catch {
+    return void 0;
+  }
+}
+function slash(p) {
+  return p.replace(windowsSlashRE, "/");
+}
+function normalizePath(id) {
+  return import_path.default.posix.normalize(isWindows ? slash(id) : id);
+}
+function tryFsResolve(file) {
+  const fileStat = tryStatSync(file);
+  if (fileStat?.isFile())
+    return normalizePath(file);
+  return void 0;
+}
+function resolveAbsolutePath(rootDir, id) {
+  const resolved = tryFsResolve(import_path.default.join(rootDir, id));
+  if (!resolved)
+    return tryFsResolve(id);
+  return resolved;
+}
 var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
   if (options.dts && options.js) {
     throw new Error("Can't have both `dts` and `js` be set to `true`.");
@@ -62,7 +94,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
   let compilerOptions;
-  let rootDir;
+  let rootDir = process.cwd();
   return {
     name: "unplugin-civet",
     enforce: "pre",
@@ -162,10 +194,11 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
         return null;
       if (!isCivet(id) && !isCivetTranspiled(id))
         return null;
-      const absolutePath = rootDir != null && import_path.default.isAbsolute(id) ? import_path.default.join(rootDir, id) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+      id = cleanCivetId(id);
+      const absolutePath = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+      if (!absolutePath)
+        return null;
       const relativeId = import_path.default.relative(process.cwd(), absolutePath);
-      if (isCivetTranspiled(id))
-        return relativeId.replace(/\?transform$/, "");
       const relativePath = relativeId + outExt;
       return relativePath;
     },
@@ -206,9 +239,9 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
       if (options.dts || options.typecheck) {
         const resolved = import_path.default.resolve(process.cwd(), id);
         fsMap.set(resolved, code);
-        const slash = resolved.replace(/\\/g, "/");
-        if (resolved !== slash)
-          fsMap.set(slash, code);
+        const slashed = slash(resolved);
+        if (resolved !== slashed)
+          fsMap.set(slashed, code);
       }
       return null;
     },

package/dist/webpack.js

@@ -42,14 +42,46 @@ var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_typescript = __toESM(require("typescript"));
 var tsvfs = __toESM(require("@typescript/vfs"));
+var import_os = __toESM(require("os"));
 var formatHost = {
   getCurrentDirectory: () => import_typescript.default.sys.getCurrentDirectory(),
   getNewLine: () => import_typescript.default.sys.newLine,
   getCanonicalFileName: import_typescript.default.sys.useCaseSensitiveFileNames ? (f) => f : (f) => f.toLowerCase()
 };
 var isCivet = (id) => /\.civet$/.test(id);
-var isCivetTranspiled = (id) => /\.civet\.(m?)(j|t)s(x?)(\?transform)?$/.test(id);
-var isCivetTranspiledTS = (id) => /\.civet\.(m?)ts(x?)$/.test(id);
+var isCivetTranspiled = (id) => /\.civet\.[jt]sx(\?transform)?$/.test(id);
+var isCivetTranspiledTS = (id) => /\.civet\.tsx$/.test(id);
+var postfixRE = /(\.[jt]sx)?[?#].*$/s;
+var isWindows = import_os.default.platform() === "win32";
+var windowsSlashRE = /\\/g;
+function cleanCivetId(id) {
+  return id.replace(postfixRE, "");
+}
+function tryStatSync(file) {
+  try {
+    return fs.statSync(file, { throwIfNoEntry: false });
+  } catch {
+    return void 0;
+  }
+}
+function slash(p) {
+  return p.replace(windowsSlashRE, "/");
+}
+function normalizePath(id) {
+  return import_path.default.posix.normalize(isWindows ? slash(id) : id);
+}
+function tryFsResolve(file) {
+  const fileStat = tryStatSync(file);
+  if (fileStat?.isFile())
+    return normalizePath(file);
+  return void 0;
+}
+function resolveAbsolutePath(rootDir, id) {
+  const resolved = tryFsResolve(import_path.default.join(rootDir, id));
+  if (!resolved)
+    return tryFsResolve(id);
+  return resolved;
+}
 var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
   if (options.dts && options.js) {
     throw new Error("Can't have both `dts` and `js` be set to `true`.");
@@ -62,7 +94,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
   let compilerOptions;
-  let rootDir;
+  let rootDir = process.cwd();
   return {
     name: "unplugin-civet",
     enforce: "pre",
@@ -162,10 +194,11 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
         return null;
       if (!isCivet(id) && !isCivetTranspiled(id))
         return null;
-      const absolutePath = rootDir != null && import_path.default.isAbsolute(id) ? import_path.default.join(rootDir, id) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+      id = cleanCivetId(id);
+      const absolutePath = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+      if (!absolutePath)
+        return null;
       const relativeId = import_path.default.relative(process.cwd(), absolutePath);
-      if (isCivetTranspiled(id))
-        return relativeId.replace(/\?transform$/, "");
       const relativePath = relativeId + outExt;
       return relativePath;
     },
@@ -206,9 +239,9 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
       if (options.dts || options.typecheck) {
         const resolved = import_path.default.resolve(process.cwd(), id);
         fsMap.set(resolved, code);
-        const slash = resolved.replace(/\\/g, "/");
-        if (resolved !== slash)
-          fsMap.set(slash, code);
+        const slashed = slash(resolved);
+        if (resolved !== slashed)
+          fsMap.set(slashed, code);
       }
       return null;
     },

package/package.json

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