zotero-plugin-scaffold 0.7.0 → 0.7.1

package/dist/cli.d.mts

@@ -1,4 +1,4 @@
-import { B as Base, C as Context, O as OverrideConfig } from './shared/zotero-plugin-scaffold.DmiRKKLw.mjs';
+import { B as Base, C as Context, O as OverrideConfig } from './shared/zotero-plugin-scaffold.CIruZpuO.mjs';
 import 'hookable';
 import 'esbuild';
 

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 import process from 'node:process';
 import { Command } from 'commander';
-import { E as ExitSignals, C as Config, B as Build, S as Serve, T as Test, R as Release } from './shared/zotero-plugin-scaffold.D2qdHZn7.mjs';
+import { E as ExitSignals, C as Config, B as Build, S as Serve, T as Test, R as Release } from './shared/zotero-plugin-scaffold.BLTrbfUc.mjs';
 import { readFile } from 'node:fs/promises';
 import { pathExists } from 'fs-extra';
 import { l as logger } from './shared/zotero-plugin-scaffold.CzBjWbS8.mjs';
@@ -20,12 +20,12 @@ import 'adm-zip';
 import 'node:child_process';
 import 'std-env';
 import 'bumpp';
-import 'octokit';
 import 'node:os';
 import 'node:url';
 import 'node:assert';
 import 'node:v8';
 import 'node:util';
+import 'octokit';
 import 'chokidar';
 import 'node:net';
 import 'node:buffer';
@@ -36,7 +36,7 @@ import 'node:http';
 import 'node:readline';
 
 const name = "zotero-plugin-scaffold";
-const version = "0.7.0";
+const version = "0.7.1";
 const pkg = {
 	name: name,
 	version: version};

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { U as UserConfig, O as OverrideConfig, C as Context, B as Base, G as GitCommit } from './shared/zotero-plugin-scaffold.DmiRKKLw.mjs';
+import { U as UserConfig, O as OverrideConfig, C as Context, B as Base } from './shared/zotero-plugin-scaffold.CIruZpuO.mjs';
 import 'hookable';
 import 'esbuild';
 
@@ -36,8 +36,6 @@ declare class Release extends Base {
      *    then, create or update release (tag is "release"), update `update.json`.
      */
     run(): Promise<void>;
-    getConventionalChangelog(commits: GitCommit[]): Promise<string>;
-    getGitDiff(): Promise<GitCommit[]>;
     getChangelog(): Promise<string>;
     private isEnabled;
     exit(): void;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { B as Build, C as Config, R as Release, S as Serve, T as Test, d as defineConfig } from './shared/zotero-plugin-scaffold.D2qdHZn7.mjs';
+export { B as Build, C as Config, R as Release, S as Serve, T as Test, d as defineConfig } from './shared/zotero-plugin-scaffold.BLTrbfUc.mjs';
 import 'c12';
 import 'es-toolkit';
 import 'fs-extra/esm';
@@ -19,11 +19,11 @@ import 'node:crypto';
 import 'adm-zip';
 import 'node:child_process';
 import 'bumpp';
-import 'octokit';
 import 'node:os';
 import 'node:url';
 import 'node:assert';
 import 'node:v8';
+import 'octokit';
 import 'chokidar';
 import 'node:net';
 import 'node:buffer';

package/dist/shared/{zotero-plugin-scaffold.D2qdHZn7.mjs → zotero-plugin-scaffold.BLTrbfUc.mjs}

@@ -16,12 +16,12 @@ import AdmZip from 'adm-zip';
 import { execSync, spawn } from 'node:child_process';
 import { isCI, isWindows as isWindows$1, isMacOS, isLinux, isDebug } from 'std-env';
 import { versionBump, ProgressEvent } from 'bumpp';
-import { Octokit } from 'octokit';
 import 'node:os';
 import { fileURLToPath, pathToFileURL, URL as URL$1 } from 'node:url';
 import assert from 'node:assert';
 import v8 from 'node:v8';
 import { format, inspect } from 'node:util';
+import { Octokit } from 'octokit';
 import chokidar from 'chokidar';
 import net from 'node:net';
 import { Buffer } from 'node:buffer';
@@ -860,6 +860,84 @@ class Build extends Base {
   }
 }
 
+class ReleaseBase {
+  isCI;
+  ctx;
+  constructor(ctx) {
+    this.ctx = ctx;
+    this.isCI = isCI;
+  }
+  checkFiles() {
+    const { dist } = this.ctx;
+    if (globSync(`${dist}/*.xpi`).length === 0) {
+      throw new Error("No xpi file found, are you sure you have run build?");
+    }
+  }
+  get logger() {
+    return this.ctx.logger;
+  }
+}
+
+class Bump extends ReleaseBase {
+  constructor(ctx) {
+    super(ctx);
+  }
+  async run() {
+    const bumppConfig = {
+      ...this.ctx.release.bumpp,
+      push: true,
+      progress: this.bumppProgress
+    };
+    const { version } = this.ctx;
+    if (bumppConfig.release === version) {
+      this.logger.debug("Commit, tag, and push are disabled because new version = old version.");
+      bumppConfig.commit = false;
+      bumppConfig.tag = false;
+      bumppConfig.push = false;
+    }
+    const result = await versionBump(bumppConfig);
+    this.ctx.version = result.newVersion;
+    this.ctx.release.bumpp.tag = result.tag || this.ctx.release.bumpp.tag.toString().replace("%s", result.newVersion);
+    this.ctx.release.bumpp.commit = result.commit || this.ctx.release.bumpp.commit.toString().replace("%s", result.newVersion);
+    this.logger.debug(`The release context after bump: ", ${this.ctx.release}`);
+  }
+  /**
+   * bumpp 显示进度的回调
+   *
+   * @see https://github.com/antfu/bumpp/blob/main/src/cli/index.ts
+   */
+  get bumppProgress() {
+    return ({
+      event,
+      script,
+      updatedFiles,
+      skippedFiles,
+      newVersion
+    }) => {
+      switch (event) {
+        case ProgressEvent.FileUpdated:
+          this.logger.success(`Updated ${updatedFiles.pop()} to ${newVersion}`);
+          break;
+        case ProgressEvent.FileSkipped:
+          this.logger.info(`${skippedFiles.pop()} did not need to be updated`);
+          break;
+        case ProgressEvent.GitCommit:
+          this.logger.success("Git commit");
+          break;
+        case ProgressEvent.GitTag:
+          this.logger.success("Git tag");
+          break;
+        case ProgressEvent.GitPush:
+          this.logger.success("Git push");
+          break;
+        case ProgressEvent.NpmScript:
+          this.logger.success(`Npm run ${script}`);
+          break;
+      }
+    };
+  }
+}
+
 const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
 function normalizeWindowsPath(input = "") {
   if (!input) {
@@ -2654,52 +2732,6 @@ async function getGitDiff(from, to = "HEAD", cwd) {
     return r2;
   });
 }
-function parseCommits(commits, config) {
-  return commits.map((commit) => parseGitCommit(commit, config)).filter(Boolean);
-}
-const ConventionalCommitRegex = /(?<emoji>:.+:|(\uD83C[\uDF00-\uDFFF])|(\uD83D[\uDC00-\uDE4F\uDE80-\uDEFF])|[\u2600-\u2B55])?( *)?(?<type>[a-z]+)(\((?<scope>.+)\))?(?<breaking>!)?: (?<description>.+)/i;
-const CoAuthoredByRegex = /co-authored-by:\s*(?<name>.+)(<(?<email>.+)>)/gim;
-const PullRequestRE = /\([ a-z]*(#\d+)\s*\)/gm;
-const IssueRE = /(#\d+)/gm;
-function parseGitCommit(commit, config) {
-  const match = commit.message.match(ConventionalCommitRegex);
-  if (!match) {
-    return null;
-  }
-  const type = match.groups.type;
-  const hasBreakingBody = /breaking change:/i.test(commit.body);
-  let scope = match.groups.scope || "";
-  scope = config.scopeMap[scope] || scope;
-  const isBreaking = Boolean(match.groups.breaking || hasBreakingBody);
-  let description = match.groups.description;
-  const references = [];
-  for (const m of description.matchAll(PullRequestRE)) {
-    references.push({ type: "pull-request", value: m[1] });
-  }
-  for (const m of description.matchAll(IssueRE)) {
-    if (!references.some((i) => i.value === m[1])) {
-      references.push({ type: "issue", value: m[1] });
-    }
-  }
-  references.push({ value: commit.shortHash, type: "hash" });
-  description = description.replace(PullRequestRE, "").trim();
-  const authors = [commit.author];
-  for (const match2 of commit.body.matchAll(CoAuthoredByRegex)) {
-    authors.push({
-      name: (match2.groups.name || "").trim(),
-      email: (match2.groups.email || "").trim()
-    });
-  }
-  return {
-    ...commit,
-    authors,
-    description,
-    type,
-    scope,
-    references,
-    isBreaking
-  };
-}
 
 const providerToRefSpec = {
   github: { "pull-request": "pull", hash: "commit", issue: "issues" },
@@ -2958,82 +2990,50 @@ async function resolveChangelogConfig(config, cwd) {
   return config;
 }
 
-class ReleaseBase {
-  isCI;
-  ctx;
-  constructor(ctx) {
-    this.ctx = ctx;
-    this.isCI = isCI;
+async function getConventionalChangelog(commits) {
+  if (!commits[0].type) {
+    return commits.map((c) => c.message).join("\n");
   }
-  checkFiles() {
-    const { dist } = this.ctx;
-    if (globSync(`${dist}/*.xpi`).length === 0) {
-      throw new Error("No xpi file found, are you sure you have run build?");
+  const resolvedCommits = commits.map((c) => {
+    if (c.type === "remove") {
+      c.isBreaking = true;
     }
-  }
-  get logger() {
-    return this.ctx.logger;
-  }
-}
-
-class Bump extends ReleaseBase {
-  constructor(ctx) {
-    super(ctx);
-  }
-  async run() {
-    const bumppConfig = {
-      ...this.ctx.release.bumpp,
-      push: true,
-      progress: this.bumppProgress
-    };
-    const { version } = this.ctx;
-    if (bumppConfig.release === version) {
-      this.logger.debug("Commit, tag, and push are disabled because new version = old version.");
-      bumppConfig.commit = false;
-      bumppConfig.tag = false;
-      bumppConfig.push = false;
+    return c;
+  });
+  const _config = await loadChangelogConfig(process$1.cwd(), {
+    types: {
+      add: { title: "\u{1F680} Enhancements", semver: "minor" },
+      change: { title: "\u{1FA79} Fixes", semver: "patch" },
+      remove: { title: "\u{1FA79} Fixes", semver: "minor" }
+    },
+    hideAuthorEmail: true
+  });
+  const md = await generateMarkDown(resolvedCommits, _config);
+  return md.split("\n").slice(3).join("\n");
+}
+async function getGitCommits(currentTag, commitMessageTemplate) {
+  const tags = execSync("git tag -l --sort=v:refname").toString().trim().split("\n");
+  const currentTagIndex = tags.indexOf(currentTag);
+  if (currentTagIndex === -1)
+    throw new Error(`Tag "${currentTag}" not found.`);
+  let previousTagIndex = currentTagIndex - 1;
+  let previousTag;
+  if (currentTagIndex === 0) {
+    previousTag = void 0;
+  } else if (currentTag.includes("-")) {
+    previousTag = tags[previousTagIndex];
+  } else {
+    while (previousTagIndex >= 0 && tags[previousTagIndex].includes("-")) {
+      previousTagIndex--;
     }
-    const result = await versionBump(bumppConfig);
-    this.ctx.version = result.newVersion;
-    this.ctx.release.bumpp.tag = result.tag || this.ctx.release.bumpp.tag.toString().replace("%s", result.newVersion);
-    this.ctx.release.bumpp.commit = result.commit || this.ctx.release.bumpp.commit.toString().replace("%s", result.newVersion);
-    this.logger.debug(`The release context after bump: ", ${this.ctx.release}`);
-  }
-  /**
-   * bumpp 显示进度的回调
-   *
-   * @see https://github.com/antfu/bumpp/blob/main/src/cli/index.ts
-   */
-  get bumppProgress() {
-    return ({
-      event,
-      script,
-      updatedFiles,
-      skippedFiles,
-      newVersion
-    }) => {
-      switch (event) {
-        case ProgressEvent.FileUpdated:
-          this.logger.success(`Updated ${updatedFiles.pop()} to ${newVersion}`);
-          break;
-        case ProgressEvent.FileSkipped:
-          this.logger.info(`${skippedFiles.pop()} did not need to be updated`);
-          break;
-        case ProgressEvent.GitCommit:
-          this.logger.success("Git commit");
-          break;
-        case ProgressEvent.GitTag:
-          this.logger.success("Git tag");
-          break;
-        case ProgressEvent.GitPush:
-          this.logger.success("Git push");
-          break;
-        case ProgressEvent.NpmScript:
-          this.logger.success(`Npm run ${script}`);
-          break;
-      }
-    };
+    if (previousTagIndex < 0)
+      previousTag = void 0;
+    else
+      previousTag = tags[previousTagIndex];
   }
+  const filterRegex = new RegExp(escapeRegExp(commitMessageTemplate));
+  const rawCommits = (await getGitDiff(previousTag, currentTag)).filter((c) => !filterRegex.test(c.message));
+  return parseCommits(rawCommits, { scopeMap: {} });
 }
 
 const mimeTypes = {
@@ -3236,55 +3236,10 @@ class Release extends Base {
       `Done in ${((/* @__PURE__ */ new Date()).getTime() - t.getTime()) / 1e3} s.`
     );
   }
-  async getConventionalChangelog(commits) {
-    if (!commits[0].type) {
-      return commits.map((c) => c.message).join("\n");
-    }
-    const resolvedCommits = commits.map((c) => {
-      if (c.type === "remove") {
-        c.isBreaking = true;
-      }
-      return c;
-    });
-    const _config = await loadChangelogConfig(process$1.cwd(), {
-      types: {
-        add: { title: "\u{1F680} Enhancements", semver: "minor" },
-        change: { title: "\u{1FA79} Fixes", semver: "patch" },
-        remove: { title: "\u{1FA79} Fixes", semver: "minor" }
-      }
-    });
-    const md = await generateMarkDown(resolvedCommits, _config);
-    return md.split("\n").slice(3).join("\n");
-  }
-  async getGitDiff() {
-    const currentTag = this.ctx.release.bumpp.tag;
-    const tags = execSync("git tag -l --sort=v:refname").toString().trim().split("\n");
-    const currentTagIndex = tags.indexOf(currentTag);
-    if (currentTagIndex === -1)
-      throw new Error(`Tag "${currentTag}" not found.`);
-    let previousTagIndex = currentTagIndex - 1;
-    let previousTag;
-    if (currentTagIndex === 0) {
-      previousTag = void 0;
-    } else if (currentTag.includes("-")) {
-      previousTag = tags[previousTagIndex];
-    } else {
-      while (previousTagIndex >= 0 && tags[previousTagIndex].includes("-")) {
-        previousTagIndex--;
-      }
-      if (previousTagIndex < 0)
-        previousTag = void 0;
-      else
-        previousTag = tags[previousTagIndex];
-    }
-    const commitMessage = this.ctx.release.bumpp.commit;
-    const filterRegex = new RegExp(escapeRegExp(commitMessage));
-    const rawCommits = (await getGitDiff(previousTag, currentTag)).filter((c) => !filterRegex.test(c.message));
-    return parseCommits(rawCommits, { scopeMap: {} });
-  }
   async getChangelog() {
+    const { commit, tag } = this.ctx.release.bumpp;
     let changelog;
-    const rawCommit = await this.getGitDiff();
+    const rawCommit = await getGitCommits(tag, commit);
     if (rawCommit.length === 0) {
       return "_No significant changes._";
     }
@@ -3294,7 +3249,7 @@ class Release extends Base {
     } else if (!!changelogConfig && typeof changelogConfig == "string") {
       changelog = execSync(changelogConfig).toString().trim();
     } else {
-      changelog = await this.getConventionalChangelog(rawCommit);
+      changelog = await getConventionalChangelog(rawCommit);
     }
     this.logger.debug(`Got changelog:
 ${changelog}

package/dist/shared/{zotero-plugin-scaffold.DmiRKKLw.d.mts → zotero-plugin-scaffold.CIruZpuO.d.mts}

@@ -855,4 +855,4 @@ declare abstract class Base {
 }
 
 export { Base as B };
-export type { Context as C, GitCommit as G, OverrideConfig as O, UserConfig as U };
+export type { Context as C, OverrideConfig as O, UserConfig as U };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zotero-plugin-scaffold",
   "type": "module",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "A scaffold for Zotero plugin development.",
   "author": "northword",
   "license": "AGPL-3.0-or-later",