@omnigraph/grpc 0.0.1-alpha-20241030124810-c0e8113edb4c8fd5b24bd53fd28ec5b664e9922e → 0.0.1-alpha-20241030131730-1359d5277c2d37355cd8bcfebf07b0160688def4

package/cjs/{gRPCLoader.js → grpcLoaderHelper.js}

@@ -1,32 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.gRPCLoader = void 0;
+exports.GrpcLoaderHelper = void 0;
 const tslib_1 = require("tslib");
+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 directives_js_1 = require("./directives.js");
-const grpc_js_1 = require("@grpc/grpc-js");
 const protobufjs_1 = tslib_1.__importDefault(require("protobufjs"));
-const string_interpolation_1 = require("@graphql-mesh/string-interpolation");
-const node_path_1 = require("node:path");
-const cross_helpers_1 = require("@graphql-mesh/cross-helpers");
-const globby_1 = tslib_1.__importDefault(require("globby"));
-const utils_js_1 = require("./utils.js");
-const utils_1 = require("@graphql-tools/utils");
 const index_js_1 = tslib_1.__importDefault(require("protobufjs/ext/descriptor/index.js"));
 const grpc_reflection_js_1 = require("@ardatan/grpc-reflection-js");
+const cross_helpers_1 = require("@graphql-mesh/cross-helpers");
+const string_interpolation_1 = require("@graphql-mesh/string-interpolation");
+const utils_1 = require("@graphql-tools/utils");
+const grpc_js_1 = require("@grpc/grpc-js");
 const disposablestack_1 = require("@whatwg-node/disposablestack");
+const directives_js_1 = require("./directives.js");
+const utils_js_1 = require("./utils.js");
 const { Root } = protobufjs_1.default;
 const QUERY_METHOD_PREFIXES = ['get', 'list', 'search'];
-class gRPCLoader {
+class GrpcLoaderHelper {
     constructor(subgraphName, baseDir, logger, config) {
         this.subgraphName = subgraphName;
         this.baseDir = baseDir;
         this.logger = logger;
         this.config = config;
         this.schemaComposer = new graphql_compose_1.SchemaComposer();
-        this.asyncDisposableStack = new disposablestack_1.AsyncDisposableStack;
+        this.asyncDisposableStack = new disposablestack_1.AsyncDisposableStack();
     }
     [Symbol.asyncDispose]() {
         return this.asyncDisposableStack.disposeAsync();
@@ -87,8 +86,8 @@ class gRPCLoader {
         this.logger.debug(`Building the final GraphQL Schema`);
         this.schemaComposer.addDirective(directives_js_1.transportDirective);
         const schema = this.schemaComposer.buildSchema();
-        const schemaExtensions = schema.extensions = schema.extensions || {};
-        const directiveExtensions = schemaExtensions.directives = schemaExtensions.directives || {};
+        const schemaExtensions = (schema.extensions = schema.extensions || {});
+        const directiveExtensions = (schemaExtensions.directives = schemaExtensions.directives || {});
         directiveExtensions.transport = {
             subgraph: this.subgraphName,
             kind: 'grpc',
@@ -108,11 +107,10 @@ class gRPCLoader {
         this.logger.debug(`Creating gRPC Reflection Client`);
         const reflectionClient = new grpc_reflection_js_1.Client(reflectionEndpoint, creds);
         this.asyncDisposableStack.defer(() => reflectionClient.grpcClient.close());
-        return reflectionClient.listServices().then(services => (services.filter(service => service && !service?.startsWith('grpc.'))
-            .map(service => {
+        return reflectionClient.listServices().then(services => services.filter(service => service && !service?.startsWith('grpc.')).map(service => {
             this.logger.debug(`Resolving root of Service: ${service} from the reflection response`);
             return reflectionClient.fileContainingSymbol(service);
-        })));
+        }));
     }
     async processDescriptorFile() {
         let fileName;
@@ -121,16 +119,16 @@ class gRPCLoader {
             fileName = this.config.source.file;
             options = {
                 ...this.config.source.load,
-                includeDirs: this.config.source.load.includeDirs?.map(includeDir => (0, node_path_1.isAbsolute)(includeDir) ? includeDir : (0, node_path_1.join)(this.baseDir, includeDir)),
+                includeDirs: this.config.source.load.includeDirs?.map(includeDir => cross_helpers_1.path.isAbsolute(includeDir) ? includeDir : cross_helpers_1.path.join(this.baseDir, includeDir)),
             };
         }
         else {
             fileName = this.config.source;
         }
         fileName = string_interpolation_1.stringInterpolator.parse(fileName, { env: process.env });
-        const absoluteFilePath = (0, node_path_1.isAbsolute)(fileName)
+        const absoluteFilePath = cross_helpers_1.path.isAbsolute(fileName)
             ? fileName
-            : (0, node_path_1.join)(this.baseDir, fileName);
+            : cross_helpers_1.path.join(this.baseDir, fileName);
         this.logger.debug(`Using the descriptor set from ${absoluteFilePath} `);
         const descriptorSetBuffer = await cross_helpers_1.fs.promises.readFile(absoluteFilePath);
         this.logger.debug(`Reading ${absoluteFilePath} `);
@@ -166,7 +164,7 @@ class gRPCLoader {
             options = {
                 ...options,
                 ...this.config.source.load,
-                includeDirs: this.config.source.load?.includeDirs?.map(includeDir => (0, node_path_1.isAbsolute)(includeDir) ? includeDir : (0, node_path_1.join)(this.baseDir, includeDir)),
+                includeDirs: this.config.source.load?.includeDirs?.map(includeDir => cross_helpers_1.path.isAbsolute(includeDir) ? includeDir : cross_helpers_1.path.join(this.baseDir, includeDir)),
             };
             if (options.includeDirs) {
                 if (!Array.isArray(options.includeDirs)) {
@@ -183,7 +181,7 @@ class gRPCLoader {
             cwd: this.baseDir,
         });
         this.logger.debug(`Loading proto files(${fileGlob}); \n ${fileNames.join('\n')} `);
-        protoRoot = await protoRoot.load(fileNames.map(filePath => (0, node_path_1.isAbsolute)(filePath) ? filePath : (0, node_path_1.join)(this.baseDir, filePath)), options);
+        protoRoot = await protoRoot.load(fileNames.map(filePath => cross_helpers_1.path.isAbsolute(filePath) ? filePath : cross_helpers_1.path.join(this.baseDir, filePath)), options);
         this.logger.debug(`Adding proto content to the root`);
         return protoRoot;
     }
@@ -222,20 +220,20 @@ class gRPCLoader {
         this.logger.debug(`Getting channel credentials`);
         if (this.config.credentialsSsl) {
             this.logger.debug(() => `Using SSL Connection with credentials at ${this.config.credentialsSsl.privateKey} & ${this.config.credentialsSsl.certChain}`);
-            const absolutePrivateKeyPath = (0, node_path_1.isAbsolute)(this.config.credentialsSsl.privateKey)
+            const absolutePrivateKeyPath = cross_helpers_1.path.isAbsolute(this.config.credentialsSsl.privateKey)
                 ? this.config.credentialsSsl.privateKey
-                : (0, node_path_1.join)(this.baseDir, this.config.credentialsSsl.privateKey);
-            const absoluteCertChainPath = (0, node_path_1.isAbsolute)(this.config.credentialsSsl.certChain)
+                : cross_helpers_1.path.join(this.baseDir, this.config.credentialsSsl.privateKey);
+            const absoluteCertChainPath = cross_helpers_1.path.isAbsolute(this.config.credentialsSsl.certChain)
                 ? this.config.credentialsSsl.certChain
-                : (0, node_path_1.join)(this.baseDir, this.config.credentialsSsl.certChain);
+                : cross_helpers_1.path.join(this.baseDir, this.config.credentialsSsl.certChain);
             const sslFiles = [
                 cross_helpers_1.fs.promises.readFile(absolutePrivateKeyPath),
                 cross_helpers_1.fs.promises.readFile(absoluteCertChainPath),
             ];
             if (this.config.credentialsSsl.rootCA !== 'rootCA') {
-                const absoluteRootCAPath = (0, node_path_1.isAbsolute)(this.config.credentialsSsl.rootCA)
+                const absoluteRootCAPath = cross_helpers_1.path.isAbsolute(this.config.credentialsSsl.rootCA)
                     ? this.config.credentialsSsl.rootCA
-                    : (0, node_path_1.join)(this.baseDir, this.config.credentialsSsl.rootCA);
+                    : cross_helpers_1.path.join(this.baseDir, this.config.credentialsSsl.rootCA);
                 sslFiles.unshift(cross_helpers_1.fs.promises.readFile(absoluteRootCAPath));
             }
             return Promise.all(sslFiles).then(([rootCA, privateKey, certChain]) => grpc_js_1.credentials.createSsl(rootCA, privateKey, certChain));
@@ -463,4 +461,4 @@ class gRPCLoader {
         }
     }
 }
-exports.gRPCLoader = gRPCLoader;
+exports.GrpcLoaderHelper = GrpcLoaderHelper;

package/cjs/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadGrpcSubgraph = loadGrpcSubgraph;
-const gRPCLoader_1 = require("./gRPCLoader");
+const grpcLoaderHelper_js_1 = require("./grpcLoaderHelper.js");
 function loadGrpcSubgraph(name, options) {
     return (ctx) => ({
         name,
-        schema$: new gRPCLoader_1.gRPCLoader(name, ctx.cwd, ctx.logger, options).buildSchema(),
+        schema$: new grpcLoaderHelper_js_1.GrpcLoaderHelper(name, ctx.cwd, ctx.logger, options).buildSchema(),
     });
 }

package/esm/{gRPCLoader.js → grpcLoaderHelper.js}

@@ -1,28 +1,27 @@
-import { specifiedDirectives } from "graphql";
-import { SchemaComposer } from "graphql-compose";
-import { GraphQLBigInt, GraphQLByte, GraphQLUnsignedInt, GraphQLVoid, GraphQLJSON } from "graphql-scalars";
-import { EnumDirective, grpcConnectivityStateDirective, grpcMethodDirective, grpcRootJsonDirective, transportDirective } from "./directives.js";
-import { credentials } from '@grpc/grpc-js';
+import globby from 'globby';
+import { specifiedDirectives } from 'graphql';
+import { SchemaComposer, } from 'graphql-compose';
+import { GraphQLBigInt, GraphQLByte, GraphQLJSON, GraphQLUnsignedInt, GraphQLVoid, } from 'graphql-scalars';
 import protobufjs from 'protobufjs';
-import { stringInterpolator } from '@graphql-mesh/string-interpolation';
-import { isAbsolute, join } from "node:path";
-import { fs } from "@graphql-mesh/cross-helpers";
-import globby from "globby";
-import { addIncludePathResolver, getTypeName, walkToFindTypePath } from "./utils.js";
-import { GraphQLStreamDirective } from "@graphql-tools/utils";
 import descriptor from 'protobufjs/ext/descriptor/index.js';
 import { Client } from '@ardatan/grpc-reflection-js';
+import { fs, path } from '@graphql-mesh/cross-helpers';
+import { stringInterpolator } from '@graphql-mesh/string-interpolation';
+import { GraphQLStreamDirective } from '@graphql-tools/utils';
+import { credentials } from '@grpc/grpc-js';
 import { AsyncDisposableStack } from '@whatwg-node/disposablestack';
+import { EnumDirective, grpcConnectivityStateDirective, grpcMethodDirective, grpcRootJsonDirective, transportDirective, } from './directives.js';
+import { addIncludePathResolver, getTypeName, walkToFindTypePath } from './utils.js';
 const { Root } = protobufjs;
 const QUERY_METHOD_PREFIXES = ['get', 'list', 'search'];
-export class gRPCLoader {
+export class GrpcLoaderHelper {
     constructor(subgraphName, baseDir, logger, config) {
         this.subgraphName = subgraphName;
         this.baseDir = baseDir;
         this.logger = logger;
         this.config = config;
         this.schemaComposer = new SchemaComposer();
-        this.asyncDisposableStack = new AsyncDisposableStack;
+        this.asyncDisposableStack = new AsyncDisposableStack();
     }
     [Symbol.asyncDispose]() {
         return this.asyncDisposableStack.disposeAsync();
@@ -83,8 +82,8 @@ export class gRPCLoader {
         this.logger.debug(`Building the final GraphQL Schema`);
         this.schemaComposer.addDirective(transportDirective);
         const schema = this.schemaComposer.buildSchema();
-        const schemaExtensions = schema.extensions = schema.extensions || {};
-        const directiveExtensions = schemaExtensions.directives = schemaExtensions.directives || {};
+        const schemaExtensions = (schema.extensions = schema.extensions || {});
+        const directiveExtensions = (schemaExtensions.directives = schemaExtensions.directives || {});
         directiveExtensions.transport = {
             subgraph: this.subgraphName,
             kind: 'grpc',
@@ -104,11 +103,10 @@ export class gRPCLoader {
         this.logger.debug(`Creating gRPC Reflection Client`);
         const reflectionClient = new Client(reflectionEndpoint, creds);
         this.asyncDisposableStack.defer(() => reflectionClient.grpcClient.close());
-        return reflectionClient.listServices().then(services => (services.filter(service => service && !service?.startsWith('grpc.'))
-            .map(service => {
+        return reflectionClient.listServices().then(services => services.filter(service => service && !service?.startsWith('grpc.')).map(service => {
             this.logger.debug(`Resolving root of Service: ${service} from the reflection response`);
             return reflectionClient.fileContainingSymbol(service);
-        })));
+        }));
     }
     async processDescriptorFile() {
         let fileName;
@@ -117,16 +115,16 @@ export class gRPCLoader {
             fileName = this.config.source.file;
             options = {
                 ...this.config.source.load,
-                includeDirs: this.config.source.load.includeDirs?.map(includeDir => isAbsolute(includeDir) ? includeDir : join(this.baseDir, includeDir)),
+                includeDirs: this.config.source.load.includeDirs?.map(includeDir => path.isAbsolute(includeDir) ? includeDir : path.join(this.baseDir, includeDir)),
             };
         }
         else {
             fileName = this.config.source;
         }
         fileName = stringInterpolator.parse(fileName, { env: process.env });
-        const absoluteFilePath = isAbsolute(fileName)
+        const absoluteFilePath = path.isAbsolute(fileName)
             ? fileName
-            : join(this.baseDir, fileName);
+            : path.join(this.baseDir, fileName);
         this.logger.debug(`Using the descriptor set from ${absoluteFilePath} `);
         const descriptorSetBuffer = await fs.promises.readFile(absoluteFilePath);
         this.logger.debug(`Reading ${absoluteFilePath} `);
@@ -162,7 +160,7 @@ export class gRPCLoader {
             options = {
                 ...options,
                 ...this.config.source.load,
-                includeDirs: this.config.source.load?.includeDirs?.map(includeDir => isAbsolute(includeDir) ? includeDir : join(this.baseDir, includeDir)),
+                includeDirs: this.config.source.load?.includeDirs?.map(includeDir => path.isAbsolute(includeDir) ? includeDir : path.join(this.baseDir, includeDir)),
             };
             if (options.includeDirs) {
                 if (!Array.isArray(options.includeDirs)) {
@@ -179,7 +177,7 @@ export class gRPCLoader {
             cwd: this.baseDir,
         });
         this.logger.debug(`Loading proto files(${fileGlob}); \n ${fileNames.join('\n')} `);
-        protoRoot = await protoRoot.load(fileNames.map(filePath => isAbsolute(filePath) ? filePath : join(this.baseDir, filePath)), options);
+        protoRoot = await protoRoot.load(fileNames.map(filePath => path.isAbsolute(filePath) ? filePath : path.join(this.baseDir, filePath)), options);
         this.logger.debug(`Adding proto content to the root`);
         return protoRoot;
     }
@@ -218,20 +216,20 @@ export class gRPCLoader {
         this.logger.debug(`Getting channel credentials`);
         if (this.config.credentialsSsl) {
             this.logger.debug(() => `Using SSL Connection with credentials at ${this.config.credentialsSsl.privateKey} & ${this.config.credentialsSsl.certChain}`);
-            const absolutePrivateKeyPath = isAbsolute(this.config.credentialsSsl.privateKey)
+            const absolutePrivateKeyPath = path.isAbsolute(this.config.credentialsSsl.privateKey)
                 ? this.config.credentialsSsl.privateKey
-                : join(this.baseDir, this.config.credentialsSsl.privateKey);
-            const absoluteCertChainPath = isAbsolute(this.config.credentialsSsl.certChain)
+                : path.join(this.baseDir, this.config.credentialsSsl.privateKey);
+            const absoluteCertChainPath = path.isAbsolute(this.config.credentialsSsl.certChain)
                 ? this.config.credentialsSsl.certChain
-                : join(this.baseDir, this.config.credentialsSsl.certChain);
+                : path.join(this.baseDir, this.config.credentialsSsl.certChain);
             const sslFiles = [
                 fs.promises.readFile(absolutePrivateKeyPath),
                 fs.promises.readFile(absoluteCertChainPath),
             ];
             if (this.config.credentialsSsl.rootCA !== 'rootCA') {
-                const absoluteRootCAPath = isAbsolute(this.config.credentialsSsl.rootCA)
+                const absoluteRootCAPath = path.isAbsolute(this.config.credentialsSsl.rootCA)
                     ? this.config.credentialsSsl.rootCA
-                    : join(this.baseDir, this.config.credentialsSsl.rootCA);
+                    : path.join(this.baseDir, this.config.credentialsSsl.rootCA);
                 sslFiles.unshift(fs.promises.readFile(absoluteRootCAPath));
             }
             return Promise.all(sslFiles).then(([rootCA, privateKey, certChain]) => credentials.createSsl(rootCA, privateKey, certChain));

package/esm/index.js

@@ -1,7 +1,7 @@
-import { gRPCLoader } from "./gRPCLoader";
+import { GrpcLoaderHelper } from './grpcLoaderHelper.js';
 export function loadGrpcSubgraph(name, options) {
     return (ctx) => ({
         name,
-        schema$: new gRPCLoader(name, ctx.cwd, ctx.logger, options).buildSchema(),
+        schema$: new GrpcLoaderHelper(name, ctx.cwd, ctx.logger, options).buildSchema(),
     });
 }

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "@omnigraph/grpc",
-  "version": "0.0.1-alpha-20241030124810-c0e8113edb4c8fd5b24bd53fd28ec5b664e9922e",
+  "version": "0.0.1-alpha-20241030131730-1359d5277c2d37355cd8bcfebf07b0160688def4",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "*"
   },
   "dependencies": {
     "@ardatan/grpc-reflection-js": "^0.0.2",
+    "@graphql-mesh/cross-helpers": "^0.4.7",
     "@graphql-mesh/string-interpolation": "^0.5.6",
-    "@graphql-mesh/transport-common": "0.7.12-alpha-20241030124810-c0e8113edb4c8fd5b24bd53fd28ec5b664e9922e",
+    "@graphql-mesh/transport-common": "0.7.12-alpha-20241030131730-1359d5277c2d37355cd8bcfebf07b0160688def4",
     "@graphql-tools/utils": "^10.5.5",
     "@grpc/grpc-js": "^1.1.7",
     "@whatwg-node/disposablestack": "^0.0.5",

package/typings/{gRPCLoader.d.cts → grpcLoaderHelper.d.cts}

@@ -1,8 +1,8 @@
-import type { Logger, YamlConfig } from "@graphql-mesh/types";
-import { type ChannelCredentials } from '@grpc/grpc-js';
 import protobufjs, { type AnyNestedObject } from 'protobufjs';
-import { type MaybePromise } from "@graphql-tools/utils";
-export declare class gRPCLoader implements AsyncDisposable {
+import type { Logger, YamlConfig } from '@graphql-mesh/types';
+import { type MaybePromise } from '@graphql-tools/utils';
+import { type ChannelCredentials } from '@grpc/grpc-js';
+export declare class GrpcLoaderHelper implements AsyncDisposable {
     private subgraphName;
     private baseDir;
     private logger;

package/typings/{gRPCLoader.d.ts → grpcLoaderHelper.d.ts}

@@ -1,8 +1,8 @@
-import type { Logger, YamlConfig } from "@graphql-mesh/types";
-import { type ChannelCredentials } from '@grpc/grpc-js';
 import protobufjs, { type AnyNestedObject } from 'protobufjs';
-import { type MaybePromise } from "@graphql-tools/utils";
-export declare class gRPCLoader implements AsyncDisposable {
+import type { Logger, YamlConfig } from '@graphql-mesh/types';
+import { type MaybePromise } from '@graphql-tools/utils';
+import { type ChannelCredentials } from '@grpc/grpc-js';
+export declare class GrpcLoaderHelper implements AsyncDisposable {
     private subgraphName;
     private baseDir;
     private logger;

package/typings/index.d.cts

@@ -1,4 +1,4 @@
-import type { Logger, YamlConfig } from "@graphql-mesh/types";
+import type { Logger, YamlConfig } from '@graphql-mesh/types';
 interface LoaderContext {
     cwd: string;
     logger: Logger;

package/typings/index.d.ts

@@ -1,4 +1,4 @@
-import type { Logger, YamlConfig } from "@graphql-mesh/types";
+import type { Logger, YamlConfig } from '@graphql-mesh/types';
 interface LoaderContext {
     cwd: string;
     logger: Logger;