fix: replace schema factories with pipe

Author: joshunrau

src/__tests__/zod.test.ts

@@ -3,7 +3,7 @@ import * as module from 'node:module';
 import { describe, expect, it } from 'vitest';
 import { z } from 'zod';
 
-import { $$BooleanLike, $$NumberLike, isZodType } from '../zod.js';
+import { $BooleanLike, $NumberLike, isZodType } from '../zod.js';
 
 const require = module.createRequire(import.meta.url);
 
@@ -35,38 +35,39 @@ describe('isZodType', () => {
 
 describe('$BooleanLike', () => {
   it('should parse "true" correctly', () => {
-    expect($$BooleanLike().safeParse('true').data).toBe(true);
+    expect($BooleanLike.safeParse('true').data).toBe(true);
   });
   it('should parse "false" correctly', () => {
-    expect($$BooleanLike().safeParse('false').data).toBe(false);
+    expect($BooleanLike.safeParse('false').data).toBe(false);
   });
   it('should parse booleans correctly', () => {
-    expect($$BooleanLike().safeParse(true).data).toBe(true);
-    expect($$BooleanLike().safeParse(false).data).toBe(false);
+    expect($BooleanLike.safeParse(true).data).toBe(true);
+    expect($BooleanLike.safeParse(false).data).toBe(false);
   });
   it('should fail to parse undefined', () => {
-    expect($$BooleanLike().safeParse(undefined).success).toBe(false);
+    expect($BooleanLike.safeParse(undefined).success).toBe(false);
   });
   it('should fail to parse an empty string', () => {
-    expect($$BooleanLike().safeParse('').success).toBe(false);
+    expect($BooleanLike.safeParse('').success).toBe(false);
   });
   it('should parse undefined, if set to optional', () => {
-    const result = $$BooleanLike().optional().safeParse(undefined);
+    const result = $BooleanLike.optional().safeParse(undefined);
     expect(result.success).toBe(true);
     expect(result.data).toBe(undefined);
   });
 });
 
 describe('$NumberLike', () => {
   it('should parse a number', () => {
-    expect($$NumberLike().safeParse(1).data).toBe(1);
+    expect($NumberLike.safeParse(1).data).toBe(1);
   });
   it('should fail to parse non-numbers', () => {
-    expect($$NumberLike().safeParse(NaN).success).toBe(false);
-    expect($$NumberLike().safeParse('').success).toBe(false);
+    expect($NumberLike.safeParse(NaN).success).toBe(false);
+    expect($NumberLike.safeParse('').success).toBe(false);
   });
-  it('should allow restricting the number', () => {
-    expect($$NumberLike((base) => base.int()).safeParse('1.1').success).toBe(false);
-    expect($$NumberLike((base) => base.int()).safeParse('1').data).toBe(1);
+  it('should allow restricting the number through a pipe', () => {
+    const $IntLike = $NumberLike.pipe(z.number().int());
+    expect($IntLike.safeParse('1.1').success).toBe(false);
+    expect($IntLike.safeParse('1').data).toBe(1);
   });
 });

src/zod.ts

@@ -3,12 +3,6 @@ import { z } from 'zod';
 import { isNumberLike, parseNumber } from './number.js';
 import { isObject } from './object.js';
 
-const defaultExtend = <TSchema extends z.ZodTypeAny>(schema: TSchema): TSchema => schema;
-
-type SchemaFactory<TSchema extends z.ZodTypeAny, TInput = any> = (
-  extend?: (base: TSchema) => TSchema
-) => z.ZodEffects<TSchema, z.TypeOf<TSchema>, TInput>;
-
 /** Used to determine if object is of type `ZodType` independent of specific instances or library versions */
 export function isZodType(arg: unknown): arg is z.ZodTypeAny {
   let prototype: null | object = null;
@@ -18,24 +12,20 @@ export function isZodType(arg: unknown): arg is z.ZodTypeAny {
   return Boolean(prototype && Reflect.get(prototype, 'name') === 'ZodType');
 }
 
-export const $$BooleanLike: SchemaFactory<z.ZodBoolean> = (extend = defaultExtend) => {
-  return z.preprocess((arg) => {
-    if (typeof arg === 'string') {
-      if (arg.trim().toLowerCase() === 'true') {
-        return true;
-      } else if (arg.trim().toLowerCase() === 'false') {
-        return false;
-      }
+export const $BooleanLike = z.preprocess((arg) => {
+  if (typeof arg === 'string') {
+    if (arg.trim().toLowerCase() === 'true') {
+      return true;
+    } else if (arg.trim().toLowerCase() === 'false') {
+      return false;
     }
-    return arg;
-  }, extend(z.boolean()));
-};
+  }
+  return arg;
+}, z.boolean());
 
-export const $$NumberLike: SchemaFactory<z.ZodNumber> = (extend = defaultExtend) => {
-  return z.preprocess((arg) => {
-    if (isNumberLike(arg)) {
-      return parseNumber(arg);
-    }
-    return arg;
-  }, extend(z.number()));
-};
+export const $NumberLike = z.preprocess((arg) => {
+  if (isNumberLike(arg)) {
+    return parseNumber(arg);
+  }
+  return arg;
+}, z.number());