@gitkraken/core-gitlens 0.11.1 → 0.13.0

package/dist/plus/integrations/providers/providersApi.d.ts

@@ -6,8 +6,9 @@ import { GitCloudHostIntegrationId, GitSelfManagedHostIntegrationId, Integration
 import { ProviderOrganization } from "../results.js";
 import { ProviderPullRequestCount, ProviderPullRequestSearchPage } from "../models/pullRequestReads.js";
 import { IssueFilter } from "../providerFilters.js";
-import { GetIssuesOptions, GetPullRequestsForUserOptions, GetPullRequestsOptions, GetReposOptions, PageInfo, PagingInput, PagingMode, ProviderAccount, ProviderApiCollectionResult, ProviderApiPagedResult, ProviderAzureProject, ProviderAzureResource, ProviderBitbucketResource, ProviderGitHubOrganization, ProviderGitLabGroup, ProviderHierarchyResult, ProviderIssue, ProviderJiraProject, ProviderJiraResource, ProviderJiraServerProject, ProviderLinearOrganization, ProviderLinearTeam, ProviderPullRequest, ProviderRepoInput, ProviderReposInput, ProviderRepository, ProviderRequestResponse } from "./models.js";
-import { AzurePullRequest, AzureWorkItemResponse } from "./azure/models.js";
+import { GetIssuesOptions, GetPullRequestsForUserOptions, GetPullRequestsOptions, GetReposOptions, JiraIssuePage, PageInfo, PagingInput, PagingMode, ProviderAccount, ProviderApiCollectionResult, ProviderApiPagedResult, ProviderAzureProject, ProviderAzureResource, ProviderBitbucketResource, ProviderGitHubOrganization, ProviderGitLabGroup, ProviderHierarchyResult, ProviderIssue, ProviderJiraProject, ProviderJiraResource, ProviderJiraServerProject, ProviderLinearOrganization, ProviderLinearTeam, ProviderPullRequest, ProviderRepoInput, ProviderReposInput, ProviderRepository, ProviderRequestResponse } from "./models.js";
+import { AzurePullRequest, AzureWorkItemEtagRead } from "./azure/models.js";
+import { AzureWorkItemStatesCache } from "./azure/workItemStateCategories.js";
 import { countBitbucketServerPullRequests, searchBitbucketServerPullRequestsPage } from "./bitbucket-server/pullRequestSearch.js";
 import { JiraIssueEtagResponse } from "./jiraIssueByKey.js";
 import { LinearIssueEtagNode } from "./linearIssuesEtag.js";
@@ -16,9 +17,10 @@ import { CollectionMetadata, GitIssueState, GitPullRequestState, TrelloBoard, Tr
 //#region ../plus/integrations/src/providers/providersApi.d.ts
 export declare class ProvidersApi {
   private readonly authenticationService;
+  private readonly azureWorkItemTypeStates;
   private readonly providers;
   private readonly request;
-  constructor(authenticationService: IntegrationAuthenticationService);
+  constructor(authenticationService: IntegrationAuthenticationService, azureWorkItemTypeStates?: AzureWorkItemStatesCache);
   getScopesForProvider(providerId: IntegrationIds): string[] | undefined;
   getProviderDomain(providerId: IntegrationIds): string | undefined;
   getProviderPullRequestsPagingMode(providerId: IntegrationIds): PagingMode | undefined;
@@ -122,8 +124,9 @@ export declare class ProvidersApi {
    * request, where {@link getAzureWorkItem} reads one work item per request, selecting only
    * `azureWorkItemEtagFieldNames`. Asked with `errorPolicy=omit`, without which one missing id fails the whole
    * request; Azure then leaves out every id it can't return, for whatever reason, so a caller matches the work items
-   * to its ids by `id`, never by position, and reads an omission as unknown rather than absent. Every failure throws,
-   * classified as {@link getAzureWorkItem} classifies it.
+   * to its ids by `id`, never by position, and reads an omission as unknown rather than absent. Each work item comes
+   * with the workflow category its state classifies to, as {@link getAzureWorkItem} classifies it. Every failure
+   * throws, classified as {@link getAzureWorkItem} classifies it, the states reads' included.
    */
   getAzureWorkItemsEtagFields(tokenOptInfo: TokenOptInfo, scope: {
     namespace: string;
@@ -131,7 +134,7 @@ export declare class ProvidersApi {
   }, ids: readonly number[], options: {
     isPAT?: boolean;
     baseUrl?: string;
-  }): Promise<AzureWorkItemResponse[]>;
+  }): Promise<AzureWorkItemEtagRead[]>;
   /**
    * The cheap check behind the batch pull request read's etags: one pull request as Azure DevOps returns it, by the
    * same request {@link getPullRequestForRepo} has provider-apis send, but without the repository read it adds for
@@ -341,18 +344,19 @@ export declare class ProvidersApi {
   getIssuesForAzureProject(tokenOptInfo: TokenOptInfo<GitCloudHostIntegrationId.AzureDevOps | GitSelfManagedHostIntegrationId.AzureDevOpsServer>, namespace: string, project: string, options?: GetIssuesOptions & {
     isPAT?: boolean;
     baseUrl?: string;
-  }): Promise<PagedResult<ProviderIssue>>;
+  }): Promise<ProviderApiPagedResult<ProviderIssue>>;
+  private azureStatesScope;
+  private readAzureStatesMetadata;
+  private getAzureTypeStates;
+  private getAzureProjectWorkItemStates;
+  private classifyAzureIssueStates;
   getIssuesForProject(tokenOptInfo: TokenWithInfo, project: string, resourceId: string, options?: GetIssuesOptions): Promise<ProviderIssue[] | undefined>;
   /**
    * Single page of {@link getIssuesForProject} that preserves the SDK's `pageInfo` so a caller can drain
    * every page (the plain {@link getIssuesForProject} discards it, silently capping at the first page).
    * `nextCursor` is the raw provider cursor (Jira offset / nextPageToken) fed back verbatim as `options.cursor`.
    */
-  getIssuesForProjectPaged(tokenOptInfo: TokenWithInfo, project: string, resourceId: string, options?: GetIssuesOptions): Promise<{
-    data: ProviderIssue[];
-    hasMore: boolean;
-    nextCursor: string | undefined;
-  } | undefined>;
+  getIssuesForProjectPaged(tokenOptInfo: TokenWithInfo, project: string, resourceId: string, options?: GetIssuesOptions): Promise<JiraIssuePage>;
   getJiraServerCurrentUser(tokenOptInfo: TokenWithInfo<IssuesSelfManagedHostIntegrationId.JiraServer>, baseUrl: string): Promise<ProviderAccount | undefined>;
   /**
    * Jira Server's project list, which is a single unpaged `/rest/api/2/project` read rather than Cloud's
@@ -363,42 +367,26 @@ export declare class ProvidersApi {
    * One page of a Jira Server project's issues, preserving the SDK's `pageInfo` so the integration can drain
    * every page — the same contract as {@link getIssuesForProjectPaged} on Cloud.
    */
-  getJiraServerIssuesForProjectPaged(tokenOptInfo: TokenWithInfo<IssuesSelfManagedHostIntegrationId.JiraServer>, baseUrl: string, projectKey: string, options?: GetIssuesOptions): Promise<{
-    data: ProviderIssue[];
-    hasMore: boolean;
-    nextCursor: string | undefined;
-  } | undefined>;
+  getJiraServerIssuesForProjectPaged(tokenOptInfo: TokenWithInfo<IssuesSelfManagedHostIntegrationId.JiraServer>, baseUrl: string, projectKey: string, options?: GetIssuesOptions): Promise<JiraIssuePage>;
   /**
    * Single page of one issue search across several projects of a Jira Server instance — the contract of
    * {@link getIssuesForProjectsPaged} on Cloud: the page and its cursor are global to the project set, and at
    * most `JIRA_MAX_PROJECT_KEYS_PER_REQUEST` keys are accepted per call.
    */
-  getJiraServerIssuesForProjectsPaged(tokenOptInfo: TokenWithInfo<IssuesSelfManagedHostIntegrationId.JiraServer>, baseUrl: string, projectKeys: string[], options?: GetIssuesOptions): Promise<{
-    data: ProviderIssue[];
-    hasMore: boolean;
-    nextCursor: string | undefined;
-  } | undefined>;
+  getJiraServerIssuesForProjectsPaged(tokenOptInfo: TokenWithInfo<IssuesSelfManagedHostIntegrationId.JiraServer>, baseUrl: string, projectKeys: string[], options?: GetIssuesOptions): Promise<JiraIssuePage>;
   getJiraServerIssue(tokenOptInfo: TokenWithInfo<IssuesSelfManagedHostIntegrationId.JiraServer>, baseUrl: string, number: string): Promise<ProviderIssue | undefined>;
   /** The account-wide read: every issue related to the current user on this instance, no project needed. */
   getJiraServerIssuesForCurrentUser(tokenOptInfo: TokenWithInfo<IssuesSelfManagedHostIntegrationId.JiraServer>, baseUrl: string, options?: {
     cursor?: string;
     states?: GitIssueState[];
     sort?: IssueSorting;
-  }): Promise<{
-    data: ProviderIssue[];
-    hasMore: boolean;
-    nextCursor: string | undefined;
-  } | undefined>;
+  }): Promise<JiraIssuePage>;
   /**
    * Single page of one issue search across several projects of the same Jira site. The page, its cursor and
    * `hasMore` are global to the whole project set, not per project; at most `JIRA_MAX_PROJECT_KEYS_PER_REQUEST`
    * keys are accepted per call (the SDK throws past it), so the caller chunks.
    */
-  getIssuesForProjectsPaged(tokenOptInfo: TokenWithInfo, projectKeys: string[], resourceId: string, options?: GetIssuesOptions): Promise<{
-    data: ProviderIssue[];
-    hasMore: boolean;
-    nextCursor: string | undefined;
-  } | undefined>;
+  getIssuesForProjectsPaged(tokenOptInfo: TokenWithInfo, projectKeys: string[], resourceId: string, options?: GetIssuesOptions): Promise<JiraIssuePage>;
   getTrelloCard(tokenOptInfo: TokenWithInfo<IssuesCloudHostIntegrationId.Trello>, appKey: string, cardId: string, options?: {
     trelloBoardListsById?: Record<string, {
       name: string;
@@ -435,7 +423,7 @@ export declare class ProvidersApi {
     states?: GitIssueState[];
     isPAT?: boolean;
     baseUrl?: string;
-  }): Promise<PagedResult<ProviderIssue>>;
+  }): Promise<ProviderApiPagedResult<ProviderIssue>>;
   getJiraIssueByKey(tokenOptInfo: TokenWithInfo<IssuesCloudHostIntegrationId.Jira>, resourceId: string, resourceUrl: string, key: string): Promise<ProviderIssue | undefined>;
   /**
    * The change state of up to `jiraBulkFetchMaxKeys` issues of one Jira Cloud site, in one bulk fetch. Unlike

package/dist/plus/integrations/providers/providersApi.js

@@ -1,18 +1,20 @@
+import { mapSettledBounded } from "../../../utils/promise.js";
 import { RequestNotFoundError } from "../../../git/errors.js";
 import { base64 } from "../../../utils/base64.js";
 import { toError } from "../errors.js";
 import "../constants.js";
 import { UnexpectedHtmlResponseError, getProviderResponseBodyMessage, isAzureProviderId, isProviderIssueNotFoundError, throwProviderError } from "./providerErrors.js";
-import { isIncompleteCollection } from "../collectionMetadata.js";
+import { isIncompleteCollection, toCollectionScopeFailure } from "../collectionMetadata.js";
 import { toTokenWithInfo } from "../authentication/models.js";
 import { collectProviderPagedResult, mergeCollectionMetadata, parsePageCursor, toPageCursor } from "./utils/providerPaging.js";
 import { isRepoIdsInput, providersMetadata } from "./models.js";
-import { azureWorkItemEtagFieldNames, encodeAzurePathSegment, fromAzureWorkItemToProviderIssue } from "./azure/models.js";
+import { azureIssueStateCategory, azureWorkItemEtagFieldNames, encodeAzurePathSegment, fromAzureWorkItemToProviderIssue } from "./azure/models.js";
+import { AzureWorkItemStatesCache, getAzureWorkItemTypeStatesUrl, getAzureWorkItemTypesUrl } from "./azure/workItemStateCategories.js";
 import { requestJiraIssueByKey, requestJiraIssuesEtagFields } from "./jiraIssueByKey.js";
 import { requestLinearIssuesEtagFields } from "./linearIssuesEtag.js";
 import { requestBitbucketServerProjects, requestBitbucketServerRepositories } from "./bitbucket-server/discovery.js";
 import { countBitbucketServerPullRequests, searchBitbucketServerPullRequestsPage } from "./bitbucket-server/pullRequestSearch.js";
-import ProviderApis from "@gitkraken/provider-apis";
+import ProviderApis, { GitIssueState } from "@gitkraken/provider-apis";
 //#region ../plus/integrations/src/providers/providersApi.ts
 const createProviderApis = ProviderApis.default ?? ProviderApis;
 const repoNotFoundMessage = /^Repository .+ not found$/i;
@@ -103,12 +105,27 @@ function fromTrelloCard(card, trelloBoardListsById) {
 		}))
 	};
 }
+/**
+* One Jira search page as the drains read it: `nextCursor` is the raw provider cursor (Jira offset / nextPageToken)
+* fed back verbatim as `options.cursor`, and `metadata` is the SDK's, kept only when it reported something.
+*/
+function toJiraIssuePage(result) {
+	if (result == null) return void 0;
+	return {
+		data: result.data,
+		hasMore: result.pageInfo?.hasNextPage ?? false,
+		nextCursor: result.pageInfo?.endCursor ?? void 0,
+		...result.metadata != null ? { metadata: result.metadata } : {}
+	};
+}
 var ProvidersApi = class {
 	authenticationService;
+	azureWorkItemTypeStates;
 	providers;
 	request;
-	constructor(authenticationService) {
+	constructor(authenticationService, azureWorkItemTypeStates = new AzureWorkItemStatesCache()) {
 		this.authenticationService = authenticationService;
+		this.azureWorkItemTypeStates = azureWorkItemTypeStates;
 		const http = authenticationService.ctx.http;
 		const userAgent = http.userAgent;
 		const customFetch = async ({ url, ...options }) => {
@@ -634,6 +651,7 @@ var ProvidersApi = class {
 		if (issue == null) throw new Error(`Azure DevOps returned no readable work item ${id}`);
 		const project = workItem?.fields?.["System.TeamProject"];
 		if (typeof project === "string" && project.toLowerCase() !== scope.project.toLowerCase()) throw new Error(`Azure DevOps work item ${id} is in project '${project}', not '${scope.project}'`);
+		await this.classifyAzureIssueStates([issue], tokenWithInfo, scope.namespace, scope.project, options);
 		return issue;
 	}
 	/**
@@ -641,8 +659,9 @@ var ProvidersApi = class {
 	* request, where {@link getAzureWorkItem} reads one work item per request, selecting only
 	* `azureWorkItemEtagFieldNames`. Asked with `errorPolicy=omit`, without which one missing id fails the whole
 	* request; Azure then leaves out every id it can't return, for whatever reason, so a caller matches the work items
-	* to its ids by `id`, never by position, and reads an omission as unknown rather than absent. Every failure throws,
-	* classified as {@link getAzureWorkItem} classifies it.
+	* to its ids by `id`, never by position, and reads an omission as unknown rather than absent. Each work item comes
+	* with the workflow category its state classifies to, as {@link getAzureWorkItem} classifies it. Every failure
+	* throws, classified as {@link getAzureWorkItem} classifies it, the states reads' included.
 	*/
 	async getAzureWorkItemsEtagFields(tokenOptInfo, scope, ids, options) {
 		const { tokenWithInfo } = await this.ensureProviderToken(tokenOptInfo);
@@ -656,7 +675,20 @@ var ProvidersApi = class {
 				headers: { Authorization: options.isPAT ? `Basic ${base64(`:${token}`)}` : `Bearer ${token}` }
 			})).body?.value;
 			if (!Array.isArray(workItems)) throw new Error("Azure DevOps returned no work items");
-			return workItems.filter((w) => w != null);
+			const readable = workItems.filter((w) => w != null);
+			const issues = readable.map((w) => {
+				const state = w.fields?.["System.State"];
+				const type = w.fields?.["System.WorkItemType"];
+				return {
+					type: typeof type === "string" ? type : void 0,
+					state: typeof state === "string" && state ? { name: state } : void 0
+				};
+			});
+			await this.classifyAzureIssueStates(issues, tokenWithInfo, scope.namespace, scope.project, options);
+			return readable.map((w, i) => ({
+				workItem: w,
+				category: issues[i].state?.category
+			}));
 		} catch (e) {
 			return this.handleProviderError(tokenWithInfo, e);
 		}
@@ -1088,11 +1120,119 @@ var ProvidersApi = class {
 	}
 	async getIssuesForAzureProject(tokenOptInfo, namespace, project, options) {
 		const { provider, tokenWithInfo } = await this.ensureProviderTokenAndFunction(tokenOptInfo, "getIssuesForAzureProjectFn");
-		return this.getPagedResult({
+		const workItemTypeStates = options?.states?.includes(GitIssueState.Open) && options.states.includes(GitIssueState.Closed) ? void 0 : await this.getAzureProjectWorkItemStates(tokenWithInfo, namespace, project, options);
+		const page = await this.getPagedResult({
 			namespace,
 			project,
-			...options
+			...options,
+			workItemTypeStates
 		}, provider.getIssuesForAzureProjectFn, tokenWithInfo, options?.cursor, options?.isPAT, options?.baseUrl);
+		const result = workItemTypeStates?.metadata == null ? page : {
+			...page,
+			metadata: mergeCollectionMetadata(page.metadata, workItemTypeStates.metadata),
+			paging: {
+				...page.paging ?? {
+					cursor: "{}",
+					more: false
+				},
+				truncated: true
+			}
+		};
+		try {
+			await this.classifyAzureIssueStates(result.values, tokenWithInfo, namespace, project, options, workItemTypeStates);
+		} catch (ex) {
+			return {
+				...result,
+				values: result.values,
+				paging: {
+					...result.paging ?? {
+						cursor: "{}",
+						more: false
+					},
+					truncated: true
+				},
+				metadata: mergeCollectionMetadata(result.metadata, {
+					completeness: "partial",
+					failures: [toCollectionScopeFailure({
+						providerId: tokenWithInfo.providerId,
+						resourceId: namespace,
+						projectId: project
+					}, ex)]
+				})
+			};
+		}
+		return result;
+	}
+	azureStatesScope(token, namespace, project, options) {
+		return {
+			baseUrl: options?.baseUrl ?? azureDevOpsBaseUrl,
+			namespace,
+			project,
+			token: token.accessToken,
+			isPAT: options?.isPAT === true
+		};
+	}
+	async readAzureStatesMetadata(token, url, isPAT) {
+		try {
+			return (await this.request({
+				url,
+				headers: { Authorization: azureAuthorization(token.accessToken, isPAT) }
+			})).body;
+		} catch (ex) {
+			return this.handleProviderError(token, ex);
+		}
+	}
+	getAzureTypeStates(token, scope, type) {
+		return this.azureWorkItemTypeStates.getStates(scope, type, () => this.readAzureStatesMetadata(token, getAzureWorkItemTypeStatesUrl(scope.baseUrl, scope.namespace, scope.project, type), scope.isPAT));
+	}
+	async getAzureProjectWorkItemStates(token, namespace, project, options) {
+		const scope = this.azureStatesScope(token, namespace, project, options);
+		const failureScope = {
+			providerId: token.providerId,
+			resourceId: namespace,
+			projectId: project
+		};
+		let types;
+		try {
+			types = await this.azureWorkItemTypeStates.getTypes(scope, () => this.readAzureStatesMetadata(token, getAzureWorkItemTypesUrl(scope.baseUrl, namespace, project), scope.isPAT));
+		} catch (ex) {
+			return {
+				types: [],
+				metadata: {
+					completeness: "partial",
+					failures: [toCollectionScopeFailure(failureScope, ex)]
+				}
+			};
+		}
+		const results = await mapSettledBounded(types, 6, async (type) => ({
+			name: type,
+			states: await this.getAzureTypeStates(token, scope, type)
+		}));
+		const failures = results.flatMap((r) => r.status === "rejected" ? [toCollectionScopeFailure(failureScope, r.reason)] : []);
+		return {
+			types: results.map((r, i) => r.status === "fulfilled" ? r.value : { name: types[i] }),
+			...failures.length ? { metadata: {
+				completeness: "partial",
+				failures
+			} } : {}
+		};
+	}
+	async classifyAzureIssueStates(issues, tokenWithInfo, namespace, project, options, snapshot) {
+		const scope = this.azureStatesScope(tokenWithInfo, namespace, project, options);
+		const snapshotTypes = new Map(snapshot?.types.map((type) => [type.name, type.states]));
+		const types = [...new Set(issues.flatMap((i) => i.state?.name && i.type && !snapshotTypes.has(i.type) ? [i.type] : []))];
+		const results = await mapSettledBounded(types, 6, async (type) => [type, await this.getAzureTypeStates(tokenWithInfo, scope, type)]);
+		const statesByType = new Map([...snapshotTypes, ...results.flatMap((r) => r.status === "fulfilled" ? [r.value] : [])]);
+		for (const issue of issues) {
+			const states = issue.type ? statesByType.get(issue.type) : void 0;
+			if (states == null || issue.state == null) continue;
+			issue.state = {
+				...issue.state,
+				category: azureIssueStateCategory(states.find((s) => s.name === issue.state?.name)?.category)
+			};
+		}
+		const failure = results.find((r) => r.status === "rejected");
+		if (failure?.status === "rejected") throw failure.reason;
 	}
 	async getIssuesForProject(tokenOptInfo, project, resourceId, options) {
 		const { provider, tokenWithInfo } = await this.ensureProviderTokenAndFunction(tokenOptInfo, "getIssuesForProjectFn");
@@ -1117,18 +1257,12 @@ var ProvidersApi = class {
 		const { provider, tokenWithInfo } = await this.ensureProviderTokenAndFunction(tokenOptInfo, "getIssuesForProjectFn");
 		const token = tokenWithInfo.accessToken;
 		try {
-			const result = await provider.getIssuesForProjectFn?.({
+			return toJiraIssuePage(await provider.getIssuesForProjectFn?.({
 				projectKey: project,
 				resourceId,
 				...options,
 				includeTransitions: jiraListIncludeTransitions
-			}, { token });
-			if (result == null) return void 0;
-			return {
-				data: result.data,
-				hasMore: result.pageInfo?.hasNextPage ?? false,
-				nextCursor: result.pageInfo?.endCursor ?? void 0
-			};
+			}, { token }));
 		} catch (e) {
 			return this.handleProviderError(tokenWithInfo, e);
 		}
@@ -1166,20 +1300,14 @@ var ProvidersApi = class {
 	async getJiraServerIssuesForProjectPaged(tokenOptInfo, baseUrl, projectKey, options) {
 		const { provider, tokenWithInfo } = await this.ensureProviderTokenAndFunction(tokenOptInfo, "getJiraServerIssuesForProjectFn");
 		try {
-			const result = await provider.getJiraServerIssuesForProjectFn?.({
+			return toJiraIssuePage(await provider.getJiraServerIssuesForProjectFn?.({
 				projectKey,
 				...options,
 				includeTransitions: jiraListIncludeTransitions
 			}, {
 				token: tokenWithInfo.accessToken,
 				baseUrl
-			});
-			if (result == null) return void 0;
-			return {
-				data: result.data,
-				hasMore: result.pageInfo?.hasNextPage ?? false,
-				nextCursor: result.pageInfo?.endCursor ?? void 0
-			};
+			}));
 		} catch (e) {
 			return this.handleProviderError(tokenWithInfo, e);
 		}
@@ -1192,20 +1320,14 @@ var ProvidersApi = class {
 	async getJiraServerIssuesForProjectsPaged(tokenOptInfo, baseUrl, projectKeys, options) {
 		const { provider, tokenWithInfo } = await this.ensureProviderTokenAndFunction(tokenOptInfo, "getJiraServerIssuesForProjectsFn");
 		try {
-			const result = await provider.getJiraServerIssuesForProjectsFn?.({
+			return toJiraIssuePage(await provider.getJiraServerIssuesForProjectsFn?.({
 				projectKeys,
 				...options,
 				includeTransitions: jiraListIncludeTransitions
 			}, {
 				token: tokenWithInfo.accessToken,
 				baseUrl
-			});
-			if (result == null) return void 0;
-			return {
-				data: result.data,
-				hasMore: result.pageInfo?.hasNextPage ?? false,
-				nextCursor: result.pageInfo?.endCursor ?? void 0
-			};
+			}));
 		} catch (e) {
 			return this.handleProviderError(tokenWithInfo, e);
 		}
@@ -1226,7 +1348,7 @@ var ProvidersApi = class {
 	async getJiraServerIssuesForCurrentUser(tokenOptInfo, baseUrl, options) {
 		const { provider, tokenWithInfo } = await this.ensureProviderTokenAndFunction(tokenOptInfo, "getJiraServerIssuesForCurrentUserFn");
 		try {
-			const result = await provider.getJiraServerIssuesForCurrentUserFn?.({
+			return toJiraIssuePage(await provider.getJiraServerIssuesForCurrentUserFn?.({
 				cursor: options?.cursor,
 				states: options?.states,
 				sort: options?.sort,
@@ -1234,13 +1356,7 @@ var ProvidersApi = class {
 			}, {
 				token: tokenWithInfo.accessToken,
 				baseUrl
-			});
-			if (result == null) return void 0;
-			return {
-				data: result.data,
-				hasMore: result.pageInfo?.hasNextPage ?? false,
-				nextCursor: result.pageInfo?.endCursor ?? void 0
-			};
+			}));
 		} catch (e) {
 			return this.handleProviderError(tokenWithInfo, e);
 		}
@@ -1254,18 +1370,12 @@ var ProvidersApi = class {
 		const { provider, tokenWithInfo } = await this.ensureProviderTokenAndFunction(tokenOptInfo, "getIssuesForProjectsFn");
 		const token = tokenWithInfo.accessToken;
 		try {
-			const result = await provider.getIssuesForProjectsFn?.({
+			return toJiraIssuePage(await provider.getIssuesForProjectsFn?.({
 				projectKeys,
 				resourceId,
 				...options,
 				includeTransitions: jiraListIncludeTransitions
-			}, { token });
-			if (result == null) return void 0;
-			return {
-				data: result.data,
-				hasMore: result.pageInfo?.hasNextPage ?? false,
-				nextCursor: result.pageInfo?.endCursor ?? void 0
-			};
+			}, { token }));
 		} catch (e) {
 			return this.handleProviderError(tokenWithInfo, e);
 		}