@danielx/civet 0.7.10 → 0.7.12

package/dist/civet

@@ -122,6 +122,12 @@ function parseArgs(args) {
   while (i < args.length) {
     const arg = args[i];
     if (/^-\w{2,}$/.test(arg)) {
+      const results = [];
+      for (let ref = arg.slice(1), i1 = 0, len = ref.length; i1 < len; i1++) {
+        const char = ref[i1];
+        results.push(`-${char}`);
+      }
+      ;
       args.splice(i, 1 + i - i, ...results);
       continue;
     }
@@ -218,8 +224,8 @@ function parseArgs(args) {
 }
 async function* readFiles(filenames) {
   const results1 = [];
-  for (let i1 = 0, len = filenames.length; i1 < len; i1++) {
-    let filename = filenames[i1];
+  for (let i2 = 0, len1 = filenames.length; i2 < len1; i2++) {
+    let filename = filenames[i2];
     const stdin = filename === "-";
     try {
       let content;
@@ -418,18 +424,17 @@ ${" ".repeat(error.column - 1)}^ ${error.header}`);
           return callback(error, void 0);
         }
         if (topLevelAwait) {
-          let threw = false;
+          let ok = true;
           try {
-            result = await result;
+            return result = await result;
           } catch (error) {
-            threw = true;
-            callback(error, void 0);
-          }
-          if (!threw) {
-            return callback(null, result);
+            ok = false;
+            return callback(error, void 0);
+          } finally {
+            if (ok) {
+              callback(null, result);
+            }
           }
-          ;
-          return;
         } else {
           return callback(null, result);
         }
@@ -642,9 +647,9 @@ async function cli() {
         }
       });
     } catch (error) {
-      let ref;
-      if (ref = error.message.match(/Aborting build because of (\d+) TypeScript diagnostic/)) {
-        const match = ref;
+      let ref1;
+      if (ref1 = error.message.match(/Aborting build because of (\d+) TypeScript diagnostic/)) {
+        const match = ref1;
         return process.exitCode = Math.min(255, errors + +match[1]);
       } else {
         process.exitCode = 1;

package/dist/esbuild.js

@@ -108,6 +108,7 @@ var rawPlugin = (options = {}, meta) => {
       getCanonicalFileName: sys.useCaseSensitiveFileNames ? (f) => f : (f) => f.toLowerCase()
     };
   };
+  const cache = options.cache ? /* @__PURE__ */ new Map() : void 0;
   return {
     name: "unplugin-civet",
     enforce: "pre",
@@ -320,6 +321,14 @@ var rawPlugin = (options = {}, meta) => {
         return null;
       const basename = id.slice(0, match.index + match[1].length);
       const filename = import_path.default.resolve(rootDir, basename);
+      let mtime;
+      if (cache) {
+        mtime = (await fs.promises.stat(filename)).mtimeMs;
+        const 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;
@@ -403,6 +412,7 @@ var rawPlugin = (options = {}, meta) => {
       };
       if (options.transformOutput)
         transformed = await options.transformOutput(transformed.code, id);
+      cache?.set(filename, { mtime, result: transformed });
       return transformed;
     },
     esbuild: {

package/dist/esm.mjs

@@ -1,39 +1,10 @@
 // source/esm.civet
 import { readFileSync } from "fs";
 import { pathToFileURL, fileURLToPath } from "url";
-import sourceMapSupport from "@cspotcode/source-map-support";
 import Civet from "./main.js";
 var { compile, SourceMap } = Civet;
 var baseURL = pathToFileURL(process.cwd() + "/").href;
 var extensionsRegex = /\.civet$/;
-var registered = false;
-var outputCache = /* @__PURE__ */ new Map();
-var directorySeparator = "/";
-var backslashRegExp = /\\/g;
-function normalizeSlashes(value) {
-  return value.replace(backslashRegExp, directorySeparator);
-}
-var ensureRegister = function() {
-  if (registered) {
-    return;
-  }
-  const installation = {
-    environment: "node",
-    retrieveFile(pathOrUrl) {
-      let path = pathOrUrl;
-      if (path.startsWith("file:")) {
-        try {
-          path = fileURLToPath(path);
-        } catch (e) {
-        }
-      }
-      path = normalizeSlashes(path);
-      return outputCache.get(path);
-    }
-  };
-  sourceMapSupport.install(installation);
-  return registered = true;
-};
 function resolve(specifier, context, next) {
   const { parentURL = baseURL } = context;
   if (extensionsRegex.test(specifier)) {
@@ -62,10 +33,8 @@ async function load(url, context, next) {
       // NOTE: Setting the source in the context makes it available when ts-node uses defaultLoad
       source: tsSource
     });
-    ensureRegister();
     result.responseURL = (result.responseURL ?? transpiledUrl).replace(/.tsx$/, "");
     result.source = SourceMap.remap(result.source, sourceMap, url, result.responseURL);
-    outputCache.set(normalizeSlashes(path), result.source);
     return result;
   }
   return next(url, context);