fern-api 0.16.15 → 0.16.16

package/bundle.cjs

@@ -736685,7 +736685,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "0.16.15",
+          version: "0.16.16",
           usingAccessToken: true
         }
       });
@@ -736747,7 +736747,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "0.16.15",
+        version: "0.16.16",
         ...event,
         ...event.properties
       }
@@ -749798,14 +749798,20 @@ function getRequest({ declarationFile, context, request, requestNameOverride, ge
         fileContainingReference: declarationFile,
         context
       });
-      return [
-        property2.key,
-        usedNames.has(property2.key) ? {
-          type: getTypeFromTypeReference(propertyTypeReference),
-          docs: getDocsFromTypeReference(propertyTypeReference),
-          name: property2.generatedName
-        } : propertyTypeReference
-      ];
+      if (!usedNames.has(property2.key) && property2.audiences.length <= 0) {
+        return [property2.key, propertyTypeReference];
+      }
+      const typeReference = {
+        type: getTypeFromTypeReference(propertyTypeReference),
+        docs: getDocsFromTypeReference(propertyTypeReference)
+      };
+      if (usedNames.has(property2.key)) {
+        typeReference.name = property2.generatedName;
+      }
+      if (property2.audiences.length > 0) {
+        typeReference.audiences = property2.audiences;
+      }
+      return [property2.key, typeReference];
     }));
     const extendedSchemas = resolvedSchema.allOf.map((referencedSchema) => {
       const allOfTypeReference = buildTypeReference({
@@ -752106,8 +752112,10 @@ function convertRequest({ requestBody, document: document4, context, requestBrea
           };
         }
         const schemaWithExample = convertSchema(definition2, false, context, [...requestBreadcrumbs, key2]);
+        const audiences = getExtension(definition2, FernOpenAPIExtension.AUDIENCES) ?? [];
         return {
           key: key2,
+          audiences,
           schema: import_finalIr9.MultipartSchema.json(convertSchemaWithExampleToSchema(schemaWithExample)),
           description: void 0
         };
@@ -761234,10 +761242,10 @@ var CliContext = class {
     return "fern-api";
   }
   getPackageVersion() {
-    if ("0.16.15" == null) {
+    if ("0.16.16" == null) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "0.16.15";
+    return "0.16.16";
   }
   getCliName() {
     if ("fern" == null) {
@@ -765095,6 +765103,24 @@ function isReferencedWebhookPayloadSchema(payload) {
   return payload.type != null;
 }
 
+// pnp:/home/circleci/project/packages/cli/generation/ir-generator/lib/utils/getPropertiesForAudience.js
+function getPropertiesForAudience(properties) {
+  var _a2;
+  const propertiesByAudience = {};
+  for (const [property2, propertyDeclaration] of Object.entries(properties)) {
+    if (typeof propertyDeclaration === "string") {
+      continue;
+    }
+    for (const audience of propertyDeclaration.audiences ?? []) {
+      if (propertiesByAudience[audience] == null) {
+        propertiesByAudience[audience] = /* @__PURE__ */ new Set();
+      }
+      (_a2 = propertiesByAudience[audience]) == null ? void 0 : _a2.add(property2);
+    }
+  }
+  return propertiesByAudience;
+}
+
 // pnp:/home/circleci/project/packages/cli/generation/ir-generator/lib/converters/type-declarations/convertAliasTypeDeclaration.js
 var import_api18 = __toESM(require_api4());
 function convertAliasTypeDeclaration({ alias, file, typeResolver }) {
@@ -765226,26 +765252,15 @@ var SeenTypeNamesImpl = class {
 
 // pnp:/home/circleci/project/packages/cli/generation/ir-generator/lib/converters/type-declarations/convertTypeDeclaration.js
 async function convertTypeDeclaration({ typeName, typeDeclaration, file, typeResolver, exampleResolver, workspace }) {
-  var _a2;
   const declaration = await convertDeclaration(typeDeclaration);
   const declaredTypeName = parseTypeName({
     typeName,
     file
   });
   const referencedTypes = getReferencedTypesFromRawDeclaration({ typeDeclaration, file, typeResolver });
-  const propertiesByAudience = {};
+  let propertiesByAudience = {};
   if (isRawObjectDefinition(typeDeclaration)) {
-    for (const [property2, propertyDeclaration] of Object.entries(typeDeclaration.properties ?? {})) {
-      if (typeof propertyDeclaration === "string") {
-        continue;
-      }
-      for (const audience of propertyDeclaration.audiences ?? []) {
-        if (propertiesByAudience[audience] == null) {
-          propertiesByAudience[audience] = /* @__PURE__ */ new Set();
-        }
-        (_a2 = propertiesByAudience[audience]) == null ? void 0 : _a2.add(property2);
-      }
-    }
+    propertiesByAudience = getPropertiesForAudience(typeDeclaration.properties ?? {});
   }
   return {
     propertiesByAudience,
@@ -765296,14 +765311,16 @@ var FilteredIrImpl = class {
   errors = /* @__PURE__ */ new Set();
   services = /* @__PURE__ */ new Set();
   endpoints = /* @__PURE__ */ new Set();
+  requestProperties;
   subpackages = /* @__PURE__ */ new Set();
-  constructor({ types: types4, errors, services, endpoints, subpackages, properties }) {
+  constructor({ types: types4, errors, services, endpoints, subpackages, requestProperties, properties }) {
     this.types = types4;
     this.properties = properties;
     this.errors = errors;
     this.services = services;
     this.endpoints = endpoints;
     this.subpackages = subpackages;
+    this.requestProperties = requestProperties;
   }
   hasTypeId(typeId) {
     return this.types.has(typeId);
@@ -765339,6 +765356,13 @@ var FilteredIrImpl = class {
   hasEndpoint(endpoint) {
     return this.endpoints.has(endpoint.id);
   }
+  hasRequestProperty(endpoint, property2) {
+    const properties = this.requestProperties[endpoint];
+    if (properties == null) {
+      return true;
+    }
+    return properties.has(property2);
+  }
   hasSubpackage(subpackageId) {
     return this.subpackages.has(subpackageId);
   }
@@ -765348,6 +765372,7 @@ var FilteredIrImpl = class {
 var IrGraph = class {
   types = {};
   properties = {};
+  requestProperties = {};
   errors = {};
   endpoints = {};
   audiences;
@@ -765404,7 +765429,7 @@ var IrGraph = class {
     };
     this.errors[errorId] = errorNode;
   }
-  addEndpoint(service, httpEndpoint) {
+  addEndpoint(service, httpEndpoint, rawEndpoint) {
     const serviceId = IdGenerator.generateServiceId(service.name);
     const endpointId = httpEndpoint.id;
     const referencedTypes = /* @__PURE__ */ new Set();
@@ -765428,6 +765453,13 @@ var IrGraph = class {
           for (const property2 of inlinedRequestBody.properties) {
             populateReferencesFromTypeReference(property2.valueType, referencedTypes, referencedSubpackages);
           }
+          if (rawEndpoint != null && typeof rawEndpoint.request === "object" && typeof rawEndpoint.request.body === "object" && isInlineRequestBody(rawEndpoint.request.body)) {
+            const propertiesByAudience = getPropertiesForAudience(rawEndpoint.request.body.properties ?? {});
+            this.requestProperties[endpointId] = {
+              endpointId,
+              propertiesByAudience
+            };
+          }
         },
         reference: ({ requestBodyType }) => {
           populateReferencesFromTypeReference(requestBodyType, referencedTypes, referencedSubpackages);
@@ -765523,6 +765555,7 @@ var IrGraph = class {
     }
     this.addReferencedTypes(typeIds, this.typesNeededForAudience);
     const properties = {};
+    const requestProperties = {};
     if (this.audiences.type === "filtered") {
       for (const [typeId, typePropertiesNode] of Object.entries(this.properties)) {
         if (!typeIds.has(typeId)) {
@@ -765541,11 +765574,29 @@ var IrGraph = class {
           properties[typeId] = propertiesForTypeId;
         }
       }
+      for (const [endpointId, requestPropertiesNode] of Object.entries(this.requestProperties)) {
+        if (!this.endpointsNeededForAudience.has(endpointId)) {
+          continue;
+        }
+        const propertiesForEndpoint = /* @__PURE__ */ new Set();
+        for (const audience of this.audiences.audiences) {
+          const propertiesForAudience = requestPropertiesNode.propertiesByAudience[audience];
+          if (propertiesForAudience != null) {
+            propertiesForAudience.forEach((property2) => {
+              propertiesForEndpoint.add(property2);
+            });
+          }
+        }
+        if (propertiesForEndpoint.size > 0) {
+          requestProperties[endpointId] = propertiesForEndpoint;
+        }
+      }
     }
     return new FilteredIrImpl({
       types: typeIds,
       properties,
       errors: errorIds,
+      requestProperties,
       services: this.servicesNeededForAudience,
       endpoints: this.endpointsNeededForAudience,
       subpackages: this.subpackagesNeededForAudience
@@ -766364,7 +766415,8 @@ async function generateIntermediateRepresentation({ workspace, generationLanguag
         packageTreeGenerator.addService(serviceId, convertedHttpService);
         const convertedEndpoints = {};
         convertedHttpService.endpoints.forEach((httpEndpoint) => {
-          irGraph.addEndpoint(convertedHttpService, httpEndpoint);
+          const rawEndpointSchema = service.endpoints[httpEndpoint.name.originalName];
+          irGraph.addEndpoint(convertedHttpService, httpEndpoint, rawEndpointSchema);
           convertedEndpoints[httpEndpoint.name.originalName] = httpEndpoint;
         });
         if (service.audiences != null) {
@@ -766512,7 +766564,21 @@ function filterIntermediateRepresentationForAudiences(intermediateRepresentation
     errors: pickBy_default(intermediateRepresentation.errors, (error) => filteredIr.hasError(error)),
     services: mapValues_default(pickBy_default(intermediateRepresentation.services, (httpService) => filteredIr.hasService(httpService)), (httpService) => ({
       ...httpService,
-      endpoints: httpService.endpoints.filter((httpEndpoint) => filteredIr.hasEndpoint(httpEndpoint))
+      endpoints: httpService.endpoints.filter((httpEndpoint) => filteredIr.hasEndpoint(httpEndpoint)).map((httpEndpoint) => {
+        var _a2;
+        if (((_a2 = httpEndpoint.requestBody) == null ? void 0 : _a2.type) === "inlinedRequestBody") {
+          return {
+            ...httpEndpoint,
+            requestBody: {
+              ...httpEndpoint.requestBody,
+              properties: httpEndpoint.requestBody.properties.filter((property2) => {
+                return filteredIr.hasRequestProperty(httpEndpoint.id, property2.name.wireValue);
+              })
+            }
+          };
+        }
+        return httpEndpoint;
+      })
     })),
     serviceTypeReferenceInfo: filterServiceTypeReferenceInfoForAudiences(intermediateRepresentation.serviceTypeReferenceInfo, filteredIr)
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fern-api",
-  "version": "0.16.15",
+  "version": "0.16.16",
   "repository": {
     "type": "git",
     "url": "https://github.com/fern-api/fern.git",