@bool-ts/core 1.7.3 → 1.7.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/entities/route.js +1 -1
  2. package/dist/hooks/factory.js +21 -3
  3. package/package.json +1 -1
  4. package/src/entities/route.ts +1 -1
  5. package/src/hooks/factory.ts +37 -4
package/dist/entities/route.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  export class Route {
3
- static rootPattern = ":([a-z0-9A-Z_.-]{1,})";
3
+ static rootPattern = ":([a-z0-9A-Z_-]{1,})";
4
4
  alias;
5
5
  _map = new Map();
6
6
  constructor(alias) {
package/dist/hooks/factory.js CHANGED
@@ -255,7 +255,13 @@ const fetcher = async (bun, bool) => {
255
255
  ? request.headers.get(argsMetadata.key) || undefined
256
256
  : await argumentsResolution(request.headers.get(argsMetadata.key) || undefined, argsMetadata.zodSchema, argsMetadata.index, collection.funcName);
257
257
  break;
258
+ case paramArgsKey:
259
+ args[argsMetadata.index] = !argsMetadata.zodSchema
260
+ ? context[paramsArgsKey][argsMetadata.key] || undefined
261
+ : await argumentsResolution(context[paramsArgsKey][argsMetadata.key], argsMetadata.zodSchema, argsMetadata.index, collection.funcName);
262
+ break;
258
263
  case routeModelArgsKey:
264
+ args[argsMetadata.index] = context[routeModelArgsKey];
259
265
  break;
260
266
  default:
261
267
  args[argsMetadata.index] = !argsMetadata.zodSchema
@@ -306,7 +312,13 @@ const fetcher = async (bun, bool) => {
306
312
  ? request.headers.get(argsMetadata.key) || undefined
307
313
  : await argumentsResolution(request.headers.get(argsMetadata.key) || undefined, argsMetadata.zodSchema, argsMetadata.index, collection.funcName);
308
314
  break;
315
+ case paramArgsKey:
316
+ args[argsMetadata.index] = !argsMetadata.zodSchema
317
+ ? context[paramsArgsKey][argsMetadata.key] || undefined
318
+ : await argumentsResolution(context[paramsArgsKey][argsMetadata.key], argsMetadata.zodSchema, argsMetadata.index, collection.funcName);
319
+ break;
309
320
  case routeModelArgsKey:
321
+ args[argsMetadata.index] = context[routeModelArgsKey];
310
322
  break;
311
323
  default:
312
324
  args[argsMetadata.index] = !argsMetadata.zodSchema
@@ -481,6 +493,9 @@ const fetcher = async (bun, bool) => {
481
493
  }
482
494
  await collection.func(...args);
483
495
  }
496
+ if (context[responseBodyArgsKey] instanceof Response) {
497
+ return responseConverter(context[responseBodyArgsKey]);
498
+ }
484
499
  // Execute end middleware(s)
485
500
  for (let i = 0; i < endMiddlewareGroup.length; i++) {
486
501
  const args = [];
@@ -515,7 +530,13 @@ const fetcher = async (bun, bool) => {
515
530
  ? request.headers.get(argsMetadata.key) || undefined
516
531
  : await argumentsResolution(request.headers.get(argsMetadata.key) || undefined, argsMetadata.zodSchema, argsMetadata.index, collection.funcName);
517
532
  break;
533
+ case paramArgsKey:
534
+ args[argsMetadata.index] = !argsMetadata.zodSchema
535
+ ? context[paramsArgsKey][argsMetadata.key] || undefined
536
+ : await argumentsResolution(context[paramsArgsKey][argsMetadata.key], argsMetadata.zodSchema, argsMetadata.index, collection.funcName);
537
+ break;
518
538
  case routeModelArgsKey:
539
+ args[argsMetadata.index] = context[routeModelArgsKey];
519
540
  break;
520
541
  default:
521
542
  args[argsMetadata.index] = !argsMetadata.zodSchema
@@ -532,9 +553,6 @@ const fetcher = async (bun, bool) => {
532
553
  return responseConverter(context[responseBodyArgsKey]);
533
554
  }
534
555
  }
535
- if (context[responseBodyArgsKey] instanceof Response) {
536
- return responseConverter(context[responseBodyArgsKey]);
537
- }
538
556
  return responseConverter(new Response(!context[responseBodyArgsKey]
539
557
  ? undefined
540
558
  : JSON.stringify({
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bool-ts/core",
3
- "version": "1.7.3",
3
+ "version": "1.7.5",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
package/src/entities/route.ts CHANGED
@@ -9,7 +9,7 @@ export type TRouteModel<T = unknown> = Readonly<{
9
9
  }>;
10
10
 
11
11
  export class Route {
12
- public static rootPattern = ":([a-z0-9A-Z_.-]{1,})";
12
+ public static rootPattern = ":([a-z0-9A-Z_-]{1,})";
13
13
 
14
14
  public readonly alias: string;
15
15
 
package/src/hooks/factory.ts CHANGED
@@ -408,7 +408,18 @@ const fetcher = async (
408
408
  collection.funcName
409
409
  );
410
410
  break;
411
+ case paramArgsKey:
412
+ args[argsMetadata.index] = !argsMetadata.zodSchema
413
+ ? context[paramsArgsKey][argsMetadata.key] || undefined
414
+ : await argumentsResolution(
415
+ context[paramsArgsKey][argsMetadata.key],
416
+ argsMetadata.zodSchema,
417
+ argsMetadata.index,
418
+ collection.funcName
419
+ );
420
+ break;
411
421
  case routeModelArgsKey:
422
+ args[argsMetadata.index] = context[routeModelArgsKey];
412
423
  break;
413
424
  default:
414
425
  args[argsMetadata.index] = !argsMetadata.zodSchema
@@ -489,7 +500,18 @@ const fetcher = async (
489
500
  collection.funcName
490
501
  );
491
502
  break;
503
+ case paramArgsKey:
504
+ args[argsMetadata.index] = !argsMetadata.zodSchema
505
+ ? context[paramsArgsKey][argsMetadata.key] || undefined
506
+ : await argumentsResolution(
507
+ context[paramsArgsKey][argsMetadata.key],
508
+ argsMetadata.zodSchema,
509
+ argsMetadata.index,
510
+ collection.funcName
511
+ );
512
+ break;
492
513
  case routeModelArgsKey:
514
+ args[argsMetadata.index] = context[routeModelArgsKey];
493
515
  break;
494
516
  default:
495
517
  args[argsMetadata.index] = !argsMetadata.zodSchema
@@ -774,6 +796,10 @@ const fetcher = async (
774
796
  await collection.func(...args);
775
797
  }
776
798
 
799
+ if (context[responseBodyArgsKey] instanceof Response) {
800
+ return responseConverter(context[responseBodyArgsKey]);
801
+ }
802
+
777
803
  // Execute end middleware(s)
778
804
  for (let i = 0; i < endMiddlewareGroup.length; i++) {
779
805
  const args = [];
@@ -830,7 +856,18 @@ const fetcher = async (
830
856
  collection.funcName
831
857
  );
832
858
  break;
859
+ case paramArgsKey:
860
+ args[argsMetadata.index] = !argsMetadata.zodSchema
861
+ ? context[paramsArgsKey][argsMetadata.key] || undefined
862
+ : await argumentsResolution(
863
+ context[paramsArgsKey][argsMetadata.key],
864
+ argsMetadata.zodSchema,
865
+ argsMetadata.index,
866
+ collection.funcName
867
+ );
868
+ break;
833
869
  case routeModelArgsKey:
870
+ args[argsMetadata.index] = context[routeModelArgsKey];
834
871
  break;
835
872
  default:
836
873
  args[argsMetadata.index] = !argsMetadata.zodSchema
@@ -855,10 +892,6 @@ const fetcher = async (
855
892
  }
856
893
  }
857
894
 
858
- if (context[responseBodyArgsKey] instanceof Response) {
859
- return responseConverter(context[responseBodyArgsKey]);
860
- }
861
-
862
895
  return responseConverter(
863
896
  new Response(
864
897
  !context[responseBodyArgsKey]