@react-typed-forms/schemas 11.18.1 → 11.18.3

package/lib/schemaBuilder.d.ts

@@ -1,5 +1,5 @@
 import { CompoundField, FieldOption, FieldType, SchemaField, SchemaMap } from "./types";
-type AllowedSchema<T> = T extends string ? SchemaField & {
+export type AllowedSchema<T> = T extends string ? SchemaField & {
     type: FieldType.String | FieldType.Date | FieldType.DateTime | FieldType.Time;
 } : T extends number ? SchemaField & {
     type: FieldType.Int | FieldType.Double;
@@ -20,22 +20,11 @@ type AllowedField<T, K> = (name: string) => (SchemaField & {
 export declare function buildSchema<T, Custom = "">(def: {
     [K in keyof T]-?: AllowedField<T[K], Custom>;
 }): SchemaField[];
-export declare function stringField(displayName: string, options?: Partial<Omit<SchemaField, "type">>): (name: string) => SchemaField & {
-    field?: string | undefined;
-    displayName: string | null;
-    tags?: string[] | null | undefined;
-    system?: boolean | null | undefined;
-    collection?: boolean | null | undefined;
-    onlyForTypes?: string[] | null | undefined;
-    required?: boolean | null | undefined;
-    notNullable?: boolean | null | undefined;
-    defaultValue?: any;
-    isTypeField?: boolean | null | undefined;
-    searchable?: boolean | null | undefined;
-    options?: FieldOption[] | null | undefined;
-    validators?: import("./types").SchemaValidator[] | null | undefined;
-    type: FieldType.String;
-};
+export type FieldBuilder<T extends FieldType, K> = (name: string) => Omit<SchemaField, "type"> & {
+    type: T;
+} & K;
+export declare function stringField(displayName: string): FieldBuilder<FieldType.String, {}>;
+export declare function stringField<S extends Partial<SchemaField>>(displayName: string, options: S): FieldBuilder<FieldType.String, S>;
 export declare function stringOptionsField(displayName: string, ...options: FieldOption[]): (name: string) => SchemaField & {
     type: FieldType.String;
     displayName: string;
@@ -46,18 +35,12 @@ export declare function makeScalarField<S extends Partial<SchemaField>>(options:
 export declare function makeCompoundField<S extends Partial<CompoundField>>(options: S): (name: string) => CompoundField & {
     type: FieldType.Compound;
 } & S;
-export declare function intField<S extends Partial<SchemaField>>(displayName: string, options?: S): (name: string) => SchemaField & {
-    type: FieldType.Int;
-    displayName: string;
-} & S;
-export declare function doubleField<S extends Partial<SchemaField>>(displayName: string, options?: S): (name: string) => SchemaField & {
-    type: FieldType.Double;
-    displayName: string;
-} & S;
-export declare function dateField<S extends Partial<SchemaField>>(displayName: string, options?: S): (name: string) => SchemaField & {
-    type: FieldType.Date;
-    displayName: string;
-} & S;
+export declare function intField(displayName: string): FieldBuilder<FieldType.Int, {}>;
+export declare function intField<S extends Partial<SchemaField>>(displayName: string, options: S): FieldBuilder<FieldType.Int, S>;
+export declare function doubleField(displayName: string): FieldBuilder<FieldType.Double, {}>;
+export declare function doubleField<S extends Partial<SchemaField>>(displayName: string, options: S): FieldBuilder<FieldType.Double, S>;
+export declare function dateField(displayName: string): FieldBuilder<FieldType.Date, {}>;
+export declare function dateField<S extends Partial<SchemaField>>(displayName: string, options: S): FieldBuilder<FieldType.Date, S>;
 export declare function timeField<S extends Partial<SchemaField>>(displayName: string, options?: S): (name: string) => SchemaField & {
     type: FieldType.Time;
     displayName: string;
@@ -66,10 +49,8 @@ export declare function dateTimeField<S extends Partial<SchemaField>>(displayNam
     type: FieldType.DateTime;
     displayName: string;
 } & S;
-export declare function boolField<S extends Partial<SchemaField>>(displayName: string, options?: S): (name: string) => SchemaField & {
-    type: FieldType.Bool;
-    displayName: string;
-} & S;
+export declare function boolField(displayName: string): FieldBuilder<FieldType.Bool, {}>;
+export declare function boolField<S extends Partial<SchemaField>>(displayName: string, options: S): FieldBuilder<FieldType.Bool, S>;
 export declare function compoundField<Other extends Partial<Omit<CompoundField, "type" | "schemaType">>>(displayName: string, fields: SchemaField[], other?: Other): (name: string) => CompoundField & {
     collection: Other["collection"];
 };

package/lib/types.d.ts

@@ -156,7 +156,7 @@ export interface TooltipAdornment extends ControlAdornment {
 export interface AccordionAdornment extends ControlAdornment {
     type: ControlAdornmentType.Accordion;
     title: string;
-    defaultExpanded: boolean;
+    defaultExpanded?: boolean | null;
 }
 export interface HelpTextAdornment extends ControlAdornment {
     type: ControlAdornmentType.HelpText;
@@ -344,7 +344,7 @@ export interface CustomDisplay extends DisplayData {
 export interface ActionControlDefinition extends ControlDefinition {
     type: ControlDefinitionType.Action;
     actionId: string;
-    actionData: string;
+    actionData?: string | null;
 }
 export declare enum ValidatorType {
     Jsonata = "Jsonata",

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "@react-typed-forms/schemas",
-  "version": "11.18.1",
+  "version": "11.18.3",
   "description": "",
+  "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
+  "exports": "./lib/index.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/doolse/react-typed-forms.git"
@@ -43,8 +45,8 @@
   },
   "gitHead": "698e16cd3ab31b7dd0528fc76536f4d3205ce8c6",
   "scripts": {
-    "build": "rimraf ./lib/ && microbundle -f cjs --no-compress --jsx React.createElement --jsxFragment React.Fragment",
-    "watch": "microbundle -w -f cjs --no-compress --jsx React.createElement --jsxFragment React.Fragment",
+    "build": "rimraf ./lib/ && microbundle -f modern,cjs --jsx React.createElement --jsxFragment React.Fragment",
+    "watch": "microbundle -w -f modern,cjs --no-compress --jsx React.createElement --jsxFragment React.Fragment",
     "update-readme": "md-magic --path README.md",
     "gencode": "nswag swagger2tsclient /input:http://localhost:5216/swagger/v1/swagger.json /runtime:Net60 /output:src/types.ts /GenerateClientClasses:false /MarkOptionalProperties:false /Template:Fetch /TypeStyle:Interface /DateTimeType:string"
   }