version bump 1.6.0: IE6+ compatibility

- removed string indexing from table generation
- browser tests
- expanded flow checks

Author: SheetJSDev

.flowconfig

@@ -17,8 +17,12 @@
 
 [include]
 cputils.flow.js
+.*/bin/.*.njs
 
 [libs]
 misc/flow.js
+misc/flowdeps.js
 
 [options]
+module.file_ext=.js
+module.file_ext=.njs

Makefile

@@ -2,6 +2,10 @@ SHELL=/bin/bash
 VOC=voc
 TARGET=cptable.js
 AUXTARGETS=cputils.js cpexcel.js sbcs.js
+DISTFULL=cpexcel sbcs cptable
+CMDS=bin/codepage.njs
+
+ULIB=$(shell echo $(LIB) | tr a-z A-Z)
 
 ## Main Targets
 
@@ -19,16 +23,17 @@ js: make.sh codepage.md ## Build all output targets
 	bash make.sh
 	make cputils.js
 
-cputils.js: %.js : %.flow.js
+cputils.js: cputils.flow.js
 	node -e 'process.stdout.write(require("fs").readFileSync("$<","utf8").replace(/^[ \t]*\/\*[:#][^*]*\*\/[ \t]*(\n)?/gm,"").replace(/\/\*[:#][^*]*\*\//gm,""))' > $@
 
 .PHONY: clean
 clean: ## Remove targets and build artifaats
 	rm -f make.sh .vocrc pages.csv bits/*.js
 
-.PHONY: dist ## Copy files for distribution
-dist: $(TARGET) $(AUXTARGETS)
+.PHONY: dist
+dist: $(TARGET) $(AUXTARGETS) ## Copy files for distribution
 	cp $(TARGET) $(AUXTARGETS) LICENSE dist/
+	for i in $(DISTFULL); do cat $$i.js cputils.js > dist/$$i.full.js; done
 
 ## Testing
 
@@ -42,17 +47,22 @@ ctest: ## Build browser test (into ctest/ subdirectory)
 
 .PHONY: ctestserv
 ctestserv: ## Start a test server on port 8000
-	@python -mSimpleHTTPServer
+	@cd ctest && python -mSimpleHTTPServer
 
 .PHONY: baseline
 baseline: ## Build test baselines
 	@bash ./misc/make_baseline.sh
 
+.PHONY: clean-baseline
+clean-baseline: ## Remove test baselines
+	@bash ./misc/make_baseline.sh clean
+
 ## Code Checking
 
 .PHONY: lint
 lint: $(TARGET) $(AUXTARGETS) ## Run jshint and jscs checks
 	@jshint --show-non-errors $(TARGET) $(AUXTARGETS)
+	@jshint --show-non-errors $(CMDS)
 	@jshint --show-non-errors package.json
 	@jshint --show-non-errors --extract=always $(HTMLLINT)
 	@jscs $(TARGET) $(AUXTARGETS)
@@ -77,7 +87,6 @@ prof:
 	node --prof prof.js
 
 
-
 .PHONY: help
 help:
 	@grep -hE '(^[a-zA-Z_-][ a-zA-Z_-]*:.*?|^#[#*])' $(MAKEFILE_LIST) | bash misc/help.sh

README.md

@@ -1,14 +1,9 @@
-# Codepages for JS
+# js-codepage
 
 [Codepages](https://en.wikipedia.org/wiki/Codepage) are character encodings.  In
 many contexts, single- or double-byte character sets are used in lieu of Unicode
 encodings.  The codepages map between characters and numbers.
 
-[unicode.org](http://www.unicode.org/Public/MAPPINGS/) hosts lists of mappings.
-The build script automatically downloads and parses the mappings in order to
-generate the full script.  The `pages.csv` description in `codepage.md` controls
-which codepages are used.
-
 ## Setup
 
 In node:
@@ -317,15 +312,33 @@ unicode.org does not prescribe a value, MakeEncoding.cs value is used.
 of Windows.  In older versions of Windows (e.g. Windows 98) these files followed
 the name pattern `CP_#.NLS`, but newer versions use the name pattern `C_#.NLS`.
 
+## Testing
+
+`make test` will run the nodejs-based test.
+
+To run the in-browser tests, run a local server and go to the `ctest` directory.
+`make ctestserv` will start a python `SimpleHTTPServer` server on port 8000.
+
+To update the browser artifacts, run `make ctest`.
+
 ## Sources
 
 - [Unicode Consortium Public Mappings](http://www.unicode.org/Public/MAPPINGS/)
 - [Windows Code Page Enumeration](http://msdn.microsoft.com/en-us/library/cc195051.aspx)
 - [Windows Code Page Identifiers](http://msdn.microsoft.com/en-us/library/windows/desktop/dd317756.aspx)
 - [IBM Coded Character Sets](https://www-01.ibm.com/software/globalization/ccsid/ccsid_registered.html)
 
+## License
+
+Please consult the attached LICENSE file for details.  All rights not explicitly
+granted by the Apache 2.0 license are reserved by the Original Author.
+
 ## Badges
 
+[![Sauce Test Status](https://saucelabs.com/browser-matrix/codepage.svg)](https://saucelabs.com/u/codepage)
+
 [![Build Status](https://travis-ci.org/SheetJS/js-codepage.svg?branch=master)](https://travis-ci.org/SheetJS/js-codepage)
-[![Coverage Status](https://coveralls.io/repos/SheetJS/js-codepage/badge.png)](https://coveralls.io/r/SheetJS/js-codepage)
+
+[![Coverage Status](http://img.shields.io/coveralls/SheetJS/js-codepage/master.svg)](https://coveralls.io/r/SheetJS/js-codepage?branch=master)
+
 [![Analytics](https://ga-beacon.appspot.com/UA-36810333-1/SheetJS/js-codepage?pixel)](https://github.com/SheetJS/js-codepage)

bin/codepage.njs

@@ -3,7 +3,7 @@
 /* vim: set ts=2 ft=javascript: */
 var codepage = require('../');
 require('exit-on-epipe');
-var fs = require('fs'), program = require('commander');
+var fs = require('fs'), program/*:any*/ = (require('commander')/*:any*/);
 program
 	.version(codepage.version)
 	.usage('[options] <file>')
@@ -23,7 +23,10 @@ program.on('--help', function() {
 program.parse(process.argv);
 
 if(program.list) {
-	Object.keys(codepage).forEach(function(x) { if(+x == x) console.log(x); });
+	var l/*:Array<number>*/ = [];
+	Object.keys(codepage).forEach(function(x) { if(parseInt(x) == +x) l.push(+x); });
+	Object.keys(codepage.utils.magic).forEach(function(x) { if(parseInt(x) == +x && +x != 16969) l.push(+x); });
+	l.sort(function(a,b) { return a-b; }).forEach(function(x) { console.log(x); });
 	process.exit();
 }
 
@@ -45,15 +48,14 @@ else process_text(fs.readFileSync(f));
 function process_text(text) {
 	var dec = codepage.utils.decode(fr, text);
 
-	var bom = {
-		1200:  new Buffer([0xFF, 0xFE]),
-		1201:  new Buffer([0xFE, 0xFF]),
-		12000: new Buffer([0xFF, 0xFE, 0x00, 0x00]),
-		12001: new Buffer([0x00, 0x00, 0xFE, 0xFF]),
-		16969: new Buffer([0x69, 0x69]),
-		65000: new Buffer([0x2B, 0x2F, 0x76, 0x2B]),
-		65001: new Buffer([0xEF, 0xBB, 0xBF])
-	}
+	var bom/*:Array<Buffer>*/ = [];
+	bom[1200] = new Buffer([0xFF, 0xFE]);
+	bom[1201] = new Buffer([0xFE, 0xFF]);
+	bom[12000] = new Buffer([0xFF, 0xFE, 0x00, 0x00]);
+	bom[12001] = new Buffer([0x00, 0x00, 0xFE, 0xFF]);
+	bom[16969] = new Buffer([0x69, 0x69]);
+	bom[65000] = new Buffer([0x2B, 0x2F, 0x76, 0x2B]);
+	bom[65001] = new Buffer([0xEF, 0xBB, 0xBF]);
 
 	var mybom = (program.bom && bom[fr] ? bom[fr] : "");
 	var out = to === 65001 ? dec.toString('utf8') : codepage.utils.encode(to, dec);