@comet/admin-generator 9.0.0-canary-20251013121422 → 9.0.0-canary-20251113142723

package/lib/commands/generate/generateForm/generateForm.js

@@ -1,23 +1,15 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateForm = generateForm;
 const generate_command_1 = require("../generate-command");
 const convertConfigImport_1 = require("../utils/convertConfigImport");
 const findMutationType_1 = require("../utils/findMutationType");
+const generateGqlOperation_1 = require("../utils/generateGqlOperation");
 const generateImportsCode_1 = require("../utils/generateImportsCode");
 const runtimeTypeGuards_1 = require("../utils/runtimeTypeGuards");
+const flatFormFieldsFromFormConfig_1 = require("./flatFormFieldsFromFormConfig");
 const generateFields_1 = require("./generateFields");
+const generateFormValues_1 = require("./generateFormValues");
 const generateFragmentByFormFragmentFields_1 = require("./generateFragmentByFormFragmentFields");
 const getForwardedGqlArgs_1 = require("./getForwardedGqlArgs");
 function generateFormPropsCode(props) {
@@ -54,7 +46,6 @@ config) {
         { name: "useApolloClient", importPath: "@apollo/client" },
         { name: "useQuery", importPath: "@apollo/client" },
         { name: "gql", importPath: "@apollo/client" },
-        { name: "AsyncSelectField", importPath: "@comet/admin" },
         { name: "CheckboxField", importPath: "@comet/admin" },
         { name: "Field", importPath: "@comet/admin" },
         { name: "filterByFragment", importPath: "@comet/admin" },
@@ -91,31 +82,28 @@ config) {
     const editMode = mode === "edit" || mode == "all";
     const addMode = mode === "add" || mode == "all";
     const createMutationType = addMode && (0, findMutationType_1.findMutationTypeOrThrow)((_c = config.createMutation) !== null && _c !== void 0 ? _c : `create${gqlType}`, gqlIntrospection);
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const formFields = config.fields.reduce((acc, field) => {
-        if ((0, generate_command_1.isFormLayoutConfig)(field)) {
-            // using forEach instead of acc.push(...field.fields.filter(isFormFieldConfig)) because typescript can't handle mixed typing
-            field.fields.forEach((nestedFieldConfig) => {
-                if ((0, generate_command_1.isFormFieldConfig)(nestedFieldConfig)) {
-                    acc.push(nestedFieldConfig);
-                }
-            });
-        }
-        else if ((0, generate_command_1.isFormFieldConfig)(field)) {
-            acc.push(field);
-        }
-        return acc;
-    }, []);
+    const formFields = (0, flatFormFieldsFromFormConfig_1.flatFormFieldsFromFormConfig)(config);
+    let useScopeFromContext = false;
     const gqlArgs = [];
     if (createMutationType) {
-        const { imports: forwardedGqlArgsImports, props: forwardedGqlArgsProps, gqlArgs: forwardedGqlArgs, } = (0, getForwardedGqlArgs_1.getForwardedGqlArgs)({
+        const forwardedArgs = (0, getForwardedGqlArgs_1.getForwardedGqlArgs)({
             fields: formFields,
             gqlOperation: createMutationType,
             gqlIntrospection,
         });
-        imports.push(...forwardedGqlArgsImports);
-        formProps.push(...forwardedGqlArgsProps);
-        gqlArgs.push(...forwardedGqlArgs);
+        for (const forwardedArg of forwardedArgs) {
+            imports.push(...forwardedArg.imports);
+            if (forwardedArg.gqlArg.name === "scope" && !forwardedArg.gqlArg.isInputArgSubfield && !config.scopeAsProp) {
+                useScopeFromContext = true;
+            }
+            else {
+                formProps.push(forwardedArg.prop);
+                gqlArgs.push(forwardedArg.gqlArg);
+            }
+        }
+    }
+    if (useScopeFromContext) {
+        imports.push({ name: "useContentScope", importPath: "@comet/cms-admin" });
     }
     if (editMode) {
         if (mode === "all") {
@@ -145,17 +133,17 @@ config) {
         imports.push({ name: "GQLFinalFormFileUploadDownloadableFragment", importPath: "@comet/cms-admin" });
     }
     let hooksCode = "";
-    let formValueToGqlInputCode = "";
     const formFragmentFields = [];
     const formValuesConfig = [];
-    const _h = (0, generateFields_1.generateFields)({
+    const generatedFields = (0, generateFields_1.generateFields)({
         gqlIntrospection,
         baseOutputFilename,
         fields: config.fields,
         formFragmentName,
         formConfig: config,
         gqlType: config.gqlType,
-    }), { code: fieldsCode } = _h, generatedFields = __rest(_h, ["code"]);
+    });
+    const fieldsCode = generatedFields.code;
     for (const name in generatedFields.gqlDocuments) {
         gqlDocuments[name] = {
             document: generatedFields.gqlDocuments[name].document,
@@ -165,9 +153,13 @@ config) {
     imports.push(...generatedFields.imports);
     formProps.push(...generatedFields.formProps);
     hooksCode += generatedFields.hooksCode;
-    formValueToGqlInputCode += generatedFields.formValueToGqlInputCode;
     formFragmentFields.push(...generatedFields.formFragmentFields);
     formValuesConfig.push(...generatedFields.formValuesConfig);
+    formProps.push({
+        name: "onCreate",
+        optional: true,
+        type: `(id: string) => void`,
+    });
     const { formPropsTypeCode, formPropsParamsCode } = generateFormPropsCode(formProps);
     gqlDocuments[`${instanceGqlType}FormFragment`] = {
         document: (0, generateFragmentByFormFragmentFields_1.generateFragmentByFormFragmentFields)({ formFragmentName, gqlType, formFragmentFields }),
@@ -175,60 +167,66 @@ config) {
     };
     if (editMode) {
         gqlDocuments[`${instanceGqlType}Query`] = {
-            document: `
-            query ${gqlType}($id: ID!) {
-                ${instanceGqlType}(id: $id) {
-                    id
-                    updatedAt
-                    ...${formFragmentName}
-                }
-            }
-            \${${`${instanceGqlType}FormFragment`}}
-        `,
+            document: (0, generateGqlOperation_1.generateGqlOperation)({
+                type: "query",
+                operationName: gqlType,
+                rootOperation: instanceGqlType,
+                fields: ["id", "updatedAt", `...${formFragmentName}`],
+                variables: [
+                    {
+                        name: "id",
+                        type: "ID!",
+                    },
+                ],
+                fragmentVariables: [`\${${`${instanceGqlType}FormFragment`}}`],
+            }),
             export: true,
         };
     }
     if (addMode && createMutationType) {
         gqlDocuments[`create${gqlType}Mutation`] = {
-            document: `
-            mutation Create${gqlType}(${gqlArgs.filter((gqlArg) => !gqlArg.isInputArgSubfield).length
-                ? `${gqlArgs
-                    .filter((gqlArg) => !gqlArg.isInputArgSubfield)
-                    .map((gqlArg) => {
-                    return `$${gqlArg.name}: ${gqlArg.type}!`;
-                })
-                    .join(", ")}, `
-                : ``}$input: ${gqlType}Input!) {
-                ${createMutationType.name}(${gqlArgs.filter((gqlArg) => !gqlArg.isInputArgSubfield).length
-                ? `${gqlArgs
-                    .filter((gqlArg) => !gqlArg.isInputArgSubfield)
-                    .map((gqlArg) => {
-                    return `${gqlArg.name}: $${gqlArg.name}`;
-                })
-                    .join(", ")}, `
-                : ``}input: $input) {
-                    id
-                    updatedAt
-                    ...${formFragmentName}
-                }
-            }
-            \${${`${instanceGqlType}FormFragment`}}
-        `,
+            document: (0, generateGqlOperation_1.generateGqlOperation)({
+                type: "mutation",
+                operationName: `Create${gqlType}`,
+                rootOperation: createMutationType.name,
+                fields: ["id", "updatedAt", `...${formFragmentName}`],
+                fragmentVariables: [`\${${`${instanceGqlType}FormFragment`}}`],
+                variables: [
+                    ...gqlArgs
+                        .filter((gqlArg) => !gqlArg.isInputArgSubfield)
+                        .map((gqlArg) => ({
+                        name: gqlArg.name,
+                        type: `${gqlArg.type}!`,
+                    })),
+                    ...(useScopeFromContext ? [{ name: "scope", type: `${gqlType}ContentScopeInput!` }] : []),
+                    {
+                        name: "input",
+                        type: `${gqlType}Input!`,
+                    },
+                ],
+            }),
             export: true,
         };
     }
     if (editMode) {
         gqlDocuments[`update${gqlType}Mutation`] = {
-            document: `
-            mutation Update${gqlType}($id: ID!, $input: ${gqlType}UpdateInput!) {
-                update${gqlType}(id: $id, input: $input) {
-                    id
-                    updatedAt
-                    ...${formFragmentName}
-                }
-            }
-            \${${`${instanceGqlType}FormFragment`}}
-        `,
+            document: (0, generateGqlOperation_1.generateGqlOperation)({
+                type: "mutation",
+                operationName: `Update${gqlType}`,
+                rootOperation: `update${gqlType}`,
+                fields: ["id", "updatedAt", `...${formFragmentName}`],
+                fragmentVariables: [`\${${`${instanceGqlType}FormFragment`}}`],
+                variables: [
+                    {
+                        name: "id",
+                        type: "ID!",
+                    },
+                    {
+                        name: "input",
+                        type: `${gqlType}UpdateInput!`,
+                    },
+                ],
+            }),
             export: true,
         };
     }
@@ -290,19 +288,7 @@ config) {
 
     ${customFilterByFragment}
 
-    type FormValues = ${formValuesConfig.filter((config) => !!config.omitFromFragmentType).length > 0 || rootBlockFields.length > 0
-        ? `Omit<${filterByFragmentType}, ${[
-            ...(rootBlockFields.length > 0 ? ["keyof typeof rootBlocks"] : []),
-            ...formValuesConfig.filter((config) => !!config.omitFromFragmentType).map((config) => `"${config.omitFromFragmentType}"`),
-        ].join(" | ")}>`
-        : `${filterByFragmentType}`} ${formValuesConfig.filter((config) => !!config.typeCode).length > 0
-        ? `& {
-                ${formValuesConfig
-            .filter((config) => !!config.typeCode)
-            .map((config) => config.typeCode)
-            .join("\n")}
-            }`
-        : ""};
+    ${(0, generateFormValues_1.generateFormValuesType)({ formValuesConfig, filterByFragmentType, gqlIntrospection, gqlType })}
 
     ${formPropsTypeCode}
 
@@ -311,6 +297,7 @@ config) {
         ${mode == "all" ? `const mode = id ? "edit" : "add";` : ""}
         const formApiRef = useFormApiRef<FormValues>();
         ${addMode ? `const stackSwitchApi = useStackSwitchApi();` : ""}
+        ${useScopeFromContext ? `const { scope } = useContentScope();` : ""}
 
         ${editMode
         ? `
@@ -321,28 +308,8 @@ config) {
         `
         : ""}
 
-        ${editMode
-        ? `const initialValues = useMemo<Partial<FormValues>>(() => data?.${instanceGqlType}
-        ? {
-            ...filterByFragment<${filterByFragmentType}>(${instanceGqlType}FormFragment, data.${instanceGqlType}),
-            ${formValuesConfig
-            .filter((config) => !!config.initializationCode)
-            .map((config) => config.initializationCode)
-            .join(",\n")}
-        }
-        : {
-            ${formValuesConfig
-            .filter((config) => !!config.defaultInitializationCode)
-            .map((config) => config.defaultInitializationCode)
-            .join(",\n")}
-        }
-    , [data]);`
-        : `const initialValues = {
-                ${formValuesConfig
-            .filter((config) => !!config.defaultInitializationCode)
-            .map((config) => config.defaultInitializationCode)
-            .join(",\n")}
-            };`}
+        ${(0, generateFormValues_1.generateInitialValues)({ mode, formValuesConfig, filterByFragmentType, gqlIntrospection, gqlType })}
+
 
         ${editMode
         ? `
@@ -359,17 +326,14 @@ config) {
         `
         : ""}
 
-        const handleSubmit = async (${formValuesConfig.filter((config) => !!config.destructFromFormValues).length
-        ? `{ ${formValuesConfig
-            .filter((config) => !!config.destructFromFormValues)
-            .map((config) => config.destructFromFormValues)
-            .join(", ")}, ...formValues }`
-        : `formValues`}: FormValues, form: FormApi<FormValues>${addMode ? `, event: FinalFormSubmitEvent` : ""}) => {
+        const handleSubmit = async (${(0, generateFormValues_1.generateDestructFormValueForInput)({
+        formValuesConfig,
+        gqlIntrospection,
+        gqlType,
+    })}: FormValues, form: FormApi<FormValues>${addMode ? `, event: FinalFormSubmitEvent` : ""}) => {
             ${editMode ? `if (await saveConflict.checkForConflicts()) throw new Error("Conflicts detected");` : ""}
-            const output = {
-                ...formValues,
-                ${formValueToGqlInputCode}
-            };
+            ${(0, generateFormValues_1.generateFormValuesToGqlInput)({ formValuesConfig, gqlIntrospection, gqlType })}
+
             ${mode == "all" ? `if (mode === "edit") {` : ""}
                 ${editMode
         ? `
@@ -386,7 +350,9 @@ config) {
         ? `
                 const { data: mutationResponse } = await client.mutate<GQLCreate${gqlType}Mutation, GQLCreate${gqlType}MutationVariables>({
                     mutation: create${gqlType}Mutation,
-                    variables: { input: ${gqlArgs.filter((prop) => prop.isInputArgSubfield).length
+                    variables: {
+                        ${useScopeFromContext ? `scope,` : ""}
+                        input: ${gqlArgs.filter((prop) => prop.isInputArgSubfield).length
             ? `{ ...output, ${gqlArgs
                 .filter((prop) => prop.isInputArgSubfield)
                 .map((prop) => prop.name)
@@ -398,13 +364,14 @@ config) {
                 .join(",")}`
             : ""} },
                 });
-                if (!event.navigatingBack) {
-                    const id = mutationResponse?.${createMutationType.name}.id;
-                    if (id) {
-                        setTimeout(() => {
-                            stackSwitchApi.activatePage(\`edit\`, id);
-                        });
-                    }
+                const id = mutationResponse?.${createMutationType.name}.id;
+                if (id) {
+                    setTimeout(() => {
+                        onCreate?.(id);
+                        ${config.navigateOnCreate === true || config.navigateOnCreate === undefined
+            ? `if (!event.navigatingBack) { stackSwitchApi.activatePage(\`edit\`, id);`
+            : ``}
+                    });
                 }
                 `
         : ""}

package/lib/commands/generate/generateForm/generateFormField.js

@@ -6,6 +6,7 @@ const convertConfigImport_1 = require("../utils/convertConfigImport");
 const isFieldOptional_1 = require("../utils/isFieldOptional");
 const runtimeTypeGuards_1 = require("../utils/runtimeTypeGuards");
 const generateAsyncSelect_1 = require("./asyncSelect/generateAsyncSelect");
+const findIntrospectionFieldType_1 = require("./formField/findIntrospectionFieldType");
 const options_1 = require("./formField/options");
 function generateFormField({ gqlIntrospection, baseOutputFilename, config, formConfig, gqlType, namePrefix, }) {
     if (config.type == "asyncSelect" || config.type == "asyncSelectFilter") {
@@ -13,9 +14,9 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
     }
     const imports = [];
     const formProps = [];
-    const { name, formattedMessageRootId, fieldLabel, startAdornment, endAdornment, imports: optionsImports, } = (0, options_1.buildFormFieldOptions)({ config, formConfig, gqlType, gqlIntrospection });
+    const { name, formattedMessageRootId, fieldLabel, startAdornment, endAdornment, imports: optionsImports, } = (0, options_1.buildFormFieldOptions)({ config, formConfig });
     imports.push(...optionsImports);
-    let { introspectionFieldType } = (0, options_1.buildFormFieldOptions)({ config, formConfig, gqlType, gqlIntrospection });
+    let introspectionFieldType = (0, findIntrospectionFieldType_1.findIntrospectionFieldType)({ name, gqlIntrospection, gqlType });
     const nameWithPrefix = `${namePrefix ? `${namePrefix}.` : ``}${name}`;
     const rootGqlType = formConfig.gqlType;
     const dataRootName = rootGqlType[0].toLowerCase() + rootGqlType.substring(1); // TODO should probably be deteced via query
@@ -24,7 +25,9 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
     const endAdornmentWithLockIconProp = `endAdornment={<InputAdornment position="end"><Lock /></InputAdornment>}`;
     const readOnlyProps = `readOnly disabled`;
     const readOnlyPropsWithLock = `${readOnlyProps} ${endAdornmentWithLockIconProp}`;
-    let formValuesConfig = [{}]; // FormFields should only contain one entry
+    const formValueConfig = {
+        fieldName: nameWithPrefix,
+    };
     const gqlDocuments = {};
     const hooksCode = "";
     let finalFormConfig;
@@ -40,7 +43,6 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
         }
     }
     let code = "";
-    let formValueToGqlInputCode = "";
     let formFragmentFields = [name];
     if (config.type == "text") {
         const TextInputComponent = config.multiline ? "TextAreaField" : "TextField";
@@ -62,7 +64,7 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
             ${validateCode}
         />`;
         if (!required && !config.readOnly) {
-            formValueToGqlInputCode = `${name}: formValues.${name} ?? null,`;
+            formValueConfig.formValueToGqlInputCode = `$fieldName ?? null`;
         }
     }
     else if (config.type == "number") {
@@ -85,22 +87,21 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
                 ${validateCode}
             />`;
         //TODO MUI suggest not using type=number https://mui.com/material-ui/react-text-field/#type-quot-number-quot
-        let assignment = `parseFloat(formValues.${nameWithPrefix})`;
+        let assignment = `parseFloat($fieldName)`;
         if ((0, isFieldOptional_1.isFieldOptional)({ config, gqlIntrospection: gqlIntrospection, gqlType: gqlType })) {
-            assignment = `formValues.${nameWithPrefix} ? ${assignment} : null`;
+            assignment = `$fieldName ? ${assignment} : null`;
         }
-        formValueToGqlInputCode = `${name}: ${assignment},`;
+        formValueConfig.formValueToGqlInputCode = `${assignment}`;
         let initializationAssignment = `String(data.${dataRootName}.${nameWithPrefix})`;
         if (!required) {
             initializationAssignment = `data.${dataRootName}.${nameWithPrefix} ? ${initializationAssignment} : undefined`;
         }
-        formValuesConfig = [
-            {
-                omitFromFragmentType: name,
-                typeCode: `${name}${!required ? `?` : ``}: string;`,
-                initializationCode: `${name}: ${initializationAssignment}`,
-            },
-        ];
+        formValueConfig.omitFromFragmentType = true;
+        formValueConfig.typeCode = {
+            nullable: !required,
+            type: "string",
+        };
+        formValueConfig.initializationCode = `${initializationAssignment}`;
     }
     else if (config.type === "numberRange") {
         code = `
@@ -140,11 +141,7 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
             : ""}
                         ${validateCode}
                     />`;
-        formValuesConfig = [
-            {
-                defaultInitializationCode: `${name}: false`,
-            },
-        ];
+        formValueConfig.defaultInitializationCode = `false`;
     }
     else if (config.type == "date") {
         imports.push({
@@ -169,7 +166,7 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
                 ${validateCode}
             />`;
         if (!required && !config.readOnly) {
-            formValueToGqlInputCode = `${name}: formValues.${name} ?? null,`;
+            formValueConfig.formValueToGqlInputCode = `$fieldName ?? null`;
         }
     }
     else if (config.type == "dateTime") {
@@ -193,31 +190,25 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
             : ""}
                 ${validateCode}
             />`;
-        formValuesConfig = [
-            {
-                initializationCode: `${name}: data.${dataRootName}.${nameWithPrefix} ? new Date(data.${dataRootName}.${nameWithPrefix}) : undefined`,
-                omitFromFragmentType: name,
-                typeCode: `${name}${!required ? "?" : ""}: Date${!required ? " | null" : ""};`,
-            },
-        ];
+        formValueConfig.initializationCode = `data.${dataRootName}.${nameWithPrefix} ? new Date(data.${dataRootName}.${nameWithPrefix}) : undefined`;
+        formValueConfig.omitFromFragmentType = true;
+        formValueConfig.typeCode = {
+            nullable: !required,
+            type: `Date${!required ? " | null" : ""}`,
+        };
         if (!config.readOnly) {
-            formValueToGqlInputCode = required
-                ? `${name}: formValues.${name}.toISOString(),`
-                : `${name}: formValues.${name} ? formValues.${name}.toISOString() : null,`;
+            formValueConfig.formValueToGqlInputCode = required ? `$fieldName.toISOString()` : `$fieldName ? $fieldName.toISOString() : null`;
         }
     }
     else if (config.type == "block") {
         code = `<Field name="${nameWithPrefix}" isEqual={isEqual} label={${fieldLabel}} variant="horizontal" fullWidth>
             {createFinalFormBlock(rootBlocks.${String(config.name)})}
         </Field>`;
-        formValueToGqlInputCode = `${name}: rootBlocks.${name}.state2Output(formValues.${nameWithPrefix}),`;
-        formValuesConfig = [
-            {
-                typeCode: `${name}: BlockState<typeof rootBlocks.${name}>;`,
-                initializationCode: `${name}: rootBlocks.${name}.input2State(data.${dataRootName}.${nameWithPrefix})`,
-                defaultInitializationCode: `${name}: rootBlocks.${name}.defaultValues()`,
-            },
-        ];
+        formValueConfig.formValueToGqlInputCode = `rootBlocks.${name}.state2Output($fieldName)`;
+        formValueConfig.omitFromFragmentType = true;
+        formValueConfig.typeCode = { nullable: false, type: `BlockState<typeof rootBlocks.${name}>` };
+        formValueConfig.initializationCode = `rootBlocks.${name}.input2State(data.${dataRootName}.${nameWithPrefix})`;
+        formValueConfig.defaultInitializationCode = `rootBlocks.${name}.defaultValues()`;
     }
     else if (config.type === "fileUpload") {
         const multiple = config.multiple || (typeof config.maxFiles === "number" && config.maxFiles > 1);
@@ -231,12 +222,12 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
             ${config.accept ? `accept="${config.accept}"` : ""}
         />`;
         if (multiple) {
-            formValueToGqlInputCode = `${name}: formValues.${name}?.map(({ id }) => id),`;
+            formValueConfig.formValueToGqlInputCode = `$fieldName?.map(({ id }) => id)`;
         }
         else {
-            formValueToGqlInputCode = `${name}: formValues.${name} ? formValues.${name}.id : null,`;
+            formValueConfig.formValueToGqlInputCode = `$fieldName ? $fieldName.id : null`;
         }
-        formFragmentFields = [`${name} { ...${config.download ? "FinalFormFileUploadDownloadable" : "FinalFormFileUpload"} }`];
+        formFragmentFields = [`${name}...${config.download ? "FinalFormFileUploadDownloadable" : "FinalFormFileUpload"}`];
     }
     else if (config.type == "staticSelect") {
         const multiple = (introspectionFieldType === null || introspectionFieldType === void 0 ? void 0 : introspectionFieldType.kind) === "LIST";
@@ -336,12 +327,11 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
     return {
         code,
         hooksCode,
-        formValueToGqlInputCode,
         formFragmentFields,
         gqlDocuments,
         imports,
         formProps,
-        formValuesConfig,
+        formValuesConfig: [formValueConfig],
         finalFormConfig,
     };
 }

package/lib/commands/generate/generateForm/generateFormLayout.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateFormLayout = generateFormLayout;
 const camelCaseToHumanReadable_1 = require("../utils/camelCaseToHumanReadable");
+const findIntrospectionFieldType_1 = require("./formField/findIntrospectionFieldType");
 const generateFields_1 = require("./generateFields");
 function generateFormLayout({ gqlIntrospection, baseOutputFilename, config, formFragmentName, formConfig, gqlType, namePrefix, }) {
     var _a, _b, _c, _d, _e;
@@ -10,7 +11,6 @@ function generateFormLayout({ gqlIntrospection, baseOutputFilename, config, form
     const dataRootName = rootGqlType[0].toLowerCase() + rootGqlType.substring(1); // TODO should probably be deteced via query
     let code = "";
     let hooksCode = "";
-    let formValueToGqlInputCode = "";
     const formFragmentFields = [];
     const gqlDocuments = {};
     const imports = [];
@@ -29,7 +29,6 @@ function generateFormLayout({ gqlIntrospection, baseOutputFilename, config, form
             namePrefix,
         });
         hooksCode += generatedFields.hooksCode;
-        formValueToGqlInputCode += generatedFields.formValueToGqlInputCode;
         formFragmentFields.push(...generatedFields.formFragmentFields);
         for (const name in generatedFields.gqlDocuments) {
             gqlDocuments[name] = generatedFields.gqlDocuments[name];
@@ -66,16 +65,10 @@ function generateFormLayout({ gqlIntrospection, baseOutputFilename, config, form
     }
     else if (config.type === "optionalNestedFields") {
         const name = String(config.name);
-        const introspectionObject = gqlIntrospection.__schema.types.find((type) => type.kind === "OBJECT" && type.name === gqlType);
-        if (!introspectionObject)
-            throw new Error(`didn't find object ${gqlType} in gql introspection`);
-        const introspectionField = introspectionObject.fields.find((field) => field.name === name);
-        if (!introspectionField)
-            throw new Error(`didn't find field ${name} in gql introspection type ${gqlType}`);
-        if (introspectionField.type.kind === "NON_NULL") {
-            throw new Error(`field ${name} in gql introspection type ${gqlType} must not be required to be usable with optionalNestedFields`);
-        }
-        if (introspectionField.type.kind !== "OBJECT")
+        const introspectionFieldType = (0, findIntrospectionFieldType_1.findIntrospectionFieldType)({ name, gqlType, gqlIntrospection });
+        if (!introspectionFieldType)
+            throw new Error(`field ${name} in gql introspection type ${gqlType} not found`);
+        if (introspectionFieldType.kind !== "OBJECT")
             throw new Error(`field ${name} in gql introspection type ${gqlType} has to be OBJECT`);
         const checkboxLabel = (_e = config.checkboxLabel) !== null && _e !== void 0 ? _e : `Enable ${(0, camelCaseToHumanReadable_1.camelCaseToHumanReadable)(String(config.name))}`;
         const generatedFields = (0, generateFields_1.generateFields)({
@@ -84,7 +77,7 @@ function generateFormLayout({ gqlIntrospection, baseOutputFilename, config, form
             fields: config.fields,
             formFragmentName,
             formConfig,
-            gqlType: introspectionField.type.name,
+            gqlType: introspectionFieldType.name,
             namePrefix: name,
         });
         hooksCode += generatedFields.hooksCode;
@@ -93,39 +86,26 @@ function generateFormLayout({ gqlIntrospection, baseOutputFilename, config, form
             gqlDocuments[name] = generatedFields.gqlDocuments[name];
         }
         imports.push(...generatedFields.imports);
-        const wrappingFormValuesConfig = {
-            omitFromFragmentType: name,
-            destructFromFormValues: `${name}Enabled`,
-            typeCode: `${name}Enabled: boolean;`,
-            initializationCode: `${name}Enabled: !!data.${dataRootName}.${name}`,
-        };
-        const subfieldsFormValuesTypeCode = generatedFields.formValuesConfig
-            .filter((config) => !!config.omitFromFragmentType)
-            .map((config) => `"${config.omitFromFragmentType}"`);
-        if (subfieldsFormValuesTypeCode.length) {
-            wrappingFormValuesConfig.typeCode = `${wrappingFormValuesConfig.typeCode}
-                ${name}: Omit<NonNullable<GQL${formFragmentName}Fragment["${name}"]>, ${subfieldsFormValuesTypeCode.join(" | ")}> & {
-                    ${generatedFields.formValuesConfig.map((config) => config.typeCode).join("\n")}
-                };`;
-        }
-        const subfieldsFormValuesInitCode = generatedFields.formValuesConfig
-            .filter((config) => !!config.initializationCode)
-            .map((config) => config.initializationCode);
-        if (subfieldsFormValuesInitCode.length) {
-            wrappingFormValuesConfig.initializationCode = `${wrappingFormValuesConfig.initializationCode},
-                ${name}: data.${dataRootName}.${name} ? { ${subfieldsFormValuesInitCode.join(", ")}} : undefined    `;
-        }
-        const subfieldsFormValuesDefaultInitCode = generatedFields.formValuesConfig
-            .filter((config) => !!config.defaultInitializationCode)
-            .map((config) => config.defaultInitializationCode);
-        if (subfieldsFormValuesDefaultInitCode.length) {
-            wrappingFormValuesConfig.defaultInitializationCode = `${name}: { ${subfieldsFormValuesDefaultInitCode.join(", ")}}`;
-        }
-        formValuesConfig.push(wrappingFormValuesConfig);
+        formValuesConfig.push(...generatedFields.formValuesConfig);
+        // first field is the "enabled" checkbox
+        formValuesConfig.push({
+            fieldName: `${name}Enabled`,
+            omitFromFragmentType: false,
+            destructFromFormValues: true,
+            typeCode: {
+                nullable: false,
+                type: "boolean",
+            },
+            initializationCode: `!!data.${dataRootName}.${name}`,
+        });
+        // second field is the nested object, which is not a final-form field itself
+        formValuesConfig.push({
+            fieldName: `${name}`,
+            wrapFormValueToGqlInputCode: `${name.split(".").pop()}Enabled && $fieldName ? $inner : null`,
+        });
         imports.push({ name: "FinalFormSwitch", importPath: "@comet/admin" });
         imports.push({ name: "messages", importPath: "@comet/admin" });
         imports.push({ name: "FormControlLabel", importPath: "@mui/material" });
-        formValueToGqlInputCode += `${String(config.name)}: ${String(config.name)}Enabled && formValues.${String(config.name)} ? {${generatedFields.formValueToGqlInputCode}} : null,`;
         code = `<Field
                     fullWidth
                     name="${String(config.name)}Enabled"
@@ -155,7 +135,6 @@ function generateFormLayout({ gqlIntrospection, baseOutputFilename, config, form
     return {
         code,
         hooksCode,
-        formValueToGqlInputCode,
         formFragmentFields,
         gqlDocuments,
         imports,