Skip to content

Commit f646ac9

Browse files
committed
test: address loader fs review feedback
1 parent cb198b7 commit f646ac9

2 files changed

Lines changed: 6 additions & 11 deletions

File tree

packages/core/test/loader/loader_fs.test.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import assert from 'node:assert/strict';
22
import fs from 'node:fs';
33
import path from 'node:path';
44

5-
import { RealLoaderFS } from '@eggjs/loader-fs';
5+
import { RealLoaderFS as SharedRealLoaderFS } from '@eggjs/loader-fs';
66
import globby from 'globby';
77
import { describe, it } from 'vitest';
88

9-
import { RealLoaderFS as CoreRealLoaderFS } from '../../src/loader/loader_fs.ts';
9+
import { RealLoaderFS } from '../../src/loader/loader_fs.ts';
1010
import { getFilepath } from '../helper.ts';
1111

1212
describe('test/loader/loader_fs.test.ts', () => {
@@ -28,9 +28,7 @@ describe('test/loader/loader_fs.test.ts', () => {
2828

2929
assert.deepEqual(await loaderFS.readJSON(packagePath), JSON.parse(fs.readFileSync(packagePath, 'utf8')));
3030
assert.deepEqual(loaderFS.glob(patterns, { cwd: baseDir }).sort(), globby.sync(patterns, { cwd: baseDir }).sort());
31-
assert.deepEqual(
32-
await loaderFS.loadFile(path.join(baseDir, 'object.js')),
33-
await new CoreRealLoaderFS().loadFile(path.join(baseDir, 'object.js')),
34-
);
31+
assert.equal(RealLoaderFS, SharedRealLoaderFS);
32+
assert.deepEqual(await loaderFS.loadFile(path.join(baseDir, 'object.js')), { a: 1 });
3533
});
3634
});

packages/loader-fs/src/index.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,8 @@ export class RealLoaderFS implements LoaderFS {
5050
}
5151
return await importModule(filepath, { importDefaultOnly: true });
5252
} catch (err) {
53-
if (!(err instanceof Error)) {
54-
console.trace(err);
55-
throw err;
56-
}
57-
const error = new Error(`[egg/loader-fs] load file: ${filepath}, error: ${err.message}`);
53+
const message = err instanceof Error ? err.message : String(err);
54+
const error = new Error(`[egg/loader-fs] load file: ${filepath}, error: ${message}`);
5855
error.cause = err;
5956
debug('[loadFile] handle %s error: %s', filepath, err);
6057
throw error;

0 commit comments

Comments
 (0)