refactor

README.md

@@ -66,7 +66,7 @@ npm install --save-dev zod-schema-faker
 ## Usage
 
 ```ts
-import * as z from 'zod'
+import { z } from 'zod'
 import { install, fake } from 'zod-schema-faker'
 
 const schema = z.number()
@@ -269,7 +269,7 @@ const data = {
 - `function seed(value)`: sets the seed to use
 
   ```ts
-  import * as z from 'zod'
+  import { z } from 'zod'
   import { install, fake, seed } from 'zod-schema-faker'
 
   install()

e2e/issue-189/src/index.ts

@@ -1,4 +1,4 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { install, fake } from 'zod-schema-faker'
 import { expectType, TypeEqual } from 'ts-expect'
 

playground/src/main.ts

@@ -1,4 +1,4 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { install, fake } from 'zod-schema-faker'
 
 const main = async () => {

src/fake.ts

@@ -1,6 +1,6 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { ZodSchemaFakerError } from './error'
-import { assertZodSchema } from './utils'
+import { assertsZodSchema } from './utils'
 
 export const zodTypeKindToZodTypeFaker: Map<z.ZodFirstPartyTypeKind, any /* TODO: should not use any */> = new Map()
 export const zodTypeToZodTypeFaker: Map<z.ZodType, any /* TODO: should not use any */> = new Map()
@@ -9,7 +9,7 @@ export const zodTypeToZodTypeFaker: Map<z.ZodType, any /* TODO: should not use a
  * generate fake data based on schema
  */
 export const fake = <T extends z.ZodType>(schema: T): z.infer<T> => {
-  assertZodSchema(schema)
+  assertsZodSchema(schema)
 
   const typeName = (schema._def as any).typeName
   const faker = zodTypeToZodTypeFaker.get(schema) ?? zodTypeKindToZodTypeFaker.get(typeName)

src/index.ts

@@ -1,14 +1,14 @@
 import { z } from 'zod'
 import { fake as _fake } from './fake'
-import { resetSeed } from './faker'
+import { resetSeed } from './random'
 
 export const fake = <T extends z.ZodType>(schema: T): z.infer<T> => {
   const result = _fake(schema)
   resetSeed()
   return result
 }
 
-export { seed, runFake, randexp } from './faker'
+export { seed, runFake, randexp } from './random'
 export { install, installCustom } from './zod-type-kind-to-zod-type-faker'
 export { ZodSchemaFakerError } from './error'
 export { ZodTypeFaker } from './zod-type-faker'

src/utils.ts

@@ -1,7 +1,13 @@
+import { z } from 'zod'
 import { ZodSchemaFakerError } from './error'
 
-export const assertZodSchema = (schema: any): void | never => {
-  if (typeof schema !== 'object' || schema === null || typeof schema._parse !== 'function') {
+export function assertsZodSchema(schema: unknown): asserts schema is z.ZodTypeAny {
+  if (
+    typeof schema !== 'object' ||
+    schema === null ||
+    '_parse' in schema === false ||
+    typeof schema._parse !== 'function'
+  ) {
     throw new ZodSchemaFakerError(`Expected a zod schema, but got ${schema}`)
   }
 }

src/zod-any-faker.ts

@@ -1,6 +1,6 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { fake } from './fake'
-import { runFake } from './faker'
+import { runFake } from './random'
 import { ZodTypeFaker } from './zod-type-faker'
 
 const schemas = (() => {

src/zod-array-faker.ts

@@ -1,6 +1,6 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { fake } from './fake'
-import { runFake } from './faker'
+import { runFake } from './random'
 import { ZodTypeFaker } from './zod-type-faker'
 
 export class ZodArrayFaker<T extends z.ZodArray<any, any>> extends ZodTypeFaker<T> {

src/zod-bigint-faker.ts

@@ -1,5 +1,5 @@
-import * as z from 'zod'
-import { runFake } from './faker'
+import { z } from 'zod'
+import { runFake } from './random'
 import { ZodTypeFaker } from './zod-type-faker'
 
 export class ZodBigIntFaker extends ZodTypeFaker<z.ZodBigInt> {

src/zod-boolean-faker.ts

@@ -1,5 +1,5 @@
-import * as z from 'zod'
-import { runFake } from './faker'
+import { z } from 'zod'
+import { runFake } from './random'
 import { ZodTypeFaker } from './zod-type-faker'
 
 export class ZodBooleanFaker extends ZodTypeFaker<z.ZodBoolean> {

src/zod-branded-faker.ts

@@ -1,4 +1,4 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { fake } from './fake'
 import { ZodTypeFaker } from './zod-type-faker'
 

src/zod-date-faker.ts

@@ -1,5 +1,5 @@
-import * as z from 'zod'
-import { runFake } from './faker'
+import { z } from 'zod'
+import { runFake } from './random'
 import { ZodTypeFaker } from './zod-type-faker'
 
 export class ZodDateFaker extends ZodTypeFaker<z.ZodDate> {

src/zod-default-faker.ts

@@ -1,6 +1,6 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { fake } from './fake'
-import { runFake } from './faker'
+import { runFake } from './random'
 import { ZodTypeFaker } from './zod-type-faker'
 
 export class ZodDefaultFaker<T extends z.ZodDefault<any>> extends ZodTypeFaker<T> {

src/zod-discriminated-union-faker.ts

@@ -1,6 +1,6 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { fake } from './fake'
-import { runFake } from './faker'
+import { runFake } from './random'
 import { ZodTypeFaker } from './zod-type-faker'
 
 export class ZodDiscriminatedUnionFaker<T extends z.ZodDiscriminatedUnion<any, any>> extends ZodTypeFaker<T> {

src/zod-effects-faker.ts

@@ -1,4 +1,4 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { fake } from './fake'
 import { ZodTypeFaker } from './zod-type-faker'
 

src/zod-enum-faker.ts

@@ -1,5 +1,5 @@
-import * as z from 'zod'
-import { runFake } from './faker'
+import { z } from 'zod'
+import { runFake } from './random'
 import { ZodTypeFaker } from './zod-type-faker'
 
 export class ZodEnumFaker<T extends z.ZodEnum<any>> extends ZodTypeFaker<T> {

src/zod-function-faker.ts

@@ -1,4 +1,4 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { fake } from './fake'
 import { ZodTypeFaker } from './zod-type-faker'
 

src/zod-intersection-faker.ts

@@ -1,4 +1,4 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { ZodSchemaFakerError } from './error'
 import { fake } from './fake'
 import { ZodTypeFaker } from './zod-type-faker'

src/zod-lazy-faker.ts

@@ -1,4 +1,4 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { ZodSchemaFakerError } from './error'
 import { fake } from './fake'
 import { ZodTypeFaker } from './zod-type-faker'

src/zod-literal-faker.ts

@@ -1,4 +1,4 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { ZodTypeFaker } from './zod-type-faker'
 
 export class ZodLiteralFaker<T extends z.ZodLiteral<any>> extends ZodTypeFaker<T> {

src/zod-map-faker.ts

@@ -1,7 +1,7 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { fake } from './fake'
 import { ZodTypeFaker } from './zod-type-faker'
-import { runFake } from './faker'
+import { runFake } from './random'
 
 export class ZodMapFaker<T extends z.ZodMap<any, any>> extends ZodTypeFaker<T> {
   fake(): z.infer<T> {

src/zod-nan-faker.ts

@@ -1,4 +1,4 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { ZodTypeFaker } from './zod-type-faker'
 
 export class ZodNaNFaker extends ZodTypeFaker<z.ZodNaN> {

src/zod-native-enum-faker.ts

@@ -1,5 +1,5 @@
-import * as z from 'zod'
-import { runFake } from './faker'
+import { z } from 'zod'
+import { runFake } from './random'
 import { ZodTypeFaker } from './zod-type-faker'
 
 const getValidEnumValues = (obj: any) => {

src/zod-never-faker.ts

@@ -1,4 +1,4 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { ZodTypeFaker } from './zod-type-faker'
 
 export class ZodNeverFaker extends ZodTypeFaker<z.ZodNever> {

src/zod-null-faker.ts

@@ -1,4 +1,4 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { ZodTypeFaker } from './zod-type-faker'
 
 export class ZodNullFaker extends ZodTypeFaker<z.ZodNull> {

src/zod-nullable-faker.ts

@@ -1,6 +1,6 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { fake } from './fake'
-import { runFake } from './faker'
+import { runFake } from './random'
 import { ZodTypeFaker } from './zod-type-faker'
 
 export class ZodNullableFaker<T extends z.ZodNullable<any>> extends ZodTypeFaker<T> {

src/zod-number-faker.ts

@@ -1,5 +1,5 @@
-import * as z from 'zod'
-import { runFake } from './faker'
+import { z } from 'zod'
+import { runFake } from './random'
 import { ZodTypeFaker } from './zod-type-faker'
 
 export class ZodNumberFaker extends ZodTypeFaker<z.ZodNumber> {

src/zod-object-faker.ts

@@ -1,4 +1,4 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { fake } from './fake'
 import { ZodTypeFaker } from './zod-type-faker'
 

src/zod-optional-faker.ts

@@ -1,6 +1,6 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { fake } from './fake'
-import { runFake } from './faker'
+import { runFake } from './random'
 import { ZodTypeFaker } from './zod-type-faker'
 
 export class ZodOptionalFaker<T extends z.ZodOptional<any>> extends ZodTypeFaker<T> {

src/zod-pipe-faker.ts

@@ -1,4 +1,4 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { fake } from './fake'
 import { ZodTypeFaker } from './zod-type-faker'
 

src/zod-promise-faker.ts

@@ -1,7 +1,7 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { fake } from './fake'
 import { ZodTypeFaker } from './zod-type-faker'
-import { runFake } from './faker'
+import { runFake } from './random'
 
 export class ZodPromiseFaker<T extends z.ZodPromise<any>> extends ZodTypeFaker<T> {
   fake(): z.infer<T> {

src/zod-readonly-faker.ts

@@ -1,4 +1,4 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { fake } from './fake'
 import { ZodTypeFaker } from './zod-type-faker'
 

src/zod-record-faker.ts

@@ -1,7 +1,7 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { fake } from './fake'
 import { ZodTypeFaker } from './zod-type-faker'
-import { runFake } from './faker'
+import { runFake } from './random'
 import { ZodSchemaFakerError } from './error'
 
 export class ZodRecordFaker<T extends z.ZodRecord<any, any>> extends ZodTypeFaker<T> {

src/zod-set-faker.ts

@@ -1,6 +1,6 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { fake } from './fake'
-import { runFake } from './faker'
+import { runFake } from './random'
 import { ZodTypeFaker } from './zod-type-faker'
 
 export class ZodSetFaker<T extends z.ZodSet<any>> extends ZodTypeFaker<T> {

src/zod-string-faker.ts

@@ -1,7 +1,7 @@
-import * as z from 'zod'
-import { ZodSchemaFakerError } from './error'
-import { randexp, runFake } from './faker'
+import { z } from 'zod'
 import { ZodTypeFaker } from './zod-type-faker'
+import { ZodSchemaFakerError } from './error'
+import { randexp, runFake } from './random'
 
 const averageWordLength = 5
 const averageSentenceLength = averageWordLength * 15

src/zod-symbol-faker.ts

@@ -1,4 +1,4 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { ZodTypeFaker } from './zod-type-faker'
 
 export class ZodSymbolFaker<T extends z.ZodSymbol> extends ZodTypeFaker<T> {

src/zod-tuple-faker.ts

@@ -1,6 +1,6 @@
-import * as z from 'zod'
-import { fake } from './fake'
+import { z } from 'zod'
 import { ZodTypeFaker } from './zod-type-faker'
+import { fake } from './fake'
 
 export class ZodTupleFaker<T extends z.ZodTuple<any, any>> extends ZodTypeFaker<T> {
   fake(): z.infer<T> {

src/zod-type-faker.ts

@@ -1,13 +1,9 @@
-import * as z from 'zod'
-import { assertZodSchema } from './utils'
+import { z } from 'zod'
+import { assertsZodSchema } from './utils'
 
-export abstract class ZodTypeFaker<T extends z.ZodType<any, any, any>> {
-  protected schema: T
-
-  constructor(schema: T) {
-    assertZodSchema(schema)
-
-    this.schema = schema
+export abstract class ZodTypeFaker<T extends z.ZodTypeAny> {
+  constructor(protected schema: T) {
+    assertsZodSchema(schema)
   }
 
   abstract fake(): z.infer<T>

src/zod-type-kind-to-zod-type-faker.ts

@@ -1,4 +1,4 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { zodTypeKindToZodTypeFaker, zodTypeToZodTypeFaker } from './fake'
 import { ZodAnyFaker } from './zod-any-faker'
 import { ZodArrayFaker } from './zod-array-faker'

src/zod-undefined-faker.ts

@@ -1,4 +1,4 @@
-import * as z from 'zod'
+import { z } from 'zod'
 import { ZodTypeFaker } from './zod-type-faker'
 
 export class ZodUndefinedFaker extends ZodTypeFaker<z.ZodUndefined> {

src/zod-union-faker.ts

@@ -1,7 +1,7 @@
-import * as z from 'zod'
-import { fake } from './fake'
-import { runFake } from './faker'
+import { z } from 'zod'
 import { ZodTypeFaker } from './zod-type-faker'
+import { fake } from './fake'
+import { runFake } from './random'
 
 export class ZodUnionFaker<T extends z.ZodUnion<any>> extends ZodTypeFaker<T> {
   fake(): z.infer<T> {

src/zod-unknown-faker.ts

@@ -1,6 +1,6 @@
-import * as z from 'zod'
-import { fake } from './fake'
+import { z } from 'zod'
 import { ZodTypeFaker } from './zod-type-faker'
+import { fake } from './fake'
 
 export class ZodUnknownFaker extends ZodTypeFaker<z.ZodUnknown> {
   fake(): z.infer<z.ZodUnknown> {

src/zod-void-faker.ts

@@ -1,5 +1,4 @@
-import * as z from 'zod'
-import { fake } from './fake'
+import { z } from 'zod'
 import { ZodTypeFaker } from './zod-type-faker'
 
 export class ZodVoidFaker extends ZodTypeFaker<z.ZodVoid> {

tests/fake.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from 'vitest'
-import * as z from 'zod'
+import { z } from 'zod'
 import { fake, install } from '../src'
 import { uninstall } from '../src/zod-type-kind-to-zod-type-faker'
 

tests/faker.test.ts

@@ -1,7 +1,6 @@
 import { expect, test } from 'vitest'
-import * as z from 'zod'
-import { install, fake, seed } from '../src'
-import { runFake } from '../src/faker'
+import { z } from 'zod'
+import { install, fake, seed, runFake } from '../src'
 
 test('seed', () => {
   install()