@steedos/service-package-loader 3.0.0-beta.98 → 3.0.0

package/index.js

@@ -19,6 +19,8 @@ const {
 } = require('@steedos/metadata-core');
 const sRouter = require('@steedos/router');
 
+const chalk = require("chalk");
+
 const getPackageYmlData = (packagePath)=>{
     let packageYmlData = {};
     if(fs.existsSync(path.join(packagePath, 'package.service.yml'))){
@@ -201,7 +203,7 @@ module.exports = {
             }
         },
         async errorHandler(error) {
-            this.broker.logger.error(`[${this.name}] 启动失败: ${error.message}`);
+            console.error(chalk.red(`[${this.name}] 启动失败: ${error.message}`));
             await await this.broker.call(`@steedos/service-project.disablePackage`, {
                 module: this.schema.packageName
             })
@@ -268,12 +270,12 @@ module.exports = {
             this.started = true;
             const endTime = moment();
             const serviceName = this.name.length < 50 ? `${_.padEnd(this.name, 50, ' ')}` : this.name
-            logger.log(`service ${serviceName} started: ${endTime.diff(startTime, 'seconds', true)}s`);
+            console.log(chalk.green(`service ${serviceName} started: ${endTime.diff(startTime, 'seconds', true)}s`));
             if(this.afterStart){
                 try {
                     await this.afterStart();
                 } catch (error) {
-                    this.broker.logger.error(`[${this.name}]: ${error.message}`);
+                    console.error(chalk.error(`[${this.name}]: ${error.message}`));
                 }
             }
         },
@@ -315,7 +317,7 @@ module.exports = {
                     return ;
                 }
                 compressFiles(sourcePath, sourcePath, tempDir, option, async (base64, zipDir) => {
-                    const result = await this.broker.call('~packages-@steedos/metadata-api.deploy', {
+                    const result = await this.broker.call('@steedos/metadata-api.deploy', {
                         fileBase64: base64,
                         packageInfo
                     }, {
@@ -356,7 +358,7 @@ module.exports = {
     merged(schema) {
         schema.packageName = schema.name;
         if(!schema.metadata || !schema.metadata.$package){
-            schema.name = `~packages-${schema.name}`;
+            schema.name = `${schema.name}`;
         }
 
         schema.settings.packageInfo = {

package/lib/imports/ImportJson.d.ts

@@ -1,4 +1,4 @@
-import { Base } from './Base';
+import { Base } from "./Base";
 export default class ImportJson implements Base {
     readFile(filePath: string): Promise<Array<{
         objectName: string;

package/lib/imports/ImportJson.js

@@ -5,20 +5,31 @@ const lodash_1 = require("lodash");
 const metadata_core_1 = require("@steedos/metadata-core");
 const path = require("path");
 const fs = require("fs");
+const yaml = require("js-yaml");
 class ImportJson {
     readFile(filePath) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let results = [];
             const filePatten = [
                 path.join(filePath, "**", "*.data.json"),
+                path.join(filePath, "**", "*.data.yml"),
                 "!" + path.join(filePath, "**", "*.flow.data.json"),
-                "!" + path.join(filePath, "node_modules")
+                "!" + path.join(filePath, "node_modules"),
             ];
             const matchedPaths = (0, metadata_core_1.syncMatchFiles)(filePatten);
             (0, lodash_1.each)(matchedPaths, (matchedPath) => {
-                let records = JSON.parse(fs.readFileSync(matchedPath, 'utf8').normalize('NFC'));
-                let objectName = path.basename(matchedPath).split('.')[0];
-                results.push({ objectName: objectName, records: records });
+                if (matchedPath.endsWith(".yml")) {
+                    let ymlRecords = yaml.load(fs.readFileSync(matchedPath, "utf8"));
+                    let records = (0, lodash_1.isArray)(ymlRecords) ? ymlRecords : [];
+                    let objectName = path.basename(matchedPath).split(".")[0];
+                    results.push({ objectName: objectName, records: records });
+                    return;
+                }
+                else if (matchedPath.endsWith(".data.json")) {
+                    let records = JSON.parse(fs.readFileSync(matchedPath, "utf8").normalize("NFC"));
+                    let objectName = path.basename(matchedPath).split(".")[0];
+                    results.push({ objectName: objectName, records: records });
+                }
             });
             return results;
         });

package/lib/imports/ImportJson.js.map

@@ -1 +1 @@
-{"version":3,"file":"ImportJson.js","sourceRoot":"","sources":["../../src/imports/ImportJson.ts"],"names":[],"mappings":";;;AAQA,mCAA8B;AAE9B,0DAAwD;AACxD,6BAA8B;AAC9B,yBAA0B;AAE1B,MAAqB,UAAU;IAErB,QAAQ,CAAC,QAAgB;;YAC3B,IAAI,OAAO,GAAQ,EAAE,CAAA;YACrB,MAAM,UAAU,GAAG;gBACf,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,aAAa,CAAC;gBACxC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,kBAAkB,CAAC;gBACnD,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC;aAAC,CAAC;YAE/C,MAAM,YAAY,GAAa,IAAA,8BAAc,EAAC,UAAU,CAAC,CAAC;YAC1D,IAAA,aAAI,EAAC,YAAY,EAAE,CAAC,WAAmB,EAAE,EAAE;gBACvC,IAAI,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;gBAChF,IAAI,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC1D,OAAO,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;YAC/D,CAAC,CAAC,CAAA;YACF,OAAO,OAAO,CAAA;QAClB,CAAC;KAAA;CAEJ;AAlBD,6BAkBC"}
+{"version":3,"file":"ImportJson.js","sourceRoot":"","sources":["../../src/imports/ImportJson.ts"],"names":[],"mappings":";;;AAQA,mCAAuC;AAEvC,0DAAwD;AACxD,6BAA8B;AAC9B,yBAA0B;AAC1B,gCAAiC;AAEjC,MAAqB,UAAU;IACvB,QAAQ,CACZ,QAAgB;;YAEhB,IAAI,OAAO,GAAQ,EAAE,CAAC;YACtB,MAAM,UAAU,GAAG;gBACjB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,aAAa,CAAC;gBACxC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,YAAY,CAAC;gBACvC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,kBAAkB,CAAC;gBACnD,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC;aAC1C,CAAC;YAEF,MAAM,YAAY,GAAa,IAAA,8BAAc,EAAC,UAAU,CAAC,CAAC;YAC1D,IAAA,aAAI,EAAC,YAAY,EAAE,CAAC,WAAmB,EAAE,EAAE;gBACzC,IAAI,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;oBACjC,IAAI,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;oBACjE,IAAI,OAAO,GAAG,IAAA,gBAAO,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;oBACpD,IAAI,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC1D,OAAO,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;oBAC3D,OAAO;gBACT,CAAC;qBAAM,IAAI,WAAW,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;oBAC9C,IAAI,OAAO,GAAG,IAAI,CAAC,KAAK,CACtB,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CACtD,CAAC;oBACF,IAAI,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC1D,OAAO,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;gBAC7D,CAAC;YACH,CAAC,CAAC,CAAC;YACH,OAAO,OAAO,CAAC;QACjB,CAAC;KAAA;CACF;AA9BD,6BA8BC"}

package/lib/triggerLoader/index.js

@@ -13,8 +13,8 @@ function load(broker, packagePath, packageServiceName) {
             return;
         }
         for (const trigger of objTriggers) {
-            broker.emit('trigger.loaded', {
-                objectName: trigger['listenTo']
+            broker.emit("trigger.loaded", {
+                objectName: trigger["listenTo"],
             });
         }
     });

package/lib/triggerLoader/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/triggerLoader/index.ts"],"names":[],"mappings":";;AAyBA,oBAoDC;;AAtED,gCAAgC;AAChC,6BAA6B;AAE7B,oEAAiE;AAejE,SAAsB,IAAI,CAAC,MAAW,EAAE,WAAmB,EAAE,kBAA0B;;QAGnF,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAC5C,IAAI,WAAW,GAAG,IAAA,uCAAkB,EAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACnE,IAAI,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YACzB,OAAO;QACX,CAAC;QAeD,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE,CAAC;YAgBhC,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE;gBAC1B,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC;aAClC,CAAC,CAAA;QACN,CAAC;IAWL,CAAC;CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/triggerLoader/index.ts"],"names":[],"mappings":";;AAuBA,oBAuDC;;AAvED,gCAAgC;AAChC,6BAA6B;AAE7B,oEAAiE;AAajE,SAAsB,IAAI,CACxB,MAAW,EACX,WAAmB,EACnB,kBAA0B;;QAI1B,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAC5C,IAAI,WAAW,GAAG,IAAA,uCAAkB,EAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACnE,IAAI,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YAC3B,OAAO;QACT,CAAC;QAeD,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE,CAAC;YAgBlC,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE;gBAC5B,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC;aAChC,CAAC,CAAC;QACL,CAAC;IAUH,CAAC;CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-loader",
-  "version": "3.0.0-beta.98",
+  "version": "3.0.0",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -10,13 +10,13 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@steedos/metadata-core": "3.0.0-beta.98",
-    "@steedos/metadata-registrar": "3.0.0-beta.98",
-    "@steedos/router": "3.0.0-beta.98",
-    "@steedos/service-object-mixin": "3.0.0-beta.98",
+    "@steedos/metadata-core": "3.0.0",
+    "@steedos/metadata-registrar": "3.0.0",
+    "@steedos/router": "3.0.0",
+    "@steedos/service-object-mixin": "3.0.0",
     "clone": "^2.1.2",
     "csvtojson": "~2.0.10",
-    "moleculer": "^0.14.25",
+    "moleculer": "^0.14.35",
     "moment": "^2.24.0",
     "node-xlsx": "^0.16.1",
     "underscore": "^1.12.0"
@@ -24,9 +24,8 @@
   "devDependencies": {
     "typescript": "5.7.3"
   },
-  "private": false,
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4b7a81157f9279ab1750ef877d94c9d64ae7968e"
+  "gitHead": "20ea485d800dd4ad0a99c82b26000879c2f85741"
 }