Skip to content

Commit 350978b

Browse files
committed
version bump 1.1.1: lint
1 parent d3f3730 commit 350978b

14 files changed

+73
-28
lines changed

.eslintrc

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
"ecmaVersion": 3,
66
},
77
"plugins": [ "html", "json" ],
8-
"!extends": "eslint:recommended",
8+
"extends": "eslint:recommended",
99
"rules": {
10-
"no-console": 0,
11-
"no-bitwise": 0,
12-
"curly": 0,
1310
"comma-style": [ 2, "last" ],
11+
"comma-dangle": [ 2, "never" ],
12+
"curly": 0,
13+
"no-bitwise": 0,
14+
"no-console": 0,
1415
"no-trailing-spaces": 2,
15-
"semi": [ 2, "always" ],
16-
"comma-dangle": [ 2, "never" ]
16+
"semi": [ 2, "always" ]
1717
}
1818
}

Makefile

+9
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ clean-stress: ## Remove stress tests
7070

7171
## Code Checking
7272

73+
.PHONY: fullint
74+
fullint: lint old-lint tslint flow mdlint ## Run all checks
75+
7376
.PHONY: lint
7477
lint: $(TARGET) ## Run eslint checks
7578
@eslint --ext .js,.njs,.json,.html,.htm $(TARGET) $(AUXTARGETS) $(CMDS) $(HTMLLINT) package.json bower.json
@@ -103,6 +106,12 @@ misc/coverage.html: $(TARGET) test.js
103106
coveralls: ## Coverage Test + Send to coveralls.io
104107
mocha --require blanket --reporter mocha-lcov-reporter -t 20000 | node ./node_modules/coveralls/bin/coveralls.js
105108

109+
MDLINT=README.md
110+
.PHONY: mdlint
111+
mdlint: $(MDLINT) ## Check markdown documents
112+
alex $^
113+
mdspell -a -n -x -r --en-us $^
114+
106115
.PHONY: help
107116
help:
108117
@grep -hE '(^[a-zA-Z_-][ a-zA-Z_-]*:.*?|^#[#*])' $(MAKEFILE_LIST) | bash misc/help.sh

bin/printj.njs

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/usr/bin/env node
22
/* printj.js (C) 2016-present SheetJS -- http://sheetjs.com */
3+
/* eslint-env node */
34
/* vim: set ts=2 ft=javascript: */
45
/*jshint node:true, evil:true */
56
var X = require("../"), argv = process.argv;
@@ -42,6 +43,7 @@ function parse_arg(arg/*:string*/)/*:any*/ {
4243
case /*e*/ 101: return eval(m);
4344
case /*s*/ 115: return m;
4445
}
46+
void p;
4547
return arg;
4648
}
4749

bits/00_header.js

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
var PRINTJ/*:PRINTJModule*/;
88
(function (factory/*:(a:any)=>void*/)/*:void*/ {
99
/*jshint ignore:start */
10+
/*eslint-disable */
1011
if(typeof DO_NOT_EXPORT_PRINTJ === 'undefined') {
1112
if('object' === typeof exports) {
1213
factory(exports);
@@ -22,6 +23,7 @@ var PRINTJ/*:PRINTJModule*/;
2223
} else {
2324
factory(PRINTJ = /*::(*/{}/*:: :any)*/);
2425
}
26+
/*eslint-enable */
2527
/*jshint ignore:end */
2628
}(function(PRINTJ/*:PRINTJModule*/) {
2729
#include "01_version.js"

bits/01_version.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
PRINTJ.version = '1.1.0';
1+
PRINTJ.version = '1.1.1';

bits/52_convint.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/* unsigned integer */
88
case /*U*/ 85: LONG;
99
/* falls through */
10-
case /*u*/ 117: INT; break;
10+
case /*u*/ 117: INT; break;
1111

1212
/* unsigned octal */
1313
case /*O*/ 79: LONG;

ctest/printj.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
var PRINTJ;
66
(function (factory) {
77
/*jshint ignore:start */
8+
/*eslint-disable */
89
if(typeof DO_NOT_EXPORT_PRINTJ === 'undefined') {
910
if('object' === typeof exports) {
1011
factory(exports);
@@ -20,10 +21,11 @@ var PRINTJ;
2021
} else {
2122
factory(PRINTJ = {});
2223
}
24+
/*eslint-enable */
2325
/*jshint ignore:end */
2426
}(function(PRINTJ) {
2527

26-
PRINTJ.version = '1.1.0';
28+
PRINTJ.version = '1.1.1';
2729

2830
function tokenize(fmt) {
2931
var out = [];
@@ -235,7 +237,7 @@ function doit(t, args) {
235237
/* unsigned integer */
236238
case /*U*/ 85: bytes = 8;
237239
/* falls through */
238-
case /*u*/ 117: isnum = -1; break;
240+
case /*u*/ 117: isnum = -1; break;
239241

240242
/* unsigned octal */
241243
case /*O*/ 79: bytes = 8;

dist/printj.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
var PRINTJ;
66
(function (factory) {
77
/*jshint ignore:start */
8+
/*eslint-disable */
89
if(typeof DO_NOT_EXPORT_PRINTJ === 'undefined') {
910
if('object' === typeof exports) {
1011
factory(exports);
@@ -20,10 +21,11 @@ var PRINTJ;
2021
} else {
2122
factory(PRINTJ = {});
2223
}
24+
/*eslint-enable */
2325
/*jshint ignore:end */
2426
}(function(PRINTJ) {
2527

26-
PRINTJ.version = '1.0.1';
28+
PRINTJ.version = '1.1.1';
2729

2830
function tokenize(fmt) {
2931
var out = [];
@@ -235,7 +237,7 @@ function doit(t, args) {
235237
/* unsigned integer */
236238
case /*U*/ 85: bytes = 8;
237239
/* falls through */
238-
case /*u*/ 117: isnum = -1; break;
240+
case /*u*/ 117: isnum = -1; break;
239241

240242
/* unsigned octal */
241243
case /*O*/ 79: bytes = 8;
@@ -314,6 +316,8 @@ function doit(t, args) {
314316

315317
}
316318

319+
if(width < 0) { width = -width; flags += "-"; }
320+
317321
if(isnum == -1) {
318322

319323
Vnum = Number(arg);

dist/printj.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/printj.min.map

+1-1
Large diffs are not rendered by default.

index.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<script src="http://cdnjs.cloudflare.com/ajax/libs/json3/3.3.2/json3.min.js"></script>
3232
<script src="printj.js"></script>
3333
<script type="text/javascript">
34+
/* eslint-env browser */
3435
/*global PRINTJ */
3536
var table = document.getElementById("data");
3637
var ex = [
@@ -58,8 +59,6 @@
5859
var c2 = row.insertCell(1); c2.innerHTML = "<pre>" + eval(m) + "</pre>";
5960
});
6061
};
61-
</script>
62-
<script type="text/javascript">
6362
var _gaq = _gaq || [];
6463
_gaq.push(['_setAccount', 'UA-36810333-1']);
6564
_gaq.push(['_trackPageview']);

package.json

+31-8
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,60 @@
11
{
22
"name": "printj",
3-
"version": "1.1.0",
3+
"version": "1.1.1",
44
"author": "sheetjs",
55
"description": "Pure-JS printf",
6-
"keywords": [ "printf", "sprintf", "format", "string" ],
6+
"keywords": [
7+
"printf",
8+
"sprintf",
9+
"format",
10+
"string"
11+
],
712
"bin": {
813
"printj": "./bin/printj.njs"
914
},
1015
"main": "./printj",
1116
"types": "types",
17+
"browser": {
18+
"process": false,
19+
"util": false
20+
},
1221
"dependencies": {
1322
},
1423
"devDependencies": {
15-
"mocha":"~2.5.3",
24+
"mocha": "~2.5.3",
1625
"blanket": "~1.2.3",
17-
"@sheetjs/uglify-js":"~2.7.3",
18-
"@types/node":"^8.0.7",
26+
"@sheetjs/uglify-js": "~2.7.3",
27+
"@types/node": "^8.0.7",
1928
"dtslint": "^0.1.2",
2029
"typescript": "2.2.0"
2130
},
22-
"repository": { "type":"git", "url":"git://github.com/SheetJS/printj.git" },
31+
"repository": {
32+
"type": "git",
33+
"url": "git://github.com/SheetJS/printj.git"
34+
},
2335
"scripts": {
2436
"test": "make test",
37+
"build": "make",
38+
"lint": "make fullint",
2539
"dtslint": "dtslint types"
2640
},
2741
"config": {
2842
"blanket": {
2943
"pattern": "printj.js"
3044
}
3145
},
46+
"alex": {
47+
"allow": [
48+
"period"
49+
]
50+
},
3251
"homepage": "http://sheetjs.com/opensource",
3352
"files": ["printj.js", "bin/printj.njs", "LICENSE", "README.md", "dist/*.js", "dist/*.map", "dist/LICENSE", "types/index.d.ts", "types/*.json"],
34-
"bugs": { "url": "https://github.com/SheetJS/printj/issues" },
53+
"bugs": {
54+
"url": "https://github.com/SheetJS/printj/issues"
55+
},
3556
"license": "Apache-2.0",
36-
"engines": { "node": ">=0.8" }
57+
"engines": {
58+
"node": ">=0.8"
59+
}
3760
}

printj.flow.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
var PRINTJ/*:PRINTJModule*/;
88
(function (factory/*:(a:any)=>void*/)/*:void*/ {
99
/*jshint ignore:start */
10+
/*eslint-disable */
1011
if(typeof DO_NOT_EXPORT_PRINTJ === 'undefined') {
1112
if('object' === typeof exports) {
1213
factory(exports);
@@ -22,10 +23,11 @@ var PRINTJ/*:PRINTJModule*/;
2223
} else {
2324
factory(PRINTJ = /*::(*/{}/*:: :any)*/);
2425
}
26+
/*eslint-enable */
2527
/*jshint ignore:end */
2628
}(function(PRINTJ/*:PRINTJModule*/) {
2729

28-
PRINTJ.version = '1.1.0';
30+
PRINTJ.version = '1.1.1';
2931

3032
function tokenize(fmt/*:string*/)/*:ParsedFmt*/ {
3133
var out/*:ParsedFmt*/ = [];
@@ -238,7 +240,7 @@ function doit(t/*:ParsedFmt*/, args/*:Array<any>*/)/*:string*/ {
238240
/* unsigned integer */
239241
case /*U*/ 85: bytes = 8;
240242
/* falls through */
241-
case /*u*/ 117: isnum = -1; break;
243+
case /*u*/ 117: isnum = -1; break;
242244

243245
/* unsigned octal */
244246
case /*O*/ 79: bytes = 8;

printj.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
var PRINTJ;
66
(function (factory) {
77
/*jshint ignore:start */
8+
/*eslint-disable */
89
if(typeof DO_NOT_EXPORT_PRINTJ === 'undefined') {
910
if('object' === typeof exports) {
1011
factory(exports);
@@ -20,10 +21,11 @@ var PRINTJ;
2021
} else {
2122
factory(PRINTJ = {});
2223
}
24+
/*eslint-enable */
2325
/*jshint ignore:end */
2426
}(function(PRINTJ) {
2527

26-
PRINTJ.version = '1.1.0';
28+
PRINTJ.version = '1.1.1';
2729

2830
function tokenize(fmt) {
2931
var out = [];
@@ -235,7 +237,7 @@ function doit(t, args) {
235237
/* unsigned integer */
236238
case /*U*/ 85: bytes = 8;
237239
/* falls through */
238-
case /*u*/ 117: isnum = -1; break;
240+
case /*u*/ 117: isnum = -1; break;
239241

240242
/* unsigned octal */
241243
case /*O*/ 79: bytes = 8;

0 commit comments

Comments
 (0)