xmlui 0.9.71 → 0.9.72

package/dist/scripts/src/components-core/interception/ApiInterceptorProvider.js

@@ -48,50 +48,71 @@ const react_1 = require("react");
 const misc_1 = require("../utils/misc");
 const useApiInterceptorContext_1 = require("./useApiInterceptorContext");
 // This React component injects the API interceptor into the application's context
-function ApiInterceptorProvider({ interceptor, children, apiWorker, useHashBasedRouting, waitForApiInterceptor = false, }) {
-    const [forceInitialize, setForceInitialize] = (0, react_1.useState)(false);
+function ApiInterceptorProvider({ interceptor, children, useHashBasedRouting, parentInterceptorContext = null, waitForApiInterceptor = false, }) {
+    const hasParentInterceptorContext = parentInterceptorContext !== null;
     const [initialized, setInitialized] = (0, react_1.useState)(!interceptor);
+    const [forceInitialize, setForceInitialize] = (0, react_1.useState)(false);
     const [interceptorWorker, setInterceptorWorker] = (0, react_1.useState)(null);
     // --- Whenever the interceptor changes, update the provider accordingly
     (0, react_1.useEffect)(() => {
-        if (interceptor || forceInitialize) {
-            setInitialized(false);
-            // --- We use "msw" to manage the API interception
-            let interceptorWorker;
-            (() => __awaiter(this, void 0, void 0, function* () {
-                // --- Create the worker on the fly
-                if (process.env.VITE_MOCK_ENABLED) {
-                    const { createApiInterceptorWorker } = yield Promise.resolve().then(() => __importStar(require("./apiInterceptorWorker")));
-                    if (interceptor || forceInitialize) {
-                        interceptorWorker = yield createApiInterceptorWorker(interceptor || {}, apiWorker);
-                        setInterceptorWorker(interceptorWorker);
-                        // if the apiWorker comes from the outside, we don't handle the lifecycle here
-                        if (!apiWorker) {
+        if (!hasParentInterceptorContext) {
+            if (interceptor || forceInitialize) {
+                // setInitialized(false);
+                // --- We use "msw" to manage the API interception
+                let interceptorWorker;
+                (() => __awaiter(this, void 0, void 0, function* () {
+                    // --- Create the worker on the fly
+                    if (process.env.VITE_MOCK_ENABLED) {
+                        const { createApiInterceptorWorker } = yield Promise.resolve().then(() => __importStar(require("./apiInterceptorWorker")));
+                        if (interceptor || forceInitialize) {
+                            interceptorWorker = yield createApiInterceptorWorker(interceptor || {}, null);
+                            // if the apiWorker comes from the outside, we don't handle the lifecycle here
                             const workerFileLocation = (0, misc_1.normalizePath)(process.env.VITE_MOCK_WORKER_LOCATION || "mockServiceWorker.js");
                             yield interceptorWorker.start({
                                 onUnhandledRequest: "bypass",
                                 quiet: true,
                                 serviceWorker: {
-                                    url: workerFileLocation,
-                                },
+                                    url: workerFileLocation
+                                }
                             });
+                            setInterceptorWorker(interceptorWorker);
                         }
                     }
-                }
+                    setInitialized(true);
+                }))();
+                return () => {
+                    // if the apiWorker comes from the outside, we don't handle the lifecycle here
+                    if (!(parentInterceptorContext === null || parentInterceptorContext === void 0 ? void 0 : parentInterceptorContext.interceptorWorker)) {
+                        interceptorWorker === null || interceptorWorker === void 0 ? void 0 : interceptorWorker.stop();
+                    }
+                    setInitialized(false);
+                };
+            }
+            else {
                 setInitialized(true);
-            }))();
-            return () => {
-                // if the apiWorker comes from the outside, we don't handle the lifecycle here
-                if (!apiWorker) {
-                    interceptorWorker === null || interceptorWorker === void 0 ? void 0 : interceptorWorker.stop();
+            }
+        }
+        else {
+            if (interceptor) {
+                if (parentInterceptorContext === null || parentInterceptorContext === void 0 ? void 0 : parentInterceptorContext.interceptorWorker) {
+                    (() => __awaiter(this, void 0, void 0, function* () {
+                        const { createApiInterceptorWorker } = yield Promise.resolve().then(() => __importStar(require("./apiInterceptorWorker")));
+                        yield createApiInterceptorWorker(interceptor, parentInterceptorContext === null || parentInterceptorContext === void 0 ? void 0 : parentInterceptorContext.interceptorWorker);
+                        setTimeout(() => {
+                            setInitialized(true);
+                        }, 0);
+                    }))();
+                }
+                else {
+                    parentInterceptorContext === null || parentInterceptorContext === void 0 ? void 0 : parentInterceptorContext.forceInitialize();
                 }
-            };
+            }
         }
-    }, [apiWorker, forceInitialize, interceptor, useHashBasedRouting]);
+    }, [forceInitialize, hasParentInterceptorContext, interceptor, parentInterceptorContext === null || parentInterceptorContext === void 0 ? void 0 : parentInterceptorContext.forceInitialize, parentInterceptorContext === null || parentInterceptorContext === void 0 ? void 0 : parentInterceptorContext.interceptorWorker]);
+    const isMocked = (0, react_1.useCallback)((url) => interceptor !== undefined && !!process.env.VITE_MOCK_ENABLED, [interceptor]);
     const doForceInitialize = (0, react_1.useCallback)(() => {
         setForceInitialize(true);
     }, []);
-    const isMocked = (0, react_1.useCallback)((url) => interceptor !== undefined && !!process.env.VITE_MOCK_ENABLED, [interceptor]);
     const contextValue = (0, react_1.useMemo)(() => {
         return {
             interceptorWorker,
@@ -100,5 +121,6 @@ function ApiInterceptorProvider({ interceptor, children, apiWorker, useHashBased
             isMocked: isMocked,
         };
     }, [interceptorWorker, initialized, doForceInitialize, isMocked]);
+    // console.log("[ApiInterceptorProvider] Initialized:", initialized, "Interceptor:", interceptor, "Has parent", hasParentInterceptorContext, "waitForApiInterceptor", waitForApiInterceptor);
     return ((0, jsx_runtime_1.jsx)(useApiInterceptorContext_1.ApiInterceptorContext.Provider, { value: contextValue, children: waitForApiInterceptor && !initialized ? null : children }));
 }

package/dist/standalone/xmlui-standalone.es.d.ts

@@ -47,11 +47,12 @@ declare type ApiInterceptorDefinition = {
     auth?: AuthDefinition;
 };
 
-declare function ApiInterceptorProvider({ interceptor, children, apiWorker, useHashBasedRouting, waitForApiInterceptor, }: {
+declare function ApiInterceptorProvider({ interceptor, children, useHashBasedRouting, parentInterceptorContext, waitForApiInterceptor, }: {
     interceptor?: ApiInterceptorDefinition;
     children: ReactNode;
     apiWorker?: SetupWorker;
     useHashBasedRouting?: boolean;
+    parentInterceptorContext?: IApiInterceptorContext;
     waitForApiInterceptor?: boolean;
 }): JSX_2.Element;
 
@@ -916,7 +917,7 @@ declare type Message = ValueOrFunction<Renderable, Toast>;
  */
 declare type ModuleErrors = Record<string, ScriptParserErrorMessage[]>;
 
-declare function NestedApp({ api, app, components, config, activeTheme, activeTone, title, height, allowPlaygroundPopup, popOutUrl, withFrame, noHeader, splitView, style, refVersion, }: NestedAppProps): JSX_2.Element;
+declare function NestedApp({ api, app, components, config, activeTheme, activeTone, height, style, refreshVersion }: NestedAppProps): JSX_2.Element;
 
 declare type NestedAppProps = {
     api?: any;
@@ -925,15 +926,9 @@ declare type NestedAppProps = {
     config?: any;
     activeTone?: ThemeTone;
     activeTheme?: string;
-    title?: string;
     height?: string | number;
-    allowPlaygroundPopup?: boolean;
-    popOutUrl?: string;
-    withFrame?: boolean;
-    noHeader?: boolean;
     style?: CSSProperties;
-    splitView?: boolean;
-    refVersion?: number;
+    refreshVersion?: number;
 };
 
 declare type NO_ARG_EXPRESSION = typeof T_NO_ARG_EXPRESSION;