@fluojs/graphql 1.0.3 → 1.1.0

package/dist/schema/schema.js

@@ -1,6 +1,7 @@
 import { DtoValidationError } from '@fluojs/validation';
 import { createGraphqlInput, resolveArgType, resolveOutputType } from '../pipeline/input-pipeline.js';
 import { GRAPHQL_OPERATION_CONTAINER, isGraphqlListTypeRef } from '../types.js';
+import { ObjectFieldResolverRegistry } from './object-field-resolvers.js';
 function isAsyncIterable(value) {
   return typeof value === 'object' && value !== null && Symbol.asyncIterator in value;
 }
@@ -14,7 +15,6 @@ function scalarByName(deps, scalar) {
       return deps.GraphQLBoolean;
     case 'id':
       return deps.GraphQLID;
-    case 'string':
     default:
       return deps.GraphQLString;
   }
@@ -35,43 +35,60 @@ function builtinScalarByGraphqlName(deps, scalarName) {
       return undefined;
   }
 }
-function normalizeFieldOutputType(deps, type) {
+function normalizeFieldOutputType(deps, outputTypeCache, type, transformObjectFields) {
+  if (isListOutputType(type)) {
+    return new deps.GraphQLList(normalizeFieldOutputType(deps, outputTypeCache, type.ofType, transformObjectFields));
+  }
+  if (isNonNullOutputType(type)) {
+    return new deps.GraphQLNonNull(normalizeFieldOutputType(deps, outputTypeCache, type.ofType, transformObjectFields));
+  }
   const maybeScalarName = type.name;
   if (typeof maybeScalarName === 'string') {
-    return builtinScalarByGraphqlName(deps, maybeScalarName) ?? type;
+    const builtinScalar = builtinScalarByGraphqlName(deps, maybeScalarName);
+    if (builtinScalar) {
+      return builtinScalar;
+    }
+  }
+  if (isUnionOutputType(type)) {
+    return normalizeUnionOutputType(deps, outputTypeCache, type, transformObjectFields);
+  }
+  if (isObjectOutputType(type)) {
+    return normalizeObjectOutputType(deps, outputTypeCache, type, transformObjectFields);
   }
   return type;
 }
-function normalizeObjectOutputType(deps, outputTypeCache, outputType) {
+function normalizeObjectOutputType(deps, outputTypeCache, outputType, transformObjectFields) {
   const outputTypeName = outputType.name;
   const cached = outputTypeCache.get(outputTypeName);
   if (cached) {
     return cached;
   }
   const config = outputType.toConfig();
-  const clonedFields = Object.fromEntries(Object.entries(config.fields).map(([fieldName, fieldConfig]) => {
-    const field = fieldConfig;
-    return [fieldName, {
-      ...field,
-      type: normalizeFieldOutputType(deps, field.type)
-    }];
-  }));
   const normalized = new deps.GraphQLObjectType({
     ...config,
-    fields: clonedFields
+    fields: () => {
+      const clonedFields = Object.fromEntries(Object.entries(config.fields).map(([fieldName, fieldConfig]) => {
+        const field = fieldConfig;
+        return [fieldName, {
+          ...field,
+          type: normalizeFieldOutputType(deps, outputTypeCache, field.type, transformObjectFields)
+        }];
+      }));
+      return transformObjectFields(outputTypeName, clonedFields);
+    }
   });
   outputTypeCache.set(outputTypeName, normalized);
+  normalized.getFields();
   return normalized;
 }
-function normalizeUnionOutputType(deps, outputTypeCache, outputType) {
+function normalizeUnionOutputType(deps, outputTypeCache, outputType, transformObjectFields) {
   const outputTypeName = outputType.name;
   const cached = outputTypeCache.get(outputTypeName);
   if (cached) {
     return cached;
   }
   const config = outputType.toConfig();
-  const normalizedTypes = config.types.map(itemType => normalizeObjectOutputType(deps, outputTypeCache, itemType));
-  const normalizedTypeByName = new Set(normalizedTypes.map(itemType => itemType.name).filter(name => typeof name === 'string'));
+  const normalizedTypeByName = new Set(config.types.map(itemType => itemType.name));
   const normalized = new deps.GraphQLUnionType({
     ...config,
     resolveType: async (...args) => {
@@ -88,36 +105,46 @@ function normalizeUnionOutputType(deps, outputTypeCache, outputType) {
       }
       return undefined;
     },
-    types: normalizedTypes
+    types: () => config.types.map(itemType => normalizeObjectOutputType(deps, outputTypeCache, itemType, transformObjectFields))
   });
   outputTypeCache.set(outputTypeName, normalized);
+  normalized.getTypes();
   return normalized;
 }
 function isUnionOutputType(value) {
   return typeof value === 'object' && typeof value.getTypes === 'function';
 }
+function isObjectOutputType(value) {
+  return value[Symbol.toStringTag] === 'GraphQLObjectType';
+}
+function isListOutputType(value) {
+  return value[Symbol.toStringTag] === 'GraphQLList';
+}
+function isNonNullOutputType(value) {
+  return value[Symbol.toStringTag] === 'GraphQLNonNull';
+}
 function resolveArgGraphqlType(deps, argType) {
   if (isGraphqlListTypeRef(argType)) {
     return new deps.GraphQLList(scalarByName(deps, argType.ofType));
   }
   return scalarByName(deps, argType);
 }
-function resolveNamedRootOutputType(deps, outputTypeCache, markAllowedCrossRealmGraphqlObjects, outputRef) {
+function resolveNamedRootOutputType(deps, outputTypeCache, markAllowedCrossRealmGraphqlObjects, outputRef, transformObjectFields) {
   if (typeof outputRef === 'string') {
     return scalarByName(deps, outputRef);
   }
   markAllowedCrossRealmGraphqlObjects(outputRef);
   if (isUnionOutputType(outputRef)) {
-    return normalizeUnionOutputType(deps, outputTypeCache, outputRef);
+    return normalizeUnionOutputType(deps, outputTypeCache, outputRef, transformObjectFields);
   }
-  return normalizeObjectOutputType(deps, outputTypeCache, outputRef);
+  return normalizeObjectOutputType(deps, outputTypeCache, outputRef, transformObjectFields);
 }
-function resolveRootOutputType(deps, outputTypeCache, markAllowedCrossRealmGraphqlObjects, outputRef) {
+function resolveRootOutputType(deps, outputTypeCache, markAllowedCrossRealmGraphqlObjects, outputRef, transformObjectFields) {
   if (isGraphqlListTypeRef(outputRef)) {
-    const listItemType = resolveNamedRootOutputType(deps, outputTypeCache, markAllowedCrossRealmGraphqlObjects, outputRef.ofType);
+    const listItemType = resolveNamedRootOutputType(deps, outputTypeCache, markAllowedCrossRealmGraphqlObjects, outputRef.ofType, transformObjectFields);
     return new deps.GraphQLList(listItemType);
   }
-  return resolveNamedRootOutputType(deps, outputTypeCache, markAllowedCrossRealmGraphqlObjects, outputRef);
+  return resolveNamedRootOutputType(deps, outputTypeCache, markAllowedCrossRealmGraphqlObjects, outputRef, transformObjectFields);
 }
 function createFieldArgs(deps, handler) {
   return Object.fromEntries(handler.argFields.map(argField => [argField.argName, {
@@ -147,7 +174,7 @@ function createOperationField(descriptor, handler, args, outputType, invokeResol
     type: outputType
   };
 }
-function pickFieldsByType(deps, descriptors, handlerType, markAllowedCrossRealmGraphqlObjects, outputTypeCache, invokeResolver) {
+function pickFieldsByType(deps, descriptors, handlerType, markAllowedCrossRealmGraphqlObjects, outputTypeCache, transformObjectFields, invokeResolver) {
   const fields = {};
   for (const descriptor of descriptors) {
     for (const handler of descriptor.handlers) {
@@ -156,7 +183,7 @@ function pickFieldsByType(deps, descriptors, handlerType, markAllowedCrossRealmG
       }
       const args = createFieldArgs(deps, handler);
       const outputRef = resolveOutputType(handler);
-      const outputType = resolveRootOutputType(deps, outputTypeCache, markAllowedCrossRealmGraphqlObjects, outputRef);
+      const outputType = resolveRootOutputType(deps, outputTypeCache, markAllowedCrossRealmGraphqlObjects, outputRef, transformObjectFields);
       if (Object.hasOwn(fields, handler.fieldName)) {
         throw new Error(`GraphQL schema conflict: field "${handler.fieldName}" on ${handlerType} type is registered more than once. ` + `Found duplicate in resolver "${descriptor.targetName}". Each field name must be unique across all resolvers.`);
       }
@@ -175,20 +202,22 @@ function isGraphQLSchemaLike(value) {
   }
   return typeof value.getQueryType === 'function' && typeof value.getTypeMap === 'function';
 }
-function toGraphqlValidationError(deps, error) {
-  return new deps.GraphQLError('Validation failed.', {
+function toGraphqlValidationError(deps, error, markAllowedCrossRealmGraphqlObjects) {
+  const graphqlError = deps.createGraphQLError('Validation failed.', {
     extensions: {
       code: 'BAD_USER_INPUT',
       issues: error.issues
     }
   });
+  markAllowedCrossRealmGraphqlObjects(graphqlError);
+  return graphqlError;
 }
-async function createResolverInput(deps, handler, args) {
+async function createResolverInput(deps, handler, args, markAllowedCrossRealmGraphqlObjects) {
   try {
     return await createGraphqlInput(handler.inputClass, args, handler.argFields);
   } catch (error) {
     if (error instanceof DtoValidationError) {
-      throw toGraphqlValidationError(deps, error);
+      throw toGraphqlValidationError(deps, error, markAllowedCrossRealmGraphqlObjects);
     }
     throw error;
   }
@@ -200,21 +229,21 @@ function resolveResolverMethod(instance, descriptor, handler) {
   }
   return value;
 }
-function createResolverInvoker(deps, runtimeContainer) {
-  return async (descriptor, handler, args, contextValue) => {
+function createResolverInvoker(deps, runtimeContainer, markAllowedCrossRealmGraphqlObjects, objectFieldResolvers) {
+  return async (descriptor, handler, args, contextValue, source) => {
     if (descriptor.scope === 'singleton') {
       const instance = await runtimeContainer.resolve(descriptor.token);
       const resolverMethod = resolveResolverMethod(instance, descriptor, handler);
-      const input = await createResolverInput(deps, handler, args);
-      return resolverMethod.call(instance, input, contextValue);
+      const methodArguments = handler.type === 'field' ? objectFieldResolvers.createMethodArguments(handler, source, contextValue) : [await createResolverInput(deps, handler, args, markAllowedCrossRealmGraphqlObjects), contextValue];
+      return resolverMethod.call(instance, ...methodArguments);
     }
     const operationContainer = contextValue[GRAPHQL_OPERATION_CONTAINER] ?? runtimeContainer.createRequestScope();
     const disposeOperationContainer = contextValue[GRAPHQL_OPERATION_CONTAINER] === undefined;
     try {
       const instance = await operationContainer.resolve(descriptor.token);
       const resolverMethod = resolveResolverMethod(instance, descriptor, handler);
-      const input = await createResolverInput(deps, handler, args);
-      return await resolverMethod.call(instance, input, contextValue);
+      const methodArguments = handler.type === 'field' ? objectFieldResolvers.createMethodArguments(handler, source, contextValue) : [await createResolverInput(deps, handler, args, markAllowedCrossRealmGraphqlObjects), contextValue];
+      return await resolverMethod.call(instance, ...methodArguments);
     } finally {
       if (disposeOperationContainer) {
         await operationContainer.dispose();
@@ -282,17 +311,24 @@ export function createCodeFirstSchema(deps, runtimeContainer, resolverDescriptor
   if (resolverDescriptors.length === 0) {
     throw new Error('GraphQL module requires either schema or at least one resolver decorated with @Resolver().');
   }
-  const invokeResolver = createResolverInvoker(deps, runtimeContainer);
+  const objectFieldResolvers = new ObjectFieldResolverRegistry(resolverDescriptors);
+  const invokeResolver = createResolverInvoker(deps, runtimeContainer, markAllowedCrossRealmGraphqlObjects, objectFieldResolvers);
   const outputTypeCache = new Map();
-  const queryFields = pickFieldsByType(deps, resolverDescriptors, 'query', markAllowedCrossRealmGraphqlObjects, outputTypeCache, invokeResolver);
-  const mutationFields = pickFieldsByType(deps, resolverDescriptors, 'mutation', markAllowedCrossRealmGraphqlObjects, outputTypeCache, invokeResolver);
-  const subscriptionFields = pickFieldsByType(deps, resolverDescriptors, 'subscription', markAllowedCrossRealmGraphqlObjects, outputTypeCache, invokeResolver);
+  function attachObjectFieldResolvers(typeName, fields) {
+    return objectFieldResolvers.attach(typeName, fields, outputType => resolveRootOutputType(deps, outputTypeCache, markAllowedCrossRealmGraphqlObjects, outputType, attachObjectFieldResolvers), (descriptor, handler, source, contextValue) => invokeResolver(descriptor, handler, {}, contextValue, source));
+  }
+  const queryFields = pickFieldsByType(deps, resolverDescriptors, 'query', markAllowedCrossRealmGraphqlObjects, outputTypeCache, attachObjectFieldResolvers, invokeResolver);
+  const mutationFields = pickFieldsByType(deps, resolverDescriptors, 'mutation', markAllowedCrossRealmGraphqlObjects, outputTypeCache, attachObjectFieldResolvers, invokeResolver);
+  const subscriptionFields = pickFieldsByType(deps, resolverDescriptors, 'subscription', markAllowedCrossRealmGraphqlObjects, outputTypeCache, attachObjectFieldResolvers, invokeResolver);
+  objectFieldResolvers.assertAllTargetsAttached();
   const queryType = createQueryRootType(deps, queryFields);
   const mutationType = createOptionalRootType(deps, 'Mutation', mutationFields);
   const subscriptionType = createOptionalRootType(deps, 'Subscription', subscriptionFields);
-  return new deps.GraphQLSchema({
+  const schema = new deps.GraphQLSchema({
     mutation: mutationType,
     query: queryType,
     subscription: subscriptionType
   });
+  markAllowedCrossRealmGraphqlObjects(schema);
+  return schema;
 }

package/dist/service.d.ts

@@ -1,5 +1,5 @@
-import { type HttpApplicationAdapter } from '@fluojs/http';
 import type { Container } from '@fluojs/di';
+import { type HttpApplicationAdapter } from '@fluojs/http';
 import type { ApplicationLogger, CompiledModule, OnApplicationBootstrap, OnApplicationShutdown } from '@fluojs/runtime';
 import type { GraphqlModuleOptions } from './types.js';
 /**
@@ -21,11 +21,9 @@ export declare class GraphqlLifecycleService implements OnApplicationBootstrap,
     private graphQLErrorConstructor;
     private middlewareRegistered;
     private readonly operationContainers;
+    private readonly requestContexts;
     private readonly websocketOperationContainers;
-    private websocketDisposable;
-    private websocketServer;
-    private websocketUpgradeListener;
-    private websocketUpgradeServer;
+    private websocketTransport;
     private executeGraphqlOperation;
     private releaseGraphqlInstanceOfPatch;
     private subscribeGraphqlOperation;
@@ -47,10 +45,8 @@ export declare class GraphqlLifecycleService implements OnApplicationBootstrap,
     private registerWebSocketTransport;
     private unregisterWebSocketTransport;
     private isWebSocketTransportEnabled;
-    private resolveUpgradeServer;
     private handleWebSocketSubscribe;
     private createWebSocketOperationLimitError;
-    private rejectWebSocketUpgrade;
     private getOrCreateWebSocketOperationContainer;
     private disposeWebSocketOperationContainer;
     private disposeAllWebSocketOperationContainers;

package/dist/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAgD,KAAK,sBAAsB,EAAsD,MAAM,cAAc,CAAC;AAE7J,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AA2BxH,OAAO,KAAK,EAEV,oBAAoB,EAGrB,MAAM,YAAY,CAAC;AAmIpB;;GAEG;AACH,qBACa,yBAAyB;IAEpC,SAAS,IAAI,SAAS;IAKtB,UAAU,IAAI,SAAS;CAGxB;AA+ID;;GAEG;AACH,qBACa,uBAAwB,YAAW,sBAAsB,EAAE,qBAAqB;IA6DzF,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAhE1B,OAAO,CAAC,uBAAuB,CAAsC;IACrE,OAAO,CAAC,oBAAoB,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAqC;IACzE,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAA6C;IAC1F,OAAO,CAAC,mBAAmB,CAAkD;IAC7E,OAAO,CAAC,eAAe,CAA8B;IACrD,OAAO,CAAC,wBAAwB,CAAkC;IAClE,OAAO,CAAC,sBAAsB,CAAgC;IAC9D,OAAO,CAAC,uBAAuB,CAAyD;IACxF,OAAO,CAAC,6BAA6B,CAA2B;IAChE,OAAO,CAAC,yBAAyB,CAAyD;IAC1F,OAAO,CAAC,IAAI,CAAuB;IAEnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CA4CzB;gBAGiB,gBAAgB,EAAE,SAAS,EAC3B,eAAe,EAAE,SAAS,cAAc,EAAE,EAC1C,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,oBAAoB;IAG1C,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAgDvC,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;YAI9B,wBAAwB;IAYtC,OAAO,CAAC,sBAAsB;IAI9B,OAAO,CAAC,2BAA2B;IAInC,OAAO,CAAC,sBAAsB;IAe9B,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,2BAA2B;IAInC,OAAO,CAAC,kBAAkB;IAiB1B,OAAO,CAAC,oBAAoB;IAmB5B,OAAO,CAAC,mBAAmB;IAyB3B,OAAO,CAAC,0BAA0B;YAuEpB,4BAA4B;IAuC1C,OAAO,CAAC,2BAA2B;IAInC,OAAO,CAAC,oBAAoB;YAkBd,wBAAwB;IAwDtC,OAAO,CAAC,kCAAkC;IAwB1C,OAAO,CAAC,sBAAsB;IAoB9B,OAAO,CAAC,sCAAsC;YAchC,kCAAkC;YAqBlC,sCAAsC;IAkBpD,OAAO,CAAC,6BAA6B;YAYvB,yBAAyB;CAexC"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAA0C,KAAK,sBAAsB,EAA4D,MAAM,cAAc,CAAC;AAC7J,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AA0BxH,OAAO,KAAK,EAEV,oBAAoB,EAGrB,MAAM,YAAY,CAAC;AA2EpB;;GAEG;AACH,qBACa,yBAAyB;IAEpC,SAAS,IAAI,SAAS;IAKtB,UAAU,IAAI,SAAS;CAGxB;AA4JD;;GAEG;AACH,qBACa,uBAAwB,YAAW,sBAAsB,EAAE,qBAAqB;IA0DzF,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IA7D1B,OAAO,CAAC,uBAAuB,CAAsC;IACrE,OAAO,CAAC,oBAAoB,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAqC;IACzE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiD;IACjF,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAA6C;IAC1F,OAAO,CAAC,kBAAkB,CAA4C;IACtE,OAAO,CAAC,uBAAuB,CAAoC;IACnE,OAAO,CAAC,6BAA6B,CAA2B;IAChE,OAAO,CAAC,yBAAyB,CAAsC;IACvE,OAAO,CAAC,IAAI,CAAuB;IAEnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CA2CzB;gBAGiB,gBAAgB,EAAE,SAAS,EAC3B,eAAe,EAAE,SAAS,cAAc,EAAE,EAC1C,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,oBAAoB;IAG1C,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAgDvC,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;YAI9B,wBAAwB;IAYtC,OAAO,CAAC,sBAAsB;IAI9B,OAAO,CAAC,2BAA2B;IAInC,OAAO,CAAC,sBAAsB;IAe9B,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,2BAA2B;IAInC,OAAO,CAAC,kBAAkB;IAiB1B,OAAO,CAAC,oBAAoB;IAmB5B,OAAO,CAAC,mBAAmB;YAyBb,0BAA0B;YAgC1B,4BAA4B;IAgB1C,OAAO,CAAC,2BAA2B;YAIrB,wBAAwB;IAmDtC,OAAO,CAAC,kCAAkC;IAwB1C,OAAO,CAAC,sCAAsC;YAchC,kCAAkC;YAqBlC,sCAAsC;IAkBpD,OAAO,CAAC,6BAA6B;YAYvB,yBAAyB;CAexC"}