@voxgig/model 2.3.0 → 3.0.0

package/lib/watch.ts

@@ -3,17 +3,24 @@
 import Path from 'node:path'
 
 
-import { Build, BuildResult } from './build'
+import type { Build, BuildResult } from './types'
+
+import { makeBuild } from './build'
 import { FSWatcher } from 'chokidar'
 
 import { readFile } from 'fs/promises'
 
 
+const print = console.log
+const warn = console.warn
+
+
 class Watch {
   fsw: FSWatcher
   spec: any
   last?: BuildResult
   last_change_time: number
+  build: Build | undefined
 
   constructor(spec: any) {
     this.spec = spec
@@ -23,8 +30,11 @@ class Watch {
     const run = this.run.bind(this)
 
     this.fsw.on('change', () => {
+
+      // TODO: needs a much more robust queue that checks for dups,
+      // otherwise BuildContext state will have concurrency corruptions
       // Avoid rebuilding when, for example, TS rewrites all files in dist
-      if (55 < Date.now() - this.last_change_time) {
+      if (1 < Date.now() - this.last_change_time) {
         run()
       }
     })
@@ -35,14 +45,11 @@ class Watch {
     if (!Path.isAbsolute(file)) {
       file = Path.join(this.spec.require, file)
     }
-    // console.log('WATCH ADD', file)
     this.fsw.add(file)
   }
 
 
   update(br: BuildResult) {
-    // console.log('BUILD RESULT', br)
-
     let build = (br.build as Build)
 
     let files: string[] =
@@ -62,33 +69,34 @@ class Watch {
       }
     })
 
-    // setTimeout(() => {
-    //   console.log('WATCH', this.fsw.getWatched())
-    // }, 100)
-
   }
 
 
-  async start() {
-    await this.run(false)
+  // Returns first BuildResult
+  async start(): Promise<BuildResult> {
+    return await this.run(false)
   }
 
 
-  async run(once?: boolean) {
+  async run(once?: boolean): Promise<BuildResult> {
     this.last_change_time = Date.now()
-    console.log('\n@voxgig/model', new Date(this.last_change_time))
+    print('\n@voxgig/model', new Date(this.last_change_time))
 
     // TODO: build spec should not have src!
     let src = (await readFile(this.spec.path)).toString()
     this.spec.src = src
 
-    let build = new Build(this.spec)
-    let br: BuildResult = await build.run()
+    this.build = this.build || makeBuild(this.spec)
+
+    // TODO: better way to do this?
+    this.build.src = src
+
+    let br: BuildResult = await this.build.run()
 
-    console.log('\nFILES:\n' + this.descDeps((br as any).build.root.deps) + '\n')
+    print('\nFILES:\n' + this.descDeps((br as any).build.root.deps) + '\n')
 
     if (br.ok) {
-      console.log('TOP:', Object.keys(br?.build?.model).join(', '), '\n')
+      print('TOP:', Object.keys(br?.build?.model).join(', '), '\n')
 
       if (!once) {
         // There may be new files.
@@ -96,7 +104,7 @@ class Watch {
       }
     }
     else {
-      console.log('MODEL ERRORS: ' + br.err?.length)
+      warn('MODEL ERRORS: ' + br.err?.length)
       this.handleErrors(br)
     }
 
@@ -115,19 +123,23 @@ class Watch {
     if (br.err) {
       for (let be of br.err) {
         if (be.msg) {
-          console.log(be.msg)
+          warn(be.msg)
         }
         else if (be.message) {
-          console.log(be.message)
+          warn(be.message)
         }
         else {
-          console.log(be)
+          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)

package/model.ts

@@ -3,23 +3,16 @@
 // 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 { Build, BuildAction, BuildResult, Spec } from './lib/build'
 import { Watch } from './lib/watch'
 
 import { model_builder } from './lib/builder/model'
 import { local_builder } from './lib/builder/local'
 
-import {
-  dive,
-  joins,
-  get,
-  pinify,
-  camelify,
-} from '@voxgig/util'
-
-
-const intern = makeIntern()
 
 class Model {
   config: Config
@@ -30,33 +23,38 @@ class Model {
 
 
   constructor(spec: Spec) {
+    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: Build) => {
-        // console.log('CONFIG BUILD', build.model)
+      build: async function trigger_model(build: Build, ctx: BuildContext) {
+        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
+          self.build.use.config.watch.last.build = build
 
-          res = this.watch.run(true)
+          res = self.watch.run(true)
         }
         else {
-          this.trigger_model = true
+          self.trigger_model = true
           res = { ok: true }
         }
 
-        const watchmap = build.model.sys?.model?.watch
-        // console.log('WATCHMAP', watchmap)
+        const watchmap = build.model?.sys?.model?.watch
 
         if (watchmap) {
           Object.keys(watchmap).map((file: string) => {
-            this.watch.add(file)
+            self.watch.add(file)
           })
         }
 
@@ -70,7 +68,7 @@ class Model {
       src: spec.src,
       path: spec.path,
       base: spec.base,
-      use: { config: this.config },
+      use: { config: self.config },
       res: [
         {
           path: '/',
@@ -85,60 +83,60 @@ class Model {
     }
 
 
-    this.watch = new Watch(this.build)
+    this.watch = new Watch(self.build)
   }
 
+
   async run(): Promise<BuildResult> {
     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()
+  async start(): Promise<BuildResult> {
+    this.trigger_model = false
+    const br = await this.config.start()
+    return br.ok ? this.watch.start() : br
   }
 
+
   async stop() {
     return this.watch.stop()
   }
 }
 
 
-function makeIntern() {
-  return {
-    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()
+function makeConfig(spec: Spec, trigger_model_build: BuildAction) {
+  let cbase = spec.base + '/.model-config'
+  let cpath = cbase + '/model-config.jsonic'
 
-      let cspec: Spec = {
-        src: src,
-        path: cpath,
-        base: cbase,
-        res: [
+  // Build should load file
+  let src = Fs.readFileSync(cpath).toString()
 
-          // Generate full config model and save as a file.
-          {
-            path: '/',
-            build: model_builder
-          },
+  let cspec: Spec = {
+    src: src,
+    path: cpath,
+    base: cbase,
+    res: [
 
-          trigger_model_build
-        ],
-        require: spec.require
-      }
+      // Generate full config model and save as a file.
+      {
+        path: '/',
+        build: model_builder
+      },
 
-      return new Config(cspec)
-    }
+      // Trigger main model build.
+      trigger_model_build
+    ],
+    require: spec.require
   }
+
+  return new Config(cspec)
 }
 
 
+
 export {
   Model,
   Spec,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/model",
-  "version": "2.3.0",
+  "version": "3.0.0",
   "main": "dist/model.js",
   "type": "commonjs",
   "types": "dist/model.d.ts",
@@ -50,9 +50,9 @@
   },
   "devDependencies": {
     "@types/jest": "^29.5.12",
-    "@types/node": "22.3.0",
+    "@types/node": "22.5.0",
     "es-jest": "^2.1.0",
-    "esbuild": "^0.23.0",
+    "esbuild": "^0.23.1",
     "esbuild-jest": "^0.5.0",
     "jest": "^29.7.0",
     "typescript": "^5.5.4"