@comet/admin-generator 9.0.0-canary-20251211112608 → 9.0.0-canary-20251222112948

package/lib/commands/generate/config/transformConfig.js

@@ -52,6 +52,20 @@ 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`),
 ];
+const supportedFormattedMessagePaths = [
+    "[type=grid].newEntryText",
+    "[type=grid].columns.headerName",
+    "[type=grid].columns.headerInfoTooltip",
+    //staticSelect
+    "[type=grid].columns.values.label",
+    "[type=grid].columns.values.label.primaryText",
+    "[type=grid].columns.values.label.secondaryText",
+    //support in up to 5 levels of nested fields (eg. fieldSet)
+    ...Array.from(Array(5).keys()).map((i) => `[type=form]${".fields".repeat(i + 1)}.label`),
+    ...Array.from(Array(5).keys()).map((i) => `[type=form]${".fields".repeat(i + 1)}.helperText`),
+    ...Array.from(Array(5).keys()).map((i) => `[type=form]${".fields".repeat(i + 1)}.checkboxLabel`),
+    ...Array.from(Array(5).keys()).map((i) => `[type=form]${".fields".repeat(i + 1)}.title`), // fieldSet title
+];
 // transform the config file to replace all imports and inline code with a { code, imports } object
 // this is needed to be able to execute the config file in a node environment
 function transformConfigFile(fileName, sourceText) {
@@ -112,6 +126,26 @@ function transformConfigFile(fileName, sourceText) {
                         }
                     }
                 }
+                else if (ts.isJsxSelfClosingElement(node)) {
+                    if (node.tagName.getText() == "FormattedMessage") {
+                        if (!supportedFormattedMessagePaths.includes(path)) {
+                            throw new Error(`FormattedMessage is not supported in this context: ${path}`);
+                        }
+                        return ts.factory.createObjectLiteralExpression(node.attributes.properties.map((attr) => {
+                            var _a;
+                            if (!ts.isJsxAttribute(attr)) {
+                                throw new Error(`Only JsxAttributes are supported in FormattedMessage in this context: ${path}`);
+                            }
+                            let name = (_a = attr.name) === null || _a === void 0 ? void 0 : _a.getText();
+                            if (name === "id")
+                                name = "formattedMessageId"; // rename to identify as formattedMessage
+                            if (!attr.initializer || !ts.isStringLiteral(attr.initializer)) {
+                                throw new Error(`Only string literals are supported in FormattedMessage in this context: ${path}.${name}`);
+                            }
+                            return ts.factory.createPropertyAssignment(name, ts.factory.createStringLiteral(attr.initializer.text));
+                        }));
+                    }
+                }
                 const transformKinds = [
                     ts.SyntaxKind.Identifier,
                     ts.SyntaxKind.ArrayLiteralExpression,

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

@@ -6,9 +6,11 @@ import { type IconProps } from "@mui/material";
 import { type GridCellParams, type GridFilterItem, type GridFilterOperator, type GridRenderCellParams, type GridSortDirection, type GridValidRowModel } from "@mui/x-data-grid";
 import { Command } from "commander";
 import { type FieldValidator, type FormApi } from "final-form";
-import { type ComponentType } from "react";
+import type { ComponentType, ReactElement } from "react";
+import type { FormattedMessage, MessageDescriptor } from "react-intl";
 import { type UsableFields, type UsableFormFields } from "./generateGrid/usableFields";
 import { type ColumnVisibleOption } from "./utils/columnVisibility";
+export type FormattedMessageElement = ReactElement<MessageDescriptor, typeof FormattedMessage>;
 type IconObject = Pick<IconProps, "color" | "fontSize"> & {
     name: IconName;
 };
@@ -143,23 +145,23 @@ export type FormFieldConfig<T> = (({
     maxFiles?: number;
     download?: boolean;
 } & Pick<Partial<FinalFormFileUploadProps<true>>, "maxFileSize" | "readOnly" | "layout" | "accept">)) & {
-    label?: string;
+    label?: string | FormattedMessageElement;
     required?: boolean;
     validate?: FieldValidator<unknown>;
-    helperText?: string;
+    helperText?: string | FormattedMessageElement;
     readOnly?: boolean;
 };
 export declare function isFormFieldConfig<T>(arg: any): arg is FormFieldConfig<T>;
 type OptionalNestedFieldsConfig<T> = {
     type: "optionalNestedFields";
     name: UsableFormFields<T>;
-    checkboxLabel?: string;
+    checkboxLabel?: string | FormattedMessageElement;
     fields: FormFieldConfig<any>[];
 };
 export type FormLayoutConfig<T> = {
     type: "fieldSet";
     name: string;
-    title?: string;
+    title?: string | FormattedMessageElement;
     supportText?: string;
     collapsible?: boolean;
     initiallyExpanded?: boolean;
@@ -194,19 +196,20 @@ export type InjectedFormVariables = {
     scope: ContentScope;
 };
 export declare function injectFormVariables<T>(fn: (injectedVariables: InjectedFormVariables) => T): T;
-type BaseColumnConfig = Pick<GridColDef, "headerName" | "width" | "minWidth" | "maxWidth" | "flex" | "pinned" | "disableExport"> & {
-    headerInfoTooltip?: string;
+type BaseColumnConfig = Pick<GridColDef, "width" | "minWidth" | "maxWidth" | "flex" | "pinned" | "disableExport"> & {
+    headerName?: string | FormattedMessageElement;
+    headerInfoTooltip?: string | FormattedMessageElement;
     visible?: ColumnVisibleOption;
     fieldName?: string;
 };
 export type GridColumnStaticSelectLabelCellContent = {
-    primaryText?: string;
-    secondaryText?: string;
+    primaryText?: string | FormattedMessageElement;
+    secondaryText?: string | FormattedMessageElement;
     icon?: Icon;
 };
 export type GridColumnStaticSelectValue = StaticSelectValue | {
     value: string | number | boolean;
-    label: string | GridColumnStaticSelectLabelCellContent;
+    label: string | FormattedMessageElement | GridColumnStaticSelectLabelCellContent;
 } | number | boolean;
 export type GridColumnConfig<T extends GridValidRowModel> = ({
     type: "text";
@@ -294,7 +297,7 @@ export type GridConfig<T extends {
     filterProp?: boolean;
     toolbar?: boolean;
     toolbarActionProp?: boolean;
-    newEntryText?: string;
+    newEntryText?: string | FormattedMessageElement;
     rowActionProp?: boolean;
     selectionProps?: "multiSelect" | "singleSelect";
     rowReordering?: {
@@ -307,6 +310,9 @@ export type GridConfig<T extends {
      */
     scopeAsProp?: boolean;
     density?: "comfortable" | "compact" | "standard";
+    crudContextMenu?: {
+        deleteText?: string;
+    };
 };
 export type GeneratorConfig<T extends {
     __typename?: string;

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

@@ -14,6 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildFormFieldOptions = buildFormFieldOptions;
 const camelCaseToHumanReadable_1 = require("../../utils/camelCaseToHumanReadable");
 const convertConfigImport_1 = require("../../utils/convertConfigImport");
+const intl_1 = require("../../utils/intl");
 const runtimeTypeGuards_1 = require("../../utils/runtimeTypeGuards");
 const buildAdornmentData = ({ adornmentData }) => {
     let adornmentString = "";
@@ -52,12 +53,15 @@ const buildAdornmentData = ({ adornmentData }) => {
  * Helper function that builds various options needed for generating form fields.
  */
 function buildFormFieldOptions({ config, formConfig, }) {
-    var _a;
     const rootGqlType = formConfig.gqlType;
     const name = String(config.name);
-    const label = (_a = config.label) !== null && _a !== void 0 ? _a : (0, camelCaseToHumanReadable_1.camelCaseToHumanReadable)(name);
     const formattedMessageRootId = rootGqlType[0].toLowerCase() + rootGqlType.substring(1);
-    const fieldLabel = `<FormattedMessage id="${formattedMessageRootId}.${name}" defaultMessage="${label}" />`;
+    const fieldLabel = (0, intl_1.generateFormattedMessage)({
+        config: config.label,
+        id: `${formattedMessageRootId}.${name}`,
+        defaultMessage: (0, camelCaseToHumanReadable_1.camelCaseToHumanReadable)(name),
+        type: "jsx",
+    });
     const imports = [];
     let startAdornment = { adornmentString: "" };
     let endAdornment = { adornmentString: "" };

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateFormField = generateFormField;
 const camelCaseToHumanReadable_1 = require("../utils/camelCaseToHumanReadable");
 const convertConfigImport_1 = require("../utils/convertConfigImport");
+const intl_1 = require("../utils/intl");
 const isFieldOptional_1 = require("../utils/isFieldOptional");
 const runtimeTypeGuards_1 = require("../utils/runtimeTypeGuards");
 const generateAsyncSelect_1 = require("./asyncSelect/generateAsyncSelect");
@@ -57,9 +58,11 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
             ${config.startAdornment ? `startAdornment={<InputAdornment position="start">${startAdornment.adornmentString}</InputAdornment>}` : ""}
             ${config.endAdornment ? `endAdornment={<InputAdornment position="end">${endAdornment.adornmentString}</InputAdornment>}` : ""}
             ${config.helperText
-            ? `helperText={<FormattedMessage id=` +
-                `"${formattedMessageRootId}.${name}.helperText" ` +
-                `defaultMessage="${config.helperText}" />}`
+            ? `helperText={${(0, intl_1.generateFormattedMessage)({
+                config: config.helperText,
+                id: `${formattedMessageRootId}.${name}.helperText`,
+                type: "jsx",
+            })}}`
             : ""}
             ${validateCode}
         />`;
@@ -89,22 +92,9 @@ function generateFormField({ gqlIntrospection, baseOutputFilename, config, formC
             : ""}
                 ${validateCode}
             />`;
-        //TODO MUI suggest not using type=number https://mui.com/material-ui/react-text-field/#type-quot-number-quot
-        let assignment = `parseFloat($fieldName)`;
-        if ((0, isFieldOptional_1.isFieldOptional)({ config, gqlIntrospection: gqlIntrospection, gqlType: gqlType })) {
-            assignment = `$fieldName ? ${assignment} : null`;
-        }
-        formValueConfig.formValueToGqlInputCode = `${assignment}`;
-        let initializationAssignment = `String(data.${dataRootName}.${nameWithPrefix})`;
-        if (!required) {
-            initializationAssignment = `data.${dataRootName}.${nameWithPrefix} ? ${initializationAssignment} : undefined`;
+        if (!required && !config.readOnly) {
+            formValueConfig.formValueToGqlInputCode = `$fieldName ?? null`;
         }
-        formValueConfig.omitFromFragmentType = true;
-        formValueConfig.typeCode = {
-            nullable: !required,
-            type: "string",
-        };
-        formValueConfig.initializationCode = `${initializationAssignment}`;
         if (config.initialValue !== undefined) {
             formValueConfig.defaultInitializationCode = JSON.stringify(config.initialValue);
         }

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

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateFormLayout = generateFormLayout;
 const camelCaseToHumanReadable_1 = require("../utils/camelCaseToHumanReadable");
+const intl_1 = require("../utils/intl");
 const findIntrospectionFieldType_1 = require("./formField/findIntrospectionFieldType");
 const generateFields_1 = require("./generateFields");
 function generateFormLayout({ gqlIntrospection, baseOutputFilename, config, formFragmentName, formConfig, gqlType, namePrefix, }) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c;
     const rootGqlType = formConfig.gqlType;
     const formattedMessageRootId = rootGqlType[0].toLowerCase() + rootGqlType.substring(1);
     const dataRootName = rootGqlType[0].toLowerCase() + rootGqlType.substring(1); // TODO should probably be deteced via query
@@ -18,7 +19,6 @@ function generateFormLayout({ gqlIntrospection, baseOutputFilename, config, form
     const formValuesConfig = [];
     const finalFormConfig = { subscription: {}, renderProps: {} };
     if (config.type === "fieldSet") {
-        const title = (_a = config.title) !== null && _a !== void 0 ? _a : (0, camelCaseToHumanReadable_1.camelCaseToHumanReadable)(config.name);
         const generatedFields = (0, generateFields_1.generateFields)({
             gqlIntrospection,
             baseOutputFilename,
@@ -36,10 +36,10 @@ function generateFormLayout({ gqlIntrospection, baseOutputFilename, config, form
         imports.push(...generatedFields.imports);
         formProps.push(...generatedFields.formProps);
         formValuesConfig.push(...generatedFields.formValuesConfig);
-        finalFormConfig.subscription = Object.assign(Object.assign({}, finalFormConfig.subscription), (_b = generatedFields.finalFormConfig) === null || _b === void 0 ? void 0 : _b.subscription);
-        finalFormConfig.renderProps = Object.assign(Object.assign({}, finalFormConfig.renderProps), (_c = generatedFields.finalFormConfig) === null || _c === void 0 ? void 0 : _c.renderProps);
+        finalFormConfig.subscription = Object.assign(Object.assign({}, finalFormConfig.subscription), (_a = generatedFields.finalFormConfig) === null || _a === void 0 ? void 0 : _a.subscription);
+        finalFormConfig.renderProps = Object.assign(Object.assign({}, finalFormConfig.renderProps), (_b = generatedFields.finalFormConfig) === null || _b === void 0 ? void 0 : _b.renderProps);
         imports.push({ name: "FieldSet", importPath: "@comet/admin" });
-        const supportPlaceholder = (_d = config.supportText) === null || _d === void 0 ? void 0 : _d.includes("{");
+        const supportPlaceholder = (_c = config.supportText) === null || _c === void 0 ? void 0 : _c.includes("{");
         if (supportPlaceholder) {
             imports.push({ name: "FormSpy", importPath: "react-final-form" });
         }
@@ -47,7 +47,12 @@ function generateFormLayout({ gqlIntrospection, baseOutputFilename, config, form
         <FieldSet
             ${config.collapsible === undefined || config.collapsible ? `collapsible` : ``}
             ${config.initiallyExpanded != null ? `initiallyExpanded={${config.initiallyExpanded}}` : ``}
-            title={<FormattedMessage id="${formattedMessageRootId}.${config.name}.title" defaultMessage="${title}" />}
+            title={${(0, intl_1.generateFormattedMessage)({
+            config: config.title,
+            id: `${formattedMessageRootId}.${config.name}.title`,
+            defaultMessage: (0, camelCaseToHumanReadable_1.camelCaseToHumanReadable)(config.name),
+            type: "jsx",
+        })}}
             ${config.supportText
             ? `supportText={
                         ${supportPlaceholder ? `mode === "edit" && (<FormSpy subscription={{ values: true }}>{({ values }) => (` : ``}
@@ -70,7 +75,6 @@ function generateFormLayout({ gqlIntrospection, baseOutputFilename, config, form
             throw new Error(`field ${name} in gql introspection type ${gqlType} not found`);
         if (introspectionFieldType.kind !== "OBJECT")
             throw new Error(`field ${name} in gql introspection type ${gqlType} has to be OBJECT`);
-        const checkboxLabel = (_e = config.checkboxLabel) !== null && _e !== void 0 ? _e : `Enable ${(0, camelCaseToHumanReadable_1.camelCaseToHumanReadable)(String(config.name))}`;
         const generatedFields = (0, generateFields_1.generateFields)({
             gqlIntrospection,
             baseOutputFilename,
@@ -110,7 +114,12 @@ function generateFormLayout({ gqlIntrospection, baseOutputFilename, config, form
                     fullWidth
                     name="${String(config.name)}Enabled"
                     type="checkbox"
-                    label={<FormattedMessage id="${formattedMessageRootId}.${String(config.name)}.${String(config.name)}Enabled" defaultMessage="${checkboxLabel}" />}
+                    label={${(0, intl_1.generateFormattedMessage)({
+            config: config.checkboxLabel,
+            id: `${formattedMessageRootId}.${String(config.name)}.${String(config.name)}Enabled`,
+            defaultMessage: `Enable ${(0, camelCaseToHumanReadable_1.camelCaseToHumanReadable)(String(config.name))}`,
+            type: "jsx",
+        })}}
                 >
                     {(props) => (
                         <FormControlLabel

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

@@ -20,6 +20,7 @@ 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 intl_1 = require("../utils/intl");
 const runtimeTypeGuards_1 = require("../utils/runtimeTypeGuards");
 const detectMuiXVersion_1 = require("./detectMuiXVersion");
 const findInputObjectType_1 = require("./findInputObjectType");
@@ -73,37 +74,59 @@ const getSortByValue = (sortBy) => {
     return sortBy;
 };
 const getValueOptionsLabelData = (messageId, label) => {
-    if (typeof label === "string") {
+    if (typeof label === "string" || (0, runtimeTypeGuards_1.isGeneratorConfigFormattedMessage)(label)) {
         return {
-            textLabel: `intl.formatMessage({ id: "${messageId}", defaultMessage: "${label}" })`,
+            textLabel: (0, intl_1.generateFormattedMessage)({
+                config: label,
+                id: messageId,
+                type: "intlCall",
+            }),
         };
     }
     const textLabelParts = [];
     const gridCellContentProps = {};
-    if (label.primaryText) {
+    if ("primaryText" in label && label.primaryText) {
         const primaryMessageId = `${messageId}.primary`;
-        textLabelParts.push(`intl.formatMessage({ id: "${primaryMessageId}", defaultMessage: "${label.primaryText}" })`);
-        gridCellContentProps.primaryText = `<FormattedMessage id="${primaryMessageId}" defaultMessage="${label.primaryText}" />`;
+        textLabelParts.push((0, intl_1.generateFormattedMessage)({
+            config: label.primaryText,
+            id: primaryMessageId,
+            type: "intlCall",
+        }));
+        gridCellContentProps.primaryText = (0, intl_1.generateFormattedMessage)({
+            config: label.primaryText,
+            id: primaryMessageId,
+            type: "jsx",
+        });
     }
-    if (label.secondaryText) {
+    if ("secondaryText" in label && label.secondaryText) {
         const secondaryMessageId = `${messageId}.secondary`;
-        textLabelParts.push(`intl.formatMessage({ id: "${secondaryMessageId}", defaultMessage: "${label.secondaryText}" })`);
-        gridCellContentProps.secondaryText = `<FormattedMessage id="${secondaryMessageId}" defaultMessage="${label.secondaryText}" />`;
-    }
-    if (typeof label.icon === "string") {
-        gridCellContentProps.icon = `<${label.icon}Icon />`;
+        textLabelParts.push((0, intl_1.generateFormattedMessage)({
+            config: label.secondaryText,
+            id: secondaryMessageId,
+            type: "intlCall",
+        }));
+        gridCellContentProps.secondaryText = (0, intl_1.generateFormattedMessage)({
+            config: label.secondaryText,
+            id: secondaryMessageId,
+            type: "jsx",
+        });
     }
-    else if (typeof label.icon === "object") {
-        if ("import" in label.icon) {
-            gridCellContentProps.icon = `<${label.icon.name} />`;
+    if ("icon" in label) {
+        if (typeof label.icon === "string") {
+            gridCellContentProps.icon = `<${label.icon}Icon />`;
         }
-        else {
-            const _a = label.icon, { name } = _a, iconProps = __rest(_a, ["name"]);
-            gridCellContentProps.icon = `<${name}Icon
+        else if (typeof label.icon === "object") {
+            if ("import" in label.icon) {
+                gridCellContentProps.icon = `<${label.icon.name} />`;
+            }
+            else {
+                const _a = label.icon, { name } = _a, iconProps = __rest(_a, ["name"]);
+                gridCellContentProps.icon = `<${name}Icon
                 ${Object.entries(iconProps)
-                .map(([key, value]) => `${key}="${value}"`)
-                .join("\n")}
+                    .map(([key, value]) => `${key}="${value}"`)
+                    .join("\n")}
             />`;
+            }
         }
     }
     const gridCellContent = `<GridCellContent
@@ -117,7 +140,7 @@ const getValueOptionsLabelData = (messageId, label) => {
     };
 };
 function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntrospection, }, config) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const gqlType = config.gqlType;
     if (!gqlType) {
         throw new Error("gqlType is required in grid config");
@@ -312,10 +335,10 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
     if (!schemaEntity)
         throw new Error("didn't find entity in schema types");
     const actionsColumnConfig = config.columns.find((column) => column.type === "actions");
-    const _j = actionsColumnConfig !== null && actionsColumnConfig !== void 0 ? actionsColumnConfig : {}, { component: actionsColumnComponent, type: actionsColumnType, headerName: actionsColumnHeaderName, pinned: actionsColumnPinned = "right", width: actionsColumnWidth = defaultActionsColumnWidth, visible: actionsColumnVisible = undefined, 
+    const _k = actionsColumnConfig !== null && actionsColumnConfig !== void 0 ? actionsColumnConfig : {}, { component: actionsColumnComponent, type: actionsColumnType, headerName: actionsColumnHeaderName, pinned: actionsColumnPinned = "right", width: actionsColumnWidth = defaultActionsColumnWidth, visible: actionsColumnVisible = undefined, 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    queryFields: actionsColumnQueryFields = [] } = _j, // not needed here, but needs to be removed from restActionsColumnConfig because it's directly used in to generate component props in tsCodeRecordToString
-    restActionsColumnConfig = __rest(_j, ["component", "type", "headerName", "pinned", "width", "visible", "queryFields"]);
+    queryFields: actionsColumnQueryFields = [] } = _k, // not needed here, but needs to be removed from restActionsColumnConfig because it's directly used in to generate component props in tsCodeRecordToString
+    restActionsColumnConfig = __rest(_k, ["component", "type", "headerName", "pinned", "width", "visible", "queryFields"]);
     if (actionsColumnComponent) {
         if (!(0, runtimeTypeGuards_1.isGeneratorConfigImport)(actionsColumnComponent)) {
             throw new Error("Unsupported actionsColumnComponent, only imports are supported");
@@ -380,7 +403,7 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
             const enumType = gqlIntrospection.__schema.types.find((t) => t.kind === "ENUM" && t.name === introspectionFieldType.name);
             (_a = column.values) === null || _a === void 0 ? void 0 : _a.forEach((value) => {
                 var _a;
-                if (typeof value === "object" && typeof value.label === "object" && typeof value.label.icon !== "undefined") {
+                if (typeof value === "object" && typeof value.label === "object" && "icon" in value.label) {
                     if (typeof value.label.icon === "string") {
                         iconsToImport.push(value.label.icon);
                     }
@@ -677,10 +700,19 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
             renderHeader: column.headerInfoTooltip
                 ? `() => (
                                     <>
-                                        <GridColumnHeaderTitle label={intl.formatMessage({ id: "${instanceGqlType}.${column.name}",   defaultMessage: "${column.headerName || (0, camelCaseToHumanReadable_1.camelCaseToHumanReadable)(column.name)}"})} columnWidth= {${tooltipColumnWidth}}
+                                        <GridColumnHeaderTitle label={${(0, intl_1.generateFormattedMessage)({
+                    config: column.headerName,
+                    id: `${instanceGqlType}.${column.name}`,
+                    defaultMessage: (0, camelCaseToHumanReadable_1.camelCaseToHumanReadable)(column.name),
+                    type: "intlCall",
+                })}} columnWidth= {${tooltipColumnWidth}}
                               />
                                         <Tooltip
-                                            title={<FormattedMessage id="${instanceGqlType}.${column.name}.tooltip" defaultMessage="${column.headerInfoTooltip}" />}
+                                            title={${(0, intl_1.generateFormattedMessage)({
+                    config: column.headerInfoTooltip,
+                    id: `${instanceGqlType}.${column.name}.tooltip`,
+                    type: "jsx",
+                })}}
                                         >
                                             <InfoIcon sx={{ marginLeft: 1 }} />
                                         </Tooltip>
@@ -689,7 +721,12 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
                 : undefined,
             headerName: column.headerName === ""
                 ? `""`
-                : `intl.formatMessage({ id: "${instanceGqlType}.${column.name}", defaultMessage: "${column.headerName || (0, camelCaseToHumanReadable_1.camelCaseToHumanReadable)(column.name)}" })`,
+                : (0, intl_1.generateFormattedMessage)({
+                    config: column.headerName,
+                    id: `${instanceGqlType}.${column.name}`,
+                    defaultMessage: (0, camelCaseToHumanReadable_1.camelCaseToHumanReadable)(column.name),
+                    type: "intlCall",
+                }),
             type: column.gridType ? `"${column.gridType}"` : undefined,
             filterable: (!column.filterOperators && !filterFields.includes(column.name)) || allowRowReordering ? `false` : undefined,
             sortable: (!sortFields.includes(column.name) || allowRowReordering) && !column.sortBy ? `false` : undefined,
@@ -717,8 +754,18 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
         .join(",\n")},
                 ${showActionsColumn
         ? tsCodeRecordToString(Object.assign(Object.assign({ field: '"actions"', headerName: actionsColumnHeaderName
-                ? `intl.formatMessage({ id: "${instanceGqlType}.actions", defaultMessage: "${actionsColumnHeaderName}" })`
-                : `""`, sortable: "false", filterable: "false", type: '"actions"', align: '"right"', pinned: `"${actionsColumnPinned}"`, width: forwardRowAction ? "actionsColumnWidth" : actionsColumnWidth, visible: actionsColumnVisible && `theme.breakpoints.${actionsColumnVisible}` }, restActionsColumnConfig), { disableExport: config.excelExport ? "true" : undefined, renderCell: `(params) => {
+                ? (0, intl_1.generateFormattedMessage)({
+                    config: actionsColumnHeaderName,
+                    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
+                ? (0, intl_1.generateFormattedMessage)({
+                    config: restActionsColumnConfig.headerInfoTooltip,
+                    id: `${instanceGqlType}.actions`,
+                    type: "intlCall",
+                })
+                : undefined, disableExport: config.excelExport ? "true" : undefined, renderCell: `(params) => {
                             return (
                                 <>
                                 ${(actionsColumnComponent === null || actionsColumnComponent === void 0 ? void 0 : actionsColumnComponent.name) ? `<${actionsColumnComponent.name} {...params} />` : ""}${allowEditing
@@ -742,6 +789,7 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
                                             `
                     : ""}
                                             refetchQueries={[${instanceGqlTypePlural}Query]}
+                                            ${((_h = config.crudContextMenu) === null || _h === void 0 ? void 0 : _h.deleteText) ? `messagesMapping={{ delete: <FormattedMessage id="${instanceGqlType}.crudContextMenu.delete" defaultMessage="${config.crudContextMenu.deleteText}" /> }}` : ""}
                                         />
                                     `
                 : ""}
@@ -783,7 +831,7 @@ function generateGrid({ exportName, baseOutputFilename, targetDirectory, gqlIntr
         });
         const rowCount = useBufferedRowCount(data?.${gridQuery}.totalCount);
         if (error) throw error;
-        const rows = ${!allowRowReordering ? `data?.${gridQuery}.nodes` : generateRowReorderingRows(gridQuery, fieldList, (_h = config.rowReordering) === null || _h === void 0 ? void 0 : _h.dragPreviewField)} ?? [];
+        const rows = ${!allowRowReordering ? `data?.${gridQuery}.nodes` : generateRowReorderingRows(gridQuery, fieldList, (_j = config.rowReordering) === null || _j === void 0 ? void 0 : _j.dragPreviewField)} ?? [];
 
         ${generateGridExportApi(config.excelExport, gqlTypePlural, instanceGqlTypePlural, gridQuery, gqlArgs)}
 

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

@@ -1,3 +1,4 @@
+import { type FormattedMessageElement } from "../generate-command";
 type Options = {
     componentName: string;
     forwardToolbarAction: boolean | undefined;
@@ -7,7 +8,7 @@ type Options = {
     allowAdding: boolean;
     instanceGqlType: string;
     gqlType: string;
-    newEntryText: string | undefined;
+    newEntryText: string | FormattedMessageElement | undefined;
     fragmentName: string;
 };
 export declare const generateGridToolbar: ({ componentName, forwardToolbarAction, hasSearch, hasFilter, excelExport, allowAdding, instanceGqlType, gqlType, newEntryText, fragmentName, }: Options) => string;

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

@@ -14,7 +14,12 @@ const generateGridToolbar = ({ componentName, forwardToolbarAction, hasSearch, h
                 <FillSpace />
                 ${renderToolbarActions({
         forwardToolbarAction,
-        addItemText: (0, intl_1.getFormattedMessageNode)(`${instanceGqlType}.${(0, change_case_1.camelCase)(fragmentName)}.newEntry`, newEntryText !== null && newEntryText !== void 0 ? newEntryText : `New ${(0, camelCaseToHumanReadable_1.camelCaseToHumanReadable)(gqlType)}`),
+        addItemText: (0, intl_1.generateFormattedMessage)({
+            config: newEntryText,
+            id: `${instanceGqlType}.${(0, change_case_1.camelCase)(fragmentName)}.newEntry`,
+            defaultMessage: `New ${(0, camelCaseToHumanReadable_1.camelCaseToHumanReadable)(gqlType)}`,
+            type: "jsx",
+        }),
         excelExport,
         allowAdding,
     })}

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

@@ -1 +1,17 @@
-export declare const getFormattedMessageNode: (id: string, defaultMessage?: string, values?: string) => string;
+import { type FormattedMessageElement } from "../generate-command";
+type GenerateFormattedMessageOptions = ({
+    config: string | FormattedMessageElement | undefined;
+    defaultMessage: string;
+} | {
+    config: string | FormattedMessageElement;
+}) & {
+    id: string;
+    type: "jsx" | "intlCall";
+};
+/**
+ * Generates a <FormattedMessage> JSX element or an intl.formatMessage call string supporting <FormattedMessage> config objects.
+ *
+ * either config or defaultMessage is required
+ */
+export declare const generateFormattedMessage: (options: GenerateFormattedMessageOptions) => string;
+export {};

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

@@ -1,7 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFormattedMessageNode = void 0;
-const getFormattedMessageNode = (id, defaultMessage = "", values) => {
-    return `<FormattedMessage id="${id}" defaultMessage={\`${defaultMessage}\`} ${values ? `values={${values}}` : ""} />`;
+exports.generateFormattedMessage = void 0;
+const runtimeTypeGuards_1 = require("./runtimeTypeGuards");
+/**
+ * Generates a <FormattedMessage> JSX element or an intl.formatMessage call string supporting <FormattedMessage> config objects.
+ *
+ * either config or defaultMessage is required
+ */
+const generateFormattedMessage = (options) => {
+    let id = options.id;
+    let defaultMessage = "";
+    if ("defaultMessage" in options) {
+        defaultMessage = options.defaultMessage;
+    }
+    if ((0, runtimeTypeGuards_1.isGeneratorConfigFormattedMessage)(options.config)) {
+        id = options.config.formattedMessageId;
+        defaultMessage = options.config.defaultMessage;
+    }
+    else if (typeof options.config === "string") {
+        defaultMessage = options.config;
+    }
+    if (options.type === "jsx") {
+        return `<FormattedMessage id=${JSON.stringify(id)} defaultMessage=${JSON.stringify(defaultMessage)} />`;
+    }
+    else {
+        return `intl.formatMessage({ id: ${JSON.stringify(id)}, defaultMessage: ${JSON.stringify(defaultMessage)} })`;
+    }
 };
-exports.getFormattedMessageNode = getFormattedMessageNode;
+exports.generateFormattedMessage = generateFormattedMessage;

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

@@ -17,4 +17,12 @@ type GeneratorConfigCode = {
  * Type Guard used by generator runtime for places where runtime vs. configtime types mismatch
  */
 export declare function isGeneratorConfigCode(value: unknown): value is GeneratorConfigCode;
+type GeneratorConfigFormattedMessage = {
+    formattedMessageId: string;
+    defaultMessage: string;
+};
+/**
+ * Type Guard used by generator runtime for places where runtime vs. configtime types mismatch
+ */
+export declare function isGeneratorConfigFormattedMessage(value: unknown): value is GeneratorConfigFormattedMessage;
 export {};

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isGeneratorConfigImport = isGeneratorConfigImport;
 exports.isGeneratorConfigCode = isGeneratorConfigCode;
+exports.isGeneratorConfigFormattedMessage = isGeneratorConfigFormattedMessage;
 /**
  * Type Guard used by generator runtime for places where runtime vs. configtime types mismatch
  */
@@ -20,3 +21,12 @@ function isGeneratorConfigCode(value) {
     }
     return false;
 }
+/**
+ * Type Guard used by generator runtime for places where runtime vs. configtime types mismatch
+ */
+function isGeneratorConfigFormattedMessage(value) {
+    if (value && typeof value === "object" && "formattedMessageId" in value) {
+        return true;
+    }
+    return false;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comet/admin-generator",
-  "version": "9.0.0-canary-20251211112608",
+  "version": "9.0.0-canary-20251222112948",
   "description": "Comet Admin Generator CLI tool",
   "repository": {
     "directory": "packages/admin/admin-generator",
@@ -37,7 +37,7 @@
     "@types/node": "^24.9.1",
     "@types/object-path": "^0.11.4",
     "@types/pluralize": "^0.0.33",
-    "@types/react": "^18.3.23",
+    "@types/react": "^18.3.27",
     "@types/react-dom": "^18.3.7",
     "eslint": "^9.30.1",
     "final-form": "^4.20.10",
@@ -50,10 +50,10 @@
     "rimraf": "^6.1.2",
     "ts-jest": "^29.4.0",
     "typescript": "5.9.3",
-    "@comet/admin": "9.0.0-canary-20251211112608",
-    "@comet/admin-icons": "9.0.0-canary-20251211112608",
-    "@comet/cms-admin": "9.0.0-canary-20251211112608",
-    "@comet/eslint-config": "9.0.0-canary-20251211112608"
+    "@comet/admin": "9.0.0-canary-20251222112948",
+    "@comet/admin-icons": "9.0.0-canary-20251222112948",
+    "@comet/cms-admin": "9.0.0-canary-20251222112948",
+    "@comet/eslint-config": "9.0.0-canary-20251222112948"
   },
   "engines": {
     "node": ">=22.0.0"