@plotdb/srcbuild 0.0.71 → 0.1.0

package/dist/adapter.js

@@ -17,6 +17,7 @@ adapter = function(opt){
     on: {},
     by: {}
   };
+  this.failed = new Set();
   if (that = opt.getDependencies) {
     this.getDependencies = that;
   }
@@ -52,10 +53,7 @@ adapter.prototype = import$(Object.create(Object.prototype), {
       list = (this.getDependencies(file) || []).map(path.normalize);
     } catch (e$) {
       e = e$;
-      this.log.error(("analyse " + file + " failed: ").red);
-      this.log.error(e.message.toString());
-      throw ref$ = new Error(), ref$.name = 'lderror', ref$.id = 999, ref$;
-      return;
+      throw ref$ = new Error(e.message), ref$.name = 'lderror', ref$.id = 999, ref$.cause = e, ref$;
     }
     Array.from(this.depends.by[file] || []).map(function(f){
       if (this$.depends.on[f]) {
@@ -82,19 +80,52 @@ adapter.prototype = import$(Object.create(Object.prototype), {
         mtime: 0
       };
     });
+    ret.map(function(it){
+      return this$.failed['delete'](it.file);
+    });
     return this.purge(ret);
   },
+  depMtime: function(file, memo){
+    var recurse, this$ = this;
+    memo == null && (memo = {});
+    recurse = function(f){
+      var that, stat, e;
+      if ((that = memo[f]) != null) {
+        return that;
+      }
+      memo[f] = 0;
+      if (!fs.existsSync(f)) {
+        return memo[f] = 0;
+      }
+      try {
+        stat = fs.statSync(f);
+      } catch (e$) {
+        e = e$;
+        return memo[f] = 0;
+      }
+      return memo[f] = Math.max.apply(Math, [+stat.mtime].concat(Array.from(this$.depends.by[f] || []).map(function(n){
+        return recurse(n);
+      })));
+    };
+    return recurse(file);
+  },
   change: function(files, opt){
-    var affectedFiles, mtimes, queue, ret, now, file, e, mtime, this$ = this;
+    var affectedFiles, queued, queue, push, now, file, analysed, e, memo, ret, this$ = this;
     opt == null && (opt = {});
     affectedFiles = new Set();
-    mtimes = {};
-    queue = (Array.isArray(files)
+    queued = new Set();
+    queue = [];
+    push = function(f){
+      if (!queued.has(f)) {
+        queued.add(f);
+        return queue.push(f);
+      }
+    };
+    files = Array.isArray(files)
       ? files
-      : [files]).map(function(it){
-      return it;
-    });
-    ret = [];
+      : [files];
+    files.map(push);
+    Array.from(this.failed).map(push);
     now = Date.now();
     while (queue.length) {
       file = queue.pop();
@@ -102,68 +133,52 @@ adapter.prototype = import$(Object.create(Object.prototype), {
         continue;
       }
       if (this.isSupported(file)) {
+        analysed = true;
         try {
           this.logDependencies(file);
         } catch (e$) {
           e = e$;
-          if (e.name === 'lderror' && e.id === 999) {
-            continue;
+          if (!(e.name === 'lderror' && e.id === 999)) {
+            throw e;
           }
+          analysed = false;
+        }
+        if (analysed) {
+          if (this.failed.has(file)) {
+            this.failed['delete'](file);
+            this.log.info((file + " analysed successfully. dependency recovered.").green);
+          }
+        } else if (!this.failed.has(file)) {
+          this.failed.add(file);
+          this.log.error(("analyse " + file + " failed. will retry on next change.").red);
         }
       }
       affectedFiles.add(file);
-      mtime = opt.force
-        ? now
-        : fs.existsSync(file) ? fs.statSync(file).mtime : now;
-      if (!mtimes[file] || mtimes[file] < mtime) {
-        mtimes[file] = mtime;
-      }
       if (opt.nonRecursive) {
         continue;
       }
-      Array.from(this.depends.on[file] || []).map(fn$);
+      Array.from(this.depends.on[file] || []).map(push);
     }
+    memo = {};
     ret = Array.from(affectedFiles).filter(function(it){
       return this$.isSupported(it);
     }).map(function(it){
       return {
         file: it,
-        mtime: mtimes[it]
+        mtime: opt.force
+          ? now
+          : this$.depMtime(it, memo)
       };
     });
     return Promise.resolve(ret.length ? this.build(ret) : null);
-    function fn$(f){
-      if (!mtimes[f] || mtimes[f] < mtimes[file]) {
-        mtimes[f] = mtimes[file];
-      }
-      return queue.push(f);
-    }
   },
   dirtyCheck: function(files){
-    var mtimes, recurse, this$ = this;
-    mtimes = {};
-    recurse = function(file){
-      var that, stat, e;
-      if (that = mtimes[file]) {
-        return that;
-      }
-      if (!fs.existsSync(file)) {
-        return 0;
-      }
-      try {
-        stat = fs.statSync(file);
-      } catch (e$) {
-        e = e$;
-        return 0;
-      }
-      return mtimes[file] = Math.max.apply(Math, [+stat.mtime].concat(Array.from(this$.depends.by[file] || []).map(function(f){
-        return recurse(f);
-      })));
-    };
+    var memo, this$ = this;
+    memo = {};
     return this.build(files.map(function(file){
       return {
         file: file,
-        mtime: recurse(file)
+        mtime: this$.depMtime(file, memo)
       };
     }));
   },
@@ -205,9 +220,11 @@ adapter.prototype = import$(Object.create(Object.prototype), {
           this$.logDependencies(file);
         } catch (e$) {
           e = e$;
-          if (e.name === 'lderror' && e.id === 999) {
-            continue;
+          if (!(e.name === 'lderror' && e.id === 999)) {
+            throw e;
           }
+          this$.failed.add(file);
+          this$.log.error(("analyse " + file + " failed. will retry on next change.").red);
         }
         results$.push(initBuilds.push(file));
       }

package/dist/ext/bundle.js

@@ -1,11 +1,13 @@
 // Generated by LiveScript 1.6.0
-var path, uglifyJs, uglifycss, debounce, base, aux, fs, spec, specmgr, build;
+var path, crypto, uglifyJs, uglifycss, debounce, base, aux, hashstore, fs, spec, specmgr, build;
 path = require('path');
+crypto = require('crypto');
 uglifyJs = require('uglify-js');
 uglifycss = require('uglifycss');
 debounce = require('@loadingio/debounce.js');
 base = require('./base');
 aux = require('../aux');
+hashstore = require('../hashstore');
 fs = require("fs-extra");
 spec = function(o){
   var ref$;
@@ -55,9 +57,13 @@ spec.prototype = import$(Object.create(Object.prototype), {
   }
 });
 specmgr = function(o){
+  var this$ = this;
   o == null && (o = {});
   this.log = o.log;
   this.cachedir = o.cachedir;
+  this.clearDirty = debounce(1000, function(){
+    return this$.flushDirty();
+  });
   this.evthdr = {};
   this._ = {};
   this.codesrc = {};
@@ -105,19 +111,21 @@ specmgr.prototype = import$(Object.create(Object.prototype), {
     this._dirty.add(this.key(o));
     return this.clearDirty();
   },
-  clearDirty: debounce(1000, function(){
+  flushDirty: function(){
     var specs, this$ = this;
     specs = Array.from(this._dirty).map(function(k){
       return this$.get(k);
     }).filter(function(it){
       return it;
     });
-    this.fire('build-by-spec', specs);
+    this.fire('build-by-spec', specs, {
+      force: true
+    });
     specs.map(function(s){
       return s.syncCache();
     });
     return this._dirty.clear();
-  }),
+  },
   add: function(o, opt){
     var k, that, s, this$ = this;
     o == null && (o = {});
@@ -163,8 +171,9 @@ specmgr.prototype = import$(Object.create(Object.prototype), {
   hasCode: function(f){
     return !!this.codesrc[f] || !!this.deps[f];
   },
-  touchCode: function(files){
+  touchCode: function(files, opt){
     var keys, this$ = this;
+    opt == null && (opt = {});
     files = Array.isArray(files)
       ? files
       : [files];
@@ -186,10 +195,12 @@ specmgr.prototype = import$(Object.create(Object.prototype), {
     });
     return this.fire('build-by-spec', Array.from(keys).map(function(k){
       return this$.get(k);
-    }));
+    }).filter(function(it){
+      return it;
+    }), opt);
   },
   update: function(o){
-    var k, dirty, s, this$ = this;
+    var k, dirty, s, i$, ref$, len$, f, next, this$ = this;
     o == null && (o = {});
     k = this.key(o);
     dirty = false;
@@ -208,6 +219,11 @@ specmgr.prototype = import$(Object.create(Object.prototype), {
       : [o.src]).filter(function(it){
       return it;
     });
+    for (i$ = 0, len$ = (ref$ = ['codesrc', 'deps']).length; i$ < len$; ++i$) {
+      f = ref$[i$];
+      next = new Set(o[f] || []);
+      s[f].forEach(fn$);
+    }
     s.codesrc = new Set(o.codesrc || []);
     s.deps = new Set(o.deps || []);
     (Array.isArray(o.specsrc)
@@ -240,15 +256,54 @@ specmgr.prototype = import$(Object.create(Object.prototype), {
       this.setDirty(s);
     }
     return dirty;
+    function fn$(n){
+      var u;
+      if (next.has(n)) {
+        return;
+      }
+      u = {
+        spec: s
+      };
+      u[f] = n;
+      return this$.unlink(u);
+    }
+  },
+  setDeps: function(spec, list){
+    var next, this$ = this;
+    next = new Set(list || []);
+    if (Array.from(spec.deps).sort().join(',') === Array.from(next).sort().join(',')) {
+      return false;
+    }
+    spec.deps.forEach(function(n){
+      if (!next.has(n)) {
+        return this$.unlink({
+          deps: n,
+          spec: spec
+        });
+      }
+    });
+    spec.deps = next;
+    next.forEach(function(n){
+      return this$.link({
+        deps: n,
+        spec: spec
+      });
+    });
+    spec.syncCache();
+    this.log.info("bundle " + this.key(spec) + " dependencies updated ( " + next.size + " )");
+    return true;
   },
   get: function(o){
     o == null && (o = {});
     return this._[this.key(o)];
   },
   'delete': function(o){
-    var s, this$ = this;
+    var k, s, fn, this$ = this;
     o == null && (o = {});
-    s = this._[this.key(o)];
+    k = this.key(o);
+    if (!(s = this._[k])) {
+      return;
+    }
     s.codesrc.forEach(function(n){
       return this$.unlink({
         codesrc: n,
@@ -267,7 +322,14 @@ specmgr.prototype = import$(Object.create(Object.prototype), {
         spec: s
       });
     });
-    return this.setDirty(o);
+    delete this._[k];
+    this._dirty['delete'](k);
+    fn = this.getCacheName(s);
+    if (fs.existsSync(fn)) {
+      fs.unlinkSync(fn);
+    }
+    this.log.info("bundle spec " + k + " removed. " + fn + " deleted.");
+    return this.fire('delete', s);
   },
   link: function(o){
     var f, s, that;
@@ -292,7 +354,7 @@ specmgr.prototype = import$(Object.create(Object.prototype), {
     if (!(s = this[f][o[f]])) {
       return;
     }
-    s.remove(this.key(o.spec));
+    s['delete'](this.key(o.spec));
     if (s.size) {
       return;
     }
@@ -303,14 +365,19 @@ specmgr.prototype = import$(Object.create(Object.prototype), {
     if (!(s = this.specsrc[n])) {
       return;
     }
-    s.forEach(function(k){
+    Array.from(s).forEach(function(k){
       var spec;
       if (!(spec = this$.get(k))) {
         return;
       }
-      spec.unlink({
-        specsrc: n
+      spec.specsrc['delete'](n);
+      this$.unlink({
+        specsrc: n,
+        spec: spec
       });
+      if (!spec.specsrc.size) {
+        return this$['delete'](k);
+      }
       return this$.setDirty(k);
     });
     return ref1$ = (ref$ = this.specsrc)[n], delete ref$[n], ref1$;
@@ -331,6 +398,7 @@ build = function(o){
     : o.manager;
   this.defcfg = o.config || null;
   this.cachedir = path.join(o.base || '.', '.bundle-dep');
+  this.store = o.store || null;
   this.cfgfn = o.configFile ? path.join(o.base || '.', o.configFile) : null;
   this.reldir = typeof o.relativePath === 'string'
     ? o.relativePath
@@ -343,6 +411,18 @@ build = function(o){
   return this;
 };
 build.prototype = import$(Object.create(base.prototype), {
+  manifestUrl: function(arg$){
+    var type, name, min, ref$, des, desMin;
+    type = arg$.type, name = arg$.name, min = (ref$ = arg$.min) != null ? ref$ : true;
+    if (!this.store) {
+      return null;
+    }
+    ref$ = this.desPath({
+      name: name,
+      type: type
+    }), des = ref$.des, desMin = ref$.desMin;
+    return this.store.get(this.store.urlOf(min ? desMin : des));
+  },
   getPath: function(f){
     var version, p;
     if (typeof f === 'string') {
@@ -372,11 +452,15 @@ build.prototype = import$(Object.create(base.prototype), {
       cachedir: this.cachedir,
       log: this.log
     });
-    return this.specmgr.on('build-by-spec', function(specs){
+    this.specmgr.on('build-by-spec', function(specs, opt){
+      opt == null && (opt = {});
       return specs.forEach(function(spec){
-        return this$.buildBySpec(spec);
+        return this$.buildBySpec(spec, opt);
       });
     });
+    return this.specmgr.on('delete', function(spec){
+      return this$.purgeOutputs(spec);
+    });
   },
   loadCfg: function(opt){
     var cfgs, cfg, e, i$, len$, ref$, fn, lresult$, type, lresult1$, name, list, codesrc, results$ = [], this$ = this;
@@ -464,7 +548,7 @@ build.prototype = import$(Object.create(base.prototype), {
     });
   },
   delSpecsrc: function(n){
-    return specmgr.delSpecsrc(n);
+    return this.specmgr.delSpecsrc(n);
   },
   addSpec: function(opts){
     var this$ = this;
@@ -518,6 +602,24 @@ build.prototype = import$(Object.create(base.prototype), {
       }
     });
   },
+  purgeOutputs: function(arg$){
+    var name, type, ref$, des, desMin, this$ = this;
+    name = arg$.name, type = arg$.type;
+    ref$ = this.desPath({
+      name: name,
+      type: type
+    }), des = ref$.des, desMin = ref$.desMin;
+    return [des, desMin].map(function(f){
+      if (this$.store) {
+        this$.store.drop(f);
+      }
+      if (!fs.existsSync(f)) {
+        return;
+      }
+      this$.log.info("bundle " + f + " removed with its spec.");
+      return fs.removeSync(f);
+    });
+  },
   getDependencies: function(file){
     return [];
   },
@@ -525,20 +627,27 @@ build.prototype = import$(Object.create(base.prototype), {
     return this.specmgr.hasCode(file);
   },
   purge: function(files){
-    return this.build(files);
+    return this.build(files, {
+      force: true
+    });
   },
   build: function(files, opt){
-    var force, this$ = this;
-    force = typeof opt === 'boolean' ? opt : false;
-    if (opt == null) {
-      opt = {};
+    var ref$, cfgs, rest, this$ = this;
+    opt = typeof opt === 'boolean'
+      ? {
+        force: opt
+      }
+      : opt || {};
+    ref$ = [[], []], cfgs = ref$[0], rest = ref$[1];
+    files.map(function(f){
+      return (f.file === this$.cfgfn ? cfgs : rest).push(f);
+    });
+    if (cfgs.length) {
+      this.loadCfg();
     }
-    if (files.filter(function(it){
-      return it.file === this$.cfgfn;
-    }).length) {
-      return this.loadCfg();
+    if (rest.length) {
+      return this.specmgr.touchCode(rest, opt);
     }
-    return this.specmgr.touchCode(files);
   },
   desPath: function(arg$){
     var name, type;
@@ -549,20 +658,37 @@ build.prototype = import$(Object.create(base.prototype), {
       type: type
     });
   },
-  buildBySpec: function(spec){
+  buildBySpec: function(spec, opt){
     var this$ = this;
+    opt == null && (opt = {});
     return Promise.resolve().then(function(){
-      var name, type, t1, srcs, ref$, desdir, des, desMin, ext;
+      var name, type, t1, srcs, watched, ref$, desdir, des, desMin, ext;
+      if (!spec) {
+        return;
+      }
       name = spec.name, type = spec.type;
       t1 = Date.now();
       srcs = Array.from(spec.codesrc);
+      watched = srcs.concat(Array.from(spec.deps));
       ref$ = this$.desPath({
         name: name,
         type: type
       }), desdir = ref$.desdir, des = ref$.des, desMin = ref$.desMin;
       ext = type === 'block' ? 'html' : type;
+      if (!opt.force && aux.newer(des, watched) && aux.newer(desMin, watched)) {
+        if (this$.store) {
+          [des, desMin].map(function(it){
+            return this$.store.ensure(it);
+          });
+        }
+        return {
+          type: type,
+          name: name,
+          skipped: true
+        };
+      }
       return fs.ensureDir(desdir).then(function(){
-        var ps;
+        var ref$, re, reMin, ps;
         if (type === 'block') {
           if (!this$.mgr || !this$.mgr.bundle) {
             throw new Error("block bundling requires manager of @plotdb/block provided via bundler option.");
@@ -570,15 +696,25 @@ build.prototype = import$(Object.create(base.prototype), {
           return this$.mgr.bundle({
             blocks: spec.src
           }).then(function(ret){
-            var code;
+            var deps, code;
+            if (ret.deps) {
+              deps = ret.deps;
+              this$.specmgr.setDeps(spec, ((deps.js || []).concat(deps.css || [], deps.block || [])).map(function(f){
+                return this$.getPath(f);
+              }));
+            }
             code = ret.code || ret;
-            return Promise.all([fs.writeFile(des, code), fs.writeFile(desMin, code)]);
+            return {
+              code: code,
+              codeMin: code
+            };
           });
         } else {
+          ref$ = [new RegExp("\\.min\\." + ext + "$"), new RegExp("\\." + ext + "$")], re = ref$[0], reMin = ref$[1];
           ps = srcs.map(function(f){
             var fMin;
-            f = f.replace(".min." + ext, "." + ext);
-            fMin = f.replace("." + ext, ".min." + ext);
+            f = f.replace(re, "." + ext);
+            fMin = f.replace(reMin, ".min." + ext);
             return fs.readFile(f)['catch'](function(){
               return "";
             }).then(function(b){
@@ -613,22 +749,34 @@ build.prototype = import$(Object.create(base.prototype), {
                   })
                   : o.code;
             }).join('');
-            return Promise.all([fs.writeFile(des, normal), fs.writeFile(desMin, minified)]);
+            return {
+              code: normal,
+              codeMin: minified
+            };
           });
         }
-      }).then(function(){
-        var ret, size, sizeMin, elapsed;
-        ret = {
+      }).then(function(arg$){
+        var code, codeMin;
+        code = arg$.code, codeMin = arg$.codeMin;
+        return Promise.all([fs.writeFile(des, code), fs.writeFile(desMin, codeMin)]).then(function(){
+          if (!this$.store) {
+            return {};
+          }
+          return {
+            code: this$.store.put(des, code),
+            min: this$.store.put(desMin, codeMin)
+          };
+        });
+      }).then(function(out){
+        var elapsed;
+        elapsed = Date.now() - t1;
+        this$.log.info("bundle " + des + " ( " + fs.statSync(des).size + " bytes / " + elapsed + "ms )");
+        this$.log.info("bundle " + desMin + " ( " + fs.statSync(desMin).size + " bytes / " + elapsed + "ms )");
+        return import$({
           type: type,
           name: name,
-          elapsed: Date.now() - t1,
-          size: fs.statSync(des).size,
-          sizeMin: fs.statSync(desMin).size
-        };
-        size = ret.size, sizeMin = ret.sizeMin, elapsed = ret.elapsed;
-        this$.log.info("bundle " + des + " ( " + size + " bytes / " + elapsed + "ms )");
-        this$.log.info("bundle " + desMin + " ( " + sizeMin + " bytes / " + elapsed + "ms )");
-        return ret;
+          elapsed: elapsed
+        }, out);
       })['catch'](function(e){
         this$.log.error((des + " failed: ").red);
         return this$.log.error({

package/dist/ext/lsc.js

@@ -15,6 +15,7 @@ browserify = null;
 lscbuild = function(opt){
   opt == null && (opt = {});
   this.useGlslify = opt.useGlslify;
+  this.store = opt.store;
   if (this.useGlslify && !glslify) {
     glslify = require("glslify");
     browserify = require("browserify");
@@ -57,6 +58,11 @@ lscbuild.prototype = import$(Object.create(base.prototype), {
       return Promise.resolve().then(function(){
         var code, desdir;
         if (!fs.existsSync(src) || aux.newer(des, mtime)) {
+          if (this$.store) {
+            [des, desMin].map(function(it){
+              return this$.store.ensure(it);
+            });
+          }
           return Promise.resolve();
         }
         code = fs.readFileSync(src).toString();
@@ -94,6 +100,10 @@ lscbuild.prototype = import$(Object.create(base.prototype), {
         codeMin = uglifyJs.minify(code).code || '';
         fs.writeFileSync(des, code);
         fs.writeFileSync(desMin, codeMin);
+        if (this$.store) {
+          this$.store.put(des, code);
+          this$.store.put(desMin, codeMin);
+        }
         t2 = Date.now();
         return this$.log.info(src + " --> " + des + " / " + desMin + " ( " + (t2 - t1) + "ms )");
       })['catch'](function(e){
@@ -111,6 +121,9 @@ lscbuild.prototype = import$(Object.create(base.prototype), {
     }
     return results$;
     function fn$(f){
+      if (this$.store) {
+        this$.store.drop(f);
+      }
       if (!fs.existsSync(f)) {
         return;
       }

package/dist/ext/pug.js

@@ -1,5 +1,5 @@
 // Generated by LiveScript 1.6.0
-var fs, path, fsExtra, pug, livescript, uglifyJs, uglifycss, stylus, jsYaml, marked, crypto, colors, base, aux, bundle, cwd, pugbuild;
+var fs, path, fsExtra, pug, livescript, uglifyJs, uglifycss, stylus, jsYaml, marked, crypto, colors, base, aux, bundle, hashstore, cwd, pugbuild;
 fs = require('fs');
 path = require('path');
 fsExtra = require('fs-extra');
@@ -15,6 +15,7 @@ colors = require('@plotdb/colors');
 base = require('./base');
 aux = require('../aux');
 bundle = require('./bundle');
+hashstore = require('../hashstore');
 cwd = process.cwd();
 pugbuild = function(opt){
   opt == null && (opt = {});
@@ -24,6 +25,8 @@ pugbuild = function(opt){
   this.locals = opt.locals || {};
   this.extapi = this.getExtapi();
   this.bundler = opt.bundler;
+  this.store = opt.store || null;
+  this.urlrefs = {};
   this.init(import$({
     srcdir: 'src/pug',
     desdir: 'static'
@@ -34,6 +37,85 @@ pugbuild = function(opt){
   return this;
 };
 pugbuild.prototype = import$(Object.create(base.prototype), {
+  refUrl: function(url, src){
+    var that;
+    if (!(url && src)) {
+      return;
+    }
+    return ((that = this.urlrefs[url])
+      ? that
+      : this.urlrefs[url] = new Set()).add(src);
+  },
+  invalidateUrl: function(url){
+    var s, files;
+    if (!(s = this.urlrefs[url]) || !s.size) {
+      return Promise.resolve();
+    }
+    files = Array.from(s).filter(function(it){
+      return fs.existsSync(it);
+    });
+    this.log.info(path.join(this.desdir, url) + " changed --> rebuilding " + files.length + " page(s)");
+    return this.adapter.change(files, {
+      force: true
+    });
+  },
+  getStore: function(){
+    if (typeof this.store === 'function') {
+      return this.store();
+    } else {
+      return this.store;
+    }
+  },
+  assetUrl: function(url){
+    var store;
+    if (store = this.getStore()) {
+      return store.get(url);
+    }
+    return this.loadManifest()[url] || null;
+  },
+  bundleUrl: function(arg$){
+    var type, name, min, ref$, des;
+    type = arg$.type, name = arg$.name, min = (ref$ = arg$.min) != null ? ref$ : true;
+    des = bundle.desPath({
+      desdir: this.desdir,
+      name: name,
+      type: type
+    });
+    return this.assetUrl(this.urlOf(min
+      ? des.desMin
+      : des.des));
+  },
+  urlOf: function(file){
+    return '/' + path.relative(this.desdir, path.normalize(file)).split(path.sep).join('/');
+  },
+  loadManifest: function(){
+    var fn, mtime, e, raw, res$, k, v;
+    fn = hashstore.manifestPath(this.base);
+    try {
+      mtime = +fs.statSync(fn).mtime;
+    } catch (e$) {
+      e = e$;
+      return this._manifest = {};
+    }
+    if (this._manifest && this._manifestMtime === mtime) {
+      return this._manifest;
+    }
+    try {
+      raw = JSON.parse(fs.readFileSync(fn).toString());
+      res$ = {};
+      for (k in raw) {
+        v = raw[k];
+        res$[k] = (v || {}).url;
+      }
+      this._manifest = res$;
+      this._manifestMtime = mtime;
+    } catch (e$) {
+      e = e$;
+      this.log.error(("parse error of hash manifest " + fn).red);
+      this._manifest = {};
+    }
+    return this._manifest;
+  },
   pugResolve: function(fn, src, opt){
     var e;
     try {
@@ -99,7 +181,7 @@ pugbuild.prototype = import$(Object.create(base.prototype), {
           });
           ret = "";
           opts.forEach(function(o){
-            var list, name, str, spec, des, relDesMin, relDes;
+            var list, name, str, spec, des, plain, url;
             list = o.files;
             list.forEach(function(d){
               if (!d.type) {
@@ -142,14 +224,18 @@ pugbuild.prototype = import$(Object.create(base.prototype), {
                 desdir: this$.desdir
               }, spec));
             }
-            relDesMin = path.relative(this$.desdir, des.desMin);
-            relDes = path.relative(this$.desdir, des.des);
+            plain = "/" + path.relative(this$.desdir, des.desMin);
+            this$.refUrl(plain, _opt.filename);
+            url = this$.bundleUrl({
+              type: o.type,
+              name: name
+            }) || plain;
             if (o.type === 'css') {
-              return ret += "<link rel=\"stylesheet\" type=\"text/css\" href=\"/" + relDesMin + "\"/>";
+              return ret += "<link rel=\"stylesheet\" type=\"text/css\" href=\"" + url + "\"/>";
             } else if (o.type === 'js') {
-              return ret += "<script type=\"text/javascript\" src=\"/" + relDesMin + "\"></script>";
+              return ret += "<script type=\"text/javascript\" src=\"" + url + "\"></script>";
             } else if (o.type === 'block') {
-              return ret += "<link rel=\"block\" href=\"/" + relDesMin + "\">";
+              return ret += "<link rel=\"block\" href=\"" + url + "\">";
             }
           });
           return ret;
@@ -213,6 +299,30 @@ pugbuild.prototype = import$(Object.create(base.prototype), {
       md5: function(str){
         return crypto.createHash('md5').update(str).digest('hex');
       },
+      bundleurl: function(arg$){
+        var type, name, min, ref$, src, d;
+        type = arg$.type, name = arg$.name, min = (ref$ = arg$.min) != null ? ref$ : true, src = arg$.src;
+        d = bundle.desPath({
+          desdir: this$.desdir,
+          name: name,
+          type: type
+        });
+        this$.refUrl(this$.urlOf(min
+          ? d.desMin
+          : d.des), src);
+        return this$.bundleUrl({
+          type: type,
+          name: name,
+          min: min
+        });
+      },
+      asseturl: function(url, src){
+        if (!url || /^(https?:)?\/\//.exec(url)) {
+          return url;
+        }
+        this$.refUrl(url, src);
+        return this$.assetUrl(url) || url;
+      },
       hashfile: function(arg$){
         var type, name, files, src, spec;
         type = arg$.type, name = arg$.name, files = arg$.files, src = arg$.src;
@@ -332,19 +442,29 @@ pugbuild.prototype = import$(Object.create(base.prototype), {
           : ((ref$ = this$.i18n).options || (ref$.options = {})).fallbackLng)
         : Promise.resolve();
       return p.then(function(){
-        var i$, ref$, len$, ref1$, file, mtime, src, desh, desv, code, t1, desvdir, opt, ret, t2, desdir, e, results$ = [];
+        var i$, ref$, len$, ref1$, file, mtime, src, desh, desv, code, outs, t1, desvdir, opt, ret, t2, desdir, e, results$ = [];
         for (i$ = 0, len$ = (ref$ = files).length; i$ < len$; ++i$) {
           ref1$ = ref$[i$], file = ref1$.file, mtime = ref1$.mtime;
           ref1$ = this$.map(file, intl), src = ref1$.src, desh = ref1$.desh, desv = ref1$.desv;
-          if (!fs.existsSync(src) || aux.newer(this$._noView ? desh : desv, mtime)) {
+          if (!fs.existsSync(src)) {
             continue;
           }
           code = fs.readFileSync(src).toString();
+          if (/^\/\/- ?module ?/.exec(code)) {
+            continue;
+          }
+          outs = [];
+          if (!this$._noView) {
+            outs.push(desv);
+          }
+          if (!/^\/\/- ?view ?/.exec(code)) {
+            outs.push(desh);
+          }
+          if (outs.length && outs.filter(fn$).length === outs.length) {
+            continue;
+          }
           try {
             t1 = Date.now();
-            if (/^\/\/- ?module ?/.exec(code)) {
-              continue;
-            }
             if (!this$._noView) {
               desvdir = path.dirname(desv);
               fsExtra.ensureDirSync(desvdir);
@@ -380,6 +500,9 @@ pugbuild.prototype = import$(Object.create(base.prototype), {
           }
         }
         return results$;
+        function fn$(it){
+          return aux.newer(it, mtime);
+        }
       });
     };
     lngs = [''].concat(this.i18n && this._buildIntl
@@ -412,6 +535,9 @@ pugbuild.prototype = import$(Object.create(base.prototype), {
         for (i$ = 0, len$ = (ref$ = files).length; i$ < len$; ++i$) {
           ref1$ = ref$[i$], file = ref1$.file, mtime = ref1$.mtime;
           ref1$ = this$.map(file, intl), src = ref1$.src, desh = ref1$.desh, desv = ref1$.desv;
+          if (this$.bundler) {
+            this$.bundler.delSpecsrc(src);
+          }
           results$.push([desh, desv].filter(fn$));
         }
         return results$;

package/dist/ext/stylus.js

@@ -11,6 +11,7 @@ aux = require('../aux');
 adapter = require('../adapter');
 stylusbuild = function(opt){
   opt == null && (opt = {});
+  this.store = opt.store;
   return this.init(import$({
     srcdir: 'src/styl',
     desdir: 'static/css'
@@ -59,6 +60,9 @@ stylusbuild.prototype = import$(Object.create(base.prototype), {
       ref$ = files[i$], file = ref$.file, mtime = ref$.mtime;
       ref$ = this.map(file), src = ref$.src, des = ref$.des, desMin = ref$.desMin;
       if (!fs.existsSync(src) || aux.newer(des, mtime)) {
+        if (this.store) {
+          [des, desMin].map(fn$);
+        }
         continue;
       }
       try {
@@ -69,7 +73,7 @@ stylusbuild.prototype = import$(Object.create(base.prototype), {
         }
         desdir = path.dirname(des);
         fsExtra.ensureDirSync(desdir);
-        results$.push(stylus(code).set('filename', src).render(fn$));
+        results$.push(stylus(code).set('filename', src).render(fn1$));
       } catch (e$) {
         e = e$;
         this.log.error((src + " failed: ").red);
@@ -77,7 +81,10 @@ stylusbuild.prototype = import$(Object.create(base.prototype), {
       }
     }
     return results$;
-    function fn$(e, css){
+    function fn$(it){
+      return this$.store.ensure(it);
+    }
+    function fn1$(e, css){
       var codeMin, t2;
       if (e) {
         throw e;
@@ -87,6 +94,10 @@ stylusbuild.prototype = import$(Object.create(base.prototype), {
       });
       fs.writeFileSync(des, css);
       fs.writeFileSync(desMin, codeMin);
+      if (this$.store) {
+        this$.store.put(des, css);
+        this$.store.put(desMin, codeMin);
+      }
       t2 = Date.now();
       return this$.log.info(src + " --> " + des + " / " + desMin + " ( " + (t2 - t1) + "ms )");
     }
@@ -100,6 +111,9 @@ stylusbuild.prototype = import$(Object.create(base.prototype), {
     }
     return results$;
     function fn$(f){
+      if (this$.store) {
+        this$.store.drop(f);
+      }
       if (!fs.existsSync(f)) {
         return;
       }

package/dist/hashstore.js

@@ -0,0 +1,228 @@
+// Generated by LiveScript 1.6.0
+var path, crypto, aux, fs, hashstore;
+path = require('path');
+crypto = require('crypto');
+aux = require('./aux');
+fs = require("fs-extra");
+hashstore = function(o){
+  var that;
+  o == null && (o = {});
+  this.base = o.base || '.';
+  this.root = path.normalize(o.root || path.join(this.base, 'static'));
+  this.fn = o.manifest || hashstore.manifestPath(this.base);
+  this.mode = o.mode === 'query' ? 'query' : 'filename';
+  this.keep = (that = o.keep) != null ? that : 3;
+  this.keepDays = (that = o.keepDays) != null ? that : 0;
+  this.log = o.logger || aux.logger;
+  this.evthdr = {};
+  this.load();
+  return this;
+};
+hashstore.manifestPath = function(base){
+  base == null && (base = '.');
+  return path.join(base, '.bundle-dep', 'manifest.json');
+};
+hashstore.normalizeGen = function(g){
+  if (Array.isArray(g)) {
+    return {
+      files: g,
+      at: 0
+    };
+  } else {
+    return {
+      files: g.files || [],
+      at: g.at || 0
+    };
+  }
+};
+hashstore.hashedName = function(name, hash){
+  var parts, at;
+  parts = name.split('.');
+  if (parts.length < 2) {
+    return name + "." + hash;
+  }
+  at = parts.length > 2 && parts[parts.length - 2] === 'min'
+    ? parts.length - 2
+    : parts.length - 1;
+  parts.splice(at, 0, hash);
+  return parts.join('.');
+};
+hashstore.prototype = import$(Object.create(Object.prototype), {
+  on: function(n, cb){
+    var this$ = this;
+    return (Array.isArray(n)
+      ? n
+      : [n]).map(function(n){
+      var ref$;
+      return ((ref$ = this$.evthdr)[n] || (ref$[n] = [])).push(cb);
+    });
+  },
+  fire: function(n){
+    var v, res$, i$, to$, ref$, len$, cb, results$ = [];
+    res$ = [];
+    for (i$ = 1, to$ = arguments.length; i$ < to$; ++i$) {
+      res$.push(arguments[i$]);
+    }
+    v = res$;
+    for (i$ = 0, len$ = (ref$ = this.evthdr[n] || []).length; i$ < len$; ++i$) {
+      cb = ref$[i$];
+      results$.push(cb.apply(this, v));
+    }
+    return results$;
+  },
+  urlOf: function(file){
+    return '/' + path.relative(this.root, path.normalize(file)).split(path.sep).join('/');
+  },
+  load: function(){
+    var e;
+    this.manifest = {};
+    if (!fs.existsSync(this.fn)) {
+      return;
+    }
+    try {
+      return this.manifest = JSON.parse(fs.readFileSync(this.fn).toString()) || {};
+    } catch (e$) {
+      e = e$;
+      this.log.error(("parse error of hash manifest " + this.fn).red);
+      return this.manifest = {};
+    }
+  },
+  save: function(){
+    var e;
+    try {
+      return fs.outputFileSync(this.fn, JSON.stringify(this.manifest, null, 2));
+    } catch (e$) {
+      e = e$;
+      return this.log.error(("failed to write " + this.fn + ": " + e.message).red);
+    }
+  },
+  get: function(url){
+    return (this.manifest[url] || {}).url || null;
+  },
+  ensure: function(file){
+    if (this.get(this.urlOf(file))) {
+      return null;
+    }
+    if (!fs.existsSync(file)) {
+      return null;
+    }
+    return this.put(file, fs.readFileSync(file));
+  },
+  hashedFileOf: function(url){
+    var e;
+    if (this.mode === 'query') {
+      return null;
+    }
+    if (!(e = this.manifest[url]) || !e.generations || !e.generations[0]) {
+      return null;
+    }
+    return hashstore.normalizeGen(e.generations[0]).files[0] || null;
+  },
+  put: function(file, code){
+    var url, hash, hashed, entry, prev, changed, now, cur, olds, gens, cutoff, ref$, kept, rest, dropped, alive, e, this$ = this;
+    url = this.urlOf(file);
+    hash = crypto.createHash('md5').update(code).digest('hex').substring(0, 12);
+    if (this.mode === 'query') {
+      return this.putQuery(url, hash);
+    }
+    hashed = path.join(path.dirname(file), hashstore.hashedName(path.basename(file), hash));
+    entry = {
+      url: this.urlOf(hashed)
+    };
+    prev = this.manifest[url] || {};
+    changed = prev.url !== entry.url;
+    now = Date.now();
+    cur = {
+      files: [hashed],
+      at: now
+    };
+    olds = (prev.generations || []).map(hashstore.normalizeGen);
+    gens = changed
+      ? [cur].concat(olds)
+      : [cur].concat(olds.slice(1));
+    cutoff = now - this.keepDays * 86400000;
+    ref$ = [gens.slice(0, this.keep), gens.slice(this.keep)], kept = ref$[0], rest = ref$[1];
+    gens = kept.concat(rest.filter(function(g){
+      return g.at > cutoff;
+    }));
+    dropped = rest.filter(function(g){
+      return !(g.at > cutoff);
+    });
+    alive = new Set([].concat.apply([], gens.map(function(it){
+      return it.files;
+    })));
+    try {
+      fs.outputFileSync(hashed, code);
+      [].concat.apply([], dropped.map(function(it){
+        return it.files;
+      })).filter(function(f){
+        return !alive.has(f);
+      }).map(function(f){
+        this$.log.info(f + " expired, deleted.");
+        try {
+          return fs.removeSync(f);
+        } catch (e$) {}
+      });
+      this.manifest[url] = (entry.generations = gens, entry);
+      this.save();
+    } catch (e$) {
+      e = e$;
+      this.log.error(("failed to write " + hashed + ": " + e.message).red);
+      return null;
+    }
+    if (changed) {
+      this.log.info(file + " --> " + hashed);
+      this.fire('change', {
+        url: url,
+        hashed: entry.url,
+        prev: prev.url || null
+      });
+    }
+    return ref$ = import$({}, entry), ref$.url = url, ref$.hashed = entry.url, ref$.changed = changed, ref$;
+  },
+  putQuery: function(url, hash){
+    var entry, prev, changed, ref$;
+    entry = {
+      url: url + "?v=" + hash
+    };
+    prev = this.manifest[url] || {};
+    changed = prev.url !== entry.url;
+    this.manifest[url] = (entry.generations = [], entry);
+    this.save();
+    if (changed) {
+      this.log.info(url + " --> " + entry.url);
+      this.fire('change', {
+        url: url,
+        hashed: entry.url,
+        prev: prev.url || null
+      });
+    }
+    return ref$ = import$({}, entry), ref$.url = url, ref$.hashed = entry.url, ref$.changed = changed, ref$;
+  },
+  drop: function(file){
+    var url, e, this$ = this;
+    url = this.urlOf(file);
+    if (!(e = this.manifest[url])) {
+      return;
+    }
+    delete this.manifest[url];
+    this.save();
+    return [].concat.apply([], (e.generations || []).map(hashstore.normalizeGen).map(function(it){
+      return it.files;
+    })).map(function(f){
+      if (!fs.existsSync(f)) {
+        return;
+      }
+      this$.log.info(f + " removed with its source.");
+      try {
+        return fs.removeSync(f);
+      } catch (e$) {}
+    });
+  }
+});
+module.exports = hashstore;
+function import$(obj, src){
+  var own = {}.hasOwnProperty;
+  for (var key in src) if (own.call(src, key)) obj[key] = src[key];
+  return obj;
+}

package/dist/lib.pug

@@ -32,14 +32,19 @@ mixin script(os,cfg)
           str = str + ';' + url;
           urls.push(url);
       else
-        script(type="text/javascript",src=url + libLoader._v, defer=defer, async=!!c.async)
+        - var hurl = (typeof(asseturl) == "function") ? asseturl(url, locals.filename) : url;
+        script(type="text/javascript",src=hurl + (hurl == url ? libLoader._v : ""), defer=defer, async=!!c.async)
   if cfg && cfg.pack
     -
       var name = md5(str);
-      //var filename = "/js/pack/" + name + "." + (typeof(cfg.min) == "undefined" || cfg.min ? "min" : "") + ".js";
-      var fn = "/assets/bundle/" + name + "." + (typeof(cfg.min) == "undefined" || cfg.min ? "min" : "") + ".js";
+      var min = (typeof(cfg.min) == "undefined" || cfg.min);
       hashfile({type: "js", name: name, files: urls, src: locals.filename});
-    script(type="text/javascript",src=fn + libLoader._v)
+      // content-addressed url when the bundle has been built. it needs no `_v`: the
+      // filename already changes with the content. before the first build there is no
+      // entry yet, so fall back to the plain name ( which does need `_v` ).
+      var fn = (typeof(bundleurl) == "function") ? bundleurl({type: "js", name: name, min: min, src: locals.filename}) : null;
+      if(!fn) { fn = "/assets/bundle/" + name + (min ? ".min" : "") + ".js" + libLoader._v; }
+    script(type="text/javascript",src=fn)
 
 mixin css(os,cfg)
   -
@@ -60,11 +65,13 @@ mixin css(os,cfg)
           str = str + ';' + url;
           urls.push(url);
       else
-        link(rel="stylesheet",type="text/css",href=url + libLoader._v)
+        - var hurl = (typeof(asseturl) == "function") ? asseturl(url, locals.filename) : url;
+        link(rel="stylesheet",type="text/css",href=hurl + (hurl == url ? libLoader._v : ""))
   if cfg && cfg.pack
     -
       var name = md5(str);
-      //var filename = "/css/pack/" + name + "." + (typeof(cfg.min) == "undefined" || cfg.min ? "min" : "") + ".css";
-      var fn = "/assets/bundle/" + name + "." + (typeof(cfg.min) == "undefined" || cfg.min ? "min" : "") + ".css";
+      var min = (typeof(cfg.min) == "undefined" || cfg.min);
       hashfile({type: "css", name: name, files: urls, src: locals.filename});
-    link(rel="stylesheet",type="text/css",href=fn + libLoader._v)
+      var fn = (typeof(bundleurl) == "function") ? bundleurl({type: "css", name: name, min: min, src: locals.filename}) : null;
+      if(!fn) { fn = "/assets/bundle/" + name + (min ? ".min" : "") + ".css" + libLoader._v; }
+    link(rel="stylesheet",type="text/css",href=fn)

package/dist/main.js

@@ -1,8 +1,9 @@
 // Generated by LiveScript 1.6.0
-var fs, i18n, watch, pug, stylus, lsc, bundle, asset, base;
+var fs, i18n, watch, hashstore, pug, stylus, lsc, bundle, asset, base;
 fs = require('fs');
 i18n = require('./i18n');
 watch = require('./watch');
+hashstore = require('./hashstore');
 pug = require('./ext/pug');
 stylus = require('./ext/stylus');
 lsc = require('./ext/lsc');
@@ -12,39 +13,60 @@ base = require('./ext/base');
 module.exports = {
   base: base,
   i18n: i18n,
+  hashstore: hashstore,
   lsp: function(opt){
-    var base, adapters, i$, len$, b, bundler, ref$, watcher;
+    var base, adapters, stores, watcher, ref$;
     opt == null && (opt = {});
     base = opt.base || 'web';
     base = Array.isArray(base)
       ? base
       : [base];
     adapters = [];
-    for (i$ = 0, len$ = base.length; i$ < len$; ++i$) {
-      b = base[i$];
-      bundler = new bundle(import$((ref$ = {
+    stores = [];
+    base.map(function(b){
+      var store, ref$, bundler, pugbuilder;
+      store = (opt.hash || {}).enabled ? new hashstore(import$((ref$ = {
         base: b
+      }, ref$.logger = opt.logger, ref$), opt.hash)) : null;
+      if (store) {
+        stores.push(store);
+      }
+      bundler = new bundle(import$((ref$ = {
+        base: b,
+        store: store
       }, ref$.logger = opt.logger, ref$.i18n = opt.i18n, ref$.ignored = opt.ignored, ref$), opt.bundle || {}));
+      pugbuilder = new pug(import$((ref$ = {
+        base: b,
+        bundler: bundler,
+        store: store
+      }, ref$.logger = opt.logger, ref$.i18n = opt.i18n, ref$.ignored = opt.ignored, ref$), opt.pug || {}));
+      if (store) {
+        store.on('change', function(arg$){
+          var url;
+          url = arg$.url;
+          return pugbuilder.invalidateUrl(url);
+        });
+      }
       adapters.push(bundler.getAdapter());
-      adapters = adapters.concat([
+      return adapters = adapters.concat([
         new lsc(import$((ref$ = {
-          base: b
+          base: b,
+          store: store
         }, ref$.logger = opt.logger, ref$.i18n = opt.i18n, ref$.ignored = opt.ignored, ref$), opt.lsc || {})), new stylus(import$((ref$ = {
-          base: b
-        }, ref$.logger = opt.logger, ref$.i18n = opt.i18n, ref$.ignored = opt.ignored, ref$), opt.stylus || {})), new pug(import$((ref$ = {
           base: b,
-          bundler: bundler
-        }, ref$.logger = opt.logger, ref$.i18n = opt.i18n, ref$.ignored = opt.ignored, ref$), opt.pug || {})), new asset(import$((ref$ = {
+          store: store
+        }, ref$.logger = opt.logger, ref$.i18n = opt.i18n, ref$.ignored = opt.ignored, ref$), opt.stylus || {})), pugbuilder, new asset(import$((ref$ = {
           base: b
         }, ref$.logger = opt.logger, ref$.i18n = opt.i18n, ref$.ignored = opt.ignored, ref$), opt.asset || {}))
-      ].map(fn$));
-    }
-    return watcher = new watch((ref$ = {
+      ].map(function(it){
+        return it.getAdapter();
+      }));
+    });
+    watcher = new watch((ref$ = {
       adapters: adapters
     }, ref$.logger = opt.logger, ref$.i18n = opt.i18n, ref$.ignored = opt.ignored, ref$));
-    function fn$(it){
-      return it.getAdapter();
-    }
+    watcher.stores = stores;
+    return watcher;
   }
 };
 function import$(obj, src){

package/dist/view/pug.js

@@ -16,7 +16,8 @@ pugViewEngine = function(options){
     srcdir: options.srcdir,
     desdir: options.desdir,
     base: options.base,
-    filters: options.filters
+    filters: options.filters,
+    store: options.store
   };
   for (k in opt) {
     v = opt[k];
@@ -24,7 +25,9 @@ pugViewEngine = function(options){
       delete opt[k];
     }
   }
-  builder = new pugbuild(opt);
+  builder = new pugbuild(import$({
+    initScan: false
+  }, opt));
   extapi = builder.getExtapi();
   logger = options.logger;
   pugcache = {};
@@ -39,7 +42,7 @@ pugViewEngine = function(options){
     if (opt.settings.env === 'development') {
       lc.dev = true;
     }
-    lc.useCache = true || opt.settings['view cache'];
+    lc.useCache = !!opt.settings['view cache'];
     intl = opt.i18n ? path.join("intl", opt._locals.language) : '';
     ref$ = builder.map(src, ''), src = ref$.src, desv = ref$.desv, desh = ref$.desh;
     startTime = Date.now();

package/package.json

@@ -1,7 +1,7 @@
 {
   "author": "zbryikt",
   "name": "@plotdb/srcbuild",
-  "version": "0.0.71",
+  "version": "0.1.0",
   "description": "",
   "main": "./dist/main.js",
   "files": [
@@ -13,7 +13,8 @@
   },
   "scripts": {
     "prepare": "mkdir -p ./node_modules/@plotdb/srcbuild/dist; cp dist/lib.pug ./node_modules/@plotdb/srcbuild/dist/",
-    "start": "./node_modules/.bin/lsc watch.ls"
+    "start": "./node_modules/.bin/lsc watch.ls",
+    "test": "node test/index.js"
   },
   "license": "MIT",
   "homepage": "https://github.com/plotdb/srcbuild",
@@ -56,7 +57,7 @@
     "bootstrap": "^4.6.1",
     "express": "^4.18.2",
     "fedep": "^1.6.0",
-    "jsdom": "^20.0.3",
+    "jsdom": "^26.1.0",
     "ldcolor": "^1.1.3",
     "ldcover": "^3.5.6",
     "ldloader": "^3.0.3",
@@ -81,5 +82,8 @@
       "ldcolor",
       "ldview"
     ]
+  },
+  "volta": {
+    "node": "20.20.2"
   }
 }