@derivesome/server 1.0.16 → 1.0.18

package/src/app.ts

@@ -1,4 +1,4 @@
-import { ShapeMapping, validate } from "shapedef";
+import { parse, ShapeMapping, validate } from "shapedef";
 import { isPlainObject, LooseRecord, UnknownRecord } from "./common";
 import { MetaProvider } from "./meta-provider";
 import { RequestMethod } from "./request-method";
@@ -208,17 +208,36 @@ export class App<Meta extends UnknownRecord = UnknownRecord> {
     ctx: RouteHandlerContext<Request, Response, any, any, any>,
     route: Route,
   ) {
-    if (route.mergeParams !== false && isPlainObject(ctx.req.body)) {
-      ctx.args = {};
-      ctx.args = { ...ctx.args, ...ctx.req.body };
-    }
-    if (["POST", "PUT", "PATCH"].includes(route.method)) {
-      if (route.args) {
-        const validation = validate(ctx.req.body, route.args);
-        if (!validation.ok) {
-          return await this.sendReturn(ctx, ctx.R.json(validation).status(400));
+    ctx.args = isPlainObject(ctx.req.body) ? ctx.req.body : {};
+
+    if (ctx.req.raw.url && route.mergeParams !== false) {
+      const url = new URL(ctx.req.raw.url!, "http://does-not-matter");
+      const obj = Object.fromEntries(Array.from(url.searchParams.entries()));
+
+      const validated = Object.entries(obj).map(([k, v]) => {
+        const args = route.args;
+        if (!args) return { [k]: { ok: true as const, value: v } };
+        if (!(k in args.rec)) return { [k]: { ok: true as const, value: v } };
+        return { [k]: parse(v, args.rec[k]) };
+      });
+
+      const parsedQ: Record<any, any> = {};
+
+      for (const it of validated) {
+        for (const [k, v] of Object.entries(it)) {
+          if (!v.ok)
+            return await this.sendReturn(ctx, ctx.R.json(v).status(400));
+          parsedQ[k] = v.value;
         }
-        ctx.args = ctx.req.body;
+      }
+
+      ctx.args = { ...ctx.args, ...parsedQ };
+    }
+
+    if (route.args) {
+      const validation = validate(ctx.args, route.args);
+      if (!validation.ok) {
+        return await this.sendReturn(ctx, ctx.R.json(validation).status(400));
       }
     }
 

package/src/app.ts~

@@ -1,4 +1,4 @@
-import { ShapeMapping, shapes, validate } from "shapedef";
+import { parse, ShapeMapping, validate } from "shapedef";
 import { isPlainObject, LooseRecord, UnknownRecord } from "./common";
 import { MetaProvider } from "./meta-provider";
 import { RequestMethod } from "./request-method";
@@ -208,17 +208,35 @@ export class App<Meta extends UnknownRecord = UnknownRecord> {
     ctx: RouteHandlerContext<Request, Response, any, any, any>,
     route: Route,
   ) {
-    if (route.mergeParams !== false && isPlainObject(ctx.req.body)) {
-      ctx.args = {};
-      ctx.args = { ...ctx.args, ...ctx.req.body };
-    }
-    if (["POST", "PUT", "PATCH"].includes(route.method)) {
-      if (route.args) {
-        const validation = validate(ctx.req.body, route.args);
-        if (!validation.ok) {
-          return await this.sendReturn(ctx, ctx.R.json(validation).status(400));
+    ctx.args = (isPlainObject(ctx.req.body) ? ctx.req.body : {});
+
+    if (ctx.req.raw.url && route.mergeParams !== false) {
+      const url = new URL(ctx.req.raw.url!, 'http://does-not-matter');
+      const obj = Object.fromEntries(Array.from(url.searchParams.entries()));
+
+      const validated = Object.entries(obj).map(([k, v]) => {
+        const args = route.args;
+        if (!args) return {[k]: { ok: true as const, value: v }};
+        if (!(k in args.rec)) return  {[k]: { ok: true as const, value: v }};
+        return {[k]: parse(v, args.rec[k])};
+      });
+
+      const parsedQ: Record<any, any> = {};
+
+      for (const it of validated) {
+        for (const [k, v] of Object.entries(it)) {
+          if (!v.ok) return await this.sendReturn(ctx, ctx.R.json(v).status(400));
+          parsedQ[k] = v.value;
         }
-        ctx.args = ctx.req.body;
+      }
+      
+      ctx.args = {...ctx.args, ...(parsedQ)};
+    }
+    
+    if (route.args) {
+      const validation = validate(ctx.args, route.args);
+      if (!validation.ok) {
+        return await this.sendReturn(ctx, ctx.R.json(validation).status(400));
       }
     }