diff --git a/src/index.ts b/src/index.ts index 5362cfa8..532871fc 100644 --- a/src/index.ts +++ b/src/index.ts @@ -92,7 +92,15 @@ const rules = { disallowTypeAnnotations: true, fixStyle: 'inline-type-imports' }], - '@typescript-eslint/dot-notation': ['error', { allowKeywords: true }], + '@typescript-eslint/dot-notation': ['error', + { + allowIndexSignaturePropertyAccess: false, + allowKeywords: true, + allowPattern: '', + allowPrivateClassPropertyAccess: false, + allowProtectedClassPropertyAccess: false + } + ], '@typescript-eslint/explicit-function-return-type': ['error', { allowExpressions: true, allowHigherOrderFunctions: true, @@ -136,7 +144,7 @@ const rules = { }], '@typescript-eslint/key-spacing': ['error', { beforeColon: false, afterColon: true }], '@typescript-eslint/keyword-spacing': ['error', { before: true, after: true }], - '@typescript-eslint/lines-between-class-members': ['error', 'always', { exceptAfterSingleLine: true }], + '@typescript-eslint/lines-between-class-members': ['error', 'always', { exceptAfterOverload: true, exceptAfterSingleLine: true }], '@typescript-eslint/member-delimiter-style': [ 'error', { @@ -180,7 +188,8 @@ const rules = { '@typescript-eslint/no-unused-expressions': ['error', { allowShortCircuit: true, allowTernary: true, - allowTaggedTemplates: true + allowTaggedTemplates: true, + enforceForJSX: false }], '@typescript-eslint/no-unused-vars': ['error', { args: 'none', @@ -231,10 +240,11 @@ const rules = { '@typescript-eslint/type-annotation-spacing': ['error'], '@typescript-eslint/unbound-method': ['error', { ignoreStatic: false }], - 'accessor-pairs': ['error', { setWithoutGet: true, enforceForClassMembers: true }], + 'accessor-pairs': ['error', { setWithoutGet: true, getWithoutSet: false, enforceForClassMembers: true }], 'array-bracket-spacing': ['error', 'never'], 'array-callback-return': ['error', { allowImplicit: false, + allowVoid: false, checkForEach: false }], 'arrow-spacing': ['error', { before: true, after: true }], @@ -336,12 +346,12 @@ const rules = { 'no-whitespace-before-property': ['error'], 'no-with': ['error'], 'object-curly-newline': ['error', { multiline: true, consistent: true }], - 'object-property-newline': ['error', { allowMultiplePropertiesPerLine: true }], + 'object-property-newline': ['error', { allowMultiplePropertiesPerLine: true, allowAllPropertiesOnSameLine: false }], 'object-shorthand': ['warn', 'properties'], 'one-var': ['error', { initialized: 'never' }], 'operator-linebreak': ['error', 'after', { overrides: { '?': 'before', ':': 'before', '|>': 'before' } }], 'padded-blocks': ['error', { blocks: 'never', switches: 'never', classes: 'never' }], - 'prefer-const': ['error', { destructuring: 'all' }], + 'prefer-const': ['error', { destructuring: 'all', ignoreReadBeforeAssign: false }], 'prefer-regex-literals': ['error', { disallowRedundantWrapping: true }], 'quote-props': ['error', 'as-needed'], 'rest-spread-spacing': ['error', 'never'], diff --git a/src/test/_util.ts b/src/test/_util.ts index c821ae0b..977154c5 100644 --- a/src/test/_util.ts +++ b/src/test/_util.ts @@ -76,10 +76,11 @@ export const expectedExportedValue = { 'no-var': ['warn'], 'object-shorthand': ['warn', 'properties'], - 'accessor-pairs': ['error', { setWithoutGet: true, enforceForClassMembers: true }], + 'accessor-pairs': ['error', { setWithoutGet: true, getWithoutSet: false, enforceForClassMembers: true }], 'array-bracket-spacing': ['error', 'never'], 'array-callback-return': ['error', { allowImplicit: false, + allowVoid: false, checkForEach: false }], 'arrow-spacing': ['error', { before: true, after: true }], @@ -202,11 +203,11 @@ export const expectedExportedValue = { 'no-with': ['error'], 'object-curly-newline': ['error', { multiline: true, consistent: true }], 'object-curly-spacing': ['off'], - 'object-property-newline': ['error', { allowMultiplePropertiesPerLine: true }], + 'object-property-newline': ['error', { allowAllPropertiesOnSameLine: false, allowMultiplePropertiesPerLine: true }], 'one-var': ['error', { initialized: 'never' }], 'operator-linebreak': ['error', 'after', { overrides: { '?': 'before', ':': 'before', '|>': 'before' } }], 'padded-blocks': ['error', { blocks: 'never', switches: 'never', classes: 'never' }], - 'prefer-const': ['error', { destructuring: 'all' }], + 'prefer-const': ['error', { destructuring: 'all', ignoreReadBeforeAssign: false }], 'prefer-promise-reject-errors': ['off'], 'prefer-regex-literals': ['error', { disallowRedundantWrapping: true }], 'quote-props': ['error', 'as-needed'], @@ -343,7 +344,15 @@ export const expectedExportedValue = { disallowTypeAnnotations: true, fixStyle: 'inline-type-imports' }], - '@typescript-eslint/dot-notation': ['error', { allowKeywords: true }], + '@typescript-eslint/dot-notation': ['error', + { + allowIndexSignaturePropertyAccess: false, + allowKeywords: true, + allowPattern: '', + allowPrivateClassPropertyAccess: false, + allowProtectedClassPropertyAccess: false + } + ], '@typescript-eslint/explicit-function-return-type': ['error', { allowExpressions: true, allowHigherOrderFunctions: true, @@ -369,7 +378,7 @@ export const expectedExportedValue = { }], '@typescript-eslint/key-spacing': ['error', { beforeColon: false, afterColon: true }], '@typescript-eslint/keyword-spacing': ['error', { before: true, after: true }], - '@typescript-eslint/lines-between-class-members': ['error', 'always', { exceptAfterSingleLine: true }], + '@typescript-eslint/lines-between-class-members': ['error', 'always', { exceptAfterOverload: true, exceptAfterSingleLine: true }], '@typescript-eslint/member-delimiter-style': [ 'error', { @@ -413,7 +422,7 @@ export const expectedExportedValue = { '@typescript-eslint/no-unsafe-argument': ['error'], '@typescript-eslint/no-unused-vars': ['error', { args: 'none', caughtErrors: 'none', ignoreRestSiblings: true, vars: 'all' }], '@typescript-eslint/no-use-before-define': ['error', { functions: false, classes: false, enums: false, variables: false, typedefs: false }], - '@typescript-eslint/no-unused-expressions': ['error', { allowShortCircuit: true, allowTaggedTemplates: true, allowTernary: true }], + '@typescript-eslint/no-unused-expressions': ['error', { allowShortCircuit: true, allowTaggedTemplates: true, allowTernary: true, enforceForJSX: false }], '@typescript-eslint/no-useless-constructor': ['error'], '@typescript-eslint/no-var-requires': ['error'], '@typescript-eslint/object-curly-spacing': ['error', 'always'], diff --git a/src/test/resolved-config.ts b/src/test/resolved-config.ts index f173d097..ee0c2ad7 100644 --- a/src/test/resolved-config.ts +++ b/src/test/resolved-config.ts @@ -15,5 +15,5 @@ test('resolved config', async (t): Promise => { t.deepEqual(actual.plugins, [...expectedExportedValue.plugins].reverse(), 'plugins') t.deepEqual(actual.globals, expectedExportedValue.globals, 'globals') t.true(actual.parser.includes(expectedExportedValue.parser), 'parser') - t.like(actual.rules, expectedExportedValue.rules, 'rules') + t.deepEqual(actual.rules, expectedExportedValue.rules, 'rules') })