Skip to content

Commit a3a9be7

Browse files
authored
make file structure closer to Node.js' (#6)
* make file structure closer to Node.js' Having the file structure as close as nodejs/node one will help keeping the code up-to-date. We can also use package imports for the require calls to be as close as the upstream ones as possible. * fixup! * fixup! * fixup!
1 parent 48ed727 commit a3a9be7

14 files changed

Lines changed: 38 additions & 24 deletions

File tree

bin/test_runner.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env node
2-
// https://github.com/cjihrig/node/blob/484d35402de36d8d5756b244c8e5fbb8aa4c6afd/lib/internal/main/test_runner.js
2+
// https://github.com/nodejs/node/blob/484d35402de36d8d5756b244c8e5fbb8aa4c6afd/lib/internal/main/test_runner.js
33
'use strict'
44
const {
55
ArrayFrom,
@@ -8,15 +8,18 @@ const {
88
ArrayPrototypeSort,
99
Promise,
1010
SafeSet
11-
} = require('../lib/primordials')
11+
} = require('#internal/per_context/primordials')
1212
const { spawn } = require('child_process')
1313
const { readdirSync, statSync } = require('fs')
1414
const {
1515
codes: { ERR_TEST_FAILURE }
16-
} = require('../lib/errors')
17-
const test = require('../lib/harness')
18-
const { kSubtestsFailed } = require('../lib/test')
19-
const { isSupportedFileType, doesPathMatchFilter } = require('../lib/utils')
16+
} = require('#internal/errors')
17+
const test = require('#internal/test_runner/harness')
18+
const { kSubtestsFailed } = require('#internal/test_runner/test')
19+
const {
20+
isSupportedFileType,
21+
doesPathMatchFilter
22+
} = require('#internal/test_runner/utils')
2023
const { basename, join, resolve } = require('path')
2124

2225
// TODO(cjihrig): Replace this with recursive readdir once it lands.

index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
'use strict'
44

5-
const test = require('./lib/harness')
5+
const test = require('#internal/test_runner/harness')
66

77
module.exports = test
88
module.exports.test = test

lib/errors.js renamed to lib/internal/errors.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const {
1010
ReflectApply,
1111
SafeMap,
1212
StringPrototypeMatch
13-
} = require('./primordials')
13+
} = require('#internal/per_context/primordials')
1414

1515
function inspectWithNoCustomRetry (obj, options) {
1616
const utilInspect = lazyInternalUtilInspect()
File renamed without changes.
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33
'use strict'
44

55
const { createHook, executionAsyncId } = require('async_hooks')
6-
const { FunctionPrototypeBind, SafeMap } = require('./primordials')
6+
const {
7+
FunctionPrototypeBind,
8+
SafeMap
9+
} = require('#internal/per_context/primordials')
710
const {
811
codes: { ERR_TEST_FAILURE }
9-
} = require('./errors')
10-
const { Test } = require('./test')
12+
} = require('#internal/errors')
13+
const { Test } = require('#internal/test_runner/test')
1114

1215
function createProcessEventHandler (eventName, rootTest, testResources) {
1316
return err => {
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'use strict'
44

55
const { Readable } = require('stream')
6-
const { isError } = require('./utils')
6+
const { isError } = require('#internal/test_runner/utils')
77
const {
88
ArrayPrototypeForEach,
99
ArrayPrototypeJoin,
@@ -13,8 +13,8 @@ const {
1313
StringPrototypeReplaceAll,
1414
StringPrototypeSplit,
1515
RegExpPrototypeSymbolReplace
16-
} = require('./primordials')
17-
const { inspectWithNoCustomRetry } = require('./errors')
16+
} = require('#internal/per_context/primordials')
17+
const { inspectWithNoCustomRetry } = require('#internal/errors')
1818

1919
const kFrameStartRegExp = /^ {4}at /
2020
const kLineBreakRegExp = /\n|\r\n/

lib/test.js renamed to lib/internal/test_runner/test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ const {
1313
Number,
1414
ObjectCreate,
1515
SafeMap
16-
} = require('./primordials')
16+
} = require('#internal/per_context/primordials')
1717
const {
1818
codes: { ERR_TEST_FAILURE },
1919
kIsNodeError
20-
} = require('./errors')
21-
const { getOptionValue } = require('./options')
22-
const { TapStream } = require('./tap_stream')
20+
} = require('#internal/errors')
21+
const { getOptionValue } = require('#internal/options')
22+
const { TapStream } = require('#internal/test_runner/tap_stream')
2323
const { cpus } = require('os')
2424
const isTestRunner = getOptionValue('--test')
2525
const testOnlyFlag = !isTestRunner && getOptionValue('--test-only')

lib/utils.js renamed to lib/internal/test_runner/utils.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
// https://github.com/nodejs/node/blob/98e9499b55fbc63b2b3db79507ee1475302f9763/lib/internal/test_runner/utils.js
22
'use strict'
3-
const { RegExpPrototypeExec } = require('./primordials')
3+
const { RegExpPrototypeExec } = require('#internal/per_context/primordials')
44
const { basename } = require('path')
5-
const { types: { isNativeError } } = require('util')
5+
const {
6+
types: { isNativeError }
7+
} = require('util')
68
const kSupportedFileExtensions = /\.[cm]?js$/
79
const kTestFilePattern = /((^test(-.+)?)|(.+[.\-_]test))\.[cm]?js$/
810

package.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@
99
"bin": {
1010
"node-core-test": "./bin/test_runner.js"
1111
},
12+
"imports": {
13+
"#internal/per_context/*": "./lib/internal/per_context/*.js",
14+
"#internal/test_runner/*": "./lib/internal/test_runner/*.js",
15+
"#internal/*": "./lib/internal/*.js",
16+
"#node:test": "./index.js"
17+
},
1218
"scripts": {
1319
"test": "npm run test:lint && npm run test:unit",
1420
"test:lint": "standard --fix",

0 commit comments

Comments
 (0)