sofa-api 0.11.1 → 0.11.2

package/index.js

@@ -11,7 +11,7 @@ const utils = require('@graphql-tools/utils');
 const paramCase = require('param-case');
 const uuid = require('uuid');
 const crossUndiciFetch = require('cross-undici-fetch');
-const colors = require('ansi-colors');
+const colors = _interopDefault(require('ansi-colors'));
 const jsYaml = require('js-yaml');
 const fs = require('fs');
 const titleCase = require('title-case');
@@ -566,24 +566,8 @@ function extractsModels(schema) {
 }
 // it's dumb but let's leave it for now
 function isArrayOf(type, expected) {
-    if (isOptionalList(type)) {
-        return true;
-    }
-    if (graphql.isNonNullType(type) && isOptionalList(type.ofType)) {
-        return true;
-    }
-    function isOptionalList(list) {
-        if (graphql.isListType(list)) {
-            if (list.ofType.name === expected.name) {
-                return true;
-            }
-            if (graphql.isNonNullType(list.ofType) &&
-                list.ofType.ofType.name === expected.name) {
-                return true;
-            }
-        }
-    }
-    return false;
+    const typeNameInSdl = type.toString();
+    return (typeNameInSdl.includes('[') && typeNameInSdl.includes(expected.toString()));
 }
 function hasID(type) {
     return graphql.isObjectType(type) && !!type.getFields().id;

package/index.mjs

@@ -5,7 +5,7 @@ import { buildOperationNodeForField } from '@graphql-tools/utils';
 import { paramCase } from 'param-case';
 import { v4 } from 'uuid';
 import { fetch } from 'cross-undici-fetch';
-import { red, yellow, green, blue } from 'ansi-colors';
+import colors from 'ansi-colors';
 import { dump } from 'js-yaml';
 import { writeFileSync } from 'fs';
 import { titleCase } from 'title-case';
@@ -84,16 +84,16 @@ const log = (level, color, args) => {
 };
 const logger = {
     error: (...args) => {
-        log('error', red, args);
+        log('error', colors.red, args);
     },
     warn: (...args) => {
-        log('warn', yellow, args);
+        log('warn', colors.yellow, args);
     },
     info: (...args) => {
-        log('info', green, args);
+        log('info', colors.green, args);
     },
     debug: (...args) => {
-        log('debug', blue, args);
+        log('debug', colors.blue, args);
     },
 };
 
@@ -560,24 +560,8 @@ function extractsModels(schema) {
 }
 // it's dumb but let's leave it for now
 function isArrayOf(type, expected) {
-    if (isOptionalList(type)) {
-        return true;
-    }
-    if (isNonNullType(type) && isOptionalList(type.ofType)) {
-        return true;
-    }
-    function isOptionalList(list) {
-        if (isListType(list)) {
-            if (list.ofType.name === expected.name) {
-                return true;
-            }
-            if (isNonNullType(list.ofType) &&
-                list.ofType.ofType.name === expected.name) {
-                return true;
-            }
-        }
-    }
-    return false;
+    const typeNameInSdl = type.toString();
+    return (typeNameInSdl.includes('[') && typeNameInSdl.includes(expected.toString()));
 }
 function hasID(type) {
     return isObjectType(type) && !!type.getFields().id;

package/open-api/types.d.ts

@@ -1,3 +1,3 @@
-import { GraphQLObjectType, GraphQLInputObjectType, GraphQLOutputType, GraphQLNamedType } from 'graphql';
+import { GraphQLObjectType, GraphQLInputObjectType, GraphQLType } from 'graphql';
 export declare function buildSchemaObjectFromType(type: GraphQLObjectType | GraphQLInputObjectType): any;
-export declare function resolveFieldType(type: GraphQLOutputType | GraphQLNamedType): any;
+export declare function resolveFieldType(type: GraphQLType): any;

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "sofa-api",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "Create REST APIs with GraphQL",
   "sideEffects": false,
   "peerDependencies": {
-    "graphql": "^0.13.2 || ^14.0.0 || ^15.0.0"
+    "graphql": "^0.13.2 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "@graphql-tools/utils": "8.1.1",
-    "@types/js-yaml": "4.0.2",
+    "@graphql-tools/utils": "8.6.5",
+    "@types/js-yaml": "4.0.5",
     "ansi-colors": "4.1.1",
     "cross-undici-fetch": "0.1.28",
     "js-yaml": "4.1.0",
@@ -48,6 +48,7 @@
     "./*": {
       "require": "./*.js",
       "import": "./*.mjs"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }

package/subscriptions.d.ts

@@ -20,19 +20,11 @@ export declare class SubscriptionManager {
     private operations;
     private clients;
     constructor(sofa: Sofa);
-    start(event: StartSubscriptionEvent, contextValue: ContextValue): Promise<ExecutionResult<{
-        [key: string]: any;
-    }, {
-        [key: string]: any;
-    }> | {
+    start(event: StartSubscriptionEvent, contextValue: ContextValue): Promise<ExecutionResult<import("graphql/jsutils/ObjMap").ObjMap<unknown>, import("graphql/jsutils/ObjMap").ObjMap<unknown>> | {
         id: string;
     }>;
     stop(id: ID): Promise<StopSubscriptionResponse>;
-    update(event: UpdateSubscriptionEvent, contextValue: ContextValue): Promise<ExecutionResult<{
-        [key: string]: any;
-    }, {
-        [key: string]: any;
-    }> | {
+    update(event: UpdateSubscriptionEvent, contextValue: ContextValue): Promise<ExecutionResult<import("graphql/jsutils/ObjMap").ObjMap<unknown>, import("graphql/jsutils/ObjMap").ObjMap<unknown>> | {
         id: string;
     }>;
     private execute;