@react-typed-forms/schemas 1.0.0-dev.4 → 1.0.0-dev.6

package/.rush/temp/package-deps_build.json

@@ -1,12 +1,12 @@
 {
   "files": {
     "packages/schemas/.rush/temp/shrinkwrap-deps.json": "5ce6417fae765db5c61e400f851ecafe0ce756f0",
-    "packages/schemas/package.json": "3fc4e26d218ceacae3452eccb3749fa9fc874c38",
-    "packages/schemas/src/controlRender.tsx": "5ce85ef4ee97307d9131d066655c133eb1b9bf48",
+    "packages/schemas/package.json": "40451e443132a138bd7420e0d10471f24cd9f816",
+    "packages/schemas/src/controlRender.tsx": "3a1df1f3ade46594dbc15bca1228dc0d57e55da0",
     "packages/schemas/src/hooks.ts": "4eb4946f7b1c685e0b51cd011b4d39a1fdd6aa2e",
     "packages/schemas/src/index.ts": "67f656f1d7f717bce7e933b9f4d7dc5dc50274dc",
     "packages/schemas/src/schemaBuilder.ts": "bfe74d3fb1cc2a4d5226051a58e025e107c32b11",
-    "packages/schemas/src/types.ts": "01bba36475e368ee273871358458caf60b36dad5",
+    "packages/schemas/src/types.ts": "d2a43322331d513069fc886776a22ca09fa243b0",
     "packages/schemas/tsconfig.json": "52e4f044fa580f4e0ad5830f3cfca574e2788372"
   },
   "arguments": "rimraf ./lib/ && tsc "

package/lib/controlRender.d.ts

@@ -1,4 +1,4 @@
-import { ActionControlDefinition, AnyControlDefinition, CompoundField, ControlDefinition, DataControlDefinition, DisplayControlDefinition, FieldOption, GroupedControlsDefinition, SchemaField } from "./types";
+import { ActionControlDefinition, CompoundField, ControlDefinition, DataControlDefinition, DisplayControlDefinition, FieldOption, GroupedControlsDefinition, SchemaField } from "./types";
 import React, { Key, ReactElement } from "react";
 import { Control } from "@react-typed-forms/core";
 export interface FormEditHooks {
@@ -88,7 +88,7 @@ export declare function findScalarField(fields: SchemaField[], field: string): S
 export declare function findCompoundField(fields: SchemaField[], field: string): CompoundField | undefined;
 export declare function findField(fields: SchemaField[], field: string): SchemaField | undefined;
 export declare function controlTitle(title: string | undefined | null, field: SchemaField): string;
-export declare function renderControl(definition: AnyControlDefinition, formState: FormEditState, hooks: FormEditHooks, key: Key, wrapChild?: (key: Key, db: ReactElement) => ReactElement): ReactElement;
+export declare function renderControl<S extends ControlDefinition>(definition: S, formState: FormEditState, hooks: FormEditHooks, key: Key, wrapChild?: (key: Key, db: ReactElement) => ReactElement): ReactElement;
 export declare function controlForField(field: string, formState: FormEditState): Control<any>;
 export declare function fieldForControl(c: ControlDefinition): string | null | undefined;
 export declare function isDataControl(c: ControlDefinition): c is DataControlDefinition;

package/lib/controlRender.js

@@ -116,26 +116,21 @@ function controlTitle(title, field) {
 exports.controlTitle = controlTitle;
 function renderControl(definition, formState, hooks, key, wrapChild) {
     const { fields } = formState;
-    switch (definition.type) {
-        case types_1.ControlDefinitionType.Data:
-            const def = definition;
+    return (0, types_1.visitControlDefinition)(definition, {
+        data: (def) => {
             const fieldData = findScalarField(fields, def.field);
             if (!fieldData)
                 return react_1.default.createElement("h1", null,
                     "No schema field for: ",
                     def.field);
             return (react_1.default.createElement(DataRenderer, { key: key, wrapElem: wrapElem, formState: formState, hooks: hooks, controlDef: def, fieldData: fieldData }));
-        case types_1.ControlDefinitionType.Group:
-            return (react_1.default.createElement(GroupRenderer, { key: key, hooks: hooks, groupDef: definition, formState: formState, wrapElem: wrapElem }));
-        case types_1.ControlDefinitionType.Display:
-            return (react_1.default.createElement(DisplayRenderer, { key: key, hooks: hooks, formState: formState, wrapElem: wrapElem, displayDef: definition }));
-        case types_1.ControlDefinitionType.Action:
-            return (react_1.default.createElement(ActionRenderer, { key: key, hooks: hooks, formState: formState, wrapElem: wrapElem, actionDef: definition }));
-        default:
-            return react_1.default.createElement("h1", null,
-                "Unknown control: ",
-                definition.type);
-    }
+        },
+        group: (d) => (react_1.default.createElement(GroupRenderer, { key: key, hooks: hooks, groupDef: d, formState: formState, wrapElem: wrapElem })),
+        action: (d) => (react_1.default.createElement(ActionRenderer, { key: key, hooks: hooks, formState: formState, wrapElem: wrapElem, actionDef: d })),
+        display: (d) => (react_1.default.createElement(DisplayRenderer, { key: key, hooks: hooks, formState: formState, wrapElem: wrapElem, displayDef: d })),
+    }, () => react_1.default.createElement("h1", null,
+        "Unknown control: ",
+        definition.type));
     function wrapElem(e) {
         var _a;
         return (_a = wrapChild === null || wrapChild === void 0 ? void 0 : wrapChild(key, e)) !== null && _a !== void 0 ? _a : e;

package/lib/types.d.ts

@@ -59,7 +59,7 @@ export declare enum ControlDefinitionType {
     Action = "Action"
 }
 export interface DynamicProperty {
-    type: DynamicPropertyType;
+    type: string;
     expr: EntityExpression;
 }
 export declare enum DynamicPropertyType {
@@ -156,7 +156,7 @@ export interface IconSelectionRenderOptions extends RenderOptions {
 }
 export interface GroupedControlsDefinition extends ControlDefinition {
     type: ControlDefinitionType.Group;
-    children: AnyControlDefinition[];
+    children: ControlDefinition[];
     compoundField?: string | null;
     groupOptions: GroupRenderOptions;
 }
@@ -198,3 +198,14 @@ 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;

package/lib/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DisplayDataType = exports.GroupRenderType = exports.SyncTextType = exports.DataRenderType = exports.ControlAdornmentType = exports.ExpressionType = exports.DynamicPropertyType = exports.ControlDefinitionType = exports.FieldType = void 0;
+exports.visitControlDefinition = exports.isActionControlsDefinition = exports.isDisplayControlsDefinition = exports.isGroupControlsDefinition = exports.isDataControlDefinition = exports.DisplayDataType = exports.GroupRenderType = exports.SyncTextType = exports.DataRenderType = exports.ControlAdornmentType = exports.ExpressionType = exports.DynamicPropertyType = exports.ControlDefinitionType = exports.FieldType = void 0;
 var FieldType;
 (function (FieldType) {
     FieldType["String"] = "String";
@@ -66,3 +66,34 @@ var DisplayDataType;
     DisplayDataType["Text"] = "Text";
     DisplayDataType["Html"] = "Html";
 })(DisplayDataType = exports.DisplayDataType || (exports.DisplayDataType = {}));
+function isDataControlDefinition(x) {
+    return x.type === ControlDefinitionType.Data;
+}
+exports.isDataControlDefinition = isDataControlDefinition;
+function isGroupControlsDefinition(x) {
+    return x.type === ControlDefinitionType.Group;
+}
+exports.isGroupControlsDefinition = isGroupControlsDefinition;
+function isDisplayControlsDefinition(x) {
+    return x.type === ControlDefinitionType.Display;
+}
+exports.isDisplayControlsDefinition = isDisplayControlsDefinition;
+function isActionControlsDefinition(x) {
+    return x.type === ControlDefinitionType.Action;
+}
+exports.isActionControlsDefinition = isActionControlsDefinition;
+function visitControlDefinition(x, visitor, defaultValue) {
+    switch (x.type) {
+        case ControlDefinitionType.Action:
+            return visitor.action(x);
+        case ControlDefinitionType.Data:
+            return visitor.data(x);
+        case ControlDefinitionType.Display:
+            return visitor.display(x);
+        case ControlDefinitionType.Group:
+            return visitor.group(x);
+        default:
+            return defaultValue(x);
+    }
+}
+exports.visitControlDefinition = visitControlDefinition;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@react-typed-forms/schemas",
-	"version": "1.0.0-dev.4",
+	"version": "1.0.0-dev.6",
 	"description": "",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
@@ -24,7 +24,7 @@
 		"material-ui"
 	],
 	"dependencies": {
-		"@react-typed-forms/core": "3.0.0-dev.101"
+		"@react-typed-forms/core": "3.0.0-dev.102"
 	},
 	"devDependencies": {
 		"@types/react": "^18.0.22",

package/schemas.build.log

@@ -0,0 +1,2 @@
+Invoking: rimraf ./lib/ && tsc 
+

package/src/controlRender.tsx

@@ -10,6 +10,7 @@ import {
   FieldType,
   GroupedControlsDefinition,
   SchemaField,
+  visitControlDefinition,
 } from "./types";
 import React, { createContext, Key, ReactElement, useContext } from "react";
 import { Control, newControl } from "@react-typed-forms/core";
@@ -241,62 +242,61 @@ export function controlTitle(
   return title ? title : fieldDisplayName(field);
 }
 
-export function renderControl(
-  definition: AnyControlDefinition,
+export function renderControl<S extends ControlDefinition>(
+  definition: S,
   formState: FormEditState,
   hooks: FormEditHooks,
   key: Key,
   wrapChild?: (key: Key, db: ReactElement) => ReactElement
 ): ReactElement {
   const { fields } = formState;
-  switch (definition.type) {
-    case ControlDefinitionType.Data:
-      const def = definition as DataControlDefinition;
-      const fieldData = findScalarField(fields, def.field);
-      if (!fieldData) return <h1>No schema field for: {def.field}</h1>;
-      return (
-        <DataRenderer
-          key={key}
-          wrapElem={wrapElem}
-          formState={formState}
-          hooks={hooks}
-          controlDef={def}
-          fieldData={fieldData}
-        />
-      );
-    case ControlDefinitionType.Group:
-      return (
+  return visitControlDefinition(
+    definition,
+    {
+      data: (def) => {
+        const fieldData = findScalarField(fields, def.field);
+        if (!fieldData) return <h1>No schema field for: {def.field}</h1>;
+        return (
+          <DataRenderer
+            key={key}
+            wrapElem={wrapElem}
+            formState={formState}
+            hooks={hooks}
+            controlDef={def}
+            fieldData={fieldData}
+          />
+        );
+      },
+      group: (d: GroupedControlsDefinition) => (
         <GroupRenderer
           key={key}
           hooks={hooks}
-          groupDef={definition as GroupedControlsDefinition}
+          groupDef={d}
           formState={formState}
           wrapElem={wrapElem}
         />
-      );
-    case ControlDefinitionType.Display:
-      return (
-        <DisplayRenderer
+      ),
+      action: (d: ActionControlDefinition) => (
+        <ActionRenderer
           key={key}
           hooks={hooks}
           formState={formState}
           wrapElem={wrapElem}
-          displayDef={definition as DisplayControlDefinition}
+          actionDef={d}
         />
-      );
-    case ControlDefinitionType.Action:
-      return (
-        <ActionRenderer
+      ),
+      display: (d: DisplayControlDefinition) => (
+        <DisplayRenderer
           key={key}
           hooks={hooks}
           formState={formState}
           wrapElem={wrapElem}
-          actionDef={definition as ActionControlDefinition}
+          displayDef={d}
         />
-      );
-    default:
-      return <h1>Unknown control: {(definition as any).type}</h1>;
-  }
+      ),
+    },
+    () => <h1>Unknown control: {(definition as any).type}</h1>
+  );
 
   function wrapElem(e: ReactElement): ReactElement {
     return wrapChild?.(key, e) ?? e;

package/src/types.ts

@@ -1,3 +1,5 @@
+import { DataControlProperties } from "./controlRender";
+
 export interface SchemaField {
   type: string;
   field: string;
@@ -72,7 +74,7 @@ export enum ControlDefinitionType {
 }
 
 export interface DynamicProperty {
-  type: DynamicPropertyType;
+  type: string;
   expr: EntityExpression;
 }
 
@@ -190,7 +192,7 @@ export interface IconSelectionRenderOptions extends RenderOptions {}
 
 export interface GroupedControlsDefinition extends ControlDefinition {
   type: ControlDefinitionType.Group;
-  children: AnyControlDefinition[];
+  children: ControlDefinition[];
   compoundField?: string | null;
   groupOptions: GroupRenderOptions;
 }
@@ -242,3 +244,53 @@ export interface ActionControlDefinition extends ControlDefinition {
   type: ControlDefinitionType.Action;
   actionId: string;
 }
+
+export function isDataControlDefinition(
+  x: ControlDefinition
+): x is DataControlDefinition {
+  return x.type === ControlDefinitionType.Data;
+}
+
+export function isGroupControlsDefinition(
+  x: ControlDefinition
+): x is GroupedControlsDefinition {
+  return x.type === ControlDefinitionType.Group;
+}
+
+export function isDisplayControlsDefinition(
+  x: ControlDefinition
+): x is DisplayControlDefinition {
+  return x.type === ControlDefinitionType.Display;
+}
+
+export function isActionControlsDefinition(
+  x: ControlDefinition
+): x is ActionControlDefinition {
+  return x.type === ControlDefinitionType.Action;
+}
+
+export interface ControlVisitor<A> {
+  data(d: DataControlDefinition): A;
+  group(d: GroupedControlsDefinition): A;
+  display(d: DisplayControlDefinition): A;
+  action(d: ActionControlDefinition): A;
+}
+
+export function visitControlDefinition<A>(
+  x: ControlDefinition,
+  visitor: ControlVisitor<A>,
+  defaultValue: (c: ControlDefinition) => A
+): A {
+  switch (x.type) {
+    case ControlDefinitionType.Action:
+      return visitor.action(x as ActionControlDefinition);
+    case ControlDefinitionType.Data:
+      return visitor.data(x as DataControlDefinition);
+    case ControlDefinitionType.Display:
+      return visitor.display(x as DisplayControlDefinition);
+    case ControlDefinitionType.Group:
+      return visitor.group(x as GroupedControlsDefinition);
+    default:
+      return defaultValue(x);
+  }
+}