@comet/admin-generator 8.0.0-beta.1 → 8.0.0-beta.2

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

@@ -1,20 +1,17 @@
 import { type GridColDef } from "@comet/admin";
 import { type IconName } from "@comet/admin-icons";
-import { type FinalFormFileUploadProps } from "@comet/cms-admin";
+import { type BlockInterface, type FinalFormFileUploadProps } from "@comet/cms-admin";
 import { type IconProps } from "@mui/material";
-import { type GridFilterItem, type GridSortDirection } from "@mui/x-data-grid";
+import { type GridCellParams, type GridFilterItem, type GridFilterOperator, type GridRenderCellParams, type GridSortDirection, type GridValidRowModel } from "@mui/x-data-grid";
 import { Command } from "commander";
-import { type GridCombinationColumnConfig } from "./generateGrid/combinationColumn";
+import { type FieldValidator } from "final-form";
+import { type ComponentType } from "react";
 import { type UsableFields } from "./generateGrid/usableFields";
 import { type ColumnVisibleOption } from "./utils/columnVisibility";
-export type ImportReference = {
-    name: string;
-    import: string;
-};
 type IconObject = Pick<IconProps, "color" | "fontSize"> & {
     name: IconName;
 };
-type Icon = IconName | IconObject | ImportReference;
+type Icon = IconName | IconObject | ComponentType;
 export type Adornment = string | {
     icon: Icon;
 };
@@ -36,7 +33,7 @@ type InputBaseFieldConfig = {
 };
 export type ComponentFormFieldConfig = {
     type: "component";
-    component: ImportReference;
+    component: ComponentType;
 };
 export type FormFieldConfig<T> = (({
     type: "text";
@@ -71,13 +68,13 @@ export type FormFieldConfig<T> = (({
     };
 } & Omit<InputBaseFieldConfig, "endAdornment">) | {
     type: "block";
-    block: ImportReference;
+    block: BlockInterface;
 } | SingleFileFormFieldConfig | MultiFileFormFieldConfig) & {
     name: keyof T;
     label?: string;
     required?: boolean;
     virtual?: boolean;
-    validate?: ImportReference;
+    validate?: FieldValidator<unknown>;
     helperText?: string;
     readOnly?: boolean;
 };
@@ -115,7 +112,7 @@ type TabsConfig = {
         content: GeneratorConfig;
     }[];
 };
-export type BaseColumnConfig = Pick<GridColDef, "headerName" | "width" | "minWidth" | "maxWidth" | "flex" | "pinned" | "disableExport"> & {
+type BaseColumnConfig = Pick<GridColDef, "headerName" | "width" | "minWidth" | "maxWidth" | "flex" | "pinned" | "disableExport"> & {
     headerInfoTooltip?: string;
     visible?: ColumnVisibleOption;
     fieldName?: string;
@@ -125,16 +122,21 @@ export type StaticSelectLabelCellContent = {
     secondaryText?: string;
     icon?: Icon;
 };
-export type GridColumnConfig<T> = ({
+export type GridColumnConfig<T extends GridValidRowModel> = ({
     type: "text";
+    renderCell?: (params: GridRenderCellParams<T, any, any>) => JSX.Element;
 } | {
     type: "number";
+    renderCell?: (params: GridRenderCellParams<T, any, any>) => JSX.Element;
 } | {
     type: "boolean";
+    renderCell?: (params: GridRenderCellParams<T, any, any>) => JSX.Element;
 } | {
     type: "date";
+    renderCell?: (params: GridRenderCellParams<T, any, any>) => JSX.Element;
 } | {
     type: "dateTime";
+    renderCell?: (params: GridRenderCellParams<T, any, any>) => JSX.Element;
 } | {
     type: "staticSelect";
     values?: Array<{
@@ -143,15 +145,21 @@ export type GridColumnConfig<T> = ({
     } | string>;
 } | {
     type: "block";
-    block: ImportReference;
+    block: BlockInterface;
 }) & {
     name: UsableFields<T>;
-    filterOperators?: ImportReference;
+    filterOperators?: GridFilterOperator[];
 } & BaseColumnConfig;
 export type ActionsGridColumnConfig = {
     type: "actions";
-    component?: ImportReference;
+    component?: ComponentType<GridCellParams>;
 } & BaseColumnConfig;
+export type VirtualGridColumnConfig<T extends GridValidRowModel> = {
+    type: "virtual";
+    name: string;
+    queryFields?: UsableFields<T>[];
+    renderCell: (params: GridRenderCellParams<T, any, any>) => JSX.Element;
+} & Pick<GridColDef, "sortBy"> & BaseColumnConfig;
 type InitialFilterConfig = {
     items: GridFilterItem[];
     linkOperator?: "and" | "or";
@@ -164,7 +172,7 @@ export type GridConfig<T extends {
     fragmentName?: string;
     query?: string;
     queryParamsPrefix?: string;
-    columns: Array<GridColumnConfig<T> | GridCombinationColumnConfig<UsableFields<T>> | ActionsGridColumnConfig>;
+    columns: Array<GridColumnConfig<T> | ActionsGridColumnConfig | VirtualGridColumnConfig<T>>;
     excelExport?: boolean;
     add?: boolean;
     edit?: boolean;

package/lib/commands/generate/generate-command.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -32,7 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateCommand = exports.isFormLayoutConfig = exports.isFormFieldConfig = void 0;
+exports.generateCommand = void 0;
+exports.isFormFieldConfig = isFormFieldConfig;
+exports.isFormLayoutConfig = isFormLayoutConfig;
 const graphql_file_loader_1 = require("@graphql-tools/graphql-file-loader");
 const load_1 = require("@graphql-tools/load");
 const commander_1 = require("commander");
@@ -42,23 +21,19 @@ const graphql_1 = require("graphql");
 const path_1 = require("path");
 const generateForm_1 = require("./generateForm/generateForm");
 const generateGrid_1 = require("./generateGrid/generateGrid");
+const tsMorphHelper_1 = require("./utils/tsMorphHelper");
 const writeGenerated_1 = require("./utils/writeGenerated");
-// eslint-disable-next-line  @typescript-eslint/no-explicit-any
 function isFormFieldConfig(arg) {
     return !isFormLayoutConfig(arg);
 }
-exports.isFormFieldConfig = isFormFieldConfig;
-// eslint-disable-next-line  @typescript-eslint/no-explicit-any
 function isFormLayoutConfig(arg) {
     return arg.type !== undefined && ["fieldSet", "optionalNestedFields"].includes(arg.type);
 }
-exports.isFormLayoutConfig = isFormLayoutConfig;
 /**
  * @experimental
  */
-function runGenerate(filePattern = "src/**/*.cometGen.ts") {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
+function runGenerate() {
+    return __awaiter(this, arguments, void 0, function* (filePattern = "src/**/*.cometGen.{ts,tsx}") {
         const schema = yield (0, load_1.loadSchema)("./schema.gql", {
             loaders: [new graphql_file_loader_1.GraphQLFileLoader()],
         });
@@ -68,10 +43,10 @@ function runGenerate(filePattern = "src/**/*.cometGen.ts") {
             let outputCode = "";
             let gqlDocumentsOutputCode = "";
             const targetDirectory = `${(0, path_1.dirname)(file)}/generated`;
-            const baseOutputFilename = (0, path_1.basename)(file).replace(/\.cometGen\.ts$/, "");
-            const configs = yield (_a = `${process.cwd()}/${file.replace(/\.ts$/, "")}`, Promise.resolve().then(() => __importStar(require(_a))));
-            //const configs = await import(`${process.cwd()}/${file}`);
-            const codeOuputFilename = `${targetDirectory}/${(0, path_1.basename)(file.replace(/\.cometGen\.ts$/, ""))}.tsx`;
+            const baseOutputFilename = (0, path_1.basename)(file).replace(/\.cometGen\.tsx?$/, "");
+            const configs = (0, tsMorphHelper_1.configsFromSourceFile)((0, tsMorphHelper_1.morphTsSource)(file));
+            //const configs = await import(`${process.cwd()}/${file.replace(/\.ts$/, "")}`);
+            const codeOuputFilename = `${targetDirectory}/${(0, path_1.basename)(file.replace(/\.cometGen\.tsx?$/, ""))}.tsx`;
             yield fs_1.promises.rm(codeOuputFilename, { force: true });
             console.log(`generating ${file}`);
             for (const exportName in configs) {
@@ -94,7 +69,7 @@ function runGenerate(filePattern = "src/**/*.cometGen.ts") {
             }
             yield (0, writeGenerated_1.writeGenerated)(codeOuputFilename, outputCode);
             if (gqlDocumentsOutputCode != "") {
-                const gqlDocumentsOuputFilename = `${targetDirectory}/${(0, path_1.basename)(file.replace(/\.cometGen\.ts$/, ""))}.gql.tsx`;
+                const gqlDocumentsOuputFilename = `${targetDirectory}/${(0, path_1.basename)(file.replace(/\.cometGen\.tsx?$/, ""))}.gql.tsx`;
                 yield fs_1.promises.rm(gqlDocumentsOuputFilename, { force: true });
                 gqlDocumentsOutputCode = `import { gql } from "@apollo/client";
                 import { finalFormFileUploadFragment, finalFormFileUploadDownloadableFragment } from "@comet/cms-admin";
@@ -108,7 +83,7 @@ function runGenerate(filePattern = "src/**/*.cometGen.ts") {
 }
 exports.generateCommand = new commander_1.Command("generate")
     .option("-f, --file <file>", "path to config file or glob pattern to generate specific files")
-    .action(({ file: filePattern }) => __awaiter(void 0, void 0, void 0, function* () {
+    .action((_a) => __awaiter(void 0, [_a], void 0, function* ({ file: filePattern }) {
     console.log("️️️⚠️️️⚠️️️⚠️️️  Admin Generator is still experimental and in beta phase.  ⚠️️️⚠️️️⚠️️️\n\n");
     yield runGenerate(filePattern);
 }));

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

@@ -1,8 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateComponentFormField = void 0;
+exports.generateComponentFormField = generateComponentFormField;
+const convertConfigImport_1 = require("../utils/convertConfigImport");
+const runtimeTypeGuards_1 = require("../utils/runtimeTypeGuards");
 function generateComponentFormField({ config }) {
-    const imports = [{ name: config.component.name, importPath: config.component.import }];
+    if (!(0, runtimeTypeGuards_1.isGeneratorConfigImport)(config.component)) {
+        throw new Error("config.component must be a GeneratorConfigImport");
+    }
+    const imports = [(0, convertConfigImport_1.convertConfigImport)(config.component)];
     const code = `<${config.component.name} />`;
     return {
         imports,
@@ -15,4 +20,3 @@ function generateComponentFormField({ config }) {
         gqlDocuments: {},
     };
 }
-exports.generateComponentFormField = generateComponentFormField;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateFields = exports.findFieldByName = void 0;
+exports.findFieldByName = findFieldByName;
+exports.generateFields = generateFields;
 const generate_command_1 = require("../generate-command");
 const generateComponentFormField_1 = require("./generateComponentFormField");
 const generateFormField_1 = require("./generateFormField");
@@ -18,7 +19,6 @@ function findFieldByName(name, fields) {
                     : undefined;
     }, undefined);
 }
-exports.findFieldByName = findFieldByName;
 function generateFields({ gqlIntrospection, baseOutputFilename, fields, formFragmentName, formConfig, gqlType, namePrefix, }) {
     const gqlDocuments = {};
     let hooksCode = "";
@@ -85,4 +85,3 @@ function generateFields({ gqlIntrospection, baseOutputFilename, fields, formFrag
         finalFormConfig,
     };
 }
-exports.generateFields = generateFields;

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

@@ -11,10 +11,12 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateForm = void 0;
+exports.generateForm = generateForm;
 const generate_command_1 = require("../generate-command");
+const convertConfigImport_1 = require("../utils/convertConfigImport");
 const findMutationType_1 = require("../utils/findMutationType");
 const generateImportsCode_1 = require("../utils/generateImportsCode");
+const runtimeTypeGuards_1 = require("../utils/runtimeTypeGuards");
 const generateFields_1 = require("./generateFields");
 const getForwardedGqlArgs_1 = require("./getForwardedGqlArgs");
 function generateFormPropsCode(props) {
@@ -96,10 +98,9 @@ config) {
         return field;
     });
     rootBlockFields.forEach((field) => {
-        imports.push({
-            name: field.block.name,
-            importPath: field.block.import,
-        });
+        if ((0, runtimeTypeGuards_1.isGeneratorConfigImport)(field.block)) {
+            imports.push((0, convertConfigImport_1.convertConfigImport)(field.block));
+        }
     });
     const readOnlyFields = formFields.filter((field) => field.readOnly);
     const fileFields = formFields.filter((field) => field.type == "fileUpload");
@@ -440,7 +441,6 @@ config) {
         gqlDocuments,
     };
 }
-exports.generateForm = generateForm;
 /**
  * Checks if the provided form config is valid.
  *

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

@@ -11,11 +11,13 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateFormField = void 0;
+exports.generateFormField = generateFormField;
 const generate_command_1 = require("../generate-command");
 const camelCaseToHumanReadable_1 = require("../utils/camelCaseToHumanReadable");
+const convertConfigImport_1 = require("../utils/convertConfigImport");
 const findQueryType_1 = require("../utils/findQueryType");
 const isFieldOptional_1 = require("../utils/isFieldOptional");
+const runtimeTypeGuards_1 = require("../utils/runtimeTypeGuards");
 const generateFields_1 = require("./generateFields");
 const getAdornmentData = ({ adornmentData }) => {
     let adornmentString = "";
@@ -31,12 +33,9 @@ const getAdornmentData = ({ adornmentData }) => {
         };
     }
     else if (typeof adornmentData.icon === "object") {
-        if ("import" in adornmentData.icon) {
+        if ((0, runtimeTypeGuards_1.isGeneratorConfigImport)(adornmentData.icon)) {
             adornmentString = `<${adornmentData.icon.name} />`;
-            adornmentImport = {
-                name: `${adornmentData.icon.name}`,
-                importPath: `${adornmentData.icon.import}`,
-            };
+            adornmentImport = (0, convertConfigImport_1.convertConfigImport)(adornmentData.icon);
         }
         else {
             const _a = adornmentData.icon, { name } = _a, iconProps = __rest(_a, ["name"]);
@@ -109,16 +108,14 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
     let finalFormConfig;
     let validateCode = "";
     if (config.validate) {
-        let importPath = config.validate.import;
-        if (importPath.startsWith("./")) {
-            //go one level up as generated files are in generated subfolder
-            importPath = `.${importPath}`;
+        if ((0, runtimeTypeGuards_1.isGeneratorConfigImport)(config.validate)) {
+            imports.push((0, convertConfigImport_1.convertConfigImport)(config.validate));
+            validateCode = `validate={${config.validate.name}}`;
+        }
+        else if ((0, runtimeTypeGuards_1.isGeneratorConfigCode)(config.validate)) {
+            validateCode = `validate={${config.validate.code}}`;
+            imports.push(...config.validate.imports.map((imprt) => (0, convertConfigImport_1.convertConfigImport)(imprt)));
         }
-        imports.push({
-            name: config.validate.name,
-            importPath,
-        });
-        validateCode = `validate={${config.validate.name}}`;
     }
     const fieldLabel = `<FormattedMessage id="${formattedMessageRootId}.${name}" defaultMessage="${label}" />`;
     let startAdornment = { adornmentString: "" };
@@ -522,4 +519,3 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
         finalFormConfig,
     };
 }
-exports.generateFormField = generateFormField;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateFormLayout = void 0;
+exports.generateFormLayout = generateFormLayout;
 const camelCaseToHumanReadable_1 = require("../utils/camelCaseToHumanReadable");
 const generateFields_1 = require("./generateFields");
 function generateFormLayout({ gqlIntrospection, baseOutputFilename, config, formFragmentName, formConfig, gqlType, namePrefix, }) {
@@ -161,4 +161,3 @@ function generateFormLayout({ gqlIntrospection, baseOutputFilename, config, form
         finalFormConfig,
     };
 }
-exports.generateFormLayout = generateFormLayout;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getForwardedGqlArgs = void 0;
+exports.getForwardedGqlArgs = getForwardedGqlArgs;
 function getForwardedGqlArgs({ fields, gqlOperation, gqlIntrospection, }) {
     const imports = [];
     const props = [];
@@ -33,7 +33,6 @@ function getForwardedGqlArgs({ fields, gqlOperation, gqlIntrospection, }) {
         gqlArgs,
     };
 }
-exports.getForwardedGqlArgs = getForwardedGqlArgs;
 function getArgsIncludingInputArgSubfields(gqlOperation, gqlIntrospection) {
     const nativeScalars = ["ID", "String", "Boolean", "Int", "Float", "DateTime", "JSONObject"];
     // reducer is not created inline to reuse it to look into "input" arg

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findInputObjectType = void 0;
+exports.findInputObjectType = findInputObjectType;
 function findInputObjectType(input, schema) {
     let type = input.type;
     if (type.kind == "NON_NULL") {
@@ -13,4 +13,3 @@ function findInputObjectType(input, schema) {
     const filterType = schema.__schema.types.find((type) => type.kind === "INPUT_OBJECT" && type.name === typeName);
     return filterType;
 }
-exports.findInputObjectType = findInputObjectType;

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

@@ -1,5 +1,4 @@
-import { type ActionsGridColumnConfig, type GridColumnConfig } from "../generate-command";
-import { type GridCombinationColumnConfig } from "./combinationColumn";
+import { type ActionsGridColumnConfig, type GridColumnConfig, type VirtualGridColumnConfig } from "../generate-command";
 export declare function generateGqlFieldList({ columns, }: {
-    columns: Array<GridColumnConfig<any> | GridCombinationColumnConfig<string> | ActionsGridColumnConfig>;
+    columns: Array<GridColumnConfig<any> | ActionsGridColumnConfig | VirtualGridColumnConfig<any>>;
 }): string;

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

@@ -3,9 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateGqlFieldList = void 0;
+exports.generateGqlFieldList = generateGqlFieldList;
 const object_path_1 = __importDefault(require("object-path"));
-const combinationColumn_1 = require("./combinationColumn");
 const recursiveStringify = (obj) => {
     let ret = "";
     let prefixField = "";
@@ -26,10 +25,11 @@ const recursiveStringify = (obj) => {
 };
 function generateGqlFieldList({ columns, }) {
     const fieldsObject = columns.reduce((acc, field) => {
+        var _a;
         if (field.type !== "actions") {
-            if (field.type === "combination") {
-                (0, combinationColumn_1.getAllColumnFieldNames)(field).map((fieldName) => {
-                    object_path_1.default.set(acc, fieldName, true);
+            if (field.type === "virtual") {
+                (_a = field.queryFields) === null || _a === void 0 ? void 0 : _a.map((queryField) => {
+                    object_path_1.default.set(acc, queryField, true);
                 });
             }
             else {
@@ -40,4 +40,3 @@ function generateGqlFieldList({ columns, }) {
     }, {});
     return recursiveStringify(fieldsObject);
 }
-exports.generateGqlFieldList = generateGqlFieldList;

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

@@ -11,14 +11,15 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateGrid = void 0;
+exports.generateGrid = generateGrid;
 const pluralize_1 = require("pluralize");
 const camelCaseToHumanReadable_1 = require("../utils/camelCaseToHumanReadable");
+const convertConfigImport_1 = require("../utils/convertConfigImport");
 const findMutationType_1 = require("../utils/findMutationType");
 const findQueryType_1 = require("../utils/findQueryType");
 const findRootBlocks_1 = require("../utils/findRootBlocks");
 const generateImportsCode_1 = require("../utils/generateImportsCode");
-const combinationColumn_1 = require("./combinationColumn");
+const runtimeTypeGuards_1 = require("../utils/runtimeTypeGuards");
 const findInputObjectType_1 = require("./findInputObjectType");
 const generateGqlFieldList_1 = require("./generateGqlFieldList");
 const generateGridToolbar_1 = require("./generateGridToolbar");
@@ -113,9 +114,7 @@ const getValueOptionsLabelData = (messageId, label) => {
         gridCellContent,
     };
 };
-function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntrospection, }, 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-config) {
+function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntrospection, }, config) {
     var _a, _b;
     const gqlType = config.gqlType;
     const gqlTypePlural = (0, pluralize_1.plural)(gqlType);
@@ -148,15 +147,17 @@ config) {
     rootBlockColumns.forEach((field) => {
         if (rootBlocks[String(field.name)]) {
             // update rootBlocks if they are also used in columns
-            rootBlocks[String(field.name)].import = field.block.import;
-            rootBlocks[String(field.name)].name = field.block.name;
+            const block = field.block;
+            if ((0, runtimeTypeGuards_1.isGeneratorConfigImport)(block)) {
+                rootBlocks[String(field.name)].import = block.import;
+                rootBlocks[String(field.name)].name = block.name;
+            }
         }
     });
     Object.values(rootBlocks).forEach((block) => {
-        imports.push({
-            name: block.name,
-            importPath: block.import,
-        });
+        if ((0, runtimeTypeGuards_1.isGeneratorConfigImport)(block)) {
+            imports.push((0, convertConfigImport_1.convertConfigImport)(block));
+        }
     });
     const gridQueryType = (0, findQueryType_1.findQueryTypeOrThrow)(gridQuery, gqlIntrospection);
     const createMutationType = (0, findMutationType_1.findMutationType)(`create${gqlType}`, gqlIntrospection);
@@ -247,6 +248,12 @@ config) {
     });
     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"]);
+    if (actionsColumnComponent) {
+        if (!(0, runtimeTypeGuards_1.isGeneratorConfigImport)(actionsColumnComponent)) {
+            throw new Error("Unsupported actionsColumnComponent, only imports are supported");
+        }
+        imports.push((0, convertConfigImport_1.convertConfigImport)(actionsColumnComponent));
+    }
     const gridNeedsTheme = config.columns.some((column) => typeof column.visible === "string");
     const gridColumnFields = config.columns.filter((column) => column.type !== "actions").map((column) => {
         var _a;
@@ -257,17 +264,14 @@ config) {
         let valueFormatter = undefined;
         let gridType;
         let filterOperators;
-        if (column.filterOperators) {
-            let importPath = column.filterOperators.import;
-            if (importPath.startsWith("./")) {
-                //go one level up as generated files are in generated subfolder
-                importPath = `.${importPath}`;
+        if (column.type != "virtual" && column.filterOperators) {
+            if ((0, runtimeTypeGuards_1.isGeneratorConfigImport)(column.filterOperators)) {
+                imports.push((0, convertConfigImport_1.convertConfigImport)(column.filterOperators));
+                filterOperators = column.filterOperators.name;
+            }
+            else {
+                throw new Error("Unsupported filterOperators, only imports are supported for now");
             }
-            imports.push({
-                name: column.filterOperators.name,
-                importPath,
-            });
-            filterOperators = column.filterOperators.name;
         }
         if (type == "dateTime") {
             gridColumnType = "...dataGridDateTimeColumn,";
@@ -301,11 +305,8 @@ config) {
                         iconsToImport.push(value.label.icon);
                     }
                     else if (typeof ((_a = value.label.icon) === null || _a === void 0 ? void 0 : _a.name) === "string") {
-                        if ("import" in value.label.icon) {
-                            imports.push({
-                                name: value.label.icon.name,
-                                importPath: value.label.icon.import,
-                            });
+                        if ((0, runtimeTypeGuards_1.isGeneratorConfigImport)(value.label.icon)) {
+                            imports.push((0, convertConfigImport_1.convertConfigImport)(value.label.icon));
                         }
                         else {
                             iconsToImport.push(value.label.icon.name);
@@ -364,8 +365,20 @@ config) {
                 disableExport: column.disableExport,
             };
         }
-        else if (type == "combination") {
-            renderCell = (0, combinationColumn_1.getCombinationColumnRenderCell)(column, `${instanceGqlType}.${name}`);
+        if ((column.type == "text" ||
+            column.type == "number" ||
+            column.type == "boolean" ||
+            column.type == "date" ||
+            column.type == "dateTime" ||
+            column.type == "virtual") &&
+            column.renderCell) {
+            if ((0, runtimeTypeGuards_1.isGeneratorConfigCode)(column.renderCell)) {
+                renderCell = column.renderCell.code;
+                imports.push(...column.renderCell.imports.map((imprt) => (0, convertConfigImport_1.convertConfigImport)(imprt)));
+            }
+            else {
+                throw new Error(`Unsupported renderCell for column '${name}', only arrow functions are supported`);
+            }
         }
         //TODO support n:1 relation with singleSelect
         return {
@@ -501,11 +514,6 @@ config) {
     import { FormattedMessage, FormattedNumber, useIntl } from "react-intl";
     ${(0, generateImportsCode_1.generateImportsCode)(imports)}
 
-    ${Object.entries(rootBlocks)
-        .map(([rootBlockKey, rootBlock]) => `import { ${rootBlock.name} } from "${rootBlock.import}";`)
-        .join("\n")}
-    ${actionsColumnComponent ? `import { ${actionsColumnComponent.name} } from "${actionsColumnComponent.import}";` : ""}
-
     const ${instanceGqlTypePlural}Fragment = gql\`
         fragment ${fragmentName} on ${gqlType} {
             id
@@ -615,7 +623,7 @@ config) {
             }
         }
         const columnDefinition = {
-            field: column.fieldName ? `"${column.fieldName}"` : `"${column.name.replace(/\./g, "_")}"`,
+            field: column.fieldName ? `"${column.fieldName}"` : `"${column.name.replace(/\./g, "_")}"`, // field-name is used for api-filter, and api nests with underscore
             renderHeader: column.headerInfoTooltip
                 ? `() => (
                                     <>
@@ -783,7 +791,6 @@ config) {
         gqlDocuments,
     };
 }
-exports.generateGrid = generateGrid;
 const getDefaultActionsColumnWidth = (showCrudContextMenu, showEdit) => {
     let numberOfActions = 0;
     if (showCrudContextMenu) {

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getForwardedGqlArgs = void 0;
+exports.getForwardedGqlArgs = getForwardedGqlArgs;
 function getForwardedGqlArgs(gqlFields) {
     const supportedGqlArgs = ["offset", "limit", "sort", "search", "filter", "scope", "input"]; // this arguments need to be handled differently or are already handled somewhere else
     const imports = [];
@@ -31,7 +31,6 @@ function getForwardedGqlArgs(gqlFields) {
         gqlArgs,
     };
 }
-exports.getForwardedGqlArgs = getForwardedGqlArgs;
 function getArgs(gqlFields, skipGqlArgs) {
     return gqlFields.reduce((acc, gqlField) => {
         gqlField.args.forEach((gqlArg) => {

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPropsForFilterProp = void 0;
+exports.getPropsForFilterProp = getPropsForFilterProp;
 function getPropsForFilterProp({ config, filterType, }) {
     if (!config.filterProp)
         return { hasFilterProp: false, imports: [], props: [] };
@@ -11,4 +11,3 @@ function getPropsForFilterProp({ config, filterType, }) {
         props: [{ name: "filter", optional: true, type: filterTypeName }],
     };
 }
-exports.getPropsForFilterProp = getPropsForFilterProp;

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

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.camelCaseToHumanReadable = void 0;
+exports.camelCaseToHumanReadable = camelCaseToHumanReadable;
 const change_case_1 = require("change-case");
 function camelCaseToHumanReadable(s) {
     return (0, change_case_1.capitalCase)(s);
 }
-exports.camelCaseToHumanReadable = camelCaseToHumanReadable;

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

@@ -0,0 +1,5 @@
+import { type Imports } from "./generateImportsCode";
+export declare function convertConfigImport(imprt: {
+    name: string;
+    import: string;
+}): Imports[0];