@voxgig/system 0.3.0 → 0.4.2

package/dist/system.d.ts

@@ -4,9 +4,17 @@ import { MakeSrv } from './srv/make';
 declare function messages(seneca: any, options: any, reload: any): void;
 declare function prepare(seneca: any, require: any): void;
 declare function Local(this: any, options: any): void;
+declare type LiveOptions = {
+    srv: {
+        name: string;
+        folder: string;
+    };
+    options: Record<string, any>;
+};
+declare function Live(this: any, options: LiveOptions): void;
 declare const System: {
     messages: typeof messages;
     prepare: typeof prepare;
 };
 export type { Msg };
-export { System, MakeSrv, Utility, Local, };
+export { System, MakeSrv, Utility, Local, Live, };

package/dist/system.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Local = exports.Utility = exports.MakeSrv = exports.System = void 0;
+exports.Live = exports.Local = exports.Utility = exports.MakeSrv = exports.System = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const utility_1 = require("./lib/utility");
@@ -17,7 +17,7 @@ function messages(seneca, options, reload) {
     let model = seneca.context.model;
     let srvmodel = model.main.srv[srvname];
     let msgs = srvmsgs(srvmodel, model);
-    console.log('SYSTEM: MESSAGES FOUND', srvname, msgs);
+    console.log('SYSTEM: MESSAGES FOUND', srvname, msgs.map(m => m.pattern));
     for (let msg of msgs) {
         seneca.message(msg.pattern, reload(actpath(msg), { options }));
     }
@@ -62,6 +62,41 @@ function Local(options) {
     }
 }
 exports.Local = Local;
+function Live(options) {
+    const model = this.context.model;
+    const srvname = options.srv.name;
+    let srvdef = model.main.srv[srvname];
+    srvdef.name = srvname;
+    let deps = srvdef.deps || {};
+    let srvs = Object
+        .entries(deps)
+        .reduce(((srvdefs, dep) => {
+        let depname = dep[0];
+        let depsrv = model.main.srv[depname];
+        depsrv.name = depname;
+        srvdefs.push(depsrv);
+        return srvdefs;
+    }), []);
+    srvs.push(srvdef);
+    useSrvs(this, srvs, options, model);
+}
+exports.Live = Live;
+function useSrvs(seneca, srvs, options, model) {
+    const folder = options.srv.folder;
+    // index by srv name, overrides model
+    const srvOptions = options.options || {};
+    for (const srv of srvs) {
+        let name = srv.name;
+        let srvpath = path_1.default.join(folder, name, name + '-srv.js');
+        if (fs_1.default.existsSync(srvpath)) {
+            let srvopts = deep({}, srv.options, srvOptions[name]);
+            seneca.root.use(srvpath, srvopts);
+        }
+        else {
+            seneca.log.warn('srv-not-found', { name, srvpath: srvpath });
+        }
+    }
+}
 const System = {
     messages,
     prepare,

package/dist/system.js.map

@@ -1 +1 @@
-{"version":3,"file":"system.js","sourceRoot":"","sources":["../system.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"system.js","sourceRoot":"","sources":["../system.ts"],"names":[],"mappings":";AAAA,+CAA+C;;;;;;AAG/C,gDAAuB;AACvB,4CAAmB;AAOnB,2CAAuC;AAyJrC,wFAzJO,iBAAO,OAyJP;AAvJT,qCAAoC;AAsJlC,wFAtJO,cAAO,OAsJP;AAnJT,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,EACjC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA,EAAE,CAAA,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;IAEnC,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;AA+EC,sBAAK;AAjEP,SAAS,IAAI,CAEX,OAAoB;IAEpB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAA;IAChC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAA;IAEhC,IAAI,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACpC,MAAM,CAAC,IAAI,GAAG,OAAO,CAAA;IAErB,IAAI,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,EAAE,CAAA;IAE5B,IAAI,IAAI,GAAG,MAAM;SACd,OAAO,CAAC,IAAI,CAAC;SACb,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE;QACxB,IAAI,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;QACpB,IAAI,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACpC,MAAM,CAAC,IAAI,GAAG,OAAO,CAAA;QACrB,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACpB,OAAO,OAAO,CAAA;IAChB,CAAC,CAAC,EAAG,EAAY,CAAC,CAAA;IAEpB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAEjB,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;AACrC,CAAC;AAyCC,oBAAI;AAtCN,SAAS,OAAO,CAAC,MAAW,EAAE,IAAW,EAAE,OAAoB,EAAE,KAAU;IACzE,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAA;IAEjC,qCAAqC;IACrC,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,IAAI,EAAE,CAAA;IAExC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,IAAI,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACnB,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,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;SAClC;aACI;YACH,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAA;SAC7D;KACF;AAEH,CAAC;AAID,MAAM,MAAM,GAAG;IACb,QAAQ;IACR,OAAO;CACR,CAAA;AAQC,wBAAM"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/system",
-  "version": "0.3.0",
+  "version": "0.4.2",
   "main": "dist/system.js",
   "type": "commonjs",
   "types": "dist/system.d.ts",
@@ -36,15 +36,15 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "@types/jest": "^28.1.3",
-    "esbuild": "^0.14.47",
+    "@types/jest": "^28.1.7",
+    "esbuild": "^0.15.3",
     "esbuild-jest": "^0.5.0",
-    "jest": "^28.1.1",
-    "ts-jest": "^28.0.5",
+    "jest": "^28.1.3",
+    "ts-jest": "^28.0.8",
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@jsonic/jsonic-next": "^2.1.0",
-    "patrun": "^7.2.4"
+    "@jsonic/jsonic-next": "^2.3.0",
+    "patrun": "^7.2.5"
   }
 }

package/system.ts

@@ -24,7 +24,8 @@ function messages(seneca: any, options: any, reload: any) {
   let srvmodel = model.main.srv[srvname]
 
   let msgs = srvmsgs(srvmodel, model)
-  console.log('SYSTEM: MESSAGES FOUND', srvname, msgs)
+  console.log('SYSTEM: MESSAGES FOUND', srvname,
+              msgs.map(m=>m.pattern))
 
   for (let msg of msgs) {
     seneca.message(msg.pattern, reload(actpath(msg), { options }))
@@ -86,6 +87,67 @@ function Local(this: any, options: any) {
 }
 
 
+type LiveOptions = {
+  srv: {
+    name: string,
+    folder: string,
+  },
+
+  // Srv options by name
+  options: Record<string, any>
+}
+
+
+function Live(
+  this: any,
+  options: LiveOptions
+) {
+  const model = this.context.model
+  const srvname = options.srv.name
+  
+  let srvdef = model.main.srv[srvname]
+  srvdef.name = srvname
+
+  let deps = srvdef.deps || {}
+
+  let srvs = Object
+    .entries(deps)
+    .reduce(((srvdefs, dep) => {
+      let depname = dep[0]
+      let depsrv = model.main.srv[depname]
+      depsrv.name = depname
+      srvdefs.push(depsrv)
+      return srvdefs
+    }), ([] as any[]))
+
+  srvs.push(srvdef)
+
+  useSrvs(this, srvs, options, model)
+}
+
+
+function useSrvs(seneca: any, srvs: any[], options: LiveOptions, model: any) {
+  const folder = options.srv.folder
+
+  // index by srv name, overrides model
+  const srvOptions = options.options || {}
+
+  for (const srv of srvs) {
+    let name = srv.name
+    let srvpath = Path.join(folder, name, name + '-srv.js')
+
+    if (Fs.existsSync(srvpath)) {
+      let srvopts = deep({}, srv.options, srvOptions[name])
+      seneca.root.use(srvpath, srvopts)
+    }
+    else {
+      seneca.log.warn('srv-not-found', { name, srvpath: srvpath })
+    }
+  }
+
+}
+
+
 
 const System = {
   messages,
@@ -102,4 +164,5 @@ export {
   MakeSrv,
   Utility,
   Local,
+  Live,
 }