@voxgig/model 4.0.0 → 5.0.0

package/bin/voxgig-model

@@ -1,52 +1,171 @@
 #!/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 exit(err) {
+  let code = 0
+  if(err) {
+    code = 1
+  }
+  process.exit(code)
 }
 
-path = Path.resolve(path)
 
-let src = Fs.readFileSync(path).toString()
+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',
+      },
+      
+    }
+  })
 
-let spec = {
-  src,
-  path,
-  base,
-  require: process.cwd()
+  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
 }
 
-let model = new Model(spec)
 
-async function run() {
-  if(once) {
-    let br = await model.run()
-    if(0 < br.err.length) {
-      process.exit(1)
-    }
+function validateOptions(rawOptions) {
+  const optShape = Gubu({
+    model: Fault('The first argument should be the model file.', String),
+    watch: Boolean,
+    debug: One(String,Boolean),
+    help: Boolean,
+    version: Boolean,
+  })
+
+  const err = []
+  const options = optShape(rawOptions,{err})
+
+  if(err[0]) {
+    throw new Error(err[0].text)
   }
-  else {
+
+  return options
+}
+
+
+async function handleError(err) {
+  CONSOLE.log('Voxgig Model Error:')
+  CONSOLE.log(err)
+  exit(err)
+}
+
+
+function version() {
+  CONSOLE.log(Pkg.version)
+}
+
+
+function help() {
+  const s = 'TODO'
+  CONSOLE.log(s)
+}
+
+
+
+async function generate(options) {
+  let path = options.model
+
+  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 src = Fs.readFileSync(path).toString()
+
+  let spec = {
+    src,
+    path,
+    base,
+    require: process.cwd(),
+    debug: options.debug,
+  }
+
+  let model = new Model(spec)
+
+  if(options.watch) {
     model.start()
   }
+  else {
+    let br = await model.run()
+  }
 }
 
-
-run()

package/dist/{lib/build.d.ts → build.d.ts}

@@ -1,5 +1,5 @@
 import { Val } from 'aontu';
-import type { Build, BuildResult, BuildAction, BuildContext, Spec } from './types';
+import type { Build, BuildResult, BuildAction, BuildContext, BuildSpec, Log } from './types';
 declare class BuildImpl implements Build {
     id: string;
     src: string;
@@ -8,13 +8,14 @@ declare class BuildImpl implements Build {
     root: any;
     opts: any;
     res: BuildAction[];
-    spec: Spec;
+    spec: BuildSpec;
     model: any;
     use: {};
     err: any[];
     ctx: BuildContext;
-    constructor(spec: Spec);
+    log: Log;
+    constructor(spec: BuildSpec, log: Log);
     run(): Promise<BuildResult>;
 }
-declare function makeBuild(spec: Spec): BuildImpl;
-export { makeBuild, Spec, Val };
+declare function makeBuild(spec: BuildSpec, log: Log): BuildImpl;
+export { makeBuild, BuildSpec, Val };

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

@@ -4,11 +4,12 @@ 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.id = String(Math.random()).substring(3, 9);
+        this.log = log;
         this.spec = spec;
         this.src = spec.src;
         this.base = null == spec.base ? '' : spec.base;
@@ -80,7 +81,7 @@ class BuildImpl {
         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/{lib/builder → builder}/local.js

@@ -36,41 +36,20 @@ const local_builder = async (build, ctx) => {
             throw e;
         }
     }
-    if ('pre' === ctx.step) {
-        try {
-            let ok = true;
-            let brlog = [];
-            for (let actionDef of actionDefs) {
-                if ('pre' === actionDef.step || 'all' === actionDef.step) {
-                    let br = await actionDef.action(build.model, build);
-                    ok = ok && null != br && br.ok;
-                    brlog.push(br);
-                }
-            }
-            return { ok: true, step: ctx.step, active: true };
-        }
-        catch (e) {
-            throw e;
-        }
-    }
-    else if ('post' === ctx.step) {
-        try {
-            let ok = true;
-            let brlog = [];
-            for (let actionDef of actionDefs) {
-                if ('post' === actionDef.step || 'all' === actionDef.step) {
-                    let br = await actionDef.action(build.model, build);
-                    ok = ok && null != br && br.ok;
-                    brlog.push(br);
-                }
-            }
-            return { ok: true, step: ctx.step, active: true };
-        }
-        catch (e) {
-            throw e;
-        }
+    const runActionDefs = actionDefs.filter((ad) => ctx.step === ad.step || 'all' === ad.step);
+    // console.log(runActionDefs)
+    build.log.info({
+        point: ctx.step + '-actions', step: ctx.step, actions: runActionDefs,
+        note: runActionDefs.map((ad) => ad.name).join(';')
+    });
+    let ok = true;
+    let brlog = [];
+    for (let actionDef of runActionDefs) {
+        let br = await actionDef.action(build.model, build);
+        ok = ok && null != br && br.ok;
+        brlog.push(br);
     }
-    return { ok: false, why: 'bad-step', step: ctx.step, active: false };
+    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,IAAI,CAAC;YACH,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,GAAG,EAAE,CAAA;YAE5C,+CAA+C;YAC/C,IAAI,IAAI,GAAG,cAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;YAG/C,6BAA6B;YAC7B,IAAI,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAA;YAElC,IAAI,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAA;YAE/C,IAAI,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAA;YAExC,kCAAkC;YAClC,gBAAgB;YAChB,KAAK,IAAI,IAAI,IAAI,QAAQ,EAAE,CAAC;gBAC1B,IAAI,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAA;gBAC5B,IAAI,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;gBAG/C,qBAAqB;gBAGrB,IAAI,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;gBAEjC,IAAI,MAAM,YAAY,OAAO,EAAE,CAAC;oBAC9B,MAAM,GAAG,MAAM,MAAM,CAAA;gBACvB,CAAC;gBAED,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,CAAA;gBAElC,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;YAClD,CAAC;QACH,CAAC;QACD,OAAO,CAAM,EAAE,CAAC;YACd,MAAM,CAAC,CAAA;QACT,CAAC;IACH,CAAC;IAGD,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,6BAA6B;IAE7B,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,KAAK,GAAG,EAAE,CAAA;IAEd,KAAK,IAAI,SAAS,IAAI,aAAa,EAAE,CAAC;QACpC,IAAI,EAAE,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;QACnD,EAAE,GAAG,EAAE,IAAI,IAAI,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAA;QAC9B,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAChB,CAAC;IAED,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;AACnD,CAAC,CAAA;AAkCC,sCAAa"}

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

@@ -19,6 +19,11 @@ const model_builder = async (build, ctx) => {
             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 };
     }

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,CAAC;QACH,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,CAAC;YAClB,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA;QAC7B,CAAC;QAED,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,QAAQ,GAAG,OAAO,CAAA;QAErD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC;YACb,KAAK,EAAE,aAAa;YACpB,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC;SACvC,CAAC,CAAA;QAEF,MAAM,IAAA,oBAAS,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QAE3B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;IACnD,CAAC;IACD,OAAO,CAAM,EAAE,CAAC;QACd,MAAM,CAAC,CAAA;IACT,CAAC;AACH,CAAC,CAAA;AAGC,sCAAa"}

package/dist/{lib/config.d.ts → config.d.ts}

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

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

@@ -4,7 +4,8 @@ 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,
@@ -12,12 +13,13 @@ class Config {
             res: [
                 ...(spec.res || [])
             ],
-            require: spec.require
+            require: spec.require,
+            log: this.log,
         };
-        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>');
+        return this.watch.run('config', true, '<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,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,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;SACd,CAAA;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,aAAK,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA;IAC9C,CAAC;IAED,KAAK,CAAC,GAAG;QACP,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,UAAU,CAAC,CAAA;IACnD,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,15 @@
-import type { BuildResult, Spec } from './lib/types';
-import { Config } from './lib/config';
-import { Watch } from './lib/watch';
+import type { BuildResult, BuildSpec, 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;
+    constructor(spec: BuildSpec);
     run(): Promise<BuildResult>;
     start(): Promise<void | BuildResult>;
     stop(): Promise<void>;
 }
-export { Model, Spec, };
+export { Model, BuildSpec, };

package/dist/model.js

@@ -1,25 +1,34 @@
 "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) {
         this.trigger_model = false;
         const self = this;
+        const pino = (0, util_1.prettyPino)('model', spec);
+        this.log = pino.child({ cmp: 'model' });
+        this.log.info({ point: 'model-init' });
+        this.log.debug({
+            point: 'model-spec', spec, note: '\n' +
+                JSON.stringify({ ...spec, 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(spec, this.log, {
             path: '/',
             build: async function trigger_model(build, ctx) {
-                var _a, _b, _c;
                 if ('post' !== ctx.step) {
                     return { ok: true };
                 }
@@ -27,15 +36,17 @@ class Model {
                 // 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;
+                const watchmap = build.model?.sys?.model?.watch;
                 if (watchmap) {
                     Object.keys(watchmap).map((file) => {
                         self.watch.add(file);
@@ -60,14 +71,15 @@ class Model {
                     build: local_1.local_builder
                 }
             ],
-            require: spec.require
+            require: spec.require,
+            log: this.log,
         };
-        this.watch = new watch_1.Watch(self.build);
+        this.watch = new watch_1.Watch(self.build, this.log);
     }
     async run() {
         this.trigger_model = false;
         const br = await this.config.run();
-        return br.ok ? this.watch.run(true) : br;
+        return br.ok ? this.watch.run('model', true) : br;
     }
     async start() {
         this.trigger_model = false;
@@ -80,12 +92,13 @@ class Model {
     }
 }
 exports.Model = Model;
-function makeConfig(spec, trigger_model_build) {
+function makeConfig(spec, log, trigger_model_build) {
     let cbase = spec.base + '/.model-config';
     let cpath = cbase + '/model-config.jsonic';
     // Build should load file
-    let src = fs_1.default.readFileSync(cpath).toString();
+    let src = node_fs_1.default.readFileSync(cpath).toString();
     let cspec = {
+        name: 'config',
         src: src,
         path: cpath,
         base: cbase,
@@ -98,8 +111,9 @@ function makeConfig(spec, trigger_model_build) {
             // Trigger main model build.
             trigger_model_build
         ],
-        require: spec.require
+        require: spec.require,
+        log,
     };
-    return new config_1.Config(cspec);
+    return new config_1.Config(cspec, log);
 }
 //# sourceMappingURL=model.js.map

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":["../src/model.ts"],"names":[],"mappings":"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"}

package/dist/tsconfig.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["../src/build.ts","../src/config.ts","../src/model.ts","../src/types.ts","../src/watch.ts","../src/builder/local.ts","../src/builder/model.ts"],"version":"5.6.3"}

package/dist/{lib/types.d.ts → types.d.ts}

@@ -1,3 +1,5 @@
+import Pino from 'pino';
+type Log = ReturnType<typeof Pino>;
 interface Build {
     id: string;
     src: string;
@@ -8,7 +10,7 @@ interface Build {
         [key: string]: any;
     };
     res: BuildAction[];
-    spec: Spec;
+    spec: BuildSpec;
     model: any;
     use: {
         [name: string]: any;
@@ -16,6 +18,7 @@ interface Build {
     err: any[];
     ctx: BuildContext;
     run: () => Promise<BuildResult>;
+    log: Log;
 }
 interface BuildResult {
     ok: boolean;
@@ -35,7 +38,7 @@ interface BuildContext {
     state: Record<string, any>;
 }
 type Builder = (build: Build, ctx: BuildContext) => Promise<BuildResult>;
-interface Spec {
+interface BuildSpec {
     src: string;
     path?: string;
     base?: string;
@@ -44,5 +47,24 @@ interface Spec {
     use?: {
         [name: string]: any;
     };
+    log?: Log;
+    idle?: number;
+    name?: string;
+    debug?: boolean | string;
 }
-export type { Build, BuildResult, BuildAction, Builder, BuildContext, Spec, };
+type Run = {
+    canon: string;
+    path: string;
+    start: number;
+    end: number;
+};
+type Canon = {
+    path: string;
+    isFolder: boolean;
+    when: number;
+};
+type ChangeItem = {
+    path: string;
+    when: number;
+};
+export type { Build, BuildResult, BuildAction, Builder, BuildContext, BuildSpec, Log, Run, Canon, ChangeItem };

package/dist/types.js

@@ -0,0 +1,4 @@
+"use strict";
+/* Copyright © 2021-2024 Voxgig Ltd, MIT License. */
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";AAAA,oDAAoD"}

package/dist/{lib/watch.d.ts → watch.d.ts}

@@ -1,23 +1,8 @@
-import type { Build, BuildResult } from './types';
+import type { Build, BuildResult, Log, Run, Canon, ChangeItem, BuildSpec } from './types';
 import { FSWatcher } from 'chokidar';
-type Run = {
-    canon: string;
-    path: string;
-    start: number;
-    end: number;
-};
-type Canon = {
-    path: string;
-    isFolder: boolean;
-    when: number;
-};
-type ChangeItem = {
-    path: string;
-    when: number;
-};
 declare class Watch {
     fsw: FSWatcher;
-    spec: any;
+    wspec: any;
     last?: BuildResult;
     lastChangeTime: number;
     build: Build | undefined;
@@ -30,14 +15,16 @@ declare class Watch {
     running: boolean;
     lastChange: ChangeItem;
     lastTrigger: ChangeItem;
-    constructor(spec: any);
+    log: Log;
+    name: string;
+    constructor(wspec: BuildSpec, log: Log);
     start(): void;
     canon(path: string): string;
     handleChange(path: string): void;
     drain(): Promise<void>;
     add(path: string): Promise<void>;
     update(br: BuildResult): Promise<void>;
-    run(once?: boolean, trigger?: string): Promise<BuildResult>;
+    run(name: string, once?: boolean, trigger?: string): Promise<BuildResult>;
     stop(): Promise<void>;
     handleErrors(br: BuildResult): void;
     descDeps(deps: Record<string, Record<string, {