Skip to content
Draft
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
46 changes: 37 additions & 9 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const path = require('bare-path')
const resolve = require('bare-module-resolve')
const lex = require('bare-module-lexer')
const strip = require('bare-type-stripper')
const { isURL, fileURLToPath, pathToFileURL } = require('bare-url')
const Bundle = require('bare-bundle')
const Protocol = require('./lib/protocol')
Expand Down Expand Up @@ -615,9 +616,9 @@ const Module = exports
function extensionsForType(type) {
switch (type) {
case constants.types.SCRIPT:
return ['.js', '.cjs']
return ['.js', '.cjs', '.ts', '.cts']
case constants.types.MODULE:
return ['.js', '.mjs']
return ['.js', '.mjs', '.ts', '.mts']
case constants.types.JSON:
return ['.json']
case constants.types.BUNDLE:
Expand All @@ -629,7 +630,7 @@ function extensionsForType(type) {
case constants.types.TEXT:
return ['.txt']
default:
return ['.js', '.cjs', '.mjs', '.json', '.bare', '.node']
return ['.js', '.cjs', '.mjs', '.ts', '.cts', '.mts', '.json', '.bare', '.node']
}
}

Expand Down Expand Up @@ -839,7 +840,6 @@ Module._extensions['.cjs'] = function (module, source, referrer) {
module._type = constants.types.SCRIPT

if (source === null) source = protocol.read(module._url)

if (typeof source === 'string') source = Buffer.from(source)

module._source = source
Expand All @@ -860,21 +860,52 @@ Module._extensions['.mjs'] = function (module, source, referrer) {
module._type = constants.types.MODULE

if (source === null) source = protocol.read(module._url)

if (typeof source === 'string') source = Buffer.from(source)

module._source = source

module._handle = binding.createModule(module._url.href, source.toString(), 0, self._handle)
}

Module._extensions['.ts'] = function (module, source, referrer) {
const self = Module

const protocol = module._protocol

if (source === null) source = protocol.read(module._url)
if (typeof source === 'string') source = Buffer.from(source)

return self._extensions['.js'](module, strip(source), referrer)
}

Module._extensions['.cts'] = function (module, source, referrer) {
const self = Module

const protocol = module._protocol

if (source === null) source = protocol.read(module._url)
if (typeof source === 'string') source = Buffer.from(source)

return self._extensions['.cjs'](module, strip(source), referrer)
}

Module._extensions['.mts'] = function (module, source, referrer) {
const self = Module

const protocol = module._protocol

if (source === null) source = protocol.read(module._url)
if (typeof source === 'string') source = Buffer.from(source)

return self._extensions['.mjs'](module, strip(source), referrer)
}

Module._extensions['.json'] = function (module, source, referrer) {
const protocol = module._protocol

module._type = constants.types.JSON

if (source === null) source = protocol.read(module._url)

if (typeof source === 'string') source = Buffer.from(source)

module._source = source
Expand Down Expand Up @@ -905,7 +936,6 @@ Module._extensions['.bundle'] = function (module, source, referrer) {
module._type = constants.types.BUNDLE

if (source === null) source = protocol.read(module._url)

if (typeof source === 'string') source = Buffer.from(source)

referrer = module
Expand Down Expand Up @@ -943,7 +973,6 @@ Module._extensions['.bin'] = function (module, source, referrer) {
module._type = constants.types.BINARY

if (source === null) source = protocol.read(module._url)

if (typeof source === 'string') source = Buffer.from(source)

module._source = module._exports = source
Expand All @@ -955,7 +984,6 @@ Module._extensions['.txt'] = function (module, source, referrer) {
module._type = constants.types.TEXT

if (source === null) source = protocol.read(module._url)

if (typeof source === 'string') source = Buffer.from(source)

module._source = source
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"bare-module-lexer": "^1.0.0",
"bare-module-resolve": "^1.8.0",
"bare-path": "^3.0.0",
"bare-type-stripper": "^0.1.2",
"bare-url": "^2.0.1"
},
"devDependencies": {
Expand Down
37 changes: 37 additions & 0 deletions test.js
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,43 @@ test('load .cjs and .mjs from .mjs', (t) => {
t.alike(order, ['b.mjs', 'c.cjs', 'd.mjs', 'e.cjs', 'a.mjs'])
})

test('load .ts', (t) => {
t.teardown(onteardown)

const protocol = new Module.Protocol({
read(url) {
if (url.href === root + '/index.ts') {
return 'const a: number = 42; module.exports = a'
}

t.fail()
}
})

t.is(Module.load(new URL(root + '/index.ts'), { protocol }).exports, 42)
})

test('load .ts, non-erasable', (t) => {
t.teardown(onteardown)

const protocol = new Module.Protocol({
read(url) {
if (url.href === root + '/index.ts') {
return 'enum foo {}'
}

t.fail()
}
})

try {
Module.load(new URL(root + '/index.ts'), { protocol })
t.fail()
} catch (err) {
t.comment(err.message)
}
})

test('load .json', (t) => {
t.teardown(onteardown)

Expand Down
Loading