@bool-ts/core 1.5.5 → 1.5.7

package/__test/controller.ts

@@ -2,7 +2,7 @@ import type { IService } from "./interfaces";
 
 import * as Zod from "zod";
 
-import { Body, Controller, Delete, Get, Inject, Options, Params, Patch, Post, Put, Param } from "../src";
+import { Body, Controller, Delete, Get, Inject, Options, Params, Patch, Post, Put, Param, Query } from "../src";
 import { TestService } from "./service";
 
 const postParamsSchema = Zod.object({
@@ -45,10 +45,12 @@ export class TestController {
     public async post(
         @Params()
         params: any,
+        @Query()
+        query: any,
         @Body(bodySchema)
         body: Zod.infer<typeof bodySchema>
     ) {
-        console.log("req.headers", body, params);
+        console.log("req.headers", query);
         console.log("===========================");
     }
 

package/__test/module.ts

@@ -10,9 +10,6 @@ import { TestService } from "./service";
 import { SecondGuard } from "./secondGuard";
 
 @Module({
-    options: {
-        allowOrigins: ["*"]
-    },
     middlewares: [FirstMiddleware, SecondMiddleware],
     guards: [FirstGuard, SecondGuard],
     beforeDispatchers: [BeforeDispatcher],

package/dist/decorators/arguments.js

@@ -74,7 +74,7 @@ export const Query = (zodSchema) => {
         const queryMetadata = Reflect.getOwnMetadata(argumentsKey, target.constructor, methodName) || {};
         queryMetadata[`argumentIndexes.${parameterIndex}`] = {
             index: parameterIndex,
-            type: EArgumentTypes.params,
+            type: EArgumentTypes.query,
             zodSchema: zodSchema
         };
         Reflect.defineMetadata(argumentsKey, queryMetadata, target.constructor, methodName);

package/dist/hooks/factory.js

@@ -149,6 +149,7 @@ export const BoolFactory = (target, options) => {
             const url = new URL(request.url);
             const reqHeaders = request.headers;
             const resHeaders = new Headers();
+            const query = Qs.parse(url.searchParams.toString(), options.queryParser);
             try {
                 // Execute middleware(s)
                 for (let i = 0; i < middlewareGroup.length; i++) {
@@ -168,6 +169,11 @@ export const BoolFactory = (target, options) => {
                                         ? await request[argsMetadata.parser || "json"]()
                                         : await argumentsResolution(await request[argsMetadata.parser || "json"](), argsMetadata.zodSchema, argsMetadata.index, middlewareCollection.funcName);
                                     break;
+                                case EArgumentTypes.query:
+                                    middlewareArguments[argsMetadata.index] = !argsMetadata.zodSchema
+                                        ? query
+                                        : await argumentsResolution(query, argsMetadata.zodSchema, argsMetadata.index, middlewareCollection.funcName);
+                                    break;
                                 case EArgumentTypes.request:
                                     middlewareArguments[argsMetadata.index] = request;
                                     break;
@@ -201,6 +207,11 @@ export const BoolFactory = (target, options) => {
                                         ? await request[argsMetadata.parser || "json"]()
                                         : await argumentsResolution(await request[argsMetadata.parser || "json"](), argsMetadata.zodSchema, argsMetadata.index, guardCollection.funcName);
                                     break;
+                                case EArgumentTypes.query:
+                                    guardArguments[argsMetadata.index] = !argsMetadata.zodSchema
+                                        ? query
+                                        : await argumentsResolution(query, argsMetadata.zodSchema, argsMetadata.index, guardCollection.funcName);
+                                    break;
                                 case EArgumentTypes.request:
                                     guardArguments[argsMetadata.index] = request;
                                     break;
@@ -228,7 +239,6 @@ export const BoolFactory = (target, options) => {
                     });
                 }
                 const params = result.params;
-                const query = Qs.parse(url.search, options.queryParser);
                 let responseBody = undefined;
                 // Execute before dispatcher(s)
                 for (let i = 0; i < beforeDispatcherGroup.length; i++) {
@@ -383,7 +393,7 @@ export const BoolFactory = (target, options) => {
                     });
             }
             catch (error) {
-                return jsonErrorInfer(error);
+                return jsonErrorInfer(error, resHeaders);
             }
             finally {
                 if (allowLogsMethods) {

package/dist/http/index.d.ts

@@ -9,6 +9,6 @@ export type THttpMethods = {
     TRACE: "TRACE";
     PATCH: "PATCH";
 };
-export declare const jsonErrorInfer: (data: any) => import("undici-types").Response;
+export declare const jsonErrorInfer: (data: any, headers?: Headers) => Response;
 export * from "./clientError";
 export * from "./serverError";

package/dist/http/index.js

@@ -1,8 +1,7 @@
 import { HttpClientError } from "./clientError";
 import { HttpServerError } from "./serverError";
-export const jsonErrorInfer = (data) => {
-    const headers = new Headers();
-    headers.append("Content-Type", "application/json");
+export const jsonErrorInfer = (data, headers = new Headers()) => {
+    headers.set("Content-Type", "application/json");
     if (data instanceof HttpClientError || data instanceof HttpServerError) {
         return new Response(JSON.stringify(data), {
             status: data.httpCode,

package/jsconfig.json

@@ -0,0 +1,27 @@
+{
+  "compilerOptions": {
+    // Enable latest features
+    "lib": ["ESNext", "DOM"],
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleDetection": "force",
+    "jsx": "react-jsx",
+    "allowJs": true,
+
+    // Bundler mode
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "verbatimModuleSyntax": true,
+    "noEmit": true,
+
+    // Best practices
+    "strict": true,
+    "skipLibCheck": true,
+    "noFallthroughCasesInSwitch": true,
+
+    // Some stricter flags (disabled by default)
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    "noPropertyAccessFromIndexSignature": false
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bool-ts/core",
-    "version": "1.5.5",
+    "version": "1.5.7",
     "description": "",
     "main": "dist/index.js",
     "scripts": {
@@ -24,7 +24,7 @@
         "zod": "^3.23.8"
     },
     "devDependencies": {
-        "@types/bun": "^1.1.6",
+        "@types/bun": "latest",
         "@types/qs": "^6.9.15",
         "typescript": "^5.5.4"
     }

package/src/decorators/arguments.ts

@@ -154,12 +154,12 @@ export const Query = (zodSchema?: Zod.Schema) => {
 
         queryMetadata[`argumentIndexes.${parameterIndex}`] = {
             index: parameterIndex,
-            type: EArgumentTypes.params,
+            type: EArgumentTypes.query,
             zodSchema: zodSchema
         } satisfies Extract<
             TArgumentsMetadata,
             {
-                type: EArgumentTypes.params;
+                type: EArgumentTypes.query;
             }
         >;
 

package/src/hooks/factory.ts

@@ -205,6 +205,7 @@ export const BoolFactory = (target: new (...args: any[]) => unknown, options: TB
             const url = new URL(request.url);
             const reqHeaders = request.headers;
             const resHeaders = new Headers();
+            const query = Qs.parse(url.searchParams.toString(), options.queryParser);
 
             try {
                 // Execute middleware(s)
@@ -237,6 +238,16 @@ export const BoolFactory = (target: new (...args: any[]) => unknown, options: TB
                                               middlewareCollection.funcName
                                           );
                                     break;
+                                case EArgumentTypes.query:
+                                    middlewareArguments[argsMetadata.index] = !argsMetadata.zodSchema
+                                        ? query
+                                        : await argumentsResolution(
+                                              query,
+                                              argsMetadata.zodSchema,
+                                              argsMetadata.index,
+                                              middlewareCollection.funcName
+                                          );
+                                    break;
                                 case EArgumentTypes.request:
                                     middlewareArguments[argsMetadata.index] = request;
                                     break;
@@ -286,6 +297,16 @@ export const BoolFactory = (target: new (...args: any[]) => unknown, options: TB
                                               guardCollection.funcName
                                           );
                                     break;
+                                case EArgumentTypes.query:
+                                    guardArguments[argsMetadata.index] = !argsMetadata.zodSchema
+                                        ? query
+                                        : await argumentsResolution(
+                                              query,
+                                              argsMetadata.zodSchema,
+                                              argsMetadata.index,
+                                              guardCollection.funcName
+                                          );
+                                    break;
                                 case EArgumentTypes.request:
                                     guardArguments[argsMetadata.index] = request;
                                     break;
@@ -318,7 +339,6 @@ export const BoolFactory = (target: new (...args: any[]) => unknown, options: TB
                 }
 
                 const params = result.params;
-                const query = Qs.parse(url.search, options.queryParser);
 
                 let responseBody = undefined;
 
@@ -572,7 +592,7 @@ export const BoolFactory = (target: new (...args: any[]) => unknown, options: TB
                           }
                       );
             } catch (error) {
-                return jsonErrorInfer(error);
+                return jsonErrorInfer(error, resHeaders);
             } finally {
                 if (allowLogsMethods) {
                     const end = performance.now();

package/src/http/index.ts

@@ -13,10 +13,8 @@ export type THttpMethods = {
     PATCH: "PATCH";
 };
 
-export const jsonErrorInfer = (data: any) => {
-    const headers = new Headers();
-
-    headers.append("Content-Type", "application/json");
+export const jsonErrorInfer = (data: any, headers: Headers = new Headers()) => {
+    headers.set("Content-Type", "application/json");
 
     if (data instanceof HttpClientError || data instanceof HttpServerError) {
         return new Response(JSON.stringify(data), {

package/test.http

@@ -5,7 +5,7 @@
 GET http://{{baseUrl}}/test/abc/23234
 
 ### Send test POST method
-POST http://{{baseUrl}}/test/abc/123/provider/23234 HTTP/1.1
+POST http://{{baseUrl}}/test/abc/123/provider/23234?options[page]=1&options[limit]=6&options[sort][metadata.latestReviewAt]=desc&options[sort][info.searchCount]=desc&options[sort][createdAt]=desc&populate[0]=__headquarters&populate[1]=__logoMedia HTTP/1.1
 content-type: application/json
 
 {

package/tsconfig.json

@@ -11,7 +11,8 @@
         /* Language and Environment */
         "target": "ESNext" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
         "lib": [
-            "ESNext"
+            "ESNext",
+            "DOM"
         ] /* Specify a set of bundled library declaration files that describe the target runtime environment. */,
         // "jsx": "preserve",                                /* Specify what JSX code is generated. */
         "experimentalDecorators": true /* Enable experimental support for legacy experimental decorators. */,