@fern-api/fern-api-dev 4.46.2 → 4.46.3-8-g7a60c0cd67d

package/cli.cjs

@@ -509587,14 +509587,21 @@ function buildOneOfTypeDeclaration({ schema: schema2, context: context3, declara
     return {
       name: schema2.nameOverride ?? schema2.generatedName,
       schema: {
-        discriminant: schema2.discriminantPropertyNameOverride != null ? { name: schema2.discriminantPropertyNameOverride, value: schema2.discriminantProperty } : schema2.discriminantProperty,
+        discriminant: schema2.discriminantPropertyNameOverride != null || schema2.discriminatorContext != null ? {
+          ...schema2.discriminantPropertyNameOverride != null && {
+            name: schema2.discriminantPropertyNameOverride
+          },
+          value: schema2.discriminantProperty,
+          ...schema2.discriminatorContext != null && {
+            context: schema2.discriminatorContext
+          }
+        } : schema2.discriminantProperty,
         "base-properties": baseProperties,
         docs: schema2.description ?? void 0,
         availability: schema2.availability != null ? convertAvailability(schema2.availability) : void 0,
         union: union21,
         encoding,
-        source: schema2.source != null ? convertToSourceSchema(schema2.source) : void 0,
-        ...schema2.discriminatorContext && { context: schema2.discriminatorContext }
+        source: schema2.source != null ? convertToSourceSchema(schema2.source) : void 0
       }
     };
   }
@@ -590881,6 +590888,228 @@ var OpenAPIConverterContext3_1 = class extends AbstractConverterContext {
   }
 };
 
+// ../api-importers/openapi-to-ir/lib/resolveOAuthEndpointReferences.js
+var HTTP_METHOD_MAP = {
+  GET: HttpMethod2.Get,
+  POST: HttpMethod2.Post,
+  PUT: HttpMethod2.Put,
+  PATCH: HttpMethod2.Patch,
+  DELETE: HttpMethod2.Delete
+};
+function resolveOAuthEndpointReferences({ ir: ir15, authOverrides }) {
+  if (!authOverrides["auth-schemes"] || !ir15.auth) {
+    return ir15;
+  }
+  const authSchemes = authOverrides["auth-schemes"];
+  const updatedSchemes = [];
+  for (const scheme of ir15.auth.schemes) {
+    if (scheme.type !== "bearer") {
+      updatedSchemes.push(scheme);
+      continue;
+    }
+    const rawDeclaration = authSchemes[scheme.key];
+    if (rawDeclaration == null) {
+      updatedSchemes.push(scheme);
+      continue;
+    }
+    const resolvedScheme = visitRawAuthSchemeDeclaration(rawDeclaration, {
+      header: () => void 0,
+      basic: () => void 0,
+      tokenBearer: () => void 0,
+      inferredBearer: () => void 0,
+      oauth: (oauthScheme) => resolveOAuthScheme({ ir: ir15, key: scheme.key, oauthScheme })
+    });
+    updatedSchemes.push(resolvedScheme ?? scheme);
+  }
+  return { ...ir15, auth: { ...ir15.auth, schemes: updatedSchemes } };
+}
+function resolveOAuthScheme({ ir: ir15, key: key2, oauthScheme }) {
+  if (oauthScheme.type !== "client-credentials") {
+    return void 0;
+  }
+  const tokenEndpointConfig = oauthScheme["get-token"];
+  const resolved = resolveEndpointFromReference({ ir: ir15, endpointRef: tokenEndpointConfig.endpoint });
+  if (resolved == null) {
+    return void 0;
+  }
+  const { endpoint: endpoint3, serviceId, subpackageId } = resolved;
+  const reqProps = tokenEndpointConfig["request-properties"];
+  const resProps = tokenEndpointConfig["response-properties"];
+  const clientIdProp = findRequestBodyProperty({
+    ir: ir15,
+    endpoint: endpoint3,
+    wireValue: extractWireName(reqProps?.["client-id"], "client_id")
+  });
+  const clientSecretProp = findRequestBodyProperty({
+    ir: ir15,
+    endpoint: endpoint3,
+    wireValue: extractWireName(reqProps?.["client-secret"], "client_secret")
+  });
+  const accessTokenProp = findResponseProperty({
+    ir: ir15,
+    endpoint: endpoint3,
+    wireValue: extractWireName(resProps?.["access-token"], "access_token")
+  });
+  if (clientIdProp == null || clientSecretProp == null || accessTokenProp == null) {
+    return void 0;
+  }
+  return AuthScheme.oauth({
+    key: key2,
+    docs: oauthScheme.docs,
+    configuration: OAuthConfiguration.clientCredentials({
+      clientIdEnvVar: oauthScheme["client-id-env"],
+      clientSecretEnvVar: oauthScheme["client-secret-env"],
+      tokenPrefix: oauthScheme["token-prefix"],
+      tokenHeader: oauthScheme["token-header"],
+      scopes: oauthScheme.scopes,
+      tokenEndpoint: {
+        endpointReference: { endpointId: endpoint3.id, serviceId, subpackageId },
+        requestProperties: {
+          clientId: clientIdProp,
+          clientSecret: clientSecretProp,
+          scopes: void 0,
+          customProperties: void 0
+        },
+        responseProperties: {
+          accessToken: accessTokenProp,
+          expiresIn: findResponseProperty({
+            ir: ir15,
+            endpoint: endpoint3,
+            wireValue: extractWireName(resProps?.["expires-in"], "expires_in")
+          }),
+          refreshToken: findResponseProperty({
+            ir: ir15,
+            endpoint: endpoint3,
+            wireValue: extractWireName(resProps?.["refresh-token"], "refresh_token")
+          })
+        }
+      },
+      refreshEndpoint: oauthScheme["refresh-token"] != null ? resolveRefreshEndpoint({ ir: ir15, refreshTokenConfig: oauthScheme["refresh-token"] }) : void 0
+    })
+  });
+}
+function resolveRefreshEndpoint({ ir: ir15, refreshTokenConfig }) {
+  const resolved = resolveEndpointFromReference({ ir: ir15, endpointRef: refreshTokenConfig.endpoint });
+  if (resolved == null) {
+    return void 0;
+  }
+  const { endpoint: endpoint3, serviceId, subpackageId } = resolved;
+  const reqProps = refreshTokenConfig["request-properties"];
+  const resProps = refreshTokenConfig["response-properties"];
+  const refreshTokenReqProp = findRequestBodyProperty({
+    ir: ir15,
+    endpoint: endpoint3,
+    wireValue: extractWireName(reqProps?.["refresh-token"], "refresh_token")
+  });
+  const accessTokenProp = findResponseProperty({
+    ir: ir15,
+    endpoint: endpoint3,
+    wireValue: extractWireName(resProps?.["access-token"], "access_token")
+  });
+  if (refreshTokenReqProp == null || accessTokenProp == null) {
+    return void 0;
+  }
+  return {
+    endpointReference: { endpointId: endpoint3.id, serviceId, subpackageId },
+    requestProperties: { refreshToken: refreshTokenReqProp },
+    responseProperties: {
+      accessToken: accessTokenProp,
+      expiresIn: findResponseProperty({
+        ir: ir15,
+        endpoint: endpoint3,
+        wireValue: extractWireName(resProps?.["expires-in"], "expires_in")
+      }),
+      refreshToken: findResponseProperty({
+        ir: ir15,
+        endpoint: endpoint3,
+        wireValue: extractWireName(resProps?.["refresh-token"], "refresh_token")
+      })
+    }
+  };
+}
+function resolveEndpointFromReference({ ir: ir15, endpointRef }) {
+  const parts = endpointRef.trim().split(/\s+/);
+  if (parts.length !== 2) {
+    return void 0;
+  }
+  const method8 = HTTP_METHOD_MAP[parts[0]?.toUpperCase() ?? ""];
+  const targetPath = parts[1]?.replace(/\/+$/, "");
+  if (method8 == null || targetPath == null) {
+    return void 0;
+  }
+  for (const [serviceId, service] of Object.entries(ir15.services)) {
+    for (const endpoint3 of service.endpoints) {
+      if (endpoint3.method !== method8) {
+        continue;
+      }
+      const endpointPath = reconstructPath(endpoint3.fullPath);
+      if (endpointPath === targetPath) {
+        const subpackageId = Object.entries(ir15.subpackages).find(([, sp4]) => sp4.service === serviceId)?.[0];
+        return { endpoint: endpoint3, serviceId, subpackageId };
+      }
+    }
+  }
+  return void 0;
+}
+function reconstructPath(httpPath) {
+  let result = httpPath.head;
+  for (const part of httpPath.parts) {
+    result += `{${part.pathParameter}}${part.tail}`;
+  }
+  return result.replace(/\/+$/, "");
+}
+function extractWireName(value, defaultName) {
+  if (value == null) {
+    return defaultName;
+  }
+  const match3 = value.match(/^\$(?:request|response)\.(.+)$/);
+  return match3?.[1] ?? value;
+}
+function findObjectPropertyByWireValue(properties7, wireValue) {
+  return properties7.find((prop) => prop.name.wireValue === wireValue);
+}
+function getObjectPropertiesForNamedType(ir15, typeId) {
+  const typeDecl = ir15.types[typeId];
+  if (typeDecl?.shape.type === "object") {
+    return typeDecl.shape.properties;
+  }
+  return void 0;
+}
+function findRequestBodyProperty({ ir: ir15, endpoint: endpoint3, wireValue }) {
+  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);
+  }
+  const prop = properties7 != null ? findObjectPropertyByWireValue(properties7, wireValue) : void 0;
+  if (prop == null) {
+    return void 0;
+  }
+  return {
+    propertyPath: void 0,
+    property: RequestPropertyValue.body({ ...prop })
+  };
+}
+function findResponseProperty({ ir: ir15, endpoint: endpoint3, wireValue }) {
+  if (endpoint3.response?.body?.type !== "json") {
+    return void 0;
+  }
+  const responseBodyType = endpoint3.response.body.value.responseBodyType;
+  if (responseBodyType.type !== "named") {
+    return void 0;
+  }
+  const properties7 = getObjectPropertiesForNamedType(ir15, responseBodyType.typeId);
+  const prop = properties7 != null ? findObjectPropertyByWireValue(properties7, wireValue) : void 0;
+  if (prop == null) {
+    return void 0;
+  }
+  return { propertyPath: void 0, property: prop };
+}
+
 // ../api-importers/openrpc-to-ir/lib/1.x/extensions/x-fern-parameters.js
 init_lib4();
 var ParameterBaseObjectSchema = external_exports2.object({
@@ -592737,9 +592966,6 @@ var OSSWorkspace = class _OSSWorkspace extends BaseOpenAPIWorkspace {
     const specs = await this.getOpenAPISpecsCached({ context: context3 });
     const documents = await this.loader.loadDocuments({ context: context3, specs });
     const authOverrides = this.generatorsConfiguration?.api?.auth != null ? { ...this.generatorsConfiguration?.api } : void 0;
-    if (authOverrides) {
-      context3.logger.trace("Using auth overrides from generators configuration");
-    }
     const environmentOverrides = this.generatorsConfiguration?.api?.environments != null ? { ...this.generatorsConfiguration?.api } : void 0;
     if (environmentOverrides) {
       context3.logger.trace("Using environment overrides from generators configuration");
@@ -592874,6 +593100,9 @@ var OSSWorkspace = class _OSSWorkspace extends BaseOpenAPIWorkspace {
     if (mergedIr === void 0) {
       throw new Error("Failed to generate intermediate representation");
     }
+    if (authOverrides != null) {
+      mergedIr = resolveOAuthEndpointReferences({ ir: mergedIr, authOverrides });
+    }
     return mergedIr;
   }
   async generateAllProtobufIRs({ context: context3 }) {
@@ -601761,7 +601990,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.46.2",
+          version: "4.46.3-8-g7a60c0cd67d",
           usingAccessToken: true
         }
       });
@@ -601812,7 +602041,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.46.2",
+        version: "4.46.3-8-g7a60c0cd67d",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -825666,7 +825895,7 @@ var import_path54 = __toESM(require("path"), 1);
 var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 function getCliSource() {
-  const version7 = "4.46.2";
+  const version7 = "4.46.3-8-g7a60c0cd67d";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -836633,7 +836862,7 @@ var LegacyDocsPublisher = class {
         previewId: void 0,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.46.2"
+        cliVersion: "4.46.3-8-g7a60c0cd67d"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -909483,7 +909712,7 @@ var CliContext = class {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.46.2";
+    return "4.46.3-8-g7a60c0cd67d";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.46.2",
+  "version": "4.46.3-8-g7a60c0cd67d",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",