@comet/admin-generator 8.7.0-canary-20251113120441 → 8.7.0-canary-20251113135204

package/lib/commands/generate/config/transformConfig.d.ts

@@ -1 +1,7 @@
+import * as ts from "typescript";
 export declare function transformConfigFile(fileName: string, sourceText: string): string;
+export declare function collectImports(rootNode: ts.Node): Map<string, {
+    name: string;
+    import: string;
+    defaultImport?: boolean;
+}>;

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

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformConfigFile = transformConfigFile;
+exports.collectImports = collectImports;
 const ts = __importStar(require("typescript"));
 const supportedImportPaths = [
     "[type=grid].columns.filterOperators",
@@ -60,6 +61,21 @@ function transformConfigFile(fileName, sourceText) {
     function configTransformer() {
         return (context) => {
             const visit = (node, path) => {
+                if (ts.isCallExpression(node)) {
+                    if (node.expression.getText() === "injectFormVariables") {
+                        if (!path.startsWith("[type=form].fields")) {
+                            throw new Error(`injectFormVariables can only be used in form field definitions: ${path}`);
+                        }
+                        if (node.arguments.length !== 1) {
+                            throw new Error(`injectFormVariables expects exactly one argument`);
+                        }
+                        const injectFormVariablesArg = node.arguments[0];
+                        if (!ts.isArrowFunction(injectFormVariablesArg)) {
+                            throw new Error(`injectFormVariables expects an arrow function as its argument`);
+                        }
+                        node = injectFormVariablesArg.body;
+                    }
+                }
                 if (ts.isArrowFunction(node)) {
                     if (supportedInlineCodePaths.includes(path)) {
                         let code = node.getText();
@@ -73,6 +89,9 @@ function transformConfigFile(fileName, sourceText) {
                                 return ts.factory.createObjectLiteralExpression([
                                     ts.factory.createPropertyAssignment("name", ts.factory.createStringLiteral(imprt.name)),
                                     ts.factory.createPropertyAssignment("import", ts.factory.createStringLiteral(imprt.import)),
+                                    ...(imprt.defaultImport
+                                        ? [ts.factory.createPropertyAssignment("defaultImport", ts.factory.createTrue())]
+                                        : []),
                                 ]);
                             }))),
                         ], true);
@@ -193,16 +212,25 @@ function getTypePropertyFromObjectLiteral(node) {
 function collectImports(rootNode) {
     const importedIdentifiers = new Map();
     function visit(node) {
-        if (ts.isImportDeclaration(node) &&
-            node.importClause &&
-            node.importClause.namedBindings &&
-            ts.isNamedImports(node.importClause.namedBindings)) {
+        if (ts.isImportDeclaration(node) && node.importClause) {
             const moduleSpecifier = node.moduleSpecifier.text;
-            for (const element of node.importClause.namedBindings.elements) {
-                const localName = element.name.text;
-                const originalName = element.propertyName ? element.propertyName.text : localName;
+            if (node.importClause.namedBindings && ts.isNamedImports(node.importClause.namedBindings)) {
+                //named import
+                for (const element of node.importClause.namedBindings.elements) {
+                    const localName = element.name.text;
+                    const originalName = element.propertyName ? element.propertyName.text : localName;
+                    importedIdentifiers.set(localName, {
+                        name: originalName,
+                        import: moduleSpecifier,
+                    });
+                }
+            }
+            else if (node.importClause.name && ts.isIdentifier(node.importClause.name)) {
+                //default import
+                const localName = node.importClause.name.text;
                 importedIdentifiers.set(localName, {
-                    name: originalName,
+                    defaultImport: true,
+                    name: localName,
                     import: moduleSpecifier,
                 });
             }

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

@@ -1,10 +1,11 @@
+import { type ApolloClient } from "@apollo/client";
 import { type GridColDef } from "@comet/admin";
 import { type IconName } from "@comet/admin-icons";
-import { type BlockInterface, type FinalFormFileUploadProps } from "@comet/cms-admin";
+import { type BlockInterface, type ContentScope, type FinalFormFileUploadProps } from "@comet/cms-admin";
 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 } from "final-form";
+import { type FieldValidator, type FormApi } from "final-form";
 import { type ComponentType } from "react";
 import { type UsableFields, type UsableFormFields } from "./generateGrid/usableFields";
 import { type ColumnVisibleOption } from "./utils/columnVisibility";
@@ -175,6 +176,14 @@ export type FormConfig<T extends {
      */
     navigateOnCreate?: boolean;
 };
+export type InjectedFormVariables = {
+    id?: string;
+    mode?: "edit" | "add";
+    client: ApolloClient<object>;
+    formApi: FormApi<unknown, Partial<unknown>>;
+    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;
     visible?: ColumnVisibleOption;

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.injectFormVariables = injectFormVariables;
 exports.defineConfig = defineConfig;
 const graphql_file_loader_1 = require("@graphql-tools/graphql-file-loader");
 const load_1 = require("@graphql-tools/load");
@@ -33,6 +34,10 @@ function isFormFieldConfig(arg) {
 function isFormLayoutConfig(arg) {
     return arg.type !== undefined && ["fieldSet", "optionalNestedFields"].includes(arg.type);
 }
+function injectFormVariables(fn) {
+    // this function is only used in config but never called at runtime
+    return fn({});
+}
 function defineConfig(config) {
     return config;
 }

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/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": "8.7.0-canary-20251113120441",
+  "version": "8.7.0-canary-20251113135204",
   "description": "Comet Admin Generator CLI tool",
   "repository": {
     "directory": "packages/admin/admin-generator",
@@ -30,6 +30,7 @@
     "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",
@@ -47,10 +48,10 @@
     "rimraf": "^6.0.1",
     "ts-jest": "^29.4.0",
     "typescript": "5.8.3",
-    "@comet/admin": "8.7.0-canary-20251113120441",
-    "@comet/admin-icons": "8.7.0-canary-20251113120441",
-    "@comet/cms-admin": "8.7.0-canary-20251113120441",
-    "@comet/eslint-config": "8.7.0-canary-20251113120441"
+    "@comet/admin": "8.7.0-canary-20251113135204",
+    "@comet/admin-icons": "8.7.0-canary-20251113135204",
+    "@comet/cms-admin": "8.7.0-canary-20251113135204",
+    "@comet/eslint-config": "8.7.0-canary-20251113135204"
   },
   "engines": {
     "node": ">=22.0.0"