@typestyles/build-runner 0.5.3 → 0.6.0

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

@@ -94,13 +94,30 @@ function discoverRegisteredComponentsModule(root) {
 }
 
 // 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) {
@@ -133,7 +150,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;
@@ -157,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]}`);
@@ -498,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

package/dist/index.d.cts

@@ -167,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 {

package/dist/index.d.ts

@@ -167,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 {

package/dist/index.js

@@ -45,13 +45,30 @@ function discoverRegisteredComponentsModule(root) {
 }
 
 // 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) {
@@ -84,7 +101,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;
@@ -108,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]}`);
@@ -449,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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typestyles/build-runner",
-  "version": "0.5.3",
+  "version": "0.6.0",
   "description": "Shared module execution utilities for typestyles build integrations",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -30,7 +30,7 @@
     "tsup": "^8.0.0",
     "typescript": "^5.4.0",
     "vitest": "^3.0.0",
-    "typestyles": "0.25.0"
+    "typestyles": "1.0.0"
   },
   "license": "Apache-2.0",
   "repository": {