@voxgig/system 0.0.2 → 0.3.0
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.
- package/dist/lib/utility.d.ts +1 -0
- package/dist/lib/utility.js +6 -2
- package/dist/lib/utility.js.map +1 -1
- package/dist/system.js +5 -2
- package/dist/system.js.map +1 -1
- package/lib/utility.ts +7 -2
- package/package.json +11 -8
- package/system.ts +6 -2
package/dist/lib/utility.d.ts
CHANGED
package/dist/lib/utility.js
CHANGED
|
@@ -2,11 +2,14 @@
|
|
|
2
2
|
/* Copyright © 2022 Voxgig Ltd, MIT License. */
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
exports.Utility = void 0;
|
|
5
|
-
const
|
|
5
|
+
const jsonic_next_1 = require("@jsonic/jsonic-next");
|
|
6
|
+
// const Seneca = require('seneca')
|
|
7
|
+
const Patrun = require('patrun');
|
|
6
8
|
// TODO: perform this during model build?
|
|
7
9
|
function srvmsgs(srv, model) {
|
|
8
10
|
const allmsgs = listmsgs(model.main.msg);
|
|
9
|
-
const allpat = Seneca.util.Patrun()
|
|
11
|
+
// const allpat = Seneca.util.Patrun()
|
|
12
|
+
const allpat = Patrun();
|
|
10
13
|
allmsgs.forEach((msg) => allpat.add(msg.props, msg));
|
|
11
14
|
// TODO: need an option to listmsgs to just list patterns
|
|
12
15
|
const srvpats = listmsgs(srv.in).map(m => m.props);
|
|
@@ -50,6 +53,7 @@ function walkmsgs(point, path, handle) {
|
|
|
50
53
|
const Utility = {
|
|
51
54
|
srvmsgs,
|
|
52
55
|
listmsgs,
|
|
56
|
+
deep: jsonic_next_1.util.deep,
|
|
53
57
|
};
|
|
54
58
|
exports.Utility = Utility;
|
|
55
59
|
//# sourceMappingURL=utility.js.map
|
package/dist/lib/utility.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utility.js","sourceRoot":"","sources":["../../lib/utility.ts"],"names":[],"mappings":";AAAA,+CAA+C;;;
|
|
1
|
+
{"version":3,"file":"utility.js","sourceRoot":"","sources":["../../lib/utility.ts"],"names":[],"mappings":"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"}
|
package/dist/system.js
CHANGED
|
@@ -11,7 +11,7 @@ const utility_1 = require("./lib/utility");
|
|
|
11
11
|
Object.defineProperty(exports, "Utility", { enumerable: true, get: function () { return utility_1.Utility; } });
|
|
12
12
|
const make_1 = require("./srv/make");
|
|
13
13
|
Object.defineProperty(exports, "MakeSrv", { enumerable: true, get: function () { return make_1.MakeSrv; } });
|
|
14
|
-
const { srvmsgs } = utility_1.Utility;
|
|
14
|
+
const { srvmsgs, deep } = utility_1.Utility;
|
|
15
15
|
function messages(seneca, options, reload) {
|
|
16
16
|
let srvname = seneca.fixedargs.plugin$.name.replace(/^srv_/, '');
|
|
17
17
|
let model = seneca.context.model;
|
|
@@ -46,12 +46,15 @@ function prepare(seneca, require) {
|
|
|
46
46
|
function Local(options) {
|
|
47
47
|
const model = this.context.model;
|
|
48
48
|
const folder = options.srv.folder;
|
|
49
|
+
// index by srv name, overrides model
|
|
50
|
+
const srvOptions = options.options || {};
|
|
49
51
|
for (const entry of Object.entries(model.main.srv)) {
|
|
50
52
|
let name = entry[0];
|
|
51
53
|
let srv = entry[1];
|
|
52
54
|
let srvpath = path_1.default.join(folder, name, name + '-srv.js');
|
|
53
55
|
if (fs_1.default.existsSync(srvpath)) {
|
|
54
|
-
|
|
56
|
+
let srvopts = deep({}, srv.options, srvOptions[name]);
|
|
57
|
+
this.root.use(srvpath, srvopts);
|
|
55
58
|
}
|
|
56
59
|
else {
|
|
57
60
|
this.log.warn('srv-not-found', { name, srvpath: srvpath });
|
package/dist/system.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system.js","sourceRoot":"","sources":["../system.ts"],"names":[],"mappings":";AAAA,+CAA+C;;;;;;AAG/C,gDAAuB;AACvB,4CAAmB;AAOnB,2CAAuC;
|
|
1
|
+
{"version":3,"file":"system.js","sourceRoot":"","sources":["../system.ts"],"names":[],"mappings":";AAAA,+CAA+C;;;;;;AAG/C,gDAAuB;AACvB,4CAAmB;AAOnB,2CAAuC;AA2FrC,wFA3FO,iBAAO,OA2FP;AAzFT,qCAAoC;AAwFlC,wFAxFO,cAAO,OAwFP;AArFT,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,iBAAO,CAAA;AAGjC,SAAS,QAAQ,CAAC,MAAW,EAAE,OAAY,EAAE,MAAW;IACtD,IAAI,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;IAEhE,IAAI,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAA;IAChC,IAAI,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IAEtC,IAAI,IAAI,GAAG,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;IACnC,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;IAEpD,KAAK,IAAI,GAAG,IAAI,IAAI,EAAE;QACpB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;KAC/D;AACH,CAAC;AAGD,SAAS,OAAO,CAAC,GAAQ;IACvB,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE;QACjB,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAA;KACrB;IAED,IAAI,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IAExC,gDAAgD;IAChD,IAAI,IAAI,GAAG,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IAC5D,OAAO,IAAI,CAAA;AACb,CAAC;AAGD,SAAS,OAAO,CAAC,MAAW,EAAE,OAAY;IACxC,IAAI,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;IAEhE,IAAI;QACF,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,GAAG,OAAO,GAAG,aAAa,CAAC,CAAA;QAC3D,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAA;KAC9B;IACD,OAAO,CAAM,EAAE;QACb,IAAI,kBAAkB,KAAK,CAAC,CAAC,IAAI,EAAE;YACjC,MAAM,CAAC,CAAA;SACR;KACF;AACH,CAAC;AAID,SAAS,KAAK,CAAY,OAAY;IACpC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAA;IAChC,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAA;IAEjC,qCAAqC;IACrC,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,IAAI,EAAE,CAAA;IAExC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QAClD,IAAI,IAAI,GAAW,KAAK,CAAC,CAAC,CAAC,CAAA;QAC3B,IAAI,GAAG,GAAQ,KAAK,CAAC,CAAC,CAAC,CAAA;QAEvB,IAAI,OAAO,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC,CAAA;QAEvD,IAAI,YAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;YAC1B,IAAI,OAAO,GAAG,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;YACrD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;SAChC;aACI;YACH,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAA;SAC3D;KACF;AAEH,CAAC;AAkBC,sBAAK;AAdP,MAAM,MAAM,GAAG;IACb,QAAQ;IACR,OAAO;CACR,CAAA;AAQC,wBAAM"}
|
package/lib/utility.ts
CHANGED
|
@@ -5,15 +5,19 @@ import type {
|
|
|
5
5
|
Msg
|
|
6
6
|
} from './types'
|
|
7
7
|
|
|
8
|
+
import { util } from '@jsonic/jsonic-next'
|
|
8
9
|
|
|
9
|
-
|
|
10
|
+
|
|
11
|
+
// const Seneca = require('seneca')
|
|
12
|
+
const Patrun = require('patrun')
|
|
10
13
|
|
|
11
14
|
|
|
12
15
|
// TODO: perform this during model build?
|
|
13
16
|
function srvmsgs(srv: Record<string, any>, model: Record<string, any>): Msg[] {
|
|
14
17
|
const allmsgs = listmsgs(model.main.msg)
|
|
15
18
|
|
|
16
|
-
const allpat = Seneca.util.Patrun()
|
|
19
|
+
// const allpat = Seneca.util.Patrun()
|
|
20
|
+
const allpat = Patrun()
|
|
17
21
|
allmsgs.forEach((msg: Msg) => allpat.add(msg.props, msg))
|
|
18
22
|
|
|
19
23
|
// TODO: need an option to listmsgs to just list patterns
|
|
@@ -77,6 +81,7 @@ function walkmsgs(
|
|
|
77
81
|
const Utility = {
|
|
78
82
|
srvmsgs,
|
|
79
83
|
listmsgs,
|
|
84
|
+
deep: util.deep,
|
|
80
85
|
}
|
|
81
86
|
|
|
82
87
|
|
package/package.json
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@voxgig/system",
|
|
3
|
-
"version": "0.0
|
|
3
|
+
"version": "0.3.0",
|
|
4
4
|
"main": "dist/system.js",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"types": "dist/system.d.ts",
|
|
7
7
|
"description": "Voxgig System.",
|
|
8
8
|
"homepage": "https://github.com/voxgig/system",
|
|
9
9
|
"keywords": [
|
|
10
|
+
"voxgig",
|
|
10
11
|
"system"
|
|
11
12
|
],
|
|
12
13
|
"author": "Richard Rodger (http://richardrodger.com)",
|
|
@@ -35,13 +36,15 @@
|
|
|
35
36
|
"LICENSE"
|
|
36
37
|
],
|
|
37
38
|
"devDependencies": {
|
|
38
|
-
"@types/jest": "^
|
|
39
|
-
"esbuild": "^0.14.
|
|
39
|
+
"@types/jest": "^28.1.3",
|
|
40
|
+
"esbuild": "^0.14.47",
|
|
40
41
|
"esbuild-jest": "^0.5.0",
|
|
41
|
-
"jest": "^28.1.
|
|
42
|
-
"
|
|
43
|
-
"
|
|
44
|
-
|
|
45
|
-
|
|
42
|
+
"jest": "^28.1.1",
|
|
43
|
+
"ts-jest": "^28.0.5",
|
|
44
|
+
"typescript": "^4.7.4"
|
|
45
|
+
},
|
|
46
|
+
"dependencies": {
|
|
47
|
+
"@jsonic/jsonic-next": "^2.1.0",
|
|
48
|
+
"patrun": "^7.2.4"
|
|
46
49
|
}
|
|
47
50
|
}
|
package/system.ts
CHANGED
|
@@ -14,7 +14,7 @@ import { Utility } from './lib/utility'
|
|
|
14
14
|
import { MakeSrv } from './srv/make'
|
|
15
15
|
|
|
16
16
|
|
|
17
|
-
const { srvmsgs } = Utility
|
|
17
|
+
const { srvmsgs, deep } = Utility
|
|
18
18
|
|
|
19
19
|
|
|
20
20
|
function messages(seneca: any, options: any, reload: any) {
|
|
@@ -65,6 +65,9 @@ function Local(this: any, options: any) {
|
|
|
65
65
|
const model = this.context.model
|
|
66
66
|
const folder = options.srv.folder
|
|
67
67
|
|
|
68
|
+
// index by srv name, overrides model
|
|
69
|
+
const srvOptions = options.options || {}
|
|
70
|
+
|
|
68
71
|
for (const entry of Object.entries(model.main.srv)) {
|
|
69
72
|
let name: string = entry[0]
|
|
70
73
|
let srv: any = entry[1]
|
|
@@ -72,7 +75,8 @@ function Local(this: any, options: any) {
|
|
|
72
75
|
let srvpath = Path.join(folder, name, name + '-srv.js')
|
|
73
76
|
|
|
74
77
|
if (Fs.existsSync(srvpath)) {
|
|
75
|
-
|
|
78
|
+
let srvopts = deep({}, srv.options, srvOptions[name])
|
|
79
|
+
this.root.use(srvpath, srvopts)
|
|
76
80
|
}
|
|
77
81
|
else {
|
|
78
82
|
this.log.warn('srv-not-found', { name, srvpath: srvpath })
|