@jk2908/cxx 0.2.4 → 0.3.1

package/dist/next/cxx-loader.cjs

@@ -4,38 +4,61 @@ var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toESMCache_node;
+var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
-  for (let key of __getOwnPropNames(mod))
-    if (!__hasOwnProp.call(to, key))
-      __defProp(to, key, {
-        get: () => mod[key],
-        enumerable: true
-      });
+  if (mod && typeof mod === "object" || typeof mod === "function") {
+    for (let key of __getOwnPropNames(mod))
+      if (!__hasOwnProp.call(to, key))
+        __defProp(to, key, {
+          get: __accessProp.bind(mod, key),
+          enumerable: true
+        });
+  }
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
-var __moduleCache = /* @__PURE__ */ new WeakMap;
 var __toCommonJS = (from) => {
-  var entry = __moduleCache.get(from), desc;
+  var entry = (__moduleCache ??= new WeakMap).get(from), desc;
   if (entry)
     return entry;
   entry = __defProp({}, "__esModule", { value: true });
-  if (from && typeof from === "object" || typeof from === "function")
-    __getOwnPropNames(from).map((key) => !__hasOwnProp.call(entry, key) && __defProp(entry, key, {
-      get: () => from[key],
-      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-    }));
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (var key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(entry, key))
+        __defProp(entry, key, {
+          get: __accessProp.bind(from, key),
+          enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+        });
+  }
   __moduleCache.set(from, entry);
   return entry;
 };
+var __moduleCache;
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 
@@ -54,20 +77,14 @@ var LEVELS = {
   error: 3,
   fatal: 4
 };
+var defaultLevel = process.env["NODE_ENV"] === "production" ? "error" : "info";
 
 class Logger {
   name;
-  static #defaultLevel = "info";
   #level;
   constructor(level, name) {
     this.name = name;
-    this.#level = level;
-  }
-  static set defaultLevel(level) {
-    Logger.#defaultLevel = level;
-  }
-  static get defaultLevel() {
-    return Logger.#defaultLevel;
+    this.#level = level ?? defaultLevel;
   }
   static toError(err) {
     return err instanceof Error ? err : new Error(String(err), { cause: err });
@@ -90,7 +107,7 @@ ${err.stack}` : "");
     this.#level = level;
   }
   get level() {
-    return this.#level ?? Logger.#defaultLevel;
+    return this.#level;
   }
   log(level, message, error) {
     if (LEVELS[level] < LEVELS[this.level])
@@ -137,13 +154,13 @@ ${Logger.print(entry.error)}` : "";
 var import_promises2 = __toESM(require("node:fs/promises"));
 var import_node_path2 = __toESM(require("node:path"));
 var import_node_url = require("node:url");
-var import_watcher = __toESM(require("@parcel/watcher"));
 
-// src/index.ts
+// src/build.ts
 var import_node_crypto = require("node:crypto");
 var import_promises = __toESM(require("node:fs/promises"));
 var import_node_path = __toESM(require("node:path"));
 var import_lightningcss = require("lightningcss");
+var import_magic_string = __toESM(require("magic-string"));
 
 // src/config.ts
 var NAME = "cxx";
@@ -194,19 +211,32 @@ function pascalise(str) {
   return str.split(/[ _-]+/).map(capitalise).join("");
 }
 
-// src/index.ts
+// src/build.ts
+var decoder = new TextDecoder;
 var collectCache = new LruCache;
 var fileCache = new LruCache;
+var writeChain = Promise.resolve();
 function isENOENT(err) {
   return err instanceof Error && "code" in err && err.code === "ENOENT";
 }
+async function writeFileAtomic(filePath, content) {
+  const tmp = `${filePath}.${process.pid}.${Math.random().toString(36).slice(2)}.tmp`;
+  await import_promises.default.writeFile(tmp, content);
+  await import_promises.default.rename(tmp, filePath);
+}
+function enqueueWrite(task) {
+  const run = writeChain.then(task, task);
+  writeChain = run.then(() => {
+    return;
+  }, () => {
+    return;
+  });
+  return run;
+}
 async function maybeWrite(filePath, content) {
   const cached = fileCache.get(filePath);
-  if (cached !== content) {
-    await import_promises.default.writeFile(filePath, content);
-    fileCache.set(filePath, content);
-    return true;
-  }
+  if (cached === content)
+    return false;
   try {
     if (await import_promises.default.readFile(filePath, "utf-8") === content) {
       fileCache.set(filePath, content);
@@ -216,26 +246,42 @@ async function maybeWrite(filePath, content) {
     if (!isENOENT(err))
       throw err;
   }
-  await import_promises.default.writeFile(filePath, content);
+  await writeFileAtomic(filePath, content);
   fileCache.set(filePath, content);
   return true;
 }
-var regex = /(?:const|var|let)\s*\[(\w+|)\s*,?\s*(\w+|)\s*,?\s*(\w+|)\s*\]\s*=\s*cxx(?:\s*`([\s\S]*?)`|\s*\.\s*tag(?:\s*<[^>]+>)?\s*\(\s*(['"])(.*?)\5\s*\)\s*`([\s\S]*?)`)/gm;
+var regex = /((?:export\s+)?)(?:const|var|let)\s*\[(\w*)\s*,?\s*(\w*)\s*,?\s*(\w*)\s*\]\s*=\s*cxx(?:\s*`([\s\S]*?)`|\s*\.\s*tag(?:\s*<[^>]+>)?\s*\(\s*(['"])(.*?)\6\s*\)\s*`([\s\S]*?)`)/gm;
+var IDENTIFIER = /^[A-Za-z_$][A-Za-z0-9_$]*$/;
 function hashCss(code) {
   return `cxx-${import_node_crypto.createHash("sha256").update(code).digest("base64url").slice(0, 12)}`;
 }
 
-class TagDuplicateError extends Error {
+class DuplicateTagError extends Error {
+  name = "DuplicateTagError";
   constructor(tag) {
     super(`Tag ${tag} has already been seen. Tags must be unique across your application`);
   }
 }
+
+class InvalidTagError extends Error {
+  name = "InvalidTagError";
+  constructor(tag) {
+    super(`Tag "${tag}" does not map to a valid TypeScript identifier. ` + `Use letters, numbers, spaces, "_" or "-"`);
+  }
+}
 function collect(source, id, config) {
-  const tags = new Map;
+  const configKey = JSON.stringify(config);
   const cached = collectCache.get(id);
-  if (cached?.source === source)
+  if (cached?.source === source && cached.config === configKey)
     return cached;
-  const template = source.replace(regex, (_match, varOne, varTwo, varThree, plainCss, _quote, tag, taggedCss) => {
+  const tags = new Map;
+  const magic = new import_magic_string.default(source);
+  let matched = false;
+  regex.lastIndex = 0;
+  let match;
+  while (match = regex.exec(source)) {
+    matched = true;
+    const [, exp, varOne, varTwo, varThree, plainCss, , tag, taggedCss] = match;
     const css = plainCss ?? taggedCss;
     const { code, exports: exports2 = {} } = import_lightningcss.transform({
       minify: true,
@@ -248,169 +294,220 @@ function collect(source, id, config) {
     if (tag) {
       const suffix = typeof config.typeSuffix === "string" ? config.typeSuffix : config.typeSuffix === false ? "" : "Classes";
       const tagWithSuffix = pascalise(`${tag}${suffix}`);
+      if (!IDENTIFIER.test(tagWithSuffix))
+        throw new InvalidTagError(tag);
       if (tags.has(tagWithSuffix))
-        throw new TagDuplicateError(tagWithSuffix);
+        throw new DuplicateTagError(tagWithSuffix);
       tags.set(tagWithSuffix, Object.keys(styles));
     }
-    return [
-      varOne && `const ${varOne} = \`${code}\``,
-      varTwo && `const ${varTwo} = ${JSON.stringify(styles)}`,
-      varThree && `const ${varThree} = \`${href}\``
-    ].filter(Boolean).join(`
+    const statements = [];
+    if (varOne) {
+      statements.push(`${exp}const ${varOne} = ${JSON.stringify(decoder.decode(code))}`);
+    }
+    if (varTwo) {
+      statements.push(`${exp}const ${varTwo} = ${JSON.stringify(styles)}`);
+    }
+    if (varThree) {
+      statements.push(`${exp}const ${varThree} = ${JSON.stringify(href)}`);
+    }
+    magic.overwrite(match.index, match.index + match[0].length, statements.join(`
+`));
+  }
+  const template = magic.toString();
+  const map = matched ? magic.generateMap({ source: id, includeContent: true, hires: true }) : null;
+  const result = { source, config: configKey, template, tags, map };
+  collectCache.set(id, result);
+  return result;
+}
+function renderTypes(tags) {
+  return [
+    AUTOGEN_MSG,
+    "",
+    `import '${PKG_NAME}'`,
+    "",
+    `declare module '${PKG_NAME}' {`,
+    tagsToType(tags),
+    "}",
+    ""
+  ].join(`
 `);
-  });
-  collectCache.set(id, { source, template, tags });
-  return {
-    template,
-    tags
-  };
 }
-async function writeTypes(tags) {
+async function writeRenderedTypes(tags) {
   const filePath = import_node_path.default.join(GENERATED_DIR, "index.d.ts");
   if (!tags.size) {
-    try {
-      await import_promises.default.rm(filePath, { force: true });
-      fileCache.delete(filePath);
-    } catch (err) {
-      if (!isENOENT(err))
-        throw err;
-    }
+    await import_promises.default.rm(filePath, { force: true });
+    fileCache.delete(filePath);
     return;
   }
   await import_promises.default.mkdir(GENERATED_DIR, { recursive: true });
-  await maybeWrite(filePath, `${AUTOGEN_MSG}
-
-			import '${PKG_NAME}'
-
-			declare module '${PKG_NAME}' {
-				${tagsToType(tags)}
-			}
-		`);
+  await maybeWrite(filePath, renderTypes(tags));
 }
-function tagsToType(tags) {
-  return [...tags].map(([tag, classes]) => `
-		export type ${tag} = ${classes.length > 0 ? classes.toSorted((a, b) => a.length - b.length).map((c) => `'${c}'`).join(" | ") : "never"}
-	`).join(`
-`);
+var PARTIAL_DIR = import_node_path.default.join(GENERATED_DIR, "tags");
+function partialPath(filePath) {
+  return import_node_path.default.join(PARTIAL_DIR, `${import_node_crypto.createHash("sha1").update(filePath).digest("hex")}.json`);
 }
-function flattenTags(tagsByFile) {
+async function readPartials() {
+  let entries;
+  try {
+    entries = await import_promises.default.readdir(PARTIAL_DIR);
+  } catch (err) {
+    if (isENOENT(err))
+      return new Map;
+    throw err;
+  }
   const tags = new Map;
-  for (const fileTags of tagsByFile.values()) {
-    for (const [name, classes] of fileTags) {
+  for (const entry of entries) {
+    if (!entry.endsWith(".json"))
+      continue;
+    const partial = import_node_path.default.join(PARTIAL_DIR, entry);
+    let parsed;
+    try {
+      parsed = JSON.parse(await import_promises.default.readFile(partial, "utf-8"));
+    } catch {
+      continue;
+    }
+    try {
+      await import_promises.default.access(parsed.file);
+    } catch {
+      await import_promises.default.rm(partial, { force: true });
+      continue;
+    }
+    for (const [name, classes] of Object.entries(parsed.tags)) {
       if (tags.has(name))
-        throw new TagDuplicateError(name);
+        throw new DuplicateTagError(name);
       tags.set(name, classes);
     }
   }
   return tags;
 }
-var cxx = Object.assign((_) => ["", {}, ""], {
-  tag: (_) => (_strings) => [
-    "",
-    {},
-    ""
-  ]
-});
+function writeTypesForFile(filePath, tags) {
+  return enqueueWrite(async () => {
+    await import_promises.default.mkdir(PARTIAL_DIR, { recursive: true });
+    const partial = partialPath(filePath);
+    if (!tags.size) {
+      await import_promises.default.rm(partial, { force: true });
+    } else {
+      await writeFileAtomic(partial, JSON.stringify({ file: filePath, tags: Object.fromEntries(tags) }));
+    }
+    await writeRenderedTypes(await readPartials());
+  });
+}
+function tagsToType(tags) {
+  return [...tags].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(`
+`);
+}
 
 // src/next/index.ts
 var nextDir = import_node_path2.default.dirname(import_node_url.fileURLToPath("file:///Users/jeromekenway/Documents/dev.nosync/me/repo/cxx/packages/cxx/src/next/index.ts"));
 var loader = import_node_path2.default.join(nextDir, "cxx-loader.cjs");
-var tagsByFile = new Map;
 var watchedFiles = new Map;
-var subscriptionsByDir = new Map;
-async function rebuildFile(filePath, event) {
-  const watchedFile = watchedFiles.get(filePath);
-  if (!watchedFile)
+var subscription = null;
+var subscriptionPromise = null;
+var cleanupRegistered = false;
+var watcherLogger = null;
+var DEFAULT_IGNORE = [
+  "**/node_modules/**",
+  "**/.next/**",
+  `**/${GENERATED_DIR}/**`,
+  "**/.git/**"
+];
+async function onEvent(event, filePath) {
+  const watched = watchedFiles.get(filePath);
+  if (!watched)
     return;
-  const { pluginConfig, logger } = watchedFile;
-  const hadTags = tagsByFile.has(filePath);
+  const { pluginConfig, logger } = watched;
   if (event === "delete") {
-    tagsByFile.delete(filePath);
-    if (!hadTags)
-      return;
-    await writeTypes(flattenTags(tagsByFile));
+    await writeTypesForFile(filePath, new Map);
     logger.info(`updated types from ${filePath}`);
     return;
   }
+  let source;
   try {
-    const source = await import_promises2.default.readFile(filePath, "utf-8");
-    const { tags } = collect(source, filePath, pluginConfig);
-    const hasTags = tags.size > 0;
-    if (hasTags) {
-      tagsByFile.set(filePath, tags);
-    } else {
-      tagsByFile.delete(filePath);
-    }
-    if (!hadTags && !hasTags)
-      return;
-    await writeTypes(flattenTags(tagsByFile));
-    logger.info(`updated types from ${filePath}`);
+    source = await import_promises2.default.readFile(filePath, "utf-8");
   } catch (err) {
     if (!isENOENT(err))
       throw err;
-    if (!hadTags)
-      return;
-    tagsByFile.delete(filePath);
-    await writeTypes(flattenTags(tagsByFile));
+    await writeTypesForFile(filePath, new Map);
     logger.info(`updated types from ${filePath}`);
+    return;
   }
+  const { tags } = collect(source, filePath, pluginConfig);
+  await writeTypesForFile(filePath, tags);
+  logger.info(`updated types from ${filePath}`);
+}
+function ensureWatcher(pluginConfig, logger) {
+  watcherLogger = logger;
+  if (subscriptionPromise)
+    return;
+  const root = pluginConfig.watch?.root ?? process.cwd();
+  const ignore = [...DEFAULT_IGNORE, ...pluginConfig.watch?.ignore ?? []];
+  subscriptionPromise = (async () => {
+    const { subscribe } = await import("@parcel/watcher");
+    subscription = await subscribe(root, (watchErr, events) => {
+      if (watchErr) {
+        watcherLogger?.error(`failed to watch ${root}`, watchErr);
+        return;
+      }
+      for (const event of events) {
+        const filePath = import_node_path2.default.resolve(event.path);
+        if (!watchedFiles.has(filePath))
+          continue;
+        onEvent(event.type, filePath).catch((err) => {
+          watcherLogger?.error(`failed to update types from ${filePath}`, err);
+        });
+      }
+    }, { ignore });
+    registerCleanup();
+  })().catch((err) => {
+    watcherLogger?.error("failed to start cxx watcher", err);
+    subscriptionPromise = null;
+  });
+}
+async function cleanup() {
+  const active = subscription;
+  subscription = null;
+  subscriptionPromise = null;
+  watchedFiles.clear();
+  if (active)
+    await active.unsubscribe();
+}
+async function shutdown(signal) {
+  try {
+    await cleanup();
+  } finally {
+    process.kill(process.pid, signal);
+  }
+}
+function registerCleanup() {
+  if (cleanupRegistered)
+    return;
+  cleanupRegistered = true;
+  process.once("SIGINT", () => void shutdown("SIGINT"));
+  process.once("SIGTERM", () => void shutdown("SIGTERM"));
 }
 function processFile(source, filePath, pluginConfig, logger) {
   const resolvedFilePath = import_node_path2.default.resolve(filePath);
-  const directoryPath = import_node_path2.default.dirname(resolvedFilePath);
-  let subscription = subscriptionsByDir.get(directoryPath);
-  if (true) {
+  if (process.env["NODE_ENV"] !== "production") {
     watchedFiles.set(resolvedFilePath, { pluginConfig, logger });
-    if (!subscription) {
-      subscription = import_watcher.default.subscribe(directoryPath, async (err, events) => {
-        if (err) {
-          logger.error(`failed to update types from ${directoryPath}`, err);
-          return;
-        }
-        for (const event of events) {
-          const eventFilePath = import_node_path2.default.resolve(event.path);
-          if (!watchedFiles.has(eventFilePath))
-            continue;
-          try {
-            await rebuildFile(eventFilePath, event.type);
-          } catch (watchErr) {
-            logger.error(`failed to update types from ${eventFilePath}`, watchErr);
-          }
-        }
-      });
-      subscriptionsByDir.set(directoryPath, subscription);
-    }
+    ensureWatcher(pluginConfig, logger);
   }
-  const result = collect(source, filePath, pluginConfig);
-  if (result.tags.size > 0) {
-    tagsByFile.set(filePath, result.tags);
-  } else {
-    tagsByFile.delete(filePath);
-  }
-  writeTypes(flattenTags(tagsByFile));
+  const result = collect(source, resolvedFilePath, pluginConfig);
+  writeTypesForFile(resolvedFilePath, result.tags).catch((err) => {
+    logger.error(`failed to write types for ${resolvedFilePath}`, err);
+  });
   return result;
 }
-async function cleanup() {
-  await Promise.all([...subscriptionsByDir].map(async ([directoryPath, subPromise]) => {
-    subscriptionsByDir.delete(directoryPath);
-    await (await subPromise).unsubscribe();
-  }));
-  subscriptionsByDir.clear();
-}
-process.once("SIGINT", () => {
-  cleanup().finally(() => process.exit(130));
-});
-process.once("SIGTERM", () => {
-  cleanup().finally(() => process.exit(143));
-});
 
 // src/next/cxx-loader.js
 var loader2 = function(source) {
   const { pluginConfig } = this.getOptions();
-  const logger = new Logger(pluginConfig?.logger?.level ?? false ? "error" : "debug");
+  const logger = new Logger;
   const { template } = processFile(source, this.resourcePath, pluginConfig, logger);
   return template;
 };
 var cxx_loader_default = loader2;
 
-//# debugId=6E503B7704B6BACD64756E2164756E21
+//# debugId=9743BC642BE06F6664756E2164756E21