occam-file-system 6.0.36 → 6.0.40
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.
|
@@ -30,15 +30,23 @@ function moveProjectEntries(projectsDirectoryPath, json, callback) {
|
|
|
30
30
|
callback(json);
|
|
31
31
|
}
|
|
32
32
|
function moveProjectEntry(projectsDirectoryPath, pathMap) {
|
|
33
|
-
var sourceEntryPath = pathMap.sourceEntryPath;
|
|
34
|
-
if (sourceEntryPath === null) {
|
|
35
|
-
return;
|
|
36
|
-
}
|
|
37
33
|
var targetEntryPath = pathMap.targetEntryPath;
|
|
38
34
|
if (targetEntryPath === null) {
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
var absoluteTargetEntryPath = concatenatePaths(projectsDirectoryPath, targetEntryPath), targetEntryExists = checkEntryExists(absoluteTargetEntryPath);
|
|
38
|
+
if (targetEntryExists) {
|
|
39
39
|
(0, _removeProjectEntries.removeProjectEntry)(projectsDirectoryPath, pathMap);
|
|
40
40
|
return;
|
|
41
41
|
}
|
|
42
|
+
var sourceEntryPath = pathMap.sourceEntryPath, absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath), sourceEntryExists = checkEntryExists(absoluteSourceEntryPath);
|
|
43
|
+
if (!sourceEntryExists) {
|
|
44
|
+
var targetEntryPath1 = null;
|
|
45
|
+
Object.assign(pathMap, {
|
|
46
|
+
targetEntryPath: targetEntryPath1
|
|
47
|
+
});
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
42
50
|
var entryDirectory = pathMap.entryDirectory;
|
|
43
51
|
entryDirectory ? moveProjectDirectory(projectsDirectoryPath, pathMap) : moveProjectFile(projectsDirectoryPath, pathMap);
|
|
44
52
|
}
|
|
@@ -67,4 +75,4 @@ function moveProjectDirectory(projectsDirectoryPath, pathMap) {
|
|
|
67
75
|
}
|
|
68
76
|
}
|
|
69
77
|
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9tb3ZlUHJvamVjdEVudHJpZXMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IHBhdGhVdGlsaXRpZXMsIGZpbGVTeXN0ZW1VdGlsaXRpZXMgfSBmcm9tIFwibmVjZXNzYXJ5XCI7XG5cbmltcG9ydCB7IHJlbW92ZVByb2plY3RFbnRyeSB9IGZyb20gXCIuL3JlbW92ZVByb2plY3RFbnRyaWVzXCI7XG5cbmNvbnN0IHsgY29uY2F0ZW5hdGVQYXRocyB9ID0gcGF0aFV0aWxpdGllcyxcbiAgICAgIHsgbW92ZUVudHJ5LCBjaGVja0VudHJ5RXhpc3RzIH0gPSBmaWxlU3lzdGVtVXRpbGl0aWVzO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBtb3ZlUHJvamVjdEVudHJpZXMocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBqc29uLCBjYWxsYmFjaykge1xuICBjb25zdCB7IHBhdGhNYXBzIH0gPSBqc29uO1xuXG4gIHBhdGhNYXBzLmZvckVhY2goKHBhdGhNYXApID0+
|
|
78
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9tb3ZlUHJvamVjdEVudHJpZXMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IHBhdGhVdGlsaXRpZXMsIGZpbGVTeXN0ZW1VdGlsaXRpZXMgfSBmcm9tIFwibmVjZXNzYXJ5XCI7XG5cbmltcG9ydCB7IHJlbW92ZVByb2plY3RFbnRyeSB9IGZyb20gXCIuL3JlbW92ZVByb2plY3RFbnRyaWVzXCI7XG5cbmNvbnN0IHsgY29uY2F0ZW5hdGVQYXRocyB9ID0gcGF0aFV0aWxpdGllcyxcbiAgICAgIHsgbW92ZUVudHJ5LCBjaGVja0VudHJ5RXhpc3RzIH0gPSBmaWxlU3lzdGVtVXRpbGl0aWVzO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBtb3ZlUHJvamVjdEVudHJpZXMocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBqc29uLCBjYWxsYmFjaykge1xuICBjb25zdCB7IHBhdGhNYXBzIH0gPSBqc29uO1xuXG4gIHBhdGhNYXBzLmZvckVhY2goKHBhdGhNYXApID0+IHtcbiAgICBtb3ZlUHJvamVjdEVudHJ5KHByb2plY3RzRGlyZWN0b3J5UGF0aCwgcGF0aE1hcCk7XG4gIH0pO1xuXG4gIGpzb24gPSB7XG4gICAgcGF0aE1hcHNcbiAgfTtcblxuICBjYWxsYmFjayhqc29uKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG1vdmVQcm9qZWN0RW50cnkocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBwYXRoTWFwKSB7XG4gIGNvbnN0IHsgdGFyZ2V0RW50cnlQYXRoIH0gPSBwYXRoTWFwO1xuXG4gIGlmICh0YXJnZXRFbnRyeVBhdGggPT09IG51bGwpIHtcbiAgICByZXR1cm47XG4gIH1cblxuICBjb25zdCBhYnNvbHV0ZVRhcmdldEVudHJ5UGF0aCA9IGNvbmNhdGVuYXRlUGF0aHMocHJvamVjdHNEaXJlY3RvcnlQYXRoLCB0YXJnZXRFbnRyeVBhdGgpLFxuICAgICAgICB0YXJnZXRFbnRyeUV4aXN0cyA9IGNoZWNrRW50cnlFeGlzdHMoYWJzb2x1dGVUYXJnZXRFbnRyeVBhdGgpO1xuXG4gIGlmICh0YXJnZXRFbnRyeUV4aXN0cykge1xuICAgIHJlbW92ZVByb2plY3RFbnRyeShwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIHBhdGhNYXApO1xuXG4gICAgcmV0dXJuO1xuICB9XG5cbiAgY29uc3QgeyBzb3VyY2VFbnRyeVBhdGggfSA9IHBhdGhNYXAsXG4gICAgICAgIGFic29sdXRlU291cmNlRW50cnlQYXRoID0gY29uY2F0ZW5hdGVQYXRocyhwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIHNvdXJjZUVudHJ5UGF0aCksXG4gICAgICAgIHNvdXJjZUVudHJ5RXhpc3RzID0gY2hlY2tFbnRyeUV4aXN0cyhhYnNvbHV0ZVNvdXJjZUVudHJ5UGF0aCk7XG5cbiAgaWYgKCFzb3VyY2VFbnRyeUV4aXN0cykge1xuICAgIGNvbnN0IHRhcmdldEVudHJ5UGF0aCA9IG51bGw7XG5cbiAgICBPYmplY3QuYXNzaWduKHBhdGhNYXAsIHtcbiAgICAgIHRhcmdldEVudHJ5UGF0aFxuICAgIH0pO1xuXG4gICAgcmV0dXJuO1xuICB9XG5cbiAgY29uc3QgeyBlbnRyeURpcmVjdG9yeSB9ID0gcGF0aE1hcDtcblxuICBlbnRyeURpcmVjdG9yeSA/XG4gICAgbW92ZVByb2plY3REaXJlY3RvcnkocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBwYXRoTWFwKSA6XG4gICAgICBtb3ZlUHJvamVjdEZpbGUocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBwYXRoTWFwKTtcbn1cblxuZnVuY3Rpb24gbW92ZVByb2plY3RGaWxlKHByb2plY3RzRGlyZWN0b3J5UGF0aCwgcGF0aE1hcCkge1xuICBjb25zdCB7IHNvdXJjZUVudHJ5UGF0aCwgdGFyZ2V0RW50cnlQYXRoIH0gPSBwYXRoTWFwLFxuICAgICAgICBzb3VyY2VGaWxlUGF0aCA9IHNvdXJjZUVudHJ5UGF0aCwgLy8vXG4gICAgICAgIHRhcmdldEZpbGVQYXRoID0gdGFyZ2V0RW50cnlQYXRoLCAvLy9cbiAgICAgICAgYWJzb2x1dGVTb3VyY2VGaWxlUGF0aCA9IGNvbmNhdGVuYXRlUGF0aHMocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBzb3VyY2VGaWxlUGF0aCksXG4gICAgICAgIGFic29sdXRlVGFyZ2V0RmlsZVBhdGggPSBjb25jYXRlbmF0ZVBhdGhzKHByb2plY3RzRGlyZWN0b3J5UGF0aCwgdGFyZ2V0RmlsZVBhdGgpO1xuXG4gIHRyeSB7XG4gICAgY29uc3Qgb2xkRW50cnlQYXRoID0gYWJzb2x1dGVTb3VyY2VGaWxlUGF0aCwgLy8vXG4gICAgICAgICAgbmV3RW50cnlQYXRoID0gYWJzb2x1dGVUYXJnZXRGaWxlUGF0aDsgLy8vXG5cbiAgICBtb3ZlRW50cnkob2xkRW50cnlQYXRoLCBuZXdFbnRyeVBhdGgpO1xuICB9IGNhdGNoIChlcnJvcikge1xuICAgIGNvbnN0IHNvdXJjZUVudHJ5UGF0aCA9IG51bGw7XG5cbiAgICBPYmplY3QuYXNzaWduKHBhdGhNYXAsIHtcbiAgICAgIHNvdXJjZUVudHJ5UGF0aFxuICAgIH0pO1xuICB9XG59XG5cbmZ1bmN0aW9uIG1vdmVQcm9qZWN0RGlyZWN0b3J5KHByb2plY3RzRGlyZWN0b3J5UGF0aCwgcGF0aE1hcCkge1xuICBjb25zdCB7IHNvdXJjZUVudHJ5UGF0aCwgdGFyZ2V0RW50cnlQYXRoIH0gPSBwYXRoTWFwLFxuICAgICAgICBzb3VyY2VEaXJlY3RvcnlQYXRoID0gc291cmNlRW50cnlQYXRoLCAvLy9cbiAgICAgICAgdGFyZ2V0RGlyZWN0b3J5UGF0aCA9IHRhcmdldEVudHJ5UGF0aCwgLy8vXG4gICAgICAgIGFic29sdXRlU291cmNlRGlyZWN0b3J5UGF0aCA9IGNvbmNhdGVuYXRlUGF0aHMocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBzb3VyY2VEaXJlY3RvcnlQYXRoKSxcbiAgICAgICAgYWJzb2x1dGVUYXJnZXREaXJlY3RvcnlQYXRoID0gY29uY2F0ZW5hdGVQYXRocyhwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIHRhcmdldERpcmVjdG9yeVBhdGgpO1xuXG4gIHRyeSB7XG4gICAgY29uc3Qgb2xkRW50cnlQYXRoID0gYWJzb2x1dGVTb3VyY2VEaXJlY3RvcnlQYXRoLCAvLy9cbiAgICAgICAgICBuZXdFbnRyeVBhdGggPSBhYnNvbHV0ZVRhcmdldERpcmVjdG9yeVBhdGg7IC8vL1xuXG4gICAgbW92ZUVudHJ5KG9sZEVudHJ5UGF0aCwgbmV3RW50cnlQYXRoKTtcbiAgfSBjYXRjaCAoZXJyb3IpIHtcbiAgICBjb25zdCBzb3VyY2VFbnRyeVBhdGggPSBudWxsO1xuXG4gICAgT2JqZWN0LmFzc2lnbihwYXRoTWFwLCB7XG4gICAgICBzb3VyY2VFbnRyeVBhdGhcbiAgICB9KTtcbiAgfVxufVxuIl0sIm5hbWVzIjpbIm1vdmVQcm9qZWN0RW50cmllcyIsIm1vdmVQcm9qZWN0RW50cnkiLCJjb25jYXRlbmF0ZVBhdGhzIiwicGF0aFV0aWxpdGllcyIsIm1vdmVFbnRyeSIsImZpbGVTeXN0ZW1VdGlsaXRpZXMiLCJjaGVja0VudHJ5RXhpc3RzIiwicHJvamVjdHNEaXJlY3RvcnlQYXRoIiwianNvbiIsImNhbGxiYWNrIiwicGF0aE1hcHMiLCJmb3JFYWNoIiwicGF0aE1hcCIsInRhcmdldEVudHJ5UGF0aCIsImFic29sdXRlVGFyZ2V0RW50cnlQYXRoIiwidGFyZ2V0RW50cnlFeGlzdHMiLCJyZW1vdmVQcm9qZWN0RW50cnkiLCJzb3VyY2VFbnRyeVBhdGgiLCJhYnNvbHV0ZVNvdXJjZUVudHJ5UGF0aCIsInNvdXJjZUVudHJ5RXhpc3RzIiwiT2JqZWN0IiwiYXNzaWduIiwiZW50cnlEaXJlY3RvcnkiLCJtb3ZlUHJvamVjdERpcmVjdG9yeSIsIm1vdmVQcm9qZWN0RmlsZSIsInNvdXJjZUZpbGVQYXRoIiwidGFyZ2V0RmlsZVBhdGgiLCJhYnNvbHV0ZVNvdXJjZUZpbGVQYXRoIiwiYWJzb2x1dGVUYXJnZXRGaWxlUGF0aCIsIm9sZEVudHJ5UGF0aCIsIm5ld0VudHJ5UGF0aCIsImVycm9yIiwic291cmNlRGlyZWN0b3J5UGF0aCIsInRhcmdldERpcmVjdG9yeVBhdGgiLCJhYnNvbHV0ZVNvdXJjZURpcmVjdG9yeVBhdGgiLCJhYnNvbHV0ZVRhcmdldERpcmVjdG9yeVBhdGgiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztJQVNBLE9BWUM7ZUFadUJBOztJQWNSQyxnQkFBZ0I7ZUFBaEJBOzs7eUJBckJtQztvQ0FFaEI7QUFFbkMsSUFBTSxBQUFFQyxtQkFBcUJDLHdCQUFhLENBQWxDRCxrQkFDQUUsWUFBZ0NDLDhCQUFtQixDQUFuREQsV0FBV0UsbUJBQXFCRCw4QkFBbUIsQ0FBeENDO0FBRUosU0FBU04sbUJBQW1CTyxxQkFBcUIsRUFBRUMsSUFBSSxFQUFFQyxRQUFRO0lBQzlFLElBQU0sQUFBRUMsV0FBYUYsS0FBYkU7SUFFUkEsU0FBU0MsT0FBTyxDQUFDLFNBQUNDO1FBQ2hCWCxpQkFBaUJNLHVCQUF1Qks7SUFDMUM7SUFFQUosT0FBTztRQUNMRSxVQUFBQTtJQUNGO0lBRUFELFNBQVNEO0FBQ1g7QUFFTyxTQUFTUCxpQkFBaUJNLHFCQUFxQixFQUFFSyxPQUFPO0lBQzdELElBQU0sQUFBRUMsa0JBQW9CRCxRQUFwQkM7SUFFUixJQUFJQSxvQkFBb0IsTUFBTTtRQUM1QjtJQUNGO0lBRUEsSUFBTUMsMEJBQTBCWixpQkFBaUJLLHVCQUF1Qk0sa0JBQ2xFRSxvQkFBb0JULGlCQUFpQlE7SUFFM0MsSUFBSUMsbUJBQW1CO1FBQ3JCQyxJQUFBQSx3Q0FBa0IsRUFBQ1QsdUJBQXVCSztRQUUxQztJQUNGO0lBRUEsSUFBTSxBQUFFSyxrQkFBb0JMLFFBQXBCSyxpQkFDRkMsMEJBQTBCaEIsaUJBQWlCSyx1QkFBdUJVLGtCQUNsRUUsb0JBQW9CYixpQkFBaUJZO0lBRTNDLElBQUksQ0FBQ0MsbUJBQW1CO1FBQ3RCLElBQU1OLG1CQUFrQjtRQUV4Qk8sT0FBT0MsTUFBTSxDQUFDVCxTQUFTO1lBQ3JCQyxpQkFBQUE7UUFDRjtRQUVBO0lBQ0Y7SUFFQSxJQUFNLEFBQUVTLGlCQUFtQlYsUUFBbkJVO0lBRVJBLGlCQUNFQyxxQkFBcUJoQix1QkFBdUJLLFdBQzFDWSxnQkFBZ0JqQix1QkFBdUJLO0FBQzdDO0FBRUEsU0FBU1ksZ0JBQWdCakIscUJBQXFCLEVBQUVLLE9BQU87SUFDckQsSUFBUUssa0JBQXFDTCxRQUFyQ0ssaUJBQWlCSixrQkFBb0JELFFBQXBCQyxpQkFDbkJZLGlCQUFpQlIsaUJBQ2pCUyxpQkFBaUJiLGlCQUNqQmMseUJBQXlCekIsaUJBQWlCSyx1QkFBdUJrQixpQkFDakVHLHlCQUF5QjFCLGlCQUFpQkssdUJBQXVCbUI7SUFFdkUsSUFBSTtRQUNGLElBQU1HLGVBQWVGLHdCQUNmRyxlQUFlRix3QkFBd0IsR0FBRztRQUVoRHhCLFVBQVV5QixjQUFjQztJQUMxQixFQUFFLE9BQU9DLE9BQU87UUFDZCxJQUFNZCxtQkFBa0I7UUFFeEJHLE9BQU9DLE1BQU0sQ0FBQ1QsU0FBUztZQUNyQkssaUJBQUFBO1FBQ0Y7SUFDRjtBQUNGO0FBRUEsU0FBU00scUJBQXFCaEIscUJBQXFCLEVBQUVLLE9BQU87SUFDMUQsSUFBUUssa0JBQXFDTCxRQUFyQ0ssaUJBQWlCSixrQkFBb0JELFFBQXBCQyxpQkFDbkJtQixzQkFBc0JmLGlCQUN0QmdCLHNCQUFzQnBCLGlCQUN0QnFCLDhCQUE4QmhDLGlCQUFpQkssdUJBQXVCeUIsc0JBQ3RFRyw4QkFBOEJqQyxpQkFBaUJLLHVCQUF1QjBCO0lBRTVFLElBQUk7UUFDRixJQUFNSixlQUFlSyw2QkFDZkosZUFBZUssNkJBQTZCLEdBQUc7UUFFckQvQixVQUFVeUIsY0FBY0M7SUFDMUIsRUFBRSxPQUFPQyxPQUFPO1FBQ2QsSUFBTWQsbUJBQWtCO1FBRXhCRyxPQUFPQyxNQUFNLENBQUNULFNBQVM7WUFDckJLLGlCQUFBQTtRQUNGO0lBQ0Y7QUFDRiJ9
|
|
@@ -33,6 +33,10 @@ function removeProjectEntry(projectsDirectoryPath, pathMap) {
|
|
|
33
33
|
if (sourceEntryPath === null) {
|
|
34
34
|
return;
|
|
35
35
|
}
|
|
36
|
+
var absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath), sourceEntryExists = checkEntryExists(absoluteSourceEntryPath);
|
|
37
|
+
if (!sourceEntryExists) {
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
36
40
|
var entryDirectory = pathMap.entryDirectory;
|
|
37
41
|
entryDirectory ? removeProjectDirectory(projectsDirectoryPath, pathMap) : removeProjectFile(projectsDirectoryPath, pathMap);
|
|
38
42
|
}
|
|
@@ -61,4 +65,4 @@ function removeProjectDirectory(projectsDirectoryPath, pathMap) {
|
|
|
61
65
|
}
|
|
62
66
|
}
|
|
63
67
|
|
|
64
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9yZW1vdmVQcm9qZWN0RW50cmllcy5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgcGF0aFV0aWxpdGllcywgZmlsZVN5c3RlbVV0aWxpdGllcyB9IGZyb20gXCJuZWNlc3NhcnlcIjtcblxuY29uc3QgeyBjb25jYXRlbmF0ZVBhdGhzIH0gPSBwYXRoVXRpbGl0aWVzLFxuICAgICAgeyByZW1vdmVFbnRyeSwgY2hlY2tFbnRyeUV4aXN0cyB9ID0gZmlsZVN5c3RlbVV0aWxpdGllcztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gcmVtb3ZlUHJvamVjdEVudHJpZXMocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBqc29uLCBjYWxsYmFjaykge1xuICBjb25zdCB7IHBhdGhNYXBzIH0gPSBqc29uO1xuXG4gIHBhdGhNYXBzLmZvckVhY2goKHBhdGhNYXApID0+
|
|
68
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9yZW1vdmVQcm9qZWN0RW50cmllcy5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgcGF0aFV0aWxpdGllcywgZmlsZVN5c3RlbVV0aWxpdGllcyB9IGZyb20gXCJuZWNlc3NhcnlcIjtcblxuY29uc3QgeyBjb25jYXRlbmF0ZVBhdGhzIH0gPSBwYXRoVXRpbGl0aWVzLFxuICAgICAgeyByZW1vdmVFbnRyeSwgY2hlY2tFbnRyeUV4aXN0cyB9ID0gZmlsZVN5c3RlbVV0aWxpdGllcztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gcmVtb3ZlUHJvamVjdEVudHJpZXMocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBqc29uLCBjYWxsYmFjaykge1xuICBjb25zdCB7IHBhdGhNYXBzIH0gPSBqc29uO1xuXG4gIHBhdGhNYXBzLmZvckVhY2goKHBhdGhNYXApID0+IHtcbiAgICByZW1vdmVQcm9qZWN0RW50cnkocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBwYXRoTWFwKTtcbiAgfSk7XG5cbiAganNvbiA9IHtcbiAgICBwYXRoTWFwc1xuICB9O1xuXG4gIGNhbGxiYWNrKGpzb24pO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gcmVtb3ZlUHJvamVjdEVudHJ5KHByb2plY3RzRGlyZWN0b3J5UGF0aCwgcGF0aE1hcCkge1xuICBjb25zdCB7IHNvdXJjZUVudHJ5UGF0aCB9ID0gcGF0aE1hcDtcblxuICBpZiAoc291cmNlRW50cnlQYXRoID09PSBudWxsKSB7XG4gICAgcmV0dXJuO1xuICB9XG5cbiAgY29uc3QgYWJzb2x1dGVTb3VyY2VFbnRyeVBhdGggPSBjb25jYXRlbmF0ZVBhdGhzKHByb2plY3RzRGlyZWN0b3J5UGF0aCwgc291cmNlRW50cnlQYXRoKSxcbiAgICAgICAgc291cmNlRW50cnlFeGlzdHMgPSBjaGVja0VudHJ5RXhpc3RzKGFic29sdXRlU291cmNlRW50cnlQYXRoKTtcblxuICBpZiAoIXNvdXJjZUVudHJ5RXhpc3RzKSB7XG4gICAgcmV0dXJuO1xuICB9XG5cbiAgY29uc3QgeyBlbnRyeURpcmVjdG9yeSB9ID0gcGF0aE1hcDtcblxuICBlbnRyeURpcmVjdG9yeSA/XG4gICAgcmVtb3ZlUHJvamVjdERpcmVjdG9yeShwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIHBhdGhNYXApIDpcbiAgICAgIHJlbW92ZVByb2plY3RGaWxlKHByb2plY3RzRGlyZWN0b3J5UGF0aCwgcGF0aE1hcCk7XG59XG5cbmZ1bmN0aW9uIHJlbW92ZVByb2plY3RGaWxlKHByb2plY3RzRGlyZWN0b3J5UGF0aCwgcGF0aE1hcCkge1xuICBjb25zdCB7IHNvdXJjZUVudHJ5UGF0aCB9ID0gcGF0aE1hcCxcbiAgICAgICAgc291cmNlRmlsZVBhdGggPSBzb3VyY2VFbnRyeVBhdGgsIC8vL1xuICAgICAgICBhYnNvbHV0ZVNvdXJjZUZpbGVQYXRoID0gY29uY2F0ZW5hdGVQYXRocyhwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIHNvdXJjZUZpbGVQYXRoKTtcblxuICB0cnkge1xuICAgIGNvbnN0IGVudHJ5UGF0aCA9IGFic29sdXRlU291cmNlRmlsZVBhdGg7ICAvLy9cblxuICAgIHJlbW92ZUVudHJ5KGVudHJ5UGF0aCk7XG4gIH0gY2F0Y2ggKGVycm9yKSB7XG4gICAgY29uc3Qgc291cmNlRW50cnlQYXRoID0gbnVsbDtcblxuICAgIE9iamVjdC5hc3NpZ24ocGF0aE1hcCwge1xuICAgICAgc291cmNlRW50cnlQYXRoXG4gICAgfSk7XG4gIH1cbn1cblxuZnVuY3Rpb24gcmVtb3ZlUHJvamVjdERpcmVjdG9yeShwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIHBhdGhNYXApIHtcbiAgY29uc3QgeyBzb3VyY2VFbnRyeVBhdGggfSA9IHBhdGhNYXAsXG4gICAgICAgIHNvdXJjZURpcmVjdG9yeVBhdGggPSBzb3VyY2VFbnRyeVBhdGgsIC8vL1xuICAgICAgICBhYnNvbHV0ZVNvdXJjZURpcmVjdG9yeVBhdGggPSBjb25jYXRlbmF0ZVBhdGhzKHByb2plY3RzRGlyZWN0b3J5UGF0aCwgc291cmNlRGlyZWN0b3J5UGF0aCk7XG5cbiAgdHJ5IHtcbiAgICBjb25zdCBlbnRyeVBhdGggPSBhYnNvbHV0ZVNvdXJjZURpcmVjdG9yeVBhdGg7ICAvLy9cblxuICAgIHJlbW92ZUVudHJ5KGVudHJ5UGF0aCk7XG4gIH0gY2F0Y2ggKGVycm9yKSB7XG4gICAgY29uc3Qgc291cmNlRW50cnlQYXRoID0gbnVsbDtcblxuICAgIE9iamVjdC5hc3NpZ24ocGF0aE1hcCwge1xuICAgICAgc291cmNlRW50cnlQYXRoXG4gICAgfSk7XG4gIH1cbn1cbiJdLCJuYW1lcyI6WyJyZW1vdmVQcm9qZWN0RW50cmllcyIsInJlbW92ZVByb2plY3RFbnRyeSIsImNvbmNhdGVuYXRlUGF0aHMiLCJwYXRoVXRpbGl0aWVzIiwicmVtb3ZlRW50cnkiLCJmaWxlU3lzdGVtVXRpbGl0aWVzIiwiY2hlY2tFbnRyeUV4aXN0cyIsInByb2plY3RzRGlyZWN0b3J5UGF0aCIsImpzb24iLCJjYWxsYmFjayIsInBhdGhNYXBzIiwiZm9yRWFjaCIsInBhdGhNYXAiLCJzb3VyY2VFbnRyeVBhdGgiLCJhYnNvbHV0ZVNvdXJjZUVudHJ5UGF0aCIsInNvdXJjZUVudHJ5RXhpc3RzIiwiZW50cnlEaXJlY3RvcnkiLCJyZW1vdmVQcm9qZWN0RGlyZWN0b3J5IiwicmVtb3ZlUHJvamVjdEZpbGUiLCJzb3VyY2VGaWxlUGF0aCIsImFic29sdXRlU291cmNlRmlsZVBhdGgiLCJlbnRyeVBhdGgiLCJlcnJvciIsIk9iamVjdCIsImFzc2lnbiIsInNvdXJjZURpcmVjdG9yeVBhdGgiLCJhYnNvbHV0ZVNvdXJjZURpcmVjdG9yeVBhdGgiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztJQU9BLE9BWUM7ZUFadUJBOztJQWNSQyxrQkFBa0I7ZUFBbEJBOzs7eUJBbkJtQztBQUVuRCxJQUFNLEFBQUVDLG1CQUFxQkMsd0JBQWEsQ0FBbENELGtCQUNBRSxjQUFrQ0MsOEJBQW1CLENBQXJERCxhQUFhRSxtQkFBcUJELDhCQUFtQixDQUF4Q0M7QUFFTixTQUFTTixxQkFBcUJPLHFCQUFxQixFQUFFQyxJQUFJLEVBQUVDLFFBQVE7SUFDaEYsSUFBTSxBQUFFQyxXQUFhRixLQUFiRTtJQUVSQSxTQUFTQyxPQUFPLENBQUMsU0FBQ0M7UUFDaEJYLG1CQUFtQk0sdUJBQXVCSztJQUM1QztJQUVBSixPQUFPO1FBQ0xFLFVBQUFBO0lBQ0Y7SUFFQUQsU0FBU0Q7QUFDWDtBQUVPLFNBQVNQLG1CQUFtQk0scUJBQXFCLEVBQUVLLE9BQU87SUFDL0QsSUFBTSxBQUFFQyxrQkFBb0JELFFBQXBCQztJQUVSLElBQUlBLG9CQUFvQixNQUFNO1FBQzVCO0lBQ0Y7SUFFQSxJQUFNQywwQkFBMEJaLGlCQUFpQkssdUJBQXVCTSxrQkFDbEVFLG9CQUFvQlQsaUJBQWlCUTtJQUUzQyxJQUFJLENBQUNDLG1CQUFtQjtRQUN0QjtJQUNGO0lBRUEsSUFBTSxBQUFFQyxpQkFBbUJKLFFBQW5CSTtJQUVSQSxpQkFDRUMsdUJBQXVCVix1QkFBdUJLLFdBQzVDTSxrQkFBa0JYLHVCQUF1Qks7QUFDL0M7QUFFQSxTQUFTTSxrQkFBa0JYLHFCQUFxQixFQUFFSyxPQUFPO0lBQ3ZELElBQU0sQUFBRUMsa0JBQW9CRCxRQUFwQkMsaUJBQ0ZNLGlCQUFpQk4saUJBQ2pCTyx5QkFBeUJsQixpQkFBaUJLLHVCQUF1Qlk7SUFFdkUsSUFBSTtRQUNGLElBQU1FLFlBQVlELHdCQUF5QixHQUFHO1FBRTlDaEIsWUFBWWlCO0lBQ2QsRUFBRSxPQUFPQyxPQUFPO1FBQ2QsSUFBTVQsbUJBQWtCO1FBRXhCVSxPQUFPQyxNQUFNLENBQUNaLFNBQVM7WUFDckJDLGlCQUFBQTtRQUNGO0lBQ0Y7QUFDRjtBQUVBLFNBQVNJLHVCQUF1QlYscUJBQXFCLEVBQUVLLE9BQU87SUFDNUQsSUFBTSxBQUFFQyxrQkFBb0JELFFBQXBCQyxpQkFDRlksc0JBQXNCWixpQkFDdEJhLDhCQUE4QnhCLGlCQUFpQkssdUJBQXVCa0I7SUFFNUUsSUFBSTtRQUNGLElBQU1KLFlBQVlLLDZCQUE4QixHQUFHO1FBRW5EdEIsWUFBWWlCO0lBQ2QsRUFBRSxPQUFPQyxPQUFPO1FBQ2QsSUFBTVQsbUJBQWtCO1FBRXhCVSxPQUFPQyxNQUFNLENBQUNaLFNBQVM7WUFDckJDLGlCQUFBQTtRQUNGO0lBQ0Y7QUFDRiJ9
|
|
@@ -17,6 +17,7 @@ _export(exports, {
|
|
|
17
17
|
}
|
|
18
18
|
});
|
|
19
19
|
var _necessary = require("necessary");
|
|
20
|
+
var _removeProjectEntries = require("./removeProjectEntries");
|
|
20
21
|
var concatenatePaths = _necessary.pathUtilities.concatenatePaths, moveEntry = _necessary.fileSystemUtilities.moveEntry, checkEntryExists = _necessary.fileSystemUtilities.checkEntryExists;
|
|
21
22
|
function renameProjectEntries(projectsDirectoryPath, json, callback) {
|
|
22
23
|
var pathMaps = json.pathMaps;
|
|
@@ -35,17 +36,14 @@ function renameProjectEntry(projectsDirectoryPath, pathMap) {
|
|
|
35
36
|
}
|
|
36
37
|
var absoluteTargetEntryPath = concatenatePaths(projectsDirectoryPath, targetEntryPath), targetEntryExists = checkEntryExists(absoluteTargetEntryPath);
|
|
37
38
|
if (targetEntryExists) {
|
|
38
|
-
|
|
39
|
-
Object.assign(pathMap, {
|
|
40
|
-
targetEntryPath: targetEntryPath1
|
|
41
|
-
});
|
|
39
|
+
(0, _removeProjectEntries.removeProjectEntry)(projectsDirectoryPath, pathMap);
|
|
42
40
|
return;
|
|
43
41
|
}
|
|
44
42
|
var sourceEntryPath = pathMap.sourceEntryPath, absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath), sourceEntryExists = checkEntryExists(absoluteSourceEntryPath);
|
|
45
43
|
if (!sourceEntryExists) {
|
|
46
|
-
var
|
|
44
|
+
var targetEntryPath1 = null;
|
|
47
45
|
Object.assign(pathMap, {
|
|
48
|
-
targetEntryPath:
|
|
46
|
+
targetEntryPath: targetEntryPath1
|
|
49
47
|
});
|
|
50
48
|
return;
|
|
51
49
|
}
|
|
@@ -77,4 +75,4 @@ function renameProjectDirectory(projectsDirectoryPath, pathMap) {
|
|
|
77
75
|
}
|
|
78
76
|
}
|
|
79
77
|
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
78
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9yZW5hbWVQcm9qZWN0RW50cmllcy5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgcGF0aFV0aWxpdGllcywgZmlsZVN5c3RlbVV0aWxpdGllcyB9IGZyb20gXCJuZWNlc3NhcnlcIjtcblxuaW1wb3J0IHsgcmVtb3ZlUHJvamVjdEVudHJ5IH0gZnJvbSBcIi4vcmVtb3ZlUHJvamVjdEVudHJpZXNcIjtcblxuY29uc3QgeyBjb25jYXRlbmF0ZVBhdGhzIH0gPSBwYXRoVXRpbGl0aWVzLFxuICAgICAgeyBtb3ZlRW50cnksIGNoZWNrRW50cnlFeGlzdHMgfSA9IGZpbGVTeXN0ZW1VdGlsaXRpZXM7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHJlbmFtZVByb2plY3RFbnRyaWVzKHByb2plY3RzRGlyZWN0b3J5UGF0aCwganNvbiwgY2FsbGJhY2spIHtcbiAgY29uc3QgeyBwYXRoTWFwcyB9ID0ganNvbjtcblxuICBwYXRoTWFwcy5mb3JFYWNoKChwYXRoTWFwKSA9PiB7XG4gICAgcmVuYW1lUHJvamVjdEVudHJ5KHByb2plY3RzRGlyZWN0b3J5UGF0aCwgcGF0aE1hcCk7XG4gIH0pO1xuXG4gIGpzb24gPSB7XG4gICAgcGF0aE1hcHNcbiAgfTtcblxuICBjYWxsYmFjayhqc29uKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHJlbmFtZVByb2plY3RFbnRyeShwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIHBhdGhNYXApIHtcbiAgY29uc3QgeyB0YXJnZXRFbnRyeVBhdGggfSA9IHBhdGhNYXA7XG5cbiAgaWYgKHRhcmdldEVudHJ5UGF0aCA9PT0gbnVsbCkge1xuICAgIHJldHVybjtcbiAgfVxuXG4gIGNvbnN0IGFic29sdXRlVGFyZ2V0RW50cnlQYXRoID0gY29uY2F0ZW5hdGVQYXRocyhwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIHRhcmdldEVudHJ5UGF0aCksXG4gICAgICAgIHRhcmdldEVudHJ5RXhpc3RzID0gY2hlY2tFbnRyeUV4aXN0cyhhYnNvbHV0ZVRhcmdldEVudHJ5UGF0aCk7XG5cbiAgaWYgKHRhcmdldEVudHJ5RXhpc3RzKSB7XG4gICAgcmVtb3ZlUHJvamVjdEVudHJ5KHByb2plY3RzRGlyZWN0b3J5UGF0aCwgcGF0aE1hcCk7XG5cbiAgICByZXR1cm47XG4gIH1cblxuICBjb25zdCB7IHNvdXJjZUVudHJ5UGF0aCB9ID0gcGF0aE1hcCxcbiAgICAgICAgYWJzb2x1dGVTb3VyY2VFbnRyeVBhdGggPSBjb25jYXRlbmF0ZVBhdGhzKHByb2plY3RzRGlyZWN0b3J5UGF0aCwgc291cmNlRW50cnlQYXRoKSxcbiAgICAgICAgc291cmNlRW50cnlFeGlzdHMgPSBjaGVja0VudHJ5RXhpc3RzKGFic29sdXRlU291cmNlRW50cnlQYXRoKTtcblxuICBpZiAoIXNvdXJjZUVudHJ5RXhpc3RzKSB7XG4gICAgY29uc3QgdGFyZ2V0RW50cnlQYXRoID0gbnVsbDtcblxuICAgIE9iamVjdC5hc3NpZ24ocGF0aE1hcCwge1xuICAgICAgdGFyZ2V0RW50cnlQYXRoXG4gICAgfSk7XG5cbiAgICByZXR1cm47XG4gIH1cblxuICBjb25zdCB7IGVudHJ5RGlyZWN0b3J5IH0gPSBwYXRoTWFwO1xuXG4gIGVudHJ5RGlyZWN0b3J5ID9cbiAgICByZW5hbWVQcm9qZWN0RGlyZWN0b3J5KHByb2plY3RzRGlyZWN0b3J5UGF0aCwgcGF0aE1hcCkgOlxuICAgICAgcmVuYW1lUHJvamVjdEZpbGUocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBwYXRoTWFwKTtcbn1cblxuZnVuY3Rpb24gcmVuYW1lUHJvamVjdEZpbGUocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBwYXRoTWFwKSB7XG4gIGNvbnN0IHsgc291cmNlRW50cnlQYXRoLCB0YXJnZXRFbnRyeVBhdGggfSA9IHBhdGhNYXAsXG4gICAgICAgIHNvdXJjZUZpbGVQYXRoID0gc291cmNlRW50cnlQYXRoLCAvLy9cbiAgICAgICAgdGFyZ2V0RmlsZVBhdGggPSB0YXJnZXRFbnRyeVBhdGgsIC8vL1xuICAgICAgICBhYnNvbHV0ZVNvdXJjZUZpbGVQYXRoID0gY29uY2F0ZW5hdGVQYXRocyhwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIHNvdXJjZUZpbGVQYXRoKSxcbiAgICAgICAgYWJzb2x1dGVUYXJnZXRGaWxlUGF0aCA9IGNvbmNhdGVuYXRlUGF0aHMocHJvamVjdHNEaXJlY3RvcnlQYXRoLCB0YXJnZXRGaWxlUGF0aCk7XG5cbiAgdHJ5IHtcbiAgICBjb25zdCBvbGRFbnRyeVBhdGggPSBhYnNvbHV0ZVNvdXJjZUZpbGVQYXRoLCAvLy9cbiAgICAgICAgICBuZXdFbnRyeVBhdGggPSBhYnNvbHV0ZVRhcmdldEZpbGVQYXRoOyAvLy9cblxuICAgIG1vdmVFbnRyeShvbGRFbnRyeVBhdGgsIG5ld0VudHJ5UGF0aCk7ICAvLy9cbiAgfSBjYXRjaCAoZXJyb3IpIHtcbiAgICBjb25zdCBzb3VyY2VFbnRyeVBhdGggPSBudWxsO1xuXG4gICAgT2JqZWN0LmFzc2lnbihwYXRoTWFwLCB7XG4gICAgICBzb3VyY2VFbnRyeVBhdGhcbiAgICB9KTtcbiAgfVxufVxuXG5mdW5jdGlvbiByZW5hbWVQcm9qZWN0RGlyZWN0b3J5KHByb2plY3RzRGlyZWN0b3J5UGF0aCwgcGF0aE1hcCkge1xuICBjb25zdCB7IHNvdXJjZUVudHJ5UGF0aCwgdGFyZ2V0RW50cnlQYXRoIH0gPSBwYXRoTWFwLFxuICAgICAgICBzb3VyY2VEaXJlY3RvcnlQYXRoID0gc291cmNlRW50cnlQYXRoLCAvLy9cbiAgICAgICAgdGFyZ2V0RGlyZWN0b3J5UGF0aCA9IHRhcmdldEVudHJ5UGF0aCwgLy8vXG4gICAgICAgIGFic29sdXRlU291cmNlRGlyZWN0b3J5UGF0aCA9IGNvbmNhdGVuYXRlUGF0aHMocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBzb3VyY2VEaXJlY3RvcnlQYXRoKSxcbiAgICAgICAgYWJzb2x1dGVUYXJnZXREaXJlY3RvcnlQYXRoID0gY29uY2F0ZW5hdGVQYXRocyhwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIHRhcmdldERpcmVjdG9yeVBhdGgpO1xuXG4gIHRyeSB7XG4gICAgY29uc3Qgb2xkRW50cnlQYXRoID0gYWJzb2x1dGVTb3VyY2VEaXJlY3RvcnlQYXRoLCAvLy9cbiAgICAgICAgICBuZXdFbnRyeVBhdGggPSBhYnNvbHV0ZVRhcmdldERpcmVjdG9yeVBhdGg7IC8vL1xuXG4gICAgbW92ZUVudHJ5KG9sZEVudHJ5UGF0aCwgbmV3RW50cnlQYXRoKTsgIC8vL1xuICB9IGNhdGNoIChlcnJvcikge1xuICAgIGNvbnN0IHNvdXJjZUVudHJ5UGF0aCA9IG51bGw7XG5cbiAgICBPYmplY3QuYXNzaWduKHBhdGhNYXAsIHtcbiAgICAgIHNvdXJjZUVudHJ5UGF0aFxuICAgIH0pO1xuICB9XG59XG4iXSwibmFtZXMiOlsicmVuYW1lUHJvamVjdEVudHJpZXMiLCJyZW5hbWVQcm9qZWN0RW50cnkiLCJjb25jYXRlbmF0ZVBhdGhzIiwicGF0aFV0aWxpdGllcyIsIm1vdmVFbnRyeSIsImZpbGVTeXN0ZW1VdGlsaXRpZXMiLCJjaGVja0VudHJ5RXhpc3RzIiwicHJvamVjdHNEaXJlY3RvcnlQYXRoIiwianNvbiIsImNhbGxiYWNrIiwicGF0aE1hcHMiLCJmb3JFYWNoIiwicGF0aE1hcCIsInRhcmdldEVudHJ5UGF0aCIsImFic29sdXRlVGFyZ2V0RW50cnlQYXRoIiwidGFyZ2V0RW50cnlFeGlzdHMiLCJyZW1vdmVQcm9qZWN0RW50cnkiLCJzb3VyY2VFbnRyeVBhdGgiLCJhYnNvbHV0ZVNvdXJjZUVudHJ5UGF0aCIsInNvdXJjZUVudHJ5RXhpc3RzIiwiT2JqZWN0IiwiYXNzaWduIiwiZW50cnlEaXJlY3RvcnkiLCJyZW5hbWVQcm9qZWN0RGlyZWN0b3J5IiwicmVuYW1lUHJvamVjdEZpbGUiLCJzb3VyY2VGaWxlUGF0aCIsInRhcmdldEZpbGVQYXRoIiwiYWJzb2x1dGVTb3VyY2VGaWxlUGF0aCIsImFic29sdXRlVGFyZ2V0RmlsZVBhdGgiLCJvbGRFbnRyeVBhdGgiLCJuZXdFbnRyeVBhdGgiLCJlcnJvciIsInNvdXJjZURpcmVjdG9yeVBhdGgiLCJ0YXJnZXREaXJlY3RvcnlQYXRoIiwiYWJzb2x1dGVTb3VyY2VEaXJlY3RvcnlQYXRoIiwiYWJzb2x1dGVUYXJnZXREaXJlY3RvcnlQYXRoIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7SUFTQSxPQVlDO2VBWnVCQTs7SUFjUkMsa0JBQWtCO2VBQWxCQTs7O3lCQXJCbUM7b0NBRWhCO0FBRW5DLElBQU0sQUFBRUMsbUJBQXFCQyx3QkFBYSxDQUFsQ0Qsa0JBQ0FFLFlBQWdDQyw4QkFBbUIsQ0FBbkRELFdBQVdFLG1CQUFxQkQsOEJBQW1CLENBQXhDQztBQUVKLFNBQVNOLHFCQUFxQk8scUJBQXFCLEVBQUVDLElBQUksRUFBRUMsUUFBUTtJQUNoRixJQUFNLEFBQUVDLFdBQWFGLEtBQWJFO0lBRVJBLFNBQVNDLE9BQU8sQ0FBQyxTQUFDQztRQUNoQlgsbUJBQW1CTSx1QkFBdUJLO0lBQzVDO0lBRUFKLE9BQU87UUFDTEUsVUFBQUE7SUFDRjtJQUVBRCxTQUFTRDtBQUNYO0FBRU8sU0FBU1AsbUJBQW1CTSxxQkFBcUIsRUFBRUssT0FBTztJQUMvRCxJQUFNLEFBQUVDLGtCQUFvQkQsUUFBcEJDO0lBRVIsSUFBSUEsb0JBQW9CLE1BQU07UUFDNUI7SUFDRjtJQUVBLElBQU1DLDBCQUEwQlosaUJBQWlCSyx1QkFBdUJNLGtCQUNsRUUsb0JBQW9CVCxpQkFBaUJRO0lBRTNDLElBQUlDLG1CQUFtQjtRQUNyQkMsSUFBQUEsd0NBQWtCLEVBQUNULHVCQUF1Qks7UUFFMUM7SUFDRjtJQUVBLElBQU0sQUFBRUssa0JBQW9CTCxRQUFwQkssaUJBQ0ZDLDBCQUEwQmhCLGlCQUFpQkssdUJBQXVCVSxrQkFDbEVFLG9CQUFvQmIsaUJBQWlCWTtJQUUzQyxJQUFJLENBQUNDLG1CQUFtQjtRQUN0QixJQUFNTixtQkFBa0I7UUFFeEJPLE9BQU9DLE1BQU0sQ0FBQ1QsU0FBUztZQUNyQkMsaUJBQUFBO1FBQ0Y7UUFFQTtJQUNGO0lBRUEsSUFBTSxBQUFFUyxpQkFBbUJWLFFBQW5CVTtJQUVSQSxpQkFDRUMsdUJBQXVCaEIsdUJBQXVCSyxXQUM1Q1ksa0JBQWtCakIsdUJBQXVCSztBQUMvQztBQUVBLFNBQVNZLGtCQUFrQmpCLHFCQUFxQixFQUFFSyxPQUFPO0lBQ3ZELElBQVFLLGtCQUFxQ0wsUUFBckNLLGlCQUFpQkosa0JBQW9CRCxRQUFwQkMsaUJBQ25CWSxpQkFBaUJSLGlCQUNqQlMsaUJBQWlCYixpQkFDakJjLHlCQUF5QnpCLGlCQUFpQkssdUJBQXVCa0IsaUJBQ2pFRyx5QkFBeUIxQixpQkFBaUJLLHVCQUF1Qm1CO0lBRXZFLElBQUk7UUFDRixJQUFNRyxlQUFlRix3QkFDZkcsZUFBZUYsd0JBQXdCLEdBQUc7UUFFaER4QixVQUFVeUIsY0FBY0MsZUFBZ0IsR0FBRztJQUM3QyxFQUFFLE9BQU9DLE9BQU87UUFDZCxJQUFNZCxtQkFBa0I7UUFFeEJHLE9BQU9DLE1BQU0sQ0FBQ1QsU0FBUztZQUNyQkssaUJBQUFBO1FBQ0Y7SUFDRjtBQUNGO0FBRUEsU0FBU00sdUJBQXVCaEIscUJBQXFCLEVBQUVLLE9BQU87SUFDNUQsSUFBUUssa0JBQXFDTCxRQUFyQ0ssaUJBQWlCSixrQkFBb0JELFFBQXBCQyxpQkFDbkJtQixzQkFBc0JmLGlCQUN0QmdCLHNCQUFzQnBCLGlCQUN0QnFCLDhCQUE4QmhDLGlCQUFpQkssdUJBQXVCeUIsc0JBQ3RFRyw4QkFBOEJqQyxpQkFBaUJLLHVCQUF1QjBCO0lBRTVFLElBQUk7UUFDRixJQUFNSixlQUFlSyw2QkFDZkosZUFBZUssNkJBQTZCLEdBQUc7UUFFckQvQixVQUFVeUIsY0FBY0MsZUFBZ0IsR0FBRztJQUM3QyxFQUFFLE9BQU9DLE9BQU87UUFDZCxJQUFNZCxtQkFBa0I7UUFFeEJHLE9BQU9DLE1BQU0sQ0FBQ1QsU0FBUztZQUNyQkssaUJBQUFBO1FBQ0Y7SUFDRjtBQUNGIn0=
|
package/package.json
CHANGED
|
@@ -22,20 +22,35 @@ export default function moveProjectEntries(projectsDirectoryPath, json, callback
|
|
|
22
22
|
}
|
|
23
23
|
|
|
24
24
|
export function moveProjectEntry(projectsDirectoryPath, pathMap) {
|
|
25
|
-
const {
|
|
25
|
+
const { targetEntryPath } = pathMap;
|
|
26
26
|
|
|
27
|
-
if (
|
|
27
|
+
if (targetEntryPath === null) {
|
|
28
28
|
return;
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
-
const
|
|
31
|
+
const absoluteTargetEntryPath = concatenatePaths(projectsDirectoryPath, targetEntryPath),
|
|
32
|
+
targetEntryExists = checkEntryExists(absoluteTargetEntryPath);
|
|
32
33
|
|
|
33
|
-
if (
|
|
34
|
+
if (targetEntryExists) {
|
|
34
35
|
removeProjectEntry(projectsDirectoryPath, pathMap);
|
|
35
36
|
|
|
36
37
|
return;
|
|
37
38
|
}
|
|
38
39
|
|
|
40
|
+
const { sourceEntryPath } = pathMap,
|
|
41
|
+
absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath),
|
|
42
|
+
sourceEntryExists = checkEntryExists(absoluteSourceEntryPath);
|
|
43
|
+
|
|
44
|
+
if (!sourceEntryExists) {
|
|
45
|
+
const targetEntryPath = null;
|
|
46
|
+
|
|
47
|
+
Object.assign(pathMap, {
|
|
48
|
+
targetEntryPath
|
|
49
|
+
});
|
|
50
|
+
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
|
|
39
54
|
const { entryDirectory } = pathMap;
|
|
40
55
|
|
|
41
56
|
entryDirectory ?
|
|
@@ -26,6 +26,13 @@ export function removeProjectEntry(projectsDirectoryPath, pathMap) {
|
|
|
26
26
|
return;
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
+
const absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath),
|
|
30
|
+
sourceEntryExists = checkEntryExists(absoluteSourceEntryPath);
|
|
31
|
+
|
|
32
|
+
if (!sourceEntryExists) {
|
|
33
|
+
return;
|
|
34
|
+
}
|
|
35
|
+
|
|
29
36
|
const { entryDirectory } = pathMap;
|
|
30
37
|
|
|
31
38
|
entryDirectory ?
|
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
import { pathUtilities, fileSystemUtilities } from "necessary";
|
|
4
4
|
|
|
5
|
+
import { removeProjectEntry } from "./removeProjectEntries";
|
|
6
|
+
|
|
5
7
|
const { concatenatePaths } = pathUtilities,
|
|
6
8
|
{ moveEntry, checkEntryExists } = fileSystemUtilities;
|
|
7
9
|
|
|
@@ -30,11 +32,7 @@ export function renameProjectEntry(projectsDirectoryPath, pathMap) {
|
|
|
30
32
|
targetEntryExists = checkEntryExists(absoluteTargetEntryPath);
|
|
31
33
|
|
|
32
34
|
if (targetEntryExists) {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
Object.assign(pathMap, {
|
|
36
|
-
targetEntryPath
|
|
37
|
-
});
|
|
35
|
+
removeProjectEntry(projectsDirectoryPath, pathMap);
|
|
38
36
|
|
|
39
37
|
return;
|
|
40
38
|
}
|