sofa-api 0.15.3 → 0.15.5

package/index.js

@@ -12,7 +12,6 @@ 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);
@@ -580,6 +579,7 @@ function isContextFn(context) {
 // they might represent an Object that is not a model
 // We check it later, when an operation is being built
 function extractsModels(schema) {
+    var _a, _b;
     const modelMap = {};
     const query = schema.getQueryType();
     const fields = query.getFields();
@@ -599,7 +599,7 @@ function extractsModels(schema) {
                 // add to registry with `list: true`
                 const sameName = isNameEqual(field.name, namedType.name + 's');
                 const allOptionalArguments = !field.args.some((arg) => graphql.isNonNullType(arg.type));
-                modelMap[namedType.name].list = sameName && allOptionalArguments;
+                (_a = modelMap[namedType.name]).list || (_a.list = sameName && allOptionalArguments);
             }
             else if (graphql.isObjectType(field.type) ||
                 (graphql.isNonNullType(field.type) && graphql.isObjectType(field.type.ofType))) {
@@ -609,7 +609,7 @@ function extractsModels(schema) {
                 // add to registry with `single: true`
                 const sameName = isNameEqual(field.name, namedType.name);
                 const hasIdArgument = field.args.length === 1 && field.args[0].name === 'id';
-                modelMap[namedType.name].single = sameName && hasIdArgument;
+                (_b = modelMap[namedType.name]).single || (_b.single = sameName && hasIdArgument);
             }
         }
     }
@@ -715,23 +715,25 @@ 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);
+    const summary = resolveDescription(schema, info.operation);
+    const variables = info.operation.variableDefinitions;
+    const pathParams = variables === null || variables === void 0 ? void 0 : variables.filter((variable) => isInPath(url, variable.variable.name.value));
+    const bodyParams = variables === null || variables === void 0 ? void 0 : variables.filter((variable) => !isInPath(url, variable.variable.name.value));
     return Object.assign(Object.assign({ tags,
         description,
         summary, operationId: info.name }, (useRequestBody
         ? {
+            parameters: resolveParameters(url, pathParams, schema, info.operation, { customScalars, enumTypes }),
             requestBody: {
                 content: {
                     'application/json': {
-                        schema: resolveRequestBody(info.operation.variableDefinitions, {
-                            customScalars, enumTypes
-                        }),
+                        schema: resolveRequestBody(bodyParams, schema, info.operation, { customScalars, enumTypes }),
                     },
                 },
             },
         }
         : {
-            parameters: resolveParameters(url, info.operation.variableDefinitions, { customScalars, enumTypes }),
+            parameters: resolveParameters(url, variables, schema, info.operation, { customScalars, enumTypes }),
         })), { responses: {
             200: {
                 description: summary,
@@ -748,15 +750,17 @@ function buildPathFromOperation({ url, schema, operation, useRequestBody, tags,
         } });
 }
 function resolveEnumTypes(schema) {
-    const enumTypes = Object.values(schema.getTypeMap()).filter(graphql.isEnumType).map(definition.assertEnumType);
-    return Object.fromEntries(enumTypes.map(type => ([type.name,
+    const enumTypes = Object.values(schema.getTypeMap())
+        .filter(graphql.isEnumType);
+    return Object.fromEntries(enumTypes.map((type) => [
+        type.name,
         {
             type: 'string',
-            enum: type.getValues().map(value => value.name),
+            enum: type.getValues().map((value) => value.name),
         },
-    ])));
+    ]));
 }
-function resolveParameters(url, variables, opts) {
+function resolveParameters(url, variables, schema, operation, opts) {
     if (!variables) {
         return [];
     }
@@ -766,10 +770,11 @@ function resolveParameters(url, variables, opts) {
             name: variable.variable.name.value,
             required: variable.type.kind === graphql.Kind.NON_NULL_TYPE,
             schema: resolveParamSchema(variable.type, opts),
+            description: resolveVariableDescription(schema, operation, variable),
         };
     });
 }
-function resolveRequestBody(variables, opts) {
+function resolveRequestBody(variables, schema, operation, opts) {
     if (!variables) {
         return {};
     }
@@ -779,7 +784,7 @@ function resolveRequestBody(variables, opts) {
         if (variable.type.kind === graphql.Kind.NON_NULL_TYPE) {
             required.push(variable.variable.name.value);
         }
-        properties[variable.variable.name.value] = resolveParamSchema(variable.type, opts);
+        properties[variable.variable.name.value] = Object.assign(Object.assign({}, resolveParamSchema(variable.type, opts)), { description: resolveVariableDescription(schema, operation, variable) });
     });
     return Object.assign({ type: 'object', properties }, (required.length ? { required } : {}));
 }
@@ -799,8 +804,7 @@ function resolveParamSchema(type, opts) {
     const primitive = mapToPrimitive(type.name.value);
     return (primitive ||
         opts.customScalars[type.name.value] ||
-        opts.enumTypes[type.name.value] ||
-        { $ref: mapToRef(type.name.value) });
+        opts.enumTypes[type.name.value] || { $ref: mapToRef(type.name.value) });
 }
 function resolveResponse({ schema, operation, opts, }) {
     const operationType = operation.operation;
@@ -821,22 +825,29 @@ function resolveResponse({ schema, operation, opts, }) {
 function isInPath(url, param) {
     return url.indexOf(`{${param}}`) !== -1;
 }
-function resolveSummary(schema, operation) {
+function getOperationFieldNode(schema, operation) {
     const selection = operation.selectionSet.selections[0];
     const fieldName = selection.name.value;
     const typeDefinition = schema.getType(titleCase.titleCase(operation.operation));
     if (!typeDefinition) {
-        return '';
+        return undefined;
     }
     const definitionNode = typeDefinition.astNode || graphql.parse(graphql.printType(typeDefinition)).definitions[0];
     if (!isObjectTypeDefinitionNode(definitionNode)) {
-        return '';
+        return undefined;
     }
-    const fieldNode = definitionNode.fields.find((field) => field.name.value === fieldName);
-    const descriptionDefinition = fieldNode && fieldNode.description;
-    return descriptionDefinition && descriptionDefinition.value
-        ? descriptionDefinition.value
-        : '';
+    return definitionNode.fields.find((field) => field.name.value === fieldName);
+}
+function resolveDescription(schema, operation) {
+    var _a;
+    const fieldNode = getOperationFieldNode(schema, operation);
+    return ((_a = fieldNode === null || fieldNode === void 0 ? void 0 : fieldNode.description) === null || _a === void 0 ? void 0 : _a.value) || '';
+}
+function resolveVariableDescription(schema, operation, variable) {
+    var _a, _b;
+    const fieldNode = getOperationFieldNode(schema, operation);
+    const argument = (_a = fieldNode === null || fieldNode === void 0 ? void 0 : fieldNode.arguments) === null || _a === void 0 ? void 0 : _a.find((arg) => arg.name.value === variable.variable.name.value);
+    return (_b = argument === null || argument === void 0 ? void 0 : argument.description) === null || _b === void 0 ? void 0 : _b.value;
 }
 function isObjectTypeDefinitionNode(node) {
     return node.kind === graphql.Kind.OBJECT_TYPE_DEFINITION;

package/index.mjs

@@ -6,7 +6,6 @@ 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);
@@ -574,6 +573,7 @@ function isContextFn(context) {
 // they might represent an Object that is not a model
 // We check it later, when an operation is being built
 function extractsModels(schema) {
+    var _a, _b;
     const modelMap = {};
     const query = schema.getQueryType();
     const fields = query.getFields();
@@ -593,7 +593,7 @@ function extractsModels(schema) {
                 // add to registry with `list: true`
                 const sameName = isNameEqual(field.name, namedType.name + 's');
                 const allOptionalArguments = !field.args.some((arg) => isNonNullType(arg.type));
-                modelMap[namedType.name].list = sameName && allOptionalArguments;
+                (_a = modelMap[namedType.name]).list || (_a.list = sameName && allOptionalArguments);
             }
             else if (isObjectType(field.type) ||
                 (isNonNullType(field.type) && isObjectType(field.type.ofType))) {
@@ -603,7 +603,7 @@ function extractsModels(schema) {
                 // add to registry with `single: true`
                 const sameName = isNameEqual(field.name, namedType.name);
                 const hasIdArgument = field.args.length === 1 && field.args[0].name === 'id';
-                modelMap[namedType.name].single = sameName && hasIdArgument;
+                (_b = modelMap[namedType.name]).single || (_b.single = sameName && hasIdArgument);
             }
         }
     }
@@ -709,23 +709,25 @@ 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);
+    const summary = resolveDescription(schema, info.operation);
+    const variables = info.operation.variableDefinitions;
+    const pathParams = variables === null || variables === void 0 ? void 0 : variables.filter((variable) => isInPath(url, variable.variable.name.value));
+    const bodyParams = variables === null || variables === void 0 ? void 0 : variables.filter((variable) => !isInPath(url, variable.variable.name.value));
     return Object.assign(Object.assign({ tags,
         description,
         summary, operationId: info.name }, (useRequestBody
         ? {
+            parameters: resolveParameters(url, pathParams, schema, info.operation, { customScalars, enumTypes }),
             requestBody: {
                 content: {
                     'application/json': {
-                        schema: resolveRequestBody(info.operation.variableDefinitions, {
-                            customScalars, enumTypes
-                        }),
+                        schema: resolveRequestBody(bodyParams, schema, info.operation, { customScalars, enumTypes }),
                     },
                 },
             },
         }
         : {
-            parameters: resolveParameters(url, info.operation.variableDefinitions, { customScalars, enumTypes }),
+            parameters: resolveParameters(url, variables, schema, info.operation, { customScalars, enumTypes }),
         })), { responses: {
             200: {
                 description: summary,
@@ -742,15 +744,17 @@ function buildPathFromOperation({ url, schema, operation, useRequestBody, tags,
         } });
 }
 function resolveEnumTypes(schema) {
-    const enumTypes = Object.values(schema.getTypeMap()).filter(isEnumType).map(assertEnumType);
-    return Object.fromEntries(enumTypes.map(type => ([type.name,
+    const enumTypes = Object.values(schema.getTypeMap())
+        .filter(isEnumType);
+    return Object.fromEntries(enumTypes.map((type) => [
+        type.name,
         {
             type: 'string',
-            enum: type.getValues().map(value => value.name),
+            enum: type.getValues().map((value) => value.name),
         },
-    ])));
+    ]));
 }
-function resolveParameters(url, variables, opts) {
+function resolveParameters(url, variables, schema, operation, opts) {
     if (!variables) {
         return [];
     }
@@ -760,10 +764,11 @@ function resolveParameters(url, variables, opts) {
             name: variable.variable.name.value,
             required: variable.type.kind === Kind.NON_NULL_TYPE,
             schema: resolveParamSchema(variable.type, opts),
+            description: resolveVariableDescription(schema, operation, variable),
         };
     });
 }
-function resolveRequestBody(variables, opts) {
+function resolveRequestBody(variables, schema, operation, opts) {
     if (!variables) {
         return {};
     }
@@ -773,7 +778,7 @@ function resolveRequestBody(variables, opts) {
         if (variable.type.kind === Kind.NON_NULL_TYPE) {
             required.push(variable.variable.name.value);
         }
-        properties[variable.variable.name.value] = resolveParamSchema(variable.type, opts);
+        properties[variable.variable.name.value] = Object.assign(Object.assign({}, resolveParamSchema(variable.type, opts)), { description: resolveVariableDescription(schema, operation, variable) });
     });
     return Object.assign({ type: 'object', properties }, (required.length ? { required } : {}));
 }
@@ -793,8 +798,7 @@ function resolveParamSchema(type, opts) {
     const primitive = mapToPrimitive(type.name.value);
     return (primitive ||
         opts.customScalars[type.name.value] ||
-        opts.enumTypes[type.name.value] ||
-        { $ref: mapToRef(type.name.value) });
+        opts.enumTypes[type.name.value] || { $ref: mapToRef(type.name.value) });
 }
 function resolveResponse({ schema, operation, opts, }) {
     const operationType = operation.operation;
@@ -815,22 +819,29 @@ function resolveResponse({ schema, operation, opts, }) {
 function isInPath(url, param) {
     return url.indexOf(`{${param}}`) !== -1;
 }
-function resolveSummary(schema, operation) {
+function getOperationFieldNode(schema, operation) {
     const selection = operation.selectionSet.selections[0];
     const fieldName = selection.name.value;
     const typeDefinition = schema.getType(titleCase(operation.operation));
     if (!typeDefinition) {
-        return '';
+        return undefined;
     }
     const definitionNode = typeDefinition.astNode || parse(printType(typeDefinition)).definitions[0];
     if (!isObjectTypeDefinitionNode(definitionNode)) {
-        return '';
+        return undefined;
     }
-    const fieldNode = definitionNode.fields.find((field) => field.name.value === fieldName);
-    const descriptionDefinition = fieldNode && fieldNode.description;
-    return descriptionDefinition && descriptionDefinition.value
-        ? descriptionDefinition.value
-        : '';
+    return definitionNode.fields.find((field) => field.name.value === fieldName);
+}
+function resolveDescription(schema, operation) {
+    var _a;
+    const fieldNode = getOperationFieldNode(schema, operation);
+    return ((_a = fieldNode === null || fieldNode === void 0 ? void 0 : fieldNode.description) === null || _a === void 0 ? void 0 : _a.value) || '';
+}
+function resolveVariableDescription(schema, operation, variable) {
+    var _a, _b;
+    const fieldNode = getOperationFieldNode(schema, operation);
+    const argument = (_a = fieldNode === null || fieldNode === void 0 ? void 0 : fieldNode.arguments) === null || _a === void 0 ? void 0 : _a.find((arg) => arg.name.value === variable.variable.name.value);
+    return (_b = argument === null || argument === void 0 ? void 0 : argument.description) === null || _b === void 0 ? void 0 : _b.value;
 }
 function isObjectTypeDefinitionNode(node) {
     return node.kind === Kind.OBJECT_TYPE_DEFINITION;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "sofa-api",
-  "version": "0.15.3",
+  "version": "0.15.5",
   "description": "Create REST APIs with GraphQL",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^0.13.2 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "@graphql-tools/utils": "9.1.3",
+    "@graphql-tools/utils": "9.1.4",
     "@whatwg-node/fetch": "^0.6.0",
     "@whatwg-node/router": "^0.1.2",
     "ansi-colors": "4.1.3",