@zerooneit/expressive-tea 1.3.0-beta.2 → 1.3.0-beta.4

package/helpers/server.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fileSettings = exports.router = exports.generateRoute = exports.extractParameters = exports.mapArguments = exports.executeRequest = exports.autoResponse = void 0;
 const lodash_1 = require("lodash");
-const MetaData_1 = require("../classes/MetaData");
-const constants_1 = require("../libs/constants");
+const Metadata_1 = require("@expressive-tea/commons/classes/Metadata");
+const constants_1 = require("@expressive-tea/commons/constants");
 const RequestExceptions_1 = require("../exceptions/RequestExceptions");
-const object_helper_1 = require("./object-helper");
+const object_helper_1 = require("@expressive-tea/commons/helpers/object-helper");
 const fs = require("fs");
 function autoResponse(request, response, annotations, responseResult) {
     const view = (0, lodash_1.find)(annotations, { type: 'view' });
@@ -82,9 +82,9 @@ function generateRoute(route, verb, ...settings) {
 }
 exports.generateRoute = generateRoute;
 function router(verb, route, target, handler, propertyKey, settings) {
-    const existedRoutesHandlers = MetaData_1.default.get(constants_1.ROUTER_HANDLERS_KEY, target) || [];
+    const existedRoutesHandlers = Metadata_1.default.get(constants_1.ROUTER_HANDLERS_KEY, target) || [];
     existedRoutesHandlers.unshift({ verb, route, handler, target, propertyKey, settings });
-    MetaData_1.default.set(constants_1.ROUTER_HANDLERS_KEY, existedRoutesHandlers, target);
+    Metadata_1.default.set(constants_1.ROUTER_HANDLERS_KEY, existedRoutesHandlers, target);
 }
 exports.router = router;
 function fileSettings() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zerooneit/expressive-tea",
-  "version": "1.3.0-beta.2",
+  "version": "1.3.0-beta.4",
   "description": "A REST API  over Express and Typescript",
   "main": "classes/Boot.js",
   "engines": {
@@ -25,44 +25,45 @@
   ],
   "license": "Apache-2.0",
   "devDependencies": {
-    "@expressive-tea/plugin": "0.0.4",
-    "@types/bluebird": "3.5.36",
-    "@types/express": "4.17.13",
+    "@expressive-tea/commons": "^1.0.1",
+    "@expressive-tea/plugin": "1.0.2",
+    "@types/bluebird": "3.5.38",
+    "@types/express": "4.17.15",
     "@types/express-http-proxy": "1.6.3",
-    "@types/express-serve-static-core": "4.17.28",
-    "@types/jest": "27.5.1",
-    "@types/lodash": "4.14.182",
-    "@types/node": "17.0.36",
+    "@types/express-serve-static-core": "4.17.32",
+    "@types/jest": "29.2.5",
+    "@types/lodash": "4.14.191",
+    "@types/node": "18.11.18",
     "@types/reflect-metadata": "0.1.0",
     "@types/socket.io": "3.0.2",
     "@types/socket.io-client": "3.0.0",
-    "@types/ws": "8.5.3",
-    "trash-cli":"5.0.0",
+    "@types/ws": "8.5.4",
     "http-terminator": "3.2.0",
-    "jest": "28.1.0",
+    "jest": "29.3.1",
     "jest-express": "1.12.0",
-    "jest-junit": "13.2.0",
+    "jest-junit": "15.0.0",
     "reflect-metadata": "0.1.13",
-    "rimraf": "3.0.2",
-    "supertest": "6.2.3",
+    "rimraf": "4.0.5",
+    "supertest": "6.3.3",
     "toast-jsdoc": "1.0.2",
-    "ts-jest": "28.0.3",
-    "ts-node": "10.8.0",
+    "trash-cli": "5.0.0",
+    "ts-jest": "29.0.5",
+    "ts-node": "10.9.1",
     "tslint": "6.1.3",
-    "typescript": "4.7.2"
+    "typescript": "4.9.4"
   },
   "dependencies": {
     "bluebird": "3.7.2",
-    "eiows": "4.1.2",
-    "express": "4.18.1",
+    "eiows": "^4.1.2",
+    "express": "4.18.2",
     "express-http-proxy": "1.6.3",
     "inversify": "6.0.1",
     "inversify-inject-decorators": "3.1.0",
     "lodash": "4.17.21",
-    "socket.io": "4.5.1",
-    "socket.io-client": "4.5.1",
+    "socket.io": "4.5.4",
+    "socket.io-client": "4.5.4",
     "url-scheme": "1.0.5",
-    "ws": "8.7.0"
+    "ws": "8.12.0"
   },
   "repository": {
     "type": "git",
@@ -105,8 +106,8 @@
   },
   "homepage": "https://github.com/Expressive-Tea/expresive-tea#readme",
   "optionalDependencies": {
-    "bufferutil": "4.0.6",
-    "utf-8-validate": "^5.0.9"
+    "bufferutil": "4.0.7",
+    "utf-8-validate": "^6.0.0"
   },
   "resolutions": {
     "set-value": "4.1.0",

package/classes/MetaData.d.ts

@@ -1,17 +0,0 @@
-import 'reflect-metadata';
-export default class Metadata {
-    static get(key: string, target: any, propertyKey?: string | symbol): any;
-    static getOwn(key: string, target: any, propertyKey?: string | symbol): any;
-    static getType(target: any, propertyKey?: string | symbol): any;
-    static getOwnType(target: any, propertyKey?: string | symbol): any;
-    static getReturnType(target: any, propertyKey?: string | symbol): any;
-    static getOwnReturnType(target: any, propertyKey?: string | symbol): any;
-    static has(key: string, target: any, propertyKey?: string | symbol): boolean;
-    static hasOwn(key: string, target: any, propertyKey?: string | symbol): boolean;
-    static setParamTypes(target: any, propertyKey: string | symbol, value: any): void;
-    static delete(key: string, target: any, propertyKey?: string | symbol): boolean;
-    static getTargetsFromPropertyKey: (metadataKey: string | symbol) => any[];
-    static set(key: string, value: any, target: any, propertyKey?: string | symbol): void;
-    static getParamTypes(targetPrototype: any, propertyKey?: string | symbol): any[];
-    static getOwnParamTypes(target: any, propertyKey?: string | symbol): any[];
-}

package/classes/MetaData.js

@@ -1,68 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-/* istanbul ignore file */
-require("reflect-metadata");
-const object_helper_1 = require("../helpers/object-helper");
-function get(key, target, propertyKey, own = false) {
-    return own ?
-        Reflect.getOwnMetadata(key, (0, object_helper_1.getClass)(target), propertyKey) :
-        Reflect.getMetadata(key, (0, object_helper_1.getClass)(target), propertyKey);
-}
-class Metadata {
-    static get(key, target, propertyKey) {
-        return get(key, (0, object_helper_1.getClass)(target), propertyKey);
-    }
-    static getOwn(key, target, propertyKey) {
-        return get(key, (0, object_helper_1.getClass)(target), propertyKey, true);
-    }
-    static getType(target, propertyKey) {
-        return Reflect.getMetadata(DESIGN_TYPE, target, propertyKey);
-    }
-    static getOwnType(target, propertyKey) {
-        return Reflect.getMetadata(DESIGN_TYPE, target, propertyKey);
-    }
-    static getReturnType(target, propertyKey) {
-        return Reflect.getMetadata(DESIGN_RETURN_TYPE, target, propertyKey);
-    }
-    static getOwnReturnType(target, propertyKey) {
-        return Reflect.getOwnMetadata(DESIGN_RETURN_TYPE, target, propertyKey);
-    }
-    static has(key, target, propertyKey) {
-        try {
-            return Reflect.hasMetadata(key, (0, object_helper_1.getClass)(target), propertyKey);
-        }
-        catch (er) {
-            return false;
-        }
-    }
-    static hasOwn(key, target, propertyKey) {
-        return Reflect.hasOwnMetadata(key, (0, object_helper_1.getClass)(target), propertyKey);
-    }
-    static setParamTypes(target, propertyKey, value) {
-        return this.set(DESIGN_PARAM_TYPES, value, target.prototype, propertyKey);
-    }
-    static delete(key, target, propertyKey) {
-        return Reflect.deleteMetadata(key, (0, object_helper_1.getClass)(target), propertyKey);
-    }
-    static set(key, value, target, propertyKey) {
-        const targets = PROPERTIES.has(key) ? PROPERTIES.get(key) || [] : [];
-        const classConstructor = (0, object_helper_1.getClass)(target);
-        if (targets.indexOf(classConstructor) === -1) {
-            targets.push(classConstructor);
-            PROPERTIES.set(key, targets);
-        }
-        Reflect.defineMetadata(key, value, (0, object_helper_1.getClass)(target), propertyKey);
-    }
-    static getParamTypes(targetPrototype, propertyKey) {
-        return get(DESIGN_PARAM_TYPES, targetPrototype, propertyKey) || [];
-    }
-    static getOwnParamTypes(target, propertyKey) {
-        return get(DESIGN_PARAM_TYPES, target, propertyKey, true) || [];
-    }
-}
-exports.default = Metadata;
-Metadata.getTargetsFromPropertyKey = (metadataKey) => PROPERTIES.has(metadataKey) ? PROPERTIES.get(metadataKey) || [] : [];
-const DESIGN_PARAM_TYPES = 'design:paramtypes';
-const DESIGN_TYPE = 'design:type';
-const DESIGN_RETURN_TYPE = 'design:returntype';
-const PROPERTIES = new Map();

package/helpers/object-helper.d.ts

@@ -1,167 +0,0 @@
-/**
- * Get the provide constructor.
- * @param targetClass
- * @ignore
- */
-export declare const getConstructor: (targetClass: any) => any;
-/**
- * Get the provide constructor if target is an instance.
- * @param target
- * @returns {*}
- * @ignore
- */
-export declare function getClass(target: any): any;
-/**
- * Get the provide constructor if target is an instance.
- * @param target
- * @returns {*}
- * @alias getClass
- * @ignore
- */
-export declare function classOf(target: any): any;
-/**
- *
- * @param target
- * @returns {symbol}
- * @ignore
- */
-export declare function getClassOrSymbol(target: any): any;
-/**
- * Return true if the given obj is a primitive.
- * @param target
- * @returns {boolean}
- * @ignore
- */
-export declare function isPrimitiveOrPrimitiveClass(target: any): boolean;
-/**
- *
- * @param target
- * @returns {"string" | "number" | "boolean" | "any"}
- * @ignore
- */
-export declare function primitiveOf(target: any): 'string' | 'number' | 'boolean' | 'any';
-/**
- *
- * @param target
- * @returns {boolean}
- * @ignore
- */
-export declare function isString(target: any): boolean;
-/**
- *
- * @param target
- * @returns {boolean}
- * @ignore
- */
-export declare function isNumber(target: any): boolean;
-/**
- *
- * @param target
- * @returns {boolean}
- * @ignore
- */
-export declare function isBoolean(target: any): boolean;
-/**
- *
- * @param target
- * @returns {Boolean}
- * @ignore
- */
-export declare function isArray(target: any): boolean;
-/**
- * Return true if the clazz is an array.
- * @param target
- * @returns {boolean}
- * @ignore
- */
-export declare function isArrayOrArrayClass(target: any): boolean;
-/**
- * Return true if the target.
- * @param target
- * @returns {boolean}
- * @ignore
- */
-export declare function isCollection(target: any): boolean;
-/**
- *
- * @param target
- * @returns {boolean}
- * @ignore
- */
-export declare function isDate(target: any): boolean;
-/**
- *
- * @param target
- * @returns {boolean}
- * @ignore
- */
-export declare function isObject(target: any): boolean;
-/**
- *
- * @param target
- * @returns {boolean}
- * @ignore
- */
-export declare function isClass(target: any): boolean;
-/**
- * Return true if the value is an empty string, null or undefined.
- * @param value
- * @returns {boolean}
- * @ignore
- */
-export declare function isEmpty(value: any): boolean;
-/**
- *
- * @param target
- * @returns {boolean}
- * @ignore
- */
-export declare function isPromise(target: any): boolean;
-/**
- *
- * @param target
- * @returns {any}
- * @ignore
- */
-export declare function getInheritedClass(target: any): any;
-/**
- *
- * @param target
- * @returns {Array}
- * @ignore
- */
-export declare function ancestorsOf(target: any): any[];
-/**
- * Get object name
- * @ignore
- */
-export declare function nameOf(obj: any): string;
-/**
- * Get the provide name.
- * @param targetClass
- * @ignore
- */
-export declare function nameOfClass(targetClass: any): string;
-/**
- * Get symbol name.
- * @param sym
- * @ignore
- */
-export declare const nameOfSymbol: (sym: symbol) => string;
-/**
- *
- * @param target
- * @param {string} propertyKey
- * @returns {PropertyDescriptor}
- * @ignore
- */
-export declare function descriptorOf(target: any, propertyKey: string): PropertyDescriptor;
-/**
- *
- * @param target
- * @returns {any}
- * @ignore
- */
-export declare function prototypeOf(target: any): any;
-export declare function getOwnArgumentNames(fn: Function): string[];
-export declare function isAsyncFunction(fn: () => any): boolean;

package/helpers/object-helper.js

@@ -1,292 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isAsyncFunction = exports.getOwnArgumentNames = exports.prototypeOf = exports.descriptorOf = exports.nameOfSymbol = exports.nameOfClass = exports.nameOf = exports.ancestorsOf = exports.getInheritedClass = exports.isPromise = exports.isEmpty = exports.isClass = exports.isObject = exports.isDate = exports.isCollection = exports.isArrayOrArrayClass = exports.isArray = exports.isBoolean = exports.isNumber = exports.isString = exports.primitiveOf = exports.isPrimitiveOrPrimitiveClass = exports.getClassOrSymbol = exports.classOf = exports.getClass = exports.getConstructor = void 0;
-/* istanbul ignore file */
-/**
- * Get the provide constructor.
- * @param targetClass
- * @ignore
- */
-const getConstructor = (targetClass) => typeof targetClass === 'function' ? targetClass : targetClass.constructor;
-exports.getConstructor = getConstructor;
-/**
- * Get the provide constructor if target is an instance.
- * @param target
- * @returns {*}
- * @ignore
- */
-function getClass(target) {
-    return target.prototype ? target : target.constructor;
-}
-exports.getClass = getClass;
-/**
- * Get the provide constructor if target is an instance.
- * @param target
- * @returns {*}
- * @alias getClass
- * @ignore
- */
-function classOf(target) {
-    return getClass(target);
-}
-exports.classOf = classOf;
-/**
- *
- * @param target
- * @returns {symbol}
- * @ignore
- */
-function getClassOrSymbol(target) {
-    return typeof target === 'symbol' ? target : getClass(target);
-}
-exports.getClassOrSymbol = getClassOrSymbol;
-/**
- * Return true if the given obj is a primitive.
- * @param target
- * @returns {boolean}
- * @ignore
- */
-function isPrimitiveOrPrimitiveClass(target) {
-    return isString(target) || isNumber(target) || isBoolean(target);
-}
-exports.isPrimitiveOrPrimitiveClass = isPrimitiveOrPrimitiveClass;
-/**
- *
- * @param target
- * @returns {"string" | "number" | "boolean" | "any"}
- * @ignore
- */
-function primitiveOf(target) {
-    if (isString(target)) {
-        return 'string';
-    }
-    if (isNumber(target)) {
-        return 'number';
-    }
-    if (isBoolean(target)) {
-        return 'boolean';
-    }
-    return 'any';
-}
-exports.primitiveOf = primitiveOf;
-/**
- *
- * @param target
- * @returns {boolean}
- * @ignore
- */
-function isString(target) {
-    return checkType(target, 'string', String);
-}
-exports.isString = isString;
-/**
- *
- * @param target
- * @returns {boolean}
- * @ignore
- */
-function isNumber(target) {
-    return checkType(target, 'number', Number);
-}
-exports.isNumber = isNumber;
-/**
- *
- * @param target
- * @returns {boolean}
- * @ignore
- */
-function isBoolean(target) {
-    return checkType(target, 'boolean', Boolean);
-}
-exports.isBoolean = isBoolean;
-function checkType(target, type, TypeClass) {
-    return typeof target === type || target instanceof TypeClass || target === TypeClass;
-}
-/**
- *
- * @param target
- * @returns {Boolean}
- * @ignore
- */
-function isArray(target) {
-    return Array.isArray(target);
-}
-exports.isArray = isArray;
-/**
- * Return true if the clazz is an array.
- * @param target
- * @returns {boolean}
- * @ignore
- */
-function isArrayOrArrayClass(target) {
-    if (target === Array) {
-        return true;
-    }
-    return isArray(target);
-}
-exports.isArrayOrArrayClass = isArrayOrArrayClass;
-/**
- * Return true if the target.
- * @param target
- * @returns {boolean}
- * @ignore
- */
-function isCollection(target) {
-    return (isArrayOrArrayClass(target) ||
-        target === Map ||
-        target instanceof Map ||
-        target === Set ||
-        target instanceof Set ||
-        target === WeakMap ||
-        target instanceof WeakMap ||
-        target === WeakSet ||
-        target instanceof WeakSet);
-}
-exports.isCollection = isCollection;
-/**
- *
- * @param target
- * @returns {boolean}
- * @ignore
- */
-function isDate(target) {
-    return target === Date || target instanceof Date;
-}
-exports.isDate = isDate;
-/**
- *
- * @param target
- * @returns {boolean}
- * @ignore
- */
-function isObject(target) {
-    return target === Object;
-}
-exports.isObject = isObject;
-/**
- *
- * @param target
- * @returns {boolean}
- * @ignore
- */
-function isClass(target) {
-    return (!isPrimitiveOrPrimitiveClass(target) &&
-        !isObject(target) &&
-        !isDate(target) &&
-        target !== undefined &&
-        !isPromise(target));
-}
-exports.isClass = isClass;
-/**
- * Return true if the value is an empty string, null or undefined.
- * @param value
- * @returns {boolean}
- * @ignore
- */
-function isEmpty(value) {
-    return value === '' || value === null || value === undefined;
-}
-exports.isEmpty = isEmpty;
-/**
- *
- * @param target
- * @returns {boolean}
- * @ignore
- */
-function isPromise(target) {
-    return target === Promise || target instanceof Promise;
-}
-exports.isPromise = isPromise;
-/**
- *
- * @param target
- * @returns {any}
- * @ignore
- */
-function getInheritedClass(target) {
-    return Object.getPrototypeOf(target);
-}
-exports.getInheritedClass = getInheritedClass;
-/**
- *
- * @param target
- * @returns {Array}
- * @ignore
- */
-function ancestorsOf(target) {
-    const classes = [];
-    let currentTarget = getClass(target);
-    while (nameOf(currentTarget) !== '') {
-        classes.unshift(currentTarget);
-        currentTarget = getInheritedClass(currentTarget);
-    }
-    return classes;
-}
-exports.ancestorsOf = ancestorsOf;
-/**
- * Get object name
- * @ignore
- */
-function nameOf(obj) {
-    switch (typeof obj) {
-        default:
-            return '' + obj;
-        case 'symbol':
-            return (0, exports.nameOfSymbol)(obj);
-        case 'function':
-            return nameOfClass(obj);
-    }
-}
-exports.nameOf = nameOf;
-/**
- * Get the provide name.
- * @param targetClass
- * @ignore
- */
-function nameOfClass(targetClass) {
-    return typeof targetClass === 'function' ? targetClass.name : targetClass.constructor.name;
-}
-exports.nameOfClass = nameOfClass;
-/**
- * Get symbol name.
- * @param sym
- * @ignore
- */
-const nameOfSymbol = (sym) => sym
-    .toString()
-    .replace('Symbol(', '')
-    .replace(')', '');
-exports.nameOfSymbol = nameOfSymbol;
-/**
- *
- * @param target
- * @param {string} propertyKey
- * @returns {PropertyDescriptor}
- * @ignore
- */
-function descriptorOf(target, propertyKey) {
-    return Object.getOwnPropertyDescriptor((target && target.prototype) || target, propertyKey);
-}
-exports.descriptorOf = descriptorOf;
-/**
- *
- * @param target
- * @returns {any}
- * @ignore
- */
-function prototypeOf(target) {
-    return classOf(target) === target ? target.prototype : target;
-}
-exports.prototypeOf = prototypeOf;
-const argumentsRegExp = /\(([\s\S]*?)\)/;
-const replaceRegExp = /[ ,\n\r\t]+/;
-// tslint:disable-next-line:ban-types
-function getOwnArgumentNames(fn) {
-    const fnArguments = argumentsRegExp.exec(fn.toString())[1].trim();
-    return fnArguments && fnArguments.length ? fnArguments.split(replaceRegExp) : [];
-}
-exports.getOwnArgumentNames = getOwnArgumentNames;
-function isAsyncFunction(fn) {
-    return fn.constructor.name === 'AsyncFunction' || fn.constructor.name.includes('__awaiter');
-}
-exports.isAsyncFunction = isAsyncFunction;