pan-stack-cli 0.1.1 → 0.1.2

package/README.md

@@ -33,7 +33,7 @@ Sau đó gõ `pan` thay cho `./pan`.
 
 Tuỳ chọn git (forward xuống script):
 
-- `--base-dir DIR` — thư mục gốc cho path repo con (mặc định: `.`)
+- `--base-dir DIR` — thư mục gốc cho path repo con (mặc định: thư mục chứa `.project.yaml`; tự walk-up từ cwd nếu không có ngay tại đó)
 - `--dry-run` — chỉ in lệnh
 - `[manifest]` — đường dẫn manifest (mặc định: `.project.yaml`)
 

package/lib/discover.js

@@ -64,12 +64,17 @@ function walkUpManifests(startDir) {
   return found;
 }
 
-function findNearestWorkspace(startDir = process.cwd()) {
+function findNearestProjectManifest(startDir = process.cwd()) {
   const walked = walkUpManifests(startDir);
-  if (walked.length === 0) {
+  return walked[0] || null;
+}
+
+function findNearestWorkspace(startDir = process.cwd()) {
+  const manifestPath = findNearestProjectManifest(startDir);
+  if (!manifestPath) {
     return null;
   }
-  return loadManifest(walked[0]);
+  return loadManifest(manifestPath);
 }
 
 function loadCommandSourcesForWorkspace(workspace) {
@@ -205,6 +210,7 @@ function isBuiltinGitCommand(name) {
 module.exports = {
   BUILTIN_GIT_COMMANDS,
   PAN_CONFIG_FILE,
+  findNearestProjectManifest,
   findNearestWorkspace,
   loadAllCommandSources,
   loadCommandSourcesForWorkspace,

package/lib/git/git-clone.js

@@ -47,7 +47,7 @@ function main() {
     return;
   }
 
-  const repos = loadManifestRepos({
+  const { repos } = loadManifestRepos({
     manifestPath: args.manifest,
     baseDir: args.baseDir,
   });

package/lib/git/git-fetch-all.js

@@ -40,7 +40,7 @@ function main() {
     return;
   }
 
-  const repos = loadManifestRepos({
+  const { repos } = loadManifestRepos({
     manifestPath: args.manifest,
     baseDir: args.baseDir,
   });

package/lib/git/git-grv.js

@@ -5,7 +5,6 @@
  * Alias tương đương grv trong oh-my-zsh — hiển thị URL đầy đủ (fetch/push).
  */
 
-const path = require("path");
 const { parseCommonArgs, loadManifestRepos, printCommonOptions } = require("./helpers/cli");
 const { ensureRepoExists, isGitRepo, listRemotesVerbose } = require("./helpers/git");
 
@@ -28,8 +27,7 @@ function printRepoRemotes({ label, destination, dryRun }) {
   console.log("");
 }
 
-function showWorkspaceRootRemotes({ manifestPath, baseDir, dryRun }) {
-  const workspaceRoot = path.resolve(baseDir || path.dirname(manifestPath || ".project.yaml"));
+function showWorkspaceRootRemotes({ workspaceRoot, dryRun }) {
   if (!isGitRepo(workspaceRoot)) {
     return;
   }
@@ -64,16 +62,14 @@ function main() {
     return;
   }
 
-  const manifestPath = path.resolve(args.manifest || ".project.yaml");
-  const repos = loadManifestRepos({
-    manifestPath,
+  const { repos, workspaceRoot } = loadManifestRepos({
+    manifestPath: args.manifest,
     baseDir: args.baseDir,
   });
 
   if (!args.noWorkspace) {
     showWorkspaceRootRemotes({
-      manifestPath,
-      baseDir: args.baseDir,
+      workspaceRoot,
       dryRun: args.dryRun,
     });
   }

package/lib/git/git-gst.js

@@ -5,7 +5,6 @@
  * Alias tương đương gst trong oh-my-zsh — chạy git status trên workspace + repo con.
  */
 
-const path = require("path");
 const { parseCommonArgs, loadManifestRepos, printCommonOptions } = require("./helpers/cli");
 const { ensureRepoExists, isGitRepo, runGitStatus } = require("./helpers/git");
 
@@ -22,8 +21,7 @@ function printRepoStatus({ label, destination, dryRun, gitArgs }) {
   console.log("");
 }
 
-function showWorkspaceRootStatus({ manifestPath, baseDir, dryRun, gitArgs }) {
-  const workspaceRoot = path.resolve(baseDir || path.dirname(manifestPath || ".project.yaml"));
+function showWorkspaceRootStatus({ workspaceRoot, dryRun, gitArgs }) {
   if (!isGitRepo(workspaceRoot)) {
     return;
   }
@@ -62,16 +60,14 @@ function main() {
   }
 
   const gitArgs = args.gitArgs || [];
-  const manifestPath = path.resolve(args.manifest || ".project.yaml");
-  const repos = loadManifestRepos({
-    manifestPath,
+  const { repos, workspaceRoot } = loadManifestRepos({
+    manifestPath: args.manifest,
     baseDir: args.baseDir,
   });
 
   if (!args.noWorkspace) {
     showWorkspaceRootStatus({
-      manifestPath,
-      baseDir: args.baseDir,
+      workspaceRoot,
       dryRun: args.dryRun,
       gitArgs,
     });

package/lib/git/git-pull.js

@@ -53,7 +53,7 @@ function main() {
     return;
   }
 
-  const repos = loadManifestRepos({
+  const { repos } = loadManifestRepos({
     manifestPath: args.manifest,
     baseDir: args.baseDir,
   });

package/lib/git/git-push.js

@@ -53,7 +53,7 @@ function main() {
     return;
   }
 
-  const repos = loadManifestRepos({
+  const { repos } = loadManifestRepos({
     manifestPath: args.manifest,
     baseDir: args.baseDir,
   });

package/lib/git/helpers/cli.js

@@ -1,5 +1,6 @@
 const path = require("path");
 const fs = require("fs");
+const { findNearestProjectManifest } = require("../../discover");
 const { parseManifest, manifestRepos, validateRepo } = require("./manifest");
 
 function parseCommonArgs(argv, extraFlags = {}) {
@@ -51,19 +52,61 @@ function looksLikeManifest(arg) {
   }
 }
 
-function loadManifestRepos({ manifestPath, baseDir }) {
-  const resolvedManifest = path.resolve(manifestPath || ".project.yaml");
-  if (!fs.existsSync(resolvedManifest)) {
-    throw new Error(`Manifest not found: ${manifestPath || ".project.yaml"}`);
+function resolveProjectWorkspace({
+  manifestPath = "",
+  baseDir = ".",
+  startDir = process.cwd(),
+}) {
+  const manifestName = manifestPath || ".project.yaml";
+  const cwdManifest = path.isAbsolute(manifestName)
+    ? manifestName
+    : path.resolve(startDir, manifestName);
+
+  let resolvedManifest = "";
+  let usedWalkUp = false;
+
+  if (fs.existsSync(cwdManifest)) {
+    resolvedManifest = cwdManifest;
+  } else {
+    const found = findNearestProjectManifest(startDir);
+    if (!found) {
+      const label = manifestPath || ".project.yaml";
+      throw new Error(
+        `Manifest not found: ${label} (đã tìm từ ${startDir} lên thư mục cha)`
+      );
+    }
+    resolvedManifest = found;
+    usedWalkUp = true;
+  }
+
+  const workspaceRoot = path.dirname(resolvedManifest);
+  let resolvedBaseDir;
+  if (baseDir === ".") {
+    resolvedBaseDir = usedWalkUp ? workspaceRoot : path.resolve(startDir, ".");
+  } else if (path.isAbsolute(baseDir)) {
+    resolvedBaseDir = baseDir;
+  } else {
+    resolvedBaseDir = path.resolve(startDir, baseDir);
   }
 
+  return {
+    manifestPath: resolvedManifest,
+    baseDir: resolvedBaseDir,
+    workspaceRoot,
+  };
+}
+
+function loadManifestRepos({ manifestPath, baseDir, startDir = process.cwd() }) {
+  const workspace = resolveProjectWorkspace({ manifestPath, baseDir, startDir });
+  const { manifestPath: resolvedManifest, baseDir: resolvedBaseDir, workspaceRoot } =
+    workspace;
+
   const data = parseManifest(resolvedManifest);
   const repos = manifestRepos(data);
   if (repos.length === 0) {
     throw new Error("No repositories found in manifest.");
   }
 
-  const resolvedBaseDir = path.resolve(baseDir);
   const results = [];
   for (const repo of repos) {
     try {
@@ -83,7 +126,12 @@ function loadManifestRepos({ manifestPath, baseDir }) {
     throw new Error("No valid repositories found in manifest.");
   }
 
-  return results;
+  return {
+    repos: results,
+    manifestPath: resolvedManifest,
+    baseDir: resolvedBaseDir,
+    workspaceRoot,
+  };
 }
 
 function printCommonOptions() {
@@ -92,12 +140,13 @@ function printCommonOptions() {
 
 options:
   -h, --help           show this help message and exit
-  --base-dir BASE_DIR  Base directory for relative repo paths. Default: current directory.
+  --base-dir BASE_DIR  Base directory for relative repo paths. Default: thư mục chứa .project.yaml (walk-up từ cwd nếu cần).
   --dry-run            Print commands only`;
 }
 
 module.exports = {
   parseCommonArgs,
+  resolveProjectWorkspace,
   loadManifestRepos,
   printCommonOptions,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pan-stack-cli",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "CLI điều phối PAN Stack — git đa repo và lệnh dự án từ .project.yaml",
   "license": "MIT",
   "bin": {