@voxgig/model 3.5.0 → 5.0.0

package/dist/watch.js

@@ -0,0 +1,227 @@
+"use strict";
+/* Copyright © 2021-2024 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.Watch = void 0;
+const node_path_1 = __importDefault(require("node:path"));
+const build_1 = require("./build");
+const chokidar_1 = require("chokidar");
+const promises_1 = require("fs/promises");
+const print = console.log;
+const warn = console.warn;
+class Watch {
+    constructor(wspec, log) {
+        this.wspec = wspec;
+        this.log = log;
+        this.name = wspec.name || 'model';
+        this.fsw = new chokidar_1.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 = wspec.idle || 111;
+        this.fsw.on('change', async (path) => {
+            // 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) {
+        for (const canon of this.canons) {
+            if (canon.isFolder && path.startsWith(canon.path)) {
+                return canon.path;
+            }
+        }
+        return path;
+    }
+    handleChange(path) {
+        // 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;
+        // 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(this.name, 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) {
+        if (!node_path_1.default.isAbsolute(path)) {
+            path = node_path_1.default.join(this.wspec.require, path);
+        }
+        // Ignore if aleady added
+        if (this.canons.find((c) => c.path === path)) {
+            return;
+        }
+        const fileStat = await (0, promises_1.stat)(path);
+        const canon = {
+            path: path,
+            isFolder: fileStat.isDirectory(),
+            when: Date.now()
+        };
+        this.canons.push(canon);
+        this.fsw.add(path);
+        // console.log('ADD', canon)
+    }
+    async update(br) {
+        let build = br.build;
+        let files = Object.keys(build.root.deps).reduce((files, target) => {
+            files = files.concat(Object.keys(build.root.deps[target]));
+            return files;
+        }, [build.path]);
+        // TODO: remove deleted files
+        files.forEach(async (file) => {
+            if ('string' === typeof (file) &&
+                '' !== file &&
+                build.opts.base !== file) {
+                await this.add(file);
+            }
+        });
+    }
+    async run(name, once, trigger) {
+        // console.trace()
+        this.lastChangeTime = Date.now();
+        // print('\n@voxgig/model =================', this.lastChangeTime, new Date(this.lastChangeTime))
+        // print('TRIGGER:', trigger, '\n')
+        this.log.info({
+            point: 'build-start', last: this.lastChangeTime, watch: name,
+            note: 'watch:' + name + ' last:' + new Date(this.lastChangeTime).toISOString()
+        });
+        this.log.info({
+            point: 'build-trigger', trigger,
+            note: 'watch:' + name + ' trigger:' + ('' + trigger).replace(process.cwd() + '/', '')
+        });
+        // TODO: build spec should not have src!
+        let src = (await (0, promises_1.readFile)(this.wspec.path)).toString();
+        this.wspec.src = src;
+        this.build = this.build || (0, build_1.makeBuild)(this.wspec, this.log);
+        // TODO: better way to do this?
+        this.build.src = src;
+        let br = await this.build.run();
+        // print('\nFILES:\n' + this.descDeps((br as any).build.root.deps) + '\n')
+        const deps = this.descDeps(br.build.root.deps);
+        this.log.debug({
+            point: 'deps', deps,
+            note: 'watch:' + name + ' deps:\n' + deps
+        });
+        if (br.ok) {
+            const rootkeys = Object.keys(br?.build?.model).join(';');
+            this.log.info({
+                point: 'root-keys', keys: rootkeys,
+                note: 'watch:' + name + ' keys: ' + rootkeys
+            });
+            // 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;
+        this.log.info({
+            point: 'build-end', watch: name,
+            note: 'watch:' + name + '\n',
+        });
+        return br;
+    }
+    async stop() {
+        await this.fsw.close();
+    }
+    handleErrors(br) {
+        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) {
+        if (null == deps) {
+            return '';
+        }
+        let cwd = process.cwd();
+        let desc = [];
+        for (let entryPath of Object.keys(deps)) {
+            desc.push('  ' + entryPath);
+            for (let depPath of Object.keys(deps[entryPath])) {
+                depPath = depPath.replace(cwd, '.');
+                desc.push('    ' + depPath);
+            }
+        }
+        return desc.join('\n');
+    }
+}
+exports.Watch = Watch;
+//# sourceMappingURL=watch.js.map

package/dist/watch.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/model",
-  "version": "3.5.0",
+  "version": "5.0.0",
   "main": "dist/model.js",
   "type": "commonjs",
   "types": "dist/model.d.ts",
@@ -19,16 +19,16 @@
     "url": "git://github.com/voxgig/model.git"
   },
   "scripts": {
-    "test": "jest --coverage",
-    "test-pure": "jest --coverage --config jest.config.pure.js",
-    "test-some": "jest -t",
-    "test-watch": "jest --coverage --watchAll",
+    "test": "node --enable-source-maps --test dist-test",
+    "test22": "node --enable-source-maps --test \"dist-test/*.test.js\"",
+    "test-some": "node --enable-source-maps --test-name-pattern=\"$npm_config_pattern\" --test dist-test",
+    "test-cov": "rm -rf ./coverage && mkdir -p ./coverage && node --experimental-test-coverage --test-reporter=spec --test-reporter-destination=stdout --test-reporter=lcov --test-reporter-destination=coverage/lcov.info --enable-source-maps --test \"dist-test/*.test.js\"",
+    "watch": "tsc --build src test -w",
+    "build": "tsc --build src test",
     "test-model": "voxgig-model test/sys01/model/model.jsonic",
-    "model": "voxgig-model model/sys.jsonic",
-    "model-build": "voxgig-model model/sys.jsonic --once",
-    "watch": "tsc -w -d",
-    "build": "tsc -d",
-    "clean": "rm -rf node_modules yarn.lock package-lock.json",
+    "model": "voxgig-model -w model/sys.jsonic",
+    "model-build": "voxgig-model -g debug model/sys.jsonic",
+    "clean": "rm -rf node_modules dist dist-test yarn.lock package-lock.json",
     "reset": "npm run clean && npm i && npm run build && npm test",
     "repo-tag": "REPO_VERSION=`node -e \"console.log(require('./package').version)\"` && echo TAG: v$REPO_VERSION && git commit -a -m v$REPO_VERSION && git push && git tag v$REPO_VERSION && git push --tags;",
     "repo-publish": "npm run clean && npm i && npm run repo-publish-quick",
@@ -44,17 +44,16 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@voxgig/util": "^0.0.3",
-    "aontu": "0.22.0",
-    "chokidar": "4.0.1"
+    "aontu": "0.25.0",
+    "chokidar": "4.0.1",
+    "gubu": "^8.3.0"
+  },
+  "peerDependencies": {
+    "@voxgig/util": ">=0"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.13",
-    "@types/node": "22.6.1",
-    "es-jest": "^2.1.0",
-    "esbuild": "^0.24.0",
-    "esbuild-jest": "^0.5.0",
-    "jest": "^29.7.0",
-    "typescript": "^5.6.2"
+    "@types/node": "22.9.0",
+    "typescript": "^5.6.3",
+    "@hapi/code": "^9.0.3"
   }
 }

package/dist/lib/build.js.map

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

package/dist/lib/builder/local.js.map

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

package/dist/lib/builder/model.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../lib/builder/model.ts"],"names":[],"mappings":";;;;;;AACA,gDAAuB;AAEvB,0CAAuC;AAKvC,iDAAiD;AACjD,MAAM,aAAa,GAAY,KAAK,EAAE,KAAY,EAAE,GAAiB,EAAE,EAAE;IACvE,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,CAAA;IACpD,CAAC;IAED,IAAI,CAAC;QACH,IAAI,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QAEpD,IAAI,QAAQ,GAAG,cAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACxC,IAAI,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QACnD,IAAI,aAAa,EAAE,CAAC;YAClB,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA;QAC7B,CAAC;QAED,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,QAAQ,GAAG,OAAO,CAAA;QAErD,MAAM,IAAA,oBAAS,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QAE3B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;IACnD,CAAC;IACD,OAAO,CAAM,EAAE,CAAC;QACd,MAAM,CAAC,CAAA;IACT,CAAC;AACH,CAAC,CAAA;AAGC,sCAAa"}

package/dist/lib/config.d.ts

@@ -1,11 +0,0 @@
-import type { BuildResult, Spec } from './types';
-import { Watch } from './watch';
-declare class Config {
-    build: any;
-    watch: Watch;
-    constructor(spec: Spec);
-    run(): Promise<BuildResult>;
-    start(): Promise<BuildResult>;
-    stop(): Promise<void>;
-}
-export { Config, Spec };

package/dist/lib/config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../lib/config.ts"],"names":[],"mappings":";AAAA,oDAAoD;;;AAKpD,mCAA+B;AAS/B,MAAM,MAAM;IAIV,YAAY,IAAU;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;gBACH,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC;aACpB;YACD,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAA;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,aAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACpC,CAAC;IAED,KAAK,CAAC,GAAG;QACP,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAC7B,CAAC;IAED,KAAK,CAAC,KAAK;QACT,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;IAC3B,CAAC;IAED,KAAK,CAAC,IAAI;QACR,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;IAC1B,CAAC;CACF;AAGQ,wBAAM"}

package/dist/lib/model-builder.js

@@ -1,2 +0,0 @@
-"use strict";
-//# sourceMappingURL=model-builder.js.map

package/dist/lib/model-builder.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"model-builder.js","sourceRoot":"","sources":["../../lib/model-builder.ts"],"names":[],"mappings":""}

package/dist/lib/types.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=types.js.map

package/dist/lib/types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../lib/types.ts"],"names":[],"mappings":""}

package/dist/lib/util.d.ts

@@ -1,7 +0,0 @@
-type DiveMapper = (path: any[], leaf: any) => any[];
-declare function dive(node: any, depth?: number | DiveMapper, mapper?: DiveMapper): any[];
-declare function joins(arr: any[], ...seps: string[]): string;
-declare function get(root: any, path: string | string[]): any;
-declare function pinify(path: string[]): string;
-declare function camelify(input: any[] | string): string;
-export { dive, joins, get, pinify, camelify, };

package/dist/lib/util.js

@@ -1,94 +0,0 @@
-"use strict";
-/* Copyright © 2021-2023 Voxgig Ltd, MIT License. */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.camelify = exports.pinify = exports.get = exports.joins = exports.dive = void 0;
-function dive(node, depth, mapper) {
-    let d = (null == depth || 'number' != typeof depth) ? 2 : depth;
-    mapper = 'function' === typeof depth ? depth : mapper;
-    let items = [];
-    Object.entries(node || {}).reduce((items, entry) => {
-        let key = entry[0];
-        let child = entry[1];
-        // console.log('CHILD', d, key, child)
-        if ('$' === key) {
-            // console.log('BBB', d)
-            items.push([[], child]);
-        }
-        else if (d <= 1 ||
-            null == child ||
-            'object' !== typeof child ||
-            0 === Object.keys(child).length) {
-            // console.log('AAA', d)
-            items.push([[key], child]);
-        }
-        else {
-            // console.log('CCC', d)
-            let children = dive(child, d - 1);
-            children = children.map(child => {
-                child[0].unshift(key);
-                return child;
-            });
-            items.push(...children);
-        }
-        return items;
-    }, items);
-    // console.log('ITEMS', items)
-    if (mapper) {
-        return items.reduce(((a, entry) => {
-            entry = mapper(entry[0], entry[1]);
-            if (null != entry[0]) {
-                a[entry[0]] = entry[1];
-            }
-            return a;
-        }), {});
-    }
-    return items;
-}
-exports.dive = dive;
-/*
- * , => a,b
- * :, => a:1,b:2
- * :,/ => a:1,b:2/c:3,d:4/e:5,f:6
-*/
-function joins(arr, ...seps) {
-    arr = arr || [];
-    seps = seps || [];
-    let sa = [];
-    for (let i = 0; i < arr.length; i++) {
-        sa.push(arr[i]);
-        if (i < arr.length - 1) {
-            for (let j = seps.length - 1; -1 < j; j--) {
-                if (0 === (i + 1) % (1 << j)) {
-                    sa.push(seps[j]);
-                    break;
-                }
-            }
-        }
-    }
-    return sa.join('');
-}
-exports.joins = joins;
-function get(root, path) {
-    path = 'string' === typeof path ? path.split('.') : path;
-    let node = root;
-    for (let i = 0; i < path.length && null != node; i++) {
-        node = node[path[i]];
-    }
-    return node;
-}
-exports.get = get;
-function pinify(path) {
-    let pin = path
-        .map((p, i) => p + (i % 2 ? (i === path.length - 1 ? '' : ',') : ':'))
-        .join('');
-    return pin;
-}
-exports.pinify = pinify;
-function camelify(input) {
-    let parts = 'string' == typeof input ? input.split('-') : input.map(n => '' + n);
-    return parts
-        .map((p) => ('' === p ? '' : (p[0].toUpperCase() + p.substring(1))))
-        .join('');
-}
-exports.camelify = camelify;
-//# sourceMappingURL=util.js.map

package/dist/lib/util.js.map

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

package/dist/lib/watch.js

@@ -1,172 +0,0 @@
-"use strict";
-/* Copyright © 2021-2024 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.Watch = void 0;
-const node_path_1 = __importDefault(require("node:path"));
-const build_1 = require("./build");
-const chokidar_1 = require("chokidar");
-const promises_1 = require("fs/promises");
-const print = console.log;
-const warn = console.warn;
-class Watch {
-    constructor(spec) {
-        this.spec = spec;
-        this.fsw = new chokidar_1.FSWatcher();
-        this.last_change_time = 0;
-        this.runq = [];
-        this.doneq = [];
-        this.canons = [];
-        this.running = false;
-        // const run = this.run.bind(this)
-        const drain = this.drain.bind(this);
-        this.fsw.on('change', async (path) => {
-            // 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
-            // const dorun = 1111 < Date.now() - this.last_change_time
-            // console.log('CHANGE', dorun, this.last_change_time, args)
-            const canon = this.canon(path);
-            const running = this.runq.find((run) => run.canon === canon);
-            if (running) {
-                // console.log('RUNNING', canon, path)
-                return;
-            }
-            this.runq.push({
-                canon,
-                path,
-                start: Date.now(),
-                end: -1,
-            });
-            // console.log('RUNQ-ADD', this.runq)
-            setImmediate(drain);
-        });
-    }
-    async drain() {
-        if (this.running) {
-            return;
-        }
-        this.running = true;
-        let r;
-        while (r = this.runq[0]) {
-            // console.log('DRAIN')
-            let br = await this.run(false, r.canon);
-            // console.log('BR', br)
-            this.runq.shift();
-            r.end = Date.now();
-            this.doneq.push(r);
-            // console.log('DONEQ', this.doneq)
-        }
-        this.running = false;
-    }
-    async add(path) {
-        if (!node_path_1.default.isAbsolute(path)) {
-            path = node_path_1.default.join(this.spec.require, path);
-        }
-        // Ignore if aleady added
-        if (this.canons.find((c) => c.path === path)) {
-            return;
-        }
-        const fileStat = await (0, promises_1.stat)(path);
-        const canon = {
-            path: path,
-            isFolder: fileStat.isDirectory(),
-            when: Date.now()
-        };
-        this.canons.push(canon);
-        this.fsw.add(path);
-        // console.log('ADD', canon)
-    }
-    // If path is inside a watched folder, return folder as canonical reference.
-    canon(path) {
-        for (const canon of this.canons) {
-            if (canon.isFolder && path.startsWith(canon.path)) {
-                return canon.path;
-            }
-        }
-        return path;
-    }
-    async update(br) {
-        let build = br.build;
-        let files = Object.keys(build.root.deps).reduce((files, target) => {
-            files = files.concat(Object.keys(build.root.deps[target]));
-            return files;
-        }, [build.path]);
-        // TODO: remove deleted files
-        files.forEach(async (file) => {
-            if ('string' === typeof (file) &&
-                '' !== file &&
-                build.opts.base !== file) {
-                await this.add(file);
-            }
-        });
-    }
-    // Returns first BuildResult
-    async start() {
-        return await this.run(false, '<start>');
-    }
-    async run(once, trigger) {
-        // console.trace()
-        var _a, _b;
-        this.last_change_time = Date.now();
-        print('\n@voxgig/model', this.last_change_time, new Date(this.last_change_time));
-        print('TRIGGER:', trigger, '\n');
-        // TODO: build spec should not have src!
-        let src = (await (0, promises_1.readFile)(this.spec.path)).toString();
-        this.spec.src = src;
-        this.build = this.build || (0, build_1.makeBuild)(this.spec);
-        // TODO: better way to do this?
-        this.build.src = src;
-        let br = await this.build.run();
-        print('\nFILES:\n' + this.descDeps(br.build.root.deps) + '\n');
-        if (br.ok) {
-            print('TOP:', Object.keys((_a = br === null || br === void 0 ? void 0 : br.build) === null || _a === void 0 ? void 0 : _a.model).join(', '), '\n');
-            if (!once) {
-                // There may be new files.
-                await this.update(br);
-            }
-        }
-        else {
-            warn('MODEL ERRORS: ' + ((_b = br.err) === null || _b === void 0 ? void 0 : _b.length));
-            this.handleErrors(br);
-        }
-        this.last = br;
-        return br;
-    }
-    async stop() {
-        await this.fsw.close();
-    }
-    handleErrors(br) {
-        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) {
-        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');
-    }
-}
-exports.Watch = Watch;
-//# sourceMappingURL=watch.js.map