fern-api 0.19.23 → 0.19.24-rc2

package/bundle.cjs

@@ -827033,7 +827033,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "0.19.23",
+          version: "0.19.24-rc2",
           usingAccessToken: true
         }
       });
@@ -827095,7 +827095,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "0.19.23",
+        version: "0.19.24-rc2",
         ...event,
         ...event.properties
       }
@@ -839474,9 +839474,21 @@ function buildEnumTypeDeclaration(schema2) {
   if (schema2.description != null) {
     enumSchema.docs = schema2.description;
   }
+  const uniqueEnumName = /* @__PURE__ */ new Set();
+  const uniqueEnumSchema = {
+    ...enumSchema,
+    enum: []
+  };
+  for (const enumValue of enumSchema.enum) {
+    const name2 = typeof enumValue === "string" ? enumValue : enumValue.name ?? enumValue.value;
+    if (!uniqueEnumName.has(name2)) {
+      uniqueEnumSchema.enum.push(enumValue);
+      uniqueEnumName.add(name2);
+    }
+  }
   return {
     name: schema2.nameOverride ?? schema2.generatedName,
-    schema: enumSchema
+    schema: uniqueEnumSchema
   };
 }
 function buildReferenceTypeDeclaration({ schema: schema2, context, declarationFile }) {
@@ -842499,6 +842511,191 @@ function enumContainsValue({ schema: schema2, value }) {
   }).includes(value);
 }
 
+// pnp:/home/circleci/project/packages/cli/openapi-parser/lib/schema/utils/convertSchemaToSchemaWithExample.js
+function convertSchemaToSchemaWithExample(schema2) {
+  switch (schema2.type) {
+    case "object":
+      return SchemaWithExample.object({
+        allOf: schema2.allOf,
+        properties: schema2.properties.map((objectProperty) => convertToObjectProperty2(objectProperty)),
+        allOfPropertyConflicts: schema2.allOfPropertyConflicts,
+        description: schema2.description,
+        generatedName: schema2.generatedName,
+        nameOverride: schema2.nameOverride,
+        groupName: schema2.groupName,
+        fullExamples: void 0
+      });
+    case "array":
+      return SchemaWithExample.array({
+        description: schema2.description,
+        value: convertSchemaToSchemaWithExample(schema2.value),
+        generatedName: schema2.generatedName,
+        nameOverride: schema2.nameOverride,
+        groupName: schema2.groupName
+      });
+    case "enum":
+      return SchemaWithExample.enum({
+        description: schema2.description,
+        generatedName: schema2.generatedName,
+        nameOverride: schema2.nameOverride,
+        values: schema2.values,
+        groupName: schema2.groupName,
+        example: void 0
+      });
+    case "literal":
+      return SchemaWithExample.literal({
+        description: schema2.description,
+        value: schema2.value,
+        generatedName: schema2.generatedName,
+        nameOverride: schema2.nameOverride,
+        groupName: schema2.groupName
+      });
+    case "nullable":
+      return SchemaWithExample.nullable({
+        generatedName: schema2.generatedName,
+        nameOverride: schema2.nameOverride,
+        description: schema2.description,
+        value: convertSchemaToSchemaWithExample(schema2.value),
+        groupName: schema2.groupName
+      });
+    case "optional":
+      return SchemaWithExample.optional({
+        generatedName: schema2.generatedName,
+        nameOverride: schema2.nameOverride,
+        description: schema2.description,
+        value: convertSchemaToSchemaWithExample(schema2.value),
+        groupName: schema2.groupName
+      });
+    case "primitive":
+      return SchemaWithExample.primitive({
+        description: schema2.description,
+        schema: convertToPrimitiveSchemaValue2(schema2.schema),
+        generatedName: schema2.generatedName,
+        nameOverride: schema2.nameOverride,
+        groupName: schema2.groupName
+      });
+    case "map":
+      return SchemaWithExample.map({
+        description: schema2.description,
+        key: SchemaWithExample.primitive({
+          description: schema2.key.description,
+          schema: convertToPrimitiveSchemaValue2(schema2.key.schema),
+          generatedName: schema2.key.generatedName,
+          nameOverride: schema2.key.nameOverride,
+          groupName: schema2.groupName
+        }),
+        value: convertSchemaToSchemaWithExample(schema2.value),
+        generatedName: schema2.generatedName,
+        nameOverride: schema2.nameOverride,
+        groupName: schema2.groupName
+      });
+    case "reference":
+      return SchemaWithExample.reference({
+        description: schema2.description,
+        generatedName: schema2.generatedName,
+        nameOverride: schema2.nameOverride,
+        schema: schema2.schema,
+        groupName: schema2.groupName
+      });
+    case "oneOf":
+      return SchemaWithExample.oneOf(convertToOneOf2(schema2.value));
+    case "unknown":
+      return SchemaWithExample.unknown({
+        nameOverride: schema2.nameOverride,
+        generatedName: schema2.generatedName,
+        example: void 0,
+        groupName: void 0,
+        description: void 0
+      });
+    default:
+      assertNever(schema2);
+  }
+}
+function convertToOneOf2(oneOfSchema) {
+  switch (oneOfSchema.type) {
+    case "discriminated":
+      return OneOfSchemaWithExample.discriminated({
+        commonProperties: oneOfSchema.commonProperties.map((commonProperty) => {
+          return {
+            key: commonProperty.key,
+            schema: convertSchemaToSchemaWithExample(commonProperty.schema)
+          };
+        }),
+        description: oneOfSchema.description,
+        discriminantProperty: oneOfSchema.discriminantProperty,
+        generatedName: oneOfSchema.generatedName,
+        nameOverride: oneOfSchema.nameOverride,
+        schemas: Object.fromEntries(Object.entries(oneOfSchema.schemas).map(([discriminantValue, schemaWithExample]) => {
+          return [discriminantValue, convertSchemaToSchemaWithExample(schemaWithExample)];
+        })),
+        groupName: oneOfSchema.groupName
+      });
+    case "undisciminated":
+      return OneOfSchemaWithExample.undisciminated({
+        description: oneOfSchema.description,
+        generatedName: oneOfSchema.generatedName,
+        nameOverride: oneOfSchema.nameOverride,
+        schemas: oneOfSchema.schemas.map((oneOfSchema2) => convertSchemaToSchemaWithExample(oneOfSchema2)),
+        groupName: oneOfSchema.groupName
+      });
+    default:
+      assertNever(oneOfSchema);
+  }
+}
+function convertToPrimitiveSchemaValue2(primitiveSchema) {
+  switch (primitiveSchema.type) {
+    case "string":
+      return PrimitiveSchemaValueWithExample.string({
+        maxLength: primitiveSchema.maxLength,
+        minLength: primitiveSchema.minLength,
+        example: void 0
+      });
+    case "base64":
+      return PrimitiveSchemaValueWithExample.base64({
+        example: void 0
+      });
+    case "boolean":
+      return PrimitiveSchemaValueWithExample.boolean({
+        example: void 0
+      });
+    case "date":
+      return PrimitiveSchemaValueWithExample.date({
+        example: void 0
+      });
+    case "datetime":
+      return PrimitiveSchemaValueWithExample.datetime({
+        example: void 0
+      });
+    case "double":
+      return PrimitiveSchemaValueWithExample.double({
+        example: void 0
+      });
+    case "float":
+      return PrimitiveSchemaValueWithExample.float({
+        example: void 0
+      });
+    case "int":
+      return PrimitiveSchemaValueWithExample.int({
+        example: void 0
+      });
+    case "int64":
+      return PrimitiveSchemaValueWithExample.int64({
+        example: void 0
+      });
+    default:
+      assertNever(primitiveSchema);
+  }
+}
+function convertToObjectProperty2(objectProperty) {
+  return {
+    conflict: objectProperty.conflict,
+    generatedName: objectProperty.generatedName,
+    key: objectProperty.key,
+    schema: convertSchemaToSchemaWithExample(objectProperty.schema),
+    audiences: objectProperty.audiences
+  };
+}
+
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/schema/utils/isSchemaRequired.js
 function isSchemaRequired4(schema2) {
   return schema2.type !== "optional" && schema2.type !== "nullable";
@@ -842524,11 +842721,8 @@ var ExampleEndpointFactory = class {
     this.logger.debug(`Building endpoint example for ${endpoint.method.toUpperCase()} ${endpoint.path}`);
     const requestSchemaIdResponse = getRequestSchema(endpoint.request);
     const responseSchemaIdResponse = getResponseSchema(endpoint.response);
-    if ((requestSchemaIdResponse == null ? void 0 : requestSchemaIdResponse.type) === "unsupported" || (responseSchemaIdResponse == null ? void 0 : responseSchemaIdResponse.type) === "unsupported") {
-      return void 0;
-    }
     let requestExample = void 0;
-    if (requestSchemaIdResponse != null) {
+    if (requestSchemaIdResponse != null && requestSchemaIdResponse.type === "present") {
       const required = this.isSchemaRequired(requestSchemaIdResponse.schema);
       requestExample = this.exampleTypeFactory.buildExample({
         schema: requestSchemaIdResponse.schema,
@@ -842543,7 +842737,7 @@ var ExampleEndpointFactory = class {
       }
     }
     let responseExample = void 0;
-    if (responseSchemaIdResponse != null) {
+    if (responseSchemaIdResponse != null && responseSchemaIdResponse.type === "present") {
       const required = this.isSchemaRequired(responseSchemaIdResponse.schema);
       responseExample = this.exampleTypeFactory.buildExample({
         schema: responseSchemaIdResponse.schema,
@@ -842630,9 +842824,12 @@ var ExampleEndpointFactory = class {
         });
       }
     }
-    let exampleName = (_c3 = requestSchemaIdResponse == null ? void 0 : requestSchemaIdResponse.example) == null ? void 0 : _c3.name;
-    if (exampleName == null && (requestSchemaIdResponse == null ? void 0 : requestSchemaIdResponse.schema) != null) {
-      exampleName = getNameFromSchemaWithExample(requestSchemaIdResponse.schema);
+    let exampleName = void 0;
+    if ((requestSchemaIdResponse == null ? void 0 : requestSchemaIdResponse.type) === "present") {
+      exampleName = (_c3 = requestSchemaIdResponse == null ? void 0 : requestSchemaIdResponse.example) == null ? void 0 : _c3.name;
+      if (exampleName == null && (requestSchemaIdResponse == null ? void 0 : requestSchemaIdResponse.schema) != null) {
+        exampleName = getNameFromSchemaWithExample(requestSchemaIdResponse.schema);
+      }
     }
     const codeSamples = endpoint.examples.filter(hasIncompleteExample).flatMap((example) => example.codeSamples);
     return {
@@ -842665,10 +842862,17 @@ function getRequestSchema(request) {
   if (request == null) {
     return void 0;
   }
-  if (request.type !== "json") {
-    return { type: "unsupported" };
+  if (request.type === "multipart") {
+    return {
+      type: "present",
+      schema: convertMultipartRequestToSchema(request),
+      example: void 0
+    };
   }
-  return { type: "present", schema: request.schema, example: ((_a4 = request.fullExamples) == null ? void 0 : _a4[0]) ?? void 0 };
+  if (request.type === "json") {
+    return { type: "present", schema: request.schema, example: ((_a4 = request.fullExamples) == null ? void 0 : _a4[0]) ?? void 0 };
+  }
+  return { type: "unsupported" };
 }
 function getResponseSchema(response) {
   var _a4;
@@ -842733,6 +842937,60 @@ function getNameFromSchemaWithExample(schema2) {
       assertNever(schema2);
   }
 }
+function convertMultipartRequestToSchema(request) {
+  return SchemaWithExample.object({
+    properties: request.properties.map((property5) => {
+      if (property5.schema.type === "file") {
+        const innerSchema = SchemaWithExample.primitive({
+          schema: api_exports5.PrimitiveSchemaValueWithExample.string({
+            minLength: void 0,
+            maxLength: void 0,
+            example: void 0
+          }),
+          description: property5.description,
+          nameOverride: void 0,
+          generatedName: "",
+          groupName: void 0
+        });
+        const maybeArraySchema = property5.schema.isArray ? SchemaWithExample.array({
+          value: innerSchema,
+          groupName: void 0,
+          nameOverride: void 0,
+          generatedName: "",
+          description: void 0
+        }) : innerSchema;
+        const maybeOptionalSchema = property5.schema.isOptional ? SchemaWithExample.optional({
+          value: maybeArraySchema,
+          groupName: void 0,
+          nameOverride: void 0,
+          generatedName: "",
+          description: void 0
+        }) : maybeArraySchema;
+        return {
+          key: property5.key,
+          schema: maybeOptionalSchema,
+          audiences: [],
+          conflict: {},
+          generatedName: property5.key
+        };
+      }
+      return {
+        key: property5.key,
+        schema: convertSchemaToSchemaWithExample(property5.schema.value),
+        audiences: [],
+        conflict: {},
+        generatedName: property5.key
+      };
+    }).filter(isNonNullish),
+    allOf: [],
+    allOfPropertyConflicts: [],
+    fullExamples: void 0,
+    description: request.description,
+    nameOverride: void 0,
+    generatedName: "",
+    groupName: void 0
+  });
+}
 
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/asyncapi/ExampleWebsocketSessionFactory.js
 var ExampleWebsocketSessionFactory = class {
@@ -846170,7 +846428,8 @@ function getRequest({ declarationFile, context, request, requestNameOverride, ge
         headers,
         body: {
           properties
-        }
+        },
+        "content-type": "multipart/form-data"
       }
     };
   }
@@ -850865,10 +851124,10 @@ var CliContext = class {
     return "fern-api";
   }
   getPackageVersion() {
-    if ("0.19.23" == null) {
+    if ("0.19.24-rc2" == null) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "0.19.23";
+    return "0.19.24-rc2";
   }
   getCliName() {
     if ("fern" == null) {
@@ -851476,7 +851735,7 @@ function convertService(irService, ir) {
       response: irEndpoint.response != null ? convertResponse2(irEndpoint.response) : void 0,
       errors: convertResponseErrors(irEndpoint.errors, ir),
       errorsV2: convertResponseErrorsV2(irEndpoint.errors, ir),
-      examples: irEndpoint.examples.filter((example) => example.exampleType === "userProvided").map((example) => convertHttpEndpointExample(example, ir))
+      examples: irEndpoint.examples.filter((example) => example.exampleType === "userProvided").map((example) => convertHttpEndpointExample(example, irEndpoint, ir))
     };
   });
 }
@@ -851816,8 +852075,8 @@ function convertResponseErrorsV2(irResponseErrors, ir) {
   }
   return errors;
 }
-function convertHttpEndpointExample(irExample, ir) {
-  var _a4, _b3, _c3, _d;
+function convertHttpEndpointExample(irExample, irEndpoint, ir) {
+  var _a4, _b3, _c3, _d, _e;
   return {
     name: (_a4 = irExample.name) == null ? void 0 : _a4.originalName,
     description: irExample.docs ?? void 0,
@@ -851835,7 +852094,46 @@ function convertHttpEndpointExample(irExample, ir) {
       return headers;
     }, {}),
     requestBody: (_b3 = irExample.request) == null ? void 0 : _b3.jsonExample,
-    requestBodyV3: irExample.request != null ? { type: "json", value: irExample.request.jsonExample } : void 0,
+    requestBodyV3: (_c3 = irEndpoint.requestBody) == null ? void 0 : _c3._visit({
+      inlinedRequestBody: () => irExample.request != null ? { type: "json", value: irExample.request.jsonExample } : void 0,
+      reference: () => irExample.request != null ? { type: "json", value: irExample.request.jsonExample } : void 0,
+      fileUpload: (fileUploadSchema) => {
+        if (irExample.request == null) {
+          return void 0;
+        }
+        const value = {};
+        if (isPlainObject(irExample.request.jsonExample)) {
+          const fullExample = irExample.request.jsonExample;
+          for (const property5 of fileUploadSchema.properties) {
+            property5._visit({
+              file: (file) => {
+                if (file.type === "file") {
+                  value[file.key.wireValue] = {
+                    type: "filename",
+                    value: "<file1>"
+                  };
+                } else if (file.type === "fileArray") {
+                  value[file.key.wireValue] = {
+                    type: "filename",
+                    value: "<file1>"
+                  };
+                }
+              },
+              bodyProperty: (bodyProperty) => {
+                value[bodyProperty.name.wireValue] = {
+                  type: "json",
+                  value: fullExample[bodyProperty.name.wireValue]
+                };
+              },
+              _other: noop_default
+            });
+          }
+        }
+        return { type: "form", value };
+      },
+      bytes: () => void 0,
+      _other: () => void 0
+    }),
     responseStatusCode: api_exports4.http.ExampleResponse._visit(irExample.response, {
       ok: ({ body }) => body != null ? 200 : 204,
       error: ({ error: errorName }) => {
@@ -851849,9 +852147,9 @@ function convertHttpEndpointExample(irExample, ir) {
         throw new Error("Unknown ExampleResponse: " + irExample.response.type);
       }
     }),
-    responseBody: (_c3 = irExample.response.body) == null ? void 0 : _c3.jsonExample,
+    responseBody: (_d = irExample.response.body) == null ? void 0 : _d.jsonExample,
     responseBodyV3: irExample.response.body != null ? { type: "json", value: irExample.response.body.jsonExample } : void 0,
-    codeSamples: (_d = irExample.codeSamples) == null ? void 0 : _d.map((codeSample) => ExampleCodeSample._visit(codeSample, {
+    codeSamples: (_e = irExample.codeSamples) == null ? void 0 : _e.map((codeSample) => ExampleCodeSample._visit(codeSample, {
       language: (value) => {
         var _a5;
         return {
@@ -854347,6 +854645,9 @@ function convertExampleRequestBody({ endpoint, example, typeResolver, exampleRes
   if (requestType == null) {
     return void 0;
   }
+  if (typeof requestType === "string" && parseBytesRequest(requestType) != null) {
+    return void 0;
+  }
   if (!isInlineRequestBody(requestType)) {
     return ExampleRequestBody.reference(convertTypeReferenceExample({
       example: example.request,
@@ -854367,6 +854668,10 @@ function convertExampleRequestBody({ endpoint, example, typeResolver, exampleRes
   const exampleProperties = [];
   for (const [wireKey, propertyExample] of Object.entries(example.request)) {
     const inlinedRequestPropertyDeclaration = (_b3 = requestType.properties) == null ? void 0 : _b3[wireKey];
+    const inilnedRequestPropertyType = typeof inlinedRequestPropertyDeclaration === "string" ? inlinedRequestPropertyDeclaration : inlinedRequestPropertyDeclaration == null ? void 0 : inlinedRequestPropertyDeclaration.type;
+    if (inilnedRequestPropertyType != null && parseRawFileType(inilnedRequestPropertyType) != null) {
+      continue;
+    }
     if (inlinedRequestPropertyDeclaration != null) {
       exampleProperties.push({
         name: file.casingsGenerator.generateNameAndWireValue({
@@ -857089,7 +857394,7 @@ var TypeResolverImpl = class {
   resolveTypeOrThrow({ type: type2, file }) {
     const resolvedType = this.resolveType({ type: type2, file });
     if (resolvedType == null) {
-      throw new Error("Cannot resolve type: " + type2);
+      throw new Error("Cannot resolve type: " + type2 + " in file " + file.relativeFilepath);
     }
     return resolvedType;
   }

package/package.json

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