fern-api 0.31.13 → 0.31.15

package/bundle.cjs

@@ -1115837,7 +1115837,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "0.31.13",
+          version: "0.31.15",
           usingAccessToken: true
         }
       });
@@ -1115899,7 +1115899,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "0.31.13",
+        version: "0.31.15",
         ...event,
         ...event.properties
       }
@@ -1139780,115 +1139780,6 @@ function convertNumber({ nameOverride, generatedName, format: format5, _default:
   });
 }
 
-// pnp:/home/circleci/project/packages/cli/openapi-parser/lib/schema/utils/getBreadcrumbsFromReference.js
-var STARTS_WITH_COMPONENTS_SCHEMAS = {
-  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "#" && refUnderProcessing[1] === "components" && refUnderProcessing[2] === "schemas",
-  applyStrategy: (refUnderProcessing) => {
-    const newBreadcrumbs = [refUnderProcessing[3] ?? ""];
-    return {
-      refUnderProcessing: refUnderProcessing.slice(4),
-      newBreadcrumbs
-    };
-  }
-};
-var STARTS_WITH_COMPONENTS_RESPONSES = {
-  isApplicable: (breadcrumbs) => breadcrumbs[0] === "#" && breadcrumbs[1] === "components" && breadcrumbs[2] === "responses",
-  applyStrategy: (refUnderProcessing) => {
-    const newBreadcrumbs = [refUnderProcessing[3] ?? ""];
-    refUnderProcessing = refUnderProcessing.slice(4);
-    return {
-      refUnderProcessing: refUnderProcessing.slice(4),
-      newBreadcrumbs
-    };
-  }
-};
-var STARTS_WITH_COMPONENTS_PARAMETERS = {
-  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "#" && refUnderProcessing[1] === "components" && refUnderProcessing[2] === "parameters",
-  applyStrategy: (refUnderProcessing) => {
-    const newBreadcrumbs = [refUnderProcessing[3] ?? ""];
-    refUnderProcessing = refUnderProcessing.slice(4);
-    if (refUnderProcessing[0] === "schema") {
-      refUnderProcessing = refUnderProcessing.slice(1);
-    }
-    return {
-      refUnderProcessing,
-      newBreadcrumbs
-    };
-  }
-};
-var EXTRACT_PROPERTY = {
-  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "properties",
-  applyStrategy: (refUnderProcessing) => {
-    const newBreadcrumbs = [refUnderProcessing[1] ?? ""];
-    return {
-      refUnderProcessing: refUnderProcessing.slice(2),
-      newBreadcrumbs
-    };
-  }
-};
-var REMOVE_ITEMS_KEYWORD = {
-  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "items",
-  applyStrategy: (refUnderProcessing) => {
-    return {
-      refUnderProcessing: refUnderProcessing.slice(1),
-      newBreadcrumbs: []
-    };
-  }
-};
-var REMOVE_ALL_OF_KEYWORD = {
-  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "allOf",
-  applyStrategy: (refUnderProcessing) => {
-    return {
-      refUnderProcessing: refUnderProcessing.slice(1),
-      newBreadcrumbs: []
-    };
-  }
-};
-var REMOVE_ANY_OF_KEYWORD = {
-  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "anyOf",
-  applyStrategy: (refUnderProcessing) => {
-    return {
-      refUnderProcessing: refUnderProcessing.slice(1),
-      newBreadcrumbs: []
-    };
-  }
-};
-var REMOVE_ONE_OF_KEYWORD = {
-  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "oneOf",
-  applyStrategy: (refUnderProcessing) => {
-    return {
-      refUnderProcessing: refUnderProcessing.slice(1),
-      newBreadcrumbs: []
-    };
-  }
-};
-function getBreadcrumbsFromReference(reference) {
-  let refUnderProcessing = reference.split("/").map((breadcrumb) => breadcrumb.replace(/~1/g, "/"));
-  let breadcrumbs = [];
-  const strategies = [
-    STARTS_WITH_COMPONENTS_SCHEMAS,
-    STARTS_WITH_COMPONENTS_RESPONSES,
-    STARTS_WITH_COMPONENTS_PARAMETERS,
-    EXTRACT_PROPERTY,
-    REMOVE_ITEMS_KEYWORD,
-    REMOVE_ALL_OF_KEYWORD,
-    REMOVE_ANY_OF_KEYWORD,
-    REMOVE_ONE_OF_KEYWORD
-  ];
-  let previousRefUnderProcessing;
-  do {
-    previousRefUnderProcessing = refUnderProcessing;
-    for (const strategy of strategies) {
-      if (strategy.isApplicable(refUnderProcessing)) {
-        const { refUnderProcessing: newRefUnderProcessing, newBreadcrumbs } = strategy.applyStrategy(refUnderProcessing);
-        refUnderProcessing = newRefUnderProcessing;
-        breadcrumbs = [...breadcrumbs, ...newBreadcrumbs];
-      }
-    }
-  } while (refUnderProcessing.join("") !== previousRefUnderProcessing.join(""));
-  return breadcrumbs;
-}
-
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/schema/utils/getSchemaName.js
 function getGeneratedTypeName(breadcrumbs) {
   const underscoreDelimeted = breadcrumbs.join("_");
@@ -1140135,6 +1140026,115 @@ function isObjectEqual(a2, b2) {
   });
 }
 
+// pnp:/home/circleci/project/packages/cli/openapi-parser/lib/schema/utils/getBreadcrumbsFromReference.js
+var STARTS_WITH_COMPONENTS_SCHEMAS = {
+  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "#" && refUnderProcessing[1] === "components" && refUnderProcessing[2] === "schemas",
+  applyStrategy: (refUnderProcessing) => {
+    const newBreadcrumbs = [refUnderProcessing[3] ?? ""];
+    return {
+      refUnderProcessing: refUnderProcessing.slice(4),
+      newBreadcrumbs
+    };
+  }
+};
+var STARTS_WITH_COMPONENTS_RESPONSES = {
+  isApplicable: (breadcrumbs) => breadcrumbs[0] === "#" && breadcrumbs[1] === "components" && breadcrumbs[2] === "responses",
+  applyStrategy: (refUnderProcessing) => {
+    const newBreadcrumbs = [refUnderProcessing[3] ?? ""];
+    refUnderProcessing = refUnderProcessing.slice(4);
+    return {
+      refUnderProcessing: refUnderProcessing.slice(4),
+      newBreadcrumbs
+    };
+  }
+};
+var STARTS_WITH_COMPONENTS_PARAMETERS = {
+  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "#" && refUnderProcessing[1] === "components" && refUnderProcessing[2] === "parameters",
+  applyStrategy: (refUnderProcessing) => {
+    const newBreadcrumbs = [refUnderProcessing[3] ?? ""];
+    refUnderProcessing = refUnderProcessing.slice(4);
+    if (refUnderProcessing[0] === "schema") {
+      refUnderProcessing = refUnderProcessing.slice(1);
+    }
+    return {
+      refUnderProcessing,
+      newBreadcrumbs
+    };
+  }
+};
+var EXTRACT_PROPERTY = {
+  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "properties",
+  applyStrategy: (refUnderProcessing) => {
+    const newBreadcrumbs = [refUnderProcessing[1] ?? ""];
+    return {
+      refUnderProcessing: refUnderProcessing.slice(2),
+      newBreadcrumbs
+    };
+  }
+};
+var REMOVE_ITEMS_KEYWORD = {
+  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "items",
+  applyStrategy: (refUnderProcessing) => {
+    return {
+      refUnderProcessing: refUnderProcessing.slice(1),
+      newBreadcrumbs: []
+    };
+  }
+};
+var REMOVE_ALL_OF_KEYWORD = {
+  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "allOf",
+  applyStrategy: (refUnderProcessing) => {
+    return {
+      refUnderProcessing: refUnderProcessing.slice(1),
+      newBreadcrumbs: []
+    };
+  }
+};
+var REMOVE_ANY_OF_KEYWORD = {
+  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "anyOf",
+  applyStrategy: (refUnderProcessing) => {
+    return {
+      refUnderProcessing: refUnderProcessing.slice(1),
+      newBreadcrumbs: []
+    };
+  }
+};
+var REMOVE_ONE_OF_KEYWORD = {
+  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "oneOf",
+  applyStrategy: (refUnderProcessing) => {
+    return {
+      refUnderProcessing: refUnderProcessing.slice(1),
+      newBreadcrumbs: []
+    };
+  }
+};
+function getBreadcrumbsFromReference(reference) {
+  let refUnderProcessing = reference.split("/").map((breadcrumb) => breadcrumb.replace(/~1/g, "/"));
+  let breadcrumbs = [];
+  const strategies = [
+    STARTS_WITH_COMPONENTS_SCHEMAS,
+    STARTS_WITH_COMPONENTS_RESPONSES,
+    STARTS_WITH_COMPONENTS_PARAMETERS,
+    EXTRACT_PROPERTY,
+    REMOVE_ITEMS_KEYWORD,
+    REMOVE_ALL_OF_KEYWORD,
+    REMOVE_ANY_OF_KEYWORD,
+    REMOVE_ONE_OF_KEYWORD
+  ];
+  let previousRefUnderProcessing;
+  do {
+    previousRefUnderProcessing = refUnderProcessing;
+    for (const strategy of strategies) {
+      if (strategy.isApplicable(refUnderProcessing)) {
+        const { refUnderProcessing: newRefUnderProcessing, newBreadcrumbs } = strategy.applyStrategy(refUnderProcessing);
+        refUnderProcessing = newRefUnderProcessing;
+        breadcrumbs = [...breadcrumbs, ...newBreadcrumbs];
+      }
+    }
+  } while (refUnderProcessing.join("") !== previousRefUnderProcessing.join(""));
+  return breadcrumbs;
+}
+
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/schema/convertObject.js
 function convertObject({ nameOverride, generatedName, breadcrumbs, properties, description, required, wrapAsNullable, allOf, context, propertiesToExclude, groupName, fullExamples, additionalProperties }) {
   const allRequired = [...required ?? []];
@@ -1141056,9 +1141056,7 @@ function convertSchemaObject(schema2, wrapAsNullable, context, breadcrumbs, prop
   if (schema2.allOf != null || schema2.properties != null) {
     const filteredAllOfs = [];
     for (const allOf of schema2.allOf ?? []) {
-      if (isReferenceObject(allOf)) {
-        filteredAllOfs.push(allOf);
-      } else if (Object.keys(allOf).length > 0 && Object.keys(allOf).includes("type")) {
+      if (isReferenceObject(allOf) || Object.keys(allOf).length > 0) {
         filteredAllOfs.push(allOf);
       }
     }
@@ -1141066,6 +1141064,17 @@ function convertSchemaObject(schema2, wrapAsNullable, context, breadcrumbs, prop
       const convertedSchema = convertSchema(filteredAllOfs[0], wrapAsNullable, context, breadcrumbs, referencedAsRequest);
       return maybeInjectDescriptionOrGroupName(convertedSchema, description, groupName);
     }
+    const filteredAllOfObjects = filteredAllOfs.filter((allOf) => {
+      const valid2 = isValidAllOfObject(allOf);
+      if (!valid2) {
+        context.logger.warn(`Skipping non-object allOf element: ${JSON.stringify(allOf)}`);
+      }
+      return valid2;
+    });
+    if ((schema2.properties == null || schema2.properties.length === 0) && filteredAllOfObjects.length === 1 && filteredAllOfObjects[0] != null) {
+      const convertedSchema = convertSchema(filteredAllOfObjects[0], wrapAsNullable, context, breadcrumbs, referencedAsRequest);
+      return maybeInjectDescriptionOrGroupName(convertedSchema, description, groupName);
+    }
     return convertObject({
       nameOverride,
       generatedName,
@@ -1141074,7 +1141083,7 @@ function convertSchemaObject(schema2, wrapAsNullable, context, breadcrumbs, prop
       description,
       required: schema2.required,
       wrapAsNullable,
-      allOf: filteredAllOfs,
+      allOf: filteredAllOfObjects,
       context,
       propertiesToExclude,
       groupName,
@@ -1141185,6 +1141194,21 @@ function maybeInjectDescriptionOrGroupName(schema2, description, groupName) {
   }
   return schema2;
 }
+function isValidAllOfObject(allOf) {
+  if (isReferenceObject(allOf) || allOf.type === "object" || allOf.properties != null) {
+    return true;
+  }
+  if (allOf.allOf != null) {
+    return allOf.allOf.every((elem) => isValidAllOfObject(elem));
+  }
+  if (allOf.oneOf != null) {
+    return allOf.oneOf.every((elem) => isValidAllOfObject(elem));
+  }
+  if (allOf.anyOf != null) {
+    return allOf.anyOf.every((elem) => isValidAllOfObject(elem));
+  }
+  return false;
+}
 function wrapLiteral({ literal: literal2, wrapAsNullable, groupName, description, nameOverride, generatedName }) {
   if (wrapAsNullable) {
     return SchemaWithExample.nullable({
@@ -1151467,10 +1151491,10 @@ var CliContext = class {
     return "fern-api";
   }
   getPackageVersion() {
-    if ("0.31.13" == null) {
+    if ("0.31.15" == null) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "0.31.13";
+    return "0.31.15";
   }
   getCliName() {
     if ("fern" == null) {
@@ -1201997,9 +1202021,12 @@ var import_tmp_promise9 = __toESM(require_tmp_promise());
 
 // pnp:/home/circleci/project/packages/cli/generation/remote-generation/remote-workspace-runner/lib/substituteEnvVariables.js
 var ENV_VAR_REGEX = /\$\{(\w+)\}/g;
-function substituteEnvVariables(content5, context) {
+function substituteEnvVariables(content5, context, options2 = {}) {
   if (typeof content5 === "string") {
     const transformed2 = content5.replace(ENV_VAR_REGEX, (_substring, envVarName) => {
+      if (options2.substituteAsEmpty) {
+        return "";
+      }
       const envVarValue = process.env[envVarName];
       if (envVarValue == null) {
         context.failAndThrow(`Environment variable ${envVarName} is not defined.`);
@@ -1202011,7 +1202038,7 @@ function substituteEnvVariables(content5, context) {
   if (!isPlainObject_default(content5)) {
     return content5;
   }
-  const transformed = mapValues_default2(content5, (value) => substituteEnvVariables(value, context));
+  const transformed = mapValues_default2(content5, (value) => substituteEnvVariables(value, context, options2));
   return transformed;
 }
 
@@ -1202033,6 +1202060,7 @@ async function createAndStartJob({ projectConfig, workspace, organization, inter
   return job;
 }
 async function createJob({ projectConfig, workspace, organization, generatorInvocation, version: version3, context, shouldLogS3Url, token, whitelabel, absolutePathToPreview }) {
+  const isPreview = absolutePathToPreview != null;
   const generatorConfig = {
     id: generatorInvocation.name,
     version: generatorInvocation.version,
@@ -1202040,8 +1202068,10 @@ async function createJob({ projectConfig, workspace, organization, generatorInvo
     customConfig: generatorInvocation.config,
     publishMetadata: generatorInvocation.publishMetadata
   };
-  const generatorConfigsWithEnvVarSubstitutions = substituteEnvVariables(generatorConfig, context);
-  const whitelabelWithEnvVarSubstiutions = whitelabel != null ? substituteEnvVariables(whitelabel, context) : void 0;
+  const generatorConfigsWithEnvVarSubstitutions = substituteEnvVariables(generatorConfig, context, {
+    substituteAsEmpty: isPreview
+  });
+  const whitelabelWithEnvVarSubstiutions = whitelabel != null ? substituteEnvVariables(whitelabel, context, { substituteAsEmpty: isPreview }) : void 0;
   const remoteGenerationService = createFiddleService({ token: token.value });
   let fernDefinitionMetadata;
   if (generatorInvocation.outputMode.type.startsWith("github")) {

package/package.json

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