diff --git a/.gitignore b/.gitignore index 159e4fc..0147a96 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ misc/coverage.html ctest/sauce* *.sheetjs *.tgz +package-lock.json \ No newline at end of file diff --git a/Makefile b/Makefile index d3e7d23..01c0217 100644 --- a/Makefile +++ b/Makefile @@ -61,6 +61,10 @@ dist: $(TARGET) ## Prepare JS files for distribution test mocha: test.js $(TARGET) ## Run test suite $(MOCHA) -R spec -t 20000 +.PHONY: test-deno +test-deno: test.ts ## Run Deno test suite + deno test --check --allow-env --allow-read --allow-write --config misc/test.deno.jsonc $< + .PHONY: ctest ctest: ## Build browser test (into ctest/ subdirectory) cp -f test.js ctest/test.js @@ -69,7 +73,7 @@ ctest: ## Build browser test (into ctest/ subdirectory) .PHONY: ctestserv ctestserv: ## Start a test server on port 8000 - @cd ctest && python -mSimpleHTTPServer + @cd ctest && python -mSimpleHTTPServer || python3 -mhttp.server || npx -y http-server -p 8000 . .PHONY: stress stress: ## Run stress tests diff --git a/README.md b/README.md index 41286bb..6b3ac4d 100644 --- a/README.md +++ b/README.md @@ -76,16 +76,16 @@ A self-contained specification of the printf format string is included below in ## Installation -With [npm](https://www.npmjs.org/package/printj): +A NodeJS package is available on the SheetJS CDN: ```bash -$ npm install printj +$ npm install --save https://cdn.sheetjs.com/printj-1.3.2/printj-1.3.2.tgz ``` In the browser: ```html - + ``` The browser exposes a variable `PRINTJ` @@ -189,16 +189,6 @@ granted by the Apache 2.0 license are reserved by the Original Author. [![Build Status](https://saucelabs.com/browser-matrix/printj.svg)](https://saucelabs.com/u/printj) -[![Build Status](https://travis-ci.org/SheetJS/printj.svg?branch=master)](https://travis-ci.org/SheetJS/printj) - -[![Coverage Status](http://img.shields.io/coveralls/SheetJS/printj/master.svg)](https://coveralls.io/r/SheetJS/printj?branch=master) - -[![NPM Downloads](https://img.shields.io/npm/dt/printj.svg)](https://npmjs.org/package/printj) - -[![Dependencies Status](https://david-dm.org/sheetjs/printj/status.svg)](https://david-dm.org/sheetjs/printj) - -[![Analytics](https://ga-beacon.appspot.com/UA-36810333-1/SheetJS/printj?pixel)](https://github.com/SheetJS/printj) - # printf format string specification The `printf` family of functions attempt to generate and output a string of diff --git a/bits/01_version.js b/bits/01_version.js index c39cf20..a660420 100644 --- a/bits/01_version.js +++ b/bits/01_version.js @@ -1 +1 @@ -PRINTJ.version = '1.3.1'; +PRINTJ.version = '1.3.2'; diff --git a/bits/50_doit.js b/bits/50_doit.js index 229355b..c6d489f 100644 --- a/bits/50_doit.js +++ b/bits/50_doit.js @@ -8,6 +8,7 @@ var u_inspect/*:(o:any)=>string*/ = JSON.stringify; if(typeof process !== 'undefined' && !!process.versions && !!process.versions.node) util=require("util"); var u_inspect/*:(o:any)=>string*/ = (typeof util != 'undefined') ? util.inspect : JSON.stringify; #endif +function set_inspect(inspect) { u_inspect = inspect; } function doit(t/*:ParsedFmt*/, args/*:Array*/)/*:string*/ { //var o/*:Array*/ = []; diff --git a/bits/90_exports.js b/bits/90_exports.js index c247979..44e8123 100644 --- a/bits/90_exports.js +++ b/bits/90_exports.js @@ -2,3 +2,4 @@ PRINTJ.sprintf = sprintf; PRINTJ.vsprintf = vsprintf; PRINTJ._doit = doit; PRINTJ._tokenize = tokenize; +PRINTJ.set_inspect = set_inspect; \ No newline at end of file diff --git a/bits/99_esmfoot.js b/bits/99_esmfoot.js index 54a466f..91b2325 100644 --- a/bits/99_esmfoot.js +++ b/bits/99_esmfoot.js @@ -1 +1 @@ -export { sprintf, vsprintf }; +export { sprintf, vsprintf, set_inspect }; diff --git a/ctest/printj.js b/ctest/printj.js index 09bd070..b707bbd 100644 --- a/ctest/printj.js +++ b/ctest/printj.js @@ -25,7 +25,7 @@ var PRINTJ; /*jshint ignore:end */ }(function(PRINTJ) { -PRINTJ.version = '1.3.0'; +PRINTJ.version = '1.3.2'; var tcache = {}; @@ -156,6 +156,8 @@ function tokenize(fmt) { if(typeof process !== 'undefined' && !!process.versions && !!process.versions.node) util=require("util"); var u_inspect = (typeof util != 'undefined') ? util.inspect : JSON.stringify; +function set_inspect(inspect) { u_inspect = inspect; } + function doit(t, args) { //var o = []; var o = ""; @@ -597,6 +599,6 @@ PRINTJ.sprintf = sprintf; PRINTJ.vsprintf = vsprintf; PRINTJ._doit = doit; PRINTJ._tokenize = tokenize; - +PRINTJ.set_inspect = set_inspect; })); diff --git a/ctest/test.js b/ctest/test.js index c807d0e..b90a2cf 100644 --- a/ctest/test.js +++ b/ctest/test.js @@ -1,4 +1,6 @@ /* vim: set ts=2: */ +/* eslint-env mocha */ +/*global assert:true */ var X; var IMPLS = {}, IMPLA = [], IMPL = []; if(typeof require !== 'undefined') { @@ -172,6 +174,13 @@ describe('special cases', function() { assert.equal(sprintf("|%1$b|%1$B|%1$d|%1$D|%1$i|%1$o|%1$O|%1$u|%1$U|%1$x|%1$X|", undefined), "|0|0|0|0|0|0|0|0|0|0|0|"); assert.equal(sprintf("|%1$b|%1$B|%1$d|%1$D|%1$i|%1$o|%1$O|%1$u|%1$U|%1$x|%1$X|", null), "|0|0|0|0|0|0|0|0|0|0|0|"); }); + if(typeof JSON !== "undefined") it('correctly handles JSON conversion: J', function() { + var data = ({a:1}); + assert.equal(sprintf("%J", data), JSON.stringify(data)); + X.set_inspect(function(data) { return "|" + JSON.stringify(data) + "|"; }); + assert.equal(sprintf("%J", data), JSON.stringify(data)); + assert.equal(sprintf("%#J", data), "|" + JSON.stringify(data) + "|"); + }); it('handles dynamic specifiers', function() { assert.equal(sprintf("|%5s|", "sheetjs"), "|sheetjs|"); assert.equal(sprintf("|%*s|", 5, "sheetjs"), "|sheetjs|"); diff --git a/dist/printj.js b/dist/printj.js index a102fa2..b707bbd 100644 --- a/dist/printj.js +++ b/dist/printj.js @@ -25,7 +25,7 @@ var PRINTJ; /*jshint ignore:end */ }(function(PRINTJ) { -PRINTJ.version = '1.3.1'; +PRINTJ.version = '1.3.2'; var tcache = {}; @@ -156,6 +156,8 @@ function tokenize(fmt) { if(typeof process !== 'undefined' && !!process.versions && !!process.versions.node) util=require("util"); var u_inspect = (typeof util != 'undefined') ? util.inspect : JSON.stringify; +function set_inspect(inspect) { u_inspect = inspect; } + function doit(t, args) { //var o = []; var o = ""; @@ -597,6 +599,6 @@ PRINTJ.sprintf = sprintf; PRINTJ.vsprintf = vsprintf; PRINTJ._doit = doit; PRINTJ._tokenize = tokenize; - +PRINTJ.set_inspect = set_inspect; })); diff --git a/dist/printj.min.js b/dist/printj.min.js index b43f1b7..91e9b1e 100644 --- a/dist/printj.min.js +++ b/dist/printj.min.js @@ -1,2 +1,2 @@ /* printj.js (C) 2016-present SheetJS -- http://sheetjs.com */ -var PRINTJ;(function(factory){if(typeof DO_NOT_EXPORT_PRINTJ==="undefined"){if("object"===typeof exports){factory(exports)}else if("function"===typeof define&&define.amd){define(function(){var module={};factory(module);return module})}else{factory(PRINTJ={})}}else{factory(PRINTJ={})}})(function(PRINTJ){PRINTJ.version="1.3.1";var tcache={};function tokenize(fmt){if(tcache[fmt])return tcache[fmt];var out=[];var start=0;var i=0;var infmt=false;var fmtparam="",fmtflags="",fmtwidth="",fmtprec="",fmtlen="";var c=0;var L=fmt.length;for(;i=48&&c<58){if(fmtprec.length)fmtprec+=String.fromCharCode(c);else if(c==48&&!fmtwidth.length)fmtflags+=String.fromCharCode(c);else fmtwidth+=String.fromCharCode(c)}else switch(c){case 36:if(fmtprec.length)fmtprec+="$";else if(fmtwidth.charAt(0)=="*")fmtwidth+="$";else{fmtparam=fmtwidth+"$";fmtwidth=""}break;case 39:fmtflags+="'";break;case 45:fmtflags+="-";break;case 43:fmtflags+="+";break;case 32:fmtflags+=" ";break;case 35:fmtflags+="#";break;case 46:fmtprec=".";break;case 42:if(fmtprec.charAt(0)==".")fmtprec+="*";else fmtwidth+="*";break;case 104:;case 108:if(fmtlen.length>1)throw"bad length "+fmtlen+String(c);fmtlen+=String.fromCharCode(c);break;case 76:;case 106:;case 122:;case 116:;case 113:;case 90:;case 119:if(fmtlen!=="")throw"bad length "+fmtlen+String.fromCharCode(c);fmtlen=String.fromCharCode(c);break;case 73:if(fmtlen!=="")throw"bad length "+fmtlen+"I";fmtlen="I";break;case 100:;case 105:;case 111:;case 117:;case 120:;case 88:;case 102:;case 70:;case 101:;case 69:;case 103:;case 71:;case 97:;case 65:;case 99:;case 67:;case 115:;case 83:;case 112:;case 110:;case 68:;case 85:;case 79:;case 109:;case 98:;case 66:;case 121:;case 89:;case 74:;case 86:;case 84:;case 37:infmt=false;if(fmtprec.length>1)fmtprec=fmtprec.substr(1);out.push([String.fromCharCode(c),fmt.substring(start,i+1),fmtparam,fmtflags,fmtwidth,fmtprec,fmtlen]);start=i+1;fmtlen=fmtprec=fmtwidth=fmtflags=fmtparam="";break;default:throw new Error("Invalid format string starting with |"+fmt.substring(start,i+1)+"|");}}if(start-1;if(m[2])argidx=parseInt(m[2],10)-1;else if(c===109&&!alt){o+="Success";continue}var width=0;if(m[4].length>0){if(m[4].charAt(0)!=="*")width=parseInt(m[4],10);else if(m[4].length===1)width=args[idx++];else width=args[parseInt(m[4].substr(1),10)-1]}var prec=-1;if(m[5].length>0){if(m[5].charAt(0)!=="*")prec=parseInt(m[5],10);else if(m[5].length===1)prec=args[idx++];else prec=args[parseInt(m[5].substr(1),10)-1]}if(!m[2])argidx=idx++;var arg=args[argidx];var len=m[6];switch(c){case 83:;case 115:O=String(arg);if(prec>=0)O=O.substr(0,prec);if(width>O.length||-width>O.length){if((flags.indexOf("-")==-1||width<0)&&flags.indexOf("0")!=-1){pad=width-O.length>=0?"0".repeat(width-O.length):"";O=pad+O}else{pad=width-O.length>=0?" ".repeat(width-O.length):"";O=flags.indexOf("-")>-1?O+pad:pad+O}}break;case 67:;case 99:switch(typeof arg){case"number":var cc=arg;if(c==67||len.charCodeAt(0)===108){cc&=4294967295;O=String.fromCharCode(cc)}else{cc&=255;O=String.fromCharCode(cc)}break;case"string":O=arg.charAt(0);break;default:O=String(arg).charAt(0);}if(width>O.length||-width>O.length){if((flags.indexOf("-")==-1||width<0)&&flags.indexOf("0")!=-1){pad=width-O.length>=0?"0".repeat(width-O.length):"";O=pad+O}else{pad=width-O.length>=0?" ".repeat(width-O.length):"";O=flags.indexOf("-")>-1?O+pad:pad+O}}break;case 68:bytes=8;case 100:;case 105:isnum=-1;sign=true;break;case 85:bytes=8;case 117:isnum=-1;break;case 79:bytes=8;case 111:isnum=-1;radix=8;break;case 120:isnum=-1;radix=-16;break;case 88:isnum=-1;radix=16;break;case 66:bytes=8;case 98:isnum=-1;radix=2;break;case 70:;case 102:isnum=1;break;case 69:;case 101:isnum=2;break;case 71:;case 103:isnum=3;break;case 65:;case 97:isnum=4;break;case 112:Vnum=typeof arg=="number"?arg:arg?Number(arg.l):-1;if(isNaN(Vnum))Vnum=-1;if(alt)O=Vnum.toString(10);else{Vnum=Math.abs(Vnum);O="0x"+Vnum.toString(16).toLowerCase()}break;case 110:if(arg){arg.len=o.length}continue;case 109:if(!(arg instanceof Error))O="Success";else if(arg.message)O=arg.message;else if(arg.errno)O="Error number "+arg.errno;else O="Error "+String(arg);break;case 74:O=(alt?u_inspect:JSON.stringify)(arg);break;case 86:O=arg==null?"null":String(arg.valueOf());break;case 84:if(alt){O=Object.prototype.toString.call(arg).substr(8);O=O.substr(0,O.length-1)}else O=typeof arg;break;case 89:;case 121:O=arg?alt?"yes":"true":alt?"no":"false";if(c==89)O=O.toUpperCase();if(prec>=0)O=O.substr(0,prec);if(width>O.length||-width>O.length){if((flags.indexOf("-")==-1||width<0)&&flags.indexOf("0")!=-1){pad=width-O.length>=0?"0".repeat(width-O.length):"";O=pad+O}else{pad=width-O.length>=0?" ".repeat(width-O.length):"";O=flags.indexOf("-")>-1?O+pad:pad+O}}break;}if(width<0){width=-width;flags+="-"}if(isnum==-1){Vnum=Number(arg);switch(len){case"hh":{bytes=1}break;case"h":{bytes=2}break;case"l":{if(bytes==4)bytes=8}break;case"L":;case"q":;case"ll":{if(bytes==4)bytes=8}break;case"j":{if(bytes==4)bytes=8}break;case"t":{if(bytes==4)bytes=8}break;case"z":;case"Z":{if(bytes==4)bytes=8}break;case"I":{if(bytes==4)bytes=8}break;case"w":break;}switch(bytes){case 1:Vnum=Vnum&255;if(sign&&Vnum>127)Vnum-=255+1;break;case 2:Vnum=Vnum&65535;if(sign&&Vnum>32767)Vnum-=65535+1;break;case 4:Vnum=sign?Vnum|0:Vnum>>>0;break;default:Vnum=isNaN(Vnum)?0:Math.round(Vnum);break;}if(bytes>4&&Vnum<0&&!sign){if(radix==16||radix==-16){O=(Vnum>>>0).toString(16);Vnum=Math.floor((Vnum-(Vnum>>>0))/Math.pow(2,32));O=(Vnum>>>0).toString(16)+(8-O.length>=0?"0".repeat(8-O.length):"")+O;O=(16-O.length>=0?"f".repeat(16-O.length):"")+O;if(radix==16)O=O.toUpperCase()}else if(radix==8){O=(Vnum>>>0).toString(8);O=(10-O.length>=0?"0".repeat(10-O.length):"")+O;Vnum=Math.floor((Vnum-(Vnum>>>0&1073741823))/Math.pow(2,30));O=(Vnum>>>0).toString(8)+O.substr(O.length-10);O=O.substr(O.length-20);O="1"+(21-O.length>=0?"7".repeat(21-O.length):"")+O}else{Vnum=-Vnum%1e16;var d1=[1,8,4,4,6,7,4,4,0,7,3,7,0,9,5,5,1,6,1,6];var di=d1.length-1;while(Vnum>0){if((d1[di]-=Vnum%10)<0){d1[di]+=10;d1[di-1]--}--di;Vnum=Math.floor(Vnum/10)}O=d1.join("")}}else{if(radix===-16)O=Vnum.toString(16).toLowerCase();else if(radix===16)O=Vnum.toString(16).toUpperCase();else O=Vnum.toString(radix)}if(prec===0&&O=="0"&&!(radix==8&&alt))O="";else{if(O.length=0?"0".repeat(prec-O.length):"")+O;else O=O.substr(0,1)+(prec+1-O.length>=0?"0".repeat(prec+1-O.length):"")+O.substr(1)}if(!sign&&alt&&Vnum!==0)switch(radix){case-16:O="0x"+O;break;case 16:O="0X"+O;break;case 8:if(O.charAt(0)!="0")O="0"+O;break;case 2:O="0b"+O;break;}}if(sign&&O.charAt(0)!="-"){if(flags.indexOf("+")>-1)O="+"+O;else if(flags.indexOf(" ")>-1)O=" "+O}if(width>0){if(O.length-1){O=O+(width-O.length>=0?" ".repeat(width-O.length):"")}else if(flags.indexOf("0")>-1&&prec<0&&O.length>0){if(prec>O.length)O=(prec-O.length>=0?"0".repeat(prec-O.length):"")+O;pad=width-O.length>=0?(prec>0?" ":"0").repeat(width-O.length):"";if(O.charCodeAt(0)<48){if(O.charAt(2).toLowerCase()=="x")O=O.substr(0,3)+pad+O.substring(3);else O=O.substr(0,1)+pad+O.substring(1)}else if(O.charAt(1).toLowerCase()=="x")O=O.substr(0,2)+pad+O.substring(2);else O=pad+O}else{O=(width-O.length>=0?" ".repeat(width-O.length):"")+O}}}}else if(isnum>0){Vnum=Number(arg);if(arg===null)Vnum=0/0;if(len=="L")bytes=12;var isf=isFinite(Vnum);if(!isf){if(Vnum<0)O="-";else if(flags.indexOf("+")>-1)O="+";else if(flags.indexOf(" ")>-1)O=" ";O+=isNaN(Vnum)?"nan":"inf"}else{var E=0;if(prec==-1&&isnum!=4)prec=6;if(isnum==3){O=Vnum.toExponential(1);E=+O.substr(O.indexOf("e")+1);if(prec===0)prec=1;if(prec>E&&E>=-4){isnum=11;prec=prec-(E+1)}else{isnum=12;prec=prec-1}}var sg=Vnum<0||1/Vnum==-Infinity?"-":"";if(Vnum<0)Vnum=-Vnum;switch(isnum){case 1:;case 11:if(Vnum<1e21){O=Vnum.toFixed(prec);if(isnum==1){if(prec===0&&alt&&O.indexOf(".")==-1)O+="."}else if(!alt)O=O.replace(/(\.\d*[1-9])0*$/,"$1").replace(/\.0*$/,"");else if(O.indexOf(".")==-1)O+=".";break}O=Vnum.toExponential(20);E=+O.substr(O.indexOf("e")+1);O=O.charAt(0)+O.substr(2,O.indexOf("e")-2);O=O+(E-O.length+1>=0?"0".repeat(E-O.length+1):"");if(alt||prec>0&&isnum!==11)O=O+"."+(prec>=0?"0".repeat(prec):"");break;case 2:;case 12:O=Vnum.toExponential(prec);E=O.indexOf("e");if(O.length-E===3)O=O.substr(0,E+2)+"0"+O.substr(E+2);if(alt&&O.indexOf(".")==-1)O=O.substr(0,E)+"."+O.substr(E);else if(!alt&&isnum==12)O=O.replace(/\.0*e/,"e").replace(/\.(\d*[1-9])0*e/,".$1e");break;case 4:if(Vnum===0){O="0x0"+(alt||prec>0?"."+(prec>=0?"0".repeat(prec):""):"")+"p+0";break}O=Vnum.toString(16);var ac=O.charCodeAt(0);if(ac==48){ac=2;E=-4;Vnum*=16;while(O.charCodeAt(ac++)==48){E-=4;Vnum*=16}O=Vnum.toString(16);ac=O.charCodeAt(0)}var ai=O.indexOf(".");if(O.indexOf("(")>-1){var am=O.match(/\(e(.*)\)/);var ae=am?+am[1]:0;E+=4*ae;Vnum/=Math.pow(16,ae)}else if(ai>1){E+=4*(ai-1);Vnum/=Math.pow(16,ai-1)}else if(ai==-1){E+=4*(O.length-1);Vnum/=Math.pow(16,O.length-1)}if(bytes>8){if(ac<50){E-=3;Vnum*=8}else if(ac<52){E-=2;Vnum*=4}else if(ac<56){E-=1;Vnum*=2}}else{if(ac>=56){E+=3;Vnum/=8}else if(ac>=52){E+=2;Vnum/=4}else if(ac>=50){E+=1;Vnum/=2}}O=Vnum.toString(16);if(O.length>1){if(O.length>prec+2&&O.charCodeAt(prec+2)>=56){var _f=O.charCodeAt(0)==102;O=(Vnum+8*Math.pow(16,-prec-1)).toString(16);if(_f&&O.charCodeAt(0)==49)E+=4}if(prec>0){O=O.substr(0,prec+2);if(O.length=0?"0".repeat(prec+2-O.length):"")+O.substr(1);else O+=prec+2-O.length>=0?"0".repeat(prec+2-O.length):""}}else if(prec===0)O=O.charAt(0)+(alt?".":"")}else if(prec>0)O=O+"."+(prec>=0?"0".repeat(prec):"");else if(alt)O=O+".";O="0x"+O+"p"+(E>=0?"+"+E:E);break;}if(sg===""){if(flags.indexOf("+")>-1)sg="+";else if(flags.indexOf(" ")>-1)sg=" "}O=sg+O}if(width>O.length){if(flags.indexOf("-")>-1){O=O+(width-O.length>=0?" ".repeat(width-O.length):"")}else if(flags.indexOf("0")>-1&&O.length>0&&isf){pad=width-O.length>=0?"0".repeat(width-O.length):"";if(O.charCodeAt(0)<48){if(O.charAt(2).toLowerCase()=="x")O=O.substr(0,3)+pad+O.substring(3);else O=O.substr(0,1)+pad+O.substring(1)}else if(O.charAt(1).toLowerCase()=="x")O=O.substr(0,2)+pad+O.substring(2);else O=pad+O}else{O=(width-O.length>=0?" ".repeat(width-O.length):"")+O}}if(c<96)O=O.toUpperCase()}o+=O}return o}function vsprintf(fmt,args){return doit(tokenize(fmt),args)}function sprintf(){var args=new Array(arguments.length-1);for(var i=0;i=48&&c<58){if(fmtprec.length)fmtprec+=String.fromCharCode(c);else if(c==48&&!fmtwidth.length)fmtflags+=String.fromCharCode(c);else fmtwidth+=String.fromCharCode(c)}else switch(c){case 36:if(fmtprec.length)fmtprec+="$";else if(fmtwidth.charAt(0)=="*")fmtwidth+="$";else{fmtparam=fmtwidth+"$";fmtwidth=""}break;case 39:fmtflags+="'";break;case 45:fmtflags+="-";break;case 43:fmtflags+="+";break;case 32:fmtflags+=" ";break;case 35:fmtflags+="#";break;case 46:fmtprec=".";break;case 42:if(fmtprec.charAt(0)==".")fmtprec+="*";else fmtwidth+="*";break;case 104:;case 108:if(fmtlen.length>1)throw"bad length "+fmtlen+String(c);fmtlen+=String.fromCharCode(c);break;case 76:;case 106:;case 122:;case 116:;case 113:;case 90:;case 119:if(fmtlen!=="")throw"bad length "+fmtlen+String.fromCharCode(c);fmtlen=String.fromCharCode(c);break;case 73:if(fmtlen!=="")throw"bad length "+fmtlen+"I";fmtlen="I";break;case 100:;case 105:;case 111:;case 117:;case 120:;case 88:;case 102:;case 70:;case 101:;case 69:;case 103:;case 71:;case 97:;case 65:;case 99:;case 67:;case 115:;case 83:;case 112:;case 110:;case 68:;case 85:;case 79:;case 109:;case 98:;case 66:;case 121:;case 89:;case 74:;case 86:;case 84:;case 37:infmt=false;if(fmtprec.length>1)fmtprec=fmtprec.substr(1);out.push([String.fromCharCode(c),fmt.substring(start,i+1),fmtparam,fmtflags,fmtwidth,fmtprec,fmtlen]);start=i+1;fmtlen=fmtprec=fmtwidth=fmtflags=fmtparam="";break;default:throw new Error("Invalid format string starting with |"+fmt.substring(start,i+1)+"|");}}if(start-1;if(m[2])argidx=parseInt(m[2],10)-1;else if(c===109&&!alt){o+="Success";continue}var width=0;if(m[4].length>0){if(m[4].charAt(0)!=="*")width=parseInt(m[4],10);else if(m[4].length===1)width=args[idx++];else width=args[parseInt(m[4].substr(1),10)-1]}var prec=-1;if(m[5].length>0){if(m[5].charAt(0)!=="*")prec=parseInt(m[5],10);else if(m[5].length===1)prec=args[idx++];else prec=args[parseInt(m[5].substr(1),10)-1]}if(!m[2])argidx=idx++;var arg=args[argidx];var len=m[6];switch(c){case 83:;case 115:O=String(arg);if(prec>=0)O=O.substr(0,prec);if(width>O.length||-width>O.length){if((flags.indexOf("-")==-1||width<0)&&flags.indexOf("0")!=-1){pad=width-O.length>=0?"0".repeat(width-O.length):"";O=pad+O}else{pad=width-O.length>=0?" ".repeat(width-O.length):"";O=flags.indexOf("-")>-1?O+pad:pad+O}}break;case 67:;case 99:switch(typeof arg){case"number":var cc=arg;if(c==67||len.charCodeAt(0)===108){cc&=4294967295;O=String.fromCharCode(cc)}else{cc&=255;O=String.fromCharCode(cc)}break;case"string":O=arg.charAt(0);break;default:O=String(arg).charAt(0);}if(width>O.length||-width>O.length){if((flags.indexOf("-")==-1||width<0)&&flags.indexOf("0")!=-1){pad=width-O.length>=0?"0".repeat(width-O.length):"";O=pad+O}else{pad=width-O.length>=0?" ".repeat(width-O.length):"";O=flags.indexOf("-")>-1?O+pad:pad+O}}break;case 68:bytes=8;case 100:;case 105:isnum=-1;sign=true;break;case 85:bytes=8;case 117:isnum=-1;break;case 79:bytes=8;case 111:isnum=-1;radix=8;break;case 120:isnum=-1;radix=-16;break;case 88:isnum=-1;radix=16;break;case 66:bytes=8;case 98:isnum=-1;radix=2;break;case 70:;case 102:isnum=1;break;case 69:;case 101:isnum=2;break;case 71:;case 103:isnum=3;break;case 65:;case 97:isnum=4;break;case 112:Vnum=typeof arg=="number"?arg:arg?Number(arg.l):-1;if(isNaN(Vnum))Vnum=-1;if(alt)O=Vnum.toString(10);else{Vnum=Math.abs(Vnum);O="0x"+Vnum.toString(16).toLowerCase()}break;case 110:if(arg){arg.len=o.length}continue;case 109:if(!(arg instanceof Error))O="Success";else if(arg.message)O=arg.message;else if(arg.errno)O="Error number "+arg.errno;else O="Error "+String(arg);break;case 74:O=(alt?u_inspect:JSON.stringify)(arg);break;case 86:O=arg==null?"null":String(arg.valueOf());break;case 84:if(alt){O=Object.prototype.toString.call(arg).substr(8);O=O.substr(0,O.length-1)}else O=typeof arg;break;case 89:;case 121:O=arg?alt?"yes":"true":alt?"no":"false";if(c==89)O=O.toUpperCase();if(prec>=0)O=O.substr(0,prec);if(width>O.length||-width>O.length){if((flags.indexOf("-")==-1||width<0)&&flags.indexOf("0")!=-1){pad=width-O.length>=0?"0".repeat(width-O.length):"";O=pad+O}else{pad=width-O.length>=0?" ".repeat(width-O.length):"";O=flags.indexOf("-")>-1?O+pad:pad+O}}break;}if(width<0){width=-width;flags+="-"}if(isnum==-1){Vnum=Number(arg);switch(len){case"hh":{bytes=1}break;case"h":{bytes=2}break;case"l":{if(bytes==4)bytes=8}break;case"L":;case"q":;case"ll":{if(bytes==4)bytes=8}break;case"j":{if(bytes==4)bytes=8}break;case"t":{if(bytes==4)bytes=8}break;case"z":;case"Z":{if(bytes==4)bytes=8}break;case"I":{if(bytes==4)bytes=8}break;case"w":break;}switch(bytes){case 1:Vnum=Vnum&255;if(sign&&Vnum>127)Vnum-=255+1;break;case 2:Vnum=Vnum&65535;if(sign&&Vnum>32767)Vnum-=65535+1;break;case 4:Vnum=sign?Vnum|0:Vnum>>>0;break;default:Vnum=isNaN(Vnum)?0:Math.round(Vnum);break;}if(bytes>4&&Vnum<0&&!sign){if(radix==16||radix==-16){O=(Vnum>>>0).toString(16);Vnum=Math.floor((Vnum-(Vnum>>>0))/Math.pow(2,32));O=(Vnum>>>0).toString(16)+(8-O.length>=0?"0".repeat(8-O.length):"")+O;O=(16-O.length>=0?"f".repeat(16-O.length):"")+O;if(radix==16)O=O.toUpperCase()}else if(radix==8){O=(Vnum>>>0).toString(8);O=(10-O.length>=0?"0".repeat(10-O.length):"")+O;Vnum=Math.floor((Vnum-(Vnum>>>0&1073741823))/Math.pow(2,30));O=(Vnum>>>0).toString(8)+O.substr(O.length-10);O=O.substr(O.length-20);O="1"+(21-O.length>=0?"7".repeat(21-O.length):"")+O}else{Vnum=-Vnum%1e16;var d1=[1,8,4,4,6,7,4,4,0,7,3,7,0,9,5,5,1,6,1,6];var di=d1.length-1;while(Vnum>0){if((d1[di]-=Vnum%10)<0){d1[di]+=10;d1[di-1]--}--di;Vnum=Math.floor(Vnum/10)}O=d1.join("")}}else{if(radix===-16)O=Vnum.toString(16).toLowerCase();else if(radix===16)O=Vnum.toString(16).toUpperCase();else O=Vnum.toString(radix)}if(prec===0&&O=="0"&&!(radix==8&&alt))O="";else{if(O.length=0?"0".repeat(prec-O.length):"")+O;else O=O.substr(0,1)+(prec+1-O.length>=0?"0".repeat(prec+1-O.length):"")+O.substr(1)}if(!sign&&alt&&Vnum!==0)switch(radix){case-16:O="0x"+O;break;case 16:O="0X"+O;break;case 8:if(O.charAt(0)!="0")O="0"+O;break;case 2:O="0b"+O;break;}}if(sign&&O.charAt(0)!="-"){if(flags.indexOf("+")>-1)O="+"+O;else if(flags.indexOf(" ")>-1)O=" "+O}if(width>0){if(O.length-1){O=O+(width-O.length>=0?" ".repeat(width-O.length):"")}else if(flags.indexOf("0")>-1&&prec<0&&O.length>0){if(prec>O.length)O=(prec-O.length>=0?"0".repeat(prec-O.length):"")+O;pad=width-O.length>=0?(prec>0?" ":"0").repeat(width-O.length):"";if(O.charCodeAt(0)<48){if(O.charAt(2).toLowerCase()=="x")O=O.substr(0,3)+pad+O.substring(3);else O=O.substr(0,1)+pad+O.substring(1)}else if(O.charAt(1).toLowerCase()=="x")O=O.substr(0,2)+pad+O.substring(2);else O=pad+O}else{O=(width-O.length>=0?" ".repeat(width-O.length):"")+O}}}}else if(isnum>0){Vnum=Number(arg);if(arg===null)Vnum=0/0;if(len=="L")bytes=12;var isf=isFinite(Vnum);if(!isf){if(Vnum<0)O="-";else if(flags.indexOf("+")>-1)O="+";else if(flags.indexOf(" ")>-1)O=" ";O+=isNaN(Vnum)?"nan":"inf"}else{var E=0;if(prec==-1&&isnum!=4)prec=6;if(isnum==3){O=Vnum.toExponential(1);E=+O.substr(O.indexOf("e")+1);if(prec===0)prec=1;if(prec>E&&E>=-4){isnum=11;prec=prec-(E+1)}else{isnum=12;prec=prec-1}}var sg=Vnum<0||1/Vnum==-Infinity?"-":"";if(Vnum<0)Vnum=-Vnum;switch(isnum){case 1:;case 11:if(Vnum<1e21){O=Vnum.toFixed(prec);if(isnum==1){if(prec===0&&alt&&O.indexOf(".")==-1)O+="."}else if(!alt)O=O.replace(/(\.\d*[1-9])0*$/,"$1").replace(/\.0*$/,"");else if(O.indexOf(".")==-1)O+=".";break}O=Vnum.toExponential(20);E=+O.substr(O.indexOf("e")+1);O=O.charAt(0)+O.substr(2,O.indexOf("e")-2);O=O+(E-O.length+1>=0?"0".repeat(E-O.length+1):"");if(alt||prec>0&&isnum!==11)O=O+"."+(prec>=0?"0".repeat(prec):"");break;case 2:;case 12:O=Vnum.toExponential(prec);E=O.indexOf("e");if(O.length-E===3)O=O.substr(0,E+2)+"0"+O.substr(E+2);if(alt&&O.indexOf(".")==-1)O=O.substr(0,E)+"."+O.substr(E);else if(!alt&&isnum==12)O=O.replace(/\.0*e/,"e").replace(/\.(\d*[1-9])0*e/,".$1e");break;case 4:if(Vnum===0){O="0x0"+(alt||prec>0?"."+(prec>=0?"0".repeat(prec):""):"")+"p+0";break}O=Vnum.toString(16);var ac=O.charCodeAt(0);if(ac==48){ac=2;E=-4;Vnum*=16;while(O.charCodeAt(ac++)==48){E-=4;Vnum*=16}O=Vnum.toString(16);ac=O.charCodeAt(0)}var ai=O.indexOf(".");if(O.indexOf("(")>-1){var am=O.match(/\(e(.*)\)/);var ae=am?+am[1]:0;E+=4*ae;Vnum/=Math.pow(16,ae)}else if(ai>1){E+=4*(ai-1);Vnum/=Math.pow(16,ai-1)}else if(ai==-1){E+=4*(O.length-1);Vnum/=Math.pow(16,O.length-1)}if(bytes>8){if(ac<50){E-=3;Vnum*=8}else if(ac<52){E-=2;Vnum*=4}else if(ac<56){E-=1;Vnum*=2}}else{if(ac>=56){E+=3;Vnum/=8}else if(ac>=52){E+=2;Vnum/=4}else if(ac>=50){E+=1;Vnum/=2}}O=Vnum.toString(16);if(O.length>1){if(O.length>prec+2&&O.charCodeAt(prec+2)>=56){var _f=O.charCodeAt(0)==102;O=(Vnum+8*Math.pow(16,-prec-1)).toString(16);if(_f&&O.charCodeAt(0)==49)E+=4}if(prec>0){O=O.substr(0,prec+2);if(O.length=0?"0".repeat(prec+2-O.length):"")+O.substr(1);else O+=prec+2-O.length>=0?"0".repeat(prec+2-O.length):""}}else if(prec===0)O=O.charAt(0)+(alt?".":"")}else if(prec>0)O=O+"."+(prec>=0?"0".repeat(prec):"");else if(alt)O=O+".";O="0x"+O+"p"+(E>=0?"+"+E:E);break;}if(sg===""){if(flags.indexOf("+")>-1)sg="+";else if(flags.indexOf(" ")>-1)sg=" "}O=sg+O}if(width>O.length){if(flags.indexOf("-")>-1){O=O+(width-O.length>=0?" ".repeat(width-O.length):"")}else if(flags.indexOf("0")>-1&&O.length>0&&isf){pad=width-O.length>=0?"0".repeat(width-O.length):"";if(O.charCodeAt(0)<48){if(O.charAt(2).toLowerCase()=="x")O=O.substr(0,3)+pad+O.substring(3);else O=O.substr(0,1)+pad+O.substring(1)}else if(O.charAt(1).toLowerCase()=="x")O=O.substr(0,2)+pad+O.substring(2);else O=pad+O}else{O=(width-O.length>=0?" ".repeat(width-O.length):"")+O}}if(c<96)O=O.toUpperCase()}o+=O}return o}function vsprintf(fmt,args){return doit(tokenize(fmt),args)}function sprintf(){var args=new Array(arguments.length-1);for(var i=0;istring*/ = JSON.stringify; +function set_inspect(inspect) { u_inspect = inspect; } + function doit(t/*:ParsedFmt*/, args/*:Array*/)/*:string*/ { //var o/*:Array*/ = []; var o = ""; @@ -575,5 +577,5 @@ function sprintf(/*:: ...argz*/)/*:string*/ { return doit(tokenize(arguments[0]), args); } -export { sprintf, vsprintf }; +export { sprintf, vsprintf, set_inspect }; diff --git a/misc/import_map.json b/misc/import_map.json new file mode 100644 index 0000000..0078270 --- /dev/null +++ b/misc/import_map.json @@ -0,0 +1,3 @@ +{ + "imports": {} +} diff --git a/misc/test.deno.jsonc b/misc/test.deno.jsonc new file mode 100644 index 0000000..3d65446 --- /dev/null +++ b/misc/test.deno.jsonc @@ -0,0 +1,11 @@ +{ + "compilerOptions": { + "lib": [ + "deno.ns", + "dom", + "dom.iterable", + "dom.asynciterable" + ] + }, + "importMap": "./import_map.json" +} diff --git a/package.json b/package.json index 162e725..dcae386 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "printj", - "version": "1.3.1", + "version": "1.3.2", "author": "sheetjs", "description": "Pure-JS printf", "keywords": [ @@ -37,7 +37,7 @@ }, "repository": { "type": "git", - "url": "git://github.com/SheetJS/printj.git" + "url": "https://git.sheetjs.com/sheetjs/printj.git" }, "scripts": { "test": "make test", @@ -62,7 +62,7 @@ "homepage": "https://sheetjs.com/", "files": ["printj.js", "printj.mjs", "bin/printj.njs", "LICENSE", "README.md", "shim.js", "dist/*.js", "dist/*.map", "dist/LICENSE", "types/index.d.ts", "types/*.json"], "bugs": { - "url": "https://github.com/SheetJS/printj/issues" + "url": "https://git.sheetjs.com/sheetjs/printj/issues" }, "license": "Apache-2.0", "engines": { diff --git a/printj.flow.js b/printj.flow.js index b5c6005..4bdae6a 100644 --- a/printj.flow.js +++ b/printj.flow.js @@ -28,7 +28,7 @@ var PRINTJ/*:PRINTJModule*/; /*jshint ignore:end */ }(function(PRINTJ/*:PRINTJModule*/) { -PRINTJ.version = '1.3.1'; +PRINTJ.version = '1.3.2'; var tcache = {}; @@ -160,6 +160,8 @@ function tokenize(fmt/*:string*/)/*:ParsedFmt*/ { if(typeof process !== 'undefined' && !!process.versions && !!process.versions.node) util=require("util"); var u_inspect/*:(o:any)=>string*/ = (typeof util != 'undefined') ? util.inspect : JSON.stringify; +function set_inspect(inspect) { u_inspect = inspect; } + function doit(t/*:ParsedFmt*/, args/*:Array*/)/*:string*/ { //var o/*:Array*/ = []; var o = ""; @@ -601,6 +603,6 @@ PRINTJ.sprintf = sprintf; PRINTJ.vsprintf = vsprintf; PRINTJ._doit = doit; PRINTJ._tokenize = tokenize; - +PRINTJ.set_inspect = set_inspect; })); diff --git a/printj.js b/printj.js index a102fa2..b707bbd 100644 --- a/printj.js +++ b/printj.js @@ -25,7 +25,7 @@ var PRINTJ; /*jshint ignore:end */ }(function(PRINTJ) { -PRINTJ.version = '1.3.1'; +PRINTJ.version = '1.3.2'; var tcache = {}; @@ -156,6 +156,8 @@ function tokenize(fmt) { if(typeof process !== 'undefined' && !!process.versions && !!process.versions.node) util=require("util"); var u_inspect = (typeof util != 'undefined') ? util.inspect : JSON.stringify; +function set_inspect(inspect) { u_inspect = inspect; } + function doit(t, args) { //var o = []; var o = ""; @@ -597,6 +599,6 @@ PRINTJ.sprintf = sprintf; PRINTJ.vsprintf = vsprintf; PRINTJ._doit = doit; PRINTJ._tokenize = tokenize; - +PRINTJ.set_inspect = set_inspect; })); diff --git a/printj.mjs b/printj.mjs index 96870de..51eb90c 100644 --- a/printj.mjs +++ b/printj.mjs @@ -7,7 +7,7 @@ var PRINTJ/*:PRINTJModule*/ = /*::(*/{}/*:: :any)*/; -PRINTJ.version = '1.3.1'; +PRINTJ.version = '1.3.2'; export const version = PRINTJ.version; @@ -138,6 +138,8 @@ function tokenize(fmt/*:string*/)/*:ParsedFmt*/ { var u_inspect/*:(o:any)=>string*/ = JSON.stringify; +function set_inspect(inspect) { u_inspect = inspect; } + function doit(t/*:ParsedFmt*/, args/*:Array*/)/*:string*/ { //var o/*:Array*/ = []; var o = ""; @@ -575,5 +577,5 @@ function sprintf(/*:: ...argz*/)/*:string*/ { return doit(tokenize(arguments[0]), args); } -export { sprintf, vsprintf }; +export { sprintf, vsprintf, set_inspect }; diff --git a/test.js b/test.js index c807d0e..b90a2cf 100644 --- a/test.js +++ b/test.js @@ -1,4 +1,6 @@ /* vim: set ts=2: */ +/* eslint-env mocha */ +/*global assert:true */ var X; var IMPLS = {}, IMPLA = [], IMPL = []; if(typeof require !== 'undefined') { @@ -172,6 +174,13 @@ describe('special cases', function() { assert.equal(sprintf("|%1$b|%1$B|%1$d|%1$D|%1$i|%1$o|%1$O|%1$u|%1$U|%1$x|%1$X|", undefined), "|0|0|0|0|0|0|0|0|0|0|0|"); assert.equal(sprintf("|%1$b|%1$B|%1$d|%1$D|%1$i|%1$o|%1$O|%1$u|%1$U|%1$x|%1$X|", null), "|0|0|0|0|0|0|0|0|0|0|0|"); }); + if(typeof JSON !== "undefined") it('correctly handles JSON conversion: J', function() { + var data = ({a:1}); + assert.equal(sprintf("%J", data), JSON.stringify(data)); + X.set_inspect(function(data) { return "|" + JSON.stringify(data) + "|"; }); + assert.equal(sprintf("%J", data), JSON.stringify(data)); + assert.equal(sprintf("%#J", data), "|" + JSON.stringify(data) + "|"); + }); it('handles dynamic specifiers', function() { assert.equal(sprintf("|%5s|", "sheetjs"), "|sheetjs|"); assert.equal(sprintf("|%*s|", 5, "sheetjs"), "|sheetjs|"); diff --git a/test.ts b/test.ts new file mode 100644 index 0000000..3ea194b --- /dev/null +++ b/test.ts @@ -0,0 +1,147 @@ +/* vim: set ts=2: */ +/* eslint-env mocha */ +import * as assert_ from 'https://deno.land/std/testing/asserts.ts'; +const assert: any = {...assert_}; +assert.throws = function(f: () => void) { assert.assertThrows(function() { try { f(); } catch(e) { throw e instanceof Error ? e : new Error(e); }})}; +assert.doesNotThrow = function(f: ()=>void) { f(); }; +assert.equal = assert.assertEquals; +assert.notEqual = assert.assertNotEquals; +assert.deepEqual = (x: any,y: any, z?: string) => assert.equal(JSON.stringify(x), JSON.stringify(y), z); + +// @deno-types="./types/index.d.ts" +import * as X from "./printj.mjs"; + +var sprintf = X.sprintf; +var chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ !\"#$%&'()*+,-./0123456789:;<=>?@[\\]^_~{|}`".split(""); +var convs = "aAbBcCdDeEfFgGiJmnoOpsSTuUVxXyY%".split(""); +var flags = " #'+-0".split(""); +var digits = "0123456789".split(""); +var lens = "hIjlLqtwzZ".split(""); lens.push("hh"); lens.push("ll"); +var other = "$*.".split(""); +var unused: string[] = []; chars.forEach(function(c) { + if(convs.indexOf(c) == -1 && + flags.indexOf(c) == -1 && + digits.indexOf(c) == -1 && + lens.indexOf(c) == -1 && + other.indexOf(c) == -1 + ) unused.push(c); +}); + +Deno.test('special cases', async function(t) { + await t.step('fails on unrecognized format chars: ' + unused.join(""), function() { + unused.forEach(function(c) { + assert.throws(function() { sprintf("%" + c, 0); }, "Should fail on %" +c); + }); + }); + await t.step('accepts all expected conversions: ' + convs.join(""), function() { + convs.forEach(function(c) { + assert.doesNotThrow(function() { sprintf("%" + c, 0); }, "Should pass on %" +c); + }); + }); + await t.step('accepts all expected lengths: ' + lens.join(""), function() { + lens.forEach(function(l) { + var fmt = "%" + l + "X"; + assert.doesNotThrow(function() { sprintf(fmt, 0); }, "Should pass on "+fmt); + }); + }); + await t.step('accepts all expected flags: ' + flags.join(""), function() { + flags.forEach(function(l) { + var fmt = "%" + l + "X"; + assert.doesNotThrow(function() { sprintf(fmt, 0); }, "Should pass on "+fmt); + }); + }); + await t.step('correctly handles character conversions: cC', function() { + assert.equal(sprintf("|%c %c|", "69", 69), "|6 E|"); + assert.equal(sprintf("|%c|", {toString:function() { return "69"; }, valueOf: function() { return 69; }} ), "|6|"); + }); + await t.step('correctly handles error conversion: m', function() { + var x = new Error("sheetjs"); + (x as any).errno = 69; x.toString = function() { return "SHEETJS"; }; + assert.equal(sprintf("|%#m|", x), "|sheetjs|"); + delete (x as any).message; + assert.equal(sprintf("|%#m|", x), "|Error number 69|"); + delete (x as any).errno; + assert.equal(sprintf("|%#m|", x), "|Error SHEETJS|"); + }); + await t.step('correctly handles typeof and valueOf conversions: TV', function() { + assert.equal(sprintf("%1$T %1$#T", 1), 'number Number'); + assert.equal(sprintf("%1$T %1$#T", 'foo'), 'string String'); + assert.equal(sprintf("%1$T %1$#T", [1,2,3]), 'object Array'); + assert.equal(sprintf("%1$T %1$#T", null).replace(/Object|global/, "Null"), 'object Null'); + assert.equal(sprintf("%1$T %1$#T", undefined).replace(/Object|global/, "Undefined"), 'undefined Undefined'); + + var _f = function() { return "f"; }; + var _3 = function() { return 3; }; + assert.equal(sprintf("%1$d %1$s %1$V", {toString:_f}), '0 f f'); + assert.equal(sprintf("%1$d %1$s %1$V", {valueOf:_3}), '3 [object Object] 3'); + assert.equal(sprintf("%1$d %1$s %1$V", {valueOf:_3, toString:_f}), '3 f 3'); + }); + await t.step('correctly handles standard integer conversions: diouxXDUO', function() { + assert.equal(sprintf("%02hhx %02hhX", 1, 1234321), "01 91"); + assert.equal(sprintf("%02hhx %-02hhX", -1, -253), "ff 3 "); + assert.equal(sprintf("%#02llx", -3), "0xfffffffffffffffd"); + assert.equal(sprintf("%#02llX", -3), "0XFFFFFFFFFFFFFFFD"); + assert.equal(sprintf("%#02llo", -3), "01777777777777777777775"); + assert.equal(sprintf("%#02llu", -3), "18446744073709551613"); + assert.equal(sprintf("%#03lld", -3), "-03"); + assert.equal(sprintf("%.9d %.9d", 123456, -123456), "000123456 -000123456"); + }); + await t.step('correctly handles new binary conversions: bB', function() { + assert.equal(sprintf("%#b", -3), "0b11111111111111111111111111111101"); + assert.equal(sprintf("%#5B", 3), " 0b11"); + }); + await t.step('recognizes IEEE754 special values', function() { + assert.equal(sprintf("%a", Infinity), "inf"); + assert.equal(sprintf("%e", -Infinity), "-inf"); + assert.equal(sprintf("%f", 0/0), "nan"); + assert.equal(sprintf("%g", 1/-Infinity), "-0"); + }); + await t.step('correctly handles floating point conversions: aAeEfFgG', function() { + assert.equal(sprintf("%1$g %1$#g", 1e5), "100000 100000."); + assert.equal(sprintf("%.3g %.3g", 1.2345e-4, 1.2345e-5), "0.000123 1.23e-05"); + assert.equal(sprintf("%f", 1.23e22).replace("10486","00000"), "12300000000000000000000.000000"); + assert.equal(sprintf("|%1$4.1f|%1$04.1f|%1$-4.1f", 1.2), "| 1.2|01.2|1.2 "); + assert.equal(sprintf("%1$.1a|%1$04.0f", -128), "-0x1.0p+7|-128"); + assert.equal(sprintf("%1$.1a|%1$04.0f", -6.9e-11), "-0x1.3p-34|-000"); + assert.equal(sprintf("%a %A %a %A", 1, .2, .69, 6e20), "0x1p+0 0X1.999999999999AP-3 0x1.6147ae147ae14p-1 0X1.043561A88293P+69"); + assert.equal(sprintf("%La %LA %La %LA", 1, .2, .69, 6e20), "0x8p-3 0XC.CCCCCCCCCCCDP-6 0xb.0a3d70a3d70ap-4 0X8.21AB0D441498P+66"); + assert.equal(sprintf("%010.1a", 1.), "0x001.0p+0"); + assert.equal(sprintf("%.7a %.7a", 129, -129), "0x1.0200000p+7 -0x1.0200000p+7"); + assert.equal(sprintf("%.7a", -3.1), "-0x1.8cccccdp+1"); + }); + await t.step('consistently handles null and undefined', function() { + assert.equal(sprintf("|%1$a|%1$A|%1$e|%1$E|%1$f|%1$F|%1$g|%1$G|", undefined), "|nan|NAN|nan|NAN|nan|NAN|nan|NAN|"); + assert.equal(sprintf("|%1$a|%1$A|%1$e|%1$E|%1$f|%1$F|%1$g|%1$G|", null), "|nan|NAN|nan|NAN|nan|NAN|nan|NAN|"); + assert.equal(sprintf("|%1$b|%1$B|%1$d|%1$D|%1$i|%1$o|%1$O|%1$u|%1$U|%1$x|%1$X|", undefined), "|0|0|0|0|0|0|0|0|0|0|0|"); + assert.equal(sprintf("|%1$b|%1$B|%1$d|%1$D|%1$i|%1$o|%1$O|%1$u|%1$U|%1$x|%1$X|", null), "|0|0|0|0|0|0|0|0|0|0|0|"); + }); + await t.step('correctly handles JSON conversion: J', function() { + var data = ({a:1}); + assert.equal(sprintf("%J", data), JSON.stringify(data)); + X.set_inspect(function(data: any) { return "|" + JSON.stringify(data) + "|"; }); + assert.equal(sprintf("%J", data), JSON.stringify(data)); + assert.equal(sprintf("%#J", data), "|" + JSON.stringify(data) + "|"); + }); + await t.step('handles dynamic specifiers', function() { + assert.equal(sprintf("|%5s|", "sheetjs"), "|sheetjs|"); + assert.equal(sprintf("|%*s|", 5, "sheetjs"), "|sheetjs|"); + assert.equal(sprintf("|%2$*1$s|", 5, "sheetjs", 10), "|sheetjs|"); + assert.equal(sprintf("|%10s|", "sheetjs"), "| sheetjs|"); + assert.equal(sprintf("|%2$*3$s|", 5, "sheetjs", 10), "| sheetjs|"); + assert.equal(sprintf("|%0*.*d|", 4, 2, 1), "| 01|"); + assert.equal(sprintf("|%1$0*3$.*2$d|", 1, 2, 4), "| 01|"); + assert.equal(sprintf("|%*.*d|", 4, 2, 1), "| 01|"); + assert.equal(sprintf("|%-*.*d|", 4, 2, 1), "|01 |"); + assert.equal(sprintf("|%*.*d|", -4, 2, 1), "|01 |"); + assert.equal(sprintf("|%-*.*d|", -4, 2, 1), "|01 |"); + assert.equal(sprintf("|%*s|", 4, "sheetjs"), "|sheetjs|"); + assert.equal(sprintf("|%*.*s|", 4, 3, "sheetjs"), "| she|"); + assert.equal(sprintf("|%*.*s|", 4, 2, "sheetjs"), "| sh|"); + assert.equal(sprintf("|%*.*s|", 4, 1, "sheetjs"), "| s|"); + assert.equal(sprintf("|%*.*s|", 4, 0, "sheetjs"), "| |"); + assert.equal(sprintf("|%*.*s|", 4, -1, "sheetjs"), "|sheetjs|"); + }); + await t.step('handles long strings', function() { + for(var i = 10; i <= 1000; i+= 10) assert.equal(sprintf("%" + i + "s", "abc").length, i); + }); +}); diff --git a/types/index.d.ts b/types/index.d.ts index 5b6e280..9c9ef56 100644 --- a/types/index.d.ts +++ b/types/index.d.ts @@ -8,3 +8,6 @@ export function sprintf(fmt: string, ...args: any[]): string; /** Generate formatted string from format and array of variables */ export function vsprintf(fmt: string, args: any[]): string; + +/** Override inspect function for #J conversion */ +export function set_inspect(inspector: (val: any)=>string): void; \ No newline at end of file