Skip to content

make form less fragile #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sverhoeven merged 3 commits into from
Apr 17, 2025
Merged

make form less fragile #134

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
719a371
Wrap experiment config form in error boundary
sverhoeven Apr 17, 2025
f75aaeb
Replace unwrap() and structuredClone with JSON clone
sverhoeven Apr 17, 2025
62ecffd
Revert "Wrap experiment config form in error boundary"
sverhoeven Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions packages/form/src/Form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@ function useFormContext() {
return value;
}

function cloneAndUnwrap<T>(value: T): T {
const s = JSON.stringify(value);
const val = JSON.parse(s);
return val;
}

function createFormStore(
schema: Accessor<JSONSchemaType<GenericConfig>>,
initialValues: GenericConfig,
Expand All @@ -123,7 +129,7 @@ function createFormStore(
schema: JSONSchemaType<GenericConfig>;
}>({
// Copy props.values as initial form values
values: structuredClone(unwrap(initialValues)),
values: cloneAndUnwrap(initialValues),
errors: [],
schema: schema(),
});
Expand All @@ -138,7 +144,7 @@ function createFormStore(
setStore("errors", errors);
},
reset: () => {
setStore("values", structuredClone(initialValues));
setStore("values", cloneAndUnwrap(initialValues));
setStore("errors", []);
},
get errors() {
Expand Down Expand Up @@ -177,11 +183,16 @@ export function Form<C extends GenericConfig>(props: Props<C>) {
: DEFAULT_UI_COMPONENTS;
const schemaWithDefaults = createMemo(() => {
// TODO do not cast, but without it ajv and solidjs complain
const uschema = unwrap(props.schema as JSONSchemaType<GenericConfig>);
const uschema = cloneAndUnwrap(
props.schema as JSONSchemaType<GenericConfig>,
);
if (!props.defaults) {
return uschema;
}
return overwriteDefaultsInJsonSchema(uschema, unwrap(props.defaults));
return overwriteDefaultsInJsonSchema(
uschema,
cloneAndUnwrap(props.defaults),
);
});
const validate = createMemo(() => buildValidate(schemaWithDefaults()));
const store = createFormStore(schemaWithDefaults, props.values, uiComponents);
Expand Down