Skip to content

Commit f96c74a

Browse files
XhmikosRXhmikosR
committed
Lint tweaks.
1 parent e811409 commit f96c74a

33 files changed

+1137
-1099
lines changed

‎.jshintrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
"nonew": true,
1313
"predef": ["-SyntaxError"],
1414
"proto": true,
15+
"quotmark": "double",
1516
"strict": true,
1617
"undef": true,
17-
"unused": "vars"
18+
"unused": true
1819
}

‎package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@
2626
"main": "./src/index.js",
2727
"scripts": {
2828
"coverage": "ytestrunner -c",
29-
"pretest": "jshint src tests scripts",
29+
"lint": "jshint scripts src tests",
30+
"pretest": "npm run lint",
3031
"build": "node scripts/build.js",
3132
"test-yuitest": "ytestrunner",
32-
"test": "npm run test-yuitest",
33+
"test": "npm run lint && npm run test-yuitest",
3334
"prepublish": "npm test"
3435
},
3536
"devDependencies": {

‎scripts/build.js

+36-15
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,40 @@ var buildDir = path.join(__dirname, "../dist");
1414
var srcDir = path.join(__dirname, "../src");
1515
var testsDir = path.join(__dirname, "../tests");
1616

17-
var RIGHT_NOW = moment().locale('en-US').format("D-MMMM-YYYY HH:mm:ss");
17+
var RIGHT_NOW = moment().locale("en-US").format("D-MMMM-YYYY HH:mm:ss");
1818
var LICENSE = [
1919
"/*!",
2020
shell.cat(path.join(__dirname, "../LICENSE")),
2121
"*/",
2222
"/* Version v" + version + ", Build time: " + RIGHT_NOW + " */"
23-
].map(function(s) { return s.trim(); }).join("\n");
23+
].map(function(s) {
24+
return s.trim();
25+
}).join("\n");
2426

2527
function writeFile(filename, contents) {
2628
return new Promise(function(resolve, reject) {
2729
var fullname = path.join(buildDir, filename);
2830
console.log("Writing", path.relative(process.cwd(), fullname));
29-
fs.writeFile(fullname, contents, 'utf8', function(err) {
30-
if (err) { reject(err); } else { resolve(); }
31+
fs.writeFile(fullname, contents, "utf8", function(err) {
32+
if (err) {
33+
reject(err);
34+
} else {
35+
resolve();
36+
}
3137
});
3238
});
3339
}
3440

3541
function concatP() {
3642
var resolve;
37-
var promise = new Promise(function(r) { resolve = r; });
43+
var promise = new Promise(function(r) {
44+
resolve = r;
45+
});
3846
var stream = concat(resolve);
39-
return { stream: stream, promise: promise };
47+
return {
48+
stream: stream,
49+
promise: promise
50+
};
4051
}
4152

4253
function build(target, filename) {
@@ -49,15 +60,21 @@ function build(target, filename) {
4960
if (target === "split") {
5061
bundle.require(path.join(srcDir, "util"),
5162
{ expose: "parserlib-core" });
52-
var css = concatP(); results.push(css.promise);
53-
var stub = concatP(); results.push(stub.promise);
54-
bundle.plugin('factor-bundle', {
63+
var css = concatP();
64+
results.push(css.promise);
65+
var stub = concatP();
66+
results.push(stub.promise);
67+
bundle.plugin("factor-bundle", {
5568
outputs: [ css.stream, stub.stream ]
5669
});
5770
}
5871

5972
bundle.bundle(function(err, src) {
60-
if (err) { reject(err); } else { resolve(src); }
73+
if (err) {
74+
reject(err);
75+
} else {
76+
resolve(src);
77+
}
6178
});
6279
});
6380
return Promise.all(results).then(function(results) {
@@ -96,7 +113,7 @@ function build(target, filename) {
96113
"return require('parserlib');",
97114
"})();"
98115
];
99-
if (target === 'node') {
116+
if (target === "node") {
100117
src.push("module.exports = parserlib;");
101118
}
102119
return writeFile(filename, src.join("\n"));
@@ -114,10 +131,14 @@ function buildTests(filename) {
114131
tests.forEach(function(f, i) {
115132
bundle.require(f, { expose: "test"+i });
116133
});
117-
bundle.exclude('yuitest');
134+
bundle.exclude("yuitest");
118135
bundle.exclude(path.join(srcDir, "index.js"));
119136
bundle.bundle(function(err, src) {
120-
if (err) { reject(err); } else { resolve(src); }
137+
if (err) {
138+
reject(err);
139+
} else {
140+
resolve(src);
141+
}
121142
});
122143
}).then(function(src) {
123144
src = [
@@ -128,7 +149,7 @@ function buildTests(filename) {
128149
"return parserlib;",
129150
"};",
130151
src
131-
].concat(tests.map(function(f,i) {
152+
].concat(tests.map(function(f, i) {
132153
return "require('test"+i+"');";
133154
})).concat([
134155
"})();"
@@ -139,7 +160,7 @@ function buildTests(filename) {
139160

140161
Promise.resolve().then(function() {
141162
// Ensure build directory is present.
142-
shell.mkdir('-p', buildDir);
163+
shell.mkdir("-p", buildDir);
143164
}).then(function() {
144165
return build("full", "parserlib.js");
145166
}).then(function() {

‎src/css/Combinator.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var Parser = require("./Parser");
1616
* @param {int} line The line of text on which the unit resides.
1717
* @param {int} col The column of text on which the unit resides.
1818
*/
19-
function Combinator(text, line, col){
19+
function Combinator(text, line, col) {
2020

2121
SyntaxUnit.call(this, text, line, col, Parser.COMBINATOR_TYPE);
2222

@@ -28,13 +28,13 @@ function Combinator(text, line, col){
2828
this.type = "unknown";
2929

3030
//pretty simple
31-
if (/^\s+$/.test(text)){
31+
if (/^\s+$/.test(text)) {
3232
this.type = "descendant";
33-
} else if (text === ">"){
33+
} else if (text === ">") {
3434
this.type = "child";
35-
} else if (text === "+"){
35+
} else if (text === "+") {
3636
this.type = "adjacent-sibling";
37-
} else if (text === "~"){
37+
} else if (text === "~") {
3838
this.type = "sibling";
3939
}
4040

‎src/css/Matcher.js

+41-15
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,9 @@ Matcher.fromType = function(type) {
147147
*/
148148
Matcher.seq = function() {
149149
var ms = Array.prototype.slice.call(arguments).map(Matcher.cast);
150-
if (ms.length === 1) { return ms[0]; }
150+
if (ms.length === 1) {
151+
return ms[0];
152+
}
151153
return new Matcher(function(expression) {
152154
var i, result = true;
153155
for (i = 0; result && i < ms.length; i++) {
@@ -156,8 +158,12 @@ Matcher.seq = function() {
156158
return result;
157159
}, function(prec) {
158160
var p = Matcher.prec.SEQ;
159-
var s = ms.map(function(m) { return m.toString(p); }).join(" ");
160-
if (prec > p) { s = "[ " + s + " ]"; }
161+
var s = ms.map(function(m) {
162+
return m.toString(p);
163+
}).join(" ");
164+
if (prec > p) {
165+
s = "[ " + s + " ]";
166+
}
161167
return s;
162168
});
163169
};
@@ -168,7 +174,9 @@ Matcher.seq = function() {
168174
*/
169175
Matcher.alt = function() {
170176
var ms = Array.prototype.slice.call(arguments).map(Matcher.cast);
171-
if (ms.length === 1) { return ms[0]; }
177+
if (ms.length === 1) {
178+
return ms[0];
179+
}
172180
return new Matcher(function(expression) {
173181
var i, result = false;
174182
for (i = 0; !result && i < ms.length; i++) {
@@ -177,8 +185,12 @@ Matcher.alt = function() {
177185
return result;
178186
}, function(prec) {
179187
var p = Matcher.prec.ALT;
180-
var s = ms.map(function(m) { return m.toString(p); }).join(" | ");
181-
if (prec > p) { s = "[ " + s + " ]"; }
188+
var s = ms.map(function(m) {
189+
return m.toString(p);
190+
}).join(" | ");
191+
if (prec > p) {
192+
s = "[ " + s + " ]";
193+
}
182194
return s;
183195
});
184196
};
@@ -202,7 +214,13 @@ Matcher.many = function(required) {
202214
}
203215
return acc;
204216
}, []);
205-
if (required === true) { required = ms.map(function() { return true; }); }
217+
218+
if (required === true) {
219+
required = ms.map(function() {
220+
return true;
221+
});
222+
}
223+
206224
var result = new Matcher(function(expression) {
207225
var seen = [], max = 0, pass = 0;
208226
var success = function(matchCount) {
@@ -215,7 +233,9 @@ Matcher.many = function(required) {
215233
};
216234
var tryMatch = function(matchCount) {
217235
for (var i = 0; i < ms.length; i++) {
218-
if (seen[i]) { continue; }
236+
if (seen[i]) {
237+
continue;
238+
}
219239
expression.mark();
220240
if (ms[i].match(expression)) {
221241
seen[i] = true;
@@ -243,7 +263,7 @@ Matcher.many = function(required) {
243263
}
244264

245265
if (required === false) {
246-
return (max > 0);
266+
return max > 0;
247267
}
248268
// Use finer-grained specification of which matchers are required.
249269
for (var i = 0; i < ms.length; i++) {
@@ -253,14 +273,16 @@ Matcher.many = function(required) {
253273
}
254274
return true;
255275
}, function(prec) {
256-
var p = (required === false) ? Matcher.prec.OROR : Matcher.prec.ANDAND;
276+
var p = required === false ? Matcher.prec.OROR : Matcher.prec.ANDAND;
257277
var s = ms.map(function(m, i) {
258278
if (required !== false && !required[i]) {
259279
return m.toString(Matcher.prec.MOD) + "?";
260280
}
261281
return m.toString(p);
262282
}).join(required === false ? " || " : " && ");
263-
if (prec > p) { s = "[ " + s + " ]"; }
283+
if (prec > p) {
284+
s = "[ " + s + " ]";
285+
}
264286
return s;
265287
});
266288
result.options = ms;
@@ -292,7 +314,7 @@ Matcher.oror = function() {
292314
Matcher.prototype = {
293315
constructor: Matcher,
294316
// These are expected to be overridden in every instance.
295-
match: function(expression) { throw new Error("unimplemented"); },
317+
match: function() { throw new Error("unimplemented"); },
296318
toString: function() { throw new Error("unimplemented"); },
297319
// This returns a standalone function to do the matching.
298320
func: function() { return this.match.bind(this); },
@@ -321,9 +343,13 @@ Matcher.prototype = {
321343
} else {
322344
result = m1.match(expression);
323345
}
324-
if (!result) { break; }
346+
if (!result) {
347+
break;
348+
}
325349
}
326-
return (i >= min);
327-
}, function() { return m1.toString(Matcher.prec.MOD) + marker; });
350+
return i >= min;
351+
}, function() {
352+
return m1.toString(Matcher.prec.MOD) + marker;
353+
});
328354
}
329355
};

‎src/css/MediaFeature.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var Parser = require("./Parser");
1515
* @param {SyntaxUnit} name The name of the feature.
1616
* @param {SyntaxUnit} value The value of the feature or null if none.
1717
*/
18-
function MediaFeature(name, value){
18+
function MediaFeature(name, value) {
1919

2020
SyntaxUnit.call(this, "(" + name + (value !== null ? ":" + value : "") + ")", name.startLine, name.startCol, Parser.MEDIA_FEATURE_TYPE);
2121

‎src/css/MediaQuery.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ var Parser = require("./Parser");
1818
* @param {int} line The line of text on which the unit resides.
1919
* @param {int} col The column of text on which the unit resides.
2020
*/
21-
function MediaQuery(modifier, mediaType, features, line, col){
21+
function MediaQuery(modifier, mediaType, features, line, col) {
2222

2323
SyntaxUnit.call(this, (modifier ? modifier + " ": "") + (mediaType ? mediaType : "") + (mediaType && features.length > 0 ? " and " : "") + features.join(" and "), line, col, Parser.MEDIA_QUERY_TYPE);
2424

0 commit comments

Comments
 (0)