occam-file-system 6.0.52 → 6.0.55
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/createProjectEntries.js +12 -9
- package/lib/moveProjectEntries.js +13 -9
- package/lib/renameProjectEntries.js +12 -9
- package/package.json +2 -2
- package/src/createProjectEntries.js +17 -13
- package/src/moveProjectEntries.js +17 -11
- package/src/renameProjectEntries.js +17 -12
|
@@ -18,7 +18,7 @@ _export(exports, {
|
|
|
18
18
|
});
|
|
19
19
|
var _pathMap = require("./utilities/pathMap");
|
|
20
20
|
var _necessary = require("necessary");
|
|
21
|
-
var concatenatePaths = _necessary.pathUtilities.concatenatePaths, createFile = _necessary.fileSystemUtilities.createFile, createDirectory = _necessary.fileSystemUtilities.createDirectory, checkEntryExists = _necessary.fileSystemUtilities.checkEntryExists;
|
|
21
|
+
var concatenatePaths = _necessary.pathUtilities.concatenatePaths, createFile = _necessary.fileSystemUtilities.createFile, createDirectory = _necessary.fileSystemUtilities.createDirectory, checkFileExists = _necessary.fileSystemUtilities.checkEntryExists, checkDirectoryExists = _necessary.fileSystemUtilities.checkEntryExists;
|
|
22
22
|
function createProjectEntries(projectsDirectoryPath, json, callback) {
|
|
23
23
|
var pathMaps = json.pathMaps;
|
|
24
24
|
pathMaps.forEach(function(pathMap) {
|
|
@@ -30,16 +30,15 @@ function createProjectEntries(projectsDirectoryPath, json, callback) {
|
|
|
30
30
|
callback(json);
|
|
31
31
|
}
|
|
32
32
|
function createProjectEntry(projectsDirectoryPath, pathMap) {
|
|
33
|
-
var targetEntryPath = pathMap.targetEntryPath, absoluteTargetEntryPath = concatenatePaths(projectsDirectoryPath, targetEntryPath), targetEntryExists = checkEntryExists(absoluteTargetEntryPath);
|
|
34
|
-
if (targetEntryExists) {
|
|
35
|
-
(0, _pathMap.nullifyTargetEntryPath)(pathMap);
|
|
36
|
-
return;
|
|
37
|
-
}
|
|
38
33
|
var entryDirectory = pathMap.entryDirectory;
|
|
39
34
|
entryDirectory ? createProjectDirectory(projectsDirectoryPath, pathMap) : createProjectFile(projectsDirectoryPath, pathMap);
|
|
40
35
|
}
|
|
41
36
|
function createProjectFile(projectsDirectoryPath, pathMap) {
|
|
42
|
-
var targetEntryPath = pathMap.targetEntryPath, targetFilePath = targetEntryPath, absoluteTargetFilePath = concatenatePaths(projectsDirectoryPath, targetFilePath);
|
|
37
|
+
var targetEntryPath = pathMap.targetEntryPath, targetFilePath = targetEntryPath, absoluteTargetFilePath = concatenatePaths(projectsDirectoryPath, targetFilePath), targetFileExists = checkFileExists(absoluteTargetFilePath);
|
|
38
|
+
if (targetFileExists) {
|
|
39
|
+
(0, _pathMap.nullifyTargetEntryPath)(pathMap);
|
|
40
|
+
return;
|
|
41
|
+
}
|
|
43
42
|
try {
|
|
44
43
|
var filePath = absoluteTargetFilePath; ///
|
|
45
44
|
createFile(filePath);
|
|
@@ -48,7 +47,11 @@ function createProjectFile(projectsDirectoryPath, pathMap) {
|
|
|
48
47
|
}
|
|
49
48
|
}
|
|
50
49
|
function createProjectDirectory(projectsDirectoryPath, pathMap) {
|
|
51
|
-
var targetEntryPath = pathMap.targetEntryPath, targetDirectoryPath = targetEntryPath, absoluteTargetDirectoryPath = concatenatePaths(projectsDirectoryPath, targetDirectoryPath);
|
|
50
|
+
var targetEntryPath = pathMap.targetEntryPath, targetDirectoryPath = targetEntryPath, absoluteTargetDirectoryPath = concatenatePaths(projectsDirectoryPath, targetDirectoryPath), targetDirectoryExists = checkDirectoryExists(absoluteTargetDirectoryPath);
|
|
51
|
+
if (targetDirectoryExists) {
|
|
52
|
+
(0, _pathMap.nullifyTargetEntryPath)(pathMap);
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
52
55
|
try {
|
|
53
56
|
var directoryPath = absoluteTargetDirectoryPath; ///
|
|
54
57
|
createDirectory(directoryPath);
|
|
@@ -57,4 +60,4 @@ function createProjectDirectory(projectsDirectoryPath, pathMap) {
|
|
|
57
60
|
}
|
|
58
61
|
}
|
|
59
62
|
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
63
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jcmVhdGVQcm9qZWN0RW50cmllcy5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgbnVsbGlmeVRhcmdldEVudHJ5UGF0aCB9IGZyb20gXCIuL3V0aWxpdGllcy9wYXRoTWFwXCI7XG5pbXBvcnQgeyBwYXRoVXRpbGl0aWVzLCBmaWxlU3lzdGVtVXRpbGl0aWVzIH0gZnJvbSBcIm5lY2Vzc2FyeVwiO1xuXG5jb25zdCB7IGNvbmNhdGVuYXRlUGF0aHMgfSA9IHBhdGhVdGlsaXRpZXMsXG4gICAgICB7IGNyZWF0ZUZpbGUsIGNyZWF0ZURpcmVjdG9yeSwgY2hlY2tFbnRyeUV4aXN0czogY2hlY2tGaWxlRXhpc3RzLCBjaGVja0VudHJ5RXhpc3RzOiBjaGVja0RpcmVjdG9yeUV4aXN0cyB9ID0gZmlsZVN5c3RlbVV0aWxpdGllcztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gY3JlYXRlUHJvamVjdEVudHJpZXMocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBqc29uLCBjYWxsYmFjaykge1xuICBjb25zdCB7IHBhdGhNYXBzIH0gPSBqc29uO1xuXG4gIHBhdGhNYXBzLmZvckVhY2goKHBhdGhNYXApID0+IHtcbiAgICBjcmVhdGVQcm9qZWN0RW50cnkocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBwYXRoTWFwKTtcbiAgfSk7XG5cbiAganNvbiA9IHtcbiAgICBwYXRoTWFwc1xuICB9O1xuXG4gIGNhbGxiYWNrKGpzb24pO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gY3JlYXRlUHJvamVjdEVudHJ5KHByb2plY3RzRGlyZWN0b3J5UGF0aCwgcGF0aE1hcCkge1xuICBjb25zdCB7IGVudHJ5RGlyZWN0b3J5IH0gPSBwYXRoTWFwO1xuXG4gIGVudHJ5RGlyZWN0b3J5ID9cbiAgICBjcmVhdGVQcm9qZWN0RGlyZWN0b3J5KHByb2plY3RzRGlyZWN0b3J5UGF0aCwgcGF0aE1hcCkgOlxuICAgICAgY3JlYXRlUHJvamVjdEZpbGUocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBwYXRoTWFwKTtcbn1cblxuZnVuY3Rpb24gY3JlYXRlUHJvamVjdEZpbGUocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBwYXRoTWFwKSB7XG4gIGNvbnN0IHsgdGFyZ2V0RW50cnlQYXRoIH0gPSBwYXRoTWFwLFxuICAgICAgICB0YXJnZXRGaWxlUGF0aCA9IHRhcmdldEVudHJ5UGF0aCwgLy8vXG4gICAgICAgIGFic29sdXRlVGFyZ2V0RmlsZVBhdGggPSBjb25jYXRlbmF0ZVBhdGhzKHByb2plY3RzRGlyZWN0b3J5UGF0aCwgdGFyZ2V0RmlsZVBhdGgpLFxuICAgICAgICB0YXJnZXRGaWxlRXhpc3RzID0gY2hlY2tGaWxlRXhpc3RzKGFic29sdXRlVGFyZ2V0RmlsZVBhdGgpO1xuXG4gIGlmICh0YXJnZXRGaWxlRXhpc3RzKSB7XG4gICAgbnVsbGlmeVRhcmdldEVudHJ5UGF0aChwYXRoTWFwKTtcblxuICAgIHJldHVybjtcbiAgfVxuXG4gIHRyeSB7XG4gICAgY29uc3QgZmlsZVBhdGggPSBhYnNvbHV0ZVRhcmdldEZpbGVQYXRoOyAgLy8vXG5cbiAgICBjcmVhdGVGaWxlKGZpbGVQYXRoKTtcbiAgfSBjYXRjaCAoZXJyb3IpIHtcbiAgICBudWxsaWZ5VGFyZ2V0RW50cnlQYXRoKHBhdGhNYXApO1xuICB9XG59XG5cbmZ1bmN0aW9uIGNyZWF0ZVByb2plY3REaXJlY3RvcnkocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBwYXRoTWFwKSB7XG4gIGNvbnN0IHsgdGFyZ2V0RW50cnlQYXRoIH0gPSBwYXRoTWFwLFxuICAgICAgICB0YXJnZXREaXJlY3RvcnlQYXRoID0gdGFyZ2V0RW50cnlQYXRoLCAvLy9cbiAgICAgICAgYWJzb2x1dGVUYXJnZXREaXJlY3RvcnlQYXRoID0gY29uY2F0ZW5hdGVQYXRocyhwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIHRhcmdldERpcmVjdG9yeVBhdGgpLFxuICAgICAgICB0YXJnZXREaXJlY3RvcnlFeGlzdHMgPSBjaGVja0RpcmVjdG9yeUV4aXN0cyhhYnNvbHV0ZVRhcmdldERpcmVjdG9yeVBhdGgpO1xuXG4gIGlmICh0YXJnZXREaXJlY3RvcnlFeGlzdHMpIHtcbiAgICBudWxsaWZ5VGFyZ2V0RW50cnlQYXRoKHBhdGhNYXApO1xuXG4gICAgcmV0dXJuO1xuICB9XG5cbiAgdHJ5IHtcbiAgICBjb25zdCBkaXJlY3RvcnlQYXRoID0gYWJzb2x1dGVUYXJnZXREaXJlY3RvcnlQYXRoOyAgLy8vXG5cbiAgICBjcmVhdGVEaXJlY3RvcnkoZGlyZWN0b3J5UGF0aCk7XG4gIH0gY2F0Y2ggKGVycm9yKSB7XG4gICAgbnVsbGlmeVRhcmdldEVudHJ5UGF0aChwYXRoTWFwKTtcbiAgfVxufVxuIl0sIm5hbWVzIjpbImNyZWF0ZVByb2plY3RFbnRyeSIsImNyZWF0ZVByb2plY3RFbnRyaWVzIiwiY29uY2F0ZW5hdGVQYXRocyIsInBhdGhVdGlsaXRpZXMiLCJjcmVhdGVGaWxlIiwiZmlsZVN5c3RlbVV0aWxpdGllcyIsImNyZWF0ZURpcmVjdG9yeSIsImNoZWNrRW50cnlFeGlzdHMiLCJjaGVja0ZpbGVFeGlzdHMiLCJjaGVja0RpcmVjdG9yeUV4aXN0cyIsInByb2plY3RzRGlyZWN0b3J5UGF0aCIsImpzb24iLCJjYWxsYmFjayIsInBhdGhNYXBzIiwiZm9yRWFjaCIsInBhdGhNYXAiLCJlbnRyeURpcmVjdG9yeSIsImNyZWF0ZVByb2plY3REaXJlY3RvcnkiLCJjcmVhdGVQcm9qZWN0RmlsZSIsInRhcmdldEVudHJ5UGF0aCIsInRhcmdldEZpbGVQYXRoIiwiYWJzb2x1dGVUYXJnZXRGaWxlUGF0aCIsInRhcmdldEZpbGVFeGlzdHMiLCJudWxsaWZ5VGFyZ2V0RW50cnlQYXRoIiwiZmlsZVBhdGgiLCJlcnJvciIsInRhcmdldERpcmVjdG9yeVBhdGgiLCJhYnNvbHV0ZVRhcmdldERpcmVjdG9yeVBhdGgiLCJ0YXJnZXREaXJlY3RvcnlFeGlzdHMiLCJkaXJlY3RvcnlQYXRoIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7SUFzQmdCQSxrQkFBa0I7ZUFBbEJBOztJQWRoQixPQVlDO2VBWnVCQzs7O3VCQU5lO3lCQUNZO0FBRW5ELElBQU0sQUFBRUMsbUJBQXFCQyx3QkFBYSxDQUFsQ0Qsa0JBQ0FFLGFBQTJHQyw4QkFBbUIsQ0FBOUhELFlBQVlFLGtCQUErRkQsOEJBQW1CLENBQWxIQyxpQkFBaUJDLEFBQWtCQyxrQkFBNERILDhCQUFtQixDQUFqR0Usa0JBQW1DQSxBQUFrQkUsdUJBQXlCSiw4QkFBbUIsQ0FBOURFO0FBRXpELFNBQVNOLHFCQUFxQlMscUJBQXFCLEVBQUVDLElBQUksRUFBRUMsUUFBUTtJQUNoRixJQUFNLEFBQUVDLFdBQWFGLEtBQWJFO0lBRVJBLFNBQVNDLE9BQU8sQ0FBQyxTQUFDQztRQUNoQmYsbUJBQW1CVSx1QkFBdUJLO0lBQzVDO0lBRUFKLE9BQU87UUFDTEUsVUFBQUE7SUFDRjtJQUVBRCxTQUFTRDtBQUNYO0FBRU8sU0FBU1gsbUJBQW1CVSxxQkFBcUIsRUFBRUssT0FBTztJQUMvRCxJQUFNLEFBQUVDLGlCQUFtQkQsUUFBbkJDO0lBRVJBLGlCQUNFQyx1QkFBdUJQLHVCQUF1QkssV0FDNUNHLGtCQUFrQlIsdUJBQXVCSztBQUMvQztBQUVBLFNBQVNHLGtCQUFrQlIscUJBQXFCLEVBQUVLLE9BQU87SUFDdkQsSUFBTSxBQUFFSSxrQkFBb0JKLFFBQXBCSSxpQkFDRkMsaUJBQWlCRCxpQkFDakJFLHlCQUF5Qm5CLGlCQUFpQlEsdUJBQXVCVSxpQkFDakVFLG1CQUFtQmQsZ0JBQWdCYTtJQUV6QyxJQUFJQyxrQkFBa0I7UUFDcEJDLElBQUFBLCtCQUFzQixFQUFDUjtRQUV2QjtJQUNGO0lBRUEsSUFBSTtRQUNGLElBQU1TLFdBQVdILHdCQUF5QixHQUFHO1FBRTdDakIsV0FBV29CO0lBQ2IsRUFBRSxPQUFPQyxPQUFPO1FBQ2RGLElBQUFBLCtCQUFzQixFQUFDUjtJQUN6QjtBQUNGO0FBRUEsU0FBU0UsdUJBQXVCUCxxQkFBcUIsRUFBRUssT0FBTztJQUM1RCxJQUFNLEFBQUVJLGtCQUFvQkosUUFBcEJJLGlCQUNGTyxzQkFBc0JQLGlCQUN0QlEsOEJBQThCekIsaUJBQWlCUSx1QkFBdUJnQixzQkFDdEVFLHdCQUF3Qm5CLHFCQUFxQmtCO0lBRW5ELElBQUlDLHVCQUF1QjtRQUN6QkwsSUFBQUEsK0JBQXNCLEVBQUNSO1FBRXZCO0lBQ0Y7SUFFQSxJQUFJO1FBQ0YsSUFBTWMsZ0JBQWdCRiw2QkFBOEIsR0FBRztRQUV2RHJCLGdCQUFnQnVCO0lBQ2xCLEVBQUUsT0FBT0osT0FBTztRQUNkRixJQUFBQSwrQkFBc0IsRUFBQ1I7SUFDekI7QUFDRiJ9
|
|
@@ -17,8 +17,9 @@ _export(exports, {
|
|
|
17
17
|
}
|
|
18
18
|
});
|
|
19
19
|
var _necessary = require("necessary");
|
|
20
|
+
var _removeProjectEntries = require("./removeProjectEntries");
|
|
20
21
|
var _pathMap = require("./utilities/pathMap");
|
|
21
|
-
var concatenatePaths = _necessary.pathUtilities.concatenatePaths, moveEntry = _necessary.fileSystemUtilities.moveEntry, checkEntryExists = _necessary.fileSystemUtilities.checkEntryExists,
|
|
22
|
+
var concatenatePaths = _necessary.pathUtilities.concatenatePaths, moveEntry = _necessary.fileSystemUtilities.moveEntry, isDirectoryEmpty = _necessary.fileSystemUtilities.isDirectoryEmpty, checkEntryExists = _necessary.fileSystemUtilities.checkEntryExists, checkFileExists = _necessary.fileSystemUtilities.checkEntryExists, checkDirectoryExists = _necessary.fileSystemUtilities.checkEntryExists;
|
|
22
23
|
function moveProjectEntries(projectsDirectoryPath, json, callback) {
|
|
23
24
|
var pathMaps = json.pathMaps;
|
|
24
25
|
pathMaps.forEach(function(pathMap) {
|
|
@@ -34,11 +35,6 @@ function moveProjectEntry(projectsDirectoryPath, pathMap) {
|
|
|
34
35
|
if (targetEntryPath === null) {
|
|
35
36
|
return;
|
|
36
37
|
}
|
|
37
|
-
var absoluteTargetEntryPath = concatenatePaths(projectsDirectoryPath, targetEntryPath), targetEntryExists = checkEntryExists(absoluteTargetEntryPath);
|
|
38
|
-
if (targetEntryExists) {
|
|
39
|
-
(0, _pathMap.nullifyEntryPaths)(pathMap);
|
|
40
|
-
return;
|
|
41
|
-
}
|
|
42
38
|
var sourceEntryPath = pathMap.sourceEntryPath, absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath), sourceEntryExists = checkEntryExists(absoluteSourceEntryPath);
|
|
43
39
|
if (!sourceEntryExists) {
|
|
44
40
|
(0, _pathMap.nullifyTargetEntryPath)(pathMap);
|
|
@@ -48,7 +44,11 @@ function moveProjectEntry(projectsDirectoryPath, pathMap) {
|
|
|
48
44
|
entryDirectory ? moveProjectDirectory(projectsDirectoryPath, pathMap) : moveProjectFile(projectsDirectoryPath, pathMap);
|
|
49
45
|
}
|
|
50
46
|
function moveProjectFile(projectsDirectoryPath, pathMap) {
|
|
51
|
-
var sourceEntryPath = pathMap.sourceEntryPath, targetEntryPath = pathMap.targetEntryPath, sourceFilePath = sourceEntryPath, targetFilePath = targetEntryPath, absoluteSourceFilePath = concatenatePaths(projectsDirectoryPath, sourceFilePath), absoluteTargetFilePath = concatenatePaths(projectsDirectoryPath, targetFilePath);
|
|
47
|
+
var sourceEntryPath = pathMap.sourceEntryPath, targetEntryPath = pathMap.targetEntryPath, sourceFilePath = sourceEntryPath, targetFilePath = targetEntryPath, absoluteSourceFilePath = concatenatePaths(projectsDirectoryPath, sourceFilePath), absoluteTargetFilePath = concatenatePaths(projectsDirectoryPath, targetFilePath), targetFileExists = checkFileExists(absoluteTargetFilePath);
|
|
48
|
+
if (targetFileExists) {
|
|
49
|
+
(0, _pathMap.nullifyEntryPaths)(pathMap);
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
52
|
try {
|
|
53
53
|
var oldEntryPath = absoluteSourceFilePath, newEntryPath = absoluteTargetFilePath; ///
|
|
54
54
|
moveEntry(oldEntryPath, newEntryPath);
|
|
@@ -57,11 +57,15 @@ function moveProjectFile(projectsDirectoryPath, pathMap) {
|
|
|
57
57
|
}
|
|
58
58
|
}
|
|
59
59
|
function moveProjectDirectory(projectsDirectoryPath, pathMap) {
|
|
60
|
-
var sourceEntryPath = pathMap.sourceEntryPath, targetEntryPath = pathMap.targetEntryPath, sourceDirectoryPath = sourceEntryPath, targetDirectoryPath = targetEntryPath, absoluteSourceDirectoryPath = concatenatePaths(projectsDirectoryPath, sourceDirectoryPath), absoluteTargetDirectoryPath = concatenatePaths(projectsDirectoryPath, targetDirectoryPath), directoryEmpty = isDirectoryEmpty(absoluteSourceDirectoryPath);
|
|
60
|
+
var sourceEntryPath = pathMap.sourceEntryPath, targetEntryPath = pathMap.targetEntryPath, sourceDirectoryPath = sourceEntryPath, targetDirectoryPath = targetEntryPath, absoluteSourceDirectoryPath = concatenatePaths(projectsDirectoryPath, sourceDirectoryPath), absoluteTargetDirectoryPath = concatenatePaths(projectsDirectoryPath, targetDirectoryPath), targetDirectoryExists = checkDirectoryExists(absoluteTargetDirectoryPath), directoryEmpty = isDirectoryEmpty(absoluteSourceDirectoryPath);
|
|
61
61
|
if (!directoryEmpty) {
|
|
62
62
|
(0, _pathMap.nullifyEntryPaths)(pathMap);
|
|
63
63
|
return;
|
|
64
64
|
}
|
|
65
|
+
if (targetDirectoryExists) {
|
|
66
|
+
(0, _removeProjectEntries.removeProjectEntry)(projectsDirectoryPath, pathMap);
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
65
69
|
try {
|
|
66
70
|
var oldEntryPath = absoluteSourceDirectoryPath, newEntryPath = absoluteTargetDirectoryPath; ///
|
|
67
71
|
moveEntry(oldEntryPath, newEntryPath);
|
|
@@ -70,4 +74,4 @@ function moveProjectDirectory(projectsDirectoryPath, pathMap) {
|
|
|
70
74
|
}
|
|
71
75
|
}
|
|
72
76
|
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
77
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9tb3ZlUHJvamVjdEVudHJpZXMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IHBhdGhVdGlsaXRpZXMsIGZpbGVTeXN0ZW1VdGlsaXRpZXMgfSBmcm9tIFwibmVjZXNzYXJ5XCI7XG5cbmltcG9ydCB7IHJlbW92ZVByb2plY3RFbnRyeSB9IGZyb20gXCIuL3JlbW92ZVByb2plY3RFbnRyaWVzXCI7XG5pbXBvcnQgeyBudWxsaWZ5RW50cnlQYXRocywgbnVsbGlmeVRhcmdldEVudHJ5UGF0aCB9IGZyb20gXCIuL3V0aWxpdGllcy9wYXRoTWFwXCI7XG5cbmNvbnN0IHsgY29uY2F0ZW5hdGVQYXRocyB9ID0gcGF0aFV0aWxpdGllcyxcbiAgICAgIHsgbW92ZUVudHJ5LCBpc0RpcmVjdG9yeUVtcHR5LCBjaGVja0VudHJ5RXhpc3RzLCBjaGVja0VudHJ5RXhpc3RzOiBjaGVja0ZpbGVFeGlzdHMsIGNoZWNrRW50cnlFeGlzdHM6IGNoZWNrRGlyZWN0b3J5RXhpc3RzIH0gPSBmaWxlU3lzdGVtVXRpbGl0aWVzO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBtb3ZlUHJvamVjdEVudHJpZXMocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBqc29uLCBjYWxsYmFjaykge1xuICBjb25zdCB7IHBhdGhNYXBzIH0gPSBqc29uO1xuXG4gIHBhdGhNYXBzLmZvckVhY2goKHBhdGhNYXApID0+IHtcbiAgICBtb3ZlUHJvamVjdEVudHJ5KHByb2plY3RzRGlyZWN0b3J5UGF0aCwgcGF0aE1hcCk7XG4gIH0pO1xuXG4gIGpzb24gPSB7XG4gICAgcGF0aE1hcHNcbiAgfTtcblxuICBjYWxsYmFjayhqc29uKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG1vdmVQcm9qZWN0RW50cnkocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBwYXRoTWFwKSB7XG4gIGNvbnN0IHsgdGFyZ2V0RW50cnlQYXRoIH0gPSBwYXRoTWFwO1xuXG4gIGlmICh0YXJnZXRFbnRyeVBhdGggPT09IG51bGwpIHtcbiAgICByZXR1cm47XG4gIH1cblxuICBjb25zdCB7IHNvdXJjZUVudHJ5UGF0aCB9ID0gcGF0aE1hcCxcbiAgICAgICAgYWJzb2x1dGVTb3VyY2VFbnRyeVBhdGggPSBjb25jYXRlbmF0ZVBhdGhzKHByb2plY3RzRGlyZWN0b3J5UGF0aCwgc291cmNlRW50cnlQYXRoKSxcbiAgICAgICAgc291cmNlRW50cnlFeGlzdHMgPSBjaGVja0VudHJ5RXhpc3RzKGFic29sdXRlU291cmNlRW50cnlQYXRoKTtcblxuICBpZiAoIXNvdXJjZUVudHJ5RXhpc3RzKSB7XG4gICAgbnVsbGlmeVRhcmdldEVudHJ5UGF0aChwYXRoTWFwKTtcblxuICAgIHJldHVybjtcbiAgfVxuXG4gIGNvbnN0IHsgZW50cnlEaXJlY3RvcnkgfSA9IHBhdGhNYXA7XG5cbiAgZW50cnlEaXJlY3RvcnkgP1xuICAgIG1vdmVQcm9qZWN0RGlyZWN0b3J5KHByb2plY3RzRGlyZWN0b3J5UGF0aCwgcGF0aE1hcCkgOlxuICAgICAgbW92ZVByb2plY3RGaWxlKHByb2plY3RzRGlyZWN0b3J5UGF0aCwgcGF0aE1hcCk7XG59XG5cbmZ1bmN0aW9uIG1vdmVQcm9qZWN0RmlsZShwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIHBhdGhNYXApIHtcbiAgY29uc3QgeyBzb3VyY2VFbnRyeVBhdGgsIHRhcmdldEVudHJ5UGF0aCB9ID0gcGF0aE1hcCxcbiAgICAgICAgc291cmNlRmlsZVBhdGggPSBzb3VyY2VFbnRyeVBhdGgsIC8vL1xuICAgICAgICB0YXJnZXRGaWxlUGF0aCA9IHRhcmdldEVudHJ5UGF0aCwgLy8vXG4gICAgICAgIGFic29sdXRlU291cmNlRmlsZVBhdGggPSBjb25jYXRlbmF0ZVBhdGhzKHByb2plY3RzRGlyZWN0b3J5UGF0aCwgc291cmNlRmlsZVBhdGgpLFxuICAgICAgICBhYnNvbHV0ZVRhcmdldEZpbGVQYXRoID0gY29uY2F0ZW5hdGVQYXRocyhwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIHRhcmdldEZpbGVQYXRoKSxcbiAgICAgICAgdGFyZ2V0RmlsZUV4aXN0cyA9IGNoZWNrRmlsZUV4aXN0cyhhYnNvbHV0ZVRhcmdldEZpbGVQYXRoKTtcblxuICBpZiAodGFyZ2V0RmlsZUV4aXN0cykge1xuICAgIG51bGxpZnlFbnRyeVBhdGhzKHBhdGhNYXApO1xuXG4gICAgcmV0dXJuO1xuICB9XG5cbiAgdHJ5IHtcbiAgICBjb25zdCBvbGRFbnRyeVBhdGggPSBhYnNvbHV0ZVNvdXJjZUZpbGVQYXRoLCAvLy9cbiAgICAgICAgICBuZXdFbnRyeVBhdGggPSBhYnNvbHV0ZVRhcmdldEZpbGVQYXRoOyAvLy9cblxuICAgIG1vdmVFbnRyeShvbGRFbnRyeVBhdGgsIG5ld0VudHJ5UGF0aCk7XG4gIH0gY2F0Y2ggKGVycm9yKSB7XG4gICAgbnVsbGlmeUVudHJ5UGF0aHMocGF0aE1hcCk7XG4gIH1cbn1cblxuZnVuY3Rpb24gbW92ZVByb2plY3REaXJlY3RvcnkocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBwYXRoTWFwKSB7XG4gIGNvbnN0IHsgc291cmNlRW50cnlQYXRoLCB0YXJnZXRFbnRyeVBhdGggfSA9IHBhdGhNYXAsXG4gICAgICAgIHNvdXJjZURpcmVjdG9yeVBhdGggPSBzb3VyY2VFbnRyeVBhdGgsIC8vL1xuICAgICAgICB0YXJnZXREaXJlY3RvcnlQYXRoID0gdGFyZ2V0RW50cnlQYXRoLCAvLy9cbiAgICAgICAgYWJzb2x1dGVTb3VyY2VEaXJlY3RvcnlQYXRoID0gY29uY2F0ZW5hdGVQYXRocyhwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIHNvdXJjZURpcmVjdG9yeVBhdGgpLFxuICAgICAgICBhYnNvbHV0ZVRhcmdldERpcmVjdG9yeVBhdGggPSBjb25jYXRlbmF0ZVBhdGhzKHByb2plY3RzRGlyZWN0b3J5UGF0aCwgdGFyZ2V0RGlyZWN0b3J5UGF0aCksXG4gICAgICAgIHRhcmdldERpcmVjdG9yeUV4aXN0cyA9IGNoZWNrRGlyZWN0b3J5RXhpc3RzKGFic29sdXRlVGFyZ2V0RGlyZWN0b3J5UGF0aCksXG4gICAgICAgIGRpcmVjdG9yeUVtcHR5ID0gaXNEaXJlY3RvcnlFbXB0eShhYnNvbHV0ZVNvdXJjZURpcmVjdG9yeVBhdGgpO1xuXG4gIGlmICghZGlyZWN0b3J5RW1wdHkpIHtcbiAgICBudWxsaWZ5RW50cnlQYXRocyhwYXRoTWFwKTtcblxuICAgIHJldHVybjtcbiAgfVxuXG4gIGlmICh0YXJnZXREaXJlY3RvcnlFeGlzdHMpIHtcbiAgICByZW1vdmVQcm9qZWN0RW50cnkocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBwYXRoTWFwKTtcblxuICAgIHJldHVybjtcbiAgfVxuXG4gIHRyeSB7XG4gICAgY29uc3Qgb2xkRW50cnlQYXRoID0gYWJzb2x1dGVTb3VyY2VEaXJlY3RvcnlQYXRoLCAvLy9cbiAgICAgICAgICBuZXdFbnRyeVBhdGggPSBhYnNvbHV0ZVRhcmdldERpcmVjdG9yeVBhdGg7IC8vL1xuXG4gICAgbW92ZUVudHJ5KG9sZEVudHJ5UGF0aCwgbmV3RW50cnlQYXRoKTtcbiAgfSBjYXRjaCAoZXJyb3IpIHtcbiAgICBudWxsaWZ5RW50cnlQYXRocyhwYXRoTWFwKTtcbiAgfVxufVxuIl0sIm5hbWVzIjpbIm1vdmVQcm9qZWN0RW50cmllcyIsIm1vdmVQcm9qZWN0RW50cnkiLCJjb25jYXRlbmF0ZVBhdGhzIiwicGF0aFV0aWxpdGllcyIsIm1vdmVFbnRyeSIsImZpbGVTeXN0ZW1VdGlsaXRpZXMiLCJpc0RpcmVjdG9yeUVtcHR5IiwiY2hlY2tFbnRyeUV4aXN0cyIsImNoZWNrRmlsZUV4aXN0cyIsImNoZWNrRGlyZWN0b3J5RXhpc3RzIiwicHJvamVjdHNEaXJlY3RvcnlQYXRoIiwianNvbiIsImNhbGxiYWNrIiwicGF0aE1hcHMiLCJmb3JFYWNoIiwicGF0aE1hcCIsInRhcmdldEVudHJ5UGF0aCIsInNvdXJjZUVudHJ5UGF0aCIsImFic29sdXRlU291cmNlRW50cnlQYXRoIiwic291cmNlRW50cnlFeGlzdHMiLCJudWxsaWZ5VGFyZ2V0RW50cnlQYXRoIiwiZW50cnlEaXJlY3RvcnkiLCJtb3ZlUHJvamVjdERpcmVjdG9yeSIsIm1vdmVQcm9qZWN0RmlsZSIsInNvdXJjZUZpbGVQYXRoIiwidGFyZ2V0RmlsZVBhdGgiLCJhYnNvbHV0ZVNvdXJjZUZpbGVQYXRoIiwiYWJzb2x1dGVUYXJnZXRGaWxlUGF0aCIsInRhcmdldEZpbGVFeGlzdHMiLCJudWxsaWZ5RW50cnlQYXRocyIsIm9sZEVudHJ5UGF0aCIsIm5ld0VudHJ5UGF0aCIsImVycm9yIiwic291cmNlRGlyZWN0b3J5UGF0aCIsInRhcmdldERpcmVjdG9yeVBhdGgiLCJhYnNvbHV0ZVNvdXJjZURpcmVjdG9yeVBhdGgiLCJhYnNvbHV0ZVRhcmdldERpcmVjdG9yeVBhdGgiLCJ0YXJnZXREaXJlY3RvcnlFeGlzdHMiLCJkaXJlY3RvcnlFbXB0eSIsInJlbW92ZVByb2plY3RFbnRyeSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O0lBVUEsT0FZQztlQVp1QkE7O0lBY1JDLGdCQUFnQjtlQUFoQkE7Ozt5QkF0Qm1DO29DQUVoQjt1QkFDdUI7QUFFMUQsSUFBTSxBQUFFQyxtQkFBcUJDLHdCQUFhLENBQWxDRCxrQkFDQUUsWUFBNkhDLDhCQUFtQixDQUFoSkQsV0FBV0UsbUJBQWtIRCw4QkFBbUIsQ0FBcklDLGtCQUFrQkMsbUJBQWdHRiw4QkFBbUIsQ0FBbkhFLGtCQUFrQkEsQUFBa0JDLGtCQUE0REgsOEJBQW1CLENBQWpHRSxrQkFBbUNBLEFBQWtCRSx1QkFBeUJKLDhCQUFtQixDQUE5REU7QUFFM0UsU0FBU1AsbUJBQW1CVSxxQkFBcUIsRUFBRUMsSUFBSSxFQUFFQyxRQUFRO0lBQzlFLElBQU0sQUFBRUMsV0FBYUYsS0FBYkU7SUFFUkEsU0FBU0MsT0FBTyxDQUFDLFNBQUNDO1FBQ2hCZCxpQkFBaUJTLHVCQUF1Qks7SUFDMUM7SUFFQUosT0FBTztRQUNMRSxVQUFBQTtJQUNGO0lBRUFELFNBQVNEO0FBQ1g7QUFFTyxTQUFTVixpQkFBaUJTLHFCQUFxQixFQUFFSyxPQUFPO0lBQzdELElBQU0sQUFBRUMsa0JBQW9CRCxRQUFwQkM7SUFFUixJQUFJQSxvQkFBb0IsTUFBTTtRQUM1QjtJQUNGO0lBRUEsSUFBTSxBQUFFQyxrQkFBb0JGLFFBQXBCRSxpQkFDRkMsMEJBQTBCaEIsaUJBQWlCUSx1QkFBdUJPLGtCQUNsRUUsb0JBQW9CWixpQkFBaUJXO0lBRTNDLElBQUksQ0FBQ0MsbUJBQW1CO1FBQ3RCQyxJQUFBQSwrQkFBc0IsRUFBQ0w7UUFFdkI7SUFDRjtJQUVBLElBQU0sQUFBRU0saUJBQW1CTixRQUFuQk07SUFFUkEsaUJBQ0VDLHFCQUFxQlosdUJBQXVCSyxXQUMxQ1EsZ0JBQWdCYix1QkFBdUJLO0FBQzdDO0FBRUEsU0FBU1EsZ0JBQWdCYixxQkFBcUIsRUFBRUssT0FBTztJQUNyRCxJQUFRRSxrQkFBcUNGLFFBQXJDRSxpQkFBaUJELGtCQUFvQkQsUUFBcEJDLGlCQUNuQlEsaUJBQWlCUCxpQkFDakJRLGlCQUFpQlQsaUJBQ2pCVSx5QkFBeUJ4QixpQkFBaUJRLHVCQUF1QmMsaUJBQ2pFRyx5QkFBeUJ6QixpQkFBaUJRLHVCQUF1QmUsaUJBQ2pFRyxtQkFBbUJwQixnQkFBZ0JtQjtJQUV6QyxJQUFJQyxrQkFBa0I7UUFDcEJDLElBQUFBLDBCQUFpQixFQUFDZDtRQUVsQjtJQUNGO0lBRUEsSUFBSTtRQUNGLElBQU1lLGVBQWVKLHdCQUNmSyxlQUFlSix3QkFBd0IsR0FBRztRQUVoRHZCLFVBQVUwQixjQUFjQztJQUMxQixFQUFFLE9BQU9DLE9BQU87UUFDZEgsSUFBQUEsMEJBQWlCLEVBQUNkO0lBQ3BCO0FBQ0Y7QUFFQSxTQUFTTyxxQkFBcUJaLHFCQUFxQixFQUFFSyxPQUFPO0lBQzFELElBQVFFLGtCQUFxQ0YsUUFBckNFLGlCQUFpQkQsa0JBQW9CRCxRQUFwQkMsaUJBQ25CaUIsc0JBQXNCaEIsaUJBQ3RCaUIsc0JBQXNCbEIsaUJBQ3RCbUIsOEJBQThCakMsaUJBQWlCUSx1QkFBdUJ1QixzQkFDdEVHLDhCQUE4QmxDLGlCQUFpQlEsdUJBQXVCd0Isc0JBQ3RFRyx3QkFBd0I1QixxQkFBcUIyQiw4QkFDN0NFLGlCQUFpQmhDLGlCQUFpQjZCO0lBRXhDLElBQUksQ0FBQ0csZ0JBQWdCO1FBQ25CVCxJQUFBQSwwQkFBaUIsRUFBQ2Q7UUFFbEI7SUFDRjtJQUVBLElBQUlzQix1QkFBdUI7UUFDekJFLElBQUFBLHdDQUFrQixFQUFDN0IsdUJBQXVCSztRQUUxQztJQUNGO0lBRUEsSUFBSTtRQUNGLElBQU1lLGVBQWVLLDZCQUNmSixlQUFlSyw2QkFBNkIsR0FBRztRQUVyRGhDLFVBQVUwQixjQUFjQztJQUMxQixFQUFFLE9BQU9DLE9BQU87UUFDZEgsSUFBQUEsMEJBQWlCLEVBQUNkO0lBQ3BCO0FBQ0YifQ==
|
|
@@ -18,7 +18,7 @@ _export(exports, {
|
|
|
18
18
|
});
|
|
19
19
|
var _necessary = require("necessary");
|
|
20
20
|
var _pathMap = require("./utilities/pathMap");
|
|
21
|
-
var concatenatePaths = _necessary.pathUtilities.concatenatePaths, moveEntry = _necessary.fileSystemUtilities.moveEntry, checkEntryExists = _necessary.fileSystemUtilities.checkEntryExists;
|
|
21
|
+
var concatenatePaths = _necessary.pathUtilities.concatenatePaths, moveEntry = _necessary.fileSystemUtilities.moveEntry, checkEntryExists = _necessary.fileSystemUtilities.checkEntryExists, checkFileExists = _necessary.fileSystemUtilities.checkEntryExists, checkDirectoryExists = _necessary.fileSystemUtilities.checkEntryExists;
|
|
22
22
|
function renameProjectEntries(projectsDirectoryPath, json, callback) {
|
|
23
23
|
var pathMaps = json.pathMaps;
|
|
24
24
|
pathMaps.forEach(function(pathMap) {
|
|
@@ -34,11 +34,6 @@ function renameProjectEntry(projectsDirectoryPath, pathMap) {
|
|
|
34
34
|
if (targetEntryPath === null) {
|
|
35
35
|
return;
|
|
36
36
|
}
|
|
37
|
-
var absoluteTargetEntryPath = concatenatePaths(projectsDirectoryPath, targetEntryPath), targetEntryExists = checkEntryExists(absoluteTargetEntryPath);
|
|
38
|
-
if (targetEntryExists) {
|
|
39
|
-
(0, _pathMap.nullifyEntryPaths)(pathMap);
|
|
40
|
-
return;
|
|
41
|
-
}
|
|
42
37
|
var sourceEntryPath = pathMap.sourceEntryPath, absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath), sourceEntryExists = checkEntryExists(absoluteSourceEntryPath);
|
|
43
38
|
if (!sourceEntryExists) {
|
|
44
39
|
(0, _pathMap.nullifyTargetEntryPath)(pathMap);
|
|
@@ -48,7 +43,11 @@ function renameProjectEntry(projectsDirectoryPath, pathMap) {
|
|
|
48
43
|
entryDirectory ? renameProjectDirectory(projectsDirectoryPath, pathMap) : renameProjectFile(projectsDirectoryPath, pathMap);
|
|
49
44
|
}
|
|
50
45
|
function renameProjectFile(projectsDirectoryPath, pathMap) {
|
|
51
|
-
var sourceEntryPath = pathMap.sourceEntryPath, targetEntryPath = pathMap.targetEntryPath, sourceFilePath = sourceEntryPath, targetFilePath = targetEntryPath, absoluteSourceFilePath = concatenatePaths(projectsDirectoryPath, sourceFilePath), absoluteTargetFilePath = concatenatePaths(projectsDirectoryPath, targetFilePath);
|
|
46
|
+
var sourceEntryPath = pathMap.sourceEntryPath, targetEntryPath = pathMap.targetEntryPath, sourceFilePath = sourceEntryPath, targetFilePath = targetEntryPath, absoluteSourceFilePath = concatenatePaths(projectsDirectoryPath, sourceFilePath), absoluteTargetFilePath = concatenatePaths(projectsDirectoryPath, targetFilePath), targetFileExists = checkFileExists(absoluteTargetFilePath);
|
|
47
|
+
if (targetFileExists) {
|
|
48
|
+
(0, _pathMap.nullifyEntryPaths)(pathMap);
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
52
51
|
try {
|
|
53
52
|
var oldEntryPath = absoluteSourceFilePath, newEntryPath = absoluteTargetFilePath; ///
|
|
54
53
|
moveEntry(oldEntryPath, newEntryPath); ///
|
|
@@ -57,7 +56,11 @@ function renameProjectFile(projectsDirectoryPath, pathMap) {
|
|
|
57
56
|
}
|
|
58
57
|
}
|
|
59
58
|
function renameProjectDirectory(projectsDirectoryPath, pathMap) {
|
|
60
|
-
var sourceEntryPath = pathMap.sourceEntryPath, targetEntryPath = pathMap.targetEntryPath, sourceDirectoryPath = sourceEntryPath, targetDirectoryPath = targetEntryPath, absoluteSourceDirectoryPath = concatenatePaths(projectsDirectoryPath, sourceDirectoryPath), absoluteTargetDirectoryPath = concatenatePaths(projectsDirectoryPath, targetDirectoryPath);
|
|
59
|
+
var sourceEntryPath = pathMap.sourceEntryPath, targetEntryPath = pathMap.targetEntryPath, sourceDirectoryPath = sourceEntryPath, targetDirectoryPath = targetEntryPath, absoluteSourceDirectoryPath = concatenatePaths(projectsDirectoryPath, sourceDirectoryPath), absoluteTargetDirectoryPath = concatenatePaths(projectsDirectoryPath, targetDirectoryPath), targetDirectoryExists = checkDirectoryExists(absoluteTargetDirectoryPath);
|
|
60
|
+
if (targetDirectoryExists) {
|
|
61
|
+
(0, _pathMap.nullifyEntryPaths)(pathMap);
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
61
64
|
try {
|
|
62
65
|
var oldEntryPath = absoluteSourceDirectoryPath, newEntryPath = absoluteTargetDirectoryPath; ///
|
|
63
66
|
moveEntry(oldEntryPath, newEntryPath); ///
|
|
@@ -66,4 +69,4 @@ function renameProjectDirectory(projectsDirectoryPath, pathMap) {
|
|
|
66
69
|
}
|
|
67
70
|
}
|
|
68
71
|
|
|
69
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9yZW5hbWVQcm9qZWN0RW50cmllcy5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgcGF0aFV0aWxpdGllcywgZmlsZVN5c3RlbVV0aWxpdGllcyB9IGZyb20gXCJuZWNlc3NhcnlcIjtcblxuaW1wb3J0IHsgbnVsbGlmeUVudHJ5UGF0aHMsIG51bGxpZnlUYXJnZXRFbnRyeVBhdGggfSBmcm9tIFwiLi91dGlsaXRpZXMvcGF0aE1hcFwiO1xuXG5jb25zdCB7IGNvbmNhdGVuYXRlUGF0aHMgfSA9IHBhdGhVdGlsaXRpZXMsXG4gICAgICB7IG1vdmVFbnRyeSwgY2hlY2tFbnRyeUV4aXN0cywgY2hlY2tFbnRyeUV4aXN0czogY2hlY2tGaWxlRXhpc3RzLCBjaGVja0VudHJ5RXhpc3RzOiBjaGVja0RpcmVjdG9yeUV4aXN0cyB9ID0gZmlsZVN5c3RlbVV0aWxpdGllcztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gcmVuYW1lUHJvamVjdEVudHJpZXMocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBqc29uLCBjYWxsYmFjaykge1xuICBjb25zdCB7IHBhdGhNYXBzIH0gPSBqc29uO1xuXG4gIHBhdGhNYXBzLmZvckVhY2goKHBhdGhNYXApID0+IHtcbiAgICByZW5hbWVQcm9qZWN0RW50cnkocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBwYXRoTWFwKTtcbiAgfSk7XG5cbiAganNvbiA9IHtcbiAgICBwYXRoTWFwc1xuICB9O1xuXG4gIGNhbGxiYWNrKGpzb24pO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gcmVuYW1lUHJvamVjdEVudHJ5KHByb2plY3RzRGlyZWN0b3J5UGF0aCwgcGF0aE1hcCkge1xuICBjb25zdCB7IHRhcmdldEVudHJ5UGF0aCB9ID0gcGF0aE1hcDtcblxuICBpZiAodGFyZ2V0RW50cnlQYXRoID09PSBudWxsKSB7XG4gICAgcmV0dXJuO1xuICB9XG5cbiAgY29uc3QgeyBzb3VyY2VFbnRyeVBhdGggfSA9IHBhdGhNYXAsXG4gICAgICAgIGFic29sdXRlU291cmNlRW50cnlQYXRoID0gY29uY2F0ZW5hdGVQYXRocyhwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIHNvdXJjZUVudHJ5UGF0aCksXG4gICAgICAgIHNvdXJjZUVudHJ5RXhpc3RzID0gY2hlY2tFbnRyeUV4aXN0cyhhYnNvbHV0ZVNvdXJjZUVudHJ5UGF0aCk7XG5cbiAgaWYgKCFzb3VyY2VFbnRyeUV4aXN0cykge1xuICAgIG51bGxpZnlUYXJnZXRFbnRyeVBhdGgocGF0aE1hcCk7XG5cbiAgICByZXR1cm47XG4gIH1cblxuICBjb25zdCB7IGVudHJ5RGlyZWN0b3J5IH0gPSBwYXRoTWFwO1xuXG4gIGVudHJ5RGlyZWN0b3J5ID9cbiAgICByZW5hbWVQcm9qZWN0RGlyZWN0b3J5KHByb2plY3RzRGlyZWN0b3J5UGF0aCwgcGF0aE1hcCkgOlxuICAgICAgcmVuYW1lUHJvamVjdEZpbGUocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBwYXRoTWFwKTtcbn1cblxuZnVuY3Rpb24gcmVuYW1lUHJvamVjdEZpbGUocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBwYXRoTWFwKSB7XG4gIGNvbnN0IHsgc291cmNlRW50cnlQYXRoLCB0YXJnZXRFbnRyeVBhdGggfSA9IHBhdGhNYXAsXG4gICAgICAgIHNvdXJjZUZpbGVQYXRoID0gc291cmNlRW50cnlQYXRoLCAvLy9cbiAgICAgICAgdGFyZ2V0RmlsZVBhdGggPSB0YXJnZXRFbnRyeVBhdGgsIC8vL1xuICAgICAgICBhYnNvbHV0ZVNvdXJjZUZpbGVQYXRoID0gY29uY2F0ZW5hdGVQYXRocyhwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIHNvdXJjZUZpbGVQYXRoKSxcbiAgICAgICAgYWJzb2x1dGVUYXJnZXRGaWxlUGF0aCA9IGNvbmNhdGVuYXRlUGF0aHMocHJvamVjdHNEaXJlY3RvcnlQYXRoLCB0YXJnZXRGaWxlUGF0aCksXG4gICAgICAgIHRhcmdldEZpbGVFeGlzdHMgPSBjaGVja0ZpbGVFeGlzdHMoYWJzb2x1dGVUYXJnZXRGaWxlUGF0aCk7XG5cbiAgaWYgKHRhcmdldEZpbGVFeGlzdHMpIHtcbiAgICBudWxsaWZ5RW50cnlQYXRocyhwYXRoTWFwKTtcblxuICAgIHJldHVybjtcbiAgfVxuXG4gIHRyeSB7XG4gICAgY29uc3Qgb2xkRW50cnlQYXRoID0gYWJzb2x1dGVTb3VyY2VGaWxlUGF0aCwgLy8vXG4gICAgICAgICAgbmV3RW50cnlQYXRoID0gYWJzb2x1dGVUYXJnZXRGaWxlUGF0aDsgLy8vXG5cbiAgICBtb3ZlRW50cnkob2xkRW50cnlQYXRoLCBuZXdFbnRyeVBhdGgpOyAgLy8vXG4gIH0gY2F0Y2ggKGVycm9yKSB7XG4gICAgbnVsbGlmeUVudHJ5UGF0aHMocGF0aE1hcCk7XG4gIH1cbn1cblxuZnVuY3Rpb24gcmVuYW1lUHJvamVjdERpcmVjdG9yeShwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIHBhdGhNYXApIHtcbiAgY29uc3QgeyBzb3VyY2VFbnRyeVBhdGgsIHRhcmdldEVudHJ5UGF0aCB9ID0gcGF0aE1hcCxcbiAgICAgICAgc291cmNlRGlyZWN0b3J5UGF0aCA9IHNvdXJjZUVudHJ5UGF0aCwgLy8vXG4gICAgICAgIHRhcmdldERpcmVjdG9yeVBhdGggPSB0YXJnZXRFbnRyeVBhdGgsIC8vL1xuICAgICAgICBhYnNvbHV0ZVNvdXJjZURpcmVjdG9yeVBhdGggPSBjb25jYXRlbmF0ZVBhdGhzKHByb2plY3RzRGlyZWN0b3J5UGF0aCwgc291cmNlRGlyZWN0b3J5UGF0aCksXG4gICAgICAgIGFic29sdXRlVGFyZ2V0RGlyZWN0b3J5UGF0aCA9IGNvbmNhdGVuYXRlUGF0aHMocHJvamVjdHNEaXJlY3RvcnlQYXRoLCB0YXJnZXREaXJlY3RvcnlQYXRoKSxcbiAgICAgICAgdGFyZ2V0RGlyZWN0b3J5RXhpc3RzID0gY2hlY2tEaXJlY3RvcnlFeGlzdHMoYWJzb2x1dGVUYXJnZXREaXJlY3RvcnlQYXRoKTtcblxuICBpZiAodGFyZ2V0RGlyZWN0b3J5RXhpc3RzKSB7XG4gICAgbnVsbGlmeUVudHJ5UGF0aHMocGF0aE1hcCk7XG5cbiAgICByZXR1cm47XG4gIH1cblxuICB0cnkge1xuICAgIGNvbnN0IG9sZEVudHJ5UGF0aCA9IGFic29sdXRlU291cmNlRGlyZWN0b3J5UGF0aCwgLy8vXG4gICAgICAgICAgbmV3RW50cnlQYXRoID0gYWJzb2x1dGVUYXJnZXREaXJlY3RvcnlQYXRoOyAvLy9cblxuICAgIG1vdmVFbnRyeShvbGRFbnRyeVBhdGgsIG5ld0VudHJ5UGF0aCk7ICAvLy9cbiAgfSBjYXRjaCAoZXJyb3IpIHtcbiAgICBudWxsaWZ5RW50cnlQYXRocyhwYXRoTWFwKTtcbiAgfVxufVxuIl0sIm5hbWVzIjpbInJlbmFtZVByb2plY3RFbnRyaWVzIiwicmVuYW1lUHJvamVjdEVudHJ5IiwiY29uY2F0ZW5hdGVQYXRocyIsInBhdGhVdGlsaXRpZXMiLCJtb3ZlRW50cnkiLCJmaWxlU3lzdGVtVXRpbGl0aWVzIiwiY2hlY2tFbnRyeUV4aXN0cyIsImNoZWNrRmlsZUV4aXN0cyIsImNoZWNrRGlyZWN0b3J5RXhpc3RzIiwicHJvamVjdHNEaXJlY3RvcnlQYXRoIiwianNvbiIsImNhbGxiYWNrIiwicGF0aE1hcHMiLCJmb3JFYWNoIiwicGF0aE1hcCIsInRhcmdldEVudHJ5UGF0aCIsInNvdXJjZUVudHJ5UGF0aCIsImFic29sdXRlU291cmNlRW50cnlQYXRoIiwic291cmNlRW50cnlFeGlzdHMiLCJudWxsaWZ5VGFyZ2V0RW50cnlQYXRoIiwiZW50cnlEaXJlY3RvcnkiLCJyZW5hbWVQcm9qZWN0RGlyZWN0b3J5IiwicmVuYW1lUHJvamVjdEZpbGUiLCJzb3VyY2VGaWxlUGF0aCIsInRhcmdldEZpbGVQYXRoIiwiYWJzb2x1dGVTb3VyY2VGaWxlUGF0aCIsImFic29sdXRlVGFyZ2V0RmlsZVBhdGgiLCJ0YXJnZXRGaWxlRXhpc3RzIiwibnVsbGlmeUVudHJ5UGF0aHMiLCJvbGRFbnRyeVBhdGgiLCJuZXdFbnRyeVBhdGgiLCJlcnJvciIsInNvdXJjZURpcmVjdG9yeVBhdGgiLCJ0YXJnZXREaXJlY3RvcnlQYXRoIiwiYWJzb2x1dGVTb3VyY2VEaXJlY3RvcnlQYXRoIiwiYWJzb2x1dGVUYXJnZXREaXJlY3RvcnlQYXRoIiwidGFyZ2V0RGlyZWN0b3J5RXhpc3RzIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7SUFTQSxPQVlDO2VBWnVCQTs7SUFjUkMsa0JBQWtCO2VBQWxCQTs7O3lCQXJCbUM7dUJBRU87QUFFMUQsSUFBTSxBQUFFQyxtQkFBcUJDLHdCQUFhLENBQWxDRCxrQkFDQUUsWUFBMkdDLDhCQUFtQixDQUE5SEQsV0FBV0UsbUJBQWdHRCw4QkFBbUIsQ0FBbkhDLGtCQUFrQkEsQUFBa0JDLGtCQUE0REYsOEJBQW1CLENBQWpHQyxrQkFBbUNBLEFBQWtCRSx1QkFBeUJILDhCQUFtQixDQUE5REM7QUFFekQsU0FBU04scUJBQXFCUyxxQkFBcUIsRUFBRUMsSUFBSSxFQUFFQyxRQUFRO0lBQ2hGLElBQU0sQUFBRUMsV0FBYUYsS0FBYkU7SUFFUkEsU0FBU0MsT0FBTyxDQUFDLFNBQUNDO1FBQ2hCYixtQkFBbUJRLHVCQUF1Qks7SUFDNUM7SUFFQUosT0FBTztRQUNMRSxVQUFBQTtJQUNGO0lBRUFELFNBQVNEO0FBQ1g7QUFFTyxTQUFTVCxtQkFBbUJRLHFCQUFxQixFQUFFSyxPQUFPO0lBQy9ELElBQU0sQUFBRUMsa0JBQW9CRCxRQUFwQkM7SUFFUixJQUFJQSxvQkFBb0IsTUFBTTtRQUM1QjtJQUNGO0lBRUEsSUFBTSxBQUFFQyxrQkFBb0JGLFFBQXBCRSxpQkFDRkMsMEJBQTBCZixpQkFBaUJPLHVCQUF1Qk8sa0JBQ2xFRSxvQkFBb0JaLGlCQUFpQlc7SUFFM0MsSUFBSSxDQUFDQyxtQkFBbUI7UUFDdEJDLElBQUFBLCtCQUFzQixFQUFDTDtRQUV2QjtJQUNGO0lBRUEsSUFBTSxBQUFFTSxpQkFBbUJOLFFBQW5CTTtJQUVSQSxpQkFDRUMsdUJBQXVCWix1QkFBdUJLLFdBQzVDUSxrQkFBa0JiLHVCQUF1Qks7QUFDL0M7QUFFQSxTQUFTUSxrQkFBa0JiLHFCQUFxQixFQUFFSyxPQUFPO0lBQ3ZELElBQVFFLGtCQUFxQ0YsUUFBckNFLGlCQUFpQkQsa0JBQW9CRCxRQUFwQkMsaUJBQ25CUSxpQkFBaUJQLGlCQUNqQlEsaUJBQWlCVCxpQkFDakJVLHlCQUF5QnZCLGlCQUFpQk8sdUJBQXVCYyxpQkFDakVHLHlCQUF5QnhCLGlCQUFpQk8sdUJBQXVCZSxpQkFDakVHLG1CQUFtQnBCLGdCQUFnQm1CO0lBRXpDLElBQUlDLGtCQUFrQjtRQUNwQkMsSUFBQUEsMEJBQWlCLEVBQUNkO1FBRWxCO0lBQ0Y7SUFFQSxJQUFJO1FBQ0YsSUFBTWUsZUFBZUosd0JBQ2ZLLGVBQWVKLHdCQUF3QixHQUFHO1FBRWhEdEIsVUFBVXlCLGNBQWNDLGVBQWdCLEdBQUc7SUFDN0MsRUFBRSxPQUFPQyxPQUFPO1FBQ2RILElBQUFBLDBCQUFpQixFQUFDZDtJQUNwQjtBQUNGO0FBRUEsU0FBU08sdUJBQXVCWixxQkFBcUIsRUFBRUssT0FBTztJQUM1RCxJQUFRRSxrQkFBcUNGLFFBQXJDRSxpQkFBaUJELGtCQUFvQkQsUUFBcEJDLGlCQUNuQmlCLHNCQUFzQmhCLGlCQUN0QmlCLHNCQUFzQmxCLGlCQUN0Qm1CLDhCQUE4QmhDLGlCQUFpQk8sdUJBQXVCdUIsc0JBQ3RFRyw4QkFBOEJqQyxpQkFBaUJPLHVCQUF1QndCLHNCQUN0RUcsd0JBQXdCNUIscUJBQXFCMkI7SUFFbkQsSUFBSUMsdUJBQXVCO1FBQ3pCUixJQUFBQSwwQkFBaUIsRUFBQ2Q7UUFFbEI7SUFDRjtJQUVBLElBQUk7UUFDRixJQUFNZSxlQUFlSyw2QkFDZkosZUFBZUssNkJBQTZCLEdBQUc7UUFFckQvQixVQUFVeUIsY0FBY0MsZUFBZ0IsR0FBRztJQUM3QyxFQUFFLE9BQU9DLE9BQU87UUFDZEgsSUFBQUEsMEJBQWlCLEVBQUNkO0lBQ3BCO0FBQ0YifQ==
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "occam-file-system",
|
|
3
3
|
"author": "James Smith",
|
|
4
|
-
"version": "6.0.
|
|
4
|
+
"version": "6.0.55",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-file-system",
|
|
7
7
|
"description": "Occam's file system functionality.",
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"necessary": "^12.0.1",
|
|
14
|
-
"occam-entities": "^1.0.
|
|
14
|
+
"occam-entities": "^1.0.15"
|
|
15
15
|
},
|
|
16
16
|
"devDependencies": {
|
|
17
17
|
"@swc/core": "^1.2.51",
|
|
@@ -4,7 +4,7 @@ import { nullifyTargetEntryPath } from "./utilities/pathMap";
|
|
|
4
4
|
import { pathUtilities, fileSystemUtilities } from "necessary";
|
|
5
5
|
|
|
6
6
|
const { concatenatePaths } = pathUtilities,
|
|
7
|
-
{ createFile, createDirectory, checkEntryExists } = fileSystemUtilities;
|
|
7
|
+
{ createFile, createDirectory, checkEntryExists: checkFileExists, checkEntryExists: checkDirectoryExists } = fileSystemUtilities;
|
|
8
8
|
|
|
9
9
|
export default function createProjectEntries(projectsDirectoryPath, json, callback) {
|
|
10
10
|
const { pathMaps } = json;
|
|
@@ -21,16 +21,6 @@ export default function createProjectEntries(projectsDirectoryPath, json, callba
|
|
|
21
21
|
}
|
|
22
22
|
|
|
23
23
|
export function createProjectEntry(projectsDirectoryPath, pathMap) {
|
|
24
|
-
const { targetEntryPath } = pathMap,
|
|
25
|
-
absoluteTargetEntryPath = concatenatePaths(projectsDirectoryPath, targetEntryPath),
|
|
26
|
-
targetEntryExists = checkEntryExists(absoluteTargetEntryPath);
|
|
27
|
-
|
|
28
|
-
if (targetEntryExists) {
|
|
29
|
-
nullifyTargetEntryPath(pathMap);
|
|
30
|
-
|
|
31
|
-
return;
|
|
32
|
-
}
|
|
33
|
-
|
|
34
24
|
const { entryDirectory } = pathMap;
|
|
35
25
|
|
|
36
26
|
entryDirectory ?
|
|
@@ -41,7 +31,14 @@ export function createProjectEntry(projectsDirectoryPath, pathMap) {
|
|
|
41
31
|
function createProjectFile(projectsDirectoryPath, pathMap) {
|
|
42
32
|
const { targetEntryPath } = pathMap,
|
|
43
33
|
targetFilePath = targetEntryPath, ///
|
|
44
|
-
absoluteTargetFilePath = concatenatePaths(projectsDirectoryPath, targetFilePath)
|
|
34
|
+
absoluteTargetFilePath = concatenatePaths(projectsDirectoryPath, targetFilePath),
|
|
35
|
+
targetFileExists = checkFileExists(absoluteTargetFilePath);
|
|
36
|
+
|
|
37
|
+
if (targetFileExists) {
|
|
38
|
+
nullifyTargetEntryPath(pathMap);
|
|
39
|
+
|
|
40
|
+
return;
|
|
41
|
+
}
|
|
45
42
|
|
|
46
43
|
try {
|
|
47
44
|
const filePath = absoluteTargetFilePath; ///
|
|
@@ -55,7 +52,14 @@ function createProjectFile(projectsDirectoryPath, pathMap) {
|
|
|
55
52
|
function createProjectDirectory(projectsDirectoryPath, pathMap) {
|
|
56
53
|
const { targetEntryPath } = pathMap,
|
|
57
54
|
targetDirectoryPath = targetEntryPath, ///
|
|
58
|
-
absoluteTargetDirectoryPath = concatenatePaths(projectsDirectoryPath, targetDirectoryPath)
|
|
55
|
+
absoluteTargetDirectoryPath = concatenatePaths(projectsDirectoryPath, targetDirectoryPath),
|
|
56
|
+
targetDirectoryExists = checkDirectoryExists(absoluteTargetDirectoryPath);
|
|
57
|
+
|
|
58
|
+
if (targetDirectoryExists) {
|
|
59
|
+
nullifyTargetEntryPath(pathMap);
|
|
60
|
+
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
59
63
|
|
|
60
64
|
try {
|
|
61
65
|
const directoryPath = absoluteTargetDirectoryPath; ///
|
|
@@ -2,10 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
import { pathUtilities, fileSystemUtilities } from "necessary";
|
|
4
4
|
|
|
5
|
+
import { removeProjectEntry } from "./removeProjectEntries";
|
|
5
6
|
import { nullifyEntryPaths, nullifyTargetEntryPath } from "./utilities/pathMap";
|
|
6
7
|
|
|
7
8
|
const { concatenatePaths } = pathUtilities,
|
|
8
|
-
{ moveEntry, checkEntryExists,
|
|
9
|
+
{ moveEntry, isDirectoryEmpty, checkEntryExists, checkEntryExists: checkFileExists, checkEntryExists: checkDirectoryExists } = fileSystemUtilities;
|
|
9
10
|
|
|
10
11
|
export default function moveProjectEntries(projectsDirectoryPath, json, callback) {
|
|
11
12
|
const { pathMaps } = json;
|
|
@@ -28,15 +29,6 @@ export function moveProjectEntry(projectsDirectoryPath, pathMap) {
|
|
|
28
29
|
return;
|
|
29
30
|
}
|
|
30
31
|
|
|
31
|
-
const absoluteTargetEntryPath = concatenatePaths(projectsDirectoryPath, targetEntryPath),
|
|
32
|
-
targetEntryExists = checkEntryExists(absoluteTargetEntryPath);
|
|
33
|
-
|
|
34
|
-
if (targetEntryExists) {
|
|
35
|
-
nullifyEntryPaths(pathMap);
|
|
36
|
-
|
|
37
|
-
return;
|
|
38
|
-
}
|
|
39
|
-
|
|
40
32
|
const { sourceEntryPath } = pathMap,
|
|
41
33
|
absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath),
|
|
42
34
|
sourceEntryExists = checkEntryExists(absoluteSourceEntryPath);
|
|
@@ -59,7 +51,14 @@ function moveProjectFile(projectsDirectoryPath, pathMap) {
|
|
|
59
51
|
sourceFilePath = sourceEntryPath, ///
|
|
60
52
|
targetFilePath = targetEntryPath, ///
|
|
61
53
|
absoluteSourceFilePath = concatenatePaths(projectsDirectoryPath, sourceFilePath),
|
|
62
|
-
absoluteTargetFilePath = concatenatePaths(projectsDirectoryPath, targetFilePath)
|
|
54
|
+
absoluteTargetFilePath = concatenatePaths(projectsDirectoryPath, targetFilePath),
|
|
55
|
+
targetFileExists = checkFileExists(absoluteTargetFilePath);
|
|
56
|
+
|
|
57
|
+
if (targetFileExists) {
|
|
58
|
+
nullifyEntryPaths(pathMap);
|
|
59
|
+
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
63
62
|
|
|
64
63
|
try {
|
|
65
64
|
const oldEntryPath = absoluteSourceFilePath, ///
|
|
@@ -77,6 +76,7 @@ function moveProjectDirectory(projectsDirectoryPath, pathMap) {
|
|
|
77
76
|
targetDirectoryPath = targetEntryPath, ///
|
|
78
77
|
absoluteSourceDirectoryPath = concatenatePaths(projectsDirectoryPath, sourceDirectoryPath),
|
|
79
78
|
absoluteTargetDirectoryPath = concatenatePaths(projectsDirectoryPath, targetDirectoryPath),
|
|
79
|
+
targetDirectoryExists = checkDirectoryExists(absoluteTargetDirectoryPath),
|
|
80
80
|
directoryEmpty = isDirectoryEmpty(absoluteSourceDirectoryPath);
|
|
81
81
|
|
|
82
82
|
if (!directoryEmpty) {
|
|
@@ -85,6 +85,12 @@ function moveProjectDirectory(projectsDirectoryPath, pathMap) {
|
|
|
85
85
|
return;
|
|
86
86
|
}
|
|
87
87
|
|
|
88
|
+
if (targetDirectoryExists) {
|
|
89
|
+
removeProjectEntry(projectsDirectoryPath, pathMap);
|
|
90
|
+
|
|
91
|
+
return;
|
|
92
|
+
}
|
|
93
|
+
|
|
88
94
|
try {
|
|
89
95
|
const oldEntryPath = absoluteSourceDirectoryPath, ///
|
|
90
96
|
newEntryPath = absoluteTargetDirectoryPath; ///
|
|
@@ -5,7 +5,7 @@ import { pathUtilities, fileSystemUtilities } from "necessary";
|
|
|
5
5
|
import { nullifyEntryPaths, nullifyTargetEntryPath } from "./utilities/pathMap";
|
|
6
6
|
|
|
7
7
|
const { concatenatePaths } = pathUtilities,
|
|
8
|
-
{ moveEntry, checkEntryExists } = fileSystemUtilities;
|
|
8
|
+
{ moveEntry, checkEntryExists, checkEntryExists: checkFileExists, checkEntryExists: checkDirectoryExists } = fileSystemUtilities;
|
|
9
9
|
|
|
10
10
|
export default function renameProjectEntries(projectsDirectoryPath, json, callback) {
|
|
11
11
|
const { pathMaps } = json;
|
|
@@ -28,15 +28,6 @@ export function renameProjectEntry(projectsDirectoryPath, pathMap) {
|
|
|
28
28
|
return;
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
-
const absoluteTargetEntryPath = concatenatePaths(projectsDirectoryPath, targetEntryPath),
|
|
32
|
-
targetEntryExists = checkEntryExists(absoluteTargetEntryPath);
|
|
33
|
-
|
|
34
|
-
if (targetEntryExists) {
|
|
35
|
-
nullifyEntryPaths(pathMap);
|
|
36
|
-
|
|
37
|
-
return;
|
|
38
|
-
}
|
|
39
|
-
|
|
40
31
|
const { sourceEntryPath } = pathMap,
|
|
41
32
|
absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath),
|
|
42
33
|
sourceEntryExists = checkEntryExists(absoluteSourceEntryPath);
|
|
@@ -59,7 +50,14 @@ function renameProjectFile(projectsDirectoryPath, pathMap) {
|
|
|
59
50
|
sourceFilePath = sourceEntryPath, ///
|
|
60
51
|
targetFilePath = targetEntryPath, ///
|
|
61
52
|
absoluteSourceFilePath = concatenatePaths(projectsDirectoryPath, sourceFilePath),
|
|
62
|
-
absoluteTargetFilePath = concatenatePaths(projectsDirectoryPath, targetFilePath)
|
|
53
|
+
absoluteTargetFilePath = concatenatePaths(projectsDirectoryPath, targetFilePath),
|
|
54
|
+
targetFileExists = checkFileExists(absoluteTargetFilePath);
|
|
55
|
+
|
|
56
|
+
if (targetFileExists) {
|
|
57
|
+
nullifyEntryPaths(pathMap);
|
|
58
|
+
|
|
59
|
+
return;
|
|
60
|
+
}
|
|
63
61
|
|
|
64
62
|
try {
|
|
65
63
|
const oldEntryPath = absoluteSourceFilePath, ///
|
|
@@ -76,7 +74,14 @@ function renameProjectDirectory(projectsDirectoryPath, pathMap) {
|
|
|
76
74
|
sourceDirectoryPath = sourceEntryPath, ///
|
|
77
75
|
targetDirectoryPath = targetEntryPath, ///
|
|
78
76
|
absoluteSourceDirectoryPath = concatenatePaths(projectsDirectoryPath, sourceDirectoryPath),
|
|
79
|
-
absoluteTargetDirectoryPath = concatenatePaths(projectsDirectoryPath, targetDirectoryPath)
|
|
77
|
+
absoluteTargetDirectoryPath = concatenatePaths(projectsDirectoryPath, targetDirectoryPath),
|
|
78
|
+
targetDirectoryExists = checkDirectoryExists(absoluteTargetDirectoryPath);
|
|
79
|
+
|
|
80
|
+
if (targetDirectoryExists) {
|
|
81
|
+
nullifyEntryPaths(pathMap);
|
|
82
|
+
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
80
85
|
|
|
81
86
|
try {
|
|
82
87
|
const oldEntryPath = absoluteSourceDirectoryPath, ///
|