@voxgig/model 0.0.8 → 0.1.0

package/README.md

@@ -1 +1,7 @@
-# model
+# Model
+
+A framework for universal application modeling.
+
+PROTOTYPE.
+
+INSPIRED BY: http://cuelang.org

package/bin/voxgig-model

@@ -1,19 +1,44 @@
 #!/usr/bin/env node
 
 const Fs = require('fs')
+const Path = require('path')
 
 let { Model } = require('../dist/model.js')
 
 let path = process.argv[2]
+let once = '--once' === process.argv[3]
 
 if(null == path || '' == path) {
   console.error('ERROR: First argument should be a jsonic model file path.')
   process.exit(1)
 }
 
+let fstats = Fs.statSync(path)
+let base = path
+
+if (fstats.isFile()) {
+  let basedesc = Path.parse(base)
+  base = basedesc.dir
+}
+
+path = Path.resolve(path)
+console.log('PATH', path)
+
 let src = Fs.readFileSync(path).toString()
 
-let model = new Model({src,path})
+let model = new Model({src,path,base})
+
+
+async function run() {
+  if(once) {
+    let br = await model.run()
+    console.log('OK:'+br.ok, once)
+  }
+  else {
+    console.log('WATCHING...')
+    model.start()
+  }
+}
 
-console.log(JSON.stringify(model.get(),null,2))
 
+run()

package/dist/lib/build.d.ts

@@ -0,0 +1,40 @@
+import { Val } from 'aontu';
+interface BuildResult {
+    ok: boolean;
+    builder?: string;
+    path?: string;
+    build?: Build;
+    builders?: BuildResult[];
+}
+interface BuildAction {
+    path: string;
+    build: Builder;
+}
+declare type Builder = (build: Build) => Promise<BuildResult>;
+interface Spec {
+    src: string;
+    path?: string;
+    base?: string;
+    res?: BuildAction[];
+    use?: {
+        [name: string]: any;
+    };
+}
+declare class Build {
+    src: string;
+    base: string;
+    path: string;
+    root: Val;
+    opts: {
+        [key: string]: any;
+    };
+    res: BuildAction[];
+    spec: Spec;
+    model: any;
+    use: {
+        [name: string]: any;
+    };
+    constructor(spec: Spec);
+    run(): Promise<BuildResult>;
+}
+export { Build, Builder, BuildResult, BuildAction, Spec, Val };

package/dist/lib/build.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Val = exports.Build = void 0;
+const aontu_1 = require("aontu");
+Object.defineProperty(exports, "Val", { enumerable: true, get: function () { return aontu_1.Val; } });
+class Build {
+    constructor(spec) {
+        this.root = aontu_1.Nil.make();
+        this.use = {};
+        this.spec = spec;
+        this.src = spec.src;
+        this.base = null == spec.base ? '' : spec.base;
+        this.path = null == spec.path ? '' : spec.path;
+        this.opts = {};
+        if (null != spec.base) {
+            this.opts.base = spec.base;
+        }
+        this.res = spec.res || [];
+        Object.assign(this.use, spec.use || {});
+    }
+    async run() {
+        console.log('BUILDING ', this.path, new Date() + ' ...');
+        this.root = (0, aontu_1.Aontu)(this.src, this.opts);
+        let nil = this.root;
+        console.log('MODEL: ' + (nil.nil ? nil.why : 'ok'));
+        console.log('MODEL ERR', 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);
+        }
+        return { ok: true, build: this, builders: brlog };
+    }
+}
+exports.Build = Build;
+//# sourceMappingURL=build.js.map

package/dist/lib/build.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../../lib/build.ts"],"names":[],"mappings":";;;AAEA,iCAAuC;AA6FrC,oFA7Fc,WAAG,OA6Fd;AA7DL,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,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,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEvC,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"}

package/dist/lib/builder/local.d.ts

@@ -0,0 +1,3 @@
+import { Builder } from '../build';
+declare const local_builder: Builder;
+export { local_builder };

package/dist/lib/builder/local.js

@@ -0,0 +1,34 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+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);
+    }
+    return { ok: ok, brlog };
+};
+exports.local_builder = local_builder;
+//# sourceMappingURL=local.js.map

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

@@ -0,0 +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"}

package/dist/lib/builder/model.d.ts

@@ -0,0 +1,3 @@
+import { Builder } from '../build';
+declare const model_builder: Builder;
+export { model_builder };

package/dist/lib/builder/model.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.model_builder = void 0;
+const promises_1 = require("fs/promises");
+const model_builder = async (build) => {
+    let json = JSON.stringify(build.root.gen(), null, 2);
+    let file = build.opts.base + '/model.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

@@ -0,0 +1 @@
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../lib/builder/model.ts"],"names":[],"mappings":";;;AACA,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,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,aAAa,CAAA;IAE1C,MAAM,IAAA,oBAAS,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAE3B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAA;AACrB,CAAC,CAAA;AAGC,sCAAa"}

package/dist/lib/config.d.ts

@@ -0,0 +1,11 @@
+import { BuildResult, Spec } from './build';
+import { Watch } from './watch';
+declare class Config {
+    build: any;
+    watch: Watch;
+    constructor(spec: Spec);
+    run(): Promise<BuildResult>;
+    start(): Promise<void>;
+    stop(): Promise<void>;
+}
+export { Config, Spec };

package/dist/lib/config.js

@@ -0,0 +1,36 @@
+"use strict";
+// load config as a model
+// from model / config.jsonic by default
+// config defines builders
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Config = void 0;
+const watch_1 = require("./watch");
+const model_1 = require("./builder/model");
+class Config {
+    constructor(spec) {
+        this.build = {
+            src: spec.src,
+            path: spec.path,
+            base: spec.base,
+            res: [
+                {
+                    path: '/',
+                    build: model_1.model_builder
+                },
+                ...(spec.res || [])
+            ]
+        };
+        this.watch = new watch_1.Watch(this.build);
+    }
+    async run() {
+        return this.watch.run(true);
+    }
+    async start() {
+        return this.watch.start();
+    }
+    async stop() {
+        return this.watch.stop();
+    }
+}
+exports.Config = Config;
+//# sourceMappingURL=config.js.map

package/dist/lib/config.js.map

@@ -0,0 +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"}

package/dist/lib/model-builder.js

@@ -0,0 +1,2 @@
+"use strict";
+//# sourceMappingURL=model-builder.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"model-builder.js","sourceRoot":"","sources":["../../lib/model-builder.ts"],"names":[],"mappings":""}

package/dist/lib/watch.d.ts

@@ -0,0 +1,13 @@
+import { BuildResult } from './build';
+import { FSWatcher } from 'chokidar';
+declare class Watch {
+    fsw: FSWatcher;
+    spec: any;
+    last?: BuildResult;
+    constructor(spec: any);
+    update(br: BuildResult): void;
+    start(): Promise<void>;
+    run(once: boolean): Promise<BuildResult>;
+    stop(): Promise<void>;
+}
+export { Watch };

package/dist/lib/watch.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Watch = void 0;
+const build_1 = require("./build");
+const chokidar_1 = require("chokidar");
+const promises_1 = require("fs/promises");
+class Watch {
+    constructor(spec) {
+        this.spec = spec;
+        this.fsw = new chokidar_1.FSWatcher();
+        this.fsw.on('change', this.run.bind(this));
+    }
+    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);
+    }
+    async start() {
+        await this.run(false);
+    }
+    async run(once) {
+        // 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);
+        }
+        this.last = br;
+        console.log('WATCH RUN DONE', this.spec.path, this.last.ok);
+        return br;
+    }
+    async stop() {
+        await this.fsw.close();
+    }
+}
+exports.Watch = Watch;
+//# sourceMappingURL=watch.js.map

package/dist/lib/watch.js.map

@@ -0,0 +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"}

package/dist/model.d.ts

@@ -1,8 +1,14 @@
-import { Aontu, Val } from 'aontu';
+import { Config } from './lib/config';
+import { BuildResult, Spec } from './lib/build';
+import { Watch } from './lib/watch';
 declare class Model {
-    root: Val;
-    parse: typeof Aontu;
-    constructor(spec: any);
-    get(): any;
+    config: Config;
+    build: any;
+    watch: Watch;
+    trigger_model: boolean;
+    constructor(spec: Spec);
+    run(): Promise<BuildResult>;
+    start(): Promise<void>;
+    stop(): Promise<void>;
 }
-export { Model };
+export { Model, Spec };

package/dist/model.js

@@ -1,18 +1,94 @@
 "use strict";
+/* Copyright © 2021-2022 Voxgig Ltd, MIT License. */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Model = void 0;
-const file_1 = require("@jsonic/multisource/dist/resolver/file");
-const aontu_1 = require("aontu");
+// TODO: remove need for this
+const fs_1 = __importDefault(require("fs"));
+const config_1 = require("./lib/config");
+const watch_1 = require("./lib/watch");
+const model_1 = require("./lib/builder/model");
+const local_1 = require("./lib/builder/local");
+const intern = makeIntern();
 class Model {
     constructor(spec) {
-        this.parse = aontu_1.Aontu;
-        this.root = this.parse(spec.src, {
-            resolver: file_1.FileResolver,
+        this.trigger_model = false;
+        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);
+                }
+                else {
+                    this.trigger_model = true;
+                    return { ok: true };
+                }
+            }
         });
+        this.build = {
+            src: spec.src,
+            path: spec.path,
+            base: spec.base,
+            use: { config: this.config },
+            res: [
+                {
+                    path: '/',
+                    build: model_1.model_builder
+                },
+                {
+                    path: '/',
+                    build: local_1.local_builder
+                }
+            ]
+        };
+        this.watch = new watch_1.Watch(this.build);
     }
-    get() {
-        return this.root.gen([]);
+    async run() {
+        this.trigger_model = false;
+        let br = await this.config.run();
+        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();
+    }
+    async stop() {
+        return this.watch.stop();
     }
 }
 exports.Model = Model;
+function makeIntern() {
+    return {
+        makeConfig(spec, trigger_model_build) {
+            let cbase = spec.base + '/config';
+            let cpath = cbase + '/config.jsonic';
+            // Build should load file
+            let src = fs_1.default.readFileSync(cpath).toString();
+            let cspec = {
+                src: src,
+                path: cpath,
+                base: cbase,
+                res: [
+                    // Generate full config model and save as a file.
+                    {
+                        path: '/',
+                        build: model_1.model_builder
+                    },
+                    trigger_model_build
+                ]
+            };
+            return new config_1.Config(cspec);
+        }
+    };
+}
 //# sourceMappingURL=model.js.map

package/dist/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../model.ts"],"names":[],"mappings":";;;AAEA,iEAAqE;AAErE,iCAAkC;AAGlC,MAAM,KAAK;IAKT,YAAY,IAAS;QAFrB,UAAK,GAAG,aAAK,CAAA;QAGX,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;YAC/B,QAAQ,EAAE,mBAAY;SACvB,CAAC,CAAA;IACJ,CAAC;IAED,GAAG;QACD,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAC1B,CAAC;CACF;AAGQ,sBAAK"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../model.ts"],"names":[],"mappings":";AAAA,oDAAoD;;;;;;AAEpD,6BAA6B;AAC7B,4CAAmB;AAEnB,yCAAqC;AAErC,uCAAmC;AAEnC,+CAAmD;AACnD,+CAAmD;AAGnD,MAAM,MAAM,GAAG,UAAU,EAAE,CAAA;AAE3B,MAAM,KAAK;IAQT,YAAY,IAAU;QAHtB,kBAAa,GAAG,KAAK,CAAA;QAInB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE;YACpC,IAAI,EAAE,GAAG;YACT,KAAK,EAAE,KAAK,EAAE,KAAY,EAAE,EAAE;gBAC5B,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC,aAAa,CAAC,CAAA;gBAEhD,IAAI,IAAI,CAAC,aAAa,EAAE;oBACtB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA,CAAA,SAAS;oBACrC,kBAAkB;oBAClB,4BAA4B;oBAE5B,eAAe;oBACf,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;oBAE9C,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;iBAC5B;qBACI;oBACH,IAAI,CAAC,aAAa,GAAG,IAAI,CAAA;oBACzB,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAA;iBACpB;YACH,CAAC;SACF,CAAC,CAAA;QAIF,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,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE;YAC5B,GAAG,EAAE;gBACH;oBACE,IAAI,EAAE,GAAG;oBACT,KAAK,EAAE,qBAAa;iBACrB;gBAGD;oBACE,IAAI,EAAE,GAAG;oBACT,KAAK,EAAE,qBAAa;iBACrB;aACF;SACF,CAAA;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,aAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACpC,CAAC;IAED,KAAK,CAAC,GAAG;QACP,IAAI,CAAC,aAAa,GAAG,KAAK,CAAA;QAC1B,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAA;QAChC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAC1C,CAAC;IAED,KAAK,CAAC,KAAK;QACT,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;QAC1B,IAAI,CAAC,aAAa,GAAG,KAAK,CAAA;QAC1B,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;QAEzB,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;AAiCQ,sBAAK;AA9Bd,SAAS,UAAU;IACjB,OAAO;QACL,UAAU,CAAC,IAAU,EAAE,mBAAgC;YACrD,IAAI,KAAK,GAAG,IAAI,CAAC,IAAI,GAAG,SAAS,CAAA;YACjC,IAAI,KAAK,GAAG,KAAK,GAAG,gBAAgB,CAAA;YAEpC,yBAAyB;YACzB,IAAI,GAAG,GAAG,YAAE,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAA;YAE3C,IAAI,KAAK,GAAS;gBAChB,GAAG,EAAE,GAAG;gBACR,IAAI,EAAE,KAAK;gBACX,IAAI,EAAE,KAAK;gBACX,GAAG,EAAE;oBAEH,iDAAiD;oBACjD;wBACE,IAAI,EAAE,GAAG;wBACT,KAAK,EAAE,qBAAa;qBACrB;oBAED,mBAAmB;iBACpB;aACF,CAAA;YACD,OAAO,IAAI,eAAM,CAAC,KAAK,CAAC,CAAA;QAC1B,CAAC;KACF,CAAA;AACH,CAAC"}

package/dist/model.min.js

@@ -1,18 +1,94 @@
 "use strict";
+/* Copyright © 2021-2022 Voxgig Ltd, MIT License. */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Model = void 0;
-const file_1 = require("@jsonic/multisource/dist/resolver/file");
-const aontu_1 = require("aontu");
+// TODO: remove need for this
+const fs_1 = __importDefault(require("fs"));
+const config_1 = require("./lib/config");
+const watch_1 = require("./lib/watch");
+const model_1 = require("./lib/builder/model");
+const local_1 = require("./lib/builder/local");
+const intern = makeIntern();
 class Model {
     constructor(spec) {
-        this.parse = aontu_1.Aontu;
-        this.root = this.parse(spec.src, {
-            resolver: file_1.FileResolver,
+        this.trigger_model = false;
+        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);
+                }
+                else {
+                    this.trigger_model = true;
+                    return { ok: true };
+                }
+            }
         });
+        this.build = {
+            src: spec.src,
+            path: spec.path,
+            base: spec.base,
+            use: { config: this.config },
+            res: [
+                {
+                    path: '/',
+                    build: model_1.model_builder
+                },
+                {
+                    path: '/',
+                    build: local_1.local_builder
+                }
+            ]
+        };
+        this.watch = new watch_1.Watch(this.build);
     }
-    get() {
-        return this.root.gen([]);
+    async run() {
+        this.trigger_model = false;
+        let br = await this.config.run();
+        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();
+    }
+    async stop() {
+        return this.watch.stop();
     }
 }
 exports.Model = Model;
+function makeIntern() {
+    return {
+        makeConfig(spec, trigger_model_build) {
+            let cbase = spec.base + '/config';
+            let cpath = cbase + '/config.jsonic';
+            // Build should load file
+            let src = fs_1.default.readFileSync(cpath).toString();
+            let cspec = {
+                src: src,
+                path: cpath,
+                base: cbase,
+                res: [
+                    // Generate full config model and save as a file.
+                    {
+                        path: '/',
+                        build: model_1.model_builder
+                    },
+                    trigger_model_build
+                ]
+            };
+            return new config_1.Config(cspec);
+        }
+    };
+}
 //# sourceMappingURL=model.js.map

package/lib/build.ts

@@ -0,0 +1,99 @@
+
+
+import { Aontu, Val, Nil } from 'aontu'
+
+
+interface BuildResult {
+  ok: boolean
+  builder?: string
+  path?: string
+  build?: Build
+  builders?: BuildResult[]
+}
+
+interface BuildAction {
+  path: string
+  build: Builder
+}
+
+type Builder = (
+  build: Build
+) => Promise<BuildResult>
+
+
+interface Spec {
+  src: string
+  path?: string
+  base?: string
+  res?: BuildAction[]
+  use?: { [name: string]: any }
+}
+
+
+
+
+class Build {
+  src: string
+  base: string
+  path: string
+  root: Val = Nil.make()
+  opts: { [key: string]: any }
+  res: BuildAction[]
+  spec: Spec
+  model: any
+  use: { [name: string]: any } = {}
+
+  constructor(spec: Spec) {
+    this.spec = spec
+    this.src = spec.src
+    this.base = null == spec.base ? '' : spec.base
+    this.path = null == spec.path ? '' : spec.path
+    this.opts = {}
+
+    if (null != spec.base) {
+      this.opts.base = spec.base
+    }
+
+    this.res = spec.res || []
+
+    Object.assign(this.use, spec.use || {})
+  }
+
+
+  async run(): Promise<BuildResult> {
+    console.log('BUILDING ', this.path, new Date() + ' ...')
+
+    this.root = Aontu(this.src, this.opts)
+
+    let nil = (this.root as Nil)
+    console.log('MODEL: ' + (nil.nil ? nil.why : 'ok'))
+
+    console.log('MODEL ERR', 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)
+    }
+
+    return { ok: true, build: this, builders: brlog }
+  }
+}
+
+
+export {
+  Build,
+  Builder,
+  BuildResult,
+  BuildAction,
+  Spec,
+  Val
+}
+
+

package/lib/builder/local.ts

@@ -0,0 +1,43 @@
+
+import Path from 'path'
+
+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, '..', '..')
+
+  // 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.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 }
+}
+
+export {
+  local_builder
+}

package/lib/builder/model.ts

@@ -0,0 +1,20 @@
+
+import { writeFile } from 'fs/promises'
+
+import { Build, Builder } from '../build'
+
+
+const model_builder: Builder = async (build: Build) => {
+
+  let json = JSON.stringify(build.root.gen(), null, 2)
+
+  let file = build.opts.base + '/model.json'
+
+  await writeFile(file, json)
+
+  return { ok: true }
+}
+
+export {
+  model_builder
+}

package/lib/config.ts

@@ -0,0 +1,58 @@
+
+// load config as a model
+// from model / config.jsonic by default
+// config defines builders
+
+
+
+
+import { BuildResult, Spec } from './build'
+import { Watch } from './watch'
+
+
+import { model_builder } from './builder/model'
+
+
+
+
+
+
+class Config {
+  build: any
+  watch: Watch
+
+  constructor(spec: Spec) {
+    this.build = {
+      src: spec.src,
+      path: spec.path,
+      base: spec.base,
+      res: [
+        {
+          path: '/',
+          build: model_builder
+        },
+        ...(spec.res || [])
+      ]
+    }
+
+    this.watch = new Watch(this.build)
+  }
+
+  async run(): Promise<BuildResult> {
+    return this.watch.run(true)
+  }
+
+  async start() {
+    return this.watch.start()
+  }
+
+  async stop() {
+    return this.watch.stop()
+  }
+}
+
+
+export { Config, Spec }
+
+
+

package/lib/watch.ts

@@ -0,0 +1,91 @@
+
+
+import { Build, BuildResult } from './build'
+import { FSWatcher } from 'chokidar'
+
+import { readFile } from 'fs/promises'
+
+
+class Watch {
+  fsw: FSWatcher
+  spec: any
+  last?: BuildResult
+
+  constructor(spec: any) {
+    this.spec = spec
+    this.fsw = new FSWatcher()
+    this.fsw.on('change', this.run.bind(this))
+  }
+
+  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]))
+        return files
+      }, [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)
+
+  }
+
+  async start() {
+    await this.run(false)
+  }
+
+  async run(once: boolean) {
+    // 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()
+
+    if (!once) {
+      // There may be new files.
+      this.update(br)
+    }
+
+    this.last = br
+    console.log('WATCH RUN DONE', this.spec.path, this.last.ok)
+
+    return br
+  }
+
+
+  async stop() {
+    await this.fsw.close()
+  }
+}
+
+
+export {
+  Watch
+}

package/model/config/sys.jsonic

@@ -0,0 +1,11 @@
+
+shape: builder: {
+  load: string
+  x: 1
+}
+
+model: build: order: string # TODO: comma sep 
+
+model: builders: {
+  # &=/sys/shape/builder
+}

package/model/sys.jsonic

@@ -0,0 +1,73 @@
+
+shape: srv: {
+  env: {
+    lambda: boolean
+  }
+}
+
+
+
+
+
+# shape: app: {
+#   name: string
+#   layout: string
+#   # parts: {
+#   #   &={
+#   #     part: string
+#   #     active: boolean
+#   #     # active: *true | boolean
+#   #   }
+#   # }
+# }
+
+# shape: part: img: {
+#   src: string
+#   svg: string
+# }
+
+  
+# app: web: basic: /sys/shape/app
+
+# app: web: basic: {
+#   name: basic
+#   layout: BasicAdmin
+# }
+
+# app: web: basic: parts: {
+#   head: {
+#     part: BasicHead
+#   }
+
+#   side: {
+#     part: BasicSide
+#   }
+
+#   main: {
+#     part: BasicMain
+#   }
+
+#   foot: {
+#     part: BasicFoot
+#   }
+# }
+
+# #app: web: basic: parts: head: {
+# #   part: BasicHead
+# #   logo: /sys/shape/part/img 
+# #}
+
+# # app: web: basic: parts: side: {
+# # #  part: BasicSide
+# # #   # menu: /shape/part/menu
+# # }
+
+# # app: web: basic: parts: main: {
+# #   part: BasicMain
+# # }
+
+# # app: web: basic: parts: foot: {
+# #   part: BasicFoot
+# # }
+  
+

package/model.ts

@@ -1,27 +1,123 @@
+/* Copyright © 2021-2022 Voxgig Ltd, MIT License. */
 
+// TODO: remove need for this
+import Fs from 'fs'
 
-import { FileResolver } from '@jsonic/multisource/dist/resolver/file'
+import { Config } from './lib/config'
+import { Build, BuildAction, BuildResult, Spec } from './lib/build'
+import { Watch } from './lib/watch'
 
-import { Aontu, Val } from 'aontu'
+import { model_builder } from './lib/builder/model'
+import { local_builder } from './lib/builder/local'
 
 
+const intern = makeIntern()
+
 class Model {
-  root: Val
+  config: Config
+  build: any
+  watch: Watch
+
+  trigger_model = false
+
 
-  parse = Aontu
+  constructor(spec: Spec) {
+    this.config = intern.makeConfig(spec, {
+      path: '/',
+      build: async (build: Build) => {
+        console.log('TRIGGER MODEL', this.trigger_model)
 
-  constructor(spec: any) {
-    this.root = this.parse(spec.src, {
-      resolver: FileResolver,
+        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)
+        }
+        else {
+          this.trigger_model = true
+          return { ok: true }
+        }
+      }
     })
+
+
+
+    this.build = {
+      src: spec.src,
+      path: spec.path,
+      base: spec.base,
+      use: { config: this.config },
+      res: [
+        {
+          path: '/',
+          build: model_builder
+        },
+
+
+        {
+          path: '/',
+          build: local_builder
+        }
+      ]
+    }
+
+    this.watch = new Watch(this.build)
+  }
+
+  async run(): Promise<BuildResult> {
+    this.trigger_model = false
+    let br = await this.config.run()
+    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()
+  }
+
+  async stop() {
+    return this.watch.stop()
   }
+}
+
+
+function makeIntern() {
+  return {
+    makeConfig(spec: Spec, trigger_model_build: BuildAction) {
+      let cbase = spec.base + '/config'
+      let cpath = cbase + '/config.jsonic'
+
+      // Build should load file
+      let src = Fs.readFileSync(cpath).toString()
+
+      let cspec: Spec = {
+        src: src,
+        path: cpath,
+        base: cbase,
+        res: [
+
+          // Generate full config model and save as a file.
+          {
+            path: '/',
+            build: model_builder
+          },
 
-  get() {
-    return this.root.gen([])
+          trigger_model_build
+        ]
+      }
+      return new Config(cspec)
+    }
   }
 }
 
 
-export { Model }
+export { Model, Spec }
 
 

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@voxgig/model",
-  "version": "0.0.8",
+  "version": "0.1.0",
   "main": "dist/model.js",
   "type": "commonjs",
-  "browser": "dist/model.min.js",
   "types": "dist/model.d.ts",
   "bin": {
     "voxgig-model": "bin/voxgig-model"
   },
-  "description": "Model.",
+  "description": "Voxgig Model.",
   "homepage": "https://github.com/voxgig/model",
   "keywords": [
+    "voxgig",
     "model"
   ],
   "author": "Richard Rodger (http://richardrodger.com)",
@@ -19,19 +19,17 @@
     "url": "git://github.com/voxgig/model.git"
   },
   "scripts": {
+    "test": "jest --coverage",
+    "test-pure": "jest --coverage --config jest.config.pure.js",
+    "test-some": "jest -t",
+    "test-watch": "jest --coverage --watchAll",
     "watch": "tsc -w -d",
-    "test": "lab -v -P test -t 50 --sourcemaps --transform node_modules/lab-transform-typescript -r console -o stdout -r html -o test/coverage.html",
-    "test-some": "lab -v -P test --sourcemaps --transform node_modules/lab-transform-typescript -g",
-    "test-jest": "jest --coverage",
-    "test-web": "echo no-test-web",
-    "test-web-x": "browserify -o test-web/test-web.js -e test/model.test.js -s Model -im -i assert -i @hapi/lab && open test-web/index.html",
-    "build-x": "tsc -d && cp dist/model.js dist/model.min.js && browserify -o dist/model.min.js -e dist/model.js -s Model -im -i assert -p tinyify",
-    "build": "tsc -d && cp dist/model.js dist/model.min.js",
+    "build": "tsc -d",
     "clean": "rm -rf node_modules yarn.lock package-lock.json",
     "reset": "npm run clean && npm i && npm run build && npm test",
     "repo-tag": "REPO_VERSION=`node -e \"console.log(require('./package').version)\"` && echo TAG: v$REPO_VERSION && git commit -a -m v$REPO_VERSION && git push && git tag v$REPO_VERSION && git push --tags;",
     "repo-publish": "npm run clean && npm i && npm run repo-publish-quick",
-    "repo-publish-quick": "npm run build && npm run test && npm run repo-tag && npm publish --registry http://registry.npmjs.org --access=public"
+    "repo-publish-quick": "npm run build && npm run test && npm run repo-tag && npm publish --registry https://registry.npmjs.org --access=public"
   },
   "license": "MIT",
   "files": [
@@ -39,21 +37,19 @@
     "lib",
     "dist",
     "bin",
+    "model",
     "LICENSE"
   ],
   "dependencies": {
-    "@jsonic/multisource": "0.0.6",
-    "aontu": "0.0.6",
-    "jsonic": "jsonicjs/jsonic#nextgen"
+    "aontu": "rjrodger/aontu",
+    "chokidar": "^3.5.3"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.23",
-    "jest": "^26.6.3",
-    "tinyify": "^3.0.0",
-    "ts-jest": "^26.5.5",
-    "typescript": "^4.2.4",
-    "@hapi/code": "^8.0.3",
-    "@hapi/lab": "^24.2.0",
-    "lab-transform-typescript": "^3.0.1"
+    "@types/jest": "^27.5.1",
+    "esbuild": "^0.14.39",
+    "esbuild-jest": "^0.5.0",
+    "jest": "^28.1.0",
+    "ts-jest": "^28.0.2",
+    "typescript": "^4.6.4"
   }
 }

package/bin/voxgig-model~

@@ -1 +0,0 @@
-