hsync-cli 1.1.5 → 1.1.7

package/dist/bin.js

@@ -68316,10 +68316,12 @@ class LocalScanner {
   excludePatterns;
   respectGitignore;
   ignoreRules;
+  includeBases;
   constructor(localPath, filePatterns, excludePatterns, respectGitignore = false) {
     this.localPath = localPath;
     this.filePatterns = filePatterns || [];
     this.excludePatterns = excludePatterns || [];
+    this.includeBases = this.filePatterns.map((p) => import_micromatch.default.scan(p).base);
     this.respectGitignore = respectGitignore;
     this.ignoreRules = respectGitignore ? [{ base: "", glob: "**/.git", negate: false, dirOnly: true }] : [];
   }
@@ -68355,7 +68357,15 @@ class LocalScanner {
     return results;
   }
   async walk(dirPath, results) {
-    const entries = await fs2.readdir(dirPath, { withFileTypes: true });
+    let entries;
+    try {
+      entries = await fs2.readdir(dirPath, { withFileTypes: true });
+    } catch (err) {
+      if (err.code !== "EACCES" && err.code !== "EPERM")
+        throw err;
+      console.warn(`[LocalScanner] Skipping unreadable folder: ${dirPath}`);
+      return;
+    }
     if (this.respectGitignore && entries.some((e) => e.isFile() && e.name === ".gitignore")) {
       this.ignoreRules.push(...parseGitignore(await fs2.readFile(path3.join(dirPath, ".gitignore"), "utf8"), path3.relative(this.localPath, dirPath).split(path3.sep).join("/")));
     }
@@ -68363,7 +68373,11 @@ class LocalScanner {
       const fullPath = path3.join(dirPath, entry.name);
       const relativePath = path3.relative(this.localPath, fullPath);
       if (entry.isDirectory()) {
-        if (!matchesRules(this.ignoreRules, relativePath.split(path3.sep).join("/"), true)) {
+        const dir = relativePath.split(path3.sep).join("/");
+        if (this.includeBases.length > 0 && !this.includeBases.some((b) => b === "" || b === dir || b.startsWith(dir + "/") || dir.startsWith(b + "/"))) {
+          continue;
+        }
+        if (!matchesRules(this.ignoreRules, dir, true)) {
           await this.walk(fullPath, results);
         }
         continue;
@@ -68409,9 +68423,8 @@ class RemoteClient {
     const response = await this.client.get(`/api/buckets/${slug}/files/tree`, {
       params: { path: cleanPath }
     });
-    const isSingleFile = response.data.files.length === 1 && response.data.files[0].path === cleanPath && !response.data.files[0].isDirectory;
-    if (isSingleFile) {
-      const f = response.data.files[0];
+    const f = response.data.files.find((file) => file.path === cleanPath && !file.isDirectory);
+    if (cleanPath && f) {
       return [
         {
           path: "",
@@ -68422,7 +68435,7 @@ class RemoteClient {
       ];
     }
     const prefix = cleanPath ? cleanPath + "/" : "";
-    return response.data.files.filter((f) => !f.isDirectory).map((f) => ({
+    return response.data.files.filter((f) => !f.isDirectory && f.path.startsWith(prefix)).map((f) => ({
       path: prefix ? f.path.slice(prefix.length) : f.path,
       hash: f.hash || "",
       size: f.size,
@@ -70437,13 +70450,14 @@ async function push(localPath, remoteTarget, options) {
     const remoteClient = new RemoteClient(serverUrl, apiKey);
     const remoteFiles = await remoteClient.getTree(remote.slug, remote.remotePath);
     spinner.stop();
+    const isFileToFile = !!remote.remotePath && (await fs6.stat(resolvedLocalPath)).isFile() && (remoteFiles.length === 1 && remoteFiles[0].path === "" || remoteFiles.length === 0 && path8.posix.basename(remote.remotePath) === localFiles[0].relativePath);
     console.log(source_default.cyan(`Found ${localFiles.length} local files, ${remoteFiles.length} remote files.`));
     const prompter = new OverwritePrompter(forceYes);
     let pushCount = 0;
     let skipCount = 0;
     for (const localFile of localFiles) {
-      const remoteFile = remoteFiles.find((f) => f.path === localFile.relativePath);
-      const destinationPath = remote.remotePath ? `${remote.remotePath}/${localFile.relativePath}` : localFile.relativePath;
+      const remoteFile = remoteFiles.find((f) => f.path === (isFileToFile ? "" : localFile.relativePath));
+      const destinationPath = isFileToFile ? remote.remotePath : remote.remotePath ? `${remote.remotePath}/${localFile.relativePath}` : localFile.relativePath;
       let shouldUpload = false;
       if (!remoteFile) {
         shouldUpload = true;
@@ -70491,8 +70505,24 @@ async function pull(remoteTarget, localPath, options) {
     const remoteClient = new RemoteClient(serverUrl, apiKey);
     const remoteFiles = await remoteClient.getTree(remote.slug, remote.remotePath);
     spinner.text = "Scanning local files...";
-    await fs6.mkdir(resolvedLocalPath, { recursive: true });
-    const localFiles = await scanLocalPath(resolvedLocalPath, resolvedLocalPath);
+    let singleFileDest = "";
+    let localFiles = [];
+    if (remoteFiles.length === 1 && remoteFiles[0].path === "") {
+      singleFileDest = resolvedLocalPath;
+      let isDir = localPath.endsWith("/");
+      try {
+        isDir = isDir || (await fs6.stat(resolvedLocalPath)).isDirectory();
+      } catch {}
+      if (isDir) {
+        singleFileDest = path8.join(resolvedLocalPath, path8.posix.basename(remote.remotePath));
+      }
+      try {
+        localFiles = [{ ...(await scanLocalPath(singleFileDest, singleFileDest))[0], relativePath: "" }];
+      } catch {}
+    } else {
+      await fs6.mkdir(resolvedLocalPath, { recursive: true });
+      localFiles = await scanLocalPath(resolvedLocalPath, resolvedLocalPath);
+    }
     spinner.stop();
     console.log(source_default.cyan(`Found ${remoteFiles.length} remote files, ${localFiles.length} local files.`));
     const prompter = new OverwritePrompter(forceYes);
@@ -70500,13 +70530,13 @@ async function pull(remoteTarget, localPath, options) {
     let skipCount = 0;
     for (const remoteFile of remoteFiles) {
       const localFile = localFiles.find((f) => f.relativePath === remoteFile.path);
-      const localDestPath = path8.join(resolvedLocalPath, remoteFile.path);
-      const sourcePath = remote.remotePath ? `${remote.remotePath}/${remoteFile.path}` : remoteFile.path;
+      const localDestPath = singleFileDest || path8.join(resolvedLocalPath, remoteFile.path);
+      const sourcePath = singleFileDest ? remote.remotePath : remote.remotePath ? `${remote.remotePath}/${remoteFile.path}` : remoteFile.path;
       let shouldDownload = false;
       if (!localFile) {
         shouldDownload = true;
       } else if (localFile.hash !== remoteFile.hash) {
-        const confirm = await prompter.shouldOverwrite(remoteFile.path);
+        const confirm = await prompter.shouldOverwrite(remoteFile.path || remote.remotePath);
         if (confirm) {
           shouldDownload = true;
         } else {
@@ -70516,13 +70546,13 @@ async function pull(remoteTarget, localPath, options) {
         skipCount++;
       }
       if (shouldDownload) {
-        const fileSpinner = ora2(`Pulling ${remoteFile.path}...`).start();
+        const fileSpinner = ora2(`Pulling ${remoteFile.path || remote.remotePath}...`).start();
         try {
           await remoteClient.downloadFile(remote.slug, sourcePath, localDestPath);
-          fileSpinner.succeed(source_default.green(`Pulled ${remoteFile.path}`));
+          fileSpinner.succeed(source_default.green(`Pulled ${remoteFile.path || remote.remotePath}`));
           pullCount++;
         } catch (downloadErr) {
-          fileSpinner.fail(source_default.red(`Failed to pull ${remoteFile.path}: ${downloadErr.message}`));
+          fileSpinner.fail(source_default.red(`Failed to pull ${remoteFile.path || remote.remotePath}: ${downloadErr.message}`));
         }
       }
     }
@@ -71488,7 +71518,7 @@ Press Ctrl+C to stop the server...
 // package.json
 var package_default = {
   name: "hsync-cli",
-  version: "1.1.5",
+  version: "1.1.7",
   description: "hsync CLI for file sync operations",
   bin: {
     hsync: "./dist/bin.js"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hsync-cli",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "hsync CLI for file sync operations",
   "bin": {
     "hsync": "./dist/bin.js"