diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 4687bb8796fad..91e050754019b 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -12026,7 +12026,7 @@ export function isSideEffectImport(node: Node): boolean { return !!ancestor && !ancestor.importClause; } -// require('module').builtinModules.filter(x => !x.startsWith('_')) +// require('module').builtinModules.filter(x => !x.match(/^(?:_|node:)/)) const unprefixedNodeCoreModulesList = [ "assert", "assert/strict", @@ -12069,7 +12069,6 @@ const unprefixedNodeCoreModulesList = [ "stream/web", "string_decoder", "sys", - "test/mock_loader", "timers", "timers/promises", "tls", @@ -12088,11 +12087,10 @@ const unprefixedNodeCoreModulesList = [ /** @internal */ export const unprefixedNodeCoreModules: Set = new Set(unprefixedNodeCoreModulesList); -// await fetch('https://nodejs.org/docs/latest/api/all.json').then(r => r.text()).then(t => -// new Set(t.match(/(?<=')node:.+?(?=')/g)) -// .difference(new Set(require('module').builtinModules.map(x => `node:${x}`)))) +// require('module').builtinModules.filter(x => x.startsWith('node:')) /** @internal */ export const exclusivelyPrefixedNodeCoreModules: Set = new Set([ + "node:quic", "node:sea", "node:sqlite", "node:test", diff --git a/tests/baselines/reference/tsserver/typingsInstaller/discover-typings-should-return-node-for-core-modules.js b/tests/baselines/reference/tsserver/typingsInstaller/discover-typings-should-return-node-for-core-modules.js index 702d77b80ff5d..f9e2abe23a7c9 100644 --- a/tests/baselines/reference/tsserver/typingsInstaller/discover-typings-should-return-node-for-core-modules.js +++ b/tests/baselines/reference/tsserver/typingsInstaller/discover-typings-should-return-node-for-core-modules.js @@ -1330,38 +1330,6 @@ TI:: [hh:mm:ss:mss] Finished typings discovery: ] } -ts.JsTyping.discoverTypings:: - { - "fileNames": [ - "/home/src/projects/project/app.js" - ], - "projectRootPath": "/home/src/projects/project", - "safeList": {}, - "packageNameToTypingLocation": {}, - "typeAcquisition": { - "enable": true - }, - "unresolvedImports": [ - "test/mock_loader", - "somename" - ], - "typesRegistry": {}, - "compilerOptions": {} - } -TI:: [hh:mm:ss:mss] Inferred typings from unresolved imports: ["node","somename"] -TI:: [hh:mm:ss:mss] Finished typings discovery: - { - "cachedTypingPaths": [], - "newTypingNames": [ - "node", - "somename" - ], - "filesToWatch": [ - "/home/src/projects/project/bower_components", - "/home/src/projects/project/node_modules" - ] - } - ts.JsTyping.discoverTypings:: { "fileNames": [ @@ -3102,7 +3070,7 @@ ts.JsTyping.discoverTypings:: "enable": true }, "unresolvedImports": [ - "node:test/mock_loader", + "node:timers", "somename" ], "typesRegistry": {}, @@ -3134,7 +3102,7 @@ ts.JsTyping.discoverTypings:: "enable": true }, "unresolvedImports": [ - "node:timers", + "node:timers/promises", "somename" ], "typesRegistry": {}, @@ -3166,7 +3134,7 @@ ts.JsTyping.discoverTypings:: "enable": true }, "unresolvedImports": [ - "node:timers/promises", + "node:tls", "somename" ], "typesRegistry": {}, @@ -3198,7 +3166,7 @@ ts.JsTyping.discoverTypings:: "enable": true }, "unresolvedImports": [ - "node:tls", + "node:trace_events", "somename" ], "typesRegistry": {}, @@ -3230,7 +3198,7 @@ ts.JsTyping.discoverTypings:: "enable": true }, "unresolvedImports": [ - "node:trace_events", + "node:tty", "somename" ], "typesRegistry": {}, @@ -3262,7 +3230,7 @@ ts.JsTyping.discoverTypings:: "enable": true }, "unresolvedImports": [ - "node:tty", + "node:url", "somename" ], "typesRegistry": {}, @@ -3294,7 +3262,7 @@ ts.JsTyping.discoverTypings:: "enable": true }, "unresolvedImports": [ - "node:url", + "node:util", "somename" ], "typesRegistry": {}, @@ -3326,7 +3294,7 @@ ts.JsTyping.discoverTypings:: "enable": true }, "unresolvedImports": [ - "node:util", + "node:util/types", "somename" ], "typesRegistry": {}, @@ -3358,7 +3326,7 @@ ts.JsTyping.discoverTypings:: "enable": true }, "unresolvedImports": [ - "node:util/types", + "node:v8", "somename" ], "typesRegistry": {}, @@ -3390,7 +3358,7 @@ ts.JsTyping.discoverTypings:: "enable": true }, "unresolvedImports": [ - "node:v8", + "node:vm", "somename" ], "typesRegistry": {}, @@ -3422,7 +3390,7 @@ ts.JsTyping.discoverTypings:: "enable": true }, "unresolvedImports": [ - "node:vm", + "node:wasi", "somename" ], "typesRegistry": {}, @@ -3454,7 +3422,7 @@ ts.JsTyping.discoverTypings:: "enable": true }, "unresolvedImports": [ - "node:wasi", + "node:worker_threads", "somename" ], "typesRegistry": {}, @@ -3486,7 +3454,7 @@ ts.JsTyping.discoverTypings:: "enable": true }, "unresolvedImports": [ - "node:worker_threads", + "node:zlib", "somename" ], "typesRegistry": {}, @@ -3518,7 +3486,7 @@ ts.JsTyping.discoverTypings:: "enable": true }, "unresolvedImports": [ - "node:zlib", + "node:quic", "somename" ], "typesRegistry": {},