@plotdb/srcbuild 0.0.56 → 0.0.57

package/dist/ext/bundle.js

@@ -1,237 +1,612 @@
 // Generated by LiveScript 1.6.0
-var fs, path, fsExtra, uglifyJs, uglifycss, colors, base, aux, adapter, bundlebuild;
-fs = require('fs');
+var path, uglifyJs, uglifycss, debounce, base, aux, fs, spec, specmgr, build;
 path = require('path');
-fsExtra = require('fs-extra');
 uglifyJs = require('uglify-js');
 uglifycss = require('uglifycss');
-colors = require('@plotdb/colors');
+debounce = require('@loadingio/debounce.js');
 base = require('./base');
 aux = require('../aux');
-adapter = require('../adapter');
-bundlebuild = function(opt){
-  opt == null && (opt = {});
-  this.config = opt.config || {
-    css: {},
-    js: {}
-  };
-  this.configFile = opt.configFile || null;
-  this._relativePath = typeof opt.relativePath === 'string'
-    ? opt.relativePath
-    : opt.relativePath && this.configFile
-      ? path.dirname(this.configFile)
+fs = require("fs-extra");
+spec = function(o){
+  var ref$;
+  o == null && (o = {});
+  this.mgr = o.manager;
+  this.log = o.log;
+  this.o = JSON.parse(JSON.stringify({
+    name: o.name,
+    type: o.type,
+    codesrc: o.codesrc,
+    specsrc: o.specsrc,
+    deps: o.deps
+  }));
+  this.type = (ref$ = this.o).type;
+  this.name = ref$.name;
+  this.src = (Array.isArray(o.src)
+    ? o.src
+    : [o.src]).filter(function(it){
+    return it;
+  });
+  this.codesrc = new Set(this.o.codesrc || []);
+  this.specsrc = new Set(this.o.specsrc || []);
+  this.deps = new Set(this.o.deps || []);
+  return this;
+};
+spec.prototype = import$(Object.create(Object.prototype), {
+  toObject: function(){
+    var ref$;
+    return ref$ = {
+      codesrc: Array.from(this.codesrc),
+      specsrc: Array.from(this.specsrc),
+      deps: Array.from(this.deps)
+    }, ref$.type = this.type, ref$.name = this.name, ref$;
+  },
+  cacheFn: function(){
+    return this.mgr.getCacheName(this);
+  },
+  syncCache: function(){
+    var fn, this$ = this;
+    fn = this.cacheFn();
+    return fs.ensureDir(path.dirname(fn)).then(function(){
+      fs.writeFile(fn, JSON.stringify(this$.toObject()));
+      return this$.log.info("bundle dependency written to " + fn);
+    });
+  }
+});
+specmgr = function(o){
+  o == null && (o = {});
+  this.log = o.log;
+  this.cachedir = o.cachedir;
+  this.evthdr = {};
+  this._ = {};
+  this.codesrc = {};
+  this.specsrc = {};
+  this.deps = {};
+  this._dirty = new Set();
+  return this;
+};
+specmgr.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$;
+  },
+  key: function(o){
+    o == null && (o = {});
+    if (typeof o === 'object') {
+      return o.type + "/" + o.name;
+    } else {
+      return o;
+    }
+  },
+  getCacheName: function(spec){
+    return path.join(this.cachedir, spec.type, spec.name + ".dep");
+  },
+  setDirty: function(o){
+    o == null && (o = {});
+    this._dirty.add(this.key(o));
+    return this.clearDirty();
+  },
+  clearDirty: debounce(1000, 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);
+    specs.map(function(s){
+      return s.syncCache();
+    });
+    return this._dirty.clear();
+  }),
+  add: function(o, opt){
+    var k, that, s, this$ = this;
+    o == null && (o = {});
+    opt == null && (opt = {});
+    k = this.key(o);
+    if (that = this._[k] && !opt.force) {
+      return that;
+    }
+    this._[k] = s = new spec(import$({
+      log: this.log,
+      manager: this
+    }, o));
+    s.codesrc.forEach(function(n){
+      return this$.link({
+        codesrc: n,
+        spec: s
+      });
+    });
+    s.specsrc.forEach(function(n){
+      return this$.link({
+        specsrc: n,
+        spec: s
+      });
+    });
+    s.deps.forEach(function(n){
+      return this$.link({
+        deps: n,
+        spec: s
+      });
+    });
+    if (!opt.init) {
+      this.setDirty(s);
+    }
+    return s;
+  },
+  set: function(o, opt){
+    o == null && (o = {});
+    opt == null && (opt = {});
+    return this.add(o, import$({
+      force: true
+    }, opt));
+  },
+  hasCode: function(f){
+    return !!this.codesrc[f] || !!this.deps[f];
+  },
+  touchCode: function(files){
+    var keys, this$ = this;
+    files = Array.isArray(files)
+      ? files
+      : [files];
+    keys = new Set();
+    files.map(function(f){
+      if (typeof f === 'object') {
+        f = f.file;
+      }
+      if (this$.codesrc[f]) {
+        Array.from(this$.codesrc[f]).forEach(function(k){
+          return keys.add(k);
+        });
+      }
+      if (this$.deps[f]) {
+        return Array.from(this$.deps[f]).forEach(function(k){
+          return keys.add(k);
+        });
+      }
+    });
+    return this.fire('build-by-spec', Array.from(keys).map(function(k){
+      return this$.get(k);
+    }));
+  },
+  update: function(o){
+    var k, dirty, s, this$ = this;
+    o == null && (o = {});
+    k = this.key(o);
+    dirty = false;
+    if (!(s = this._[k])) {
+      this.add(o);
+      return true;
+    }
+    if (Array.from(s.codesrc).join(',') !== (o.codesrc || []).join(',')) {
+      dirty = true;
+    }
+    if (s.src.join(',') !== (o.src || []).join(',')) {
+      dirty = true;
+    }
+    s.src = (Array.isArray(o.src)
+      ? o.src
+      : [o.src]).filter(function(it){
+      return it;
+    });
+    s.codesrc = new Set(o.codesrc || []);
+    s.deps = new Set(o.deps || []);
+    (Array.isArray(o.specsrc)
+      ? o.specsrc
+      : [o.specsrc]).forEach(function(n){
+      if (!s.specsrc.has(n)) {
+        dirty = true;
+      }
+      return s.specsrc.add(n);
+    });
+    s.codesrc.forEach(function(n){
+      return this$.link({
+        codesrc: n,
+        spec: s
+      });
+    });
+    s.specsrc.forEach(function(n){
+      return this$.link({
+        specsrc: n,
+        spec: s
+      });
+    });
+    s.deps.forEach(function(n){
+      return this$.link({
+        deps: n,
+        spec: s
+      });
+    });
+    if (dirty) {
+      this.setDirty(s);
+    }
+    return dirty;
+  },
+  get: function(o){
+    o == null && (o = {});
+    return this._[this.key(o)];
+  },
+  'delete': function(o){
+    var s, this$ = this;
+    o == null && (o = {});
+    s = this._[this.key(o)];
+    s.codesrc.forEach(function(n){
+      return this$.unlink({
+        codesrc: n,
+        spec: s
+      });
+    });
+    s.specsrc.forEach(function(n){
+      return this$.unlink({
+        specsrc: n,
+        spec: s
+      });
+    });
+    s.deps.forEach(function(n){
+      return this$.unlink({
+        deps: n,
+        spec: s
+      });
+    });
+    return this.setDirty(o);
+  },
+  link: function(o){
+    var f, s, that;
+    o == null && (o = {});
+    f = o.codesrc
+      ? 'codesrc'
+      : o.specsrc ? 'specsrc' : 'deps';
+    s = (that = this[f][o[f]])
+      ? that
+      : this[f][o[f]] = new Set();
+    if (!s) {
+      return;
+    }
+    return s.add(this.key(o.spec));
+  },
+  unlink: function(o){
+    var f, s, ref$, key$, ref1$;
+    o == null && (o = {});
+    f = o.codesrc
+      ? 'codesrc'
+      : o.specsrc ? 'specsrc' : 'deps';
+    if (!(s = this[f][o[f]])) {
+      return;
+    }
+    s.remove(this.key(o.spec));
+    if (s.size) {
+      return;
+    }
+    return ref1$ = (ref$ = this[f])[key$ = o[f]], delete ref$[key$], ref1$;
+  },
+  delSpecsrc: function(n){
+    var s, ref$, ref1$, this$ = this;
+    if (!(s = this.specsrc[n])) {
+      return;
+    }
+    s.forEach(function(k){
+      var spec;
+      if (!(spec = this$.get(k))) {
+        return;
+      }
+      spec.unlink({
+        specsrc: n
+      });
+      return this$.setDirty(k);
+    });
+    return ref1$ = (ref$ = this.specsrc)[n], delete ref$[n], ref1$;
+  }
+});
+build = function(o){
+  o == null && (o = {});
+  this.mgr = o.manager;
+  this.defcfg = o.config || null;
+  this.cachedir = path.join(o.base || '.', '.bundle-dep');
+  this.cfgfn = o.configFile ? path.join(o.base || '.', o.configFile) : null;
+  this.reldir = typeof o.relativePath === 'string'
+    ? o.relativePath
+    : o.relativePath && this.cfgfn
+      ? path.dirname(this.cfgfn)
       : process.cwd();
-  this.prepareConfig();
-  return this.init(import$({
+  this.log = o.logger || aux.logger;
+  this.reload();
+  this.init(import$({
     srcdir: 'static',
     desdir: 'static'
-  }, opt));
+  }, o));
+  return this;
 };
-bundlebuild.prototype = import$(Object.create(base.prototype), {
-  prepareConfig: function(){
-    var e, type, name, ref$, list, i$, len$, f, this$ = this;
-    if (this.configFile && fs.existsSync(this.configFile)) {
+build.prototype = import$(Object.create(base.prototype), {
+  getPath: function(f){
+    var version, p;
+    if (typeof f === 'string') {
+      return f;
+    }
+    if (this.mgr) {
+      return this.mgr.getUrl(f);
+    }
+    version = f.version || 'main';
+    p = f.path
+      ? f.path
+      : f.type === 'css'
+        ? 'index.min.css'
+        : f.type === 'block' ? 'index.html' : 'index.min.js';
+    return path.join(this.desdir, "assets/lib/" + f.name + "/" + version + "/" + p);
+  },
+  reload: function(){
+    this.reset();
+    this.loadCfg({
+      init: true
+    });
+    return this.loadCaches();
+  },
+  reset: function(){
+    var this$ = this;
+    this.specmgr = new specmgr({
+      cachedir: this.cachedir,
+      log: this.log
+    });
+    return this.specmgr.on('build-by-spec', function(specs){
+      return specs.forEach(function(spec){
+        return this$.buildBySpec(spec);
+      });
+    });
+  },
+  loadCfg: function(opt){
+    var cfgs, cfg, e, i$, len$, ref$, fn, lresult$, type, lresult1$, name, list, codesrc, results$ = [], this$ = this;
+    opt == null && (opt = {});
+    cfgs = opt.init
+      ? [['', this.defcfg]]
+      : [];
+    if (this.cfgfn && fs.existsSync(this.cfgfn)) {
       try {
-        this.config = JSON.parse(fs.readFileSync(this.configFile).toString());
+        cfg = JSON.parse(fs.readFileSync(this.cfgfn).toString());
       } catch (e$) {
         e = e$;
-        (this.log ? this.log : console).error(("bundle failed: parse error of config file " + this.configFile).red);
-        this.config = {};
+        this.log.error(("parse error of config file " + this.cfgfn).red);
+        cfg = {};
       }
+      cfgs.push([this.cfgfn, cfg]);
     }
-    if (typeof this._relativePath === 'string') {
-      for (type in this.config) {
-        for (name in ref$ = this.config[type]) {
+    for (i$ = 0, len$ = cfgs.length; i$ < len$; ++i$) {
+      ref$ = cfgs[i$], fn = ref$[0], cfg = ref$[1];
+      lresult$ = [];
+      for (type in cfg) {
+        lresult1$ = [];
+        for (name in ref$ = cfg[type]) {
           list = ref$[name];
-          this.config[type][name] = list.map(fn$);
+          codesrc = list.map(fn$);
+          lresult1$.push(this.specmgr.update({
+            type: type,
+            name: name,
+            src: list,
+            codesrc: codesrc,
+            deps: [fn],
+            specsrc: [fn]
+          }));
         }
+        lresult$.push(lresult1$);
       }
+      results$.push(lresult$);
     }
-    this.fileList = new Set();
-    this.fileMap = {};
-    for (type in this.config) {
-      for (name in ref$ = this.config[type]) {
-        list = ref$[name];
-        for (i$ = 0, len$ = list.length; i$ < len$; ++i$) {
-          f = list[i$];
-          this.fileList.add(f);
-          this.fileMap[f] = {
-            type: type,
-            name: name
-          };
-        }
+    return results$;
+    function fn$(n){
+      if (typeof n === 'string') {
+        return path.join(this$.reldir, n);
+      } else {
+        return this$.getPath(n);
       }
     }
-    return this.fileList.add(this.configFile);
-    function fn$(f){
-      return path.join(this$._relativePath, f);
+  },
+  loadCaches: function(){
+    var traverse, files, this$ = this;
+    if (!fs.existsSync(this.cachedir)) {
+      return;
     }
+    traverse = function(dir){
+      var files, ret, i$, len$, file;
+      files = fs.readdirSync(dir).map(function(n){
+        return path.join(dir, n);
+      });
+      ret = [];
+      for (i$ = 0, len$ = files.length; i$ < len$; ++i$) {
+        file = files[i$];
+        if (fs.statSync(file).isDirectory()) {
+          ret = ret.concat(traverse(file));
+        }
+        if (/\.dep$/.exec(file)) {
+          ret.push(file);
+        }
+      }
+      return ret;
+    };
+    files = traverse(this.cachedir);
+    return files.forEach(function(n){
+      var json, e;
+      try {
+        json = JSON.parse(fs.readFileSync(n).toString());
+      } catch (e$) {
+        e = e$;
+        console.log(e);
+        this$.log.error(("parse error of cache file " + n).red);
+      }
+      return this$.specmgr.set(json, {
+        init: true
+      });
+    });
+  },
+  delSpecsrc: function(n){
+    return specmgr.delSpecsrc(n);
+  },
+  addSpec: function(opts){
+    var this$ = this;
+    opts == null && (opts = []);
+    opts = (Array.isArray(opts)
+      ? opts
+      : [opts]).filter(function(it){
+      return it;
+    });
+    return opts.map(function(o){
+      var codesrc, specsrc, deps, ref$, ref1$;
+      if (o.type === 'block') {
+        return this$.mgr.bundle({
+          blocks: o.codesrc || (o.codesrc = [])
+        }).then(function(r){
+          var deps, codesrc, specsrc, ref$, ref1$;
+          if (!(r && r.deps)) {
+            this$.log.warn("block bundle requires block > 4.8.0 to work properly");
+          }
+          deps = r.deps || {
+            js: [],
+            css: [],
+            block: []
+          };
+          deps = (deps.js.concat(deps.css, deps.block)).map(function(f){
+            return this$.getPath(f);
+          });
+          codesrc = (o.src || (o.src = [])).map(function(f){
+            return this$.getPath(f);
+          });
+          specsrc = Array.isArray(o.specsrc)
+            ? o.specsrc
+            : [o.specsrc];
+          return this$.specmgr.update((ref$ = (ref1$ = {}, ref1$.name = o.name, ref1$.type = o.type, ref1$.src = o.src, ref1$), ref$.codesrc = codesrc, ref$.specsrc = specsrc, ref$.deps = deps, ref$));
+        });
+      } else {
+        codesrc = (o.src || (o.src = [])).map(function(f){
+          return this$.getPath(f);
+        });
+        specsrc = (Array.isArray(o.specsrc)
+          ? o.specsrc
+          : [o.specsrc]).filter(function(it){
+          return it;
+        });
+        deps = (Array.isArray(o.deps)
+          ? o.deps
+          : [o.deps]).filter(function(it){
+          return it;
+        });
+        return this$.specmgr.update((ref$ = (ref1$ = {}, ref1$.name = o.name, ref1$.type = o.type, ref1$.src = o.src, ref1$), ref$.codesrc = codesrc, ref$.specsrc = specsrc, ref$.deps = deps, ref$));
+      }
+    });
   },
   getDependencies: function(file){
-    return file === this.configFile
-      ? []
-      : [this.configFile];
+    return [];
   },
   isSupported: function(file){
-    return this.fileList.has(file);
+    return this.specmgr.hasCode(file);
   },
-  resolve: function(file){
-    var re, ret;
-    re = new RegExp("^" + this.desdir + "/(css|js)/pack/(.+?)(.min)?.(css|js)");
-    if (!(ret = re.exec(file))) {
-      return null;
-    }
-    return (this.config[ret[1]][ret[2]] || [])[0];
+  purge: function(files){
+    return this.build(files);
   },
   build: function(files, opt){
-    var force, dirty, key$, nfs, ofs, ref$, i$, len$, file, ret, ps, type, name, desdir, des, this$ = this;
+    var force, this$ = this;
     force = typeof opt === 'boolean' ? opt : false;
     if (opt == null) {
       opt = {};
     }
     if (files.filter(function(it){
-      return it.file === this$.configFile;
+      return it.file === this$.cfgfn;
     }).length) {
-      this.prepareConfig();
-      files = Array.from(this.fileList).map(function(it){
-        return {
-          file: it
-        };
-      });
-      files.splice(files.indexOf(this.configFile), 1);
-      return this.build(files, true);
-    }
-    if (opt.odb) {
-      dirty = {};
-      (dirty[key$ = opt.type] || (dirty[key$] = {}))[opt.name] = true;
-      nfs = files.map(function(f){
-        return path.join(this$._relativePath, f);
-      });
-      ofs = ((ref$ = this.config)[key$ = opt.type] || (ref$[key$] = {}))[opt.name] || [];
-      if (nfs.length !== ofs.length || nfs.filter(function(it){
-        return !in$(it, ofs);
-      }).length) {
-        force = true;
-      }
-      ((ref$ = this.config)[key$ = opt.type] || (ref$[key$] = {}))[opt.name] = nfs;
-      for (i$ = 0, len$ = (ref$ = this.config[opt.type][opt.name]).length; i$ < len$; ++i$) {
-        file = ref$[i$];
-        this.fileMap[file] = {
-          type: opt.type,
-          name: opt.name
-        };
-        this.fileList.add(file);
-      }
-    } else {
-      dirty = {};
-      for (i$ = 0, len$ = files.length; i$ < len$; ++i$) {
-        file = files[i$];
-        if (!(ret = this.fileMap[file.file])) {
-          continue;
-        }
-        (dirty[key$ = ret.type] || (dirty[key$] = {}))[ret.name] = true;
-      }
+      return this.loadCfg();
     }
-    ps = [];
-    for (type in dirty) {
-      for (name in dirty[type]) {
-        desdir = path.join(this.desdir, type, 'pack');
-        des = path.join(desdir, name + "." + type);
-        if (!force && aux.newer(des, (this.config[type][name] || []).concat([this.configFile]))) {
-          continue;
-        }
-        ps.push(this.buildByName({
-          type: type,
-          name: name
-        }));
-      }
-    }
-    return Promise.all(ps);
+    return this.specmgr.touchCode(files);
   },
-  buildByName: function(arg$){
-    var name, type, this$ = this;
+  desPath: function(arg$){
+    var name, type, _desdir, ext, des, desMin, desdir;
     name = arg$.name, type = arg$.type;
+    _desdir = path.join(this.desdir, 'assets', 'bundle');
+    ext = type === 'block' ? 'html' : type;
+    des = path.join(_desdir, name + "." + ext);
+    desMin = path.join(_desdir, name + ".min." + ext);
+    desdir = path.dirname(des);
+    return {
+      desdir: desdir,
+      des: des,
+      desMin: desMin
+    };
+  },
+  buildBySpec: function(spec){
+    var this$ = this;
     return Promise.resolve().then(function(){
-      var t1, srcs, desdir, des, desMin;
+      var name, type, t1, srcs, ref$, desdir, des, desMin, ext;
+      name = spec.name, type = spec.type;
       t1 = Date.now();
-      srcs = this$.config[type][name];
-      desdir = path.join(this$.desdir, type, 'pack');
-      des = path.join(desdir, name + "." + type);
-      desMin = path.join(desdir, name + ".min." + type);
-      return Promise.resolve().then(function(){
-        return new Promise(function(res, rej){
-          return fsExtra.ensureDir(desdir, function(){
-            return res();
+      srcs = Array.from(spec.codesrc);
+      ref$ = this$.desPath({
+        name: name,
+        type: type
+      }), desdir = ref$.desdir, des = ref$.des, desMin = ref$.desMin;
+      ext = type === 'block' ? 'html' : type;
+      return fs.ensureDir(desdir).then(function(){
+        var ps;
+        if (type === 'block') {
+          return this$.mgr.bundle({
+            blocks: spec.src
+          }).then(function(ret){
+            var code;
+            code = ret.code || ret;
+            return Promise.all([fs.writeFile(des, code), fs.writeFile(desMin, code)]);
           });
-        });
-      }).then(function(){
-        return Promise.all([
-          Promise.all(srcs.map(function(f){
-            return new Promise(function(res, rej){
-              return fs.readFile(f, function(e, b){
-                if (e) {
-                  return rej(e);
-                } else {
-                  return res({
-                    name: f,
-                    code: b.toString()
-                  });
-                }
-              });
-            });
-          })), Promise.all(srcs.map(function(f){
-            return new Promise(function(res, rej){
-              var fm;
-              fm = f.replace(/\.(js|css)$/, '.min.$1');
-              return fs.readFile(fm, function(e, b){
-                if (e) {
-                  return fs.readFile(f, function(e, b){
-                    if (e) {
-                      return rej(e);
-                    } else {
-                      return res({
-                        name: fm,
-                        code: b.toString()
-                      });
-                    }
-                  });
-                } else {
-                  return res({
-                    name: f,
-                    code: b.toString()
-                  });
-                }
+        } else {
+          ps = srcs.map(function(f){
+            var fMin;
+            f = f.replace(".min." + ext, "." + ext);
+            fMin = f.replace("." + ext, ".min." + ext);
+            return fs.readFile(f)['catch'](function(){
+              return "";
+            }).then(function(b){
+              return fs.readFile(fMin)['catch'](function(){
+                return "";
+              }).then(function(bm){
+                return {
+                  name: f,
+                  code: b.toString(),
+                  codeMin: bm.toString()
+                };
               });
             });
-          }))
-        ]);
-      }).then(function(ret){
-        var normal, minified;
-        normal = ret[0].map(function(it){
-          return it.code;
-        }).join('');
-        minified = ret[1].map(function(arg$){
-          var name, code;
-          name = arg$.name, code = arg$.code;
-          return /\.min\./.exec(name)
-            ? code
-            : type === 'js'
-              ? uglifyJs.minify(code).code
-              : type === 'css' ? uglifycss.processString(code, {
-                uglyComments: true
-              }) : code;
-        }).join('');
-        return Promise.all([
-          new Promise(function(res, rej){
-            return fs.writeFile(des, normal, function(e, b){
-              return res(b);
-            });
-          }), new Promise(function(res, rej){
-            return fs.writeFile(desMin, minified, function(e, b){
-              return res(b);
-            });
-          })
-        ]);
+          });
+          return Promise.all(ps).then(function(ret){
+            var normal, minified;
+            normal = ret.map(function(it){
+              return it.code || it.codeMin;
+            }).join('');
+            minified = ret.map(function(o){
+              if (o.codeMin) {
+                return o.codeMin;
+              }
+              if (!o.code) {
+                return "";
+              }
+              return type === 'js'
+                ? uglifyJs.minify(o.code).code
+                : type === 'css'
+                  ? uglifycss.processString(o.code, {
+                    uglyComments: true
+                  })
+                  : o.code;
+            }).join('');
+            return Promise.all([fs.writeFile(des, normal), fs.writeFile(desMin, minified)]);
+          });
+        }
       }).then(function(){
         var ret, size, sizeMin, elapsed;
         ret = {
@@ -242,27 +617,19 @@ bundlebuild.prototype = import$(Object.create(base.prototype), {
           sizeMin: fs.statSync(desMin).size
         };
         size = ret.size, sizeMin = ret.sizeMin, elapsed = ret.elapsed;
-        this$.log.info("bundle " + desdir + "/" + name + "." + type + " ( " + size + " bytes / " + elapsed + "ms )");
-        this$.log.info("bundle " + desdir + "/" + name + ".min." + type + " ( " + sizeMin + " bytes / " + elapsed + "ms )");
+        this$.log.info("bundle " + des + " ( " + size + " bytes / " + elapsed + "ms )");
+        this$.log.info("bundle " + desMin + " ( " + sizeMin + " bytes / " + elapsed + "ms )");
         return ret;
       })['catch'](function(e){
         this$.log.error((des + " failed: ").red);
         return this$.log.error(e.message.toString());
       });
     });
-  },
-  purge: function(files){
-    return this.build(files);
   }
 });
-module.exports = bundlebuild;
+module.exports = build;
 function import$(obj, src){
   var own = {}.hasOwnProperty;
   for (var key in src) if (own.call(src, key)) obj[key] = src[key];
   return obj;
-}
-function in$(x, xs){
-  var i = -1, l = xs.length >>> 0;
-  while (++i < l) if (x === xs[i]) return true;
-  return false;
 }

package/dist/ext/pug.js

@@ -85,6 +85,66 @@ pugbuild.prototype = import$(Object.create(base.prototype), {
         }
       }],
       filters: import$(this.filters || {}, {
+        'bundle': function(text, _opt){
+          var opts, ret;
+          opts = Array.isArray(_opt.options)
+            ? _opt.options
+            : [_opt.options];
+          opts = opts.filter(function(it){
+            var ref$;
+            return it && ((ref$ = it.type) === 'js' || ref$ === 'css' || ref$ === 'block');
+          });
+          ret = "";
+          opts.forEach(function(o){
+            var list, name, str, spec, des, relDesMin, relDes;
+            list = o.files;
+            list.forEach(function(d){
+              if (!d.type) {
+                return d.type = o.type;
+              }
+            });
+            if (o.type === 'block' && !(o.sort != null || o.sort)) {
+              list.sort(function(a, b){
+                var i$, ref$, len$, n, ref1$, c, d;
+                for (i$ = 0, len$ = (ref$ = ['ns', 'name', 'version', 'path']).length; i$ < len$; ++i$) {
+                  n = ref$[i$];
+                  ref1$ = [a[n] || '', b[n] || ''], c = ref1$[0], d = ref1$[1];
+                  if (c < d) {
+                    return -1;
+                  } else if (c > d) {
+                    return 1;
+                  }
+                }
+                return 0;
+              });
+            }
+            if (o.name) {
+              name = o.name;
+            } else {
+              str = (o.type + ":") + list.join(';');
+              name = crypto.createHash('md5').update(str).digest('hex');
+              name = path.join(name.substring(0, 4), name.substring(4));
+            }
+            spec = {
+              name: name,
+              type: o.type,
+              src: list,
+              specsrc: _opt.filename
+            };
+            this$.bundler.addSpec(spec);
+            des = this$.bundler.desPath(spec);
+            relDesMin = path.relative(this$.desdir, des.desMin);
+            relDes = path.relative(this$.desdir, des.des);
+            if (o.type === 'css') {
+              return ret += "<link rel=\"stylesheet\" type=\"text/css\" href=\"/" + relDesMin + "\"/>";
+            } else if (o.type === 'js') {
+              return ret += "<script type=\"text/javascript\" src=\"/" + relDesMin + "\"></script>";
+            } else if (o.type === 'block') {
+              return ret += "<link rel=\"block\" href=\"/" + relDesMin + "\">";
+            }
+          });
+          return ret;
+        },
         'lsc': function(text, opt){
           var code, codeMin;
           code = livescript.compile(text, {
@@ -145,19 +205,32 @@ pugbuild.prototype = import$(Object.create(base.prototype), {
         return crypto.createHash('md5').update(str).digest('hex');
       },
       hashfile: function(arg$){
-        var type, name, files;
-        type = arg$.type, name = arg$.name, files = arg$.files;
+        var type, name, files, src, spec;
+        type = arg$.type, name = arg$.name, files = arg$.files, src = arg$.src;
         if (!this$.bundler) {
           return;
         }
         files = files.map(function(file){
-          return path.relative(this$.base, path.join(this$.desdir, file));
+          if (/^https?:/.exec(file.url || file)) {
+            return file.url || file;
+          }
+          if (file.url || typeof file === 'string') {
+            return path.join(this$.desdir, file.url || file);
+          }
+          if (typeof file === 'object') {
+            return import$({
+              type: type
+            }, file);
+          }
+          return file;
         });
-        return this$.bundler.build(files, {
+        spec = {
           type: type,
           name: name,
-          odb: true
-        });
+          src: files,
+          specsrc: [src]
+        };
+        return this$.bundler.addSpec(spec);
       }
     };
     if (this.i18n) {
@@ -190,14 +263,15 @@ pugbuild.prototype = import$(Object.create(base.prototype), {
     return ret;
   },
   getDependencies: function(file){
-    var code, ret, root;
+    var code, opt, ret, root;
     code = fs.readFileSync(file);
-    ret = pug.compileClientWithDependenciesTracked(code, import$({
+    opt = import$({
       basedir: path.resolve(this.srcdir),
       filename: file,
       doctype: 'html',
       compileDebug: false
-    }, this.extapi));
+    }, this.extapi);
+    ret = pug.compileClientWithDependenciesTracked(code, opt);
     root = path.resolve('.') + '/';
     return (ret.dependencies || []).map(function(it){
       return it.replace(root, '');
@@ -249,7 +323,7 @@ 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, ret, t2, desdir, e, results$ = [];
+        var i$, ref$, len$, ref1$, file, mtime, src, desh, desv, code, 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;
@@ -265,12 +339,13 @@ pugbuild.prototype = import$(Object.create(base.prototype), {
             if (!this$._noView) {
               desvdir = path.dirname(desv);
               fsExtra.ensureDirSync(desvdir);
-              ret = pug.compileClient(code, import$({
+              opt = import$({
                 filename: src,
                 basedir: path.resolve(this$.srcdir),
                 doctype: 'html',
                 compileDebug: false
-              }, this$.extapi));
+              }, this$.extapi);
+              ret = pug.compileClient(code, opt);
               ret = " (function() { " + ret + "; module.exports = template; })() ";
               fs.writeFileSync(desv, ret);
               t2 = Date.now();
@@ -279,12 +354,13 @@ pugbuild.prototype = import$(Object.create(base.prototype), {
             if (!/^\/\/- ?view ?/.exec(code)) {
               desdir = path.dirname(desh);
               fsExtra.ensureDirSync(desdir);
-              fs.writeFileSync(desh, pug.render(code, import$({
+              opt = import$({
                 filename: src,
                 basedir: path.resolve(this$.srcdir),
                 doctype: 'html',
                 compileDebug: false
-              }, this$.extapi)));
+              }, this$.extapi);
+              fs.writeFileSync(desh, pug.render(code, opt));
               t2 = Date.now();
               results$.push(this$.log.info(src + " --> " + desh + " ( " + (t2 - t1) + "ms )"));
             }

package/dist/lib.pug

@@ -36,9 +36,10 @@ mixin script(os,cfg)
   if cfg && cfg.pack
     -
       var name = md5(str);
-      var filename = "/js/pack/" + name + "." + (typeof(cfg.min) == "undefined" || cfg.min ? "min" : "") + ".js";
-      hashfile({type: "js", name: name, files: urls});
-    script(type="text/javascript",src=filename + libLoader._v)
+      //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";
+      hashfile({type: "js", name: name, files: urls, src: locals.filename});
+    script(type="text/javascript",src=fn + libLoader._v)
 
 mixin css(os,cfg)
   -
@@ -63,6 +64,7 @@ mixin css(os,cfg)
   if cfg && cfg.pack
     -
       var name = md5(str);
-      var filename = "/css/pack/" + name + "." + (typeof(cfg.min) == "undefined" || cfg.min ? "min" : "") + ".css";
-      hashfile({type: "css", name: name, files: urls});
-    link(rel="stylesheet",type="text/css",href=filename + libLoader._v)
+      //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";
+      hashfile({type: "css", name: name, files: urls, src: locals.filename});
+    link(rel="stylesheet",type="text/css",href=fn + libLoader._v)

package/package.json

@@ -1,7 +1,7 @@
 {
   "author": "zbryikt",
   "name": "@plotdb/srcbuild",
-  "version": "0.0.56",
+  "version": "0.0.57",
   "description": "",
   "main": "./dist/main.js",
   "files": [
@@ -27,6 +27,7 @@
   },
   "dependencies": {
     "@loadingio/debounce.js": "^1.0.1",
+    "@plotdb/block": "^4.8.0",
     "@plotdb/colors": "^0.0.1",
     "anymatch": "^3.1.2",
     "browserify": "^17.0.0",
@@ -47,17 +48,34 @@
     "yargs": "^17.2.1"
   },
   "devDependencies": {
+    "@loadingio/bootstrap.ext": "^0.0.9",
+    "@plotdb/csscope": "^4.1.2",
+    "@plotdb/rescope": "^4.2.2",
+    "@plotdb/semver": "^0.0.3",
+    "@loadingio/ldquery": "^3.0.4",
+    "bootstrap": "^4.6.1",
+    "express": "^4.18.2",
     "fedep": "^1.1.7",
+    "jsdom": "^20.0.3",
     "ldcolor": "^1.0.0",
     "ldcover": "^3.2.1",
     "ldloader": "^3.0.1",
     "ldview": "^1.3.0",
+    "proxise": "^1.0.1",
     "shaderlib": "github:zbryikt/shaderlib"
   },
   "frontendDependencies": {
     "root": "web/static/assets/lib",
     "modules": [
+      "bootstrap",
+      "@loadingio/ldquery",
+      "@loadingio/bootstrap.ext",
       "@loadingio/debounce.js",
+      "proxise",
+      "@plotdb/semver",
+      "@plotdb/rescope",
+      "@plotdb/csscope",
+      "@plotdb/block",
       "ldcover",
       "ldloader",
       "ldcolor",