fix dumb dumb logic

samchungy · Oct 30, 2024 · 6b71240 · 6b71240
1 parent f0cfee4
commit 6b71240
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 68 deletions.
diff --git a/src/create/schema/parsers/intersection.test.ts b/src/create/schema/parsers/intersection.test.ts
@@ -27,58 +27,4 @@ describe('createIntersectionSchema', () => {
 
     expect(result).toEqual(expected);
   });
-
-  it('handles z.undefined() option', () => {
-    const expected: Schema = {
-      type: 'schema',
-      schema: {
-        allOf: [
-          {
-            type: 'string',
-          },
-        ],
-      },
-    };
-    const schema = z.intersection(z.undefined(), z.string());
-
-    const result = createIntersectionSchema(schema, createOutputState());
-
-    expect(result).toEqual(expected);
-  });
-
-  it('handles z.literal(undefined) option', () => {
-    const expected: Schema = {
-      type: 'schema',
-      schema: {
-        allOf: [
-          {
-            type: 'string',
-          },
-        ],
-      },
-    };
-    const schema = z.intersection(z.string(), z.literal(undefined));
-
-    const result = createIntersectionSchema(schema, createOutputState());
-
-    expect(result).toEqual(expected);
-  });
-
-  it('handles z.never() option', () => {
-    const expected: Schema = {
-      type: 'schema',
-      schema: {
-        allOf: [
-          {
-            type: 'string',
-          },
-        ],
-      },
-    };
-    const schema = z.intersection(z.string(), z.never());
-
-    const result = createIntersectionSchema(schema, createOutputState());
-
-    expect(result).toEqual(expected);
-  });
 });
diff --git a/src/create/schema/parsers/intersection.ts b/src/create/schema/parsers/intersection.ts
@@ -6,7 +6,6 @@ import {
   createSchemaObject,
 } from '../../schema';
 
-import { isOptionalObjectKey } from './optional';
 import { flattenEffects } from './transform';
 
 export const createIntersectionSchema = <
@@ -16,22 +15,18 @@ export const createIntersectionSchema = <
   zodIntersection: ZodIntersection<T, U>,
   state: SchemaState,
 ): Schema => {
-  const left = !isOptionalObjectKey(zodIntersection._def.left)
-    ? createSchemaObject(zodIntersection._def.left, state, [
-        'intersection left',
-      ])
-    : undefined;
-  const right = !isOptionalObjectKey(zodIntersection._def.right)
-    ? createSchemaObject(zodIntersection._def.right, state, [
-        'intersection right',
-      ])
-    : undefined;
+  const left = createSchemaObject(zodIntersection._def.left, state, [
+    'intersection left',
+  ]);
+  const right = createSchemaObject(zodIntersection._def.right, state, [
+    'intersection right',
+  ]);
 
   return {
     type: 'schema',
     schema: {
-      allOf: [...(left ? [left.schema] : []), ...(right ? [right.schema] : [])],
+      allOf: [left.schema, right.schema],
     },
-    effects: flattenEffects([left?.effects, right?.effects]),
+    effects: flattenEffects([left.effects, right.effects]),
   };
 };
diff --git a/src/create/schema/parsers/object.test.ts b/src/create/schema/parsers/object.test.ts
@@ -320,7 +320,6 @@ describe('required', () => {
           .transform((str) => str?.length)
           .pipe(z.number().optional()),
         m: z.string().default('a'),
-        n: z.intersection(z.literal(undefined), z.number()),
       });
 
       const result = createObjectSchema(schema, createInputState());