@pnpm/fs.indexed-pkg-importer 3.0.1 → 4.0.0
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.d.ts +2 -2
- package/lib/importIndexedDir.js +31 -30
- package/lib/importIndexedDir.js.map +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.js +28 -31
- package/lib/index.js.map +1 -1
- package/package.json +9 -9
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export type ImportFile = (src: string, dest: string) =>
|
|
1
|
+
export type ImportFile = (src: string, dest: string) => void;
|
|
2
2
|
export declare function importIndexedDir(importFile: ImportFile, newDir: string, filenames: Record<string, string>, opts: {
|
|
3
3
|
keepModulesDir?: boolean;
|
|
4
|
-
}):
|
|
4
|
+
}): void;
|
package/lib/importIndexedDir.js
CHANGED
|
@@ -4,29 +4,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.importIndexedDir = void 0;
|
|
7
|
-
const fs_1 = require("fs");
|
|
7
|
+
const fs_1 = __importDefault(require("fs"));
|
|
8
8
|
const fs_extra_1 = require("fs-extra");
|
|
9
9
|
const path_1 = __importDefault(require("path"));
|
|
10
10
|
const logger_1 = require("@pnpm/logger");
|
|
11
|
-
const rimraf_1 =
|
|
11
|
+
const rimraf_1 = require("@zkochan/rimraf");
|
|
12
|
+
const make_empty_dir_1 = require("make-empty-dir");
|
|
12
13
|
const sanitize_filename_1 = __importDefault(require("sanitize-filename"));
|
|
13
|
-
const
|
|
14
|
-
const path_temp_1 = __importDefault(require("path-temp"));
|
|
14
|
+
const path_temp_1 = require("path-temp");
|
|
15
15
|
const rename_overwrite_1 = __importDefault(require("rename-overwrite"));
|
|
16
16
|
const filenameConflictsLogger = (0, logger_1.logger)('_filename-conflicts');
|
|
17
|
-
|
|
18
|
-
const stage = (0, path_temp_1.
|
|
17
|
+
function importIndexedDir(importFile, newDir, filenames, opts) {
|
|
18
|
+
const stage = (0, path_temp_1.fastPathTemp)(newDir);
|
|
19
19
|
try {
|
|
20
|
-
|
|
20
|
+
tryImportIndexedDir(importFile, stage, filenames);
|
|
21
21
|
if (opts.keepModulesDir) {
|
|
22
22
|
// Keeping node_modules is needed only when the hoisted node linker is used.
|
|
23
|
-
|
|
23
|
+
moveOrMergeModulesDirs(path_1.default.join(newDir, 'node_modules'), path_1.default.join(stage, 'node_modules'));
|
|
24
24
|
}
|
|
25
|
-
|
|
25
|
+
rename_overwrite_1.default.sync(stage, newDir);
|
|
26
26
|
}
|
|
27
27
|
catch (err) { // eslint-disable-line
|
|
28
28
|
try {
|
|
29
|
-
|
|
29
|
+
(0, rimraf_1.sync)(stage);
|
|
30
30
|
}
|
|
31
31
|
catch (err) { } // eslint-disable-line:no-empty
|
|
32
32
|
if (err['code'] === 'EEXIST') {
|
|
@@ -41,7 +41,7 @@ async function importIndexedDir(importFile, newDir, filenames, opts) {
|
|
|
41
41
|
'Some of the files have equal names in different case, ' +
|
|
42
42
|
'which is an issue on case-insensitive filesystems. ' +
|
|
43
43
|
`The conflicting file names are: ${JSON.stringify(conflictingFileNames)}`);
|
|
44
|
-
|
|
44
|
+
importIndexedDir(importFile, newDir, uniqueFileMap, opts);
|
|
45
45
|
return;
|
|
46
46
|
}
|
|
47
47
|
if (err['code'] === 'ENOENT') {
|
|
@@ -52,7 +52,7 @@ async function importIndexedDir(importFile, newDir, filenames, opts) {
|
|
|
52
52
|
The package linked to "${path_1.default.relative(process.cwd(), newDir)}" had \
|
|
53
53
|
files with invalid names: ${invalidFilenames.join(', ')}. \
|
|
54
54
|
They were renamed.`);
|
|
55
|
-
|
|
55
|
+
importIndexedDir(importFile, newDir, sanitizedFilenames, opts);
|
|
56
56
|
return;
|
|
57
57
|
}
|
|
58
58
|
throw err;
|
|
@@ -71,8 +71,8 @@ function sanitizeFilenames(filenames) {
|
|
|
71
71
|
}
|
|
72
72
|
return { sanitizedFilenames, invalidFilenames };
|
|
73
73
|
}
|
|
74
|
-
|
|
75
|
-
|
|
74
|
+
function tryImportIndexedDir(importFile, newDir, filenames) {
|
|
75
|
+
(0, make_empty_dir_1.sync)(newDir, { recursive: true });
|
|
76
76
|
const alldirs = new Set();
|
|
77
77
|
Object.keys(filenames)
|
|
78
78
|
.forEach((f) => {
|
|
@@ -81,14 +81,13 @@ async function tryImportIndexedDir(importFile, newDir, filenames) {
|
|
|
81
81
|
return;
|
|
82
82
|
alldirs.add(dir);
|
|
83
83
|
});
|
|
84
|
-
|
|
84
|
+
Array.from(alldirs)
|
|
85
85
|
.sort((d1, d2) => d1.length - d2.length) // from shortest to longest
|
|
86
|
-
.
|
|
87
|
-
|
|
88
|
-
.map(async ([f, src]) => {
|
|
86
|
+
.forEach((dir) => fs_1.default.mkdirSync(path_1.default.join(newDir, dir), { recursive: true }));
|
|
87
|
+
for (const [f, src] of Object.entries(filenames)) {
|
|
89
88
|
const dest = path_1.default.join(newDir, f);
|
|
90
|
-
|
|
91
|
-
}
|
|
89
|
+
importFile(src, dest);
|
|
90
|
+
}
|
|
92
91
|
}
|
|
93
92
|
function getUniqueFileMap(fileMap) {
|
|
94
93
|
const lowercaseFiles = new Map();
|
|
@@ -108,9 +107,9 @@ function getUniqueFileMap(fileMap) {
|
|
|
108
107
|
uniqueFileMap,
|
|
109
108
|
};
|
|
110
109
|
}
|
|
111
|
-
|
|
110
|
+
function moveOrMergeModulesDirs(src, dest) {
|
|
112
111
|
try {
|
|
113
|
-
|
|
112
|
+
renameEvenAcrossDevices(src, dest);
|
|
114
113
|
}
|
|
115
114
|
catch (err) { // eslint-disable-line
|
|
116
115
|
switch (err.code) {
|
|
@@ -120,27 +119,29 @@ async function moveOrMergeModulesDirs(src, dest) {
|
|
|
120
119
|
case 'ENOTEMPTY':
|
|
121
120
|
case 'EPERM': // This error code is thrown on Windows
|
|
122
121
|
// The newly added dependency might have node_modules if it has bundled dependencies.
|
|
123
|
-
|
|
122
|
+
mergeModulesDirs(src, dest);
|
|
124
123
|
return;
|
|
125
124
|
default:
|
|
126
125
|
throw err;
|
|
127
126
|
}
|
|
128
127
|
}
|
|
129
128
|
}
|
|
130
|
-
|
|
129
|
+
function renameEvenAcrossDevices(src, dest) {
|
|
131
130
|
try {
|
|
132
|
-
|
|
131
|
+
fs_1.default.renameSync(src, dest);
|
|
133
132
|
}
|
|
134
133
|
catch (err) { // eslint-disable-line
|
|
135
134
|
if (err.code !== 'EXDEV')
|
|
136
135
|
throw err;
|
|
137
|
-
|
|
136
|
+
(0, fs_extra_1.copySync)(src, dest);
|
|
138
137
|
}
|
|
139
138
|
}
|
|
140
|
-
|
|
141
|
-
const srcFiles =
|
|
142
|
-
const destFiles = new Set(
|
|
139
|
+
function mergeModulesDirs(src, dest) {
|
|
140
|
+
const srcFiles = fs_1.default.readdirSync(src);
|
|
141
|
+
const destFiles = new Set(fs_1.default.readdirSync(dest));
|
|
143
142
|
const filesToMove = srcFiles.filter((file) => !destFiles.has(file));
|
|
144
|
-
|
|
143
|
+
for (const file of filesToMove) {
|
|
144
|
+
renameEvenAcrossDevices(path_1.default.join(src, file), path_1.default.join(dest, file));
|
|
145
|
+
}
|
|
145
146
|
}
|
|
146
147
|
//# sourceMappingURL=importIndexedDir.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"importIndexedDir.js","sourceRoot":"","sources":["../src/importIndexedDir.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"importIndexedDir.js","sourceRoot":"","sources":["../src/importIndexedDir.ts"],"names":[],"mappings":"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"}
|
package/lib/index.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { type ImportOptions, type ImportIndexedPackage } from '@pnpm/store-controller-types';
|
|
2
2
|
export declare function createIndexedPkgImporter(packageImportMethod?: 'auto' | 'hardlink' | 'copy' | 'clone' | 'clone-or-copy'): ImportIndexedPackage;
|
|
3
|
-
export declare function copyPkg(to: string, opts: ImportOptions):
|
|
3
|
+
export declare function copyPkg(to: string, opts: ImportOptions): "copy" | undefined;
|
package/lib/index.js
CHANGED
|
@@ -9,13 +9,10 @@ const graceful_fs_1 = __importDefault(require("@pnpm/graceful-fs"));
|
|
|
9
9
|
const path_1 = __importDefault(require("path"));
|
|
10
10
|
const logger_1 = require("@pnpm/logger");
|
|
11
11
|
const core_loggers_1 = require("@pnpm/core-loggers");
|
|
12
|
-
const p_limit_1 = __importDefault(require("p-limit"));
|
|
13
|
-
const path_exists_1 = __importDefault(require("path-exists"));
|
|
14
12
|
const importIndexedDir_1 = require("./importIndexedDir");
|
|
15
|
-
const limitLinking = (0, p_limit_1.default)(16);
|
|
16
13
|
function createIndexedPkgImporter(packageImportMethod) {
|
|
17
14
|
const importPackage = createImportPackage(packageImportMethod);
|
|
18
|
-
return
|
|
15
|
+
return importPackage;
|
|
19
16
|
}
|
|
20
17
|
exports.createIndexedPkgImporter = createIndexedPkgImporter;
|
|
21
18
|
function createImportPackage(packageImportMethod) {
|
|
@@ -45,10 +42,10 @@ function createImportPackage(packageImportMethod) {
|
|
|
45
42
|
}
|
|
46
43
|
function createAutoImporter() {
|
|
47
44
|
let auto = initialAuto;
|
|
48
|
-
return
|
|
49
|
-
|
|
45
|
+
return (to, opts) => auto(to, opts);
|
|
46
|
+
function initialAuto(to, opts) {
|
|
50
47
|
try {
|
|
51
|
-
if (!
|
|
48
|
+
if (!clonePkg(to, opts))
|
|
52
49
|
return undefined;
|
|
53
50
|
core_loggers_1.packageImportMethodLogger.debug({ method: 'clone' });
|
|
54
51
|
auto = clonePkg;
|
|
@@ -58,7 +55,7 @@ function createAutoImporter() {
|
|
|
58
55
|
// ignore
|
|
59
56
|
}
|
|
60
57
|
try {
|
|
61
|
-
if (!
|
|
58
|
+
if (!hardlinkPkg(graceful_fs_1.default.linkSync, to, opts))
|
|
62
59
|
return undefined;
|
|
63
60
|
core_loggers_1.packageImportMethodLogger.debug({ method: 'hardlink' });
|
|
64
61
|
auto = hardlinkPkg.bind(null, linkOrCopy);
|
|
@@ -81,10 +78,10 @@ function createAutoImporter() {
|
|
|
81
78
|
}
|
|
82
79
|
function createCloneOrCopyImporter() {
|
|
83
80
|
let auto = initialAuto;
|
|
84
|
-
return
|
|
85
|
-
|
|
81
|
+
return (to, opts) => auto(to, opts);
|
|
82
|
+
function initialAuto(to, opts) {
|
|
86
83
|
try {
|
|
87
|
-
if (!
|
|
84
|
+
if (!clonePkg(to, opts))
|
|
88
85
|
return undefined;
|
|
89
86
|
core_loggers_1.packageImportMethodLogger.debug({ method: 'clone' });
|
|
90
87
|
auto = clonePkg;
|
|
@@ -98,29 +95,29 @@ function createCloneOrCopyImporter() {
|
|
|
98
95
|
return auto(to, opts);
|
|
99
96
|
}
|
|
100
97
|
}
|
|
101
|
-
|
|
98
|
+
function clonePkg(to, opts) {
|
|
102
99
|
const pkgJsonPath = path_1.default.join(to, 'package.json');
|
|
103
|
-
if (!opts.fromStore || opts.force || !
|
|
104
|
-
|
|
100
|
+
if (!opts.fromStore || opts.force || !(0, fs_1.existsSync)(pkgJsonPath)) {
|
|
101
|
+
(0, importIndexedDir_1.importIndexedDir)(cloneFile, to, opts.filesMap, opts);
|
|
105
102
|
return 'clone';
|
|
106
103
|
}
|
|
107
104
|
return undefined;
|
|
108
105
|
}
|
|
109
|
-
|
|
110
|
-
|
|
106
|
+
function cloneFile(from, to) {
|
|
107
|
+
graceful_fs_1.default.copyFileSync(from, to, fs_1.constants.COPYFILE_FICLONE_FORCE);
|
|
111
108
|
}
|
|
112
|
-
|
|
109
|
+
function hardlinkPkg(importFile, to, opts) {
|
|
113
110
|
if (!opts.fromStore ||
|
|
114
111
|
opts.force ||
|
|
115
|
-
!
|
|
116
|
-
|
|
112
|
+
!pkgLinkedToStore(opts.filesMap, to)) {
|
|
113
|
+
(0, importIndexedDir_1.importIndexedDir)(importFile, to, opts.filesMap, opts);
|
|
117
114
|
return 'hardlink';
|
|
118
115
|
}
|
|
119
116
|
return undefined;
|
|
120
117
|
}
|
|
121
|
-
|
|
118
|
+
function linkOrCopy(existingPath, newPath) {
|
|
122
119
|
try {
|
|
123
|
-
|
|
120
|
+
graceful_fs_1.default.linkSync(existingPath, newPath);
|
|
124
121
|
}
|
|
125
122
|
catch (err) { // eslint-disable-line
|
|
126
123
|
// If a hard link to the same file already exists
|
|
@@ -130,12 +127,12 @@ async function linkOrCopy(existingPath, newPath) {
|
|
|
130
127
|
// In some VERY rare cases (1 in a thousand), hard-link creation fails on Windows.
|
|
131
128
|
// In that case, we just fall back to copying.
|
|
132
129
|
// This issue is reproducible with "pnpm add @material-ui/icons@4.9.1"
|
|
133
|
-
|
|
130
|
+
graceful_fs_1.default.copyFileSync(existingPath, newPath);
|
|
134
131
|
}
|
|
135
132
|
}
|
|
136
|
-
|
|
133
|
+
function pkgLinkedToStore(filesMap, to) {
|
|
137
134
|
if (filesMap['package.json']) {
|
|
138
|
-
if (
|
|
135
|
+
if (isSameFile('package.json', to, filesMap)) {
|
|
139
136
|
return true;
|
|
140
137
|
}
|
|
141
138
|
}
|
|
@@ -143,31 +140,31 @@ async function pkgLinkedToStore(filesMap, to) {
|
|
|
143
140
|
// An injected package might not have a package.json.
|
|
144
141
|
// This will probably only even happen in a Bit workspace.
|
|
145
142
|
const [anyFile] = Object.keys(filesMap);
|
|
146
|
-
if (
|
|
143
|
+
if (isSameFile(anyFile, to, filesMap))
|
|
147
144
|
return true;
|
|
148
145
|
}
|
|
149
146
|
return false;
|
|
150
147
|
}
|
|
151
|
-
|
|
148
|
+
function isSameFile(filename, linkedPkgDir, filesMap) {
|
|
152
149
|
const linkedFile = path_1.default.join(linkedPkgDir, filename);
|
|
153
150
|
let stats0;
|
|
154
151
|
try {
|
|
155
|
-
stats0 =
|
|
152
|
+
stats0 = graceful_fs_1.default.statSync(linkedFile);
|
|
156
153
|
}
|
|
157
154
|
catch (err) { // eslint-disable-line
|
|
158
155
|
if (err.code === 'ENOENT')
|
|
159
156
|
return false;
|
|
160
157
|
}
|
|
161
|
-
const stats1 =
|
|
158
|
+
const stats1 = graceful_fs_1.default.statSync(filesMap[filename]);
|
|
162
159
|
if (stats0.ino === stats1.ino)
|
|
163
160
|
return true;
|
|
164
161
|
(0, logger_1.globalInfo)(`Relinking ${linkedPkgDir} from the store`);
|
|
165
162
|
return false;
|
|
166
163
|
}
|
|
167
|
-
|
|
164
|
+
function copyPkg(to, opts) {
|
|
168
165
|
const pkgJsonPath = path_1.default.join(to, 'package.json');
|
|
169
|
-
if (!opts.fromStore || opts.force || !
|
|
170
|
-
|
|
166
|
+
if (!opts.fromStore || opts.force || !(0, fs_1.existsSync)(pkgJsonPath)) {
|
|
167
|
+
(0, importIndexedDir_1.importIndexedDir)(graceful_fs_1.default.copyFileSync, to, opts.filesMap, opts);
|
|
171
168
|
return 'copy';
|
|
172
169
|
}
|
|
173
170
|
return undefined;
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
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": "4.0.0",
|
|
5
5
|
"bugs": {
|
|
6
6
|
"url": "https://github.com/pnpm/pnpm/issues"
|
|
7
7
|
},
|
|
@@ -15,22 +15,22 @@
|
|
|
15
15
|
"@pnpm/logger": "^5.0.0"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@zkochan/rimraf": "^2.1.
|
|
18
|
+
"@zkochan/rimraf": "^2.1.3",
|
|
19
19
|
"fs-extra": "^11.1.1",
|
|
20
|
-
"make-empty-dir": "^2.
|
|
20
|
+
"make-empty-dir": "^2.1.0",
|
|
21
21
|
"p-limit": "^3.1.0",
|
|
22
22
|
"path-exists": "^4.0.0",
|
|
23
|
-
"path-temp": "^2.
|
|
23
|
+
"path-temp": "^2.1.0",
|
|
24
24
|
"rename-overwrite": "^4.0.3",
|
|
25
25
|
"sanitize-filename": "^1.6.3",
|
|
26
|
-
"@pnpm/core-loggers": "9.0.
|
|
27
|
-
"@pnpm/graceful-fs": "3.
|
|
28
|
-
"@pnpm/store-controller-types": "
|
|
26
|
+
"@pnpm/core-loggers": "9.0.2",
|
|
27
|
+
"@pnpm/graceful-fs": "3.1.0",
|
|
28
|
+
"@pnpm/store-controller-types": "16.0.0"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
31
31
|
"@types/fs-extra": "^9.0.13",
|
|
32
|
-
"@pnpm/fs.indexed-pkg-importer": "
|
|
33
|
-
"@pnpm/prepare": "0.0.
|
|
32
|
+
"@pnpm/fs.indexed-pkg-importer": "4.0.0",
|
|
33
|
+
"@pnpm/prepare": "0.0.76"
|
|
34
34
|
},
|
|
35
35
|
"directories": {
|
|
36
36
|
"test": "test"
|