occam-file-system 5.0.198 → 5.0.199

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.
@@ -18,24 +18,11 @@ _export(exports, {
18
18
  });
19
19
  var _fsextra = require("fs-extra");
20
20
  var _necessary = require("necessary");
21
- var last = _necessary.arrayUtilities.last, concatenatePaths = _necessary.pathUtilities.concatenatePaths, checkEntryExists = _necessary.fileSystemUtilities.checkEntryExists;
21
+ var _pathMaps = require("./utilities/pathMaps");
22
+ var concatenatePaths = _necessary.pathUtilities.concatenatePaths, checkEntryExists = _necessary.fileSystemUtilities.checkEntryExists;
22
23
  function renameProjectEntry(projectsDirectoryPath, json, callback) {
23
- var pathMaps = json.pathMaps, lastPathMap = last(pathMaps), pathMap = lastPathMap, sourceEntryPath = pathMap.sourceEntryPath, targetEntryPath = pathMap.targetEntryPath, entryDirectory = pathMap.entryDirectory;
24
- renameEntryOperation(sourceEntryPath, targetEntryPath, entryDirectory, projectsDirectoryPath, function(sourceEntryPath, targetEntryPath) {
25
- var entryMissing = sourceEntryPath === null, entryUnmoved = sourceEntryPath === targetEntryPath, targetEntryPaths = pathMaps.map(function(pathMap) {
26
- var _$targetEntryPath;
27
- var _$sourceEntryPath = pathMap.sourceEntryPath;
28
- if (false) {
29
- ///
30
- } else if (entryMissing) {
31
- _$targetEntryPath = null;
32
- } else if (entryUnmoved) {
33
- _$targetEntryPath = _$sourceEntryPath; ///
34
- } else {
35
- _$targetEntryPath = pathMap.targetEntryPath;
36
- }
37
- return _$targetEntryPath;
38
- });
24
+ var pathMaps = json.pathMaps;
25
+ renameEntries(pathMaps, projectsDirectoryPath, function(targetEntryPaths) {
39
26
  var _$json = {
40
27
  targetEntryPaths: targetEntryPaths
41
28
  };
@@ -51,6 +38,17 @@ function renameEntryOperation(sourceEntryPath, targetEntryPath, entryDirectory,
51
38
  }
52
39
  entryDirectory ? renameDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) : renameFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback);
53
40
  }
41
+ function renameEntries(pathMaps, projectsDirectoryPath, callback) {
42
+ var targetEntryPaths = [];
43
+ (0, _pathMaps.asynchronousForEach)(pathMaps, function(sourceEntryPath, targetEntryPath, entryDirectory, next, done, index) {
44
+ renameEntryOperation(sourceEntryPath, targetEntryPath, entryDirectory, projectsDirectoryPath, function(sourceEntryPath, targetEntryPath) {
45
+ targetEntryPaths.push(targetEntryPath);
46
+ next();
47
+ });
48
+ }, function() {
49
+ callback(targetEntryPaths);
50
+ });
51
+ }
54
52
  function renameFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {
55
53
  var sourceFilePath = sourceEntryPath, targetFilePath = targetEntryPath, absoluteSourceFilePath = concatenatePaths(projectsDirectoryPath, sourceFilePath), absoluteTargetFilePath = concatenatePaths(projectsDirectoryPath, targetFilePath), targetFileExists = checkEntryExists(absoluteTargetFilePath);
56
54
  if (targetFileExists) {
@@ -80,4 +78,4 @@ function renameDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDire
80
78
  });
81
79
  }
82
80
 
83
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/renameProjectEntry.js"],"sourcesContent":["\"use strict\";\n\nimport { move as rename } from \"fs-extra\";\nimport { arrayUtilities } from \"necessary\";\nimport { pathUtilities, fileSystemUtilities } from \"necessary\";\n\nconst { last } = arrayUtilities,\n      { concatenatePaths } = pathUtilities,\n      { checkEntryExists } = fileSystemUtilities;\n\nexport default function renameProjectEntry(projectsDirectoryPath, json, callback) {\n  const { pathMaps } = json,\n        lastPathMap = last(pathMaps),\n        pathMap = lastPathMap,  ///\n        { sourceEntryPath, targetEntryPath, entryDirectory } = pathMap;\n\n  renameEntryOperation(sourceEntryPath, targetEntryPath, entryDirectory, projectsDirectoryPath, (sourceEntryPath, targetEntryPath) => {\n    const entryMissing = (sourceEntryPath === null),\n          entryUnmoved = (sourceEntryPath === targetEntryPath),\n          targetEntryPaths = pathMaps.map((pathMap) => {\n            let targetEntryPath;\n\n            const { sourceEntryPath } = pathMap;\n\n            if (false) {\n              ///\n            } else if (entryMissing) {\n              targetEntryPath = null;\n            } else if (entryUnmoved) {\n              targetEntryPath = sourceEntryPath;  ///\n            } else {\n              ({ targetEntryPath } = pathMap);\n            }\n\n            return targetEntryPath;\n          });\n\n    const json = {\n      targetEntryPaths\n    };\n\n    callback(json);\n  });\n}\n\nexport function renameEntryOperation(sourceEntryPath, targetEntryPath, entryDirectory, projectsDirectoryPath, callback) {\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  entryDirectory ?\n    renameDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) :\n      renameFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback);\n}\n\nfunction renameFileOperation(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    targetEntryPath = sourceEntryPath;  ///\n\n    callback(sourceEntryPath, targetEntryPath);\n\n    return;\n  }\n\n  rename(absoluteSourceFilePath, absoluteTargetFilePath, (error) => {\n    if (error) {\n      targetEntryPath = sourceEntryPath;  ///\n    }\n\n    callback(sourceEntryPath, targetEntryPath);\n  });\n}\n\nfunction renameDirectoryOperation(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\n  if (targetDirectoryExists) {\n    targetEntryPath = sourceEntryPath;  ///\n\n    callback(sourceEntryPath, targetEntryPath);\n\n    return;\n  }\n\n  rename(absoluteSourceDirectoryPath, absoluteTargetDirectoryPath, (error) => {\n    if (error) {\n      targetEntryPath = sourceEntryPath;  ///\n    }\n\n    callback(sourceEntryPath, targetEntryPath);\n  });\n}\n"],"names":["renameProjectEntry","renameEntryOperation","last","arrayUtilities","concatenatePaths","pathUtilities","checkEntryExists","fileSystemUtilities","projectsDirectoryPath","json","callback","pathMaps","lastPathMap","pathMap","sourceEntryPath","targetEntryPath","entryDirectory","entryMissing","entryUnmoved","targetEntryPaths","map","absoluteSourceEntryPath","sourceEntryExists","renameDirectoryOperation","renameFileOperation","sourceFilePath","targetFilePath","absoluteSourceFilePath","absoluteTargetFilePath","targetFileExists","rename","error","sourceDirectoryPath","targetDirectoryPath","absoluteSourceDirectoryPath","absoluteTargetDirectoryPath","targetDirectoryExists"],"mappings":"AAAA;;;;;;;;;;;IAUA,OAiCC;eAjCuBA;;IAmCRC,oBAAoB;eAApBA;;;uBA3Ce;yBACA;AAG/B,IAAM,AAAEC,OAASC,yBAAc,CAAvBD,MACF,AAAEE,mBAAqBC,wBAAa,CAAlCD,kBACF,AAAEE,mBAAqBC,8BAAmB,CAAxCD;AAEO,SAASN,mBAAmBQ,qBAAqB,EAAEC,IAAI,EAAEC,QAAQ,EAAE;IAChF,IAAM,AAAEC,WAAaF,KAAbE,UACFC,cAAcV,KAAKS,WACnBE,UAAUD,aACRE,kBAAqDD,QAArDC,iBAAiBC,kBAAoCF,QAApCE,iBAAiBC,iBAAmBH,QAAnBG;IAE1Cf,qBAAqBa,iBAAiBC,iBAAiBC,gBAAgBR,uBAAuB,SAACM,iBAAiBC,iBAAoB;QAClI,IAAME,eAAgBH,oBAAoB,IAAI,EACxCI,eAAgBJ,oBAAoBC,iBACpCI,mBAAmBR,SAASS,GAAG,CAAC,SAACP,SAAY;YAC3C,IAAIE;YAEJ,IAAM,AAAED,oBAAoBD,QAApBC;YAER,IAAI,KAAK,EAAE;YACT,GAAG;YACL,OAAO,IAAIG,cAAc;gBACvBF,oBAAkB,IAAI;YACxB,OAAO,IAAIG,cAAc;gBACvBH,oBAAkBD,mBAAkB,GAAG;YACzC,OAAO;gBACFC,oBAAoBF,QAApBE;YACL,CAAC;YAED,OAAOA;QACT;QAEN,IAAMN,SAAO;YACXU,kBAAAA;QACF;QAEAT,SAASD;IACX;AACF;AAEO,SAASR,qBAAqBa,eAAe,EAAEC,eAAe,EAAEC,cAAc,EAAER,qBAAqB,EAAEE,QAAQ,EAAE;IACtH,IAAMW,0BAA0BjB,iBAAiBI,uBAAuBM,kBAClEQ,oBAAoBhB,iBAAiBe;IAE3C,IAAI,CAACC,mBAAmB;QACtBP,kBAAkB,IAAI;QAEtBL,SAASI,iBAAiBC;QAE1B;IACF,CAAC;IAEDC,iBACEO,yBAAyBT,iBAAiBC,iBAAiBP,uBAAuBE,YAChFc,oBAAoBV,iBAAiBC,iBAAiBP,uBAAuBE,SAAS;AAC5F;AAEA,SAASc,oBAAoBV,eAAe,EAAEC,eAAe,EAAEP,qBAAqB,EAAEE,QAAQ,EAAE;IAC9F,IAAMe,iBAAiBX,iBACjBY,iBAAiBX,iBACjBY,yBAAyBvB,iBAAiBI,uBAAuBiB,iBACjEG,yBAAyBxB,iBAAiBI,uBAAuBkB,iBACjEG,mBAAmBvB,iBAAiBsB;IAE1C,IAAIC,kBAAkB;QACpBd,kBAAkBD,iBAAkB,GAAG;QAEvCJ,SAASI,iBAAiBC;QAE1B;IACF,CAAC;IAEDe,IAAAA,aAAM,EAACH,wBAAwBC,wBAAwB,SAACG,OAAU;QAChE,IAAIA,OAAO;YACThB,kBAAkBD,iBAAkB,GAAG;QACzC,CAAC;QAEDJ,SAASI,iBAAiBC;IAC5B;AACF;AAEA,SAASQ,yBAAyBT,eAAe,EAAEC,eAAe,EAAEP,qBAAqB,EAAEE,QAAQ,EAAE;IACnG,IAAMsB,sBAAsBlB,iBACtBmB,sBAAsBlB,iBACtBmB,8BAA8B9B,iBAAiBI,uBAAuBwB,sBACtEG,8BAA8B/B,iBAAiBI,uBAAuByB,sBACtEG,wBAAwB9B,iBAAiB6B;IAE/C,IAAIC,uBAAuB;QACzBrB,kBAAkBD,iBAAkB,GAAG;QAEvCJ,SAASI,iBAAiBC;QAE1B;IACF,CAAC;IAEDe,IAAAA,aAAM,EAACI,6BAA6BC,6BAA6B,SAACJ,OAAU;QAC1E,IAAIA,OAAO;YACThB,kBAAkBD,iBAAkB,GAAG;QACzC,CAAC;QAEDJ,SAASI,iBAAiBC;IAC5B;AACF"}
81
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9yZW5hbWVQcm9qZWN0RW50cnkuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IG1vdmUgYXMgcmVuYW1lIH0gZnJvbSBcImZzLWV4dHJhXCI7XG5pbXBvcnQgeyBwYXRoVXRpbGl0aWVzLCBmaWxlU3lzdGVtVXRpbGl0aWVzIH0gZnJvbSBcIm5lY2Vzc2FyeVwiO1xuXG5pbXBvcnQgeyBhc3luY2hyb25vdXNGb3JFYWNoIH0gZnJvbSBcIi4vdXRpbGl0aWVzL3BhdGhNYXBzXCI7XG5cbmNvbnN0IHsgY29uY2F0ZW5hdGVQYXRocyB9ID0gcGF0aFV0aWxpdGllcyxcbiAgICAgIHsgY2hlY2tFbnRyeUV4aXN0cyB9ID0gZmlsZVN5c3RlbVV0aWxpdGllcztcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gcmVuYW1lUHJvamVjdEVudHJ5KHByb2plY3RzRGlyZWN0b3J5UGF0aCwganNvbiwgY2FsbGJhY2spIHtcbiAgY29uc3QgeyBwYXRoTWFwcyB9ID0ganNvbjtcblxuICByZW5hbWVFbnRyaWVzKHBhdGhNYXBzLCBwcm9qZWN0c0RpcmVjdG9yeVBhdGgsICh0YXJnZXRFbnRyeVBhdGhzKSA9PiB7XG4gICAgY29uc3QganNvbiA9IHtcbiAgICAgIHRhcmdldEVudHJ5UGF0aHNcbiAgICB9O1xuXG4gICAgY2FsbGJhY2soanNvbik7XG4gIH0pO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gcmVuYW1lRW50cnlPcGVyYXRpb24oc291cmNlRW50cnlQYXRoLCB0YXJnZXRFbnRyeVBhdGgsIGVudHJ5RGlyZWN0b3J5LCBwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIGNhbGxiYWNrKSB7XG4gIGNvbnN0IGFic29sdXRlU291cmNlRW50cnlQYXRoID0gY29uY2F0ZW5hdGVQYXRocyhwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIHNvdXJjZUVudHJ5UGF0aCksXG4gICAgICAgIHNvdXJjZUVudHJ5RXhpc3RzID0gY2hlY2tFbnRyeUV4aXN0cyhhYnNvbHV0ZVNvdXJjZUVudHJ5UGF0aCk7XG5cbiAgaWYgKCFzb3VyY2VFbnRyeUV4aXN0cykge1xuICAgIHRhcmdldEVudHJ5UGF0aCA9IG51bGw7XG5cbiAgICBjYWxsYmFjayhzb3VyY2VFbnRyeVBhdGgsIHRhcmdldEVudHJ5UGF0aCk7XG5cbiAgICByZXR1cm47XG4gIH1cblxuICBlbnRyeURpcmVjdG9yeSA/XG4gICAgcmVuYW1lRGlyZWN0b3J5T3BlcmF0aW9uKHNvdXJjZUVudHJ5UGF0aCwgdGFyZ2V0RW50cnlQYXRoLCBwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIGNhbGxiYWNrKSA6XG4gICAgICByZW5hbWVGaWxlT3BlcmF0aW9uKHNvdXJjZUVudHJ5UGF0aCwgdGFyZ2V0RW50cnlQYXRoLCBwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIGNhbGxiYWNrKTtcbn1cblxuZnVuY3Rpb24gcmVuYW1lRW50cmllcyhwYXRoTWFwcywgcHJvamVjdHNEaXJlY3RvcnlQYXRoLCBjYWxsYmFjaykge1xuICBjb25zdCB0YXJnZXRFbnRyeVBhdGhzID0gW107XG5cbiAgYXN5bmNocm9ub3VzRm9yRWFjaChcbiAgICBwYXRoTWFwcyxcbiAgICAoc291cmNlRW50cnlQYXRoLCB0YXJnZXRFbnRyeVBhdGgsIGVudHJ5RGlyZWN0b3J5LCBuZXh0LCBkb25lLCBpbmRleCkgPT4ge1xuICAgICAgcmVuYW1lRW50cnlPcGVyYXRpb24oc291cmNlRW50cnlQYXRoLCB0YXJnZXRFbnRyeVBhdGgsIGVudHJ5RGlyZWN0b3J5LCBwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIChzb3VyY2VFbnRyeVBhdGgsIHRhcmdldEVudHJ5UGF0aCkgPT4ge1xuICAgICAgICB0YXJnZXRFbnRyeVBhdGhzLnB1c2godGFyZ2V0RW50cnlQYXRoKTtcblxuICAgICAgICBuZXh0KCk7XG4gICAgICB9KTtcbiAgICB9LFxuICAgICgpID0+IHtcbiAgICAgIGNhbGxiYWNrKHRhcmdldEVudHJ5UGF0aHMpO1xuICAgIH1cbiAgKTtcbn1cblxuZnVuY3Rpb24gcmVuYW1lRmlsZU9wZXJhdGlvbihzb3VyY2VFbnRyeVBhdGgsIHRhcmdldEVudHJ5UGF0aCwgcHJvamVjdHNEaXJlY3RvcnlQYXRoLCBjYWxsYmFjaykge1xuICBjb25zdCBzb3VyY2VGaWxlUGF0aCA9IHNvdXJjZUVudHJ5UGF0aCwgLy8vXG4gICAgICAgIHRhcmdldEZpbGVQYXRoID0gdGFyZ2V0RW50cnlQYXRoLCAvLy9cbiAgICAgICAgYWJzb2x1dGVTb3VyY2VGaWxlUGF0aCA9IGNvbmNhdGVuYXRlUGF0aHMocHJvamVjdHNEaXJlY3RvcnlQYXRoLCBzb3VyY2VGaWxlUGF0aCksXG4gICAgICAgIGFic29sdXRlVGFyZ2V0RmlsZVBhdGggPSBjb25jYXRlbmF0ZVBhdGhzKHByb2plY3RzRGlyZWN0b3J5UGF0aCwgdGFyZ2V0RmlsZVBhdGgpLFxuICAgICAgICB0YXJnZXRGaWxlRXhpc3RzID0gY2hlY2tFbnRyeUV4aXN0cyhhYnNvbHV0ZVRhcmdldEZpbGVQYXRoKTtcblxuICBpZiAodGFyZ2V0RmlsZUV4aXN0cykge1xuICAgIHRhcmdldEVudHJ5UGF0aCA9IHNvdXJjZUVudHJ5UGF0aDsgIC8vL1xuXG4gICAgY2FsbGJhY2soc291cmNlRW50cnlQYXRoLCB0YXJnZXRFbnRyeVBhdGgpO1xuXG4gICAgcmV0dXJuO1xuICB9XG5cbiAgcmVuYW1lKGFic29sdXRlU291cmNlRmlsZVBhdGgsIGFic29sdXRlVGFyZ2V0RmlsZVBhdGgsIChlcnJvcikgPT4ge1xuICAgIGlmIChlcnJvcikge1xuICAgICAgdGFyZ2V0RW50cnlQYXRoID0gc291cmNlRW50cnlQYXRoOyAgLy8vXG4gICAgfVxuXG4gICAgY2FsbGJhY2soc291cmNlRW50cnlQYXRoLCB0YXJnZXRFbnRyeVBhdGgpO1xuICB9KTtcbn1cblxuZnVuY3Rpb24gcmVuYW1lRGlyZWN0b3J5T3BlcmF0aW9uKHNvdXJjZUVudHJ5UGF0aCwgdGFyZ2V0RW50cnlQYXRoLCBwcm9qZWN0c0RpcmVjdG9yeVBhdGgsIGNhbGxiYWNrKSB7XG4gIGNvbnN0IHNvdXJjZURpcmVjdG9yeVBhdGggPSBzb3VyY2VFbnRyeVBhdGgsICAvLy9cbiAgICAgICAgdGFyZ2V0RGlyZWN0b3J5UGF0aCA9IHRhcmdldEVudHJ5UGF0aCwgIC8vL1xuICAgICAgICBhYnNvbHV0ZVNvdXJjZURpcmVjdG9yeVBhdGggPSBjb25jYXRlbmF0ZVBhdGhzKHByb2plY3RzRGlyZWN0b3J5UGF0aCwgc291cmNlRGlyZWN0b3J5UGF0aCksXG4gICAgICAgIGFic29sdXRlVGFyZ2V0RGlyZWN0b3J5UGF0aCA9IGNvbmNhdGVuYXRlUGF0aHMocHJvamVjdHNEaXJlY3RvcnlQYXRoLCB0YXJnZXREaXJlY3RvcnlQYXRoKSxcbiAgICAgICAgdGFyZ2V0RGlyZWN0b3J5RXhpc3RzID0gY2hlY2tFbnRyeUV4aXN0cyhhYnNvbHV0ZVRhcmdldERpcmVjdG9yeVBhdGgpO1xuXG4gIGlmICh0YXJnZXREaXJlY3RvcnlFeGlzdHMpIHtcbiAgICB0YXJnZXRFbnRyeVBhdGggPSBzb3VyY2VFbnRyeVBhdGg7ICAvLy9cblxuICAgIGNhbGxiYWNrKHNvdXJjZUVudHJ5UGF0aCwgdGFyZ2V0RW50cnlQYXRoKTtcblxuICAgIHJldHVybjtcbiAgfVxuXG4gIHJlbmFtZShhYnNvbHV0ZVNvdXJjZURpcmVjdG9yeVBhdGgsIGFic29sdXRlVGFyZ2V0RGlyZWN0b3J5UGF0aCwgKGVycm9yKSA9PiB7XG4gICAgaWYgKGVycm9yKSB7XG4gICAgICB0YXJnZXRFbnRyeVBhdGggPSBzb3VyY2VFbnRyeVBhdGg7ICAvLy9cbiAgICB9XG5cbiAgICBjYWxsYmFjayhzb3VyY2VFbnRyeVBhdGgsIHRhcmdldEVudHJ5UGF0aCk7XG4gIH0pO1xufVxuIl0sIm5hbWVzIjpbInJlbmFtZVByb2plY3RFbnRyeSIsInJlbmFtZUVudHJ5T3BlcmF0aW9uIiwiY29uY2F0ZW5hdGVQYXRocyIsInBhdGhVdGlsaXRpZXMiLCJjaGVja0VudHJ5RXhpc3RzIiwiZmlsZVN5c3RlbVV0aWxpdGllcyIsInByb2plY3RzRGlyZWN0b3J5UGF0aCIsImpzb24iLCJjYWxsYmFjayIsInBhdGhNYXBzIiwicmVuYW1lRW50cmllcyIsInRhcmdldEVudHJ5UGF0aHMiLCJzb3VyY2VFbnRyeVBhdGgiLCJ0YXJnZXRFbnRyeVBhdGgiLCJlbnRyeURpcmVjdG9yeSIsImFic29sdXRlU291cmNlRW50cnlQYXRoIiwic291cmNlRW50cnlFeGlzdHMiLCJyZW5hbWVEaXJlY3RvcnlPcGVyYXRpb24iLCJyZW5hbWVGaWxlT3BlcmF0aW9uIiwiYXN5bmNocm9ub3VzRm9yRWFjaCIsIm5leHQiLCJkb25lIiwiaW5kZXgiLCJwdXNoIiwic291cmNlRmlsZVBhdGgiLCJ0YXJnZXRGaWxlUGF0aCIsImFic29sdXRlU291cmNlRmlsZVBhdGgiLCJhYnNvbHV0ZVRhcmdldEZpbGVQYXRoIiwidGFyZ2V0RmlsZUV4aXN0cyIsInJlbmFtZSIsImVycm9yIiwic291cmNlRGlyZWN0b3J5UGF0aCIsInRhcmdldERpcmVjdG9yeVBhdGgiLCJhYnNvbHV0ZVNvdXJjZURpcmVjdG9yeVBhdGgiLCJhYnNvbHV0ZVRhcmdldERpcmVjdG9yeVBhdGgiLCJ0YXJnZXREaXJlY3RvcnlFeGlzdHMiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztJQVVBLE9BVUM7ZUFWdUJBOztJQVlSQyxvQkFBb0I7ZUFBcEJBOzs7dUJBcEJlO3lCQUNvQjt3QkFFZjtBQUVwQyxJQUFNLEFBQUVDLG1CQUFxQkMsd0JBQWEsQ0FBbENELGtCQUNGLEFBQUVFLG1CQUFxQkMsOEJBQW1CLENBQXhDRDtBQUVPLFNBQVNKLG1CQUFtQk0scUJBQXFCLEVBQUVDLElBQUksRUFBRUMsUUFBUSxFQUFFO0lBQ2hGLElBQU0sQUFBRUMsV0FBYUYsS0FBYkU7SUFFUkMsY0FBY0QsVUFBVUgsdUJBQXVCLFNBQUNLLGtCQUFxQjtRQUNuRSxJQUFNSixTQUFPO1lBQ1hJLGtCQUFBQTtRQUNGO1FBRUFILFNBQVNEO0lBQ1g7QUFDRjtBQUVPLFNBQVNOLHFCQUFxQlcsZUFBZSxFQUFFQyxlQUFlLEVBQUVDLGNBQWMsRUFBRVIscUJBQXFCLEVBQUVFLFFBQVEsRUFBRTtJQUN0SCxJQUFNTywwQkFBMEJiLGlCQUFpQkksdUJBQXVCTSxrQkFDbEVJLG9CQUFvQlosaUJBQWlCVztJQUUzQyxJQUFJLENBQUNDLG1CQUFtQjtRQUN0Qkgsa0JBQWtCLElBQUk7UUFFdEJMLFNBQVNJLGlCQUFpQkM7UUFFMUI7SUFDRixDQUFDO0lBRURDLGlCQUNFRyx5QkFBeUJMLGlCQUFpQkMsaUJBQWlCUCx1QkFBdUJFLFlBQ2hGVSxvQkFBb0JOLGlCQUFpQkMsaUJBQWlCUCx1QkFBdUJFLFNBQVM7QUFDNUY7QUFFQSxTQUFTRSxjQUFjRCxRQUFRLEVBQUVILHFCQUFxQixFQUFFRSxRQUFRLEVBQUU7SUFDaEUsSUFBTUcsbUJBQW1CLEVBQUU7SUFFM0JRLElBQUFBLDZCQUFtQixFQUNqQlYsVUFDQSxTQUFDRyxpQkFBaUJDLGlCQUFpQkMsZ0JBQWdCTSxNQUFNQyxNQUFNQyxPQUFVO1FBQ3ZFckIscUJBQXFCVyxpQkFBaUJDLGlCQUFpQkMsZ0JBQWdCUix1QkFBdUIsU0FBQ00saUJBQWlCQyxpQkFBb0I7WUFDbElGLGlCQUFpQlksSUFBSSxDQUFDVjtZQUV0Qk87UUFDRjtJQUNGLEdBQ0EsV0FBTTtRQUNKWixTQUFTRztJQUNYO0FBRUo7QUFFQSxTQUFTTyxvQkFBb0JOLGVBQWUsRUFBRUMsZUFBZSxFQUFFUCxxQkFBcUIsRUFBRUUsUUFBUSxFQUFFO0lBQzlGLElBQU1nQixpQkFBaUJaLGlCQUNqQmEsaUJBQWlCWixpQkFDakJhLHlCQUF5QnhCLGlCQUFpQkksdUJBQXVCa0IsaUJBQ2pFRyx5QkFBeUJ6QixpQkFBaUJJLHVCQUF1Qm1CLGlCQUNqRUcsbUJBQW1CeEIsaUJBQWlCdUI7SUFFMUMsSUFBSUMsa0JBQWtCO1FBQ3BCZixrQkFBa0JELGlCQUFrQixHQUFHO1FBRXZDSixTQUFTSSxpQkFBaUJDO1FBRTFCO0lBQ0YsQ0FBQztJQUVEZ0IsSUFBQUEsYUFBTSxFQUFDSCx3QkFBd0JDLHdCQUF3QixTQUFDRyxPQUFVO1FBQ2hFLElBQUlBLE9BQU87WUFDVGpCLGtCQUFrQkQsaUJBQWtCLEdBQUc7UUFDekMsQ0FBQztRQUVESixTQUFTSSxpQkFBaUJDO0lBQzVCO0FBQ0Y7QUFFQSxTQUFTSSx5QkFBeUJMLGVBQWUsRUFBRUMsZUFBZSxFQUFFUCxxQkFBcUIsRUFBRUUsUUFBUSxFQUFFO0lBQ25HLElBQU11QixzQkFBc0JuQixpQkFDdEJvQixzQkFBc0JuQixpQkFDdEJvQiw4QkFBOEIvQixpQkFBaUJJLHVCQUF1QnlCLHNCQUN0RUcsOEJBQThCaEMsaUJBQWlCSSx1QkFBdUIwQixzQkFDdEVHLHdCQUF3Qi9CLGlCQUFpQjhCO0lBRS9DLElBQUlDLHVCQUF1QjtRQUN6QnRCLGtCQUFrQkQsaUJBQWtCLEdBQUc7UUFFdkNKLFNBQVNJLGlCQUFpQkM7UUFFMUI7SUFDRixDQUFDO0lBRURnQixJQUFBQSxhQUFNLEVBQUNJLDZCQUE2QkMsNkJBQTZCLFNBQUNKLE9BQVU7UUFDMUUsSUFBSUEsT0FBTztZQUNUakIsa0JBQWtCRCxpQkFBa0IsR0FBRztRQUN6QyxDQUFDO1FBRURKLFNBQVNJLGlCQUFpQkM7SUFDNUI7QUFDRiJ9
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.198",
4
+ "version": "5.0.199",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-file-system",
7
7
  "description": "Occam's file system functionality.",
@@ -1,40 +1,17 @@
1
1
  "use strict";
2
2
 
3
3
  import { move as rename } from "fs-extra";
4
- import { arrayUtilities } from "necessary";
5
4
  import { pathUtilities, fileSystemUtilities } from "necessary";
6
5
 
7
- const { last } = arrayUtilities,
8
- { concatenatePaths } = pathUtilities,
6
+ import { asynchronousForEach } from "./utilities/pathMaps";
7
+
8
+ const { concatenatePaths } = pathUtilities,
9
9
  { checkEntryExists } = fileSystemUtilities;
10
10
 
11
11
  export default function renameProjectEntry(projectsDirectoryPath, json, callback) {
12
- const { pathMaps } = json,
13
- lastPathMap = last(pathMaps),
14
- pathMap = lastPathMap, ///
15
- { sourceEntryPath, targetEntryPath, entryDirectory } = pathMap;
16
-
17
- renameEntryOperation(sourceEntryPath, targetEntryPath, entryDirectory, projectsDirectoryPath, (sourceEntryPath, targetEntryPath) => {
18
- const entryMissing = (sourceEntryPath === null),
19
- entryUnmoved = (sourceEntryPath === targetEntryPath),
20
- targetEntryPaths = pathMaps.map((pathMap) => {
21
- let targetEntryPath;
22
-
23
- const { sourceEntryPath } = pathMap;
24
-
25
- if (false) {
26
- ///
27
- } else if (entryMissing) {
28
- targetEntryPath = null;
29
- } else if (entryUnmoved) {
30
- targetEntryPath = sourceEntryPath; ///
31
- } else {
32
- ({ targetEntryPath } = pathMap);
33
- }
34
-
35
- return targetEntryPath;
36
- });
12
+ const { pathMaps } = json;
37
13
 
14
+ renameEntries(pathMaps, projectsDirectoryPath, (targetEntryPaths) => {
38
15
  const json = {
39
16
  targetEntryPaths
40
17
  };
@@ -60,6 +37,24 @@ export function renameEntryOperation(sourceEntryPath, targetEntryPath, entryDire
60
37
  renameFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback);
61
38
  }
62
39
 
40
+ function renameEntries(pathMaps, projectsDirectoryPath, callback) {
41
+ const targetEntryPaths = [];
42
+
43
+ asynchronousForEach(
44
+ pathMaps,
45
+ (sourceEntryPath, targetEntryPath, entryDirectory, next, done, index) => {
46
+ renameEntryOperation(sourceEntryPath, targetEntryPath, entryDirectory, projectsDirectoryPath, (sourceEntryPath, targetEntryPath) => {
47
+ targetEntryPaths.push(targetEntryPath);
48
+
49
+ next();
50
+ });
51
+ },
52
+ () => {
53
+ callback(targetEntryPaths);
54
+ }
55
+ );
56
+ }
57
+
63
58
  function renameFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {
64
59
  const sourceFilePath = sourceEntryPath, ///
65
60
  targetFilePath = targetEntryPath, ///