lalph 0.3.36 → 0.3.37

package/dist/cli.mjs

@@ -159140,6 +159140,7 @@ const GithubIssueSource = effect$1(IssueSource, gen(function* () {
 		capacity: Number.POSITIVE_INFINITY
 	});
 	const hasLabel = (label, name) => label.some((l) => typeof l === "string" ? l === name : l.name === name);
+	const matchesLabelFilter = (labels, labelFilter) => labelFilter.pipe(map$14((label) => hasLabel(labels, label)), getOrElse$1(() => true));
 	const listOpenBlockedBy = (issueId) => pipe(github.stream((rest, page) => rest.issues.listDependenciesBlockedBy({
 		owner: cli.owner,
 		repo: cli.repo,
@@ -159147,13 +159148,14 @@ const GithubIssueSource = effect$1(IssueSource, gen(function* () {
 		per_page: 100,
 		page
 	})), filter$2((issue) => issue.state === "open"));
-	const recentlyClosed = pipe(github.stream((rest, page) => rest.issues.listForRepo({
+	const recentlyClosed = (labelFilter) => pipe(github.stream((rest, page) => rest.issues.listForRepo({
 		owner: cli.owner,
 		repo: cli.repo,
 		state: "closed",
 		per_page: 100,
 		page,
-		since: nowUnsafe().pipe(subtract({ days: 3 }), formatIso)
+		since: nowUnsafe().pipe(subtract({ days: 3 }), formatIso),
+		labels: getOrUndefined(labelFilter)
 	})), filter$2((issue) => issue.state_reason !== "not_planned"));
 	const presets = yield* getPresetsWithMetadata("github", PresetMetadata);
 	const issuePresetMap = /* @__PURE__ */ new Map();
@@ -159181,16 +159183,16 @@ const GithubIssueSource = effect$1(IssueSource, gen(function* () {
 		return yield* projectFilterSelect;
 	});
 	const repository = `${cli.owner}/${cli.repo}`.toLowerCase();
-	const projectIssues = (project) => {
+	const projectIssues = (options) => {
 		const threeDaysAgo = nowUnsafe().pipe(subtract({ days: 3 }));
 		return paginate$1(null, (cursor) => github.graphql(githubProjectItemsQuery, {
-			projectId: project.id,
+			projectId: options.project.id,
 			after: cursor
-		}).pipe(map$8((data) => [data.node.items.nodes.map((item) => item.content), fromNullOr(data.node.items.pageInfo.endCursor)]))).pipe(filter$2((_) => _.repository.nameWithOwner.toLowerCase() === repository && (!_.closedAt || makeUnsafe$10(_.closedAt).pipe(isGreaterThan$2(threeDaysAgo)))), map$6((issue) => ({
+		}).pipe(map$8((data) => [data.node.items.nodes.flatMap((item) => isGithubProjectIssue(item.content) ? [item.content] : []), fromNullOr(data.node.items.pageInfo.endCursor)]))).pipe(filter$2((issue) => issue.repository.nameWithOwner.toLowerCase() === repository && (!issue.closedAt || makeUnsafe$10(issue.closedAt).pipe(isGreaterThan$2(threeDaysAgo)))), map$6((issue) => ({
 			...issue,
 			state: issue.state.toLowerCase(),
 			labels: issue.labels.nodes.map((label) => label.name)
-		})));
+		})), filter$2((issue) => matchesLabelFilter(issue.labels, options.labelFilter)));
 	};
 	const repoIssues = (options) => pipe(github.stream((rest, page) => rest.issues.listForRepo({
 		owner: cli.owner,
@@ -159199,9 +159201,12 @@ const GithubIssueSource = effect$1(IssueSource, gen(function* () {
 		per_page: 100,
 		page,
 		labels: getOrUndefined(options.labelFilter)
-	})), merge$2(recentlyClosed), filter$2((issue) => issue.pull_request === void 0));
+	})), merge$2(recentlyClosed(options.labelFilter)), filter$2((issue) => issue.pull_request === void 0));
 	const issues = (options) => {
-		return pipe(unify(isSome(options.projectFilter) ? projectIssues(options.projectFilter.value) : repoIssues(options)), mapEffect$1(fnUntraced(function* (issue) {
+		return pipe(unify(isSome(options.projectFilter) ? projectIssues({
+			project: options.projectFilter.value,
+			labelFilter: options.labelFilter
+		}) : repoIssues(options)), mapEffect$1(fnUntraced(function* (issue) {
 			const id = `#${issue.number}`;
 			const dependencies = yield* listOpenBlockedBy(issue.number).pipe(runCollect);
 			const state = issue.state === "closed" ? "done" : hasLabel(issue.labels, "in-progress") ? "in-progress" : hasLabel(issue.labels, "in-review") ? "in-review" : "todo";
@@ -159426,6 +159431,7 @@ const getOrSelectAutoMergeLabel = gen(function* () {
 	return yield* autoMergeLabelSelect;
 });
 const PresetMetadata = Struct({ label: NonEmptyString });
+const isGithubProjectIssue = (content) => content !== null && content.__typename === "Issue";
 const githubProjectsQuery = `
 query GithubProjects($after: String) {
   viewer {
@@ -161037,7 +161043,7 @@ const commandSource = make$34("source").pipe(withDescription("Select the issue s
 
 //#endregion
 //#region package.json
-var version = "0.3.36";
+var version = "0.3.37";
 
 //#endregion
 //#region src/commands/projects/ls.ts

package/package.json

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

package/src/Github.ts

@@ -221,6 +221,20 @@ export const GithubIssueSource = Layer.effect(
     ): boolean =>
       label.some((l) => (typeof l === "string" ? l === name : l.name === name))
 
+    const matchesLabelFilter = (
+      labels: ReadonlyArray<
+        | string
+        | {
+            readonly name?: string
+          }
+      >,
+      labelFilter: Option.Option<string>,
+    ): boolean =>
+      labelFilter.pipe(
+        Option.map((label) => hasLabel(labels, label)),
+        Option.getOrElse(() => true),
+      )
+
     const listOpenBlockedBy = (issueId: number) =>
       pipe(
         github.stream((rest, page) =>
@@ -235,22 +249,24 @@ export const GithubIssueSource = Layer.effect(
         Stream.filter((issue) => issue.state === "open"),
       )
 
-    const recentlyClosed = pipe(
-      github.stream((rest, page) =>
-        rest.issues.listForRepo({
-          owner: cli.owner,
-          repo: cli.repo,
-          state: "closed",
-          per_page: 100,
-          page,
-          since: DateTime.nowUnsafe().pipe(
-            DateTime.subtract({ days: 3 }),
-            DateTime.formatIso,
-          ),
-        }),
-      ),
-      Stream.filter((issue) => issue.state_reason !== "not_planned"),
-    )
+    const recentlyClosed = (labelFilter: Option.Option<string>) =>
+      pipe(
+        github.stream((rest, page) =>
+          rest.issues.listForRepo({
+            owner: cli.owner,
+            repo: cli.repo,
+            state: "closed",
+            per_page: 100,
+            page,
+            since: DateTime.nowUnsafe().pipe(
+              DateTime.subtract({ days: 3 }),
+              DateTime.formatIso,
+            ),
+            labels: Option.getOrUndefined(labelFilter),
+          }),
+        ),
+        Stream.filter((issue) => issue.state_reason !== "not_planned"),
+      )
 
     const presets = yield* getPresetsWithMetadata("github", PresetMetadata)
     const issuePresetMap = new Map<string, CliAgentPreset>()
@@ -308,28 +324,33 @@ export const GithubIssueSource = Layer.effect(
 
     const repository = `${cli.owner}/${cli.repo}`.toLowerCase()
 
-    const projectIssues = (project: GithubProject) => {
+    const projectIssues = (options: {
+      readonly project: GithubProject
+      readonly labelFilter: Option.Option<string>
+    }) => {
       const threeDaysAgo = DateTime.nowUnsafe().pipe(
         DateTime.subtract({ days: 3 }),
       )
       return Stream.paginate(null, (cursor: string | null) =>
         github
           .graphql<GithubProjectItemsQuery>(githubProjectItemsQuery, {
-            projectId: project.id,
+            projectId: options.project.id,
             after: cursor,
           })
           .pipe(
             Effect.map((data) => [
-              data.node.items.nodes.map((item) => item.content),
+              data.node.items.nodes.flatMap((item) =>
+                isGithubProjectIssue(item.content) ? [item.content] : [],
+              ),
               Option.fromNullOr(data.node.items.pageInfo.endCursor),
             ]),
           ),
       ).pipe(
         Stream.filter(
-          (_) =>
-            _.repository.nameWithOwner.toLowerCase() === repository &&
-            (!_.closedAt ||
-              DateTime.makeUnsafe(_.closedAt).pipe(
+          (issue) =>
+            issue.repository.nameWithOwner.toLowerCase() === repository &&
+            (!issue.closedAt ||
+              DateTime.makeUnsafe(issue.closedAt).pipe(
                 DateTime.isGreaterThan(threeDaysAgo),
               )),
         ),
@@ -338,6 +359,9 @@ export const GithubIssueSource = Layer.effect(
           state: issue.state.toLowerCase(),
           labels: issue.labels.nodes.map((label) => label.name),
         })),
+        Stream.filter((issue) =>
+          matchesLabelFilter(issue.labels, options.labelFilter),
+        ),
       )
     }
 
@@ -355,7 +379,7 @@ export const GithubIssueSource = Layer.effect(
             labels: Option.getOrUndefined(options.labelFilter),
           }),
         ),
-        Stream.merge(recentlyClosed),
+        Stream.merge(recentlyClosed(options.labelFilter)),
         Stream.filter((issue) => issue.pull_request === undefined),
       )
 
@@ -366,7 +390,10 @@ export const GithubIssueSource = Layer.effect(
     }) => {
       const source = Unify.unify(
         Option.isSome(options.projectFilter)
-          ? projectIssues(options.projectFilter.value)
+          ? projectIssues({
+              project: options.projectFilter.value,
+              labelFilter: options.labelFilter,
+            })
           : repoIssues(options),
       )
 
@@ -827,26 +854,35 @@ type GithubProjectsQuery = {
   }
 }
 
+type GithubProjectIssue = {
+  readonly __typename: "Issue"
+  readonly number: number
+  readonly repository: {
+    readonly nameWithOwner: string
+  }
+  readonly title: string
+  readonly body: string
+  readonly state: string
+  readonly labels: {
+    readonly nodes: ReadonlyArray<{
+      readonly name: string
+    }>
+  }
+  readonly closedAt: string | null
+}
+
+type GithubProjectItemContent =
+  | GithubProjectIssue
+  | {
+      readonly __typename: string
+    }
+  | null
+
 type GithubProjectItemsQuery = {
   readonly node: {
     readonly items: {
       readonly nodes: ReadonlyArray<{
-        readonly content: {
-          readonly __typename: string
-          readonly number: number
-          readonly repository: {
-            readonly nameWithOwner: string
-          }
-          readonly title: string
-          readonly body: string
-          readonly state: string
-          readonly labels: {
-            readonly nodes: ReadonlyArray<{
-              readonly name: string
-            }>
-          }
-          readonly closedAt: string | null
-        }
+        readonly content: GithubProjectItemContent
       }>
       readonly pageInfo: {
         readonly endCursor: string | null
@@ -858,6 +894,11 @@ type GithubProjectItemsQuery = {
 
 // == helpers
 
+const isGithubProjectIssue = (
+  content: GithubProjectItemContent,
+): content is GithubProjectIssue =>
+  content !== null && content.__typename === "Issue"
+
 const githubProjectsQuery = `
 query GithubProjects($after: String) {
   viewer {