galbe 0.13.0 → 0.13.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "galbe",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "description": "Fast, lightweight and highly customizable JavaScript web framework based on Bun",
   "author": "Pierre Caillaud M (https://github.com/pierre-cm)",
   "type": "module",

package/src/parser.ts

@@ -12,6 +12,7 @@ import type {
   STNull,
   STPropsValue,
   STUnion,
+  STIntersection,
 } from './schema'
 
 import { readableStreamToArrayBuffer } from 'bun'
@@ -112,13 +113,20 @@ export const requestBodyParser = async (
         }
         return await streamToString(body, schema as STBodyValue)
       } else if (contentType === 'json') {
-        if (!['object', 'json', 'boolean', 'number', 'integer', 'string', 'array', 'union'].includes(kind))
+        if (
+          !['object', 'json', 'boolean', 'number', 'integer', 'string', 'array', 'union', 'intersection'].includes(kind)
+        )
           throw new RequestError({ status: 400, payload: { body: `Not a valid body` } })
         if (kind === 'union') {
           let str = body === null ? 'null' : await streamToString(body)
           let json = JSON.parse(str)
           return unionize(json, schema)
         }
+        if (kind === 'intersection') {
+          let str = body === null ? 'null' : await streamToString(body)
+          let json = JSON.parse(str)
+          return intersectionize(json, schema)
+        }
         const str = body === null ? 'null' : await streamToString(body)
         let json
         try {
@@ -753,3 +761,13 @@ const unionize = (b: any, schema: STUnion) => {
   else if (error) throw new RequestError({ status: 400, payload: { body: error } })
   else throw new RequestError({ status: 400, payload: { body: `No matching body schema found` } })
 }
+
+const intersectionize = (b: any, schema: STIntersection) => {
+  let res
+  try {
+    for (let s of schema.allOf) res = validate(b, s, { parse: true })
+    return res
+  } catch (e) {
+    throw new RequestError({ status: 400, payload: { body: `No matching body schema found` } })
+  }
+}

package/src/types.ts

@@ -5,6 +5,7 @@ import type {
   STBoolean,
   STByteArray,
   STInteger,
+  STIntersection,
   STJson,
   STLiteral,
   STMultipartForm,
@@ -40,7 +41,7 @@ export type STBody =
   | Partial<{
       byteArray?: STByteArray | STStream
       text?: STString | STLiteral | STBoolean | STNumber | STInteger | STUnion | STStream
-      json?: STJson | STObject | STBoolean | STInteger | STNumber | STString | STArray | STUnion
+      json?: STJson | STObject | STBoolean | STInteger | STNumber | STString | STArray | STUnion | STIntersection
       urlForm?: STObject | STStream | STUnion
       multipart?: STMultipartForm | STStream | STUnion
       default?: STString | STByteArray | STStream | STAny