clear-router 2.6.2 → 2.6.4

package/dist/index.d.mts

@@ -20,6 +20,11 @@ type ControllerAction = 'index' | 'show' | 'create' | 'update' | 'destroy';
 type RequestData = Record<string, any>;
 type ApiResourceMiddleware<M = any> = M | M[] | { [K in ControllerAction]?: M | M[] };
 interface RouterConfig {
+  /**
+   * When enabled, API param name will be infered from the route path.
+   * So instead of getting /api/users/:id, we will now get /api/users/:user
+   */
+  inferParamName?: boolean;
   /**
    * Configuration for method override functionality, allowing clients to use a
    * specific header or body parameter to override the HTTP method.
@@ -239,6 +244,19 @@ declare abstract class CoreRouter {
   private static readonly pluginArgumentResolversKey;
   private static requestProvider?;
   private static responseProvider?;
+  static config: RouterConfig;
+  protected static groupContext: AsyncLocalStorage<{
+    prefix: string;
+    groupMiddlewares: any[];
+  }>;
+  protected static pluginRequestContext: AsyncLocalStorage<ClearRouterPluginRequestContext>;
+  static routes: Set<Route<any, any, any>>;
+  static routesByPathMethod: Map<string, Route<any, any, any>>;
+  static routesByMethod: Map<"GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "OPTIONS" | "HEAD", Route<any, any, any>[]>;
+  static routesByName: Map<string, Route<any, any, any>>;
+  static prefix: string;
+  static groupMiddlewares: any[];
+  static globalMiddlewares: any[];
   /**
    * Resets the router to it's default state
    */
@@ -257,17 +275,16 @@ declare abstract class CoreRouter {
       prefix: string;
       groupMiddlewares: any[];
     }>;
-    routes: Array<Route<any, any, any>>;
-    routesByPathMethod: Record<string, Route<any, any, any>>;
-    routesByMethod: { [method in Uppercase<HttpMethod>]?: Array<Route<any, any, any>> };
-    routesByName: Record<string, Route<any, any, any>>;
+    routes: Set<never>;
+    routesByPathMethod: Map<any, any>;
+    routesByMethod: Map<any, any>;
+    routesByName: Map<any, any>;
     prefix: string;
     groupMiddlewares: any[];
     globalMiddlewares: any[];
   };
   protected static bindStateAccessors(): void;
   protected static createDefaultOptionsHandler(): any;
-  static config: RouterConfig;
   static configureDefaults(options?: RouterConfig): void;
   /**
    * Use a registered plugin
@@ -279,18 +296,6 @@ declare abstract class CoreRouter {
    */
   static use<Options = any>(plugin: ClearRouterPluginInput<Options>, options?: Options): Promise<void>;
   protected static pluginsReady(): Promise<void>;
-  protected static groupContext: AsyncLocalStorage<{
-    prefix: string;
-    groupMiddlewares: any[];
-  }>;
-  protected static pluginRequestContext: AsyncLocalStorage<ClearRouterPluginRequestContext>;
-  static routes: Array<Route<any, any, any>>;
-  static routesByPathMethod: Record<string, Route<any, any, any>>;
-  static routesByMethod: { [method in Uppercase<HttpMethod>]?: Array<Route<any, any, any>> };
-  static routesByName: Record<string, Route<any, any, any>>;
-  static prefix: string;
-  static groupMiddlewares: any[];
-  static globalMiddlewares: any[];
   protected static getCurrentPluginRequestContext(): ClearRouterPluginRequestContext | undefined;
   protected static createPluginRequestContext(ctx: any): ClearRouterPluginRequestContext;
   protected static createPluginBind(): PluginBind;
@@ -455,6 +460,7 @@ declare abstract class CoreRouter {
    * @param provider
    */
   static setResponseProvider(provider: typeof Response$1): void;
+  private static hasPackageInstalled;
   /**
    * Provide a class that will overide the base Response instance
    *

package/dist/index.mjs

@@ -1,3 +1,4 @@
+import { createRequire } from "node:module";
 import { AsyncLocalStorage } from "node:async_hooks";
 
 //#region src/ClearRequest.ts
@@ -300,21 +301,43 @@ var CoreRouter = class {
 	static pluginArgumentResolversKey = Symbol.for("clear-router:plugin-argument-resolvers");
 	static requestProvider;
 	static responseProvider;
+	static config = {
+		inferParamName: false,
+		methodOverride: {
+			enabled: true,
+			bodyKeys: ["_method"],
+			headerKeys: ["x-http-method"]
+		},
+		container: {
+			enabled: false,
+			autoDiscover: false
+		}
+	};
+	static groupContext = new AsyncLocalStorage();
+	static pluginRequestContext = new AsyncLocalStorage();
+	static routes = /* @__PURE__ */ new Set([]);
+	static routesByPathMethod = /* @__PURE__ */ new Map();
+	static routesByMethod = /* @__PURE__ */ new Map();
+	static routesByName = /* @__PURE__ */ new Map();
+	static prefix = "";
+	static groupMiddlewares = [];
+	static globalMiddlewares = [];
 	/**
 	* Resets the router to it's default state
 	*/
 	static reset() {
-		this.routes = [];
+		this.routes.clear();
 		this.prefix = "";
 		this.groupMiddlewares = [];
 		this.globalMiddlewares = [];
-		this.routesByPathMethod = {};
-		this.routesByMethod = {};
-		this.routesByName = {};
+		this.routesByPathMethod.clear();
+		this.routesByMethod.clear();
+		this.routesByName.clear();
 		return this;
 	}
 	static createBaseConfig() {
 		return {
+			inferParamName: false,
 			methodOverride: {
 				enabled: true,
 				bodyKeys: ["_method"],
@@ -342,6 +365,7 @@ var CoreRouter = class {
 		const g = globalThis;
 		if (!g[this.defaultConfigKey]) g[this.defaultConfigKey] = this.createBaseConfig();
 		return {
+			inferParamName: g[this.defaultConfigKey].inferParamName,
 			methodOverride: { ...g[this.defaultConfigKey].methodOverride },
 			container: { ...g[this.defaultConfigKey].container }
 		};
@@ -373,10 +397,10 @@ var CoreRouter = class {
 		return {
 			config: this.getDefaultConfig(),
 			groupContext: new AsyncLocalStorage(),
-			routes: [],
-			routesByPathMethod: {},
-			routesByMethod: {},
-			routesByName: {},
+			routes: /* @__PURE__ */ new Set([]),
+			routesByPathMethod: /* @__PURE__ */ new Map(),
+			routesByMethod: /* @__PURE__ */ new Map(),
+			routesByName: /* @__PURE__ */ new Map(),
 			prefix: "",
 			groupMiddlewares: [],
 			globalMiddlewares: []
@@ -450,17 +474,6 @@ var CoreRouter = class {
 			}
 		};
 	}
-	static config = {
-		methodOverride: {
-			enabled: true,
-			bodyKeys: ["_method"],
-			headerKeys: ["x-http-method"]
-		},
-		container: {
-			enabled: false,
-			autoDiscover: false
-		}
-	};
 	static configureDefaults(options) {
 		const g = globalThis;
 		const defaults = this.mergeConfig(g[this.defaultConfigKey] || this.createBaseConfig(), options);
@@ -521,15 +534,6 @@ var CoreRouter = class {
 		if (!pending.length) return;
 		await Promise.all(pending);
 	}
-	static groupContext = new AsyncLocalStorage();
-	static pluginRequestContext = new AsyncLocalStorage();
-	static routes = [];
-	static routesByPathMethod = {};
-	static routesByMethod = {};
-	static routesByName = {};
-	static prefix = "";
-	static groupMiddlewares = [];
-	static globalMiddlewares = [];
 	static getCurrentPluginRequestContext() {
 		return this.pluginRequestContext.getStore();
 	}
@@ -575,10 +579,10 @@ var CoreRouter = class {
 			headerKeys: ["x-http-method"]
 		} };
 		if (!this.groupContext) this.groupContext = new AsyncLocalStorage();
-		if (!Array.isArray(this.routes)) this.routes = [];
-		if (!this.routesByPathMethod || typeof this.routesByPathMethod !== "object") this.routesByPathMethod = {};
-		if (!this.routesByMethod || typeof this.routesByMethod !== "object") this.routesByMethod = {};
-		if (!this.routesByName || typeof this.routesByName !== "object") this.routesByName = {};
+		if (!this.routes || Array.isArray(this.routes)) this.routes = new Set(this.routes ?? []);
+		if (!this.routesByPathMethod) this.routesByPathMethod = /* @__PURE__ */ new Map();
+		if (!this.routesByMethod) this.routesByMethod = /* @__PURE__ */ new Map();
+		if (!this.routesByName) this.routesByName = /* @__PURE__ */ new Map();
 		if (typeof this.prefix !== "string") this.prefix = "";
 		if (!Array.isArray(this.groupMiddlewares)) this.groupMiddlewares = [];
 		if (!Array.isArray(this.globalMiddlewares)) this.globalMiddlewares = [];
@@ -649,13 +653,15 @@ var CoreRouter = class {
 			if (typeof container.enabled === "boolean") this.config.container.enabled = container.enabled;
 			if (typeof container.autoDiscover === "boolean") this.config.container.autoDiscover = container.autoDiscover;
 		}
+		if (options?.inferParamName) this.config.inferParamName = options?.inferParamName;
 		const override = options?.methodOverride;
-		if (!override) return;
-		if (typeof override.enabled === "boolean") this.config.methodOverride.enabled = override.enabled;
-		const bodyKeys = override.bodyKeys;
-		if (typeof bodyKeys !== "undefined") this.config.methodOverride.bodyKeys = (Array.isArray(bodyKeys) ? bodyKeys : [bodyKeys]).map((e) => String(e).trim()).filter(Boolean);
-		const headerKeys = override.headerKeys;
-		if (typeof headerKeys !== "undefined") this.config.methodOverride.headerKeys = (Array.isArray(headerKeys) ? headerKeys : [headerKeys]).map((e) => String(e).trim().toLowerCase()).filter(Boolean);
+		if (override) {
+			if (typeof override.enabled === "boolean") this.config.methodOverride.enabled = override.enabled;
+			const bodyKeys = override.bodyKeys;
+			if (typeof bodyKeys !== "undefined") this.config.methodOverride.bodyKeys = (Array.isArray(bodyKeys) ? bodyKeys : [bodyKeys]).map((e) => String(e).trim()).filter(Boolean);
+			const headerKeys = override.headerKeys;
+			if (typeof headerKeys !== "undefined") this.config.methodOverride.headerKeys = (Array.isArray(headerKeys) ? headerKeys : [headerKeys]).map((e) => String(e).trim().toLowerCase()).filter(Boolean);
+		}
 	}
 	static resolveMethodOverride(method, headers, body) {
 		this.ensureState();
@@ -717,16 +723,16 @@ var CoreRouter = class {
 			registrationPaths,
 			parameters,
 			onName: (name, route, previousName) => {
-				if (previousName && this.routesByName[previousName] === route) delete this.routesByName[previousName];
-				this.routesByName[name] = route;
+				if (previousName && this.routesByName.get(previousName) === route) this.routesByName.delete(previousName);
+				this.routesByName.set(name, route);
 			}
 		});
-		if (!methods.includes("options") && !this.routesByPathMethod[`OPTIONS ${fullPath}`]) this.options(path, this.createDefaultOptionsHandler());
-		this.routes.push(route);
+		if (!methods.includes("options") && !this.routesByPathMethod.get(`OPTIONS ${fullPath}`)) this.options(path, this.createDefaultOptionsHandler());
+		this.routes.add(route);
 		for (const method of methods.map((m) => m.toUpperCase())) {
-			this.routesByPathMethod[`${method} ${fullPath}`] = route;
-			if (!this.routesByMethod[method]) this.routesByMethod[method] = [];
-			this.routesByMethod[method].push(route);
+			this.routesByPathMethod.set(`${method} ${fullPath}`, route);
+			if (!this.routesByMethod.has(method)) this.routesByMethod.set(method, []);
+			this.routesByMethod.get(method)?.push(route);
 		}
 		return route;
 	}
@@ -739,6 +745,11 @@ var CoreRouter = class {
 	* @param options 
 	*/
 	static apiResource(basePath, controller, options) {
+		let paramName = "id";
+		if (!!this.config.inferParamName && this.hasPackageInstalled("@h3ravel/support")) {
+			const { str } = createRequire(import.meta.url)("@h3ravel/support");
+			paramName = str(basePath).singular().afterLast("/").toString();
+		}
 		const actions = {
 			index: {
 				method: "get",
@@ -746,7 +757,7 @@ var CoreRouter = class {
 			},
 			show: {
 				method: "get",
-				path: "/:id"
+				path: `/:${paramName}`
 			},
 			create: {
 				method: "post",
@@ -754,11 +765,11 @@ var CoreRouter = class {
 			},
 			update: {
 				method: "put",
-				path: "/:id"
+				path: `/:${paramName}`
 			},
 			destroy: {
 				method: "delete",
-				path: "/:id"
+				path: `/:${paramName}`
 			}
 		};
 		const only = options?.only || Object.keys(actions);
@@ -769,7 +780,8 @@ var CoreRouter = class {
 			if (typeof preController[action] === "function") {
 				const { method, path } = actions[action];
 				const actionMiddlewares = typeof options?.middlewares === "object" && !Array.isArray(options.middlewares) ? options.middlewares[action] : options?.middlewares;
-				this.add(method, `${basePath}${path}`, [controller, action], Array.isArray(actionMiddlewares) ? actionMiddlewares : actionMiddlewares ? [actionMiddlewares] : void 0);
+				const name = `${basePath}${path}`.replace(/\/:[^/]+|\/\{[^}]+\}/g, "").replace(/\{(\w+):[^}]+\}/g, "$1").replace(/\/|:|[{}]/g, ".").replace(/\.{2,}/g, ".").replace(/^\.|\.$/g, "");
+				this.add(method, `${basePath}${path}`, [controller, action], Array.isArray(actionMiddlewares) ? actionMiddlewares : actionMiddlewares ? [actionMiddlewares] : void 0).name(name + "." + action.toLowerCase());
 			}
 		}
 	}
@@ -888,14 +900,14 @@ var CoreRouter = class {
 	}
 	static allRoutes(type) {
 		this.ensureState();
-		if (type === "method") return this.routesByMethod;
-		if (type === "path") return this.routesByPathMethod;
-		if (type === "name") return this.routesByName;
-		return this.routes.filter((e) => e.methods.length > 1 || e.methods[0] !== "options");
+		if (type === "method") return Object.fromEntries(this.routesByMethod.entries());
+		if (type === "path") return Object.fromEntries(this.routesByPathMethod.entries());
+		if (type === "name") return Object.fromEntries(this.routesByName.entries());
+		return Array.from(this.routes).filter((e) => e.methods.length > 1 || e.methods[0] !== "options");
 	}
 	static route(name) {
 		this.ensureState();
-		return this.routesByName[name];
+		return this.routesByName.get(name);
 	}
 	static url(name, params) {
 		return this.route(name)?.toPath(params);
@@ -916,6 +928,14 @@ var CoreRouter = class {
 	static setResponseProvider(provider) {
 		this.responseProvider = provider;
 	}
+	static hasPackageInstalled(name) {
+		try {
+			createRequire(import.meta.url).resolve(name, { paths: [process.cwd()] });
+			return true;
+		} catch {
+			return false;
+		}
+	}
 	static initializeInstance(provider, args) {
 		const isRequest = [
 			"CoreRequest",

package/dist/koa/index.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 require('../bindings-CLsZjOEy.cjs');
-const require_router = require('../router--8gWGXv-.cjs');
+const require_router = require('../router-dJWUSsg1.cjs');
 const require_responses = require('../responses-Bvnk0uvc.cjs');
 
 //#region src/koa/router.ts
@@ -184,7 +184,7 @@ var Router = class Router extends require_router.CoreRouter {
 	* @returns    The  @koa/router instance with the applied routes
 	*/
 	static apply(router) {
-		for (const route of this.routes) {
+		for (const route of Array.from(this.routes)) {
 			let handlerFunction = null;
 			let instance = null;
 			let bindingTarget;

package/dist/koa/index.d.cts

@@ -1,4 +1,4 @@
-import { F as ControllerAction, I as HttpMethod, P as ApiResourceMiddleware, _ as KoaRouterApp, g as HttpContext, h as Handler, m as Route, t as CoreRouter, v as Middleware } from "../router-Bu4kNHUo.cjs";
+import { F as ControllerAction, I as HttpMethod, P as ApiResourceMiddleware, _ as KoaRouterApp, g as HttpContext, h as Handler, m as Route, t as CoreRouter, v as Middleware } from "../router-BITqScD_.cjs";
 
 //#region src/koa/router.d.ts
 /**

package/dist/koa/index.d.mts

@@ -1,4 +1,4 @@
-import { F as ControllerAction, I as HttpMethod, P as ApiResourceMiddleware, _ as KoaRouterApp, g as HttpContext, h as Handler, m as Route, t as CoreRouter, v as Middleware } from "../router-awXi28kb.mjs";
+import { F as ControllerAction, I as HttpMethod, P as ApiResourceMiddleware, _ as KoaRouterApp, g as HttpContext, h as Handler, m as Route, t as CoreRouter, v as Middleware } from "../router-Cs8cC5zd.mjs";
 
 //#region src/koa/router.d.ts
 /**

package/dist/koa/index.mjs

@@ -1,5 +1,5 @@
 import "../bindings-XLDXFpHZ.mjs";
-import { t as CoreRouter } from "../router-DgZmT-17.mjs";
+import { t as CoreRouter } from "../router-BM24N08q.mjs";
 import { n as resolveResponseMeta, t as isFetchResponse } from "../responses-BvETUeDL.mjs";
 
 //#region src/koa/router.ts
@@ -183,7 +183,7 @@ var Router = class Router extends CoreRouter {
 	* @returns    The  @koa/router instance with the applied routes
 	*/
 	static apply(router) {
-		for (const route of this.routes) {
+		for (const route of Array.from(this.routes)) {
 			let handlerFunction = null;
 			let instance = null;
 			let bindingTarget;

package/dist/{router-Bu4kNHUo.d.cts → router-BITqScD_.d.cts}

@@ -49,6 +49,11 @@ type ControllerAction = 'index' | 'show' | 'create' | 'update' | 'destroy';
 type RequestData = Record<string, any>;
 type ApiResourceMiddleware<M = any> = M | M[] | { [K in ControllerAction]?: M | M[] };
 interface RouterConfig {
+  /**
+   * When enabled, API param name will be infered from the route path.
+   * So instead of getting /api/users/:id, we will now get /api/users/:user
+   */
+  inferParamName?: boolean;
   /**
    * Configuration for method override functionality, allowing clients to use a
    * specific header or body parameter to override the HTTP method.
@@ -326,6 +331,19 @@ declare abstract class CoreRouter {
   private static readonly pluginArgumentResolversKey;
   private static requestProvider?;
   private static responseProvider?;
+  static config: RouterConfig;
+  protected static groupContext: AsyncLocalStorage<{
+    prefix: string;
+    groupMiddlewares: any[];
+  }>;
+  protected static pluginRequestContext: AsyncLocalStorage<ClearRouterPluginRequestContext>;
+  static routes: Set<Route<any, any, any>>;
+  static routesByPathMethod: Map<string, Route<any, any, any>>;
+  static routesByMethod: Map<"GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "OPTIONS" | "HEAD", Route<any, any, any>[]>;
+  static routesByName: Map<string, Route<any, any, any>>;
+  static prefix: string;
+  static groupMiddlewares: any[];
+  static globalMiddlewares: any[];
   /**
    * Resets the router to it's default state
    */
@@ -344,17 +362,16 @@ declare abstract class CoreRouter {
       prefix: string;
       groupMiddlewares: any[];
     }>;
-    routes: Array<Route<any, any, any>>;
-    routesByPathMethod: Record<string, Route<any, any, any>>;
-    routesByMethod: { [method in Uppercase<HttpMethod>]?: Array<Route<any, any, any>> };
-    routesByName: Record<string, Route<any, any, any>>;
+    routes: Set<never>;
+    routesByPathMethod: Map<any, any>;
+    routesByMethod: Map<any, any>;
+    routesByName: Map<any, any>;
     prefix: string;
     groupMiddlewares: any[];
     globalMiddlewares: any[];
   };
   protected static bindStateAccessors(): void;
   protected static createDefaultOptionsHandler(): any;
-  static config: RouterConfig;
   static configureDefaults(options?: RouterConfig): void;
   /**
    * Use a registered plugin
@@ -366,18 +383,6 @@ declare abstract class CoreRouter {
    */
   static use<Options = any>(plugin: ClearRouterPluginInput<Options>, options?: Options): Promise<void>;
   protected static pluginsReady(): Promise<void>;
-  protected static groupContext: AsyncLocalStorage<{
-    prefix: string;
-    groupMiddlewares: any[];
-  }>;
-  protected static pluginRequestContext: AsyncLocalStorage<ClearRouterPluginRequestContext>;
-  static routes: Array<Route<any, any, any>>;
-  static routesByPathMethod: Record<string, Route<any, any, any>>;
-  static routesByMethod: { [method in Uppercase<HttpMethod>]?: Array<Route<any, any, any>> };
-  static routesByName: Record<string, Route<any, any, any>>;
-  static prefix: string;
-  static groupMiddlewares: any[];
-  static globalMiddlewares: any[];
   protected static getCurrentPluginRequestContext(): ClearRouterPluginRequestContext | undefined;
   protected static createPluginRequestContext(ctx: any): ClearRouterPluginRequestContext;
   protected static createPluginBind(): PluginBind;
@@ -542,6 +547,7 @@ declare abstract class CoreRouter {
    * @param provider
    */
   static setResponseProvider(provider: typeof Response$2): void;
+  private static hasPackageInstalled;
   /**
    * Provide a class that will overide the base Response instance
    *