Stricter types

docs/api-bridges.md

@@ -28,8 +28,8 @@ If only a simple or no validation is needed, this bridge is perfectly suited to
 The constructor accepts three arguments:
 
 - `schema: GraphQLType` can be any type parsed and extracted from a GraphQL schema.
-- `validator: (model: Record<string, any>) => any` a custom validator function that should return a falsy value if no errors are present or information about errors in the model as described in the [custom bridge section](/docs/examples-custom-bridge#validator-definition).
-- `extras: Record<string, any> = {}` used to extend the schema generated from GraphQL type with extra field configuration.
+- `validator: (model: Record<string, unknown>) => any` a custom validator function that should return a falsy value if no errors are present or information about errors in the model as described in the [custom bridge section](/docs/examples-custom-bridge#validator-definition).
+- `extras: Record<string, unknown> = {}` used to extend the schema generated from GraphQL type with extra field configuration.
 
 ### Code example
 

packages/uniforms-antd/__tests__/_createContext.ts

@@ -1,20 +1,21 @@
-import { BaseForm, Context, randomIds } from 'uniforms';
+import { SimpleSchemaDefinition } from 'simpl-schema';
+import { Context, UnknownObject, randomIds, ChangedMap } from 'uniforms';
 
 import createSchema from './_createSchema';
 
 const randomId = randomIds();
 
-export default function createContext(
-  schema?: object,
-  context?: Partial<Context<any>>,
-  model?: object,
-): { context: Context<any> } {
+export default function createContext<Model extends UnknownObject>(
+  schema?: SimpleSchemaDefinition,
+  context?: Partial<Context<Model>>,
+  model = {} as Model,
+): { context: Context<Model> } {
   return {
     context: {
       changed: false,
-      changedMap: {},
+      changedMap: {} as ChangedMap<Model>,
       error: null,
-      model: model ?? {},
+      model,
       name: [],
       onChange() {},
       onSubmit() {},
@@ -32,7 +33,8 @@ export default function createContext(
         showInlineError: false,
         ...context?.state,
       },
-      formRef: {} as BaseForm<unknown>,
+      // @ts-expect-error We don't have a true ref in tests.
+      formRef: null,
     },
   };
 }

packages/uniforms-antd/__tests__/_createSchema.ts

@@ -1,6 +1,6 @@
-import SimpleSchema from 'simpl-schema';
+import SimpleSchema, { SimpleSchemaDefinition } from 'simpl-schema';
 import { SimpleSchema2Bridge } from 'uniforms-bridge-simple-schema-2';
 
-export default function createSchema(schema = {}) {
+export default function createSchema(schema: SimpleSchemaDefinition = {}) {
   return new SimpleSchema2Bridge(new SimpleSchema(schema));
 }

packages/uniforms-antd/src/AutoField.tsx

@@ -1,6 +1,6 @@
 import invariant from 'invariant';
-import { createAutoField } from 'uniforms';
 export { AutoFieldProps } from 'uniforms';
+import { createAutoField } from 'uniforms';
 
 import BoolField from './BoolField';
 import DateField from './DateField';

packages/uniforms-antd/src/HiddenField.tsx

@@ -7,7 +7,7 @@ export type HiddenFieldProps = Override<
     inputRef?: Ref<HTMLInputElement>;
     name: string;
     noDOM?: boolean;
-    value?: any;
+    value?: unknown;
   }
 >;
 
@@ -27,6 +27,7 @@ export default function HiddenField({ value, ...rawProps }: HiddenFieldProps) {
       readOnly={props.readOnly}
       ref={props.inputRef}
       type="hidden"
+      // @ts-expect-error `value` should be serializable.
       value={value ?? props.value ?? ''}
       {...filterDOMProps(props)}
     />

packages/uniforms-bootstrap3/__tests__/_createContext.ts

@@ -1,20 +1,21 @@
-import { BaseForm, Context, randomIds } from 'uniforms';
+import { SimpleSchemaDefinition } from 'simpl-schema';
+import { Context, UnknownObject, randomIds, ChangedMap } from 'uniforms';
 
 import createSchema from './_createSchema';
 
 const randomId = randomIds();
 
-export default function createContext(
-  schema?: object,
-  context?: Partial<Context<any>>,
-  model?: object,
-): { context: Context<any> } {
+export default function createContext<Model extends UnknownObject>(
+  schema?: SimpleSchemaDefinition,
+  context?: Partial<Context<Model>>,
+  model = {} as Model,
+): { context: Context<Model> } {
   return {
     context: {
       changed: false,
-      changedMap: {},
+      changedMap: {} as ChangedMap<Model>,
       error: null,
-      model: model ?? {},
+      model,
       name: [],
       onChange() {},
       onSubmit() {},
@@ -32,7 +33,8 @@ export default function createContext(
         showInlineError: false,
         ...context?.state,
       },
-      formRef: {} as BaseForm<unknown>,
+      // @ts-expect-error We don't have a true ref in tests.
+      formRef: null,
     },
   };
 }

packages/uniforms-bootstrap3/__tests__/_createSchema.ts

@@ -1,6 +1,6 @@
-import SimpleSchema from 'simpl-schema';
+import SimpleSchema, { SimpleSchemaDefinition } from 'simpl-schema';
 import { SimpleSchema2Bridge } from 'uniforms-bridge-simple-schema-2';
 
-export default function createSchema(schema = {}) {
+export default function createSchema(schema: SimpleSchemaDefinition = {}) {
   return new SimpleSchema2Bridge(new SimpleSchema(schema));
 }

packages/uniforms-bootstrap3/src/AutoField.tsx

@@ -1,6 +1,6 @@
 import invariant from 'invariant';
-import { createAutoField } from 'uniforms';
 export { AutoFieldProps } from 'uniforms';
+import { createAutoField } from 'uniforms';
 
 import BoolField from './BoolField';
 import DateField from './DateField';

packages/uniforms-bootstrap3/src/HiddenField.tsx

@@ -1,13 +1,13 @@
 import React, { HTMLProps, Ref, useEffect } from 'react';
-import { filterDOMProps, Override, useField } from 'uniforms';
+import { Override, filterDOMProps, useField } from 'uniforms';
 
 export type HiddenFieldProps = Override<
   HTMLProps<HTMLInputElement>,
   {
     inputRef?: Ref<HTMLInputElement>;
     name: string;
     noDOM?: boolean;
-    value?: any;
+    value?: unknown;
   }
 >;
 
@@ -27,6 +27,7 @@ export default function HiddenField({ value, ...rawProps }: HiddenFieldProps) {
       readOnly={props.readOnly}
       ref={props.inputRef}
       type="hidden"
+      // @ts-expect-error `value` should be serializable.
       value={value ?? props.value ?? ''}
       {...filterDOMProps(props)}
     />

packages/uniforms-bootstrap4/__tests__/_createContext.ts

@@ -1,20 +1,21 @@
-import { BaseForm, Context, randomIds } from 'uniforms';
+import { SimpleSchemaDefinition } from 'simpl-schema';
+import { Context, UnknownObject, randomIds, ChangedMap } from 'uniforms';
 
 import createSchema from './_createSchema';
 
 const randomId = randomIds();
 
-export default function createContext(
-  schema?: object,
-  context?: Partial<Context<any>>,
-  model?: object,
-): { context: Context<any> } {
+export default function createContext<Model extends UnknownObject>(
+  schema?: SimpleSchemaDefinition,
+  context?: Partial<Context<Model>>,
+  model = {} as Model,
+): { context: Context<Model> } {
   return {
     context: {
       changed: false,
-      changedMap: {},
+      changedMap: {} as ChangedMap<Model>,
       error: null,
-      model: model ?? {},
+      model,
       name: [],
       onChange() {},
       onSubmit() {},
@@ -32,7 +33,8 @@ export default function createContext(
         showInlineError: false,
         ...context?.state,
       },
-      formRef: {} as BaseForm<unknown>,
+      // @ts-expect-error We don't have a true ref in tests.
+      formRef: null,
     },
   };
 }

packages/uniforms-bootstrap4/__tests__/_createSchema.ts

@@ -1,6 +1,6 @@
-import SimpleSchema from 'simpl-schema';
+import SimpleSchema, { SimpleSchemaDefinition } from 'simpl-schema';
 import { SimpleSchema2Bridge } from 'uniforms-bridge-simple-schema-2';
 
-export default function createSchema(schema = {}) {
+export default function createSchema(schema: SimpleSchemaDefinition = {}) {
   return new SimpleSchema2Bridge(new SimpleSchema(schema));
 }

packages/uniforms-bootstrap4/src/AutoField.tsx

@@ -1,6 +1,6 @@
 import invariant from 'invariant';
-import { createAutoField } from 'uniforms';
 export { AutoFieldProps } from 'uniforms';
+import { createAutoField } from 'uniforms';
 
 import BoolField from './BoolField';
 import DateField from './DateField';

packages/uniforms-bootstrap4/src/HiddenField.tsx

@@ -1,13 +1,13 @@
 import React, { HTMLProps, Ref, useEffect } from 'react';
-import { filterDOMProps, Override, useField } from 'uniforms';
+import { Override, filterDOMProps, useField } from 'uniforms';
 
 export type HiddenFieldProps = Override<
   HTMLProps<HTMLInputElement>,
   {
     inputRef?: Ref<HTMLInputElement>;
     name: string;
     noDOM?: boolean;
-    value?: any;
+    value?: unknown;
   }
 >;
 
@@ -27,6 +27,7 @@ export default function HiddenField({ value, ...rawProps }: HiddenFieldProps) {
       readOnly={props.readOnly}
       ref={props.inputRef}
       type="hidden"
+      // @ts-expect-error `value` should be serializable.
       value={value ?? props.value ?? ''}
       {...filterDOMProps(props)}
     />

packages/uniforms-bootstrap5/__tests__/_createContext.ts

@@ -1,20 +1,21 @@
-import { BaseForm, Context, randomIds } from 'uniforms';
+import { SimpleSchemaDefinition } from 'simpl-schema';
+import { Context, UnknownObject, randomIds, ChangedMap } from 'uniforms';
 
 import createSchema from './_createSchema';
 
 const randomId = randomIds();
 
-export default function createContext(
-  schema?: object,
-  context?: Partial<Context<any>>,
-  model?: object,
-): { context: Context<any> } {
+export default function createContext<Model extends UnknownObject>(
+  schema?: SimpleSchemaDefinition,
+  context?: Partial<Context<Model>>,
+  model = {} as Model,
+): { context: Context<Model> } {
   return {
     context: {
       changed: false,
-      changedMap: {},
+      changedMap: {} as ChangedMap<Model>,
       error: null,
-      model: model ?? {},
+      model,
       name: [],
       onChange() {},
       onSubmit() {},
@@ -32,7 +33,8 @@ export default function createContext(
         showInlineError: false,
         ...context?.state,
       },
-      formRef: {} as BaseForm<unknown>,
+      // @ts-expect-error We don't have a true ref in tests.
+      formRef: null,
     },
   };
 }

packages/uniforms-bootstrap5/__tests__/_createSchema.ts

@@ -1,6 +1,6 @@
-import SimpleSchema from 'simpl-schema';
+import SimpleSchema, { SimpleSchemaDefinition } from 'simpl-schema';
 import { SimpleSchema2Bridge } from 'uniforms-bridge-simple-schema-2';
 
-export default function createSchema(schema = {}) {
+export default function createSchema(schema: SimpleSchemaDefinition = {}) {
   return new SimpleSchema2Bridge(new SimpleSchema(schema));
 }

packages/uniforms-bootstrap5/src/AutoField.tsx

@@ -1,6 +1,6 @@
 import invariant from 'invariant';
-import { createAutoField } from 'uniforms';
 export { AutoFieldProps } from 'uniforms';
+import { createAutoField } from 'uniforms';
 
 import BoolField from './BoolField';
 import DateField from './DateField';

packages/uniforms-bootstrap5/src/HiddenField.tsx

@@ -1,13 +1,13 @@
 import React, { HTMLProps, Ref, useEffect } from 'react';
-import { filterDOMProps, Override, useField } from 'uniforms';
+import { Override, filterDOMProps, useField } from 'uniforms';
 
 export type HiddenFieldProps = Override<
   HTMLProps<HTMLInputElement>,
   {
     inputRef?: Ref<HTMLInputElement>;
     name: string;
     noDOM?: boolean;
-    value?: any;
+    value?: unknown;
   }
 >;
 
@@ -27,6 +27,7 @@ export default function HiddenField({ value, ...rawProps }: HiddenFieldProps) {
       readOnly={props.readOnly}
       ref={props.inputRef}
       type="hidden"
+      // @ts-expect-error `value` should be serializable.
       value={value ?? props.value ?? ''}
       {...filterDOMProps(props)}
     />