@comet/admin-generator 9.0.0-canary-20251002124333 → 9.0.0-canary-20251113142723

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-20251002124333",
+  "version": "9.0.0-canary-20251113142723",
   "description": "Comet Admin Generator CLI tool",
   "repository": {
     "directory": "packages/admin/admin-generator",
@@ -30,27 +30,30 @@
     "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",
+    "@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",
     "prettier": "^3.6.2",
     "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "react-intl": "^7.1.11",
     "rimraf": "^6.0.1",
     "ts-jest": "^29.4.0",
     "typescript": "5.8.3",
-    "@comet/admin": "9.0.0-canary-20251002124333",
-    "@comet/admin-icons": "9.0.0-canary-20251002124333",
-    "@comet/cms-admin": "9.0.0-canary-20251002124333",
-    "@comet/eslint-config": "9.0.0-canary-20251002124333"
+    "@comet/admin": "9.0.0-canary-20251113142723",
+    "@comet/admin-icons": "9.0.0-canary-20251113142723",
+    "@comet/cms-admin": "9.0.0-canary-20251113142723",
+    "@comet/eslint-config": "9.0.0-canary-20251113142723"
   },
   "engines": {
     "node": ">=22.0.0"
@@ -60,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",