fern-api 0.19.28 → 0.19.29

package/bundle.cjs

@@ -823712,27 +823712,38 @@ async function convertGenerator({ absolutePathToGeneratorsConfiguration, generat
     absolutePathToLocalOutput: ((_a4 = generator.output) == null ? void 0 : _a4.location) === "local-file-system" ? resolve(dirname(absolutePathToGeneratorsConfiguration), generator.output.path) : void 0,
     language: getLanguageFromGeneratorName(generator.name),
     irVersionOverride: generator["ir-version"] ?? void 0,
-    publishMetadata: generator["publish-metadata"] != null ? convertPublishMetadata({ publishMetadata: generator["publish-metadata"] }) : void 0
+    publishMetadata: getPublishMetadata({ generatorInvocation: generator })
   };
 }
-function convertPublishMetadata({ publishMetadata }) {
-  return {
-    packageDescription: publishMetadata["package-description"],
-    publisherEmail: publishMetadata.email,
-    publisherName: publishMetadata.author,
-    referenceUrl: publishMetadata["reference-url"]
-  };
+function getPublishMetadata({ generatorInvocation }) {
+  const publishMetadata = generatorInvocation["publish-metadata"];
+  if (publishMetadata != null) {
+    return {
+      packageDescription: publishMetadata["package-description"],
+      publisherEmail: publishMetadata.email,
+      publisherName: publishMetadata.author,
+      referenceUrl: publishMetadata["reference-url"]
+    };
+  } else if (generatorInvocation.metadata != null) {
+    return {
+      packageDescription: generatorInvocation.metadata["package-description"],
+      publisherEmail: generatorInvocation.metadata.email,
+      publisherName: generatorInvocation.metadata.author,
+      referenceUrl: generatorInvocation.metadata["reference-url"]
+    };
+  }
+  return void 0;
 }
 async function convertOutputMode({ absolutePathToGeneratorsConfiguration, generator }) {
-  var _a4;
   if (generator.github != null) {
     const indexOfFirstSlash = generator.github.repository.indexOf("/");
     const owner = generator.github.repository.slice(0, indexOfFirstSlash);
     const repo = generator.github.repository.slice(indexOfFirstSlash + 1);
     const publishInfo = generator.output != null ? getGithubPublishInfo(generator.output) : void 0;
-    const license = generator.github.license != null ? await getGithubLicense({
+    const licenseSchema = getGithubLicenseSchema(generator);
+    const license = licenseSchema != null ? await getGithubLicense({
       absolutePathToGeneratorsConfiguration,
-      githubLicense: ((_a4 = generator["publish-metadata"]) == null ? void 0 : _a4.license) ?? generator.github.license
+      githubLicense: licenseSchema
     }) : void 0;
     const mode = generator.github.mode ?? "release";
     switch (mode) {
@@ -823776,9 +823787,8 @@ async function convertOutputMode({ absolutePathToGeneratorsConfiguration, genera
         token: generator.output.token ?? ""
       }));
     case "maven": {
-      const hasSignature = generator.output.signature != null;
       return import_fiddle_sdk.FernFiddle.OutputMode.publishV2(import_fiddle_sdk.FernFiddle.remoteGen.PublishOutputModeV2.mavenOverride({
-        registryUrl: generator.output.url ?? hasSignature ? "https://oss.sonatype.org/service/local/staging/deploy/maven2/" : "https://s01.oss.sonatype.org/content/repositories/releases/",
+        registryUrl: getMavenRegistryUrl(generator.output),
         username: generator.output.username ?? "",
         password: generator.output.password ?? "",
         coordinate: generator.output.coordinate,
@@ -823845,7 +823855,7 @@ function getGithubPublishInfo(output) {
       });
     case "maven":
       return import_fiddle_sdk.FernFiddle.GithubPublishInfo.maven({
-        registryUrl: output.url ?? output.signature != null ? "https://oss.sonatype.org/service/local/staging/deploy/maven2/" : "https://s01.oss.sonatype.org/content/repositories/releases/",
+        registryUrl: getMavenRegistryUrl(output),
         coordinate: output.coordinate,
         credentials: output.username != null && output.password != null ? {
           username: output.username,
@@ -823903,6 +823913,21 @@ function getLanguageFromGeneratorName(generatorName) {
   }
   return void 0;
 }
+function getMavenRegistryUrl(maven) {
+  if (maven.url != null) {
+    return maven.url;
+  }
+  return maven.signature != null ? "https://oss.sonatype.org/service/local/staging/deploy/maven2/" : "https://s01.oss.sonatype.org/content/repositories/releases/";
+}
+function getGithubLicenseSchema(generator) {
+  var _a4, _b3, _c3;
+  if (((_a4 = generator["publish-metadata"]) == null ? void 0 : _a4.license) != null) {
+    return generator["publish-metadata"].license;
+  } else if (((_b3 = generator.metadata) == null ? void 0 : _b3.license) != null) {
+    return generator.metadata.license;
+  }
+  return (_c3 = generator.github) == null ? void 0 : _c3.license;
+}
 
 // pnp:/home/circleci/project/packages/cli/configuration/lib/generators-yml/loadGeneratorsConfiguration.js
 async function loadRawGeneratorsConfiguration({ absolutePathToWorkspace, context }) {
@@ -827127,7 +827152,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "0.19.28",
+          version: "0.19.29",
           usingAccessToken: true
         }
       });
@@ -827189,7 +827214,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "0.19.28",
+        version: "0.19.29",
         ...event,
         ...event.properties
       }
@@ -838178,6 +838203,7 @@ __export(schemas_exports3, {
   BasicAuthSchemeSchema: () => BasicAuthSchemeSchema,
   BearerAuthSchemeSchema: () => BearerAuthSchemeSchema,
   CasingOverridesSchema: () => CasingOverridesSchema,
+  CursorPaginationSchema: () => CursorPaginationSchema,
   DeclarationSchema: () => DeclarationSchema,
   DeclarationWithoutDocsSchema: () => DeclarationWithoutDocsSchema,
   DefinitionFileSchema: () => DefinitionFileSchema,
@@ -838212,6 +838238,7 @@ __export(schemas_exports3, {
   MultipleBaseUrlsEnvironmentSchema: () => MultipleBaseUrlsEnvironmentSchema,
   ObjectPropertySchema: () => ObjectPropertySchema,
   ObjectSchema: () => ObjectSchema,
+  OffsetPaginationSchema: () => OffsetPaginationSchema,
   PackageMarkerFileSchema: () => PackageMarkerFileSchema,
   PaginationSchema: () => PaginationSchema,
   PropertyErrorDiscriminationSchema: () => PropertyErrorDiscriminationSchema,
@@ -838341,6 +838368,13 @@ var CasingOverridesSchema = z.object({
   "screaming-snake": z.optional(z.string())
 });
 
+// pnp:/home/circleci/project/packages/cli/yaml/yaml-schema/lib/schemas/CursorPaginationSchema.js
+var CursorPaginationSchema = z.object({
+  cursor: z.string().describe("The path to the request property for the cursor."),
+  next_cursor: z.string().describe("The path to the response property for the next cursor."),
+  results: z.string().describe("The path to the response property for the page elements.")
+});
+
 // pnp:/home/circleci/project/packages/cli/yaml/yaml-schema/lib/schemas/ObjectExtendsSchema.js
 var ObjectExtendsSchema = z.union([z.string(), z.array(z.string())]);
 
@@ -838584,19 +838618,10 @@ var HttpResponseStreamSchema = WithDocsSchema.extend({
   terminator: z.optional(z.string())
 });
 
-// pnp:/home/circleci/project/packages/cli/yaml/yaml-schema/lib/schemas/CursorPaginationSchema.js
-var CursorPaginationSchema = z.object({
-  type: z.literal("cursor").describe("Configures cursor auto-pagination."),
-  page: z.string().describe("The request property name that represents the page cursor."),
-  next: z.string().describe("The response property name that represents the next page cursor to retrieve."),
-  results: z.string().describe("The response property name that represents the page elements.")
-});
-
 // pnp:/home/circleci/project/packages/cli/yaml/yaml-schema/lib/schemas/OffsetPaginationSchema.js
 var OffsetPaginationSchema = z.object({
-  type: z.literal("offset").describe("Configures offset auto-pagination."),
-  page: z.string().describe("The request property name that represents the page offset."),
-  results: z.string().describe("The response property name that represents the page elements.")
+  offset: z.string().describe("The path to the request property for the page offset."),
+  results: z.string().describe("The path to the response property for the page elements.")
 });
 
 // pnp:/home/circleci/project/packages/cli/yaml/yaml-schema/lib/schemas/PaginationSchema.js
@@ -851222,10 +851247,10 @@ var CliContext = class {
     return "fern-api";
   }
   getPackageVersion() {
-    if ("0.19.28" == null) {
+    if ("0.19.29" == null) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "0.19.28";
+    return "0.19.29";
   }
   getCliName() {
     if ("fern" == null) {
@@ -854656,6 +854681,29 @@ function convertSingleUnionType({ rawValueType, rawSingleUnionType, fileContaini
   }
 }
 
+// pnp:/home/circleci/project/packages/cli/generation/ir-generator/lib/converters/services/convertQueryParameter.js
+async function convertQueryParameter({ file, queryParameterKey, queryParameter }) {
+  const { name: name2 } = getQueryParameterName({ queryParameterKey, queryParameter });
+  const valueType = file.parseTypeReference(queryParameter);
+  return {
+    ...await convertDeclaration(queryParameter),
+    name: file.casingsGenerator.generateNameAndWireValue({
+      wireValue: queryParameterKey,
+      name: name2
+    }),
+    valueType,
+    allowMultiple: typeof queryParameter !== "string" && queryParameter["allow-multiple"] != null ? queryParameter["allow-multiple"] : false
+  };
+}
+function getQueryParameterName({ queryParameterKey, queryParameter }) {
+  if (typeof queryParameter !== "string") {
+    if (queryParameter.name != null) {
+      return { name: queryParameter.name, wasExplicitlySet: true };
+    }
+  }
+  return { name: queryParameterKey, wasExplicitlySet: false };
+}
+
 // pnp:/home/circleci/project/packages/cli/generation/ir-generator/lib/converters/services/convertExampleEndpointCall.js
 function convertExampleEndpointCall2({ service, endpoint, example, typeResolver, errorResolver, exampleResolver, variableResolver, file, workspace }) {
   var _a4;
@@ -854999,6 +855047,76 @@ function buildUrl({ service, endpoint, example, pathParams }) {
   return url;
 }
 
+// pnp:/home/circleci/project/packages/cli/generation/ir-generator/lib/converters/services/getObjectPropertyFromResolvedType.js
+async function getObjectPropertyFromResolvedType({ typeResolver, file, resolvedType, property: property5 }) {
+  switch (resolvedType._type) {
+    case "container":
+      if (resolvedType.container._type === "optional") {
+        return await getObjectPropertyFromResolvedType({
+          typeResolver,
+          file,
+          resolvedType: resolvedType.container.itemType,
+          property: property5
+        });
+      }
+      break;
+    case "named":
+      if (isRawObjectDefinition(resolvedType.declaration)) {
+        return await getObjectPropertyFromObjectSchema({
+          typeResolver,
+          file: resolvedType.file,
+          objectSchema: resolvedType.declaration,
+          property: property5
+        });
+      }
+      break;
+    case "primitive":
+    case "unknown":
+      break;
+    default:
+      assertNever(resolvedType);
+  }
+  throw new Error("Internal error; response must be an object in order to return a property as a response");
+}
+async function getObjectPropertyFromObjectSchema({ typeResolver, file, objectSchema, property: property5 }) {
+  const properties = await getAllPropertiesForRawObjectSchema(objectSchema, file, typeResolver);
+  const objectProperty = properties[property5];
+  if (objectProperty == null) {
+    throw new Error(`Response does not have a property named ${property5}.`);
+  }
+  return objectProperty;
+}
+async function getAllPropertiesForRawObjectSchema(objectSchema, file, typeResolver) {
+  let extendedTypes = [];
+  if (typeof objectSchema.extends === "string") {
+    extendedTypes = [objectSchema.extends];
+  } else if (Array.isArray(objectSchema.extends)) {
+    extendedTypes = objectSchema.extends;
+  }
+  const properties = {};
+  for (const extendedType of extendedTypes) {
+    const extendedProperties = await getAllPropertiesForExtendedType(extendedType, file, typeResolver);
+    Object.entries(extendedProperties).map(([propertyKey, objectProperty]) => {
+      properties[propertyKey] = objectProperty;
+    });
+  }
+  const objectProperties = await getObjectPropertiesFromRawObjectSchema(objectSchema, file);
+  objectProperties.forEach((objectProperty) => {
+    properties[objectProperty.name.name.originalName] = objectProperty;
+  });
+  return properties;
+}
+async function getAllPropertiesForExtendedType(extendedType, file, typeResolver) {
+  const resolvedType = typeResolver.resolveNamedTypeOrThrow({
+    referenceToNamedType: extendedType,
+    file
+  });
+  if (resolvedType._type === "named" && isRawObjectDefinition(resolvedType.declaration)) {
+    return await getAllPropertiesForRawObjectSchema(resolvedType.declaration, file, typeResolver);
+  }
+  throw new Error(`Extended type ${extendedType} must be another named type`);
+}
+
 // pnp:/home/circleci/project/packages/cli/generation/ir-generator/lib/converters/services/convertHttpResponse.js
 async function convertHttpResponse({ endpoint, file, typeResolver }) {
   const { response, ["response-stream"]: responseStream } = endpoint;
@@ -855045,7 +855163,12 @@ async function convertJsonResponse(response, docs, file, typeResolver) {
     return HttpResponse.json(JsonResponse.nestedPropertyAsResponse({
       docs,
       responseBodyType,
-      responseProperty: await getObjectPropertyFromResolvedType(resolvedType, responseProperty, file, typeResolver)
+      responseProperty: await getObjectPropertyFromResolvedType({
+        typeResolver,
+        file,
+        resolvedType,
+        property: responseProperty
+      })
     }));
   }
   return HttpResponse.json(JsonResponse.response({
@@ -855053,35 +855176,88 @@ async function convertJsonResponse(response, docs, file, typeResolver) {
     responseBodyType
   }));
 }
-async function getObjectPropertyFromResolvedType(resolvedType, property5, file, typeResolver) {
-  switch (resolvedType._type) {
-    case "container":
-      if (resolvedType.container._type === "optional") {
-        return await getObjectPropertyFromResolvedType(resolvedType.container.itemType, property5, file, typeResolver);
-      }
-      break;
-    case "named":
-      if (isRawObjectDefinition2(resolvedType.declaration)) {
-        return await getObjectPropertyFromObjectSchema(resolvedType.declaration, property5, resolvedType.file, typeResolver);
-      }
-      break;
-    case "primitive":
-    case "unknown":
-      break;
-    default:
-      assertNever(resolvedType);
+
+// pnp:/home/circleci/project/packages/cli/generation/ir-generator/lib/converters/services/convertPaginationUtils.js
+function getPaginationPropertyComponents(endpointPagination) {
+  if (isRawOffsetPaginationSchema(endpointPagination)) {
+    return {
+      type: "offset",
+      offset: getRequestProperty(endpointPagination.offset),
+      results: getResponsePropertyComponents(endpointPagination.results)
+    };
   }
-  throw new Error("Internal error; response must be an object in order to return a property as a response");
+  return {
+    type: "cursor",
+    cursor: getRequestProperty(endpointPagination.cursor),
+    next_cursor: getResponsePropertyComponents(endpointPagination.next_cursor),
+    results: getResponsePropertyComponents(endpointPagination.results)
+  };
 }
-async function getObjectPropertyFromObjectSchema(objectSchema, property5, file, typeResolver) {
-  const properties = await getAllPropertiesForRawObjectSchema(objectSchema, file, typeResolver);
-  const objectProperty = properties[property5];
-  if (objectProperty == null) {
+async function getNestedObjectPropertyFromResolvedType({ typeResolver, file, resolvedType, propertyComponents }) {
+  if (propertyComponents.length === 0) {
+    return void 0;
+  }
+  if (propertyComponents.length === 1) {
+    return await getObjectPropertyFromResolvedType({
+      typeResolver,
+      file,
+      resolvedType,
+      property: propertyComponents[0] ?? ""
+    });
+  }
+  const objectSchema = maybeObjectSchema(resolvedType);
+  if (objectSchema == null) {
+    return void 0;
+  }
+  const propertyType = await getPropertyTypeFromObjectSchema({
+    typeResolver,
+    file,
+    objectSchema,
+    property: propertyComponents[0] ?? ""
+  });
+  const resolvedTypeProperty = typeResolver.resolveTypeOrThrow({
+    type: propertyType,
+    file
+  });
+  return getNestedObjectPropertyFromResolvedType({
+    typeResolver,
+    file: maybeFileFromResolvedType(resolvedTypeProperty) ?? file,
+    resolvedType: resolvedTypeProperty,
+    propertyComponents: propertyComponents.slice(1)
+  });
+}
+function resolveResponseType({ endpoint, typeResolver, file }) {
+  var _a4;
+  return typeResolver.resolveTypeOrThrow({
+    type: (typeof endpoint.response !== "string" ? (_a4 = endpoint.response) == null ? void 0 : _a4.type : endpoint.response) ?? "",
+    file
+  });
+}
+function maybeFileFromResolvedType(resolvedType) {
+  if (resolvedType == null) {
+    return void 0;
+  }
+  if (resolvedType._type === "named") {
+    return resolvedType.file;
+  }
+  if (resolvedType._type === "container" && resolvedType.container._type === "optional") {
+    return maybeFileFromResolvedType(resolvedType.container.itemType);
+  }
+  return void 0;
+}
+async function getPropertyTypeFromObjectSchema({ typeResolver, file, objectSchema, property: property5 }) {
+  const properties = await getAllPropertiesForRawObjectSchema2({
+    typeResolver,
+    file,
+    objectSchema
+  });
+  const propertyType = properties[property5];
+  if (propertyType == null) {
     throw new Error(`Response does not have a property named ${property5}.`);
   }
-  return objectProperty;
+  return propertyType;
 }
-async function getAllPropertiesForRawObjectSchema(objectSchema, file, typeResolver) {
+async function getAllPropertiesForRawObjectSchema2({ typeResolver, file, objectSchema }) {
   let extendedTypes = [];
   if (typeof objectSchema.extends === "string") {
     extendedTypes = [objectSchema.extends];
@@ -855090,29 +855266,165 @@ async function getAllPropertiesForRawObjectSchema(objectSchema, file, typeResolv
   }
   const properties = {};
   for (const extendedType of extendedTypes) {
-    const extendedProperties = await getAllPropertiesForExtendedType(extendedType, file, typeResolver);
-    Object.entries(extendedProperties).map(([propertyKey, objectProperty]) => {
-      properties[propertyKey] = objectProperty;
+    const extendedProperties = await getAllPropertiesForExtendedType2({
+      typeResolver,
+      file,
+      extendedType
+    });
+    Object.entries(extendedProperties).map(([propertyKey, propertyType]) => {
+      properties[propertyKey] = propertyType;
+    });
+  }
+  if (objectSchema.properties != null) {
+    Object.entries(objectSchema.properties).map(([propertyKey, propertyType]) => {
+      properties[propertyKey] = typeof propertyType === "string" ? propertyType : propertyType.type;
     });
   }
-  const objectProperties = await getObjectPropertiesFromRawObjectSchema(objectSchema, file);
-  objectProperties.forEach((objectProperty) => {
-    properties[objectProperty.name.name.originalName] = objectProperty;
-  });
   return properties;
 }
-async function getAllPropertiesForExtendedType(extendedType, file, typeResolver) {
+async function getAllPropertiesForExtendedType2({ typeResolver, file, extendedType }) {
   const resolvedType = typeResolver.resolveNamedTypeOrThrow({
     referenceToNamedType: extendedType,
     file
   });
-  if (resolvedType._type === "named" && isRawObjectDefinition2(resolvedType.declaration)) {
-    return await getAllPropertiesForRawObjectSchema(resolvedType.declaration, file, typeResolver);
+  if (resolvedType._type === "named" && isRawObjectDefinition(resolvedType.declaration)) {
+    return await getAllPropertiesForRawObjectSchema2({
+      typeResolver,
+      file: maybeFileFromResolvedType(resolvedType) ?? file,
+      objectSchema: resolvedType.declaration
+    });
   }
-  throw new Error(`Extended type ${extendedType} must be another named type`);
+  throw new Error(`Extended type ${extendedType} must be another named type.`);
 }
-function isRawObjectDefinition2(namedDeclaration) {
-  return namedDeclaration.extends != null || namedDeclaration.properties != null;
+function maybeObjectSchema(resolvedType) {
+  if (resolvedType == null) {
+    return void 0;
+  }
+  if (resolvedType._type === "named" && isRawObjectDefinition(resolvedType.declaration)) {
+    return resolvedType.declaration;
+  }
+  if (resolvedType._type === "container" && resolvedType.container._type === "optional") {
+    return maybeObjectSchema(resolvedType.container.itemType);
+  }
+  return void 0;
+}
+function getRequestProperty(value) {
+  return value.substring("$request.".length);
+}
+function getResponsePropertyComponents(value) {
+  const trimmed = value.substring("$response.".length);
+  return (trimmed == null ? void 0 : trimmed.split(".")) ?? [];
+}
+function isRawOffsetPaginationSchema(rawPaginationSchema) {
+  return rawPaginationSchema.offset != null && rawPaginationSchema.results != null;
+}
+
+// pnp:/home/circleci/project/packages/cli/generation/ir-generator/lib/converters/services/convertCursorPagination.js
+async function convertCursorPagination({ typeResolver, file, endpointSchema, paginationPropertyComponents }) {
+  var _a4, _b3, _c3;
+  const queryParameterSchema = typeof endpointSchema.request !== "string" && ((_a4 = endpointSchema.request) == null ? void 0 : _a4["query-parameters"]) != null ? (_c3 = (_b3 = endpointSchema == null ? void 0 : endpointSchema.request) == null ? void 0 : _b3["query-parameters"]) == null ? void 0 : _c3[paginationPropertyComponents.cursor] : void 0;
+  if (queryParameterSchema == null) {
+    return void 0;
+  }
+  const resolvedResponseType = resolveResponseType({
+    typeResolver,
+    file,
+    endpoint: endpointSchema
+  });
+  const nextCursorObjectProperty = await getNestedObjectPropertyFromResolvedType({
+    typeResolver,
+    file: maybeFileFromResolvedType(resolvedResponseType) ?? file,
+    resolvedType: resolvedResponseType,
+    propertyComponents: paginationPropertyComponents.next_cursor
+  });
+  if (nextCursorObjectProperty == null) {
+    return void 0;
+  }
+  const resultsObjectProperty = await getNestedObjectPropertyFromResolvedType({
+    typeResolver,
+    file: maybeFileFromResolvedType(resolvedResponseType) ?? file,
+    resolvedType: resolvedResponseType,
+    propertyComponents: paginationPropertyComponents.results
+  });
+  if (resultsObjectProperty == null) {
+    return void 0;
+  }
+  return Pagination.cursor({
+    page: await convertQueryParameter({
+      file,
+      queryParameterKey: paginationPropertyComponents.cursor,
+      queryParameter: queryParameterSchema
+    }),
+    next: {
+      propertyPath: paginationPropertyComponents.next_cursor.map((property5) => file.casingsGenerator.generateName(property5)),
+      property: nextCursorObjectProperty
+    },
+    results: {
+      propertyPath: paginationPropertyComponents.results.map((property5) => file.casingsGenerator.generateName(property5)),
+      property: resultsObjectProperty
+    }
+  });
+}
+
+// pnp:/home/circleci/project/packages/cli/generation/ir-generator/lib/converters/services/convertOffsetPagination.js
+async function convertOffsetPagination({ typeResolver, file, endpointSchema, paginationPropertyComponents }) {
+  var _a4, _b3, _c3;
+  const queryParameterSchema = typeof endpointSchema.request !== "string" && ((_a4 = endpointSchema.request) == null ? void 0 : _a4["query-parameters"]) != null ? (_c3 = (_b3 = endpointSchema == null ? void 0 : endpointSchema.request) == null ? void 0 : _b3["query-parameters"]) == null ? void 0 : _c3[paginationPropertyComponents.offset] : void 0;
+  if (queryParameterSchema == null) {
+    return void 0;
+  }
+  const resolvedResponseType = resolveResponseType({
+    typeResolver,
+    file,
+    endpoint: endpointSchema
+  });
+  const resultsObjectProperty = await getNestedObjectPropertyFromResolvedType({
+    typeResolver,
+    file: maybeFileFromResolvedType(resolvedResponseType) ?? file,
+    resolvedType: resolvedResponseType,
+    propertyComponents: paginationPropertyComponents.results
+  });
+  if (resultsObjectProperty == null) {
+    return void 0;
+  }
+  return Pagination.offset({
+    page: await convertQueryParameter({
+      file,
+      queryParameterKey: paginationPropertyComponents.offset,
+      queryParameter: queryParameterSchema
+    }),
+    results: {
+      propertyPath: paginationPropertyComponents.results.map((property5) => file.casingsGenerator.generateName(property5)),
+      property: resultsObjectProperty
+    }
+  });
+}
+
+// pnp:/home/circleci/project/packages/cli/generation/ir-generator/lib/converters/services/convertPagination.js
+async function convertPagination({ typeResolver, file, endpointSchema }) {
+  const endpointPagination = typeof endpointSchema.pagination === "boolean" ? file.rootApiFile.pagination : endpointSchema.pagination;
+  if (!endpointPagination) {
+    return void 0;
+  }
+  const paginationPropertyComponents = getPaginationPropertyComponents(endpointPagination);
+  switch (paginationPropertyComponents.type) {
+    case "cursor":
+      return await convertCursorPagination({
+        typeResolver,
+        file,
+        endpointSchema,
+        paginationPropertyComponents
+      });
+    case "offset":
+      return convertOffsetPagination({
+        typeResolver,
+        file,
+        endpointSchema,
+        paginationPropertyComponents
+      });
+    default:
+      assertNever(paginationPropertyComponents);
+  }
 }
 
 // pnp:/home/circleci/project/packages/cli/generation/ir-generator/lib/converters/services/convertResponseErrors.js
@@ -855139,7 +855451,7 @@ async function convertHttpService({ rootPathParameters, serviceDefinition, file,
     variableResolver
   });
   const serviceName = { fernFilepath: file.fernFilepath };
-  return {
+  const service = {
     availability: convertAvailability(serviceDefinition.availability),
     name: serviceName,
     displayName: serviceDefinition["display-name"] ?? void 0,
@@ -855168,17 +855480,11 @@ async function convertHttpService({ rootPathParameters, serviceDefinition, file,
         pathParameters: endpointPathParameters,
         allPathParameters: [...rootPathParameters, ...servicePathParameters, ...endpointPathParameters],
         queryParameters: typeof endpoint.request !== "string" && ((_a4 = endpoint.request) == null ? void 0 : _a4["query-parameters"]) != null ? await Promise.all(Object.entries(endpoint.request["query-parameters"]).map(async ([queryParameterKey, queryParameter]) => {
-          const { name: name2 } = getQueryParameterName({ queryParameterKey, queryParameter });
-          const valueType = file.parseTypeReference(queryParameter);
-          return {
-            ...await convertDeclaration(queryParameter),
-            name: file.casingsGenerator.generateNameAndWireValue({
-              wireValue: queryParameterKey,
-              name: name2
-            }),
-            valueType,
-            allowMultiple: typeof queryParameter !== "string" && queryParameter["allow-multiple"] != null ? queryParameter["allow-multiple"] : false
-          };
+          return await convertQueryParameter({
+            file,
+            queryParameterKey,
+            queryParameter
+          });
         })) : [],
         headers: typeof endpoint.request !== "string" && ((_b3 = endpoint.request) == null ? void 0 : _b3.headers) != null ? await Promise.all(Object.entries(endpoint.request.headers).map(([headerKey, header]) => convertHttpHeader({ headerKey, header, file }))) : [],
         requestBody: convertHttpRequestBody({ request: endpoint.request, file }),
@@ -855201,12 +855507,17 @@ async function convertHttpService({ rootPathParameters, serviceDefinition, file,
           file,
           workspace
         })) : [],
-        pagination: void 0
+        pagination: await convertPagination({
+          typeResolver,
+          file,
+          endpointSchema: endpoint
+        })
       };
       httpEndpoint.id = IdGenerator.generateEndpointId(serviceName, httpEndpoint);
       return httpEndpoint;
     }))
   };
+  return service;
 }
 async function convertPathParameters2({ pathParameters, location: location2, file, variableResolver }) {
   if (pathParameters == null) {
@@ -855267,14 +855578,6 @@ function resolvePathParameter({ parameter, variableResolver, file }) {
     };
   }
 }
-function getQueryParameterName({ queryParameterKey, queryParameter }) {
-  if (typeof queryParameter !== "string") {
-    if (queryParameter.name != null) {
-      return { name: queryParameter.name, wasExplicitlySet: true };
-    }
-  }
-  return { name: queryParameterKey, wasExplicitlySet: false };
-}
 function convertHttpMethod2(method2) {
   switch (method2) {
     case "GET":
@@ -859596,7 +859899,7 @@ function resolvedTypeHasProperty(resolvedType, property5, file, typeResolver) {
       }
       return resolvedTypeHasProperty(resolvedType.container.itemType, property5, file, typeResolver);
     case "named":
-      if (!isRawObjectDefinition3(resolvedType.declaration)) {
+      if (!isRawObjectDefinition2(resolvedType.declaration)) {
         return Result.IsNotObject;
       }
       if (rawObjectSchemaHasProperty(resolvedType.declaration, property5, file, typeResolver)) {
@@ -859611,10 +859914,10 @@ function resolvedTypeHasProperty(resolvedType, property5, file, typeResolver) {
   }
 }
 function rawObjectSchemaHasProperty(objectSchema, property5, file, typeResolver) {
-  const properties = getAllPropertiesForRawObjectSchema2(objectSchema, file, typeResolver);
+  const properties = getAllPropertiesForRawObjectSchema3(objectSchema, file, typeResolver);
   return properties.has(property5);
 }
-function getAllPropertiesForRawObjectSchema2(objectSchema, file, typeResolver) {
+function getAllPropertiesForRawObjectSchema3(objectSchema, file, typeResolver) {
   let extendedTypes = [];
   if (typeof objectSchema.extends === "string") {
     extendedTypes = [objectSchema.extends];
@@ -859623,7 +859926,7 @@ function getAllPropertiesForRawObjectSchema2(objectSchema, file, typeResolver) {
   }
   const properties = /* @__PURE__ */ new Set();
   for (const extendedType of extendedTypes) {
-    for (const extendedProperty of getAllPropertiesForExtendedType2(extendedType, file, typeResolver)) {
+    for (const extendedProperty of getAllPropertiesForExtendedType3(extendedType, file, typeResolver)) {
       properties.add(extendedProperty);
     }
   }
@@ -859632,17 +859935,17 @@ function getAllPropertiesForRawObjectSchema2(objectSchema, file, typeResolver) {
   }
   return properties;
 }
-function getAllPropertiesForExtendedType2(extendedType, file, typeResolver) {
+function getAllPropertiesForExtendedType3(extendedType, file, typeResolver) {
   const resolvedType = typeResolver.resolveNamedTypeOrThrow({
     referenceToNamedType: extendedType,
     file
   });
-  if (resolvedType._type === "named" && isRawObjectDefinition3(resolvedType.declaration)) {
-    return getAllPropertiesForRawObjectSchema2(resolvedType.declaration, file, typeResolver);
+  if (resolvedType._type === "named" && isRawObjectDefinition2(resolvedType.declaration)) {
+    return getAllPropertiesForRawObjectSchema3(resolvedType.declaration, file, typeResolver);
   }
   return /* @__PURE__ */ new Set();
 }
-function isRawObjectDefinition3(namedDeclaration) {
+function isRawObjectDefinition2(namedDeclaration) {
   return namedDeclaration.extends != null || namedDeclaration.properties != null;
 }
 
@@ -860582,6 +860885,422 @@ var ValidNavigationRule = {
   }
 };
 
+// pnp:/home/circleci/project/packages/cli/yaml/validator/lib/rules/valid-pagination/validateUtils.js
+var REQUEST_PREFIX2 = "$request.";
+var RESPONSE_PREFIX = "$response.";
+function validateResultsProperty({ endpointId, typeResolver, file, resolvedResponseType, resultsProperty }) {
+  return validateResponseProperty({
+    endpointId,
+    typeResolver,
+    file,
+    resolvedResponseType,
+    responseProperty: resultsProperty,
+    propertyValidator: {
+      propertyID: "results",
+      validate: isValidResultsProperty
+    }
+  });
+}
+function validateQueryParameterProperty({ endpointId, endpoint, typeResolver, file, queryParameterProperty, propertyValidator }) {
+  var _a4;
+  const violations = [];
+  const queryPropertyComponents = getRequestPropertyComponents(queryParameterProperty);
+  if (queryPropertyComponents == null) {
+    violations.push({
+      severity: "error",
+      message: `Pagination configuration for endpoint ${source_default.bold(endpointId)} must define a dot-delimited '${propertyValidator.propertyID}' property starting with $request (e.g. $request.${propertyValidator.propertyID}).`
+    });
+    return violations;
+  }
+  const queryPropertyName = queryPropertyComponents == null ? void 0 : queryPropertyComponents[0];
+  if (queryPropertyName == null || queryPropertyComponents.length !== 1) {
+    violations.push({
+      severity: "error",
+      message: `Pagination configuration for endpoint ${source_default.bold(endpointId)} is only compatible with '${propertyValidator.propertyID}' properties that are defined as query parameters (e.g. $request.${propertyValidator.propertyID}).`
+    });
+    return violations;
+  }
+  const queryParameters = typeof endpoint.request !== "string" ? (_a4 = endpoint.request) == null ? void 0 : _a4["query-parameters"] : null;
+  if (queryParameters == null) {
+    violations.push({
+      severity: "error",
+      message: `Pagination configuration for endpoint ${source_default.bold(endpointId)} specifies '${propertyValidator.propertyID}' ${queryParameterProperty}, but that query parameter does not exist.`
+    });
+    return violations;
+  }
+  const queryParameter = queryParameters[queryPropertyName];
+  if (queryParameter == null) {
+    violations.push({
+      severity: "error",
+      message: `Pagination configuration for endpoint ${source_default.bold(endpointId)} specifies '${propertyValidator.propertyID}' ${queryParameterProperty}, but that query parameter does not exist.`
+    });
+    return violations;
+  }
+  const queryParameterType = typeof queryParameter !== "string" ? queryParameter.type : queryParameter;
+  const resolvedQueryParameterType = typeResolver.resolveType({
+    type: queryParameterType,
+    file
+  });
+  if (!propertyValidator.validate({
+    typeResolver,
+    file: maybeFileFromResolvedType2(resolvedQueryParameterType) ?? file,
+    resolvedType: resolvedQueryParameterType,
+    propertyComponents: queryPropertyComponents.slice(1)
+  })) {
+    violations.push({
+      severity: "error",
+      message: `Pagination configuration for endpoint ${source_default.bold(endpointId)} specifies '${propertyValidator.propertyID}' ${queryParameterProperty}, which is not a valid '${propertyValidator.propertyID}' type.`
+    });
+  }
+  return violations;
+}
+function validateResponseProperty({ endpointId, typeResolver, file, resolvedResponseType, responseProperty, propertyValidator }) {
+  const violations = [];
+  const responsePropertyComponents = getResponsePropertyComponents2(responseProperty);
+  if (responsePropertyComponents == null) {
+    violations.push({
+      severity: "error",
+      message: `Pagination configuration for endpoint ${source_default.bold(endpointId)} must define a dot-delimited '${propertyValidator.propertyID}' property starting with $response (e.g. $response.${propertyValidator.propertyID}).`
+    });
+  }
+  if (responsePropertyComponents != null && !propertyValidator.validate({
+    typeResolver,
+    file,
+    resolvedType: resolvedResponseType,
+    propertyComponents: responsePropertyComponents
+  })) {
+    violations.push({
+      severity: "error",
+      message: `Pagination configuration for endpoint ${source_default.bold(endpointId)} specifies '${propertyValidator.propertyID}' ${responseProperty}, which is not a valid '${propertyValidator.propertyID}' type.`
+    });
+  }
+  return violations;
+}
+function resolvedTypeHasProperty2({ typeResolver, file, resolvedType, propertyComponents, validate: validate3 }) {
+  if (propertyComponents.length === 0) {
+    return validate3(resolvedType);
+  }
+  const objectSchema = maybeObjectSchema2(resolvedType);
+  if (objectSchema == null) {
+    return false;
+  }
+  const property5 = getPropertyTypeFromObjectSchema2({
+    typeResolver,
+    file,
+    objectSchema,
+    property: propertyComponents[0] ?? ""
+  });
+  if (property5 == null) {
+    return false;
+  }
+  const resolvedTypeProperty = typeResolver.resolveType({
+    type: property5,
+    file
+  });
+  return resolvedTypeHasProperty2({
+    typeResolver,
+    file: maybeFileFromResolvedType2(resolvedTypeProperty) ?? file,
+    resolvedType: resolvedTypeProperty,
+    propertyComponents: propertyComponents.slice(1),
+    validate: validate3
+  });
+}
+function resolveResponseType2({ endpoint, typeResolver, file }) {
+  var _a4;
+  const responseType = typeof endpoint.response !== "string" ? (_a4 = endpoint.response) == null ? void 0 : _a4.type : endpoint.response;
+  if (responseType == null) {
+    return void 0;
+  }
+  return typeResolver.resolveType({
+    type: responseType,
+    file
+  });
+}
+function maybePrimitiveType(resolvedType) {
+  if ((resolvedType == null ? void 0 : resolvedType._type) === "primitive") {
+    return resolvedType.primitive;
+  }
+  if ((resolvedType == null ? void 0 : resolvedType._type) === "container" && resolvedType.container._type === "optional") {
+    return maybePrimitiveType(resolvedType.container.itemType);
+  }
+  return void 0;
+}
+function maybeFileFromResolvedType2(resolvedType) {
+  if (resolvedType == null) {
+    return void 0;
+  }
+  if (resolvedType._type === "named") {
+    return resolvedType.file;
+  }
+  if (resolvedType._type === "container" && resolvedType.container._type === "optional") {
+    return maybeFileFromResolvedType2(resolvedType.container.itemType);
+  }
+  return void 0;
+}
+function getPropertyTypeFromObjectSchema2({ typeResolver, file, objectSchema, property: property5 }) {
+  const properties = getAllPropertiesForRawObjectSchema4({
+    typeResolver,
+    file,
+    objectSchema
+  });
+  return properties[property5];
+}
+function getAllPropertiesForRawObjectSchema4({ typeResolver, file, objectSchema }) {
+  let extendedTypes = [];
+  if (typeof objectSchema.extends === "string") {
+    extendedTypes = [objectSchema.extends];
+  } else if (Array.isArray(objectSchema.extends)) {
+    extendedTypes = objectSchema.extends;
+  }
+  const properties = {};
+  for (const extendedType of extendedTypes) {
+    const extendedProperties = getAllPropertiesForExtendedType4({
+      typeResolver,
+      file,
+      extendedType
+    });
+    Object.entries(extendedProperties).map(([propertyKey, propertyType]) => {
+      properties[propertyKey] = propertyType;
+    });
+  }
+  if (objectSchema.properties != null) {
+    Object.entries(objectSchema.properties).map(([propertyKey, propertyType]) => {
+      properties[propertyKey] = typeof propertyType === "string" ? propertyType : propertyType.type;
+    });
+  }
+  return properties;
+}
+function getAllPropertiesForExtendedType4({ typeResolver, file, extendedType }) {
+  const resolvedType = typeResolver.resolveNamedTypeOrThrow({
+    referenceToNamedType: extendedType,
+    file
+  });
+  if (resolvedType._type === "named" && isRawObjectDefinition(resolvedType.declaration)) {
+    return getAllPropertiesForRawObjectSchema4({
+      typeResolver,
+      file: maybeFileFromResolvedType2(resolvedType) ?? file,
+      objectSchema: resolvedType.declaration
+    });
+  }
+  return {};
+}
+function isValidResultsProperty({ typeResolver, file, resolvedType, propertyComponents }) {
+  return resolvedTypeHasProperty2({
+    typeResolver,
+    file,
+    resolvedType,
+    propertyComponents,
+    validate: isValidResultsType
+  });
+}
+function isValidResultsType(resolvedType) {
+  return true;
+}
+function maybeObjectSchema2(resolvedType) {
+  if (resolvedType == null) {
+    return void 0;
+  }
+  if (resolvedType._type === "named" && isRawObjectDefinition(resolvedType.declaration)) {
+    return resolvedType.declaration;
+  }
+  if (resolvedType._type === "container" && resolvedType.container._type === "optional") {
+    return maybeObjectSchema2(resolvedType.container.itemType);
+  }
+  return void 0;
+}
+function getRequestPropertyComponents(value) {
+  const trimmed = trimPrefix(value, REQUEST_PREFIX2);
+  return trimmed == null ? void 0 : trimmed.split(".");
+}
+function getResponsePropertyComponents2(value) {
+  const trimmed = trimPrefix(value, RESPONSE_PREFIX);
+  return trimmed == null ? void 0 : trimmed.split(".");
+}
+function trimPrefix(value, prefix) {
+  if (value.startsWith(prefix)) {
+    return value.substring(prefix.length);
+  }
+  return null;
+}
+
+// pnp:/home/circleci/project/packages/cli/yaml/validator/lib/rules/valid-pagination/validateCursorPagination.js
+function validateCursorPagination({ endpointId, endpoint, typeResolver, file, cursorPagination }) {
+  const violations = [];
+  violations.push(...validateCursorProperty({
+    endpointId,
+    endpoint,
+    typeResolver,
+    file,
+    cursorPagination
+  }));
+  const resolvedResponseType = resolveResponseType2({ endpoint, typeResolver, file });
+  if (resolvedResponseType == null) {
+    violations.push({
+      severity: "error",
+      message: `Pagination configuration for endpoint ${source_default.bold(endpointId)} must define a response type.`
+    });
+    return violations;
+  }
+  violations.push(...validateNextCursorProperty({
+    endpointId,
+    typeResolver,
+    file: maybeFileFromResolvedType2(resolvedResponseType) ?? file,
+    resolvedResponseType,
+    nextProperty: cursorPagination.next_cursor
+  }));
+  violations.push(...validateResultsProperty({
+    endpointId,
+    typeResolver,
+    file: maybeFileFromResolvedType2(resolvedResponseType) ?? file,
+    resolvedResponseType,
+    resultsProperty: cursorPagination.results
+  }));
+  return violations;
+}
+function validateCursorProperty({ endpointId, endpoint, typeResolver, file, cursorPagination }) {
+  return validateQueryParameterProperty({
+    endpointId,
+    endpoint,
+    typeResolver,
+    file,
+    queryParameterProperty: cursorPagination.cursor,
+    propertyValidator: {
+      propertyID: "cursor",
+      validate: isValidCursorProperty
+    }
+  });
+}
+function validateNextCursorProperty({ endpointId, typeResolver, file, resolvedResponseType, nextProperty }) {
+  return validateResponseProperty({
+    endpointId,
+    typeResolver,
+    file,
+    resolvedResponseType,
+    responseProperty: nextProperty,
+    propertyValidator: {
+      propertyID: "next_cursor",
+      validate: isValidCursorProperty
+    }
+  });
+}
+function isValidCursorProperty({ typeResolver, file, resolvedType, propertyComponents }) {
+  return resolvedTypeHasProperty2({
+    typeResolver,
+    file,
+    resolvedType,
+    propertyComponents,
+    validate: isValidCursorType
+  });
+}
+function isValidCursorType(resolvedType) {
+  const primitiveType = maybePrimitiveType(resolvedType);
+  if (primitiveType == null) {
+    return false;
+  }
+  return primitiveType !== "BOOLEAN";
+}
+
+// pnp:/home/circleci/project/packages/cli/yaml/validator/lib/rules/valid-pagination/validateOffsetPagination.js
+function validateOffsetPagination({ endpointId, endpoint, typeResolver, file, offsetPagination }) {
+  const violations = [];
+  violations.push(...validateOffsetProperty({
+    endpointId,
+    endpoint,
+    typeResolver,
+    file,
+    offsetPagination
+  }));
+  const resolvedResponseType = resolveResponseType2({ endpoint, typeResolver, file });
+  if (resolvedResponseType == null) {
+    violations.push({
+      severity: "error",
+      message: `Pagination configuration for endpoint ${source_default.bold(endpointId)} must define a response type.`
+    });
+    return violations;
+  }
+  violations.push(...validateResultsProperty({
+    endpointId,
+    typeResolver,
+    file: maybeFileFromResolvedType2(resolvedResponseType) ?? file,
+    resolvedResponseType,
+    resultsProperty: offsetPagination.results
+  }));
+  return violations;
+}
+function validateOffsetProperty({ endpointId, endpoint, typeResolver, file, offsetPagination }) {
+  return validateQueryParameterProperty({
+    endpointId,
+    endpoint,
+    typeResolver,
+    file,
+    queryParameterProperty: offsetPagination.offset,
+    propertyValidator: {
+      propertyID: "offset",
+      validate: isValidOffsetProperty
+    }
+  });
+}
+function isValidOffsetProperty({ typeResolver, file, resolvedType, propertyComponents }) {
+  return resolvedTypeHasProperty2({
+    typeResolver,
+    file,
+    resolvedType,
+    propertyComponents,
+    validate: isValidOffsetType
+  });
+}
+function isValidOffsetType(resolvedType) {
+  const primitiveType = maybePrimitiveType(resolvedType);
+  if (primitiveType == null) {
+    return false;
+  }
+  return primitiveType === "INTEGER" || primitiveType === "LONG" || primitiveType === "DOUBLE";
+}
+
+// pnp:/home/circleci/project/packages/cli/yaml/validator/lib/rules/valid-pagination/valid-pagination.js
+var ValidPaginationRule = {
+  name: "valid-pagination",
+  create: ({ workspace }) => {
+    const typeResolver = new TypeResolverImpl(workspace);
+    const defaultPagination = workspace.definition.rootApiFile.contents.pagination;
+    return {
+      definitionFile: {
+        httpEndpoint: ({ endpointId, endpoint }, { relativeFilepath, contents: definitionFile }) => {
+          const endpointPagination = typeof endpoint.pagination === "boolean" ? defaultPagination : endpoint.pagination;
+          if (!endpointPagination) {
+            return [];
+          }
+          const file = constructFernFileContext({
+            relativeFilepath,
+            definitionFile,
+            casingsGenerator: CASINGS_GENERATOR2,
+            rootApiFile: workspace.definition.rootApiFile.contents
+          });
+          if (isRawCursorPaginationSchema(endpointPagination)) {
+            return validateCursorPagination({
+              endpointId,
+              endpoint,
+              typeResolver,
+              file,
+              cursorPagination: endpointPagination
+            });
+          }
+          return validateOffsetPagination({
+            endpointId,
+            endpoint,
+            typeResolver,
+            file,
+            offsetPagination: endpointPagination
+          });
+        }
+      }
+    };
+  }
+};
+function isRawCursorPaginationSchema(rawPaginationSchema) {
+  return rawPaginationSchema.cursor != null && rawPaginationSchema.next_cursor != null && rawPaginationSchema.results != null;
+}
+
 // pnp:/home/circleci/project/packages/cli/yaml/validator/lib/rules/valid-service-urls/valid-service-url.js
 var ValidServiceUrlsRule = {
   name: "valid-service-urls",
@@ -860707,7 +861426,8 @@ function getAllRules() {
     NoUndefinedVariableReferenceRule,
     OnlyObjectExtensionsRule,
     NoMaybeStreamingRule,
-    NoResponsePropertyRule
+    NoResponsePropertyRule,
+    ValidPaginationRule
   ];
 }
 function getAllEnabledRules() {
@@ -861549,13 +862269,13 @@ function convertEndpoint2(endpoint) {
     requestBody: endpoint.requestBody != null ? convertRequestBody2(endpoint.requestBody) : void 0,
     response: endpoint.response != null ? convertHttpResponse2(endpoint.response) : void 0,
     headers: endpoint.headers.map((header) => convertHttpHeader2(header)),
-    queryParameters: endpoint.queryParameters.map((queryParameter) => convertQueryParameter(queryParameter)),
+    queryParameters: endpoint.queryParameters.map((queryParameter) => convertQueryParameter2(queryParameter)),
     examples: endpoint.examples,
     streamingResponse: endpoint.streamingResponse != null ? convertStreamingResponse(endpoint.streamingResponse) : void 0,
     sdkResponse: endpoint.sdkResponse != null ? convertSdkResponse(endpoint.sdkResponse) : void 0
   };
 }
-function convertQueryParameter(queryParameter) {
+function convertQueryParameter2(queryParameter) {
   return {
     availability: queryParameter.availability,
     docs: queryParameter.docs,
@@ -861874,13 +862594,13 @@ function convertEndpoint3(endpoint) {
     requestBody: endpoint.requestBody != null ? convertRequestBody3(endpoint.requestBody) : void 0,
     response: endpoint.response != null ? convertHttpResponse3(endpoint.response) : void 0,
     headers: endpoint.headers.map((header) => convertHttpHeader3(header)),
-    queryParameters: endpoint.queryParameters.map((queryParameter) => convertQueryParameter2(queryParameter)),
+    queryParameters: endpoint.queryParameters.map((queryParameter) => convertQueryParameter3(queryParameter)),
     examples: endpoint.examples,
     streamingResponse: endpoint.streamingResponse != null ? convertStreamingResponse2(endpoint.streamingResponse) : void 0,
     sdkResponse: endpoint.sdkResponse != null ? convertSdkResponse2(endpoint.sdkResponse) : void 0
   };
 }
-function convertQueryParameter2(queryParameter) {
+function convertQueryParameter3(queryParameter) {
   return {
     availability: queryParameter.availability,
     docs: queryParameter.docs,
@@ -862732,7 +863452,7 @@ function convertEndpoint8(endpoint) {
     headers: endpoint.headers.map((header) => convertHeader3(header)),
     pathParameters: endpoint.pathParameters.map((pathParameter) => convertPathParameter5(pathParameter)),
     allPathParameters: endpoint.allPathParameters.map((pathParameter) => convertPathParameter5(pathParameter)),
-    queryParameters: endpoint.queryParameters.map((queryParameter) => convertQueryParameter3(queryParameter)),
+    queryParameters: endpoint.queryParameters.map((queryParameter) => convertQueryParameter4(queryParameter)),
     requestBody: convertedRequestBody,
     sdkRequest: endpoint.sdkRequest != null ? {
       requestParameterName: endpoint.sdkRequest.requestParameterName,
@@ -862985,7 +863705,7 @@ function convertPathParameter5(pathParameter) {
     valueType: convertTypeReference4(pathParameter.valueType)
   };
 }
-function convertQueryParameter3(queryParameter) {
+function convertQueryParameter4(queryParameter) {
   return {
     ...queryParameter,
     valueType: convertTypeReference4(queryParameter.valueType)
@@ -863374,7 +864094,7 @@ function convertEndpoint9(val) {
   return {
     ...val,
     headers: val.headers.map((header) => convertHeader4(header)),
-    queryParameters: val.queryParameters.map((query) => convertQueryParameter4(query)),
+    queryParameters: val.queryParameters.map((query) => convertQueryParameter5(query)),
     availability: val.availability == null ? {
       status: IrVersions_exports.V25.AvailabilityStatus.GeneralAvailability,
       message: void 0
@@ -863390,7 +864110,7 @@ function convertHeader4(val) {
     } : val.availability
   };
 }
-function convertQueryParameter4(val) {
+function convertQueryParameter5(val) {
   return {
     ...val,
     availability: val.availability == null ? {
@@ -863793,10 +864513,10 @@ function convertPathParameter6(val) {
 }
 function convertQueryParameters(val) {
   return val.map((pathParameter) => {
-    return convertQueryParameter5(pathParameter);
+    return convertQueryParameter6(pathParameter);
   });
 }
-function convertQueryParameter5(val) {
+function convertQueryParameter6(val) {
   return {
     ...val,
     valueType: maybeConvertBooleanLiteralForTypeReference(val.valueType)
@@ -865364,9 +866084,37 @@ var V35_TO_V34_MIGRATION = {
     unrecognizedObjectKeys: "strip",
     skipValidation: true
   }),
-  migrateBackwards: (V352, _context) => {
+  migrateBackwards: (V352) => {
     return {
-      ...V352
+      ...V352,
+      services: Object.fromEntries(Object.entries(V352.services).map(([id, service]) => [
+        id,
+        {
+          ...service,
+          endpoints: service.endpoints.map((endpoint) => ({
+            docs: endpoint.docs,
+            availability: endpoint.availability,
+            id: endpoint.id,
+            name: endpoint.name,
+            displayName: endpoint.displayName,
+            method: endpoint.method,
+            headers: endpoint.headers,
+            baseUrl: endpoint.baseUrl,
+            path: endpoint.path,
+            fullPath: endpoint.fullPath,
+            pathParameters: endpoint.pathParameters,
+            allPathParameters: endpoint.allPathParameters,
+            queryParameters: endpoint.queryParameters,
+            requestBody: endpoint.requestBody,
+            sdkRequest: endpoint.sdkRequest,
+            response: endpoint.response,
+            errors: endpoint.errors,
+            auth: endpoint.auth,
+            idempotent: endpoint.idempotent,
+            examples: endpoint.examples
+          }))
+        }
+      ]))
     };
   }
 };
@@ -865940,7 +866688,7 @@ function convertEndpoint11({ endpoint, errorResolver }) {
     headers: endpoint.headers.map((header) => convertHeader5(header)),
     path: endpoint.path,
     pathParameters: endpoint.pathParameters.map((pathParameter) => convertPathParameter7(pathParameter)),
-    queryParameters: endpoint.queryParameters.map((queryParameter) => convertQueryParameter6(queryParameter)),
+    queryParameters: endpoint.queryParameters.map((queryParameter) => convertQueryParameter7(queryParameter)),
     requestBody: endpoint.requestBody != null ? convertRequestBody5(endpoint.requestBody) : void 0,
     sdkRequest: endpoint.sdkRequest != null ? convertSdkRequest4(endpoint.sdkRequest) : void 0,
     response: convertResponse5(endpoint.response),
@@ -865959,7 +866707,7 @@ function convertPathParameter7(pathParameter) {
     valueType: convertTypeReference5(pathParameter.valueType)
   };
 }
-function convertQueryParameter6(queryParameter) {
+function convertQueryParameter7(queryParameter) {
   return {
     docs: queryParameter.docs,
     availability: queryParameter.availability,
@@ -866862,7 +867610,7 @@ function convertEndpoint12(endpoint) {
     requestBody: endpoint.requestBody != null ? convertRequestBody6(endpoint.requestBody) : void 0,
     response: convertHttpResponse6(endpoint.response),
     headers: endpoint.headers.map((header) => convertHeader6(header)),
-    queryParameters: endpoint.queryParameters.map((queryParameter) => convertQueryParameter7(queryParameter)),
+    queryParameters: endpoint.queryParameters.map((queryParameter) => convertQueryParameter8(queryParameter)),
     examples: endpoint.examples.map((example) => convertExampleEndpointCall9(example))
   };
 }
@@ -866872,7 +867620,7 @@ function convertResponseError2(error) {
     error: convertDeclaredErrorName2(error.error)
   };
 }
-function convertQueryParameter7(queryParameter) {
+function convertQueryParameter8(queryParameter) {
   return {
     availability: queryParameter.availability,
     docs: queryParameter.docs,

package/package.json

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