@restorecommerce/facade 0.3.4 → 0.3.7

package/CHANGELOG.md

@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.3.7](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.3.6...@restorecommerce/facade@0.3.7) (2022-03-14)
+
+
+### Bug Fixes
+
+* **facade:** encode any type to buffered json ([9dbb5cb](https://github.com/restorecommerce/libs/commit/9dbb5cb9985f1bdcfd8ac4a9b1ab8bde050be8b2))
+
+
+
+
+
+## [0.3.6](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.3.5...@restorecommerce/facade@0.3.6) (2022-03-09)
+
+
+### Bug Fixes
+
+* **facade:** merge query and mutation resolvers ([c2481b0](https://github.com/restorecommerce/libs/commit/c2481b05c46a5992d2a05017f9c4d279f3055613))
+* **facade:** to add scope only to root mutation / query instead of all input types and updated suject scope to read from request scope ([9bbc8da](https://github.com/restorecommerce/libs/commit/9bbc8daba19d1ce5ef16b54f9353b9c2df39258e))
+
+
+
+
+
+## [0.3.5](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.3.4...@restorecommerce/facade@0.3.5) (2022-03-04)
+
+
+### Bug Fixes
+
+* **facade:** added null check ([2ff25fe](https://github.com/restorecommerce/libs/commit/2ff25febd04ffa624d2ba4a7b50179726abfe8da))
+
+
+
+
+
 ## [0.3.4](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.3.3...@restorecommerce/facade@0.3.4) (2022-03-04)
 
 

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

@@ -1,4 +1,4 @@
-import { GraphQLInputField, GraphQLResolveInfo, GraphQLSchema, ThunkObjMap } from "graphql";
+import { GraphQLInputField, GraphQLOutputType, GraphQLResolveInfo, GraphQLSchema, ThunkObjMap } from "graphql";
 import { GraphQLEnumType, GraphQLFieldConfig, GraphQLFieldConfigMap, GraphQLInputObjectType, GraphQLInputType } from "graphql/type/definition";
 import { ServiceConfig, SubService, SubSpaceServiceConfig } from "./types";
 import { MethodDescriptorProto, ServiceDescriptorProto } from "ts-proto-descriptors";
@@ -6,6 +6,7 @@ import { GrpcClientConfig } from "@restorecommerce/grpc-client";
 export declare const getGQLSchema: <TSource, TContext>(method: MethodDescriptorProto) => GraphQLFieldConfig<TSource, TContext, any>;
 export declare const getGQLSchemas: <TSource, TContext>(service: ServiceDescriptorProto) => GraphQLFieldConfigMap<TSource, TContext>;
 export declare const recursiveUploadToBuffer: (data: any, model: GraphQLInputObjectType | GraphQLEnumType | GraphQLInputField | GraphQLInputType) => Promise<any>;
+export declare const recursiveBufferToValue: (data: any, model: GraphQLOutputType) => any;
 export declare type ResolverFn<TResult, TParent, TContext, TArgs> = (parent: TParent, args: TArgs, context: TContext, info: GraphQLResolveInfo) => Promise<TResult> | TResult;
 declare type ServiceClient<Context extends Pick<Context, Key>, Key extends keyof Context, T extends Record<string, any>> = {
     [V in Key]: {
@@ -15,7 +16,8 @@ declare type ServiceClient<Context extends Pick<Context, Key>, Key extends keyof
 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, service?: ServiceDescriptorProto | undefined) => void;
 export declare const generateResolver: (...namespaces: string[]) => any;
-export declare const registerResolverSchema: (namespace: string, name: string, schema: ThunkObjMap<GraphQLFieldConfig<any, any>>, mutation?: boolean, subspace?: string | undefined) => void;
+declare type SchemaBaseOrSub = ThunkObjMap<GraphQLFieldConfig<any, any>> | Map<string, ThunkObjMap<GraphQLFieldConfig<any, any>>>;
+export declare const registerResolverSchema: (namespace: string, name: string, schema: SchemaBaseOrSub, mutation?: boolean, subspace?: string | undefined) => void;
 export declare const generateSchema: (setup: {
     prefix: string;
     namespace: string;

package/dist/gql/protos/graphql.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateSubServiceResolvers = exports.generateSubServiceSchemas = exports.getAndGenerateResolvers = exports.getAndGenerateSchema = exports.getWhitelistBlacklistConfig = exports.generateSchema = exports.registerResolverSchema = exports.generateResolver = exports.registerResolverFunction = exports.getGQLResolverFunctions = exports.recursiveUploadToBuffer = exports.getGQLSchemas = exports.getGQLSchema = void 0;
+exports.generateSubServiceResolvers = exports.generateSubServiceSchemas = exports.getAndGenerateResolvers = exports.getAndGenerateSchema = exports.getWhitelistBlacklistConfig = exports.generateSchema = exports.registerResolverSchema = exports.generateResolver = exports.registerResolverFunction = exports.getGQLResolverFunctions = exports.recursiveBufferToValue = exports.recursiveUploadToBuffer = exports.getGQLSchemas = exports.getGQLSchema = void 0;
 const graphql_1 = require("graphql");
 const definition_1 = require("graphql/type/definition");
 const types_1 = require("./types");
@@ -62,10 +62,26 @@ const recursiveUploadToBuffer = async (data, model) => {
         return data;
     }
     if (model instanceof definition_1.GraphQLInputObjectType) {
-        const fields = model.getFields();
-        for (let key of Object.keys(fields)) {
-            if (key in data) {
-                data[key] = await (0, exports.recursiveUploadToBuffer)(data[key], fields[key].type);
+        if (model.name === 'IGoogleProtobufAny') {
+            // TODO Use encoded once resource base supports it
+            // const typing = getTyping(data.typeUrl);
+            // if (!typing) {
+            //   throw Error(`GoogleProtobufAny could not find input type: ${data.typeUrl}`);
+            // }
+            //
+            // const encoded = typing.processor.encode(typing.processor.fromPartial(data.value)).finish();
+            const encoded = Buffer.from(JSON.stringify(data.value));
+            return {
+                ...data,
+                value: encoded
+            };
+        }
+        else {
+            const fields = model.getFields();
+            for (let key of Object.keys(fields)) {
+                if (data && key in data) {
+                    data[key] = await (0, exports.recursiveUploadToBuffer)(data[key], fields[key].type);
+                }
             }
         }
     }
@@ -96,19 +112,55 @@ const recursiveUploadToBuffer = async (data, model) => {
     return data;
 };
 exports.recursiveUploadToBuffer = recursiveUploadToBuffer;
+const recursiveBufferToValue = (data, model) => {
+    if (model instanceof definition_1.GraphQLEnumType) {
+        return data;
+    }
+    if (model instanceof graphql_1.GraphQLObjectType) {
+        if (model.name === 'GoogleProtobufAny') {
+            // TODO Use encoded once resource base supports it
+            const decoded = JSON.parse(data.value.toString());
+            return {
+                ...data,
+                value: decoded
+            };
+        }
+        else {
+            const fields = model.getFields();
+            for (let key of Object.keys(fields)) {
+                if (data && key in data) {
+                    data[key] = (0, exports.recursiveBufferToValue)(data[key], fields[key].type);
+                }
+            }
+        }
+    }
+    if (model instanceof graphql_1.GraphQLNonNull) {
+        return (0, exports.recursiveBufferToValue)(data, model.ofType);
+    }
+    if (model instanceof graphql_1.GraphQLList) {
+        for (let i = 0; i < data.length; i++) {
+            data[i] = (0, exports.recursiveBufferToValue)(data[i], model.ofType);
+        }
+    }
+    return data;
+};
+exports.recursiveBufferToValue = recursiveBufferToValue;
 const getGQLResolverFunctions = (service, key, serviceKey, grpcClientConfig) => {
     if (!service.method) {
         return {};
     }
     return service.method.reduce((obj, method) => {
         const typing = (0, registry_1.getTyping)(method.inputType);
+        const outputTyping = (0, registry_1.getTyping)(method.outputType);
         if (!typing) {
             throw Error(`Method '${method.name}' could not find input type: ${method.inputType}`);
         }
+        if (!outputTyping) {
+            throw Error(`Method '${method.name}' could not find output type: ${method.outputType}`);
+        }
         if (!('fromPartial' in typing.processor)) {
             throw Error(`Method ${method.name} input type '${method.inputType}' does not contain 'fromPartial' function`);
         }
-        const defaults = typing.processor.fromPartial({});
         let subjectField = null;
         if (typing) {
             for (let field of typing.meta.field) {
@@ -118,16 +170,20 @@ const getGQLResolverFunctions = (service, key, serviceKey, grpcClientConfig) =>
                 }
             }
         }
-        obj[method.name] = async (args, context) => {
+        let methodName = method.name;
+        if (Mutate.indexOf(method.name) > -1) {
+            methodName = 'Mutate';
+        }
+        if (methodName in obj) {
+            return obj;
+        }
+        obj[methodName] = async (args, context) => {
+            var _a;
             const client = context[key].client;
             const service = client[serviceKey];
             try {
                 const converted = await (0, exports.recursiveUploadToBuffer)(args.input, typing.input);
-                let req = {
-                    // Fill defaults
-                    ...defaults,
-                    ...converted
-                };
+                let req = typing.processor.fromPartial(converted);
                 // convert enum strings to integers
                 req = (0, utils_1.convertEnumToInt)(typing, req);
                 if (subjectField !== null) {
@@ -136,8 +192,29 @@ const getGQLResolverFunctions = (service, key, serviceKey, grpcClientConfig) =>
                     if (authToken && authToken.startsWith('Bearer ')) {
                         req.subject.token = authToken.split(' ')[1];
                     }
+                    if (req.scope) {
+                        req.subject.scope = req.scope;
+                    }
+                }
+                let realMethod = method.name;
+                if (Mutate.indexOf(method.name) > -1) {
+                    const mode = (_a = args === null || args === void 0 ? void 0 : args.input) === null || _a === void 0 ? void 0 : _a.mode;
+                    if (!mode) {
+                        throw new Error('Please specify mode');
+                    }
+                    if (mode === 'CREATE') {
+                        realMethod = 'Create';
+                    }
+                    else if (mode === 'UPDATE') {
+                        realMethod = 'Update';
+                    }
+                    else if (mode === 'UPSERT') {
+                        realMethod = 'Upsert';
+                    }
                 }
-                const result = await service[method.name](req);
+                console.log(outputTyping);
+                const rawResult = await service[realMethod](req);
+                const result = (0, exports.recursiveBufferToValue)(rawResult, outputTyping.output);
                 const bufferFields = (0, utils_1.getKeys)(grpcClientConfig === null || grpcClientConfig === void 0 ? void 0 : grpcClientConfig.bufferFields);
                 if (result instanceof stream.Readable) {
                     let operationStatus = { code: 0, message: '' };
@@ -226,155 +303,6 @@ const getGQLResolverFunctions = (service, key, serviceKey, grpcClientConfig) =>
 };
 exports.getGQLResolverFunctions = getGQLResolverFunctions;
 const namespaceResolverRegistry = new Map();
-const MutateResolver = async (req, ctx, schema) => {
-    var _a, _b, _c, _d, _e, _f;
-    let module_name, key, service;
-    if ((_b = (_a = schema === null || schema === void 0 ? void 0 : schema.path) === null || _a === void 0 ? void 0 : _a.prev) === null || _b === void 0 ? void 0 : _b.key) {
-        key = schema.path.prev.key;
-    }
-    if ((_d = (_c = schema === null || schema === void 0 ? void 0 : schema.path) === null || _c === void 0 ? void 0 : _c.prev) === null || _d === void 0 ? void 0 : _d.typename) {
-        let typeName = schema.path.prev.typename;
-        if (typeName.endsWith('Mutation')) {
-            module_name = typeName.split('Mutation')[0];
-        }
-    }
-    if (key && module_name) {
-        module_name = (0, utils_1.convertyCamelToSnakeCase)(module_name);
-        key = (0, utils_1.convertyCamelToSnakeCase)(key);
-        service = (_e = ctx[module_name]) === null || _e === void 0 ? void 0 : _e.client[key];
-    }
-    try {
-        let method = '';
-        let input = req.input;
-        const mode = (_f = req === null || req === void 0 ? void 0 : req.input) === null || _f === void 0 ? void 0 : _f.mode;
-        if (!mode) {
-            throw new Error('Please specify mode');
-        }
-        if (mode === 'CREATE') {
-            method = 'Create';
-        }
-        else if (mode === 'UPDATE') {
-            method = 'Update';
-        }
-        else if (mode === 'UPSERT') {
-            method = 'Upsert';
-        }
-        const inputMethodTypeKey = module_name.toLowerCase() + '.' + key.toLowerCase() + '.' + method.toLowerCase();
-        const nsType = inputMethodType.get(inputMethodTypeKey);
-        if (nsType) {
-            const inputTyping = (0, registry_1.getTyping)(nsType);
-            (0, utils_1.convertEnumToInt)(inputTyping, input);
-        }
-        // check service object contains requested mode's method def
-        if (!service[method]) {
-            throw new Error(`Method ${method} not defined on ${module_name}`);
-        }
-        // update subject token from authorizatin header
-        let subject = {
-            id: '',
-            scope: '',
-            roleAssociations: [],
-            hierarchicalScopes: [],
-            token: '',
-            unauthenticated: false
-        };
-        const authToken = ctx.request.req.headers['authorization'];
-        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,
-                operationStatus: result.operationStatus // overall status
-            }
-        };
-    }
-    catch (error) {
-        console.error(error);
-        return {
-            details: {
-                items: [],
-                operationStatus: {
-                    code: error.code,
-                    message: error.message
-                }
-            }
-        };
-    }
-};
 const registerResolverFunction = (namespace, name, func, mutation = false, subspace = undefined, service) => {
     if (!namespaceResolverRegistry.has(namespace)) {
         namespaceResolverRegistry.set(namespace, new Map());
@@ -404,11 +332,6 @@ const registerResolverFunction = (namespace, name, func, mutation = false, subsp
             inputMethodType.set(key, value.inputType);
         }
     }
-    // custom mutation resolver for create, update and upsert - Mutate
-    if (Mutate.indexOf(name) > -1) {
-        name = 'Mutate';
-        func = MutateResolver;
-    }
     space.set(name, func);
 };
 exports.registerResolverFunction = registerResolverFunction;
@@ -601,6 +524,9 @@ const getWhitelistBlacklistConfig = (metaService, queries, config) => {
             }
         }
     }
+    if (Mutate.findIndex(val => mut.has(val)) > -1) {
+        mut.add('Mutate');
+    }
     return {
         mutations: mut,
         queries: que

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

@@ -10,6 +10,7 @@ export interface TypingData {
 }
 export declare const registeredTypings: Map<string, TypingData>;
 export declare const scalarTypes: string[];
+export declare const IGoogleProtobufAny: GraphQLInputObjectType;
 export declare const clearRegistry: () => void;
 export declare const registerPackagesRecursive: (...protoMetadata: ProtoMetadata[]) => void;
 export declare const getRegisteredEnumTypings: () => string[];

package/dist/gql/protos/registry.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTyping = exports.registerEnumTyping = exports.registerTyping = exports.recursiveEnumCheck = exports.getNameSpaceTypeName = exports.getRegisteredEnumTypings = exports.registerPackagesRecursive = exports.clearRegistry = exports.scalarTypes = exports.registeredTypings = void 0;
+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");
@@ -14,7 +14,28 @@ const registeredEnumTypes = [];
 const MapScalar = new definition_1.GraphQLScalarType({
     name: 'MapScalar',
 });
+const GoogleProtobufAnyValue = new definition_1.GraphQLScalarType({
+    name: 'GoogleProtobufAnyValue'
+});
+const protobufAnyFields = {
+    typeUrl: {
+        type: graphql_1.GraphQLString
+    },
+    value: {
+        type: GoogleProtobufAnyValue
+    }
+};
+const GoogleProtobufAny = new graphql_1.GraphQLObjectType({
+    name: 'GoogleProtobufAny',
+    fields: protobufAnyFields
+});
+exports.IGoogleProtobufAny = new definition_1.GraphQLInputObjectType({
+    name: 'IGoogleProtobufAny',
+    fields: protobufAnyFields
+});
+const googleProtobufAnyName = '.google.protobuf.Any';
 const Mutate = ['Create', 'Update', 'Upsert'];
+const CRUD_OPERATION_NAMES = ['Cretae', 'Update', 'Upsert', 'Delete', 'Read'];
 const TodoScalar = new definition_1.GraphQLScalarType({
     name: 'TodoScalar',
     serialize: () => {
@@ -119,6 +140,7 @@ const ModeType = new definition_1.GraphQLEnumType({
 });
 const registerTyping = (protoPackage, message, methodDef, opts, inputOpts) => {
     let insertMode = false;
+    let crudOperation = false;
     const type = (protoPackage.startsWith('.') ? '' : '.') + protoPackage + '.' + message.name;
     if (methodDef && methodDef.length > 0) {
         for (let method of methodDef) {
@@ -127,8 +149,21 @@ const registerTyping = (protoPackage, message, methodDef, opts, inputOpts) => {
             if ((Mutate.indexOf(method.name) > -1) && type === method.inputType) {
                 insertMode = true;
             }
+            // add scope
+            if ((CRUD_OPERATION_NAMES.indexOf(method.name) > -1) && type === method.inputType) {
+                crudOperation = true;
+            }
         }
     }
+    if (type === googleProtobufAnyName) {
+        // Do not register any type
+        typeNameAndNameSpaceMapping.set(GoogleProtobufAny.name, type);
+        exports.registeredTypings.set(type, {
+            output: GoogleProtobufAny,
+            input: exports.IGoogleProtobufAny,
+            meta: message
+        });
+    }
     if (exports.registeredTypings.has(type)) {
         // TODO Log debug "Typings for object are already registered"
         return;
@@ -166,12 +201,14 @@ const registerTyping = (protoPackage, message, methodDef, opts, inputOpts) => {
                 type: ModeType
             };
         }
-        // add scope to all mutations / queries
-        if (!result.scope) {
-            result['scope'] = {
-                description: 'target scope',
-                type: graphql_1.GraphQLString
-            };
+        if (crudOperation) {
+            // add scope to all mutations / queries
+            if (!result.scope) {
+                result['scope'] = {
+                    description: 'target scope',
+                    type: graphql_1.GraphQLString
+                };
+            }
         }
         return result;
     };
@@ -235,6 +272,14 @@ const resolveMeta = (key, field, rootObjType, objName, input) => {
         case ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_ENUM:
         case ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_MESSAGE:
             const objType = field.typeName;
+            if (objType === googleProtobufAnyName) {
+                if (input) {
+                    result = exports.IGoogleProtobufAny;
+                    break;
+                }
+                result = GoogleProtobufAny;
+                break;
+            }
             if (!exports.registeredTypings.has(objType)) {
                 throw new Error("Typing '" + objType + "' not registered for key '" + key + "' in object: " + objName);
             }