Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions lib/nodejs/esm-utils.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const path = require('node:path');
const url = require('node:url');
const debug = require('debug')('mocha:esm-utils');

const forward = x => x;

Expand Down Expand Up @@ -95,14 +96,22 @@ const requireModule = async (file, esmDecorator) => {
}
try {
return require(file);
} catch (err) {
// Import if require fails.
return dealWithExports(await formattedImport(file, esmDecorator));
} catch (requireErr) {
debug('requireModule caught err: %O', requireErr.message);
try {
return dealWithExports(await formattedImport(file, esmDecorator));
} catch (importErr) {
if (importErr.code === 'ERR_INTERNAL_ASSERTION') {
throw requireErr;
}
throw importErr;
}
}
};

// We only assign this `requireOrImport` function once based on Node version
// We check for file extensions in `requireModule` and `tryImportAndRequire`
debug('assigning requireOrImport, require_module === %O', process.features.require_module);
if (process.features.require_module) {
exports.requireOrImport = requireModule;
} else {
Expand Down
29 changes: 23 additions & 6 deletions test/node-unit/esm-utils.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,32 @@ const sinon = require('sinon');
const url = require('node:url');

describe('esm-utils', function () {
beforeEach(function () {
sinon.stub(esmUtils, 'doImport').resolves({});
});

afterEach(function () {
sinon.restore();
describe('requireOrImport', function () {
it('should show an informative error message for a broken default import', async function () {
return expect(
() =>
esmUtils.requireOrImport(
'../../test/node-unit/fixtures/broken-default-import.mjs'
),
'to be rejected with error satisfying',
{
name: 'SyntaxError',
message:
"The requested module './module-without-default-export.mjs' does not provide an export named 'default'"
}
);
});
});

describe('loadFilesAsync()', function () {
beforeEach(function () {
sinon.stub(esmUtils, 'doImport').resolves({});
});

afterEach(function () {
sinon.restore();
});

it('should not decorate imported module if no decorator passed', async function () {
await esmUtils.loadFilesAsync(
['/foo/bar.mjs'],
Expand Down
3 changes: 3 additions & 0 deletions test/node-unit/fixtures/broken-default-import.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import moduleWithoutDefaultExport from './module-without-default-export.mjs';

moduleWithoutDefaultExport;
1 change: 1 addition & 0 deletions test/node-unit/fixtures/module-without-default-export.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const value = 42;
Loading