comfy-pr 0.2.24 → 0.2.26

package/src/getActivatedShell.ts

@@ -1,18 +1,18 @@
-import { $ as zx } from "zx";
-import { getActivateCMD } from "./cli/getActivateCMD";
-
-if (import.meta.main) {
-  // await checkComfyActivated();
-  zx.verbose = true;
-  const $ = getActivatedShell();
-  const p = await $`comfy-cli --version`;
-  console.log(p.stdout);
-  // zx({ prefix:  })`comfy-cli --help`;
-}
-
-export function getActivatedShell() {
-  const activate = getActivateCMD();
-  return zx({
-    prefix: `echo Comfy CLI version: $(comfy-cli --version) || (apt-get install -y python3-venv && python -m venv .venv && ${activate} && pip install comfy-cli); `,
-  });
-}
+import { $ as zx } from "zx";
+import { getActivateCMD } from "./cli/getActivateCMD";
+
+if (import.meta.main) {
+  // await checkComfyActivated();
+  zx.verbose = true;
+  const $ = getActivatedShell();
+  const p = await $`comfy-cli --version`;
+  console.log(p.stdout);
+  // zx({ prefix:  })`comfy-cli --help`;
+}
+
+export function getActivatedShell() {
+  const activate = getActivateCMD();
+  return zx({
+    prefix: `echo Comfy CLI version: $(comfy-cli --version) || (apt-get install -y python3-venv && python -m venv .venv && ${activate} && pip install comfy-cli); `,
+  });
+}

package/src/getBranchWorkingDir.ts

@@ -1,16 +1,16 @@
-import { rm } from "fs/promises";
-import { getRepoWorkingDir } from "./getRepoWorkingDir";
-import { parseUrlRepoOwner } from "./parseOwnerRepo";
-
-export async function getBranchWorkingDir(
-  upstreamUrl: string,
-  forkUrl: string,
-  branch: string
-) {
-  const src = parseUrlRepoOwner(upstreamUrl);
-  const dir = getRepoWorkingDir(forkUrl);
-  const packageName = src.repo;
-  const cwd = `${dir}/${branch}/${packageName}`;
-  await rm(cwd, { recursive: true }).catch(() => null);
-  return cwd;
-}
+import { rm } from "fs/promises";
+import { getRepoWorkingDir } from "./getRepoWorkingDir";
+import { parseUrlRepoOwner } from "./parseOwnerRepo";
+
+export async function getBranchWorkingDir(
+  upstreamUrl: string,
+  forkUrl: string,
+  branch: string
+) {
+  const src = parseUrlRepoOwner(upstreamUrl);
+  const dir = getRepoWorkingDir(forkUrl);
+  const packageName = src.repo;
+  const cwd = `${dir}/${branch}/${packageName}`;
+  await rm(cwd, { recursive: true }).catch(() => null);
+  return cwd;
+}

package/src/getRepoWorkingDir.ts

@@ -1,6 +1,6 @@
-import { parseUrlRepoOwner } from "./parseOwnerRepo";
-
-export function getRepoWorkingDir(forkUrl: string) {
-  return `prs/${parseUrlRepoOwner(forkUrl).repo}`;
-}
+import { parseUrlRepoOwner } from "./parseOwnerRepo";
+
+export function getRepoWorkingDir(forkUrl: string) {
+  return `prs/${parseUrlRepoOwner(forkUrl).repo}`;
+}
   

package/src/ghUser.ts

@@ -1,6 +1,9 @@
-import { gh } from "./gh";
-
-export const ghUser = (await gh.users.getAuthenticated()).data;
-
-console.log("Fetch Current Github User...");
-console.log(`Current Github User: ${ghUser.login} <${ghUser.email}>`);
+import type { Task } from "@/packages/mongodb-pipeline-ts/Task";
+import { gh } from "./gh";
+import type { AwaitedReturnType } from "./types/AwaitedReturnType";
+
+export const ghUser = (await gh.users.getAuthenticated()).data;
+
+console.log("Fetch Current Github User...");
+console.log(`Current Github User: ${ghUser.login} <${ghUser.email}>`);
+export type GHUser = Task<AwaitedReturnType<typeof gh.users.getByUsername>["data"]>;

package/src/index.ts

@@ -1,22 +1,26 @@
-import "dotenv/config";
-import { checkComfyActivated } from "./checkComfyActivated";
-import { initializeFollowRules } from "./initializeFollowRules";
-import { updateAuthors } from "./updateAuthors";
-import { updateCNRepos } from "./updateCNRepos";
-import { runFollowRuleSet } from "./updateFollowRuleSet";
-import { updateSlackMessages } from "./updateSlackMessages";
-import { tLog } from "./utils/tLog";
-
-if (import.meta.main) {
-  await Promise.all([
-    // try send msgs that didn't send in last run
-    updateSlackMessages(),
-    checkComfyActivated(), // needed if make pr
-    updateCNRepos(),
-    updateAuthors(),
-  ]);
-  await initializeFollowRules();
-  await tLog("runFollowRuleSet", runFollowRuleSet);
-  console.log("All done");
-  process.exit(0);
-}
+import "dotenv/config";
+import { checkComfyActivated } from "./checkComfyActivated";
+import { updateEmailTasks } from "./EmailTasks";
+import { initializeFollowRules } from "./initializeFollowRules";
+import { updateTomlLicenseTasks } from "./makeUpdateTomlLicenseBranch";
+import { updateAuthors } from "./updateAuthors";
+import { updateCNRepos } from "./updateCNRepos";
+import { runFollowRuleSet } from "./updateFollowRuleSet";
+import { updateSlackMessages } from "./updateSlackMessages";
+import { tLog } from "./utils/tLog";
+
+if (import.meta.main) {
+  await Promise.all([
+    // try send msgs that didn't send in last run
+    updateSlackMessages(),
+    checkComfyActivated(), // needed if make pr
+    updateCNRepos(),
+    updateAuthors(),
+    updateEmailTasks(),
+    updateTomlLicenseTasks(),
+  ]);
+  await initializeFollowRules();
+  await tLog("runFollowRuleSet", runFollowRuleSet);
+  console.log("All done");
+  process.exit(0);
+}

package/src/initializeFollowRules.ts

@@ -1,26 +1,26 @@
-import DIE from "@snomiao/die";
-import { readFile } from "fs/promises";
-import { FollowRuleSets } from "./FollowRules";
-
-if (import.meta.main) {
-  const followRules = await initializeFollowRules();
-  const ruleset = (await FollowRuleSets.findOne({ name: "default" })) ?? DIE("default ruleset not found");
-  if (!ruleset?.enabled) DIE("default ruleset not enabled");
-
-  console.log("initialized follow rules");
-}
-/**
- *
- * @author: snomiao <snomiao@gmail.com>
- */
-export async function initializeFollowRules() {
-  return await updateFollowRules("default", await readFile("./templates/follow-rules.yaml", "utf8"));
-}
-
-export async function updateFollowRules(name: string, rawRuleYaml: string) {
-  return (await FollowRuleSets.findOneAndUpdate(
-    { name },
-    { $setOnInsert: { yaml: rawRuleYaml, enabled: false } },
-    { upsert: true, returnDocument: "after" },
-  ))!;
-}
+import DIE from "@snomiao/die";
+import { readFile } from "fs/promises";
+import { FollowRuleSets } from "./FollowRules";
+
+if (import.meta.main) {
+  const followRules = await initializeFollowRules();
+  const ruleset = (await FollowRuleSets.findOne({ name: "default" })) ?? DIE("default ruleset not found");
+  if (!ruleset?.enabled) DIE("default ruleset not enabled");
+
+  console.log("initialized follow rules");
+}
+/**
+ *
+ * @author: snomiao <snomiao@gmail.com>
+ */
+export async function initializeFollowRules() {
+  return await updateFollowRules("default", await readFile("./templates/follow-rules.yaml", "utf8"));
+}
+
+export async function updateFollowRules(name: string, rawRuleYaml: string) {
+  return (await FollowRuleSets.findOneAndUpdate(
+    { name },
+    { $setOnInsert: { yaml: rawRuleYaml, enabled: false } },
+    { upsert: true, returnDocument: "after" },
+  ))!;
+}

package/src/makePublishBranch.ts

@@ -1,58 +1,58 @@
-import { readFile } from "fs/promises";
-import { dirname } from "path";
-import { GIT_USEREMAIL } from "./GIT_USEREMAIL";
-import { GIT_USERNAME } from "./GIT_USERNAME";
-import { $ } from "./cli/echoBunShell";
-import { getBranchWorkingDir } from "./getBranchWorkingDir";
-import { gh } from "./gh";
-import { parseUrlRepoOwner, stringifyGithubOrigin, stringifyGithubRepoUrl } from "./parseOwnerRepo";
-import { parseTitleBodyOfMarkdown } from "./parseTitleBodyOfMarkdown";
-
-/**
- * Clone from upstream
- * push to fork url
- * @param dir
- * @param upstreamUrl
- * @param origin
- * @returns
- */
-export async function makePublishcrBranch(upstreamUrl: string, forkUrl: Readonly<string>) {
-  const type = "publishcr" as const;
-
-  const origin = await stringifyGithubOrigin(parseUrlRepoOwner(forkUrl));
-  const branch = "publish";
-  const tmpl = await readFile("./templates/add-action.md", "utf8");
-  const { title, body } = parseTitleBodyOfMarkdown(tmpl);
-  const repo = parseUrlRepoOwner(origin);
-
-  if (await gh.repos.getBranch({ ...repo, branch }).catch(() => null)) {
-    console.log("Skip changes as branch existed: " + branch);
-    return { type, title, body, branch };
-  }
-
-  const cwd = await getBranchWorkingDir(upstreamUrl, forkUrl, branch);
-
-  const file = `${cwd}/.github/workflows/publish.yml`;
-  const publishYmlPath = "./templates/publish.yaml";
-
-  // commit & push changes
-  await $`
-git clone ${upstreamUrl} ${cwd}
-
-mkdir -p ${dirname(file)}
-cat ${publishYmlPath} > ${file}
-
-cd ${cwd}
-
-git config user.name ${GIT_USERNAME} && \
-git config user.email ${GIT_USEREMAIL} && \
-git checkout -b ${branch} && \
-git add . && \ 
-git commit -am "chore(${branch}): ${title}" && \
-git push "${origin}" ${branch}:${branch}
-    `;
-
-  const branchUrl = `${stringifyGithubRepoUrl(repo)}/tree/${branch}`;
-  console.log(`Branch Push OK: ${branchUrl}`);
-  return { type, title, body, branch };
-}
+import { readFile } from "fs/promises";
+import { dirname } from "path";
+import { GIT_USEREMAIL } from "./GIT_USEREMAIL";
+import { GIT_USERNAME } from "./GIT_USERNAME";
+import { $ } from "./cli/echoBunShell";
+import { getBranchWorkingDir } from "./getBranchWorkingDir";
+import { gh } from "./gh";
+import { parseUrlRepoOwner, stringifyGithubOrigin, stringifyGithubRepoUrl } from "./parseOwnerRepo";
+import { parseTitleBodyOfMarkdown } from "./parseTitleBodyOfMarkdown";
+
+/**
+ * Clone from upstream
+ * push to fork url
+ * @param dir
+ * @param upstreamUrl
+ * @param origin
+ * @returns
+ */
+export async function makePublishcrBranch(upstreamUrl: string, forkUrl: Readonly<string>) {
+  const type = "publishcr" as const;
+
+  const origin = await stringifyGithubOrigin(parseUrlRepoOwner(forkUrl));
+  const branch = "publish";
+  const tmpl = await readFile("./templates/add-action.md", "utf8");
+  const { title, body } = parseTitleBodyOfMarkdown(tmpl);
+  const repo = parseUrlRepoOwner(origin);
+
+  if (await gh.repos.getBranch({ ...repo, branch }).catch(() => null)) {
+    console.log("Skip changes as branch existed: " + branch);
+    return { type, title, body, branch };
+  }
+
+  const cwd = await getBranchWorkingDir(upstreamUrl, forkUrl, branch);
+
+  const file = `${cwd}/.github/workflows/publish.yml`;
+  const publishYmlPath = "./templates/publish.yaml";
+
+  // commit & push changes
+  await $`
+git clone ${upstreamUrl} ${cwd}
+
+mkdir -p ${dirname(file)}
+cat ${publishYmlPath} > ${file}
+
+cd ${cwd}
+
+git config user.name ${GIT_USERNAME} && \
+git config user.email ${GIT_USEREMAIL} && \
+git checkout -b ${branch} && \
+git add . && \ 
+git commit -am "chore(${branch}): ${title}" && \
+git push "${origin}" ${branch}:${branch}
+    `;
+
+  const branchUrl = `${stringifyGithubRepoUrl(repo)}/tree/${branch}`;
+  console.log(`Branch Push OK: ${branchUrl}`);
+  return { type, title, body, branch };
+}

package/src/makeTomlBranch.ts

@@ -1,53 +1,53 @@
-import { readFile } from "fs/promises";
-import { GIT_USEREMAIL } from "./GIT_USEREMAIL";
-import { GIT_USERNAME } from "./GIT_USERNAME";
-import { $ } from "./cli/echoBunShell";
-import { getBranchWorkingDir } from "./getBranchWorkingDir";
-import { gh } from "./gh";
-import { parseUrlRepoOwner, stringifyGithubOrigin } from "./parseOwnerRepo";
-import { parseTitleBodyOfMarkdown } from "./parseTitleBodyOfMarkdown";
-import { tomlFillDescription } from "./tomlFillDescription";
-
-export async function makePyprojectBranch(upstreamUrl: string, forkUrl: string) {
-  const type = "pyproject" as const;
-  const origin = await stringifyGithubOrigin(parseUrlRepoOwner(forkUrl));
-  const branch = "pyproject";
-  const tmpl = await readFile("./templates/add-toml.md", "utf8");
-  const { title, body } = parseTitleBodyOfMarkdown(tmpl);
-  const repo = parseUrlRepoOwner(forkUrl);
-
-  if (await gh.repos.getBranch({ ...repo, branch }).catch(() => null)) {
-    console.log("Skip changes as branch existed: " + branch);
-    return { type, title, body, branch };
-  }
-  const src = parseUrlRepoOwner(upstreamUrl);
-  const cwd = await getBranchWorkingDir(upstreamUrl, forkUrl, branch);
-
-  // commit changes
-  await $`
-git clone ${upstreamUrl} ${cwd}
-
-cd ${cwd}
-echo N | comfy node init
-`;
-
-  // Try fill description from ComfyUI-manager
-  const referenceUrl = `https://github.com/${src.owner}/${src.repo}`;
-  const pyprojectToml = cwd + "/pyproject.toml";
-  await tomlFillDescription(referenceUrl, pyprojectToml).catch((e) => {
-    console.error(e);
-  });
-
-  await $`
-cd ${cwd}
-git config user.name ${GIT_USERNAME} && \
-git config user.email ${GIT_USEREMAIL} && \
-git checkout -b ${branch} && \
-git add . && \
-git commit -am ${`chore(${branch}): ${title}`} && \
-git push "${origin}" ${branch}:${branch}
-`;
-  const branchUrl = `https://github.com/${repo.owner}/${repo.repo}/tree/${branch}`;
-  console.log(`Branch Push OK: ${branchUrl}`);
-  return { type, title, body, branch };
-}
+import { readFile } from "fs/promises";
+import { GIT_USEREMAIL } from "./GIT_USEREMAIL";
+import { GIT_USERNAME } from "./GIT_USERNAME";
+import { $ } from "./cli/echoBunShell";
+import { getBranchWorkingDir } from "./getBranchWorkingDir";
+import { gh } from "./gh";
+import { parseUrlRepoOwner, stringifyGithubOrigin } from "./parseOwnerRepo";
+import { parseTitleBodyOfMarkdown } from "./parseTitleBodyOfMarkdown";
+import { tomlFillDescription } from "./tomlFillDescription";
+
+export async function makePyprojectBranch(upstreamUrl: string, forkUrl: string) {
+  const type = "pyproject" as const;
+  const origin = await stringifyGithubOrigin(parseUrlRepoOwner(forkUrl));
+  const branch = "pyproject";
+  const tmpl = await readFile("./templates/add-toml.md", "utf8");
+  const { title, body } = parseTitleBodyOfMarkdown(tmpl);
+  const repo = parseUrlRepoOwner(forkUrl);
+
+  if (await gh.repos.getBranch({ ...repo, branch }).catch(() => null)) {
+    console.log("Skip changes as branch existed: " + branch);
+    return { type, title, body, branch };
+  }
+  const src = parseUrlRepoOwner(upstreamUrl);
+  const cwd = await getBranchWorkingDir(upstreamUrl, forkUrl, branch);
+
+  // commit changes
+  await $`
+git clone ${upstreamUrl} ${cwd}
+
+cd ${cwd}
+echo N | comfy node init
+`;
+
+  // Try fill description from ComfyUI-manager
+  const referenceUrl = `https://github.com/${src.owner}/${src.repo}`;
+  const pyprojectToml = cwd + "/pyproject.toml";
+  await tomlFillDescription(referenceUrl, pyprojectToml).catch((e) => {
+    console.error(e);
+  });
+
+  await $`
+cd ${cwd}
+git config user.name ${GIT_USERNAME} && \
+git config user.email ${GIT_USEREMAIL} && \
+git checkout -b ${branch} && \
+git add . && \
+git commit -am ${`chore(${branch}): ${title}`} && \
+git push "${origin}" ${branch}:${branch}
+`;
+  const branchUrl = `https://github.com/${repo.owner}/${repo.repo}/tree/${branch}`;
+  console.log(`Branch Push OK: ${branchUrl}`);
+  return { type, title, body, branch };
+}