heymark 1.1.2 → 1.2.0

package/scripts/lib/parser.js

@@ -1,82 +1,125 @@
-"use strict";
-
-const fs = require("fs");
-const path = require("path");
-
-const GENERATED_MARKER = "<!-- @generated by sync-rules - DO NOT EDIT -->";
-
-function parseFrontmatter(content) {
-    const match = content.match(/^---\r?\n([\s\S]+?)\r?\n---\r?\n?([\s\S]*)$/);
-    if (!match) return { metadata: {}, body: content.trim() };
-
-    const metadata = {};
-    match[1].split(/\r?\n/).forEach((line) => {
-        const idx = line.indexOf(":");
-        if (idx === -1) return;
-        const key = line.slice(0, idx).trim();
-        let value = line.slice(idx + 1).trim();
-        if (
-            (value.startsWith('"') && value.endsWith('"')) ||
-            (value.startsWith("'") && value.endsWith("'"))
-        ) {
-            value = value.slice(1, -1);
-        }
-        if (value === "true") value = true;
-        else if (value === "false") value = false;
-        metadata[key] = value;
-    });
-
-    return { metadata, body: match[2].trim() };
-}
-
-function loadRules(rulesDir) {
-    if (!fs.existsSync(rulesDir)) {
-        console.error(`[Error] Rules directory not found: ${rulesDir}`);
-        console.error("  Ensure 'rules/' exists relative to the script location.");
-        process.exit(1);
-    }
-
-    const files = fs
-        .readdirSync(rulesDir)
-        .filter((f) => f.endsWith(".md"))
-        .sort();
-
-    if (files.length === 0) {
-        console.error(`[Error] No .md files found in: ${rulesDir}`);
-        process.exit(1);
-    }
-
-    return files.map((file) => {
-        const raw = fs.readFileSync(path.join(rulesDir, file), "utf8");
-        const { metadata, body } = parseFrontmatter(raw);
-        const baseName = path.basename(file, ".md");
-
-        return {
-            fileName: file,
-            name: metadata.name || baseName,
-            description: metadata.description || baseName,
-            globs: metadata.globs || "",
-            alwaysApply: metadata.alwaysApply === true,
-            metadata,
-            body,
-        };
-    });
-}
-
-function mergeRuleBodies(rules) {
-    return rules.map((r) => r.body).join("\n\n---\n\n");
-}
-
-function writeMergedFile(filePath, rules) {
-    fs.mkdirSync(path.dirname(filePath), { recursive: true });
-    const content = `${GENERATED_MARKER}\n\n${mergeRuleBodies(rules)}\n`;
-    fs.writeFileSync(filePath, content);
-}
-
-module.exports = {
-    GENERATED_MARKER,
-    parseFrontmatter,
-    loadRules,
-    mergeRuleBodies,
-    writeMergedFile,
-};
+"use strict";
+
+const fs = require("fs");
+const path = require("path");
+
+const GENERATED_MARKER = "<!-- @generated by sync-rules - DO NOT EDIT -->";
+const FRONTMATTER_REGEX = /^---\r?\n([\s\S]+?)\r?\n---\r?\n?([\s\S]*)$/;
+const MARKDOWN_EXTENSION = ".md";
+const RULE_SEPARATOR = "\n\n---\n\n";
+
+/**
+ * @param {string} rawValue
+ * @returns {string | boolean}
+ */
+function parseMetadataValue(rawValue) {
+    let value = rawValue.trim();
+    if (
+        (value.startsWith('"') && value.endsWith('"')) ||
+        (value.startsWith("'") && value.endsWith("'"))
+    ) {
+        value = value.slice(1, -1);
+    }
+
+    if (value === "true") {
+        return true;
+    }
+    if (value === "false") {
+        return false;
+    }
+
+    return value;
+}
+
+/**
+ * @param {string} metadataBlock
+ * @returns {Record<string, string | boolean>}
+ */
+function parseMetadataBlock(metadataBlock) {
+    const metadata = {};
+
+    metadataBlock.split(/\r?\n/).forEach((line) => {
+        const separatorIndex = line.indexOf(":");
+        if (separatorIndex === -1) {
+            return;
+        }
+
+        const key = line.slice(0, separatorIndex).trim();
+        const rawValue = line.slice(separatorIndex + 1);
+        metadata[key] = parseMetadataValue(rawValue);
+    });
+
+    return metadata;
+}
+
+function parseFrontmatter(content) {
+    const match = content.match(FRONTMATTER_REGEX);
+    if (!match) {
+        return { metadata: {}, body: content.trim() };
+    }
+
+    const [, metadataBlock, body] = match;
+    return {
+        metadata: parseMetadataBlock(metadataBlock),
+        body: body.trim(),
+    };
+}
+
+function loadMarkdownFiles(rulesDir) {
+    return fs
+        .readdirSync(rulesDir)
+        .filter((fileName) => fileName.endsWith(MARKDOWN_EXTENSION))
+        .sort();
+}
+
+function createRuleFromFile(rulesDir, fileName) {
+    const filePath = path.join(rulesDir, fileName);
+    const raw = fs.readFileSync(filePath, "utf8");
+    const { metadata, body } = parseFrontmatter(raw);
+    const baseName = path.basename(fileName, MARKDOWN_EXTENSION);
+
+    return {
+        fileName,
+        name: metadata.name || baseName,
+        description: metadata.description || baseName,
+        globs: metadata.globs || "",
+        alwaysApply: metadata.alwaysApply === true,
+        metadata,
+        body,
+    };
+}
+
+function loadRules(rulesDir) {
+    if (!fs.existsSync(rulesDir)) {
+        console.error(`[Error] Rules directory not found: ${rulesDir}`);
+        console.error("  Ensure 'rules/' exists relative to the script location.");
+        process.exit(1);
+    }
+
+    const files = loadMarkdownFiles(rulesDir);
+
+    if (files.length === 0) {
+        console.error(`[Error] No .md files found in: ${rulesDir}`);
+        process.exit(1);
+    }
+
+    return files.map((fileName) => createRuleFromFile(rulesDir, fileName));
+}
+
+function mergeRuleBodies(rules) {
+    return rules.map((rule) => rule.body).join(RULE_SEPARATOR);
+}
+
+function writeMergedFile(filePath, rules) {
+    fs.mkdirSync(path.dirname(filePath), { recursive: true });
+    const content = `${GENERATED_MARKER}\n\n${mergeRuleBodies(rules)}\n`;
+    fs.writeFileSync(filePath, content, "utf8");
+}
+
+module.exports = {
+    GENERATED_MARKER,
+    parseFrontmatter,
+    loadRules,
+    mergeRuleBodies,
+    writeMergedFile,
+};

package/scripts/lib/repo.js

@@ -5,47 +5,75 @@ const path = require("path");
 const { execSync } = require("child_process");
 
 const CACHE_DIR_NAME = path.join(".heymark", "cache");
+const DEFAULT_BRANCH = "main";
+const GITHUB_REPO_PATTERN = /github\.com[:/]([^/]+\/[^/]+?)(?:\/|$)/;
+const GENERIC_REPO_PATTERN = /([^/]+\/[^/]+?)(?:\/|$)/;
 
 /**
- * 저장소 URL에서 캐시 폴더명으로 쓸 수 있는 문자열 추출
+ * Convert repository URL to a stable cache directory name.
  * https://github.com/org/repo -> org-repo
  * git@github.com:org/repo.git -> org-repo
+ * @param {string} repoUrl
+ * @returns {string}
  */
-function sanitizeRepoName(url) {
-    let s = url.trim();
-    if (s.endsWith(".git")) s = s.slice(0, -4);
-    const match =
-        s.match(/github\.com[:/]([^/]+\/[^/]+?)(?:\/|$)/) || s.match(/([^/]+\/[^/]+?)(?:\/|$)/);
+function sanitizeRepoName(repoUrl) {
+    let normalized = repoUrl.trim();
+    if (normalized.endsWith(".git")) {
+        normalized = normalized.slice(0, -4);
+    }
+
+    const match = normalized.match(GITHUB_REPO_PATTERN) || normalized.match(GENERIC_REPO_PATTERN);
     if (match) {
         return match[1].replace(/\//g, "-");
     }
-    return s.replace(/[^a-zA-Z0-9._-]/g, "-") || "repo";
+
+    return normalized.replace(/[^a-zA-Z0-9._-]/g, "-") || "repo";
+}
+
+function cloneRulesRepo(projectRoot, clonePath, branch, repoUrl) {
+    execSync(`git clone --depth 1 --branch "${branch}" "${repoUrl}" "${clonePath}"`, {
+        stdio: "inherit",
+        cwd: projectRoot,
+    });
+}
+
+function updateRulesRepo(clonePath, branch) {
+    execSync(`git fetch origin && git checkout --quiet . && git pull --quiet origin "${branch}"`, {
+        stdio: "pipe",
+        cwd: clonePath,
+    });
+}
+
+function resolveRulesDirectory(clonePath, rulesSourceDir) {
+    const rulesDir = rulesSourceDir ? path.join(clonePath, rulesSourceDir) : clonePath;
+    if (!fs.existsSync(rulesDir) || !fs.statSync(rulesDir).isDirectory()) {
+        console.error(`[Error] Rules directory not found in repo: ${rulesSourceDir || "(root)"}`);
+        process.exit(1);
+    }
+    return rulesDir;
 }
 
 /**
- * 원격 저장소를 clone 또는 pull하여, 규칙 .md가 있는 로컬 디렉터리 절대 경로를 반환합니다.
- * Private repo는 사용자의 git 인증(SSH 키, credential)으로 접근해야 합니다.
- * @param {string} projectRoot - 현재 프로젝트 루트
+ * Clone or update remote repository and return local rules directory.
+ * Private repositories require user git credentials (SSH key or token).
+ * @param {string} projectRoot
  * @param {{ rulesSource: string, branch?: string, rulesSourceDir?: string }} config
- * @returns {string} - .md 파일이 있는 디렉터리의 절대 경로
+ * @returns {string}
  */
 function getRulesDirFromRepo(projectRoot, config) {
-    const url = config.rulesSource;
-    const branch = config.branch || "main";
-    const subDir = config.rulesSourceDir || "";
+    const repoUrl = config.rulesSource;
+    const branch = config.branch || DEFAULT_BRANCH;
+    const rulesSourceDir = config.rulesSourceDir || "";
 
     const cacheBase = path.join(projectRoot, CACHE_DIR_NAME);
-    const repoName = sanitizeRepoName(url);
+    const repoName = sanitizeRepoName(repoUrl);
     const clonePath = path.join(cacheBase, repoName);
 
     if (!fs.existsSync(clonePath)) {
         fs.mkdirSync(cacheBase, { recursive: true });
         try {
-            execSync(`git clone --depth 1 --branch "${branch}" "${url}" "${clonePath}"`, {
-                stdio: "inherit",
-                cwd: projectRoot,
-            });
-        } catch (err) {
+            cloneRulesRepo(projectRoot, clonePath, branch, repoUrl);
+        } catch {
             console.error("[Error] Failed to clone rules repository.");
             console.error("  For private repos, ensure you have access (SSH key or HTTPS token).");
             console.error("  Example: heymark init https://github.com/org/repo.git");
@@ -53,24 +81,13 @@ function getRulesDirFromRepo(projectRoot, config) {
         }
     } else {
         try {
-            execSync(
-                "git fetch origin && git checkout --quiet . && git pull --quiet origin " + branch,
-                {
-                    stdio: "pipe",
-                    cwd: clonePath,
-                }
-            );
-        } catch (err) {
-            // pull 실패 시(네트워크 등) 기존 클론 내용으로 진행
+            updateRulesRepo(clonePath, branch);
+        } catch {
+            // Continue with cached clone when fetch or pull fails.
         }
     }
 
-    const rulesDir = subDir ? path.join(clonePath, subDir) : clonePath;
-    if (!fs.existsSync(rulesDir) || !fs.statSync(rulesDir).isDirectory()) {
-        console.error(`[Error] Rules directory not found in repo: ${subDir || "(root)"}`);
-        process.exit(1);
-    }
-    return rulesDir;
+    return resolveRulesDirectory(clonePath, rulesSourceDir);
 }
 
 module.exports = {