@fern-api/fern-api-dev 5.23.3-453-g95a1c6fbe81 → 5.23.3-459-gc7f48c6da37

package/cli.cjs

@@ -669562,7 +669562,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.23.3-453-g95a1c6fbe81",
+          version: "5.23.3-459-gc7f48c6da37",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -669626,7 +669626,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.23.3-453-g95a1c6fbe81",
+        version: "5.23.3-459-gc7f48c6da37",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -861367,7 +861367,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 = "5.23.3-453-g95a1c6fbe81";
+  const version7 = "5.23.3-459-gc7f48c6da37";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -892459,7 +892459,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.23.3-453-g95a1c6fbe81",
+        cliVersion: "5.23.3-459-gc7f48c6da37",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -925028,14 +925028,25 @@ var EndpointSnippetGenerator5 = class {
   getMethodArgsForBodyRequest({ request: request7, snippet: snippet2 }) {
     const args = [];
     this.context.errors.scope(Scope4.PathParameters);
-    const pathParameters = [...this.context.ir.pathParameters ?? [], ...request7.pathParameters ?? []];
-    if (pathParameters.length > 0) {
-      args.push(...this.getPathParameters({ namedParameters: pathParameters, snippet: snippet2 }).map((field5) => field5.value));
+    const irPathParameters = this.context.ir.pathParameters ?? [];
+    const requiredIrPathParameters = irPathParameters.filter((p14) => p14.variable == null);
+    const optionalIrPathParameters = irPathParameters.filter((p14) => p14.variable != null);
+    const requiredPathParameters = [...requiredIrPathParameters, ...request7.pathParameters ?? []];
+    if (requiredPathParameters.length > 0) {
+      args.push(...this.getPathParameters({ namedParameters: requiredPathParameters, snippet: snippet2 }).map((field5) => field5.value));
     }
     this.context.errors.unscope();
     this.context.errors.scope(Scope4.RequestBody);
     if (request7.body != null) {
-      args.push(this.getBodyRequestArg({ body: request7.body, value: snippet2.requestBody }));
+      const bodyArg = this.getBodyRequestArg({ body: request7.body, value: snippet2.requestBody });
+      if (!php_exports.TypeLiteral.isNop(bodyArg)) {
+        args.push(bodyArg);
+      }
+    }
+    this.context.errors.unscope();
+    this.context.errors.scope(Scope4.PathParameters);
+    if (optionalIrPathParameters.length > 0) {
+      args.push(...this.getPathParameters({ namedParameters: optionalIrPathParameters, snippet: snippet2 }).map((field5) => field5.value));
     }
     this.context.errors.unscope();
     return args;
@@ -925062,17 +925073,25 @@ var EndpointSnippetGenerator5 = class {
     const args = [];
     const inlinePathParameters = this.context.customConfig?.inlinePathParameters ?? false;
     this.context.errors.scope(Scope4.PathParameters);
-    const pathParameterFields = [];
-    const pathParameters = [...this.context.ir.pathParameters ?? [], ...request7.pathParameters ?? []];
-    if (pathParameters.length > 0) {
-      pathParameterFields.push(...this.getPathParameters({ namedParameters: pathParameters, snippet: snippet2 }));
-    }
+    const irPathParameters = this.context.ir.pathParameters ?? [];
+    const requiredIrPathParameters = irPathParameters.filter((p14) => p14.variable == null);
+    const optionalIrPathParameters = irPathParameters.filter((p14) => p14.variable != null);
+    const requiredPathParameterFields = [];
+    const requiredPathParams = [...requiredIrPathParameters, ...request7.pathParameters ?? []];
+    if (requiredPathParams.length > 0) {
+      requiredPathParameterFields.push(...this.getPathParameters({ namedParameters: requiredPathParams, snippet: snippet2 }));
+    }
+    const optionalPathParameterFields = [];
+    if (optionalIrPathParameters.length > 0) {
+      optionalPathParameterFields.push(...this.getPathParameters({ namedParameters: optionalIrPathParameters, snippet: snippet2 }));
+    }
+    const pathParameterFields = [...requiredPathParameterFields, ...optionalPathParameterFields];
     this.context.errors.unscope();
     this.context.errors.scope(Scope4.RequestBody);
     const filePropertyInfo = this.getFilePropertyInfo({ request: request7, snippet: snippet2 });
     this.context.errors.unscope();
     if (!this.context.includePathParametersInWrappedRequest({ request: request7, inlinePathParameters })) {
-      args.push(...pathParameterFields.map((field5) => field5.value));
+      args.push(...requiredPathParameterFields.map((field5) => field5.value));
     }
     if (this.context.needsRequestParameter({
       request: request7,
@@ -925090,6 +925109,9 @@ var EndpointSnippetGenerator5 = class {
         filePropertyInfo
       }));
     }
+    if (!this.context.includePathParametersInWrappedRequest({ request: request7, inlinePathParameters })) {
+      args.push(...optionalPathParameterFields.map((field5) => field5.value));
+    }
     return args;
   }
   getFilePropertyInfo({ request: request7, snippet: snippet2 }) {
@@ -941307,7 +941329,7 @@ var DynamicSnippetsSwiftTestGenerator = class {
           idx
         });
         await (0, import_promises127.mkdir)(import_node_path40.default.dirname(dynamicSnippetFilePath), { recursive: true });
-        await (0, import_promises127.writeFile)(dynamicSnippetFilePath, response.snippet);
+        await (0, import_promises127.writeFile)(dynamicSnippetFilePath, this.wrapSnippetAsLibrary(response.snippet, `Example${idx}`));
       } catch (error50) {
         this.context.logger.error(`Failed to generate dynamic snippet for endpoint ${JSON.stringify(request7.endpoint)}: ${error50}`);
       }
@@ -941315,14 +941337,56 @@ var DynamicSnippetsSwiftTestGenerator = class {
     this.context.logger.debug("Done generating dynamic snippet tests");
   }
   async initializeProject(outputDir) {
-    const absolutePathToOutputDir = join8(outputDir, RelativeFilePath2.of("Snippets"));
+    const absolutePathToOutputDir = join8(outputDir, RelativeFilePath2.of("Tests/Snippets"));
     await (0, import_promises127.mkdir)(absolutePathToOutputDir, { recursive: true });
     return absolutePathToOutputDir;
   }
   getTestFilePath({ absolutePathToOutputDir, idx }) {
     return join8(absolutePathToOutputDir, RelativeFilePath2.of(`Example${idx}.swift`));
   }
+  wrapSnippetAsLibrary(snippet2, enumName) {
+    return wrapSnippetAsLibrary({
+      snippet: snippet2,
+      enumName,
+      warn: (message) => this.context.logger.warn(message)
+    });
+  }
 };
+function wrapSnippetAsLibrary({ snippet: snippet2, enumName, warn: warn2 }) {
+  const FUNC_DECL = "private func main() async throws {";
+  const FUNC_INVOCATION = "try await main()";
+  if (!snippet2.includes(FUNC_DECL)) {
+    warn2(`Snippet ${enumName} does not match expected format (missing '${FUNC_DECL}'). Writing raw snippet.`);
+    return snippet2;
+  }
+  const lines = snippet2.trimEnd().split("\n");
+  const result = [];
+  let insideFunc = false;
+  let foundInvocation = false;
+  for (const line of lines) {
+    if (line.trimEnd() === FUNC_DECL) {
+      result.push(`enum ${enumName} {`);
+      result.push("    static func snippet() async throws {");
+      insideFunc = true;
+    } else if (line.trimEnd() === FUNC_INVOCATION) {
+      foundInvocation = true;
+    } else if (insideFunc) {
+      result.push(line === "" ? "" : `    ${line}`);
+    } else {
+      result.push(line);
+    }
+  }
+  if (!foundInvocation) {
+    warn2(`Snippet ${enumName} missing expected '${FUNC_INVOCATION}'. Writing raw snippet.`);
+    return snippet2;
+  }
+  while (result.length > 0 && result[result.length - 1] === "") {
+    result.pop();
+  }
+  result.push("}");
+  result.push("");
+  return result.join("\n");
+}
 
 // ../generation/local-generation/local-workspace-runner/lib/dynamic-snippets/typescript/DynamicSnippetsTypeScriptTestGenerator.js
 init_lib8();
@@ -957556,7 +957620,7 @@ function getAutomationContextFromEnv() {
     config_branch: process.env.FERN_CONFIG_BRANCH,
     config_pr_number: process.env.FERN_CONFIG_PR_NUMBER,
     trigger: process.env.GITHUB_EVENT_NAME,
-    cli_version: "5.23.3-453-g95a1c6fbe81"
+    cli_version: "5.23.3-459-gc7f48c6da37"
   };
 }
 function isAutomationMode() {
@@ -958382,7 +958446,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.23.3-453-g95a1c6fbe81";
+    return "5.23.3-459-gc7f48c6da37";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.23.3-453-g95a1c6fbe81",
+  "version": "5.23.3-459-gc7f48c6da37",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",