@restorecommerce/facade 1.1.4 → 1.1.5

package/CHANGELOG.md

@@ -3,6 +3,32 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.5](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@1.1.4...@restorecommerce/facade@1.1.5) (2023-05-22)
+
+
+### Bug Fixes
+
+* **acs-client:** fix test imports ([3a092ef](https://github.com/restorecommerce/libs/commit/3a092ef3e34b45df0c121c3fef3f8a51d99acb96))
+* **facade:** build error for null field ([aa7f405](https://github.com/restorecommerce/libs/commit/aa7f405aa3940be8d75abd3e10c6f29a19688d09))
+* **facade:** downgrade nanoid, import koa-body, match test to object ([d05cee1](https://github.com/restorecommerce/libs/commit/d05cee10c7d631d54b5466e6122fee769505a6da))
+* **facade:** fixed sub service name space ([f3266e7](https://github.com/restorecommerce/libs/commit/f3266e7461c7bb2db0a7be05fb79ff132f062ec5))
+* **facade:** regenerated schema for changes in protos ([0da0851](https://github.com/restorecommerce/libs/commit/0da08515e4e1d05482d5881cbfe55523fc7fa368))
+* **facade:** renamed service in protos and removed service names options from proto files, fixed typing issues. ([25a24f0](https://github.com/restorecommerce/libs/commit/25a24f063e2499c06c171f1265297500816879f2))
+* **facade:** restore facade code-gen to previous working version ([294a55f](https://github.com/restorecommerce/libs/commit/294a55f7135aa4b072fdecefbd33baed9efeb4ca))
+* **facade:** unit test ([748ab00](https://github.com/restorecommerce/libs/commit/748ab00483fa1893aa50006795c654834a7ffb57))
+* failed unit tests ([0f06228](https://github.com/restorecommerce/libs/commit/0f062288ad929303a9544a3d30357b666dec555c))
+* **protos:** restore nested attribute as its referenced in obligation masked properties in ACS ([d6536f9](https://github.com/restorecommerce/libs/commit/d6536f96dfc30eb1905c899af519d50778e2edee))
+* **rc-grpc-clients, facade:** WIP optional fields ([98f0977](https://github.com/restorecommerce/libs/commit/98f097730503bd0fa021bc886ba55d477dafb89f))
+
+
+### Reverts
+
+* Revert "chore: upgrade Apollo Server 4" ([90464f2](https://github.com/restorecommerce/libs/commit/90464f2ba77261406718a76d4a854ff7cbcfedf2))
+
+
+
+
+
 ## [1.1.4](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@1.1.3...@restorecommerce/facade@1.1.4) (2022-11-16)
 
 

package/codegen/index.js

@@ -15,7 +15,8 @@ async function generateSchemaTypings({ schema, outputFile, typescript, typescrip
             plugins: [
                 {
                     typescript: {
-                        maybeValue: 'T | undefined',
+                        maybeValue: 'T | null | undefined',
+                        inputMaybeValue: 'T | null | undefined',
                         ...(typescript !== null && typescript !== void 0 ? typescript : {})
                     },
                 },

package/dist/gql/protos/federation.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeSubscribeIntoSchema = exports.buildFederatedSubscriptionSchema = void 0;
 const federation_1 = require("@apollo/federation");
-const apollo_server_koa_1 = require("apollo-server-koa");
+const graphql_tag_1 = require("graphql-tag");
 const index_1 = require("graphql/index");
 const graphql_1 = require("graphql");
 const definition_1 = require("graphql/type/definition");
@@ -12,7 +12,7 @@ const buildFederatedSubscriptionSchema = (subServices, config, namespace, schema
     // 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.buildSubgraphSchema)({
-        typeDefs: (0, apollo_server_koa_1.gql)((0, index_1.printSchema)(schema)),
+        typeDefs: (0, graphql_tag_1.default)((0, index_1.printSchema)(schema)),
         resolvers
     });
     return {

package/dist/gql/protos/registry.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTyping = exports.registerEnumTyping = exports.registerTyping = exports.recursiveEnumCheck = exports.getNameSpaceTypeName = exports.getRegisteredEnumTypings = exports.registerPackagesRecursive = exports.clearRegistry = exports.IGoogleProtobufAny = exports.scalarTypes = exports.registeredTypings = void 0;
 const graphql_1 = require("graphql");
 const definition_1 = require("graphql/type/definition");
-const graphql_upload_1 = require("graphql-upload");
+const GraphQLUpload = require('graphql-upload/GraphQLUpload.js');
 const utils_1 = require("./utils");
 const types_1 = require("./types");
 const ts_proto_descriptors_1 = require("ts-proto-descriptors");
@@ -349,7 +349,7 @@ const resolveMeta = (key, field, rootObjType, objName, input) => {
             break;
         case ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_BYTES:
             if (input) {
-                result = graphql_upload_1.GraphQLUpload;
+                result = GraphQLUpload;
                 break;
             }
             // TODO Output Buffer

package/dist/gql/protos/resolvers.d.ts

@@ -1,8 +1,8 @@
 import { ProtoMetadata, ServiceClient, ServiceConfig, SubSpaceServiceConfig } from './types';
 import { ServiceDescriptorProto } from 'ts-proto-descriptors';
 import { GraphQLResolveInfo } from 'graphql';
-export declare type ResolverFn<TResult, TParent, TContext, TArgs> = (parent: TParent, args: TArgs, context: TContext, info: GraphQLResolveInfo) => Promise<TResult> | TResult;
-export declare type SubscribeResolverFn<TResult, TParent, TContext, TArgs> = (parent: TParent, args: TArgs, context: TContext, info: GraphQLResolveInfo) => AsyncGenerator<TResult>;
+export type ResolverFn<TResult, TParent, TContext, TArgs> = (parent: TParent, args: TArgs, context: TContext, info: GraphQLResolveInfo) => Promise<TResult> | TResult;
+export type SubscribeResolverFn<TResult, TParent, TContext, TArgs> = (parent: TParent, args: TArgs, context: TContext, info: GraphQLResolveInfo) => AsyncGenerator<TResult>;
 export declare const getGQLResolverFunctions: <T extends Record<string, any>, CTX extends ServiceClient<CTX, keyof CTX, T>, SRV = any, R = ResolverFn<any, any, ServiceClient<CTX, keyof CTX, T>, any>, B extends keyof T = any, NS extends keyof CTX = any>(service: ServiceDescriptorProto, key: NS, serviceKey: B, cfg: ServiceConfig) => { [key in keyof SRV]: R; };
 export declare const registerResolverFunction: <T extends Record<string, any>, CTX extends ServiceClient<CTX, keyof CTX, T>>(namespace: string, name: string, func: ResolverFn<any, any, ServiceClient<CTX, keyof CTX, T>, any>, mutation?: boolean, subspace?: string | undefined, service?: ServiceDescriptorProto) => void;
 export declare const generateResolver: (...namespaces: string[]) => any;

package/dist/gql/protos/resolvers.js

@@ -261,8 +261,9 @@ const generateSubServiceResolvers = (subServices, config, namespace) => {
     subServices.forEach((meta) => {
         var _a;
         meta.fileDescriptor.service.forEach(service => {
-            if (meta.options && meta.options.services && meta.options.services[service.name]) {
-                const subName = meta.options.services[service.name].options['service_name'];
+            if (service.name) {
+                // strip Service from end of String for sub service name
+                const subName = (0, utils_1.getServiceName)(service.name);
                 const { mutations, queries } = (0, graphql_1.getWhitelistBlacklistConfig)(service, config, meta, subName);
                 const func = (0, exports.getGQLResolverFunctions)(service, namespace, subName || namespace, config);
                 Object.keys(func).forEach(k => {
@@ -354,11 +355,11 @@ const generateSubServiceResolvers = (subServices, config, namespace) => {
     if (config.root) {
         return (0, exports.generateResolver)(...(0, array_prototype_flat_1.default)(subServices.map(meta => {
             return meta.fileDescriptor.service.map(service => {
-                if (meta.options && meta.options.services && meta.options.services[service.name]) {
-                    return meta.options.services[service.name].options['service_name'];
+                if (service.name) {
+                    return (0, utils_1.getServiceName)(service.name);
                 }
-                return null;
-            }).filter(s => s !== null);
+                return '';
+            }).filter(s => s !== '');
         })));
     }
     const finalResolver = (0, exports.generateResolver)(namespace);

package/dist/gql/protos/schema.d.ts

@@ -4,7 +4,7 @@ import { GraphQLSchema, ThunkObjMap } from 'graphql';
 import { GraphQLFieldConfig, GraphQLFieldConfigMap } from 'graphql/type/definition';
 export declare const getGQLSchema: <TSource, TContext>(method: MethodDescriptorProto) => GraphQLFieldConfig<TSource, TContext, any>;
 export declare const getGQLSchemas: <TSource, TContext>(service: ServiceDescriptorProto) => GraphQLFieldConfigMap<TSource, TContext>;
-declare type SchemaBaseOrSub = ThunkObjMap<GraphQLFieldConfig<any, any>> | Map<string, ThunkObjMap<GraphQLFieldConfig<any, any>>>;
+type SchemaBaseOrSub = ThunkObjMap<GraphQLFieldConfig<any, any>> | Map<string, ThunkObjMap<GraphQLFieldConfig<any, any>>>;
 export declare const registerResolverSchema: (namespace: string, name: string, schema: SchemaBaseOrSub, mutation: boolean | undefined, subspace: string | undefined, config: ServiceConfig) => void;
 export declare const generateSchema: (setup: {
     prefix: string;

package/dist/gql/protos/schema.js

@@ -189,8 +189,8 @@ const generateSubServiceSchemas = (subServices, config, namespace, prefix) => {
     subServices.forEach((meta) => {
         var _a;
         meta.fileDescriptor.service.forEach(service => {
-            if (meta.options && meta.options.services && meta.options.services[service.name]) {
-                const subName = meta.options.services[service.name].options['service_name'];
+            if (service.name) {
+                const subName = (0, utils_1.getServiceName)(service.name);
                 const { mutations, queries } = (0, graphql_2.getWhitelistBlacklistConfig)(service, config, meta, subName);
                 const schemas = (0, exports.getGQLSchemas)(service);
                 Object.keys(schemas).forEach(key => {
@@ -218,8 +218,8 @@ const generateSubServiceSchemas = (subServices, config, namespace, prefix) => {
     if (config.root) {
         return (0, exports.generateSchema)((0, array_prototype_flat_1.default)(subServices.map(meta => {
             return meta.fileDescriptor.service.map(service => {
-                if (meta.options && meta.options.services && meta.options.services[service.name]) {
-                    const subName = meta.options.services[service.name].options['service_name'];
+                if (service.name) {
+                    const subName = (0, utils_1.getServiceName)(service.name);
                     return {
                         prefix: prefix + subName.substring(0, 1).toUpperCase() + subName.substring(1).toLowerCase(),
                         namespace: subName

package/dist/gql/protos/types.d.ts

@@ -12,7 +12,7 @@ export interface GraphQLResolverMap<TContext = {}> {
     };
 }
 export declare const authSubjectType = ".io.restorecommerce.auth.Subject";
-export declare type ProtoMetaMessageOptions = {
+export type ProtoMetaMessageOptions = {
     options?: {
         [key: string]: any;
     };
@@ -85,12 +85,12 @@ export interface ServiceConfig {
 export interface SubSpaceServiceConfig extends ServiceConfig {
     root: boolean;
 }
-export declare type ServiceClient<Context extends Pick<Context, Key>, Key extends keyof Context, T extends Record<string, any>> = {
+export type ServiceClient<Context extends Pick<Context, Key>, Key extends keyof Context, T extends Record<string, any>> = {
     [V in Key]: {
         client: T;
     };
 };
-export declare type FederatedSchemaWithResolvers = {
+export type FederatedSchemaWithResolvers = {
     federatedSchema: GraphQLSchema;
     resolvers: GraphQLResolverMap<any>;
 };

package/dist/gql/protos/utils.d.ts

@@ -10,6 +10,8 @@ export declare const decodeBufferFields: (items: any[], bufferFields: string[])
  */
 export declare const convertEnumToInt: (inputTyping: TypingData, req: any) => any;
 export declare const snakeToCamel: (s: string) => string;
+export declare const camelToSnake: (serviceName: string) => string;
+export declare const getServiceName: (serviceName: string) => string;
 export declare const capitalize: (s: string) => string;
 export declare function camelCase(s: string): string;
 export declare let useSubscriptions: boolean;

package/dist/gql/protos/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setUseSubscriptions = exports.useSubscriptions = exports.camelCase = exports.capitalize = exports.snakeToCamel = exports.convertEnumToInt = exports.decodeBufferFields = exports.getKeys = exports.convertyCamelToSnakeCase = exports.capitalizeProtoName = void 0;
+exports.setUseSubscriptions = exports.useSubscriptions = exports.camelCase = exports.capitalize = exports.getServiceName = exports.camelToSnake = exports.snakeToCamel = exports.convertEnumToInt = exports.decodeBufferFields = exports.getKeys = exports.convertyCamelToSnakeCase = exports.capitalizeProtoName = void 0;
 const _ = require("lodash");
 const registry_1 = require("./registry");
 const capitalizeProtoName = (name) => {
@@ -126,6 +126,16 @@ const snakeToCamel = (s) => {
         .join('');
 };
 exports.snakeToCamel = snakeToCamel;
+const camelToSnake = (serviceName) => {
+    // convert camel case to snake case
+    serviceName = serviceName.replace(/(?:^|\.?)([A-Z])/g, (x, y) => { return '_' + y.toLowerCase(); }).replace(/^_/, '');
+    return serviceName;
+};
+exports.camelToSnake = camelToSnake;
+const getServiceName = (serviceName) => {
+    return serviceName.endsWith('Service') ? (0, exports.camelToSnake)(serviceName.substr(0, serviceName.length - 7)) : (0, exports.camelToSnake)(serviceName);
+};
+exports.getServiceName = getServiceName;
 const capitalize = (s) => {
     return s.substring(0, 1).toUpperCase() + s.substring(1);
 };

package/dist/index.d.ts

@@ -1,10 +1,8 @@
-/// <reference types="koa-bodyparser" />
-/// <reference types="koa-websocket" />
 /// <reference types="node" />
 /// <reference types="node" />
-import Koa from 'koa';
 import { Logger } from 'winston';
 import { Server, ServerResponse } from 'http';
+import Koa from "koa";
 import { AddressInfo } from 'net';
 import { Facade, FacadeBaseContext, FacadeModule, FacadeModuleBase, FacadeModulesContext } from './interfaces';
 import { KafkaProviderConfig } from '@restorecommerce/kafka-client';

package/dist/index.js

@@ -15,14 +15,18 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFacade = exports.RestoreCommerceFacade = void 0;
-const koa_1 = require("koa");
 const logger_1 = require("@restorecommerce/logger");
 const http_1 = require("http");
-const apollo_server_koa_1 = require("apollo-server-koa");
+const koa_1 = require("koa");
+const bodyParser = require('koa-bodyparser');
+const cors = require('@koa/cors');
+const server_1 = require("@apollo/server");
+const koa_2 = require("@as-integrations/koa");
 const graphql_1 = require("graphql");
 const gateway_1 = require("@apollo/gateway");
 const modules_1 = require("./modules");
-const apollo_server_core_1 = require("apollo-server-core");
+const drainHttpServer_1 = require("@apollo/server/plugin/drainHttpServer");
+const default_1 = require("@apollo/server/plugin/landingPage/default");
 const http_2 = require("http");
 const ws_1 = require("ws");
 const ws_2 = require("graphql-ws/lib/use/ws");
@@ -201,7 +205,7 @@ class RestoreCommerceFacade {
                 subscription: schemaContext.apiSchema.getSubscriptionType()
             }));
             let schema = (0, graphql_tools_1.makeExecutableSchema)({
-                typeDefs: (0, graphql_tag_1.gql)(typeDefs + `
+                typeDefs: (0, graphql_tag_1.default)(typeDefs + `
         type Query { sample: String }
         `),
                 resolvers: {
@@ -225,12 +229,13 @@ class RestoreCommerceFacade {
                 },
             }, wsServer);
         });
-        const gqlServer = new apollo_server_koa_1.ApolloServer({
+        const gqlServer = new server_1.ApolloServer({
             gateway,
             introspection: true,
+            allowBatchedHttpRequests: true,
             plugins: [
-                (0, apollo_server_core_1.ApolloServerPluginDrainHttpServer)({ httpServer: this._server }),
-                (0, apollo_server_core_1.ApolloServerPluginLandingPageLocalDefault)({
+                (0, drainHttpServer_1.ApolloServerPluginDrainHttpServer)({ httpServer: this._server }),
+                (0, default_1.ApolloServerPluginLandingPageLocalDefault)({
                     embed: true
                 }),
                 {
@@ -243,27 +248,23 @@ class RestoreCommerceFacade {
                     },
                 },
             ],
-            debug: true,
+            includeStacktraceInErrorResponses: true,
             formatError: (error) => {
                 this.logger.error('Error while processing request', { message: error.message });
                 this.logger.debug('Error while processing request', { error });
                 return {
                     message: error.message,
                     locations: error.locations,
-                    stack: error.stack,
+                    stack: error
                 };
             },
-            context: ({ ctx }) => ctx
         });
         await gqlServer.start();
-        const middleware = gqlServer.getMiddleware({
-            path: '/graphql',
-            cors: true,
-            bodyParserConfig: {
-                jsonLimit: '10mb'
-            },
-        });
-        this.koa.use(middleware);
+        this.koa.use(cors());
+        this.koa.use(bodyParser());
+        this.koa.use((0, koa_2.koaMiddleware)(gqlServer, {
+            context: async ({ ctx }) => ctx,
+        }));
     }
 }
 exports.RestoreCommerceFacade = RestoreCommerceFacade;

package/dist/interfaces.d.ts

@@ -1,12 +1,11 @@
 /// <reference types="koa-websocket" />
-/// <reference types="koa-bodyparser" />
 /// <reference types="node" />
 /// <reference types="node" />
 import Koa from 'koa';
 import { Logger } from 'winston';
 import { Server } from 'http';
 import { AddressInfo } from 'net';
-declare type RequireAtLeastOne<T, Keys extends keyof T> = Pick<T, Exclude<keyof T, Keys>> & {
+type RequireAtLeastOne<T, Keys extends keyof T> = Pick<T, Exclude<keyof T, Keys>> & {
     [K in Keys]-?: Required<Pick<T, K>> & Partial<Pick<T, Exclude<Keys, K>>>;
 }[Keys];
 export interface FacadeBaseContext extends Koa.Context {
@@ -22,9 +21,9 @@ export interface FacadeModule<TContext extends FacadeBaseContext = FacadeBaseCon
 export interface FacadeModuleFactory<TConfig = any, TContext extends FacadeBaseContext = FacadeBaseContext> extends FacadeModuleBase<TContext> {
     (config: TConfig): FacadeModule<TContext>;
 }
-export declare type ExtractModuleContext<TModule> = TModule extends FacadeModuleFactory<infer TConfig, infer TContext> ? TContext : TModule extends FacadeModule<infer TContext> ? TContext : never;
-export declare type FacadeModulesContext<T extends FacadeModuleBase[]> = (T[0] extends FacadeModuleBase ? ExtractModuleContext<T[0]> : FacadeBaseContext) & (T[1] extends FacadeModuleBase ? ExtractModuleContext<T[1]> : FacadeBaseContext) & (T[2] extends FacadeModuleBase ? ExtractModuleContext<T[2]> : FacadeBaseContext) & (T[3] extends FacadeModuleBase ? ExtractModuleContext<T[3]> : FacadeBaseContext) & (T[4] extends FacadeModuleBase ? ExtractModuleContext<T[4]> : FacadeBaseContext) & (T[5] extends FacadeModuleBase ? ExtractModuleContext<T[5]> : FacadeBaseContext) & (T[6] extends FacadeModuleBase ? ExtractModuleContext<T[6]> : FacadeBaseContext) & (T[7] extends FacadeModuleBase ? ExtractModuleContext<T[7]> : FacadeBaseContext) & (T[8] extends FacadeModuleBase ? ExtractModuleContext<T[8]> : FacadeBaseContext) & (T[9] extends FacadeModuleBase ? ExtractModuleContext<T[9]> : FacadeBaseContext);
-export declare type FacadeContext<T extends FacadeModuleBase[] | Facade<any> = []> = T extends FacadeModuleBase[] ? FacadeModulesContext<T> : T extends Facade<infer TFacadeModules> ? FacadeModulesContext<TFacadeModules> : FacadeBaseContext;
+export type ExtractModuleContext<TModule> = TModule extends FacadeModuleFactory<infer TConfig, infer TContext> ? TContext : TModule extends FacadeModule<infer TContext> ? TContext : never;
+export type FacadeModulesContext<T extends FacadeModuleBase[]> = (T[0] extends FacadeModuleBase ? ExtractModuleContext<T[0]> : FacadeBaseContext) & (T[1] extends FacadeModuleBase ? ExtractModuleContext<T[1]> : FacadeBaseContext) & (T[2] extends FacadeModuleBase ? ExtractModuleContext<T[2]> : FacadeBaseContext) & (T[3] extends FacadeModuleBase ? ExtractModuleContext<T[3]> : FacadeBaseContext) & (T[4] extends FacadeModuleBase ? ExtractModuleContext<T[4]> : FacadeBaseContext) & (T[5] extends FacadeModuleBase ? ExtractModuleContext<T[5]> : FacadeBaseContext) & (T[6] extends FacadeModuleBase ? ExtractModuleContext<T[6]> : FacadeBaseContext) & (T[7] extends FacadeModuleBase ? ExtractModuleContext<T[7]> : FacadeBaseContext) & (T[8] extends FacadeModuleBase ? ExtractModuleContext<T[8]> : FacadeBaseContext) & (T[9] extends FacadeModuleBase ? ExtractModuleContext<T[9]> : FacadeBaseContext);
+export type FacadeContext<T extends FacadeModuleBase[] | Facade<any> = []> = T extends FacadeModuleBase[] ? FacadeModulesContext<T> : T extends Facade<infer TFacadeModules> ? FacadeModulesContext<TFacadeModules> : FacadeBaseContext;
 export interface Facade<TModules extends FacadeModuleBase[] = []> {
     readonly logger: Logger;
     readonly koa: Koa<any, FacadeModulesContext<TModules>>;

package/dist/modules/access-control/gql/federation.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FederatedAccessControlSchema = void 0;
-const apollo_server_koa_1 = require("apollo-server-koa");
+const graphql_tag_1 = require("graphql-tag");
 const federation_1 = require("@apollo/federation");
 const schema_1 = require("./schema");
 const interfaces_1 = require("../interfaces");
@@ -11,7 +11,7 @@ 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 FederatedAccessControlSchema = (cfg) => (0, federation_1.buildSubgraphSchema)({
-    typeDefs: (0, apollo_server_koa_1.gql)((0, graphql_1.printSchema)((0, schema_1.schema)(cfg))),
+    typeDefs: (0, graphql_tag_1.default)((0, graphql_1.printSchema)((0, schema_1.schema)(cfg))),
     resolvers: (0, protos_1.generateSubServiceResolvers)(types_1.subServices, cfg, interfaces_1.namespace)
 });
 exports.FederatedAccessControlSchema = FederatedAccessControlSchema;