@voxgig/model 3.5.0 → 5.0.0

package/dist/lib/watch.js.map

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

package/dist/model.min.js

@@ -1,94 +0,0 @@
-"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;
-// 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.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);
-    }
-    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

@@ -1,138 +0,0 @@
-/* Copyright © 2021-2023 Voxgig Ltd, MIT License. */
-
-
-import { Aontu, Val, Nil, Context } from 'aontu'
-
-
-import type {
-  Build,
-  BuildResult,
-  BuildAction,
-  Builder,
-  BuildContext,
-  Spec,
-} from './types'
-
-
-
-
-class BuildImpl implements Build {
-  id
-  src
-  base
-  path
-  root: any = Nil.make()
-  opts: any
-  res
-  spec
-  model: 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
-      this.opts.path = spec.path
-    }
-
-    if (null != spec.require) {
-      this.opts.require = spec.require
-    }
-
-    this.res = spec.res || []
-
-    Object.assign(this.use, spec.use || {})
-  }
-
-
-  async run(): Promise<BuildResult> {
-    let hasErr = false
-
-    // 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
-      }
-    }
-
-
-    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 })
-      this.model = this.root.gen(genctx)
-
-      hasErr = genctx.err && 0 < genctx.err.length
-      if (hasErr) {
-        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, 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
-          }
-        }
-      }
-    }
-
-    const br = { ok: !hasErr, build: this, builders: brlog, err: this.err }
-
-    return br
-  }
-}
-
-
-function makeBuild(spec: Spec) {
-  return new BuildImpl(spec)
-}
-
-export {
-  makeBuild,
-  Spec,
-  Val
-}
-
-

package/lib/builder/local.ts

@@ -1,130 +0,0 @@
-
-import Path from 'path'
-
-import type { Build, Builder, BuildContext } from '../types'
-
-
-// Runs any builders local to the repo.
-const local_builder: Builder = async (build: Build, ctx: BuildContext) => {
-  ctx.state.local = (ctx.state.local || {})
-  let actionDefs = ctx.state.local.actionDefs
-
-  if (null == actionDefs) {
-    try {
-      actionDefs = ctx.state.local.actionDefs = []
-
-      // TODO: need to provide project root via build
-      let root = Path.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.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: 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)
-
-  if (require.cache[filePath]) {
-    const children = require.cache[filePath].children.map(child => child.id)
-
-    // Delete module from cache
-    delete require.cache[filePath]
-
-    for (const id of children) {
-      clear(id)
-    }
-  }
-
-
-  if (require.cache[filePath] && require.cache[filePath].parent) {
-    let i = require.cache[filePath].parent.children.length
-
-    while (i--) {
-      if (require.cache[filePath].parent.children[i].id === filePath) {
-        require.cache[filePath].parent.children.splice(i, 1)
-      }
-    }
-  }
-
-}
-*/
-
-
-export {
-  local_builder
-}

package/lib/builder/model.ts

@@ -1,37 +0,0 @@
-
-import Path from 'path'
-
-import { writeFile } from 'fs/promises'
-
-import type { Build, Builder, BuildContext } from '../types'
-
-
-// Builds the main model file, after unification.
-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)
-
-    let filename = Path.basename(build.path)
-    let filenameparts = filename.match(/^(.*)\.[^.]+$/)
-    if (filenameparts) {
-      filename = filenameparts[1]
-    }
-
-    let file = build.opts.base + '/' + filename + '.json'
-
-    await writeFile(file, json)
-
-    return { ok: true, step: ctx.step, active: true }
-  }
-  catch (e: any) {
-    throw e
-  }
-}
-
-export {
-  model_builder
-}

package/lib/config.ts

@@ -1,50 +0,0 @@
-/* Copyright © 2021-2024 Voxgig Ltd, MIT License. */
-
-
-import type { BuildResult, Spec } from './types'
-
-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: [
-        ...(spec.res || [])
-      ],
-      require: spec.require
-    }
-
-    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/types.ts

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