@fern-api/fern-api-dev 4.68.0 → 4.68.1-2-g6abc412986d

package/cli.cjs

@@ -627624,14 +627624,17 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.68.0",
+          version: "4.68.1-2-g6abc412986d",
           usingAccessToken: true
         }
       });
     }
   }
   async flush() {
-    await this.posthog.flush();
+    try {
+      await Promise.race([this.posthog.flush(), new Promise((resolve13) => setTimeout(resolve13, 3e3))]);
+    } catch {
+    }
   }
 };
 
@@ -627675,7 +627678,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.68.0",
+        version: "4.68.1-2-g6abc412986d",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -627684,7 +627687,10 @@ var UserPosthogManager = class {
     });
   }
   async flush() {
-    await this.posthog.flush();
+    try {
+      await Promise.race([this.posthog.flush(), new Promise((resolve13) => setTimeout(resolve13, 3e3))]);
+    } catch {
+    }
   }
   userEmail;
   async getUserEmail() {
@@ -631201,7 +631207,10 @@ var TelemetryClient = class _TelemetryClient {
   async flush() {
     const promises = [];
     if (this.posthog != null) {
-      promises.push(this.posthog.shutdown().catch(() => void 0));
+      promises.push(Promise.race([
+        this.posthog.shutdown().catch(() => void 0),
+        new Promise((resolve13) => setTimeout(resolve13, 3e3))
+      ]));
     }
     if (this.sentry !== void 0) {
       promises.push(Promise.resolve(this.sentry.flush(2e3)).catch(() => void 0));
@@ -843944,7 +843953,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 = "4.68.0";
+  const version7 = "4.68.1-2-g6abc412986d";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -855192,7 +855201,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.68.0"
+        cliVersion: "4.68.1-2-g6abc412986d"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -870275,13 +870284,15 @@ var Class2 = class _Class extends DefinedType {
   annotations = [];
   primaryConstructor;
   namespaceReferences = [];
+  skipNamespaceDeclaration;
   constructors = [];
   operators = [];
   nestedClasses = [];
   nestedInterfaces = [];
   rawBodyBlocks = [];
-  constructor({ name: name2, namespace, access: access6, static_, abstract_, sealed, partial: partial2, readonly: readonly2, parentClassReference, interfaceReferences, enclosingType, type: type8, summary, doc, annotations, primaryConstructor, origin: origin2 }, generation) {
+  constructor({ name: name2, namespace, access: access6, static_, abstract_, sealed, partial: partial2, readonly: readonly2, parentClassReference, interfaceReferences, enclosingType, type: type8, summary, doc, annotations, primaryConstructor, skipNamespaceDeclaration, origin: origin2 }, generation) {
     super({ name: name2, namespace, access: access6, partial: partial2, interfaceReferences, enclosingType, origin: origin2 }, generation);
+    this.skipNamespaceDeclaration = skipNamespaceDeclaration ?? false;
     this.static_ = static_ ?? false;
     this.abstract_ = abstract_ ?? false;
     this.sealed = sealed ?? false;
@@ -870343,7 +870354,7 @@ var Class2 = class _Class extends DefinedType {
     this.namespaceReferences.forEach((namespace) => {
       writer2.addNamespace(namespace);
     });
-    if (!this.isNested) {
+    if (!this.isNested && !this.skipNamespaceDeclaration) {
       writer2.writeLine(`namespace ${this.namespace};`);
       writer2.newLine();
     }
@@ -870351,7 +870362,9 @@ var Class2 = class _Class extends DefinedType {
     this.annotations.forEach((annotation) => {
       annotation.write(writer2);
     });
-    writer2.writeNewLineIfLastLineNot();
+    if (!this.skipNamespaceDeclaration) {
+      writer2.writeNewLineIfLastLineNot();
+    }
     writer2.write(`${this.access}`);
     if (this.static_) {
       writer2.write(" static");
@@ -872374,7 +872387,7 @@ var CSharp = class {
       args.name = this.model.getClassNameFor(args.origin);
     }
     if (args.enclosingType) {
-      if (args.namespace) {
+      if (args.namespace && args.namespace !== args.enclosingType.namespace) {
         throw new Error(`ClassReference: Both enclosingType and namespace cannot be provided`);
       }
       args.namespace = args.enclosingType.namespace;
@@ -874320,6 +874333,8 @@ var Generation = class {
     useDefaultRequestParameterValues: () => this.customConfig["use-default-request-parameter-values"] ?? false,
     /** When true, redacts the response body in deserialization error exceptions and adds a custom ToString override to the base API exception. Default: false. */
     redactResponseBodyOnError: () => this.customConfig["redact-response-body-on-error"] ?? false,
+    /** When true, generates inline types as nested classes inside a static Types class on the parent type, instead of as separate top-level files. Default: false. */
+    enableInlineTypes: () => this.customConfig["enable-inline-types"] ?? false,
     /** Temporary mapping of websocket environment configurations. Default: {}. */
     temporaryWebsocketEnvironments: () => this.customConfig["temporary-websocket-environments"] ?? {},
     /** Custom name for the base API exception class. Default: "" (auto-generated). */
@@ -875975,7 +875990,7 @@ var DynamicTypeMapper = class extends WithGeneration {
         if (named == null) {
           return this.convertUnknown();
         }
-        return this.convertNamed({ named });
+        return this.convertNamed({ named, typeId: args.typeReference.value });
       }
       case "optional":
       case "nullable": {
@@ -875992,13 +876007,13 @@ var DynamicTypeMapper = class extends WithGeneration {
         assertNever(args.typeReference);
     }
   }
-  convertToClassReference(named) {
+  convertToClassReference(named, typeId) {
     return this.csharp.classReference({
       origin: named.declaration,
       namespace: this.context.getNamespace(named.declaration.fernFilepath)
     });
   }
-  convertNamed({ named }) {
+  convertNamed({ named, typeId }) {
     switch (named.type) {
       case "alias":
         if (this.settings.generateLiterals && named.typeReference.type === "literal") {
@@ -876010,24 +876025,15 @@ var DynamicTypeMapper = class extends WithGeneration {
         return this.convert({ typeReference: named.typeReference });
       case "enum":
       case "object":
-        return this.csharp.classReference({
-          origin: named.declaration,
-          namespace: this.context.getNamespace(named.declaration.fernFilepath)
-        });
+        return this.convertToClassReference(named, typeId);
       case "discriminatedUnion":
         if (!this.settings.shouldGeneratedDiscriminatedUnions) {
           return this.Primitive.object;
         }
-        return this.csharp.classReference({
-          origin: named.declaration,
-          namespace: this.context.getNamespace(named.declaration.fernFilepath)
-        });
+        return this.convertToClassReference(named, typeId);
       case "undiscriminatedUnion":
         if (this.settings.shouldGenerateUndiscriminatedUnions) {
-          return this.csharp.classReference({
-            origin: named.declaration,
-            namespace: this.context.getNamespace(named.declaration.fernFilepath)
-          });
+          return this.convertToClassReference(named, typeId);
         }
         return this.OneOf.OneOf(named.types.map((typeReference2) => {
           return this.convert({ typeReference: typeReference2 });
@@ -876368,7 +876374,7 @@ var DynamicSnippetsGeneratorContext = class _DynamicSnippetsGeneratorContext ext
     Object.entries(this.ir.types).sort((a10, b19) => {
       return a10[0].length - b19[0].length;
     }).forEach(([typeId, type8]) => {
-      this.dynamicTypeMapper.convertToClassReference(type8);
+      this.dynamicTypeMapper.convertToClassReference(type8, typeId);
     });
     for (const [idx, request7] of requests3.entries()) {
       this.csharp.classReference({
@@ -876409,7 +876415,7 @@ var EndpointSnippetGenerator2 = class extends WithGeneration {
   async generateSnippet({ endpoint: endpoint3, request: request7, options: options2 }) {
     const code5 = this.buildCodeBlock({ endpoint: endpoint3, snippet: request7, options: options2 });
     return code5.toString({
-      namespace: "Usage",
+      namespace: "Examples",
       generation: this.generation,
       allNamespaceSegments: /* @__PURE__ */ new Set(),
       allTypeClassReferences: /* @__PURE__ */ new Map(),
@@ -876423,7 +876429,7 @@ var EndpointSnippetGenerator2 = class extends WithGeneration {
   generateSnippetSync({ endpoint: endpoint3, request: request7, options: options2 }) {
     const code5 = this.buildCodeBlock({ endpoint: endpoint3, snippet: request7, options: options2 });
     return code5.toString({
-      namespace: "Usage",
+      namespace: "Examples",
       generation: this.generation,
       allNamespaceSegments: /* @__PURE__ */ new Set(),
       allTypeClassReferences: /* @__PURE__ */ new Map(),
@@ -876455,14 +876461,17 @@ var EndpointSnippetGenerator2 = class extends WithGeneration {
   }
   buildFullCodeBlock({ body, options: options2 }) {
     const config5 = this.getConfig(options2);
+    const methodName = config5.fullStyleMethodName ?? config5.fullStyleClassName ?? "Example";
     const class_6 = this.csharp.class_({
-      name: config5.fullStyleClassName ?? "Example",
-      namespace: "Usage",
+      name: "Examples",
+      namespace: "Examples",
+      partial: true,
+      skipNamespaceDeclaration: true,
       access: ast_exports.Access.Public
     });
     class_6.addNamespaceReference(this.Types.RootClientForSnippets.namespace);
     class_6.addMethod({
-      name: "Do",
+      name: methodName,
       access: ast_exports.Access.Public,
       isAsync: true,
       parameters: [],
@@ -877105,18 +877114,16 @@ function convertIr(ir15) {
 }
 
 // ../generation/local-generation/local-workspace-runner/lib/dynamic-snippets/csharp/DynamicSnippetsCsharpTestGenerator.js
-var PROJECT_FILE_CONTENT = `
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <LangVersion>12</LangVersion>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\\..\\**\\*.csproj" Exclude="..\\..\\**\\*.DynamicSnippets.csproj;..\\..\\**\\*.Test.csproj" />
-    </ItemGroup>
+var PROJECT_FILE_CONTENT = `<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <RootNamespace>Snippets</RootNamespace>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\\**\\*.csproj" Exclude="..\\**\\*.Test.csproj;..\\Snippets\\*.csproj" />
+  </ItemGroup>
 </Project>`;
 var DynamicSnippetsCsharpTestGenerator = class {
   context;
@@ -877145,7 +877152,7 @@ var DynamicSnippetsCsharpTestGenerator = class {
         }
         const response = await this.dynamicSnippetsGenerator.generate(convertedRequest, {
           config: {
-            fullStyleClassName: `Example${idx}`
+            fullStyleMethodName: `Example${idx}`
           },
           style: Style2.Full,
           endpointId
@@ -877160,9 +877167,9 @@ var DynamicSnippetsCsharpTestGenerator = class {
     this.context.logger.debug("Done generating dynamic snippet tests");
   }
   async initializeProject(outputDir) {
-    const absolutePathToOutputDir = join8(outputDir, RelativeFilePath2.of("src/SeedApi.DynamicSnippets"));
+    const absolutePathToOutputDir = join8(outputDir, RelativeFilePath2.of("Snippets"));
     await (0, import_promises93.mkdir)(absolutePathToOutputDir, { recursive: true });
-    await (0, import_promises93.writeFile)(join8(absolutePathToOutputDir, RelativeFilePath2.of("SeedApi.DynamicSnippets.csproj")), PROJECT_FILE_CONTENT);
+    await (0, import_promises93.writeFile)(join8(absolutePathToOutputDir, RelativeFilePath2.of("Snippets.csproj")), PROJECT_FILE_CONTENT);
     return absolutePathToOutputDir;
   }
   getTestFilePath({ absolutePathToOutputDir, idx }) {
@@ -928934,7 +928941,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.68.0";
+    return "4.68.1-2-g6abc412986d";
   }
   getCliName() {
     if (false) {
@@ -928990,7 +928997,10 @@ var CliContext = class _CliContext {
       await this.nudgeUpgradeIfAvailable();
     }
     this.ttyAwareLogger.finish();
-    await this.posthogManager.flush();
+    try {
+      await this.posthogManager.flush();
+    } catch {
+    }
     await this.sentryClient.flush();
     this.exitProgram({ code: code5 });
   }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.68.0",
+  "version": "4.68.1-2-g6abc412986d",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",