@dxos/react-ui-form 0.7.4 → 0.7.5-main.499c70c

package/dist/lib/node/index.cjs

@@ -33,11 +33,12 @@ __export(node_exports, {
   FieldEditor: () => FieldEditor,
   Form: () => Form,
   FormActions: () => FormActions,
-  GeiPointInput: () => GeiPointInput,
+  GeoPointInput: () => GeoPointInput,
   InputHeader: () => InputHeader,
   NumberInput: () => NumberInput,
   SelectInput: () => SelectInput,
   TextInput: () => TextInput,
+  TupleInput: () => TupleInput,
   ViewEditor: () => ViewEditor,
   cellClassesForFieldType: () => cellClassesForFieldType,
   cellClassesForRowSelection: () => cellClassesForRowSelection,
@@ -56,37 +57,43 @@ var import_echo_schema = require("@dxos/echo-schema");
 var import_log = require("@dxos/log");
 var import_react_ui2 = require("@dxos/react-ui");
 var import_schema = require("@dxos/schema");
-var import_effect = require("effect");
-var import_String = require("effect/String");
 var import_react3 = __toESM(require("react"));
-var import_echo_schema2 = require("@dxos/echo-schema");
-var import_effect2 = require("@dxos/effect");
-var import_log2 = require("@dxos/log");
 var import_react_ui3 = require("@dxos/react-ui");
-var import_react_ui_theme = require("@dxos/react-ui-theme");
-var import_schema2 = require("@dxos/schema");
 var import_util = require("@dxos/util");
 var import_react4 = __toESM(require("react"));
 var import_react_ui4 = require("@dxos/react-ui");
+var import_react_ui_theme = require("@dxos/react-ui-theme");
 var import_react5 = __toESM(require("react"));
 var import_react_ui5 = require("@dxos/react-ui");
 var import_react_ui_theme2 = require("@dxos/react-ui-theme");
-var import_echo_schema3 = require("@dxos/echo-schema");
+var import_util2 = require("@dxos/util");
 var import_react6 = __toESM(require("react"));
 var import_react_ui6 = require("@dxos/react-ui");
-var import_react7 = require("react");
+var import_effect = require("effect");
+var import_String = require("effect/String");
+var import_react7 = __toESM(require("react"));
+var import_echo_schema2 = require("@dxos/echo-schema");
+var import_effect2 = require("@dxos/effect");
+var import_log2 = require("@dxos/log");
+var import_react_ui7 = require("@dxos/react-ui");
+var import_react_ui_theme3 = require("@dxos/react-ui-theme");
+var import_schema2 = require("@dxos/schema");
+var import_util3 = require("@dxos/util");
+var import_echo_schema3 = require("@dxos/echo-schema");
+var import_react8 = require("react");
+var import_echo_schema4 = require("@dxos/echo-schema");
 var import_invariant = require("@dxos/invariant");
 var import_log3 = require("@dxos/log");
 var import_schema3 = require("@dxos/schema");
-var import_react8 = __toESM(require("react"));
-var import_echo_schema4 = require("@dxos/echo-schema");
-var import_react_ui7 = require("@dxos/react-ui");
+var import_react9 = __toESM(require("react"));
+var import_echo_schema5 = require("@dxos/echo-schema");
+var import_react_ui8 = require("@dxos/react-ui");
 var import_react_ui_list = require("@dxos/react-ui-list");
-var import_react_ui_theme3 = require("@dxos/react-ui-theme");
+var import_react_ui_theme4 = require("@dxos/react-ui-theme");
 var import_schema4 = require("@dxos/schema");
-var import_util2 = require("@dxos/util");
-var import_echo_schema5 = require("@dxos/echo-schema");
+var import_util4 = require("@dxos/util");
 var import_echo_schema6 = require("@dxos/echo-schema");
+var import_echo_schema7 = require("@dxos/echo-schema");
 var translationKey = "react-ui-form";
 var translations_default = [
   {
@@ -163,123 +170,143 @@ var DeprecatedFormInput = ({ label, description, secondary, children }) => {
   return primary;
 };
 var InputHeader = ({ children, error }) => {
-  return /* @__PURE__ */ import_react5.default.createElement("div", {
+  return /* @__PURE__ */ import_react4.default.createElement("div", {
     role: "none",
     className: "flex justify-between items-center mb-1"
-  }, children, error && /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Tooltip.Root, null, /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Tooltip.Trigger, {
+  }, children, error && /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Tooltip.Root, null, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Tooltip.Trigger, {
     asChild: true
-  }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Icon, {
+  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Icon, {
     icon: "ph--warning--regular",
     size: 4,
-    classNames: import_react_ui_theme2.errorText
-  })), /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Tooltip.Content, {
+    classNames: import_react_ui_theme.errorText
+  })), /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Tooltip.Content, {
     side: "bottom"
-  }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Tooltip.Arrow, null), error)));
+  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Tooltip.Arrow, null), error)));
+};
+var GeoPointInput = ({ property, type, label, disabled, getStatus, getValue: getValue2, onValueChange, onBlur }) => {
+  const { t } = (0, import_react_ui3.useTranslation)(translationKey);
+  const { status, error } = getStatus?.(property);
+  const [lng = 0, lat = 0] = getValue2(property) ?? [];
+  return /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.Input.Root, {
+    validationValence: status
+  }, /* @__PURE__ */ import_react3.default.createElement(InputHeader, {
+    error
+  }, /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.Input.Label, null, label)), /* @__PURE__ */ import_react3.default.createElement("div", {
+    className: "grid grid-cols-2 gap-2"
+  }, /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.Input.TextInput, {
+    type: "number",
+    disabled,
+    placeholder: t("placeholder longitude"),
+    value: lng,
+    onChange: (event) => onValueChange(property, type, [
+      lat,
+      (0, import_util.safeParseFloat)(event.target.value, 0)
+    ]),
+    onBlur
+  }), /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.Input.TextInput, {
+    type: "number",
+    disabled,
+    placeholder: t("placeholder latitude"),
+    value: lat,
+    onChange: (event) => onValueChange(property, type, [
+      (0, import_util.safeParseFloat)(event.target.value, 0),
+      lng
+    ]),
+    onBlur
+  })));
 };
-var TextInput = ({ property, type, label, inputOnly, disabled, placeholder, getStatus, getValue, onValueChange, onBlur }) => {
+var gridCols = [
+  "grid-cols-1",
+  "grid-cols-2",
+  "grid-cols-3",
+  "grid-cols-4"
+];
+var TupleInput = ({ binding, property, type, label, disabled, getStatus, getValue: getValue2, onValueChange, onBlur }) => {
   const { status, error } = getStatus?.(property);
-  return /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.Root, {
+  const values = getValue2(property) ?? {};
+  return /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Input.Root, {
     validationValence: status
-  }, !inputOnly && /* @__PURE__ */ import_react4.default.createElement(InputHeader, {
+  }, /* @__PURE__ */ import_react5.default.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.Label, null, label)), /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.TextInput, {
+  }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Input.Label, null, label)), /* @__PURE__ */ import_react5.default.createElement("div", {
+    className: (0, import_react_ui_theme2.mx)("grid gap-2", gridCols[binding.length - 1])
+  }, binding.map((prop) => /* @__PURE__ */ import_react5.default.createElement(import_react_ui5.Input.TextInput, {
+    key: prop,
+    type: "number",
+    disabled,
+    value: values[prop],
+    onChange: (event) => onValueChange(property, type, {
+      ...values,
+      [prop]: (0, import_util2.safeParseFloat)(event.target.value, 0)
+    }),
+    onBlur
+  }))));
+};
+var TextInput = ({ property, type, label, inputOnly, disabled, placeholder, getStatus, getValue: getValue2, onValueChange, onBlur }) => {
+  const { status, error } = getStatus?.(property);
+  return /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Root, {
+    validationValence: status
+  }, !inputOnly && /* @__PURE__ */ import_react6.default.createElement(InputHeader, {
+    error
+  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Label, null, label)), /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.TextInput, {
     disabled,
     placeholder,
-    value: getValue(property) ?? "",
+    value: getValue2(property) ?? "",
     onChange: (event) => onValueChange(property, type, event.target.value),
     onBlur
-  }), inputOnly && /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.Validation, null, error));
+  }), inputOnly && /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Validation, null, error));
 };
-var NumberInput = ({ property, type, label, inputOnly, disabled, placeholder, getStatus, getValue, onValueChange, onBlur }) => {
+var NumberInput = ({ property, type, label, inputOnly, disabled, placeholder, getStatus, getValue: getValue2, onValueChange, onBlur }) => {
   const { status, error } = getStatus?.(property);
-  return /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.Root, {
+  return /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Root, {
     validationValence: status
-  }, !inputOnly && /* @__PURE__ */ import_react4.default.createElement(InputHeader, {
+  }, !inputOnly && /* @__PURE__ */ import_react6.default.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.Label, null, label)), /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.TextInput, {
+  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Label, null, label)), /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.TextInput, {
     type: "number",
     disabled,
     placeholder,
-    value: getValue(property) ?? 0,
+    value: getValue2(property) ?? 0,
     onChange: (event) => onValueChange(property, type, event.target.value),
     onBlur
-  }), inputOnly && /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.DescriptionAndValidation, null, error));
+  }), inputOnly && /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.DescriptionAndValidation, null, error));
 };
-var BooleanInput = ({ property, type, label, inputOnly, getStatus, getValue, onValueChange }) => {
+var BooleanInput = ({ property, type, label, inputOnly, getStatus, getValue: getValue2, onValueChange }) => {
   const { status, error } = getStatus?.(property);
-  return /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.Root, {
+  return /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Root, {
     validationValence: status
-  }, !inputOnly && /* @__PURE__ */ import_react4.default.createElement(InputHeader, {
+  }, !inputOnly && /* @__PURE__ */ import_react6.default.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.Label, null, label)), /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.Switch, {
-    checked: getValue(property),
+  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Label, null, label)), /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Switch, {
+    checked: getValue2(property),
     onCheckedChange: (value) => onValueChange(property, type, value)
-  }), inputOnly && /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.DescriptionAndValidation, null, error));
+  }), inputOnly && /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.DescriptionAndValidation, null, error));
 };
-var SelectInput = ({ property, type, label, inputOnly, disabled, placeholder, options, getStatus, getValue, onValueChange }) => {
+var SelectInput = ({ property, type, label, inputOnly, disabled, placeholder, options, getStatus, getValue: getValue2, onValueChange }) => {
   const { status, error } = getStatus?.(property);
-  return /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.Root, {
+  return /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Root, {
     validationValence: status
-  }, !inputOnly && /* @__PURE__ */ import_react4.default.createElement(InputHeader, {
+  }, !inputOnly && /* @__PURE__ */ import_react6.default.createElement(InputHeader, {
     error
-  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.Label, null, label)), /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Select.Root, {
-    value: getValue(property),
+  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Label, null, label)), /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Select.Root, {
+    value: getValue2(property),
     onValueChange: (value) => onValueChange(property, type, value)
-  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Select.TriggerButton, {
+  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Select.TriggerButton, {
     classNames: "is-full",
     disabled,
     placeholder
-  }), /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Select.Portal, null, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Select.Content, null, /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Select.Viewport, null, options?.map(({ value, label: label2 }) => (
+  }), /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Select.Portal, null, /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Select.Content, null, /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Select.Viewport, null, options?.map(({ value, label: label2 }) => (
     // NOTE: Numeric values are converted to and from strings.
-    /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Select.Option, {
+    /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Select.Option, {
       key: String(value),
       value: String(value)
     }, label2 ?? String(value))
-  )))))), inputOnly && /* @__PURE__ */ import_react4.default.createElement(import_react_ui4.Input.DescriptionAndValidation, null, error));
-};
-var GeiPointInput = ({ property, type, label, disabled, getStatus, getValue, onValueChange, onBlur }) => {
-  const { t } = (0, import_react_ui6.useTranslation)(translationKey);
-  const { status, error } = getStatus?.(property);
-  const [lng = 0, lat = 0] = getValue(property) ?? [];
-  return /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Root, {
-    validationValence: status
-  }, /* @__PURE__ */ import_react6.default.createElement(InputHeader, {
-    error
-  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.Label, null, label)), /* @__PURE__ */ import_react6.default.createElement("div", {
-    className: "grid grid-cols-2 gap-2"
-  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.TextInput, {
-    type: "number",
-    disabled,
-    placeholder: t("placeholder longitude"),
-    value: lng,
-    onChange: (event) => onValueChange(property, type, [
-      lat,
-      safeParseFloat(event.target.value, 0)
-    ]),
-    onBlur
-  }), /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.TextInput, {
-    type: "number",
-    disabled,
-    placeholder: t("placeholder latitude"),
-    value: lat,
-    onChange: (event) => onValueChange(property, type, [
-      safeParseFloat(event.target.value, 0),
-      lng
-    ]),
-    onBlur
-  })));
-};
-var safeParseFloat = (str, defaultValue) => {
-  try {
-    return parseFloat(str);
-  } catch {
-    return defaultValue ?? 0;
-  }
+  )))))), inputOnly && /* @__PURE__ */ import_react6.default.createElement(import_react_ui6.Input.DescriptionAndValidation, null, error));
 };
 var getInputComponent = (type, format) => {
   switch (format) {
     case import_echo_schema3.FormatEnum.LatLng:
-      return GeiPointInput;
+      return GeoPointInput;
   }
   switch (type) {
     case "string":
@@ -292,32 +319,34 @@ var getInputComponent = (type, format) => {
 };
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/ui/react-ui-form/src/hooks/useForm.ts";
 var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, onSave }) => {
-  const [values, setValues] = (0, import_react7.useState)(initialValues);
-  (0, import_react7.useEffect)(() => {
+  const [values, setValues] = (0, import_react8.useState)(initialValues);
+  (0, import_react8.useEffect)(() => {
     setValues(initialValues);
   }, [
     initialValues
   ]);
-  const [touched, setTouched] = (0, import_react7.useState)(createKeySet(initialValues, false));
-  const [changed, setChanged] = (0, import_react7.useState)(createKeySet(initialValues, false));
-  const [errors, setErrors] = (0, import_react7.useState)({});
-  const [saving, setSaving] = (0, import_react7.useState)(false);
-  const validate = (0, import_react7.useCallback)((values2) => {
+  const [touched, setTouched] = (0, import_react8.useState)(createKeySet(initialValues, false));
+  const [changed, setChanged] = (0, import_react8.useState)(createKeySet(initialValues, false));
+  const [errors, setErrors] = (0, import_react8.useState)({});
+  const [saving, setSaving] = (0, import_react8.useState)(false);
+  const validate = (0, import_react8.useCallback)((values2) => {
     let errors2 = (0, import_schema3.validateSchema)(schema, values2) ?? [];
     if (errors2.length === 0 && onValidate) {
-      errors2 = onValidate(values2) ?? [];
+      const validatedValues = values2;
+      errors2 = onValidate(validatedValues) ?? [];
     }
     setErrors(flatMap(errors2));
-    return errors2.length === 0;
+    const valid = errors2.length === 0;
+    return valid;
   }, [
     schema,
     onValidate
   ]);
-  const [schemaDirty, setSchemaDirty] = (0, import_react7.useState)(false);
-  (0, import_react7.useEffect)(() => setSchemaDirty(true), [
+  const [schemaDirty, setSchemaDirty] = (0, import_react8.useState)(false);
+  (0, import_react8.useEffect)(() => setSchemaDirty(true), [
     schema
   ]);
-  (0, import_react7.useEffect)(() => {
+  (0, import_react8.useEffect)(() => {
     if (schemaDirty) {
       validate(values);
       setSchemaDirty(false);
@@ -326,13 +355,13 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
     values,
     schemaDirty
   ]);
-  const canSave = (0, import_react7.useMemo)(() => !saving && Object.keys(values).every((property) => touched[property] === false || !errors[property]), [
+  const canSave = (0, import_react8.useMemo)(() => !saving && Object.keys(values).every((property) => touched[property] === false || !errors[property]), [
     values,
     touched,
     errors,
     saving
   ]);
-  const handleSave = (0, import_react7.useCallback)(async () => {
+  const handleSave = (0, import_react8.useCallback)(async () => {
     if (validate(values)) {
       setSaving(true);
       try {
@@ -346,17 +375,18 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
   }, [
     values,
     validate,
-    onSave
+    onSave,
+    changed
   ]);
-  const getStatus = (0, import_react7.useCallback)((property) => ({
+  const getStatus = (0, import_react8.useCallback)((property) => ({
     status: errors[property] ? "error" : void 0,
     error: errors[property] ? errors[property] : void 0
   }), [
     touched,
     errors
   ]);
-  const getValue = (property) => {
-    return getByPath(values, property);
+  const getFormValue = (property) => {
+    return (0, import_echo_schema4.getValue)(values, property);
   };
   const onValueChange = (property, type, value) => {
     let parsedValue = value;
@@ -367,13 +397,15 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
     } catch (err) {
       import_log3.log.catch(err, void 0, {
         F: __dxlog_file,
-        L: 183,
+        L: 178,
         S: void 0,
         C: (f, a) => f(...a)
       });
       parsedValue = void 0;
     }
-    const newValues = setByPath(values, property, parsedValue);
+    const newValues = {
+      ...(0, import_echo_schema4.setValue)(values, property, parsedValue)
+    };
     setValues(newValues);
     setChanged((prev) => ({
       ...prev,
@@ -387,7 +419,7 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
       });
     }
   };
-  const onBlur = (0, import_react7.useCallback)((event) => {
+  const onBlur = (0, import_react8.useCallback)((event) => {
     const { name } = event.target;
     setTouched((touched2) => ({
       ...touched2,
@@ -411,7 +443,7 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
     handleSave,
     // Field utils.
     getStatus,
-    getValue,
+    getValue: getFormValue,
     onValueChange,
     onBlur
   };
@@ -419,7 +451,7 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
 var createKeySet = (obj, value) => {
   (0, import_invariant.invariant)(obj, void 0, {
     F: __dxlog_file,
-    L: 234,
+    L: 229,
     S: void 0,
     A: [
       "obj",
@@ -439,24 +471,10 @@ var flatMap = (errors) => {
     return result;
   }, {});
 };
-var getByPath = (obj, path) => {
-  const [key, index] = path.split(".");
-  return index === void 0 ? obj[key] : obj[key][parseInt(index)];
-};
-var setByPath = (obj, path, value) => {
-  const [key, index] = path.split(".");
-  const newValue = index === void 0 ? value : [
-    ...obj[key]
-  ].map((v, i) => i === parseInt(index) ? value : v);
-  return {
-    ...obj,
-    [key]: newValue
-  };
-};
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-form/src/components/Form/Form.tsx";
 var padding = "px-2";
 var Form = ({ classNames, schema, values: initialValues, path = [], readonly, filter, sort, autoSave, testId, onValuesChanged, onValidate, onSave, onCancel, Custom }) => {
-  const onValid = (0, import_react3.useMemo)(() => autoSave ? onSave : void 0, [
+  const onValid = (0, import_react7.useMemo)(() => autoSave ? onSave : void 0, [
     autoSave,
     onSave
   ]);
@@ -468,7 +486,7 @@ var Form = ({ classNames, schema, values: initialValues, path = [], readonly, fi
     onValid,
     onSave
   });
-  const properties = (0, import_react3.useMemo)(() => {
+  const properties = (0, import_react7.useMemo)(() => {
     const props = (0, import_schema2.getSchemaProperties)(schema.ast, values);
     const filtered = filter ? filter(props) : props;
     const findIndex = (props2, prop) => {
@@ -481,13 +499,13 @@ var Form = ({ classNames, schema, values: initialValues, path = [], readonly, fi
     filter,
     values
   ]);
-  (0, import_react3.useEffect)(() => {
+  (0, import_react7.useEffect)(() => {
     if (errors && Object.keys(errors).length) {
       import_log2.log.warn("validation", {
         errors
       }, {
         F: __dxlog_file2,
-        L: 100,
+        L: 99,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -495,9 +513,9 @@ var Form = ({ classNames, schema, values: initialValues, path = [], readonly, fi
   }, [
     errors
   ]);
-  return /* @__PURE__ */ import_react3.default.createElement("div", {
+  return /* @__PURE__ */ import_react7.default.createElement("div", {
     role: "form",
-    className: (0, import_react_ui_theme.mx)("flex flex-col w-full gap-2 py-2", classNames),
+    className: (0, import_react_ui_theme3.mx)("flex flex-col w-full gap-2 py-2", classNames),
     "data-testid": testId
   }, properties.map((property) => {
     const { ast, name, type, format, title, description, examples, options, array } = property;
@@ -510,11 +528,11 @@ var Form = ({ classNames, schema, values: initialValues, path = [], readonly, fi
     let InputComponent = Custom?.[key.join(".")];
     if (!InputComponent) {
       if (options) {
-        return /* @__PURE__ */ import_react3.default.createElement("div", {
+        return /* @__PURE__ */ import_react7.default.createElement("div", {
           key: name,
           role: "none",
           className: padding
-        }, /* @__PURE__ */ import_react3.default.createElement(SelectInput, {
+        }, /* @__PURE__ */ import_react7.default.createElement(SelectInput, {
           type,
           format,
           property: name,
@@ -530,7 +548,7 @@ var Form = ({ classNames, schema, values: initialValues, path = [], readonly, fi
       }
       InputComponent = getInputComponent(type, format);
       if (array) {
-        return /* @__PURE__ */ import_react3.default.createElement(ArrayField, {
+        return /* @__PURE__ */ import_react7.default.createElement(ArrayField, {
           key: name,
           name,
           type,
@@ -552,12 +570,12 @@ var Form = ({ classNames, schema, values: initialValues, path = [], readonly, fi
         const typeLiteral = baseNode ? (0, import_effect2.getDiscriminatedType)(baseNode, values[name]) : (0, import_effect2.findNode)(ast, import_echo_schema2.AST.isTypeLiteral);
         if (typeLiteral) {
           const schema2 = import_echo_schema2.S.make(typeLiteral);
-          return /* @__PURE__ */ import_react3.default.createElement("div", {
+          return /* @__PURE__ */ import_react7.default.createElement("div", {
             key: name,
             role: "none"
-          }, /* @__PURE__ */ import_react3.default.createElement("div", {
+          }, /* @__PURE__ */ import_react7.default.createElement("div", {
             className: padding
-          }, label), /* @__PURE__ */ import_react3.default.createElement(Form, {
+          }, label), /* @__PURE__ */ import_react7.default.createElement(Form, {
             schema: schema2,
             path: key,
             values: values[name] ?? {},
@@ -573,17 +591,17 @@ var Form = ({ classNames, schema, values: initialValues, path = [], readonly, fi
         type
       }, {
         F: __dxlog_file2,
-        L: 185,
+        L: 184,
         S: void 0,
         C: (f, a) => f(...a)
       });
       return null;
     }
-    return /* @__PURE__ */ import_react3.default.createElement("div", {
+    return /* @__PURE__ */ import_react7.default.createElement("div", {
       key: name,
       role: "none",
       className: padding
-    }, /* @__PURE__ */ import_react3.default.createElement(InputComponent, {
+    }, /* @__PURE__ */ import_react7.default.createElement(InputComponent, {
       type,
       format,
       property: name,
@@ -592,7 +610,7 @@ var Form = ({ classNames, schema, values: initialValues, path = [], readonly, fi
       placeholder,
       ...inputProps
     }));
-  }).filter(import_util.isNotFalsy), (onCancel || onSave) && !autoSave && /* @__PURE__ */ import_react3.default.createElement(FormActions, {
+  }).filter(import_util3.isNotFalsy), (onCancel || onSave) && !autoSave && /* @__PURE__ */ import_react7.default.createElement(FormActions, {
     onCancel,
     onSubmit: handleSave,
     canSubmit: canSave,
@@ -600,7 +618,7 @@ var Form = ({ classNames, schema, values: initialValues, path = [], readonly, fi
   }));
 };
 var ArrayField = ({ name, type, label, ast, values, format, readonly, placeholder, inputProps, Custom }) => {
-  const { t } = (0, import_react_ui3.useTranslation)(translationKey);
+  const { t } = (0, import_react_ui7.useTranslation)(translationKey);
   const arrayValues = values[name] ?? [];
   const key = [
     name
@@ -612,26 +630,26 @@ var ArrayField = ({ name, type, label, ast, values, format, readonly, placeholde
     const typeLiteral = baseNode ? (0, import_effect2.getDiscriminatedType)(baseNode, values[name]) : (0, import_effect2.findNode)(elementType, import_echo_schema2.AST.isTypeLiteral);
     if (typeLiteral) {
       const schema = import_echo_schema2.S.make(typeLiteral);
-      return /* @__PURE__ */ import_react3.default.createElement("div", {
+      return /* @__PURE__ */ import_react7.default.createElement("div", {
         key: name,
         role: "none",
-        className: (0, import_react_ui_theme.mx)(padding)
-      }, /* @__PURE__ */ import_react3.default.createElement(InputHeader, null, label), /* @__PURE__ */ import_react3.default.createElement("div", {
+        className: (0, import_react_ui_theme3.mx)(padding)
+      }, /* @__PURE__ */ import_react7.default.createElement(InputHeader, null, label), /* @__PURE__ */ import_react7.default.createElement("div", {
         role: "none",
         className: "flex flex-col gap-1"
       }, arrayValues.map((value, index) => {
-        return /* @__PURE__ */ import_react3.default.createElement("div", {
+        return /* @__PURE__ */ import_react7.default.createElement("div", {
           key: index,
           role: "none",
           className: "flex items-center gap-1"
-        }, /* @__PURE__ */ import_react3.default.createElement("div", {
+        }, /* @__PURE__ */ import_react7.default.createElement("div", {
           role: "none",
           className: "flex-1"
-        }, /* @__PURE__ */ import_react3.default.createElement(Form, {
+        }, /* @__PURE__ */ import_react7.default.createElement(Form, {
           schema,
           path: [
             ...key,
-            index.toString()
+            `[${index}]`
           ],
           values: value,
           onValuesChanged: (childValues) => {
@@ -642,7 +660,7 @@ var ArrayField = ({ name, type, label, ast, values, format, readonly, placeholde
             inputProps.onValueChange(name, "object", newValues);
           },
           Custom
-        })), /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.IconButton, {
+        })), /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.IconButton, {
           icon: "ph--trash--regular",
           iconOnly: true,
           label: t("button remove"),
@@ -651,10 +669,10 @@ var ArrayField = ({ name, type, label, ast, values, format, readonly, placeholde
             inputProps.onValueChange(name, type, newValues);
           }
         }));
-      })), /* @__PURE__ */ import_react3.default.createElement("div", {
+      })), /* @__PURE__ */ import_react7.default.createElement("div", {
         role: "none",
         className: "flex justify-between items-center plb-1"
-      }, /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.IconButton, {
+      }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.IconButton, {
         icon: "ph--plus--regular",
         iconOnly: true,
         label: t("button add"),
@@ -667,7 +685,7 @@ var ArrayField = ({ name, type, label, ast, values, format, readonly, placeholde
         }
       })));
     }
-    return /* @__PURE__ */ import_react3.default.createElement("div", {
+    return /* @__PURE__ */ import_react7.default.createElement("div", {
       key: name,
       role: "none"
     }, "Nested form not supported in arrays, yet.");
@@ -676,30 +694,30 @@ var ArrayField = ({ name, type, label, ast, values, format, readonly, placeholde
   if (!InputComponent) {
     return null;
   }
-  return /* @__PURE__ */ import_react3.default.createElement("div", {
+  return /* @__PURE__ */ import_react7.default.createElement("div", {
     role: "none",
     key: "meta-input",
-    className: (0, import_react_ui_theme.mx)(padding)
-  }, /* @__PURE__ */ import_react3.default.createElement(InputHeader, null, label), /* @__PURE__ */ import_react3.default.createElement("div", {
+    className: (0, import_react_ui_theme3.mx)(padding)
+  }, /* @__PURE__ */ import_react7.default.createElement(InputHeader, null, label), /* @__PURE__ */ import_react7.default.createElement("div", {
     role: "none",
     className: "flex flex-col gap-1"
-  }, arrayValues.map((_, index) => /* @__PURE__ */ import_react3.default.createElement("div", {
+  }, arrayValues.map((_, index) => /* @__PURE__ */ import_react7.default.createElement("div", {
     key: index,
     role: "none",
     className: "flex items-start gap-1"
-  }, /* @__PURE__ */ import_react3.default.createElement("div", {
+  }, /* @__PURE__ */ import_react7.default.createElement("div", {
     role: "none",
     className: "flex-1"
-  }, /* @__PURE__ */ import_react3.default.createElement(InputComponent, {
+  }, /* @__PURE__ */ import_react7.default.createElement(InputComponent, {
     type,
     format,
     label,
     inputOnly: true,
-    property: `${name}.${index}`,
+    property: `${name}[${index}]`,
     disabled: readonly,
     placeholder,
     ...inputProps
-  })), /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.IconButton, {
+  })), /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.IconButton, {
     icon: "ph--trash--regular",
     iconOnly: true,
     label: t("button remove"),
@@ -707,10 +725,10 @@ var ArrayField = ({ name, type, label, ast, values, format, readonly, placeholde
       const newValues = arrayValues.filter((_2, i) => i !== index);
       inputProps.onValueChange(name, type, newValues);
     }
-  })))), /* @__PURE__ */ import_react3.default.createElement("div", {
+  })))), /* @__PURE__ */ import_react7.default.createElement("div", {
     role: "none",
     className: "flex justify-between items-center plb-1"
-  }, /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.IconButton, {
+  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.IconButton, {
     icon: "ph--plus--regular",
     iconOnly: true,
     label: t("button add"),
@@ -724,19 +742,19 @@ var ArrayField = ({ name, type, label, ast, values, format, readonly, placeholde
   })));
 };
 var FormActions = ({ onCancel, onSubmit, canSubmit, readonly }) => {
-  const { t } = (0, import_react_ui3.useTranslation)(translationKey);
-  return /* @__PURE__ */ import_react3.default.createElement("div", {
+  const { t } = (0, import_react_ui7.useTranslation)(translationKey);
+  return /* @__PURE__ */ import_react7.default.createElement("div", {
     role: "none",
     className: "flex justify-center"
-  }, /* @__PURE__ */ import_react3.default.createElement("div", {
+  }, /* @__PURE__ */ import_react7.default.createElement("div", {
     role: "none",
-    className: (0, import_react_ui_theme.mx)(onCancel && !readonly && "grid grid-cols-2 gap-2")
-  }, onCancel && !readonly && /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.IconButton, {
+    className: (0, import_react_ui_theme3.mx)(onCancel && !readonly && "grid grid-cols-2 gap-2")
+  }, onCancel && !readonly && /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.IconButton, {
     "data-testid": "cancel-button",
     icon: "ph--x--regular",
     label: t("button cancel"),
     onClick: onCancel
-  }), onSubmit && /* @__PURE__ */ import_react3.default.createElement(import_react_ui3.IconButton, {
+  }), onSubmit && /* @__PURE__ */ import_react7.default.createElement(import_react_ui7.IconButton, {
     type: "submit",
     "data-testid": "save-button",
     disabled: !canSubmit,
@@ -758,9 +776,11 @@ var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
     if (!registry) {
       return;
     }
-    const subscription = registry.subscribe(setSchemas);
+    const subscription = registry.query().subscribe((query) => setSchemas(query.results), {
+      fire: true
+    });
     const t2 = setTimeout(async () => {
-      const schemas2 = await registry.query();
+      const schemas2 = await registry.query().run();
       setSchemas(schemas2);
     });
     return () => {
@@ -781,11 +801,15 @@ var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
     fieldSchema: (0, import_schema.getFormatSchema)(props?.format)
   });
   const handleValuesChanged = (0, import_react2.useCallback)((_props) => {
-    if (_props.format !== props.format) {
-      setFieldSchema({
-        fieldSchema: (0, import_schema.getFormatSchema)(_props.format)
-      });
-    }
+    setFieldSchema((prev) => {
+      const fieldSchema2 = (0, import_schema.getFormatSchema)(_props.format);
+      if (prev.fieldSchema === fieldSchema2) {
+        return prev;
+      }
+      return {
+        fieldSchema: fieldSchema2
+      };
+    });
     if (_props.referenceSchema !== props.referenceSchema) {
       setSchema(schemas.find((schema2) => schema2.typename === _props.referenceSchema));
     }
@@ -802,7 +826,8 @@ var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
     });
   }, [
     schemas,
-    props
+    props.format,
+    props.referenceSchema
   ]);
   const handleValidate = (0, import_react2.useCallback)(({ property }) => {
     if (property && view.fields.find((f) => f.path === property && f.path !== field.path)) {
@@ -839,7 +864,7 @@ var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
       props
     }, {
       F: __dxlog_file3,
-      L: 118,
+      L: 126,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -875,7 +900,7 @@ var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
       }),
       ["referencePath"]: (props2) => /* @__PURE__ */ import_react2.default.createElement(SelectInput, {
         ...props2,
-        options: schema ? (0, import_schema.getSchemaProperties)(schema.schema.ast).sort(import_schema.sortProperties).map((p) => ({
+        options: schema ? (0, import_schema.getSchemaProperties)(schema.ast).sort(import_schema.sortProperties).map((p) => ({
           value: p.name
         })) : []
       })
@@ -883,22 +908,22 @@ var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
   });
 };
 var grid = "grid grid-cols-[32px_1fr_32px] min-bs-[2.5rem]";
-var ViewMetaSchema = import_echo_schema4.S.Struct({
-  name: import_echo_schema4.S.String.annotations({
-    [import_echo_schema4.AST.TitleAnnotationId]: "View"
+var ViewMetaSchema = import_echo_schema5.S.Struct({
+  name: import_echo_schema5.S.String.annotations({
+    [import_echo_schema5.AST.TitleAnnotationId]: "View"
   }),
-  typename: import_echo_schema4.Format.DXN.annotations({
-    [import_echo_schema4.AST.TitleAnnotationId]: "Typename"
+  typename: import_echo_schema5.Format.DXN.annotations({
+    [import_echo_schema5.AST.TitleAnnotationId]: "Typename"
   })
-}).pipe(import_echo_schema4.S.mutable);
+}).pipe(import_echo_schema5.S.mutable);
 var ViewEditor = ({ classNames, schema, view, registry, readonly, showHeading = false, onDelete }) => {
-  const { t } = (0, import_react_ui7.useTranslation)(translationKey);
-  const projection = (0, import_react8.useMemo)(() => new import_schema4.ViewProjection(schema, view), [
+  const { t } = (0, import_react_ui8.useTranslation)(translationKey);
+  const projection = (0, import_react9.useMemo)(() => new import_schema4.ViewProjection(schema, view), [
     schema,
     view
   ]);
-  const [field, setField] = (0, import_react8.useState)();
-  const viewValues = (0, import_react8.useMemo)(() => {
+  const [field, setField] = (0, import_react9.useState)();
+  const viewValues = (0, import_react9.useMemo)(() => {
     return {
       name: view.name,
       // TODO(burdon): Need to warn user of possible consequences of editing.
@@ -908,7 +933,7 @@ var ViewEditor = ({ classNames, schema, view, registry, readonly, showHeading =
   }, [
     view
   ]);
-  const handleViewUpdate = (0, import_react8.useCallback)(({ name, typename }) => {
+  const handleViewUpdate = (0, import_react9.useCallback)(({ name, typename }) => {
     requestAnimationFrame(() => {
       view.name = name;
       view.query.type = typename;
@@ -918,67 +943,67 @@ var ViewEditor = ({ classNames, schema, view, registry, readonly, showHeading =
     view,
     schema
   ]);
-  const handleSelect = (0, import_react8.useCallback)((field2) => {
+  const handleSelect = (0, import_react9.useCallback)((field2) => {
     setField((f) => f === field2 ? void 0 : field2);
   }, []);
-  const handleAdd = (0, import_react8.useCallback)(() => {
+  const handleAdd = (0, import_react9.useCallback)(() => {
     const field2 = projection.createFieldProjection();
     setField(field2);
   }, [
     view
   ]);
-  const handleMove = (0, import_react8.useCallback)((fromIndex, toIndex) => {
-    (0, import_util2.arrayMove)(view.fields, fromIndex, toIndex);
+  const handleMove = (0, import_react9.useCallback)((fromIndex, toIndex) => {
+    (0, import_util4.arrayMove)(view.fields, fromIndex, toIndex);
   }, [
     view.fields
   ]);
-  const handleClose = (0, import_react8.useCallback)(() => setField(void 0), []);
-  return /* @__PURE__ */ import_react8.default.createElement("div", {
+  const handleClose = (0, import_react9.useCallback)(() => setField(void 0), []);
+  return /* @__PURE__ */ import_react9.default.createElement("div", {
     role: "none",
-    className: (0, import_react_ui_theme3.mx)("flex flex-col w-full divide-y divide-separator", classNames)
-  }, /* @__PURE__ */ import_react8.default.createElement(Form, {
+    className: (0, import_react_ui_theme4.mx)("flex flex-col w-full divide-y divide-separator", classNames)
+  }, /* @__PURE__ */ import_react9.default.createElement(Form, {
     autoFocus: true,
     autoSave: true,
     schema: ViewMetaSchema,
     values: viewValues,
     onSave: handleViewUpdate
-  }), /* @__PURE__ */ import_react8.default.createElement("div", null, /* @__PURE__ */ import_react8.default.createElement("div", {
+  }), /* @__PURE__ */ import_react9.default.createElement("div", null, /* @__PURE__ */ import_react9.default.createElement("div", {
     role: "none",
     className: "p-2"
-  }, /* @__PURE__ */ import_react8.default.createElement("label", {
-    className: (0, import_react_ui_theme3.mx)(import_react_ui_theme3.inputTextLabel)
-  }, t("fields label"))), /* @__PURE__ */ import_react8.default.createElement(import_react_ui_list.List.Root, {
+  }, /* @__PURE__ */ import_react9.default.createElement("label", {
+    className: (0, import_react_ui_theme4.mx)(import_react_ui_theme4.inputTextLabel)
+  }, t("fields label"))), /* @__PURE__ */ import_react9.default.createElement(import_react_ui_list.List.Root, {
     items: view.fields,
-    isItem: import_echo_schema4.S.is(import_schema4.FieldSchema),
+    isItem: import_echo_schema5.S.is(import_schema4.FieldSchema),
     getId: (field2) => field2.id,
     onMove: handleMove
-  }, ({ items: fields }) => /* @__PURE__ */ import_react8.default.createElement(import_react8.default.Fragment, null, showHeading && /* @__PURE__ */ import_react8.default.createElement("div", {
+  }, ({ items: fields }) => /* @__PURE__ */ import_react9.default.createElement(import_react9.default.Fragment, null, showHeading && /* @__PURE__ */ import_react9.default.createElement("div", {
     role: "heading",
     className: grid
-  }, /* @__PURE__ */ import_react8.default.createElement("div", null), /* @__PURE__ */ import_react8.default.createElement("div", {
+  }, /* @__PURE__ */ import_react9.default.createElement("div", null), /* @__PURE__ */ import_react9.default.createElement("div", {
     className: "flex items-center text-sm"
-  }, t("field path label"))), /* @__PURE__ */ import_react8.default.createElement("div", {
+  }, t("field path label"))), /* @__PURE__ */ import_react9.default.createElement("div", {
     role: "list",
     className: "flex flex-col w-full"
-  }, fields?.map((field2) => /* @__PURE__ */ import_react8.default.createElement(import_react_ui_list.List.Item, {
+  }, fields?.map((field2) => /* @__PURE__ */ import_react9.default.createElement(import_react_ui_list.List.Item, {
     key: field2.id,
     item: field2,
-    classNames: (0, import_react_ui_theme3.mx)(grid, import_react_ui_theme3.ghostHover, "cursor-pointer")
-  }, /* @__PURE__ */ import_react8.default.createElement(import_react_ui_list.List.ItemDragHandle, null), /* @__PURE__ */ import_react8.default.createElement(import_react_ui_list.List.ItemTitle, {
+    classNames: (0, import_react_ui_theme4.mx)(grid, import_react_ui_theme4.ghostHover, "cursor-pointer")
+  }, /* @__PURE__ */ import_react9.default.createElement(import_react_ui_list.List.ItemDragHandle, null), /* @__PURE__ */ import_react9.default.createElement(import_react_ui_list.List.ItemTitle, {
     onClick: () => handleSelect(field2)
-  }, field2.path), /* @__PURE__ */ import_react8.default.createElement(import_react_ui_list.List.ItemDeleteButton, {
+  }, field2.path), /* @__PURE__ */ import_react9.default.createElement(import_react_ui_list.List.ItemDeleteButton, {
     disabled: view.fields.length <= 1,
     onClick: () => onDelete(field2.id)
-  }))))))), field && /* @__PURE__ */ import_react8.default.createElement(FieldEditor, {
+  }))))))), field && /* @__PURE__ */ import_react9.default.createElement(FieldEditor, {
     key: field.id,
     view,
     projection,
     field,
     registry,
     onSave: handleClose
-  }), !readonly && !field && /* @__PURE__ */ import_react8.default.createElement("div", {
+  }), !readonly && !field && /* @__PURE__ */ import_react9.default.createElement("div", {
     className: "flex p-2 justify-center"
-  }, /* @__PURE__ */ import_react8.default.createElement(import_react_ui7.IconButton, {
+  }, /* @__PURE__ */ import_react9.default.createElement(import_react_ui8.IconButton, {
     icon: "ph--plus--regular",
     label: t("button add property"),
     onClick: handleAdd,
@@ -992,7 +1017,7 @@ var parseValue = ({ type, format, value }) => {
   }
   const parseScalar = (type2) => {
     switch (type2) {
-      case import_echo_schema5.TypeEnum.Boolean: {
+      case import_echo_schema6.TypeEnum.Boolean: {
         if (typeof value === "string") {
           const lowercaseValue = value.toLowerCase();
           if (lowercaseValue === "0" || lowercaseValue === "false") {
@@ -1003,13 +1028,13 @@ var parseValue = ({ type, format, value }) => {
         }
         return Boolean(value);
       }
-      case import_echo_schema5.TypeEnum.Number: {
+      case import_echo_schema6.TypeEnum.Number: {
         const cleaned = typeof value === "string" ? value.replace(/[^0-9.-]+/g, "") : value;
         const num = Number(cleaned);
         return Number.isNaN(num) ? null : num;
       }
-      case import_echo_schema5.TypeEnum.String:
-      case import_echo_schema5.TypeEnum.Ref:
+      case import_echo_schema6.TypeEnum.String:
+      case import_echo_schema6.TypeEnum.Ref:
         return String(value);
       default: {
         return value;
@@ -1020,22 +1045,22 @@ var parseValue = ({ type, format, value }) => {
     return parseScalar(type);
   }
   switch (format) {
-    case import_echo_schema5.FormatEnum.Boolean:
-      return parseScalar(import_echo_schema5.TypeEnum.Boolean);
-    case import_echo_schema5.FormatEnum.Number:
-    case import_echo_schema5.FormatEnum.Percent:
-    case import_echo_schema5.FormatEnum.Currency:
-      return parseScalar(import_echo_schema5.TypeEnum.Number);
-    case import_echo_schema5.FormatEnum.String:
-    case import_echo_schema5.FormatEnum.Markdown: {
-      return parseScalar(import_echo_schema5.TypeEnum.String);
+    case import_echo_schema6.FormatEnum.Boolean:
+      return parseScalar(import_echo_schema6.TypeEnum.Boolean);
+    case import_echo_schema6.FormatEnum.Number:
+    case import_echo_schema6.FormatEnum.Percent:
+    case import_echo_schema6.FormatEnum.Currency:
+      return parseScalar(import_echo_schema6.TypeEnum.Number);
+    case import_echo_schema6.FormatEnum.String:
+    case import_echo_schema6.FormatEnum.Markdown: {
+      return parseScalar(import_echo_schema6.TypeEnum.String);
     }
-    case import_echo_schema5.FormatEnum.Ref:
-      throw new Error(`unexpected format: ${import_echo_schema5.FormatEnum.Ref}`);
-    case import_echo_schema5.FormatEnum.DateTime:
-    case import_echo_schema5.FormatEnum.Date:
-    case import_echo_schema5.FormatEnum.Time:
-    case import_echo_schema5.FormatEnum.Timestamp: {
+    case import_echo_schema6.FormatEnum.Ref:
+      throw new Error(`unexpected format: ${import_echo_schema6.FormatEnum.Ref}`);
+    case import_echo_schema6.FormatEnum.DateTime:
+    case import_echo_schema6.FormatEnum.Date:
+    case import_echo_schema6.FormatEnum.Time:
+    case import_echo_schema6.FormatEnum.Timestamp: {
       const date = new Date(value);
       return isNaN(date.getTime()) ? null : date;
     }
@@ -1047,19 +1072,19 @@ var parseValue = ({ type, format, value }) => {
 var cellClassesForFieldType = ({ type, format }) => {
   if (!format) {
     switch (type) {
-      case import_echo_schema5.TypeEnum.Number:
+      case import_echo_schema6.TypeEnum.Number:
         return [
           "text-right",
           "font-mono"
         ];
-      case import_echo_schema5.TypeEnum.Boolean:
+      case import_echo_schema6.TypeEnum.Boolean:
         return [
           "text-right",
           "font-mono"
         ];
-      case import_echo_schema5.TypeEnum.String:
+      case import_echo_schema6.TypeEnum.String:
         return void 0;
-      case import_echo_schema5.TypeEnum.Ref:
+      case import_echo_schema6.TypeEnum.Ref:
         return void 0;
       default: {
         return void 0;
@@ -1067,20 +1092,20 @@ var cellClassesForFieldType = ({ type, format }) => {
     }
   }
   switch (format) {
-    case import_echo_schema5.FormatEnum.Markdown:
+    case import_echo_schema6.FormatEnum.Markdown:
       return void 0;
-    case import_echo_schema5.FormatEnum.Timestamp:
-    case import_echo_schema5.FormatEnum.DateTime:
-    case import_echo_schema5.FormatEnum.Date:
-    case import_echo_schema5.FormatEnum.Time:
+    case import_echo_schema6.FormatEnum.Timestamp:
+    case import_echo_schema6.FormatEnum.DateTime:
+    case import_echo_schema6.FormatEnum.Date:
+    case import_echo_schema6.FormatEnum.Time:
       return [
         "font-mono"
       ];
-    case import_echo_schema5.FormatEnum.Currency:
+    case import_echo_schema6.FormatEnum.Currency:
       return [
         "text-right"
       ];
-    case import_echo_schema5.FormatEnum.JSON:
+    case import_echo_schema6.FormatEnum.JSON:
       return [
         "font-mono"
       ];
@@ -1098,12 +1123,12 @@ var pathNotUniqueError = (path) => ({
 var formatForDisplay = ({ type, format, value, locale = void 0 }) => {
   const formatScalar = (type2) => {
     switch (type2) {
-      case import_echo_schema6.TypeEnum.Boolean:
+      case import_echo_schema7.TypeEnum.Boolean:
         return value.toLocaleString().toUpperCase();
-      case import_echo_schema6.TypeEnum.Number:
+      case import_echo_schema7.TypeEnum.Number:
         return value.toLocaleString(locale);
-      case import_echo_schema6.TypeEnum.String:
-      case import_echo_schema6.TypeEnum.Ref:
+      case import_echo_schema7.TypeEnum.String:
+      case import_echo_schema7.TypeEnum.Ref:
         return String(value);
       default: {
         return String(value);
@@ -1114,20 +1139,20 @@ var formatForDisplay = ({ type, format, value, locale = void 0 }) => {
     return formatScalar(type);
   }
   switch (format) {
-    case import_echo_schema6.FormatEnum.Boolean: {
-      return formatScalar(import_echo_schema6.TypeEnum.Boolean);
+    case import_echo_schema7.FormatEnum.Boolean: {
+      return formatScalar(import_echo_schema7.TypeEnum.Boolean);
     }
-    case import_echo_schema6.FormatEnum.Number: {
-      return formatScalar(import_echo_schema6.TypeEnum.Number);
+    case import_echo_schema7.FormatEnum.Number: {
+      return formatScalar(import_echo_schema7.TypeEnum.Number);
     }
-    case import_echo_schema6.FormatEnum.String:
-    case import_echo_schema6.FormatEnum.Ref: {
-      return formatScalar(import_echo_schema6.TypeEnum.String);
+    case import_echo_schema7.FormatEnum.String:
+    case import_echo_schema7.FormatEnum.Ref: {
+      return formatScalar(import_echo_schema7.TypeEnum.String);
     }
-    case import_echo_schema6.FormatEnum.Percent: {
+    case import_echo_schema7.FormatEnum.Percent: {
       return `${value * 100}%`;
     }
-    case import_echo_schema6.FormatEnum.Currency: {
+    case import_echo_schema7.FormatEnum.Currency: {
       return value.toLocaleString(locale, {
         style: "currency",
         currency: "USD",
@@ -1135,13 +1160,13 @@ var formatForDisplay = ({ type, format, value, locale = void 0 }) => {
         maximumFractionDigits: 2
       });
     }
-    case import_echo_schema6.FormatEnum.DateTime:
-    case import_echo_schema6.FormatEnum.Date:
-    case import_echo_schema6.FormatEnum.Time: {
+    case import_echo_schema7.FormatEnum.DateTime:
+    case import_echo_schema7.FormatEnum.Date:
+    case import_echo_schema7.FormatEnum.Time: {
       const date = new Date(value);
-      if (format === import_echo_schema6.FormatEnum.DateTime) {
+      if (format === import_echo_schema7.FormatEnum.DateTime) {
         return date.toLocaleString(locale);
-      } else if (format === import_echo_schema6.FormatEnum.Date) {
+      } else if (format === import_echo_schema7.FormatEnum.Date) {
         return date.toLocaleDateString(locale);
       } else {
         return date.toLocaleTimeString(locale);
@@ -1158,10 +1183,10 @@ var formatForDisplay = ({ type, format, value, locale = void 0 }) => {
 var formatForEditing = ({ type, format, value, locale = void 0 }) => {
   const formatScalar = (type2) => {
     switch (type2) {
-      case import_echo_schema6.TypeEnum.Boolean:
-      case import_echo_schema6.TypeEnum.Number:
-      case import_echo_schema6.TypeEnum.String:
-      case import_echo_schema6.TypeEnum.Ref:
+      case import_echo_schema7.TypeEnum.Boolean:
+      case import_echo_schema7.TypeEnum.Number:
+      case import_echo_schema7.TypeEnum.String:
+      case import_echo_schema7.TypeEnum.Ref:
         return String(value);
       default:
         return String(value);
@@ -1171,27 +1196,27 @@ var formatForEditing = ({ type, format, value, locale = void 0 }) => {
     return formatScalar(type);
   }
   switch (format) {
-    case import_echo_schema6.FormatEnum.Boolean:
-    case import_echo_schema6.FormatEnum.Number:
-    case import_echo_schema6.FormatEnum.String:
-    case import_echo_schema6.FormatEnum.Ref: {
+    case import_echo_schema7.FormatEnum.Boolean:
+    case import_echo_schema7.FormatEnum.Number:
+    case import_echo_schema7.FormatEnum.String:
+    case import_echo_schema7.FormatEnum.Ref: {
       return formatScalar(type);
     }
-    case import_echo_schema6.FormatEnum.Percent: {
+    case import_echo_schema7.FormatEnum.Percent: {
       return String(value * 100);
     }
-    case import_echo_schema6.FormatEnum.Currency: {
+    case import_echo_schema7.FormatEnum.Currency: {
       return String(value);
     }
-    case import_echo_schema6.FormatEnum.DateTime: {
+    case import_echo_schema7.FormatEnum.DateTime: {
       const date = new Date(value);
       return date.toISOString();
     }
-    case import_echo_schema6.FormatEnum.Date: {
+    case import_echo_schema7.FormatEnum.Date: {
       const date = new Date(value);
       return date.toISOString().split("T")[0];
     }
-    case import_echo_schema6.FormatEnum.Time: {
+    case import_echo_schema7.FormatEnum.Time: {
       const date = new Date(value);
       return date.toISOString().split("T")[1].split(".")[0];
     }
@@ -1207,11 +1232,12 @@ var formatForEditing = ({ type, format, value, locale = void 0 }) => {
   FieldEditor,
   Form,
   FormActions,
-  GeiPointInput,
+  GeoPointInput,
   InputHeader,
   NumberInput,
   SelectInput,
   TextInput,
+  TupleInput,
   ViewEditor,
   cellClassesForFieldType,
   cellClassesForRowSelection,