occam-file-system 5.0.221 → 5.0.225
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/editProjectEntries.js +13 -3
- package/package.json +2 -2
- package/src/editProjectEntries.js +18 -4
|
@@ -64,12 +64,22 @@ function editFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPa
|
|
|
64
64
|
});
|
|
65
65
|
}
|
|
66
66
|
function editDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {
|
|
67
|
-
var sourceDirectoryPath = sourceEntryPath, targetDirectoryPath = targetEntryPath, absoluteSourceDirectoryPath = concatenatePaths(projectsDirectoryPath, sourceDirectoryPath),
|
|
68
|
-
if (
|
|
67
|
+
var sourceDirectoryPath = sourceEntryPath, targetDirectoryPath = targetEntryPath, absoluteSourceDirectoryPath = concatenatePaths(projectsDirectoryPath, sourceDirectoryPath), sourceDirectoryEmpty = isDirectoryEmpty(absoluteSourceDirectoryPath);
|
|
68
|
+
if (!sourceDirectoryEmpty) {
|
|
69
69
|
targetEntryPath = sourceEntryPath; ///
|
|
70
70
|
callback(sourceEntryPath, targetEntryPath);
|
|
71
71
|
return;
|
|
72
72
|
}
|
|
73
|
+
var absoluteTargetDirectoryPath = concatenatePaths(projectsDirectoryPath, targetDirectoryPath), targetDirectoryExists = checkEntryExists(absoluteTargetDirectoryPath);
|
|
74
|
+
if (targetDirectoryExists) {
|
|
75
|
+
(0, _fsextra.remove)(absoluteSourceDirectoryPath, function(error) {
|
|
76
|
+
if (error) {
|
|
77
|
+
targetEntryPath = sourceEntryPath; ///
|
|
78
|
+
}
|
|
79
|
+
callback(sourceEntryPath, targetEntryPath);
|
|
80
|
+
});
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
73
83
|
(0, _fsextra.move)(absoluteSourceDirectoryPath, absoluteTargetDirectoryPath, function(error) {
|
|
74
84
|
if (error) {
|
|
75
85
|
targetEntryPath = sourceEntryPath; ///
|
|
@@ -78,4 +88,4 @@ function editDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirect
|
|
|
78
88
|
});
|
|
79
89
|
}
|
|
80
90
|
|
|
81
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
91
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/editProjectEntries.js"],"sourcesContent":["\"use strict\";\n\nimport { move as edit, remove } from \"fs-extra\";\nimport { pathUtilities, fileSystemUtilities } from \"necessary\";\n\nimport { asynchronousForEach } from \"./utilities/pathMaps\";\n\nconst { concatenatePaths } = pathUtilities,\n      { checkEntryExists } = fileSystemUtilities;\n\nexport default function editProjectEntries(projectsDirectoryPath, json, callback) {\n  const { pathMaps } = json;\n\n  editEntries(pathMaps, projectsDirectoryPath, (targetEntryPaths) => {\n    const json = {\n      targetEntryPaths\n    };\n\n    callback(json);\n  });\n}\n\nexport function editEntryOperation(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    editDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) :\n      editFileOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback);\n}\n\nfunction editEntries(pathMaps, projectsDirectoryPath, callback) {\n  const targetEntryPaths = [];\n\n  asynchronousForEach(\n    pathMaps,\n    (sourceEntryPath, targetEntryPath, entryDirectory, next, done, index) => {\n      editEntryOperation(sourceEntryPath, targetEntryPath, entryDirectory, projectsDirectoryPath, (sourceEntryPath, targetEntryPath) => {\n        targetEntryPaths.push(targetEntryPath);\n\n        next();\n      });\n    },\n    () => {\n      callback(targetEntryPaths);\n    }\n  );\n}\n\nfunction editFileOperation(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  edit(absoluteSourceFilePath, absoluteTargetFilePath, (error) => {\n    if (error) {\n      targetEntryPath = sourceEntryPath;  ///\n    }\n\n    callback(sourceEntryPath, targetEntryPath);\n  });\n}\n\nfunction editDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirectoryPath, callback) {\n  const sourceDirectoryPath = sourceEntryPath,  ///\n        targetDirectoryPath = targetEntryPath,  ///\n        absoluteSourceDirectoryPath = concatenatePaths(projectsDirectoryPath, sourceDirectoryPath),\n        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  edit(absoluteSourceDirectoryPath, absoluteTargetDirectoryPath, (error) => {\n    if (error) {\n      targetEntryPath = sourceEntryPath;  ///\n    }\n\n    callback(sourceEntryPath, targetEntryPath);\n  });\n}\n"],"names":["editProjectEntries","editEntryOperation","concatenatePaths","pathUtilities","checkEntryExists","fileSystemUtilities","projectsDirectoryPath","json","callback","pathMaps","editEntries","targetEntryPaths","sourceEntryPath","targetEntryPath","entryDirectory","absoluteSourceEntryPath","sourceEntryExists","editDirectoryOperation","editFileOperation","asynchronousForEach","next","done","index","push","sourceFilePath","targetFilePath","absoluteSourceFilePath","absoluteTargetFilePath","targetFileExists","edit","error","sourceDirectoryPath","targetDirectoryPath","absoluteSourceDirectoryPath","sourceDirectoryEmpty","isDirectoryEmpty","absoluteTargetDirectoryPath","targetDirectoryExists","remove"],"mappings":"AAAA;;;;;;;;;;;IAUA,OAUC;eAVuBA;;IAYRC,kBAAkB;eAAlBA;;;uBApBqB;yBACc;wBAEf;AAEpC,IAAM,AAAEC,mBAAqBC,wBAAa,CAAlCD,kBACF,AAAEE,mBAAqBC,8BAAmB,CAAxCD;AAEO,SAASJ,mBAAmBM,qBAAqB,EAAEC,IAAI,EAAEC,QAAQ;IAC9E,IAAM,AAAEC,WAAaF,KAAbE;IAERC,YAAYD,UAAUH,uBAAuB,SAACK;QAC5C,IAAMJ,SAAO;YACXI,kBAAAA;QACF;QAEAH,SAASD;IACX;AACF;AAEO,SAASN,mBAAmBW,eAAe,EAAEC,eAAe,EAAEC,cAAc,EAAER,qBAAqB,EAAEE,QAAQ;IAClH,IAAMO,0BAA0Bb,iBAAiBI,uBAAuBM,kBAClEI,oBAAoBZ,iBAAiBW;IAE3C,IAAI,CAACC,mBAAmB;QACtBH,kBAAkB;QAElBL,SAASI,iBAAiBC;QAE1B;IACF;IAEAC,iBACEG,uBAAuBL,iBAAiBC,iBAAiBP,uBAAuBE,YAC9EU,kBAAkBN,iBAAiBC,iBAAiBP,uBAAuBE;AACjF;AAEA,SAASE,YAAYD,QAAQ,EAAEH,qBAAqB,EAAEE,QAAQ;IAC5D,IAAMG,mBAAmB,EAAE;IAE3BQ,IAAAA,6BAAmB,EACjBV,UACA,SAACG,iBAAiBC,iBAAiBC,gBAAgBM,MAAMC,MAAMC;QAC7DrB,mBAAmBW,iBAAiBC,iBAAiBC,gBAAgBR,uBAAuB,SAACM,iBAAiBC;YAC5GF,iBAAiBY,IAAI,CAACV;YAEtBO;QACF;IACF,GACA;QACEZ,SAASG;IACX;AAEJ;AAEA,SAASO,kBAAkBN,eAAe,EAAEC,eAAe,EAAEP,qBAAqB,EAAEE,QAAQ;IAC1F,IAAMgB,iBAAiBZ,iBACjBa,iBAAiBZ,iBACjBa,yBAAyBxB,iBAAiBI,uBAAuBkB,iBACjEG,yBAAyBzB,iBAAiBI,uBAAuBmB,iBACjEG,mBAAmBxB,iBAAiBuB;IAE1C,IAAIC,kBAAkB;QACpBf,kBAAkBD,iBAAkB,GAAG;QAEvCJ,SAASI,iBAAiBC;QAE1B;IACF;IAEAgB,IAAAA,aAAI,EAACH,wBAAwBC,wBAAwB,SAACG;QACpD,IAAIA,OAAO;YACTjB,kBAAkBD,iBAAkB,GAAG;QACzC;QAEAJ,SAASI,iBAAiBC;IAC5B;AACF;AAEA,SAASI,uBAAuBL,eAAe,EAAEC,eAAe,EAAEP,qBAAqB,EAAEE,QAAQ;IAC/F,IAAMuB,sBAAsBnB,iBACtBoB,sBAAsBnB,iBACtBoB,8BAA8B/B,iBAAiBI,uBAAuByB,sBACtEG,uBAAuBC,iBAAiBF;IAE9C,IAAI,CAACC,sBAAsB;QACzBrB,kBAAkBD,iBAAkB,GAAG;QAEvCJ,SAASI,iBAAiBC;QAE1B;IACF;IAEA,IAAMuB,8BAA8BlC,iBAAiBI,uBAAuB0B,sBACtEK,wBAAwBjC,iBAAiBgC;IAE/C,IAAIC,uBAAuB;QACzBC,IAAAA,eAAM,EAACL,6BAA6B,SAACH;YACnC,IAAIA,OAAO;gBACTjB,kBAAkBD,iBAAkB,GAAG;YACzC;YAEAJ,SAASI,iBAAiBC;QAC5B;QAEA;IACF;IAEAgB,IAAAA,aAAI,EAACI,6BAA6BG,6BAA6B,SAACN;QAC9D,IAAIA,OAAO;YACTjB,kBAAkBD,iBAAkB,GAAG;QACzC;QAEAJ,SAASI,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.
|
|
4
|
+
"version": "5.0.225",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-file-system",
|
|
7
7
|
"description": "Occam's file system functionality.",
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"mkdirp": "^0.5.1",
|
|
16
16
|
"necessary": "^11.0.40",
|
|
17
17
|
"occam-dom": "^3.1.31",
|
|
18
|
-
"occam-grammars": "^1.0.
|
|
18
|
+
"occam-grammars": "^1.0.451"
|
|
19
19
|
},
|
|
20
20
|
"devDependencies": {
|
|
21
21
|
"@swc/core": "^1.2.51",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import { move as edit } from "fs-extra";
|
|
3
|
+
import { move as edit, remove } from "fs-extra";
|
|
4
4
|
import { pathUtilities, fileSystemUtilities } from "necessary";
|
|
5
5
|
|
|
6
6
|
import { asynchronousForEach } from "./utilities/pathMaps";
|
|
@@ -83,10 +83,9 @@ function editDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirect
|
|
|
83
83
|
const sourceDirectoryPath = sourceEntryPath, ///
|
|
84
84
|
targetDirectoryPath = targetEntryPath, ///
|
|
85
85
|
absoluteSourceDirectoryPath = concatenatePaths(projectsDirectoryPath, sourceDirectoryPath),
|
|
86
|
-
|
|
87
|
-
targetDirectoryExists = checkEntryExists(absoluteTargetDirectoryPath);
|
|
86
|
+
sourceDirectoryEmpty = isDirectoryEmpty(absoluteSourceDirectoryPath);
|
|
88
87
|
|
|
89
|
-
if (
|
|
88
|
+
if (!sourceDirectoryEmpty) {
|
|
90
89
|
targetEntryPath = sourceEntryPath; ///
|
|
91
90
|
|
|
92
91
|
callback(sourceEntryPath, targetEntryPath);
|
|
@@ -94,6 +93,21 @@ function editDirectoryOperation(sourceEntryPath, targetEntryPath, projectsDirect
|
|
|
94
93
|
return;
|
|
95
94
|
}
|
|
96
95
|
|
|
96
|
+
const absoluteTargetDirectoryPath = concatenatePaths(projectsDirectoryPath, targetDirectoryPath),
|
|
97
|
+
targetDirectoryExists = checkEntryExists(absoluteTargetDirectoryPath);
|
|
98
|
+
|
|
99
|
+
if (targetDirectoryExists) {
|
|
100
|
+
remove(absoluteSourceDirectoryPath, (error) => {
|
|
101
|
+
if (error) {
|
|
102
|
+
targetEntryPath = sourceEntryPath; ///
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
callback(sourceEntryPath, targetEntryPath);
|
|
106
|
+
});
|
|
107
|
+
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
110
|
+
|
|
97
111
|
edit(absoluteSourceDirectoryPath, absoluteTargetDirectoryPath, (error) => {
|
|
98
112
|
if (error) {
|
|
99
113
|
targetEntryPath = sourceEntryPath; ///
|