@comet/admin-generator 8.0.0-beta.3 → 8.0.0-beta.5

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

@@ -115,7 +115,7 @@ const getValueOptionsLabelData = (messageId, label) => {
     };
 };
 function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntrospection, }, config) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const gqlType = config.gqlType;
     const gqlTypePlural = (0, pluralize_1.plural)(gqlType);
     //const title = config.title ?? camelCaseToHumanReadable(gqlType);
@@ -123,8 +123,58 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
     const instanceGqlTypePlural = gqlTypePlural[0].toLowerCase() + gqlTypePlural.substring(1);
     const gridQuery = config.query ? config.query : instanceGqlType != instanceGqlTypePlural ? instanceGqlTypePlural : `${instanceGqlTypePlural}List`;
     const gqlDocuments = {};
-    const imports = [];
-    const iconsToImport = ["Add", "Edit"];
+    const imports = [
+        { name: "FormattedMessage", importPath: "react-intl" },
+        { name: "FormattedNumber", importPath: "react-intl" },
+        { name: "useIntl", importPath: "react-intl" },
+        { name: "ReactNode", importPath: "react" },
+        { name: "gql", importPath: "@apollo/client" },
+        { name: "useApolloClient", importPath: "@apollo/client" },
+        { name: "useQuery", importPath: "@apollo/client" },
+        { name: "Button", importPath: "@comet/admin" },
+        { name: "CrudContextMenu", importPath: "@comet/admin" },
+        { name: "CrudMoreActionsMenu", importPath: "@comet/admin" },
+        { name: "DataGridToolbar", importPath: "@comet/admin" },
+        { name: "ExportApi", importPath: "@comet/admin" },
+        { name: "filterByFragment", importPath: "@comet/admin" },
+        { name: "GridFilterButton", importPath: "@comet/admin" },
+        { name: "GridCellContent", importPath: "@comet/admin" },
+        { name: "GridColDef", importPath: "@comet/admin" },
+        { name: "dataGridDateTimeColumn", importPath: "@comet/admin" },
+        { name: "dataGridDateColumn", importPath: "@comet/admin" },
+        { name: "renderStaticSelectCell", importPath: "@comet/admin" },
+        { name: "messages", importPath: "@comet/admin" },
+        { name: "muiGridFilterToGql", importPath: "@comet/admin" },
+        { name: "muiGridSortToGql", importPath: "@comet/admin" },
+        { name: "StackLink", importPath: "@comet/admin" },
+        { name: "FillSpace", importPath: "@comet/admin" },
+        { name: "Tooltip", importPath: "@comet/admin" },
+        { name: "useBufferedRowCount", importPath: "@comet/admin" },
+        { name: "useDataGridExcelExport", importPath: "@comet/admin" },
+        { name: "useDataGridRemote", importPath: "@comet/admin" },
+        { name: "usePersistentColumnState", importPath: "@comet/admin" },
+        { name: "BlockPreviewContent", importPath: "@comet/cms-admin" },
+        { name: "useContentScope", importPath: "@comet/cms-admin" },
+        { name: "Alert", importPath: "@mui/material" },
+        { name: "Box", importPath: "@mui/material" },
+        { name: "IconButton", importPath: "@mui/material" },
+        { name: "Typography", importPath: "@mui/material" },
+        { name: "useTheme", importPath: "@mui/material" },
+        { name: "Menu", importPath: "@mui/material" },
+        { name: "MenuItem", importPath: "@mui/material" },
+        { name: "ListItemIcon", importPath: "@mui/material" },
+        { name: "ListItemText", importPath: "@mui/material" },
+        { name: "CircularProgress", importPath: "@mui/material" },
+        { name: "DataGridPro", importPath: "@mui/x-data-grid-pro" },
+        { name: "GridLogicOperator", importPath: "@mui/x-data-grid-pro" },
+        { name: "GridRenderCellParams", importPath: "@mui/x-data-grid-pro" },
+        { name: "GridSlotsComponent", importPath: "@mui/x-data-grid-pro" },
+        { name: "GridToolbarProps", importPath: "@mui/x-data-grid-pro" },
+        { name: "GridColumnHeaderTitle", importPath: "@mui/x-data-grid-pro" },
+        { name: "GridToolbarQuickFilter", importPath: "@mui/x-data-grid-pro" },
+        { name: "GridRowOrderChangeParams", importPath: "@mui/x-data-grid-pro" },
+    ];
+    const iconsToImport = ["Add", "Edit", "Info", "Excel"];
     const props = [];
     const fieldList = (0, generateGqlFieldList_1.generateGqlFieldList)({
         columns: config.columns.filter((column) => {
@@ -161,12 +211,29 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
     });
     const gridQueryType = (0, findQueryType_1.findQueryTypeOrThrow)(gridQuery, gqlIntrospection);
     const createMutationType = (0, findMutationType_1.findMutationType)(`create${gqlType}`, gqlIntrospection);
+    const updateMutationType = (0, findMutationType_1.findMutationType)(`update${gqlType}`, gqlIntrospection);
     const hasDeleteMutation = !!(0, findMutationType_1.findMutationType)(`delete${gqlType}`, gqlIntrospection);
     const hasCreateMutation = !!createMutationType;
+    const hasUpdateMutation = !!updateMutationType;
     const allowCopyPaste = (typeof config.copyPaste === "undefined" || config.copyPaste === true) && !config.readOnly && hasCreateMutation;
     const allowAdding = (typeof config.add === "undefined" || config.add === true) && !config.readOnly;
     const allowEditing = (typeof config.edit === "undefined" || config.edit === true) && !config.readOnly;
     const allowDeleting = (typeof config.delete === "undefined" || config.delete === true) && !config.readOnly && hasDeleteMutation;
+    const allowRowReordering = typeof ((_a = config.rowReordering) === null || _a === void 0 ? void 0 : _a.enabled) !== "undefined" && ((_b = config.rowReordering) === null || _b === void 0 ? void 0 : _b.enabled) && hasUpdateMutation;
+    const updateInputArg = updateMutationType === null || updateMutationType === void 0 ? void 0 : updateMutationType.args.find((arg) => arg.name === "input");
+    if (allowRowReordering && updateInputArg) {
+        const inputType = (0, findInputObjectType_1.findInputObjectType)(updateInputArg, gqlIntrospection);
+        if (!inputType)
+            throw new Error("Can't find update input type");
+        if (!((_c = inputType.inputFields) === null || _c === void 0 ? void 0 : _c.find((field) => field.name === "position"))) {
+            throw new Error("Position field is needed when using 'rowReordering'");
+        }
+    }
+    const hasRowReorderingOnDragField = allowRowReordering && typeof ((_d = config.rowReordering) === null || _d === void 0 ? void 0 : _d.dragPreviewField) !== "undefined";
+    if (hasRowReorderingOnDragField &&
+        !config.columns.find((column) => { var _a; return column.type !== "actions" && (column === null || column === void 0 ? void 0 : column.name) === ((_a = config.rowReordering) === null || _a === void 0 ? void 0 : _a.dragPreviewField); })) {
+        throw new Error(`rowReorderingOnDragField '${(_e = config.rowReordering) === null || _e === void 0 ? void 0 : _e.dragPreviewField}' must exist in columns`);
+    }
     const forwardRowAction = allowEditing && config.rowActionProp;
     const showActionsColumn = allowCopyPaste || allowEditing || allowDeleting;
     const showCrudContextMenuInActionsColumn = allowCopyPaste || allowDeleting;
@@ -175,9 +242,9 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
     const { imports: forwardedGqlArgsImports, props: forwardedGqlArgsProps, gqlArgs, } = (0, getForwardedGqlArgs_1.getForwardedGqlArgs)([gridQueryType, ...(createMutationType ? [createMutationType] : [])]);
     imports.push(...forwardedGqlArgsImports);
     props.push(...forwardedGqlArgsProps);
-    const renderToolbar = (_a = config.toolbar) !== null && _a !== void 0 ? _a : true;
+    const renderToolbar = (_f = config.toolbar) !== null && _f !== void 0 ? _f : true;
     const filterArg = gridQueryType.args.find((arg) => arg.name === "filter");
-    const hasFilter = !!filterArg && renderToolbar;
+    const hasFilter = !!filterArg && renderToolbar && !allowRowReordering;
     let hasFilterProp = false;
     let filterFields = [];
     if (filterArg) {
@@ -223,8 +290,11 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
         if (!sortInputEnum)
             throw new Error("Can't find sortInputEnum");
         sortFields = sortInputEnum.enumValues.map((v) => v.name.replace(/_/g, "."));
+        if (allowRowReordering && !sortFields.includes("position")) {
+            throw new Error("Sort argument must include 'position' field for row reordering");
+        }
     }
-    const hasSearch = gridQueryType.args.some((arg) => arg.name === "search");
+    const hasSearch = gridQueryType.args.some((arg) => arg.name === "search") && !allowRowReordering;
     const hasScope = gridQueryType.args.some((arg) => arg.name === "scope");
     const schemaEntity = gqlIntrospection.__schema.types.find((type) => type.kind === "OBJECT" && type.name === gqlType);
     if (!schemaEntity)
@@ -247,7 +317,7 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
         return true;
     });
     const actionsColumnConfig = config.columns.find((column) => column.type === "actions");
-    const _c = actionsColumnConfig !== null && actionsColumnConfig !== void 0 ? actionsColumnConfig : {}, { component: actionsColumnComponent, type: actionsColumnType, headerName: actionsColumnHeaderName, pinned: actionsColumnPinned = "right", width: actionsColumnWidth = defaultActionsColumnWidth, visible: actionsColumnVisible = undefined } = _c, restActionsColumnConfig = __rest(_c, ["component", "type", "headerName", "pinned", "width", "visible"]);
+    const _j = actionsColumnConfig !== null && actionsColumnConfig !== void 0 ? actionsColumnConfig : {}, { component: actionsColumnComponent, type: actionsColumnType, headerName: actionsColumnHeaderName, pinned: actionsColumnPinned = "right", width: actionsColumnWidth = defaultActionsColumnWidth, visible: actionsColumnVisible = undefined } = _j, restActionsColumnConfig = __rest(_j, ["component", "type", "headerName", "pinned", "width", "visible"]);
     if (actionsColumnComponent) {
         if (!(0, runtimeTypeGuards_1.isGeneratorConfigImport)(actionsColumnComponent)) {
             throw new Error("Unsupported actionsColumnComponent, only imports are supported");
@@ -281,6 +351,12 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
         }
         else if (type == "number") {
             gridType = "number";
+            const defaultDecimals = column.currency ? 2 : 0;
+            const decimals = typeof column.decimals === "number" ? column.decimals : defaultDecimals;
+            const currencyProps = column.currency ? `style="currency" currency="${column.currency}"` : "";
+            renderCell = `({ value }) => {
+                return (typeof value === "number") ? <FormattedNumber value={value} ${currencyProps} minimumFractionDigits={${decimals}} maximumFractionDigits={${decimals}} /> : "";
+            }`;
         }
         else if (type == "boolean") {
             gridType = "boolean";
@@ -419,7 +495,7 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
             createMutationInputFields = inputType.inputFields.filter((field) => fieldsToLoad.some((gridColumnField) => gridColumnField.name == field.name));
         }
     }
-    const fragmentName = (_b = config.fragmentName) !== null && _b !== void 0 ? _b : `${gqlTypePlural}Form`;
+    const fragmentName = (_g = config.fragmentName) !== null && _g !== void 0 ? _g : `${gqlTypePlural}Form`;
     if (forwardRowAction) {
         props.push({
             name: "rowAction",
@@ -458,7 +534,7 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
             : ""}
               ${config.initialFilter
             ? `initialFilter:{ ${config.initialFilter.linkOperator
-                ? `linkOperator: GridLinkOperator.${config.initialFilter.linkOperator === "or" ? "Or" : "And"},`
+                ? `linkOperator: GridLogicOperator.${config.initialFilter.linkOperator === "or" ? "Or" : "And"},`
                 : ""}
                       items: [${config.initialFilter.items
                 .map((item) => {
@@ -469,49 +545,17 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
               ${config.queryParamsPrefix ? `queryParamsPrefix: "${config.queryParamsPrefix}",` : ""}
               }`
         : "";
-    const code = `import { gql, useApolloClient, useQuery } from "@apollo/client";
-    import {
-        Button,
-        CrudContextMenu,
-        CrudMoreActionsMenu,
-        DataGridToolbar,
-        ExportApi,
-        filterByFragment,
-        GridFilterButton,
-        GridCellContent,
-        GridColDef,
-        dataGridDateTimeColumn,
-        dataGridDateColumn,
-        renderStaticSelectCell,
-        messages,
-        muiGridFilterToGql,
-        muiGridSortToGql,
-        StackLink,
-        ToolbarActions,
-        FillSpace,
-        ToolbarItem,
-        Tooltip,
-        useBufferedRowCount,
-        useDataGridExcelExport,
-        useDataGridRemote,
-        usePersistentColumnState,
-    } from "@comet/admin";
-    import { Add as AddIcon, Edit, Info, MoreVertical, Excel } from "@comet/admin-icons";
-    import { BlockPreviewContent } from "@comet/cms-admin";
-    import { Alert, Box, IconButton, Typography, useTheme, Menu, MenuItem, ListItemIcon, ListItemText, CircularProgress } from "@mui/material";
-    import { DataGridPro, GridLinkOperator, GridRenderCellParams, GridSlotsComponent, GridToolbarProps, GridColumnHeaderTitle, GridToolbarQuickFilter } from "@mui/x-data-grid-pro";
-    import { useContentScope } from "@src/common/ContentScopeProvider";
-    import {
+    const code = `import {
         GQL${gqlTypePlural}GridQuery,
         GQL${gqlTypePlural}GridQueryVariables,
         GQL${fragmentName}Fragment,
         GQLCreate${gqlType}Mutation,
         GQLCreate${gqlType}MutationVariables,
+        GQLUpdate${gqlType}PositionMutation,
+        GQLUpdate${gqlType}PositionMutationVariables,
         GQLDelete${gqlType}Mutation,
         GQLDelete${gqlType}MutationVariables
     } from "./${baseOutputFilename}.generated";
-    import { ReactNode } from "react";
-    import { FormattedMessage, FormattedNumber, useIntl } from "react-intl";
     ${(0, generateImportsCode_1.generateImportsCode)(imports)}
 
     const ${instanceGqlTypePlural}Fragment = gql\`
@@ -547,6 +591,17 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
         \${${instanceGqlTypePlural}Fragment}
     \`;
 
+    ${allowRowReordering
+        ? `const update${gqlType}PositionMutation = gql\`
+                mutation Update${gqlType}Position($id: ID!, $input: ${gqlType}UpdateInput!) {
+                    update${gqlType}(id: $id, input: $input) {
+                        id
+                        position
+                        updatedAt
+                    }
+                }
+            \`;`
+        : ""}
 
     ${allowDeleting
         ? `const delete${gqlType}Mutation = gql\`
@@ -602,6 +657,8 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
         ${hasScope ? `const { scope } = useContentScope();` : ""}
         ${gridNeedsTheme ? `const theme = useTheme();` : ""}
 
+        ${generateHandleRowOrderChange(allowRowReordering, gqlType, instanceGqlTypePlural)}
+
         const columns: GridColDef<GQL${fragmentName}Fragment>[] = [
             ${gridColumnFields
         .map((column) => {
@@ -632,7 +689,7 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
                                         <Tooltip
                                             title={<FormattedMessage id="${instanceGqlType}.${column.name}.tooltip" defaultMessage="${column.headerInfoTooltip}" />}
                                         >
-                                            <Info sx={{ marginLeft: 1 }} />
+                                            <InfoIcon sx={{ marginLeft: 1 }} />
                                         </Tooltip>
                                     </>
                                 )`
@@ -641,8 +698,8 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
                 ? `intl.formatMessage({ id: "${instanceGqlType}.${column.name}", defaultMessage: "${column.headerName || (0, camelCaseToHumanReadable_1.camelCaseToHumanReadable)(column.name)}" })`
                 : undefined,
             type: column.gridType ? `"${column.gridType}"` : undefined,
-            filterable: !column.filterOperators && !filterFields.includes(column.name) ? `false` : undefined,
-            sortable: !sortFields.includes(column.name) ? `false` : undefined,
+            filterable: (!column.filterOperators && !filterFields.includes(column.name)) || allowRowReordering ? `false` : undefined,
+            sortable: !sortFields.includes(column.name) || allowRowReordering ? `false` : undefined,
             valueGetter: column.valueGetter,
             valueFormatter: column.valueFormatter,
             valueOptions: column.valueOptions,
@@ -755,17 +812,20 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
                         : []
             : []),
         ...(hasSearch ? ["search: gqlSearch"] : []),
-        ...[
-            `offset: dataGridProps.paginationModel.page * dataGridProps.paginationModel.pageSize`,
-            `limit: dataGridProps.paginationModel.pageSize`,
-            `sort: muiGridSortToGql(dataGridProps.sortModel)`,
-        ],
+        ...(!allowRowReordering
+            ? [
+                `offset: dataGridProps.paginationModel.page * dataGridProps.paginationModel.pageSize`,
+                `limit: dataGridProps.paginationModel.pageSize`,
+                `sort: muiGridSortToGql(dataGridProps.sortModel)`,
+            ]
+            : // TODO: offset and limit should not be necessary for row reordering but not yet possible to disable in the api generator
+                [`offset: 0`, `limit: 100`, `sort: { field: "position", direction: "ASC" }`]),
     ].join(", ")}
             },
         });
         const rowCount = useBufferedRowCount(data?.${gridQuery}.totalCount);
         if (error) throw error;
-        const rows = data?.${gridQuery}.nodes ?? [];
+        const rows = ${!allowRowReordering ? `data?.${gridQuery}.nodes` : generateRowReorderingRows(gridQuery, fieldList, (_h = config.rowReordering) === null || _h === void 0 ? void 0 : _h.dragPreviewField)} ?? [];
 
         ${generateGridExportApi(config.excelExport, gqlTypePlural, gridQuery)}
 
@@ -781,6 +841,11 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
                                 toolbar: ${gridToolbarComponentName} as GridSlotsComponent["toolbar"],
                             }}
                             ${getDataGridSlotProps(gridToolbarComponentName, forwardToolbarAction, config.excelExport)}`
+        : ""}
+                ${allowRowReordering
+        ? `rowReordering
+                           onRowOrderChange={handleRowOrderChange}
+                           hideFooterPagination`
         : ""}
             />
         );
@@ -791,6 +856,14 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
         gqlDocuments,
     };
 }
+const generateRowReorderingRows = (gridQuery, fieldList, dragPreviewField) => {
+    const fields = fieldList.split(" ");
+    const reorderField = dragPreviewField || fields.find((field) => field === "title" || field === "name") || "id";
+    return `data?.${gridQuery}.nodes.map((node) => ({
+        ...node,
+        __reorder__: node.${reorderField}
+    }))`;
+};
 const getDefaultActionsColumnWidth = (showCrudContextMenu, showEdit) => {
     let numberOfActions = 0;
     if (showCrudContextMenu) {
@@ -832,3 +905,16 @@ const generateGridExportApi = (excelExport, gqlTypePlural, gridQuery) => {
         },
     });`;
 };
+const generateHandleRowOrderChange = (allowRowReordering, gqlType, instanceGqlTypePlural) => {
+    if (!allowRowReordering) {
+        return "";
+    }
+    return `const handleRowOrderChange = async ({ row: { id }, targetIndex }: GridRowOrderChangeParams) => {
+        await client.mutate<GQLUpdate${gqlType}PositionMutation, GQLUpdate${gqlType}PositionMutationVariables>({
+            mutation: update${gqlType}PositionMutation,
+            variables: { id, input: { position: targetIndex + 1 } },
+            awaitRefetchQueries: true,
+            refetchQueries: [${instanceGqlTypePlural}Query]
+        });
+    };`;
+};

package/lib/commands/generate/generateGrid/generateGridToolbar.js

@@ -9,8 +9,8 @@ const generateGridToolbar = ({ componentName, forwardToolbarAction, hasSearch, h
     function ${componentName}(${getGridToolbarProps(componentName, !!forwardToolbarAction, !!excelExport)}) {
         return (
             <DataGridToolbar>
-                ${hasSearch ? searchItem : ""}
-                ${hasFilter ? filterItem : ""}
+                ${hasSearch ? "<GridToolbarQuickFilter />" : ""}
+                ${hasFilter ? "<GridFilterButton />" : ""}
                 <FillSpace />
                 ${renderToolbarActions({
         forwardToolbarAction,
@@ -44,12 +44,6 @@ const getGridToolbarProps = (componentName, toolbarAction, exportApi) => {
         ${props.map((prop) => `${prop.destructured}`).join(",")}
     }: ${componentName}ToolbarProps`;
 };
-const searchItem = `<ToolbarItem>
-    <GridToolbarQuickFilter />
-</ToolbarItem>`;
-const filterItem = `<ToolbarItem>
-    <GridFilterButton />
-</ToolbarItem>`;
 const renderToolbarActions = ({ forwardToolbarAction, addItemText, excelExport, allowAdding }) => {
     const showMoreActionsMenu = excelExport;
     if (!showMoreActionsMenu && !allowAdding) {
@@ -65,7 +59,7 @@ const renderToolbarActions = ({ forwardToolbarAction, addItemText, excelExport,
             ${excelExport
         ? `{
                         label: <FormattedMessage {...messages.downloadAsExcel} />,
-                        icon: exportApi.loading ? <CircularProgress size={20} /> : <Excel />,
+                        icon: exportApi.loading ? <CircularProgress size={20} /> : <ExcelIcon />,
                         onClick: () => exportApi.exportGrid(),
                         disabled: exportApi.loading,
                     }`
@@ -76,10 +70,9 @@ const renderToolbarActions = ({ forwardToolbarAction, addItemText, excelExport,
         ${addItemText}
     </Button>`;
     const addAction = forwardToolbarAction ? "{toolbarAction}" : defaultAddItemButton;
-    return `<ToolbarActions>
+    return `
         ${showMoreActionsMenu ? moreActionsMenu : ""}
-        ${allowAdding ? addAction : ""}
-    </ToolbarActions>`;
+        ${allowAdding ? addAction : ""}`;
 };
 const renderToolbarProps = (componentName, forwardToolbarAction, exportApi) => {
     if (forwardToolbarAction || exportApi) {

package/lib/commands/generate/generateGrid/usableFields.d.ts

@@ -1,8 +1,9 @@
-type GqlLeaves<T> = T extends any ? "__typename" extends keyof T ? {
-    [K in keyof T as K extends "__typename" ? never : K]-?: GqlLeaves<T[K]>;
+type Prev = [never, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
+type GqlLeaves<T, FollowArrays extends boolean = false, Depth extends number = 5> = [Depth] extends [never] ? never : T extends any ? T extends Array<infer ArrayType> ? FollowArrays extends true ? GqlLeaves<ArrayType, FollowArrays, Prev[Depth]> : never : "__typename" extends keyof T ? {
+    [K in keyof T as K extends "__typename" ? never : K]-?: GqlLeaves<T[K], FollowArrays, Prev[Depth]>;
 } : never : never;
 type FieldNames<T> = {
     [K in keyof T]: `${Exclude<K, symbol>}${FieldNames<T[K]> extends never ? "" : `.${FieldNames<T[K]>}`}`;
 }[keyof T];
-export type UsableFields<T> = FieldNames<GqlLeaves<T>>;
+export type UsableFields<T, FollowArrays extends boolean = false> = FieldNames<GqlLeaves<T, FollowArrays>>;
 export {};

package/lib/commands/generate/generateGrid/usableFields.js

@@ -1,2 +1,3 @@
 "use strict";
+/* eslint-disable @typescript-eslint/no-explicit-any */
 Object.defineProperty(exports, "__esModule", { value: true });

package/lib/commands/generate/utils/writeGenerated.js

@@ -46,39 +46,78 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeGenerated = writeGenerated;
-const chalk_1 = __importDefault(require("chalk"));
-const eslint_1 = require("eslint");
 const fs_1 = require("fs");
 const path = __importStar(require("path"));
+const typescript_1 = __importDefault(require("typescript"));
 function writeGenerated(filePath, contents) {
     return __awaiter(this, void 0, void 0, function* () {
         const header = `// This file has been generated by comet admin-generator.
     // You may choose to use this file as scaffold by moving this file out of generated folder and removing this comment.
     `;
         yield fs_1.promises.mkdir(path.dirname(filePath), { recursive: true });
-        const eslint = new eslint_1.ESLint({
-            cwd: process.cwd(),
-            fix: true,
+        const sourceFile = typescript_1.default.createSourceFile(filePath, header + contents, typescript_1.default.ScriptTarget.Latest, true, typescript_1.default.ScriptKind.TSX);
+        const result = typescript_1.default.transform(sourceFile, [removeUnusedImports()]);
+        const printer = typescript_1.default.createPrinter({
+            newLine: typescript_1.default.NewLineKind.LineFeed,
+            removeComments: false,
         });
-        // Write not linted generated code into file. This is necessary to avoid linting errors like: Parsing error: file/path/file.tsx was not found by the project service.
-        yield fs_1.promises.writeFile(filePath, header + contents);
-        const lintResult = yield eslint.lintText(header + contents, {
-            filePath,
-        });
-        if (lintResult[0].errorCount > 0 || lintResult[0].fatalErrorCount > 0) {
-            const errorMessage = lintResult[0].messages
-                .map((message) => {
-                return message.message;
-            })
-                .join(".");
-            console.error(chalk_1.default.red(`Linting error in ${filePath}: \n${errorMessage}`));
-        }
-        else if (lintResult[0].output != null) {
-            yield fs_1.promises.writeFile(filePath, lintResult[0].output);
-        }
-        else {
-            console.error(chalk_1.default.red("No output from linting"));
-        }
+        const prettyCode = printer.printFile(result.transformed[0]).replace(/gql `/g, "gql`");
+        yield fs_1.promises.writeFile(filePath, prettyCode);
         console.log(`generated ${filePath}`);
     });
 }
+// copy from @comet/api-generator
+function removeUnusedImports() {
+    return (context) => {
+        function visit(sourceFile) {
+            const usedIdentifiers = new Set();
+            // Step 1: Collect all used identifiers
+            function collectUsage(node) {
+                if (typescript_1.default.isIdentifier(node)) {
+                    usedIdentifiers.add(node.text);
+                }
+                else if (typescript_1.default.isImportDeclaration(node)) {
+                    // Skip import declarations (those identifiers are not usages)
+                    return;
+                }
+                typescript_1.default.forEachChild(node, collectUsage);
+            }
+            typescript_1.default.forEachChild(sourceFile, collectUsage);
+            // Step 2: Visit and update the import declarations
+            function visitor(node) {
+                if (typescript_1.default.isImportDeclaration(node) && node.importClause) {
+                    const { name, namedBindings } = node.importClause;
+                    const updatedBindings = [];
+                    if (name && usedIdentifiers.has(name.text)) {
+                        // default import is used
+                    }
+                    else if (name) {
+                        // default import is unused
+                        return undefined;
+                    }
+                    if (namedBindings && typescript_1.default.isNamedImports(namedBindings)) {
+                        for (const specifier of namedBindings.elements) {
+                            const importName = specifier.name.text;
+                            if (usedIdentifiers.has(importName)) {
+                                updatedBindings.push(specifier);
+                            }
+                        }
+                        if (updatedBindings.length === 0 && !name) {
+                            // nothing left in this import
+                            return undefined;
+                        }
+                        return typescript_1.default.factory.updateImportDeclaration(node, node.modifiers, typescript_1.default.factory.updateImportClause(node.importClause, node.importClause.isTypeOnly, name, updatedBindings.length > 0 ? typescript_1.default.factory.updateNamedImports(namedBindings, updatedBindings) : undefined), node.moduleSpecifier, node.assertClause);
+                    }
+                    if (!namedBindings && !name) {
+                        // empty import, probably a side-effect import
+                        return node;
+                    }
+                    return node;
+                }
+                return typescript_1.default.visitEachChild(node, visitor, context);
+            }
+            return typescript_1.default.visitNode(sourceFile, visitor);
+        }
+        return (sourceFile) => visit(sourceFile);
+    };
+}

package/lib/index.d.ts

@@ -1 +1,2 @@
 export type { FormConfig, FormFieldConfig, GeneratorConfig, GridColumnConfig, GridConfig } from "./commands/generate/generate-command";
+export { defineConfig } from "./commands/generate/generate-command";

package/lib/index.js

@@ -1,2 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.defineConfig = void 0;
+var generate_command_1 = require("./commands/generate/generate-command");
+Object.defineProperty(exports, "defineConfig", { enumerable: true, get: function () { return generate_command_1.defineConfig; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comet/admin-generator",
-  "version": "8.0.0-beta.3",
+  "version": "8.0.0-beta.5",
   "repository": {
     "directory": "packages/admin/admin-generator",
     "type": "git",
@@ -19,38 +19,36 @@
   "dependencies": {
     "@graphql-tools/graphql-file-loader": "^7.5.17",
     "@graphql-tools/load": "^7.8.14",
-    "chalk": "^5.4.1",
     "change-case": "^4.1.2",
     "commander": "^9.5.0",
     "glob": "^10.4.5",
     "graphql": "^16.10.0",
     "object-path": "^0.11.8",
     "pluralize": "^8.0.0",
-    "ts-morph": "^25.0.1",
     "ts-node": "^10.9.2"
   },
   "devDependencies": {
-    "@mui/material": "^6.4.8",
-    "@mui/x-data-grid": "^7.28.0",
+    "@mui/material": "^7.1.0",
+    "@mui/x-data-grid": "^7.29.4",
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.13.10",
+    "@types/node": "^22.15.21",
     "@types/object-path": "^0.11.4",
     "@types/pluralize": "^0.0.33",
-    "@types/react": "^18.3.19",
+    "@types/react": "^18.3.22",
     "eslint": "^9.22.0",
     "final-form": "^4.20.10",
     "jest": "^29.7.0",
     "npm-run-all2": "^5.0.2",
     "prettier": "^3.5.3",
     "react": "^18.3.1",
-    "react-intl": "^7.1.6",
+    "react-intl": "^7.1.10",
     "rimraf": "^6.0.1",
     "ts-jest": "^29.2.6",
     "typescript": "^5.7.3",
-    "@comet/admin": "8.0.0-beta.3",
-    "@comet/admin-icons": "8.0.0-beta.3",
-    "@comet/cms-admin": "8.0.0-beta.3",
-    "@comet/eslint-config": "8.0.0-beta.3"
+    "@comet/admin": "8.0.0-beta.5",
+    "@comet/admin-icons": "8.0.0-beta.5",
+    "@comet/cms-admin": "8.0.0-beta.5",
+    "@comet/eslint-config": "8.0.0-beta.5"
   },
   "engines": {
     "node": ">=22.0.0"
@@ -67,7 +65,7 @@
     "lint:eslint": "eslint --max-warnings 0 src/ **/*.json --no-warn-ignored",
     "lint:prettier": "npx prettier --check './**/*.{js,json,md,yml,yaml}'",
     "lint:tsc": "tsc",
-    "test": "jest --passWithNoTests",
-    "test:watch": "jest --watch"
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest --passWithNoTests",
+    "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
   }
 }

package/lib/commands/generate/utils/tsMorphHelper.d.ts

@@ -1,4 +0,0 @@
-import { type SourceFile } from "ts-morph";
-import { type GeneratorConfig } from "../generate-command";
-export declare function morphTsSource(path: string): SourceFile;
-export declare function configsFromSourceFile(sourceFile: SourceFile): Record<string, GeneratorConfig>;