@strictly/define 0.0.6 → 0.0.8

package/types/specs/value_of_type.tests.ts

@@ -12,9 +12,9 @@ describe('ValueOfType', function () {
     }
     type T = ValueOfType<{ definition: TypeD }>
 
-    let t: 'a' | 'b' | 'c'
+    type C = 'a' | 'b' | 'c'
     it('equals expected type', function () {
-      expectTypeOf(t).toEqualTypeOf<T>()
+      expectTypeOf<C>().toEqualTypeOf<T>()
     })
   })
 
@@ -29,9 +29,9 @@ describe('ValueOfType', function () {
       }
       type T = ValueOfType<{ definition: TypeD }>
       describe('mutable', function () {
-        let a: ('a' | 'b' | 'c')[]
+        type C = ('a' | 'b' | 'c')[]
         it('equals expected type', function () {
-          expectTypeOf(a).toEqualTypeOf<T>()
+          expectTypeOf<C>().toEqualTypeOf<T>()
         })
       })
 
@@ -46,9 +46,9 @@ describe('ValueOfType', function () {
           },
         }>
 
-        let a: readonly ('a' | 'b' | 'c')[]
+        type C = readonly ('a' | 'b' | 'c')[]
         it('equals expected type', function () {
-          expectTypeOf(a).toEqualTypeOf<R>()
+          expectTypeOf<C>().toEqualTypeOf<R>()
         })
       })
     })
@@ -66,9 +66,9 @@ describe('ValueOfType', function () {
     type T = ValueOfType<{ definition: TypeD }>
 
     describe('mutable', function () {
-      let t: Record<'x' | 'y' | 'z', 'a' | 'b' | 'c'>
+      type C = Record<'x' | 'y' | 'z', 'a' | 'b' | 'c'>
       it('equals expected type', function () {
-        expectTypeOf(t).toEqualTypeOf<T>()
+        expectTypeOf<C>().toEqualTypeOf<T>()
       })
     })
 
@@ -83,10 +83,10 @@ describe('ValueOfType', function () {
           },
         },
       }>
-      let r: Readonly<Record<'x' | 'y' | 'z', 'a' | 'b' | 'c'>>
+      type C = Readonly<Record<'x' | 'y' | 'z', 'a' | 'b' | 'c'>>
 
       it('equals expected type', function () {
-        expectTypeOf(r).toEqualTypeOf<R>()
+        expectTypeOf<C>().toEqualTypeOf<R>()
       })
     })
 
@@ -101,9 +101,9 @@ describe('ValueOfType', function () {
       }
       type T = ValueOfType<{ definition: TypeD }>
 
-      let t: Partial<Record<'x' | 'y' | 'z', 'a' | 'b' | 'c'>>
+      type C = Partial<Record<'x' | 'y' | 'z', 'a' | 'b' | 'c'>>
       it('equals expected type', function () {
-        expectTypeOf(t).toEqualTypeOf<T>()
+        expectTypeOf<C>().toEqualTypeOf<T>()
       })
     })
 
@@ -118,9 +118,9 @@ describe('ValueOfType', function () {
       }
       type T = ValueOfType<{ definition: TypeD }>
 
-      let t: Partial<Readonly<Record<'x' | 'y' | 'z', 'a' | 'b' | 'c'>>>
+      type C = Partial<Readonly<Record<'x' | 'y' | 'z', 'a' | 'b' | 'c'>>>
       it('equals expected type', function () {
-        expectTypeOf(t).toEqualTypeOf<T>()
+        expectTypeOf<C>().toEqualTypeOf<T>()
       })
     })
   })
@@ -142,13 +142,13 @@ describe('ValueOfType', function () {
     type T = ValueOfType<{ definition: TypeD }>
 
     describe('mutable', function () {
-      let value: {
+      type C = {
         a: 'a' | 'b',
         b: number,
       }
 
       it('equals expected type', function () {
-        expectTypeOf(value).toEqualTypeOf<T>()
+        expectTypeOf<C>().toEqualTypeOf<T>()
       })
     })
 
@@ -168,12 +168,12 @@ describe('ValueOfType', function () {
       }
       type T = ValueOfType<{ definition: TypeD }>
 
-      let value: {
+      type C = {
         readonly a: 'a' | 'b',
         readonly b: number,
       }
       it('equals expected type', function () {
-        expectTypeOf(value).toEqualTypeOf<T>()
+        expectTypeOf<C>().toEqualTypeOf<T>()
       })
     })
 
@@ -193,13 +193,13 @@ describe('ValueOfType', function () {
       }
       type T = ValueOfType<{ definition: TypeD }>
 
-      let v: {
+      type C = {
         a?: 'a' | 'b',
         b?: number,
       }
 
       it('equals expected type', function () {
-        expectTypeOf(v).toEqualTypeOf<T>()
+        expectTypeOf<C>().toEqualTypeOf<T>()
       })
     })
   })
@@ -227,10 +227,10 @@ describe('ValueOfType', function () {
         },
       }>
 
-      let t: null | number | string
+      type C = null | number | string
 
       it('equals expected type', function () {
-        expectTypeOf(t).toEqualTypeOf<T>()
+        expectTypeOf<C>().toEqualTypeOf<T>()
       })
     })
 
@@ -270,7 +270,7 @@ describe('ValueOfType', function () {
         },
       }>
 
-      let t: {
+      type C = {
         readonly d: 1,
         b: string,
       } | {
@@ -279,7 +279,7 @@ describe('ValueOfType', function () {
       }
 
       it('equals expected type', function () {
-        expectTypeOf(t).toEqualTypeOf<T>()
+        expectTypeOf<C>().toEqualTypeOf<T>()
       })
     })
 
@@ -313,7 +313,7 @@ describe('ValueOfType', function () {
         }>
       >
 
-      let t: {
+      type C = {
         readonly d: 1,
         b: string,
       } | {
@@ -322,7 +322,7 @@ describe('ValueOfType', function () {
       }
 
       it('equals expected type', function () {
-        expectTypeOf(t).toEqualTypeOf<T>()
+        expectTypeOf<C>().toEqualTypeOf<T>()
       })
     })
   })

package/types/specs/value_to_type_paths_of_type.tests.ts

@@ -19,11 +19,11 @@ describe('ValueToTypePathsOfType', function () {
   describe('literal', function () {
     type T = ValueToTypePathsOfType<typeof numberType.narrow>
 
-    let t: {
+    type C = {
       readonly $: '$',
     }
     it('equals expected type', function () {
-      expectTypeOf(t).toEqualTypeOf<T>()
+      expectTypeOf<C>().toEqualTypeOf<T>()
     })
   })
 
@@ -31,13 +31,13 @@ describe('ValueToTypePathsOfType', function () {
     const builder = list(list(numberType))
     type T = SimplifyDeep<ValueToTypePathsOfType<typeof builder.narrow>>
 
-    let t: {
+    type C = {
       readonly $: '$',
       readonly [_: `$.${number}`]: '$.*',
       readonly [_: `$.${number}.${number}`]: '$.*.*',
     }
     it('equals expected type', function () {
-      expectTypeOf(t).toEqualTypeOf<T>()
+      expectTypeOf<C>().toEqualTypeOf<T>()
     })
   })
 
@@ -46,7 +46,7 @@ describe('ValueToTypePathsOfType', function () {
     const builder = record<typeof l, 'a' | 'b'>(l)
     type T = SimplifyDeep<ValueToTypePathsOfType<typeof builder>>
 
-    let t: {
+    type C = {
       readonly $: '$',
       readonly [`$.a`]: '$.*',
       readonly [`$.b`]: '$.*',
@@ -54,7 +54,7 @@ describe('ValueToTypePathsOfType', function () {
       readonly [_: `$.b.${number}`]: '$.*.*',
     }
     it('equals expected type', function () {
-      expectTypeOf(t).toEqualTypeOf<T>()
+      expectTypeOf<C>().toEqualTypeOf<T>()
     })
 
     it('allows lookup of type path', function () {
@@ -71,7 +71,7 @@ describe('ValueToTypePathsOfType', function () {
 
     type T = SimplifyDeep<ValueToTypePathsOfType<typeof builder>>
 
-    let t: {
+    type C = {
       readonly $: '$',
       readonly [`$.a`]: '$.a',
       readonly [`$.b`]: '$.b',
@@ -80,7 +80,7 @@ describe('ValueToTypePathsOfType', function () {
       readonly [_: `$.a.${number}`]: '$.a.*',
     }
     it('equals expected type', function () {
-      expectTypeOf(t).toEqualTypeOf<T>()
+      expectTypeOf<C>().toEqualTypeOf<T>()
     })
 
     it('has the same value paths', function () {
@@ -101,13 +101,13 @@ describe('ValueToTypePathsOfType', function () {
         .or('2', stringType)
       type T = SimplifyDeep<ValueToTypePathsOfType<typeof builder>>
 
-      let t: {
+      type C = {
         readonly $: '$',
         readonly [_: `$.${number}`]: '$.*',
       }
 
       it('equals expected type', function () {
-        expectTypeOf(t).toEqualTypeOf<T>()
+        expectTypeOf<C>().toEqualTypeOf<T>()
       })
     })
 
@@ -117,7 +117,7 @@ describe('ValueToTypePathsOfType', function () {
         .or('2', object().field('x', numberType).field('y', stringType))
       type T = SimplifyDeep<ValueToTypePathsOfType<typeof builder>>
 
-      let t: {
+      type C = {
         readonly $: '$',
         readonly ['$.1:a']: '$.1:a',
         readonly ['$.1:b']: '$.1:b',
@@ -125,7 +125,7 @@ describe('ValueToTypePathsOfType', function () {
         readonly ['$.2:y']: '$.2:y',
       }
       it('equals expected type', function () {
-        expectTypeOf(t).toEqualTypeOf<T>()
+        expectTypeOf<C>().toEqualTypeOf<T>()
       })
 
       it('has the same value paths', function () {
@@ -145,13 +145,13 @@ describe('ValueToTypePathsOfType', function () {
 
     type T = SimplifyDeep<ValueToTypePathsOfType<typeof builder>>
 
-    let t: {
+    type C = {
       readonly $: '$',
       readonly [_: `$.${number}`]: '$.*',
       readonly [_: `$.${number}.${number}`]: '$.*.*',
     }
     it('equals expected type', function () {
-      expectTypeOf(t).toEqualTypeOf<T>()
+      expectTypeOf<C>().toEqualTypeOf<T>()
     })
   })
 
@@ -160,13 +160,13 @@ describe('ValueToTypePathsOfType', function () {
 
     type T = SimplifyDeep<ValueToTypePathsOfType<typeof builder>>
 
-    let t: {
+    type C = {
       readonly $: '$',
       readonly [_: `$.${number}`]: '$.*',
       readonly [_: `$.${number}.${number}`]: '$.*.*',
     }
     it('equals expected type', function () {
-      expectTypeOf(t).toEqualTypeOf<T>()
+      expectTypeOf<C>().toEqualTypeOf<T>()
     })
 
     it('has the same value paths', function () {

package/validation/specs/errors_of_validators.tests.ts

@@ -8,13 +8,13 @@ describe('ErrorsOfValidators', function () {
       y: Validator<number, 'b'>,
     }>
 
-    let t: {
+    type C = {
       readonly x: 'a',
       readonly y: 'b',
     }
 
     it('equals expected type', function () {
-      expectTypeOf<T>().toEqualTypeOf(t)
+      expectTypeOf<T>().toEqualTypeOf<C>()
     })
   })
 })

package/validation/specs/validators_of_values.tests.ts

@@ -13,13 +13,13 @@ describe('FlattenedValidatorsOfType', function () {
       1
     >
 
-    let t: {
+    type C = {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       readonly $: Validator<'a' | 'b' | 'c', any, '$', 1>,
     }
 
     it('has the expected type', function () {
-      expectTypeOf<T>().toEqualTypeOf(t)
+      expectTypeOf<T>().toEqualTypeOf<C>()
     })
   })
 
@@ -36,7 +36,7 @@ describe('FlattenedValidatorsOfType', function () {
       2
     >
 
-    let t: {
+    type C = {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       readonly $: Validator<number[], any, '$', 2>,
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -44,7 +44,7 @@ describe('FlattenedValidatorsOfType', function () {
     }
 
     it('has the expected type', function () {
-      expectTypeOf<T>().toEqualTypeOf(t)
+      expectTypeOf<T>().toEqualTypeOf<C>()
     })
   })
 
@@ -56,13 +56,13 @@ describe('FlattenedValidatorsOfType', function () {
       }
     >
 
-    let t: {
+    type C = {
       readonly $: Validator<number[]>,
       readonly '$.*': Validator<number>,
     }
 
     it('has the expected type', function () {
-      expectTypeOf<T>().toEqualTypeOf(t)
+      expectTypeOf<T>().toEqualTypeOf<C>()
     })
   })
 })

package/validation/validator.ts

@@ -47,11 +47,21 @@ export type ValidationError<Type extends string, Data = {}> = Simplify<
   } & Data
 >
 
-export function isFunctionalValidator(v: Validator): v is FunctionalValidator {
+export function isFunctionalValidator<
+  V,
+  E,
+  ValuePath extends string,
+  Context,
+>(v: Validator<V, E, ValuePath, Context>): v is FunctionalValidator<V, E, ValuePath, Context> {
   return typeof v === 'function'
 }
 
-export function isAnnotatedValidator(v: Validator): v is AnnotatedValidator {
+export function isAnnotatedValidator<
+  V,
+  E,
+  ValuePath extends string,
+  Context,
+>(v: Validator<V, E, ValuePath, Context>): v is AnnotatedValidator<V, E, ValuePath, Context> {
   return typeof v !== 'function'
 }
 
@@ -73,8 +83,7 @@ export function validate<
   if (isAnnotatedValidator(validator)) {
     return validator.validate(v, valuePath, context)
   } else {
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    return (validator as FunctionalValidator<V, E, ValuePath, Context>)(v, valuePath, context)
+    return validator(v, valuePath, context)
   }
 }
 

package/validation/validators/defined_validator.ts

@@ -1,8 +1,6 @@
 import { type AnnotatedValidator } from 'validation/validator'
 
-export class DefinedValidator<V, E, ValuePath extends string, Context>
-  implements AnnotatedValidator<V | null | undefined, E, ValuePath, Context>
-{
+export class DefinedValidator<V, E> implements AnnotatedValidator<V | null | undefined, E, never, never> {
   constructor(private readonly error: E) {
   }
 

package/validation/validators/minimum_string_length_validator.ts

@@ -10,8 +10,8 @@ export type MinimumStringLengthValidationError = {
   minimumLength: number,
 }
 
-export class MinimumStringLengthValidator<ValuePath extends string, Context>
-  implements AnnotatedValidator<string, MinimumStringLengthValidationError, ValuePath, Context>
+export class MinimumStringLengthValidator
+  implements AnnotatedValidator<string, MinimumStringLengthValidationError, never, never>
 {
   constructor(private readonly minimumLength: number) {
   }