@react-typed-forms/schemas 1.0.0-dev.17 → 1.0.0-dev.19

package/lib/types.d.ts

@@ -1,234 +1,265 @@
-export interface SchemaField {
-    type: string;
-    field: string;
-    displayName?: string | null;
-    tags?: string[] | null;
-    system?: boolean | null;
-    collection?: boolean | null;
-    onlyForTypes?: string[] | null;
-    required?: boolean | null;
-    defaultValue?: any;
-    isTypeField?: boolean | null;
-    searchable?: boolean | null;
-    options?: FieldOption[] | null;
-    /**
-     * @deprecated Use options directly
-     */
-    restrictions?: SchemaRestrictions | undefined | null;
-}
-export declare enum FieldType {
-    String = "String",
-    Bool = "Bool",
-    Int = "Int",
-    Date = "Date",
-    DateTime = "DateTime",
-    Double = "Double",
-    EntityRef = "EntityRef",
-    Compound = "Compound",
-    AutoId = "AutoId",
-    Image = "Image",
-    Any = "Any"
-}
-export interface EntityRefField extends SchemaField {
-    type: FieldType.EntityRef;
-    entityRefType: string;
-    parentField: string;
-}
-export interface SchemaRestrictions {
-    options?: FieldOption[] | null;
-}
-export interface FieldOption {
-    name: string;
-    value: any;
-}
-export interface CompoundField extends SchemaField {
-    type: FieldType.Compound;
-    children: SchemaField[];
-    treeChildren?: boolean;
-}
-export type AnyControlDefinition = DataControlDefinition | GroupedControlsDefinition | ActionControlDefinition | DisplayControlDefinition;
-export interface ControlDefinition {
-    type: string;
-    title?: string | null;
-    dynamic?: DynamicProperty[] | null;
-    adornments?: ControlAdornment[] | null;
-}
-export declare enum ControlDefinitionType {
-    Data = "Data",
-    Group = "Group",
-    Display = "Display",
-    Action = "Action"
-}
-export interface DynamicProperty {
-    type: string;
-    expr: EntityExpression;
-}
-export declare enum DynamicPropertyType {
-    Visible = "Visible",
-    DefaultValue = "DefaultValue"
-}
-export interface EntityExpression {
-    type: string;
-}
-export declare enum ExpressionType {
-    Jsonata = "Jsonata",
-    FieldValue = "FieldValue",
-    UserMatch = "UserMatch"
-}
-export interface JsonataExpression extends EntityExpression {
-    type: ExpressionType.Jsonata;
-    expression: string;
-}
-export interface FieldValueExpression extends EntityExpression {
-    type: ExpressionType.FieldValue;
-    field: string;
-    value: any;
-}
-export interface UserMatchExpression extends EntityExpression {
-    type: ExpressionType.UserMatch;
-    userMatch: string;
-}
-export interface ControlAdornment {
-    type: string;
-}
-export declare enum ControlAdornmentType {
-    Tooltip = "Tooltip",
-    Accordion = "Accordion"
-}
-export interface TooltipAdornment extends ControlAdornment {
-    type: ControlAdornmentType.Tooltip;
-    tooltip: string;
-}
-export interface AccordionAdornment extends ControlAdornment {
-    type: ControlAdornmentType.Accordion;
-    title: string;
-    defaultExpanded: boolean;
-}
-export interface DataControlDefinition extends ControlDefinition {
-    type: ControlDefinitionType.Data;
-    field: string;
-    required?: boolean | null;
-    renderOptions?: RenderOptions | null;
-    defaultValue?: any;
-    readonly?: boolean | null;
-}
-export interface RenderOptions {
-    type: string;
-}
-export declare enum DataRenderType {
-    Standard = "Standard",
-    Radio = "Radio",
-    HtmlEditor = "HtmlEditor",
-    IconList = "IconList",
-    CheckList = "CheckList",
-    UserSelection = "UserSelection",
-    Synchronised = "Synchronised",
-    IconSelector = "IconSelector",
-    DateTime = "DateTime"
-}
-export interface RadioButtonRenderOptions extends RenderOptions {
-    type: DataRenderType.Radio;
-}
-export interface StandardRenderer extends RenderOptions {
-    type: DataRenderType.Standard;
-}
-export interface HtmlEditorRenderOptions extends RenderOptions {
-    type: DataRenderType.HtmlEditor;
-    allowImages: boolean;
-}
-export interface DateTimeRenderOptions extends RenderOptions {
-    type: DataRenderType.DateTime;
-    format?: string | null;
-}
-export interface IconListRenderOptions extends RenderOptions {
-    type: DataRenderType.IconList;
-    iconMappings: IconMapping[];
-}
-export interface IconMapping {
-    value: string;
-    materialIcon?: string | null;
-}
-export interface CheckListRenderOptions extends RenderOptions {
-    type: DataRenderType.CheckList;
-}
-export interface SynchronisedRenderOptions extends RenderOptions {
-    type: DataRenderType.Synchronised;
-    fieldToSync: string;
-    syncType: SyncTextType;
-}
-export declare enum SyncTextType {
-    Camel = "Camel",
-    Snake = "Snake",
-    Pascal = "Pascal"
-}
-export interface UserSelectionRenderOptions extends RenderOptions {
-    type: DataRenderType.UserSelection;
-    noGroups: boolean;
-    noUsers: boolean;
-}
-export interface IconSelectionRenderOptions extends RenderOptions {
-    type: DataRenderType.IconSelector;
-}
-export interface GroupedControlsDefinition extends ControlDefinition {
-    type: ControlDefinitionType.Group;
-    children: ControlDefinition[];
-    compoundField?: string | null;
-    groupOptions: GroupRenderOptions;
-}
-export interface GroupRenderOptions {
-    type: string;
-    hideTitle?: boolean | null;
-}
-export declare enum GroupRenderType {
-    Standard = "Standard",
-    Grid = "Grid",
-    GroupElement = "GroupElement"
-}
-export interface StandardGroupRenderer extends GroupRenderOptions {
-    type: GroupRenderType.Standard;
-}
-export interface GroupElementRenderer extends GroupRenderOptions {
-    type: GroupRenderType.GroupElement;
-    value: any;
-}
-export interface GridRenderer extends GroupRenderOptions {
-    type: GroupRenderType.Grid;
-    columns?: number | null;
-}
-export interface DisplayControlDefinition extends ControlDefinition {
-    type: ControlDefinitionType.Display;
-    displayData: DisplayData;
-}
-export interface DisplayData {
-    type: string;
-}
-export declare enum DisplayDataType {
-    Text = "Text",
-    Html = "Html"
-}
-export interface TextDisplay extends DisplayData {
-    type: DisplayDataType.Text;
-    text: string;
-}
-export interface HtmlDisplay extends DisplayData {
-    type: DisplayDataType.Html;
-    html: string;
-}
-export interface ActionControlDefinition extends ControlDefinition {
-    type: ControlDefinitionType.Action;
-    actionId: string;
-}
-export declare function isDataControlDefinition(x: ControlDefinition): x is DataControlDefinition;
-export declare function isGroupControlsDefinition(x: ControlDefinition): x is GroupedControlsDefinition;
-export declare function isDisplayControlsDefinition(x: ControlDefinition): x is DisplayControlDefinition;
-export declare function isActionControlsDefinition(x: ControlDefinition): x is ActionControlDefinition;
-export interface ControlVisitor<A> {
-    data(d: DataControlDefinition): A;
-    group(d: GroupedControlsDefinition): A;
-    display(d: DisplayControlDefinition): A;
-    action(d: ActionControlDefinition): A;
-}
-export declare function visitControlDefinition<A>(x: ControlDefinition, visitor: ControlVisitor<A>, defaultValue: (c: ControlDefinition) => A): A;
-export declare function dataControl(field: string, options?: Partial<DataControlDefinition>): DataControlDefinition;
-export declare function fieldValueExpr(field: string, value: any): FieldValueExpression;
-export declare function visibility(expr: EntityExpression): DynamicProperty;
+export interface SchemaField {
+    type: string;
+    field: string;
+    displayName?: string | null;
+    tags?: string[] | null;
+    system?: boolean | null;
+    collection?: boolean | null;
+    onlyForTypes?: string[] | null;
+    required?: boolean | null;
+    defaultValue?: any;
+    isTypeField?: boolean | null;
+    searchable?: boolean | null;
+    options?: FieldOption[] | null;
+    validators?: SchemaValidator[] | null;
+}
+export declare enum FieldType {
+    String = "String",
+    Bool = "Bool",
+    Int = "Int",
+    Date = "Date",
+    DateTime = "DateTime",
+    Double = "Double",
+    EntityRef = "EntityRef",
+    Compound = "Compound",
+    AutoId = "AutoId",
+    Image = "Image",
+    Any = "Any"
+}
+export interface EntityRefField extends SchemaField {
+    type: FieldType.EntityRef;
+    entityRefType: string;
+    parentField: string;
+}
+export interface FieldOption {
+    name: string;
+    value: any;
+}
+export interface CompoundField extends SchemaField {
+    type: FieldType.Compound;
+    children: SchemaField[];
+    treeChildren?: boolean;
+}
+export type AnyControlDefinition = DataControlDefinition | GroupedControlsDefinition | ActionControlDefinition | DisplayControlDefinition;
+export interface ControlDefinition {
+    type: string;
+    title?: string | null;
+    dynamic?: DynamicProperty[] | null;
+    adornments?: ControlAdornment[] | null;
+}
+export declare enum ControlDefinitionType {
+    Data = "Data",
+    Group = "Group",
+    Display = "Display",
+    Action = "Action"
+}
+export interface DynamicProperty {
+    type: string;
+    expr: EntityExpression;
+}
+export declare enum DynamicPropertyType {
+    Visible = "Visible",
+    DefaultValue = "DefaultValue"
+}
+export interface EntityExpression {
+    type: string;
+}
+export declare enum ExpressionType {
+    Jsonata = "Jsonata",
+    FieldValue = "FieldValue",
+    UserMatch = "UserMatch"
+}
+export interface JsonataExpression extends EntityExpression {
+    type: ExpressionType.Jsonata;
+    expression: string;
+}
+export interface FieldValueExpression extends EntityExpression {
+    type: ExpressionType.FieldValue;
+    field: string;
+    value: any;
+}
+export interface UserMatchExpression extends EntityExpression {
+    type: ExpressionType.UserMatch;
+    userMatch: string;
+}
+export interface ControlAdornment {
+    type: string;
+}
+export declare enum AdornmentPlacement {
+    ControlStart = "ControlStart",
+    ControlEnd = "ControlEnd",
+    LabelStart = "LabelStart",
+    LabelEnd = "LabelEnd"
+}
+export declare enum ControlAdornmentType {
+    Tooltip = "Tooltip",
+    Accordion = "Accordion",
+    HelpText = "HelpText"
+}
+export interface TooltipAdornment extends ControlAdornment {
+    type: ControlAdornmentType.Tooltip;
+    tooltip: string;
+}
+export interface AccordionAdornment extends ControlAdornment {
+    type: ControlAdornmentType.Accordion;
+    title: string;
+    defaultExpanded: boolean;
+}
+export interface HelpTextAdornment extends ControlAdornment {
+    type: ControlAdornmentType.HelpText;
+    helpText: string;
+    placement: AdornmentPlacement;
+}
+export interface DataControlDefinition extends ControlDefinition {
+    type: ControlDefinitionType.Data;
+    field: string;
+    required?: boolean | null;
+    renderOptions?: RenderOptions | null;
+    defaultValue?: any;
+    readonly?: boolean | null;
+    validators?: SchemaValidator[] | null;
+}
+export interface RenderOptions {
+    type: string;
+}
+export declare enum DataRenderType {
+    Standard = "Standard",
+    Radio = "Radio",
+    HtmlEditor = "HtmlEditor",
+    IconList = "IconList",
+    CheckList = "CheckList",
+    UserSelection = "UserSelection",
+    Synchronised = "Synchronised",
+    IconSelector = "IconSelector",
+    DateTime = "DateTime",
+    Checkbox = "Checkbox",
+    Dropdown = "Dropdown"
+}
+export interface RadioButtonRenderOptions extends RenderOptions {
+    type: DataRenderType.Radio;
+}
+export interface StandardRenderer extends RenderOptions {
+    type: DataRenderType.Standard;
+}
+export interface HtmlEditorRenderOptions extends RenderOptions {
+    type: DataRenderType.HtmlEditor;
+    allowImages: boolean;
+}
+export interface DateTimeRenderOptions extends RenderOptions {
+    type: DataRenderType.DateTime;
+    format?: string | null;
+}
+export interface IconListRenderOptions extends RenderOptions {
+    type: DataRenderType.IconList;
+    iconMappings: IconMapping[];
+}
+export interface IconMapping {
+    value: string;
+    materialIcon?: string | null;
+}
+export interface CheckListRenderOptions extends RenderOptions {
+    type: DataRenderType.CheckList;
+}
+export interface SynchronisedRenderOptions extends RenderOptions {
+    type: DataRenderType.Synchronised;
+    fieldToSync: string;
+    syncType: SyncTextType;
+}
+export declare enum SyncTextType {
+    Camel = "Camel",
+    Snake = "Snake",
+    Pascal = "Pascal"
+}
+export interface UserSelectionRenderOptions extends RenderOptions {
+    type: DataRenderType.UserSelection;
+    noGroups: boolean;
+    noUsers: boolean;
+}
+export interface IconSelectionRenderOptions extends RenderOptions {
+    type: DataRenderType.IconSelector;
+}
+export interface GroupedControlsDefinition extends ControlDefinition {
+    type: ControlDefinitionType.Group;
+    children: ControlDefinition[];
+    compoundField?: string | null;
+    groupOptions: GroupRenderOptions;
+}
+export interface GroupRenderOptions {
+    type: string;
+    hideTitle?: boolean | null;
+}
+export declare enum GroupRenderType {
+    Standard = "Standard",
+    Grid = "Grid",
+    GroupElement = "GroupElement"
+}
+export interface StandardGroupRenderer extends GroupRenderOptions {
+    type: GroupRenderType.Standard;
+}
+export interface GroupElementRenderer extends GroupRenderOptions {
+    type: GroupRenderType.GroupElement;
+    value: any;
+}
+export interface GridRenderer extends GroupRenderOptions {
+    type: GroupRenderType.Grid;
+    columns?: number | null;
+}
+export interface DisplayControlDefinition extends ControlDefinition {
+    type: ControlDefinitionType.Display;
+    displayData: DisplayData;
+}
+export interface DisplayData {
+    type: string;
+}
+export declare enum DisplayDataType {
+    Text = "Text",
+    Html = "Html"
+}
+export interface TextDisplay extends DisplayData {
+    type: DisplayDataType.Text;
+    text: string;
+}
+export interface HtmlDisplay extends DisplayData {
+    type: DisplayDataType.Html;
+    html: string;
+}
+export interface ActionControlDefinition extends ControlDefinition {
+    type: ControlDefinitionType.Action;
+    actionId: string;
+}
+export declare enum ValidatorType {
+    Jsonata = "Jsonata",
+    Date = "Date"
+}
+export interface SchemaValidator {
+    type: string;
+}
+export interface JsonataValidator extends SchemaValidator {
+    type: ValidatorType.Jsonata;
+    expression: string;
+}
+export declare enum DateComparison {
+    NotBefore = "NotBefore",
+    NotAfter = "NotAfter"
+}
+export interface DateValidator extends SchemaValidator {
+    type: ValidatorType.Date;
+    comparison: DateComparison;
+    fixedDate?: string | null;
+    daysFromCurrent?: number | null;
+}
+export declare function isDataControlDefinition(x: ControlDefinition): x is DataControlDefinition;
+export declare function isGroupControlsDefinition(x: ControlDefinition): x is GroupedControlsDefinition;
+export declare function isDisplayControlsDefinition(x: ControlDefinition): x is DisplayControlDefinition;
+export declare function isActionControlsDefinition(x: ControlDefinition): x is ActionControlDefinition;
+export interface ControlVisitor<A> {
+    data(d: DataControlDefinition): A;
+    group(d: GroupedControlsDefinition): A;
+    display(d: DisplayControlDefinition): A;
+    action(d: ActionControlDefinition): A;
+}
+export declare function visitControlDefinition<A>(x: ControlDefinition, visitor: ControlVisitor<A>, defaultValue: (c: ControlDefinition) => A): A;
+export declare function dataControl(field: string, options?: Partial<DataControlDefinition>): DataControlDefinition;
+export declare function fieldValueExpr(field: string, value: any): FieldValueExpression;
+export declare function visibility(expr: EntityExpression): DynamicProperty;
+export declare function isGridRenderer(options: GroupRenderOptions): options is GridRenderer;

package/lib/util.d.ts

@@ -1,3 +1,22 @@
-import { SchemaField } from "./types";
-export declare function fieldHasTag(field: SchemaField, tag: string): boolean;
-export declare function fieldDisplayName(field: SchemaField): string;
+import { CompoundField, ControlDefinition, DataControlDefinition, FieldOption, GroupedControlsDefinition, SchemaField } from "./types";
+export declare function applyDefaultValues(v: {
+    [k: string]: any;
+} | undefined, fields: SchemaField[]): any;
+export declare function applyDefaultForField(v: any, field: SchemaField, parent: SchemaField[], notElement?: boolean): any;
+export declare function defaultValueForFields(fields: SchemaField[]): any;
+export declare function defaultValueForField(sf: SchemaField): any;
+export declare function elementValueForField(sf: SchemaField): any;
+export declare function findScalarField(fields: SchemaField[], field: string): SchemaField | undefined;
+export declare function findCompoundField(fields: SchemaField[], field: string): CompoundField | undefined;
+export declare function findField(fields: SchemaField[], field: string): SchemaField | undefined;
+export declare function isScalarField(sf: SchemaField): sf is SchemaField;
+export declare function isCompoundField(sf: SchemaField): sf is CompoundField;
+export declare function isDataControl(c: ControlDefinition): c is DataControlDefinition;
+export declare function isGroupControl(c: ControlDefinition): c is GroupedControlsDefinition;
+export declare function fieldHasTag(field: SchemaField, tag: string): boolean;
+export declare function fieldDisplayName(field: SchemaField): string;
+export declare function hasOptions(o: {
+    options: FieldOption[] | undefined | null;
+}): boolean;
+export declare function defaultControlForField(sf: SchemaField): DataControlDefinition | GroupedControlsDefinition;
+export declare function addMissingControls(fields: SchemaField[], controls: ControlDefinition[]): ControlDefinition[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@react-typed-forms/schemas",
-	"version": "1.0.0-dev.17",
+	"version": "1.0.0-dev.19",
 	"description": "",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
@@ -24,7 +24,9 @@
 		"material-ui"
 	],
 	"dependencies": {
-		"@react-typed-forms/core": "^3.0.0-dev.111",
+		"@react-typed-forms/core": "^3.0.0-dev.116",
+		"clsx": "^1 || ^2",
+		"jsonata": "^2.0.3",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
@@ -32,12 +34,14 @@
 		"@types/react": "^18.2.28",
 		"microbundle": "^0.15.1",
 		"nswag": "^13.18.2",
-		"rimraf": "^3.0.2"
+		"prettier": "^3.0.3",
+		"rimraf": "^3.0.2",
+		"typescript": "^5.2.2"
 	},
 	"gitHead": "698e16cd3ab31b7dd0528fc76536f4d3205ce8c6",
 	"scripts": {
 		"build": "rimraf ./lib/ && microbundle -f cjs --no-compress --jsx React.createElement --jsxFragment React.Fragment",
-		"watch": "tsc -w",
+		"watch": "microbundle -w -f cjs --no-compress --jsx React.createElement --jsxFragment React.Fragment",
 		"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"
 	}
 }