@typestyles/build-runner 0.0.0-unstable.de79e3a17eb1 → 0.0.0-unstable.df708abe489f

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('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,9 +29,11 @@ __export(index_exports, {
   createModuleLoader: () => createModuleLoader,
   discoverDefaultExtractModules: () => discoverDefaultExtractModules,
   discoverNextAppRoutes: () => discoverNextAppRoutes,
+  discoverRegisteredComponentsModule: () => discoverRegisteredComponentsModule,
   extractNamespaces: () => extractNamespaces,
   getRouteCss: () => getRouteCss,
   isManifestV2: () => isManifestV2,
+  moduleNeedsOverrideHmr: () => moduleNeedsOverrideHmr,
   normalizeRoutePath: () => normalizeRoutePath,
   pageRelPathToRoutePath: () => pageRelPathToRoutePath,
   readCssFile: () => readCssFile,
@@ -59,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) {
@@ -71,16 +80,88 @@ 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_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 extractCreateThemeNames(code) {
+  const names = [];
+  for (const match of code.matchAll(CREATE_THEME_CALL_RE)) {
+    const start = (match.index ?? 0) + match[0].length;
+    const args = code.slice(start, start + CREATE_THEME_ARG_SCAN);
+    const positional = args.match(/^\s*['"]([^'"]+)['"]/);
+    if (positional) {
+      names.push(positional[1]);
+      continue;
+    }
+    if (!/^\s*\{/.test(args)) continue;
+    const named = args.match(/\bname\s*:\s*['"]([^'"]+)['"]/);
+    if (named) 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) {
+  return code.replace(/\/\*[\s\S]*?\*\//g, "").replace(/(^|[^:])\/\/.*$/gm, "$1");
+}
+function collectOverrideHmrCallTargets(code) {
+  const locals = new Set(OVERRIDE_HMR_EXPORT_NAMES);
+  const namespaces = /* @__PURE__ */ new Set();
+  for (const match of code.matchAll(/import\s*{([^}]+)}\s*from\s*['"][^'"]+['"]/g)) {
+    for (const rawPart of match[1].split(",")) {
+      const part = rawPart.trim();
+      if (!part || part.startsWith("type ")) continue;
+      const asMatch = part.match(/^(\w+)\s+as\s+(\w+)$/);
+      if (asMatch) {
+        if (OVERRIDE_HMR_EXPORT_NAMES.has(asMatch[1])) {
+          locals.add(asMatch[2]);
+        }
+        continue;
+      }
+      const name = part.match(/^(\w+)$/)?.[1];
+      if (name && OVERRIDE_HMR_EXPORT_NAMES.has(name)) {
+        locals.add(name);
+      }
+    }
+  }
+  for (const match of code.matchAll(/import\s*\*\s*as\s+(\w+)\s*from\s*['"][^'"]+['"]/g)) {
+    namespaces.add(match[1]);
+  }
+  return { locals, namespaces };
+}
+function moduleNeedsOverrideHmr(code) {
+  const scan = stripCommentsForHmrScan(code);
+  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;
+  }
+  for (const ns of namespaces) {
+    if (new RegExp(`\\b${ns}\\.(?:createDesignTheme|overrideComponent)\\s*\\(`).test(scan)) {
+      return true;
+    }
+  }
+  return false;
+}
 function extractNamespaces(code) {
   const keys = [];
   const prefixes = [];
@@ -93,8 +174,8 @@ function extractNamespaces(code) {
   for (const match of code.matchAll(TOKENS_CREATE_RE)) {
     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)) {
+    keys.push(`theme:${themeName}`);
   }
   for (const match of code.matchAll(KEYFRAMES_CREATE_RE)) {
     keys.push(`keyframes:${match[1]}`);
@@ -123,10 +204,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");
@@ -424,10 +515,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
@@ -549,6 +641,16 @@ async function runTypestylesBuild({
     // calls silently dropped as "unused". Disable tree shaking here so every
     // registration in the extraction graph survives.
     treeShaking: false,
+    // `treeShaking: false` only stops esbuild from pruning declarations
+    // *within* an already-included module. It's a separate esbuild behavior
+    // by the treeShaking option — that drops a plain bare import entirely
+    // (`import './some-lib'` with no binding at all) when it resolves to a
+    // module/package marked "sideEffects": false, before that module is ever
+    // considered for inclusion. A real extraction entry is exactly this
+    // shape: several side-effect-only imports, any one of which may point at
+    // a (correctly) tree-shakeable component library. Ignore both kinds of
+    // annotation so every import in the extraction graph is included.
+    ignoreAnnotations: true,
     stdin: {
       contents: importLines,
       resolveDir: root,
@@ -593,6 +695,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,
@@ -600,9 +703,11 @@ ${result.stderr || result.stdout || "unknown error"}`
   createModuleLoader,
   discoverDefaultExtractModules,
   discoverNextAppRoutes,
+  discoverRegisteredComponentsModule,
   extractNamespaces,
   getRouteCss,
   isManifestV2,
+  moduleNeedsOverrideHmr,
   normalizeRoutePath,
   pageRelPathToRoutePath,
   readCssFile,

package/dist/index.d.cts

@@ -3,13 +3,33 @@
  * 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;
+/**
+ * True when this module may register `styles.override` rules and needs Vite HMR
+ * dispose tracking — including Var UI sugar (`createDesignTheme` / `overrideComponent`)
+ * that never spells `styles.override` in source.
+ *
+ * Detects renamed imports (`createDesignTheme as cdt`) and namespace imports
+ * (`Core.createDesignTheme(`), not only the canonical identifier spelling.
+ */
+declare function moduleNeedsOverrideHmr(code: string): boolean;
 /**
  * Extract namespace information from source code for invalidation and duplicate checks.
  */
@@ -39,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.
@@ -134,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 {
@@ -194,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, 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,13 +3,33 @@
  * 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;
+/**
+ * True when this module may register `styles.override` rules and needs Vite HMR
+ * dispose tracking — including Var UI sugar (`createDesignTheme` / `overrideComponent`)
+ * that never spells `styles.override` in source.
+ *
+ * Detects renamed imports (`createDesignTheme as cdt`) and namespace imports
+ * (`Core.createDesignTheme(`), not only the canonical identifier spelling.
+ */
+declare function moduleNeedsOverrideHmr(code: string): boolean;
 /**
  * Extract namespace information from source code for invalidation and duplicate checks.
  */
@@ -39,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.
@@ -134,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 {
@@ -194,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, 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,16 +31,88 @@ 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_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 extractCreateThemeNames(code) {
+  const names = [];
+  for (const match of code.matchAll(CREATE_THEME_CALL_RE)) {
+    const start = (match.index ?? 0) + match[0].length;
+    const args = code.slice(start, start + CREATE_THEME_ARG_SCAN);
+    const positional = args.match(/^\s*['"]([^'"]+)['"]/);
+    if (positional) {
+      names.push(positional[1]);
+      continue;
+    }
+    if (!/^\s*\{/.test(args)) continue;
+    const named = args.match(/\bname\s*:\s*['"]([^'"]+)['"]/);
+    if (named) 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) {
+  return code.replace(/\/\*[\s\S]*?\*\//g, "").replace(/(^|[^:])\/\/.*$/gm, "$1");
+}
+function collectOverrideHmrCallTargets(code) {
+  const locals = new Set(OVERRIDE_HMR_EXPORT_NAMES);
+  const namespaces = /* @__PURE__ */ new Set();
+  for (const match of code.matchAll(/import\s*{([^}]+)}\s*from\s*['"][^'"]+['"]/g)) {
+    for (const rawPart of match[1].split(",")) {
+      const part = rawPart.trim();
+      if (!part || part.startsWith("type ")) continue;
+      const asMatch = part.match(/^(\w+)\s+as\s+(\w+)$/);
+      if (asMatch) {
+        if (OVERRIDE_HMR_EXPORT_NAMES.has(asMatch[1])) {
+          locals.add(asMatch[2]);
+        }
+        continue;
+      }
+      const name = part.match(/^(\w+)$/)?.[1];
+      if (name && OVERRIDE_HMR_EXPORT_NAMES.has(name)) {
+        locals.add(name);
+      }
+    }
+  }
+  for (const match of code.matchAll(/import\s*\*\s*as\s+(\w+)\s*from\s*['"][^'"]+['"]/g)) {
+    namespaces.add(match[1]);
+  }
+  return { locals, namespaces };
+}
+function moduleNeedsOverrideHmr(code) {
+  const scan = stripCommentsForHmrScan(code);
+  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;
+  }
+  for (const ns of namespaces) {
+    if (new RegExp(`\\b${ns}\\.(?:createDesignTheme|overrideComponent)\\s*\\(`).test(scan)) {
+      return true;
+    }
+  }
+  return false;
+}
 function extractNamespaces(code) {
   const keys = [];
   const prefixes = [];
@@ -47,8 +125,8 @@ function extractNamespaces(code) {
   for (const match of code.matchAll(TOKENS_CREATE_RE)) {
     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)) {
+    keys.push(`theme:${themeName}`);
   }
   for (const match of code.matchAll(KEYFRAMES_CREATE_RE)) {
     keys.push(`keyframes:${match[1]}`);
@@ -77,10 +155,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");
@@ -378,10 +466,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
@@ -503,6 +592,16 @@ async function runTypestylesBuild({
     // calls silently dropped as "unused". Disable tree shaking here so every
     // registration in the extraction graph survives.
     treeShaking: false,
+    // `treeShaking: false` only stops esbuild from pruning declarations
+    // *within* an already-included module. It's a separate esbuild behavior
+    // by the treeShaking option — that drops a plain bare import entirely
+    // (`import './some-lib'` with no binding at all) when it resolves to a
+    // module/package marked "sideEffects": false, before that module is ever
+    // considered for inclusion. A real extraction entry is exactly this
+    // shape: several side-effect-only imports, any one of which may point at
+    // a (correctly) tree-shakeable component library. Ignore both kinds of
+    // annotation so every import in the extraction graph is included.
+    ignoreAnnotations: true,
     stdin: {
       contents: importLines,
       resolveDir: root,
@@ -546,6 +645,7 @@ ${result.stderr || result.stdout || "unknown error"}`
 }
 export {
   DEFAULT_EXTRACT_MODULE_CANDIDATES,
+  DEFAULT_REGISTERED_COMPONENTS_MODULE_BASES,
   TYPESTYLES_IMPORT_RE,
   VerifyTypestylesBuildError,
   buildManifestV2,
@@ -553,9 +653,11 @@ export {
   createModuleLoader,
   discoverDefaultExtractModules,
   discoverNextAppRoutes,
+  discoverRegisteredComponentsModule,
   extractNamespaces,
   getRouteCss,
   isManifestV2,
+  moduleNeedsOverrideHmr,
   normalizeRoutePath,
   pageRelPathToRoutePath,
   readCssFile,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typestyles/build-runner",
-  "version": "0.0.0-unstable.de79e3a17eb1",
+  "version": "0.0.0-unstable.df708abe489f",
   "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.de79e3a17eb1",
+    "typestyles": "0.0.0-unstable.df708abe489f",
     "vitest": "^3.0.0"
   },
   "license": "Apache-2.0",