maxserver 0.8.2 → 0.8.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "maxserver",
-	"version": "0.8.2",
+	"version": "0.8.3",
 	"description": "Node server setup based fastify",
 	"author": "Max Matinpalo",
 	"type": "module",

package/src/setupDocs.js

@@ -2,37 +2,6 @@ import swagger from "@fastify/swagger";
 import apiReference from "@scalar/fastify-api-reference";
 
 
-/*
-const schema = {
-	summary: "OpenAPI Specification",
-	description: "Returns the full OpenAPI 3.0 specification.",
-	tags: ["Docs"],
-	response: {
-		200: {
-			type: "object",
-			additionalProperties: true,
-			required: ["openapi", "info", "paths"],
-			properties: {
-				openapi: { type: "string", example: "3.0.3" },
-				info: {
-					type: "object",
-					required: ["title", "version"],
-					properties: {
-						title: { type: "string", example: "API" },
-						version: { type: "string", example: "1.0.0" }
-					}
-				},
-				paths: { type: "object", example: {} }
-			}
-		}
-	}
-};
-*/
-
-
-
-
-
 export async function setupDocs(app) {
 
 	const info = app.maxserver.openapiInfo || {
@@ -76,7 +45,7 @@ export async function setupDocs(app) {
 				persistAuth: true,
 				showDeveloperTools: "never",
 				//"expandAllModelSections": true,
-				operationsSorter: "alpha",
+				// operationsSorter: "alpha",
 				orderSchemaPropertiesBy: "preserve",
 				metaData: {
 					title: "API Docs 👨‍💻",

package/src/setupRoutes.js

@@ -54,64 +54,77 @@ function getRoute(file) {
 	};
 }
 
-/**
- * Safe dynamic import for ESM.
- */
-async function importDefault(file) {
-	return (await import(pathToFileURL(file).href)).default;
-}
-
 export async function setupRoutes(app) {
 	const root = path.resolve(app.maxserver.routesDir || "src");
 	const files = walk(root);
 
-	// 1. Pass One: Register Global Schemas (Lonely .schema.js files)
+	// 1. Pass One: Register Named Exports Globally
+	const globals = new Map();
 	for (const file of files) {
-		// Only process if no matching handler file exists
-		if (file.endsWith(".schema.js") && !fs.existsSync(file.replace(".schema.js", ".js"))) {
-			const mod = await import(pathToFileURL(file).href);
+		if (file.endsWith(".schema.js")) continue;
 
-			// Register default export + all named exports if they have an $id
-			for (const schema of Object.values(mod))
-				if (schema?.$id) app.addSchema(schema);
+		const mod = await import(pathToFileURL(file).href);
+		for (const [key, val] of Object.entries(mod)) {
+			if (key === "default" || key.startsWith("autoregister_")) continue;
+
+			if (globals.has(key)) {
+				console.error("\n❌ Global Identifier Conflict!");
+				console.error(`The export "${key}" is defined in multiple files:`);
+				console.error(`  -> ${globals.get(key)}`);
+				console.error(`  -> ${file}\n`);
+				throw new Error(`Duplicate global identifier "${key}"`);
+			}
+
+			globals.set(key, file);
+			global[key] = val;
 		}
 	}
 
-	// 2. Pass Two: Auto-register hooks
+	// 2. Pass Two: Register Global Schemas (Lonely .schema.js files)
 	for (const file of files) {
+		const isLonely = file.endsWith(".schema.js") &&
+			!fs.existsSync(file.replace(".schema.js", ".js"));
+
+		if (!isLonely) continue;
+
+		const mod = await import(pathToFileURL(file).href);
+		for (const schema of Object.values(mod))
+			if (schema?.$id) app.addSchema(schema);
+	}
+
+	// 3. Pass Three: Auto-register hooks
+	for (const file of files) {
+		if (file.endsWith(".schema.js")) continue;
+
 		const mod = await import(pathToFileURL(file).href);
 		for (const [key, fn] of Object.entries(mod))
 			if (key.startsWith("autoregister_") && typeof fn === "function") await fn(app);
 	}
 
-	// 3. Pass Three: Register Routes
-	const seen = new Map();
+	// 4. Pass Four: Collect and Group Routes by Directory
+	const groups = new Map();
 	for (const file of files) {
 		if (file.endsWith(".schema.js")) continue;
 
 		const info = getRoute(file);
 		if (!info) continue;
 
-		const key = `${info.method} ${info.url}`;
-		if (seen.has(key)) throw new Error(`Duplicate route "${key}" detected.`);
-		seen.set(key, file);
-
-		const handler = await importDefault(file);
+		const mod = await import(pathToFileURL(file).href);
+		const handler = mod.default;
 		if (typeof handler !== "function") {
-			throw new Error(`Route "${key}" in "${file}" must export a default function.`);
+			throw new Error(`Route in "${file}" must export a default function.`);
 		}
 
 		const schemaFile = file.replace(/\.js$/, ".schema.js");
 		let raw = {};
 
 		if (fs.existsSync(schemaFile)) {
-			const loaded = await importDefault(schemaFile);
+			const loaded = (await import(pathToFileURL(schemaFile).href)).default;
 			if (loaded && typeof loaded === "object") raw = loaded;
 		}
 
-		let { auth, routeOptions = {}, ...schema } = raw;
+		let { auth, order = 999, routeOptions = {}, ...schema } = raw;
 
-		// Inject 'auth' config for the global authentication hook
 		if (auth !== undefined) {
 			routeOptions = {
 				...routeOptions,
@@ -119,6 +132,33 @@ export async function setupRoutes(app) {
 			};
 		}
 
-		app[info.method](info.url, { ...routeOptions, schema }, handler);
+		const dir = path.dirname(file);
+		if (!groups.has(dir)) groups.set(dir, []);
+
+		groups.get(dir).push({
+			method: info.method,
+			url: info.url,
+			options: { ...routeOptions, schema },
+			handler,
+			order,
+			file
+		});
+	}
+
+	// Sort routes locally within each directory
+	const routes = [];
+	for (const list of groups.values()) {
+		list.sort((a, b) => a.order - b.order);
+		routes.push(...list);
+	}
+
+	// 5. Pass Five: Register Sorted Routes
+	const seen = new Map();
+	for (const r of routes) {
+		const key = `${r.method} ${r.url}`;
+		if (seen.has(key)) throw new Error(`Duplicate route "${key}" detected.`);
+		seen.set(key, r.file);
+
+		app[r.method](r.url, r.options, r.handler);
 	}
 }

package/templates/ai/BASE

@@ -0,0 +1,2 @@
+@node
+@js

package/templates/package.json

@@ -9,20 +9,5 @@
 	},
 	"type": "module",
 	"private": "true",
-	"dependencies": {},
-	"keywords": [
-		"fastify",
-		"backend",
-		"framework",
-		"node-server",
-		"api-server",
-		"auto-routes",
-		"automatic-docs",
-		"scalar",
-		"openapi",
-		"jwt-auth",
-		"mongodb",
-		"minimalist",
-		"zero-boilerplate"
-	]
+	"dependencies": {}
 }