Pass variant options as issue requirement

fabian-hiller · Nov 30, 2023 · 7069548 · 7069548
1 parent 3b03518
commit 7069548
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 25 deletions.
diff --git a/library/src/schemas/variant/variant.test.ts b/library/src/schemas/variant/variant.test.ts
@@ -96,7 +96,7 @@ describe('variant', () => {
             input: { type: 'c', val: false },
           },
         ],
-        requirement: ['a', 'b'],
+        requirement: schema.options,
       },
     ]);
 
@@ -110,7 +110,7 @@ describe('variant', () => {
         input: undefined,
         origin: 'value',
         path: [{ type: 'object', key: 'type', value: undefined, input: {} }],
-        requirement: ['a', 'b'],
+        requirement: schema.options,
       },
     ]);
   });

diff --git a/library/src/schemas/variant/variant.ts b/library/src/schemas/variant/variant.ts
@@ -6,15 +6,13 @@ import type {
   Output,
 } from '../../types/index.ts';
 import { getSchemaIssues, getOutput, getIssues } from '../../utils/index.ts';
-import type { Literal } from '../literal/index.ts';
-import type { LiteralSchema } from '../literal/literal.ts';
 import type { ObjectPathItem, ObjectSchema } from '../object/index.ts';
 
 /**
  * Variant option type.
  */
 export type VariantOption<TKey extends string> =
-  | ObjectSchema<Record<TKey, LiteralSchema<Literal>>, any>
+  | ObjectSchema<Record<TKey, BaseSchema>, any>
   | (BaseSchema & {
       type: 'variant';
       options: VariantOptions<TKey>;
@@ -87,17 +85,13 @@ export function variant<
       // Create issues and output
       let issues: Issues | undefined;
       let output: [Record<string, any>] | undefined;
-      const requirement: Literal[] = [];
 
       // Create function to parse options recursively
       const parseOptions = (options: VariantOptions<TKey>) => {
         for (const schema of options) {
           // If it is an object schema, parse discriminator key
           if (schema.type === 'object') {
             const variantKeySchema = schema.entries[this.key];
-
-            requirement.push(variantKeySchema.literal);
-
             const result = variantKeySchema._parse(
               (input as Record<TKey, unknown>)[this.key],
               info
@@ -163,7 +157,7 @@ export function variant<
         'Invalid variant key',
         inputRecord[this.key],
         undefined,
-        requirement
+        this.options
       );
       nonMatchingKeyIssues.issues[0].path = [pathItem];
       return nonMatchingKeyIssues;

diff --git a/library/src/schemas/variant/variantAsync.test.ts b/library/src/schemas/variant/variantAsync.test.ts
@@ -101,7 +101,7 @@ describe('variantAsync', () => {
             input: { type: 'c', val: false },
           },
         ],
-        requirement: ['a', 'b'],
+        requirement: schema.options,
       },
     ]);
 
@@ -118,7 +118,7 @@ describe('variantAsync', () => {
         input: undefined,
         origin: 'value',
         path: [{ type: 'object', key: 'type', value: undefined, input: {} }],
-        requirement: ['a', 'b'],
+        requirement: schema.options,
       },
     ]);
   });

diff --git a/library/src/schemas/variant/variantAsync.ts b/library/src/schemas/variant/variantAsync.ts
@@ -7,9 +7,6 @@ import type {
   Output,
 } from '../../types/index.ts';
 import { getSchemaIssues, getOutput, getIssues } from '../../utils/index.ts';
-import type { LiteralSchema } from '../literal/literal.ts';
-import type { LiteralSchemaAsync } from '../literal/literalAsync.ts';
-import type { Literal } from '../literal/types.ts';
 import type {
   ObjectPathItem,
   ObjectSchema,
@@ -20,11 +17,8 @@ import type {
  * Variant option async type.
  */
 export type VariantOptionAsync<TKey extends string> =
-  | ObjectSchema<Record<TKey, LiteralSchema<Literal>>, any>
-  | ObjectSchemaAsync<
-      Record<TKey, LiteralSchema<Literal> | LiteralSchemaAsync<Literal>>,
-      any
-    >
+  | ObjectSchema<Record<TKey, BaseSchema>, any>
+  | ObjectSchemaAsync<Record<TKey, BaseSchema | BaseSchemaAsync>, any>
   | ((BaseSchema | BaseSchemaAsync) & {
       type: 'variant';
       options: VariantOptionsAsync<TKey>;
@@ -97,17 +91,13 @@ export function variantAsync<
       // Create issues and output
       let issues: Issues | undefined;
       let output: [Record<string, any>] | undefined;
-      const requirement: Literal[] = [];
 
       // Create function to parse options recursively
       const parseOptions = async (options: VariantOptionsAsync<TKey>) => {
         for (const schema of options) {
           // If it is an object schema, parse discriminator key
           if (schema.type === 'object') {
             const variantKeySchema = schema.entries[this.key];
-
-            requirement.push(variantKeySchema.literal);
-
             const result = await variantKeySchema._parse(
               (input as Record<TKey, unknown>)[this.key],
               info
@@ -173,7 +163,7 @@ export function variantAsync<
         'Invalid variant key',
         inputRecord[this.key],
         undefined,
-        requirement
+        this.options
       );
       nonMatchingKeyIssues.issues[0].path = [pathItem];
       return nonMatchingKeyIssues;