fixup! WIP

ezzatron · Mar 24, 2024 · 97ae92a · 97ae92a
1 parent 5459337
commit 97ae92a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/src/constraint.ts b/src/constraint.ts
@@ -1,6 +1,10 @@
 import { normalize } from "./error.js";
 import { createConjunctionFormatter } from "./list.js";
 
+export type DeclarationConstraintOptions<T> = {
+  readonly constraints?: ExtrinsicConstraint<T>[];
+};
+
 export type Constraint<T> = IntrinsicConstraint<T> | ExtrinsicConstraint<T>;
 
 export type IntrinsicConstraint<T> = {

diff --git a/src/declaration/big-integer.ts b/src/declaration/big-integer.ts
@@ -1,4 +1,7 @@
-import type { Constraint, ExtrinsicConstraint } from "../constraint.js";
+import type {
+  Constraint,
+  DeclarationConstraintOptions,
+} from "../constraint.js";
 import {
   createRangeConstraint,
   hasBigintRangeConstraint,
@@ -22,10 +25,9 @@ import { resolve } from "../maybe.js";
 import { ScalarSchema, createScalar, toString } from "../schema.js";
 
 export type Options = DeclarationOptions<bigint> &
+  DeclarationConstraintOptions<bigint> &
   DeclarationExampleOptions<bigint> &
-  Partial<RangeConstraintSpec<bigint>> & {
-    readonly constraints?: ExtrinsicConstraint<bigint>[];
-  };
+  Partial<RangeConstraintSpec<bigint>>;
 
 export function bigInteger<O extends Options>(
   name: string,

diff --git a/src/declaration/binary.ts b/src/declaration/binary.ts
@@ -1,5 +1,8 @@
 import { Buffer } from "node:buffer";
-import type { Constraint, ExtrinsicConstraint } from "../constraint.js";
+import type {
+  Constraint,
+  DeclarationConstraintOptions,
+} from "../constraint.js";
 import {
   createLengthConstraint,
   type LengthConstraintSpec,
@@ -27,8 +30,8 @@ const PATTERNS: Partial<Record<BufferEncoding, RegExp>> = {
 } as const;
 
 export type Options = DeclarationOptions<Buffer> &
+  DeclarationConstraintOptions<Buffer> &
   DeclarationExampleOptions<Buffer> & {
-    readonly constraints?: ExtrinsicConstraint<Buffer>[];
     readonly encoding?: BufferEncoding;
     readonly length?: LengthConstraintSpec;
   };

diff --git a/src/declaration/string.ts b/src/declaration/string.ts
@@ -1,4 +1,7 @@
-import type { Constraint, ExtrinsicConstraint } from "../constraint.js";
+import type {
+  Constraint,
+  DeclarationConstraintOptions,
+} from "../constraint.js";
 import {
   createLengthConstraint,
   type LengthConstraintSpec,
@@ -21,8 +24,8 @@ import { resolve } from "../maybe.js";
 import { createString, type ScalarSchema } from "../schema.js";
 
 export type Options = DeclarationOptions<string> &
+  DeclarationConstraintOptions<string> &
   DeclarationExampleOptions<string> & {
-    readonly constraints?: ExtrinsicConstraint<string>[];
     readonly length?: LengthConstraintSpec;
   };