@adonisjs/http-server 6.8.2-2 → 6.8.2-4

package/build/src/response.js

@@ -5,16 +5,15 @@ import mime from 'mime-types';
 import destroy from 'destroy';
 import { extname } from 'node:path';
 import onFinished from 'on-finished';
-import { promisify } from 'node:util';
 import json from '@poppinss/utils/json';
 import Macroable from '@poppinss/macroable';
-import { createReadStream, stat } from 'node:fs';
+import { createReadStream } from 'node:fs';
+import { stat } from 'node:fs/promises';
 import { RuntimeException } from '@poppinss/utils';
 import contentDisposition from 'content-disposition';
 import { Redirect } from './redirect.js';
 import { CookieSerializer } from './cookies/serializer.js';
 import { E_HTTP_REQUEST_ABORTED } from './exceptions.js';
-const statFn = promisify(stat);
 const CACHEABLE_HTTP_METHODS = ['GET', 'HEAD'];
 export class Response extends Macroable {
     request;
@@ -203,7 +202,7 @@ export class Response extends Macroable {
     }
     async streamFileForDownload(filePath, generateEtag, errorCallback) {
         try {
-            const stats = await statFn(filePath);
+            const stats = await stat(filePath);
             if (!stats || !stats.isFile()) {
                 throw new TypeError('response.download only accepts path to a file');
             }

package/build/src/router/lookup_store/url_builder.js

@@ -1,5 +1,5 @@
-import matchit from '@poppinss/matchit';
 import { RuntimeException } from '@poppinss/utils';
+import { parseRoutePattern } from '../parser.js';
 export class UrlBuilder {
     #qsParser;
     #params = {};
@@ -28,7 +28,7 @@ export class UrlBuilder {
         const paramsArray = Array.isArray(this.#params) ? this.#params : null;
         const paramsObject = !Array.isArray(this.#params) ? this.#params : {};
         let paramsIndex = 0;
-        const tokens = matchit.parse(pattern);
+        const tokens = parseRoutePattern(pattern);
         for (const token of tokens) {
             if (token.type === 0) {
                 uriSegments.push(`${token.val}${token.end}`);

package/build/src/router/main.d.ts

@@ -5,17 +5,18 @@ import { Route } from './route.js';
 import { RouteGroup } from './group.js';
 import { BriskRoute } from './brisk.js';
 import { RouteResource } from './resource.js';
-import type { Constructor, LazyImport } from '../types/base.js';
 import { LookupStore } from './lookup_store/main.js';
 import { RouteMatchers as Matchers } from './matchers.js';
+import type { Constructor, LazyImport } from '../types/base.js';
 import type { MiddlewareAsClass, ParsedGlobalMiddleware } from '../types/middleware.js';
-import type { RouteFn, MatchedRoute, RouteMatcher, MakeUrlOptions, MakeSignedUrlOptions, GetControllerHandlers } from '../types/route.js';
+import type { RouteFn, MatchedRoute, RouteMatcher, RouteMatchers, MakeUrlOptions, MakeSignedUrlOptions, GetControllerHandlers } from '../types/route.js';
 export declare class Router extends LookupStore {
     #private;
     routes: (Route | RouteResource | RouteGroup | BriskRoute)[];
     usingDomains: boolean;
     matchers: Matchers;
     constructor(app: Application<any>, encryption: Encryption, qsParser: Qs);
+    parsePattern(pattern: string, matchers?: RouteMatchers): import("../types/route.js").MatchItRouteToken[];
     use(middleware: LazyImport<MiddlewareAsClass>[]): this;
     named<NamedMiddleware extends Record<string, LazyImport<MiddlewareAsClass>>>(collection: NamedMiddleware): { [K in keyof NamedMiddleware]: <Args extends import("../types/middleware.js").GetMiddlewareArgs<import("../types/base.js").UnWrapLazyImport<NamedMiddleware[K]>>>(...args: Args) => {
         name: K;

package/build/src/router/main.js

@@ -10,6 +10,7 @@ import { RouteResource } from './resource.js';
 import { LookupStore } from './lookup_store/main.js';
 import { RouteMatchers as Matchers } from './matchers.js';
 import { defineNamedMiddleware } from '../define_middleware.js';
+import { parseRoutePattern } from './parser.js';
 export class Router extends LookupStore {
     #app;
     #store = new RoutesStore();
@@ -31,6 +32,9 @@ export class Router extends LookupStore {
         }
         this.routes.push(entity);
     }
+    parsePattern(pattern, matchers) {
+        return parseRoutePattern(pattern, matchers);
+    }
     use(middleware) {
         middleware.forEach((one) => this.#middleware.push(moduleImporter(one, 'handle').toHandleMethod()));
         return this;

package/build/src/router/parser.d.ts

@@ -0,0 +1,2 @@
+import { MatchItRouteToken, RouteMatchers } from '../types/route.js';
+export declare function parseRoutePattern(pattern: string, matchers?: RouteMatchers): MatchItRouteToken[];

package/build/src/router/parser.js

@@ -0,0 +1,5 @@
+import matchit from '@poppinss/matchit';
+export function parseRoutePattern(pattern, matchers) {
+    const tokens = matchit.parse(pattern, matchers);
+    return tokens;
+}

package/build/src/router/store.js

@@ -1,12 +1,13 @@
 import matchit from '@poppinss/matchit';
 import lodash from '@poppinss/utils/lodash';
 import { RuntimeException } from '@poppinss/utils';
+import { parseRoutePattern } from './parser.js';
 export class RoutesStore {
     usingDomains = false;
     tree = { tokens: [], domains: {} };
     #getDomainNode(domain) {
         if (!this.tree.domains[domain]) {
-            this.tree.tokens.push(matchit.parse(domain));
+            this.tree.tokens.push(parseRoutePattern(domain));
             this.tree.domains[domain] = {};
         }
         return this.tree.domains[domain];
@@ -48,7 +49,7 @@ export class RoutesStore {
         if (route.domain !== 'root') {
             this.usingDomains = true;
         }
-        const tokens = matchit.parse(route.pattern, route.matchers);
+        const tokens = parseRoutePattern(route.pattern, route.matchers);
         const routeNode = lodash.merge({ meta: {} }, lodash.pick(route, ['pattern', 'handler', 'meta', 'middleware', 'name', 'execute']));
         routeNode.meta.params = this.#collectRouteParams(routeNode, tokens);
         route.methods.forEach((method) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/http-server",
-  "version": "6.8.2-2",
+  "version": "6.8.2-4",
   "description": "AdonisJS HTTP server with support packed with Routing and Cookies",
   "main": "build/index.js",
   "type": "module",
@@ -52,7 +52,7 @@
     "@japa/run-failed-tests": "^1.1.1",
     "@japa/runner": "^2.5.1",
     "@japa/spec-reporter": "^1.3.3",
-    "@swc/core": "^1.3.39",
+    "@swc/core": "^1.3.40",
     "@types/accepts": "^1.3.5",
     "@types/content-disposition": "^0.5.5",
     "@types/cookie": "^0.5.1",
@@ -63,7 +63,7 @@
     "@types/fs-extra": "^11.0.1",
     "@types/http-status-codes": "^1.2.0",
     "@types/mime-types": "^2.1.1",
-    "@types/node": "^18.15.0",
+    "@types/node": "^18.15.2",
     "@types/on-finished": "^2.3.1",
     "@types/pem": "^1.9.6",
     "@types/proxy-addr": "^2.0.0",