dynim-core 1.0.6 → 1.0.9

package/dist/builder/builder.d.ts

@@ -8,6 +8,8 @@ export interface BuilderConfig {
     logo?: string;
     onExit?: () => void;
     onEnter?: () => void;
+    /** Called at the very start of exit, before any async work */
+    onExitStart?: () => void;
     chatConfig?: WidgetConfig;
     contentRoot?: HTMLElement;
     pageId?: string;
@@ -23,6 +25,8 @@ export interface BuilderConfig {
     }>;
     /** External CodeClient to use (shares state with parent) - if not provided, creates its own */
     codeClient?: CodeClient;
+    /** Function to load a bundle URL (typically bundleManager.load) */
+    loadBundle?: (bundleUrl: string) => Promise<void>;
 }
 export interface Builder {
     enter: () => void;

package/dist/builder/builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/builder/builder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAA6B,KAAK,YAAY,EAAE,MAAM,UAAU,CAAC;AAQxE,OAAO,EAAoB,KAAK,UAAU,EAAE,MAAM,eAAe,CAAC;AAIlE,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,CAAC,EAAE,YAAY,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uCAAuC;IACvC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,wCAAwC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qCAAqC;IACrC,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACrE,+FAA+F;IAC/F,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,MAAM,WAAW,OAAO;IACtB,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,QAAQ,EAAE,MAAM,OAAO,CAAC;IACxB,cAAc,EAAE,MAAM,OAAO,CAAC;IAC9B,YAAY,EAAE,MAAM,OAAO,CAAC;IAC5B,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,wBAAgB,aAAa,CAAC,MAAM,GAAE,aAAkB,GAAG,OAAO,CA0bjE;;;;AAMD,wBAAyC"}
+{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/builder/builder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAA6B,KAAK,YAAY,EAAE,MAAM,UAAU,CAAC;AAQxE,OAAO,EAAoB,KAAK,UAAU,EAAE,MAAM,eAAe,CAAC;AAIlE,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,8DAA8D;IAC9D,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE,YAAY,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uCAAuC;IACvC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,wCAAwC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qCAAqC;IACrC,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACrE,+FAA+F;IAC/F,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,mEAAmE;IACnE,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnD;AAED,MAAM,WAAW,OAAO;IACtB,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,QAAQ,EAAE,MAAM,OAAO,CAAC;IACxB,cAAc,EAAE,MAAM,OAAO,CAAC;IAC9B,YAAY,EAAE,MAAM,OAAO,CAAC;IAC5B,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED,wBAAgB,aAAa,CAAC,MAAM,GAAE,aAAkB,GAAG,OAAO,CAyejE;;;;AAMD,wBAAyC"}

package/dist/builder/builder.js

@@ -15,7 +15,7 @@ import { createCodeClient } from './code-client';
 import { createBuilderClient } from './builder-client';
 import { buildElementIdentifier, getRelevantStyles } from './element-utils';
 export function createBuilder(config = {}) {
-    const { logo = 'Builder', onExit, onEnter, chatConfig = {}, contentRoot = document.body, pageId = window.location.pathname, apiBase = 'http://localhost:8080', sessionToken, refreshToken, getSession, codeClient: externalCodeClient } = config;
+    const { logo = 'Builder', onExit, onEnter, onExitStart, chatConfig = {}, contentRoot = document.body, pageId = window.location.pathname, apiBase = 'http://localhost:8080', sessionToken, refreshToken, getSession, codeClient: externalCodeClient, loadBundle } = config;
     let isActive = false;
     let chatWidget = null;
     let state = null;
@@ -44,7 +44,7 @@ export function createBuilder(config = {}) {
           </svg>
           Preview
         </button>
-        <button class="builder-bar__btn builder-bar__btn--save">
+        <button class="builder-bar__btn builder-bar__btn--save" disabled>
           <svg viewBox="0 0 24 24" width="14" height="14" fill="currentColor">
             <path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"/>
           </svg>
@@ -62,6 +62,8 @@ export function createBuilder(config = {}) {
     let builderClient = null;
     // Track unsubscribe function for external client
     let unsubscribeFromClient = null;
+    // Track unsubscribe function for bundleReady state
+    let unsubscribeCodeClient = null;
     function initCodeClient(stateRef) {
         // Handler for message updates (used by both internal and external client)
         const handleMessageUpdate = (message) => {
@@ -247,6 +249,16 @@ export function createBuilder(config = {}) {
             });
             initCodeClient(state);
             initBuilderClient();
+            // Subscribe to code client to track bundleReady state
+            if (client) {
+                unsubscribeCodeClient = client.onMessage((message) => {
+                    const saveBtn = root.querySelector('.builder-bar__btn--save');
+                    if (saveBtn) {
+                        // Enable when bundleReady (changes exist to save)
+                        saveBtn.disabled = !message.bundleReady;
+                    }
+                });
+            }
             // Pre-warm the cache for faster chat responses (projectId comes from JWT)
             if (client) {
                 client.warmCache();
@@ -294,6 +306,9 @@ export function createBuilder(config = {}) {
         freezeOverlay = null;
         editorState = null;
         treeState = null;
+        // Cleanup bundleReady subscription
+        unsubscribeCodeClient?.();
+        unsubscribeCodeClient = null;
         if (chatWidget) {
             chatWidget.close();
             chatWidget.root.style.display = 'none';
@@ -304,7 +319,32 @@ export function createBuilder(config = {}) {
         if (!isActive)
             return;
         isActive = false;
-        // Notify server of exit
+        // Notify IMMEDIATELY before any async work
+        // This allows BuilderProvider to set isExitingRef before streaming events can interfere
+        onExitStart?.();
+        // Step 1: Abandon temp edits on server
+        if (client) {
+            try {
+                await client.abandonCode();
+                console.log('[Builder] Temp edits abandoned');
+                // Step 2: Load permanent bundle (now that temp edits are gone)
+                if (loadBundle) {
+                    const savedBundleUrl = `${apiBase}/api/code/bundle`;
+                    console.log('[Builder] Loading permanent bundle:', savedBundleUrl);
+                    try {
+                        await loadBundle(savedBundleUrl);
+                        console.log('[Builder] Permanent bundle loaded');
+                    }
+                    catch (bundleError) {
+                        console.error('[Builder] Failed to load permanent bundle:', bundleError);
+                    }
+                }
+            }
+            catch (error) {
+                console.error('[Builder] Exit/abandon failed:', error);
+            }
+        }
+        // Step 3: Notify server (optional additional cleanup)
         if (builderClient) {
             try {
                 await builderClient.exit(pageId, true);
@@ -314,6 +354,7 @@ export function createBuilder(config = {}) {
                 console.error('[Builder] Exit notification failed:', error);
             }
         }
+        // Step 4: Cleanup UI
         cleanup();
     }
     async function handlePreview() {
@@ -341,22 +382,23 @@ export function createBuilder(config = {}) {
         try {
             console.log('[Builder] Saving code edits...');
             await client.saveCode();
-            console.log('[Builder] Save complete');
-            // Visual feedback - briefly show saved state
-            const saveBtn = root.querySelector('.builder-bar__btn--save');
-            if (saveBtn) {
-                saveBtn.classList.add('builder-bar__btn--saved');
-                saveBtn.textContent = 'Saved!';
-                setTimeout(() => {
-                    saveBtn.classList.remove('builder-bar__btn--saved');
-                    saveBtn.innerHTML = `
-            <svg viewBox="0 0 24 24" width="14" height="14" fill="currentColor">
-              <path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"/>
-            </svg>
-            Save
-          `;
-                }, 2000);
+            console.log('[Builder] Save complete - exiting builder');
+            // After save, the current bundle IS the permanent state
+            // Skip abandon/reload and just cleanup UI
+            if (!isActive)
+                return;
+            isActive = false;
+            // Notify server of exit (no discard since we saved)
+            if (builderClient) {
+                try {
+                    await builderClient.exit(pageId, false);
+                    console.log('[Builder] Exit notification sent');
+                }
+                catch (error) {
+                    console.error('[Builder] Exit notification failed:', error);
+                }
             }
+            cleanup();
         }
         catch (error) {
             console.error('[Builder] Save failed:', error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dynim-core",
-  "version": "1.0.6",
+  "version": "1.0.9",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",