@graphql-mesh/grpc 0.95.3-alpha-20230822080151-fa4ac7163 → 0.95.3

package/cjs/directives.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.grpcRootJsonDirective = exports.ObjMapScalar = exports.grpcConnectivityStateDirective = exports.grpcMethodDirective = void 0;
+exports.grpcRootJsonDirective = exports.ObjMapScalar = exports.EnumDirective = exports.grpcConnectivityStateDirective = exports.grpcMethodDirective = void 0;
 const graphql_1 = require("graphql");
 exports.grpcMethodDirective = new graphql_1.GraphQLDirective({
     name: 'grpcMethod',
@@ -32,6 +32,15 @@ exports.grpcConnectivityStateDirective = new graphql_1.GraphQLDirective({
         },
     },
 });
+exports.EnumDirective = new graphql_1.GraphQLDirective({
+    name: 'enum',
+    locations: [graphql_1.DirectiveLocation.ENUM_VALUE],
+    args: {
+        value: {
+            type: graphql_1.GraphQLString,
+        },
+    },
+});
 exports.ObjMapScalar = new graphql_1.GraphQLScalarType({
     name: 'ObjMap',
     serialize: value => JSON.stringify(value),

package/cjs/index.js

@@ -262,8 +262,9 @@ class GrpcHandler {
         }
         const rootTypes = (0, utils_2.getRootTypes)(schema);
         for (const rootType of rootTypes) {
-            for (const fieldName in rootType.getFields()) {
-                const field = rootType.getFields()[fieldName];
+            const rootTypeFields = rootType.getFields();
+            for (const fieldName in rootTypeFields) {
+                const field = rootTypeFields[fieldName];
                 const directives = (0, utils_2.getDirectives)(schema, field);
                 if (directives?.length) {
                     for (const directiveObj of directives) {
@@ -299,6 +300,24 @@ class GrpcHandler {
                 }
             }
         }
+        const typeMap = schema.getTypeMap();
+        for (const typeName in typeMap) {
+            const type = typeMap[typeName];
+            if ((0, graphql_1.isEnumType)(type)) {
+                const values = type.getValues();
+                for (const value of values) {
+                    const enumAnnotations = (0, utils_2.getDirective)(schema, value, 'enum');
+                    if (enumAnnotations?.length) {
+                        for (const enumAnnotation of enumAnnotations) {
+                            const enumSerializedValue = enumAnnotation.value;
+                            if (enumSerializedValue) {
+                                value.value = JSON.parse(enumSerializedValue);
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
     visit({ nested, name, currentPath, rootJsonName, rootJson, rootLogger: logger, loadOptions, }) {
         const pathWithName = [...currentPath, ...name.split('.')].filter(Boolean);
@@ -318,20 +337,28 @@ class GrpcHandler {
         }
         const typeName = pathWithName.join('_');
         if ('values' in nested) {
-            const enumTypeConfig = {
-                name: typeName,
-                values: {},
-                description: nested.comment,
-            };
+            const enumValues = {};
             const commentMap = nested.comments;
             for (const [key, value] of Object.entries(nested.values)) {
                 logger.debug(`Visiting ${currentPath}.nested.values[${key}]`);
-                enumTypeConfig.values[key] = {
-                    value,
+                enumValues[key] = {
+                    directives: [
+                        {
+                            name: 'enum',
+                            args: {
+                                value: JSON.stringify(value),
+                            },
+                        },
+                    ],
                     description: commentMap?.[key],
                 };
             }
-            this.schemaComposer.createEnumTC(enumTypeConfig);
+            this.schemaComposer.addDirective(directives_js_1.EnumDirective);
+            this.schemaComposer.createEnumTC({
+                name: typeName,
+                values: enumValues,
+                description: nested.comment,
+            });
         }
         else if ('fields' in nested) {
             const inputTypeName = typeName + '_Input';

package/esm/directives.js

@@ -29,6 +29,15 @@ export const grpcConnectivityStateDirective = new GraphQLDirective({
         },
     },
 });
+export const EnumDirective = new GraphQLDirective({
+    name: 'enum',
+    locations: [DirectiveLocation.ENUM_VALUE],
+    args: {
+        value: {
+            type: GraphQLString,
+        },
+    },
+});
 export const ObjMapScalar = new GraphQLScalarType({
     name: 'ObjMap',
     serialize: value => JSON.stringify(value),

package/esm/index.js

@@ -1,7 +1,7 @@
 /* eslint-disable import/no-duplicates */
 import globby from 'globby';
-import { buildSchema, specifiedDirectives, } from 'graphql';
-import { SchemaComposer } from 'graphql-compose';
+import { buildSchema, isEnumType, specifiedDirectives, } from 'graphql';
+import { SchemaComposer, } from 'graphql-compose';
 import { GraphQLBigInt, GraphQLByte, GraphQLJSON, GraphQLUnsignedInt, GraphQLVoid, } from 'graphql-scalars';
 import lodashGet from 'lodash.get';
 import lodashHas from 'lodash.has';
@@ -15,7 +15,7 @@ import { readFileOrUrl } from '@graphql-mesh/utils';
 import { getDirective, getDirectives, getRootTypes, GraphQLStreamDirective, } from '@graphql-tools/utils';
 import { credentials, loadPackageDefinition } from '@grpc/grpc-js';
 import { fromJSON } from '@grpc/proto-loader';
-import { grpcConnectivityStateDirective, grpcMethodDirective, grpcRootJsonDirective, ObjMapScalar, } from './directives.js';
+import { EnumDirective, grpcConnectivityStateDirective, grpcMethodDirective, grpcRootJsonDirective, ObjMapScalar, } from './directives.js';
 import './patchLongJs.js';
 import { resolvers as scalarResolvers } from 'graphql-scalars';
 import { addExecutionLogicToScalar } from './scalars.js';
@@ -259,8 +259,9 @@ export default class GrpcHandler {
         }
         const rootTypes = getRootTypes(schema);
         for (const rootType of rootTypes) {
-            for (const fieldName in rootType.getFields()) {
-                const field = rootType.getFields()[fieldName];
+            const rootTypeFields = rootType.getFields();
+            for (const fieldName in rootTypeFields) {
+                const field = rootTypeFields[fieldName];
                 const directives = getDirectives(schema, field);
                 if (directives?.length) {
                     for (const directiveObj of directives) {
@@ -296,6 +297,24 @@ export default class GrpcHandler {
                 }
             }
         }
+        const typeMap = schema.getTypeMap();
+        for (const typeName in typeMap) {
+            const type = typeMap[typeName];
+            if (isEnumType(type)) {
+                const values = type.getValues();
+                for (const value of values) {
+                    const enumAnnotations = getDirective(schema, value, 'enum');
+                    if (enumAnnotations?.length) {
+                        for (const enumAnnotation of enumAnnotations) {
+                            const enumSerializedValue = enumAnnotation.value;
+                            if (enumSerializedValue) {
+                                value.value = JSON.parse(enumSerializedValue);
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
     visit({ nested, name, currentPath, rootJsonName, rootJson, rootLogger: logger, loadOptions, }) {
         const pathWithName = [...currentPath, ...name.split('.')].filter(Boolean);
@@ -315,20 +334,28 @@ export default class GrpcHandler {
         }
         const typeName = pathWithName.join('_');
         if ('values' in nested) {
-            const enumTypeConfig = {
-                name: typeName,
-                values: {},
-                description: nested.comment,
-            };
+            const enumValues = {};
             const commentMap = nested.comments;
             for (const [key, value] of Object.entries(nested.values)) {
                 logger.debug(`Visiting ${currentPath}.nested.values[${key}]`);
-                enumTypeConfig.values[key] = {
-                    value,
+                enumValues[key] = {
+                    directives: [
+                        {
+                            name: 'enum',
+                            args: {
+                                value: JSON.stringify(value),
+                            },
+                        },
+                    ],
                     description: commentMap?.[key],
                 };
             }
-            this.schemaComposer.createEnumTC(enumTypeConfig);
+            this.schemaComposer.addDirective(EnumDirective);
+            this.schemaComposer.createEnumTC({
+                name: typeName,
+                values: enumValues,
+                description: nested.comment,
+            });
         }
         else if ('fields' in nested) {
             const inputTypeName = typeName + '_Input';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-mesh/grpc",
-  "version": "0.95.3-alpha-20230822080151-fa4ac7163",
+  "version": "0.95.3",
   "sideEffects": false,
   "peerDependencies": {
     "@graphql-mesh/cross-helpers": "^0.4.0",

package/typings/directives.d.cts

@@ -1,5 +1,6 @@
 import { GraphQLDirective, GraphQLScalarType } from 'graphql';
 export declare const grpcMethodDirective: GraphQLDirective;
 export declare const grpcConnectivityStateDirective: GraphQLDirective;
+export declare const EnumDirective: GraphQLDirective;
 export declare const ObjMapScalar: GraphQLScalarType<any, string>;
 export declare const grpcRootJsonDirective: GraphQLDirective;

package/typings/directives.d.ts

@@ -1,5 +1,6 @@
 import { GraphQLDirective, GraphQLScalarType } from 'graphql';
 export declare const grpcMethodDirective: GraphQLDirective;
 export declare const grpcConnectivityStateDirective: GraphQLDirective;
+export declare const EnumDirective: GraphQLDirective;
 export declare const ObjMapScalar: GraphQLScalarType<any, string>;
 export declare const grpcRootJsonDirective: GraphQLDirective;