@eggjs/utils 4.1.1 → 4.1.2
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/dist/commonjs/import.js +138 -40
- package/dist/esm/import.js +139 -41
- package/dist/package.json +1 -1
- package/package.json +9 -6
- package/src/import.ts +140 -39
package/dist/commonjs/import.js
CHANGED
|
@@ -12,6 +12,8 @@ const node_path_1 = __importDefault(require("node:path"));
|
|
|
12
12
|
const node_fs_1 = __importDefault(require("node:fs"));
|
|
13
13
|
const debug = (0, node_util_1.debuglog)('@eggjs/utils/import');
|
|
14
14
|
const isESM = typeof require === 'undefined';
|
|
15
|
+
const nodeMajorVersion = parseInt(process.versions.node.split('.', 1)[0], 10);
|
|
16
|
+
const supportImportMetaResolve = nodeMajorVersion >= 18;
|
|
15
17
|
let _customRequire;
|
|
16
18
|
function getRequire() {
|
|
17
19
|
if (!_customRequire) {
|
|
@@ -33,17 +35,86 @@ function isSupportTypeScript() {
|
|
|
33
35
|
}
|
|
34
36
|
return _supportTypeScript;
|
|
35
37
|
}
|
|
36
|
-
function
|
|
38
|
+
function tryToResolveFromFile(filepath) {
|
|
39
|
+
// "type": "module", try index.mjs then index.js
|
|
40
|
+
const type = isESM ? 'module' : 'commonjs';
|
|
41
|
+
let mainIndexFile = '';
|
|
42
|
+
if (type === 'module') {
|
|
43
|
+
mainIndexFile = filepath + '.mjs';
|
|
44
|
+
if (node_fs_1.default.existsSync(mainIndexFile)) {
|
|
45
|
+
debug('[tryToResolveFromFile] %o, use index.mjs, type: %o', mainIndexFile, type);
|
|
46
|
+
return mainIndexFile;
|
|
47
|
+
}
|
|
48
|
+
mainIndexFile = filepath + '.js';
|
|
49
|
+
if (node_fs_1.default.existsSync(mainIndexFile)) {
|
|
50
|
+
debug('[tryToResolveFromFile] %o, use index.js, type: %o', mainIndexFile, type);
|
|
51
|
+
return mainIndexFile;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
// "type": "commonjs", try index.js then index.cjs
|
|
56
|
+
mainIndexFile = filepath + '.cjs';
|
|
57
|
+
if (node_fs_1.default.existsSync(mainIndexFile)) {
|
|
58
|
+
debug('[tryToResolveFromFile] %o, use index.cjs, type: %o', mainIndexFile, type);
|
|
59
|
+
return mainIndexFile;
|
|
60
|
+
}
|
|
61
|
+
mainIndexFile = filepath + '.js';
|
|
62
|
+
if (node_fs_1.default.existsSync(mainIndexFile)) {
|
|
63
|
+
debug('[tryToResolveFromFile] %o, use index.js, type: %o', mainIndexFile, type);
|
|
64
|
+
return mainIndexFile;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
if (!isSupportTypeScript()) {
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
// for the module under development
|
|
71
|
+
mainIndexFile = filepath + '.ts';
|
|
72
|
+
if (node_fs_1.default.existsSync(mainIndexFile)) {
|
|
73
|
+
debug('[tryToResolveFromFile] %o, use index.ts, type: %o', mainIndexFile, type);
|
|
74
|
+
return mainIndexFile;
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
function tryToResolveByDirnameFromPackage(dirname, pkg) {
|
|
37
78
|
// try to read pkg.main or pkg.module first
|
|
38
79
|
// "main": "./dist/commonjs/index.js",
|
|
39
80
|
// "module": "./dist/esm/index.js"
|
|
40
81
|
const defaultMainFile = isESM ? pkg.module ?? pkg.main : pkg.main;
|
|
41
82
|
if (defaultMainFile) {
|
|
42
|
-
const mainIndexFilePath = node_path_1.default.join(
|
|
83
|
+
const mainIndexFilePath = node_path_1.default.join(dirname, defaultMainFile);
|
|
84
|
+
if (node_fs_1.default.existsSync(mainIndexFilePath)) {
|
|
85
|
+
debug('[tryToResolveByDirnameFromPackage] %o, use pkg.main or pkg.module: %o, isESM: %s', mainIndexFilePath, defaultMainFile, isESM);
|
|
86
|
+
return mainIndexFilePath;
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
// "type": "module", try index.mjs then index.js
|
|
90
|
+
const type = pkg?.type ?? (isESM ? 'module' : 'commonjs');
|
|
91
|
+
if (type === 'module') {
|
|
92
|
+
const mainIndexFilePath = node_path_1.default.join(dirname, 'index.mjs');
|
|
93
|
+
if (node_fs_1.default.existsSync(mainIndexFilePath)) {
|
|
94
|
+
debug('[tryToResolveByDirnameFromPackage] %o, use index.mjs, pkg.type: %o', mainIndexFilePath, type);
|
|
95
|
+
return mainIndexFilePath;
|
|
96
|
+
}
|
|
97
|
+
const mainIndexMjsFilePath = node_path_1.default.join(dirname, 'index.js');
|
|
98
|
+
if (node_fs_1.default.existsSync(mainIndexMjsFilePath)) {
|
|
99
|
+
debug('[tryToResolveByDirnameFromPackage] %o, use index.js, pkg.type: %o', mainIndexMjsFilePath, type);
|
|
100
|
+
return mainIndexMjsFilePath;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
// "type": "commonjs", try index.cjs then index.js
|
|
105
|
+
const mainIndexFilePath = node_path_1.default.join(dirname, 'index.cjs');
|
|
43
106
|
if (node_fs_1.default.existsSync(mainIndexFilePath)) {
|
|
44
|
-
debug('[
|
|
45
|
-
return;
|
|
107
|
+
debug('[tryToResolveByDirnameFromPackage] %o, use index.cjs, pkg.type: %o', mainIndexFilePath, type);
|
|
108
|
+
return mainIndexFilePath;
|
|
46
109
|
}
|
|
110
|
+
const mainIndexCjsFilePath = node_path_1.default.join(dirname, 'index.js');
|
|
111
|
+
if (node_fs_1.default.existsSync(mainIndexCjsFilePath)) {
|
|
112
|
+
debug('[tryToResolveByDirnameFromPackage] %o, use index.js, pkg.type: %o', mainIndexCjsFilePath, type);
|
|
113
|
+
return mainIndexCjsFilePath;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
if (!isSupportTypeScript()) {
|
|
117
|
+
return;
|
|
47
118
|
}
|
|
48
119
|
// for the module under development
|
|
49
120
|
// "tshy": {
|
|
@@ -52,55 +123,69 @@ function tryToGetTypeScriptMainFile(pkg, baseDir) {
|
|
|
52
123
|
// ".": "./src/index.ts"
|
|
53
124
|
// }
|
|
54
125
|
// }
|
|
55
|
-
const mainIndexFile = pkg.tshy?.exports?.['.'];
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
126
|
+
const mainIndexFile = pkg.tshy?.exports?.['.'] ?? 'index.ts';
|
|
127
|
+
const mainIndexFilePath = node_path_1.default.join(dirname, mainIndexFile);
|
|
128
|
+
if (node_fs_1.default.existsSync(mainIndexFilePath)) {
|
|
129
|
+
return mainIndexFilePath;
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
function tryToResolveByDirname(dirname) {
|
|
133
|
+
const pkgFile = node_path_1.default.join(dirname, 'package.json');
|
|
134
|
+
if (node_fs_1.default.existsSync(pkgFile)) {
|
|
135
|
+
const pkg = JSON.parse(node_fs_1.default.readFileSync(pkgFile, 'utf-8'));
|
|
136
|
+
return tryToResolveByDirnameFromPackage(dirname, pkg);
|
|
61
137
|
}
|
|
62
138
|
}
|
|
63
139
|
function importResolve(filepath, options) {
|
|
64
|
-
|
|
65
|
-
if (node_path_1.default.isAbsolute(filepath)
|
|
66
|
-
const
|
|
67
|
-
if (
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
140
|
+
let moduleFilePath;
|
|
141
|
+
if (node_path_1.default.isAbsolute(filepath)) {
|
|
142
|
+
const stat = node_fs_1.default.statSync(filepath, { throwIfNoEntry: false });
|
|
143
|
+
if (stat?.isDirectory()) {
|
|
144
|
+
moduleFilePath = tryToResolveByDirname(filepath);
|
|
145
|
+
if (moduleFilePath) {
|
|
146
|
+
debug('[importResolve] %o => %o', filepath, moduleFilePath);
|
|
147
|
+
return moduleFilePath;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
if (!stat) {
|
|
151
|
+
moduleFilePath = tryToResolveFromFile(filepath);
|
|
152
|
+
if (moduleFilePath) {
|
|
153
|
+
debug('[importResolve] %o => %o', filepath, moduleFilePath);
|
|
154
|
+
return moduleFilePath;
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
if (isESM) {
|
|
159
|
+
if (supportImportMetaResolve) {
|
|
160
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
161
|
+
// @ts-ignore
|
|
162
|
+
moduleFilePath = require.resolve(filepath);
|
|
163
|
+
if (moduleFilePath.startsWith('file://')) {
|
|
164
|
+
// resolve will return file:// URL on Linux and MacOS expect on Windows
|
|
165
|
+
moduleFilePath = (0, node_url_1.fileURLToPath)(moduleFilePath);
|
|
73
166
|
}
|
|
74
167
|
}
|
|
168
|
+
else {
|
|
169
|
+
moduleFilePath = getRequire().resolve(filepath);
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
else {
|
|
173
|
+
const cwd = process.cwd();
|
|
174
|
+
const paths = options?.paths ?? [cwd];
|
|
175
|
+
moduleFilePath = require.resolve(filepath, {
|
|
176
|
+
paths,
|
|
177
|
+
});
|
|
75
178
|
}
|
|
76
|
-
const cwd = process.cwd();
|
|
77
|
-
const paths = options?.paths ?? [cwd];
|
|
78
|
-
const moduleFilePath = getRequire().resolve(filepath, {
|
|
79
|
-
paths,
|
|
80
|
-
});
|
|
81
179
|
debug('[importResolve] %o, options: %o => %o', filepath, options, moduleFilePath);
|
|
82
180
|
return moduleFilePath;
|
|
83
181
|
}
|
|
84
182
|
async function importModule(filepath, options) {
|
|
85
183
|
const moduleFilePath = importResolve(filepath, options);
|
|
86
184
|
let obj;
|
|
87
|
-
if (
|
|
88
|
-
// commonjs
|
|
89
|
-
obj = require(moduleFilePath);
|
|
90
|
-
debug('[importModule] require %o => %o', filepath, obj);
|
|
91
|
-
if (obj?.__esModule === true && 'default' in obj) {
|
|
92
|
-
// 兼容 cjs 模拟 esm 的导出格式
|
|
93
|
-
// {
|
|
94
|
-
// __esModule: true,
|
|
95
|
-
// default: { fn: [Function: fn], foo: 'bar', one: 1 }
|
|
96
|
-
// }
|
|
97
|
-
obj = obj.default;
|
|
98
|
-
}
|
|
99
|
-
}
|
|
100
|
-
else {
|
|
185
|
+
if (isESM) {
|
|
101
186
|
// esm
|
|
102
|
-
debug('[importModule] await import start: %o', filepath);
|
|
103
187
|
const fileUrl = (0, node_url_1.pathToFileURL)(moduleFilePath).toString();
|
|
188
|
+
debug('[importModule] await import start: %o', fileUrl);
|
|
104
189
|
obj = await import(fileUrl);
|
|
105
190
|
debug('[importModule] await import end: %o => %o', filepath, obj);
|
|
106
191
|
// {
|
|
@@ -143,7 +228,20 @@ async function importModule(filepath, options) {
|
|
|
143
228
|
}
|
|
144
229
|
}
|
|
145
230
|
}
|
|
231
|
+
else {
|
|
232
|
+
// commonjs
|
|
233
|
+
obj = require(moduleFilePath);
|
|
234
|
+
debug('[importModule] require %o => %o', filepath, obj);
|
|
235
|
+
if (obj?.__esModule === true && 'default' in obj) {
|
|
236
|
+
// 兼容 cjs 模拟 esm 的导出格式
|
|
237
|
+
// {
|
|
238
|
+
// __esModule: true,
|
|
239
|
+
// default: { fn: [Function: fn], foo: 'bar', one: 1 }
|
|
240
|
+
// }
|
|
241
|
+
obj = obj.default;
|
|
242
|
+
}
|
|
243
|
+
}
|
|
146
244
|
debug('[importModule] return %o => %o', filepath, obj);
|
|
147
245
|
return obj;
|
|
148
246
|
}
|
|
149
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
247
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"import.js","sourceRoot":"","sources":["../../src/import.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/import.js
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { debuglog } from 'node:util';
|
|
2
2
|
import { createRequire } from 'node:module';
|
|
3
|
-
import { pathToFileURL } from 'node:url';
|
|
3
|
+
import { pathToFileURL, fileURLToPath } from 'node:url';
|
|
4
4
|
import path from 'node:path';
|
|
5
5
|
import fs from 'node:fs';
|
|
6
6
|
const debug = debuglog('@eggjs/utils/import');
|
|
7
7
|
const isESM = typeof require === 'undefined';
|
|
8
|
+
const nodeMajorVersion = parseInt(process.versions.node.split('.', 1)[0], 10);
|
|
9
|
+
const supportImportMetaResolve = nodeMajorVersion >= 18;
|
|
8
10
|
let _customRequire;
|
|
9
11
|
function getRequire() {
|
|
10
12
|
if (!_customRequire) {
|
|
@@ -26,17 +28,86 @@ function isSupportTypeScript() {
|
|
|
26
28
|
}
|
|
27
29
|
return _supportTypeScript;
|
|
28
30
|
}
|
|
29
|
-
function
|
|
31
|
+
function tryToResolveFromFile(filepath) {
|
|
32
|
+
// "type": "module", try index.mjs then index.js
|
|
33
|
+
const type = isESM ? 'module' : 'commonjs';
|
|
34
|
+
let mainIndexFile = '';
|
|
35
|
+
if (type === 'module') {
|
|
36
|
+
mainIndexFile = filepath + '.mjs';
|
|
37
|
+
if (fs.existsSync(mainIndexFile)) {
|
|
38
|
+
debug('[tryToResolveFromFile] %o, use index.mjs, type: %o', mainIndexFile, type);
|
|
39
|
+
return mainIndexFile;
|
|
40
|
+
}
|
|
41
|
+
mainIndexFile = filepath + '.js';
|
|
42
|
+
if (fs.existsSync(mainIndexFile)) {
|
|
43
|
+
debug('[tryToResolveFromFile] %o, use index.js, type: %o', mainIndexFile, type);
|
|
44
|
+
return mainIndexFile;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
// "type": "commonjs", try index.js then index.cjs
|
|
49
|
+
mainIndexFile = filepath + '.cjs';
|
|
50
|
+
if (fs.existsSync(mainIndexFile)) {
|
|
51
|
+
debug('[tryToResolveFromFile] %o, use index.cjs, type: %o', mainIndexFile, type);
|
|
52
|
+
return mainIndexFile;
|
|
53
|
+
}
|
|
54
|
+
mainIndexFile = filepath + '.js';
|
|
55
|
+
if (fs.existsSync(mainIndexFile)) {
|
|
56
|
+
debug('[tryToResolveFromFile] %o, use index.js, type: %o', mainIndexFile, type);
|
|
57
|
+
return mainIndexFile;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
if (!isSupportTypeScript()) {
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
// for the module under development
|
|
64
|
+
mainIndexFile = filepath + '.ts';
|
|
65
|
+
if (fs.existsSync(mainIndexFile)) {
|
|
66
|
+
debug('[tryToResolveFromFile] %o, use index.ts, type: %o', mainIndexFile, type);
|
|
67
|
+
return mainIndexFile;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
function tryToResolveByDirnameFromPackage(dirname, pkg) {
|
|
30
71
|
// try to read pkg.main or pkg.module first
|
|
31
72
|
// "main": "./dist/commonjs/index.js",
|
|
32
73
|
// "module": "./dist/esm/index.js"
|
|
33
74
|
const defaultMainFile = isESM ? pkg.module ?? pkg.main : pkg.main;
|
|
34
75
|
if (defaultMainFile) {
|
|
35
|
-
const mainIndexFilePath = path.join(
|
|
76
|
+
const mainIndexFilePath = path.join(dirname, defaultMainFile);
|
|
77
|
+
if (fs.existsSync(mainIndexFilePath)) {
|
|
78
|
+
debug('[tryToResolveByDirnameFromPackage] %o, use pkg.main or pkg.module: %o, isESM: %s', mainIndexFilePath, defaultMainFile, isESM);
|
|
79
|
+
return mainIndexFilePath;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
// "type": "module", try index.mjs then index.js
|
|
83
|
+
const type = pkg?.type ?? (isESM ? 'module' : 'commonjs');
|
|
84
|
+
if (type === 'module') {
|
|
85
|
+
const mainIndexFilePath = path.join(dirname, 'index.mjs');
|
|
86
|
+
if (fs.existsSync(mainIndexFilePath)) {
|
|
87
|
+
debug('[tryToResolveByDirnameFromPackage] %o, use index.mjs, pkg.type: %o', mainIndexFilePath, type);
|
|
88
|
+
return mainIndexFilePath;
|
|
89
|
+
}
|
|
90
|
+
const mainIndexMjsFilePath = path.join(dirname, 'index.js');
|
|
91
|
+
if (fs.existsSync(mainIndexMjsFilePath)) {
|
|
92
|
+
debug('[tryToResolveByDirnameFromPackage] %o, use index.js, pkg.type: %o', mainIndexMjsFilePath, type);
|
|
93
|
+
return mainIndexMjsFilePath;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
// "type": "commonjs", try index.cjs then index.js
|
|
98
|
+
const mainIndexFilePath = path.join(dirname, 'index.cjs');
|
|
36
99
|
if (fs.existsSync(mainIndexFilePath)) {
|
|
37
|
-
debug('[
|
|
38
|
-
return;
|
|
100
|
+
debug('[tryToResolveByDirnameFromPackage] %o, use index.cjs, pkg.type: %o', mainIndexFilePath, type);
|
|
101
|
+
return mainIndexFilePath;
|
|
39
102
|
}
|
|
103
|
+
const mainIndexCjsFilePath = path.join(dirname, 'index.js');
|
|
104
|
+
if (fs.existsSync(mainIndexCjsFilePath)) {
|
|
105
|
+
debug('[tryToResolveByDirnameFromPackage] %o, use index.js, pkg.type: %o', mainIndexCjsFilePath, type);
|
|
106
|
+
return mainIndexCjsFilePath;
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
if (!isSupportTypeScript()) {
|
|
110
|
+
return;
|
|
40
111
|
}
|
|
41
112
|
// for the module under development
|
|
42
113
|
// "tshy": {
|
|
@@ -45,55 +116,69 @@ function tryToGetTypeScriptMainFile(pkg, baseDir) {
|
|
|
45
116
|
// ".": "./src/index.ts"
|
|
46
117
|
// }
|
|
47
118
|
// }
|
|
48
|
-
const mainIndexFile = pkg.tshy?.exports?.['.'];
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
119
|
+
const mainIndexFile = pkg.tshy?.exports?.['.'] ?? 'index.ts';
|
|
120
|
+
const mainIndexFilePath = path.join(dirname, mainIndexFile);
|
|
121
|
+
if (fs.existsSync(mainIndexFilePath)) {
|
|
122
|
+
return mainIndexFilePath;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
function tryToResolveByDirname(dirname) {
|
|
126
|
+
const pkgFile = path.join(dirname, 'package.json');
|
|
127
|
+
if (fs.existsSync(pkgFile)) {
|
|
128
|
+
const pkg = JSON.parse(fs.readFileSync(pkgFile, 'utf-8'));
|
|
129
|
+
return tryToResolveByDirnameFromPackage(dirname, pkg);
|
|
54
130
|
}
|
|
55
131
|
}
|
|
56
132
|
export function importResolve(filepath, options) {
|
|
57
|
-
|
|
58
|
-
if (path.isAbsolute(filepath)
|
|
59
|
-
const
|
|
60
|
-
if (
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
133
|
+
let moduleFilePath;
|
|
134
|
+
if (path.isAbsolute(filepath)) {
|
|
135
|
+
const stat = fs.statSync(filepath, { throwIfNoEntry: false });
|
|
136
|
+
if (stat?.isDirectory()) {
|
|
137
|
+
moduleFilePath = tryToResolveByDirname(filepath);
|
|
138
|
+
if (moduleFilePath) {
|
|
139
|
+
debug('[importResolve] %o => %o', filepath, moduleFilePath);
|
|
140
|
+
return moduleFilePath;
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
if (!stat) {
|
|
144
|
+
moduleFilePath = tryToResolveFromFile(filepath);
|
|
145
|
+
if (moduleFilePath) {
|
|
146
|
+
debug('[importResolve] %o => %o', filepath, moduleFilePath);
|
|
147
|
+
return moduleFilePath;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
if (isESM) {
|
|
152
|
+
if (supportImportMetaResolve) {
|
|
153
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
154
|
+
// @ts-ignore
|
|
155
|
+
moduleFilePath = import.meta.resolve(filepath);
|
|
156
|
+
if (moduleFilePath.startsWith('file://')) {
|
|
157
|
+
// resolve will return file:// URL on Linux and MacOS expect on Windows
|
|
158
|
+
moduleFilePath = fileURLToPath(moduleFilePath);
|
|
66
159
|
}
|
|
67
160
|
}
|
|
161
|
+
else {
|
|
162
|
+
moduleFilePath = getRequire().resolve(filepath);
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
else {
|
|
166
|
+
const cwd = process.cwd();
|
|
167
|
+
const paths = options?.paths ?? [cwd];
|
|
168
|
+
moduleFilePath = require.resolve(filepath, {
|
|
169
|
+
paths,
|
|
170
|
+
});
|
|
68
171
|
}
|
|
69
|
-
const cwd = process.cwd();
|
|
70
|
-
const paths = options?.paths ?? [cwd];
|
|
71
|
-
const moduleFilePath = getRequire().resolve(filepath, {
|
|
72
|
-
paths,
|
|
73
|
-
});
|
|
74
172
|
debug('[importResolve] %o, options: %o => %o', filepath, options, moduleFilePath);
|
|
75
173
|
return moduleFilePath;
|
|
76
174
|
}
|
|
77
175
|
export async function importModule(filepath, options) {
|
|
78
176
|
const moduleFilePath = importResolve(filepath, options);
|
|
79
177
|
let obj;
|
|
80
|
-
if (
|
|
81
|
-
// commonjs
|
|
82
|
-
obj = require(moduleFilePath);
|
|
83
|
-
debug('[importModule] require %o => %o', filepath, obj);
|
|
84
|
-
if (obj?.__esModule === true && 'default' in obj) {
|
|
85
|
-
// 兼容 cjs 模拟 esm 的导出格式
|
|
86
|
-
// {
|
|
87
|
-
// __esModule: true,
|
|
88
|
-
// default: { fn: [Function: fn], foo: 'bar', one: 1 }
|
|
89
|
-
// }
|
|
90
|
-
obj = obj.default;
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
|
-
else {
|
|
178
|
+
if (isESM) {
|
|
94
179
|
// esm
|
|
95
|
-
debug('[importModule] await import start: %o', filepath);
|
|
96
180
|
const fileUrl = pathToFileURL(moduleFilePath).toString();
|
|
181
|
+
debug('[importModule] await import start: %o', fileUrl);
|
|
97
182
|
obj = await import(fileUrl);
|
|
98
183
|
debug('[importModule] await import end: %o => %o', filepath, obj);
|
|
99
184
|
// {
|
|
@@ -136,7 +221,20 @@ export async function importModule(filepath, options) {
|
|
|
136
221
|
}
|
|
137
222
|
}
|
|
138
223
|
}
|
|
224
|
+
else {
|
|
225
|
+
// commonjs
|
|
226
|
+
obj = require(moduleFilePath);
|
|
227
|
+
debug('[importModule] require %o => %o', filepath, obj);
|
|
228
|
+
if (obj?.__esModule === true && 'default' in obj) {
|
|
229
|
+
// 兼容 cjs 模拟 esm 的导出格式
|
|
230
|
+
// {
|
|
231
|
+
// __esModule: true,
|
|
232
|
+
// default: { fn: [Function: fn], foo: 'bar', one: 1 }
|
|
233
|
+
// }
|
|
234
|
+
obj = obj.default;
|
|
235
|
+
}
|
|
236
|
+
}
|
|
139
237
|
debug('[importModule] return %o => %o', filepath, obj);
|
|
140
238
|
return obj;
|
|
141
239
|
}
|
|
142
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
240
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"import.js","sourceRoot":"","sources":["../../src/import.ts"],"names":[],"mappings":"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"}
|
package/dist/package.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eggjs/utils",
|
|
3
|
-
"version": "4.1.
|
|
3
|
+
"version": "4.1.2",
|
|
4
4
|
"engine": {
|
|
5
5
|
"node": ">=18.19.0"
|
|
6
6
|
},
|
|
@@ -10,12 +10,13 @@
|
|
|
10
10
|
"description": "Utils for all egg projects",
|
|
11
11
|
"scripts": {
|
|
12
12
|
"lint": "eslint src test --ext ts",
|
|
13
|
-
"pretest": "npm run prepublishOnly",
|
|
14
|
-
"test": "npm run
|
|
13
|
+
"pretest": "npm run clean && npm run lint -- --fix && npm run prepublishOnly",
|
|
14
|
+
"test": "npm run test-local",
|
|
15
15
|
"test-local": "egg-bin test",
|
|
16
|
-
"preci": "npm run prepublishOnly",
|
|
17
|
-
"ci": "
|
|
18
|
-
"
|
|
16
|
+
"preci": "npm run clean && npm run lint && npm run prepublishOnly",
|
|
17
|
+
"ci": "egg-bin cov",
|
|
18
|
+
"clean": "rimraf dist",
|
|
19
|
+
"prepublishOnly": "tshy && tshy-after && attw --pack"
|
|
19
20
|
},
|
|
20
21
|
"keywords": [
|
|
21
22
|
"egg",
|
|
@@ -29,6 +30,7 @@
|
|
|
29
30
|
"license": "MIT",
|
|
30
31
|
"dependencies": {},
|
|
31
32
|
"devDependencies": {
|
|
33
|
+
"@arethetypeswrong/cli": "^0.17.2",
|
|
32
34
|
"@eggjs/tsconfig": "1",
|
|
33
35
|
"@types/mocha": "10",
|
|
34
36
|
"@types/node": "22",
|
|
@@ -38,6 +40,7 @@
|
|
|
38
40
|
"eslint-config-egg": "14",
|
|
39
41
|
"mm": "3",
|
|
40
42
|
"npminstall": "7",
|
|
43
|
+
"rimraf": "6",
|
|
41
44
|
"runscript": "2",
|
|
42
45
|
"tshy": "3",
|
|
43
46
|
"tshy-after": "1",
|
package/src/import.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { debuglog } from 'node:util';
|
|
2
2
|
import { createRequire } from 'node:module';
|
|
3
|
-
import { pathToFileURL } from 'node:url';
|
|
3
|
+
import { pathToFileURL, fileURLToPath } from 'node:url';
|
|
4
4
|
import path from 'node:path';
|
|
5
5
|
import fs from 'node:fs';
|
|
6
6
|
|
|
@@ -16,6 +16,8 @@ export interface ImportModuleOptions extends ImportResolveOptions {
|
|
|
16
16
|
}
|
|
17
17
|
|
|
18
18
|
const isESM = typeof require === 'undefined';
|
|
19
|
+
const nodeMajorVersion = parseInt(process.versions.node.split('.', 1)[0], 10);
|
|
20
|
+
const supportImportMetaResolve = nodeMajorVersion >= 18;
|
|
19
21
|
|
|
20
22
|
let _customRequire: NodeRequire;
|
|
21
23
|
function getRequire() {
|
|
@@ -39,20 +41,92 @@ function isSupportTypeScript() {
|
|
|
39
41
|
return _supportTypeScript;
|
|
40
42
|
}
|
|
41
43
|
|
|
42
|
-
function
|
|
44
|
+
function tryToResolveFromFile(filepath: string): string | undefined {
|
|
45
|
+
// "type": "module", try index.mjs then index.js
|
|
46
|
+
const type = isESM ? 'module' : 'commonjs';
|
|
47
|
+
let mainIndexFile = '';
|
|
48
|
+
if (type === 'module') {
|
|
49
|
+
mainIndexFile = filepath + '.mjs';
|
|
50
|
+
if (fs.existsSync(mainIndexFile)) {
|
|
51
|
+
debug('[tryToResolveFromFile] %o, use index.mjs, type: %o', mainIndexFile, type);
|
|
52
|
+
return mainIndexFile;
|
|
53
|
+
}
|
|
54
|
+
mainIndexFile = filepath + '.js';
|
|
55
|
+
if (fs.existsSync(mainIndexFile)) {
|
|
56
|
+
debug('[tryToResolveFromFile] %o, use index.js, type: %o', mainIndexFile, type);
|
|
57
|
+
return mainIndexFile;
|
|
58
|
+
}
|
|
59
|
+
} else {
|
|
60
|
+
// "type": "commonjs", try index.js then index.cjs
|
|
61
|
+
mainIndexFile = filepath + '.cjs';
|
|
62
|
+
if (fs.existsSync(mainIndexFile)) {
|
|
63
|
+
debug('[tryToResolveFromFile] %o, use index.cjs, type: %o', mainIndexFile, type);
|
|
64
|
+
return mainIndexFile;
|
|
65
|
+
}
|
|
66
|
+
mainIndexFile = filepath + '.js';
|
|
67
|
+
if (fs.existsSync(mainIndexFile)) {
|
|
68
|
+
debug('[tryToResolveFromFile] %o, use index.js, type: %o', mainIndexFile, type);
|
|
69
|
+
return mainIndexFile;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
if (!isSupportTypeScript()) {
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
// for the module under development
|
|
78
|
+
mainIndexFile = filepath + '.ts';
|
|
79
|
+
if (fs.existsSync(mainIndexFile)) {
|
|
80
|
+
debug('[tryToResolveFromFile] %o, use index.ts, type: %o', mainIndexFile, type);
|
|
81
|
+
return mainIndexFile;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
function tryToResolveByDirnameFromPackage(dirname: string, pkg: any): string | undefined {
|
|
43
86
|
// try to read pkg.main or pkg.module first
|
|
44
87
|
// "main": "./dist/commonjs/index.js",
|
|
45
88
|
// "module": "./dist/esm/index.js"
|
|
46
89
|
const defaultMainFile = isESM ? pkg.module ?? pkg.main : pkg.main;
|
|
47
90
|
if (defaultMainFile) {
|
|
48
|
-
const mainIndexFilePath = path.join(
|
|
91
|
+
const mainIndexFilePath = path.join(dirname, defaultMainFile);
|
|
49
92
|
if (fs.existsSync(mainIndexFilePath)) {
|
|
50
|
-
debug('[
|
|
93
|
+
debug('[tryToResolveByDirnameFromPackage] %o, use pkg.main or pkg.module: %o, isESM: %s',
|
|
51
94
|
mainIndexFilePath, defaultMainFile, isESM);
|
|
52
|
-
return;
|
|
95
|
+
return mainIndexFilePath;
|
|
53
96
|
}
|
|
54
97
|
}
|
|
55
98
|
|
|
99
|
+
// "type": "module", try index.mjs then index.js
|
|
100
|
+
const type = pkg?.type ?? (isESM ? 'module' : 'commonjs');
|
|
101
|
+
if (type === 'module') {
|
|
102
|
+
const mainIndexFilePath = path.join(dirname, 'index.mjs');
|
|
103
|
+
if (fs.existsSync(mainIndexFilePath)) {
|
|
104
|
+
debug('[tryToResolveByDirnameFromPackage] %o, use index.mjs, pkg.type: %o', mainIndexFilePath, type);
|
|
105
|
+
return mainIndexFilePath;
|
|
106
|
+
}
|
|
107
|
+
const mainIndexMjsFilePath = path.join(dirname, 'index.js');
|
|
108
|
+
if (fs.existsSync(mainIndexMjsFilePath)) {
|
|
109
|
+
debug('[tryToResolveByDirnameFromPackage] %o, use index.js, pkg.type: %o', mainIndexMjsFilePath, type);
|
|
110
|
+
return mainIndexMjsFilePath;
|
|
111
|
+
}
|
|
112
|
+
} else {
|
|
113
|
+
// "type": "commonjs", try index.cjs then index.js
|
|
114
|
+
const mainIndexFilePath = path.join(dirname, 'index.cjs');
|
|
115
|
+
if (fs.existsSync(mainIndexFilePath)) {
|
|
116
|
+
debug('[tryToResolveByDirnameFromPackage] %o, use index.cjs, pkg.type: %o', mainIndexFilePath, type);
|
|
117
|
+
return mainIndexFilePath;
|
|
118
|
+
}
|
|
119
|
+
const mainIndexCjsFilePath = path.join(dirname, 'index.js');
|
|
120
|
+
if (fs.existsSync(mainIndexCjsFilePath)) {
|
|
121
|
+
debug('[tryToResolveByDirnameFromPackage] %o, use index.js, pkg.type: %o', mainIndexCjsFilePath, type);
|
|
122
|
+
return mainIndexCjsFilePath;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
if (!isSupportTypeScript()) {
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
129
|
+
|
|
56
130
|
// for the module under development
|
|
57
131
|
// "tshy": {
|
|
58
132
|
// "exports": {
|
|
@@ -60,33 +134,60 @@ function tryToGetTypeScriptMainFile(pkg: any, baseDir: string): string | undefin
|
|
|
60
134
|
// ".": "./src/index.ts"
|
|
61
135
|
// }
|
|
62
136
|
// }
|
|
63
|
-
const mainIndexFile = pkg.tshy?.exports?.['.'];
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
137
|
+
const mainIndexFile = pkg.tshy?.exports?.['.'] ?? 'index.ts';
|
|
138
|
+
const mainIndexFilePath = path.join(dirname, mainIndexFile);
|
|
139
|
+
if (fs.existsSync(mainIndexFilePath)) {
|
|
140
|
+
return mainIndexFilePath;
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
function tryToResolveByDirname(dirname: string): string | undefined {
|
|
145
|
+
const pkgFile = path.join(dirname, 'package.json');
|
|
146
|
+
if (fs.existsSync(pkgFile)) {
|
|
147
|
+
const pkg = JSON.parse(fs.readFileSync(pkgFile, 'utf-8'));
|
|
148
|
+
return tryToResolveByDirnameFromPackage(dirname, pkg);
|
|
69
149
|
}
|
|
70
150
|
}
|
|
71
151
|
|
|
72
152
|
export function importResolve(filepath: string, options?: ImportResolveOptions) {
|
|
73
|
-
|
|
74
|
-
if (path.isAbsolute(filepath)
|
|
75
|
-
const
|
|
76
|
-
if (
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
return mainFile;
|
|
153
|
+
let moduleFilePath: string | undefined;
|
|
154
|
+
if (path.isAbsolute(filepath)) {
|
|
155
|
+
const stat = fs.statSync(filepath, { throwIfNoEntry: false });
|
|
156
|
+
if (stat?.isDirectory()) {
|
|
157
|
+
moduleFilePath = tryToResolveByDirname(filepath);
|
|
158
|
+
if (moduleFilePath) {
|
|
159
|
+
debug('[importResolve] %o => %o', filepath, moduleFilePath);
|
|
160
|
+
return moduleFilePath;
|
|
82
161
|
}
|
|
83
162
|
}
|
|
163
|
+
if (!stat) {
|
|
164
|
+
moduleFilePath = tryToResolveFromFile(filepath);
|
|
165
|
+
if (moduleFilePath) {
|
|
166
|
+
debug('[importResolve] %o => %o', filepath, moduleFilePath);
|
|
167
|
+
return moduleFilePath;
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
if (isESM) {
|
|
173
|
+
if (supportImportMetaResolve) {
|
|
174
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
175
|
+
// @ts-ignore
|
|
176
|
+
moduleFilePath = import.meta.resolve(filepath);
|
|
177
|
+
if (moduleFilePath.startsWith('file://')) {
|
|
178
|
+
// resolve will return file:// URL on Linux and MacOS expect on Windows
|
|
179
|
+
moduleFilePath = fileURLToPath(moduleFilePath);
|
|
180
|
+
}
|
|
181
|
+
} else {
|
|
182
|
+
moduleFilePath = getRequire().resolve(filepath);
|
|
183
|
+
}
|
|
184
|
+
} else {
|
|
185
|
+
const cwd = process.cwd();
|
|
186
|
+
const paths = options?.paths ?? [ cwd ];
|
|
187
|
+
moduleFilePath = require.resolve(filepath, {
|
|
188
|
+
paths,
|
|
189
|
+
});
|
|
84
190
|
}
|
|
85
|
-
const cwd = process.cwd();
|
|
86
|
-
const paths = options?.paths ?? [ cwd ];
|
|
87
|
-
const moduleFilePath = getRequire().resolve(filepath, {
|
|
88
|
-
paths,
|
|
89
|
-
});
|
|
90
191
|
debug('[importResolve] %o, options: %o => %o', filepath, options, moduleFilePath);
|
|
91
192
|
return moduleFilePath;
|
|
92
193
|
}
|
|
@@ -94,22 +195,10 @@ export function importResolve(filepath: string, options?: ImportResolveOptions)
|
|
|
94
195
|
export async function importModule(filepath: string, options?: ImportModuleOptions) {
|
|
95
196
|
const moduleFilePath = importResolve(filepath, options);
|
|
96
197
|
let obj: any;
|
|
97
|
-
if (
|
|
98
|
-
// commonjs
|
|
99
|
-
obj = require(moduleFilePath);
|
|
100
|
-
debug('[importModule] require %o => %o', filepath, obj);
|
|
101
|
-
if (obj?.__esModule === true && 'default' in obj) {
|
|
102
|
-
// 兼容 cjs 模拟 esm 的导出格式
|
|
103
|
-
// {
|
|
104
|
-
// __esModule: true,
|
|
105
|
-
// default: { fn: [Function: fn], foo: 'bar', one: 1 }
|
|
106
|
-
// }
|
|
107
|
-
obj = obj.default;
|
|
108
|
-
}
|
|
109
|
-
} else {
|
|
198
|
+
if (isESM) {
|
|
110
199
|
// esm
|
|
111
|
-
debug('[importModule] await import start: %o', filepath);
|
|
112
200
|
const fileUrl = pathToFileURL(moduleFilePath).toString();
|
|
201
|
+
debug('[importModule] await import start: %o', fileUrl);
|
|
113
202
|
obj = await import(fileUrl);
|
|
114
203
|
debug('[importModule] await import end: %o => %o', filepath, obj);
|
|
115
204
|
// {
|
|
@@ -151,6 +240,18 @@ export async function importModule(filepath: string, options?: ImportModuleOptio
|
|
|
151
240
|
obj = obj.default;
|
|
152
241
|
}
|
|
153
242
|
}
|
|
243
|
+
} else {
|
|
244
|
+
// commonjs
|
|
245
|
+
obj = require(moduleFilePath);
|
|
246
|
+
debug('[importModule] require %o => %o', filepath, obj);
|
|
247
|
+
if (obj?.__esModule === true && 'default' in obj) {
|
|
248
|
+
// 兼容 cjs 模拟 esm 的导出格式
|
|
249
|
+
// {
|
|
250
|
+
// __esModule: true,
|
|
251
|
+
// default: { fn: [Function: fn], foo: 'bar', one: 1 }
|
|
252
|
+
// }
|
|
253
|
+
obj = obj.default;
|
|
254
|
+
}
|
|
154
255
|
}
|
|
155
256
|
debug('[importModule] return %o => %o', filepath, obj);
|
|
156
257
|
return obj;
|