@fern-api/fern-api-dev 5.44.12 → 5.44.14

package/cli.cjs

@@ -660747,7 +660747,7 @@ var NoConflictingParameterNamesRule = {
           const mergedParams = mergeParameters(pathLevelParams, operationParams);
           const nameToParams = {};
           for (const param of mergedParams) {
-            const normalizedName = toCamelCase3(param.name);
+            const normalizedName = toCamelCase3(param.fernParameterName ?? param.name);
             if (normalizedName === "") {
               continue;
             }
@@ -660762,7 +660762,10 @@ var NoConflictingParameterNamesRule = {
             if (distinctTypes.size <= 1) {
               continue;
             }
-            const paramDescriptions = params2.map((p14) => `${p14.in} parameter '${p14.name}'`).join(", ");
+            const paramDescriptions = params2.map((p14) => {
+              const effectiveName = p14.fernParameterName ?? p14.name;
+              return `${p14.in} parameter '${effectiveName}'`;
+            }).join(", ");
             violations.push({
               name: "no-conflicting-parameter-names",
               severity: "error",
@@ -660821,7 +660824,8 @@ function resolveParam(param, api2, visited = /* @__PURE__ */ new Set()) {
     return void 0;
   }
   if (typeof paramObj.in === "string" && typeof paramObj.name === "string") {
-    return { in: paramObj.in, name: paramObj.name };
+    const fernParameterName = typeof paramObj["x-fern-parameter-name"] === "string" ? paramObj["x-fern-parameter-name"] : void 0;
+    return { in: paramObj.in, name: paramObj.name, fernParameterName };
   }
   return void 0;
 }
@@ -669562,7 +669566,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.44.12",
+          version: "5.44.14",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -669626,7 +669630,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.44.12",
+        version: "5.44.14",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -861367,7 +861371,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.44.12";
+  const version7 = "5.44.14";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -892459,7 +892463,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.44.12",
+        cliVersion: "5.44.14",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -923893,7 +923897,7 @@ var DynamicTypeLiteralMapper2 = class {
           name: this.context.getClassName(discriminatedUnion2.declaration.name),
           namespace: this.context.getTypesNamespace(discriminatedUnion2.declaration.fernFilepath)
         }),
-        method: this.context.getMethodName(unionVariant.discriminantValue.name),
+        method: this.context.getPropertyName(unionVariant.discriminantValue.name),
         arguments_: this.convertDiscriminatedUnionVariantArgs({
           discriminatedUnionTypeInstance,
           unionVariant,
@@ -923938,12 +923942,14 @@ var DynamicTypeLiteralMapper2 = class {
               }
             ];
           }
+          const wireValue = unionVariant.discriminantValue.wireValue;
+          const singlePropertyValue = record23[wireValue] ?? record23["value"];
           return [
             {
               name: this.context.getPropertyName(unionVariant.discriminantValue.name),
               value: this.convert({
                 typeReference: unionVariant.typeReference,
-                value: record23[unionVariant.discriminantValue.wireValue]
+                value: singlePropertyValue
               })
             }
           ];
@@ -923958,20 +923964,14 @@ var DynamicTypeLiteralMapper2 = class {
     }
   }
   convertDiscriminatedUnionVariantArgs({ discriminatedUnionTypeInstance, unionVariant, unionProperties }) {
-    const baseFields = this.getBaseFields({
+    const { required: requiredBaseFields, optional: optionalBaseFields } = this.getBaseFields({
       discriminatedUnionTypeInstance,
       singleDiscriminatedUnionType: unionVariant
     });
     if (unionVariant.type === "singleProperty") {
-      const record23 = this.context.getRecord(discriminatedUnionTypeInstance.value);
-      if (record23 == null && unionProperties.length === 1) {
-        return [
-          ...baseFields,
-          this.convert({
-            typeReference: unionVariant.typeReference,
-            value: discriminatedUnionTypeInstance.value
-          })
-        ];
+      const singleProperty = unionProperties[0];
+      if (singleProperty != null) {
+        return [...requiredBaseFields, singleProperty.value, ...optionalBaseFields];
       }
     }
     if (unionVariant.type === "samePropertiesAsObject") {
@@ -923982,17 +923982,18 @@ var DynamicTypeLiteralMapper2 = class {
         return [];
       }
       return [
-        ...baseFields,
+        ...requiredBaseFields,
         php_exports.TypeLiteral.class_({
           reference: php_exports.classReference({
             name: this.context.getClassName(named.declaration.name),
             namespace: this.context.getTypesNamespace(named.declaration.fernFilepath)
           }),
           fields: unionProperties
-        })
+        }),
+        ...optionalBaseFields
       ];
     }
-    return baseFields;
+    return [...requiredBaseFields, ...optionalBaseFields];
   }
   getBaseFields({ discriminatedUnionTypeInstance, singleDiscriminatedUnionType }) {
     const properties7 = this.context.associateByWireValue({
@@ -924002,14 +924003,22 @@ var DynamicTypeLiteralMapper2 = class {
       // are handled by the union variant.
       ignoreMissingParameters: true
     });
-    return properties7.map((property24) => {
+    const required6 = [];
+    const optional23 = [];
+    for (const property24 of properties7) {
       this.context.errors.scope(property24.name.wireValue);
       try {
-        return this.convert(property24);
+        const converted = this.convert(property24);
+        if (this.isOptionalOrNullable(property24.typeReference)) {
+          optional23.push(converted);
+        } else {
+          required6.push(converted);
+        }
       } finally {
         this.context.errors.unscope();
       }
-    });
+    }
+    return { required: required6, optional: optional23 };
   }
   convertObject({ object_, value: value2 }) {
     const record23 = this.context.getRecord(value2) ?? {};
@@ -925028,14 +925037,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 +925082,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 +925118,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 }) {
@@ -957598,7 +957629,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.44.12"
+    cli_version: "5.44.14"
   };
 }
 function isAutomationMode() {
@@ -958424,7 +958455,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.44.12";
+    return "5.44.14";
   }
   getCliName() {
     if (false) {
@@ -968452,10 +968483,11 @@ function convertHttpEndpoint4({
       if (url3 == null) {
         throw new CliError({ message: "No URL defined for " + baseUrlId, code: CliError.Code.InternalError });
       }
-      const server = { url: url3 };
-      if (environment2.docs != null) {
-        server.description = environment2.docs;
-      }
+      const envName = getOriginalName(environment2.name);
+      const server = {
+        url: url3,
+        description: environment2.docs != null ? `${envName} (${environment2.docs})` : envName
+      };
       return server;
     });
   }
@@ -969130,13 +969162,34 @@ function convertIrToOpenApi({
       securitySchemes: constructSecuritySchemes(ir11.auth)
     }
   };
-  if (ir11.environments != null && ir11.environments.environments.type === "singleBaseUrl") {
-    openAPISpec.servers = ir11.environments.environments.environments.map((environment2) => {
-      return {
-        url: environment2.url,
-        description: environment2.docs != null ? `${getOriginalName(environment2.name)} (${environment2.docs})` : getOriginalName(environment2.name)
-      };
-    });
+  if (ir11.environments != null) {
+    const envs = ir11.environments.environments;
+    if (envs.type === "singleBaseUrl") {
+      openAPISpec.servers = envs.environments.map((environment2) => {
+        return {
+          url: environment2.url,
+          description: environment2.docs != null ? `${getOriginalName(environment2.name)} (${environment2.docs})` : getOriginalName(environment2.name)
+        };
+      });
+    } else if (envs.type === "multipleBaseUrls") {
+      const servers = [];
+      for (const environment2 of envs.environments) {
+        const envName = getOriginalName(environment2.name);
+        for (const baseUrlDef of envs.baseUrls) {
+          const url3 = environment2.urls[baseUrlDef.id];
+          if (url3 != null) {
+            const urlName = getOriginalName(baseUrlDef.name);
+            servers.push({
+              url: url3,
+              description: environment2.docs != null ? `${envName} - ${urlName} (${environment2.docs})` : `${envName} (${urlName})`
+            });
+          }
+        }
+      }
+      if (servers.length > 0) {
+        openAPISpec.servers = servers;
+      }
+    }
   }
   return openAPISpec;
 }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.44.12",
+  "version": "5.44.14",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",