eslint 9.22.0 → 9.24.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +48 -46
- package/bin/eslint.js +92 -90
- package/conf/default-cli-options.js +22 -22
- package/conf/ecma-version.js +1 -1
- package/conf/globals.js +97 -98
- package/conf/replacements.json +24 -20
- package/conf/rule-type-list.json +88 -92
- package/lib/api.js +12 -12
- package/lib/cli-engine/cli-engine.js +830 -810
- package/lib/cli-engine/file-enumerator.js +381 -387
- package/lib/cli-engine/formatters/formatters-meta.json +16 -16
- package/lib/cli-engine/formatters/html.js +107 -99
- package/lib/cli-engine/formatters/json-with-metadata.js +5 -5
- package/lib/cli-engine/formatters/json.js +2 -2
- package/lib/cli-engine/formatters/stylish.js +96 -75
- package/lib/cli-engine/hash.js +1 -1
- package/lib/cli-engine/index.js +1 -1
- package/lib/cli-engine/lint-result-cache.js +144 -145
- package/lib/cli-engine/load-rules.js +16 -16
- package/lib/cli.js +638 -457
- package/lib/config/config-loader.js +726 -622
- package/lib/config/config.js +247 -221
- package/lib/config/default-config.js +54 -45
- package/lib/config/flat-config-array.js +167 -172
- package/lib/config/flat-config-helpers.js +72 -72
- package/lib/config/flat-config-schema.js +375 -368
- package/lib/config/rule-validator.js +139 -144
- package/lib/config-api.js +2 -2
- package/lib/eslint/eslint-helpers.js +756 -681
- package/lib/eslint/eslint.js +934 -912
- package/lib/eslint/index.js +2 -2
- package/lib/eslint/legacy-eslint.js +577 -533
- package/lib/languages/js/index.js +263 -264
- package/lib/languages/js/source-code/index.js +1 -1
- package/lib/languages/js/source-code/source-code.js +1128 -1057
- package/lib/languages/js/source-code/token-store/backward-token-comment-cursor.js +39 -35
- package/lib/languages/js/source-code/token-store/backward-token-cursor.js +35 -36
- package/lib/languages/js/source-code/token-store/cursor.js +36 -36
- package/lib/languages/js/source-code/token-store/cursors.js +80 -52
- package/lib/languages/js/source-code/token-store/decorative-cursor.js +17 -18
- package/lib/languages/js/source-code/token-store/filter-cursor.js +19 -20
- package/lib/languages/js/source-code/token-store/forward-token-comment-cursor.js +40 -32
- package/lib/languages/js/source-code/token-store/forward-token-cursor.js +40 -41
- package/lib/languages/js/source-code/token-store/index.js +592 -498
- package/lib/languages/js/source-code/token-store/limit-cursor.js +17 -18
- package/lib/languages/js/source-code/token-store/padded-token-cursor.js +23 -16
- package/lib/languages/js/source-code/token-store/skip-cursor.js +19 -20
- package/lib/languages/js/source-code/token-store/utils.js +63 -60
- package/lib/languages/js/validate-language-options.js +104 -89
- package/lib/linter/apply-disable-directives.js +467 -383
- package/lib/linter/code-path-analysis/code-path-analyzer.js +650 -672
- package/lib/linter/code-path-analysis/code-path-segment.js +215 -216
- package/lib/linter/code-path-analysis/code-path-state.js +2118 -2096
- package/lib/linter/code-path-analysis/code-path.js +307 -319
- package/lib/linter/code-path-analysis/debug-helpers.js +183 -163
- package/lib/linter/code-path-analysis/fork-context.js +296 -271
- package/lib/linter/code-path-analysis/id-generator.js +22 -23
- package/lib/linter/file-context.js +119 -120
- package/lib/linter/index.js +3 -3
- package/lib/linter/interpolate.js +16 -16
- package/lib/linter/linter.js +2403 -2045
- package/lib/linter/node-event-generator.js +284 -225
- package/lib/linter/report-translator.js +256 -219
- package/lib/linter/rule-fixer.js +122 -124
- package/lib/linter/rules.js +36 -36
- package/lib/linter/safe-emitter.js +18 -18
- package/lib/linter/source-code-fixer.js +94 -92
- package/lib/linter/timing.js +104 -101
- package/lib/linter/vfile.js +70 -73
- package/lib/options.js +404 -361
- package/lib/rule-tester/index.js +1 -1
- package/lib/rule-tester/rule-tester.js +1308 -1046
- package/lib/rules/accessor-pairs.js +298 -263
- package/lib/rules/array-bracket-newline.js +250 -238
- package/lib/rules/array-bracket-spacing.js +263 -224
- package/lib/rules/array-callback-return.js +402 -356
- package/lib/rules/array-element-newline.js +358 -313
- package/lib/rules/arrow-body-style.js +400 -281
- package/lib/rules/arrow-parens.js +206 -173
- package/lib/rules/arrow-spacing.js +169 -163
- package/lib/rules/block-scoped-var.js +125 -123
- package/lib/rules/block-spacing.js +186 -176
- package/lib/rules/brace-style.js +262 -199
- package/lib/rules/callback-return.js +203 -190
- package/lib/rules/camelcase.js +403 -392
- package/lib/rules/capitalized-comments.js +253 -232
- package/lib/rules/class-methods-use-this.js +224 -172
- package/lib/rules/comma-dangle.js +379 -346
- package/lib/rules/comma-spacing.js +193 -195
- package/lib/rules/comma-style.js +375 -316
- package/lib/rules/complexity.js +173 -169
- package/lib/rules/computed-property-spacing.js +236 -211
- package/lib/rules/consistent-return.js +181 -170
- package/lib/rules/consistent-this.js +167 -147
- package/lib/rules/constructor-super.js +412 -404
- package/lib/rules/curly.js +407 -332
- package/lib/rules/default-case-last.js +38 -31
- package/lib/rules/default-case.js +89 -85
- package/lib/rules/default-param-last.js +69 -54
- package/lib/rules/dot-location.js +122 -110
- package/lib/rules/dot-notation.js +192 -156
- package/lib/rules/eol-last.js +122 -120
- package/lib/rules/eqeqeq.js +168 -155
- package/lib/rules/for-direction.js +146 -121
- package/lib/rules/func-call-spacing.js +261 -231
- package/lib/rules/func-name-matching.js +293 -209
- package/lib/rules/func-names.js +165 -164
- package/lib/rules/func-style.js +159 -127
- package/lib/rules/function-call-argument-newline.js +152 -129
- package/lib/rules/function-paren-newline.js +349 -291
- package/lib/rules/generator-star-spacing.js +229 -210
- package/lib/rules/getter-return.js +208 -172
- package/lib/rules/global-require.js +85 -74
- package/lib/rules/grouped-accessor-pairs.js +170 -150
- package/lib/rules/guard-for-in.js +72 -63
- package/lib/rules/handle-callback-err.js +108 -103
- package/lib/rules/id-blacklist.js +182 -199
- package/lib/rules/id-denylist.js +168 -187
- package/lib/rules/id-length.js +197 -171
- package/lib/rules/id-match.js +344 -289
- package/lib/rules/implicit-arrow-linebreak.js +102 -79
- package/lib/rules/indent-legacy.js +1344 -1118
- package/lib/rules/indent.js +2272 -1759
- package/lib/rules/index.js +317 -292
- package/lib/rules/init-declarations.js +137 -107
- package/lib/rules/jsx-quotes.js +94 -82
- package/lib/rules/key-spacing.js +750 -633
- package/lib/rules/keyword-spacing.js +648 -605
- package/lib/rules/line-comment-position.js +142 -128
- package/lib/rules/linebreak-style.js +107 -106
- package/lib/rules/lines-around-comment.js +540 -448
- package/lib/rules/lines-around-directive.js +233 -203
- package/lib/rules/lines-between-class-members.js +305 -234
- package/lib/rules/logical-assignment-operators.js +582 -399
- package/lib/rules/max-classes-per-file.js +69 -68
- package/lib/rules/max-depth.js +146 -143
- package/lib/rules/max-len.js +473 -434
- package/lib/rules/max-lines-per-function.js +201 -176
- package/lib/rules/max-lines.js +158 -162
- package/lib/rules/max-nested-callbacks.js +102 -104
- package/lib/rules/max-params.js +78 -76
- package/lib/rules/max-statements-per-line.js +205 -198
- package/lib/rules/max-statements.js +168 -164
- package/lib/rules/multiline-comment-style.js +637 -479
- package/lib/rules/multiline-ternary.js +241 -176
- package/lib/rules/new-cap.js +233 -213
- package/lib/rules/new-parens.js +88 -79
- package/lib/rules/newline-after-var.js +287 -250
- package/lib/rules/newline-before-return.js +229 -222
- package/lib/rules/newline-per-chained-call.js +142 -127
- package/lib/rules/no-alert.js +90 -79
- package/lib/rules/no-array-constructor.js +125 -113
- package/lib/rules/no-async-promise-executor.js +30 -24
- package/lib/rules/no-await-in-loop.js +69 -71
- package/lib/rules/no-bitwise.js +124 -100
- package/lib/rules/no-buffer-constructor.js +55 -47
- package/lib/rules/no-caller.js +39 -33
- package/lib/rules/no-case-declarations.js +61 -57
- package/lib/rules/no-catch-shadow.js +76 -73
- package/lib/rules/no-class-assign.js +51 -48
- package/lib/rules/no-compare-neg-zero.js +62 -48
- package/lib/rules/no-cond-assign.js +148 -132
- package/lib/rules/no-confusing-arrow.js +98 -81
- package/lib/rules/no-console.js +202 -199
- package/lib/rules/no-const-assign.js +47 -41
- package/lib/rules/no-constant-binary-expression.js +500 -405
- package/lib/rules/no-constant-condition.js +158 -143
- package/lib/rules/no-constructor-return.js +49 -49
- package/lib/rules/no-continue.js +25 -27
- package/lib/rules/no-control-regex.js +125 -121
- package/lib/rules/no-debugger.js +28 -30
- package/lib/rules/no-delete-var.js +29 -29
- package/lib/rules/no-div-regex.js +47 -41
- package/lib/rules/no-dupe-args.js +68 -69
- package/lib/rules/no-dupe-class-members.js +102 -89
- package/lib/rules/no-dupe-else-if.js +100 -77
- package/lib/rules/no-dupe-keys.js +133 -110
- package/lib/rules/no-duplicate-case.js +50 -43
- package/lib/rules/no-duplicate-imports.js +179 -176
- package/lib/rules/no-else-return.js +430 -385
- package/lib/rules/no-empty-character-class.js +57 -50
- package/lib/rules/no-empty-function.js +127 -128
- package/lib/rules/no-empty-pattern.js +63 -58
- package/lib/rules/no-empty-static-block.js +37 -35
- package/lib/rules/no-empty.js +98 -86
- package/lib/rules/no-eq-null.js +37 -32
- package/lib/rules/no-eval.js +256 -250
- package/lib/rules/no-ex-assign.js +42 -39
- package/lib/rules/no-extend-native.js +161 -159
- package/lib/rules/no-extra-bind.js +201 -190
- package/lib/rules/no-extra-boolean-cast.js +398 -348
- package/lib/rules/no-extra-label.js +150 -131
- package/lib/rules/no-extra-parens.js +1654 -1325
- package/lib/rules/no-extra-semi.js +146 -144
- package/lib/rules/no-fallthrough.js +199 -157
- package/lib/rules/no-floating-decimal.js +74 -66
- package/lib/rules/no-func-assign.js +54 -55
- package/lib/rules/no-global-assign.js +78 -73
- package/lib/rules/no-implicit-coercion.js +349 -293
- package/lib/rules/no-implicit-globals.js +158 -135
- package/lib/rules/no-implied-eval.js +140 -112
- package/lib/rules/no-import-assign.js +145 -159
- package/lib/rules/no-inline-comments.js +101 -95
- package/lib/rules/no-inner-declarations.js +115 -101
- package/lib/rules/no-invalid-regexp.js +222 -190
- package/lib/rules/no-invalid-this.js +123 -117
- package/lib/rules/no-irregular-whitespace.js +266 -252
- package/lib/rules/no-iterator.js +29 -33
- package/lib/rules/no-label-var.js +59 -62
- package/lib/rules/no-labels.js +138 -133
- package/lib/rules/no-lone-blocks.js +127 -123
- package/lib/rules/no-lonely-if.js +108 -77
- package/lib/rules/no-loop-func.js +238 -213
- package/lib/rules/no-loss-of-precision.js +218 -201
- package/lib/rules/no-magic-numbers.js +246 -218
- package/lib/rules/no-misleading-character-class.js +499 -446
- package/lib/rules/no-mixed-operators.js +188 -182
- package/lib/rules/no-mixed-requires.js +253 -240
- package/lib/rules/no-mixed-spaces-and-tabs.js +134 -121
- package/lib/rules/no-multi-assign.js +46 -44
- package/lib/rules/no-multi-spaces.js +163 -143
- package/lib/rules/no-multi-str.js +42 -41
- package/lib/rules/no-multiple-empty-lines.js +196 -158
- package/lib/rules/no-native-reassign.js +90 -85
- package/lib/rules/no-negated-condition.js +79 -75
- package/lib/rules/no-negated-in-lhs.js +45 -43
- package/lib/rules/no-nested-ternary.js +33 -32
- package/lib/rules/no-new-func.js +71 -62
- package/lib/rules/no-new-native-nonconstructor.js +43 -39
- package/lib/rules/no-new-object.js +48 -48
- package/lib/rules/no-new-require.js +48 -47
- package/lib/rules/no-new-symbol.js +52 -50
- package/lib/rules/no-new-wrappers.js +43 -41
- package/lib/rules/no-new.js +28 -29
- package/lib/rules/no-nonoctal-decimal-escape.js +141 -121
- package/lib/rules/no-obj-calls.js +66 -53
- package/lib/rules/no-object-constructor.js +104 -97
- package/lib/rules/no-octal-escape.js +40 -43
- package/lib/rules/no-octal.js +32 -32
- package/lib/rules/no-param-reassign.js +235 -217
- package/lib/rules/no-path-concat.js +66 -67
- package/lib/rules/no-plusplus.js +60 -61
- package/lib/rules/no-process-env.js +49 -48
- package/lib/rules/no-process-exit.js +54 -50
- package/lib/rules/no-promise-executor-return.js +214 -182
- package/lib/rules/no-proto.js +26 -29
- package/lib/rules/no-prototype-builtins.js +146 -124
- package/lib/rules/no-redeclare.js +154 -152
- package/lib/rules/no-regex-spaces.js +183 -161
- package/lib/rules/no-restricted-exports.js +208 -185
- package/lib/rules/no-restricted-globals.js +111 -112
- package/lib/rules/no-restricted-imports.js +657 -537
- package/lib/rules/no-restricted-modules.js +222 -202
- package/lib/rules/no-restricted-properties.js +181 -153
- package/lib/rules/no-restricted-syntax.js +56 -52
- package/lib/rules/no-return-assign.js +55 -50
- package/lib/rules/no-return-await.js +148 -124
- package/lib/rules/no-script-url.js +52 -45
- package/lib/rules/no-self-assign.js +148 -146
- package/lib/rules/no-self-compare.js +63 -46
- package/lib/rules/no-sequences.js +135 -116
- package/lib/rules/no-setter-return.js +185 -152
- package/lib/rules/no-shadow-restricted-names.js +61 -46
- package/lib/rules/no-shadow.js +342 -316
- package/lib/rules/no-spaced-func.js +82 -77
- package/lib/rules/no-sparse-arrays.js +54 -59
- package/lib/rules/no-sync.js +61 -60
- package/lib/rules/no-tabs.js +83 -72
- package/lib/rules/no-template-curly-in-string.js +33 -32
- package/lib/rules/no-ternary.js +25 -29
- package/lib/rules/no-this-before-super.js +321 -319
- package/lib/rules/no-throw-literal.js +31 -36
- package/lib/rules/no-trailing-spaces.js +199 -191
- package/lib/rules/no-undef-init.js +76 -61
- package/lib/rules/no-undef.js +51 -48
- package/lib/rules/no-undefined.js +73 -75
- package/lib/rules/no-underscore-dangle.js +370 -327
- package/lib/rules/no-unexpected-multiline.js +112 -102
- package/lib/rules/no-unmodified-loop-condition.js +254 -254
- package/lib/rules/no-unneeded-ternary.js +212 -147
- package/lib/rules/no-unreachable-loop.js +145 -142
- package/lib/rules/no-unreachable.js +255 -248
- package/lib/rules/no-unsafe-finally.js +93 -85
- package/lib/rules/no-unsafe-negation.js +105 -83
- package/lib/rules/no-unsafe-optional-chaining.js +192 -178
- package/lib/rules/no-unused-expressions.js +178 -162
- package/lib/rules/no-unused-labels.js +139 -124
- package/lib/rules/no-unused-private-class-members.js +206 -182
- package/lib/rules/no-unused-vars.js +1669 -1449
- package/lib/rules/no-use-before-define.js +229 -231
- package/lib/rules/no-useless-assignment.js +590 -511
- package/lib/rules/no-useless-backreference.js +212 -193
- package/lib/rules/no-useless-call.js +58 -53
- package/lib/rules/no-useless-catch.js +40 -40
- package/lib/rules/no-useless-computed-key.js +144 -115
- package/lib/rules/no-useless-concat.js +65 -60
- package/lib/rules/no-useless-constructor.js +158 -111
- package/lib/rules/no-useless-escape.js +342 -291
- package/lib/rules/no-useless-rename.js +183 -156
- package/lib/rules/no-useless-return.js +344 -312
- package/lib/rules/no-var.js +233 -212
- package/lib/rules/no-void.js +50 -48
- package/lib/rules/no-warning-comments.js +191 -186
- package/lib/rules/no-whitespace-before-property.js +131 -115
- package/lib/rules/no-with.js +24 -26
- package/lib/rules/nonblock-statement-body-position.js +149 -130
- package/lib/rules/object-curly-newline.js +306 -265
- package/lib/rules/object-curly-spacing.js +360 -314
- package/lib/rules/object-property-newline.js +137 -106
- package/lib/rules/object-shorthand.js +607 -502
- package/lib/rules/one-var-declaration-per-line.js +104 -100
- package/lib/rules/one-var.js +653 -537
- package/lib/rules/operator-assignment.js +219 -161
- package/lib/rules/operator-linebreak.js +295 -251
- package/lib/rules/padded-blocks.js +346 -308
- package/lib/rules/padding-line-between-statements.js +443 -439
- package/lib/rules/prefer-arrow-callback.js +362 -313
- package/lib/rules/prefer-const.js +418 -377
- package/lib/rules/prefer-destructuring.js +301 -279
- package/lib/rules/prefer-exponentiation-operator.js +176 -133
- package/lib/rules/prefer-named-capture-group.js +153 -140
- package/lib/rules/prefer-numeric-literals.js +121 -113
- package/lib/rules/prefer-object-has-own.js +116 -82
- package/lib/rules/prefer-object-spread.js +213 -193
- package/lib/rules/prefer-promise-reject-errors.js +140 -122
- package/lib/rules/prefer-reflect.js +127 -107
- package/lib/rules/prefer-regex-literals.js +578 -466
- package/lib/rules/prefer-rest-params.js +79 -80
- package/lib/rules/prefer-spread.js +47 -44
- package/lib/rules/prefer-template.js +266 -195
- package/lib/rules/quote-props.js +373 -307
- package/lib/rules/quotes.js +374 -326
- package/lib/rules/radix.js +152 -136
- package/lib/rules/require-atomic-updates.js +316 -285
- package/lib/rules/require-await.js +144 -116
- package/lib/rules/require-unicode-regexp.js +282 -177
- package/lib/rules/require-yield.js +53 -54
- package/lib/rules/rest-spread-spacing.js +128 -116
- package/lib/rules/semi-spacing.js +281 -250
- package/lib/rules/semi-style.js +176 -134
- package/lib/rules/semi.js +456 -436
- package/lib/rules/sort-imports.js +306 -233
- package/lib/rules/sort-keys.js +219 -188
- package/lib/rules/sort-vars.js +127 -93
- package/lib/rules/space-before-blocks.js +199 -189
- package/lib/rules/space-before-function-paren.js +186 -166
- package/lib/rules/space-in-parens.js +359 -288
- package/lib/rules/space-infix-ops.js +237 -201
- package/lib/rules/space-unary-ops.js +356 -298
- package/lib/rules/spaced-comment.js +363 -319
- package/lib/rules/strict.js +265 -230
- package/lib/rules/switch-colon-spacing.js +130 -122
- package/lib/rules/symbol-description.js +45 -48
- package/lib/rules/template-curly-spacing.js +148 -142
- package/lib/rules/template-tag-spacing.js +98 -88
- package/lib/rules/unicode-bom.js +54 -56
- package/lib/rules/use-isnan.js +237 -206
- package/lib/rules/utils/ast-utils.js +2039 -1860
- package/lib/rules/utils/char-source.js +162 -155
- package/lib/rules/utils/fix-tracker.js +83 -80
- package/lib/rules/utils/keywords.js +59 -59
- package/lib/rules/utils/lazy-loading-rule-map.js +79 -76
- package/lib/rules/utils/regular-expressions.js +32 -24
- package/lib/rules/utils/unicode/index.js +4 -4
- package/lib/rules/utils/unicode/is-combining-character.js +1 -1
- package/lib/rules/utils/unicode/is-emoji-modifier.js +1 -1
- package/lib/rules/utils/unicode/is-regional-indicator-symbol.js +1 -1
- package/lib/rules/utils/unicode/is-surrogate-pair.js +1 -1
- package/lib/rules/valid-typeof.js +153 -111
- package/lib/rules/vars-on-top.js +152 -145
- package/lib/rules/wrap-iife.js +204 -191
- package/lib/rules/wrap-regex.js +70 -58
- package/lib/rules/yield-star-spacing.js +145 -134
- package/lib/rules/yoda.js +283 -272
- package/lib/services/parser-service.js +35 -35
- package/lib/services/processor-service.js +66 -73
- package/lib/services/suppressions-service.js +289 -0
- package/lib/shared/ajv.js +14 -14
- package/lib/shared/assert.js +3 -4
- package/lib/shared/ast-utils.js +7 -6
- package/lib/shared/deep-merge-arrays.js +24 -22
- package/lib/shared/directives.js +3 -2
- package/lib/shared/flags.js +50 -17
- package/lib/shared/logging.js +24 -25
- package/lib/shared/option-utils.js +43 -36
- package/lib/shared/runtime-info.js +136 -127
- package/lib/shared/serialization.js +27 -27
- package/lib/shared/severity.js +22 -22
- package/lib/shared/stats.js +5 -5
- package/lib/shared/string-utils.js +16 -16
- package/lib/shared/text-table.js +28 -27
- package/lib/shared/traverser.js +153 -146
- package/lib/shared/types.js +4 -27
- package/lib/types/index.d.ts +2010 -1559
- package/lib/types/rules.d.ts +5253 -5140
- package/lib/types/use-at-your-own-risk.d.ts +32 -30
- package/lib/unsupported-api.js +5 -5
- package/messages/all-files-ignored.js +3 -3
- package/messages/all-matched-files-ignored.js +3 -3
- package/messages/config-file-missing.js +2 -2
- package/messages/config-plugin-missing.js +3 -3
- package/messages/config-serialize-function.js +9 -7
- package/messages/eslintrc-incompat.js +13 -15
- package/messages/eslintrc-plugins.js +3 -4
- package/messages/extend-config-missing.js +3 -3
- package/messages/failed-to-read-json.js +3 -3
- package/messages/file-not-found.js +3 -3
- package/messages/invalid-rule-options.js +2 -2
- package/messages/invalid-rule-severity.js +2 -2
- package/messages/no-config-found.js +3 -3
- package/messages/plugin-conflict.js +8 -8
- package/messages/plugin-invalid.js +3 -3
- package/messages/plugin-missing.js +3 -3
- package/messages/print-config-with-directory-path.js +2 -2
- package/messages/shared.js +6 -1
- package/messages/whitespace-found.js +3 -3
- package/package.json +14 -20
package/lib/options.js
CHANGED
@@ -62,6 +62,10 @@ const optionator = require("optionator");
|
|
62
62
|
* the linting operation to short circuit and not report any failures.
|
63
63
|
* @property {string[]} _ Positional filenames or patterns
|
64
64
|
* @property {boolean} [stats] Report additional statistics
|
65
|
+
* @property {boolean} [suppressAll] Suppress all error violations
|
66
|
+
* @property {string[]} [suppressRule] Suppress specific rules
|
67
|
+
* @property {string} [suppressionsLocation] Path to the suppressions file or directory
|
68
|
+
* @property {boolean} [pruneSuppressions] Prune unused suppressions
|
65
69
|
*/
|
66
70
|
|
67
71
|
//------------------------------------------------------------------------------
|
@@ -75,387 +79,426 @@ const optionator = require("optionator");
|
|
75
79
|
* @param {boolean} usingFlatConfig Indicates if flat config is being used.
|
76
80
|
* @returns {Object} The optionator instance.
|
77
81
|
*/
|
78
|
-
module.exports = function(usingFlatConfig) {
|
82
|
+
module.exports = function (usingFlatConfig) {
|
83
|
+
let lookupFlag;
|
79
84
|
|
80
|
-
|
85
|
+
if (usingFlatConfig) {
|
86
|
+
lookupFlag = {
|
87
|
+
option: "config-lookup",
|
88
|
+
type: "Boolean",
|
89
|
+
default: "true",
|
90
|
+
description: "Disable look up for eslint.config.js",
|
91
|
+
};
|
92
|
+
} else {
|
93
|
+
lookupFlag = {
|
94
|
+
option: "eslintrc",
|
95
|
+
type: "Boolean",
|
96
|
+
default: "true",
|
97
|
+
description: "Disable use of configuration from .eslintrc.*",
|
98
|
+
};
|
99
|
+
}
|
81
100
|
|
82
|
-
|
83
|
-
lookupFlag = {
|
84
|
-
option: "config-lookup",
|
85
|
-
type: "Boolean",
|
86
|
-
default: "true",
|
87
|
-
description: "Disable look up for eslint.config.js"
|
88
|
-
};
|
89
|
-
} else {
|
90
|
-
lookupFlag = {
|
91
|
-
option: "eslintrc",
|
92
|
-
type: "Boolean",
|
93
|
-
default: "true",
|
94
|
-
description: "Disable use of configuration from .eslintrc.*"
|
95
|
-
};
|
96
|
-
}
|
101
|
+
let envFlag;
|
97
102
|
|
98
|
-
|
103
|
+
if (!usingFlatConfig) {
|
104
|
+
envFlag = {
|
105
|
+
option: "env",
|
106
|
+
type: "[String]",
|
107
|
+
description: "Specify environments",
|
108
|
+
};
|
109
|
+
}
|
99
110
|
|
100
|
-
|
101
|
-
envFlag = {
|
102
|
-
option: "env",
|
103
|
-
type: "[String]",
|
104
|
-
description: "Specify environments"
|
105
|
-
};
|
106
|
-
}
|
111
|
+
let inspectConfigFlag;
|
107
112
|
|
108
|
-
|
113
|
+
if (usingFlatConfig) {
|
114
|
+
inspectConfigFlag = {
|
115
|
+
option: "inspect-config",
|
116
|
+
type: "Boolean",
|
117
|
+
description:
|
118
|
+
"Open the config inspector with the current configuration",
|
119
|
+
};
|
120
|
+
}
|
109
121
|
|
110
|
-
|
111
|
-
inspectConfigFlag = {
|
112
|
-
option: "inspect-config",
|
113
|
-
type: "Boolean",
|
114
|
-
description: "Open the config inspector with the current configuration"
|
115
|
-
};
|
116
|
-
}
|
122
|
+
let extFlag;
|
117
123
|
|
118
|
-
|
124
|
+
if (!usingFlatConfig) {
|
125
|
+
extFlag = {
|
126
|
+
option: "ext",
|
127
|
+
type: "[String]",
|
128
|
+
description: "Specify JavaScript file extensions",
|
129
|
+
};
|
130
|
+
} else {
|
131
|
+
extFlag = {
|
132
|
+
option: "ext",
|
133
|
+
type: "[String]",
|
134
|
+
description: "Specify additional file extensions to lint",
|
135
|
+
};
|
136
|
+
}
|
119
137
|
|
120
|
-
|
121
|
-
extFlag = {
|
122
|
-
option: "ext",
|
123
|
-
type: "[String]",
|
124
|
-
description: "Specify JavaScript file extensions"
|
125
|
-
};
|
126
|
-
} else {
|
127
|
-
extFlag = {
|
128
|
-
option: "ext",
|
129
|
-
type: "[String]",
|
130
|
-
description: "Specify additional file extensions to lint"
|
131
|
-
};
|
132
|
-
}
|
138
|
+
let resolvePluginsFlag;
|
133
139
|
|
134
|
-
|
140
|
+
if (!usingFlatConfig) {
|
141
|
+
resolvePluginsFlag = {
|
142
|
+
option: "resolve-plugins-relative-to",
|
143
|
+
type: "path::String",
|
144
|
+
description:
|
145
|
+
"A folder where plugins should be resolved from, CWD by default",
|
146
|
+
};
|
147
|
+
}
|
135
148
|
|
136
|
-
|
137
|
-
resolvePluginsFlag = {
|
138
|
-
option: "resolve-plugins-relative-to",
|
139
|
-
type: "path::String",
|
140
|
-
description: "A folder where plugins should be resolved from, CWD by default"
|
141
|
-
};
|
142
|
-
}
|
149
|
+
let rulesDirFlag;
|
143
150
|
|
144
|
-
|
151
|
+
if (!usingFlatConfig) {
|
152
|
+
rulesDirFlag = {
|
153
|
+
option: "rulesdir",
|
154
|
+
type: "[path::String]",
|
155
|
+
description:
|
156
|
+
"Load additional rules from this directory. Deprecated: Use rules from plugins",
|
157
|
+
};
|
158
|
+
}
|
145
159
|
|
146
|
-
|
147
|
-
rulesDirFlag = {
|
148
|
-
option: "rulesdir",
|
149
|
-
type: "[path::String]",
|
150
|
-
description: "Load additional rules from this directory. Deprecated: Use rules from plugins"
|
151
|
-
};
|
152
|
-
}
|
160
|
+
let ignorePathFlag;
|
153
161
|
|
154
|
-
|
162
|
+
if (!usingFlatConfig) {
|
163
|
+
ignorePathFlag = {
|
164
|
+
option: "ignore-path",
|
165
|
+
type: "path::String",
|
166
|
+
description: "Specify path of ignore file",
|
167
|
+
};
|
168
|
+
}
|
155
169
|
|
156
|
-
|
157
|
-
ignorePathFlag = {
|
158
|
-
option: "ignore-path",
|
159
|
-
type: "path::String",
|
160
|
-
description: "Specify path of ignore file"
|
161
|
-
};
|
162
|
-
}
|
170
|
+
let statsFlag;
|
163
171
|
|
164
|
-
|
172
|
+
if (usingFlatConfig) {
|
173
|
+
statsFlag = {
|
174
|
+
option: "stats",
|
175
|
+
type: "Boolean",
|
176
|
+
default: "false",
|
177
|
+
description: "Add statistics to the lint report",
|
178
|
+
};
|
179
|
+
}
|
165
180
|
|
166
|
-
|
167
|
-
statsFlag = {
|
168
|
-
option: "stats",
|
169
|
-
type: "Boolean",
|
170
|
-
default: "false",
|
171
|
-
description: "Add statistics to the lint report"
|
172
|
-
};
|
173
|
-
}
|
181
|
+
let warnIgnoredFlag;
|
174
182
|
|
175
|
-
|
183
|
+
if (usingFlatConfig) {
|
184
|
+
warnIgnoredFlag = {
|
185
|
+
option: "warn-ignored",
|
186
|
+
type: "Boolean",
|
187
|
+
default: "true",
|
188
|
+
description:
|
189
|
+
"Suppress warnings when the file list includes ignored files",
|
190
|
+
};
|
191
|
+
}
|
176
192
|
|
177
|
-
|
178
|
-
warnIgnoredFlag = {
|
179
|
-
option: "warn-ignored",
|
180
|
-
type: "Boolean",
|
181
|
-
default: "true",
|
182
|
-
description: "Suppress warnings when the file list includes ignored files"
|
183
|
-
};
|
184
|
-
}
|
193
|
+
let flagFlag;
|
185
194
|
|
186
|
-
|
195
|
+
if (usingFlatConfig) {
|
196
|
+
flagFlag = {
|
197
|
+
option: "flag",
|
198
|
+
type: "[String]",
|
199
|
+
description: "Enable a feature flag",
|
200
|
+
};
|
201
|
+
}
|
187
202
|
|
188
|
-
|
189
|
-
flagFlag = {
|
190
|
-
option: "flag",
|
191
|
-
type: "[String]",
|
192
|
-
description: "Enable a feature flag"
|
193
|
-
};
|
194
|
-
}
|
203
|
+
let reportUnusedInlineConfigsFlag;
|
195
204
|
|
196
|
-
|
205
|
+
if (usingFlatConfig) {
|
206
|
+
reportUnusedInlineConfigsFlag = {
|
207
|
+
option: "report-unused-inline-configs",
|
208
|
+
type: "String",
|
209
|
+
default: void 0,
|
210
|
+
description:
|
211
|
+
"Adds reported errors for unused eslint inline config comments",
|
212
|
+
enum: ["off", "warn", "error", "0", "1", "2"],
|
213
|
+
};
|
214
|
+
}
|
197
215
|
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
|
214
|
-
|
215
|
-
|
216
|
-
|
217
|
-
|
218
|
-
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
|
223
|
-
|
224
|
-
|
225
|
-
|
226
|
-
|
227
|
-
|
228
|
-
|
229
|
-
|
230
|
-
|
231
|
-
|
232
|
-
|
233
|
-
|
234
|
-
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
|
239
|
-
|
240
|
-
|
241
|
-
|
242
|
-
|
243
|
-
|
244
|
-
|
245
|
-
|
246
|
-
|
247
|
-
|
248
|
-
|
249
|
-
|
250
|
-
|
251
|
-
|
252
|
-
|
253
|
-
|
254
|
-
|
255
|
-
|
256
|
-
|
257
|
-
|
258
|
-
|
259
|
-
|
260
|
-
|
261
|
-
|
262
|
-
|
263
|
-
|
264
|
-
|
265
|
-
|
266
|
-
|
267
|
-
|
268
|
-
|
269
|
-
|
270
|
-
|
271
|
-
|
272
|
-
|
273
|
-
|
274
|
-
|
275
|
-
|
276
|
-
|
277
|
-
|
278
|
-
|
279
|
-
|
280
|
-
|
281
|
-
|
282
|
-
|
283
|
-
|
284
|
-
|
285
|
-
|
286
|
-
|
287
|
-
|
288
|
-
|
289
|
-
|
290
|
-
|
291
|
-
|
292
|
-
|
293
|
-
|
294
|
-
|
295
|
-
|
296
|
-
|
297
|
-
|
298
|
-
|
299
|
-
|
300
|
-
|
301
|
-
|
302
|
-
|
303
|
-
|
304
|
-
|
305
|
-
|
306
|
-
|
307
|
-
|
308
|
-
|
309
|
-
|
310
|
-
|
311
|
-
|
312
|
-
|
313
|
-
|
314
|
-
|
315
|
-
|
316
|
-
|
317
|
-
|
318
|
-
|
319
|
-
|
320
|
-
|
321
|
-
|
322
|
-
|
323
|
-
|
324
|
-
|
325
|
-
|
326
|
-
|
327
|
-
|
328
|
-
|
329
|
-
|
330
|
-
|
331
|
-
|
332
|
-
|
333
|
-
|
334
|
-
|
335
|
-
|
336
|
-
|
337
|
-
|
338
|
-
|
339
|
-
|
340
|
-
|
341
|
-
|
342
|
-
|
343
|
-
|
344
|
-
|
345
|
-
|
346
|
-
|
347
|
-
|
348
|
-
|
349
|
-
|
350
|
-
|
351
|
-
|
352
|
-
|
353
|
-
|
354
|
-
|
355
|
-
|
356
|
-
|
357
|
-
|
358
|
-
|
359
|
-
|
360
|
-
|
361
|
-
|
362
|
-
|
363
|
-
|
364
|
-
|
365
|
-
|
366
|
-
|
367
|
-
|
368
|
-
|
369
|
-
|
370
|
-
|
371
|
-
|
372
|
-
|
373
|
-
|
374
|
-
|
375
|
-
|
376
|
-
|
377
|
-
|
378
|
-
|
379
|
-
|
380
|
-
|
381
|
-
|
382
|
-
|
383
|
-
|
384
|
-
|
385
|
-
|
386
|
-
|
387
|
-
|
388
|
-
|
389
|
-
|
390
|
-
|
391
|
-
|
392
|
-
|
393
|
-
|
394
|
-
|
395
|
-
|
396
|
-
|
397
|
-
|
398
|
-
|
399
|
-
|
400
|
-
|
401
|
-
|
402
|
-
|
403
|
-
|
404
|
-
|
405
|
-
|
406
|
-
|
407
|
-
|
408
|
-
|
409
|
-
|
410
|
-
|
411
|
-
|
412
|
-
|
413
|
-
|
414
|
-
|
415
|
-
|
416
|
-
|
417
|
-
|
418
|
-
|
419
|
-
|
420
|
-
|
421
|
-
|
422
|
-
|
423
|
-
|
424
|
-
|
425
|
-
|
426
|
-
|
427
|
-
|
428
|
-
|
429
|
-
|
430
|
-
|
431
|
-
|
432
|
-
|
433
|
-
|
434
|
-
|
435
|
-
|
436
|
-
|
437
|
-
|
438
|
-
|
439
|
-
|
440
|
-
|
441
|
-
|
442
|
-
|
443
|
-
|
444
|
-
|
445
|
-
|
446
|
-
|
447
|
-
|
448
|
-
|
449
|
-
|
450
|
-
|
451
|
-
|
452
|
-
|
453
|
-
|
454
|
-
|
455
|
-
|
456
|
-
|
457
|
-
|
458
|
-
|
459
|
-
|
460
|
-
|
216
|
+
return optionator({
|
217
|
+
prepend: "eslint [options] file.js [file.js] [dir]",
|
218
|
+
defaults: {
|
219
|
+
concatRepeatedArrays: true,
|
220
|
+
mergeRepeatedObjects: true,
|
221
|
+
},
|
222
|
+
options: [
|
223
|
+
{
|
224
|
+
heading: "Basic configuration",
|
225
|
+
},
|
226
|
+
lookupFlag,
|
227
|
+
{
|
228
|
+
option: "config",
|
229
|
+
alias: "c",
|
230
|
+
type: "path::String",
|
231
|
+
description: usingFlatConfig
|
232
|
+
? "Use this configuration instead of eslint.config.js, eslint.config.mjs, or eslint.config.cjs"
|
233
|
+
: "Use this configuration, overriding .eslintrc.* config options if present",
|
234
|
+
},
|
235
|
+
inspectConfigFlag,
|
236
|
+
envFlag,
|
237
|
+
extFlag,
|
238
|
+
{
|
239
|
+
option: "global",
|
240
|
+
type: "[String]",
|
241
|
+
description: "Define global variables",
|
242
|
+
},
|
243
|
+
{
|
244
|
+
option: "parser",
|
245
|
+
type: "String",
|
246
|
+
description: "Specify the parser to be used",
|
247
|
+
},
|
248
|
+
{
|
249
|
+
option: "parser-options",
|
250
|
+
type: "Object",
|
251
|
+
description: "Specify parser options",
|
252
|
+
},
|
253
|
+
resolvePluginsFlag,
|
254
|
+
{
|
255
|
+
heading: "Specify Rules and Plugins",
|
256
|
+
},
|
257
|
+
{
|
258
|
+
option: "plugin",
|
259
|
+
type: "[String]",
|
260
|
+
description: "Specify plugins",
|
261
|
+
},
|
262
|
+
{
|
263
|
+
option: "rule",
|
264
|
+
type: "Object",
|
265
|
+
description: "Specify rules",
|
266
|
+
},
|
267
|
+
rulesDirFlag,
|
268
|
+
{
|
269
|
+
heading: "Fix Problems",
|
270
|
+
},
|
271
|
+
{
|
272
|
+
option: "fix",
|
273
|
+
type: "Boolean",
|
274
|
+
default: false,
|
275
|
+
description: "Automatically fix problems",
|
276
|
+
},
|
277
|
+
{
|
278
|
+
option: "fix-dry-run",
|
279
|
+
type: "Boolean",
|
280
|
+
default: false,
|
281
|
+
description:
|
282
|
+
"Automatically fix problems without saving the changes to the file system",
|
283
|
+
},
|
284
|
+
{
|
285
|
+
option: "fix-type",
|
286
|
+
type: "Array",
|
287
|
+
description:
|
288
|
+
"Specify the types of fixes to apply (directive, problem, suggestion, layout)",
|
289
|
+
},
|
290
|
+
{
|
291
|
+
heading: "Ignore Files",
|
292
|
+
},
|
293
|
+
ignorePathFlag,
|
294
|
+
{
|
295
|
+
option: "ignore",
|
296
|
+
type: "Boolean",
|
297
|
+
default: "true",
|
298
|
+
description: "Disable use of ignore files and patterns",
|
299
|
+
},
|
300
|
+
{
|
301
|
+
option: "ignore-pattern",
|
302
|
+
type: "[String]",
|
303
|
+
description: `Patterns of files to ignore${usingFlatConfig ? "" : " (in addition to those in .eslintignore)"}`,
|
304
|
+
concatRepeatedArrays: [
|
305
|
+
true,
|
306
|
+
{
|
307
|
+
oneValuePerFlag: true,
|
308
|
+
},
|
309
|
+
],
|
310
|
+
},
|
311
|
+
{
|
312
|
+
heading: "Use stdin",
|
313
|
+
},
|
314
|
+
{
|
315
|
+
option: "stdin",
|
316
|
+
type: "Boolean",
|
317
|
+
default: "false",
|
318
|
+
description: "Lint code provided on <STDIN>",
|
319
|
+
},
|
320
|
+
{
|
321
|
+
option: "stdin-filename",
|
322
|
+
type: "String",
|
323
|
+
description: "Specify filename to process STDIN as",
|
324
|
+
},
|
325
|
+
{
|
326
|
+
heading: "Handle Warnings",
|
327
|
+
},
|
328
|
+
{
|
329
|
+
option: "quiet",
|
330
|
+
type: "Boolean",
|
331
|
+
default: "false",
|
332
|
+
description: "Report errors only",
|
333
|
+
},
|
334
|
+
{
|
335
|
+
option: "max-warnings",
|
336
|
+
type: "Int",
|
337
|
+
default: "-1",
|
338
|
+
description: "Number of warnings to trigger nonzero exit code",
|
339
|
+
},
|
340
|
+
{
|
341
|
+
heading: "Output",
|
342
|
+
},
|
343
|
+
{
|
344
|
+
option: "output-file",
|
345
|
+
alias: "o",
|
346
|
+
type: "path::String",
|
347
|
+
description: "Specify file to write report to",
|
348
|
+
},
|
349
|
+
{
|
350
|
+
option: "format",
|
351
|
+
alias: "f",
|
352
|
+
type: "String",
|
353
|
+
default: "stylish",
|
354
|
+
description: "Use a specific output format",
|
355
|
+
},
|
356
|
+
{
|
357
|
+
option: "color",
|
358
|
+
type: "Boolean",
|
359
|
+
alias: "no-color",
|
360
|
+
description: "Force enabling/disabling of color",
|
361
|
+
},
|
362
|
+
{
|
363
|
+
heading: "Inline configuration comments",
|
364
|
+
},
|
365
|
+
{
|
366
|
+
option: "inline-config",
|
367
|
+
type: "Boolean",
|
368
|
+
default: "true",
|
369
|
+
description: "Prevent comments from changing config or rules",
|
370
|
+
},
|
371
|
+
{
|
372
|
+
option: "report-unused-disable-directives",
|
373
|
+
type: "Boolean",
|
374
|
+
default: void 0,
|
375
|
+
description:
|
376
|
+
"Adds reported errors for unused eslint-disable and eslint-enable directives",
|
377
|
+
},
|
378
|
+
{
|
379
|
+
option: "report-unused-disable-directives-severity",
|
380
|
+
type: "String",
|
381
|
+
default: void 0,
|
382
|
+
description:
|
383
|
+
"Chooses severity level for reporting unused eslint-disable and eslint-enable directives",
|
384
|
+
enum: ["off", "warn", "error", "0", "1", "2"],
|
385
|
+
},
|
386
|
+
reportUnusedInlineConfigsFlag,
|
387
|
+
{
|
388
|
+
heading: "Caching",
|
389
|
+
},
|
390
|
+
{
|
391
|
+
option: "cache",
|
392
|
+
type: "Boolean",
|
393
|
+
default: "false",
|
394
|
+
description: "Only check changed files",
|
395
|
+
},
|
396
|
+
{
|
397
|
+
option: "cache-file",
|
398
|
+
type: "path::String",
|
399
|
+
default: ".eslintcache",
|
400
|
+
description:
|
401
|
+
"Path to the cache file. Deprecated: use --cache-location",
|
402
|
+
},
|
403
|
+
{
|
404
|
+
option: "cache-location",
|
405
|
+
type: "path::String",
|
406
|
+
description: "Path to the cache file or directory",
|
407
|
+
},
|
408
|
+
{
|
409
|
+
option: "cache-strategy",
|
410
|
+
dependsOn: ["cache"],
|
411
|
+
type: "String",
|
412
|
+
default: "metadata",
|
413
|
+
enum: ["metadata", "content"],
|
414
|
+
description:
|
415
|
+
"Strategy to use for detecting changed files in the cache",
|
416
|
+
},
|
417
|
+
{
|
418
|
+
heading: "Suppressing Violations",
|
419
|
+
},
|
420
|
+
{
|
421
|
+
option: "suppress-all",
|
422
|
+
type: "Boolean",
|
423
|
+
default: "false",
|
424
|
+
description: "Suppress all violations",
|
425
|
+
},
|
426
|
+
{
|
427
|
+
option: "suppress-rule",
|
428
|
+
type: "[String]",
|
429
|
+
description: "Suppress specific rules",
|
430
|
+
},
|
431
|
+
{
|
432
|
+
option: "suppressions-location",
|
433
|
+
type: "path::String",
|
434
|
+
description: "Specify the location of the suppressions file",
|
435
|
+
},
|
436
|
+
{
|
437
|
+
option: "prune-suppressions",
|
438
|
+
type: "Boolean",
|
439
|
+
default: "false",
|
440
|
+
description: "Prune unused suppressions",
|
441
|
+
},
|
442
|
+
{
|
443
|
+
heading: "Miscellaneous",
|
444
|
+
},
|
445
|
+
{
|
446
|
+
option: "init",
|
447
|
+
type: "Boolean",
|
448
|
+
default: "false",
|
449
|
+
description: "Run config initialization wizard",
|
450
|
+
},
|
451
|
+
{
|
452
|
+
option: "env-info",
|
453
|
+
type: "Boolean",
|
454
|
+
default: "false",
|
455
|
+
description: "Output execution environment information",
|
456
|
+
},
|
457
|
+
{
|
458
|
+
option: "error-on-unmatched-pattern",
|
459
|
+
type: "Boolean",
|
460
|
+
default: "true",
|
461
|
+
description: "Prevent errors when pattern is unmatched",
|
462
|
+
},
|
463
|
+
{
|
464
|
+
option: "exit-on-fatal-error",
|
465
|
+
type: "Boolean",
|
466
|
+
default: "false",
|
467
|
+
description: "Exit with exit code 2 in case of fatal error",
|
468
|
+
},
|
469
|
+
warnIgnoredFlag,
|
470
|
+
{
|
471
|
+
option: "pass-on-no-patterns",
|
472
|
+
type: "Boolean",
|
473
|
+
default: false,
|
474
|
+
description:
|
475
|
+
"Exit with exit code 0 in case no file patterns are passed",
|
476
|
+
},
|
477
|
+
{
|
478
|
+
option: "debug",
|
479
|
+
type: "Boolean",
|
480
|
+
default: false,
|
481
|
+
description: "Output debugging information",
|
482
|
+
},
|
483
|
+
{
|
484
|
+
option: "help",
|
485
|
+
alias: "h",
|
486
|
+
type: "Boolean",
|
487
|
+
description: "Show help",
|
488
|
+
},
|
489
|
+
{
|
490
|
+
option: "version",
|
491
|
+
alias: "v",
|
492
|
+
type: "Boolean",
|
493
|
+
description: "Output the version number",
|
494
|
+
},
|
495
|
+
{
|
496
|
+
option: "print-config",
|
497
|
+
type: "path::String",
|
498
|
+
description: "Print the configuration for the given file",
|
499
|
+
},
|
500
|
+
statsFlag,
|
501
|
+
flagFlag,
|
502
|
+
].filter(value => !!value),
|
503
|
+
});
|
461
504
|
};
|