dynim-react 1.0.17 → 1.0.18

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

@@ -1 +1 @@
-{"version":3,"file":"BuilderProvider.d.ts","sourceRoot":"","sources":["../../src/builder/BuilderProvider.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"BuilderProvider.d.ts","sourceRoot":"","sources":["../../src/builder/BuilderProvider.tsx"],"names":[],"mappings":"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"}

package/dist/builder/BuilderProvider.js

@@ -21,10 +21,17 @@ export function BuilderProvider({ children, config = {}, onBuilderReady, }) {
     const builderRef = useRef(null);
     const codeClientRef = useRef(null);
     // Track when we're exiting to prevent auto-load from re-triggering
-    // Use BOTH ref (for sync checks) and state (for effect dependencies)
     const isExitingRef = useRef(false);
-    const [isExiting, setIsExiting] = useState(false);
+    // Track builder active state - use BOTH ref (for sync checks in callbacks) and state (for renders)
+    const isBuilderActiveRef = useRef(false);
     const [isBuilderActive, setIsBuilderActive] = useState(false);
+    // Signal counter for triggering bundle loads - ONLY incremented when we decide to load
+    // This avoids the dependency cascade problem with the old approach
+    const [bundleLoadSignal, setBundleLoadSignal] = useState(0);
+    const pendingBundleProjectIdRef = useRef(null);
+    // Store apiBase in ref so bundle load effect has no config dependency
+    const apiBaseRef = useRef(config.apiBase || 'http://localhost:8080');
+    apiBaseRef.current = config.apiBase || 'http://localhost:8080';
     const [isBundleLoaded, setIsBundleLoaded] = useState(false);
     const [isBundleLoading, setIsBundleLoading] = useState(false);
     const [codeMessage, setCodeMessage] = useState({
@@ -108,7 +115,7 @@ export function BuilderProvider({ children, config = {}, onBuilderReady, }) {
             // This prevents race condition where streaming events trigger temp bundle reload
             onExitStart: () => {
                 isExitingRef.current = true;
-                setIsExiting(true); // Also update state for effect dependency
+                isBuilderActiveRef.current = false; // Mark inactive immediately
                 console.log('[BuilderProvider] Exit started, isExiting=true');
                 // Abort any active streaming to prevent late bundle_ready events
                 codeClientRef.current?.abort();
@@ -128,7 +135,7 @@ export function BuilderProvider({ children, config = {}, onBuilderReady, }) {
             onEnter: () => {
                 console.log('[BuilderProvider] Visual builder entered');
                 isExitingRef.current = false;
-                setIsExiting(false); // Reset for next session
+                isBuilderActiveRef.current = true;
                 setIsBuilderActive(true);
             },
             onExit: () => {
@@ -292,22 +299,46 @@ export function BuilderProvider({ children, config = {}, onBuilderReady, }) {
         console.log('[BuilderProvider] Loading temp bundle via:', bundleUrl);
         await loadBundle(bundleUrl);
     }, [config, loadBundle]);
-    // Auto-load temp bundle when bundle is ready (only while builder is active and not exiting)
+    // Watch for bundleReady and decide if we should queue a load
+    // Uses refs for instant checks (no stale closure issues)
     useEffect(() => {
-        console.log('[BuilderProvider] Auto-load check:', {
-            bundleReady: codeMessage.bundleReady,
-            projectId: codeMessage.projectId,
-            isBuilderActive,
-            isExiting, // Use state value for logging
-            isExitingRef: isExitingRef.current, // Also log ref for debugging
-        });
-        // Only auto-load if builder is active AND not in the process of exiting
-        // Check BOTH state and ref for maximum safety against race conditions
-        if (isBuilderActive && !isExiting && !isExitingRef.current && codeMessage.bundleReady && codeMessage.projectId) {
-            console.log('[BuilderProvider] Bundle ready - loading temp bundle:', codeMessage.projectId);
-            loadTempBundle(codeMessage.projectId);
+        if (codeMessage.bundleReady && codeMessage.projectId) {
+            // Check refs for current state (not stale closure values)
+            if (isBuilderActiveRef.current && !isExitingRef.current) {
+                console.log('[BuilderProvider] Bundle ready - queueing load:', codeMessage.projectId);
+                pendingBundleProjectIdRef.current = codeMessage.projectId;
+                setBundleLoadSignal(s => s + 1);
+            }
+            else {
+                console.log('[BuilderProvider] Bundle ready but skipping (exiting or inactive):', {
+                    isBuilderActive: isBuilderActiveRef.current,
+                    isExiting: isExitingRef.current,
+                });
+            }
+        }
+    }, [codeMessage.bundleReady, codeMessage.projectId]);
+    // Effect that actually loads - ONLY triggered by the signal counter
+    // Uses refs for everything so it has ONLY ONE dependency: bundleLoadSignal
+    useEffect(() => {
+        if (bundleLoadSignal === 0)
+            return; // Skip initial render
+        const projectId = pendingBundleProjectIdRef.current;
+        if (!projectId)
+            return;
+        // Final safety check before loading
+        if (isExitingRef.current) {
+            console.log('[BuilderProvider] Skipping load - exit in progress');
+            pendingBundleProjectIdRef.current = null;
+            return;
+        }
+        // Use refs to avoid dependency on config/loadTempBundle
+        const bundleUrl = `${apiBaseRef.current}/api/code/bundle?_t=${Date.now()}`;
+        console.log('[BuilderProvider] Loading temp bundle:', bundleUrl);
+        if (loadBundleRef.current) {
+            loadBundleRef.current(bundleUrl);
         }
-    }, [codeMessage.bundleReady, codeMessage.projectId, isBuilderActive, isExiting, loadTempBundle]);
+        pendingBundleProjectIdRef.current = null;
+    }, [bundleLoadSignal]); // ONLY depends on the signal!
     // Unload bundle - show children again
     const unloadBundle = useCallback(() => {
         setTenantApp(null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dynim-react",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",