npm - @comet/admin-generator - Versions diffs - 9.0.0-canary-20250915134805 → 9.0.0-canary-20251002064922 - Mend

@comet/admin-generator 9.0.0-canary-20250915134805 → 9.0.0-canary-20251002064922

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/lib/commands/generate/generate-command.d.ts CHANGED Viewed

@@ -15,18 +15,6 @@ type Icon = IconName | IconObject | ComponentType;
 export type Adornment = string | {
     icon: Icon;
 };
-type SingleFileFormFieldConfig = {
-    type: "fileUpload";
-    multiple?: false;
-    maxFiles?: 1;
-    download?: boolean;
-} & Pick<Partial<FinalFormFileUploadProps<false>>, "maxFileSize" | "readOnly" | "layout" | "accept">;
-type MultiFileFormFieldConfig = {
-    type: "fileUpload";
-    multiple: true;
-    maxFiles?: number;
-    download?: boolean;
-} & Pick<Partial<FinalFormFileUploadProps<true>>, "maxFileSize" | "readOnly" | "layout" | "accept">;
 type InputBaseFieldConfig = {
     startAdornment?: Adornment;
     endAdornment?: Adornment;
@@ -39,73 +27,103 @@ export type StaticSelectValue = {
     value: string;
     label: string;
 } | string;
+type AsyncSelectFilter = {
+    /**
+     * Filter by value of field in current form
+     */
+    type: "field";
+    /**
+     * Name of the field in current form, that will be used to filter the query
+     */
+    formFieldName: string;
+    /**
+     * Name of the graphql argument the prop will be applied to. Defaults to propdName.
+     *
+     * Root Argument or filter argument are supported.
+     */
+    rootQueryArg?: string;
+} | {
+    /**
+     * Filter by a prop passed into the form, this prop will be generated
+     */
+    type: "formProp";
+    /**
+     * Name of the prop generated for this form
+     */
+    propName: string;
+    /**
+     * Name of the graphql argument the prop will be applied to. Defaults to propdName.
+     *
+     * Root Argument or filter argument are supported.
+     */
+    rootQueryArg?: string;
+};
 export type FormFieldConfig<T> = (({
     type: "text";
+    name: keyof T;
     multiline?: boolean;
 } & InputBaseFieldConfig) | ({
     type: "number";
+    name: keyof T;
     decimals?: number;
 } & InputBaseFieldConfig) | ({
     type: "numberRange";
+    name: keyof T;
     minValue: number;
     maxValue: number;
     disableSlider?: boolean;
 } & InputBaseFieldConfig) | {
     type: "boolean";
+    name: keyof T;
 } | ({
     type: "date";
+    name: keyof T;
 } & InputBaseFieldConfig) | ({
     type: "dateTime";
+    name: keyof T;
 } & InputBaseFieldConfig) | ({
     type: "staticSelect";
+    name: keyof T;
     values?: StaticSelectValue[];
     inputType?: "select" | "radio";
 } & Omit<InputBaseFieldConfig, "endAdornment">) | ({
     type: "asyncSelect";
+    name: keyof T;
     rootQuery: string;
     labelField?: string;
     /**
      * filter for query, passed as variable to graphql query
      */
-    filter?: {
-        /**
-         * Filter by value of field in current form
-         */
-        type: "field";
-        /**
-         * Name of the field in current form, that will be used to filter the query
-         */
-        formFieldName: string;
-        /**
-         * Name of the graphql argument the prop will be applied to. Defaults to propdName.
-         *
-         * Root Argument or filter argument are supported.
-         */
-        rootQueryArg?: string;
-    } | {
-        /**
-         * Filter by a prop passed into the form, this prop will be generated
-         */
-        type: "formProp";
-        /**
-         * Name of the prop generated for this form
-         */
-        propName: string;
-        /**
-         * Name of the graphql argument the prop will be applied to. Defaults to propdName.
-         *
-         * Root Argument or filter argument are supported.
-         */
-        rootQueryArg?: string;
-    };
+    filter?: AsyncSelectFilter;
+} & Omit<InputBaseFieldConfig, "endAdornment">) | ({
+    type: "asyncSelectFilter";
+    name: string;
+    loadValueQueryField: string;
+    rootQuery: string;
+    labelField?: string;
+    /**
+     * filter for query, passed as variable to graphql query
+     */
+    filter?: AsyncSelectFilter;
 } & Omit<InputBaseFieldConfig, "endAdornment">) | {
     type: "block";
+    name: keyof T;
     block: BlockInterface;
-} | SingleFileFormFieldConfig | MultiFileFormFieldConfig) & {
+} | ({
+    type: "fileUpload";
+    multiple?: false;
+    name: keyof T;
+    maxFiles?: 1;
+    download?: boolean;
+} & Pick<Partial<FinalFormFileUploadProps<false>>, "maxFileSize" | "readOnly" | "layout" | "accept">) | ({
+    type: "fileUpload";
+    multiple: true;
     name: keyof T;
+    maxFiles?: number;
+    download?: boolean;
+} & Pick<Partial<FinalFormFileUploadProps<true>>, "maxFileSize" | "readOnly" | "layout" | "accept">)) & {
     label?: string;
     required?: boolean;
-    virtual?: boolean;
     validate?: FieldValidator<unknown>;
     helperText?: string;
     readOnly?: boolean;

package/lib/commands/generate/generateForm/asyncSelect/generateAsyncSelect.d.ts CHANGED Viewed

@@ -1,11 +1,24 @@
-import { type IntrospectionQuery } from "graphql";
+import { type IntrospectionObjectType, type IntrospectionQuery } from "graphql";
 import { type FormConfig, type FormFieldConfig } from "../../generate-command";
 import { type GenerateFieldsReturn } from "../generateFields";
+/**
+ * Helper that returns the introspection object type for a given form field config, supporting the special case for asyncSelectFilter
+ */
+export declare function findIntrospectionObjectType({ config, gqlIntrospection, gqlType, }: {
+    config: FormFieldConfig<any>;
+    gqlIntrospection: IntrospectionQuery;
+    gqlType: string;
+}): {
+    multiple: boolean;
+    objectType: IntrospectionObjectType;
+};
 export declare function generateAsyncSelect({ gqlIntrospection, baseOutputFilename, config, formConfig, gqlType, namePrefix, }: {
     gqlIntrospection: IntrospectionQuery;
     baseOutputFilename: string;
     config: Extract<FormFieldConfig<any>, {
         type: "asyncSelect";
+    } | {
+        type: "asyncSelectFilter";
     }>;
     formConfig: FormConfig<any>;
     gqlType: string;

package/lib/commands/generate/generateForm/asyncSelect/generateAsyncSelect.js CHANGED Viewed

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.findIntrospectionObjectType = findIntrospectionObjectType;
 exports.generateAsyncSelect = generateAsyncSelect;
 const generate_command_1 = require("../../generate-command");
 const findQueryType_1 = require("../../utils/findQueryType");
@@ -56,28 +57,69 @@ function buildTypeInfo(arg, gqlIntrospection) {
         inputType,
     };
 }
+/**
+ * Helper that returns the introspection object type for a given form field config, supporting the special case for asyncSelectFilter
+ */
+function findIntrospectionObjectType({ config, gqlIntrospection, gqlType, }) {
+    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`);
+    function findIntrospectionField(introspectionObject, name) {
+        const introspectionField = introspectionObject.fields.find((field) => field.name === name);
+        if (!introspectionField)
+            throw new Error(`didn't find field ${name} in gql introspection type ${gqlType}`);
+        let introspectionFieldType = introspectionField.type.kind === "NON_NULL" ? introspectionField.type.ofType : introspectionField.type;
+        const multiple = (introspectionFieldType === null || introspectionFieldType === void 0 ? void 0 : introspectionFieldType.kind) === "LIST";
+        if ((introspectionFieldType === null || introspectionFieldType === void 0 ? void 0 : introspectionFieldType.kind) === "LIST") {
+            introspectionFieldType =
+                introspectionFieldType.ofType.kind === "NON_NULL" ? introspectionFieldType.ofType.ofType : introspectionFieldType.ofType;
+        }
+        if (introspectionFieldType.kind !== "OBJECT")
+            throw new Error(`asyncSelect only supports OBJECT types`);
+        const objectType = gqlIntrospection.__schema.types.find((t) => t.kind === "OBJECT" && t.name === introspectionFieldType.name);
+        if (!objectType)
+            throw new Error(`Object type ${introspectionFieldType.name} not found for field ${name}`);
+        return { multiple, objectType };
+    }
+    if (config.type === "asyncSelectFilter") {
+        //for a filter select the field is "virtual", and it's ObjectType is defined by the path in config.loadValueQueryField
+        return {
+            multiple: false,
+            objectType: config.loadValueQueryField.split(".").reduce((acc, fieldName) => {
+                const introspectionField = findIntrospectionField(acc, fieldName);
+                if (introspectionField.multiple)
+                    throw new Error(`asyncSelectFilter does not support list fields in loadValueQueryField`);
+                return introspectionField.objectType;
+            }, introspectionObject),
+        };
+    }
+    else {
+        //for a standard select we just find the field directly (no nested path to follow, name can be only one level deep)
+        return findIntrospectionField(introspectionObject, name);
+    }
+}
 function generateAsyncSelect({ gqlIntrospection, baseOutputFilename, config, formConfig, gqlType, namePrefix, }) {
     var _a, _b;
     const imports = [];
     const formProps = [];
-    const { name, fieldLabel, introspectionFieldType, startAdornment,
+    const { name, fieldLabel, startAdornment,
     //endAdornment,
     imports: optionsImports, } = (0, options_1.buildFormFieldOptions)({ config, formConfig, gqlIntrospection, gqlType });
     imports.push(...optionsImports);
     const nameWithPrefix = `${namePrefix ? `${namePrefix}.` : ``}${name}`;
     const required = !(0, isFieldOptional_1.isFieldOptional)({ config, gqlIntrospection, gqlType });
-    const defaultFormValuesConfig = {
-        destructFromFormValues: config.virtual ? name : undefined,
+    const formValueConfig = {
+        destructFromFormValues: config.type == "asyncSelectFilter" ? name : undefined,
     };
-    const formValuesConfig = [defaultFormValuesConfig]; // FormFields should only contain one entry
     let finalFormConfig;
     let code = "";
     let formValueToGqlInputCode = "";
-    if (introspectionFieldType.kind !== "OBJECT")
-        throw new Error(`asyncSelect only supports OBJECT types`);
-    const objectType = gqlIntrospection.__schema.types.find((t) => t.kind === "OBJECT" && t.name === introspectionFieldType.name);
-    if (!objectType)
-        throw new Error(`Object type ${introspectionFieldType.name} not found for field ${name}`);
+    const { objectType, multiple } = findIntrospectionObjectType({
+        config,
+        gqlIntrospection,
+        gqlType,
+    });
     //find labelField: 1. as configured
     let labelField = config.labelField;
     //find labelField: 2. common names (name or title)
@@ -105,7 +147,13 @@ function generateAsyncSelect({ gqlIntrospection, baseOutputFilename, config, for
     const rootQuery = config.rootQuery; //TODO we should infer a default value from the gql schema
     const queryName = `${rootQuery[0].toUpperCase() + rootQuery.substring(1)}Select`;
     const rootQueryType = (0, findQueryType_1.findQueryTypeOrThrow)(rootQuery, gqlIntrospection);
-    const formFragmentField = `${name} { id ${labelField} }`;
+    let formFragmentFields;
+    if (config.type == "asyncSelectFilter") {
+        formFragmentFields = [`${config.loadValueQueryField}.id`, `${config.loadValueQueryField}.${labelField}`];
+    }
+    else {
+        formFragmentFields = [`${name}.id`, `${name}.${labelField}`];
+    }
     const filterConfig = config.filter
         ? (() => {
             var _a;
@@ -118,9 +166,9 @@ function generateAsyncSelect({ gqlIntrospection, baseOutputFilename, config, for
                     throw new Error(`Field ${String(config.name)}: No field with name "${config.filter.formFieldName}" referenced as filter.formFieldName found in form-config.`);
                 }
                 if (!(0, generate_command_1.isFormFieldConfig)(filterField)) {
-                    throw new Error(`Field ${String(config.name)}: Field with name "${config.filter.formFieldName}" referenced as filter.fieldName is no FormField.`);
+                    throw new Error(`Field ${String(config.name)}: Field with name "${config.filter.formFieldName}" referenced as filter.formFieldName is no FormField.`);
                 }
-                filterVar = `values.${filterField.type === "asyncSelect" ? `${String(filterField.name)}?.id` : String(filterField.name)}`;
+                filterVar = `values.${filterField.type === "asyncSelect" || filterField.type === "asyncSelectFilter" ? `${String(filterField.name)}?.id` : String(filterField.name)}`;
                 if (!rootQueryArg) {
                     rootQueryArg = config.filter.formFieldName;
                 }
@@ -194,7 +242,7 @@ function generateAsyncSelect({ gqlIntrospection, baseOutputFilename, config, for
                     }
                 }
                 else {
-                    throw new Error(`Neither filter-prop nor root-prop with name: ${rootQueryArg} for asyncSelect-query not found. Consider setting filter.rootQueryArg explicitly.`);
+                    throw new Error(`Neither filter-prop nor root-prop with name: ${rootQueryArg} for asyncSelect-query not found. Consider setting filterField.gqlVarName explicitly.`);
                 }
             }
             if (config.filter.type === "formProp") {
@@ -216,12 +264,17 @@ function generateAsyncSelect({ gqlIntrospection, baseOutputFilename, config, for
         imports.push({ name: "OnChangeField", importPath: "@comet/admin" });
         finalFormConfig = { subscription: { values: true }, renderProps: { values: true, form: true } };
     }
-    if (!config.virtual) {
-        if (!required) {
-            formValueToGqlInputCode = `${name}: formValues.${name} ? formValues.${name}.id : null,`;
+    if (config.type != "asyncSelectFilter") {
+        if (!multiple) {
+            if (!required) {
+                formValueToGqlInputCode = `${name}: formValues.${name} ? formValues.${name}.id : null,`;
+            }
+            else {
+                formValueToGqlInputCode = `${name}: formValues.${name}?.id,`;
+            }
         }
         else {
-            formValueToGqlInputCode = `${name}: formValues.${name}?.id,`;
+            formValueToGqlInputCode = `${name}: formValues.${name}.map((item) => item.id),`;
         }
     }
     imports.push({
@@ -232,11 +285,18 @@ function generateAsyncSelect({ gqlIntrospection, baseOutputFilename, config, for
         name: `GQL${queryName}QueryVariables`,
         importPath: `./${baseOutputFilename}.generated`,
     });
+    const instanceGqlType = gqlType[0].toLowerCase() + gqlType.substring(1);
+    if (config.type == "asyncSelectFilter") {
+        // add (in the gql schema) non existing value for virtual filter field
+        formValueConfig.typeCode = `${name}?: { id: string; ${labelField}: string };`;
+        formValueConfig.initializationCode = `${name}: data.${instanceGqlType}.${config.loadValueQueryField.replace(/\./g, "?.")}`;
+    }
     code = `<AsyncSelectField
                 ${required ? "required" : ""}
                 variant="horizontal"
                 fullWidth
                 ${config.readOnly ? "readOnly disabled" : ""}
+                ${multiple ? "multiple" : ""}
                 name="${nameWithPrefix}"
                 label={${fieldLabel}}
                 ${config.startAdornment ? `startAdornment={<InputAdornment position="start">${startAdornment.adornmentString}</InputAdornment>}` : ""}
@@ -270,11 +330,11 @@ function generateAsyncSelect({ gqlIntrospection, baseOutputFilename, config, for
         code,
         hooksCode: "",
         formValueToGqlInputCode,
-        formFragmentFields: [formFragmentField],
+        formFragmentFields,
         gqlDocuments: {},
         imports,
         formProps,
-        formValuesConfig,
+        formValuesConfig: [formValueConfig],
         finalFormConfig,
     };
 }

package/lib/commands/generate/generateForm/formField/options.d.ts CHANGED Viewed

@@ -23,6 +23,6 @@ export declare function buildFormFieldOptions({ config, formConfig, gqlIntrospec
     startAdornment: AdornmentData;
     endAdornment: AdornmentData;
     imports: Imports;
-    introspectionFieldType: import("graphql").IntrospectionNamedTypeRef<import("graphql").IntrospectionOutputType> | import("graphql").IntrospectionListTypeRef<import("graphql").IntrospectionOutputTypeRef>;
+    introspectionFieldType: import("graphql").IntrospectionNamedTypeRef<import("graphql").IntrospectionOutputType> | import("graphql").IntrospectionListTypeRef<import("graphql").IntrospectionOutputTypeRef> | undefined;
 };
 export {};

package/lib/commands/generate/generateForm/formField/options.js CHANGED Viewed

@@ -62,9 +62,11 @@ function buildFormFieldOptions({ config, formConfig, gqlIntrospection, 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}`);
-    const introspectionFieldType = introspectionField.type.kind === "NON_NULL" ? introspectionField.type.ofType : introspectionField.type;
+    const introspectionFieldType = introspectionField
+        ? introspectionField.type.kind === "NON_NULL"
+            ? introspectionField.type.ofType
+            : introspectionField.type
+        : undefined;
     const imports = [];
     let startAdornment = { adornmentString: "" };
     let endAdornment = { adornmentString: "" };

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

@@ -18,6 +18,7 @@ const findMutationType_1 = require("../utils/findMutationType");
 const generateImportsCode_1 = require("../utils/generateImportsCode");
 const runtimeTypeGuards_1 = require("../utils/runtimeTypeGuards");
 const generateFields_1 = require("./generateFields");
+const generateFragmentByFormFragmentFields_1 = require("./generateFragmentByFormFragmentFields");
 const getForwardedGqlArgs_1 = require("./getForwardedGqlArgs");
 function generateFormPropsCode(props) {
     if (!props.length)
@@ -141,10 +142,6 @@ config) {
     const fileFields = formFields.filter((field) => field.type == "fileUpload");
     if (fileFields.length > 0) {
         imports.push({ name: "GQLFinalFormFileUploadFragment", importPath: "@comet/cms-admin" });
-    }
-    // Unnecessary field.type == "fileUpload" check to make TypeScript happy
-    const downloadableFileFields = fileFields.filter((field) => field.type == "fileUpload" && field.download);
-    if (fileFields.length > 0) {
         imports.push({ name: "GQLFinalFormFileUploadDownloadableFragment", importPath: "@comet/cms-admin" });
     }
     let hooksCode = "";
@@ -173,13 +170,7 @@ config) {
     formValuesConfig.push(...generatedFields.formValuesConfig);
     const { formPropsTypeCode, formPropsParamsCode } = generateFormPropsCode(formProps);
     gqlDocuments[`${instanceGqlType}FormFragment`] = {
-        document: `
-        fragment ${formFragmentName} on ${gqlType} {
-            ${formFragmentFields.join("\n")}
-        }
-        ${fileFields.length > 0 && fileFields.length !== downloadableFileFields.length ? "${finalFormFileUploadFragment}" : ""}
-        ${downloadableFileFields.length > 0 ? "${finalFormFileUploadDownloadableFragment}" : ""}
-    `,
+        document: (0, generateFragmentByFormFragmentFields_1.generateFragmentByFormFragmentFields)({ formFragmentName, gqlType, formFragmentFields }),
         export: editMode,
     };
     if (editMode) {

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

@@ -8,13 +8,14 @@ const runtimeTypeGuards_1 = require("../utils/runtimeTypeGuards");
 const generateAsyncSelect_1 = require("./asyncSelect/generateAsyncSelect");
 const options_1 = require("./formField/options");
 function generateFormField({ gqlIntrospection, baseOutputFilename, config, formConfig, gqlType, namePrefix, }) {
-    if (config.type == "asyncSelect") {
+    if (config.type == "asyncSelect" || config.type == "asyncSelectFilter") {
         return (0, generateAsyncSelect_1.generateAsyncSelect)({ gqlIntrospection, baseOutputFilename, config, formConfig, gqlType, namePrefix });
     }
     const imports = [];
     const formProps = [];
-    const { name, formattedMessageRootId, fieldLabel, introspectionFieldType, 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, gqlType, gqlIntrospection });
     imports.push(...optionsImports);
+    let { introspectionFieldType } = (0, options_1.buildFormFieldOptions)({ config, formConfig, gqlType, gqlIntrospection });
     const nameWithPrefix = `${namePrefix ? `${namePrefix}.` : ``}${name}`;
     const rootGqlType = formConfig.gqlType;
     const dataRootName = rootGqlType[0].toLowerCase() + rootGqlType.substring(1); // TODO should probably be deteced via query
@@ -23,10 +24,7 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
     const endAdornmentWithLockIconProp = `endAdornment={<InputAdornment position="end"><Lock /></InputAdornment>}`;
     const readOnlyProps = `readOnly disabled`;
     const readOnlyPropsWithLock = `${readOnlyProps} ${endAdornmentWithLockIconProp}`;
-    const defaultFormValuesConfig = {
-        destructFromFormValues: config.virtual ? name : undefined,
-    };
-    let formValuesConfig = [defaultFormValuesConfig]; // FormFields should only contain one entry
+    let formValuesConfig = [{}]; // FormFields should only contain one entry
     const gqlDocuments = {};
     const hooksCode = "";
     let finalFormConfig;
@@ -43,7 +41,7 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
     }
     let code = "";
     let formValueToGqlInputCode = "";
-    let formFragmentField = name;
+    let formFragmentFields = [name];
     if (config.type == "text") {
         const TextInputComponent = config.multiline ? "TextAreaField" : "TextField";
         code = `
@@ -63,7 +61,7 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
             : ""}
             ${validateCode}
         />`;
-        if (!config.virtual && !required && !config.readOnly) {
+        if (!required && !config.readOnly) {
             formValueToGqlInputCode = `${name}: formValues.${name} ?? null,`;
         }
     }
@@ -91,17 +89,17 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
         if ((0, isFieldOptional_1.isFieldOptional)({ config, gqlIntrospection: gqlIntrospection, gqlType: gqlType })) {
             assignment = `formValues.${nameWithPrefix} ? ${assignment} : null`;
         }
-        formValueToGqlInputCode = !config.virtual ? `${name}: ${assignment},` : ``;
+        formValueToGqlInputCode = `${name}: ${assignment},`;
         let initializationAssignment = `String(data.${dataRootName}.${nameWithPrefix})`;
         if (!required) {
             initializationAssignment = `data.${dataRootName}.${nameWithPrefix} ? ${initializationAssignment} : undefined`;
         }
         formValuesConfig = [
-            Object.assign(Object.assign({}, defaultFormValuesConfig), {
+            {
                 omitFromFragmentType: name,
                 typeCode: `${name}${!required ? `?` : ``}: string;`,
                 initializationCode: `${name}: ${initializationAssignment}`,
-            }),
+            },
         ];
     }
     else if (config.type === "numberRange") {
@@ -126,7 +124,7 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
             : ""}
                 ${validateCode}
             />`;
-        formFragmentField = `${name} { min max }`;
+        formFragmentFields = [`${name}.min`, `${name}.max`];
     }
     else if (config.type == "boolean") {
         code = `<CheckboxField
@@ -143,9 +141,9 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
                         ${validateCode}
                     />`;
         formValuesConfig = [
-            Object.assign(Object.assign({}, defaultFormValuesConfig), {
+            {
                 defaultInitializationCode: `${name}: false`,
-            }),
+            },
         ];
     }
     else if (config.type == "date") {
@@ -170,9 +168,16 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
             : ""}
                 ${validateCode}
             />`;
+        if (!required && !config.readOnly) {
+            formValueToGqlInputCode = `${name}: formValues.${name} ?? null,`;
+        }
     }
     else if (config.type == "dateTime") {
-        code = `<DateTimeField
+        imports.push({
+            name: "Future_DateTimePickerField as DateTimePickerField",
+            importPath: "@comet/admin",
+        });
+        code = `<DateTimePickerField
                 ${required ? "required" : ""}
                 ${config.readOnly ? readOnlyPropsWithLock : ""}
                 variant="horizontal"
@@ -189,13 +194,13 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
                 ${validateCode}
             />`;
         formValuesConfig = [
-            Object.assign(Object.assign({}, defaultFormValuesConfig), {
+            {
                 initializationCode: `${name}: data.${dataRootName}.${nameWithPrefix} ? new Date(data.${dataRootName}.${nameWithPrefix}) : undefined`,
                 omitFromFragmentType: name,
                 typeCode: `${name}${!required ? "?" : ""}: Date${!required ? " | null" : ""};`,
-            }),
+            },
         ];
-        if (!config.virtual && !config.readOnly) {
+        if (!config.readOnly) {
             formValueToGqlInputCode = required
                 ? `${name}: formValues.${name}.toISOString(),`
                 : `${name}: formValues.${name} ? formValues.${name}.toISOString() : null,`;
@@ -205,13 +210,13 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
         code = `<Field name="${nameWithPrefix}" isEqual={isEqual} label={${fieldLabel}} variant="horizontal" fullWidth>
             {createFinalFormBlock(rootBlocks.${String(config.name)})}
         </Field>`;
-        formValueToGqlInputCode = !config.virtual ? `${name}: rootBlocks.${name}.state2Output(formValues.${nameWithPrefix}),` : ``;
+        formValueToGqlInputCode = `${name}: rootBlocks.${name}.state2Output(formValues.${nameWithPrefix}),`;
         formValuesConfig = [
-            Object.assign(Object.assign({}, defaultFormValuesConfig), {
+            {
                 typeCode: `${name}: BlockState<typeof rootBlocks.${name}>;`,
                 initializationCode: `${name}: rootBlocks.${name}.input2State(data.${dataRootName}.${nameWithPrefix})`,
                 defaultInitializationCode: `${name}: rootBlocks.${name}.defaultValues()`,
-            }),
+            },
         ];
     }
     else if (config.type === "fileUpload") {
@@ -231,9 +236,14 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
         else {
             formValueToGqlInputCode = `${name}: formValues.${name} ? formValues.${name}.id : null,`;
         }
-        formFragmentField = `${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";
+        if ((introspectionFieldType === null || introspectionFieldType === void 0 ? void 0 : introspectionFieldType.kind) === "LIST") {
+            introspectionFieldType =
+                introspectionFieldType.ofType.kind === "NON_NULL" ? introspectionFieldType.ofType.ofType : introspectionFieldType.ofType;
+        }
         const enumType = gqlIntrospection.__schema.types.find((t) => t.kind === "ENUM" && t.name === introspectionFieldType.name);
         if (!enumType)
             throw new Error(`Enum type ${introspectionFieldType.name} not found for field ${name}`);
@@ -248,7 +258,30 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
                 return value;
             }
         });
-        const renderAsRadio = config.inputType === "radio" || (required && values.length <= 5 && config.inputType !== "select");
+        let inputType = config.inputType;
+        if (!inputType) {
+            if (!required || multiple) {
+                // radio is not clearable, render always as select if not required
+                // radio doesn't support multiple
+                inputType = "select";
+            }
+            else {
+                // auto select/radio based on number of values
+                if (values.length <= 5) {
+                    inputType = "radio";
+                }
+                else {
+                    inputType = "select";
+                }
+            }
+        }
+        if (inputType === "radio" && multiple) {
+            throw new Error(`${name}: inputType=radio doesn't support multiple`);
+        }
+        if (inputType === "radio" && !required) {
+            throw new Error(`${name}: inputType=radio must be required as it doesn't support clearable`);
+        }
+        const renderAsRadio = inputType === "radio";
         if (renderAsRadio) {
             code = `<RadioGroupField
              ${required ? "required" : ""}
@@ -286,6 +319,7 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
                 : ""}
                                 ${validateCode}
                                 ${config.readOnly ? readOnlyPropsWithLock : ""}
+                                ${multiple ? "multiple" : ""}
                                 options={[${values.map((value) => {
                 const id = `${formattedMessageRootId}.${name}.${value.value.charAt(0).toLowerCase() + value.value.slice(1)}`;
                 return `{
@@ -303,7 +337,7 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
         code,
         hooksCode,
         formValueToGqlInputCode,
-        formFragmentFields: [formFragmentField],
+        formFragmentFields,
         gqlDocuments,
         imports,
         formProps,

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

@@ -88,7 +88,7 @@ function generateFormLayout({ gqlIntrospection, baseOutputFilename, config, form
             namePrefix: name,
         });
         hooksCode += generatedFields.hooksCode;
-        formFragmentFields.push(`${name} { ${generatedFields.formFragmentFields.join(" ")} }`);
+        formFragmentFields.push(...generatedFields.formFragmentFields.map((field) => `${name}.${field}`));
         for (const name in generatedFields.gqlDocuments) {
             gqlDocuments[name] = generatedFields.gqlDocuments[name];
         }

package/lib/commands/generate/generateForm/generateFragmentByFormFragmentFields.d.ts ADDED Viewed

@@ -0,0 +1,11 @@
+/**
+ * Helper function that generates a GraphQL fragment from form fragment fields (array of dot.separated.fields).
+ *
+ * - Fragments are supported as "foo { ...FragmentName }"
+ * - for FinalFormFileUpload and FinalFormFileUploadDownloadable the needed variable is added automatically
+ */
+export declare function generateFragmentByFormFragmentFields({ formFragmentName, gqlType, formFragmentFields, }: {
+    formFragmentName: string;
+    gqlType: string;
+    formFragmentFields: string[];
+}): string;

package/lib/commands/generate/generateForm/generateFragmentByFormFragmentFields.js ADDED Viewed

@@ -0,0 +1,62 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateFragmentByFormFragmentFields = generateFragmentByFormFragmentFields;
+const object_path_1 = __importDefault(require("object-path"));
+/**
+ * Helper function that generates a GraphQL fragment from form fragment fields (array of dot.separated.fields).
+ *
+ * - Fragments are supported as "foo { ...FragmentName }"
+ * - for FinalFormFileUpload and FinalFormFileUploadDownloadable the needed variable is added automatically
+ */
+function generateFragmentByFormFragmentFields({ formFragmentName, gqlType, formFragmentFields, }) {
+    // 1. create tree out of dot separated fields
+    const fieldsObject = formFragmentFields.reduce((acc, field) => {
+        const fragmentMatch = field.match(/(.*)({.*?})/); // keep { ... } parts as they are, contains eg. fragments
+        if (fragmentMatch) {
+            object_path_1.default.set(acc, fragmentMatch[1].trim(), fragmentMatch[2]);
+        }
+        else {
+            object_path_1.default.set(acc, field, true);
+        }
+        return acc;
+    }, {});
+    // 2. create fragment string out of tree
+    const recursiveStringify = (obj) => {
+        let ret = "";
+        let prefixField = "";
+        for (const key in obj) {
+            const value = obj[key];
+            if (typeof value === "boolean") {
+                ret += `${prefixField}${key}`;
+            }
+            else if (typeof value === "string") {
+                ret += `${prefixField}${key} ${value}`;
+            }
+            else {
+                ret += `${prefixField}${key} { ${recursiveStringify(value)} }`;
+            }
+            prefixField = " ";
+        }
+        return ret;
+    };
+    let fragmentCode = `
+        fragment ${formFragmentName} on ${gqlType} {
+            ${recursiveStringify(fieldsObject)}
+        }
+    `;
+    // 3. add fragment instance variables when fragments are used
+    // this only works for hardcoded special cases, and the imports are also not handled here - if there would be more, this needs improvement
+    const fragments = {
+        "...FinalFormFileUpload": "${finalFormFileUploadFragment}",
+        "...FinalFormFileUploadDownloadable": "${finalFormFileUploadDownloadableFragment}",
+    };
+    for (const [fragmentName, fragmentVar] of Object.entries(fragments)) {
+        if (fragmentCode.match(`${fragmentName.replace(".", "\\.")}\\b`) && !fragmentCode.includes(fragmentVar)) {
+            fragmentCode += `\n${fragmentVar}`;
+        }
+    }
+    return fragmentCode;
+}

package/lib/commands/generate/generateGrid/generateGrid.js CHANGED Viewed

@@ -308,6 +308,7 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
         let gridColumnType = undefined;
         let renderCell = undefined;
         let valueFormatter = undefined;
+        let valueGetter = name.includes(".") ? `(params, row) => row.${name.replace(/\./g, "?.")}` : undefined;
         let gridType;
         let filterOperators;
         if (column.type != "virtual" && column.filterOperators) {
@@ -321,9 +322,15 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
         }
         if (type == "dateTime") {
             gridColumnType = "...dataGridDateTimeColumn,";
+            valueGetter = name.includes(".")
+                ? `(params, row) => row.${name.replace(/\./g, "?.")} && new Date(row.${name.replace(/\./g, "?.")})`
+                : undefined;
         }
         else if (type == "date") {
             gridColumnType = "...dataGridDateColumn,";
+            valueGetter = name.includes(".")
+                ? `(params, row) => row.${name.replace(/\./g, "?.")} && new Date(row.${name.replace(/\./g, "?.")})`
+                : undefined;
         }
         else if (type == "number") {
             gridType = "number";
@@ -458,7 +465,7 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
             gridType,
             columnType: gridColumnType,
             renderCell,
-            valueGetter: name.includes(".") ? `(params, row) => row.${name.replace(/\./g, "?.")}` : undefined,
+            valueGetter,
             filterOperators: filterOperators,
             valueFormatter,
             width: column.width,

package/lib/commands/generate/utils/isFieldOptional.js CHANGED Viewed

@@ -15,7 +15,7 @@ const isFieldOptional = ({ config, gqlIntrospection, gqlType, }) => {
         throw new Error(`kind of ${gqlType} is not object, but should be.`); // this should not happen
     const fieldDef = schemaEntity.fields.find((field) => field.name === String(config.name));
     if (!fieldDef)
-        throw new Error(`didn't find field ${String(config.name)} of ${gqlType} in introspected gql-schema.`);
+        return false;
     return fieldDef.type.kind !== "NON_NULL";
 };
 exports.isFieldOptional = isFieldOptional;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@comet/admin-generator",
-  "version": "9.0.0-canary-20250915134805",
+  "version": "9.0.0-canary-20251002064922",
   "description": "Comet Admin Generator CLI tool",
   "repository": {
     "directory": "packages/admin/admin-generator",
@@ -40,17 +40,17 @@
     "eslint": "^9.30.1",
     "final-form": "^4.20.10",
     "jest": "^29.7.0",
-    "npm-run-all2": "^5.0.2",
+    "npm-run-all2": "^8.0.0",
     "prettier": "^3.6.2",
     "react": "^18.3.1",
     "react-intl": "^7.1.11",
     "rimraf": "^6.0.1",
     "ts-jest": "^29.4.0",
     "typescript": "5.8.3",
-    "@comet/admin": "9.0.0-canary-20250915134805",
-    "@comet/admin-icons": "9.0.0-canary-20250915134805",
-    "@comet/cms-admin": "9.0.0-canary-20250915134805",
-    "@comet/eslint-config": "9.0.0-canary-20250915134805"
+    "@comet/admin": "9.0.0-canary-20251002064922",
+    "@comet/admin-icons": "9.0.0-canary-20251002064922",
+    "@comet/cms-admin": "9.0.0-canary-20251002064922",
+    "@comet/eslint-config": "9.0.0-canary-20251002064922"
   },
   "engines": {
     "node": ">=22.0.0"