split-by-codeowners 1.0.0 → 1.0.3

package/dist-cli/index.js

@@ -1829,6 +1829,7 @@ const codeowners_1 = __nccwpck_require__(586);
 const git_1 = __nccwpck_require__(243);
 const github_1 = __nccwpck_require__(248);
 const ghcli_1 = __nccwpck_require__(64);
+const pr_template_1 = __nccwpck_require__(456);
 function formatTemplate(tpl, vars) {
     let out = tpl;
     for (const [k, v] of Object.entries(vars))
@@ -1948,8 +1949,22 @@ async function runSplit(config, logger) {
                 (0, git_1.pushBranch)(config.remoteName, branch, worktreeDir);
                 const ownersStr = b.owners.length ? b.owners.join(", ") : "(unowned)";
                 const filesStr = b.files.map(f => `- ${f.file}`).join("\n");
+                const bucketInfo = formatTemplate("Automated changes bucketed by CODEOWNERS.\n\nOwners: {owners}\nBucket key: {bucket_key}\n\nFiles:\n{files}\n", { owners: ownersStr, bucket_key: b.key, files: filesStr });
                 const title = formatTemplate(config.prTitle, { owners: ownersStr, bucket_key: b.key });
-                const body = formatTemplate(config.prBody, { owners: ownersStr, bucket_key: b.key, files: filesStr });
+                let body;
+                if (config.prBodyMode === "none") {
+                    body = undefined;
+                }
+                else if (config.prBodyMode === "custom") {
+                    body = formatTemplate(config.prBody, { owners: ownersStr, bucket_key: b.key, files: filesStr });
+                }
+                else {
+                    const template = (0, pr_template_1.readPrTemplate)(worktreeDir, config.prTemplatePath) ?? "";
+                    body =
+                        config.prBodyMode === "template_with_bucket"
+                            ? (template ? template.trimEnd() + "\n\n---\n\n" + bucketInfo : bucketInfo)
+                            : (template || bucketInfo);
+                }
                 const pr = useGhCli
                     ? (() => {
                         return (0, ghcli_1.upsertPullRequestViaGh)({
@@ -1957,7 +1972,7 @@ async function runSplit(config, logger) {
                             base: baseBranch,
                             head: branch,
                             title,
-                            body,
+                            body: body ?? "",
                             draft: config.draft,
                             bucketKey: b.key
                         });
@@ -1968,7 +1983,7 @@ async function runSplit(config, logger) {
                         base: baseBranch,
                         head: branch,
                         title,
-                        body,
+                        body: body ?? "",
                         draft: config.draft,
                         bucketKey: b.key
                     });
@@ -2073,6 +2088,35 @@ exports.parseCodeowners = parseCodeowners;
 exports.ownersForFile = ownersForFile;
 const node_fs_1 = __importDefault(__nccwpck_require__(24));
 const minimatch_1 = __nccwpck_require__(507);
+function splitPatternOwners(line) {
+    // CODEOWNERS lines are: <pattern><whitespace><owner>...
+    // Patterns may contain spaces if escaped as `\ `.
+    // We parse by finding the first whitespace not escaped by a backslash.
+    let i = 0;
+    let escaped = false;
+    for (; i < line.length; i++) {
+        const ch = line[i];
+        if (escaped) {
+            escaped = false;
+            continue;
+        }
+        if (ch === "\\") {
+            escaped = true;
+            continue;
+        }
+        if (/\s/.test(ch))
+            break;
+    }
+    const rawPattern = line.slice(0, i).trim();
+    const rest = line.slice(i).trim();
+    if (!rawPattern || !rest)
+        return null;
+    const pattern = rawPattern.replaceAll("\\ ", " ");
+    const owners = rest.split(/\s+/).filter(Boolean);
+    if (!owners.length)
+        return null;
+    return { pattern, owners };
+}
 function parseCodeowners(path) {
     const text = node_fs_1.default.readFileSync(path, "utf8");
     const rules = [];
@@ -2080,18 +2124,60 @@ function parseCodeowners(path) {
         const line = raw.trim();
         if (!line || line.startsWith("#"))
             continue;
-        const parts = line.split(/\s+/).filter(Boolean);
-        if (parts.length < 2)
+        const parsed = splitPatternOwners(line);
+        if (!parsed)
             continue;
-        rules.push({ pattern: parts[0], owners: parts.slice(1) });
+        rules.push({ pattern: parsed.pattern, owners: parsed.owners });
     }
     return rules;
 }
+function hasGlobMagic(p) {
+    // Good-enough heuristic for gitignore-style globs.
+    return /[*?\[]/.test(p);
+}
 function matches(file, pattern) {
-    const f = file.replace(/\\/g, "/");
-    // crude but works for most repos:
-    const pat = pattern.startsWith("/") ? pattern.slice(1) : pattern;
-    return (0, minimatch_1.minimatch)(f, pat, { dot: true, matchBase: !pattern.startsWith("/") });
+    // GitHub CODEOWNERS patterns are gitignore-like:
+    // - Leading `/` anchors to repo root
+    // - Pattern without `/` matches a basename anywhere
+    // - A directory pattern matches everything under it (e.g. `/frontend/admin` should match `/frontend/admin/**`)
+    const f = file.replace(/\\/g, "/").replace(/^\.?\//, "");
+    let pat = pattern.replace(/\\/g, "/").trim();
+    if (!pat)
+        return false;
+    const anchored = pat.startsWith("/");
+    if (anchored)
+        pat = pat.slice(1);
+    // Directory patterns: trailing `/` means directory; also treat non-glob literal paths as directory-or-file match.
+    const trailingSlash = pat.endsWith("/");
+    if (trailingSlash)
+        pat = pat.slice(0, -1);
+    const isLiteral = !hasGlobMagic(pat);
+    const hasSlash = pat.includes("/");
+    // Literal path: match exact file OR directory subtree.
+    if (isLiteral && (anchored || hasSlash)) {
+        return f === pat || f.startsWith(pat + "/");
+    }
+    // Literal basename: match basename OR directory subtree anywhere.
+    if (isLiteral && !hasSlash) {
+        const base = f.split("/").pop() ?? f;
+        if (base === pat)
+            return true;
+        return f.includes("/" + pat + "/");
+    }
+    // Glob patterns: use minimatch.
+    // - If anchored: match from repo root.
+    // - If not anchored and no slash: match basename anywhere.
+    // - If not anchored but includes a slash: match relative to repo root (like a root CODEOWNERS / .gitignore).
+    const matchBase = !anchored && !hasSlash;
+    const mm = (0, minimatch_1.minimatch)(f, pat, { dot: true, matchBase });
+    if (mm)
+        return true;
+    // If the pattern explicitly denotes a directory (trailing slash), also match directory subtree.
+    if (trailingSlash) {
+        // Convert `dir/` to subtree match.
+        return (0, minimatch_1.minimatch)(f, pat + "/**", { dot: true, matchBase: false });
+    }
+    return false;
 }
 function ownersForFile(file, rules) {
     let hit;
@@ -2398,13 +2484,47 @@ async function upsertPullRequest(params) {
         head,
         base,
         title,
-        body,
+        body: body || "",
         draft
     });
     return { bucket_key: bucketKey, branch: head, number: created.data.number, url: created.data.html_url };
 }
 
 
+/***/ }),
+
+/***/ 456:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.readPrTemplate = readPrTemplate;
+const node_fs_1 = __importDefault(__nccwpck_require__(24));
+const node_path_1 = __importDefault(__nccwpck_require__(760));
+function readPrTemplate(cwd, templatePath) {
+    const candidates = [];
+    if (templatePath && templatePath.trim()) {
+        candidates.push(templatePath.trim());
+    }
+    else {
+        candidates.push(".github/pull_request_template.md");
+        candidates.push(".github/PULL_REQUEST_TEMPLATE.md");
+        candidates.push("pull_request_template.md");
+    }
+    for (const rel of candidates) {
+        const abs = node_path_1.default.resolve(cwd, rel);
+        if (node_fs_1.default.existsSync(abs) && node_fs_1.default.statSync(abs).isFile()) {
+            return node_fs_1.default.readFileSync(abs, "utf8");
+        }
+    }
+    return null;
+}
+
+
 /***/ }),
 
 /***/ 421:
@@ -13236,6 +13356,8 @@ function printHelp() {
         "  --commit-message <msg>        (default: chore: automated changes)",
         "  --pr-title <tpl>              Supports {owners} and {bucket_key}",
         "  --pr-body <tpl>               Supports {owners}, {bucket_key}, {files}",
+        "  --pr-body-mode <mode>         custom|template|template_with_bucket|none (default: custom)",
+        "  --pr-template-path <path>     (default: .github/pull_request_template.md)",
         "  --draft <true|false>          (default: false)",
         "",
         "Examples:",
@@ -13284,6 +13406,8 @@ async function main() {
     let commitMessage = "chore: automated changes";
     let prTitle = "chore: automated changes ({owners})";
     let prBody = "Automated changes bucketed by CODEOWNERS.\n\nOwners: {owners}\nBucket key: {bucket_key}\n\nFiles:\n{files}\n";
+    let prBodyMode = "template";
+    let prTemplatePath = ".github/pull_request_template.md";
     let draft = false;
     // parse args
     for (let i = 0; i < argv.length; i++) {
@@ -13323,6 +13447,10 @@ async function main() {
             prTitle = takeArg(argv, i++, a);
         else if (a === "--pr-body")
             prBody = takeArg(argv, i++, a);
+        else if (a === "--pr-body-mode")
+            prBodyMode = takeArg(argv, i++, a);
+        else if (a === "--pr-template-path")
+            prTemplatePath = takeArg(argv, i++, a);
         else if (a === "--draft")
             draft = (0, buckets_2.parseBool)(takeArg(argv, i++, a));
         else if (a.startsWith("-"))
@@ -13346,6 +13474,8 @@ async function main() {
         commitMessage,
         prTitle,
         prBody,
+        prBodyMode,
+        prTemplatePath,
         draft,
         remoteName: "origin"
     };