owebjs 1.1.0 → 1.1.2

package/dist/index.d.ts

@@ -1,19 +1,21 @@
 import { FastifyServerOptions, FastifyRequest, FastifyReply, FastifyListenOptions, FastifyInstance } from 'fastify';
-export * from 'fastify/types/instance';
-export * from 'fastify/types/hooks';
-export * from 'fastify/types/logger';
-export * from 'fastify/types/request';
-export * from 'fastify/types/reply';
-export * from 'fastify/types/errors';
-export * from 'fastify/types/register';
-export * from 'fastify/types/plugin';
-export * from 'fastify/types/route';
-export * from 'fastify/types/schema';
-export * from 'fastify/types/context';
-export * from 'fastify/types/utils';
-export * from 'fastify/types/serverFactory';
-export * from 'fastify/types/type-provider';
-export * from 'fastify/types/content-type-parser';
+import { FastifyReply as FastifyReply$1 } from 'fastify/types/reply';
+export { FastifyReply } from 'fastify/types/reply';
+import { FastifyRequest as FastifyRequest$1 } from 'fastify/types/request';
+export { FastifyRequest, RequestGenericInterface } from 'fastify/types/request';
+import { RouteShorthandOptions } from 'fastify/types/route';
+export { RouteGenericInterface, RouteHandler, RouteHandlerMethod, RouteOptions, RouteShorthandMethod, RouteShorthandOptions, RouteShorthandOptionsWithHandler } from 'fastify/types/route';
+export { AddContentTypeParser, ConstructorAction, FastifyBodyParser, FastifyContentTypeParser, ProtoAction, getDefaultJsonParser, hasContentTypeParser } from 'fastify/types/content-type-parser';
+export { FastifyContext, FastifyContextConfig } from 'fastify/types/context';
+export { FastifyErrorCodes } from 'fastify/types/errors';
+export { DoneFuncWithErrOrRes, HookHandlerDoneFunction, RequestPayload, onCloseAsyncHookHandler, onCloseHookHandler, onErrorAsyncHookHandler, onErrorHookHandler, onListenAsyncHookHandler, onListenHookHandler, onReadyAsyncHookHandler, onReadyHookHandler, onRegisterHookHandler, onRequestAbortAsyncHookHandler, onRequestAbortHookHandler, onRequestAsyncHookHandler, onRequestHookHandler, onResponseAsyncHookHandler, onResponseHookHandler, onRouteHookHandler, onSendAsyncHookHandler, onSendHookHandler, onTimeoutAsyncHookHandler, onTimeoutHookHandler, preHandlerAsyncHookHandler, preHandlerHookHandler, preParsingAsyncHookHandler, preParsingHookHandler, preSerializationAsyncHookHandler, preSerializationHookHandler, preValidationAsyncHookHandler, preValidationHookHandler } from 'fastify/types/hooks';
+export { FastifyInstance, FastifyListenOptions, PrintRoutesOptions } from 'fastify/types/instance';
+export { Bindings, ChildLoggerOptions, FastifyBaseLogger, FastifyLogFn, FastifyLoggerInstance, FastifyLoggerOptions, LogLevel, PinoLoggerOptions } from 'fastify/types/logger';
+export { FastifyPlugin, FastifyPluginAsync, FastifyPluginCallback, FastifyPluginOptions } from 'fastify/types/plugin';
+export { FastifyRegister, FastifyRegisterOptions, RegisterOptions } from 'fastify/types/register';
+export { FastifySchema, FastifySchemaCompiler, FastifySchemaValidationError, SchemaErrorDataVar, SchemaErrorFormatter } from 'fastify/types/schema';
+export { FastifyServerFactory, FastifyServerFactoryHandler } from 'fastify/types/serverFactory';
+export { FastifyTypeProvider, FastifyTypeProviderDefault } from 'fastify/types/type-provider';
 
 interface OwebOptions extends FastifyServerOptions {
     uWebSocketsEnabled?: boolean;
@@ -41,14 +43,16 @@ declare class Oweb extends _FastifyInstance {
 type Awaitable<T> = T | Promise<T>;
 
 declare interface Route {
-    handle(req: FastifyRequest, res: FastifyReply): Awaitable<any>;
-    handleError?(req: FastifyRequest, res: FastifyReply, err: Error): Awaitable<any>;
+    handle(req: FastifyRequest$1, res: FastifyReply$1): Awaitable<any>;
+    handleError?(req: FastifyRequest$1, res: FastifyReply$1, err: Error): Awaitable<any>;
 }
 declare abstract class Route {
+    _options: RouteShorthandOptions;
+    constructor(options?: RouteShorthandOptions);
 }
 
 declare interface Hook {
-    handle(req: FastifyRequest, res: FastifyReply, done: () => void): Awaitable<any>;
+    handle(req: FastifyRequest$1, res: FastifyReply$1, done: () => void): Awaitable<any>;
 }
 declare abstract class Hook {
 }

package/dist/structures/Route.js

@@ -5,6 +5,10 @@ class Route {
   static {
     __name(this, "Route");
   }
+  _options = {};
+  constructor(options) {
+    this._options = options ?? {};
+  }
   handle() {
     throw new Error("Route#handle must be implemented");
   }

package/dist/utils/assignRoutes.js

@@ -30,8 +30,8 @@ const assignRoutes = /* @__PURE__ */ __name(async (directory, oweb) => {
   const files = await walk(directory);
   const routes = await generateRoutes(files);
   for (const route of routes) {
-    oweb[route.method](route.url, function(req, res) {
-      const routeFunc = new route.fn(...arguments);
+    const routeFunc = new route.fn();
+    oweb[route.method](route.url, routeFunc._options, function(req, res) {
       const handle = /* @__PURE__ */ __name(() => {
         if (routeFunc.handle.constructor.name == "AsyncFunction") {
           routeFunc.handle(...arguments).catch((error) => {

package/dist/utils/utils.js

@@ -18,8 +18,15 @@ const buildRoutePath = /* @__PURE__ */ __name((parsedFile) => {
   return directory + name;
 }, "buildRoutePath");
 const buildRouteURL = /* @__PURE__ */ __name((path) => {
+  const paths = path.split("/");
+  const normalizedPath = paths.map((x) => {
+    if (x.startsWith("(") && x.endsWith(")")) {
+      x = x.slice(1, -1);
+    }
+    return x;
+  }).join("/");
   let method = "get";
-  const paramURL = convertParamSyntax(path);
+  const paramURL = convertParamSyntax(normalizedPath);
   let url = convertCatchallSyntax(paramURL);
   for (const m of [
     ".DELETE",

package/dist/utils/walk.js

@@ -45,9 +45,25 @@ const walk = /* @__PURE__ */ __name(async (directory, tree = []) => {
         ...hookPaths
       ];
       const hooks = spread.filter((hookPath) => {
-        return isParentOrGrandparent(hookPath, directoryResolve);
+        const ren = isParentOrGrandparent(hookPath, directoryResolve);
+        return ren;
       });
-      const hooksImport = hooks.map((hookPath) => new URL(hookPath, `file://${__dirname}`).pathname.replaceAll("\\", "/") + "/_hooks.js");
+      const copyHooks = [
+        hooks
+      ].flat();
+      let scopingSort = copyHooks.sort((a, b) => b.length - a.length);
+      const scopeIndex = scopingSort.findIndex((path2) => {
+        const lastdir = path2.split("\\").at(-1);
+        return lastdir.startsWith("(") && lastdir.endsWith(")");
+      });
+      let useHook = [];
+      if (scopeIndex > -1) {
+        scopingSort.length = scopeIndex + 1;
+        useHook = scopingSort;
+      } else {
+        useHook = hooks;
+      }
+      const hooksImport = useHook.map((hookPath) => new URL(hookPath, `file://${__dirname}`).pathname.replaceAll("\\", "/") + "/_hooks.js");
       const hookFunctions = [];
       for (const importPath of hooksImport) {
         const imp = await import(importPath);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "owebjs",
-    "version": "1.1.0",
+    "version": "1.1.2",
     "description": "Flexible handler that built on top of Fastify",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -11,6 +11,11 @@
         "test": "tsup && node scripts/copyBinaries && node test/index.js",
         "format": "prettier --write . --ignore-path .gitignore"
     },
+    "homepage": "https://github.com/owebjs/oweb",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/owebjs/oweb"
+    },
     "keywords": [],
     "author": "owebjs",
     "license": "MIT",