@danielx/civet 0.11.1 → 0.11.3

package/dist/types.d.ts

@@ -53,6 +53,10 @@ declare module "@danielx/civet" {
      * in sourcemaps and error messages.
      */
     filename?: string
+    /**
+     * Output (transpiled) filename to record in inline source maps.
+     */
+    outputFilename?: string
     /**
      * Whether to return a source map in addition to transpiled code.
      * If false (the default), `compile` just returns transpiled code.

package/dist/unplugin/unplugin.js

@@ -40,7 +40,180 @@ var import_config = require("@danielx/civet/config");
 var import_ts_diagnostic = require("@danielx/civet/ts-diagnostic");
 var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
-var tsvfs = __toESM(require("@typescript/vfs"));
+
+// node_modules/@typescript/vfs/dist/vfs.esm.js
+function _extends() {
+  _extends = Object.assign ? Object.assign.bind() : function(target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+      for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          target[key] = source[key];
+        }
+      }
+    }
+    return target;
+  };
+  return _extends.apply(this, arguments);
+}
+var hasLocalStorage = false;
+try {
+  hasLocalStorage = typeof localStorage !== "undefined";
+} catch (error) {
+}
+var hasProcess = typeof process !== "undefined";
+var shouldDebug = hasLocalStorage && /* @__PURE__ */ localStorage.getItem("DEBUG") || hasProcess && process.env.DEBUG;
+var debugLog = shouldDebug ? console.log : function(_message) {
+  return "";
+};
+function notImplemented(methodName) {
+  throw new Error("Method '" + methodName + "' is not implemented.");
+}
+function audit(name, fn) {
+  return function() {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    var res = fn.apply(void 0, args);
+    var smallres = typeof res === "string" ? res.slice(0, 80) + "..." : res;
+    debugLog.apply(void 0, ["> " + name].concat(args));
+    debugLog("< " + smallres);
+    return res;
+  };
+}
+var defaultCompilerOptions = function defaultCompilerOptions2(ts) {
+  return _extends({}, ts.getDefaultCompilerOptions(), {
+    jsx: ts.JsxEmit.React,
+    strict: true,
+    esModuleInterop: true,
+    module: ts.ModuleKind.ESNext,
+    suppressOutputPathCheck: true,
+    skipLibCheck: true,
+    skipDefaultLibCheck: true,
+    moduleResolution: ts.ModuleResolutionKind.NodeJs
+  });
+};
+function createFSBackedSystem(files, _projectRoot, ts, tsLibDirectory) {
+  var root = _projectRoot + "/vfs";
+  var path2 = requirePath();
+  var nodeSys = ts.sys;
+  var tsLib = tsLibDirectory != null ? tsLibDirectory : path2.dirname(require.resolve("typescript"));
+  return {
+    // @ts-ignore
+    name: "fs-vfs",
+    root,
+    args: [],
+    createDirectory: function createDirectory() {
+      return notImplemented("createDirectory");
+    },
+    // TODO: could make a real file tree
+    directoryExists: audit("directoryExists", function(directory) {
+      return Array.from(files.keys()).some(function(path3) {
+        return path3.startsWith(directory);
+      }) || nodeSys.directoryExists(directory);
+    }),
+    exit: nodeSys.exit,
+    fileExists: audit("fileExists", function(fileName) {
+      if (files.has(fileName)) return true;
+      if (fileName.includes("tsconfig.json") || fileName.includes("tsconfig.json")) return false;
+      if (fileName.startsWith("/lib")) {
+        var tsLibName = tsLib + "/" + fileName.replace("/", "");
+        return nodeSys.fileExists(tsLibName);
+      }
+      return nodeSys.fileExists(fileName);
+    }),
+    getCurrentDirectory: function getCurrentDirectory() {
+      return root;
+    },
+    getDirectories: nodeSys.getDirectories,
+    getExecutingFilePath: function getExecutingFilePath() {
+      return notImplemented("getExecutingFilePath");
+    },
+    readDirectory: audit("readDirectory", function() {
+      if ((arguments.length <= 0 ? void 0 : arguments[0]) === "/") {
+        return Array.from(files.keys());
+      } else {
+        return nodeSys.readDirectory.apply(nodeSys, arguments);
+      }
+    }),
+    readFile: audit("readFile", function(fileName) {
+      if (files.has(fileName)) return files.get(fileName);
+      if (fileName.startsWith("/lib")) {
+        var tsLibName = tsLib + "/" + fileName.replace("/", "");
+        var result = nodeSys.readFile(tsLibName);
+        if (!result) {
+          var libs = nodeSys.readDirectory(tsLib);
+          throw new Error("TSVFS: A request was made for " + tsLibName + " but there wasn't a file found in the file map. You likely have a mismatch in the compiler options for the CDN download vs the compiler program. Existing Libs: " + libs + ".");
+        }
+        return result;
+      }
+      return nodeSys.readFile(fileName);
+    }),
+    resolvePath: function resolvePath(path3) {
+      if (files.has(path3)) return path3;
+      return nodeSys.resolvePath(path3);
+    },
+    newLine: "\n",
+    useCaseSensitiveFileNames: true,
+    write: function write() {
+      return notImplemented("write");
+    },
+    writeFile: function writeFile(fileName, contents) {
+      files.set(fileName, contents);
+    },
+    deleteFile: function deleteFile(fileName) {
+      files["delete"](fileName);
+    },
+    realpath: nodeSys.realpath
+  };
+}
+function createVirtualCompilerHost(sys, compilerOptions, ts) {
+  var sourceFiles = /* @__PURE__ */ new Map();
+  var save = function save2(sourceFile) {
+    sourceFiles.set(sourceFile.fileName, sourceFile);
+    return sourceFile;
+  };
+  var vHost = {
+    compilerHost: _extends({}, sys, {
+      getCanonicalFileName: function getCanonicalFileName(fileName) {
+        return fileName;
+      },
+      getDefaultLibFileName: function getDefaultLibFileName() {
+        return "/" + ts.getDefaultLibFileName(compilerOptions);
+      },
+      // '/lib.d.ts',
+      // getDefaultLibLocation: () => '/',
+      getNewLine: function getNewLine() {
+        return sys.newLine;
+      },
+      getSourceFile: function getSourceFile(fileName, languageVersionOrOptions) {
+        var _ref;
+        return sourceFiles.get(fileName) || save(ts.createSourceFile(fileName, sys.readFile(fileName), (_ref = languageVersionOrOptions != null ? languageVersionOrOptions : compilerOptions.target) != null ? _ref : defaultCompilerOptions(ts).target, false));
+      },
+      useCaseSensitiveFileNames: function useCaseSensitiveFileNames() {
+        return sys.useCaseSensitiveFileNames;
+      }
+    }),
+    updateFile: function updateFile(sourceFile) {
+      var alreadyExists = sourceFiles.has(sourceFile.fileName);
+      sys.writeFile(sourceFile.fileName, sourceFile.text);
+      sourceFiles.set(sourceFile.fileName, sourceFile);
+      return alreadyExists;
+    },
+    deleteFile: function deleteFile(sourceFile) {
+      var alreadyExists = sourceFiles.has(sourceFile.fileName);
+      sourceFiles["delete"](sourceFile.fileName);
+      sys.deleteFile(sourceFile.fileName);
+      return alreadyExists;
+    }
+  };
+  return vHost;
+}
+var requirePath = function requirePath2() {
+  return require(String.fromCharCode(112, 97, 116, 104));
+};
+
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
 var import_os = __toESM(require("os"));
 
 // source/unplugin/constants.mjs
@@ -56,6 +229,7 @@ var postfixRE = /[?#].*$/s;
 var isWindows = import_os.default.platform() === "win32";
 var windowsSlashRE = /\\/g;
 var civetSuffix = ".civet";
+var workerRE = /(?:\?|&)(?:worker|sharedworker)(?:&|$|#)/;
 function extractCivetFilename(id, outputExtension) {
   let postfix = "";
   let filename = id.replace(postfixRE, (match) => {
@@ -127,6 +301,7 @@ var rawPlugin = (options = {}, meta) => {
   let esbuildOptions;
   let configErrors;
   let configFileNames;
+  let skipWorker = false;
   let ref;
   if (transformTS || ts === "tsc") {
     ref = import("typescript").then(($1) => $1.default);
@@ -217,7 +392,7 @@ var rawPlugin = (options = {}, meta) => {
     async buildEnd(useConfigFileNames = false) {
       if (transformTS) {
         const ts2 = await tsPromise;
-        const system = tsvfs.createFSBackedSystem(fsMap, process.cwd(), ts2);
+        const system = createFSBackedSystem(fsMap, process.cwd(), ts2);
         const {
           fileExists: systemFileExists,
           readFile: systemReadFile,
@@ -278,7 +453,7 @@ var rawPlugin = (options = {}, meta) => {
           sourceMaps.set(filename, sourceMap);
           return compiledTS;
         };
-        const host = tsvfs.createVirtualCompilerHost(
+        const host = createVirtualCompilerHost(
           system,
           compilerOptions,
           ts2
@@ -415,13 +590,14 @@ var rawPlugin = (options = {}, meta) => {
       return resolved + outExt + postfix;
     },
     loadInclude(id) {
-      return extractCivetFilename(id, outExt).filename.endsWith(civetSuffix);
+      const { filename, postfix } = extractCivetFilename(id, outExt);
+      if (skipWorker && workerRE.test(postfix)) {
+        return false;
+      }
+      return filename.endsWith(civetSuffix);
     },
     async load(id) {
       let { filename } = extractCivetFilename(id, outExt);
-      if (!filename.endsWith(civetSuffix)) {
-        return null;
-      }
       filename = import_path.default.resolve(rootDir, filename);
       this.addWatchFile(filename);
       let mtime, cached, resolve;
@@ -563,6 +739,9 @@ var rawPlugin = (options = {}, meta) => {
     },
     vite: {
       config(config) {
+        if (this?.meta?.viteVersion && 7 <= Number(this.meta.viteVersion.split(".")[0])) {
+          skipWorker = true;
+        }
         rootDir = import_path.default.resolve(process.cwd(), config.root ?? "");
         if (implicitExtension) {
           config.resolve ??= {};
@@ -592,10 +771,11 @@ var rawPlugin = (options = {}, meta) => {
           return;
         }
         const resolvedId = slash(import_path.default.resolve(file) + outExt);
-        const module2 = server.moduleGraph.getModuleById(resolvedId);
-        if (module2) {
+        let ref4;
+        if (ref4 = server.moduleGraph.getModulesByFile(resolvedId)) {
+          const fileModules = ref4;
           server.moduleGraph.onFileChange(resolvedId);
-          return [...modules, module2];
+          return [...modules, ...fileModules];
         }
         return modules;
       }
@@ -618,9 +798,9 @@ var rawPlugin = (options = {}, meta) => {
         compiler.options.resolve.extensions.unshift(".civet");
       }
       return aliasResolver = (id) => {
-        let ref4;
-        for (const key in ref4 = compiler.options.resolve.alias) {
-          const value = ref4[key];
+        let ref5;
+        for (const key in ref5 = compiler.options.resolve.alias) {
+          const value = ref5[key];
           if (key.endsWith("$")) {
             if (id === key.slice(0, -1)) {
               return typeof value === "string" ? value : "\0";

package/dist/unplugin/unplugin.mjs

@@ -1,3 +1,10 @@
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+
 // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
 import { createUnplugin } from "unplugin";
 import civet, { decode, lib, SourceMap } from "@danielx/civet";
@@ -8,7 +15,180 @@ import {
 } from "@danielx/civet/ts-diagnostic";
 import * as fs from "fs";
 import path from "path";
-import * as tsvfs from "@typescript/vfs";
+
+// node_modules/@typescript/vfs/dist/vfs.esm.js
+function _extends() {
+  _extends = Object.assign ? Object.assign.bind() : function(target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+      for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          target[key] = source[key];
+        }
+      }
+    }
+    return target;
+  };
+  return _extends.apply(this, arguments);
+}
+var hasLocalStorage = false;
+try {
+  hasLocalStorage = typeof localStorage !== "undefined";
+} catch (error) {
+}
+var hasProcess = typeof process !== "undefined";
+var shouldDebug = hasLocalStorage && /* @__PURE__ */ localStorage.getItem("DEBUG") || hasProcess && process.env.DEBUG;
+var debugLog = shouldDebug ? console.log : function(_message) {
+  return "";
+};
+function notImplemented(methodName) {
+  throw new Error("Method '" + methodName + "' is not implemented.");
+}
+function audit(name, fn) {
+  return function() {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    var res = fn.apply(void 0, args);
+    var smallres = typeof res === "string" ? res.slice(0, 80) + "..." : res;
+    debugLog.apply(void 0, ["> " + name].concat(args));
+    debugLog("< " + smallres);
+    return res;
+  };
+}
+var defaultCompilerOptions = function defaultCompilerOptions2(ts) {
+  return _extends({}, ts.getDefaultCompilerOptions(), {
+    jsx: ts.JsxEmit.React,
+    strict: true,
+    esModuleInterop: true,
+    module: ts.ModuleKind.ESNext,
+    suppressOutputPathCheck: true,
+    skipLibCheck: true,
+    skipDefaultLibCheck: true,
+    moduleResolution: ts.ModuleResolutionKind.NodeJs
+  });
+};
+function createFSBackedSystem(files, _projectRoot, ts, tsLibDirectory) {
+  var root = _projectRoot + "/vfs";
+  var path2 = requirePath();
+  var nodeSys = ts.sys;
+  var tsLib = tsLibDirectory != null ? tsLibDirectory : path2.dirname(__require.resolve("typescript"));
+  return {
+    // @ts-ignore
+    name: "fs-vfs",
+    root,
+    args: [],
+    createDirectory: function createDirectory() {
+      return notImplemented("createDirectory");
+    },
+    // TODO: could make a real file tree
+    directoryExists: audit("directoryExists", function(directory) {
+      return Array.from(files.keys()).some(function(path3) {
+        return path3.startsWith(directory);
+      }) || nodeSys.directoryExists(directory);
+    }),
+    exit: nodeSys.exit,
+    fileExists: audit("fileExists", function(fileName) {
+      if (files.has(fileName)) return true;
+      if (fileName.includes("tsconfig.json") || fileName.includes("tsconfig.json")) return false;
+      if (fileName.startsWith("/lib")) {
+        var tsLibName = tsLib + "/" + fileName.replace("/", "");
+        return nodeSys.fileExists(tsLibName);
+      }
+      return nodeSys.fileExists(fileName);
+    }),
+    getCurrentDirectory: function getCurrentDirectory() {
+      return root;
+    },
+    getDirectories: nodeSys.getDirectories,
+    getExecutingFilePath: function getExecutingFilePath() {
+      return notImplemented("getExecutingFilePath");
+    },
+    readDirectory: audit("readDirectory", function() {
+      if ((arguments.length <= 0 ? void 0 : arguments[0]) === "/") {
+        return Array.from(files.keys());
+      } else {
+        return nodeSys.readDirectory.apply(nodeSys, arguments);
+      }
+    }),
+    readFile: audit("readFile", function(fileName) {
+      if (files.has(fileName)) return files.get(fileName);
+      if (fileName.startsWith("/lib")) {
+        var tsLibName = tsLib + "/" + fileName.replace("/", "");
+        var result = nodeSys.readFile(tsLibName);
+        if (!result) {
+          var libs = nodeSys.readDirectory(tsLib);
+          throw new Error("TSVFS: A request was made for " + tsLibName + " but there wasn't a file found in the file map. You likely have a mismatch in the compiler options for the CDN download vs the compiler program. Existing Libs: " + libs + ".");
+        }
+        return result;
+      }
+      return nodeSys.readFile(fileName);
+    }),
+    resolvePath: function resolvePath(path3) {
+      if (files.has(path3)) return path3;
+      return nodeSys.resolvePath(path3);
+    },
+    newLine: "\n",
+    useCaseSensitiveFileNames: true,
+    write: function write() {
+      return notImplemented("write");
+    },
+    writeFile: function writeFile(fileName, contents) {
+      files.set(fileName, contents);
+    },
+    deleteFile: function deleteFile(fileName) {
+      files["delete"](fileName);
+    },
+    realpath: nodeSys.realpath
+  };
+}
+function createVirtualCompilerHost(sys, compilerOptions, ts) {
+  var sourceFiles = /* @__PURE__ */ new Map();
+  var save = function save2(sourceFile) {
+    sourceFiles.set(sourceFile.fileName, sourceFile);
+    return sourceFile;
+  };
+  var vHost = {
+    compilerHost: _extends({}, sys, {
+      getCanonicalFileName: function getCanonicalFileName(fileName) {
+        return fileName;
+      },
+      getDefaultLibFileName: function getDefaultLibFileName() {
+        return "/" + ts.getDefaultLibFileName(compilerOptions);
+      },
+      // '/lib.d.ts',
+      // getDefaultLibLocation: () => '/',
+      getNewLine: function getNewLine() {
+        return sys.newLine;
+      },
+      getSourceFile: function getSourceFile(fileName, languageVersionOrOptions) {
+        var _ref;
+        return sourceFiles.get(fileName) || save(ts.createSourceFile(fileName, sys.readFile(fileName), (_ref = languageVersionOrOptions != null ? languageVersionOrOptions : compilerOptions.target) != null ? _ref : defaultCompilerOptions(ts).target, false));
+      },
+      useCaseSensitiveFileNames: function useCaseSensitiveFileNames() {
+        return sys.useCaseSensitiveFileNames;
+      }
+    }),
+    updateFile: function updateFile(sourceFile) {
+      var alreadyExists = sourceFiles.has(sourceFile.fileName);
+      sys.writeFile(sourceFile.fileName, sourceFile.text);
+      sourceFiles.set(sourceFile.fileName, sourceFile);
+      return alreadyExists;
+    },
+    deleteFile: function deleteFile(sourceFile) {
+      var alreadyExists = sourceFiles.has(sourceFile.fileName);
+      sourceFiles["delete"](sourceFile.fileName);
+      sys.deleteFile(sourceFile.fileName);
+      return alreadyExists;
+    }
+  };
+  return vHost;
+}
+var requirePath = function requirePath2() {
+  return __require(String.fromCharCode(112, 97, 116, 104));
+};
+
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
 import os from "os";
 
 // source/unplugin/constants.mjs
@@ -24,6 +204,7 @@ var postfixRE = /[?#].*$/s;
 var isWindows = os.platform() === "win32";
 var windowsSlashRE = /\\/g;
 var civetSuffix = ".civet";
+var workerRE = /(?:\?|&)(?:worker|sharedworker)(?:&|$|#)/;
 function extractCivetFilename(id, outputExtension) {
   let postfix = "";
   let filename = id.replace(postfixRE, (match) => {
@@ -95,6 +276,7 @@ var rawPlugin = (options = {}, meta) => {
   let esbuildOptions;
   let configErrors;
   let configFileNames;
+  let skipWorker = false;
   let ref;
   if (transformTS || ts === "tsc") {
     ref = import("typescript").then(($1) => $1.default);
@@ -185,7 +367,7 @@ var rawPlugin = (options = {}, meta) => {
     async buildEnd(useConfigFileNames = false) {
       if (transformTS) {
         const ts2 = await tsPromise;
-        const system = tsvfs.createFSBackedSystem(fsMap, process.cwd(), ts2);
+        const system = createFSBackedSystem(fsMap, process.cwd(), ts2);
         const {
           fileExists: systemFileExists,
           readFile: systemReadFile,
@@ -246,7 +428,7 @@ var rawPlugin = (options = {}, meta) => {
           sourceMaps.set(filename, sourceMap);
           return compiledTS;
         };
-        const host = tsvfs.createVirtualCompilerHost(
+        const host = createVirtualCompilerHost(
           system,
           compilerOptions,
           ts2
@@ -383,13 +565,14 @@ var rawPlugin = (options = {}, meta) => {
       return resolved + outExt + postfix;
     },
     loadInclude(id) {
-      return extractCivetFilename(id, outExt).filename.endsWith(civetSuffix);
+      const { filename, postfix } = extractCivetFilename(id, outExt);
+      if (skipWorker && workerRE.test(postfix)) {
+        return false;
+      }
+      return filename.endsWith(civetSuffix);
     },
     async load(id) {
       let { filename } = extractCivetFilename(id, outExt);
-      if (!filename.endsWith(civetSuffix)) {
-        return null;
-      }
       filename = path.resolve(rootDir, filename);
       this.addWatchFile(filename);
       let mtime, cached, resolve;
@@ -531,6 +714,9 @@ var rawPlugin = (options = {}, meta) => {
     },
     vite: {
       config(config) {
+        if (this?.meta?.viteVersion && 7 <= Number(this.meta.viteVersion.split(".")[0])) {
+          skipWorker = true;
+        }
         rootDir = path.resolve(process.cwd(), config.root ?? "");
         if (implicitExtension) {
           config.resolve ??= {};
@@ -560,10 +746,11 @@ var rawPlugin = (options = {}, meta) => {
           return;
         }
         const resolvedId = slash(path.resolve(file) + outExt);
-        const module = server.moduleGraph.getModuleById(resolvedId);
-        if (module) {
+        let ref4;
+        if (ref4 = server.moduleGraph.getModulesByFile(resolvedId)) {
+          const fileModules = ref4;
           server.moduleGraph.onFileChange(resolvedId);
-          return [...modules, module];
+          return [...modules, ...fileModules];
         }
         return modules;
       }
@@ -586,9 +773,9 @@ var rawPlugin = (options = {}, meta) => {
         compiler.options.resolve.extensions.unshift(".civet");
       }
       return aliasResolver = (id) => {
-        let ref4;
-        for (const key in ref4 = compiler.options.resolve.alias) {
-          const value = ref4[key];
+        let ref5;
+        for (const key in ref5 = compiler.options.resolve.alias) {
+          const value = ref5[key];
           if (key.endsWith("$")) {
             if (id === key.slice(0, -1)) {
               return typeof value === "string" ? value : "\0";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.11.1",
+  "version": "0.11.3",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -95,6 +95,7 @@
   },
   "scripts": {
     "build": "bash ./build/build.sh",
+    "build:self": "yarn build && bash ./build/build-self.sh",
     "docs:dev": "yarn build && vitepress dev civet.dev",
     "docs:build": "yarn build && vitepress build civet.dev",
     "docs:preview": "yarn build && vitepress preview civet.dev",
@@ -107,7 +108,6 @@
   "license": "MIT",
   "dependencies": {
     "@cspotcode/source-map-support": "^0.8.1",
-    "@typescript/vfs": "^1.6.0",
     "unplugin": "^2.3.2"
   },
   "devDependencies": {
@@ -117,6 +117,7 @@
     "@types/assert": "^1.5.6",
     "@types/mocha": "^10.0.8",
     "@types/node": "^22.10.2",
+    "@typescript/vfs": "^1.6.0",
     "c8": "^7.12.0",
     "esbuild": "0.24.0",
     "marked": "^4.2.4",
@@ -137,6 +138,9 @@
     "yaml": "^2.4.5"
   },
   "peerDependenciesMeta": {
+    "typescript": {
+      "optional": true
+    },
     "yaml": {
       "optional": true
     }