Unemyr/sheetjs
1
Fork 0
forked from sheetjs/sheetjs
Code Pull Requests Activity

version bump 0.11.0

Browse Source
This commit is contained in:
SheetJS 2020-05-09 01:00:04 -04:00
parent 791bf255f5
commit b00f11ce33
5 changed files with 22 additions and 18 deletions

8
Makefile

@ -34,6 +34,10 @@ bits/01_version.js: package.json
clean: ## Remove targets and build artifacts clean: ## Remove targets and build artifacts
rm -f $(TARGET) $(FLOWTARGET) rm -f $(TARGET) $(FLOWTARGET)
.PHONY: git
git: ## show version string
@echo "$$(node -pe 'require("./package.json").version') (ssf)"
## Testing ## Testing
@ -43,7 +47,7 @@ test mocha: ## Run test suite
.PHONY: test_misc .PHONY: test_misc
test_misc: test_misc:
MINTEST=1 npm test MINTEST=1 mocha -R spec -t 30000
.PHONY: travis .PHONY: travis
travis: ## Run test suite with minimal output travis: ## Run test suite with minimal output
@ -51,7 +55,7 @@ travis: ## Run test suite with minimal output
.PHONY: ctest .PHONY: ctest
ctest: ## Build browser test fixtures ctest: ## Build browser test fixtures
browserify -t brfs test/{dateNF,dates,exp,fraction,general,implied,oddities,utilities,comma,valid}.js > ctest/test.js browserify -t brfs test/{comma,dateNF,dates,exp,fraction,general,implied,oddities,utilities,valid}.js > ctest/test.js
.PHONY: ctestserv .PHONY: ctestserv
ctestserv: ## Start a test server on port 8000 ctestserv: ## Start a test server on port 8000

2
bits/01_version.js

@ -1 +1 @@
SSF.version = '0.10.3'; SSF.version = '0.11.0';

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "ssf", "name": "ssf",
"version": "0.10.3", "version": "0.11.0",
"author": "sheetjs", "author": "sheetjs",
"description": "Format data using ECMA-376 spreadsheet Format Codes", "description": "Format data using ECMA-376 spreadsheet Format Codes",
"keywords": [ "keywords": [

14
ssf.flow.js

@ -4,7 +4,7 @@
/*:: declare var DO_NOT_EXPORT_SSF: any; */ /*:: declare var DO_NOT_EXPORT_SSF: any; */
var SSF/*:SSFModule*/ = ({}/*:any*/); var SSF/*:SSFModule*/ = ({}/*:any*/);
var make_ssf = function make_ssf(SSF/*:SSFModule*/){ var make_ssf = function make_ssf(SSF/*:SSFModule*/){
SSF.version = '0.10.3'; SSF.version = '0.11.0';
function _strrev(x/*:string*/)/*:string*/ { var o = "", i = x.length-1; while(i>=0) o += x.charAt(i--); return o; } function _strrev(x/*:string*/)/*:string*/ { var o = "", i = x.length-1; while(i>=0) o += x.charAt(i--); return o; }
function fill(c/*:string*/,l/*:number*/)/*:string*/ { var o = ""; while(o.length < l) o+=c; return o; } function fill(c/*:string*/,l/*:number*/)/*:string*/ { var o = ""; while(o.length < l) o+=c; return o; }
function pad0(v/*:any*/,d/*:number*/)/*:string*/{var t=""+v; return t.length>=d?t:fill('0',d-t.length)+t;} function pad0(v/*:any*/,d/*:number*/)/*:string*/{var t=""+v; return t.length>=d?t:fill('0',d-t.length)+t;}
@ -652,7 +652,7 @@ function eval_fmt(fmt/*:string*/, v/*:any*/, opts/*:any*/, flen/*:number*/) {
} }
/* falls through */ /* falls through */
case '0': case '#': case '0': case '#':
o = c; while((++i < fmt.length && "0#?.,E+-%".indexOf(c=fmt.charAt(i)) > -1) || (c=='\\' && fmt.charAt(i+1) == "-" && i < fmt.length - 2 && "0#".indexOf(fmt.charAt(i+2))>-1)) o += c; o = c; while(++i < fmt.length && "0#?.,E+-%".indexOf(c=fmt.charAt(i)) > -1) o += c;
out[out.length] = {t:'n', v:o}; break; out[out.length] = {t:'n', v:o}; break;
case '?': case '?':
o = c; while(fmt.charAt(++i) === c) o+=c; o = c; while(fmt.charAt(++i) === c) o+=c;
@ -711,7 +711,7 @@ function eval_fmt(fmt/*:string*/, v/*:any*/, opts/*:any*/, flen/*:number*/) {
/*::if(!dt) throw "unreachable"; */ /*::if(!dt) throw "unreachable"; */
out[i].v = write_date(out[i].t.charCodeAt(0), out[i].v, dt, ss0); out[i].v = write_date(out[i].t.charCodeAt(0), out[i].v, dt, ss0);
out[i].t = 't'; break; out[i].t = 't'; break;
case 'n': case '(': case '?': case 'n': case '?':
jj = i+1; jj = i+1;
while(out[jj] != null && ( while(out[jj] != null && (
(c=out[jj].t) === "?" || c === "D" || (c=out[jj].t) === "?" || c === "D" ||
@ -731,7 +731,7 @@ function eval_fmt(fmt/*:string*/, v/*:any*/, opts/*:any*/, flen/*:number*/) {
if(nstr.length > 0) { if(nstr.length > 0) {
if(nstr.charCodeAt(0) == 40) /* '(' */ { if(nstr.charCodeAt(0) == 40) /* '(' */ {
myv = (v<0&&nstr.charCodeAt(0) === 45 ? -v : v); myv = (v<0&&nstr.charCodeAt(0) === 45 ? -v : v);
ostr = write_num('(', nstr, myv); ostr = write_num('n', nstr, myv);
} else { } else {
myv = (v<0 && flen > 1 ? -v : v); myv = (v<0 && flen > 1 ? -v : v);
ostr = write_num('n', nstr, myv); ostr = write_num('n', nstr, myv);
@ -746,7 +746,7 @@ function eval_fmt(fmt/*:string*/, v/*:any*/, opts/*:any*/, flen/*:number*/) {
var lasti=out.length; var lasti=out.length;
if(decpt === out.length && ostr.indexOf("E") === -1) { if(decpt === out.length && ostr.indexOf("E") === -1) {
for(i=out.length-1; i>= 0;--i) { for(i=out.length-1; i>= 0;--i) {
if(out[i] == null || 'n?('.indexOf(out[i].t) === -1) continue; if(out[i] == null || 'n?'.indexOf(out[i].t) === -1) continue;
if(jj>=out[i].v.length-1) { jj -= out[i].v.length; out[i].v = ostr.substr(jj+1, out[i].v.length); } if(jj>=out[i].v.length-1) { jj -= out[i].v.length; out[i].v = ostr.substr(jj+1, out[i].v.length); }
else if(jj < 0) out[i].v = ""; else if(jj < 0) out[i].v = "";
else { out[i].v = ostr.substr(0, jj+1); jj = -1; } else { out[i].v = ostr.substr(0, jj+1); jj = -1; }
@ -758,7 +758,7 @@ function eval_fmt(fmt/*:string*/, v/*:any*/, opts/*:any*/, flen/*:number*/) {
else if(decpt !== out.length && ostr.indexOf("E") === -1) { else if(decpt !== out.length && ostr.indexOf("E") === -1) {
jj = ostr.indexOf(".")-1; jj = ostr.indexOf(".")-1;
for(i=decpt; i>= 0; --i) { for(i=decpt; i>= 0; --i) {
if(out[i] == null || 'n?('.indexOf(out[i].t) === -1) continue; if(out[i] == null || 'n?'.indexOf(out[i].t) === -1) continue;
j=out[i].v.indexOf(".")>-1&&i===decpt?out[i].v.indexOf(".")-1:out[i].v.length-1; j=out[i].v.indexOf(".")>-1&&i===decpt?out[i].v.indexOf(".")-1:out[i].v.length-1;
vv = out[i].v.substr(j+1); vv = out[i].v.substr(j+1);
for(; j>=0; --j) { for(; j>=0; --j) {
@ -783,7 +783,7 @@ function eval_fmt(fmt/*:string*/, v/*:any*/, opts/*:any*/, flen/*:number*/) {
} }
} }
} }
for(i=0; i<out.length; ++i) if(out[i] != null && 'n(?'.indexOf(out[i].t)>-1) { for(i=0; i<out.length; ++i) if(out[i] != null && 'n?'.indexOf(out[i].t)>-1) {
myv = (flen >1 && v < 0 && i>0 && out[i-1].v === "-" ? -v:v); myv = (flen >1 && v < 0 && i>0 && out[i-1].v === "-" ? -v:v);
out[i].v = write_num(out[i].t, out[i].v, myv); out[i].v = write_num(out[i].t, out[i].v, myv);
out[i].t = 't'; out[i].t = 't';

14
ssf.js

@ -3,7 +3,7 @@
/*jshint -W041 */ /*jshint -W041 */
var SSF = ({}); var SSF = ({});
var make_ssf = function make_ssf(SSF){ var make_ssf = function make_ssf(SSF){
SSF.version = '0.10.3'; SSF.version = '0.11.0';
function _strrev(x) { var o = "", i = x.length-1; while(i>=0) o += x.charAt(i--); return o; } function _strrev(x) { var o = "", i = x.length-1; while(i>=0) o += x.charAt(i--); return o; }
function fill(c,l) { var o = ""; while(o.length < l) o+=c; return o; } function fill(c,l) { var o = ""; while(o.length < l) o+=c; return o; }
function pad0(v,d){var t=""+v; return t.length>=d?t:fill('0',d-t.length)+t;} function pad0(v,d){var t=""+v; return t.length>=d?t:fill('0',d-t.length)+t;}
@ -645,7 +645,7 @@ function eval_fmt(fmt, v, opts, flen) {
} }
/* falls through */ /* falls through */
case '0': case '#': case '0': case '#':
o = c; while((++i < fmt.length && "0#?.,E+-%".indexOf(c=fmt.charAt(i)) > -1) || (c=='\\' && fmt.charAt(i+1) == "-" && i < fmt.length - 2 && "0#".indexOf(fmt.charAt(i+2))>-1)) o += c; o = c; while(++i < fmt.length && "0#?.,E+-%".indexOf(c=fmt.charAt(i)) > -1) o += c;
out[out.length] = {t:'n', v:o}; break; out[out.length] = {t:'n', v:o}; break;
case '?': case '?':
o = c; while(fmt.charAt(++i) === c) o+=c; o = c; while(fmt.charAt(++i) === c) o+=c;
@ -701,7 +701,7 @@ if(dt.u >= 0.5) { dt.u = 0; ++dt.S; }
case 'd': case 'm': case 'y': case 'h': case 'H': case 'M': case 's': case 'e': case 'b': case 'Z': case 'd': case 'm': case 'y': case 'h': case 'H': case 'M': case 's': case 'e': case 'b': case 'Z':
out[i].v = write_date(out[i].t.charCodeAt(0), out[i].v, dt, ss0); out[i].v = write_date(out[i].t.charCodeAt(0), out[i].v, dt, ss0);
out[i].t = 't'; break; out[i].t = 't'; break;
case 'n': case '(': case '?': case 'n': case '?':
jj = i+1; jj = i+1;
while(out[jj] != null && ( while(out[jj] != null && (
(c=out[jj].t) === "?" || c === "D" || (c=out[jj].t) === "?" || c === "D" ||
@ -721,7 +721,7 @@ out[i].v = write_date(out[i].t.charCodeAt(0), out[i].v, dt, ss0);
if(nstr.length > 0) { if(nstr.length > 0) {
if(nstr.charCodeAt(0) == 40) /* '(' */ { if(nstr.charCodeAt(0) == 40) /* '(' */ {
myv = (v<0&&nstr.charCodeAt(0) === 45 ? -v : v); myv = (v<0&&nstr.charCodeAt(0) === 45 ? -v : v);
ostr = write_num('(', nstr, myv); ostr = write_num('n', nstr, myv);
} else { } else {
myv = (v<0 && flen > 1 ? -v : v); myv = (v<0 && flen > 1 ? -v : v);
ostr = write_num('n', nstr, myv); ostr = write_num('n', nstr, myv);
@ -736,7 +736,7 @@ out[i].v = write_date(out[i].t.charCodeAt(0), out[i].v, dt, ss0);
var lasti=out.length; var lasti=out.length;
if(decpt === out.length && ostr.indexOf("E") === -1) { if(decpt === out.length && ostr.indexOf("E") === -1) {
for(i=out.length-1; i>= 0;--i) { for(i=out.length-1; i>= 0;--i) {
if(out[i] == null || 'n?('.indexOf(out[i].t) === -1) continue; if(out[i] == null || 'n?'.indexOf(out[i].t) === -1) continue;
if(jj>=out[i].v.length-1) { jj -= out[i].v.length; out[i].v = ostr.substr(jj+1, out[i].v.length); } if(jj>=out[i].v.length-1) { jj -= out[i].v.length; out[i].v = ostr.substr(jj+1, out[i].v.length); }
else if(jj < 0) out[i].v = ""; else if(jj < 0) out[i].v = "";
else { out[i].v = ostr.substr(0, jj+1); jj = -1; } else { out[i].v = ostr.substr(0, jj+1); jj = -1; }
@ -748,7 +748,7 @@ out[i].v = write_date(out[i].t.charCodeAt(0), out[i].v, dt, ss0);
else if(decpt !== out.length && ostr.indexOf("E") === -1) { else if(decpt !== out.length && ostr.indexOf("E") === -1) {
jj = ostr.indexOf(".")-1; jj = ostr.indexOf(".")-1;
for(i=decpt; i>= 0; --i) { for(i=decpt; i>= 0; --i) {
if(out[i] == null || 'n?('.indexOf(out[i].t) === -1) continue; if(out[i] == null || 'n?'.indexOf(out[i].t) === -1) continue;
j=out[i].v.indexOf(".")>-1&&i===decpt?out[i].v.indexOf(".")-1:out[i].v.length-1; j=out[i].v.indexOf(".")>-1&&i===decpt?out[i].v.indexOf(".")-1:out[i].v.length-1;
vv = out[i].v.substr(j+1); vv = out[i].v.substr(j+1);
for(; j>=0; --j) { for(; j>=0; --j) {
@ -773,7 +773,7 @@ out[i].v = write_date(out[i].t.charCodeAt(0), out[i].v, dt, ss0);
} }
} }
} }
for(i=0; i<out.length; ++i) if(out[i] != null && 'n(?'.indexOf(out[i].t)>-1) { for(i=0; i<out.length; ++i) if(out[i] != null && 'n?'.indexOf(out[i].t)>-1) {
myv = (flen >1 && v < 0 && i>0 && out[i-1].v === "-" ? -v:v); myv = (flen >1 && v < 0 && i>0 && out[i-1].v === "-" ? -v:v);
out[i].v = write_num(out[i].t, out[i].v, myv); out[i].v = write_num(out[i].t, out[i].v, myv);
out[i].t = 't'; out[i].t = 't';