@revojs/vue 0.1.18 → 0.1.20

package/dist/client/index.d.ts

@@ -1,5 +1,5 @@
-import { Ref } from "vue";
 import { Scope } from "revojs";
+import { Ref } from "vue";
 
 //#region src/client/index.d.ts
 type AsyncOptions<T> = {

package/dist/client/index.js

@@ -1,4 +1,4 @@
-import { $fetch, getState, sendRedirect, setState } from "../dist-CID_dTbk.js";
+import { $fetch, getState, sendRedirect, setState } from "revojs";
 import { customRef, inject, onServerPrefetch, ref } from "vue";
 import { useRouter } from "vue-router";
 

package/dist/index.js

@@ -1,5 +1,5 @@
-import "./dist-CID_dTbk.js";
-import { addAssets, addRoutes, useKit } from "@revojs/kit";
+import { addRoutes, useKit } from "revojs/kit";
+import "revojs";
 
 //#region src/index.ts
 function addPages(app, path) {
@@ -8,13 +8,12 @@ function addPages(app, path) {
 function vue() {
 	return {
 		config: { sources: { pages: {
-			match: "**/{page,layout}.vue",
+			match: "**/*.vue",
 			entries: ["./routes"]
 		} } },
 		setup(app) {
 			const { toPath, addAlias } = useKit(app, import.meta.url);
 			app.config.client = toPath("./module/index.html");
-			addAssets(app, "./dist/client");
 			addRoutes(app, toPath("./module/routes"));
 			addAlias("vue/app", "./module/app.ts");
 			addAlias("vue/main", "./module/main.vue");

package/dist/module/app.ts

@@ -5,10 +5,10 @@ import Main from "#alias/vue/main";
 import pages from "#virtual/pages";
 
 function toRoute(path: string, node: Node<Component>, index: number): RouteRecordRaw {
-    const layout = node.children["LAYOUT"];
+    const layout = node.children["+layout"];
 
     if (layout) {
-        delete node.children["LAYOUT"];
+        delete node.children["+layout"];
     }
 
     const children = Object.entries(node.children).map(([path, node]) => toRoute(path, node, index + 1));
@@ -21,10 +21,6 @@ function toRoute(path: string, node: Node<Component>, index: number): RouteRecor
         path += node.parameter;
     }
 
-    if (index === 0) {
-        path = "/";
-    }
-
     const route = {
         path,
         children,
@@ -38,17 +34,16 @@ export default async (scope: Scope) => {
     const radix = new Radix<Component>();
 
     for (const name in pages) {
-        const [path, target] = toRoutePath(name);
-
         const Component = pages[name];
+
         if (Component) {
-            radix.use(target === "PAGE" ? path : path + "/" + target, Component);
+            radix.use(toRoutePath(name), Component);
         }
     }
 
     const router = createRouter({
         history: import.meta.server ? createMemoryHistory() : createWebHistory(),
-        routes: Object.entries(radix.rootNode.children).map(([path, node]) => toRoute(path, node, 0)),
+        routes: [toRoute("/", radix.rootNode, 0)],
     });
 
     const app = createSSRApp(Main).use(router).provide("REVOJS_SCOPE", scope);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@revojs/vue",
-    "version": "0.1.18",
+    "version": "0.1.20",
     "type": "module",
     "repository": "coverbase/revojs",
     "license": "MIT",
@@ -29,9 +29,9 @@
         "watch": "tsdown -w"
     },
     "dependencies": {
-        "@revojs/kit": "*",
         "vue": "^3.5.19",
-        "vue-router": "^4.5.1"
+        "vue-router": "^4.5.1",
+        "revojs": "*"
     },
     "devDependencies": {
         "@revojs/tsconfig": "*",

package/dist/dist-CID_dTbk.js

@@ -1,110 +0,0 @@
-//#region ../revojs/dist/index.js
-function useServer(scope) {
-	return scope.getContext(SERVER_CONTEXT);
-}
-function getState(scope, name) {
-	if (import.meta.server) {
-		const { states } = useServer(scope);
-		return states[name];
-	} else {
-		if (STATES === void 0) {
-			const element = document.getElementById("STATES");
-			STATES = element?.textContent ? JSON.parse(element.textContent) : {};
-		}
-		return STATES[name];
-	}
-}
-function setState(scope, name, value) {
-	if (import.meta.server) {
-		const { states } = useServer(scope);
-		states[name] = value;
-	} else {
-		if (STATES === void 0) {
-			const element = document.getElementById("STATES");
-			STATES = element?.textContent ? JSON.parse(element.textContent) : {};
-		}
-		STATES[name] = value;
-	}
-}
-function sendRedirect(scope, path, config) {
-	const { response } = useServer(scope);
-	response.status = 302;
-	response.headers.set("Location", path);
-	return new Response(null, mergeObjects(response, config));
-}
-const ROUTER_CONTEXT = defineContext("ROUTER_CONTEXT");
-const SERVER_CONTEXT = defineContext("SERVER_CONTEXT");
-let STATES;
-var StopEvent = class extends Event {
-	constructor() {
-		super("stop");
-	}
-};
-var Scope = class extends EventTarget {
-	parentScope;
-	context;
-	constructor(parentScope) {
-		super();
-		this.parentScope = parentScope;
-		this.parentScope?.onStop(() => this.stop());
-		this.context = {};
-	}
-	getContext(input) {
-		let scope = this;
-		while (scope) {
-			if (scope.context[input]) return scope.context[input];
-			scope = scope.parentScope;
-		}
-		return {};
-	}
-	setContext(input, value) {
-		this.context[input] = value;
-	}
-	onStop(input) {
-		this.addEventListener("stop", input, { once: true });
-	}
-	stop() {
-		return this.dispatchEvent(new StopEvent());
-	}
-};
-function defineContext(name) {
-	return name;
-}
-function mergeObjects(base, input) {
-	if (input === null || input === void 0) return mergeObjects(base, {});
-	const object = Object.assign({}, input);
-	for (const key in base) {
-		if (key === "__proto__" || key === "constructor") continue;
-		const value = base[key];
-		if (value === null || value === void 0) continue;
-		if (Array.isArray(value) && Array.isArray(object[key])) object[key] = [...value, ...object[key]];
-		else if (typeof value === "object" && typeof object[key] === "object") object[key] = mergeObjects(value, object[key]);
-		else object[key] = value;
-	}
-	return object;
-}
-async function $fetch(scope, input, options) {
-	let response;
-	if (import.meta.server) {
-		const { states, request, variables } = useServer(scope);
-		const next = new Scope();
-		const url = new URL(input.toString(), request.url);
-		next.setContext(SERVER_CONTEXT, {
-			states,
-			request: new Request(url, options),
-			response: { headers: new Headers() },
-			variables
-		});
-		const previous = new URL(request.url);
-		if (url.origin === previous.origin) 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, getState, sendRedirect, setState };