@voxgig/model 2.3.1 → 3.1.0

package/dist/model.js

@@ -11,31 +11,34 @@ 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.trigger_model = false;
+        const self = this;
         // Config is a special Watch to handle model config.
-        this.config = intern.makeConfig(spec, {
+        this.config = makeConfig(spec, {
             path: '/',
-            build: async (build) => {
-                // console.log('CONFIG BUILD', build.model)
-                var _a, _b;
+            build: async function trigger_model(build, ctx) {
+                var _a, _b, _c;
+                if ('post' !== ctx.step) {
+                    return { ok: true };
+                }
                 let res;
-                if (this.trigger_model) {
+                // console.log('TRIGGER', build.id, self.trigger_model, ctx)
+                // console.log(new Error().stack)
+                if (self.trigger_model) {
                     // TODO: fix!!!
-                    this.build.use.config.watch.last.build = build;
-                    res = this.watch.run(true);
+                    self.build.use.config.watch.last.build = build;
+                    res = self.watch.run(true);
                 }
                 else {
-                    this.trigger_model = true;
+                    self.trigger_model = true;
                     res = { ok: true };
                 }
-                const watchmap = (_b = (_a = build.model.sys) === null || _a === void 0 ? void 0 : _a.model) === null || _b === void 0 ? void 0 : _b.watch;
-                // console.log('WATCHMAP', watchmap)
+                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) => {
-                        this.watch.add(file);
+                        self.watch.add(file);
                     });
                 }
                 return res;
@@ -46,7 +49,7 @@ class Model {
             src: spec.src,
             path: spec.path,
             base: spec.base,
-            use: { config: this.config },
+            use: { config: self.config },
             res: [
                 {
                     path: '/',
@@ -59,46 +62,43 @@ class Model {
             ],
             require: spec.require
         };
-        this.watch = new watch_1.Watch(this.build);
+        this.watch = new watch_1.Watch(self.build);
     }
     async run() {
         this.trigger_model = false;
-        let br = await this.config.run();
+        const br = await this.config.run();
         return br.ok ? this.watch.run(true) : br;
     }
     async start() {
         this.trigger_model = false;
-        await this.config.start();
-        return this.watch.start();
+        const br = await this.config.start();
+        return br.ok ? this.watch.start() : br;
     }
     async stop() {
         return this.watch.stop();
     }
 }
 exports.Model = Model;
-function makeIntern() {
-    return {
-        makeConfig(spec, 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 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
-                ],
-                require: spec.require
-            };
-            return new config_1.Config(cspec);
-        }
+function makeConfig(spec, 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 cspec = {
+        src: src,
+        path: cpath,
+        base: cbase,
+        res: [
+            // Generate full config model and save as a file.
+            {
+                path: '/',
+                build: model_1.model_builder
+            },
+            // Trigger main model build.
+            trigger_model_build
+        ],
+        require: spec.require
     };
+    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":"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"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../model.ts"],"names":[],"mappings":";AAAA,oDAAoD;;;;;;AAEpD,6BAA6B;AAC7B,4CAAmB;AAMnB,yCAAqC;AACrC,uCAAmC;AAEnC,+CAAmD;AACnD,+CAAmD;AAGnD,MAAM,KAAK;IAQT,YAAY,IAAU;QAHtB,kBAAa,GAAG,KAAK,CAAA;QAInB,MAAM,IAAI,GAAG,IAAI,CAAA;QAEjB,oDAAoD;QACpD,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,IAAI,EAAE;YAC7B,IAAI,EAAE,GAAG;YACT,KAAK,EAAE,KAAK,UAAU,aAAa,CAAC,KAAY,EAAE,GAAiB;;gBACjE,IAAI,MAAM,KAAK,GAAG,CAAC,IAAI,EAAE,CAAC;oBACxB,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAA;gBACrB,CAAC;gBAED,IAAI,GAAG,CAAA;gBAEP,4DAA4D;gBAC5D,iCAAiC;gBAEjC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;oBAEvB,eAAe;oBACf,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;oBAE9C,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;gBAC5B,CAAC;qBACI,CAAC;oBACJ,IAAI,CAAC,aAAa,GAAG,IAAI,CAAA;oBACzB,GAAG,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,CAAA;gBACpB,CAAC;gBAED,MAAM,QAAQ,GAAG,MAAA,MAAA,MAAA,KAAK,CAAC,KAAK,0CAAE,GAAG,0CAAE,KAAK,0CAAE,KAAK,CAAA;gBAE/C,IAAI,QAAQ,EAAE,CAAC;oBACb,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE;wBACzC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;oBACtB,CAAC,CAAC,CAAA;gBACJ,CAAC;gBAED,OAAO,GAAG,CAAA;YACZ,CAAC;SACF,CAAC,CAAA;QAGF,oBAAoB;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,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE;YAC5B,GAAG,EAAE;gBACH;oBACE,IAAI,EAAE,GAAG;oBACT,KAAK,EAAE,qBAAa;iBACrB;gBACD;oBACE,IAAI,EAAE,GAAG;oBACT,KAAK,EAAE,qBAAa;iBACrB;aACF;YACD,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAA;QAGD,IAAI,CAAC,KAAK,GAAG,IAAI,aAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACpC,CAAC;IAGD,KAAK,CAAC,GAAG;QACP,IAAI,CAAC,aAAa,GAAG,KAAK,CAAA;QAC1B,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAA;QAClC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAC1C,CAAC;IAGD,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,aAAa,GAAG,KAAK,CAAA;QAC1B,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;QACpC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IACxC,CAAC;IAGD,KAAK,CAAC,IAAI;QACR,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;IAC1B,CAAC;CACF;AAkCC,sBAAK;AA/BP,SAAS,UAAU,CAAC,IAAU,EAAE,mBAAgC;IAC9D,IAAI,KAAK,GAAG,IAAI,CAAC,IAAI,GAAG,gBAAgB,CAAA;IACxC,IAAI,KAAK,GAAG,KAAK,GAAG,sBAAsB,CAAA;IAE1C,yBAAyB;IACzB,IAAI,GAAG,GAAG,YAAE,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAA;IAE3C,IAAI,KAAK,GAAS;QAChB,GAAG,EAAE,GAAG;QACR,IAAI,EAAE,KAAK;QACX,IAAI,EAAE,KAAK;QACX,GAAG,EAAE;YAEH,iDAAiD;YACjD;gBACE,IAAI,EAAE,GAAG;gBACT,KAAK,EAAE,qBAAa;aACrB;YAED,4BAA4B;YAC5B,mBAAmB;SACpB;QACD,OAAO,EAAE,IAAI,CAAC,OAAO;KACtB,CAAA;IAED,OAAO,IAAI,eAAM,CAAC,KAAK,CAAC,CAAA;AAC1B,CAAC"}

package/lib/build.ts

@@ -4,56 +4,42 @@
 import { Aontu, Val, Nil, Context } from 'aontu'
 
 
-interface BuildResult {
-  ok: boolean
-  builder?: string
-  path?: string
-  build?: Build
-  builders?: BuildResult[]
-  err?: any[]
-}
-
-interface BuildAction {
-  path: string
-  build: Builder
-}
-
-type Builder = (
-  build: Build
-) => Promise<BuildResult>
-
-
-interface Spec {
-  src: string
-  path?: string
-  base?: string
-  res?: BuildAction[]
-  require?: any
-  use?: { [name: string]: any }
-}
+import type {
+  Build,
+  BuildResult,
+  BuildAction,
+  Builder,
+  BuildContext,
+  Spec,
+} from './types'
 
 
 
 
-class Build {
-  src: string
-  base: string
-  path: string
-  root: Val = Nil.make()
-  opts: { [key: string]: any }
-  res: BuildAction[]
-  spec: Spec
+class BuildImpl implements Build {
+  id
+  src
+  base
+  path
+  root: any = Nil.make()
+  opts: any
+  res
+  spec
   model: any
-  use: { [name: string]: any } = {}
+  use = {}
   err: any[] = []
+  ctx: BuildContext
 
 
   constructor(spec: Spec) {
+    this.id = String(Math.random()).substring(3, 9)
+
     this.spec = spec
     this.src = spec.src
     this.base = null == spec.base ? '' : spec.base
     this.path = null == spec.path ? '' : spec.path
     this.opts = {}
+    this.ctx = { step: 'pre', state: {} }
 
     if (null != spec.base) {
       this.opts.base = spec.base
@@ -71,19 +57,37 @@ class Build {
 
 
   async run(): Promise<BuildResult> {
-    // console.log('BUILD RUN', this.path)
-
     let hasErr = false
 
-    this.root = Aontu(this.src, this.opts)
-    hasErr = this.root.err && 0 < this.root.err.length
-
-    if (hasErr) {
-      this.err.push(...this.root.err)
+    // this.ctx.step = 'pre'
+    this.ctx = { step: 'pre', state: {} }
+    const brlog = []
+
+    for (let builder of this.res) {
+      try {
+        let br = await builder.build(this, this.ctx)
+        br.step = this.ctx.step
+        br.path = builder.path
+        br.builder = builder.build.name
+        brlog.push(br)
+      }
+      catch (e: any) {
+        this.err.push(e)
+        hasErr = true
+        break
+      }
     }
 
 
-    let brlog = []
+    if (!hasErr) {
+      this.root = Aontu(this.src, this.opts)
+      hasErr = this.root.err && 0 < this.root.err.length
+
+      if (hasErr) {
+        this.err.push(...this.root.err)
+      }
+    }
+
 
     if (!hasErr) {
       let genctx = new Context({ root: this.root })
@@ -94,32 +98,39 @@ class Build {
         this.err.push(...genctx.err)
       }
       else {
-
         // TODO: only call if path value has changed
+
+        this.ctx.step = 'post'
+
         for (let builder of this.res) {
           try {
-            let br = await builder.build(this)
+            let br = await builder.build(this, this.ctx)
+            br.step = this.ctx.step
             br.path = builder.path
             br.builder = builder.build.name
             brlog.push(br)
           }
           catch (e: any) {
             this.err.push(e)
+            break
           }
         }
       }
     }
 
-    return { ok: !hasErr, build: this, builders: brlog, err: this.err }
+    const br = { ok: !hasErr, build: this, builders: brlog, err: this.err }
+
+    return br
   }
 }
 
 
+function makeBuild(spec: Spec) {
+  return new BuildImpl(spec)
+}
+
 export {
-  Build,
-  Builder,
-  BuildResult,
-  BuildAction,
+  makeBuild,
   Spec,
   Val
 }

package/lib/builder/local.ts

@@ -1,61 +1,104 @@
 
 import Path from 'path'
 
-import { Build, Builder } from '../build'
+import type { Build, Builder, BuildContext } from '../types'
 
 
 // Runs any builders local to the repo.
-const local_builder: Builder = async (build: Build) => {
-  try {
-    // TODO: need to provide project root via build
-    let root = Path.resolve(build.path, '..', '..')
+const local_builder: Builder = async (build: Build, ctx: BuildContext) => {
+  ctx.state.local = (ctx.state.local || {})
+  let actionDefs = ctx.state.local.actionDefs
 
-    // TODO: build should do this
-    // console.log('LOCAL root:', root)
-    let configbuild = build.use.config
+  if (null == actionDefs) {
+    try {
+      actionDefs = ctx.state.local.actionDefs = []
 
-    let config = configbuild.watch.last.build.model
-    // console.log('CONFIG BUILD')
-    // console.dir(config, { depth: null })
+      // TODO: need to provide project root via build
+      let root = Path.resolve(build.path, '..', '..')
 
-    let builders = config.sys.model.builders
 
-    let ok = true
-    let brlog = []
+      // TODO: build should do this
+      let configbuild = build.use.config
 
-    // TODO: order by comma sep string
-    for (let name in builders) {
-      // console.log('LOCAL BUILDER', name)
+      let config = configbuild.watch.last.build.model
 
-      let builder = builders[name]
-      let action_path = Path.join(root, builder.load)
+      let builders = config.sys.model.builders
 
-      clear(action_path)
-      let action = require(action_path)
-      let br = await action(build.model, build)
-      ok = ok && null != br && br.ok
-      brlog.push(br)
+      // TODO: order by comma sep string
+      // Load builders
+      for (let name in builders) {
+        let builder = builders[name]
+        let action_path = Path.join(root, builder.load)
+
+        clear(action_path)
+        let action = require(action_path)
+
+        if (action instanceof Promise) {
+          action = await action
+        }
+
+        const step = action.step || 'post'
+
+        actionDefs.push({ name, builder, action, step })
+      }
+    }
+    catch (e: any) {
+      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: ok, brlog }
-  } catch (e: any) {
-    console.log('MODEL BUILD local', e)
-    throw e
+      return { ok: true, step: ctx.step, active: true }
+    }
+    catch (e: any) {
+      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: any) {
+      throw e
+    }
   }
 
+  return { ok: false, why: 'bad-step', step: ctx.step, active: false }
 }
 
 
 // Adapted from https://github.com/sindresorhus/import-fresh - Thanks!
 function clear(path: string) {
   let filePath = require.resolve(path)
-  // console.log('CM fp', filePath)
 
   if (require.cache[filePath]) {
     const children = require.cache[filePath].children.map(child => child.id)
 
-    // console.log('CM-B', filePath, children)
-
     // Delete module from cache
     delete require.cache[filePath]
 
@@ -68,8 +111,6 @@ function clear(path: string) {
   if (require.cache[filePath] && require.cache[filePath].parent) {
     let i = require.cache[filePath].parent.children.length
 
-    // console.log('CM-A', filePath, require.cache[filePath].parent.children)
-
     while (i--) {
       if (require.cache[filePath].parent.children[i].id === filePath) {
         require.cache[filePath].parent.children.splice(i, 1)

package/lib/builder/model.ts

@@ -3,11 +3,14 @@ import Path from 'path'
 
 import { writeFile } from 'fs/promises'
 
-import { Build, Builder } from '../build'
+import type { Build, Builder, BuildContext } from '../types'
 
 
 // Builds the main model file, after unification.
-const model_builder: Builder = async (build: Build) => {
+const model_builder: Builder = async (build: Build, ctx: BuildContext) => {
+  if ('post' !== ctx.step) {
+    return { ok: true, step: ctx.step, active: false }
+  }
 
   try {
     let json = JSON.stringify(build.root.gen(), null, 2)
@@ -20,12 +23,11 @@ const model_builder: Builder = async (build: Build) => {
 
     let file = build.opts.base + '/' + filename + '.json'
 
-    // console.log('MODEL BUILDER', file)
     await writeFile(file, json)
 
-    return { ok: true }
-  } catch (e: any) {
-    console.log('MODEL BUILD model', e)
+    return { ok: true, step: ctx.step, active: true }
+  }
+  catch (e: any) {
     throw e
   }
 }

package/lib/config.ts

@@ -1,17 +1,10 @@
-/* Copyright © 2021-2023 Voxgig Ltd, MIT License. */
+/* Copyright © 2021-2024 Voxgig Ltd, MIT License. */
 
 
-// load config as a model
-// from model / config.jsonic by default
-// config defines builders
+import type { BuildResult, Spec } from './types'
 
-
-
-
-import { BuildResult, Spec } from './build'
 import { Watch } from './watch'
 
-
 import { model_builder } from './builder/model'
 
 
@@ -29,10 +22,6 @@ class Config {
       path: spec.path,
       base: spec.base,
       res: [
-        {
-          path: '/',
-          build: model_builder
-        },
         ...(spec.res || [])
       ],
       require: spec.require

package/lib/types.ts

@@ -0,0 +1,67 @@
+
+
+
+interface Build {
+  id: string
+  src: string
+  base: string
+  path: string
+  root: any
+  opts: { [key: string]: any }
+  res: BuildAction[]
+  spec: Spec
+  model: any
+  use: { [name: string]: any }
+  err: any[]
+  ctx: BuildContext
+
+  run: () => Promise<BuildResult>
+}
+
+
+interface BuildResult {
+  ok: boolean
+  builder?: string
+  path?: string
+  build?: Build
+  builders?: BuildResult[]
+  step?: string
+  err?: any[]
+}
+
+interface BuildAction {
+  path: string
+  build: Builder
+}
+
+
+interface BuildContext {
+  step: 'pre' | 'post'
+  state: Record<string, any>
+}
+
+type Builder = (
+  build: Build,
+  ctx: BuildContext,
+) => Promise<BuildResult>
+
+
+interface Spec {
+  src: string
+  path?: string
+  base?: string
+  res?: BuildAction[]
+  require?: any
+  use?: { [name: string]: any }
+}
+
+
+
+export type {
+  Build,
+  BuildResult,
+  BuildAction,
+  Builder,
+  BuildContext,
+  Spec,
+}