simplify generator class name

veigaribo · May 26, 2021 · b3df5e4 · b3df5e4
1 parent 223e82f
commit b3df5e4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/src/classes.ts b/src/classes.ts
@@ -1,5 +1,5 @@
 import { cache } from './cache'
-import { ConstructorValuesGenerator } from './generators'
+import { Generator } from './generators'
 import { Constructor, MaybeError } from './utils'
 import {
   all,
@@ -64,7 +64,7 @@ export class Class {
    */
   validate<T extends Constructor>(
     Constructor: T,
-    values: ConstructorValuesGenerator<T>,
+    values: Generator<T>,
     options: ValidationOptions = {},
   ): ValidationResult {
     // check cache

diff --git a/src/generators.ts b/src/generators.ts
@@ -1,6 +1,6 @@
 import { arrayWithLength, Constructor } from './utils'
 
-export interface ConstructorValuesGenerator<T extends Constructor> {
+export interface Generator<T extends Constructor> {
   get(i: number): InstanceType<T>
 }
 
@@ -15,8 +15,7 @@ export function defaultRandom(): number {
   return Math.random()
 }
 
-export class Continuous<T extends Constructor>
-  implements ConstructorValuesGenerator<T> {
+export class Continuous<T extends Constructor> implements Generator<T> {
   public readonly random: RandomFunction
 
   /**
@@ -50,8 +49,7 @@ export class Continuous<T extends Constructor>
   }
 }
 
-export class Discrete<T extends Constructor>
-  implements ConstructorValuesGenerator<T> {
+export class Discrete<T extends Constructor> implements Generator<T> {
   public readonly random: RandomFunction
 
   /**

diff --git a/src/instances.ts b/src/instances.ts
@@ -1,5 +1,5 @@
 import { Class } from './classes'
-import { ConstructorValuesGenerator } from './generators'
+import { Generator } from './generators'
 import { Constructor, MaybeError } from './utils'
 import { ValidationOptions } from './validators'
 
@@ -28,7 +28,7 @@ import { ValidationOptions } from './validators'
 export function instance<T extends Constructor>(
   Constructor: T,
   clazz: Class,
-  values: ConstructorValuesGenerator<T>,
+  values: Generator<T>,
   options: ValidationOptions = {},
 ) {
   const result = clazz.validate(Constructor, values, options)

diff --git a/src/validators.ts b/src/validators.ts
@@ -1,4 +1,4 @@
-import { ConstructorValuesGenerator } from './generators'
+import { Generator } from './generators'
 import { arrayWithLength, Constructor, MaybeError } from './utils'
 
 export interface ValidationOptions {
@@ -10,7 +10,7 @@ export type ValidationResult = MaybeError
 export interface InstanceValidator<T extends Constructor> {
   check(
     Instance: T,
-    values: ConstructorValuesGenerator<T>,
+    values: Generator<T>,
     options?: ValidationOptions,
   ): ValidationResult
 }
@@ -26,7 +26,7 @@ export class Obeys<T extends Constructor> implements InstanceValidator<T> {
 
   check(
     Instance: T,
-    values: ConstructorValuesGenerator<T>,
+    values: Generator<T>,
     options: ValidationOptions = {},
   ): ValidationResult {
     const { sampleSize = 15 } = options
@@ -77,7 +77,7 @@ export class All<T extends Constructor> implements InstanceValidator<T> {
 
   check(
     Instance: T,
-    values: ConstructorValuesGenerator<T>,
+    values: Generator<T>,
     options: ValidationOptions = {},
   ): ValidationResult {
     const result = MaybeError.foldConjoin(
@@ -95,7 +95,7 @@ export class Any<T extends Constructor> implements InstanceValidator<T> {
 
   check(
     Instance: T,
-    values: ConstructorValuesGenerator<T>,
+    values: Generator<T>,
     options: ValidationOptions = {},
   ): ValidationResult {
     const result = MaybeError.foldDisjoin(