Skip to content

Commit ce39b0f

Browse files
committed
fix
1 parent 79dd753 commit ce39b0f

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

dist-raw/node-esm-default-get-format.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ function defaultGetFormat(url, context, defaultGetFormatUnused) {
8282
}
8383
return { format: null };
8484
}
85-
return {defaultGetFormat};
85+
return {
86+
defaultGetFormat: /** @type {import('../src/esm').GetFormatHook} */(defaultGetFormat)
87+
};
8688
}
8789

8890
exports.createDefaultGetFormat = createDefaultGetFormat;

dist-raw/node-esm-resolve-implementation.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,12 @@ const pendingDeprecation = getOptionValue('--pending-deprecation');
108108
* @param {{
109109
* tsExtensions: string[];
110110
* jsExtensions: string[];
111-
* preferTsExts: boolean;
112-
* packageJsonReader: ReturnType<import('./node-package-json-reader').createNodePackageJsonReader>;
111+
* preferTsExts: boolean | undefined;
112+
* nodePackageJsonReader: ReturnType<import('./node-package-json-reader').createNodePackageJsonReader>;
113113
* }} opts
114114
*/
115115
function createResolve(opts) {
116-
const {tsExtensions, jsExtensions, preferTsExts, packageJsonReader} = opts;
116+
const {tsExtensions, jsExtensions, preferTsExts, nodePackageJsonReader: packageJsonReader} = opts;
117117
const {defaultGetFormat} = createDefaultGetFormat(getPackageType);
118118

119119
const emittedPackageWarnings = new SafeSet();
@@ -985,6 +985,4 @@ return {
985985
defaultGetFormat
986986
};
987987
}
988-
module.exports = {
989-
createResolve
990-
};
988+
module.exports.createResolve = createResolve;

src/esm.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ import {
1515
import { extname } from 'path';
1616
import * as assert from 'assert';
1717
import { normalizeSlashes } from './util';
18-
const {
19-
createResolve,
20-
} = require('../dist-raw/node-esm-resolve-implementation');
18+
import { createResolve } from '../dist-raw/node-esm-resolve-implementation';
2119

2220
// Note: On Windows, URLs look like this: file:///D:/dev/@TypeStrong/ts-node-examples/foo.ts
2321

@@ -35,6 +33,11 @@ const {
3533
// from node, build our implementation of the *new* API on top of it, and implement the *old*
3634
// hooks API as a shim to the *new* API.
3735

36+
/** @internal */
37+
export type GetFormatHook = NonNullable<
38+
ReturnType<typeof createEsmHooks>['getFormat']
39+
>;
40+
3841
/** @internal */
3942
export function registerAndCreateEsmHooks(opts?: RegisterOptions) {
4043
// Automatically performs registration just like `-r ts-node/register`
@@ -50,6 +53,7 @@ export function createEsmHooks(tsNodeService: Service) {
5053
const nodeResolveImplementation = createResolve({
5154
...getExtensions(tsNodeService.config),
5255
preferTsExts: tsNodeService.options.preferTsExts,
56+
nodePackageJsonReader: tsNodeService.nodePackageJsonReader,
5357
});
5458

5559
// The hooks API changed in node version X so we need to check for backwards compatibility.

0 commit comments

Comments
 (0)