@eggjs/router 4.0.0-beta.18 → 4.0.0-beta.20

package/dist/Layer-Br45DupW.d.ts

@@ -0,0 +1,118 @@
+import { MiddlewareFunc, MiddlewareFuncWithParamProperty, ParamMiddlewareFunc } from "./types-DvonNcgV.js";
+import { Key } from "path-to-regexp";
+
+//#region src/Layer.d.ts
+interface LayerOptions {
+  prefix?: string;
+  /** route name */
+  name?: string;
+  /** case sensitive (default: false) */
+  sensitive?: boolean;
+  /** require the trailing slash (default: false) */
+  strict?: boolean;
+  ignoreCaptures?: boolean;
+  end?: boolean;
+}
+interface LayerURLOptions {
+  query?: string | object;
+}
+declare class Layer {
+  readonly opts: LayerOptions;
+  readonly name?: string;
+  readonly methods: string[];
+  readonly stack: MiddlewareFuncWithParamProperty[];
+  path: string | RegExp;
+  regexp: RegExp;
+  paramNames: Key[];
+  /**
+   * Initialize a new routing Layer with given `method`, `path`, and `middleware`.
+   *
+   * @param {String|RegExp} path Path string or regular expression.
+   * @param {Array} methods Array of HTTP verbs.
+   * @param {Array|Function} middlewares Layer callback/middleware or series of.
+   * @param {Object=} opts optional params
+   * @param {String=} opts.name route name
+   * @param {String=} opts.sensitive case sensitive (default: false)
+   * @param {String=} opts.strict require the trailing slash (default: false)
+   * @private
+   */
+  constructor(path: string | RegExp, methods: string[], middlewares: MiddlewareFunc | MiddlewareFunc[], opts?: LayerOptions | string);
+  /**
+   * Returns whether request `path` matches route.
+   *
+   * @param {String} path path string
+   * @return {Boolean} matched or not
+   * @private
+   */
+  match(path: string): boolean;
+  /**
+   * Returns map of URL parameters for given `path` and `paramNames`.
+   *
+   * @param {String} _path path string
+   * @param {Array.<String>} captures captures strings
+   * @param {Object=} [existingParams] existing params
+   * @return {Object} params object
+   * @private
+   */
+  params(_path: string, captures: Array<string>, existingParams?: Record<string, string>): Record<string, string>;
+  /**
+   * Returns array of regexp url path captures.
+   *
+   * @param {String} path path string
+   * @return {Array.<String>} captures strings
+   * @private
+   */
+  captures(path: string): Array<string>;
+  /**
+   * Generate URL for route using given `params`.
+   *
+   * @example
+   *
+   * ```javascript
+   * var route = new Layer(['GET'], '/users/:id', fn);
+   *
+   * route.url(123); // => "/users/123"
+   * route.url('123'); // => "/users/123"
+   * route.url({ id: 123 }); // => "/users/123"
+   * ```
+   *
+   * @param {Object} params url parameters
+   * @param {Object} paramsOrOptions optional parameters
+   * @return {String} url string
+   * @private
+   */
+  url(params?: string | number | object, ...paramsOrOptions: (string | number | object | LayerURLOptions)[]): string;
+  /**
+   * Run validations on route named parameters.
+   *
+   * @example
+   *
+   * ```javascript
+   * router
+   *   .param('user', function (id, ctx, next) {
+   *     ctx.user = users[id];
+   *     if (!user) return ctx.status = 404;
+   *     next();
+   *   })
+   *   .get('/users/:user', function (ctx, next) {
+   *     ctx.body = ctx.user;
+   *   });
+   * ```
+   *
+   * @param {String} param param string
+   * @param {Function} fn middleware function
+   * @return {Layer} layer instance
+   * @private
+   */
+  param(param: string, fn: ParamMiddlewareFunc): Layer;
+  /**
+   * Prefix route path.
+   *
+   * @param {String} prefix prefix string
+   * @return {Layer} layer instance
+   * @private
+   */
+  setPrefix(prefix: string): Layer;
+}
+//#endregion
+export { Layer, LayerOptions, LayerURLOptions };

package/dist/Layer-CPiRgFSm.js

@@ -0,0 +1,201 @@
+import { decodeURIComponent } from "utility";
+import { isGeneratorFunction } from "is-type-of";
+import { debuglog } from "node:util";
+import pathToRegExp from "path-to-regexp";
+import URI from "urijs";
+
+//#region src/Layer.ts
+const debug = debuglog("egg/router:Layer");
+var Layer = class {
+	opts;
+	name;
+	methods = [];
+	stack;
+	path;
+	regexp;
+	paramNames = [];
+	/**
+	* Initialize a new routing Layer with given `method`, `path`, and `middleware`.
+	*
+	* @param {String|RegExp} path Path string or regular expression.
+	* @param {Array} methods Array of HTTP verbs.
+	* @param {Array|Function} middlewares Layer callback/middleware or series of.
+	* @param {Object=} opts optional params
+	* @param {String=} opts.name route name
+	* @param {String=} opts.sensitive case sensitive (default: false)
+	* @param {String=} opts.strict require the trailing slash (default: false)
+	* @private
+	*/
+	constructor(path, methods, middlewares, opts) {
+		if (typeof opts === "string") opts = { name: opts };
+		this.opts = opts ?? {};
+		this.opts.prefix = this.opts.prefix ?? "";
+		this.name = this.opts.name;
+		this.stack = Array.isArray(middlewares) ? middlewares : [middlewares];
+		for (const method of methods) {
+			const l = this.methods.push(method.toUpperCase());
+			if (this.methods[l - 1] === "GET") this.methods.unshift("HEAD");
+		}
+		this.stack.forEach((fn) => {
+			const type = typeof fn;
+			if (type !== "function") throw new TypeError(methods.toString() + " `" + (this.opts.name || path) + "`: `middleware` must be a function, not `" + type + "`");
+			if (isGeneratorFunction(fn)) throw new TypeError(methods.toString() + " `" + (this.opts.name || path) + "`: Please use async function instead of generator function");
+		});
+		this.path = path;
+		this.regexp = pathToRegExp(path, this.paramNames, this.opts);
+		debug("defined route %s %s", this.methods, this.opts.prefix + this.path);
+	}
+	/**
+	* Returns whether request `path` matches route.
+	*
+	* @param {String} path path string
+	* @return {Boolean} matched or not
+	* @private
+	*/
+	match(path) {
+		return this.regexp.test(path);
+	}
+	/**
+	* Returns map of URL parameters for given `path` and `paramNames`.
+	*
+	* @param {String} _path path string
+	* @param {Array.<String>} captures captures strings
+	* @param {Object=} [existingParams] existing params
+	* @return {Object} params object
+	* @private
+	*/
+	params(_path, captures, existingParams) {
+		const params = existingParams ?? {};
+		for (let len = captures.length, i = 0; i < len; i++) {
+			const paramName = this.paramNames[i];
+			if (paramName) {
+				const c = captures[i];
+				params[paramName.name] = c ? decodeURIComponent(c) : c;
+			}
+		}
+		return params;
+	}
+	/**
+	* Returns array of regexp url path captures.
+	*
+	* @param {String} path path string
+	* @return {Array.<String>} captures strings
+	* @private
+	*/
+	captures(path) {
+		if (this.opts.ignoreCaptures) return [];
+		const m = path.match(this.regexp);
+		return m ? m.slice(1) : [];
+	}
+	/**
+	* Generate URL for route using given `params`.
+	*
+	* @example
+	*
+	* ```javascript
+	* var route = new Layer(['GET'], '/users/:id', fn);
+	*
+	* route.url(123); // => "/users/123"
+	* route.url('123'); // => "/users/123"
+	* route.url({ id: 123 }); // => "/users/123"
+	* ```
+	*
+	* @param {Object} params url parameters
+	* @param {Object} paramsOrOptions optional parameters
+	* @return {String} url string
+	* @private
+	*/
+	url(params, ...paramsOrOptions) {
+		let args = params;
+		const url = this.path.replace(/\(\.\*\)/g, "");
+		const toPath = pathToRegExp.compile(url);
+		let options;
+		if (params !== void 0 && typeof params !== "object") {
+			args = [params, ...paramsOrOptions];
+			if (Array.isArray(args)) {
+				const lastIndex = args.length - 1;
+				if (typeof args[lastIndex] === "object") {
+					options = args[lastIndex];
+					args = args.slice(0, lastIndex);
+				}
+			}
+		} else if (typeof params === "object") {
+			if (typeof paramsOrOptions[0] === "object" && "query" in paramsOrOptions[0]) options = paramsOrOptions[0];
+		}
+		const tokens = pathToRegExp.parse(url);
+		let replace = {};
+		if (Array.isArray(args)) for (let len = tokens.length, i = 0, j = 0; i < len; i++) {
+			const token = tokens[i];
+			if (typeof token === "object" && token.name) replace[token.name] = args[j++];
+		}
+		else if (tokens.some((token) => typeof token === "object" && token.name)) replace = params;
+		else options = params;
+		const replaced = toPath(replace);
+		if (options?.query) {
+			const urlObject = new URI(replaced);
+			urlObject.search(options.query);
+			return urlObject.toString();
+		}
+		return replaced;
+	}
+	/**
+	* Run validations on route named parameters.
+	*
+	* @example
+	*
+	* ```javascript
+	* router
+	*   .param('user', function (id, ctx, next) {
+	*     ctx.user = users[id];
+	*     if (!user) return ctx.status = 404;
+	*     next();
+	*   })
+	*   .get('/users/:user', function (ctx, next) {
+	*     ctx.body = ctx.user;
+	*   });
+	* ```
+	*
+	* @param {String} param param string
+	* @param {Function} fn middleware function
+	* @return {Layer} layer instance
+	* @private
+	*/
+	param(param, fn) {
+		const stack = this.stack;
+		const params = this.paramNames;
+		const middleware = function(ctx, next) {
+			return fn.call(this, ctx.params[param], ctx, next);
+		};
+		middleware.param = param;
+		const names = params.map((p) => {
+			return p.name;
+		});
+		const x = names.indexOf(param);
+		if (x > -1) stack.some(function(fn$1, i) {
+			if (!fn$1.param || names.indexOf(fn$1.param) > x) {
+				stack.splice(i, 0, middleware);
+				return true;
+			}
+			return false;
+		});
+		return this;
+	}
+	/**
+	* Prefix route path.
+	*
+	* @param {String} prefix prefix string
+	* @return {Layer} layer instance
+	* @private
+	*/
+	setPrefix(prefix) {
+		if (this.path) {
+			this.path = prefix + this.path;
+			this.paramNames = [];
+			this.regexp = pathToRegExp(this.path, this.paramNames, this.opts);
+		}
+		return this;
+	}
+};
+
+//#endregion
+export { Layer };

package/dist/Layer.d.ts

@@ -1,118 +1,3 @@
-import { MiddlewareFunc, MiddlewareFuncWithParamProperty, ParamMiddlewareFunc } from "./types.js";
-import { Key } from "path-to-regexp";
-
-//#region src/Layer.d.ts
-interface LayerOptions {
-  prefix?: string;
-  /** route name */
-  name?: string;
-  /** case sensitive (default: false) */
-  sensitive?: boolean;
-  /** require the trailing slash (default: false) */
-  strict?: boolean;
-  ignoreCaptures?: boolean;
-  end?: boolean;
-}
-interface LayerURLOptions {
-  query?: string | object;
-}
-declare class Layer {
-  readonly opts: LayerOptions;
-  readonly name?: string;
-  readonly methods: string[];
-  readonly stack: MiddlewareFuncWithParamProperty[];
-  path: string | RegExp;
-  regexp: RegExp;
-  paramNames: Key[];
-  /**
-   * Initialize a new routing Layer with given `method`, `path`, and `middleware`.
-   *
-   * @param {String|RegExp} path Path string or regular expression.
-   * @param {Array} methods Array of HTTP verbs.
-   * @param {Array|Function} middlewares Layer callback/middleware or series of.
-   * @param {Object=} opts optional params
-   * @param {String=} opts.name route name
-   * @param {String=} opts.sensitive case sensitive (default: false)
-   * @param {String=} opts.strict require the trailing slash (default: false)
-   * @private
-   */
-  constructor(path: string | RegExp, methods: string[], middlewares: MiddlewareFunc | MiddlewareFunc[], opts?: LayerOptions | string);
-  /**
-   * Returns whether request `path` matches route.
-   *
-   * @param {String} path path string
-   * @return {Boolean} matched or not
-   * @private
-   */
-  match(path: string): boolean;
-  /**
-   * Returns map of URL parameters for given `path` and `paramNames`.
-   *
-   * @param {String} _path path string
-   * @param {Array.<String>} captures captures strings
-   * @param {Object=} [existingParams] existing params
-   * @return {Object} params object
-   * @private
-   */
-  params(_path: string, captures: Array<string>, existingParams?: Record<string, string>): Record<string, string>;
-  /**
-   * Returns array of regexp url path captures.
-   *
-   * @param {String} path path string
-   * @return {Array.<String>} captures strings
-   * @private
-   */
-  captures(path: string): Array<string>;
-  /**
-   * Generate URL for route using given `params`.
-   *
-   * @example
-   *
-   * ```javascript
-   * var route = new Layer(['GET'], '/users/:id', fn);
-   *
-   * route.url(123); // => "/users/123"
-   * route.url('123'); // => "/users/123"
-   * route.url({ id: 123 }); // => "/users/123"
-   * ```
-   *
-   * @param {Object} params url parameters
-   * @param {Object} paramsOrOptions optional parameters
-   * @return {String} url string
-   * @private
-   */
-  url(params?: string | number | object, ...paramsOrOptions: (string | number | object | LayerURLOptions)[]): string;
-  /**
-   * Run validations on route named parameters.
-   *
-   * @example
-   *
-   * ```javascript
-   * router
-   *   .param('user', function (id, ctx, next) {
-   *     ctx.user = users[id];
-   *     if (!user) return ctx.status = 404;
-   *     next();
-   *   })
-   *   .get('/users/:user', function (ctx, next) {
-   *     ctx.body = ctx.user;
-   *   });
-   * ```
-   *
-   * @param {String} param param string
-   * @param {Function} fn middleware function
-   * @return {Layer} layer instance
-   * @private
-   */
-  param(param: string, fn: ParamMiddlewareFunc): Layer;
-  /**
-   * Prefix route path.
-   *
-   * @param {String} prefix prefix string
-   * @return {Layer} layer instance
-   * @private
-   */
-  setPrefix(prefix: string): Layer;
-}
-//#endregion
+import "./types-DvonNcgV.js";
+import { Layer, LayerOptions, LayerURLOptions } from "./Layer-Br45DupW.js";
 export { Layer, LayerOptions, LayerURLOptions };

package/dist/Layer.js

@@ -1,201 +1,3 @@
-import { decodeURIComponent } from "utility";
-import { isGeneratorFunction } from "is-type-of";
-import { debuglog } from "node:util";
-import pathToRegExp from "path-to-regexp";
-import URI from "urijs";
+import { Layer } from "./Layer-CPiRgFSm.js";
 
-//#region src/Layer.ts
-const debug = debuglog("egg/router:Layer");
-var Layer = class {
-	opts;
-	name;
-	methods = [];
-	stack;
-	path;
-	regexp;
-	paramNames = [];
-	/**
-	* Initialize a new routing Layer with given `method`, `path`, and `middleware`.
-	*
-	* @param {String|RegExp} path Path string or regular expression.
-	* @param {Array} methods Array of HTTP verbs.
-	* @param {Array|Function} middlewares Layer callback/middleware or series of.
-	* @param {Object=} opts optional params
-	* @param {String=} opts.name route name
-	* @param {String=} opts.sensitive case sensitive (default: false)
-	* @param {String=} opts.strict require the trailing slash (default: false)
-	* @private
-	*/
-	constructor(path, methods, middlewares, opts) {
-		if (typeof opts === "string") opts = { name: opts };
-		this.opts = opts ?? {};
-		this.opts.prefix = this.opts.prefix ?? "";
-		this.name = this.opts.name;
-		this.stack = Array.isArray(middlewares) ? middlewares : [middlewares];
-		for (const method of methods) {
-			const l = this.methods.push(method.toUpperCase());
-			if (this.methods[l - 1] === "GET") this.methods.unshift("HEAD");
-		}
-		this.stack.forEach((fn) => {
-			const type = typeof fn;
-			if (type !== "function") throw new TypeError(methods.toString() + " `" + (this.opts.name || path) + "`: `middleware` must be a function, not `" + type + "`");
-			if (isGeneratorFunction(fn)) throw new TypeError(methods.toString() + " `" + (this.opts.name || path) + "`: Please use async function instead of generator function");
-		});
-		this.path = path;
-		this.regexp = pathToRegExp(path, this.paramNames, this.opts);
-		debug("defined route %s %s", this.methods, this.opts.prefix + this.path);
-	}
-	/**
-	* Returns whether request `path` matches route.
-	*
-	* @param {String} path path string
-	* @return {Boolean} matched or not
-	* @private
-	*/
-	match(path) {
-		return this.regexp.test(path);
-	}
-	/**
-	* Returns map of URL parameters for given `path` and `paramNames`.
-	*
-	* @param {String} _path path string
-	* @param {Array.<String>} captures captures strings
-	* @param {Object=} [existingParams] existing params
-	* @return {Object} params object
-	* @private
-	*/
-	params(_path, captures, existingParams) {
-		const params = existingParams ?? {};
-		for (let len = captures.length, i = 0; i < len; i++) {
-			const paramName = this.paramNames[i];
-			if (paramName) {
-				const c = captures[i];
-				params[paramName.name] = c ? decodeURIComponent(c) : c;
-			}
-		}
-		return params;
-	}
-	/**
-	* Returns array of regexp url path captures.
-	*
-	* @param {String} path path string
-	* @return {Array.<String>} captures strings
-	* @private
-	*/
-	captures(path) {
-		if (this.opts.ignoreCaptures) return [];
-		const m = path.match(this.regexp);
-		return m ? m.slice(1) : [];
-	}
-	/**
-	* Generate URL for route using given `params`.
-	*
-	* @example
-	*
-	* ```javascript
-	* var route = new Layer(['GET'], '/users/:id', fn);
-	*
-	* route.url(123); // => "/users/123"
-	* route.url('123'); // => "/users/123"
-	* route.url({ id: 123 }); // => "/users/123"
-	* ```
-	*
-	* @param {Object} params url parameters
-	* @param {Object} paramsOrOptions optional parameters
-	* @return {String} url string
-	* @private
-	*/
-	url(params, ...paramsOrOptions) {
-		let args = params;
-		const url = this.path.replace(/\(\.\*\)/g, "");
-		const toPath = pathToRegExp.compile(url);
-		let options;
-		if (params !== void 0 && typeof params !== "object") {
-			args = [params, ...paramsOrOptions];
-			if (Array.isArray(args)) {
-				const lastIndex = args.length - 1;
-				if (typeof args[lastIndex] === "object") {
-					options = args[lastIndex];
-					args = args.slice(0, lastIndex);
-				}
-			}
-		} else if (typeof params === "object") {
-			if (typeof paramsOrOptions[0] === "object" && "query" in paramsOrOptions[0]) options = paramsOrOptions[0];
-		}
-		const tokens = pathToRegExp.parse(url);
-		let replace = {};
-		if (Array.isArray(args)) for (let len = tokens.length, i = 0, j = 0; i < len; i++) {
-			const token = tokens[i];
-			if (typeof token === "object" && token.name) replace[token.name] = args[j++];
-		}
-		else if (tokens.some((token) => typeof token === "object" && token.name)) replace = params;
-		else options = params;
-		const replaced = toPath(replace);
-		if (options?.query) {
-			const urlObject = new URI(replaced);
-			urlObject.search(options.query);
-			return urlObject.toString();
-		}
-		return replaced;
-	}
-	/**
-	* Run validations on route named parameters.
-	*
-	* @example
-	*
-	* ```javascript
-	* router
-	*   .param('user', function (id, ctx, next) {
-	*     ctx.user = users[id];
-	*     if (!user) return ctx.status = 404;
-	*     next();
-	*   })
-	*   .get('/users/:user', function (ctx, next) {
-	*     ctx.body = ctx.user;
-	*   });
-	* ```
-	*
-	* @param {String} param param string
-	* @param {Function} fn middleware function
-	* @return {Layer} layer instance
-	* @private
-	*/
-	param(param, fn) {
-		const stack = this.stack;
-		const params = this.paramNames;
-		const middleware = function(ctx, next) {
-			return fn.call(this, ctx.params[param], ctx, next);
-		};
-		middleware.param = param;
-		const names = params.map((p) => {
-			return p.name;
-		});
-		const x = names.indexOf(param);
-		if (x > -1) stack.some(function(fn$1, i) {
-			if (!fn$1.param || names.indexOf(fn$1.param) > x) {
-				stack.splice(i, 0, middleware);
-				return true;
-			}
-			return false;
-		});
-		return this;
-	}
-	/**
-	* Prefix route path.
-	*
-	* @param {String} prefix prefix string
-	* @return {Layer} layer instance
-	* @private
-	*/
-	setPrefix(prefix) {
-		if (this.path) {
-			this.path = prefix + this.path;
-			this.paramNames = [];
-			this.regexp = pathToRegExp(this.path, this.paramNames, this.opts);
-		}
-		return this;
-	}
-};
-
-//#endregion
 export { Layer };