@pnpm/fs.indexed-pkg-importer 2.1.1 → 2.1.3
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/importIndexedDir.js
CHANGED
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.importIndexedDir = void 0;
|
|
7
7
|
const fs_1 = require("fs");
|
|
8
|
+
const fs_extra_1 = require("fs-extra");
|
|
8
9
|
const path_1 = __importDefault(require("path"));
|
|
9
10
|
const logger_1 = require("@pnpm/logger");
|
|
10
11
|
const rimraf_1 = __importDefault(require("@zkochan/rimraf"));
|
|
@@ -109,7 +110,7 @@ function getUniqueFileMap(fileMap) {
|
|
|
109
110
|
}
|
|
110
111
|
async function moveOrMergeModulesDirs(src, dest) {
|
|
111
112
|
try {
|
|
112
|
-
await
|
|
113
|
+
await renameEvenAcrossDevices(src, dest);
|
|
113
114
|
}
|
|
114
115
|
catch (err) { // eslint-disable-line
|
|
115
116
|
switch (err.code) {
|
|
@@ -126,10 +127,20 @@ async function moveOrMergeModulesDirs(src, dest) {
|
|
|
126
127
|
}
|
|
127
128
|
}
|
|
128
129
|
}
|
|
130
|
+
async function renameEvenAcrossDevices(src, dest) {
|
|
131
|
+
try {
|
|
132
|
+
await fs_1.promises.rename(src, dest);
|
|
133
|
+
}
|
|
134
|
+
catch (err) { // eslint-disable-line
|
|
135
|
+
if (err.code !== 'EXDEV')
|
|
136
|
+
throw err;
|
|
137
|
+
await (0, fs_extra_1.copy)(src, dest);
|
|
138
|
+
}
|
|
139
|
+
}
|
|
129
140
|
async function mergeModulesDirs(src, dest) {
|
|
130
141
|
const srcFiles = await fs_1.promises.readdir(src);
|
|
131
142
|
const destFiles = new Set(await fs_1.promises.readdir(dest));
|
|
132
143
|
const filesToMove = srcFiles.filter((file) => !destFiles.has(file));
|
|
133
|
-
await Promise.all(filesToMove.map((file) =>
|
|
144
|
+
await Promise.all(filesToMove.map((file) => renameEvenAcrossDevices(path_1.default.join(src, file), path_1.default.join(dest, file))));
|
|
134
145
|
}
|
|
135
146
|
//# sourceMappingURL=importIndexedDir.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"importIndexedDir.js","sourceRoot":"","sources":["../src/importIndexedDir.ts"],"names":[],"mappings":";;;;;;AAAA,2BAAmC;AACnC,gDAAuB;AACvB,yCAAiD;AACjD,6DAAoC;AACpC,0EAAgD;AAChD,oEAAyC;AACzC,0DAAgC;AAChC,wEAA8C;AAE9C,MAAM,uBAAuB,GAAG,IAAA,eAAM,EAAC,qBAAqB,CAAC,CAAA;AAItD,KAAK,UAAU,gBAAgB,CACpC,UAAsB,EACtB,MAAc,EACd,SAAiC,EACjC,IAEC;IAED,MAAM,KAAK,GAAG,IAAA,mBAAQ,EAAC,cAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;IAC5C,IAAI;QACF,MAAM,mBAAmB,CAAC,UAAU,EAAE,KAAK,EAAE,SAAS,CAAC,CAAA;QACvD,IAAI,IAAI,CAAC,cAAc,EAAE;YACvB,4EAA4E;YAC5E,MAAM,sBAAsB,CAAC,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,EAAE,cAAI,CAAC,IAAI,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,CAAA;SAClG;QACD,MAAM,IAAA,0BAAe,EAAC,KAAK,EAAE,MAAM,CAAC,CAAA;KACrC;IAAC,OAAO,GAAQ,EAAE,EAAE,sBAAsB;QACzC,IAAI;YACF,MAAM,IAAA,gBAAM,EAAC,KAAK,CAAC,CAAA;SACpB;QAAC,OAAO,GAAG,EAAE,GAAE,CAAC,+BAA+B;QAChD,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,QAAQ,EAAE;YAC5B,MAAM,EAAE,aAAa,EAAE,oBAAoB,EAAE,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAA;YAC3E,IAAI,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,MAAM,KAAK,CAAC;gBAAE,MAAM,GAAG,CAAA;YAC7D,uBAAuB,CAAC,KAAK,CAAC;gBAC5B,SAAS,EAAE,oBAAoB;gBAC/B,SAAS,EAAE,MAAM;aAClB,CAAC,CAAA;YACF,IAAA,mBAAU,EACR,iCAAiC,cAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,KAAK;gBAC1E,wDAAwD;gBACxD,qDAAqD;gBACrD,mCAAmC,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,EAAE,CAC1E,CAAA;YACD,MAAM,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,CAAC,CAAA;YAC/D,OAAM;SACP;QACD,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,QAAQ,EAAE;YAC5B,MAAM,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAA;YAC7E,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC;gBAAE,MAAM,GAAG,CAAA;YAC5C,IAAA,mBAAU,EAAC;yBACQ,cAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC;4BACjC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC;mBACpC,CAAC,CAAA;YACd,MAAM,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAA;YACpE,OAAM;SACP;QACD,MAAM,GAAG,CAAA;KACV;AACH,CAAC;AAhDD,4CAgDC;AAED,SAAS,iBAAiB,CAAE,SAAiC;IAC3D,MAAM,kBAAkB,GAA2B,EAAE,CAAA;IACrD,MAAM,gBAAgB,GAAa,EAAE,CAAA;IACrC,KAAK,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QACvD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,2BAAgB,EAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACvF,IAAI,iBAAiB,KAAK,QAAQ,EAAE;YAClC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;SAChC;QACD,kBAAkB,CAAC,iBAAiB,CAAC,GAAG,GAAG,CAAA;KAC5C;IACD,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,CAAA;AACjD,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAE,UAAsB,EAAE,MAAc,EAAE,SAAiC;IAC3G,MAAM,IAAA,wBAAY,EAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAC/C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAA;IACjC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;SACnB,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACb,MAAM,GAAG,GAAG,cAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QAC3B,IAAI,GAAG,KAAK,GAAG;YAAE,OAAM;QACvB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAClB,CAAC,CAAC,CAAA;IACJ,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;SAChB,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,2BAA2B;SACnE,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,aAAE,CAAC,KAAK,CAAC,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAC7E,CAAA;IACD,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;SACtB,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,GAAG,CAAmB,EAAE,EAAE;QACxC,MAAM,IAAI,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;QACjC,MAAM,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAC7B,CAAC,CAAC,CACL,CAAA;AACH,CAAC;AAED,SAAS,gBAAgB,CAAE,OAA+B;IACxD,MAAM,cAAc,GAAG,IAAI,GAAG,EAAkB,CAAA;IAChD,MAAM,oBAAoB,
|
|
1
|
+
{"version":3,"file":"importIndexedDir.js","sourceRoot":"","sources":["../src/importIndexedDir.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/fs.indexed-pkg-importer",
|
|
3
3
|
"description": "Replicates indexed directories using hard links, copies, or cloning",
|
|
4
|
-
"version": "2.1.
|
|
4
|
+
"version": "2.1.3",
|
|
5
5
|
"bugs": {
|
|
6
6
|
"url": "https://github.com/pnpm/pnpm/issues"
|
|
7
7
|
},
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
18
|
"@zkochan/rimraf": "^2.1.2",
|
|
19
|
+
"fs-extra": "^11.1.0",
|
|
19
20
|
"make-empty-dir": "^2.0.0",
|
|
20
21
|
"p-limit": "^3.1.0",
|
|
21
22
|
"path-exists": "^4.0.0",
|
|
@@ -23,11 +24,12 @@
|
|
|
23
24
|
"rename-overwrite": "^4.0.3",
|
|
24
25
|
"sanitize-filename": "^1.6.3",
|
|
25
26
|
"@pnpm/core-loggers": "8.0.3",
|
|
26
|
-
"@pnpm/store-controller-types": "14.3.
|
|
27
|
+
"@pnpm/store-controller-types": "14.3.1"
|
|
27
28
|
},
|
|
28
29
|
"devDependencies": {
|
|
29
|
-
"@
|
|
30
|
-
"@pnpm/
|
|
30
|
+
"@types/fs-extra": "^9.0.13",
|
|
31
|
+
"@pnpm/fs.indexed-pkg-importer": "2.1.3",
|
|
32
|
+
"@pnpm/prepare": "0.0.63"
|
|
31
33
|
},
|
|
32
34
|
"directories": {
|
|
33
35
|
"test": "test"
|