sofa-api 0.15.2 → 0.15.3

package/index.js

@@ -12,6 +12,7 @@ const fetch = require('@whatwg-node/fetch');
 const colors = _interopDefault(require('ansi-colors'));
 const router = require('@whatwg-node/router');
 const titleCase = require('title-case');
+const definition = require('graphql/type/definition');
 
 function getOperationInfo(doc) {
     const op = graphql.getOperationAST(doc, null);
@@ -713,6 +714,7 @@ function resolveFieldType(type, opts) {
 
 function buildPathFromOperation({ url, schema, operation, useRequestBody, tags, description, customScalars, }) {
     const info = getOperationInfo(operation);
+    const enumTypes = resolveEnumTypes(schema);
     const summary = resolveSummary(schema, info.operation);
     return Object.assign(Object.assign({ tags,
         description,
@@ -722,14 +724,14 @@ function buildPathFromOperation({ url, schema, operation, useRequestBody, tags,
                 content: {
                     'application/json': {
                         schema: resolveRequestBody(info.operation.variableDefinitions, {
-                            customScalars,
+                            customScalars, enumTypes
                         }),
                     },
                 },
             },
         }
         : {
-            parameters: resolveParameters(url, info.operation.variableDefinitions, { customScalars }),
+            parameters: resolveParameters(url, info.operation.variableDefinitions, { customScalars, enumTypes }),
         })), { responses: {
             200: {
                 description: summary,
@@ -738,13 +740,22 @@ function buildPathFromOperation({ url, schema, operation, useRequestBody, tags,
                         schema: resolveResponse({
                             schema,
                             operation: info.operation,
-                            customScalars,
+                            opts: { customScalars, enumTypes },
                         }),
                     },
                 },
             },
         } });
 }
+function resolveEnumTypes(schema) {
+    const enumTypes = Object.values(schema.getTypeMap()).filter(graphql.isEnumType).map(definition.assertEnumType);
+    return Object.fromEntries(enumTypes.map(type => ([type.name,
+        {
+            type: 'string',
+            enum: type.getValues().map(value => value.name),
+        },
+    ])));
+}
 function resolveParameters(url, variables, opts) {
     if (!variables) {
         return [];
@@ -787,23 +798,23 @@ function resolveParamSchema(type, opts) {
     }
     const primitive = mapToPrimitive(type.name.value);
     return (primitive ||
-        opts.customScalars[type.name.value] || {
-        $ref: mapToRef(type.name.value),
-    });
+        opts.customScalars[type.name.value] ||
+        opts.enumTypes[type.name.value] ||
+        { $ref: mapToRef(type.name.value) });
 }
-function resolveResponse({ schema, operation, customScalars, }) {
+function resolveResponse({ schema, operation, opts, }) {
     const operationType = operation.operation;
     const rootField = operation.selectionSet.selections[0];
     if (rootField.kind === graphql.Kind.FIELD) {
         if (operationType === 'query') {
             const queryType = schema.getQueryType();
             const field = queryType.getFields()[rootField.name.value];
-            return resolveFieldType(field.type, { customScalars });
+            return resolveFieldType(field.type, opts);
         }
         if (operationType === 'mutation') {
             const mutationType = schema.getMutationType();
             const field = mutationType.getFields()[rootField.name.value];
-            return resolveFieldType(field.type, { customScalars });
+            return resolveFieldType(field.type, opts);
         }
     }
 }

package/index.mjs

@@ -6,6 +6,7 @@ import { crypto, fetch } from '@whatwg-node/fetch';
 import colors from 'ansi-colors';
 import { createRouter as createRouter$1, Response } from '@whatwg-node/router';
 import { titleCase } from 'title-case';
+import { assertEnumType } from 'graphql/type/definition';
 
 function getOperationInfo(doc) {
     const op = getOperationAST(doc, null);
@@ -707,6 +708,7 @@ function resolveFieldType(type, opts) {
 
 function buildPathFromOperation({ url, schema, operation, useRequestBody, tags, description, customScalars, }) {
     const info = getOperationInfo(operation);
+    const enumTypes = resolveEnumTypes(schema);
     const summary = resolveSummary(schema, info.operation);
     return Object.assign(Object.assign({ tags,
         description,
@@ -716,14 +718,14 @@ function buildPathFromOperation({ url, schema, operation, useRequestBody, tags,
                 content: {
                     'application/json': {
                         schema: resolveRequestBody(info.operation.variableDefinitions, {
-                            customScalars,
+                            customScalars, enumTypes
                         }),
                     },
                 },
             },
         }
         : {
-            parameters: resolveParameters(url, info.operation.variableDefinitions, { customScalars }),
+            parameters: resolveParameters(url, info.operation.variableDefinitions, { customScalars, enumTypes }),
         })), { responses: {
             200: {
                 description: summary,
@@ -732,13 +734,22 @@ function buildPathFromOperation({ url, schema, operation, useRequestBody, tags,
                         schema: resolveResponse({
                             schema,
                             operation: info.operation,
-                            customScalars,
+                            opts: { customScalars, enumTypes },
                         }),
                     },
                 },
             },
         } });
 }
+function resolveEnumTypes(schema) {
+    const enumTypes = Object.values(schema.getTypeMap()).filter(isEnumType).map(assertEnumType);
+    return Object.fromEntries(enumTypes.map(type => ([type.name,
+        {
+            type: 'string',
+            enum: type.getValues().map(value => value.name),
+        },
+    ])));
+}
 function resolveParameters(url, variables, opts) {
     if (!variables) {
         return [];
@@ -781,23 +792,23 @@ function resolveParamSchema(type, opts) {
     }
     const primitive = mapToPrimitive(type.name.value);
     return (primitive ||
-        opts.customScalars[type.name.value] || {
-        $ref: mapToRef(type.name.value),
-    });
+        opts.customScalars[type.name.value] ||
+        opts.enumTypes[type.name.value] ||
+        { $ref: mapToRef(type.name.value) });
 }
-function resolveResponse({ schema, operation, customScalars, }) {
+function resolveResponse({ schema, operation, opts, }) {
     const operationType = operation.operation;
     const rootField = operation.selectionSet.selections[0];
     if (rootField.kind === Kind.FIELD) {
         if (operationType === 'query') {
             const queryType = schema.getQueryType();
             const field = queryType.getFields()[rootField.name.value];
-            return resolveFieldType(field.type, { customScalars });
+            return resolveFieldType(field.type, opts);
         }
         if (operationType === 'mutation') {
             const mutationType = schema.getMutationType();
             const field = mutationType.getFields()[rootField.name.value];
-            return resolveFieldType(field.type, { customScalars });
+            return resolveFieldType(field.type, opts);
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sofa-api",
-  "version": "0.15.2",
+  "version": "0.15.3",
   "description": "Create REST APIs with GraphQL",
   "sideEffects": false,
   "peerDependencies": {