@voxgig/model 4.0.0 → 5.1.0

package/bin/voxgig-model

@@ -1,52 +1,173 @@
 #!/usr/bin/env node
 
-const Fs = require('fs')
-const Path = require('path')
+const { parseArgs } = require('node:util')
+const Fs = require('node:fs')
+const Path = require('node:path')
 
-let { Model } = require('../dist/model.js')
+const Pkg = require('../package.json')
+const { Model } = require('../dist/model.js')
 
+const { Gubu, Fault, One } = require('gubu')
 
-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 CONSOLE = console
+
+run()
+
+
+async function run() {
+  try {
+    let options = resolveOptions()
+
+    if(options.version) {
+      version()
+    }
+
+    if(options.help) {
+      help()
+    }
+
+    if(options.version || options.help) {
+      exit()
+    }
+
+    options = validateOptions(options)
+
+    await generate(options)
+  }
+  catch(err) {
+    handleError(err)
+  }
 }
 
-let fstats = Fs.statSync(path)
-// let base = path
-let base = Path.resolve(path)
 
-if (fstats.isFile()) {
-  let basedesc = Path.parse(base)
-  base = basedesc.dir
+function resolveOptions() {
+
+  const args = parseArgs({
+    allowPositionals: true,
+    options: {
+      model: {
+        type: 'string',
+        short: 'm',
+        default: '',
+      },
+      
+      watch: {
+        type: 'boolean',
+        short: 'w',
+      },
+      
+      debug: {
+        type: 'string',
+        short: 'g',
+        default: 'info'
+      },
+      
+      help: {
+        type: 'boolean',
+        short: 'h',
+      },
+      
+      version: {
+        type: 'boolean',
+        short: 'v',
+      },
+      
+    }
+  })
+
+  const options = {
+    model: '' === args.values.model ? args.positionals[0] : args.values.model,
+    watch: !!args.values.watch,
+    debug: args.values.debug,
+    help: !!args.values.help,
+    version: !!args.values.version,
+  }
+
+  return options
 }
 
-path = Path.resolve(path)
 
-let src = Fs.readFileSync(path).toString()
+function validateOptions(rawOptions) {
+  const optShape = Gubu({
+    model: Fault('The first command line argument must be the model file path.', String),
+    watch: Boolean,
+    debug: One(String,Boolean),
+    help: Boolean,
+    version: Boolean,
+  })
 
-let spec = {
-  src,
-  path,
-  base,
-  require: process.cwd()
+  const err = []
+  const options = optShape(rawOptions,{err})
+
+  if(err[0]) {
+    const errtext = 'ERROR: '+err.map(err=>err.text).join('\n')
+    console.error(errtext)
+    exit(1)
+  }
+
+  return options
 }
 
-let model = new Model(spec)
 
-async function run() {
-  if(once) {
-    let br = await model.run()
-    if(0 < br.err.length) {
-      process.exit(1)
-    }
+async function handleError(err) {
+  CONSOLE.error(err)
+  exit(err)
+}
+
+
+function version() {
+  CONSOLE.log(Pkg.version)
+}
+
+
+function help() {
+  const s = 'TODO'
+  CONSOLE.log(s)
+}
+
+
+function exit(err) {
+  let code = 0
+  if(err) {
+    code = 1
   }
-  else {
+  process.exit(code)
+}
+
+
+async function generate(options) {
+  let path = options.model
+
+  if(!Fs.existsSync(path)) {
+    console.error('ERROR: model file does not exist: '+(path.replace(process.cwd(),'.')))
+    exit(1)
+  }
+                 
+  let fstats = Fs.statSync(path)
+  let base = Path.resolve(path)
+
+  if (fstats.isFile()) {
+    let basedesc = Path.parse(base)
+    base = basedesc.dir
+  }
+
+  path = Path.resolve(path)
+
+  let spec = {
+    path,
+    base,
+    require: process.cwd(),
+    debug: options.debug,
+  }
+
+  let model = new Model(spec)
+
+  if(options.watch) {
     model.start()
   }
+  else {
+    await model.run()
+  }
 }
 
-
-run()

package/dist/build.d.ts

@@ -0,0 +1,21 @@
+import { Val } from 'aontu';
+import type { Build, BuildResult, BuildContext, BuildSpec, RunSpec, Log } from './types';
+declare class BuildImpl implements Build {
+    id: string;
+    base: string;
+    path: string;
+    root: any;
+    opts: any;
+    res: any[];
+    spec: BuildSpec;
+    model: any;
+    use: {};
+    errs: any[];
+    ctx: BuildContext;
+    log: Log;
+    fs: any;
+    constructor(spec: BuildSpec, log: Log);
+    run(rspec: RunSpec): Promise<BuildResult>;
+}
+declare function makeBuild(spec: BuildSpec, log: Log): BuildImpl;
+export { makeBuild, BuildSpec, Val };

package/dist/{lib/build.js → build.js}

@@ -1,20 +1,21 @@
 "use strict";
-/* Copyright © 2021-2023 Voxgig Ltd, MIT License. */
+/* Copyright © 2021-2024 Voxgig Ltd, MIT License. */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeBuild = makeBuild;
 const aontu_1 = require("aontu");
 class BuildImpl {
-    constructor(spec) {
+    constructor(spec, log) {
         this.root = aontu_1.Nil.make();
         this.use = {};
-        this.err = [];
+        this.errs = [];
         this.id = String(Math.random()).substring(3, 9);
+        this.log = log;
         this.spec = spec;
-        this.src = spec.src;
+        this.fs = spec.fs;
         this.base = null == spec.base ? '' : spec.base;
         this.path = null == spec.path ? '' : spec.path;
         this.opts = {};
-        this.ctx = { step: 'pre', state: {} };
+        this.ctx = { step: 'pre', watch: false, state: {} };
         if (null != spec.base) {
             this.opts.base = spec.base;
             this.opts.path = spec.path;
@@ -25,10 +26,9 @@ class BuildImpl {
         this.res = spec.res || [];
         Object.assign(this.use, spec.use || {});
     }
-    async run() {
+    async run(rspec) {
         let hasErr = false;
-        // this.ctx.step = 'pre'
-        this.ctx = { step: 'pre', state: {} };
+        this.ctx = { step: 'pre', state: {}, watch: rspec.watch };
         const brlog = [];
         for (let builder of this.res) {
             try {
@@ -38,17 +38,28 @@ class BuildImpl {
                 br.builder = builder.build.name;
                 brlog.push(br);
             }
-            catch (e) {
-                this.err.push(e);
+            catch (err) {
+                this.errs.push(err);
                 hasErr = true;
                 break;
             }
         }
+        let src = '';
         if (!hasErr) {
-            this.root = (0, aontu_1.Aontu)(this.src, this.opts);
+            try {
+                src = this.fs.readFileSync(this.path, 'utf8');
+            }
+            catch (err) {
+                hasErr = true;
+                this.errs.push(err);
+            }
+        }
+        if (!hasErr) {
+            this.root = (0, aontu_1.Aontu)(src, this.opts);
             hasErr = this.root.err && 0 < this.root.err.length;
             if (hasErr) {
-                this.err.push(...this.root.err);
+                this.errs.push(...this.root.err);
+                // console.log('AONTU ERRS', this.errs)
             }
         }
         if (!hasErr) {
@@ -56,10 +67,9 @@ class BuildImpl {
             this.model = this.root.gen(genctx);
             hasErr = genctx.err && 0 < genctx.err.length;
             if (hasErr) {
-                this.err.push(...genctx.err);
+                this.errs.push(...genctx.err);
             }
             else {
-                // TODO: only call if path value has changed
                 this.ctx.step = 'post';
                 for (let builder of this.res) {
                     try {
@@ -69,18 +79,19 @@ class BuildImpl {
                         br.builder = builder.build.name;
                         brlog.push(br);
                     }
-                    catch (e) {
-                        this.err.push(e);
+                    catch (err) {
+                        hasErr = true;
+                        this.errs.push(err);
                         break;
                     }
                 }
             }
         }
-        const br = { ok: !hasErr, build: this, builders: brlog, err: this.err };
+        const br = { ok: !hasErr, build: this, builders: brlog, errs: this.errs };
         return br;
     }
 }
-function makeBuild(spec) {
-    return new BuildImpl(spec);
+function makeBuild(spec, log) {
+    return new BuildImpl(spec, log);
 }
 //# sourceMappingURL=build.js.map

package/dist/build.js.map

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

package/dist/builder/local.js

@@ -0,0 +1,48 @@
+"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"));
+// Runs any builders local to the repo.
+const local_builder = async (build, ctx) => {
+    ctx.state.local = (ctx.state.local || {});
+    let actionDefs = ctx.state.local.actionDefs;
+    if (null == actionDefs) {
+        actionDefs = ctx.state.local.actionDefs = [];
+        // TODO: need to provide project root via build
+        let root = path_1.default.resolve(build.path, '..', '..');
+        // TODO: build should do this
+        let configbuild = build.use.config;
+        let config = configbuild.watch.last?.build.model || {};
+        let builders = config.sys?.model.builders || {};
+        // TODO: order by comma sep string
+        // Load builders
+        for (let name in builders) {
+            let builder = builders[name];
+            let action_path = path_1.default.join(root, builder.load);
+            let action = require(action_path);
+            if (action instanceof Promise) {
+                action = await action;
+            }
+            const step = action.step || 'post';
+            actionDefs.push({ name, builder, action, step });
+        }
+    }
+    const runActionDefs = actionDefs.filter((ad) => ctx.step === ad.step || 'all' === ad.step);
+    build.log.info({
+        point: ctx.step + '-actions', step: ctx.step, actions: runActionDefs,
+        note: runActionDefs.map((ad) => ad.name).join(';')
+    });
+    let ok = true;
+    let areslog = [];
+    for (let actionDef of runActionDefs) {
+        let ares = await actionDef.action(build.model, build, ctx);
+        ok = ok && null != ares && ares.ok;
+        areslog.push(ares);
+    }
+    return { ok: true, step: ctx.step, active: true };
+};
+exports.local_builder = local_builder;
+//# sourceMappingURL=local.js.map

package/dist/builder/local.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"local.js","sourceRoot":"","sources":["../../src/builder/local.ts"],"names":[],"mappings":";;;;;;AACA,gDAAuB;AAKvB,uCAAuC;AACvC,MAAM,aAAa,GAAY,KAAK,EAAE,KAAY,EAAE,GAAiB,EAAE,EAAE;IACvE,GAAG,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAA;IACzC,IAAI,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAA;IAE3C,IAAI,IAAI,IAAI,UAAU,EAAE,CAAC;QACvB,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,GAAG,EAAE,CAAA;QAE5C,+CAA+C;QAC/C,IAAI,IAAI,GAAG,cAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;QAG/C,6BAA6B;QAC7B,IAAI,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAA;QAElC,IAAI,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,IAAI,EAAE,CAAA;QAEtD,IAAI,QAAQ,GAAG,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAA;QAE/C,kCAAkC;QAClC,gBAAgB;QAChB,KAAK,IAAI,IAAI,IAAI,QAAQ,EAAE,CAAC;YAC1B,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,IAAI,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;YAEjC,IAAI,MAAM,YAAY,OAAO,EAAE,CAAC;gBAC9B,MAAM,GAAG,MAAM,MAAM,CAAA;YACvB,CAAC;YAED,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,CAAA;YAElC,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;QAClD,CAAC;IACH,CAAC;IAED,MAAM,aAAa,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,EAAO,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,EAAE,CAAC,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC,IAAI,CAAC,CAAA;IAE/F,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC;QACb,KAAK,EAAE,GAAG,CAAC,IAAI,GAAG,UAAU,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,aAAa;QACpE,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,EAAO,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;KACxD,CAAC,CAAA;IAEF,IAAI,EAAE,GAAG,IAAI,CAAA;IACb,IAAI,OAAO,GAAG,EAAE,CAAA;IAEhB,KAAK,IAAI,SAAS,IAAI,aAAa,EAAE,CAAC;QACpC,IAAI,IAAI,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,CAAA;QAC1D,EAAE,GAAG,EAAE,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,EAAE,CAAA;QAClC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACpB,CAAC;IAED,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;AACnD,CAAC,CAAA;AAIC,sCAAa"}

package/dist/{lib/builder → builder}/model.js

@@ -11,20 +11,20 @@ const model_builder = async (build, ctx) => {
     if ('post' !== ctx.step) {
         return { ok: true, step: ctx.step, active: false };
     }
-    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, step: ctx.step, active: true };
-    }
-    catch (e) {
-        throw e;
+    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';
+    build.log.info({
+        point: 'write-model',
+        path: file,
+        note: file.replace(process.cwd(), '.')
+    });
+    await (0, promises_1.writeFile)(file, json);
+    return { ok: true, step: ctx.step, active: true };
 };
 exports.model_builder = model_builder;
 //# sourceMappingURL=model.js.map

package/dist/builder/model.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/builder/model.ts"],"names":[],"mappings":";;;;;;AACA,gDAAuB;AAEvB,0CAAuC;AAKvC,iDAAiD;AACjD,MAAM,aAAa,GAAY,KAAK,EAAE,KAAY,EAAE,GAAiB,EAAE,EAAE;IACvE,IAAI,MAAM,KAAK,GAAG,CAAC,IAAI,EAAE,CAAC;QACxB,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAA;IACpD,CAAC;IAED,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,CAAC;QAClB,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA;IAC7B,CAAC;IAED,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,QAAQ,GAAG,OAAO,CAAA;IAErD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC;QACb,KAAK,EAAE,aAAa;QACpB,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC;KACvC,CAAC,CAAA;IAEF,MAAM,IAAA,oBAAS,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAE3B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;AACnD,CAAC,CAAA;AAGC,sCAAa"}

package/dist/config.d.ts

@@ -0,0 +1,12 @@
+import type { BuildResult, BuildSpec, Log } from './types';
+import { Watch } from './watch';
+declare class Config {
+    build: BuildSpec;
+    watch: Watch;
+    log: Log;
+    constructor(spec: BuildSpec, log: Log);
+    run(watch: boolean): Promise<BuildResult>;
+    start(): Promise<void>;
+    stop(): Promise<void>;
+}
+export { Config, BuildSpec };

package/dist/{lib/config.js → config.js}

@@ -4,20 +4,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Config = void 0;
 const watch_1 = require("./watch");
 class Config {
-    constructor(spec) {
+    constructor(spec, log) {
+        this.log = log;
         this.build = {
-            src: spec.src,
             path: spec.path,
             base: spec.base,
             res: [
                 ...(spec.res || [])
             ],
-            require: spec.require
+            require: spec.require,
+            log: this.log,
+            fs: spec.fs
         };
-        this.watch = new watch_1.Watch(this.build);
+        this.watch = new watch_1.Watch(this.build, this.log);
     }
-    async run() {
-        return this.watch.run(true, '<config>');
+    async run(watch) {
+        return this.watch.run('config', watch, '<config>');
     }
     async start() {
         return this.watch.start();

package/dist/config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";AAAA,oDAAoD;;;AAKpD,mCAA+B;AAI/B,MAAM,MAAM;IAKV,YAAY,IAAe,EAAE,GAAQ;QACnC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QAEd,IAAI,CAAC,KAAK,GAAG;YACX,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,GAAG,EAAE;gBACH,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC;aACpB;YACD,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,EAAE,EAAE,IAAI,CAAC,EAAE;SACZ,CAAA;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,aAAK,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA;IAC9C,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,KAAc;QACtB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAA;IACpD,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/model.d.ts

@@ -1,14 +1,16 @@
-import type { BuildResult, Spec } from './lib/types';
-import { Config } from './lib/config';
-import { Watch } from './lib/watch';
+import type { BuildResult, BuildSpec, ModelSpec, Log } from './types';
+import { Config } from './config';
+import { Watch } from './watch';
 declare class Model {
     config: Config;
-    build: any;
+    build: BuildSpec;
     watch: Watch;
     trigger_model: boolean;
-    constructor(spec: Spec);
+    log: Log;
+    fs: any;
+    constructor(mspec: ModelSpec);
     run(): Promise<BuildResult>;
     start(): Promise<void | BuildResult>;
     stop(): Promise<void>;
 }
-export { Model, Spec, };
+export { Model, BuildSpec, };

package/dist/model.js

@@ -1,54 +1,64 @@
 "use strict";
-/* Copyright © 2021-2023 Voxgig Ltd, MIT License. */
+/* Copyright © 2021-2024 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;
-// 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 node_fs_1 = __importDefault(require("node:fs"));
+const util_1 = require("@voxgig/util");
+const config_1 = require("./config");
+const watch_1 = require("./watch");
+const model_1 = require("./builder/model");
+const local_1 = require("./builder/local");
 class Model {
-    constructor(spec) {
+    constructor(mspec) {
         this.trigger_model = false;
         const self = this;
+        self.fs = mspec.fs || node_fs_1.default;
+        const pino = (0, util_1.prettyPino)('model', mspec);
+        this.log = pino.child({ cmp: 'model' });
+        this.log.info({ point: 'model-init' });
+        this.log.debug({
+            point: 'model-spec', mspec, note: '\n' +
+                JSON.stringify({ ...mspec, src: '<NOT-SHOWN>' }, null, 2)
+                    .replace(/"/g, '')
+                    .replaceAll(process.cwd(), '.')
+        });
         // Config is a special Watch to handle model config.
-        this.config = makeConfig(spec, {
+        this.config = makeConfig(mspec, this.log, this.fs, {
             path: '/',
             build: async function trigger_model(build, ctx) {
-                var _a, _b, _c;
                 if ('post' !== ctx.step) {
                     return { ok: true };
                 }
                 let res;
-                // console.log('TRIGGER', build.id, self.trigger_model, ctx)
-                // console.log(new Error().stack)
                 if (self.trigger_model) {
-                    // TODO: fix!!!
-                    self.build.use.config.watch.last.build = build;
-                    res = self.watch.run(true);
+                    // TODO: better design
+                    if (self.build.use) {
+                        self.build.use.config.watch.last.build = build;
+                    }
+                    res = self.watch.run('model', true);
                 }
                 else {
                     self.trigger_model = true;
                     res = { ok: true };
                 }
-                const watchmap = (_c = (_b = (_a = build.model) === null || _a === void 0 ? void 0 : _a.sys) === null || _b === void 0 ? void 0 : _b.model) === null || _c === void 0 ? void 0 : _c.watch;
-                if (watchmap) {
-                    Object.keys(watchmap).map((file) => {
-                        self.watch.add(file);
-                    });
+                if (ctx.watch) {
+                    const watchmap = build.model?.sys?.model?.watch;
+                    if (watchmap) {
+                        Object.keys(watchmap).map((file) => {
+                            self.watch.add(file);
+                        });
+                    }
                 }
                 return res;
             }
         });
         // The actual model.
         this.build = {
-            src: spec.src,
-            path: spec.path,
-            base: spec.base,
+            path: mspec.path,
+            base: mspec.base,
             use: { config: self.config },
             res: [
                 {
@@ -60,19 +70,22 @@ class Model {
                     build: local_1.local_builder
                 }
             ],
-            require: spec.require
+            require: mspec.require,
+            log: this.log,
+            fs: this.fs
         };
-        this.watch = new watch_1.Watch(self.build);
+        this.watch = new watch_1.Watch(self.build, this.log);
     }
+    // Run once.
     async run() {
         this.trigger_model = false;
-        const br = await this.config.run();
-        return br.ok ? this.watch.run(true) : br;
+        const br = await this.config.run(false);
+        return br.ok ? this.watch.run('model', false, '<start>') : br;
     }
+    // Start watching for file changes. Run once initially.
     async start() {
         this.trigger_model = false;
-        const br = await this.config.run();
-        // console.log('MODEL CONFIG START', br.ok)
+        const br = await this.config.run(true);
         return br.ok ? this.watch.start() : br;
     }
     async stop() {
@@ -80,13 +93,22 @@ class Model {
     }
 }
 exports.Model = Model;
-function makeConfig(spec, trigger_model_build) {
-    let cbase = spec.base + '/.model-config';
+function makeConfig(mspec, log, fs, trigger_model_build) {
+    let cbase = mspec.base + '/.model-config';
     let cpath = cbase + '/model-config.jsonic';
-    // Build should load file
-    let src = fs_1.default.readFileSync(cpath).toString();
+    /*
+    try {
+      src = Fs.readFileSync(cpath).toString()
+    }
+    catch (err: any) {
+      log.error({
+        fail: 'read-file', point: 'model-config', path: cpath, err
+      })
+      throw err
+    }
+    */
     let cspec = {
-        src: src,
+        name: 'config',
         path: cpath,
         base: cbase,
         res: [
@@ -98,8 +120,10 @@ function makeConfig(spec, trigger_model_build) {
             // Trigger main model build.
             trigger_model_build
         ],
-        require: spec.require
+        require: mspec.require,
+        log,
+        fs,
     };
-    return new config_1.Config(cspec);
+    return new config_1.Config(cspec, log);
 }
 //# sourceMappingURL=model.js.map