@fern-api/fern-api-dev 4.71.2 → 4.71.3-3-ge9a920d9274

package/cli.cjs

@@ -521218,7 +521218,45 @@ function buildEnvironments(context3) {
           }
         }
       }
-      if (apiToUrls.size > 0) {
+      const endpointServerNamesSet = new Set(apiToUrls.keys());
+      const topLevelServerNamesSet = new Set(Object.keys(topLevelServersWithName));
+      const endpointServersReferenceTopLevel = endpointServerNamesSet.size > 0 && [...endpointServerNamesSet].every((name2) => topLevelServerNamesSet.has(name2));
+      if (apiToUrls.size > 0 && endpointServersReferenceTopLevel) {
+        const entries23 = Object.entries(topLevelServersWithName);
+        const firstEntry = entries23[0];
+        if (firstEntry) {
+          const [envName, firstSchema] = firstEntry;
+          const baseUrl = typeof firstSchema === "string" ? firstSchema : isRawMultipleBaseUrlsEnvironment(firstSchema) ? Object.values(firstSchema.urls)[0] : firstSchema["default-url"] ?? firstSchema.url;
+          const urls = {};
+          if (baseUrl != null) {
+            urls[DEFAULT_URL_NAME] = baseUrl;
+            context3.setUrlId(baseUrl, DEFAULT_URL_NAME);
+          }
+          for (let i11 = 1; i11 < entries23.length; i11++) {
+            const entry = entries23[i11];
+            if (entry == null) {
+              continue;
+            }
+            const [name2, schema2] = entry;
+            const url3 = typeof schema2 === "string" ? schema2 : isRawMultipleBaseUrlsEnvironment(schema2) ? Object.values(schema2.urls)[0] : schema2["default-url"] ?? schema2.url;
+            if (url3 != null) {
+              urls[name2] = url3;
+              context3.setUrlId(url3, name2);
+            }
+          }
+          if (hasWebsocketServersWithName) {
+            Object.assign(urls, extractUrlsFromEnvironmentSchema(websocketServersWithName));
+          }
+          context3.builder.addEnvironment({
+            name: envName,
+            schema: { urls }
+          });
+          if (context3.options.inferDefaultEnvironment !== false) {
+            context3.builder.setDefaultEnvironment(envName);
+          }
+          context3.builder.setDefaultUrl(DEFAULT_URL_NAME);
+        }
+      } else if (apiToUrls.size > 0) {
         let firstEnvironment = true;
         for (const [envName, envSchema] of Object.entries(topLevelServersWithName)) {
           const baseUrl = typeof envSchema === "string" ? envSchema : isRawMultipleBaseUrlsEnvironment(envSchema) ? Object.values(envSchema.urls)[0] : envSchema["default-url"] ?? envSchema.url;
@@ -563496,12 +563534,16 @@ function convertOAuthRefreshEndpoint({ endpointResolver, propertyResolver, file:
 }
 
 // ../generation/ir-generator/lib/converters/convertOAuthTokenEndpoint.js
-function convertOAuthTokenEndpoint({ endpointResolver, propertyResolver, file: file4, tokenEndpoint }) {
+function convertOAuthTokenEndpoint({ endpointResolver, propertyResolver, typeResolver, file: file4, tokenEndpoint }) {
   const resolvedEndpoint = endpointResolver.resolveEndpointOrThrow({
     endpoint: tokenEndpoint.endpoint,
     file: file4
   });
-  const requestBodyProperties = typeof resolvedEndpoint.endpoint.request === "object" && resolvedEndpoint.endpoint.request.body != null && typeof resolvedEndpoint.endpoint.request.body === "object" && "properties" in resolvedEndpoint.endpoint.request.body ? resolvedEndpoint.endpoint.request.body.properties ?? {} : {};
+  const requestBodyProperties = getRequestBodyPropertyNames({
+    endpoint: resolvedEndpoint.endpoint,
+    file: resolvedEndpoint.file,
+    typeResolver
+  });
   let expiresIn = void 0;
   try {
     expiresIn = tokenEndpoint.responseProperties.expires_in != null ? propertyResolver.resolveResponsePropertyOrThrow({
@@ -563530,7 +563572,7 @@ function convertOAuthTokenEndpoint({ endpointResolver, propertyResolver, file: f
         propertyComponents: tokenEndpoint.requestProperties.scopes
       }) : void 0,
       customProperties: resolveCustomRequestProperties({
-        requestBodyProperties,
+        requestBodyPropertyNames: requestBodyProperties,
         tokenEndpoint,
         file: file4,
         propertyResolver
@@ -563551,20 +563593,63 @@ function convertOAuthTokenEndpoint({ endpointResolver, propertyResolver, file: f
     }
   };
 }
-var resolveCustomRequestProperties = ({ requestBodyProperties, tokenEndpoint, file: file4, propertyResolver }) => {
-  const customPropertyNames = Object.keys(requestBodyProperties).filter((propertyName) => !tokenEndpoint.requestProperties.client_id.includes(propertyName) && !tokenEndpoint.requestProperties.client_secret.includes(propertyName) && (tokenEndpoint.requestProperties.scopes == null || !tokenEndpoint.requestProperties.scopes.includes(propertyName)));
+var resolveCustomRequestProperties = ({ requestBodyPropertyNames, tokenEndpoint, file: file4, propertyResolver }) => {
+  const customPropertyNames = requestBodyPropertyNames.filter((propertyName) => !tokenEndpoint.requestProperties.client_id.includes(propertyName) && !tokenEndpoint.requestProperties.client_secret.includes(propertyName) && (tokenEndpoint.requestProperties.scopes == null || !tokenEndpoint.requestProperties.scopes.includes(propertyName)));
   return customPropertyNames.length > 0 ? customPropertyNames.map((propertyName) => propertyResolver.resolveRequestPropertyOrThrow({
     file: file4,
     endpoint: tokenEndpoint.endpoint,
     propertyComponents: [propertyName]
   })) : void 0;
 };
+function getRequestBodyPropertyNames({ endpoint: endpoint3, file: file4, typeResolver }) {
+  const request7 = endpoint3.request;
+  if (request7 == null) {
+    return [];
+  }
+  if (typeof request7 === "string") {
+    return getPropertyNamesFromType({ typeName: request7, file: file4, typeResolver });
+  }
+  const body = request7.body;
+  if (body == null) {
+    return [];
+  }
+  if (typeof body === "string") {
+    return getPropertyNamesFromType({ typeName: body, file: file4, typeResolver });
+  }
+  if (isInlineRequestBody(body)) {
+    const names2 = Object.keys(body.properties ?? {});
+    if (body.extends != null) {
+      const extendsList = typeof body.extends === "string" ? [body.extends] : body.extends;
+      for (const extendedType of extendsList) {
+        names2.push(...getPropertyNamesFromType({ typeName: extendedType, file: file4, typeResolver }));
+      }
+    }
+    return names2;
+  }
+  return getPropertyNamesFromType({ typeName: body.type, file: file4, typeResolver });
+}
+function getPropertyNamesFromType({ typeName, file: file4, typeResolver }) {
+  const resolved = typeResolver.resolveType({ type: typeName, file: file4 });
+  if (resolved == null || resolved._type !== "named") {
+    return [];
+  }
+  const declaration = resolved.declaration;
+  const names2 = [];
+  if ("properties" in declaration && declaration.properties != null) {
+    names2.push(...Object.keys(declaration.properties));
+  }
+  if ("base-properties" in declaration && declaration["base-properties"] != null) {
+    names2.push(...Object.keys(declaration["base-properties"]));
+  }
+  return names2;
+}
 
 // ../generation/ir-generator/lib/converters/convertOAuthClientCredentials.js
-function convertOAuthClientCredentials({ propertyResolver, endpointResolver, file: file4, oauthScheme, tokenEndpoint, refreshTokenEndpoint }) {
+function convertOAuthClientCredentials({ propertyResolver, endpointResolver, typeResolver, file: file4, oauthScheme, tokenEndpoint, refreshTokenEndpoint }) {
   const oauthTokenEndpoint = convertOAuthTokenEndpoint({
     propertyResolver,
     endpointResolver,
+    typeResolver,
     file: file4,
     tokenEndpoint
   });
@@ -563692,7 +563777,7 @@ function getTokenEndpointResponsePropertiesWithDefault({ responseProperties, def
 }
 
 // ../generation/ir-generator/lib/converters/convertApiAuth.js
-function convertApiAuth2({ rawApiFileSchema, file: file4, propertyResolver, endpointResolver }) {
+function convertApiAuth2({ rawApiFileSchema, file: file4, propertyResolver, endpointResolver, typeResolver }) {
   if (rawApiFileSchema.auth == null) {
     return {
       docs: void 0,
@@ -563708,7 +563793,8 @@ function convertApiAuth2({ rawApiFileSchema, file: file4, propertyResolver, endp
         authSchemeDeclarations: rawApiFileSchema["auth-schemes"],
         file: file4,
         propertyResolver,
-        endpointResolver
+        endpointResolver,
+        typeResolver
       });
       return {
         docs,
@@ -563724,7 +563810,8 @@ function convertApiAuth2({ rawApiFileSchema, file: file4, propertyResolver, endp
         authSchemeDeclarations: rawApiFileSchema["auth-schemes"],
         file: file4,
         propertyResolver,
-        endpointResolver
+        endpointResolver,
+        typeResolver
       }))
     }),
     endpointSecurity: () => ({
@@ -563735,12 +563822,13 @@ function convertApiAuth2({ rawApiFileSchema, file: file4, propertyResolver, endp
         authSchemeDeclarations: rawApiFileSchema["auth-schemes"],
         file: file4,
         propertyResolver,
-        endpointResolver
+        endpointResolver,
+        typeResolver
       }))
     })
   });
 }
-function convertSchemeReference2({ reference: reference4, authSchemeDeclarations, file: file4, propertyResolver, endpointResolver }) {
+function convertSchemeReference2({ reference: reference4, authSchemeDeclarations, file: file4, propertyResolver, endpointResolver, typeResolver }) {
   const convertNamedAuthSchemeReference = (reference5, docs) => {
     const declaration = authSchemeDeclarations?.[reference5];
     if (declaration == null) {
@@ -563784,7 +563872,8 @@ function convertSchemeReference2({ reference: reference4, authSchemeDeclarations
         docs,
         rawScheme,
         propertyResolver,
-        endpointResolver
+        endpointResolver,
+        typeResolver
       })
     });
   };
@@ -563811,7 +563900,8 @@ function convertSchemeReference2({ reference: reference4, authSchemeDeclarations
         docs: void 0,
         rawScheme: void 0,
         propertyResolver,
-        endpointResolver
+        endpointResolver,
+        typeResolver
       });
     default:
       return convertNamedAuthSchemeReference(scheme, typeof reference4 !== "string" ? reference4.docs : void 0);
@@ -563837,7 +563927,7 @@ function generateBasicAuth2({ key: key2, file: file4, docs, rawScheme }) {
     passwordOmit: rawScheme?.password?.omit
   });
 }
-function generateOAuth({ key: key2, file: file4, docs, rawScheme, propertyResolver, endpointResolver }) {
+function generateOAuth({ key: key2, file: file4, docs, rawScheme, propertyResolver, endpointResolver, typeResolver }) {
   switch (rawScheme?.type) {
     case "client-credentials":
       return AuthScheme.oauth({
@@ -563846,6 +563936,7 @@ function generateOAuth({ key: key2, file: file4, docs, rawScheme, propertyResolv
         configuration: OAuthConfiguration.clientCredentials(convertOAuthClientCredentials({
           propertyResolver,
           endpointResolver,
+          typeResolver,
           file: file4,
           oauthScheme: rawScheme,
           tokenEndpoint: get0AuthTokenEndpoint(rawScheme),
@@ -566636,7 +566727,8 @@ function generateIntermediateRepresentation({ workspace, generationLanguage, key
       rawApiFileSchema: workspace.definition.rootApiFile.contents,
       file: rootApiFileContext,
       propertyResolver,
-      endpointResolver
+      endpointResolver,
+      typeResolver
     }),
     headers: workspace.definition.rootApiFile.contents.headers != null ? Object.entries(workspace.definition.rootApiFile.contents.headers).map(([headerKey, header]) => convertHttpHeader({ headerKey, header, file: rootApiFileContext })) : [],
     idempotencyHeaders: workspace.definition.rootApiFile.contents["idempotency-headers"] != null ? Object.entries(workspace.definition.rootApiFile.contents["idempotency-headers"]).map(([headerKey, header]) => convertHttpHeader({ headerKey, header, file: rootApiFileContext })) : [],
@@ -610875,7 +610967,14 @@ function resolveOAuthScheme({ ir: ir15, key: key2, oauthScheme }) {
           clientId: clientIdProp,
           clientSecret: clientSecretProp,
           scopes: void 0,
-          customProperties: void 0
+          customProperties: findCustomRequestProperties({
+            ir: ir15,
+            endpoint: endpoint3,
+            excludeWireValues: [
+              extractWireName(reqProps?.["client-id"], "client_id"),
+              extractWireName(reqProps?.["client-secret"], "client_secret")
+            ]
+          })
         },
         responseProperties: {
           accessToken: accessTokenProp,
@@ -611001,6 +611100,26 @@ function findRequestBodyProperty({ ir: ir15, endpoint: endpoint3, wireValue }) {
     property: RequestPropertyValue.body({ ...prop })
   };
 }
+function findCustomRequestProperties({ ir: ir15, endpoint: endpoint3, excludeWireValues }) {
+  if (endpoint3.requestBody == null) {
+    return void 0;
+  }
+  let properties7;
+  if (endpoint3.requestBody.type === "inlinedRequestBody") {
+    properties7 = endpoint3.requestBody.properties;
+  } else if (endpoint3.requestBody.type === "reference" && endpoint3.requestBody.requestBodyType.type === "named") {
+    properties7 = getObjectPropertiesForNamedType(ir15, endpoint3.requestBody.requestBodyType.typeId);
+  }
+  if (properties7 == null) {
+    return void 0;
+  }
+  const excludeSet = new Set(excludeWireValues);
+  const customProps = properties7.filter((prop) => !excludeSet.has(getWireValue(prop.name))).map((prop) => ({
+    propertyPath: void 0,
+    property: RequestPropertyValue.body({ ...prop })
+  }));
+  return customProps.length > 0 ? customProps : void 0;
+}
 function findResponseProperty({ ir: ir15, endpoint: endpoint3, wireValue }) {
   if (endpoint3.response?.body?.type !== "json") {
     return void 0;
@@ -621274,7 +621393,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.71.2",
+          version: "4.71.3-3-ge9a920d9274",
           usingAccessToken: true
         }
       });
@@ -621328,7 +621447,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.71.2",
+        version: "4.71.3-3-ge9a920d9274",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -793368,7 +793487,7 @@ var ApiReferenceNodeConverter = class {
     const pointsTo = navigation_exports2.V1.followRedirects(this.#children);
     const changelogNodeConverter = new ChangelogNodeConverter(this.markdownFilesToFullSlugs, this.markdownFilesToNoIndex, this.markdownFilesToTags, this.workspace?.changelog?.files.map((file4) => file4.absoluteFilepath), this.docsWorkspace, this.#idgen).orUndefined();
     let overviewPageId = this.#overviewPageId;
-    if (overviewPageId == null) {
+    if (overviewPageId == null && !this.apiSection.tagDescriptionPages) {
       const apiPackageWithOverview = this.#children.find((child) => child.type === "apiPackage" && child.overviewPageId != null);
       if (apiPackageWithOverview != null) {
         overviewPageId = apiPackageWithOverview.overviewPageId;
@@ -838427,7 +838546,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.71.2";
+  const version7 = "4.71.3-3-ge9a920d9274";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -849674,7 +849793,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.71.2"
+        cliVersion: "4.71.3-3-ge9a920d9274"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -877189,19 +877308,20 @@ var DynamicTypeLiteralMapper = class {
       case "discriminatedUnion":
         return this.convertDiscriminatedUnion({
           discriminatedUnion: named,
-          value
+          value,
+          as: as8
         });
       case "enum":
         return this.convertEnum({ enum_: named, value });
       case "object":
         return this.convertObject({ object_: named, value, as: as8, inUndiscriminatedUnion });
       case "undiscriminatedUnion":
-        return this.convertUndiscriminatedUnion({ undiscriminatedUnion: named, value });
+        return this.convertUndiscriminatedUnion({ undiscriminatedUnion: named, value, as: as8 });
       default:
         assertNever(named);
     }
   }
-  convertDiscriminatedUnion({ discriminatedUnion: discriminatedUnion2, value }) {
+  convertDiscriminatedUnion({ discriminatedUnion: discriminatedUnion2, value, as: as8 }) {
     const classReference4 = this.context.getJavaClassReferenceFromDeclaration({
       declaration: discriminatedUnion2.declaration
     });
@@ -877224,7 +877344,7 @@ var DynamicTypeLiteralMapper = class {
         return java_exports.TypeLiteral.reference(java_exports.invokeMethod({
           on: classReference4,
           method: this.context.getPropertyName(unionVariant.discriminantValue.name),
-          arguments_: [this.convertNamed({ named, value: discriminatedUnionTypeInstance.value })]
+          arguments_: [this.convertNamed({ named, value: discriminatedUnionTypeInstance.value, as: as8 })]
         }));
       }
       case "singleProperty": {
@@ -877241,7 +877361,8 @@ var DynamicTypeLiteralMapper = class {
             arguments_: [
               this.convert({
                 typeReference: unionVariant.typeReference,
-                value: record22[propertyKey]
+                value: record22[propertyKey],
+                as: as8
               })
             ]
           }));
@@ -877453,10 +877574,11 @@ var DynamicTypeLiteralMapper = class {
     }
     return this.context.getEnumName(enumValue.name);
   }
-  convertUndiscriminatedUnion({ undiscriminatedUnion: undiscriminatedUnion21, value }) {
+  convertUndiscriminatedUnion({ undiscriminatedUnion: undiscriminatedUnion21, value, as: as8 }) {
     const result = this.findMatchingUndiscriminatedUnionType({
       undiscriminatedUnion: undiscriminatedUnion21,
-      value
+      value,
+      as: as8
     });
     if (result == null) {
       return java_exports.TypeLiteral.nop();
@@ -877478,13 +877600,14 @@ var DynamicTypeLiteralMapper = class {
       arguments_: [result.typeInstantiation]
     }));
   }
-  findMatchingUndiscriminatedUnionType({ undiscriminatedUnion: undiscriminatedUnion21, value }) {
+  findMatchingUndiscriminatedUnionType({ undiscriminatedUnion: undiscriminatedUnion21, value, as: as8 }) {
     for (const typeReference2 of undiscriminatedUnion21.types) {
       const errorsBefore = this.context.errors.size();
       try {
         const typeInstantiation = this.convert({
           typeReference: typeReference2,
           value,
+          as: as8,
           inUndiscriminatedUnion: true
         });
         if (java_exports.TypeLiteral.isNop(typeInstantiation) || this.context.errors.size() > errorsBefore) {
@@ -924023,7 +924146,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.71.2";
+    return "4.71.3-3-ge9a920d9274";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.71.2",
+  "version": "4.71.3-3-ge9a920d9274",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",