@jk2908/cxx 0.3.3 → 0.3.5

package/dist/utils.d.ts

@@ -1,19 +1,3 @@
 export declare function capitalise(str: string): string;
 export declare function pascalise(str: string): string;
-export type Batcher<K, V> = {
-    /**
-     * Queue a value for a key. Queueing the same key again replaces the previous value.
-     */
-    add: (key: K, value: V) => void;
-    /**
-     * Run any waiting work now and resolve once it has finished.
-     */
-    flush: () => Promise<void>;
-};
-/**
- * Group bursts of work and run them together. Every key queued within `wait` is
- * included once, and a key queued while a batch is running is handled in the next
- * batch instead of replacing the one in progress.
- */
-export declare function createBatcher<K, V>(wait: number, flush: (batch: Map<K, V>) => void | Promise<void>): Batcher<K, V>;
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,UAErC;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,UAKpC;AAED,MAAM,MAAM,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI;IAC3B;;OAEG;IACH,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,IAAI,CAAA;IAC/B;;OAEG;IACH,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAC1B,CAAA;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,CAAC,EACjC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAC/C,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAkEf"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,UAErC;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,UAKpC"}

package/dist/vite/index.d.ts

@@ -4,6 +4,7 @@ export default function cxx(pluginConfig?: PluginConfig): {
     name: string;
     enforce: "pre";
     configResolved(this: import("vite").MinimalPluginContextWithoutEnvironment, config: ResolvedConfig): void;
+    buildStart(this: import("rolldown").PluginContext): Promise<void>;
     transform(this: import("rolldown").TransformPluginContext, code: string, id: string): {
         code: string;
         map: import("magic-string").SourceMap | null;

package/dist/vite/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/vite/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAe,KAAK,cAAc,EAAE,KAAK,aAAa,EAAE,MAAM,MAAM,CAAA;AAE3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AA+B/C,MAAM,CAAC,OAAO,UAAU,GAAG,CAAC,YAAY,GAAE,YAAiB;;;wFA+GlC,cAAc;;;;;yFA8Bb,aAAa;;EA6BtC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/vite/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAe,KAAK,cAAc,EAAE,KAAK,aAAa,EAAE,MAAM,MAAM,CAAA;AAE3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAkB/C,MAAM,CAAC,OAAO,UAAU,GAAG,CAAC,YAAY,GAAE,YAAiB;;;wFA6ElC,cAAc;;;;;;yFAkCb,aAAa;;EAYtC"}

package/dist/vite/index.js

@@ -1,6 +1,3 @@
-import { createRequire } from "node:module";
-var __require = /* @__PURE__ */ createRequire(import.meta.url);
-
 // src/build.ts
 import { createHash } from "node:crypto";
 import fs from "node:fs/promises";
@@ -14,6 +11,86 @@ var PKG_NAME = `@jk2908/${NAME}`;
 var GENERATED_DIR = `.${NAME}`;
 var AUTOGEN_MSG = `// auto-generated by ${NAME}`;
 
+// src/logger.ts
+var LEVELS = {
+  debug: 0,
+  info: 1,
+  warn: 2,
+  error: 3,
+  fatal: 4
+};
+var defaultLevel = process.env["NODE_ENV"] === "production" ? "error" : "info";
+
+class Logger {
+  name;
+  #level = defaultLevel;
+  constructor(name) {
+    this.name = name;
+  }
+  static toError(err) {
+    return err instanceof Error ? err : new Error(String(err), { cause: err });
+  }
+  static print(err) {
+    if (err instanceof Error) {
+      return err.message + (err.stack ? `
+${err.stack}` : "");
+    }
+    if (typeof err === "object" && err !== null) {
+      try {
+        return JSON.stringify(err, null, 2);
+      } catch {
+        return String(err);
+      }
+    }
+    return String(err);
+  }
+  set level(level) {
+    this.#level = level;
+  }
+  get level() {
+    return this.#level;
+  }
+  log(level, message, error) {
+    if (LEVELS[level] < LEVELS[this.level])
+      return;
+    const entry = {
+      ts: Date.now(),
+      level,
+      message
+    };
+    if (level === "error" || level === "fatal") {
+      entry.error = error ? Logger.toError(error) : new Error(message);
+    }
+    const line = `${this.name ? `[${this.name}]` : ""} [${entry.ts}] [${level.toUpperCase()}] ${message}`;
+    const extra = entry.error ? `
+${Logger.print(entry.error)}` : "";
+    if (level === "warn") {
+      console.warn(line, extra);
+      return;
+    }
+    if (level === "error" || level === "fatal") {
+      console.error(line, extra);
+      return;
+    }
+    console.log(line, extra);
+  }
+  debug(...messages) {
+    this.log("debug", messages.join(" "));
+  }
+  info(...messages) {
+    this.log("info", messages.join(" "));
+  }
+  warn(...messages) {
+    this.log("warn", messages.join(" "));
+  }
+  error(message, error) {
+    this.log("error", message, error === undefined ? undefined : Logger.toError(error));
+  }
+  fatal(message, error) {
+    this.log("fatal", message, error === undefined ? undefined : Logger.toError(error));
+  }
+}
+
 // src/lru.ts
 var CACHE_MAX_SIZE = 100;
 
@@ -56,54 +133,9 @@ function capitalise(str) {
 function pascalise(str) {
   return str.split(/[ _-]+/).map(capitalise).join("");
 }
-function createBatcher(wait, flush) {
-  const pending = new Map;
-  let timer = null;
-  let current = null;
-  function drain() {
-    if (current)
-      return current;
-    const run = (async () => {
-      while (pending.size > 0) {
-        const batch = new Map(pending);
-        pending.clear();
-        await flush(batch);
-      }
-    })();
-    current = run;
-    run.then(() => {
-      if (current === run)
-        current = null;
-    }, () => {
-      if (current === run)
-        current = null;
-    });
-    return run;
-  }
-  function schedule() {
-    if (timer)
-      clearTimeout(timer);
-    timer = setTimeout(() => {
-      timer = null;
-      drain().catch(() => {});
-    }, wait);
-  }
-  return {
-    add(key, value) {
-      pending.set(key, value);
-      schedule();
-    },
-    flush() {
-      if (timer) {
-        clearTimeout(timer);
-        timer = null;
-      }
-      return drain();
-    }
-  };
-}
 
 // src/build.ts
+var logger = new Logger(NAME);
 var decoder = new TextDecoder;
 var encoder = new TextEncoder;
 var collectCache = new LruCache;
@@ -244,29 +276,21 @@ async function writeRenderedTypes(tags) {
 var PARTIAL_DIR = path.join(GENERATED_DIR, "tags");
 var REBUILD_WAIT = 100;
 var rebuildTimer = null;
-var rebuildError = null;
 function partialPath(filePath) {
   return path.join(PARTIAL_DIR, `${createHash("sha1").update(filePath).digest("hex")}.json`);
 }
-async function partialDirMtime() {
-  try {
-    return (await fs.stat(PARTIAL_DIR)).mtimeMs;
-  } catch (err) {
-    if (isENOENT(err))
-      return 0;
-    throw err;
-  }
-}
 async function readPartials() {
   let entries;
   try {
     entries = await fs.readdir(PARTIAL_DIR);
   } catch (err) {
     if (isENOENT(err))
-      return new Map;
+      return { tags: new Map, duplicates: [] };
     throw err;
   }
   const tags = new Map;
+  const fileByTag = new Map;
+  const duplicates = [];
   for (const entry of entries) {
     if (!entry.endsWith(".json"))
       continue;
@@ -277,19 +301,28 @@ async function readPartials() {
     } catch {
       continue;
     }
+    let source;
     try {
-      await fs.access(parsed.file);
+      source = await fs.readFile(parsed.file, "utf-8");
     } catch {
       await fs.rm(partial, { force: true });
       continue;
     }
+    if (!source.includes("cxx")) {
+      await fs.rm(partial, { force: true });
+      continue;
+    }
     for (const [name, classes] of Object.entries(parsed.tags)) {
-      if (tags.has(name))
-        throw new DuplicateTagError(name);
+      const existing = fileByTag.get(name);
+      if (existing) {
+        duplicates.push({ tag: name, files: [existing, parsed.file] });
+        continue;
+      }
+      fileByTag.set(name, parsed.file);
       tags.set(name, classes);
     }
   }
-  return tags;
+  return { tags, duplicates };
 }
 function writeTypesForFile(filePath, tags) {
   return enqueueWrite(async () => {
@@ -300,8 +333,8 @@ function writeTypesForFile(filePath, tags) {
     } else {
       await writeFileAtomic(partial, JSON.stringify({ file: filePath, tags: Object.fromEntries(tags) }));
     }
-  }).then(() => {
-    scheduleRebuild();
+  }).then(() => scheduleRebuild()).catch((err) => {
+    logger.error(`failed to write types for ${filePath}`, err);
   });
 }
 function scheduleRebuild() {
@@ -310,7 +343,7 @@ function scheduleRebuild() {
   rebuildTimer = setTimeout(() => {
     rebuildTimer = null;
     flushTypes().catch((err) => {
-      rebuildError = err;
+      logger.error("failed to generate types", err);
     });
   }, REBUILD_WAIT);
 }
@@ -320,23 +353,64 @@ function flushTypes() {
     rebuildTimer = null;
   }
   return enqueueWrite(async () => {
-    let before = await partialDirMtime();
-    for (let attempt = 0;attempt < 3; attempt++) {
-      await writeRenderedTypes(await readPartials());
-      const after = await partialDirMtime();
-      if (after === before)
-        return;
-      before = after;
+    const { tags, duplicates } = await readPartials();
+    await writeRenderedTypes(tags);
+    for (const duplicate of duplicates) {
+      logger.error(`Tag "${duplicate.tag}" is defined in multiple files: ${duplicate.files.join(", ")}`);
+    }
+  });
+}
+var SOURCE_EXTENSIONS = new Set([".js", ".jsx", ".ts", ".tsx"]);
+var SKIP_DIRS = new Set(["node_modules", "dist", "build", "coverage", "out"]);
+async function runWithConcurrency(items, concurrency, fn) {
+  let cursor = 0;
+  const workers = Array.from({ length: Math.min(concurrency, items.length) }, async () => {
+    while (cursor < items.length) {
+      const index = cursor++;
+      await fn(items[index]);
     }
   });
+  await Promise.all(workers);
 }
-function takeRebuildError() {
-  const err = rebuildError;
-  rebuildError = null;
-  return err;
+async function refreshFile(file, config) {
+  let source;
+  try {
+    source = await fs.readFile(file, "utf-8");
+  } catch (err) {
+    if (!isENOENT(err))
+      throw err;
+    await writeTypesForFile(file, new Map);
+    return;
+  }
+  const tags = source.includes("cxx") ? collect(source, file, config).tags : new Map;
+  await writeTypesForFile(file, tags);
+}
+async function seedTypes(root, config) {
+  async function scan(dir) {
+    let entries;
+    try {
+      entries = await fs.readdir(dir, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    await runWithConcurrency(entries, 8, async (entry) => {
+      if (entry.name.startsWith(".") || SKIP_DIRS.has(entry.name))
+        return;
+      const full = path.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        await scan(full);
+        return;
+      }
+      if (!SOURCE_EXTENSIONS.has(path.extname(entry.name)))
+        return;
+      await refreshFile(full, config);
+    });
+  }
+  await scan(root);
+  await flushTypes();
 }
 function tagsToType(tags) {
-  return [...tags].toSorted(([a], [b]) => a.localeCompare(b)).map(([tag, classes]) => {
+  return [...tags].toSorted(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([tag, classes]) => {
     const union = classes.length > 0 ? classes.toSorted((a, b) => a.length - b.length).map((c) => `'${c}'`).join(" | ") : "never";
     return `	export type ${tag} = ${union}`;
   }).join(`
@@ -345,170 +419,60 @@ function tagsToType(tags) {
 
 // src/vite/index.ts
 import { realpathSync } from "node:fs";
-import fs2 from "node:fs/promises";
 import path2 from "node:path";
-
-// src/logger.ts
-var LEVELS = {
-  debug: 0,
-  info: 1,
-  warn: 2,
-  error: 3,
-  fatal: 4
-};
-var defaultLevel = process.env["NODE_ENV"] === "production" ? "error" : "info";
-
-class Logger {
-  name;
-  #level;
-  constructor(level, name) {
-    this.name = name;
-    this.#level = level ?? defaultLevel;
-  }
-  static toError(err) {
-    return err instanceof Error ? err : new Error(String(err), { cause: err });
-  }
-  static print(err) {
-    if (err instanceof Error) {
-      return err.message + (err.stack ? `
-${err.stack}` : "");
-    }
-    if (typeof err === "object" && err !== null) {
-      try {
-        return JSON.stringify(err, null, 2);
-      } catch {
-        return String(err);
-      }
-    }
-    return String(err);
-  }
-  set level(level) {
-    this.#level = level;
-  }
-  get level() {
-    return this.#level;
-  }
-  log(level, message, error) {
-    if (LEVELS[level] < LEVELS[this.level])
-      return;
-    const entry = {
-      ts: Date.now(),
-      level,
-      message
-    };
-    if (level === "error" || level === "fatal") {
-      entry.error = error ? Logger.toError(error) : new Error(message);
-    }
-    const line = `${this.name ? `[${this.name}]` : ""} [${entry.ts}] [${level.toUpperCase()}] ${message}`;
-    const extra = entry.error ? `
-${Logger.print(entry.error)}` : "";
-    if (level === "warn") {
-      console.warn(line, extra);
-      return;
-    }
-    if (level === "error" || level === "fatal") {
-      console.error(line, extra);
-      return;
-    }
-    console.log(line, extra);
-  }
-  debug(...messages) {
-    this.log("debug", messages.join(" "));
-  }
-  info(...messages) {
-    this.log("info", messages.join(" "));
-  }
-  warn(...messages) {
-    this.log("warn", messages.join(" "));
-  }
-  error(message, error) {
-    this.log("error", message, error === undefined ? undefined : Logger.toError(error));
-  }
-  fatal(message, error) {
-    this.log("fatal", message, error === undefined ? undefined : Logger.toError(error));
-  }
-}
-
-// src/vite/index.ts
-var ACCEPTED_EXTENSIONS = new Set([".js", ".jsx", ".ts", ".tsx"]);
 function normaliseWatchPath(p) {
   return p.replace(/\\/g, "/");
 }
-function globToRegExp(glob) {
-  const pattern = glob.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*\*(\/|$)/g, ".*$1").replace(/\*/g, "[^/]*").replace(/\?/g, "[^/]");
-  return new RegExp(`^${pattern}$`);
-}
 function cxx(pluginConfig = {}) {
-  const logger = new Logger;
+  const logger2 = new Logger;
   let watchRoot = normaliseWatchPath(process.cwd());
-  const ignored = (pluginConfig.watch?.ignore ?? []).map(globToRegExp);
+  let seeded = false;
+  const realpaths = new Map;
   function resolveWatchFile(filePath) {
     const absolutePath = path2.resolve(watchRoot, filePath);
     const parentPath = path2.dirname(absolutePath);
-    try {
-      const resolvedParentPath = normaliseWatchPath(realpathSync.native(parentPath));
-      return normaliseWatchPath(path2.join(resolvedParentPath, path2.basename(absolutePath)));
-    } catch {
-      return normaliseWatchPath(absolutePath);
+    let resolvedParentPath = realpaths.get(parentPath);
+    if (resolvedParentPath === undefined) {
+      try {
+        resolvedParentPath = normaliseWatchPath(realpathSync.native(parentPath));
+      } catch {
+        resolvedParentPath = normaliseWatchPath(parentPath);
+      }
+      realpaths.set(parentPath, resolvedParentPath);
     }
+    return normaliseWatchPath(path2.join(resolvedParentPath, path2.basename(absolutePath)));
   }
   function watchedFile(filePath) {
     const resolvedPath = resolveWatchFile(filePath);
-    if (resolvedPath.startsWith(`${watchRoot}/`) && !resolvedPath.includes(`/${GENERATED_DIR}/`) && ACCEPTED_EXTENSIONS.has(path2.extname(resolvedPath)) && !ignored.some((regexp) => regexp.test(resolvedPath))) {
+    if (resolvedPath.startsWith(`${watchRoot}/`) && !resolvedPath.includes(`/${GENERATED_DIR}/`) && SOURCE_EXTENSIONS.has(path2.extname(resolvedPath))) {
       return resolvedPath;
     }
     return null;
   }
-  async function recordFile(file) {
-    let source;
-    try {
-      source = await fs2.readFile(file, "utf-8");
-    } catch (err) {
-      if (!isENOENT(err))
-        throw err;
+  async function handleEvent(event, file) {
+    if (event === "unlink") {
       await writeTypesForFile(file, new Map);
-      return;
+    } else {
+      await refreshFile(file, pluginConfig);
     }
-    const tags = source.includes("cxx") ? collect(source, file, pluginConfig).tags : new Map;
-    await writeTypesForFile(file, tags);
+    logger2.info(`updated types from ${file}`);
   }
-  async function scan(dir) {
-    let entries;
-    try {
-      entries = await fs2.readdir(dir, { withFileTypes: true });
-    } catch {
-      return;
-    }
-    await Promise.all(entries.map(async (entry) => {
-      if (entry.name.startsWith(".") || entry.name === "node_modules")
-        return;
-      const full = path2.join(dir, entry.name);
-      if (entry.isDirectory()) {
-        await scan(full);
+  function onWatch(event) {
+    return (p) => {
+      const file = watchedFile(p);
+      if (!file)
         return;
-      }
-      if (!ACCEPTED_EXTENSIONS.has(path2.extname(entry.name)))
-        return;
-      const resolved = resolveWatchFile(full);
-      if (ignored.some((regexp) => regexp.test(resolved)))
-        return;
-      await recordFile(resolved);
-    }));
+      handleEvent(event, file).catch((err) => {
+        logger2.error(`failed to update types from ${file}`, err);
+      });
+    };
+  }
+  async function seed() {
+    if (seeded)
+      return;
+    seeded = true;
+    await seedTypes(watchRoot, pluginConfig);
   }
-  const queue = createBatcher(75, async (batch) => {
-    for (const [file, event] of batch) {
-      try {
-        if (event === "unlink") {
-          await writeTypesForFile(file, new Map);
-        } else {
-          await recordFile(file);
-        }
-        logger.info(`updated types from ${file}`);
-      } catch (err) {
-        logger.error(`failed to update types from ${file}`, err);
-      }
-    }
-  });
   return {
     name: "cxx",
     enforce: "pre",
@@ -519,6 +483,10 @@ function cxx(pluginConfig = {}) {
       } catch {
         watchRoot = normaliseWatchPath(root);
       }
+      realpaths.clear();
+    },
+    async buildStart() {
+      await seed();
     },
     transform(code, id) {
       if (id.startsWith("\x00") || id.includes("/node_modules/"))
@@ -526,7 +494,7 @@ function cxx(pluginConfig = {}) {
       if (!code.includes("cxx"))
         return null;
       const cleanId = id.split("?")[0];
-      if (!ACCEPTED_EXTENSIONS.has(path2.extname(cleanId)))
+      if (!SOURCE_EXTENSIONS.has(path2.extname(cleanId)))
         return null;
       const { template, tags, map } = collect(code, cleanId, pluginConfig);
       if (template === code)
@@ -538,25 +506,8 @@ function cxx(pluginConfig = {}) {
       };
     },
     configureServer(server) {
-      logger.info("Watching for changes...");
-      server.watcher.on("add", (p) => {
-        const file = watchedFile(p);
-        if (file)
-          queue.add(file, "add");
-      }).on("change", (p) => {
-        const file = watchedFile(p);
-        if (file)
-          queue.add(file, "change");
-      }).on("unlink", (p) => {
-        const file = watchedFile(p);
-        if (file)
-          queue.add(file, "unlink");
-      });
-      scan(watchRoot).then(() => flushTypes()).then(() => {
-        const err = takeRebuildError();
-        if (err)
-          logger.error("failed to generate types", err);
-      }).catch((err) => logger.error("failed to scan for cxx templates", err));
+      logger2.info("Watching for changes...");
+      server.watcher.on("add", onWatch("add")).on("change", onWatch("change")).on("unlink", onWatch("unlink"));
     },
     async writeBundle() {
       await flushTypes();
@@ -567,4 +518,4 @@ export {
   cxx as default
 };
 
-//# debugId=7C0503EFBFB9E21F64756E2164756E21
+//# debugId=9AC49C0FC7DBDEB864756E2164756E21