@omnigraph/grpc 0.2.1-alpha-20250115141639-803e3526c125de5895ee472922b8197b0a6d19ce → 0.2.2-alpha-20250117110641-b3ddf764383c4fd9fa3790f810a5e7a511dbeb51

package/cjs/grpcLoaderHelper.js

@@ -6,6 +6,7 @@ const globby_1 = tslib_1.__importDefault(require("globby"));
 const graphql_1 = require("graphql");
 const graphql_compose_1 = require("graphql-compose");
 const graphql_scalars_1 = require("graphql-scalars");
+const micromatch_1 = tslib_1.__importDefault(require("micromatch"));
 const protobufjs_1 = tslib_1.__importDefault(require("protobufjs"));
 const index_js_1 = tslib_1.__importDefault(require("protobufjs/ext/descriptor/index.js"));
 const grpc_reflection_js_1 = require("@ardatan/grpc-reflection-js");
@@ -385,9 +386,30 @@ class GrpcLoaderHelper extends disposablestack_1.DisposableStack {
                 fieldConfig.args = fieldConfigArgs;
                 const methodNameLowerCased = methodName.toLowerCase();
                 const prefixQueryMethod = this.config.prefixQueryMethod || QUERY_METHOD_PREFIXES;
-                const rootTypeComposer = prefixQueryMethod.some(prefix => methodNameLowerCased.startsWith(prefix))
-                    ? this.schemaComposer.Query
-                    : this.schemaComposer.Mutation;
+                let rootTypeComposer;
+                if (this.config.selectQueryOrMutationField) {
+                    const selection = this.config.selectQueryOrMutationField.find(selection => (0, micromatch_1.default)([rootFieldName], selection.fieldName).length > 0);
+                    const rootTypeName = selection?.type?.toLowerCase();
+                    if (rootTypeName) {
+                        if (rootTypeName === 'query') {
+                            rootTypeComposer = this.schemaComposer.Query;
+                        }
+                        else if (rootTypeName === 'mutation') {
+                            rootTypeComposer = this.schemaComposer.Mutation;
+                        }
+                        else if (rootTypeName === 'subscription') {
+                            rootTypeComposer = this.schemaComposer.Subscription;
+                        }
+                        else {
+                            throw new Error(`Unknown type provided ${selection.type} for ${rootFieldName}; available options are Query, Mutation and Subscription`);
+                        }
+                    }
+                }
+                if (rootTypeComposer == null) {
+                    rootTypeComposer = prefixQueryMethod.some(prefix => methodNameLowerCased.startsWith(prefix))
+                        ? this.schemaComposer.Query
+                        : this.schemaComposer.Mutation;
+                }
                 this.schemaComposer.addDirective(directives_js_1.grpcMethodDirective);
                 rootTypeComposer.addFields({
                     [rootFieldName]: {

package/esm/grpcLoaderHelper.js

@@ -2,6 +2,7 @@ import globby from 'globby';
 import { specifiedDirectives } from 'graphql';
 import { SchemaComposer, } from 'graphql-compose';
 import { GraphQLBigInt, GraphQLByte, GraphQLJSON, GraphQLUnsignedInt, GraphQLVoid, } from 'graphql-scalars';
+import micromatch from 'micromatch';
 import protobufjs from 'protobufjs';
 import descriptor from 'protobufjs/ext/descriptor/index.js';
 import { Client } from '@ardatan/grpc-reflection-js';
@@ -381,9 +382,30 @@ export class GrpcLoaderHelper extends DisposableStack {
                 fieldConfig.args = fieldConfigArgs;
                 const methodNameLowerCased = methodName.toLowerCase();
                 const prefixQueryMethod = this.config.prefixQueryMethod || QUERY_METHOD_PREFIXES;
-                const rootTypeComposer = prefixQueryMethod.some(prefix => methodNameLowerCased.startsWith(prefix))
-                    ? this.schemaComposer.Query
-                    : this.schemaComposer.Mutation;
+                let rootTypeComposer;
+                if (this.config.selectQueryOrMutationField) {
+                    const selection = this.config.selectQueryOrMutationField.find(selection => micromatch([rootFieldName], selection.fieldName).length > 0);
+                    const rootTypeName = selection?.type?.toLowerCase();
+                    if (rootTypeName) {
+                        if (rootTypeName === 'query') {
+                            rootTypeComposer = this.schemaComposer.Query;
+                        }
+                        else if (rootTypeName === 'mutation') {
+                            rootTypeComposer = this.schemaComposer.Mutation;
+                        }
+                        else if (rootTypeName === 'subscription') {
+                            rootTypeComposer = this.schemaComposer.Subscription;
+                        }
+                        else {
+                            throw new Error(`Unknown type provided ${selection.type} for ${rootFieldName}; available options are Query, Mutation and Subscription`);
+                        }
+                    }
+                }
+                if (rootTypeComposer == null) {
+                    rootTypeComposer = prefixQueryMethod.some(prefix => methodNameLowerCased.startsWith(prefix))
+                        ? this.schemaComposer.Query
+                        : this.schemaComposer.Mutation;
+                }
                 this.schemaComposer.addDirective(grpcMethodDirective);
                 rootTypeComposer.addFields({
                     [rootFieldName]: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnigraph/grpc",
-  "version": "0.2.1-alpha-20250115141639-803e3526c125de5895ee472922b8197b0a6d19ce",
+  "version": "0.2.2-alpha-20250117110641-b3ddf764383c4fd9fa3790f810a5e7a511dbeb51",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "*"
@@ -14,9 +14,10 @@
     "@grpc/grpc-js": "^1.1.7",
     "@whatwg-node/disposablestack": "^0.0.5",
     "globby": "^11.1.0",
-    "graphql-compose": "^9.0.11",
+    "graphql-compose": "^9.1.0",
     "graphql-scalars": "^1.23.0",
     "lodash.has": "^4.5.2",
+    "micromatch": "^4.0.8",
     "protobufjs": "^7.2.5"
   },
   "repository": {