@fern-api/fern-api-dev 5.63.1 → 5.64.1

package/cli.cjs

@@ -366386,39 +366386,6 @@ var init_GraphQLConverter = __esm({
         }
         return fields.every((f3) => f3.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);
@@ -366460,7 +366427,6 @@ var init_GraphQLConverter = __esm({
         if (!this.schema) {
           return;
         }
-        const namespaceTypeNames = this.collectNamespaceTypeNames();
         const typeMap = this.schema.getTypeMap();
         for (const [typeName, type7] of Object.entries(typeMap)) {
           if (typeName.startsWith("__")) {
@@ -366472,9 +366438,6 @@ var init_GraphQLConverter = __esm({
           if (type7 === this.schema.getSubscriptionType() && type7 instanceof GraphQLObjectType && this.isActualSubscriptionRootType(type7)) {
             continue;
           }
-          if (type7 instanceof GraphQLObjectType && namespaceTypeNames.has(typeName)) {
-            continue;
-          }
           if (type7 instanceof GraphQLScalarType && this.isBuiltInScalar(typeName)) {
             continue;
           }
@@ -366560,14 +366523,30 @@ var init_GraphQLConverter = __esm({
           }
         }
       }
+      // Builds an operation id of the form `<operationType>_<segments joined by ".">`.
+      // Flat (top-level) ids use a single segment; namespaced ids include the full field
+      // path so that fields sharing a leaf name across namespaces resolve to distinct ids.
+      // resolveOperationIds falls back from the flat id to the namespaced id on collision,
+      // so both must be produced with this same format for that fallback to line up.
+      buildOperationId(operationType, segments) {
+        return `${operationType.toLowerCase()}_${segments.join(".")}`;
+      }
       convertOperations(type7, operationType, pending) {
         const fields = type7.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)) {
+            if (operationType === "QUERY") {
+              const parentFlatId = this.buildOperationId(operationType, [fieldName]);
+              pending.push({
+                flatId: parentFlatId,
+                namespacedId: parentFlatId,
+                operation: this.convertField(field5, fieldName, operationType)
+              });
+            }
             this.convertNamespaceOperations(returnRawType, operationType, pending, [fieldName]);
           } else {
-            const flatId = `${operationType.toLowerCase()}_${fieldName}`;
+            const flatId = this.buildOperationId(operationType, [fieldName]);
             pending.push({
               flatId,
               namespacedId: flatId,
@@ -366579,8 +366558,8 @@ var init_GraphQLConverter = __esm({
       convertNamespaceOperations(namespaceType, operationType, pending, fieldPath) {
         const fields = namespaceType.getFields();
         for (const [fieldName, field5] of Object.entries(fields)) {
-          const flatId = `${operationType.toLowerCase()}_${fieldName}`;
-          const namespacedId = `${operationType.toLowerCase()}_${[...fieldPath, fieldName].join(".")}`;
+          const flatId = this.buildOperationId(operationType, [fieldName]);
+          const namespacedId = this.buildOperationId(operationType, [...fieldPath, fieldName]);
           pending.push({
             flatId,
             namespacedId,
@@ -453327,6 +453306,9 @@ var init_toPageNode = __esm({
 function getFieldPath(operation) {
   return operation.fieldPath;
 }
+function getOperationName(operation) {
+  return operation.name ?? operation.id;
+}
 var import_url_join21, ApiReferenceNodeConverter;
 var init_ApiReferenceNodeConverter = __esm({
   "../docs-resolver/lib/ApiReferenceNodeConverter.js"() {
@@ -453792,25 +453774,20 @@ ${tagInfo.description}`;
           }
           this.#visitedGraphqlOperations.add(operationId);
           const operationSlug = endpointItem.slug != null ? parentSlug.append(endpointItem.slug) : parentSlug.append(graphqlOperation.name ?? graphqlOperation.id);
-          return {
+          return this.#buildGraphqlChildNode({
             id: this.#idgen.get(`${this.apiDefinitionId}:${operationId}`),
-            type: "graphql",
-            collapsed: void 0,
             operationType: graphqlOperation.operationType,
             graphqlOperationId: APIV1Read_exports.GraphQlOperationId(graphqlOperation.id),
-            graphqlOperationIds: void 0,
-            apiDefinitionId: this.apiDefinitionId,
-            availability: convertDocsAvailability(endpointItem.availability ?? parentAvailability),
             title: endpointItem.title ?? graphqlOperation.displayName ?? graphqlOperation.name ?? graphqlOperation.id,
             slug: operationSlug.get(),
+            availability: endpointItem.availability ?? parentAvailability,
             icon: this.resolveIconFileId(endpointItem.icon),
             hidden: this.hideChildren || endpointItem.hidden,
             playground: this.#convertPlaygroundSettings(endpointItem.playground),
-            authed: void 0,
             viewers: endpointItem.viewers,
             orphaned: endpointItem.orphaned,
             featureFlags: endpointItem.featureFlags
-          };
+          });
         }
         this.taskContext.logger.error("Unknown identifier in the API Reference layout: ", endpointItem.endpoint);
         return;
@@ -453879,25 +453856,18 @@ ${tagInfo.description}`;
         }
         this.#visitedGraphqlOperations.add(operationId);
         const operationSlug = operationItem.slug != null ? parentSlug.append(operationItem.slug) : parentSlug.append(graphqlOperation.name ?? graphqlOperation.id);
-        return {
+        return this.#buildGraphqlChildNode({
           id: this.#idgen.get(`${this.apiDefinitionId}:${operationId}`),
-          type: "graphql",
-          collapsed: void 0,
           operationType: graphqlOperation.operationType,
           graphqlOperationId: APIV1Read_exports.GraphQlOperationId(graphqlOperation.id),
-          graphqlOperationIds: void 0,
-          apiDefinitionId: this.apiDefinitionId,
-          availability: convertDocsAvailability(operationItem.availability ?? parentAvailability),
           title: operationItem.title ?? graphqlOperation.displayName ?? graphqlOperation.name ?? graphqlOperation.id,
           slug: operationSlug.get(),
-          icon: void 0,
+          availability: operationItem.availability ?? parentAvailability,
           hidden: this.hideChildren || operationItem.hidden,
-          playground: void 0,
-          authed: void 0,
           viewers: operationItem.viewers,
           orphaned: operationItem.orphaned,
           featureFlags: operationItem.featureFlags
-        };
+        });
       }
       // Step 2
       #mergeAndFilterChildren(left3, right3) {
@@ -454215,6 +454185,32 @@ ${tagInfo.description}`;
         }
         return sections;
       }
+      // Single source of truth for constructing a GraphQL navigation child node. Callers pass
+      // the fields that vary; the fixed shape (type, apiDefinitionId, authed, ...) and the
+      // availability conversion live here. Optional fields left unset serialize as `undefined`,
+      // matching the previous inline literals exactly — `hidden` is passed explicitly by every
+      // caller so its original value (which may be `undefined`) is preserved verbatim.
+      #buildGraphqlChildNode({ id, operationType, graphqlOperationId, graphqlOperationIds, title: title2, slug, availability, hidden: hidden2, icon, playground, viewers, orphaned, featureFlags }) {
+        return {
+          id,
+          type: "graphql",
+          collapsed: void 0,
+          operationType,
+          graphqlOperationId,
+          graphqlOperationIds,
+          apiDefinitionId: this.apiDefinitionId,
+          availability: convertDocsAvailability(availability),
+          title: title2,
+          slug,
+          icon,
+          hidden: hidden2,
+          playground,
+          authed: void 0,
+          viewers,
+          orphaned,
+          featureFlags
+        };
+      }
       #buildFieldPathGroupedChildren(operations, parentSlug, parentAvailability, operationType) {
         const shouldGroup = operationType === "QUERY";
         const groupedByParent = /* @__PURE__ */ new Map();
@@ -454233,11 +454229,23 @@ ${tagInfo.description}`;
             insertionOrder.push({ type: "flat", operation });
           }
         }
+        const parentOpsByGroup = /* @__PURE__ */ new Map();
+        for (const entry of insertionOrder) {
+          if (entry.type === "flat") {
+            const name2 = getOperationName(entry.operation);
+            if (groupedByParent.has(name2) && getFieldPath(entry.operation) == null) {
+              parentOpsByGroup.set(name2, entry.operation);
+            }
+          }
+        }
         const children2 = [];
         for (const entry of insertionOrder) {
           if (entry.type === "flat") {
+            const leafName = getOperationName(entry.operation);
+            if (parentOpsByGroup.has(leafName)) {
+              continue;
+            }
             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) {
@@ -454245,51 +454253,33 @@ ${tagInfo.description}`;
               }
             }
             operationSlug = operationSlug.append(kebabCase_default(leafName));
-            children2.push({
+            children2.push(this.#buildGraphqlChildNode({
               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),
-              graphqlOperationIds: void 0,
-              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
-            });
+              availability: parentAvailability,
+              hidden: this.hideChildren
+            }));
           } else {
             const groupOps = groupedByParent.get(entry.parentField) ?? [];
-            const firstOp = groupOps[0];
-            if (firstOp == null) {
+            const parentOp = parentOpsByGroup.get(entry.parentField);
+            const representativeOp = parentOp ?? groupOps[0];
+            if (representativeOp == 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),
+            children2.push(this.#buildGraphqlChildNode({
+              id: navigation_exports.V1.NodeId(`${this.apiDefinitionId}:${representativeOp.id}`),
+              operationType: representativeOp.operationType,
+              graphqlOperationId: APIV1Read_exports.GraphQlOperationId(representativeOp.id),
               graphqlOperationIds: groupOps.map((op2) => APIV1Read_exports.GraphQlOperationId(op2.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
-            });
+              availability: parentAvailability,
+              hidden: this.hideChildren
+            }));
           }
         }
         return children2;
@@ -687227,7 +687217,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.63.1",
+          version: "5.64.1",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -687293,7 +687283,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.63.1",
+        version: "5.64.1",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -868388,7 +868378,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.63.1";
+  const version7 = "5.64.1";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -889949,6 +889939,9 @@ var import_child_process8 = require("child_process");
 var import_path77 = __toESM(require("path"), 1);
 init_esm16();
 var import_tmp_promise12 = __toESM(require_tmp_promise(), 1);
+function isCommitSha(ref2) {
+  return /^[0-9a-f]{7,40}$/i.test(ref2);
+}
 function cloneTargetKey(target) {
   return `${target.repo}#${target.ref ?? "HEAD"}`;
 }
@@ -889986,12 +889979,22 @@ async function resolveRemoteSpecs({ definitions: definitions7, context: context3
     const tmpDir = await import_tmp_promise12.default.dir({ unsafeCleanup: true });
     const clonePath = AbsoluteFilePath2.of(tmpDir.path);
     const git = simpleGit();
-    const cloneArgs = ["--depth", "1", "--config", "core.symlinks=false"];
-    if (target.ref != null) {
-      cloneArgs.push("--branch", target.ref);
-    }
+    const useCommitShaFlow = target.ref != null && isCommitSha(target.ref);
     try {
-      await git.clone(target.repo, tmpDir.path, cloneArgs);
+      if (useCommitShaFlow) {
+        const ref2 = target.ref;
+        const cloneArgs = ["--depth", "1", "--config", "core.symlinks=false", "--no-checkout"];
+        await git.clone(target.repo, tmpDir.path, cloneArgs);
+        const repoGit = simpleGit(tmpDir.path);
+        await repoGit.fetch("origin", ref2, { "--depth": "1" });
+        await repoGit.checkout(ref2);
+      } else {
+        const cloneArgs = ["--depth", "1", "--config", "core.symlinks=false"];
+        if (target.ref != null) {
+          cloneArgs.push("--branch", target.ref);
+        }
+        await git.clone(target.repo, tmpDir.path, cloneArgs);
+      }
     } catch (error50) {
       const errorMessage = extractErrorMessage(error50);
       if (errorMessage.includes("Authentication failed") || errorMessage.includes("could not read Username") || errorMessage.includes("401") || errorMessage.includes("403")) {
@@ -890019,11 +890022,16 @@ async function resolveRemoteSpecs({ definitions: definitions7, context: context3
       throw new Error(`Invalid git source path '${def.gitSource.path}': path must be relative to the repository root and cannot traverse outside it.`);
     }
     if (def.schema.type === "protobuf") {
+      const resolvedTarget = def.schema.target.length > 0 ? import_path77.default.resolve(clonedPath, def.schema.target) : def.schema.target;
+      if (resolvedTarget.length > 0 && !resolvedTarget.startsWith(clonedPath + import_path77.default.sep) && resolvedTarget !== clonedPath) {
+        throw new Error(`Invalid proto target path '${def.schema.target}': path must be relative to the repository root and cannot traverse outside it.`);
+      }
       return {
         ...def,
         schema: {
           ...def.schema,
-          root: resolvedPath
+          root: resolvedPath,
+          target: resolvedTarget
         },
         gitSource: void 0,
         resolvedAbsolutePath: true
@@ -890067,13 +890075,14 @@ async function loadSingleNamespaceAPIWorkspace({ absolutePathToWorkspace, namesp
           }
         };
       }
-      const absoluteFilepathToTarget = definition3.schema.target.length === 0 ? void 0 : join8(absolutePathToWorkspace, RelativeFilePath2.of(definition3.schema.target));
+      const absoluteFilepathToTarget = definition3.schema.target.length === 0 ? void 0 : import_path78.default.isAbsolute(definition3.schema.target) && definition3.resolvedAbsolutePath ? AbsoluteFilePath2.of(definition3.schema.target) : join8(absolutePathToWorkspace, RelativeFilePath2.of(definition3.schema.target));
       if (absoluteFilepathToTarget != null) {
         if (!await doesPathExist(absoluteFilepathToTarget)) {
+          const displayTarget = import_path78.default.isAbsolute(definition3.schema.target) && definition3.resolvedAbsolutePath ? RelativeFilePath2.of(import_path78.default.basename(definition3.schema.target)) : RelativeFilePath2.of(definition3.schema.target);
           return {
             didSucceed: false,
             failures: {
-              [RelativeFilePath2.of(definition3.schema.target)]: {
+              [displayTarget]: {
                 type: WorkspaceLoaderFailureType.FILE_MISSING
               }
             }
@@ -900886,7 +900895,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.63.1",
+        cliVersion: "5.64.1",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -951447,7 +951456,7 @@ var TypeLiteral4 = class _TypeLiteral extends AstNode9 {
     writer2.writeLine("{");
     writer2.indent();
     for (const entry of entries24) {
-      entry.key.write(writer2);
+      this.writeObjectKey({ writer: writer2, key: entry.key });
       writer2.write(": ");
       entry.value.write(writer2);
       writer2.writeLine(",");
@@ -951455,6 +951464,14 @@ var TypeLiteral4 = class _TypeLiteral extends AstNode9 {
     writer2.dedent();
     writer2.write("}");
   }
+  writeObjectKey({ writer: writer2, key: key2 }) {
+    const internal2 = key2.internalType;
+    if (internal2.type === "string" && isValidIdentifier(internal2.value)) {
+      writer2.write(internal2.value);
+      return;
+    }
+    key2.write(writer2);
+  }
   writeObject({ writer: writer2, object: object23 }) {
     const fields = filterNopObjectFields({ fields: object23.fields });
     if (fields.length === 0) {
@@ -951590,7 +951607,12 @@ var TypeLiteral4 = class _TypeLiteral extends AstNode9 {
     writer2.writeLine("{");
     writer2.indent();
     for (const [key2, val] of entries24) {
-      writer2.write(`${key2}: `);
+      if (isValidIdentifier(key2)) {
+        writer2.write(`${key2}: `);
+      } else {
+        writer2.writeNode(_TypeLiteral.string(key2));
+        writer2.write(": ");
+      }
       writer2.writeNode(_TypeLiteral.unknown(val));
       writer2.writeLine(",");
     }
@@ -951598,6 +951620,9 @@ var TypeLiteral4 = class _TypeLiteral extends AstNode9 {
     writer2.write("}");
   }
 };
+function isValidIdentifier(value2) {
+  return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(value2);
+}
 function filterNopObjectFields({ fields }) {
   return fields.filter((field5) => !TypeLiteral4.isNop(field5.value));
 }
@@ -967178,7 +967203,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.63.1"
+    cli_version: "5.64.1"
   };
 }
 function isAutomationMode() {
@@ -968010,7 +968035,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.63.1";
+    return "5.64.1";
   }
   getCliName() {
     if (false) {

package/package.json

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