signed-off: added stricter scalar type checks + build

Signed-off-by: Ifeora Okechukwu <[email protected]>

packages/openapi-to-graphql/lib/schema_builder.d.ts

@@ -3,7 +3,7 @@
  */
 import { PreprocessingData } from './types/preprocessing_data';
 import { Operation, DataDefinition } from './types/operation';
-import { ParameterObject } from './types/oas3';
+import { SchemaObject, ParameterObject } from './types/oas3';
 import { Args, GraphQLType } from './types/graphql';
 declare type GetArgsParams = {
     requestPayloadDef?: DataDefinition;
@@ -13,6 +13,7 @@ declare type GetArgsParams = {
 };
 declare type CreateOrReuseComplexTypeParams = {
     def: DataDefinition;
+    schema?: SchemaObject;
     operation?: Operation;
     iteration?: number;
     isInputObjectType?: boolean;
@@ -21,7 +22,7 @@ declare type CreateOrReuseComplexTypeParams = {
 /**
  * Creates and returns a GraphQL type for the given JSON schema.
  */
-export declare function getGraphQLType({ def, operation, data, iteration, isInputObjectType }: CreateOrReuseComplexTypeParams): GraphQLType;
+export declare function getGraphQLType({ def, schema, operation, data, iteration, isInputObjectType }: CreateOrReuseComplexTypeParams): GraphQLType;
 /**
  * Creates the arguments for resolving a field
  */

packages/openapi-to-graphql/lib/types/oas3.d.ts

@@ -8,6 +8,11 @@ declare type ExternalDocumentationObject = {
 export declare type SchemaObject = {
     $ref?: string;
     title?: string;
+    minimum?: number;
+    maximum?: number;
+    maxLength?: number;
+    minLength?: number;
+    pattern?: string;
     type?: 'string' | 'number' | 'object' | 'array' | 'boolean' | 'integer';
     format?: string;
     nullable?: boolean;

packages/openapi-to-graphql/lib/utils.d.ts

@@ -33,6 +33,10 @@ export declare const mitigations: {
     LIMIT_ARGUMENT_NAME_COLLISION: string;
     OAUTH_SECURITY_SCHEME: string;
 };
+/**
+ * get the correct type of a variable
+ */
+export declare function strictTypeOf(value: any, type: any): boolean;
 /**
  * Utilities that are specific to OpenAPI-to-GraphQL
  */

packages/openapi-to-graphql/src/utils.ts

@@ -55,54 +55,54 @@ export const mitigations = {
  * check if a literal is falsy or not
  */
 const isLiteralFalsey = (variable): boolean => {
-  return (variable === "" || variable === false || variable === 0)
+  return variable === '' || variable === false || variable === 0
 }
 
 /**
  * provide the name of primitive and/or reference types
  */
 const checkTypeName = (target, type): boolean => {
-  let typeName = ""
+  let typeName = ''
 
-  if(isLiteralFalsey(target)){
-      typeName = (typeof target)
-  }else{
-      typeName = ("" + (target && target.constructor.name))
+  if (isLiteralFalsey(target)) {
+    typeName = typeof target
+  } else {
+    typeName = '' + (target && target.constructor.name)
   }
   return !!(typeName.toLowerCase().indexOf(type) + 1)
 }
 
 /**
  * get the correct type of a variable
  */
- export function strictTypeOf (value, type): boolean {
+export function strictTypeOf(value, type): boolean {
   let result = false
 
   type = type || []
 
-  if(typeof type === 'object'){
-      if(typeof type.length !== 'number'){
-          return result
-      }
-
-      let bitPiece = 0
+  if (typeof type === 'object') {
+    if (typeof type.length !== 'number') {
+      return result
+    }
 
-      type = [].slice.call(type)
+    let bitPiece = 0
 
-      type.forEach( _type => {
-          if(typeof _type === 'function'){
-              _type = (_type.name || _type.displayName).toLowerCase()
-          }
-          bitPiece |= Number(checkTypeName(value, _type))
-      });
+    type = [].slice.call(type)
 
-      result = Boolean(bitPiece)
-  }else{
-      if(typeof type === 'function'){
-          type = (type.name || type.displayName).toLowerCase()
+    type.forEach(_type => {
+      if (typeof _type === 'function') {
+        _type = (_type.name || _type.displayName).toLowerCase()
       }
+      bitPiece |= Number(checkTypeName(value, _type))
+    })
+
+    result = Boolean(bitPiece)
+  } else {
+    if (typeof type === 'function') {
+      type = (type.name || type.displayName).toLowerCase()
+    }
 
-      result = checkTypeName(value, type)
+    result = checkTypeName(value, type)
   }
   return result
 }