@omnigraph/json-schema 1.0.0-alpha-20230424111644-b7c761da0 → 1.0.0-alpha-20230522105300-fe9c79867

package/cjs/addRootFieldResolver.js

@@ -58,7 +58,7 @@ function addHTTPRootFieldResolver(schema, field, logger, globalFetch, { path, op
             headers,
         };
         if (timeout) {
-            requestInit.signal = fetch_1.AbortSignal.timeout(timeout);
+            requestInit.signal = AbortSignal.timeout(timeout);
         }
         // Handle binary data
         if (isBinary) {

package/cjs/directives.js

@@ -64,8 +64,11 @@ exports.ResolveRootDirective = new graphql_1.GraphQLDirective({
     name: 'resolveRoot',
     locations: [graphql_1.DirectiveLocation.FIELD_DEFINITION],
 });
+function rootResolver(root) {
+    return root;
+}
 function processResolveRootAnnotations(field) {
-    field.resolve = root => root;
+    field.resolve = rootResolver;
 }
 exports.processResolveRootAnnotations = processResolveRootAnnotations;
 exports.ResolveRootFieldDirective = new graphql_1.GraphQLDirective({
@@ -560,7 +563,11 @@ exports.EnumDirective = new graphql_1.GraphQLDirective({
 });
 exports.OneOfDirective = new graphql_1.GraphQLDirective({
     name: 'oneOf',
-    locations: [graphql_1.DirectiveLocation.OBJECT, graphql_1.DirectiveLocation.INTERFACE],
+    locations: [
+        graphql_1.DirectiveLocation.OBJECT,
+        graphql_1.DirectiveLocation.INTERFACE,
+        graphql_1.DirectiveLocation.INPUT_OBJECT,
+    ],
 });
 exports.ExampleDirective = new graphql_1.GraphQLDirective({
     name: 'example',

package/cjs/getComposerFromJSONSchema.js

@@ -605,15 +605,23 @@ function getComposerFromJSONSchema(schema, logger) {
                                 ...subSchema,
                             };
                         case 'Query':
-                            return {
-                                output: schemaComposer.Query,
-                                ...subSchema,
-                            };
+                            if (path === '/properties/query') {
+                                return {
+                                    output: schemaComposer.Query,
+                                    ...subSchema,
+                                };
+                            }
+                            subSchema.title += '_';
+                            break;
                         case 'Mutation':
-                            return {
-                                output: schemaComposer.Mutation,
-                                ...subSchema,
-                            };
+                            if (path === '/properties/mutation') {
+                                return {
+                                    output: schemaComposer.Mutation,
+                                    ...subSchema,
+                                };
+                            }
+                            subSchema.title += '_';
+                            break;
                         case 'Subscription':
                             if (path === '/properties/subscription') {
                                 return {
@@ -621,7 +629,7 @@ function getComposerFromJSONSchema(schema, logger) {
                                     ...subSchema,
                                 };
                             }
-                            subSchema.title = 'Subscription_';
+                            subSchema.title += '_';
                             break;
                     }
                 }

package/cjs/getTypeResolverFromOutputTCs.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTypeResolverFromOutputTCs = void 0;
 const utils_1 = require("@graphql-tools/utils");
 function getTypeResolverFromOutputTCs({ possibleTypes, discriminatorField, discriminatorMapping, statusCodeTypeNameMap, }) {
-    return function resolveType(data) {
+    return function resolveType(data, _ctx, info) {
         if (data.__typename) {
             return data.__typename;
         }
@@ -17,8 +17,29 @@ function getTypeResolverFromOutputTCs({ possibleTypes, discriminatorField, discr
                 return typeName;
             }
         }
+        const dataTypeOf = typeof data;
+        if (dataTypeOf !== 'object') {
+            for (const possibleType of possibleTypes) {
+                const fieldMap = possibleType.getFields();
+                const fields = Object.values(fieldMap);
+                if (fields.length === 1) {
+                    const field = fields[0];
+                    const directiveObjs = (0, utils_1.getDirective)(info.schema, field, 'resolveRoot');
+                    if (directiveObjs === null || directiveObjs === void 0 ? void 0 : directiveObjs.length) {
+                        const fieldType = field.type;
+                        if ('parseValue' in fieldType) {
+                            try {
+                                fieldType.parseValue(data);
+                                return possibleType.name;
+                            }
+                            catch (e) { }
+                        }
+                    }
+                }
+            }
+        }
         // const validationErrors: Record<string, ErrorObject[]> = {};
-        const dataKeys = typeof data === 'object'
+        const dataKeys = dataTypeOf
             ? Object.keys(data)
                 // Remove metadata fields used to pass data
                 .filter(property => !property.toString().startsWith('$'))

package/cjs/getUnionTypeComposers.js

@@ -5,10 +5,15 @@ const graphql_compose_1 = require("graphql-compose");
 const directives_js_1 = require("./directives.js");
 function getContainerTC(schemaComposer, output) {
     const containerTypeName = `${output.getTypeName()}_container`;
+    schemaComposer.addDirective(directives_js_1.ResolveRootDirective);
     return schemaComposer.getOrCreateOTC(containerTypeName, otc => otc.addFields({
         [output.getTypeName()]: {
             type: output,
-            resolve: root => root,
+            directives: [
+                {
+                    name: 'resolveRoot',
+                },
+            ],
         },
     }));
 }

package/esm/addRootFieldResolver.js

@@ -6,7 +6,7 @@ import { process } from '@graphql-mesh/cross-helpers';
 import { stringInterpolator } from '@graphql-mesh/string-interpolation';
 import { getHeadersObj } from '@graphql-mesh/utils';
 import { createGraphQLError, memoize1 } from '@graphql-tools/utils';
-import { AbortSignal, Blob, File, FormData } from '@whatwg-node/fetch';
+import { Blob, File, FormData } from '@whatwg-node/fetch';
 import { resolveDataByUnionInputType } from './resolveDataByUnionInputType.js';
 import { isFileUpload } from './utils.js';
 const isListTypeOrNonNullListType = memoize1(function isListTypeOrNonNullListType(type) {

package/esm/directives.js

@@ -59,8 +59,11 @@ export const ResolveRootDirective = new GraphQLDirective({
     name: 'resolveRoot',
     locations: [DirectiveLocation.FIELD_DEFINITION],
 });
+function rootResolver(root) {
+    return root;
+}
 export function processResolveRootAnnotations(field) {
-    field.resolve = root => root;
+    field.resolve = rootResolver;
 }
 export const ResolveRootFieldDirective = new GraphQLDirective({
     name: 'resolveRootField',
@@ -545,7 +548,11 @@ export const EnumDirective = new GraphQLDirective({
 });
 export const OneOfDirective = new GraphQLDirective({
     name: 'oneOf',
-    locations: [DirectiveLocation.OBJECT, DirectiveLocation.INTERFACE],
+    locations: [
+        DirectiveLocation.OBJECT,
+        DirectiveLocation.INTERFACE,
+        DirectiveLocation.INPUT_OBJECT,
+    ],
 });
 export const ExampleDirective = new GraphQLDirective({
     name: 'example',

package/esm/getComposerFromJSONSchema.js

@@ -602,15 +602,23 @@ export function getComposerFromJSONSchema(schema, logger) {
                                 ...subSchema,
                             };
                         case 'Query':
-                            return {
-                                output: schemaComposer.Query,
-                                ...subSchema,
-                            };
+                            if (path === '/properties/query') {
+                                return {
+                                    output: schemaComposer.Query,
+                                    ...subSchema,
+                                };
+                            }
+                            subSchema.title += '_';
+                            break;
                         case 'Mutation':
-                            return {
-                                output: schemaComposer.Mutation,
-                                ...subSchema,
-                            };
+                            if (path === '/properties/mutation') {
+                                return {
+                                    output: schemaComposer.Mutation,
+                                    ...subSchema,
+                                };
+                            }
+                            subSchema.title += '_';
+                            break;
                         case 'Subscription':
                             if (path === '/properties/subscription') {
                                 return {
@@ -618,7 +626,7 @@ export function getComposerFromJSONSchema(schema, logger) {
                                     ...subSchema,
                                 };
                             }
-                            subSchema.title = 'Subscription_';
+                            subSchema.title += '_';
                             break;
                     }
                 }

package/esm/getTypeResolverFromOutputTCs.js

@@ -1,6 +1,6 @@
-import { createGraphQLError } from '@graphql-tools/utils';
+import { createGraphQLError, getDirective } from '@graphql-tools/utils';
 export function getTypeResolverFromOutputTCs({ possibleTypes, discriminatorField, discriminatorMapping, statusCodeTypeNameMap, }) {
-    return function resolveType(data) {
+    return function resolveType(data, _ctx, info) {
         if (data.__typename) {
             return data.__typename;
         }
@@ -14,8 +14,29 @@ export function getTypeResolverFromOutputTCs({ possibleTypes, discriminatorField
                 return typeName;
             }
         }
+        const dataTypeOf = typeof data;
+        if (dataTypeOf !== 'object') {
+            for (const possibleType of possibleTypes) {
+                const fieldMap = possibleType.getFields();
+                const fields = Object.values(fieldMap);
+                if (fields.length === 1) {
+                    const field = fields[0];
+                    const directiveObjs = getDirective(info.schema, field, 'resolveRoot');
+                    if (directiveObjs === null || directiveObjs === void 0 ? void 0 : directiveObjs.length) {
+                        const fieldType = field.type;
+                        if ('parseValue' in fieldType) {
+                            try {
+                                fieldType.parseValue(data);
+                                return possibleType.name;
+                            }
+                            catch (e) { }
+                        }
+                    }
+                }
+            }
+        }
         // const validationErrors: Record<string, ErrorObject[]> = {};
-        const dataKeys = typeof data === 'object'
+        const dataKeys = dataTypeOf
             ? Object.keys(data)
                 // Remove metadata fields used to pass data
                 .filter(property => !property.toString().startsWith('$'))

package/esm/getUnionTypeComposers.js

@@ -1,11 +1,16 @@
 import { isSomeInputTypeComposer, } from 'graphql-compose';
-import { StatusCodeTypeNameDirective } from './directives.js';
+import { ResolveRootDirective, StatusCodeTypeNameDirective } from './directives.js';
 export function getContainerTC(schemaComposer, output) {
     const containerTypeName = `${output.getTypeName()}_container`;
+    schemaComposer.addDirective(ResolveRootDirective);
     return schemaComposer.getOrCreateOTC(containerTypeName, otc => otc.addFields({
         [output.getTypeName()]: {
             type: output,
-            resolve: root => root,
+            directives: [
+                {
+                    name: 'resolveRoot',
+                },
+            ],
         },
     }));
 }

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@omnigraph/json-schema",
-  "version": "1.0.0-alpha-20230424111644-b7c761da0",
+  "version": "1.0.0-alpha-20230522105300-fe9c79867",
   "sideEffects": false,
   "peerDependencies": {
-    "@graphql-mesh/cross-helpers": "^0.3.4",
-    "@graphql-mesh/types": "1.0.0-alpha-20230424111644-b7c761da0",
-    "@graphql-mesh/utils": "1.0.0-alpha-20230424111644-b7c761da0",
+    "@graphql-mesh/cross-helpers": "0.4.0-alpha-20230522105300-fe9c79867",
+    "@graphql-mesh/types": "1.0.0-alpha-20230522105300-fe9c79867",
+    "@graphql-mesh/utils": "1.0.0-alpha-20230522105300-fe9c79867",
     "@graphql-tools/utils": "^9.2.1",
     "graphql": "*",
     "tslib": "^2.4.0"
   },
   "dependencies": {
-    "@graphql-mesh/string-interpolation": "0.4.4",
+    "@graphql-mesh/string-interpolation": "0.5.0-alpha-20230522105300-fe9c79867",
     "@json-schema-tools/meta-schema": "1.7.0",
     "@whatwg-node/fetch": "^0.8.3",
     "ajv": "8.12.0",
@@ -19,9 +19,9 @@
     "dset": "3.1.2",
     "graphql-compose": "9.0.10",
     "graphql-scalars": "^1.20.4",
-    "json-machete": "1.0.0-alpha-20230424111644-b7c761da0",
+    "json-machete": "1.0.0-alpha-20230522105300-fe9c79867",
     "pascal-case": "3.1.2",
-    "qs": "6.11.1",
+    "qs": "6.11.2",
     "to-json-schema": "0.2.5",
     "url-join": "4.0.1"
   },