Remove duplicate resolveType() function (#266)

airtasker · Jun 5, 2019 · 74f3f90 · 74f3f90
1 parent 0ebbe68
commit 74f3f90
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/lib/src/generators/contract/openapi3-schema.ts b/lib/src/generators/contract/openapi3-schema.ts
@@ -7,7 +7,7 @@ import {
   TypeKind,
   UnionType
 } from "../../models/types";
-import { resolveType } from "../../models/types/resolve-type";
+import { resolveType } from "../../verifiers/utilities/type-resolver";
 
 function isStringConstantUnion(type: UnionType): boolean {
   return type.types.reduce<boolean>((acc, type) => {
@@ -175,7 +175,7 @@ function inferDiscriminator(
         // Optional properties cannot be discriminators, since they may not always be present.
         continue;
       }
-      const resolvedPropertyType = resolveType(types, property.type);
+      const resolvedPropertyType = resolveType(property.type, types);
       if (resolvedPropertyType.kind === TypeKind.STRING_LITERAL) {
         possibleDiscriminators[property.name] =
           possibleDiscriminators[property.name] || {};

diff --git a/lib/src/models/types/resolve-type.ts b/lib/src/models/types/resolve-type.ts