@alepha/react 0.10.5 → 0.10.7

package/dist/index.browser.js

@@ -102,10 +102,10 @@ const $page = (options) => {
 };
 var PageDescriptor = class extends Descriptor {
 	onInit() {
-		if (this.options.static) this.options.cache ??= {
+		if (this.options.static) this.options.cache ??= { store: {
 			provider: "memory",
 			ttl: [1, "week"]
-		};
+		} };
 	}
 	get name() {
 		return this.options.name ?? this.config.propertyKey;
@@ -172,13 +172,13 @@ const ClientOnly = (props) => {
 	if (props.disabled) return props.children;
 	return mounted ? props.children : props.fallback;
 };
+var ClientOnly_default = ClientOnly;
 
 //#endregion
 //#region src/components/ErrorViewer.tsx
 const ErrorViewer = ({ error, alepha }) => {
 	const [expanded, setExpanded] = useState(false);
-	const isProduction = alepha.isProduction();
-	if (isProduction) return /* @__PURE__ */ jsx(ErrorViewerProduction, {});
+	if (alepha.isProduction()) return /* @__PURE__ */ jsx(ErrorViewerProduction, {});
 	const stackLines = error.stack?.split("\n") ?? [];
 	const previewLines = stackLines.slice(0, 5);
 	const hiddenLineCount = stackLines.length - previewLines.length;
@@ -279,6 +279,7 @@ const ErrorViewer = ({ error, alepha }) => {
 		})] })]
 	});
 };
+var ErrorViewer_default = ErrorViewer;
 const ErrorViewerProduction = () => {
 	const styles = {
 		container: {
@@ -450,6 +451,7 @@ var ErrorBoundary = class extends React.Component {
 		return this.props.children;
 	}
 };
+var ErrorBoundary_default = ErrorBoundary;
 
 //#endregion
 //#region src/components/NestedView.tsx
@@ -533,11 +535,11 @@ const NestedView = (props) => {
 		})
 	});
 	if (props.errorBoundary === false) return /* @__PURE__ */ jsx(Fragment, { children: element });
-	if (props.errorBoundary) return /* @__PURE__ */ jsx(ErrorBoundary, {
+	if (props.errorBoundary) return /* @__PURE__ */ jsx(ErrorBoundary_default, {
 		fallback: props.errorBoundary,
 		children: element
 	});
-	return /* @__PURE__ */ jsx(ErrorBoundary, {
+	return /* @__PURE__ */ jsx(ErrorBoundary_default, {
 		fallback: (error) => {
 			const result = state.onError(error, state);
 			if (result instanceof Redirection) return "Redirection inside ErrorBoundary is not allowed.";
@@ -548,7 +550,7 @@ const NestedView = (props) => {
 };
 var NestedView_default = memo(NestedView);
 function parseAnimation(animationLike, state, type = "enter") {
-	if (!animationLike) return void 0;
+	if (!animationLike) return;
 	const DEFAULT_DURATION = 300;
 	const animation = typeof animationLike === "function" ? animationLike(state) : animationLike;
 	if (typeof animation === "string") {
@@ -562,20 +564,15 @@ function parseAnimation(animationLike, state, type = "enter") {
 		const anim = animation[type];
 		const duration = typeof anim === "object" ? anim.duration ?? DEFAULT_DURATION : DEFAULT_DURATION;
 		const name = typeof anim === "object" ? anim.name : anim;
-		if (type === "exit") {
-			const timing$1 = typeof anim === "object" ? anim.timing ?? "" : "";
-			return {
-				duration,
-				animation: `${duration}ms ${timing$1} ${name}`
-			};
-		}
-		const timing = typeof anim === "object" ? anim.timing ?? "" : "";
+		if (type === "exit") return {
+			duration,
+			animation: `${duration}ms ${typeof anim === "object" ? anim.timing ?? "" : ""} ${name}`
+		};
 		return {
 			duration,
-			animation: `${duration}ms ${timing} ${name}`
+			animation: `${duration}ms ${typeof anim === "object" ? anim.timing ?? "" : ""} ${name}`
 		};
 	}
-	return void 0;
 }
 
 //#endregion
@@ -659,15 +656,13 @@ var ReactPageProvider = class {
 			it.config = { ...config };
 			if (previous?.[i] && !forceRefresh && previous[i].name === route$1.name) {
 				const url = (str) => str ? str.replace(/\/\/+/g, "/") : "/";
-				const prev = JSON.stringify({
+				if (JSON.stringify({
 					part: url(previous[i].part),
 					params: previous[i].config?.params ?? {}
-				});
-				const curr = JSON.stringify({
+				}) === JSON.stringify({
 					part: url(route$1.path),
 					params: config.params ?? {}
-				});
-				if (prev === curr) {
+				})) {
 					it.props = previous[i].props;
 					it.error = previous[i].error;
 					it.cache = true;
@@ -681,11 +676,9 @@ var ReactPageProvider = class {
 			}
 			if (!route$1.resolve) continue;
 			try {
-				const props = await route$1.resolve?.({
-					...state,
-					...config,
-					...context
-				}) ?? {};
+				const args = Object.create(state);
+				Object.assign(args, config, context);
+				const props = await route$1.resolve?.(args) ?? {};
 				it.props = { ...props };
 				context = {
 					...context,
@@ -772,15 +765,11 @@ var ReactPageProvider = class {
 	}
 	async createElement(page, props) {
 		if (page.lazy && page.component) this.log.warn(`Page ${page.name} has both lazy and component options, lazy will be used`);
-		if (page.lazy) {
-			const component = await page.lazy();
-			return createElement(component.default, props);
-		}
+		if (page.lazy) return createElement((await page.lazy()).default, props);
 		if (page.component) return createElement(page.component, props);
-		return void 0;
 	}
 	renderError(error) {
-		return createElement(ErrorViewer, {
+		return createElement(ErrorViewer_default, {
 			error,
 			alepha: this.alepha
 		});
@@ -806,7 +795,7 @@ var ReactPageProvider = class {
 	}
 	renderView(index, path, view, page) {
 		view ??= this.renderEmptyView();
-		const element = page.client ? createElement(ClientOnly, typeof page.client === "object" ? page.client : {}, view) : view;
+		const element = page.client ? createElement(ClientOnly_default, typeof page.client === "object" ? page.client : {}, view) : view;
 		return createElement(RouterLayerContext.Provider, { value: {
 			index,
 			path
@@ -819,10 +808,7 @@ var ReactPageProvider = class {
 			const pages = this.alepha.descriptors($page);
 			const hasParent = (it) => {
 				if (it.options.parent) return true;
-				for (const page of pages) {
-					const children = page.options.children ? Array.isArray(page.options.children) ? page.options.children : page.options.children() : [];
-					if (children.includes(it)) return true;
-				}
+				for (const page of pages) if ((page.options.children ? Array.isArray(page.options.children) ? page.options.children : page.options.children() : []).includes(it)) return true;
 			};
 			for (const page of pages) {
 				if (page.options.path === "/*") hasNotFoundHandler = true;
@@ -856,7 +842,7 @@ var ReactPageProvider = class {
 		};
 	}
 	add(entry) {
-		if (this.alepha.isReady()) throw new Error("Router is already initialized");
+		if (this.alepha.isReady()) throw new AlephaError("Router is already initialized");
 		entry.name ??= this.nextId();
 		const page = entry;
 		page.match = this.createMatch(page);
@@ -907,7 +893,7 @@ var ReactBrowserRouterProvider = class extends RouterProvider {
 	});
 	async transition(url, previous = [], meta = {}) {
 		const { pathname, search } = url;
-		const entry = {
+		const state = {
 			url,
 			query: {},
 			params: {},
@@ -915,7 +901,6 @@ var ReactBrowserRouterProvider = class extends RouterProvider {
 			onError: () => null,
 			meta
 		};
-		const state = entry;
 		await this.alepha.events.emit("react:transition:begin", {
 			previous: this.alepha.state.get("react.router.state"),
 			state
@@ -1068,7 +1053,8 @@ var ReactBrowserProvider = class {
 		const redirect = await this.router.transition(new URL(`http://localhost${url}`), previous, options.meta);
 		if (redirect) {
 			this.log.info("Redirecting to", { redirect });
-			return await this.render({ url: redirect });
+			if (redirect.startsWith("http")) window.location.href = redirect;
+			else return await this.render({ url: redirect });
 		}
 		const ms = this.dateTimeProvider.now().diff(start);
 		this.log.info(`Transition OK [${ms}ms]`, this.transitioning);
@@ -1151,7 +1137,6 @@ var ReactRouter = class {
 	}
 	get browser() {
 		if (this.alepha.isBrowser()) return this.alepha.inject(ReactBrowserProvider);
-		return void 0;
 	}
 	path(name, config = {}) {
 		return this.pageApi.pathname(name, {
@@ -1284,14 +1269,14 @@ const Link = (props) => {
 		children: props.children
 	});
 };
+var Link_default = Link;
 
 //#endregion
 //#region src/hooks/useActive.ts
 const useActive = (args) => {
 	const router = useRouter();
 	const [isPending, setPending] = useState(false);
-	const state = useRouterState();
-	const current = state.url.pathname;
+	const current = useRouterState().url.pathname;
 	const options = typeof args === "string" ? { href: args } : {
 		...args,
 		href: args.href
@@ -1375,8 +1360,7 @@ const useSchema = (action) => {
 	const [schema, setSchema] = useState(ssrSchemaLoading(alepha, name));
 	useEffect(() => {
 		if (!schema.loading) return;
-		const opts = { cache: true };
-		httpClient.fetch(`${LinkProvider.path.apiLinks}/${name}/schema`, {}, opts).then((it) => setSchema(it.data));
+		httpClient.fetch(`${LinkProvider.path.apiLinks}/${name}/schema`, {}, { cache: true }).then((it) => setSchema(it.data));
 	}, [name]);
 	return schema;
 };
@@ -1417,5 +1401,5 @@ const AlephaReact = $module({
 });
 
 //#endregion
-export { $page, AlephaContext, AlephaReact, ClientOnly, ErrorBoundary, ErrorViewer, Link, NestedView_default as NestedView, NotFoundPage as NotFound, PageDescriptor, ReactBrowserProvider, ReactBrowserRouterProvider, ReactPageProvider, ReactRouter, Redirection, RouterLayerContext, isPageRoute, ssrSchemaLoading, useActive, useAlepha, useClient, useInject, useQueryParams, useRouter, useRouterEvents, useRouterState, useSchema, useStore };
+export { $page, AlephaContext, AlephaReact, ClientOnly_default as ClientOnly, ErrorBoundary_default as ErrorBoundary, ErrorViewer_default as ErrorViewer, Link_default as Link, NestedView_default as NestedView, NotFoundPage as NotFound, PageDescriptor, ReactBrowserProvider, ReactBrowserRouterProvider, ReactPageProvider, ReactRouter, Redirection, RouterLayerContext, isPageRoute, ssrSchemaLoading, useActive, useAlepha, useClient, useInject, useQueryParams, useRouter, useRouterEvents, useRouterState, useSchema, useStore };
 //# sourceMappingURL=index.browser.js.map