comfy-pr 0.2.24 → 0.2.26

package/src/updateOutdatedPullsTemplates.ts

@@ -1,160 +1,165 @@
-import { $elemMatch } from "@/packages/mongodb-pipeline-ts/$elemMatch";
-import DIE from "@snomiao/die";
-import pMap from "p-map";
-import { match } from "ts-pattern";
-import { $OK, TaskError, TaskOK, tsmatch } from "../packages/mongodb-pipeline-ts/Task";
-import { CNRepos, type CRPull } from "./CNRepos";
-import { $filaten, $fresh, $stale } from "./db";
-import { gh } from "./gh";
-import { parsePull } from "./gh/parsePull";
-import { ghUser } from "./ghUser";
-import { parseUrlRepoOwner } from "./parseOwnerRepo";
-import { readTemplate } from "./readTemplateTitle";
-import { notifySlackLinks } from "./slack/notifySlackLinks";
-import { tLog } from "./utils/tLog";
-if (import.meta.main) {
-  await tLog("updateOutdatedPullsTemplates", updateOutdatedPullsTemplates);
-}
-
-export async function updateOutdatedPullsTemplates() {
-  const pyproject = await readTemplate("add-toml.md");
-  const publishcr = await readTemplate("add-action.md");
-  const outdated_pyproject = await readTemplate("outdated/add-toml.md");
-  const outdated_publishcr = await readTemplate("outdated/add-action.md");
-  const outdated_pyproject_v2 = await readTemplate("outdated/add-toml-v2.md");
-  const outdated_publishcr_v2 = await readTemplate("outdated/add-action-v2.md");
-  const outdated_pyproject_v3 = await readTemplate("outdated/add-toml-v3.md");
-  const outdated_publishcr_v3 = await readTemplate("outdated/add-action-v3.md");
-  const outdated_pyproject_v4 = await readTemplate("outdated/add-toml-v4.md");
-  const outdateTitles = [
-    outdated_pyproject.title,
-    outdated_publishcr.title,
-    outdated_pyproject_v2.title,
-    outdated_publishcr_v2.title,
-    outdated_pyproject_v3.title,
-    outdated_publishcr_v3.title,
-    outdated_pyproject_v4.title,
-  ];
-  const outdateBodies = [
-    outdated_pyproject.body,
-    outdated_publishcr.body,
-    outdated_pyproject_v2.body,
-    outdated_publishcr_v2.body,
-    outdated_pyproject_v3.body,
-    outdated_publishcr_v3.body,
-    outdated_pyproject_v4.body,
-  ];
-
-  // const templateOutdate = new Date("2024-06-13T09:02:56.630Z");
-
-  await CNRepos.createIndex({
-    "crPulls.mtime": -1,
-    "crPulls.data.edited.error": -1,
-    "crPulls.data.edited.mtime": -1,
-    "crPulls.data.edited.state": -1,
-    "crPulls.data.pull.body": -1,
-    "crPulls.data.pull.title": -1,
-    "crPulls.data.pull.user.login": -1,
-  });
-  return await pMap(
-    CNRepos.find(
-      $filaten({
-        crPulls: {
-          mtime: $fresh("1h"), // retry if update fails
-          data: $elemMatch({
-            edited: {
-              mtime: $stale("30m"), // retry if update fails
-              state: { $ne: "ok" },
-              error: { $nin: ["up to date", "body mismatch"] },
-            },
-            pull: {
-              user: { login: ghUser.login },
-              title: { $in: outdateTitles },
-              body: { $in: outdateBodies },
-            },
-          }),
-        },
-      }),
-      // $filaten({
-      //   crPulls: {
-      //     data: $elemMatch({
-      //       edited: {
-      //         mtime: $stale("30m"), // retry if update fails
-      //         state: { $ne: "ok" },
-      //         error: { $nin: ["not editable", "up to date", "body mismatch"] },
-      //       },
-      //       pull: {
-      //         updated_at: {
-      //           $lte: new Date().toISOString().replace(/.\d\d\dZ/, "Z"),
-      //         },
-      //       },
-      //     }),
-      //   },
-      // }),
-    ),
-    async (repo) => {
-      const { repository } = repo;
-      console.log("Updating PR templates for: " + repository);
-      const crPulls = match(repo.crPulls)
-        .with($OK, (e) => e.data)
-        .otherwise(() => null)!;
-
-      // edit CRPulls templates to latest
-      const crPullsEdited = await pMap(
-        crPulls,
-        async (data, i): Promise<CRPull> => {
-          const { pull, type } = data;
-          const { number } = pull;
-          if (pull.user.login !== ghUser.login) DIE("not editable");
-          const replacement = match(pull)
-            .with(pyproject, () => DIE("Is already latest, should never happen here"))
-            .with(publishcr, () => DIE("Is already latest, should never happen here"))
-            .with(outdated_pyproject, () => pyproject)
-            .with(outdated_pyproject_v2, () => pyproject)
-            .with(outdated_pyproject_v3, () => pyproject)
-            .with(outdated_pyproject_v4, () => pyproject)
-            .with(outdated_publishcr, () => publishcr)
-            .with(outdated_publishcr_v2, () => publishcr)
-            .with(outdated_publishcr_v3, () => publishcr)
-            // in case author clicked some task as completed, body will be different, may cause template mismatch
-            .otherwise(() => DIE("Template not found: " + pull.title));
-          if (!replacement) return { ...data, edited: TaskError("Template mismatch") };
-
-          const edited = await gh.issues
-            .update({
-              ...parseUrlRepoOwner(repository),
-              issue_number: number,
-              ...(pull.title === replacement.title ? {} : { title: replacement.title }),
-              ...(pull.body === replacement.body ? {} : { body: replacement.body }),
-            })
-            .then(() => true as const)
-            .then(TaskOK)
-            .catch(TaskError);
-          const updatedPull = (
-            await gh.pulls.get({
-              ...parseUrlRepoOwner(repository),
-              pull_number: number,
-            })
-          ).data;
-          await CNRepos.updateOne({ repository }, { $set: { [`crPulls.data.${i}.edited`]: edited } });
-          return { pull: parsePull(updatedPull), type, edited };
-        },
-        { concurrency: 2 },
-      )
-        .then(TaskOK)
-        .catch(TaskError);
-      tsmatch(crPullsEdited)
-        .with($OK, async ({ data }) => {
-          await notifySlackLinks(
-            `Updated PR body to latest template`,
-            data.map((e) => e.pull.html_url),
-          );
-        })
-        .otherwise(() => {});
-      await CNRepos.updateOne({ repository }, { $set: { crPullsEdited } });
-      // update outdated pr issue bodies
-      return crPullsEdited;
-    },
-    { concurrency: 2 },
-  );
-}
+import { $elemMatch } from "@/packages/mongodb-pipeline-ts/$elemMatch";
+import DIE from "@snomiao/die";
+import pMap from "p-map";
+import { match } from "ts-pattern";
+import { $OK, TaskError, TaskOK, tsmatch } from "../packages/mongodb-pipeline-ts/Task";
+import { CNRepos, type CRPull } from "./CNRepos";
+import { $filaten, $fresh, $stale } from "./db";
+import { gh } from "./gh";
+import { parsePull } from "./gh/parsePull";
+import { ghUser } from "./ghUser";
+import { parseUrlRepoOwner } from "./parseOwnerRepo";
+import { readTemplate } from "./readTemplateTitle";
+import { notifySlackLinks } from "./slack/notifySlackLinks";
+import { tLog } from "./utils/tLog";
+if (import.meta.main) {
+  await tLog("updateOutdatedPullsTemplates", updateOutdatedPullsTemplates);
+}
+
+export async function updateOutdatedPullsTemplates() {
+  const pyproject = await readTemplate("add-toml.md");
+  const publishcr = await readTemplate("add-action.md");
+  const toml = await readTemplate("update-toml-license.md");
+  const outdated_toml = await readTemplate("outdated/update-toml-license.md");
+  const outdated_pyproject = await readTemplate("outdated/add-toml.md");
+  const outdated_publishcr = await readTemplate("outdated/add-action.md");
+  const outdated_pyproject_v2 = await readTemplate("outdated/add-toml-v2.md");
+  const outdated_publishcr_v2 = await readTemplate("outdated/add-action-v2.md");
+  const outdated_pyproject_v3 = await readTemplate("outdated/add-toml-v3.md");
+  const outdated_publishcr_v3 = await readTemplate("outdated/add-action-v3.md");
+  const outdated_pyproject_v4 = await readTemplate("outdated/add-toml-v4.md");
+  const outdateTitles = [
+    outdated_toml.title,
+    outdated_pyproject.title,
+    outdated_publishcr.title,
+    outdated_pyproject_v2.title,
+    outdated_publishcr_v2.title,
+    outdated_pyproject_v3.title,
+    outdated_publishcr_v3.title,
+    outdated_pyproject_v4.title,
+  ];
+  const outdateBodies = [
+    outdated_toml.body,
+    outdated_pyproject.body,
+    outdated_publishcr.body,
+    outdated_pyproject_v2.body,
+    outdated_publishcr_v2.body,
+    outdated_pyproject_v3.body,
+    outdated_publishcr_v3.body,
+    outdated_pyproject_v4.body,
+  ];
+
+  // const templateOutdate = new Date("2024-06-13T09:02:56.630Z");
+
+  await CNRepos.createIndex({
+    "crPulls.mtime": -1,
+    "crPulls.data.edited.error": -1,
+    "crPulls.data.edited.mtime": -1,
+    "crPulls.data.edited.state": -1,
+    "crPulls.data.pull.body": -1,
+    "crPulls.data.pull.title": -1,
+    "crPulls.data.pull.user.login": -1,
+  });
+  return await pMap(
+    CNRepos.find(
+      $filaten({
+        crPulls: {
+          mtime: $fresh("1h"), // retry if update fails
+          data: $elemMatch({
+            edited: {
+              mtime: $stale("30m"), // retry if update fails
+              state: { $ne: "ok" },
+              error: { $nin: ["up to date", "body mismatch"] },
+            },
+            pull: {
+              user: { login: ghUser.login },
+              title: { $in: outdateTitles },
+              body: { $in: outdateBodies },
+            },
+          }),
+        },
+      }),
+      // $filaten({
+      //   crPulls: {
+      //     data: $elemMatch({
+      //       edited: {
+      //         mtime: $stale("30m"), // retry if update fails
+      //         state: { $ne: "ok" },
+      //         error: { $nin: ["not editable", "up to date", "body mismatch"] },
+      //       },
+      //       pull: {
+      //         updated_at: {
+      //           $lte: new Date().toISOString().replace(/.\d\d\dZ/, "Z"),
+      //         },
+      //       },
+      //     }),
+      //   },
+      // }),
+    ),
+    async (repo) => {
+      const { repository } = repo;
+      console.log("Updating PR templates for: " + repository);
+      const crPulls = match(repo.crPulls)
+        .with($OK, (e) => e.data)
+        .otherwise(() => null)!;
+
+      // edit CRPulls templates to latest
+      const crPullsEdited = await pMap(
+        crPulls,
+        async (data, i): Promise<CRPull> => {
+          const { pull, type } = data;
+          const { number } = pull;
+          if (pull.user.login !== ghUser.login) DIE("not editable");
+          const replacement = match(pull)
+            .with(pyproject, () => DIE("Is already latest, should never happen here"))
+            .with(publishcr, () => DIE("Is already latest, should never happen here"))
+            .with(outdated_toml, () => toml)
+            .with(outdated_pyproject, () => pyproject)
+            .with(outdated_pyproject_v2, () => pyproject)
+            .with(outdated_pyproject_v3, () => pyproject)
+            .with(outdated_pyproject_v4, () => pyproject)
+            .with(outdated_publishcr, () => publishcr)
+            .with(outdated_publishcr_v2, () => publishcr)
+            .with(outdated_publishcr_v3, () => publishcr)
+            // in case author clicked some task as completed, body will be different, may cause template mismatch
+            .otherwise(() => DIE("Template not found: " + pull.title));
+          if (!replacement) return { ...data, edited: TaskError("Template mismatch") };
+
+          const edited = await gh.issues
+            .update({
+              ...parseUrlRepoOwner(repository),
+              issue_number: number,
+              ...(pull.title === replacement.title ? {} : { title: replacement.title }),
+              ...(pull.body === replacement.body ? {} : { body: replacement.body }),
+            })
+            .then(() => true as const)
+            .then(TaskOK)
+            .catch(TaskError);
+          const updatedPull = (
+            await gh.pulls.get({
+              ...parseUrlRepoOwner(repository),
+              pull_number: number,
+            })
+          ).data;
+          await CNRepos.updateOne({ repository }, { $set: { [`crPulls.data.${i}.edited`]: edited } });
+          return { pull: parsePull(updatedPull), type, edited };
+        },
+        { concurrency: 2 },
+      )
+        .then(TaskOK)
+        .catch(TaskError);
+      tsmatch(crPullsEdited)
+        .with($OK, async ({ data }) => {
+          await notifySlackLinks(
+            `Updated PR body to latest template`,
+            data.map((e) => e.pull.html_url),
+          );
+        })
+        .otherwise(() => {});
+      await CNRepos.updateOne({ repository }, { $set: { crPullsEdited } });
+      // update outdated pr issue bodies
+      return crPullsEdited;
+    },
+    { concurrency: 2 },
+  );
+}

package/src/updateSlackMessages.ts

@@ -1,43 +1,43 @@
-import { $fresh, $stale } from "@/packages/mongodb-pipeline-ts";
-import { $filaten } from "@/packages/mongodb-pipeline-ts/$filaten";
-import pMap from "p-map";
-import { postSlackMessage } from "./postSlackMessage";
-import { SlackMsgs } from "./slack/SlackMsgs";
-
-export async function updateSlackMessages() {
-  // send
-  return await pMap(
-    SlackMsgs.find(
-      $filaten({
-        $or: [
-          { status: { $exists: false } },
-          {
-            status: { $in: ["pending last", "error"] },
-            mtime: $stale("5m"), // try errors again after 5m
-          },
-        ],
-      }),
-    ),
-    async ({ _id, text, last_id: last, silent }) => {
-      await SlackMsgs.updateOne({ _id }, { $set: { status: "sending" } });
-      // max 5 msg per 30s
-      while (5 <= (await SlackMsgs.countDocuments({ mtime: $fresh("30s") })))
-        await new Promise((r) => setTimeout(r, 1000));
-      if (last) {
-        // check if last succ
-        const lastSent = await SlackMsgs.findOne({ _id: last });
-        if (lastSent?.status !== "sent") {
-          await SlackMsgs.updateOne({ _id }, { $set: { status: "pending last" } });
-          return;
-        }
-      }
-      console.log("SLACK POST MSG: " + JSON.stringify(text));
-      if (silent) return await SlackMsgs.updateOne({ _id }, { $set: { status: "sent", mtime: new Date() } });
-      const sent = await postSlackMessage(text)
-        .then((e) => ({ ...e, error: undefined, status: "sent" as const }))
-        .catch((e) => ({ error: e.message ?? String(e), status: "error" as const }));
-      await SlackMsgs.updateOne({ _id }, { $set: { ...sent, mtime: new Date() } });
-    },
-    { concurrency: 2 },
-  );
-}
+import { $fresh, $stale } from "@/packages/mongodb-pipeline-ts";
+import { $filaten } from "@/packages/mongodb-pipeline-ts/$filaten";
+import pMap from "p-map";
+import { postSlackMessage } from "./postSlackMessage";
+import { SlackMsgs } from "./slack/SlackMsgs";
+
+export async function updateSlackMessages() {
+  // send
+  return await pMap(
+    SlackMsgs.find(
+      $filaten({
+        $or: [
+          { status: { $exists: false } },
+          {
+            status: { $in: ["pending last", "error"] },
+            mtime: $stale("5m"), // try errors again after 5m
+          },
+        ],
+      }),
+    ),
+    async ({ _id, text, last_id: last, silent }) => {
+      await SlackMsgs.updateOne({ _id }, { $set: { status: "sending" } });
+      // max 5 msg per 30s
+      while (5 <= (await SlackMsgs.countDocuments({ mtime: $fresh("30s") })))
+        await new Promise((r) => setTimeout(r, 1000));
+      if (last) {
+        // check if last succ
+        const lastSent = await SlackMsgs.findOne({ _id: last });
+        if (lastSent?.status !== "sent") {
+          await SlackMsgs.updateOne({ _id }, { $set: { status: "pending last" } });
+          return;
+        }
+      }
+      console.log("SLACK POST MSG: " + JSON.stringify(text));
+      if (silent) return await SlackMsgs.updateOne({ _id }, { $set: { status: "sent", mtime: new Date() } });
+      const sent = await postSlackMessage(text)
+        .then((e) => ({ ...e, error: undefined, status: "sent" as const }))
+        .catch((e) => ({ error: e.message ?? String(e), status: "error" as const }));
+      await SlackMsgs.updateOne({ _id }, { $set: { ...sent, mtime: new Date() } });
+    },
+    { concurrency: 2 },
+  );
+}

package/tailwind.config.ts

@@ -1,20 +1,75 @@
-import daisyui from "daisyui";
-import type { Config } from "tailwindcss";
-const config: Config = {
-  content: [
-    "./pages/**/*.{js,ts,jsx,tsx,mdx}",
-    "./components/**/*.{js,ts,jsx,tsx,mdx}",
-    "./app/**/*.{js,ts,jsx,tsx,mdx}",
-  ],
-  theme: {
-    extend: {
-      backgroundImage: {
-        "gradient-radial": "radial-gradient(var(--tw-gradient-stops))",
-        "gradient-conic": "conic-gradient(from 180deg at 50% 50%, var(--tw-gradient-stops))",
-      },
-    },
-  },
-  plugins: [daisyui],
-  daisyui: { logs: false },
-};
-export default config;
+import type { Config } from "tailwindcss";
+
+const config = {
+  darkMode: ["class"],
+  content: ["./pages/**/*.{ts,tsx}", "./components/**/*.{ts,tsx}", "./app/**/*.{ts,tsx}", "./src/**/*.{ts,tsx}"],
+  prefix: "",
+  theme: {
+    container: {
+      center: true,
+      padding: "2rem",
+      screens: {
+        "2xl": "1400px",
+      },
+    },
+    extend: {
+      colors: {
+        border: "hsl(var(--border))",
+        input: "hsl(var(--input))",
+        ring: "hsl(var(--ring))",
+        background: "hsl(var(--background))",
+        foreground: "hsl(var(--foreground))",
+        primary: {
+          DEFAULT: "hsl(var(--primary))",
+          foreground: "hsl(var(--primary-foreground))",
+        },
+        secondary: {
+          DEFAULT: "hsl(var(--secondary))",
+          foreground: "hsl(var(--secondary-foreground))",
+        },
+        destructive: {
+          DEFAULT: "hsl(var(--destructive))",
+          foreground: "hsl(var(--destructive-foreground))",
+        },
+        muted: {
+          DEFAULT: "hsl(var(--muted))",
+          foreground: "hsl(var(--muted-foreground))",
+        },
+        accent: {
+          DEFAULT: "hsl(var(--accent))",
+          foreground: "hsl(var(--accent-foreground))",
+        },
+        popover: {
+          DEFAULT: "hsl(var(--popover))",
+          foreground: "hsl(var(--popover-foreground))",
+        },
+        card: {
+          DEFAULT: "hsl(var(--card))",
+          foreground: "hsl(var(--card-foreground))",
+        },
+      },
+      borderRadius: {
+        lg: "var(--radius)",
+        md: "calc(var(--radius) - 2px)",
+        sm: "calc(var(--radius) - 4px)",
+      },
+      keyframes: {
+        "accordion-down": {
+          from: { height: "0" },
+          to: { height: "var(--radix-accordion-content-height)" },
+        },
+        "accordion-up": {
+          from: { height: "var(--radix-accordion-content-height)" },
+          to: { height: "0" },
+        },
+      },
+      animation: {
+        "accordion-down": "accordion-down 0.2s ease-out",
+        "accordion-up": "accordion-up 0.2s ease-out",
+      },
+    },
+  },
+  plugins: [require("daisyui"), require("tailwindcss-animate")],
+} satisfies Config;
+
+export default config;