@restorecommerce/facade 0.1.31 → 0.1.36

package/CHANGELOG.md

@@ -3,6 +3,52 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.1.36](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.1.35...@restorecommerce/facade@0.1.36) (2021-12-09)
+
+**Note:** Version bump only for package @restorecommerce/facade
+
+
+
+
+
+## [0.1.35](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.1.34...@restorecommerce/facade@0.1.35) (2021-12-09)
+
+
+### Bug Fixes
+
+* **facade:** updated generated schema for facade module due to changes in proto files. ([c57d5fa](https://github.com/restorecommerce/libs/commit/c57d5faaea1dbd287727f7c7678e6cfe34dba92d))
+
+
+
+
+
+## [0.1.34](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.1.33...@restorecommerce/facade@0.1.34) (2021-12-06)
+
+
+### Bug Fixes
+
+* **facade:** Added streaming response handling for mutations and queries. ([199db2d](https://github.com/restorecommerce/libs/commit/199db2d51f5a1d08ec2af09579df9c742ae0bbb1))
+
+
+
+
+
+## [0.1.33](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.1.32...@restorecommerce/facade@0.1.33) (2021-11-08)
+
+**Note:** Version bump only for package @restorecommerce/facade
+
+
+
+
+
+## [0.1.32](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.1.31...@restorecommerce/facade@0.1.32) (2021-11-05)
+
+**Note:** Version bump only for package @restorecommerce/facade
+
+
+
+
+
 ## [0.1.31](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.1.30...@restorecommerce/facade@0.1.31) (2021-10-25)
 
 **Note:** Version bump only for package @restorecommerce/facade

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

@@ -2,6 +2,7 @@ import { GraphQLInputField, GraphQLResolveInfo, GraphQLSchema } from "graphql";
 import { GraphQLEnumType, GraphQLFieldConfig, GraphQLFieldConfigMap, GraphQLInputObjectType, GraphQLInputType, Thunk } from "graphql/type/definition";
 import { ServiceConfig, SubService, SubSpaceServiceConfig } from "./types";
 import { MethodDescriptorProto, ServiceDescriptorProto } from "ts-proto-descriptors/google/protobuf/descriptor";
+import { GrpcClientConfig } from "@restorecommerce/grpc-client";
 export declare const getGQLSchema: <TSource, TContext>(method: MethodDescriptorProto) => GraphQLFieldConfig<TSource, TContext, {
     [argName: string]: any;
 }>;
@@ -13,7 +14,7 @@ declare type ServiceClient<Context extends Pick<Context, Key>, Key extends keyof
         client: T;
     };
 };
-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) => { [key in keyof SRV]: R; };
+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, grpcClientConfig: GrpcClientConfig) => { [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) => void;
 export declare const generateResolver: (...namespaces: string[]) => any;
 export declare const registerResolverSchema: (namespace: string, name: string, schema: Thunk<GraphQLFieldConfig<any, any>>, mutation?: boolean, subspace?: string | undefined) => void;

package/dist/gql/protos/graphql.js

@@ -6,6 +6,8 @@ const definition_1 = require("graphql/type/definition");
 const types_1 = require("./types");
 const registry_1 = require("./registry");
 const utils_1 = require("./utils");
+const stream = require("stream");
+const _ = require("lodash");
 const typeCache = new Map();
 const Mutate = ['Create', 'Update', 'Upsert'];
 const getGQLSchema = (method) => {
@@ -93,7 +95,7 @@ const recursiveUploadToBuffer = async (data, model) => {
     return data;
 };
 exports.recursiveUploadToBuffer = recursiveUploadToBuffer;
-const getGQLResolverFunctions = (service, key, serviceKey) => {
+const getGQLResolverFunctions = (service, key, serviceKey, grpcClientConfig) => {
     if (!service.method) {
         return {};
     }
@@ -117,6 +119,7 @@ const getGQLResolverFunctions = (service, key, serviceKey) => {
             }
         }
         obj[method.name] = async (args, context) => {
+            var _a;
             const client = context[key].client;
             const service = client[serviceKey];
             try {
@@ -133,11 +136,57 @@ const getGQLResolverFunctions = (service, key, serviceKey) => {
                         req.subject.token = authToken.split(' ')[1];
                     }
                 }
-                // TODO Handle client-stream methods
                 const result = await service[method.name](req);
+                const bufferFields = utils_1.getKeys((_a = grpcClientConfig) === null || _a === void 0 ? void 0 : _a.bufferFields);
+                if (result instanceof stream.Readable) {
+                    let operationStatus = { code: 0, message: '' };
+                    let aggregatedResponse = await new Promise((resolve, reject) => {
+                        let response = {};
+                        result.on('data', (chunk) => {
+                            const chunkObj = _.cloneDeep(chunk);
+                            if (!response) {
+                                response = chunk;
+                            }
+                            else {
+                                Object.assign(response, chunk);
+                            }
+                            const existingBufferFields = _.intersection(Object.keys(chunk), bufferFields);
+                            for (let bufferField of existingBufferFields) {
+                                if (chunkObj[bufferField] && chunkObj[bufferField].value) {
+                                    if (response[bufferField] && response[bufferField].value && !_.isArray(response[bufferField].value)) {
+                                        response[bufferField].value = [];
+                                    }
+                                    let data = JSON.parse(chunkObj[bufferField].value.toString());
+                                    if (_.isArray(data)) {
+                                        for (let dataObj of data) {
+                                            response[bufferField].value.push(dataObj);
+                                        }
+                                    }
+                                    else {
+                                        response[bufferField].value.push(data);
+                                    }
+                                }
+                            }
+                        });
+                        result.on('error', (err) => {
+                            console.error(err);
+                            operationStatus.code = err.code ? err.code : 500;
+                            operationStatus.message = err.message;
+                        });
+                        result.on('end', () => {
+                            if (_.isEmpty(operationStatus.message)) {
+                                operationStatus.code = 200;
+                                operationStatus.message = 'success';
+                            }
+                            resolve(response);
+                        });
+                    });
+                    return { details: aggregatedResponse, operationStatus };
+                }
+                let items = utils_1.decodeBufferFields(result.items, bufferFields);
                 return {
                     details: {
-                        items: result.items,
+                        items: items,
                         operationStatus: result.operationStatus // overall status
                     },
                 };
@@ -210,10 +259,79 @@ const MutateResolver = async (req, ctx, schema) => {
         if (authToken && authToken.startsWith('Bearer ')) {
             subject.token = authToken.split(' ')[1];
         }
+        // TODO identify google.protobufAny from config
+        for (let item of input.items) {
+            let keys = Object.keys(item);
+            for (let key of keys) {
+                if (item[key] && item[key].value) {
+                    item[key] = { typeUrl: '', value: Buffer.from(JSON.stringify(item.data.value)) };
+                }
+            }
+        }
         const result = await service[method]({
             items: input === null || input === void 0 ? void 0 : input.items,
             subject
         });
+        // TODO read from grpcClientConfig
+        // const bufferFields = getKeys((grpcClientConfig as any)?.bufferFields);
+        const bufferFields = [];
+        if (result instanceof stream.Readable) {
+            let operationStatus = { code: 0, message: '' };
+            let aggregatedResponse = await new Promise((resolve, reject) => {
+                let response = {};
+                result.on('data', (chunk) => {
+                    const chunkObj = _.cloneDeep(chunk);
+                    if (!response) {
+                        response = chunk;
+                    }
+                    else {
+                        Object.assign(response, chunk);
+                    }
+                    const existingBufferFields = _.intersection(Object.keys(chunk), bufferFields);
+                    for (let bufferField of existingBufferFields) {
+                        if (chunkObj[bufferField] && chunkObj[bufferField].value) {
+                            if (response[bufferField] && response[bufferField].value && !_.isArray(response[bufferField].value)) {
+                                response[bufferField].value = [];
+                            }
+                            let data = JSON.parse(chunkObj[bufferField].value.toString());
+                            if (_.isArray(data)) {
+                                for (let dataObj of data) {
+                                    response[bufferField].value.push(dataObj);
+                                }
+                            }
+                            else {
+                                response[bufferField].value.push(data);
+                            }
+                        }
+                    }
+                });
+                result.on('error', (err) => {
+                    console.error(err);
+                    operationStatus.code = err.code ? err.code : 500;
+                    operationStatus.message = err.message;
+                });
+                result.on('end', () => {
+                    if (_.isEmpty(operationStatus.message)) {
+                        operationStatus.code = 200;
+                        operationStatus.message = 'success';
+                    }
+                    resolve(response);
+                });
+            });
+            return { details: { items: aggregatedResponse, operationStatus } };
+        }
+        // TODO identify google.protobufAny from config
+        // let items = decodeBufferFields(result.items, bufferFields);
+        for (let item of result.items) {
+            if (item && item.payload) {
+                const keys = Object.keys(item.payload);
+                for (let bufferField of keys) {
+                    if (item.payload[bufferField] && item.payload[bufferField].value) {
+                        item.payload[bufferField].value = JSON.parse(item.payload[bufferField].value.toString());
+                    }
+                }
+            }
+        }
         return {
             details: {
                 items: result.items,
@@ -470,7 +588,7 @@ const getAndGenerateSchema = (service, namespace, prefix, cfg, queryList) => {
 exports.getAndGenerateSchema = getAndGenerateSchema;
 const getAndGenerateResolvers = (service, namespace, cfg, queryList, subspace = undefined, serviceKey = undefined) => {
     const { mutations, queries } = exports.getWhitelistBlacklistConfig(service, queryList, cfg);
-    const func = exports.getGQLResolverFunctions(service, namespace, serviceKey || subspace || namespace);
+    const func = exports.getGQLResolverFunctions(service, namespace, serviceKey || subspace || namespace, cfg.client);
     Object.keys(func).forEach(k => {
         exports.registerResolverFunction(namespace, k, func[k], !queries.has(k) && mutations.has(k), subspace);
     });
@@ -497,7 +615,7 @@ exports.generateSubServiceSchemas = generateSubServiceSchemas;
 const generateSubServiceResolvers = (subServices, config, namespace) => {
     subServices.forEach((sub) => {
         const { mutations, queries } = exports.getWhitelistBlacklistConfig(sub.service, sub.queries, config);
-        const func = exports.getGQLResolverFunctions(sub.service, namespace, sub.name || namespace);
+        const func = exports.getGQLResolverFunctions(sub.service, namespace, sub.name || namespace, config.client);
         Object.keys(func).forEach(k => {
             exports.registerResolverFunction(config.root ? sub.name : namespace, k, func[k], !queries.has(k) && mutations.has(k), config.root ? undefined : sub.name);
         });

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

@@ -1,2 +1,4 @@
 export declare const capitalizeProtoName: (name: string) => string;
 export declare const convertyCamelToSnakeCase: (entity: string) => string;
+export declare const getKeys: (obj: any) => string[];
+export declare const decodeBufferFields: (items: any, bufferFields: string[]) => any;

package/dist/gql/protos/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertyCamelToSnakeCase = exports.capitalizeProtoName = void 0;
+exports.decodeBufferFields = exports.getKeys = exports.convertyCamelToSnakeCase = exports.capitalizeProtoName = void 0;
+const _ = require("lodash");
 const capitalizeProtoName = (name) => {
     return name.replace(/(?:\.|^|_)(\w)/g, v => v.toUpperCase()).replace(/[._]/g, '');
 };
@@ -10,3 +11,40 @@ const convertyCamelToSnakeCase = (entity) => {
     return entity.replace(/(?:^|\.?)([A-Z])/g, (x, y) => { return '_' + y.toLowerCase(); }).replace(/^_/, '');
 };
 exports.convertyCamelToSnakeCase = convertyCamelToSnakeCase;
+const getKeys = (obj) => {
+    let set = new Set();
+    if (obj) {
+        const keys = Object.keys(obj);
+        for (let key of keys) {
+            if (typeof obj[key] === 'string') {
+                set.add(obj[key]);
+            }
+            else if (Array.isArray(obj[key])) {
+                for (let value of obj[key]) {
+                    set.add(value);
+                }
+            }
+        }
+    }
+    return Array.from(set);
+};
+exports.getKeys = getKeys;
+const decodeBufferFields = (items, bufferFields) => {
+    if (bufferFields && bufferFields.length > 0 && items && items.length > 0) {
+        for (let item of items) {
+            if (item && item.payload) {
+                const existingBufferFields = _.intersection(Object.keys(item.payload), bufferFields);
+                for (let bufferField of existingBufferFields) {
+                    if (item.payload[bufferField] && item.payload[bufferField].value) {
+                        item.payload[bufferField].value = JSON.parse(item.payload[bufferField].value.toString());
+                    }
+                }
+            }
+        }
+        return items;
+    }
+    else {
+        return items;
+    }
+};
+exports.decodeBufferFields = decodeBufferFields;

package/dist/modules/access-control/gql/schema.generated.d.ts

@@ -82,6 +82,7 @@ export declare type IIoRestorecommerceRuleTarget = {
 export declare type IIoRestorecommerceAttributeAttribute = {
     id?: Maybe<Scalars['String']>;
     value?: Maybe<Scalars['String']>;
+    attribute?: Maybe<Array<IIoRestorecommerceAttributeAttribute>>;
 };
 export declare type IIoRestorecommerceAccessControlContext = {
     subject?: Maybe<IGoogleProtobufAny>;
@@ -119,6 +120,7 @@ export declare type IoRestorecommerceAttributeAttribute = {
     __typename?: 'IoRestorecommerceAttributeAttribute';
     id?: Maybe<Scalars['String']>;
     value?: Maybe<Scalars['String']>;
+    attribute?: Maybe<Array<IoRestorecommerceAttributeAttribute>>;
 };
 export declare type IoRestorecommercePolicyPolicyRq = {
     __typename?: 'IoRestorecommercePolicyPolicyRQ';
@@ -145,15 +147,44 @@ export declare enum IoRestorecommerceRuleEffect {
 }
 export declare type IoRestorecommerceRuleContextQuery = {
     __typename?: 'IoRestorecommerceRuleContextQuery';
-    filters?: Maybe<Array<IoRestorecommerceRuleContextQueryFilter>>;
+    filters?: Maybe<Array<IoRestorecommerceFilterFilterOp>>;
     query?: Maybe<Scalars['String']>;
 };
-export declare type IoRestorecommerceRuleContextQueryFilter = {
-    __typename?: 'IoRestorecommerceRuleContextQueryFilter';
+export declare type IoRestorecommerceFilterFilterOp = {
+    __typename?: 'IoRestorecommerceFilterFilterOp';
+    filter?: Maybe<Array<IoRestorecommerceFilterFilter>>;
+    operator?: Maybe<IoRestorecommerceFilterFilterOpOperator>;
+};
+export declare type IoRestorecommerceFilterFilter = {
+    __typename?: 'IoRestorecommerceFilterFilter';
     field?: Maybe<Scalars['String']>;
-    operation?: Maybe<Scalars['String']>;
+    operation?: Maybe<IoRestorecommerceFilterFilterOperation>;
     value?: Maybe<Scalars['String']>;
+    type?: Maybe<IoRestorecommerceFilterFilterValueType>;
+    filters?: Maybe<Array<IoRestorecommerceFilterFilterOp>>;
 };
+export declare enum IoRestorecommerceFilterFilterOperation {
+    Eq = 0,
+    Lt = 1,
+    Lte = 2,
+    Gt = 3,
+    Gte = 4,
+    IsEmpty = 5,
+    ILike = 6,
+    In = 7,
+    Neq = 8
+}
+export declare enum IoRestorecommerceFilterFilterValueType {
+    String = 0,
+    Number = 1,
+    Boolean = 2,
+    Date = 3,
+    Array = 4
+}
+export declare enum IoRestorecommerceFilterFilterOpOperator {
+    And = 0,
+    Or = 1
+}
 export declare type AccessControlPolicyQuery = {
     __typename?: 'AccessControlPolicyQuery';
     Read?: Maybe<ProtoIoRestorecommercePolicyPolicyListResponse>;
@@ -194,6 +225,11 @@ export declare type IoRestorecommerceMetaMeta = {
     modified?: Maybe<Scalars['Float']>;
     modifiedBy?: Maybe<Scalars['String']>;
     owner?: Maybe<Array<IoRestorecommerceAttributeAttribute>>;
+    acl?: Maybe<Array<IoRestorecommerceAttributeAttributeObj>>;
+};
+export declare type IoRestorecommerceAttributeAttributeObj = {
+    __typename?: 'IoRestorecommerceAttributeAttributeObj';
+    attribute?: Maybe<IoRestorecommerceAttributeAttribute>;
 };
 export declare type IoRestorecommerceStatusStatus = {
     __typename?: 'IoRestorecommerceStatusStatus';
@@ -261,28 +297,6 @@ export declare type IIoRestorecommerceFilterFilter = {
     type?: Maybe<IoRestorecommerceFilterFilterValueType>;
     filters?: Maybe<Array<IIoRestorecommerceFilterFilterOp>>;
 };
-export declare enum IoRestorecommerceFilterFilterOperation {
-    Eq = 0,
-    Lt = 1,
-    Lte = 2,
-    Gt = 3,
-    Gte = 4,
-    IsEmpty = 5,
-    ILike = 6,
-    In = 7,
-    Neq = 8
-}
-export declare enum IoRestorecommerceFilterFilterValueType {
-    String = 0,
-    Number = 1,
-    Boolean = 2,
-    Date = 3,
-    Array = 4
-}
-export declare enum IoRestorecommerceFilterFilterOpOperator {
-    And = 0,
-    Or = 1
-}
 export declare enum IoRestorecommerceResourcebaseFilterOpOperator {
     And = 0,
     Or = 1
@@ -399,6 +413,10 @@ export declare type IIoRestorecommerceMetaMeta = {
     modified?: Maybe<Scalars['Float']>;
     modifiedBy?: Maybe<Scalars['String']>;
     owner?: Maybe<Array<IIoRestorecommerceAttributeAttribute>>;
+    acl?: Maybe<Array<IIoRestorecommerceAttributeAttributeObj>>;
+};
+export declare type IIoRestorecommerceAttributeAttributeObj = {
+    attribute?: Maybe<IIoRestorecommerceAttributeAttribute>;
 };
 export declare enum ModeType {
     Create = "CREATE",
@@ -446,14 +464,9 @@ export declare type IIoRestorecommerceRuleRule = {
     evaluationCacheable?: Maybe<Scalars['Boolean']>;
 };
 export declare type IIoRestorecommerceRuleContextQuery = {
-    filters?: Maybe<Array<IIoRestorecommerceRuleContextQueryFilter>>;
+    filters?: Maybe<Array<IIoRestorecommerceFilterFilterOp>>;
     query?: Maybe<Scalars['String']>;
 };
-export declare type IIoRestorecommerceRuleContextQueryFilter = {
-    field?: Maybe<Scalars['String']>;
-    operation?: Maybe<Scalars['String']>;
-    value?: Maybe<Scalars['String']>;
-};
 export declare type AccessControlPolicySetMutation = {
     __typename?: 'AccessControlPolicySetMutation';
     Mutate?: Maybe<ProtoIoRestorecommercePolicySetPolicySetListResponse>;
@@ -531,7 +544,11 @@ export declare type ResolversTypes = ResolversObject<{
     IoRestorecommerceRuleRuleRQ: ResolverTypeWrapper<IoRestorecommerceRuleRuleRq>;
     IoRestorecommerceRuleEffect: IoRestorecommerceRuleEffect;
     IoRestorecommerceRuleContextQuery: ResolverTypeWrapper<IoRestorecommerceRuleContextQuery>;
-    IoRestorecommerceRuleContextQueryFilter: ResolverTypeWrapper<IoRestorecommerceRuleContextQueryFilter>;
+    IoRestorecommerceFilterFilterOp: ResolverTypeWrapper<IoRestorecommerceFilterFilterOp>;
+    IoRestorecommerceFilterFilter: ResolverTypeWrapper<IoRestorecommerceFilterFilter>;
+    IoRestorecommerceFilterFilterOperation: IoRestorecommerceFilterFilterOperation;
+    IoRestorecommerceFilterFilterValueType: IoRestorecommerceFilterFilterValueType;
+    IoRestorecommerceFilterFilterOpOperator: IoRestorecommerceFilterFilterOpOperator;
     AccessControlPolicyQuery: ResolverTypeWrapper<AccessControlPolicyQuery>;
     ProtoIoRestorecommercePolicyPolicyListResponse: ResolverTypeWrapper<ProtoIoRestorecommercePolicyPolicyListResponse>;
     IoRestorecommercePolicyPolicyListResponse: ResolverTypeWrapper<IoRestorecommercePolicyPolicyListResponse>;
@@ -539,6 +556,7 @@ export declare type ResolversTypes = ResolversObject<{
     IoRestorecommercePolicyPolicy: ResolverTypeWrapper<IoRestorecommercePolicyPolicy>;
     IoRestorecommerceMetaMeta: ResolverTypeWrapper<IoRestorecommerceMetaMeta>;
     Float: ResolverTypeWrapper<Scalars['Float']>;
+    IoRestorecommerceAttributeAttributeObj: ResolverTypeWrapper<IoRestorecommerceAttributeAttributeObj>;
     IoRestorecommerceStatusStatus: ResolverTypeWrapper<IoRestorecommerceStatusStatus>;
     IIoRestorecommerceResourcebaseReadRequest: IIoRestorecommerceResourcebaseReadRequest;
     IIoRestorecommerceResourcebaseSort: IIoRestorecommerceResourcebaseSort;
@@ -549,9 +567,6 @@ export declare type ResolversTypes = ResolversObject<{
     IoRestorecommerceResourcebaseFilterValueType: IoRestorecommerceResourcebaseFilterValueType;
     IIoRestorecommerceFilterFilterOp: IIoRestorecommerceFilterFilterOp;
     IIoRestorecommerceFilterFilter: IIoRestorecommerceFilterFilter;
-    IoRestorecommerceFilterFilterOperation: IoRestorecommerceFilterFilterOperation;
-    IoRestorecommerceFilterFilterValueType: IoRestorecommerceFilterFilterValueType;
-    IoRestorecommerceFilterFilterOpOperator: IoRestorecommerceFilterFilterOpOperator;
     IoRestorecommerceResourcebaseFilterOpOperator: IoRestorecommerceResourcebaseFilterOpOperator;
     IIoRestorecommerceResourcebaseFieldFilter: IIoRestorecommerceResourcebaseFieldFilter;
     AccessControlRuleQuery: ResolverTypeWrapper<AccessControlRuleQuery>;
@@ -570,6 +585,7 @@ export declare type ResolversTypes = ResolversObject<{
     IIoRestorecommercePolicyPolicyList: IIoRestorecommercePolicyPolicyList;
     IIoRestorecommercePolicyPolicy: IIoRestorecommercePolicyPolicy;
     IIoRestorecommerceMetaMeta: IIoRestorecommerceMetaMeta;
+    IIoRestorecommerceAttributeAttributeObj: IIoRestorecommerceAttributeAttributeObj;
     ModeType: ModeType;
     ProtoIoRestorecommerceResourcebaseDeleteResponse: ResolverTypeWrapper<ProtoIoRestorecommerceResourcebaseDeleteResponse>;
     IoRestorecommerceResourcebaseDeleteResponse: ResolverTypeWrapper<IoRestorecommerceResourcebaseDeleteResponse>;
@@ -578,7 +594,6 @@ export declare type ResolversTypes = ResolversObject<{
     IIoRestorecommerceRuleRuleList: IIoRestorecommerceRuleRuleList;
     IIoRestorecommerceRuleRule: IIoRestorecommerceRuleRule;
     IIoRestorecommerceRuleContextQuery: IIoRestorecommerceRuleContextQuery;
-    IIoRestorecommerceRuleContextQueryFilter: IIoRestorecommerceRuleContextQueryFilter;
     AccessControlPolicySetMutation: ResolverTypeWrapper<AccessControlPolicySetMutation>;
     IIoRestorecommercePolicySetPolicySetList: IIoRestorecommercePolicySetPolicySetList;
     IIoRestorecommercePolicySetPolicySet: IIoRestorecommercePolicySetPolicySet;
@@ -608,7 +623,8 @@ export declare type ResolversParentTypes = ResolversObject<{
     IoRestorecommercePolicyPolicyRQ: IoRestorecommercePolicyPolicyRq;
     IoRestorecommerceRuleRuleRQ: IoRestorecommerceRuleRuleRq;
     IoRestorecommerceRuleContextQuery: IoRestorecommerceRuleContextQuery;
-    IoRestorecommerceRuleContextQueryFilter: IoRestorecommerceRuleContextQueryFilter;
+    IoRestorecommerceFilterFilterOp: IoRestorecommerceFilterFilterOp;
+    IoRestorecommerceFilterFilter: IoRestorecommerceFilterFilter;
     AccessControlPolicyQuery: AccessControlPolicyQuery;
     ProtoIoRestorecommercePolicyPolicyListResponse: ProtoIoRestorecommercePolicyPolicyListResponse;
     IoRestorecommercePolicyPolicyListResponse: IoRestorecommercePolicyPolicyListResponse;
@@ -616,6 +632,7 @@ export declare type ResolversParentTypes = ResolversObject<{
     IoRestorecommercePolicyPolicy: IoRestorecommercePolicyPolicy;
     IoRestorecommerceMetaMeta: IoRestorecommerceMetaMeta;
     Float: Scalars['Float'];
+    IoRestorecommerceAttributeAttributeObj: IoRestorecommerceAttributeAttributeObj;
     IoRestorecommerceStatusStatus: IoRestorecommerceStatusStatus;
     IIoRestorecommerceResourcebaseReadRequest: IIoRestorecommerceResourcebaseReadRequest;
     IIoRestorecommerceResourcebaseSort: IIoRestorecommerceResourcebaseSort;
@@ -640,6 +657,7 @@ export declare type ResolversParentTypes = ResolversObject<{
     IIoRestorecommercePolicyPolicyList: IIoRestorecommercePolicyPolicyList;
     IIoRestorecommercePolicyPolicy: IIoRestorecommercePolicyPolicy;
     IIoRestorecommerceMetaMeta: IIoRestorecommerceMetaMeta;
+    IIoRestorecommerceAttributeAttributeObj: IIoRestorecommerceAttributeAttributeObj;
     ProtoIoRestorecommerceResourcebaseDeleteResponse: ProtoIoRestorecommerceResourcebaseDeleteResponse;
     IoRestorecommerceResourcebaseDeleteResponse: IoRestorecommerceResourcebaseDeleteResponse;
     IIoRestorecommerceResourcebaseDeleteRequest: IIoRestorecommerceResourcebaseDeleteRequest;
@@ -647,7 +665,6 @@ export declare type ResolversParentTypes = ResolversObject<{
     IIoRestorecommerceRuleRuleList: IIoRestorecommerceRuleRuleList;
     IIoRestorecommerceRuleRule: IIoRestorecommerceRuleRule;
     IIoRestorecommerceRuleContextQuery: IIoRestorecommerceRuleContextQuery;
-    IIoRestorecommerceRuleContextQueryFilter: IIoRestorecommerceRuleContextQueryFilter;
     AccessControlPolicySetMutation: AccessControlPolicySetMutation;
     IIoRestorecommercePolicySetPolicySetList: IIoRestorecommercePolicySetPolicySetList;
     IIoRestorecommercePolicySetPolicySet: IIoRestorecommercePolicySetPolicySet;
@@ -718,6 +735,7 @@ export declare type IoRestorecommerceRuleTargetResolvers<ContextType = AccessCon
 export declare type IoRestorecommerceAttributeAttributeResolvers<ContextType = AccessControlContext, ParentType extends ResolversParentTypes['IoRestorecommerceAttributeAttribute'] = ResolversParentTypes['IoRestorecommerceAttributeAttribute']> = ResolversObject<{
     id?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
     value?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+    attribute?: Resolver<Maybe<Array<ResolversTypes['IoRestorecommerceAttributeAttribute']>>, ParentType, ContextType>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
 export declare type IoRestorecommercePolicyPolicyRqResolvers<ContextType = AccessControlContext, ParentType extends ResolversParentTypes['IoRestorecommercePolicyPolicyRQ'] = ResolversParentTypes['IoRestorecommercePolicyPolicyRQ']> = ResolversObject<{
@@ -744,16 +762,45 @@ export declare type IoRestorecommerceRuleEffectResolvers = {
     DENY: 1;
 };
 export declare type IoRestorecommerceRuleContextQueryResolvers<ContextType = AccessControlContext, ParentType extends ResolversParentTypes['IoRestorecommerceRuleContextQuery'] = ResolversParentTypes['IoRestorecommerceRuleContextQuery']> = ResolversObject<{
-    filters?: Resolver<Maybe<Array<ResolversTypes['IoRestorecommerceRuleContextQueryFilter']>>, ParentType, ContextType>;
+    filters?: Resolver<Maybe<Array<ResolversTypes['IoRestorecommerceFilterFilterOp']>>, ParentType, ContextType>;
     query?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
-export declare type IoRestorecommerceRuleContextQueryFilterResolvers<ContextType = AccessControlContext, ParentType extends ResolversParentTypes['IoRestorecommerceRuleContextQueryFilter'] = ResolversParentTypes['IoRestorecommerceRuleContextQueryFilter']> = ResolversObject<{
+export declare type IoRestorecommerceFilterFilterOpResolvers<ContextType = AccessControlContext, ParentType extends ResolversParentTypes['IoRestorecommerceFilterFilterOp'] = ResolversParentTypes['IoRestorecommerceFilterFilterOp']> = ResolversObject<{
+    filter?: Resolver<Maybe<Array<ResolversTypes['IoRestorecommerceFilterFilter']>>, ParentType, ContextType>;
+    operator?: Resolver<Maybe<ResolversTypes['IoRestorecommerceFilterFilterOpOperator']>, ParentType, ContextType>;
+    __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+}>;
+export declare type IoRestorecommerceFilterFilterResolvers<ContextType = AccessControlContext, ParentType extends ResolversParentTypes['IoRestorecommerceFilterFilter'] = ResolversParentTypes['IoRestorecommerceFilterFilter']> = ResolversObject<{
     field?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-    operation?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+    operation?: Resolver<Maybe<ResolversTypes['IoRestorecommerceFilterFilterOperation']>, ParentType, ContextType>;
     value?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+    type?: Resolver<Maybe<ResolversTypes['IoRestorecommerceFilterFilterValueType']>, ParentType, ContextType>;
+    filters?: Resolver<Maybe<Array<ResolversTypes['IoRestorecommerceFilterFilterOp']>>, ParentType, ContextType>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
+export declare type IoRestorecommerceFilterFilterOperationResolvers = {
+    eq: 'undefined';
+    lt: 1;
+    lte: 2;
+    gt: 3;
+    gte: 4;
+    isEmpty: 5;
+    iLike: 6;
+    in: 7;
+    neq: 8;
+};
+export declare type IoRestorecommerceFilterFilterValueTypeResolvers = {
+    STRING: 'undefined';
+    NUMBER: 1;
+    BOOLEAN: 2;
+    DATE: 3;
+    ARRAY: 4;
+};
+export declare type IoRestorecommerceFilterFilterOpOperatorResolvers = {
+    and: 'undefined';
+    or: 1;
+};
 export declare type AccessControlPolicyQueryResolvers<ContextType = AccessControlContext, ParentType extends ResolversParentTypes['AccessControlPolicyQuery'] = ResolversParentTypes['AccessControlPolicyQuery']> = ResolversObject<{
     Read?: Resolver<Maybe<ResolversTypes['ProtoIoRestorecommercePolicyPolicyListResponse']>, ParentType, ContextType, RequireFields<AccessControlPolicyQueryReadArgs, 'input'>>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
@@ -790,6 +837,11 @@ export declare type IoRestorecommerceMetaMetaResolvers<ContextType = AccessContr
     modified?: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
     modifiedBy?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
     owner?: Resolver<Maybe<Array<ResolversTypes['IoRestorecommerceAttributeAttribute']>>, ParentType, ContextType>;
+    acl?: Resolver<Maybe<Array<ResolversTypes['IoRestorecommerceAttributeAttributeObj']>>, ParentType, ContextType>;
+    __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+}>;
+export declare type IoRestorecommerceAttributeAttributeObjResolvers<ContextType = AccessControlContext, ParentType extends ResolversParentTypes['IoRestorecommerceAttributeAttributeObj'] = ResolversParentTypes['IoRestorecommerceAttributeAttributeObj']> = ResolversObject<{
+    attribute?: Resolver<Maybe<ResolversTypes['IoRestorecommerceAttributeAttribute']>, ParentType, ContextType>;
     __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
 export declare type IoRestorecommerceStatusStatusResolvers<ContextType = AccessControlContext, ParentType extends ResolversParentTypes['IoRestorecommerceStatusStatus'] = ResolversParentTypes['IoRestorecommerceStatusStatus']> = ResolversObject<{
@@ -821,28 +873,6 @@ export declare type IoRestorecommerceResourcebaseFilterValueTypeResolvers = {
     DATE: 3;
     ARRAY: 4;
 };
-export declare type IoRestorecommerceFilterFilterOperationResolvers = {
-    eq: 'undefined';
-    lt: 1;
-    lte: 2;
-    gt: 3;
-    gte: 4;
-    isEmpty: 5;
-    iLike: 6;
-    in: 7;
-    neq: 8;
-};
-export declare type IoRestorecommerceFilterFilterValueTypeResolvers = {
-    STRING: 'undefined';
-    NUMBER: 1;
-    BOOLEAN: 2;
-    DATE: 3;
-    ARRAY: 4;
-};
-export declare type IoRestorecommerceFilterFilterOpOperatorResolvers = {
-    and: 'undefined';
-    or: 1;
-};
 export declare type IoRestorecommerceResourcebaseFilterOpOperatorResolvers = {
     and: 'undefined';
     or: 1;
@@ -958,20 +988,22 @@ export declare type Resolvers<ContextType = AccessControlContext> = ResolversObj
     IoRestorecommerceRuleRuleRQ?: IoRestorecommerceRuleRuleRqResolvers<ContextType>;
     IoRestorecommerceRuleEffect?: IoRestorecommerceRuleEffectResolvers;
     IoRestorecommerceRuleContextQuery?: IoRestorecommerceRuleContextQueryResolvers<ContextType>;
-    IoRestorecommerceRuleContextQueryFilter?: IoRestorecommerceRuleContextQueryFilterResolvers<ContextType>;
+    IoRestorecommerceFilterFilterOp?: IoRestorecommerceFilterFilterOpResolvers<ContextType>;
+    IoRestorecommerceFilterFilter?: IoRestorecommerceFilterFilterResolvers<ContextType>;
+    IoRestorecommerceFilterFilterOperation?: IoRestorecommerceFilterFilterOperationResolvers;
+    IoRestorecommerceFilterFilterValueType?: IoRestorecommerceFilterFilterValueTypeResolvers;
+    IoRestorecommerceFilterFilterOpOperator?: IoRestorecommerceFilterFilterOpOperatorResolvers;
     AccessControlPolicyQuery?: AccessControlPolicyQueryResolvers<ContextType>;
     ProtoIoRestorecommercePolicyPolicyListResponse?: ProtoIoRestorecommercePolicyPolicyListResponseResolvers<ContextType>;
     IoRestorecommercePolicyPolicyListResponse?: IoRestorecommercePolicyPolicyListResponseResolvers<ContextType>;
     IoRestorecommercePolicyPolicyResponse?: IoRestorecommercePolicyPolicyResponseResolvers<ContextType>;
     IoRestorecommercePolicyPolicy?: IoRestorecommercePolicyPolicyResolvers<ContextType>;
     IoRestorecommerceMetaMeta?: IoRestorecommerceMetaMetaResolvers<ContextType>;
+    IoRestorecommerceAttributeAttributeObj?: IoRestorecommerceAttributeAttributeObjResolvers<ContextType>;
     IoRestorecommerceStatusStatus?: IoRestorecommerceStatusStatusResolvers<ContextType>;
     IoRestorecommerceResourcebaseSortSortOrder?: IoRestorecommerceResourcebaseSortSortOrderResolvers;
     IoRestorecommerceResourcebaseFilterOperation?: IoRestorecommerceResourcebaseFilterOperationResolvers;
     IoRestorecommerceResourcebaseFilterValueType?: IoRestorecommerceResourcebaseFilterValueTypeResolvers;
-    IoRestorecommerceFilterFilterOperation?: IoRestorecommerceFilterFilterOperationResolvers;
-    IoRestorecommerceFilterFilterValueType?: IoRestorecommerceFilterFilterValueTypeResolvers;
-    IoRestorecommerceFilterFilterOpOperator?: IoRestorecommerceFilterFilterOpOperatorResolvers;
     IoRestorecommerceResourcebaseFilterOpOperator?: IoRestorecommerceResourcebaseFilterOpOperatorResolvers;
     AccessControlRuleQuery?: AccessControlRuleQueryResolvers<ContextType>;
     ProtoIoRestorecommerceRuleRuleListResponse?: ProtoIoRestorecommerceRuleRuleListResponseResolvers<ContextType>;