Skip to content

Commit 55152fd

Browse files
committed
remove es6 default argument
1 parent e161977 commit 55152fd

File tree

1 file changed

+18
-6
lines changed

1 file changed

+18
-6
lines changed

lib/rules/jsx-no-literals.js

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,20 @@ const getText = require('../util/eslint').getText;
2121
// Rule Definition
2222
// ------------------------------------------------------------------------------
2323

24-
function trimIfString(val) {
25-
return typeof val === 'string' ? val.trim() : val;
24+
/**
25+
* @param {unknown} value
26+
* @returns {string | unknown}
27+
*/
28+
function trimIfString(value) {
29+
return typeof value === 'string' ? value.trim() : value;
30+
}
31+
32+
/**
33+
* @param {boolean | undefined} value
34+
* @returns {boolean}
35+
*/
36+
function valueOrTrue(value) {
37+
return value !== undefined ? value : true;
2638
}
2739

2840
const overridableElementPattern = '^[A-Z][\\w.]*$';
@@ -73,7 +85,7 @@ const commonPropertiesSchema = {
7385
*
7486
* @typedef RawOverrideOnlyConfig
7587
* @property {boolean} [allowElement]
76-
* @property {boolean} [applyToNestedElements]
88+
* @property {boolean} [applyToNestedElements=true]
7789
*
7890
* @typedef {RawElementConfig & RawOverrideOnlyConfig} RawOverrideConfig
7991
*
@@ -112,7 +124,7 @@ const commonPropertiesSchema = {
112124
* @param {boolean} [handleElementOverrides=true]
113125
* @returns {Config}
114126
*/
115-
function normalizeConfig(config, handleElementOverrides = true) {
127+
function normalizeConfig(config, handleElementOverrides) {
116128
/** @type {Config} */
117129
const normalizedConfig = {
118130
type: 'element',
@@ -125,7 +137,7 @@ function normalizeConfig(config, handleElementOverrides = true) {
125137
elementOverrides: {},
126138
};
127139

128-
if (handleElementOverrides) {
140+
if (valueOrTrue(handleElementOverrides)) {
129141
if (config.elementOverrides) {
130142
normalizedConfig.elementOverrides = fromEntries(
131143
reduce(
@@ -138,7 +150,7 @@ function normalizeConfig(config, handleElementOverrides = true) {
138150
type: 'override',
139151
name: key,
140152
allowElement: value.allowElement || false,
141-
applyToNestedElements: value.applyToNestedElements !== undefined ? value.applyToNestedElements : true,
153+
applyToNestedElements: valueOrTrue(value.applyToNestedElements),
142154
}),
143155
]);
144156

0 commit comments

Comments
 (0)