@quentinadam/zod 0.1.7 → 0.1.9

package/dist/zod.d.ts

@@ -12,7 +12,7 @@ type Result<T> = {
 } | {
     success: false;
 };
-export declare function getType(value: unknown): string;
+export declare function inspectValue(value: unknown): string;
 export declare class Schema<T> {
     protected readonly safeParseFn: (value: unknown, context?: Context) => Result<T>;
     constructor(safeParseFn: (value: unknown, context?: Context) => Result<T>);
@@ -47,6 +47,9 @@ declare function createArraySchema<T>(schema: Schema<T>): Schema<T[]>;
 declare function createBigIntSchema(): Schema<bigint>;
 declare function createBooleanSchema(): Schema<boolean>;
 declare function createDateSchema(): Schema<Date>;
+declare function createDiscrimatedUnionSchema<B extends string, T extends Record<B, unknown>[]>(discriminator: B, schemas: {
+    [K in keyof T]: ObjectSchema<T[K]>;
+}): Schema<T[number]>;
 declare function createInstanceofSchema<T>(schema: {
     new (...args: any[]): T;
 }): Schema<T>;
@@ -73,4 +76,4 @@ declare function createUnionSchema<T extends unknown[]>(schemas: {
     [K in keyof T]: Schema<T[K]>;
 }): Schema<T[number]>;
 declare function createUnknownSchema(): Schema<unknown>;
-export { createArraySchema as array, createBigIntSchema as bigint, createBooleanSchema as boolean, createDateSchema as date, createInstanceofSchema as instanceof, createLazySchema as lazy, createLiteralSchema as literal, createNullableSchema as nullable, createNullishSchema as nullish, createNullSchema as null, createNumberSchema as number, createObjectSchema as object, createOptionalSchema as optional, createRecordSchema as record, createStrictObjectSchema as strictObject, createStringSchema as string, createTupleSchema as tuple, createUndefinedSchema as undefined, createUnionSchema as union, createUnknownSchema as unknown, };
+export { createArraySchema as array, createBigIntSchema as bigint, createBooleanSchema as boolean, createDateSchema as date, createDiscrimatedUnionSchema as discriminatedUnion, createInstanceofSchema as instanceof, createLazySchema as lazy, createLiteralSchema as literal, createNullableSchema as nullable, createNullishSchema as nullish, createNullSchema as null, createNumberSchema as number, createObjectSchema as object, createOptionalSchema as optional, createRecordSchema as record, createStrictObjectSchema as strictObject, createStringSchema as string, createTupleSchema as tuple, createUndefinedSchema as undefined, createUnionSchema as union, createUnknownSchema as unknown, };

package/dist/zod.js

@@ -1,10 +1,22 @@
-export function getType(value) {
+export function inspectValue(value) {
     if (value === undefined)
         return 'undefined';
     if (value === null)
         return 'null';
     if (Array.isArray(value))
         return 'array';
+    if (typeof value === 'string') {
+        return `string ${value.length > 32 ? JSON.stringify(value.slice(0, 32) + '...') : JSON.stringify(value)}`;
+    }
+    if (typeof value === 'number') {
+        return `number ${value}`;
+    }
+    if (typeof value === 'bigint') {
+        return `bigint ${value.toString()}`;
+    }
+    if (typeof value === 'boolean') {
+        return `boolean ${value}`;
+    }
     return typeof value;
 }
 export class Schema {
@@ -70,7 +82,7 @@ export class ObjectSchema extends Schema {
         super((value, context) => {
             if (typeof value !== 'object' || value === null || Array.isArray(value)) {
                 if (context !== undefined) {
-                    context.errors.push({ path: context.path, message: `Expected object, got ${getType(value)}` });
+                    context.errors.push({ path: context.path, message: `Expected object, got ${inspectValue(value)}` });
                 }
                 return { success: false };
             }
@@ -121,7 +133,7 @@ function createArraySchema(schema) {
     return new Schema((value, context) => {
         if (!Array.isArray(value)) {
             if (context !== undefined) {
-                context.errors.push({ path: context.path, message: `Expected array, got ${getType(value)}` });
+                context.errors.push({ path: context.path, message: `Expected array, got ${inspectValue(value)}` });
             }
             return { success: false };
         }
@@ -154,7 +166,7 @@ function createBigIntSchema() {
     return new Schema((value, context) => {
         if (typeof value !== 'bigint') {
             if (context !== undefined) {
-                context.errors.push({ path: context.path, message: `Expected bigint, got ${getType(value)}` });
+                context.errors.push({ path: context.path, message: `Expected bigint, got ${inspectValue(value)}` });
             }
             return { success: false };
         }
@@ -165,7 +177,7 @@ function createBooleanSchema() {
     return new Schema((value, context) => {
         if (typeof value !== 'boolean') {
             if (context !== undefined) {
-                context.errors.push({ path: context.path, message: `Expected boolean, got ${getType(value)}` });
+                context.errors.push({ path: context.path, message: `Expected boolean, got ${inspectValue(value)}` });
             }
             return { success: false };
         }
@@ -175,6 +187,44 @@ function createBooleanSchema() {
 function createDateSchema() {
     return createInstanceofSchema(Date);
 }
+function createDiscrimatedUnionSchema(discriminator, schemas) {
+    return new Schema((value, context) => {
+        if (typeof value !== 'object' || value === null || Array.isArray(value)) {
+            if (context !== undefined) {
+                context.errors.push({
+                    path: context.path,
+                    message: `Expected object, got ${inspectValue(value)}`,
+                });
+            }
+            return { success: false };
+        }
+        const object = value;
+        const discriminatorValue = object[discriminator];
+        const discriminatedSchemas = schemas.filter((schema) => {
+            return schema.shape[discriminator].safeParse(discriminatorValue).success;
+        });
+        if (discriminatedSchemas.length > 1) {
+            if (context !== undefined) {
+                context.errors.push({
+                    path: [...context.path, discriminator],
+                    message: `Ambiguous discriminator value ${inspectValue(discriminatorValue)}`,
+                });
+            }
+            return { success: false };
+        }
+        const discriminatedSchema = discriminatedSchemas[0];
+        if (discriminatedSchema === undefined) {
+            if (context !== undefined) {
+                context.errors.push({
+                    path: [...context.path, discriminator],
+                    message: `Invalid discriminator value ${inspectValue(discriminatorValue)}`,
+                });
+            }
+            return { success: false };
+        }
+        return discriminatedSchema.internalSafeParse(value, context);
+    });
+}
 // deno-lint-ignore no-explicit-any
 function createInstanceofSchema(schema) {
     return new Schema((value, context) => {
@@ -182,7 +232,7 @@ function createInstanceofSchema(schema) {
             if (context !== undefined) {
                 context.errors.push({
                     path: context.path,
-                    message: `Expected instance of ${schema.name}, got ${getType(value)}`,
+                    message: `Expected instance of ${schema.name}, got ${inspectValue(value)}`,
                 });
             }
             return { success: false };
@@ -200,7 +250,10 @@ function createLiteralSchema(literal) {
     return new Schema((value, context) => {
         if (value !== literal) {
             if (context !== undefined) {
-                context.errors.push({ path: context.path, message: `Expected literal ${literal}, got ${getType(value)}` });
+                context.errors.push({
+                    path: context.path,
+                    message: `Expected literal ${JSON.stringify(literal)}, got ${inspectValue(value)}`,
+                });
             }
             return { success: false };
         }
@@ -223,7 +276,7 @@ function createNullSchema() {
     return new Schema((value, context) => {
         if (value !== null) {
             if (context !== undefined) {
-                context.errors.push({ path: context.path, message: `Expected null, got ${getType(value)}` });
+                context.errors.push({ path: context.path, message: `Expected null, got ${inspectValue(value)}` });
             }
             return { success: false };
         }
@@ -234,7 +287,7 @@ function createNumberSchema() {
     return new Schema((value, context) => {
         if (typeof value !== 'number') {
             if (context !== undefined) {
-                context.errors.push({ path: context.path, message: `Expected number, got ${getType(value)}` });
+                context.errors.push({ path: context.path, message: `Expected number, got ${inspectValue(value)}` });
             }
             return { success: false };
         }
@@ -244,7 +297,10 @@ function createNumberSchema() {
 function createRecordSchema(schema) {
     return new Schema((record, context) => {
         if (typeof record !== 'object' || record === null || Array.isArray(record)) {
-            throw new Error(`Expected object, got ${getType(record)}`);
+            if (context !== undefined) {
+                context.errors.push({ path: context.path, message: `Expected object, got ${inspectValue(record)}` });
+            }
+            return { success: false };
         }
         const result = (() => {
             const parsedObject = {};
@@ -275,7 +331,7 @@ function createStringSchema() {
     return new Schema((value, context) => {
         if (typeof value !== 'string') {
             if (context !== undefined) {
-                context.errors.push({ path: context.path, message: `Expected string, got ${getType(value)}` });
+                context.errors.push({ path: context.path, message: `Expected string, got ${inspectValue(value)}` });
             }
             return { success: false };
         }
@@ -286,7 +342,7 @@ function createTupleSchema(schema) {
     return new Schema((value, context) => {
         if (!Array.isArray(value)) {
             if (context !== undefined) {
-                context.errors.push({ path: context.path, message: `Expected array, got ${getType(value)}` });
+                context.errors.push({ path: context.path, message: `Expected array, got ${inspectValue(value)}` });
             }
             return { success: false };
         }
@@ -329,7 +385,7 @@ function createUndefinedSchema() {
     return new Schema((value, context) => {
         if (value !== undefined) {
             if (context !== undefined) {
-                context.errors.push({ path: context.path, message: `Expected undefined, got ${getType(value)}` });
+                context.errors.push({ path: context.path, message: `Expected undefined, got ${inspectValue(value)}` });
             }
             return { success: false };
         }
@@ -357,4 +413,4 @@ function createUnknownSchema() {
         return { success: true, data: value };
     });
 }
-export { createArraySchema as array, createBigIntSchema as bigint, createBooleanSchema as boolean, createDateSchema as date, createInstanceofSchema as instanceof, createLazySchema as lazy, createLiteralSchema as literal, createNullableSchema as nullable, createNullishSchema as nullish, createNullSchema as null, createNumberSchema as number, createObjectSchema as object, createOptionalSchema as optional, createRecordSchema as record, createStrictObjectSchema as strictObject, createStringSchema as string, createTupleSchema as tuple, createUndefinedSchema as undefined, createUnionSchema as union, createUnknownSchema as unknown, };
+export { createArraySchema as array, createBigIntSchema as bigint, createBooleanSchema as boolean, createDateSchema as date, createDiscrimatedUnionSchema as discriminatedUnion, createInstanceofSchema as instanceof, createLazySchema as lazy, createLiteralSchema as literal, createNullableSchema as nullable, createNullishSchema as nullish, createNullSchema as null, createNumberSchema as number, createObjectSchema as object, createOptionalSchema as optional, createRecordSchema as record, createStrictObjectSchema as strictObject, createStringSchema as string, createTupleSchema as tuple, createUndefinedSchema as undefined, createUnionSchema as union, createUnknownSchema as unknown, };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quentinadam/zod",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "A simple library to parse data, inspired by zod",
   "license": "MIT",
   "author": "Quentin Adam",