@pnpm/fs.indexed-pkg-importer 4.1.1 → 5.0.1
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/index.js +34 -17
- package/lib/index.js.map +1 -1
- package/package.json +7 -6
package/lib/index.js
CHANGED
|
@@ -24,7 +24,7 @@ function createImportPackage(packageImportMethod) {
|
|
|
24
24
|
switch (packageImportMethod ?? 'auto') {
|
|
25
25
|
case 'clone':
|
|
26
26
|
core_loggers_1.packageImportMethodLogger.debug({ method: 'clone' });
|
|
27
|
-
return clonePkg;
|
|
27
|
+
return clonePkg.bind(null, createCloneFunction());
|
|
28
28
|
case 'hardlink':
|
|
29
29
|
core_loggers_1.packageImportMethodLogger.debug({ method: 'hardlink' });
|
|
30
30
|
return hardlinkPkg.bind(null, linkOrCopy);
|
|
@@ -45,10 +45,11 @@ function createAutoImporter() {
|
|
|
45
45
|
return (to, opts) => auto(to, opts);
|
|
46
46
|
function initialAuto(to, opts) {
|
|
47
47
|
try {
|
|
48
|
-
|
|
48
|
+
const _clonePkg = clonePkg.bind(null, createCloneFunction());
|
|
49
|
+
if (!_clonePkg(to, opts))
|
|
49
50
|
return undefined;
|
|
50
51
|
core_loggers_1.packageImportMethodLogger.debug({ method: 'clone' });
|
|
51
|
-
auto =
|
|
52
|
+
auto = _clonePkg;
|
|
52
53
|
return 'clone';
|
|
53
54
|
}
|
|
54
55
|
catch (err) { // eslint-disable-line
|
|
@@ -81,10 +82,11 @@ function createCloneOrCopyImporter() {
|
|
|
81
82
|
return (to, opts) => auto(to, opts);
|
|
82
83
|
function initialAuto(to, opts) {
|
|
83
84
|
try {
|
|
84
|
-
|
|
85
|
+
const _clonePkg = clonePkg.bind(null, createCloneFunction());
|
|
86
|
+
if (!_clonePkg(to, opts))
|
|
85
87
|
return undefined;
|
|
86
88
|
core_loggers_1.packageImportMethodLogger.debug({ method: 'clone' });
|
|
87
|
-
auto =
|
|
89
|
+
auto = _clonePkg;
|
|
88
90
|
return 'clone';
|
|
89
91
|
}
|
|
90
92
|
catch (err) { // eslint-disable-line
|
|
@@ -95,29 +97,44 @@ function createCloneOrCopyImporter() {
|
|
|
95
97
|
return auto(to, opts);
|
|
96
98
|
}
|
|
97
99
|
}
|
|
98
|
-
function clonePkg(to, opts) {
|
|
100
|
+
function clonePkg(clone, to, opts) {
|
|
99
101
|
const pkgJsonPath = path_1.default.join(to, 'package.json');
|
|
100
|
-
if (
|
|
101
|
-
(0, importIndexedDir_1.importIndexedDir)(
|
|
102
|
+
if (opts.resolvedFrom !== 'store' || opts.force || !(0, fs_1.existsSync)(pkgJsonPath)) {
|
|
103
|
+
(0, importIndexedDir_1.importIndexedDir)(clone, to, opts.filesMap, opts);
|
|
102
104
|
return 'clone';
|
|
103
105
|
}
|
|
104
106
|
return undefined;
|
|
105
107
|
}
|
|
106
|
-
function
|
|
107
|
-
|
|
108
|
+
function createCloneFunction() {
|
|
109
|
+
// Node.js currently does not natively support reflinks on Windows and macOS.
|
|
110
|
+
// Hence, we use a third party solution.
|
|
111
|
+
if (process.platform === 'win32' || process.platform === 'darwin') {
|
|
112
|
+
// eslint-disable-next-line
|
|
113
|
+
const { reflinkFileSync } = require('@reflink/reflink');
|
|
114
|
+
return reflinkFileSync;
|
|
115
|
+
}
|
|
116
|
+
return (src, dest) => {
|
|
117
|
+
graceful_fs_1.default.copyFileSync(src, dest, fs_1.constants.COPYFILE_FICLONE_FORCE);
|
|
118
|
+
};
|
|
108
119
|
}
|
|
109
120
|
function hardlinkPkg(importFile, to, opts) {
|
|
110
|
-
if (
|
|
111
|
-
opts.force ||
|
|
112
|
-
!(opts.disableRelinkFromStore ? pkgExists : pkgLinkedToStore)(opts.filesMap, to)) {
|
|
121
|
+
if (opts.force || shouldRelinkPkg(to, opts)) {
|
|
113
122
|
(0, importIndexedDir_1.importIndexedDir)(importFile, to, opts.filesMap, opts);
|
|
114
123
|
return 'hardlink';
|
|
115
124
|
}
|
|
116
125
|
return undefined;
|
|
117
126
|
}
|
|
118
|
-
function
|
|
119
|
-
|
|
120
|
-
|
|
127
|
+
function shouldRelinkPkg(to, opts) {
|
|
128
|
+
if (opts.disableRelinkLocalDirDeps && opts.resolvedFrom === 'local-dir') {
|
|
129
|
+
try {
|
|
130
|
+
const files = graceful_fs_1.default.readdirSync(to);
|
|
131
|
+
return files.length === 0 || files.length === 1 && files[0] === 'node_modules';
|
|
132
|
+
}
|
|
133
|
+
catch {
|
|
134
|
+
return true;
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
return opts.resolvedFrom !== 'store' || !pkgLinkedToStore(opts.filesMap, to);
|
|
121
138
|
}
|
|
122
139
|
function linkOrCopy(existingPath, newPath) {
|
|
123
140
|
try {
|
|
@@ -167,7 +184,7 @@ function isSameFile(filename, linkedPkgDir, filesMap) {
|
|
|
167
184
|
}
|
|
168
185
|
function copyPkg(to, opts) {
|
|
169
186
|
const pkgJsonPath = path_1.default.join(to, 'package.json');
|
|
170
|
-
if (
|
|
187
|
+
if (opts.resolvedFrom !== 'store' || opts.force || !(0, fs_1.existsSync)(pkgJsonPath)) {
|
|
171
188
|
(0, importIndexedDir_1.importIndexedDir)(graceful_fs_1.default.copyFileSync, to, opts.filesMap, opts);
|
|
172
189
|
return 'copy';
|
|
173
190
|
}
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,2BAAsD;AACtD,oEAAkC;AAClC,gDAAuB;AACvB,yCAAqD;AACrD,qDAA8D;AAE9D,yDAAsE;AAEtE,SAAgB,wBAAwB,CACtC,mBAA8E;IAE9E,MAAM,aAAa,GAAG,mBAAmB,CAAC,mBAAmB,CAAC,CAAA;IAC9D,OAAO,aAAa,CAAA;AACtB,CAAC;AALD,4DAKC;AAED,SAAS,mBAAmB,CAAE,mBAA8E;IAC1G,mCAAmC;IACnC,iDAAiD;IACjD,2CAA2C;IAC3C,+EAA+E;IAC/E,2DAA2D;IAC3D,QAAQ,mBAAmB,IAAI,MAAM,EAAE;QACvC,KAAK,OAAO;YACV,wCAAyB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAA;YACpD,OAAO,QAAQ,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.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": "
|
|
4
|
+
"version": "5.0.1",
|
|
5
5
|
"bugs": {
|
|
6
6
|
"url": "https://github.com/pnpm/pnpm/issues"
|
|
7
7
|
},
|
|
@@ -21,16 +21,17 @@
|
|
|
21
21
|
"p-limit": "^3.1.0",
|
|
22
22
|
"path-exists": "^4.0.0",
|
|
23
23
|
"path-temp": "^2.1.0",
|
|
24
|
+
"@reflink/reflink": "0.1.7",
|
|
24
25
|
"rename-overwrite": "^4.0.3",
|
|
25
26
|
"sanitize-filename": "^1.6.3",
|
|
26
|
-
"@pnpm/
|
|
27
|
-
"@pnpm/graceful-fs": "3.
|
|
28
|
-
"@pnpm/
|
|
27
|
+
"@pnpm/store-controller-types": "17.0.1",
|
|
28
|
+
"@pnpm/graceful-fs": "3.2.0",
|
|
29
|
+
"@pnpm/core-loggers": "9.0.3"
|
|
29
30
|
},
|
|
30
31
|
"devDependencies": {
|
|
31
32
|
"@types/fs-extra": "^9.0.13",
|
|
32
|
-
"@pnpm/
|
|
33
|
-
"@pnpm/
|
|
33
|
+
"@pnpm/fs.indexed-pkg-importer": "5.0.1",
|
|
34
|
+
"@pnpm/prepare": "0.0.81"
|
|
34
35
|
},
|
|
35
36
|
"directories": {
|
|
36
37
|
"test": "test"
|