Skip to content

Commit df82def

Browse files
mvorisekmvorisek
authored
feat(lint): nested ternary formatting and remove unneeded parentheses
Modernize code using eslint advisory introduced in GH-2596. This PR updates ternary operator formatting for better readability and and removes unneeded parentheses around expressions.
1 parent 27384cb commit df82def

35 files changed

+811
-760
lines changed

‎.eslintrc.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ module.exports = {
4747
VariableDeclarator: true,
4848
},
4949
}],
50+
'no-extra-parens': 'off', /* TODO https://github.com/eslint/eslint/issues/16626#issuecomment-1341016901 ['error', 'all', {
51+
nestedBinaryExpressions: false,
52+
enforceForNewInMemberExpressions: false,
53+
}], */
5054
'no-nested-ternary': 'off',
5155
'no-param-reassign': 'off',
5256
'no-plusplus': 'off',
@@ -116,7 +120,6 @@ module.exports = {
116120
'no-shadow': 'off', // about 220 errors to be fixed manually
117121
'prefer-arrow-callback': 'off', // about 350 errors (all autofixable)
118122
'prefer-rest-params': 'off', // about 180 errors to be fixed manually
119-
'unicorn/no-nested-ternary': 'off', // about 80 errors (except 14 nested ternary operators autofixable)
120123

121124
// TODO
122125
'no-return-assign': 'off',

‎scripts/nightly-version.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ const getPublishedVersion = async function () {
4444
.then((p) => {
4545
let nightly = p['dist-tags'].nightly ?? '';
4646
let versionInfo = p.versions[nightly] ?? {};
47-
let buildCommit = nightly.indexOf('+') === -1 && versionInfo.gitHead ? '+' + (versionInfo.gitHead ?? '').slice(0, 7) : '';
47+
let buildCommit = nightly.indexOf('+') === -1 && versionInfo.gitHead
48+
? '+' + (versionInfo.gitHead ?? '').slice(0, 7)
49+
: '';
4850

4951
return nightly + buildCommit;
5052
})

‎src/definitions/behaviors/api.js

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
return typeof obj === 'function' && typeof obj.nodeType !== 'number';
2020
}
2121

22-
window = (window !== undefined && window.Math === Math)
22+
window = window !== undefined && window.Math === Math
2323
? window
2424
: globalThis;
2525

@@ -34,15 +34,15 @@
3434
performance = [],
3535

3636
query = arguments[0],
37-
methodInvoked = (typeof query === 'string'),
37+
methodInvoked = typeof query === 'string',
3838
queryArguments = [].slice.call(arguments, 1),
3939

4040
returnedValue
4141
;
4242

4343
$allModules.each(function () {
4444
var
45-
settings = ($.isPlainObject(parameters))
45+
settings = $.isPlainObject(parameters)
4646
? $.extend(true, {}, $.fn.api.settings, parameters)
4747
: $.extend({}, $.fn.api.settings),
4848

@@ -62,7 +62,7 @@
6262
$form = $module.closest(selector.form),
6363

6464
// context used for state
65-
$context = (settings.stateContext)
65+
$context = settings.stateContext
6666
? ([window, document].indexOf(settings.stateContext) < 0 ? $(document).find(settings.stateContext) : $(settings.stateContext))
6767
: $module,
6868

@@ -274,13 +274,13 @@
274274

275275
should: {
276276
removeError: function () {
277-
return (settings.hideError === true || (settings.hideError === 'auto' && !module.is.form()));
277+
return settings.hideError === true || (settings.hideError === 'auto' && !module.is.form());
278278
},
279279
},
280280

281281
is: {
282282
disabled: function () {
283-
return ($module.filter(selector.disabled).length > 0);
283+
return $module.filter(selector.disabled).length > 0;
284284
},
285285
expectingJSON: function () {
286286
return settings.dataType === 'json' || settings.dataType === 'jsonp';
@@ -289,14 +289,14 @@
289289
return $module.is('form') || $context.is('form');
290290
},
291291
mocked: function () {
292-
return (settings.mockResponse || settings.mockResponseAsync || settings.response || settings.responseAsync);
292+
return settings.mockResponse || settings.mockResponseAsync || settings.response || settings.responseAsync;
293293
},
294294
input: function () {
295295
return $module.is('input');
296296
},
297297
loading: function () {
298-
return (module.request)
299-
? (module.request.state() == 'pending')
298+
return module.request
299+
? module.request.state() == 'pending'
300300
: false;
301301
},
302302
abortedRequest: function (xhr) {
@@ -311,7 +311,7 @@
311311
return false;
312312
},
313313
validResponse: function (response) {
314-
if ((!module.is.expectingJSON()) || !isFunction(settings.successTest)) {
314+
if (!module.is.expectingJSON() || !isFunction(settings.successTest)) {
315315
module.verbose('Response is not JSON, skipping validation', settings.successTest, response);
316316

317317
return true;
@@ -331,16 +331,16 @@
331331

332332
was: {
333333
cancelled: function () {
334-
return (module.cancelled || false);
334+
return module.cancelled || false;
335335
},
336336
successful: function () {
337-
return (module.request && module.request.state() == 'resolved');
337+
return module.request && module.request.state() == 'resolved';
338338
},
339339
failure: function () {
340-
return (module.request && module.request.state() == 'rejected');
340+
return module.request && module.request.state() == 'rejected';
341341
},
342342
complete: function () {
343-
return (module.request && (module.request.state() == 'resolved' || module.request.state() == 'rejected'));
343+
return module.request && (module.request.state() == 'resolved' || module.request.state() == 'rejected');
344344
},
345345
},
346346

@@ -359,16 +359,16 @@
359359
$.each(requiredVariables, function (index, templatedString) {
360360
var
361361
// allow legacy {$var} style
362-
variable = (templatedString.indexOf('$') !== -1)
362+
variable = templatedString.indexOf('$') !== -1
363363
? templatedString.slice(2, -1)
364364
: templatedString.slice(1, -1),
365365
value = ($.isPlainObject(urlData) && urlData[variable] !== undefined)
366366
? urlData[variable]
367-
: ($module.data(variable) !== undefined)
367+
: (($module.data(variable) !== undefined)
368368
? $module.data(variable)
369-
: ($context.data(variable) !== undefined)
369+
: (($context.data(variable) !== undefined) // eslint-disable-line unicorn/no-nested-ternary
370370
? $context.data(variable)
371-
: urlData[variable]
371+
: urlData[variable]))
372372
;
373373
// remove value
374374
if (value === undefined) {
@@ -379,7 +379,7 @@
379379
}
380380

381381
module.verbose('Found required variable', variable, value);
382-
value = (settings.encodeParameters)
382+
value = settings.encodeParameters
383383
? module.get.urlEncodedValue(value)
384384
: value;
385385
url = url.replace(templatedString, value);
@@ -390,16 +390,16 @@
390390
$.each(optionalVariables, function (index, templatedString) {
391391
var
392392
// allow legacy {/$var} style
393-
variable = (templatedString.indexOf('$') !== -1)
393+
variable = templatedString.indexOf('$') !== -1
394394
? templatedString.slice(3, -1)
395395
: templatedString.slice(2, -1),
396396
value = ($.isPlainObject(urlData) && urlData[variable] !== undefined)
397397
? urlData[variable]
398-
: ($module.data(variable) !== undefined)
398+
: (($module.data(variable) !== undefined)
399399
? $module.data(variable)
400-
: ($context.data(variable) !== undefined)
400+
: (($context.data(variable) !== undefined) // eslint-disable-line unicorn/no-nested-ternary
401401
? $context.data(variable)
402-
: urlData[variable]
402+
: urlData[variable]))
403403
;
404404
// optional replacement
405405
if (value !== undefined) {
@@ -536,15 +536,15 @@
536536
done: function (response, textStatus, xhr) {
537537
var
538538
context = this,
539-
elapsedTime = (Date.now() - requestStartTime),
540-
timeLeft = (settings.loadingDuration - elapsedTime),
541-
translatedResponse = (isFunction(settings.onResponse))
542-
? module.is.expectingJSON() && !settings.rawResponse
539+
elapsedTime = Date.now() - requestStartTime,
540+
timeLeft = settings.loadingDuration - elapsedTime,
541+
translatedResponse = isFunction(settings.onResponse)
542+
? (module.is.expectingJSON() && !settings.rawResponse
543543
? settings.onResponse.call(context, $.extend(true, {}, response))
544-
: settings.onResponse.call(context, response)
544+
: settings.onResponse.call(context, response))
545545
: false
546546
;
547-
timeLeft = (timeLeft > 0)
547+
timeLeft = timeLeft > 0
548548
? timeLeft
549549
: 0;
550550
if (translatedResponse) {
@@ -565,10 +565,10 @@
565565
fail: function (xhr, status, httpMessage) {
566566
var
567567
context = this,
568-
elapsedTime = (Date.now() - requestStartTime),
569-
timeLeft = (settings.loadingDuration - elapsedTime)
568+
elapsedTime = Date.now() - requestStartTime,
569+
timeLeft = settings.loadingDuration - elapsedTime
570570
;
571-
timeLeft = (timeLeft > 0)
571+
timeLeft = timeLeft > 0
572572
? timeLeft
573573
: 0;
574574
if (timeLeft > 0) {
@@ -748,17 +748,17 @@
748748
},
749749
responseFromXHR: function (xhr) {
750750
return $.isPlainObject(xhr)
751-
? (module.is.expectingJSON())
751+
? ((module.is.expectingJSON())
752752
? module.decode.json(xhr.responseText)
753-
: xhr.responseText
753+
: xhr.responseText)
754754
: false;
755755
},
756756
errorFromRequest: function (response, status, httpMessage) {
757757
return ($.isPlainObject(response) && response.error !== undefined)
758758
? response.error // use json error message
759-
: (settings.error[status] !== undefined) // use server error message
759+
: ((settings.error[status] !== undefined) // use server error message
760760
? settings.error[status]
761-
: httpMessage;
761+
: httpMessage);
762762
},
763763
request: function () {
764764
return module.request || false;
@@ -795,15 +795,15 @@
795795
return runSettings;
796796
}
797797

798-
return (runSettings !== undefined)
798+
return runSettings !== undefined
799799
? $.extend(true, {}, runSettings)
800800
: $.extend(true, {}, settings);
801801
},
802802
urlEncodedValue: function (value) {
803803
var
804804
decodedValue = window.decodeURIComponent(value),
805805
encodedValue = window.encodeURIComponent(value),
806-
alreadyEncoded = (decodedValue !== value)
806+
alreadyEncoded = decodedValue !== value
807807
;
808808
if (alreadyEncoded) {
809809
module.debug('URL value is already encoded, avoiding double encoding', value);
@@ -838,9 +838,9 @@
838838
if ($module.is('input')) {
839839
return (element.oninput !== undefined)
840840
? 'input'
841-
: (element.onpropertychange !== undefined)
841+
: ((element.onpropertychange !== undefined)
842842
? 'propertychange'
843-
: 'keyup';
843+
: 'keyup');
844844
}
845845
if ($module.is('form')) {
846846
return 'submit';
@@ -1004,7 +1004,7 @@
10041004
query = query.split(/[ .]/);
10051005
maxDepth = query.length - 1;
10061006
$.each(query, function (depth, value) {
1007-
var camelCaseValue = (depth != maxDepth)
1007+
var camelCaseValue = depth != maxDepth
10081008
? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1)
10091009
: query
10101010
;
@@ -1057,7 +1057,7 @@
10571057
}
10581058
});
10591059

1060-
return (returnedValue !== undefined)
1060+
return returnedValue !== undefined
10611061
? returnedValue
10621062
: this;
10631063
};

0 commit comments

Comments
 (0)