feat(cli): handle multi service conjure files in importer (#4831)

fern/pages/changelogs/cli/2024-10-09.mdx

@@ -0,0 +1,3 @@
+## 0.44.11
+**`(fix):`** Several improvements to the conjure importer.
+

fern/pages/changelogs/csharp-sdk/2024-10-08.mdx

@@ -0,0 +1,5 @@
+## 1.8.1
+**`(fix):`** Fixes a bug where the `OauthTokenProvider.cs` was incorrectly referencing
+the endpoint method, causing code to fail to compile.
+
+

generators/commons/package.json

@@ -39,7 +39,6 @@
     "tmp-promise": "^3.0.3"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.12",
     "@types/js-yaml": "^4.0.8",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^18.7.18",

packages/cli/api-importers/conjure/conjure-sdk/fern/definition/conjure.yml

@@ -8,6 +8,5 @@ types:
 
   DefinitionFile: 
     properties:
-      imports: optional<map<string, string>>
       types: optional<types.ConjureTypes>
       services: optional<map<ConjureServiceName, services.ConjureService>>

packages/cli/api-importers/conjure/conjure-sdk/fern/definition/types.yml

@@ -1,5 +1,8 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/fern-api/fern/main/fern.schema.json
 
+imports: 
+  commons: commons.yml
+
 types: 
   ConjureTypes: 
     properties: 
@@ -33,8 +36,20 @@ types:
 
   ConjureEnumDeclaration: 
     properties: 
-      values: list<string>
-
+      values: list<ConjureEnumVariant>
+
+  ConjureEnumVariant: 
+    discriminated: false
+    union: 
+      - string
+      - ConjureEnumWithDocs
+
+  ConjureEnumWithDocs: 
+    extends: 
+      - commons.WithDocs
+    properties: 
+      value: string
+
   ConjureTypeReference: 
     discriminated: false
     union: 

packages/cli/api-importers/conjure/conjure-sdk/src/sdk/api/resources/conjure/types/DefinitionFile.ts

@@ -5,7 +5,6 @@
 import * as FernConjure from "../../../index";
 
 export interface DefinitionFile {
-    imports: Record<string, string> | undefined;
     types: FernConjure.ConjureTypes | undefined;
     services: Record<FernConjure.ConjureServiceName, FernConjure.ConjureService> | undefined;
 }

packages/cli/api-importers/conjure/conjure-sdk/src/sdk/api/resources/types/types/ConjureEnumDeclaration.ts

@@ -2,6 +2,8 @@
  * This file was auto-generated by Fern from our API Definition.
  */
 
+import * as FernConjure from "../../../index";
+
 export interface ConjureEnumDeclaration {
-    values: string[];
+    values: FernConjure.ConjureEnumVariant[];
 }

packages/cli/api-importers/conjure/conjure-sdk/src/sdk/api/resources/types/types/ConjureEnumVariant.ts

@@ -0,0 +1,7 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+
+import * as FernConjure from "../../../index";
+
+export type ConjureEnumVariant = string | FernConjure.ConjureEnumWithDocs;

packages/cli/api-importers/conjure/conjure-sdk/src/sdk/api/resources/types/types/ConjureEnumWithDocs.ts

@@ -0,0 +1,9 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+
+import * as FernConjure from "../../../index";
+
+export interface ConjureEnumWithDocs extends FernConjure.WithDocs {
+    value: string;
+}

packages/cli/api-importers/conjure/conjure-sdk/src/sdk/api/resources/types/types/index.ts

@@ -5,6 +5,8 @@ export * from "./ConjureAliasDeclaration";
 export * from "./ConjureUnionDeclaration";
 export * from "./ConjureObjectDeclaration";
 export * from "./ConjureEnumDeclaration";
+export * from "./ConjureEnumVariant";
+export * from "./ConjureEnumWithDocs";
 export * from "./ConjureTypeReference";
 export * from "./ConjureType";
 export * from "./ConjureTypeWithDocs";

packages/cli/api-importers/conjure/conjure-sdk/src/sdk/serialization/resources/conjure/types/DefinitionFile.ts

@@ -13,14 +13,12 @@ export const DefinitionFile: core.serialization.ObjectSchema<
     serializers.DefinitionFile.Raw,
     FernConjure.DefinitionFile
 > = core.serialization.objectWithoutOptionalProperties({
-    imports: core.serialization.record(core.serialization.string(), core.serialization.string()).optional(),
     types: ConjureTypes.optional(),
     services: core.serialization.record(ConjureServiceName, ConjureService).optional(),
 });
 
 export declare namespace DefinitionFile {
     interface Raw {
-        imports?: Record<string, string> | null;
         types?: ConjureTypes.Raw | null;
         services?: Record<ConjureServiceName.Raw, ConjureService.Raw> | null;
     }

packages/cli/api-importers/conjure/conjure-sdk/src/sdk/serialization/resources/types/types/ConjureEnumDeclaration.ts

@@ -5,16 +5,17 @@
 import * as serializers from "../../../index";
 import * as FernConjure from "../../../../api/index";
 import * as core from "../../../../core";
+import { ConjureEnumVariant } from "./ConjureEnumVariant";
 
 export const ConjureEnumDeclaration: core.serialization.ObjectSchema<
     serializers.ConjureEnumDeclaration.Raw,
     FernConjure.ConjureEnumDeclaration
 > = core.serialization.objectWithoutOptionalProperties({
-    values: core.serialization.list(core.serialization.string()),
+    values: core.serialization.list(ConjureEnumVariant),
 });
 
 export declare namespace ConjureEnumDeclaration {
     interface Raw {
-        values: string[];
+        values: ConjureEnumVariant.Raw[];
     }
 }

packages/cli/api-importers/conjure/conjure-sdk/src/sdk/serialization/resources/types/types/ConjureEnumVariant.ts

@@ -0,0 +1,17 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+
+import * as serializers from "../../../index";
+import * as FernConjure from "../../../../api/index";
+import * as core from "../../../../core";
+import { ConjureEnumWithDocs } from "./ConjureEnumWithDocs";
+
+export const ConjureEnumVariant: core.serialization.Schema<
+    serializers.ConjureEnumVariant.Raw,
+    FernConjure.ConjureEnumVariant
+> = core.serialization.undiscriminatedUnion([core.serialization.string(), ConjureEnumWithDocs]);
+
+export declare namespace ConjureEnumVariant {
+    type Raw = string | ConjureEnumWithDocs.Raw;
+}

packages/cli/api-importers/conjure/conjure-sdk/src/sdk/serialization/resources/types/types/ConjureEnumWithDocs.ts

@@ -0,0 +1,23 @@
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+
+import * as serializers from "../../../index";
+import * as FernConjure from "../../../../api/index";
+import * as core from "../../../../core";
+import { WithDocs } from "../../commons/types/WithDocs";
+
+export const ConjureEnumWithDocs: core.serialization.ObjectSchema<
+    serializers.ConjureEnumWithDocs.Raw,
+    FernConjure.ConjureEnumWithDocs
+> = core.serialization
+    .objectWithoutOptionalProperties({
+        value: core.serialization.string(),
+    })
+    .extend(WithDocs);
+
+export declare namespace ConjureEnumWithDocs {
+    interface Raw extends WithDocs.Raw {
+        value: string;
+    }
+}

packages/cli/api-importers/conjure/conjure-sdk/src/sdk/serialization/resources/types/types/index.ts

@@ -5,6 +5,8 @@ export * from "./ConjureAliasDeclaration";
 export * from "./ConjureUnionDeclaration";
 export * from "./ConjureObjectDeclaration";
 export * from "./ConjureEnumDeclaration";
+export * from "./ConjureEnumVariant";
+export * from "./ConjureEnumWithDocs";
 export * from "./ConjureTypeReference";
 export * from "./ConjureType";
 export * from "./ConjureTypeWithDocs";