Skip to content

Commit c72a9d5

Browse files
committed
properly classify json files as json
Fix: tapjs#3
1 parent cff7901 commit c72a9d5

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

src/classify-module.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ const readPJType = cachedMtime(
2121
})
2222
)
2323

24-
export const classifyModule = (fileName: string) => {
25-
if (fileName.endsWith('.cts') || fileName.endsWith('.cjs')) {
24+
export const classifyModule = (fileName: string): PackageJsonType | 'json' => {
25+
if (fileName.endsWith('.json')) {
26+
return 'json'
27+
} if (fileName.endsWith('.cts') || fileName.endsWith('.cjs')) {
2628
return 'commonjs'
2729
} else if (fileName.endsWith('.mts') || fileName.endsWith('.mjs')) {
2830
return 'module'

src/service/service.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ export class DaemonServer extends SockDaemonServer<
8484
if (target.startsWith('file://')) {
8585
const tsFile = findTsFile(target)
8686
if (tsFile) {
87-
const ret = String(pathToFileURL(tsFile))
88-
return { fileName: ret }
87+
return { fileName: String(pathToFileURL(tsFile)) }
8988
}
9089
}
9190
return {}

tap-snapshots/test/classify-module.ts.test.cjs

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Object {
1010
"index.cjs": "commonjs",
1111
"index.cts": "commonjs",
1212
"index.js": "commonjs",
13+
"index.json": "json",
1314
"index.jsx": "commonjs",
1415
"index.mjs": "module",
1516
"index.mts": "module",
@@ -23,6 +24,7 @@ Object {
2324
"index.cjs": "commonjs",
2425
"index.cts": "commonjs",
2526
"index.js": "commonjs",
27+
"index.json": "json",
2628
"index.jsx": "commonjs",
2729
"index.mjs": "module",
2830
"index.mts": "module",
@@ -36,6 +38,7 @@ Object {
3638
"index.cjs": "commonjs",
3739
"index.cts": "commonjs",
3840
"index.js": "module",
41+
"index.json": "json",
3942
"index.jsx": "module",
4043
"index.mjs": "module",
4144
"index.mts": "module",

test/classify-module.ts

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { classifyModule } from '../src/classify-module.js'
66

77
t.test('classify some modules', t => {
88
const files = {
9+
'index.json': '',
910
'index.cjs': '',
1011
'index.cts': '',
1112
'index.mjs': '',
@@ -67,6 +68,7 @@ t.test('classify some modules', t => {
6768
t.strictSame(
6869
results,
6970
{
71+
'index.json': 'json',
7072
'index.cjs': 'commonjs',
7173
'index.cts': 'commonjs',
7274
'index.mjs': 'module',

0 commit comments

Comments
 (0)