fix: allow jsonFormat with format:html

fastify · May 21, 2022 · f282dae · f282dae
1 parent b83d922
commit f282dae
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -45,11 +45,11 @@ interface ListRender {
 interface ListOptions {
   names?: string[];
   extendedFolderInfo?: boolean;
+  jsonFormat?: 'names' | 'extended';
 }
 
 interface ListOptionsJsonFormat extends ListOptions {
   format: 'json';
-  jsonFormat?: 'names' | 'extended';
   // Required when the URL parameter `format=html` exists
   render?: ListRender;
 }

diff --git a/lib/dirList.js b/lib/dirList.js
@@ -204,9 +204,6 @@ const dirList = {
     if (options.list.format === 'html' && typeof options.list.render !== 'function') {
       return new TypeError('The `list.render` option must be a function and is required with html format')
     }
-    if (options.list.format === 'html' && options.list.jsonFormat != null) {
-      return new TypeError('The `list.jsonFormat` option must be with json format')
-    }
   }
 
 }

diff --git a/test/dir-list.test.js b/test/dir-list.test.js
@@ -72,14 +72,6 @@ t.test('throws when `list.format` is html and `list render` is not a function',
   t.equal(err.message, 'The `list.render` option must be a function and is required with html format')
 })
 
-t.test('throws when `list.format` is html and `list.jsonFormat` is given', t => {
-  t.plan(2)
-
-  const err = dirList.validateOptions({ list: { format: 'html', render: () => '', jsonFormat: 'extended' } })
-  t.type(err, TypeError)
-  t.equal(err.message, 'The `list.jsonFormat` option must be with json format')
-})
-
 t.test('dir list wrong options', t => {
   t.plan(3)