@comet/admin-generator 9.0.0-canary-20260113132154 → 9.0.0-canary-20260121085838

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

@@ -16,15 +16,18 @@ exports.injectFormVariables = injectFormVariables;
 exports.defineConfig = defineConfig;
 const graphql_file_loader_1 = require("@graphql-tools/graphql-file-loader");
 const load_1 = require("@graphql-tools/load");
+const child_process_1 = require("child_process");
 const commander_1 = require("commander");
 const fs_1 = require("fs");
 const glob_1 = require("glob");
 const graphql_1 = require("graphql");
 const path_1 = require("path");
+const util_1 = require("util");
 const parseConfig_1 = require("./config/parseConfig");
 const generateForm_1 = require("./generateForm/generateForm");
 const generateGrid_1 = require("./generateGrid/generateGrid");
 const writeGenerated_1 = require("./utils/writeGenerated");
+const exec = (0, util_1.promisify)(child_process_1.exec);
 function isComponentFormFieldConfig(arg) {
     return arg && arg.type === "component";
 }
@@ -51,6 +54,7 @@ function runGenerate() {
             loaders: [new graphql_file_loader_1.GraphQLFileLoader()],
         });
         const gqlIntrospection = (0, graphql_1.introspectionFromSchema)(schema);
+        const writtenFiles = [];
         const files = yield (0, glob_1.glob)(filePattern);
         for (const file of files) {
             let outputCode = "";
@@ -80,6 +84,7 @@ function runGenerate() {
                 gqlDocumentsOutputCode += `${exportStatement} const ${queryName} = gql\`${generated.gqlDocuments[queryName].document}\`\n`;
             }
             yield (0, writeGenerated_1.writeGenerated)(codeOuputFilename, outputCode);
+            writtenFiles.push(codeOuputFilename);
             if (gqlDocumentsOutputCode != "") {
                 const gqlDocumentsOuputFilename = `${targetDirectory}/${(0, path_1.basename)(file.replace(/\.cometGen\.tsx?$/, ""))}.gql.tsx`;
                 yield fs_1.promises.rm(gqlDocumentsOuputFilename, { force: true });
@@ -89,9 +94,14 @@ function runGenerate() {
                 ${gqlDocumentsOutputCode}
             `;
                 yield (0, writeGenerated_1.writeGenerated)(gqlDocumentsOuputFilename, gqlDocumentsOutputCode);
+                writtenFiles.push(gqlDocumentsOuputFilename);
             }
             console.log("");
         }
+        if (writtenFiles.length > 0) {
+            console.log("Formatting generated files...");
+            yield exec(`./node_modules/.bin/prettier --write ${writtenFiles.join(" ")}`);
+        }
     });
 }
 exports.generateCommand = new commander_1.Command("generate")

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

@@ -144,11 +144,11 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
     }
     else if (config.type == "date") {
         imports.push({
-            name: "DatePickerField",
+            name: "Future_DatePickerField",
             importPath: "@comet/admin",
         });
         code = `
-            <DatePickerField
+            <Future_DatePickerField
                 ${required ? "required" : ""}
                 ${config.readOnly ? readOnlyPropsWithLock : ""}
                 variant="horizontal"
@@ -173,7 +173,7 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
     }
     else if (config.type == "dateTime") {
         imports.push({
-            name: "DateTimePickerField",
+            name: "Future_DateTimePickerField as DateTimePickerField",
             importPath: "@comet/admin",
         });
         code = `<DateTimePickerField

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

@@ -463,7 +463,7 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
                 maxWidth: column.maxWidth,
                 flex: column.flex,
                 headerInfoTooltip: column.headerInfoTooltip,
-                visible: column.visible && `theme.breakpoints.${column.visible}`,
+                visible: column.visible !== undefined ? (typeof column.visible == "string" ? `theme.breakpoints.${column.visible}` : "false") : undefined,
                 pinned: column.pinned,
                 disableExport: column.disableExport,
             };
@@ -518,7 +518,7 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
             maxWidth: column.maxWidth,
             flex: column.flex,
             headerInfoTooltip: column.headerInfoTooltip,
-            visible: column.visible && `theme.breakpoints.${column.visible}`,
+            visible: column.visible !== undefined ? (typeof column.visible == "string" ? `theme.breakpoints.${column.visible}` : "false") : undefined,
             pinned: column.pinned,
             disableExport: column.disableExport,
             sortBy: "sortBy" in column ? column.sortBy : undefined,
@@ -759,7 +759,11 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
                     id: `${instanceGqlType}.actions`,
                     type: "intlCall",
                 })
-                : `""`, sortable: "false", filterable: "false", type: '"actions"', align: '"right"', pinned: `"${actionsColumnPinned}"`, width: forwardRowAction ? "actionsColumnWidth" : actionsColumnWidth, visible: actionsColumnVisible && `theme.breakpoints.${actionsColumnVisible}` }, restActionsColumnConfig), { headerInfoTooltip: restActionsColumnConfig.headerInfoTooltip
+                : `""`, sortable: "false", filterable: "false", type: '"actions"', align: '"right"', pinned: `"${actionsColumnPinned}"`, width: forwardRowAction ? "actionsColumnWidth" : actionsColumnWidth, visible: actionsColumnVisible !== undefined
+                ? typeof actionsColumnVisible == "string"
+                    ? `theme.breakpoints.${actionsColumnVisible}`
+                    : "false"
+                : undefined }, restActionsColumnConfig), { headerInfoTooltip: restActionsColumnConfig.headerInfoTooltip
                 ? (0, intl_1.generateFormattedMessage)({
                     config: restActionsColumnConfig.headerInfoTooltip,
                     id: `${instanceGqlType}.actions`,

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

@@ -2,5 +2,5 @@ import { type Breakpoint } from "@mui/material";
 type BreakpointKey = `'${Breakpoint}'` | number;
 type SingleValueBrakpointTypes = "up" | "down" | "only" | "not";
 type MultiValueBrakpointTypes = "between";
-export type ColumnVisibleOption = `${SingleValueBrakpointTypes}(${BreakpointKey})` | `${MultiValueBrakpointTypes}(${BreakpointKey}, ${BreakpointKey})`;
+export type ColumnVisibleOption = `${SingleValueBrakpointTypes}(${BreakpointKey})` | `${MultiValueBrakpointTypes}(${BreakpointKey}, ${BreakpointKey})` | false;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comet/admin-generator",
-  "version": "9.0.0-canary-20260113132154",
+  "version": "9.0.0-canary-20260121085838",
   "description": "Comet Admin Generator CLI tool",
   "repository": {
     "directory": "packages/admin/admin-generator",
@@ -31,29 +31,25 @@
   },
   "devDependencies": {
     "@apollo/client": "^3.14.0",
-    "@mui/material": "^7.3.5",
-    "@mui/x-data-grid": "^7.29.8",
-    "@types/jest": "^29.5.14",
+    "@mui/material": "^7.3.7",
+    "@mui/x-data-grid": "^7.29.12",
     "@types/node": "^24.9.1",
     "@types/object-path": "^0.11.4",
     "@types/pluralize": "^0.0.33",
     "@types/react": "^18.3.27",
-    "@types/react-dom": "^18.3.7",
     "eslint": "^9.30.1",
     "final-form": "^4.20.10",
-    "jest": "^29.7.0",
-    "npm-run-all2": "^8.0.0",
+    "npm-run-all2": "^8.0.4",
     "prettier": "^3.6.2",
     "react": "^18.3.1",
-    "react-dom": "^18.3.1",
     "react-intl": "^7.1.11",
     "rimraf": "^6.1.2",
-    "ts-jest": "^29.4.0",
     "typescript": "5.9.3",
-    "@comet/admin": "9.0.0-canary-20260113132154",
-    "@comet/admin-icons": "9.0.0-canary-20260113132154",
-    "@comet/cms-admin": "9.0.0-canary-20260113132154",
-    "@comet/eslint-config": "9.0.0-canary-20260113132154"
+    "vitest": "^4.0.16",
+    "@comet/admin": "9.0.0-canary-20260121085838",
+    "@comet/admin-icons": "9.0.0-canary-20260121085838",
+    "@comet/cms-admin": "9.0.0-canary-20260121085838",
+    "@comet/eslint-config": "9.0.0-canary-20260121085838"
   },
   "engines": {
     "node": ">=22.0.0"
@@ -69,10 +65,10 @@
     "lint": "run-p lint:prettier lint:eslint lint:tsc",
     "lint:ci": "pnpm run lint",
     "lint:eslint": "eslint --max-warnings 0 src/ **/*.json --no-warn-ignored",
-    "lint:prettier": "pnpm exec prettier --check './**/*.{js,json,md,yml,yaml}'",
+    "lint:prettier": "pnpm exec prettier --check '*.{ts,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",
-    "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
+    "test": "vitest --run",
+    "test:updateSnapshot": "vitest --run --update",
+    "test:watch": "vitest --watch"
   }
 }