@steedos/service-package-loader 2.5.0-beta.8 → 2.5.0

package/index.js

@@ -6,6 +6,7 @@ const core = require('@steedos/core');
 const triggerLoader = require('./lib').triggerLoader;
 const processLoader = require('./lib').processLoader;
 const processTriggerLoader = require('./lib').processTriggerLoader;
+const triggerYmlLoader = require('./lib').triggerYmlLoader;
 const path = require('path');
 const _ = require('lodash');
 const express = require('express');
@@ -19,6 +20,8 @@ const loadFlowFile = new metaDataCore.LoadFlowFile();
 
 module.exports = {
     name: "service-package-loader",
+    
+    triggerLoader,
 
     /**
      * Settings
@@ -166,6 +169,7 @@ module.exports = {
             await objectql.addAllConfigFiles(packagePath, datasourceName, name);
             await triggerLoader.load(this.broker, packagePath, name);
             await processTriggerLoader.load(this.broker, packagePath, name);
+            await triggerYmlLoader.load(this.broker, packagePath, name);
             core.loadClientScripts();
             let routersData = objectql.loadRouters(packagePath);
             let oldRoutersInfo = await this.broker.call(`@steedos/service-packages.getPackageRoutersInfo`, {packageName: name})
@@ -306,7 +310,14 @@ module.exports = {
 
     merged(schema) {
         schema.packageName = schema.name;
-        schema.name = `~packages-${schema.name}`;
+        if(!schema.metadata || !schema.metadata.$package){
+            schema.name = `~packages-${schema.name}`;
+        }
+
+        schema.settings.packageInfo = {
+            ...schema.settings.packageInfo,
+            ...(schema.metadata && schema.metadata.$package ? schema.metadata.$package : {})
+        }
     },
 
     /**
@@ -348,7 +359,7 @@ module.exports = {
             nodeID: this.broker.nodeID,
             instanceID: this.broker.instanceID
         }] }); //${this.broker.nodeID}.${this.name}
-        
+        this.broker.broadcast('metadata.object_triggers.change', {})
         this.broker.broadcastLocal("@steedos/service-packages.offline", {serviceInfo: {name: this.name, nodeID: this.broker.nodeID, instanceID: this.broker.instanceID}})
 
         console.log(`service ${this.name} stopped`);

package/lib/index.d.ts

@@ -1,3 +1,4 @@
 export * as triggerLoader from "./triggerLoader";
 export * as processLoader from "./processLoader";
 export * as processTriggerLoader from "./processTriggerLoader";
+export * as triggerYmlLoader from './loader/triggerYmlLoader';

package/lib/index.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processTriggerLoader = exports.processLoader = exports.triggerLoader = void 0;
+exports.triggerYmlLoader = exports.processTriggerLoader = exports.processLoader = exports.triggerLoader = void 0;
 exports.triggerLoader = require("./triggerLoader");
 exports.processLoader = require("./processLoader");
 exports.processTriggerLoader = require("./processTriggerLoader");
+exports.triggerYmlLoader = require("./loader/triggerYmlLoader");
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAOA,mDAAgD;AAChD,mDAAgD;AAChD,iEAA8D"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAOA,mDAAgD;AAChD,mDAAgD;AAChD,iEAA8D;AAC9D,gEAA8D"}

package/lib/loader/triggerYmlLoader.d.ts

@@ -0,0 +1 @@
+export declare function load(broker: any, packagePath: string, packageServiceName: string): Promise<void>;

package/lib/loader/triggerYmlLoader.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.load = void 0;
+const tslib_1 = require("tslib");
+const metadata_core_1 = require("@steedos/metadata-core");
+const path = require("path");
+const _ = require("lodash");
+const loadTriggerFile = new metadata_core_1.LoadTriggerFile();
+function isPatternTrigger(data) {
+    const { listenTo } = data;
+    if (listenTo === '*') {
+        return true;
+    }
+    else if (_.isArray(listenTo)) {
+        return true;
+    }
+    else if (_.isRegExp(listenTo)) {
+        return true;
+    }
+    else if (_.isString(listenTo) && listenTo.startsWith("/")) {
+        try {
+            if (_.isRegExp(eval(listenTo))) {
+                return true;
+            }
+        }
+        catch (error) {
+            return false;
+        }
+        return false;
+    }
+    return false;
+}
+function load(broker, packagePath, packageServiceName) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        let filePath = path.join(packagePath, "**");
+        let triggers = loadTriggerFile.load(filePath);
+        if (_.isEmpty(triggers)) {
+            return;
+        }
+        for (const apiName in triggers) {
+            const trigger = triggers[apiName];
+            if (isPatternTrigger(trigger)) {
+                trigger.isPattern = true;
+            }
+            yield broker.call(`object_triggers.add`, { apiName: `${trigger.listenTo}.${trigger.name}`, data: trigger }, {
+                meta: {
+                    metadataServiceName: packageServiceName,
+                    caller: {
+                        nodeID: broker.nodeID,
+                        service: {
+                            name: packageServiceName,
+                        }
+                    }
+                }
+            });
+            broker.broadcast('metadata.object_triggers.change', { apiName: `${trigger.listenTo}.${trigger.name}`, listenTo: trigger.listenTo });
+        }
+    });
+}
+exports.load = load;
+//# sourceMappingURL=triggerYmlLoader.js.map

package/lib/loader/triggerYmlLoader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"triggerYmlLoader.js","sourceRoot":"","sources":["../../src/loader/triggerYmlLoader.ts"],"names":[],"mappings":";;;;AAQA,0DAAwD;AACxD,6BAA8B;AAC9B,4BAA6B;AAE7B,MAAM,eAAe,GAAG,IAAI,+BAAe,EAAE,CAAC;AAC9C,SAAS,gBAAgB,CAAC,IAAI;IAC1B,MAAM,EAAC,QAAQ,EAAC,GAAG,IAAI,CAAC;IACxB,IAAG,QAAQ,KAAK,GAAG,EAAC;QAChB,OAAO,IAAI,CAAC;KACf;SAAK,IAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAC;QACzB,OAAO,IAAI,CAAC;KACf;SAAK,IAAG,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAC;QAC1B,OAAO,IAAI,CAAC;KACf;SAAK,IAAG,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAC;QACtD,IAAI;YACA,IAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAC;gBAC1B,OAAO,IAAI,CAAC;aACf;SACJ;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,KAAK,CAAA;SACf;QACD,OAAO,KAAK,CAAC;KAChB;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AACD,SAAsB,IAAI,CAAC,MAAW,EAAE,WAAmB,EAAE,kBAA0B;;QACnF,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAC5C,IAAI,QAAQ,GAAQ,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YACrB,OAAO;SACV;QACD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC5B,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;YAClC,IAAG,gBAAgB,CAAC,OAAO,CAAC,EAAC;gBACzB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAA;aAC3B;YACD,MAAM,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;gBACxG,IAAI,EAAE;oBACN,mBAAmB,EAAE,kBAAkB;oBACvC,MAAM,EAAE;wBACJ,MAAM,EAAE,MAAM,CAAC,MAAM;wBACrB,OAAO,EAAE;4BACL,IAAI,EAAE,kBAAkB;yBAC3B;qBACJ;iBACJ;aAAC,CAAC,CAAC;YACJ,MAAM,CAAC,SAAS,CAAC,iCAAiC,EAAE,EAAC,OAAO,EAAE,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAC,CAAC,CAAA;SACpI;IACL,CAAC;CAAA;AAvBD,oBAuBC"}

package/lib/triggerLoader/index.js

@@ -4,35 +4,23 @@ exports.load = void 0;
 const tslib_1 = require("tslib");
 const _ = require("underscore");
 const path = require("path");
-const objectql = require("@steedos/objectql");
 const objectql_1 = require("@steedos/objectql");
+const TRIGGERKEYS = ['beforeFind', 'beforeInsert', 'beforeUpdate', 'beforeDelete', 'afterFind', 'afterInsert', 'afterUpdate', 'afterDelete', 'afterFindOne', 'afterCount'];
 function load(broker, packagePath, packageServiceName) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         let actions = {};
         let serviceName = `~triggers-${packageServiceName}`;
         let filePath = path.join(packagePath, "**");
-        let objTriggers = objectql.loadObjectTriggers(filePath, packageServiceName);
+        let objTriggers = (0, objectql_1.loadObjectTriggers)(filePath, packageServiceName);
         if (_.isEmpty(objTriggers)) {
             return;
         }
-        for (const ot of objTriggers) {
-            if (_.has(ot, 'handler')) {
-                if (_.isString(ot.when)) {
-                    let action = generateAction(ot);
-                    if (action) {
-                        actions[action.name] = action;
-                    }
-                }
-                else if (_.isArray(ot.when)) {
-                    for (const w of ot.when) {
-                        let trigger = _.extend({}, ot, { when: w, name: undefined });
-                        let action = generateAction(trigger);
-                        if (action) {
-                            actions[action.name] = action;
-                        }
-                    }
-                }
-            }
+        for (const trigger of objTriggers) {
+            const actionTriggerName = (0, objectql_1.getMD5)((0, objectql_1.JSONStringify)(trigger));
+            actions[actionTriggerName] = generateActionTrigger(trigger);
+            broker.emit('trigger.loaded', {
+                objectName: trigger['listenTo']
+            });
         }
         let serviceConfig = {
             name: serviceName,
@@ -42,65 +30,79 @@ function load(broker, packagePath, packageServiceName) {
         if (!broker.started) {
             yield broker._restartService(service);
         }
-        yield register(broker, actions, serviceName, packageServiceName);
     });
 }
 exports.load = load;
-function generateAction(trigger) {
-    if (!_.contains(objectql_1._TRIGGERKEYS, trigger.when)) {
-        console.warn(`invalid value ${trigger.when}, please check your trigger.`);
-        return;
+function generateActionTrigger(trigger) {
+    const when = [];
+    for (const key in trigger) {
+        if (Object.hasOwnProperty.call(trigger, key)) {
+            if (_.contains(TRIGGERKEYS, key)) {
+                when.push(key);
+            }
+        }
     }
-    let name = trigger.name || (0, objectql_1.getMD5)((0, objectql_1.JSONStringify)(trigger));
-    let action = {
+    const actionTrigger = {
         trigger: {
-            when: trigger.when,
             listenTo: trigger.listenTo,
-            name: name
+            when: when
         },
-        name: `${trigger.listenTo}.${name}`,
-        handler: function () { }
-    };
-    if (_.has(trigger, 'handler')) {
-        action.handler = function (ctx) {
+        handler(ctx) {
             return tslib_1.__awaiter(this, void 0, void 0, function* () {
-                return yield trigger.handler.call(ctx.params, ctx);
+                const { isInsert, isUpdate, isDelete, isFind, isBefore, isAfter, isFindOne, isCount, id, doc, previousDoc, userId, spaceId, objectName, query, data } = ctx.params;
+                const context = {
+                    id,
+                    userId,
+                    spaceId,
+                    doc,
+                    previousDoc,
+                    query,
+                    data,
+                    objectName
+                };
+                let when = '';
+                if (isBefore) {
+                    if (isFind) {
+                        when = 'beforeFind';
+                    }
+                    else if (isInsert) {
+                        when = 'beforeInsert';
+                    }
+                    else if (isUpdate) {
+                        when = 'beforeUpdate';
+                    }
+                    else if (isDelete) {
+                        when = 'beforeDelete';
+                    }
+                }
+                else if (isAfter) {
+                    if (isFind) {
+                        when = 'afterFind';
+                    }
+                    else if (isInsert) {
+                        when = 'afterInsert';
+                    }
+                    else if (isUpdate) {
+                        when = 'afterUpdate';
+                    }
+                    else if (isDelete) {
+                        when = 'afterDelete';
+                    }
+                    else if (isFindOne) {
+                        when = 'afterFindOne';
+                    }
+                    else if (isCount) {
+                        when = 'afterCount';
+                    }
+                }
+                if (when) {
+                    const object = (0, objectql_1.getObject)(objectName);
+                    yield object.runTriggers(when, context);
+                    return context;
+                }
             });
-        };
-    }
-    return action;
-}
-function register(broker, actions, serviceName, packageServiceName) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        for (const key in actions) {
-            if (Object.hasOwnProperty.call(actions, key)) {
-                let action = actions[key];
-                let data = generateAddData(action);
-                let meta = generateAddMeta(broker, serviceName, packageServiceName);
-                yield broker.call('triggers.add', { data: data }, { meta: meta });
-            }
-        }
-    });
-}
-function generateAddData(action) {
-    let data = {
-        name: action.trigger.name,
-        listenTo: action.trigger.listenTo,
-        when: action.trigger.when,
-        action: action.name
-    };
-    return data;
-}
-function generateAddMeta(broker, serviceName, packageServiceName) {
-    let meta = {
-        metadataServiceName: packageServiceName,
-        caller: {
-            nodeID: broker.nodeID + '',
-            service: {
-                name: serviceName
-            }
         }
     };
-    return meta;
+    return actionTrigger;
 }
 //# sourceMappingURL=index.js.map

package/lib/triggerLoader/index.js.map

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

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@steedos/service-package-loader",
-  "version": "2.5.0-beta.8",
+  "version": "2.5.0",
   "description": "",
   "main": "index.js",
   "scripts": {
-    "build": "tsc",
+    "build": "rm -rf ./lib && tsc",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@steedos/core": "2.5.0-beta.8",
-    "@steedos/metadata-core": "2.5.0-beta.8",
-    "@steedos/objectql": "2.5.0-beta.8",
-    "@steedos/router": "2.5.0-beta.8",
+    "@steedos/core": "2.5.0",
+    "@steedos/metadata-core": "2.5.0",
+    "@steedos/objectql": "2.5.0",
+    "@steedos/router": "2.5.0",
     "clone": "^2.1.2",
     "moleculer": "^0.14.25",
     "underscore": "^1.12.0"
@@ -25,5 +25,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "537101194e8c7c61a4eed846d28382126d947775"
+  "gitHead": "c4b366d1366ab52eb53da1a3ff4a80b16fd73cc0"
 }

package/src/index.ts

@@ -1,10 +1,11 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-05-14 10:16:03
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2022-05-14 13:51:40
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-04-25 17:08:47
  * @Description: 
  */
 export * as triggerLoader from "./triggerLoader"
 export * as processLoader from "./processLoader"
-export * as processTriggerLoader from "./processTriggerLoader"
+export * as processTriggerLoader from "./processTriggerLoader"
+export * as triggerYmlLoader from './loader/triggerYmlLoader';

package/src/loader/triggerYmlLoader.ts

@@ -0,0 +1,57 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2023-04-25 16:52:28
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-05-18 09:27:20
+ * @Description: 
+ */
+
+import { LoadTriggerFile } from '@steedos/metadata-core'
+import path = require('path');
+import _ = require('lodash');
+
+const loadTriggerFile = new LoadTriggerFile();
+function isPatternTrigger(data){
+    const {listenTo} = data;
+    if(listenTo === '*'){
+        return true;
+    }else if(_.isArray(listenTo)){
+        return true;
+    }else if(_.isRegExp(listenTo)){
+        return true;
+    }else if(_.isString(listenTo) && listenTo.startsWith("/")){
+        try {
+            if(_.isRegExp(eval(listenTo))){
+                return true;
+            }
+        } catch (error) {
+            return false
+        }
+        return false;
+    }
+    return false;
+}
+export async function load(broker: any, packagePath: string, packageServiceName: string) {
+    let filePath = path.join(packagePath, "**");
+    let triggers: any = loadTriggerFile.load(filePath);
+    if (_.isEmpty(triggers)) {
+        return;
+    }
+    for (const apiName in triggers) {
+        const trigger = triggers[apiName];
+        if(isPatternTrigger(trigger)){
+            trigger.isPattern = true
+        }
+        await broker.call(`object_triggers.add`, { apiName: `${trigger.listenTo}.${trigger.name}`, data: trigger }, {
+            meta: {
+            metadataServiceName: packageServiceName,
+            caller: {
+                nodeID: broker.nodeID,
+                service: {
+                    name: packageServiceName,
+                }
+            }
+        }});
+        broker.broadcast('metadata.object_triggers.change', {apiName: `${trigger.listenTo}.${trigger.name}`, listenTo: trigger.listenTo})
+    }
+}

package/src/triggerLoader/index.ts

@@ -1,36 +1,57 @@
+/*
+ * @Author: sunhaolin@hotoa.com
+ * @Date: 2022-06-12 19:08:48
+ * @LastEditors: sunhaolin@hotoa.com
+ * @LastEditTime: 2023-04-24 13:09:55
+ * @Description: 加载*.trigger.js文件注册为新版action trigger
+ */
 import * as _ from "underscore";
 import * as path from "path";
-import * as objectql from "@steedos/objectql";
-import { getMD5, JSONStringify, _TRIGGERKEYS } from "@steedos/objectql";
-import { Action, Meta, Trigger, TriggerData } from "./types";
-import { Context } from 'moleculer';
+import { getMD5, JSONStringify, TriggerActionParams, SteedosTriggerContextConfig, loadObjectTriggers, getObject } from "@steedos/objectql";
+
+const TRIGGERKEYS = ['beforeFind', 'beforeInsert', 'beforeUpdate', 'beforeDelete', 'afterFind', 'afterInsert', 'afterUpdate', 'afterDelete', 'afterFindOne', 'afterCount']
 
 export async function load(broker: any, packagePath: string, packageServiceName: string) {
     let actions = {};
     let serviceName = `~triggers-${packageServiceName}`;
     let filePath = path.join(packagePath, "**");
-    let objTriggers = objectql.loadObjectTriggers(filePath, packageServiceName);
+    let objTriggers = loadObjectTriggers(filePath, packageServiceName);
     if (_.isEmpty(objTriggers)) {
         return;
     }
-    for (const ot of objTriggers) {
-        if (_.has(ot, 'handler')) { // 新trigger格式
-
-            if (_.isString(ot.when)) {
-                let action = generateAction(ot);
-                if (action) {
-                    actions[action.name] = action;
-                }
-            } else if (_.isArray(ot.when)) {
-                for (const w of ot.when) {
-                    let trigger = _.extend({}, ot, { when: w, name: undefined });
-                    let action = generateAction(trigger);
-                    if (action) {
-                        actions[action.name] = action;
-                    }
-                }
-            }
+    /** objTriggers格式
+    [
+        {
+            beforeInsert: [AsyncFunction: beforeInsert],
+            beforeUpdate: [AsyncFunction: beforeUpdate],
+            beforeDelete: [AsyncFunction: beforeDelete],
+            afterInsert: [AsyncFunction: afterInsert],
+            afterUpdate: [AsyncFunction: afterUpdate],
+            afterDelete: [AsyncFunction: afterDelete],
+            metadataServiceName: '~packages-my-steedos-package',
+            listenTo: 'company'
+        }
+    ]
+     */
+    for (const trigger of objTriggers) {
+        // 转换为action trigger
+        /** action trigger 格式
+        spaceUsersBeforeUpdate: {
+            trigger: { 
+                listenTo: 'space_users', 
+                when: ['beforeInsert', 'beforeUpdate']
+            },
+            async handler(ctx) {
+                this.broker.logger.debug('spaceUsersBeforeUpdate', ctx)
+            }   
         }
+         */
+        const actionTriggerName = getMD5(JSONStringify(trigger));
+        actions[actionTriggerName] = generateActionTrigger(trigger)
+    
+        broker.emit('trigger.loaded', {
+            objectName: trigger['listenTo']
+        })
     }
 
     let serviceConfig = {
@@ -42,67 +63,76 @@ export async function load(broker: any, packagePath: string, packageServiceName:
         await broker._restartService(service)
     }
 
-    await register(broker, actions, serviceName, packageServiceName);
 }
 
-function generateAction(trigger: Trigger): Action {
-    if (!_.contains(_TRIGGERKEYS, trigger.when)) {
-        console.warn(`invalid value ${trigger.when}, please check your trigger.`);
-        return;
+// 生成action trigger
+function generateActionTrigger(trigger) {
+    const when = [];
+    for (const key in trigger) {
+        if (Object.hasOwnProperty.call(trigger, key)) {
+            if (_.contains(TRIGGERKEYS, key)) {
+                when.push(key);
+            }
+        }
     }
-
-    let name = trigger.name || getMD5(JSONStringify(trigger));
-    let action: Action = {
+    const actionTrigger = {
         trigger: {
-            when: trigger.when,
             listenTo: trigger.listenTo,
-            name: name
+            when: when
         },
-        name: `${trigger.listenTo}.${name}`,
-        handler: function () { }
-    };
-    if (_.has(trigger, 'handler')) {
-        action.handler = async function (ctx: Context) {
-           return await trigger.handler.call(ctx.params, ctx);
-        }
-    }
-
-    return action;
-}
+        async handler(ctx) {
+            // 调用trigger.js的处理函数
+            const {
+                isInsert, isUpdate, isDelete, isFind, isBefore, isAfter, isFindOne, isCount,
+                id, doc, previousDoc,
+                // size, 
+                userId, spaceId, objectName, query, data }: TriggerActionParams = ctx.params;
 
+            const context: SteedosTriggerContextConfig = {
+                id,
+                userId,
+                spaceId,
+                doc,
+                previousDoc,
+                query,
+                data,
+                objectName
+            }
 
-async function register(broker: any, actions: object, serviceName: string, packageServiceName: string) {
-    for (const key in actions) {
-        if (Object.hasOwnProperty.call(actions, key)) {
-            let action = actions[key];
-            let data = generateAddData(action);
-            let meta = generateAddMeta(broker, serviceName, packageServiceName);
-            await broker.call('triggers.add', { data: data }, { meta: meta });
-        }
-    }
-}
-
-
-function generateAddData(action: Action): TriggerData {
-    let data = {
-        name: action.trigger.name,
-        listenTo: action.trigger.listenTo,
-        when: action.trigger.when,
-        action: action.name
-    };
-    return data;
-}
-
+            let when = ''
+            if (isBefore) {
+                if (isFind) {
+                    when = 'beforeFind'
+                } else if (isInsert) {
+                    when = 'beforeInsert'
+                } else if (isUpdate) {
+                    when = 'beforeUpdate'
+                } else if (isDelete) {
+                    when = 'beforeDelete'
+                }
+            }
+            else if (isAfter) {
+                if (isFind) {
+                    when = 'afterFind'
+                } else if (isInsert) {
+                    when = 'afterInsert'
+                } else if (isUpdate) {
+                    when = 'afterUpdate'
+                } else if (isDelete) {
+                    when = 'afterDelete'
+                } else if (isFindOne) {
+                    when = 'afterFindOne'
+                } else if (isCount) {
+                    when = 'afterCount'
+                }
+            }
 
-function generateAddMeta(broker: any, serviceName: string, packageServiceName: string): Meta {
-    let meta = {
-        metadataServiceName: packageServiceName,
-        caller: {
-            nodeID: broker.nodeID + '',
-            service: {
-                name: serviceName
+            if (when) {
+                const object = getObject(objectName);
+                await object.runTriggers(when, context);
+                return context;
             }
         }
     };
-    return meta;
-}
+    return actionTrigger;
+}

package/lib/triggerLoader/types/action.d.ts

@@ -1,9 +0,0 @@
-export declare type Action = {
-    trigger: {
-        when: string | string[];
-        listenTo: string;
-        name: string;
-    };
-    name: string;
-    handler: Function;
-};

package/lib/triggerLoader/types/action.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=action.js.map

package/lib/triggerLoader/types/action.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"action.js","sourceRoot":"","sources":["../../../src/triggerLoader/types/action.ts"],"names":[],"mappings":""}

package/lib/triggerLoader/types/index.d.ts

@@ -1,4 +0,0 @@
-export * from './meta';
-export * from './triggerData';
-export * from './action';
-export * from './trigger';

package/lib/triggerLoader/types/index.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./meta"), exports);
-tslib_1.__exportStar(require("./triggerData"), exports);
-tslib_1.__exportStar(require("./action"), exports);
-tslib_1.__exportStar(require("./trigger"), exports);
-//# sourceMappingURL=index.js.map

package/lib/triggerLoader/types/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/triggerLoader/types/index.ts"],"names":[],"mappings":";;;AAAA,iDAAuB;AACvB,wDAA8B;AAC9B,mDAAyB;AACzB,oDAA0B"}

package/lib/triggerLoader/types/meta.d.ts

@@ -1,8 +0,0 @@
-export declare type Meta = {
-    caller: {
-        nodeID: string;
-        service: {
-            name: string;
-        };
-    };
-};

package/lib/triggerLoader/types/meta.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=meta.js.map

package/lib/triggerLoader/types/meta.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"meta.js","sourceRoot":"","sources":["../../../src/triggerLoader/types/meta.ts"],"names":[],"mappings":""}

package/lib/triggerLoader/types/trigger.d.ts

@@ -1,6 +0,0 @@
-export declare type Trigger = {
-    name: string;
-    listenTo: string;
-    when: string | string[];
-    handler: Function;
-};

package/lib/triggerLoader/types/trigger.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=trigger.js.map

package/lib/triggerLoader/types/trigger.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"trigger.js","sourceRoot":"","sources":["../../../src/triggerLoader/types/trigger.ts"],"names":[],"mappings":""}

package/lib/triggerLoader/types/triggerData.d.ts

@@ -1,6 +0,0 @@
-export declare type TriggerData = {
-    name: string;
-    listenTo: string;
-    when: string | string[];
-    action: string;
-};

package/lib/triggerLoader/types/triggerData.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=triggerData.js.map

package/lib/triggerLoader/types/triggerData.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"triggerData.js","sourceRoot":"","sources":["../../../src/triggerLoader/types/triggerData.ts"],"names":[],"mappings":""}

package/src/triggerLoader/types/action.ts

@@ -1,9 +0,0 @@
-export type Action = {
-    trigger: {
-        when: string | string[],
-        listenTo: string,
-        name: string
-    },
-    name: string,
-    handler: Function
-}

package/src/triggerLoader/types/index.ts

@@ -1,4 +0,0 @@
-export * from './meta';
-export * from './triggerData';
-export * from './action';
-export * from './trigger';

package/src/triggerLoader/types/meta.ts

@@ -1,8 +0,0 @@
-export type Meta = {
-    caller: {
-        nodeID: string,
-        service: {
-            name: string,
-        }
-    }
-}

package/src/triggerLoader/types/trigger.ts

@@ -1,6 +0,0 @@
-export type Trigger = {
-    name: string,
-    listenTo: string,
-    when: string | string[],
-    handler: Function
-}

package/src/triggerLoader/types/triggerData.ts

@@ -1,6 +0,0 @@
-export type TriggerData = {
-    name: string,
-    listenTo: string,
-    when: string | string[],
-    action: string
-}