v1.2.1

timthelion · Jan 31, 2022 · f79bd10 · f79bd10
1 parent 4526c6c
commit f79bd10
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 33 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@samkirkland/ftp-deploy",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "private": false,
   "description": "Deploy files to a ftp server",
   "main": "dist/module.js",

diff --git a/src/main.test.ts b/src/main.test.ts
@@ -1,7 +1,7 @@
 import { HashDiff } from "./HashDiff";
 import { IFileList, currentSyncFileVersion, IFile } from "./types";
 import { Record } from "./types";
-import { applyExcludeFilter, applyFolderFiltersToSubItems, getDefaultSettings, ILogger, Timings } from "./utilities";
+import { applyExcludeFilter, getDefaultSettings, ILogger, Timings } from "./utilities";
 import path from "path";
 import FtpSrv from "ftp-srv";
 import { getLocalFiles } from "./localFiles";
@@ -615,7 +615,7 @@ describe("getLocalFiles", () => {
             new MockedStats("node_modules/@samkirkland/"),
         ];
 
-        const filteredStats = files.filter(file => applyExcludeFilter(file, applyFolderFiltersToSubItems(excludeDefaults)));
+        const filteredStats = files.filter(file => applyExcludeFilter(file, excludeDefaults));
 
         expect(filteredStats.map(f => f.path)).toStrictEqual(["test/sam"]);
     });
@@ -632,7 +632,7 @@ describe("getLocalFiles", () => {
             new MockedStats("test/.git/workflows/main.yml"),
         ];
 
-        const filteredStats = files.filter(file => applyExcludeFilter(file, applyFolderFiltersToSubItems(excludeDefaults)));
+        const filteredStats = files.filter(file => applyExcludeFilter(file, excludeDefaults));
 
         expect(filteredStats.map(f => f.path)).toStrictEqual(["test/sam"]);
     });
@@ -652,7 +652,7 @@ describe("getLocalFiles", () => {
             new MockedStats("node_modules/@samkirkland/"),
         ];
 
-        const filteredStats = files.filter(file => applyExcludeFilter(file, applyFolderFiltersToSubItems([])));
+        const filteredStats = files.filter(file => applyExcludeFilter(file, []));
 
         expect(filteredStats.length).toBe(11);
     });
@@ -663,7 +663,7 @@ describe("getLocalFiles", () => {
             new MockedStats("test/folder/"),
         ];
 
-        const filteredStats = files.filter(file => applyExcludeFilter(file, applyFolderFiltersToSubItems(["*.js"])));
+        const filteredStats = files.filter(file => applyExcludeFilter(file, ["*.js"]));
 
         expect(filteredStats.map(f => f.path)).toStrictEqual(["test/folder/"]);
     });
@@ -674,7 +674,7 @@ describe("getLocalFiles", () => {
             new MockedStats("test/folder/"),
         ];
 
-        const filteredStats = files.filter(file => applyExcludeFilter(file, applyFolderFiltersToSubItems(["**/folder/**"])));
+        const filteredStats = files.filter(file => applyExcludeFilter(file, ["**/folder/**"]));
 
         expect(filteredStats.map(f => f.path)).toStrictEqual(["test/test.js"]);
     });
@@ -685,7 +685,7 @@ describe("getLocalFiles", () => {
             new MockedStats("test/folder/"),
         ];
 
-        const filteredStats = files.filter(file => applyExcludeFilter(file, applyFolderFiltersToSubItems(["**/folder/**"])));
+        const filteredStats = files.filter(file => applyExcludeFilter(file, ["**/folder/**"]));
 
         expect(filteredStats.map(f => f.path)).toStrictEqual(["test/test.js"]);
     });
@@ -697,21 +697,7 @@ describe("getLocalFiles", () => {
             new MockedStats("test/folder/newfile.js"),
         ];
 
-        const filteredStats = files.filter(file => applyExcludeFilter(file, applyFolderFiltersToSubItems(["test/folder/**"])));
-
-        expect(filteredStats.map(f => f.path)).toStrictEqual(["test/test.js"]);
-    });
-
-    test("exclude existing folder while adding new file", async () => {
-        const files: MockedStats[] = [
-            new MockedStats("test/test.js"),
-            new MockedStats("test/folder/"),
-            new MockedStats("test/folder/subFolder/"),
-            new MockedStats("test/folder/newfile.js"),
-            new MockedStats("test/folder/sub/sub/sub/sub/newfile.js"),
-        ];
-
-        const filteredStats = files.filter(file => applyExcludeFilter(file, applyFolderFiltersToSubItems(["test/folder/"])));
+        const filteredStats = files.filter(file => applyExcludeFilter(file, ["test/folder/**"]));
 
         expect(filteredStats.map(f => f.path)).toStrictEqual(["test/test.js"]);
     });

diff --git a/src/utilities.ts b/src/utilities.ts
@@ -185,21 +185,12 @@ export function getDefaultSettings(withoutDefaults: IFtpDeployArguments): IFtpDe
         "state-name": withoutDefaults["state-name"] ?? ".ftp-deploy-sync-state.json",
         "dry-run": withoutDefaults["dry-run"] ?? false,
         "dangerous-clean-slate": withoutDefaults["dangerous-clean-slate"] ?? false,
-        "exclude": applyFolderFiltersToSubItems(withoutDefaults.exclude ?? excludeDefaults),
+        "exclude": withoutDefaults.exclude ?? excludeDefaults,
         "log-level": withoutDefaults["log-level"] ?? "standard",
         "security": withoutDefaults.security ?? "loose",
     };
 }
 
-/**
- * automatically exclude all sub-files/sub-folders if we exclude a folder.
- * For example "test/" should also exclude "test/file.txt"
- * to do this we add "**" to all folder paths
- */
-export function applyFolderFiltersToSubItems(excludeFilters: Readonly<string[]>) {
-    return excludeFilters.map(filter => filter.endsWith("/") ? `${filter}**` : filter);
-}
-
 interface IStats {
     path: string;
     isDirectory(): boolean;