occam-file-system 3.1.9 → 4.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/constants.js +2 -4
- package/lib/moveProjectEntries.js +33 -41
- package/lib/removeProjectEntries.js +19 -18
- package/package.json +2 -2
- package/src/constants.js +0 -1
- package/src/moveProjectEntries.js +54 -51
- package/src/removeProjectEntries.js +31 -25
- package/lib/utilities/fileSystem.js +0 -15
- package/src/utilities/fileSystem.js +0 -11
package/lib/constants.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
exports.CONTENT_LENGTH = exports.OKAY_200 = exports.END = exports.EMPTY_STRING = exports.
|
|
5
|
+
exports.CONTENT_LENGTH = exports.OKAY_200 = exports.END = exports.EMPTY_STRING = exports.DATA = void 0;
|
|
6
6
|
var END = "end";
|
|
7
7
|
exports.END = END;
|
|
8
8
|
var DATA = "data";
|
|
@@ -13,7 +13,5 @@ var EMPTY_STRING = "";
|
|
|
13
13
|
exports.EMPTY_STRING = EMPTY_STRING;
|
|
14
14
|
var CONTENT_LENGTH = "content-length";
|
|
15
15
|
exports.CONTENT_LENGTH = CONTENT_LENGTH;
|
|
16
|
-
var DEST_ALREADY_EXISTS_MESSAGE = "dest already exists.";
|
|
17
|
-
exports.DEST_ALREADY_EXISTS_MESSAGE = DEST_ALREADY_EXISTS_MESSAGE;
|
|
18
16
|
|
|
19
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25zdGFudHMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmV4cG9ydCBjb25zdCBFTkQgPSBcImVuZFwiO1xuZXhwb3J0IGNvbnN0IERBVEEgPSBcImRhdGFcIjtcbmV4cG9ydCBjb25zdCBPS0FZXzIwMCA9IDIwMDtcbmV4cG9ydCBjb25zdCBFTVBUWV9TVFJJTkcgPSBcIlwiO1xuZXhwb3J0IGNvbnN0IENPTlRFTlRfTEVOR1RIID0gXCJjb250ZW50LWxlbmd0aFwiO1xuIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJDQUFBLFVBQVk7Ozs7O0FBRUwsR0FBSyxDQUFDLEdBQUcsSUFBRyxHQUFLO1FBQVgsR0FBRyxHQUFILEdBQUc7QUFDVCxHQUFLLENBQUMsSUFBSSxJQUFHLElBQU07UUFBYixJQUFJLEdBQUosSUFBSTtBQUNWLEdBQUssQ0FBQyxRQUFRLEdBQUcsR0FBRztRQUFkLFFBQVEsR0FBUixRQUFRO0FBQ2QsR0FBSyxDQUFDLFlBQVk7UUFBWixZQUFZLEdBQVosWUFBWTtBQUNsQixHQUFLLENBQUMsY0FBYyxJQUFHLGNBQWdCO1FBQWpDLGNBQWMsR0FBZCxjQUFjIn0=
|
|
@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
5
|
exports.default = moveProjectEntries;
|
|
6
|
+
exports.moveEntry = moveEntry;
|
|
7
|
+
var _fsExtra = require("fs-extra");
|
|
6
8
|
var _necessary = require("necessary");
|
|
7
|
-
var
|
|
9
|
+
var _removeProjectEntries = require("./removeProjectEntries");
|
|
8
10
|
var _pathMaps = require("./utilities/pathMaps");
|
|
9
|
-
var _constants = require("./constants");
|
|
10
11
|
var concatenatePaths = _necessary.pathUtilities.concatenatePaths, checkEntryExists = _necessary.fileSystemUtilities.checkEntryExists, isEntryDirectory = _necessary.fileSystemUtilities.isEntryDirectory, isDirectoryEmpty = _necessary.fileSystemUtilities.isDirectoryEmpty;
|
|
11
12
|
function moveProjectEntries(projectsDirectoryPath, json, callback) {
|
|
12
13
|
var pathMaps = json.pathMaps, targetPaths = [];
|
|
@@ -22,57 +23,48 @@ function moveProjectEntries(projectsDirectoryPath, json, callback) {
|
|
|
22
23
|
}
|
|
23
24
|
function moveEntry(sourcePath, targetPath, projectsDirectoryPath, callback) {
|
|
24
25
|
if (targetPath === null) {
|
|
26
|
+
(0, _removeProjectEntries).removeEntry(sourcePath, targetPath, projectsDirectoryPath, callback);
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
if (sourcePath === targetPath) {
|
|
30
|
+
callback(targetPath);
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
var absoluteSourcePath = concatenatePaths(projectsDirectoryPath, sourcePath), sourceEntryExists = checkEntryExists(absoluteSourcePath);
|
|
34
|
+
if (!sourceEntryExists) {
|
|
35
|
+
targetPath = null;
|
|
36
|
+
callback(targetPath);
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
var absoluteTargetPath = concatenatePaths(projectsDirectoryPath, targetPath), targetEntryExists = checkEntryExists(absoluteTargetPath);
|
|
40
|
+
if (targetEntryExists) {
|
|
41
|
+
targetPath = sourcePath; ///
|
|
25
42
|
callback(targetPath);
|
|
26
|
-
|
|
27
|
-
if (sourcePath === targetPath) {
|
|
28
|
-
callback(targetPath);
|
|
29
|
-
} else {
|
|
30
|
-
var absoluteSourcePath = concatenatePaths(projectsDirectoryPath, sourcePath), entryExists = checkEntryExists(absoluteSourcePath);
|
|
31
|
-
if (!entryExists) {
|
|
32
|
-
targetPath = null;
|
|
33
|
-
callback(targetPath);
|
|
34
|
-
} else {
|
|
35
|
-
var entryDirectory = isEntryDirectory(absoluteSourcePath);
|
|
36
|
-
entryDirectory ? moveDirectory(sourcePath, targetPath, projectsDirectoryPath, callback) : moveFile(sourcePath, targetPath, projectsDirectoryPath, callback);
|
|
37
|
-
}
|
|
38
|
-
}
|
|
43
|
+
return;
|
|
39
44
|
}
|
|
45
|
+
var entryDirectory = isEntryDirectory(absoluteSourcePath);
|
|
46
|
+
entryDirectory ? moveDirectory(sourcePath, targetPath, projectsDirectoryPath, callback) : moveFile(sourcePath, targetPath, projectsDirectoryPath, callback);
|
|
40
47
|
}
|
|
41
48
|
function moveFile(sourcePath, targetPath, projectsDirectoryPath, callback) {
|
|
42
49
|
var absoluteSourcePath = concatenatePaths(projectsDirectoryPath, sourcePath), absoluteTargetPath = concatenatePaths(projectsDirectoryPath, targetPath);
|
|
43
|
-
(0,
|
|
44
|
-
var success = !error;
|
|
45
|
-
targetPath = success ? targetPath : sourcePath;
|
|
50
|
+
(0, _fsExtra).move(absoluteSourcePath, absoluteTargetPath, function(error) {
|
|
51
|
+
var success = !error;
|
|
52
|
+
targetPath = success ? targetPath : sourcePath; ///
|
|
46
53
|
callback(targetPath);
|
|
47
54
|
});
|
|
48
55
|
}
|
|
49
56
|
function moveDirectory(sourcePath, targetPath, projectsDirectoryPath, callback) {
|
|
50
57
|
var absoluteSourcePath = concatenatePaths(projectsDirectoryPath, sourcePath), absoluteTargetPath = concatenatePaths(projectsDirectoryPath, targetPath), directoryEmpty = isDirectoryEmpty(absoluteSourcePath);
|
|
51
58
|
if (!directoryEmpty) {
|
|
52
|
-
var targetPath1 = sourcePath;
|
|
59
|
+
var targetPath1 = sourcePath; ///
|
|
53
60
|
callback(targetPath1);
|
|
54
|
-
|
|
55
|
-
(0, _fileSystem).move(absoluteSourcePath, absoluteTargetPath, function(error) {
|
|
56
|
-
var success = !error; ///
|
|
57
|
-
if (success) {
|
|
58
|
-
callback(targetPath);
|
|
59
|
-
} else {
|
|
60
|
-
var message = error.message;
|
|
61
|
-
if (message !== _constants.DEST_ALREADY_EXISTS_MESSAGE) {
|
|
62
|
-
var targetPath2 = sourcePath;
|
|
63
|
-
callback(targetPath2);
|
|
64
|
-
} else {
|
|
65
|
-
(0, _fileSystem).remove(absoluteSourcePath, function(error1) {
|
|
66
|
-
var success1 = !error1; ///
|
|
67
|
-
if (!success1) {
|
|
68
|
-
targetPath = sourcePath;
|
|
69
|
-
}
|
|
70
|
-
callback(targetPath);
|
|
71
|
-
});
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
});
|
|
61
|
+
return;
|
|
75
62
|
}
|
|
63
|
+
(0, _fsExtra).move(absoluteSourcePath, absoluteTargetPath, function(error) {
|
|
64
|
+
var success = !error;
|
|
65
|
+
targetPath = success ? targetPath : sourcePath; ///
|
|
66
|
+
callback(targetPath);
|
|
67
|
+
});
|
|
76
68
|
}
|
|
77
69
|
|
|
78
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9tb3ZlUHJvamVjdEVudHJpZXMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IG1vdmUgfSBmcm9tIFwiZnMtZXh0cmFcIjtcbmltcG9ydCB7IHBhdGhVdGlsaXRpZXMsIGZpbGVTeXN0ZW1VdGlsaXRpZXMgfSBmcm9tIFwibmVjZXNzYXJ5XCI7XG5cbmltcG9ydCB7IHJlbW92ZUVudHJ5IH0gZnJvbSBcIi4vcmVtb3ZlUHJvamVjdEVudHJpZXNcIjtcbmltcG9ydCB7IGFzeW5jaHJvbm91c0ZvckVhY2ggfSBmcm9tIFwiLi91dGlsaXRpZXMvcGF0aE1hcHNcIjtcblxuY29uc3QgeyBjb25jYXRlbmF0ZVBhdGhzIH0gPSBwYXRoVXRpbGl0aWVzLFxuICAgICAgeyBjaGVja0VudHJ5RXhpc3RzLCBpc0VudHJ5RGlyZWN0b3J5LCBpc0RpcmVjdG9yeUVtcHR5IH0gPSBmaWxlU3lzdGVtVXRpbGl0aWVzO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBtb3ZlUHJvamVjdEVudHJpZXMocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBqc29uLCBjYWxsYmFjaykge1xuICBjb25zdCB7IHBhdGhNYXBzIH0gPSBqc29uLFxuXHRcdCAgICB0YXJnZXRQYXRocyA9IFtdO1xuXG4gIGFzeW5jaHJvbm91c0ZvckVhY2goXG4gICAgcGF0aE1hcHMsXG4gICAgKHNvdXJjZVBhdGgsIHRhcmdldFBhdGgsIGRpcmVjdG9yeSwgbmV4dCwgZG9uZSwgaW5kZXgpID0+IHtcbiAgICAgIG1vdmVFbnRyeShzb3VyY2VQYXRoLCB0YXJnZXRQYXRoLCBwcm9qZWN0c0RpcmVjdG9yeVBhdGgsICh0YXJnZXRQYXRoKSA9PiB7XG4gICAgICAgIHRhcmdldFBhdGhzLnB1c2godGFyZ2V0UGF0aCk7XG5cbiAgICAgICAgbmV4dCgpO1xuICAgICAgfSk7XG4gICAgfSxcbiAgICAoKSA9PiB7XG4gICAgXHRjb25zdCBqc29uID0gdGFyZ2V0UGF0aHM7IC8vL1xuXG4gICAgICBjYWxsYmFjayhqc29uKTtcbiAgICB9XG4gICk7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBtb3ZlRW50cnkoc291cmNlUGF0aCwgdGFyZ2V0UGF0aCwgcHJvamVjdHNEaXJlY3RvcnlQYXRoLCBjYWxsYmFjaykge1xuICBpZiAodGFyZ2V0UGF0aCA9PT0gbnVsbCkge1xuICAgIHJlbW92ZUVudHJ5KHNvdXJjZVBhdGgsIHRhcmdldFBhdGgsIHByb2plY3RzRGlyZWN0b3J5UGF0aCwgY2FsbGJhY2spO1xuXG4gICAgcmV0dXJuO1xuICB9XG5cbiAgaWYgKHNvdXJjZVBhdGggPT09IHRhcmdldFBhdGgpIHtcbiAgICBjYWxsYmFjayh0YXJnZXRQYXRoKTtcblxuICAgIHJldHVybjtcbiAgfVxuXG4gIGNvbnN0IGFic29sdXRlU291cmNlUGF0aCA9IGNvbmNhdGVuYXRlUGF0aHMocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBzb3VyY2VQYXRoKSxcbiAgICAgICAgc291cmNlRW50cnlFeGlzdHMgPSBjaGVja0VudHJ5RXhpc3RzKGFic29sdXRlU291cmNlUGF0aCk7XG5cbiAgaWYgKCFzb3VyY2VFbnRyeUV4aXN0cykge1xuICAgIHRhcmdldFBhdGggPSBudWxsO1xuXG4gICAgY2FsbGJhY2sodGFyZ2V0UGF0aCk7XG5cbiAgICByZXR1cm47XG4gIH1cblxuICBjb25zdCBhYnNvbHV0ZVRhcmdldFBhdGggPSBjb25jYXRlbmF0ZVBhdGhzKHByb2plY3RzRGlyZWN0b3J5UGF0aCwgdGFyZ2V0UGF0aCksXG4gICAgICAgIHRhcmdldEVudHJ5RXhpc3RzID0gY2hlY2tFbnRyeUV4aXN0cyhhYnNvbHV0ZVRhcmdldFBhdGgpO1xuXG4gIGlmICh0YXJnZXRFbnRyeUV4aXN0cykge1xuICAgIHRhcmdldFBhdGggPSBzb3VyY2VQYXRoOyAgLy8vXG5cbiAgICBjYWxsYmFjayh0YXJnZXRQYXRoKTtcblxuICAgIHJldHVybjtcbiAgfVxuXG4gIGNvbnN0IGVudHJ5RGlyZWN0b3J5ID0gaXNFbnRyeURpcmVjdG9yeShhYnNvbHV0ZVNvdXJjZVBhdGgpO1xuXG4gIGVudHJ5RGlyZWN0b3J5ID9cbiAgICBtb3ZlRGlyZWN0b3J5KHNvdXJjZVBhdGgsIHRhcmdldFBhdGgsIHByb2plY3RzRGlyZWN0b3J5UGF0aCwgY2FsbGJhY2spIDpcbiAgICAgIG1vdmVGaWxlKHNvdXJjZVBhdGgsIHRhcmdldFBhdGgsIHByb2plY3RzRGlyZWN0b3J5UGF0aCwgY2FsbGJhY2spO1xufVxuXG5mdW5jdGlvbiBtb3ZlRmlsZShzb3VyY2VQYXRoLCB0YXJnZXRQYXRoLCBwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIGNhbGxiYWNrKSB7XG4gIGNvbnN0IGFic29sdXRlU291cmNlUGF0aCA9IGNvbmNhdGVuYXRlUGF0aHMocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBzb3VyY2VQYXRoKSxcbiAgICAgICAgYWJzb2x1dGVUYXJnZXRQYXRoID0gY29uY2F0ZW5hdGVQYXRocyhwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIHRhcmdldFBhdGgpO1xuXG4gIG1vdmUoYWJzb2x1dGVTb3VyY2VQYXRoLCBhYnNvbHV0ZVRhcmdldFBhdGgsIChlcnJvcikgPT4ge1xuICAgIGNvbnN0IHN1Y2Nlc3MgPSAhZXJyb3I7XG4gICAgXG4gICAgdGFyZ2V0UGF0aCA9IHN1Y2Nlc3MgP1xuICAgICAgICAgICAgICAgICAgIHRhcmdldFBhdGggOlxuICAgICAgICAgICAgICAgICAgICAgc291cmNlUGF0aDsgIC8vL1xuXG4gICAgY2FsbGJhY2sodGFyZ2V0UGF0aCk7XG4gIH0pO1xufVxuXG5mdW5jdGlvbiBtb3ZlRGlyZWN0b3J5KHNvdXJjZVBhdGgsIHRhcmdldFBhdGgsIHByb2plY3RzRGlyZWN0b3J5UGF0aCwgY2FsbGJhY2spIHtcbiAgY29uc3QgYWJzb2x1dGVTb3VyY2VQYXRoID0gY29uY2F0ZW5hdGVQYXRocyhwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIHNvdXJjZVBhdGgpLFxuICAgICAgICBhYnNvbHV0ZVRhcmdldFBhdGggPSBjb25jYXRlbmF0ZVBhdGhzKHByb2plY3RzRGlyZWN0b3J5UGF0aCwgdGFyZ2V0UGF0aCksXG4gICAgICAgIGRpcmVjdG9yeUVtcHR5ID0gaXNEaXJlY3RvcnlFbXB0eShhYnNvbHV0ZVNvdXJjZVBhdGgpO1xuXG4gIGlmICghZGlyZWN0b3J5RW1wdHkpIHtcbiAgICBjb25zdCB0YXJnZXRQYXRoID0gc291cmNlUGF0aDsgIC8vL1xuXG4gICAgY2FsbGJhY2sodGFyZ2V0UGF0aCk7XG5cbiAgICByZXR1cm47XG4gIH1cblxuICBtb3ZlKGFic29sdXRlU291cmNlUGF0aCwgYWJzb2x1dGVUYXJnZXRQYXRoLCAoZXJyb3IpID0+IHtcbiAgICBjb25zdCBzdWNjZXNzID0gIWVycm9yO1xuXG4gICAgdGFyZ2V0UGF0aCA9IHN1Y2Nlc3MgP1xuICAgICAgICAgICAgICAgICAgIHRhcmdldFBhdGggOlxuICAgICAgICAgICAgICAgICAgICAgc291cmNlUGF0aDsgIC8vL1xuXG4gICAgY2FsbGJhY2sodGFyZ2V0UGF0aCk7XG4gIH0pO1xufVxuIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJDQUFBLFVBQVk7Ozs7a0JBV1ksa0JBQWtCO1FBcUIxQixTQUFTLEdBQVQsU0FBUztBQTlCSixHQUFVLENBQVYsUUFBVTtBQUNvQixHQUFXLENBQVgsVUFBVztBQUVsQyxHQUF3QixDQUF4QixxQkFBd0I7QUFDaEIsR0FBc0IsQ0FBdEIsU0FBc0I7QUFFMUQsR0FBSyxDQUFHLGdCQUFnQixHQUwyQixVQUFXLGVBS3RELGdCQUFnQixFQUNoQixnQkFBZ0IsR0FOMkIsVUFBVyxxQkFNdEQsZ0JBQWdCLEVBQUUsZ0JBQWdCLEdBTlMsVUFBVyxxQkFNcEMsZ0JBQWdCLEVBQUUsZ0JBQWdCLEdBTlQsVUFBVyxxQkFNbEIsZ0JBQWdCO1NBRXBDLGtCQUFrQixDQUFDLHFCQUFxQixFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsQ0FBQztJQUNqRixHQUFLLENBQUcsUUFBUSxHQUFLLElBQUksQ0FBakIsUUFBUSxFQUNaLFdBQVc7UUFQbUIs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
|
|
@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
5
|
exports.default = removeProjectEntries;
|
|
6
|
+
exports.removeEntry = removeEntry;
|
|
7
|
+
var _fsExtra = require("fs-extra");
|
|
6
8
|
var _necessary = require("necessary");
|
|
7
|
-
var _fileSystem = require("./utilities/fileSystem");
|
|
8
9
|
var _pathMaps = require("./utilities/pathMaps");
|
|
9
10
|
var concatenatePaths = _necessary.pathUtilities.concatenatePaths, checkEntryExists = _necessary.fileSystemUtilities.checkEntryExists, isEntryDirectory = _necessary.fileSystemUtilities.isEntryDirectory, isDirectoryEmpty = _necessary.fileSystemUtilities.isDirectoryEmpty;
|
|
10
11
|
function removeProjectEntries(projectsDirectoryPath, json, callback) {
|
|
@@ -22,21 +23,21 @@ function removeProjectEntries(projectsDirectoryPath, json, callback) {
|
|
|
22
23
|
function removeEntry(sourcePath, targetPath, projectsDirectoryPath, callback) {
|
|
23
24
|
if (sourcePath === targetPath) {
|
|
24
25
|
callback(targetPath);
|
|
25
|
-
|
|
26
|
-
var absoluteSourcePath = concatenatePaths(projectsDirectoryPath, sourcePath), entryExists = checkEntryExists(absoluteSourcePath);
|
|
27
|
-
if (!entryExists) {
|
|
28
|
-
targetPath = null;
|
|
29
|
-
callback(targetPath);
|
|
30
|
-
} else {
|
|
31
|
-
var entryDirectory = isEntryDirectory(absoluteSourcePath);
|
|
32
|
-
entryDirectory ? removeDirectory(sourcePath, projectsDirectoryPath, callback) : removeFile(sourcePath, projectsDirectoryPath, callback);
|
|
33
|
-
}
|
|
26
|
+
return;
|
|
34
27
|
}
|
|
28
|
+
var absoluteSourcePath = concatenatePaths(projectsDirectoryPath, sourcePath), entryExists = checkEntryExists(absoluteSourcePath);
|
|
29
|
+
if (!entryExists) {
|
|
30
|
+
targetPath = null;
|
|
31
|
+
callback(targetPath);
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
var entryDirectory = isEntryDirectory(absoluteSourcePath);
|
|
35
|
+
entryDirectory ? removeDirectory(sourcePath, projectsDirectoryPath, callback) : removeFile(sourcePath, projectsDirectoryPath, callback);
|
|
35
36
|
}
|
|
36
37
|
function removeFile(sourcePath, projectsDirectoryPath, callback) {
|
|
37
38
|
var absoluteSourcePath = concatenatePaths(projectsDirectoryPath, sourcePath);
|
|
38
|
-
(0,
|
|
39
|
-
var success = !error, targetPath = success ? null : sourcePath;
|
|
39
|
+
(0, _fsExtra).remove(absoluteSourcePath, function(error) {
|
|
40
|
+
var success = !error, targetPath = success ? null : sourcePath; ///
|
|
40
41
|
callback(targetPath);
|
|
41
42
|
});
|
|
42
43
|
}
|
|
@@ -45,12 +46,12 @@ function removeDirectory(sourcePath, projectsDirectoryPath, callback) {
|
|
|
45
46
|
if (!directoryEmpty) {
|
|
46
47
|
var targetPath = sourcePath; ///
|
|
47
48
|
callback(targetPath);
|
|
48
|
-
|
|
49
|
-
(0, _fileSystem).remove(absoluteSourcePath, function(error) {
|
|
50
|
-
var success = !error, targetPath = success ? null : sourcePath;
|
|
51
|
-
callback(targetPath);
|
|
52
|
-
});
|
|
49
|
+
return;
|
|
53
50
|
}
|
|
51
|
+
(0, _fsExtra).remove(absoluteSourcePath, function(error) {
|
|
52
|
+
var success = !error, targetPath = success ? null : sourcePath; ///
|
|
53
|
+
callback(targetPath);
|
|
54
|
+
});
|
|
54
55
|
}
|
|
55
56
|
|
|
56
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
57
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9yZW1vdmVQcm9qZWN0RW50cmllcy5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgcmVtb3ZlIH0gZnJvbSBcImZzLWV4dHJhXCI7XG5pbXBvcnQgeyBwYXRoVXRpbGl0aWVzLCBmaWxlU3lzdGVtVXRpbGl0aWVzIH0gZnJvbSBcIm5lY2Vzc2FyeVwiO1xuXG5pbXBvcnQgeyBhc3luY2hyb25vdXNGb3JFYWNoIH0gZnJvbSBcIi4vdXRpbGl0aWVzL3BhdGhNYXBzXCI7XG5cbmNvbnN0IHsgY29uY2F0ZW5hdGVQYXRocyB9ID0gcGF0aFV0aWxpdGllcyxcbiAgICAgIHsgY2hlY2tFbnRyeUV4aXN0cywgaXNFbnRyeURpcmVjdG9yeSwgaXNEaXJlY3RvcnlFbXB0eSB9ID0gZmlsZVN5c3RlbVV0aWxpdGllcztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gcmVtb3ZlUHJvamVjdEVudHJpZXMocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBqc29uLCBjYWxsYmFjaykge1xuICBjb25zdCB7IHBhdGhNYXBzIH0gPSBqc29uLFxuXHRcdCAgICB0YXJnZXRQYXRocyA9IFtdO1xuXG4gIGFzeW5jaHJvbm91c0ZvckVhY2goXG4gICAgcGF0aE1hcHMsXG4gICAgKHNvdXJjZVBhdGgsIHRhcmdldFBhdGgsIGRpcmVjdG9yeSwgbmV4dCwgZG9uZSwgaW5kZXgpID0+IHtcbiAgICAgIHJlbW92ZUVudHJ5KHNvdXJjZVBhdGgsIHRhcmdldFBhdGgsIHByb2plY3RzRGlyZWN0b3J5UGF0aCwgKHRhcmdldFBhdGgpID0+IHtcbiAgICAgICAgdGFyZ2V0UGF0aHMucHVzaCh0YXJnZXRQYXRoKTtcblxuICAgICAgICBuZXh0KCk7XG4gICAgICB9KTtcbiAgICB9LFxuICAgICgpID0+IHtcbiAgICBcdGNvbnN0IGpzb24gPSB0YXJnZXRQYXRoczsgLy8vXG5cbiAgICAgIGNhbGxiYWNrKGpzb24pO1xuICAgIH1cbiAgKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHJlbW92ZUVudHJ5KHNvdXJjZVBhdGgsIHRhcmdldFBhdGgsIHByb2plY3RzRGlyZWN0b3J5UGF0aCwgY2FsbGJhY2spIHtcbiAgaWYgKHNvdXJjZVBhdGggPT09IHRhcmdldFBhdGgpIHtcbiAgICBjYWxsYmFjayh0YXJnZXRQYXRoKTtcblxuICAgIHJldHVybjtcbiAgfVxuXG4gIGNvbnN0IGFic29sdXRlU291cmNlUGF0aCA9IGNvbmNhdGVuYXRlUGF0aHMocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBzb3VyY2VQYXRoKSxcbiAgICAgICAgZW50cnlFeGlzdHMgPSBjaGVja0VudHJ5RXhpc3RzKGFic29sdXRlU291cmNlUGF0aCk7XG5cbiAgaWYgKCFlbnRyeUV4aXN0cykge1xuICAgIHRhcmdldFBhdGggPSBudWxsO1xuXG4gICAgY2FsbGJhY2sodGFyZ2V0UGF0aCk7XG5cbiAgICByZXR1cm47XG4gIH1cblxuICBjb25zdCBlbnRyeURpcmVjdG9yeSA9IGlzRW50cnlEaXJlY3RvcnkoYWJzb2x1dGVTb3VyY2VQYXRoKTtcblxuICBlbnRyeURpcmVjdG9yeSA/XG4gICAgcmVtb3ZlRGlyZWN0b3J5KHNvdXJjZVBhdGgsIHByb2plY3RzRGlyZWN0b3J5UGF0aCwgY2FsbGJhY2spIDpcbiAgICAgIHJlbW92ZUZpbGUoc291cmNlUGF0aCwgcHJvamVjdHNEaXJlY3RvcnlQYXRoLCBjYWxsYmFjayk7XG59XG5cbmZ1bmN0aW9uIHJlbW92ZUZpbGUoc291cmNlUGF0aCwgcHJvamVjdHNEaXJlY3RvcnlQYXRoLCBjYWxsYmFjaykge1xuICBjb25zdCBhYnNvbHV0ZVNvdXJjZVBhdGggPSBjb25jYXRlbmF0ZVBhdGhzKHByb2plY3RzRGlyZWN0b3J5UGF0aCwgc291cmNlUGF0aCk7XG5cbiAgcmVtb3ZlKGFic29sdXRlU291cmNlUGF0aCwgKGVycm9yKSA9PiB7XG4gICAgY29uc3Qgc3VjY2VzcyA9ICFlcnJvcixcbiAgICAgICAgICB0YXJnZXRQYXRoID0gc3VjY2VzcyA/XG4gICAgICAgICAgICAgICAgICAgICAgICAgbnVsbCA6XG4gICAgICAgICAgICAgICAgICAgICAgICAgICBzb3VyY2VQYXRoOyAgLy8vXG5cbiAgICBjYWxsYmFjayh0YXJnZXRQYXRoKTtcbiAgfSk7XG59XG5cbmZ1bmN0aW9uIHJlbW92ZURpcmVjdG9yeShzb3VyY2VQYXRoLCBwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIGNhbGxiYWNrKSB7XG4gIGNvbnN0IGFic29sdXRlU291cmNlUGF0aCA9IGNvbmNhdGVuYXRlUGF0aHMocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBzb3VyY2VQYXRoKSxcbiAgICAgICAgZGlyZWN0b3J5RW1wdHkgPSBpc0RpcmVjdG9yeUVtcHR5KGFic29sdXRlU291cmNlUGF0aCk7XG5cbiAgaWYgKCFkaXJlY3RvcnlFbXB0eSkge1xuICAgIGNvbnN0IHRhcmdldFBhdGggPSBzb3VyY2VQYXRoOyAgLy8vXG5cbiAgICBjYWxsYmFjayh0YXJnZXRQYXRoKTtcblxuICAgIHJldHVybjtcbiAgfVxuXG4gIHJlbW92ZShhYnNvbHV0ZVNvdXJjZVBhdGgsIChlcnJvcikgPT4ge1xuICAgIGNvbnN0IHN1Y2Nlc3MgPSAhZXJyb3IsXG4gICAgICAgICAgdGFyZ2V0UGF0aCA9IHN1Y2Nlc3MgP1xuICAgICAgICAgICAgICAgICAgICAgICAgICBudWxsIDpcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICBzb3VyY2VQYXRoOyAvLy9cblxuICAgIGNhbGxiYWNrKHRhcmdldFBhdGgpO1xuICB9KTtcbn1cbiJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQ0FBQSxVQUFZOzs7O2tCQVVZLG9CQUFvQjtRQXFCNUIsV0FBVyxHQUFYLFdBQVc7QUE3QkosR0FBVSxDQUFWLFFBQVU7QUFDa0IsR0FBVyxDQUFYLFVBQVc7QUFFMUIsR0FBc0IsQ0FBdEIsU0FBc0I7QUFFMUQsR0FBSyxDQUFHLGdCQUFnQixHQUoyQixVQUFXLGVBSXRELGdCQUFnQixFQUNoQixnQkFBZ0IsR0FMMkIsVUFBVyxx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
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "occam-file-system",
|
|
3
3
|
"author": "James Smith",
|
|
4
|
-
"version": "
|
|
4
|
+
"version": "4.0.3",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-file-system",
|
|
7
7
|
"description": "Occam's file system functionality.",
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"fs-extra": "^9.0.0",
|
|
14
14
|
"necessary": "^7.3.1",
|
|
15
|
-
"occam-open-cli": "^4.0.
|
|
15
|
+
"occam-open-cli": "^4.0.18"
|
|
16
16
|
},
|
|
17
17
|
"devDependencies": {
|
|
18
18
|
"@swc/core": "^1.2.51",
|
package/src/constants.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
import { move } from "fs-extra";
|
|
3
4
|
import { pathUtilities, fileSystemUtilities } from "necessary";
|
|
4
5
|
|
|
5
|
-
import {
|
|
6
|
+
import { removeEntry } from "./removeProjectEntries";
|
|
6
7
|
import { asynchronousForEach } from "./utilities/pathMaps";
|
|
7
|
-
import { DEST_ALREADY_EXISTS_MESSAGE } from "./constants";
|
|
8
8
|
|
|
9
9
|
const { concatenatePaths } = pathUtilities,
|
|
10
10
|
{ checkEntryExists, isEntryDirectory, isDirectoryEmpty } = fileSystemUtilities;
|
|
@@ -30,29 +30,46 @@ export default function moveProjectEntries(projectsDirectoryPath, json, callback
|
|
|
30
30
|
);
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
-
function moveEntry(sourcePath, targetPath, projectsDirectoryPath, callback) {
|
|
33
|
+
export function moveEntry(sourcePath, targetPath, projectsDirectoryPath, callback) {
|
|
34
34
|
if (targetPath === null) {
|
|
35
|
+
removeEntry(sourcePath, targetPath, projectsDirectoryPath, callback);
|
|
36
|
+
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
if (sourcePath === targetPath) {
|
|
35
41
|
callback(targetPath);
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
callback(targetPath);
|
|
39
|
-
} else {
|
|
40
|
-
const absoluteSourcePath = concatenatePaths(projectsDirectoryPath, sourcePath),
|
|
41
|
-
entryExists = checkEntryExists(absoluteSourcePath);
|
|
42
|
-
|
|
43
|
-
if (!entryExists) {
|
|
44
|
-
targetPath = null;
|
|
45
|
-
|
|
46
|
-
callback(targetPath);
|
|
47
|
-
} else {
|
|
48
|
-
const entryDirectory = isEntryDirectory(absoluteSourcePath);
|
|
49
|
-
|
|
50
|
-
entryDirectory ?
|
|
51
|
-
moveDirectory(sourcePath, targetPath, projectsDirectoryPath, callback) :
|
|
52
|
-
moveFile(sourcePath, targetPath, projectsDirectoryPath, callback);
|
|
53
|
-
}
|
|
54
|
-
}
|
|
42
|
+
|
|
43
|
+
return;
|
|
55
44
|
}
|
|
45
|
+
|
|
46
|
+
const absoluteSourcePath = concatenatePaths(projectsDirectoryPath, sourcePath),
|
|
47
|
+
sourceEntryExists = checkEntryExists(absoluteSourcePath);
|
|
48
|
+
|
|
49
|
+
if (!sourceEntryExists) {
|
|
50
|
+
targetPath = null;
|
|
51
|
+
|
|
52
|
+
callback(targetPath);
|
|
53
|
+
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
const absoluteTargetPath = concatenatePaths(projectsDirectoryPath, targetPath),
|
|
58
|
+
targetEntryExists = checkEntryExists(absoluteTargetPath);
|
|
59
|
+
|
|
60
|
+
if (targetEntryExists) {
|
|
61
|
+
targetPath = sourcePath; ///
|
|
62
|
+
|
|
63
|
+
callback(targetPath);
|
|
64
|
+
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
const entryDirectory = isEntryDirectory(absoluteSourcePath);
|
|
69
|
+
|
|
70
|
+
entryDirectory ?
|
|
71
|
+
moveDirectory(sourcePath, targetPath, projectsDirectoryPath, callback) :
|
|
72
|
+
moveFile(sourcePath, targetPath, projectsDirectoryPath, callback);
|
|
56
73
|
}
|
|
57
74
|
|
|
58
75
|
function moveFile(sourcePath, targetPath, projectsDirectoryPath, callback) {
|
|
@@ -60,11 +77,11 @@ function moveFile(sourcePath, targetPath, projectsDirectoryPath, callback) {
|
|
|
60
77
|
absoluteTargetPath = concatenatePaths(projectsDirectoryPath, targetPath);
|
|
61
78
|
|
|
62
79
|
move(absoluteSourcePath, absoluteTargetPath, (error) => {
|
|
63
|
-
const success = !error;
|
|
80
|
+
const success = !error;
|
|
64
81
|
|
|
65
82
|
targetPath = success ?
|
|
66
83
|
targetPath :
|
|
67
|
-
sourcePath;
|
|
84
|
+
sourcePath; ///
|
|
68
85
|
|
|
69
86
|
callback(targetPath);
|
|
70
87
|
});
|
|
@@ -76,34 +93,20 @@ function moveDirectory(sourcePath, targetPath, projectsDirectoryPath, callback)
|
|
|
76
93
|
directoryEmpty = isDirectoryEmpty(absoluteSourcePath);
|
|
77
94
|
|
|
78
95
|
if (!directoryEmpty) {
|
|
79
|
-
const targetPath = sourcePath;
|
|
96
|
+
const targetPath = sourcePath; ///
|
|
80
97
|
|
|
81
98
|
callback(targetPath);
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
const success = !error; ///
|
|
85
|
-
|
|
86
|
-
if (success) {
|
|
87
|
-
callback(targetPath);
|
|
88
|
-
} else {
|
|
89
|
-
const { message } = error;
|
|
90
|
-
|
|
91
|
-
if (message !== DEST_ALREADY_EXISTS_MESSAGE) {
|
|
92
|
-
const targetPath = sourcePath;
|
|
93
|
-
|
|
94
|
-
callback(targetPath);
|
|
95
|
-
} else {
|
|
96
|
-
remove(absoluteSourcePath, (error) => {
|
|
97
|
-
const success = !error; ///
|
|
98
|
-
|
|
99
|
-
if (!success) {
|
|
100
|
-
targetPath = sourcePath;
|
|
101
|
-
}
|
|
102
|
-
|
|
103
|
-
callback(targetPath);
|
|
104
|
-
});
|
|
105
|
-
}
|
|
106
|
-
}
|
|
107
|
-
});
|
|
99
|
+
|
|
100
|
+
return;
|
|
108
101
|
}
|
|
102
|
+
|
|
103
|
+
move(absoluteSourcePath, absoluteTargetPath, (error) => {
|
|
104
|
+
const success = !error;
|
|
105
|
+
|
|
106
|
+
targetPath = success ?
|
|
107
|
+
targetPath :
|
|
108
|
+
sourcePath; ///
|
|
109
|
+
|
|
110
|
+
callback(targetPath);
|
|
111
|
+
});
|
|
109
112
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
import { remove } from "fs-extra";
|
|
3
4
|
import { pathUtilities, fileSystemUtilities } from "necessary";
|
|
4
5
|
|
|
5
|
-
import { remove } from "./utilities/fileSystem";
|
|
6
6
|
import { asynchronousForEach } from "./utilities/pathMaps";
|
|
7
7
|
|
|
8
8
|
const { concatenatePaths } = pathUtilities,
|
|
@@ -29,35 +29,39 @@ export default function removeProjectEntries(projectsDirectoryPath, json, callba
|
|
|
29
29
|
);
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
-
function removeEntry(sourcePath, targetPath, projectsDirectoryPath, callback) {
|
|
32
|
+
export function removeEntry(sourcePath, targetPath, projectsDirectoryPath, callback) {
|
|
33
33
|
if (sourcePath === targetPath) {
|
|
34
34
|
callback(targetPath);
|
|
35
|
-
} else {
|
|
36
|
-
const absoluteSourcePath = concatenatePaths(projectsDirectoryPath, sourcePath),
|
|
37
|
-
entryExists = checkEntryExists(absoluteSourcePath);
|
|
38
35
|
|
|
39
|
-
|
|
40
|
-
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
const absoluteSourcePath = concatenatePaths(projectsDirectoryPath, sourcePath),
|
|
40
|
+
entryExists = checkEntryExists(absoluteSourcePath);
|
|
41
41
|
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
const entryDirectory = isEntryDirectory(absoluteSourcePath);
|
|
42
|
+
if (!entryExists) {
|
|
43
|
+
targetPath = null;
|
|
45
44
|
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
}
|
|
45
|
+
callback(targetPath);
|
|
46
|
+
|
|
47
|
+
return;
|
|
50
48
|
}
|
|
49
|
+
|
|
50
|
+
const entryDirectory = isEntryDirectory(absoluteSourcePath);
|
|
51
|
+
|
|
52
|
+
entryDirectory ?
|
|
53
|
+
removeDirectory(sourcePath, projectsDirectoryPath, callback) :
|
|
54
|
+
removeFile(sourcePath, projectsDirectoryPath, callback);
|
|
51
55
|
}
|
|
52
56
|
|
|
53
57
|
function removeFile(sourcePath, projectsDirectoryPath, callback) {
|
|
54
58
|
const absoluteSourcePath = concatenatePaths(projectsDirectoryPath, sourcePath);
|
|
55
59
|
|
|
56
60
|
remove(absoluteSourcePath, (error) => {
|
|
57
|
-
const success = !error,
|
|
61
|
+
const success = !error,
|
|
58
62
|
targetPath = success ?
|
|
59
63
|
null :
|
|
60
|
-
sourcePath;
|
|
64
|
+
sourcePath; ///
|
|
61
65
|
|
|
62
66
|
callback(targetPath);
|
|
63
67
|
});
|
|
@@ -71,14 +75,16 @@ function removeDirectory(sourcePath, projectsDirectoryPath, callback) {
|
|
|
71
75
|
const targetPath = sourcePath; ///
|
|
72
76
|
|
|
73
77
|
callback(targetPath);
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
const success = !error, ///
|
|
77
|
-
targetPath = success ?
|
|
78
|
-
null :
|
|
79
|
-
sourcePath;
|
|
80
|
-
|
|
81
|
-
callback(targetPath);
|
|
82
|
-
});
|
|
78
|
+
|
|
79
|
+
return;
|
|
83
80
|
}
|
|
81
|
+
|
|
82
|
+
remove(absoluteSourcePath, (error) => {
|
|
83
|
+
const success = !error,
|
|
84
|
+
targetPath = success ?
|
|
85
|
+
null :
|
|
86
|
+
sourcePath; ///
|
|
87
|
+
|
|
88
|
+
callback(targetPath);
|
|
89
|
+
});
|
|
84
90
|
}
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", {
|
|
3
|
-
value: true
|
|
4
|
-
});
|
|
5
|
-
exports.move = move;
|
|
6
|
-
exports.remove = remove;
|
|
7
|
-
var _fsExtra = require("fs-extra");
|
|
8
|
-
function move(absoluteSourcePath, absoluteTargetPath, callback) {
|
|
9
|
-
(0, _fsExtra).move(absoluteSourcePath, absoluteTargetPath, callback);
|
|
10
|
-
}
|
|
11
|
-
function remove(absoluteSourcePath, callback) {
|
|
12
|
-
(0, _fsExtra).remove(absoluteSourcePath, callback);
|
|
13
|
-
}
|
|
14
|
-
|
|
15
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvZmlsZVN5c3RlbS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgbW92ZSBhcyBtb3ZlRXh0cmEsIHJlbW92ZSBhcyByZW1vdmVFeHRyYSB9IGZyb20gXCJmcy1leHRyYVwiO1xuXG5leHBvcnQgZnVuY3Rpb24gbW92ZShhYnNvbHV0ZVNvdXJjZVBhdGgsIGFic29sdXRlVGFyZ2V0UGF0aCwgY2FsbGJhY2spIHtcbiAgbW92ZUV4dHJhKGFic29sdXRlU291cmNlUGF0aCwgYWJzb2x1dGVUYXJnZXRQYXRoLCBjYWxsYmFjayk7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiByZW1vdmUoYWJzb2x1dGVTb3VyY2VQYXRoLCBjYWxsYmFjaykge1xuICByZW1vdmVFeHRyYShhYnNvbHV0ZVNvdXJjZVBhdGgsIGNhbGxiYWNrKTtcbn1cbiJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQ0FBQSxVQUFZOzs7O1FBSUksSUFBSSxHQUFKLElBQUk7UUFJSixNQUFNLEdBQU4sTUFBTTtBQU5tQyxHQUFVLENBQVYsUUFBVTtTQUVuRCxJQUFJLENBQUMsa0JBQWtCLEVBQUUsa0JBQWtCLEVBQUUsUUFBUSxFQUFFLENBQUM7UUFGZixRQUFVLE9BR3ZELGtCQUFrQixFQUFFLGtCQUFrQixFQUFFLFFBQVE7QUFDNUQsQ0FBQztTQUVlLE1BQU0sQ0FBQyxrQkFBa0IsRUFBRSxRQUFRLEVBQUUsQ0FBQztRQU5HLFFBQVUsU0FPckQsa0JBQWtCLEVBQUUsUUFBUTtBQUMxQyxDQUFDIn0=
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
import { move as moveExtra, remove as removeExtra } from "fs-extra";
|
|
4
|
-
|
|
5
|
-
export function move(absoluteSourcePath, absoluteTargetPath, callback) {
|
|
6
|
-
moveExtra(absoluteSourcePath, absoluteTargetPath, callback);
|
|
7
|
-
}
|
|
8
|
-
|
|
9
|
-
export function remove(absoluteSourcePath, callback) {
|
|
10
|
-
removeExtra(absoluteSourcePath, callback);
|
|
11
|
-
}
|