fix(striker-ui): revise input tests to handle optional, number fields

striker-ui/lib/test_input/buildDomainTestBatch.tsx

@@ -6,10 +6,11 @@ import { InlineMonoText } from '../../components/Text';
 const buildDomainTestBatch: BuildInputTestBatchFunction = (
   inputName,
   onSuccess,
-  { compare: dCompare, getValue } = {},
+  { onFinishBatch, ...defaults } = {},
   onDomainTestFailure,
 ) => ({
-  defaults: { compare: dCompare, getValue, onSuccess },
+  defaults: { ...defaults, onSuccess },
+  onFinishBatch,
   tests: [
     {
       onFailure: (...args) => {

striker-ui/lib/test_input/buildIPAddressTestBatch.tsx

@@ -5,10 +5,11 @@ import testNotBlank from './testNotBlank';
 const buildIPAddressTestBatch: BuildInputTestBatchFunction = (
   inputName,
   onSuccess,
-  { getValue } = {},
+  { onFinishBatch, ...defaults } = {},
   onIPv4TestFailure,
 ) => ({
-  defaults: { getValue, onSuccess },
+  defaults: { ...defaults, onSuccess },
+  onFinishBatch,
   tests: [
     {
       onFailure: (...args) => {

striker-ui/lib/test_input/buildNumberTestBatch.tsx

@@ -0,0 +1,56 @@
+import testRange from './testRange';
+import toNumber from '../toNumber';
+
+const buildNumberTestBatch: BuildInputTestBatchFunction = (
+  inputName,
+  onSuccess,
+  { onFinishBatch, ...defaults } = {},
+  onIntTestFailure?,
+  onFloatTestFailure?,
+  onRangeTestFailure?,
+) => {
+  const tests: InputTest[] = [];
+
+  if (onIntTestFailure) {
+    tests.push({
+      onFailure: (...args) => {
+        onIntTestFailure(<>{inputName} must be a valid integer.</>, ...args);
+      },
+      test: ({ value }) => Number.isSafeInteger(toNumber(value)),
+    });
+  } else if (onFloatTestFailure) {
+    tests.push({
+      onFailure: (...args) => {
+        onFloatTestFailure(
+          <>{inputName} must be a valid floating-point number.</>,
+          ...args,
+        );
+      },
+      test: ({ value }) => Number.isFinite(toNumber(value, 'parseFloat')),
+    });
+  }
+
+  if (onRangeTestFailure) {
+    tests.push({
+      onFailure: (...args) => {
+        const { displayMax, displayMin } = args[0];
+
+        onRangeTestFailure(
+          <>
+            {inputName} is expected to be between {displayMin} and {displayMax}.
+          </>,
+          ...args,
+        );
+      },
+      test: testRange,
+    });
+  }
+
+  return {
+    defaults: { ...defaults, onSuccess },
+    onFinishBatch,
+    tests,
+  };
+};
+
+export default buildNumberTestBatch;

striker-ui/lib/test_input/buildPeacefulStringTestBatch.tsx

@@ -6,10 +6,11 @@ import { InlineMonoText } from '../../components/Text';
 const buildPeacefulStringTestBatch: BuildInputTestBatchFunction = (
   inputName,
   onSuccess,
-  { getValue } = {},
+  { onFinishBatch, ...defaults } = {},
   onTestPeacefulStringFailureAppend,
 ) => ({
-  defaults: { getValue, onSuccess },
+  defaults: { ...defaults, onSuccess },
+  onFinishBatch,
   tests: [
     {
       onFailure: (...args) => {

striker-ui/lib/test_input/buildUUIDTestBatch.tsx

@@ -5,10 +5,11 @@ import testNotBlank from './testNotBlank';
 const buildUUIDTestBatch: BuildInputTestBatchFunction = (
   inputName,
   onSuccess,
-  { getValue } = {},
+  { onFinishBatch, ...defaults } = {},
   onUUIDTestFailure,
 ) => ({
-  defaults: { getValue, onSuccess },
+  defaults: { ...defaults, onSuccess },
+  onFinishBatch,
   tests: [
     {
       onFailure: (...args) => {

striker-ui/lib/test_input/testInput.ts

@@ -32,6 +32,9 @@ const evalIsIgnoreOnCallbacks = ({
         setTestCallbacks: cbSetter,
       };
 
+const nullishSet = <T>(a: T | undefined, b: T) => a ?? b;
+const orSet = <T>(a: T | undefined, b: T) => a || b;
+
 const testInput: TestInputFunction = ({
   excludeTestIds = [],
   excludeTestIdsRe,
@@ -80,22 +83,28 @@ const testInput: TestInputFunction = ({
         onSuccess: dOnSuccess,
         value: dValue = null,
       } = {},
+      isRequired = false,
       onFinishBatch,
       optionalTests,
       tests: requiredTests,
     } = tests[id];
+    const isOptional = !isRequired;
     const {
       getCompare = dGetCompare,
       getValue = dGetValue,
       isIgnoreOnCallbacks = dIsIgnoreOnCallbacks,
       max = dMax,
       min = dMin,
-      compare = getCompare?.call(null) ?? dCompare,
-      value = getValue?.call(null) ?? dValue,
-      displayMax = dDisplayMax || String(max),
-      displayMin = dDisplayMin || String(min),
+      compare = nullishSet(getCompare?.call(null), dCompare),
+      value = nullishSet(getValue?.call(null), dValue),
+      displayMax = orSet(dDisplayMax, String(max)),
+      displayMin = orSet(dDisplayMin, String(min)),
     } = testsToRun[id];
 
+    if (!value && isOptional) {
+      return true;
+    }
+
     const { cbFinishBatch, setTestCallbacks } = evalIsIgnoreOnCallbacks({
       isIgnoreOnCallbacks,
       onFinishBatch,
@@ -153,7 +162,7 @@ const testInput: TestInputFunction = ({
     //   );
     // })();
 
-    cbFinishBatch?.call(null);
+    cbFinishBatch?.call(null, requiredTestsResult, id);
 
     return requiredTestsResult || isContinueOnFailure;
   });

striker-ui/lib/toNumber.ts

@@ -0,0 +1,7 @@
+const toNumber: (
+  value: unknown,
+  parser?: 'parseFloat' | 'parseInt',
+) => number = (value, parser = 'parseInt') =>
+  typeof value === 'number' ? value : Number[parser](String(value));
+
+export default toNumber;

striker-ui/types/TestInputFunction.d.ts

@@ -50,12 +50,13 @@ type InputTestInputs = {
   [id: string]: Partial<InputTestArgs>;
 };
 
-type InputTestBatchFinishCallback = () => void;
+type InputTestBatchFinishCallback = (result: boolean, id: string) => void;
 
 type InputTestBatch = {
   defaults?: InputTestArgs & {
     onSuccess?: InputTestSuccessCallback;
   };
+  isRequired?: boolean;
   onFinishBatch?: InputTestBatchFinishCallback;
   optionalTests?: Array<InputTest>;
   tests: Array<InputTest>;
@@ -64,7 +65,7 @@ type InputTestBatch = {
 type BuildInputTestBatchFunction = (
   inputName: string,
   onSuccess: InputTestSuccessCallback,
-  options?: InputTestBatch['defaults'],
+  options?: InputTestBatch['defaults'] & Pick<InputTestBatch, 'onFinishBatch'>,
   ...onFailureAppends: InputTestFailureAppendCallback[]
 ) => InputTestBatch;