occam-file-system 5.0.89 → 5.0.91

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.
Files changed (5) hide show
  1. package/lib/moveProjectEntries.js +30 -17
  2. package/lib/removeProjectEntries.js +28 -22
  3. package/package.json +1 -1
  4. package/src/moveProjectEntries.js +47 -28
  5. package/src/removeProjectEntries.js +41 -30
package/lib/moveProjectEntries.js CHANGED
@@ -42,44 +42,57 @@ function moveEntryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryP
42
42
  (0, _removeProjectEntries.removeEntryOperation)(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback);
43
43
  return;
44
44
  }
45
- if (sourceEntryPath === targetEntryPath) {
45
+ var absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath), entryDirectory = isEntryDirectory(absoluteSourceEntryPath);
46
+ entryDirectory ? moveDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) : moveFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback);
47
+ }
48
+ function moveFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {
49
+ var sourceFilePath = sourceEntryPath, targetFilePath = targetEntryPath; ///
50
+ if (sourceFilePath === targetFilePath) {
46
51
  callback(sourceEntryPath, targetEntryPath);
47
52
  return;
48
53
  }
49
- var absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath), sourceEntryExists = checkEntryExists(absoluteSourceEntryPath);
50
- if (!sourceEntryExists) {
51
- targetEntryPath = null;
54
+ var absoluteSourceFilePath = concatenatePaths(projectsDirectoryPath, sourceFilePath), sourceFileExists = checkEntryExists(absoluteSourceFilePath);
55
+ if (!sourceFileExists) {
56
+ sourceEntryPath = null;
52
57
  callback(sourceEntryPath, targetEntryPath);
53
58
  return;
54
59
  }
55
- var entryDirectory = isEntryDirectory(absoluteSourceEntryPath);
56
- entryDirectory ? moveDirectory(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) : moveFile(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback);
57
- }
58
- function moveFile(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {
59
- var sourceFilePath = sourceEntryPath, targetFilePath = targetEntryPath, absoluteSourceFilePath = concatenatePaths(projectsDirectoryPath, sourceFilePath), absoluteTargetFilePath = concatenatePaths(projectsDirectoryPath, targetFilePath), targetFileExists = checkEntryExists(absoluteTargetFilePath);
60
+ var absoluteTargetFilePath = concatenatePaths(projectsDirectoryPath, targetFilePath), targetFileExists = checkEntryExists(absoluteTargetFilePath);
60
61
  if (targetFileExists) {
61
- sourceEntryPath = null;
62
+ targetEntryPath = sourceEntryPath; ///
62
63
  callback(sourceEntryPath, targetEntryPath);
63
64
  return;
64
65
  }
65
66
  (0, _fsExtra.move)(absoluteSourceFilePath, absoluteTargetFilePath, function(error) {
66
67
  if (error) {
67
- sourceEntryPath = null;
68
+ targetEntryPath = sourceEntryPath; ///
68
69
  }
69
70
  callback(sourceEntryPath, targetEntryPath);
70
71
  });
71
72
  }
72
- function moveDirectory(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {
73
- var sourceDirectoryPath = sourceEntryPath, targetDirectoryPath = targetEntryPath, absoluteSourceDirectoryPath = concatenatePaths(projectsDirectoryPath, sourceDirectoryPath), absoluteTargetDirectoryPath = concatenatePaths(projectsDirectoryPath, targetDirectoryPath), targetDirectoryExists = checkEntryExists(absoluteTargetDirectoryPath), sourceDirectoryEmpty = isDirectoryEmpty(absoluteSourceDirectoryPath);
74
- if (!sourceDirectoryEmpty) {
73
+ function moveDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {
74
+ var sourceDirectoryPath = sourceEntryPath, targetDirectoryPath = targetEntryPath; //
75
+ if (sourceDirectoryPath === targetDirectoryPath) {
76
+ callback(sourceEntryPath, targetEntryPath);
77
+ return;
78
+ }
79
+ var absoluteSourceDirectoryPath = concatenatePaths(projectsDirectoryPath, sourceDirectoryPath), sourceDirectoryExists = checkEntryExists(absoluteSourceDirectoryPath);
80
+ if (!sourceDirectoryExists) {
75
81
  sourceEntryPath = null;
76
82
  callback(sourceEntryPath, targetEntryPath);
77
83
  return;
78
84
  }
85
+ var sourceDirectoryEmpty = isDirectoryEmpty(absoluteSourceDirectoryPath);
86
+ if (!sourceDirectoryEmpty) {
87
+ targetEntryPath = sourceEntryPath; ///
88
+ callback(sourceEntryPath, targetEntryPath);
89
+ return;
90
+ }
91
+ var absoluteTargetDirectoryPath = concatenatePaths(projectsDirectoryPath, targetDirectoryPath), targetDirectoryExists = checkEntryExists(absoluteTargetDirectoryPath);
79
92
  if (targetDirectoryExists) {
80
93
  (0, _fsExtra.remove)(absoluteSourceDirectoryPath, function(error) {
81
94
  if (error) {
82
- sourceEntryPath = null;
95
+ targetEntryPath = sourceEntryPath; ///
83
96
  }
84
97
  callback(sourceEntryPath, targetEntryPath);
85
98
  });
@@ -87,10 +100,10 @@ function moveDirectory(sourceEntryPath, targetEntryPath, projectsDirectoryPath,
87
100
  }
88
101
  (0, _fsExtra.move)(absoluteSourceDirectoryPath, absoluteTargetDirectoryPath, function(error) {
89
102
  if (error) {
90
- sourceEntryPath = null;
103
+ targetEntryPath = sourceEntryPath; ///
91
104
  }
92
105
  callback(sourceEntryPath, targetEntryPath);
93
106
  });
94
107
  }
95
108
 
96
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/moveProjectEntries.js"],"sourcesContent":["\"use strict\";\n\nimport { move, remove } from \"fs-extra\";\nimport { pathUtilities, fileSystemUtilities } from \"necessary\";\n\nimport { asynchronousForEach } from \"./utilities/pathMaps\";\nimport { removeEntryOperation } from \"./removeProjectEntries\";\n\nconst { concatenatePaths } = pathUtilities,\n      { checkEntryExists, isEntryDirectory, isDirectoryEmpty } = fileSystemUtilities;\n\nexport default function moveProjectEntries(projectsDirectoryPath, json, callback) {\n  const { pathMaps } = json,\n        sourceEntryPaths = [],\n\t\t    targetEntryPaths = [],\n        done = () => {\n          const json = {\n            sourceEntryPaths,\n            targetEntryPaths\n          };\n\n          callback(json);\n        };\n\n  asynchronousForEach(\n    pathMaps,\n    (sourceEntryPath, targetEntryPath, entryDirectory, next, done, index) => {\n      moveEntryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, (sourceEntryPath, targetEntryPath) => {\n        sourceEntryPaths.push(sourceEntryPath);\n        targetEntryPaths.push(targetEntryPath);\n\n        next();\n      });\n    },\n    done\n  );\n}\n\nexport function moveEntryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {\n  if (targetEntryPath === null) {\n    removeEntryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback);\n\n    return;\n  }\n\n  if (sourceEntryPath === targetEntryPath) {\n    callback(sourceEntryPath, targetEntryPath);\n\n    return;\n  }\n\n  const absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath),\n        sourceEntryExists = checkEntryExists(absoluteSourceEntryPath);\n\n  if (!sourceEntryExists) {\n    targetEntryPath = null;\n\n    callback(sourceEntryPath, targetEntryPath);\n\n    return;\n  }\n\n  const entryDirectory = isEntryDirectory(absoluteSourceEntryPath);\n\n  entryDirectory ?\n    moveDirectory(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) :\n      moveFile(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback);\n}\n\nfunction moveFile(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {\n  const sourceFilePath = sourceEntryPath,  ///\n        targetFilePath = targetEntryPath,  ///\n        absoluteSourceFilePath = concatenatePaths(projectsDirectoryPath, sourceFilePath),\n        absoluteTargetFilePath = concatenatePaths(projectsDirectoryPath, targetFilePath),\n        targetFileExists = checkEntryExists(absoluteTargetFilePath);\n\n  if (targetFileExists) {\n    sourceEntryPath = null;\n\n    callback(sourceEntryPath, targetEntryPath);\n\n    return;\n  }\n\n  move(absoluteSourceFilePath, absoluteTargetFilePath, (error) => {\n    if (error) {\n      sourceEntryPath = null;\n    }\n\n    callback(sourceEntryPath, targetEntryPath);\n  });\n}\n\nfunction moveDirectory(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {\n  const sourceDirectoryPath = sourceEntryPath, ///\n        targetDirectoryPath = targetEntryPath, //\n        absoluteSourceDirectoryPath = concatenatePaths(projectsDirectoryPath, sourceDirectoryPath),\n        absoluteTargetDirectoryPath = concatenatePaths(projectsDirectoryPath, targetDirectoryPath),\n        targetDirectoryExists = checkEntryExists(absoluteTargetDirectoryPath),\n        sourceDirectoryEmpty = isDirectoryEmpty(absoluteSourceDirectoryPath);\n\n  if (!sourceDirectoryEmpty) {\n    sourceEntryPath = null;\n\n    callback(sourceEntryPath, targetEntryPath);\n\n    return;\n  }\n\n  if (targetDirectoryExists) {\n    remove(absoluteSourceDirectoryPath, (error) => {\n      if (error) {\n        sourceEntryPath = null;\n      }\n\n      callback(sourceEntryPath, targetEntryPath);\n    });\n\n    return;\n  }\n\n  move(absoluteSourceDirectoryPath, absoluteTargetDirectoryPath, (error) => {\n    if (error) {\n      sourceEntryPath = null;\n    }\n\n    callback(sourceEntryPath, targetEntryPath);\n  });\n}\n"],"names":["moveProjectEntries","moveEntryOperation","concatenatePaths","pathUtilities","checkEntryExists","fileSystemUtilities","isEntryDirectory","isDirectoryEmpty","projectsDirectoryPath","json","callback","pathMaps","sourceEntryPaths","targetEntryPaths","done","asynchronousForEach","sourceEntryPath","targetEntryPath","entryDirectory","next","index","push","removeEntryOperation","absoluteSourceEntryPath","sourceEntryExists","moveDirectory","moveFile","sourceFilePath","targetFilePath","absoluteSourceFilePath","absoluteTargetFilePath","targetFileExists","move","error","sourceDirectoryPath","targetDirectoryPath","absoluteSourceDirectoryPath","absoluteTargetDirectoryPath","targetDirectoryExists","sourceDirectoryEmpty","remove"],"mappings":"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"}
109
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/moveProjectEntries.js"],"sourcesContent":["\"use strict\";\n\nimport { move, remove } from \"fs-extra\";\nimport { pathUtilities, fileSystemUtilities } from \"necessary\";\n\nimport { asynchronousForEach } from \"./utilities/pathMaps\";\nimport { removeEntryOperation } from \"./removeProjectEntries\";\n\nconst { concatenatePaths } = pathUtilities,\n      { checkEntryExists, isEntryDirectory, isDirectoryEmpty } = fileSystemUtilities;\n\nexport default function moveProjectEntries(projectsDirectoryPath, json, callback) {\n  const { pathMaps } = json,\n        sourceEntryPaths = [],\n\t\t    targetEntryPaths = [],\n        done = () => {\n          const json = {\n            sourceEntryPaths,\n            targetEntryPaths\n          };\n\n          callback(json);\n        };\n\n  asynchronousForEach(\n    pathMaps,\n    (sourceEntryPath, targetEntryPath, entryDirectory, next, done, index) => {\n      moveEntryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, (sourceEntryPath, targetEntryPath) => {\n        sourceEntryPaths.push(sourceEntryPath);\n        targetEntryPaths.push(targetEntryPath);\n\n        next();\n      });\n    },\n    done\n  );\n}\n\nexport function moveEntryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {\n  if (targetEntryPath === null) {\n    removeEntryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback);\n\n    return;\n  }\n\n  const absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath),\n        entryDirectory = isEntryDirectory(absoluteSourceEntryPath);\n\n  entryDirectory ?\n    moveDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) :\n      moveFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback);\n}\n\nfunction moveFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {\n  const sourceFilePath = sourceEntryPath,  ///\n        targetFilePath = targetEntryPath;  ///\n\n  if (sourceFilePath === targetFilePath) {\n    callback(sourceEntryPath, targetEntryPath);\n\n    return;\n  }\n\n  const absoluteSourceFilePath = concatenatePaths(projectsDirectoryPath, sourceFilePath),\n        sourceFileExists = checkEntryExists(absoluteSourceFilePath);\n\n  if (!sourceFileExists) {\n    sourceEntryPath = null;\n\n    callback(sourceEntryPath, targetEntryPath);\n\n    return;\n  }\n\n  const absoluteTargetFilePath = concatenatePaths(projectsDirectoryPath, targetFilePath),\n        targetFileExists = checkEntryExists(absoluteTargetFilePath);\n\n  if (targetFileExists) {\n    targetEntryPath = sourceEntryPath;  ///\n\n    callback(sourceEntryPath, targetEntryPath);\n\n    return;\n  }\n\n  move(absoluteSourceFilePath, absoluteTargetFilePath, (error) => {\n    if (error) {\n      targetEntryPath = sourceEntryPath;  ///\n    }\n\n    callback(sourceEntryPath, targetEntryPath);\n  });\n}\n\nfunction moveDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {\n  const sourceDirectoryPath = sourceEntryPath, ///\n        targetDirectoryPath = targetEntryPath; //\n\n  if (sourceDirectoryPath === targetDirectoryPath) {\n    callback(sourceEntryPath, targetEntryPath);\n\n    return;\n  }\n\n  const absoluteSourceDirectoryPath = concatenatePaths(projectsDirectoryPath, sourceDirectoryPath),\n        sourceDirectoryExists = checkEntryExists(absoluteSourceDirectoryPath);\n\n  if (!sourceDirectoryExists) {\n    sourceEntryPath = null;\n\n    callback(sourceEntryPath, targetEntryPath);\n\n    return;\n  }\n\n  const sourceDirectoryEmpty = isDirectoryEmpty(absoluteSourceDirectoryPath);\n\n  if (!sourceDirectoryEmpty) {\n    targetEntryPath = sourceEntryPath;  ///\n\n    callback(sourceEntryPath, targetEntryPath);\n\n    return;\n  }\n\n  const absoluteTargetDirectoryPath = concatenatePaths(projectsDirectoryPath, targetDirectoryPath),\n        targetDirectoryExists = checkEntryExists(absoluteTargetDirectoryPath);\n\n  if (targetDirectoryExists) {\n    remove(absoluteSourceDirectoryPath, (error) => {\n      if (error) {\n        targetEntryPath = sourceEntryPath;  ///\n      }\n\n      callback(sourceEntryPath, targetEntryPath);\n    });\n\n    return;\n  }\n\n  move(absoluteSourceDirectoryPath, absoluteTargetDirectoryPath, (error) => {\n    if (error) {\n      targetEntryPath = sourceEntryPath;  ///\n    }\n\n    callback(sourceEntryPath, targetEntryPath);\n  });\n}\n"],"names":["moveProjectEntries","moveEntryOperation","concatenatePaths","pathUtilities","checkEntryExists","fileSystemUtilities","isEntryDirectory","isDirectoryEmpty","projectsDirectoryPath","json","callback","pathMaps","sourceEntryPaths","targetEntryPaths","done","asynchronousForEach","sourceEntryPath","targetEntryPath","entryDirectory","next","index","push","removeEntryOperation","absoluteSourceEntryPath","moveDirectoryOperation","moveFileOperation","sourceFilePath","targetFilePath","absoluteSourceFilePath","sourceFileExists","absoluteTargetFilePath","targetFileExists","move","error","sourceDirectoryPath","targetDirectoryPath","absoluteSourceDirectoryPath","sourceDirectoryExists","sourceDirectoryEmpty","absoluteTargetDirectoryPath","targetDirectoryExists","remove"],"mappings":"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"}
package/lib/removeProjectEntries.js CHANGED
@@ -37,46 +37,52 @@ function removeProjectEntries(projectsDirectoryPath, json, callback) {
37
37
  }, done);
38
38
  }
39
39
  function removeEntryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {
40
- if (sourceEntryPath === targetEntryPath) {
40
+ var absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath), entryDirectory = isEntryDirectory(absoluteSourceEntryPath);
41
+ entryDirectory ? removeDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) : removeFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback);
42
+ }
43
+ function removeFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {
44
+ var sourceFilePath = sourceEntryPath, targetFilePath = targetEntryPath; ///
45
+ if (sourceFilePath === targetFilePath) {
41
46
  callback(sourceEntryPath, targetEntryPath);
42
47
  return;
43
48
  }
44
- var absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath), entryExists = checkEntryExists(absoluteSourceEntryPath);
45
- if (!entryExists) {
46
- targetEntryPath = null;
49
+ var absoluteSourceFilePath = concatenatePaths(projectsDirectoryPath, sourceFilePath), sourceFileExists = checkEntryExists(absoluteSourceFilePath);
50
+ if (!sourceFileExists) {
51
+ sourceEntryPath = null;
47
52
  callback(sourceEntryPath, targetEntryPath);
48
53
  return;
49
54
  }
50
- var entryDirectory = isEntryDirectory(absoluteSourceEntryPath);
51
- entryDirectory ? removeDirectory(sourceEntryPath, projectsDirectoryPath, callback) : removeFile(sourceEntryPath, projectsDirectoryPath, callback);
52
- }
53
- function removeFile(sourceEntryPath, projectsDirectoryPath, callback) {
54
- var absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath);
55
- (0, _fsExtra.remove)(absoluteSourceEntryPath, function(error) {
56
- var targetEntryPath = null;
55
+ (0, _fsExtra.remove)(absoluteSourceFilePath, function(error) {
57
56
  if (error) {
58
- sourceEntryPath = null;
59
- callback(sourceEntryPath, targetEntryPath);
60
- return;
57
+ targetEntryPath = sourceEntryPath; ///
61
58
  }
62
59
  callback(sourceEntryPath, targetEntryPath);
63
60
  });
64
61
  }
65
- function removeDirectory(sourceEntryPath, projectsDirectoryPath, callback) {
66
- var absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath), sourceDirectoryEmpty = isDirectoryEmpty(absoluteSourceEntryPath);
67
- if (!sourceDirectoryEmpty) {
68
- var targetEntryPath = null;
62
+ function removeDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {
63
+ var sourceDirectoryPath = sourceEntryPath, targetDirectoryPath = targetEntryPath; ///
64
+ if (sourceDirectoryPath === targetDirectoryPath) {
65
+ callback(sourceEntryPath, targetEntryPath);
66
+ return;
67
+ }
68
+ var absoluteSourceDirectoryPath = concatenatePaths(projectsDirectoryPath, sourceDirectoryPath), sourceDirectoryExists = checkEntryExists(absoluteSourceDirectoryPath);
69
+ if (!sourceDirectoryExists) {
69
70
  sourceEntryPath = null;
70
71
  callback(sourceEntryPath, targetEntryPath);
71
72
  return;
72
73
  }
73
- (0, _fsExtra.remove)(absoluteSourceEntryPath, function(error) {
74
- var targetEntryPath = null;
74
+ var sourceDirectoryEmpty = isDirectoryEmpty(absoluteSourceDirectoryPath);
75
+ if (!sourceDirectoryEmpty) {
76
+ targetEntryPath = sourceEntryPath; ///
77
+ callback(sourceEntryPath, targetEntryPath);
78
+ return;
79
+ }
80
+ (0, _fsExtra.remove)(absoluteSourceDirectoryPath, function(error) {
75
81
  if (error) {
76
- sourceEntryPath = null;
82
+ targetEntryPath = sourceEntryPath; ///
77
83
  }
78
84
  callback(sourceEntryPath, targetEntryPath);
79
85
  });
80
86
  }
81
87
 
82
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9yZW1vdmVQcm9qZWN0RW50cmllcy5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgcmVtb3ZlIH0gZnJvbSBcImZzLWV4dHJhXCI7XG5pbXBvcnQgeyBwYXRoVXRpbGl0aWVzLCBmaWxlU3lzdGVtVXRpbGl0aWVzIH0gZnJvbSBcIm5lY2Vzc2FyeVwiO1xuXG5pbXBvcnQgeyBhc3luY2hyb25vdXNGb3JFYWNoIH0gZnJvbSBcIi4vdXRpbGl0aWVzL3BhdGhNYXBzXCI7XG5cbmNvbnN0IHsgY29uY2F0ZW5hdGVQYXRocyB9ID0gcGF0aFV0aWxpdGllcyxcbiAgICAgIHsgY2hlY2tFbnRyeUV4aXN0cywgaXNFbnRyeURpcmVjdG9yeSwgaXNEaXJlY3RvcnlFbXB0eSB9ID0gZmlsZVN5c3RlbVV0aWxpdGllcztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gcmVtb3ZlUHJvamVjdEVudHJpZXMocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBqc29uLCBjYWxsYmFjaykge1xuICBjb25zdCB7IHBhdGhNYXBzIH0gPSBqc29uLFxuICAgICAgICBzb3VyY2VFbnRyeVBhdGhzID0gW10sXG5cdFx0ICAgIHRhcmdldEVudHJ5UGF0aHMgPSBbXSxcbiAgICAgICAgZG9uZSA9ICgpID0+IHtcbiAgICAgICAgICBjb25zdCBqc29uID0ge1xuICAgICAgICAgICAgc291cmNlRW50cnlQYXRocyxcbiAgICAgICAgICAgIHRhcmdldEVudHJ5UGF0aHNcbiAgICAgICAgICB9O1xuXG4gICAgICAgICAgY2FsbGJhY2soanNvbik7XG4gICAgICAgIH07XG5cbiAgYXN5bmNocm9ub3VzRm9yRWFjaChcbiAgICBwYXRoTWFwcyxcbiAgICAoc291cmNlRW50cnlQYXRoLCB0YXJnZXRFbnRyeVBhdGgsIGVudHJ5RGlyZWN0b3J5LCBuZXh0LCBkb25lLCBpbmRleCkgPT4ge1xuICAgICAgcmVtb3ZlRW50cnlPcGVyYXRpb24oc291cmNlRW50cnlQYXRoLCB0YXJnZXRFbnRyeVBhdGgsIHByb2plY3RzRGlyZWN0b3J5UGF0aCwgKHNvdXJjZUVudHJ5UGF0aCwgdGFyZ2V0RW50cnlQYXRoKSA9PiB7XG4gICAgICAgIHNvdXJjZUVudHJ5UGF0aHMucHVzaChzb3VyY2VFbnRyeVBhdGgpO1xuICAgICAgICB0YXJnZXRFbnRyeVBhdGhzLnB1c2godGFyZ2V0RW50cnlQYXRoKTtcblxuICAgICAgICBuZXh0KCk7XG4gICAgICB9KTtcbiAgICB9LFxuICAgIGRvbmVcbiAgKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHJlbW92ZUVudHJ5T3BlcmF0aW9uKHNvdXJjZUVudHJ5UGF0aCwgdGFyZ2V0RW50cnlQYXRoLCBwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIGNhbGxiYWNrKSB7XG4gIGlmIChzb3VyY2VFbnRyeVBhdGggPT09IHRhcmdldEVudHJ5UGF0aCkge1xuICAgIGNhbGxiYWNrKHNvdXJjZUVudHJ5UGF0aCwgdGFyZ2V0RW50cnlQYXRoKTtcblxuICAgIHJldHVybjtcbiAgfVxuXG4gIGNvbnN0IGFic29sdXRlU291cmNlRW50cnlQYXRoID0gY29uY2F0ZW5hdGVQYXRocyhwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIHNvdXJjZUVudHJ5UGF0aCksXG4gICAgICAgIGVudHJ5RXhpc3RzID0gY2hlY2tFbnRyeUV4aXN0cyhhYnNvbHV0ZVNvdXJjZUVudHJ5UGF0aCk7XG5cbiAgaWYgKCFlbnRyeUV4aXN0cykge1xuICAgIHRhcmdldEVudHJ5UGF0aCA9IG51bGw7XG5cbiAgICBjYWxsYmFjayhzb3VyY2VFbnRyeVBhdGgsIHRhcmdldEVudHJ5UGF0aCk7XG5cbiAgICByZXR1cm47XG4gIH1cblxuICBjb25zdCBlbnRyeURpcmVjdG9yeSA9IGlzRW50cnlEaXJlY3RvcnkoYWJzb2x1dGVTb3VyY2VFbnRyeVBhdGgpO1xuXG4gIGVudHJ5RGlyZWN0b3J5ID9cbiAgICByZW1vdmVEaXJlY3Rvcnkoc291cmNlRW50cnlQYXRoLCBwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIGNhbGxiYWNrKSA6XG4gICAgICByZW1vdmVGaWxlKHNvdXJjZUVudHJ5UGF0aCwgcHJvamVjdHNEaXJlY3RvcnlQYXRoLCBjYWxsYmFjayk7XG59XG5cbmZ1bmN0aW9uIHJlbW92ZUZpbGUoc291cmNlRW50cnlQYXRoLCBwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIGNhbGxiYWNrKSB7XG4gIGNvbnN0IGFic29sdXRlU291cmNlRW50cnlQYXRoID0gY29uY2F0ZW5hdGVQYXRocyhwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIHNvdXJjZUVudHJ5UGF0aCk7XG5cbiAgcmVtb3ZlKGFic29sdXRlU291cmNlRW50cnlQYXRoLCAoZXJyb3IpID0+IHtcbiAgICBjb25zdCB0YXJnZXRFbnRyeVBhdGggPSBudWxsO1xuXG4gICAgaWYgKGVycm9yKSB7XG4gICAgICBzb3VyY2VFbnRyeVBhdGggPSBudWxsO1xuXG4gICAgICBjYWxsYmFjayhzb3VyY2VFbnRyeVBhdGgsIHRhcmdldEVudHJ5UGF0aCk7XG5cbiAgICAgIHJldHVybjtcbiAgICB9XG5cbiAgICBjYWxsYmFjayhzb3VyY2VFbnRyeVBhdGgsIHRhcmdldEVudHJ5UGF0aCk7XG4gIH0pO1xufVxuXG5mdW5jdGlvbiByZW1vdmVEaXJlY3Rvcnkoc291cmNlRW50cnlQYXRoLCBwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIGNhbGxiYWNrKSB7XG4gIGNvbnN0IGFic29sdXRlU291cmNlRW50cnlQYXRoID0gY29uY2F0ZW5hdGVQYXRocyhwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIHNvdXJjZUVudHJ5UGF0aCksXG4gICAgICAgIHNvdXJjZURpcmVjdG9yeUVtcHR5ID0gaXNEaXJlY3RvcnlFbXB0eShhYnNvbHV0ZVNvdXJjZUVudHJ5UGF0aCk7XG5cbiAgaWYgKCFzb3VyY2VEaXJlY3RvcnlFbXB0eSkge1xuICAgIGNvbnN0IHRhcmdldEVudHJ5UGF0aCA9IG51bGw7XG5cbiAgICBzb3VyY2VFbnRyeVBhdGggPSBudWxsO1xuXG4gICAgY2FsbGJhY2soc291cmNlRW50cnlQYXRoLCB0YXJnZXRFbnRyeVBhdGgpO1xuXG4gICAgcmV0dXJuO1xuICB9XG5cbiAgcmVtb3ZlKGFic29sdXRlU291cmNlRW50cnlQYXRoLCAoZXJyb3IpID0+IHtcbiAgICBjb25zdCB0YXJnZXRFbnRyeVBhdGggPSBudWxsO1xuXG4gICAgaWYgKGVycm9yKSB7XG4gICAgICBzb3VyY2VFbnRyeVBhdGggPSBudWxsO1xuICAgIH1cblxuICAgIGNhbGxiYWNrKHNvdXJjZUVudHJ5UGF0aCwgdGFyZ2V0RW50cnlQYXRoKTtcbiAgfSk7XG59XG4iXSwibmFtZXMiOlsicmVtb3ZlUHJvamVjdEVudHJpZXMiLCJyZW1vdmVFbnRyeU9wZXJhdGlvbiIsImNvbmNhdGVuYXRlUGF0aHMiLCJwYXRoVXRpbGl0aWVzIiwiY2hlY2tFbnRyeUV4aXN0cyIsImZpbGVTeXN0ZW1VdGlsaXRpZXMiLCJpc0VudHJ5RGlyZWN0b3J5IiwiaXNEaXJlY3RvcnlFbXB0eSIsInByb2plY3RzRGlyZWN0b3J5UGF0aCIsImpzb24iLCJjYWxsYmFjayIsInBhdGhNYXBzIiwic291cmNlRW50cnlQYXRocyIsInRhcmdldEVudHJ5UGF0aHMiLCJkb25lIiwiYXN5bmNocm9ub3VzRm9yRWFjaCIsInNvdXJjZUVudHJ5UGF0aCIsInRhcmdldEVudHJ5UGF0aCIsImVudHJ5RGlyZWN0b3J5IiwibmV4dCIsImluZGV4IiwicHVzaCIsImFic29sdXRlU291cmNlRW50cnlQYXRoIiwiZW50cnlFeGlzdHMiLCJyZW1vdmVEaXJlY3RvcnkiLCJyZW1vdmVGaWxlIiwicmVtb3ZlIiwiZXJyb3IiLCJzb3VyY2VEaXJlY3RvcnlFbXB0eSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O0lBVUEsT0F5QkM7ZUF6QnVCQTs7SUEyQlJDLG9CQUFvQjtlQUFwQkE7Ozt1QkFuQ087eUJBQzRCO3dCQUVmO0FBRXBDLElBQU0sQUFBRUMsbUJBQXFCQyx3QkFBYSxDQUFsQ0Qsa0JBQ0FFLG1CQUF5REMsOEJBQW1CLENBQTVFRCxrQkFBa0JFLG1CQUF1Q0QsOEJBQW1CLENBQTFEQyxrQkFBa0JDLG1CQUFxQkYsOEJBQW1CLENBQXhDRTtBQUU3QixTQUFTUCxxQkFBcUJRLHFCQUFxQixFQUFFQyxJQUFJLEVBQUVDLFFBQVEsRUFBRTtJQUNsRixJQUFNLEFBQUVDLFdBQWFGLEtBQWJFLFVBQ0ZDLG1CQUFtQixFQUFFLEVBQ3ZCQyxtQkFBbUIsRUFBRSxFQUNuQkMsT0FBTyxXQUFNO1FBQ1gsSUFBTUwsU0FBTztZQUNYRyxrQkFBQUE7WUFDQUMsa0JBQUFBO1FBQ0Y7UUFFQUgsU0FBU0Q7SUFDWDtJQUVOTSxJQUFBQSw2QkFBbUIsRUFDakJKLFVBQ0EsU0FBQ0ssaUJBQWlCQyxpQkFBaUJDLGdCQUFnQkMsTUFBTUwsTUFBTU0sT0FBVTtRQUN2RW5CLHFCQUFxQmUsaUJBQWlCQyxpQkFBaUJULHVCQUF1QixTQUFDUSxpQkFBaUJDLGlCQUFvQjtZQUNsSEwsaUJBQWlCUyxJQUFJLENBQUNMO1lBQ3RCSCxpQkFBaUJRLElBQUksQ0FBQ0o7WUFFdEJFO1FBQ0Y7SUFDRixHQUNBTDtBQUVKO0FBRU8sU0FBU2IscUJBQXFCZSxlQUFlLEVBQUVDLGVBQWUsRUFBRVQscUJBQXFCLEVBQUVFLFFBQVEsRUFBRTtJQUN0RyxJQUFJTSxvQkFBb0JDLGlCQUFpQjtRQUN2Q1AsU0FBU00saUJBQWlCQztRQUUxQjtJQUNGLENBQUM7SUFFRCxJQUFNSywwQkFBMEJwQixpQkFBaUJNLHVCQUF1QlEsa0JBQ2xFTyxjQUFjbkIsaUJBQWlCa0I7SUFFckMsSUFBSSxDQUFDQyxhQUFhO1FBQ2hCTixrQkFBa0IsSUFBSTtRQUV0QlAsU0FBU00saUJBQWlCQztRQUUxQjtJQUNGLENBQUM7SUFFRCxJQUFNQyxpQkFBaUJaLGlCQUFpQmdCO0lBRXhDSixpQkFDRU0sZ0JBQWdCUixpQkFBaUJSLHVCQUF1QkUsWUFDdERlLFdBQVdULGlCQUFpQlIsdUJBQXVCRSxTQUFTO0FBQ2xFO0FBRUEsU0FBU2UsV0FBV1QsZUFBZSxFQUFFUixxQkFBcUIsRUFBRUUsUUFBUSxFQUFFO0lBQ3BFLElBQU1ZLDBCQUEwQnBCLGlCQUFpQk0sdUJBQXVCUTtJQUV4RVUsSUFBQUEsZUFBTSxFQUFDSix5QkFBeUIsU0FBQ0ssT0FBVTtRQUN6QyxJQUFNVixrQkFBa0IsSUFBSTtRQUU1QixJQUFJVSxPQUFPO1lBQ1RYLGtCQUFrQixJQUFJO1lBRXRCTixTQUFTTSxpQkFBaUJDO1lBRTFCO1FBQ0YsQ0FBQztRQUVEUCxTQUFTTSxpQkFBaUJDO0lBQzVCO0FBQ0Y7QUFFQSxTQUFTTyxnQkFBZ0JSLGVBQWUsRUFBRVIscUJBQXFCLEVBQUVFLFFBQVEsRUFBRTtJQUN6RSxJQUFNWSwwQkFBMEJwQixpQkFBaUJNLHVCQUF1QlEsa0JBQ2xFWSx1QkFBdUJyQixpQkFBaUJlO0lBRTlDLElBQUksQ0FBQ00sc0JBQXNCO1FBQ3pCLElBQU1YLGtCQUFrQixJQUFJO1FBRTVCRCxrQkFBa0IsSUFBSTtRQUV0Qk4sU0FBU00saUJBQWlCQztRQUUxQjtJQUNGLENBQUM7SUFFRFMsSUFBQUEsZUFBTSxFQUFDSix5QkFBeUIsU0FBQ0ssT0FBVTtRQUN6QyxJQUFNVixrQkFBa0IsSUFBSTtRQUU1QixJQUFJVSxPQUFPO1lBQ1RYLGtCQUFrQixJQUFJO1FBQ3hCLENBQUM7UUFFRE4sU0FBU00saUJBQWlCQztJQUM1QjtBQUNGIn0=
88
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/removeProjectEntries.js"],"sourcesContent":["\"use strict\";\n\nimport { remove } from \"fs-extra\";\nimport { pathUtilities, fileSystemUtilities } from \"necessary\";\n\nimport { asynchronousForEach } from \"./utilities/pathMaps\";\n\nconst { concatenatePaths } = pathUtilities,\n      { checkEntryExists, isEntryDirectory, isDirectoryEmpty } = fileSystemUtilities;\n\nexport default function removeProjectEntries(projectsDirectoryPath, json, callback) {\n  const { pathMaps } = json,\n        sourceEntryPaths = [],\n\t\t    targetEntryPaths = [],\n        done = () => {\n          const json = {\n            sourceEntryPaths,\n            targetEntryPaths\n          };\n\n          callback(json);\n        };\n\n  asynchronousForEach(\n    pathMaps,\n    (sourceEntryPath, targetEntryPath, entryDirectory, next, done, index) => {\n      removeEntryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, (sourceEntryPath, targetEntryPath) => {\n        sourceEntryPaths.push(sourceEntryPath);\n        targetEntryPaths.push(targetEntryPath);\n\n        next();\n      });\n    },\n    done\n  );\n}\n\nexport function removeEntryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {\n  const absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath),\n        entryDirectory = isEntryDirectory(absoluteSourceEntryPath);\n\n  entryDirectory ?\n    removeDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) :\n      removeFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback);\n}\n\nfunction removeFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {\n  const sourceFilePath = sourceEntryPath,  ///\n        targetFilePath = targetEntryPath;  ///\n\n  if (sourceFilePath === targetFilePath) {\n    callback(sourceEntryPath, targetEntryPath);\n\n    return;\n  }\n\n  const absoluteSourceFilePath = concatenatePaths(projectsDirectoryPath, sourceFilePath),\n        sourceFileExists = checkEntryExists(absoluteSourceFilePath);\n\n  if (!sourceFileExists) {\n    sourceEntryPath = null;\n\n    callback(sourceEntryPath, targetEntryPath);\n\n    return;\n  }\n\n  remove(absoluteSourceFilePath, (error) => {\n    if (error) {\n      targetEntryPath = sourceEntryPath;  ///\n    }\n\n    callback(sourceEntryPath, targetEntryPath);\n  });\n}\n\nfunction removeDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {\n  const sourceDirectoryPath = sourceEntryPath, ///\n        targetDirectoryPath = targetEntryPath; ///\n\n  if (sourceDirectoryPath === targetDirectoryPath) {\n    callback(sourceEntryPath, targetEntryPath);\n\n    return;\n  }\n\n  const absoluteSourceDirectoryPath = concatenatePaths(projectsDirectoryPath, sourceDirectoryPath),\n        sourceDirectoryExists = checkEntryExists(absoluteSourceDirectoryPath);\n\n  if (!sourceDirectoryExists) {\n    sourceEntryPath = null;\n\n    callback(sourceEntryPath, targetEntryPath);\n\n    return;\n  }\n\n  const sourceDirectoryEmpty = isDirectoryEmpty(absoluteSourceDirectoryPath);\n\n  if (!sourceDirectoryEmpty) {\n    targetEntryPath = sourceEntryPath;  ///\n\n    callback(sourceEntryPath, targetEntryPath);\n\n    return;\n  }\n\n  remove(absoluteSourceDirectoryPath, (error) => {\n    if (error) {\n      targetEntryPath = sourceEntryPath;  ///\n    }\n\n    callback(sourceEntryPath, targetEntryPath);\n  });\n}\n"],"names":["removeProjectEntries","removeEntryOperation","concatenatePaths","pathUtilities","checkEntryExists","fileSystemUtilities","isEntryDirectory","isDirectoryEmpty","projectsDirectoryPath","json","callback","pathMaps","sourceEntryPaths","targetEntryPaths","done","asynchronousForEach","sourceEntryPath","targetEntryPath","entryDirectory","next","index","push","absoluteSourceEntryPath","removeDirectoryOperation","removeFileOperation","sourceFilePath","targetFilePath","absoluteSourceFilePath","sourceFileExists","remove","error","sourceDirectoryPath","targetDirectoryPath","absoluteSourceDirectoryPath","sourceDirectoryExists","sourceDirectoryEmpty"],"mappings":"AAAA;;;;;;;;;;;IAUA,OAyBC;eAzBuBA;;IA2BRC,oBAAoB;eAApBA;;;uBAnCO;yBAC4B;wBAEf;AAEpC,IAAM,AAAEC,mBAAqBC,wBAAa,CAAlCD,kBACAE,mBAAyDC,8BAAmB,CAA5ED,kBAAkBE,mBAAuCD,8BAAmB,CAA1DC,kBAAkBC,mBAAqBF,8BAAmB,CAAxCE;AAE7B,SAASP,qBAAqBQ,qBAAqB,EAAEC,IAAI,EAAEC,QAAQ,EAAE;IAClF,IAAM,AAAEC,WAAaF,KAAbE,UACFC,mBAAmB,EAAE,EACvBC,mBAAmB,EAAE,EACnBC,OAAO,WAAM;QACX,IAAML,SAAO;YACXG,kBAAAA;YACAC,kBAAAA;QACF;QAEAH,SAASD;IACX;IAENM,IAAAA,6BAAmB,EACjBJ,UACA,SAACK,iBAAiBC,iBAAiBC,gBAAgBC,MAAML,MAAMM,OAAU;QACvEnB,qBAAqBe,iBAAiBC,iBAAiBT,uBAAuB,SAACQ,iBAAiBC,iBAAoB;YAClHL,iBAAiBS,IAAI,CAACL;YACtBH,iBAAiBQ,IAAI,CAACJ;YAEtBE;QACF;IACF,GACAL;AAEJ;AAEO,SAASb,qBAAqBe,eAAe,EAAEC,eAAe,EAAET,qBAAqB,EAAEE,QAAQ,EAAE;IACtG,IAAMY,0BAA0BpB,iBAAiBM,uBAAuBQ,kBAClEE,iBAAiBZ,iBAAiBgB;IAExCJ,iBACEK,yBAAyBP,iBAAiBC,iBAAiBT,uBAAuBE,YAChFc,oBAAoBR,iBAAiBC,iBAAiBT,uBAAuBE,SAAS;AAC5F;AAEA,SAASc,oBAAoBR,eAAe,EAAEC,eAAe,EAAET,qBAAqB,EAAEE,QAAQ,EAAE;IAC9F,IAAMe,iBAAiBT,iBACjBU,iBAAiBT,iBAAkB,GAAG;IAE5C,IAAIQ,mBAAmBC,gBAAgB;QACrChB,SAASM,iBAAiBC;QAE1B;IACF,CAAC;IAED,IAAMU,yBAAyBzB,iBAAiBM,uBAAuBiB,iBACjEG,mBAAmBxB,iBAAiBuB;IAE1C,IAAI,CAACC,kBAAkB;QACrBZ,kBAAkB,IAAI;QAEtBN,SAASM,iBAAiBC;QAE1B;IACF,CAAC;IAEDY,IAAAA,eAAM,EAACF,wBAAwB,SAACG,OAAU;QACxC,IAAIA,OAAO;YACTb,kBAAkBD,iBAAkB,GAAG;QACzC,CAAC;QAEDN,SAASM,iBAAiBC;IAC5B;AACF;AAEA,SAASM,yBAAyBP,eAAe,EAAEC,eAAe,EAAET,qBAAqB,EAAEE,QAAQ,EAAE;IACnG,IAAMqB,sBAAsBf,iBACtBgB,sBAAsBf,iBAAiB,GAAG;IAEhD,IAAIc,wBAAwBC,qBAAqB;QAC/CtB,SAASM,iBAAiBC;QAE1B;IACF,CAAC;IAED,IAAMgB,8BAA8B/B,iBAAiBM,uBAAuBuB,sBACtEG,wBAAwB9B,iBAAiB6B;IAE/C,IAAI,CAACC,uBAAuB;QAC1BlB,kBAAkB,IAAI;QAEtBN,SAASM,iBAAiBC;QAE1B;IACF,CAAC;IAED,IAAMkB,uBAAuB5B,iBAAiB0B;IAE9C,IAAI,CAACE,sBAAsB;QACzBlB,kBAAkBD,iBAAkB,GAAG;QAEvCN,SAASM,iBAAiBC;QAE1B;IACF,CAAC;IAEDY,IAAAA,eAAM,EAACI,6BAA6B,SAACH,OAAU;QAC7C,IAAIA,OAAO;YACTb,kBAAkBD,iBAAkB,GAAG;QACzC,CAAC;QAEDN,SAASM,iBAAiBC;IAC5B;AACF"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "occam-file-system",
3
3
  "author": "James Smith",
4
- "version": "5.0.89",
4
+ "version": "5.0.91",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-file-system",
7
7
  "description": "Occam's file system functionality.",
package/src/moveProjectEntries.js CHANGED
@@ -43,39 +43,40 @@ export function moveEntryOperation(sourceEntryPath, targetEntryPath, projectsDir
43
43
  return;
44
44
  }
45
45
 
46
- if (sourceEntryPath === targetEntryPath) {
46
+ const absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath),
47
+ entryDirectory = isEntryDirectory(absoluteSourceEntryPath);
48
+
49
+ entryDirectory ?
50
+ moveDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) :
51
+ moveFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback);
52
+ }
53
+
54
+ function moveFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {
55
+ const sourceFilePath = sourceEntryPath, ///
56
+ targetFilePath = targetEntryPath; ///
57
+
58
+ if (sourceFilePath === targetFilePath) {
47
59
  callback(sourceEntryPath, targetEntryPath);
48
60
 
49
61
  return;
50
62
  }
51
63
 
52
- const absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath),
53
- sourceEntryExists = checkEntryExists(absoluteSourceEntryPath);
64
+ const absoluteSourceFilePath = concatenatePaths(projectsDirectoryPath, sourceFilePath),
65
+ sourceFileExists = checkEntryExists(absoluteSourceFilePath);
54
66
 
55
- if (!sourceEntryExists) {
56
- targetEntryPath = null;
67
+ if (!sourceFileExists) {
68
+ sourceEntryPath = null;
57
69
 
58
70
  callback(sourceEntryPath, targetEntryPath);
59
71
 
60
72
  return;
61
73
  }
62
74
 
63
- const entryDirectory = isEntryDirectory(absoluteSourceEntryPath);
64
-
65
- entryDirectory ?
66
- moveDirectory(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) :
67
- moveFile(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback);
68
- }
69
-
70
- function moveFile(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {
71
- const sourceFilePath = sourceEntryPath, ///
72
- targetFilePath = targetEntryPath, ///
73
- absoluteSourceFilePath = concatenatePaths(projectsDirectoryPath, sourceFilePath),
74
- absoluteTargetFilePath = concatenatePaths(projectsDirectoryPath, targetFilePath),
75
+ const absoluteTargetFilePath = concatenatePaths(projectsDirectoryPath, targetFilePath),
75
76
  targetFileExists = checkEntryExists(absoluteTargetFilePath);
76
77
 
77
78
  if (targetFileExists) {
78
- sourceEntryPath = null;
79
+ targetEntryPath = sourceEntryPath; ///
79
80
 
80
81
  callback(sourceEntryPath, targetEntryPath);
81
82
 
@@ -84,22 +85,27 @@ function moveFile(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callb
84
85
 
85
86
  move(absoluteSourceFilePath, absoluteTargetFilePath, (error) => {
86
87
  if (error) {
87
- sourceEntryPath = null;
88
+ targetEntryPath = sourceEntryPath; ///
88
89
  }
89
90
 
90
91
  callback(sourceEntryPath, targetEntryPath);
91
92
  });
92
93
  }
93
94
 
94
- function moveDirectory(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {
95
+ function moveDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {
95
96
  const sourceDirectoryPath = sourceEntryPath, ///
96
- targetDirectoryPath = targetEntryPath, //
97
- absoluteSourceDirectoryPath = concatenatePaths(projectsDirectoryPath, sourceDirectoryPath),
98
- absoluteTargetDirectoryPath = concatenatePaths(projectsDirectoryPath, targetDirectoryPath),
99
- targetDirectoryExists = checkEntryExists(absoluteTargetDirectoryPath),
100
- sourceDirectoryEmpty = isDirectoryEmpty(absoluteSourceDirectoryPath);
97
+ targetDirectoryPath = targetEntryPath; //
101
98
 
102
- if (!sourceDirectoryEmpty) {
99
+ if (sourceDirectoryPath === targetDirectoryPath) {
100
+ callback(sourceEntryPath, targetEntryPath);
101
+
102
+ return;
103
+ }
104
+
105
+ const absoluteSourceDirectoryPath = concatenatePaths(projectsDirectoryPath, sourceDirectoryPath),
106
+ sourceDirectoryExists = checkEntryExists(absoluteSourceDirectoryPath);
107
+
108
+ if (!sourceDirectoryExists) {
103
109
  sourceEntryPath = null;
104
110
 
105
111
  callback(sourceEntryPath, targetEntryPath);
@@ -107,10 +113,23 @@ function moveDirectory(sourceEntryPath, targetEntryPath, projectsDirectoryPath,
107
113
  return;
108
114
  }
109
115
 
116
+ const sourceDirectoryEmpty = isDirectoryEmpty(absoluteSourceDirectoryPath);
117
+
118
+ if (!sourceDirectoryEmpty) {
119
+ targetEntryPath = sourceEntryPath; ///
120
+
121
+ callback(sourceEntryPath, targetEntryPath);
122
+
123
+ return;
124
+ }
125
+
126
+ const absoluteTargetDirectoryPath = concatenatePaths(projectsDirectoryPath, targetDirectoryPath),
127
+ targetDirectoryExists = checkEntryExists(absoluteTargetDirectoryPath);
128
+
110
129
  if (targetDirectoryExists) {
111
130
  remove(absoluteSourceDirectoryPath, (error) => {
112
131
  if (error) {
113
- sourceEntryPath = null;
132
+ targetEntryPath = sourceEntryPath; ///
114
133
  }
115
134
 
116
135
  callback(sourceEntryPath, targetEntryPath);
@@ -121,7 +140,7 @@ function moveDirectory(sourceEntryPath, targetEntryPath, projectsDirectoryPath,
121
140
 
122
141
  move(absoluteSourceDirectoryPath, absoluteTargetDirectoryPath, (error) => {
123
142
  if (error) {
124
- sourceEntryPath = null;
143
+ targetEntryPath = sourceEntryPath; ///
125
144
  }
126
145
 
127
146
  callback(sourceEntryPath, targetEntryPath);
package/src/removeProjectEntries.js CHANGED
@@ -36,67 +36,78 @@ export default function removeProjectEntries(projectsDirectoryPath, json, callba
36
36
  }
37
37
 
38
38
  export function removeEntryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {
39
- if (sourceEntryPath === targetEntryPath) {
39
+ const absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath),
40
+ entryDirectory = isEntryDirectory(absoluteSourceEntryPath);
41
+
42
+ entryDirectory ?
43
+ removeDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) :
44
+ removeFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback);
45
+ }
46
+
47
+ function removeFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {
48
+ const sourceFilePath = sourceEntryPath, ///
49
+ targetFilePath = targetEntryPath; ///
50
+
51
+ if (sourceFilePath === targetFilePath) {
40
52
  callback(sourceEntryPath, targetEntryPath);
41
53
 
42
54
  return;
43
55
  }
44
56
 
45
- const absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath),
46
- entryExists = checkEntryExists(absoluteSourceEntryPath);
57
+ const absoluteSourceFilePath = concatenatePaths(projectsDirectoryPath, sourceFilePath),
58
+ sourceFileExists = checkEntryExists(absoluteSourceFilePath);
47
59
 
48
- if (!entryExists) {
49
- targetEntryPath = null;
60
+ if (!sourceFileExists) {
61
+ sourceEntryPath = null;
50
62
 
51
63
  callback(sourceEntryPath, targetEntryPath);
52
64
 
53
65
  return;
54
66
  }
55
67
 
56
- const entryDirectory = isEntryDirectory(absoluteSourceEntryPath);
68
+ remove(absoluteSourceFilePath, (error) => {
69
+ if (error) {
70
+ targetEntryPath = sourceEntryPath; ///
71
+ }
57
72
 
58
- entryDirectory ?
59
- removeDirectory(sourceEntryPath, projectsDirectoryPath, callback) :
60
- removeFile(sourceEntryPath, projectsDirectoryPath, callback);
73
+ callback(sourceEntryPath, targetEntryPath);
74
+ });
61
75
  }
62
76
 
63
- function removeFile(sourceEntryPath, projectsDirectoryPath, callback) {
64
- const absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath);
77
+ function removeDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {
78
+ const sourceDirectoryPath = sourceEntryPath, ///
79
+ targetDirectoryPath = targetEntryPath; ///
65
80
 
66
- remove(absoluteSourceEntryPath, (error) => {
67
- const targetEntryPath = null;
81
+ if (sourceDirectoryPath === targetDirectoryPath) {
82
+ callback(sourceEntryPath, targetEntryPath);
68
83
 
69
- if (error) {
70
- sourceEntryPath = null;
84
+ return;
85
+ }
71
86
 
72
- callback(sourceEntryPath, targetEntryPath);
87
+ const absoluteSourceDirectoryPath = concatenatePaths(projectsDirectoryPath, sourceDirectoryPath),
88
+ sourceDirectoryExists = checkEntryExists(absoluteSourceDirectoryPath);
73
89
 
74
- return;
75
- }
90
+ if (!sourceDirectoryExists) {
91
+ sourceEntryPath = null;
76
92
 
77
93
  callback(sourceEntryPath, targetEntryPath);
78
- });
79
- }
80
94
 
81
- function removeDirectory(sourceEntryPath, projectsDirectoryPath, callback) {
82
- const absoluteSourceEntryPath = concatenatePaths(projectsDirectoryPath, sourceEntryPath),
83
- sourceDirectoryEmpty = isDirectoryEmpty(absoluteSourceEntryPath);
95
+ return;
96
+ }
84
97
 
85
- if (!sourceDirectoryEmpty) {
86
- const targetEntryPath = null;
98
+ const sourceDirectoryEmpty = isDirectoryEmpty(absoluteSourceDirectoryPath);
87
99
 
88
- sourceEntryPath = null;
100
+ if (!sourceDirectoryEmpty) {
101
+ targetEntryPath = sourceEntryPath; ///
89
102
 
90
103
  callback(sourceEntryPath, targetEntryPath);
91
104
 
92
105
  return;
93
106
  }
94
107
 
95
- remove(absoluteSourceEntryPath, (error) => {
96
- const targetEntryPath = null;
97
-
108
+ remove(absoluteSourceDirectoryPath, (error) => {
98
109
  if (error) {
99
- sourceEntryPath = null;
110
+ targetEntryPath = sourceEntryPath; ///
100
111
  }
101
112
 
102
113
  callback(sourceEntryPath, targetEntryPath);