@eggjs/utils 4.0.3 → 4.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -4
- package/dist/commonjs/import.js +45 -6
- package/dist/commonjs/plugin.js +1 -1
- package/dist/esm/import.js +42 -6
- package/dist/esm/plugin.js +1 -1
- package/dist/package.json +1 -1
- package/package.json +2 -2
- package/src/import.ts +43 -5
- 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,63 @@
|
|
|
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');
|
|
9
14
|
let _customRequire;
|
|
10
|
-
function
|
|
11
|
-
const cwd = process.cwd();
|
|
15
|
+
function getRequire() {
|
|
12
16
|
if (!_customRequire) {
|
|
13
17
|
if (typeof require !== 'undefined') {
|
|
14
18
|
_customRequire = require;
|
|
15
19
|
}
|
|
16
20
|
else {
|
|
17
|
-
_customRequire = (0, node_module_1.createRequire)(cwd);
|
|
21
|
+
_customRequire = (0, node_module_1.createRequire)(process.cwd());
|
|
18
22
|
}
|
|
19
23
|
}
|
|
24
|
+
return _customRequire;
|
|
25
|
+
}
|
|
26
|
+
let supportTypeScript;
|
|
27
|
+
function isSupportTypeScript() {
|
|
28
|
+
if (supportTypeScript === undefined) {
|
|
29
|
+
const extensions = getRequire().extensions;
|
|
30
|
+
supportTypeScript = extensions['.ts'] !== undefined;
|
|
31
|
+
debug('[isSupportTypeScript] %o, extensions: %j', supportTypeScript, Object.keys(extensions));
|
|
32
|
+
}
|
|
33
|
+
return supportTypeScript;
|
|
34
|
+
}
|
|
35
|
+
function importResolve(filepath, options) {
|
|
36
|
+
// support typescript import on absolute path
|
|
37
|
+
if (node_path_1.default.isAbsolute(filepath) && isSupportTypeScript()) {
|
|
38
|
+
// "tshy": {
|
|
39
|
+
// "exports": {
|
|
40
|
+
// "./package.json": "./package.json",
|
|
41
|
+
// ".": "./src/index.ts"
|
|
42
|
+
// }
|
|
43
|
+
// }
|
|
44
|
+
const pkgFile = node_path_1.default.join(filepath, 'package.json');
|
|
45
|
+
if (node_fs_1.default.existsSync(pkgFile)) {
|
|
46
|
+
const pkg = JSON.parse(node_fs_1.default.readFileSync(pkgFile, 'utf-8'));
|
|
47
|
+
const mainIndexFile = pkg.tshy?.exports?.['.'];
|
|
48
|
+
if (mainIndexFile) {
|
|
49
|
+
const mainIndexFilePath = node_path_1.default.join(filepath, mainIndexFile);
|
|
50
|
+
if (node_fs_1.default.existsSync(mainIndexFilePath)) {
|
|
51
|
+
debug('[importResolve] %o, options: %o => %o, use typescript', filepath, options, mainIndexFilePath);
|
|
52
|
+
return mainIndexFilePath;
|
|
53
|
+
}
|
|
54
|
+
debug('[importResolve] typescript file %o not exists', mainIndexFilePath);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
const cwd = process.cwd();
|
|
20
59
|
const paths = options?.paths ?? [cwd];
|
|
21
|
-
const moduleFilePath =
|
|
60
|
+
const moduleFilePath = getRequire().resolve(filepath, {
|
|
22
61
|
paths,
|
|
23
62
|
});
|
|
24
63
|
debug('[importResolve] %o, options: %o => %o', filepath, options, moduleFilePath);
|
|
@@ -89,4 +128,4 @@ async function importModule(filepath, options) {
|
|
|
89
128
|
debug('[importModule] return %o => %o', filepath, obj);
|
|
90
129
|
return obj;
|
|
91
130
|
}
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
131
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1wb3J0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ltcG9ydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQXdDQSxzQ0E4QkM7QUFFRCxvQ0ErREM7QUF2SUQseUNBQXFDO0FBQ3JDLDZDQUE0QztBQUM1Qyx1Q0FBeUM7QUFDekMsMERBQTZCO0FBQzdCLHNEQUF5QjtBQUV6QixNQUFNLEtBQUssR0FBRyxJQUFBLG9CQUFRLEVBQUMscUJBQXFCLENBQUMsQ0FBQztBQUU5QyxJQUFJLGNBQTJCLENBQUM7QUFXaEMsU0FBUyxVQUFVO0lBQ2pCLElBQUksQ0FBQyxjQUFjLEVBQUUsQ0FBQztRQUNwQixJQUFJLE9BQU8sT0FBTyxLQUFLLFdBQVcsRUFBRSxDQUFDO1lBQ25DLGNBQWMsR0FBRyxPQUFPLENBQUM7UUFDM0IsQ0FBQzthQUFNLENBQUM7WUFDTixjQUFjLEdBQUcsSUFBQSwyQkFBYSxFQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDO1FBQ2hELENBQUM7SUFDSCxDQUFDO0lBQ0QsT0FBTyxjQUFjLENBQUM7QUFDeEIsQ0FBQztBQUVELElBQUksaUJBQXNDLENBQUM7QUFDM0MsU0FBUyxtQkFBbUI7SUFDMUIsSUFBSSxpQkFBaUIsS0FBSyxTQUFTLEVBQUUsQ0FBQztRQUNwQyxNQUFNLFVBQVUsR0FBRyxVQUFVLEVBQUUsQ0FBQyxVQUFVLENBQUM7UUFDM0MsaUJBQWlCLEdBQUcsVUFBVSxDQUFDLEtBQUssQ0FBQyxLQUFLLFNBQVMsQ0FBQztRQUNwRCxLQUFLLENBQUMsMENBQTBDLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO0lBQ2hHLENBQUM7SUFDRCxPQUFPLGlCQUFpQixDQUFDO0FBQzNCLENBQUM7QUFFRCxTQUFnQixhQUFhLENBQUMsUUFBZ0IsRUFBRSxPQUE4QjtJQUM1RSw2Q0FBNkM7SUFDN0MsSUFBSSxtQkFBSSxDQUFDLFVB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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,56 @@
|
|
|
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');
|
|
5
7
|
let _customRequire;
|
|
6
|
-
|
|
7
|
-
const cwd = process.cwd();
|
|
8
|
+
function getRequire() {
|
|
8
9
|
if (!_customRequire) {
|
|
9
10
|
if (typeof require !== 'undefined') {
|
|
10
11
|
_customRequire = require;
|
|
11
12
|
}
|
|
12
13
|
else {
|
|
13
|
-
_customRequire = createRequire(cwd);
|
|
14
|
+
_customRequire = createRequire(process.cwd());
|
|
14
15
|
}
|
|
15
16
|
}
|
|
17
|
+
return _customRequire;
|
|
18
|
+
}
|
|
19
|
+
let supportTypeScript;
|
|
20
|
+
function isSupportTypeScript() {
|
|
21
|
+
if (supportTypeScript === undefined) {
|
|
22
|
+
const extensions = getRequire().extensions;
|
|
23
|
+
supportTypeScript = extensions['.ts'] !== undefined;
|
|
24
|
+
debug('[isSupportTypeScript] %o, extensions: %j', supportTypeScript, Object.keys(extensions));
|
|
25
|
+
}
|
|
26
|
+
return supportTypeScript;
|
|
27
|
+
}
|
|
28
|
+
export function importResolve(filepath, options) {
|
|
29
|
+
// support typescript import on absolute path
|
|
30
|
+
if (path.isAbsolute(filepath) && isSupportTypeScript()) {
|
|
31
|
+
// "tshy": {
|
|
32
|
+
// "exports": {
|
|
33
|
+
// "./package.json": "./package.json",
|
|
34
|
+
// ".": "./src/index.ts"
|
|
35
|
+
// }
|
|
36
|
+
// }
|
|
37
|
+
const pkgFile = path.join(filepath, 'package.json');
|
|
38
|
+
if (fs.existsSync(pkgFile)) {
|
|
39
|
+
const pkg = JSON.parse(fs.readFileSync(pkgFile, 'utf-8'));
|
|
40
|
+
const mainIndexFile = pkg.tshy?.exports?.['.'];
|
|
41
|
+
if (mainIndexFile) {
|
|
42
|
+
const mainIndexFilePath = path.join(filepath, mainIndexFile);
|
|
43
|
+
if (fs.existsSync(mainIndexFilePath)) {
|
|
44
|
+
debug('[importResolve] %o, options: %o => %o, use typescript', filepath, options, mainIndexFilePath);
|
|
45
|
+
return mainIndexFilePath;
|
|
46
|
+
}
|
|
47
|
+
debug('[importResolve] typescript file %o not exists', mainIndexFilePath);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
const cwd = process.cwd();
|
|
16
52
|
const paths = options?.paths ?? [cwd];
|
|
17
|
-
const moduleFilePath =
|
|
53
|
+
const moduleFilePath = getRequire().resolve(filepath, {
|
|
18
54
|
paths,
|
|
19
55
|
});
|
|
20
56
|
debug('[importResolve] %o, options: %o => %o', filepath, options, moduleFilePath);
|
|
@@ -85,4 +121,4 @@ export async function importModule(filepath, options) {
|
|
|
85
121
|
debug('[importModule] return %o => %o', filepath, obj);
|
|
86
122
|
return obj;
|
|
87
123
|
}
|
|
88
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
124
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1wb3J0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ltcG9ydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ3JDLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDNUMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLFVBQVUsQ0FBQztBQUN6QyxPQUFPLElBQUksTUFBTSxXQUFXLENBQUM7QUFDN0IsT0FBTyxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBRXpCLE1BQU0sS0FBSyxHQUFHLFFBQVEsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO0FBRTlDLElBQUksY0FBMkIsQ0FBQztBQVdoQyxTQUFTLFVBQVU7SUFDakIsSUFBSSxDQUFDLGNBQWMsRUFBRSxDQUFDO1FBQ3BCLElBQUksT0FBTyxPQUFPLEtBQUssV0FBVyxFQUFFLENBQUM7WUFDbkMsY0FBYyxHQUFHLE9BQU8sQ0FBQztRQUMzQixDQUFDO2FBQU0sQ0FBQztZQUNOLGNBQWMsR0FBRyxhQUFhLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUM7UUFDaEQsQ0FBQztJQUNILENBQUM7SUFDRCxPQUFPLGNBQWMsQ0FBQztBQUN4QixDQUFDO0FBRUQsSUFBSSxpQkFBc0MsQ0FBQztBQUMzQyxTQUFTLG1CQUFtQjtJQUMxQixJQUFJLGlCQUFpQixLQUFLLFNBQVMsRUFBRSxDQUFDO1FBQ3BDLE1BQU0sVUFBVSxHQUFHLFVBQVUsRUFBRSxDQUFDLFVBQVUsQ0FBQztRQUMzQyxpQkFBaUIsR0FBRyxVQUFVLENBQUMsS0FBSyxDQUFDLEtBQUssU0FBUyxDQUFDO1FBQ3BELEtBQUssQ0FBQywwQ0FBMEMsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUM7SUFDaEcsQ0FBQztJQUNELE9BQU8saUJBQWlCLENBQUM7QUFDM0IsQ0FB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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.0
|
|
3
|
+
"version": "4.1.0",
|
|
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,8 +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
|
|
7
|
+
const debug = debuglog('@eggjs/utils/import');
|
|
6
8
|
|
|
7
9
|
let _customRequire: NodeRequire;
|
|
8
10
|
|
|
@@ -15,17 +17,53 @@ export interface ImportModuleOptions extends ImportResolveOptions {
|
|
|
15
17
|
importDefaultOnly?: boolean;
|
|
16
18
|
}
|
|
17
19
|
|
|
18
|
-
|
|
19
|
-
const cwd = process.cwd();
|
|
20
|
+
function getRequire() {
|
|
20
21
|
if (!_customRequire) {
|
|
21
22
|
if (typeof require !== 'undefined') {
|
|
22
23
|
_customRequire = require;
|
|
23
24
|
} else {
|
|
24
|
-
_customRequire = createRequire(cwd);
|
|
25
|
+
_customRequire = createRequire(process.cwd());
|
|
25
26
|
}
|
|
26
27
|
}
|
|
28
|
+
return _customRequire;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
let supportTypeScript: boolean | undefined;
|
|
32
|
+
function isSupportTypeScript() {
|
|
33
|
+
if (supportTypeScript === undefined) {
|
|
34
|
+
const extensions = getRequire().extensions;
|
|
35
|
+
supportTypeScript = extensions['.ts'] !== undefined;
|
|
36
|
+
debug('[isSupportTypeScript] %o, extensions: %j', supportTypeScript, Object.keys(extensions));
|
|
37
|
+
}
|
|
38
|
+
return supportTypeScript;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
export function importResolve(filepath: string, options?: ImportResolveOptions) {
|
|
42
|
+
// support typescript import on absolute path
|
|
43
|
+
if (path.isAbsolute(filepath) && isSupportTypeScript()) {
|
|
44
|
+
// "tshy": {
|
|
45
|
+
// "exports": {
|
|
46
|
+
// "./package.json": "./package.json",
|
|
47
|
+
// ".": "./src/index.ts"
|
|
48
|
+
// }
|
|
49
|
+
// }
|
|
50
|
+
const pkgFile = path.join(filepath, 'package.json');
|
|
51
|
+
if (fs.existsSync(pkgFile)) {
|
|
52
|
+
const pkg = JSON.parse(fs.readFileSync(pkgFile, 'utf-8'));
|
|
53
|
+
const mainIndexFile = pkg.tshy?.exports?.['.'];
|
|
54
|
+
if (mainIndexFile) {
|
|
55
|
+
const mainIndexFilePath = path.join(filepath, mainIndexFile);
|
|
56
|
+
if (fs.existsSync(mainIndexFilePath)) {
|
|
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);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
const cwd = process.cwd();
|
|
27
65
|
const paths = options?.paths ?? [ cwd ];
|
|
28
|
-
const moduleFilePath =
|
|
66
|
+
const moduleFilePath = getRequire().resolve(filepath, {
|
|
29
67
|
paths,
|
|
30
68
|
});
|
|
31
69
|
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
|
|