Skip to content

Commit

Permalink
fix(cli): Cleanup header type helpers
Browse files Browse the repository at this point in the history
  • Loading branch information
WoH committed Jan 8, 2021
1 parent edafcc0 commit 9637443
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions packages/cli/src/utils/headerTypeHeloers.ts
Original file line number Diff line number Diff line change
@@ -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]);
Expand All @@ -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;
Expand Down

0 comments on commit 9637443

Please sign in to comment.