@graphql-mesh/grpc 0.94.1 → 0.94.3

package/cjs/index.js

@@ -20,6 +20,8 @@ const grpc_js_1 = require("@grpc/grpc-js");
 const proto_loader_1 = require("@grpc/proto-loader");
 const directives_js_1 = require("./directives.js");
 require("./patchLongJs.js");
+const graphql_scalars_2 = require("graphql-scalars");
+const scalars_js_1 = require("./scalars.js");
 const utils_js_1 = require("./utils.js");
 const { Root } = protobufjs_1.default;
 const QUERY_METHOD_PREFIXES = ['get', 'list', 'search'];
@@ -36,9 +38,9 @@ class GrpcHandler {
     }
     async processReflection(creds) {
         this.logger.debug(`Using the reflection`);
-        const grpcReflectionServer = this.config.endpoint;
+        const reflectionEndpoint = string_interpolation_1.stringInterpolator.parse(this.config.endpoint, { env: cross_helpers_1.process.env });
         this.logger.debug(`Creating gRPC Reflection Client`);
-        const reflectionClient = new grpc_reflection_js_1.Client(grpcReflectionServer, creds);
+        const reflectionClient = new grpc_reflection_js_1.Client(reflectionEndpoint, creds);
         const subId = this.pubsub.subscribe('destroy', () => {
             reflectionClient.grpcClient.close();
             this.pubsub.unsubscribe(subId);
@@ -64,6 +66,7 @@ class GrpcHandler {
         else {
             fileName = this.config.source;
         }
+        fileName = string_interpolation_1.stringInterpolator.parse(fileName, { env: cross_helpers_1.process.env });
         const absoluteFilePath = cross_helpers_1.path.isAbsolute(fileName)
             ? fileName
             : cross_helpers_1.path.join(this.baseDir, fileName);
@@ -114,6 +117,7 @@ class GrpcHandler {
         else {
             fileGlob = this.config.source;
         }
+        fileGlob = string_interpolation_1.stringInterpolator.parse(fileGlob, { env: cross_helpers_1.process.env });
         const fileNames = await (0, globby_1.default)(fileGlob, {
             cwd: this.baseDir,
         });
@@ -238,6 +242,15 @@ class GrpcHandler {
         };
     }
     processDirectives({ schema, creds }) {
+        const schemaTypeMap = schema.getTypeMap();
+        for (const scalarTypeName in graphql_scalars_2.resolvers) {
+            if (scalarTypeName in schemaTypeMap) {
+                (0, scalars_js_1.addExecutionLogicToScalar)(schemaTypeMap[scalarTypeName], graphql_scalars_2.resolvers[scalarTypeName]);
+            }
+        }
+        if ('ObjMap' in schemaTypeMap) {
+            (0, scalars_js_1.addExecutionLogicToScalar)(schemaTypeMap.ObjMap, directives_js_1.ObjMapScalar);
+        }
         const queryType = schema.getQueryType();
         const rootJsonAnnotations = (0, utils_2.getDirective)(schema, queryType, 'grpcRootJson');
         const rootJsonMap = new Map();

package/cjs/scalars.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGraphQLScalar = exports.isScalarType = void 0;
+exports.addExecutionLogicToScalar = exports.getGraphQLScalar = exports.isScalarType = void 0;
 const SCALARS = new Map([
     ['bool', 'Boolean'],
     ['bytes', 'Byte'],
@@ -30,3 +30,23 @@ function getGraphQLScalar(scalarType) {
     return SCALARS.get(scalarType);
 }
 exports.getGraphQLScalar = getGraphQLScalar;
+function addExecutionLogicToScalar(nonExecutableScalar, actualScalar) {
+    Object.defineProperties(nonExecutableScalar, {
+        serialize: {
+            value: actualScalar.serialize,
+        },
+        parseValue: {
+            value: actualScalar.parseValue,
+        },
+        parseLiteral: {
+            value: actualScalar.parseLiteral,
+        },
+        extensions: {
+            value: {
+                ...actualScalar.extensions,
+                ...nonExecutableScalar.extensions,
+            },
+        },
+    });
+}
+exports.addExecutionLogicToScalar = addExecutionLogicToScalar;

package/esm/index.js

@@ -15,8 +15,10 @@ import { readFileOrUrl } from '@graphql-mesh/utils';
 import { getDirective, getDirectives, getRootTypes } from '@graphql-tools/utils';
 import { credentials, loadPackageDefinition } from '@grpc/grpc-js';
 import { fromJSON } from '@grpc/proto-loader';
-import { grpcConnectivityStateDirective, grpcMethodDirective, grpcRootJsonDirective, } from './directives.js';
+import { grpcConnectivityStateDirective, grpcMethodDirective, grpcRootJsonDirective, ObjMapScalar, } from './directives.js';
 import './patchLongJs.js';
+import { resolvers as scalarResolvers } from 'graphql-scalars';
+import { addExecutionLogicToScalar } from './scalars.js';
 import { addIncludePathResolver, addMetaDataToCall, getTypeName } from './utils.js';
 const { Root } = protobufjs;
 const QUERY_METHOD_PREFIXES = ['get', 'list', 'search'];
@@ -33,9 +35,9 @@ export default class GrpcHandler {
     }
     async processReflection(creds) {
         this.logger.debug(`Using the reflection`);
-        const grpcReflectionServer = this.config.endpoint;
+        const reflectionEndpoint = stringInterpolator.parse(this.config.endpoint, { env: process.env });
         this.logger.debug(`Creating gRPC Reflection Client`);
-        const reflectionClient = new Client(grpcReflectionServer, creds);
+        const reflectionClient = new Client(reflectionEndpoint, creds);
         const subId = this.pubsub.subscribe('destroy', () => {
             reflectionClient.grpcClient.close();
             this.pubsub.unsubscribe(subId);
@@ -61,6 +63,7 @@ export default class GrpcHandler {
         else {
             fileName = this.config.source;
         }
+        fileName = stringInterpolator.parse(fileName, { env: process.env });
         const absoluteFilePath = path.isAbsolute(fileName)
             ? fileName
             : path.join(this.baseDir, fileName);
@@ -111,6 +114,7 @@ export default class GrpcHandler {
         else {
             fileGlob = this.config.source;
         }
+        fileGlob = stringInterpolator.parse(fileGlob, { env: process.env });
         const fileNames = await globby(fileGlob, {
             cwd: this.baseDir,
         });
@@ -235,6 +239,15 @@ export default class GrpcHandler {
         };
     }
     processDirectives({ schema, creds }) {
+        const schemaTypeMap = schema.getTypeMap();
+        for (const scalarTypeName in scalarResolvers) {
+            if (scalarTypeName in schemaTypeMap) {
+                addExecutionLogicToScalar(schemaTypeMap[scalarTypeName], scalarResolvers[scalarTypeName]);
+            }
+        }
+        if ('ObjMap' in schemaTypeMap) {
+            addExecutionLogicToScalar(schemaTypeMap.ObjMap, ObjMapScalar);
+        }
         const queryType = schema.getQueryType();
         const rootJsonAnnotations = getDirective(schema, queryType, 'grpcRootJson');
         const rootJsonMap = new Map();

package/esm/scalars.js

@@ -25,3 +25,22 @@ export function getGraphQLScalar(scalarType) {
     }
     return SCALARS.get(scalarType);
 }
+export function addExecutionLogicToScalar(nonExecutableScalar, actualScalar) {
+    Object.defineProperties(nonExecutableScalar, {
+        serialize: {
+            value: actualScalar.serialize,
+        },
+        parseValue: {
+            value: actualScalar.parseValue,
+        },
+        parseLiteral: {
+            value: actualScalar.parseLiteral,
+        },
+        extensions: {
+            value: {
+                ...actualScalar.extensions,
+                ...nonExecutableScalar.extensions,
+            },
+        },
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-mesh/grpc",
-  "version": "0.94.1",
+  "version": "0.94.3",
   "sideEffects": false,
   "peerDependencies": {
     "@graphql-mesh/cross-helpers": "^0.4.0",

package/typings/scalars.d.cts

@@ -1,2 +1,4 @@
+import { GraphQLScalarType } from 'graphql';
 export declare function isScalarType(type: string): boolean;
 export declare function getGraphQLScalar(scalarType: string): string;
+export declare function addExecutionLogicToScalar(nonExecutableScalar: GraphQLScalarType, actualScalar: GraphQLScalarType): void;

package/typings/scalars.d.ts

@@ -1,2 +1,4 @@
+import { GraphQLScalarType } from 'graphql';
 export declare function isScalarType(type: string): boolean;
 export declare function getGraphQLScalar(scalarType: string): string;
+export declare function addExecutionLogicToScalar(nonExecutableScalar: GraphQLScalarType, actualScalar: GraphQLScalarType): void;