@danielx/civet 0.9.0 → 0.9.2

package/dist/unplugin/unplugin.mjs

@@ -21,7 +21,7 @@ DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error";
 DiagnosticCategory[DiagnosticCategory["Suggestion"] = 2] = "Suggestion";
 DiagnosticCategory[DiagnosticCategory["Message"] = 3] = "Message";
 var civetExtension = /\.civet$/;
-var isCivetTranspiled = /(\.civet)(\.[jt]sx)([?#].*)?$/;
+var isCivetTranspiled = /(\.civet)(\.[jt]sx)?([?#].*)?$/;
 var postfixRE = /[?#].*$/s;
 var isWindows = os.platform() === "win32";
 var windowsSlashRE = /\\/g;
@@ -70,12 +70,10 @@ function implicitCivet(file) {
   return;
 }
 var rawPlugin = (options = {}, meta) => {
-  if (options.dts)
-    options.emitDeclaration = options.dts;
+  if (options.dts) options.emitDeclaration = options.dts;
   let compileOptions = {};
   let ts = options.ts;
-  if (options.js)
-    ts = "civet";
+  if (options.js) ts = "civet";
   if (!(ts != null)) {
     console.log('WARNING: You are using the default mode for `options.ts` which is `"civet"`. This mode does not support all TS features. If this is intentional, you should explicitly set `options.ts` to `"civet"`, or choose a different mode.');
     ts = "civet";
@@ -110,7 +108,7 @@ var rawPlugin = (options = {}, meta) => {
       getCanonicalFileName: sys.useCaseSensitiveFileNames ? (f) => f : (f) => f.toLowerCase()
     };
   };
-  const cache = options.cache ? /* @__PURE__ */ new Map() : void 0;
+  const cache = !(options.cache === false) ? /* @__PURE__ */ new Map() : void 0;
   const plugin = {
     name: "unplugin-civet",
     enforce: "pre",
@@ -123,6 +121,9 @@ var rawPlugin = (options = {}, meta) => {
         ...compileOptions.parseOptions,
         ...options.parseOptions
       };
+      if (options.threads != null) {
+        compileOptions.threads = options.threads;
+      }
       if (transformTS || ts === "tsc") {
         let mogrify = function(key) {
           if (key in config && Array.isArray(config[key])) {
@@ -186,10 +187,8 @@ var rawPlugin = (options = {}, meta) => {
           readDirectory: systemReadDirectory
         } = system;
         system.fileExists = (filename) => {
-          if (!filename.endsWith(".civet.tsx"))
-            return systemFileExists(filename);
-          if (fsMap.has(filename))
-            return true;
+          if (!filename.endsWith(".civet.tsx")) return systemFileExists(filename);
+          if (fsMap.has(filename)) return true;
           return systemFileExists(filename.slice(0, -4));
         };
         system.readDirectory = (path2) => {
@@ -226,10 +225,8 @@ var rawPlugin = (options = {}, meta) => {
             recurse(parsed.imports);
             return modified ? JSON.stringify(parsed) : json;
           }
-          if (!filename.endsWith(".civet.tsx"))
-            return systemReadFile(filename, encoding);
-          if (fsMap.has(filename))
-            return fsMap.get(filename);
+          if (!filename.endsWith(".civet.tsx")) return systemReadFile(filename, encoding);
+          if (fsMap.has(filename)) return fsMap.get(filename);
           const civetFilename = filename.slice(0, -4);
           const rawCivetSource = fs.readFileSync(civetFilename, {
             encoding
@@ -258,11 +255,9 @@ var rawPlugin = (options = {}, meta) => {
         });
         const diagnostics = ts2.getPreEmitDiagnostics(program).map((diagnostic) => {
           const file = diagnostic.file;
-          if (!file)
-            return diagnostic;
+          if (!file) return diagnostic;
           const sourceMap = sourceMaps.get(file.fileName);
-          if (!sourceMap)
-            return diagnostic;
+          if (!sourceMap) return diagnostic;
           const sourcemapLines = sourceMap.data.lines;
           const range = remapRange(
             {
@@ -291,14 +286,10 @@ var rawPlugin = (options = {}, meta) => {
           if (options.typecheck) {
             let failures = [];
             if (typeof options.typecheck === "string") {
-              if (options.typecheck.includes("error"))
-                failures.push(DiagnosticCategory.Error);
-              if (options.typecheck.includes("warning"))
-                failures.push(DiagnosticCategory.Warning);
-              if (options.typecheck.includes("suggestion"))
-                failures.push(DiagnosticCategory.Suggestion);
-              if (options.typecheck.includes("message"))
-                failures.push(DiagnosticCategory.Message);
+              if (options.typecheck.includes("error")) failures.push(DiagnosticCategory.Error);
+              if (options.typecheck.includes("warning")) failures.push(DiagnosticCategory.Warning);
+              if (options.typecheck.includes("suggestion")) failures.push(DiagnosticCategory.Suggestion);
+              if (options.typecheck.includes("message")) failures.push(DiagnosticCategory.Message);
               if (options.typecheck.includes("all")) {
                 failures = { includes: () => true };
               }
@@ -351,7 +342,9 @@ var rawPlugin = (options = {}, meta) => {
                     path.dirname(
                       path.resolve(esbuildOptions.outdir, pathFromDistDir)
                     ),
-                    { recursive: true }
+                    {
+                      recursive: true
+                    }
                   );
                 }
                 return this.emitFile({
@@ -376,8 +369,7 @@ var rawPlugin = (options = {}, meta) => {
       if (aliasResolver != null) {
         id = aliasResolver(id);
       }
-      if (/\0/.test(id))
-        return null;
+      if (/\0/.test(id)) return null;
       if (plugin.__virtualModulePrefix && importer?.startsWith(plugin.__virtualModulePrefix)) {
         importer = decodeURIComponent(importer.slice(plugin.__virtualModulePrefix.length));
       }
@@ -391,14 +383,11 @@ var rawPlugin = (options = {}, meta) => {
       }
       ;
       let resolvedId = ref2;
-      if (!resolvedId)
-        return null;
+      if (!resolvedId) return null;
       if (!resolvedId.endsWith(".civet")) {
-        if (!implicitExtension)
-          return null;
+        if (!implicitExtension) return null;
         const implicitId = implicitCivet(resolvedId);
-        if (!implicitId)
-          return null;
+        if (!implicitId) return null;
         resolvedId = implicitId;
       }
       if (options2.scan && meta.framework === "vite") {
@@ -416,114 +405,130 @@ var rawPlugin = (options = {}, meta) => {
       }
       const basename = id.slice(0, match.index + match[1].length);
       const filename = path.resolve(rootDir, basename);
-      let mtime;
-      if (cache) {
+      let mtime, cached, resolve;
+      if (cache != null) {
         mtime = (await fs.promises.stat(filename)).mtimeMs;
-        const cached = cache?.get(filename);
+        cached = cache?.get(filename);
         if (cached && cached.mtime === mtime) {
-          return cached.result;
-        }
-      }
-      const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
-      this.addWatchFile(filename);
-      let compiled;
-      let sourceMap;
-      const civetOptions = {
-        ...compileOptions,
-        filename: id,
-        errors: []
-      };
-      function checkErrors() {
-        if (civetOptions.errors.length) {
-          throw new civet.ParseErrors(civetOptions.errors);
+          if (cached.promise) {
+            await cached.promise;
+          }
+          if (cached.result) {
+            return cached.result;
+          }
         }
-        ;
-        return;
-      }
-      const ast = await civet.compile(rawCivetSource, {
-        ...civetOptions,
-        ast: true
-      });
-      const civetSourceMap = SourceMap(rawCivetSource);
-      if (ts === "civet") {
-        compiled = await civet.generate(ast, {
-          ...civetOptions,
-          js: true,
-          sourceMap: civetSourceMap
+        const promise = new Promise((r) => {
+          resolve = r;
         });
-        sourceMap = civetSourceMap;
-        checkErrors();
-      } else {
-        const compiledTS = await civet.generate(ast, {
+        cache.set(filename, cached = { mtime, promise });
+      }
+      try {
+        let checkErrors = function() {
+          if (civetOptions.errors.length) {
+            throw new civet.ParseErrors(civetOptions.errors);
+          }
+          ;
+          return;
+        };
+        this.addWatchFile(filename);
+        let compiled;
+        let sourceMap;
+        const civetOptions = {
+          ...compileOptions,
+          filename: id,
+          errors: []
+        };
+        const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
+        const ast = await civet.compile(rawCivetSource, {
           ...civetOptions,
-          js: false,
-          sourceMap: civetSourceMap
+          ast: true
         });
-        checkErrors();
-        switch (ts) {
-          case "esbuild": {
-            const esbuildTransform = (await import("esbuild")).transform;
-            const result = await esbuildTransform(compiledTS, {
-              jsx: "preserve",
-              loader: "tsx",
-              sourcefile: id,
-              sourcemap: "external"
-            });
-            compiled = result.code;
-            sourceMap = result.map;
-            break;
+        const civetSourceMap = SourceMap(rawCivetSource);
+        if (ts === "civet") {
+          compiled = await civet.generate(ast, {
+            ...civetOptions,
+            js: true,
+            sourceMap: civetSourceMap
+          });
+          sourceMap = civetSourceMap;
+          checkErrors();
+        } else {
+          const compiledTS = await civet.generate(ast, {
+            ...civetOptions,
+            js: false,
+            sourceMap: civetSourceMap
+          });
+          checkErrors();
+          switch (ts) {
+            case "esbuild": {
+              const esbuildTransform = (await import("esbuild")).transform;
+              const result = await esbuildTransform(compiledTS, {
+                jsx: "preserve",
+                loader: "tsx",
+                sourcefile: id,
+                sourcemap: "external"
+              });
+              compiled = result.code;
+              sourceMap = result.map;
+              break;
+            }
+            case "tsc": {
+              const tsTranspile = (await tsPromise).transpileModule;
+              const result = tsTranspile(compiledTS, {
+                compilerOptions: compilerOptionsWithSourceMap
+              });
+              compiled = result.outputText;
+              sourceMap = result.sourceMapText;
+              break;
+            }
+            case "preserve": {
+              compiled = compiledTS;
+              break;
+            }
           }
-          case "tsc": {
-            const tsTranspile = (await tsPromise).transpileModule;
-            const result = tsTranspile(compiledTS, {
-              compilerOptions: compilerOptionsWithSourceMap
-            });
-            compiled = result.outputText;
-            sourceMap = result.sourceMapText;
-            break;
+        }
+        if (transformTS) {
+          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");
+            }
           }
-          case "preserve": {
-            compiled = compiledTS;
-            break;
+          const compiledTS = await civet.generate(ast, {
+            ...civetOptions,
+            js: false,
+            sourceMap: civetSourceMap
+          });
+          checkErrors();
+          const tsx = filename + ".tsx";
+          fsMap.set(tsx, compiledTS);
+          sourceMaps.set(tsx, civetSourceMap);
+          const slashed = slash(tsx);
+          if (!(tsx === slashed)) {
+            fsMap.set(slashed, compiledTS);
+            sourceMaps.set(slashed, civetSourceMap);
           }
         }
-      }
-      if (transformTS) {
-        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");
-          }
+        const jsonSourceMap = sourceMap && (typeof sourceMap === "string" ? JSON.parse(sourceMap) : sourceMap.json(
+          path.basename(id.replace(/\.[jt]sx$/, "")),
+          path.basename(id)
+        ));
+        let transformed = {
+          code: compiled,
+          map: jsonSourceMap
+        };
+        if (options.transformOutput) {
+          transformed = await options.transformOutput(transformed.code, id);
         }
-        const compiledTS = await civet.generate(ast, {
-          ...civetOptions,
-          js: false,
-          sourceMap: civetSourceMap
-        });
-        checkErrors();
-        const tsx = filename + ".tsx";
-        fsMap.set(tsx, compiledTS);
-        sourceMaps.set(tsx, civetSourceMap);
-        const slashed = slash(tsx);
-        if (!(tsx === slashed)) {
-          fsMap.set(slashed, compiledTS);
-          sourceMaps.set(slashed, civetSourceMap);
+        if (cached != null) {
+          cached.result = transformed;
+          delete cached.promise;
         }
+        return transformed;
+      } finally {
+        resolve?.();
       }
-      const jsonSourceMap = sourceMap && (typeof sourceMap === "string" ? JSON.parse(sourceMap) : sourceMap.json(
-        path.basename(id.replace(/\.[jt]sx$/, "")),
-        path.basename(id)
-      ));
-      let transformed = {
-        code: compiled,
-        map: jsonSourceMap
-      };
-      if (options.transformOutput) {
-        transformed = await options.transformOutput(transformed.code, id);
-      }
-      cache?.set(filename, { mtime, result: transformed });
-      return transformed;
     },
     esbuild: {
       config(options2) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -92,22 +92,22 @@
   "dependencies": {
     "@cspotcode/source-map-support": "^0.8.1",
     "@typescript/vfs": "^1.6.0",
-    "unplugin": "^1.12.2"
+    "unplugin": "^2.1.0"
   },
   "devDependencies": {
-    "@danielx/civet": "0.8.11",
+    "@danielx/civet": "0.9.0",
     "@danielx/hera": "^0.8.16",
     "@prettier/sync": "^0.5.2",
     "@types/assert": "^1.5.6",
     "@types/mocha": "^10.0.8",
-    "@types/node": "^20.12.2",
+    "@types/node": "^22.10.2",
     "c8": "^7.12.0",
-    "esbuild": "0.20.0",
+    "esbuild": "0.24.0",
     "marked": "^4.2.4",
     "mocha": "^10.7.3",
     "prettier": "^3.2.5",
     "terser": "^5.16.1",
-    "ts-node": "^10.9.1",
+    "ts-node": "^10.9.2",
     "tslib": "^2.4.0",
     "typescript": "^5.5.2",
     "vite": "^4.4.12",