@torpor/build 0.0.3 → 0.0.5

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @torpor/build
 
+## 0.0.5
+
+### Patch Changes
+
+- 79da6cf: Refactor: export more types
+- 3707fdb: Fix: better ordering of routes
+- Updated dependencies [808da4c]
+  - @torpor/view@0.0.6
+  - @torpor/unplugin@0.0.5
+
+## 0.0.4
+
+### Patch Changes
+
+- Updated dependencies [44cf656]
+- Updated dependencies [a278176]
+  - @torpor/view@0.0.5
+  - @torpor/unplugin@0.0.4
+
 ## 0.0.3
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@torpor/build",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "A framework for building sites and apps with Torpor",
   "type": "module",
   "main": "dist/index.cjs",
@@ -34,8 +34,8 @@
   "license": "ISC",
   "dependencies": {
     "vinxi": "^0.5.3",
-    "@torpor/unplugin": "^0.0.3",
-    "@torpor/view": "^0.0.4"
+    "@torpor/unplugin": "^0.0.5",
+    "@torpor/view": "^0.0.6"
   },
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "^5.2.2",

package/src/bin/index.ts

@@ -3,7 +3,7 @@
 import fs from "node:fs";
 import path from "path";
 import defineConfig from "../site/defineConfig";
-import { type UserConfig } from "../types/UserConfig";
+import type UserConfig from "../types/UserConfig";
 
 // Check for a torpor.config.js/ts file in the working directory
 // TODO: Make sure it's valid, try/catch, etc

package/src/index.ts

@@ -1,12 +1,16 @@
 import buildRoutePath from "./site/buildRoutePath";
 import defineConfig from "./site/defineConfig";
-import { type PageEndPoint } from "./types/PageEndPoint";
-import { type PageEvent } from "./types/PageEvent";
-import { type PageServerEndPoint } from "./types/PageServerEndPoint";
-import { type ServerEndPoint } from "./types/ServerEndPoint";
-import { type ServerEvent } from "./types/ServerEvent";
-import { type ServerHook } from "./types/ServerHook";
-import { type UserConfig } from "./types/UserConfig";
+import type CookieHelper from "./types/CookieHelper";
+import type PageEndPoint from "./types/PageEndPoint";
+import type PageEvent from "./types/PageEvent";
+import type PageServerAction from "./types/PageServerAction";
+import type PageServerEndPoint from "./types/PageServerEndPoint";
+import type PageServerLoad from "./types/PageServerLoad";
+import type ServerEndPoint from "./types/ServerEndPoint";
+import type ServerEvent from "./types/ServerEvent";
+import type ServerHook from "./types/ServerHook";
+import type ServerRequest from "./types/ServerRequest";
+import type UserConfig from "./types/UserConfig";
 
 // NOTE: Do not export anything that relies on vinxi/vite from here, or it will
 // cause problems when they are re-imported when routes are lazily loaded
@@ -17,8 +21,12 @@ export type {
 	UserConfig,
 	PageEndPoint,
 	PageServerEndPoint,
+	PageServerLoad,
+	PageServerAction,
 	ServerEndPoint,
+	ServerRequest,
 	ServerHook,
 	PageEvent,
 	ServerEvent,
+	CookieHelper,
 };

package/src/site/clientEntry.ts

@@ -2,8 +2,8 @@ import { hydrate, mount } from "@torpor/view";
 import { type Component, type SlotRender } from "@torpor/view";
 import "vinxi/client";
 import $page from "../state/$page";
-import { type PageEndPoint } from "../types/PageEndPoint";
-import { type PageServerEndPoint } from "../types/PageServerEndPoint";
+import type PageEndPoint from "../types/PageEndPoint";
+import type PageServerEndPoint from "../types/PageServerEndPoint";
 import routeHandlers from "./routeHandlers";
 
 // Intercept clicks on links
@@ -43,7 +43,7 @@ async function navigate(
 	urlParams: URLSearchParams,
 	firstTime = false,
 ): Promise<boolean> {
-	console.log("navigating client to", path, "with", urlParams.toString());
+	console.log("navigating client to", path, urlParams.size ? `with ${urlParams}` : "");
 
 	const parent = document.getElementById("app");
 	if (!parent) {
@@ -146,6 +146,7 @@ async function navigate(
 		} catch (error) {
 			// TODO: Show a proper Error component
 			parent.innerHTML = '<span style="color: red">Script syntax error</span><p>' + error + "</p>";
+			console.log(error);
 		}
 	}
 

package/src/site/defineConfig.ts

@@ -2,7 +2,7 @@ import torpor from "@torpor/unplugin/vite";
 import path from "node:path";
 import { type AppOptions, type RouterSchemaInput, createApp } from "vinxi";
 import { config } from "vinxi/plugins/config";
-import { type UserConfig } from "../types/UserConfig";
+import type UserConfig from "../types/UserConfig";
 import FileSystemRouter from "./FileSystemRouter";
 
 export default function defineConfig(options?: UserConfig) {

package/src/site/routeHandlers.ts

@@ -1,8 +1,8 @@
 import { getManifest } from "vinxi/manifest";
 import fileRoutes, { type RouteModule } from "vinxi/routes";
-import { type RouteHandler } from "../types/RouteHandler";
-import { type RouteHandlerCollection } from "../types/RouteHandlerCollection";
-import { type RouteLayoutHandler } from "../types/RouteLayoutHandler";
+import type RouteHandler from "../types/RouteHandler";
+import type RouteHandlerCollection from "../types/RouteHandlerCollection";
+import type RouteLayoutHandler from "../types/RouteLayoutHandler";
 import lazyRoute from "./lazyRoute";
 
 const clientManifest = getManifest("client");
@@ -16,20 +16,34 @@ const routeHandlers: RouteHandlerCollection = {
 			return {
 				...route,
 				regex: pathToRegExp(route.path),
-				order: /\[([^\/]+?)\]/.test(route.path) ? 1 : 0,
 				// TODO: Implement the rest of the lazyRoute stuff from vinxi/react or vinxi/solid
 				endPoint: lazyRoute(route.$handler, clientManifest, serverManifest),
 				loaded: false,
 			};
 		})
-		.sort((a, b) => a.order - b.order),
+		.sort((a, b) => {
+			// Sort [param]s after paths
+			// There might be a quicker/easier way to do this
+			for (let i = 0; i < Math.min(a.path.length, b.path.length); i++) {
+				if (a.path[i] === "[" && b.path[i] !== "[") {
+					return 1;
+				} else if (b.path[i] === "[" && a.path[i] !== "[") {
+					return -1;
+				} else if (a.path[i] === b.path[i]) {
+					// Keep going...
+				} else {
+					return a.path[i].localeCompare(b.path[i]);
+				}
+			}
+			return a.path.length - b.path.length;
+		}),
 	match(path, urlParams) {
-		console.log("matching", path);
-
 		// TODO: Lots of testing etc
 		for (let handler of (this as RouteHandlerCollection).handlers) {
 			let match = path.match(handler.regex);
 			if (match) {
+				console.log(`matching ${path}, found ${handler.path}`);
+
 				// Lazy load server endpoints and layouts
 				// Partly because it makes sense to do it here, but also because
 				// it doesn't work if we try to do it upfront for some reason
@@ -45,10 +59,7 @@ const routeHandlers: RouteHandlerCollection = {
 			}
 		}
 
-		console.log("not found");
-		//for (let handler of (this as RouteHandlerCollection).handlers) {
-		//	console.log("  have", handler.path, handler.regex);
-		//}
+		console.log(`matching ${path}, not found`);
 	},
 };
 

package/src/site/serverEntry.ts

@@ -10,12 +10,12 @@ import ok from "../response/ok";
 import seeOther from "../response/seeOther";
 import serverError from "../response/serverError";
 import $page from "../state/$page";
-import { type PageEndPoint } from "../types/PageEndPoint";
-import { type PageServerEndPoint } from "../types/PageServerEndPoint";
-import { type RouteHandler } from "../types/RouteHandler";
-import { type ServerEndPoint } from "../types/ServerEndPoint";
-import { type ServerEvent } from "../types/ServerEvent";
-import { type ServerHook } from "../types/ServerHook";
+import type PageEndPoint from "../types/PageEndPoint";
+import type PageServerEndPoint from "../types/PageServerEndPoint";
+import type RouteHandler from "../types/RouteHandler";
+import type ServerEndPoint from "../types/ServerEndPoint";
+import type ServerEvent from "../types/ServerEvent";
+import type ServerHook from "../types/ServerHook";
 import routeHandlers from "./routeHandlers";
 
 let printedRoutes = false;
@@ -26,17 +26,17 @@ export default eventHandler(async (event) => {
 
 	const searchParams = url.searchParams;
 
-	console.log("handling server", event.method, "for", path, "with", searchParams);
+	console.log(
+		"handling server",
+		event.method,
+		"for",
+		path,
+		searchParams.size ? `with ${searchParams}` : "",
+	);
 
 	if (!printedRoutes) {
 		printedRoutes = true;
-		console.log(
-			"routes:\n  " +
-				routeHandlers.handlers
-					.map((h) => h.path)
-					.sort()
-					.join("\n  "),
-		);
+		console.log("routes:\n  " + routeHandlers.handlers.map((h) => h.path).join("\n  "));
 	}
 
 	const route = routeHandlers.match(path, searchParams);
@@ -235,6 +235,7 @@ async function loadView(
 	} catch (error) {
 		// TODO: Show a proper Error component
 		componentCode = '<span style="color: red">Script syntax error</span><p>' + error + "</p>";
+		console.log(error);
 	}
 
 	// Put it all together

package/src/types/CookieHelper.ts

@@ -1,7 +1,8 @@
 import { type CookieSerializeOptions } from "vinxi/http";
 
-export type CookieHelper = {
+type CookieHelper = {
 	get: (name: string) => string | undefined;
 	set: (name: string, value: string, options?: CookieSerializeOptions) => void;
 	delete: (name: string, options?: CookieSerializeOptions) => void;
 };
+export default CookieHelper;

package/src/types/PageEndPoint.ts

@@ -1,10 +1,10 @@
 import { type Component } from "@torpor/view";
-import { type PageEvent } from "./PageEvent";
+import type PageEvent from "./PageEvent";
 
 /**
  * For +page.
  */
-export type PageEndPoint = {
+type PageEndPoint = {
 	/**
 	 * Builds the route path for the page in a type-safe manner.
 	 * TODO: Not sure this is actually the best way to do it...
@@ -24,6 +24,7 @@ export type PageEndPoint = {
 	 */
 	head?: HeadElement[] | ((event: PageEvent) => HeadElement[]);
 };
+export default PageEndPoint;
 
 type HeadElement = TitleElement | MetaElement;
 

package/src/types/PageEvent.ts

@@ -1,4 +1,4 @@
-export type PageEvent = {
+type PageEvent = {
 	/**
 	 * The URL for the server function.
 	 */
@@ -12,3 +12,4 @@ export type PageEvent = {
 	 */
 	data: Record<string, any>;
 };
+export default PageEvent;

package/src/types/PageServerAction.ts

@@ -0,0 +1,4 @@
+import type ServerEvent from "./ServerEvent";
+
+type PageServerAction = (event: ServerEvent) => Response | Promise<Response | undefined> | void;
+export default PageServerAction;

package/src/types/PageServerEndPoint.ts

@@ -1,18 +1,17 @@
-import { type ServerEvent } from "./ServerEvent";
+import type PageServerAction from "./PageServerAction";
+import type PageServerLoad from "./PageServerLoad";
 
 /**
  * For +page.server.
  */
-export type PageServerEndPoint = {
+type PageServerEndPoint = {
 	/**
 	 * Loads data from the server for a page.
 	 */
-	load?: ServerLoad;
+	load?: PageServerLoad;
 	/**
 	 * A map of actions that can be performed on the server for a page, generally from a form submit.
 	 */
-	actions?: Record<string, ServerAction>;
+	actions?: Record<string, PageServerAction>;
 };
-
-type ServerLoad = (event: ServerEvent) => Response | Promise<Response | undefined> | void;
-type ServerAction = (event: ServerEvent) => Response | Promise<Response | undefined> | void;
+export default PageServerEndPoint;

package/src/types/PageServerLoad.ts

@@ -0,0 +1,4 @@
+import type ServerEvent from "./ServerEvent";
+
+type PageServerLoad = (event: ServerEvent) => Response | Promise<Response | undefined> | void;
+export default PageServerLoad;

package/src/types/RouteHandler.ts

@@ -1,6 +1,6 @@
-import { type RouteLayoutHandler } from "./RouteLayoutHandler";
+import type RouteLayoutHandler from "./RouteLayoutHandler";
 
-export type RouteHandler = {
+type RouteHandler = {
 	path: string;
 	regex: RegExp;
 	endPoint: Promise<any>;
@@ -10,3 +10,4 @@ export type RouteHandler = {
 	serverEndPoint?: Promise<any>;
 	serverHook?: Promise<any>;
 };
+export default RouteHandler;

package/src/types/RouteHandlerCollection.ts

@@ -1,7 +1,8 @@
-import { type RouteHandler } from "./RouteHandler";
-import { type RouteMatchResult } from "./RouteMatchResult";
+import type RouteHandler from "./RouteHandler";
+import type RouteMatchResult from "./RouteMatchResult";
 
-export type RouteHandlerCollection = {
+type RouteHandlerCollection = {
 	handlers: RouteHandler[];
 	match(path: string, urlParams?: URLSearchParams): RouteMatchResult | undefined;
 };
+export default RouteHandlerCollection;

package/src/types/RouteLayoutHandler.ts

@@ -1,5 +1,6 @@
-export type RouteLayoutHandler = {
+type RouteLayoutHandler = {
 	path: string;
 	endPoint: Promise<any>;
 	serverEndPoint?: Promise<any>;
 };
+export default RouteLayoutHandler;

package/src/types/RouteMatchResult.ts

@@ -1,7 +1,8 @@
-import { type RouteHandler } from "./RouteHandler";
+import type RouteHandler from "./RouteHandler";
 
-export type RouteMatchResult = {
+type RouteMatchResult = {
 	handler: RouteHandler;
 	routeParams?: Record<string, string>;
 	urlParams?: Record<string, string>;
 };
+export default RouteMatchResult;

package/src/types/ServerEndPoint.ts

@@ -1,37 +1,36 @@
-import { type ServerEvent } from "./ServerEvent";
+import type ServerRequest from "./ServerRequest";
 
 /**
  * For +server.
  */
-export type ServerEndPoint = { [key: string]: ServerRequest } & {
+type ServerEndPoint = { [key: string]: ServerRequest } & {
 	/**
 	 * Performs a GET.
 	 */
 	get?: ServerRequest;
 	/**
-	 * Perfroms a POST.
+	 * Performs a POST.
 	 */
 	post?: ServerRequest;
 	/**
-	 * Perfroms a PATCH.
+	 * Performs a PATCH.
 	 */
 	patch?: ServerRequest;
 	/**
-	 * Perfroms a PUT.
+	 * Performs a PUT.
 	 */
 	put?: ServerRequest;
 	/**
-	 * Perfroms a DELETE.
+	 * Performs a DELETE.
 	 */
 	del?: ServerRequest;
 	/**
-	 * Perfroms an OPTIONS request.
+	 * Performs an OPTIONS request.
 	 */
 	options?: ServerRequest;
 	/**
-	 * Perfroms a HEAD request.
+	 * Performs a HEAD request.
 	 */
 	head?: ServerRequest;
 };
-
-type ServerRequest = (event: ServerEvent) => Response | Promise<Response | undefined> | void;
+export default ServerEndPoint;

package/src/types/ServerEvent.ts

@@ -1,7 +1,7 @@
 import { ServerResponse } from "node:http";
-import { type CookieHelper } from "./CookieHelper";
+import CookieHelper from "./CookieHelper";
 
-export type ServerEvent = {
+type ServerEvent = {
 	/**
 	 * The URL for the server function.
 	 */
@@ -25,3 +25,4 @@ export type ServerEvent = {
 	 */
 	cookies: CookieHelper;
 };
+export default ServerEvent;

package/src/types/ServerHook.ts

@@ -1,13 +1,14 @@
-import { type ServerEvent } from "./ServerEvent";
+import type ServerEvent from "./ServerEvent";
 
 /**
  * For _hook.server.
  */
-export type ServerHook = {
+type ServerHook = {
 	/**
 	 * Called on each server request.
 	 */
 	handle?: ServerLoad;
 };
+export default ServerHook;
 
 type ServerLoad = (event: ServerEvent) => Promise<void> | void;

package/src/types/ServerRequest.ts

@@ -0,0 +1,4 @@
+import type ServerEvent from "./ServerEvent";
+
+type ServerRequest = (event: ServerEvent) => Response | Promise<Response | undefined> | void;
+export default ServerRequest;

package/src/types/UserConfig.ts

@@ -1,3 +1,4 @@
-export type UserConfig = {
+type UserConfig = {
 	port?: number;
 };
+export default UserConfig;