@restorecommerce/resource-base-interface 0.1.1 → 0.2.3

package/lib/core/interfaces.d.ts

@@ -1,8 +1,42 @@
+import { Vertices, Collection } from '@restorecommerce/chassis-srv';
 export declare type TRequest = CreateRequest | DeleteRequest | UpdateRequest | UpsertRequest | ReadRequest;
 export interface ServiceCall<TRequest> {
     request: TRequest;
 }
 export declare type SortType = 'ASCENDING' | 'DESCENDING' | 'UNSORTED' | 2 | 1 | 0;
+export declare enum FilterOperation {
+    eq = 0,
+    lt = 1,
+    lte = 2,
+    gt = 3,
+    gte = 4,
+    isEmpty = 5,
+    iLike = 6,
+    in = 7,
+    neq = 8
+}
+export declare enum FilterValueType {
+    STRING = 0,
+    NUMBER = 1,
+    BOOLEAN = 2,
+    DATE = 3,
+    ARRAY = 4
+}
+export declare enum OperatorType {
+    and = 0,
+    or = 1
+}
+export interface Filter {
+    field: string;
+    operation: FilterOperation;
+    value: string;
+    type?: FilterValueType;
+    filters?: FilterOp[];
+}
+export interface FilterOp {
+    filter?: Filter[];
+    operator?: OperatorType;
+}
 export interface ReadRequest {
     search?: string;
     sort?: {
@@ -15,7 +49,7 @@ export interface ReadRequest {
         name: string;
         include: boolean;
     }[];
-    filter?: any;
+    filters?: FilterOp[];
     custom_queries?: string[];
     custom_arguments?: any;
 }
@@ -45,3 +79,34 @@ export interface UpsertRequest extends UpdateRequest {
 export interface CreateRequest {
     items: BaseDocument[];
 }
+export declare enum Direction {
+    OUTBOUND = "OUTBOUND",
+    INBOUND = "INBOUND"
+}
+export interface TraversalOptions {
+    include_vertex?: string[];
+    exclude_vertex?: string[];
+    include_edge?: string[];
+    exclude_edge?: string[];
+    direction?: Direction;
+}
+export interface GraphFilter {
+    field: string;
+    operation: FilterOperation;
+    value: string;
+    type?: FilterValueType;
+    filters?: GraphFilters[];
+}
+export interface GraphFilters {
+    entity?: string;
+    edge?: string;
+    filter?: GraphFilter[];
+    operator?: OperatorType;
+}
+export interface TraversalRequest {
+    vertices?: Vertices;
+    collection?: Collection;
+    opts?: TraversalOptions;
+    path?: boolean;
+    filters?: GraphFilters[];
+}

package/lib/core/interfaces.js

@@ -1,3 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Direction = exports.OperatorType = exports.FilterValueType = exports.FilterOperation = void 0;
+var FilterOperation;
+(function (FilterOperation) {
+    FilterOperation[FilterOperation["eq"] = 0] = "eq";
+    FilterOperation[FilterOperation["lt"] = 1] = "lt";
+    FilterOperation[FilterOperation["lte"] = 2] = "lte";
+    FilterOperation[FilterOperation["gt"] = 3] = "gt";
+    FilterOperation[FilterOperation["gte"] = 4] = "gte";
+    FilterOperation[FilterOperation["isEmpty"] = 5] = "isEmpty";
+    FilterOperation[FilterOperation["iLike"] = 6] = "iLike";
+    FilterOperation[FilterOperation["in"] = 7] = "in";
+    FilterOperation[FilterOperation["neq"] = 8] = "neq";
+})(FilterOperation = exports.FilterOperation || (exports.FilterOperation = {}));
+;
+var FilterValueType;
+(function (FilterValueType) {
+    FilterValueType[FilterValueType["STRING"] = 0] = "STRING";
+    FilterValueType[FilterValueType["NUMBER"] = 1] = "NUMBER";
+    FilterValueType[FilterValueType["BOOLEAN"] = 2] = "BOOLEAN";
+    FilterValueType[FilterValueType["DATE"] = 3] = "DATE";
+    FilterValueType[FilterValueType["ARRAY"] = 4] = "ARRAY";
+})(FilterValueType = exports.FilterValueType || (exports.FilterValueType = {}));
+;
+var OperatorType;
+(function (OperatorType) {
+    OperatorType[OperatorType["and"] = 0] = "and";
+    OperatorType[OperatorType["or"] = 1] = "or";
+})(OperatorType = exports.OperatorType || (exports.OperatorType = {}));
+;
+var Direction;
+(function (Direction) {
+    Direction["OUTBOUND"] = "OUTBOUND";
+    Direction["INBOUND"] = "INBOUND";
+})(Direction = exports.Direction || (exports.Direction = {}));
+;
+;
 //# sourceMappingURL=interfaces.js.map

package/lib/core/interfaces.js.map

@@ -1 +1 @@
-{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../src/core/interfaces.ts"],"names":[],"mappings":""}
+{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../src/core/interfaces.ts"],"names":[],"mappings":";;;AASA,IAAY,eAUX;AAVD,WAAY,eAAe;IACzB,iDAAM,CAAA;IACN,iDAAM,CAAA;IACN,mDAAO,CAAA;IACP,iDAAM,CAAA;IACN,mDAAO,CAAA;IACP,2DAAW,CAAA;IACX,uDAAS,CAAA;IACT,iDAAM,CAAA;IACN,mDAAO,CAAA;AACT,CAAC,EAVW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAU1B;AAAA,CAAC;AAEF,IAAY,eAMX;AAND,WAAY,eAAe;IACzB,yDAAU,CAAA;IACV,yDAAU,CAAA;IACV,2DAAW,CAAA;IACX,qDAAQ,CAAA;IACR,uDAAS,CAAA;AACX,CAAC,EANW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAM1B;AAAA,CAAC;AAEF,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,6CAAO,CAAA;IACP,2CAAM,CAAA;AACR,CAAC,EAHW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAGvB;AAAA,CAAC;AAsDF,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,kCAAqB,CAAA;IACrB,gCAAmB,CAAA;AACrB,CAAC,EAHW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAGpB;AAAA,CAAC;AAQD,CAAC"}

package/lib/index.d.ts

@@ -1,8 +1,15 @@
-export declare const toStruct: (obj: any, fromArray?: Boolean) => any;
-export declare const toObject: (struct: any, fromArray?: any) => Object;
+/**
+ * toObject takes input contained in the proto structure defined in resource_base proto
+ * and converts it into Object understandable by the underlying DB implementation in chassis-srv
+ * @param {*} input Original filter input object
+ * @param {*} obj converted filter objected passed recursively
+ * @param {*} operatorList operatorlist updated and passed recursively
+ */
+export declare const toObject: (input: any, obj?: any, operatorList?: string[]) => any;
 import { ResourcesAPIBase } from './core/ResourcesAPI';
 export { ResourcesAPIBase };
 import { ServiceBase } from './core/ServiceBase';
 export { ServiceBase };
 import { GraphResourcesServiceBase } from './core/GraphResourcesServiceBase';
 export { GraphResourcesServiceBase };
+export { Filter, FilterOp, FilterOperation, FilterValueType, OperatorType, TraversalOptions, GraphFilters, GraphFilter } from './core/interfaces';

package/lib/index.js

@@ -1,83 +1,202 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GraphResourcesServiceBase = exports.ServiceBase = exports.ResourcesAPIBase = exports.toObject = exports.toStruct = void 0;
-const _ = require("lodash");
-const toStruct = (obj, fromArray = false) => {
-    const decode = (value) => {
-        let decodedVal;
-        if (_.isNumber(value)) {
-            decodedVal = { number_value: value };
-        }
-        else if (_.isString(value)) {
-            decodedVal = { string_value: value };
+exports.OperatorType = exports.FilterValueType = exports.FilterOperation = exports.GraphResourcesServiceBase = exports.ServiceBase = exports.ResourcesAPIBase = exports.toObject = void 0;
+const _ = __importStar(require("lodash"));
+const filterOperationMap = new Map([
+    [0, 'eq'],
+    [1, 'lt'],
+    [2, 'lte'],
+    [3, 'gt'],
+    [4, 'gte'],
+    [5, 'isEmpty'],
+    [6, 'iLike'],
+    [7, 'in'],
+    [8, 'neq']
+]);
+const filterOperatorMap = new Map([
+    [0, 'and'],
+    [1, 'or']
+]);
+/**
+ * Takes filter object containing field, operation and value and inserts it
+ * to the obj using the operatorList for finding the last operator position and updates obj
+ * @param {filter} filter object containing field, operation, value and type
+ * @param {obj} obj converted filter object
+ * @param {operatorList} operatorList list of operators from original filter object
+ */
+const convertFilterToObject = (filter, obj, operatorList) => {
+    let temp = _.clone(obj);
+    let value;
+    if (!filter.type || filter.type === 'STRING' || filter.type === 0) {
+        value = filter.value;
+    }
+    else if ((filter.type === 'NUMBER' || filter.type === 1) && !isNaN(filter.value)) {
+        value = Number(filter.value);
+    }
+    else if (filter.type === 'BOOLEAN' || filter.type === 2) {
+        if (filter.value === 'true') {
+            value = true;
         }
-        else if (_.isBoolean(value)) {
-            decodedVal = { bool_value: value };
+        else if (filter.value === 'false') {
+            value = false;
         }
-        else if (_.isArray(value)) {
-            decodedVal = {
-                list_value: {
-                    values: _.map(value, (v) => {
-                        return exports.toStruct(v, true);
-                    })
-                }
-            };
+    }
+    else if (filter.type === 'ARRAY' || filter.type === 4) {
+        try {
+            value = JSON.parse(filter.value);
         }
-        else if (_.isObject(value)) {
-            decodedVal = { struct_value: exports.toStruct(value) };
+        catch (err) {
+            // to handle JSON string parse error
+            if (err.message.indexOf('Unexpected token') > -1) {
+                value = JSON.parse(JSON.stringify(filter.value));
+            }
+            else {
+                throw err;
+            }
         }
-        return decodedVal;
-    };
-    let struct;
-    // fromArray flag is true when iterating
-    // objects inside a JSON array
-    if (!fromArray) {
-        struct = {
-            fields: {},
-        };
-        _.forEach(obj, (value, key) => {
-            struct.fields[key] = decode(value);
-        });
     }
-    else {
-        struct = decode(obj);
+    else if (filter.type === 'DATE' || filter.type === 3) {
+        value = (new Date(filter.value)).getTime();
     }
-    return struct;
+    for (let i = 0; i < operatorList.length; i++) {
+        if (_.isArray(temp)) {
+            temp = _.find(temp, operatorList[i]);
+        }
+        else {
+            temp = temp[operatorList[i]];
+        }
+        if (i === (operatorList.length - 1)) {
+            // push for final element in the operatorList array
+            if (filter.operation === 'eq' || filter.operation === 0) {
+                if (_.isArray(temp)) {
+                    temp.push({ [filter.field]: value });
+                }
+                else {
+                    temp[operatorList[i]].push({ [filter.field]: value });
+                }
+            }
+            else if (filter.operation === 'neq' || filter.operation === 8) {
+                if (_.isArray(temp)) {
+                    temp.push({ [filter.field]: { $not: { $eq: value } } });
+                }
+                else {
+                    temp[operatorList[i]].push({ [filter.field]: { $not: { $eq: value } } });
+                }
+            }
+            else {
+                let op, opValue;
+                if (typeof filter.operation === 'string' || filter.operation instanceof String) {
+                    opValue = filter.operation;
+                }
+                else if (Number.isInteger(filter.operation)) {
+                    opValue = filterOperationMap.get(filter.operation);
+                }
+                op = `$${opValue}`;
+                if (_.isArray(temp)) {
+                    temp.push({ [filter.field]: { [op]: value } });
+                }
+                else {
+                    temp[operatorList[i]].push({ [filter.field]: { [op]: value } });
+                }
+            }
+        }
+    }
+    return obj;
 };
-exports.toStruct = toStruct;
-const decodeValue = (value) => {
-    let ret = {};
-    if (!value) {
-        value = {};
+/**
+ * Inserts the new operator into obj iterating throught the operator list and updates obj
+ * @param {obj} obj Converted filter object
+ * @param {operatorList} operatorList operator list
+ * @param {operatorNew} operatorNew new operator
+ */
+const insertNewOpAndUpdateObj = (obj, operatorList, operatorNew) => {
+    let pos = _.clone(obj);
+    for (let i = 0; i < operatorList.length; i++) {
+        if (_.isArray(pos)) {
+            pos = _.find(pos, operatorList[i]);
+        }
+        else {
+            pos = pos[operatorList[i]];
+        }
+        // push new operator after iterating to the last element in operatorList
+        if (i === (operatorList.length - 1)) {
+            pos.push({ [operatorNew]: [] });
+        }
     }
-    if (value.number_value) {
-        ret = value.number_value;
+    return obj;
+};
+/**
+ * toObject takes input contained in the proto structure defined in resource_base proto
+ * and converts it into Object understandable by the underlying DB implementation in chassis-srv
+ * @param {*} input Original filter input object
+ * @param {*} obj converted filter objected passed recursively
+ * @param {*} operatorList operatorlist updated and passed recursively
+ */
+const toObject = (input, obj, operatorList) => {
+    // since toObject method is called recursively we are not adding the typing to input parameter
+    let filters;
+    if (input && !_.isEmpty(input.filters)) {
+        filters = input.filters;
     }
-    else if (value.string_value) {
-        ret = value.string_value;
+    else {
+        filters = input;
     }
-    else if (value.list_value) {
-        ret = _.map(value.list_value.values, (v) => {
-            return exports.toObject(v, true); // eslint-disable-line
-        });
+    // const filters = _.cloneDeep( (input.filters && input.filters.length > 0) ? input.filters : input);
+    // by default use 'and' operator if no operator is specified
+    if (filters && _.isArray(filters.filter) && !filters.operator) {
+        filters.operator = 'and';
     }
-    else if (value.struct_value) {
-        ret = exports.toObject(value.struct_value); // eslint-disable-line
+    if (!obj) {
+        obj = {};
     }
-    else if (!_.isNil(value.bool_value)) {
-        ret = value.bool_value;
+    if (_.isArray(filters.filter)) {
+        let operatorValue;
+        if (typeof filters.operator === 'string' || filters.operator instanceof String) {
+            operatorValue = filters.operator;
+        }
+        else if (Number.isInteger(filters.operator)) {
+            operatorValue = filterOperatorMap.get(filters.operator);
+        }
+        const newOperator = `$${operatorValue}`;
+        if (operatorList && newOperator) {
+            // insert obj with new operator
+            obj = insertNewOpAndUpdateObj(obj, operatorList, newOperator);
+            operatorList.push(newOperator);
+        }
+        else {
+            operatorList = [newOperator];
+            obj[newOperator] = [];
+        }
+        // pass operatorList and obj recursively
+        (0, exports.toObject)(filters.filter, obj, operatorList);
     }
-    return ret;
-};
-const toObject = (struct, fromArray = false) => {
-    let obj = {};
-    if (!fromArray) {
-        _.forEach(struct.fields, (value, key) => {
-            obj[key] = decodeValue(value);
-        });
+    else if (_.isArray(filters)) {
+        for (let filterObj of filters) {
+            (0, exports.toObject)(filterObj, obj, operatorList);
+        }
     }
-    else {
-        obj = decodeValue(struct);
+    else if (filters.field && (filters.operation || filters.operation === 0) && filters.value) {
+        // object contains field, operation and value, update it on obj using convertFilterToObject()
+        obj = convertFilterToObject(filters, obj, operatorList);
     }
     return obj;
 };
@@ -88,4 +207,8 @@ const ServiceBase_1 = require("./core/ServiceBase");
 Object.defineProperty(exports, "ServiceBase", { enumerable: true, get: function () { return ServiceBase_1.ServiceBase; } });
 const GraphResourcesServiceBase_1 = require("./core/GraphResourcesServiceBase");
 Object.defineProperty(exports, "GraphResourcesServiceBase", { enumerable: true, get: function () { return GraphResourcesServiceBase_1.GraphResourcesServiceBase; } });
+var interfaces_1 = require("./core/interfaces");
+Object.defineProperty(exports, "FilterOperation", { enumerable: true, get: function () { return interfaces_1.FilterOperation; } });
+Object.defineProperty(exports, "FilterValueType", { enumerable: true, get: function () { return interfaces_1.FilterValueType; } });
+Object.defineProperty(exports, "OperatorType", { enumerable: true, get: function () { return interfaces_1.OperatorType; } });
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@restorecommerce/resource-base-interface",
-  "version": "0.1.1",
+  "version": "0.2.3",
   "description": "Restorecommerce Resource Base Interface",
   "main": "lib/index.js",
   "author": "n-fuse GmbH",
@@ -17,42 +17,43 @@
     "interface"
   ],
   "dependencies": {
-    "@restorecommerce/chassis-srv": "^0.2.3",
-    "@restorecommerce/grpc-client": "0.0.9",
-    "@restorecommerce/kafka-client": "^0.2.1",
-    "@restorecommerce/protos": "^0.0.22",
-    "@restorecommerce/service-config": "^0.4.1",
+    "@restorecommerce/chassis-srv": "^0.3.6",
+    "@restorecommerce/grpc-client": "^0.2.14",
+    "@restorecommerce/kafka-client": "^0.2.29",
+    "@restorecommerce/protos": "^0.5.0",
+    "@restorecommerce/service-config": "^0.4.23",
     "bluebird": "^3.7.2",
     "lodash": "^4.17.21",
     "redis": "^3.1.2"
   },
   "devDependencies": {
-    "@types/bluebird": "^3.5.33",
-    "@types/lodash": "^4.14.168",
-    "@types/mocha": "^8.2.2",
-    "@types/redis": "^2.8.28",
-    "@typescript-eslint/eslint-plugin": "^4.22.0",
-    "@typescript-eslint/eslint-plugin-tslint": "^4.22.0",
-    "@typescript-eslint/parser": "^4.22.0",
+    "@types/bluebird": "^3.5.36",
+    "@types/lodash": "^4.14.178",
+    "@types/mocha": "^9.1.0",
+    "@types/redis": "^2.8.31",
+    "@typescript-eslint/eslint-plugin": "^5.10.1",
+    "@typescript-eslint/eslint-plugin-tslint": "^5.10.1",
+    "@typescript-eslint/parser": "^5.10.1",
     "cross-env": "^7.0.3",
-    "eslint": "^7.25.0",
-    "eslint-plugin-prefer-arrow-functions": "^3.0.1",
-    "mocha": "^8.3.2",
+    "eslint": "^8.7.0",
+    "eslint-plugin-prefer-arrow-functions": "^3.1.4",
+    "mocha": "^9.2.0",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.1.0",
     "rimraf": "^3.0.2",
     "should": "^13.2.3",
+    "ts-node": "^10.4.0",
     "tslint": "^6.1.3",
-    "typescript": "^4.2.4"
+    "typescript": "^4.5.5"
   },
   "scripts": {
     "test": "npm run lint && nyc npm run mocha",
-    "pretest": "npm run build && npm run tsctests",
+    "pretest": "npm run build",
     "tsctests": "tsc -d -p tsconfig.test.json",
     "lint": "eslint 'src/**/*.ts' ",
-    "mocha": "cross-env NODE_ENV=test; mocha -R spec ./test/*.js --exit",
+    "mocha": "cross-env NODE_ENV=test; mocha --full-trace --exit --trace-warnings;",
     "test-debug": "npm run lint && npm run mocha-debug",
-    "mocha-debug": "cross-env NODE_ENV=test; mocha ./test/*_test.js --inspect-brk --exit",
+    "mocha-debug": "cross-env NODE_ENV=test; mocha --full-trace --inspect-brk",
     "lcov-report": "nyc report --reporter=lcov",
     "build:tsc": "tsc -d",
     "build:clean": "rimraf lib",

package/tsconfig.json

@@ -1,24 +1,32 @@
 {
   "compilerOptions": {
-    "target": "es6",
+    "target": "ES2021",
     "module": "commonjs",
     "moduleResolution": "node",
+    "declaration": true,
+    // "strict": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "allowSyntheticDefaultImports": true,
+    "noUnusedLocals": false,
     "skipLibCheck": true,
+    "esModuleInterop": true,
+    "sourceMap": true,
     "outDir": "lib",
     "typeRoots": [
       "node_modules/@types"
     ],
-    "sourceMap": true
+    "lib": [
+      "es2020.promise",
+      "dom"
+    ]
   },
   "include": [
     "./src/**/*.ts"
   ],
   "exclude": [
-    "doc",
+    "node_modules",
     "lib",
-    "node_modules"
+    "doc"
   ]
 }