@voxgig/model 4.0.0 → 5.1.0

package/lib/watch.ts

@@ -1,301 +0,0 @@
-/* Copyright © 2021-2024 Voxgig Ltd, MIT License. */
-
-import Path from 'node:path'
-
-
-import type { Build, BuildResult } from './types'
-
-import { makeBuild } from './build'
-import { FSWatcher } from 'chokidar'
-
-import { readFile, stat } from 'fs/promises'
-
-
-const print = console.log
-const warn = console.warn
-
-
-type Run = {
-  canon: string
-  path: string
-  start: number
-  end: number
-}
-
-type Canon = {
-  path: string
-  isFolder: boolean
-  when: number
-}
-
-
-type ChangeItem = {
-  path: string
-  when: number
-}
-
-class Watch {
-  fsw: FSWatcher
-  spec: any
-  last?: BuildResult
-  lastChangeTime: number
-  build: Build | undefined
-  runq: Run[]
-  doneq: Run[]
-  canons: Canon[]
-  lastrun: Run | undefined
-  idle: number
-  startTime: number
-  running: boolean
-  lastChange: ChangeItem
-  lastTrigger: ChangeItem
-
-  constructor(spec: any) {
-    this.spec = spec
-    this.fsw = new FSWatcher()
-    this.lastChangeTime = 0
-    this.runq = []
-    this.doneq = []
-    this.canons = []
-    this.startTime = 0
-    this.lastChange = { path: '', when: 0 }
-    this.lastTrigger = { path: '', when: 0 }
-    this.running = false
-    this.lastrun = undefined
-
-    this.idle = spec.idle || 111
-
-    this.fsw.on('change', async (path: string) => {
-      // console.log('CHANGE', Date.now() - this.startTime, path)
-      this.handleChange(path)
-    })
-  }
-
-
-  // Returns first BuildResult
-  start() {
-    this.startTime = Date.now()
-    this.handleChange('<start>')
-
-    // Check if there have been no recent changes, if so, run build.
-    setInterval(() => {
-      const start = this.startTime
-      const now = Date.now()
-      const idleDuration = now - this.lastChange.when
-
-      // Only trigger a build if there was a actual change
-      const trigger = this.lastChange.when !== this.lastTrigger.when &&
-        this.lastChange.path !== this.lastTrigger.path
-
-      // console.log('CHECK-A', {
-      //   tick: (now - start),
-      //   idleDuration,
-      //   trigger,
-      //   running: this.running,
-      //   path: this.lastChange.path
-      // })
-
-      if (trigger) {
-
-        // Only add to build queue if we've been idle.
-        // This allows external compilation outputting multiple files to complete fully.
-        // IMPORTANT: always trigger a new build if there were changes *inside* a build period
-        if (this.idle < idleDuration) {
-          this.lastTrigger.path = this.lastChange.path
-          this.lastTrigger.when = this.lastChange.when
-
-          const path = this.lastChange.path
-          const canon = this.canon(path)
-
-          this.runq.push({
-            canon,
-            path,
-            start: now,
-            end: -1,
-          })
-
-          // Defer builds to the event loop to keep idle checking separate.
-          setImmediate(this.drain.bind(this))
-        }
-      }
-
-    }, (this.idle * 1.1 / 2) | 0)
-  }
-
-
-  // If path is inside a watched folder, return folder as canonical reference.
-  canon(path: string) {
-    for (const canon of this.canons) {
-      if (canon.isFolder && path.startsWith(canon.path)) {
-        return canon.path
-      }
-    }
-    return path
-  }
-
-
-  handleChange(path: string) {
-    // Record most recent (last) changed path and time
-    this.lastChange.path = path
-    this.lastChange.when = Date.now()
-  }
-
-
-  async drain() {
-    // If already running, all items in queue will be drained from this.runq in the while loop
-    if (this.running) {
-      return
-    }
-
-    this.running = true
-    let r: Run | undefined
-
-    // While there are queued runs, run them sequentially
-    while (r = this.runq.shift()) {
-      // console.log('===DRAIN-RUN', this.runq.length, new Date(), r.start, r.canon)
-
-      // TODO: collect results and errors!!!
-      let br = await this.run(false, r.canon)
-      // console.log('BR', br)
-
-      r.end = Date.now()
-      this.doneq.push(r)
-      this.lastrun = r
-
-      // console.log('===DRAIN-DONE', this.runq.length, new Date(), r.start, r.canon)
-    }
-    this.running = false
-  }
-
-
-  async add(path: string) {
-    if (!Path.isAbsolute(path)) {
-      path = Path.join(this.spec.require, path)
-    }
-
-    // Ignore if aleady added
-    if (this.canons.find((c: Canon) => c.path === path)) {
-      return
-    }
-
-    const fileStat = await stat(path)
-    const canon: Canon = {
-      path: path,
-      isFolder: fileStat.isDirectory(),
-      when: Date.now()
-    }
-
-    this.canons.push(canon)
-
-    this.fsw.add(path)
-
-    // console.log('ADD', canon)
-  }
-
-
-  async update(br: BuildResult) {
-    let build = (br.build as Build)
-
-    let files: string[] =
-      Object.keys(build.root.deps).reduce((files: string[], target: any) => {
-        files = files.concat(Object.keys(build.root.deps[target]))
-        return files
-      }, [build.path])
-
-
-    // TODO: remove deleted files
-    files.forEach(async (file: string) => {
-      if ('string' === typeof (file) &&
-        '' !== file &&
-        build.opts.base !== file
-      ) {
-        await this.add(file)
-      }
-    })
-
-  }
-
-
-
-  async run(once?: boolean, trigger?: string): Promise<BuildResult> {
-    // console.trace()
-
-    this.lastChangeTime = Date.now()
-    print('\n@voxgig/model =================', this.lastChangeTime, new Date(this.lastChangeTime))
-    print('TRIGGER:', trigger, '\n')
-
-    // TODO: build spec should not have src!
-    let src = (await readFile(this.spec.path)).toString()
-    this.spec.src = src
-
-    this.build = this.build || makeBuild(this.spec)
-
-    // TODO: better way to do this?
-    this.build.src = src
-
-    let br: BuildResult = await this.build.run()
-
-    print('\nFILES:\n' + this.descDeps((br as any).build.root.deps) + '\n')
-
-    if (br.ok) {
-      print('TOP:', Object.keys(br?.build?.model).join(', '), '\n')
-
-      if (!once) {
-        // There may be new files.
-        await this.update(br)
-      }
-    }
-    else {
-      warn('MODEL ERRORS: ' + br.err?.length)
-      this.handleErrors(br)
-    }
-
-    this.last = br
-
-    return br
-  }
-
-
-  async stop() {
-    await this.fsw.close()
-  }
-
-
-  handleErrors(br: BuildResult) {
-    if (br.err) {
-      for (let be of br.err) {
-        // TODO: print stack if not a model error
-
-        if (be.isVal && be.msg) {
-          warn(be.msg)
-        }
-        // else if (be.message) {
-        //   warn(be.message)
-        // }
-        else {
-          warn(be)
-        }
-      }
-    }
-  }
-
-  descDeps(deps: Record<string, Record<string, { tar: string }>>) {
-    if (null == deps) {
-      return ''
-    }
-
-    let desc = []
-    for (let entryPath of Object.keys(deps)) {
-      desc.push('  ' + entryPath)
-      for (let depPath of Object.keys(deps[entryPath])) {
-        desc.push('    ' + depPath)
-      }
-    }
-    return desc.join('\n')
-  }
-}
-
-
-export {
-  Watch
-}

package/model.ts

@@ -1,147 +0,0 @@
-/* Copyright © 2021-2023 Voxgig Ltd, MIT License. */
-
-// TODO: remove need for this
-import Fs from 'fs'
-
-
-import type { Build, BuildResult, BuildAction, BuildContext, Spec } from './lib/types'
-
-
-import { Config } from './lib/config'
-import { Watch } from './lib/watch'
-
-import { model_builder } from './lib/builder/model'
-import { local_builder } from './lib/builder/local'
-
-
-class Model {
-  config: Config
-  build: any
-  watch: Watch
-
-  trigger_model = false
-
-
-  constructor(spec: Spec) {
-    const self = this
-
-    // Config is a special Watch to handle model config.
-    this.config = makeConfig(spec, {
-      path: '/',
-      build: async function trigger_model(build: Build, ctx: BuildContext) {
-        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)
-        }
-        else {
-          self.trigger_model = true
-          res = { ok: true }
-        }
-
-        const watchmap = build.model?.sys?.model?.watch
-
-        if (watchmap) {
-          Object.keys(watchmap).map((file: string) => {
-            self.watch.add(file)
-          })
-        }
-
-        return res
-      }
-    })
-
-
-    // The actual model.
-    this.build = {
-      src: spec.src,
-      path: spec.path,
-      base: spec.base,
-      use: { config: self.config },
-      res: [
-        {
-          path: '/',
-          build: model_builder
-        },
-        {
-          path: '/',
-          build: local_builder
-        }
-      ],
-      require: spec.require
-    }
-
-
-    this.watch = new Watch(self.build)
-  }
-
-
-  async run(): Promise<BuildResult> {
-    this.trigger_model = false
-    const br = await this.config.run()
-    return br.ok ? this.watch.run(true) : br
-  }
-
-
-  async start() {
-    this.trigger_model = false
-
-    const br = await this.config.run()
-    // console.log('MODEL CONFIG START', br.ok)
-    return br.ok ? this.watch.start() : br
-  }
-
-
-  async stop() {
-    return this.watch.stop()
-  }
-}
-
-
-function makeConfig(spec: Spec, trigger_model_build: BuildAction) {
-  let cbase = spec.base + '/.model-config'
-  let cpath = cbase + '/model-config.jsonic'
-
-  // Build should load file
-  let src = Fs.readFileSync(cpath).toString()
-
-  let cspec: Spec = {
-    src: src,
-    path: cpath,
-    base: cbase,
-    res: [
-
-      // Generate full config model and save as a file.
-      {
-        path: '/',
-        build: model_builder
-      },
-
-      // Trigger main model build.
-      trigger_model_build
-    ],
-    require: spec.require
-  }
-
-  return new Config(cspec)
-}
-
-
-
-export {
-  Model,
-  Spec,
-}
-
-