@xlfont/load 1.1.1 → 2.0.0

package/README.md

@@ -58,7 +58,7 @@ Generally speaking, the steps of font subsetting by `xfl` are as following:
 
 include the locally installed dist files or from cdn:
 
-    <script src="path-to/xfl.js"></script>
+    <script src="path-to/xfl-js"></script>
 
 
 Then, load desired font:
@@ -96,8 +96,9 @@ Besides loading from `xfl.load`, you can also manually construct a `xlfont` obje
  - `isXl`: true if this is a xlfont. if omitted, decided by `ext`. 
  - `doMerge`: should subsetted merged by frontend JS before using to enhacen UX. default false
  - `useWorker`: use web worker for font merging. default false. When specified, can be an object with following:
-   - `url`: worker js url
    - `opentype-url`: required `opentype.js` url.
+      - context of worker is in Object URL, so relative URL is not support.
+      - use `document.location` to prevent from hardcoding domain.
  - `style`: font style ( e.g., `normal`, `italic` ). default `normal`.
  - `weight`: font weight ( e.g., `400`, `500`, etc ). default `400`.
 

package/bin/build.js

@@ -7,7 +7,7 @@
   opentype = require('@plotdb/opentype.js');
   yargs = require('yargs');
   path = require('path');
-  colors = require('colors');
+  colors = require('@plotdb/colors');
   progress = require('progress');
   ttf2woff2 = require('ttf2woff2');
   ttf2woff = require('ttf2woff');

package/bin/meta.js

@@ -3,7 +3,7 @@
   var fs, path, colors, yargs, opentype, lib, allRanges, argv, file, all, multiline;
   fs = require('fs');
   path = require('path');
-  colors = require('colors');
+  colors = require('@plotdb/colors');
   yargs = require('yargs');
   opentype = require('@plotdb/opentype.js');
   lib = path.dirname(fs.realpathSync(__filename));

package/dist/index.js

@@ -1,4 +1,4 @@
-var err, xlfWorker, xlfMerger, xlfont, xfl;
+(function() { var xlfWorkerCode = 'var local={},onmessage=function(e){var e=e.data||{},n=e.bufs,p=e.key,e=e.lib;return local.inited||(console.log(e),importScripts(e||"opentype.js"),local.inited=!0),Promise.resolve().then(function(){return n.map(function(e){return opentype.parse(e)})}).then(function(e){for(var n,t,r,s,o,a=[],l=0,i=e.length;l<i;++l)for(t=0,r=(n=e[l]).glyphs.length;t<r;++t)s=t,a.push(n.glyphs.glyphs[s]);return n=e[0],o=new opentype.Font(((o={glyphs:a,familyName:n.names.fontFamily.en,styleName:n.names.fontSubfamily.en}).unitsPerEm=n.unitsPerEm,o.ascender=n.ascender,o.descender=n.descender,o)),postMessage({buf:o.toArrayBuffer(),key:p})})};'; var err, xlfWorker, xlfMerger, xlfont, xfl;
 err = function(e){
   e == null && (e = {});
   return import$(new Error(), import$({
@@ -12,36 +12,45 @@ xlfWorker = {
   init: function(opt){
     var this$ = this;
     opt == null && (opt = {});
-    if (this.worker) {
-      return;
-    }
-    this.worker = new Worker(opt.url || "worker.min.js");
-    return this.worker.onmessage = function(e){
-      var ref$, buf, key, item;
-      ref$ = e.data, buf = ref$.buf, key = ref$.key;
-      if (!(item = this$.queue.filter(function(q){
-        return key === q.key;
-      })[0])) {
+    return Promise.resolve().then(function(){
+      var url;
+      if (this$.worker) {
         return;
       }
-      this$.queue.splice(this$.queue.indexOf(item), 1);
-      return item.res(buf);
-    };
+      url = URL.createObjectURL(new Blob([xlfWorkerCode], {
+        type: 'text/javascript'
+      }));
+      this$.worker = new Worker(url);
+      URL.revokeObjectURL(url);
+      return this$.worker.onmessage = function(e){
+        var ref$, buf, key, item;
+        ref$ = e.data, buf = ref$.buf, key = ref$.key;
+        if (!(item = this$.queue.filter(function(q){
+          return key === q.key;
+        })[0])) {
+          return;
+        }
+        this$.queue.splice(this$.queue.indexOf(item), 1);
+        return item.res(buf);
+      };
+    });
   },
   run: function(abs, opt){
     var this$ = this;
     return new Promise(function(res, rej){
-      var item;
-      this$.init(opt);
-      this$.queue.push(item = {
-        res: res,
-        rej: rej,
-        key: this$.key++
-      });
-      return this$.worker.postMessage({
-        bufs: abs,
-        key: item.key,
-        lib: opt.opentype
+      return this$.init(opt).then(function(){
+        var item;
+        this$.queue.push(item = {
+          res: res,
+          rej: rej,
+          key: this$.key++
+        });
+        console.log(">", opt);
+        return this$.worker.postMessage({
+          bufs: abs,
+          key: item.key,
+          lib: opt.opentypeUrl
+        });
       });
     });
   }
@@ -578,3 +587,4 @@ function import$(obj, src){
   for (var key in src) if (own.call(src, key)) obj[key] = src[key];
   return obj;
 }
+}());

package/dist/index.min.js

@@ -1 +1 @@
-var err,xlfWorker,xlfMerger,xlfont,xfl;err=function(e){e==null&&(e={});return import$(new Error,import$({name:"lderror"},e))};xlfWorker={key:0,worker:null,queue:[],init:function(opt){var this$=this;opt==null&&(opt={});if(this.worker){return}this.worker=new Worker(opt.url||"worker.min.js");return this.worker.onmessage=function(e){var ref$,buf,key,item;ref$=e.data,buf=ref$.buf,key=ref$.key;if(!(item=this$.queue.filter(function(q){return key===q.key})[0])){return}this$.queue.splice(this$.queue.indexOf(item),1);return item.res(buf)}},run:function(abs,opt){var this$=this;return new Promise(function(res,rej){var item;this$.init(opt);this$.queue.push(item={res:res,rej:rej,key:this$.key++});return this$.worker.postMessage({bufs:abs,key:item.key,lib:opt.opentype})})}};xlfMerger=function(arg$){var bufs,useWorker;bufs=arg$.bufs,useWorker=arg$.useWorker;if(!bufs.length){return Promise.resolve()}if(useWorker){return xlfWorker.run(bufs,useWorker)}return Promise.resolve().then(function(){return bufs.map(function(it){return opentype.parse(it)})}).then(function(fonts){var glyphs,i$,len$,font,j$,to$,i,merged,ref$;glyphs=[];for(i$=0,len$=fonts.length;i$<len$;++i$){font=fonts[i$];for(j$=0,to$=font.glyphs.length;j$<to$;++j$){i=j$;glyphs.push(font.glyphs.glyphs[i])}}font=fonts[0];merged=new opentype.Font((ref$={glyphs:glyphs,familyName:font.names.fontFamily.en,styleName:font.names.fontSubfamily.en},ref$.unitsPerEm=font.unitsPerEm,ref$.ascender=font.ascender,ref$.descender=font.descender,ref$));return merged.toArrayBuffer()})};xlfont=function(opt){var that,this$=this;opt==null&&(opt={});this.opt=opt;this.sub={set:{},font:{}};this.cjkOnly=opt.cjkOnly||false;this.codemap={};this.otf={font:null,dirty:true};this.path=opt.path;this.name=opt.name||this.path.replace(/\.[a-zA-Z0-9]+$/,"").replace(/^https?:\/\/[^/]+\//g,"").replace(/\s/g,"-").replace(/\//g,"-").toLowerCase();this.style=opt.style||"normal";this.weight=opt.weight||"400";this.ext=opt.ext||(/\.(ttf|otf|woff2|woff)$/.exec(this.path)||[])[1]||"";this.format=(that=this.ext.toLowerCase())?that==="ttf"?"truetype":that==="otf"?"truetype":that:"";if(this.format){this.format="format('"+this.format+"')"}this.className="xfl-"+(this.name||"").replace(/\s+/g,"_")+"-"+Math.random().toString(36).substring(2);this.isXl=opt.isXl!=null?opt.isXl:!this.ext;if(!this.ext){this.ext="woff"}this.doMerge=opt.doMerge!=null?opt.doMerge:false;this.useWorker=opt.useWorker!=null?opt.useWorker:false;this.misschar={};this.css=[];this.init=proxise.once(function(){return this$._init()});this.init();return this};xlfont.prototype=import$(Object.create(Object.prototype),{_init:function(){var this$=this;return Promise.resolve().then(function(){if(!this$.isXl){this$.css=[{content:'@font-face {\n  font-family: "'+this$.name+'";\n  src: url("'+this$.path+'") '+this$.format+";\n  font-style: "+this$.style+";\n  font-weight: "+this$.weight+";\n}\n."+this$.className+' { font-family: "'+this$.name+'"; }'}];return xfl.update()}else{return new Promise(function(res,rej){var xhr;xhr=new XMLHttpRequest;xhr.addEventListener("readystatechange",function(){if(xhr.readyState!==XMLHttpRequest.DONE){return}if(xhr.status!==200){return rej(err({code:xhr.status,message:xhr.responseText}))}(xhr.responseText||"").split("\n").map(function(d,i){return d.split(" ").map(function(e,j){return this$.codemap[e]=i+1})});return res()});xhr.open("GET",this$.path+"/charmap.txt");return xhr.send()})}})},_fetch:function(f,dofetch,type){var this$=this;f==null&&(f={});dofetch==null&&(dofetch=false);type==null&&(type="ttf");if(!dofetch){if(!f.url){if(this.isXl){f.url=this.path+"/"+f.key+"."+type;f.type=type}else{f.url=this.path;f.type=this.ext.toLowerCase()||type}}return Promise.resolve(f)}if(f.blob){return Promise.resolve(f)}if(!f.proxy){f.proxy=proxise(function(f){var p;if(f.running){return}f.running=true;p=new Promise(function(res,rej){var xhr;if(f.blob){return res(f)}xhr=new XMLHttpRequest;xhr.addEventListener("readystatechange",function(){if(xhr.readyState!==XMLHttpRequest.DONE){return}if(xhr.status!==200){return rej(err({code:xhr.status,message:xhr.responseText}))}this$.otf.dirty=true;f.url=URL.createObjectURL(xhr.response);f.blob=xhr.response;f.type=this$.ext.toLowerCase()||type;return res(f)});if(this$.isXl){xhr.open("GET",this$.path+"/"+f.key+"."+type)}else{xhr.open("GET",this$.path)}xhr.responseType="blob";return xhr.send()});return p["finally"](function(){return f.running=false})})}return f.proxy(f)},fetchAll:function(){var k,f,this$=this;if(this.isXl){return Promise.all(function(){var ref$,results$=[];for(k in ref$=this.sub.font){f=ref$[k];results$.push(f)}return results$}.call(this).map(function(it){return this$._fetch(it,true,"woff")}))}else{return this._fetch(this.sub.font[0],true,"ttf")}},fetch:function(list,dofetch){var doMerge,ps,this$=this;list==null&&(list=[]);dofetch==null&&(dofetch=false);if(!this.isXl){if(this.sub.font[0]&&this.sub.font[0].blob){return Promise.resolve()}list=[0]}doMerge=this.doMerge;ps=Array.from(new Set(list.map(function(it){return it}))).filter(function(it){return!this$.sub.font[it]}).map(function(d,i){var f,type;this$.sub.font[d]=f={key:d};type=!this$.isXl?"ttf":"woff";f.needMerge=+d!==1;return this$._fetch(f,!doMerge?dofetch:true,type)});return Promise.all(ps).then(function(subfonts){var ps;if(!doMerge){return subfonts}ps=subfonts.filter(function(it){return it.needMerge}).map(function(font){return new Promise(function(res,rej){var fr;fr=new FileReader;fr.onerror=function(it){return rej(it)};fr.onload=function(){return res(fr.result)};return fr.readAsArrayBuffer(font.blob)})});return Promise.all(ps).then(function(it){return xlfMerger({bufs:it,useWorker:this$.useWorker})}).then(function(ab){var font,blob;if(!ab){return subfonts.filter(function(it){return!it.needMerge})}font=subfonts.filter(function(it){return it.needMerge})[0];blob=new Blob([ab],{type:"font/"+(font.type||"ttf")});font={url:URL.createObjectURL(blob),blob:blob,type:font.type||"ttf"};return subfonts.filter(function(it){return!it.needMerge}).concat([font])})}).then(function(subfonts){var css,k,ref$,f,i$,len$;if(!subfonts.length){return}css="."+this$.className+' { font-family: "'+this$.name+'"; }';for(k in ref$=this$.sub.font){f=ref$[k]}for(i$=0,len$=subfonts.length;i$<len$;++i$){f=subfonts[i$];css+='@font-face {\n  font-family: "'+this$.name+'";\n  src: url("'+f.url+"\") format('"+f.type+"');\n  font-style: "+this$.style+";\n  font-weight: "+this$.weight+";\n}"}return this$.css.push({content:css})})},hasChar:function(c){return typeof this.misschar[c]==="undefined"?undefined:!this.misshcar[c]},getPath:function(opt){var ref$,text,x,y,fontSize,this$=this;opt==null&&(opt={});ref$=import$({text:"",x:0,y:0,fontSize:48},opt),text=ref$.text,x=ref$.x,y=ref$.y,fontSize=ref$.fontSize;return this.sync(text).then(function(){return this$.getotf()}).then(function(otf){var txt,i$,to$,i,path;txt="";for(i$=0,to$=text.length;i$<to$;++i$){i=i$;txt+=!this$.misschar[text[i]]?text[i]:" "}path=otf.getPath(txt,x,y,fontSize);return path})},getotf:function(){var this$=this;if(!(typeof opentype!="undefined"&&opentype!==null)){return Promise.reject(err({id:1022,message:"[@plotdb/xfl] need opentype.js to merge subfonts"}))}if(!this.otf.dirty){return Promise.resolve(this.otf.font)}return Promise.resolve().then(function(){if(!this$.isXl){return this$.fetch()}else{return this$.fetchAll()}}).then(function(){var ps,k,f;ps=function(){var ref$,results$=[];for(k in ref$=this.sub.font){f=ref$[k];results$.push(f)}return results$}.call(this$).map(function(f){if(f.otf){return Promise.resolve(f)}else{return opentype.load(f.url).then(function(it){f.otf=it;return f})}});return Promise.all(ps)}).then(function(list){var glyphs,ref$,ref1$;list==null&&(list=[]);if(list.length===1){return list[0].otf}glyphs=list.map(function(f){var glyphs,i$,to$,i,results$=[];glyphs=f.otf.glyphs;for(i$=1,to$=glyphs.length;i$<=to$;++i$){i=i$;results$.push(glyphs.glyphs[i])}return results$}).reduce(function(a,b){return a.concat(b)},[]).filter(function(it){return it});this$.otf.font=new opentype.Font((ref1$={familyName:this$.name,styleName:this$.style||"normal",glyphs:glyphs},ref1$.unitsPerEm=(ref$=list[0].otf).unitsPerEm,ref1$.ascender=ref$.ascender,ref1$.descender=ref$.descender,ref1$));this$.otf.font.kerningPairs={};return this$.otf.font})},sync:function(txt){var this$=this;txt==null&&(txt="");if(!this.isXl){xfl.update();return Promise.resolve()}return Promise.resolve().then(function(){var ref$,misscodes,missset,i$,to$,i,code,setIdx,k,list,res$;ref$=[{},{}],misscodes=ref$[0],missset=ref$[1];for(i$=0,to$=txt.length;i$<to$;++i$){i=i$;code=txt.charCodeAt(i);if(this$.cjkOnly&&!xfl.isCJK(code)){continue}setIdx=this$.codemap[code.toString(16)];this$.misschar[txt[i]]=misscodes[txt[i]]=!setIdx?true:false;if(setIdx&&!this$.sub.set[setIdx]){this$.sub.set[setIdx]=missset[setIdx]=true}}misscodes=function(){var results$=[];for(k in misscodes){results$.push(k)}return results$}().filter(function(it){return misscodes[it]});if(misscodes.length){console.log("[@plotdb/xfl] sync xl-font with following chars unsupported: "+misscodes.join(""))}res$=[];for(k in missset){res$.push(k)}list=res$;if(list.length){return this$.fetch(list)}}).then(function(){return xfl.update()})}});xfl={range:{CJK:[[12352,12543],[13312,19903],[19968,40959],[63744,64255],[65382,65439],[12593,55197]]},fonts:{},running:{},isCJK:function(code){return this.range.CJK.filter(function(it){return code>=it[0]&&code<=it[1]}).length},proxy:{},update:function(){var css,k,ref$,v,node,f;css="";for(k in ref$=this.fonts){v=ref$[k];(v.css||[]).filter(fn$).map(fn1$)}if(css){node=document.createElement("style");node.textContent=css;node.setAttribute("type","text/css");document.body.appendChild(node)}return Promise.all(function(){var ref$,results$=[];for(k in ref$=this.fonts){f=ref$[k];results$.push(f)}return results$}.call(this).map(function(){return document.fonts.load("16px "+v.name)})).then(function(){return new Promise(function(res,rej){return setTimeout(function(){return res()},350)})});function fn$(it){return!it.rendered}function fn1$(it){it.rendered=true;return css=css+it.content}},_load:function(opt){var path,this$=this;opt==null&&(opt={});path=opt.path;if(this.running[path]){return}this.running[path]=true;return Promise.resolve().then(function(){var fobj;this$.fonts[path]=fobj=new xlfont(opt);return fobj.init()})["finally"](function(){return this$.running[path]=false}).then(function(){this$.proxy[path].resolve(this$.fonts[path]);return this$.fonts[path]})["catch"](function(it){this$.proxy[path].reject(it);return Promise.reject(it)})},load:function(opt){var this$=this;opt==null&&(opt={});if(typeof opt==="string"){opt={path:opt}}return new Promise(function(res,rej){var path,that,ref$;if(!(path=opt.path)){return rej(err({id:400}))}path=path.replace(/\/$/,"");if(that=this$.fonts[path]){return res(that)}if(!this$.proxy[path]){this$.proxy[path]=proxise(function(it){return this$._load(it)})}return this$.proxy[path]((ref$=import$({},opt),ref$.path=path,ref$)).then(function(it){return res(it)})["catch"](function(it){return rej(it)})})}};if(typeof module!="undefined"&&module!==null){module.exports=xfl}else if(typeof window!="undefined"&&window!==null){window.xfl=xfl}function import$(obj,src){var own={}.hasOwnProperty;for(var key in src)if(own.call(src,key))obj[key]=src[key];return obj}
+!function(){var i,n,t,o,c;function l(e,t){var n,r={}.hasOwnProperty;for(n in t)r.call(t,n)&&(e[n]=t[n]);return e}i=function(e){return null==e&&(e={}),l(new Error,l({name:"lderror"},e))},n={key:0,worker:null,queue:[],init:function(e){var r=this;return null==e&&(e={}),Promise.resolve().then(function(){var e;if(!r.worker)return e=URL.createObjectURL(new Blob(['var local={},onmessage=function(e){var e=e.data||{},n=e.bufs,p=e.key,e=e.lib;return local.inited||(console.log(e),importScripts(e||"opentype.js"),local.inited=!0),Promise.resolve().then(function(){return n.map(function(e){return opentype.parse(e)})}).then(function(e){for(var n,t,r,s,o,a=[],l=0,i=e.length;l<i;++l)for(t=0,r=(n=e[l]).glyphs.length;t<r;++t)s=t,a.push(n.glyphs.glyphs[s]);return n=e[0],o=new opentype.Font(((o={glyphs:a,familyName:n.names.fontFamily.en,styleName:n.names.fontSubfamily.en}).unitsPerEm=n.unitsPerEm,o.ascender=n.ascender,o.descender=n.descender,o)),postMessage({buf:o.toArrayBuffer(),key:p})})};'],{type:"text/javascript"})),r.worker=new Worker(e),URL.revokeObjectURL(e),r.worker.onmessage=function(e){var t=e.data,e=t.buf,n=t.key;if(t=r.queue.filter(function(e){return n===e.key})[0])return r.queue.splice(r.queue.indexOf(t),1),t.res(e)}})},run:function(r,o){var s=this;return new Promise(function(t,n){return s.init(o).then(function(){var e;return s.queue.push(e={res:t,rej:n,key:s.key++}),console.log(">",o),s.worker.postMessage({bufs:r,key:e.key,lib:o.opentypeUrl})})})}},t=function(e){var t=e.bufs,e=e.useWorker;return t.length?e?n.run(t,e):Promise.resolve().then(function(){return t.map(function(e){return opentype.parse(e)})}).then(function(e){for(var t,n,r,o,s,i=[],u=0,f=e.length;u<f;++u)for(n=0,r=(t=e[u]).glyphs.length;n<r;++n)o=n,i.push(t.glyphs.glyphs[o]);return t=e[0],new opentype.Font(((s={glyphs:i,familyName:t.names.fontFamily.en,styleName:t.names.fontSubfamily.en}).unitsPerEm=t.unitsPerEm,s.ascender=t.ascender,s.descender=t.descender,s)).toArrayBuffer()}):Promise.resolve()},(o=function(e){var t,n=this;return this.opt=e=null==e?{}:e,this.sub={set:{},font:{}},this.cjkOnly=e.cjkOnly||!1,this.codemap={},this.otf={font:null,dirty:!0},this.path=e.path,this.name=e.name||this.path.replace(/\.[a-zA-Z0-9]+$/,"").replace(/^https?:\/\/[^/]+\//g,"").replace(/\s/g,"-").replace(/\//g,"-").toLowerCase(),this.style=e.style||"normal",this.weight=e.weight||"400",this.ext=e.ext||(/\.(ttf|otf|woff2|woff)$/.exec(this.path)||[])[1]||"",this.format=(t=this.ext.toLowerCase())?"ttf"===t||"otf"===t?"truetype":t:"",this.format&&(this.format="format('"+this.format+"')"),this.className="xfl-"+(this.name||"").replace(/\s+/g,"_")+"-"+Math.random().toString(36).substring(2),this.isXl=null!=e.isXl?e.isXl:!this.ext,this.ext||(this.ext="woff"),this.doMerge=null!=e.doMerge&&e.doMerge,this.useWorker=null!=e.useWorker&&e.useWorker,this.misschar={},this.css=[],this.init=proxise.once(function(){return n._init()}),this.init(),this}).prototype=l(Object.create(Object.prototype),{_init:function(){var r=this;return Promise.resolve().then(function(){return r.isXl?new Promise(function(e,t){var n=new XMLHttpRequest;return n.addEventListener("readystatechange",function(){if(n.readyState===XMLHttpRequest.DONE)return 200!==n.status?t(i({code:n.status,message:n.responseText})):((n.responseText||"").split("\n").map(function(e,n){return e.split(" ").map(function(e,t){return r.codemap[e]=n+1})}),e())}),n.open("GET",r.path+"/charmap.txt"),n.send()}):(r.css=[{content:'@font-face {\n  font-family: "'+r.name+'";\n  src: url("'+r.path+'") '+r.format+";\n  font-style: "+r.style+";\n  font-weight: "+r.weight+";\n}\n."+r.className+' { font-family: "'+r.name+'"; }'}],c.update())})},_fetch:function(e,t,o){var s=this;return null==e&&(e={}),null==o&&(o="ttf"),(t=null!=t&&t)?e.blob?Promise.resolve(e):(e.proxy||(e.proxy=proxise(function(r){if(!r.running)return r.running=!0,new Promise(function(e,t){var n;return r.blob?e(r):((n=new XMLHttpRequest).addEventListener("readystatechange",function(){if(n.readyState===XMLHttpRequest.DONE)return 200!==n.status?t(i({code:n.status,message:n.responseText})):(s.otf.dirty=!0,r.url=URL.createObjectURL(n.response),r.blob=n.response,r.type=s.ext.toLowerCase()||o,e(r))}),s.isXl?n.open("GET",s.path+"/"+r.key+"."+o):n.open("GET",s.path),n.responseType="blob",n.send())}).finally(function(){return r.running=!1})})),e.proxy(e)):(e.url||(this.isXl?(e.url=this.path+"/"+e.key+"."+o,e.type=o):(e.url=this.path,e.type=this.ext.toLowerCase()||o)),Promise.resolve(e))},fetchAll:function(){var n,r,t=this;return this.isXl?Promise.all(function(){var e,t=[];for(n in e=this.sub.font)r=e[n],t.push(r);return t}.call(this).map(function(e){return t._fetch(e,!0,"woff")})):this._fetch(this.sub.font[0],!0,"ttf")},fetch:function(e,o){var s,u=this;if(null==e&&(e=[]),null==o&&(o=!1),!this.isXl){if(this.sub.font[0]&&this.sub.font[0].blob)return Promise.resolve();e=[0]}return s=this.doMerge,e=Array.from(new Set(e.map(function(e){return e}))).filter(function(e){return!u.sub.font[e]}).map(function(e,t){var n,r;return u.sub.font[e]=n={key:e},r=u.isXl?"woff":"ttf",n.needMerge=1!=+e,u._fetch(n,!!s||o,r)}),Promise.all(e).then(function(n){var e;return s?(e=n.filter(function(e){return e.needMerge}).map(function(r){return new Promise(function(e,t){var n=new FileReader;return n.onerror=function(e){return t(e)},n.onload=function(){return e(n.result)},n.readAsArrayBuffer(r.blob)})}),Promise.all(e).then(function(e){return t({bufs:e,useWorker:u.useWorker})}).then(function(e){var t;return e?(t=n.filter(function(e){return e.needMerge})[0],e=new Blob([e],{type:"font/"+(t.type||"ttf")}),t={url:URL.createObjectURL(e),blob:e,type:t.type||"ttf"},n.filter(function(e){return!e.needMerge}).concat([t])):n.filter(function(e){return!e.needMerge})})):n}).then(function(e){var t,n,r,o,s,i;if(e.length){for(n in t="."+u.className+' { font-family: "'+u.name+'"; }',r=u.sub.font)o=r[n];for(s=0,i=e.length;s<i;++s)o=e[s],t+='@font-face {\n  font-family: "'+u.name+'";\n  src: url("'+o.url+"\") format('"+o.type+"');\n  font-style: "+u.style+";\n  font-weight: "+u.weight+";\n}";return u.css.push({content:t})}})},hasChar:function(e){return void 0===this.misschar[e]?void 0:!this.misshcar[e]},getPath:function(e){var s=this,e=l({text:"",x:0,y:0,fontSize:48},e=null==e?{}:e),i=e.text,u=e.x,f=e.y,a=e.fontSize;return this.sync(i).then(function(){return s.getotf()}).then(function(e){for(var t,n="",r=0,o=i.length;r<o;++r)t=r,n+=s.misschar[i[t]]?" ":i[t];return e.getPath(n,u,f,a)})},getotf:function(){var o=this;return"undefined"==typeof opentype||null===opentype?Promise.reject(i({id:1022,message:"[@plotdb/xfl] need opentype.js to merge subfonts"})):this.otf.dirty?Promise.resolve().then(function(){return o.isXl?o.fetchAll():o.fetch()}).then(function(){var n,r,e=function(){var e,t=[];for(n in e=this.sub.font)r=e[n],t.push(r);return t}.call(o).map(function(t){return t.otf?Promise.resolve(t):opentype.load(t.url).then(function(e){return t.otf=e,t})});return Promise.all(e)}).then(function(e){var t;return 1===(e=null==e?[]:e).length?e[0].otf:(t=e.map(function(e){for(var t,n=[],r=e.otf.glyphs,o=1,s=r.length;o<=s;++o)t=o,n.push(r.glyphs[t]);return n}).reduce(function(e,t){return e.concat(t)},[]).filter(function(e){return e}),o.otf.font=new opentype.Font(((t={familyName:o.name,styleName:o.style||"normal",glyphs:t}).unitsPerEm=(e=e[0].otf).unitsPerEm,t.ascender=e.ascender,t.descender=e.descender,t)),o.otf.font.kerningPairs={},o.otf.font)}):Promise.resolve(this.otf.font)},sync:function(a){var l=this;return null==a&&(a=""),this.isXl?Promise.resolve().then(function(){for(var e,t,n,r,o=[{},{}],s=o[0],i=o[1],u=0,f=a.length;u<f;++u)e=u,t=a.charCodeAt(e),l.cjkOnly&&!c.isCJK(t)||(t=l.codemap[t.toString(16)],l.misschar[a[e]]=s[a[e]]=!t,t&&!l.sub.set[t]&&(l.sub.set[t]=i[t]=!0));for(n in(s=function(){var e=[];for(n in s)e.push(n);return e}().filter(function(e){return s[e]})).length&&console.log("[@plotdb/xfl] sync xl-font with following chars unsupported: "+s.join("")),r=[],i)r.push(n);if((o=r).length)return l.fetch(o)}).then(function(){return c.update()}):(c.update(),Promise.resolve())}}),c={range:{CJK:[[12352,12543],[13312,19903],[19968,40959],[63744,64255],[65382,65439],[12593,55197]]},fonts:{},running:{},isCJK:function(t){return this.range.CJK.filter(function(e){return t>=e[0]&&t<=e[1]}).length},proxy:{},update:function(){var n,e,t,r,o,s="";for(n in e=this.fonts)((t=e[n]).css||[]).filter(i).map(u);return s&&((r=document.createElement("style")).textContent=s,r.setAttribute("type","text/css"),document.body.appendChild(r)),Promise.all(function(){var e,t=[];for(n in e=this.fonts)o=e[n],t.push(o);return t}.call(this).map(function(){return document.fonts.load("16px "+t.name)})).then(function(){return new Promise(function(e,t){return setTimeout(function(){return e()},350)})});function i(e){return!e.rendered}function u(e){return e.rendered=!0,s+=e.content}},_load:function(t){var n=this,r=(t=null==t?{}:t).path;if(!this.running[r])return this.running[r]=!0,Promise.resolve().then(function(){var e;return n.fonts[r]=e=new o(t),e.init()}).finally(function(){return n.running[r]=!1}).then(function(){return n.proxy[r].resolve(n.fonts[r]),n.fonts[r]}).catch(function(e){return n.proxy[r].reject(e),Promise.reject(e)})},load:function(o){var s=this;return"string"==typeof(o=null==o?{}:o)&&(o={path:o}),new Promise(function(t,n){var e,r;return(e=o.path)?(e=e.replace(/\/$/,""),(r=s.fonts[e])?t(r):(s.proxy[e]||(s.proxy[e]=proxise(function(e){return s._load(e)})),s.proxy[e](((r=l({},o)).path=e,r)).then(function(e){return t(e)}).catch(function(e){return n(e)}))):n(i({id:400}))})}},"undefined"!=typeof module&&null!==module?module.exports=c:"undefined"!=typeof window&&null!==window&&(window.xfl=c)}();

package/dist/worker.js

@@ -1,10 +1,11 @@
 var local, onmessage;
 local = {};
 onmessage = function(e){
-  var ref$, bufs, key, opentypeUrl;
-  ref$ = e.data || {}, bufs = ref$.bufs, key = ref$.key, opentypeUrl = ref$.opentypeUrl;
+  var ref$, bufs, key, lib;
+  ref$ = e.data || {}, bufs = ref$.bufs, key = ref$.key, lib = ref$.lib;
   if (!local.inited) {
-    importScripts(opentypeUrl || "opentype.js");
+    console.log(lib);
+    importScripts(lib || "opentype.js");
     local.inited = true;
   }
   return Promise.resolve().then(function(){

package/dist/worker.min.js

@@ -1 +1 @@
-var local,onmessage;local={};onmessage=function(e){var ref$,bufs,key,opentypeUrl;ref$=e.data||{},bufs=ref$.bufs,key=ref$.key,opentypeUrl=ref$.opentypeUrl;if(!local.inited){importScripts(opentypeUrl||"opentype.js");local.inited=true}return Promise.resolve().then(function(){return bufs.map(function(it){return opentype.parse(it)})}).then(function(fonts){var glyphs,i$,len$,font,j$,to$,i,merged,ref$;glyphs=[];for(i$=0,len$=fonts.length;i$<len$;++i$){font=fonts[i$];for(j$=0,to$=font.glyphs.length;j$<to$;++j$){i=j$;glyphs.push(font.glyphs.glyphs[i])}}font=fonts[0];merged=new opentype.Font((ref$={glyphs:glyphs,familyName:font.names.fontFamily.en,styleName:font.names.fontSubfamily.en},ref$.unitsPerEm=font.unitsPerEm,ref$.ascender=font.ascender,ref$.descender=font.descender,ref$));return postMessage({buf:merged.toArrayBuffer(),key:key})})};
+var local={},onmessage=function(e){var e=e.data||{},n=e.bufs,p=e.key,e=e.lib;return local.inited||(console.log(e),importScripts(e||"opentype.js"),local.inited=!0),Promise.resolve().then(function(){return n.map(function(e){return opentype.parse(e)})}).then(function(e){for(var n,t,r,s,o,a=[],l=0,i=e.length;l<i;++l)for(t=0,r=(n=e[l]).glyphs.length;t<r;++t)s=t,a.push(n.glyphs.glyphs[s]);return n=e[0],o=new opentype.Font(((o={glyphs:a,familyName:n.names.fontFamily.en,styleName:n.names.fontSubfamily.en}).unitsPerEm=n.unitsPerEm,o.ascender=n.ascender,o.descender=n.descender,o)),postMessage({buf:o.toArrayBuffer(),key:p})})};

package/package.json

@@ -3,8 +3,9 @@
   "name": "@xlfont/load",
   "license": "MIT",
   "description": "XL font generator and loader",
-  "version": "1.1.1",
-  "main": "dist/index.js",
+  "version": "2.0.0",
+  "browser": "dist/index.min.js",
+  "main": "dist/index.min.js",
   "homepage": "https://github.com/xlfont/load",
   "files": [
     "dist/**/*",
@@ -26,8 +27,8 @@
     "xfl-meta": "./bin/meta.js"
   },
   "dependencies": {
-    "@plotdb/opentype.js": "^1.3.4",
-    "colors": "^1.4.0",
+    "@plotdb/opentype.js": "^1.3.5",
+    "@plotdb/colors": "^0.0.1",
     "fs-extra": "^9.1.0",
     "progress": "^2.0.3",
     "ttf2woff": "^2.0.2",
@@ -35,27 +36,27 @@
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@loadingio/bootstrap.ext": "^0.0.1",
-    "@loadingio/debounce.js": "^0.0.1",
-    "@loadingio/ldquery": "^2.2.1",
-    "@loadingio/loading.css": "^2.0.1",
+    "@loadingio/bootstrap.ext": "^0.0.4",
+    "@loadingio/debounce.js": "^1.0.1",
+    "@loadingio/ldquery": "^3.0.1",
+    "@loadingio/loading.css": "^3.0.0",
     "@zbryikt/deploy": "^0.0.1",
-    "@zbryikt/template": "^2.3.22",
+    "@zbryikt/template": "^2.3.33",
     "bootstrap": "^4.5.3",
     "bootstrap.native": "^3.0.13",
-    "fedep": "^0.0.17",
-    "ldbutton": "^1.0.2",
-    "ldcover": "^2.0.0",
-    "ldloader": "^2.1.0",
-    "ldview": "^0.2.7",
+    "fedep": "^1.1.0",
+    "ldbutton": "^2.0.0",
+    "ldcover": "^3.0.1",
+    "ldloader": "^3.0.0",
+    "ldview": "^1.0.0",
     "livescript": "^1.6.0",
     "stylus": "^0.55.0",
-    "uglify-js": "^3.2.0",
+    "uglify-js": "^3.13.1",
     "uglifycss": "^0.0.29"
   },
   "peerDependencies": {
-    "@plotdb/opentype.js": "^1.3.4",
-    "proxise": "^0.1.3"
+    "@plotdb/opentype.js": "^1.3.5",
+    "proxise": "^1.0.1"
   },
   "frontendDependencies": {
     "root": "web/static/assets/lib",

package/dist/xfl.js

@@ -1,580 +0,0 @@
-var err, xlfWorker, xlfMerger, xlfont, xfl;
-err = function(e){
-  e == null && (e = {});
-  return import$(new Error(), import$({
-    name: 'lderror'
-  }, e));
-};
-xlfWorker = {
-  key: 0,
-  worker: null,
-  queue: [],
-  init: function(opt){
-    var this$ = this;
-    opt == null && (opt = {});
-    if (this.worker) {
-      return;
-    }
-    this.worker = new Worker(opt.url || "worker.min.js");
-    return this.worker.onmessage = function(e){
-      var ref$, buf, key, item;
-      ref$ = e.data, buf = ref$.buf, key = ref$.key;
-      if (!(item = this$.queue.filter(function(q){
-        return key === q.key;
-      })[0])) {
-        return;
-      }
-      this$.queue.splice(this$.queue.indexOf(item), 1);
-      return item.res(buf);
-    };
-  },
-  run: function(abs, opt){
-    var this$ = this;
-    return new Promise(function(res, rej){
-      var item;
-      this$.init(opt);
-      this$.queue.push(item = {
-        res: res,
-        rej: rej,
-        key: this$.key++
-      });
-      return this$.worker.postMessage({
-        bufs: abs,
-        key: item.key,
-        lib: opt.opentype
-      });
-    });
-  }
-};
-xlfMerger = function(arg$){
-  var bufs, useWorker;
-  bufs = arg$.bufs, useWorker = arg$.useWorker;
-  if (!bufs.length) {
-    return Promise.resolve();
-  }
-  if (useWorker) {
-    return xlfWorker.run(bufs, useWorker);
-  }
-  return Promise.resolve().then(function(){
-    return bufs.map(function(it){
-      return opentype.parse(it);
-    });
-  }).then(function(fonts){
-    var glyphs, i$, len$, font, j$, to$, i, merged, ref$;
-    glyphs = [];
-    for (i$ = 0, len$ = fonts.length; i$ < len$; ++i$) {
-      font = fonts[i$];
-      for (j$ = 0, to$ = font.glyphs.length; j$ < to$; ++j$) {
-        i = j$;
-        glyphs.push(font.glyphs.glyphs[i]);
-      }
-    }
-    font = fonts[0];
-    merged = new opentype.Font((ref$ = {
-      glyphs: glyphs,
-      familyName: font.names.fontFamily.en,
-      styleName: font.names.fontSubfamily.en
-    }, ref$.unitsPerEm = font.unitsPerEm, ref$.ascender = font.ascender, ref$.descender = font.descender, ref$));
-    return merged.toArrayBuffer();
-  });
-};
-xlfont = function(opt){
-  var that, this$ = this;
-  opt == null && (opt = {});
-  this.opt = opt;
-  this.sub = {
-    set: {},
-    font: {}
-  };
-  this.cjkOnly = opt.cjkOnly || false;
-  this.codemap = {};
-  this.otf = {
-    font: null,
-    dirty: true
-  };
-  this.path = opt.path;
-  this.name = opt.name || this.path.replace(/\.[a-zA-Z0-9]+$/, '').replace(/^https?:\/\/[^/]+\//g, '').replace(/\s/g, '-').replace(/\//g, '-').toLowerCase();
-  this.style = opt.style || 'normal';
-  this.weight = opt.weight || '400';
-  this.ext = opt.ext || (/\.(ttf|otf|woff2|woff)$/.exec(this.path) || [])[1] || '';
-  this.format = (that = this.ext.toLowerCase()) ? that === 'ttf'
-    ? 'truetype'
-    : that === 'otf' ? 'truetype' : that : '';
-  if (this.format) {
-    this.format = "format('" + this.format + "')";
-  }
-  this.className = "xfl-" + (this.name || '').replace(/\s+/g, '_') + "-" + Math.random().toString(36).substring(2);
-  this.isXl = opt.isXl != null
-    ? opt.isXl
-    : !this.ext;
-  if (!this.ext) {
-    this.ext = 'woff';
-  }
-  this.doMerge = opt.doMerge != null ? opt.doMerge : false;
-  this.useWorker = opt.useWorker != null ? opt.useWorker : false;
-  this.misschar = {};
-  this.css = [];
-  this.init = proxise.once(function(){
-    return this$._init();
-  });
-  this.init();
-  return this;
-};
-xlfont.prototype = import$(Object.create(Object.prototype), {
-  _init: function(){
-    var this$ = this;
-    return Promise.resolve().then(function(){
-      if (!this$.isXl) {
-        this$.css = [{
-          content: "@font-face {\n  font-family: \"" + this$.name + "\";\n  src: url(\"" + this$.path + "\") " + this$.format + ";\n  font-style: " + this$.style + ";\n  font-weight: " + this$.weight + ";\n}\n." + this$.className + " { font-family: \"" + this$.name + "\"; }"
-        }];
-        return xfl.update();
-      } else {
-        return new Promise(function(res, rej){
-          var xhr;
-          xhr = new XMLHttpRequest();
-          xhr.addEventListener('readystatechange', function(){
-            if (xhr.readyState !== XMLHttpRequest.DONE) {
-              return;
-            }
-            if (xhr.status !== 200) {
-              return rej(err({
-                code: xhr.status,
-                message: xhr.responseText
-              }));
-            }
-            (xhr.responseText || '').split('\n').map(function(d, i){
-              return d.split(' ').map(function(e, j){
-                return this$.codemap[e] = i + 1;
-              });
-            });
-            return res();
-          });
-          xhr.open('GET', this$.path + "/charmap.txt");
-          return xhr.send();
-        });
-      }
-    });
-  },
-  _fetch: function(f, dofetch, type){
-    var this$ = this;
-    f == null && (f = {});
-    dofetch == null && (dofetch = false);
-    type == null && (type = 'ttf');
-    if (!dofetch) {
-      if (!f.url) {
-        if (this.isXl) {
-          f.url = this.path + "/" + f.key + "." + type;
-          f.type = type;
-        } else {
-          f.url = this.path;
-          f.type = this.ext.toLowerCase() || type;
-        }
-      }
-      return Promise.resolve(f);
-    }
-    if (f.blob) {
-      return Promise.resolve(f);
-    }
-    if (!f.proxy) {
-      f.proxy = proxise(function(f){
-        var p;
-        if (f.running) {
-          return;
-        }
-        f.running = true;
-        p = new Promise(function(res, rej){
-          var xhr;
-          if (f.blob) {
-            return res(f);
-          }
-          xhr = new XMLHttpRequest();
-          xhr.addEventListener('readystatechange', function(){
-            if (xhr.readyState !== XMLHttpRequest.DONE) {
-              return;
-            }
-            if (xhr.status !== 200) {
-              return rej(err({
-                code: xhr.status,
-                message: xhr.responseText
-              }));
-            }
-            this$.otf.dirty = true;
-            f.url = URL.createObjectURL(xhr.response);
-            f.blob = xhr.response;
-            f.type = this$.ext.toLowerCase() || type;
-            return res(f);
-          });
-          if (this$.isXl) {
-            xhr.open('GET', this$.path + "/" + f.key + "." + type);
-          } else {
-            xhr.open('GET', this$.path);
-          }
-          xhr.responseType = 'blob';
-          return xhr.send();
-        });
-        return p['finally'](function(){
-          return f.running = false;
-        });
-      });
-    }
-    return f.proxy(f);
-  },
-  fetchAll: function(){
-    var k, f, this$ = this;
-    if (this.isXl) {
-      return Promise.all((function(){
-        var ref$, results$ = [];
-        for (k in ref$ = this.sub.font) {
-          f = ref$[k];
-          results$.push(f);
-        }
-        return results$;
-      }.call(this)).map(function(it){
-        return this$._fetch(it, true, 'woff');
-      }));
-    } else {
-      return this._fetch(this.sub.font[0], true, 'ttf');
-    }
-  },
-  fetch: function(list, dofetch){
-    var doMerge, ps, this$ = this;
-    list == null && (list = []);
-    dofetch == null && (dofetch = false);
-    if (!this.isXl) {
-      if (this.sub.font[0] && this.sub.font[0].blob) {
-        return Promise.resolve();
-      }
-      list = [0];
-    }
-    doMerge = this.doMerge;
-    ps = Array.from(new Set(list.map(function(it){
-      return it;
-    }))).filter(function(it){
-      return !this$.sub.font[it];
-    }).map(function(d, i){
-      var f, type;
-      this$.sub.font[d] = f = {
-        key: d
-      };
-      type = !this$.isXl ? 'ttf' : 'woff';
-      f.needMerge = +d !== 1;
-      return this$._fetch(f, !doMerge ? dofetch : true, type);
-    });
-    return Promise.all(ps).then(function(subfonts){
-      var ps;
-      if (!doMerge) {
-        return subfonts;
-      }
-      ps = subfonts.filter(function(it){
-        return it.needMerge;
-      }).map(function(font){
-        return new Promise(function(res, rej){
-          var fr;
-          fr = new FileReader();
-          fr.onerror = function(it){
-            return rej(it);
-          };
-          fr.onload = function(){
-            return res(fr.result);
-          };
-          return fr.readAsArrayBuffer(font.blob);
-        });
-      });
-      return Promise.all(ps).then(function(it){
-        return xlfMerger({
-          bufs: it,
-          useWorker: this$.useWorker
-        });
-      }).then(function(ab){
-        var font, blob;
-        if (!ab) {
-          return subfonts.filter(function(it){
-            return !it.needMerge;
-          });
-        }
-        font = subfonts.filter(function(it){
-          return it.needMerge;
-        })[0];
-        blob = new Blob([ab], {
-          type: "font/" + (font.type || 'ttf')
-        });
-        font = {
-          url: URL.createObjectURL(blob),
-          blob: blob,
-          type: font.type || 'ttf'
-        };
-        return subfonts.filter(function(it){
-          return !it.needMerge;
-        }).concat([font]);
-      });
-    }).then(function(subfonts){
-      var css, k, ref$, f, i$, len$;
-      if (!subfonts.length) {
-        return;
-      }
-      css = "." + this$.className + " { font-family: \"" + this$.name + "\"; }";
-      for (k in ref$ = this$.sub.font) {
-        f = ref$[k];
-      }
-      for (i$ = 0, len$ = subfonts.length; i$ < len$; ++i$) {
-        f = subfonts[i$];
-        css += "@font-face {\n  font-family: \"" + this$.name + "\";\n  src: url(\"" + f.url + "\") format('" + f.type + "');\n  font-style: " + this$.style + ";\n  font-weight: " + this$.weight + ";\n}";
-      }
-      return this$.css.push({
-        content: css
-      });
-    });
-  },
-  hasChar: function(c){
-    return typeof this.misschar[c] === 'undefined'
-      ? undefined
-      : !this.misshcar[c];
-  },
-  getPath: function(opt){
-    var ref$, text, x, y, fontSize, this$ = this;
-    opt == null && (opt = {});
-    ref$ = import$({
-      text: '',
-      x: 0,
-      y: 0,
-      fontSize: 48
-    }, opt), text = ref$.text, x = ref$.x, y = ref$.y, fontSize = ref$.fontSize;
-    return this.sync(text).then(function(){
-      return this$.getotf();
-    }).then(function(otf){
-      var txt, i$, to$, i, path;
-      txt = '';
-      for (i$ = 0, to$ = text.length; i$ < to$; ++i$) {
-        i = i$;
-        txt += !this$.misschar[text[i]] ? text[i] : ' ';
-      }
-      path = otf.getPath(txt, x, y, fontSize);
-      return path;
-    });
-  },
-  getotf: function(){
-    var this$ = this;
-    if (!(typeof opentype != 'undefined' && opentype !== null)) {
-      return Promise.reject(err({
-        id: 1022,
-        message: "[@plotdb/xfl] need opentype.js to merge subfonts"
-      }));
-    }
-    if (!this.otf.dirty) {
-      return Promise.resolve(this.otf.font);
-    }
-    return Promise.resolve().then(function(){
-      if (!this$.isXl) {
-        return this$.fetch();
-      } else {
-        return this$.fetchAll();
-      }
-    }).then(function(){
-      var ps, k, f;
-      ps = (function(){
-        var ref$, results$ = [];
-        for (k in ref$ = this.sub.font) {
-          f = ref$[k];
-          results$.push(f);
-        }
-        return results$;
-      }.call(this$)).map(function(f){
-        if (f.otf) {
-          return Promise.resolve(f);
-        } else {
-          return opentype.load(f.url).then(function(it){
-            f.otf = it;
-            return f;
-          });
-        }
-      });
-      return Promise.all(ps);
-    }).then(function(list){
-      var glyphs, ref$, ref1$;
-      list == null && (list = []);
-      if (list.length === 1) {
-        return list[0].otf;
-      }
-      glyphs = list.map(function(f){
-        var glyphs, i$, to$, i, results$ = [];
-        glyphs = f.otf.glyphs;
-        for (i$ = 1, to$ = glyphs.length; i$ <= to$; ++i$) {
-          i = i$;
-          results$.push(glyphs.glyphs[i]);
-        }
-        return results$;
-      }).reduce(function(a, b){
-        return a.concat(b);
-      }, []).filter(function(it){
-        return it;
-      });
-      this$.otf.font = new opentype.Font((ref1$ = {
-        familyName: this$.name,
-        styleName: this$.style || 'normal',
-        glyphs: glyphs
-      }, ref1$.unitsPerEm = (ref$ = list[0].otf).unitsPerEm, ref1$.ascender = ref$.ascender, ref1$.descender = ref$.descender, ref1$));
-      this$.otf.font.kerningPairs = {};
-      return this$.otf.font;
-    });
-  },
-  sync: function(txt){
-    var this$ = this;
-    txt == null && (txt = "");
-    if (!this.isXl) {
-      xfl.update();
-      return Promise.resolve();
-    }
-    return Promise.resolve().then(function(){
-      var ref$, misscodes, missset, i$, to$, i, code, setIdx, k, list, res$;
-      ref$ = [{}, {}], misscodes = ref$[0], missset = ref$[1];
-      for (i$ = 0, to$ = txt.length; i$ < to$; ++i$) {
-        i = i$;
-        code = txt.charCodeAt(i);
-        if (this$.cjkOnly && !xfl.isCJK(code)) {
-          continue;
-        }
-        setIdx = this$.codemap[code.toString(16)];
-        this$.misschar[txt[i]] = misscodes[txt[i]] = !setIdx ? true : false;
-        if (setIdx && !this$.sub.set[setIdx]) {
-          this$.sub.set[setIdx] = missset[setIdx] = true;
-        }
-      }
-      misscodes = (function(){
-        var results$ = [];
-        for (k in misscodes) {
-          results$.push(k);
-        }
-        return results$;
-      }()).filter(function(it){
-        return misscodes[it];
-      });
-      if (misscodes.length) {
-        console.log("[@plotdb/xfl] sync xl-font with following chars unsupported: " + misscodes.join(''));
-      }
-      res$ = [];
-      for (k in missset) {
-        res$.push(k);
-      }
-      list = res$;
-      if (list.length) {
-        return this$.fetch(list);
-      }
-    }).then(function(){
-      return xfl.update();
-    });
-  }
-});
-xfl = {
-  range: {
-    CJK: [[0x3040, 0x30ff], [0x3400, 0x4dbf], [0x4e00, 0x9fff], [0xf900, 0xfaff], [0xff66, 0xff9f], [0x3131, 0xD79D]]
-  },
-  fonts: {},
-  running: {},
-  isCJK: function(code){
-    return this.range.CJK.filter(function(it){
-      return code >= it[0] && code <= it[1];
-    }).length;
-  },
-  proxy: {},
-  update: function(){
-    var css, k, ref$, v, node, f;
-    css = "";
-    for (k in ref$ = this.fonts) {
-      v = ref$[k];
-      (v.css || []).filter(fn$).map(fn1$);
-    }
-    if (css) {
-      node = document.createElement("style");
-      node.textContent = css;
-      node.setAttribute('type', 'text/css');
-      document.body.appendChild(node);
-    }
-    return Promise.all((function(){
-      var ref$, results$ = [];
-      for (k in ref$ = this.fonts) {
-        f = ref$[k];
-        results$.push(f);
-      }
-      return results$;
-    }.call(this)).map(function(){
-      return document.fonts.load("16px " + v.name);
-    })).then(function(){
-      return new Promise(function(res, rej){
-        return setTimeout(function(){
-          return res();
-        }, 350);
-      });
-    });
-    function fn$(it){
-      return !it.rendered;
-    }
-    function fn1$(it){
-      it.rendered = true;
-      return css = css + it.content;
-    }
-  },
-  _load: function(opt){
-    var path, this$ = this;
-    opt == null && (opt = {});
-    path = opt.path;
-    if (this.running[path]) {
-      return;
-    }
-    this.running[path] = true;
-    return Promise.resolve().then(function(){
-      var fobj;
-      this$.fonts[path] = fobj = new xlfont(opt);
-      return fobj.init();
-    })['finally'](function(){
-      return this$.running[path] = false;
-    }).then(function(){
-      this$.proxy[path].resolve(this$.fonts[path]);
-      return this$.fonts[path];
-    })['catch'](function(it){
-      this$.proxy[path].reject(it);
-      return Promise.reject(it);
-    });
-  },
-  load: function(opt){
-    var this$ = this;
-    opt == null && (opt = {});
-    if (typeof opt === 'string') {
-      opt = {
-        path: opt
-      };
-    }
-    return new Promise(function(res, rej){
-      var path, that, ref$;
-      if (!(path = opt.path)) {
-        return rej(err({
-          id: 400
-        }));
-      }
-      path = path.replace(/\/$/, '');
-      if (that = this$.fonts[path]) {
-        return res(that);
-      }
-      if (!this$.proxy[path]) {
-        this$.proxy[path] = proxise(function(it){
-          return this$._load(it);
-        });
-      }
-      return this$.proxy[path]((ref$ = import$({}, opt), ref$.path = path, ref$)).then(function(it){
-        return res(it);
-      })['catch'](function(it){
-        return rej(it);
-      });
-    });
-  }
-};
-if (typeof module != 'undefined' && module !== null) {
-  module.exports = xfl;
-} else if (typeof window != 'undefined' && window !== null) {
-  window.xfl = xfl;
-}
-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/xfl.min.js

@@ -1 +0,0 @@
-var err,xlfWorker,xlfMerger,xlfont,xfl;err=function(e){e==null&&(e={});return import$(new Error,import$({name:"lderror"},e))};xlfWorker={key:0,worker:null,queue:[],init:function(opt){var this$=this;opt==null&&(opt={});if(this.worker){return}this.worker=new Worker(opt.url||"worker.min.js");return this.worker.onmessage=function(e){var ref$,buf,key,item;ref$=e.data,buf=ref$.buf,key=ref$.key;if(!(item=this$.queue.filter(function(q){return key===q.key})[0])){return}this$.queue.splice(this$.queue.indexOf(item),1);return item.res(buf)}},run:function(abs,opt){var this$=this;return new Promise(function(res,rej){var item;this$.init(opt);this$.queue.push(item={res:res,rej:rej,key:this$.key++});return this$.worker.postMessage({bufs:abs,key:item.key,lib:opt.opentype})})}};xlfMerger=function(arg$){var bufs,useWorker;bufs=arg$.bufs,useWorker=arg$.useWorker;if(!bufs.length){return Promise.resolve()}if(useWorker){return xlfWorker.run(bufs,useWorker)}return Promise.resolve().then(function(){return bufs.map(function(it){return opentype.parse(it)})}).then(function(fonts){var glyphs,i$,len$,font,j$,to$,i,merged,ref$;glyphs=[];for(i$=0,len$=fonts.length;i$<len$;++i$){font=fonts[i$];for(j$=0,to$=font.glyphs.length;j$<to$;++j$){i=j$;glyphs.push(font.glyphs.glyphs[i])}}font=fonts[0];merged=new opentype.Font((ref$={glyphs:glyphs,familyName:font.names.fontFamily.en,styleName:font.names.fontSubfamily.en},ref$.unitsPerEm=font.unitsPerEm,ref$.ascender=font.ascender,ref$.descender=font.descender,ref$));return merged.toArrayBuffer()})};xlfont=function(opt){var that,this$=this;opt==null&&(opt={});this.opt=opt;this.sub={set:{},font:{}};this.cjkOnly=opt.cjkOnly||false;this.codemap={};this.otf={font:null,dirty:true};this.path=opt.path;this.name=opt.name||this.path.replace(/\.[a-zA-Z0-9]+$/,"").replace(/^https?:\/\/[^/]+\//g,"").replace(/\s/g,"-").replace(/\//g,"-").toLowerCase();this.style=opt.style||"normal";this.weight=opt.weight||"400";this.ext=opt.ext||(/\.(ttf|otf|woff2|woff)$/.exec(this.path)||[])[1]||"";this.format=(that=this.ext.toLowerCase())?that==="ttf"?"truetype":that==="otf"?"truetype":that:"";if(this.format){this.format="format('"+this.format+"')"}this.className="xfl-"+(this.name||"").replace(/\s+/g,"_")+"-"+Math.random().toString(36).substring(2);this.isXl=opt.isXl!=null?opt.isXl:!this.ext;if(!this.ext){this.ext="woff"}this.doMerge=opt.doMerge!=null?opt.doMerge:false;this.useWorker=opt.useWorker!=null?opt.useWorker:false;this.misschar={};this.css=[];this.init=proxise.once(function(){return this$._init()});this.init();return this};xlfont.prototype=import$(Object.create(Object.prototype),{_init:function(){var this$=this;return Promise.resolve().then(function(){if(!this$.isXl){this$.css=[{content:'@font-face {\n  font-family: "'+this$.name+'";\n  src: url("'+this$.path+'") '+this$.format+";\n  font-style: "+this$.style+";\n  font-weight: "+this$.weight+";\n}\n."+this$.className+' { font-family: "'+this$.name+'"; }'}];return xfl.update()}else{return new Promise(function(res,rej){var xhr;xhr=new XMLHttpRequest;xhr.addEventListener("readystatechange",function(){if(xhr.readyState!==XMLHttpRequest.DONE){return}if(xhr.status!==200){return rej(err({code:xhr.status,message:xhr.responseText}))}(xhr.responseText||"").split("\n").map(function(d,i){return d.split(" ").map(function(e,j){return this$.codemap[e]=i+1})});return res()});xhr.open("GET",this$.path+"/charmap.txt");return xhr.send()})}})},_fetch:function(f,dofetch,type){var this$=this;f==null&&(f={});dofetch==null&&(dofetch=false);type==null&&(type="ttf");if(!dofetch){if(!f.url){if(this.isXl){f.url=this.path+"/"+f.key+"."+type;f.type=type}else{f.url=this.path;f.type=this.ext.toLowerCase()||type}}return Promise.resolve(f)}if(f.blob){return Promise.resolve(f)}if(!f.proxy){f.proxy=proxise(function(f){var p;if(f.running){return}f.running=true;p=new Promise(function(res,rej){var xhr;if(f.blob){return res(f)}xhr=new XMLHttpRequest;xhr.addEventListener("readystatechange",function(){if(xhr.readyState!==XMLHttpRequest.DONE){return}if(xhr.status!==200){return rej(err({code:xhr.status,message:xhr.responseText}))}this$.otf.dirty=true;f.url=URL.createObjectURL(xhr.response);f.blob=xhr.response;f.type=this$.ext.toLowerCase()||type;return res(f)});if(this$.isXl){xhr.open("GET",this$.path+"/"+f.key+"."+type)}else{xhr.open("GET",this$.path)}xhr.responseType="blob";return xhr.send()});return p["finally"](function(){return f.running=false})})}return f.proxy(f)},fetchAll:function(){var k,f,this$=this;if(this.isXl){return Promise.all(function(){var ref$,results$=[];for(k in ref$=this.sub.font){f=ref$[k];results$.push(f)}return results$}.call(this).map(function(it){return this$._fetch(it,true,"woff")}))}else{return this._fetch(this.sub.font[0],true,"ttf")}},fetch:function(list,dofetch){var doMerge,ps,this$=this;list==null&&(list=[]);dofetch==null&&(dofetch=false);if(!this.isXl){if(this.sub.font[0]&&this.sub.font[0].blob){return Promise.resolve()}list=[0]}doMerge=this.doMerge;ps=Array.from(new Set(list.map(function(it){return it}))).filter(function(it){return!this$.sub.font[it]}).map(function(d,i){var f,type;this$.sub.font[d]=f={key:d};type=!this$.isXl?"ttf":"woff";f.needMerge=+d!==1;return this$._fetch(f,!doMerge?dofetch:true,type)});return Promise.all(ps).then(function(subfonts){var ps;if(!doMerge){return subfonts}ps=subfonts.filter(function(it){return it.needMerge}).map(function(font){return new Promise(function(res,rej){var fr;fr=new FileReader;fr.onerror=function(it){return rej(it)};fr.onload=function(){return res(fr.result)};return fr.readAsArrayBuffer(font.blob)})});return Promise.all(ps).then(function(it){return xlfMerger({bufs:it,useWorker:this$.useWorker})}).then(function(ab){var font,blob;if(!ab){return subfonts.filter(function(it){return!it.needMerge})}font=subfonts.filter(function(it){return it.needMerge})[0];blob=new Blob([ab],{type:"font/"+(font.type||"ttf")});font={url:URL.createObjectURL(blob),blob:blob,type:font.type||"ttf"};return subfonts.filter(function(it){return!it.needMerge}).concat([font])})}).then(function(subfonts){var css,k,ref$,f,i$,len$;if(!subfonts.length){return}css="."+this$.className+' { font-family: "'+this$.name+'"; }';for(k in ref$=this$.sub.font){f=ref$[k]}for(i$=0,len$=subfonts.length;i$<len$;++i$){f=subfonts[i$];css+='@font-face {\n  font-family: "'+this$.name+'";\n  src: url("'+f.url+"\") format('"+f.type+"');\n  font-style: "+this$.style+";\n  font-weight: "+this$.weight+";\n}"}return this$.css.push({content:css})})},hasChar:function(c){return typeof this.misschar[c]==="undefined"?undefined:!this.misshcar[c]},getPath:function(opt){var ref$,text,x,y,fontSize,this$=this;opt==null&&(opt={});ref$=import$({text:"",x:0,y:0,fontSize:48},opt),text=ref$.text,x=ref$.x,y=ref$.y,fontSize=ref$.fontSize;return this.sync(text).then(function(){return this$.getotf()}).then(function(otf){var txt,i$,to$,i,path;txt="";for(i$=0,to$=text.length;i$<to$;++i$){i=i$;txt+=!this$.misschar[text[i]]?text[i]:" "}path=otf.getPath(txt,x,y,fontSize);return path})},getotf:function(){var this$=this;if(!(typeof opentype!="undefined"&&opentype!==null)){return Promise.reject(err({id:1022,message:"[@plotdb/xfl] need opentype.js to merge subfonts"}))}if(!this.otf.dirty){return Promise.resolve(this.otf.font)}return Promise.resolve().then(function(){if(!this$.isXl){return this$.fetch()}else{return this$.fetchAll()}}).then(function(){var ps,k,f;ps=function(){var ref$,results$=[];for(k in ref$=this.sub.font){f=ref$[k];results$.push(f)}return results$}.call(this$).map(function(f){if(f.otf){return Promise.resolve(f)}else{return opentype.load(f.url).then(function(it){f.otf=it;return f})}});return Promise.all(ps)}).then(function(list){var glyphs,ref$,ref1$;list==null&&(list=[]);if(list.length===1){return list[0].otf}glyphs=list.map(function(f){var glyphs,i$,to$,i,results$=[];glyphs=f.otf.glyphs;for(i$=1,to$=glyphs.length;i$<=to$;++i$){i=i$;results$.push(glyphs.glyphs[i])}return results$}).reduce(function(a,b){return a.concat(b)},[]).filter(function(it){return it});this$.otf.font=new opentype.Font((ref1$={familyName:this$.name,styleName:this$.style||"normal",glyphs:glyphs},ref1$.unitsPerEm=(ref$=list[0].otf).unitsPerEm,ref1$.ascender=ref$.ascender,ref1$.descender=ref$.descender,ref1$));this$.otf.font.kerningPairs={};return this$.otf.font})},sync:function(txt){var this$=this;txt==null&&(txt="");if(!this.isXl){xfl.update();return Promise.resolve()}return Promise.resolve().then(function(){var ref$,misscodes,missset,i$,to$,i,code,setIdx,k,list,res$;ref$=[{},{}],misscodes=ref$[0],missset=ref$[1];for(i$=0,to$=txt.length;i$<to$;++i$){i=i$;code=txt.charCodeAt(i);if(this$.cjkOnly&&!xfl.isCJK(code)){continue}setIdx=this$.codemap[code.toString(16)];this$.misschar[txt[i]]=misscodes[txt[i]]=!setIdx?true:false;if(setIdx&&!this$.sub.set[setIdx]){this$.sub.set[setIdx]=missset[setIdx]=true}}misscodes=function(){var results$=[];for(k in misscodes){results$.push(k)}return results$}().filter(function(it){return misscodes[it]});if(misscodes.length){console.log("[@plotdb/xfl] sync xl-font with following chars unsupported: "+misscodes.join(""))}res$=[];for(k in missset){res$.push(k)}list=res$;if(list.length){return this$.fetch(list)}}).then(function(){return xfl.update()})}});xfl={range:{CJK:[[12352,12543],[13312,19903],[19968,40959],[63744,64255],[65382,65439],[12593,55197]]},fonts:{},running:{},isCJK:function(code){return this.range.CJK.filter(function(it){return code>=it[0]&&code<=it[1]}).length},proxy:{},update:function(){var css,k,ref$,v,node,f;css="";for(k in ref$=this.fonts){v=ref$[k];(v.css||[]).filter(fn$).map(fn1$)}if(css){node=document.createElement("style");node.textContent=css;node.setAttribute("type","text/css");document.body.appendChild(node)}return Promise.all(function(){var ref$,results$=[];for(k in ref$=this.fonts){f=ref$[k];results$.push(f)}return results$}.call(this).map(function(){return document.fonts.load("16px "+v.name)})).then(function(){return new Promise(function(res,rej){return setTimeout(function(){return res()},350)})});function fn$(it){return!it.rendered}function fn1$(it){it.rendered=true;return css=css+it.content}},_load:function(opt){var path,this$=this;opt==null&&(opt={});path=opt.path;if(this.running[path]){return}this.running[path]=true;return Promise.resolve().then(function(){var fobj;this$.fonts[path]=fobj=new xlfont(opt);return fobj.init()})["finally"](function(){return this$.running[path]=false}).then(function(){this$.proxy[path].resolve(this$.fonts[path]);return this$.fonts[path]})["catch"](function(it){this$.proxy[path].reject(it);return Promise.reject(it)})},load:function(opt){var this$=this;opt==null&&(opt={});if(typeof opt==="string"){opt={path:opt}}return new Promise(function(res,rej){var path,that,ref$;if(!(path=opt.path)){return rej(err({id:400}))}path=path.replace(/\/$/,"");if(that=this$.fonts[path]){return res(that)}if(!this$.proxy[path]){this$.proxy[path]=proxise(function(it){return this$._load(it)})}return this$.proxy[path]((ref$=import$({},opt),ref$.path=path,ref$)).then(function(it){return res(it)})["catch"](function(it){return rej(it)})})}};if(typeof module!="undefined"&&module!==null){module.exports=xfl}else if(typeof window!="undefined"&&window!==null){window.xfl=xfl}function import$(obj,src){var own={}.hasOwnProperty;for(var key in src)if(own.call(src,key))obj[key]=src[key];return obj}