From d543650b313c434e794ad800aefe4aeda83c0fed Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 23 Feb 2023 18:02:35 +0100
Subject: [PATCH] fix(cli): .wmillignore whitelist behavior

---
 cli/sync.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/cli/sync.ts b/cli/sync.ts
index 33b5362198..b0c7335787 100644
--- a/cli/sync.ts
+++ b/cli/sync.ts
@@ -212,7 +212,7 @@ async function compareDynFSElement(
 }
 
 const isNotWmillFile = (p: string, isDirectory: boolean) => {
-  if (p == "./" || p == "" || p == "u" || p == "f" || p == "g" || p.endsWith("/")) {
+  if (p.endsWith("/")) {
     return false
   }
   if (isDirectory) {
@@ -231,6 +231,9 @@ const isNotWmillFile = (p: string, isDirectory: boolean) => {
   }
 }
 
+const isWhitelisted = (p: string) => {
+  return p == "./" || p == "" || p == "u" || p == "f" || p == "g"
+}
 async function ignoreF() {
   try {
     const ignore: {
@@ -239,9 +242,12 @@ async function ignoreF() {
     } = gitignore_parser.compile(
       await Deno.readTextFile(".wmillignore"),
     );
-    return (p: string, isDirectory: boolean) => isNotWmillFile(p, isDirectory) || ignore.denies(p);
+
+    return (p: string, isDirectory: boolean) => {
+      return !isWhitelisted(p) && (isNotWmillFile(p, isDirectory) || ignore.denies(p));
+    }
   } catch (e) {
-    return isNotWmillFile
+    return (p: string, isDirectory: boolean) => !isWhitelisted(p) && isNotWmillFile(p, isDirectory)
   }
 }