sofa-api 0.18.3 → 0.18.6

package/cjs/ast.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOperationInfo = void 0;
+exports.getOperationInfo = getOperationInfo;
 const graphql_1 = require("graphql");
 function getOperationInfo(doc) {
     const op = (0, graphql_1.getOperationAST)(doc, null);
@@ -13,4 +13,3 @@ function getOperationInfo(doc) {
         variables: op.variableDefinitions || [],
     };
 }
-exports.getOperationInfo = getOperationInfo;

package/cjs/common.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNil = exports.convertName = void 0;
+exports.convertName = convertName;
+exports.isNil = isNil;
 const param_case_1 = require("param-case");
 function convertName(name) {
     return (0, param_case_1.paramCase)(name);
 }
-exports.convertName = convertName;
 function isNil(val) {
     return val == null;
 }
-exports.isNil = isNil;

package/cjs/index.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useSofa = exports.OpenAPI = void 0;
-const router_1 = require("./router");
-const sofa_1 = require("./sofa");
+exports.OpenAPI = void 0;
+exports.useSofa = useSofa;
+const router_js_1 = require("./router.js");
+const sofa_js_1 = require("./sofa.js");
 var open_api_1 = require("./open-api");
 Object.defineProperty(exports, "OpenAPI", { enumerable: true, get: function () { return open_api_1.OpenAPI; } });
 function useSofa(config) {
-    return (0, router_1.createRouter)((0, sofa_1.createSofa)(config));
+    return (0, router_js_1.createRouter)((0, sofa_js_1.createSofa)(config));
 }
-exports.useSofa = useSofa;

package/cjs/open-api/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpenAPI = void 0;
+exports.OpenAPI = OpenAPI;
 const graphql_1 = require("graphql");
-const types_1 = require("./types");
-const operations_1 = require("./operations");
-const utils_1 = require("./utils");
+const types_js_1 = require("./types.js");
+const operations_js_1 = require("./operations.js");
+const utils_js_1 = require("./utils.js");
 function OpenAPI({ schema, info, servers, components, security, tags, customScalars = {}, }) {
     const types = schema.getTypeMap();
     const swagger = {
@@ -21,7 +21,7 @@ function OpenAPI({ schema, info, servers, components, security, tags, customScal
         const type = types[typeName];
         if (((0, graphql_1.isObjectType)(type) || (0, graphql_1.isInputObjectType)(type)) &&
             !(0, graphql_1.isIntrospectionType)(type)) {
-            swagger.components.schemas[typeName] = (0, types_1.buildSchemaObjectFromType)(type, {
+            swagger.components.schemas[typeName] = (0, types_js_1.buildSchemaObjectFromType)(type, {
                 customScalars,
             });
         }
@@ -39,12 +39,12 @@ function OpenAPI({ schema, info, servers, components, security, tags, customScal
         addRoute(info, config) {
             const basePath = config?.basePath || '';
             const path = basePath +
-                (0, utils_1.normalizePathParamForOpenAPI)(info.path);
+                (0, utils_js_1.normalizePathParamForOpenAPI)(info.path);
             if (!swagger.paths[path]) {
                 swagger.paths[path] = {};
             }
             const pathsObj = swagger.paths[path];
-            pathsObj[info.method.toLowerCase()] = (0, operations_1.buildPathFromOperation)({
+            pathsObj[info.method.toLowerCase()] = (0, operations_js_1.buildPathFromOperation)({
                 url: path,
                 operation: info.document,
                 schema,
@@ -59,4 +59,3 @@ function OpenAPI({ schema, info, servers, components, security, tags, customScal
         },
     };
 }
-exports.OpenAPI = OpenAPI;

package/cjs/open-api/operations.js

@@ -1,13 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveVariableDescription = exports.isInPath = exports.resolveResponse = exports.resolveParamSchema = exports.resolveRequestBody = exports.buildPathFromOperation = void 0;
+exports.buildPathFromOperation = buildPathFromOperation;
+exports.resolveRequestBody = resolveRequestBody;
+exports.resolveParamSchema = resolveParamSchema;
+exports.resolveResponse = resolveResponse;
+exports.isInPath = isInPath;
+exports.resolveVariableDescription = resolveVariableDescription;
 const graphql_1 = require("graphql");
-const ast_1 = require("../ast");
-const utils_1 = require("./utils");
-const types_1 = require("./types");
+const ast_js_1 = require("../ast.js");
+const utils_js_1 = require("./utils.js");
+const types_js_1 = require("./types.js");
 const title_case_1 = require("title-case");
 function buildPathFromOperation({ url, schema, operation, useRequestBody, tags, description, customScalars, }) {
-    const info = (0, ast_1.getOperationInfo)(operation);
+    const info = (0, ast_js_1.getOperationInfo)(operation);
     const enumTypes = resolveEnumTypes(schema);
     const summary = resolveDescription(schema, info.operation);
     const variables = info.operation.variableDefinitions;
@@ -48,7 +53,6 @@ function buildPathFromOperation({ url, schema, operation, useRequestBody, tags,
         },
     };
 }
-exports.buildPathFromOperation = buildPathFromOperation;
 function resolveEnumTypes(schema) {
     const enumTypes = Object.values(schema.getTypeMap())
         .filter(graphql_1.isEnumType);
@@ -95,7 +99,6 @@ function resolveRequestBody(variables, schema, operation, opts) {
         ...(required.length ? { required } : {}),
     };
 }
-exports.resolveRequestBody = resolveRequestBody;
 // array -> [type]
 // type -> $ref
 // scalar -> swagger primitive
@@ -109,12 +112,11 @@ function resolveParamSchema(type, opts) {
             items: resolveParamSchema(type.type, opts),
         };
     }
-    const primitive = (0, utils_1.mapToPrimitive)(type.name.value);
+    const primitive = (0, utils_js_1.mapToPrimitive)(type.name.value);
     return (primitive ||
         opts.customScalars[type.name.value] ||
-        opts.enumTypes[type.name.value] || { $ref: (0, utils_1.mapToRef)(type.name.value) });
+        opts.enumTypes[type.name.value] || { $ref: (0, utils_js_1.mapToRef)(type.name.value) });
 }
-exports.resolveParamSchema = resolveParamSchema;
 function resolveResponse({ schema, operation, opts, }) {
     const operationType = operation.operation;
     const rootField = operation.selectionSet.selections[0];
@@ -122,20 +124,18 @@ function resolveResponse({ schema, operation, opts, }) {
         if (operationType === 'query') {
             const queryType = schema.getQueryType();
             const field = queryType.getFields()[rootField.name.value];
-            return (0, types_1.resolveFieldType)(field.type, opts);
+            return (0, types_js_1.resolveFieldType)(field.type, opts);
         }
         if (operationType === 'mutation') {
             const mutationType = schema.getMutationType();
             const field = mutationType.getFields()[rootField.name.value];
-            return (0, types_1.resolveFieldType)(field.type, opts);
+            return (0, types_js_1.resolveFieldType)(field.type, opts);
         }
     }
 }
-exports.resolveResponse = resolveResponse;
 function isInPath(url, param) {
     return url.includes(`:${param}`) || url.includes(`{${param}}`);
 }
-exports.isInPath = isInPath;
 function getOperationFieldNode(schema, operation) {
     const selection = operation.selectionSet.selections[0];
     const fieldName = selection.name.value;
@@ -158,7 +158,6 @@ function resolveVariableDescription(schema, operation, variable) {
     const argument = fieldNode?.arguments?.find((arg) => arg.name.value === variable.variable.name.value);
     return argument?.description?.value;
 }
-exports.resolveVariableDescription = resolveVariableDescription;
 function isObjectTypeDefinitionNode(node) {
     return node.kind === graphql_1.Kind.OBJECT_TYPE_DEFINITION;
 }

package/cjs/open-api/types.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveFieldType = exports.buildSchemaObjectFromType = void 0;
+exports.buildSchemaObjectFromType = buildSchemaObjectFromType;
+exports.resolveFieldType = resolveFieldType;
 const graphql_1 = require("graphql");
-const utils_1 = require("./utils");
+const utils_js_1 = require("./utils.js");
 function buildSchemaObjectFromType(type, opts) {
     const required = [];
     const properties = {};
@@ -24,7 +25,6 @@ function buildSchemaObjectFromType(type, opts) {
         ...(type.description ? { description: type.description } : {}),
     };
 }
-exports.buildSchemaObjectFromType = buildSchemaObjectFromType;
 function resolveField(field, opts) {
     return resolveFieldType(field.type, opts);
 }
@@ -43,11 +43,11 @@ function resolveFieldType(type, opts) {
     }
     if ((0, graphql_1.isObjectType)(type)) {
         return {
-            $ref: (0, utils_1.mapToRef)(type.name),
+            $ref: (0, utils_js_1.mapToRef)(type.name),
         };
     }
     if ((0, graphql_1.isScalarType)(type)) {
-        const resolved = (0, utils_1.mapToPrimitive)(type.name) ||
+        const resolved = (0, utils_js_1.mapToPrimitive)(type.name) ||
             opts.customScalars[type.name] ||
             type.extensions?.jsonSchema || {
             type: 'object',
@@ -69,4 +69,3 @@ function resolveFieldType(type, opts) {
         type: 'object',
     };
 }
-exports.resolveFieldType = resolveFieldType;

package/cjs/open-api/utils.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizePathParamForOpenAPI = exports.mapToRef = exports.mapToPrimitive = void 0;
+exports.mapToPrimitive = mapToPrimitive;
+exports.mapToRef = mapToRef;
+exports.normalizePathParamForOpenAPI = normalizePathParamForOpenAPI;
 function mapToPrimitive(type) {
     const formatMap = {
         Int: {
@@ -25,11 +27,9 @@ function mapToPrimitive(type) {
         return formatMap[type];
     }
 }
-exports.mapToPrimitive = mapToPrimitive;
 function mapToRef(type) {
     return `#/components/schemas/${type}`;
 }
-exports.mapToRef = mapToRef;
 function normalizePathParamForOpenAPI(path) {
     const pathParts = path.split('/');
     const normalizedPathParts = pathParts.map((part) => {
@@ -40,4 +40,3 @@ function normalizePathParamForOpenAPI(path) {
     });
     return normalizedPathParts.join('/');
 }
-exports.normalizePathParamForOpenAPI = normalizePathParamForOpenAPI;

package/cjs/parse.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseVariable = void 0;
+exports.parseVariable = parseVariable;
 const graphql_1 = require("graphql");
 const common_js_1 = require("./common.js");
 function parseVariable({ value, variable, schema, }) {
@@ -13,7 +13,6 @@ function parseVariable({ value, variable, schema, }) {
         schema,
     });
 }
-exports.parseVariable = parseVariable;
 function resolveVariable({ value, type, schema, }) {
     if (type.kind === graphql_1.Kind.NAMED_TYPE) {
         const namedType = schema.getType(type.name.value);

package/cjs/router.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRouter = void 0;
+exports.createRouter = createRouter;
 const graphql_1 = require("graphql");
 const utils_1 = require("@graphql-tools/utils");
 const ast_js_1 = require("./ast.js");
-const common_1 = require("./common");
+const common_js_1 = require("./common.js");
 const parse_js_1 = require("./parse.js");
 const subscriptions_js_1 = require("./subscriptions.js");
 const logger_js_1 = require("./logger.js");
@@ -157,7 +157,6 @@ function createRouter(sofa) {
     });
     return router;
 }
-exports.createRouter = createRouter;
 function createQueryRoute({ sofa, router, fieldName, }) {
     logger_js_1.logger.debug(`[Router] Creating ${fieldName} query`);
     const queryType = sofa.schema.getQueryType();
@@ -211,10 +210,12 @@ function createQueryRoute({ sofa, router, fieldName, }) {
 }
 function getRouteSchemas({ method, path, info, sofa, responseStatus, }) {
     const params = {
+        type: 'object',
         properties: {},
         required: [],
     };
     const query = {
+        type: 'object',
         properties: {},
         required: [],
     };
@@ -386,7 +387,7 @@ function useHandler(config) {
     };
 }
 function getPath(fieldName, hasId = false) {
-    return `/${(0, common_1.convertName)(fieldName)}${hasId ? '/:id' : ''}`;
+    return `/${(0, common_js_1.convertName)(fieldName)}${hasId ? '/:id' : ''}`;
 }
 function pickParam({ name, url, params, body, }) {
     if (name in params) {

package/cjs/sofa.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isContextFn = exports.createSofa = void 0;
+exports.createSofa = createSofa;
+exports.isContextFn = isContextFn;
 const graphql_1 = require("graphql");
 const common_js_1 = require("./common.js");
 const logger_js_1 = require("./logger.js");
@@ -33,11 +34,9 @@ function createSofa(config) {
         ...config,
     };
 }
-exports.createSofa = createSofa;
 function isContextFn(context) {
     return typeof context === 'function';
 }
-exports.isContextFn = isContextFn;
 // Objects and Unions are the only things that are used to define return types
 // and both might contain an ID
 // We don't treat Unions as models because

package/esm/index.js

@@ -1,5 +1,5 @@
-import { createRouter } from './router';
-import { createSofa } from './sofa';
+import { createRouter } from './router.js';
+import { createSofa } from './sofa.js';
 export { OpenAPI } from './open-api';
 export function useSofa(config) {
     return createRouter(createSofa(config));

package/esm/open-api/index.js

@@ -1,7 +1,7 @@
 import { isObjectType, isInputObjectType, isIntrospectionType, } from 'graphql';
-import { buildSchemaObjectFromType } from './types';
-import { buildPathFromOperation } from './operations';
-import { normalizePathParamForOpenAPI } from './utils';
+import { buildSchemaObjectFromType } from './types.js';
+import { buildPathFromOperation } from './operations.js';
+import { normalizePathParamForOpenAPI } from './utils.js';
 export function OpenAPI({ schema, info, servers, components, security, tags, customScalars = {}, }) {
     const types = schema.getTypeMap();
     const swagger = {

package/esm/open-api/operations.js

@@ -1,7 +1,7 @@
 import { isEnumType, Kind, parse, printType, } from 'graphql';
-import { getOperationInfo } from '../ast';
-import { mapToPrimitive, mapToRef } from './utils';
-import { resolveFieldType } from './types';
+import { getOperationInfo } from '../ast.js';
+import { mapToPrimitive, mapToRef } from './utils.js';
+import { resolveFieldType } from './types.js';
 import { titleCase } from 'title-case';
 export function buildPathFromOperation({ url, schema, operation, useRequestBody, tags, description, customScalars, }) {
     const info = getOperationInfo(operation);

package/esm/open-api/types.js

@@ -1,5 +1,5 @@
 import { isNonNullType, isListType, isObjectType, isScalarType, isEnumType, isUnionType, } from 'graphql';
-import { mapToPrimitive, mapToRef } from './utils';
+import { mapToPrimitive, mapToRef } from './utils.js';
 export function buildSchemaObjectFromType(type, opts) {
     const required = [];
     const properties = {};

package/esm/router.js

@@ -1,7 +1,7 @@
 import { isObjectType, isNonNullType, Kind, isIntrospectionType, isInputObjectType, isEnumType, } from 'graphql';
 import { buildOperationNodeForField, createGraphQLError } from '@graphql-tools/utils';
 import { getOperationInfo } from './ast.js';
-import { convertName } from './common';
+import { convertName } from './common.js';
 import { parseVariable } from './parse.js';
 import { SubscriptionManager } from './subscriptions.js';
 import { logger } from './logger.js';
@@ -207,10 +207,12 @@ function createQueryRoute({ sofa, router, fieldName, }) {
 }
 function getRouteSchemas({ method, path, info, sofa, responseStatus, }) {
     const params = {
+        type: 'object',
         properties: {},
         required: [],
     };
     const query = {
+        type: 'object',
         properties: {},
         required: [],
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sofa-api",
-  "version": "0.18.3",
+  "version": "0.18.6",
   "description": "Create REST APIs with GraphQL",
   "sideEffects": false,
   "peerDependencies": {
@@ -9,7 +9,7 @@
   "dependencies": {
     "@graphql-tools/utils": "^10.0.0",
     "@whatwg-node/fetch": "^0.9.14",
-    "fets": "^0.7.0",
+    "fets": "^0.8.0",
     "ansi-colors": "^4.1.3",
     "openapi-types": "^12.1.0",
     "param-case": "^3.0.4",

package/typings/index.d.cts

@@ -1,4 +1,4 @@
-import type { SofaConfig } from './sofa';
+import type { SofaConfig } from './sofa.cjs';
 export { OpenAPI } from './open-api';
 export declare function useSofa(config: SofaConfig): import("fets").Router<any, {}, {
     [TKey: string]: never;

package/typings/index.d.ts

@@ -1,4 +1,4 @@
-import type { SofaConfig } from './sofa';
+import type { SofaConfig } from './sofa.js';
 export { OpenAPI } from './open-api';
 export declare function useSofa(config: SofaConfig): import("fets").Router<any, {}, {
     [TKey: string]: never;

package/typings/open-api/index.d.cts

@@ -1,5 +1,5 @@
 import { GraphQLSchema } from 'graphql';
-import { RouteInfo } from '../types';
+import { RouteInfo } from '../types.cjs';
 import { OpenAPIV3 } from 'openapi-types';
 export declare function OpenAPI({ schema, info, servers, components, security, tags, customScalars, }: {
     schema: GraphQLSchema;

package/typings/open-api/index.d.ts

@@ -1,5 +1,5 @@
 import { GraphQLSchema } from 'graphql';
-import { RouteInfo } from '../types';
+import { RouteInfo } from '../types.js';
 import { OpenAPIV3 } from 'openapi-types';
 export declare function OpenAPI({ schema, info, servers, components, security, tags, customScalars, }: {
     schema: GraphQLSchema;

package/typings/types.d.cts

@@ -13,3 +13,8 @@ export type ContextFn = (serverContext: DefaultSofaServerContext) => Promise<Con
 export type DefaultSofaServerContext = {
     request: Request;
 };
+export interface ObjectJSONSchema {
+    type: 'object';
+    properties: Record<string, any>;
+    required: string[];
+}

package/typings/types.d.ts

@@ -13,3 +13,8 @@ export type ContextFn = (serverContext: DefaultSofaServerContext) => Promise<Con
 export type DefaultSofaServerContext = {
     request: Request;
 };
+export interface ObjectJSONSchema {
+    type: 'object';
+    properties: Record<string, any>;
+    required: string[];
+}