@docyrus/docyrus 0.0.15 → 0.0.16

package/main.js

@@ -124678,7 +124678,7 @@ function buildInputSchema(args, env2, options2) {
 // package.json
 var package_default = {
   name: "@docyrus/docyrus",
-  version: "0.0.15",
+  version: "0.0.16",
   private: false,
   description: "Docyrus API CLI",
   main: "./main.js",
@@ -126227,7 +126227,7 @@ function parseOpenApiDocument(raw) {
   }
   return parsed;
 }
-async function loadOpenApiSpec(dependencies, tenantId) {
+async function loadOpenApiSpec(dependencies, tenantId, options2) {
   let filePath = dependencies.tenantOpenApiService.getTenantOpenApiFilePath(tenantId);
   let downloaded = false;
   let sourceUrl;
@@ -126241,7 +126241,7 @@ async function loadOpenApiSpec(dependencies, tenantId) {
         cause: error48
       });
     }
-    const downloadResult = await dependencies.tenantOpenApiService.downloadTenantOpenApi(tenantId);
+    const downloadResult = await dependencies.tenantOpenApiService.downloadTenantOpenApi(tenantId, options2);
     downloaded = true;
     sourceUrl = downloadResult.sourceUrl;
     filePath = downloadResult.filePath;
@@ -126260,11 +126260,15 @@ async function withActiveTenantSpec(dependencies) {
   if (!activeProfile) {
     throw new AuthSessionError("No active session found. Run 'docyrus auth login'.");
   }
-  const spec = await loadOpenApiSpec(dependencies, activeProfile.tenantId);
+  const authSessionService = dependencies.createAuthSessionService(apiBaseUrl);
+  const authToken = await authSessionService.getValidAccessToken();
   return {
     apiBaseUrl,
     activeProfile,
-    spec
+    spec: await loadOpenApiSpec(dependencies, activeProfile.tenantId, {
+      apiBaseUrl,
+      authToken
+    })
   };
 }
 function createDiscoverCli(dependencies) {
@@ -126280,7 +126284,12 @@ function createDiscoverCli(dependencies) {
       if (!activeProfile) {
         throw new AuthSessionError("No active session found. Run 'docyrus auth login'.");
       }
-      const downloaded = await dependencies.tenantOpenApiService.downloadTenantOpenApi(activeProfile.tenantId);
+      const authSessionService = dependencies.createAuthSessionService(apiBaseUrl);
+      const authToken = await authSessionService.getValidAccessToken();
+      const downloaded = await dependencies.tenantOpenApiService.downloadTenantOpenApi(activeProfile.tenantId, {
+        apiBaseUrl,
+        authToken
+      });
       return await injectContext({
         apiBaseUrl,
         authStore: dependencies.authStore,
@@ -126753,6 +126762,65 @@ function requireNonEmptyObject(payload, label) {
     throw new UserInputError(`${label} payload is empty. Provide flags, --data, or --from-file.`);
   }
 }
+function isRecord5(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function normalizeBatchUpdateFieldItem(item) {
+  if (!isRecord5(item)) {
+    return item;
+  }
+  const normalized = {
+    ...item
+  };
+  if (!("fieldId" in normalized) && typeof normalized.id === "string") {
+    normalized.fieldId = normalized.id;
+  }
+  if (!("readOnly" in normalized) && "read_only" in normalized) {
+    normalized.readOnly = normalized.read_only;
+  }
+  if (!("defaultValue" in normalized) && "default_value" in normalized) {
+    normalized.defaultValue = normalized.default_value;
+  }
+  if (!("relationDataSourceId" in normalized) && "relation_data_source_id" in normalized) {
+    normalized.relationDataSourceId = normalized.relation_data_source_id;
+  }
+  if (!("editorOptions" in normalized) && "options" in normalized) {
+    normalized.editorOptions = normalized.options;
+  }
+  return normalized;
+}
+function normalizeBatchUpdateFieldsPayload(payload) {
+  const fields = payload.fields;
+  if (!Array.isArray(fields)) {
+    return payload;
+  }
+  return {
+    ...payload,
+    fields: fields.map((item) => normalizeBatchUpdateFieldItem(item))
+  };
+}
+function normalizeUpdateEnumItem(item) {
+  if (!isRecord5(item)) {
+    return item;
+  }
+  if (!("enumId" in item) && typeof item.id === "string") {
+    return {
+      ...item,
+      enumId: item.id
+    };
+  }
+  return item;
+}
+function normalizeUpdateEnumsPayload(payload) {
+  const enums = payload.enums;
+  if (!Array.isArray(enums)) {
+    return payload;
+  }
+  return {
+    ...payload,
+    enums: enums.map((item) => normalizeUpdateEnumItem(item))
+  };
+}
 function createStudioCli(dependencies) {
   const studioCli = Cli_exports.create("studio", {
     description: "Studio (dev app data source CRUD) commands",
@@ -127249,10 +127317,11 @@ function createStudioCli(dependencies) {
         }),
         "fields"
       );
+      const normalizedPayload = normalizeBatchUpdateFieldsPayload(payload);
       const response = await studio.apiClient.request({
         method: "PATCH",
         path: `/dev/apps/${appId}/data-sources/${dataSourceId}/fields/batch`,
-        body: payload
+        body: normalizedPayload
       });
       return await wrapStudioPayload(studio.apiBaseUrl, dependencies, response.data);
     }
@@ -127413,10 +127482,11 @@ function createStudioCli(dependencies) {
         }),
         "enums"
       );
+      const normalizedPayload = normalizeUpdateEnumsPayload(payload);
       const response = await studio.apiClient.request({
         method: "PATCH",
         path: `/dev/apps/${appId}/data-sources/${dataSourceId}/fields/${fieldId}/enums`,
-        body: payload
+        body: normalizedPayload
       });
       return await wrapStudioPayload(studio.apiBaseUrl, dependencies, response.data);
     }
@@ -127750,7 +127820,7 @@ var ApiClient = class {
 
 // src/services/authSession.ts
 var DEFAULT_MANUAL_ACCESS_TOKEN_EXPIRY_SECONDS = 3600;
-function isRecord5(value) {
+function isRecord6(value) {
   return typeof value === "object" && value !== null;
 }
 function extractRecordValue(record2, keys) {
@@ -128063,11 +128133,11 @@ var AuthSessionService = class {
       fetchFn: this.params.fetchFn
     });
     const payload = response.data;
-    const dataCandidate = isRecord5(payload) && isRecord5(payload.data) ? payload.data : payload;
-    if (!isRecord5(dataCandidate)) {
+    const dataCandidate = isRecord6(payload) && isRecord6(payload.data) ? payload.data : payload;
+    if (!isRecord6(dataCandidate)) {
       throw new AuthSessionError("Unable to parse /users/me response.");
     }
-    const tenantCandidate = isRecord5(dataCandidate.tenant) ? dataCandidate.tenant : void 0;
+    const tenantCandidate = isRecord6(dataCandidate.tenant) ? dataCandidate.tenant : void 0;
     const userId = extractString3(dataCandidate, ["id", "user_id"]);
     const email3 = extractString3(dataCandidate, ["email"]);
     const tenantId = tenantCandidate ? extractString3(tenantCandidate, ["id"]) : extractString3(dataCandidate, ["tenant_id", "tenantId"]);
@@ -128093,13 +128163,13 @@ var AuthSessionService = class {
       fetchFn: this.params.fetchFn
     });
     const payload = response.data;
-    const listCandidate = Array.isArray(payload) ? payload : isRecord5(payload) && Array.isArray(payload.data) ? payload.data : null;
+    const listCandidate = Array.isArray(payload) ? payload : isRecord6(payload) && Array.isArray(payload.data) ? payload.data : null;
     if (!listCandidate) {
       throw new AuthSessionError("Unable to parse tenant catalog response.");
     }
     const mapped = [];
     for (const item of listCandidate) {
-      if (!isRecord5(item)) {
+      if (!isRecord6(item)) {
         continue;
       }
       const tenantId = extractString3(item, ["id", "tenant_id"]);
@@ -128781,10 +128851,66 @@ var import_node_path9 = require("node:path");
 function resolveSourceUrl(tenantId, template) {
   return template.replace("{tenantId}", encodeURIComponent(tenantId));
 }
+async function parseOpenApiJsonResponse(response, params) {
+  const content = await response.text();
+  let parsedContent;
+  try {
+    parsedContent = JSON.parse(content);
+  } catch (error48) {
+    throw new AuthSessionError("Downloaded tenant OpenAPI spec is invalid JSON.", {
+      tenantId: params.tenantId,
+      sourceUrl: params.sourceUrl,
+      cause: error48
+    });
+  }
+  return parsedContent;
+}
 var TenantOpenApiService = class {
   constructor(params) {
     this.params = params;
   }
+  async #writeOpenApiFile(tenantId, parsedContent) {
+    const filePath = this.getTenantOpenApiFilePath(tenantId);
+    await (0, import_promises7.mkdir)((0, import_node_path9.dirname)(filePath), {
+      recursive: true,
+      mode: 448
+    });
+    await (0, import_promises7.writeFile)(filePath, `${JSON.stringify(parsedContent, null, 2)}
+`, {
+      encoding: "utf8",
+      mode: 384
+    });
+    await (0, import_promises7.chmod)(filePath, 384);
+    return filePath;
+  }
+  async #generateTenantOpenApiViaAuthenticatedEndpoint(tenantId, options2) {
+    if (!options2.apiBaseUrl || !options2.authToken) {
+      throw new AuthSessionError("Failed to download tenant OpenAPI spec.", {
+        tenantId,
+        reason: "OpenAPI file is missing and no authenticated fallback request could be made."
+      });
+    }
+    const apiUrl = `${normalizeApiBaseUrl(options2.apiBaseUrl)}/api/openapi.json`;
+    const response = await (this.params?.fetchFn || fetch)(apiUrl, {
+      method: "GET",
+      headers: {
+        Accept: "application/json",
+        Authorization: `Bearer ${options2.authToken}`
+      }
+    });
+    if (!response.ok) {
+      throw new AuthSessionError("Failed to generate tenant OpenAPI spec via authenticated endpoint.", {
+        tenantId,
+        sourceUrl: apiUrl,
+        status: response.status,
+        statusText: response.statusText
+      });
+    }
+    return await parseOpenApiJsonResponse(response, {
+      tenantId,
+      sourceUrl: apiUrl
+    });
+  }
   getTenantOpenApiFilePath(tenantId) {
     const normalizedTenantId = tenantId.trim();
     if (!normalizedTenantId) {
@@ -128793,7 +128919,7 @@ var TenantOpenApiService = class {
     const rootPath = this.params?.rootPath || TENANT_OPENAPI_ROOT_PATH;
     return (0, import_node_path9.join)(rootPath, normalizedTenantId, "openapi.json");
   }
-  async downloadTenantOpenApi(tenantId) {
+  async downloadTenantOpenApi(tenantId, options2 = {}) {
     const normalizedTenantId = tenantId.trim();
     if (!normalizedTenantId) {
       throw new AuthSessionError("Tenant ID is required to download OpenAPI spec.");
@@ -128806,35 +128932,34 @@ var TenantOpenApiService = class {
       method: "GET"
     });
     if (!response.ok) {
-      throw new AuthSessionError("Failed to download tenant OpenAPI spec.", {
-        tenantId: normalizedTenantId,
-        sourceUrl,
-        status: response.status,
-        statusText: response.statusText
+      if (response.status !== 404) {
+        throw new AuthSessionError("Failed to download tenant OpenAPI spec.", {
+          tenantId: normalizedTenantId,
+          sourceUrl,
+          status: response.status,
+          statusText: response.statusText
+        });
+      }
+      const generatedSpec = await this.#generateTenantOpenApiViaAuthenticatedEndpoint(normalizedTenantId, options2);
+      const retryResponse = await (this.params?.fetchFn || fetch)(sourceUrl, {
+        method: "GET"
       });
-    }
-    const content = await response.text();
-    let parsedContent;
-    try {
-      parsedContent = JSON.parse(content);
-    } catch (error48) {
-      throw new AuthSessionError("Downloaded tenant OpenAPI spec is invalid JSON.", {
+      const parsedContent2 = retryResponse.ok ? await parseOpenApiJsonResponse(retryResponse, {
+        tenantId: normalizedTenantId,
+        sourceUrl
+      }) : generatedSpec;
+      const filePath2 = await this.#writeOpenApiFile(normalizedTenantId, parsedContent2);
+      return {
         tenantId: normalizedTenantId,
         sourceUrl,
-        cause: error48
-      });
+        filePath: filePath2
+      };
     }
-    const filePath = this.getTenantOpenApiFilePath(normalizedTenantId);
-    await (0, import_promises7.mkdir)((0, import_node_path9.dirname)(filePath), {
-      recursive: true,
-      mode: 448
-    });
-    await (0, import_promises7.writeFile)(filePath, `${JSON.stringify(parsedContent, null, 2)}
-`, {
-      encoding: "utf8",
-      mode: 384
+    const parsedContent = await parseOpenApiJsonResponse(response, {
+      tenantId: normalizedTenantId,
+      sourceUrl
     });
-    await (0, import_promises7.chmod)(filePath, 384);
+    const filePath = await this.#writeOpenApiFile(normalizedTenantId, parsedContent);
     return {
       tenantId: normalizedTenantId,
       sourceUrl,
@@ -128937,6 +129062,7 @@ function createDocyrusCli(params) {
   }));
   cli2.command(createDiscoverCli({
     environmentConfigService,
+    createAuthSessionService,
     authStore,
     tenantOpenApiService
   }));