@plotdb/srcbuild 0.0.57 → 0.0.59

package/README.md

@@ -103,6 +103,10 @@ Except common options, each builder may support different options:
      - `false`: all files in `configFile` are relative to current working directory.
      - `true`: all files in `configFile` are relative to the directory containing `bundle.json`
      - or, specific a path as the relative root.
+   - `manager`: block manager, optional. required for @plotdb/block bundling.
+     - can be either an `block.manager` object, or ...
+     - a function returning such object which accepts an object with following fields as parameter:
+       - `base`: the base dir of this bundle.
    - `config`: bundle configuration in following format:
      {
        "css": {

package/dist/ext/base.js

@@ -17,12 +17,21 @@ basebuild.prototype = import$(Object.create(Object.prototype), {
   purge: function(files){},
   resolve: function(file){},
   init: function(opt){
-    var this$ = this;
+    opt == null && (opt = {});
+    this.initVars(opt);
+    this.initAdapter(opt);
+    return this;
+  },
+  initVars: function(opt){
     opt == null && (opt = {});
     this.log = opt.logger || aux.logger;
     this.base = opt.base || this.base || '.';
     this.srcdir = path.normalize(path.join(this.base, opt.srcdir || this.srcdir || '.'));
-    this.desdir = path.normalize(path.join(this.base, opt.desdir || this.desdir || '.'));
+    return this.desdir = path.normalize(path.join(this.base, opt.desdir || this.desdir || '.'));
+  },
+  initAdapter: function(opt){
+    var this$ = this;
+    opt == null && (opt = {});
     this.adapter = new adapter({
       base: this.srcdir,
       getDependencies: function(it){
@@ -41,8 +50,7 @@ basebuild.prototype = import$(Object.create(Object.prototype), {
         return this$.resolve(file);
       }
     });
-    this.adapter.init();
-    return this;
+    return this.adapter.init();
   },
   getAdapter: function(){
     return this.adapter;

package/dist/ext/bundle.js

@@ -17,7 +17,8 @@ spec = function(o){
     type: o.type,
     codesrc: o.codesrc,
     specsrc: o.specsrc,
-    deps: o.deps
+    deps: o.deps,
+    src: o.src
   }));
   this.type = (ref$ = this.o).type;
   this.name = ref$.name;
@@ -37,7 +38,8 @@ spec.prototype = import$(Object.create(Object.prototype), {
     return ref$ = {
       codesrc: Array.from(this.codesrc),
       specsrc: Array.from(this.specsrc),
-      deps: Array.from(this.deps)
+      deps: Array.from(this.deps),
+      src: Array.from(this.src)
     }, ref$.type = this.type, ref$.name = this.name, ref$;
   },
   cacheFn: function(){
@@ -315,22 +317,29 @@ specmgr.prototype = import$(Object.create(Object.prototype), {
   }
 });
 build = function(o){
+  var opt;
   o == null && (o = {});
-  this.mgr = o.manager;
+  opt = import$({
+    srcdir: 'static',
+    desdir: 'static'
+  }, o);
+  this.initVars(opt);
+  this.mgr = typeof o.manager === 'function'
+    ? o.manager({
+      base: this.base
+    })
+    : 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
+    : (!(o.relativePath != null) || o.relativePath) && this.cfgfn
       ? path.dirname(this.cfgfn)
       : process.cwd();
   this.log = o.logger || aux.logger;
   this.reload();
-  this.init(import$({
-    srcdir: 'static',
-    desdir: 'static'
-  }, o));
+  this.initAdapter(opt);
   return this;
 };
 build.prototype = import$(Object.create(base.prototype), {
@@ -352,10 +361,10 @@ build.prototype = import$(Object.create(base.prototype), {
   },
   reload: function(){
     this.reset();
-    this.loadCfg({
+    this.loadCaches();
+    return this.loadCfg({
       init: true
     });
-    return this.loadCaches();
   },
   reset: function(){
     var this$ = this;
@@ -558,6 +567,9 @@ build.prototype = import$(Object.create(base.prototype), {
       return fs.ensureDir(desdir).then(function(){
         var ps;
         if (type === 'block') {
+          if (!this$.mgr || !this$.mgr.bundle) {
+            throw new Error("block bundling requires manager of @plotdb/block provided via bundler option.");
+          }
           return this$.mgr.bundle({
             blocks: spec.src
           }).then(function(ret){
@@ -622,7 +634,9 @@ build.prototype = import$(Object.create(base.prototype), {
         return ret;
       })['catch'](function(e){
         this$.log.error((des + " failed: ").red);
-        return this$.log.error(e.message.toString());
+        return this$.log.error({
+          err: e
+        }, e.message.toString());
       });
     });
   }

package/dist/ext/pug.js

@@ -131,16 +131,20 @@ pugbuild.prototype = import$(Object.create(base.prototype), {
               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 + "\">";
+            if (this$.bundler) {
+              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 + "\">";
+              }
+            } else {
+              return ret += "<!-- no bundler available for bundling " + name + " in type " + o.type + " -->";
             }
           });
           return ret;

package/package.json

@@ -1,7 +1,7 @@
 {
   "author": "zbryikt",
   "name": "@plotdb/srcbuild",
-  "version": "0.0.57",
+  "version": "0.0.59",
   "description": "",
   "main": "./dist/main.js",
   "files": [