@eggjs/utils 4.1.3 → 4.1.4
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 +20 -16
- package/dist/esm/import.js +20 -16
- package/dist/package.json +1 -1
- package/package.json +3 -3
- package/src/import.ts +18 -14
package/dist/commonjs/import.js
CHANGED
|
@@ -138,8 +138,10 @@ function tryToResolveByDirname(dirname) {
|
|
|
138
138
|
}
|
|
139
139
|
function importResolve(filepath, options) {
|
|
140
140
|
let moduleFilePath;
|
|
141
|
-
|
|
141
|
+
const isAbsolute = node_path_1.default.isAbsolute(filepath);
|
|
142
|
+
if (isAbsolute) {
|
|
142
143
|
const stat = node_fs_1.default.statSync(filepath, { throwIfNoEntry: false });
|
|
144
|
+
// try to resolve from directory
|
|
143
145
|
if (stat?.isDirectory()) {
|
|
144
146
|
moduleFilePath = tryToResolveByDirname(filepath);
|
|
145
147
|
if (moduleFilePath) {
|
|
@@ -147,15 +149,24 @@ function importResolve(filepath, options) {
|
|
|
147
149
|
return moduleFilePath;
|
|
148
150
|
}
|
|
149
151
|
}
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
}
|
|
152
|
+
// try to resolve from file
|
|
153
|
+
moduleFilePath = tryToResolveFromFile(filepath);
|
|
154
|
+
if (moduleFilePath) {
|
|
155
|
+
debug('[importResolve] %o => %o', filepath, moduleFilePath);
|
|
156
|
+
return moduleFilePath;
|
|
156
157
|
}
|
|
157
158
|
}
|
|
158
|
-
|
|
159
|
+
const extname = node_path_1.default.extname(filepath);
|
|
160
|
+
if ((!isAbsolute && extname === '.json') || !isESM) {
|
|
161
|
+
// find *.json or CommonJS module by require.resolve
|
|
162
|
+
// e.g.: importResolve('egg/package.json', { paths })
|
|
163
|
+
const cwd = process.cwd();
|
|
164
|
+
const paths = options?.paths ?? [cwd];
|
|
165
|
+
moduleFilePath = getRequire().resolve(filepath, {
|
|
166
|
+
paths,
|
|
167
|
+
});
|
|
168
|
+
}
|
|
169
|
+
else {
|
|
159
170
|
if (supportImportMetaResolve) {
|
|
160
171
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
161
172
|
// @ts-ignore
|
|
@@ -172,13 +183,6 @@ function importResolve(filepath, options) {
|
|
|
172
183
|
moduleFilePath = getRequire().resolve(filepath);
|
|
173
184
|
}
|
|
174
185
|
}
|
|
175
|
-
else {
|
|
176
|
-
const cwd = process.cwd();
|
|
177
|
-
const paths = options?.paths ?? [cwd];
|
|
178
|
-
moduleFilePath = require.resolve(filepath, {
|
|
179
|
-
paths,
|
|
180
|
-
});
|
|
181
|
-
}
|
|
182
186
|
debug('[importResolve] %o, options: %o => %o, isESM: %s', filepath, options, moduleFilePath, isESM);
|
|
183
187
|
return moduleFilePath;
|
|
184
188
|
}
|
|
@@ -248,4 +252,4 @@ async function importModule(filepath, options) {
|
|
|
248
252
|
}
|
|
249
253
|
return obj;
|
|
250
254
|
}
|
|
251
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
255
|
+
//# 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
|
@@ -131,8 +131,10 @@ function tryToResolveByDirname(dirname) {
|
|
|
131
131
|
}
|
|
132
132
|
export function importResolve(filepath, options) {
|
|
133
133
|
let moduleFilePath;
|
|
134
|
-
|
|
134
|
+
const isAbsolute = path.isAbsolute(filepath);
|
|
135
|
+
if (isAbsolute) {
|
|
135
136
|
const stat = fs.statSync(filepath, { throwIfNoEntry: false });
|
|
137
|
+
// try to resolve from directory
|
|
136
138
|
if (stat?.isDirectory()) {
|
|
137
139
|
moduleFilePath = tryToResolveByDirname(filepath);
|
|
138
140
|
if (moduleFilePath) {
|
|
@@ -140,15 +142,24 @@ export function importResolve(filepath, options) {
|
|
|
140
142
|
return moduleFilePath;
|
|
141
143
|
}
|
|
142
144
|
}
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
}
|
|
145
|
+
// try to resolve from file
|
|
146
|
+
moduleFilePath = tryToResolveFromFile(filepath);
|
|
147
|
+
if (moduleFilePath) {
|
|
148
|
+
debug('[importResolve] %o => %o', filepath, moduleFilePath);
|
|
149
|
+
return moduleFilePath;
|
|
149
150
|
}
|
|
150
151
|
}
|
|
151
|
-
|
|
152
|
+
const extname = path.extname(filepath);
|
|
153
|
+
if ((!isAbsolute && extname === '.json') || !isESM) {
|
|
154
|
+
// find *.json or CommonJS module by require.resolve
|
|
155
|
+
// e.g.: importResolve('egg/package.json', { paths })
|
|
156
|
+
const cwd = process.cwd();
|
|
157
|
+
const paths = options?.paths ?? [cwd];
|
|
158
|
+
moduleFilePath = getRequire().resolve(filepath, {
|
|
159
|
+
paths,
|
|
160
|
+
});
|
|
161
|
+
}
|
|
162
|
+
else {
|
|
152
163
|
if (supportImportMetaResolve) {
|
|
153
164
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
154
165
|
// @ts-ignore
|
|
@@ -165,13 +176,6 @@ export function importResolve(filepath, options) {
|
|
|
165
176
|
moduleFilePath = getRequire().resolve(filepath);
|
|
166
177
|
}
|
|
167
178
|
}
|
|
168
|
-
else {
|
|
169
|
-
const cwd = process.cwd();
|
|
170
|
-
const paths = options?.paths ?? [cwd];
|
|
171
|
-
moduleFilePath = require.resolve(filepath, {
|
|
172
|
-
paths,
|
|
173
|
-
});
|
|
174
|
-
}
|
|
175
179
|
debug('[importResolve] %o, options: %o => %o, isESM: %s', filepath, options, moduleFilePath, isESM);
|
|
176
180
|
return moduleFilePath;
|
|
177
181
|
}
|
|
@@ -241,4 +245,4 @@ export async function importModule(filepath, options) {
|
|
|
241
245
|
}
|
|
242
246
|
return obj;
|
|
243
247
|
}
|
|
244
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
248
|
+
//# 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.4",
|
|
4
4
|
"engine": {
|
|
5
5
|
"node": ">=18.19.0"
|
|
6
6
|
},
|
|
@@ -35,10 +35,10 @@
|
|
|
35
35
|
"@types/mocha": "10",
|
|
36
36
|
"@types/node": "22",
|
|
37
37
|
"coffee": "5",
|
|
38
|
-
"egg-bin": "6",
|
|
38
|
+
"egg-bin": "^6.13.0",
|
|
39
39
|
"eslint": "8",
|
|
40
40
|
"eslint-config-egg": "14",
|
|
41
|
-
"mm": "
|
|
41
|
+
"mm": "4",
|
|
42
42
|
"npminstall": "7",
|
|
43
43
|
"rimraf": "6",
|
|
44
44
|
"runscript": "2",
|
package/src/import.ts
CHANGED
|
@@ -151,8 +151,10 @@ function tryToResolveByDirname(dirname: string): string | undefined {
|
|
|
151
151
|
|
|
152
152
|
export function importResolve(filepath: string, options?: ImportResolveOptions) {
|
|
153
153
|
let moduleFilePath: string | undefined;
|
|
154
|
-
|
|
154
|
+
const isAbsolute = path.isAbsolute(filepath);
|
|
155
|
+
if (isAbsolute) {
|
|
155
156
|
const stat = fs.statSync(filepath, { throwIfNoEntry: false });
|
|
157
|
+
// try to resolve from directory
|
|
156
158
|
if (stat?.isDirectory()) {
|
|
157
159
|
moduleFilePath = tryToResolveByDirname(filepath);
|
|
158
160
|
if (moduleFilePath) {
|
|
@@ -160,16 +162,24 @@ export function importResolve(filepath: string, options?: ImportResolveOptions)
|
|
|
160
162
|
return moduleFilePath;
|
|
161
163
|
}
|
|
162
164
|
}
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
}
|
|
165
|
+
// try to resolve from file
|
|
166
|
+
moduleFilePath = tryToResolveFromFile(filepath);
|
|
167
|
+
if (moduleFilePath) {
|
|
168
|
+
debug('[importResolve] %o => %o', filepath, moduleFilePath);
|
|
169
|
+
return moduleFilePath;
|
|
169
170
|
}
|
|
170
171
|
}
|
|
171
172
|
|
|
172
|
-
|
|
173
|
+
const extname = path.extname(filepath);
|
|
174
|
+
if ((!isAbsolute && extname === '.json') || !isESM) {
|
|
175
|
+
// find *.json or CommonJS module by require.resolve
|
|
176
|
+
// e.g.: importResolve('egg/package.json', { paths })
|
|
177
|
+
const cwd = process.cwd();
|
|
178
|
+
const paths = options?.paths ?? [ cwd ];
|
|
179
|
+
moduleFilePath = getRequire().resolve(filepath, {
|
|
180
|
+
paths,
|
|
181
|
+
});
|
|
182
|
+
} else {
|
|
173
183
|
if (supportImportMetaResolve) {
|
|
174
184
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
175
185
|
// @ts-ignore
|
|
@@ -184,12 +194,6 @@ export function importResolve(filepath: string, options?: ImportResolveOptions)
|
|
|
184
194
|
} else {
|
|
185
195
|
moduleFilePath = getRequire().resolve(filepath);
|
|
186
196
|
}
|
|
187
|
-
} else {
|
|
188
|
-
const cwd = process.cwd();
|
|
189
|
-
const paths = options?.paths ?? [ cwd ];
|
|
190
|
-
moduleFilePath = require.resolve(filepath, {
|
|
191
|
-
paths,
|
|
192
|
-
});
|
|
193
197
|
}
|
|
194
198
|
debug('[importResolve] %o, options: %o => %o, isESM: %s',
|
|
195
199
|
filepath, options, moduleFilePath, isESM);
|