@forklaunch/validator 0.10.14 → 0.10.16

package/lib/__test__/utils/mockSchemaValidator.d.mts

@@ -1,5 +1,5 @@
 import { SchemaObject } from 'openapi3-ts/oas31';
-import { S as SchemaValidator, L as LiteralSchema, a as ParseResult } from '../../schema.types-wl77iEsE.mjs';
+import { S as SchemaValidator, L as LiteralSchema, a as ParseResult } from '../../schema.types-CR2kDA3N.mjs';
 import '@forklaunch/common';
 import '@sinclair/typebox';
 import '@sinclair/typebox/compiler';

package/lib/__test__/utils/mockSchemaValidator.d.ts

@@ -1,5 +1,5 @@
 import { SchemaObject } from 'openapi3-ts/oas31';
-import { S as SchemaValidator, L as LiteralSchema, a as ParseResult } from '../../schema.types-wl77iEsE.js';
+import { S as SchemaValidator, L as LiteralSchema, a as ParseResult } from '../../schema.types-CR2kDA3N.js';
 import '@forklaunch/common';
 import '@sinclair/typebox';
 import '@sinclair/typebox/compiler';

package/lib/index.d.mts

@@ -1,5 +1,5 @@
-import { P as ParseError } from './schema.types-wl77iEsE.mjs';
-export { A as AnySchemaValidator, I as IdiomaticSchema, e as Increment, K as KeyTypes, L as LiteralSchema, a as ParseResult, d as Schema, b as SchemaResolve, c as SchemaTranslate, S as SchemaValidator, U as UnboxedObjectSchema } from './schema.types-wl77iEsE.mjs';
+import { P as ParseError } from './schema.types-CR2kDA3N.mjs';
+export { A as AnySchemaValidator, I as IdiomaticSchema, e as Increment, K as KeyTypes, L as LiteralSchema, a as ParseResult, d as Schema, b as SchemaResolve, c as SchemaTranslate, S as SchemaValidator, U as UnboxedObjectSchema } from './schema.types-CR2kDA3N.mjs';
 import '@forklaunch/common';
 import 'openapi3-ts/oas31';
 import '@sinclair/typebox';

package/lib/index.d.ts

@@ -1,5 +1,5 @@
-import { P as ParseError } from './schema.types-wl77iEsE.js';
-export { A as AnySchemaValidator, I as IdiomaticSchema, e as Increment, K as KeyTypes, L as LiteralSchema, a as ParseResult, d as Schema, b as SchemaResolve, c as SchemaTranslate, S as SchemaValidator, U as UnboxedObjectSchema } from './schema.types-wl77iEsE.js';
+import { P as ParseError } from './schema.types-CR2kDA3N.js';
+export { A as AnySchemaValidator, I as IdiomaticSchema, e as Increment, K as KeyTypes, L as LiteralSchema, a as ParseResult, d as Schema, b as SchemaResolve, c as SchemaTranslate, S as SchemaValidator, U as UnboxedObjectSchema } from './schema.types-CR2kDA3N.js';
 import '@forklaunch/common';
 import 'openapi3-ts/oas31';
 import '@sinclair/typebox';

package/lib/{schema.types-wl77iEsE.d.mts → schema.types-CR2kDA3N.d.mts}

@@ -40,7 +40,7 @@ declare class TypeboxSchemaValidator implements SchemaValidator<(<T>() => TTrans
     unknown: TUnknown;
     never: TNever;
     binary: TTransform<TString, Uint8Array<ArrayBuffer>>;
-    file: TTransform<TUnsafe<Buffer<ArrayBuffer>>, Blob>;
+    file: TTransform<TUnion<[TUnsafe<Buffer>, TUnsafe<ArrayBuffer>, TUnsafe<Blob>, TString]>, Blob>;
     type: <T>() => TTransform<TAny, T>;
     /**
      * Extracts the error type of a schema for error messages.
@@ -251,7 +251,7 @@ declare class ZodSchemaValidator implements SchemaValidator<(<T>() => ZodType<T>
     unknown: z.ZodUnknown;
     never: z.ZodNever;
     binary: z.ZodEffects<z.ZodString, Uint8Array<ArrayBuffer>, string>;
-    file: z.ZodEffects<z.ZodType<Buffer<ArrayBuffer>, z.ZodTypeDef, Buffer<ArrayBuffer>>, Blob, Buffer<ArrayBuffer>>;
+    file: z.ZodEffects<z.ZodEffects<z.ZodUnion<[z.ZodType<Buffer<ArrayBufferLike>, z.ZodTypeDef, Buffer<ArrayBufferLike>>, z.ZodType<ArrayBuffer, z.ZodTypeDef, ArrayBuffer>, z.ZodType<Blob, z.ZodTypeDef, Blob>, z.ZodString]>, Blob, string | ArrayBuffer | Buffer<ArrayBufferLike> | Blob>, Blob, string | ArrayBuffer | Buffer<ArrayBufferLike> | Blob>;
     type: <T>() => ZodType<T>;
     /**
      * Compiles schema if this exists, for optimal performance.

package/lib/{schema.types-wl77iEsE.d.ts → schema.types-CR2kDA3N.d.ts}

@@ -40,7 +40,7 @@ declare class TypeboxSchemaValidator implements SchemaValidator<(<T>() => TTrans
     unknown: TUnknown;
     never: TNever;
     binary: TTransform<TString, Uint8Array<ArrayBuffer>>;
-    file: TTransform<TUnsafe<Buffer<ArrayBuffer>>, Blob>;
+    file: TTransform<TUnion<[TUnsafe<Buffer>, TUnsafe<ArrayBuffer>, TUnsafe<Blob>, TString]>, Blob>;
     type: <T>() => TTransform<TAny, T>;
     /**
      * Extracts the error type of a schema for error messages.
@@ -251,7 +251,7 @@ declare class ZodSchemaValidator implements SchemaValidator<(<T>() => ZodType<T>
     unknown: z.ZodUnknown;
     never: z.ZodNever;
     binary: z.ZodEffects<z.ZodString, Uint8Array<ArrayBuffer>, string>;
-    file: z.ZodEffects<z.ZodType<Buffer<ArrayBuffer>, z.ZodTypeDef, Buffer<ArrayBuffer>>, Blob, Buffer<ArrayBuffer>>;
+    file: z.ZodEffects<z.ZodEffects<z.ZodUnion<[z.ZodType<Buffer<ArrayBufferLike>, z.ZodTypeDef, Buffer<ArrayBufferLike>>, z.ZodType<ArrayBuffer, z.ZodTypeDef, ArrayBuffer>, z.ZodType<Blob, z.ZodTypeDef, Blob>, z.ZodString]>, Blob, string | ArrayBuffer | Buffer<ArrayBufferLike> | Blob>, Blob, string | ArrayBuffer | Buffer<ArrayBufferLike> | Blob>;
     type: <T>() => ZodType<T>;
     /**
      * Compiles schema if this exists, for optimal performance.

package/lib/src/typebox/index.d.mts

@@ -1,6 +1,6 @@
 export * from '@sinclair/typebox';
-import { T as TypeboxSchemaValidator } from '../../schema.types-wl77iEsE.mjs';
-export { i as SafeTObject, f as TCatchall, l as TIdiomaticSchema, h as TObjectShape, g as TOuterArray, o as TResolve, j as TSchemaTranslate, m as TUnionTupleContainer, k as UnboxedTObjectSchema, n as UnionTupleTResolve } from '../../schema.types-wl77iEsE.mjs';
+import { T as TypeboxSchemaValidator } from '../../schema.types-CR2kDA3N.mjs';
+export { i as SafeTObject, f as TCatchall, l as TIdiomaticSchema, h as TObjectShape, g as TOuterArray, o as TResolve, j as TSchemaTranslate, m as TUnionTupleContainer, k as UnboxedTObjectSchema, n as UnionTupleTResolve } from '../../schema.types-CR2kDA3N.mjs';
 import '@forklaunch/common';
 import 'openapi3-ts/oas31';
 import '@sinclair/typebox/compiler';

package/lib/src/typebox/index.d.ts

@@ -1,6 +1,6 @@
 export * from '@sinclair/typebox';
-import { T as TypeboxSchemaValidator } from '../../schema.types-wl77iEsE.js';
-export { i as SafeTObject, f as TCatchall, l as TIdiomaticSchema, h as TObjectShape, g as TOuterArray, o as TResolve, j as TSchemaTranslate, m as TUnionTupleContainer, k as UnboxedTObjectSchema, n as UnionTupleTResolve } from '../../schema.types-wl77iEsE.js';
+import { T as TypeboxSchemaValidator } from '../../schema.types-CR2kDA3N.js';
+export { i as SafeTObject, f as TCatchall, l as TIdiomaticSchema, h as TObjectShape, g as TOuterArray, o as TResolve, j as TSchemaTranslate, m as TUnionTupleContainer, k as UnboxedTObjectSchema, n as UnionTupleTResolve } from '../../schema.types-CR2kDA3N.js';
 import '@forklaunch/common';
 import 'openapi3-ts/oas31';
 import '@sinclair/typebox/compiler';

package/lib/src/typebox/index.js

@@ -257,14 +257,46 @@ var TypeboxSchemaValidator = class {
     return "";
   });
   file = import_typebox.Type.Transform(
-    import_typebox.Type.Unsafe({
-      errorType: "binary",
-      format: "binary",
-      example: "a raw buffer or file stream",
-      title: "File"
-    })
+    import_typebox.Type.Union([
+      import_typebox.Type.Unsafe({
+        errorType: "binary",
+        format: "binary",
+        example: "a raw buffer or file stream",
+        title: "File"
+      }),
+      import_typebox.Type.Unsafe({
+        errorType: "binary",
+        format: "binary",
+        example: "an array buffer",
+        title: "File"
+      }),
+      import_typebox.Type.Unsafe({
+        errorType: "binary",
+        format: "binary",
+        example: "a blob object",
+        title: "File"
+      }),
+      import_typebox.Type.String({
+        errorType: "binary",
+        format: "binary",
+        example: "a string content",
+        title: "File"
+      })
+    ])
   ).Decode((value) => {
-    return new import_common.InMemoryBlob(value);
+    if (value instanceof Buffer) {
+      return new import_common.InMemoryBlob(value);
+    }
+    if (value instanceof ArrayBuffer) {
+      return new import_common.InMemoryBlob(Buffer.from(value));
+    }
+    if (value instanceof Blob) {
+      return value;
+    }
+    if (typeof value === "string") {
+      return new import_common.InMemoryBlob(Buffer.from(value));
+    }
+    return new import_common.InMemoryBlob(Buffer.from(value));
   }).Encode((value) => value.content);
   type = () => this.any;
   /**
@@ -304,7 +336,7 @@ var TypeboxSchemaValidator = class {
     }
     const newSchema = {};
     Object.getOwnPropertyNames(schema).forEach((key) => {
-      if (import_typebox.KindGuard.IsSchema(schema[key])) {
+      if (import_typebox.KindGuard.IsSchema(schema[key]) || import_typebox.KindGuard.IsTransform(schema[key])) {
         newSchema[key] = schema[key];
       } else {
         const schemified = this.schemify(schema[key]);
@@ -522,20 +554,25 @@ var TypeboxSchemaValidator = class {
    * @returns {SchemaObject} The OpenAPI schema object.
    */
   openapi(schema) {
-    let schemified = this.schemify(schema);
+    const schemified = this.schemify(schema);
+    let processedSchema;
     if (import_typebox.KindGuard.IsDate(schemified)) {
-      schemified = import_typebox.Type.String({
+      processedSchema = import_typebox.Type.String({
         format: "date-time"
       });
+    } else {
+      processedSchema = (0, import_common.deepCloneWithoutUndefined)(schemified);
     }
-    const newSchema = Object.assign({}, schemified);
+    const newSchema = Object.assign({}, processedSchema);
     if (Object.hasOwn(newSchema, "properties")) {
       if (newSchema.properties) {
-        Object.entries({ ...schemified.properties }).forEach(([key, value]) => {
-          if (import_typebox.KindGuard.IsSchema(value) && newSchema.properties) {
-            newSchema.properties[key] = this.openapi(value);
+        Object.entries({ ...processedSchema.properties }).forEach(
+          ([key, value]) => {
+            if (import_typebox.KindGuard.IsSchema(value) && newSchema.properties) {
+              newSchema.properties[key] = this.openapi(value);
+            }
           }
-        });
+        );
       }
     }
     if (Object.hasOwn(newSchema, "items")) {

package/lib/src/typebox/index.mjs

@@ -2,7 +2,7 @@
 export * from "@sinclair/typebox";
 
 // src/typebox/typeboxSchemaValidator.ts
-import { InMemoryBlob } from "@forklaunch/common";
+import { deepCloneWithoutUndefined, InMemoryBlob } from "@forklaunch/common";
 import {
   FormatRegistry,
   Kind,
@@ -208,14 +208,46 @@ var TypeboxSchemaValidator = class {
     return "";
   });
   file = Type.Transform(
-    Type.Unsafe({
-      errorType: "binary",
-      format: "binary",
-      example: "a raw buffer or file stream",
-      title: "File"
-    })
+    Type.Union([
+      Type.Unsafe({
+        errorType: "binary",
+        format: "binary",
+        example: "a raw buffer or file stream",
+        title: "File"
+      }),
+      Type.Unsafe({
+        errorType: "binary",
+        format: "binary",
+        example: "an array buffer",
+        title: "File"
+      }),
+      Type.Unsafe({
+        errorType: "binary",
+        format: "binary",
+        example: "a blob object",
+        title: "File"
+      }),
+      Type.String({
+        errorType: "binary",
+        format: "binary",
+        example: "a string content",
+        title: "File"
+      })
+    ])
   ).Decode((value) => {
-    return new InMemoryBlob(value);
+    if (value instanceof Buffer) {
+      return new InMemoryBlob(value);
+    }
+    if (value instanceof ArrayBuffer) {
+      return new InMemoryBlob(Buffer.from(value));
+    }
+    if (value instanceof Blob) {
+      return value;
+    }
+    if (typeof value === "string") {
+      return new InMemoryBlob(Buffer.from(value));
+    }
+    return new InMemoryBlob(Buffer.from(value));
   }).Encode((value) => value.content);
   type = () => this.any;
   /**
@@ -255,7 +287,7 @@ var TypeboxSchemaValidator = class {
     }
     const newSchema = {};
     Object.getOwnPropertyNames(schema).forEach((key) => {
-      if (KindGuard.IsSchema(schema[key])) {
+      if (KindGuard.IsSchema(schema[key]) || KindGuard.IsTransform(schema[key])) {
         newSchema[key] = schema[key];
       } else {
         const schemified = this.schemify(schema[key]);
@@ -473,20 +505,25 @@ var TypeboxSchemaValidator = class {
    * @returns {SchemaObject} The OpenAPI schema object.
    */
   openapi(schema) {
-    let schemified = this.schemify(schema);
+    const schemified = this.schemify(schema);
+    let processedSchema;
     if (KindGuard.IsDate(schemified)) {
-      schemified = Type.String({
+      processedSchema = Type.String({
         format: "date-time"
       });
+    } else {
+      processedSchema = deepCloneWithoutUndefined(schemified);
     }
-    const newSchema = Object.assign({}, schemified);
+    const newSchema = Object.assign({}, processedSchema);
     if (Object.hasOwn(newSchema, "properties")) {
       if (newSchema.properties) {
-        Object.entries({ ...schemified.properties }).forEach(([key, value]) => {
-          if (KindGuard.IsSchema(value) && newSchema.properties) {
-            newSchema.properties[key] = this.openapi(value);
+        Object.entries({ ...processedSchema.properties }).forEach(
+          ([key, value]) => {
+            if (KindGuard.IsSchema(value) && newSchema.properties) {
+              newSchema.properties[key] = this.openapi(value);
+            }
           }
-        });
+        );
       }
     }
     if (Object.hasOwn(newSchema, "items")) {

package/lib/src/zod/index.d.mts

@@ -1,6 +1,6 @@
 export { ZodAny, ZodArray, ZodBigInt, ZodBoolean, ZodDate, ZodEffects, ZodEnum, ZodFunction, ZodLiteral, ZodNever, ZodNull, ZodNumber, ZodObject, ZodOptional, ZodPipeline, ZodPromise, ZodRawShape, ZodRecord, ZodString, ZodSymbol, ZodTuple, ZodType, ZodTypeAny, ZodUndefined, ZodUnion, ZodUnknown, ZodVoid } from 'zod/v3';
-import { Z as ZodSchemaValidator } from '../../schema.types-wl77iEsE.mjs';
-export { w as TupleZodResolve, t as UnboxedZodObjectSchema, y as UnionZodResolve, p as ZodCatchall, u as ZodIdiomaticSchema, r as ZodObjectShape, q as ZodOuterArray, B as ZodRecordKey, z as ZodResolve, s as ZodSchemaTranslate, v as ZodTupleContainer, x as ZodUnionContainer } from '../../schema.types-wl77iEsE.mjs';
+import { Z as ZodSchemaValidator } from '../../schema.types-CR2kDA3N.mjs';
+export { w as TupleZodResolve, t as UnboxedZodObjectSchema, y as UnionZodResolve, p as ZodCatchall, u as ZodIdiomaticSchema, r as ZodObjectShape, q as ZodOuterArray, B as ZodRecordKey, z as ZodResolve, s as ZodSchemaTranslate, v as ZodTupleContainer, x as ZodUnionContainer } from '../../schema.types-CR2kDA3N.mjs';
 import '@forklaunch/common';
 import 'openapi3-ts/oas31';
 import '@sinclair/typebox';

package/lib/src/zod/index.d.ts

@@ -1,6 +1,6 @@
 export { ZodAny, ZodArray, ZodBigInt, ZodBoolean, ZodDate, ZodEffects, ZodEnum, ZodFunction, ZodLiteral, ZodNever, ZodNull, ZodNumber, ZodObject, ZodOptional, ZodPipeline, ZodPromise, ZodRawShape, ZodRecord, ZodString, ZodSymbol, ZodTuple, ZodType, ZodTypeAny, ZodUndefined, ZodUnion, ZodUnknown, ZodVoid } from 'zod/v3';
-import { Z as ZodSchemaValidator } from '../../schema.types-wl77iEsE.js';
-export { w as TupleZodResolve, t as UnboxedZodObjectSchema, y as UnionZodResolve, p as ZodCatchall, u as ZodIdiomaticSchema, r as ZodObjectShape, q as ZodOuterArray, B as ZodRecordKey, z as ZodResolve, s as ZodSchemaTranslate, v as ZodTupleContainer, x as ZodUnionContainer } from '../../schema.types-wl77iEsE.js';
+import { Z as ZodSchemaValidator } from '../../schema.types-CR2kDA3N.js';
+export { w as TupleZodResolve, t as UnboxedZodObjectSchema, y as UnionZodResolve, p as ZodCatchall, u as ZodIdiomaticSchema, r as ZodObjectShape, q as ZodOuterArray, B as ZodRecordKey, z as ZodResolve, s as ZodSchemaTranslate, v as ZodTupleContainer, x as ZodUnionContainer } from '../../schema.types-CR2kDA3N.js';
 import '@forklaunch/common';
 import 'openapi3-ts/oas31';
 import '@sinclair/typebox';

package/lib/src/zod/index.js

@@ -58,6 +58,7 @@ __export(zod_exports, {
 module.exports = __toCommonJS(zod_exports);
 
 // src/zod/zodSchemaValidator.ts
+var import_common = require("@forklaunch/common");
 var import_v32 = require("zod/v3");
 
 // shims/zod-v3-openapi/zod-openapi.ts
@@ -774,8 +775,27 @@ var ZodSchemaValidator = class {
     format: "binary",
     example: "a base-64 encodable string"
   });
-  file = import_v32.z.instanceof(Buffer).transform((val) => {
+  file = import_v32.z.union([
+    import_v32.z.instanceof(Buffer),
+    import_v32.z.instanceof(ArrayBuffer),
+    import_v32.z.instanceof(Blob),
+    import_v32.z.string()
+  ]).transform((val) => {
+    if (val instanceof Buffer) {
+      return new Blob([val]);
+    }
+    if (val instanceof ArrayBuffer) {
+      return new Blob([val]);
+    }
+    if (val instanceof Blob) {
+      return val;
+    }
+    if (typeof val === "string") {
+      return new Blob([val]);
+    }
     return new Blob([val]);
+  }).refine((val) => val instanceof Blob, {
+    message: "Invalid file type: expected Buffer, ArrayBuffer, Blob, or string"
   }).openapi({
     title: "File",
     type: "string",
@@ -960,7 +980,8 @@ var ZodSchemaValidator = class {
    * @returns {SchemaObject} The OpenAPI schema object.
    */
   openapi(schema) {
-    return generateSchema(this.schemify(schema));
+    const schemified = this.schemify(schema);
+    return generateSchema((0, import_common.deepCloneWithoutUndefined)(schemified));
   }
 };
 

package/lib/src/zod/index.mjs

@@ -1,4 +1,5 @@
 // src/zod/zodSchemaValidator.ts
+import { deepCloneWithoutUndefined } from "@forklaunch/common";
 import {
   z as z2,
   ZodType
@@ -718,8 +719,27 @@ var ZodSchemaValidator = class {
     format: "binary",
     example: "a base-64 encodable string"
   });
-  file = z2.instanceof(Buffer).transform((val) => {
+  file = z2.union([
+    z2.instanceof(Buffer),
+    z2.instanceof(ArrayBuffer),
+    z2.instanceof(Blob),
+    z2.string()
+  ]).transform((val) => {
+    if (val instanceof Buffer) {
+      return new Blob([val]);
+    }
+    if (val instanceof ArrayBuffer) {
+      return new Blob([val]);
+    }
+    if (val instanceof Blob) {
+      return val;
+    }
+    if (typeof val === "string") {
+      return new Blob([val]);
+    }
     return new Blob([val]);
+  }).refine((val) => val instanceof Blob, {
+    message: "Invalid file type: expected Buffer, ArrayBuffer, Blob, or string"
   }).openapi({
     title: "File",
     type: "string",
@@ -904,7 +924,8 @@ var ZodSchemaValidator = class {
    * @returns {SchemaObject} The OpenAPI schema object.
    */
   openapi(schema) {
-    return generateSchema(this.schemify(schema));
+    const schemified = this.schemify(schema);
+    return generateSchema(deepCloneWithoutUndefined(schemified));
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forklaunch/validator",
-  "version": "0.10.14",
+  "version": "0.10.16",
   "description": "Schema validator for ForkLaunch components.",
   "homepage": "https://github.com/forklaunch/forklaunch-js#readme",
   "bugs": {
@@ -61,13 +61,13 @@
     "@sinclair/typebox": "^0.34.41",
     "ts-deepmerge": "^7.0.3",
     "zod": "^4.1.11",
-    "@forklaunch/common": "0.6.14"
+    "@forklaunch/common": "0.6.16"
   },
   "devDependencies": {
-    "@eslint/js": "^9.36.0",
+    "@eslint/js": "^9.37.0",
     "@types/jest": "^30.0.0",
-    "@types/node": "^24.6.0",
-    "@typescript/native-preview": "7.0.0-dev.20250930.1",
+    "@types/node": "^24.6.2",
+    "@typescript/native-preview": "7.0.0-dev.20251003.1",
     "@vitest/coverage-v8": "^3.2.4",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.4",