@voxgig/model 0.19.0 → 0.21.0

package/bin/voxgig-model

@@ -15,7 +15,8 @@ if(null == path || '' == path) {
 }
 
 let fstats = Fs.statSync(path)
-let base = path
+// let base = path
+let base = Path.resolve(path)
 
 if (fstats.isFile()) {
   let basedesc = Path.parse(base)
@@ -23,7 +24,6 @@ if (fstats.isFile()) {
 }
 
 path = Path.resolve(path)
-// console.log('PATH', path)
 
 let src = Fs.readFileSync(path).toString()
 
@@ -34,18 +34,13 @@ let spec = {
   require: process.cwd()
 }
 
-// console.log('CMD SPEC', spec)
-
 let model = new Model(spec)
 
-
 async function run() {
   if(once) {
     let br = await model.run()
-    console.log('OK:'+br.ok, once)
   }
   else {
-    console.log('WATCHING...')
     model.start()
   }
 }

package/dist/lib/build.d.ts

@@ -5,6 +5,7 @@ interface BuildResult {
     path?: string;
     build?: Build;
     builders?: BuildResult[];
+    err?: any[];
 }
 interface BuildAction {
     path: string;
@@ -35,6 +36,7 @@ declare class Build {
     use: {
         [name: string]: any;
     };
+    err: any[];
     constructor(spec: Spec);
     run(): Promise<BuildResult>;
 }

package/dist/lib/build.js

@@ -1,4 +1,5 @@
 "use strict";
+/* Copyright © 2021-2023 Voxgig Ltd, MIT License. */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Build = void 0;
 const aontu_1 = require("aontu");
@@ -6,6 +7,7 @@ class Build {
     constructor(spec) {
         this.root = aontu_1.Nil.make();
         this.use = {};
+        this.err = [];
         this.spec = spec;
         this.src = spec.src;
         this.base = null == spec.base ? '' : spec.base;
@@ -13,6 +15,7 @@ class Build {
         this.opts = {};
         if (null != spec.base) {
             this.opts.base = spec.base;
+            this.opts.path = spec.path;
         }
         if (null != spec.require) {
             this.opts.require = spec.require;
@@ -21,24 +24,36 @@ class Build {
         Object.assign(this.use, spec.use || {});
     }
     async run() {
-        console.log('BUILDING ', this.path, new Date() + ' ...');
+        let hasErr = false;
         this.root = (0, aontu_1.Aontu)(this.src, this.opts);
-        let nil = this.root;
-        console.log('MODEL: ' + (nil.nil ? nil.why : 'ok'));
-        if (this.root.err) {
-            console.log('MODEL ERR');
-            console.dir(this.root.err, { depth: null });
+        hasErr = this.root.err && 0 < this.root.err.length;
+        if (hasErr) {
+            this.err.push(...this.root.err);
         }
-        this.model = this.root.gen();
-        // TODO: only call if path value has changed
         let brlog = [];
-        for (let builder of this.res) {
-            let br = await builder.build(this);
-            br.path = builder.path;
-            br.builder = builder.build.name;
-            brlog.push(br);
+        if (!hasErr) {
+            let genctx = new aontu_1.Context({ root: this.root });
+            this.model = this.root.gen(genctx);
+            hasErr = genctx.err && 0 < genctx.err.length;
+            if (hasErr) {
+                this.err.push(...genctx.err);
+            }
+            else {
+                // TODO: only call if path value has changed
+                for (let builder of this.res) {
+                    try {
+                        let br = await builder.build(this);
+                        br.path = builder.path;
+                        br.builder = builder.build.name;
+                        brlog.push(br);
+                    }
+                    catch (e) {
+                        this.err.push(e);
+                    }
+                }
+            }
         }
-        return { ok: true, build: this, builders: brlog };
+        return { ok: !hasErr, build: this, builders: brlog, err: this.err };
     }
 }
 exports.Build = Build;

package/dist/lib/build.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../../lib/build.ts"],"names":[],"mappings":";;;AAEA,iCAAuC;AAiCvC,MAAM,KAAK;IAWT,YAAY,IAAU;QAPtB,SAAI,GAAQ,WAAG,CAAC,IAAI,EAAE,CAAA;QAKtB,QAAG,GAA4B,EAAE,CAAA;QAG/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAA;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;QAC9C,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;QAC9C,IAAI,CAAC,IAAI,GAAG,EAAE,CAAA;QAEd,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;YACrB,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;SAC3B;QAED,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE;YACxB,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;SACjC;QAED,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,EAAE,CAAA;QAEzB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,CAAA;IACzC,CAAC;IAGD,KAAK,CAAC,GAAG;QACP,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,IAAI,EAAE,GAAG,MAAM,CAAC,CAAA;QAExD,IAAI,CAAC,IAAI,GAAG,IAAA,aAAK,EAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;QAEtC,IAAI,GAAG,GAAI,IAAI,CAAC,IAAY,CAAA;QAC5B,OAAO,CAAC,GAAG,CAAC,SAAS,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;QAEnD,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;YACjB,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;YACxB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;SAC5C;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAA;QAG5B,4CAA4C;QAC5C,IAAI,KAAK,GAAG,EAAE,CAAA;QACd,KAAK,IAAI,OAAO,IAAI,IAAI,CAAC,GAAG,EAAE;YAC5B,IAAI,EAAE,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YAClC,EAAE,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;YACtB,EAAE,CAAC,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAA;YAC/B,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;SACf;QAED,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAA;IACnD,CAAC;CACF;AAIC,sBAAK"}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../../lib/build.ts"],"names":[],"mappings":"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"}

package/dist/lib/builder/local.js

@@ -6,29 +6,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.local_builder = void 0;
 const path_1 = __importDefault(require("path"));
 const local_builder = async (build) => {
-    // TODO: need to provide project root via build
-    let root = path_1.default.resolve(build.path, '..', '..');
-    // TODO: build should do this
-    console.log('LOCAL root:', root);
-    let configbuild = build.use.config;
-    let config = configbuild.watch.last.build.model;
-    console.log('CONFIG BUILD');
-    console.dir(config, { depth: null });
-    let builders = config.sys.model.builders;
-    let ok = true;
-    let brlog = [];
-    // TODO: order by comma sep string
-    for (let name in builders) {
-        let builder = builders[name];
-        let action_path = path_1.default.join(root, builder.load);
-        // TODO: need to watch these files too, and their deps!
-        console.log('ACTION PATH', name, action_path);
-        let action = require(action_path);
-        let br = await action(build.model, build);
-        ok = ok && null != br && br.ok;
-        brlog.push(br);
+    try {
+        // TODO: need to provide project root via build
+        let root = path_1.default.resolve(build.path, '..', '..');
+        // TODO: build should do this
+        // console.log('LOCAL root:', root)
+        let configbuild = build.use.config;
+        let config = configbuild.watch.last.build.model;
+        // console.log('CONFIG BUILD')
+        // console.dir(config, { depth: null })
+        let builders = config.sys.model.builders;
+        let ok = true;
+        let brlog = [];
+        // TODO: order by comma sep string
+        for (let name in builders) {
+            let builder = builders[name];
+            let action_path = path_1.default.join(root, builder.load);
+            // TODO: need to watch these files too, and their deps!
+            // console.log('ACTION PATH', name, action_path)
+            let action = require(action_path);
+            let br = await action(build.model, build);
+            ok = ok && null != br && br.ok;
+            brlog.push(br);
+        }
+        return { ok: ok, brlog };
+    }
+    catch (e) {
+        console.log('MODEL BUILD local', e);
+        throw e;
     }
-    return { ok: ok, brlog };
 };
 exports.local_builder = local_builder;
 //# sourceMappingURL=local.js.map

package/dist/lib/builder/local.js.map

@@ -1 +1 @@
-{"version":3,"file":"local.js","sourceRoot":"","sources":["../../../lib/builder/local.ts"],"names":[],"mappings":";;;;;;AACA,gDAAuB;AAKvB,MAAM,aAAa,GAAY,KAAK,EAAE,KAAY,EAAE,EAAE;IACpD,+CAA+C;IAC/C,IAAI,IAAI,GAAG,cAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;IAE/C,6BAA6B;IAC7B,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,CAAA;IAChC,IAAI,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAA;IAElC,IAAI,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAA;IAC/C,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;IAC3B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IAEpC,IAAI,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAA;IAExC,IAAI,EAAE,GAAG,IAAI,CAAA;IACb,IAAI,KAAK,GAAG,EAAE,CAAA;IAEd,kCAAkC;IAClC,KAAK,IAAI,IAAI,IAAI,QAAQ,EAAE;QACzB,IAAI,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAA;QAC5B,IAAI,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;QAE/C,uDAAuD;QACvD,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,EAAE,WAAW,CAAC,CAAA;QAE7C,IAAI,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;QACjC,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;QACzC,EAAE,GAAG,EAAE,IAAI,IAAI,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAA;QAC9B,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;KACf;IAED,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,CAAA;AAC1B,CAAC,CAAA;AAGC,sCAAa"}
+{"version":3,"file":"local.js","sourceRoot":"","sources":["../../../lib/builder/local.ts"],"names":[],"mappings":";;;;;;AACA,gDAAuB;AAKvB,MAAM,aAAa,GAAY,KAAK,EAAE,KAAY,EAAE,EAAE;IACpD,IAAI;QACF,+CAA+C;QAC/C,IAAI,IAAI,GAAG,cAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;QAE/C,6BAA6B;QAC7B,mCAAmC;QACnC,IAAI,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAA;QAElC,IAAI,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAA;QAC/C,8BAA8B;QAC9B,uCAAuC;QAEvC,IAAI,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAA;QAExC,IAAI,EAAE,GAAG,IAAI,CAAA;QACb,IAAI,KAAK,GAAG,EAAE,CAAA;QAEd,kCAAkC;QAClC,KAAK,IAAI,IAAI,IAAI,QAAQ,EAAE;YACzB,IAAI,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAA;YAC5B,IAAI,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;YAE/C,uDAAuD;YACvD,gDAAgD;YAEhD,IAAI,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;YACjC,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;YACzC,EAAE,GAAG,EAAE,IAAI,IAAI,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAA;YAC9B,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;SACf;QAED,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,CAAA;KACzB;IAAC,OAAO,CAAM,EAAE;QACf,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAA;QACnC,MAAM,CAAC,CAAA;KACR;AAEH,CAAC,CAAA;AAGC,sCAAa"}

package/dist/lib/builder/model.js

@@ -7,15 +7,21 @@ exports.model_builder = void 0;
 const path_1 = __importDefault(require("path"));
 const promises_1 = require("fs/promises");
 const model_builder = async (build) => {
-    let json = JSON.stringify(build.root.gen(), null, 2);
-    let filename = path_1.default.basename(build.path);
-    let filenameparts = filename.match(/^(.*)\.[^.]+$/);
-    if (filenameparts) {
-        filename = filenameparts[1];
+    try {
+        let json = JSON.stringify(build.root.gen(), null, 2);
+        let filename = path_1.default.basename(build.path);
+        let filenameparts = filename.match(/^(.*)\.[^.]+$/);
+        if (filenameparts) {
+            filename = filenameparts[1];
+        }
+        let file = build.opts.base + '/' + filename + '.json';
+        await (0, promises_1.writeFile)(file, json);
+        return { ok: true };
+    }
+    catch (e) {
+        console.log('MODEL BUILD model', e);
+        throw e;
     }
-    let file = build.opts.base + '/' + filename + '.json';
-    await (0, promises_1.writeFile)(file, json);
-    return { ok: true };
 };
 exports.model_builder = model_builder;
 //# sourceMappingURL=model.js.map

package/dist/lib/builder/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../lib/builder/model.ts"],"names":[],"mappings":";;;;;;AACA,gDAAuB;AAEvB,0CAAuC;AAKvC,MAAM,aAAa,GAAY,KAAK,EAAE,KAAY,EAAE,EAAE;IAEpD,IAAI,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IAEpD,IAAI,QAAQ,GAAG,cAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACxC,IAAI,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;IACnD,IAAI,aAAa,EAAE;QACjB,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA;KAC5B;IAED,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,QAAQ,GAAG,OAAO,CAAA;IAErD,MAAM,IAAA,oBAAS,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAE3B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAA;AACrB,CAAC,CAAA;AAGC,sCAAa"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../lib/builder/model.ts"],"names":[],"mappings":";;;;;;AACA,gDAAuB;AAEvB,0CAAuC;AAKvC,MAAM,aAAa,GAAY,KAAK,EAAE,KAAY,EAAE,EAAE;IAEpD,IAAI;QACF,IAAI,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QAEpD,IAAI,QAAQ,GAAG,cAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACxC,IAAI,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QACnD,IAAI,aAAa,EAAE;YACjB,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA;SAC5B;QAED,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,QAAQ,GAAG,OAAO,CAAA;QAErD,MAAM,IAAA,oBAAS,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QAE3B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAA;KACpB;IAAC,OAAO,CAAM,EAAE;QACf,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAA;QACnC,MAAM,CAAC,CAAA;KACR;AACH,CAAC,CAAA;AAGC,sCAAa"}

package/dist/lib/config.js

@@ -1,7 +1,5 @@
 "use strict";
-// load config as a model
-// from model / config.jsonic by default
-// config defines builders
+/* Copyright © 2021-2023 Voxgig Ltd, MIT License. */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Config = void 0;
 const watch_1 = require("./watch");
@@ -18,7 +16,8 @@ class Config {
                     build: model_1.model_builder
                 },
                 ...(spec.res || [])
-            ]
+            ],
+            require: spec.require
         };
         this.watch = new watch_1.Watch(this.build);
     }

package/dist/lib/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../lib/config.ts"],"names":[],"mappings":";AACA,yBAAyB;AACzB,wCAAwC;AACxC,0BAA0B;;;AAM1B,mCAA+B;AAG/B,2CAA+C;AAO/C,MAAM,MAAM;IAIV,YAAY,IAAU;QACpB,IAAI,CAAC,KAAK,GAAG;YACX,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,GAAG,EAAE;gBACH;oBACE,IAAI,EAAE,GAAG;oBACT,KAAK,EAAE,qBAAa;iBACrB;gBACD,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC;aACpB;SACF,CAAA;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,aAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACpC,CAAC;IAED,KAAK,CAAC,GAAG;QACP,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAC7B,CAAC;IAED,KAAK,CAAC,KAAK;QACT,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;IAC3B,CAAC;IAED,KAAK,CAAC,IAAI;QACR,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;IAC1B,CAAC;CACF;AAGQ,wBAAM"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../lib/config.ts"],"names":[],"mappings":";AAAA,oDAAoD;;;AAWpD,mCAA+B;AAG/B,2CAA+C;AAO/C,MAAM,MAAM;IAIV,YAAY,IAAU;QACpB,IAAI,CAAC,KAAK,GAAG;YACX,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,GAAG,EAAE;gBACH;oBACE,IAAI,EAAE,GAAG;oBACT,KAAK,EAAE,qBAAa;iBACrB;gBACD,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC;aACpB;YACD,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAA;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,aAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACpC,CAAC;IAED,KAAK,CAAC,GAAG;QACP,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAC7B,CAAC;IAED,KAAK,CAAC,KAAK;QACT,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;IAC3B,CAAC;IAED,KAAK,CAAC,IAAI;QACR,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;IAC1B,CAAC;CACF;AAGQ,wBAAM"}

package/dist/lib/util.js

@@ -1,4 +1,5 @@
 "use strict";
+/* Copyright © 2021-2023 Voxgig Ltd, MIT License. */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.joins = exports.dive = void 0;
 function dive(node, depth, mapper) {

package/dist/lib/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../lib/util.ts"],"names":[],"mappings":";;;AAIA,SAAS,IAAI,CAAC,IAAS,EAAE,KAA2B,EAAE,MAAmB;IACvE,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,KAAK,IAAI,QAAQ,IAAI,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;IAC/D,MAAM,GAAG,UAAU,KAAK,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAA;IAErD,IAAI,KAAK,GAAU,EAAE,CAAA;IAErB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CACzB,CAAC,KAAY,EAAE,KAAY,EAAE,EAAE;QAC7B,IAAI,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;QAClB,IAAI,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;QAEpB,IAAI,CAAC,IAAI,CAAC,EAAE;YACV,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC,CAAA;SAC3B;aACI;YACH,IAAI,QAAQ,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;YACjC,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;gBAC9B,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;gBACrB,OAAO,KAAK,CAAA;YACd,CAAC,CAAC,CAAA;YACF,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAA;SACxB;QAED,OAAO,KAAK,CAAA;IACd,CAAC,EACD,KAAK,CACN,CAAA;IAED,IAAI,MAAM,EAAE;QACV,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YAChC,KAAK,GAAI,MAAc,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;YAC3C,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;YACtB,OAAO,CAAC,CAAA;QACV,CAAC,CAAC,EAAE,EAAS,CAAC,CAAA;KACf;IAED,OAAO,KAAK,CAAA;AACd,CAAC;AA2BC,oBAAI;AAxBN;;;;EAIE;AACF,SAAS,KAAK,CAAC,GAAU,EAAE,GAAG,IAAc;IAC1C,GAAG,GAAG,GAAG,IAAI,EAAE,CAAA;IACf,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;IACjB,IAAI,EAAE,GAAG,EAAE,CAAA;IACX,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACnC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QACf,IAAI,CAAC,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;YACtB,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;gBACzC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE;oBAC5B,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;oBAChB,MAAK;iBACN;aACF;SACF;KACF;IACD,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;AACpB,CAAC;AAIC,sBAAK"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../lib/util.ts"],"names":[],"mappings":";AAAA,oDAAoD;;;AAKpD,SAAS,IAAI,CAAC,IAAS,EAAE,KAA2B,EAAE,MAAmB;IACvE,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,KAAK,IAAI,QAAQ,IAAI,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;IAC/D,MAAM,GAAG,UAAU,KAAK,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAA;IAErD,IAAI,KAAK,GAAU,EAAE,CAAA;IAErB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CACzB,CAAC,KAAY,EAAE,KAAY,EAAE,EAAE;QAC7B,IAAI,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;QAClB,IAAI,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;QAEpB,IAAI,CAAC,IAAI,CAAC,EAAE;YACV,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC,CAAA;SAC3B;aACI;YACH,IAAI,QAAQ,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;YACjC,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;gBAC9B,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;gBACrB,OAAO,KAAK,CAAA;YACd,CAAC,CAAC,CAAA;YACF,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAA;SACxB;QAED,OAAO,KAAK,CAAA;IACd,CAAC,EACD,KAAK,CACN,CAAA;IAED,IAAI,MAAM,EAAE;QACV,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YAChC,KAAK,GAAI,MAAc,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;YAC3C,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;YACtB,OAAO,CAAC,CAAA;QACV,CAAC,CAAC,EAAE,EAAS,CAAC,CAAA;KACf;IAED,OAAO,KAAK,CAAA;AACd,CAAC;AA2BC,oBAAI;AAxBN;;;;EAIE;AACF,SAAS,KAAK,CAAC,GAAU,EAAE,GAAG,IAAc;IAC1C,GAAG,GAAG,GAAG,IAAI,EAAE,CAAA;IACf,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;IACjB,IAAI,EAAE,GAAG,EAAE,CAAA;IACX,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACnC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QACf,IAAI,CAAC,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;YACtB,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;gBACzC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE;oBAC5B,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;oBAChB,MAAK;iBACN;aACF;SACF;KACF;IACD,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;AACpB,CAAC;AAIC,sBAAK"}

package/dist/lib/watch.d.ts

@@ -9,5 +9,9 @@ declare class Watch {
     start(): Promise<void>;
     run(once: boolean): Promise<BuildResult>;
     stop(): Promise<void>;
+    handleErrors(br: BuildResult): void;
+    descDeps(deps: Record<string, Record<string, {
+        tar: string;
+    }>>): string;
 }
 export { Watch };

package/dist/lib/watch.js

@@ -1,4 +1,5 @@
 "use strict";
+/* Copyright © 2021-2023 Voxgig Ltd, MIT License. */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Watch = void 0;
 const build_1 = require("./build");
@@ -12,49 +13,76 @@ class Watch {
     }
     update(br) {
         let build = br.build;
-        // TODO: remove dep map building from Aontu 
-        //let depmap = (build.root as any).map
-        // console.log('DEPMAP', depmap)
-        //let files = Object.keys(depmap.url)
-        //console.log('DEP FILES', files)
         let files = Object.keys(build.root.deps).reduce((files, target) => {
             files = files.concat(Object.keys(build.root.deps[target]));
             return files;
         }, [build.path]);
-        //console.log('DEPS', build.base, files)
         // TODO: remove deleted files
         files.forEach((file) => {
             if ('string' === typeof (file) &&
                 '' !== file &&
                 build.opts.base !== file) {
-                // console.log('ADD', file)
                 this.fsw.add(file);
             }
         });
-        setTimeout(() => {
-            console.log('WATCH', this.fsw.getWatched());
-        }, 100);
+        // setTimeout(() => {
+        //   console.log('WATCH', this.fsw.getWatched())
+        // }, 100)
     }
     async start() {
         await this.run(false);
     }
     async run(once) {
+        var _a, _b;
+        console.log('\n@voxgig/model', new Date());
         // TODO: build spec should not have src!
         let src = (await (0, promises_1.readFile)(this.spec.path)).toString();
         this.spec.src = src;
         let build = new build_1.Build(this.spec);
         let br = await build.run();
-        if (!once) {
-            // There may be new files.
-            this.update(br);
+        console.log('\nFILES:\n' + this.descDeps(br.build.root.deps) + '\n');
+        if (br.ok) {
+            console.log('TOP:', Object.keys((_a = br === null || br === void 0 ? void 0 : br.build) === null || _a === void 0 ? void 0 : _a.model).join(', '), '\n');
+            if (!once) {
+                // There may be new files.
+                this.update(br);
+            }
+        }
+        else {
+            console.log('MODEL ERRORS: ' + ((_b = br.err) === null || _b === void 0 ? void 0 : _b.length));
+            this.handleErrors(br);
         }
         this.last = br;
-        console.log('WATCH RUN DONE', this.spec.path, this.last.ok);
         return br;
     }
     async stop() {
         await this.fsw.close();
     }
+    handleErrors(br) {
+        if (br.err) {
+            for (let be of br.err) {
+                if (be.msg) {
+                    console.log(be.msg);
+                }
+                else if (be.message) {
+                    console.log(be.message);
+                }
+                else {
+                    console.log(be);
+                }
+            }
+        }
+    }
+    descDeps(deps) {
+        let desc = [];
+        for (let entryPath of Object.keys(deps)) {
+            desc.push('  ' + entryPath);
+            for (let depPath of Object.keys(deps[entryPath])) {
+                desc.push('    ' + depPath);
+            }
+        }
+        return desc.join('\n');
+    }
 }
 exports.Watch = Watch;
 //# sourceMappingURL=watch.js.map

package/dist/lib/watch.js.map

@@ -1 +1 @@
-{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../lib/watch.ts"],"names":[],"mappings":";;;AAEA,mCAA4C;AAC5C,uCAAoC;AAEpC,0CAAsC;AAGtC,MAAM,KAAK;IAKT,YAAY,IAAS;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,GAAG,GAAG,IAAI,oBAAS,EAAE,CAAA;QAC1B,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IAC5C,CAAC;IAED,MAAM,CAAC,EAAe;QAGpB,IAAI,KAAK,GAAI,EAAE,CAAC,KAAe,CAAA;QAE/B,4CAA4C;QAC5C,sCAAsC;QAEtC,gCAAgC;QAEhC,qCAAqC;QACrC,iCAAiC;QAEjC,IAAI,KAAK,GACP,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,KAAe,EAAE,MAAW,EAAE,EAAE;YACnE,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;YAC1D,OAAO,KAAK,CAAA;QACd,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;QAGlB,wCAAwC;QAExC,6BAA6B;QAC7B,KAAK,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,EAAE;YAC7B,IAAI,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC;gBAC5B,EAAE,KAAK,IAAI;gBACX,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,EACxB;gBACA,2BAA2B;gBAC3B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;aACnB;QACH,CAAC,CAAC,CAAA;QAEF,UAAU,CAAC,GAAG,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAA;QAC7C,CAAC,EAAE,GAAG,CAAC,CAAA;IAET,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IACvB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAAa;QACrB,wCAAwC;QACxC,IAAI,GAAG,GAAG,CAAC,MAAM,IAAA,mBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAA;QACrD,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QAEnB,IAAI,KAAK,GAAG,IAAI,aAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAChC,IAAI,EAAE,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,CAAA;QAE1B,IAAI,CAAC,IAAI,EAAE;YACT,0BAA0B;YAC1B,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;SAChB;QAED,IAAI,CAAC,IAAI,GAAG,EAAE,CAAA;QACd,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAE3D,OAAO,EAAE,CAAA;IACX,CAAC;IAGD,KAAK,CAAC,IAAI;QACR,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAA;IACxB,CAAC;CACF;AAIC,sBAAK"}
+{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../lib/watch.ts"],"names":[],"mappings":"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"}

package/dist/model.js

@@ -1,5 +1,5 @@
 "use strict";
-/* Copyright © 2021-2022 Voxgig Ltd, MIT License. */
+/* Copyright © 2021-2023 Voxgig Ltd, MIT License. */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -18,15 +18,11 @@ const intern = makeIntern();
 class Model {
     constructor(spec) {
         this.trigger_model = false;
-        console.log('MODEL SPEC', spec);
+        // Config is a special Watch to handle model config.
         this.config = intern.makeConfig(spec, {
             path: '/',
             build: async (build) => {
-                console.log('TRIGGER MODEL', this.trigger_model);
                 if (this.trigger_model) {
-                    console.log('CONFIG CHANGE'); //, this)
-                    // console.trace()
-                    // rebuild if config changes
                     // TODO: fix!!!
                     this.build.use.config.watch.last.build = build;
                     return this.watch.run(true);
@@ -37,6 +33,7 @@ class Model {
                 }
             }
         });
+        // The actual model.
         this.build = {
             src: spec.src,
             path: spec.path,
@@ -62,7 +59,6 @@ class Model {
         return br.ok ? this.watch.run(true) : br;
     }
     async start() {
-        console.log('MODEL START');
         this.trigger_model = false;
         await this.config.start();
         return this.watch.start();

package/dist/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../model.ts"],"names":[],"mappings":"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"}

package/lib/build.ts

@@ -1,6 +1,7 @@
+/* Copyright © 2021-2023 Voxgig Ltd, MIT License. */
 
 
-import { Aontu, Val, Nil } from 'aontu'
+import { Aontu, Val, Nil, Context } from 'aontu'
 
 
 interface BuildResult {
@@ -9,6 +10,7 @@ interface BuildResult {
   path?: string
   build?: Build
   builders?: BuildResult[]
+  err?: any[]
 }
 
 interface BuildAction {
@@ -43,6 +45,8 @@ class Build {
   spec: Spec
   model: any
   use: { [name: string]: any } = {}
+  err: any[] = []
+
 
   constructor(spec: Spec) {
     this.spec = spec
@@ -53,6 +57,7 @@ class Build {
 
     if (null != spec.base) {
       this.opts.base = spec.base
+      this.opts.path = spec.path
     }
 
     if (null != spec.require) {
@@ -66,31 +71,44 @@ class Build {
 
 
   async run(): Promise<BuildResult> {
-    console.log('BUILDING ', this.path, new Date() + ' ...')
+    let hasErr = false
 
     this.root = Aontu(this.src, this.opts)
+    hasErr = this.root.err && 0 < this.root.err.length
 
-    let nil = (this.root as Nil)
-    console.log('MODEL: ' + (nil.nil ? nil.why : 'ok'))
-
-    if (this.root.err) {
-      console.log('MODEL ERR')
-      console.dir(this.root.err, { depth: null })
+    if (hasErr) {
+      this.err.push(...this.root.err)
     }
 
-    this.model = this.root.gen()
 
-
-    // TODO: only call if path value has changed
     let brlog = []
-    for (let builder of this.res) {
-      let br = await builder.build(this)
-      br.path = builder.path
-      br.builder = builder.build.name
-      brlog.push(br)
+
+    if (!hasErr) {
+      let genctx = new Context({ root: this.root })
+      this.model = this.root.gen(genctx)
+
+      hasErr = genctx.err && 0 < genctx.err.length
+      if (hasErr) {
+        this.err.push(...genctx.err)
+      }
+      else {
+
+        // TODO: only call if path value has changed
+        for (let builder of this.res) {
+          try {
+            let br = await builder.build(this)
+            br.path = builder.path
+            br.builder = builder.build.name
+            brlog.push(br)
+          }
+          catch (e: any) {
+            this.err.push(e)
+          }
+        }
+      }
     }
 
-    return { ok: true, build: this, builders: brlog }
+    return { ok: !hasErr, build: this, builders: brlog, err: this.err }
   }
 }
 

package/lib/builder/local.ts

@@ -5,37 +5,43 @@ import { Build, Builder } from '../build'
 
 
 const local_builder: Builder = async (build: Build) => {
-  // TODO: need to provide project root via build
-  let root = Path.resolve(build.path, '..', '..')
+  try {
+    // TODO: need to provide project root via build
+    let root = Path.resolve(build.path, '..', '..')
 
-  // TODO: build should do this
-  console.log('LOCAL root:', root)
-  let configbuild = build.use.config
+    // TODO: build should do this
+    // console.log('LOCAL root:', root)
+    let configbuild = build.use.config
 
-  let config = configbuild.watch.last.build.model
-  console.log('CONFIG BUILD')
-  console.dir(config, { depth: null })
+    let config = configbuild.watch.last.build.model
+    // console.log('CONFIG BUILD')
+    // console.dir(config, { depth: null })
 
-  let builders = config.sys.model.builders
+    let builders = config.sys.model.builders
 
-  let ok = true
-  let brlog = []
+    let ok = true
+    let brlog = []
 
-  // TODO: order by comma sep string
-  for (let name in builders) {
-    let builder = builders[name]
-    let action_path = Path.join(root, builder.load)
+    // TODO: order by comma sep string
+    for (let name in builders) {
+      let builder = builders[name]
+      let action_path = Path.join(root, builder.load)
 
-    // TODO: need to watch these files too, and their deps!
-    console.log('ACTION PATH', name, action_path)
+      // TODO: need to watch these files too, and their deps!
+      // console.log('ACTION PATH', name, action_path)
 
-    let action = require(action_path)
-    let br = await action(build.model, build)
-    ok = ok && null != br && br.ok
-    brlog.push(br)
+      let action = require(action_path)
+      let br = await action(build.model, build)
+      ok = ok && null != br && br.ok
+      brlog.push(br)
+    }
+
+    return { ok: ok, brlog }
+  } catch (e: any) {
+    console.log('MODEL BUILD local', e)
+    throw e
   }
 
-  return { ok: ok, brlog }
 }
 
 export {

package/lib/builder/model.ts

@@ -8,19 +8,24 @@ import { Build, Builder } from '../build'
 
 const model_builder: Builder = async (build: Build) => {
 
-  let json = JSON.stringify(build.root.gen(), null, 2)
+  try {
+    let json = JSON.stringify(build.root.gen(), null, 2)
 
-  let filename = Path.basename(build.path)
-  let filenameparts = filename.match(/^(.*)\.[^.]+$/)
-  if (filenameparts) {
-    filename = filenameparts[1]
-  }
+    let filename = Path.basename(build.path)
+    let filenameparts = filename.match(/^(.*)\.[^.]+$/)
+    if (filenameparts) {
+      filename = filenameparts[1]
+    }
 
-  let file = build.opts.base + '/' + filename + '.json'
+    let file = build.opts.base + '/' + filename + '.json'
 
-  await writeFile(file, json)
+    await writeFile(file, json)
 
-  return { ok: true }
+    return { ok: true }
+  } catch (e: any) {
+    console.log('MODEL BUILD model', e)
+    throw e
+  }
 }
 
 export {

package/lib/config.ts

@@ -1,3 +1,5 @@
+/* Copyright © 2021-2023 Voxgig Ltd, MIT License. */
+
 
 // load config as a model
 // from model / config.jsonic by default
@@ -32,7 +34,8 @@ class Config {
           build: model_builder
         },
         ...(spec.res || [])
-      ]
+      ],
+      require: spec.require
     }
 
     this.watch = new Watch(this.build)

package/lib/util.ts

@@ -1,3 +1,4 @@
+/* Copyright © 2021-2023 Voxgig Ltd, MIT License. */
 
 
 type DiveMapper = (path: any[], leaf: any) => any[]

package/lib/watch.ts

@@ -1,3 +1,4 @@
+/* Copyright © 2021-2023 Voxgig Ltd, MIT License. */
 
 
 import { Build, BuildResult } from './build'
@@ -18,18 +19,8 @@ class Watch {
   }
 
   update(br: BuildResult) {
-
-
     let build = (br.build as Build)
 
-    // TODO: remove dep map building from Aontu 
-    //let depmap = (build.root as any).map
-
-    // console.log('DEPMAP', depmap)
-
-    //let files = Object.keys(depmap.url)
-    //console.log('DEP FILES', files)
-
     let files: string[] =
       Object.keys(build.root.deps).reduce((files: string[], target: any) => {
         files = files.concat(Object.keys(build.root.deps[target]))
@@ -37,22 +28,19 @@ class Watch {
       }, [build.path])
 
 
-    //console.log('DEPS', build.base, files)
-
     // TODO: remove deleted files
     files.forEach((file: string) => {
       if ('string' === typeof (file) &&
         '' !== file &&
         build.opts.base !== file
       ) {
-        // console.log('ADD', file)
         this.fsw.add(file)
       }
     })
 
-    setTimeout(() => {
-      console.log('WATCH', this.fsw.getWatched())
-    }, 100)
+    // setTimeout(() => {
+    //   console.log('WATCH', this.fsw.getWatched())
+    // }, 100)
 
   }
 
@@ -61,20 +49,31 @@ class Watch {
   }
 
   async run(once: boolean) {
+    console.log('\n@voxgig/model', new Date())
+
     // TODO: build spec should not have src!
     let src = (await readFile(this.spec.path)).toString()
     this.spec.src = src
 
     let build = new Build(this.spec)
-    let br = await build.run()
+    let br: BuildResult = await build.run()
+
+    console.log('\nFILES:\n' + this.descDeps((br as any).build.root.deps) + '\n')
 
-    if (!once) {
-      // There may be new files.
-      this.update(br)
+    if (br.ok) {
+      console.log('TOP:', Object.keys(br?.build?.model).join(', '), '\n')
+
+      if (!once) {
+        // There may be new files.
+        this.update(br)
+      }
+    }
+    else {
+      console.log('MODEL ERRORS: ' + br.err?.length)
+      this.handleErrors(br)
     }
 
     this.last = br
-    console.log('WATCH RUN DONE', this.spec.path, this.last.ok)
 
     return br
   }
@@ -83,6 +82,34 @@ class Watch {
   async stop() {
     await this.fsw.close()
   }
+
+
+  handleErrors(br: BuildResult) {
+    if (br.err) {
+      for (let be of br.err) {
+        if (be.msg) {
+          console.log(be.msg)
+        }
+        else if (be.message) {
+          console.log(be.message)
+        }
+        else {
+          console.log(be)
+        }
+      }
+    }
+  }
+
+  descDeps(deps: Record<string, Record<string, { tar: string }>>) {
+    let desc = []
+    for (let entryPath of Object.keys(deps)) {
+      desc.push('  ' + entryPath)
+      for (let depPath of Object.keys(deps[entryPath])) {
+        desc.push('    ' + depPath)
+      }
+    }
+    return desc.join('\n')
+  }
 }
 
 

package/model.ts

@@ -1,4 +1,4 @@
-/* Copyright © 2021-2022 Voxgig Ltd, MIT License. */
+/* Copyright © 2021-2023 Voxgig Ltd, MIT License. */
 
 // TODO: remove need for this
 import Fs from 'fs'
@@ -27,17 +27,13 @@ class Model {
 
 
   constructor(spec: Spec) {
-    console.log('MODEL SPEC', spec)
 
+    // Config is a special Watch to handle model config.
     this.config = intern.makeConfig(spec, {
       path: '/',
       build: async (build: Build) => {
-        console.log('TRIGGER MODEL', this.trigger_model)
 
         if (this.trigger_model) {
-          console.log('CONFIG CHANGE')//, this)
-          // console.trace()
-          // rebuild if config changes
 
           // TODO: fix!!!
           this.build.use.config.watch.last.build = build
@@ -52,7 +48,7 @@ class Model {
     })
 
 
-
+    // The actual model.
     this.build = {
       src: spec.src,
       path: spec.path,
@@ -63,8 +59,6 @@ class Model {
           path: '/',
           build: model_builder
         },
-
-
         {
           path: '/',
           build: local_builder
@@ -73,6 +67,7 @@ class Model {
       require: spec.require
     }
 
+
     this.watch = new Watch(this.build)
   }
 
@@ -83,7 +78,6 @@ class Model {
   }
 
   async start() {
-    console.log('MODEL START')
     this.trigger_model = false
     await this.config.start()
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/model",
-  "version": "0.19.0",
+  "version": "0.21.0",
   "main": "dist/model.js",
   "type": "commonjs",
   "types": "dist/model.d.ts",
@@ -42,15 +42,15 @@
     "LICENSE"
   ],
   "dependencies": {
-    "aontu": "0.12.0",
+    "aontu": "0.14.1",
     "chokidar": "3.5.3"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.0",
-    "esbuild": "^0.17.12",
+    "@types/jest": "^29.5.2",
+    "esbuild": "^0.18.8",
     "esbuild-jest": "^0.5.0",
     "jest": "^29.5.0",
     "es-jest": "^2.1.0",
-    "typescript": "^5.0.2"
+    "typescript": "^5.1.3"
   }
 }