From 9aa4f8d7a823d3d42b5fbe7c69f86e717171ad2d Mon Sep 17 00:00:00 2001 From: SheetJS Date: Fri, 28 Jul 2017 02:14:33 -0400 Subject: [PATCH] version bump 1.10.0: pin dependencies --- bin/codepage.njs | 10 +++++----- codepage.md | 12 ++++++------ cpexcel.js | 2 +- cptable.js | 2 +- cputils.flow.js | 13 +++---------- misc/codepage.md.ascii | 12 ++++++------ misc/codepage.md.utf16be | Bin 55902 -> 55966 bytes misc/codepage.md.utf16le | Bin 55902 -> 55966 bytes misc/codepage.md.utf32be | Bin 111800 -> 111928 bytes misc/codepage.md.utf32le | Bin 111800 -> 111928 bytes misc/codepage.md.utf7 | 12 ++++++------ misc/codepage.md.utf8 | 12 ++++++------ misc/cptable.js.ascii | 2 +- misc/cptable.js.utf16be | Bin 2659744 -> 2659746 bytes misc/cptable.js.utf16le | Bin 2659744 -> 2659746 bytes misc/cptable.js.utf32be | Bin 5319488 -> 5319492 bytes misc/cptable.js.utf32le | Bin 5319488 -> 5319492 bytes misc/cptable.js.utf7 | 2 +- misc/cptable.js.utf8 | 2 +- misc/flow.js | 20 +++++++++++++++++--- misc/flowdeps.js | 3 +++ package.json | 12 ++++++------ sbcs.js | 2 +- 23 files changed, 64 insertions(+), 54 deletions(-) diff --git a/bin/codepage.njs b/bin/codepage.njs index 65576f9..d23a55a 100755 --- a/bin/codepage.njs +++ b/bin/codepage.njs @@ -45,8 +45,8 @@ if(f !== "-" && !fs.existsSync(f)) { if(f === "-") process.stdin.pipe(require('concat-stream')(process_text)); else process_text(fs.readFileSync(f)); -function process_text(text) { - var dec = codepage.utils.decode(fr, text); +function process_text(text/*:Buffer*/) { + var dec/*:Buffer*/ = codepage.utils.decode(fr, text); var bom/*:Array*/ = []; bom[1200] = new Buffer([0xFF, 0xFE]); @@ -58,7 +58,7 @@ function process_text(text) { bom[65001] = new Buffer([0xEF, 0xBB, 0xBF]); var mybom = (program.bom && bom[to] ? bom[to] : ""); - var out = to === 65001 ? dec.toString('utf8') : codepage.utils.encode(to, dec); + var out/*:any*/ = to === 65001 ? dec.toString('utf8') : codepage.utils.encode(to, dec); /* if output file is specified */ if(o) writefile(o, out, mybom); @@ -76,12 +76,12 @@ function process_text(text) { } } -function logit(out, bom) { +function logit(out/*:Buffer*/, bom) { process.stdout.write(bom); process.stdout.write(out); } -function writefile(o, out, bom) { +function writefile(o, out/*:Buffer*/, bom) { fs.writeFileSync(o, bom); fs.appendFileSync(o, out); } diff --git a/codepage.md b/codepage.md index d1f1d86..76fdbe1 100644 --- a/codepage.md +++ b/codepage.md @@ -753,7 +753,7 @@ describe('failures', function() { ```json>package.json { "name": "codepage", - "version": "1.9.0", + "version": "1.10.0", "author": "SheetJS", "description": "pure-JS library to handle codepages", "keywords": [ "codepage", "iconv", "convert", "strings" ], @@ -770,13 +770,13 @@ describe('failures', function() { ], "main": "cputils.js", "dependencies": { - "voc":"", - "concat-stream":"", - "exit-on-epipe":"", - "commander":"" + "voc":"~1.0.0", + "concat-stream":"~1.6.0", + "exit-on-epipe":"~1.0.1", + "commander":"~2.11.0" }, "devDependencies": { - "mocha":"" + "mocha":"~2.5.3" }, "repository": { "type":"git", "url":"git://github.com/SheetJS/js-codepage.git"}, "scripts": { diff --git a/cpexcel.js b/cpexcel.js index b3d5dae..05c7984 100644 --- a/cpexcel.js +++ b/cpexcel.js @@ -1,6 +1,6 @@ /* cpexcel.js (C) 2013-present SheetJS -- http://sheetjs.com */ /*jshint -W100 */ -var cptable = {version:"1.9.0"}; +var cptable = {version:"1.10.0"}; cptable[437] = (function(){ var d = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜ¢£¥₧ƒáíóúñѪº¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ ", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d.charAt(i)] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); cptable[620] = (function(){ var d = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ÇüéâäàąçêëèïîćÄĄĘęłôöĆûùŚÖÜ¢Ł¥śƒŹŻóÓńŃźż¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ ", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d.charAt(i)] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); cptable[737] = (function(){ var d = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρσςτυφχψ░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀ωάέήϊίόύϋώΆΈΉΊΌΎΏ±≥≤ΪΫ÷≈°∙·√ⁿ²■ ", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d.charAt(i)] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); diff --git a/cptable.js b/cptable.js index 27d9734..99eb3ec 100644 --- a/cptable.js +++ b/cptable.js @@ -1,6 +1,6 @@ /* cptable.js (C) 2013-present SheetJS -- http://sheetjs.com */ /*jshint -W100 */ -var cptable = {version:"1.9.0"}; +var cptable = {version:"1.10.0"}; cptable[37] = (function(){ var d = "\u0000\u0001\u0002\u0003œ\t†—Ž\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013…\b‡\u0018\u0019’\u001c\u001d\u001e\u001f€‚ƒ„\n\u0017\u001bˆ‰Š‹Œ\u0005\u0006\u0007‘\u0016“”•–\u0004˜™š›\u0014\u0015ž\u001a  âäàáãåçñ¢.<(+|&éêëèíîïìß!$*);¬-/ÂÄÀÁÃÅÇѦ,%_>?øÉÊËÈÍÎÏÌ`:#@'=\"Øabcdefghi«»ðýþ±°jklmnopqrªºæ¸Æ¤µ~stuvwxyz¡¿ÐÝÞ®^£¥·©§¶¼½¾[]¯¨´×{ABCDEFGHI­ôöòóõ}JKLMNOPQR¹ûüùúÿ\\÷STUVWXYZ²ÔÖÒÓÕ0123456789³ÛÜÙڟ", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d.charAt(i)] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); cptable[437] = (function(){ var d = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜ¢£¥₧ƒáíóúñѪº¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ ", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d.charAt(i)] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); cptable[500] = (function(){ var d = "\u0000\u0001\u0002\u0003œ\t†—Ž\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013…\b‡\u0018\u0019’\u001c\u001d\u001e\u001f€‚ƒ„\n\u0017\u001bˆ‰Š‹Œ\u0005\u0006\u0007‘\u0016“”•–\u0004˜™š›\u0014\u0015ž\u001a  âäàáãåçñ[.<(+!&éêëèíîïìß]$*);^-/ÂÄÀÁÃÅÇѦ,%_>?øÉÊËÈÍÎÏÌ`:#@'=\"Øabcdefghi«»ðýþ±°jklmnopqrªºæ¸Æ¤µ~stuvwxyz¡¿ÐÝÞ®¢£¥·©§¶¼½¾¬|¯¨´×{ABCDEFGHI­ôöòóõ}JKLMNOPQR¹ûüùúÿ\\÷STUVWXYZ²ÔÖÒÓÕ0123456789³ÛÜÙڟ", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d.charAt(i)] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); diff --git a/cputils.flow.js b/cputils.flow.js index 2c49da0..8f54e20 100644 --- a/cputils.flow.js +++ b/cputils.flow.js @@ -2,28 +2,21 @@ /* vim: set ft=javascript: */ /*jshint newcap: false */ /*:: -type Data = string | Array | Buffer; -type StrData = string | Array | Buffer; -type OutType = Data; type Decoder = (data:Data)=>string; type Encoder = (data:StrData, ofmt:?string)=>Data; -type CPIndex = number|string; -type EMap = {[e:string]:number}; -type DMap = Array; type EncoderMap = {[id:CPIndex]:Encoder}; type DecoderMap = {[id:CPIndex]:Decoder}; -type CPEntry = {enc:EMap, dec:DMap}; */ (function(root/*:any*/, factory) { "use strict"; if(typeof cptable === "undefined") { if(typeof require !== "undefined"){ - var cpt = require('./cpt' + 'able'); + var cpt/*:CPTable*/ = require('./cptable'); if (typeof module !== 'undefined' && module.exports) module.exports = factory(cpt); else root.cptable = factory(cpt); } else throw new Error("cptable not found"); } else cptable = factory(cptable); -}(this, function(cpt){ +}(this, function(cpt/*:CPTable*/){ "use strict"; var magic/*:{[id:CPIndex]:string}*/ = { "1200":"utf16le", @@ -414,7 +407,7 @@ type CPEntry = {enc:EMap, dec:DMap}; out = out.slice(0,j); if(!has_buf) return (ofmt == 'str') ? (out/*:any*/).map(sfcc).join("") : out; if(!ofmt || ofmt === 'buf') return out; - if(ofmt !== 'arr') return out.toString('binary'); + if(ofmt !== 'arr') return /*::((*/out/*:: :any) :Buffer)*/.toString('binary'); return [].slice.call(out); }; var decode = function decode(cp/*:CPIndex*/, data/*:Data*/)/*:string*/ { diff --git a/misc/codepage.md.ascii b/misc/codepage.md.ascii index 564741b..97a2494 100644 --- a/misc/codepage.md.ascii +++ b/misc/codepage.md.ascii @@ -753,7 +753,7 @@ describe('failures', function() { ```json>package.json { "name": "codepage", - "version": "1.9.0", + "version": "1.10.0", "author": "SheetJS", "description": "pure-JS library to handle codepages", "keywords": [ "codepage", "iconv", "convert", "strings" ], @@ -770,13 +770,13 @@ describe('failures', function() { ], "main": "cputils.js", "dependencies": { - "voc":"", - "concat-stream":"", - "exit-on-epipe":"", - "commander":"" + "voc":"~1.0.0", + "concat-stream":"~1.6.0", + "exit-on-epipe":"~1.0.1", + "commander":"~2.11.0" }, "devDependencies": { - "mocha":"" + "mocha":"~2.5.3" }, "repository": { "type":"git", "url":"git://github.com/SheetJS/js-codepage.git"}, "scripts": { diff --git a/misc/codepage.md.utf16be b/misc/codepage.md.utf16be index 1931dc50138e66ae9b41c490df7880307494c515..b093ea6db8756f174863d06cbc1376c120543225 100644 GIT binary patch delta 105 zcmcb&g?Zjq<_%9TG8-}&Y<_m}GZS|mgCT<+g8>LnzH!A6$~Ob^Ij+L^AbG>d7FRWS f>llncY>2MO30K2`IzS?(Kx_=;i*7!BbutS8h?pH{ delta 37 vcmV+=0NVeawFBO?1F+@M0Xehi(enb6=hQHhBh@gIU)3m+mDN_W_tmEah7}Z& diff --git a/misc/codepage.md.utf16le b/misc/codepage.md.utf16le index d9824fe29a2c798dc0781ae42b048aade2d5b40a..1fa68ef171f67add8b950f9cea462d7dafb4f986 100644 GIT binary patch delta 105 zcmcb&g?Zjq<_%9SG8-}&Y<_z2GZS|mgCT<+g8>LnzJA3J$~Ob^*{{O*AbG>d=2ta& f>llncY>2MO@mIrvIzS?(Kx_=;i*7!3bqWgrhYKBH delta 45 zcmbQYmHFNl<_%9SGFonae(^KYWTq=ZlYd;1o2+!z0L(79DmHn_)v(RquC8DK03L}K Af&c&j diff --git a/misc/codepage.md.utf32be b/misc/codepage.md.utf32be index 8a2e70bac1002995b6378dd3b6dfd31dc537c204..7ce3e0abb3430196b52c48597b4cb89c5940223c 100644 GIT binary patch delta 187 zcmdn-l5NK;wuUW?#}~62GB7Y0OwZZKsJ#94V#Xt^ymdeUkf0t+LVmjZaz>u%=T|a1 zph%j5bU`KcS1~$>qUeO0U^xB4Vn%U@3H_@W4J1K|j9`*L8e!F*RgCMwX27IPp~{S> O1EsXLPhQQa$_W4<1SvZJ delta 65 zcmdn-ifzYBwuUW?#}_kNPCu}cQGWaD#f&Fdr!%i$RGI#MC8N!B=T(de5bpg|j5^a# TFJsi0?!TI`W&7*ZjJ})zyP+Gi diff --git a/misc/codepage.md.utf32le b/misc/codepage.md.utf32le index 8d794827cf805b8ba5c74b8a57085a7ec9e429b7..60a4c350b2bd3af35ce86e792dc176cd02219c8c 100644 GIT binary patch delta 205 zcmdn-l5NK;wuUW?M;7xMGB7Y00I?p3p02o(QF{A}#f(Q-MeBe9AW5(UjGn%6IivdY z3o99IP~^?v@{Y?Hm8a{hVst=}hgo0<(LZ4oqmCrVd?TnnkUem_rXO6!s6F}29**g6 YRx#Fq&4H;ig{n6OtJywbHKPV60F1#Z7XSbN delta 80 zcmdn-ifzYBwuUW?M;0?$PT#wdQGWZ2#f&Fdrpackage.json { "name": "codepage", - "version": "1.9.0", + "version": "1.10.0", "author": "SheetJS", "description": "pure-JS library to handle codepages", "keywords": [ "codepage", "iconv", "convert", "strings" ], @@ -770,13 +770,13 @@ describe('failures', function() { ], "main": "cputils.js", "dependencies": { - "voc":"", - "concat-stream":"", - "exit-on-epipe":"", - "commander":"" + "voc":"~1.0.0", + "concat-stream":"~1.6.0", + "exit-on-epipe":"~1.0.1", + "commander":"~2.11.0" }, "devDependencies": { - "mocha":"" + "mocha":"~2.5.3" }, "repository": { "type":"git", "url":"git://github.com/SheetJS/js-codepage.git"}, "scripts": { diff --git a/misc/cptable.js.ascii b/misc/cptable.js.ascii index 900f164..50de9e6 100644 --- a/misc/cptable.js.ascii +++ b/misc/cptable.js.ascii @@ -1,6 +1,6 @@ /* cptable.js (C) 2013-present SheetJS -- http://sheetjs.com */ /*jshint -W100 */ -var cptable = {version:"1.9.0"}; +var cptable = {version:"1.10.0"}; cptable[37] = (function(){ var d = "\u0000\u0001\u0002\u0003\t\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\b\u0018\u0019\u001c\u001d\u001e\u001f\n\u0017\u001b\u0005\u0006\u0007\u0016\u0004\u0014\u0015\u001a .<(+|&!$*);-/,%_>?`:#@'=\"abcdefghijklmnopqr~stuvwxyz^[]{ABCDEFGHI}JKLMNOPQR\\STUVWXYZ0123456789", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d.charAt(i)] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); cptable[437] = (function(){ var d = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d.charAt(i)] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); cptable[500] = (function(){ var d = "\u0000\u0001\u0002\u0003\t\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\b\u0018\u0019\u001c\u001d\u001e\u001f\n\u0017\u001b\u0005\u0006\u0007\u0016\u0004\u0014\u0015\u001a [.<(+!&]$*);^-/,%_>?`:#@'=\"abcdefghijklmnopqr~stuvwxyz|{ABCDEFGHI}JKLMNOPQR\\STUVWXYZ0123456789", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d.charAt(i)] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); diff --git a/misc/cptable.js.utf16be b/misc/cptable.js.utf16be index abc4d4d0a07e8706d6a7df8af755456cb690f6a7..42abfc9fc2127ec0bb366198e49eea19c1ab52cf 100644 GIT binary patch delta 138 zcmWN=ITFDD06!XU=>5G zVI3RT#1^)(gI(-l9|t(Z5k?qef+>!1f>WH~92dC66|QlE8E$chdpzI~b1d-m_WXJL E0Gyvfod5s; delta 136 zcmWN=w++Hj06;-~f(gcCFko`BS71Df*HbWn<(8Ti*a7Jc11DYeszUky_=ekE3|PZD zHn52iwy=#I>|%^POt6mw9O4MaIKe5-aE>W1aEU9-aE%+>;tuzCz$2dUj2FCO{R diff --git a/misc/cptable.js.utf16le b/misc/cptable.js.utf16le index a0013a46e749ed2a5941602dbadf1d74c295eac9..1dcca2d0a2513a83b28da1cb73e6a23cda7dcfe6 100644 GIT binary patch delta 138 zcmWN=ITFDD06!XU=>5G zVI3RT#1^)(gI(-l9|t(Z5k?qef+>!1f>WH~92dC66|QlE8E$chdpzI~b1d-m_WXJL E0FmKBbN~PV delta 136 zcmWN=w++Hj06;-~f(gcCFko`BS71Df*HbWn<(8TmSOMuR11DYeszUky_=ekE3|PZD zHn52iwy=#I>|%^POt6mw9O4MaIKe5-aE>W1aEU9-aE%+>;tuzCz$2dUj2FCO{j+4yKZ!gyK^DB(k zgCMAVL}4ci|HtgJ-?#|}9CXNGM;vv`q$$UpFm1-HIVYWR+Pnp4oORB5iCY*56DU+t0cE(xfoOi)Rms~b&#uc-!nlta3>lQ4! zVaZLm+;+#ZyH?zD-vbXl^4Jqkt$OCUHS0FKu<4~&Ufc4y|H diff --git a/misc/cptable.js.utf32le b/misc/cptable.js.utf32le index 469ce551c86b265813f5965b754aaff5519e9e60..6ba3c5d2717b4d7113592aeda63e486c629f40f9 100644 GIT binary patch delta 346 zcmWl|$u>d(007YUBJ(_CDAGWMC`4rznTNi~!qTtwR&6c%2H)el=iHy)eyne|8^)_a z5L7;+@GA=c#~g6bxI+#*;;3VeJK>~LPCMhQbI!Zqq6wE=cEwebrd)H~v>Rs3nltaF zTNW%@a@!quExYHw6{{Y2=#e##J+W@Xrl+2H?uD0LdF_oYZ@shay$?S6?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜ¢£¥₧ƒáíóúñѪº¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ ", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d.charAt(i)] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); cptable[500] = (function(){ var d = "\u0000\u0001\u0002\u0003œ\t†—Ž\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013…\b‡\u0018\u0019’\u001c\u001d\u001e\u001f€‚ƒ„\n\u0017\u001bˆ‰Š‹Œ\u0005\u0006\u0007‘\u0016“”•–\u0004˜™š›\u0014\u0015ž\u001a  âäàáãåçñ[.<(+!&éêëèíîïìß]$*);^-/ÂÄÀÁÃÅÇѦ,%_>?øÉÊËÈÍÎÏÌ`:#@'=\"Øabcdefghi«»ðýþ±°jklmnopqrªºæ¸Æ¤µ~stuvwxyz¡¿ÐÝÞ®¢£¥·©§¶¼½¾¬|¯¨´×{ABCDEFGHI­ôöòóõ}JKLMNOPQR¹ûüùúÿ\\÷STUVWXYZ²ÔÖÒÓÕ0123456789³ÛÜÙڟ", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d.charAt(i)] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); diff --git a/misc/flow.js b/misc/flow.js index bcd3d7d..32beb08 100644 --- a/misc/flow.js +++ b/misc/flow.js @@ -1,14 +1,28 @@ /*:: +type EMap = {[e:string]:number}; +type DMap = Array; +type CPEntry = {enc:EMap, dec:DMap}; + +type Data = string | Array | Buffer; +type StrData = string | Array | Buffer; +type OutType = Data; + +type CPIndex = number|string; + type CPTable = { - [key: string|number]:any; + [key: CPIndex]:CPEntry; utils:{ decode:any; - encode:any; - hascp:any; + encode(cp:CPIndex, data:StrData, ofmt:?string):OutType; + hascp(cp:number):boolean; magic:any; cache:any; }; }; declare var cptable: CPTable; + +declare module './cptable' { + declare var exports: CPTable; +} */ diff --git a/misc/flowdeps.js b/misc/flowdeps.js index 9cdb1ee..b505490 100644 --- a/misc/flowdeps.js +++ b/misc/flowdeps.js @@ -7,4 +7,7 @@ declare module 'codepage' { declare var exports:CPTable; }; declare module '../' { declare var exports:CPTable; }; declare module 'commander' { declare var exports:any; }; + +type CPTableType = { [i:CPIndex]:CPEntry; }; +declare module './cptable' { declare var exports:CPTableType; }; */ diff --git a/package.json b/package.json index 0977162..8eaca21 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "codepage", - "version": "1.9.0", + "version": "1.10.0", "author": "SheetJS", "description": "pure-JS library to handle codepages", "keywords": [ "codepage", "iconv", "convert", "strings" ], @@ -17,13 +17,13 @@ ], "main": "cputils.js", "dependencies": { - "voc":"", - "concat-stream":"", - "exit-on-epipe":"", - "commander":"" + "voc":"~1.0.0", + "concat-stream":"~1.6.0", + "exit-on-epipe":"~1.0.1", + "commander":"~2.11.0" }, "devDependencies": { - "mocha":"" + "mocha":"~2.5.3" }, "repository": { "type":"git", "url":"git://github.com/SheetJS/js-codepage.git"}, "scripts": { diff --git a/sbcs.js b/sbcs.js index c0ab800..e55680c 100644 --- a/sbcs.js +++ b/sbcs.js @@ -1,6 +1,6 @@ /* sbcs.js (C) 2013-present SheetJS -- http://sheetjs.com */ /*jshint -W100 */ -var cptable = {version:"1.9.0"}; +var cptable = {version:"1.10.0"}; cptable[37] = (function(){ var d = "\u0000\u0001\u0002\u0003œ\t†—Ž\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013…\b‡\u0018\u0019’\u001c\u001d\u001e\u001f€‚ƒ„\n\u0017\u001bˆ‰Š‹Œ\u0005\u0006\u0007‘\u0016“”•–\u0004˜™š›\u0014\u0015ž\u001a  âäàáãåçñ¢.<(+|&éêëèíîïìß!$*);¬-/ÂÄÀÁÃÅÇѦ,%_>?øÉÊËÈÍÎÏÌ`:#@'=\"Øabcdefghi«»ðýþ±°jklmnopqrªºæ¸Æ¤µ~stuvwxyz¡¿ÐÝÞ®^£¥·©§¶¼½¾[]¯¨´×{ABCDEFGHI­ôöòóõ}JKLMNOPQR¹ûüùúÿ\\÷STUVWXYZ²ÔÖÒÓÕ0123456789³ÛÜÙڟ", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d.charAt(i)] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); cptable[437] = (function(){ var d = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜ¢£¥₧ƒáíóúñѪº¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ ", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d.charAt(i)] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })(); cptable[500] = (function(){ var d = "\u0000\u0001\u0002\u0003œ\t†—Ž\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013…\b‡\u0018\u0019’\u001c\u001d\u001e\u001f€‚ƒ„\n\u0017\u001bˆ‰Š‹Œ\u0005\u0006\u0007‘\u0016“”•–\u0004˜™š›\u0014\u0015ž\u001a  âäàáãåçñ[.<(+!&éêëèíîïìß]$*);^-/ÂÄÀÁÃÅÇѦ,%_>?øÉÊËÈÍÎÏÌ`:#@'=\"Øabcdefghi«»ðýþ±°jklmnopqrªºæ¸Æ¤µ~stuvwxyz¡¿ÐÝÞ®¢£¥·©§¶¼½¾¬|¯¨´×{ABCDEFGHI­ôöòóõ}JKLMNOPQR¹ûüùúÿ\\÷STUVWXYZ²ÔÖÒÓÕ0123456789³ÛÜÙڟ", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d.charAt(i)] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })();