@stacksjs/validation 0.70.369 → 0.70.370

package/dist/index.d.ts

@@ -1,7 +1,12 @@
 export type {
   ConditionalAPI,
   ConditionalRecord,
+  InferObjectShape,
+  InferValidatorValue,
+  InferredArrayValidator,
+  InferredEnumValidator,
   ObjectWithContextValidator,
+  ValidatorShape,
   ValidatorWithConditionals,
 } from './schema';
 // Type guard utilities

package/dist/object-with-context.d.ts

@@ -15,7 +15,16 @@ import type { ValidationResult, Validator } from '@stacksjs/ts-validation';
  * }).validate(input)
  * ```
  */
-export declare function objectWithContext<T extends Record<string, Validator<any>>>(initialShape?: T): ObjectWithContextValidator<T> & ConditionalAPI<ObjectWithContextValidator<T>>;
+export declare function objectWithContext<const TShape extends ValidatorShape = Record<string, never>>(initialShape?: TShape): ObjectWithContextValidator<TShape> & ConditionalAPI<ObjectWithContextValidator<TShape>>;
+export declare interface ObjectWithContextValidator<TShape extends ValidatorShape> extends Validator<InferObjectShape<TShape>> {
+  readonly name: 'object'
+  validate: (value: InferObjectShape<TShape>) => ValidationResult
+  getShape: () => TShape
+  required: () => this
+  optional: () => this
+  isPartOfShape: boolean
+  shape: <TNextShape extends ValidatorShape>(shape: TNextShape) => ObjectWithContextValidator<TNextShape>
+}
 /**
  * Validator-shaped object returned by `schema.object()`. Mirrors the
  * subset of ts-validation's `ObjectValidatorType` that Stacks code
@@ -26,12 +35,10 @@ export declare function objectWithContext<T extends Record<string, Validator<any
  *     and other introspection passes can walk the per-field validators
  *     (and their `__conditionals` arrays).
  */
-export declare interface ObjectWithContextValidator<T extends Record<string, Validator<any>>> extends Validator<Record<string, unknown>> {
-  readonly name: 'object'
-  validate: (value: unknown) => ValidationResult
-  getShape: () => T
-  required: () => this
-  optional: () => this
-  isPartOfShape: boolean
-  shape: (shape: T) => ObjectWithContextValidator<T>
+export type ValidatorShape = Readonly<Record<string, Validator<any>>>;
+/** Resolve the value accepted by one validator. */
+export type InferValidatorValue<TValidator> = TValidator extends Validator<infer TValue> ? TValue : never;
+/** Resolve an object value directly from its validator shape. */
+export type InferObjectShape<TShape extends ValidatorShape> = {
+  -readonly [TKey in keyof TShape]: InferValidatorValue<TShape[TKey]>
 }

package/dist/schema.d.ts

@@ -3,10 +3,10 @@ import { objectWithContext } from './object-with-context';
 import { withConditionals } from './conditional';
 import type { ConditionalAPI } from './conditional';
 import type { ObjectWithContextValidator } from './object-with-context';
-import type { ValidationInstance } from '@stacksjs/ts-validation';
+import type { ValidationInstance, Validator } from '@stacksjs/ts-validation';
 export type { FileLike } from './file-validator';
 export type { ConditionalAPI, ConditionalRecord, ValidatorWithConditionals } from './conditional';
-export type { ObjectWithContextValidator } from './object-with-context';
+export type { InferObjectShape, InferValidatorValue, ObjectWithContextValidator, ValidatorShape } from './object-with-context';
 /**
  * `Object.assign({}, v, { file })` would defeat the ts-validation
  * proxy's late-binding. Wrapping with `new Proxy` keeps every existing
@@ -15,6 +15,29 @@ export type { ObjectWithContextValidator } from './object-with-context';
  * mixin on primitive factories).
  */
 export declare const schema: SchemaWithFile;
+export declare interface InferredEnumValidator<TValue extends string> extends Validator<TValue> {
+  readonly name: 'enum'
+  getAllowedValues: () => readonly TValue[]
+  custom: (fn: (value: TValue) => boolean, message: string) => InferredEnumValidator<TValue>
+}
+export declare interface InferredArrayValidator<TValue> extends Validator<TValue[]> {
+  readonly name: 'array'
+  min: (length: number) => InferredArrayValidator<TValue>
+  max: (length: number) => InferredArrayValidator<TValue>
+  length: (length: number) => InferredArrayValidator<TValue>
+  each: <TElement>(validator: Validator<TElement>) => InferredArrayValidator<TElement>
+  unique: () => InferredArrayValidator<TValue>
+}
+declare type WithConditionals<TValidator extends Validator<any>> = TValidator & ConditionalAPI<TValidator>;
+declare type ConditionalValidationInstance = {
+  // eslint-disable-next-line pickier/no-unused-vars
+  [TKey in keyof ValidationInstance]: ValidationInstance[TKey] extends (...args: infer TArgs) => infer TValidator
+    ? TValidator extends Validator<any>
+      // eslint-disable-next-line pickier/no-unused-vars
+      ? (...args: TArgs) => WithConditionals<TValidator>
+      : ValidationInstance[TKey]
+    : ValidationInstance[TKey]
+}
 /**
  * Extended `ValidationInstance` that adds `schema.file()` on top of the
  * ts-validation surface (stacksjs/stacks#1856). Upstream ts-validation
@@ -27,8 +50,10 @@ export declare const schema: SchemaWithFile;
  * and every primitive factory wrapped to attach `.when()` / `.sometimes()`
  * to the returned validator.
  */
-export type SchemaWithFile = Omit<ValidationInstance, 'object'> & {
+export type SchemaWithFile = Omit<ConditionalValidationInstance, 'array' | 'enum' | 'file' | 'object'> & {
   file: () => FileValidator
+  array: <TValue = unknown>() => WithConditionals<InferredArrayValidator<TValue>>
+  enum: <const TValues extends readonly string[]>(values: TValues) => WithConditionals<InferredEnumValidator<TValues[number]>>
   object: typeof objectWithContext
 }
 export { file, FileValidator } from './file-validator';

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/validation",
   "type": "module",
   "sideEffects": false,
-  "version": "0.70.369",
+  "version": "0.70.370",
   "description": "The Stacks Validation ways.",
   "author": "Chris Breuer",
   "contributors": [
@@ -55,14 +55,15 @@
   "scripts": {
     "build": "bun build.ts",
     "typecheck": "bun tsc --noEmit",
+    "typecheck:inference": "bun tsc -p tsconfig.type-tests.json",
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
-    "@stacksjs/ts-validation": "^0.5.0"
+    "@stacksjs/ts-validation": "^0.5.3"
   },
   "devDependencies": {
     "better-dx": "^0.2.17",
-    "@stacksjs/strings": "0.70.369",
-    "@stacksjs/types": "0.70.369"
+    "@stacksjs/strings": "0.70.370",
+    "@stacksjs/types": "0.70.370"
   }
 }