revojs 0.1.20 → 0.1.21

package/dist/{app-C4yy27ko.js → app-gPmc1xyv.js}

@@ -50,7 +50,7 @@ var Router = class extends Radix {
 		const { pathname } = useUrl(scope);
 		const context = {
 			route: this.rootNode,
-			segments: pathname.substring(1).split("/").concat(request.method.toLowerCase()),
+			segments: (request.method.toLowerCase() + pathname).split("/"),
 			parameters: {}
 		};
 		const invoke$1 = (node, index) => {
@@ -71,7 +71,7 @@ var Router = class extends Radix {
 			if (node.children[WILDCARD]) {
 				const wildcardNode = node.children[WILDCARD];
 				context.parameters[wildcardNode.parameter] = segment;
-				return wildcardNode.value ?? invoke$1(wildcardNode, index + 1);
+				return wildcardNode.value ?? invoke$1(wildcardNode, context.segments.length);
 			}
 		};
 		const route = invoke$1(this.rootNode, 0);
@@ -207,9 +207,8 @@ function mimeType(file) {
 	return mimeTypes[extension ?? ""] ?? "text/plain";
 }
 function toRoutePath(path) {
-	const result = path.replaceAll(/\[\.\.\.(.*?)\]/g, (_, value) => WILDCARD + value).replaceAll(/\[(.*?)\]/g, (_, value) => PARAMETER + value).split("/");
-	const properties = result.pop()?.toLocaleLowerCase().replaceAll("index", "").split(".").slice(0, -1).filter(Boolean) ?? [];
-	return result.concat(properties).join("/");
+	const segments = path.toLowerCase().replaceAll(/\[\.\.\.(.*?)\]/g, (_, value) => WILDCARD + value).replaceAll(/\[(.*?)\]/g, (_, value) => PARAMETER + value).split(".");
+	return [(segments.shift() ?? "").split("/").filter((value) => value !== "index").join("/"), ...segments];
 }
 async function invoke(scope, pipeline, index = 0) {
 	return await pipeline.at(index)?.fetch(scope, async () => await invoke(scope, pipeline, index + 1));
@@ -218,7 +217,10 @@ async function createServer() {
 	const router = new Router();
 	const middlewares = new Array();
 	const routes = await import("#virtual/routes").then((module) => Object.entries(module.default));
-	for (const [path, route] of routes) router.use(toRoutePath(path), route);
+	for (const [path, route] of routes) {
+		const [result, method] = toRoutePath(path);
+		router.use(method + "/" + result, route);
+	}
 	middlewares.push(router);
 	return {
 		router,

package/dist/{index-D-rKmbh3.d.ts → index-D6BvOWjN.d.ts}

@@ -143,7 +143,7 @@ declare function sendRedirect(scope: Scope, path: string, config?: Mergeable<Res
 declare function sendBadRequest(scope: Scope, text: string, config?: Mergeable<ResponseConfig>): Response;
 declare function sendUnauthorized(scope: Scope, config?: Mergeable<ResponseConfig>): Response;
 declare function mimeType(file: string): MimeType;
-declare function toRoutePath(path: string): string;
+declare function toRoutePath(path: string): [string, ...Array<string>];
 declare function invoke(scope: Scope, pipeline: Array<Middleware>, index?: number): Promise<Result>;
 declare function createServer(): Promise<Server>;
 declare const ROUTER_CONTEXT: Descriptor<RouterContext>;

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-import { $fetch, App, BuildConfig, CLIENT, Config, Context, CookieOptions, CookiePriority, CookieSameSite, Descriptor, DevelopmentConfig, Encoding, Environment, Failure, HttpMethod, InferInput, InferOutput, Issue, Mergeable, Middleware, MimeType, Module, Node, Output, PARAMETER, ParameterNode, PathNode, ROUTER_CONTEXT, Radix, ResponseConfig, Result, Route, Router, RouterContext, SERVER, SERVER_CONTEXT, STATES, Schema, Scope, Server, ServerContext, Source, States, StatusCode, StopEvent, Success, Virtual, WILDCARD, WildcardNode, createApp, createServer, defineContext, defineMiddleware, defineRoute, getState, invoke, isFailure, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, setState, toRoutePath, useCookies, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery } from "./index-D-rKmbh3.js";
+import { $fetch, App, BuildConfig, CLIENT, Config, Context, CookieOptions, CookiePriority, CookieSameSite, Descriptor, DevelopmentConfig, Encoding, Environment, Failure, HttpMethod, InferInput, InferOutput, Issue, Mergeable, Middleware, MimeType, Module, Node, Output, PARAMETER, ParameterNode, PathNode, ROUTER_CONTEXT, Radix, ResponseConfig, Result, Route, Router, RouterContext, SERVER, SERVER_CONTEXT, STATES, Schema, Scope, Server, ServerContext, Source, States, StatusCode, StopEvent, Success, Virtual, WILDCARD, WildcardNode, createApp, createServer, defineContext, defineMiddleware, defineRoute, getState, invoke, isFailure, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, setState, toRoutePath, useCookies, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery } from "./index-D6BvOWjN.js";
 export { $fetch, App, BuildConfig, CLIENT, Config, Context, CookieOptions, CookiePriority, CookieSameSite, Descriptor, DevelopmentConfig, Encoding, Environment, Failure, HttpMethod, InferInput, InferOutput, Issue, Mergeable, Middleware, MimeType, Module, Node, Output, PARAMETER, ParameterNode, PathNode, ROUTER_CONTEXT, Radix, ResponseConfig, Result, Route, Router, RouterContext, SERVER, SERVER_CONTEXT, STATES, Schema, Scope, Server, ServerContext, Source, States, StatusCode, StopEvent, Success, Virtual, WILDCARD, WildcardNode, createApp, createServer, defineContext, defineMiddleware, defineRoute, getState, invoke, isFailure, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, setState, toRoutePath, useCookies, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { CLIENT, PARAMETER, ROUTER_CONTEXT, Radix, Router, SERVER, SERVER_CONTEXT, STATES, Scope, StopEvent, WILDCARD, createApp, createServer, defineContext, defineMiddleware, defineRoute, getState, invoke, isFailure, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, setState, toRoutePath, useCookies, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery } from "./app-C4yy27ko.js";
+import { CLIENT, PARAMETER, ROUTER_CONTEXT, Radix, Router, SERVER, SERVER_CONTEXT, STATES, Scope, StopEvent, WILDCARD, createApp, createServer, defineContext, defineMiddleware, defineRoute, getState, invoke, isFailure, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, setState, toRoutePath, useCookies, useHeaders, useQuery, useRouter, useServer, useSetCookies, useUrl, withQuery } from "./app-gPmc1xyv.js";
 
 //#region src/client/index.ts
 async function $fetch(scope, input, options) {

package/dist/kit/index.d.ts

@@ -1,4 +1,4 @@
-import { App, Virtual } from "../index-D-rKmbh3.js";
+import { App, Virtual } from "../index-D6BvOWjN.js";
 
 //#region src/kit/index.d.ts
 declare function useKit(app: App, source: string | URL): {

package/dist/vite/index.d.ts

@@ -1,4 +1,4 @@
-import { Config, Mergeable } from "../index-D-rKmbh3.js";
+import { Config, Mergeable } from "../index-D6BvOWjN.js";
 import { Plugin } from "vite";
 
 //#region src/vite/index.d.ts

package/dist/vite/index.js

@@ -1,4 +1,4 @@
-import { CLIENT, SERVER, SERVER_CONTEXT, Scope, createApp, invoke } from "../app-C4yy27ko.js";
+import { CLIENT, SERVER, SERVER_CONTEXT, Scope, createApp, invoke } from "../app-gPmc1xyv.js";
 import { useKit } from "../kit-Bzr1NqHb.js";
 import { basename, dirname, isAbsolute, join, posix, relative, win32 } from "path";
 import { isRunnableDevEnvironment } from "vite";
@@ -307,7 +307,7 @@ function virtuals(virtuals$1) {
 //#endregion
 //#region package.json
 var name = "revojs";
-var version = "0.1.20";
+var version = "0.1.21";
 
 //#endregion
 //#region src/vite/index.ts

package/package.json

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