github-actions[bot]
commented
3 years ago prettier/prettier#10297 VS prettier/prettier@main
- babel/babel@b63be942cef487fa31a7fa35bd7694076d5b7ad9
- vuejs/eslint-plugin-vue@cc9c14003390dccf358cbda042e359ecfda8432a
- excalidraw/excalidraw@1973ae9444027cc97eea87e1c0cbbf98c1d1160b
- prettier/prettier@2c1b8f6fab1f9c63ab5d937908d090d8e75e8072
- typescript-eslint/typescript-eslint@7b701a3091eca0eef5a1e3a7cbcadbabdc54104d
Diff (3727 lines)
````diff diff --git ORI/babel/packages/babel-cli/test/index.js ALT/babel/packages/babel-cli/test/index.js index 7cedb49e3..bd2f64c1b 100644 --- ORI/babel/packages/babel-cli/test/index.js +++ ALT/babel/packages/babel-cli/test/index.js @@ -52,19 +52,21 @@ const saveInFiles = function (files) { }; const normalizeOutput = function (str, cwd) { - let result = str - .replace(/\(\d+ms\)/g, "(123ms)") - .replace(new RegExp(escapeRegExp(cwd), "g"), "
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-imports.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-imports.ts
index 096deaff..8d9d6de9 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-imports.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-imports.ts
@@ -592,9 +592,10 @@ export default util.createRule({
);
// import Type , {...} from 'foo'
// ^^^^^ pick
- const defaultText = sourceCode.text
- .slice(defaultSpecifier.range[0], commaToken.range[0])
- .trim();
+ const defaultText =
+ sourceCode.text
+ .slice(defaultSpecifier.range[0], commaToken.range[0])
+ .trim();
yield fixer.insertTextBefore(
node,
`import type ${defaultText} from ${sourceCode.getText(
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/func-call-spacing.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/func-call-spacing.ts
index 08d72181..c9d94183 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/func-call-spacing.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/func-call-spacing.ts
@@ -99,9 +99,10 @@ export default util.createRule({
util.isNotOptionalChainPunctuator,
)!;
- const textBetweenTokens = text
- .slice(lastCalleeToken.range[1], openingParenToken.range[0])
- .replace(/\/\*.*?\*\//gu, '');
+ const textBetweenTokens =
+ text
+ .slice(lastCalleeToken.range[1], openingParenToken.range[0])
+ .replace(/\/\*.*?\*\//gu, '');
const hasWhitespace = /\s/u.test(textBetweenTokens);
const hasNewline =
hasWhitespace && util.LINEBREAK_MATCHER.test(textBetweenTokens);
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/method-signature-style.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/method-signature-style.ts
index 4775a1fe..02a704b0 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/method-signature-style.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/method-signature-style.ts
@@ -154,13 +154,14 @@ export default util.createRule({
methodNode,
...duplicatedKeyMethodNodes,
].sort((a, b) => (a.range[0] < b.range[0] ? -1 : 1));
- const typeString = methodNodes
- .map(node => {
- const params = getMethodParams(node);
- const returnType = getMethodReturnType(node);
- return `(${params} => ${returnType})`;
- })
- .join(' & ');
+ const typeString =
+ methodNodes
+ .map(node => {
+ const params = getMethodParams(node);
+ const returnType = getMethodReturnType(node);
+ return `(${params} => ${returnType})`;
+ })
+ .join(' & ');
const key = getMethodKey(methodNode);
const delimiter = getDelimiter(methodNode);
yield fixer.replaceText(
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention-utils/parse-options.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention-utils/parse-options.ts
index c4e6e36b..b0e1386f 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention-utils/parse-options.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention-utils/parse-options.ts
@@ -80,9 +80,10 @@ function normalizeOption(option: Selector): NormalizedSelector[] {
}
function parseOptions(context: Context): ParsedOptions {
- const normalizedOptions = context.options
- .map(opt => normalizeOption(opt))
- .reduce((acc, val) => acc.concat(val), []);
+ const normalizedOptions =
+ context.options
+ .map(opt => normalizeOption(opt))
+ .reduce((acc, val) => acc.concat(val), []);
return util.getEnumNames(Selectors).reduce((acc, k) => {
acc[k] = createValidator(k, context, normalizedOptions);
return acc;
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention-utils/validator.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention-utils/validator.ts
index a683933d..0297f62c 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention-utils/validator.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention-utils/validator.ts
@@ -28,46 +28,47 @@ function createValidator(
): (node: TSESTree.Identifier | TSESTree.Literal) => void {
// make sure the "highest priority" configs are checked first
const selectorType = Selectors[type];
- const configs = allConfigs
- // gather all of the applicable selectors
- .filter(
- c =>
- (c.selector & selectorType) !== 0 ||
- c.selector === MetaSelectors.default,
- )
- .sort((a, b) => {
- if (a.selector === b.selector) {
- // in the event of the same selector, order by modifier weight
- // sort descending - the type modifiers are "more important"
- return b.modifierWeight - a.modifierWeight;
- }
+ const configs =
+ allConfigs
+ // gather all of the applicable selectors
+ .filter(
+ c =>
+ (c.selector & selectorType) !== 0 ||
+ c.selector === MetaSelectors.default,
+ )
+ .sort((a, b) => {
+ if (a.selector === b.selector) {
+ // in the event of the same selector, order by modifier weight
+ // sort descending - the type modifiers are "more important"
+ return b.modifierWeight - a.modifierWeight;
+ }
- const aIsMeta = isMetaSelector(a.selector);
- const bIsMeta = isMetaSelector(b.selector);
+ const aIsMeta = isMetaSelector(a.selector);
+ const bIsMeta = isMetaSelector(b.selector);
- // non-meta selectors should go ahead of meta selectors
- if (aIsMeta && !bIsMeta) {
- return 1;
- }
- if (!aIsMeta && bIsMeta) {
- return -1;
- }
+ // non-meta selectors should go ahead of meta selectors
+ if (aIsMeta && !bIsMeta) {
+ return 1;
+ }
+ if (!aIsMeta && bIsMeta) {
+ return -1;
+ }
- const aIsMethodOrProperty = isMethodOrPropertySelector(a.selector);
- const bIsMethodOrProperty = isMethodOrPropertySelector(b.selector);
+ const aIsMethodOrProperty = isMethodOrPropertySelector(a.selector);
+ const bIsMethodOrProperty = isMethodOrPropertySelector(b.selector);
- // for backward compatibility, method and property have higher precedence than other meta selectors
- if (aIsMethodOrProperty && !bIsMethodOrProperty) {
- return -1;
- }
- if (!aIsMethodOrProperty && bIsMethodOrProperty) {
- return 1;
- }
+ // for backward compatibility, method and property have higher precedence than other meta selectors
+ if (aIsMethodOrProperty && !bIsMethodOrProperty) {
+ return -1;
+ }
+ if (!aIsMethodOrProperty && bIsMethodOrProperty) {
+ return 1;
+ }
- // both aren't meta selectors
- // sort descending - the meta selectors are "least important"
- return b.selector - a.selector;
- });
+ // both aren't meta selectors
+ // sort descending - the meta selectors are "least important"
+ return b.selector - a.selector;
+ });
return (
node: TSESTree.Identifier | TSESTree.Literal,
@@ -429,10 +430,11 @@ function isCorrectType(
const { esTreeNodeToTSNodeMap, program } = util.getParserServices(context);
const checker = program.getTypeChecker();
const tsNode = esTreeNodeToTSNodeMap.get(node);
- const type = checker
- .getTypeAtLocation(tsNode)
- // remove null and undefined from the type, as we don't care about it here
- .getNonNullableType();
+ const type =
+ checker
+ .getTypeAtLocation(tsNode)
+ // remove null and undefined from the type, as we don't care about it here
+ .getNonNullableType();
for (const allowedType of config.types) {
switch (allowedType) {
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention.ts
index 16e31b62..91c6dc0c 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention.ts
@@ -96,9 +96,10 @@ export default util.createRule({
const validators = parseOptions(context);
// getParserServices(context, false) -- dirty hack to work around the docs checker test...
- const compilerOptions = util
- .getParserServices(context, true)
- .program.getCompilerOptions();
+ const compilerOptions =
+ util
+ .getParserServices(context, true)
+ .program.getCompilerOptions();
function handleMember(
validator: ValidatorFunction | null,
node:
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-invalid-void-type.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-invalid-void-type.ts
index 0dff489e..3ef3fcbb 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-invalid-void-type.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-invalid-void-type.ts
@@ -102,9 +102,10 @@ export default util.createRule<[Options], MessageIds>({
// check whitelist
if (Array.isArray(allowInGenericTypeArguments)) {
const sourceCode = context.getSourceCode();
- const fullyQualifiedName = sourceCode
- .getText(node.parent.parent.typeName)
- .replace(/ /gu, '');
+ const fullyQualifiedName =
+ sourceCode
+ .getText(node.parent.parent.typeName)
+ .replace(/ /gu, '');
if (
!allowInGenericTypeArguments
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-loop-func.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-loop-func.ts
index 44d0178e..99153caa 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-loop-func.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-loop-func.ts
@@ -49,9 +49,10 @@ export default util.createRule({
}
const references = context.getScope().through;
- const unsafeRefs = references
- .filter(r => !isSafe(loopNode, r))
- .map(r => r.identifier.name);
+ const unsafeRefs =
+ references
+ .filter(r => !isSafe(loopNode, r))
+ .map(r => r.identifier.name);
if (unsafeRefs.length > 0) {
context.report({
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-redeclare.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-redeclare.ts
index 21456319..d6d58ade 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-redeclare.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-redeclare.ts
@@ -101,15 +101,16 @@ export default util.createRule({
}
}
- const identifiers = variable.identifiers
- .map(id => ({
- identifier: id,
- parent: id.parent!,
- }))
- // ignore function declarations because TS will treat them as an overload
- .filter(
- ({ parent }) => parent.type !== AST_NODE_TYPES.TSDeclareFunction,
- );
+ const identifiers =
+ variable.identifiers
+ .map(id => ({
+ identifier: id,
+ parent: id.parent!,
+ }))
+ // ignore function declarations because TS will treat them as an overload
+ .filter(
+ ({ parent }) => parent.type !== AST_NODE_TYPES.TSDeclareFunction,
+ );
if (options.ignoreDeclarationMerge && identifiers.length > 1) {
if (
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-includes.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-includes.ts
index d21b088d..cc5a0136 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-includes.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-includes.ts
@@ -146,9 +146,10 @@ export default createRule({
// Get the symbol of `indexOf` method.
const tsNode = services.esTreeNodeToTSNodeMap.get(node.property);
- const indexofMethodDeclarations = types
- .getSymbolAtLocation(tsNode)
- ?.getDeclarations();
+ const indexofMethodDeclarations =
+ types
+ .getSymbolAtLocation(tsNode)
+ ?.getDeclarations();
if (
indexofMethodDeclarations == null ||
indexofMethodDeclarations.length === 0
@@ -161,9 +162,10 @@ export default createRule({
for (const instanceofMethodDecl of indexofMethodDeclarations) {
const typeDecl = instanceofMethodDecl.parent;
const type = types.getTypeAtLocation(typeDecl);
- const includesMethodDecl = type
- .getProperty('includes')
- ?.getDeclarations();
+ const includesMethodDecl =
+ type
+ .getProperty('includes')
+ ?.getDeclarations();
if (
includesMethodDecl == null ||
!includesMethodDecl.some(includesMethodDecl =>
@@ -204,9 +206,10 @@ export default createRule({
const tsNode = services.esTreeNodeToTSNodeMap.get(argument);
const type = getConstrainedTypeAtLocation(types, tsNode);
- const includesMethodDecl = type
- .getProperty('includes')
- ?.getDeclarations();
+ const includesMethodDecl =
+ type
+ .getProperty('includes')
+ ?.getDeclarations();
if (includesMethodDecl == null) {
return;
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/promise-function-async.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/promise-function-async.ts
index 00888c8f..1bcb2f96 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/promise-function-async.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/promise-function-async.ts
@@ -99,9 +99,10 @@ export default util.createRule({
| TSESTree.FunctionExpression,
): void {
const originalNode = parserServices.esTreeNodeToTSNodeMap.get(node);
- const signatures = checker
- .getTypeAtLocation(originalNode)
- .getCallSignatures();
+ const signatures =
+ checker
+ .getTypeAtLocation(originalNode)
+ .getCallSignatures();
if (!signatures.length) {
return;
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/sort-type-union-intersection-members.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/sort-type-union-intersection-members.ts
index ff4a4d1a..e738a517 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/sort-type-union-intersection-members.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/sort-type-union-intersection-members.ts
@@ -210,11 +210,14 @@ export default util.createRule({
}
const fix: TSESLint.ReportFixFunction = fixer => {
- const sorted = expectedOrder
- .map(t => t.text)
- .join(
- node.type === AST_NODE_TYPES.TSIntersectionType ? ' & ' : ' | ',
- );
+ const sorted =
+ expectedOrder
+ .map(t => t.text)
+ .join(
+ node.type === AST_NODE_TYPES.TSIntersectionType
+ ? ' & '
+ : ' | ',
+ );
return fixer.replaceText(node, sorted);
};
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/switch-exhaustiveness-check.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/switch-exhaustiveness-check.ts
index 8881473d..99d911d8 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/switch-exhaustiveness-check.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/switch-exhaustiveness-check.ts
@@ -88,9 +88,10 @@ export default createRule({
);
}
- const fixString = missingCases
- .map(code => `${caseIndent}${code}`)
- .join('\n');
+ const fixString =
+ missingCases
+ .map(code => `${caseIndent}${code}`)
+ .join('\n');
if (lastCase) {
return fixer.insertTextAfter(lastCase, `\n${fixString}`);
@@ -141,13 +142,14 @@ export default createRule({
node: node.discriminant,
messageId: 'switchIsNotExhaustive',
data: {
- missingBranches: missingBranchTypes
- .map(missingType =>
- isTypeFlagSet(missingType, ts.TypeFlags.ESSymbolLike)
- ? `typeof ${missingType.getSymbol()?.escapedName}`
- : checker.typeToString(missingType),
- )
- .join(' | '),
+ missingBranches:
+ missingBranchTypes
+ .map(missingType =>
+ isTypeFlagSet(missingType, ts.TypeFlags.ESSymbolLike)
+ ? `typeof ${missingType.getSymbol()?.escapedName}`
+ : checker.typeToString(missingType),
+ )
+ .join(' | '),
},
suggest: [
{
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/unbound-method.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/unbound-method.ts
index 407d04c1..ffacd370 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/unbound-method.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/unbound-method.ts
@@ -81,23 +81,24 @@ const SUPPORTED_GLOBALS = [
'JSON',
'Intl',
] as const;
-const nativelyBoundMembers = SUPPORTED_GLOBALS.map(namespace => {
- if (!(namespace in global)) {
- // node.js might not have namespaces like Intl depending on compilation options
- // https://nodejs.org/api/intl.html#intl_options_for_building_node_js
- return [];
- }
- const object = global[namespace];
- return Object.getOwnPropertyNames(object)
- .filter(
- name =>
- !name.startsWith('_') &&
- typeof (object as Record)[name] === 'function',
- )
- .map(name => `${namespace}.${name}`);
-})
- .reduce((arr, names) => arr.concat(names), [])
- .filter(name => !nativelyNotBoundMembers.has(name));
+const nativelyBoundMembers =
+ SUPPORTED_GLOBALS.map(namespace => {
+ if (!(namespace in global)) {
+ // node.js might not have namespaces like Intl depending on compilation options
+ // https://nodejs.org/api/intl.html#intl_options_for_building_node_js
+ return [];
+ }
+ const object = global[namespace];
+ return Object.getOwnPropertyNames(object)
+ .filter(
+ name =>
+ !name.startsWith('_') &&
+ typeof (object as Record)[name] === 'function',
+ )
+ .map(name => `${namespace}.${name}`);
+ })
+ .reduce((arr, names) => arr.concat(names), [])
+ .filter(name => !nativelyNotBoundMembers.has(name));
const isNotImported = (
symbol: ts.Symbol,
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/util/propertyTypes.ts ALT/typescript-eslint/packages/eslint-plugin/src/util/propertyTypes.ts
index 5e2f1054..4b4a25b2 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/util/propertyTypes.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/util/propertyTypes.ts
@@ -13,9 +13,10 @@ export function getTypeOfPropertyOfName(
// Symbolic names may differ in their escaped name compared to their human-readable name
// https://github.com/typescript-eslint/typescript-eslint/issues/2143
- const escapedProperty = type
- .getProperties()
- .find(property => property.escapedName === escapedName);
+ const escapedProperty =
+ type
+ .getProperties()
+ .find(property => property.escapedName === escapedName);
return escapedProperty
? checker.getDeclaredTypeOfSymbol(escapedProperty)
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/configs.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/configs.test.ts
index f8fc068a..ed879e52 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/configs.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/configs.test.ts
@@ -2,17 +2,18 @@ import rules from '../src/rules';
import plugin from '../src/index';
const RULE_NAME_PREFIX = '@typescript-eslint/';
-const EXTENSION_RULES = Object.entries(rules)
- .filter(([, rule]) => rule.meta.docs?.extendsBaseRule)
- .map(
- ([ruleName, rule]) =>
- [
- `${RULE_NAME_PREFIX}${ruleName}`,
- typeof rule.meta.docs?.extendsBaseRule === 'string'
- ? rule.meta.docs.extendsBaseRule
- : ruleName,
- ] as const,
- );
+const EXTENSION_RULES =
+ Object.entries(rules)
+ .filter(([, rule]) => rule.meta.docs?.extendsBaseRule)
+ .map(
+ ([ruleName, rule]) =>
+ [
+ `${RULE_NAME_PREFIX}${ruleName}`,
+ typeof rule.meta.docs?.extendsBaseRule === 'string'
+ ? rule.meta.docs.extendsBaseRule
+ : ruleName,
+ ] as const,
+ );
function entriesToObject(value: [string, T][]): Record {
return value.reduce>((accum, [k, v]) => {
@@ -49,9 +50,13 @@ describe('all.json config', () => {
plugin.configs.all.rules;
const configRules = filterRules(unfilteredConfigRules);
// note: exclude deprecated rules, this config is allowed to change between minor versions
- const ruleConfigs = Object.entries(rules)
- .filter(([, rule]) => !rule.meta.deprecated)
- .map<[string, string]>(([name]) => [`${RULE_NAME_PREFIX}${name}`, 'error']);
+ const ruleConfigs =
+ Object.entries(rules)
+ .filter(([, rule]) => !rule.meta.deprecated)
+ .map<[string, string]>(([name]) => [
+ `${RULE_NAME_PREFIX}${name}`,
+ 'error',
+ ]);
it('contains all of the rules, excluding the deprecated ones', () => {
expect(entriesToObject(ruleConfigs)).toEqual(entriesToObject(configRules));
@@ -65,16 +70,17 @@ describe('recommended.json config', () => {
plugin.configs.recommended.rules;
const configRules = filterRules(unfilteredConfigRules);
// note: include deprecated rules so that the config doesn't change between major bumps
- const ruleConfigs = Object.entries(rules)
- .filter(
- ([, rule]) =>
- rule.meta.docs?.recommended !== false &&
- rule.meta.docs?.requiresTypeChecking !== true,
- )
- .map<[string, string]>(([name, rule]) => [
- `${RULE_NAME_PREFIX}${name}`,
- rule.meta.docs?.recommended ? rule.meta.docs.recommended : 'off',
- ]);
+ const ruleConfigs =
+ Object.entries(rules)
+ .filter(
+ ([, rule]) =>
+ rule.meta.docs?.recommended !== false &&
+ rule.meta.docs?.requiresTypeChecking !== true,
+ )
+ .map<[string, string]>(([name, rule]) => [
+ `${RULE_NAME_PREFIX}${name}`,
+ rule.meta.docs?.recommended ? rule.meta.docs.recommended : 'off',
+ ]);
it("contains all recommended rules that don't require typechecking, excluding the deprecated ones", () => {
expect(entriesToObject(ruleConfigs)).toEqual(entriesToObject(configRules));
@@ -88,16 +94,17 @@ describe('recommended-requiring-type-checking.json config', () => {
plugin.configs['recommended-requiring-type-checking'].rules;
const configRules = filterRules(unfilteredConfigRules);
// note: include deprecated rules so that the config doesn't change between major bumps
- const ruleConfigs = Object.entries(rules)
- .filter(
- ([, rule]) =>
- rule.meta.docs?.recommended !== false &&
- rule.meta.docs?.requiresTypeChecking === true,
- )
- .map<[string, string]>(([name, rule]) => [
- `${RULE_NAME_PREFIX}${name}`,
- rule.meta.docs?.recommended ? rule.meta.docs.recommended : 'off',
- ]);
+ const ruleConfigs =
+ Object.entries(rules)
+ .filter(
+ ([, rule]) =>
+ rule.meta.docs?.recommended !== false &&
+ rule.meta.docs?.requiresTypeChecking === true,
+ )
+ .map<[string, string]>(([name, rule]) => [
+ `${RULE_NAME_PREFIX}${name}`,
+ rule.meta.docs?.recommended ? rule.meta.docs.recommended : 'off',
+ ]);
it('contains all recommended rules that require type checking, excluding the deprecated ones', () => {
expect(entriesToObject(ruleConfigs)).toEqual(entriesToObject(configRules));
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/docs.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/docs.test.ts
index d67ff887..230e312b 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/docs.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/docs.test.ts
@@ -41,13 +41,15 @@ function parseReadme(): {
describe('Validating rule docs', () => {
it('All rules must have a corresponding rule doc', () => {
- const files = fs
- .readdirSync(docsRoot)
- // this rule doc was left behind on purpose for legacy reasons
- .filter(rule => rule !== 'camelcase.md');
- const ruleFiles = Object.keys(rules)
- .map(rule => `${rule}.md`)
- .sort();
+ const files =
+ fs
+ .readdirSync(docsRoot)
+ // this rule doc was left behind on purpose for legacy reasons
+ .filter(rule => rule !== 'camelcase.md');
+ const ruleFiles =
+ Object.keys(rules)
+ .map(rule => `${rule}.md`)
+ .sort();
expect(files.sort()).toEqual(ruleFiles);
});
@@ -115,20 +117,22 @@ describe('Validating README.md', () => {
);
it('All non-deprecated base rules should have a row in the base rules table, and the table should be ordered alphabetically', () => {
- const baseRuleNames = baseRules
- .map(([ruleName]) => ruleName)
- .sort()
- .map(createRuleLink);
+ const baseRuleNames =
+ baseRules
+ .map(([ruleName]) => ruleName)
+ .sort()
+ .map(createRuleLink);
expect(rulesTables.base.cells.map(row => row[0])).toStrictEqual(
baseRuleNames,
);
});
it('All non-deprecated extension rules should have a row in the base rules table, and the table should be ordered alphabetically', () => {
- const extensionRuleNames = extensionRules
- .map(([ruleName]) => ruleName)
- .sort()
- .map(createRuleLink);
+ const extensionRuleNames =
+ extensionRules
+ .map(([ruleName]) => ruleName)
+ .sort()
+ .map(createRuleLink);
expect(rulesTables.extension.cells.map(row => row[0])).toStrictEqual(
extensionRuleNames,
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/index.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/index.test.ts
index 3cac8304..6ca70b85 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/index.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/index.test.ts
@@ -8,10 +8,13 @@ describe('eslint-plugin ("./src/index.ts")', () => {
const ruleKeys = Object.keys(rules);
const eslintPluginRuleKeys = Object.keys(eslintPlugin.rules);
- const configs = fs
- .readdirSync('./src/configs')
- .filter(file => ['.json', '.ts'].includes(path.extname(file).toLowerCase()))
- .map(file => path.basename(file, path.extname(file)));
+ const configs =
+ fs
+ .readdirSync('./src/configs')
+ .filter(file =>
+ ['.json', '.ts'].includes(path.extname(file).toLowerCase()),
+ )
+ .map(file => path.basename(file, path.extname(file)));
const eslintPluginConfigKeys = Object.keys(eslintPlugin.configs);
it('exports all available rules', () => {
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/indent/indent.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/indent/indent.test.ts
index 8296bf19..22d15332 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/indent/indent.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/indent/indent.test.ts
@@ -640,30 +640,31 @@ type Foo = string | {
// test the fixer by removing all the spaces
code: code.replace(new RegExp(indent, 'g'), ''),
output: code,
- errors: code
- .split('\n')
- .map | null>((line, lineNum) => {
- const indentCount = line.split(indent).length - 1;
- const spaceCount = indentCount * indent.length;
+ errors:
+ code
+ .split('\n')
+ .map | null>((line, lineNum) => {
+ const indentCount = line.split(indent).length - 1;
+ const spaceCount = indentCount * indent.length;
- if (indentCount < 1) {
- return null;
- }
+ if (indentCount < 1) {
+ return null;
+ }
- return {
- messageId: 'wrongIndentation',
- data: {
- expected: `${spaceCount} spaces`,
- actual: 0,
- },
- line: lineNum + 1,
- column: 1,
- };
- })
- .filter(
- (error): error is TSESLint.TestCaseError =>
- error !== null,
- ),
+ return {
+ messageId: 'wrongIndentation',
+ data: {
+ expected: `${spaceCount} spaces`,
+ actual: 0,
+ },
+ line: lineNum + 1,
+ column: 1,
+ };
+ })
+ .filter(
+ (error): error is TSESLint.TestCaseError =>
+ error !== null,
+ ),
};
if (invalid.errors.length > 0) {
invalidCases.push(invalid);
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/indent/utils.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/indent/utils.ts
index badfbc1c..cd868ac7 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/indent/utils.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/indent/utils.ts
@@ -19,13 +19,15 @@ type MessageIds = InferMessageIdsTypeFromRule;
export function unIndent(strings: TemplateStringsArray): string {
const WHITESPACE_REGEX = / */u;
const templateValue = strings[0];
- const lines = templateValue
- .replace(/^\n/u, '')
- .replace(/\n\s*$/u, '')
- .split('\n');
- const lineIndents = lines
- .filter(line => line.trim())
- .map(line => WHITESPACE_REGEX.exec(line)![0].length);
+ const lines =
+ templateValue
+ .replace(/^\n/u, '')
+ .replace(/\n\s*$/u, '')
+ .split('\n');
+ const lineIndents =
+ lines
+ .filter(line => line.trim())
+ .map(line => WHITESPACE_REGEX.exec(line)![0].length);
const minLineIndent = Math.min(...lineIndents);
return lines.map(line => line.slice(minLineIndent)).join('\n');
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/index.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/index.test.ts
index c9160c05..1139ce3e 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/index.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/index.test.ts
@@ -4,9 +4,10 @@ import rules from '../../src/rules';
describe('./src/rules/index.ts', () => {
const ruleNames = Object.keys(rules).map(name => `${name}.ts`);
- const files = fs
- .readdirSync('./src/rules')
- .filter(file => file !== 'index.ts' && file.endsWith('.ts'));
+ const files =
+ fs
+ .readdirSync('./src/rules')
+ .filter(file => file !== 'index.ts' && file.endsWith('.ts'));
it('imports all available rule modules', () => {
expect(ruleNames).toEqual(expect.arrayContaining(files));
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/prefer-readonly-parameter-types.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/prefer-readonly-parameter-types.test.ts
index 9278420a..59ac6ffc 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/prefer-readonly-parameter-types.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/prefer-readonly-parameter-types.test.ts
@@ -269,10 +269,11 @@ ruleTester.run('prefer-readonly-parameter-types', rule, {
invalid: [
// arrays
...arrays.map>(baseType => {
- const type = baseType
- .replace(/readonly /g, '')
- .replace(/Readonly<(.+?)>/g, '$1')
- .replace(/ReadonlyArray/g, 'Array');
+ const type =
+ baseType
+ .replace(/readonly /g, '')
+ .replace(/Readonly<(.+?)>/g, '$1')
+ .replace(/ReadonlyArray/g, 'Array');
return {
code: `function foo(arg: ${type}) {}`,
errors: [
diff --git ORI/typescript-eslint/packages/eslint-plugin/tools/generate-configs.ts ALT/typescript-eslint/packages/eslint-plugin/tools/generate-configs.ts
index ed84f286..1f6698f3 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tools/generate-configs.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tools/generate-configs.ts
@@ -161,16 +161,17 @@ console.log();
console.log(
'------------------------------ recommended.ts (should not require program) ------------------------------',
);
-const recommendedRules = ruleEntries
- .filter(entry => !!entry[1].meta.docs?.recommended)
- .reduce(
- (config, entry) =>
- reducer(config, entry, {
- filterDeprecated: false,
- filterRequiresTypeChecking: 'exclude',
- }),
- {},
- );
+const recommendedRules =
+ ruleEntries
+ .filter(entry => !!entry[1].meta.docs?.recommended)
+ .reduce(
+ (config, entry) =>
+ reducer(config, entry, {
+ filterDeprecated: false,
+ filterRequiresTypeChecking: 'exclude',
+ }),
+ {},
+ );
const recommendedConfig: LinterConfig = {
extends: EXTENDS,
rules: recommendedRules,
@@ -184,16 +185,17 @@ console.log();
console.log(
'--------------------------------- recommended-requiring-type-checking.ts ---------------------------------',
);
-const recommendedRulesRequiringProgram = ruleEntries
- .filter(entry => !!entry[1].meta.docs?.recommended)
- .reduce(
- (config, entry) =>
- reducer(config, entry, {
- filterDeprecated: false,
- filterRequiresTypeChecking: 'include',
- }),
- {},
- );
+const recommendedRulesRequiringProgram =
+ ruleEntries
+ .filter(entry => !!entry[1].meta.docs?.recommended)
+ .reduce(
+ (config, entry) =>
+ reducer(config, entry, {
+ filterDeprecated: false,
+ filterRequiresTypeChecking: 'include',
+ }),
+ {},
+ );
const recommendedRequiringTypeCheckingConfig: LinterConfig = {
extends: EXTENDS,
rules: recommendedRulesRequiringProgram,
diff --git ORI/typescript-eslint/packages/eslint-plugin/tools/generate-rules-lists.ts ALT/typescript-eslint/packages/eslint-plugin/tools/generate-rules-lists.ts
index cffe4006..809c9248 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tools/generate-rules-lists.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tools/generate-rules-lists.ts
@@ -105,16 +105,17 @@ const updateRulesList = (
].join('\n');
};
-const rulesDetails: RuleDetails[] = Object.entries(rules)
- .filter(([, rule]) => rule.meta.deprecated !== true)
- .map(([name, rule]) => ({
- name,
- description: rule.meta.docs?.description ?? '',
- recommended: !!rule.meta.docs?.recommended ?? false,
- fixable: !!rule.meta.fixable,
- requiresTypeChecking: rule.meta.docs?.requiresTypeChecking ?? false,
- extendsBaseRule: !!rule.meta.docs?.extendsBaseRule ?? false,
- }));
+const rulesDetails: RuleDetails[] =
+ Object.entries(rules)
+ .filter(([, rule]) => rule.meta.deprecated !== true)
+ .map(([name, rule]) => ({
+ name,
+ description: rule.meta.docs?.description ?? '',
+ recommended: !!rule.meta.docs?.recommended ?? false,
+ fixable: !!rule.meta.fixable,
+ requiresTypeChecking: rule.meta.docs?.requiresTypeChecking ?? false,
+ extendsBaseRule: !!rule.meta.docs?.extendsBaseRule ?? false,
+ }));
const baseRules = rulesDetails.filter(rule => !rule.extendsBaseRule);
const extensionRules = rulesDetails.filter(rule => rule.extendsBaseRule);
diff --git ORI/typescript-eslint/packages/parser/src/parser.ts ALT/typescript-eslint/packages/parser/src/parser.ts
index f304a837..cd6fd0d1 100644
--- ORI/typescript-eslint/packages/parser/src/parser.ts
+++ ALT/typescript-eslint/packages/parser/src/parser.ts
@@ -154,9 +154,10 @@ function parseForESLint(
compilerOptions.jsxFragmentFactory != null
) {
// in case the user has specified something like "preact.Fragment"
- const fragFactory = compilerOptions.jsxFragmentFactory
- .split('.')[0]
- .trim();
+ const fragFactory =
+ compilerOptions.jsxFragmentFactory
+ .split('.')[0]
+ .trim();
analyzeOptions.jsxFragmentName = fragFactory;
log(
'Resolved jsxFragmentName from program: %s',
diff --git ORI/typescript-eslint/packages/scope-manager/tests/fixtures.test.ts ALT/typescript-eslint/packages/scope-manager/tests/fixtures.test.ts
index 5255ed02..5f5a2295 100644
--- ORI/typescript-eslint/packages/scope-manager/tests/fixtures.test.ts
+++ ALT/typescript-eslint/packages/scope-manager/tests/fixtures.test.ts
@@ -12,24 +12,25 @@ const ONLY = [].join(path.sep);
const FIXTURES_DIR = path.resolve(__dirname, 'fixtures');
-const fixtures = glob
- .sync(`${FIXTURES_DIR}/**/*.{js,ts,jsx,tsx}`, {
- ignore: ['fixtures.test.ts'],
- })
- .map(absolute => {
- const relative = path.relative(FIXTURES_DIR, absolute);
- const { name, dir, ext } = path.parse(relative);
- const segments = dir.split(path.sep);
- const snapshotPath = path.join(FIXTURES_DIR, dir);
- return {
- absolute,
- name,
- ext,
- segments,
- snapshotPath,
- snapshotFile: path.join(snapshotPath, `${name}${ext}.shot`),
- };
- });
+const fixtures =
+ glob
+ .sync(`${FIXTURES_DIR}/**/*.{js,ts,jsx,tsx}`, {
+ ignore: ['fixtures.test.ts'],
+ })
+ .map(absolute => {
+ const relative = path.relative(FIXTURES_DIR, absolute);
+ const { name, dir, ext } = path.parse(relative);
+ const segments = dir.split(path.sep);
+ const snapshotPath = path.join(FIXTURES_DIR, dir);
+ return {
+ absolute,
+ name,
+ ext,
+ segments,
+ snapshotPath,
+ snapshotFile: path.join(snapshotPath, `${name}${ext}.shot`),
+ };
+ });
const FOUR_SLASH = /^\/\/\/\/[ ]+@(\w+)[ ]*=[ ]*(.+)$/;
const QUOTED_STRING = /^["'](.+?)['"]$/;
diff --git ORI/typescript-eslint/packages/typescript-estree/src/convert.ts ALT/typescript-eslint/packages/typescript-estree/src/convert.ts
index f5a6a230..8c0ecfc7 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/convert.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/convert.ts
@@ -1953,12 +1953,13 @@ export class Converter {
case SyntaxKind.BigIntLiteral: {
const range = getRange(node, this.ast);
const rawValue = this.ast.text.slice(range[0], range[1]);
- const bigint = rawValue
- // remove suffix `n`
- .slice(0, -1)
- // `BigInt` doesn't accept numeric separator
- // and `bigint` property should not include numeric separator
- .replace(/_/g, '');
+ const bigint =
+ rawValue
+ // remove suffix `n`
+ .slice(0, -1)
+ // `BigInt` doesn't accept numeric separator
+ // and `bigint` property should not include numeric separator
+ .replace(/_/g, '');
const value = typeof BigInt !== 'undefined' ? BigInt(bigint) : null;
return this.createNode(node, {
type: AST_NODE_TYPES.Literal,
diff --git ORI/typescript-eslint/packages/typescript-estree/src/create-program/createWatchProgram.ts ALT/typescript-eslint/packages/typescript-estree/src/create-program/createWatchProgram.ts
index a3f007a0..599cfeed 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/create-program/createWatchProgram.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/create-program/createWatchProgram.ts
@@ -289,12 +289,14 @@ function createWatchProgram(
// ensure process doesn't emit programs
watchCompilerHost.afterProgramCreate = (program): void => {
// report error if there are any errors in the config file
- const configFileDiagnostics = program
- .getConfigFileParsingDiagnostics()
- .filter(
- diag =>
- diag.category === ts.DiagnosticCategory.Error && diag.code !== 18003,
- );
+ const configFileDiagnostics =
+ program
+ .getConfigFileParsingDiagnostics()
+ .filter(
+ diag =>
+ diag.category === ts.DiagnosticCategory.Error &&
+ diag.code !== 18003,
+ );
if (configFileDiagnostics.length > 0) {
diagnosticReporter(configFileDiagnostics[0]);
}
diff --git ORI/typescript-eslint/packages/typescript-estree/src/parser.ts ALT/typescript-eslint/packages/typescript-estree/src/parser.ts
index dd765eb5..4e118007 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/parser.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/parser.ts
@@ -264,17 +264,16 @@ function applyParserOptionsToExtra(options: TSESTreeOptions): void {
// NOTE - ensureAbsolutePath relies upon having the correct tsconfigRootDir in extra
extra.filePath = ensureAbsolutePath(extra.filePath, extra);
- const projectFolderIgnoreList = (
- options.projectFolderIgnoreList ?? ['**/node_modules/**']
- )
- .reduce((acc, folder) => {
- if (typeof folder === 'string') {
- acc.push(folder);
- }
- return acc;
- }, [])
- // prefix with a ! for not match glob
- .map(folder => (folder.startsWith('!') ? folder : `!${folder}`));
+ const projectFolderIgnoreList =
+ (options.projectFolderIgnoreList ?? ['**/node_modules/**'])
+ .reduce((acc, folder) => {
+ if (typeof folder === 'string') {
+ acc.push(folder);
+ }
+ return acc;
+ }, [])
+ // prefix with a ! for not match glob
+ .map(folder => (folder.startsWith('!') ? folder : `!${folder}`));
// NOTE - prepareAndTransformProjects relies upon having the correct tsconfigRootDir in extra
extra.projects = prepareAndTransformProjects(
options.project,
diff --git ORI/typescript-eslint/tools/generate-contributors.ts ALT/typescript-eslint/tools/generate-contributors.ts
index 6bb908b3..fb6dc4df 100644
--- ORI/typescript-eslint/tools/generate-contributors.ts
+++ ALT/typescript-eslint/tools/generate-contributors.ts
@@ -83,19 +83,20 @@ async function main(): Promise {
}),
);
- const contributors = users
- // remove ignored users
- .filter(u => !IGNORED_USERS.has(u.login))
- // fetch the in-depth information for each user
- .map(usr => {
- return {
- login: usr.login,
- name: usr.name || usr.login,
- avatar_url: usr.avatar_url,
- profile: usr.html_url,
- contributions: [],
- };
- });
+ const contributors =
+ users
+ // remove ignored users
+ .filter(u => !IGNORED_USERS.has(u.login))
+ // fetch the in-depth information for each user
+ .map(usr => {
+ return {
+ login: usr.login,
+ name: usr.name || usr.login,
+ avatar_url: usr.avatar_url,
+ profile: usr.html_url,
+ contributions: [],
+ };
+ });
// build + write the .all-contributorsrc
const allContributorsConfig = {
````
sosukesuzuki
commented
3 years ago run #10297
github-actions[bot]
commented
3 years ago prettier/prettier#10297 VS prettier/prettier@main
- babel/babel@b63be942cef487fa31a7fa35bd7694076d5b7ad9
- vuejs/eslint-plugin-vue@cc9c14003390dccf358cbda042e359ecfda8432a
- excalidraw/excalidraw@1973ae9444027cc97eea87e1c0cbbf98c1d1160b
- prettier/prettier@2c1b8f6fab1f9c63ab5d937908d090d8e75e8072
- typescript-eslint/typescript-eslint@7b701a3091eca0eef5a1e3a7cbcadbabdc54104d
- vega/vega-lite@e89e9e6f1f32a106bf7e7f9091dff863e754c79a
Diff (3915 lines)
````diff diff --git ORI/babel/packages/babel-cli/test/index.js ALT/babel/packages/babel-cli/test/index.js index 7cedb49e3..bd2f64c1b 100644 --- ORI/babel/packages/babel-cli/test/index.js +++ ALT/babel/packages/babel-cli/test/index.js @@ -52,19 +52,21 @@ const saveInFiles = function (files) { }; const normalizeOutput = function (str, cwd) { - let result = str - .replace(/\(\d+ms\)/g, "(123ms)") - .replace(new RegExp(escapeRegExp(cwd), "g"), "
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-imports.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-imports.ts
index 096deaff..8d9d6de9 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-imports.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-imports.ts
@@ -592,9 +592,10 @@ export default util.createRule({
);
// import Type , {...} from 'foo'
// ^^^^^ pick
- const defaultText = sourceCode.text
- .slice(defaultSpecifier.range[0], commaToken.range[0])
- .trim();
+ const defaultText =
+ sourceCode.text
+ .slice(defaultSpecifier.range[0], commaToken.range[0])
+ .trim();
yield fixer.insertTextBefore(
node,
`import type ${defaultText} from ${sourceCode.getText(
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/func-call-spacing.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/func-call-spacing.ts
index 08d72181..c9d94183 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/func-call-spacing.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/func-call-spacing.ts
@@ -99,9 +99,10 @@ export default util.createRule({
util.isNotOptionalChainPunctuator,
)!;
- const textBetweenTokens = text
- .slice(lastCalleeToken.range[1], openingParenToken.range[0])
- .replace(/\/\*.*?\*\//gu, '');
+ const textBetweenTokens =
+ text
+ .slice(lastCalleeToken.range[1], openingParenToken.range[0])
+ .replace(/\/\*.*?\*\//gu, '');
const hasWhitespace = /\s/u.test(textBetweenTokens);
const hasNewline =
hasWhitespace && util.LINEBREAK_MATCHER.test(textBetweenTokens);
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/method-signature-style.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/method-signature-style.ts
index 4775a1fe..02a704b0 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/method-signature-style.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/method-signature-style.ts
@@ -154,13 +154,14 @@ export default util.createRule({
methodNode,
...duplicatedKeyMethodNodes,
].sort((a, b) => (a.range[0] < b.range[0] ? -1 : 1));
- const typeString = methodNodes
- .map(node => {
- const params = getMethodParams(node);
- const returnType = getMethodReturnType(node);
- return `(${params} => ${returnType})`;
- })
- .join(' & ');
+ const typeString =
+ methodNodes
+ .map(node => {
+ const params = getMethodParams(node);
+ const returnType = getMethodReturnType(node);
+ return `(${params} => ${returnType})`;
+ })
+ .join(' & ');
const key = getMethodKey(methodNode);
const delimiter = getDelimiter(methodNode);
yield fixer.replaceText(
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention-utils/parse-options.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention-utils/parse-options.ts
index c4e6e36b..b0e1386f 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention-utils/parse-options.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention-utils/parse-options.ts
@@ -80,9 +80,10 @@ function normalizeOption(option: Selector): NormalizedSelector[] {
}
function parseOptions(context: Context): ParsedOptions {
- const normalizedOptions = context.options
- .map(opt => normalizeOption(opt))
- .reduce((acc, val) => acc.concat(val), []);
+ const normalizedOptions =
+ context.options
+ .map(opt => normalizeOption(opt))
+ .reduce((acc, val) => acc.concat(val), []);
return util.getEnumNames(Selectors).reduce((acc, k) => {
acc[k] = createValidator(k, context, normalizedOptions);
return acc;
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention-utils/validator.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention-utils/validator.ts
index a683933d..0297f62c 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention-utils/validator.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention-utils/validator.ts
@@ -28,46 +28,47 @@ function createValidator(
): (node: TSESTree.Identifier | TSESTree.Literal) => void {
// make sure the "highest priority" configs are checked first
const selectorType = Selectors[type];
- const configs = allConfigs
- // gather all of the applicable selectors
- .filter(
- c =>
- (c.selector & selectorType) !== 0 ||
- c.selector === MetaSelectors.default,
- )
- .sort((a, b) => {
- if (a.selector === b.selector) {
- // in the event of the same selector, order by modifier weight
- // sort descending - the type modifiers are "more important"
- return b.modifierWeight - a.modifierWeight;
- }
+ const configs =
+ allConfigs
+ // gather all of the applicable selectors
+ .filter(
+ c =>
+ (c.selector & selectorType) !== 0 ||
+ c.selector === MetaSelectors.default,
+ )
+ .sort((a, b) => {
+ if (a.selector === b.selector) {
+ // in the event of the same selector, order by modifier weight
+ // sort descending - the type modifiers are "more important"
+ return b.modifierWeight - a.modifierWeight;
+ }
- const aIsMeta = isMetaSelector(a.selector);
- const bIsMeta = isMetaSelector(b.selector);
+ const aIsMeta = isMetaSelector(a.selector);
+ const bIsMeta = isMetaSelector(b.selector);
- // non-meta selectors should go ahead of meta selectors
- if (aIsMeta && !bIsMeta) {
- return 1;
- }
- if (!aIsMeta && bIsMeta) {
- return -1;
- }
+ // non-meta selectors should go ahead of meta selectors
+ if (aIsMeta && !bIsMeta) {
+ return 1;
+ }
+ if (!aIsMeta && bIsMeta) {
+ return -1;
+ }
- const aIsMethodOrProperty = isMethodOrPropertySelector(a.selector);
- const bIsMethodOrProperty = isMethodOrPropertySelector(b.selector);
+ const aIsMethodOrProperty = isMethodOrPropertySelector(a.selector);
+ const bIsMethodOrProperty = isMethodOrPropertySelector(b.selector);
- // for backward compatibility, method and property have higher precedence than other meta selectors
- if (aIsMethodOrProperty && !bIsMethodOrProperty) {
- return -1;
- }
- if (!aIsMethodOrProperty && bIsMethodOrProperty) {
- return 1;
- }
+ // for backward compatibility, method and property have higher precedence than other meta selectors
+ if (aIsMethodOrProperty && !bIsMethodOrProperty) {
+ return -1;
+ }
+ if (!aIsMethodOrProperty && bIsMethodOrProperty) {
+ return 1;
+ }
- // both aren't meta selectors
- // sort descending - the meta selectors are "least important"
- return b.selector - a.selector;
- });
+ // both aren't meta selectors
+ // sort descending - the meta selectors are "least important"
+ return b.selector - a.selector;
+ });
return (
node: TSESTree.Identifier | TSESTree.Literal,
@@ -429,10 +430,11 @@ function isCorrectType(
const { esTreeNodeToTSNodeMap, program } = util.getParserServices(context);
const checker = program.getTypeChecker();
const tsNode = esTreeNodeToTSNodeMap.get(node);
- const type = checker
- .getTypeAtLocation(tsNode)
- // remove null and undefined from the type, as we don't care about it here
- .getNonNullableType();
+ const type =
+ checker
+ .getTypeAtLocation(tsNode)
+ // remove null and undefined from the type, as we don't care about it here
+ .getNonNullableType();
for (const allowedType of config.types) {
switch (allowedType) {
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention.ts
index 16e31b62..91c6dc0c 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/naming-convention.ts
@@ -96,9 +96,10 @@ export default util.createRule({
const validators = parseOptions(context);
// getParserServices(context, false) -- dirty hack to work around the docs checker test...
- const compilerOptions = util
- .getParserServices(context, true)
- .program.getCompilerOptions();
+ const compilerOptions =
+ util
+ .getParserServices(context, true)
+ .program.getCompilerOptions();
function handleMember(
validator: ValidatorFunction | null,
node:
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-invalid-void-type.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-invalid-void-type.ts
index 0dff489e..3ef3fcbb 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-invalid-void-type.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-invalid-void-type.ts
@@ -102,9 +102,10 @@ export default util.createRule<[Options], MessageIds>({
// check whitelist
if (Array.isArray(allowInGenericTypeArguments)) {
const sourceCode = context.getSourceCode();
- const fullyQualifiedName = sourceCode
- .getText(node.parent.parent.typeName)
- .replace(/ /gu, '');
+ const fullyQualifiedName =
+ sourceCode
+ .getText(node.parent.parent.typeName)
+ .replace(/ /gu, '');
if (
!allowInGenericTypeArguments
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-loop-func.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-loop-func.ts
index 44d0178e..99153caa 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-loop-func.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-loop-func.ts
@@ -49,9 +49,10 @@ export default util.createRule({
}
const references = context.getScope().through;
- const unsafeRefs = references
- .filter(r => !isSafe(loopNode, r))
- .map(r => r.identifier.name);
+ const unsafeRefs =
+ references
+ .filter(r => !isSafe(loopNode, r))
+ .map(r => r.identifier.name);
if (unsafeRefs.length > 0) {
context.report({
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-redeclare.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-redeclare.ts
index 21456319..d6d58ade 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-redeclare.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-redeclare.ts
@@ -101,15 +101,16 @@ export default util.createRule({
}
}
- const identifiers = variable.identifiers
- .map(id => ({
- identifier: id,
- parent: id.parent!,
- }))
- // ignore function declarations because TS will treat them as an overload
- .filter(
- ({ parent }) => parent.type !== AST_NODE_TYPES.TSDeclareFunction,
- );
+ const identifiers =
+ variable.identifiers
+ .map(id => ({
+ identifier: id,
+ parent: id.parent!,
+ }))
+ // ignore function declarations because TS will treat them as an overload
+ .filter(
+ ({ parent }) => parent.type !== AST_NODE_TYPES.TSDeclareFunction,
+ );
if (options.ignoreDeclarationMerge && identifiers.length > 1) {
if (
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-includes.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-includes.ts
index d21b088d..cc5a0136 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-includes.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-includes.ts
@@ -146,9 +146,10 @@ export default createRule({
// Get the symbol of `indexOf` method.
const tsNode = services.esTreeNodeToTSNodeMap.get(node.property);
- const indexofMethodDeclarations = types
- .getSymbolAtLocation(tsNode)
- ?.getDeclarations();
+ const indexofMethodDeclarations =
+ types
+ .getSymbolAtLocation(tsNode)
+ ?.getDeclarations();
if (
indexofMethodDeclarations == null ||
indexofMethodDeclarations.length === 0
@@ -161,9 +162,10 @@ export default createRule({
for (const instanceofMethodDecl of indexofMethodDeclarations) {
const typeDecl = instanceofMethodDecl.parent;
const type = types.getTypeAtLocation(typeDecl);
- const includesMethodDecl = type
- .getProperty('includes')
- ?.getDeclarations();
+ const includesMethodDecl =
+ type
+ .getProperty('includes')
+ ?.getDeclarations();
if (
includesMethodDecl == null ||
!includesMethodDecl.some(includesMethodDecl =>
@@ -204,9 +206,10 @@ export default createRule({
const tsNode = services.esTreeNodeToTSNodeMap.get(argument);
const type = getConstrainedTypeAtLocation(types, tsNode);
- const includesMethodDecl = type
- .getProperty('includes')
- ?.getDeclarations();
+ const includesMethodDecl =
+ type
+ .getProperty('includes')
+ ?.getDeclarations();
if (includesMethodDecl == null) {
return;
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/promise-function-async.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/promise-function-async.ts
index 00888c8f..1bcb2f96 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/promise-function-async.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/promise-function-async.ts
@@ -99,9 +99,10 @@ export default util.createRule({
| TSESTree.FunctionExpression,
): void {
const originalNode = parserServices.esTreeNodeToTSNodeMap.get(node);
- const signatures = checker
- .getTypeAtLocation(originalNode)
- .getCallSignatures();
+ const signatures =
+ checker
+ .getTypeAtLocation(originalNode)
+ .getCallSignatures();
if (!signatures.length) {
return;
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/sort-type-union-intersection-members.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/sort-type-union-intersection-members.ts
index ff4a4d1a..e738a517 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/sort-type-union-intersection-members.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/sort-type-union-intersection-members.ts
@@ -210,11 +210,14 @@ export default util.createRule({
}
const fix: TSESLint.ReportFixFunction = fixer => {
- const sorted = expectedOrder
- .map(t => t.text)
- .join(
- node.type === AST_NODE_TYPES.TSIntersectionType ? ' & ' : ' | ',
- );
+ const sorted =
+ expectedOrder
+ .map(t => t.text)
+ .join(
+ node.type === AST_NODE_TYPES.TSIntersectionType
+ ? ' & '
+ : ' | ',
+ );
return fixer.replaceText(node, sorted);
};
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/switch-exhaustiveness-check.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/switch-exhaustiveness-check.ts
index 8881473d..99d911d8 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/switch-exhaustiveness-check.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/switch-exhaustiveness-check.ts
@@ -88,9 +88,10 @@ export default createRule({
);
}
- const fixString = missingCases
- .map(code => `${caseIndent}${code}`)
- .join('\n');
+ const fixString =
+ missingCases
+ .map(code => `${caseIndent}${code}`)
+ .join('\n');
if (lastCase) {
return fixer.insertTextAfter(lastCase, `\n${fixString}`);
@@ -141,13 +142,14 @@ export default createRule({
node: node.discriminant,
messageId: 'switchIsNotExhaustive',
data: {
- missingBranches: missingBranchTypes
- .map(missingType =>
- isTypeFlagSet(missingType, ts.TypeFlags.ESSymbolLike)
- ? `typeof ${missingType.getSymbol()?.escapedName}`
- : checker.typeToString(missingType),
- )
- .join(' | '),
+ missingBranches:
+ missingBranchTypes
+ .map(missingType =>
+ isTypeFlagSet(missingType, ts.TypeFlags.ESSymbolLike)
+ ? `typeof ${missingType.getSymbol()?.escapedName}`
+ : checker.typeToString(missingType),
+ )
+ .join(' | '),
},
suggest: [
{
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/unbound-method.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/unbound-method.ts
index 407d04c1..ffacd370 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/unbound-method.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/unbound-method.ts
@@ -81,23 +81,24 @@ const SUPPORTED_GLOBALS = [
'JSON',
'Intl',
] as const;
-const nativelyBoundMembers = SUPPORTED_GLOBALS.map(namespace => {
- if (!(namespace in global)) {
- // node.js might not have namespaces like Intl depending on compilation options
- // https://nodejs.org/api/intl.html#intl_options_for_building_node_js
- return [];
- }
- const object = global[namespace];
- return Object.getOwnPropertyNames(object)
- .filter(
- name =>
- !name.startsWith('_') &&
- typeof (object as Record)[name] === 'function',
- )
- .map(name => `${namespace}.${name}`);
-})
- .reduce((arr, names) => arr.concat(names), [])
- .filter(name => !nativelyNotBoundMembers.has(name));
+const nativelyBoundMembers =
+ SUPPORTED_GLOBALS.map(namespace => {
+ if (!(namespace in global)) {
+ // node.js might not have namespaces like Intl depending on compilation options
+ // https://nodejs.org/api/intl.html#intl_options_for_building_node_js
+ return [];
+ }
+ const object = global[namespace];
+ return Object.getOwnPropertyNames(object)
+ .filter(
+ name =>
+ !name.startsWith('_') &&
+ typeof (object as Record)[name] === 'function',
+ )
+ .map(name => `${namespace}.${name}`);
+ })
+ .reduce((arr, names) => arr.concat(names), [])
+ .filter(name => !nativelyNotBoundMembers.has(name));
const isNotImported = (
symbol: ts.Symbol,
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/util/propertyTypes.ts ALT/typescript-eslint/packages/eslint-plugin/src/util/propertyTypes.ts
index 5e2f1054..4b4a25b2 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/util/propertyTypes.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/util/propertyTypes.ts
@@ -13,9 +13,10 @@ export function getTypeOfPropertyOfName(
// Symbolic names may differ in their escaped name compared to their human-readable name
// https://github.com/typescript-eslint/typescript-eslint/issues/2143
- const escapedProperty = type
- .getProperties()
- .find(property => property.escapedName === escapedName);
+ const escapedProperty =
+ type
+ .getProperties()
+ .find(property => property.escapedName === escapedName);
return escapedProperty
? checker.getDeclaredTypeOfSymbol(escapedProperty)
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/configs.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/configs.test.ts
index f8fc068a..ed879e52 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/configs.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/configs.test.ts
@@ -2,17 +2,18 @@ import rules from '../src/rules';
import plugin from '../src/index';
const RULE_NAME_PREFIX = '@typescript-eslint/';
-const EXTENSION_RULES = Object.entries(rules)
- .filter(([, rule]) => rule.meta.docs?.extendsBaseRule)
- .map(
- ([ruleName, rule]) =>
- [
- `${RULE_NAME_PREFIX}${ruleName}`,
- typeof rule.meta.docs?.extendsBaseRule === 'string'
- ? rule.meta.docs.extendsBaseRule
- : ruleName,
- ] as const,
- );
+const EXTENSION_RULES =
+ Object.entries(rules)
+ .filter(([, rule]) => rule.meta.docs?.extendsBaseRule)
+ .map(
+ ([ruleName, rule]) =>
+ [
+ `${RULE_NAME_PREFIX}${ruleName}`,
+ typeof rule.meta.docs?.extendsBaseRule === 'string'
+ ? rule.meta.docs.extendsBaseRule
+ : ruleName,
+ ] as const,
+ );
function entriesToObject(value: [string, T][]): Record {
return value.reduce>((accum, [k, v]) => {
@@ -49,9 +50,13 @@ describe('all.json config', () => {
plugin.configs.all.rules;
const configRules = filterRules(unfilteredConfigRules);
// note: exclude deprecated rules, this config is allowed to change between minor versions
- const ruleConfigs = Object.entries(rules)
- .filter(([, rule]) => !rule.meta.deprecated)
- .map<[string, string]>(([name]) => [`${RULE_NAME_PREFIX}${name}`, 'error']);
+ const ruleConfigs =
+ Object.entries(rules)
+ .filter(([, rule]) => !rule.meta.deprecated)
+ .map<[string, string]>(([name]) => [
+ `${RULE_NAME_PREFIX}${name}`,
+ 'error',
+ ]);
it('contains all of the rules, excluding the deprecated ones', () => {
expect(entriesToObject(ruleConfigs)).toEqual(entriesToObject(configRules));
@@ -65,16 +70,17 @@ describe('recommended.json config', () => {
plugin.configs.recommended.rules;
const configRules = filterRules(unfilteredConfigRules);
// note: include deprecated rules so that the config doesn't change between major bumps
- const ruleConfigs = Object.entries(rules)
- .filter(
- ([, rule]) =>
- rule.meta.docs?.recommended !== false &&
- rule.meta.docs?.requiresTypeChecking !== true,
- )
- .map<[string, string]>(([name, rule]) => [
- `${RULE_NAME_PREFIX}${name}`,
- rule.meta.docs?.recommended ? rule.meta.docs.recommended : 'off',
- ]);
+ const ruleConfigs =
+ Object.entries(rules)
+ .filter(
+ ([, rule]) =>
+ rule.meta.docs?.recommended !== false &&
+ rule.meta.docs?.requiresTypeChecking !== true,
+ )
+ .map<[string, string]>(([name, rule]) => [
+ `${RULE_NAME_PREFIX}${name}`,
+ rule.meta.docs?.recommended ? rule.meta.docs.recommended : 'off',
+ ]);
it("contains all recommended rules that don't require typechecking, excluding the deprecated ones", () => {
expect(entriesToObject(ruleConfigs)).toEqual(entriesToObject(configRules));
@@ -88,16 +94,17 @@ describe('recommended-requiring-type-checking.json config', () => {
plugin.configs['recommended-requiring-type-checking'].rules;
const configRules = filterRules(unfilteredConfigRules);
// note: include deprecated rules so that the config doesn't change between major bumps
- const ruleConfigs = Object.entries(rules)
- .filter(
- ([, rule]) =>
- rule.meta.docs?.recommended !== false &&
- rule.meta.docs?.requiresTypeChecking === true,
- )
- .map<[string, string]>(([name, rule]) => [
- `${RULE_NAME_PREFIX}${name}`,
- rule.meta.docs?.recommended ? rule.meta.docs.recommended : 'off',
- ]);
+ const ruleConfigs =
+ Object.entries(rules)
+ .filter(
+ ([, rule]) =>
+ rule.meta.docs?.recommended !== false &&
+ rule.meta.docs?.requiresTypeChecking === true,
+ )
+ .map<[string, string]>(([name, rule]) => [
+ `${RULE_NAME_PREFIX}${name}`,
+ rule.meta.docs?.recommended ? rule.meta.docs.recommended : 'off',
+ ]);
it('contains all recommended rules that require type checking, excluding the deprecated ones', () => {
expect(entriesToObject(ruleConfigs)).toEqual(entriesToObject(configRules));
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/docs.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/docs.test.ts
index d67ff887..230e312b 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/docs.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/docs.test.ts
@@ -41,13 +41,15 @@ function parseReadme(): {
describe('Validating rule docs', () => {
it('All rules must have a corresponding rule doc', () => {
- const files = fs
- .readdirSync(docsRoot)
- // this rule doc was left behind on purpose for legacy reasons
- .filter(rule => rule !== 'camelcase.md');
- const ruleFiles = Object.keys(rules)
- .map(rule => `${rule}.md`)
- .sort();
+ const files =
+ fs
+ .readdirSync(docsRoot)
+ // this rule doc was left behind on purpose for legacy reasons
+ .filter(rule => rule !== 'camelcase.md');
+ const ruleFiles =
+ Object.keys(rules)
+ .map(rule => `${rule}.md`)
+ .sort();
expect(files.sort()).toEqual(ruleFiles);
});
@@ -115,20 +117,22 @@ describe('Validating README.md', () => {
);
it('All non-deprecated base rules should have a row in the base rules table, and the table should be ordered alphabetically', () => {
- const baseRuleNames = baseRules
- .map(([ruleName]) => ruleName)
- .sort()
- .map(createRuleLink);
+ const baseRuleNames =
+ baseRules
+ .map(([ruleName]) => ruleName)
+ .sort()
+ .map(createRuleLink);
expect(rulesTables.base.cells.map(row => row[0])).toStrictEqual(
baseRuleNames,
);
});
it('All non-deprecated extension rules should have a row in the base rules table, and the table should be ordered alphabetically', () => {
- const extensionRuleNames = extensionRules
- .map(([ruleName]) => ruleName)
- .sort()
- .map(createRuleLink);
+ const extensionRuleNames =
+ extensionRules
+ .map(([ruleName]) => ruleName)
+ .sort()
+ .map(createRuleLink);
expect(rulesTables.extension.cells.map(row => row[0])).toStrictEqual(
extensionRuleNames,
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/index.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/index.test.ts
index 3cac8304..6ca70b85 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/index.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/index.test.ts
@@ -8,10 +8,13 @@ describe('eslint-plugin ("./src/index.ts")', () => {
const ruleKeys = Object.keys(rules);
const eslintPluginRuleKeys = Object.keys(eslintPlugin.rules);
- const configs = fs
- .readdirSync('./src/configs')
- .filter(file => ['.json', '.ts'].includes(path.extname(file).toLowerCase()))
- .map(file => path.basename(file, path.extname(file)));
+ const configs =
+ fs
+ .readdirSync('./src/configs')
+ .filter(file =>
+ ['.json', '.ts'].includes(path.extname(file).toLowerCase()),
+ )
+ .map(file => path.basename(file, path.extname(file)));
const eslintPluginConfigKeys = Object.keys(eslintPlugin.configs);
it('exports all available rules', () => {
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/indent/indent.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/indent/indent.test.ts
index 8296bf19..22d15332 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/indent/indent.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/indent/indent.test.ts
@@ -640,30 +640,31 @@ type Foo = string | {
// test the fixer by removing all the spaces
code: code.replace(new RegExp(indent, 'g'), ''),
output: code,
- errors: code
- .split('\n')
- .map | null>((line, lineNum) => {
- const indentCount = line.split(indent).length - 1;
- const spaceCount = indentCount * indent.length;
+ errors:
+ code
+ .split('\n')
+ .map | null>((line, lineNum) => {
+ const indentCount = line.split(indent).length - 1;
+ const spaceCount = indentCount * indent.length;
- if (indentCount < 1) {
- return null;
- }
+ if (indentCount < 1) {
+ return null;
+ }
- return {
- messageId: 'wrongIndentation',
- data: {
- expected: `${spaceCount} spaces`,
- actual: 0,
- },
- line: lineNum + 1,
- column: 1,
- };
- })
- .filter(
- (error): error is TSESLint.TestCaseError =>
- error !== null,
- ),
+ return {
+ messageId: 'wrongIndentation',
+ data: {
+ expected: `${spaceCount} spaces`,
+ actual: 0,
+ },
+ line: lineNum + 1,
+ column: 1,
+ };
+ })
+ .filter(
+ (error): error is TSESLint.TestCaseError =>
+ error !== null,
+ ),
};
if (invalid.errors.length > 0) {
invalidCases.push(invalid);
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/indent/utils.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/indent/utils.ts
index badfbc1c..cd868ac7 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/indent/utils.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/indent/utils.ts
@@ -19,13 +19,15 @@ type MessageIds = InferMessageIdsTypeFromRule;
export function unIndent(strings: TemplateStringsArray): string {
const WHITESPACE_REGEX = / */u;
const templateValue = strings[0];
- const lines = templateValue
- .replace(/^\n/u, '')
- .replace(/\n\s*$/u, '')
- .split('\n');
- const lineIndents = lines
- .filter(line => line.trim())
- .map(line => WHITESPACE_REGEX.exec(line)![0].length);
+ const lines =
+ templateValue
+ .replace(/^\n/u, '')
+ .replace(/\n\s*$/u, '')
+ .split('\n');
+ const lineIndents =
+ lines
+ .filter(line => line.trim())
+ .map(line => WHITESPACE_REGEX.exec(line)![0].length);
const minLineIndent = Math.min(...lineIndents);
return lines.map(line => line.slice(minLineIndent)).join('\n');
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/index.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/index.test.ts
index c9160c05..1139ce3e 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/index.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/index.test.ts
@@ -4,9 +4,10 @@ import rules from '../../src/rules';
describe('./src/rules/index.ts', () => {
const ruleNames = Object.keys(rules).map(name => `${name}.ts`);
- const files = fs
- .readdirSync('./src/rules')
- .filter(file => file !== 'index.ts' && file.endsWith('.ts'));
+ const files =
+ fs
+ .readdirSync('./src/rules')
+ .filter(file => file !== 'index.ts' && file.endsWith('.ts'));
it('imports all available rule modules', () => {
expect(ruleNames).toEqual(expect.arrayContaining(files));
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/prefer-readonly-parameter-types.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/prefer-readonly-parameter-types.test.ts
index 9278420a..59ac6ffc 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/prefer-readonly-parameter-types.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/prefer-readonly-parameter-types.test.ts
@@ -269,10 +269,11 @@ ruleTester.run('prefer-readonly-parameter-types', rule, {
invalid: [
// arrays
...arrays.map>(baseType => {
- const type = baseType
- .replace(/readonly /g, '')
- .replace(/Readonly<(.+?)>/g, '$1')
- .replace(/ReadonlyArray/g, 'Array');
+ const type =
+ baseType
+ .replace(/readonly /g, '')
+ .replace(/Readonly<(.+?)>/g, '$1')
+ .replace(/ReadonlyArray/g, 'Array');
return {
code: `function foo(arg: ${type}) {}`,
errors: [
diff --git ORI/typescript-eslint/packages/eslint-plugin/tools/generate-configs.ts ALT/typescript-eslint/packages/eslint-plugin/tools/generate-configs.ts
index ed84f286..1f6698f3 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tools/generate-configs.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tools/generate-configs.ts
@@ -161,16 +161,17 @@ console.log();
console.log(
'------------------------------ recommended.ts (should not require program) ------------------------------',
);
-const recommendedRules = ruleEntries
- .filter(entry => !!entry[1].meta.docs?.recommended)
- .reduce(
- (config, entry) =>
- reducer(config, entry, {
- filterDeprecated: false,
- filterRequiresTypeChecking: 'exclude',
- }),
- {},
- );
+const recommendedRules =
+ ruleEntries
+ .filter(entry => !!entry[1].meta.docs?.recommended)
+ .reduce(
+ (config, entry) =>
+ reducer(config, entry, {
+ filterDeprecated: false,
+ filterRequiresTypeChecking: 'exclude',
+ }),
+ {},
+ );
const recommendedConfig: LinterConfig = {
extends: EXTENDS,
rules: recommendedRules,
@@ -184,16 +185,17 @@ console.log();
console.log(
'--------------------------------- recommended-requiring-type-checking.ts ---------------------------------',
);
-const recommendedRulesRequiringProgram = ruleEntries
- .filter(entry => !!entry[1].meta.docs?.recommended)
- .reduce(
- (config, entry) =>
- reducer(config, entry, {
- filterDeprecated: false,
- filterRequiresTypeChecking: 'include',
- }),
- {},
- );
+const recommendedRulesRequiringProgram =
+ ruleEntries
+ .filter(entry => !!entry[1].meta.docs?.recommended)
+ .reduce(
+ (config, entry) =>
+ reducer(config, entry, {
+ filterDeprecated: false,
+ filterRequiresTypeChecking: 'include',
+ }),
+ {},
+ );
const recommendedRequiringTypeCheckingConfig: LinterConfig = {
extends: EXTENDS,
rules: recommendedRulesRequiringProgram,
diff --git ORI/typescript-eslint/packages/eslint-plugin/tools/generate-rules-lists.ts ALT/typescript-eslint/packages/eslint-plugin/tools/generate-rules-lists.ts
index cffe4006..809c9248 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tools/generate-rules-lists.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tools/generate-rules-lists.ts
@@ -105,16 +105,17 @@ const updateRulesList = (
].join('\n');
};
-const rulesDetails: RuleDetails[] = Object.entries(rules)
- .filter(([, rule]) => rule.meta.deprecated !== true)
- .map(([name, rule]) => ({
- name,
- description: rule.meta.docs?.description ?? '',
- recommended: !!rule.meta.docs?.recommended ?? false,
- fixable: !!rule.meta.fixable,
- requiresTypeChecking: rule.meta.docs?.requiresTypeChecking ?? false,
- extendsBaseRule: !!rule.meta.docs?.extendsBaseRule ?? false,
- }));
+const rulesDetails: RuleDetails[] =
+ Object.entries(rules)
+ .filter(([, rule]) => rule.meta.deprecated !== true)
+ .map(([name, rule]) => ({
+ name,
+ description: rule.meta.docs?.description ?? '',
+ recommended: !!rule.meta.docs?.recommended ?? false,
+ fixable: !!rule.meta.fixable,
+ requiresTypeChecking: rule.meta.docs?.requiresTypeChecking ?? false,
+ extendsBaseRule: !!rule.meta.docs?.extendsBaseRule ?? false,
+ }));
const baseRules = rulesDetails.filter(rule => !rule.extendsBaseRule);
const extensionRules = rulesDetails.filter(rule => rule.extendsBaseRule);
diff --git ORI/typescript-eslint/packages/parser/src/parser.ts ALT/typescript-eslint/packages/parser/src/parser.ts
index f304a837..cd6fd0d1 100644
--- ORI/typescript-eslint/packages/parser/src/parser.ts
+++ ALT/typescript-eslint/packages/parser/src/parser.ts
@@ -154,9 +154,10 @@ function parseForESLint(
compilerOptions.jsxFragmentFactory != null
) {
// in case the user has specified something like "preact.Fragment"
- const fragFactory = compilerOptions.jsxFragmentFactory
- .split('.')[0]
- .trim();
+ const fragFactory =
+ compilerOptions.jsxFragmentFactory
+ .split('.')[0]
+ .trim();
analyzeOptions.jsxFragmentName = fragFactory;
log(
'Resolved jsxFragmentName from program: %s',
diff --git ORI/typescript-eslint/packages/scope-manager/tests/fixtures.test.ts ALT/typescript-eslint/packages/scope-manager/tests/fixtures.test.ts
index 5255ed02..5f5a2295 100644
--- ORI/typescript-eslint/packages/scope-manager/tests/fixtures.test.ts
+++ ALT/typescript-eslint/packages/scope-manager/tests/fixtures.test.ts
@@ -12,24 +12,25 @@ const ONLY = [].join(path.sep);
const FIXTURES_DIR = path.resolve(__dirname, 'fixtures');
-const fixtures = glob
- .sync(`${FIXTURES_DIR}/**/*.{js,ts,jsx,tsx}`, {
- ignore: ['fixtures.test.ts'],
- })
- .map(absolute => {
- const relative = path.relative(FIXTURES_DIR, absolute);
- const { name, dir, ext } = path.parse(relative);
- const segments = dir.split(path.sep);
- const snapshotPath = path.join(FIXTURES_DIR, dir);
- return {
- absolute,
- name,
- ext,
- segments,
- snapshotPath,
- snapshotFile: path.join(snapshotPath, `${name}${ext}.shot`),
- };
- });
+const fixtures =
+ glob
+ .sync(`${FIXTURES_DIR}/**/*.{js,ts,jsx,tsx}`, {
+ ignore: ['fixtures.test.ts'],
+ })
+ .map(absolute => {
+ const relative = path.relative(FIXTURES_DIR, absolute);
+ const { name, dir, ext } = path.parse(relative);
+ const segments = dir.split(path.sep);
+ const snapshotPath = path.join(FIXTURES_DIR, dir);
+ return {
+ absolute,
+ name,
+ ext,
+ segments,
+ snapshotPath,
+ snapshotFile: path.join(snapshotPath, `${name}${ext}.shot`),
+ };
+ });
const FOUR_SLASH = /^\/\/\/\/[ ]+@(\w+)[ ]*=[ ]*(.+)$/;
const QUOTED_STRING = /^["'](.+?)['"]$/;
diff --git ORI/typescript-eslint/packages/typescript-estree/src/convert.ts ALT/typescript-eslint/packages/typescript-estree/src/convert.ts
index f5a6a230..8c0ecfc7 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/convert.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/convert.ts
@@ -1953,12 +1953,13 @@ export class Converter {
case SyntaxKind.BigIntLiteral: {
const range = getRange(node, this.ast);
const rawValue = this.ast.text.slice(range[0], range[1]);
- const bigint = rawValue
- // remove suffix `n`
- .slice(0, -1)
- // `BigInt` doesn't accept numeric separator
- // and `bigint` property should not include numeric separator
- .replace(/_/g, '');
+ const bigint =
+ rawValue
+ // remove suffix `n`
+ .slice(0, -1)
+ // `BigInt` doesn't accept numeric separator
+ // and `bigint` property should not include numeric separator
+ .replace(/_/g, '');
const value = typeof BigInt !== 'undefined' ? BigInt(bigint) : null;
return this.createNode(node, {
type: AST_NODE_TYPES.Literal,
diff --git ORI/typescript-eslint/packages/typescript-estree/src/create-program/createWatchProgram.ts ALT/typescript-eslint/packages/typescript-estree/src/create-program/createWatchProgram.ts
index a3f007a0..599cfeed 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/create-program/createWatchProgram.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/create-program/createWatchProgram.ts
@@ -289,12 +289,14 @@ function createWatchProgram(
// ensure process doesn't emit programs
watchCompilerHost.afterProgramCreate = (program): void => {
// report error if there are any errors in the config file
- const configFileDiagnostics = program
- .getConfigFileParsingDiagnostics()
- .filter(
- diag =>
- diag.category === ts.DiagnosticCategory.Error && diag.code !== 18003,
- );
+ const configFileDiagnostics =
+ program
+ .getConfigFileParsingDiagnostics()
+ .filter(
+ diag =>
+ diag.category === ts.DiagnosticCategory.Error &&
+ diag.code !== 18003,
+ );
if (configFileDiagnostics.length > 0) {
diagnosticReporter(configFileDiagnostics[0]);
}
diff --git ORI/typescript-eslint/packages/typescript-estree/src/parser.ts ALT/typescript-eslint/packages/typescript-estree/src/parser.ts
index dd765eb5..4e118007 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/parser.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/parser.ts
@@ -264,17 +264,16 @@ function applyParserOptionsToExtra(options: TSESTreeOptions): void {
// NOTE - ensureAbsolutePath relies upon having the correct tsconfigRootDir in extra
extra.filePath = ensureAbsolutePath(extra.filePath, extra);
- const projectFolderIgnoreList = (
- options.projectFolderIgnoreList ?? ['**/node_modules/**']
- )
- .reduce((acc, folder) => {
- if (typeof folder === 'string') {
- acc.push(folder);
- }
- return acc;
- }, [])
- // prefix with a ! for not match glob
- .map(folder => (folder.startsWith('!') ? folder : `!${folder}`));
+ const projectFolderIgnoreList =
+ (options.projectFolderIgnoreList ?? ['**/node_modules/**'])
+ .reduce((acc, folder) => {
+ if (typeof folder === 'string') {
+ acc.push(folder);
+ }
+ return acc;
+ }, [])
+ // prefix with a ! for not match glob
+ .map(folder => (folder.startsWith('!') ? folder : `!${folder}`));
// NOTE - prepareAndTransformProjects relies upon having the correct tsconfigRootDir in extra
extra.projects = prepareAndTransformProjects(
options.project,
diff --git ORI/typescript-eslint/tools/generate-contributors.ts ALT/typescript-eslint/tools/generate-contributors.ts
index 6bb908b3..fb6dc4df 100644
--- ORI/typescript-eslint/tools/generate-contributors.ts
+++ ALT/typescript-eslint/tools/generate-contributors.ts
@@ -83,19 +83,20 @@ async function main(): Promise {
}),
);
- const contributors = users
- // remove ignored users
- .filter(u => !IGNORED_USERS.has(u.login))
- // fetch the in-depth information for each user
- .map(usr => {
- return {
- login: usr.login,
- name: usr.name || usr.login,
- avatar_url: usr.avatar_url,
- profile: usr.html_url,
- contributions: [],
- };
- });
+ const contributors =
+ users
+ // remove ignored users
+ .filter(u => !IGNORED_USERS.has(u.login))
+ // fetch the in-depth information for each user
+ .map(usr => {
+ return {
+ login: usr.login,
+ name: usr.name || usr.login,
+ avatar_url: usr.avatar_url,
+ profile: usr.html_url,
+ contributions: [],
+ };
+ });
// build + write the .all-contributorsrc
const allContributorsConfig = {
diff --git ORI/vega-lite/site/static/index.ts ALT/vega-lite/site/static/index.ts
index 951282330..92458d643 100644
--- ORI/vega-lite/site/static/index.ts
+++ ALT/vega-lite/site/static/index.ts
@@ -60,12 +60,13 @@ function renderExample($target: Selection, specText: string,
const textClean = specText.replace(/(\s)+"(\$schema|description)": ".*?",/g, '');
if (!figureOnly) {
- const code = $target
- .append('pre')
- .attr('class', 'example-code')
- .append('code')
- .attr('class', 'json')
- .text(textClean);
+ const code =
+ $target
+ .append('pre')
+ .attr('class', 'example-code')
+ .append('code')
+ .attr('class', 'json')
+ .text(textClean);
hljs.highlightBlock(code.node() as any);
}
@@ -142,11 +143,12 @@ window['buildSpecOpts'] = (id: string, baseName: string) => {
const prefixSel = select(`select[name=${id}]`);
const inputsSel = selectAll(`input[name=${id}]:checked`);
const prefix = prefixSel.empty() ? id : prefixSel.property('value');
- const values = inputsSel
- .nodes()
- .map((n: any) => n.value)
- .sort()
- .join('_');
+ const values =
+ inputsSel
+ .nodes()
+ .map((n: any) => n.value)
+ .sort()
+ .join('_');
const newName = baseName + prefix + (values ? `_${values}` : '');
if (oldName !== newName) {
window['changeSpec'](id, newName);
diff --git ORI/vega-lite/site/static/streaming.ts ALT/vega-lite/site/static/streaming.ts
index ff4806aa2..af282d915 100644
--- ORI/vega-lite/site/static/streaming.ts
+++ ALT/vega-lite/site/static/streaming.ts
@@ -42,10 +42,11 @@ export function runStreamingExample(eleId: string) {
let minimumX = -100;
window.setInterval(() => {
minimumX++;
- const changeSet = view
- .changeset()
- .insert(valueGenerator())
- .remove((t: {x: number}) => t.x < minimumX);
+ const changeSet =
+ view
+ .changeset()
+ .insert(valueGenerator())
+ .remove((t: {x: number}) => t.x < minimumX);
view.change('table', changeSet).run();
}, 1000);
}
diff --git ORI/vega-lite/src/compile/legend/assemble.ts ALT/vega-lite/src/compile/legend/assemble.ts
index 3732dac59..d675e3ae0 100644
--- ORI/vega-lite/src/compile/legend/assemble.ts
+++ ALT/vega-lite/src/compile/legend/assemble.ts
@@ -40,10 +40,11 @@ export function assembleLegends(model: Model): VgLegend[] {
}
}
- const legends = vals(legendByDomain)
- .flat()
- .map(l => assembleLegend(l, model.config))
- .filter(l => l !== undefined);
+ const legends =
+ vals(legendByDomain)
+ .flat()
+ .map(l => assembleLegend(l, model.config))
+ .filter(l => l !== undefined);
return legends;
}
diff --git ORI/vega-lite/src/compile/mark/encode/aria.ts ALT/vega-lite/src/compile/mark/encode/aria.ts
index dac62f19e..c210e2563 100644
--- ORI/vega-lite/src/compile/mark/encode/aria.ts
+++ ALT/vega-lite/src/compile/mark/encode/aria.ts
@@ -69,9 +69,10 @@ export function description(model: UnitModel) {
return {
description: {
- signal: entries(data)
- .map(([key, value], index) => `"${index > 0 ? '; ' : ''}${key}: " + (${value})`)
- .join(' + ')
+ signal:
+ entries(data)
+ .map(([key, value], index) => `"${index > 0 ? '; ' : ''}${key}: " + (${value})`)
+ .join(' + ')
}
};
}
diff --git ORI/vega-lite/src/compile/selection/interval.ts ALT/vega-lite/src/compile/selection/interval.ts
index 7dd7b69b1..f104ea560 100644
--- ORI/vega-lite/src/compile/selection/interval.ts
+++ ALT/vega-lite/src/compile/selection/interval.ts
@@ -139,9 +139,10 @@ const interval: SelectionCompiler<'interval'> = {
const vgStroke = keys(stroke).reduce((def, k) => {
def[k] = [
{
- test: [x !== undefined && `${xvname}[0] !== ${xvname}[1]`, y !== undefined && `${yvname}[0] !== ${yvname}[1]`]
- .filter(t => t)
- .join(' && '),
+ test:
+ [x !== undefined && `${xvname}[0] !== ${xvname}[1]`, y !== undefined && `${yvname}[0] !== ${yvname}[1]`]
+ .filter(t => t)
+ .join(' && '),
value: stroke[k]
},
{value: null}
diff --git ORI/vega-lite/src/compile/selection/legends.ts ALT/vega-lite/src/compile/selection/legends.ts
index d24822243..fe4a25f61 100644
--- ORI/vega-lite/src/compile/selection/legends.ts
+++ ALT/vega-lite/src/compile/selection/legends.ts
@@ -62,10 +62,11 @@ const legendBindings: SelectionCompiler<'point'> = {
const hasSignal = signals.filter(s => s.name === sgName);
if (hasSignal.length === 0) {
- const events = stream.merge
- .map(markName(`${prefix}_symbols`))
- .concat(stream.merge.map(markName(`${prefix}_labels`)))
- .concat(stream.merge.map(markName(`${prefix}_entries`)));
+ const events =
+ stream.merge
+ .map(markName(`${prefix}_symbols`))
+ .concat(stream.merge.map(markName(`${prefix}_labels`)))
+ .concat(stream.merge.map(markName(`${prefix}_entries`)));
signals.unshift({
name: sgName,
diff --git ORI/vega-lite/src/compile/selection/point.ts ALT/vega-lite/src/compile/selection/point.ts
index 384ac50fa..8c25479d8 100644
--- ORI/vega-lite/src/compile/selection/point.ts
+++ ALT/vega-lite/src/compile/selection/point.ts
@@ -11,16 +11,17 @@ const point: SelectionCompiler<'point'> = {
const fieldsSg = name + TUPLE_FIELDS;
const project = selCmpt.project;
const datum = '(item().isVoronoi ? datum.datum : datum)';
- const values = project.items
- .map(p => {
- const fieldDef = model.fieldDef(p.channel);
- // Binned fields should capture extents, for a range test against the raw field.
- return fieldDef && fieldDef.bin
- ? `[${datum}[${stringValue(model.vgField(p.channel, {}))}], ` +
- `${datum}[${stringValue(model.vgField(p.channel, {binSuffix: 'end'}))}]]`
- : `${datum}[${stringValue(p.field)}]`;
- })
- .join(', ');
+ const values =
+ project.items
+ .map(p => {
+ const fieldDef = model.fieldDef(p.channel);
+ // Binned fields should capture extents, for a range test against the raw field.
+ return fieldDef && fieldDef.bin
+ ? `[${datum}[${stringValue(model.vgField(p.channel, {}))}], ` +
+ `${datum}[${stringValue(model.vgField(p.channel, {binSuffix: 'end'}))}]]`
+ : `${datum}[${stringValue(p.field)}]`;
+ })
+ .join(', ');
// Only add a discrete selection to the store if a datum is present _and_
// the interaction isn't occurring on a group mark. This guards against
diff --git ORI/vega-lite/src/normalize/repeater.ts ALT/vega-lite/src/normalize/repeater.ts
index 4034174bb..c832e2b73 100644
--- ORI/vega-lite/src/normalize/repeater.ts
+++ ALT/vega-lite/src/normalize/repeater.ts
@@ -145,9 +145,10 @@ function replaceRepeaterInMapping(
if (isArray(channelDef)) {
// array cannot have condition
- out[channel] = (channelDef as ChannelDef[]) // somehow we need to cast it here
- .map(cd => replaceRepeaterInChannelDef(cd, repeater))
- .filter(cd => cd);
+ out[channel] =
+ (channelDef as ChannelDef[]) // somehow we need to cast it here
+ .map(cd => replaceRepeaterInChannelDef(cd, repeater))
+ .filter(cd => cd);
} else {
const cd = replaceRepeaterInChannelDef(channelDef, repeater);
if (cd !== undefined) {
````
run #10297