fern-api 0.16.29 → 0.16.31

package/bundle.cjs

@@ -733310,10 +733310,12 @@ var GeneratorGroupSchema = z.strictObject({
 // pnp:/home/circleci/project/packages/cli/config-management/generators-configuration/lib/schemas/GeneratorsConfigurationSchema.js
 var DEFAULT_GROUP_GENERATORS_CONFIG_KEY = "default-group";
 var OPENAPI_LOCATION_KEY = "openapi";
+var OPENAPI_OVERRIDES_LOCATION_KEY = "openapi-overrides";
 var ASYNC_API_LOCATION_KEY = "async-api";
 var GeneratorsConfigurationSchema = z.strictObject({
   [DEFAULT_GROUP_GENERATORS_CONFIG_KEY]: z.optional(z.string()),
   [OPENAPI_LOCATION_KEY]: z.optional(z.string()),
+  [OPENAPI_OVERRIDES_LOCATION_KEY]: z.optional(z.string()),
   [ASYNC_API_LOCATION_KEY]: z.optional(z.string()),
   groups: z.optional(z.record(GeneratorGroupSchema))
 });
@@ -733322,10 +733324,12 @@ var GeneratorsConfigurationSchema = z.strictObject({
 async function convertGeneratorsConfiguration({ absolutePathToGeneratorsConfiguration, rawGeneratorsConfiguration }) {
   const pathToOpenAPI = rawGeneratorsConfiguration[OPENAPI_LOCATION_KEY];
   const pathToAsyncAPI = rawGeneratorsConfiguration[ASYNC_API_LOCATION_KEY];
+  const pathToOpenAPIOverrides = rawGeneratorsConfiguration[OPENAPI_OVERRIDES_LOCATION_KEY];
   return {
     absolutePathToConfiguration: absolutePathToGeneratorsConfiguration,
     absolutePathToAsyncAPI: pathToAsyncAPI != null ? join(dirname(absolutePathToGeneratorsConfiguration), RelativeFilePath.of(pathToAsyncAPI)) : void 0,
     absolutePathToOpenAPI: pathToOpenAPI != null ? join(dirname(absolutePathToGeneratorsConfiguration), RelativeFilePath.of(pathToOpenAPI)) : void 0,
+    absolutePathToOpenAPIOverrides: pathToOpenAPIOverrides != null ? join(dirname(absolutePathToGeneratorsConfiguration), RelativeFilePath.of(pathToOpenAPIOverrides)) : void 0,
     rawConfiguration: rawGeneratorsConfiguration,
     defaultGroup: rawGeneratorsConfiguration["default-group"],
     groups: rawGeneratorsConfiguration.groups != null ? await Promise.all(Object.entries(rawGeneratorsConfiguration.groups).map(([groupName, group]) => convertGroup({
@@ -736951,7 +736955,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "0.16.29",
+          version: "0.16.31",
           usingAccessToken: true
         }
       });
@@ -737013,7 +737017,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "0.16.29",
+        version: "0.16.31",
         ...event,
         ...event.properties
       }
@@ -751623,8 +751627,9 @@ function isObjectEqual(a2, b2) {
 
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/v3/converters/schema/convertObject.js
 function convertObject2({ nameOverride, generatedName, breadcrumbs, properties, description, required, wrapAsNullable, allOf, context, propertiesToExclude, groupName }) {
-  let allRequired = [...required ?? []];
-  let propertiesToConvert = { ...properties };
+  const allRequired = [...required ?? []];
+  const propertiesToConvert = { ...properties };
+  const inlinedParentProperties = [];
   const parents = [];
   for (const allOfElement of allOf) {
     if (isReferenceObject(allOfElement)) {
@@ -751640,9 +751645,9 @@ function convertObject2({ nameOverride, generatedName, breadcrumbs, properties,
       });
       context.markSchemaAsReferencedByNonRequest(schemaId);
     } else {
-      if (allOfElement.properties != null) {
-        allRequired = [...allRequired, ...allOfElement.required ?? []];
-        propertiesToConvert = { ...allOfElement.properties, ...propertiesToConvert };
+      const allOfSchema = convertSchema(allOfElement, false, context, breadcrumbs);
+      if (allOfSchema.type === "object") {
+        inlinedParentProperties.push(...allOfSchema.properties);
       }
     }
   }
@@ -751698,6 +751703,21 @@ function convertObject2({ nameOverride, generatedName, breadcrumbs, properties,
       generatedName: getGeneratedPropertyName([...breadcrumbs, propertyName])
     };
   });
+  convertedProperties.push(...inlinedParentProperties.map((property2) => {
+    const conflicts = property2.conflict;
+    for (const parent2 of parents) {
+      const parentPropertySchema = parent2.properties[property2.key];
+      if (parentPropertySchema != null && !isSchemaWithExampleEqual(property2.schema, parentPropertySchema)) {
+        conflicts[parent2.schemaId] = { differentSchema: true };
+      } else if (parentPropertySchema != null) {
+        conflicts[parent2.schemaId] = { differentSchema: false };
+      }
+    }
+    return {
+      ...property2,
+      conflict: conflicts
+    };
+  }));
   return wrapObject({
     nameOverride,
     generatedName,
@@ -754374,7 +754394,7 @@ var FERN_TYPE_EXTENSIONS = {
     }
   }
 };
-async function loadOpenAPI({ absolutePathToOpenAPI, context }) {
+async function loadOpenAPI({ absolutePathToOpenAPI, absolutePathToOpenAPIOverrides, context }) {
   const result2 = await (0, import_openapi_core.bundle)({
     config: new import_openapi_core.Config({
       apis: {},
@@ -754391,12 +754411,19 @@ async function loadOpenAPI({ absolutePathToOpenAPI, context }) {
     keepUrlRefs: true
   });
   const parsed = await import_swagger_parser.default.parse(result2.bundle.parsed);
-  const overridesFilepath = typeof parsed === "object" ? parsed[FernOpenAPIExtension.OPENAPI_OVERIDES_FILEPATH] : void 0;
+  let overridesFilepath = void 0;
+  if (absolutePathToOpenAPIOverrides != null) {
+    overridesFilepath = absolutePathToOpenAPIOverrides;
+  } else if (typeof parsed === "object" && parsed[FernOpenAPIExtension.OPENAPI_OVERIDES_FILEPATH] != null) {
+    overridesFilepath = join(
+      dirname(absolutePathToOpenAPI),
+      RelativeFilePath.of(parsed[FernOpenAPIExtension.OPENAPI_OVERIDES_FILEPATH])
+    );
+  }
   if (overridesFilepath != null) {
-    const pathToFile = join(dirname(absolutePathToOpenAPI), RelativeFilePath.of(overridesFilepath));
     let parsedOverrides = null;
     try {
-      const contents = (await (0, import_promises22.readFile)(pathToFile, "utf8")).toString();
+      const contents = (await (0, import_promises22.readFile)(overridesFilepath, "utf8")).toString();
       try {
         parsedOverrides = JSON.parse(contents);
       } catch (err) {
@@ -754419,13 +754446,17 @@ async function generateIr2(openApi, taskContext) {
 }
 
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/parse.js
-async function parse2({ absolutePathToAsyncAPI, absolutePathToOpenAPI, taskContext }) {
+async function parse2({ absolutePathToAsyncAPI, absolutePathToOpenAPI, absolutePathToOpenAPIOverrides, taskContext }) {
   let asyncAPISchemas = {};
   if (absolutePathToAsyncAPI != null) {
     const asyncAPI = await loadAsyncAPI(absolutePathToAsyncAPI);
     asyncAPISchemas = generateSchemasFromAsyncAPI(asyncAPI, taskContext);
   }
-  const openApiDocument = await loadOpenAPI({ absolutePathToOpenAPI, context: taskContext });
+  const openApiDocument = await loadOpenAPI({
+    absolutePathToOpenAPI,
+    context: taskContext,
+    absolutePathToOpenAPIOverrides
+  });
   let openApiIr = void 0;
   if (isOpenApiV3(openApiDocument)) {
     openApiIr = generateIr(openApiDocument, taskContext);
@@ -754456,9 +754487,11 @@ function isOpenApiV2(openApi) {
 
 // pnp:/home/circleci/project/packages/cli/workspace-loader/lib/utils/convertOpenApiWorkspaceToFernWorkspace.js
 async function getOpenAPIIRFromOpenAPIWorkspace(openapiWorkspace, context) {
+  var _a2;
   return await parse2({
     absolutePathToAsyncAPI: openapiWorkspace.absolutePathToAsyncAPI,
     absolutePathToOpenAPI: openapiWorkspace.absolutePathToOpenAPI,
+    absolutePathToOpenAPIOverrides: (_a2 = openapiWorkspace.generatorsConfiguration) == null ? void 0 : _a2.absolutePathToOpenAPIOverrides,
     taskContext: context
   });
 }
@@ -761708,10 +761741,10 @@ var CliContext = class {
     return "fern-api";
   }
   getPackageVersion() {
-    if ("0.16.29" == null) {
+    if ("0.16.31" == null) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "0.16.29";
+    return "0.16.31";
   }
   getCliName() {
     if ("fern" == null) {

package/package.json

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