@jfdevelops/react-layout 1.6.1 → 2.0.0

package/dist/create-config/define-layout.cjs

@@ -1,7 +1,11 @@
-const require_invalid_config = require('../errors/invalid-config.cjs');
-const require_missing_resource_provider = require('../errors/missing-resource-provider.cjs');
 const require_layout_configuration_error = require('../errors/layout-configuration-error.cjs');
 const require_resource_state_error = require('../errors/resource-state-error.cjs');
+const require_lazy_resource_error = require('../errors/lazy-resource-error.cjs');
+const require_lazy_boundary = require('../lazy/lazy-boundary.cjs');
+const require_fallback_props = require('../lazy/fallback-props.cjs');
+const require_types = require('../lazy/types.cjs');
+const require_invalid_config = require('../errors/invalid-config.cjs');
+const require_missing_resource_provider = require('../errors/missing-resource-provider.cjs');
 const require_capitalize = require('../utils/capitalize.cjs');
 const require_state_composable = require('./state-composable.cjs');
 const require_merge_layout_props = require('./merge-layout-props.cjs');
@@ -14,13 +18,13 @@ const require_component_keys = require('./component-keys.cjs');
 const require_get_component = require('./get-component.cjs');
 const require_create_resource_links = require('./create-resource-links.cjs');
 const require_for_resource = require('./for-resource.cjs');
+const require_render_state = require('./render-state.cjs');
 const require_create_for_resources = require('./for-resources/create-for-resources.cjs');
 const require_shell_context = require('./shell-context.cjs');
-const require_render_state = require('./render-state.cjs');
 let _jfdevelops_react_layout_composables = require("@jfdevelops/react-layout-composables");
 let react = require("react");
-let _jfdevelops_react_layout_devtools_core = require("@jfdevelops/react-layout-devtools-core");
 let react_jsx_runtime = require("react/jsx-runtime");
+let _jfdevelops_react_layout_devtools_core = require("@jfdevelops/react-layout-devtools-core");
 let _jfdevelops_react_layout_validator = require("@jfdevelops/react-layout-validator");
 
 //#region src/create-config/define-layout.tsx
@@ -141,6 +145,7 @@ function assertUnreservedResourceSlugs(resources, owner) {
 }
 function defineResourceLayoutImpl(options, inheritedStateScope, inheritedInspection) {
 	const { options: inProps = {}, resources, layout, namespace: defaultNamespace = false } = options;
+	const getLazyDefaults = options[require_types.lazyDefaultsSymbol] ?? (() => ({}));
 	const shellId = options.shellId;
 	const inspection = inheritedInspection ? void 0 : require_inspection.inspectDefinition(resources, (0, _jfdevelops_react_layout_devtools_core.getLayoutDebug)(options)?.source ?? (0, _jfdevelops_react_layout_devtools_core.getLayoutDebug)(layout)?.source);
 	if (inspection) inspection.store.node({
@@ -319,7 +324,6 @@ function defineResourceLayoutImpl(options, inheritedStateScope, inheritedInspect
 		}));
 		const mergedRenderContext = {
 			composables: resolvedComposables,
-			resource: layoutContext.resource,
 			resources: createLayoutRenderResourcesAccessor(resources, layoutContext.resource),
 			name: layoutContext.name,
 			inProps: splitInProps
@@ -336,6 +340,7 @@ function defineResourceLayoutImpl(options, inheritedStateScope, inheritedInspect
 		}
 		function Component(props) {
 			const publishResource = require_shell_context.useResourceLayoutShellPublisher();
+			const fallbackOptions = (0, react.useContext)(require_fallback_props.LazyFallbackPropsContext);
 			(0, react.useLayoutEffect)(() => {
 				publishResource?.(layoutContext.resource, shellId);
 				return () => publishResource?.(void 0, shellId);
@@ -348,7 +353,7 @@ function defineResourceLayoutImpl(options, inheritedStateScope, inheritedInspect
 				const definition = mergedResolvedInProps[key];
 				const includeBehavior = includeLayoutProps?.[key];
 				const callSiteValue = allowsComponentPassthrough(includeBehavior) ? readLayoutOptionValue(key, definition, props) : void 0;
-				const layoutOptionValue = allowsConfigPassthrough(includeBehavior) ? readLayoutOptionValue(key, definition, layoutOptionValues) : void 0;
+				const layoutOptionValue = allowsConfigPassthrough(includeBehavior) ? readLayoutOptionValue(key, definition, fallbackOptions?.owner === activeInspection.layout ? fallbackOptions.props : layoutOptionValues) : void 0;
 				const splitValue = key in splitInProps ? splitInProps[key] : void 0;
 				const value = callSiteValue ?? layoutOptionValue ?? splitValue;
 				if (value !== void 0) includedPropValues[key] = value;
@@ -400,41 +405,38 @@ function defineResourceLayoutImpl(options, inheritedStateScope, inheritedInspect
 		function createStateComponent(stateName, input, validateStateName = true, fallbackStateName = stateName) {
 			const inspectedId = validateStateName ? stateIds.get(stateName) : getReferenceStateId(input, stateName);
 			if (require_render_state.isLazyRenderState(input)) {
-				const loadState = input[require_render_state.lazyRenderStateSymbol];
-				function createLazyState() {
-					return (0, react.lazy)(async () => {
-						const stateDefinition = await require_render_state.findDefinedRenderState(await loadState().catch((error) => {
-							throw new require_resource_state_error.ResourceModuleLoadError(String(layoutContext.resource), error);
-						}));
-						if (validateStateName && stateDefinition.state !== void 0 && stateDefinition.state !== stateName) throw new require_layout_configuration_error.LayoutConfigurationError(`Lazy render state "${stateDefinition.state}" cannot be used as "${stateName}"`);
-						return { default: createLoadedStateComponent(validateStateName ? stateName : stateDefinition.state ?? stateName, stateDefinition, inspectedId) };
-					});
-				}
+				const loader = input[require_render_state.lazyLoaderSymbol];
+				const lazyOptions = input[require_render_state.lazyOptionsSymbol];
+				const lazyInspection = input[require_render_state.lazyInspectionSymbol];
+				inspectionStore.connect(input);
+				inspectionStore.edge(inspectedId ?? layoutId, lazyInspection.id, "declares");
+				const label = `${layoutContext.resource}:${stateName}`;
+				lazyInspection.setLabel(label);
+				const map = (stateDefinition) => {
+					if (validateStateName && stateDefinition.state !== void 0 && stateDefinition.state !== stateName) throw new require_lazy_resource_error.LazyResourceStateNotFoundError(label, stateName);
+					return createLoadedStateComponent(validateStateName ? stateName : stateDefinition.state ?? stateName, stateDefinition, inspectedId);
+				};
 				function LazyStateComponent(props) {
-					const [, rerender] = (0, react.useReducer)((version) => version + 1, 0);
-					const LazyState = (0, react.useRef)(createLazyState());
-					const CurrentLazyState = LazyState.current;
+					const defaults = lazyOptions.defaults();
 					const LoadingComponent = fallbackStateName === "Loading" ? void 0 : stateComponents.Loading;
-					const ErrorComponent = fallbackStateName === "Error" ? void 0 : stateComponents.Error;
-					function retry() {
-						LazyState.current = createLazyState();
-						rerender();
-					}
-					const rendered = /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react.Suspense, {
-						fallback: LoadingComponent ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(LoadingComponent, {}) : null,
-						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(CurrentLazyState, { ...props })
+					const ErrorState = fallbackStateName === "Error" ? void 0 : stateComponents.Error;
+					const LoadingDefault = defaults.Loading;
+					const ErrorComponent = ErrorState ? ({ error, retry }) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(RenderStateRetryContext.Provider, {
+						value: retry,
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ErrorState, {
+							error,
+							retry
+						})
+					}) : defaults.Error;
+					return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_lazy_boundary.LazyBoundary, {
+						loader,
+						map,
+						resource: String(layoutContext.resource),
+						componentProps: props,
+						ErrorComponent,
+						onMount: lazyInspection.hooks.onMount,
+						fallback: lazyOptions.fallback !== void 0 ? lazyOptions.fallback : LoadingComponent ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(LoadingComponent, {}) : LoadingDefault ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(LoadingDefault, { resource: String(layoutContext.resource) }) : null
 					});
-					return ErrorComponent ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(RenderStateBoundary, {
-						fallback: (error, reset) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(RenderStateRetryContext.Provider, {
-							value: reset,
-							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ErrorComponent, {
-								error: toResourceStateError(String(layoutContext.resource), stateName, error),
-								retry: reset
-							})
-						}),
-						onRetry: retry,
-						children: rendered
-					}) : rendered;
 				}
 				return LazyStateComponent;
 			}
@@ -557,6 +559,17 @@ function defineResourceLayoutImpl(options, inheritedStateScope, inheritedInspect
 				name
 			}),
 			...exposedStates,
+			[require_types.lazyStatesSymbol]: {
+				owner: layoutId,
+				Loading: stateComponents.Loading,
+				Error: stateComponents.Error ? ({ error, retry }) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(RenderStateRetryContext.Provider, {
+					value: retry,
+					children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(stateComponents.Error, {
+						error,
+						retry
+					})
+				}) : void 0
+			},
 			[require_render_state.definedResourceLayoutComponentSymbol]: true
 		});
 		previewRoot = createdComponent;
@@ -618,7 +631,21 @@ function defineResourceLayoutImpl(options, inheritedStateScope, inheritedInspect
 			createLayoutForResource: createLayoutForResourceBuilder,
 			...layout.composables ? { createMakeComposableLayout: createTopLevelMakeComposable } : {},
 			createResourceLayout: definedResourceLayout,
-			getComponentPropDefinitions
+			getComponentPropDefinitions,
+			lazyEnvironment: {
+				store: inheritedInspection?.store ?? inspection.store,
+				parent: inheritedInspection?.layout ?? inspection.definition,
+				defaults: getLazyDefaults,
+				states(resource, props) {
+					if (typeof layout.render !== "object" || !layout.render || !("Loading" in layout.render || "Error" in layout.render)) return {};
+					return definedResourceLayout({
+						...props,
+						resource,
+						namespace: false,
+						name: require_capitalize.capitalize(resource)
+					})[require_types.lazyStatesSymbol];
+				}
+			}
 		})
 	};
 	if (layout.composables) createResourceLayoutExtras.makeComposable = createTopLevelMakeComposable();