fixup! WIP

ezzatron · Mar 24, 2024 · fb7a537 · fb7a537
1 parent 2fa9090
commit fb7a537
Show file tree

Hide file tree

Showing 2 changed files with 79 additions and 2 deletions.
diff --git a/src/declaration/number.ts b/src/declaration/number.ts
@@ -1,3 +1,7 @@
+import type {
+  Constraint,
+  DeclarationConstraintOptions,
+} from "../constraint.js";
 import {
   createRangeConstraint,
   hasNumberRangeConstraint,
@@ -21,6 +25,7 @@ import { resolve } from "../maybe.js";
 import { ScalarSchema, createScalar, toString } from "../schema.js";
 
 export type Options = DeclarationOptions<number> &
+  DeclarationConstraintOptions<number> &
   DeclarationExampleOptions<number> &
   Partial<RangeConstraintSpec<number>>;
 
@@ -59,7 +64,8 @@ function createSchema(name: string, options: Options): ScalarSchema<number> {
     return n;
   }
 
-  const constraints = [];
+  const { constraints: explicitConstraints = [] } = options;
+  const constraints: Constraint<number>[] = [];
 
   try {
     if (hasNumberRangeConstraint(options)) {
@@ -69,7 +75,10 @@ function createSchema(name: string, options: Options): ScalarSchema<number> {
     throw new SpecError(name, normalize(error));
   }
 
-  return createScalar("number", toString, unmarshal, constraints);
+  return createScalar("number", toString, unmarshal, [
+    ...constraints,
+    ...explicitConstraints,
+  ]);
 }
 
 function buildExamples(): Example<number>[] {

diff --git a/test/suite/declaration/number.spec.ts b/test/suite/declaration/number.spec.ts
@@ -210,4 +210,72 @@ describe("Number declarations", () => {
       });
     });
   });
+
+  describe("when the declaration has constraints", () => {
+    beforeEach(() => {
+      declaration = number("AUSTENITE_NUMBER", "<description>", {
+        constraints: [
+          {
+            description: "<constraint A>",
+            constrain: (v) => v % 2 === 0 || "must be divisible by 2",
+          },
+          {
+            description: "<constraint B>",
+            constrain: (v) => v % 3 === 0 || "must be divisible by 3",
+          },
+        ],
+        examples: [{ value: 6, label: "example" }],
+      });
+    });
+
+    describe("when the value satisfies the constraints", () => {
+      beforeEach(() => {
+        process.env.AUSTENITE_NUMBER = "6";
+
+        initialize({ onInvalid: noop });
+      });
+
+      describe(".value()", () => {
+        it("returns the value", () => {
+          expect(declaration.value()).toBe(6);
+        });
+      });
+    });
+
+    describe("when the value violates the first constraint", () => {
+      beforeEach(() => {
+        process.env.AUSTENITE_NUMBER = "3";
+
+        initialize({ onInvalid: noop });
+      });
+
+      describe(".value()", () => {
+        it("throws", () => {
+          expect(() => {
+            declaration.value();
+          }).toThrow(
+            "value of AUSTENITE_NUMBER (3) is invalid: must be divisible by 2",
+          );
+        });
+      });
+    });
+
+    describe("when the value violates the second constraint", () => {
+      beforeEach(() => {
+        process.env.AUSTENITE_NUMBER = "2";
+
+        initialize({ onInvalid: noop });
+      });
+
+      describe(".value()", () => {
+        it("throws", () => {
+          expect(() => {
+            declaration.value();
+          }).toThrow(
+            "value of AUSTENITE_NUMBER (2) is invalid: must be divisible by 3",
+          );
+        });
+      });
+    });
+  });
 });