@restorecommerce/facade 1.1.4 → 1.1.5

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

@@ -1,15 +1,15 @@
 import { RestoreCommerceGrpcClient } from '@restorecommerce/rc-grpc-clients';
-import { ServiceClient as userClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/user';
-import { ServiceClient as roleClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/role';
-import { ServiceClient as authentication_logClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/authentication_log';
-import { ServiceClient as tokenClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/token';
-import { ServiceClient as oauthClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/oauth';
+import { UserServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/user';
+import { RoleServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/role';
+import { AuthenticationLogServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/authentication_log';
+import { TokenServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/token';
+import { OAuthServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/oauth';
 import { GrpcClientConfig } from '@restorecommerce/grpc-client';
 export declare class IdentitySrvGrpcClient extends RestoreCommerceGrpcClient {
-    readonly user: userClient;
-    readonly role: roleClient;
-    readonly authentication_log: authentication_logClient;
-    readonly token: tokenClient;
-    readonly oauth: oauthClient;
+    readonly user: UserServiceClient;
+    readonly role: RoleServiceClient;
+    readonly authentication_log: AuthenticationLogServiceClient;
+    readonly token: TokenServiceClient;
+    readonly oauth: OAuthServiceClient;
     constructor(address: string, cfg: GrpcClientConfig);
 }

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

@@ -10,11 +10,11 @@ const oauth_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/rest
 class IdentitySrvGrpcClient extends rc_grpc_clients_1.RestoreCommerceGrpcClient {
     constructor(address, cfg) {
         super(address, cfg);
-        this.user = this.createClient(cfg, user_1.ServiceDefinition, this.channel);
-        this.role = this.createClient(cfg, role_1.ServiceDefinition, this.channel);
-        this.authentication_log = this.createClient(cfg, authentication_log_1.ServiceDefinition, this.channel);
-        this.token = this.createClient(cfg, token_1.ServiceDefinition, this.channel);
-        this.oauth = this.createClient(cfg, oauth_1.ServiceDefinition, this.channel);
+        this.user = this.createClient(cfg, user_1.UserServiceDefinition, this.channel);
+        this.role = this.createClient(cfg, role_1.RoleServiceDefinition, this.channel);
+        this.authentication_log = this.createClient(cfg, authentication_log_1.AuthenticationLogServiceDefinition, this.channel);
+        this.token = this.createClient(cfg, token_1.TokenServiceDefinition, this.channel);
+        this.oauth = this.createClient(cfg, oauth_1.OAuthServiceDefinition, this.channel);
     }
 }
 exports.IdentitySrvGrpcClient = IdentitySrvGrpcClient;

package/dist/modules/identity/interfaces.d.ts

@@ -18,5 +18,5 @@ export interface IdentityContext extends FacadeContext {
         client: IdentitySrvGrpcClient;
     };
 }
-export declare type IdentityModule = FacadeModule<IdentityContext>;
+export type IdentityModule = FacadeModule<IdentityContext>;
 export declare const namespace = "identity";

package/dist/modules/identity/oidc/adapter.d.ts

@@ -1,4 +1,4 @@
 import { Logger } from 'winston';
 import { Adapter, AdapterConstructor } from 'oidc-provider';
-import { ServiceClient as tokenService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/token";
+import { TokenServiceClient as tokenService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/token";
 export declare function createIdentityServiceAdapterClass(remoteTokenService: tokenService, logger: Logger, localTokenServiceFactory?: (type: string) => Adapter): AdapterConstructor;

package/dist/modules/identity/oidc/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="koa-router" />
-import { Provider } from 'oidc-provider';
+import Provider from 'oidc-provider';
 import { Logger } from 'winston';
 import { IdentityContext } from '../interfaces';
 import { OIDCConfig } from './interfaces';

package/dist/modules/identity/oidc/index.js

@@ -11,7 +11,7 @@ Object.defineProperty(exports, "createOIDCRouter", { enumerable: true, get: func
 function createOIDC({ identitySrvClient, env, logger, config: { loginFn, post_logout_redirect_uris, localTokenServiceFactory, remoteTokenService, cookies, redirect_uris, client_id, client_secret, issuer, jwks, templates } }) {
     var _a, _b;
     const adapterClass = (0, adapter_1.createIdentityServiceAdapterClass)(remoteTokenService !== null && remoteTokenService !== void 0 ? remoteTokenService : identitySrvClient.token, logger, localTokenServiceFactory);
-    const provider = new oidc_provider_1.Provider(issuer, {
+    const provider = new oidc_provider_1.default(issuer, {
         adapter: adapterClass,
         clients: [{
                 post_logout_redirect_uris,

package/dist/modules/identity/oidc/interfaces.d.ts

@@ -1,7 +1,8 @@
-import { Adapter, errors, Provider } from 'oidc-provider';
+import { Adapter, errors } from 'oidc-provider';
+import Provider from 'oidc-provider';
 import { IdentityContext } from '../interfaces';
-import { ServiceClient as authLogService } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/authentication_log';
-import { ServiceClient as tokenService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/token";
+import { AuthenticationLogServiceClient as authLogService } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/authentication_log';
+import { TokenServiceClient as tokenService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/token";
 import { User } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/user";
 export interface OIDCHbsTemplates {
     login?: string;
@@ -27,18 +28,18 @@ export interface OIDCError {
     key: string;
     message?: string;
 }
-export declare type UserKey = keyof User;
-export declare type AuthUserKeyWhitelist = 'id' | 'name' | 'email' | 'localeId' | 'timezoneId' | 'roleAssociations' | 'firstName' | 'lastName' | 'defaultScope' | 'tokens' | 'lastAccess';
-export declare type AuthUser = Pick<User, AuthUserKeyWhitelist>;
+export type UserKey = keyof User;
+export type AuthUserKeyWhitelist = 'id' | 'name' | 'email' | 'localeId' | 'timezoneId' | 'roleAssociations' | 'firstName' | 'lastName' | 'defaultScope' | 'tokens' | 'lastAccess';
+export type AuthUser = Pick<User, AuthUserKeyWhitelist>;
 export interface LoginFnResponse {
     user?: AuthUser;
     error?: OIDCError;
     identifier?: string;
     remember?: boolean;
 }
-export declare type OIDCBodyLoginFn = (ctx: IdentityContext, body: any) => Promise<LoginFnResponse>;
-export declare type OIDCBodyLoginCredentials = (ctx: IdentityContext, credentials: UserCredentials) => Promise<LoginFnResponse>;
-export declare type OIDCLoginFn = (ctx: IdentityContext, identifier?: string, password?: string, remember?: boolean) => Promise<LoginFnResponse>;
+export type OIDCBodyLoginFn = (ctx: IdentityContext, body: any) => Promise<LoginFnResponse>;
+export type OIDCBodyLoginCredentials = (ctx: IdentityContext, credentials: UserCredentials) => Promise<LoginFnResponse>;
+export type OIDCLoginFn = (ctx: IdentityContext, identifier?: string, password?: string, remember?: boolean) => Promise<LoginFnResponse>;
 export interface UserCredentials {
     identifier: string;
     password?: string;
@@ -66,7 +67,7 @@ export declare class InvalidPasswordGrant extends errors.InvalidGrant {
     constructor(detail: string);
 }
 export interface Claims {
-    sub: string;
+    sub: string | undefined;
     data: AuthUser;
     [key: string]: any;
 }

package/dist/modules/identity/oidc/router.d.ts

@@ -1,5 +1,5 @@
 import KoaRouter from 'koa-router';
-import { Provider } from 'oidc-provider';
+import Provider from 'oidc-provider';
 import { Logger } from 'winston';
 import { IdentityContext } from '../interfaces';
 import { OIDCHbsTemplates, OIDCBodyLoginFn } from './interfaces';

package/dist/modules/identity/oidc/router.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createOIDCRouter = void 0;
 const templates_1 = require("./templates");
+const koa_body_1 = require("koa-body");
 const Router = eval('require("koa-router")');
-const bodyParser = eval('require("koa-body")');
 function createOIDCRouter({ logger, loginFn, provider, env, templates }) {
     const dev = env === 'development';
     const tplEngine = new templates_1.OIDCTemplateEngine(templates);
@@ -70,7 +70,7 @@ function createOIDCRouter({ logger, loginFn, provider, env, templates }) {
     //     mergeWithLastSubmission: true,
     //   });
     // });
-    router.post('/interaction/:uid/login', bodyParser({
+    router.post('/interaction/:uid/login', (0, koa_body_1.koaBody)({
         text: false, json: false
     }), async (ctx) => {
         const { prompt, uid, params, session } = await provider.interactionDetails(ctx.req, ctx.res);

package/dist/modules/identity/oidc/user.d.ts

@@ -1,5 +1,5 @@
 import { OIDCBodyLoginFn, AuthUser, OIDCLoginFn, OIDCBodyLoginCredentials } from './interfaces';
-import { ServiceClient as userService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/user";
+import { UserServiceClient as userService } from "@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/user";
 export declare const loginUserBody: OIDCBodyLoginFn;
 export declare const loginUserCredentials: OIDCBodyLoginCredentials;
 export declare const loginUser: OIDCLoginFn;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FederatedIndexingSchema = 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 protos_1 = require("../../../gql/protos");
@@ -11,7 +11,7 @@ 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.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.FederatedIndexingSchema = FederatedIndexingSchema;

package/dist/modules/indexing/gql/schema.generated.d.ts

@@ -1,23 +1,23 @@
 import { GraphQLResolveInfo, GraphQLScalarType, GraphQLScalarTypeConfig } from 'graphql';
 import { IndexingContext } from '../interfaces';
-export declare type Maybe<T> = T | undefined;
-export declare type InputMaybe<T> = T | undefined;
-export declare type Exact<T extends {
+export type Maybe<T> = T | null | undefined;
+export type InputMaybe<T> = T | null | undefined;
+export type Exact<T extends {
     [key: string]: unknown;
 }> = {
     [K in keyof T]: T[K];
 };
-export declare type MakeOptional<T, K extends keyof T> = Omit<T, K> & {
+export type MakeOptional<T, K extends keyof T> = Omit<T, K> & {
     [SubKey in K]?: Maybe<T[SubKey]>;
 };
-export declare type MakeMaybe<T, K extends keyof T> = Omit<T, K> & {
+export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & {
     [SubKey in K]: Maybe<T[SubKey]>;
 };
-export declare type RequireFields<T, K extends keyof T> = Omit<T, K> & {
+export type RequireFields<T, K extends keyof T> = Omit<T, K> & {
     [P in K]-?: NonNullable<T[P]>;
 };
 /** All built-in and custom scalars, mapped to their actual values */
-export declare type Scalars = {
+export type Scalars = {
     ID: string;
     String: string;
     Boolean: boolean;
@@ -25,59 +25,63 @@ export declare type Scalars = {
     Float: number;
     GoogleProtobufAnyValue: any;
 };
-export declare type Mutation = {
+export type Mutation = {
     __typename?: 'Mutation';
     indexing: IndexingMutation;
 };
-export declare type IndexingMutation = {
+export type IndexingMutation = {
     __typename?: 'IndexingMutation';
     search: IndexingSearchMutation;
 };
-export declare type IndexingSearchMutation = {
+export type IndexingSearchMutation = {
     __typename?: 'IndexingSearchMutation';
     Search?: Maybe<ProtoIoRestorecommerceSearchSearchResponse>;
 };
-export declare type IndexingSearchMutationSearchArgs = {
+export type IndexingSearchMutationSearchArgs = {
     input: IIoRestorecommerceSearchSearchRequest;
 };
-export declare type ProtoIoRestorecommerceSearchSearchResponse = {
+export type ProtoIoRestorecommerceSearchSearchResponse = {
     __typename?: 'ProtoIoRestorecommerceSearchSearchResponse';
     details?: Maybe<IoRestorecommerceSearchSearchResponse>;
 };
-export declare type IoRestorecommerceSearchSearchResponse = {
+export type IoRestorecommerceSearchSearchResponse = {
     __typename?: 'IoRestorecommerceSearchSearchResponse';
     data?: Maybe<Array<GoogleProtobufAny>>;
 };
-export declare type GoogleProtobufAny = {
+export type GoogleProtobufAny = {
     __typename?: 'GoogleProtobufAny';
     typeUrl?: Maybe<Scalars['String']>;
     value?: Maybe<Scalars['GoogleProtobufAnyValue']>;
 };
-export declare type IIoRestorecommerceSearchSearchRequest = {
+export type IIoRestorecommerceSearchSearchRequest = {
     collection?: InputMaybe<Scalars['String']>;
     text?: InputMaybe<Scalars['String']>;
     acl?: InputMaybe<Array<Scalars['String']>>;
 };
-export declare type Subscription = {
+export type Subscription = {
     __typename?: 'Subscription';
     orderingOrders?: Maybe<SubscriptionOutput>;
-    fulfillmentFulfillment?: Maybe<SubscriptionOutput>;
+    catalogProducts?: Maybe<SubscriptionOutput>;
+    fulfillmentFulfillments?: Maybe<SubscriptionOutput>;
     fulfillmentFulfillmentCouriers?: Maybe<SubscriptionOutput>;
-    fulfillmentFulfillmentProduct?: Maybe<SubscriptionOutput>;
+    fulfillmentFulfillment_products?: Maybe<SubscriptionOutput>;
 };
-export declare type SubscriptionOrderingOrdersArgs = {
+export type SubscriptionOrderingOrdersArgs = {
     action?: InputMaybe<SubscriptionAction>;
 };
-export declare type SubscriptionFulfillmentFulfillmentArgs = {
+export type SubscriptionCatalogProductsArgs = {
     action?: InputMaybe<SubscriptionAction>;
 };
-export declare type SubscriptionFulfillmentFulfillmentCouriersArgs = {
+export type SubscriptionFulfillmentFulfillmentsArgs = {
     action?: InputMaybe<SubscriptionAction>;
 };
-export declare type SubscriptionFulfillmentFulfillmentProductArgs = {
+export type SubscriptionFulfillmentFulfillmentCouriersArgs = {
     action?: InputMaybe<SubscriptionAction>;
 };
-export declare type SubscriptionOutput = {
+export type SubscriptionFulfillmentFulfillment_ProductsArgs = {
+    action?: InputMaybe<SubscriptionAction>;
+};
+export type SubscriptionOutput = {
     __typename?: 'SubscriptionOutput';
     id?: Maybe<Scalars['String']>;
 };
@@ -86,16 +90,16 @@ export declare enum SubscriptionAction {
     Updated = "UPDATED",
     Deleted = "DELETED"
 }
-export declare type WithIndex<TObject> = TObject & Record<string, any>;
-export declare type ResolversObject<TObject> = WithIndex<TObject>;
-export declare type ResolverTypeWrapper<T> = Promise<T> | T;
-export declare type ResolverWithResolve<TResult, TParent, TContext, TArgs> = {
+export type WithIndex<TObject> = TObject & Record<string, any>;
+export type ResolversObject<TObject> = WithIndex<TObject>;
+export type ResolverTypeWrapper<T> = Promise<T> | T;
+export type ResolverWithResolve<TResult, TParent, TContext, TArgs> = {
     resolve: ResolverFn<TResult, TParent, TContext, TArgs>;
 };
-export declare type Resolver<TResult, TParent = {}, TContext = {}, TArgs = {}> = ResolverFn<TResult, TParent, TContext, TArgs> | ResolverWithResolve<TResult, TParent, TContext, TArgs>;
-export declare type ResolverFn<TResult, TParent, TContext, TArgs> = (parent: TParent, args: TArgs, context: TContext, info: GraphQLResolveInfo) => Promise<TResult> | TResult;
-export declare type SubscriptionSubscribeFn<TResult, TParent, TContext, TArgs> = (parent: TParent, args: TArgs, context: TContext, info: GraphQLResolveInfo) => AsyncIterable<TResult> | Promise<AsyncIterable<TResult>>;
-export declare type SubscriptionResolveFn<TResult, TParent, TContext, TArgs> = (parent: TParent, args: TArgs, context: TContext, info: GraphQLResolveInfo) => TResult | Promise<TResult>;
+export type Resolver<TResult, TParent = {}, TContext = {}, TArgs = {}> = ResolverFn<TResult, TParent, TContext, TArgs> | ResolverWithResolve<TResult, TParent, TContext, TArgs>;
+export type ResolverFn<TResult, TParent, TContext, TArgs> = (parent: TParent, args: TArgs, context: TContext, info: GraphQLResolveInfo) => Promise<TResult> | TResult;
+export type SubscriptionSubscribeFn<TResult, TParent, TContext, TArgs> = (parent: TParent, args: TArgs, context: TContext, info: GraphQLResolveInfo) => AsyncIterable<TResult> | Promise<AsyncIterable<TResult>>;
+export type SubscriptionResolveFn<TResult, TParent, TContext, TArgs> = (parent: TParent, args: TArgs, context: TContext, info: GraphQLResolveInfo) => TResult | Promise<TResult>;
 export interface SubscriptionSubscriberObject<TResult, TKey extends string, TParent, TContext, TArgs> {
     subscribe: SubscriptionSubscribeFn<{
         [key in TKey]: TResult;
@@ -108,14 +112,14 @@ export interface SubscriptionResolverObject<TResult, TParent, TContext, TArgs> {
     subscribe: SubscriptionSubscribeFn<any, TParent, TContext, TArgs>;
     resolve: SubscriptionResolveFn<TResult, any, TContext, TArgs>;
 }
-export declare type SubscriptionObject<TResult, TKey extends string, TParent, TContext, TArgs> = SubscriptionSubscriberObject<TResult, TKey, TParent, TContext, TArgs> | SubscriptionResolverObject<TResult, TParent, TContext, TArgs>;
-export declare type SubscriptionResolver<TResult, TKey extends string, TParent = {}, TContext = {}, TArgs = {}> = ((...args: any[]) => SubscriptionObject<TResult, TKey, TParent, TContext, TArgs>) | SubscriptionObject<TResult, TKey, TParent, TContext, TArgs>;
-export declare type TypeResolveFn<TTypes, TParent = {}, TContext = {}> = (parent: TParent, context: TContext, info: GraphQLResolveInfo) => Maybe<TTypes> | Promise<Maybe<TTypes>>;
-export declare type IsTypeOfResolverFn<T = {}, TContext = {}> = (obj: T, context: TContext, info: GraphQLResolveInfo) => boolean | Promise<boolean>;
-export declare type NextResolverFn<T> = () => Promise<T>;
-export declare type DirectiveResolverFn<TResult = {}, TParent = {}, TContext = {}, TArgs = {}> = (next: NextResolverFn<TResult>, parent: TParent, args: TArgs, context: TContext, info: GraphQLResolveInfo) => TResult | Promise<TResult>;
+export type SubscriptionObject<TResult, TKey extends string, TParent, TContext, TArgs> = SubscriptionSubscriberObject<TResult, TKey, TParent, TContext, TArgs> | SubscriptionResolverObject<TResult, TParent, TContext, TArgs>;
+export type SubscriptionResolver<TResult, TKey extends string, TParent = {}, TContext = {}, TArgs = {}> = ((...args: any[]) => SubscriptionObject<TResult, TKey, TParent, TContext, TArgs>) | SubscriptionObject<TResult, TKey, TParent, TContext, TArgs>;
+export type TypeResolveFn<TTypes, TParent = {}, TContext = {}> = (parent: TParent, context: TContext, info: GraphQLResolveInfo) => Maybe<TTypes> | Promise<Maybe<TTypes>>;
+export type IsTypeOfResolverFn<T = {}, TContext = {}> = (obj: T, context: TContext, info: GraphQLResolveInfo) => boolean | Promise<boolean>;
+export type NextResolverFn<T> = () => Promise<T>;
+export type DirectiveResolverFn<TResult = {}, TParent = {}, TContext = {}, TArgs = {}> = (next: NextResolverFn<TResult>, parent: TParent, args: TArgs, context: TContext, info: GraphQLResolveInfo) => TResult | Promise<TResult>;
 /** Mapping between all available schema types and the resolvers types */
-export declare type ResolversTypes = ResolversObject<{
+export type ResolversTypes = ResolversObject<{
     Mutation: ResolverTypeWrapper<{}>;
     IndexingMutation: ResolverTypeWrapper<IndexingMutation>;
     IndexingSearchMutation: ResolverTypeWrapper<IndexingSearchMutation>;
@@ -131,7 +135,7 @@ export declare type ResolversTypes = ResolversObject<{
     Boolean: ResolverTypeWrapper<Scalars['Boolean']>;
 }>;
 /** Mapping between all available schema types and the resolvers parents */
-export declare type ResolversParentTypes = ResolversObject<{
+export type ResolversParentTypes = ResolversObject<{
     Mutation: {};
     IndexingMutation: IndexingMutation;
     IndexingSearchMutation: IndexingSearchMutation;
@@ -145,26 +149,26 @@ export declare type ResolversParentTypes = ResolversObject<{
     SubscriptionOutput: SubscriptionOutput;
     Boolean: Scalars['Boolean'];
 }>;
-export declare type MutationResolvers<ContextType = IndexingContext, ParentType extends ResolversParentTypes['Mutation'] = ResolversParentTypes['Mutation']> = ResolversObject<{
+export type MutationResolvers<ContextType = IndexingContext, ParentType extends ResolversParentTypes['Mutation'] = ResolversParentTypes['Mutation']> = ResolversObject<{
     indexing?: Resolver<ResolversTypes['IndexingMutation'], ParentType, ContextType>;
 }>;
-export declare type IndexingMutationResolvers<ContextType = IndexingContext, ParentType extends ResolversParentTypes['IndexingMutation'] = ResolversParentTypes['IndexingMutation']> = ResolversObject<{
+export type IndexingMutationResolvers<ContextType = IndexingContext, ParentType extends ResolversParentTypes['IndexingMutation'] = ResolversParentTypes['IndexingMutation']> = ResolversObject<{
     search?: Resolver<ResolversTypes['IndexingSearchMutation'], ParentType, ContextType>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
-export declare type IndexingSearchMutationResolvers<ContextType = IndexingContext, ParentType extends ResolversParentTypes['IndexingSearchMutation'] = ResolversParentTypes['IndexingSearchMutation']> = ResolversObject<{
+export type IndexingSearchMutationResolvers<ContextType = IndexingContext, ParentType extends ResolversParentTypes['IndexingSearchMutation'] = ResolversParentTypes['IndexingSearchMutation']> = ResolversObject<{
     Search?: Resolver<Maybe<ResolversTypes['ProtoIoRestorecommerceSearchSearchResponse']>, ParentType, ContextType, RequireFields<IndexingSearchMutationSearchArgs, 'input'>>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
-export declare type ProtoIoRestorecommerceSearchSearchResponseResolvers<ContextType = IndexingContext, ParentType extends ResolversParentTypes['ProtoIoRestorecommerceSearchSearchResponse'] = ResolversParentTypes['ProtoIoRestorecommerceSearchSearchResponse']> = ResolversObject<{
+export type ProtoIoRestorecommerceSearchSearchResponseResolvers<ContextType = IndexingContext, ParentType extends ResolversParentTypes['ProtoIoRestorecommerceSearchSearchResponse'] = ResolversParentTypes['ProtoIoRestorecommerceSearchSearchResponse']> = ResolversObject<{
     details?: Resolver<Maybe<ResolversTypes['IoRestorecommerceSearchSearchResponse']>, ParentType, ContextType>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
-export declare type IoRestorecommerceSearchSearchResponseResolvers<ContextType = IndexingContext, ParentType extends ResolversParentTypes['IoRestorecommerceSearchSearchResponse'] = ResolversParentTypes['IoRestorecommerceSearchSearchResponse']> = ResolversObject<{
+export type IoRestorecommerceSearchSearchResponseResolvers<ContextType = IndexingContext, ParentType extends ResolversParentTypes['IoRestorecommerceSearchSearchResponse'] = ResolversParentTypes['IoRestorecommerceSearchSearchResponse']> = ResolversObject<{
     data?: Resolver<Maybe<Array<ResolversTypes['GoogleProtobufAny']>>, ParentType, ContextType>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
-export declare type GoogleProtobufAnyResolvers<ContextType = IndexingContext, ParentType extends ResolversParentTypes['GoogleProtobufAny'] = ResolversParentTypes['GoogleProtobufAny']> = ResolversObject<{
+export type GoogleProtobufAnyResolvers<ContextType = IndexingContext, ParentType extends ResolversParentTypes['GoogleProtobufAny'] = ResolversParentTypes['GoogleProtobufAny']> = ResolversObject<{
     typeUrl?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
     value?: Resolver<Maybe<ResolversTypes['GoogleProtobufAnyValue']>, ParentType, ContextType>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
@@ -172,17 +176,18 @@ export declare type GoogleProtobufAnyResolvers<ContextType = IndexingContext, Pa
 export interface GoogleProtobufAnyValueScalarConfig extends GraphQLScalarTypeConfig<ResolversTypes['GoogleProtobufAnyValue'], any> {
     name: 'GoogleProtobufAnyValue';
 }
-export declare type SubscriptionResolvers<ContextType = IndexingContext, ParentType extends ResolversParentTypes['Subscription'] = ResolversParentTypes['Subscription']> = ResolversObject<{
+export type SubscriptionResolvers<ContextType = IndexingContext, ParentType extends ResolversParentTypes['Subscription'] = ResolversParentTypes['Subscription']> = ResolversObject<{
     orderingOrders?: SubscriptionResolver<Maybe<ResolversTypes['SubscriptionOutput']>, "orderingOrders", ParentType, ContextType, Partial<SubscriptionOrderingOrdersArgs>>;
-    fulfillmentFulfillment?: SubscriptionResolver<Maybe<ResolversTypes['SubscriptionOutput']>, "fulfillmentFulfillment", ParentType, ContextType, Partial<SubscriptionFulfillmentFulfillmentArgs>>;
+    catalogProducts?: SubscriptionResolver<Maybe<ResolversTypes['SubscriptionOutput']>, "catalogProducts", ParentType, ContextType, Partial<SubscriptionCatalogProductsArgs>>;
+    fulfillmentFulfillments?: SubscriptionResolver<Maybe<ResolversTypes['SubscriptionOutput']>, "fulfillmentFulfillments", ParentType, ContextType, Partial<SubscriptionFulfillmentFulfillmentsArgs>>;
     fulfillmentFulfillmentCouriers?: SubscriptionResolver<Maybe<ResolversTypes['SubscriptionOutput']>, "fulfillmentFulfillmentCouriers", ParentType, ContextType, Partial<SubscriptionFulfillmentFulfillmentCouriersArgs>>;
-    fulfillmentFulfillmentProduct?: SubscriptionResolver<Maybe<ResolversTypes['SubscriptionOutput']>, "fulfillmentFulfillmentProduct", ParentType, ContextType, Partial<SubscriptionFulfillmentFulfillmentProductArgs>>;
+    fulfillmentFulfillment_products?: SubscriptionResolver<Maybe<ResolversTypes['SubscriptionOutput']>, "fulfillmentFulfillment_products", ParentType, ContextType, Partial<SubscriptionFulfillmentFulfillment_ProductsArgs>>;
 }>;
-export declare type SubscriptionOutputResolvers<ContextType = IndexingContext, ParentType extends ResolversParentTypes['SubscriptionOutput'] = ResolversParentTypes['SubscriptionOutput']> = ResolversObject<{
+export type SubscriptionOutputResolvers<ContextType = IndexingContext, ParentType extends ResolversParentTypes['SubscriptionOutput'] = ResolversParentTypes['SubscriptionOutput']> = ResolversObject<{
     id?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
-export declare type Resolvers<ContextType = IndexingContext> = ResolversObject<{
+export type Resolvers<ContextType = IndexingContext> = ResolversObject<{
     Mutation?: MutationResolvers<ContextType>;
     IndexingMutation?: IndexingMutationResolvers<ContextType>;
     IndexingSearchMutation?: IndexingSearchMutationResolvers<ContextType>;

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

@@ -1,7 +1,7 @@
 import { RestoreCommerceGrpcClient } from '@restorecommerce/rc-grpc-clients';
-import { ServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/search';
+import { SearchServiceClient } from '@restorecommerce/rc-grpc-clients/dist/generated/io/restorecommerce/search';
 import { GrpcClientConfig } from '@restorecommerce/grpc-client';
 export declare class IndexingSrvGrpcClient extends RestoreCommerceGrpcClient {
-    readonly search: ServiceClient;
+    readonly search: SearchServiceClient;
     constructor(address: string, cfg: GrpcClientConfig);
 }

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

@@ -6,7 +6,7 @@ const search_1 = require("@restorecommerce/rc-grpc-clients/dist/generated/io/res
 class IndexingSrvGrpcClient extends rc_grpc_clients_1.RestoreCommerceGrpcClient {
     constructor(address, cfg) {
         super(address, cfg);
-        this.search = this.createClient(cfg, search_1.ServiceDefinition, this.channel);
+        this.search = this.createClient(cfg, search_1.SearchServiceDefinition, this.channel);
     }
 }
 exports.IndexingSrvGrpcClient = IndexingSrvGrpcClient;

package/dist/modules/indexing/interfaces.d.ts

@@ -9,5 +9,5 @@ export interface IndexingContext extends FacadeContext {
         client: IndexingSrvGrpcClient;
     };
 }
-export declare type IndexingModule = FacadeModule<IndexingContext>;
+export type IndexingModule = FacadeModule<IndexingContext>;
 export declare const namespace = "indexing";

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FederatedInvoicingSchema = 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 FederatedInvoicingSchema = (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.FederatedInvoicingSchema = FederatedInvoicingSchema;