@gitkraken/core-gitlens 0.4.100 → 0.4.101

package/src/plus/integrations/models/gitHostIntegration.ts

@@ -104,6 +104,21 @@ export type SearchMyPullRequestsOptions = {
 	includeReviewRequested?: boolean;
 };
 
+/**
+ * Rejects a read the provider can't serve as asked: logs the reason and returns it as the `{ error }` half of an
+ * {@link IntegrationResult}, timed from `start`.
+ *
+ * A single builder because these refusals are a contract, not incidental returns — the read cores below reject on
+ * unsupported input, an inexpressible filter set, or an unresolvable filter account, and each one must reach the
+ * caller as an error it can surface as a warning rather than as an empty success. Writing the message once also
+ * keeps the logged text and the thrown text from drifting apart, which is exactly what happened while each site
+ * spelled its message out twice.
+ */
+function unsupportedRead<T>(message: string, start: number, logContext?: string): IntegrationResult<T> {
+	Logger.warn(message, logContext);
+	return { error: new Error(message), duration: performance.now() - start };
+}
+
 export abstract class GitHostIntegration<
 	ID extends IntegrationIds = IntegrationIds,
 	T extends ResourceDescriptor = ResourceDescriptor,
@@ -289,15 +304,6 @@ export abstract class GitHostIntegration<
 		cancellation?: AbortSignal,
 	): Promise<RepositoryMetadata | undefined>;
 
-	/**
-	 * Lists the organizations (orgs/workspaces/groups) the current user belongs to on this host.
-	 * `truncated === true` means the defensive page-drain backstop stopped before the upstream listing
-	 * was exhausted.
-	 */
-	async getOrganizationsForUser(): Promise<ProviderHierarchyResult<ProviderOrganization> | undefined> {
-		return (await this.getOrganizationsForUserResult())?.value;
-	}
-
 	/**
 	 * Whether this git host implements generic org discovery. False for providers that register no
 	 * {@link getProviderOrganizationsForUser} hook (e.g. Bitbucket Data Center) — the facade uses this to
@@ -344,9 +350,13 @@ export abstract class GitHostIntegration<
 	}
 
 	/**
-	 * Result-returning core of {@link getOrganizationsForUser}. Resolves the session for `connectionId`
-	 * (or the primary connection when omitted, honoring multi-account reads) and recovers a thrown error
-	 * into `{ error }` so callers can surface it as a warning instead of swallowing it to `undefined`.
+	 * Lists the organizations (orgs/workspaces/groups) the current user belongs to on this host.
+	 * `truncated === true` means the defensive page-drain backstop stopped before the upstream listing was
+	 * exhausted.
+	 *
+	 * Resolves the session for `connectionId` (or the primary connection when omitted, honoring multi-account
+	 * reads) and recovers a thrown error into `{ error }` so callers can surface it as a warning instead of
+	 * swallowing it to `undefined`.
 	 */
 	@trace()
 	async getOrganizationsForUserResult(
@@ -416,17 +426,9 @@ export abstract class GitHostIntegration<
 	 * every other host ignores it. (Azure without a project can't page its cross-project merge, so it
 	 * returns all matches in a single page.) `truncated === true` means the defensive page-drain
 	 * backstop stopped before the upstream listing was exhausted.
-	 */
-	async getRepositoriesForOrg(
-		org: string,
-		options?: { project?: string; cursor?: string },
-	): Promise<ProviderHierarchyResult<ProviderRepository> | undefined> {
-		return (await this.getRepositoriesForOrgResult(org, options))?.value;
-	}
-
-	/**
-	 * Result-returning core of {@link getRepositoriesForOrg}. Resolves the session for `connectionId`
-	 * (or the primary connection when omitted) and recovers a thrown error into `{ error }` for warnings.
+	 *
+	 * Resolves the session for `connectionId` (or the primary connection when omitted) and recovers a thrown
+	 * error into `{ error }`, so a caller surfaces it as a warning instead of a silent `undefined`.
 	 */
 	@trace()
 	async getRepositoriesForOrgResult(
@@ -706,11 +708,7 @@ export abstract class GitHostIntegration<
 				(isAzureDevOpsProvider(providerId) &&
 					!reposOrRepoIds.every(repo => repo.project != null && repo.namespace != null)))
 		) {
-			Logger.warn(`Unsupported input for provider ${providerId}`, 'getIssuesForRepos');
-			return {
-				error: new Error(`Unsupported input for provider ${providerId}`),
-				duration: performance.now() - start,
-			};
+			return unsupportedRead(`Unsupported input for provider ${providerId}`, start, 'getIssuesForRepos');
 		}
 
 		let getIssuesOptions: GetIssuesOptions | undefined;
@@ -723,28 +721,24 @@ export abstract class GitHostIntegration<
 			}
 
 			if (organizations.size > 1) {
-				Logger.warn(`Multiple organizations not supported for provider ${providerId}`, 'getIssuesForRepos');
-				return {
-					error: new Error(`Multiple organizations not supported for provider ${providerId}`),
-					duration: performance.now() - start,
-				};
+				return unsupportedRead(
+					`Multiple organizations not supported for provider ${providerId}`,
+					start,
+					'getIssuesForRepos',
+				);
 			} else if (organizations.size === 0) {
-				Logger.warn(`No organizations found for provider ${providerId}`, 'getIssuesForRepos');
-				return {
-					error: new Error(`No organizations found for provider ${providerId}`),
-					duration: performance.now() - start,
-				};
+				return unsupportedRead(`No organizations found for provider ${providerId}`, start, 'getIssuesForRepos');
 			}
 
 			const organization: string = first(organizations.values())!;
 
 			if (options?.filters != null) {
 				if (!api.providerSupportsIssueFilters(providerId, options.filters)) {
-					Logger.warn(`Unsupported filters for provider ${providerId}`, 'getIssuesForRepos');
-					return {
-						error: new Error(`Unsupported filters for provider ${providerId}`),
-						duration: performance.now() - start,
-					};
+					return unsupportedRead(
+						`Unsupported filters for provider ${providerId}`,
+						start,
+						'getIssuesForRepos',
+					);
 				}
 
 				let userAccount: ProviderAccount | undefined;
@@ -756,21 +750,17 @@ export abstract class GitHostIntegration<
 				}
 
 				if (userAccount == null) {
-					Logger.warn(`Unable to get current user for ${providerId}`, 'getIssuesForRepos');
-					return {
-						error: new Error(`Unable to get current user for ${providerId}`),
-						duration: performance.now() - start,
-					};
+					return unsupportedRead(`Unable to get current user for ${providerId}`, start, 'getIssuesForRepos');
 				}
 
 				const userFilterProperty = userAccount.name;
 
 				if (userFilterProperty == null) {
-					Logger.warn(`Unable to get user property for filter for ${providerId}`, 'getIssuesForRepos');
-					return {
-						error: new Error(`Unable to get user property for filter for ${providerId}`),
-						duration: performance.now() - start,
-					};
+					return unsupportedRead(
+						`Unable to get user property for filter for ${providerId}`,
+						start,
+						'getIssuesForRepos',
+					);
 				}
 
 				getIssuesOptions = {
@@ -889,11 +879,7 @@ export abstract class GitHostIntegration<
 			// branch above applies. Without it an unsupported filter (e.g. GitLab has no Mention endpoint) would
 			// resolve to no filter property being set and silently degrade to an unfiltered, project-wide read.
 			if (!api.providerSupportsIssueFilters(providerId, options.filters)) {
-				Logger.warn(`Unsupported filters for provider ${providerId}`, 'getIssuesForRepos');
-				return {
-					error: new Error(`Unsupported filters for provider ${providerId}`),
-					duration: performance.now() - start,
-				};
+				return unsupportedRead(`Unsupported filters for provider ${providerId}`, start, 'getIssuesForRepos');
 			}
 
 			let userAccount: ProviderAccount | undefined;
@@ -905,20 +891,16 @@ export abstract class GitHostIntegration<
 			}
 
 			if (userAccount == null) {
-				Logger.warn(`Unable to get current user for ${providerId}`, 'getIssuesForRepos');
-				return {
-					error: new Error(`Unable to get current user for ${providerId}`),
-					duration: performance.now() - start,
-				};
+				return unsupportedRead(`Unable to get current user for ${providerId}`, start, 'getIssuesForRepos');
 			}
 
 			const userFilterProperty = userAccount.username;
 			if (userFilterProperty == null) {
-				Logger.warn(`Unable to get user property for filter for ${providerId}`, 'getIssuesForRepos');
-				return {
-					error: new Error(`Unable to get user property for filter for ${providerId}`),
-					duration: performance.now() - start,
-				};
+				return unsupportedRead(
+					`Unable to get user property for filter for ${providerId}`,
+					start,
+					'getIssuesForRepos',
+				);
 			}
 
 			getIssuesOptions = {
@@ -1124,21 +1106,17 @@ export abstract class GitHostIntegration<
 				(isAzureDevOpsProvider(providerId) &&
 					!reposOrRepoIds.every(repo => repo.project != null && repo.namespace != null)))
 		) {
-			Logger.warn(`Unsupported input for provider ${providerId}`);
-			return {
-				error: new Error(`Unsupported input for provider ${providerId}`),
-				duration: performance.now() - start,
-			};
+			return unsupportedRead(`Unsupported input for provider ${providerId}`, start);
 		}
 
 		let getPullRequestsOptions: GetPullRequestsOptions | undefined;
 		if (options?.filters != null) {
 			if (!api.providerSupportsPullRequestFilters(providerId, options.filters)) {
-				Logger.warn(`Unsupported filters for provider ${providerId}`, 'getPullRequestsForRepos');
-				return {
-					error: new Error(`Unsupported filters for provider ${providerId}`),
-					duration: performance.now() - start,
-				};
+				return unsupportedRead(
+					`Unsupported filters for provider ${providerId}`,
+					start,
+					'getPullRequestsForRepos',
+				);
 			}
 
 			let userAccount: ProviderAccount | undefined;
@@ -1158,11 +1136,11 @@ export abstract class GitHostIntegration<
 						duration: performance.now() - start,
 					};
 				} else if (organizations.size === 0) {
-					Logger.warn(`No organizations found for provider ${providerId}`, 'getPullRequestsForRepos');
-					return {
-						error: new Error(`No organizations found for provider ${providerId}`),
-						duration: performance.now() - start,
-					};
+					return unsupportedRead(
+						`No organizations found for provider ${providerId}`,
+						start,
+						'getPullRequestsForRepos',
+					);
 				}
 
 				const organization: string = first(organizations.values())!;
@@ -1182,11 +1160,11 @@ export abstract class GitHostIntegration<
 			}
 
 			if (userAccount == null) {
-				Logger.warn(`Unable to get current user for ${providerId}`, 'getPullRequestsForRepos');
-				return {
-					error: new Error(`Unable to get current user for ${providerId}`),
-					duration: performance.now() - start,
-				};
+				return unsupportedRead(
+					`Unable to get current user for ${providerId}`,
+					start,
+					'getPullRequestsForRepos',
+				);
 			}
 
 			let userFilterProperty: string | null;
@@ -1202,11 +1180,11 @@ export abstract class GitHostIntegration<
 			}
 
 			if (userFilterProperty == null) {
-				Logger.warn(`Unable to get user property for filter for ${providerId}`, 'getPullRequestsForRepos');
-				return {
-					error: new Error(`Unable to get user property for filter for ${providerId}`),
-					duration: performance.now() - start,
-				};
+				return unsupportedRead(
+					`Unable to get user property for filter for ${providerId}`,
+					start,
+					'getPullRequestsForRepos',
+				);
 			}
 
 			// Route the "review requested from me" filter to the field each provider actually reads:

package/src/plus/integrations/models/issuesIntegration.ts

@@ -87,31 +87,13 @@ export abstract class IssuesIntegration<
 
 	protected abstract getProviderResourcesForUser(session: ProviderAuthenticationSession): Promise<T[] | undefined>;
 
-	@trace()
-	async getProjectsForResources(resources: T[], connectionId?: string): Promise<T[] | undefined> {
-		return (await this.getProjectsForResourcesResult(resources, connectionId))?.value;
-	}
-
-	/**
-	 * Result-returning core of {@link getProjectsForResources}. Recovers thrown errors into `{ error }` so callers
-	 * can surface them as warnings rather than silently swallowing them to `undefined`. Implemented by unwrapping
-	 * the metadata-aware path's `values` so the array-returning contract stays backward compatible.
-	 */
-	async getProjectsForResourcesResult(
-		resources: T[],
-		connectionId?: string,
-	): Promise<IntegrationResult<T[] | undefined>> {
-		const result = await this.getProjectsForResourcesWithMetadataResult(resources, connectionId);
-		if (result == null) return undefined;
-		if (result.error != null) return { value: result.value?.values, error: result.error };
-		return { value: result.value?.values };
-	}
-
 	/**
-	 * Metadata-aware counterpart of {@link getProjectsForResourcesResult} for ProviderBackend composition:
-	 * returns the SDK collection `{ values, metadata }` (completeness + per-resource failures) so callers can
-	 * warn on failed resources and set `fetchFailed` without discarding the resources that succeeded.
+	 * Project discovery for a set of resources, returning the SDK collection `{ values, metadata }` (completeness
+	 * + per-resource failures) so callers can warn on failed resources and set `fetchFailed` without discarding
+	 * the resources that succeeded. Thrown errors are recovered into `{ error }` for the same reason: a caller
+	 * surfaces them as a warning rather than swallowing them to `undefined`.
 	 */
+	@trace()
 	async getProjectsForResourcesWithMetadataResult(
 		resources: T[],
 		connectionId?: string,
@@ -131,35 +113,6 @@ export abstract class IssuesIntegration<
 		}
 	}
 
-	async getProjectsForUser(connectionId?: string): Promise<T[] | undefined> {
-		return (await this.getProjectsForUserResult(connectionId))?.value;
-	}
-
-	/**
-	 * Result-returning core of {@link getProjectsForUser}. Composes the resource and project result methods so
-	 * callers can surface per-step warnings. Unwraps the metadata-aware path for the array-returning contract.
-	 */
-	async getProjectsForUserResult(connectionId?: string): Promise<IntegrationResult<T[] | undefined>> {
-		const result = await this.getProjectsForUserWithMetadataResult(connectionId);
-		if (result == null) return undefined;
-		if (result.error != null) return { value: result.value?.values, error: result.error };
-		return { value: result.value?.values };
-	}
-
-	/**
-	 * Metadata-aware counterpart of {@link getProjectsForUserResult}: composes resource discovery with the
-	 * metadata-aware project read so ProviderBackend consumers get completeness/failures across resources.
-	 */
-	async getProjectsForUserWithMetadataResult(
-		connectionId?: string,
-	): Promise<IntegrationResult<ProviderApiCollectionResult<T> | undefined>> {
-		const resources = await this.getResourcesForUserResult(connectionId);
-		if (resources?.error != null) return { error: resources.error };
-		if (resources?.value == null) return undefined;
-
-		return this.getProjectsForResourcesWithMetadataResult(resources.value, connectionId);
-	}
-
 	/**
 	 * Metadata-aware provider project discovery. The default wraps the array-returning
 	 * {@link getProviderProjectsForResources} in `{ values }` with no metadata, so providers without a

package/src/plus/integrations/providers/azureDevOps.ts

@@ -1062,7 +1062,7 @@ export abstract class AzureDevOpsIntegrationBase<
 				{ providerId: this.id, resourceId: p.resourceId, projectId: p.name },
 			);
 			return {
-				issues: result.values.map(i => fromProviderIssue(i, this as any, { project: p })),
+				issues: result.values.map(i => fromProviderIssue(i, this, { project: p })),
 				// Azure work-item ids are organization-scoped. Include both org and project so the
 				// assigned/authored passes dedupe the same item without collapsing another org's item.
 				projectKey: `${p.resourceId}:${p.id}`,