@voxgig/model 7.0.0 → 7.2.0

package/bin/voxgig-model

@@ -8,10 +8,12 @@ const Pkg = require('../package.json')
 const { Model } = require('../dist/model.js')
 
 const { Jsonic } = require('jsonic')
-const { Gubu, Fault, One } = require('gubu')
+const { Gubu, Fault, One, Any } = require('gubu')
 
 
-let KONSOLE = console
+
+let KONSOLE = global['con'+'sole']
+
 
 run()
 
@@ -109,7 +111,7 @@ function validateOptions(rawOptions) {
     watch: Boolean,
     debug: One(String,Boolean),
     dryrun: false,
-    buildargs: '',
+    build: Any(),
     help: Boolean,
     version: Boolean,
   })
@@ -148,12 +150,6 @@ function version() {
 }
 
 
-function help() {
-  const s = 'TODO'
-  KONSOLE.log(s)
-}
-
-
 function exit(err) {
   let code = 0
   if(err) {
@@ -207,3 +203,43 @@ async function generate(options) {
   }
 }
 
+
+function help() {
+  const s = `
+Build a Voxgig model and generate dependent artifacts.
+
+Usage: voxgig-model <root-file> <args> 
+
+  <root-file> is the root file of the model.
+
+  <args> are the command arguments:
+
+    --dryrun        Perform a dry run, where no files are modified.
+    -y
+
+    --build <spec>  Provide a jsonic specification for build actions. 
+    -b
+
+    --debug         Set log level (default: info): trace, error, debug, info, warn, fatal.
+    -g             
+
+    --help          Print this help message.
+    -h
+
+    --version       Print version number.
+    -v
+
+
+Examples:
+
+# Basic usage
+> voxgig-model model/model.jsonic
+# Builds a model defined in the file model/model.jsonic
+
+See also: https://voxgig.com/model
+`
+  KONSOLE.log(s)
+}
+
+
+

package/model/.model-config/model-config.jsonic

@@ -1,5 +1,8 @@
 
 
-sys: model: builders: &: {
+sys: model: action: &: {
   load: string
 }
+
+sys: model: order: action: string
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/model",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "main": "dist/model.js",
   "type": "commonjs",
   "types": "dist/model.d.ts",
@@ -46,7 +46,7 @@
     "aontu": "0.28.0",
     "chokidar": "4.0.3",
     "gubu": "^9.0.0",
-    "memfs": "^4.23.0"
+    "memfs": "^4.25.0"
   },
   "peerDependencies": {
     "@voxgig/util": ">=0",

package/dist/builder/local.d.ts

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

package/dist/builder/local.js

@@ -1,67 +0,0 @@
-"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 configBuildResult = build.use.config.watch.last;
-        let configBuild = configBuildResult?.build();
-        let config = configBuild?.model || {};
-        let builders = config.sys?.model.builders || {};
-        // console.log('LOCAL BUILDERS', 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 });
-        }
-        // console.log('LOCAL ACTION DEFS', actionDefs)
-    }
-    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) {
-        try {
-            let ares = await actionDef.action(build.model, build, ctx);
-            ok = ok && (null == ares || !!ares.ok);
-            areslog.push(ares);
-            if (!ok) {
-                break;
-            }
-        }
-        catch (err) {
-            if (!err.__logged__) {
-                build.log.error({
-                    point: ctx.step + '-action', step: ctx.step, action: actionDef,
-                    note: actionDef.name,
-                    err
-                });
-                err.__logged__ = true;
-            }
-            throw err;
-        }
-    }
-    return { ok, step: ctx.step, active: true, errs: [], runlog: [] };
-};
-exports.local_builder = local_builder;
-//# sourceMappingURL=local.js.map

package/dist/builder/local.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"local.js","sourceRoot":"","sources":["../../src/builder/local.ts"],"names":[],"mappings":";;;;;;AACA,gDAAuB;AAKvB,uCAAuC;AACvC,MAAM,aAAa,GAAa,KAAK,EAAE,KAAY,EAAE,GAAiB,EAAE,EAAE;IACxE,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;QAE/C,6BAA6B;QAC7B,IAAI,iBAAiB,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAA;QACnD,IAAI,WAAW,GAAG,iBAAiB,EAAE,KAAK,EAAE,CAAA;QAC5C,IAAI,MAAM,GAAG,WAAW,EAAE,KAAK,IAAI,EAAE,CAAA;QAErC,IAAI,QAAQ,GAAG,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAA;QAE/C,0CAA0C;QAE1C,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;QAED,+CAA+C;IACjD,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,CAAC;YACH,IAAI,IAAI,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,CAAA;YAC1D,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YACtC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAElB,IAAI,CAAC,EAAE,EAAE,CAAC;gBAAC,MAAK;YAAC,CAAC;QACpB,CAAC;QACD,OAAO,GAAQ,EAAE,CAAC;YAChB,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;gBACpB,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC;oBACd,KAAK,EAAE,GAAG,CAAC,IAAI,GAAG,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS;oBAC9D,IAAI,EAAE,SAAS,CAAC,IAAI;oBACpB,GAAG;iBACJ,CAAC,CAAA;gBACF,GAAG,CAAC,UAAU,GAAG,IAAI,CAAA;YACvB,CAAC;YACD,MAAM,GAAG,CAAA;QACX,CAAC;IACH,CAAC;IAED,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAA;AACnE,CAAC,CAAA;AAIC,sCAAa"}

package/dist/builder/model.d.ts

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

package/dist/builder/model.js

@@ -1,30 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.model_builder = void 0;
-const path_1 = __importDefault(require("path"));
-// Builds the main model file, after unification.
-const model_builder = async (build, ctx) => {
-    if ('post' !== ctx.step) {
-        return { ok: true, step: ctx.step, active: false, errs: [], runlog: [] };
-    }
-    let json = JSON.stringify(build.model, 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(), '.')
-    });
-    build.fs.mkdirSync(path_1.default.dirname(file), { recursive: true });
-    build.fs.writeFileSync(file, json);
-    return { ok: true, step: ctx.step, active: true, errs: [], runlog: [] };
-};
-exports.model_builder = model_builder;
-//# sourceMappingURL=model.js.map

package/dist/builder/model.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/builder/model.ts"],"names":[],"mappings":";;;;;;AACA,gDAAuB;AAKvB,iDAAiD;AACjD,MAAM,aAAa,GAAa,KAAK,EAAE,KAAY,EAAE,GAAiB,EAAE,EAAE;IACxE,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,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAA;IAC1E,CAAC;IAED,IAAI,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IAE/C,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,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAC3D,KAAK,CAAC,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAElC,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAA;AACzE,CAAC,CAAA;AAGC,sCAAa"}