Merge branch 'main' into rohin/better-enum-parsing-openapi-parser-v2

fern/apis/fdr/definition/docs/v1/db/__package__.yml

@@ -59,6 +59,7 @@ types:
       root: optional<navigationV1.RootNode>
       navbarLinks: optional<list<commons.NavbarLink>>
       footerLinks: optional<list<commons.FooterLink>>
+      hideNavLinks: optional<boolean>
 
       # logo
       logoHeight: optional<docsReadV1.Height>

fern/apis/fdr/definition/docs/v1/read/__package__.yml

@@ -98,6 +98,7 @@ types:
       root: optional<navigationV1.RootNode>
       navbarLinks: optional<list<commons.NavbarLink>>
       footerLinks: optional<list<commons.FooterLink>>
+      hideNavLinks: optional<boolean>
 
       # logo
       logoHeight: optional<Height>

fern/apis/fdr/definition/docs/v1/write/__package__.yml

@@ -93,6 +93,7 @@ types:
       root: optional<navigationV1.RootNode>
       navbarLinks: optional<list<commons.NavbarLink>>
       footerLinks: optional<list<commons.FooterLink>>
+      hideNavLinks: optional<boolean>
 
       # logo
       logoHeight: optional<Height>

packages/commons/fdr-utils/src/definition-object-factory.ts

@@ -22,6 +22,7 @@ export class DefinitionObjectFactory {
         },
         navbarLinks: [],
         navigation: { items: [], landingPage: undefined },
+        hideNavLinks: undefined,
         root: undefined,
         title: undefined,
         defaultLanguage: undefined,

packages/fdr-sdk/src/converters/db/convertDocsDefinitionToDb.ts

@@ -110,6 +110,7 @@ export function convertDocsDefinitionToDb({
           : undefined,
       navbarLinks: writeShape.config.navbarLinks,
       footerLinks: writeShape.config.footerLinks,
+      hideNavLinks: writeShape.config.hideNavLinks,
       title: writeShape.config.title,
       favicon: writeShape.config.favicon,
       backgroundImage: writeShape.config.backgroundImage,

packages/fdr-sdk/src/converters/read/convertDbDocsConfigToRead.ts

@@ -29,6 +29,7 @@ export function convertDbDocsConfigToRead({
     colorsV3: dbShape.colorsV3 ?? getColorsV3(dbShape),
     navbarLinks: dbShape.navbarLinks,
     footerLinks: dbShape.footerLinks,
+    hideNavLinks: dbShape.hideNavLinks,
     title: dbShape.title,
     favicon: dbShape.favicon,
     typographyV2:

packages/fdr-sdk/src/navigation/NodeCollector.ts

@@ -2,6 +2,7 @@ import { EMPTY_ARRAY } from "@fern-api/ui-core-utils";
 import { once } from "es-toolkit/function";
 import { FernNavigation } from "./..";
 import { pruneVersionNode } from "./utils/pruneVersionNode";
+import { NavigationNodeWithMetadata } from "./versions";
 
 interface NavigationNodeWithMetadataAndParents {
   node: FernNavigation.NavigationNodeWithMetadata;
@@ -134,7 +135,6 @@ export class NodeCollector {
       this.#setNode(node.slug, node, parents);
     } else {
       if (FernNavigation.isPage(existing.node)) {
-        // eslint-disable-next-line no-console
         console.warn(`Duplicate slug found: ${node.slug}`, node.title);
       }
       this.orphanedNodes.push(node);
@@ -236,6 +236,29 @@ export class NodeCollector {
     return this.#getIndexablePageSlugs();
   }
 
+  #getIndexablePageNodesWithAuth = once((): NavigationNodeWithMetadata[] => {
+    const slugRecord: Record<string, NavigationNodeWithMetadata> = {};
+
+    [...this.slugToNode.values()]
+      .filter(({ node }) => FernNavigation.isPage(node))
+      .filter(({ node }) => !node.hidden)
+      .filter(({ node }) =>
+        FernNavigation.hasMarkdown(node) ? !node.noindex : true
+      )
+      .forEach((node) => {
+        const canonicalSlug = node.node.canonicalSlug ?? node.node.slug;
+        // Only keep the first node we see for each canonical slug
+        if (!(canonicalSlug in slugRecord)) {
+          slugRecord[canonicalSlug] = node.node;
+        }
+      });
+
+    return Object.values(slugRecord);
+  });
+  get indexablePageNodesWithAuth(): NavigationNodeWithMetadata[] {
+    return this.#getIndexablePageNodesWithAuth();
+  }
+
   public getVersionNodes = (): FernNavigation.VersionNode[] => {
     return this.versionNodes;
   };

packages/fern-docs/components/src/CopyToClipboardButton.tsx

@@ -40,7 +40,7 @@ export const CopyToClipboardButton: React.FC<CopyToClipboardButton.Props> = ({
           copyToClipboard?.();
         }) ?? (
           <FernButton
-            className={cn("fern-copy-button group", className)}
+            className={cn("fern-copy-button group backdrop-blur", className)}
             disabled={copyToClipboard == null}
             onClickCapture={(e) => {
               onClick?.(e);

packages/fern-docs/components/src/__test__/__snapshots__/CopyToClipboardButton.test.tsx.snap

@@ -3,7 +3,7 @@
 exports[`CopyToClipboardButton > renders correctly 1`] = `
 <button
   aria-disabled={false}
-  className="fern-copy-button group fern-button minimal normal rounded square"
+  className="fern-copy-button group backdrop-blur fern-button minimal normal rounded square"
   data-state="closed"
   data-testid="copy-btn"
   onBlur={[Function]}

packages/fern-docs/search-server/src/turbopuffer/records/create-turbopuffer-records.ts

@@ -5,7 +5,6 @@ import {
   RootNode,
   getPageId,
   hasMarkdown,
-  isPage,
 } from "@fern-api/fdr-sdk/navigation";
 import { flatten } from "es-toolkit/array";
 import { FernTurbopufferRecordWithoutVector } from "../types";
@@ -35,12 +34,7 @@ export async function createTurbopufferRecords({
 > {
   const collector = NodeCollector.collect(root);
 
-  const pageNodes = Array.from(collector.slugMap.values())
-    .filter(isPage)
-    // exclude hidden pages
-    .filter((node) => node.hidden !== true)
-    // exclude pages that are noindexed
-    .filter((node) => (hasMarkdown(node) ? node.noindex !== true : true));
+  const pageNodes = collector.indexablePageNodesWithAuth;
 
   const markdownNodes = pageNodes.filter(hasMarkdown);
   // const apiLeafNodes = pageNodes.filter(isApiLeaf);

packages/fern-docs/syntax-highlighter/src/CodeBlockWithClipboardButton.tsx

@@ -21,8 +21,8 @@ export const CodeBlockWithClipboardButton: React.FC<
       <CopyToClipboardButton
         className={cn(
           "absolute z-20",
-          "z-10 opacity-0 transition group-hover/cb-container:opacity-100",
-          "right-1 top-1"
+          "z-10 opacity-0 backdrop-blur transition group-hover/cb-container:opacity-100",
+          "right-3 top-2"
         )}
         content={code}
       />

packages/fern-docs/ui/src/search/SearchV2.tsx

@@ -91,7 +91,7 @@ export function SearchV2(): ReactElement | false {
 
   // Rerouting to ferndocs.com for production environments to ensure streaming works
   // Also see: next.config.mjs, where we set CORS headers
-  if (process.env.NODE_ENV === "production") {
+  if (process.env.NEXT_PUBLIC_VERCEL_ENV === "production") {
     chatEndpoint = `https://app.ferndocs.com/api/fern-docs/search/v2/chat`;
     suggestEndpoint = `https://app.ferndocs.com/api/fern-docs/search/v2/suggest`;
   }

packages/parsers/package.json

@@ -29,6 +29,7 @@
   "dependencies": {
     "@fern-api/logger": "0.4.24-rc1",
     "@fern-api/ui-core-utils": "workspace:*",
+    "@open-rpc/meta-schema": "^1.14.9",
     "es-toolkit": "^1.24.0",
     "openapi-types": "^12.1.3",
     "ts-essentials": "^10.0.1",

packages/parsers/src/openapi/3.1/auth/__test__/HeaderSecuritySchemeConverter.node.test.ts

@@ -1,4 +1,4 @@
-import { createMockContext } from "../../../../__test__/createMockContext.util";
+import { createMockContext } from "../../../__test__/createMockContext.util";
 import { HeaderSecuritySchemeConverterNode } from "../HeaderSecuritySchemeConverter.node";
 
 describe("HeaderSecuritySchemeConverterNode", () => {

packages/parsers/src/openapi/3.1/auth/__test__/OAuth2SecuritySchemeConverter.node.test.ts

@@ -1,5 +1,5 @@
 import { OpenAPIV3_1 } from "openapi-types";
-import { createMockContext } from "../../../../__test__/createMockContext.util";
+import { createMockContext } from "../../../__test__/createMockContext.util";
 import { OAuth2SecuritySchemeConverterNode } from "../OAuth2SecuritySchemeConverter.node";
 
 describe("OAuth2SecuritySchemeConverterNode", () => {

packages/parsers/src/openapi/3.1/auth/__test__/SecurityRequirementObjectConverter.node.test.ts

@@ -1,5 +1,5 @@
 import { OpenAPIV3_1 } from "openapi-types";
-import { createMockContext } from "../../../../__test__/createMockContext.util";
+import { createMockContext } from "../../../__test__/createMockContext.util";
 import { SecurityRequirementObjectConverterNode } from "../SecurityRequirementObjectConverter.node";
 
 describe("SecurityRequirementObjectConverterNode", () => {

packages/parsers/src/openapi/3.1/auth/__test__/SecuritySchemeConverter.node.test.ts

@@ -1,5 +1,5 @@
 import { OpenAPIV3_1 } from "openapi-types";
-import { createMockContext } from "../../../../__test__/createMockContext.util";
+import { createMockContext } from "../../../__test__/createMockContext.util";
 import { SecuritySchemeConverterNode } from "../SecuritySchemeConverter.node";
 
 describe("SecuritySchemeConverterNode", () => {

packages/parsers/src/openapi/3.1/extensions/__test__/AvailabilityConverter.node.test.ts

@@ -1,6 +1,6 @@
 import { OpenAPIV3_1 } from "openapi-types";
-import { createMockContext } from "../../../../__test__/createMockContext.util";
 import { FernRegistry } from "../../../../client/generated";
+import { createMockContext } from "../../../__test__/createMockContext.util";
 import {
   Availability,
   AvailabilityConverterNode,

packages/parsers/src/openapi/3.1/extensions/__test__/XFernBasePathConverter.node.test.ts

@@ -1,5 +1,5 @@
 import { OpenAPIV3_1 } from "openapi-types";
-import { createMockContext } from "../../../../__test__/createMockContext.util";
+import { createMockContext } from "../../../__test__/createMockContext.util";
 import { XFernBasePathConverterNode } from "../XFernBasePathConverter.node";
 import { X_FERN_BASE_PATH } from "../fernExtension.consts";
 

packages/parsers/src/openapi/3.1/extensions/__test__/XFernEndpointExampleConverter.node.test.ts

@@ -1,5 +1,5 @@
-import { createMockContext } from "../../../../__test__/createMockContext.util";
 import { FernRegistry } from "../../../../client/generated";
+import { createMockContext } from "../../../__test__/createMockContext.util";
 import { BaseOpenApiV3_1ConverterNodeConstructorArgs } from "../../../BaseOpenApiV3_1Converter.node";
 import {
   RequestMediaTypeObjectConverterNode,

packages/parsers/src/openapi/3.1/extensions/__test__/XFernGroupNameConverter.node.test.ts

@@ -1,4 +1,4 @@
-import { createMockContext } from "../../../../__test__/createMockContext.util";
+import { createMockContext } from "../../../__test__/createMockContext.util";
 import { XFernGroupNameConverterNode } from "../XFernGroupNameConverter.node";
 
 describe("XFernGroupNameConverterNode", () => {

packages/parsers/src/openapi/3.1/extensions/__test__/XFernSdkMethodNameConverter.node.test.ts

@@ -1,7 +1,7 @@
-import { createMockContext } from "../../../../__test__/createMockContext.util";
+import { createMockContext } from "../../../__test__/createMockContext.util";
 import { BaseOpenApiV3_1ConverterNodeConstructorArgs } from "../../../BaseOpenApiV3_1Converter.node";
-import { XFernSdkMethodNameConverterNode } from "../XFernSdkMethodNameConverter.node";
 import { X_FERN_SDK_METHOD_NAME } from "../fernExtension.consts";
+import { XFernSdkMethodNameConverterNode } from "../XFernSdkMethodNameConverter.node";
 
 describe("XFernSdkMethodNameConverterNode", () => {
   const mockContext = createMockContext();

packages/parsers/src/openapi/3.1/extensions/__test__/XFernServerNameConverter.node.test.ts

@@ -1,7 +1,7 @@
-import { createMockContext } from "../../../../__test__/createMockContext.util";
+import { createMockContext } from "../../../__test__/createMockContext.util";
 import { BaseOpenApiV3_1ConverterNodeConstructorArgs } from "../../../BaseOpenApiV3_1Converter.node";
-import { XFernServerNameConverterNode } from "../XFernServerNameConverter.node";
 import { X_FERN_SERVER_NAME } from "../fernExtension.consts";
+import { XFernServerNameConverterNode } from "../XFernServerNameConverter.node";
 
 describe("XFernServerNameConverterNode", () => {
   const mockContext = createMockContext();

packages/parsers/src/openapi/3.1/extensions/__test__/auth/XFernAccessTokenLocatorConverter.node.test.ts

@@ -1,4 +1,4 @@
-import { createMockContext } from "../../../../../__test__/createMockContext.util";
+import { createMockContext } from "../../../../__test__/createMockContext.util";
 import { XFernAccessTokenLocatorConverterNode } from "../../auth/XFernAccessTokenLocatorConverter.node";
 
 describe("XFernAccessTokenLocatorConverterNode", () => {

packages/parsers/src/openapi/3.1/extensions/__test__/auth/XFernBasicAuth.node.test.ts

@@ -1,4 +1,4 @@
-import { createMockContext } from "../../../../../__test__/createMockContext.util";
+import { createMockContext } from "../../../../__test__/createMockContext.util";
 import { XFernBasicAuthNode } from "../../auth/XFernBasicAuth.node";
 import { TokenSecurityScheme } from "../../auth/types/TokenSecurityScheme";
 

packages/parsers/src/openapi/3.1/extensions/__test__/auth/XFernBasicPasswordVariableNameConverter.node.test.ts

@@ -1,4 +1,4 @@
-import { createMockContext } from "../../../../../__test__/createMockContext.util";
+import { createMockContext } from "../../../../__test__/createMockContext.util";
 import { XFernBasicPasswordVariableNameConverterNode } from "../../auth/XFernBasicPasswordVariableNameConverter.node";
 
 describe("XFernBasicPasswordVariableNameConverterNode", () => {

packages/parsers/src/openapi/3.1/extensions/__test__/auth/XFernBasicUsernameVariableNameConverter.node.test.ts

@@ -1,4 +1,4 @@
-import { createMockContext } from "../../../../../__test__/createMockContext.util";
+import { createMockContext } from "../../../../__test__/createMockContext.util";
 import { XFernBasicUsernameVariableNameConverterNode } from "../../auth/XFernBasicUsernameVariableNameConverter.node";
 
 describe("XFernBasicUsernameVariableNameConverterNode", () => {

packages/parsers/src/openapi/3.1/extensions/__test__/auth/XFernBearerFormatConverter.node.test.ts

@@ -1,4 +1,4 @@
-import { createMockContext } from "../../../../../__test__/createMockContext.util";
+import { createMockContext } from "../../../../__test__/createMockContext.util";
 import { XBearerFormatConverterNode } from "../../auth/XBearerFormatConverter.node";
 
 describe("XBearerFormatConverterNode", () => {

packages/parsers/src/openapi/3.1/extensions/__test__/auth/XFernBearerTokenConverter.node.test.ts

@@ -1,4 +1,4 @@
-import { createMockContext } from "../../../../../__test__/createMockContext.util";
+import { createMockContext } from "../../../../__test__/createMockContext.util";
 import { XFernBearerTokenConverterNode } from "../../auth/XFernBearerTokenConverter.node";
 import { TokenSecurityScheme } from "../../auth/types/TokenSecurityScheme";
 

packages/parsers/src/openapi/3.1/extensions/__test__/auth/XFernBearerTokenVariableNameConverter.node.test.ts

@@ -1,4 +1,4 @@
-import { createMockContext } from "../../../../../__test__/createMockContext.util";
+import { createMockContext } from "../../../../__test__/createMockContext.util";
 import { XFernBearerTokenVariableNameConverterNode } from "../../auth/XFernBearerTokenVariableNameConverter.node";
 
 describe("XFernBearerTokenVariableNameConverterNode", () => {

packages/parsers/src/openapi/3.1/extensions/__test__/auth/XFernHeaderAuthConverter.node.test.ts

@@ -1,4 +1,4 @@
-import { createMockContext } from "../../../../../__test__/createMockContext.util";
+import { createMockContext } from "../../../../__test__/createMockContext.util";
 import { XFernHeaderAuthConverterNode } from "../../auth/XFernHeaderAuthConverter.node";
 import { HeaderTokenSecurityScheme } from "../../auth/types/TokenSecurityScheme";
 

packages/parsers/src/openapi/3.1/extensions/__test__/auth/XFernHeaderVariableNameConverter.node.test.ts

@@ -1,4 +1,4 @@
-import { createMockContext } from "../../../../../__test__/createMockContext.util";
+import { createMockContext } from "../../../../__test__/createMockContext.util";
 import { XFernHeaderVariableNameConverterNode } from "../../auth/XFernHeaderVariableNameConverter.node";
 
 describe("XFernHeaderVariableNameConverterNode", () => {

packages/parsers/src/openapi/3.1/extensions/__test__/examples/RedocExampleConverter.node.test.ts

@@ -1,4 +1,4 @@
-import { createMockContext } from "../../../../../__test__/createMockContext.util";
+import { createMockContext } from "../../../../__test__/createMockContext.util";
 import { BaseOpenApiV3_1ConverterNodeConstructorArgs } from "../../../../BaseOpenApiV3_1Converter.node";
 import { RedocExampleConverterNode } from "../../examples/RedocExampleConverter.node";
 import {

packages/parsers/src/openapi/3.1/paths/__test__/ExampleObjectConverter.node.test.ts

@@ -1,4 +1,4 @@
-import { createMockContext } from "../../../../__test__/createMockContext.util";
+import { createMockContext } from "../../../__test__/createMockContext.util";
 import { ExampleObjectConverterNode } from "../ExampleObjectConverter.node";
 import { RequestMediaTypeObjectConverterNode } from "../request/RequestMediaTypeObjectConverter.node";
 

packages/parsers/src/openapi/3.1/paths/__test__/OperationObjectConverter.node.test.ts

@@ -1,6 +1,6 @@
 import { OpenAPIV3_1 } from "openapi-types";
-import { createMockContext } from "../../../../__test__/createMockContext.util";
 import { FernRegistry } from "../../../../client/generated";
+import { createMockContext } from "../../../__test__/createMockContext.util";
 import { OperationObjectConverterNode } from "../OperationObjectConverter.node";
 
 describe("OperationObjectConverterNode", () => {

packages/parsers/src/openapi/3.1/paths/__test__/PathItemObjectConverter.node.test.ts

@@ -1,5 +1,5 @@
 import { OpenAPIV3_1 } from "openapi-types";
-import { createMockContext } from "../../../../__test__/createMockContext.util";
+import { createMockContext } from "../../../__test__/createMockContext.util";
 import { PathItemObjectConverterNode } from "../PathItemObjectConverter.node";
 
 describe("PathItemObjectConverterNode", () => {