@comet/admin-generator 9.0.0-canary-20251013121422 → 9.0.0-canary-20251124092450

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

@@ -18,8 +18,10 @@ 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 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");
@@ -120,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);
@@ -160,7 +163,6 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
         { 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" },
@@ -171,14 +173,16 @@ 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"];
     const props = [];
@@ -229,9 +233,24 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
     const showCrudContextMenuInActionsColumn = allowDeleting;
     const showEditInActionsColumn = allowEditing && !forwardRowAction;
     const defaultActionsColumnWidth = getDefaultActionsColumnWidth(showCrudContextMenuInActionsColumn, showEditInActionsColumn);
-    const { imports: forwardedGqlArgsImports, props: forwardedGqlArgsProps, gqlArgs } = (0, getForwardedGqlArgs_1.getForwardedGqlArgs)([gridQueryType]);
-    imports.push(...forwardedGqlArgsImports);
-    props.push(...forwardedGqlArgsProps);
+    let useScopeFromContext = false;
+    const gqlArgs = [];
+    {
+        const forwardedArgs = (0, getForwardedGqlArgs_1.getForwardedGqlArgs)([gridQueryType]);
+        for (const forwardedArg of forwardedArgs) {
+            imports.push(...forwardedArg.imports);
+            if (forwardedArg.gqlArg.name === "scope" && !config.scopeAsProp) {
+                useScopeFromContext = true;
+            }
+            else {
+                props.push(forwardedArg.prop);
+                gqlArgs.push(forwardedArg.gqlArg);
+            }
+        }
+    }
+    if (useScopeFromContext) {
+        imports.push({ name: "useContentScope", importPath: "@comet/cms-admin" });
+    }
     const renderToolbar = (_f = config.toolbar) !== null && _f !== void 0 ? _f : true;
     const filterArg = gridQueryType.args.find((arg) => arg.name === "filter");
     const hasFilter = !!filterArg && renderToolbar && !allowRowReordering;
@@ -255,16 +274,20 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
     const hasSort = !!sortArg;
     let sortFields = [];
     if (sortArg) {
-        if (sortArg.type.kind !== "LIST") {
+        let sortArgType = sortArg.type;
+        if (sortArgType.kind === "NON_NULL") {
+            sortArgType = sortArgType.ofType;
+        }
+        if (sortArgType.kind !== "LIST") {
             throw new Error("Sort argument must be LIST");
         }
-        if (sortArg.type.ofType.kind !== "NON_NULL") {
+        if (sortArgType.ofType.kind !== "NON_NULL") {
             throw new Error("Sort argument must be LIST->NON_NULL");
         }
-        if (sortArg.type.ofType.ofType.kind !== "INPUT_OBJECT") {
+        if (sortArgType.ofType.ofType.kind !== "INPUT_OBJECT") {
             throw new Error("Sort argument must be LIST->NON_NULL->INPUT_OBJECT");
         }
-        const sortTypeName = sortArg.type.ofType.ofType.name;
+        const sortTypeName = sortArgType.ofType.ofType.name;
         const sortType = gqlIntrospection.__schema.types.find((type) => type.kind === "INPUT_OBJECT" && type.name === sortTypeName);
         if (!sortType)
             throw new Error("Can't find sort type");
@@ -285,7 +308,6 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
         }
     }
     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)
         throw new Error("didn't find entity in schema types");
@@ -489,7 +511,7 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
     if (forwardRowAction) {
         props.push({
             name: "rowAction",
-            type: `(params: GridRenderCellParams<any, GQL${fragmentName}Fragment, any>) => ReactNode`,
+            type: `(params: GridRenderCellParams<GQL${fragmentName}Fragment>) => ReactNode`,
             optional: true,
         });
         props.push({
@@ -500,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,
         });
     }
@@ -555,31 +576,30 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
         }
     \`;
 
-    const ${instanceGqlTypePlural}Query = gql\`
-        query ${gqlTypePlural}Grid(${[
-        ...gqlArgs.filter((gqlArg) => gqlArg.queryOrMutationName === gridQueryType.name).map((gqlArg) => `$${gqlArg.name}: ${gqlArg.type}!`),
-        ...[`$offset: Int!`, `$limit: Int!`],
-        ...(hasSort ? [`$sort: [${gqlType}Sort!]`] : []),
-        ...(hasSearch ? [`$search: String`] : []),
-        ...(filterArg && (hasFilter || hasFilterProp) ? [`$filter: ${gqlType}Filter`] : []),
-        ...(hasScope ? [`$scope: ${gqlType}ContentScopeInput!`] : []),
-    ].join(", ")}) {
-    ${gridQuery}(${[
-        ...gqlArgs.filter((gqlArg) => gqlArg.queryOrMutationName === gridQueryType.name).map((gqlArg) => `${gqlArg.name}: $${gqlArg.name}`),
-        ...[`offset: $offset`, `limit: $limit`],
-        ...(hasSort ? [`sort: $sort`] : []),
-        ...(hasSearch ? [`search: $search`] : []),
-        ...(filterArg && (hasFilter || hasFilterProp) ? [`filter: $filter`] : []),
-        ...(hasScope ? [`scope: $scope`] : []),
-    ].join(", ")}) {
-                nodes {
-                    ...${fragmentName}
-                }
-                totalCount
-            }
-        }
-        \${${instanceGqlTypePlural}Fragment}
-    \`;
+    const ${instanceGqlTypePlural}Query = gql\`${(0, generateGqlOperation_1.generateGqlOperation)({
+        type: "query",
+        operationName: `${gqlTypePlural}Grid`,
+        rootOperation: gridQuery,
+        fields: [`nodes...${fragmentName}`, "totalCount"],
+        fragmentVariables: [`\${${instanceGqlTypePlural}Fragment}`],
+        variables: [
+            ...gqlArgs
+                .filter((gqlArg) => gqlArg.queryOrMutationName === gridQueryType.name)
+                .map((gqlArg) => ({ name: gqlArg.name, type: `${gqlArg.type}!` })),
+            {
+                name: "offset",
+                type: "Int!",
+            },
+            {
+                name: "limit",
+                type: "Int!",
+            },
+            ...(hasSort ? [{ name: "sort", type: `[${gqlType}Sort!]` }] : []),
+            ...(hasSearch ? [{ name: "search", type: "String" }] : []),
+            ...(filterArg && (hasFilter || hasFilterProp) ? [{ name: "filter", type: `${gqlType}Filter` }] : []),
+            ...(useScopeFromContext ? [{ name: "scope", type: `${gqlType}ContentScopeInput!` }] : []),
+        ],
+    })}\`;
 
     ${allowRowReordering
         ? `const update${gqlType}PositionMutation = gql\`
@@ -627,12 +647,12 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
         : config.selectionProps === "singleSelect"
             ? `, rowSelectionModel, onRowSelectionModelChange, checkboxSelection: false, keepNonExistentRowsSelected: false, disableRowSelectionOnClick: false`
             : ``} };
-        ${hasScope ? `const { scope } = useContentScope();` : ""}
+        ${useScopeFromContext ? `const { scope } = useContentScope();` : ""}
         ${gridNeedsTheme ? `const theme = useTheme();` : ""}
 
         ${generateHandleRowOrderChange(allowRowReordering, gqlType, instanceGqlTypePlural)}
 
-        const columns: GridColDef<GQL${fragmentName}Fragment>[] = [
+        const columns: GridColDef<GQL${fragmentName}Fragment>[] = useMemo(()=>[
             ${gridColumnFields
         .map((column) => {
         const defaultMinWidth = 150;
@@ -727,7 +747,7 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
                             );
                                 }` }))
         : ""}
-        ];
+        ],[intl${gridNeedsTheme ? ", theme" : ""}${showCrudContextMenuInActionsColumn ? ", client" : ""}${forwardRowAction ? ", rowAction, actionsColumnWidth" : ""}]);
 
         ${hasFilter || hasSearch
         ? `const { ${hasFilter ? `filter: gqlFilter, ` : ""}${hasSearch ? `search: gqlSearch, ` : ""} } = muiGridFilterToGql(columns, dataGridProps.filterModel);`
@@ -737,7 +757,7 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
             variables: {
                 ${[
         ...gqlArgs.filter((gqlArg) => gqlArg.queryOrMutationName === gridQueryType.name).map((arg) => arg.name),
-        ...(hasScope ? ["scope"] : []),
+        ...(useScopeFromContext ? ["scope"] : []),
         ...(filterArg
             ? hasFilter && hasFilterProp
                 ? ["filter: filter ? { and: [gqlFilter, filter] } : gqlFilter"]
@@ -766,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/lib/commands/generate/generateGrid/getForwardedGqlArgs.d.ts

@@ -8,6 +8,6 @@ export type GqlArg = {
 };
 export declare function getForwardedGqlArgs(gqlFields: IntrospectionField[]): {
     imports: Imports;
-    props: Prop[];
-    gqlArgs: GqlArg[];
-};
+    prop: Prop;
+    gqlArg: GqlArg;
+}[];

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

@@ -2,34 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 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 = [];
-    const props = [];
-    const gqlArgs = [];
+    const ret = [];
+    const supportedGqlArgs = ["offset", "limit", "sort", "search", "filter", "input"]; // this arguments need to be handled differently or are already handled somewhere else
     getArgs(gqlFields, supportedGqlArgs).forEach((arg) => {
+        let prop;
+        const imports = [];
         if (arg.type === "ID" || arg.type === "String" || arg.type === "DateTime") {
-            props.push({ name: arg.name, optional: false, type: "string" });
+            prop = { name: arg.name, optional: false, type: "string" };
         }
         else if (arg.type === "Boolean") {
-            props.push({ name: arg.name, optional: false, type: "boolean" });
+            prop = { name: arg.name, optional: false, type: "boolean" };
         }
         else if (arg.type === "Int" || arg.type === "Float") {
-            props.push({ name: arg.name, optional: false, type: "number" });
+            prop = { name: arg.name, optional: false, type: "number" };
         }
         else if (arg.type === "JSONObject") {
-            props.push({ name: arg.name, optional: false, type: "unknown" });
+            prop = { name: arg.name, optional: false, type: "unknown" };
         }
         else {
-            props.push({ name: arg.name, optional: false, type: arg.type });
-            imports.push({ name: arg.type, importPath: "@src/graphql.generated" });
+            prop = { name: arg.name, optional: false, type: `GQL${arg.type}` }; // generated types contain GQL prefix
+            imports.push({ name: `GQL${arg.type}`, importPath: "@src/graphql.generated" });
         }
-        gqlArgs.push({ name: arg.name, type: arg.type, queryOrMutationName: arg.gqlField.name });
+        ret.push({ gqlArg: { name: arg.name, type: arg.type, queryOrMutationName: arg.gqlField.name }, prop, imports });
     });
-    return {
-        imports,
-        props,
-        gqlArgs,
-    };
+    return ret;
 }
 function getArgs(gqlFields, skipGqlArgs) {
     return gqlFields.reduce((acc, gqlField) => {

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

@@ -2,8 +2,13 @@ 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 IfExplicitAny<T, Y, N> = T extends never ? Y : N;
 type FieldNames<T> = {
     [K in keyof T]: `${Exclude<K, symbol>}${FieldNames<T[K]> extends never ? "" : `.${FieldNames<T[K]>}`}`;
 }[keyof T];
-export type UsableFields<T, FollowArrays extends boolean = false> = FieldNames<GqlLeaves<T, FollowArrays>>;
+export type UsableFields<T, FollowArrays extends boolean = false> = IfExplicitAny<T, any, FieldNames<GqlLeaves<T, FollowArrays>>>;
+type FormFieldNames<T> = {
+    [K in keyof T]: `${Exclude<K, symbol>}` | (FormFieldNames<T[K]> extends never ? never : `${Exclude<K, symbol>}.${FormFieldNames<T[K]>}`);
+}[keyof T];
+export type UsableFormFields<T> = IfExplicitAny<T, any, FormFieldNames<GqlLeaves<T, false>>>;
 export {};

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

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

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

@@ -10,5 +10,5 @@ function convertConfigImport(imprt) {
     else if (importPath.startsWith("./")) {
         importPath = `.${importPath}`;
     }
-    return { name: imprt.name, importPath };
+    return { name: imprt.name, importPath, defaultImport: imprt.defaultImport };
 }

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

@@ -0,0 +1,12 @@
+export declare function generateGqlQueryTreeFromFields(fields: string[]): string;
+export declare function generateGqlOperation(options: {
+    type: "query" | "mutation";
+    operationName: string;
+    rootOperation: string;
+    variables?: {
+        name: string;
+        type: string;
+    }[];
+    fields: string[];
+    fragmentVariables?: string[];
+}): string;

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

@@ -0,0 +1,87 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateGqlQueryTreeFromFields = generateGqlQueryTreeFromFields;
+exports.generateGqlOperation = generateGqlOperation;
+function generateGqlQueryTreeFromFields(fields) {
+    // Helper to get or create a node at a given path
+    function getOrCreateNode(root, path) {
+        let node = root;
+        for (const part of path) {
+            if (!node.children[part]) {
+                node.children[part] = { children: {}, fragments: [] };
+            }
+            node = node.children[part];
+        }
+        return node;
+    }
+    // 1. create tree out of dot separated fields
+    const root = { children: {}, fragments: [] };
+    for (const field of fields) {
+        const fragmentMatch = field.match(/(.*)(\.{3}.*)/);
+        if (fragmentMatch) {
+            // e.g. foo.bar...Fragment
+            const key = fragmentMatch[1].trim();
+            const fragment = fragmentMatch[2].trim();
+            if (key === "") {
+                root.fragments.push(fragment);
+            }
+            else {
+                const path = key.split(".").filter(Boolean);
+                const node = getOrCreateNode(root, path);
+                node.fragments.push(fragment);
+            }
+        }
+        else {
+            // e.g. foo.bar.baz
+            const path = field.split(".").filter(Boolean);
+            if (path.length === 0)
+                continue;
+            // Mark the leaf node (no need to store field names, just ensure the path exists)
+            getOrCreateNode(root, path);
+        }
+    }
+    // 2. create fragment string out of tree
+    function recursiveStringify(node) {
+        const parts = [];
+        // Add fields (children)
+        for (const key of Object.keys(node.children)) {
+            const child = node.children[key];
+            const childStr = recursiveStringify(child);
+            if (childStr) {
+                parts.push(`${key} { ${childStr} }`);
+            }
+            else {
+                parts.push(key);
+            }
+        }
+        // Add fragments
+        if (node.fragments.length > 0) {
+            parts.push(...node.fragments);
+        }
+        return parts.join(" ");
+    }
+    return recursiveStringify(root);
+}
+function generateGqlOperation(options) {
+    var _a;
+    let queryArgs = "";
+    if (options.variables && options.variables.length > 0) {
+        queryArgs += `(`;
+        queryArgs += options.variables.map((v) => `$${v.name}: ${v.type}`).join(", ");
+        queryArgs += `)`;
+    }
+    let rootQueryArgs = "";
+    if (options.variables && options.variables.length > 0) {
+        rootQueryArgs += `(`;
+        rootQueryArgs += options.variables.map((v) => `${v.name}: $${v.name}`).join(", ");
+        rootQueryArgs += `)`;
+    }
+    return `
+    ${options.type} ${options.operationName}${queryArgs} {
+        ${options.rootOperation}${rootQueryArgs} {
+            ${generateGqlQueryTreeFromFields(options.fields)}
+        }
+    }
+    ${((_a = options.fragmentVariables) !== null && _a !== void 0 ? _a : []).join("\n")}
+    `;
+}

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

@@ -1,5 +1,6 @@
 export type Imports = Array<{
     name: string;
     importPath: string;
+    defaultImport?: boolean;
 }>;
 export declare function generateImportsCode(imports: Imports): string;

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

@@ -19,7 +19,12 @@ function generateImportsCode(imports) {
     });
     const importsString = filteredImports
         .map((imp) => {
-        return `import { ${imp.name} } from "${imp.importPath}";`;
+        if (imp.defaultImport) {
+            return `import ${imp.name} from "${imp.importPath}";`;
+        }
+        else {
+            return `import { ${imp.name} } from "${imp.importPath}";`;
+        }
     })
         .join("\n");
     return importsString;

package/lib/index.d.ts

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

package/lib/index.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineConfig = void 0;
+exports.injectFormVariables = 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; } });
+Object.defineProperty(exports, "injectFormVariables", { enumerable: true, get: function () { return generate_command_1.injectFormVariables; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comet/admin-generator",
-  "version": "9.0.0-canary-20251013121422",
+  "version": "9.0.0-canary-20251124092450",
   "description": "Comet Admin Generator CLI tool",
   "repository": {
     "directory": "packages/admin/admin-generator",
@@ -30,10 +30,11 @@
     "ts-node": "^10.9.2"
   },
   "devDependencies": {
+    "@apollo/client": "^3.7.0",
     "@mui/material": "^7.2.0",
     "@mui/x-data-grid": "^7.29.8",
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.16.3",
+    "@types/node": "^24.9.1",
     "@types/object-path": "^0.11.4",
     "@types/pluralize": "^0.0.33",
     "@types/react": "^18.3.23",
@@ -48,11 +49,11 @@
     "react-intl": "^7.1.11",
     "rimraf": "^6.0.1",
     "ts-jest": "^29.4.0",
-    "typescript": "5.8.3",
-    "@comet/admin": "9.0.0-canary-20251013121422",
-    "@comet/admin-icons": "9.0.0-canary-20251013121422",
-    "@comet/cms-admin": "9.0.0-canary-20251013121422",
-    "@comet/eslint-config": "9.0.0-canary-20251013121422"
+    "typescript": "5.9.3",
+    "@comet/admin": "9.0.0-canary-20251124092450",
+    "@comet/admin-icons": "9.0.0-canary-20251124092450",
+    "@comet/cms-admin": "9.0.0-canary-20251124092450",
+    "@comet/eslint-config": "9.0.0-canary-20251124092450"
   },
   "engines": {
     "node": ">=22.0.0"
@@ -62,12 +63,12 @@
     "registry": "https://registry.npmjs.org"
   },
   "scripts": {
-    "build": "$npm_execpath run clean && tsc -p tsconfig.build.json",
+    "build": "pnpm run clean && tsc -p tsconfig.build.json",
     "clean": "rimraf lib",
     "dev": "tsc --watch --preserveWatchOutput -p tsconfig.build.json",
     "lint": "run-p lint:prettier lint:eslint lint:tsc",
     "lint:eslint": "eslint --max-warnings 0 src/ **/*.json --no-warn-ignored",
-    "lint:prettier": "npx prettier --check './**/*.{js,json,md,yml,yaml}'",
+    "lint:prettier": "pnpm exec prettier --check './**/*.{js,json,md,yml,yaml}'",
     "lint:tsc": "tsc",
     "test": "NODE_OPTIONS=--experimental-vm-modules jest --passWithNoTests",
     "test:updateSnapshot": "NODE_OPTIONS=--experimental-vm-modules jest --updateSnapshot",