@eide/foir-cli 0.1.39 → 0.1.41

package/dist/cli.js

@@ -1871,6 +1871,11 @@ export interface FlexibleFieldDef extends BaseFieldDef {
   type: 'flexible';
 }
 
+/** Field def for inline model types (type is the model's key, e.g. 'seo', 'hero-banner') */
+export interface InlineModelFieldDef extends BaseFieldDef {
+  type: string;
+}
+
 export type FieldDef =
   | TextFieldDef
   | NumberFieldDef
@@ -1886,7 +1891,8 @@ export type FieldDef =
   | ReferenceFieldDef
   | ListFieldDef
   | JsonFieldDef
-  | FlexibleFieldDef;
+  | FlexibleFieldDef
+  | InlineModelFieldDef;
 `;
 }
 
@@ -5960,7 +5966,13 @@ var COMMANDS = [
     operation: "record",
     operationType: "query",
     positionalArgs: [{ name: "id", graphqlArg: "id" }],
-    alternateGet: { operation: "recordByKey", argName: "naturalKey" }
+    alternateGet: { operation: "recordByKey", argName: "naturalKey" },
+    customFlags: [
+      {
+        flag: "--model-key <key>",
+        description: "Model key (required when looking up by natural key)"
+      }
+    ]
   },
   {
     group: "records",
@@ -6010,7 +6022,7 @@ var COMMANDS = [
     successMessage: "Published version",
     customFlags: [
       {
-        flag: "--model <key>",
+        flag: "--model-key <key>",
         description: "Model key (use with natural key instead of version ID)"
       }
     ]
@@ -7771,6 +7783,11 @@ function registerDynamicCommands(program2, globalOpts) {
           if (entry.alternateGet && positionals.length > 0 && variables[positionals[0].graphqlArg]) {
             const firstArgValue = String(variables[positionals[0].graphqlArg]);
             if (!isUUID(firstArgValue)) {
+              if (entry.alternateGet.operation === "recordByKey" && !flags.modelKey) {
+                throw new Error(
+                  `"${firstArgValue}" is not a UUID. Use --model-key <key> to look up a record by natural key, or pass a record UUID.`
+                );
+              }
               const altEntry = {
                 ...entry,
                 operation: entry.alternateGet.operation,
@@ -7783,6 +7800,9 @@ function registerDynamicCommands(program2, globalOpts) {
               };
               delete variables[positionals[0].graphqlArg];
               variables[entry.alternateGet.argName] = firstArgValue;
+              if (flags.modelKey) {
+                variables.modelKey = String(flags.modelKey);
+              }
               const queryStr2 = engine.buildQuery(altEntry, variables);
               const result2 = await client.request(
                 queryStr2,
@@ -7804,41 +7824,33 @@ function registerDynamicCommands(program2, globalOpts) {
           }
           if (entry.group === "records" && entry.name === "publish" && variables.versionId) {
             const versionIdValue = String(variables.versionId);
-            if (flags.model) {
-              const lookupQuery = `query RecordByKey($naturalKey: String!) { recordByKey(naturalKey: $naturalKey) { id currentVersion { id } } }`;
+            if (flags.modelKey) {
+              const modelKey = String(flags.modelKey);
+              const lookupQuery = `query RecordByKey($modelKey: String!, $naturalKey: String!) { recordByKey(modelKey: $modelKey, naturalKey: $naturalKey) { id currentVersionId } }`;
               const lookupResult = await client.request(lookupQuery, {
+                modelKey,
                 naturalKey: versionIdValue
               });
               const record = lookupResult.recordByKey;
-              const currentVersion = record?.currentVersion;
-              if (!currentVersion?.id) {
+              if (!record?.currentVersionId) {
                 throw new Error(
                   `No current version found for record "${versionIdValue}"`
                 );
               }
-              variables.versionId = currentVersion.id;
+              variables.versionId = record.currentVersionId;
             } else if (!isUUID(versionIdValue)) {
-              const lookupQuery = `query RecordByKey($naturalKey: String!) { recordByKey(naturalKey: $naturalKey) { id currentVersion { id } } }`;
-              const lookupResult = await client.request(lookupQuery, {
-                naturalKey: versionIdValue
-              });
-              const record = lookupResult.recordByKey;
-              const currentVersion = record?.currentVersion;
-              if (currentVersion?.id) {
-                variables.versionId = currentVersion.id;
-              }
+              throw new Error(
+                `"${versionIdValue}" is not a UUID. Use --model-key <key> to resolve a natural key, or pass a version/record UUID directly.`
+              );
             } else {
               try {
-                const lookupQuery = `query Record($id: ID!) { record(id: $id) { id recordType currentVersion { id } } }`;
+                const lookupQuery = `query Record($id: ID!) { record(id: $id) { id recordType currentVersionId } }`;
                 const lookupResult = await client.request(lookupQuery, {
                   id: versionIdValue
                 });
                 const record = lookupResult.record;
-                if (record?.recordType === "record" && record?.currentVersion) {
-                  const cv = record.currentVersion;
-                  if (cv.id) {
-                    variables.versionId = cv.id;
-                  }
+                if (record?.recordType === "record" && record?.currentVersionId) {
+                  variables.versionId = record.currentVersionId;
                 }
               } catch {
               }
@@ -7902,7 +7914,8 @@ function registerDynamicCommands(program2, globalOpts) {
           }
           if (flags.publish && entry.group === "records" && entry.name === "create" && responseData) {
             const version2 = responseData.version;
-            const versionId = version2?.id;
+            const record = responseData.record;
+            const versionId = version2?.id ?? record?.currentVersionId;
             if (versionId) {
               const publishQuery = `mutation PublishVersion($versionId: ID!) { publishVersion(versionId: $versionId) }`;
               await client.request(publishQuery, { versionId });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eide/foir-cli",
-  "version": "0.1.39",
+  "version": "0.1.41",
   "description": "Universal platform CLI for Foir platform",
   "type": "module",
   "publishConfig": {
@@ -35,21 +35,6 @@
     "dist",
     "README.md"
   ],
-  "scripts": {
-    "build": "tsup",
-    "dev:cli": "tsx src/cli.ts",
-    "check-types": "tsc --noEmit",
-    "lint": "eslint src/",
-    "lint:fix": "eslint src/ --fix",
-    "test": "vitest run",
-    "test:watch": "vitest watch",
-    "codegen": "graphql-codegen --config codegen.ts",
-    "codegen:watch": "graphql-codegen --config codegen.ts --watch",
-    "prepublishOnly": "pnpm run build",
-    "release:patch": "pnpm version patch",
-    "release:minor": "pnpm version minor",
-    "release:major": "pnpm version major"
-  },
   "keywords": [
     "foir",
     "eide",
@@ -73,19 +58,19 @@
     "prettier": "^3.4.2"
   },
   "devDependencies": {
-    "@foir/platform": "workspace:*",
     "@graphql-codegen/cli": "^5.0.3",
     "@graphql-codegen/typed-document-node": "^5.0.12",
     "@graphql-codegen/typescript": "^4.1.2",
     "@graphql-codegen/typescript-operations": "^4.4.0",
     "@graphql-typed-document-node/core": "^3.2.0",
     "@types/inquirer": "^9.0.7",
-    "@eide/command-registry": "workspace:*",
     "@types/node": "^22.5.0",
     "tsup": "^8.5.1",
     "tsx": "^4.20.0",
     "typescript": "5.9.2",
-    "vitest": "^3.2.4"
+    "vitest": "^3.2.4",
+    "@eide/command-registry": "0.1.0",
+    "@foir/platform": "1.0.0"
   },
   "engines": {
     "node": ">=18.0.0"
@@ -94,5 +79,19 @@
     "type": "git",
     "url": "https://github.com/eidebuild/eide.git",
     "directory": "packages/cli"
+  },
+  "scripts": {
+    "build": "tsup",
+    "dev:cli": "tsx src/cli.ts",
+    "check-types": "tsc --noEmit",
+    "lint": "eslint src/",
+    "lint:fix": "eslint src/ --fix",
+    "test": "vitest run",
+    "test:watch": "vitest watch",
+    "codegen": "graphql-codegen --config codegen.ts",
+    "codegen:watch": "graphql-codegen --config codegen.ts --watch",
+    "release:patch": "pnpm version patch",
+    "release:minor": "pnpm version minor",
+    "release:major": "pnpm version major"
   }
-}
+}