More fixes

Signed-off-by: Alan Cha <[email protected]>

Author: Alan-Cha

packages/openapi-to-graphql/lib/preprocessor.js

@@ -7,26 +7,26 @@ export declare const mitigations: {
      */
     INVALID_OAS: string;
     UNNAMED_PARAMETER: string;
-    MULTIPLE_RESPONSES: string;
-    MISSING_RESPONSE_SCHEMA: string;
+    AMBIGUOUS_UNION_MEMBERS: string;
+    CANNOT_GET_FIELD_TYPE: string;
+    COMBINE_SCHEMAS: string;
     DUPLICATE_FIELD_NAME: string;
     DUPLICATE_LINK_KEY: string;
-    UNSUPPORTED_HTTP_SECURITY_SCHEME: string;
+    MISSING_RESPONSE_SCHEMA: string;
+    MISSING_SCHEMA: string;
+    MULTIPLE_RESPONSES: string;
     NON_APPLICATION_JSON_SCHEMA: string;
     OBJECT_MISSING_PROPERTIES: string;
-    UNSUPPORTED_JSON_SCHEMA_KEYWORD: string;
-    AMBIGUOUS_UNION_MEMBERS: string;
-    CANNOT_GET_FIELD_TYPE: string;
-    COMBINE_SCHEMAS: string;
     UNKNOWN_TARGET_TYPE: string;
-    MISSING_SCHEMA: string;
     UNRESOLVABLE_SCHEMA: string;
-    UNRESOLVABLE_LINK: string;
+    UNSUPPORTED_HTTP_SECURITY_SCHEME: string;
+    UNSUPPORTED_JSON_SCHEMA_KEYWORD: string;
     AMBIGUOUS_LINK: string;
     LINK_NAME_COLLISION: string;
-    MULTIPLE_OAS_SAME_TITLE: string;
+    UNRESOLVABLE_LINK: string;
     DUPLICATE_OPERATIONID: string;
     DUPLICATE_SECURITY_SCHEME: string;
+    MULTIPLE_OAS_SAME_TITLE: string;
     CUSTOM_RESOLVER_UNKNOWN_OAS: string;
     CUSTOM_RESOLVER_UNKNOWN_PATH_METHOD: string;
     LIMIT_ARGUMENT_NAME_COLLISION: string;

packages/openapi-to-graphql/lib/preprocessor.js.map

@@ -223,7 +223,10 @@ export function preprocessOas(
           oas
         }
 
-        // Handle operationId property name collision // May occur if multiple OAS are provided
+        /**
+         * Handle operationId property name collision
+         * May occur if multiple OAS are provided
+         */
         if (operationId in data.operations) {
           handleWarning({
             typeKey: 'DUPLICATE_OPERATIONID',
@@ -291,7 +294,7 @@ function getProcessedSecuritySchemes(
   for (let key in security) {
     const protocol = security[key]
 
-    // Determine the parameters and the schema for the security protocol
+    // Determine the schema and the parameters for the security protocol
     let schema
     let parameters = {}
     let description
@@ -368,6 +371,7 @@ function getProcessedSecuritySchemes(
         }
         break
 
+      // TODO: Implement
       case 'openIdConnect':
         handleWarning({
           typeKey: 'UNSUPPORTED_HTTP_SECURITY_SCHEME',
@@ -378,7 +382,6 @@ function getProcessedSecuritySchemes(
           log: preprocessingLog
         })
 
-        // TODO: Implement
         break
 
       case 'oauth2':
@@ -969,14 +972,14 @@ export function createDataDef(
                 oas
               )
             } else {
-              // handleWarning({
-              //   typeKey: 'UNKNOWN_TARGET_TYPE',
-              //   message: `No GraphQL target type could be identified for schema '${JSON.stringify(
-              //     schema
-              //   )}'.`,
-              //   data,
-              //   log: preprocessingLog
-              // })
+              handleWarning({
+                typeKey: 'OBJECT_MISSING_PROPERTIES',
+                message:
+                  `Schema ${JSON.stringify(schema)} does not have ` +
+                  `any properties`,
+                data,
+                log: preprocessingLog
+              })
 
               def.targetGraphQLType = 'json'
             }
@@ -1042,21 +1045,17 @@ function getSchemaIndex(
  * been taken.
  */
 function getPreferredName(names: Oas3Tools.SchemaNames): string {
-  let schemaName // CASE: preferred name already known
-
   if (typeof names.preferred === 'string') {
-    schemaName = names.preferred // CASE: name from reference
+    return Oas3Tools.sanitize(names.preferred, Oas3Tools.CaseStyle.PascalCase) // CASE: preferred name already known
   } else if (typeof names.fromRef === 'string') {
-    schemaName = names.fromRef // CASE: name from schema (i.e., "title" property in schema)
+    return Oas3Tools.sanitize(names.fromRef, Oas3Tools.CaseStyle.PascalCase) // CASE: name from reference
   } else if (typeof names.fromSchema === 'string') {
-    schemaName = names.fromSchema // CASE: name from path
+    return Oas3Tools.sanitize(names.fromSchema, Oas3Tools.CaseStyle.PascalCase) // CASE: name from schema (i.e., "title" property in schema)
   } else if (typeof names.fromPath === 'string') {
-    schemaName = names.fromPath // CASE: placeholder name
+    return Oas3Tools.sanitize(names.fromPath, Oas3Tools.CaseStyle.PascalCase) // CASE: name from path
   } else {
-    schemaName = 'PlaceholderName'
+    return 'PlaceholderName' // CASE: placeholder name
   }
-
-  return Oas3Tools.sanitize(schemaName, Oas3Tools.CaseStyle.camelCase)
 }
 
 /**

packages/openapi-to-graphql/lib/schema_builder.js

@@ -111,17 +111,6 @@ export function getGraphQLType({
         isInputObjectType
       })
 
-    // CASE: combine schemas
-    case 'combination':
-      // TODO: currently assuming that the combined schema is an object type
-      return createOrReuseOt({
-        def,
-        operation,
-        data,
-        iteration,
-        isInputObjectType
-      })
-
     // CASE: union - create UnionType
     case 'union':
       return createOrReuseUnion({
@@ -220,36 +209,6 @@ function createOrReuseOt({
   const schema = def.schema
   const description = schema.description
 
-  /**
-   * If the schema does not contain any properties, then OpenAPI-to-GraphQL
-   * cannot create a GraphQL object type for it because in GraphQL, all object
-   * type properties must be named.
-   *
-   * Instead, store response in an arbitray JSON type.
-   */
-  if (
-    (typeof def.schema.properties === 'undefined' ||
-      Object.keys(def.schema.properties).length === 0) && // Empty object
-    typeof def.schema.allOf === 'undefined' &&
-    typeof def.schema.oneOf === 'undefined' &&
-    typeof def.schema.anyOf === 'undefined'
-  ) {
-    handleWarning({
-      typeKey: 'OBJECT_MISSING_PROPERTIES',
-      message:
-        `The operation ` +
-        `'${operation.operationString}' contains ` +
-        `an object schema ${JSON.stringify(schema)} with no properties. ` +
-        `GraphQL objects must have well-defined properties so a one to ` +
-        `one conversion cannot be achieved.`,
-      data,
-      log: translationLog
-    })
-
-    def.graphQLType = GraphQLJSON
-    return def.graphQLType
-  }
-
   // CASE: query - create object type
   if (!isInputObjectType) {
     translationLog(
@@ -1227,13 +1186,13 @@ export function getArgs({
     })
 
     // Sanitize the argument name
-    const saneName = data.options.genericPayloadArgName ?
-      'requestBody' :
-      Oas3Tools.sanitize(
-        requestPayloadDef.graphQLInputObjectTypeName,
-        Oas3Tools.CaseStyle.camelCase
-      )
-    
+    const saneName = data.options.genericPayloadArgName
+      ? 'requestBody'
+      : Oas3Tools.sanitize(
+          requestPayloadDef.graphQLInputObjectTypeName,
+          Oas3Tools.CaseStyle.camelCase
+        )
+
     const reqRequired =
       typeof operation === 'object' &&
       typeof operation.payloadRequired === 'boolean'