properly classify json files as json

Fix: #3
tapjs · Nov 28, 2023 · c72a9d5 · c72a9d5
1 parent cff7901
commit c72a9d5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/classify-module.ts b/src/classify-module.ts
@@ -21,8 +21,10 @@ const readPJType = cachedMtime(
   })
 )
 
-export const classifyModule = (fileName: string) => {
-  if (fileName.endsWith('.cts') || fileName.endsWith('.cjs')) {
+export const classifyModule = (fileName: string): PackageJsonType | 'json' => {
+  if (fileName.endsWith('.json')) {
+    return 'json'
+  } if (fileName.endsWith('.cts') || fileName.endsWith('.cjs')) {
     return 'commonjs'
   } else if (fileName.endsWith('.mts') || fileName.endsWith('.mjs')) {
     return 'module'

diff --git a/src/service/service.ts b/src/service/service.ts
@@ -84,8 +84,7 @@ export class DaemonServer extends SockDaemonServer<
     if (target.startsWith('file://')) {
       const tsFile = findTsFile(target)
       if (tsFile) {
-        const ret = String(pathToFileURL(tsFile))
-        return { fileName: ret }
+        return { fileName: String(pathToFileURL(tsFile)) }
       }
     }
     return {}

diff --git a/tap-snapshots/test/classify-module.ts.test.cjs b/tap-snapshots/test/classify-module.ts.test.cjs
@@ -10,6 +10,7 @@ Object {
   "index.cjs": "commonjs",
   "index.cts": "commonjs",
   "index.js": "commonjs",
+  "index.json": "json",
   "index.jsx": "commonjs",
   "index.mjs": "module",
   "index.mts": "module",
@@ -23,6 +24,7 @@ Object {
   "index.cjs": "commonjs",
   "index.cts": "commonjs",
   "index.js": "commonjs",
+  "index.json": "json",
   "index.jsx": "commonjs",
   "index.mjs": "module",
   "index.mts": "module",
@@ -36,6 +38,7 @@ Object {
   "index.cjs": "commonjs",
   "index.cts": "commonjs",
   "index.js": "module",
+  "index.json": "json",
   "index.jsx": "module",
   "index.mjs": "module",
   "index.mts": "module",

diff --git a/test/classify-module.ts b/test/classify-module.ts
@@ -6,6 +6,7 @@ import { classifyModule } from '../src/classify-module.js'
 
 t.test('classify some modules', t => {
   const files = {
+    'index.json': '',
     'index.cjs': '',
     'index.cts': '',
     'index.mjs': '',
@@ -67,6 +68,7 @@ t.test('classify some modules', t => {
         t.strictSame(
           results,
           {
+            'index.json': 'json',
             'index.cjs': 'commonjs',
             'index.cts': 'commonjs',
             'index.mjs': 'module',