@restorecommerce/facade 1.1.2 → 1.1.4

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.4](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@1.1.3...@restorecommerce/facade@1.1.4) (2022-11-16)
+
+
+### Bug Fixes
+
+* command import ([fcbb6c1](https://github.com/restorecommerce/libs/commit/fcbb6c15b708fc63bf38d0dfa65946731cef3e79))
+
+
+
+
+
+## [1.1.3](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@1.1.2...@restorecommerce/facade@1.1.3) (2022-10-26)
+
+
+### Bug Fixes
+
+* **facade:** fix kafka events for commandInterfaceMeta, build error for lodash, migrated deprecated ApolloGateway serviceList with IntrospectAndCompose, replace deprecated buildFederatedSchema with buildSubgraphSchema ([6d8f4b3](https://github.com/restorecommerce/libs/commit/6d8f4b39a95a19db17075876bc766a6e65ce23d1))
+
+
+
+
+
 ## [1.1.2](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@1.1.1...@restorecommerce/facade@1.1.2) (2022-10-14)
 
 

package/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) n-fuse GmbH and other contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/gql/protos/federation.js

@@ -11,7 +11,7 @@ const buildFederatedSubscriptionSchema = (subServices, config, namespace, schema
     const resolvers = (0, resolvers_1.generateSubServiceResolvers)(subServices, config, namespace);
     // TODO There is currently no way of building a federated schema from GraphQLSchema Object
     // See https://github.com/apollographql/apollo-server/pull/4310
-    const federatedSchema = (0, federation_1.buildFederatedSchema)({
+    const federatedSchema = (0, federation_1.buildSubgraphSchema)({
         typeDefs: (0, apollo_server_koa_1.gql)((0, index_1.printSchema)(schema)),
         resolvers
     });

package/dist/index.js

@@ -26,7 +26,7 @@ const apollo_server_core_1 = require("apollo-server-core");
 const http_2 = require("http");
 const ws_1 = require("ws");
 const ws_2 = require("graphql-ws/lib/use/ws");
-const lodash_1 = require("lodash");
+const _ = require("lodash");
 const graphql_tools_1 = require("graphql-tools");
 const graphql_tag_1 = require("graphql-tag");
 const protos_1 = require("./gql/protos");
@@ -88,7 +88,7 @@ class RestoreCommerceFacade {
         }
         else if ('federatedSchema' in schema && 'resolvers' in schema) {
             this.apolloServices[name] = { schema: schema.federatedSchema, url };
-            this.allResolvers = lodash_1.default.merge(this.allResolvers, schema.resolvers);
+            this.allResolvers = _.merge(this.allResolvers, schema.resolvers);
         }
     }
     onStart(fn) {
@@ -166,7 +166,10 @@ class RestoreCommerceFacade {
         });
         const gateway = new gateway_1.ApolloGateway({
             logger: this.logger,
-            serviceList,
+            // serviceList,
+            supergraphSdl: new gateway_1.IntrospectAndCompose({
+                subgraphs: serviceList
+            }),
             debug: true,
             buildService: ({ name, url }) => {
                 var _a;

package/dist/modules/catalog/gql/federation.js

@@ -10,7 +10,7 @@ const types_1 = require("./types");
 const graphql_1 = require("graphql");
 // TODO There is currently no way of building a federated schema from GraphQLSchema Object
 // See https://github.com/apollographql/apollo-server/pull/4310
-const FederatedCatalogSchema = (cfg) => (0, federation_1.buildFederatedSchema)({
+const FederatedCatalogSchema = (cfg) => (0, federation_1.buildSubgraphSchema)({
     typeDefs: (0, apollo_server_koa_1.gql)((0, graphql_1.printSchema)((0, schema_1.schema)(cfg))),
     resolvers: (0, protos_1.generateSubServiceResolvers)(types_1.subServices, cfg, interfaces_1.namespace)
 });

package/dist/modules/facade-status/gql/index.js

@@ -8,7 +8,7 @@ const resolvers_1 = require("./resolvers");
 const schema_1 = require("./schema");
 // TODO There is currently no way of building a federated schema from GraphQLSchema Object
 // See https://github.com/apollographql/apollo-server/pull/4310
-exports.FederatedExampleSchema = (0, federation_1.buildFederatedSchema)({
+exports.FederatedExampleSchema = (0, federation_1.buildSubgraphSchema)({
     typeDefs: (0, apollo_server_koa_1.gql)((0, graphql_1.printSchema)(schema_1.schema)),
     resolvers: resolvers_1.resolvers
 });

package/dist/modules/fulfillment/gql/federation.js

@@ -10,7 +10,7 @@ const types_1 = require("./types");
 const graphql_1 = require("graphql");
 // TODO There is currently no way of building a federated schema from GraphQLSchema Object
 // See https://github.com/apollographql/apollo-server/pull/4310
-const FederatedFulfillmentSchema = (cfg) => (0, federation_1.buildFederatedSchema)({
+const FederatedFulfillmentSchema = (cfg) => (0, federation_1.buildSubgraphSchema)({
     typeDefs: (0, apollo_server_koa_1.gql)((0, graphql_1.printSchema)((0, schema_1.schema)(cfg))),
     resolvers: (0, protos_1.generateSubServiceResolvers)(types_1.subServices, cfg, interfaces_1.namespace)
 });

package/dist/modules/identity/api-key/api-key.js

@@ -4,11 +4,13 @@ exports.setupApiKey = exports.bootstrapApiKey = void 0;
 const uuid = require("uuid");
 const kafka_client_1 = require("@restorecommerce/kafka-client");
 const service_config_1 = require("@restorecommerce/service-config");
+const commandinterface_1 = require("@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/commandinterface");
 const Router = require('koa-router');
 const API_KEY_COMMAND_NAME = 'set_api_key';
 const API_KEY_COMMAND_EVENT = 'setApiKeyCommand';
 const API_KEY_COMMAND_RESPONSE = 'setApiKeyResponse';
 const COMMAND_TOPIC_NAME = 'io.restorecommerce.command';
+(0, kafka_client_1.registerProtoMeta)(commandinterface_1.protoMetadata);
 const exectueSetAPIKeyCommand = async (apiKey, logger) => {
     const cfg = (0, service_config_1.createServiceConfig)(process.cwd());
     if (apiKey && cfg.get('events:kafka')) {

package/dist/modules/indexing/gql/federation.js

@@ -10,7 +10,7 @@ const graphql_1 = require("graphql");
 const types_1 = require("../../access-control/gql/types");
 // TODO There is currently no way of building a federated schema from GraphQLSchema Object
 // See https://github.com/apollographql/apollo-server/pull/4310
-const FederatedIndexingSchema = (cfg) => (0, federation_1.buildFederatedSchema)({
+const FederatedIndexingSchema = (cfg) => (0, federation_1.buildSubgraphSchema)({
     typeDefs: (0, apollo_server_koa_1.gql)((0, graphql_1.printSchema)((0, schema_1.schema)(cfg))),
     resolvers: (0, protos_1.generateSubServiceResolvers)(types_1.subServices, cfg, interfaces_1.namespace)
 });

package/dist/modules/invoicing/gql/federation.js

@@ -10,7 +10,7 @@ const types_1 = require("./types");
 const graphql_1 = require("graphql");
 // TODO There is currently no way of building a federated schema from GraphQLSchema Object
 // See https://github.com/apollographql/apollo-server/pull/4310
-const FederatedInvoicingSchema = (cfg) => (0, federation_1.buildFederatedSchema)({
+const FederatedInvoicingSchema = (cfg) => (0, federation_1.buildSubgraphSchema)({
     typeDefs: (0, apollo_server_koa_1.gql)((0, graphql_1.printSchema)((0, schema_1.schema)(cfg))),
     resolvers: (0, protos_1.generateSubServiceResolvers)(types_1.subServices, cfg, interfaces_1.namespace)
 });

package/dist/modules/notification/gql/federation.js

@@ -10,7 +10,7 @@ const types_1 = require("./types");
 const graphql_1 = require("graphql");
 // TODO There is currently no way of building a federated schema from GraphQLSchema Object
 // See https://github.com/apollographql/apollo-server/pull/4310
-const FederatedNotificationSchema = (cfg) => (0, federation_1.buildFederatedSchema)({
+const FederatedNotificationSchema = (cfg) => (0, federation_1.buildSubgraphSchema)({
     typeDefs: (0, apollo_server_koa_1.gql)((0, graphql_1.printSchema)((0, schema_1.schema)(cfg))),
     resolvers: (0, protos_1.generateSubServiceResolvers)(types_1.subServices, cfg, interfaces_1.namespace)
 });

package/dist/modules/ordering/gql/federation.js

@@ -10,7 +10,7 @@ const types_1 = require("./types");
 const graphql_1 = require("graphql");
 // TODO There is currently no way of building a federated schema from GraphQLSchema Object
 // See https://github.com/apollographql/apollo-server/pull/4310
-const FederatedOrderingSchema = (cfg) => (0, federation_1.buildFederatedSchema)({
+const FederatedOrderingSchema = (cfg) => (0, federation_1.buildSubgraphSchema)({
     typeDefs: (0, apollo_server_koa_1.gql)((0, graphql_1.printSchema)((0, schema_1.schema)(cfg))),
     resolvers: (0, protos_1.generateSubServiceResolvers)(types_1.subServices, cfg, interfaces_1.namespace)
 });

package/dist/modules/ostorage/gql/federation.js

@@ -10,7 +10,7 @@ const types_1 = require("./types");
 const graphql_1 = require("graphql");
 // TODO There is currently no way of building a federated schema from GraphQLSchema Object
 // See https://github.com/apollographql/apollo-server/pull/4310
-const FederatedOstorageSchema = (cfg) => (0, federation_1.buildFederatedSchema)({
+const FederatedOstorageSchema = (cfg) => (0, federation_1.buildSubgraphSchema)({
     typeDefs: (0, apollo_server_koa_1.gql)((0, graphql_1.printSchema)((0, schema_1.schema)(cfg))),
     resolvers: (0, protos_1.generateSubServiceResolvers)(types_1.subServices, cfg, interfaces_1.namespace)
 });

package/dist/modules/payment/gql/federation.js

@@ -10,7 +10,7 @@ const types_1 = require("./types");
 const graphql_1 = require("graphql");
 // TODO There is currently no way of building a federated schema from GraphQLSchema Object
 // See https://github.com/apollographql/apollo-server/pull/4310
-const FederatedPaymentSchema = (cfg) => (0, federation_1.buildFederatedSchema)({
+const FederatedPaymentSchema = (cfg) => (0, federation_1.buildSubgraphSchema)({
     typeDefs: (0, apollo_server_koa_1.gql)((0, graphql_1.printSchema)((0, schema_1.schema)(cfg))),
     resolvers: (0, protos_1.generateSubServiceResolvers)(types_1.subServices, cfg, interfaces_1.namespace)
 });

package/dist/modules/resource/gql/federation.js

@@ -10,7 +10,7 @@ const types_1 = require("./types");
 const graphql_1 = require("graphql");
 // TODO There is currently no way of building a federated schema from GraphQLSchema Object
 // See https://github.com/apollographql/apollo-server/pull/4310
-const FederatedResourceSchema = (cfg) => (0, federation_1.buildFederatedSchema)({
+const FederatedResourceSchema = (cfg) => (0, federation_1.buildSubgraphSchema)({
     typeDefs: (0, apollo_server_koa_1.gql)((0, graphql_1.printSchema)((0, schema_1.schema)(cfg))),
     resolvers: (0, protos_1.generateSubServiceResolvers)(types_1.subServices, cfg, interfaces_1.namespace)
 });

package/dist/modules/resource/grpc/index.d.ts

@@ -23,5 +23,6 @@ export declare class ResourceSrvGrpcClient extends RestoreCommerceGrpcClient {
     readonly organization: organizationClient;
     readonly tax: taxClient;
     readonly tax_type: tax_typeClient;
+    readonly command: any;
     constructor(address: string, cfg: GrpcClientConfig);
 }

package/dist/modules/resource/grpc/index.js

@@ -13,6 +13,7 @@ const location_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/r
 const organization_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/organization");
 const tax_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/tax");
 const tax_type_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/tax_type");
+const command_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/command");
 class ResourceSrvGrpcClient extends rc_grpc_clients_1.RestoreCommerceGrpcClient {
     constructor(address, cfg) {
         super(address, cfg);
@@ -27,6 +28,7 @@ class ResourceSrvGrpcClient extends rc_grpc_clients_1.RestoreCommerceGrpcClient
         this.organization = this.createClient(cfg, organization_1.ServiceDefinition, this.channel);
         this.tax = this.createClient(cfg, tax_1.ServiceDefinition, this.channel);
         this.tax_type = this.createClient(cfg, tax_type_1.ServiceDefinition, this.channel);
+        this.command = this.createClient(cfg, command_1.ServiceDefinition, this.channel);
     }
 }
 exports.ResourceSrvGrpcClient = ResourceSrvGrpcClient;

package/dist/modules/scheduling/gql/federation.js

@@ -10,7 +10,7 @@ const types_1 = require("./types");
 const graphql_1 = require("graphql");
 // TODO There is currently no way of building a federated schema from GraphQLSchema Object
 // See https://github.com/apollographql/apollo-server/pull/4310
-const FederatedSchedulingSchema = (cfg) => (0, federation_1.buildFederatedSchema)({
+const FederatedSchedulingSchema = (cfg) => (0, federation_1.buildSubgraphSchema)({
     typeDefs: (0, apollo_server_koa_1.gql)((0, graphql_1.printSchema)((0, schema_1.schema)(cfg))),
     resolvers: (0, protos_1.generateSubServiceResolvers)(types_1.subServices, cfg, interfaces_1.namespace)
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@restorecommerce/facade",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Facade for Restorecommerce microservices",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -25,9 +25,9 @@
     "@grpc/grpc-js": "^1.7.1",
     "@grpc/proto-loader": "^0.7.3",
     "@restorecommerce/grpc-client": "^1.0.3",
-    "@restorecommerce/kafka-client": "^1.0.4",
+    "@restorecommerce/kafka-client": "^1.0.5",
     "@restorecommerce/logger": "^1.2.1",
-    "@restorecommerce/rc-grpc-clients": "^2.0.1",
+    "@restorecommerce/rc-grpc-clients": "^2.0.2",
     "@restorecommerce/service-config": "^1.0.3",
     "apollo-server-core": "^3.10.3",
     "apollo-server-koa": "^3.10.3",
@@ -130,5 +130,5 @@
       }
     }
   },
-  "gitHead": "d4ac2692c0d2552b209cd49a73afc754ccf6cdf3"
+  "gitHead": "2ec001696f611681778a13842a9e047f1db08059"
 }