jvcs 1.4.2 → 1.4.4

package/controllers/add.js

@@ -19,10 +19,10 @@ async function loadIgnorePatterns() {
     if(!fssync.existsSync(ignorePath)) return []
 
     const content = await fs.readFile(ignorePath, "utf-8")
-    return content.split("\n").map(line => line && !line.startsWith("#"))
+    return content.split("\n").map(line => line.trim()).filter(line => line.length > 0 && !line.startsWith("#"))
 }
 
-function isIgnored(relativePath, ignorePatterns) {
+function isIgnored(relativePath, ignorePatterns = []) {
     return ignorePatterns.some(pattern =>
         minimatch(relativePath, pattern, { dot: true })
     )
@@ -100,7 +100,7 @@ async function addCmd(paths) {
     let targets = []
     if(paths.length === 1 && paths[0] === ".") {
         let rootEntries  = await fs.readdir(process.cwd(),{withFileTypes: true})
-        targets = rootEntries.filter((target)=> target.name !== ".jvcs").map((item)=> path.resolve(process.cwd(), item.name))
+        targets = rootEntries.filter((target)=> target.name !== ".jvcs" && target.name !== ".jvcsignore").map((item)=> path.resolve(process.cwd(), item.name))
     }
     else {
         targets = paths.map((p)=> path.resolve(process.cwd(),p))
@@ -117,6 +117,16 @@ async function addCmd(paths) {
             }
     
             const relative = path.relative(process.cwd(), target)
+            if (relative === ".jvcs" || relative.startsWith(".jvcs" + path.sep)) {
+                console.log(chalk.red(`Cannot add internal repository folder ".jvcs"`))
+                continue
+            }
+
+            if (relative === ".jvcsignore") {
+                console.log(chalk.red(`Cannot add ".jvcsignore" file`))
+                continue
+            }
+
             if(isIgnored(relative, ignorePatterns)) {
                 console.log(chalk.gray(`skipped "${relative}" as it is present in .jvcsignore`))
                 continue
@@ -138,7 +148,7 @@ async function addCmd(paths) {
             }
             else if(stats.isDirectory()) {
                 await fs.cp(target,destination,{recursive: true})
-                await hashDirectoryRecursive(target,hashData)
+                await hashDirectoryRecursive(target,hashData,ignorePatterns)
                 console.log(chalk.cyan(`Added folder: ${path.relative(process.cwd(), target)}`));
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jvcs",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "bin": {
     "jvcs": "index.js"
   },