fix: maintain context of the original method name as a fallback type prefix

Author: MarshallOfSound

src/dynamic-param-interfaces.ts

@@ -48,7 +48,7 @@ const ignoreDescriptions = <T extends EventParameterDocumentation>(
 // Given a parameter create a new interface and return it's name
 // IName is the proposed interface name prefix
 // backupIName is a slightly longer IName in case IName is already taken
-const createParamInterface = (param: ParamInterface, IName = '', backupIName = ''): string => {
+const createParamInterface = (param: ParamInterface, IName = '', backupIName = '', finalBackupIName = ''): string => {
   let argType = polite(IName) + _.upperFirst(_.camelCase(param.name));
   let argName = param.name;
   // TODO: Note.  It is still possible for even backupIName to be already used
@@ -79,17 +79,15 @@ const createParamInterface = (param: ParamInterface, IName = '', backupIName = '
     )
   ) {
     if (backupIName) {
-      return createParamInterface(param, backupIName);
+      return createParamInterface(param, backupIName, finalBackupIName);
     }
-    // console.log('ISSUE', param.properties)
-    // FIXME: Wut...
-    return argType;
-    // console.error(
-    //   ignoreDescriptions(paramInterfacesToDeclare[argType].properties),
-    //   '\n',
-    //   ignoreDescriptions(param.properties),
-    // );
-    // throw Error(`Interface "${argType}" has already been declared`);
+    console.error(
+      argType, IName, backupIName, finalBackupIName,
+      ignoreDescriptions(paramInterfacesToDeclare[argType].properties),
+      '\n',
+      ignoreDescriptions(param.properties),
+    );
+    throw Error(`Interface "${argType}" has already been declared`);
   }
   // Update the params interfaces we still have to define
   paramInterfacesToDeclare[argType] = param;

src/utils.ts

@@ -295,6 +295,7 @@ export const genMethodString = (
   moduleMethod: MethodDocumentationBlock,
   includeType = true,
   paramTypePrefix = '',
+  topLevelModuleMethod?: MethodDocumentationBlock,
 ): string => {
   const createMethodObjectParamType = (
     objectParam: DetailedObjectType & TypeInformation & DocumentationBlock & { required: boolean },
@@ -304,7 +305,7 @@ export const genMethodString = (
     }
     if (objectParam.name === 'options') {
       if (
-        ['show', 'hide', 'open', 'close', 'start', 'stop', 'constructor'].includes(
+        ['show', 'hide', 'open', 'close', 'start', 'stop', 'constructor', 'print'].includes(
           moduleMethod.name.toLowerCase(),
         )
       ) {
@@ -317,7 +318,18 @@ export const genMethodString = (
       return paramInterfaces.createParamInterface(objectParam, _.upperFirst(moduleMethod.name));
     }
 
-    return paramInterfaces.createParamInterface(objectParam, '', _.upperFirst(moduleMethod.name));
+    if (
+      ['set', 'get'].includes(
+        moduleMethod.name.toLowerCase(),
+      )
+    ) {
+      return paramInterfaces.createParamInterface(
+        objectParam,
+        _.upperFirst(module.name) + _.upperFirst(moduleMethod.name),
+      );
+    }
+
+    return paramInterfaces.createParamInterface(objectParam, '', _.upperFirst(moduleMethod.name), topLevelModuleMethod ? _.upperFirst(topLevelModuleMethod.name) : '');
   };
   return `${includeType ? '(' : ''}${(moduleMethod.parameters || [])
     .map(param => {
@@ -346,6 +358,9 @@ export const genMethodString = (
                   name: _.upperFirst(moduleMethod.name) + _.upperFirst(param.name),
                   ...functionParam,
                 } as any /* FIXME: */,
+                true,
+                '',
+                moduleMethod
               ),
             });
           } else if (paramType.type === 'Object' && objectParam.properties) {
@@ -359,7 +374,9 @@ export const genMethodString = (
       }
       const functionParam = param as DetailedFunctionType;
       if (param.type === 'Function' && functionParam.parameters) {
-        paramType = genMethodString(paramInterfaces, module, functionParam as any /* FIXME: */);
+        paramType = genMethodString(paramInterfaces, module, functionParam as any /* FIXME: */, true,
+          '',
+          moduleMethod);
       }
 
       const name = paramify(param.name);