lalph 0.2.18 → 0.2.19

package/dist/cli.mjs

@@ -150368,32 +150368,41 @@ const PollResponse = Union([TokenResponse, PollErrorResponse]);
 
 //#endregion
 //#region src/domain/GithubComment.ts
-var Author = class extends Class("github/Author")({ login: String$1 }) {};
-var Comment = class extends Class("github/Comment")({
+var Author = class extends Class("Author")({ login: String$1 }) {};
+var Comment = class extends Class("Comment")({
 	id: String$1,
 	body: String$1,
-	author: Author
+	author: Author,
+	createdAt: String$1
 }) {};
-var CommentsEdge = class extends Class("github/CommentsEdge")({ node: Comment }) {};
-var PullRequestComments = class extends Class("PullRequestComments")({ edges: Array$1(CommentsEdge) }) {};
-var PullRequest = class extends Class("github/PullRequest")({
+var PullRequestComments = class extends Class("PullRequestComments")({ nodes: Array$1(Comment) }) {};
+var PullRequest = class extends Class("PullRequest")({
 	url: String$1,
+	reviewDecision: Null,
+	reviews: suspend(() => Reviews),
 	reviewThreads: suspend(() => ReviewThreads),
 	comments: PullRequestComments
 }) {};
-var Repository = class extends Class("github/Repository")({ pullRequest: PullRequest }) {};
-var Data = class extends Class("github/Data")({ repository: Repository }) {};
-var CommentsData = class extends Class("github/CommentsData")({ data: Data }) {};
-var ReviewComment = class extends Class("github/ReviewComment")({
+var Repository = class extends Class("Repository")({ pullRequest: PullRequest }) {};
+var Data = class extends Class("Data")({ repository: Repository }) {};
+var GithubPullRequestData = class extends Class("GithubPullRequestData")({ data: Data }) {};
+var Review = class extends Class("Review")({
+	id: String$1,
+	author: Author,
+	body: String$1
+}) {};
+var Reviews = class extends Class("Reviews")({ nodes: Array$1(Review) }) {};
+var ReviewComment = class extends Class("ReviewComment")({
 	id: String$1,
 	author: Author,
 	body: String$1,
 	path: String$1,
-	originalLine: NullOr(Number$1),
-	diffHunk: String$1
+	originalLine: Number$1,
+	diffHunk: String$1,
+	createdAt: String$1
 }) {};
-var NodeComments = class extends Class("github/NodeComments")({ nodes: Array$1(ReviewComment) }) {};
-var ReviewThreadNode = class extends Class("github/ReviewThreadNode")({
+var NodeComments = class extends Class("NodeComments")({ nodes: Array$1(ReviewComment) }) {};
+var ReviewThreadsNode = class extends Class("ReviewThreadsNode")({
 	isCollapsed: Boolean$2,
 	isOutdated: Boolean$2,
 	isResolved: Boolean$2,
@@ -150402,8 +150411,7 @@ var ReviewThreadNode = class extends Class("github/ReviewThreadNode")({
 	commentNodes = this.comments.nodes;
 	shouldDisplayThread = !this.isCollapsed && !this.isOutdated;
 };
-var ReviewThreadsEdge = class extends Class("ReviewThreadsEdge")({ node: ReviewThreadNode }) {};
-var ReviewThreads = class extends Class("github/ReviewThreads")({ edges: Array$1(ReviewThreadsEdge) }) {};
+var ReviewThreads = class extends Class("ReviewThreads")({ nodes: Array$1(ReviewThreadsNode) }) {};
 
 //#endregion
 //#region src/Github/Cli.ts
@@ -150413,15 +150421,16 @@ var GithubCli = class extends Service$1()("lalph/Github/Cli", { make: gen(functi
 		onNone: () => fail$4(new GithubCliRepoNotFound()),
 		onSome: (value) => succeed$1(value)
 	}))))).split("/");
-	const reviewComments = (pr) => make$23`gh api graphql -f owner=${owner} -f repo=${repo} -F pr=${pr} -f query=${githubReviewCommentsQuery}`.pipe(string, flatMap$2(decodeEffect(CommentsFromJson)), map$8((data) => {
+	const reviewComments = (pr) => make$23`gh api graphql -f owner=${owner} -f repo=${repo} -F pr=${pr} -f query=${githubReviewCommentsQuery}`.pipe(string, flatMap$2(decodeEffect(PullRequestDataFromJson)), map$8((data) => {
 		return {
-			comments: data.data.repository.pullRequest.comments.edges.map((edge) => edge.node),
-			reviewThreads: data.data.repository.pullRequest.reviewThreads.edges.map((edge) => edge.node)
+			comments: data.data.repository.pullRequest.comments.nodes.filter((c) => !c.author.login.startsWith("github")),
+			reviews: data.data.repository.pullRequest.reviews.nodes.filter((r) => r.body.trim().length > 0),
+			reviewThreads: data.data.repository.pullRequest.reviewThreads.nodes
 		};
 	}), provideService(ChildProcessSpawner, spawner));
-	const prFeedbackMd = (pr) => reviewComments(pr).pipe(map$8(({ comments, reviewThreads }) => {
+	const prFeedbackMd = (pr) => reviewComments(pr).pipe(map$8(({ comments, reviewThreads, reviews }) => {
 		const eligibleReviewThreads = reviewThreads.filter((thread) => thread.shouldDisplayThread);
-		if (comments.length === 0 && eligibleReviewThreads.length === 0) return `No review comments found.`;
+		if (comments.length === 0 && eligibleReviewThreads.length === 0 && reviews.length === 0) return `No review comments found.`;
 		let content = `# PR feedback
 
 Comments are rendered in XML format.`;
@@ -150432,6 +150441,18 @@ Comments are rendered in XML format.`;
 ## Review Comments
 
 ${reviewCommentsMd}`;
+		}
+		if (reviews.length > 0) {
+			const reviewsXml = reviews.map((review) => `<review author="${review.author.login}">
+  <body><![CDATA[${review.body}]]></body>
+</review>`).join("\n");
+			content += `
+
+## Reviews
+
+<reviews>
+${reviewsXml}
+</reviews>`;
 		}
 		if (comments.length > 0) {
 			const generalCommentsXml = comments.map((comment) => renderGeneralComment(comment)).join("\n");
@@ -150470,46 +150491,55 @@ const renderReviewComments = (comment, followup) => `<comment author="${comment.
 const renderGeneralComment = (comment) => `  <comment author="${comment.author.login}">
     <body><![CDATA[${comment.body}]]></body>
   </comment>`;
-const CommentsFromJson = fromJsonString(CommentsData);
+const PullRequestDataFromJson = fromJsonString(GithubPullRequestData);
 const githubReviewCommentsQuery = `
-  query FetchPRComments($owner: String!, $repo: String!, $pr: Int!) {
-    repository(owner: $owner, name: $repo) {
-      pullRequest(number: $pr) {
-        url
-        reviewDecision
-        reviewThreads(first: 100) {
-          edges {
-            node {
-              isCollapsed
-              isOutdated
-              isResolved
-              comments(first: 100) {
-                nodes {
-                  id
-                  author { login }
-                  body
-                  path
-                  originalLine
-                  diffHunk
-                  createdAt
-                }
-              }
-            }
+query FetchPRComments($owner: String!, $repo: String!, $pr: Int!) {
+  repository(owner: $owner, name: $repo) {
+    pullRequest(number: $pr) {
+      url
+      reviewDecision
+      reviews(first: 100) {
+        nodes {
+          id
+          author {
+            login
           }
+          body
         }
-        comments(first: 100) {
-          edges {
-            node {
+      }
+      reviewThreads(first: 100) {
+        nodes {
+          isCollapsed
+          isOutdated
+          isResolved
+          comments(first: 100) {
+            nodes {
               id
+              author {
+                login
+              }
               body
-              author { login }
+              path
+              originalLine
+              diffHunk
               createdAt
             }
           }
         }
       }
+      comments(first: 100) {
+        nodes {
+          id
+          body
+          author {
+            login
+          }
+          createdAt
+        }
+      }
     }
   }
+}
 `;
 
 //#endregion
@@ -152220,7 +152250,7 @@ const commandSource = make$35("source").pipe(withDescription("Select the issue s
 
 //#endregion
 //#region package.json
-var version = "0.2.18";
+var version = "0.2.19";
 
 //#endregion
 //#region src/commands/projects/ls.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lalph",
   "type": "module",
-  "version": "0.2.18",
+  "version": "0.2.19",
   "publishConfig": {
     "access": "public"
   },

package/src/Github/Cli.ts

@@ -10,9 +10,9 @@ import {
 } from "effect"
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
 import {
-  CommentsData,
-  ReviewComment,
   Comment,
+  GithubPullRequestData,
+  ReviewComment,
 } from "../domain/GithubComment.ts"
 
 export class GithubCli extends ServiceMap.Service<GithubCli>()(
@@ -41,17 +41,19 @@ export class GithubCli extends ServiceMap.Service<GithubCli>()(
       const reviewComments = (pr: number) =>
         ChildProcess.make`gh api graphql -f owner=${owner} -f repo=${repo} -F pr=${pr} -f query=${githubReviewCommentsQuery}`.pipe(
           ChildProcess.string,
-          Effect.flatMap(Schema.decodeEffect(CommentsFromJson)),
+          Effect.flatMap(Schema.decodeEffect(PullRequestDataFromJson)),
           Effect.map((data) => {
             const comments =
-              data.data.repository.pullRequest.comments.edges.map(
-                (edge) => edge.node,
+              data.data.repository.pullRequest.comments.nodes.filter(
+                (c) => !c.author.login.startsWith("github"),
               )
-            const reviewThreads =
-              data.data.repository.pullRequest.reviewThreads.edges.map(
-                (edge) => edge.node,
+            const reviews =
+              data.data.repository.pullRequest.reviews.nodes.filter(
+                (r) => r.body.trim().length > 0,
               )
-            return { comments, reviewThreads } as const
+            const reviewThreads =
+              data.data.repository.pullRequest.reviewThreads.nodes
+            return { comments, reviews, reviewThreads } as const
           }),
           Effect.provideService(
             ChildProcessSpawner.ChildProcessSpawner,
@@ -61,12 +63,16 @@ export class GithubCli extends ServiceMap.Service<GithubCli>()(
 
       const prFeedbackMd = (pr: number) =>
         reviewComments(pr).pipe(
-          Effect.map(({ comments, reviewThreads }) => {
+          Effect.map(({ comments, reviewThreads, reviews }) => {
             const eligibleReviewThreads = reviewThreads.filter(
               (thread) => thread.shouldDisplayThread,
             )
 
-            if (comments.length === 0 && eligibleReviewThreads.length === 0) {
+            if (
+              comments.length === 0 &&
+              eligibleReviewThreads.length === 0 &&
+              reviews.length === 0
+            ) {
               return `No review comments found.`
             }
 
@@ -90,6 +96,23 @@ Comments are rendered in XML format.`
 ${reviewCommentsMd}`
             }
 
+            if (reviews.length > 0) {
+              const reviewsXml = reviews
+                .map(
+                  (review) => `<review author="${review.author.login}">
+  <body><![CDATA[${review.body}]]></body>
+</review>`,
+                )
+                .join("\n")
+              content += `
+
+## Reviews
+
+<reviews>
+${reviewsXml}
+</reviews>`
+            }
+
             if (comments.length > 0) {
               const generalCommentsXml = comments
                 .map((comment) => renderGeneralComment(comment))
@@ -155,45 +178,54 @@ const renderGeneralComment = (
 
 // Schema definitions and GraphQL query
 
-const CommentsFromJson = Schema.fromJsonString(CommentsData)
+const PullRequestDataFromJson = Schema.fromJsonString(GithubPullRequestData)
 
 const githubReviewCommentsQuery = `
-  query FetchPRComments($owner: String!, $repo: String!, $pr: Int!) {
-    repository(owner: $owner, name: $repo) {
-      pullRequest(number: $pr) {
-        url
-        reviewDecision
-        reviewThreads(first: 100) {
-          edges {
-            node {
-              isCollapsed
-              isOutdated
-              isResolved
-              comments(first: 100) {
-                nodes {
-                  id
-                  author { login }
-                  body
-                  path
-                  originalLine
-                  diffHunk
-                  createdAt
-                }
-              }
-            }
+query FetchPRComments($owner: String!, $repo: String!, $pr: Int!) {
+  repository(owner: $owner, name: $repo) {
+    pullRequest(number: $pr) {
+      url
+      reviewDecision
+      reviews(first: 100) {
+        nodes {
+          id
+          author {
+            login
           }
+          body
         }
-        comments(first: 100) {
-          edges {
-            node {
+      }
+      reviewThreads(first: 100) {
+        nodes {
+          isCollapsed
+          isOutdated
+          isResolved
+          comments(first: 100) {
+            nodes {
               id
+              author {
+                login
+              }
               body
-              author { login }
+              path
+              originalLine
+              diffHunk
               createdAt
             }
           }
         }
       }
+      comments(first: 100) {
+        nodes {
+          id
+          body
+          author {
+            login
+          }
+          createdAt
+        }
+      }
     }
   }
+}
 `

package/src/domain/GithubComment.ts

@@ -1,62 +1,70 @@
 import * as S from "effect/Schema"
 
-export class Author extends S.Class<Author>("github/Author")({
+export class Author extends S.Class<Author>("Author")({
   login: S.String,
 }) {}
 
-export class Comment extends S.Class<Comment>("github/Comment")({
+export class Comment extends S.Class<Comment>("Comment")({
   id: S.String,
   body: S.String,
   author: Author,
-  // createdAt: S.String,
-}) {}
-
-export class CommentsEdge extends S.Class<CommentsEdge>("github/CommentsEdge")({
-  node: Comment,
+  createdAt: S.String,
 }) {}
 
 export class PullRequestComments extends S.Class<PullRequestComments>(
   "PullRequestComments",
 )({
-  edges: S.Array(CommentsEdge),
+  nodes: S.Array(Comment),
 }) {}
 
-export class PullRequest extends S.Class<PullRequest>("github/PullRequest")({
+export class PullRequest extends S.Class<PullRequest>("PullRequest")({
   url: S.String,
+  reviewDecision: S.Null,
+  reviews: S.suspend(() => Reviews),
   reviewThreads: S.suspend(() => ReviewThreads),
   comments: PullRequestComments,
 }) {}
 
-export class Repository extends S.Class<Repository>("github/Repository")({
+export class Repository extends S.Class<Repository>("Repository")({
   pullRequest: PullRequest,
 }) {}
 
-export class Data extends S.Class<Data>("github/Data")({
+export class Data extends S.Class<Data>("Data")({
   repository: Repository,
 }) {}
 
-export class CommentsData extends S.Class<CommentsData>("github/CommentsData")({
+export class GithubPullRequestData extends S.Class<GithubPullRequestData>(
+  "GithubPullRequestData",
+)({
   data: Data,
 }) {}
 
-export class ReviewComment extends S.Class<ReviewComment>(
-  "github/ReviewComment",
-)({
+export class Review extends S.Class<Review>("Review")({
+  id: S.String,
+  author: Author,
+  body: S.String,
+}) {}
+
+export class Reviews extends S.Class<Reviews>("Reviews")({
+  nodes: S.Array(Review),
+}) {}
+
+export class ReviewComment extends S.Class<ReviewComment>("ReviewComment")({
   id: S.String,
   author: Author,
   body: S.String,
   path: S.String,
-  originalLine: S.NullOr(S.Number),
+  originalLine: S.Number,
   diffHunk: S.String,
-  // createdAt: S.String,
+  createdAt: S.String,
 }) {}
 
-export class NodeComments extends S.Class<NodeComments>("github/NodeComments")({
+export class NodeComments extends S.Class<NodeComments>("NodeComments")({
   nodes: S.Array(ReviewComment),
 }) {}
 
-export class ReviewThreadNode extends S.Class<ReviewThreadNode>(
-  "github/ReviewThreadNode",
+export class ReviewThreadsNode extends S.Class<ReviewThreadsNode>(
+  "ReviewThreadsNode",
 )({
   isCollapsed: S.Boolean,
   isOutdated: S.Boolean,
@@ -67,14 +75,6 @@ export class ReviewThreadNode extends S.Class<ReviewThreadNode>(
   readonly shouldDisplayThread = !this.isCollapsed && !this.isOutdated
 }
 
-export class ReviewThreadsEdge extends S.Class<ReviewThreadsEdge>(
-  "ReviewThreadsEdge",
-)({
-  node: ReviewThreadNode,
-}) {}
-
-export class ReviewThreads extends S.Class<ReviewThreads>(
-  "github/ReviewThreads",
-)({
-  edges: S.Array(ReviewThreadsEdge),
+export class ReviewThreads extends S.Class<ReviewThreads>("ReviewThreads")({
+  nodes: S.Array(ReviewThreadsNode),
 }) {}