Skip to content

Commit 286c294

Browse files
authored
Rename Register to Service; re-export as Register for backwards… (#1158)
* Rename `Register` to `Service`; re-export as `Register` for backwards compatibility * rename variable 'register' to 'service'
1 parent c4a6a02 commit 286c294

File tree

3 files changed

+25
-18
lines changed

3 files changed

+25
-18
lines changed

src/bin.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { diffLines } from 'diff'
99
import { Script } from 'vm'
1010
import { readFileSync, statSync, realpathSync } from 'fs'
1111
import { homedir } from 'os'
12-
import { VERSION, TSError, parse, Register, register } from './index'
12+
import { VERSION, TSError, parse, Service, register } from './index'
1313

1414
/**
1515
* Eval filename for REPL/debug.
@@ -284,7 +284,7 @@ function getCwd (dir?: string, scriptMode?: boolean, scriptPath?: string) {
284284
/**
285285
* Evaluate a script.
286286
*/
287-
function evalAndExit (service: Register, state: EvalState, module: Module, code: string, isPrinted: boolean) {
287+
function evalAndExit (service: Service, state: EvalState, module: Module, code: string, isPrinted: boolean) {
288288
let result: any
289289

290290
;(global as any).__filename = module.filename
@@ -312,7 +312,7 @@ function evalAndExit (service: Register, state: EvalState, module: Module, code:
312312
/**
313313
* Evaluate the code snippet.
314314
*/
315-
function _eval (service: Register, state: EvalState, input: string) {
315+
function _eval (service: Service, state: EvalState, input: string) {
316316
const lines = state.lines
317317
const isCompletion = !/\n$/.test(input)
318318
const undo = appendEval(state, input)
@@ -351,7 +351,7 @@ function exec (code: string, filename: string) {
351351
/**
352352
* Start a CLI REPL.
353353
*/
354-
function startRepl (service: Register, state: EvalState, code?: string) {
354+
function startRepl (service: Service, state: EvalState, code?: string) {
355355
// Eval incoming code before the REPL starts.
356356
if (code) {
357357
try {

src/index.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ describe('ts-node', function () {
644644
})
645645

646646
describe('register', function () {
647-
let registered: tsNodeTypes.Register
647+
let registered: tsNodeTypes.Service
648648
let moduleTestPath: string
649649
before(() => {
650650
registered = register({
@@ -797,7 +797,7 @@ describe('ts-node', function () {
797797
})
798798

799799
describe('create', () => {
800-
let service: tsNodeTypes.Register
800+
let service: tsNodeTypes.Service
801801
before(() => {
802802
service = create({ compilerOptions: { target: 'es5' }, skipProject: true })
803803
})
@@ -824,7 +824,7 @@ describe('ts-node', function () {
824824
})
825825

826826
describe('issue #1098', () => {
827-
function testIgnored (ignored: tsNodeTypes.Register['ignored'], allowed: string[], disallowed: string[]) {
827+
function testIgnored (ignored: tsNodeTypes.Service['ignored'], allowed: string[], disallowed: string[]) {
828828
for (const ext of allowed) {
829829
expect(ignored(join(__dirname, `index${ext}`))).equal(false, `should accept ${ext} files`)
830830
}

src/index.ts

+18-11
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export const REGISTER_INSTANCE = Symbol.for('ts-node.register.instance')
4040
declare global {
4141
namespace NodeJS {
4242
interface Process {
43-
[REGISTER_INSTANCE]?: Register
43+
[REGISTER_INSTANCE]?: Service
4444
}
4545
}
4646
}
@@ -354,9 +354,9 @@ export class TSError extends BaseError {
354354
}
355355

356356
/**
357-
* Return type for registering `ts-node`.
357+
* Primary ts-node service, which wraps the TypeScript API and can compile TypeScript to JavaScript
358358
*/
359-
export interface Register {
359+
export interface Service {
360360
ts: TSCommon
361361
config: _ts.ParsedCommandLine
362362
options: RegisterOptions
@@ -366,6 +366,13 @@ export interface Register {
366366
getTypeInfo (code: string, fileName: string, position: number): TypeInfo
367367
}
368368

369+
/**
370+
* Re-export of `Service` interface for backwards-compatibility
371+
* @deprecated use `Service` instead
372+
* @see Service
373+
*/
374+
export type Register = Service
375+
369376
/**
370377
* Cached fs operation wrapper.
371378
*/
@@ -396,7 +403,7 @@ export function getExtensions (config: _ts.ParsedCommandLine) {
396403
/**
397404
* Register TypeScript compiler instance onto node.js
398405
*/
399-
export function register (opts: RegisterOptions = {}): Register {
406+
export function register (opts: RegisterOptions = {}): Service {
400407
const originalJsHandler = require.extensions['.js'] // tslint:disable-line
401408
const service = create(opts)
402409
const { tsExtensions, jsExtensions } = getExtensions(service.config)
@@ -417,7 +424,7 @@ export function register (opts: RegisterOptions = {}): Register {
417424
/**
418425
* Create TypeScript compiler instance.
419426
*/
420-
export function create (rawOptions: CreateOptions = {}): Register {
427+
export function create (rawOptions: CreateOptions = {}): Service {
421428
const dir = rawOptions.dir ?? DEFAULTS.dir
422429
const compilerName = rawOptions.compiler ?? DEFAULTS.compiler
423430
const cwd = dir ? resolve(dir) : process.cwd()
@@ -1006,12 +1013,12 @@ function reorderRequireExtension (ext: string) {
10061013
function registerExtensions (
10071014
preferTsExts: boolean | null | undefined,
10081015
extensions: string[],
1009-
register: Register,
1016+
service: Service,
10101017
originalJsHandler: (m: NodeModule, filename: string) => any
10111018
) {
10121019
// Register new extensions.
10131020
for (const ext of extensions) {
1014-
registerExtension(ext, register, originalJsHandler)
1021+
registerExtension(ext, service, originalJsHandler)
10151022
}
10161023

10171024
if (preferTsExts) {
@@ -1027,15 +1034,15 @@ function registerExtensions (
10271034
*/
10281035
function registerExtension (
10291036
ext: string,
1030-
register: Register,
1037+
service: Service,
10311038
originalHandler: (m: NodeModule, filename: string) => any
10321039
) {
10331040
const old = require.extensions[ext] || originalHandler // tslint:disable-line
10341041

10351042
require.extensions[ext] = function (m: any, filename) { // tslint:disable-line
1036-
if (register.ignored(filename)) return old(m, filename)
1043+
if (service.ignored(filename)) return old(m, filename)
10371044

1038-
if (register.options.experimentalEsmLoader) {
1045+
if (service.options.experimentalEsmLoader) {
10391046
assertScriptCanLoadAsCJS(filename)
10401047
}
10411048

@@ -1044,7 +1051,7 @@ function registerExtension (
10441051
m._compile = function (code: string, fileName: string) {
10451052
debug('module._compile', fileName)
10461053

1047-
return _compile.call(this, register.compile(code, fileName), fileName)
1054+
return _compile.call(this, service.compile(code, fileName), fileName)
10481055
}
10491056

10501057
return old(m, filename)

0 commit comments

Comments
 (0)