@restorecommerce/facade 0.3.11 → 0.3.14

package/CHANGELOG.md

@@ -3,6 +3,37 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.3.14](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.3.13...@restorecommerce/facade@0.3.14) (2022-04-01)
+
+
+### Bug Fixes
+
+* **facade:** fix to convert google.protobuf.timestamp to DateTime scalar type and convert it to JS Date object for create / update operation. ([ced5ecf](https://github.com/restorecommerce/libs/commit/ced5ecfae25eb928691a6a17eb32683ae9650a68))
+* **facade:** renamed preprocess and postprocess GQL function name ([ef0f5f0](https://github.com/restorecommerce/libs/commit/ef0f5f02dcd605067b6399d4afa525248ce64417))
+
+
+
+
+
+## [0.3.13](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.3.12...@restorecommerce/facade@0.3.13) (2022-03-29)
+
+**Note:** Version bump only for package @restorecommerce/facade
+
+
+
+
+
+## [0.3.12](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.3.11...@restorecommerce/facade@0.3.12) (2022-03-23)
+
+
+### Bug Fixes
+
+* **facade:** include scope for traversal operation as well ([cf57b73](https://github.com/restorecommerce/libs/commit/cf57b733f1788fd07d8a63ca0c9614c954b577d9))
+
+
+
+
+
 ## [0.3.11](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.3.10...@restorecommerce/facade@0.3.11) (2022-03-15)
 
 

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

@@ -5,8 +5,8 @@ import { MethodDescriptorProto, ServiceDescriptorProto } from "ts-proto-descript
 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 const preprocessGQLInput: (data: any, model: GraphQLInputObjectType | GraphQLEnumType | GraphQLInputField | GraphQLInputType) => Promise<any>;
+export declare const postProcessGQLValue: (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]: {

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.recursiveBufferToValue = 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.postProcessGQLValue = exports.preprocessGQLInput = exports.getGQLSchemas = exports.getGQLSchema = void 0;
 const graphql_1 = require("graphql");
 const definition_1 = require("graphql/type/definition");
 const types_1 = require("./types");
@@ -57,7 +57,7 @@ const getGQLSchemas = (service) => {
     }, {});
 };
 exports.getGQLSchemas = getGQLSchemas;
-const recursiveUploadToBuffer = async (data, model) => {
+const preprocessGQLInput = async (data, model) => {
     if (model instanceof definition_1.GraphQLEnumType) {
         return data;
     }
@@ -80,17 +80,22 @@ const recursiveUploadToBuffer = async (data, model) => {
             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);
+                    data[key] = await (0, exports.preprocessGQLInput)(data[key], fields[key].type);
                 }
             }
         }
     }
+    if (model instanceof definition_1.GraphQLScalarType) {
+        if (model.name === 'IDateTime') {
+            return new Date(data);
+        }
+    }
     if (model instanceof graphql_1.GraphQLNonNull) {
-        return await (0, exports.recursiveUploadToBuffer)(data, model.ofType);
+        return await (0, exports.preprocessGQLInput)(data, model.ofType);
     }
     if (model instanceof graphql_1.GraphQLList) {
         for (let i = 0; i < data.length; i++) {
-            data[i] = await (0, exports.recursiveUploadToBuffer)(data[i], model.ofType);
+            data[i] = await (0, exports.preprocessGQLInput)(data[i], model.ofType);
         }
     }
     if (model instanceof definition_1.GraphQLScalarType) {
@@ -111,8 +116,8 @@ const recursiveUploadToBuffer = async (data, model) => {
     }
     return data;
 };
-exports.recursiveUploadToBuffer = recursiveUploadToBuffer;
-const recursiveBufferToValue = (data, model) => {
+exports.preprocessGQLInput = preprocessGQLInput;
+const postProcessGQLValue = (data, model) => {
     if (model instanceof definition_1.GraphQLEnumType) {
         return data;
     }
@@ -129,22 +134,22 @@ const recursiveBufferToValue = (data, model) => {
             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);
+                    data[key] = (0, exports.postProcessGQLValue)(data[key], fields[key].type);
                 }
             }
         }
     }
     if (model instanceof graphql_1.GraphQLNonNull) {
-        return (0, exports.recursiveBufferToValue)(data, model.ofType);
+        return (0, exports.postProcessGQLValue)(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);
+            data[i] = (0, exports.postProcessGQLValue)(data[i], model.ofType);
         }
     }
     return data;
 };
-exports.recursiveBufferToValue = recursiveBufferToValue;
+exports.postProcessGQLValue = postProcessGQLValue;
 const getGQLResolverFunctions = (service, key, serviceKey, grpcClientConfig) => {
     if (!service.method) {
         return {};
@@ -182,7 +187,7 @@ const getGQLResolverFunctions = (service, key, serviceKey, grpcClientConfig) =>
             const client = context[key].client;
             const service = client[serviceKey];
             try {
-                const converted = await (0, exports.recursiveUploadToBuffer)(args.input, typing.input);
+                const converted = await (0, exports.preprocessGQLInput)(args.input, typing.input);
                 const scope = (_a = args === null || args === void 0 ? void 0 : args.input) === null || _a === void 0 ? void 0 : _a.scope;
                 let req = typing.processor.fromPartial(converted);
                 // convert enum strings to integers
@@ -214,7 +219,7 @@ const getGQLResolverFunctions = (service, key, serviceKey, grpcClientConfig) =>
                     }
                 }
                 const rawResult = await service[realMethod](req);
-                const result = (0, exports.recursiveBufferToValue)(rawResult, outputTyping.output);
+                const result = (0, exports.postProcessGQLValue)(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: '' };

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

@@ -1,10 +1,10 @@
 import { GraphQLEnumTypeConfig, GraphQLInputObjectTypeConfig, GraphQLObjectType, GraphQLObjectTypeConfig } from "graphql";
-import { GraphQLEnumType, GraphQLInputObjectType } from "graphql/type/definition";
+import { GraphQLEnumType, GraphQLInputObjectType, GraphQLScalarType } from "graphql/type/definition";
 import { ProtoMetadata } from "./types";
 import { DescriptorProto, EnumDescriptorProto, MethodDescriptorProto } from "ts-proto-descriptors";
 export interface TypingData {
-    output: GraphQLObjectType | GraphQLEnumType;
-    input: GraphQLInputObjectType | GraphQLEnumType;
+    output: GraphQLObjectType | GraphQLEnumType | GraphQLScalarType;
+    input: GraphQLInputObjectType | GraphQLEnumType | GraphQLScalarType;
     meta: DescriptorProto | EnumDescriptorProto;
     processor?: any;
 }

package/dist/gql/protos/registry.js

@@ -33,9 +33,24 @@ exports.IGoogleProtobufAny = new definition_1.GraphQLInputObjectType({
     name: 'IGoogleProtobufAny',
     fields: protobufAnyFields
 });
+const DateTime = new definition_1.GraphQLScalarType({
+    name: 'DateTime',
+    description: `A date-time string at UTC, such as 2007-12-03T10:15:30Z, 
+                compliant with the date-time format outlined in section 5.6 of 
+                the RFC 3339 profile of the ISO 8601 standard for representation
+                of dates and times using the Gregorian calendar.`,
+});
+const IDateTime = new definition_1.GraphQLScalarType({
+    name: 'IDateTime',
+    description: `A date-time string at UTC, such as 2007-12-03T10:15:30Z, 
+                compliant with the date-time format outlined in section 5.6 of 
+                the RFC 3339 profile of the ISO 8601 standard for representation
+                of dates and times using the Gregorian calendar.`,
+});
 const googleProtobufAnyName = '.google.protobuf.Any';
+const googleProtobufTimestampName = '.google.protobuf.Timestamp';
 const Mutate = ['Create', 'Update', 'Upsert'];
-const CRUD_OPERATION_NAMES = ['Cretae', 'Update', 'Upsert', 'Delete', 'Read'];
+const CRUD_TRAVERSAL_OP_NAMES = ['Cretae', 'Update', 'Upsert', 'Delete', 'Read', 'Traversal'];
 const TodoScalar = new definition_1.GraphQLScalarType({
     name: 'TodoScalar',
     serialize: () => {
@@ -150,7 +165,7 @@ const registerTyping = (protoPackage, message, methodDef, opts, inputOpts) => {
                 insertMode = true;
             }
             // add scope
-            if ((CRUD_OPERATION_NAMES.indexOf(method.name) > -1) && type === method.inputType) {
+            if ((CRUD_TRAVERSAL_OP_NAMES.indexOf(method.name) > -1) && type === method.inputType) {
                 crudOperation = true;
             }
         }
@@ -164,6 +179,14 @@ const registerTyping = (protoPackage, message, methodDef, opts, inputOpts) => {
             meta: message
         });
     }
+    if (type === googleProtobufTimestampName) {
+        typeNameAndNameSpaceMapping.set(DateTime.name, type);
+        exports.registeredTypings.set(type, {
+            output: DateTime,
+            input: IDateTime,
+            meta: message
+        });
+    }
     if (exports.registeredTypings.has(type)) {
         // TODO Log debug "Typings for object are already registered"
         return;
@@ -280,6 +303,14 @@ const resolveMeta = (key, field, rootObjType, objName, input) => {
                 result = GoogleProtobufAny;
                 break;
             }
+            if (objType === googleProtobufTimestampName) {
+                if (input) {
+                    result = IDateTime;
+                    break;
+                }
+                result = DateTime;
+                break;
+            }
             if (!exports.registeredTypings.has(objType)) {
                 throw new Error("Typing '" + objType + "' not registered for key '" + key + "' in object: " + objName);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@restorecommerce/facade",
-  "version": "0.3.11",
+  "version": "0.3.14",
   "description": "Facade for Restorecommerce microservices",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -27,7 +27,7 @@
     "@restorecommerce/grpc-client": "^0.3.1",
     "@restorecommerce/kafka-client": "^0.3.1",
     "@restorecommerce/logger": "^0.12.1",
-    "@restorecommerce/rc-grpc-clients": "^0.4.3",
+    "@restorecommerce/rc-grpc-clients": "^0.4.4",
     "@restorecommerce/service-config": "^0.4.25",
     "apollo-server-core": "^3.6.3",
     "apollo-server-koa": "^3.6.3",
@@ -108,5 +108,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ff981ea7aa6e49d8437468a26611395f8447d5ab"
+  "gitHead": "5077b6ef727b438d0379979d6d80029b2783c1f4"
 }