docs(changeset): fix types

.changeset/honest-waves-shop.md

@@ -0,0 +1,6 @@
+---
+"@vinxi/solid-start": patch
+"vinxi": patch
+---
+
+fix types

.gitignore

@@ -18,5 +18,4 @@ docs/.vitepress/dist
 docs/.vitepress/cache
 .vitepress
 
-**/types/**/*.d.ts
-**/types/**/*.d.ts.map
+

examples/react/rsc/ssr/app.config.js

@@ -3,7 +3,7 @@ import reactRefresh from "@vitejs/plugin-react";
 import { readFileSync } from "fs";
 import { join } from "path";
 import { createApp } from "vinxi";
-import { virtual } from "vinxi/lib/plugins/virtual";
+import { virtual } from "vinxi/plugins/virtual";
 
 function hash(str) {
 	let hash = 0;

examples/react/ssr/basic-cloudflare/app.config.js

@@ -1,7 +1,7 @@
 import reactRefresh from "@vitejs/plugin-react";
 import { createApp } from "vinxi";
-import { config } from "vinxi/lib/plugins/config";
-import { virtual } from "vinxi/lib/plugins/virtual";
+import { config } from "vinxi/plugins/config";
+import { virtual } from "vinxi/plugins/virtual";
 
 function viteServer() {
 	let router;
@@ -37,27 +37,23 @@ export default createApp({
 			name: "client",
 			mode: "build",
 			handler: "./app/client.tsx",
-			compile: {
-				target: "browser",
-				plugins: () => [reactRefresh()],
-			},
+			target: "browser",
+			plugins: () => [reactRefresh()],
 			base: "/_build",
 		},
 		{
 			name: "ssr",
 			mode: "handler",
 			handler: "./app/server.tsx",
-			compile: {
-				target: "server",
-				plugins: () => [
-					viteServer(),
-					config("kv", {
-						define: {
-							"import.meta.env.cloudflare": "globalThis.cloudflare",
-						},
-					}),
-				],
-			},
+			target: "server",
+			plugins: () => [
+				viteServer(),
+				config("kv", {
+					define: {
+						"import.meta.env.cloudflare": "globalThis.cloudflare",
+					},
+				}),
+			],
 		},
 	],
 });

frameworks/solid-start/root/routes.ts

@@ -1,8 +1,8 @@
-import fileRoutes from "vinxi/routes";
+import fileRoutes, { RouteModule } from "vinxi/routes";
 
 console.log("fileRoutes", fileRoutes);
 
-const defineRoutes = (fileRoutes) => {
+const defineRoutes = (fileRoutes: RouteModule[]) => {
 	function processRoute(routes, route, id, full) {
 		const parentRoute = Object.values(routes).find((o) => {
 			// if (o.id.endsWith("/index")) {

packages/vinxi/package.json

@@ -13,7 +13,7 @@
   ],
   "scripts": {},
   "bin": "./bin/cli.mjs",
-  "types": "./types/lib/index.d.ts",
+  "types": "./dist/types/lib/index.d.ts",
   "exports": {
     ".": {
       "import": "./lib/index.js"
@@ -52,43 +52,43 @@
   "typesVersions": {
     "*": {
       ".": [
-        "./types/lib/index.d.ts"
+        "./dist/types/lib/index.d.ts"
       ],
       "dev-server": [
-        "./types/lib/dev-server.d.ts"
+        "./dist/types/lib/dev-server.d.ts"
       ],
       "server": [
-        "./types/runtime/server.d.ts"
+        "./dist/types/runtime/server.d.ts"
       ],
       "party": [
-        "./types/runtime/party.d.ts"
+        "./dist/types/runtime/party.d.ts"
       ],
       "css": [
-        "./types/runtime/style.d.ts"
+        "./dist/types/runtime/style.d.ts"
       ],
       "client": [
-        "./types/runtime/client.d.ts"
+        "./dist/types/runtime/client.d.ts"
       ],
       "fs-router": [
-        "./types/lib/fs-router.d.ts"
+        "./dist/types/lib/fs-router.d.ts"
       ],
       "types/server": [
-        "./runtime/types-lib/server.d.ts"
+        "./types/server.d.ts"
       ],
       "types/client": [
-        "./runtime/types-lib/client.d.ts"
+        "./types/client.d.ts"
       ],
       "routes": [
-        "./runtime/types-lib/routes.d.ts"
+        "./types/routes.d.ts"
       ],
       "lib/invariant": [
-        "./types/lib/invariant.d.ts"
+        "./dist/types/lib/invariant.d.ts"
       ],
       "plugins/config": [
-        "./types/lib/plugins/config.d.ts"
+        "./dist/types/lib/plugins/config.d.ts"
       ],
       "plugins/virtual": [
-        "./types/lib/plugins/virtual.d.ts"
+        "./dist/types/lib/plugins/virtual.d.ts"
       ]
     }
   },

packages/vinxi/runtime/party.js

@@ -10,30 +10,63 @@ import {
 
 class InternalParty {
 	connections = new Map();
+	/**
+	 * @param {any} tag
+	 */
 	getConnections(tag) {
 		return this.connections.values();
 	}
+	/**
+	 * @param {any} id
+	 */
 	getConnection(id) {
 		return this.connections.get(id);
 	}
 	id;
+	/**
+	 * @param {string} id
+	 */
 	constructor(id) {
 		this.id = id;
 	}
+	/**
+	 * @param {{ id: any; }} connection
+	 */
 	onConnect(connection) {
 		this.connections.set(connection.id, connection);
 	}
 
+	/**
+	 * @param {{ id: any; }} connection
+	 */
 	onClose(connection) {
 		this.connections.delete(connection.id);
 	}
 
+	/**
+	 * @type {any}
+	 */
 	storage;
+	/**
+	 * @type {any}
+	 */
 	name;
+	/**
+	 * @type {any}
+	 */
 	internalID;
+	/**
+	 * @type {any}
+	 */
 	env;
+	/**
+	 * @type {any}
+	 */
 	context;
 
+	/**
+	 * @param {any} msg
+	 */
 	broadcast(msg, without = []) {
 		for (const conn of this.connections.values()) {
 			if (without && without.includes(conn.id)) {
@@ -43,15 +76,24 @@ class InternalParty {
 		}
 	}
 
+	/**
+	 * @type {any}
+	 */
 	parties;
 }
 
+/**
+ * @param {WebSocket} webSocket
+ */
 function createConnection(webSocket) {
 	// @ts-ignore
 	webSocket.id ??= Math.random().toString(36).slice(2);
 	return webSocket;
 }
 
+/**
+ * @param {{ onStart: (arg0: InternalParty) => any; onConnect: (arg0: InternalParty, arg1: any) => void; onMessage: (arg0: InternalParty, arg1: string | ArrayBuffer | Buffer[], arg2: any) => void; onError: (arg0: InternalParty, arg1: any, arg2: Error) => void; onClose: (arg0: InternalParty, arg1: any) => void; onRequest: (arg0: InternalParty, arg1: Request) => any; }} partyServer
+ */
 export function partyHandler(partyServer) {
 	return lazyEventHandler(async () => {
 		const party = new InternalParty("main");

packages/vinxi/runtime/style.js

@@ -1,3 +1,8 @@
+/**
+ * 
+ * @param {*} styles 
+ * @param {*} data 
+ */
 export function updateStyles(styles, data) {
 	let styleAsset = styles.find(
 		(s) => s.attrs["data-vite-dev-id"] === data.file,

packages/vinxi/tsconfig.json

@@ -13,7 +13,7 @@
 		"declarationMap": true,
 		"declaration": true,
 		"emitDeclarationOnly": true,
-		"outDir": "./types"
+		"outDir": "./dist/types"
 	},
 	"include": ["lib", "runtime"]
 }

packages/vinxi/runtime/types-lib/routes.d.ts → packages/vinxi/types/routes.d.ts

@@ -1,6 +1,6 @@
 declare type Mod = `$${string}`;
 
-declare const routes: ({
+export type RouteModule = {
 	path: string;
 } & Record<
 	Mod,
@@ -9,6 +9,8 @@ declare const routes: ({
 		import: () => Promise<any>;
 		require: () => any;
 	}
->)[];
+>;
+
+declare const routes: RouteModule[];
 
 export default routes;