@typestyles/build-runner 0.0.0-unstable.0df89fa2fae4 → 0.0.0-unstable.0f8b0f95f8de

package/README.md

@@ -164,7 +164,7 @@ Parses a file for typestyles registration calls. Returns `{ keys, prefixes }` fo
 import { extractNamespaces } from '@typestyles/build-runner';
 
 const { prefixes } = extractNamespaces(source);
-// styles.component('button', ...) → prefixes includes '.button-'
+// recipe({ name: 'button', ... }) → prefixes includes '.button-'
 ```
 
 ### `reportDuplicateNamespaces(map, fileId, prefixes, reporter)`

package/dist/index.cjs

@@ -21,6 +21,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   DEFAULT_EXTRACT_MODULE_CANDIDATES: () => DEFAULT_EXTRACT_MODULE_CANDIDATES,
+  DEFAULT_REGISTERED_COMPONENTS_MODULE_BASES: () => DEFAULT_REGISTERED_COMPONENTS_MODULE_BASES,
   TYPESTYLES_IMPORT_RE: () => TYPESTYLES_IMPORT_RE,
   VerifyTypestylesBuildError: () => VerifyTypestylesBuildError,
   buildManifestV2: () => buildManifestV2,
@@ -28,6 +29,7 @@ __export(index_exports, {
   createModuleLoader: () => createModuleLoader,
   discoverDefaultExtractModules: () => discoverDefaultExtractModules,
   discoverNextAppRoutes: () => discoverNextAppRoutes,
+  discoverRegisteredComponentsModule: () => discoverRegisteredComponentsModule,
   extractNamespaces: () => extractNamespaces,
   getRouteCss: () => getRouteCss,
   isManifestV2: () => isManifestV2,
@@ -60,6 +62,12 @@ var DISCOVERY_EXTENSIONS = [".ts", ".tsx", ".js", ".mjs"];
 var DEFAULT_EXTRACT_MODULE_CANDIDATES = DEFAULT_EXTRACT_MODULE_BASES.map(
   (base) => `${base}.ts`
 );
+var DEFAULT_REGISTERED_COMPONENTS_MODULE_BASES = [
+  "src/themeable-refs",
+  "src/typestyles/themeable-refs",
+  "src/typestyles-registry",
+  "styles/themeable-refs"
+];
 function discoverDefaultExtractModules(root) {
   const absRoot = (0, import_node_path.resolve)(root);
   for (const base of DEFAULT_EXTRACT_MODULE_BASES) {
@@ -72,15 +80,187 @@ function discoverDefaultExtractModules(root) {
   }
   return [];
 }
+function discoverRegisteredComponentsModule(root) {
+  const absRoot = (0, import_node_path.resolve)(root);
+  for (const base of DEFAULT_REGISTERED_COMPONENTS_MODULE_BASES) {
+    for (const ext of DISCOVERY_EXTENSIONS) {
+      const rel = `${base}${ext}`;
+      if ((0, import_node_fs.existsSync)((0, import_node_path.resolve)(absRoot, rel))) {
+        return rel.replace(/\\/g, "/");
+      }
+    }
+  }
+  return void 0;
+}
 
 // src/namespaces.ts
-var STYLES_COMPONENT_RE = /styles\.component\(\s*['"]([^'"]+)['"]/g;
-var STYLES_CLASS_RE = /styles\.class\(\s*['"]([^'"]+)['"]/g;
+var STYLES_COMPONENT_CALL_RE = /(?:styles\.component|(?<![\w.])recipe)\s*\(/g;
+var STYLES_CLASS_RE = /(?:styles\.class|(?<![\w.])style)\(\s*['"]([^'"]+)['"]/g;
 var TOKENS_CREATE_RE = /tokens\.create\(\s*['"]([^'"]+)['"]/g;
-var CREATE_THEME_RE = /(?:tokens\.)?createTheme\(\s*['"]([^'"]+)['"]/g;
+var CREATE_THEME_CALL_RE = /(?:tokens\.)?createTheme\s*\(/g;
 var KEYFRAMES_CREATE_RE = /keyframes\.create\(\s*['"]([^'"]+)['"]/g;
-var GLOBAL_STYLE_RE = /global\.style\(\s*['"]([^'"]+)['"]/g;
+var GLOBAL_STYLE_RE = /global\.(?:rule|style)\(\s*['"]([^'"]+)['"]/g;
 var GLOBAL_FONT_FACE_RE = /global\.fontFace\(\s*['"]([^'"]+)['"]/g;
+var CREATE_THEME_ARG_SCAN = 4e3;
+function codeSpanMask(code) {
+  const mask = new Uint8Array(code.length);
+  let i = 0;
+  const mark = (from, to) => {
+    const end = Math.min(to, code.length);
+    for (let j = from; j < end; j++) mask[j] = 1;
+  };
+  const skipString = (quote) => {
+    const start = i;
+    i += 1;
+    while (i < code.length) {
+      if (code[i] === "\\") {
+        i += 2;
+        continue;
+      }
+      if (code[i] === quote) {
+        i += 1;
+        break;
+      }
+      i += 1;
+    }
+    mark(start, i);
+  };
+  const scanExpression = () => {
+    let depth = 0;
+    while (i < code.length) {
+      const c = code[i];
+      const next = code[i + 1];
+      if (c === "/" && next === "/") {
+        const start = i;
+        i += 2;
+        while (i < code.length && code[i] !== "\n") i += 1;
+        mark(start, i);
+        continue;
+      }
+      if (c === "/" && next === "*") {
+        const start = i;
+        i += 2;
+        while (i < code.length && !(code[i] === "*" && code[i + 1] === "/")) i += 1;
+        if (i < code.length) i += 2;
+        mark(start, i);
+        continue;
+      }
+      if (c === '"' || c === "'") {
+        skipString(c);
+        continue;
+      }
+      if (c === "`") {
+        scanTemplate();
+        continue;
+      }
+      if (c === "{") {
+        depth += 1;
+        i += 1;
+        continue;
+      }
+      if (c === "}") {
+        i += 1;
+        if (depth === 0) return;
+        depth -= 1;
+        continue;
+      }
+      i += 1;
+    }
+  };
+  const scanTemplate = () => {
+    const open = i;
+    i += 1;
+    let staticFrom = open;
+    while (i < code.length) {
+      if (code[i] === "\\") {
+        i += 2;
+        continue;
+      }
+      if (code[i] === "`") {
+        i += 1;
+        mark(staticFrom, i);
+        return;
+      }
+      if (code[i] === "$" && code[i + 1] === "{") {
+        mark(staticFrom, i);
+        i += 2;
+        scanExpression();
+        staticFrom = i;
+        continue;
+      }
+      i += 1;
+    }
+    mark(staticFrom, i);
+  };
+  while (i < code.length) {
+    const c = code[i];
+    const next = code[i + 1];
+    if (c === "/" && next === "/") {
+      const start = i;
+      i += 2;
+      while (i < code.length && code[i] !== "\n") i += 1;
+      mark(start, i);
+      continue;
+    }
+    if (c === "/" && next === "*") {
+      const start = i;
+      i += 2;
+      while (i < code.length && !(code[i] === "*" && code[i + 1] === "/")) i += 1;
+      if (i < code.length) i += 2;
+      mark(start, i);
+      continue;
+    }
+    if (c === '"' || c === "'") {
+      skipString(c);
+      continue;
+    }
+    if (c === "`") {
+      scanTemplate();
+      continue;
+    }
+    i += 1;
+  }
+  return mask;
+}
+function isStaticNamespace(name) {
+  return !name.includes("$") && !name.includes("{") && !name.includes("}");
+}
+function extractRecipeNames(code, mask) {
+  const names = [];
+  for (const match of code.matchAll(STYLES_COMPONENT_CALL_RE)) {
+    const index = match.index ?? 0;
+    if (mask[index]) continue;
+    const start = index + match[0].length;
+    const args = code.slice(start, start + CREATE_THEME_ARG_SCAN);
+    const positional = args.match(/^\s*['"]([^'"]+)['"]/);
+    if (positional) {
+      if (isStaticNamespace(positional[1])) names.push(positional[1]);
+      continue;
+    }
+    if (!/^\s*\{/.test(args)) continue;
+    const named = args.match(/\bname\s*:\s*['"]([^'"]+)['"]/);
+    if (named && isStaticNamespace(named[1])) names.push(named[1]);
+  }
+  return names;
+}
+function extractCreateThemeNames(code, mask) {
+  const names = [];
+  for (const match of code.matchAll(CREATE_THEME_CALL_RE)) {
+    const index = match.index ?? 0;
+    if (mask[index]) continue;
+    const start = index + match[0].length;
+    const args = code.slice(start, start + CREATE_THEME_ARG_SCAN);
+    const positional = args.match(/^\s*['"]([^'"]+)['"]/);
+    if (positional) {
+      if (isStaticNamespace(positional[1])) names.push(positional[1]);
+      continue;
+    }
+    if (!/^\s*\{/.test(args)) continue;
+    const named = args.match(/\bname\s*:\s*['"]([^'"]+)['"]/);
+    if (named && isStaticNamespace(named[1])) names.push(named[1]);
+  }
+  return names;
+}
 var OVERRIDE_HMR_EXPORT_NAMES = /* @__PURE__ */ new Set(["createDesignTheme", "overrideComponent"]);
 var TYPESTYLES_IMPORT_RE = /(?:from\s+|import\s+|require\s*\(\s*)['"]typestyles['"]/;
 function stripCommentsForHmrScan(code) {
@@ -113,7 +293,7 @@ function collectOverrideHmrCallTargets(code) {
 }
 function moduleNeedsOverrideHmr(code) {
   const scan = stripCommentsForHmrScan(code);
-  if (/\bstyles\.override\s*\(/.test(scan)) return true;
+  if (/\b(?:styles\.)?override\s*\(/.test(scan)) return true;
   const { locals, namespaces } = collectOverrideHmrCallTargets(scan);
   for (const name of locals) {
     if (new RegExp(`\\b${name}\\s*\\(`).test(scan)) return true;
@@ -128,25 +308,32 @@ function moduleNeedsOverrideHmr(code) {
 function extractNamespaces(code) {
   const keys = [];
   const prefixes = [];
-  for (const match of code.matchAll(STYLES_COMPONENT_RE)) {
-    prefixes.push(`.${match[1]}-`);
+  const mask = codeSpanMask(code);
+  const inCode = (index) => index !== void 0 && mask[index] === 0;
+  for (const name of extractRecipeNames(code, mask)) {
+    prefixes.push(`.${name}-`);
   }
   for (const match of code.matchAll(STYLES_CLASS_RE)) {
+    if (!inCode(match.index) || !isStaticNamespace(match[1])) continue;
     prefixes.push(`.${match[1]}-`);
   }
   for (const match of code.matchAll(TOKENS_CREATE_RE)) {
+    if (!inCode(match.index) || !isStaticNamespace(match[1])) continue;
     keys.push(`tokens:${match[1]}`);
   }
-  for (const match of code.matchAll(CREATE_THEME_RE)) {
-    keys.push(`theme:${match[1]}`);
+  for (const themeName of extractCreateThemeNames(code, mask)) {
+    keys.push(`theme:${themeName}`);
   }
   for (const match of code.matchAll(KEYFRAMES_CREATE_RE)) {
+    if (!inCode(match.index) || !isStaticNamespace(match[1])) continue;
     keys.push(`keyframes:${match[1]}`);
   }
   for (const match of code.matchAll(GLOBAL_STYLE_RE)) {
+    if (!inCode(match.index)) continue;
     prefixes.push(match[1]);
   }
   for (const match of code.matchAll(GLOBAL_FONT_FACE_RE)) {
+    if (!inCode(match.index)) continue;
     prefixes.push(`font-face:${match[1]}`);
   }
   return { keys, prefixes };
@@ -167,10 +354,20 @@ function reportDuplicateNamespaces(moduleNamespaces, id, prefixes, reporter) {
 
 // src/resolve-extract.ts
 function resolveExtractModules(root, extract) {
+  let modules;
   if (extract?.modules !== void 0) {
-    return extract.modules;
+    modules = [...extract.modules];
+  } else {
+    modules = discoverDefaultExtractModules(root);
+  }
+  let registeredModule = extract?.registeredComponentsModule;
+  if (!registeredModule && extract?.include === "allRegisteredComponents") {
+    registeredModule = discoverRegisteredComponentsModule(root);
+  }
+  if (registeredModule && !modules.includes(registeredModule)) {
+    modules.push(registeredModule);
   }
-  return discoverDefaultExtractModules(root);
+  return modules;
 }
 function resolveExtractMode(explicitMode, resolvedModules) {
   return explicitMode ?? (resolvedModules.length > 0 ? "build" : "runtime");
@@ -468,10 +665,11 @@ async function traceTypestylesModules(root, entryFiles) {
   }
   return [...traced].sort();
 }
+var moduleLoadNonce = 0;
 function createModuleLoader(root, modulePath) {
   const abs = (0, import_node_path4.resolve)(root, modulePath);
   const href = (0, import_node_url.pathToFileURL)(abs).href;
-  return () => import(href);
+  return () => import(`${href}?typestyles-extract=${++moduleLoadNonce}`);
 }
 
 // src/route-css.ts
@@ -647,6 +845,7 @@ ${result.stderr || result.stdout || "unknown error"}`
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DEFAULT_EXTRACT_MODULE_CANDIDATES,
+  DEFAULT_REGISTERED_COMPONENTS_MODULE_BASES,
   TYPESTYLES_IMPORT_RE,
   VerifyTypestylesBuildError,
   buildManifestV2,
@@ -654,6 +853,7 @@ ${result.stderr || result.stdout || "unknown error"}`
   createModuleLoader,
   discoverDefaultExtractModules,
   discoverNextAppRoutes,
+  discoverRegisteredComponentsModule,
   extractNamespaces,
   getRouteCss,
   isManifestV2,

package/dist/index.d.cts

@@ -3,11 +3,22 @@
  * Shared by bundler integrations and `@typestyles/next/build`.
  */
 declare const DEFAULT_EXTRACT_MODULE_CANDIDATES: readonly string[];
+/**
+ * Side-effect modules that import every recipe and export `getRegisteredComponentRefs(styles)`.
+ * Used when `extract.include` is `"allRegisteredComponents"`.
+ */
+declare const DEFAULT_REGISTERED_COMPONENTS_MODULE_BASES: readonly ["src/themeable-refs", "src/typestyles/themeable-refs", "src/typestyles-registry", "styles/themeable-refs"];
 /**
  * Resolve the default extraction module when the user did not pass explicit `modules`.
  * Returns at most one path using `/` separators, relative to `root`.
  */
 declare function discoverDefaultExtractModules(root: string): string[];
+/**
+ * Convention registry module for `extract.include: 'allRegisteredComponents'`.
+ * The file should import all recipe modules and
+ * export `getRegisteredComponentRefs(styles)` from your `createTypeStyles` entry.
+ */
+declare function discoverRegisteredComponentsModule(root: string): string | undefined;
 
 declare const TYPESTYLES_IMPORT_RE: RegExp;
 /**
@@ -48,6 +59,19 @@ interface TypestylesExtractOptions {
      * Output CSS filename. Defaults to `typestyles.css`.
      */
     fileName?: string;
+    /**
+     * Additional module that re-exports {@link getRegisteredComponentRefs} (or an
+     * equivalent object of every themeable recipe handle) so extract bundles retain
+     * full design-system CSS without a hand-maintained registry object.
+     */
+    registeredComponentsModule?: string;
+    /**
+     * When `"allRegisteredComponents"`, appends a convention registry module if present
+     * ({@link discoverRegisteredComponentsModule}) or {@link registeredComponentsModule}
+     * when set. That file must side-effect-import every recipe and reference
+     * `getRegisteredComponentRefs(styles)` — the extract entry alone is not enough.
+     */
+    include?: 'allRegisteredComponents';
 }
 /**
  * Resolve extraction modules from explicit config or convention entry discovery.
@@ -143,7 +167,7 @@ declare function discoverNextAppRoutes(root: string, appDir?: string): NextAppRo
  * Paths are relative to `root` with `/` separators.
  */
 declare function traceTypestylesModules(root: string, entryFiles: string[]): Promise<string[]>;
-/** Load a traced module for style extraction. */
+/** Load a traced module for style extraction (cache-busted so re-runs re-register styles). */
 declare function createModuleLoader(root: string, modulePath: string): () => Promise<unknown>;
 
 interface CollectRouteCssOptions {
@@ -203,4 +227,4 @@ interface RunTypestylesBuildOptions {
  */
 declare function runTypestylesBuild({ root, modules, }: RunTypestylesBuildOptions): Promise<string>;
 
-export { type CollectRouteCssOptions, type CollectRouteCssResult, DEFAULT_EXTRACT_MODULE_CANDIDATES, type DuplicateNamespaceReporter, type GetRouteCssOptions, type NextAppRoute, type RunTypestylesBuildOptions, TYPESTYLES_IMPORT_RE, type TypestylesExtractManifest, type TypestylesExtractManifestV1, type TypestylesExtractManifestV2, type TypestylesExtractOptions, type TypestylesIntegrationMode, type TypestylesRouteCssEntry, VerifyTypestylesBuildError, type VerifyTypestylesBuildOptions, type VerifyTypestylesBuildResult, buildManifestV2, collectAndWriteRouteCss, createModuleLoader, discoverDefaultExtractModules, discoverNextAppRoutes, extractNamespaces, getRouteCss, isManifestV2, moduleNeedsOverrideHmr, normalizeRoutePath, pageRelPathToRoutePath, readCssFile, readTypestylesManifest, reportDuplicateNamespaces, resolveExtractMode, resolveExtractModules, runTypestylesBuild, traceTypestylesModules, verifyTypestylesBuild };
+export { type CollectRouteCssOptions, type CollectRouteCssResult, DEFAULT_EXTRACT_MODULE_CANDIDATES, DEFAULT_REGISTERED_COMPONENTS_MODULE_BASES, type DuplicateNamespaceReporter, type GetRouteCssOptions, type NextAppRoute, type RunTypestylesBuildOptions, TYPESTYLES_IMPORT_RE, type TypestylesExtractManifest, type TypestylesExtractManifestV1, type TypestylesExtractManifestV2, type TypestylesExtractOptions, type TypestylesIntegrationMode, type TypestylesRouteCssEntry, VerifyTypestylesBuildError, type VerifyTypestylesBuildOptions, type VerifyTypestylesBuildResult, buildManifestV2, collectAndWriteRouteCss, createModuleLoader, discoverDefaultExtractModules, discoverNextAppRoutes, discoverRegisteredComponentsModule, extractNamespaces, getRouteCss, isManifestV2, moduleNeedsOverrideHmr, normalizeRoutePath, pageRelPathToRoutePath, readCssFile, readTypestylesManifest, reportDuplicateNamespaces, resolveExtractMode, resolveExtractModules, runTypestylesBuild, traceTypestylesModules, verifyTypestylesBuild };

package/dist/index.d.ts

@@ -3,11 +3,22 @@
  * Shared by bundler integrations and `@typestyles/next/build`.
  */
 declare const DEFAULT_EXTRACT_MODULE_CANDIDATES: readonly string[];
+/**
+ * Side-effect modules that import every recipe and export `getRegisteredComponentRefs(styles)`.
+ * Used when `extract.include` is `"allRegisteredComponents"`.
+ */
+declare const DEFAULT_REGISTERED_COMPONENTS_MODULE_BASES: readonly ["src/themeable-refs", "src/typestyles/themeable-refs", "src/typestyles-registry", "styles/themeable-refs"];
 /**
  * Resolve the default extraction module when the user did not pass explicit `modules`.
  * Returns at most one path using `/` separators, relative to `root`.
  */
 declare function discoverDefaultExtractModules(root: string): string[];
+/**
+ * Convention registry module for `extract.include: 'allRegisteredComponents'`.
+ * The file should import all recipe modules and
+ * export `getRegisteredComponentRefs(styles)` from your `createTypeStyles` entry.
+ */
+declare function discoverRegisteredComponentsModule(root: string): string | undefined;
 
 declare const TYPESTYLES_IMPORT_RE: RegExp;
 /**
@@ -48,6 +59,19 @@ interface TypestylesExtractOptions {
      * Output CSS filename. Defaults to `typestyles.css`.
      */
     fileName?: string;
+    /**
+     * Additional module that re-exports {@link getRegisteredComponentRefs} (or an
+     * equivalent object of every themeable recipe handle) so extract bundles retain
+     * full design-system CSS without a hand-maintained registry object.
+     */
+    registeredComponentsModule?: string;
+    /**
+     * When `"allRegisteredComponents"`, appends a convention registry module if present
+     * ({@link discoverRegisteredComponentsModule}) or {@link registeredComponentsModule}
+     * when set. That file must side-effect-import every recipe and reference
+     * `getRegisteredComponentRefs(styles)` — the extract entry alone is not enough.
+     */
+    include?: 'allRegisteredComponents';
 }
 /**
  * Resolve extraction modules from explicit config or convention entry discovery.
@@ -143,7 +167,7 @@ declare function discoverNextAppRoutes(root: string, appDir?: string): NextAppRo
  * Paths are relative to `root` with `/` separators.
  */
 declare function traceTypestylesModules(root: string, entryFiles: string[]): Promise<string[]>;
-/** Load a traced module for style extraction. */
+/** Load a traced module for style extraction (cache-busted so re-runs re-register styles). */
 declare function createModuleLoader(root: string, modulePath: string): () => Promise<unknown>;
 
 interface CollectRouteCssOptions {
@@ -203,4 +227,4 @@ interface RunTypestylesBuildOptions {
  */
 declare function runTypestylesBuild({ root, modules, }: RunTypestylesBuildOptions): Promise<string>;
 
-export { type CollectRouteCssOptions, type CollectRouteCssResult, DEFAULT_EXTRACT_MODULE_CANDIDATES, type DuplicateNamespaceReporter, type GetRouteCssOptions, type NextAppRoute, type RunTypestylesBuildOptions, TYPESTYLES_IMPORT_RE, type TypestylesExtractManifest, type TypestylesExtractManifestV1, type TypestylesExtractManifestV2, type TypestylesExtractOptions, type TypestylesIntegrationMode, type TypestylesRouteCssEntry, VerifyTypestylesBuildError, type VerifyTypestylesBuildOptions, type VerifyTypestylesBuildResult, buildManifestV2, collectAndWriteRouteCss, createModuleLoader, discoverDefaultExtractModules, discoverNextAppRoutes, extractNamespaces, getRouteCss, isManifestV2, moduleNeedsOverrideHmr, normalizeRoutePath, pageRelPathToRoutePath, readCssFile, readTypestylesManifest, reportDuplicateNamespaces, resolveExtractMode, resolveExtractModules, runTypestylesBuild, traceTypestylesModules, verifyTypestylesBuild };
+export { type CollectRouteCssOptions, type CollectRouteCssResult, DEFAULT_EXTRACT_MODULE_CANDIDATES, DEFAULT_REGISTERED_COMPONENTS_MODULE_BASES, type DuplicateNamespaceReporter, type GetRouteCssOptions, type NextAppRoute, type RunTypestylesBuildOptions, TYPESTYLES_IMPORT_RE, type TypestylesExtractManifest, type TypestylesExtractManifestV1, type TypestylesExtractManifestV2, type TypestylesExtractOptions, type TypestylesIntegrationMode, type TypestylesRouteCssEntry, VerifyTypestylesBuildError, type VerifyTypestylesBuildOptions, type VerifyTypestylesBuildResult, buildManifestV2, collectAndWriteRouteCss, createModuleLoader, discoverDefaultExtractModules, discoverNextAppRoutes, discoverRegisteredComponentsModule, extractNamespaces, getRouteCss, isManifestV2, moduleNeedsOverrideHmr, normalizeRoutePath, pageRelPathToRoutePath, readCssFile, readTypestylesManifest, reportDuplicateNamespaces, resolveExtractMode, resolveExtractModules, runTypestylesBuild, traceTypestylesModules, verifyTypestylesBuild };

package/dist/index.js

@@ -13,6 +13,12 @@ var DISCOVERY_EXTENSIONS = [".ts", ".tsx", ".js", ".mjs"];
 var DEFAULT_EXTRACT_MODULE_CANDIDATES = DEFAULT_EXTRACT_MODULE_BASES.map(
   (base) => `${base}.ts`
 );
+var DEFAULT_REGISTERED_COMPONENTS_MODULE_BASES = [
+  "src/themeable-refs",
+  "src/typestyles/themeable-refs",
+  "src/typestyles-registry",
+  "styles/themeable-refs"
+];
 function discoverDefaultExtractModules(root) {
   const absRoot = resolvePath(root);
   for (const base of DEFAULT_EXTRACT_MODULE_BASES) {
@@ -25,15 +31,187 @@ function discoverDefaultExtractModules(root) {
   }
   return [];
 }
+function discoverRegisteredComponentsModule(root) {
+  const absRoot = resolvePath(root);
+  for (const base of DEFAULT_REGISTERED_COMPONENTS_MODULE_BASES) {
+    for (const ext of DISCOVERY_EXTENSIONS) {
+      const rel = `${base}${ext}`;
+      if (existsSync(resolvePath(absRoot, rel))) {
+        return rel.replace(/\\/g, "/");
+      }
+    }
+  }
+  return void 0;
+}
 
 // src/namespaces.ts
-var STYLES_COMPONENT_RE = /styles\.component\(\s*['"]([^'"]+)['"]/g;
-var STYLES_CLASS_RE = /styles\.class\(\s*['"]([^'"]+)['"]/g;
+var STYLES_COMPONENT_CALL_RE = /(?:styles\.component|(?<![\w.])recipe)\s*\(/g;
+var STYLES_CLASS_RE = /(?:styles\.class|(?<![\w.])style)\(\s*['"]([^'"]+)['"]/g;
 var TOKENS_CREATE_RE = /tokens\.create\(\s*['"]([^'"]+)['"]/g;
-var CREATE_THEME_RE = /(?:tokens\.)?createTheme\(\s*['"]([^'"]+)['"]/g;
+var CREATE_THEME_CALL_RE = /(?:tokens\.)?createTheme\s*\(/g;
 var KEYFRAMES_CREATE_RE = /keyframes\.create\(\s*['"]([^'"]+)['"]/g;
-var GLOBAL_STYLE_RE = /global\.style\(\s*['"]([^'"]+)['"]/g;
+var GLOBAL_STYLE_RE = /global\.(?:rule|style)\(\s*['"]([^'"]+)['"]/g;
 var GLOBAL_FONT_FACE_RE = /global\.fontFace\(\s*['"]([^'"]+)['"]/g;
+var CREATE_THEME_ARG_SCAN = 4e3;
+function codeSpanMask(code) {
+  const mask = new Uint8Array(code.length);
+  let i = 0;
+  const mark = (from, to) => {
+    const end = Math.min(to, code.length);
+    for (let j = from; j < end; j++) mask[j] = 1;
+  };
+  const skipString = (quote) => {
+    const start = i;
+    i += 1;
+    while (i < code.length) {
+      if (code[i] === "\\") {
+        i += 2;
+        continue;
+      }
+      if (code[i] === quote) {
+        i += 1;
+        break;
+      }
+      i += 1;
+    }
+    mark(start, i);
+  };
+  const scanExpression = () => {
+    let depth = 0;
+    while (i < code.length) {
+      const c = code[i];
+      const next = code[i + 1];
+      if (c === "/" && next === "/") {
+        const start = i;
+        i += 2;
+        while (i < code.length && code[i] !== "\n") i += 1;
+        mark(start, i);
+        continue;
+      }
+      if (c === "/" && next === "*") {
+        const start = i;
+        i += 2;
+        while (i < code.length && !(code[i] === "*" && code[i + 1] === "/")) i += 1;
+        if (i < code.length) i += 2;
+        mark(start, i);
+        continue;
+      }
+      if (c === '"' || c === "'") {
+        skipString(c);
+        continue;
+      }
+      if (c === "`") {
+        scanTemplate();
+        continue;
+      }
+      if (c === "{") {
+        depth += 1;
+        i += 1;
+        continue;
+      }
+      if (c === "}") {
+        i += 1;
+        if (depth === 0) return;
+        depth -= 1;
+        continue;
+      }
+      i += 1;
+    }
+  };
+  const scanTemplate = () => {
+    const open = i;
+    i += 1;
+    let staticFrom = open;
+    while (i < code.length) {
+      if (code[i] === "\\") {
+        i += 2;
+        continue;
+      }
+      if (code[i] === "`") {
+        i += 1;
+        mark(staticFrom, i);
+        return;
+      }
+      if (code[i] === "$" && code[i + 1] === "{") {
+        mark(staticFrom, i);
+        i += 2;
+        scanExpression();
+        staticFrom = i;
+        continue;
+      }
+      i += 1;
+    }
+    mark(staticFrom, i);
+  };
+  while (i < code.length) {
+    const c = code[i];
+    const next = code[i + 1];
+    if (c === "/" && next === "/") {
+      const start = i;
+      i += 2;
+      while (i < code.length && code[i] !== "\n") i += 1;
+      mark(start, i);
+      continue;
+    }
+    if (c === "/" && next === "*") {
+      const start = i;
+      i += 2;
+      while (i < code.length && !(code[i] === "*" && code[i + 1] === "/")) i += 1;
+      if (i < code.length) i += 2;
+      mark(start, i);
+      continue;
+    }
+    if (c === '"' || c === "'") {
+      skipString(c);
+      continue;
+    }
+    if (c === "`") {
+      scanTemplate();
+      continue;
+    }
+    i += 1;
+  }
+  return mask;
+}
+function isStaticNamespace(name) {
+  return !name.includes("$") && !name.includes("{") && !name.includes("}");
+}
+function extractRecipeNames(code, mask) {
+  const names = [];
+  for (const match of code.matchAll(STYLES_COMPONENT_CALL_RE)) {
+    const index = match.index ?? 0;
+    if (mask[index]) continue;
+    const start = index + match[0].length;
+    const args = code.slice(start, start + CREATE_THEME_ARG_SCAN);
+    const positional = args.match(/^\s*['"]([^'"]+)['"]/);
+    if (positional) {
+      if (isStaticNamespace(positional[1])) names.push(positional[1]);
+      continue;
+    }
+    if (!/^\s*\{/.test(args)) continue;
+    const named = args.match(/\bname\s*:\s*['"]([^'"]+)['"]/);
+    if (named && isStaticNamespace(named[1])) names.push(named[1]);
+  }
+  return names;
+}
+function extractCreateThemeNames(code, mask) {
+  const names = [];
+  for (const match of code.matchAll(CREATE_THEME_CALL_RE)) {
+    const index = match.index ?? 0;
+    if (mask[index]) continue;
+    const start = index + match[0].length;
+    const args = code.slice(start, start + CREATE_THEME_ARG_SCAN);
+    const positional = args.match(/^\s*['"]([^'"]+)['"]/);
+    if (positional) {
+      if (isStaticNamespace(positional[1])) names.push(positional[1]);
+      continue;
+    }
+    if (!/^\s*\{/.test(args)) continue;
+    const named = args.match(/\bname\s*:\s*['"]([^'"]+)['"]/);
+    if (named && isStaticNamespace(named[1])) names.push(named[1]);
+  }
+  return names;
+}
 var OVERRIDE_HMR_EXPORT_NAMES = /* @__PURE__ */ new Set(["createDesignTheme", "overrideComponent"]);
 var TYPESTYLES_IMPORT_RE = /(?:from\s+|import\s+|require\s*\(\s*)['"]typestyles['"]/;
 function stripCommentsForHmrScan(code) {
@@ -66,7 +244,7 @@ function collectOverrideHmrCallTargets(code) {
 }
 function moduleNeedsOverrideHmr(code) {
   const scan = stripCommentsForHmrScan(code);
-  if (/\bstyles\.override\s*\(/.test(scan)) return true;
+  if (/\b(?:styles\.)?override\s*\(/.test(scan)) return true;
   const { locals, namespaces } = collectOverrideHmrCallTargets(scan);
   for (const name of locals) {
     if (new RegExp(`\\b${name}\\s*\\(`).test(scan)) return true;
@@ -81,25 +259,32 @@ function moduleNeedsOverrideHmr(code) {
 function extractNamespaces(code) {
   const keys = [];
   const prefixes = [];
-  for (const match of code.matchAll(STYLES_COMPONENT_RE)) {
-    prefixes.push(`.${match[1]}-`);
+  const mask = codeSpanMask(code);
+  const inCode = (index) => index !== void 0 && mask[index] === 0;
+  for (const name of extractRecipeNames(code, mask)) {
+    prefixes.push(`.${name}-`);
   }
   for (const match of code.matchAll(STYLES_CLASS_RE)) {
+    if (!inCode(match.index) || !isStaticNamespace(match[1])) continue;
     prefixes.push(`.${match[1]}-`);
   }
   for (const match of code.matchAll(TOKENS_CREATE_RE)) {
+    if (!inCode(match.index) || !isStaticNamespace(match[1])) continue;
     keys.push(`tokens:${match[1]}`);
   }
-  for (const match of code.matchAll(CREATE_THEME_RE)) {
-    keys.push(`theme:${match[1]}`);
+  for (const themeName of extractCreateThemeNames(code, mask)) {
+    keys.push(`theme:${themeName}`);
   }
   for (const match of code.matchAll(KEYFRAMES_CREATE_RE)) {
+    if (!inCode(match.index) || !isStaticNamespace(match[1])) continue;
     keys.push(`keyframes:${match[1]}`);
   }
   for (const match of code.matchAll(GLOBAL_STYLE_RE)) {
+    if (!inCode(match.index)) continue;
     prefixes.push(match[1]);
   }
   for (const match of code.matchAll(GLOBAL_FONT_FACE_RE)) {
+    if (!inCode(match.index)) continue;
     prefixes.push(`font-face:${match[1]}`);
   }
   return { keys, prefixes };
@@ -120,10 +305,20 @@ function reportDuplicateNamespaces(moduleNamespaces, id, prefixes, reporter) {
 
 // src/resolve-extract.ts
 function resolveExtractModules(root, extract) {
+  let modules;
   if (extract?.modules !== void 0) {
-    return extract.modules;
+    modules = [...extract.modules];
+  } else {
+    modules = discoverDefaultExtractModules(root);
+  }
+  let registeredModule = extract?.registeredComponentsModule;
+  if (!registeredModule && extract?.include === "allRegisteredComponents") {
+    registeredModule = discoverRegisteredComponentsModule(root);
+  }
+  if (registeredModule && !modules.includes(registeredModule)) {
+    modules.push(registeredModule);
   }
-  return discoverDefaultExtractModules(root);
+  return modules;
 }
 function resolveExtractMode(explicitMode, resolvedModules) {
   return explicitMode ?? (resolvedModules.length > 0 ? "build" : "runtime");
@@ -421,10 +616,11 @@ async function traceTypestylesModules(root, entryFiles) {
   }
   return [...traced].sort();
 }
+var moduleLoadNonce = 0;
 function createModuleLoader(root, modulePath) {
   const abs = resolve3(root, modulePath);
   const href = pathToFileURL(abs).href;
-  return () => import(href);
+  return () => import(`${href}?typestyles-extract=${++moduleLoadNonce}`);
 }
 
 // src/route-css.ts
@@ -599,6 +795,7 @@ ${result.stderr || result.stdout || "unknown error"}`
 }
 export {
   DEFAULT_EXTRACT_MODULE_CANDIDATES,
+  DEFAULT_REGISTERED_COMPONENTS_MODULE_BASES,
   TYPESTYLES_IMPORT_RE,
   VerifyTypestylesBuildError,
   buildManifestV2,
@@ -606,6 +803,7 @@ export {
   createModuleLoader,
   discoverDefaultExtractModules,
   discoverNextAppRoutes,
+  discoverRegisteredComponentsModule,
   extractNamespaces,
   getRouteCss,
   isManifestV2,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typestyles/build-runner",
-  "version": "0.0.0-unstable.0df89fa2fae4",
+  "version": "0.0.0-unstable.0f8b0f95f8de",
   "description": "Shared module execution utilities for typestyles build integrations",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -29,7 +29,7 @@
     "eslint": "^9.39.2",
     "tsup": "^8.0.0",
     "typescript": "^5.4.0",
-    "typestyles": "0.0.0-unstable.0df89fa2fae4",
+    "typestyles": "0.0.0-unstable.0f8b0f95f8de",
     "vitest": "^3.0.0"
   },
   "license": "Apache-2.0",