@eggjs/utils 4.1.0 → 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 +161 -45
- package/dist/esm/import.js +162 -46
- package/dist/package.json +1 -1
- package/package.json +9 -6
- package/src/import.ts +168 -46
package/dist/commonjs/import.js
CHANGED
|
@@ -11,6 +11,9 @@ const node_url_1 = require("node:url");
|
|
|
11
11
|
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
|
+
const isESM = typeof require === 'undefined';
|
|
15
|
+
const nodeMajorVersion = parseInt(process.versions.node.split('.', 1)[0], 10);
|
|
16
|
+
const supportImportMetaResolve = nodeMajorVersion >= 18;
|
|
14
17
|
let _customRequire;
|
|
15
18
|
function getRequire() {
|
|
16
19
|
if (!_customRequire) {
|
|
@@ -23,66 +26,166 @@ function getRequire() {
|
|
|
23
26
|
}
|
|
24
27
|
return _customRequire;
|
|
25
28
|
}
|
|
26
|
-
let
|
|
29
|
+
let _supportTypeScript;
|
|
27
30
|
function isSupportTypeScript() {
|
|
28
|
-
if (
|
|
31
|
+
if (_supportTypeScript === undefined) {
|
|
29
32
|
const extensions = getRequire().extensions;
|
|
30
|
-
|
|
31
|
-
debug('[isSupportTypeScript] %o, extensions: %j',
|
|
33
|
+
_supportTypeScript = extensions['.ts'] !== undefined;
|
|
34
|
+
debug('[isSupportTypeScript] %o, extensions: %j', _supportTypeScript, Object.keys(extensions));
|
|
35
|
+
}
|
|
36
|
+
return _supportTypeScript;
|
|
37
|
+
}
|
|
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) {
|
|
78
|
+
// try to read pkg.main or pkg.module first
|
|
79
|
+
// "main": "./dist/commonjs/index.js",
|
|
80
|
+
// "module": "./dist/esm/index.js"
|
|
81
|
+
const defaultMainFile = isESM ? pkg.module ?? pkg.main : pkg.main;
|
|
82
|
+
if (defaultMainFile) {
|
|
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');
|
|
106
|
+
if (node_fs_1.default.existsSync(mainIndexFilePath)) {
|
|
107
|
+
debug('[tryToResolveByDirnameFromPackage] %o, use index.cjs, pkg.type: %o', mainIndexFilePath, type);
|
|
108
|
+
return mainIndexFilePath;
|
|
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;
|
|
118
|
+
}
|
|
119
|
+
// for the module under development
|
|
120
|
+
// "tshy": {
|
|
121
|
+
// "exports": {
|
|
122
|
+
// "./package.json": "./package.json",
|
|
123
|
+
// ".": "./src/index.ts"
|
|
124
|
+
// }
|
|
125
|
+
// }
|
|
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);
|
|
32
137
|
}
|
|
33
|
-
return supportTypeScript;
|
|
34
138
|
}
|
|
35
139
|
function importResolve(filepath, options) {
|
|
36
|
-
|
|
37
|
-
if (node_path_1.default.isAbsolute(filepath)
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
if (
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
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);
|
|
55
166
|
}
|
|
56
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
|
+
});
|
|
57
178
|
}
|
|
58
|
-
const cwd = process.cwd();
|
|
59
|
-
const paths = options?.paths ?? [cwd];
|
|
60
|
-
const moduleFilePath = getRequire().resolve(filepath, {
|
|
61
|
-
paths,
|
|
62
|
-
});
|
|
63
179
|
debug('[importResolve] %o, options: %o => %o', filepath, options, moduleFilePath);
|
|
64
180
|
return moduleFilePath;
|
|
65
181
|
}
|
|
66
182
|
async function importModule(filepath, options) {
|
|
67
183
|
const moduleFilePath = importResolve(filepath, options);
|
|
68
184
|
let obj;
|
|
69
|
-
if (
|
|
70
|
-
// commonjs
|
|
71
|
-
obj = require(moduleFilePath);
|
|
72
|
-
debug('[importModule] require %o => %o', filepath, obj);
|
|
73
|
-
if (obj?.__esModule === true && 'default' in obj) {
|
|
74
|
-
// 兼容 cjs 模拟 esm 的导出格式
|
|
75
|
-
// {
|
|
76
|
-
// __esModule: true,
|
|
77
|
-
// default: { fn: [Function: fn], foo: 'bar', one: 1 }
|
|
78
|
-
// }
|
|
79
|
-
obj = obj.default;
|
|
80
|
-
}
|
|
81
|
-
}
|
|
82
|
-
else {
|
|
185
|
+
if (isESM) {
|
|
83
186
|
// esm
|
|
84
|
-
debug('[importModule] await import start: %o', filepath);
|
|
85
187
|
const fileUrl = (0, node_url_1.pathToFileURL)(moduleFilePath).toString();
|
|
188
|
+
debug('[importModule] await import start: %o', fileUrl);
|
|
86
189
|
obj = await import(fileUrl);
|
|
87
190
|
debug('[importModule] await import end: %o => %o', filepath, obj);
|
|
88
191
|
// {
|
|
@@ -125,7 +228,20 @@ async function importModule(filepath, options) {
|
|
|
125
228
|
}
|
|
126
229
|
}
|
|
127
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
|
+
}
|
|
128
244
|
debug('[importModule] return %o => %o', filepath, obj);
|
|
129
245
|
return obj;
|
|
130
246
|
}
|
|
131
|
-
//# 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,9 +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
|
+
const isESM = typeof require === 'undefined';
|
|
8
|
+
const nodeMajorVersion = parseInt(process.versions.node.split('.', 1)[0], 10);
|
|
9
|
+
const supportImportMetaResolve = nodeMajorVersion >= 18;
|
|
7
10
|
let _customRequire;
|
|
8
11
|
function getRequire() {
|
|
9
12
|
if (!_customRequire) {
|
|
@@ -16,66 +19,166 @@ function getRequire() {
|
|
|
16
19
|
}
|
|
17
20
|
return _customRequire;
|
|
18
21
|
}
|
|
19
|
-
let
|
|
22
|
+
let _supportTypeScript;
|
|
20
23
|
function isSupportTypeScript() {
|
|
21
|
-
if (
|
|
24
|
+
if (_supportTypeScript === undefined) {
|
|
22
25
|
const extensions = getRequire().extensions;
|
|
23
|
-
|
|
24
|
-
debug('[isSupportTypeScript] %o, extensions: %j',
|
|
26
|
+
_supportTypeScript = extensions['.ts'] !== undefined;
|
|
27
|
+
debug('[isSupportTypeScript] %o, extensions: %j', _supportTypeScript, Object.keys(extensions));
|
|
28
|
+
}
|
|
29
|
+
return _supportTypeScript;
|
|
30
|
+
}
|
|
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) {
|
|
71
|
+
// try to read pkg.main or pkg.module first
|
|
72
|
+
// "main": "./dist/commonjs/index.js",
|
|
73
|
+
// "module": "./dist/esm/index.js"
|
|
74
|
+
const defaultMainFile = isESM ? pkg.module ?? pkg.main : pkg.main;
|
|
75
|
+
if (defaultMainFile) {
|
|
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');
|
|
99
|
+
if (fs.existsSync(mainIndexFilePath)) {
|
|
100
|
+
debug('[tryToResolveByDirnameFromPackage] %o, use index.cjs, pkg.type: %o', mainIndexFilePath, type);
|
|
101
|
+
return mainIndexFilePath;
|
|
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;
|
|
111
|
+
}
|
|
112
|
+
// for the module under development
|
|
113
|
+
// "tshy": {
|
|
114
|
+
// "exports": {
|
|
115
|
+
// "./package.json": "./package.json",
|
|
116
|
+
// ".": "./src/index.ts"
|
|
117
|
+
// }
|
|
118
|
+
// }
|
|
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);
|
|
25
130
|
}
|
|
26
|
-
return supportTypeScript;
|
|
27
131
|
}
|
|
28
132
|
export function importResolve(filepath, options) {
|
|
29
|
-
|
|
30
|
-
if (path.isAbsolute(filepath)
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
if (
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
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);
|
|
48
159
|
}
|
|
49
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
|
+
});
|
|
50
171
|
}
|
|
51
|
-
const cwd = process.cwd();
|
|
52
|
-
const paths = options?.paths ?? [cwd];
|
|
53
|
-
const moduleFilePath = getRequire().resolve(filepath, {
|
|
54
|
-
paths,
|
|
55
|
-
});
|
|
56
172
|
debug('[importResolve] %o, options: %o => %o', filepath, options, moduleFilePath);
|
|
57
173
|
return moduleFilePath;
|
|
58
174
|
}
|
|
59
175
|
export async function importModule(filepath, options) {
|
|
60
176
|
const moduleFilePath = importResolve(filepath, options);
|
|
61
177
|
let obj;
|
|
62
|
-
if (
|
|
63
|
-
// commonjs
|
|
64
|
-
obj = require(moduleFilePath);
|
|
65
|
-
debug('[importModule] require %o => %o', filepath, obj);
|
|
66
|
-
if (obj?.__esModule === true && 'default' in obj) {
|
|
67
|
-
// 兼容 cjs 模拟 esm 的导出格式
|
|
68
|
-
// {
|
|
69
|
-
// __esModule: true,
|
|
70
|
-
// default: { fn: [Function: fn], foo: 'bar', one: 1 }
|
|
71
|
-
// }
|
|
72
|
-
obj = obj.default;
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
else {
|
|
178
|
+
if (isESM) {
|
|
76
179
|
// esm
|
|
77
|
-
debug('[importModule] await import start: %o', filepath);
|
|
78
180
|
const fileUrl = pathToFileURL(moduleFilePath).toString();
|
|
181
|
+
debug('[importModule] await import start: %o', fileUrl);
|
|
79
182
|
obj = await import(fileUrl);
|
|
80
183
|
debug('[importModule] await import end: %o => %o', filepath, obj);
|
|
81
184
|
// {
|
|
@@ -118,7 +221,20 @@ export async function importModule(filepath, options) {
|
|
|
118
221
|
}
|
|
119
222
|
}
|
|
120
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
|
+
}
|
|
121
237
|
debug('[importModule] return %o => %o', filepath, obj);
|
|
122
238
|
return obj;
|
|
123
239
|
}
|
|
124
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
240
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"import.js","sourceRoot":"","sources":["../../src/import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,MAAM,KAAK,GAAG,QAAQ,CAAC,qBAAqB,CAAC,CAAC;AAW9C,MAAM,KAAK,GAAG,OAAO,OAAO,KAAK,WAAW,CAAC;AAC7C,MAAM,gBAAgB,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAC9E,MAAM,wBAAwB,GAAG,gBAAgB,IAAI,EAAE,CAAC;AAExD,IAAI,cAA2B,CAAC;AAChC,SAAS,UAAU;IACjB,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE,CAAC;YACnC,cAAc,GAAG,OAAO,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,cAAc,GAAG,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IACD,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,IAAI,kBAAuC,CAAC;AAC5C,SAAS,mBAAmB;IAC1B,IAAI,kBAAkB,KAAK,SAAS,EAAE,CAAC;QACrC,MAAM,UAAU,GAAG,UAAU,EAAE,CAAC,UAAU,CAAC;QAC3C,kBAAkB,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC;QACrD,KAAK,CAAC,0CAA0C,EAAE,kBAAkB,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IACjG,CAAC;IACD,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAED,SAAS,oBAAoB,CAAC,QAAgB;IAC5C,gDAAgD;IAChD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC;IAC3C,IAAI,aAAa,GAAG,EAAE,CAAC;IACvB,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,aAAa,GAAG,QAAQ,GAAG,MAAM,CAAC;QAClC,IAAI,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YACjC,KAAK,CAAC,oDAAoD,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;YACjF,OAAO,aAAa,CAAC;QACvB,CAAC;QACD,aAAa,GAAG,QAAQ,GAAG,KAAK,CAAC;QACjC,IAAI,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YACjC,KAAK,CAAC,mDAAmD,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;YAChF,OAAO,aAAa,CAAC;QACvB,CAAC;IACH,CAAC;SAAM,CAAC;QACN,kDAAkD;QAClD,aAAa,GAAG,QAAQ,GAAG,MAAM,CAAC;QAClC,IAAI,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YACjC,KAAK,CAAC,oDAAoD,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;YACjF,OAAO,aAAa,CAAC;QACvB,CAAC;QACD,aAAa,GAAG,QAAQ,GAAG,KAAK,CAAC;QACjC,IAAI,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YACjC,KAAK,CAAC,mDAAmD,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;YAChF,OAAO,aAAa,CAAC;QACvB,CAAC;IACH,CAAC;IAED,IAAI,CAAC,mBAAmB,EAAE,EAAE,CAAC;QAC3B,OAAO;IACT,CAAC;IAED,mCAAmC;IACnC,aAAa,GAAG,QAAQ,GAAG,KAAK,CAAC;IACjC,IAAI,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QACjC,KAAK,CAAC,mDAAmD,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;QAChF,OAAO,aAAa,CAAC;IACvB,CAAC;AACH,CAAC;AAED,SAAS,gCAAgC,CAAC,OAAe,EAAE,GAAQ;IACjE,2CAA2C;IAC3C,sCAAsC;IACtC,kCAAkC;IAClC,MAAM,eAAe,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;IAClE,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAC9D,IAAI,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACrC,KAAK,CAAC,kFAAkF,EACtF,iBAAiB,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC;YAC7C,OAAO,iBAAiB,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,gDAAgD;IAChD,MAAM,IAAI,GAAG,GAAG,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IAC1D,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC1D,IAAI,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACrC,KAAK,CAAC,oEAAoE,EAAE,iBAAiB,EAAE,IAAI,CAAC,CAAC;YACrG,OAAO,iBAAiB,CAAC;QAC3B,CAAC;QACD,MAAM,oBAAoB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC5D,IAAI,EAAE,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE,CAAC;YACxC,KAAK,CAAC,mEAAmE,EAAE,oBAAoB,EAAE,IAAI,CAAC,CAAC;YACvG,OAAO,oBAAoB,CAAC;QAC9B,CAAC;IACH,CAAC;SAAM,CAAC;QACN,kDAAkD;QAClD,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC1D,IAAI,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACrC,KAAK,CAAC,oEAAoE,EAAE,iBAAiB,EAAE,IAAI,CAAC,CAAC;YACrG,OAAO,iBAAiB,CAAC;QAC3B,CAAC;QACD,MAAM,oBAAoB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC5D,IAAI,EAAE,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE,CAAC;YACxC,KAAK,CAAC,mEAAmE,EAAE,oBAAoB,EAAE,IAAI,CAAC,CAAC;YACvG,OAAO,oBAAoB,CAAC;QAC9B,CAAC;IACH,CAAC;IAED,IAAI,CAAC,mBAAmB,EAAE,EAAE,CAAC;QAC3B,OAAO;IACT,CAAC;IAED,mCAAmC;IACnC,YAAY;IACZ,iBAAiB;IACjB,0CAA0C;IAC1C,4BAA4B;IAC5B,MAAM;IACN,IAAI;IACJ,MAAM,aAAa,GAAG,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC;IAC7D,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC5D,IAAI,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACrC,OAAO,iBAAiB,CAAC;IAC3B,CAAC;AACH,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAe;IAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IACnD,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QAC1D,OAAO,gCAAgC,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACxD,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,QAAgB,EAAE,OAA8B;IAC5E,IAAI,cAAkC,CAAC;IACvC,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC;QAC9D,IAAI,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC;YACxB,cAAc,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC;YACjD,IAAI,cAAc,EAAE,CAAC;gBACnB,KAAK,CAAC,0BAA0B,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;gBAC5D,OAAO,cAAc,CAAC;YACxB,CAAC;QACH,CAAC;QACD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,cAAc,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;YAChD,IAAI,cAAc,EAAE,CAAC;gBACnB,KAAK,CAAC,0BAA0B,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;gBAC5D,OAAO,cAAc,CAAC;YACxB,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,KAAK,EAAE,CAAC;QACV,IAAI,wBAAwB,EAAE,CAAC;YAC7B,6DAA6D;YAC7D,aAAa;YACb,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC/C,IAAI,cAAc,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBACzC,uEAAuE;gBACvE,cAAc,GAAG,aAAa,CAAC,cAAc,CAAC,CAAC;YACjD,CAAC;QACH,CAAC;aAAM,CAAC;YACN,cAAc,GAAG,UAAU,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,OAAO,EAAE,KAAK,IAAI,CAAE,GAAG,CAAE,CAAC;QACxC,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE;YACzC,KAAK;SACN,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,uCAAuC,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAClF,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,QAAgB,EAAE,OAA6B;IAChF,MAAM,cAAc,GAAG,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACxD,IAAI,GAAQ,CAAC;IACb,IAAI,KAAK,EAAE,CAAC;QACV,MAAM;QACN,MAAM,OAAO,GAAG,aAAa,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,CAAC;QACzD,KAAK,CAAC,uCAAuC,EAAE,OAAO,CAAC,CAAC;QACxD,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC;QAC5B,KAAK,CAAC,2CAA2C,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;QAClE,IAAI;QACJ,qCAAqC;QACrC,gBAAgB;QAChB,YAAY;QACZ,2CAA2C;QAC3C,IAAI;QACJ,IAAI,GAAG,EAAE,OAAO,EAAE,UAAU,KAAK,IAAI,IAAI,SAAS,IAAI,GAAG,EAAE,OAAO,EAAE,CAAC;YACnE,sBAAsB;YACtB,IAAI;YACJ,sBAAsB;YACtB,eAAe;YACf,wBAAwB;YACxB,iBAAiB;YACjB,0DAA0D;YAC1D,oBAAoB;YACpB,eAAe;YACf,QAAQ;YACR,OAAO;YACP,2CAA2C;YAC3C,IAAI;YACJ,eAAe;YACf,IAAI;YACJ,eAAe;YACf,0BAA0B;YAC1B,gDAAgD;YAChD,qBAAqB;YACrB,6BAA6B;YAC7B,sDAAsD;YACtD,QAAQ;YACR,OAAO;YACP,2CAA2C;YAC3C,IAAI;YACJ,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC;QACpB,CAAC;QACD,IAAI,OAAO,EAAE,iBAAiB,EAAE,CAAC;YAC/B,IAAI,SAAS,IAAI,GAAG,EAAE,CAAC;gBACrB,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC;YACpB,CAAC;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,WAAW;QACX,GAAG,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;QAC9B,KAAK,CAAC,iCAAiC,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;QACxD,IAAI,GAAG,EAAE,UAAU,KAAK,IAAI,IAAI,SAAS,IAAI,GAAG,EAAE,CAAC;YACjD,sBAAsB;YACtB,IAAI;YACJ,sBAAsB;YACtB,wDAAwD;YACxD,IAAI;YACJ,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC;QACpB,CAAC;IACH,CAAC;IACD,KAAK,CAAC,gCAAgC,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;IACvD,OAAO,GAAG,CAAC;AACb,CAAC"}
|
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,13 +1,11 @@
|
|
|
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
|
|
|
7
7
|
const debug = debuglog('@eggjs/utils/import');
|
|
8
8
|
|
|
9
|
-
let _customRequire: NodeRequire;
|
|
10
|
-
|
|
11
9
|
export interface ImportResolveOptions {
|
|
12
10
|
paths?: string[];
|
|
13
11
|
}
|
|
@@ -17,6 +15,11 @@ export interface ImportModuleOptions extends ImportResolveOptions {
|
|
|
17
15
|
importDefaultOnly?: boolean;
|
|
18
16
|
}
|
|
19
17
|
|
|
18
|
+
const isESM = typeof require === 'undefined';
|
|
19
|
+
const nodeMajorVersion = parseInt(process.versions.node.split('.', 1)[0], 10);
|
|
20
|
+
const supportImportMetaResolve = nodeMajorVersion >= 18;
|
|
21
|
+
|
|
22
|
+
let _customRequire: NodeRequire;
|
|
20
23
|
function getRequire() {
|
|
21
24
|
if (!_customRequire) {
|
|
22
25
|
if (typeof require !== 'undefined') {
|
|
@@ -28,44 +31,163 @@ function getRequire() {
|
|
|
28
31
|
return _customRequire;
|
|
29
32
|
}
|
|
30
33
|
|
|
31
|
-
let
|
|
34
|
+
let _supportTypeScript: boolean | undefined;
|
|
32
35
|
function isSupportTypeScript() {
|
|
33
|
-
if (
|
|
36
|
+
if (_supportTypeScript === undefined) {
|
|
34
37
|
const extensions = getRequire().extensions;
|
|
35
|
-
|
|
36
|
-
debug('[isSupportTypeScript] %o, extensions: %j',
|
|
38
|
+
_supportTypeScript = extensions['.ts'] !== undefined;
|
|
39
|
+
debug('[isSupportTypeScript] %o, extensions: %j', _supportTypeScript, Object.keys(extensions));
|
|
40
|
+
}
|
|
41
|
+
return _supportTypeScript;
|
|
42
|
+
}
|
|
43
|
+
|
|
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 {
|
|
86
|
+
// try to read pkg.main or pkg.module first
|
|
87
|
+
// "main": "./dist/commonjs/index.js",
|
|
88
|
+
// "module": "./dist/esm/index.js"
|
|
89
|
+
const defaultMainFile = isESM ? pkg.module ?? pkg.main : pkg.main;
|
|
90
|
+
if (defaultMainFile) {
|
|
91
|
+
const mainIndexFilePath = path.join(dirname, defaultMainFile);
|
|
92
|
+
if (fs.existsSync(mainIndexFilePath)) {
|
|
93
|
+
debug('[tryToResolveByDirnameFromPackage] %o, use pkg.main or pkg.module: %o, isESM: %s',
|
|
94
|
+
mainIndexFilePath, defaultMainFile, isESM);
|
|
95
|
+
return mainIndexFilePath;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
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
|
+
|
|
130
|
+
// for the module under development
|
|
131
|
+
// "tshy": {
|
|
132
|
+
// "exports": {
|
|
133
|
+
// "./package.json": "./package.json",
|
|
134
|
+
// ".": "./src/index.ts"
|
|
135
|
+
// }
|
|
136
|
+
// }
|
|
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);
|
|
37
149
|
}
|
|
38
|
-
return supportTypeScript;
|
|
39
150
|
}
|
|
40
151
|
|
|
41
152
|
export function importResolve(filepath: string, options?: ImportResolveOptions) {
|
|
42
|
-
|
|
43
|
-
if (path.isAbsolute(filepath)
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
if (
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
debug('[importResolve] %o, options: %o => %o, use typescript', filepath, options, mainIndexFilePath);
|
|
58
|
-
return mainIndexFilePath;
|
|
59
|
-
}
|
|
60
|
-
debug('[importResolve] typescript file %o not exists', mainIndexFilePath);
|
|
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;
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
if (!stat) {
|
|
164
|
+
moduleFilePath = tryToResolveFromFile(filepath);
|
|
165
|
+
if (moduleFilePath) {
|
|
166
|
+
debug('[importResolve] %o => %o', filepath, moduleFilePath);
|
|
167
|
+
return moduleFilePath;
|
|
61
168
|
}
|
|
62
169
|
}
|
|
63
170
|
}
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
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
|
+
});
|
|
190
|
+
}
|
|
69
191
|
debug('[importResolve] %o, options: %o => %o', filepath, options, moduleFilePath);
|
|
70
192
|
return moduleFilePath;
|
|
71
193
|
}
|
|
@@ -73,22 +195,10 @@ export function importResolve(filepath: string, options?: ImportResolveOptions)
|
|
|
73
195
|
export async function importModule(filepath: string, options?: ImportModuleOptions) {
|
|
74
196
|
const moduleFilePath = importResolve(filepath, options);
|
|
75
197
|
let obj: any;
|
|
76
|
-
if (
|
|
77
|
-
// commonjs
|
|
78
|
-
obj = require(moduleFilePath);
|
|
79
|
-
debug('[importModule] require %o => %o', filepath, obj);
|
|
80
|
-
if (obj?.__esModule === true && 'default' in obj) {
|
|
81
|
-
// 兼容 cjs 模拟 esm 的导出格式
|
|
82
|
-
// {
|
|
83
|
-
// __esModule: true,
|
|
84
|
-
// default: { fn: [Function: fn], foo: 'bar', one: 1 }
|
|
85
|
-
// }
|
|
86
|
-
obj = obj.default;
|
|
87
|
-
}
|
|
88
|
-
} else {
|
|
198
|
+
if (isESM) {
|
|
89
199
|
// esm
|
|
90
|
-
debug('[importModule] await import start: %o', filepath);
|
|
91
200
|
const fileUrl = pathToFileURL(moduleFilePath).toString();
|
|
201
|
+
debug('[importModule] await import start: %o', fileUrl);
|
|
92
202
|
obj = await import(fileUrl);
|
|
93
203
|
debug('[importModule] await import end: %o => %o', filepath, obj);
|
|
94
204
|
// {
|
|
@@ -130,6 +240,18 @@ export async function importModule(filepath: string, options?: ImportModuleOptio
|
|
|
130
240
|
obj = obj.default;
|
|
131
241
|
}
|
|
132
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
|
+
}
|
|
133
255
|
}
|
|
134
256
|
debug('[importModule] return %o => %o', filepath, obj);
|
|
135
257
|
return obj;
|