@comet/admin-generator 8.8.0-canary-20251120114500 → 8.8.0-canary-20251120141652

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

@@ -0,0 +1,5 @@
+export declare function detectMuiXGridVariant(): {
+    variant: "community" | "pro" | "premium";
+    package: string;
+    gridComponent: string;
+};

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

@@ -0,0 +1,32 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.detectMuiXGridVariant = detectMuiXGridVariant;
+const fs_1 = __importDefault(require("fs"));
+function detectMuiXGridVariant() {
+    const packageJson = JSON.parse(fs_1.default.readFileSync("package.json", "utf-8"));
+    const packages = Object.keys(packageJson.dependencies);
+    if (packages.includes("@mui/x-data-grid-premium")) {
+        return {
+            variant: "premium",
+            package: "@mui/x-data-grid-premium",
+            gridComponent: "DataGridPremium",
+        };
+    }
+    else if (packages.includes("@mui/x-data-grid-pro")) {
+        return {
+            variant: "pro",
+            package: "@mui/x-data-grid-pro",
+            gridComponent: "DataGridPro",
+        };
+    }
+    else {
+        return {
+            variant: "community",
+            package: "@mui/x-data-grid",
+            gridComponent: "DataGrid",
+        };
+    }
+}

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

@@ -21,6 +21,7 @@ const findRootBlocks_1 = require("../utils/findRootBlocks");
 const generateGqlOperation_1 = require("../utils/generateGqlOperation");
 const generateImportsCode_1 = require("../utils/generateImportsCode");
 const runtimeTypeGuards_1 = require("../utils/runtimeTypeGuards");
+const detectMuiXVersion_1 = require("./detectMuiXVersion");
 const findInputObjectType_1 = require("./findInputObjectType");
 const generateGqlFieldList_1 = require("./generateGqlFieldList");
 const generateGridToolbar_1 = require("./generateGridToolbar");
@@ -121,6 +122,7 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
     if (!gqlType) {
         throw new Error("gqlType is required in grid config");
     }
+    const muiXGridVariant = (0, detectMuiXVersion_1.detectMuiXGridVariant)();
     const gqlTypePlural = (0, pluralize_1.plural)(gqlType);
     //const title = config.title ?? camelCaseToHumanReadable(gqlType);
     const instanceGqlType = gqlType[0].toLowerCase() + gqlType.substring(1);
@@ -171,14 +173,15 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
         { 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" },
+        { name: muiXGridVariant.gridComponent, importPath: muiXGridVariant.package },
+        { name: `${muiXGridVariant.gridComponent}Props`, importPath: muiXGridVariant.package },
+        { name: "GridLogicOperator", importPath: muiXGridVariant.package },
+        { name: "GridRenderCellParams", importPath: muiXGridVariant.package },
+        { name: "GridSlotsComponent", importPath: muiXGridVariant.package },
+        { name: "GridToolbarProps", importPath: muiXGridVariant.package },
+        { name: "GridColumnHeaderTitle", importPath: muiXGridVariant.package },
+        { name: "GridToolbarQuickFilter", importPath: muiXGridVariant.package },
+        { name: "GridRowOrderChangeParams", importPath: muiXGridVariant.package },
         { name: "useMemo", importPath: "react" },
     ];
     const iconsToImport = ["Add", "Edit", "Info", "Excel"];
@@ -519,15 +522,14 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
         });
     }
     if (config.selectionProps) {
-        imports.push({ name: "DataGridProProps", importPath: "@mui/x-data-grid-pro" });
         props.push({
             name: "rowSelectionModel",
-            type: `DataGridProProps["rowSelectionModel"]`,
+            type: `${muiXGridVariant.gridComponent}Props["rowSelectionModel"]`,
             optional: true,
         });
         props.push({
             name: "onRowSelectionModelChange",
-            type: `DataGridProProps["onRowSelectionModelChange"]`,
+            type: `${muiXGridVariant.gridComponent}Props["onRowSelectionModelChange"]`,
             optional: true,
         });
     }
@@ -784,7 +786,7 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
         ${generateGridExportApi(config.excelExport, gqlTypePlural, instanceGqlTypePlural, gridQuery, gqlArgs)}
 
         return (
-            <DataGridPro
+            <${muiXGridVariant.gridComponent}
                 {...dataGridProps}
                 rows={rows}
                 rowCount={rowCount}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comet/admin-generator",
-  "version": "8.8.0-canary-20251120114500",
+  "version": "8.8.0-canary-20251120141652",
   "description": "Comet Admin Generator CLI tool",
   "repository": {
     "directory": "packages/admin/admin-generator",
@@ -48,10 +48,10 @@
     "rimraf": "^6.0.1",
     "ts-jest": "^29.4.0",
     "typescript": "5.9.3",
-    "@comet/admin": "8.8.0-canary-20251120114500",
-    "@comet/admin-icons": "8.8.0-canary-20251120114500",
-    "@comet/cms-admin": "8.8.0-canary-20251120114500",
-    "@comet/eslint-config": "8.8.0-canary-20251120114500"
+    "@comet/admin": "8.8.0-canary-20251120141652",
+    "@comet/admin-icons": "8.8.0-canary-20251120141652",
+    "@comet/cms-admin": "8.8.0-canary-20251120141652",
+    "@comet/eslint-config": "8.8.0-canary-20251120141652"
   },
   "engines": {
     "node": ">=22.0.0"