@fern-api/fern-api-dev 5.47.3 → 5.47.4

package/cli.cjs

@@ -237620,6 +237620,11 @@ var init_GraphQLConverter = __esm({
         }
         return true;
       }
+      // NOTE: This heuristic treats a type as a namespace (operation-grouping type) when ALL
+      // of its fields accept arguments. This can produce a false positive for regular data
+      // types where every field happens to be parameterized. If that becomes a problem,
+      // introduce an explicit config option (e.g. namespacedRootTypes: [...]) rather than
+      // relying on field-arg counts alone.
       isNamespaceType(type8) {
         const fields = Object.values(type8.getFields());
         if (fields.length === 0) {
@@ -237627,29 +237632,81 @@ var init_GraphQLConverter = __esm({
         }
         return fields.every((f4) => f4.args.length > 0);
       }
+      // Returns the names of object types that will be consumed as namespace groupings by
+      // convertOperations — i.e. types that appear as the return type of a zero-arg root
+      // field whose own fields all accept arguments. These types must be excluded from the
+      // type registry in collectTypeDefinitions to prevent their fields from showing up
+      // both as object properties and as standalone operations.
+      collectNamespaceTypeNames() {
+        if (!this.schema) {
+          return /* @__PURE__ */ new Set();
+        }
+        const namespaceTypeNames = /* @__PURE__ */ new Set();
+        const rootTypes = [];
+        const queryType = this.schema.getQueryType();
+        if (queryType) {
+          rootTypes.push(queryType);
+        }
+        const mutationType = this.schema.getMutationType();
+        if (mutationType) {
+          rootTypes.push(mutationType);
+        }
+        const subscriptionType = this.schema.getSubscriptionType();
+        if (subscriptionType && this.isActualSubscriptionRootType(subscriptionType)) {
+          rootTypes.push(subscriptionType);
+        }
+        for (const rootType of rootTypes) {
+          for (const field5 of Object.values(rootType.getFields())) {
+            const returnRawType = this.unwrapNonNull(field5.type);
+            if (returnRawType instanceof GraphQLObjectType && field5.args.length === 0 && this.isNamespaceType(returnRawType)) {
+              namespaceTypeNames.add(returnRawType.name);
+            }
+          }
+        }
+        return namespaceTypeNames;
+      }
       async convert() {
         const sdlContent = await (0, import_promises38.readFile)(this.filePath, "utf-8");
         this.schema = buildSchema(sdlContent);
         this.collectTypeDefinitions();
-        const graphqlOperations = {};
+        const pendingOperations = [];
         const queryType = this.schema.getQueryType();
         if (queryType) {
-          this.convertOperations(queryType, "QUERY", graphqlOperations);
+          this.convertOperations(queryType, "QUERY", pendingOperations);
         }
         const mutationType = this.schema.getMutationType();
         if (mutationType) {
-          this.convertOperations(mutationType, "MUTATION", graphqlOperations);
+          this.convertOperations(mutationType, "MUTATION", pendingOperations);
         }
         const subscriptionType = this.schema.getSubscriptionType();
         if (subscriptionType && this.isActualSubscriptionRootType(subscriptionType)) {
-          this.convertOperations(subscriptionType, "SUBSCRIPTION", graphqlOperations);
+          this.convertOperations(subscriptionType, "SUBSCRIPTION", pendingOperations);
         }
+        const graphqlOperations = this.resolveOperationIds(pendingOperations);
         return { graphqlOperations, types: this.types };
       }
+      resolveOperationIds(pending) {
+        const flatIdCounts = /* @__PURE__ */ new Map();
+        for (const op4 of pending) {
+          flatIdCounts.set(op4.flatId, (flatIdCounts.get(op4.flatId) ?? 0) + 1);
+        }
+        const result = {};
+        for (const op4 of pending) {
+          const hasCollision = (flatIdCounts.get(op4.flatId) ?? 0) > 1;
+          const finalId = hasCollision ? op4.namespacedId : op4.flatId;
+          const operationId = this.getNamespacedOperationId(finalId);
+          result[operationId] = {
+            ...op4.operation,
+            id: operationId
+          };
+        }
+        return result;
+      }
       collectTypeDefinitions() {
         if (!this.schema) {
           return;
         }
+        const namespaceTypeNames = this.collectNamespaceTypeNames();
         const typeMap = this.schema.getTypeMap();
         for (const [typeName, type8] of Object.entries(typeMap)) {
           if (typeName.startsWith("__")) {
@@ -237661,6 +237718,9 @@ var init_GraphQLConverter = __esm({
           if (type8 === this.schema.getSubscriptionType() && type8 instanceof GraphQLObjectType && this.isActualSubscriptionRootType(type8)) {
             continue;
           }
+          if (type8 instanceof GraphQLObjectType && namespaceTypeNames.has(typeName)) {
+            continue;
+          }
           if (type8 instanceof GraphQLScalarType && this.isBuiltInScalar(typeName)) {
             continue;
           }
@@ -237746,23 +237806,32 @@ var init_GraphQLConverter = __esm({
           }
         }
       }
-      convertOperations(type8, operationType, operations) {
+      convertOperations(type8, operationType, pending) {
         const fields = type8.getFields();
         for (const [fieldName, field5] of Object.entries(fields)) {
           const returnRawType = this.unwrapNonNull(field5.type);
           if (returnRawType instanceof GraphQLObjectType && field5.args.length === 0 && this.isNamespaceType(returnRawType)) {
-            this.convertNamespaceOperations(returnRawType, fieldName, operationType, operations);
+            this.convertNamespaceOperations(returnRawType, operationType, pending, [fieldName]);
           } else {
-            const operationId = this.getNamespacedOperationId(`${operationType.toLowerCase()}_${fieldName}`);
-            operations[operationId] = this.convertField(field5, fieldName, operationType);
+            const flatId = `${operationType.toLowerCase()}_${fieldName}`;
+            pending.push({
+              flatId,
+              namespacedId: flatId,
+              operation: this.convertField(field5, fieldName, operationType)
+            });
           }
         }
       }
-      convertNamespaceOperations(namespaceType, _parentName, operationType, operations) {
+      convertNamespaceOperations(namespaceType, operationType, pending, fieldPath) {
         const fields = namespaceType.getFields();
         for (const [fieldName, field5] of Object.entries(fields)) {
-          const operationId = this.getNamespacedOperationId(`${operationType.toLowerCase()}_${fieldName}`);
-          operations[operationId] = this.convertField(field5, fieldName, operationType);
+          const flatId = `${operationType.toLowerCase()}_${fieldName}`;
+          const namespacedId = `${operationType.toLowerCase()}_${[...fieldPath, fieldName].join(".")}`;
+          pending.push({
+            flatId,
+            namespacedId,
+            operation: this.convertField(field5, fieldName, operationType, fieldPath)
+          });
         }
       }
       unwrapNonNull(type8) {
@@ -237771,16 +237840,18 @@ var init_GraphQLConverter = __esm({
         }
         return type8;
       }
-      convertField(field5, name2, operationType) {
+      convertField(field5, name2, operationType, fieldPath) {
         const args = field5.args.map((arg) => this.convertArgument(arg));
         const examples = this.examplesByOperation.get(`${operationType.toLowerCase()}:${name2}`) ?? this.examplesByOperation.get(name2);
         return {
-          id: this.getNamespacedOperationId(`${operationType.toLowerCase()}_${name2}`),
+          id: FdrAPI_exports.GraphQlOperationId(""),
+          // placeholder, resolved in resolveOperationIds
           operationType,
           name: name2,
           displayName: void 0,
           description: field5.description ?? void 0,
           availability: void 0,
+          fieldPath: fieldPath != null && fieldPath.length > 0 ? fieldPath : void 0,
           arguments: args.length > 0 ? args : void 0,
           returnType: this.convertOutputType(field5.type),
           examples: examples != null && examples.length > 0 ? examples : void 0,
@@ -237974,7 +238045,8 @@ var init_GraphQLConverter = __esm({
           valueType: this.convertOutputType(field5.type),
           description: field5.description ?? void 0,
           availability: void 0,
-          propertyAccess: void 0
+          propertyAccess: void 0,
+          arguments: field5.args.length > 0 ? field5.args.map((arg) => this.convertArgument(arg)) : void 0
         }));
         const interfaces = type8.getInterfaces();
         const extendsIds = interfaces.filter((iface) => {
@@ -238021,7 +238093,8 @@ var init_GraphQLConverter = __esm({
           valueType: this.convertOutputType(field5.type),
           description: field5.description ?? void 0,
           availability: void 0,
-          propertyAccess: void 0
+          propertyAccess: void 0,
+          arguments: field5.args.length > 0 ? field5.args.map((arg) => this.convertArgument(arg)) : void 0
         }));
         return {
           type: "object",
@@ -670391,7 +670464,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.47.3",
+          version: "5.47.4",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -670455,7 +670528,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.47.3",
+        version: "5.47.4",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -821724,6 +821797,9 @@ function toPageNode({ docsWorkspace, page, parentSlug, idgen, markdownFilesToFul
 }
 
 // ../docs-resolver/lib/ApiReferenceNodeConverter.js
+function getFieldPath(operation) {
+  return operation.fieldPath;
+}
 var ApiReferenceNodeConverter = class {
   apiSection;
   docsWorkspace;
@@ -822505,27 +822581,7 @@ ${tagInfo.description}`;
         }
         const sectionTitle = operationTypeLabels[operationType];
         const sectionSlug = namespaceSlug.append(kebabCase_default(sectionTitle));
-        const children2 = operations.map((operation) => {
-          const operationSlug = sectionSlug.append(operation.name ?? operation.id);
-          return {
-            id: navigation_exports.V1.NodeId(`${this.apiDefinitionId}:${operation.id}`),
-            type: "graphql",
-            collapsed: void 0,
-            operationType: operation.operationType,
-            graphqlOperationId: APIV1Read_exports.GraphQlOperationId(operation.id),
-            apiDefinitionId: this.apiDefinitionId,
-            availability: convertDocsAvailability(parentAvailability),
-            title: operation.displayName ?? operation.name ?? operation.id,
-            slug: operationSlug.get(),
-            icon: void 0,
-            hidden: this.hideChildren,
-            playground: void 0,
-            authed: void 0,
-            viewers: void 0,
-            orphaned: void 0,
-            featureFlags: void 0
-          };
-        });
+        const children2 = this.#buildFieldPathGroupedChildren(operations, sectionSlug, parentAvailability, operationType);
         const sectionNode = {
           id: this.#idgen.get(`${this.apiDefinitionId}:graphql:${namespace}:${operationType}`),
           type: "apiPackage",
@@ -822581,27 +822637,7 @@ ${tagInfo.description}`;
       }
       const sectionTitle = operationTypeLabels[operationType];
       const sectionSlug = parentSlug.append(kebabCase_default(sectionTitle));
-      const children2 = operations.map((operation) => {
-        const operationSlug = sectionSlug.append(operation.name ?? operation.id);
-        return {
-          id: navigation_exports.V1.NodeId(`${this.apiDefinitionId}:${operation.id}`),
-          type: "graphql",
-          collapsed: void 0,
-          operationType: operation.operationType,
-          graphqlOperationId: APIV1Read_exports.GraphQlOperationId(operation.id),
-          apiDefinitionId: this.apiDefinitionId,
-          availability: convertDocsAvailability(parentAvailability),
-          title: operation.displayName ?? operation.name ?? operation.id,
-          slug: operationSlug.get(),
-          icon: void 0,
-          hidden: this.hideChildren,
-          playground: void 0,
-          authed: void 0,
-          viewers: void 0,
-          orphaned: void 0,
-          featureFlags: void 0
-        };
-      });
+      const children2 = this.#buildFieldPathGroupedChildren(operations, sectionSlug, parentAvailability, operationType);
       const sectionNode = {
         id: this.#idgen.get(`${this.apiDefinitionId}:graphql:${operationType}`),
         type: "apiPackage",
@@ -822628,6 +822664,83 @@ ${tagInfo.description}`;
     }
     return sections;
   }
+  #buildFieldPathGroupedChildren(operations, parentSlug, parentAvailability, operationType) {
+    const shouldGroup = operationType === "QUERY";
+    const groupedByParent = /* @__PURE__ */ new Map();
+    const insertionOrder = [];
+    for (const operation of operations) {
+      const parentField = getFieldPath(operation)?.[0];
+      if (shouldGroup && parentField != null) {
+        const group = groupedByParent.get(parentField);
+        if (group != null) {
+          group.push(operation);
+        } else {
+          groupedByParent.set(parentField, [operation]);
+          insertionOrder.push({ type: "group", parentField });
+        }
+      } else {
+        insertionOrder.push({ type: "flat", operation });
+      }
+    }
+    const children2 = [];
+    for (const entry of insertionOrder) {
+      if (entry.type === "flat") {
+        const fieldPath = getFieldPath(entry.operation);
+        const leafName = entry.operation.name ?? entry.operation.id;
+        let operationSlug = parentSlug;
+        if (fieldPath != null && fieldPath.length > 0) {
+          for (const segment of fieldPath) {
+            operationSlug = operationSlug.append(kebabCase_default(segment));
+          }
+        }
+        operationSlug = operationSlug.append(kebabCase_default(leafName));
+        children2.push({
+          id: navigation_exports.V1.NodeId(`${this.apiDefinitionId}:${entry.operation.id}`),
+          type: "graphql",
+          collapsed: void 0,
+          operationType: entry.operation.operationType,
+          graphqlOperationId: APIV1Read_exports.GraphQlOperationId(entry.operation.id),
+          apiDefinitionId: this.apiDefinitionId,
+          availability: convertDocsAvailability(parentAvailability),
+          title: entry.operation.displayName ?? entry.operation.name ?? entry.operation.id,
+          slug: operationSlug.get(),
+          icon: void 0,
+          hidden: this.hideChildren,
+          playground: void 0,
+          authed: void 0,
+          viewers: void 0,
+          orphaned: void 0,
+          featureFlags: void 0
+        });
+      } else {
+        const groupOps = groupedByParent.get(entry.parentField) ?? [];
+        const firstOp = groupOps[0];
+        if (firstOp == null) {
+          continue;
+        }
+        const fieldSlug = parentSlug.append(kebabCase_default(entry.parentField));
+        children2.push({
+          id: navigation_exports.V1.NodeId(`${this.apiDefinitionId}:${firstOp.id}`),
+          type: "graphql",
+          collapsed: void 0,
+          operationType: firstOp.operationType,
+          graphqlOperationId: APIV1Read_exports.GraphQlOperationId(firstOp.id),
+          apiDefinitionId: this.apiDefinitionId,
+          availability: convertDocsAvailability(parentAvailability),
+          title: entry.parentField,
+          slug: fieldSlug.get(),
+          icon: void 0,
+          hidden: this.hideChildren,
+          playground: void 0,
+          authed: void 0,
+          viewers: void 0,
+          orphaned: void 0,
+          featureFlags: void 0
+        });
+      }
+    }
+    return children2;
+  }
   #convertApiDefinitionPackageId(packageId, parentSlug, parentAvailability) {
     const pkg2 = packageId != null ? this.#holder.resolveSubpackage(this.#holder.getSubpackageByIdOrLocator(packageId)) : void 0;
     if (pkg2 == null) {
@@ -862424,7 +862537,7 @@ var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 var MAX_LOGS_DIR_SIZE_BYTES = 100 * 1024 * 1024;
 function getCliSource() {
-  const version7 = "5.47.3";
+  const version7 = "5.47.4";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -893653,7 +893766,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.47.3",
+        cliVersion: "5.47.4",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -959034,7 +959147,7 @@ function getAutomationContextFromEnv() {
     config_branch: process.env.FERN_CONFIG_BRANCH,
     config_pr_number: process.env.FERN_CONFIG_PR_NUMBER,
     trigger: process.env.GITHUB_EVENT_NAME,
-    cli_version: "5.47.3"
+    cli_version: "5.47.4"
   };
 }
 function isAutomationMode() {
@@ -959860,7 +959973,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.47.3";
+    return "5.47.4";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.47.3",
+  "version": "5.47.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",