@alepha/react 0.10.6 → 0.10.7

package/dist/index.js

@@ -106,10 +106,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;
@@ -151,13 +151,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;
@@ -258,6 +258,7 @@ const ErrorViewer = ({ error, alepha }) => {
 		})] })]
 	});
 };
+var ErrorViewer_default = ErrorViewer;
 const ErrorViewerProduction = () => {
 	const styles = {
 		container: {
@@ -429,6 +430,7 @@ var ErrorBoundary = class extends React.Component {
 		return this.props.children;
 	}
 };
+var ErrorBoundary_default = ErrorBoundary;
 
 //#endregion
 //#region src/components/NestedView.tsx
@@ -512,11 +514,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.";
@@ -527,7 +529,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") {
@@ -541,20 +543,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
@@ -663,15 +660,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;
@@ -774,15 +769,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
 		});
@@ -808,7 +799,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
@@ -821,10 +812,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;
@@ -858,7 +846,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);
@@ -932,7 +920,7 @@ var ReactServerProvider = class {
 					throw new AlephaError("Invalid HTML response");
 				};
 			}
-			if (this.alepha.isServerless() === "vite") {
+			if (this.alepha.isViteDev()) {
 				await this.configureVite(ssrEnabled);
 				return;
 			}
@@ -1008,7 +996,7 @@ var ReactServerProvider = class {
 		return async (options = {}) => {
 			const page = this.pageApi.page(name);
 			const url = new URL(this.pageApi.url(name, options));
-			const entry = {
+			const state = {
 				url,
 				params: options.params ?? {},
 				query: options.query ?? {},
@@ -1016,7 +1004,6 @@ var ReactServerProvider = class {
 				layers: [],
 				meta: {}
 			};
-			const state = entry;
 			this.log.trace("Rendering", { url });
 			await this.alepha.events.emit("react:server:render:begin", { state });
 			const { redirect } = await this.pageApi.createLayers(page, state);
@@ -1053,14 +1040,13 @@ var ReactServerProvider = class {
 			const template = await templateLoader();
 			if (!template) throw new Error("Template not found");
 			this.log.trace("Rendering page", { name: route.name });
-			const entry = {
+			const state = {
 				url,
 				params,
 				query,
 				onError: () => null,
 				layers: []
 			};
-			const state = entry;
 			if (this.alepha.has(ServerLinksProvider)) this.alepha.state.set("api", await this.alepha.inject(ServerLinksProvider).getUserApiLinks({
 				user: serverRequest.user,
 				authorization: serverRequest.headers.authorization
@@ -1143,8 +1129,7 @@ var ReactServerProvider = class {
 		return response.html;
 	}
 	preprocessTemplate(template) {
-		const bodyCloseMatch = template.match(/<\/body>/i);
-		const bodyCloseIndex = bodyCloseMatch?.index ?? template.length;
+		const bodyCloseIndex = template.match(/<\/body>/i)?.index ?? template.length;
 		const beforeScript = template.substring(0, bodyCloseIndex);
 		const afterScript = template.substring(bodyCloseIndex);
 		const rootDivMatch = beforeScript.match(this.ROOT_DIV_REGEX);
@@ -1152,11 +1137,9 @@ var ReactServerProvider = class {
 			const beforeDiv = beforeScript.substring(0, rootDivMatch.index);
 			const afterDivStart = rootDivMatch.index + rootDivMatch[0].length;
 			const afterDiv = beforeScript.substring(afterDivStart);
-			const beforeApp = `${beforeDiv}<div${rootDivMatch[1]} id="${this.env.REACT_ROOT_ID}"${rootDivMatch[2]}>`;
-			const afterApp = `</div>${afterDiv}`;
 			return {
-				beforeApp,
-				afterApp,
+				beforeApp: `${beforeDiv}<div${rootDivMatch[1]} id="${this.env.REACT_ROOT_ID}"${rootDivMatch[2]}>`,
+				afterApp: `</div>${afterDiv}`,
 				beforeScript: "",
 				afterScript
 			};
@@ -1165,11 +1148,9 @@ var ReactServerProvider = class {
 		if (bodyMatch) {
 			const beforeBody = beforeScript.substring(0, bodyMatch.index + bodyMatch[0].length);
 			const afterBody = beforeScript.substring(bodyMatch.index + bodyMatch[0].length);
-			const beforeApp = `${beforeBody}<div id="${this.env.REACT_ROOT_ID}">`;
-			const afterApp = `</div>${afterBody}`;
 			return {
-				beforeApp,
-				afterApp,
+				beforeApp: `${beforeBody}<div id="${this.env.REACT_ROOT_ID}">`,
+				afterApp: `</div>${afterBody}`,
 				beforeScript: "",
 				afterScript
 			};
@@ -1207,7 +1188,7 @@ var ReactBrowserRouterProvider = class extends RouterProvider {
 	});
 	async transition(url, previous = [], meta = {}) {
 		const { pathname, search } = url;
-		const entry = {
+		const state = {
 			url,
 			query: {},
 			params: {},
@@ -1215,7 +1196,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
@@ -1432,7 +1412,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, {
@@ -1565,14 +1544,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
@@ -1656,8 +1635,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;
 };
@@ -1706,5 +1684,5 @@ const AlephaReact = $module({
 });
 
 //#endregion
-export { $page, AlephaContext, AlephaReact, ClientOnly, ErrorBoundary, ErrorViewer, Link, NestedView_default as NestedView, NotFoundPage as NotFound, PageDescriptor, ReactBrowserProvider, ReactPageProvider, ReactRouter, ReactServerProvider, 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, ReactPageProvider, ReactRouter, ReactServerProvider, Redirection, RouterLayerContext, isPageRoute, ssrSchemaLoading, useActive, useAlepha, useClient, useInject, useQueryParams, useRouter, useRouterEvents, useRouterState, useSchema, useStore };
 //# sourceMappingURL=index.js.map