Fix custom indents for type literal signatures

Author: Soc Sieng

src/render/reflection-formatter.ts

@@ -25,7 +25,6 @@ export const sortMapping: { [key: string]: ReflectionSortFlags | undefined } = {
 
 export default class ReflectionFormatter {
   public static sortOption: ReflectionSortFlags = ReflectionSortFlags.none;
-  public static indentString: string = '  ';
 
   public render(reflection?: Reflection, terminatorCharacter?: string): string {
     if (reflection) {

src/render/type-literal-renderer.ts

@@ -33,7 +33,7 @@ export default class TypeLiteralRenderer extends ContainerRenderer {
       let signature = ReflectionFormatter.instance().render(member.signatures[0]);
       if (indent) {
         lines.push('');
-        signature = signature.split('\n').map(l => `  ${l}`).join('\n');
+        signature = signature.split('\n').map(l => `${this._indentor.getIndent(1)}${l}`).join('\n');
       }
       lines.push(signature);
     } else if (member.name === '__type') {

tests/dynamic-tests.ts

@@ -13,6 +13,7 @@ import Version from '../src/util/version';
 import VersionFilter from '../src/convert/version-filter';
 import glob from 'glob';
 import mkdir from 'make-dir';
+import Indentor from '../src/render/indentor';
 
 const writeOutput = process.env['DEBUG_MODE'] !== 'none';
 
@@ -55,8 +56,12 @@ describe('Dynamic test suite', () => {
     const basename = testFile.replace(/(input|exact)(\.d)?\.ts$/i, '');
     const expectedFile = /exact\.d\.ts$/i.test(testFile) ? testFile : `${basename}expected.d.ts`;
     const expectedOutput = fs.readFileSync(path.join(__dirname, expectedFile), 'utf8');
+    const optionsFile = path.join(__dirname, `${basename}options.json`);
+    const options = fs.existsSync(optionsFile) ? JSON.parse(fs.readFileSync(optionsFile, 'utf8')) : null;
+
+    ReflectionFormatter.sortOption = options?.sort ?? ReflectionSortFlags.tag;
+    Indentor.indentString = options?.indentString ?? '  ';
 
-    ReflectionFormatter.sortOption = ReflectionSortFlags.tag;
     const formatter = ReflectionFormatter.instance();
 
     if (project) {

tests/test-data/function/handler-indent-exact.d.ts

@@ -0,0 +1,14 @@
+declare namespace IndentHandlers {
+    type MyUncommentedHandler = (foo: any) => any;
+
+    /**
+     * My comment
+     */
+    type MyCommentedHandler =
+        /**
+         * Handler comment
+         *
+         * @param foo can be anything
+         */
+        (foo: any) => any;
+}

tests/test-data/function/handler-indent-options.json

@@ -0,0 +1,3 @@
+{
+  "indentString": "    "
+}