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

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

@@ -40,6 +40,7 @@ export type FormFieldConfig<T> = (({
     multiline?: boolean;
 } & InputBaseFieldConfig) | ({
     type: "number";
+    decimals?: number;
 } & InputBaseFieldConfig) | ({
     type: "numberRange";
     minValue: number;
@@ -105,11 +106,13 @@ export type FormConfig<T extends {
     createMutation?: string;
     fields: (FormFieldConfig<T> | FormLayoutConfig<T> | ComponentFormFieldConfig)[];
 };
-type TabsConfig = {
+type TabsConfig<T extends {
+    __typename?: string;
+}> = {
     type: "tabs";
     tabs: {
         name: string;
-        content: GeneratorConfig;
+        content: GeneratorConfig<T>;
     }[];
 };
 type BaseColumnConfig = Pick<GridColDef, "headerName" | "width" | "minWidth" | "maxWidth" | "flex" | "pinned" | "disableExport"> & {
@@ -157,7 +160,7 @@ export type ActionsGridColumnConfig = {
 export type VirtualGridColumnConfig<T extends GridValidRowModel> = {
     type: "virtual";
     name: string;
-    queryFields?: UsableFields<T>[];
+    queryFields?: UsableFields<T, true>[];
     renderCell: (params: GridRenderCellParams<T, any, any>) => JSX.Element;
 } & Pick<GridColDef, "sortBy"> & BaseColumnConfig;
 type InitialFilterConfig = {
@@ -191,7 +194,12 @@ export type GridConfig<T extends {
     rowActionProp?: boolean;
     selectionProps?: "multiSelect" | "singleSelect";
 };
-export type GeneratorConfig = FormConfig<any> | GridConfig<any> | TabsConfig;
+export type GeneratorConfig<T extends {
+    __typename?: string;
+}> = FormConfig<T> | GridConfig<T> | TabsConfig<T>;
+export declare function defineConfig<T extends {
+    __typename?: string;
+}>(config: GeneratorConfig<T>): GeneratorConfig<T>;
 type GQLDocumentConfig = {
     document: string;
     export: boolean;

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

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateCommand = void 0;
 exports.isFormFieldConfig = isFormFieldConfig;
 exports.isFormLayoutConfig = isFormLayoutConfig;
+exports.defineConfig = defineConfig;
 const graphql_file_loader_1 = require("@graphql-tools/graphql-file-loader");
 const load_1 = require("@graphql-tools/load");
 const commander_1 = require("commander");
@@ -29,11 +30,15 @@ function isFormFieldConfig(arg) {
 function isFormLayoutConfig(arg) {
     return arg.type !== undefined && ["fieldSet", "optionalNestedFields"].includes(arg.type);
 }
+function defineConfig(config) {
+    return config;
+}
 /**
  * @experimental
  */
 function runGenerate() {
     return __awaiter(this, arguments, void 0, function* (filePattern = "src/**/*.cometGen.{ts,tsx}") {
+        var _a;
         const schema = yield (0, load_1.loadSchema)("./schema.gql", {
             loaders: [new graphql_file_loader_1.GraphQLFileLoader()],
         });
@@ -44,28 +49,28 @@ function runGenerate() {
             let gqlDocumentsOutputCode = "";
             const targetDirectory = `${(0, path_1.dirname)(file)}/generated`;
             const baseOutputFilename = (0, path_1.basename)(file).replace(/\.cometGen\.tsx?$/, "");
-            const configs = (0, tsMorphHelper_1.configsFromSourceFile)((0, tsMorphHelper_1.morphTsSource)(file));
+            console.log(`generating ${file}`);
+            const config = (0, tsMorphHelper_1.configFromSourceFile)((0, tsMorphHelper_1.morphTsSource)(file));
+            const exportName = (_a = file.match(/([^/]+)\.cometGen\.tsx?$/)) === null || _a === void 0 ? void 0 : _a[1];
+            if (!exportName)
+                throw new Error("Can not determine exportName");
             //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) {
-                const config = configs[exportName];
-                let generated;
-                if (config.type == "form") {
-                    generated = (0, generateForm_1.generateForm)({ exportName, gqlIntrospection, baseOutputFilename, targetDirectory }, config);
-                }
-                else if (config.type == "grid") {
-                    generated = (0, generateGrid_1.generateGrid)({ exportName, gqlIntrospection, baseOutputFilename, targetDirectory }, config);
-                }
-                else {
-                    throw new Error(`Unknown config type: ${config.type}`);
-                }
-                outputCode += generated.code;
-                for (const queryName in generated.gqlDocuments) {
-                    const exportStatement = generated.gqlDocuments[queryName].export ? "export " : "";
-                    gqlDocumentsOutputCode += `${exportStatement} const ${queryName} = gql\`${generated.gqlDocuments[queryName].document}\`\n`;
-                }
+            let generated;
+            if (config.type == "form") {
+                generated = (0, generateForm_1.generateForm)({ exportName, gqlIntrospection, baseOutputFilename, targetDirectory }, config);
+            }
+            else if (config.type == "grid") {
+                generated = (0, generateGrid_1.generateGrid)({ exportName, gqlIntrospection, baseOutputFilename, targetDirectory }, config);
+            }
+            else {
+                throw new Error(`Unknown config type: ${config.type}`);
+            }
+            outputCode += generated.code;
+            for (const queryName in generated.gqlDocuments) {
+                const exportStatement = generated.gqlDocuments[queryName].export ? "export " : "";
+                gqlDocumentsOutputCode += `${exportStatement} const ${queryName} = gql\`${generated.gqlDocuments[queryName].document}\`\n`;
             }
             yield (0, writeGenerated_1.writeGenerated)(codeOuputFilename, outputCode);
             if (gqlDocumentsOutputCode != "") {

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

@@ -260,6 +260,7 @@ config) {
         FinalFormSelect,
         FinalFormSubmitEvent,
         Loading,
+        NumberField,
         RadioGroupField,
         TextAreaField,
         TextField,

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

@@ -158,18 +158,20 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
             : ""}
             ${validateCode}
         />`;
+        if (!config.virtual && !required && !config.readOnly) {
+            formValueToGqlInputCode = `${name}: formValues.${name} ?? "",`;
+        }
     }
     else if (config.type == "number") {
         code = `
-            <Field
+            <NumberField
                 ${required ? "required" : ""}
                 ${config.readOnly ? readOnlyPropsWithLock : ""}
                 variant="horizontal"
                 fullWidth
                 name="${nameWithPrefix}"
-                component={FinalFormInput}
-                type="number"
                 label={${fieldLabel}}
+                ${config.decimals ? `decimals={${config.decimals}}` : ""}
                 ${config.startAdornment ? `startAdornment={<InputAdornment position="start">${startAdornment.adornmentString}</InputAdornment>}` : ""}
                 ${config.endAdornment ? `endAdornment={<InputAdornment position="end">${endAdornment.adornmentString}</InputAdornment>}` : ""}
                 ${config.helperText
@@ -462,7 +464,14 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
             imports.push({ name: "OnChangeField", importPath: "@comet/admin" });
             finalFormConfig = { subscription: { values: true }, renderProps: { values: true, form: true } };
         }
-        formValueToGqlInputCode = !config.virtual ? `${name}: formValues.${name}?.id,` : ``;
+        if (!config.virtual) {
+            if (!required) {
+                formValueToGqlInputCode = `${name}: formValues.${name} ? formValues.${name}.id : null,`;
+            }
+            else {
+                formValueToGqlInputCode = `${name}: formValues.${name}?.id,`;
+            }
+        }
         imports.push({
             name: `GQL${queryName}Query`,
             importPath: `./${baseOutputFilename}.generated`,

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

@@ -487,9 +487,7 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
         muiGridFilterToGql,
         muiGridSortToGql,
         StackLink,
-        ToolbarActions,
         FillSpace,
-        ToolbarItem,
         Tooltip,
         useBufferedRowCount,
         useDataGridExcelExport,

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) {
@@ -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/tsMorphHelper.d.ts

@@ -1,4 +1,4 @@
 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>;
+export declare function configFromSourceFile(sourceFile: SourceFile): GeneratorConfig<any>;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.morphTsSource = morphTsSource;
-exports.configsFromSourceFile = configsFromSourceFile;
+exports.configFromSourceFile = configFromSourceFile;
 const ts_morph_1 = require("ts-morph");
 const project = new ts_morph_1.Project({
     tsConfigFilePath: "tsconfig.json",
@@ -29,18 +29,22 @@ const supportedInlineCodePaths = [
     //support in up to 5 levels of nested fields (eg. fieldSet)
     ...Array.from(Array(5).keys()).map((i) => `[type=form]${".fields".repeat(i + 1)}.validate`),
 ];
-function configsFromSourceFile(sourceFile) {
-    const configs = {}; //GeneratorConfig is not fully correct (runtime vs config mismatch), we work around that using type guards
+function configFromSourceFile(sourceFile) {
     for (const [name, declarations] of Array.from(sourceFile.getExportedDeclarations().entries())) {
-        //console.log(name);
-        if (declarations.length != 1) {
-            throw new Error(`Expected exactly one declaration for ${name}`);
+        if (name == "default") {
+            if (declarations.length != 1) {
+                throw new Error(`Expected exactly one declaration for ${name}`);
+            }
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const config = exportedDeclarationToJson(declarations[0]);
+            //console.dir(config, { depth: 10 });
+            return config;
+        }
+        else {
+            //ignore this export
         }
-        const config = exportedDeclarationToJson(declarations[0]);
-        //console.dir(config, { depth: 10 });
-        configs[name] = config;
     }
-    return configs;
+    throw new Error(`No default export found, please export the GeneratorConfig as default, preferrable using defineConfig helper.`);
 }
 function findUsedImports(node) {
     const imports = [];
@@ -80,7 +84,7 @@ function getTypePropertyFromObjectLiteral(node) {
     return null;
 }
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-function astExpressionToJson(node, path) {
+function astNodeToJson(node, path) {
     var _a;
     if (node.getKind() == ts_morph_1.SyntaxKind.ObjectLiteralExpression) {
         if (path == "") {
@@ -94,7 +98,7 @@ function astExpressionToJson(node, path) {
                 const propertyAssignment = property;
                 const propertyAssignmentInitializer = propertyAssignment.getInitializer();
                 if (propertyAssignmentInitializer) {
-                    ret[propertyAssignment.getName()] = astExpressionToJson(propertyAssignmentInitializer, `${path}.${propertyAssignment.getName()}`);
+                    ret[propertyAssignment.getName()] = astNodeToJson(propertyAssignmentInitializer, `${path}.${propertyAssignment.getName()}`);
                 }
                 else {
                     throw new Error(`Initializer is required for propertyAssignment '${propertyAssignment.getName()}'`);
@@ -137,7 +141,7 @@ function astExpressionToJson(node, path) {
     else if (node.getKind() == ts_morph_1.SyntaxKind.ArrayLiteralExpression) {
         const ret = [];
         for (const element of node.getElements()) {
-            ret.push(astExpressionToJson(element, path));
+            ret.push(astNodeToJson(element, path));
         }
         return ret;
     }
@@ -166,7 +170,7 @@ function astExpressionToJson(node, path) {
                     if (variableDeclaration.getName() == node.getText()) {
                         const variableInitializer = variableDeclaration.getInitializer();
                         if (variableInitializer) {
-                            return astExpressionToJson(variableInitializer, path);
+                            return astNodeToJson(variableInitializer, path);
                         }
                         else {
                             throw new Error(`Initializer is required for variableDeclaration '${variableDeclaration.getName()}'`);
@@ -187,12 +191,25 @@ function exportedDeclarationToJson(node) {
         const variableDeclaration = node;
         const initializer = variableDeclaration.getInitializer();
         if (initializer) {
-            return astExpressionToJson(initializer, "");
+            return astNodeToJson(initializer, "");
         }
         else {
             throw new Error(`Initializer is required for variableDeclaration '${variableDeclaration.getName()}'`);
         }
     }
+    else if (node.getKind() == ts_morph_1.SyntaxKind.CallExpression) {
+        const callExpression = node;
+        if (callExpression.getExpression().getText() == "defineConfig") {
+            const args = callExpression.getArguments();
+            if (args.length != 1) {
+                throw new Error(`Expected exactly one argument for defineConfig`);
+            }
+            return astNodeToJson(args[0], "");
+        }
+        else {
+            throw new Error(`Only direct call to defineConfig is supported`);
+        }
+    }
     else {
         throw new Error(`Unsupported declaration kind '${node.getKindName()}'`);
     }

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.2",
+  "version": "8.0.0-beta.4",
   "repository": {
     "directory": "packages/admin/admin-generator",
     "type": "git",
@@ -30,27 +30,27 @@
     "ts-node": "^10.9.2"
   },
   "devDependencies": {
-    "@mui/material": "^6.4.8",
-    "@mui/x-data-grid": "^7.27.3",
+    "@mui/material": "^7.0.0",
+    "@mui/x-data-grid": "^7.28.1",
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.13.10",
+    "@types/node": "^22.14.0",
     "@types/object-path": "^0.11.4",
     "@types/pluralize": "^0.0.33",
-    "@types/react": "^18.3.18",
+    "@types/react": "^18.3.20",
     "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.2",
-    "@comet/admin-icons": "8.0.0-beta.2",
-    "@comet/cms-admin": "8.0.0-beta.2",
-    "@comet/eslint-config": "8.0.0-beta.2"
+    "@comet/admin": "8.0.0-beta.4",
+    "@comet/admin-icons": "8.0.0-beta.4",
+    "@comet/cms-admin": "8.0.0-beta.4",
+    "@comet/eslint-config": "8.0.0-beta.4"
   },
   "engines": {
     "node": ">=22.0.0"