revojs 0.0.1 → 0.0.2

package/dist/app/index.d.ts

@@ -2,13 +2,15 @@ import type { Template } from "../html";
 export type NestedPartial<T> = Partial<{
     [K in keyof T]: T[K] extends object ? NestedPartial<T[K]> : T[K];
 }>;
-export type AssetConfig = {
-    path: string;
-    suffix?: string;
-    import?: string;
+export type StaticContent = {
+    type: "static";
+    source: string;
+    include: Array<string>;
 };
-export type RouteConfig = {
-    path: string;
+export type AssetContent = {
+    type: "asset";
+    source: string;
+    include: Array<string>;
 };
 export type ServerEntry = "revojs/presets/node" | "revojs/presets/deno" | "revojs/presets/bun" | "revojs/presets/cloudflare" | (string & {});
 export type ClientConfig = {
@@ -18,15 +20,14 @@ export type ServerConfig = {
     entry: ServerEntry;
 };
 export type Config = {
-    assets: Array<AssetConfig>;
-    routes: Array<RouteConfig>;
     client: ClientConfig;
     server: ServerConfig;
+    content: Record<string, StaticContent | AssetContent>;
     markdown: Record<string, Template>;
 };
 export type App = {
     config: Config;
     virtuals: Record<string, () => string>;
 };
-export declare const getAssets: <T>(regex: RegExp) => Promise<Record<string, () => Promise<T>>>;
+export declare const getContent: <T>(key: string) => Promise<Record<string, () => Promise<T>>>;
 export declare const createApp: (config?: NestedPartial<Config>) => App;

package/dist/index.js

@@ -2,20 +2,31 @@ import defu, { defu as defu$1 } from "defu";
 import { h } from "revojs/jsx-runtime";
 
 //#region src/app/index.ts
-const getAssets = async (regex) => {
-	const assets = await import("#virtual/assets").then((module) => module.assets);
-	return Object.entries(assets).reduce((assets$1, [name, value]) => {
-		if (regex.test(name)) assets$1[name] = value;
-		return assets$1;
-	}, {});
+const getContent = async (key) => {
+	return await import("#virtual/content").then((module) => module.index[key]);
 };
 const createApp = (config) => {
 	return {
 		config: defu$1(config, {
-			assets: [{ path: "./assets" }],
-			routes: [{ path: "./routes" }],
 			client: { entry: "./index.html" },
 			server: { entry: "revojs/presets/node" },
+			content: {
+				static: {
+					type: "static",
+					source: "./dist/client",
+					include: ["**/*.*"]
+				},
+				routes: {
+					type: "asset",
+					source: "./routes",
+					include: [
+						"**/*.js",
+						"**/*.ts",
+						"**/*.jsx",
+						"**/*.tsx"
+					]
+				}
+			},
 			markdown: {}
 		}),
 		virtuals: {}
@@ -427,18 +438,21 @@ const defineRoute = (route) => {
 const defineSocket = (socket) => {
 	return socket;
 };
+const fileName = (path) => {
+	return path.split("/").pop()?.split(".").slice(0, -1).join(".");
+};
 const toPath = (value) => {
-	return value.replace(/\/index/, "").replace(/\.(js|ts|jsx|tsx)$/, "").replaceAll(/\[(.*)\]/g, (_, name) => ":" + name).padStart(1, "/");
+	return value.replace(/\/index/, "").replace(/index/, "").replace(/\.(js|ts|jsx|tsx)$/, "").replaceAll(/\[(.*)\]/g, (_, name) => ":" + name);
 };
 const createRuntime = async () => {
 	const radix = new Radix();
-	const assets = await import("#virtual/assets").then((module) => module.assets);
-	for (const path in assets) radix.insert("GET" + path, defineRoute({ fetch: async (event) => {
+	const assets = await getContent("static");
+	for (const path in assets) radix.insert("GET/" + path, defineRoute({ fetch: async (event) => {
 		setHeader(event, "Content-Type", getMimeType(path));
 		return sendText(event, await assets[path]());
 	} }));
-	const routes = await import("#virtual/routes").then((module) => module.routes);
-	for (const path in routes) radix.insert("GET" + toPath(path), defineRoute({ fetch: async (event) => {
+	const routes = await getContent("routes");
+	for (const path in routes) radix.insert("GET/" + toPath(path), defineRoute({ fetch: async (event) => {
 		const route = await routes[path]();
 		if (route) {
 			if ("message" in route) return sendText(event, "WebSocket");
@@ -471,8 +485,8 @@ const Outlet = defineComponent({
 	name: "x-outlet",
 	setup: async () => {
 		const radix = new Radix();
-		const routes = await import("#virtual/routes").then((module) => module.routes);
-		for (const path in routes) radix.insert("GET" + toPath(path), routes[path]);
+		const routes = await getContent("routes");
+		for (const path in routes) radix.insert("/" + toPath(path), routes[path]);
 		const url = createState(new URL(activeEvent ? activeEvent.request.url : window.location.href));
 		if (isClient()) {
 			const controller = new AbortController();
@@ -480,7 +494,7 @@ const Outlet = defineComponent({
 			onCleanUp(() => controller.abort());
 		}
 		return async () => {
-			const { value, inputs } = radix.match("GET" + url.value.pathname);
+			const { value, inputs } = radix.match(url.value.pathname);
 			const Page = await value?.();
 			if (Page) return h(Page, inputs);
 		};
@@ -499,4 +513,4 @@ const anchorNavigate = (event) => {
 };
 
 //#endregion
-export { Handler, Outlet, Radix, activeElement, activeEvent, addStyles, anchorNavigate, components, createApp, createCompute, createElement, createEvent, createRuntime, createState, defineComponent, defineRoute, defineSocket, fromValue, getAssets, getGlobalStyles, getMimeType, globalStyles, isClient, isServer, markdownToSlot, navigate, onCleanUp, registerComponent, runCompute, runningCompute, sendHtml, sendJson, sendText, setHeader, slotToNode, slotToString, targets, toCustomElement, toPath, toString };
+export { Handler, Outlet, Radix, activeElement, activeEvent, addStyles, anchorNavigate, components, createApp, createCompute, createElement, createEvent, createRuntime, createState, defineComponent, defineRoute, defineSocket, fileName, fromValue, getContent, getGlobalStyles, getMimeType, globalStyles, isClient, isServer, markdownToSlot, navigate, onCleanUp, registerComponent, runCompute, runningCompute, sendHtml, sendJson, sendText, setHeader, slotToNode, slotToString, targets, toCustomElement, toPath, toString };

package/dist/runtime/index.d.ts

@@ -12,6 +12,7 @@ export type Runtime<T = Context> = {
 };
 export declare const defineRoute: <T = Context>(route: Route<T>) => Route<T>;
 export declare const defineSocket: <T = Context>(socket: Socket<T>) => Socket<T>;
+export declare const fileName: (path: string) => string | undefined;
 export declare const toPath: (value: string) => string;
 export declare const createRuntime: <T = Context>() => Promise<Runtime<T>>;
 export declare let activeEvent: Event | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "revojs",
-    "version": "0.0.1",
+    "version": "0.0.2",
     "type": "module",
     "repository": "coverbase/revojs",
     "license": "MIT",
@@ -30,8 +30,8 @@
         "defu": "^6.1.4"
     },
     "devDependencies": {
-        "@revojs/tsconfig": "0.0.0",
-        "@revojs/rolldown": "0.0.0",
+        "@revojs/tsconfig": "0.0.1",
+        "@revojs/rolldown": "0.0.1",
         "rolldown": "^1.0.0-beta.1"
     }
 }