@gitkraken/core-gitlens 0.9.4 → 0.9.6

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

@@ -78,7 +78,7 @@ function getProviderPullRequestIdentity(pr) {
 	const owner = typeof repository.owner === "string" ? repository.owner : repository.owner?.login;
 	const repositoryId = repository.id != null ? String(repository.id).trim() : "";
 	if (repositoryId !== "") return `repository:${repositoryId}:pull-request:${pr.id}`;
-	const name = repository.name?.trim() ?? "";
+	const name = (repository.name ?? repository.repo)?.trim() ?? "";
 	const namespace = (repository.namespace ?? owner)?.trim() ?? "";
 	const project = repository.project?.trim() ?? "";
 	if (name !== "" && (namespace !== "" || project !== "")) return `repository:${namespace}/${project}/${name}:pull-request:${pr.id}`;
@@ -620,7 +620,7 @@ function toIssueShape(issue, provider, options) {
 		repository: issue.repository?.owner?.login != null ? {
 			owner: issue.repository.owner.login,
 			repo: issue.repository.name,
-			id: issue.repository.id
+			id: issue.repository.id || void 0
 		} : void 0,
 		labels: issue.labels.map((label) => ({
 			color: label.color ?? void 0,
@@ -631,7 +631,8 @@ function toIssueShape(issue, provider, options) {
 		body: issue.description ?? void 0,
 		bodyFormat: isJira ? "jira-wiki" : void 0,
 		issueType: issue.type ?? void 0,
-		iterations: toIssueIterations(issue)
+		iterations: toIssueIterations(issue),
+		...options?.projection != null ? { projection: options.projection } : {}
 	};
 }
 function toIssueIterations(issue) {
@@ -829,7 +830,7 @@ function toProviderPullRequest(pr) {
 		commentCount: pr.commentsCount ?? null,
 		upvoteCount: pr.thumbsUpCount ?? null,
 		commitCount: pr.commitCount ?? null,
-		fileCount: null,
+		fileCount: pr.filesChanged ?? null,
 		additions: pr.additions ?? null,
 		deletions: pr.deletions ?? null,
 		author: toProviderAccount(pr.author),
@@ -855,7 +856,7 @@ function toProviderPullRequest(pr) {
 			owner: { login: "" },
 			remoteInfo: null
 		},
-		headRepository: pr.refs?.head != null ? {
+		headRepository: pr.refs?.head?.owner && pr.refs.head.repo ? {
 			id: pr.refs.head.repo,
 			name: pr.refs.head.repo,
 			owner: { login: pr.refs.head.owner },
@@ -872,10 +873,10 @@ function toProviderPullRequest(pr) {
 			url: ""
 		}] } : null,
 		permissions: pr.viewerCanUpdate == null ? null : {
-			canMerge: pr.viewerCanUpdate === true && pr.repository.accessLevel != null && pr.repository.accessLevel >= 30,
+			canMerge: pr.viewerCanUpdate === true && (pr.repository.accessLevel == null || pr.repository.accessLevel >= 30),
 			canMergeAndBypassProtections: pr.viewerCanUpdate === true && pr.repository.accessLevel != null && pr.repository.accessLevel >= 100
 		},
-		mergeableState: pr.mergeableState ? toProviderPullRequestMergeableState[pr.mergeableState] : GitPullRequestMergeableState.Unknown
+		mergeableState: pr.mergeableState ? toProviderPullRequestMergeableState[pr.mergeableState] : void 0
 	};
 }
 function fromProviderPullRequest(pr, provider, options) {
@@ -888,8 +889,7 @@ function fromProviderPullRequest(pr, provider, options) {
 	return new PullRequest(provider, fromProviderAccount(pr.author), pr.id, pr.graphQLId || pr.id, pr.title, pr.url ?? "", {
 		owner: repositoryOwner,
 		repo: repositoryName,
-		accessLevel: 30,
-		id: repository?.id ?? ""
+		id: repository?.id || void 0
 	}, fromProviderPullRequestState(pr.state), pr.createdDate, pr.updatedDate, pr.closedDate ?? void 0, pr.mergedDate ?? void 0, pr.mergeableState ? fromProviderPullRequestMergeableState[pr.mergeableState] : void 0, pr.permissions?.canMerge || pr.permissions?.canMergeAndBypassProtections ? true : void 0, {
 		base: {
 			branch: pr.baseRef?.name ?? "",
@@ -913,7 +913,35 @@ function fromProviderPullRequest(pr, provider, options) {
 			isFork: headRepository?.isFork
 		},
 		isCrossRepository: pr.isCrossRepository
-	}, pr.isDraft, pr.additions ?? void 0, pr.deletions ?? void 0, pr.commentCount ?? void 0, pr.upvoteCount ?? void 0, pr.reviewDecision ? fromPullRequestReviewDecision[pr.reviewDecision] : void 0, toReviewRequests(pr.reviews), toCompletedReviews(pr.reviews), pr.assignees?.map(fromProviderAccount) ?? void 0, toStatusCheckRollupState(pr.headCommit?.buildStatuses), options?.project, pr.version, pr.commitCount ?? void 0, void 0, pr.fileCount ?? void 0, pr.description ?? void 0, pr.number, options?.currentAccount != null ? authoredByCurrentAccount(pr, provider, options.currentAccount) : void 0);
+	}, pr.isDraft, pr.additions ?? void 0, pr.deletions ?? void 0, pr.commentCount ?? void 0, pr.upvoteCount ?? void 0, pr.reviewDecision ? fromPullRequestReviewDecision[pr.reviewDecision] : void 0, toReviewRequests(pr.reviews), toCompletedReviews(pr.reviews), pr.assignees?.map(fromProviderAccount) ?? void 0, toStatusCheckRollupState(pr.headCommit?.buildStatuses), options?.project, pr.version, pr.commitCount ?? void 0, void 0, pr.fileCount ?? void 0, pr.description ?? void 0, pr.number, options?.currentAccount != null ? authoredByCurrentAccount(pr.author, provider, options.currentAccount) : void 0, options?.projection, options?.currentAccount);
+}
+/**
+* A GitLens-native row (GitHub's own reads) tagged for the read that returned it, with `authoredByMe` and `viewer`
+* resolved by the same rule {@link fromProviderPullRequest} applies. Returns a copy: the mapper's row stays as it was
+* built.
+*/
+function stampNativePullRequest(pr, options) {
+	return Object.assign(Object.create(PullRequest.prototype), pr, {
+		authoredByMe: options.currentAccount != null ? authoredByCurrentAccount(pr.author, pr.provider, options.currentAccount) : void 0,
+		viewer: options.currentAccount,
+		projection: options.projection
+	});
+}
+/**
+* A row of an account-wide read as a `PullRequest`. GitHub's are GitLens-native, which {@link stampNativePullRequest}
+* tags; every other host's are provider-apis', which {@link fromProviderPullRequest} converts.
+*/
+function toPullRequestRow(pr, provider, options) {
+	return isNativePullRequest(pr) ? stampNativePullRequest(pr, options) : fromProviderPullRequest(pr, provider, options);
+}
+/**
+* By shape rather than by class, which a second copy of the model module fails: a native row is a `'pullrequest'` that
+* names its provider, which provider-apis' rows never do. Both, so a key provider-apis adds later can't reroute its
+* rows.
+*/
+function isNativePullRequest(pr) {
+	const row = pr;
+	return row.type === "pullrequest" && row.provider != null && typeof row.provider === "object";
 }
 /**
 * GitLens' own GitHub GraphQL client keys people by login, while the current account's `id` is GitHub's
@@ -921,9 +949,9 @@ function fromProviderPullRequest(pr, provider, options) {
 * GitHub row shape, so the username fallback is safe there; elsewhere `toProviderAccount` fills `username`
 * from a display name that two people can share, so only GitHub and GitHub Enterprise get the fallback.
 */
-function authoredByCurrentAccount(pr, provider, currentAccount) {
-	if (pr.author?.id === currentAccount.id) return true;
-	return (provider.id === "github" || provider.id === "cloud-github-enterprise") && currentAccount.username != null && pr.author?.username === currentAccount.username;
+function authoredByCurrentAccount(author, provider, currentAccount) {
+	if (author?.id === currentAccount.id) return true;
+	return (provider.id === "github" || provider.id === "cloud-github-enterprise") && currentAccount.username != null && author?.username === currentAccount.username;
 }
 function fromProviderIssue(issue, integration, options) {
 	const identifier = toIssueIdentifier(issue.number);
@@ -931,7 +959,7 @@ function fromProviderIssue(issue, integration, options) {
 	return new Issue(integration, identifier, issue.graphQLId ?? issue.id, issue.title, issue.url ?? "", issue.createdDate, issue.updatedDate ?? issue.closedDate ?? issue.createdDate, closed, closed ? "closed" : "opened", fromProviderAccount(issue.author), issue.assignees?.map(fromProviderAccount) ?? void 0, issue.repository != null ? {
 		owner: issue.repository.owner.login ?? "",
 		repo: issue.repository.name,
-		id: issue.repository.id
+		id: issue.repository.id || void 0
 	} : void 0, issue.closedDate ?? void 0, issue.labels?.map((label) => ({
 		name: label.name,
 		color: label.color ?? void 0
@@ -945,12 +973,13 @@ function fromProviderIssue(issue, integration, options) {
 		name: issue.project.name,
 		resourceId: issue.project.resourceId,
 		resourceName: issue.project.namespace
-	} : void 0, identifier, issue.type ?? void 0, toIssueProviderState(issue.state, integration.id !== "jira"), integration.id === "jira" ? "jira-wiki" : void 0, toIssueIterations(issue));
+	} : void 0, identifier, issue.type ?? void 0, toIssueProviderState(issue.state, integration.id !== "jira"), integration.id === "jira" ? "jira-wiki" : void 0, toIssueIterations(issue), options?.projection);
 }
 function toProviderPullRequestWithUniqueId(pr) {
-	const { reviews, ...providerPr } = toProviderPullRequest(pr);
+	const { reviews, mergeableState, ...providerPr } = toProviderPullRequest(pr);
 	return {
 		...providerPr,
+		mergeableState: mergeableState ?? (pr.provider.id === "bitbucket" ? GitPullRequestMergeableState.Mergeable : GitPullRequestMergeableState.Unknown),
 		reviews: reviews?.filter((r) => r.state !== "DISMISSED") ?? null,
 		uuid: EntityIdentifierUtils.encode(getEntityIdentifierInput(pr))
 	};
@@ -974,6 +1003,6 @@ function supportsCodeSuggest(provider) {
 	return isGitHubDotCom(provider.domain);
 }
 //#endregion
-export { GitBuildStatusState, GitIssueState, GitPullRequestMergeableState, GitPullRequestReviewState, GitPullRequestState, IssueFilter, PagingMode, ProviderBuildStatusState, ProviderPullRequestReviewState, PullRequestFilter, fromProviderBuildStatusState, fromProviderIssue, fromProviderPullRequest, fromProviderPullRequestMergeableState, fromProviderPullRequestState, getActionablePullRequests, getProviderPullRequestIdentity, getReasonsForUserIssue, isAzureCloudDomain, isBitbucketCloudDomain, isGitHubDotCom, isGitLabDotCom, isRepoIdsInput, issueFilterToReason, providerPullRequestMatchesSearch, providersMetadata, resolveProviderScope, supportsCodeSuggest, toAccount, toIssueShape, toProviderBuildStatusState, toProviderIssueStates, toProviderPullRequest, toProviderPullRequestMergeableState, toProviderPullRequestState, toProviderPullRequestStates, toProviderPullRequestWithUniqueId, toProviderRepositoryShape };
+export { GitBuildStatusState, GitIssueState, GitPullRequestMergeableState, GitPullRequestReviewState, GitPullRequestState, IssueFilter, PagingMode, ProviderBuildStatusState, ProviderPullRequestReviewState, PullRequestFilter, fromProviderBuildStatusState, fromProviderIssue, fromProviderPullRequest, fromProviderPullRequestMergeableState, fromProviderPullRequestState, getActionablePullRequests, getProviderPullRequestIdentity, getReasonsForUserIssue, isAzureCloudDomain, isBitbucketCloudDomain, isGitHubDotCom, isGitLabDotCom, isNativePullRequest, isRepoIdsInput, issueFilterToReason, providerPullRequestMatchesSearch, providersMetadata, resolveProviderScope, stampNativePullRequest, supportsCodeSuggest, toAccount, toIssueShape, toProviderBuildStatusState, toProviderIssueStates, toProviderPullRequest, toProviderPullRequestMergeableState, toProviderPullRequestState, toProviderPullRequestStates, toProviderPullRequestWithUniqueId, toProviderRepositoryShape, toPullRequestRow, toStatusCheckRollupState };
 
 //# sourceMappingURL=models.js.map