Skip to content

Commit e63cd1d

Browse files
authored
chore(remote-json-schema-form-kit) - upgrade to npm release (#918)
* apply changes for 0.0.10 * update lock * format * fix types * update version * fix * fix types
1 parent 66537ba commit e63cd1d

5 files changed

Lines changed: 36 additions & 27 deletions

File tree

package-lock.json

Lines changed: 17 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"@radix-ui/react-scroll-area": "^1.2.10",
9797
"@radix-ui/react-select": "^2.2.6",
9898
"@radix-ui/react-tabs": "^1.1.13",
99-
"@remoteoss/remote-json-schema-form-kit": "github:remoteoss/remote-json-schema-form-kit#v0.0.10",
99+
"@remoteoss/remote-json-schema-form-kit": "^0.0.11",
100100
"@tailwindcss/cli": "^4.2.2",
101101
"@tailwindcss/postcss": "^4.2.2",
102102
"@tanstack/react-query": "^5.99.0",

src/common/createHeadlessForm.tsx

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
import { FieldValues } from 'react-hook-form';
22
import {
33
createHeadlessForm as baseCreateHeadlessForm,
4-
FormResult,
54
modify,
65
} from '@remoteoss/remote-json-schema-form-kit';
76
import { convertToCents } from '@/src/components/form/utils';
8-
import { JSFModify } from '@/src/flows/types';
7+
import {
8+
JSFModify,
9+
JSONSchemaFormResultWithFieldsets,
10+
} from '@/src/flows/types';
911
import { findFieldsByType } from '@/src/flows/utils';
1012
import { JSFFieldset } from '@/src/types/remoteFlows';
1113

12-
type CreateHeadlessFormResult = FormResult & {
13-
meta: {
14-
'x-jsf-fieldsets': JSFFieldset;
15-
};
16-
};
17-
1814
/*
1915
* Creates a headless form from a JSON Schema, useful to avoid code duplication when creating headless forms.
2016
* @param jsfSchema - The JSON Schema
@@ -26,18 +22,24 @@ export const createHeadlessForm = (
2622
jsfSchema: Record<string, unknown>,
2723
fieldValues?: FieldValues,
2824
options?: { jsfModify?: JSFModify },
29-
): CreateHeadlessFormResult => {
25+
): JSONSchemaFormResultWithFieldsets => {
3026
if (options && options.jsfModify) {
3127
const { required, allOf, ...modifyConfig } = options.jsfModify;
3228
const { schema } = modify(jsfSchema, modifyConfig);
3329
jsfSchema = schema;
3430

3531
if (required) {
36-
jsfSchema.required = [...schema.required, ...required];
32+
jsfSchema.required = [
33+
...(Array.isArray(schema.required) ? schema.required : []),
34+
...required,
35+
];
3736
}
3837

3938
if (allOf) {
40-
jsfSchema.allOf = [...(schema.allOf || []), ...allOf];
39+
jsfSchema.allOf = [
40+
...(Array.isArray(schema.allOf) ? schema.allOf : []),
41+
...allOf,
42+
];
4143
}
4244
}
4345

src/flows/ContractorOnboarding/api.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { FormResult } from '@remoteoss/remote-json-schema-form-kit';
21
import { useMemo } from 'react';
32
import {
43
CreateContractDocument,
@@ -618,7 +617,7 @@ export const useGetEligibilityQuestionnaire = ({
618617
return useQuery<
619618
EligibilityQuestionnaireJsonSchemaResponse['data'],
620619
Error,
621-
FormResult
620+
JSONSchemaFormResultWithFieldsets
622621
>({
623622
queryKey: ['eligibility-questionnaire'],
624623
queryFn: async (): Promise<

src/flows/types.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { JSFFieldset } from '@/src/types/remoteFlows';
22
import type {
33
ModifyConfig,
4-
FormResult,
4+
FormResult as FormResultNext,
5+
FormResultLegacy,
56
} from '@remoteoss/remote-json-schema-form-kit';
67

78
type Success<T> = {
@@ -101,6 +102,8 @@ export type FlowOptions = {
101102
};
102103
};
103104

105+
type FormResult = FormResultNext | FormResultLegacy;
106+
104107
export type JSONSchemaFormResultWithFieldsets = FormResult & {
105108
meta: {
106109
'x-jsf-fieldsets': JSFFieldset;

0 commit comments

Comments
 (0)