@steedos/service-package-loader 2.5.0-beta.13 → 2.5.0-beta.15

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');
@@ -168,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})
@@ -308,13 +310,13 @@ module.exports = {
 
     merged(schema) {
         schema.packageName = schema.name;
-        if(!schema.metadata?.$package){
+        if(!schema.metadata || !schema.metadata.$package){
             schema.name = `~packages-${schema.name}`;
         }
 
         schema.settings.packageInfo = {
             ...schema.settings.packageInfo,
-            ...schema.metadata?.$package
+            ...(schema.metadata && schema.metadata.$package ? schema.metadata.$package : {})
         }
     },
 

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,34 @@
+"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 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];
+            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;AAE9C,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,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;AApBD,oBAoBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-loader",
-  "version": "2.5.0-beta.13",
+  "version": "2.5.0-beta.15",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -10,10 +10,10 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@steedos/core": "2.5.0-beta.13",
-    "@steedos/metadata-core": "2.5.0-beta.13",
-    "@steedos/objectql": "2.5.0-beta.13",
-    "@steedos/router": "2.5.0-beta.13",
+    "@steedos/core": "2.5.0-beta.15",
+    "@steedos/metadata-core": "2.5.0-beta.15",
+    "@steedos/objectql": "2.5.0-beta.15",
+    "@steedos/router": "2.5.0-beta.15",
     "clone": "^2.1.2",
     "moleculer": "^0.14.25",
     "underscore": "^1.12.0"
@@ -25,5 +25,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7027a5e2cff04814d2284fc63a1d738e32c90feb"
+  "gitHead": "0b66b1a87086836a5c2bc45875207c29e057cff6"
 }

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,35 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2023-04-25 16:52:28
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-04-26 15:22:58
+ * @Description: 
+ */
+
+import { LoadTriggerFile } from '@steedos/metadata-core'
+import path = require('path');
+import _ = require('lodash');
+
+const loadTriggerFile = new LoadTriggerFile();
+
+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];
+        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

@@ -2,7 +2,7 @@
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-06-12 19:08:48
  * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2023-04-23 10:28:35
+ * @LastEditTime: 2023-04-24 13:09:55
  * @Description: 加载*.trigger.js文件注册为新版action trigger
  */
 import * as _ from "underscore";