@apex-pub/convector-core-controller 1.5.1 → 2.0.0

package/dist/src/controller.decorator.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var g = require("window-or-global");
-var convector_core_errors_1 = require("@apex-pub/convector-core-errors");
+exports.Controller = exports.controllerMetadataKey = void 0;
+const tslib_1 = require("tslib");
+const g = tslib_1.__importStar(require("window-or-global"));
+const convector_core_errors_1 = require("@apex-pub/convector-core-errors");
 require("reflect-metadata");
 exports.controllerMetadataKey = g.ConvectorControllerMetadataKey || Symbol('controller');
 g.ConvectorControllerMetadataKey = exports.controllerMetadataKey;
 function Controller(namespace) {
-    return function (ctor) {
+    return ctor => {
         if (typeof ctor !== 'function') {
             throw new convector_core_errors_1.ControllerInvalidError(namespace);
         }

package/dist/src/controller.decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"controller.decorator.js","sourceRoot":"","sources":["../../src/controller.decorator.ts"],"names":[],"mappings":";;AAEA,oCAAsC;AACtC,yEAAyE;AACzE,4BAA0B;AAGb,QAAA,qBAAqB,GAAG,CAAC,CAAC,8BAA8B,IAAI,MAAM,CAAC,YAAY,CAAC,CAAC;AAC9F,CAAC,CAAC,8BAA8B,GAAG,6BAAqB,CAAC;AAWzD,oBAA2B,SAAiB;IAC1C,OAAO,UAAA,IAAI;QACT,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE;YAC9B,MAAM,IAAI,8CAAsB,CAAC,SAAS,CAAC,CAAC;SAC7C;QAED,OAAO,CAAC,cAAc,CAAC,6BAAqB,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;IACjE,CAAC,CAAC;AACJ,CAAC;AARD,gCAQC"}
+{"version":3,"file":"controller.decorator.js","sourceRoot":"","sources":["../../src/controller.decorator.ts"],"names":[],"mappings":";;;;AAEA,4DAAsC;AACtC,2EAAyE;AACzE,4BAA0B;AAGb,QAAA,qBAAqB,GAAG,CAAC,CAAC,8BAA8B,IAAI,MAAM,CAAC,YAAY,CAAC,CAAC;AAC9F,CAAC,CAAC,8BAA8B,GAAG,6BAAqB,CAAC;AAWzD,SAAgB,UAAU,CAAC,SAAiB;IAC1C,OAAO,IAAI,CAAC,EAAE;QACZ,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;YAC/B,MAAM,IAAI,8CAAsB,CAAC,SAAS,CAAC,CAAC;QAC9C,CAAC;QAED,OAAO,CAAC,cAAc,CAAC,6BAAqB,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;IACjE,CAAC,CAAC;AACJ,CAAC;AARD,gCAQC"}

package/dist/src/convector-controller.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var ConvectorController = (function () {
-    function ConvectorController() {
-    }
-    return ConvectorController;
-}());
+exports.ConvectorController = void 0;
+class ConvectorController {
+}
 exports.ConvectorController = ConvectorController;
 //# sourceMappingURL=convector-controller.js.map

package/dist/src/convector-controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"convector-controller.js","sourceRoot":"","sources":["../../src/convector-controller.ts"],"names":[],"mappings":";;AAGA;IAAA;IAYA,CAAC;IAAD,0BAAC;AAAD,CAAC,AAZD,IAYC;AAZqB,kDAAmB"}
+{"version":3,"file":"convector-controller.js","sourceRoot":"","sources":["../../src/convector-controller.ts"],"names":[],"mappings":";;;AAGA,MAAsB,mBAAmB;CAYxC;AAZD,kDAYC"}

package/dist/src/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
+const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./param.decorator"), exports);
 tslib_1.__exportStar(require("./invokable.decorator"), exports);
 tslib_1.__exportStar(require("./optional.decorator"), exports);

package/dist/src/invokable.decorator.js

@@ -1,116 +1,90 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var g = require("window-or-global");
-var convector_core_errors_1 = require("@apex-pub/convector-core-errors");
+exports.getInvokables = exports.Invokable = exports.invokableMetadataKey = void 0;
+const tslib_1 = require("tslib");
+const g = tslib_1.__importStar(require("window-or-global"));
+const convector_core_errors_1 = require("@apex-pub/convector-core-errors");
 require("reflect-metadata");
-var param_decorator_1 = require("./param.decorator");
-var optional_decorator_1 = require("./optional.decorator");
-var controller_decorator_1 = require("./controller.decorator");
+const param_decorator_1 = require("./param.decorator");
+const optional_decorator_1 = require("./optional.decorator");
+const controller_decorator_1 = require("./controller.decorator");
 exports.invokableMetadataKey = g.ConvectorInvokableMetadataKey || Symbol('invokable');
 g.ConvectorInvokableMetadataKey = exports.invokableMetadataKey;
 function Invokable() {
-    return function (target, key, descriptor) {
-        var fn = descriptor.value;
+    return (target, key, descriptor) => {
+        const fn = descriptor.value;
         if (typeof fn !== 'function') {
             throw new convector_core_errors_1.ControllerInvalidFunctionError();
         }
-        var invokables = Reflect.getMetadata(exports.invokableMetadataKey, target.constructor) || {};
-        Reflect.defineMetadata(exports.invokableMetadataKey, tslib_1.__assign({}, invokables, (_a = {}, _a[key] = true, _a)), target.constructor);
-        descriptor.value = function internalFn(_, args, extras) {
-            var rest = [];
-            for (var _i = 3; _i < arguments.length; _i++) {
-                rest[_i - 3] = arguments[_i];
+        const invokables = Reflect.getMetadata(exports.invokableMetadataKey, target.constructor) || {};
+        Reflect.defineMetadata(exports.invokableMetadataKey, {
+            ...invokables,
+            [key]: true
+        }, target.constructor);
+        descriptor.value = async function internalFn(_, args, extras, ...rest) {
+            let internalCall = false;
+            if ('_internal_invokable' in this) {
+                args = [_, args, extras, ...rest].filter(param => param !== undefined);
+                internalCall = true;
+                extras = {};
             }
-            return tslib_1.__awaiter(this, void 0, void 0, function () {
-                var _this = this;
-                var internalCall, schemas, optionals_1, namespace, ctx, response, e_1, error;
-                return tslib_1.__generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            internalCall = false;
-                            if ('_internal_invokable' in this) {
-                                args = [_, args, extras].concat(rest).filter(function (param) { return param !== undefined; });
-                                internalCall = true;
-                                extras = {};
-                            }
-                            schemas = Reflect.getOwnMetadata(param_decorator_1.paramMetadataKey, target, key);
-                            if (!schemas) return [3, 2];
-                            optionals_1 = Reflect.getOwnMetadata(optional_decorator_1.optionalMetadataKey, target, key) || [];
-                            if (schemas.length - optionals_1.length > args.length) {
-                                throw new convector_core_errors_1.ControllerInvalidInvokeError(key, args.length, schemas.length - optionals_1.length);
-                            }
-                            return [4, schemas.reduce(function (result, _a, index) {
-                                    var schema = _a[0], opts = _a[1], model = _a[2];
-                                    return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                                        var paramResult, e_2;
-                                        return tslib_1.__generator(this, function (_b) {
-                                            switch (_b.label) {
-                                                case 0:
-                                                    if (!(args[index] === undefined)) return [3, 2];
-                                                    if (optionals_1.indexOf(index) === -1) {
-                                                        throw new convector_core_errors_1.ControllerUndefinedArgumentError(index);
-                                                    }
-                                                    return [4, result];
-                                                case 1: return [2, (_b.sent()).concat([undefined])];
-                                                case 2:
-                                                    _b.trys.push([2, 6, , 7]);
-                                                    if (!opts.update) return [3, 3];
-                                                    paramResult = schema.cast(args[index], opts);
-                                                    return [3, 5];
-                                                case 3: return [4, schema.validate(args[index], opts)];
-                                                case 4:
-                                                    paramResult = _b.sent();
-                                                    _b.label = 5;
-                                                case 5: return [3, 7];
-                                                case 6:
-                                                    e_2 = _b.sent();
-                                                    throw new convector_core_errors_1.ControllerInvalidArgumentError(e_2, index, args[index]);
-                                                case 7:
-                                                    if (model) {
-                                                        try {
-                                                            paramResult = new model(JSON.parse(args[index]));
-                                                        }
-                                                        catch (e) {
-                                                            throw new convector_core_errors_1.ControllerArgumentParseError(e, index, args[index]);
-                                                        }
-                                                    }
-                                                    return [4, result];
-                                                case 8: return [2, (_b.sent()).concat([paramResult])];
-                                            }
-                                        });
-                                    });
-                                }, Promise.resolve([]))];
-                        case 1:
-                            args = _a.sent();
-                            _a.label = 2;
-                        case 2:
-                            namespace = Reflect.getMetadata(controller_decorator_1.controllerMetadataKey, target.constructor);
-                            ctx = Object.create(internalCall ? this : this[namespace], tslib_1.__assign({}, (extras || {}), { _internal_invokable: { value: true } }));
-                            _a.label = 3;
-                        case 3:
-                            _a.trys.push([3, 5, , 6]);
-                            return [4, fn.call.apply(fn, [ctx].concat(args))];
-                        case 4:
-                            response = _a.sent();
-                            return [2, typeof response === 'object' ? JSON.parse(JSON.stringify(response)) : response];
-                        case 5:
-                            e_1 = _a.sent();
-                            error = new Error(e_1.message);
-                            error.stack = e_1.stack;
-                            throw error;
-                        case 6: return [2];
+            const schemas = Reflect.getOwnMetadata(param_decorator_1.paramMetadataKey, target, key);
+            if (schemas) {
+                const optionals = Reflect.getOwnMetadata(optional_decorator_1.optionalMetadataKey, target, key) || [];
+                if (schemas.length - optionals.length > args.length) {
+                    throw new convector_core_errors_1.ControllerInvalidInvokeError(key, args.length, schemas.length - optionals.length);
+                }
+                args = await schemas.reduce(async (result, [schema, opts, model], index) => {
+                    let paramResult;
+                    if (args[index] === undefined) {
+                        if (optionals.indexOf(index) === -1) {
+                            throw new convector_core_errors_1.ControllerUndefinedArgumentError(index);
+                        }
+                        return [...await result, undefined];
                     }
-                });
+                    try {
+                        if (opts.update) {
+                            paramResult = schema.cast(args[index], opts);
+                        }
+                        else {
+                            paramResult = await schema.validate(args[index], opts);
+                        }
+                    }
+                    catch (e) {
+                        throw new convector_core_errors_1.ControllerInvalidArgumentError(e, index, args[index]);
+                    }
+                    if (model) {
+                        try {
+                            paramResult = new model(JSON.parse(args[index]));
+                        }
+                        catch (e) {
+                            throw new convector_core_errors_1.ControllerArgumentParseError(e, index, args[index]);
+                        }
+                    }
+                    return [...await result, paramResult];
+                }, Promise.resolve([]));
+            }
+            const namespace = Reflect.getMetadata(controller_decorator_1.controllerMetadataKey, target.constructor);
+            const ctx = Object.create(internalCall ? this : this[namespace], {
+                ...(extras || {}),
+                _internal_invokable: { value: true }
             });
+            try {
+                const response = await fn.call(ctx, ...args);
+                return typeof response === 'object' ? JSON.parse(JSON.stringify(response)) : response;
+            }
+            catch (e) {
+                const error = new Error(e.message);
+                error.stack = e.stack;
+                throw error;
+            }
         };
-        var _a;
     };
 }
 exports.Invokable = Invokable;
 function getInvokables(controller) {
-    var namespace;
-    var invokables;
+    let namespace;
+    let invokables;
     try {
         namespace = Reflect.getMetadata(controller_decorator_1.controllerMetadataKey, controller);
         if (!namespace) {
@@ -130,8 +104,8 @@ function getInvokables(controller) {
         throw new convector_core_errors_1.ControllerInvokablesMissingError(e, namespace);
     }
     return {
-        invokables: invokables,
-        namespace: namespace
+        invokables,
+        namespace
     };
 }
 exports.getInvokables = getInvokables;

package/dist/src/invokable.decorator.js.map

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

package/dist/src/optional.decorator.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var g = require("window-or-global");
+exports.OptionalParam = exports.optionalMetadataKey = void 0;
+const tslib_1 = require("tslib");
+const g = tslib_1.__importStar(require("window-or-global"));
 require("reflect-metadata");
 exports.optionalMetadataKey = g.ConvectorOptionalParamMetadataKey || Symbol('optional-param');
 g.ConvectorOptionalParamMetadataKey = exports.optionalMetadataKey;
 function OptionalParam() {
-    return function (target, propertyKey, parameterIndex) {
-        var optionals = Reflect.getOwnMetadata(exports.optionalMetadataKey, target, propertyKey) || [];
+    return (target, propertyKey, parameterIndex) => {
+        const optionals = Reflect.getOwnMetadata(exports.optionalMetadataKey, target, propertyKey) || [];
         optionals.push(parameterIndex);
         Reflect.defineMetadata(exports.optionalMetadataKey, optionals, target, propertyKey);
     };

package/dist/src/optional.decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"optional.decorator.js","sourceRoot":"","sources":["../../src/optional.decorator.ts"],"names":[],"mappings":";;AAEA,oCAAsC;AACtC,4BAA0B;AAGb,QAAA,mBAAmB,GAAG,CAAC,CAAC,iCAAiC,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAAC;AACnG,CAAC,CAAC,iCAAiC,GAAG,2BAAmB,CAAC;AAO1D;IACE,OAAO,UAAC,MAAW,EAAE,WAAmB,EAAE,cAAsB;QAE9D,IAAM,SAAS,GACb,OAAO,CAAC,cAAc,CAAC,2BAAmB,EAAE,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC;QAEzE,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC/B,OAAO,CAAC,cAAc,CAAC,2BAAmB,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IAC9E,CAAC,CAAC;AACJ,CAAC;AATD,sCASC"}
+{"version":3,"file":"optional.decorator.js","sourceRoot":"","sources":["../../src/optional.decorator.ts"],"names":[],"mappings":";;;;AAEA,4DAAsC;AACtC,4BAA0B;AAGb,QAAA,mBAAmB,GAAG,CAAC,CAAC,iCAAiC,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAAC;AACnG,CAAC,CAAC,iCAAiC,GAAG,2BAAmB,CAAC;AAO1D,SAAgB,aAAa;IAC3B,OAAO,CAAC,MAAW,EAAE,WAAmB,EAAE,cAAsB,EAAE,EAAE;QAElE,MAAM,SAAS,GACb,OAAO,CAAC,cAAc,CAAC,2BAAmB,EAAE,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC;QAEzE,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC/B,OAAO,CAAC,cAAc,CAAC,2BAAmB,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IAC9E,CAAC,CAAC;AACJ,CAAC;AATD,sCASC"}

package/dist/src/param.decorator.js

@@ -1,17 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var g = require("window-or-global");
-var yup_1 = require("yup");
+exports.Param = exports.paramMetadataKey = void 0;
+const tslib_1 = require("tslib");
+const g = tslib_1.__importStar(require("window-or-global"));
+const yup_1 = require("yup");
 require("reflect-metadata");
-var isSchema = function (schema) { return 'validate' in schema; };
+const isSchema = (schema) => 'validate' in schema;
 exports.paramMetadataKey = g.ConvectorParamMetadataKey || Symbol('param');
 g.ConvectorParamMetadataKey = exports.paramMetadataKey;
-function Param(model, opts) {
-    if (opts === void 0) { opts = { context: {} }; }
-    return function (target, propertyKey, parameterIndex) {
-        var schemas = Reflect.getOwnMetadata(exports.paramMetadataKey, target, propertyKey) || [];
-        var schema = isSchema(model) ? model : yup_1.object()
-            .transform(function (value) { return value instanceof model ? value : new model(value); });
+function Param(model, opts = { context: {} }) {
+    return (target, propertyKey, parameterIndex) => {
+        const schemas = Reflect.getOwnMetadata(exports.paramMetadataKey, target, propertyKey) || [];
+        const schema = isSchema(model) ? model : (0, yup_1.object)()
+            .transform(value => value instanceof model ? value : new model(value));
         schemas[parameterIndex] = [schema, opts, !isSchema(model) && model];
         Reflect.defineMetadata(exports.paramMetadataKey, schemas, target, propertyKey);
     };

package/dist/src/param.decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"param.decorator.js","sourceRoot":"","sources":["../../src/param.decorator.ts"],"names":[],"mappings":";;AAEA,oCAAsC;AACtC,2BAAqC;AACrC,4BAA0B;AAG1B,IAAM,QAAQ,GAAG,UAAC,MAAW,IAA4B,OAAA,UAAU,IAAI,MAAM,EAApB,CAAoB,CAAC;AAGjE,QAAA,gBAAgB,GAAG,CAAC,CAAC,yBAAyB,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC;AAC/E,CAAC,CAAC,yBAAyB,GAAG,wBAAgB,CAAC;AAmB/C,eACE,KAA2C,EAC3C,IAA2B;IAA3B,qBAAA,EAAA,SAAc,OAAO,EAAE,EAAE,EAAE;IAE3B,OAAO,UAAC,MAAW,EAAE,WAAmB,EAAE,cAAsB;QAE9D,IAAM,OAAO,GACX,OAAO,CAAC,cAAc,CAAC,wBAAgB,EAAE,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC;QAEtE,IAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,YAAM,EAAE;aAC9C,SAAS,CAAC,UAAA,KAAK,IAAI,OAAA,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,EAAjD,CAAiD,CAAC,CAAC;QAEzE,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,CAAC;QACpE,OAAO,CAAC,cAAc,CAAC,wBAAgB,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IACzE,CAAC,CAAC;AACJ,CAAC;AAfD,sBAeC"}
+{"version":3,"file":"param.decorator.js","sourceRoot":"","sources":["../../src/param.decorator.ts"],"names":[],"mappings":";;;;AAEA,4DAAsC;AACtC,6BAAqC;AACrC,4BAA0B;AAG1B,MAAM,QAAQ,GAAG,CAAC,MAAW,EAAyB,EAAE,CAAC,UAAU,IAAI,MAAM,CAAC;AAGjE,QAAA,gBAAgB,GAAG,CAAC,CAAC,yBAAyB,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC;AAC/E,CAAC,CAAC,yBAAyB,GAAG,wBAAgB,CAAC;AAmB/C,SAAgB,KAAK,CACnB,KAA2C,EAC3C,OAAY,EAAE,OAAO,EAAE,EAAE,EAAE;IAE3B,OAAO,CAAC,MAAW,EAAE,WAAmB,EAAE,cAAsB,EAAE,EAAE;QAElE,MAAM,OAAO,GACX,OAAO,CAAC,cAAc,CAAC,wBAAgB,EAAE,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC;QAEtE,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAA,YAAM,GAAE;aAC9C,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QAEzE,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,CAAC;QACpE,OAAO,CAAC,cAAc,CAAC,wBAAgB,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IACzE,CAAC,CAAC;AACJ,CAAC;AAfD,sBAeC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apex-pub/convector-core-controller",
-  "version": "1.5.1",
+  "version": "2.0.0",
   "description": "Convector Controller base class",
   "license": "Apache-2.0",
   "repository": {
@@ -34,7 +34,6 @@
     "clean:docs": "rimraf docs",
     "build": "npm run clean && tsc",
     "watch": "npm-scripts-watcher",
-    "prepare": "npm run build",
     "lint": "tslint --fix -c '../../tslint.json' -p './tsconfig.json'",
     "test": "mocha -r ts-node/register tests/**/*.spec.ts --reporter spec",
     "predocs:generate": "npm run clean:docs",
@@ -50,21 +49,23 @@
     "reflect-metadata": ">=0.1.12"
   },
   "dependencies": {
-    "@apex-pub/convector-core-errors": "^1.5.0",
-    "@apex-pub/convector-core-model": "^1.5.0",
+    "@apex-pub/convector-core-errors": "^2.0.0",
+    "@apex-pub/convector-core-model": "^2.0.0",
     "tslib": "^1.9.0",
     "window-or-global": "^1.0.1",
     "yup": "^0.26.10"
   },
   "devDependencies": {
+    "fabric-shim": "^2.4.0",
     "http-server": "^0.11.1",
-    "mocha": "^5.0.3",
+    "mocha": "^10.8.2",
     "npm-scripts-watcher": "^1.0.2",
     "reflect-metadata": "^0.1.12",
     "rimraf": "^2.6.2",
-    "ts-node": "^6.0.3",
-    "tslint": "^5.9.1",
+    "ts-node": "^10.9.2",
+    "tslint": "^6.1.3",
     "typedoc": "^0.11.1",
-    "typescript": "2.8.3"
-  }
+    "typescript": "5.4.5"
+  },
+  "gitHead": "14214eba330c45c52fb0e80401ab38ed2ffa2239"
 }

package/CHANGELOG.md

@@ -1,44 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-<a name="1.5.1"></a>
-## [1.5.1](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/compare/v1.5.0...v1.5.1) (2024-07-30)
-
-
-### Bug Fixes
-
-* updates for apex-pub changes ([feb72c3](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/commit/feb72c3))
-
-
-
-
-<a name="1.5.0"></a>
-# 1.5.0 (2024-07-29)
-
-
-### Bug Fixes
-
-* **core-model,core-controller:** convector model to accept yup.lazy ([c7e67ed](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/commit/c7e67ed)), closes [#50](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/issues/50)
-* error handlers for testing and chaincode ([ef9bae6](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/commit/ef9bae6))
-* handle global on browser environments ([44fcd22](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/commit/44fcd22))
-* invokable local call ([882e8d9](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/commit/882e8d9))
-* name collition for optional decorator ([2716c78](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/commit/2716c78))
-* update access public to the packages (pull request [#27](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/issues/27)) ([f2eebde](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/commit/f2eebde))
-
-
-### Features
-
-* Add documentation (pull request [#28](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/issues/28)) ([fc8ddbc](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/commit/fc8ddbc))
-* allow internal calls for invokables ([84269cb](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/commit/84269cb))
-* export adapter-in-chaincode in fabric ([2b28edd](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/commit/2b28edd))
-* **core-chaincode,core-controller:** remove the use of fabric-client in controllers ([e5db472](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/commit/e5db472)), closes [#37](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/issues/37) [#34](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/issues/34)
-* flatten object invokable results ([9c90a9f](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/commit/9c90a9f))
-* group packages and update package.json's ([3971b44](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/commit/3971b44))
-* optional params on controllers ([cdf6782](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/commit/cdf6782))
-* Preparing versions for stable release (pull request [#25](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/issues/25)) ([1f5a876](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/commit/1f5a876))
-* Production readiness (pull request [#48](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/issues/48)) ([5bb7287](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/commit/5bb7287))
-* refactor convector client implementation and add browser support ([30ec673](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/commit/30ec673))
-* Refactor fabric logic (pull request [#24](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/issues/24)) ([ec7f0ab](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/commit/ec7f0ab))
-* Rename logically (pull request [#21](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/issues/21)) ([d1a78ad](https://github.com/hyperledger-labs/convector/tree/develop/%40worldsibu/convector-core-controller/commit/d1a78ad))