From 219aecb78bc646d44bad27dc775a9b3d3dc58232 Mon Sep 17 00:00:00 2001 From: Toru Nagashima Date: Wed, 22 May 2019 16:34:32 +0900 Subject: [PATCH] Chore: restructure files (#11555) --- .eslintignore | 2 +- .eslintrc.js | 130 +++++++- Makefile.js | 17 +- bin/eslint.js | 2 +- conf/environments.js | 2 +- conf/eslint-all.js | 4 +- conf/eslint-recommended.js | 2 +- docs/developer-guide/architecture.md | 24 +- .../architecture/dependency.svg | 52 ++++ karma.conf.js | 4 +- lib/api.js | 10 +- lib/built-in-rules-index.js | 281 ------------------ .../cascading-config-array-factory.js | 10 +- lib/{ => cli-engine}/cli-engine.js | 38 +-- lib/cli-engine/config-array-factory.js | 14 +- lib/cli-engine/config-array/config-array.js | 12 +- .../config-array/config-dependency.js | 4 +- .../config-array/extracted-config.js | 6 +- lib/cli-engine/file-enumerator.js | 2 +- lib/{ => cli-engine}/formatters/checkstyle.js | 2 +- lib/{ => cli-engine}/formatters/codeframe.js | 0 lib/{ => cli-engine}/formatters/compact.js | 0 .../formatters/html-template-message.html | 0 .../formatters/html-template-page.html | 0 .../formatters/html-template-result.html | 0 lib/{ => cli-engine}/formatters/html.js | 0 lib/{ => cli-engine}/formatters/jslint-xml.js | 2 +- .../formatters/json-with-metadata.js | 0 lib/{ => cli-engine}/formatters/json.js | 0 lib/{ => cli-engine}/formatters/junit.js | 2 +- lib/{ => cli-engine}/formatters/stylish.js | 0 lib/{ => cli-engine}/formatters/table.js | 0 lib/{ => cli-engine}/formatters/tap.js | 0 lib/{ => cli-engine}/formatters/unix.js | 0 .../formatters/visualstudio.js | 0 lib/{util => cli-engine}/hash.js | 0 lib/{util => cli-engine}/ignored-paths.js | 0 lib/cli-engine/index.js | 7 + lib/{util => cli-engine}/lint-result-cache.js | 0 lib/{ => cli-engine}/load-rules.js | 0 lib/{util => cli-engine}/naming.js | 0 lib/{util => cli-engine}/xml-escape.js | 0 lib/cli.js | 6 +- lib/{config => init}/autoconfig.js | 6 +- lib/{config => init}/config-file.js | 0 lib/{config => init}/config-initializer.js | 12 +- lib/{config => init}/config-rule.js | 2 +- lib/{util => init}/npm-utils.js | 2 +- lib/{util => init}/source-code-utils.js | 17 +- .../apply-disable-directives.js | 0 .../code-path-analysis/code-path-analyzer.js | 25 +- .../code-path-analysis/code-path-segment.js | 0 .../code-path-analysis/code-path-state.js | 0 .../code-path-analysis/code-path.js | 0 .../code-path-analysis/debug-helpers.js | 0 .../code-path-analysis/fork-context.js | 0 .../code-path-analysis/id-generator.js | 0 lib/{util => linter}/config-comment-parser.js | 2 +- lib/linter/index.js | 13 + lib/{util => linter}/interpolate.js | 0 lib/{ => linter}/linter.js | 45 +-- lib/{util => linter}/node-event-generator.js | 2 +- lib/{util => linter}/report-translator.js | 0 lib/{util => linter}/rule-fixer.js | 0 lib/{ => linter}/rules.js | 4 +- lib/{util => linter}/safe-emitter.js | 0 lib/{util => linter}/source-code-fixer.js | 0 lib/{util => linter}/timing.js | 0 lib/rule-tester/index.js | 5 + lib/{testers => rule-tester}/rule-tester.js | 8 +- lib/rules/array-bracket-newline.js | 2 +- lib/rules/array-bracket-spacing.js | 2 +- lib/rules/array-callback-return.js | 2 +- lib/rules/array-element-newline.js | 2 +- lib/rules/arrow-body-style.js | 2 +- lib/rules/arrow-parens.js | 2 +- lib/rules/arrow-spacing.js | 2 +- lib/rules/block-spacing.js | 2 +- lib/rules/brace-style.js | 2 +- lib/rules/capitalized-comments.js | 4 +- lib/rules/comma-dangle.js | 2 +- lib/rules/comma-spacing.js | 2 +- lib/rules/comma-style.js | 2 +- lib/rules/complexity.js | 2 +- lib/rules/computed-property-spacing.js | 2 +- lib/rules/consistent-return.js | 2 +- lib/rules/curly.js | 2 +- lib/rules/dot-location.js | 2 +- lib/rules/dot-notation.js | 4 +- lib/rules/eqeqeq.js | 2 +- lib/rules/func-call-spacing.js | 2 +- lib/rules/func-name-matching.js | 2 +- lib/rules/func-names.js | 2 +- lib/rules/function-paren-newline.js | 2 +- lib/rules/getter-return.js | 2 +- lib/rules/implicit-arrow-linebreak.js | 2 +- lib/rules/indent-legacy.js | 2 +- lib/rules/indent.js | 2 +- lib/rules/index.js | 281 ++++++++++++++++++ lib/rules/jsx-quotes.js | 2 +- lib/rules/key-spacing.js | 2 +- lib/rules/keyword-spacing.js | 4 +- lib/rules/line-comment-position.js | 2 +- lib/rules/linebreak-style.js | 2 +- lib/rules/lines-around-comment.js | 2 +- lib/rules/lines-around-directive.js | 2 +- lib/rules/lines-between-class-members.js | 2 +- lib/rules/max-lines-per-function.js | 2 +- lib/rules/max-lines.js | 2 +- lib/rules/max-params.js | 2 +- lib/rules/max-statements-per-line.js | 2 +- lib/rules/max-statements.js | 2 +- lib/rules/multiline-comment-style.js | 2 +- lib/rules/multiline-ternary.js | 2 +- lib/rules/new-parens.js | 2 +- lib/rules/newline-after-var.js | 2 +- lib/rules/newline-per-chained-call.js | 2 +- lib/rules/no-alert.js | 2 +- lib/rules/no-catch-shadow.js | 2 +- lib/rules/no-class-assign.js | 2 +- lib/rules/no-cond-assign.js | 2 +- lib/rules/no-confusing-arrow.js | 2 +- lib/rules/no-console.js | 2 +- lib/rules/no-const-assign.js | 2 +- lib/rules/no-dupe-keys.js | 2 +- lib/rules/no-else-return.js | 4 +- lib/rules/no-empty-function.js | 2 +- lib/rules/no-empty.js | 2 +- lib/rules/no-eval.js | 2 +- lib/rules/no-ex-assign.js | 2 +- lib/rules/no-extend-native.js | 2 +- lib/rules/no-extra-bind.js | 2 +- lib/rules/no-extra-boolean-cast.js | 2 +- lib/rules/no-extra-label.js | 2 +- lib/rules/no-extra-parens.js | 2 +- lib/rules/no-extra-semi.js | 4 +- lib/rules/no-floating-decimal.js | 2 +- lib/rules/no-func-assign.js | 2 +- lib/rules/no-implicit-coercion.js | 2 +- lib/rules/no-inline-comments.js | 2 +- lib/rules/no-invalid-this.js | 2 +- lib/rules/no-irregular-whitespace.js | 2 +- lib/rules/no-label-var.js | 2 +- lib/rules/no-labels.js | 2 +- lib/rules/no-misleading-character-class.js | 2 +- lib/rules/no-mixed-operators.js | 2 +- lib/rules/no-multi-spaces.js | 2 +- lib/rules/no-multi-str.js | 2 +- lib/rules/no-redeclare.js | 2 +- lib/rules/no-regex-spaces.js | 2 +- lib/rules/no-restricted-properties.js | 2 +- lib/rules/no-return-assign.js | 2 +- lib/rules/no-return-await.js | 2 +- lib/rules/no-self-assign.js | 2 +- lib/rules/no-sequences.js | 2 +- lib/rules/no-shadow.js | 2 +- lib/rules/no-this-before-super.js | 2 +- lib/rules/no-throw-literal.js | 2 +- lib/rules/no-trailing-spaces.js | 2 +- lib/rules/no-undef-init.js | 2 +- lib/rules/no-unexpected-multiline.js | 2 +- lib/rules/no-unmodified-loop-condition.js | 4 +- lib/rules/no-unneeded-ternary.js | 2 +- lib/rules/no-unsafe-negation.js | 2 +- lib/rules/no-unused-vars.js | 2 +- lib/rules/no-useless-call.js | 2 +- lib/rules/no-useless-computed-key.js | 2 +- lib/rules/no-useless-concat.js | 2 +- lib/rules/no-useless-escape.js | 2 +- lib/rules/no-useless-return.js | 4 +- lib/rules/no-var.js | 2 +- lib/rules/no-warning-comments.js | 2 +- lib/rules/no-whitespace-before-property.js | 2 +- lib/rules/object-curly-newline.js | 2 +- lib/rules/object-curly-spacing.js | 2 +- lib/rules/object-shorthand.js | 2 +- lib/rules/operator-assignment.js | 2 +- lib/rules/operator-linebreak.js | 2 +- lib/rules/padded-blocks.js | 2 +- lib/rules/padding-line-between-statements.js | 2 +- lib/rules/prefer-const.js | 2 +- lib/rules/prefer-object-spread.js | 2 +- lib/rules/prefer-promise-reject-errors.js | 2 +- lib/rules/prefer-spread.js | 2 +- lib/rules/prefer-template.js | 2 +- lib/rules/quote-props.js | 2 +- lib/rules/quotes.js | 2 +- lib/rules/radix.js | 2 +- lib/rules/require-await.js | 2 +- lib/rules/semi-spacing.js | 2 +- lib/rules/semi-style.js | 2 +- lib/rules/semi.js | 4 +- lib/rules/sort-keys.js | 2 +- lib/rules/space-before-blocks.js | 2 +- lib/rules/space-before-function-paren.js | 2 +- lib/rules/space-in-parens.js | 2 +- lib/rules/space-unary-ops.js | 2 +- lib/rules/spaced-comment.js | 2 +- lib/rules/strict.js | 2 +- lib/rules/switch-colon-spacing.js | 2 +- lib/rules/symbol-description.js | 2 +- lib/rules/template-curly-spacing.js | 2 +- lib/{util => rules/utils}/ast-utils.js | 35 +-- lib/{util => rules/utils}/fix-tracker.js | 2 +- lib/{util => rules/utils}/keywords.js | 0 .../utils}/lazy-loading-rule-map.js | 0 lib/{util => rules/utils}/patterns/letters.js | 0 lib/{util => rules/utils}/unicode/index.js | 0 .../utils}/unicode/is-combining-character.js | 0 .../utils}/unicode/is-emoji-modifier.js | 0 .../unicode/is-regional-indicator-symbol.js | 0 .../utils}/unicode/is-surrogate-pair.js | 0 lib/rules/wrap-iife.js | 2 +- lib/rules/yoda.js | 2 +- lib/{util => shared}/ajv.js | 0 lib/shared/ast-utils.js | 29 ++ lib/{config => shared}/config-ops.js | 0 lib/{config => shared}/config-validator.js | 7 +- lib/{util => shared}/logging.js | 0 .../relative-module-resolver.js | 0 lib/{util => shared}/traverser.js | 0 lib/{util => shared}/types.js | 0 lib/source-code/index.js | 5 + lib/{util => source-code}/source-code.js | 18 +- .../backward-token-comment-cursor.js | 0 .../token-store/backward-token-cursor.js | 0 lib/{ => source-code}/token-store/cursor.js | 0 lib/{ => source-code}/token-store/cursors.js | 0 .../token-store/decorative-cursor.js | 0 .../token-store/filter-cursor.js | 0 .../forward-token-comment-cursor.js | 0 .../token-store/forward-token-cursor.js | 0 lib/{ => source-code}/token-store/index.js | 6 +- .../token-store/limit-cursor.js | 0 .../token-store/padded-token-cursor.js | 0 .../token-store/skip-cursor.js | 0 lib/{ => source-code}/token-store/utils.js | 0 tests/conf/config-schema.js | 2 +- tests/lib/cli-engine/_utils.js | 28 +- tests/lib/{ => cli-engine}/cli-engine.js | 38 +-- tests/lib/cli-engine/file-enumerator.js | 2 +- .../{ => cli-engine}/formatters/checkstyle.js | 2 +- .../{ => cli-engine}/formatters/codeframe.js | 2 +- .../{ => cli-engine}/formatters/compact.js | 2 +- tests/lib/{ => cli-engine}/formatters/html.js | 2 +- .../{ => cli-engine}/formatters/jslint-xml.js | 2 +- .../formatters/json-with-metadata.js | 2 +- tests/lib/{ => cli-engine}/formatters/json.js | 2 +- .../lib/{ => cli-engine}/formatters/junit.js | 2 +- .../{ => cli-engine}/formatters/stylish.js | 2 +- .../lib/{ => cli-engine}/formatters/table.js | 2 +- tests/lib/{ => cli-engine}/formatters/tap.js | 2 +- tests/lib/{ => cli-engine}/formatters/unix.js | 2 +- .../formatters/visualstudio.js | 2 +- .../lib/{util => cli-engine}/ignored-paths.js | 2 +- .../{util => cli-engine}/lint-result-cache.js | 2 +- tests/lib/{ => cli-engine}/load-rules.js | 4 +- tests/lib/{util => cli-engine}/naming.js | 2 +- tests/lib/cli.js | 56 ++-- tests/lib/{config => init}/autoconfig.js | 4 +- tests/lib/{config => init}/config-file.js | 8 +- .../{config => init}/config-initializer.js | 10 +- tests/lib/{config => init}/config-rule.js | 4 +- tests/lib/{util => init}/npm-utils.js | 6 +- tests/lib/{util => init}/source-code-utils.js | 4 +- .../apply-disable-directives.js | 2 +- .../code-path-analysis/code-path-analyzer.js | 18 +- .../code-path-analysis/code-path.js | 2 +- .../{util => linter}/config-comment-parser.js | 2 +- tests/lib/{util => linter}/interpolate.js | 2 +- tests/lib/{ => linter}/linter.js | 4 +- .../{util => linter}/node-event-generator.js | 6 +- .../lib/{util => linter}/report-translator.js | 4 +- tests/lib/{util => linter}/rule-fixer.js | 2 +- tests/lib/{ => linter}/rules.js | 4 +- tests/lib/{util => linter}/safe-emitter.js | 2 +- .../lib/{util => linter}/source-code-fixer.js | 2 +- .../no-test-runners.js | 2 +- .../{testers => rule-tester}/rule-tester.js | 2 +- tests/lib/rules/_set-default-parser.js | 2 +- tests/lib/rules/accessor-pairs.js | 2 +- tests/lib/rules/array-bracket-newline.js | 2 +- tests/lib/rules/array-bracket-spacing.js | 2 +- tests/lib/rules/array-callback-return.js | 2 +- tests/lib/rules/array-element-newline.js | 2 +- tests/lib/rules/arrow-body-style.js | 2 +- tests/lib/rules/arrow-parens.js | 2 +- tests/lib/rules/arrow-spacing.js | 2 +- tests/lib/rules/block-scoped-var.js | 2 +- tests/lib/rules/block-spacing.js | 2 +- tests/lib/rules/brace-style.js | 2 +- tests/lib/rules/callback-return.js | 2 +- tests/lib/rules/camelcase.js | 2 +- tests/lib/rules/capitalized-comments.js | 2 +- tests/lib/rules/class-methods-use-this.js | 2 +- tests/lib/rules/comma-dangle.js | 2 +- tests/lib/rules/comma-spacing.js | 2 +- tests/lib/rules/comma-style.js | 2 +- tests/lib/rules/complexity.js | 2 +- tests/lib/rules/computed-property-spacing.js | 2 +- tests/lib/rules/consistent-return.js | 2 +- tests/lib/rules/consistent-this.js | 2 +- tests/lib/rules/constructor-super.js | 2 +- tests/lib/rules/curly.js | 2 +- tests/lib/rules/default-case.js | 2 +- tests/lib/rules/dot-location.js | 2 +- tests/lib/rules/dot-notation.js | 2 +- tests/lib/rules/eol-last.js | 2 +- tests/lib/rules/eqeqeq.js | 2 +- tests/lib/rules/for-direction.js | 2 +- tests/lib/rules/func-call-spacing.js | 2 +- tests/lib/rules/func-name-matching.js | 2 +- tests/lib/rules/func-names.js | 2 +- tests/lib/rules/func-style.js | 2 +- tests/lib/rules/function-paren-newline.js | 2 +- tests/lib/rules/generator-star-spacing.js | 2 +- tests/lib/rules/getter-return.js | 2 +- tests/lib/rules/global-require.js | 2 +- tests/lib/rules/guard-for-in.js | 2 +- tests/lib/rules/handle-callback-err.js | 2 +- tests/lib/rules/id-blacklist.js | 2 +- tests/lib/rules/id-length.js | 2 +- tests/lib/rules/id-match.js | 2 +- tests/lib/rules/implicit-arrow-linebreak.js | 2 +- tests/lib/rules/indent-legacy.js | 2 +- tests/lib/rules/indent.js | 2 +- tests/lib/rules/init-declarations.js | 2 +- tests/lib/rules/jsx-quotes.js | 2 +- tests/lib/rules/key-spacing.js | 2 +- tests/lib/rules/keyword-spacing.js | 2 +- tests/lib/rules/line-comment-position.js | 2 +- tests/lib/rules/linebreak-style.js | 2 +- tests/lib/rules/lines-around-comment.js | 2 +- tests/lib/rules/lines-around-directive.js | 2 +- .../lib/rules/lines-between-class-members.js | 2 +- tests/lib/rules/max-classes-per-file.js | 2 +- tests/lib/rules/max-depth.js | 2 +- tests/lib/rules/max-len.js | 2 +- tests/lib/rules/max-lines-per-function.js | 2 +- tests/lib/rules/max-lines.js | 2 +- tests/lib/rules/max-nested-callbacks.js | 2 +- tests/lib/rules/max-params.js | 2 +- tests/lib/rules/max-statements-per-line.js | 2 +- tests/lib/rules/max-statements.js | 2 +- tests/lib/rules/multiline-comment-style.js | 2 +- tests/lib/rules/multiline-ternary.js | 2 +- tests/lib/rules/new-cap.js | 2 +- tests/lib/rules/new-parens.js | 2 +- tests/lib/rules/newline-after-var.js | 2 +- tests/lib/rules/newline-before-return.js | 2 +- tests/lib/rules/newline-per-chained-call.js | 2 +- tests/lib/rules/no-alert.js | 2 +- tests/lib/rules/no-array-constructor.js | 2 +- tests/lib/rules/no-async-promise-executor.js | 2 +- tests/lib/rules/no-await-in-loop.js | 2 +- tests/lib/rules/no-bitwise.js | 2 +- tests/lib/rules/no-buffer-constructor.js | 2 +- tests/lib/rules/no-caller.js | 2 +- tests/lib/rules/no-case-declarations.js | 2 +- tests/lib/rules/no-catch-shadow.js | 2 +- tests/lib/rules/no-class-assign.js | 2 +- tests/lib/rules/no-compare-neg-zero.js | 2 +- tests/lib/rules/no-cond-assign.js | 2 +- tests/lib/rules/no-confusing-arrow.js | 2 +- tests/lib/rules/no-console.js | 2 +- tests/lib/rules/no-const-assign.js | 2 +- tests/lib/rules/no-constant-condition.js | 2 +- tests/lib/rules/no-continue.js | 2 +- tests/lib/rules/no-control-regex.js | 2 +- tests/lib/rules/no-debugger.js | 2 +- tests/lib/rules/no-delete-var.js | 2 +- tests/lib/rules/no-div-regex.js | 2 +- tests/lib/rules/no-dupe-args.js | 2 +- tests/lib/rules/no-dupe-class-members.js | 2 +- tests/lib/rules/no-dupe-keys.js | 2 +- tests/lib/rules/no-duplicate-case.js | 2 +- tests/lib/rules/no-duplicate-imports.js | 2 +- tests/lib/rules/no-else-return.js | 2 +- tests/lib/rules/no-empty-character-class.js | 2 +- tests/lib/rules/no-empty-function.js | 2 +- tests/lib/rules/no-empty-pattern.js | 2 +- tests/lib/rules/no-empty.js | 2 +- tests/lib/rules/no-eq-null.js | 2 +- tests/lib/rules/no-eval.js | 2 +- tests/lib/rules/no-ex-assign.js | 2 +- tests/lib/rules/no-extend-native.js | 2 +- tests/lib/rules/no-extra-bind.js | 2 +- tests/lib/rules/no-extra-boolean-cast.js | 2 +- tests/lib/rules/no-extra-label.js | 2 +- tests/lib/rules/no-extra-parens.js | 2 +- tests/lib/rules/no-extra-semi.js | 2 +- tests/lib/rules/no-fallthrough.js | 2 +- tests/lib/rules/no-floating-decimal.js | 2 +- tests/lib/rules/no-func-assign.js | 2 +- tests/lib/rules/no-global-assign.js | 2 +- tests/lib/rules/no-implicit-coercion.js | 2 +- tests/lib/rules/no-implicit-globals.js | 2 +- tests/lib/rules/no-implied-eval.js | 2 +- tests/lib/rules/no-inline-comments.js | 2 +- tests/lib/rules/no-inner-declarations.js | 2 +- tests/lib/rules/no-invalid-regexp.js | 2 +- tests/lib/rules/no-invalid-this.js | 2 +- tests/lib/rules/no-irregular-whitespace.js | 2 +- tests/lib/rules/no-iterator.js | 2 +- tests/lib/rules/no-label-var.js | 2 +- tests/lib/rules/no-labels.js | 2 +- tests/lib/rules/no-lone-blocks.js | 2 +- tests/lib/rules/no-lonely-if.js | 2 +- tests/lib/rules/no-loop-func.js | 2 +- tests/lib/rules/no-magic-numbers.js | 2 +- .../rules/no-misleading-character-class.js | 2 +- tests/lib/rules/no-mixed-operators.js | 2 +- tests/lib/rules/no-mixed-requires.js | 2 +- tests/lib/rules/no-mixed-spaces-and-tabs.js | 2 +- tests/lib/rules/no-multi-assign.js | 2 +- tests/lib/rules/no-multi-spaces.js | 2 +- tests/lib/rules/no-multi-str.js | 2 +- tests/lib/rules/no-multiple-empty-lines.js | 2 +- tests/lib/rules/no-native-reassign.js | 2 +- tests/lib/rules/no-negated-condition.js | 2 +- tests/lib/rules/no-negated-in-lhs.js | 2 +- tests/lib/rules/no-nested-ternary.js | 2 +- tests/lib/rules/no-new-func.js | 2 +- tests/lib/rules/no-new-object.js | 2 +- tests/lib/rules/no-new-require.js | 2 +- tests/lib/rules/no-new-symbol.js | 2 +- tests/lib/rules/no-new-wrappers.js | 2 +- tests/lib/rules/no-new.js | 2 +- tests/lib/rules/no-obj-calls.js | 2 +- tests/lib/rules/no-octal-escape.js | 2 +- tests/lib/rules/no-octal.js | 2 +- tests/lib/rules/no-param-reassign.js | 2 +- tests/lib/rules/no-path-concat.js | 2 +- tests/lib/rules/no-plusplus.js | 2 +- tests/lib/rules/no-process-env.js | 2 +- tests/lib/rules/no-process-exit.js | 2 +- tests/lib/rules/no-proto.js | 2 +- tests/lib/rules/no-prototype-builtins.js | 2 +- tests/lib/rules/no-redeclare.js | 2 +- tests/lib/rules/no-regex-spaces.js | 2 +- tests/lib/rules/no-restricted-globals.js | 2 +- tests/lib/rules/no-restricted-imports.js | 2 +- tests/lib/rules/no-restricted-modules.js | 2 +- tests/lib/rules/no-restricted-properties.js | 2 +- tests/lib/rules/no-restricted-syntax.js | 2 +- tests/lib/rules/no-return-assign.js | 2 +- tests/lib/rules/no-return-await.js | 2 +- tests/lib/rules/no-script-url.js | 2 +- tests/lib/rules/no-self-assign.js | 2 +- tests/lib/rules/no-self-compare.js | 2 +- tests/lib/rules/no-sequences.js | 2 +- tests/lib/rules/no-shadow-restricted-names.js | 2 +- tests/lib/rules/no-shadow.js | 2 +- tests/lib/rules/no-spaced-func.js | 2 +- tests/lib/rules/no-sparse-arrays.js | 2 +- tests/lib/rules/no-sync.js | 2 +- tests/lib/rules/no-tabs.js | 2 +- .../lib/rules/no-template-curly-in-string.js | 2 +- tests/lib/rules/no-ternary.js | 2 +- tests/lib/rules/no-this-before-super.js | 2 +- tests/lib/rules/no-throw-literal.js | 2 +- tests/lib/rules/no-trailing-spaces.js | 2 +- tests/lib/rules/no-undef-init.js | 2 +- tests/lib/rules/no-undef.js | 2 +- tests/lib/rules/no-undefined.js | 2 +- tests/lib/rules/no-underscore-dangle.js | 2 +- tests/lib/rules/no-unexpected-multiline.js | 2 +- .../lib/rules/no-unmodified-loop-condition.js | 2 +- tests/lib/rules/no-unneeded-ternary.js | 2 +- tests/lib/rules/no-unreachable.js | 2 +- tests/lib/rules/no-unsafe-finally.js | 2 +- tests/lib/rules/no-unsafe-negation.js | 2 +- tests/lib/rules/no-unused-expressions.js | 2 +- tests/lib/rules/no-unused-labels.js | 2 +- tests/lib/rules/no-unused-vars.js | 2 +- tests/lib/rules/no-use-before-define.js | 2 +- tests/lib/rules/no-useless-call.js | 2 +- tests/lib/rules/no-useless-catch.js | 2 +- tests/lib/rules/no-useless-computed-key.js | 2 +- tests/lib/rules/no-useless-concat.js | 2 +- tests/lib/rules/no-useless-constructor.js | 2 +- tests/lib/rules/no-useless-escape.js | 2 +- tests/lib/rules/no-useless-rename.js | 2 +- tests/lib/rules/no-useless-return.js | 2 +- tests/lib/rules/no-var.js | 2 +- tests/lib/rules/no-void.js | 2 +- tests/lib/rules/no-warning-comments.js | 2 +- .../rules/no-whitespace-before-property.js | 2 +- tests/lib/rules/no-with.js | 2 +- .../rules/nonblock-statement-body-position.js | 2 +- tests/lib/rules/object-curly-newline.js | 2 +- tests/lib/rules/object-curly-spacing.js | 2 +- tests/lib/rules/object-property-newline.js | 2 +- tests/lib/rules/object-shorthand.js | 2 +- .../lib/rules/one-var-declaration-per-line.js | 2 +- tests/lib/rules/one-var.js | 2 +- tests/lib/rules/operator-assignment.js | 2 +- tests/lib/rules/operator-linebreak.js | 2 +- tests/lib/rules/padded-blocks.js | 2 +- .../rules/padding-line-between-statements.js | 2 +- tests/lib/rules/prefer-arrow-callback.js | 2 +- tests/lib/rules/prefer-const.js | 2 +- tests/lib/rules/prefer-destructuring.js | 2 +- tests/lib/rules/prefer-named-capture-group.js | 2 +- tests/lib/rules/prefer-numeric-literals.js | 2 +- tests/lib/rules/prefer-object-spread.js | 2 +- .../lib/rules/prefer-promise-reject-errors.js | 2 +- tests/lib/rules/prefer-reflect.js | 2 +- tests/lib/rules/prefer-rest-params.js | 2 +- tests/lib/rules/prefer-spread.js | 2 +- tests/lib/rules/prefer-template.js | 2 +- tests/lib/rules/quote-props.js | 2 +- tests/lib/rules/quotes.js | 2 +- tests/lib/rules/radix.js | 2 +- tests/lib/rules/require-atomic-updates.js | 2 +- tests/lib/rules/require-await.js | 2 +- tests/lib/rules/require-jsdoc.js | 2 +- tests/lib/rules/require-unicode-regexp.js | 2 +- tests/lib/rules/require-yield.js | 2 +- tests/lib/rules/rest-spread-spacing.js | 2 +- tests/lib/rules/semi-spacing.js | 2 +- tests/lib/rules/semi-style.js | 2 +- tests/lib/rules/semi.js | 2 +- tests/lib/rules/sort-imports.js | 2 +- tests/lib/rules/sort-keys.js | 2 +- tests/lib/rules/sort-vars.js | 2 +- tests/lib/rules/space-before-blocks.js | 2 +- .../lib/rules/space-before-function-paren.js | 2 +- tests/lib/rules/space-in-parens.js | 2 +- tests/lib/rules/space-infix-ops.js | 2 +- tests/lib/rules/space-unary-ops.js | 2 +- tests/lib/rules/spaced-comment.js | 2 +- tests/lib/rules/strict.js | 2 +- tests/lib/rules/switch-colon-spacing.js | 2 +- tests/lib/rules/symbol-description.js | 2 +- tests/lib/rules/template-curly-spacing.js | 2 +- tests/lib/rules/template-tag-spacing.js | 2 +- tests/lib/rules/unicode-bom.js | 2 +- tests/lib/rules/use-isnan.js | 2 +- tests/lib/{util => rules/utils}/ast-utils.js | 6 +- .../lib/{util => rules/utils}/fix-tracker.js | 8 +- tests/lib/rules/valid-jsdoc.js | 2 +- tests/lib/rules/valid-typeof.js | 2 +- tests/lib/rules/vars-on-top.js | 4 +- tests/lib/rules/wrap-iife.js | 2 +- tests/lib/rules/wrap-regex.js | 2 +- tests/lib/rules/yield-star-spacing.js | 2 +- tests/lib/rules/yoda.js | 2 +- tests/lib/{config => shared}/config-ops.js | 2 +- .../{config => shared}/config-validator.js | 4 +- tests/lib/{util => shared}/traverser.js | 2 +- .../lib/{util => source-code}/source-code.js | 6 +- tests/lib/{ => source-code}/token-store.js | 2 +- tests/tools/eslint-fuzzer.js | 2 +- .../consistent-docs-description.js | 2 +- .../internal-rules/consistent-docs-url.js | 2 +- .../consistent-meta-messages.js | 2 +- .../internal-rules/multiline-comment-style.js | 2 +- tests/tools/internal-rules/no-invalid-meta.js | 2 +- tools/eslint-fuzzer.js | 4 +- tools/internal-rules/package.json | 1 + tools/internal-testers/test-parser.js | 2 +- tools/update-unicode-utils.js | 4 +- webpack.config.js | 2 +- 564 files changed, 1264 insertions(+), 1022 deletions(-) create mode 100644 docs/developer-guide/architecture/dependency.svg delete mode 100644 lib/built-in-rules-index.js rename lib/{ => cli-engine}/cli-engine.js (96%) rename lib/{ => cli-engine}/formatters/checkstyle.js (97%) rename lib/{ => cli-engine}/formatters/codeframe.js (100%) rename lib/{ => cli-engine}/formatters/compact.js (100%) rename lib/{ => cli-engine}/formatters/html-template-message.html (100%) rename lib/{ => cli-engine}/formatters/html-template-page.html (100%) rename lib/{ => cli-engine}/formatters/html-template-result.html (100%) rename lib/{ => cli-engine}/formatters/html.js (100%) rename lib/{ => cli-engine}/formatters/jslint-xml.js (95%) rename lib/{ => cli-engine}/formatters/json-with-metadata.js (100%) rename lib/{ => cli-engine}/formatters/json.js (100%) rename lib/{ => cli-engine}/formatters/junit.js (97%) rename lib/{ => cli-engine}/formatters/stylish.js (100%) rename lib/{ => cli-engine}/formatters/table.js (100%) rename lib/{ => cli-engine}/formatters/tap.js (100%) rename lib/{ => cli-engine}/formatters/unix.js (100%) rename lib/{ => cli-engine}/formatters/visualstudio.js (100%) rename lib/{util => cli-engine}/hash.js (100%) rename lib/{util => cli-engine}/ignored-paths.js (100%) create mode 100644 lib/cli-engine/index.js rename lib/{util => cli-engine}/lint-result-cache.js (100%) rename lib/{ => cli-engine}/load-rules.js (100%) rename lib/{util => cli-engine}/naming.js (100%) rename lib/{util => cli-engine}/xml-escape.js (100%) rename lib/{config => init}/autoconfig.js (98%) rename lib/{config => init}/config-file.js (100%) rename lib/{config => init}/config-initializer.js (98%) rename lib/{config => init}/config-rule.js (99%) rename lib/{util => init}/npm-utils.js (99%) rename lib/{util => init}/source-code-utils.js (83%) rename lib/{util => linter}/apply-disable-directives.js (100%) rename lib/{ => linter}/code-path-analysis/code-path-analyzer.js (96%) rename lib/{ => linter}/code-path-analysis/code-path-segment.js (100%) rename lib/{ => linter}/code-path-analysis/code-path-state.js (100%) rename lib/{ => linter}/code-path-analysis/code-path.js (100%) rename lib/{ => linter}/code-path-analysis/debug-helpers.js (100%) rename lib/{ => linter}/code-path-analysis/fork-context.js (100%) rename lib/{ => linter}/code-path-analysis/id-generator.js (100%) rename lib/{util => linter}/config-comment-parser.js (98%) create mode 100644 lib/linter/index.js rename lib/{util => linter}/interpolate.js (100%) rename lib/{ => linter}/linter.js (97%) rename lib/{util => linter}/node-event-generator.js (99%) rename lib/{util => linter}/report-translator.js (100%) rename lib/{util => linter}/rule-fixer.js (100%) rename lib/{ => linter}/rules.js (96%) rename lib/{util => linter}/safe-emitter.js (100%) rename lib/{util => linter}/source-code-fixer.js (100%) rename lib/{util => linter}/timing.js (100%) create mode 100644 lib/rule-tester/index.js rename lib/{testers => rule-tester}/rule-tester.js (98%) create mode 100644 lib/rules/index.js rename lib/{util => rules/utils}/ast-utils.js (98%) rename lib/{util => rules/utils}/fix-tracker.js (98%) rename lib/{util => rules/utils}/keywords.js (100%) rename lib/{util => rules/utils}/lazy-loading-rule-map.js (100%) rename lib/{util => rules/utils}/patterns/letters.js (100%) rename lib/{util => rules/utils}/unicode/index.js (100%) rename lib/{util => rules/utils}/unicode/is-combining-character.js (100%) rename lib/{util => rules/utils}/unicode/is-emoji-modifier.js (100%) rename lib/{util => rules/utils}/unicode/is-regional-indicator-symbol.js (100%) rename lib/{util => rules/utils}/unicode/is-surrogate-pair.js (100%) rename lib/{util => shared}/ajv.js (100%) create mode 100644 lib/shared/ast-utils.js rename lib/{config => shared}/config-ops.js (100%) rename lib/{config => shared}/config-validator.js (97%) rename lib/{util => shared}/logging.js (100%) rename lib/{util => shared}/relative-module-resolver.js (100%) rename lib/{util => shared}/traverser.js (100%) rename lib/{util => shared}/types.js (100%) create mode 100644 lib/source-code/index.js rename lib/{util => source-code}/source-code.js (97%) rename lib/{ => source-code}/token-store/backward-token-comment-cursor.js (100%) rename lib/{ => source-code}/token-store/backward-token-cursor.js (100%) rename lib/{ => source-code}/token-store/cursor.js (100%) rename lib/{ => source-code}/token-store/cursors.js (100%) rename lib/{ => source-code}/token-store/decorative-cursor.js (100%) rename lib/{ => source-code}/token-store/filter-cursor.js (100%) rename lib/{ => source-code}/token-store/forward-token-comment-cursor.js (100%) rename lib/{ => source-code}/token-store/forward-token-cursor.js (100%) rename lib/{ => source-code}/token-store/index.js (99%) rename lib/{ => source-code}/token-store/limit-cursor.js (100%) rename lib/{ => source-code}/token-store/padded-token-cursor.js (100%) rename lib/{ => source-code}/token-store/skip-cursor.js (100%) rename lib/{ => source-code}/token-store/utils.js (100%) rename tests/lib/{ => cli-engine}/cli-engine.js (99%) rename tests/lib/{ => cli-engine}/formatters/checkstyle.js (98%) rename tests/lib/{ => cli-engine}/formatters/codeframe.js (99%) rename tests/lib/{ => cli-engine}/formatters/compact.js (98%) rename tests/lib/{ => cli-engine}/formatters/html.js (99%) rename tests/lib/{ => cli-engine}/formatters/jslint-xml.js (98%) rename tests/lib/{ => cli-engine}/formatters/json-with-metadata.js (96%) rename tests/lib/{ => cli-engine}/formatters/json.js (94%) rename tests/lib/{ => cli-engine}/formatters/junit.js (99%) rename tests/lib/{ => cli-engine}/formatters/stylish.js (99%) rename tests/lib/{ => cli-engine}/formatters/table.js (99%) rename tests/lib/{ => cli-engine}/formatters/tap.js (99%) rename tests/lib/{ => cli-engine}/formatters/unix.js (98%) rename tests/lib/{ => cli-engine}/formatters/visualstudio.js (98%) rename tests/lib/{util => cli-engine}/ignored-paths.js (99%) rename tests/lib/{util => cli-engine}/lint-result-cache.js (99%) rename tests/lib/{ => cli-engine}/load-rules.js (83%) rename tests/lib/{util => cli-engine}/naming.js (97%) rename tests/lib/{config => init}/autoconfig.js (99%) rename tests/lib/{config => init}/config-file.js (94%) rename tests/lib/{config => init}/config-initializer.js (98%) rename tests/lib/{config => init}/config-rule.js (98%) rename tests/lib/{util => init}/npm-utils.js (98%) rename tests/lib/{util => init}/source-code-utils.js (98%) rename tests/lib/{util => linter}/apply-disable-directives.js (99%) rename tests/lib/{ => linter}/code-path-analysis/code-path-analyzer.js (96%) rename tests/lib/{ => linter}/code-path-analysis/code-path.js (99%) rename tests/lib/{util => linter}/config-comment-parser.js (98%) rename tests/lib/{util => linter}/interpolate.js (91%) rename tests/lib/{ => linter}/linter.js (99%) rename tests/lib/{util => linter}/node-event-generator.js (98%) rename tests/lib/{util => linter}/report-translator.js (99%) rename tests/lib/{util => linter}/rule-fixer.js (98%) rename tests/lib/{ => linter}/rules.js (97%) rename tests/lib/{util => linter}/safe-emitter.js (94%) rename tests/lib/{util => linter}/source-code-fixer.js (99%) rename tests/lib/{testers => rule-tester}/no-test-runners.js (92%) rename tests/lib/{testers => rule-tester}/rule-tester.js (99%) rename tests/lib/{util => rules/utils}/ast-utils.js (99%) rename tests/lib/{util => rules/utils}/fix-tracker.js (94%) rename tests/lib/{config => shared}/config-ops.js (99%) rename tests/lib/{config => shared}/config-validator.js (99%) rename tests/lib/{util => shared}/traverser.js (97%) rename tests/lib/{util => source-code}/source-code.js (99%) rename tests/lib/{ => source-code}/token-store.js (99%) diff --git a/.eslintignore b/.eslintignore index e9b3570d8c3..49737ab8fd0 100644 --- a/.eslintignore +++ b/.eslintignore @@ -7,6 +7,6 @@ /tests/fixtures/** /tests/performance/** /tmp/** -/lib/util/unicode/is-combining-character.js +/lib/rules/utils/unicode/is-combining-character.js test.js !.eslintrc.js diff --git a/.eslintrc.js b/.eslintrc.js index ff213cf5f97..e57ac92af78 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,5 +1,14 @@ "use strict"; +const internalFiles = [ + "**/cli-engine/**/*", + "**/init/**/*", + "**/linter/**/*", + "**/rule-tester/**/*", + "**/rules/**/*", + "**/source-code/**/*" +]; + module.exports = { root: true, plugins: [ @@ -39,7 +48,7 @@ module.exports = { overrides: [ { files: ["lib/rules/*", "tools/internal-rules/*"], - excludedFiles: ["tools/internal-rules/index.js"], + excludedFiles: ["index.js"], rules: { "internal-rules/no-invalid-meta": "error", "internal-rules/consistent-docs-description": "error" @@ -49,17 +58,15 @@ module.exports = { * "internal-rules/consistent-meta-messages": "error" */ } - }, { - files: ["tools/internal-rules/*"], - rules: { - "node/no-unpublished-require": "off" - } - }, { + }, + { files: ["lib/rules/*"], + excludedFiles: ["index.js"], rules: { "internal-rules/consistent-docs-url": "error" } - }, { + }, + { files: ["tests/**/*"], env: { mocha: true }, rules: { @@ -68,6 +75,113 @@ module.exports = { message: "`assert.doesNotThrow()` should be replaced with a comment next to the code." }] } + }, + + // Restrict relative path imports + { + files: ["lib/*"], + rules: { + "no-restricted-modules": ["error", { + patterns: [ + ...internalFiles + ] + }] + } + }, + { + files: ["lib/cli-engine/**/*"], + rules: { + "no-restricted-modules": ["error", { + patterns: [ + ...internalFiles, + "**/init" + ] + }] + } + }, + { + files: ["lib/init/**/*"], + rules: { + "no-restricted-modules": ["error", { + patterns: [ + ...internalFiles, + "**/rule-tester" + ] + }] + } + }, + { + files: ["lib/linter/**/*"], + rules: { + "no-restricted-modules": ["error", { + patterns: [ + ...internalFiles, + "fs", + "**/cli-engine", + "**/init", + "**/rule-tester" + ] + }] + } + }, + { + files: ["lib/rules/**/*"], + rules: { + "no-restricted-modules": ["error", { + patterns: [ + ...internalFiles, + "fs", + "**/cli-engine", + "**/init", + "**/linter", + "**/rule-tester", + "**/source-code" + ] + }] + } + }, + { + files: ["lib/shared/**/*"], + rules: { + "no-restricted-modules": ["error", { + patterns: [ + ...internalFiles, + "**/cli-engine", + "**/init", + "**/linter", + "**/rule-tester", + "**/source-code" + ] + }] + } + }, + { + files: ["lib/source-code/**/*"], + rules: { + "no-restricted-modules": ["error", { + patterns: [ + ...internalFiles, + "fs", + "**/cli-engine", + "**/init", + "**/linter", + "**/rule-tester", + "**/rules" + ] + }] + } + }, + { + files: ["lib/rule-tester/**/*"], + rules: { + "no-restricted-modules": ["error", { + patterns: [ + ...internalFiles, + "**/cli-engine", + "**/init" + ] + }] + } } ] }; diff --git a/Makefile.js b/Makefile.js index f326faafbf0..9d0c74bf887 100644 --- a/Makefile.js +++ b/Makefile.js @@ -64,6 +64,7 @@ const NODE = "node ", // intentional extra space ESLINT = `${NODE} bin/eslint.js --report-unused-disable-directives `, // Files + RULE_FILES = glob.sync("lib/rules/*.js").filter(filePath => path.basename(filePath) !== "index.js"), JSON_FILES = find("conf/").filter(fileType("json")), MARKDOWN_FILES_ARRAY = find("docs/").concat(ls(".")).filter(fileType("md")), TEST_FILES = "\"tests/{bin,lib,tools}/**/*.js\"", @@ -119,10 +120,10 @@ function execSilent(cmd) { * @private */ function generateBlogPost(releaseInfo, prereleaseMajorVersion) { - const ruleList = ls("lib/rules") + const ruleList = RULE_FILES // Strip the .js extension - .map(ruleFileName => ruleFileName.replace(/\.js$/u, "")) + .map(ruleFileName => path.basename(ruleFileName, ".js")) /* * Sort by length descending. This ensures that rule names which are substrings of other rule names are not @@ -171,15 +172,14 @@ function generateFormatterExamples(formatterInfo, prereleaseVersion) { /** * Generate a doc page that lists all of the rules and links to them - * @param {string} basedir The directory in which to look for code. * @returns {void} */ -function generateRuleIndexPage(basedir) { +function generateRuleIndexPage() { const outputFile = "../eslint.github.io/_data/rules.yml", categoryList = "conf/category-list.json", categoriesData = JSON.parse(cat(path.resolve(categoryList))); - find(path.join(basedir, "/lib/rules/")).filter(fileType("js")) + RULE_FILES .map(filename => [filename, path.basename(filename, ".js")]) .sort((a, b) => a[1].localeCompare(b[1])) .forEach(pair => { @@ -792,10 +792,9 @@ target.checkRuleFiles = function() { echo("Validating rules"); const ruleTypes = require("./tools/rule-types.json"); - const ruleFiles = find("lib/rules/").filter(fileType("js")); let errors = 0; - ruleFiles.forEach(filename => { + RULE_FILES.forEach(filename => { const basename = path.basename(filename, ".js"); const docFilename = `docs/rules/${basename}.md`; @@ -847,11 +846,11 @@ target.checkRuleFiles = function() { } // check parity between rules index file and rules directory - const ruleIdsInIndex = require("./lib/built-in-rules-index"); + const ruleIdsInIndex = require("./lib/rules/index"); const ruleDef = ruleIdsInIndex.get(basename); if (!ruleDef) { - console.error(`Missing rule from index (./lib/built-in-rules-index.js): ${basename}. If you just added a new rule then add an entry for it in this file.`); + console.error(`Missing rule from index (./lib/rules/index.js): ${basename}. If you just added a new rule then add an entry for it in this file.`); errors++; } diff --git a/bin/eslint.js b/bin/eslint.js index e51121ec6af..1c41bafd245 100755 --- a/bin/eslint.js +++ b/bin/eslint.js @@ -65,7 +65,7 @@ if (useStdIn) { process.exitCode = cli.execute(process.argv, fs.readFileSync(STDIN_FILE_DESCRIPTOR, "utf8")); } else if (init) { - const configInit = require("../lib/config/config-initializer"); + const configInit = require("../lib/init/config-initializer"); configInit.initializeConfig().then(() => { process.exitCode = 0; diff --git a/conf/environments.js b/conf/environments.js index f404d0e1435..f77340cea27 100644 --- a/conf/environments.js +++ b/conf/environments.js @@ -14,7 +14,7 @@ const globals = require("globals"); // Public Interface //------------------------------------------------------------------------------ -/** @type {Map} */ +/** @type {Map} */ module.exports = new Map(Object.entries({ builtin: { globals: globals.es5 diff --git a/conf/eslint-all.js b/conf/eslint-all.js index 9df71073dbe..10c5304fd3f 100644 --- a/conf/eslint-all.js +++ b/conf/eslint-all.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const builtInRules = require("../lib/built-in-rules-index"); +const builtInRules = require("../lib/rules"); //------------------------------------------------------------------------------ // Helpers @@ -27,5 +27,5 @@ for (const [ruleId, rule] of builtInRules) { // Public Interface //------------------------------------------------------------------------------ -/** @type {import("../lib/util/types").ConfigData} */ +/** @type {import("../lib/shared/types").ConfigData} */ module.exports = { rules: allRules }; diff --git a/conf/eslint-recommended.js b/conf/eslint-recommended.js index 86f35bfddb5..7cc6e01652b 100644 --- a/conf/eslint-recommended.js +++ b/conf/eslint-recommended.js @@ -8,7 +8,7 @@ /* eslint sort-keys: ["error", "asc"] */ -/** @type {import("../lib/util/types").ConfigData} */ +/** @type {import("../lib/shared/types").ConfigData} */ module.exports = { rules: { "constructor-super": "error", diff --git a/docs/developer-guide/architecture.md b/docs/developer-guide/architecture.md index 2c7ae4419aa..1ea74bb7966 100644 --- a/docs/developer-guide/architecture.md +++ b/docs/developer-guide/architecture.md @@ -1,13 +1,18 @@ # Architecture +
dependency graph
+ At a high level, there are a few key parts to ESLint: * `bin/eslint.js` - this is the file that actually gets executed with the command line utility. It's a dumb wrapper that does nothing more than bootstrap ESLint, passing the command line arguments to `cli`. This is intentionally small so as not to require heavy testing. +* `lib/api.js` - this is the entry point of `require("eslint")`. This file exposes an object that contains public classes `Linter`, `CLIEngine`, `RuleTester`, and `SourceCode`. * `lib/cli.js` - this is the heart of the ESLint CLI. It takes an array of arguments and then uses `eslint` to execute the commands. By keeping this as a separate utility, it allows others to effectively call ESLint from within another Node.js program as if it were done on the command line. The main call is `cli.execute()`. This is also the part that does all the file reading, directory traversing, input, and output. -* `lib/linter.js` - this is the core Linter class that does code verifying based on configuration options. This file does no file I/O and does not interact with the `console` at all. For other Node.js programs that have JavaScript text to verify, they would be able to use this interface directly. -* `lib/api.js` - this exposes an object that contains Linter, CLIEngine, RuleTester, and SourceCode. -* `lib/testers/rule-tester.js` - this is a wrapper around Mocha, so that rules can be unit tested. This class lets us write consistently formatted tests for each rule that is implemented and be confident that each of the rules work. The RuleTester interface was modeled after Mocha and works with Mocha's global testing methods. RuleTester can also be modified to work with other testing frameworks. -* `lib/util/source-code.js` - this contains a SourceCode class that is used to represent the parsed source code. It takes in source code and the Program node of the AST representing the code. +* `lib/init/` - this module contains `--init` functionality that set up a configuration file for end users. +* `lib/cli-engine/` - this module is `CLIEngine` class that finds source code files and configuration files then does code verifying with the `Linter` class. This includes the loading logic of configuration files, parsers, plugins, and formatters. +* `lib/linter/` - this module is the core `Linter` class that does code verifying based on configuration options. This file does no file I/O and does not interact with the `console` at all. For other Node.js programs that have JavaScript text to verify, they would be able to use this interface directly. +* `lib/rule-tester/` - this module is `RuleTester` class that is a wrapper around Mocha so that rules can be unit tested. This class lets us write consistently formatted tests for each rule that is implemented and be confident that each of the rules work. The RuleTester interface was modeled after Mocha and works with Mocha's global testing methods. RuleTester can also be modified to work with other testing frameworks. +* `lib/source-code/` - this module is `SourceCode` class that is used to represent the parsed source code. It takes in source code and the Program node of the AST representing the code. +* `lib/rules/` - this contains built-in rules that verify source code. ## The `cli` object @@ -31,15 +36,14 @@ This object may not: ## The `CLIEngine` object -The `CLIEngine` type represents the core functionality of the CLI except that it reads nothing from the command line and doesn't output anything by default. Instead, it accepts many (but not all) of the arguments that are passed into the CLI. It reads both configuration and source files as well as managing the environment that is passed into the `eslint` object. +The `CLIEngine` type represents the core functionality of the CLI except that it reads nothing from the command line and doesn't output anything by default. Instead, it accepts many (but not all) of the arguments that are passed into the CLI. It reads both configuration and source files as well as managing the environment that is passed into the `Linter` object. The main method of the `CLIEngine` is `executeOnFiles()`, which accepts an array of file and directory names to run the linter on. This object's responsibilities include: -* Managing the execution environment for `eslint` +* Managing the execution environment for `Linter` * Reading from the file system -* Loading rule definitions * Reading configuration information from config files (including `.eslintrc` and `package.json`) This object may not: @@ -49,11 +53,11 @@ This object may not: * Output to the console * Use formatters -## The `eslint` object +## The `Linter` object -The main method of the `eslint` object is `verify()` and accepts two arguments: the source text to verify and a configuration object (the baked configuration of the given configuration file plus command line options). The method first parses the given text with `espree` (or whatever the configured parser is) and retrieves the AST. The AST is produced with both line/column and range locations which are useful for reporting location of issues and retrieving the source text related to an AST node, respectively. +The main method of the `Linter` object is `verify()` and accepts two arguments: the source text to verify and a configuration object (the baked configuration of the given configuration file plus command line options). The method first parses the given text with `espree` (or whatever the configured parser is) and retrieves the AST. The AST is produced with both line/column and range locations which are useful for reporting location of issues and retrieving the source text related to an AST node, respectively. -Once the AST is available, `estraverse` is used to traverse the AST from top to bottom. At each node, the `eslint` object emits an event that has the same name as the node type (i.e., "Identifier", "WithStatement", etc.). On the way back up the subtree, an event is emitted with the AST type name and suffixed with ":exit", such as "Identifier:exit" - this allows rules to take action both on the way down and on the way up in the traversal. Each event is emitted with the appropriate AST node available. +Once the AST is available, `estraverse` is used to traverse the AST from top to bottom. At each node, the `Linter` object emits an event that has the same name as the node type (i.e., "Identifier", "WithStatement", etc.). On the way back up the subtree, an event is emitted with the AST type name and suffixed with ":exit", such as "Identifier:exit" - this allows rules to take action both on the way down and on the way up in the traversal. Each event is emitted with the appropriate AST node available. This object's responsibilities include: diff --git a/docs/developer-guide/architecture/dependency.svg b/docs/developer-guide/architecture/dependency.svg new file mode 100644 index 00000000000..3b0c74c9b92 --- /dev/null +++ b/docs/developer-guide/architecture/dependency.svg @@ -0,0 +1,52 @@ +binlibeslint.jscli.jsapi.jsinitcli-enginelintersource-coderule-testerrules \ No newline at end of file diff --git a/karma.conf.js b/karma.conf.js index edfa612f7c7..dfc6bab4899 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -19,7 +19,7 @@ module.exports = function(config) { // list of files / patterns to load in the browser files: [ "build/eslint.js", - "tests/lib/linter.js" + "tests/lib/linter/linter.js" ], @@ -33,7 +33,7 @@ module.exports = function(config) { * available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor */ preprocessors: { - "tests/lib/linter.js": ["webpack"] + "tests/lib/linter/linter.js": ["webpack"] }, webpack: { mode: "none", diff --git a/lib/api.js b/lib/api.js index b521e5c8d25..40a5cc9fa5c 100644 --- a/lib/api.js +++ b/lib/api.js @@ -5,15 +5,19 @@ "use strict"; +const { CLIEngine } = require("./cli-engine"); const { Linter } = require("./linter"); +const { RuleTester } = require("./rule-tester"); +const { SourceCode } = require("./source-code"); module.exports = { Linter, - CLIEngine: require("./cli-engine").CLIEngine, - RuleTester: require("./testers/rule-tester"), - SourceCode: require("./util/source-code") + CLIEngine, + RuleTester, + SourceCode }; +// DOTO: remove deprecated API. let deprecatedLinterInstance = null; Object.defineProperty(module.exports, "linter", { diff --git a/lib/built-in-rules-index.js b/lib/built-in-rules-index.js deleted file mode 100644 index df321be9647..00000000000 --- a/lib/built-in-rules-index.js +++ /dev/null @@ -1,281 +0,0 @@ -/** - * @fileoverview Collects the built-in rules into a map structure so that they can be imported all at once and without - * using the file-system directly. - * @author Peter (Somogyvari) Metz - */ - -"use strict"; - -/* eslint sort-keys: ["error", "asc"] */ - -const { LazyLoadingRuleMap } = require("./util/lazy-loading-rule-map"); - -/** @type {ReadonlyMap} */ -module.exports = new LazyLoadingRuleMap(Object.entries({ - "accessor-pairs": () => require("./rules/accessor-pairs"), - "array-bracket-newline": () => require("./rules/array-bracket-newline"), - "array-bracket-spacing": () => require("./rules/array-bracket-spacing"), - "array-callback-return": () => require("./rules/array-callback-return"), - "array-element-newline": () => require("./rules/array-element-newline"), - "arrow-body-style": () => require("./rules/arrow-body-style"), - "arrow-parens": () => require("./rules/arrow-parens"), - "arrow-spacing": () => require("./rules/arrow-spacing"), - "block-scoped-var": () => require("./rules/block-scoped-var"), - "block-spacing": () => require("./rules/block-spacing"), - "brace-style": () => require("./rules/brace-style"), - "callback-return": () => require("./rules/callback-return"), - camelcase: () => require("./rules/camelcase"), - "capitalized-comments": () => require("./rules/capitalized-comments"), - "class-methods-use-this": () => require("./rules/class-methods-use-this"), - "comma-dangle": () => require("./rules/comma-dangle"), - "comma-spacing": () => require("./rules/comma-spacing"), - "comma-style": () => require("./rules/comma-style"), - complexity: () => require("./rules/complexity"), - "computed-property-spacing": () => require("./rules/computed-property-spacing"), - "consistent-return": () => require("./rules/consistent-return"), - "consistent-this": () => require("./rules/consistent-this"), - "constructor-super": () => require("./rules/constructor-super"), - curly: () => require("./rules/curly"), - "default-case": () => require("./rules/default-case"), - "dot-location": () => require("./rules/dot-location"), - "dot-notation": () => require("./rules/dot-notation"), - "eol-last": () => require("./rules/eol-last"), - eqeqeq: () => require("./rules/eqeqeq"), - "for-direction": () => require("./rules/for-direction"), - "func-call-spacing": () => require("./rules/func-call-spacing"), - "func-name-matching": () => require("./rules/func-name-matching"), - "func-names": () => require("./rules/func-names"), - "func-style": () => require("./rules/func-style"), - "function-paren-newline": () => require("./rules/function-paren-newline"), - "generator-star-spacing": () => require("./rules/generator-star-spacing"), - "getter-return": () => require("./rules/getter-return"), - "global-require": () => require("./rules/global-require"), - "guard-for-in": () => require("./rules/guard-for-in"), - "handle-callback-err": () => require("./rules/handle-callback-err"), - "id-blacklist": () => require("./rules/id-blacklist"), - "id-length": () => require("./rules/id-length"), - "id-match": () => require("./rules/id-match"), - "implicit-arrow-linebreak": () => require("./rules/implicit-arrow-linebreak"), - indent: () => require("./rules/indent"), - "indent-legacy": () => require("./rules/indent-legacy"), - "init-declarations": () => require("./rules/init-declarations"), - "jsx-quotes": () => require("./rules/jsx-quotes"), - "key-spacing": () => require("./rules/key-spacing"), - "keyword-spacing": () => require("./rules/keyword-spacing"), - "line-comment-position": () => require("./rules/line-comment-position"), - "linebreak-style": () => require("./rules/linebreak-style"), - "lines-around-comment": () => require("./rules/lines-around-comment"), - "lines-around-directive": () => require("./rules/lines-around-directive"), - "lines-between-class-members": () => require("./rules/lines-between-class-members"), - "max-classes-per-file": () => require("./rules/max-classes-per-file"), - "max-depth": () => require("./rules/max-depth"), - "max-len": () => require("./rules/max-len"), - "max-lines": () => require("./rules/max-lines"), - "max-lines-per-function": () => require("./rules/max-lines-per-function"), - "max-nested-callbacks": () => require("./rules/max-nested-callbacks"), - "max-params": () => require("./rules/max-params"), - "max-statements": () => require("./rules/max-statements"), - "max-statements-per-line": () => require("./rules/max-statements-per-line"), - "multiline-comment-style": () => require("./rules/multiline-comment-style"), - "multiline-ternary": () => require("./rules/multiline-ternary"), - "new-cap": () => require("./rules/new-cap"), - "new-parens": () => require("./rules/new-parens"), - "newline-after-var": () => require("./rules/newline-after-var"), - "newline-before-return": () => require("./rules/newline-before-return"), - "newline-per-chained-call": () => require("./rules/newline-per-chained-call"), - "no-alert": () => require("./rules/no-alert"), - "no-array-constructor": () => require("./rules/no-array-constructor"), - "no-async-promise-executor": () => require("./rules/no-async-promise-executor"), - "no-await-in-loop": () => require("./rules/no-await-in-loop"), - "no-bitwise": () => require("./rules/no-bitwise"), - "no-buffer-constructor": () => require("./rules/no-buffer-constructor"), - "no-caller": () => require("./rules/no-caller"), - "no-case-declarations": () => require("./rules/no-case-declarations"), - "no-catch-shadow": () => require("./rules/no-catch-shadow"), - "no-class-assign": () => require("./rules/no-class-assign"), - "no-compare-neg-zero": () => require("./rules/no-compare-neg-zero"), - "no-cond-assign": () => require("./rules/no-cond-assign"), - "no-confusing-arrow": () => require("./rules/no-confusing-arrow"), - "no-console": () => require("./rules/no-console"), - "no-const-assign": () => require("./rules/no-const-assign"), - "no-constant-condition": () => require("./rules/no-constant-condition"), - "no-continue": () => require("./rules/no-continue"), - "no-control-regex": () => require("./rules/no-control-regex"), - "no-debugger": () => require("./rules/no-debugger"), - "no-delete-var": () => require("./rules/no-delete-var"), - "no-div-regex": () => require("./rules/no-div-regex"), - "no-dupe-args": () => require("./rules/no-dupe-args"), - "no-dupe-class-members": () => require("./rules/no-dupe-class-members"), - "no-dupe-keys": () => require("./rules/no-dupe-keys"), - "no-duplicate-case": () => require("./rules/no-duplicate-case"), - "no-duplicate-imports": () => require("./rules/no-duplicate-imports"), - "no-else-return": () => require("./rules/no-else-return"), - "no-empty": () => require("./rules/no-empty"), - "no-empty-character-class": () => require("./rules/no-empty-character-class"), - "no-empty-function": () => require("./rules/no-empty-function"), - "no-empty-pattern": () => require("./rules/no-empty-pattern"), - "no-eq-null": () => require("./rules/no-eq-null"), - "no-eval": () => require("./rules/no-eval"), - "no-ex-assign": () => require("./rules/no-ex-assign"), - "no-extend-native": () => require("./rules/no-extend-native"), - "no-extra-bind": () => require("./rules/no-extra-bind"), - "no-extra-boolean-cast": () => require("./rules/no-extra-boolean-cast"), - "no-extra-label": () => require("./rules/no-extra-label"), - "no-extra-parens": () => require("./rules/no-extra-parens"), - "no-extra-semi": () => require("./rules/no-extra-semi"), - "no-fallthrough": () => require("./rules/no-fallthrough"), - "no-floating-decimal": () => require("./rules/no-floating-decimal"), - "no-func-assign": () => require("./rules/no-func-assign"), - "no-global-assign": () => require("./rules/no-global-assign"), - "no-implicit-coercion": () => require("./rules/no-implicit-coercion"), - "no-implicit-globals": () => require("./rules/no-implicit-globals"), - "no-implied-eval": () => require("./rules/no-implied-eval"), - "no-inline-comments": () => require("./rules/no-inline-comments"), - "no-inner-declarations": () => require("./rules/no-inner-declarations"), - "no-invalid-regexp": () => require("./rules/no-invalid-regexp"), - "no-invalid-this": () => require("./rules/no-invalid-this"), - "no-irregular-whitespace": () => require("./rules/no-irregular-whitespace"), - "no-iterator": () => require("./rules/no-iterator"), - "no-label-var": () => require("./rules/no-label-var"), - "no-labels": () => require("./rules/no-labels"), - "no-lone-blocks": () => require("./rules/no-lone-blocks"), - "no-lonely-if": () => require("./rules/no-lonely-if"), - "no-loop-func": () => require("./rules/no-loop-func"), - "no-magic-numbers": () => require("./rules/no-magic-numbers"), - "no-misleading-character-class": () => require("./rules/no-misleading-character-class"), - "no-mixed-operators": () => require("./rules/no-mixed-operators"), - "no-mixed-requires": () => require("./rules/no-mixed-requires"), - "no-mixed-spaces-and-tabs": () => require("./rules/no-mixed-spaces-and-tabs"), - "no-multi-assign": () => require("./rules/no-multi-assign"), - "no-multi-spaces": () => require("./rules/no-multi-spaces"), - "no-multi-str": () => require("./rules/no-multi-str"), - "no-multiple-empty-lines": () => require("./rules/no-multiple-empty-lines"), - "no-native-reassign": () => require("./rules/no-native-reassign"), - "no-negated-condition": () => require("./rules/no-negated-condition"), - "no-negated-in-lhs": () => require("./rules/no-negated-in-lhs"), - "no-nested-ternary": () => require("./rules/no-nested-ternary"), - "no-new": () => require("./rules/no-new"), - "no-new-func": () => require("./rules/no-new-func"), - "no-new-object": () => require("./rules/no-new-object"), - "no-new-require": () => require("./rules/no-new-require"), - "no-new-symbol": () => require("./rules/no-new-symbol"), - "no-new-wrappers": () => require("./rules/no-new-wrappers"), - "no-obj-calls": () => require("./rules/no-obj-calls"), - "no-octal": () => require("./rules/no-octal"), - "no-octal-escape": () => require("./rules/no-octal-escape"), - "no-param-reassign": () => require("./rules/no-param-reassign"), - "no-path-concat": () => require("./rules/no-path-concat"), - "no-plusplus": () => require("./rules/no-plusplus"), - "no-process-env": () => require("./rules/no-process-env"), - "no-process-exit": () => require("./rules/no-process-exit"), - "no-proto": () => require("./rules/no-proto"), - "no-prototype-builtins": () => require("./rules/no-prototype-builtins"), - "no-redeclare": () => require("./rules/no-redeclare"), - "no-regex-spaces": () => require("./rules/no-regex-spaces"), - "no-restricted-globals": () => require("./rules/no-restricted-globals"), - "no-restricted-imports": () => require("./rules/no-restricted-imports"), - "no-restricted-modules": () => require("./rules/no-restricted-modules"), - "no-restricted-properties": () => require("./rules/no-restricted-properties"), - "no-restricted-syntax": () => require("./rules/no-restricted-syntax"), - "no-return-assign": () => require("./rules/no-return-assign"), - "no-return-await": () => require("./rules/no-return-await"), - "no-script-url": () => require("./rules/no-script-url"), - "no-self-assign": () => require("./rules/no-self-assign"), - "no-self-compare": () => require("./rules/no-self-compare"), - "no-sequences": () => require("./rules/no-sequences"), - "no-shadow": () => require("./rules/no-shadow"), - "no-shadow-restricted-names": () => require("./rules/no-shadow-restricted-names"), - "no-spaced-func": () => require("./rules/no-spaced-func"), - "no-sparse-arrays": () => require("./rules/no-sparse-arrays"), - "no-sync": () => require("./rules/no-sync"), - "no-tabs": () => require("./rules/no-tabs"), - "no-template-curly-in-string": () => require("./rules/no-template-curly-in-string"), - "no-ternary": () => require("./rules/no-ternary"), - "no-this-before-super": () => require("./rules/no-this-before-super"), - "no-throw-literal": () => require("./rules/no-throw-literal"), - "no-trailing-spaces": () => require("./rules/no-trailing-spaces"), - "no-undef": () => require("./rules/no-undef"), - "no-undef-init": () => require("./rules/no-undef-init"), - "no-undefined": () => require("./rules/no-undefined"), - "no-underscore-dangle": () => require("./rules/no-underscore-dangle"), - "no-unexpected-multiline": () => require("./rules/no-unexpected-multiline"), - "no-unmodified-loop-condition": () => require("./rules/no-unmodified-loop-condition"), - "no-unneeded-ternary": () => require("./rules/no-unneeded-ternary"), - "no-unreachable": () => require("./rules/no-unreachable"), - "no-unsafe-finally": () => require("./rules/no-unsafe-finally"), - "no-unsafe-negation": () => require("./rules/no-unsafe-negation"), - "no-unused-expressions": () => require("./rules/no-unused-expressions"), - "no-unused-labels": () => require("./rules/no-unused-labels"), - "no-unused-vars": () => require("./rules/no-unused-vars"), - "no-use-before-define": () => require("./rules/no-use-before-define"), - "no-useless-call": () => require("./rules/no-useless-call"), - "no-useless-catch": () => require("./rules/no-useless-catch"), - "no-useless-computed-key": () => require("./rules/no-useless-computed-key"), - "no-useless-concat": () => require("./rules/no-useless-concat"), - "no-useless-constructor": () => require("./rules/no-useless-constructor"), - "no-useless-escape": () => require("./rules/no-useless-escape"), - "no-useless-rename": () => require("./rules/no-useless-rename"), - "no-useless-return": () => require("./rules/no-useless-return"), - "no-var": () => require("./rules/no-var"), - "no-void": () => require("./rules/no-void"), - "no-warning-comments": () => require("./rules/no-warning-comments"), - "no-whitespace-before-property": () => require("./rules/no-whitespace-before-property"), - "no-with": () => require("./rules/no-with"), - "nonblock-statement-body-position": () => require("./rules/nonblock-statement-body-position"), - "object-curly-newline": () => require("./rules/object-curly-newline"), - "object-curly-spacing": () => require("./rules/object-curly-spacing"), - "object-property-newline": () => require("./rules/object-property-newline"), - "object-shorthand": () => require("./rules/object-shorthand"), - "one-var": () => require("./rules/one-var"), - "one-var-declaration-per-line": () => require("./rules/one-var-declaration-per-line"), - "operator-assignment": () => require("./rules/operator-assignment"), - "operator-linebreak": () => require("./rules/operator-linebreak"), - "padded-blocks": () => require("./rules/padded-blocks"), - "padding-line-between-statements": () => require("./rules/padding-line-between-statements"), - "prefer-arrow-callback": () => require("./rules/prefer-arrow-callback"), - "prefer-const": () => require("./rules/prefer-const"), - "prefer-destructuring": () => require("./rules/prefer-destructuring"), - "prefer-named-capture-group": () => require("./rules/prefer-named-capture-group"), - "prefer-numeric-literals": () => require("./rules/prefer-numeric-literals"), - "prefer-object-spread": () => require("./rules/prefer-object-spread"), - "prefer-promise-reject-errors": () => require("./rules/prefer-promise-reject-errors"), - "prefer-reflect": () => require("./rules/prefer-reflect"), - "prefer-rest-params": () => require("./rules/prefer-rest-params"), - "prefer-spread": () => require("./rules/prefer-spread"), - "prefer-template": () => require("./rules/prefer-template"), - "quote-props": () => require("./rules/quote-props"), - quotes: () => require("./rules/quotes"), - radix: () => require("./rules/radix"), - "require-atomic-updates": () => require("./rules/require-atomic-updates"), - "require-await": () => require("./rules/require-await"), - "require-jsdoc": () => require("./rules/require-jsdoc"), - "require-unicode-regexp": () => require("./rules/require-unicode-regexp"), - "require-yield": () => require("./rules/require-yield"), - "rest-spread-spacing": () => require("./rules/rest-spread-spacing"), - semi: () => require("./rules/semi"), - "semi-spacing": () => require("./rules/semi-spacing"), - "semi-style": () => require("./rules/semi-style"), - "sort-imports": () => require("./rules/sort-imports"), - "sort-keys": () => require("./rules/sort-keys"), - "sort-vars": () => require("./rules/sort-vars"), - "space-before-blocks": () => require("./rules/space-before-blocks"), - "space-before-function-paren": () => require("./rules/space-before-function-paren"), - "space-in-parens": () => require("./rules/space-in-parens"), - "space-infix-ops": () => require("./rules/space-infix-ops"), - "space-unary-ops": () => require("./rules/space-unary-ops"), - "spaced-comment": () => require("./rules/spaced-comment"), - strict: () => require("./rules/strict"), - "switch-colon-spacing": () => require("./rules/switch-colon-spacing"), - "symbol-description": () => require("./rules/symbol-description"), - "template-curly-spacing": () => require("./rules/template-curly-spacing"), - "template-tag-spacing": () => require("./rules/template-tag-spacing"), - "unicode-bom": () => require("./rules/unicode-bom"), - "use-isnan": () => require("./rules/use-isnan"), - "valid-jsdoc": () => require("./rules/valid-jsdoc"), - "valid-typeof": () => require("./rules/valid-typeof"), - "vars-on-top": () => require("./rules/vars-on-top"), - "wrap-iife": () => require("./rules/wrap-iife"), - "wrap-regex": () => require("./rules/wrap-regex"), - "yield-star-spacing": () => require("./rules/yield-star-spacing"), - yoda: () => require("./rules/yoda") -})); diff --git a/lib/cli-engine/cascading-config-array-factory.js b/lib/cli-engine/cascading-config-array-factory.js index 27b2dd15b0e..7d162e5c048 100644 --- a/lib/cli-engine/cascading-config-array-factory.js +++ b/lib/cli-engine/cascading-config-array-factory.js @@ -25,10 +25,10 @@ const os = require("os"); const path = require("path"); -const { validateConfigArray } = require("../config/config-validator"); +const { validateConfigArray } = require("../shared/config-validator"); const { ConfigArrayFactory } = require("./config-array-factory"); const { ConfigDependency } = require("./config-array"); -const loadRules = require("../load-rules"); +const loadRules = require("./load-rules"); const debug = require("debug")("eslint:cascading-config-array-factory"); //------------------------------------------------------------------------------ @@ -36,9 +36,9 @@ const debug = require("debug")("eslint:cascading-config-array-factory"); //------------------------------------------------------------------------------ // Define types for VSCode IntelliSense. -/** @typedef {import("../util/types").ConfigData} ConfigData */ -/** @typedef {import("../util/types").Parser} Parser */ -/** @typedef {import("../util/types").Plugin} Plugin */ +/** @typedef {import("../shared/types").ConfigData} ConfigData */ +/** @typedef {import("../shared/types").Parser} Parser */ +/** @typedef {import("../shared/types").Plugin} Plugin */ /** @typedef {ReturnType} ConfigArray */ /** diff --git a/lib/cli-engine.js b/lib/cli-engine/cli-engine.js similarity index 96% rename from lib/cli-engine.js rename to lib/cli-engine/cli-engine.js index d0d3bd5662f..797125962df 100644 --- a/lib/cli-engine.js +++ b/lib/cli-engine/cli-engine.js @@ -17,19 +17,19 @@ const fs = require("fs"); const path = require("path"); -const defaultOptions = require("../conf/default-cli-options"); -const pkg = require("../package.json"); -const { CascadingConfigArrayFactory } = require("./cli-engine/cascading-config-array-factory"); -const { getUsedExtractedConfigs } = require("./cli-engine/config-array"); -const { FileEnumerator } = require("./cli-engine/file-enumerator"); -const ConfigOps = require("./config/config-ops"); -const hash = require("./util/hash"); -const { IgnoredPaths } = require("./util/ignored-paths"); -const LintResultCache = require("./util/lint-result-cache"); -const naming = require("./util/naming"); -const ModuleResolver = require("./util/relative-module-resolver"); -const builtInRules = require("./built-in-rules-index"); -const { Linter } = require("./linter"); +const defaultOptions = require("../../conf/default-cli-options"); +const pkg = require("../../package.json"); +const ConfigOps = require("../shared/config-ops"); +const ModuleResolver = require("../shared/relative-module-resolver"); +const { Linter } = require("../linter"); +const builtInRules = require("../rules"); +const { CascadingConfigArrayFactory } = require("./cascading-config-array-factory"); +const { getUsedExtractedConfigs } = require("./config-array"); +const { FileEnumerator } = require("./file-enumerator"); +const hash = require("./hash"); +const { IgnoredPaths } = require("./ignored-paths"); +const LintResultCache = require("./lint-result-cache"); +const naming = require("./naming"); const debug = require("debug")("eslint:cli-engine"); const validFixTypes = new Set(["problem", "suggestion", "layout"]); @@ -39,12 +39,12 @@ const validFixTypes = new Set(["problem", "suggestion", "layout"]); //------------------------------------------------------------------------------ // For VSCode IntelliSense -/** @typedef {import("./util/types").ConfigData} ConfigData */ -/** @typedef {import("./util/types").LintMessage} LintMessage */ -/** @typedef {import("./util/types").ParserOptions} ParserOptions */ -/** @typedef {import("./util/types").Plugin} Plugin */ -/** @typedef {import("./util/types").RuleConf} RuleConf */ -/** @typedef {import("./util/types").Rule} Rule */ +/** @typedef {import("../shared/types").ConfigData} ConfigData */ +/** @typedef {import("../shared/types").LintMessage} LintMessage */ +/** @typedef {import("../shared/types").ParserOptions} ParserOptions */ +/** @typedef {import("../shared/types").Plugin} Plugin */ +/** @typedef {import("../shared/types").RuleConf} RuleConf */ +/** @typedef {import("../shared/types").Rule} Rule */ /** @typedef {ReturnType} ConfigArray */ /** @typedef {ReturnType} ExtractedConfig */ diff --git a/lib/cli-engine/config-array-factory.js b/lib/cli-engine/config-array-factory.js index 1bd314850d5..de7b9acbfeb 100644 --- a/lib/cli-engine/config-array-factory.js +++ b/lib/cli-engine/config-array-factory.js @@ -37,10 +37,10 @@ const fs = require("fs"); const path = require("path"); const importFresh = require("import-fresh"); const stripComments = require("strip-json-comments"); -const { validateConfigSchema } = require("../config/config-validator"); +const { validateConfigSchema } = require("../shared/config-validator"); +const ModuleResolver = require("../shared/relative-module-resolver"); const { ConfigArray, ConfigDependency, OverrideTester } = require("./config-array"); -const ModuleResolver = require("../util/relative-module-resolver"); -const naming = require("../util/naming"); +const naming = require("./naming"); const debug = require("debug")("eslint:config-array-factory"); //------------------------------------------------------------------------------ @@ -59,10 +59,10 @@ const configFilenames = [ ]; // Define types for VSCode IntelliSense. -/** @typedef {import("../util/types").ConfigData} ConfigData */ -/** @typedef {import("../util/types").OverrideConfigData} OverrideConfigData */ -/** @typedef {import("../util/types").Parser} Parser */ -/** @typedef {import("../util/types").Plugin} Plugin */ +/** @typedef {import("../shared/types").ConfigData} ConfigData */ +/** @typedef {import("../shared/types").OverrideConfigData} OverrideConfigData */ +/** @typedef {import("../shared/types").Parser} Parser */ +/** @typedef {import("../shared/types").Plugin} Plugin */ /** @typedef {import("./config-array/config-dependency").DependentParser} DependentParser */ /** @typedef {import("./config-array/config-dependency").DependentPlugin} DependentPlugin */ /** @typedef {ConfigArray[0]} ConfigArrayElement */ diff --git a/lib/cli-engine/config-array/config-array.js b/lib/cli-engine/config-array/config-array.js index 60399355ce9..d85fc94bf14 100644 --- a/lib/cli-engine/config-array/config-array.js +++ b/lib/cli-engine/config-array/config-array.js @@ -37,12 +37,12 @@ const { ExtractedConfig } = require("./extracted-config"); //------------------------------------------------------------------------------ // Define types for VSCode IntelliSense. -/** @typedef {import("../../util/types").Environment} Environment */ -/** @typedef {import("../../util/types").GlobalConf} GlobalConf */ -/** @typedef {import("../../util/types").RuleConf} RuleConf */ -/** @typedef {import("../../util/types").Rule} Rule */ -/** @typedef {import("../../util/types").Plugin} Plugin */ -/** @typedef {import("../../util/types").Processor} Processor */ +/** @typedef {import("../../shared/types").Environment} Environment */ +/** @typedef {import("../../shared/types").GlobalConf} GlobalConf */ +/** @typedef {import("../../shared/types").RuleConf} RuleConf */ +/** @typedef {import("../../shared/types").Rule} Rule */ +/** @typedef {import("../../shared/types").Plugin} Plugin */ +/** @typedef {import("../../shared/types").Processor} Processor */ /** @typedef {import("./config-dependency").DependentParser} DependentParser */ /** @typedef {import("./config-dependency").DependentPlugin} DependentPlugin */ /** @typedef {import("./override-tester")["OverrideTester"]} OverrideTester */ diff --git a/lib/cli-engine/config-array/config-dependency.js b/lib/cli-engine/config-array/config-dependency.js index 76189a7d17a..8db9ff00c5c 100644 --- a/lib/cli-engine/config-array/config-dependency.js +++ b/lib/cli-engine/config-array/config-dependency.js @@ -108,7 +108,7 @@ class ConfigDependency { } } -/** @typedef {ConfigDependency} DependentParser */ -/** @typedef {ConfigDependency} DependentPlugin */ +/** @typedef {ConfigDependency} DependentParser */ +/** @typedef {ConfigDependency} DependentPlugin */ module.exports = { ConfigDependency }; diff --git a/lib/cli-engine/config-array/extracted-config.js b/lib/cli-engine/config-array/extracted-config.js index 930488e8f83..377cc0fa915 100644 --- a/lib/cli-engine/config-array/extracted-config.js +++ b/lib/cli-engine/config-array/extracted-config.js @@ -17,9 +17,9 @@ "use strict"; // For VSCode intellisense -/** @typedef {import("../../util/types").ConfigData} ConfigData */ -/** @typedef {import("../../util/types").GlobalConf} GlobalConf */ -/** @typedef {import("../../util/types").SeverityConf} SeverityConf */ +/** @typedef {import("../../shared/types").ConfigData} ConfigData */ +/** @typedef {import("../../shared/types").GlobalConf} GlobalConf */ +/** @typedef {import("../../shared/types").SeverityConf} SeverityConf */ /** @typedef {import("./config-dependency").DependentParser} DependentParser */ /** @typedef {import("./config-dependency").DependentPlugin} DependentPlugin */ diff --git a/lib/cli-engine/file-enumerator.js b/lib/cli-engine/file-enumerator.js index 2cb0fc6ea45..7e160abebcb 100644 --- a/lib/cli-engine/file-enumerator.js +++ b/lib/cli-engine/file-enumerator.js @@ -41,7 +41,7 @@ const isGlob = require("is-glob"); const { escapeRegExp } = require("lodash"); const { Minimatch } = require("minimatch"); const { CascadingConfigArrayFactory } = require("./cascading-config-array-factory"); -const { IgnoredPaths } = require("../util/ignored-paths"); +const { IgnoredPaths } = require("./ignored-paths"); const debug = require("debug")("eslint:file-enumerator"); //------------------------------------------------------------------------------ diff --git a/lib/formatters/checkstyle.js b/lib/cli-engine/formatters/checkstyle.js similarity index 97% rename from lib/formatters/checkstyle.js rename to lib/cli-engine/formatters/checkstyle.js index c807871930b..ba4d1b5b3ec 100644 --- a/lib/formatters/checkstyle.js +++ b/lib/cli-engine/formatters/checkstyle.js @@ -4,7 +4,7 @@ */ "use strict"; -const xmlEscape = require("../util/xml-escape"); +const xmlEscape = require("../xml-escape"); //------------------------------------------------------------------------------ // Helper Functions diff --git a/lib/formatters/codeframe.js b/lib/cli-engine/formatters/codeframe.js similarity index 100% rename from lib/formatters/codeframe.js rename to lib/cli-engine/formatters/codeframe.js diff --git a/lib/formatters/compact.js b/lib/cli-engine/formatters/compact.js similarity index 100% rename from lib/formatters/compact.js rename to lib/cli-engine/formatters/compact.js diff --git a/lib/formatters/html-template-message.html b/lib/cli-engine/formatters/html-template-message.html similarity index 100% rename from lib/formatters/html-template-message.html rename to lib/cli-engine/formatters/html-template-message.html diff --git a/lib/formatters/html-template-page.html b/lib/cli-engine/formatters/html-template-page.html similarity index 100% rename from lib/formatters/html-template-page.html rename to lib/cli-engine/formatters/html-template-page.html diff --git a/lib/formatters/html-template-result.html b/lib/cli-engine/formatters/html-template-result.html similarity index 100% rename from lib/formatters/html-template-result.html rename to lib/cli-engine/formatters/html-template-result.html diff --git a/lib/formatters/html.js b/lib/cli-engine/formatters/html.js similarity index 100% rename from lib/formatters/html.js rename to lib/cli-engine/formatters/html.js diff --git a/lib/formatters/jslint-xml.js b/lib/cli-engine/formatters/jslint-xml.js similarity index 95% rename from lib/formatters/jslint-xml.js rename to lib/cli-engine/formatters/jslint-xml.js index 14743430d8f..0ca1cbaed1a 100644 --- a/lib/formatters/jslint-xml.js +++ b/lib/cli-engine/formatters/jslint-xml.js @@ -4,7 +4,7 @@ */ "use strict"; -const xmlEscape = require("../util/xml-escape"); +const xmlEscape = require("../xml-escape"); //------------------------------------------------------------------------------ // Public Interface diff --git a/lib/formatters/json-with-metadata.js b/lib/cli-engine/formatters/json-with-metadata.js similarity index 100% rename from lib/formatters/json-with-metadata.js rename to lib/cli-engine/formatters/json-with-metadata.js diff --git a/lib/formatters/json.js b/lib/cli-engine/formatters/json.js similarity index 100% rename from lib/formatters/json.js rename to lib/cli-engine/formatters/json.js diff --git a/lib/formatters/junit.js b/lib/cli-engine/formatters/junit.js similarity index 97% rename from lib/formatters/junit.js rename to lib/cli-engine/formatters/junit.js index 77d548f380e..c12736751d3 100644 --- a/lib/formatters/junit.js +++ b/lib/cli-engine/formatters/junit.js @@ -4,7 +4,7 @@ */ "use strict"; -const xmlEscape = require("../util/xml-escape"); +const xmlEscape = require("../xml-escape"); //------------------------------------------------------------------------------ // Helper Functions diff --git a/lib/formatters/stylish.js b/lib/cli-engine/formatters/stylish.js similarity index 100% rename from lib/formatters/stylish.js rename to lib/cli-engine/formatters/stylish.js diff --git a/lib/formatters/table.js b/lib/cli-engine/formatters/table.js similarity index 100% rename from lib/formatters/table.js rename to lib/cli-engine/formatters/table.js diff --git a/lib/formatters/tap.js b/lib/cli-engine/formatters/tap.js similarity index 100% rename from lib/formatters/tap.js rename to lib/cli-engine/formatters/tap.js diff --git a/lib/formatters/unix.js b/lib/cli-engine/formatters/unix.js similarity index 100% rename from lib/formatters/unix.js rename to lib/cli-engine/formatters/unix.js diff --git a/lib/formatters/visualstudio.js b/lib/cli-engine/formatters/visualstudio.js similarity index 100% rename from lib/formatters/visualstudio.js rename to lib/cli-engine/formatters/visualstudio.js diff --git a/lib/util/hash.js b/lib/cli-engine/hash.js similarity index 100% rename from lib/util/hash.js rename to lib/cli-engine/hash.js diff --git a/lib/util/ignored-paths.js b/lib/cli-engine/ignored-paths.js similarity index 100% rename from lib/util/ignored-paths.js rename to lib/cli-engine/ignored-paths.js diff --git a/lib/cli-engine/index.js b/lib/cli-engine/index.js new file mode 100644 index 00000000000..52e45a6d791 --- /dev/null +++ b/lib/cli-engine/index.js @@ -0,0 +1,7 @@ +"use strict"; + +const { CLIEngine } = require("./cli-engine"); + +module.exports = { + CLIEngine +}; diff --git a/lib/util/lint-result-cache.js b/lib/cli-engine/lint-result-cache.js similarity index 100% rename from lib/util/lint-result-cache.js rename to lib/cli-engine/lint-result-cache.js diff --git a/lib/load-rules.js b/lib/cli-engine/load-rules.js similarity index 100% rename from lib/load-rules.js rename to lib/cli-engine/load-rules.js diff --git a/lib/util/naming.js b/lib/cli-engine/naming.js similarity index 100% rename from lib/util/naming.js rename to lib/cli-engine/naming.js diff --git a/lib/util/xml-escape.js b/lib/cli-engine/xml-escape.js similarity index 100% rename from lib/util/xml-escape.js rename to lib/cli-engine/xml-escape.js diff --git a/lib/cli.js b/lib/cli.js index 1bec4b3d941..c34545544b1 100644 --- a/lib/cli.js +++ b/lib/cli.js @@ -17,10 +17,10 @@ const fs = require("fs"), path = require("path"), - options = require("./options"), - CLIEngine = require("./cli-engine").CLIEngine, mkdirp = require("mkdirp"), - log = require("./util/logging"); + { CLIEngine } = require("./cli-engine"), + options = require("./options"), + log = require("./shared/logging"); const debug = require("debug")("eslint:cli"); diff --git a/lib/config/autoconfig.js b/lib/init/autoconfig.js similarity index 98% rename from lib/config/autoconfig.js rename to lib/init/autoconfig.js index 9c38c244951..19c4986c31b 100644 --- a/lib/config/autoconfig.js +++ b/lib/init/autoconfig.js @@ -10,10 +10,10 @@ //------------------------------------------------------------------------------ const lodash = require("lodash"), + recConfig = require("../../conf/eslint-recommended"), + ConfigOps = require("../shared/config-ops"), { Linter } = require("../linter"), - configRule = require("./config-rule"), - ConfigOps = require("./config-ops"), - recConfig = require("../../conf/eslint-recommended"); + configRule = require("./config-rule"); const debug = require("debug")("eslint:autoconfig"); const linter = new Linter(); diff --git a/lib/config/config-file.js b/lib/init/config-file.js similarity index 100% rename from lib/config/config-file.js rename to lib/init/config-file.js diff --git a/lib/config/config-initializer.js b/lib/init/config-initializer.js similarity index 98% rename from lib/config/config-initializer.js rename to lib/init/config-initializer.js index 946df08f2f8..4d52377d267 100644 --- a/lib/config/config-initializer.js +++ b/lib/init/config-initializer.js @@ -15,14 +15,14 @@ const util = require("util"), inquirer = require("inquirer"), ProgressBar = require("progress"), semver = require("semver"), + recConfig = require("../../conf/eslint-recommended"), + ConfigOps = require("../shared/config-ops"), + log = require("../shared/logging"), + ModuleResolver = require("../shared/relative-module-resolver"), autoconfig = require("./autoconfig.js"), ConfigFile = require("./config-file"), - ConfigOps = require("./config-ops"), - { getSourceCodeOfFiles } = require("../util/source-code-utils"), - ModuleResolver = require("../util/relative-module-resolver"), - npmUtils = require("../util/npm-utils"), - recConfig = require("../../conf/eslint-recommended"), - log = require("../util/logging"); + npmUtils = require("./npm-utils"), + { getSourceCodeOfFiles } = require("./source-code-utils"); const debug = require("debug")("eslint:config-initializer"); diff --git a/lib/config/config-rule.js b/lib/init/config-rule.js similarity index 99% rename from lib/config/config-rule.js rename to lib/init/config-rule.js index 858f4dacb09..fbe9b779ab7 100644 --- a/lib/config/config-rule.js +++ b/lib/init/config-rule.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const builtInRules = require("../built-in-rules-index"); +const builtInRules = require("../rules"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/util/npm-utils.js b/lib/init/npm-utils.js similarity index 99% rename from lib/util/npm-utils.js rename to lib/init/npm-utils.js index ddf8f24cc76..26e78406fdc 100644 --- a/lib/util/npm-utils.js +++ b/lib/init/npm-utils.js @@ -12,7 +12,7 @@ const fs = require("fs"), spawn = require("cross-spawn"), path = require("path"), - log = require("./logging"); + log = require("../shared/logging"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/util/source-code-utils.js b/lib/init/source-code-utils.js similarity index 83% rename from lib/util/source-code-utils.js rename to lib/init/source-code-utils.js index 63dc2446458..dfc170a65cf 100644 --- a/lib/util/source-code-utils.js +++ b/lib/init/source-code-utils.js @@ -9,7 +9,22 @@ // Requirements //------------------------------------------------------------------------------ -const { CLIEngine, getCLIEngineInternalSlots } = require("../cli-engine"); +const { CLIEngine } = require("../cli-engine"); + +/* + * This is used for: + * + * 1. Enumerate target file because we have not expose such a API on `CLIEngine` + * (https://github.com/eslint/eslint/issues/11222). + * 2. Create `SourceCode` instances. Because we don't have any function which + * instantiate `SourceCode` so it needs to take the created `SourceCode` + * instance out after linting. + * + * TODO1: Expose the API that enumerates target files. + * TODO2: Extract the creation logic of `SourceCode` from `Linter` class. + */ +const { getCLIEngineInternalSlots } = require("../cli-engine/cli-engine"); // eslint-disable-line no-restricted-modules + const debug = require("debug")("eslint:source-code-utils"); //------------------------------------------------------------------------------ diff --git a/lib/util/apply-disable-directives.js b/lib/linter/apply-disable-directives.js similarity index 100% rename from lib/util/apply-disable-directives.js rename to lib/linter/apply-disable-directives.js diff --git a/lib/code-path-analysis/code-path-analyzer.js b/lib/linter/code-path-analysis/code-path-analyzer.js similarity index 96% rename from lib/code-path-analysis/code-path-analyzer.js rename to lib/linter/code-path-analysis/code-path-analyzer.js index b81e212e7f4..c1f4a600451 100644 --- a/lib/code-path-analysis/code-path-analyzer.js +++ b/lib/linter/code-path-analysis/code-path-analyzer.js @@ -10,11 +10,11 @@ //------------------------------------------------------------------------------ const assert = require("assert"), + { breakableTypePattern } = require("../../shared/ast-utils"), CodePath = require("./code-path"), CodePathSegment = require("./code-path-segment"), IdGenerator = require("./id-generator"), - debug = require("./debug-helpers"), - astUtils = require("../util/ast-utils"); + debug = require("./debug-helpers"); //------------------------------------------------------------------------------ // Helpers @@ -41,6 +41,19 @@ function isHandledLogicalOperator(operator) { return operator === "&&" || operator === "||"; } +/** + * Gets the label if the parent node of a given node is a LabeledStatement. + * + * @param {ASTNode} node - A node to get. + * @returns {string|null} The label or `null`. + */ +function getLabel(node) { + if (node.parent.type === "LabeledStatement") { + return node.parent.label.name; + } + return null; +} + /** * Checks whether or not a given logical expression node goes different path * between the `true` case and the `false` case. @@ -391,7 +404,7 @@ function processCodePathToEnter(analyzer, node) { case "SwitchStatement": state.pushSwitchContext( node.cases.some(isCaseNode), - astUtils.getLabel(node) + getLabel(node) ); break; @@ -416,11 +429,11 @@ function processCodePathToEnter(analyzer, node) { case "ForStatement": case "ForInStatement": case "ForOfStatement": - state.pushLoopContext(node.type, astUtils.getLabel(node)); + state.pushLoopContext(node.type, getLabel(node)); break; case "LabeledStatement": - if (!astUtils.isBreakableStatement(node.body)) { + if (!breakableTypePattern.test(node.body.type)) { state.pushBreakContext(false, node.label.name); } break; @@ -531,7 +544,7 @@ function processCodePathToExit(analyzer, node) { break; case "LabeledStatement": - if (!astUtils.isBreakableStatement(node.body)) { + if (!breakableTypePattern.test(node.body.type)) { state.popBreakContext(); } break; diff --git a/lib/code-path-analysis/code-path-segment.js b/lib/linter/code-path-analysis/code-path-segment.js similarity index 100% rename from lib/code-path-analysis/code-path-segment.js rename to lib/linter/code-path-analysis/code-path-segment.js diff --git a/lib/code-path-analysis/code-path-state.js b/lib/linter/code-path-analysis/code-path-state.js similarity index 100% rename from lib/code-path-analysis/code-path-state.js rename to lib/linter/code-path-analysis/code-path-state.js diff --git a/lib/code-path-analysis/code-path.js b/lib/linter/code-path-analysis/code-path.js similarity index 100% rename from lib/code-path-analysis/code-path.js rename to lib/linter/code-path-analysis/code-path.js diff --git a/lib/code-path-analysis/debug-helpers.js b/lib/linter/code-path-analysis/debug-helpers.js similarity index 100% rename from lib/code-path-analysis/debug-helpers.js rename to lib/linter/code-path-analysis/debug-helpers.js diff --git a/lib/code-path-analysis/fork-context.js b/lib/linter/code-path-analysis/fork-context.js similarity index 100% rename from lib/code-path-analysis/fork-context.js rename to lib/linter/code-path-analysis/fork-context.js diff --git a/lib/code-path-analysis/id-generator.js b/lib/linter/code-path-analysis/id-generator.js similarity index 100% rename from lib/code-path-analysis/id-generator.js rename to lib/linter/code-path-analysis/id-generator.js diff --git a/lib/util/config-comment-parser.js b/lib/linter/config-comment-parser.js similarity index 98% rename from lib/util/config-comment-parser.js rename to lib/linter/config-comment-parser.js index 7ac93475740..d0e24c5940e 100644 --- a/lib/util/config-comment-parser.js +++ b/lib/linter/config-comment-parser.js @@ -11,7 +11,7 @@ //------------------------------------------------------------------------------ const levn = require("levn"), - ConfigOps = require("../config/config-ops"); + ConfigOps = require("../shared/config-ops"); const debug = require("debug")("eslint:config-comment-parser"); diff --git a/lib/linter/index.js b/lib/linter/index.js new file mode 100644 index 00000000000..25fd769bde9 --- /dev/null +++ b/lib/linter/index.js @@ -0,0 +1,13 @@ +"use strict"; + +const { Linter } = require("./linter"); +const interpolate = require("./interpolate"); +const SourceCodeFixer = require("./source-code-fixer"); + +module.exports = { + Linter, + + // For testers. + SourceCodeFixer, + interpolate +}; diff --git a/lib/util/interpolate.js b/lib/linter/interpolate.js similarity index 100% rename from lib/util/interpolate.js rename to lib/linter/interpolate.js diff --git a/lib/linter.js b/lib/linter/linter.js similarity index 97% rename from lib/linter.js rename to lib/linter/linter.js index bafc8e3ee09..e83471fa200 100644 --- a/lib/linter.js +++ b/lib/linter/linter.js @@ -9,27 +9,28 @@ // Requirements //------------------------------------------------------------------------------ -const path = require("path"), +const + path = require("path"), eslintScope = require("eslint-scope"), evk = require("eslint-visitor-keys"), espree = require("espree"), lodash = require("lodash"), + BuiltInEnvironments = require("../../conf/environments"), + pkg = require("../../package.json"), + astUtils = require("../shared/ast-utils"), + ConfigOps = require("../shared/config-ops"), + validator = require("../shared/config-validator"), + Traverser = require("../shared/traverser"), + { SourceCode } = require("../source-code"), CodePathAnalyzer = require("./code-path-analysis/code-path-analyzer"), - ConfigOps = require("./config/config-ops"), - validator = require("./config/config-validator"), - BuiltInEnvironments = require("../conf/environments"), - applyDisableDirectives = require("./util/apply-disable-directives"), - createEmitter = require("./util/safe-emitter"), - NodeEventGenerator = require("./util/node-event-generator"), - SourceCode = require("./util/source-code"), - Traverser = require("./util/traverser"), - createReportTranslator = require("./util/report-translator"), + applyDisableDirectives = require("./apply-disable-directives"), + ConfigCommentParser = require("./config-comment-parser"), + NodeEventGenerator = require("./node-event-generator"), + createReportTranslator = require("./report-translator"), Rules = require("./rules"), - timing = require("./util/timing"), - ConfigCommentParser = require("./util/config-comment-parser"), - astUtils = require("./util/ast-utils"), - pkg = require("../package.json"), - SourceCodeFixer = require("./util/source-code-fixer"); + createEmitter = require("./safe-emitter"), + SourceCodeFixer = require("./source-code-fixer"), + timing = require("./timing"); const debug = require("debug")("eslint:linter"); const MAX_AUTOFIX_PASSES = 10; @@ -41,12 +42,12 @@ const commentParser = new ConfigCommentParser(); //------------------------------------------------------------------------------ /** @typedef {InstanceType} ConfigArray */ -/** @typedef {import("./util/types").ConfigData} ConfigData */ -/** @typedef {import("./util/types").Environment} Environment */ -/** @typedef {import("./util/types").GlobalConf} GlobalConf */ -/** @typedef {import("./util/types").LintMessage} LintMessage */ -/** @typedef {import("./util/types").ParserOptions} ParserOptions */ -/** @typedef {import("./util/types").Rule} Rule */ +/** @typedef {import("../shared/types").ConfigData} ConfigData */ +/** @typedef {import("../shared/types").Environment} Environment */ +/** @typedef {import("../shared/types").GlobalConf} GlobalConf */ +/** @typedef {import("../shared/types").LintMessage} LintMessage */ +/** @typedef {import("../shared/types").ParserOptions} ParserOptions */ +/** @typedef {import("../shared/types").Rule} Rule */ /** * @typedef {Object} DisableDirective @@ -460,7 +461,7 @@ function analyzeScope(ast, parserOptions, visitorKeys) { * @private */ function parse(text, parser, providedParserOptions, filePath) { - const textToParse = stripUnicodeBOM(text).replace(astUtils.SHEBANG_MATCHER, (match, captured) => `//${captured}`); + const textToParse = stripUnicodeBOM(text).replace(astUtils.shebangPattern, (match, captured) => `//${captured}`); const parserOptions = Object.assign({}, providedParserOptions, { loc: true, range: true, diff --git a/lib/util/node-event-generator.js b/lib/linter/node-event-generator.js similarity index 99% rename from lib/util/node-event-generator.js rename to lib/linter/node-event-generator.js index 4193cc82758..cea89262e5c 100644 --- a/lib/util/node-event-generator.js +++ b/lib/linter/node-event-generator.js @@ -206,7 +206,7 @@ class NodeEventGenerator { * @param {SafeEmitter} emitter * An SafeEmitter which is the destination of events. This emitter must already * have registered listeners for all of the events that it needs to listen for. - * (See lib/util/safe-emitter.js for more details on `SafeEmitter`.) + * (See lib/linter/safe-emitter.js for more details on `SafeEmitter`.) * @returns {NodeEventGenerator} new instance */ constructor(emitter) { diff --git a/lib/util/report-translator.js b/lib/linter/report-translator.js similarity index 100% rename from lib/util/report-translator.js rename to lib/linter/report-translator.js diff --git a/lib/util/rule-fixer.js b/lib/linter/rule-fixer.js similarity index 100% rename from lib/util/rule-fixer.js rename to lib/linter/rule-fixer.js diff --git a/lib/rules.js b/lib/linter/rules.js similarity index 96% rename from lib/rules.js rename to lib/linter/rules.js index 4a1e3ed1351..1cd68bc7f38 100644 --- a/lib/rules.js +++ b/lib/linter/rules.js @@ -10,8 +10,8 @@ //------------------------------------------------------------------------------ const lodash = require("lodash"); -const ruleReplacements = require("../conf/replacements").rules; -const builtInRules = require("./built-in-rules-index"); +const ruleReplacements = require("../../conf/replacements").rules; +const builtInRules = require("../rules"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/util/safe-emitter.js b/lib/linter/safe-emitter.js similarity index 100% rename from lib/util/safe-emitter.js rename to lib/linter/safe-emitter.js diff --git a/lib/util/source-code-fixer.js b/lib/linter/source-code-fixer.js similarity index 100% rename from lib/util/source-code-fixer.js rename to lib/linter/source-code-fixer.js diff --git a/lib/util/timing.js b/lib/linter/timing.js similarity index 100% rename from lib/util/timing.js rename to lib/linter/timing.js diff --git a/lib/rule-tester/index.js b/lib/rule-tester/index.js new file mode 100644 index 00000000000..f52d14027c5 --- /dev/null +++ b/lib/rule-tester/index.js @@ -0,0 +1,5 @@ +"use strict"; + +module.exports = { + RuleTester: require("./rule-tester") +}; diff --git a/lib/testers/rule-tester.js b/lib/rule-tester/rule-tester.js similarity index 98% rename from lib/testers/rule-tester.js rename to lib/rule-tester/rule-tester.js index 79b7cf6e0c3..671de56064c 100644 --- a/lib/testers/rule-tester.js +++ b/lib/rule-tester/rule-tester.js @@ -45,12 +45,10 @@ const path = require("path"), util = require("util"), lodash = require("lodash"), - { getRuleOptionsSchema, validate } = require("../config/config-validator"), - { Linter } = require("../linter"), - SourceCodeFixer = require("../util/source-code-fixer"), - interpolate = require("../util/interpolate"); + { getRuleOptionsSchema, validate } = require("../shared/config-validator"), + { Linter, SourceCodeFixer, interpolate } = require("../linter"); -const ajv = require("../util/ajv")({ strictDefaults: true }); +const ajv = require("../shared/ajv")({ strictDefaults: true }); //------------------------------------------------------------------------------ // Private Members diff --git a/lib/rules/array-bracket-newline.js b/lib/rules/array-bracket-newline.js index a458e69f761..f6be2e8dd02 100644 --- a/lib/rules/array-bracket-newline.js +++ b/lib/rules/array-bracket-newline.js @@ -5,7 +5,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/array-bracket-spacing.js b/lib/rules/array-bracket-spacing.js index 4bead37a12f..0a51d350cd7 100644 --- a/lib/rules/array-bracket-spacing.js +++ b/lib/rules/array-bracket-spacing.js @@ -4,7 +4,7 @@ */ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/array-callback-return.js b/lib/rules/array-callback-return.js index 1c2f0562904..bd1f3a37aad 100644 --- a/lib/rules/array-callback-return.js +++ b/lib/rules/array-callback-return.js @@ -11,7 +11,7 @@ const lodash = require("lodash"); -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/array-element-newline.js b/lib/rules/array-element-newline.js index dadb26fdd22..c3d026ad696 100644 --- a/lib/rules/array-element-newline.js +++ b/lib/rules/array-element-newline.js @@ -5,7 +5,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/arrow-body-style.js b/lib/rules/arrow-body-style.js index b1fed8c15d5..6d84c7adfb1 100644 --- a/lib/rules/arrow-body-style.js +++ b/lib/rules/arrow-body-style.js @@ -8,7 +8,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/arrow-parens.js b/lib/rules/arrow-parens.js index 217a9b60e13..387bcfec0c0 100644 --- a/lib/rules/arrow-parens.js +++ b/lib/rules/arrow-parens.js @@ -8,7 +8,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/arrow-spacing.js b/lib/rules/arrow-spacing.js index 95acb787725..e5110c6c87d 100644 --- a/lib/rules/arrow-spacing.js +++ b/lib/rules/arrow-spacing.js @@ -8,7 +8,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/block-spacing.js b/lib/rules/block-spacing.js index 864bfc0c5c0..e843148e5d1 100644 --- a/lib/rules/block-spacing.js +++ b/lib/rules/block-spacing.js @@ -5,7 +5,7 @@ "use strict"; -const util = require("../util/ast-utils"); +const util = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/brace-style.js b/lib/rules/brace-style.js index 17a5c7fdf9a..07223d10d4a 100644 --- a/lib/rules/brace-style.js +++ b/lib/rules/brace-style.js @@ -5,7 +5,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/capitalized-comments.js b/lib/rules/capitalized-comments.js index 036616b3369..47477743598 100644 --- a/lib/rules/capitalized-comments.js +++ b/lib/rules/capitalized-comments.js @@ -8,8 +8,8 @@ // Requirements //------------------------------------------------------------------------------ -const LETTER_PATTERN = require("../util/patterns/letters"); -const astUtils = require("../util/ast-utils"); +const LETTER_PATTERN = require("./utils/patterns/letters"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/comma-dangle.js b/lib/rules/comma-dangle.js index 379f106bc4f..9cd6660d5d1 100644 --- a/lib/rules/comma-dangle.js +++ b/lib/rules/comma-dangle.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const lodash = require("lodash"); -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/comma-spacing.js b/lib/rules/comma-spacing.js index a9f89676a4a..79a556a8857 100644 --- a/lib/rules/comma-spacing.js +++ b/lib/rules/comma-spacing.js @@ -4,7 +4,7 @@ */ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/comma-style.js b/lib/rules/comma-style.js index 78438a858db..bc22f05dd38 100644 --- a/lib/rules/comma-style.js +++ b/lib/rules/comma-style.js @@ -5,7 +5,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/complexity.js b/lib/rules/complexity.js index 56e17ddf2fb..2b3cf847207 100644 --- a/lib/rules/complexity.js +++ b/lib/rules/complexity.js @@ -12,7 +12,7 @@ const lodash = require("lodash"); -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/computed-property-spacing.js b/lib/rules/computed-property-spacing.js index 188d863d0d0..91b7d28963f 100644 --- a/lib/rules/computed-property-spacing.js +++ b/lib/rules/computed-property-spacing.js @@ -4,7 +4,7 @@ */ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/consistent-return.js b/lib/rules/consistent-return.js index 68f9f9d8fbc..16f0070bc7c 100644 --- a/lib/rules/consistent-return.js +++ b/lib/rules/consistent-return.js @@ -10,7 +10,7 @@ const lodash = require("lodash"); -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/curly.js b/lib/rules/curly.js index f63d013436a..8eaaddc25c6 100644 --- a/lib/rules/curly.js +++ b/lib/rules/curly.js @@ -8,7 +8,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/dot-location.js b/lib/rules/dot-location.js index 0eefec2eaff..b9857ae2394 100644 --- a/lib/rules/dot-location.js +++ b/lib/rules/dot-location.js @@ -5,7 +5,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/dot-notation.js b/lib/rules/dot-notation.js index 883c9090ff1..61184ddcd1a 100644 --- a/lib/rules/dot-notation.js +++ b/lib/rules/dot-notation.js @@ -8,14 +8,14 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition //------------------------------------------------------------------------------ const validIdentifier = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/u; -const keywords = require("../util/keywords"); +const keywords = require("./utils/keywords"); module.exports = { meta: { diff --git a/lib/rules/eqeqeq.js b/lib/rules/eqeqeq.js index 3e8a392cf69..58ff9030dbb 100644 --- a/lib/rules/eqeqeq.js +++ b/lib/rules/eqeqeq.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/func-call-spacing.js b/lib/rules/func-call-spacing.js index 22375685134..f9c8e780577 100644 --- a/lib/rules/func-call-spacing.js +++ b/lib/rules/func-call-spacing.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/func-name-matching.js b/lib/rules/func-name-matching.js index 5560c692083..3c4ee510dbc 100644 --- a/lib/rules/func-name-matching.js +++ b/lib/rules/func-name-matching.js @@ -9,7 +9,7 @@ // Requirements //-------------------------------------------------------------------------- -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); const esutils = require("esutils"); //-------------------------------------------------------------------------- diff --git a/lib/rules/func-names.js b/lib/rules/func-names.js index 4ccbae0f0cb..01beb9e2ed3 100644 --- a/lib/rules/func-names.js +++ b/lib/rules/func-names.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); /** * Checks whether or not a given variable is a function name. diff --git a/lib/rules/function-paren-newline.js b/lib/rules/function-paren-newline.js index c4775fb19af..0a0b57a372a 100644 --- a/lib/rules/function-paren-newline.js +++ b/lib/rules/function-paren-newline.js @@ -8,7 +8,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/getter-return.js b/lib/rules/getter-return.js index c6035eed042..6549555646e 100644 --- a/lib/rules/getter-return.js +++ b/lib/rules/getter-return.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/implicit-arrow-linebreak.js b/lib/rules/implicit-arrow-linebreak.js index 6fc1268e753..409145e7dc1 100644 --- a/lib/rules/implicit-arrow-linebreak.js +++ b/lib/rules/implicit-arrow-linebreak.js @@ -4,7 +4,7 @@ */ "use strict"; -const { isCommentToken, isNotOpeningParenToken } = require("../util/ast-utils"); +const { isCommentToken, isNotOpeningParenToken } = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/indent-legacy.js b/lib/rules/indent-legacy.js index 93e963a1c04..fb84b732ea3 100644 --- a/lib/rules/indent-legacy.js +++ b/lib/rules/indent-legacy.js @@ -12,7 +12,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/indent.js b/lib/rules/indent.js index cd018d91d66..345c69e81c1 100644 --- a/lib/rules/indent.js +++ b/lib/rules/indent.js @@ -13,7 +13,7 @@ //------------------------------------------------------------------------------ const lodash = require("lodash"); -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); const createTree = require("functional-red-black-tree"); //------------------------------------------------------------------------------ diff --git a/lib/rules/index.js b/lib/rules/index.js new file mode 100644 index 00000000000..45045904bb4 --- /dev/null +++ b/lib/rules/index.js @@ -0,0 +1,281 @@ +/** + * @fileoverview Collects the built-in rules into a map structure so that they can be imported all at once and without + * using the file-system directly. + * @author Peter (Somogyvari) Metz + */ + +"use strict"; + +/* eslint sort-keys: ["error", "asc"] */ + +const { LazyLoadingRuleMap } = require("./utils/lazy-loading-rule-map"); + +/** @type {Map} */ +module.exports = new LazyLoadingRuleMap(Object.entries({ + "accessor-pairs": () => require("./accessor-pairs"), + "array-bracket-newline": () => require("./array-bracket-newline"), + "array-bracket-spacing": () => require("./array-bracket-spacing"), + "array-callback-return": () => require("./array-callback-return"), + "array-element-newline": () => require("./array-element-newline"), + "arrow-body-style": () => require("./arrow-body-style"), + "arrow-parens": () => require("./arrow-parens"), + "arrow-spacing": () => require("./arrow-spacing"), + "block-scoped-var": () => require("./block-scoped-var"), + "block-spacing": () => require("./block-spacing"), + "brace-style": () => require("./brace-style"), + "callback-return": () => require("./callback-return"), + camelcase: () => require("./camelcase"), + "capitalized-comments": () => require("./capitalized-comments"), + "class-methods-use-this": () => require("./class-methods-use-this"), + "comma-dangle": () => require("./comma-dangle"), + "comma-spacing": () => require("./comma-spacing"), + "comma-style": () => require("./comma-style"), + complexity: () => require("./complexity"), + "computed-property-spacing": () => require("./computed-property-spacing"), + "consistent-return": () => require("./consistent-return"), + "consistent-this": () => require("./consistent-this"), + "constructor-super": () => require("./constructor-super"), + curly: () => require("./curly"), + "default-case": () => require("./default-case"), + "dot-location": () => require("./dot-location"), + "dot-notation": () => require("./dot-notation"), + "eol-last": () => require("./eol-last"), + eqeqeq: () => require("./eqeqeq"), + "for-direction": () => require("./for-direction"), + "func-call-spacing": () => require("./func-call-spacing"), + "func-name-matching": () => require("./func-name-matching"), + "func-names": () => require("./func-names"), + "func-style": () => require("./func-style"), + "function-paren-newline": () => require("./function-paren-newline"), + "generator-star-spacing": () => require("./generator-star-spacing"), + "getter-return": () => require("./getter-return"), + "global-require": () => require("./global-require"), + "guard-for-in": () => require("./guard-for-in"), + "handle-callback-err": () => require("./handle-callback-err"), + "id-blacklist": () => require("./id-blacklist"), + "id-length": () => require("./id-length"), + "id-match": () => require("./id-match"), + "implicit-arrow-linebreak": () => require("./implicit-arrow-linebreak"), + indent: () => require("./indent"), + "indent-legacy": () => require("./indent-legacy"), + "init-declarations": () => require("./init-declarations"), + "jsx-quotes": () => require("./jsx-quotes"), + "key-spacing": () => require("./key-spacing"), + "keyword-spacing": () => require("./keyword-spacing"), + "line-comment-position": () => require("./line-comment-position"), + "linebreak-style": () => require("./linebreak-style"), + "lines-around-comment": () => require("./lines-around-comment"), + "lines-around-directive": () => require("./lines-around-directive"), + "lines-between-class-members": () => require("./lines-between-class-members"), + "max-classes-per-file": () => require("./max-classes-per-file"), + "max-depth": () => require("./max-depth"), + "max-len": () => require("./max-len"), + "max-lines": () => require("./max-lines"), + "max-lines-per-function": () => require("./max-lines-per-function"), + "max-nested-callbacks": () => require("./max-nested-callbacks"), + "max-params": () => require("./max-params"), + "max-statements": () => require("./max-statements"), + "max-statements-per-line": () => require("./max-statements-per-line"), + "multiline-comment-style": () => require("./multiline-comment-style"), + "multiline-ternary": () => require("./multiline-ternary"), + "new-cap": () => require("./new-cap"), + "new-parens": () => require("./new-parens"), + "newline-after-var": () => require("./newline-after-var"), + "newline-before-return": () => require("./newline-before-return"), + "newline-per-chained-call": () => require("./newline-per-chained-call"), + "no-alert": () => require("./no-alert"), + "no-array-constructor": () => require("./no-array-constructor"), + "no-async-promise-executor": () => require("./no-async-promise-executor"), + "no-await-in-loop": () => require("./no-await-in-loop"), + "no-bitwise": () => require("./no-bitwise"), + "no-buffer-constructor": () => require("./no-buffer-constructor"), + "no-caller": () => require("./no-caller"), + "no-case-declarations": () => require("./no-case-declarations"), + "no-catch-shadow": () => require("./no-catch-shadow"), + "no-class-assign": () => require("./no-class-assign"), + "no-compare-neg-zero": () => require("./no-compare-neg-zero"), + "no-cond-assign": () => require("./no-cond-assign"), + "no-confusing-arrow": () => require("./no-confusing-arrow"), + "no-console": () => require("./no-console"), + "no-const-assign": () => require("./no-const-assign"), + "no-constant-condition": () => require("./no-constant-condition"), + "no-continue": () => require("./no-continue"), + "no-control-regex": () => require("./no-control-regex"), + "no-debugger": () => require("./no-debugger"), + "no-delete-var": () => require("./no-delete-var"), + "no-div-regex": () => require("./no-div-regex"), + "no-dupe-args": () => require("./no-dupe-args"), + "no-dupe-class-members": () => require("./no-dupe-class-members"), + "no-dupe-keys": () => require("./no-dupe-keys"), + "no-duplicate-case": () => require("./no-duplicate-case"), + "no-duplicate-imports": () => require("./no-duplicate-imports"), + "no-else-return": () => require("./no-else-return"), + "no-empty": () => require("./no-empty"), + "no-empty-character-class": () => require("./no-empty-character-class"), + "no-empty-function": () => require("./no-empty-function"), + "no-empty-pattern": () => require("./no-empty-pattern"), + "no-eq-null": () => require("./no-eq-null"), + "no-eval": () => require("./no-eval"), + "no-ex-assign": () => require("./no-ex-assign"), + "no-extend-native": () => require("./no-extend-native"), + "no-extra-bind": () => require("./no-extra-bind"), + "no-extra-boolean-cast": () => require("./no-extra-boolean-cast"), + "no-extra-label": () => require("./no-extra-label"), + "no-extra-parens": () => require("./no-extra-parens"), + "no-extra-semi": () => require("./no-extra-semi"), + "no-fallthrough": () => require("./no-fallthrough"), + "no-floating-decimal": () => require("./no-floating-decimal"), + "no-func-assign": () => require("./no-func-assign"), + "no-global-assign": () => require("./no-global-assign"), + "no-implicit-coercion": () => require("./no-implicit-coercion"), + "no-implicit-globals": () => require("./no-implicit-globals"), + "no-implied-eval": () => require("./no-implied-eval"), + "no-inline-comments": () => require("./no-inline-comments"), + "no-inner-declarations": () => require("./no-inner-declarations"), + "no-invalid-regexp": () => require("./no-invalid-regexp"), + "no-invalid-this": () => require("./no-invalid-this"), + "no-irregular-whitespace": () => require("./no-irregular-whitespace"), + "no-iterator": () => require("./no-iterator"), + "no-label-var": () => require("./no-label-var"), + "no-labels": () => require("./no-labels"), + "no-lone-blocks": () => require("./no-lone-blocks"), + "no-lonely-if": () => require("./no-lonely-if"), + "no-loop-func": () => require("./no-loop-func"), + "no-magic-numbers": () => require("./no-magic-numbers"), + "no-misleading-character-class": () => require("./no-misleading-character-class"), + "no-mixed-operators": () => require("./no-mixed-operators"), + "no-mixed-requires": () => require("./no-mixed-requires"), + "no-mixed-spaces-and-tabs": () => require("./no-mixed-spaces-and-tabs"), + "no-multi-assign": () => require("./no-multi-assign"), + "no-multi-spaces": () => require("./no-multi-spaces"), + "no-multi-str": () => require("./no-multi-str"), + "no-multiple-empty-lines": () => require("./no-multiple-empty-lines"), + "no-native-reassign": () => require("./no-native-reassign"), + "no-negated-condition": () => require("./no-negated-condition"), + "no-negated-in-lhs": () => require("./no-negated-in-lhs"), + "no-nested-ternary": () => require("./no-nested-ternary"), + "no-new": () => require("./no-new"), + "no-new-func": () => require("./no-new-func"), + "no-new-object": () => require("./no-new-object"), + "no-new-require": () => require("./no-new-require"), + "no-new-symbol": () => require("./no-new-symbol"), + "no-new-wrappers": () => require("./no-new-wrappers"), + "no-obj-calls": () => require("./no-obj-calls"), + "no-octal": () => require("./no-octal"), + "no-octal-escape": () => require("./no-octal-escape"), + "no-param-reassign": () => require("./no-param-reassign"), + "no-path-concat": () => require("./no-path-concat"), + "no-plusplus": () => require("./no-plusplus"), + "no-process-env": () => require("./no-process-env"), + "no-process-exit": () => require("./no-process-exit"), + "no-proto": () => require("./no-proto"), + "no-prototype-builtins": () => require("./no-prototype-builtins"), + "no-redeclare": () => require("./no-redeclare"), + "no-regex-spaces": () => require("./no-regex-spaces"), + "no-restricted-globals": () => require("./no-restricted-globals"), + "no-restricted-imports": () => require("./no-restricted-imports"), + "no-restricted-modules": () => require("./no-restricted-modules"), + "no-restricted-properties": () => require("./no-restricted-properties"), + "no-restricted-syntax": () => require("./no-restricted-syntax"), + "no-return-assign": () => require("./no-return-assign"), + "no-return-await": () => require("./no-return-await"), + "no-script-url": () => require("./no-script-url"), + "no-self-assign": () => require("./no-self-assign"), + "no-self-compare": () => require("./no-self-compare"), + "no-sequences": () => require("./no-sequences"), + "no-shadow": () => require("./no-shadow"), + "no-shadow-restricted-names": () => require("./no-shadow-restricted-names"), + "no-spaced-func": () => require("./no-spaced-func"), + "no-sparse-arrays": () => require("./no-sparse-arrays"), + "no-sync": () => require("./no-sync"), + "no-tabs": () => require("./no-tabs"), + "no-template-curly-in-string": () => require("./no-template-curly-in-string"), + "no-ternary": () => require("./no-ternary"), + "no-this-before-super": () => require("./no-this-before-super"), + "no-throw-literal": () => require("./no-throw-literal"), + "no-trailing-spaces": () => require("./no-trailing-spaces"), + "no-undef": () => require("./no-undef"), + "no-undef-init": () => require("./no-undef-init"), + "no-undefined": () => require("./no-undefined"), + "no-underscore-dangle": () => require("./no-underscore-dangle"), + "no-unexpected-multiline": () => require("./no-unexpected-multiline"), + "no-unmodified-loop-condition": () => require("./no-unmodified-loop-condition"), + "no-unneeded-ternary": () => require("./no-unneeded-ternary"), + "no-unreachable": () => require("./no-unreachable"), + "no-unsafe-finally": () => require("./no-unsafe-finally"), + "no-unsafe-negation": () => require("./no-unsafe-negation"), + "no-unused-expressions": () => require("./no-unused-expressions"), + "no-unused-labels": () => require("./no-unused-labels"), + "no-unused-vars": () => require("./no-unused-vars"), + "no-use-before-define": () => require("./no-use-before-define"), + "no-useless-call": () => require("./no-useless-call"), + "no-useless-catch": () => require("./no-useless-catch"), + "no-useless-computed-key": () => require("./no-useless-computed-key"), + "no-useless-concat": () => require("./no-useless-concat"), + "no-useless-constructor": () => require("./no-useless-constructor"), + "no-useless-escape": () => require("./no-useless-escape"), + "no-useless-rename": () => require("./no-useless-rename"), + "no-useless-return": () => require("./no-useless-return"), + "no-var": () => require("./no-var"), + "no-void": () => require("./no-void"), + "no-warning-comments": () => require("./no-warning-comments"), + "no-whitespace-before-property": () => require("./no-whitespace-before-property"), + "no-with": () => require("./no-with"), + "nonblock-statement-body-position": () => require("./nonblock-statement-body-position"), + "object-curly-newline": () => require("./object-curly-newline"), + "object-curly-spacing": () => require("./object-curly-spacing"), + "object-property-newline": () => require("./object-property-newline"), + "object-shorthand": () => require("./object-shorthand"), + "one-var": () => require("./one-var"), + "one-var-declaration-per-line": () => require("./one-var-declaration-per-line"), + "operator-assignment": () => require("./operator-assignment"), + "operator-linebreak": () => require("./operator-linebreak"), + "padded-blocks": () => require("./padded-blocks"), + "padding-line-between-statements": () => require("./padding-line-between-statements"), + "prefer-arrow-callback": () => require("./prefer-arrow-callback"), + "prefer-const": () => require("./prefer-const"), + "prefer-destructuring": () => require("./prefer-destructuring"), + "prefer-named-capture-group": () => require("./prefer-named-capture-group"), + "prefer-numeric-literals": () => require("./prefer-numeric-literals"), + "prefer-object-spread": () => require("./prefer-object-spread"), + "prefer-promise-reject-errors": () => require("./prefer-promise-reject-errors"), + "prefer-reflect": () => require("./prefer-reflect"), + "prefer-rest-params": () => require("./prefer-rest-params"), + "prefer-spread": () => require("./prefer-spread"), + "prefer-template": () => require("./prefer-template"), + "quote-props": () => require("./quote-props"), + quotes: () => require("./quotes"), + radix: () => require("./radix"), + "require-atomic-updates": () => require("./require-atomic-updates"), + "require-await": () => require("./require-await"), + "require-jsdoc": () => require("./require-jsdoc"), + "require-unicode-regexp": () => require("./require-unicode-regexp"), + "require-yield": () => require("./require-yield"), + "rest-spread-spacing": () => require("./rest-spread-spacing"), + semi: () => require("./semi"), + "semi-spacing": () => require("./semi-spacing"), + "semi-style": () => require("./semi-style"), + "sort-imports": () => require("./sort-imports"), + "sort-keys": () => require("./sort-keys"), + "sort-vars": () => require("./sort-vars"), + "space-before-blocks": () => require("./space-before-blocks"), + "space-before-function-paren": () => require("./space-before-function-paren"), + "space-in-parens": () => require("./space-in-parens"), + "space-infix-ops": () => require("./space-infix-ops"), + "space-unary-ops": () => require("./space-unary-ops"), + "spaced-comment": () => require("./spaced-comment"), + strict: () => require("./strict"), + "switch-colon-spacing": () => require("./switch-colon-spacing"), + "symbol-description": () => require("./symbol-description"), + "template-curly-spacing": () => require("./template-curly-spacing"), + "template-tag-spacing": () => require("./template-tag-spacing"), + "unicode-bom": () => require("./unicode-bom"), + "use-isnan": () => require("./use-isnan"), + "valid-jsdoc": () => require("./valid-jsdoc"), + "valid-typeof": () => require("./valid-typeof"), + "vars-on-top": () => require("./vars-on-top"), + "wrap-iife": () => require("./wrap-iife"), + "wrap-regex": () => require("./wrap-regex"), + "yield-star-spacing": () => require("./yield-star-spacing"), + yoda: () => require("./yoda") +})); diff --git a/lib/rules/jsx-quotes.js b/lib/rules/jsx-quotes.js index 6d709afe35b..e6764b2e817 100644 --- a/lib/rules/jsx-quotes.js +++ b/lib/rules/jsx-quotes.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Constants diff --git a/lib/rules/key-spacing.js b/lib/rules/key-spacing.js index 7da7f9aa024..994c35627f7 100644 --- a/lib/rules/key-spacing.js +++ b/lib/rules/key-spacing.js @@ -8,7 +8,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/keyword-spacing.js b/lib/rules/keyword-spacing.js index 97df9418307..a1bf9910427 100644 --- a/lib/rules/keyword-spacing.js +++ b/lib/rules/keyword-spacing.js @@ -9,8 +9,8 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"), - keywords = require("../util/keywords"); +const astUtils = require("./utils/ast-utils"), + keywords = require("./utils/keywords"); //------------------------------------------------------------------------------ // Constants diff --git a/lib/rules/line-comment-position.js b/lib/rules/line-comment-position.js index d2af56e8a88..77ee147cbec 100644 --- a/lib/rules/line-comment-position.js +++ b/lib/rules/line-comment-position.js @@ -4,7 +4,7 @@ */ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/linebreak-style.js b/lib/rules/linebreak-style.js index 4523d6f58a1..97d552ea07c 100644 --- a/lib/rules/linebreak-style.js +++ b/lib/rules/linebreak-style.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/lines-around-comment.js b/lib/rules/lines-around-comment.js index 9d6ce461627..5e1b83cdd5d 100644 --- a/lib/rules/lines-around-comment.js +++ b/lib/rules/lines-around-comment.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const lodash = require("lodash"), - astUtils = require("../util/ast-utils"); + astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/lines-around-directive.js b/lib/rules/lines-around-directive.js index c2e5fd75aaa..39686d98916 100644 --- a/lib/rules/lines-around-directive.js +++ b/lib/rules/lines-around-directive.js @@ -6,7 +6,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/lines-between-class-members.js b/lib/rules/lines-between-class-members.js index 19ae8a6a292..60332a1b3ca 100644 --- a/lib/rules/lines-between-class-members.js +++ b/lib/rules/lines-between-class-members.js @@ -4,7 +4,7 @@ */ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/max-lines-per-function.js b/lib/rules/max-lines-per-function.js index 5abb3f0b840..5b80c64268c 100644 --- a/lib/rules/max-lines-per-function.js +++ b/lib/rules/max-lines-per-function.js @@ -8,7 +8,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Constants diff --git a/lib/rules/max-lines.js b/lib/rules/max-lines.js index 4e5f23b5d05..bd2831ead95 100644 --- a/lib/rules/max-lines.js +++ b/lib/rules/max-lines.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const lodash = require("lodash"); -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/max-params.js b/lib/rules/max-params.js index e1de3ef6f13..4eebe2d95a3 100644 --- a/lib/rules/max-params.js +++ b/lib/rules/max-params.js @@ -11,7 +11,7 @@ const lodash = require("lodash"); -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/max-statements-per-line.js b/lib/rules/max-statements-per-line.js index 597847f88f8..e9212001a34 100644 --- a/lib/rules/max-statements-per-line.js +++ b/lib/rules/max-statements-per-line.js @@ -8,7 +8,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/max-statements.js b/lib/rules/max-statements.js index 7dc3fd50cfc..437b393a508 100644 --- a/lib/rules/max-statements.js +++ b/lib/rules/max-statements.js @@ -11,7 +11,7 @@ const lodash = require("lodash"); -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/multiline-comment-style.js b/lib/rules/multiline-comment-style.js index ece1035eaa9..e4470c20f43 100644 --- a/lib/rules/multiline-comment-style.js +++ b/lib/rules/multiline-comment-style.js @@ -4,7 +4,7 @@ */ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/multiline-ternary.js b/lib/rules/multiline-ternary.js index 83378dcd86e..3b98d0b3cf1 100644 --- a/lib/rules/multiline-ternary.js +++ b/lib/rules/multiline-ternary.js @@ -5,7 +5,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/new-parens.js b/lib/rules/new-parens.js index edd3c1e1c2e..3864b21b833 100644 --- a/lib/rules/new-parens.js +++ b/lib/rules/new-parens.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/newline-after-var.js b/lib/rules/newline-after-var.js index 036cefc22ca..8f244149c55 100644 --- a/lib/rules/newline-after-var.js +++ b/lib/rules/newline-after-var.js @@ -10,7 +10,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/newline-per-chained-call.js b/lib/rules/newline-per-chained-call.js index 90b540c484d..4aee76da108 100644 --- a/lib/rules/newline-per-chained-call.js +++ b/lib/rules/newline-per-chained-call.js @@ -6,7 +6,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-alert.js b/lib/rules/no-alert.js index 609bb0b7729..287cd2c3570 100644 --- a/lib/rules/no-alert.js +++ b/lib/rules/no-alert.js @@ -8,7 +8,7 @@ // Requirements //------------------------------------------------------------------------------ -const getPropertyName = require("../util/ast-utils").getStaticPropertyName; +const getPropertyName = require("./utils/ast-utils").getStaticPropertyName; //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/no-catch-shadow.js b/lib/rules/no-catch-shadow.js index 60a0493b343..4917af84e43 100644 --- a/lib/rules/no-catch-shadow.js +++ b/lib/rules/no-catch-shadow.js @@ -10,7 +10,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-class-assign.js b/lib/rules/no-class-assign.js index 7bc65df1ba6..986bdd7c1c3 100644 --- a/lib/rules/no-class-assign.js +++ b/lib/rules/no-class-assign.js @@ -5,7 +5,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-cond-assign.js b/lib/rules/no-cond-assign.js index 62a73a6b1a9..67dcd28b208 100644 --- a/lib/rules/no-cond-assign.js +++ b/lib/rules/no-cond-assign.js @@ -4,7 +4,7 @@ */ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); const NODE_DESCRIPTIONS = { DoWhileStatement: "a 'do...while' statement", diff --git a/lib/rules/no-confusing-arrow.js b/lib/rules/no-confusing-arrow.js index 09d6e27d216..895b9499dde 100644 --- a/lib/rules/no-confusing-arrow.js +++ b/lib/rules/no-confusing-arrow.js @@ -6,7 +6,7 @@ "use strict"; -const astUtils = require("../util/ast-utils.js"); +const astUtils = require("./utils/ast-utils.js"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/no-console.js b/lib/rules/no-console.js index 5967483d68a..e4b5ce1ea44 100644 --- a/lib/rules/no-console.js +++ b/lib/rules/no-console.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-const-assign.js b/lib/rules/no-const-assign.js index 32f8154cc23..9f4c91fa305 100644 --- a/lib/rules/no-const-assign.js +++ b/lib/rules/no-const-assign.js @@ -5,7 +5,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-dupe-keys.js b/lib/rules/no-dupe-keys.js index c0ccf73b8d3..d0751b4a2da 100644 --- a/lib/rules/no-dupe-keys.js +++ b/lib/rules/no-dupe-keys.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/no-else-return.js b/lib/rules/no-else-return.js index 17f355eeb0c..2f3fcf808f4 100644 --- a/lib/rules/no-else-return.js +++ b/lib/rules/no-else-return.js @@ -9,8 +9,8 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); -const FixTracker = require("../util/fix-tracker"); +const astUtils = require("./utils/ast-utils"); +const FixTracker = require("./utils/fix-tracker"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-empty-function.js b/lib/rules/no-empty-function.js index a443796e4e2..149b1477dc1 100644 --- a/lib/rules/no-empty-function.js +++ b/lib/rules/no-empty-function.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/no-empty.js b/lib/rules/no-empty.js index 2d55dee6659..45bf03c13ae 100644 --- a/lib/rules/no-empty.js +++ b/lib/rules/no-empty.js @@ -8,7 +8,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-eval.js b/lib/rules/no-eval.js index d4b79468f19..d580f369259 100644 --- a/lib/rules/no-eval.js +++ b/lib/rules/no-eval.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/no-ex-assign.js b/lib/rules/no-ex-assign.js index 4cc179a6e8f..21d3220799b 100644 --- a/lib/rules/no-ex-assign.js +++ b/lib/rules/no-ex-assign.js @@ -5,7 +5,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-extend-native.js b/lib/rules/no-extend-native.js index 13895f0d06b..7ab25ab4895 100644 --- a/lib/rules/no-extend-native.js +++ b/lib/rules/no-extend-native.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); const globals = require("globals"); //------------------------------------------------------------------------------ diff --git a/lib/rules/no-extra-bind.js b/lib/rules/no-extra-bind.js index abbe1868e89..5380cf217f4 100644 --- a/lib/rules/no-extra-bind.js +++ b/lib/rules/no-extra-bind.js @@ -8,7 +8,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/no-extra-boolean-cast.js b/lib/rules/no-extra-boolean-cast.js index 615603177a5..8dd526477d4 100644 --- a/lib/rules/no-extra-boolean-cast.js +++ b/lib/rules/no-extra-boolean-cast.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-extra-label.js b/lib/rules/no-extra-label.js index f8acf7b2834..a4a98af5853 100644 --- a/lib/rules/no-extra-label.js +++ b/lib/rules/no-extra-label.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-extra-parens.js b/lib/rules/no-extra-parens.js index 400ce0c7613..98fc49654cb 100644 --- a/lib/rules/no-extra-parens.js +++ b/lib/rules/no-extra-parens.js @@ -8,7 +8,7 @@ // Rule Definition //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils.js"); +const astUtils = require("./utils/ast-utils.js"); module.exports = { meta: { diff --git a/lib/rules/no-extra-semi.js b/lib/rules/no-extra-semi.js index d87a181672f..e99dd67b35b 100644 --- a/lib/rules/no-extra-semi.js +++ b/lib/rules/no-extra-semi.js @@ -9,8 +9,8 @@ // Requirements //------------------------------------------------------------------------------ -const FixTracker = require("../util/fix-tracker"); -const astUtils = require("../util/ast-utils"); +const FixTracker = require("./utils/fix-tracker"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-floating-decimal.js b/lib/rules/no-floating-decimal.js index de5a521525f..b1d883212e2 100644 --- a/lib/rules/no-floating-decimal.js +++ b/lib/rules/no-floating-decimal.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-func-assign.js b/lib/rules/no-func-assign.js index ae96ab01f43..d2b4109fa33 100644 --- a/lib/rules/no-func-assign.js +++ b/lib/rules/no-func-assign.js @@ -5,7 +5,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-implicit-coercion.js b/lib/rules/no-implicit-coercion.js index 6483af0229f..7d463ac2bdc 100644 --- a/lib/rules/no-implicit-coercion.js +++ b/lib/rules/no-implicit-coercion.js @@ -5,7 +5,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/no-inline-comments.js b/lib/rules/no-inline-comments.js index c282d16e754..b35db114100 100644 --- a/lib/rules/no-inline-comments.js +++ b/lib/rules/no-inline-comments.js @@ -4,7 +4,7 @@ */ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-invalid-this.js b/lib/rules/no-invalid-this.js index e9be4445260..30ae3fdc31a 100644 --- a/lib/rules/no-invalid-this.js +++ b/lib/rules/no-invalid-this.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-irregular-whitespace.js b/lib/rules/no-irregular-whitespace.js index de6d518bd50..f339fa6c8f3 100644 --- a/lib/rules/no-irregular-whitespace.js +++ b/lib/rules/no-irregular-whitespace.js @@ -10,7 +10,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Constants diff --git a/lib/rules/no-label-var.js b/lib/rules/no-label-var.js index fdba2defc35..a9fd042a390 100644 --- a/lib/rules/no-label-var.js +++ b/lib/rules/no-label-var.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-labels.js b/lib/rules/no-labels.js index 29580bd236b..8168dc06c17 100644 --- a/lib/rules/no-labels.js +++ b/lib/rules/no-labels.js @@ -8,7 +8,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-misleading-character-class.js b/lib/rules/no-misleading-character-class.js index 287aa206036..d7c394f463b 100644 --- a/lib/rules/no-misleading-character-class.js +++ b/lib/rules/no-misleading-character-class.js @@ -5,7 +5,7 @@ const { CALL, CONSTRUCT, ReferenceTracker, getStringIfConstant } = require("eslint-utils"); const { RegExpParser, visitRegExpAST } = require("regexpp"); -const { isCombiningCharacter, isEmojiModifier, isRegionalIndicatorSymbol, isSurrogatePair } = require("../util/unicode"); +const { isCombiningCharacter, isEmojiModifier, isRegionalIndicatorSymbol, isSurrogatePair } = require("./utils/unicode"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/no-mixed-operators.js b/lib/rules/no-mixed-operators.js index 83f27fb0076..21e1d95c684 100644 --- a/lib/rules/no-mixed-operators.js +++ b/lib/rules/no-mixed-operators.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils.js"); +const astUtils = require("./utils/ast-utils.js"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/no-multi-spaces.js b/lib/rules/no-multi-spaces.js index c5fb0740342..64a04c5cc58 100644 --- a/lib/rules/no-multi-spaces.js +++ b/lib/rules/no-multi-spaces.js @@ -5,7 +5,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-multi-str.js b/lib/rules/no-multi-str.js index 844842392df..f6832f33417 100644 --- a/lib/rules/no-multi-str.js +++ b/lib/rules/no-multi-str.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-redeclare.js b/lib/rules/no-redeclare.js index 6adde0f97a5..9de2f4ed730 100644 --- a/lib/rules/no-redeclare.js +++ b/lib/rules/no-redeclare.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-regex-spaces.js b/lib/rules/no-regex-spaces.js index 75faa11191d..55e79517cef 100644 --- a/lib/rules/no-regex-spaces.js +++ b/lib/rules/no-regex-spaces.js @@ -5,7 +5,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-restricted-properties.js b/lib/rules/no-restricted-properties.js index eede6ad1c16..bdab22b19c4 100644 --- a/lib/rules/no-restricted-properties.js +++ b/lib/rules/no-restricted-properties.js @@ -5,7 +5,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-return-assign.js b/lib/rules/no-return-assign.js index c4a79d5fb1c..ea6a6bb49fc 100644 --- a/lib/rules/no-return-assign.js +++ b/lib/rules/no-return-assign.js @@ -8,7 +8,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/no-return-await.js b/lib/rules/no-return-await.js index 24cb45ee5a7..6652b5932dc 100644 --- a/lib/rules/no-return-await.js +++ b/lib/rules/no-return-await.js @@ -4,7 +4,7 @@ */ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-self-assign.js b/lib/rules/no-self-assign.js index 5b74ca8fbcf..79fb50770ef 100644 --- a/lib/rules/no-self-assign.js +++ b/lib/rules/no-self-assign.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/no-sequences.js b/lib/rules/no-sequences.js index 2570912f348..71317c2f792 100644 --- a/lib/rules/no-sequences.js +++ b/lib/rules/no-sequences.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-shadow.js b/lib/rules/no-shadow.js index 5f617e52a74..1993d60078b 100644 --- a/lib/rules/no-shadow.js +++ b/lib/rules/no-shadow.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-this-before-super.js b/lib/rules/no-this-before-super.js index bca379bf971..b271797240a 100644 --- a/lib/rules/no-this-before-super.js +++ b/lib/rules/no-this-before-super.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/no-throw-literal.js b/lib/rules/no-throw-literal.js index bf16927024c..29fb3718b48 100644 --- a/lib/rules/no-throw-literal.js +++ b/lib/rules/no-throw-literal.js @@ -5,7 +5,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-trailing-spaces.js b/lib/rules/no-trailing-spaces.js index a75ef0ec4c5..83c01d5e7e2 100644 --- a/lib/rules/no-trailing-spaces.js +++ b/lib/rules/no-trailing-spaces.js @@ -8,7 +8,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-undef-init.js b/lib/rules/no-undef-init.js index 67f3944d47e..1390c880fc8 100644 --- a/lib/rules/no-undef-init.js +++ b/lib/rules/no-undef-init.js @@ -5,7 +5,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-unexpected-multiline.js b/lib/rules/no-unexpected-multiline.js index f4a83f0cefa..8026e172223 100644 --- a/lib/rules/no-unexpected-multiline.js +++ b/lib/rules/no-unexpected-multiline.js @@ -8,7 +8,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-unmodified-loop-condition.js b/lib/rules/no-unmodified-loop-condition.js index 5bb54f81d67..85292d136ec 100644 --- a/lib/rules/no-unmodified-loop-condition.js +++ b/lib/rules/no-unmodified-loop-condition.js @@ -9,8 +9,8 @@ // Requirements //------------------------------------------------------------------------------ -const Traverser = require("../util/traverser"), - astUtils = require("../util/ast-utils"); +const Traverser = require("../shared/traverser"), + astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/no-unneeded-ternary.js b/lib/rules/no-unneeded-ternary.js index 4dbb78a3e07..331c9ce94d7 100644 --- a/lib/rules/no-unneeded-ternary.js +++ b/lib/rules/no-unneeded-ternary.js @@ -5,7 +5,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); // Operators that always result in a boolean value const BOOLEAN_OPERATORS = new Set(["==", "===", "!=", "!==", ">", ">=", "<", "<=", "in", "instanceof"]); diff --git a/lib/rules/no-unsafe-negation.js b/lib/rules/no-unsafe-negation.js index 3b5b367e42e..f394f674259 100644 --- a/lib/rules/no-unsafe-negation.js +++ b/lib/rules/no-unsafe-negation.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/no-unused-vars.js b/lib/rules/no-unused-vars.js index 8e32951bdae..48df3aa3cc1 100644 --- a/lib/rules/no-unused-vars.js +++ b/lib/rules/no-unused-vars.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-useless-call.js b/lib/rules/no-useless-call.js index 74e8bec08bc..d08b9cb8cb7 100644 --- a/lib/rules/no-useless-call.js +++ b/lib/rules/no-useless-call.js @@ -5,7 +5,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/no-useless-computed-key.js b/lib/rules/no-useless-computed-key.js index ef1f856f3ef..95527832b2d 100644 --- a/lib/rules/no-useless-computed-key.js +++ b/lib/rules/no-useless-computed-key.js @@ -8,7 +8,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-useless-concat.js b/lib/rules/no-useless-concat.js index df310119032..d26003f1e4f 100644 --- a/lib/rules/no-useless-concat.js +++ b/lib/rules/no-useless-concat.js @@ -8,7 +8,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/no-useless-escape.js b/lib/rules/no-useless-escape.js index 82db1f2be44..f3764ce91e5 100644 --- a/lib/rules/no-useless-escape.js +++ b/lib/rules/no-useless-escape.js @@ -5,7 +5,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-useless-return.js b/lib/rules/no-useless-return.js index 2ac7112872d..46b5f4b648f 100644 --- a/lib/rules/no-useless-return.js +++ b/lib/rules/no-useless-return.js @@ -8,8 +8,8 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"), - FixTracker = require("../util/fix-tracker"); +const astUtils = require("./utils/ast-utils"), + FixTracker = require("./utils/fix-tracker"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/no-var.js b/lib/rules/no-var.js index 0978de634e0..e9f191b39f2 100644 --- a/lib/rules/no-var.js +++ b/lib/rules/no-var.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/no-warning-comments.js b/lib/rules/no-warning-comments.js index 0882f61262e..5a8e0bc7ec2 100644 --- a/lib/rules/no-warning-comments.js +++ b/lib/rules/no-warning-comments.js @@ -6,7 +6,7 @@ "use strict"; const { escapeRegExp } = require("lodash"); -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/no-whitespace-before-property.js b/lib/rules/no-whitespace-before-property.js index 1ecc51db67c..83ff801b2b8 100644 --- a/lib/rules/no-whitespace-before-property.js +++ b/lib/rules/no-whitespace-before-property.js @@ -8,7 +8,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/object-curly-newline.js b/lib/rules/object-curly-newline.js index d1a6bc20f63..be9ae23a6f4 100644 --- a/lib/rules/object-curly-newline.js +++ b/lib/rules/object-curly-newline.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); const lodash = require("lodash"); //------------------------------------------------------------------------------ diff --git a/lib/rules/object-curly-spacing.js b/lib/rules/object-curly-spacing.js index c4f2077f6c9..079cf5707db 100644 --- a/lib/rules/object-curly-spacing.js +++ b/lib/rules/object-curly-spacing.js @@ -4,7 +4,7 @@ */ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/object-shorthand.js b/lib/rules/object-shorthand.js index 6fa1b183408..bff7c717a0d 100644 --- a/lib/rules/object-shorthand.js +++ b/lib/rules/object-shorthand.js @@ -17,7 +17,7 @@ const OPTIONS = { //------------------------------------------------------------------------------ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/operator-assignment.js b/lib/rules/operator-assignment.js index 94e85927344..63982cf3920 100644 --- a/lib/rules/operator-assignment.js +++ b/lib/rules/operator-assignment.js @@ -8,7 +8,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/operator-linebreak.js b/lib/rules/operator-linebreak.js index cd6e996b1b1..bce0ef56a0c 100644 --- a/lib/rules/operator-linebreak.js +++ b/lib/rules/operator-linebreak.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/padded-blocks.js b/lib/rules/padded-blocks.js index e4dd37f4cdb..d5bd5499c6e 100644 --- a/lib/rules/padded-blocks.js +++ b/lib/rules/padded-blocks.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/padding-line-between-statements.js b/lib/rules/padding-line-between-statements.js index 7d37870a481..d98cb1f247f 100644 --- a/lib/rules/padding-line-between-statements.js +++ b/lib/rules/padding-line-between-statements.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/prefer-const.js b/lib/rules/prefer-const.js index c4180faeb94..68c07da4ed9 100644 --- a/lib/rules/prefer-const.js +++ b/lib/rules/prefer-const.js @@ -5,7 +5,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/prefer-object-spread.js b/lib/rules/prefer-object-spread.js index c5fca98efeb..214f950c642 100644 --- a/lib/rules/prefer-object-spread.js +++ b/lib/rules/prefer-object-spread.js @@ -12,7 +12,7 @@ const { isOpeningParenToken, isClosingParenToken, isParenthesised -} = require("../util/ast-utils"); +} = require("./utils/ast-utils"); const ANY_SPACE = /\s/u; diff --git a/lib/rules/prefer-promise-reject-errors.js b/lib/rules/prefer-promise-reject-errors.js index 275e705f6d5..e142a96b55c 100644 --- a/lib/rules/prefer-promise-reject-errors.js +++ b/lib/rules/prefer-promise-reject-errors.js @@ -4,7 +4,7 @@ */ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/prefer-spread.js b/lib/rules/prefer-spread.js index 5f3a477329b..9368c972c08 100644 --- a/lib/rules/prefer-spread.js +++ b/lib/rules/prefer-spread.js @@ -5,7 +5,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/prefer-template.js b/lib/rules/prefer-template.js index d8dd5dd86e0..f73ac34f837 100644 --- a/lib/rules/prefer-template.js +++ b/lib/rules/prefer-template.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/quote-props.js b/lib/rules/quote-props.js index 7184bd34d35..79493b2499e 100644 --- a/lib/rules/quote-props.js +++ b/lib/rules/quote-props.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const espree = require("espree"), - keywords = require("../util/keywords"); + keywords = require("./utils/keywords"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/quotes.js b/lib/rules/quotes.js index 4556b245d30..28b20af29f4 100644 --- a/lib/rules/quotes.js +++ b/lib/rules/quotes.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Constants diff --git a/lib/rules/radix.js b/lib/rules/radix.js index 5d3805d0a70..b7b296f4515 100644 --- a/lib/rules/radix.js +++ b/lib/rules/radix.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/require-await.js b/lib/rules/require-await.js index 5e614c50251..298cb951de3 100644 --- a/lib/rules/require-await.js +++ b/lib/rules/require-await.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/semi-spacing.js b/lib/rules/semi-spacing.js index 3a6d8a052a3..083dc26199f 100644 --- a/lib/rules/semi-spacing.js +++ b/lib/rules/semi-spacing.js @@ -5,7 +5,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/semi-style.js b/lib/rules/semi-style.js index dd76b68f82b..da3c4a38742 100644 --- a/lib/rules/semi-style.js +++ b/lib/rules/semi-style.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/semi.js b/lib/rules/semi.js index 3a6df39c771..a159e19d347 100644 --- a/lib/rules/semi.js +++ b/lib/rules/semi.js @@ -8,8 +8,8 @@ // Requirements //------------------------------------------------------------------------------ -const FixTracker = require("../util/fix-tracker"); -const astUtils = require("../util/ast-utils"); +const FixTracker = require("./utils/fix-tracker"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/sort-keys.js b/lib/rules/sort-keys.js index fd5dd8a13bc..23a39108181 100644 --- a/lib/rules/sort-keys.js +++ b/lib/rules/sort-keys.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"), +const astUtils = require("./utils/ast-utils"), naturalCompare = require("natural-compare"); //------------------------------------------------------------------------------ diff --git a/lib/rules/space-before-blocks.js b/lib/rules/space-before-blocks.js index 872338effc2..527366aaccf 100644 --- a/lib/rules/space-before-blocks.js +++ b/lib/rules/space-before-blocks.js @@ -5,7 +5,7 @@ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/space-before-function-paren.js b/lib/rules/space-before-function-paren.js index 64ba72bf9ea..ca20dbc4abf 100644 --- a/lib/rules/space-before-function-paren.js +++ b/lib/rules/space-before-function-paren.js @@ -8,7 +8,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/space-in-parens.js b/lib/rules/space-in-parens.js index 30686626321..4f97b1aa896 100644 --- a/lib/rules/space-in-parens.js +++ b/lib/rules/space-in-parens.js @@ -4,7 +4,7 @@ */ "use strict"; -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/space-unary-ops.js b/lib/rules/space-unary-ops.js index 779697b5b39..f417eea58d8 100644 --- a/lib/rules/space-unary-ops.js +++ b/lib/rules/space-unary-ops.js @@ -8,7 +8,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/spaced-comment.js b/lib/rules/spaced-comment.js index e6b6e1b6534..731bd212e3e 100644 --- a/lib/rules/spaced-comment.js +++ b/lib/rules/spaced-comment.js @@ -5,7 +5,7 @@ "use strict"; const lodash = require("lodash"); -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/strict.js b/lib/rules/strict.js index a826731260b..b93a6a1a17a 100644 --- a/lib/rules/strict.js +++ b/lib/rules/strict.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/rules/switch-colon-spacing.js b/lib/rules/switch-colon-spacing.js index 40154862d19..c90641573c6 100644 --- a/lib/rules/switch-colon-spacing.js +++ b/lib/rules/switch-colon-spacing.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/symbol-description.js b/lib/rules/symbol-description.js index f2e7e16b7a5..3fd5a359671 100644 --- a/lib/rules/symbol-description.js +++ b/lib/rules/symbol-description.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/template-curly-spacing.js b/lib/rules/template-curly-spacing.js index e255a890ec4..2794b45cf78 100644 --- a/lib/rules/template-curly-spacing.js +++ b/lib/rules/template-curly-spacing.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Helpers diff --git a/lib/util/ast-utils.js b/lib/rules/utils/ast-utils.js similarity index 98% rename from lib/util/ast-utils.js rename to lib/rules/utils/ast-utils.js index 0f9ba290a9d..1aef4c162d4 100644 --- a/lib/util/ast-utils.js +++ b/lib/rules/utils/ast-utils.js @@ -12,6 +12,12 @@ const esutils = require("esutils"); const espree = require("espree"); const lodash = require("lodash"); +const { + breakableTypePattern, + createGlobalLinebreakMatcher, + lineBreakPattern, + shebangPattern +} = require("../../shared/ast-utils"); //------------------------------------------------------------------------------ // Helpers @@ -22,14 +28,11 @@ const anyLoopPattern = /^(?:DoWhile|For|ForIn|ForOf|While)Statement$/u; const arrayOrTypedArrayPattern = /Array$/u; const arrayMethodPattern = /^(?:every|filter|find|findIndex|forEach|map|some)$/u; const bindOrCallOrApplyPattern = /^(?:bind|call|apply)$/u; -const breakableTypePattern = /^(?:(?:Do)?While|For(?:In|Of)?|Switch)Statement$/u; const thisTagPattern = /^[\s*]*@this/mu; const COMMENTS_IGNORE_PATTERN = /^\s*(?:eslint|jshint\s+|jslint\s+|istanbul\s+|globals?\s+|exported\s+|jscs)/u; const LINEBREAKS = new Set(["\r\n", "\r", "\n", "\u2028", "\u2029"]); -const LINEBREAK_MATCHER = /\r\n|[\r\n\u2028\u2029]/u; -const SHEBANG_MATCHER = /^#!([^\r\n]+)/u; // A set of node types that can contain a list of statements const STATEMENT_LIST_PARENTS = new Set(["Program", "BlockStatement", "SwitchCase"]); @@ -393,15 +396,6 @@ function getOpeningParenOfParams(node, sourceCode) { : sourceCode.getFirstToken(node, isOpeningParenToken); } -/** - * Creates a version of the LINEBREAK_MATCHER regex with the global flag. - * Global regexes are mutable, so this needs to be a function instead of a constant. - * @returns {RegExp} A global regular expression that matches line terminators - */ -function createGlobalLinebreakMatcher() { - return new RegExp(LINEBREAK_MATCHER.source, "gu"); -} - /** * Checks whether or not the tokens of two given nodes are same. * @param {ASTNode} left - A node 1 to compare. @@ -434,8 +428,8 @@ function equalTokens(left, right, sourceCode) { module.exports = { COMMENTS_IGNORE_PATTERN, LINEBREAKS, - LINEBREAK_MATCHER, - SHEBANG_MATCHER, + LINEBREAK_MATCHER: lineBreakPattern, + SHEBANG_MATCHER: shebangPattern, STATEMENT_LIST_PARENTS, /** @@ -513,19 +507,6 @@ module.exports = { return breakableTypePattern.test(node.type); }, - /** - * Gets the label if the parent node of a given node is a LabeledStatement. - * - * @param {ASTNode} node - A node to get. - * @returns {string|null} The label or `null`. - */ - getLabel(node) { - if (node.parent.type === "LabeledStatement") { - return node.parent.label.name; - } - return null; - }, - /** * Gets references which are non initializer and writable. * @param {Reference[]} references - An array of references. diff --git a/lib/util/fix-tracker.js b/lib/rules/utils/fix-tracker.js similarity index 98% rename from lib/util/fix-tracker.js rename to lib/rules/utils/fix-tracker.js index 3c9bf63d257..c987a28ca6c 100644 --- a/lib/util/fix-tracker.js +++ b/lib/rules/utils/fix-tracker.js @@ -8,7 +8,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./ast-utils"); //------------------------------------------------------------------------------ // Public Interface diff --git a/lib/util/keywords.js b/lib/rules/utils/keywords.js similarity index 100% rename from lib/util/keywords.js rename to lib/rules/utils/keywords.js diff --git a/lib/util/lazy-loading-rule-map.js b/lib/rules/utils/lazy-loading-rule-map.js similarity index 100% rename from lib/util/lazy-loading-rule-map.js rename to lib/rules/utils/lazy-loading-rule-map.js diff --git a/lib/util/patterns/letters.js b/lib/rules/utils/patterns/letters.js similarity index 100% rename from lib/util/patterns/letters.js rename to lib/rules/utils/patterns/letters.js diff --git a/lib/util/unicode/index.js b/lib/rules/utils/unicode/index.js similarity index 100% rename from lib/util/unicode/index.js rename to lib/rules/utils/unicode/index.js diff --git a/lib/util/unicode/is-combining-character.js b/lib/rules/utils/unicode/is-combining-character.js similarity index 100% rename from lib/util/unicode/is-combining-character.js rename to lib/rules/utils/unicode/is-combining-character.js diff --git a/lib/util/unicode/is-emoji-modifier.js b/lib/rules/utils/unicode/is-emoji-modifier.js similarity index 100% rename from lib/util/unicode/is-emoji-modifier.js rename to lib/rules/utils/unicode/is-emoji-modifier.js diff --git a/lib/util/unicode/is-regional-indicator-symbol.js b/lib/rules/utils/unicode/is-regional-indicator-symbol.js similarity index 100% rename from lib/util/unicode/is-regional-indicator-symbol.js rename to lib/rules/utils/unicode/is-regional-indicator-symbol.js diff --git a/lib/util/unicode/is-surrogate-pair.js b/lib/rules/utils/unicode/is-surrogate-pair.js similarity index 100% rename from lib/util/unicode/is-surrogate-pair.js rename to lib/rules/utils/unicode/is-surrogate-pair.js diff --git a/lib/rules/wrap-iife.js b/lib/rules/wrap-iife.js index 0e54157f102..5e590be13e2 100644 --- a/lib/rules/wrap-iife.js +++ b/lib/rules/wrap-iife.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //------------------------------------------------------------------------------ // Rule Definition diff --git a/lib/rules/yoda.js b/lib/rules/yoda.js index 048c670a645..43783c193bd 100644 --- a/lib/rules/yoda.js +++ b/lib/rules/yoda.js @@ -8,7 +8,7 @@ // Requirements //-------------------------------------------------------------------------- -const astUtils = require("../util/ast-utils"); +const astUtils = require("./utils/ast-utils"); //-------------------------------------------------------------------------- // Helpers diff --git a/lib/util/ajv.js b/lib/shared/ajv.js similarity index 100% rename from lib/util/ajv.js rename to lib/shared/ajv.js diff --git a/lib/shared/ast-utils.js b/lib/shared/ast-utils.js new file mode 100644 index 00000000000..4ebd49c3ce6 --- /dev/null +++ b/lib/shared/ast-utils.js @@ -0,0 +1,29 @@ +/** + * @fileoverview Common utils for AST. + * + * This file contains only shared items for core and rules. + * If you make a utility for rules, please see `../rules/utils/ast-utils.js`. + * + * @author Toru Nagashima + */ +"use strict"; + +const breakableTypePattern = /^(?:(?:Do)?While|For(?:In|Of)?|Switch)Statement$/u; +const lineBreakPattern = /\r\n|[\r\n\u2028\u2029]/u; +const shebangPattern = /^#!([^\r\n]+)/u; + +/** + * Creates a version of the `lineBreakPattern` regex with the global flag. + * Global regexes are mutable, so this needs to be a function instead of a constant. + * @returns {RegExp} A global regular expression that matches line terminators + */ +function createGlobalLinebreakMatcher() { + return new RegExp(lineBreakPattern.source, "gu"); +} + +module.exports = { + breakableTypePattern, + lineBreakPattern, + createGlobalLinebreakMatcher, + shebangPattern +}; diff --git a/lib/config/config-ops.js b/lib/shared/config-ops.js similarity index 100% rename from lib/config/config-ops.js rename to lib/shared/config-ops.js diff --git a/lib/config/config-validator.js b/lib/shared/config-validator.js similarity index 97% rename from lib/config/config-validator.js rename to lib/shared/config-validator.js index d37a50f1c13..dfdcff350ba 100644 --- a/lib/config/config-validator.js +++ b/lib/shared/config-validator.js @@ -15,10 +15,10 @@ const lodash = require("lodash"), configSchema = require("../../conf/config-schema"), BuiltInEnvironments = require("../../conf/environments"), - BuiltInRules = require("../built-in-rules-index"), + BuiltInRules = require("../rules"), ConfigOps = require("./config-ops"); -const ajv = require("../util/ajv")(); +const ajv = require("./ajv")(); const ruleValidators = new WeakMap(); const noop = Function.prototype; @@ -29,8 +29,7 @@ let validateSchema; // Defitions for deprecation warnings. const deprecationWarningMessages = { - ESLINT_LEGACY_ECMAFEATURES: "The 'ecmaFeatures' config file property is deprecated, and has no effect.", - ESLINT_LEGACY_OBJECT_REST_SPREAD: "The 'parserOptions.ecmaFeatures.experimentalObjectRestSpread' option is deprecated. Use 'parserOptions.ecmaVersion' instead." + ESLINT_LEGACY_ECMAFEATURES: "The 'ecmaFeatures' config file property is deprecated, and has no effect." }; const severityMap = { error: 2, diff --git a/lib/util/logging.js b/lib/shared/logging.js similarity index 100% rename from lib/util/logging.js rename to lib/shared/logging.js diff --git a/lib/util/relative-module-resolver.js b/lib/shared/relative-module-resolver.js similarity index 100% rename from lib/util/relative-module-resolver.js rename to lib/shared/relative-module-resolver.js diff --git a/lib/util/traverser.js b/lib/shared/traverser.js similarity index 100% rename from lib/util/traverser.js rename to lib/shared/traverser.js diff --git a/lib/util/types.js b/lib/shared/types.js similarity index 100% rename from lib/util/types.js rename to lib/shared/types.js diff --git a/lib/source-code/index.js b/lib/source-code/index.js new file mode 100644 index 00000000000..76e27869f32 --- /dev/null +++ b/lib/source-code/index.js @@ -0,0 +1,5 @@ +"use strict"; + +module.exports = { + SourceCode: require("./source-code") +}; diff --git a/lib/util/source-code.js b/lib/source-code/source-code.js similarity index 97% rename from lib/util/source-code.js rename to lib/source-code/source-code.js index 93b05a87d23..88a9c0a4e43 100644 --- a/lib/util/source-code.js +++ b/lib/source-code/source-code.js @@ -8,9 +8,11 @@ // Requirements //------------------------------------------------------------------------------ -const TokenStore = require("../token-store"), - Traverser = require("./traverser"), - astUtils = require("../util/ast-utils"), +const + { isCommentToken } = require("eslint-utils"), + TokenStore = require("./token-store"), + astUtils = require("../shared/ast-utils"), + Traverser = require("../shared/traverser"), lodash = require("lodash"); //------------------------------------------------------------------------------ @@ -149,7 +151,7 @@ class SourceCode extends TokenStore { this.visitorKeys = visitorKeys || Traverser.DEFAULT_VISITOR_KEYS; // Check the source text for the presence of a shebang since it is parsed as a standard line comment. - const shebangMatched = this.text.match(astUtils.SHEBANG_MATCHER); + const shebangMatched = this.text.match(astUtils.shebangPattern); const hasShebang = shebangMatched && ast.comments.length && ast.comments[0].value === shebangMatched[1]; if (hasShebang) { @@ -274,7 +276,7 @@ class SourceCode extends TokenStore { ) { comments.trailing = this.getTokens(node, { includeComments: true, - filter: astUtils.isCommentToken + filter: isCommentToken }); } @@ -285,7 +287,7 @@ class SourceCode extends TokenStore { */ let currentToken = this.getTokenBefore(node, { includeComments: true }); - while (currentToken && astUtils.isCommentToken(currentToken)) { + while (currentToken && isCommentToken(currentToken)) { if (node.parent && (currentToken.start < node.parent.start)) { break; } @@ -297,7 +299,7 @@ class SourceCode extends TokenStore { currentToken = this.getTokenAfter(node, { includeComments: true }); - while (currentToken && astUtils.isCommentToken(currentToken)) { + while (currentToken && isCommentToken(currentToken)) { if (node.parent && (currentToken.end > node.parent.end)) { break; } @@ -332,7 +334,7 @@ class SourceCode extends TokenStore { if ( tokenBefore && - astUtils.isCommentToken(tokenBefore) && + isCommentToken(tokenBefore) && tokenBefore.type === "Block" && tokenBefore.value.charAt(0) === "*" && astNode.loc.start.line - tokenBefore.loc.end.line <= 1 diff --git a/lib/token-store/backward-token-comment-cursor.js b/lib/source-code/token-store/backward-token-comment-cursor.js similarity index 100% rename from lib/token-store/backward-token-comment-cursor.js rename to lib/source-code/token-store/backward-token-comment-cursor.js diff --git a/lib/token-store/backward-token-cursor.js b/lib/source-code/token-store/backward-token-cursor.js similarity index 100% rename from lib/token-store/backward-token-cursor.js rename to lib/source-code/token-store/backward-token-cursor.js diff --git a/lib/token-store/cursor.js b/lib/source-code/token-store/cursor.js similarity index 100% rename from lib/token-store/cursor.js rename to lib/source-code/token-store/cursor.js diff --git a/lib/token-store/cursors.js b/lib/source-code/token-store/cursors.js similarity index 100% rename from lib/token-store/cursors.js rename to lib/source-code/token-store/cursors.js diff --git a/lib/token-store/decorative-cursor.js b/lib/source-code/token-store/decorative-cursor.js similarity index 100% rename from lib/token-store/decorative-cursor.js rename to lib/source-code/token-store/decorative-cursor.js diff --git a/lib/token-store/filter-cursor.js b/lib/source-code/token-store/filter-cursor.js similarity index 100% rename from lib/token-store/filter-cursor.js rename to lib/source-code/token-store/filter-cursor.js diff --git a/lib/token-store/forward-token-comment-cursor.js b/lib/source-code/token-store/forward-token-comment-cursor.js similarity index 100% rename from lib/token-store/forward-token-comment-cursor.js rename to lib/source-code/token-store/forward-token-comment-cursor.js diff --git a/lib/token-store/forward-token-cursor.js b/lib/source-code/token-store/forward-token-cursor.js similarity index 100% rename from lib/token-store/forward-token-cursor.js rename to lib/source-code/token-store/forward-token-cursor.js diff --git a/lib/token-store/index.js b/lib/source-code/token-store/index.js similarity index 99% rename from lib/token-store/index.js rename to lib/source-code/token-store/index.js index d59a0bba03b..8f9b09e95ef 100644 --- a/lib/token-store/index.js +++ b/lib/source-code/token-store/index.js @@ -9,11 +9,11 @@ //------------------------------------------------------------------------------ const assert = require("assert"); +const { isCommentToken } = require("eslint-utils"); const cursors = require("./cursors"); const ForwardTokenCursor = require("./forward-token-cursor"); const PaddedTokenCursor = require("./padded-token-cursor"); const utils = require("./utils"); -const astUtils = require("../util/ast-utils"); //------------------------------------------------------------------------------ // Helpers @@ -184,7 +184,7 @@ function getAdjacentCommentTokensFromCursor(cursor) { const tokens = []; let currentToken = cursor.getOneToken(); - while (currentToken && astUtils.isCommentToken(currentToken)) { + while (currentToken && isCommentToken(currentToken)) { tokens.push(currentToken); currentToken = cursor.getOneToken(); } @@ -627,7 +627,7 @@ module.exports = class TokenStore { getCommentsInside(node) { return this.getTokens(node, { includeComments: true, - filter: astUtils.isCommentToken + filter: isCommentToken }); } }; diff --git a/lib/token-store/limit-cursor.js b/lib/source-code/token-store/limit-cursor.js similarity index 100% rename from lib/token-store/limit-cursor.js rename to lib/source-code/token-store/limit-cursor.js diff --git a/lib/token-store/padded-token-cursor.js b/lib/source-code/token-store/padded-token-cursor.js similarity index 100% rename from lib/token-store/padded-token-cursor.js rename to lib/source-code/token-store/padded-token-cursor.js diff --git a/lib/token-store/skip-cursor.js b/lib/source-code/token-store/skip-cursor.js similarity index 100% rename from lib/token-store/skip-cursor.js rename to lib/source-code/token-store/skip-cursor.js diff --git a/lib/token-store/utils.js b/lib/source-code/token-store/utils.js similarity index 100% rename from lib/token-store/utils.js rename to lib/source-code/token-store/utils.js diff --git a/tests/conf/config-schema.js b/tests/conf/config-schema.js index 09fa86061ac..0725ee7dd7e 100644 --- a/tests/conf/config-schema.js +++ b/tests/conf/config-schema.js @@ -12,7 +12,7 @@ const configSchema = require("../../conf/config-schema.js"), assert = require("assert"); -const ajv = require("../../lib/util/ajv")(); +const ajv = require("../../lib/shared/ajv")(); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/cli-engine/_utils.js b/tests/lib/cli-engine/_utils.js index b29da0789a6..94d6c0158d2 100644 --- a/tests/lib/cli-engine/_utils.js +++ b/tests/lib/cli-engine/_utils.js @@ -64,15 +64,15 @@ const Proxyquire = require("proxyquire/lib/proxyquire"); const CascadingConfigArrayFactoryPath = require.resolve("../../../lib/cli-engine/cascading-config-array-factory"); const CLIEnginePath = - require.resolve("../../../lib/cli-engine"); + require.resolve("../../../lib/cli-engine/cli-engine"); const ConfigArrayFactoryPath = require.resolve("../../../lib/cli-engine/config-array-factory"); const FileEnumeratorPath = require.resolve("../../../lib/cli-engine/file-enumerator"); const IgnoredPathsPath = - require.resolve("../../../lib/util/ignored-paths"); + require.resolve("../../../lib/cli-engine/ignored-paths"); const LoadRulesPath = - require.resolve("../../../lib/load-rules"); + require.resolve("../../../lib/cli-engine/load-rules"); const ESLintAllPath = require.resolve("../../../conf/eslint-all"); const ESLintRecommendedPath = @@ -277,7 +277,7 @@ function supportMkdirRecursiveOption(fs, cwd) { * @param {Object} options The options. * @param {() => string} [options.cwd] The current working directory. * @param {Object} [options.files] The initial files definition in the in-memory file system. - * @returns {{ fs: import("fs"), RelativeModuleResolver: import("../../../lib/util/relative-module-resolver"), ConfigArrayFactory: import("../../../lib/cli-engine/config-array-factory")["ConfigArrayFactory"] }} The stubbed `ConfigArrayFactory` class. + * @returns {{ fs: import("fs"), RelativeModuleResolver: import("../../../lib/shared/relative-module-resolver"), ConfigArrayFactory: import("../../../lib/cli-engine/config-array-factory")["ConfigArrayFactory"] }} The stubbed `ConfigArrayFactory` class. */ function defineConfigArrayFactoryWithInMemoryFileSystem({ cwd = process.cwd, @@ -306,7 +306,7 @@ function defineConfigArrayFactoryWithInMemoryFileSystem({ stubs.fs = fs; stubs["import-fresh"] = fsImportFresh.bind(null, fs, stubs); - stubs["../util/relative-module-resolver"] = RelativeModuleResolver; + stubs["../shared/relative-module-resolver"] = RelativeModuleResolver; /* * Write all files to the in-memory file system and compile all JavaScript @@ -383,7 +383,7 @@ function defineConfigArrayFactoryWithInMemoryFileSystem({ * @param {Object} options The options. * @param {() => string} [options.cwd] The current working directory. * @param {Object} [options.files] The initial files definition in the in-memory file system. - * @returns {{ fs: import("fs"), RelativeModuleResolver: import("../../../lib/util/relative-module-resolver"), ConfigArrayFactory: import("../../../lib/cli-engine/config-array-factory")["ConfigArrayFactory"], CascadingConfigArrayFactory: import("../../../lib/cli-engine/cascading-config-array-factory")["CascadingConfigArrayFactory"] }} The stubbed `CascadingConfigArrayFactory` class. + * @returns {{ fs: import("fs"), RelativeModuleResolver: import("../../../lib/shared/relative-module-resolver"), ConfigArrayFactory: import("../../../lib/cli-engine/config-array-factory")["ConfigArrayFactory"], CascadingConfigArrayFactory: import("../../../lib/cli-engine/cascading-config-array-factory")["CascadingConfigArrayFactory"] }} The stubbed `CascadingConfigArrayFactory` class. */ function defineCascadingConfigArrayFactoryWithInMemoryFileSystem({ cwd = process.cwd, @@ -395,7 +395,7 @@ function defineCascadingConfigArrayFactoryWithInMemoryFileSystem({ const { CascadingConfigArrayFactory } = proxyquire(CascadingConfigArrayFactoryPath, { "./config-array-factory": { ConfigArrayFactory }, - "../load-rules": loadRules + "./load-rules": loadRules }); // Override the default cwd. @@ -418,7 +418,7 @@ function defineCascadingConfigArrayFactoryWithInMemoryFileSystem({ * @param {Object} options The options. * @param {() => string} [options.cwd] The current working directory. * @param {Object} [options.files] The initial files definition in the in-memory file system. - * @returns {{ fs: import("fs"), RelativeModuleResolver: import("../../../lib/util/relative-module-resolver"), ConfigArrayFactory: import("../../../lib/cli-engine/config-array-factory")["ConfigArrayFactory"], CascadingConfigArrayFactory: import("../../../lib/cli-engine/cascading-config-array-factory")["CascadingConfigArrayFactory"], IgnoredPaths: import("../../../lib/cli-engine/ignored-paths")["IgnoredPaths"], FileEnumerator: import("../../../lib/cli-engine/file-enumerator")["FileEnumerator"] }} The stubbed `FileEnumerator` class. + * @returns {{ fs: import("fs"), RelativeModuleResolver: import("../../../lib/shared/relative-module-resolver"), ConfigArrayFactory: import("../../../lib/cli-engine/config-array-factory")["ConfigArrayFactory"], CascadingConfigArrayFactory: import("../../../lib/cli-engine/cascading-config-array-factory")["CascadingConfigArrayFactory"], IgnoredPaths: import("../../../lib/cli-engine/ignored-paths")["IgnoredPaths"], FileEnumerator: import("../../../lib/cli-engine/file-enumerator")["FileEnumerator"] }} The stubbed `FileEnumerator` class. */ function defineFileEnumeratorWithInMemoryFileSystem({ cwd = process.cwd, @@ -435,7 +435,7 @@ function defineFileEnumeratorWithInMemoryFileSystem({ const { FileEnumerator } = proxyquire(FileEnumeratorPath, { fs, "./cascading-config-array-factory": { CascadingConfigArrayFactory }, - "../util/ignored-paths": { IgnoredPaths } + "./ignored-paths": { IgnoredPaths } }); // Override the default cwd. @@ -460,7 +460,7 @@ function defineFileEnumeratorWithInMemoryFileSystem({ * @param {Object} options The options. * @param {() => string} [options.cwd] The current working directory. * @param {Object} [options.files] The initial files definition in the in-memory file system. - * @returns {{ fs: import("fs"), RelativeModuleResolver: import("../../../lib/util/relative-module-resolver"), ConfigArrayFactory: import("../../../lib/cli-engine/config-array-factory")["ConfigArrayFactory"], CascadingConfigArrayFactory: import("../../../lib/cli-engine/cascading-config-array-factory")["CascadingConfigArrayFactory"], IgnoredPaths: import("../../../lib/cli-engine/ignored-paths")["IgnoredPaths"], FileEnumerator: import("../../../lib/cli-engine/file-enumerator")["FileEnumerator"], CLIEngine: import("../../../lib/cli-engine")["CLIEngine"], getCLIEngineInternalSlots: import("../../../lib/cli-engine")["getCLIEngineInternalSlots"] }} The stubbed `CLIEngine` class. + * @returns {{ fs: import("fs"), RelativeModuleResolver: import("../../../lib/shared/relative-module-resolver"), ConfigArrayFactory: import("../../../lib/cli-engine/config-array-factory")["ConfigArrayFactory"], CascadingConfigArrayFactory: import("../../../lib/cli-engine/cascading-config-array-factory")["CascadingConfigArrayFactory"], IgnoredPaths: import("../../../lib/cli-engine/ignored-paths")["IgnoredPaths"], FileEnumerator: import("../../../lib/cli-engine/file-enumerator")["FileEnumerator"], CLIEngine: import("../../../lib/cli-engine/cli-engine")["CLIEngine"], getCLIEngineInternalSlots: import("../../../lib/cli-engine/cli-engine")["getCLIEngineInternalSlots"] }} The stubbed `CLIEngine` class. */ function defineCLIEngineWithInMemoryFileSystem({ cwd = process.cwd, @@ -477,10 +477,10 @@ function defineCLIEngineWithInMemoryFileSystem({ defineFileEnumeratorWithInMemoryFileSystem({ cwd, files }); const { CLIEngine, getCLIEngineInternalSlots } = proxyquire(CLIEnginePath, { fs, - "./cli-engine/cascading-config-array-factory": { CascadingConfigArrayFactory }, - "./cli-engine/file-enumerator": { FileEnumerator }, - "./util/ignored-paths": { IgnoredPaths }, - "./util/relative-module-resolver": RelativeModuleResolver + "./cascading-config-array-factory": { CascadingConfigArrayFactory }, + "./file-enumerator": { FileEnumerator }, + "./ignored-paths": { IgnoredPaths }, + "../shared/relative-module-resolver": RelativeModuleResolver }); // Override the default cwd. diff --git a/tests/lib/cli-engine.js b/tests/lib/cli-engine/cli-engine.js similarity index 99% rename from tests/lib/cli-engine.js rename to tests/lib/cli-engine/cli-engine.js index 2ba6eba965b..0aa68fceaf6 100644 --- a/tests/lib/cli-engine.js +++ b/tests/lib/cli-engine/cli-engine.js @@ -16,9 +16,9 @@ const assert = require("chai").assert, shell = require("shelljs"), fs = require("fs"), os = require("os"), - hash = require("../../lib/util/hash"), - { CascadingConfigArrayFactory } = require("../../lib/cli-engine/cascading-config-array-factory"), - { defineCLIEngineWithInMemoryFileSystem } = require("./cli-engine/_utils"); + hash = require("../../../lib/cli-engine/hash"), + { CascadingConfigArrayFactory } = require("../../../lib/cli-engine/cascading-config-array-factory"), + { defineCLIEngineWithInMemoryFileSystem } = require("./_utils"); const proxyquire = require("proxyquire").noCallThru().noPreserveCache(); @@ -34,18 +34,18 @@ describe("CLIEngine", () => { examplePluginNameWithNamespace = "@eslint/eslint-plugin-example", examplePlugin = { rules: { - "example-rule": require("../fixtures/rules/custom-rule"), - "make-syntax-error": require("../fixtures/rules/make-syntax-error-rule") + "example-rule": require("../../fixtures/rules/custom-rule"), + "make-syntax-error": require("../../fixtures/rules/make-syntax-error-rule") } }, examplePreprocessorName = "eslint-plugin-processor", originalDir = process.cwd(), fixtureDir = path.resolve(fs.realpathSync(os.tmpdir()), "eslint/fixtures"); - /** @type {import("../../lib/cli-engine")["CLIEngine"]} */ + /** @type {import("../../../lib/cli-engine")["CLIEngine"]} */ let CLIEngine; - /** @type {import("../../lib/cli-engine")["getCLIEngineInternalSlots"]} */ + /** @type {import("../../../lib/cli-engine/cli-engine")["getCLIEngineInternalSlots"]} */ let getCLIEngineInternalSlots; /** @@ -75,7 +75,7 @@ describe("CLIEngine", () => { // load the mocked plugins engine.addPlugin(examplePluginName, examplePlugin); engine.addPlugin(examplePluginNameWithNamespace, examplePlugin); - engine.addPlugin(examplePreprocessorName, require("../fixtures/processors/custom-processor")); + engine.addPlugin(examplePreprocessorName, require("../../fixtures/processors/custom-processor")); return engine; } @@ -87,7 +87,7 @@ describe("CLIEngine", () => { }); beforeEach(() => { - ({ CLIEngine, getCLIEngineInternalSlots } = require("../../lib/cli-engine")); + ({ CLIEngine, getCLIEngineInternalSlots } = require("../../../lib/cli-engine/cli-engine")); }); after(() => { @@ -724,7 +724,7 @@ describe("CLIEngine", () => { originalFindPath = Module._findPath; Module._findPath = function(id, ...otherArgs) { if (id === "@scope/eslint-plugin") { - return path.resolve(__dirname, "../fixtures/plugin-shorthand/basic/node_modules/@scope/eslint-plugin/index.js"); + return path.resolve(__dirname, "../../fixtures/plugin-shorthand/basic/node_modules/@scope/eslint-plugin/index.js"); } return originalFindPath.call(this, id, ...otherArgs); }; @@ -770,7 +770,7 @@ describe("CLIEngine", () => { describe("executeOnFiles()", () => { - /** @type {InstanceType} */ + /** @type {InstanceType} */ let engine; it("should use correct parser when custom parser is specified", () => { @@ -780,7 +780,7 @@ describe("CLIEngine", () => { ignore: false }); - const filePath = path.resolve(__dirname, "../fixtures/configurations/parser/custom.js"); + const filePath = path.resolve(__dirname, "../../fixtures/configurations/parser/custom.js"); const report = engine.executeOnFiles([filePath]); assert.strictEqual(report.results.length, 1); @@ -796,7 +796,7 @@ describe("CLIEngine", () => { configFile: ".eslintrc.js" }); - const report = engine.executeOnFiles(["lib/cli*.js"]); + const report = engine.executeOnFiles(["lib/**/cli*.js"]); assert.strictEqual(report.results.length, 2); assert.strictEqual(report.results[0].messages.length, 0); @@ -810,7 +810,7 @@ describe("CLIEngine", () => { configFile: ".eslintrc.js" }); - const report = engine.executeOnFiles(["lib/cli*.js", "lib/cli.?s", "lib/{cli,cli-engine}.js"]); + const report = engine.executeOnFiles(["lib/**/cli*.js", "lib/cli.?s", "lib/{cli,cli-engine/cli-engine}.js"]); assert.strictEqual(report.results.length, 2); assert.strictEqual(report.results[0].messages.length, 0); @@ -2071,7 +2071,7 @@ describe("CLIEngine", () => { rules: { "test/example-rule": 1 } }); - engine.addPlugin("eslint-plugin-test", { rules: { "example-rule": require("../fixtures/rules/custom-rule") } }); + engine.addPlugin("eslint-plugin-test", { rules: { "example-rule": require("../../fixtures/rules/custom-rule") } }); const report = engine.executeOnFiles([fs.realpathSync(getFixturePath("rules", "test", "test-custom-rule.js"))]); @@ -3291,7 +3291,7 @@ describe("CLIEngine", () => { it("should return null when a built-in formatter doesn't exist", () => { const engine = new CLIEngine(); - const fullFormatterPath = path.resolve(__dirname, "../../lib/formatters/special"); + const fullFormatterPath = path.resolve(__dirname, "../../../lib/cli-engine/formatters/special"); assert.throws(() => { engine.getFormatter("special"); @@ -3444,7 +3444,7 @@ describe("CLIEngine", () => { it("should call fs.writeFileSync() for each result with output", () => { const fakeFS = leche.fake(fs), - localCLIEngine = proxyquire("../../lib/cli-engine", { + localCLIEngine = proxyquire("../../../lib/cli-engine/cli-engine", { fs: fakeFS }).CLIEngine, report = { @@ -3473,7 +3473,7 @@ describe("CLIEngine", () => { it("should call fs.writeFileSync() for each result with output and not at all for a result without output", () => { const fakeFS = leche.fake(fs), - localCLIEngine = proxyquire("../../lib/cli-engine", { + localCLIEngine = proxyquire("../../../lib/cli-engine/cli-engine", { fs: fakeFS }).CLIEngine, report = { @@ -3733,7 +3733,7 @@ describe("CLIEngine", () => { describe("when retreiving version number", () => { it("should return current version number", () => { - const eslintCLI = require("../../lib/cli-engine").CLIEngine; + const eslintCLI = require("../../../lib/cli-engine").CLIEngine; const version = eslintCLI.version; assert.isString(version); diff --git a/tests/lib/cli-engine/file-enumerator.js b/tests/lib/cli-engine/file-enumerator.js index 23a21c0b744..13ff479dba2 100644 --- a/tests/lib/cli-engine/file-enumerator.js +++ b/tests/lib/cli-engine/file-enumerator.js @@ -11,7 +11,7 @@ const { assert } = require("chai"); const sh = require("shelljs"); const { CascadingConfigArrayFactory } = require("../../../lib/cli-engine/cascading-config-array-factory"); -const { IgnoredPaths } = require("../../../lib/util/ignored-paths"); +const { IgnoredPaths } = require("../../../lib/cli-engine/ignored-paths"); const { defineFileEnumeratorWithInMemoryFileSystem } = require("./_utils"); describe("FileEnumerator", () => { diff --git a/tests/lib/formatters/checkstyle.js b/tests/lib/cli-engine/formatters/checkstyle.js similarity index 98% rename from tests/lib/formatters/checkstyle.js rename to tests/lib/cli-engine/formatters/checkstyle.js index 0bcece23920..2a72da15ece 100644 --- a/tests/lib/formatters/checkstyle.js +++ b/tests/lib/cli-engine/formatters/checkstyle.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const assert = require("chai").assert, - formatter = require("../../../lib/formatters/checkstyle"); + formatter = require("../../../../lib/cli-engine/formatters/checkstyle"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/formatters/codeframe.js b/tests/lib/cli-engine/formatters/codeframe.js similarity index 99% rename from tests/lib/formatters/codeframe.js rename to tests/lib/cli-engine/formatters/codeframe.js index 12fedfb3936..0cdabe6c4fd 100644 --- a/tests/lib/formatters/codeframe.js +++ b/tests/lib/cli-engine/formatters/codeframe.js @@ -35,7 +35,7 @@ const chalkStub = Object.create(chalk, { chalkStub.yellow.bold = chalk.yellow.bold; chalkStub.red.bold = chalk.red.bold; -const formatter = proxyquire("../../../lib/formatters/codeframe", { chalk: chalkStub }); +const formatter = proxyquire("../../../../lib/cli-engine/formatters/codeframe", { chalk: chalkStub }); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/formatters/compact.js b/tests/lib/cli-engine/formatters/compact.js similarity index 98% rename from tests/lib/formatters/compact.js rename to tests/lib/cli-engine/formatters/compact.js index 6f0f2703143..1a179d9f5d5 100644 --- a/tests/lib/formatters/compact.js +++ b/tests/lib/cli-engine/formatters/compact.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const assert = require("chai").assert, - formatter = require("../../../lib/formatters/compact"); + formatter = require("../../../../lib/cli-engine/formatters/compact"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/formatters/html.js b/tests/lib/cli-engine/formatters/html.js similarity index 99% rename from tests/lib/formatters/html.js rename to tests/lib/cli-engine/formatters/html.js index c9f97a2cf05..9d61cd6bb18 100644 --- a/tests/lib/formatters/html.js +++ b/tests/lib/cli-engine/formatters/html.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const assert = require("chai").assert; -const formatter = require("../../../lib/formatters/html"); +const formatter = require("../../../../lib/cli-engine/formatters/html"); const cheerio = require("cheerio"); //------------------------------------------------------------------------------ diff --git a/tests/lib/formatters/jslint-xml.js b/tests/lib/cli-engine/formatters/jslint-xml.js similarity index 98% rename from tests/lib/formatters/jslint-xml.js rename to tests/lib/cli-engine/formatters/jslint-xml.js index 52ea4a75b13..eca587a42d4 100644 --- a/tests/lib/formatters/jslint-xml.js +++ b/tests/lib/cli-engine/formatters/jslint-xml.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const assert = require("chai").assert, - formatter = require("../../../lib/formatters/jslint-xml"); + formatter = require("../../../../lib/cli-engine/formatters/jslint-xml"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/formatters/json-with-metadata.js b/tests/lib/cli-engine/formatters/json-with-metadata.js similarity index 96% rename from tests/lib/formatters/json-with-metadata.js rename to tests/lib/cli-engine/formatters/json-with-metadata.js index cf0692ed036..82cb20884b4 100644 --- a/tests/lib/formatters/json-with-metadata.js +++ b/tests/lib/cli-engine/formatters/json-with-metadata.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const assert = require("chai").assert, - formatter = require("../../../lib/formatters/json-with-metadata"); + formatter = require("../../../../lib/cli-engine/formatters/json-with-metadata"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/formatters/json.js b/tests/lib/cli-engine/formatters/json.js similarity index 94% rename from tests/lib/formatters/json.js rename to tests/lib/cli-engine/formatters/json.js index a2d6e1b87a7..b0bb5ffca07 100644 --- a/tests/lib/formatters/json.js +++ b/tests/lib/cli-engine/formatters/json.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const assert = require("chai").assert, - formatter = require("../../../lib/formatters/json"); + formatter = require("../../../../lib/cli-engine/formatters/json"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/formatters/junit.js b/tests/lib/cli-engine/formatters/junit.js similarity index 99% rename from tests/lib/formatters/junit.js rename to tests/lib/cli-engine/formatters/junit.js index 5a8340c3bcb..7ba0bf441a8 100644 --- a/tests/lib/formatters/junit.js +++ b/tests/lib/cli-engine/formatters/junit.js @@ -12,7 +12,7 @@ //------------------------------------------------------------------------------ const assert = require("chai").assert, - formatter = require("../../../lib/formatters/junit"); + formatter = require("../../../../lib/cli-engine/formatters/junit"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/formatters/stylish.js b/tests/lib/cli-engine/formatters/stylish.js similarity index 99% rename from tests/lib/formatters/stylish.js rename to tests/lib/cli-engine/formatters/stylish.js index 2a88a6dae91..dee58882fde 100644 --- a/tests/lib/formatters/stylish.js +++ b/tests/lib/cli-engine/formatters/stylish.js @@ -36,7 +36,7 @@ const chalkStub = Object.create(chalk, { chalkStub.yellow.bold = chalk.yellow.bold; chalkStub.red.bold = chalk.red.bold; -const formatter = proxyquire("../../../lib/formatters/stylish", { chalk: chalkStub }); +const formatter = proxyquire("../../../../lib/cli-engine/formatters/stylish", { chalk: chalkStub }); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/formatters/table.js b/tests/lib/cli-engine/formatters/table.js similarity index 99% rename from tests/lib/formatters/table.js rename to tests/lib/cli-engine/formatters/table.js index 6354fcbc258..f80a3359f5d 100644 --- a/tests/lib/formatters/table.js +++ b/tests/lib/cli-engine/formatters/table.js @@ -10,7 +10,7 @@ const assert = require("chai").assert; const chalk = require("chalk"); -const formatter = require("../../../lib/formatters/table"); +const formatter = require("../../../../lib/cli-engine/formatters/table"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/formatters/tap.js b/tests/lib/cli-engine/formatters/tap.js similarity index 99% rename from tests/lib/formatters/tap.js rename to tests/lib/cli-engine/formatters/tap.js index 903af6a8bbc..8852ee72d60 100644 --- a/tests/lib/formatters/tap.js +++ b/tests/lib/cli-engine/formatters/tap.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const assert = require("chai").assert, - formatter = require("../../../lib/formatters/tap"); + formatter = require("../../../../lib/cli-engine/formatters/tap"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/formatters/unix.js b/tests/lib/cli-engine/formatters/unix.js similarity index 98% rename from tests/lib/formatters/unix.js rename to tests/lib/cli-engine/formatters/unix.js index 3b8e36111d4..5d9a320dc65 100644 --- a/tests/lib/formatters/unix.js +++ b/tests/lib/cli-engine/formatters/unix.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const assert = require("chai").assert, - formatter = require("../../../lib/formatters/unix"); + formatter = require("../../../../lib/cli-engine/formatters/unix"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/formatters/visualstudio.js b/tests/lib/cli-engine/formatters/visualstudio.js similarity index 98% rename from tests/lib/formatters/visualstudio.js rename to tests/lib/cli-engine/formatters/visualstudio.js index 92bcdef6c35..c4ce358f039 100644 --- a/tests/lib/formatters/visualstudio.js +++ b/tests/lib/cli-engine/formatters/visualstudio.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const assert = require("chai").assert, - formatter = require("../../../lib/formatters/visualstudio"); + formatter = require("../../../../lib/cli-engine/formatters/visualstudio"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/util/ignored-paths.js b/tests/lib/cli-engine/ignored-paths.js similarity index 99% rename from tests/lib/util/ignored-paths.js rename to tests/lib/cli-engine/ignored-paths.js index 40c943fbc0e..4870244270a 100644 --- a/tests/lib/util/ignored-paths.js +++ b/tests/lib/cli-engine/ignored-paths.js @@ -12,7 +12,7 @@ const assert = require("chai").assert, path = require("path"), os = require("os"), - { IgnoredPaths } = require("../../../lib/util/ignored-paths.js"), + { IgnoredPaths } = require("../../../lib/cli-engine/ignored-paths.js"), sinon = require("sinon"), fs = require("fs"), includes = require("lodash").includes; diff --git a/tests/lib/util/lint-result-cache.js b/tests/lib/cli-engine/lint-result-cache.js similarity index 99% rename from tests/lib/util/lint-result-cache.js rename to tests/lib/cli-engine/lint-result-cache.js index e58cf7cf675..d1515f016ff 100644 --- a/tests/lib/util/lint-result-cache.js +++ b/tests/lib/cli-engine/lint-result-cache.js @@ -54,7 +54,7 @@ describe("LintResultCache", () => { fakeErrorResultsAutofix = cliEngine.executeOnFiles([path.join(fixturePath, "test-with-errors.js")]).results[0]; // Set up LintResultCache with fake fileEntryCache module - LintResultCache = proxyquire("../../../lib/util/lint-result-cache.js", { + LintResultCache = proxyquire("../../../lib/cli-engine/lint-result-cache.js", { "file-entry-cache": fileEntryCacheStubs, "./hash": hashStub }); diff --git a/tests/lib/load-rules.js b/tests/lib/cli-engine/load-rules.js similarity index 83% rename from tests/lib/load-rules.js rename to tests/lib/cli-engine/load-rules.js index 09006b4aaf2..1ff1470cd14 100644 --- a/tests/lib/load-rules.js +++ b/tests/lib/cli-engine/load-rules.js @@ -6,7 +6,7 @@ "use strict"; const assert = require("chai").assert; -const loadRules = require("../../lib/load-rules"); +const loadRules = require("../../../lib/cli-engine/load-rules"); describe("when given an invalid rules directory", () => { it("should throw an error", () => { @@ -20,6 +20,6 @@ describe("when given a valid rules directory", () => { it("should load rules and not throw an error", () => { const rules = loadRules("tests/fixtures/rules", process.cwd()); - assert.strictEqual(rules["fixture-rule"], require(require.resolve("../fixtures/rules/fixture-rule"))); + assert.strictEqual(rules["fixture-rule"], require(require.resolve("../../fixtures/rules/fixture-rule"))); }); }); diff --git a/tests/lib/util/naming.js b/tests/lib/cli-engine/naming.js similarity index 97% rename from tests/lib/util/naming.js rename to tests/lib/cli-engine/naming.js index e9806701869..3bc917baf1f 100644 --- a/tests/lib/util/naming.js +++ b/tests/lib/cli-engine/naming.js @@ -9,7 +9,7 @@ const assert = require("chai").assert, leche = require("leche"), - naming = require("../../../lib/util/naming"); + naming = require("../../../lib/cli-engine/naming"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/cli.js b/tests/lib/cli.js index 54bf3867cdf..f3b2635fb1a 100644 --- a/tests/lib/cli.js +++ b/tests/lib/cli.js @@ -15,7 +15,7 @@ //------------------------------------------------------------------------------ const assert = require("chai").assert, - CLIEngine = require("../../lib/cli-engine").CLIEngine, + CLIEngine = require("../../lib/cli-engine/index").CLIEngine, path = require("path"), sinon = require("sinon"), leche = require("leche"), @@ -37,7 +37,7 @@ describe("cli", () => { error: sinon.spy() }; const cli = proxyquire("../../lib/cli", { - "./util/logging": log + "./shared/logging": log }); /** @@ -57,8 +57,8 @@ describe("cli", () => { sandbox.stub(fakeCLIEngine.prototype, "getFormatter").returns(sinon.spy()); const localCLI = proxyquire("../../lib/cli", { - "./cli-engine": { CLIEngine: fakeCLIEngine }, - "./util/logging": log + "./cli-engine/index": { CLIEngine: fakeCLIEngine }, + "./shared/logging": log }); localCLI.execute(cmd); @@ -716,8 +716,8 @@ describe("cli", () => { fakeCLIEngine.outputFixes = sandbox.stub(); localCLI = proxyquire("../../lib/cli", { - "./cli-engine": { CLIEngine: fakeCLIEngine }, - "./util/logging": log + "./cli-engine/index": { CLIEngine: fakeCLIEngine }, + "./shared/logging": log }); localCLI.execute("--no-inline-config ."); @@ -739,8 +739,8 @@ describe("cli", () => { fakeCLIEngine.outputFixes = sandbox.stub(); localCLI = proxyquire("../../lib/cli", { - "./cli-engine": { CLIEngine: fakeCLIEngine }, - "./util/logging": log + "./cli-engine/index": { CLIEngine: fakeCLIEngine }, + "./shared/logging": log }); const exitCode = localCLI.execute("."); @@ -776,8 +776,8 @@ describe("cli", () => { fakeCLIEngine.outputFixes = sandbox.mock().once(); localCLI = proxyquire("../../lib/cli", { - "./cli-engine": { CLIEngine: fakeCLIEngine }, - "./util/logging": log + "./cli-engine/index": { CLIEngine: fakeCLIEngine }, + "./shared/logging": log }); const exitCode = localCLI.execute("--fix ."); @@ -814,8 +814,8 @@ describe("cli", () => { fakeCLIEngine.outputFixes = sandbox.mock().withExactArgs(report); localCLI = proxyquire("../../lib/cli", { - "./cli-engine": { CLIEngine: fakeCLIEngine }, - "./util/logging": log + "./cli-engine/index": { CLIEngine: fakeCLIEngine }, + "./shared/logging": log }); const exitCode = localCLI.execute("--fix ."); @@ -852,8 +852,8 @@ describe("cli", () => { fakeCLIEngine.outputFixes = sandbox.mock().withExactArgs(report); localCLI = proxyquire("../../lib/cli", { - "./cli-engine": { CLIEngine: fakeCLIEngine }, - "./util/logging": log + "./cli-engine/index": { CLIEngine: fakeCLIEngine }, + "./shared/logging": log }); const exitCode = localCLI.execute("--fix --quiet ."); @@ -868,8 +868,8 @@ describe("cli", () => { const fakeCLIEngine = sandbox.mock().never(); localCLI = proxyquire("../../lib/cli", { - "./cli-engine": { CLIEngine: fakeCLIEngine }, - "./util/logging": log + "./cli-engine/index": { CLIEngine: fakeCLIEngine }, + "./shared/logging": log }); const exitCode = localCLI.execute("--fix .", "foo = bar;"); @@ -903,8 +903,8 @@ describe("cli", () => { fakeCLIEngine.outputFixes = sandbox.mock().never(); localCLI = proxyquire("../../lib/cli", { - "./cli-engine": { CLIEngine: fakeCLIEngine }, - "./util/logging": log + "./cli-engine/index": { CLIEngine: fakeCLIEngine }, + "./shared/logging": log }); const exitCode = localCLI.execute("--fix-dry-run ."); @@ -934,8 +934,8 @@ describe("cli", () => { fakeCLIEngine.outputFixes = sandbox.stub(); localCLI = proxyquire("../../lib/cli", { - "./cli-engine": { CLIEngine: fakeCLIEngine }, - "./util/logging": log + "./cli-engine/index": { CLIEngine: fakeCLIEngine }, + "./shared/logging": log }); const exitCode = localCLI.execute("--fix-dry-run --fix-type suggestion ."); @@ -970,8 +970,8 @@ describe("cli", () => { fakeCLIEngine.outputFixes = sandbox.mock().never(); localCLI = proxyquire("../../lib/cli", { - "./cli-engine": { CLIEngine: fakeCLIEngine }, - "./util/logging": log + "./cli-engine/index": { CLIEngine: fakeCLIEngine }, + "./shared/logging": log }); const exitCode = localCLI.execute("--fix-dry-run ."); @@ -1008,8 +1008,8 @@ describe("cli", () => { fakeCLIEngine.outputFixes = sandbox.mock().never(); localCLI = proxyquire("../../lib/cli", { - "./cli-engine": { CLIEngine: fakeCLIEngine }, - "./util/logging": log + "./cli-engine/index": { CLIEngine: fakeCLIEngine }, + "./shared/logging": log }); const exitCode = localCLI.execute("--fix-dry-run --quiet ."); @@ -1045,8 +1045,8 @@ describe("cli", () => { fakeCLIEngine.outputFixes = sandbox.mock().never(); localCLI = proxyquire("../../lib/cli", { - "./cli-engine": { CLIEngine: fakeCLIEngine }, - "./util/logging": log + "./cli-engine/index": { CLIEngine: fakeCLIEngine }, + "./shared/logging": log }); const exitCode = localCLI.execute("--fix-dry-run .", "foo = bar;"); @@ -1060,8 +1060,8 @@ describe("cli", () => { const fakeCLIEngine = sandbox.mock().never(); localCLI = proxyquire("../../lib/cli", { - "./cli-engine": { CLIEngine: fakeCLIEngine }, - "./util/logging": log + "./cli-engine/index": { CLIEngine: fakeCLIEngine }, + "./shared/logging": log }); const exitCode = localCLI.execute("--fix --fix-dry-run .", "foo = bar;"); diff --git a/tests/lib/config/autoconfig.js b/tests/lib/init/autoconfig.js similarity index 99% rename from tests/lib/config/autoconfig.js rename to tests/lib/init/autoconfig.js index 7d304eeb4d0..3ce766a1283 100644 --- a/tests/lib/config/autoconfig.js +++ b/tests/lib/init/autoconfig.js @@ -10,8 +10,8 @@ //------------------------------------------------------------------------------ const assert = require("chai").assert, - autoconfig = require("../../../lib/config/autoconfig"), - sourceCodeUtils = require("../../../lib/util/source-code-utils"), + autoconfig = require("../../../lib/init/autoconfig"), + sourceCodeUtils = require("../../../lib/init/source-code-utils"), baseDefaultOptions = require("../../../conf/default-cli-options"); const defaultOptions = Object.assign({}, baseDefaultOptions, { cwd: process.cwd() }); diff --git a/tests/lib/config/config-file.js b/tests/lib/init/config-file.js similarity index 94% rename from tests/lib/config/config-file.js rename to tests/lib/init/config-file.js index 4ff7336edcb..c90a038f801 100644 --- a/tests/lib/config/config-file.js +++ b/tests/lib/init/config-file.js @@ -15,7 +15,7 @@ const assert = require("chai").assert, fs = require("fs"), yaml = require("js-yaml"), espree = require("espree"), - ConfigFile = require("../../../lib/config/config-file"), + ConfigFile = require("../../../lib/init/config-file"), { CLIEngine } = require("../../../lib/cli-engine"); const proxyquire = require("proxyquire").noCallThru().noPreserveCache(); @@ -78,7 +78,7 @@ describe("ConfigFile", () => { "utf8" ); - const StubbedConfigFile = proxyquire("../../../lib/config/config-file", { + const StubbedConfigFile = proxyquire("../../../lib/init/config-file", { fs: fakeFS }); @@ -102,7 +102,7 @@ describe("ConfigFile", () => { "utf8" ); - const StubbedConfigFile = proxyquire("../../../lib/config/config-file", { + const StubbedConfigFile = proxyquire("../../../lib/init/config-file", { fs: fakeFS }); @@ -122,7 +122,7 @@ describe("ConfigFile", () => { sandbox.mock(fakeFS).expects("writeFileSync").once(); - const StubbedConfigFile = proxyquire("../../../lib/config/config-file", { + const StubbedConfigFile = proxyquire("../../../lib/init/config-file", { fs: fakeFS, "../cli-engine": { CLIEngine: fakeCLIEngine } }); diff --git a/tests/lib/config/config-initializer.js b/tests/lib/init/config-initializer.js similarity index 98% rename from tests/lib/config/config-initializer.js rename to tests/lib/init/config-initializer.js index dea1220cc25..9697d826670 100644 --- a/tests/lib/config/config-initializer.js +++ b/tests/lib/init/config-initializer.js @@ -15,8 +15,8 @@ const assert = require("chai").assert, os = require("os"), sinon = require("sinon"), sh = require("shelljs"), - autoconfig = require("../../../lib/config/autoconfig"), - npmUtils = require("../../../lib/util/npm-utils"); + autoconfig = require("../../../lib/init/autoconfig"), + npmUtils = require("../../../lib/init/npm-utils"); const originalDir = process.cwd(); const proxyquire = require("proxyquire").noPreserveCache(); @@ -41,8 +41,8 @@ describe("configInitializer", () => { error: sinon.spy() }; const requireStubs = { - "../util/logging": log, - "../util/relative-module-resolver": { + "../shared/logging": log, + "../shared/relative-module-resolver": { resolve() { if (localESLintVersion) { return `local-eslint-${localESLintVersion}`; @@ -92,7 +92,7 @@ describe("configInitializer", () => { "eslint-plugin-import": "^2.2.0", "eslint-plugin-react": "^7.0.1" }); - init = proxyquire("../../../lib/config/config-initializer", requireStubs); + init = proxyquire("../../../lib/init/config-initializer", requireStubs); }); afterEach(() => { diff --git a/tests/lib/config/config-rule.js b/tests/lib/init/config-rule.js similarity index 98% rename from tests/lib/config/config-rule.js rename to tests/lib/init/config-rule.js index dcd18571f2a..425317dd2c8 100644 --- a/tests/lib/config/config-rule.js +++ b/tests/lib/init/config-rule.js @@ -10,8 +10,8 @@ //------------------------------------------------------------------------------ const assert = require("chai").assert, - ConfigRule = require("../../../lib/config/config-rule"), - builtInRules = require("../../../lib/built-in-rules-index"), + ConfigRule = require("../../../lib/init/config-rule"), + builtInRules = require("../../../lib/rules"), schema = require("../../fixtures/config-rule/schemas"); //------------------------------------------------------------------------------ diff --git a/tests/lib/util/npm-utils.js b/tests/lib/init/npm-utils.js similarity index 98% rename from tests/lib/util/npm-utils.js rename to tests/lib/init/npm-utils.js index 2bbab8ec598..ae14f038349 100644 --- a/tests/lib/util/npm-utils.js +++ b/tests/lib/init/npm-utils.js @@ -14,8 +14,8 @@ const spawn = require("cross-spawn"), MemoryFs = require("metro-memory-fs"), sinon = require("sinon"), - npmUtils = require("../../../lib/util/npm-utils"), - log = require("../../../lib/util/logging"); + npmUtils = require("../../../lib/init/npm-utils"), + log = require("../../../lib/shared/logging"); const proxyquire = require("proxyquire").noCallThru().noPreserveCache(); @@ -51,7 +51,7 @@ function requireNpmUtilsWithInMemoryFileSystem(files) { } // Stub. - return proxyquire("../../../lib/util/npm-utils", { fs }); + return proxyquire("../../../lib/init/npm-utils", { fs }); } //------------------------------------------------------------------------------ diff --git a/tests/lib/util/source-code-utils.js b/tests/lib/init/source-code-utils.js similarity index 98% rename from tests/lib/util/source-code-utils.js rename to tests/lib/init/source-code-utils.js index db100e90d03..1b4a036b564 100644 --- a/tests/lib/util/source-code-utils.js +++ b/tests/lib/init/source-code-utils.js @@ -15,7 +15,7 @@ const path = require("path"), assert = require("chai").assert, sinon = require("sinon"), sh = require("shelljs"), - SourceCode = require("../../../lib/util/source-code"); + { SourceCode } = require("../../../lib/source-code"); const proxyquire = require("proxyquire").noCallThru().noPreserveCache(); const originalDir = process.cwd(); @@ -62,7 +62,7 @@ describe("SourceCodeUtil", () => { }); beforeEach(() => { - getSourceCodeOfFiles = proxyquire("../../../lib/util/source-code-utils", requireStubs).getSourceCodeOfFiles; + getSourceCodeOfFiles = proxyquire("../../../lib/init/source-code-utils", requireStubs).getSourceCodeOfFiles; }); afterEach(() => { diff --git a/tests/lib/util/apply-disable-directives.js b/tests/lib/linter/apply-disable-directives.js similarity index 99% rename from tests/lib/util/apply-disable-directives.js rename to tests/lib/linter/apply-disable-directives.js index 81e58994fa9..440b2810f50 100644 --- a/tests/lib/util/apply-disable-directives.js +++ b/tests/lib/linter/apply-disable-directives.js @@ -6,7 +6,7 @@ "use strict"; const assert = require("chai").assert; -const applyDisableDirectives = require("../../../lib/util/apply-disable-directives"); +const applyDisableDirectives = require("../../../lib/linter/apply-disable-directives"); describe("apply-disable-directives", () => { describe("/* eslint-disable */ comments without rules", () => { diff --git a/tests/lib/code-path-analysis/code-path-analyzer.js b/tests/lib/linter/code-path-analysis/code-path-analyzer.js similarity index 96% rename from tests/lib/code-path-analysis/code-path-analyzer.js rename to tests/lib/linter/code-path-analysis/code-path-analyzer.js index f9bc6c2cff9..c682b112fd6 100644 --- a/tests/lib/code-path-analysis/code-path-analyzer.js +++ b/tests/lib/linter/code-path-analysis/code-path-analyzer.js @@ -12,14 +12,14 @@ const assert = require("assert"), fs = require("fs"), path = require("path"), - { Linter } = require("../../../lib/linter"), - EventGeneratorTester = require("../../../tools/internal-testers/event-generator-tester"), - createEmitter = require("../../../lib/util/safe-emitter"), - debug = require("../../../lib/code-path-analysis/debug-helpers"), - CodePath = require("../../../lib/code-path-analysis/code-path"), - CodePathAnalyzer = require("../../../lib/code-path-analysis/code-path-analyzer"), - CodePathSegment = require("../../../lib/code-path-analysis/code-path-segment"), - NodeEventGenerator = require("../../../lib/util/node-event-generator"); + { Linter } = require("../../../../lib/linter"), + EventGeneratorTester = require("../../../../tools/internal-testers/event-generator-tester"), + createEmitter = require("../../../../lib/linter/safe-emitter"), + debug = require("../../../../lib/linter/code-path-analysis/debug-helpers"), + CodePath = require("../../../../lib/linter/code-path-analysis/code-path"), + CodePathAnalyzer = require("../../../../lib/linter/code-path-analysis/code-path-analyzer"), + CodePathSegment = require("../../../../lib/linter/code-path-analysis/code-path-segment"), + NodeEventGenerator = require("../../../../lib/linter/node-event-generator"); //------------------------------------------------------------------------------ // Helpers @@ -541,7 +541,7 @@ describe("CodePathAnalyzer", () => { }); describe("completed code paths are correct", () => { - const testDataDir = path.join(__dirname, "../../fixtures/code-path-analysis/"); + const testDataDir = path.join(__dirname, "../../../fixtures/code-path-analysis/"); const testDataFiles = fs.readdirSync(testDataDir); testDataFiles.forEach(file => { diff --git a/tests/lib/code-path-analysis/code-path.js b/tests/lib/linter/code-path-analysis/code-path.js similarity index 99% rename from tests/lib/code-path-analysis/code-path.js rename to tests/lib/linter/code-path-analysis/code-path.js index 5f50a754a92..cb1b53457d7 100644 --- a/tests/lib/code-path-analysis/code-path.js +++ b/tests/lib/linter/code-path-analysis/code-path.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const assert = require("assert"), - { Linter } = require("../../../lib/linter"); + { Linter } = require("../../../../lib/linter"); const linter = new Linter(); //------------------------------------------------------------------------------ diff --git a/tests/lib/util/config-comment-parser.js b/tests/lib/linter/config-comment-parser.js similarity index 98% rename from tests/lib/util/config-comment-parser.js rename to tests/lib/linter/config-comment-parser.js index 41583d65c49..f51fe693a73 100644 --- a/tests/lib/util/config-comment-parser.js +++ b/tests/lib/linter/config-comment-parser.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const assert = require("chai").assert, - ConfigCommentParser = require("../../../lib/util/config-comment-parser"); + ConfigCommentParser = require("../../../lib/linter/config-comment-parser"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/util/interpolate.js b/tests/lib/linter/interpolate.js similarity index 91% rename from tests/lib/util/interpolate.js rename to tests/lib/linter/interpolate.js index 89e5498db5f..a70579042be 100644 --- a/tests/lib/util/interpolate.js +++ b/tests/lib/linter/interpolate.js @@ -1,7 +1,7 @@ "use strict"; const assert = require("chai").assert; -const interpolate = require("../../../lib/util/interpolate"); +const interpolate = require("../../../lib/linter/interpolate"); describe("interpolate()", () => { it("passes through text without {{ }}", () => { diff --git a/tests/lib/linter.js b/tests/lib/linter/linter.js similarity index 99% rename from tests/lib/linter.js rename to tests/lib/linter/linter.js index 136f50180d0..71087a6ce8f 100644 --- a/tests/lib/linter.js +++ b/tests/lib/linter/linter.js @@ -33,9 +33,9 @@ function compatRequire(name, windowName) { const assert = require("chai").assert, sinon = require("sinon"), esprima = require("esprima"), - testParsers = require("../fixtures/parsers/linter-test-parsers"); + testParsers = require("../../fixtures/parsers/linter-test-parsers"); -const { Linter } = compatRequire("../../lib/linter", "eslint"); +const { Linter } = compatRequire("../../../lib/linter", "eslint"); //------------------------------------------------------------------------------ // Constants diff --git a/tests/lib/util/node-event-generator.js b/tests/lib/linter/node-event-generator.js similarity index 98% rename from tests/lib/util/node-event-generator.js rename to tests/lib/linter/node-event-generator.js index 492916334f4..8d12cbbdc9d 100644 --- a/tests/lib/util/node-event-generator.js +++ b/tests/lib/linter/node-event-generator.js @@ -11,10 +11,10 @@ const assert = require("assert"), sinon = require("sinon"), espree = require("espree"), - Traverser = require("../../../lib/util/traverser"), + Traverser = require("../../../lib/shared/traverser"), EventGeneratorTester = require("../../../tools/internal-testers/event-generator-tester"), - createEmitter = require("../../../lib/util/safe-emitter"), - NodeEventGenerator = require("../../../lib/util/node-event-generator"); + createEmitter = require("../../../lib/linter/safe-emitter"), + NodeEventGenerator = require("../../../lib/linter/node-event-generator"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/util/report-translator.js b/tests/lib/linter/report-translator.js similarity index 99% rename from tests/lib/util/report-translator.js rename to tests/lib/linter/report-translator.js index 2f8d655f87e..2a3cda6c7e2 100644 --- a/tests/lib/util/report-translator.js +++ b/tests/lib/linter/report-translator.js @@ -9,9 +9,9 @@ //------------------------------------------------------------------------------ const assert = require("chai").assert; -const SourceCode = require("../../../lib/util/source-code"); +const { SourceCode } = require("../../../lib/source-code"); const espree = require("espree"); -const createReportTranslator = require("../../../lib/util/report-translator"); +const createReportTranslator = require("../../../lib/linter/report-translator"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/util/rule-fixer.js b/tests/lib/linter/rule-fixer.js similarity index 98% rename from tests/lib/util/rule-fixer.js rename to tests/lib/linter/rule-fixer.js index c587eca7d2b..a70e735509c 100644 --- a/tests/lib/util/rule-fixer.js +++ b/tests/lib/linter/rule-fixer.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const assert = require("chai").assert, - ruleFixer = require("../../../lib/util/rule-fixer"); + ruleFixer = require("../../../lib/linter/rule-fixer"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules.js b/tests/lib/linter/rules.js similarity index 97% rename from tests/lib/rules.js rename to tests/lib/linter/rules.js index 8d33182df4d..950a24d2301 100644 --- a/tests/lib/rules.js +++ b/tests/lib/linter/rules.js @@ -10,8 +10,8 @@ //------------------------------------------------------------------------------ const assert = require("chai").assert, - Rules = require("../../lib/rules"), - { Linter } = require("../../lib/linter"); + Rules = require("../../../lib/linter/rules"), + { Linter } = require("../../../lib/linter"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/util/safe-emitter.js b/tests/lib/linter/safe-emitter.js similarity index 94% rename from tests/lib/util/safe-emitter.js rename to tests/lib/linter/safe-emitter.js index a467d7f274a..e76e1a07d8e 100644 --- a/tests/lib/util/safe-emitter.js +++ b/tests/lib/linter/safe-emitter.js @@ -5,7 +5,7 @@ "use strict"; -const createEmitter = require("../../../lib/util/safe-emitter"); +const createEmitter = require("../../../lib/linter/safe-emitter"); const assert = require("chai").assert; describe("safe-emitter", () => { diff --git a/tests/lib/util/source-code-fixer.js b/tests/lib/linter/source-code-fixer.js similarity index 99% rename from tests/lib/util/source-code-fixer.js rename to tests/lib/linter/source-code-fixer.js index 56918f51340..15df35cb987 100644 --- a/tests/lib/util/source-code-fixer.js +++ b/tests/lib/linter/source-code-fixer.js @@ -10,7 +10,7 @@ const assert = require("chai").assert, sinon = require("sinon"), - SourceCodeFixer = require("../../../lib/util/source-code-fixer"); + SourceCodeFixer = require("../../../lib/linter/source-code-fixer"); //------------------------------------------------------------------------------ // Helpers diff --git a/tests/lib/testers/no-test-runners.js b/tests/lib/rule-tester/no-test-runners.js similarity index 92% rename from tests/lib/testers/no-test-runners.js rename to tests/lib/rule-tester/no-test-runners.js index eac1da3fd5b..d6b26d34fad 100644 --- a/tests/lib/testers/no-test-runners.js +++ b/tests/lib/rule-tester/no-test-runners.js @@ -6,7 +6,7 @@ /* eslint-disable no-global-assign*/ const assert = require("assert"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); const tmpIt = it; const tmpDescribe = describe; diff --git a/tests/lib/testers/rule-tester.js b/tests/lib/rule-tester/rule-tester.js similarity index 99% rename from tests/lib/testers/rule-tester.js rename to tests/lib/rule-tester/rule-tester.js index 2ff61f1a547..555d9786b1e 100644 --- a/tests/lib/testers/rule-tester.js +++ b/tests/lib/rule-tester/rule-tester.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const sinon = require("sinon"), EventEmitter = require("events"), - RuleTester = require("../../../lib/testers/rule-tester"), + { RuleTester } = require("../../../lib/rule-tester"), assert = require("chai").assert, nodeAssert = require("assert"); diff --git a/tests/lib/rules/_set-default-parser.js b/tests/lib/rules/_set-default-parser.js index 0766407589b..7774313855e 100644 --- a/tests/lib/rules/_set-default-parser.js +++ b/tests/lib/rules/_set-default-parser.js @@ -13,7 +13,7 @@ "use strict"; const path = require("path"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); RuleTester.setDefaultConfig({ parser: path.resolve(__dirname, "../../../tools/internal-testers/test-parser") diff --git a/tests/lib/rules/accessor-pairs.js b/tests/lib/rules/accessor-pairs.js index 6470324f998..42ca8461de3 100644 --- a/tests/lib/rules/accessor-pairs.js +++ b/tests/lib/rules/accessor-pairs.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/accessor-pairs"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Helpers diff --git a/tests/lib/rules/array-bracket-newline.js b/tests/lib/rules/array-bracket-newline.js index bde0f56a227..b1603fcd5a8 100644 --- a/tests/lib/rules/array-bracket-newline.js +++ b/tests/lib/rules/array-bracket-newline.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/array-bracket-newline"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ diff --git a/tests/lib/rules/array-bracket-spacing.js b/tests/lib/rules/array-bracket-spacing.js index efb72ca5f52..68658094a33 100644 --- a/tests/lib/rules/array-bracket-spacing.js +++ b/tests/lib/rules/array-bracket-spacing.js @@ -10,7 +10,7 @@ const path = require("path"), rule = require("../../../lib/rules/array-bracket-spacing"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Helpers diff --git a/tests/lib/rules/array-callback-return.js b/tests/lib/rules/array-callback-return.js index 47d74fe3994..de39efcf6b9 100644 --- a/tests/lib/rules/array-callback-return.js +++ b/tests/lib/rules/array-callback-return.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/array-callback-return"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const ruleTester = new RuleTester(); diff --git a/tests/lib/rules/array-element-newline.js b/tests/lib/rules/array-element-newline.js index c9ddd160535..691e6afb604 100644 --- a/tests/lib/rules/array-element-newline.js +++ b/tests/lib/rules/array-element-newline.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/array-element-newline"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ diff --git a/tests/lib/rules/arrow-body-style.js b/tests/lib/rules/arrow-body-style.js index 5e5fbc3512a..2c4fa953acc 100644 --- a/tests/lib/rules/arrow-body-style.js +++ b/tests/lib/rules/arrow-body-style.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/arrow-body-style"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/arrow-parens.js b/tests/lib/rules/arrow-parens.js index 8062d7313c1..a7a020eca41 100644 --- a/tests/lib/rules/arrow-parens.js +++ b/tests/lib/rules/arrow-parens.js @@ -11,7 +11,7 @@ const baseParser = require("../../fixtures/fixture-parser"), rule = require("../../../lib/rules/arrow-parens"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const parser = baseParser.bind(null, "arrow-parens"); diff --git a/tests/lib/rules/arrow-spacing.js b/tests/lib/rules/arrow-spacing.js index 643fc70495a..fe87462f928 100644 --- a/tests/lib/rules/arrow-spacing.js +++ b/tests/lib/rules/arrow-spacing.js @@ -10,7 +10,7 @@ // const rule = require("../../../lib/rules/arrow-spacing"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/block-scoped-var.js b/tests/lib/rules/block-scoped-var.js index d939cc4899f..596c3ba1cf9 100644 --- a/tests/lib/rules/block-scoped-var.js +++ b/tests/lib/rules/block-scoped-var.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/block-scoped-var"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/block-spacing.js b/tests/lib/rules/block-spacing.js index 2c1a4a6f932..95d9d8cc089 100644 --- a/tests/lib/rules/block-spacing.js +++ b/tests/lib/rules/block-spacing.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/block-spacing"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/brace-style.js b/tests/lib/rules/brace-style.js index 33b186731ae..4444863b65d 100644 --- a/tests/lib/rules/brace-style.js +++ b/tests/lib/rules/brace-style.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/brace-style"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/callback-return.js b/tests/lib/rules/callback-return.js index 1e178915d0a..1d5e29a636e 100644 --- a/tests/lib/rules/callback-return.js +++ b/tests/lib/rules/callback-return.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/callback-return"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/camelcase.js b/tests/lib/rules/camelcase.js index c8a3914e659..4aa77abed2a 100644 --- a/tests/lib/rules/camelcase.js +++ b/tests/lib/rules/camelcase.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/camelcase"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/capitalized-comments.js b/tests/lib/rules/capitalized-comments.js index eda2f5234ec..043226055b4 100644 --- a/tests/lib/rules/capitalized-comments.js +++ b/tests/lib/rules/capitalized-comments.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/capitalized-comments"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/class-methods-use-this.js b/tests/lib/rules/class-methods-use-this.js index 369f04a64f9..8521242457f 100644 --- a/tests/lib/rules/class-methods-use-this.js +++ b/tests/lib/rules/class-methods-use-this.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/class-methods-use-this"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/comma-dangle.js b/tests/lib/rules/comma-dangle.js index b64cddda83f..99bb7df164f 100644 --- a/tests/lib/rules/comma-dangle.js +++ b/tests/lib/rules/comma-dangle.js @@ -11,7 +11,7 @@ const path = require("path"), rule = require("../../../lib/rules/comma-dangle"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Helpers diff --git a/tests/lib/rules/comma-spacing.js b/tests/lib/rules/comma-spacing.js index 2df7c71fadc..df7dac6324a 100644 --- a/tests/lib/rules/comma-spacing.js +++ b/tests/lib/rules/comma-spacing.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/comma-spacing"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/comma-style.js b/tests/lib/rules/comma-style.js index a63d80ae876..5aa401f914a 100644 --- a/tests/lib/rules/comma-style.js +++ b/tests/lib/rules/comma-style.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/comma-style"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/complexity.js b/tests/lib/rules/complexity.js index 93e40446871..08da681ea59 100644 --- a/tests/lib/rules/complexity.js +++ b/tests/lib/rules/complexity.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/complexity"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Helpers diff --git a/tests/lib/rules/computed-property-spacing.js b/tests/lib/rules/computed-property-spacing.js index b5a4825286e..fa1ca38f48a 100644 --- a/tests/lib/rules/computed-property-spacing.js +++ b/tests/lib/rules/computed-property-spacing.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/computed-property-spacing"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/consistent-return.js b/tests/lib/rules/consistent-return.js index 15c205500b3..53781ea423d 100644 --- a/tests/lib/rules/consistent-return.js +++ b/tests/lib/rules/consistent-return.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/consistent-return"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/consistent-this.js b/tests/lib/rules/consistent-this.js index 7a37dd999e7..1ddb0aa1ec6 100644 --- a/tests/lib/rules/consistent-this.js +++ b/tests/lib/rules/consistent-this.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/consistent-this"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Helpers diff --git a/tests/lib/rules/constructor-super.js b/tests/lib/rules/constructor-super.js index c1c9c045c27..b6c223dec7d 100644 --- a/tests/lib/rules/constructor-super.js +++ b/tests/lib/rules/constructor-super.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/constructor-super"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/curly.js b/tests/lib/rules/curly.js index 8cf52cd85e3..b9f0f0890f3 100644 --- a/tests/lib/rules/curly.js +++ b/tests/lib/rules/curly.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/curly"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Helpers diff --git a/tests/lib/rules/default-case.js b/tests/lib/rules/default-case.js index a0e21aeca23..8c5e3f97f12 100644 --- a/tests/lib/rules/default-case.js +++ b/tests/lib/rules/default-case.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/default-case"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/dot-location.js b/tests/lib/rules/dot-location.js index 381afc55966..d250b0e2ccb 100644 --- a/tests/lib/rules/dot-location.js +++ b/tests/lib/rules/dot-location.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/dot-location"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/dot-notation.js b/tests/lib/rules/dot-notation.js index 1261fb8853e..490a0956c44 100644 --- a/tests/lib/rules/dot-notation.js +++ b/tests/lib/rules/dot-notation.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/dot-notation"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Helpers diff --git a/tests/lib/rules/eol-last.js b/tests/lib/rules/eol-last.js index b5e1e54685b..1e5d3ebf291 100644 --- a/tests/lib/rules/eol-last.js +++ b/tests/lib/rules/eol-last.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/eol-last"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/eqeqeq.js b/tests/lib/rules/eqeqeq.js index cf565363f45..e82fae04851 100644 --- a/tests/lib/rules/eqeqeq.js +++ b/tests/lib/rules/eqeqeq.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/eqeqeq"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/for-direction.js b/tests/lib/rules/for-direction.js index d42dcc30d5a..4dd4f8a99ce 100644 --- a/tests/lib/rules/for-direction.js +++ b/tests/lib/rules/for-direction.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/for-direction"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Helpers diff --git a/tests/lib/rules/func-call-spacing.js b/tests/lib/rules/func-call-spacing.js index 46f6a640ce0..460a6022d18 100644 --- a/tests/lib/rules/func-call-spacing.js +++ b/tests/lib/rules/func-call-spacing.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/func-call-spacing"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/func-name-matching.js b/tests/lib/rules/func-name-matching.js index 13202019b7d..efb7987d420 100644 --- a/tests/lib/rules/func-name-matching.js +++ b/tests/lib/rules/func-name-matching.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/func-name-matching"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/func-names.js b/tests/lib/rules/func-names.js index 0dfc00dd551..3fcfc50a36b 100644 --- a/tests/lib/rules/func-names.js +++ b/tests/lib/rules/func-names.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/func-names"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/func-style.js b/tests/lib/rules/func-style.js index 05490fb8208..0017c8627be 100644 --- a/tests/lib/rules/func-style.js +++ b/tests/lib/rules/func-style.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/func-style"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/function-paren-newline.js b/tests/lib/rules/function-paren-newline.js index 52218273417..854df7a8c68 100644 --- a/tests/lib/rules/function-paren-newline.js +++ b/tests/lib/rules/function-paren-newline.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/function-paren-newline"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ diff --git a/tests/lib/rules/generator-star-spacing.js b/tests/lib/rules/generator-star-spacing.js index e9f06f8d83c..7dcfbfbe04f 100644 --- a/tests/lib/rules/generator-star-spacing.js +++ b/tests/lib/rules/generator-star-spacing.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/generator-star-spacing"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/getter-return.js b/tests/lib/rules/getter-return.js index 54706b7cfc7..082e584aeb5 100644 --- a/tests/lib/rules/getter-return.js +++ b/tests/lib/rules/getter-return.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/getter-return"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/global-require.js b/tests/lib/rules/global-require.js index a18c7874a6e..3fb6ccca459 100644 --- a/tests/lib/rules/global-require.js +++ b/tests/lib/rules/global-require.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/global-require"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/guard-for-in.js b/tests/lib/rules/guard-for-in.js index 0cfdaa9795f..578c60165ec 100644 --- a/tests/lib/rules/guard-for-in.js +++ b/tests/lib/rules/guard-for-in.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/guard-for-in"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/handle-callback-err.js b/tests/lib/rules/handle-callback-err.js index 0dcacbfb5e0..73ce75da0d2 100644 --- a/tests/lib/rules/handle-callback-err.js +++ b/tests/lib/rules/handle-callback-err.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/handle-callback-err"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/id-blacklist.js b/tests/lib/rules/id-blacklist.js index 5f1397ada0f..f4380e2b86e 100644 --- a/tests/lib/rules/id-blacklist.js +++ b/tests/lib/rules/id-blacklist.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/id-blacklist"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/id-length.js b/tests/lib/rules/id-length.js index f7f95233593..3800fa16986 100644 --- a/tests/lib/rules/id-length.js +++ b/tests/lib/rules/id-length.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/id-length"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/id-match.js b/tests/lib/rules/id-match.js index d500155c272..77aee182486 100644 --- a/tests/lib/rules/id-match.js +++ b/tests/lib/rules/id-match.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/id-match"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/implicit-arrow-linebreak.js b/tests/lib/rules/implicit-arrow-linebreak.js index 4e2c0e12c94..05507e76af7 100644 --- a/tests/lib/rules/implicit-arrow-linebreak.js +++ b/tests/lib/rules/implicit-arrow-linebreak.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/implicit-arrow-linebreak"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); const EXPECTED_LINEBREAK = { messageId: "expected" }; const UNEXPECTED_LINEBREAK = { messageId: "unexpected" }; diff --git a/tests/lib/rules/indent-legacy.js b/tests/lib/rules/indent-legacy.js index dd92e283806..e3295e1f3da 100644 --- a/tests/lib/rules/indent-legacy.js +++ b/tests/lib/rules/indent-legacy.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/indent-legacy"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const fs = require("fs"); const path = require("path"); diff --git a/tests/lib/rules/indent.js b/tests/lib/rules/indent.js index 01ae5e23c04..8b2cdb21f5f 100644 --- a/tests/lib/rules/indent.js +++ b/tests/lib/rules/indent.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/indent"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const fs = require("fs"); const path = require("path"); diff --git a/tests/lib/rules/init-declarations.js b/tests/lib/rules/init-declarations.js index ac0af4a1847..6324418c174 100644 --- a/tests/lib/rules/init-declarations.js +++ b/tests/lib/rules/init-declarations.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/init-declarations"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const ruleTester = new RuleTester(); diff --git a/tests/lib/rules/jsx-quotes.js b/tests/lib/rules/jsx-quotes.js index f537df84c71..f4c72d9aeb7 100644 --- a/tests/lib/rules/jsx-quotes.js +++ b/tests/lib/rules/jsx-quotes.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/jsx-quotes"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 6, ecmaFeatures: { jsx: true } } }); diff --git a/tests/lib/rules/key-spacing.js b/tests/lib/rules/key-spacing.js index f4714aad491..a9ed533741c 100644 --- a/tests/lib/rules/key-spacing.js +++ b/tests/lib/rules/key-spacing.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/key-spacing"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const ruleTester = new RuleTester(); diff --git a/tests/lib/rules/keyword-spacing.js b/tests/lib/rules/keyword-spacing.js index 68ac22a4d65..12979a52d0f 100644 --- a/tests/lib/rules/keyword-spacing.js +++ b/tests/lib/rules/keyword-spacing.js @@ -11,7 +11,7 @@ const parser = require("../../fixtures/fixture-parser"), rule = require("../../../lib/rules/keyword-spacing"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Helpers diff --git a/tests/lib/rules/line-comment-position.js b/tests/lib/rules/line-comment-position.js index 8a4d07af16a..02fb7201f3a 100644 --- a/tests/lib/rules/line-comment-position.js +++ b/tests/lib/rules/line-comment-position.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/line-comment-position"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/linebreak-style.js b/tests/lib/rules/linebreak-style.js index 483ae9c8905..7603288d8fa 100644 --- a/tests/lib/rules/linebreak-style.js +++ b/tests/lib/rules/linebreak-style.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/linebreak-style"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/lines-around-comment.js b/tests/lib/rules/lines-around-comment.js index bc16cb9bdf0..a4fd3dd70e2 100644 --- a/tests/lib/rules/lines-around-comment.js +++ b/tests/lib/rules/lines-around-comment.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/lines-around-comment"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/lines-around-directive.js b/tests/lib/rules/lines-around-directive.js index 4575cfab57e..230daa786f0 100644 --- a/tests/lib/rules/lines-around-directive.js +++ b/tests/lib/rules/lines-around-directive.js @@ -11,7 +11,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/lines-around-directive"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/lines-between-class-members.js b/tests/lib/rules/lines-between-class-members.js index d8b75ee576f..d1aa8607c0d 100644 --- a/tests/lib/rules/lines-between-class-members.js +++ b/tests/lib/rules/lines-between-class-members.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/lines-between-class-members"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Helpers diff --git a/tests/lib/rules/max-classes-per-file.js b/tests/lib/rules/max-classes-per-file.js index ecc92d1c1f7..ca9cba7a4a2 100644 --- a/tests/lib/rules/max-classes-per-file.js +++ b/tests/lib/rules/max-classes-per-file.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/max-classes-per-file"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/max-depth.js b/tests/lib/rules/max-depth.js index 06029021bf0..d5319f8dbc5 100644 --- a/tests/lib/rules/max-depth.js +++ b/tests/lib/rules/max-depth.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/max-depth"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/max-len.js b/tests/lib/rules/max-len.js index 0af7965b6c8..1d066b9f4b4 100644 --- a/tests/lib/rules/max-len.js +++ b/tests/lib/rules/max-len.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/max-len"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/max-lines-per-function.js b/tests/lib/rules/max-lines-per-function.js index 2879c2b6276..bcae7f2c295 100644 --- a/tests/lib/rules/max-lines-per-function.js +++ b/tests/lib/rules/max-lines-per-function.js @@ -8,7 +8,7 @@ // Requirements //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/max-lines-per-function"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/max-lines.js b/tests/lib/rules/max-lines.js index 33f837daa18..2929551539a 100644 --- a/tests/lib/rules/max-lines.js +++ b/tests/lib/rules/max-lines.js @@ -10,7 +10,7 @@ const rule = require("../../../lib/rules/max-lines"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ diff --git a/tests/lib/rules/max-nested-callbacks.js b/tests/lib/rules/max-nested-callbacks.js index 91ff8f99a4e..2ea2defac8c 100644 --- a/tests/lib/rules/max-nested-callbacks.js +++ b/tests/lib/rules/max-nested-callbacks.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/max-nested-callbacks"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const OPENING = "foo(function() {", CLOSING = "});"; diff --git a/tests/lib/rules/max-params.js b/tests/lib/rules/max-params.js index 206ed714fed..d5e1bf72e10 100644 --- a/tests/lib/rules/max-params.js +++ b/tests/lib/rules/max-params.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/max-params"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/max-statements-per-line.js b/tests/lib/rules/max-statements-per-line.js index 000ea50757d..2d33891d3f2 100644 --- a/tests/lib/rules/max-statements-per-line.js +++ b/tests/lib/rules/max-statements-per-line.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/max-statements-per-line"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/max-statements.js b/tests/lib/rules/max-statements.js index 2c66ee04cc2..fa3d3d1f1bd 100644 --- a/tests/lib/rules/max-statements.js +++ b/tests/lib/rules/max-statements.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/max-statements"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/multiline-comment-style.js b/tests/lib/rules/multiline-comment-style.js index be5c292a9b4..04104c00ca2 100644 --- a/tests/lib/rules/multiline-comment-style.js +++ b/tests/lib/rules/multiline-comment-style.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/multiline-comment-style"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ diff --git a/tests/lib/rules/multiline-ternary.js b/tests/lib/rules/multiline-ternary.js index 9ffd001e395..a8d2ef6eaa6 100644 --- a/tests/lib/rules/multiline-ternary.js +++ b/tests/lib/rules/multiline-ternary.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/multiline-ternary"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/new-cap.js b/tests/lib/rules/new-cap.js index 9be94764f17..ba321ec31e7 100644 --- a/tests/lib/rules/new-cap.js +++ b/tests/lib/rules/new-cap.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/new-cap"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/new-parens.js b/tests/lib/rules/new-parens.js index d56cd079d44..b9853e7c89a 100644 --- a/tests/lib/rules/new-parens.js +++ b/tests/lib/rules/new-parens.js @@ -11,7 +11,7 @@ const parser = require("../../fixtures/fixture-parser"), rule = require("../../../lib/rules/new-parens"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/newline-after-var.js b/tests/lib/rules/newline-after-var.js index 35ac3682517..5787d742cac 100644 --- a/tests/lib/rules/newline-after-var.js +++ b/tests/lib/rules/newline-after-var.js @@ -11,7 +11,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/newline-after-var"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Fixtures diff --git a/tests/lib/rules/newline-before-return.js b/tests/lib/rules/newline-before-return.js index 100a4558e48..4923706a986 100644 --- a/tests/lib/rules/newline-before-return.js +++ b/tests/lib/rules/newline-before-return.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/newline-before-return"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/newline-per-chained-call.js b/tests/lib/rules/newline-per-chained-call.js index 4b46a4b8365..a0eefd2e790 100644 --- a/tests/lib/rules/newline-per-chained-call.js +++ b/tests/lib/rules/newline-per-chained-call.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/newline-per-chained-call"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const ruleTester = new RuleTester(); diff --git a/tests/lib/rules/no-alert.js b/tests/lib/rules/no-alert.js index 0f8de5a4cac..fd89484a2d1 100644 --- a/tests/lib/rules/no-alert.js +++ b/tests/lib/rules/no-alert.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-alert"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-array-constructor.js b/tests/lib/rules/no-array-constructor.js index b42c4a7fd39..70caeb8c844 100644 --- a/tests/lib/rules/no-array-constructor.js +++ b/tests/lib/rules/no-array-constructor.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-array-constructor"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-async-promise-executor.js b/tests/lib/rules/no-async-promise-executor.js index 3190be20d96..4318bee6d4f 100644 --- a/tests/lib/rules/no-async-promise-executor.js +++ b/tests/lib/rules/no-async-promise-executor.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-async-promise-executor"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ diff --git a/tests/lib/rules/no-await-in-loop.js b/tests/lib/rules/no-await-in-loop.js index fcb6db061ee..6ba1e7b1f05 100644 --- a/tests/lib/rules/no-await-in-loop.js +++ b/tests/lib/rules/no-await-in-loop.js @@ -6,7 +6,7 @@ "use strict"; const rule = require("../../../lib/rules/no-await-in-loop"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const error = { messageId: "unexpectedAwait", type: "AwaitExpression" }; diff --git a/tests/lib/rules/no-bitwise.js b/tests/lib/rules/no-bitwise.js index f1ab5ba2373..ae3e8a8084a 100644 --- a/tests/lib/rules/no-bitwise.js +++ b/tests/lib/rules/no-bitwise.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-bitwise"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-buffer-constructor.js b/tests/lib/rules/no-buffer-constructor.js index 9bdaccb17d1..f45b4e4a3de 100644 --- a/tests/lib/rules/no-buffer-constructor.js +++ b/tests/lib/rules/no-buffer-constructor.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-buffer-constructor"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ diff --git a/tests/lib/rules/no-caller.js b/tests/lib/rules/no-caller.js index a55a823e01d..4c3a83bd938 100644 --- a/tests/lib/rules/no-caller.js +++ b/tests/lib/rules/no-caller.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-caller"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-case-declarations.js b/tests/lib/rules/no-case-declarations.js index 676caba63be..e1bd6b101a1 100644 --- a/tests/lib/rules/no-case-declarations.js +++ b/tests/lib/rules/no-case-declarations.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-case-declarations"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-catch-shadow.js b/tests/lib/rules/no-catch-shadow.js index c04927ec1dd..76a5a1d33d4 100644 --- a/tests/lib/rules/no-catch-shadow.js +++ b/tests/lib/rules/no-catch-shadow.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-catch-shadow"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-class-assign.js b/tests/lib/rules/no-class-assign.js index 3781b1f20d6..a59d2c20436 100644 --- a/tests/lib/rules/no-class-assign.js +++ b/tests/lib/rules/no-class-assign.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-class-assign"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-compare-neg-zero.js b/tests/lib/rules/no-compare-neg-zero.js index 19429026080..b9c63038715 100644 --- a/tests/lib/rules/no-compare-neg-zero.js +++ b/tests/lib/rules/no-compare-neg-zero.js @@ -10,7 +10,7 @@ const rule = require("../../../lib/rules/no-compare-neg-zero"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ diff --git a/tests/lib/rules/no-cond-assign.js b/tests/lib/rules/no-cond-assign.js index f6fb77b3245..39af0eed234 100644 --- a/tests/lib/rules/no-cond-assign.js +++ b/tests/lib/rules/no-cond-assign.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-cond-assign"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-confusing-arrow.js b/tests/lib/rules/no-confusing-arrow.js index 8c7efe6e287..58724d9ace2 100644 --- a/tests/lib/rules/no-confusing-arrow.js +++ b/tests/lib/rules/no-confusing-arrow.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-confusing-arrow"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-console.js b/tests/lib/rules/no-console.js index 5241acc251b..d1c9176d0ff 100644 --- a/tests/lib/rules/no-console.js +++ b/tests/lib/rules/no-console.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-console"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-const-assign.js b/tests/lib/rules/no-const-assign.js index c6b03da9e1c..ab44e5c9c04 100644 --- a/tests/lib/rules/no-const-assign.js +++ b/tests/lib/rules/no-const-assign.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-const-assign"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-constant-condition.js b/tests/lib/rules/no-constant-condition.js index e27e3b390b7..a5ede35cc8e 100644 --- a/tests/lib/rules/no-constant-condition.js +++ b/tests/lib/rules/no-constant-condition.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-constant-condition"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-continue.js b/tests/lib/rules/no-continue.js index 12e5baf69d3..32ab554fa10 100644 --- a/tests/lib/rules/no-continue.js +++ b/tests/lib/rules/no-continue.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-continue"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-control-regex.js b/tests/lib/rules/no-control-regex.js index b3acefbf7a2..19b66e802c5 100644 --- a/tests/lib/rules/no-control-regex.js +++ b/tests/lib/rules/no-control-regex.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-control-regex"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-debugger.js b/tests/lib/rules/no-debugger.js index 3d991fc3e18..ac8586d1235 100644 --- a/tests/lib/rules/no-debugger.js +++ b/tests/lib/rules/no-debugger.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-debugger"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-delete-var.js b/tests/lib/rules/no-delete-var.js index ec284923e33..67419342ef8 100644 --- a/tests/lib/rules/no-delete-var.js +++ b/tests/lib/rules/no-delete-var.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-delete-var"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-div-regex.js b/tests/lib/rules/no-div-regex.js index fbad6a61886..531094c19d2 100644 --- a/tests/lib/rules/no-div-regex.js +++ b/tests/lib/rules/no-div-regex.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-div-regex"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-dupe-args.js b/tests/lib/rules/no-dupe-args.js index 829a6d81e65..671f3c77730 100644 --- a/tests/lib/rules/no-dupe-args.js +++ b/tests/lib/rules/no-dupe-args.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-dupe-args"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-dupe-class-members.js b/tests/lib/rules/no-dupe-class-members.js index 0c79dfb6242..cbbc7b8015b 100644 --- a/tests/lib/rules/no-dupe-class-members.js +++ b/tests/lib/rules/no-dupe-class-members.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-dupe-class-members"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-dupe-keys.js b/tests/lib/rules/no-dupe-keys.js index 76a6c7ec1b5..518f6c36c09 100644 --- a/tests/lib/rules/no-dupe-keys.js +++ b/tests/lib/rules/no-dupe-keys.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-dupe-keys"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-duplicate-case.js b/tests/lib/rules/no-duplicate-case.js index c01085e0420..21f6267a047 100644 --- a/tests/lib/rules/no-duplicate-case.js +++ b/tests/lib/rules/no-duplicate-case.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-duplicate-case"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-duplicate-imports.js b/tests/lib/rules/no-duplicate-imports.js index d593931a199..42d35c85751 100644 --- a/tests/lib/rules/no-duplicate-imports.js +++ b/tests/lib/rules/no-duplicate-imports.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-duplicate-imports"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-else-return.js b/tests/lib/rules/no-else-return.js index 6111b55da65..1a297123c38 100644 --- a/tests/lib/rules/no-else-return.js +++ b/tests/lib/rules/no-else-return.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-else-return"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-empty-character-class.js b/tests/lib/rules/no-empty-character-class.js index 2be8ae2a4e9..1421c2ad614 100644 --- a/tests/lib/rules/no-empty-character-class.js +++ b/tests/lib/rules/no-empty-character-class.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-empty-character-class"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-empty-function.js b/tests/lib/rules/no-empty-function.js index 21f1bdae0c4..ef0ab22bfd9 100644 --- a/tests/lib/rules/no-empty-function.js +++ b/tests/lib/rules/no-empty-function.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-empty-function"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Helpers diff --git a/tests/lib/rules/no-empty-pattern.js b/tests/lib/rules/no-empty-pattern.js index 64b32977a6e..0d2d7ea80aa 100644 --- a/tests/lib/rules/no-empty-pattern.js +++ b/tests/lib/rules/no-empty-pattern.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-empty-pattern"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-empty.js b/tests/lib/rules/no-empty.js index 8706b276f95..98651a41256 100644 --- a/tests/lib/rules/no-empty.js +++ b/tests/lib/rules/no-empty.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-empty"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-eq-null.js b/tests/lib/rules/no-eq-null.js index 709913c4230..6ac277f2872 100644 --- a/tests/lib/rules/no-eq-null.js +++ b/tests/lib/rules/no-eq-null.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-eq-null"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-eval.js b/tests/lib/rules/no-eval.js index 7c4a7d427e4..995b0ea52d9 100644 --- a/tests/lib/rules/no-eval.js +++ b/tests/lib/rules/no-eval.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-eval"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-ex-assign.js b/tests/lib/rules/no-ex-assign.js index 76ff6fb015d..0c00dba65e1 100644 --- a/tests/lib/rules/no-ex-assign.js +++ b/tests/lib/rules/no-ex-assign.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-ex-assign"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-extend-native.js b/tests/lib/rules/no-extend-native.js index 05923d6b2c4..7c1b2514a29 100644 --- a/tests/lib/rules/no-extend-native.js +++ b/tests/lib/rules/no-extend-native.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-extend-native"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-extra-bind.js b/tests/lib/rules/no-extra-bind.js index 4e5a08f3660..e9c72bca61a 100644 --- a/tests/lib/rules/no-extra-bind.js +++ b/tests/lib/rules/no-extra-bind.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-extra-bind"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-extra-boolean-cast.js b/tests/lib/rules/no-extra-boolean-cast.js index 1db0cfb6f7a..4d2890e8476 100644 --- a/tests/lib/rules/no-extra-boolean-cast.js +++ b/tests/lib/rules/no-extra-boolean-cast.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-extra-boolean-cast"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Helpers diff --git a/tests/lib/rules/no-extra-label.js b/tests/lib/rules/no-extra-label.js index 14cc57b9944..8a3affa0b89 100644 --- a/tests/lib/rules/no-extra-label.js +++ b/tests/lib/rules/no-extra-label.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-extra-label"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-extra-parens.js b/tests/lib/rules/no-extra-parens.js index 31b9961db31..69d814e7df8 100644 --- a/tests/lib/rules/no-extra-parens.js +++ b/tests/lib/rules/no-extra-parens.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-extra-parens"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); /** * Create error message object for failure cases diff --git a/tests/lib/rules/no-extra-semi.js b/tests/lib/rules/no-extra-semi.js index 211d6b8e49e..f9e103bb576 100644 --- a/tests/lib/rules/no-extra-semi.js +++ b/tests/lib/rules/no-extra-semi.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-extra-semi"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-fallthrough.js b/tests/lib/rules/no-fallthrough.js index 738bfdfe0f1..e154c31d5f7 100644 --- a/tests/lib/rules/no-fallthrough.js +++ b/tests/lib/rules/no-fallthrough.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-fallthrough"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-floating-decimal.js b/tests/lib/rules/no-floating-decimal.js index bf95f94f188..18d1b165722 100644 --- a/tests/lib/rules/no-floating-decimal.js +++ b/tests/lib/rules/no-floating-decimal.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-floating-decimal"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-func-assign.js b/tests/lib/rules/no-func-assign.js index 2e0cb3617da..167a3e14410 100644 --- a/tests/lib/rules/no-func-assign.js +++ b/tests/lib/rules/no-func-assign.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-func-assign"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-global-assign.js b/tests/lib/rules/no-global-assign.js index 051752db016..550def9a0b3 100644 --- a/tests/lib/rules/no-global-assign.js +++ b/tests/lib/rules/no-global-assign.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-global-assign"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-implicit-coercion.js b/tests/lib/rules/no-implicit-coercion.js index b5bee12fad1..2f1f9e39a3d 100644 --- a/tests/lib/rules/no-implicit-coercion.js +++ b/tests/lib/rules/no-implicit-coercion.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-implicit-coercion"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-implicit-globals.js b/tests/lib/rules/no-implicit-globals.js index 8c8b95bade0..e71e62848cb 100644 --- a/tests/lib/rules/no-implicit-globals.js +++ b/tests/lib/rules/no-implicit-globals.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-implicit-globals"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-implied-eval.js b/tests/lib/rules/no-implied-eval.js index 82fbd63eba1..68166f16a22 100644 --- a/tests/lib/rules/no-implied-eval.js +++ b/tests/lib/rules/no-implied-eval.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-implied-eval"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-inline-comments.js b/tests/lib/rules/no-inline-comments.js index d84c4282438..653548f2758 100644 --- a/tests/lib/rules/no-inline-comments.js +++ b/tests/lib/rules/no-inline-comments.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-inline-comments"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-inner-declarations.js b/tests/lib/rules/no-inner-declarations.js index 967037c6401..f189664b758 100644 --- a/tests/lib/rules/no-inner-declarations.js +++ b/tests/lib/rules/no-inner-declarations.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-inner-declarations"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-invalid-regexp.js b/tests/lib/rules/no-invalid-regexp.js index 0062a5bbc5a..fb30b186ffc 100644 --- a/tests/lib/rules/no-invalid-regexp.js +++ b/tests/lib/rules/no-invalid-regexp.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-invalid-regexp"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const ruleTester = new RuleTester(); diff --git a/tests/lib/rules/no-invalid-this.js b/tests/lib/rules/no-invalid-this.js index f1d11030c5b..e951a909b0d 100644 --- a/tests/lib/rules/no-invalid-this.js +++ b/tests/lib/rules/no-invalid-this.js @@ -11,7 +11,7 @@ const lodash = require("lodash"); const rule = require("../../../lib/rules/no-invalid-this"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Helpers diff --git a/tests/lib/rules/no-irregular-whitespace.js b/tests/lib/rules/no-irregular-whitespace.js index bf5dcb45553..bb5c5d47bed 100644 --- a/tests/lib/rules/no-irregular-whitespace.js +++ b/tests/lib/rules/no-irregular-whitespace.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-irregular-whitespace"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-iterator.js b/tests/lib/rules/no-iterator.js index dc529254a33..acdb41acd23 100644 --- a/tests/lib/rules/no-iterator.js +++ b/tests/lib/rules/no-iterator.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-iterator"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-label-var.js b/tests/lib/rules/no-label-var.js index bb71f4b8ded..535c23f4d9b 100644 --- a/tests/lib/rules/no-label-var.js +++ b/tests/lib/rules/no-label-var.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-label-var"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-labels.js b/tests/lib/rules/no-labels.js index b760b16f41a..c5d37b28fb2 100644 --- a/tests/lib/rules/no-labels.js +++ b/tests/lib/rules/no-labels.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-labels"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-lone-blocks.js b/tests/lib/rules/no-lone-blocks.js index 9c4a0bb7531..3640a10127f 100644 --- a/tests/lib/rules/no-lone-blocks.js +++ b/tests/lib/rules/no-lone-blocks.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-lone-blocks"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Helpers diff --git a/tests/lib/rules/no-lonely-if.js b/tests/lib/rules/no-lonely-if.js index f84d5369b02..b2954abe585 100644 --- a/tests/lib/rules/no-lonely-if.js +++ b/tests/lib/rules/no-lonely-if.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-lonely-if"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-loop-func.js b/tests/lib/rules/no-loop-func.js index 843cdaa8aa8..ba161ec49d6 100644 --- a/tests/lib/rules/no-loop-func.js +++ b/tests/lib/rules/no-loop-func.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-loop-func"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-magic-numbers.js b/tests/lib/rules/no-magic-numbers.js index beb0282dbbd..8ebd8c93d2a 100644 --- a/tests/lib/rules/no-magic-numbers.js +++ b/tests/lib/rules/no-magic-numbers.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-magic-numbers"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Helpers diff --git a/tests/lib/rules/no-misleading-character-class.js b/tests/lib/rules/no-misleading-character-class.js index 98201186d81..4eb104fc6a9 100644 --- a/tests/lib/rules/no-misleading-character-class.js +++ b/tests/lib/rules/no-misleading-character-class.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-misleading-character-class"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Helpers diff --git a/tests/lib/rules/no-mixed-operators.js b/tests/lib/rules/no-mixed-operators.js index 171429999f5..d740b856225 100644 --- a/tests/lib/rules/no-mixed-operators.js +++ b/tests/lib/rules/no-mixed-operators.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-mixed-operators"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-mixed-requires.js b/tests/lib/rules/no-mixed-requires.js index 3ea5b7a9f03..1758b645463 100644 --- a/tests/lib/rules/no-mixed-requires.js +++ b/tests/lib/rules/no-mixed-requires.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-mixed-requires"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-mixed-spaces-and-tabs.js b/tests/lib/rules/no-mixed-spaces-and-tabs.js index 8badf704a16..d1333b2dbb1 100644 --- a/tests/lib/rules/no-mixed-spaces-and-tabs.js +++ b/tests/lib/rules/no-mixed-spaces-and-tabs.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-mixed-spaces-and-tabs"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-multi-assign.js b/tests/lib/rules/no-multi-assign.js index 569dacef8a9..e08484ab580 100644 --- a/tests/lib/rules/no-multi-assign.js +++ b/tests/lib/rules/no-multi-assign.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-multi-assign"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Fixtures diff --git a/tests/lib/rules/no-multi-spaces.js b/tests/lib/rules/no-multi-spaces.js index ea726fbddfe..db77ff391db 100644 --- a/tests/lib/rules/no-multi-spaces.js +++ b/tests/lib/rules/no-multi-spaces.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-multi-spaces"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-multi-str.js b/tests/lib/rules/no-multi-str.js index f0a02d6c0d6..a32c1d5fc48 100644 --- a/tests/lib/rules/no-multi-str.js +++ b/tests/lib/rules/no-multi-str.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-multi-str"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-multiple-empty-lines.js b/tests/lib/rules/no-multiple-empty-lines.js index 4be2e14cff2..85756b315ab 100644 --- a/tests/lib/rules/no-multiple-empty-lines.js +++ b/tests/lib/rules/no-multiple-empty-lines.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-multiple-empty-lines"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-native-reassign.js b/tests/lib/rules/no-native-reassign.js index eaf763bb74b..034d11c7188 100644 --- a/tests/lib/rules/no-native-reassign.js +++ b/tests/lib/rules/no-native-reassign.js @@ -11,7 +11,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-native-reassign"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-negated-condition.js b/tests/lib/rules/no-negated-condition.js index 81d46efc0dc..4ca81dbfbe9 100644 --- a/tests/lib/rules/no-negated-condition.js +++ b/tests/lib/rules/no-negated-condition.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-negated-condition"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-negated-in-lhs.js b/tests/lib/rules/no-negated-in-lhs.js index 14b8d659dcc..80f96d0bb4e 100644 --- a/tests/lib/rules/no-negated-in-lhs.js +++ b/tests/lib/rules/no-negated-in-lhs.js @@ -11,7 +11,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-negated-in-lhs"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-nested-ternary.js b/tests/lib/rules/no-nested-ternary.js index 8b2a26606d0..15eafa6aa61 100644 --- a/tests/lib/rules/no-nested-ternary.js +++ b/tests/lib/rules/no-nested-ternary.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-nested-ternary"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-new-func.js b/tests/lib/rules/no-new-func.js index 19a95ec7858..05f5d967452 100644 --- a/tests/lib/rules/no-new-func.js +++ b/tests/lib/rules/no-new-func.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-new-func"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-new-object.js b/tests/lib/rules/no-new-object.js index dfbdf1689d6..b0fb22e370b 100644 --- a/tests/lib/rules/no-new-object.js +++ b/tests/lib/rules/no-new-object.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-new-object"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-new-require.js b/tests/lib/rules/no-new-require.js index 3949e228301..3a475f42ce5 100644 --- a/tests/lib/rules/no-new-require.js +++ b/tests/lib/rules/no-new-require.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-new-require"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-new-symbol.js b/tests/lib/rules/no-new-symbol.js index acb8b4d0a35..0555aa71084 100644 --- a/tests/lib/rules/no-new-symbol.js +++ b/tests/lib/rules/no-new-symbol.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-new-symbol"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-new-wrappers.js b/tests/lib/rules/no-new-wrappers.js index 8e0ecd6eb53..0685a94a2c5 100644 --- a/tests/lib/rules/no-new-wrappers.js +++ b/tests/lib/rules/no-new-wrappers.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-new-wrappers"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-new.js b/tests/lib/rules/no-new.js index c31ef1b5140..54555c208a8 100644 --- a/tests/lib/rules/no-new.js +++ b/tests/lib/rules/no-new.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-new"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-obj-calls.js b/tests/lib/rules/no-obj-calls.js index dfbb22af9b9..6f390ab4575 100644 --- a/tests/lib/rules/no-obj-calls.js +++ b/tests/lib/rules/no-obj-calls.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-obj-calls"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-octal-escape.js b/tests/lib/rules/no-octal-escape.js index 00d993099a8..b15416ebf95 100644 --- a/tests/lib/rules/no-octal-escape.js +++ b/tests/lib/rules/no-octal-escape.js @@ -11,7 +11,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-octal-escape"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-octal.js b/tests/lib/rules/no-octal.js index 077b19b11be..5748734cf68 100644 --- a/tests/lib/rules/no-octal.js +++ b/tests/lib/rules/no-octal.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-octal"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-param-reassign.js b/tests/lib/rules/no-param-reassign.js index 40156f481ec..dfff7f26ad1 100644 --- a/tests/lib/rules/no-param-reassign.js +++ b/tests/lib/rules/no-param-reassign.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-param-reassign"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-path-concat.js b/tests/lib/rules/no-path-concat.js index d07116fa447..745d96b6649 100644 --- a/tests/lib/rules/no-path-concat.js +++ b/tests/lib/rules/no-path-concat.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-path-concat"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-plusplus.js b/tests/lib/rules/no-plusplus.js index 4d657d1a792..7f021e4feb2 100644 --- a/tests/lib/rules/no-plusplus.js +++ b/tests/lib/rules/no-plusplus.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-plusplus"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-process-env.js b/tests/lib/rules/no-process-env.js index e0971d36a1c..6a720385972 100644 --- a/tests/lib/rules/no-process-env.js +++ b/tests/lib/rules/no-process-env.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-process-env"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-process-exit.js b/tests/lib/rules/no-process-exit.js index 2b9a48751f9..0aeac053eb0 100644 --- a/tests/lib/rules/no-process-exit.js +++ b/tests/lib/rules/no-process-exit.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-process-exit"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-proto.js b/tests/lib/rules/no-proto.js index 09fbc8c04cc..0a013587c51 100644 --- a/tests/lib/rules/no-proto.js +++ b/tests/lib/rules/no-proto.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-proto"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-prototype-builtins.js b/tests/lib/rules/no-prototype-builtins.js index 1cbafa18934..3a25f0b61c1 100644 --- a/tests/lib/rules/no-prototype-builtins.js +++ b/tests/lib/rules/no-prototype-builtins.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-prototype-builtins"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-redeclare.js b/tests/lib/rules/no-redeclare.js index 2ad263aa91a..47c8146b14a 100644 --- a/tests/lib/rules/no-redeclare.js +++ b/tests/lib/rules/no-redeclare.js @@ -11,7 +11,7 @@ const path = require("path"); const rule = require("../../../lib/rules/no-redeclare"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-regex-spaces.js b/tests/lib/rules/no-regex-spaces.js index 72e1fd4e2fa..febd5e0dbd6 100644 --- a/tests/lib/rules/no-regex-spaces.js +++ b/tests/lib/rules/no-regex-spaces.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-regex-spaces"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const ruleTester = new RuleTester(); diff --git a/tests/lib/rules/no-restricted-globals.js b/tests/lib/rules/no-restricted-globals.js index 0e09be16984..a1bd8957cad 100644 --- a/tests/lib/rules/no-restricted-globals.js +++ b/tests/lib/rules/no-restricted-globals.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-restricted-globals"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-restricted-imports.js b/tests/lib/rules/no-restricted-imports.js index a2eba1ce2d6..a77adcc267b 100644 --- a/tests/lib/rules/no-restricted-imports.js +++ b/tests/lib/rules/no-restricted-imports.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-restricted-imports"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-restricted-modules.js b/tests/lib/rules/no-restricted-modules.js index f89cbbd97ca..97158d33332 100644 --- a/tests/lib/rules/no-restricted-modules.js +++ b/tests/lib/rules/no-restricted-modules.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-restricted-modules"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-restricted-properties.js b/tests/lib/rules/no-restricted-properties.js index e632663eee4..c1be7a12c84 100644 --- a/tests/lib/rules/no-restricted-properties.js +++ b/tests/lib/rules/no-restricted-properties.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-restricted-properties"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-restricted-syntax.js b/tests/lib/rules/no-restricted-syntax.js index 5cc1f916195..ed45540aafb 100644 --- a/tests/lib/rules/no-restricted-syntax.js +++ b/tests/lib/rules/no-restricted-syntax.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-restricted-syntax"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-return-assign.js b/tests/lib/rules/no-return-assign.js index ba754ca31b9..e63b1d29244 100644 --- a/tests/lib/rules/no-return-assign.js +++ b/tests/lib/rules/no-return-assign.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-return-assign"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-return-await.js b/tests/lib/rules/no-return-await.js index 4f0a23c5334..f38f678f0ea 100644 --- a/tests/lib/rules/no-return-await.js +++ b/tests/lib/rules/no-return-await.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-return-await"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ diff --git a/tests/lib/rules/no-script-url.js b/tests/lib/rules/no-script-url.js index 9ea78b3022a..a66136e2218 100644 --- a/tests/lib/rules/no-script-url.js +++ b/tests/lib/rules/no-script-url.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-script-url"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-self-assign.js b/tests/lib/rules/no-self-assign.js index f15a75723ee..a344e808422 100644 --- a/tests/lib/rules/no-self-assign.js +++ b/tests/lib/rules/no-self-assign.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-self-assign"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-self-compare.js b/tests/lib/rules/no-self-compare.js index b937a921411..3c09a182755 100644 --- a/tests/lib/rules/no-self-compare.js +++ b/tests/lib/rules/no-self-compare.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-self-compare"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-sequences.js b/tests/lib/rules/no-sequences.js index a32400b2f1a..55721de3e9d 100644 --- a/tests/lib/rules/no-sequences.js +++ b/tests/lib/rules/no-sequences.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-sequences"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-shadow-restricted-names.js b/tests/lib/rules/no-shadow-restricted-names.js index fc183e6db76..00bf01161bc 100644 --- a/tests/lib/rules/no-shadow-restricted-names.js +++ b/tests/lib/rules/no-shadow-restricted-names.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-shadow-restricted-names"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const ruleTester = new RuleTester(); diff --git a/tests/lib/rules/no-shadow.js b/tests/lib/rules/no-shadow.js index 36f011a97ab..9d05fef601f 100644 --- a/tests/lib/rules/no-shadow.js +++ b/tests/lib/rules/no-shadow.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-shadow"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-spaced-func.js b/tests/lib/rules/no-spaced-func.js index a5cf5086a47..b3404eb88ba 100644 --- a/tests/lib/rules/no-spaced-func.js +++ b/tests/lib/rules/no-spaced-func.js @@ -11,7 +11,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-spaced-func"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-sparse-arrays.js b/tests/lib/rules/no-sparse-arrays.js index d177d0634d9..b858de0e7f9 100644 --- a/tests/lib/rules/no-sparse-arrays.js +++ b/tests/lib/rules/no-sparse-arrays.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-sparse-arrays"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-sync.js b/tests/lib/rules/no-sync.js index 026db6862a9..c8cf36e178c 100644 --- a/tests/lib/rules/no-sync.js +++ b/tests/lib/rules/no-sync.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-sync"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-tabs.js b/tests/lib/rules/no-tabs.js index b4989037d30..ac0ad9e7400 100644 --- a/tests/lib/rules/no-tabs.js +++ b/tests/lib/rules/no-tabs.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-tabs"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-template-curly-in-string.js b/tests/lib/rules/no-template-curly-in-string.js index 5f7133d8c3d..1ea31c16dcd 100644 --- a/tests/lib/rules/no-template-curly-in-string.js +++ b/tests/lib/rules/no-template-curly-in-string.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-template-curly-in-string"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ diff --git a/tests/lib/rules/no-ternary.js b/tests/lib/rules/no-ternary.js index 85ca522d645..68fa21b8875 100644 --- a/tests/lib/rules/no-ternary.js +++ b/tests/lib/rules/no-ternary.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-ternary"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-this-before-super.js b/tests/lib/rules/no-this-before-super.js index 592cdf2692f..958fb3d54a4 100644 --- a/tests/lib/rules/no-this-before-super.js +++ b/tests/lib/rules/no-this-before-super.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-this-before-super"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-throw-literal.js b/tests/lib/rules/no-throw-literal.js index d27e7c7c5db..05002117793 100644 --- a/tests/lib/rules/no-throw-literal.js +++ b/tests/lib/rules/no-throw-literal.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-throw-literal"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-trailing-spaces.js b/tests/lib/rules/no-trailing-spaces.js index 37c81f32779..3120b4a7183 100644 --- a/tests/lib/rules/no-trailing-spaces.js +++ b/tests/lib/rules/no-trailing-spaces.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-trailing-spaces"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-undef-init.js b/tests/lib/rules/no-undef-init.js index dfd45e008c7..efbbbe4c4c7 100644 --- a/tests/lib/rules/no-undef-init.js +++ b/tests/lib/rules/no-undef-init.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-undef-init"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-undef.js b/tests/lib/rules/no-undef.js index 9e7d6a4d0f7..13bca8c3d22 100644 --- a/tests/lib/rules/no-undef.js +++ b/tests/lib/rules/no-undef.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-undef"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-undefined.js b/tests/lib/rules/no-undefined.js index bcc18b24271..3223fcbe678 100644 --- a/tests/lib/rules/no-undefined.js +++ b/tests/lib/rules/no-undefined.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-undefined"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Helpers diff --git a/tests/lib/rules/no-underscore-dangle.js b/tests/lib/rules/no-underscore-dangle.js index 3854f76cdec..277c6c85cb5 100644 --- a/tests/lib/rules/no-underscore-dangle.js +++ b/tests/lib/rules/no-underscore-dangle.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-underscore-dangle"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-unexpected-multiline.js b/tests/lib/rules/no-unexpected-multiline.js index 6cd9f73105d..5811015c30f 100644 --- a/tests/lib/rules/no-unexpected-multiline.js +++ b/tests/lib/rules/no-unexpected-multiline.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-unexpected-multiline"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const ruleTester = new RuleTester(); diff --git a/tests/lib/rules/no-unmodified-loop-condition.js b/tests/lib/rules/no-unmodified-loop-condition.js index 25dc02bd946..269ee30dd93 100644 --- a/tests/lib/rules/no-unmodified-loop-condition.js +++ b/tests/lib/rules/no-unmodified-loop-condition.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-unmodified-loop-condition"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const ruleTester = new RuleTester(); diff --git a/tests/lib/rules/no-unneeded-ternary.js b/tests/lib/rules/no-unneeded-ternary.js index 5196b576bd0..243526c2243 100644 --- a/tests/lib/rules/no-unneeded-ternary.js +++ b/tests/lib/rules/no-unneeded-ternary.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-unneeded-ternary"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-unreachable.js b/tests/lib/rules/no-unreachable.js index 1e04d687ca1..2c9b60fb882 100644 --- a/tests/lib/rules/no-unreachable.js +++ b/tests/lib/rules/no-unreachable.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-unreachable"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-unsafe-finally.js b/tests/lib/rules/no-unsafe-finally.js index 438d9c2e805..2151f9848c6 100644 --- a/tests/lib/rules/no-unsafe-finally.js +++ b/tests/lib/rules/no-unsafe-finally.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-unsafe-finally"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-unsafe-negation.js b/tests/lib/rules/no-unsafe-negation.js index a66470784c6..8316aad0227 100644 --- a/tests/lib/rules/no-unsafe-negation.js +++ b/tests/lib/rules/no-unsafe-negation.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-unsafe-negation"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-unused-expressions.js b/tests/lib/rules/no-unused-expressions.js index f94c90c1ca6..51de4916791 100644 --- a/tests/lib/rules/no-unused-expressions.js +++ b/tests/lib/rules/no-unused-expressions.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-unused-expressions"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-unused-labels.js b/tests/lib/rules/no-unused-labels.js index 8a8dd68aa08..feb6c82d5f0 100644 --- a/tests/lib/rules/no-unused-labels.js +++ b/tests/lib/rules/no-unused-labels.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-unused-labels"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-unused-vars.js b/tests/lib/rules/no-unused-vars.js index 4a85db8c5aa..0883685aa9f 100644 --- a/tests/lib/rules/no-unused-vars.js +++ b/tests/lib/rules/no-unused-vars.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-unused-vars"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-use-before-define.js b/tests/lib/rules/no-use-before-define.js index 35fd699e5a0..5935642c54a 100644 --- a/tests/lib/rules/no-use-before-define.js +++ b/tests/lib/rules/no-use-before-define.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-use-before-define"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-useless-call.js b/tests/lib/rules/no-useless-call.js index 15bdc88f287..14367902185 100644 --- a/tests/lib/rules/no-useless-call.js +++ b/tests/lib/rules/no-useless-call.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-useless-call"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-useless-catch.js b/tests/lib/rules/no-useless-catch.js index 93989a40352..040e61ea609 100644 --- a/tests/lib/rules/no-useless-catch.js +++ b/tests/lib/rules/no-useless-catch.js @@ -11,7 +11,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-useless-catch"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-useless-computed-key.js b/tests/lib/rules/no-useless-computed-key.js index ed9f3daa058..1c9969206dd 100644 --- a/tests/lib/rules/no-useless-computed-key.js +++ b/tests/lib/rules/no-useless-computed-key.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-useless-computed-key"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-useless-concat.js b/tests/lib/rules/no-useless-concat.js index 4f96ec3f018..cc66b257879 100644 --- a/tests/lib/rules/no-useless-concat.js +++ b/tests/lib/rules/no-useless-concat.js @@ -10,7 +10,7 @@ const rule = require("../../../lib/rules/no-useless-concat"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ diff --git a/tests/lib/rules/no-useless-constructor.js b/tests/lib/rules/no-useless-constructor.js index 8aceb24ee55..26d04e6fc01 100644 --- a/tests/lib/rules/no-useless-constructor.js +++ b/tests/lib/rules/no-useless-constructor.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-useless-constructor"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-useless-escape.js b/tests/lib/rules/no-useless-escape.js index 636149635e1..0acb1be668d 100644 --- a/tests/lib/rules/no-useless-escape.js +++ b/tests/lib/rules/no-useless-escape.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-useless-escape"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const ruleTester = new RuleTester(); diff --git a/tests/lib/rules/no-useless-rename.js b/tests/lib/rules/no-useless-rename.js index 9f7e0777af8..1fcc843dbd1 100644 --- a/tests/lib/rules/no-useless-rename.js +++ b/tests/lib/rules/no-useless-rename.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-useless-rename"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 6, sourceType: "module" } }); diff --git a/tests/lib/rules/no-useless-return.js b/tests/lib/rules/no-useless-return.js index b655af3c17e..200f840eb24 100644 --- a/tests/lib/rules/no-useless-return.js +++ b/tests/lib/rules/no-useless-return.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-useless-return"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ diff --git a/tests/lib/rules/no-var.js b/tests/lib/rules/no-var.js index 0c983327217..b47bf9097e9 100644 --- a/tests/lib/rules/no-var.js +++ b/tests/lib/rules/no-var.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-var"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-void.js b/tests/lib/rules/no-void.js index afe66910795..2d12718d8f7 100644 --- a/tests/lib/rules/no-void.js +++ b/tests/lib/rules/no-void.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-void"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-warning-comments.js b/tests/lib/rules/no-warning-comments.js index 8a9b2c5e273..431511dc034 100644 --- a/tests/lib/rules/no-warning-comments.js +++ b/tests/lib/rules/no-warning-comments.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-warning-comments"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-whitespace-before-property.js b/tests/lib/rules/no-whitespace-before-property.js index f4516ed519e..88eea148a69 100644 --- a/tests/lib/rules/no-whitespace-before-property.js +++ b/tests/lib/rules/no-whitespace-before-property.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-whitespace-before-property"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/no-with.js b/tests/lib/rules/no-with.js index c6dba0c3359..448a531c0d3 100644 --- a/tests/lib/rules/no-with.js +++ b/tests/lib/rules/no-with.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/no-with"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/nonblock-statement-body-position.js b/tests/lib/rules/nonblock-statement-body-position.js index 37dffb20ffa..bd65ecc5732 100644 --- a/tests/lib/rules/nonblock-statement-body-position.js +++ b/tests/lib/rules/nonblock-statement-body-position.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/nonblock-statement-body-position"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); const EXPECTED_LINEBREAK = { message: "Expected a linebreak before this statement." }; const UNEXPECTED_LINEBREAK = { message: "Expected no linebreak before this statement." }; diff --git a/tests/lib/rules/object-curly-newline.js b/tests/lib/rules/object-curly-newline.js index 26ff329b23b..191136617b4 100644 --- a/tests/lib/rules/object-curly-newline.js +++ b/tests/lib/rules/object-curly-newline.js @@ -11,7 +11,7 @@ const resolvePath = require("path").resolve, rule = require("../../../lib/rules/object-curly-newline"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/object-curly-spacing.js b/tests/lib/rules/object-curly-spacing.js index 9ef8af62ed0..156bdb363b2 100644 --- a/tests/lib/rules/object-curly-spacing.js +++ b/tests/lib/rules/object-curly-spacing.js @@ -10,7 +10,7 @@ const resolvePath = require("path").resolve, rule = require("../../../lib/rules/object-curly-spacing"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/object-property-newline.js b/tests/lib/rules/object-property-newline.js index 28cc282ac82..1d60ee9b2a0 100644 --- a/tests/lib/rules/object-property-newline.js +++ b/tests/lib/rules/object-property-newline.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/object-property-newline"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/object-shorthand.js b/tests/lib/rules/object-shorthand.js index 72bd7ba6e99..04d702535ba 100644 --- a/tests/lib/rules/object-shorthand.js +++ b/tests/lib/rules/object-shorthand.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/object-shorthand"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/one-var-declaration-per-line.js b/tests/lib/rules/one-var-declaration-per-line.js index 9a299c7b253..132931357f0 100644 --- a/tests/lib/rules/one-var-declaration-per-line.js +++ b/tests/lib/rules/one-var-declaration-per-line.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/one-var-declaration-per-line"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Fixtures diff --git a/tests/lib/rules/one-var.js b/tests/lib/rules/one-var.js index bec330c3c78..e8937d63703 100644 --- a/tests/lib/rules/one-var.js +++ b/tests/lib/rules/one-var.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/one-var"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 6 } }); diff --git a/tests/lib/rules/operator-assignment.js b/tests/lib/rules/operator-assignment.js index 0012cb81c65..fe7b326a10a 100644 --- a/tests/lib/rules/operator-assignment.js +++ b/tests/lib/rules/operator-assignment.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/operator-assignment"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/operator-linebreak.js b/tests/lib/rules/operator-linebreak.js index 885601b8595..ec618c597ca 100644 --- a/tests/lib/rules/operator-linebreak.js +++ b/tests/lib/rules/operator-linebreak.js @@ -10,7 +10,7 @@ const util = require("util"); const rule = require("../../../lib/rules/operator-linebreak"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const BAD_LN_BRK_MSG = "Bad line breaking before and after '%s'.", BEFORE_MSG = "'%s' should be placed at the beginning of the line.", diff --git a/tests/lib/rules/padded-blocks.js b/tests/lib/rules/padded-blocks.js index 08ed2856cc6..38e9d40ba23 100644 --- a/tests/lib/rules/padded-blocks.js +++ b/tests/lib/rules/padded-blocks.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/padded-blocks"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/padding-line-between-statements.js b/tests/lib/rules/padding-line-between-statements.js index 378fee15b4a..17ffcc9afc4 100644 --- a/tests/lib/rules/padding-line-between-statements.js +++ b/tests/lib/rules/padding-line-between-statements.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/padding-line-between-statements"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/prefer-arrow-callback.js b/tests/lib/rules/prefer-arrow-callback.js index 24039caee28..4d1b420d159 100644 --- a/tests/lib/rules/prefer-arrow-callback.js +++ b/tests/lib/rules/prefer-arrow-callback.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/prefer-arrow-callback"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/prefer-const.js b/tests/lib/rules/prefer-const.js index 66eec8c539f..d8c018bdf3c 100644 --- a/tests/lib/rules/prefer-const.js +++ b/tests/lib/rules/prefer-const.js @@ -11,7 +11,7 @@ const rule = require("../../../lib/rules/prefer-const"), fixtureParser = require("../../fixtures/fixture-parser"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/prefer-destructuring.js b/tests/lib/rules/prefer-destructuring.js index 5470079ef84..2fef0f93851 100644 --- a/tests/lib/rules/prefer-destructuring.js +++ b/tests/lib/rules/prefer-destructuring.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/prefer-destructuring"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ diff --git a/tests/lib/rules/prefer-named-capture-group.js b/tests/lib/rules/prefer-named-capture-group.js index 88047d7c9fa..e3a86e9ee30 100644 --- a/tests/lib/rules/prefer-named-capture-group.js +++ b/tests/lib/rules/prefer-named-capture-group.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/prefer-named-capture-group"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/prefer-numeric-literals.js b/tests/lib/rules/prefer-numeric-literals.js index 73fecfb3093..e8401749062 100644 --- a/tests/lib/rules/prefer-numeric-literals.js +++ b/tests/lib/rules/prefer-numeric-literals.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/prefer-numeric-literals"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/prefer-object-spread.js b/tests/lib/rules/prefer-object-spread.js index acac665e526..11c16d60cc3 100644 --- a/tests/lib/rules/prefer-object-spread.js +++ b/tests/lib/rules/prefer-object-spread.js @@ -8,7 +8,7 @@ const rule = require("../../../lib/rules/prefer-object-spread"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); const parserOptions = { ecmaVersion: 2018, diff --git a/tests/lib/rules/prefer-promise-reject-errors.js b/tests/lib/rules/prefer-promise-reject-errors.js index 6a06af4f9d6..7a4ee2614c9 100644 --- a/tests/lib/rules/prefer-promise-reject-errors.js +++ b/tests/lib/rules/prefer-promise-reject-errors.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/prefer-promise-reject-errors"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ diff --git a/tests/lib/rules/prefer-reflect.js b/tests/lib/rules/prefer-reflect.js index 62d9de38ee3..fac72e40531 100644 --- a/tests/lib/rules/prefer-reflect.js +++ b/tests/lib/rules/prefer-reflect.js @@ -10,7 +10,7 @@ // Requirements //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/prefer-reflect"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/prefer-rest-params.js b/tests/lib/rules/prefer-rest-params.js index c483be9d374..1d0cdb448e9 100644 --- a/tests/lib/rules/prefer-rest-params.js +++ b/tests/lib/rules/prefer-rest-params.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/prefer-rest-params"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 6 } }); diff --git a/tests/lib/rules/prefer-spread.js b/tests/lib/rules/prefer-spread.js index 1e11dd6c44a..6bb5631bd90 100644 --- a/tests/lib/rules/prefer-spread.js +++ b/tests/lib/rules/prefer-spread.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/prefer-spread"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/prefer-template.js b/tests/lib/rules/prefer-template.js index bab21ebb56b..9e987a813fa 100644 --- a/tests/lib/rules/prefer-template.js +++ b/tests/lib/rules/prefer-template.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/prefer-template"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/quote-props.js b/tests/lib/rules/quote-props.js index fa8037b7c32..c1cd10e50f0 100644 --- a/tests/lib/rules/quote-props.js +++ b/tests/lib/rules/quote-props.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/quote-props"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const ruleTester = new RuleTester(); diff --git a/tests/lib/rules/quotes.js b/tests/lib/rules/quotes.js index 74abacd5012..113d8d68f0a 100644 --- a/tests/lib/rules/quotes.js +++ b/tests/lib/rules/quotes.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/quotes"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const ruleTester = new RuleTester(); diff --git a/tests/lib/rules/radix.js b/tests/lib/rules/radix.js index 1844a323419..0acb063a347 100644 --- a/tests/lib/rules/radix.js +++ b/tests/lib/rules/radix.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/radix"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const ruleTester = new RuleTester(); diff --git a/tests/lib/rules/require-atomic-updates.js b/tests/lib/rules/require-atomic-updates.js index 9ceaba3710a..1287c356fb2 100644 --- a/tests/lib/rules/require-atomic-updates.js +++ b/tests/lib/rules/require-atomic-updates.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/require-atomic-updates"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ diff --git a/tests/lib/rules/require-await.js b/tests/lib/rules/require-await.js index 662dc72cbf9..c63a1ef5e86 100644 --- a/tests/lib/rules/require-await.js +++ b/tests/lib/rules/require-await.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/require-await"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/require-jsdoc.js b/tests/lib/rules/require-jsdoc.js index 4a84e784aab..a4b1109fe87 100644 --- a/tests/lib/rules/require-jsdoc.js +++ b/tests/lib/rules/require-jsdoc.js @@ -5,7 +5,7 @@ "use strict"; const rule = require("../../../lib/rules/require-jsdoc"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/require-unicode-regexp.js b/tests/lib/rules/require-unicode-regexp.js index b6ac758d17d..38a125096e2 100644 --- a/tests/lib/rules/require-unicode-regexp.js +++ b/tests/lib/rules/require-unicode-regexp.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/require-unicode-regexp"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/require-yield.js b/tests/lib/rules/require-yield.js index 62bfc3ca230..ab7281ae4c6 100644 --- a/tests/lib/rules/require-yield.js +++ b/tests/lib/rules/require-yield.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/require-yield"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/rest-spread-spacing.js b/tests/lib/rules/rest-spread-spacing.js index a4f93ba88c8..397eb79de13 100644 --- a/tests/lib/rules/rest-spread-spacing.js +++ b/tests/lib/rules/rest-spread-spacing.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/rest-spread-spacing"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 6 } }); diff --git a/tests/lib/rules/semi-spacing.js b/tests/lib/rules/semi-spacing.js index 06619f9b319..4f154958818 100644 --- a/tests/lib/rules/semi-spacing.js +++ b/tests/lib/rules/semi-spacing.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/semi-spacing"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/semi-style.js b/tests/lib/rules/semi-style.js index 8b0834af3d5..d985293b175 100644 --- a/tests/lib/rules/semi-style.js +++ b/tests/lib/rules/semi-style.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/semi-style"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/semi.js b/tests/lib/rules/semi.js index 30213fecbd6..e282d54e49c 100644 --- a/tests/lib/rules/semi.js +++ b/tests/lib/rules/semi.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/semi"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const ruleTester = new RuleTester(); diff --git a/tests/lib/rules/sort-imports.js b/tests/lib/rules/sort-imports.js index 290505650ea..54cdf371611 100644 --- a/tests/lib/rules/sort-imports.js +++ b/tests/lib/rules/sort-imports.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/sort-imports"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/sort-keys.js b/tests/lib/rules/sort-keys.js index 1ae091fad5b..47a13f80468 100644 --- a/tests/lib/rules/sort-keys.js +++ b/tests/lib/rules/sort-keys.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/sort-keys"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/sort-vars.js b/tests/lib/rules/sort-vars.js index bbcaf8a1317..dfe50103598 100644 --- a/tests/lib/rules/sort-vars.js +++ b/tests/lib/rules/sort-vars.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/sort-vars"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/space-before-blocks.js b/tests/lib/rules/space-before-blocks.js index 33396ddfd05..e5eaa73119b 100644 --- a/tests/lib/rules/space-before-blocks.js +++ b/tests/lib/rules/space-before-blocks.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/space-before-blocks"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/space-before-function-paren.js b/tests/lib/rules/space-before-function-paren.js index 8db80081071..5bcfd7be16c 100644 --- a/tests/lib/rules/space-before-function-paren.js +++ b/tests/lib/rules/space-before-function-paren.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/space-before-function-paren"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); const baseParser = require("../../fixtures/fixture-parser"); //------------------------------------------------------------------------------ diff --git a/tests/lib/rules/space-in-parens.js b/tests/lib/rules/space-in-parens.js index 6e66a8fbd34..f465f4f3640 100644 --- a/tests/lib/rules/space-in-parens.js +++ b/tests/lib/rules/space-in-parens.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/space-in-parens"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const MISSING_SPACE_ERROR = "There must be a space inside this paren.", REJECTED_SPACE_ERROR = "There should be no spaces inside this paren."; diff --git a/tests/lib/rules/space-infix-ops.js b/tests/lib/rules/space-infix-ops.js index 8932997e25a..e94d6fe32e1 100644 --- a/tests/lib/rules/space-infix-ops.js +++ b/tests/lib/rules/space-infix-ops.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/space-infix-ops"), - RuleTester = require("../../../lib/testers/rule-tester"), + { RuleTester } = require("../../../lib/rule-tester"), parser = require("../../fixtures/fixture-parser"); const ruleTester = new RuleTester(); diff --git a/tests/lib/rules/space-unary-ops.js b/tests/lib/rules/space-unary-ops.js index 0e6c0e1c351..c56e0135d5e 100644 --- a/tests/lib/rules/space-unary-ops.js +++ b/tests/lib/rules/space-unary-ops.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/space-unary-ops"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/spaced-comment.js b/tests/lib/rules/spaced-comment.js index 9a74f5b8bcf..c4c729b2ea2 100644 --- a/tests/lib/rules/spaced-comment.js +++ b/tests/lib/rules/spaced-comment.js @@ -5,7 +5,7 @@ "use strict"; const rule = require("../../../lib/rules/spaced-comment"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const ruleTester = new RuleTester(), validShebangProgram = "#!/path/to/node\nvar a = 3;", diff --git a/tests/lib/rules/strict.js b/tests/lib/rules/strict.js index 621cb715ba8..92abffda16c 100644 --- a/tests/lib/rules/strict.js +++ b/tests/lib/rules/strict.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/strict"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); const ruleTester = new RuleTester(); diff --git a/tests/lib/rules/switch-colon-spacing.js b/tests/lib/rules/switch-colon-spacing.js index f09b2e2060b..dfaf357b75c 100644 --- a/tests/lib/rules/switch-colon-spacing.js +++ b/tests/lib/rules/switch-colon-spacing.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/switch-colon-spacing"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/symbol-description.js b/tests/lib/rules/symbol-description.js index f9d68995ff1..36391fc7808 100644 --- a/tests/lib/rules/symbol-description.js +++ b/tests/lib/rules/symbol-description.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/symbol-description"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); const ruleTester = new RuleTester({ env: { es6: true } }); diff --git a/tests/lib/rules/template-curly-spacing.js b/tests/lib/rules/template-curly-spacing.js index bd40184542d..909ee8ccf57 100644 --- a/tests/lib/rules/template-curly-spacing.js +++ b/tests/lib/rules/template-curly-spacing.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/template-curly-spacing"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/template-tag-spacing.js b/tests/lib/rules/template-tag-spacing.js index 4de2d807184..08859369a29 100644 --- a/tests/lib/rules/template-tag-spacing.js +++ b/tests/lib/rules/template-tag-spacing.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/template-tag-spacing"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/unicode-bom.js b/tests/lib/rules/unicode-bom.js index c15563aad85..0b94a690291 100644 --- a/tests/lib/rules/unicode-bom.js +++ b/tests/lib/rules/unicode-bom.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/unicode-bom"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/use-isnan.js b/tests/lib/rules/use-isnan.js index 865a656c1f5..e9d8b99a787 100644 --- a/tests/lib/rules/use-isnan.js +++ b/tests/lib/rules/use-isnan.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/use-isnan"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/util/ast-utils.js b/tests/lib/rules/utils/ast-utils.js similarity index 99% rename from tests/lib/util/ast-utils.js rename to tests/lib/rules/utils/ast-utils.js index c879dfb053f..57927a64d47 100644 --- a/tests/lib/util/ast-utils.js +++ b/tests/lib/rules/utils/ast-utils.js @@ -11,9 +11,9 @@ const assert = require("chai").assert, espree = require("espree"), - astUtils = require("../../../lib/util/ast-utils"), - { Linter } = require("../../../lib/linter"), - SourceCode = require("../../../lib/util/source-code"); + astUtils = require("../../../../lib/rules/utils/ast-utils"), + { Linter } = require("../../../../lib/linter"), + { SourceCode } = require("../../../../lib/source-code"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/util/fix-tracker.js b/tests/lib/rules/utils/fix-tracker.js similarity index 94% rename from tests/lib/util/fix-tracker.js rename to tests/lib/rules/utils/fix-tracker.js index d68a294531b..7a4a83f9641 100644 --- a/tests/lib/util/fix-tracker.js +++ b/tests/lib/rules/utils/fix-tracker.js @@ -10,10 +10,10 @@ const assert = require("chai").assert, espree = require("espree"), - FixTracker = require("../../../lib/util/fix-tracker"), - ruleFixer = require("../../../lib/util/rule-fixer"), - SourceCode = require("../../../lib/util/source-code"), - Traverser = require("../../../lib/util/traverser"); + FixTracker = require("../../../../lib/rules/utils/fix-tracker"), + ruleFixer = require("../../../../lib/linter/rule-fixer"), + { SourceCode } = require("../../../../lib/source-code"), + Traverser = require("../../../../lib/shared/traverser"); //------------------------------------------------------------------------------ // Helpers diff --git a/tests/lib/rules/valid-jsdoc.js b/tests/lib/rules/valid-jsdoc.js index 417c6567b6a..3b9d9d09cf6 100644 --- a/tests/lib/rules/valid-jsdoc.js +++ b/tests/lib/rules/valid-jsdoc.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/valid-jsdoc"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/valid-typeof.js b/tests/lib/rules/valid-typeof.js index 203609cb628..0033a4f8abd 100644 --- a/tests/lib/rules/valid-typeof.js +++ b/tests/lib/rules/valid-typeof.js @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/valid-typeof"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/vars-on-top.js b/tests/lib/rules/vars-on-top.js index ed0f70532ad..92e1a0d1cc0 100644 --- a/tests/lib/rules/vars-on-top.js +++ b/tests/lib/rules/vars-on-top.js @@ -10,13 +10,13 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/vars-on-top"), - EslintTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests //------------------------------------------------------------------------------ -const ruleTester = new EslintTester(); +const ruleTester = new RuleTester(); const error = { messageId: "top", type: "VariableDeclaration" }; ruleTester.run("vars-on-top", rule, { diff --git a/tests/lib/rules/wrap-iife.js b/tests/lib/rules/wrap-iife.js index 0a5cd00a5f4..6e9a998331c 100644 --- a/tests/lib/rules/wrap-iife.js +++ b/tests/lib/rules/wrap-iife.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/wrap-iife"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/wrap-regex.js b/tests/lib/rules/wrap-regex.js index 8e3fc271406..db1820fef40 100644 --- a/tests/lib/rules/wrap-regex.js +++ b/tests/lib/rules/wrap-regex.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/wrap-regex"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/yield-star-spacing.js b/tests/lib/rules/yield-star-spacing.js index 4bc3dc53db3..0665f648e52 100644 --- a/tests/lib/rules/yield-star-spacing.js +++ b/tests/lib/rules/yield-star-spacing.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/yield-star-spacing"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/rules/yoda.js b/tests/lib/rules/yoda.js index da2bf1200c6..89979ff58b0 100644 --- a/tests/lib/rules/yoda.js +++ b/tests/lib/rules/yoda.js @@ -9,7 +9,7 @@ // Requirements //------------------------------------------------------------------------------ const rule = require("../../../lib/rules/yoda"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/config/config-ops.js b/tests/lib/shared/config-ops.js similarity index 99% rename from tests/lib/config/config-ops.js rename to tests/lib/shared/config-ops.js index 4309f539116..73f34155405 100644 --- a/tests/lib/config/config-ops.js +++ b/tests/lib/shared/config-ops.js @@ -11,7 +11,7 @@ const assert = require("chai").assert, leche = require("leche"), util = require("util"), - ConfigOps = require("../../../lib/config/config-ops"); + ConfigOps = require("../../../lib/shared/config-ops"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/lib/config/config-validator.js b/tests/lib/shared/config-validator.js similarity index 99% rename from tests/lib/config/config-validator.js rename to tests/lib/shared/config-validator.js index af66f6df9d5..b89c74cfa56 100644 --- a/tests/lib/config/config-validator.js +++ b/tests/lib/shared/config-validator.js @@ -11,8 +11,8 @@ const assert = require("chai").assert, { Linter } = require("../../../lib/linter"), - validator = require("../../../lib/config/config-validator"), - Rules = require("../../../lib/rules"); + validator = require("../../../lib/shared/config-validator"), + Rules = require("../../../lib/linter/rules"); const linter = new Linter(); //------------------------------------------------------------------------------ diff --git a/tests/lib/util/traverser.js b/tests/lib/shared/traverser.js similarity index 97% rename from tests/lib/util/traverser.js rename to tests/lib/shared/traverser.js index f2de25a5b50..5fbfb861c27 100644 --- a/tests/lib/util/traverser.js +++ b/tests/lib/shared/traverser.js @@ -1,7 +1,7 @@ "use strict"; const assert = require("chai").assert; -const Traverser = require("../../../lib/util/traverser"); +const Traverser = require("../../../lib/shared/traverser"); describe("Traverser", () => { it("traverses all keys except 'parent', 'leadingComments', and 'trailingComments'", () => { diff --git a/tests/lib/util/source-code.js b/tests/lib/source-code/source-code.js similarity index 99% rename from tests/lib/util/source-code.js rename to tests/lib/source-code/source-code.js index 97baf943d69..aee0ab29305 100644 --- a/tests/lib/util/source-code.js +++ b/tests/lib/source-code/source-code.js @@ -15,8 +15,8 @@ const fs = require("fs"), sinon = require("sinon"), leche = require("leche"), { Linter } = require("../../../lib/linter"), - SourceCode = require("../../../lib/util/source-code"), - astUtils = require("../../../lib/util/ast-utils"); + SourceCode = require("../../../lib/source-code/source-code"), + astUtils = require("../../../lib/shared/ast-utils"); //------------------------------------------------------------------------------ // Helpers @@ -1673,7 +1673,7 @@ describe("SourceCode", () => { it("should retrieve unaltered shebang text", () => { // Shebangs are normalized to line comments before parsing. - ast = espree.parse(SHEBANG_TEST_CODE.replace(astUtils.SHEBANG_MATCHER, (match, captured) => `//${captured}`), DEFAULT_CONFIG); + ast = espree.parse(SHEBANG_TEST_CODE.replace(astUtils.shebangPattern, (match, captured) => `//${captured}`), DEFAULT_CONFIG); sourceCode = new SourceCode(SHEBANG_TEST_CODE, ast); const shebangToken = sourceCode.getAllComments()[0]; diff --git a/tests/lib/token-store.js b/tests/lib/source-code/token-store.js similarity index 99% rename from tests/lib/token-store.js rename to tests/lib/source-code/token-store.js index cf27c53b32d..ff54a6a838a 100644 --- a/tests/lib/token-store.js +++ b/tests/lib/source-code/token-store.js @@ -11,7 +11,7 @@ const assert = require("chai").assert, espree = require("espree"), - TokenStore = require("../../lib/token-store"); + TokenStore = require("../../../lib/source-code/token-store"); //------------------------------------------------------------------------------ // Constants diff --git a/tests/tools/eslint-fuzzer.js b/tests/tools/eslint-fuzzer.js index 701a63999b2..5527c25cd99 100644 --- a/tests/tools/eslint-fuzzer.js +++ b/tests/tools/eslint-fuzzer.js @@ -4,7 +4,7 @@ const assert = require("chai").assert; const eslint = require("../.."); const espree = require("espree"); const sinon = require("sinon"); -const configRule = require("../../lib/config/config-rule"); +const configRule = require("../../lib/init/config-rule"); describe("eslint-fuzzer", function() { let fakeRule, fuzz; diff --git a/tests/tools/internal-rules/consistent-docs-description.js b/tests/tools/internal-rules/consistent-docs-description.js index 164431640e6..80fa7784a49 100644 --- a/tests/tools/internal-rules/consistent-docs-description.js +++ b/tests/tools/internal-rules/consistent-docs-description.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../tools/internal-rules/consistent-docs-description"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/tools/internal-rules/consistent-docs-url.js b/tests/tools/internal-rules/consistent-docs-url.js index cccbc95ac8f..3c61a181f39 100644 --- a/tests/tools/internal-rules/consistent-docs-url.js +++ b/tests/tools/internal-rules/consistent-docs-url.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../tools/internal-rules/consistent-docs-url"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/tools/internal-rules/consistent-meta-messages.js b/tests/tools/internal-rules/consistent-meta-messages.js index d12a6483a56..4df8be92af2 100644 --- a/tests/tools/internal-rules/consistent-meta-messages.js +++ b/tests/tools/internal-rules/consistent-meta-messages.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../tools/internal-rules/consistent-meta-messages"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tests/tools/internal-rules/multiline-comment-style.js b/tests/tools/internal-rules/multiline-comment-style.js index 2b67918a3de..d6dcff71728 100644 --- a/tests/tools/internal-rules/multiline-comment-style.js +++ b/tests/tools/internal-rules/multiline-comment-style.js @@ -1,7 +1,7 @@ "use strict"; const rule = require("../../../tools/internal-rules/multiline-comment-style"); -const RuleTester = require("../../../lib/testers/rule-tester"); +const { RuleTester } = require("../../../lib/rule-tester"); const ruleTester = new RuleTester(); ruleTester.run("internal-rules/multiline-comment-style", rule, { diff --git a/tests/tools/internal-rules/no-invalid-meta.js b/tests/tools/internal-rules/no-invalid-meta.js index 3d2b08a7709..a5ff4d55a3f 100644 --- a/tests/tools/internal-rules/no-invalid-meta.js +++ b/tests/tools/internal-rules/no-invalid-meta.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const rule = require("../../../tools/internal-rules/no-invalid-meta"), - RuleTester = require("../../../lib/testers/rule-tester"); + { RuleTester } = require("../../../lib/rule-tester"); //------------------------------------------------------------------------------ // Tests diff --git a/tools/eslint-fuzzer.js b/tools/eslint-fuzzer.js index be8b7365c74..dce2b235242 100644 --- a/tools/eslint-fuzzer.js +++ b/tools/eslint-fuzzer.js @@ -13,8 +13,8 @@ const assert = require("assert"); const lodash = require("lodash"); const eslump = require("eslump"); const espree = require("espree"); -const SourceCodeFixer = require("../lib/util/source-code-fixer"); -const ruleConfigs = require("../lib/config/config-rule").createCoreRuleConfigs(true); +const SourceCodeFixer = require("../lib/linter/source-code-fixer"); +const ruleConfigs = require("../lib/init/config-rule").createCoreRuleConfigs(true); const sampleMinimizer = require("./code-sample-minimizer"); //------------------------------------------------------------------------------ diff --git a/tools/internal-rules/package.json b/tools/internal-rules/package.json index 0d80ed2779f..30287c69874 100644 --- a/tools/internal-rules/package.json +++ b/tools/internal-rules/package.json @@ -2,6 +2,7 @@ "name": "eslint-plugin-internal-rules", "version": "0.0.0", "private": true, + "files": [], "dependencies": { "eslint-rule-composer": "^0.3.0" } diff --git a/tools/internal-testers/test-parser.js b/tools/internal-testers/test-parser.js index c7f23d0e9f9..939705e94e4 100644 --- a/tools/internal-testers/test-parser.js +++ b/tools/internal-testers/test-parser.js @@ -4,7 +4,7 @@ "use strict"; const espree = require("espree"); -const Traverser = require("../../lib/util/traverser"); +const Traverser = require("../../lib/shared/traverser"); /** * Define `start`/`end` properties as throwing error. diff --git a/tools/update-unicode-utils.js b/tools/update-unicode-utils.js index d2e7c0d786b..e3acc5289c4 100644 --- a/tools/update-unicode-utils.js +++ b/tools/update-unicode-utils.js @@ -7,7 +7,7 @@ const fs = require("fs"); const path = require("path"); /** - * Render the content of `lib/util/unicode/is-combining-character.js`. + * Render the content of `lib/rules/utils/unicode/is-combining-character.js`. * @param {number[]} chars The character code list to render. * @returns {void} */ @@ -42,6 +42,6 @@ const combiningChars = Array.from(function *() { }()); fs.writeFileSync( - path.resolve(__dirname, "../lib/util/unicode/is-combining-character.js"), + path.resolve(__dirname, "../lib/rules/utils/unicode/is-combining-character.js"), renderIsCombiningCharacter(combiningChars) ); diff --git a/webpack.config.js b/webpack.config.js index 1a6a2986a01..2c2262f65ce 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -3,7 +3,7 @@ module.exports = { mode: "none", entry: { - eslint: ["@babel/polyfill", "./lib/linter.js"], + eslint: ["@babel/polyfill", "./lib/linter/linter.js"], espree: ["@babel/polyfill", "espree"] }, output: {