revojs 0.0.49 → 0.0.51

package/dist/app/index.d.ts

@@ -1,12 +1,13 @@
-import { type Template } from "../html";
-import type { Middleware } from "../http";
+import type { Middleware } from "../runtime";
 export type NestedPartial<T> = T extends any[] ? T : T extends Record<string, any> ? {
     [P in keyof T]?: NestedPartial<T[P]>;
 } : T;
 export type Environment = typeof CLIENT | typeof SERVER;
+export type Virtual = (environment: Environment) => void | string;
+export type ClientEntry = "index.html" | (string & {});
 export type ServerEntry = "revojs/presets/node" | "revojs/presets/deno" | "revojs/presets/bun" | "revojs/presets/cloudflare" | (string & {});
 export type ClientConfig = {
-    entry: string;
+    entry: ClientEntry;
 };
 export type ServerConfig = {
     entry: ServerEntry;
@@ -15,14 +16,13 @@ export type DevelopmentConfig = {
     middleware: Array<Middleware>;
 };
 export type Config = {
-    client: ClientConfig;
+    client: false | ClientConfig;
     server: false | ServerConfig;
-    markdown: Record<string, Template>;
     dev: DevelopmentConfig;
 };
 export type App = {
     config: Config;
-    virtuals: Record<string, (environment: Environment) => string>;
+    virtuals: Record<string, Virtual>;
 };
 export declare const createApp: (config?: NestedPartial<Config>) => App;
 export declare const SERVER = "ssr";

package/dist/http/index.d.ts

@@ -19,7 +19,7 @@ export type ResponseOptions = {
     headers: Headers;
 };
 export type Handle = (scope: Scope) => void | Response | Promise<void | Response>;
-export type Middleware = (scope: Scope, next: Handle) => void | Response | Promise<void | Response>;
+export type Chain = (scope: Scope, next: Handle) => void | Response | Promise<void | Response>;
 export declare const sendText: (scope: Scope, text: string) => Response;
 export declare const sendHtml: (scope: Scope, text: string) => Response;
 export declare const sendJson: <T>(scope: Scope, value: T) => Response;

package/dist/index.d.ts

@@ -2,7 +2,6 @@ export * from "./app";
 export * from "./html";
 export * from "./http";
 export * from "./locale";
-export * from "./markdown";
 export * from "./radix";
 export * from "./router";
 export * from "./runtime";

package/dist/index.js

@@ -7,7 +7,6 @@ const createApp = (config) => {
 		config: defu(config, {
 			client: { entry: "./index.html" },
 			server: { entry: "revojs/presets/node" },
-			markdown: {},
 			dev: { middleware: [] }
 		}),
 		virtuals: {}
@@ -412,7 +411,7 @@ const toCustomElement = (Component) => {
 				internals: this.internals
 			});
 			await hydrate(this.component.scope, rootNode, await this.component.setup(), 0);
-			this.dispatchEvent(new MountedEvent());
+			requestAnimationFrame(() => this.dispatchEvent(new MountedEvent()));
 		}
 		attributeChangedCallback(name, oldValue, value) {
 			if (value === oldValue) return;
@@ -521,6 +520,9 @@ const useRoute = (scope) => {
 const defineRoute = (route) => {
 	return route;
 };
+const defineMiddleware = (middleware) => {
+	return middleware;
+};
 const fileName = (path) => {
 	return path.split("/").pop()?.split(".").slice(0, -1).join(".");
 };
@@ -567,11 +569,18 @@ const createRuntime = async () => {
 	const assets = await import("#virtual/assets").then((module) => module.assets);
 	for (const path in assets) radix.insert("GET/" + path, defineRoute({ fetch: async (scope) => {
 		const { response } = useRuntime(scope);
+		let content = await assets[path]?.();
+		if (content) {
+			if (path.endsWith(".png")) {
+				const [_, base64] = content.split(",");
+				content = Buffer.from(base64, "base64url");
+			}
+		}
 		response.headers.set("Content-Type", mimeType(path));
-		return new Response(await assets[path]?.(), response);
+		return new Response(content, response);
 	} }));
-	const invoke = (scope, next, index) => {
-		return middlewares.at(index)?.(scope, () => invoke(scope, next, index + 1)) ?? next(scope);
+	const invoke = (scope, route, index) => {
+		return middlewares.at(index)?.fetch(scope, () => invoke(scope, route, index + 1)) ?? route.fetch(scope);
 	};
 	return {
 		radix,
@@ -583,7 +592,7 @@ const createRuntime = async () => {
 			try {
 				scope.setContext(ROUTE_CONTEXT, { inputs: createState(inputs) });
 				if (route) {
-					const response = await invoke(scope, route.fetch, 0);
+					const response = await invoke(scope, route, 0);
 					if (response) return response;
 				}
 				return sendText(scope, "NOT_FOUND");
@@ -636,7 +645,7 @@ const useRequestUrl = (scope, base) => {
 };
 const useCookies = (scope) => {
 	const { request } = useRuntime(scope);
-	return (request.headers.get("Cookie")?.split("; ") ?? []).reduce((result, cookie) => {
+	return (isClient() ? document.cookie : request.headers.get("Cookie") ?? "").split("; ").reduce((result, cookie) => {
 		const [name, value] = cookie.split("=");
 		if (name && value) result[name] = decodeURIComponent(value);
 		return result;
@@ -661,7 +670,8 @@ const setCookie = (scope, name, value, options) => {
 	if (options?.priority) cookie += `; Priority=${options.priority}`;
 	if (options?.sameSite) cookie += `; SameSite=${options.sameSite}`;
 	if (options?.secure) cookie += `; Secure`;
-	response.headers.append("Set-Cookie", cookie);
+	if (isClient()) document.cookie = cookie;
+	else response.headers.append("Set-Cookie", cookie);
 };
 const mimeType = (file) => {
 	const extension = /\.([a-zA-Z0-9]+?)$/.exec(file)?.at(1);
@@ -835,97 +845,4 @@ const useLocale = (scope, context) => {
 };
 
 //#endregion
-//#region src/markdown/index.ts
-const charWhile = (buffer, start, ...chars) => {
-	let depth = 0;
-	let current = buffer.at(start + depth);
-	while (current && chars.includes(current)) {
-		depth += 1;
-		current = buffer.at(start + depth);
-	}
-	return depth;
-};
-const charUntil = (buffer, start, ...chars) => {
-	let depth = 0;
-	let current = buffer.at(start + depth);
-	while (current && !chars.includes(current)) {
-		depth += 1;
-		current = buffer.at(start + depth);
-	}
-	return depth;
-};
-const inlineText = (buffer, options) => {
-	const nodes = new Array();
-	let index = 0;
-	while (index < buffer.length) {
-		const char = buffer.charAt(index);
-		const text = charUntil(buffer, index, "*", "_", "\n");
-		if (text > 0) {
-			nodes.push(buffer.slice(index, index + text));
-			index += text;
-			continue;
-		}
-		if (char === "*" || char === "_") {
-			const start = charWhile(buffer, index, char);
-			const between = charUntil(buffer, index + start, char);
-			const end = charWhile(buffer, index + start + between, char);
-			const min = Math.min(start, end, 2);
-			const leading = start - min;
-			const trailing = end - min;
-			const slice = buffer.slice(index + leading + min, index + start + between + end - trailing - min);
-			if (slice.length > 0) {
-				const inline = inlineText(char.repeat(leading) + slice + char.repeat(trailing), options);
-				const tag = min === 2 ? "strong" : "em";
-				nodes.push(defu(options?.[tag], {
-					tag,
-					attributes: {},
-					children: inline
-				}));
-			}
-			index += start + between + end;
-			continue;
-		}
-		if (char === "\n") {
-			nodes.push(defu(options?.["br"], {
-				tag: "br",
-				attributes: {},
-				children: []
-			}));
-			index += 1;
-			continue;
-		}
-	}
-	return nodes;
-};
-const markdownToSlot = (input, options) => {
-	const nodes = new Array();
-	const buffer = input.replace(/[\r]+/g, "").trim();
-	let index = 0;
-	while (index < buffer.length) {
-		const start = index;
-		let lines = charWhile(buffer, index, "\n");
-		while (lines < 2 && index < buffer.length) {
-			index += lines + charUntil(buffer, index + lines, "\n");
-			lines = charWhile(buffer, index, "\n");
-		}
-		const block = buffer.slice(start, index);
-		if (block.startsWith("#")) {
-			const depth = charWhile(block, 0, "#");
-			const tag = "h" + depth;
-			nodes.push(defu(options?.[tag], {
-				tag,
-				attributes: {},
-				children: inlineText(block.slice(depth))
-			}));
-		} else nodes.push(defu(options?.["p"], {
-			tag: "p",
-			attributes: {},
-			children: inlineText(block)
-		}));
-		index += lines;
-	}
-	return nodes;
-};
-
-//#endregion
-export { $fetch, CLIENT, Compute, HOST_CONTEXT, Handler, LOCALE_CONTEXT, MountedEvent, NavigateEvent, Page, ROUTER_CONTEXT, ROUTE_CONTEXT, RUNTIME_CONTEXT, Radix, SERVER, Scope, StopEvent, activeCompute, components, createApp, createCompute, createElement, createLocale, createMemo, createRouter, createRuntime, createState, defineComponent, defineContext, defineRoute, fileName, fromValue, hydrate, isClient, isServer, isTemplate, markdownToSlot, mimeType, preventDefault, registerComponent, renderToString, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, stopImmediatePropagation, stopPropagation, targets, toArray, toCustomElement, toFragment, toPath, toRange, toString, useCookies, useEvent, useHost, useLocale, useRequestUrl, useRoute, useRouter, useRuntime, useSetCookies };
+export { $fetch, CLIENT, Compute, HOST_CONTEXT, Handler, LOCALE_CONTEXT, MountedEvent, NavigateEvent, Page, ROUTER_CONTEXT, ROUTE_CONTEXT, RUNTIME_CONTEXT, Radix, SERVER, Scope, StopEvent, activeCompute, components, createApp, createCompute, createElement, createLocale, createMemo, createRouter, createRuntime, createState, defineComponent, defineContext, defineMiddleware, defineRoute, fileName, fromValue, hydrate, isClient, isServer, isTemplate, mimeType, preventDefault, registerComponent, renderToString, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, stopImmediatePropagation, stopPropagation, targets, toArray, toCustomElement, toFragment, toPath, toRange, toString, useCookies, useEvent, useHost, useLocale, useRequestUrl, useRoute, useRouter, useRuntime, useSetCookies };

package/dist/runtime/index.d.ts

@@ -1,9 +1,12 @@
-import { type Handle, type Middleware, type ResponseOptions } from "../http";
+import { type Chain, type Handle, type ResponseOptions } from "../http";
 import { Radix } from "../radix";
 import { Scope, type State } from "../signals";
 export type Route = {
     fetch: Handle;
 };
+export type Middleware = {
+    fetch: Chain;
+};
 export type Runtime = {
     radix: Radix<Route>;
     middlewares: Array<Middleware>;
@@ -20,6 +23,7 @@ export type RouteContext = {
 export declare const useRuntime: <T = Record<string, unknown>>(scope: Scope) => RuntimeContext<T>;
 export declare const useRoute: (scope: Scope) => RouteContext;
 export declare const defineRoute: (route: Route) => Route;
+export declare const defineMiddleware: (middleware: Middleware) => Middleware;
 export declare const fileName: (path: string) => string | undefined;
 export declare const toPath: (value: string) => (string | undefined)[];
 export declare const $fetch: <T>(scope: Scope, input: string | URL, options?: RequestInit) => Promise<T>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "revojs",
-    "version": "0.0.49",
+    "version": "0.0.51",
     "type": "module",
     "repository": "coverbase/revojs",
     "license": "MIT",

package/dist/markdown/index.d.ts

@@ -1,2 +0,0 @@
-import type { Template } from "../html";
-export declare const markdownToSlot: (input: string, options?: Record<string, Template>) => unknown[];