revojs 0.1.3 → 0.1.5

package/dist/index.d.ts

@@ -38,8 +38,6 @@ declare class Scope extends EventTarget {
   stop(): boolean;
 }
 declare function defineContext<T>(name: string): Descriptor<T>;
-declare function isClient(): boolean;
-declare function isServer(): boolean;
 declare function isFailure<T>(result: Output<T>): result is Failure;
 declare function parseSchema<T extends Schema>(scope: Scope, schema: T, value: unknown): InferOutput<T>;
 declare function mergeObjects<TBase, TInput>(base: TBase, input: TInput): TBase & TInput;
@@ -78,6 +76,9 @@ declare function createApp(inputConfig?: Mergeable<Config>): App;
 declare const SERVER = "ssr";
 declare const CLIENT = "client";
 //#endregion
+//#region src/client/index.d.ts
+declare function $fetch<T>(scope: Scope, input: string | URL, options?: RequestInit): Promise<T>;
+//#endregion
 //#region src/server/index.d.ts
 type CookiePriority = "Low" | "Medium" | "High";
 type CookieSameSite = "Lax" | "Strict" | "None";
@@ -174,4 +175,4 @@ declare const WILDCARD = "$";
 declare const PARAMETER = ":";
 declare const mimeTypes: Record<string, MimeType>;
 //#endregion
-export { App, CLIENT, Config, Context, CookieOptions, CookiePriority, CookieSameSite, Descriptor, 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, Schema, Scope, Server, ServerContext, Source, StatusCode, StopEvent, Success, Virtual, WILDCARD, WildcardNode, createApp, createServer, defineContext, defineMiddleware, defineRoute, isClient, isFailure, isServer, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, toRoutePath, useCookies, useQuery, useServer, useSetCookies, useUrl };
+export { $fetch, App, CLIENT, Config, Context, CookieOptions, CookiePriority, CookieSameSite, Descriptor, 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, Schema, Scope, Server, ServerContext, Source, StatusCode, StopEvent, Success, Virtual, WILDCARD, WildcardNode, createApp, createServer, defineContext, defineMiddleware, defineRoute, isFailure, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, toRoutePath, useCookies, useQuery, useServer, useSetCookies, useUrl };

package/dist/index.js

@@ -102,7 +102,7 @@ function useQuery(scope, schema) {
 }
 function useCookies(scope, schema) {
 	const { request } = useServer(scope);
-	const entries = (isClient() ? document.cookie : request.headers.get("Cookie") ?? "").split("; ").reduce((result, cookie) => {
+	const entries = (import.meta.client ? document.cookie : request.headers.get("Cookie") ?? "").split("; ").reduce((result, cookie) => {
 		const [name, value] = cookie.split("=");
 		if (name && value) result[name] = decodeURIComponent(value);
 		return result;
@@ -129,7 +129,7 @@ function setCookie(scope, name, value, options) {
 	if (options?.priority) cookie += `; Priority=${options.priority}`;
 	if (options?.sameSite) cookie += `; SameSite=${options.sameSite}`;
 	if (options?.secure) cookie += `; Secure`;
-	if (isClient()) document.cookie = cookie;
+	if (import.meta.client) document.cookie = cookie;
 	else response.headers.append("Set-Cookie", cookie);
 }
 function sendText(scope, text, config) {
@@ -286,12 +286,6 @@ var Scope = class extends EventTarget {
 function defineContext(name) {
 	return name;
 }
-function isClient() {
-	return typeof window !== "undefined";
-}
-function isServer() {
-	return typeof window === "undefined";
-}
 function isFailure(result) {
 	return "issues" in result;
 }
@@ -347,4 +341,26 @@ const SERVER = "ssr";
 const CLIENT = "client";
 
 //#endregion
-export { CLIENT, PARAMETER, ROUTER_CONTEXT, Radix, Router, SERVER, SERVER_CONTEXT, Scope, StopEvent, WILDCARD, createApp, createServer, defineContext, defineMiddleware, defineRoute, isClient, isFailure, isServer, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, toRoutePath, useCookies, useQuery, useServer, useSetCookies, useUrl };
+//#region src/client/index.ts
+async function $fetch(scope, input, options) {
+	let response;
+	if (import.meta.server) {
+		const { request, variables } = useServer(scope);
+		const next = new Scope();
+		next.setContext(SERVER_CONTEXT, {
+			request: new Request(new URL(input.toString(), request.url), options),
+			response: { headers: new Headers() },
+			variables
+		});
+		response = await (await import("#virtual/server")).default.fetch(next);
+	}
+	response ??= await fetch(input, options);
+	if (response.ok === false) throw response;
+	switch (response.headers.get("Content-Type")?.split(";").shift() ?? "") {
+		case "application/json": return response.json();
+		default: return response;
+	}
+}
+
+//#endregion
+export { $fetch, CLIENT, PARAMETER, ROUTER_CONTEXT, Radix, Router, SERVER, SERVER_CONTEXT, Scope, StopEvent, WILDCARD, createApp, createServer, defineContext, defineMiddleware, defineRoute, isFailure, mergeObjects, mimeType, mimeTypes, parseSchema, sendBadRequest, sendHtml, sendJson, sendRedirect, sendText, sendUnauthorized, setCookie, toRoutePath, useCookies, useQuery, useServer, useSetCookies, useUrl };

package/dist/vite/index.js

@@ -8,7 +8,7 @@ import { existsSync, readFileSync } from "fs";
 
 //#region package.json
 var name = "revojs";
-var version = "0.1.3";
+var version = "0.1.5";
 
 //#endregion
 //#region src/server/index.ts
@@ -291,27 +291,31 @@ function entry() {
 		name: "entry",
 		enforce: "pre",
 		sharedDuringBuild: true,
-		resolveId(source, importer, options) {
-			if (source === "vite/modulepreload-polyfill") return null;
-			if (this.environment.name === CLIENT) {
-				if (importer && entryPath) {
-					const path = join(dirname(importer), source);
-					if (existsSync(path)) return path;
-				}
-				if (options.isEntry) {
-					entryName = basename(source);
-					entryPath = source;
-					return entryName;
+		resolveId: {
+			filter: { id: /\.html$/ },
+			handler(source, importer, options) {
+				if (this.environment.name === CLIENT) {
+					if (importer && entryPath) {
+						const path = join(dirname(importer), source);
+						if (existsSync(path)) return path;
+					}
+					if (options.isEntry) {
+						entryName = basename(source);
+						entryPath = source;
+						return entryName;
+					}
 				}
 			}
-			return null;
 		},
-		load(source) {
-			if (entryName && entryPath && source === entryName) return readFileSync(entryPath, {
-				encoding: "utf-8",
-				flag: "r"
-			});
-			return null;
+		load: {
+			filter: { id: /\.html$/ },
+			handler(source) {
+				if (entryName && entryPath && source === entryName) return readFileSync(entryPath, {
+					encoding: "utf-8",
+					flag: "r"
+				});
+				return null;
+			}
 		}
 	};
 }

package/package.json

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

package/src/types/index.d.ts

@@ -33,3 +33,8 @@ declare module "#virtual/middlewares" {
 
     export default middlewares;
 }
+
+interface ImportMeta {
+    readonly server: boolean;
+    readonly client: boolean;
+}