fix(cli): Cleanup header type helpers

lukeautry · Jan 8, 2021 · b4c261e · b4c261e
1 parent edafcc0
commit b4c261e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/packages/cli/src/metadataGeneration/controllerGenerator.ts b/packages/cli/src/metadataGeneration/controllerGenerator.ts
@@ -5,7 +5,7 @@ import { MetadataGenerator } from './metadataGenerator';
 import { MethodGenerator } from './methodGenerator';
 import { TypeResolver } from './typeResolver';
 import { Tsoa } from '@tsoa/runtime';
-import { getHeaderType } from '../utils/headerTypeHeloers';
+import { getHeaderType } from '../utils/headerTypeHelpers';
 
 export class ControllerGenerator {
   private readonly path?: string;

diff --git a/packages/cli/src/metadataGeneration/methodGenerator.ts b/packages/cli/src/metadataGeneration/methodGenerator.ts
@@ -9,7 +9,7 @@ import { ParameterGenerator } from './parameterGenerator';
 
 import { Tsoa } from '@tsoa/runtime';
 import { TypeResolver } from './typeResolver';
-import { getHeaderType } from '../utils/headerTypeHeloers';
+import { getHeaderType } from '../utils/headerTypeHelpers';
 
 export class MethodGenerator {
   private method: 'get' | 'post' | 'put' | 'patch' | 'delete' | 'head';

diff --git a/packages/cli/src/metadataGeneration/parameterGenerator.ts b/packages/cli/src/metadataGeneration/parameterGenerator.ts
@@ -7,7 +7,7 @@ import { getInitializerValue } from './initializer-value';
 import { MetadataGenerator } from './metadataGenerator';
 import { Tsoa } from '@tsoa/runtime';
 import { TypeResolver } from './typeResolver';
-import { getHeaderType } from '../utils/headerTypeHeloers';
+import { getHeaderType } from '../utils/headerTypeHelpers';
 
 export class ParameterGenerator {
   constructor(private readonly parameter: ts.ParameterDeclaration, private readonly method: string, private readonly path: string, private readonly current: MetadataGenerator) {}

diff --git a/packages/cli/src/utils/headerTypeHeloers.ts → packages/cli/src/utils/headerTypeHelpers.ts b/packages/cli/src/utils/headerTypeHeloers.ts → packages/cli/src/utils/headerTypeHelpers.ts
@@ -1,17 +1,17 @@
 import { Tsoa } from '@tsoa/runtime';
-import ts = require('typescript');
+import { NodeArray, TypeNode } from 'typescript';
 import { GenerateMetadataError } from '../metadataGeneration/exceptions';
 import { MetadataGenerator } from '../metadataGeneration/metadataGenerator';
 import { TypeResolver } from '../metadataGeneration/typeResolver';
 
-export function getHeaderType(typeArgumentNodes: ts.NodeArray<ts.TypeNode> | undefined, index: number, metadataGenerator: MetadataGenerator): Tsoa.HeaderType | undefined {
+export function getHeaderType(typeArgumentNodes: NodeArray<TypeNode> | undefined, index: number, metadataGenerator: MetadataGenerator): Tsoa.HeaderType | undefined {
   if (!typeArgumentNodes || !typeArgumentNodes[index]) {
     return undefined;
   }
 
   const candidate = new TypeResolver(typeArgumentNodes[index], metadataGenerator).resolve();
 
-  if (candidate && supportHeaderDataType(candidate)) {
+  if (candidate && isSupportedHeaderDataType(candidate)) {
     return candidate;
   } else if (candidate) {
     throw new GenerateMetadataError(`Unable to parse Header Type ${typeArgumentNodes[index].getText()}`, typeArgumentNodes[index]);
@@ -20,7 +20,7 @@ export function getHeaderType(typeArgumentNodes: ts.NodeArray<ts.TypeNode> | und
   return undefined;
 }
 
-export function supportHeaderDataType(parameterType: Tsoa.Type): parameterType is Tsoa.HeaderType {
+export function isSupportedHeaderDataType(parameterType: Tsoa.Type): parameterType is Tsoa.HeaderType {
   const supportedPathDataTypes: Tsoa.TypeStringLiteral[] = ['nestedObjectLiteral', 'refObject'];
   if (supportedPathDataTypes.find(t => t === parameterType.dataType)) {
     return true;