fern-api 0.30.8-rc4 → 0.30.8-rc5

package/bundle.cjs

@@ -22002,7 +22002,7 @@ var init_NavigationItem = __esm({
     NavigationItem = schemas_exports.undiscriminatedUnion([
       schemas_exports.lazyObject(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).PageConfiguration),
       schemas_exports.lazyObject(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).SectionConfiguration),
-      schemas_exports.lazyObject(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).ApiSectionConfiguration),
+      schemas_exports.lazyObject(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).ApiReferenceConfiguration),
       schemas_exports.lazyObject(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).LinkConfiguration)
     ]);
   }
@@ -22198,19 +22198,19 @@ var init_SectionConfiguration = __esm({
   }
 });
 
-// pnp:/home/circleci/project/packages/cli/configuration/lib/docs-yml/schemas/sdk/serialization/resources/docs/types/ApiSectionConfiguration.js
-var ApiSectionConfiguration;
-var init_ApiSectionConfiguration = __esm({
-  "pnp:/home/circleci/project/packages/cli/configuration/lib/docs-yml/schemas/sdk/serialization/resources/docs/types/ApiSectionConfiguration.js"() {
+// pnp:/home/circleci/project/packages/cli/configuration/lib/docs-yml/schemas/sdk/serialization/resources/docs/types/ApiReferenceConfiguration.js
+var ApiReferenceConfiguration;
+var init_ApiReferenceConfiguration = __esm({
+  "pnp:/home/circleci/project/packages/cli/configuration/lib/docs-yml/schemas/sdk/serialization/resources/docs/types/ApiReferenceConfiguration.js"() {
     init_core();
-    ApiSectionConfiguration = schemas_exports.object({
+    ApiReferenceConfiguration = schemas_exports.object({
       api: schemas_exports.string(),
       apiName: schemas_exports.property("api-name", schemas_exports.string().optional()),
       audiences: schemas_exports.list(schemas_exports.string()).optional(),
       displayErrors: schemas_exports.property("display-errors", schemas_exports.boolean().optional()),
       snippets: schemas_exports.lazyObject(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).SnippetsConfiguration).optional(),
       summary: schemas_exports.string().optional(),
-      layout: schemas_exports.lazy(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).ApiNavigationItems).optional(),
+      layout: schemas_exports.list(schemas_exports.lazy(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).ApiReferenceLayoutItem)).optional(),
       icon: schemas_exports.string().optional(),
       slug: schemas_exports.string().optional(),
       hidden: schemas_exports.boolean().optional(),
@@ -22222,30 +22222,18 @@ var init_ApiSectionConfiguration = __esm({
   }
 });
 
-// pnp:/home/circleci/project/packages/cli/configuration/lib/docs-yml/schemas/sdk/serialization/resources/docs/types/ApiNavigationItem.js
-var ApiNavigationItem;
-var init_ApiNavigationItem = __esm({
-  "pnp:/home/circleci/project/packages/cli/configuration/lib/docs-yml/schemas/sdk/serialization/resources/docs/types/ApiNavigationItem.js"() {
+// pnp:/home/circleci/project/packages/cli/configuration/lib/docs-yml/schemas/sdk/serialization/resources/docs/types/ApiReferenceLayoutItem.js
+var ApiReferenceLayoutItem;
+var init_ApiReferenceLayoutItem = __esm({
+  "pnp:/home/circleci/project/packages/cli/configuration/lib/docs-yml/schemas/sdk/serialization/resources/docs/types/ApiReferenceLayoutItem.js"() {
     init_core();
-    ApiNavigationItem = schemas_exports.undiscriminatedUnion([
+    ApiReferenceLayoutItem = schemas_exports.undiscriminatedUnion([
       schemas_exports.string(),
-      schemas_exports.record(schemas_exports.string(), schemas_exports.lazy(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).ApiNavigationItems)),
-      schemas_exports.lazyObject(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).PageConfiguration),
-      schemas_exports.lazyObject(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).LinkConfiguration),
+      schemas_exports.record(schemas_exports.string(), schemas_exports.lazy(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).ApiReferencePackageConfiguration)),
       schemas_exports.lazyObject(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).ApiReferenceSectionConfiguration),
-      schemas_exports.lazyObject(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).ApiReferencePackageConfiguration)
-    ]);
-  }
-});
-
-// pnp:/home/circleci/project/packages/cli/configuration/lib/docs-yml/schemas/sdk/serialization/resources/docs/types/SubpackageOrSubpackages.js
-var SubpackageOrSubpackages;
-var init_SubpackageOrSubpackages = __esm({
-  "pnp:/home/circleci/project/packages/cli/configuration/lib/docs-yml/schemas/sdk/serialization/resources/docs/types/SubpackageOrSubpackages.js"() {
-    init_core();
-    SubpackageOrSubpackages = schemas_exports.undiscriminatedUnion([
-      schemas_exports.string(),
-      schemas_exports.list(schemas_exports.string())
+      schemas_exports.lazyObject(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).ApiReferenceEndpointConfiguration),
+      schemas_exports.lazyObject(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).PageConfiguration),
+      schemas_exports.lazyObject(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).LinkConfiguration)
     ]);
   }
 });
@@ -22257,9 +22245,9 @@ var init_ApiReferenceSectionConfiguration = __esm({
     init_core();
     ApiReferenceSectionConfiguration = schemas_exports.object({
       section: schemas_exports.string(),
-      package: schemas_exports.lazy(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).SubpackageOrSubpackages).optional(),
+      referencedPackages: schemas_exports.property("referenced-packages", schemas_exports.list(schemas_exports.string()).optional()),
       summary: schemas_exports.string().optional(),
-      contents: schemas_exports.lazy(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).ApiNavigationItems),
+      contents: schemas_exports.list(schemas_exports.lazy(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).ApiReferenceLayoutItem)).optional(),
       slug: schemas_exports.string().optional(),
       icon: schemas_exports.string().optional(),
       hidden: schemas_exports.boolean().optional(),
@@ -22273,10 +22261,22 @@ var ApiReferencePackageConfiguration;
 var init_ApiReferencePackageConfiguration = __esm({
   "pnp:/home/circleci/project/packages/cli/configuration/lib/docs-yml/schemas/sdk/serialization/resources/docs/types/ApiReferencePackageConfiguration.js"() {
     init_core();
-    ApiReferencePackageConfiguration = schemas_exports.object({
-      package: schemas_exports.string(),
+    ApiReferencePackageConfiguration = schemas_exports.undiscriminatedUnion([
+      schemas_exports.list(schemas_exports.lazy(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).ApiReferenceLayoutItem)),
+      schemas_exports.lazyObject(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).ApiReferencePackageConfigurationWithOptions)
+    ]);
+  }
+});
+
+// pnp:/home/circleci/project/packages/cli/configuration/lib/docs-yml/schemas/sdk/serialization/resources/docs/types/ApiReferencePackageConfigurationWithOptions.js
+var ApiReferencePackageConfigurationWithOptions;
+var init_ApiReferencePackageConfigurationWithOptions = __esm({
+  "pnp:/home/circleci/project/packages/cli/configuration/lib/docs-yml/schemas/sdk/serialization/resources/docs/types/ApiReferencePackageConfigurationWithOptions.js"() {
+    init_core();
+    ApiReferencePackageConfigurationWithOptions = schemas_exports.object({
+      title: schemas_exports.string().optional(),
       summary: schemas_exports.string().optional(),
-      contents: schemas_exports.lazy(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).ApiNavigationItems),
+      contents: schemas_exports.list(schemas_exports.lazy(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).ApiReferenceLayoutItem)).optional(),
       slug: schemas_exports.string().optional(),
       icon: schemas_exports.string().optional(),
       hidden: schemas_exports.boolean().optional(),
@@ -22285,12 +22285,18 @@ var init_ApiReferencePackageConfiguration = __esm({
   }
 });
 
-// pnp:/home/circleci/project/packages/cli/configuration/lib/docs-yml/schemas/sdk/serialization/resources/docs/types/ApiNavigationItems.js
-var ApiNavigationItems;
-var init_ApiNavigationItems = __esm({
-  "pnp:/home/circleci/project/packages/cli/configuration/lib/docs-yml/schemas/sdk/serialization/resources/docs/types/ApiNavigationItems.js"() {
+// pnp:/home/circleci/project/packages/cli/configuration/lib/docs-yml/schemas/sdk/serialization/resources/docs/types/ApiReferenceEndpointConfiguration.js
+var ApiReferenceEndpointConfiguration;
+var init_ApiReferenceEndpointConfiguration = __esm({
+  "pnp:/home/circleci/project/packages/cli/configuration/lib/docs-yml/schemas/sdk/serialization/resources/docs/types/ApiReferenceEndpointConfiguration.js"() {
     init_core();
-    ApiNavigationItems = schemas_exports.list(schemas_exports.lazy(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).ApiNavigationItem));
+    ApiReferenceEndpointConfiguration = schemas_exports.object({
+      endpoint: schemas_exports.string(),
+      title: schemas_exports.string().optional(),
+      slug: schemas_exports.string().optional(),
+      icon: schemas_exports.string().optional(),
+      hidden: schemas_exports.boolean().optional()
+    });
   }
 });
 
@@ -22627,12 +22633,12 @@ var init_types = __esm({
     init_FontConfigVariant();
     init_PageConfiguration();
     init_SectionConfiguration();
-    init_ApiSectionConfiguration();
-    init_ApiNavigationItem();
-    init_SubpackageOrSubpackages();
+    init_ApiReferenceConfiguration();
+    init_ApiReferenceLayoutItem();
     init_ApiReferenceSectionConfiguration();
     init_ApiReferencePackageConfiguration();
-    init_ApiNavigationItems();
+    init_ApiReferencePackageConfigurationWithOptions();
+    init_ApiReferenceEndpointConfiguration();
     init_LinkConfiguration();
     init_VersionedSnippetLanguageConfiguration();
     init_SnippetLanguageConfiguration();
@@ -22661,11 +22667,12 @@ var init_types = __esm({
 // pnp:/home/circleci/project/packages/cli/configuration/lib/docs-yml/schemas/sdk/serialization/resources/docs/index.js
 var docs_exports3 = {};
 __export(docs_exports3, {
-  ApiNavigationItem: () => ApiNavigationItem,
-  ApiNavigationItems: () => ApiNavigationItems,
+  ApiReferenceConfiguration: () => ApiReferenceConfiguration,
+  ApiReferenceEndpointConfiguration: () => ApiReferenceEndpointConfiguration,
+  ApiReferenceLayoutItem: () => ApiReferenceLayoutItem,
   ApiReferencePackageConfiguration: () => ApiReferencePackageConfiguration,
+  ApiReferencePackageConfigurationWithOptions: () => ApiReferencePackageConfigurationWithOptions,
   ApiReferenceSectionConfiguration: () => ApiReferenceSectionConfiguration,
-  ApiSectionConfiguration: () => ApiSectionConfiguration,
   AudiencesConfig: () => AudiencesConfig,
   BackgroundImageConfiguration: () => BackgroundImageConfiguration,
   BackgroundImageThemedConfig: () => BackgroundImageThemedConfig,
@@ -22709,7 +22716,6 @@ __export(docs_exports3, {
   SidebarOrHeaderPlacement: () => SidebarOrHeaderPlacement4,
   SnippetLanguageConfiguration: () => SnippetLanguageConfiguration,
   SnippetsConfiguration: () => SnippetsConfiguration,
-  SubpackageOrSubpackages: () => SubpackageOrSubpackages,
   TabConfig: () => TabConfig,
   TabId: () => TabId2,
   TabbedNavigationConfig: () => TabbedNavigationConfig,
@@ -22738,11 +22744,12 @@ var init_resources = __esm({
 // pnp:/home/circleci/project/packages/cli/configuration/lib/docs-yml/schemas/sdk/serialization/index.js
 var serialization_exports = {};
 __export(serialization_exports, {
-  ApiNavigationItem: () => ApiNavigationItem,
-  ApiNavigationItems: () => ApiNavigationItems,
+  ApiReferenceConfiguration: () => ApiReferenceConfiguration,
+  ApiReferenceEndpointConfiguration: () => ApiReferenceEndpointConfiguration,
+  ApiReferenceLayoutItem: () => ApiReferenceLayoutItem,
   ApiReferencePackageConfiguration: () => ApiReferencePackageConfiguration,
+  ApiReferencePackageConfigurationWithOptions: () => ApiReferencePackageConfigurationWithOptions,
   ApiReferenceSectionConfiguration: () => ApiReferenceSectionConfiguration,
-  ApiSectionConfiguration: () => ApiSectionConfiguration,
   AudiencesConfig: () => AudiencesConfig,
   BackgroundImageConfiguration: () => BackgroundImageConfiguration,
   BackgroundImageThemedConfig: () => BackgroundImageThemedConfig,
@@ -22786,7 +22793,6 @@ __export(serialization_exports, {
   SidebarOrHeaderPlacement: () => SidebarOrHeaderPlacement4,
   SnippetLanguageConfiguration: () => SnippetLanguageConfiguration,
   SnippetsConfiguration: () => SnippetsConfiguration,
-  SubpackageOrSubpackages: () => SubpackageOrSubpackages,
   TabConfig: () => TabConfig,
   TabId: () => TabId2,
   TabbedNavigationConfig: () => TabbedNavigationConfig,
@@ -1049723,7 +1049729,7 @@ async function getAllPages({ navigation, absolutePathToFernFolder }) {
 async function getAllPagesFromNavigationItem({ item, absolutePathToFernFolder }) {
   switch (item.type) {
     case "apiSection": {
-      const toRet = combineMaps(await Promise.all(item.navigation.map((apiNavigation) => getAllPagesFromApiNavigationItem({ item: apiNavigation, absolutePathToFernFolder }))));
+      const toRet = combineMaps(await Promise.all(item.navigation.map((apiNavigation) => getAllPagesFromApiReferenceLayoutItem({ item: apiNavigation, absolutePathToFernFolder }))));
       if (item.summaryAbsolutePath != null) {
         toRet[await relativize(absolutePathToFernFolder, item.summaryAbsolutePath)] = (await (0, import_promises7.readFile)(item.summaryAbsolutePath)).toString();
       }
@@ -1049746,14 +1049752,14 @@ async function getAllPagesFromNavigationItem({ item, absolutePathToFernFolder })
 function combineMaps(maps) {
   return maps.reduce((acc, record4) => ({ ...acc, ...record4 }), {});
 }
-async function getAllPagesFromApiNavigationItem({ item, absolutePathToFernFolder }) {
+async function getAllPagesFromApiReferenceLayoutItem({ item, absolutePathToFernFolder }) {
   if (item.type === "page") {
     return {
       [await relativize(absolutePathToFernFolder, item.absolutePath)]: (await (0, import_promises7.readFile)(item.absolutePath)).toString()
     };
-  } else if (item.type === "package") {
+  } else if (item.type === "package" || item.type === "section") {
     const toRet = combineMaps(await Promise.all(item.contents.map(async (subItem) => {
-      return await getAllPagesFromApiNavigationItem({ item: subItem, absolutePathToFernFolder });
+      return await getAllPagesFromApiReferenceLayoutItem({ item: subItem, absolutePathToFernFolder });
     })));
     if (item.summaryAbsolutePath != null) {
       toRet[await relativize(absolutePathToFernFolder, item.summaryAbsolutePath)] = (await (0, import_promises7.readFile)(item.summaryAbsolutePath)).toString();
@@ -1050233,7 +1050239,7 @@ async function convertNavigationItem({ rawConfig, absolutePathToFernFolder, abso
       audiences: rawConfig.audiences != null ? { type: "select", audiences: rawConfig.audiences } : { type: "all" },
       showErrors: rawConfig.displayErrors ?? false,
       snippetsConfiguration: rawConfig.snippets != null ? convertSnippetsConfiguration({ rawConfig: rawConfig.snippets }) : void 0,
-      navigation: ((_a5 = rawConfig.layout) == null ? void 0 : _a5.flatMap((item) => parseApiNavigationItem(item, absolutePathToConfig))) ?? [],
+      navigation: ((_a5 = rawConfig.layout) == null ? void 0 : _a5.flatMap((item) => parseApiReferenceLayoutItem(item, absolutePathToConfig))) ?? [],
       summaryAbsolutePath: resolveFilepath(rawConfig.summary, absolutePathToConfig),
       hidden: rawConfig.hidden ?? void 0,
       slug: rawConfig.slug,
@@ -1050253,7 +1050259,8 @@ async function convertNavigationItem({ rawConfig, absolutePathToFernFolder, abso
   }
   assertNever(rawConfig);
 }
-function parseApiNavigationItem(item, absolutePathToConfig) {
+function parseApiReferenceLayoutItem(item, absolutePathToConfig) {
+  var _a5;
   if (typeof item === "string") {
     return [{ type: "item", value: item }];
   }
@@ -1050281,40 +1050288,55 @@ function parseApiNavigationItem(item, absolutePathToConfig) {
     return [
       {
         type: "section",
-        section: item.section,
-        subpackages: typeof item.package === "string" ? [item.package] : item.package ?? [],
+        title: item.section,
+        referencedSubpackages: item.referencedPackages ?? [],
         summaryAbsolutePath: resolveFilepath(item.summary, absolutePathToConfig),
-        contents: item.contents.flatMap((value) => parseApiNavigationItem(value, absolutePathToConfig)),
+        contents: ((_a5 = item.contents) == null ? void 0 : _a5.flatMap((value) => parseApiReferenceLayoutItem(value, absolutePathToConfig))) ?? [],
         slug: item.slug,
         hidden: item.hidden,
         skipUrlSlug: item.skipSlug,
         icon: item.icon
       }
     ];
-  } else if (isRawApiRefPackageConfiguration(item)) {
+  } else if (isRawApiRefEndpointConfiguration(item)) {
     return [
       {
-        type: "package",
-        package: item.package,
-        summaryAbsolutePath: resolveFilepath(item.summary, absolutePathToConfig),
-        contents: item.contents.flatMap((value) => parseApiNavigationItem(value, absolutePathToConfig)),
+        type: "endpoint",
+        endpoint: item.endpoint,
+        title: item.title,
+        icon: item.icon,
         slug: item.slug,
-        hidden: item.hidden,
-        skipUrlSlug: item.skipSlug,
-        icon: item.icon
+        hidden: item.hidden
       }
     ];
   }
-  return Object.entries(item).map(([key2, values3]) => ({
-    type: "package",
-    package: key2,
-    summaryAbsolutePath: void 0,
-    contents: values3.flatMap((value) => parseApiNavigationItem(value, absolutePathToConfig)),
-    hidden: false,
-    slug: void 0,
-    skipUrlSlug: false,
-    icon: void 0
-  }));
+  return Object.entries(item).map(([key2, value]) => {
+    var _a6;
+    if (isRawApiRefPackageConfiguration(value)) {
+      return {
+        type: "package",
+        title: value.title,
+        package: key2,
+        summaryAbsolutePath: resolveFilepath(value.summary, absolutePathToConfig),
+        contents: ((_a6 = value.contents) == null ? void 0 : _a6.flatMap((value2) => parseApiReferenceLayoutItem(value2, absolutePathToConfig))) ?? [],
+        slug: value.slug,
+        hidden: value.hidden,
+        skipUrlSlug: value.skipSlug,
+        icon: value.icon
+      };
+    }
+    return {
+      type: "package",
+      title: void 0,
+      package: key2,
+      summaryAbsolutePath: void 0,
+      contents: value.flatMap((value2) => parseApiReferenceLayoutItem(value2, absolutePathToConfig)),
+      hidden: false,
+      slug: void 0,
+      skipUrlSlug: false,
+      icon: void 0
+    };
+  });
 }
 function convertSnippetsConfiguration({ rawConfig }) {
   return {
@@ -1050334,13 +1050356,17 @@ function isRawApiSectionConfig(item) {
   return item.api != null;
 }
 function isRawLinkConfig(item) {
+  api_exports4;
   return isPlainObject(item) && typeof item.link === "string" && typeof item.href === "string";
 }
 function isRawApiRefSectionConfiguration(item) {
   return isPlainObject(item) && typeof item.section === "string" && Array.isArray(item.contents);
 }
+function isRawApiRefEndpointConfiguration(item) {
+  return isPlainObject(item) && typeof item.endpoint === "string";
+}
 function isRawApiRefPackageConfiguration(item) {
-  return isPlainObject(item) && item.section == null && typeof item.package === "string" && Array.isArray(item.contents);
+  return !Array.isArray(item);
 }
 function resolveFilepath(unresolvedFilepath, absoluteFilepathToDocsConfig) {
   if (unresolvedFilepath == null) {
@@ -1054342,7 +1054368,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "0.30.8-rc4",
+          version: "0.30.8-rc5",
           usingAccessToken: true
         }
       });
@@ -1054404,7 +1054430,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "0.30.8-rc4",
+        version: "0.30.8-rc5",
         ...event,
         ...event.properties
       }
@@ -1080347,10 +1080373,10 @@ var CliContext = class {
     return "fern-api";
   }
   getPackageVersion() {
-    if ("0.30.8-rc4" == null) {
+    if ("0.30.8-rc5" == null) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "0.30.8-rc4";
+    return "0.30.8-rc5";
   }
   getCliName() {
     if ("fern" == null) {
@@ -1087657,7 +1087683,7 @@ function stringifyEndpointPathParts22(path42) {
 }
 
 // pnp:/home/circleci/project/packages/cli/docs-resolver/lib/ApiDefinitionHolder.js
-var ROOT_PACKAGE_ID = "root";
+var ROOT_PACKAGE_ID = "__package__";
 var _endpoints2, _webSockets2, _webhooks2, _endpointsInverted, _webSocketsInverted, _webhooksInverted, _subpackages, _endpointsByLocator, _webSocketsByLocator, _webhooksByLocator, _subpackagesByLocator, _constructSubpackageLocators, constructSubpackageLocators_fn;
 var _ApiDefinitionHolder2 = class {
   constructor(api, context) {
@@ -1087742,13 +1087768,6 @@ var _ApiDefinitionHolder2 = class {
       pkg2.webhooks.forEach((webhook) => {
         subpackageHolder.webhooks.set(webhook.id, webhook);
         __privateGet(this, _webhooks2).set(_ApiDefinitionHolder2.createWebhookId(webhook, subpackageId), webhook);
-        const locators = [];
-        locators.push(`${webhook.method} ${urlJoin22("/", ...webhook.path)}`);
-        locators.forEach((locator) => {
-          var _a5;
-          (_a5 = this.context) == null ? void 0 : _a5.logger.debug(`Registering webhook locator: ${locator}`);
-          __privateGet(this, _webhooksByLocator).set(locator, webhook);
-        });
       });
     });
     __privateGet(this, _endpoints2).forEach((endpoint, endpointId) => {
@@ -1087807,6 +1087826,9 @@ var _ApiDefinitionHolder2 = class {
   get subpackages() {
     return __privateGet(this, _subpackages);
   }
+  get subpackagesByLocator() {
+    return __privateGet(this, _subpackagesByLocator);
+  }
   getEndpointId(endpoint) {
     return __privateGet(this, _endpointsInverted).get(endpoint);
   }
@@ -1087844,27 +1087866,42 @@ constructSubpackageLocators_fn = function(pkg2, parents) {
     return;
   }
   const packageList = isSubpackage2(pkg2) ? [...parents, pkg2.name] : parents;
-  __privateGet(this, _subpackagesByLocator).set(packageList.length === 0 ? ROOT_PACKAGE_ID : packageList.join("."), pkg2);
+  const path42 = packageList.length === 0 ? [ROOT_PACKAGE_ID] : packageList;
+  const locators = [path42.join("."), path42.join("/"), `${path42.join(".")}.yml`];
+  locators.forEach((locator) => {
+    var _a5;
+    (_a5 = this.context) == null ? void 0 : _a5.logger.debug(`Registering subpackage locator: ${locator}`);
+    __privateGet(this, _subpackagesByLocator).set(locator, pkg2);
+  });
   if (pkg2.pointsTo != null) {
     return __privateMethod(this, _constructSubpackageLocators, constructSubpackageLocators_fn).call(this, this.api.subpackages[pkg2.pointsTo], packageList);
   }
   pkg2.endpoints.forEach((endpoint) => {
-    var _a5;
-    const locator = [...packageList, endpoint.id].join(".");
-    (_a5 = this.context) == null ? void 0 : _a5.logger.debug(`Registering endpoint locator: ${locator}`);
-    __privateGet(this, _endpointsByLocator).set(locator, endpoint);
+    const path43 = [...packageList, endpoint.id];
+    const locators2 = [path43.join("."), path43.join("/")];
+    locators2.forEach((locator) => {
+      var _a5;
+      (_a5 = this.context) == null ? void 0 : _a5.logger.debug(`Registering endpoint locator: ${locator}`);
+      __privateGet(this, _endpointsByLocator).set(locator, endpoint);
+    });
   });
   pkg2.websockets.forEach((webSocket) => {
-    var _a5;
-    const locator = [...packageList, webSocket.id].join(".");
-    (_a5 = this.context) == null ? void 0 : _a5.logger.debug(`Registering websocket locator: ${locator}`);
-    __privateGet(this, _webSocketsByLocator).set(locator, webSocket);
+    const path43 = [...packageList, webSocket.id];
+    const locators2 = [path43.join("."), path43.join("/")];
+    locators2.forEach((locator) => {
+      var _a5;
+      (_a5 = this.context) == null ? void 0 : _a5.logger.debug(`Registering websocket locator: ${locator}`);
+      __privateGet(this, _webSocketsByLocator).set(locator, webSocket);
+    });
   });
   pkg2.webhooks.forEach((webhook) => {
-    var _a5;
-    const locator = [...packageList, webhook.id].join(".");
-    (_a5 = this.context) == null ? void 0 : _a5.logger.debug(`Registering webhook locator: ${locator}`);
-    __privateGet(this, _webhooksByLocator).set(locator, webhook);
+    const path43 = [...packageList, webhook.id];
+    const locators2 = [path43.join("."), path43.join("/")];
+    locators2.forEach((locator) => {
+      var _a5;
+      (_a5 = this.context) == null ? void 0 : _a5.logger.debug(`Registering webhook locator: ${locator}`);
+      __privateGet(this, _webhooksByLocator).set(locator, webhook);
+    });
   });
   pkg2.subpackages.forEach((subpackageId) => {
     __privateMethod(this, _constructSubpackageLocators, constructSubpackageLocators_fn).call(this, this.api.subpackages[subpackageId], packageList);
@@ -1088052,14 +1088089,18 @@ var NodeIdGenerator2 = class {
 };
 
 // pnp:/home/circleci/project/packages/cli/docs-resolver/lib/ApiReferenceNodeConverter.js
-var _holder2, _visitedEndpoints2, _visitedWebSockets2, _visitedWebhooks2, _visitedSubpackages2, _nodeIdToSubpackageId, _children, _overviewPageId, _slug, _convertApiNavigationItems, convertApiNavigationItems_fn, _convertPackage, convertPackage_fn, _convertSection, convertSection_fn, _convertApiDefinitionPackage, convertApiDefinitionPackage_fn, _convertUnknownIdentifier, convertUnknownIdentifier_fn;
+var _holder2, _visitedEndpoints2, _visitedWebSockets2, _visitedWebhooks2, _visitedSubpackages2, _nodeIdToSubpackageId, _children, _overviewPageId, _slug, _convertApiReferenceLayoutItems, convertApiReferenceLayoutItems_fn, _convertPackage, convertPackage_fn, _convertSection, convertSection_fn, _convertUnknownIdentifier, convertUnknownIdentifier_fn, _convertEndpoint, convertEndpoint_fn, _mergeAndFilterChildren, mergeAndFilterChildren_fn, _convertApiPackageChild, convertApiPackageChild_fn, _convertApiDefinitionPackage, convertApiDefinitionPackage_fn, _convertApiDefinitionPackageId, convertApiDefinitionPackageId_fn;
 var ApiReferenceNodeConverter = class {
   constructor(apiSection, api, parentSlug, workspace, docsWorkspace, taskContext, markdownFilesToFullSlugs) {
-    __privateAdd(this, _convertApiNavigationItems);
+    __privateAdd(this, _convertApiReferenceLayoutItems);
     __privateAdd(this, _convertPackage);
     __privateAdd(this, _convertSection);
-    __privateAdd(this, _convertApiDefinitionPackage);
     __privateAdd(this, _convertUnknownIdentifier);
+    __privateAdd(this, _convertEndpoint);
+    __privateAdd(this, _mergeAndFilterChildren);
+    __privateAdd(this, _convertApiPackageChild);
+    __privateAdd(this, _convertApiDefinitionPackage);
+    __privateAdd(this, _convertApiDefinitionPackageId);
     __publicField(this, "apiSection");
     __publicField(this, "workspace");
     __publicField(this, "docsWorkspace");
@@ -1088091,9 +1088132,9 @@ var ApiReferenceNodeConverter = class {
       urlSlug: this.apiSection.slug ?? kebabCase_default2(this.apiSection.title)
     }));
     if (this.apiSection.navigation != null) {
-      __privateSet(this, _children, __privateMethod(this, _convertApiNavigationItems, convertApiNavigationItems_fn).call(this, this.apiSection.navigation, __privateGet(this, _holder2).api.rootPackage, __privateGet(this, _slug), idgen));
+      __privateSet(this, _children, __privateMethod(this, _convertApiReferenceLayoutItems, convertApiReferenceLayoutItems_fn).call(this, this.apiSection.navigation, __privateGet(this, _holder2).api.rootPackage, __privateGet(this, _slug), idgen));
     }
-    __privateSet(this, _children, __privateMethod(this, _convertApiDefinitionPackage, convertApiDefinitionPackage_fn).call(this, "root", __privateGet(this, _children), __privateGet(this, _slug), idgen));
+    __privateSet(this, _children, __privateMethod(this, _mergeAndFilterChildren, mergeAndFilterChildren_fn).call(this, __privateGet(this, _children).map((child) => __privateMethod(this, _convertApiPackageChild, convertApiPackageChild_fn).call(this, child, __privateGet(this, _slug), idgen)), __privateMethod(this, _convertApiDefinitionPackage, convertApiDefinitionPackage_fn).call(this, __privateGet(this, _holder2).api.rootPackage, __privateGet(this, _slug), idgen)));
   }
   get() {
     const pointsTo = navigation_exports2.utils.followRedirects(__privateGet(this, _children));
@@ -1088162,8 +1088203,8 @@ _nodeIdToSubpackageId = new WeakMap();
 _children = new WeakMap();
 _overviewPageId = new WeakMap();
 _slug = new WeakMap();
-_convertApiNavigationItems = new WeakSet();
-convertApiNavigationItems_fn = function(navigation, apiDefinitionPackage, parentSlug, idgen) {
+_convertApiReferenceLayoutItems = new WeakSet();
+convertApiReferenceLayoutItems_fn = function(navigation, apiDefinitionPackage, parentSlug, idgen) {
   apiDefinitionPackage = __privateGet(this, _holder2).resolveSubpackage(apiDefinitionPackage);
   const apiDefinitionPackageId = apiDefinitionPackage != null ? ApiDefinitionHolder2.getSubpackageId(apiDefinitionPackage) : void 0;
   return navigation.map((item) => visitDiscriminatedUnion2(item)._visit({
@@ -1088177,22 +1088218,24 @@ convertApiNavigationItems_fn = function(navigation, apiDefinitionPackage, parent
     page: (page) => {
       var _a5;
       const pageId = navigation_exports2.PageId(this.toRelativeFilepath(page.absolutePath));
+      const pageSlug = parentSlug.apply({
+        fullSlug: (_a5 = this.markdownFilesToFullSlugs.get(page.absolutePath)) == null ? void 0 : _a5.split("/"),
+        urlSlug: page.slug ?? kebabCase_default2(page.title)
+      });
       return {
         id: idgen.append(`page:${pageId}`).get(),
         type: "page",
         pageId,
         title: page.title,
-        slug: parentSlug.apply({
-          fullSlug: (_a5 = this.markdownFilesToFullSlugs.get(page.absolutePath)) == null ? void 0 : _a5.split("/"),
-          urlSlug: page.slug ?? kebabCase_default2(page.title)
-        }).get(),
+        slug: pageSlug.get(),
         icon: page.icon,
         hidden: page.hidden
       };
     },
     package: (pkg2) => __privateMethod(this, _convertPackage, convertPackage_fn).call(this, pkg2, parentSlug, idgen),
     section: (section) => __privateMethod(this, _convertSection, convertSection_fn).call(this, section, parentSlug, idgen),
-    item: ({ value: unknownIdentifier }) => __privateMethod(this, _convertUnknownIdentifier, convertUnknownIdentifier_fn).call(this, unknownIdentifier, apiDefinitionPackageId, parentSlug, idgen)
+    item: ({ value: unknownIdentifier }) => __privateMethod(this, _convertUnknownIdentifier, convertUnknownIdentifier_fn).call(this, unknownIdentifier, apiDefinitionPackageId, parentSlug, idgen),
+    endpoint: (endpoint) => __privateMethod(this, _convertEndpoint, convertEndpoint_fn).call(this, endpoint, apiDefinitionPackageId, parentSlug, idgen)
   })).filter(isNonNullish);
 };
 _convertPackage = new WeakSet();
@@ -1088203,20 +1088246,23 @@ convertPackage_fn = function(pkg2, parentSlug, idgen) {
   if (subpackage != null) {
     const subpackageId = ApiDefinitionHolder2.getSubpackageId(subpackage);
     const subpackageNodeId = idgen.append(subpackageId);
+    if (__privateGet(this, _visitedSubpackages2).has(subpackageId)) {
+      this.taskContext.logger.error(`Duplicate subpackage found in the API Reference layout: ${subpackageId}`);
+    }
     __privateGet(this, _visitedSubpackages2).add(subpackageId);
-    __privateGet(this, _nodeIdToSubpackageId).set(subpackageNodeId.get(), subpackageId);
+    __privateGet(this, _nodeIdToSubpackageId).set(subpackageNodeId.get(), [subpackageId]);
     const urlSlug = pkg2.slug ?? (isSubpackage2(subpackage) ? subpackage.urlSlug : this.apiSection.slug ?? kebabCase_default2(this.apiSection.title));
     const slug = parentSlug.apply({
       fullSlug: maybeFullSlug == null ? void 0 : maybeFullSlug.split("/"),
       skipUrlSlug: pkg2.skipUrlSlug,
       urlSlug
     });
-    const convertedItems = __privateMethod(this, _convertApiNavigationItems, convertApiNavigationItems_fn).call(this, pkg2.contents, subpackage, slug, subpackageNodeId);
+    const convertedItems = __privateMethod(this, _convertApiReferenceLayoutItems, convertApiReferenceLayoutItems_fn).call(this, pkg2.contents, subpackage, slug, subpackageNodeId);
     return {
       id: subpackageNodeId.get(),
       type: "apiPackage",
       children: convertedItems,
-      title: isSubpackage2(subpackage) ? subpackage.displayName ?? titleCase(subpackage.name) : this.apiSection.title,
+      title: pkg2.title ?? (isSubpackage2(subpackage) ? subpackage.displayName ?? titleCase(subpackage.name) : this.apiSection.title),
       slug: slug.get(),
       icon: pkg2.icon,
       hidden: pkg2.hidden,
@@ -1088226,19 +1088272,19 @@ convertPackage_fn = function(pkg2, parentSlug, idgen) {
       pointsTo: void 0
     };
   } else {
-    this.taskContext.logger.error(`Subpackage ${pkg2.package} not found in ${this.apiDefinitionId}`);
+    this.taskContext.logger.warn(`Subpackage ${pkg2.package} not found in ${this.apiDefinitionId}, treating it as a section`);
     const urlSlug = pkg2.slug ?? kebabCase_default2(pkg2.package);
     const slug = parentSlug.apply({
       fullSlug: maybeFullSlug == null ? void 0 : maybeFullSlug.split("/"),
       skipUrlSlug: pkg2.skipUrlSlug,
       urlSlug
     });
-    const convertedItems = __privateMethod(this, _convertApiNavigationItems, convertApiNavigationItems_fn).call(this, pkg2.contents, subpackage, slug, idgen);
+    const convertedItems = __privateMethod(this, _convertApiReferenceLayoutItems, convertApiReferenceLayoutItems_fn).call(this, pkg2.contents, void 0, slug, idgen);
     return {
       id: idgen.append(kebabCase_default2(pkg2.package)).get(),
       type: "apiPackage",
       children: convertedItems,
-      title: pkg2.package,
+      title: pkg2.title ?? pkg2.package,
       slug: slug.get(),
       icon: pkg2.icon,
       hidden: pkg2.hidden,
@@ -1088253,28 +1088299,34 @@ _convertSection = new WeakSet();
 convertSection_fn = function(section, parentSlug, idgen) {
   const overviewPageId = section.summaryAbsolutePath != null ? navigation_exports2.PageId(this.toRelativeFilepath(section.summaryAbsolutePath)) : void 0;
   const maybeFullSlug = section.summaryAbsolutePath != null ? this.markdownFilesToFullSlugs.get(section.summaryAbsolutePath) : void 0;
-  const nodeId = idgen.append(`section:${kebabCase_default2(section.section)}`);
-  section.subpackages.forEach((subpackageId) => {
+  const nodeId = idgen.append(`section:${kebabCase_default2(section.title)}`);
+  const subpackages = section.referencedSubpackages.filter((subpackageId) => {
     const subpackage = __privateGet(this, _holder2).getSubpackage(subpackageId);
     if (subpackage == null) {
       this.taskContext.logger.error(`Subpackage ${subpackageId} not found in ${this.apiDefinitionId}`);
-      return;
+      return false;
+    }
+    return true;
+  });
+  __privateGet(this, _nodeIdToSubpackageId).set(nodeId.get(), subpackages);
+  subpackages.forEach((subpackageId) => {
+    if (__privateGet(this, _visitedSubpackages2).has(subpackageId)) {
+      this.taskContext.logger.error(`Duplicate subpackage found in the API Reference layout: ${subpackageId}`);
     }
     __privateGet(this, _visitedSubpackages2).add(subpackageId);
-    __privateGet(this, _nodeIdToSubpackageId).set(nodeId.get(), subpackageId);
   });
-  const urlSlug = section.slug ?? kebabCase_default2(section.section);
+  const urlSlug = section.slug ?? kebabCase_default2(section.title);
   const slug = parentSlug.apply({
     fullSlug: maybeFullSlug == null ? void 0 : maybeFullSlug.split("/"),
     skipUrlSlug: section.skipUrlSlug,
     urlSlug
   });
-  const convertedItems = __privateMethod(this, _convertApiNavigationItems, convertApiNavigationItems_fn).call(this, section.contents, section.subpackages.length === 1 ? __privateGet(this, _holder2).getSubpackage(section.subpackages[0]) : void 0, slug, idgen);
+  const convertedItems = __privateMethod(this, _convertApiReferenceLayoutItems, convertApiReferenceLayoutItems_fn).call(this, section.contents, void 0, slug, idgen);
   return {
     id: nodeId.get(),
     type: "apiPackage",
     children: convertedItems,
-    title: section.section,
+    title: section.title,
     slug: slug.get(),
     icon: section.icon,
     hidden: section.hidden,
@@ -1088284,11 +1088336,143 @@ convertSection_fn = function(section, parentSlug, idgen) {
     pointsTo: void 0
   };
 };
+_convertUnknownIdentifier = new WeakSet();
+convertUnknownIdentifier_fn = function(unknownIdentifier, apiDefinitionPackageId, parentSlug, idgen) {
+  unknownIdentifier = unknownIdentifier.trim();
+  const subpackage = __privateGet(this, _holder2).getSubpackage(unknownIdentifier);
+  if (subpackage != null) {
+    const subpackageId = ApiDefinitionHolder2.getSubpackageId(subpackage);
+    const subpackageNodeId = idgen.append(subpackageId);
+    if (__privateGet(this, _visitedSubpackages2).has(subpackageId)) {
+      this.taskContext.logger.error(`Duplicate subpackage found in the API Reference layout: ${subpackageId}`);
+    }
+    __privateGet(this, _visitedSubpackages2).add(subpackageId);
+    __privateGet(this, _nodeIdToSubpackageId).set(subpackageNodeId.get(), [subpackageId]);
+    const urlSlug = isSubpackage2(subpackage) ? subpackage.urlSlug : "";
+    const slug = parentSlug.apply({ urlSlug });
+    return {
+      id: subpackageNodeId.get(),
+      type: "apiPackage",
+      children: [],
+      title: isSubpackage2(subpackage) ? subpackage.displayName ?? titleCase(subpackage.name) : this.apiSection.title,
+      slug: slug.get(),
+      icon: void 0,
+      hidden: void 0,
+      overviewPageId: void 0,
+      availability: void 0,
+      apiDefinitionId: this.apiDefinitionId,
+      pointsTo: void 0
+    };
+  }
+  return __privateMethod(this, _convertEndpoint, convertEndpoint_fn).call(this, {
+    type: "endpoint",
+    endpoint: unknownIdentifier,
+    title: void 0,
+    icon: void 0,
+    slug: void 0,
+    hidden: void 0
+  }, apiDefinitionPackageId, parentSlug, idgen);
+};
+_convertEndpoint = new WeakSet();
+convertEndpoint_fn = function(endpointItem, apiDefinitionPackageId, parentSlug, idgen) {
+  var _a5, _b4, _c4, _d2;
+  const endpoint = (apiDefinitionPackageId != null ? (_a5 = __privateGet(this, _holder2).subpackages.get(apiDefinitionPackageId)) == null ? void 0 : _a5.endpoints.get(endpointItem.endpoint) : void 0) ?? __privateGet(this, _holder2).endpointsByLocator.get(endpointItem.endpoint);
+  if (endpoint != null) {
+    const endpointId = __privateGet(this, _holder2).getEndpointId(endpoint);
+    if (endpointId == null) {
+      throw new Error(`Expected Endpoint ID for ${endpoint.id}. Got undefined.`);
+    }
+    if (__privateGet(this, _visitedEndpoints2).has(endpointId)) {
+      this.taskContext.logger.error(`Duplicate endpoint found in the API Reference layout: ${endpointId}`);
+    }
+    __privateGet(this, _visitedEndpoints2).add(endpointId);
+    return {
+      id: idgen.append(endpoint.id).get(),
+      type: "endpoint",
+      method: endpoint.method,
+      endpointId,
+      apiDefinitionId: this.apiDefinitionId,
+      availability: navigation_exports2.utils.convertAvailability(endpoint.availability),
+      isResponseStream: ((_b4 = endpoint.response) == null ? void 0 : _b4.type.type) === "stream",
+      title: endpointItem.title ?? endpoint.name ?? stringifyEndpointPathParts2(endpoint.path.parts),
+      slug: (endpointItem.slug != null ? parentSlug.append(endpointItem.slug) : parentSlug.apply(endpoint)).get(),
+      icon: endpointItem.icon,
+      hidden: endpointItem.hidden
+    };
+  }
+  const webSocket = (apiDefinitionPackageId != null ? (_c4 = __privateGet(this, _holder2).subpackages.get(apiDefinitionPackageId)) == null ? void 0 : _c4.webSockets.get(endpointItem.endpoint) : void 0) ?? __privateGet(this, _holder2).webSocketsByLocator.get(endpointItem.endpoint);
+  if (webSocket != null) {
+    const webSocketId = __privateGet(this, _holder2).getWebSocketId(webSocket);
+    if (webSocketId == null) {
+      throw new Error(`Expected WebSocket ID for ${webSocket.id}. Got undefined.`);
+    }
+    if (__privateGet(this, _visitedWebSockets2).has(webSocketId)) {
+      this.taskContext.logger.error(`Duplicate web socket found in the API Reference layout: ${webSocketId}`);
+    }
+    __privateGet(this, _visitedWebSockets2).add(webSocketId);
+    return {
+      id: idgen.append(webSocket.id).get(),
+      type: "webSocket",
+      webSocketId,
+      title: endpointItem.title ?? webSocket.name ?? stringifyEndpointPathParts2(webSocket.path.parts),
+      slug: (endpointItem.slug != null ? parentSlug.append(endpointItem.slug) : parentSlug.apply(webSocket)).get(),
+      icon: endpointItem.icon,
+      hidden: endpointItem.hidden,
+      apiDefinitionId: this.apiDefinitionId,
+      availability: navigation_exports2.utils.convertAvailability(webSocket.availability)
+    };
+  }
+  const webhook = (apiDefinitionPackageId != null ? (_d2 = __privateGet(this, _holder2).subpackages.get(apiDefinitionPackageId)) == null ? void 0 : _d2.webhooks.get(endpointItem.endpoint) : void 0) ?? __privateGet(this, _holder2).webhooks.get(navigation_exports2.WebhookId(endpointItem.endpoint));
+  if (webhook != null) {
+    const webhookId = __privateGet(this, _holder2).getWebhookId(webhook);
+    if (webhookId == null) {
+      throw new Error(`Expected Webhook ID for ${webhook.id}. Got undefined.`);
+    }
+    if (__privateGet(this, _visitedWebhooks2).has(webhookId)) {
+      this.taskContext.logger.error(`Duplicate webhook found in the API Reference layout: ${webhookId}`);
+    }
+    __privateGet(this, _visitedWebhooks2).add(webhookId);
+    return {
+      id: idgen.append(webhook.id).get(),
+      type: "webhook",
+      webhookId,
+      method: webhook.method,
+      title: endpointItem.title ?? webhook.name ?? urlJoin22("/", ...webhook.path),
+      slug: (endpointItem.slug != null ? parentSlug.append(endpointItem.slug) : parentSlug.apply(webhook)).get(),
+      icon: endpointItem.icon,
+      hidden: endpointItem.hidden,
+      apiDefinitionId: this.apiDefinitionId,
+      availability: void 0
+    };
+  }
+  this.taskContext.logger.error("Unknown identifier in the API Reference layout: ", endpointItem.endpoint);
+  return;
+};
+_mergeAndFilterChildren = new WeakSet();
+mergeAndFilterChildren_fn = function(left3, right3) {
+  return this.mergeEndpointPairs([...left3, ...right3], NodeIdGenerator2.init(this.apiDefinitionId)).filter((child) => child.type === "apiPackage" ? child.children.length > 0 : true);
+};
+_convertApiPackageChild = new WeakSet();
+convertApiPackageChild_fn = function(child, parentSlug, idgen) {
+  if (child.type === "apiPackage") {
+    const slug = parentSlug.set(child.slug);
+    const innerIdgen = idgen.append(kebabCase_default2(child.title));
+    const subpackageIds = __privateGet(this, _nodeIdToSubpackageId).get(child.id) ?? [];
+    const subpackageChildren = subpackageIds.flatMap((subpackageId) => __privateMethod(this, _convertApiDefinitionPackageId, convertApiDefinitionPackageId_fn).call(this, subpackageId, slug, innerIdgen));
+    const children2 = __privateMethod(this, _mergeAndFilterChildren, mergeAndFilterChildren_fn).call(this, child.children, subpackageChildren);
+    return {
+      ...child,
+      children: children2,
+      pointsTo: navigation_exports2.utils.followRedirects(children2)
+    };
+  }
+  return child;
+};
 _convertApiDefinitionPackage = new WeakSet();
-convertApiDefinitionPackage_fn = function(packageId, children2, parentSlug, idgen) {
-  const pkg2 = packageId != null ? __privateGet(this, _holder2).resolveSubpackage(__privateGet(this, _holder2).getSubpackage(packageId)) : void 0;
+convertApiDefinitionPackage_fn = function(pkg2, parentSlug, idgen) {
   let additionalChildren = [];
-  pkg2 == null ? void 0 : pkg2.endpoints.forEach((endpoint) => {
+  idgen = idgen.append(isSubpackage2(pkg2) ? pkg2.subpackageId : ROOT_PACKAGE_ID);
+  pkg2.endpoints.forEach((endpoint) => {
     var _a5;
     const endpointId = __privateGet(this, _holder2).getEndpointId(endpoint);
     if (endpointId == null) {
@@ -1088311,7 +1088495,7 @@ convertApiDefinitionPackage_fn = function(packageId, children2, parentSlug, idge
       hidden: void 0
     });
   });
-  pkg2 == null ? void 0 : pkg2.websockets.forEach((webSocket) => {
+  pkg2.websockets.forEach((webSocket) => {
     const webSocketId = __privateGet(this, _holder2).getWebSocketId(webSocket);
     if (webSocketId == null) {
       throw new Error(`Expected WebSocket ID for ${webSocket.id}. Got undefined.`);
@@ -1088331,7 +1088515,7 @@ convertApiDefinitionPackage_fn = function(packageId, children2, parentSlug, idge
       availability: navigation_exports2.utils.convertAvailability(webSocket.availability)
     });
   });
-  pkg2 == null ? void 0 : pkg2.webhooks.forEach((webhook) => {
+  pkg2.webhooks.forEach((webhook) => {
     const webhookId = __privateGet(this, _holder2).getWebhookId(webhook);
     if (webhookId == null) {
       throw new Error(`Expected Webhook ID for ${webhook.id}. Got undefined.`);
@@ -1088344,7 +1088528,7 @@ convertApiDefinitionPackage_fn = function(packageId, children2, parentSlug, idge
       type: "webhook",
       webhookId,
       method: webhook.method,
-      title: webhook.name ?? urlJoin22("/", ...webhook.path),
+      title: webhook.name ?? titleCase(webhook.id),
       slug: parentSlug.apply(webhook).get(),
       icon: void 0,
       hidden: void 0,
@@ -1088352,7 +1088536,7 @@ convertApiDefinitionPackage_fn = function(packageId, children2, parentSlug, idge
       availability: void 0
     });
   });
-  pkg2 == null ? void 0 : pkg2.subpackages.forEach((subpackageId) => {
+  pkg2.subpackages.forEach((subpackageId) => {
     if (__privateGet(this, _visitedSubpackages2).has(subpackageId)) {
       return;
     }
@@ -1088363,7 +1088547,7 @@ convertApiDefinitionPackage_fn = function(packageId, children2, parentSlug, idge
     }
     const subpackageNodeId = idgen.append(subpackageId);
     const slug = isSubpackage2(subpackage) ? parentSlug.apply(subpackage) : parentSlug;
-    const subpackageChildren = __privateMethod(this, _convertApiDefinitionPackage, convertApiDefinitionPackage_fn).call(this, subpackageId, [], slug, subpackageNodeId);
+    const subpackageChildren = __privateMethod(this, _convertApiDefinitionPackageId, convertApiDefinitionPackageId_fn).call(this, subpackageId, slug, subpackageNodeId);
     additionalChildren.push({
       id: subpackageNodeId.get(),
       type: "apiPackage",
@@ -1088385,124 +1088569,16 @@ convertApiDefinitionPackage_fn = function(packageId, children2, parentSlug, idge
       return aTitle.localeCompare(bTitle);
     });
   }
-  let toRet = [
-    ...children2.map((child) => {
-      if (child.type === "apiPackage") {
-        const subpackageId = __privateGet(this, _nodeIdToSubpackageId).get(child.id);
-        const newChildren = __privateMethod(this, _convertApiDefinitionPackage, convertApiDefinitionPackage_fn).call(this, subpackageId, child.children, parentSlug.set(child.slug), idgen.append(subpackageId ?? kebabCase_default2(child.title)));
-        return {
-          ...child,
-          children: newChildren,
-          pointsTo: navigation_exports2.utils.followRedirects(newChildren)
-        };
-      }
-      return child;
-    }),
-    ...additionalChildren
-  ];
-  toRet = this.mergeEndpointPairs(toRet, idgen);
-  return toRet.filter((child) => child.type === "apiPackage" ? child.children.length > 0 : true);
+  return additionalChildren;
 };
-_convertUnknownIdentifier = new WeakSet();
-convertUnknownIdentifier_fn = function(unknownIdentifier, apiDefinitionPackageId, parentSlug, idgen) {
-  var _a5, _b4, _c4, _d2;
-  unknownIdentifier = unknownIdentifier.trim();
-  const subpackage = __privateGet(this, _holder2).getSubpackage(unknownIdentifier);
-  if (subpackage != null) {
-    const subpackageId = ApiDefinitionHolder2.getSubpackageId(subpackage);
-    const subpackageNodeId = idgen.append(subpackageId);
-    if (__privateGet(this, _visitedSubpackages2).has(subpackageId)) {
-      this.taskContext.logger.error(`Duplicate subpackage found in the API Reference layout: ${subpackageId}`);
-    }
-    __privateGet(this, _visitedSubpackages2).add(subpackageId);
-    __privateGet(this, _nodeIdToSubpackageId).set(subpackageNodeId.get(), subpackageId);
-    const urlSlug = isSubpackage2(subpackage) ? subpackage.urlSlug : "";
-    const slug = parentSlug.apply({ urlSlug });
-    return {
-      id: subpackageNodeId.get(),
-      type: "apiPackage",
-      children: [],
-      title: isSubpackage2(subpackage) ? subpackage.displayName ?? titleCase(subpackage.name) : this.apiSection.title,
-      slug: slug.get(),
-      icon: void 0,
-      hidden: void 0,
-      overviewPageId: void 0,
-      availability: void 0,
-      apiDefinitionId: this.apiDefinitionId,
-      pointsTo: void 0
-    };
-  }
-  const endpoint = (apiDefinitionPackageId != null ? (_a5 = __privateGet(this, _holder2).subpackages.get(apiDefinitionPackageId)) == null ? void 0 : _a5.endpoints.get(unknownIdentifier) : void 0) ?? __privateGet(this, _holder2).endpointsByLocator.get(unknownIdentifier);
-  if (endpoint != null) {
-    const endpointId = __privateGet(this, _holder2).getEndpointId(endpoint);
-    if (endpointId == null) {
-      throw new Error(`Expected Endpoint ID for ${endpoint.id}. Got undefined.`);
-    }
-    if (__privateGet(this, _visitedEndpoints2).has(endpointId)) {
-      this.taskContext.logger.error(`Duplicate endpoint found in the API Reference layout: ${endpointId}`);
-    }
-    __privateGet(this, _visitedEndpoints2).add(endpointId);
-    return {
-      id: idgen.append(endpoint.id).get(),
-      type: "endpoint",
-      method: endpoint.method,
-      endpointId,
-      apiDefinitionId: this.apiDefinitionId,
-      availability: navigation_exports2.utils.convertAvailability(endpoint.availability),
-      isResponseStream: ((_b4 = endpoint.response) == null ? void 0 : _b4.type.type) === "stream",
-      title: endpoint.name ?? stringifyEndpointPathParts2(endpoint.path.parts),
-      slug: parentSlug.apply(endpoint).get(),
-      icon: void 0,
-      hidden: void 0
-    };
-  }
-  const webSocket = (apiDefinitionPackageId != null ? (_c4 = __privateGet(this, _holder2).subpackages.get(apiDefinitionPackageId)) == null ? void 0 : _c4.webSockets.get(unknownIdentifier) : void 0) ?? __privateGet(this, _holder2).webSocketsByLocator.get(unknownIdentifier);
-  if (webSocket != null) {
-    const webSocketId = __privateGet(this, _holder2).getWebSocketId(webSocket);
-    if (webSocketId == null) {
-      throw new Error(`Expected WebSocket ID for ${webSocket.id}. Got undefined.`);
-    }
-    if (__privateGet(this, _visitedWebSockets2).has(webSocketId)) {
-      this.taskContext.logger.error(`Duplicate web socket found in the API Reference layout: ${webSocketId}`);
-    }
-    __privateGet(this, _visitedWebSockets2).add(webSocketId);
-    return {
-      id: idgen.append(webSocket.id).get(),
-      type: "webSocket",
-      webSocketId,
-      title: webSocket.name ?? stringifyEndpointPathParts2(webSocket.path.parts),
-      slug: parentSlug.apply(webSocket).get(),
-      icon: void 0,
-      hidden: void 0,
-      apiDefinitionId: this.apiDefinitionId,
-      availability: navigation_exports2.utils.convertAvailability(webSocket.availability)
-    };
-  }
-  const webhook = (apiDefinitionPackageId != null ? (_d2 = __privateGet(this, _holder2).subpackages.get(apiDefinitionPackageId)) == null ? void 0 : _d2.webhooks.get(unknownIdentifier) : void 0) ?? __privateGet(this, _holder2).webhooks.get(navigation_exports2.WebhookId(unknownIdentifier));
-  if (webhook != null) {
-    const webhookId = __privateGet(this, _holder2).getWebhookId(webhook);
-    if (webhookId == null) {
-      throw new Error(`Expected Webhook ID for ${webhook.id}. Got undefined.`);
-    }
-    if (__privateGet(this, _visitedWebhooks2).has(webhookId)) {
-      this.taskContext.logger.error(`Duplicate webhook found in the API Reference layout: ${webhookId}`);
-    }
-    __privateGet(this, _visitedWebhooks2).add(webhookId);
-    return {
-      id: idgen.append(webhook.id).get(),
-      type: "webhook",
-      webhookId,
-      method: webhook.method,
-      title: webhook.name ?? urlJoin22("/", ...webhook.path),
-      slug: parentSlug.apply(webhook).get(),
-      icon: void 0,
-      hidden: void 0,
-      apiDefinitionId: this.apiDefinitionId,
-      availability: void 0
-    };
+_convertApiDefinitionPackageId = new WeakSet();
+convertApiDefinitionPackageId_fn = function(packageId, parentSlug, idgen) {
+  const pkg2 = packageId != null ? __privateGet(this, _holder2).resolveSubpackage(__privateGet(this, _holder2).getSubpackage(packageId)) : void 0;
+  if (pkg2 == null) {
+    this.taskContext.logger.error(`Subpackage ${packageId} not found in ${this.apiDefinitionId}`);
+    return [];
   }
-  this.taskContext.logger.error("Unknown identifier in the API Reference layout: ", unknownIdentifier);
-  return;
+  return __privateMethod(this, _convertApiDefinitionPackage, convertApiDefinitionPackage_fn).call(this, pkg2, parentSlug, idgen);
 };
 
 // pnp:/home/circleci/project/packages/cli/docs-resolver/lib/utils/convertDocsSnippetsConfigToFdr.js

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fern-api",
-  "version": "0.30.8-rc4",
+  "version": "0.30.8-rc5",
   "repository": {
     "type": "git",
     "url": "https://github.com/fern-api/fern.git",