@eggjs/utils 4.0.3 → 4.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -4
- package/dist/commonjs/import.js +63 -6
- package/dist/commonjs/plugin.js +1 -1
- package/dist/esm/import.js +60 -6
- package/dist/esm/plugin.js +1 -1
- package/dist/package.json +1 -1
- package/package.json +2 -2
- package/src/import.ts +66 -7
- package/src/plugin.ts +1 -1
package/README.md
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
# @eggjs/utils
|
|
2
2
|
|
|
3
3
|
[![NPM version][npm-image]][npm-url]
|
|
4
|
-
[](https://github.com/eggjs/utils/actions/workflows/nodejs.yml)
|
|
5
5
|
[![Test coverage][codecov-image]][codecov-url]
|
|
6
6
|
[![npm download][download-image]][download-url]
|
|
7
7
|
|
|
8
8
|
[npm-image]: https://img.shields.io/npm/v/@eggjs/utils.svg?style=flat-square
|
|
9
9
|
[npm-url]: https://npmjs.org/package/@eggjs/utils
|
|
10
|
-
[codecov-image]: https://codecov.io/github/eggjs/
|
|
11
|
-
[codecov-url]: https://codecov.io/github/eggjs/
|
|
10
|
+
[codecov-image]: https://codecov.io/github/eggjs/utils/coverage.svg?branch=master
|
|
11
|
+
[codecov-url]: https://codecov.io/github/eggjs/utils?branch=master
|
|
12
12
|
[download-image]: https://img.shields.io/npm/dm/@eggjs/utils.svg?style=flat-square
|
|
13
13
|
[download-url]: https://npmjs.org/package/@eggjs/utils
|
|
14
14
|
|
|
@@ -51,6 +51,6 @@ npm i @eggjs/utils
|
|
|
51
51
|
|
|
52
52
|
## Contributors
|
|
53
53
|
|
|
54
|
-
[](https://github.com/eggjs/utils/graphs/contributors)
|
|
55
55
|
|
|
56
56
|
Made with [contributors-img](https://contrib.rocks).
|
package/dist/commonjs/import.js
CHANGED
|
@@ -1,24 +1,81 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.importResolve = importResolve;
|
|
4
7
|
exports.importModule = importModule;
|
|
5
8
|
const node_util_1 = require("node:util");
|
|
6
9
|
const node_module_1 = require("node:module");
|
|
7
10
|
const node_url_1 = require("node:url");
|
|
8
|
-
const
|
|
11
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
12
|
+
const node_fs_1 = __importDefault(require("node:fs"));
|
|
13
|
+
const debug = (0, node_util_1.debuglog)('@eggjs/utils/import');
|
|
14
|
+
const isESM = typeof require === 'undefined';
|
|
9
15
|
let _customRequire;
|
|
10
|
-
function
|
|
11
|
-
const cwd = process.cwd();
|
|
16
|
+
function getRequire() {
|
|
12
17
|
if (!_customRequire) {
|
|
13
18
|
if (typeof require !== 'undefined') {
|
|
14
19
|
_customRequire = require;
|
|
15
20
|
}
|
|
16
21
|
else {
|
|
17
|
-
_customRequire = (0, node_module_1.createRequire)(cwd);
|
|
22
|
+
_customRequire = (0, node_module_1.createRequire)(process.cwd());
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
return _customRequire;
|
|
26
|
+
}
|
|
27
|
+
let _supportTypeScript;
|
|
28
|
+
function isSupportTypeScript() {
|
|
29
|
+
if (_supportTypeScript === undefined) {
|
|
30
|
+
const extensions = getRequire().extensions;
|
|
31
|
+
_supportTypeScript = extensions['.ts'] !== undefined;
|
|
32
|
+
debug('[isSupportTypeScript] %o, extensions: %j', _supportTypeScript, Object.keys(extensions));
|
|
33
|
+
}
|
|
34
|
+
return _supportTypeScript;
|
|
35
|
+
}
|
|
36
|
+
function tryToGetTypeScriptMainFile(pkg, baseDir) {
|
|
37
|
+
// try to read pkg.main or pkg.module first
|
|
38
|
+
// "main": "./dist/commonjs/index.js",
|
|
39
|
+
// "module": "./dist/esm/index.js"
|
|
40
|
+
const defaultMainFile = isESM ? pkg.module ?? pkg.main : pkg.main;
|
|
41
|
+
if (defaultMainFile) {
|
|
42
|
+
const mainIndexFilePath = node_path_1.default.join(baseDir, defaultMainFile);
|
|
43
|
+
if (node_fs_1.default.existsSync(mainIndexFilePath)) {
|
|
44
|
+
debug('[tryToGetTypeScriptMainFile] %o, use pkg.main or pkg.module: %o, isESM: %s', mainIndexFilePath, defaultMainFile, isESM);
|
|
45
|
+
return;
|
|
18
46
|
}
|
|
19
47
|
}
|
|
48
|
+
// for the module under development
|
|
49
|
+
// "tshy": {
|
|
50
|
+
// "exports": {
|
|
51
|
+
// "./package.json": "./package.json",
|
|
52
|
+
// ".": "./src/index.ts"
|
|
53
|
+
// }
|
|
54
|
+
// }
|
|
55
|
+
const mainIndexFile = pkg.tshy?.exports?.['.'];
|
|
56
|
+
if (mainIndexFile) {
|
|
57
|
+
const mainIndexFilePath = node_path_1.default.join(baseDir, mainIndexFile);
|
|
58
|
+
if (node_fs_1.default.existsSync(mainIndexFilePath)) {
|
|
59
|
+
return mainIndexFilePath;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
function importResolve(filepath, options) {
|
|
64
|
+
// support typescript import on absolute path
|
|
65
|
+
if (node_path_1.default.isAbsolute(filepath) && isSupportTypeScript()) {
|
|
66
|
+
const pkgFile = node_path_1.default.join(filepath, 'package.json');
|
|
67
|
+
if (node_fs_1.default.existsSync(pkgFile)) {
|
|
68
|
+
const pkg = JSON.parse(node_fs_1.default.readFileSync(pkgFile, 'utf-8'));
|
|
69
|
+
const mainFile = tryToGetTypeScriptMainFile(pkg, filepath);
|
|
70
|
+
if (mainFile) {
|
|
71
|
+
debug('[importResolve] %o, use typescript main file: %o', filepath, mainFile);
|
|
72
|
+
return mainFile;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
const cwd = process.cwd();
|
|
20
77
|
const paths = options?.paths ?? [cwd];
|
|
21
|
-
const moduleFilePath =
|
|
78
|
+
const moduleFilePath = getRequire().resolve(filepath, {
|
|
22
79
|
paths,
|
|
23
80
|
});
|
|
24
81
|
debug('[importResolve] %o, options: %o => %o', filepath, options, moduleFilePath);
|
|
@@ -89,4 +146,4 @@ async function importModule(filepath, options) {
|
|
|
89
146
|
debug('[importModule] return %o => %o', filepath, obj);
|
|
90
147
|
return obj;
|
|
91
148
|
}
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
149
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1wb3J0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ltcG9ydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQXVFQSxzQ0FvQkM7QUFFRCxvQ0ErREM7QUE1SkQseUNBQXFDO0FBQ3JDLDZDQUE0QztBQUM1Qyx1Q0FBeUM7QUFDekMsMERBQTZCO0FBQzdCLHNEQUF5QjtBQUV6QixNQUFNLEtBQUssR0FBRyxJQUFBLG9CQUFRLEVBQUMscUJBQXFCLENBQUMsQ0FBQztBQVc5QyxNQUFNLEtBQUssR0FBRyxPQUFPLE9BQU8sS0FBSyxXQUFXLENBQUM7QUFFN0MsSUFBSSxjQUEyQixDQUFDO0FBQ2hDLFNBQVMsVUFBVTtJQUNqQixJQUFJLENBQUMsY0FBYyxFQUFFLENBQUM7UUFDcEIsSUFBSSxPQUFPLE9BQU8sS0FBSyxXQUFXLEVBQUUsQ0FBQztZQUNuQyxjQUFjLEdBQUcsT0FBTyxDQUFDO1FBQzNCLENBQUM7YUFBTSxDQUFDO1lBQ04sY0FBYyxHQUFHLElBQUEsMkJBQWEsRUFBQyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQztRQUNoRCxDQUFDO0lBQ0gsQ0FBQztJQUNELE9BQU8sY0FBYyxDQUFDO0FBQ3hCLENBQUM7QUFFRCxJQUFJLGtCQUF1QyxDQUFDO0FBQzVDLFNBQVMsbUJBQW1CO0lBQzFCLElBQUksa0JBQWtCLEtBQUssU0FBUyxFQUFFLENBQUM7UUFDckMsTUFBTSxVQUFVLEdBQUcsVUFBVSxFQUFFLENBQUMsVUFBVSxDQUFDO1FBQzNDLGtCQUFrQixHQUFHLFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxTQUFTLENBQUM7UUFDckQsS0FBSyxDQUFDLDBDQUEwQyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztJQUNqRyxDQUFDO0lBQ0QsT0FBTyxrQkFBa0IsQ0FBQztBQUM1QixDQUFDO0FBRUQsU0FBUywwQkFBMEIsQ0FBQyxHQUFRLEVB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
|
package/dist/commonjs/plugin.js
CHANGED
|
@@ -12,7 +12,7 @@ const node_assert_1 = __importDefault(require("node:assert"));
|
|
|
12
12
|
const node_os_1 = __importDefault(require("node:os"));
|
|
13
13
|
const promises_1 = require("node:fs/promises");
|
|
14
14
|
const import_js_1 = require("./import.js");
|
|
15
|
-
const debug = (0, node_util_1.debuglog)('@eggjs/utils
|
|
15
|
+
const debug = (0, node_util_1.debuglog)('@eggjs/utils/plugin');
|
|
16
16
|
const tmpDir = node_os_1.default.tmpdir();
|
|
17
17
|
function noop() { }
|
|
18
18
|
const logger = {
|
package/dist/esm/import.js
CHANGED
|
@@ -1,20 +1,74 @@
|
|
|
1
1
|
import { debuglog } from 'node:util';
|
|
2
2
|
import { createRequire } from 'node:module';
|
|
3
3
|
import { pathToFileURL } from 'node:url';
|
|
4
|
-
|
|
4
|
+
import path from 'node:path';
|
|
5
|
+
import fs from 'node:fs';
|
|
6
|
+
const debug = debuglog('@eggjs/utils/import');
|
|
7
|
+
const isESM = typeof require === 'undefined';
|
|
5
8
|
let _customRequire;
|
|
6
|
-
|
|
7
|
-
const cwd = process.cwd();
|
|
9
|
+
function getRequire() {
|
|
8
10
|
if (!_customRequire) {
|
|
9
11
|
if (typeof require !== 'undefined') {
|
|
10
12
|
_customRequire = require;
|
|
11
13
|
}
|
|
12
14
|
else {
|
|
13
|
-
_customRequire = createRequire(cwd);
|
|
15
|
+
_customRequire = createRequire(process.cwd());
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
return _customRequire;
|
|
19
|
+
}
|
|
20
|
+
let _supportTypeScript;
|
|
21
|
+
function isSupportTypeScript() {
|
|
22
|
+
if (_supportTypeScript === undefined) {
|
|
23
|
+
const extensions = getRequire().extensions;
|
|
24
|
+
_supportTypeScript = extensions['.ts'] !== undefined;
|
|
25
|
+
debug('[isSupportTypeScript] %o, extensions: %j', _supportTypeScript, Object.keys(extensions));
|
|
26
|
+
}
|
|
27
|
+
return _supportTypeScript;
|
|
28
|
+
}
|
|
29
|
+
function tryToGetTypeScriptMainFile(pkg, baseDir) {
|
|
30
|
+
// try to read pkg.main or pkg.module first
|
|
31
|
+
// "main": "./dist/commonjs/index.js",
|
|
32
|
+
// "module": "./dist/esm/index.js"
|
|
33
|
+
const defaultMainFile = isESM ? pkg.module ?? pkg.main : pkg.main;
|
|
34
|
+
if (defaultMainFile) {
|
|
35
|
+
const mainIndexFilePath = path.join(baseDir, defaultMainFile);
|
|
36
|
+
if (fs.existsSync(mainIndexFilePath)) {
|
|
37
|
+
debug('[tryToGetTypeScriptMainFile] %o, use pkg.main or pkg.module: %o, isESM: %s', mainIndexFilePath, defaultMainFile, isESM);
|
|
38
|
+
return;
|
|
14
39
|
}
|
|
15
40
|
}
|
|
41
|
+
// for the module under development
|
|
42
|
+
// "tshy": {
|
|
43
|
+
// "exports": {
|
|
44
|
+
// "./package.json": "./package.json",
|
|
45
|
+
// ".": "./src/index.ts"
|
|
46
|
+
// }
|
|
47
|
+
// }
|
|
48
|
+
const mainIndexFile = pkg.tshy?.exports?.['.'];
|
|
49
|
+
if (mainIndexFile) {
|
|
50
|
+
const mainIndexFilePath = path.join(baseDir, mainIndexFile);
|
|
51
|
+
if (fs.existsSync(mainIndexFilePath)) {
|
|
52
|
+
return mainIndexFilePath;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
export function importResolve(filepath, options) {
|
|
57
|
+
// support typescript import on absolute path
|
|
58
|
+
if (path.isAbsolute(filepath) && isSupportTypeScript()) {
|
|
59
|
+
const pkgFile = path.join(filepath, 'package.json');
|
|
60
|
+
if (fs.existsSync(pkgFile)) {
|
|
61
|
+
const pkg = JSON.parse(fs.readFileSync(pkgFile, 'utf-8'));
|
|
62
|
+
const mainFile = tryToGetTypeScriptMainFile(pkg, filepath);
|
|
63
|
+
if (mainFile) {
|
|
64
|
+
debug('[importResolve] %o, use typescript main file: %o', filepath, mainFile);
|
|
65
|
+
return mainFile;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
const cwd = process.cwd();
|
|
16
70
|
const paths = options?.paths ?? [cwd];
|
|
17
|
-
const moduleFilePath =
|
|
71
|
+
const moduleFilePath = getRequire().resolve(filepath, {
|
|
18
72
|
paths,
|
|
19
73
|
});
|
|
20
74
|
debug('[importResolve] %o, options: %o => %o', filepath, options, moduleFilePath);
|
|
@@ -85,4 +139,4 @@ export async function importModule(filepath, options) {
|
|
|
85
139
|
debug('[importModule] return %o => %o', filepath, obj);
|
|
86
140
|
return obj;
|
|
87
141
|
}
|
|
88
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
142
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1wb3J0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ltcG9ydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ3JDLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDNUMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLFVBQVUsQ0FBQztBQUN6QyxPQUFPLElBQUksTUFBTSxXQUFXLENBQUM7QUFDN0IsT0FBTyxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBRXpCLE1BQU0sS0FBSyxHQUFHLFFBQVEsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO0FBVzlDLE1BQU0sS0FBSyxHQUFHLE9BQU8sT0FBTyxLQUFLLFdBQVcsQ0FBQztBQUU3QyxJQUFJLGNBQTJCLENBQUM7QUFDaEMsU0FBUyxVQUFVO0lBQ2pCLElBQUksQ0FBQyxjQUFjLEVBQUUsQ0FBQztRQUNwQixJQUFJLE9BQU8sT0FBTyxLQUFLLFdBQVcsRUFBRSxDQUFDO1lBQ25DLGNBQWMsR0FBRyxPQUFPLENBQUM7UUFDM0IsQ0FBQzthQUFNLENBQUM7WUFDTixjQUFjLEdBQUcsYUFBYSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDO1FBQ2hELENBQUM7SUFDSCxDQUFDO0lBQ0QsT0FBTyxjQUFjLENBQUM7QUFDeEIsQ0FBQztBQUVELElBQUksa0JBQXVDLENBQUM7QUFDNUMsU0FBUyxtQkFBbUI7SUFDMUIsSUFBSSxrQkFBa0IsS0FBSyxTQUFTLEVBQUUsQ0FBQztRQUNyQyxNQUFNLFVBQVUsR0FBRyxVQUFVLEVBQUUsQ0FBQyxVQUFVLENBQUM7UUFDM0Msa0JBQWtCLEdBQUcsVUFBVSxDQUFDLEtBQUssQ0FBQyxLQUFLLFNBQVMsQ0FBQztRQUNyRCxLQUFLLENBQUMsMENBQTBDLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQyxD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
|
package/dist/esm/plugin.js
CHANGED
|
@@ -4,7 +4,7 @@ import assert from 'node:assert';
|
|
|
4
4
|
import os from 'node:os';
|
|
5
5
|
import { stat, mkdir, writeFile, realpath } from 'node:fs/promises';
|
|
6
6
|
import { importModule } from './import.js';
|
|
7
|
-
const debug = debuglog('@eggjs/utils
|
|
7
|
+
const debug = debuglog('@eggjs/utils/plugin');
|
|
8
8
|
const tmpDir = os.tmpdir();
|
|
9
9
|
function noop() { }
|
|
10
10
|
const logger = {
|
package/dist/package.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eggjs/utils",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.1.1",
|
|
4
4
|
"engine": {
|
|
5
5
|
"node": ">=18.19.0"
|
|
6
6
|
},
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"author": "fengmk2 <fengmk2@gmail.com> (https://github.com/fengmk2)",
|
|
25
25
|
"repository": {
|
|
26
26
|
"type": "git",
|
|
27
|
-
"url": "git://github.com/eggjs/
|
|
27
|
+
"url": "git://github.com/eggjs/utils.git"
|
|
28
28
|
},
|
|
29
29
|
"license": "MIT",
|
|
30
30
|
"dependencies": {},
|
package/src/import.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { debuglog } from 'node:util';
|
|
2
2
|
import { createRequire } from 'node:module';
|
|
3
3
|
import { pathToFileURL } from 'node:url';
|
|
4
|
+
import path from 'node:path';
|
|
5
|
+
import fs from 'node:fs';
|
|
4
6
|
|
|
5
|
-
const debug = debuglog('@eggjs/utils
|
|
6
|
-
|
|
7
|
-
let _customRequire: NodeRequire;
|
|
7
|
+
const debug = debuglog('@eggjs/utils/import');
|
|
8
8
|
|
|
9
9
|
export interface ImportResolveOptions {
|
|
10
10
|
paths?: string[];
|
|
@@ -15,17 +15,76 @@ export interface ImportModuleOptions extends ImportResolveOptions {
|
|
|
15
15
|
importDefaultOnly?: boolean;
|
|
16
16
|
}
|
|
17
17
|
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
const isESM = typeof require === 'undefined';
|
|
19
|
+
|
|
20
|
+
let _customRequire: NodeRequire;
|
|
21
|
+
function getRequire() {
|
|
20
22
|
if (!_customRequire) {
|
|
21
23
|
if (typeof require !== 'undefined') {
|
|
22
24
|
_customRequire = require;
|
|
23
25
|
} else {
|
|
24
|
-
_customRequire = createRequire(cwd);
|
|
26
|
+
_customRequire = createRequire(process.cwd());
|
|
25
27
|
}
|
|
26
28
|
}
|
|
29
|
+
return _customRequire;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
let _supportTypeScript: boolean | undefined;
|
|
33
|
+
function isSupportTypeScript() {
|
|
34
|
+
if (_supportTypeScript === undefined) {
|
|
35
|
+
const extensions = getRequire().extensions;
|
|
36
|
+
_supportTypeScript = extensions['.ts'] !== undefined;
|
|
37
|
+
debug('[isSupportTypeScript] %o, extensions: %j', _supportTypeScript, Object.keys(extensions));
|
|
38
|
+
}
|
|
39
|
+
return _supportTypeScript;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
function tryToGetTypeScriptMainFile(pkg: any, baseDir: string): string | undefined {
|
|
43
|
+
// try to read pkg.main or pkg.module first
|
|
44
|
+
// "main": "./dist/commonjs/index.js",
|
|
45
|
+
// "module": "./dist/esm/index.js"
|
|
46
|
+
const defaultMainFile = isESM ? pkg.module ?? pkg.main : pkg.main;
|
|
47
|
+
if (defaultMainFile) {
|
|
48
|
+
const mainIndexFilePath = path.join(baseDir, defaultMainFile);
|
|
49
|
+
if (fs.existsSync(mainIndexFilePath)) {
|
|
50
|
+
debug('[tryToGetTypeScriptMainFile] %o, use pkg.main or pkg.module: %o, isESM: %s',
|
|
51
|
+
mainIndexFilePath, defaultMainFile, isESM);
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
// for the module under development
|
|
57
|
+
// "tshy": {
|
|
58
|
+
// "exports": {
|
|
59
|
+
// "./package.json": "./package.json",
|
|
60
|
+
// ".": "./src/index.ts"
|
|
61
|
+
// }
|
|
62
|
+
// }
|
|
63
|
+
const mainIndexFile = pkg.tshy?.exports?.['.'];
|
|
64
|
+
if (mainIndexFile) {
|
|
65
|
+
const mainIndexFilePath = path.join(baseDir, mainIndexFile);
|
|
66
|
+
if (fs.existsSync(mainIndexFilePath)) {
|
|
67
|
+
return mainIndexFilePath;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
export function importResolve(filepath: string, options?: ImportResolveOptions) {
|
|
73
|
+
// support typescript import on absolute path
|
|
74
|
+
if (path.isAbsolute(filepath) && isSupportTypeScript()) {
|
|
75
|
+
const pkgFile = path.join(filepath, 'package.json');
|
|
76
|
+
if (fs.existsSync(pkgFile)) {
|
|
77
|
+
const pkg = JSON.parse(fs.readFileSync(pkgFile, 'utf-8'));
|
|
78
|
+
const mainFile = tryToGetTypeScriptMainFile(pkg, filepath);
|
|
79
|
+
if (mainFile) {
|
|
80
|
+
debug('[importResolve] %o, use typescript main file: %o', filepath, mainFile);
|
|
81
|
+
return mainFile;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
const cwd = process.cwd();
|
|
27
86
|
const paths = options?.paths ?? [ cwd ];
|
|
28
|
-
const moduleFilePath =
|
|
87
|
+
const moduleFilePath = getRequire().resolve(filepath, {
|
|
29
88
|
paths,
|
|
30
89
|
});
|
|
31
90
|
debug('[importResolve] %o, options: %o => %o', filepath, options, moduleFilePath);
|
package/src/plugin.ts
CHANGED
|
@@ -5,7 +5,7 @@ import os from 'node:os';
|
|
|
5
5
|
import { stat, mkdir, writeFile, realpath } from 'node:fs/promises';
|
|
6
6
|
import { importModule } from './import.js';
|
|
7
7
|
|
|
8
|
-
const debug = debuglog('@eggjs/utils
|
|
8
|
+
const debug = debuglog('@eggjs/utils/plugin');
|
|
9
9
|
|
|
10
10
|
const tmpDir = os.tmpdir();
|
|
11
11
|
|