balda-js 0.0.39 → 0.0.40

package/lib/index.cjs

@@ -5,7 +5,7 @@ var pino = require('pino');
 var path = require('path');
 var Ajv = require('ajv');
 var addFormats = require('ajv-formats');
-var typebox = require('@sinclair/typebox');
+var zod = require('zod');
 var fs = require('fs/promises');
 var http = require('http');
 
@@ -948,7 +948,9 @@ var ajv = addFormats__default.default(new Ajv__default.default(), [
   "iso-time"
 ]);
 var validateSchema = (inputSchema, data, safe = false) => {
-  const validate2 = ajv.compile(inputSchema);
+  const jsonSchema = zod.z.toJSONSchema(inputSchema);
+  const { $schema, ...schemaWithoutMeta } = jsonSchema;
+  const validate2 = ajv.compile(schemaWithoutMeta);
   if (!validate2(data)) {
     if (safe) {
       return data;
@@ -984,16 +986,17 @@ var serialize = (schema, options) => {
       descriptor.value[SERIALIZE_METADATA] = {};
     }
     descriptor.value[SERIALIZE_METADATA][status] = {
+      name: propertyKey,
       schema,
       safe: options?.safe ?? true
     };
     if (!descriptor.value[SERIALIZE_WRAPPED]) {
       const originalMethod = descriptor.value;
-      descriptor.value = async function(...args2) {
+      const wrappedFunction = async function(...args2) {
         const res = args2[1];
         await originalMethod.apply(this, args2);
         const actualStatus = res.responseStatus;
-        const serializeMetadata = originalMethod[SERIALIZE_METADATA];
+        const serializeMetadata = wrappedFunction[SERIALIZE_METADATA];
         const schema2 = serializeMetadata?.[actualStatus]?.schema;
         const safe = serializeMetadata?.[actualStatus]?.safe ?? true;
         if (schema2 && !safe) {
@@ -1013,8 +1016,9 @@ var serialize = (schema, options) => {
           }
         }
       };
-      descriptor.value[SERIALIZE_WRAPPED] = true;
-      descriptor.value[SERIALIZE_METADATA] = originalMethod[SERIALIZE_METADATA];
+      wrappedFunction[SERIALIZE_WRAPPED] = true;
+      wrappedFunction[SERIALIZE_METADATA] = originalMethod[SERIALIZE_METADATA];
+      descriptor.value = wrappedFunction;
     }
   };
 };
@@ -2220,8 +2224,6 @@ var commandRegistry = CommandRegistry.getInstance();
 // src/runtime/native_request.ts
 var NativeRequest = class extends Request {
 };
-
-// src/server/http/request.ts
 var Request2 = class _Request extends NativeRequest {
   static fromRequest(request) {
     return new _Request(request.url, {
@@ -2236,19 +2238,19 @@ var Request2 = class _Request extends NativeRequest {
   static enrichRequest(request) {
     request.validate = (inputSchema, safe = false) => {
       if (typeof inputSchema === "function") {
-        inputSchema = inputSchema(typebox.Type);
+        inputSchema = inputSchema(zod.z);
       }
       return validateSchema(inputSchema, request.body || {}, safe);
     };
     request.validateQuery = (inputSchema, safe = false) => {
       if (typeof inputSchema === "function") {
-        inputSchema = inputSchema(typebox.Type);
+        inputSchema = inputSchema(zod.z);
       }
       return validateSchema(inputSchema, request.query || {}, safe);
     };
     request.validateAll = (inputSchema, safe = false) => {
       if (typeof inputSchema === "function") {
-        inputSchema = inputSchema(typebox.Type);
+        inputSchema = inputSchema(zod.z);
       }
       return validateSchema(
         inputSchema,
@@ -2355,7 +2357,7 @@ var Request2 = class _Request extends NativeRequest {
    */
   validate(inputSchema, safe = false) {
     if (typeof inputSchema === "function") {
-      inputSchema = inputSchema(typebox.Type);
+      inputSchema = inputSchema(zod.z);
     }
     return validateSchema(inputSchema, this.body || {}, safe);
   }
@@ -2364,7 +2366,7 @@ var Request2 = class _Request extends NativeRequest {
    */
   validateQuery(inputSchema, safe = false) {
     if (typeof inputSchema === "function") {
-      inputSchema = inputSchema(typebox.Type);
+      inputSchema = inputSchema(zod.z);
     }
     return validateSchema(inputSchema, this.query || {}, safe);
   }
@@ -2373,7 +2375,7 @@ var Request2 = class _Request extends NativeRequest {
    */
   validateAll(inputSchema, safe = false) {
     if (typeof inputSchema === "function") {
-      inputSchema = inputSchema(typebox.Type);
+      inputSchema = inputSchema(zod.z);
     }
     return validateSchema(
       inputSchema,
@@ -4134,8 +4136,6 @@ function parseMimeType(contentType) {
   }
   return trimmed.substring(0, semicolonIndex).trim().toLowerCase();
 }
-
-// src/plugins/swagger/swagger.ts
 var swagger = (globalOptions) => {
   let swaggerOptions = {
     type: "standard",
@@ -4167,9 +4167,54 @@ var swagger = (globalOptions) => {
     res.json(spec);
   });
 };
+function safeToJSONSchema(schema) {
+  try {
+    return zod.z.toJSONSchema(schema);
+  } catch (error) {
+    if (error instanceof Error && error.message.includes(
+      "Custom types cannot be represented in JSON Schema"
+    )) {
+      const def = schema._def;
+      if (def?.typeName === "ZodInstanceof") {
+        const testFile = new File([], "test");
+        if (schema.safeParse(testFile).success) {
+          return { type: "string", format: "binary" };
+        }
+      }
+      if (def?.typeName === "ZodObject" && def?.shape) {
+        const properties = {};
+        const required = [];
+        for (const [key, fieldSchema] of Object.entries(def.shape)) {
+          try {
+            properties[key] = safeToJSONSchema(fieldSchema);
+            const fieldDef = fieldSchema._def;
+            if (fieldDef?.typeName !== "ZodOptional" && fieldDef?.typeName !== "ZodDefault") {
+              required.push(key);
+            }
+          } catch {
+            properties[key] = { type: "string", format: "binary" };
+          }
+        }
+        return {
+          type: "object",
+          properties,
+          ...required.length > 0 ? { required } : {}
+        };
+      }
+      return { type: "object", description: "Custom type" };
+    }
+    throw error;
+  }
+}
 function generateOpenAPISpec(globalOptions) {
   const routes = router.getRoutes();
   const paths = {};
+  if (Array.isArray(globalOptions.models)) {
+    globalOptions.models = globalOptions.models.reduce((acc, model) => {
+      acc[model.$id || "name"] = model;
+      return acc;
+    }, {});
+  }
   const components = {
     ...globalOptions.components,
     securitySchemes: globalOptions.securitySchemes || {},
@@ -4191,15 +4236,17 @@ function generateOpenAPISpec(globalOptions) {
     };
     let parameters = [];
     if (swaggerOptions?.query) {
-      if (swaggerOptions.query.type === "object" && swaggerOptions.query.properties) {
+      if (swaggerOptions.query.type === "object" && swaggerOptions.query.shape) {
         for (const [name, schema] of Object.entries(
-          swaggerOptions.query.properties
+          swaggerOptions.query.shape
         )) {
           parameters.push({
             name,
             in: "query",
-            required: Array.isArray(swaggerOptions.query.required) ? swaggerOptions.query.required.includes(name) : false,
-            schema: typeboxToOpenAPI(schema)
+            required: Array.isArray(
+              swaggerOptions.query.shape[name].required
+            ) ? swaggerOptions.query.shape[name].required.includes(name) : false,
+            schema: safeToJSONSchema(schema)
           });
         }
       }
@@ -4224,7 +4271,7 @@ function generateOpenAPISpec(globalOptions) {
       operation.requestBody = {
         content: {
           [routeBodyContentType]: {
-            schema: typeboxToOpenAPI(swaggerOptions.requestBody)
+            schema: safeToJSONSchema(swaggerOptions.requestBody)
           }
         },
         required: true
@@ -4248,7 +4295,7 @@ function generateOpenAPISpec(globalOptions) {
           description: `Response for ${statusCode}`,
           content: {
             "application/json": {
-              schema: typeboxToOpenAPI(schema)
+              schema: safeToJSONSchema(schema)
             }
           }
         };
@@ -4262,7 +4309,7 @@ function generateOpenAPISpec(globalOptions) {
           description: `Error response for ${statusCode}`,
           content: {
             "application/json": {
-              schema: typeboxToOpenAPI(schema)
+              schema: safeToJSONSchema(schema)
             }
           }
         };
@@ -4456,13 +4503,6 @@ function generateRapiDocUI(specUrl, globalOptions) {
 </html>
   `;
 }
-function typeboxToOpenAPI(schema) {
-  if (!schema) {
-    return void 0;
-  }
-  const { $id, $schema, ...rest } = schema;
-  return rest;
-}
 function extractPathParams(path2, paramSchema) {
   const params = [];
   const regex = /:([a-zA-Z0-9_]+)/g;
@@ -4470,8 +4510,10 @@ function extractPathParams(path2, paramSchema) {
   while ((match = regex.exec(path2)) !== null) {
     const name = match[1];
     let schema = { type: "string" };
-    if (paramSchema && paramSchema.type === "object" && paramSchema.properties && paramSchema.properties[name]) {
-      schema = typeboxToOpenAPI(paramSchema.properties[name]) || {
+    if (paramSchema && paramSchema.shape && paramSchema.shape[name]) {
+      schema = safeToJSONSchema(
+        paramSchema.shape[name]
+      ) || {
         type: "string"
       };
     }