@steedos/service-package-loader 2.5.19 → 2.5.20-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/index.js +8 -2
  2. package/lib/methods/importData.js +1 -1
  3. package/lib/methods/importData.js.map +1 -1
  4. package/package.json +6 -6
  5. package/src/methods/importData.ts +2 -2
package/index.js CHANGED
@@ -56,7 +56,7 @@ module.exports = {
56
56
  /**
57
57
  * Dependencies
58
58
  */
59
- dependencies: ['metadata-server', '@steedos/service-project', '@steedos/service-packages'],
59
+ dependencies: ['metadata-server', '@steedos/service-project', '@steedos/service-packages', 'objectql', '@steedos/data-import'],
60
60
 
61
61
  /**
62
62
  * Actions
@@ -76,10 +76,10 @@ module.exports = {
76
76
  },
77
77
  "space.initialized": {
78
78
  async handler(ctx) {
79
- await this.loadDataOnServiceStarted();
80
79
  const spaceDoc = ctx.params
81
80
  // 扫描main/default/data文件夹
82
81
  await this.importData(path.join(this.settings.packageInfo.path, 'main', 'default', 'data'), true, spaceDoc._id);
82
+ await this.loadDataOnServiceStarted();
83
83
  }
84
84
  }
85
85
  },
@@ -237,6 +237,12 @@ module.exports = {
237
237
  },
238
238
  async onStarted(){
239
239
 
240
+ // 扫描main/default/data文件夹，在加载.flow.json前执行
241
+ const primarySpaceId = await this.broker.call("objectql.getPrimarySpaceId");
242
+ if (primarySpaceId) {
243
+ await this.importData(path.join(this.settings.packageInfo.path, 'main', 'default', 'data'), true, primarySpaceId);
244
+ }
245
+
240
246
  this.checkPackageMetadataFiles(this.settings.packageInfo.path)
241
247
 
242
248
  if(this.beforeStart){
package/lib/methods/importData.js CHANGED
@@ -22,7 +22,7 @@ function handler(filePath, onlyInsert, spaceId) {
22
22
  const csvData = yield importer.csv.readFile(filePath);
23
23
  const jsonData = yield importer.json.readFile(filePath);
24
24
  const flowData = yield importer.flow.readFile(filePath);
25
- yield this.broker.call("~packages-@steedos/data-import.importData", {
25
+ yield this.broker.call("@steedos/data-import.importData", {
26
26
  data: {
27
27
  "csv": csvData,
28
28
  "json": jsonData,
package/lib/methods/importData.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"importData.js","sourceRoot":"","sources":["../../src/methods/importData.ts"],"names":[],"mappings":";;;;AAQA,sDAA+C;AAC/C,oDAA4C;AAC5C,sDAA8C;AAE9C,yBAA0B;AAE1B,SAAsB,OAAO,CAAC,QAAgB,EAAE,UAAmB,EAAE,OAAe;;QAChF,IAAI,CAAC,QAAQ,EAAE;YACX,OAAM;SACT;QACD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YAC1B,OAAM;SACT;QAED,MAAM,QAAQ,GAAG;YACb,GAAG,EAAE,IAAI,mBAAS,EAAE;YACpB,IAAI,EAAE,IAAI,oBAAU,EAAE;YACtB,IAAI,EAAE,IAAI,oBAAU,EAAE;SACzB,CAAA;QAED,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAEtD,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAExD,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAExD,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2CAA2C,EAAE;YAChE,IAAI,EAAE;gBACF,KAAK,EAAE,OAAO;gBACd,MAAM,EAAE,QAAQ;gBAChB,MAAM,EAAE,QAAQ;aACnB;YACD,OAAO;YACP,UAAU,EAAE,IAAI;SACnB,CAAC,CAAA;IAEN,CAAC;CAAA;AA9BD,0BA8BC"}
1
+ {"version":3,"file":"importData.js","sourceRoot":"","sources":["../../src/methods/importData.ts"],"names":[],"mappings":";;;;AAQA,sDAA+C;AAC/C,oDAA4C;AAC5C,sDAA8C;AAE9C,yBAA0B;AAE1B,SAAsB,OAAO,CAAC,QAAgB,EAAE,UAAmB,EAAE,OAAe;;QAChF,IAAI,CAAC,QAAQ,EAAE;YACX,OAAM;SACT;QACD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YAC1B,OAAM;SACT;QAED,MAAM,QAAQ,GAAG;YACb,GAAG,EAAE,IAAI,mBAAS,EAAE;YACpB,IAAI,EAAE,IAAI,oBAAU,EAAE;YACtB,IAAI,EAAE,IAAI,oBAAU,EAAE;SACzB,CAAA;QAED,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAEtD,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAExD,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAExD,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,EAAE;YACtD,IAAI,EAAE;gBACF,KAAK,EAAE,OAAO;gBACd,MAAM,EAAE,QAAQ;gBAChB,MAAM,EAAE,QAAQ;aACnB;YACD,OAAO;YACP,UAAU,EAAE,IAAI;SACnB,CAAC,CAAA;IAEN,CAAC;CAAA;AA9BD,0BA8BC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@steedos/service-package-loader",
3
- "version": "2.5.19",
3
+ "version": "2.5.20-beta.1",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -10,10 +10,10 @@
10
10
  "author": "",
11
11
  "license": "MIT",
12
12
  "dependencies": {
13
- "@steedos/metadata-core": "2.5.19",
14
- "@steedos/metadata-registrar": "2.5.19",
15
- "@steedos/router": "2.5.19",
16
- "@steedos/service-object-mixin": "2.5.19",
13
+ "@steedos/metadata-core": "2.5.20-beta.1",
14
+ "@steedos/metadata-registrar": "2.5.20-beta.1",
15
+ "@steedos/router": "2.5.20-beta.1",
16
+ "@steedos/service-object-mixin": "2.5.20-beta.1",
17
17
  "clone": "^2.1.2",
18
18
  "csvtojson": "~2.0.10",
19
19
  "moleculer": "^0.14.25",
@@ -27,5 +27,5 @@
27
27
  "publishConfig": {
28
28
  "access": "public"
29
29
  },
30
- "gitHead": "f45f110239267697485b421285e61ca020e4779b"
30
+ "gitHead": "35fc3332a6c185d14b9f33e880776b6980f3383b"
31
31
  }
package/src/methods/importData.ts CHANGED
@@ -2,7 +2,7 @@
2
2
  * @Author: 孙浩林 sunhaolin@steedos.com
3
3
  * @Date: 2023-10-26 10:22:14
4
4
  * @LastEditors: 孙浩林 sunhaolin@steedos.com
5
- * @LastEditTime: 2023-10-27 12:12:57
5
+ * @LastEditTime: 2023-11-14 11:10:53
6
6
  * @FilePath: /steedos-platform-2.3/services/service-package-loader/src/methods/importData.ts
7
7
  * @Description:
8
8
  */
@@ -32,7 +32,7 @@ export async function handler(filePath: string, onlyInsert: boolean, spaceId: st
32
32
 
33
33
  const flowData = await importer.flow.readFile(filePath);
34
34
 
35
- await this.broker.call("~packages-@steedos/data-import.importData", {
35
+ await this.broker.call("@steedos/data-import.importData", {
36
36
  data: {
37
37
  "csv": csvData,
38
38
  "json": jsonData,