fix(openrpc): set subpackages in openrpc

Author: dsinghvi

packages/parsers/src/openapi/3.1/OpenApiDocumentConverter.node.ts

@@ -1,7 +1,7 @@
-import { camelCase } from "es-toolkit";
 import { OpenAPIV3_1 } from "openapi-types";
 import { v4 } from "uuid";
 import { FernRegistry } from "../../client/generated";
+import { computeSubpackages } from "../../utils/computeSubpackages";
 import {
   BaseOpenApiV3_1ConverterNode,
   BaseOpenApiV3_1ConverterNodeConstructorArgs,
@@ -146,35 +146,7 @@ export class OpenApiDocumentConverterNode extends BaseOpenApiV3_1ConverterNode<
     const subpackages: Record<
       FernRegistry.api.v1.SubpackageId,
       FernRegistry.api.latest.SubpackageMetadata
-    > = {};
-    if (endpoints != null) {
-      Object.values(endpoints).forEach((endpoint) =>
-        endpoint.namespace?.forEach((subpackage) => {
-          const qualifiedPath: string[] = [];
-          subpackages[FernRegistry.api.v1.SubpackageId(camelCase(subpackage))] =
-            {
-              id: FernRegistry.api.v1.SubpackageId(camelCase(subpackage)),
-              name: [...qualifiedPath, subpackage].join("/"),
-              displayName: subpackage,
-            };
-          qualifiedPath.push(subpackage);
-        })
-      );
-    }
-    if (webhookEndpoints != null) {
-      Object.values(webhookEndpoints).forEach((webhook) =>
-        webhook.namespace?.forEach((subpackage) => {
-          const qualifiedPath: string[] = [];
-          subpackages[FernRegistry.api.v1.SubpackageId(camelCase(subpackage))] =
-            {
-              id: FernRegistry.api.v1.SubpackageId(camelCase(subpackage)),
-              name: [...qualifiedPath, subpackage].join("/"),
-              displayName: subpackage,
-            };
-          qualifiedPath.push(subpackage);
-        })
-      );
-    }
+    > = computeSubpackages({ endpoints, webhookEndpoints });
 
     const types = this.components?.convert();
 

packages/parsers/src/openrpc/1.x/OpenrpcDocumentConverter.node.ts

@@ -5,6 +5,7 @@ import { FernRegistry } from "../../client/generated";
 import { ServerObjectConverterNode } from "../../openapi";
 import { ComponentsConverterNode } from "../../openapi/3.1/schemas/ComponentsConverter.node";
 import { coalesceServers } from "../../openapi/utils/3.1/coalesceServers";
+import { computeSubpackages } from "../../utils/computeSubpackages";
 import {
   BaseOpenrpcConverterNode,
   BaseOpenrpcConverterNodeConstructorArgs,
@@ -72,25 +73,27 @@ export class OpenrpcDocumentConverterNode extends BaseOpenrpcConverterNode<
     const apiDefinitionId = v4();
     const types = this.components?.convert();
 
-    console.log(this.methods?.length);
-
     const methods = this.methods
       ?.map((method) => {
         return method.convert();
       })
       .filter(isNonNullish);
 
+    const endpoints = Object.fromEntries(
+      methods?.map((method) => [method.id, method]) ?? []
+    );
+
+    const subpackages = computeSubpackages({ endpoints });
+
     return {
       id: FernRegistry.ApiDefinitionId(apiDefinitionId),
       types: Object.fromEntries(
         Object.entries(types ?? {}).map(([id, type]) => [id, type])
       ),
-      endpoints: Object.fromEntries(
-        methods?.map((method) => [method.id, method]) ?? []
-      ),
+      endpoints,
       websockets: {},
       webhooks: {},
-      subpackages: {},
+      subpackages,
       auths: {},
       globalHeaders: [],
     };

packages/parsers/src/openrpc/__test__/__snapshots__/petstore.json

@@ -419,7 +419,13 @@
   },
   "websockets": {},
   "webhooks": {},
-  "subpackages": {},
+  "subpackages": {
+    "pets": {
+      "id": "pets",
+      "name": "pets",
+      "displayName": "pets"
+    }
+  },
   "auths": {},
   "globalHeaders": []
 }

packages/parsers/src/utils/computeSubpackages.ts

@@ -0,0 +1,58 @@
+import { camelCase } from "es-toolkit";
+import { FernRegistry } from "../client/generated";
+
+export declare namespace ComputeSubpackages {
+  interface Args {
+    endpoints?: Record<
+      FernRegistry.EndpointId,
+      FernRegistry.api.latest.EndpointDefinition
+    >;
+    webhookEndpoints?: Record<
+      FernRegistry.EndpointId,
+      FernRegistry.api.latest.WebhookDefinition
+    >;
+  }
+}
+
+export function computeSubpackages({
+  endpoints,
+  webhookEndpoints,
+}: ComputeSubpackages.Args): Record<
+  FernRegistry.api.v1.SubpackageId,
+  FernRegistry.api.latest.SubpackageMetadata
+> {
+  const subpackages: Record<
+    FernRegistry.api.v1.SubpackageId,
+    FernRegistry.api.latest.SubpackageMetadata
+  > = {};
+
+  if (endpoints != null) {
+    Object.values(endpoints).forEach((endpoint) =>
+      endpoint.namespace?.forEach((subpackage) => {
+        const qualifiedPath: string[] = [];
+        subpackages[FernRegistry.api.v1.SubpackageId(camelCase(subpackage))] = {
+          id: FernRegistry.api.v1.SubpackageId(camelCase(subpackage)),
+          name: [...qualifiedPath, subpackage].join("/"),
+          displayName: subpackage,
+        };
+        qualifiedPath.push(subpackage);
+      })
+    );
+  }
+
+  if (webhookEndpoints != null) {
+    Object.values(webhookEndpoints).forEach((webhook) =>
+      webhook.namespace?.forEach((subpackage) => {
+        const qualifiedPath: string[] = [];
+        subpackages[FernRegistry.api.v1.SubpackageId(camelCase(subpackage))] = {
+          id: FernRegistry.api.v1.SubpackageId(camelCase(subpackage)),
+          name: [...qualifiedPath, subpackage].join("/"),
+          displayName: subpackage,
+        };
+        qualifiedPath.push(subpackage);
+      })
+    );
+  }
+
+  return subpackages;
+}