@pure-ds/storybook 0.1.10 → 0.1.12

package/.storybook/preview.js

@@ -42,7 +42,7 @@ console.log('🎨 Starting PDS initialization with preset:', initialPreset);
 
 // Wrap top-level await in IIFE for production build compatibility
 (async () => {
-  window.__pdsInitializing = true;
+  PDS.initializing = true;
   const pdsOptions = {
     mode: 'live',
     preset: initialPreset,
@@ -70,14 +70,13 @@ console.log('🎨 Starting PDS initialization with preset:', initialPreset);
   }
 
   await PDS.start(pdsOptions);
-  window.__pdsInitializing = false;
+  PDS.initializing = false;
 
   console.log('✨ PDS initialized in live mode for Storybook');
   console.log('📦 AutoDefiner active at:', PDS.autoDefiner?.config?.baseURL);
 
   // Store PDS designer globally for reuse
-  window.__pdsDesigner = PDS.registry._designer;
-  window.__pdsCurrentPreset = initialPreset;
+  PDS.currentPreset = initialPreset;
 })();
 
 // Set up persistent style protection - monitor and restore PDS sheets if cleared
@@ -86,9 +85,9 @@ function ensurePDSStyles() {
   const sheets = document.adoptedStyleSheets || [];
   const hasPDS = sheets.some(s => s._pds === true);
   
-  if (!hasPDS && window.__pdsDesigner) {
+  if (!hasPDS && PDS.Generator.instance) {
     console.log('🛡️ PDS sheets missing - restoring...');
-    PDS.Generator.applyStyles(window.__pdsDesigner);
+    PDS.Generator.applyStyles(PDS.Generator.instance);
   }
 }
 
@@ -107,14 +106,14 @@ const withPDS = (story, context) => {
   console.log('📋 Current adoptedStyleSheets:', currentSheets.length, 'PDS sheets:', pdsSheets.length);
   
   // ALWAYS reapply PDS styles before each story render
-  const designer = window.__pdsDesigner || PDS.registry._designer;
+  const designer = PDS.Generator.instance;
   if (designer) {
     PDS.Generator.applyStyles(designer);
     
     // Check again after applying
     const afterSheets = document.adoptedStyleSheets || [];
     const afterPdsSheets = afterSheets.filter(s => s._pds === true);
-  } else if (!window.__pdsInitializing && PDS.isLiveMode()) {
+  } else if (!PDS.initializing && PDS.isLiveMode()) {
     console.warn('⚠️ No designer found!');
   }
   
@@ -236,13 +235,13 @@ const withGlobalsHandler = (story, context) => {
   const { globals } = context;
   
   // Handle preset changes via decorator (has access to globals)
-  if (globals?.preset && globals.preset !== window.__pdsCurrentPreset) {
-    console.log('🔄 Decorator detected preset change:', window.__pdsCurrentPreset, '→', globals.preset);
+  if (globals?.preset && globals.preset !== PDS.currentPreset) {
+    console.log('🔄 Decorator detected preset change:', PDS.currentPreset, '→', globals.preset);
     
     // Apply preset asynchronously
     (async () => {
       try {
-        window.__pdsCurrentPreset = globals.preset;
+        PDS.currentPreset = globals.preset;
         
         // Store for persistence
         try {
@@ -267,9 +266,6 @@ const withGlobalsHandler = (story, context) => {
           const newDesigner = new PDS.Generator(generatorOptions);
           await PDS.Generator.applyStyles(newDesigner);
           
-          PDS.registry._designer = newDesigner;
-          window.__pdsDesigner = newDesigner;
-          
           console.log(`✅ Preset applied via decorator: ${globals.preset}`);
         }
       } catch (err) {
@@ -1397,10 +1393,10 @@ if (typeof window !== 'undefined') {
       
       if (globals?.preset) {
         console.log('🔔 SET_GLOBALS message received with preset:', globals.preset);
-        console.log('📦 Current stored preset:', window.__pdsCurrentPreset);
+        console.log('📦 Current stored preset:', PDS.currentPreset);
         
         // Skip if already on this preset
-        if (globals.preset === window.__pdsCurrentPreset) {
+        if (globals.preset === PDS.currentPreset) {
           console.log('⏭️ Preset unchanged, skipping');
           return;
         }
@@ -1453,10 +1449,8 @@ if (typeof window !== 'undefined') {
             await PDS.Generator.applyStyles(newDesigner);
             console.log('✅ Styles applied to document');
             
-            // Update BOTH registry designer AND global reference
-            PDS.registry._designer = newDesigner;
-            window.__pdsDesigner = newDesigner;
-            window.__pdsCurrentPreset = presetId;
+            // Update global reference
+            PDS.currentPreset = presetId;
             
             console.log(`✅✅✅ Preset applied successfully: ${presetConfig.name || presetId}`);
           } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pure-ds/storybook",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "description": "Storybook showcase for Pure Design System with live configuration",
   "type": "module",
   "private": false,
@@ -32,7 +32,7 @@
     "storybook:build": "npm run build-storybook"
   },
   "peerDependencies": {
-    "@pure-ds/core": "^0.3.2"
+    "@pure-ds/core": "^0.3.3"
   },
   "dependencies": {
     "@custom-elements-manifest/analyzer": "^0.11.0",

package/src/js/pds-core/pds-generator.js

@@ -1,8 +1,17 @@
+import { registry as pdsRegistry } from "./pds-registry.js";
+
 /**
  * Generator - A JS-config-first design system
  * Generates comprehensive CSS variables and styles from a minimal configuration
  */
 export class Generator {
+  // Singleton instance
+  static #instance;
+
+  static get instance() {
+    return this.#instance;
+  }
+
   // Private internal fields
   #layers;
   #stylesheets;
@@ -22,6 +31,10 @@ export class Generator {
     if (this.options.debug) {
       this.options.log?.("debug", "Generator options:", this.options);
     }
+
+    // Set singleton instance
+    Generator.#instance = this;
+
     this.tokens = this.generateTokens();
     if (this.options.debug) {
       this.options.log?.("debug", "Generated tokens:", this.tokens);
@@ -5266,7 +5279,25 @@ export async function adoptLayers(
   try {
     // Get all requested stylesheets
     const stylesheets = await Promise.all(
-      layers.map((layer) => PDS.registry.getStylesheet(layer))
+      layers.map(async (layer) => {
+        // In live mode, get stylesheets directly from the Generator singleton
+        if (Generator.instance) {
+          switch (layer) {
+            case "tokens":
+              return Generator.instance.tokensStylesheet;
+            case "primitives":
+              return Generator.instance.primitivesStylesheet;
+            case "components":
+              return Generator.instance.componentsStylesheet;
+            case "utilities":
+              return Generator.instance.utilitiesStylesheet;
+            default:
+              // Fall through to registry for unknown layers or static fallback
+              break;
+          }
+        }
+        return pdsRegistry.getStylesheet(layer);
+      })
     );
 
     // Filter out any null results

package/src/js/pds-core/pds-registry.js

@@ -6,7 +6,6 @@
 class PDSRegistry {
   constructor() {
     this._mode = "static"; // Default to static mode
-    this._designer = null;
     this._staticPaths = {
       tokens: "/assets/pds/styles/pds-tokens.css.js",
       primitives: "/assets/pds/styles/pds-primitives.css.js",
@@ -17,17 +16,10 @@ class PDSRegistry {
   }
 
   /**
-   * Set the designer instance and switch to live mode
+   * Switch to live mode
    */
-  setDesigner(designer, meta = {}) {
-    this._designer = designer;
+  setLiveMode() {
     this._mode = "live";
-    const presetName = meta?.presetName;
-    if (presetName) {
-      designer?.options?.log?.("log", `PDS live with preset "${presetName}"`);
-    } else {
-      designer?.options?.log?.("log", "PDS live with custom config");
-    }
   }
 
   /**
@@ -46,21 +38,10 @@ class PDSRegistry {
    * Returns CSSStyleSheet object (constructable stylesheet)
    */
   async getStylesheet(layer) {
-    if (this._mode === "live" && this._designer) {
-      // Return constructable stylesheet from live designer
-      switch (layer) {
-        case "tokens":
-          return this._designer.tokensStylesheet;
-        case "primitives":
-          return this._designer.primitivesStylesheet;
-        case "components":
-          return this._designer.componentsStylesheet;
-        case "utilities":
-          return this._designer.utilitiesStylesheet;
-        default:
-          this._designer?.options?.log?.("warn", `[PDS Registry] Unknown layer: ${layer}`);
-          return null;
-      }
+    if (this._mode === "live") {
+      // In live mode, stylesheets should be retrieved from Generator.instance
+      // If we are here, it means adoptLayers fell back or something is wrong
+      return null;
     } else {
       // Import from static path
       try {
@@ -79,30 +60,6 @@ class PDSRegistry {
     }
   }
 
-  // /**
-  //  * Get BLOB URL for a layer (live mode only)
-  //  * Used for @import statements in CSS
-  //  */
-  // getBlobURL(layer) {
-  //   if (this._mode === "live" && this._designer) {
-  //     switch (layer) {
-  //       case "tokens":
-  //         return this._designer.tokensBlobURL;
-  //       case "primitives":
-  //         return this._designer.primitivesBlobURL;
-  //       case "components":
-  //         return this._designer.componentsBlobURL;
-  //       case "utilities":
-  //         return this._designer.utilitiesBlobURL;
-  //       case "styles":
-  //         return this._designer.stylesBlobURL;
-  //       default:
-  //         return null;
-  //     }
-  //   }
-  //   return null;
-  // }
-
   /**
    * Get current mode
    */
@@ -114,14 +71,7 @@ class PDSRegistry {
    * Check if in live mode
    */
   get isLive() {
-    return this._mode === "live" && this._designer !== null;
-  }
-
-  /**
-   * Check if designer is available
-   */
-  get hasDesigner() {
-    return this._designer !== null;
+    return this._mode === "live";
   }
 }
 

package/src/js/pds.js

@@ -40,6 +40,10 @@ class PDSBase extends EventTarget {}
 /** @type {PDSAPI & PDSBase} */
 const PDS = new PDSBase();
 
+// State properties
+PDS.initializing = false;
+PDS.currentPreset = null;
+
 import {
   Generator,
   adoptLayers,
@@ -64,7 +68,7 @@ import { loadTypographyFonts } from "./common/font-loader.js";
 /** Generator class — use to programmatically create design system assets from a config */
 PDS.Generator = Generator;
 
-/** Singleton runtime registry. Use `registry.setDesigner()` to enable live mode or `registry.setStaticMode()` for static assets */
+/** Singleton runtime registry. Use `registry.setLiveMode()` to enable live mode or `registry.setStaticMode()` for static assets */
 PDS.registry = registry;
 
 /** Ontology and metadata about components and tokens */
@@ -163,8 +167,8 @@ Object.defineProperty(PDS, "currentConfig", {
 Object.defineProperty(PDS, "compiled", {
   get() {
     // Only available in live mode when we have a generator
-    if (PDS.registry?.isLive && PDS.registry?._designer) {
-      return PDS.registry._designer.compiled;
+    if (PDS.registry?.isLive && Generator.instance) {
+      return Generator.instance.compiled;
     }
     return null;
   },
@@ -1150,10 +1154,15 @@ async function live(config) {
       }
     }
 
-    // Set the registry to use this designer
-    PDS.registry.setDesigner(generator, {
-      presetName: normalized.presetInfo?.name,
-    });
+    // Set the registry to live mode
+    PDS.registry.setLiveMode();
+
+    // Log preset info if available
+    if (normalized.presetInfo?.name) {
+      generatorConfig?.log?.("log", `PDS live with preset "${normalized.presetInfo.name}"`);
+    } else {
+      generatorConfig?.log?.("log", "PDS live with custom config");
+    }
 
     // Apply styles globally if requested (default behavior)
     if (applyGlobalStyles) {
@@ -1459,13 +1468,13 @@ async function setTheme(theme, options = {}) {
   }
 
   // If we're in live mode, regenerate styles with new theme
-  if (PDS.registry.isLive && PDS.registry.hasDesigner) {
+  if (PDS.registry.isLive && Generator.instance) {
     try {
-      const currentDesigner = PDS.registry._designer; // Access internal designer
-      if (currentDesigner && currentDesigner.configure) {
-        // Update the designer's config with new theme
-        const newConfig = { ...currentDesigner.config, theme: resolvedTheme };
-        currentDesigner.configure(newConfig);
+      const currentGenerator = Generator.instance;
+      if (currentGenerator && currentGenerator.configure) {
+        // Update the generator's config with new theme
+        const newConfig = { ...currentGenerator.config, theme: resolvedTheme };
+        currentGenerator.configure(newConfig);
 
         // Reapply styles
         await PDS.Generator.applyStyles(currentDesigner);