for 12087 #130
Comments
|
Run #12087 |
|
prettier/prettier#12087 VS prettier/prettier@main :: babel/babel@36a5ac4 Diff (302 lines)diff --git ORI/babel/packages/babel-core/test/config-loading.js ALT/babel/packages/babel-core/test/config-loading.js
index 46e1758b..c363ea60 100644
--- ORI/babel/packages/babel-core/test/config-loading.js
+++ ALT/babel/packages/babel-core/test/config-loading.js
@@ -36,12 +36,14 @@ describe("@babel/core config loading", () => {
return {
cwd: path.dirname(FILEPATH),
filename: FILEPATH,
- presets: skipProgrammatic
- ? null
- : [[require("./fixtures/config-loading/preset3.js"), {}]],
- plugins: skipProgrammatic
- ? null
- : [[require("./fixtures/config-loading/plugin6.js"), {}]],
+ presets:
+ skipProgrammatic
+ ? null
+ : [[require("./fixtures/config-loading/preset3.js"), {}]],
+ plugins:
+ skipProgrammatic
+ ? null
+ : [[require("./fixtures/config-loading/plugin6.js"), {}]],
};
}
diff --git ORI/babel/packages/babel-parser/src/parser/expression.js ALT/babel/packages/babel-parser/src/parser/expression.js
index e221d4d9..a8f68f18 100644
--- ORI/babel/packages/babel-parser/src/parser/expression.js
+++ ALT/babel/packages/babel-parser/src/parser/expression.js
@@ -621,9 +621,10 @@ export default class ExpressionParser extends LValParser {
if (isAwait) {
const { type } = this.state;
- const startsExpr = this.hasPlugin("v8intrinsic")
- ? tokenCanStartExpression(type)
- : tokenCanStartExpression(type) && !this.match(tt.modulo);
+ const startsExpr =
+ this.hasPlugin("v8intrinsic")
+ ? tokenCanStartExpression(type)
+ : tokenCanStartExpression(type) && !this.match(tt.modulo);
if (startsExpr && !this.isAmbiguousAwait()) {
this.raiseOverwrite(startPos, Errors.AwaitNotInAsyncContext);
return this.parseAwait(startPos, startLoc);
@@ -2120,9 +2121,10 @@ export default class ExpressionParser extends LValParser {
prop.shorthand = false;
if (this.eat(tt.colon)) {
- prop.value = isPattern
- ? this.parseMaybeDefault(this.state.start, this.state.startLoc)
- : this.parseMaybeAssignAllowIn(refExpressionErrors);
+ prop.value =
+ isPattern
+ ? this.parseMaybeDefault(this.state.start, this.state.startLoc)
+ : this.parseMaybeAssignAllowIn(refExpressionErrors);
return this.finishNode(prop, "ObjectProperty");
}
@@ -2631,11 +2633,12 @@ export default class ExpressionParser extends LValParser {
return;
}
- const reservedTest = !this.state.strict
- ? isReservedWord
- : isBinding
- ? isStrictBindReservedWord
- : isStrictReservedWord;
+ const reservedTest =
+ !this.state.strict
+ ? isReservedWord
+ : isBinding
+ ? isStrictBindReservedWord
+ : isStrictReservedWord;
if (reservedTest(word, this.inModule)) {
this.raise(startLoc, Errors.UnexpectedReservedWord, word);
diff --git ORI/babel/packages/babel-parser/src/parser/statement.js ALT/babel/packages/babel-parser/src/parser/statement.js
index 4addc193..8b2d0a22 100644
--- ORI/babel/packages/babel-parser/src/parser/statement.js
+++ ALT/babel/packages/babel-parser/src/parser/statement.js
@@ -867,11 +867,12 @@ export default class StatementParser extends ExpressionParser {
}
}
- const kind = tokenIsLoop(this.state.type)
- ? "loop"
- : this.match(tt._switch)
- ? "switch"
- : null;
+ const kind =
+ tokenIsLoop(this.state.type)
+ ? "loop"
+ : this.match(tt._switch)
+ ? "switch"
+ : null;
for (let i = this.state.labels.length - 1; i >= 0; i--) {
const label = this.state.labels[i];
if (label.statementStart === node.start) {
@@ -1081,9 +1082,8 @@ export default class StatementParser extends ExpressionParser {
}
node.left = init;
- node.right = isForIn
- ? this.parseExpression()
- : this.parseMaybeAssignAllowIn();
+ node.right =
+ isForIn ? this.parseExpression() : this.parseMaybeAssignAllowIn();
this.expect(tt.parenR);
// Parse the loop body.
@@ -1116,9 +1116,10 @@ export default class StatementParser extends ExpressionParser {
const decl = this.startNode();
this.parseVarId(decl, kind);
if (this.eat(tt.eq)) {
- decl.init = isFor
- ? this.parseMaybeAssignDisallowIn()
- : this.parseMaybeAssignAllowIn();
+ decl.init =
+ isFor
+ ? this.parseMaybeAssignDisallowIn()
+ : this.parseMaybeAssignAllowIn();
} else {
if (
kind === "const" &&
diff --git ORI/babel/packages/babel-parser/src/plugins/flow/index.js ALT/babel/packages/babel-parser/src/plugins/flow/index.js
index 660fcb59..78916d67 100644
--- ORI/babel/packages/babel-parser/src/plugins/flow/index.js
+++ ALT/babel/packages/babel-parser/src/plugins/flow/index.js
@@ -1735,9 +1735,10 @@ export default (superClass: Class<Parser>): Class<Parser> =>
flowParseTypeAnnotatableIdentifier(
allowPrimitiveOverride?: boolean,
): N.Identifier {
- const ident = allowPrimitiveOverride
- ? this.parseIdentifier()
- : this.flowParseRestrictedIdentifier();
+ const ident =
+ allowPrimitiveOverride
+ ? this.parseIdentifier()
+ : this.flowParseRestrictedIdentifier();
if (this.match(tt.colon)) {
ident.typeAnnotation = this.flowParseTypeAnnotation();
this.resetEndLocation(ident);
@@ -1805,9 +1806,10 @@ export default (superClass: Class<Parser>): Class<Parser> =>
node.predicate,
] = this.flowParseTypeAndPredicateInitialiser();
- node.returnType = typeNode.typeAnnotation
- ? this.finishNode(typeNode, "TypeAnnotation")
- : null;
+ node.returnType =
+ typeNode.typeAnnotation
+ ? this.finishNode(typeNode, "TypeAnnotation")
+ : null;
}
super.parseFunctionBodyAndFinish(node, type, isMethod);
@@ -2579,12 +2581,13 @@ export default (superClass: Class<Parser>): Class<Parser> =>
type: string,
contextDescription: string,
): void {
- specifier.local = hasTypeImportKind(node)
- ? this.flowParseRestrictedIdentifier(
- /* liberal */ true,
- /* declaration */ true,
- )
- : this.parseIdentifier();
+ specifier.local =
+ hasTypeImportKind(node)
+ ? this.flowParseRestrictedIdentifier(
+ /* liberal */ true,
+ /* declaration */ true,
+ )
+ : this.parseIdentifier();
this.checkLVal(specifier.local, contextDescription, BIND_LEXICAL);
node.specifiers.push(this.finishNode(specifier, type));
@@ -2941,9 +2944,10 @@ export default (superClass: Class<Parser>): Class<Parser> =>
if (result.error) this.state = result.failState;
// assign after it is clear it is an arrow
- node.returnType = result.node.typeAnnotation
- ? this.finishNode(result.node, "TypeAnnotation")
- : null;
+ node.returnType =
+ result.node.typeAnnotation
+ ? this.finishNode(result.node, "TypeAnnotation")
+ : null;
}
return super.parseArrow(node);
@@ -3370,9 +3374,8 @@ export default (superClass: Class<Parser>): Class<Parser> =>
flowEnumMemberRaw(): { id: N.Node, init: EnumMemberInit } {
const pos = this.state.start;
const id = this.parseIdentifier(true);
- const init = this.eat(tt.eq)
- ? this.flowEnumMemberInit()
- : { type: "none", pos };
+ const init =
+ this.eat(tt.eq) ? this.flowEnumMemberInit() : { type: "none", pos };
return { id, init };
}
diff --git ORI/babel/packages/babel-parser/src/plugins/typescript/index.js ALT/babel/packages/babel-parser/src/plugins/typescript/index.js
index c749d838..b5a9c077 100644
--- ORI/babel/packages/babel-parser/src/plugins/typescript/index.js
+++ ALT/babel/packages/babel-parser/src/plugins/typescript/index.js
@@ -1573,9 +1573,10 @@ export default (superClass: Class<Parser>): Class<Parser> =>
tsParseEnumMember(): N.TsEnumMember {
const node: N.TsEnumMember = this.startNode();
// Computed property names are grammar errors in an enum, so accept just string literal or identifier.
- node.id = this.match(tt.string)
- ? this.parseExprAtom()
- : this.parseIdentifier(/* liberal */ true);
+ node.id =
+ this.match(tt.string)
+ ? this.parseExprAtom()
+ : this.parseIdentifier(/* liberal */ true);
if (this.eat(tt.eq)) {
node.initializer = this.parseMaybeAssignAllowIn();
}
@@ -3337,9 +3338,8 @@ export default (superClass: Class<Parser>): Class<Parser> =>
parseMethod(...args: any[]) {
const method = super.parseMethod(...args);
if (method.abstract) {
- const hasBody = this.hasPlugin("estree")
- ? !!method.value.body
- : !!method.body;
+ const hasBody =
+ this.hasPlugin("estree") ? !!method.value.body : !!method.body;
if (hasBody) {
const { key } = method;
this.raise(
@@ -3491,9 +3491,8 @@ export default (superClass: Class<Parser>): Class<Parser> =>
node[kindKey] = hasTypeSpecifier ? "type" : "value";
if (canParseAsKeyword && this.eatContextual(tt._as)) {
- node[rightOfAsKey] = isImport
- ? this.parseIdentifier()
- : this.parseModuleExportName();
+ node[rightOfAsKey] =
+ isImport ? this.parseIdentifier() : this.parseModuleExportName();
}
if (!node[rightOfAsKey]) {
node[rightOfAsKey] = cloneIdentifier(node[leftOfAsKey]);
diff --git ORI/babel/packages/babel-plugin-transform-runtime/scripts/build-dist.js ALT/babel/packages/babel-plugin-transform-runtime/scripts/build-dist.js
index 4e13c713..1e931e62 100644
--- ORI/babel/packages/babel-plugin-transform-runtime/scripts/build-dist.js
+++ ALT/babel/packages/babel-plugin-transform-runtime/scripts/build-dist.js
@@ -117,9 +117,10 @@ function writeHelperFile(
{ esm, corejs }
) {
const fileName = `${helperName}.js`;
- const filePath = esm
- ? path.join("helpers", "esm", fileName)
- : path.join("helpers", fileName);
+ const filePath =
+ esm
+ ? path.join("helpers", "esm", fileName)
+ : path.join("helpers", fileName);
const fullPath = path.join(pkgDirname, filePath);
outputFile(
diff --git ORI/babel/packages/babel-types/scripts/generators/builders.js ALT/babel/packages/babel-types/scripts/generators/builders.js
index 13e772eb..18d387bc 100644
--- ORI/babel/packages/babel-types/scripts/generators/builders.js
+++ ALT/babel/packages/babel-types/scripts/generators/builders.js
@@ -93,9 +93,10 @@ import type * as t from "../..";
Object.keys(definitions.BUILDER_KEYS).forEach(type => {
const defArgs = generateBuilderArgs(type);
const formatedBuilderName = formatBuilderName(type);
- const formatedBuilderNameLocal = reservedNames.has(formatedBuilderName)
- ? `_${formatedBuilderName}`
- : formatedBuilderName;
+ const formatedBuilderNameLocal =
+ reservedNames.has(formatedBuilderName)
+ ? `_${formatedBuilderName}`
+ : formatedBuilderName;
output += `${
formatedBuilderNameLocal === formatedBuilderName ? "export " : ""
}function ${formatedBuilderNameLocal}(${defArgs.join(
diff --git ORI/babel/packages/babel-types/test/builders/typescript/tsTypeParameter.js ALT/babel/packages/babel-types/test/builders/typescript/tsTypeParameter.js
index e11753de..653d06a9 100644
--- ORI/babel/packages/babel-types/test/builders/typescript/tsTypeParameter.js
+++ ALT/babel/packages/babel-types/test/builders/typescript/tsTypeParameter.js
@@ -15,12 +15,13 @@ describe("builders", function () {
// TODO(babel-8): move this check to the snapshot
expect(tsTypeParameter).toEqual(
expect.objectContaining({
- name: !process.env.BABEL_8_BREAKING
- ? "foo"
- : expect.objectContaining({
- name: "foo",
- type: "Identifier",
- }),
+ name:
+ !process.env.BABEL_8_BREAKING
+ ? "foo"
+ : expect.objectContaining({
+ name: "foo",
+ type: "Identifier",
+ }),
}),
);
}); |
|
prettier/prettier#12087 VS prettier/prettier@main :: vuejs/eslint-plugin-vue@10dd1a9 Diff (1197 lines)diff --git ORI/eslint-plugin-vue/lib/rules/attribute-hyphenation.js ALT/eslint-plugin-vue/lib/rules/attribute-hyphenation.js
index ec5a3a9..8336ea9 100644
--- ORI/eslint-plugin-vue/lib/rules/attribute-hyphenation.js
+++ ALT/eslint-plugin-vue/lib/rules/attribute-hyphenation.js
@@ -74,9 +74,10 @@ module.exports = {
context.report({
node: node.key,
loc: node.loc,
- message: useHyphenated
- ? "Attribute '{{text}}' must be hyphenated."
- : "Attribute '{{text}}' can't be hyphenated.",
+ message:
+ useHyphenated
+ ? "Attribute '{{text}}' must be hyphenated."
+ : "Attribute '{{text}}' can't be hyphenated.",
data: {
text
},
@@ -108,13 +109,14 @@ module.exports = {
VAttribute(node) {
if (!utils.isCustomComponent(node.parent.parent)) return
- const name = !node.directive
- ? node.key.rawName
- : node.key.name.name === 'bind'
- ? node.key.argument &&
- node.key.argument.type === 'VIdentifier' &&
- node.key.argument.rawName
- : /* otherwise */ false
+ const name =
+ !node.directive
+ ? node.key.rawName
+ : node.key.name.name === 'bind'
+ ? node.key.argument &&
+ node.key.argument.type === 'VIdentifier' &&
+ node.key.argument.rawName
+ : /* otherwise */ false
if (!name || isIgnoredAttribute(name)) return
reportIssue(node, name)
diff --git ORI/eslint-plugin-vue/lib/rules/comment-directive.js ALT/eslint-plugin-vue/lib/rules/comment-directive.js
index 942860f..c0e7090 100644
--- ORI/eslint-plugin-vue/lib/rules/comment-directive.js
+++ ALT/eslint-plugin-vue/lib/rules/comment-directive.js
@@ -129,9 +129,10 @@ function processBlock(context, comment, reportUnusedDisableDirectives) {
if (parsed != null) {
if (parsed.type === 'eslint-disable') {
if (parsed.rules.length) {
- const rules = reportUnusedDisableDirectives
- ? reportUnusedRules(context, comment, parsed.type, parsed.rules)
- : parsed.rules
+ const rules =
+ reportUnusedDisableDirectives
+ ? reportUnusedRules(context, comment, parsed.type, parsed.rules)
+ : parsed.rules
for (const rule of rules) {
disable(
context,
@@ -142,9 +143,10 @@ function processBlock(context, comment, reportUnusedDisableDirectives) {
)
}
} else {
- const key = reportUnusedDisableDirectives
- ? reportUnused(context, comment, parsed.type)
- : ''
+ const key =
+ reportUnusedDisableDirectives
+ ? reportUnused(context, comment, parsed.type)
+ : ''
disable(context, comment.loc.start, 'block', null, key)
}
} else {
@@ -174,17 +176,19 @@ function processLine(context, comment, reportUnusedDisableDirectives) {
comment.loc.start.line + (parsed.type === 'eslint-disable-line' ? 0 : 1)
const column = -1
if (parsed.rules.length) {
- const rules = reportUnusedDisableDirectives
- ? reportUnusedRules(context, comment, parsed.type, parsed.rules)
- : parsed.rules
+ const rules =
+ reportUnusedDisableDirectives
+ ? reportUnusedRules(context, comment, parsed.type, parsed.rules)
+ : parsed.rules
for (const rule of rules) {
disable(context, { line, column }, 'line', rule.ruleId, rule.key || '')
enable(context, { line: line + 1, column }, 'line', rule.ruleId)
}
} else {
- const key = reportUnusedDisableDirectives
- ? reportUnused(context, comment, parsed.type)
- : ''
+ const key =
+ reportUnusedDisableDirectives
+ ? reportUnused(context, comment, parsed.type)
+ : ''
disable(context, { line, column }, 'line', null, key)
enable(context, { line: line + 1, column }, 'line', null)
}
diff --git ORI/eslint-plugin-vue/lib/rules/component-api-style.js ALT/eslint-plugin-vue/lib/rules/component-api-style.js
index 9ebf01d..5f5e275 100644
--- ORI/eslint-plugin-vue/lib/rules/component-api-style.js
+++ ALT/eslint-plugin-vue/lib/rules/component-api-style.js
@@ -240,9 +240,10 @@ module.exports = {
},
utils.defineVueVisitor(context, {
onVueObjectEnter(node) {
- const allows = utils.isSFCObject(context, node)
- ? options.allowsSFC
- : options.allowsOther
+ const allows =
+ utils.isSFCObject(context, node)
+ ? options.allowsSFC
+ : options.allowsOther
if (
(allows.composition || allows.compositionVue2) &&
allows.options
@@ -281,9 +282,10 @@ module.exports = {
if (disallowApi) {
context.report({
node: prop.key,
- messageId: isPreferScriptSetup(allows)
- ? 'disallowComponentOptionPreferScriptSetup'
- : 'disallowComponentOption',
+ messageId:
+ isPreferScriptSetup(allows)
+ ? 'disallowComponentOptionPreferScriptSetup'
+ : 'disallowComponentOption',
data: {
disallowedApi: disallowApi.apiName,
optionPhrase: buildOptionPhrase(name),
diff --git ORI/eslint-plugin-vue/lib/rules/component-options-name-casing.js ALT/eslint-plugin-vue/lib/rules/component-options-name-casing.js
index ad70c15..a427682 100644
--- ORI/eslint-plugin-vue/lib/rules/component-options-name-casing.js
+++ ALT/eslint-plugin-vue/lib/rules/component-options-name-casing.js
@@ -81,33 +81,38 @@ module.exports = {
component: name,
caseType
},
- fix: canAutoFix
- ? (fixer) => {
- const converted = convert(name)
- return property.shorthand
- ? fixer.replaceText(property, `${converted}: ${name}`)
- : fixer.replaceText(property.key, converted)
- }
- : undefined,
- suggest: canAutoFix
- ? undefined
- : [
- {
- messageId: 'possibleRenaming',
- data: { caseType },
- fix: (fixer) => {
- const converted = convert(name)
- if (caseType === 'kebab-case') {
+ fix:
+ canAutoFix
+ ? (fixer) => {
+ const converted = convert(name)
+ return property.shorthand
+ ? fixer.replaceText(property, `${converted}: ${name}`)
+ : fixer.replaceText(property.key, converted)
+ }
+ : undefined,
+ suggest:
+ canAutoFix
+ ? undefined
+ : [
+ {
+ messageId: 'possibleRenaming',
+ data: { caseType },
+ fix: (fixer) => {
+ const converted = convert(name)
+ if (caseType === 'kebab-case') {
+ return property.shorthand
+ ? fixer.replaceText(
+ property,
+ `'${converted}': ${name}`
+ )
+ : fixer.replaceText(property.key, `'${converted}'`)
+ }
return property.shorthand
- ? fixer.replaceText(property, `'${converted}': ${name}`)
- : fixer.replaceText(property.key, `'${converted}'`)
+ ? fixer.replaceText(property, `${converted}: ${name}`)
+ : fixer.replaceText(property.key, converted)
}
- return property.shorthand
- ? fixer.replaceText(property, `${converted}: ${name}`)
- : fixer.replaceText(property.key, converted)
}
- }
- ]
+ ]
})
})
})
diff --git ORI/eslint-plugin-vue/lib/rules/html-comment-content-newline.js ALT/eslint-plugin-vue/lib/rules/html-comment-content-newline.js
index 3985f7d..c651f9f 100644
--- ORI/eslint-plugin-vue/lib/rules/html-comment-content-newline.js
+++ ALT/eslint-plugin-vue/lib/rules/html-comment-content-newline.js
@@ -102,12 +102,10 @@ module.exports = {
return
}
- const startLine = openDecoration
- ? openDecoration.loc.end.line
- : value.loc.start.line
- const endLine = closeDecoration
- ? closeDecoration.loc.start.line
- : value.loc.end.line
+ const startLine =
+ openDecoration ? openDecoration.loc.end.line : value.loc.start.line
+ const endLine =
+ closeDecoration ? closeDecoration.loc.start.line : value.loc.end.line
const newlineType =
startLine === endLine ? option.singleline : option.multiline
if (newlineType === 'ignore') {
@@ -141,12 +139,14 @@ module.exports = {
start: beforeToken.loc.end,
end: value.loc.start
},
- messageId: openDecoration
- ? 'expectedAfterExceptionBlock'
- : 'expectedAfterHTMLCommentOpen',
- fix: openDecoration
- ? undefined
- : (fixer) => fixer.insertTextAfter(beforeToken, '\n')
+ messageId:
+ openDecoration
+ ? 'expectedAfterExceptionBlock'
+ : 'expectedAfterHTMLCommentOpen',
+ fix:
+ openDecoration
+ ? undefined
+ : (fixer) => fixer.insertTextAfter(beforeToken, '\n')
})
} else {
if (beforeToken.loc.end.line === value.loc.start.line) {
@@ -188,12 +188,14 @@ module.exports = {
start: value.loc.end,
end: afterToken.loc.start
},
- messageId: closeDecoration
- ? 'expectedBeforeExceptionBlock'
- : 'expectedBeforeHTMLCommentOpen',
- fix: closeDecoration
- ? undefined
- : (fixer) => fixer.insertTextBefore(afterToken, '\n')
+ messageId:
+ closeDecoration
+ ? 'expectedBeforeExceptionBlock'
+ : 'expectedBeforeHTMLCommentOpen',
+ fix:
+ closeDecoration
+ ? undefined
+ : (fixer) => fixer.insertTextBefore(afterToken, '\n')
})
} else {
if (value.loc.end.line === afterToken.loc.start.line) {
diff --git ORI/eslint-plugin-vue/lib/rules/html-comment-content-spacing.js ALT/eslint-plugin-vue/lib/rules/html-comment-content-spacing.js
index b4f3167..5cd599a 100644
--- ORI/eslint-plugin-vue/lib/rules/html-comment-content-spacing.js
+++ ALT/eslint-plugin-vue/lib/rules/html-comment-content-spacing.js
@@ -94,12 +94,14 @@ module.exports = {
start: beforeToken.loc.end,
end: value.loc.start
},
- messageId: openDecoration
- ? 'expectedAfterExceptionBlock'
- : 'expectedAfterHTMLCommentOpen',
- fix: openDecoration
- ? undefined
- : (fixer) => fixer.insertTextAfter(beforeToken, ' ')
+ messageId:
+ openDecoration
+ ? 'expectedAfterExceptionBlock'
+ : 'expectedAfterHTMLCommentOpen',
+ fix:
+ openDecoration
+ ? undefined
+ : (fixer) => fixer.insertTextAfter(beforeToken, ' ')
})
} else {
if (openDecoration) {
@@ -148,12 +150,14 @@ module.exports = {
start: value.loc.end,
end: afterToken.loc.start
},
- messageId: closeDecoration
- ? 'expectedBeforeExceptionBlock'
- : 'expectedBeforeHTMLCommentOpen',
- fix: closeDecoration
- ? undefined
- : (fixer) => fixer.insertTextBefore(afterToken, ' ')
+ messageId:
+ closeDecoration
+ ? 'expectedBeforeExceptionBlock'
+ : 'expectedBeforeHTMLCommentOpen',
+ fix:
+ closeDecoration
+ ? undefined
+ : (fixer) => fixer.insertTextBefore(afterToken, ' ')
})
} else {
if (closeDecoration) {
diff --git ORI/eslint-plugin-vue/lib/rules/html-comment-indent.js ALT/eslint-plugin-vue/lib/rules/html-comment-indent.js
index d5992b5..ae88d31 100644
--- ORI/eslint-plugin-vue/lib/rules/html-comment-indent.js
+++ ALT/eslint-plugin-vue/lib/rules/html-comment-indent.js
@@ -201,9 +201,10 @@ module.exports = {
start: { line, column: 0 },
end: { line, column: actualIndentText.length }
},
- messageId: actualIndentText
- ? 'unexpectedBaseIndentation'
- : 'missingBaseIndentation',
+ messageId:
+ actualIndentText
+ ? 'unexpectedBaseIndentation'
+ : 'missingBaseIndentation',
data: {
expected: toDisplay(baseIndentText),
actual: toDisplay(actualIndentText.slice(0, baseIndentText.length))
@@ -243,9 +244,10 @@ module.exports = {
start: { line, column: baseIndentText.length },
end: { line, column: actualIndentText.length }
},
- messageId: baseIndentText
- ? 'unexpectedRelativeIndentation'
- : 'unexpectedIndentation',
+ messageId:
+ baseIndentText
+ ? 'unexpectedRelativeIndentation'
+ : 'unexpectedIndentation',
data: {
expected: toDisplay(expectedOffsetIndentText, options.indentChar),
actual: toDisplay(actualOffsetIndentText, options.indentChar)
diff --git ORI/eslint-plugin-vue/lib/rules/match-component-file-name.js ALT/eslint-plugin-vue/lib/rules/match-component-file-name.js
index 8428516..966ae41 100644
--- ORI/eslint-plugin-vue/lib/rules/match-component-file-name.js
+++ ALT/eslint-plugin-vue/lib/rules/match-component-file-name.js
@@ -50,9 +50,8 @@ module.exports = {
const options = context.options[0]
const shouldMatchCase = (options && options.shouldMatchCase) || false
const extensionsArray = options && options.extensions
- const allowedExtensions = Array.isArray(extensionsArray)
- ? extensionsArray
- : ['jsx']
+ const allowedExtensions =
+ Array.isArray(extensionsArray) ? extensionsArray : ['jsx']
const extension = path.extname(context.getFilename())
const filename = path.basename(context.getFilename(), extension)
diff --git ORI/eslint-plugin-vue/lib/rules/no-irregular-whitespace.js ALT/eslint-plugin-vue/lib/rules/no-irregular-whitespace.js
index 1cfbd61..40a162f 100644
--- ORI/eslint-plugin-vue/lib/rules/no-irregular-whitespace.js
+++ ALT/eslint-plugin-vue/lib/rules/no-irregular-whitespace.js
@@ -232,9 +232,8 @@ module.exports = {
// Removes errors that occur outside script and template
const [scriptStart, scriptEnd] = node.range
- const [templateStart, templateEnd] = templateBody
- ? templateBody.range
- : [0, 0]
+ const [templateStart, templateEnd] =
+ templateBody ? templateBody.range : [0, 0]
errorIndexes = errorIndexes.filter(
(errorIndex) =>
(scriptStart <= errorIndex && errorIndex < scriptEnd) ||
diff --git ORI/eslint-plugin-vue/lib/rules/no-parsing-error.js ALT/eslint-plugin-vue/lib/rules/no-parsing-error.js
index 9a6b4f8..c111a4c 100644
--- ORI/eslint-plugin-vue/lib/rules/no-parsing-error.js
+++ ALT/eslint-plugin-vue/lib/rules/no-parsing-error.js
@@ -99,9 +99,10 @@ module.exports = {
loc: { line: error.lineNumber, column: error.column },
message: 'Parsing error: {{message}}.',
data: {
- message: error.message.endsWith('.')
- ? error.message.slice(0, -1)
- : error.message
+ message:
+ error.message.endsWith('.')
+ ? error.message.slice(0, -1)
+ : error.message
}
})
}
diff --git ORI/eslint-plugin-vue/lib/rules/no-reserved-component-names.js ALT/eslint-plugin-vue/lib/rules/no-reserved-component-names.js
index e32e182..1ba998a 100644
--- ORI/eslint-plugin-vue/lib/rules/no-reserved-component-names.js
+++ ALT/eslint-plugin-vue/lib/rules/no-reserved-component-names.js
@@ -133,13 +133,14 @@ module.exports = {
function report(node, name) {
context.report({
node,
- messageId: RESERVED_NAMES_IN_HTML.has(name)
- ? 'reservedInHtml'
- : RESERVED_NAMES_IN_VUE.has(name)
- ? 'reservedInVue'
- : RESERVED_NAMES_IN_VUE3.has(name)
- ? 'reservedInVue3'
- : 'reserved',
+ messageId:
+ RESERVED_NAMES_IN_HTML.has(name)
+ ? 'reservedInHtml'
+ : RESERVED_NAMES_IN_VUE.has(name)
+ ? 'reservedInVue'
+ : RESERVED_NAMES_IN_VUE3.has(name)
+ ? 'reservedInVue3'
+ : 'reserved',
data: {
name
}
diff --git ORI/eslint-plugin-vue/lib/rules/no-restricted-call-after-await.js ALT/eslint-plugin-vue/lib/rules/no-restricted-call-after-await.js
index 523d6af..1838311 100644
--- ORI/eslint-plugin-vue/lib/rules/no-restricted-call-after-await.js
+++ ALT/eslint-plugin-vue/lib/rules/no-restricted-call-after-await.js
@@ -158,9 +158,10 @@ module.exports = {
/** @type {TraceKind & TraceMap} */
const mod = traceMap[module]
let local = mod
- const paths = Array.isArray(option.path)
- ? option.path
- : [option.path || 'default']
+ const paths =
+ Array.isArray(option.path)
+ ? option.path
+ : [option.path || 'default']
for (const path of paths) {
local = local[path] || (local[path] = {})
}
diff --git ORI/eslint-plugin-vue/lib/rules/no-restricted-custom-event.js ALT/eslint-plugin-vue/lib/rules/no-restricted-custom-event.js
index 22d128c..04cd1f4 100644
--- ORI/eslint-plugin-vue/lib/rules/no-restricted-custom-event.js
+++ ALT/eslint-plugin-vue/lib/rules/no-restricted-custom-event.js
@@ -147,27 +147,28 @@ module.exports = {
node: nameLiteralNode,
messageId: 'restrictedEvent',
data: { message },
- suggest: option.suggest
- ? [
- {
- fix(fixer) {
- const sourceCode = context.getSourceCode()
- return fixer.replaceText(
- nameLiteralNode,
- `${
- sourceCode.text[nameLiteralNode.range[0]]
- }${JSON.stringify(option.suggest)
- .slice(1, -1)
- .replace(/'/gu, "\\'")}${
- sourceCode.text[nameLiteralNode.range[1] - 1]
- }`
- )
- },
- messageId: 'instead',
- data: { suggest: option.suggest }
- }
- ]
- : []
+ suggest:
+ option.suggest
+ ? [
+ {
+ fix(fixer) {
+ const sourceCode = context.getSourceCode()
+ return fixer.replaceText(
+ nameLiteralNode,
+ `${
+ sourceCode.text[nameLiteralNode.range[0]]
+ }${JSON.stringify(option.suggest)
+ .slice(1, -1)
+ .replace(/'/gu, "\\'")}${
+ sourceCode.text[nameLiteralNode.range[1] - 1]
+ }`
+ )
+ },
+ messageId: 'instead',
+ data: { suggest: option.suggest }
+ }
+ ]
+ : []
})
break
}
diff --git ORI/eslint-plugin-vue/lib/rules/no-restricted-props.js ALT/eslint-plugin-vue/lib/rules/no-restricted-props.js
index 6834df5..a49a0db 100644
--- ORI/eslint-plugin-vue/lib/rules/no-restricted-props.js
+++ ALT/eslint-plugin-vue/lib/rules/no-restricted-props.js
@@ -156,9 +156,10 @@ function createSuggest(node, option, withDefault) {
if (node.type === 'Literal' || node.type === 'TemplateLiteral') {
replaceText = JSON.stringify(option.suggest)
} else if (node.type === 'Identifier') {
- replaceText = /^[a-z]\w*$/iu.exec(option.suggest)
- ? option.suggest
- : JSON.stringify(option.suggest)
+ replaceText =
+ /^[a-z]\w*$/iu.exec(option.suggest)
+ ? option.suggest
+ : JSON.stringify(option.suggest)
} else {
return []
}
diff --git ORI/eslint-plugin-vue/lib/rules/no-restricted-static-attribute.js ALT/eslint-plugin-vue/lib/rules/no-restricted-static-attribute.js
index 24cab62..6402eb6 100644
--- ORI/eslint-plugin-vue/lib/rules/no-restricted-static-attribute.js
+++ ALT/eslint-plugin-vue/lib/rules/no-restricted-static-attribute.js
@@ -148,11 +148,12 @@ module.exports = {
*/
function defaultMessage(node, option) {
const key = node.key.rawName
- const value = !option.useValue
- ? ''
- : node.value == null
- ? '` set to `true'
- : `="${node.value.value}"`
+ const value =
+ !option.useValue
+ ? ''
+ : node.value == null
+ ? '` set to `true'
+ : `="${node.value.value}"`
let on = ''
if (option.useElement) {
diff --git ORI/eslint-plugin-vue/lib/rules/no-restricted-v-bind.js ALT/eslint-plugin-vue/lib/rules/no-restricted-v-bind.js
index 3cc46e7..7c33776 100644
--- ORI/eslint-plugin-vue/lib/rules/no-restricted-v-bind.js
+++ ALT/eslint-plugin-vue/lib/rules/no-restricted-v-bind.js
@@ -170,9 +170,8 @@ module.exports = {
key.argument != null && key.argument.type === 'VIdentifier'
? `:${key.argument.rawName}`
: ''
- const mod = option.modifiers.length
- ? `.${option.modifiers.join('.')}`
- : ''
+ const mod =
+ option.modifiers.length ? `.${option.modifiers.join('.')}` : ''
let on = ''
if (option.useElement) {
on = ` on \`<${key.parent.parent.parent.rawName}>\``
diff --git ORI/eslint-plugin-vue/lib/rules/no-undef-properties.js ALT/eslint-plugin-vue/lib/rules/no-undef-properties.js
index 4246f77..f554437 100644
--- ORI/eslint-plugin-vue/lib/rules/no-undef-properties.js
+++ ALT/eslint-plugin-vue/lib/rules/no-undef-properties.js
@@ -153,9 +153,8 @@ module.exports = {
return
}
for (const [refName, { nodes }] of references.allProperties()) {
- const referencePathName = pathName
- ? `${pathName}.${refName}`
- : refName
+ const referencePathName =
+ pathName ? `${pathName}.${refName}` : refName
const prop = defineProperties.get && defineProperties.get(refName)
if (prop) {
diff --git ORI/eslint-plugin-vue/lib/rules/no-unregistered-components.js ALT/eslint-plugin-vue/lib/rules/no-unregistered-components.js
index 5cc22a9..0171658 100644
--- ORI/eslint-plugin-vue/lib/rules/no-unregistered-components.js
+++ ALT/eslint-plugin-vue/lib/rules/no-unregistered-components.js
@@ -116,9 +116,10 @@ module.exports = {
!node.value // `<component is />`
)
return
- const value = node.value.value.startsWith('vue:') // Usage on native elements 3.1+
- ? node.value.value.slice(4)
- : node.value.value
+ const value =
+ node.value.value.startsWith('vue:') // Usage on native elements 3.1+
+ ? node.value.value.slice(4)
+ : node.value.value
if (utils.isHtmlWellKnownElementName(value)) return
usedComponentNodes.push({ node, name: value })
},
diff --git ORI/eslint-plugin-vue/lib/rules/no-unused-components.js ALT/eslint-plugin-vue/lib/rules/no-unused-components.js
index 8497dd9..e7264b9 100644
--- ORI/eslint-plugin-vue/lib/rules/no-unused-components.js
+++ ALT/eslint-plugin-vue/lib/rules/no-unused-components.js
@@ -88,9 +88,10 @@ module.exports = {
if (!node.value) {
return
}
- const value = node.value.value.startsWith('vue:') // Usage on native elements 3.1+
- ? node.value.value.slice(4)
- : node.value.value
+ const value =
+ node.value.value.startsWith('vue:') // Usage on native elements 3.1+
+ ? node.value.value.slice(4)
+ : node.value.value
usedComponents.add(value)
},
/** @param {VElement} node */
diff --git ORI/eslint-plugin-vue/lib/rules/order-in-components.js ALT/eslint-plugin-vue/lib/rules/order-in-components.js
index 83558aa..99594c3 100644
--- ORI/eslint-plugin-vue/lib/rules/order-in-components.js
+++ ALT/eslint-plugin-vue/lib/rules/order-in-components.js
@@ -313,13 +313,11 @@ module.exports = {
const beforeComma = sourceCode.getTokenBefore(propertyNode)
const codeStart = beforeComma.range[1] // to include comments
- const codeEnd = hasAfterComma
- ? afterComma.range[1]
- : propertyNode.range[1]
+ const codeEnd =
+ hasAfterComma ? afterComma.range[1] : propertyNode.range[1]
- const removeStart = hasAfterComma
- ? codeStart
- : beforeComma.range[0]
+ const removeStart =
+ hasAfterComma ? codeStart : beforeComma.range[0]
yield fixer.removeRange([removeStart, codeEnd])
const propertyCode =
diff --git ORI/eslint-plugin-vue/lib/rules/return-in-emits-validator.js ALT/eslint-plugin-vue/lib/rules/return-in-emits-validator.js
index 03d197b..49efc6d 100644
--- ORI/eslint-plugin-vue/lib/rules/return-in-emits-validator.js
+++ ALT/eslint-plugin-vue/lib/rules/return-in-emits-validator.js
@@ -135,9 +135,10 @@ module.exports = {
if (emits) {
context.report({
node,
- message: scopeStack.hasReturnValue
- ? 'Expected to return a true value in "{{name}}" emits validator.'
- : 'Expected to return a boolean value in "{{name}}" emits validator.',
+ message:
+ scopeStack.hasReturnValue
+ ? 'Expected to return a true value in "{{name}}" emits validator.'
+ : 'Expected to return a boolean value in "{{name}}" emits validator.',
data: {
name: emits.emitName || 'Unknown'
}
diff --git ORI/eslint-plugin-vue/lib/rules/syntaxes/slot-attribute.js ALT/eslint-plugin-vue/lib/rules/syntaxes/slot-attribute.js
index 4cfe209..202cdbb 100644
--- ORI/eslint-plugin-vue/lib/rules/syntaxes/slot-attribute.js
+++ ALT/eslint-plugin-vue/lib/rules/syntaxes/slot-attribute.js
@@ -74,11 +74,8 @@ module.exports = {
(attr.key.name.name === 'slot-scope' ||
attr.key.name.name === 'scope')
)
- const nameArgument = slotName
- ? vBind
- ? `:[${slotName}]`
- : `:${slotName}`
- : ''
+ const nameArgument =
+ slotName ? (vBind ? `:[${slotName}]` : `:${slotName}`) : ''
const scopeValue =
scopeAttr && scopeAttr.value
? `=${sourceCode.getText(scopeAttr.value)}`
diff --git ORI/eslint-plugin-vue/lib/rules/this-in-template.js ALT/eslint-plugin-vue/lib/rules/this-in-template.js
index 671ac56..795fcf7 100644
--- ORI/eslint-plugin-vue/lib/rules/this-in-template.js
+++ ALT/eslint-plugin-vue/lib/rules/this-in-template.js
@@ -53,9 +53,10 @@ module.exports = {
VElement(node) {
scopeStack = {
parent: scopeStack,
- nodes: scopeStack
- ? scopeStack.nodes.slice() // make copy
- : []
+ nodes:
+ scopeStack
+ ? scopeStack.nodes.slice() // make copy
+ : []
}
if (node.variables) {
for (const variable of node.variables) {
diff --git ORI/eslint-plugin-vue/lib/rules/use-v-on-exact.js ALT/eslint-plugin-vue/lib/rules/use-v-on-exact.js
index 0a17906..2293865 100644
--- ORI/eslint-plugin-vue/lib/rules/use-v-on-exact.js
+++ ALT/eslint-plugin-vue/lib/rules/use-v-on-exact.js
@@ -38,9 +38,8 @@ const GLOBAL_MODIFIERS = new Set([
*/
function getEventDirectives(startTag, sourceCode) {
return utils.getDirectives(startTag, 'on').map((attribute) => ({
- name: attribute.key.argument
- ? sourceCode.getText(attribute.key.argument)
- : '',
+ name:
+ attribute.key.argument ? sourceCode.getText(attribute.key.argument) : '',
node: attribute.key,
modifiers: attribute.key.modifiers.map((modifier) => modifier.name)
}))
diff --git ORI/eslint-plugin-vue/lib/rules/v-bind-style.js ALT/eslint-plugin-vue/lib/rules/v-bind-style.js
index e6878a3..f08a99e 100644
--- ORI/eslint-plugin-vue/lib/rules/v-bind-style.js
+++ ALT/eslint-plugin-vue/lib/rules/v-bind-style.js
@@ -44,11 +44,12 @@ module.exports = {
context.report({
node,
loc: node.loc,
- message: preferShorthand
- ? "Unexpected 'v-bind' before ':'."
- : shorthandProp
- ? "Expected 'v-bind:' instead of '.'."
- : /* otherwise */ "Expected 'v-bind' before ':'.",
+ message:
+ preferShorthand
+ ? "Unexpected 'v-bind' before ':'."
+ : shorthandProp
+ ? "Expected 'v-bind:' instead of '.'."
+ : /* otherwise */ "Expected 'v-bind' before ':'.",
*fix(fixer) {
if (preferShorthand) {
yield fixer.remove(node.key.name)
diff --git ORI/eslint-plugin-vue/lib/rules/v-on-event-hyphenation.js ALT/eslint-plugin-vue/lib/rules/v-on-event-hyphenation.js
index 16ea753..75bc901 100644
--- ORI/eslint-plugin-vue/lib/rules/v-on-event-hyphenation.js
+++ ALT/eslint-plugin-vue/lib/rules/v-on-event-hyphenation.js
@@ -64,9 +64,10 @@ module.exports = {
context.report({
node: node.key,
loc: node.loc,
- message: useHyphenated
- ? "v-on event '{{text}}' must be hyphenated."
- : "v-on event '{{text}}' can't be hyphenated.",
+ message:
+ useHyphenated
+ ? "v-on event '{{text}}' must be hyphenated."
+ : "v-on event '{{text}}' can't be hyphenated.",
data: {
text
},
diff --git ORI/eslint-plugin-vue/lib/rules/v-on-function-call.js ALT/eslint-plugin-vue/lib/rules/v-on-function-call.js
index 90da5ed..b892c27 100644
--- ORI/eslint-plugin-vue/lib/rules/v-on-function-call.js
+++ ALT/eslint-plugin-vue/lib/rules/v-on-function-call.js
@@ -164,20 +164,24 @@ module.exports = {
node: expression,
message:
"Method calls without arguments inside of 'v-on' directives must not have parentheses.",
- fix: hasComment
- ? null /* The comment is included and cannot be fixed. */
- : (fixer) => {
- /** @type {Range} */
- const range =
- leftQuote && rightQuote
- ? [leftQuote.range[1], rightQuote.range[0]]
- : [tokens[0].range[0], tokens[tokens.length - 1].range[1]]
-
- return fixer.replaceTextRange(
- range,
- context.getSourceCode().getText(expression.callee)
- )
- }
+ fix:
+ hasComment
+ ? null /* The comment is included and cannot be fixed. */
+ : (fixer) => {
+ /** @type {Range} */
+ const range =
+ leftQuote && rightQuote
+ ? [leftQuote.range[1], rightQuote.range[0]]
+ : [
+ tokens[0].range[0],
+ tokens[tokens.length - 1].range[1]
+ ]
+
+ return fixer.replaceTextRange(
+ range,
+ context.getSourceCode().getText(expression.callee)
+ )
+ }
})
}
},
diff --git ORI/eslint-plugin-vue/lib/rules/v-on-style.js ALT/eslint-plugin-vue/lib/rules/v-on-style.js
index 4649aac..6f3ed40 100644
--- ORI/eslint-plugin-vue/lib/rules/v-on-style.js
+++ ALT/eslint-plugin-vue/lib/rules/v-on-style.js
@@ -44,9 +44,10 @@ module.exports = {
context.report({
node,
loc: node.loc,
- message: preferShorthand
- ? "Expected '@' instead of 'v-on:'."
- : "Expected 'v-on:' instead of '@'.",
+ message:
+ preferShorthand
+ ? "Expected '@' instead of 'v-on:'."
+ : "Expected 'v-on:' instead of '@'.",
fix: (fixer) =>
preferShorthand
? fixer.replaceTextRange([pos, pos + 5], '@')
diff --git ORI/eslint-plugin-vue/lib/utils/html-comments.js ALT/eslint-plugin-vue/lib/utils/html-comments.js
index ec957af..21dc83e 100644
--- ORI/eslint-plugin-vue/lib/utils/html-comments.js
+++ ALT/eslint-plugin-vue/lib/utils/html-comments.js
@@ -180,19 +180,20 @@ function defineParser(sourceCode, config) {
/** @type {HTMLCommentOpen} */
const open = createToken(TYPE_HTML_COMMENT_OPEN, '<!--')
/** @type {HTMLCommentOpenDecoration | null} */
- const openDecoration = openDecorationText
- ? createToken(TYPE_HTML_COMMENT_OPEN_DECORATION, openDecorationText)
- : null
+ const openDecoration =
+ openDecorationText
+ ? createToken(TYPE_HTML_COMMENT_OPEN_DECORATION, openDecorationText)
+ : null
tokenIndex += beforeSpace.length
/** @type {HTMLCommentValue | null} */
- const value = valueText
- ? createToken(TYPE_HTML_COMMENT_VALUE, valueText)
- : null
+ const value =
+ valueText ? createToken(TYPE_HTML_COMMENT_VALUE, valueText) : null
tokenIndex += afterSpace.length
/** @type {HTMLCommentCloseDecoration | null} */
- const closeDecoration = closeDecorationText
- ? createToken(TYPE_HTML_COMMENT_CLOSE_DECORATION, closeDecorationText)
- : null
+ const closeDecoration =
+ closeDecorationText
+ ? createToken(TYPE_HTML_COMMENT_CLOSE_DECORATION, closeDecorationText)
+ : null
/** @type {HTMLCommentClose} */
const close = createToken(TYPE_HTML_COMMENT_CLOSE, '-->')
diff --git ORI/eslint-plugin-vue/lib/utils/indent-common.js ALT/eslint-plugin-vue/lib/utils/indent-common.js
index 39ef586..44bcc43 100644
--- ORI/eslint-plugin-vue/lib/utils/indent-common.js
+++ ALT/eslint-plugin-vue/lib/utils/indent-common.js
@@ -913,9 +913,10 @@ module.exports.defineVisitor = function create(
// Validate.
for (const comment of comments) {
const commentExpectedIndents = getExpectedIndents([comment])
- const commentExpectedIndent = commentExpectedIndents
- ? commentExpectedIndents.expectedIndent
- : commentOptionalExpectedIndents[0]
+ const commentExpectedIndent =
+ commentExpectedIndents
+ ? commentExpectedIndents.expectedIndent
+ : commentOptionalExpectedIndents[0]
validateCore(
comment,
@@ -1276,9 +1277,10 @@ module.exports.defineVisitor = function create(
const leftToken = tokenStore.getTokenAfter(whileToken)
const testToken = tokenStore.getTokenAfter(leftToken)
const lastToken = tokenStore.getLastToken(node)
- const rightToken = isSemicolonToken(lastToken)
- ? tokenStore.getTokenBefore(lastToken)
- : lastToken
+ const rightToken =
+ isSemicolonToken(lastToken)
+ ? tokenStore.getTokenBefore(lastToken)
+ : lastToken
processMaybeBlock(node.body, doToken)
setOffset(whileToken, 0, doToken)
@@ -1634,13 +1636,14 @@ module.exports.defineVisitor = function create(
const newToken = tokenStore.getFirstToken(node)
const calleeToken = tokenStore.getTokenAfter(newToken)
const rightToken = tokenStore.getLastToken(node)
- const leftToken = isClosingParenToken(rightToken)
- ? tokenStore.getFirstTokenBetween(
- node.callee,
- rightToken,
- isOpeningParenToken
- )
- : null
+ const leftToken =
+ isClosingParenToken(rightToken)
+ ? tokenStore.getFirstTokenBetween(
+ node.callee,
+ rightToken,
+ isOpeningParenToken
+ )
+ : null
setOffset(calleeToken, 1, newToken)
if (leftToken != null) {
@@ -1875,9 +1878,8 @@ module.exports.defineVisitor = function create(
firstToken != null &&
firstToken.type === 'Punctuator' &&
firstToken.value === '<script>'
- const baseIndent = isScriptTag
- ? options.indentSize * options.baseIndent
- : 0
+ const baseIndent =
+ isScriptTag ? options.indentSize * options.baseIndent : 0
for (const statement of node.body) {
processTopLevelNode(statement, baseIndent)
diff --git ORI/eslint-plugin-vue/lib/utils/index.js ALT/eslint-plugin-vue/lib/utils/index.js
index d6c3a6f..fd7fa68 100644
--- ORI/eslint-plugin-vue/lib/utils/index.js
+++ ALT/eslint-plugin-vue/lib/utils/index.js
@@ -85,21 +85,23 @@ function getCoreRule(name) {
*/
function wrapContextToOverrideTokenMethods(context, tokenStore, options) {
const eslintSourceCode = context.getSourceCode()
- const rootNode = options.applyDocument
- ? context.parserServices.getDocumentFragment &&
- context.parserServices.getDocumentFragment()
- : eslintSourceCode.ast.templateBody
+ const rootNode =
+ options.applyDocument
+ ? context.parserServices.getDocumentFragment &&
+ context.parserServices.getDocumentFragment()
+ : eslintSourceCode.ast.templateBody
/** @type {Token[] | null} */
let tokensAndComments = null
function getTokensAndComments() {
if (tokensAndComments) {
return tokensAndComments
}
- tokensAndComments = rootNode
- ? tokenStore.getTokens(rootNode, {
- includeComments: true
- })
- : []
+ tokensAndComments =
+ rootNode
+ ? tokenStore.getTokens(rootNode, {
+ includeComments: true
+ })
+ : []
return tokensAndComments
}
@@ -2082,18 +2084,21 @@ function getScope(context, currentNode) {
* @returns { (Property) | null}
*/
function findProperty(node, name, filter) {
- const predicate = filter
- ? /**
- * @param {Property | SpreadElement} prop
- * @returns {prop is Property}
- */
- (prop) =>
- isProperty(prop) && getStaticPropertyName(prop) === name && filter(prop)
- : /**
- * @param {Property | SpreadElement} prop
- * @returns {prop is Property}
- */
- (prop) => isProperty(prop) && getStaticPropertyName(prop) === name
+ const predicate =
+ filter
+ ? /**
+ * @param {Property | SpreadElement} prop
+ * @returns {prop is Property}
+ */
+ (prop) =>
+ isProperty(prop) &&
+ getStaticPropertyName(prop) === name &&
+ filter(prop)
+ : /**
+ * @param {Property | SpreadElement} prop
+ * @returns {prop is Property}
+ */
+ (prop) => isProperty(prop) && getStaticPropertyName(prop) === name
return node.properties.find(predicate) || null
}
@@ -2105,21 +2110,22 @@ function findProperty(node, name, filter) {
* @returns { (AssignmentProperty) | null}
*/
function findAssignmentProperty(node, name, filter) {
- const predicate = filter
- ? /**
- * @param {AssignmentProperty | RestElement} prop
- * @returns {prop is AssignmentProperty}
- */
- (prop) =>
- isAssignmentProperty(prop) &&
- getStaticPropertyName(prop) === name &&
- filter(prop)
- : /**
- * @param {AssignmentProperty | RestElement} prop
- * @returns {prop is AssignmentProperty}
- */
- (prop) =>
- isAssignmentProperty(prop) && getStaticPropertyName(prop) === name
+ const predicate =
+ filter
+ ? /**
+ * @param {AssignmentProperty | RestElement} prop
+ * @returns {prop is AssignmentProperty}
+ */
+ (prop) =>
+ isAssignmentProperty(prop) &&
+ getStaticPropertyName(prop) === name &&
+ filter(prop)
+ : /**
+ * @param {AssignmentProperty | RestElement} prop
+ * @returns {prop is AssignmentProperty}
+ */
+ (prop) =>
+ isAssignmentProperty(prop) && getStaticPropertyName(prop) === name
return node.properties.find(predicate) || null
}
diff --git ORI/eslint-plugin-vue/tests/eslint-compat.js ALT/eslint-plugin-vue/tests/eslint-compat.js
index 8da19ae..800c5c5 100644
--- ORI/eslint-plugin-vue/tests/eslint-compat.js
+++ ALT/eslint-plugin-vue/tests/eslint-compat.js
@@ -29,23 +29,24 @@ function getESLintClassForV6() {
/** @type {eslint.CLIEngine.Options} */
const newOptions = {
fix: Boolean(fix),
- reportUnusedDisableDirectives: reportUnusedDisableDirectives
- ? reportUnusedDisableDirectives !== 'off'
- : undefined,
+ reportUnusedDisableDirectives:
+ reportUnusedDisableDirectives
+ ? reportUnusedDisableDirectives !== 'off'
+ : undefined,
...otherOptions,
- globals: globals
- ? Object.keys(globals).filter((n) => globals[n])
- : undefined,
+ globals:
+ globals ? Object.keys(globals).filter((n) => globals[n]) : undefined,
plugins: plugins || [],
- rules: rules
- ? Object.entries(rules).reduce((o, [ruleId, opt]) => {
- if (opt) {
- o[ruleId] = opt
- }
- return o
- }, /** @type {NonNullable<eslint.CLIEngine.Options["rules"]>}*/ ({}))
- : undefined,
+ rules:
+ rules
+ ? Object.entries(rules).reduce((o, [ruleId, opt]) => {
+ if (opt) {
+ o[ruleId] = opt
+ }
+ return o
+ }, /** @type {NonNullable<eslint.CLIEngine.Options["rules"]>}*/ ({}))
+ : undefined,
...overrideConfig
}
this.engine = new eslint.CLIEngine(newOptions)
diff --git ORI/eslint-plugin-vue/tests/lib/rules/func-call-spacing.js ALT/eslint-plugin-vue/tests/lib/rules/func-call-spacing.js
index 74fa4cb..f0d4d33 100644
--- ORI/eslint-plugin-vue/tests/lib/rules/func-call-spacing.js
+++ ALT/eslint-plugin-vue/tests/lib/rules/func-call-spacing.js
@@ -62,9 +62,10 @@ tester.run('func-call-spacing', rule, {
`,
errors: [
{
- message: semver.lt(ESLint.version, '7.0.0')
- ? 'Unexpected newline between function name and paren.'
- : 'Unexpected whitespace between function name and paren.',
+ message:
+ semver.lt(ESLint.version, '7.0.0')
+ ? 'Unexpected newline between function name and paren.'
+ : 'Unexpected whitespace between function name and paren.',
line: 3
}
]
@@ -105,9 +106,10 @@ tester.run('func-call-spacing', rule, {
</style>`,
errors: [
{
- message: semver.lt(ESLint.version, '7.0.0')
- ? 'Unexpected newline between function name and paren.'
- : 'Unexpected whitespace between function name and paren.',
+ message:
+ semver.lt(ESLint.version, '7.0.0')
+ ? 'Unexpected newline between function name and paren.'
+ : 'Unexpected whitespace between function name and paren.',
line: 4
}
]
diff --git ORI/eslint-plugin-vue/tests/lib/rules/no-reserved-component-names.js ALT/eslint-plugin-vue/tests/lib/rules/no-reserved-component-names.js
index cdb3ab7..f626d4d 100644
--- ORI/eslint-plugin-vue/tests/lib/rules/no-reserved-component-names.js
+++ ALT/eslint-plugin-vue/tests/lib/rules/no-reserved-component-names.js
@@ -586,9 +586,8 @@ ruleTester.run('no-reserved-component-names', rule, {
parserOptions,
errors: [
{
- messageId: RESERVED_NAMES_IN_HTML.has(name)
- ? 'reservedInHtml'
- : 'reserved',
+ messageId:
+ RESERVED_NAMES_IN_HTML.has(name) ? 'reservedInHtml' : 'reserved',
data: { name },
type: 'Literal',
line: 3
@@ -603,9 +602,8 @@ ruleTester.run('no-reserved-component-names', rule, {
parserOptions,
errors: [
{
- messageId: RESERVED_NAMES_IN_HTML.has(name)
- ? 'reservedInHtml'
- : 'reserved',
+ messageId:
+ RESERVED_NAMES_IN_HTML.has(name) ? 'reservedInHtml' : 'reserved',
data: { name },
type: 'Literal',
line: 1
@@ -620,9 +618,8 @@ ruleTester.run('no-reserved-component-names', rule, {
parserOptions,
errors: [
{
- messageId: RESERVED_NAMES_IN_HTML.has(name)
- ? 'reservedInHtml'
- : 'reserved',
+ messageId:
+ RESERVED_NAMES_IN_HTML.has(name) ? 'reservedInHtml' : 'reserved',
data: { name },
type: 'Literal',
line: 1
@@ -637,9 +634,8 @@ ruleTester.run('no-reserved-component-names', rule, {
parserOptions,
errors: [
{
- messageId: RESERVED_NAMES_IN_HTML.has(name)
- ? 'reservedInHtml'
- : 'reserved',
+ messageId:
+ RESERVED_NAMES_IN_HTML.has(name) ? 'reservedInHtml' : 'reserved',
data: { name },
type: 'TemplateLiteral',
line: 1
@@ -654,9 +650,8 @@ ruleTester.run('no-reserved-component-names', rule, {
parserOptions,
errors: [
{
- messageId: RESERVED_NAMES_IN_HTML.has(name)
- ? 'reservedInHtml'
- : 'reserved',
+ messageId:
+ RESERVED_NAMES_IN_HTML.has(name) ? 'reservedInHtml' : 'reserved',
data: { name },
type: 'TemplateLiteral',
line: 1
@@ -675,9 +670,8 @@ ruleTester.run('no-reserved-component-names', rule, {
parserOptions,
errors: [
{
- messageId: RESERVED_NAMES_IN_HTML.has(name)
- ? 'reservedInHtml'
- : 'reserved',
+ messageId:
+ RESERVED_NAMES_IN_HTML.has(name) ? 'reservedInHtml' : 'reserved',
data: { name },
type: 'Property',
line: 3
diff --git ORI/eslint-plugin-vue/tests/lib/rules/space-in-parens.js ALT/eslint-plugin-vue/tests/lib/rules/space-in-parens.js
index 8791652..4de9958 100644
--- ORI/eslint-plugin-vue/tests/lib/rules/space-in-parens.js
+++ ALT/eslint-plugin-vue/tests/lib/rules/space-in-parens.js
@@ -7,16 +7,18 @@ const { RuleTester, ESLint } = require('../../eslint-compat')
const semver = require('semver')
const rule = require('../../../lib/rules/space-in-parens')
-const errorMessage = semver.lt(ESLint.version, '6.4.0')
- ? (obj) => {
- const messageId = obj.messageId
- delete obj.messageId
- obj.message = messageId.startsWith('missing')
- ? 'There must be a space inside this paren.'
- : 'There should be no spaces inside this paren.'
- return obj
- }
- : (obj) => obj
+const errorMessage =
+ semver.lt(ESLint.version, '6.4.0')
+ ? (obj) => {
+ const messageId = obj.messageId
+ delete obj.messageId
+ obj.message =
+ messageId.startsWith('missing')
+ ? 'There must be a space inside this paren.'
+ : 'There should be no spaces inside this paren.'
+ return obj
+ }
+ : (obj) => obj
const tester = new RuleTester({
parser: require.resolve('vue-eslint-parser'),
diff --git ORI/eslint-plugin-vue/tests/lib/rules/space-infix-ops.js ALT/eslint-plugin-vue/tests/lib/rules/space-infix-ops.js
index b8a6797..8e781dd 100644
--- ORI/eslint-plugin-vue/tests/lib/rules/space-infix-ops.js
+++ ALT/eslint-plugin-vue/tests/lib/rules/space-infix-ops.js
@@ -12,9 +12,10 @@ const tester = new RuleTester({
parserOptions: { ecmaVersion: 2015 }
})
-const message = semver.lt(ESLint.version, '5.10.0')
- ? () => 'Infix operators must be spaced.'
- : (operator) => `Operator '${operator}' must be spaced.`
+const message =
+ semver.lt(ESLint.version, '5.10.0')
+ ? () => 'Infix operators must be spaced.'
+ : (operator) => `Operator '${operator}' must be spaced.`
tester.run('space-infix-ops', rule, {
valid: [ |
|
prettier/prettier#12087 VS prettier/prettier@main :: excalidraw/excalidraw@afa7932 Diff (987 lines)diff --git ORI/excalidraw/src/actions/actionClipboard.tsx ALT/excalidraw/src/actions/actionClipboard.tsx
index aa0dbac..af21edd 100644
--- ORI/excalidraw/src/actions/actionClipboard.tsx
+++ ALT/excalidraw/src/actions/actionClipboard.tsx
@@ -96,12 +96,14 @@ export const actionCopyAsPng = register({
appState: {
...appState,
toastMessage: t("toast.copyToClipboardAsPng", {
- exportSelection: selectedElements.length
- ? t("toast.selection")
- : t("toast.canvas"),
- exportColorScheme: appState.exportWithDarkMode
- ? t("buttons.darkMode")
- : t("buttons.lightMode"),
+ exportSelection:
+ selectedElements.length
+ ? t("toast.selection")
+ : t("toast.canvas"),
+ exportColorScheme:
+ appState.exportWithDarkMode
+ ? t("buttons.darkMode")
+ : t("buttons.lightMode"),
}),
},
commitToHistory: false,
diff --git ORI/excalidraw/src/actions/actionExport.tsx ALT/excalidraw/src/actions/actionExport.tsx
index 16f33f8..0c87786 100644
--- ORI/excalidraw/src/actions/actionExport.tsx
+++ ALT/excalidraw/src/actions/actionExport.tsx
@@ -50,9 +50,8 @@ export const actionChangeExportScale = register({
PanelComponent: ({ elements: allElements, appState, updateData }) => {
const elements = getNonDeletedElements(allElements);
const exportSelected = isSomeElementSelected(elements, appState);
- const exportedElements = exportSelected
- ? getSelectedElements(elements, appState)
- : elements;
+ const exportedElements =
+ exportSelected ? getSelectedElements(elements, appState) : elements;
return (
<>
@@ -132,23 +131,25 @@ export const actionSaveToActiveFile = register({
const fileHandleExists = !!appState.fileHandle;
try {
- const { fileHandle } = isImageFileHandle(appState.fileHandle)
- ? await resaveAsImageWithScene(elements, appState, app.files)
- : await saveAsJSON(elements, appState, app.files);
+ const { fileHandle } =
+ isImageFileHandle(appState.fileHandle)
+ ? await resaveAsImageWithScene(elements, appState, app.files)
+ : await saveAsJSON(elements, appState, app.files);
return {
commitToHistory: false,
appState: {
...appState,
fileHandle,
- toastMessage: fileHandleExists
- ? fileHandle?.name
- ? t("toast.fileSavedToFilename").replace(
- "{filename}",
- `"${fileHandle.name}"`,
- )
- : t("toast.fileSaved")
- : null,
+ toastMessage:
+ fileHandleExists
+ ? fileHandle?.name
+ ? t("toast.fileSavedToFilename").replace(
+ "{filename}",
+ `"${fileHandle.name}"`,
+ )
+ : t("toast.fileSaved")
+ : null,
},
};
} catch (error: any) {
diff --git ORI/excalidraw/src/actions/actionFinalize.tsx ALT/excalidraw/src/actions/actionFinalize.tsx
index e89112a..85d2687 100644
--- ORI/excalidraw/src/actions/actionFinalize.tsx
+++ ALT/excalidraw/src/actions/actionFinalize.tsx
@@ -55,11 +55,12 @@ export const actionFinalize = register({
focusContainer();
}
- const multiPointElement = appState.multiElement
- ? appState.multiElement
- : appState.editingElement?.type === "freedraw"
- ? appState.editingElement
- : null;
+ const multiPointElement =
+ appState.multiElement
+ ? appState.multiElement
+ : appState.editingElement?.type === "freedraw"
+ ? appState.editingElement
+ : null;
if (multiPointElement) {
// pen and mouse have hover
diff --git ORI/excalidraw/src/actions/actionProperties.tsx ALT/excalidraw/src/actions/actionProperties.tsx
index cc3bbbd..81c2c9d 100644
--- ORI/excalidraw/src/actions/actionProperties.tsx
+++ ALT/excalidraw/src/actions/actionProperties.tsx
@@ -610,12 +610,14 @@ export const actionChangeSharpness = register({
getNonDeletedElements(elements),
appState,
);
- const shouldUpdateForNonLinearElements = targetElements.length
- ? targetElements.every((el) => !isLinearElement(el))
- : !isLinearElementType(appState.elementType);
- const shouldUpdateForLinearElements = targetElements.length
- ? targetElements.every(isLinearElement)
- : isLinearElementType(appState.elementType);
+ const shouldUpdateForNonLinearElements =
+ targetElements.length
+ ? targetElements.every((el) => !isLinearElement(el))
+ : !isLinearElementType(appState.elementType);
+ const shouldUpdateForLinearElements =
+ targetElements.length
+ ? targetElements.every(isLinearElement)
+ : isLinearElementType(appState.elementType);
return {
elements: changeProperty(elements, appState, (el) =>
newElementWith(el, {
@@ -624,12 +626,14 @@ export const actionChangeSharpness = register({
),
appState: {
...appState,
- currentItemStrokeSharpness: shouldUpdateForNonLinearElements
- ? value
- : appState.currentItemStrokeSharpness,
- currentItemLinearStrokeSharpness: shouldUpdateForLinearElements
- ? value
- : appState.currentItemLinearStrokeSharpness,
+ currentItemStrokeSharpness:
+ shouldUpdateForNonLinearElements
+ ? value
+ : appState.currentItemStrokeSharpness,
+ currentItemLinearStrokeSharpness:
+ shouldUpdateForLinearElements
+ ? value
+ : appState.currentItemLinearStrokeSharpness,
},
commitToHistory: true,
};
diff --git ORI/excalidraw/src/appState.ts ALT/excalidraw/src/appState.ts
index a15a4e9..603a5f2 100644
--- ORI/excalidraw/src/appState.ts
+++ ALT/excalidraw/src/appState.ts
@@ -10,9 +10,8 @@ import { t } from "./i18n";
import { AppState, NormalizedZoomValue } from "./types";
import { getDateTime } from "./utils";
-const defaultExportScale = EXPORT_SCALES.includes(devicePixelRatio)
- ? devicePixelRatio
- : 1;
+const defaultExportScale =
+ EXPORT_SCALES.includes(devicePixelRatio) ? devicePixelRatio : 1;
export const getDefaultAppState = (): Omit<
AppState,
diff --git ORI/excalidraw/src/charts.ts ALT/excalidraw/src/charts.ts
index f36a076..8d489a0 100644
--- ORI/excalidraw/src/charts.ts
+++ ALT/excalidraw/src/charts.ts
@@ -299,35 +299,37 @@ const chartBaseElements = (
): ChartElements => {
const { chartWidth, chartHeight } = getChartDimentions(spreadsheet);
- const title = spreadsheet.title
- ? newTextElement({
- backgroundColor,
- groupIds: [groupId],
- ...commonProps,
- text: spreadsheet.title,
- x: x + chartWidth / 2,
- y: y - BAR_HEIGHT - BAR_GAP * 2 - DEFAULT_FONT_SIZE,
- strokeSharpness: "sharp",
- strokeStyle: "solid",
- textAlign: "center",
- })
- : null;
-
- const debugRect = debug
- ? newElement({
- backgroundColor,
- groupIds: [groupId],
- ...commonProps,
- type: "rectangle",
- x,
- y: y - chartHeight,
- width: chartWidth,
- height: chartHeight,
- strokeColor: colors.elementStroke[0],
- fillStyle: "solid",
- opacity: 6,
- })
- : null;
+ const title =
+ spreadsheet.title
+ ? newTextElement({
+ backgroundColor,
+ groupIds: [groupId],
+ ...commonProps,
+ text: spreadsheet.title,
+ x: x + chartWidth / 2,
+ y: y - BAR_HEIGHT - BAR_GAP * 2 - DEFAULT_FONT_SIZE,
+ strokeSharpness: "sharp",
+ strokeStyle: "solid",
+ textAlign: "center",
+ })
+ : null;
+
+ const debugRect =
+ debug
+ ? newElement({
+ backgroundColor,
+ groupIds: [groupId],
+ ...commonProps,
+ type: "rectangle",
+ x,
+ y: y - chartHeight,
+ width: chartWidth,
+ height: chartHeight,
+ strokeColor: colors.elementStroke[0],
+ fillStyle: "solid",
+ opacity: 6,
+ })
+ : null;
return [
...(debugRect ? [debugRect] : []),
diff --git ORI/excalidraw/src/clipboard.ts ALT/excalidraw/src/clipboard.ts
index d2aa4f3..9c63943 100644
--- ORI/excalidraw/src/clipboard.ts
+++ ALT/excalidraw/src/clipboard.ts
@@ -111,10 +111,11 @@ const getSystemClipboard = async (
event: ClipboardEvent | null,
): Promise<string> => {
try {
- const text = event
- ? event.clipboardData?.getData("text/plain").trim()
- : probablySupportsClipboardReadText &&
- (await navigator.clipboard.readText());
+ const text =
+ event
+ ? event.clipboardData?.getData("text/plain").trim()
+ : probablySupportsClipboardReadText &&
+ (await navigator.clipboard.readText());
return text || "";
} catch {
diff --git ORI/excalidraw/src/components/Actions.tsx ALT/excalidraw/src/components/Actions.tsx
index cc291ea..98e832b 100644
--- ORI/excalidraw/src/components/Actions.tsx
+++ ALT/excalidraw/src/components/Actions.tsx
@@ -180,9 +180,10 @@ export const ShapesSwitcher = ({
{SHAPES.map(({ value, icon, key }, index) => {
const label = t(`toolBar.${value}`);
const letter = key && (typeof key === "string" ? key : key[0]);
- const shortcut = letter
- ? `${capitalizeString(letter)} ${t("helpDialog.or")} ${index + 1}`
- : `${index + 1}`;
+ const shortcut =
+ letter
+ ? `${capitalizeString(letter)} ${t("helpDialog.or")} ${index + 1}`
+ : `${index + 1}`;
return (
<ToolButton
className="Shape"
diff --git ORI/excalidraw/src/components/App.tsx ALT/excalidraw/src/components/App.tsx
index ced146d..c77adcd 100644
--- ORI/excalidraw/src/components/App.tsx
+++ ALT/excalidraw/src/components/App.tsx
@@ -547,9 +547,10 @@ class App extends React.Component<AppProps, AppState> {
}
if (actionResult.files) {
- this.files = actionResult.replaceFiles
- ? actionResult.files
- : { ...this.files, ...actionResult.files };
+ this.files =
+ actionResult.replaceFiles
+ ? actionResult.files
+ : { ...this.files, ...actionResult.files };
this.addNewImagesToImageCache();
}
@@ -1462,9 +1463,8 @@ class App extends React.Component<AppProps, AppState> {
this.setState((prevState) => {
return {
elementLocked: !prevState.elementLocked,
- elementType: prevState.elementLocked
- ? "selection"
- : prevState.elementType,
+ elementType:
+ prevState.elementLocked ? "selection" : prevState.elementType,
};
});
};
@@ -2034,33 +2034,34 @@ class App extends React.Component<AppProps, AppState> {
window.devicePixelRatio,
);
- const element = existingTextElement
- ? existingTextElement
- : newTextElement({
- x: parentCenterPosition
- ? parentCenterPosition.elementCenterX
- : sceneX,
- y: parentCenterPosition
- ? parentCenterPosition.elementCenterY
- : sceneY,
- strokeColor: this.state.currentItemStrokeColor,
- backgroundColor: this.state.currentItemBackgroundColor,
- fillStyle: this.state.currentItemFillStyle,
- strokeWidth: this.state.currentItemStrokeWidth,
- strokeStyle: this.state.currentItemStrokeStyle,
- roughness: this.state.currentItemRoughness,
- opacity: this.state.currentItemOpacity,
- strokeSharpness: this.state.currentItemStrokeSharpness,
- text: "",
- fontSize: this.state.currentItemFontSize,
- fontFamily: this.state.currentItemFontFamily,
- textAlign: parentCenterPosition
- ? "center"
- : this.state.currentItemTextAlign,
- verticalAlign: parentCenterPosition
- ? "middle"
- : DEFAULT_VERTICAL_ALIGN,
- });
+ const element =
+ existingTextElement
+ ? existingTextElement
+ : newTextElement({
+ x:
+ parentCenterPosition
+ ? parentCenterPosition.elementCenterX
+ : sceneX,
+ y:
+ parentCenterPosition
+ ? parentCenterPosition.elementCenterY
+ : sceneY,
+ strokeColor: this.state.currentItemStrokeColor,
+ backgroundColor: this.state.currentItemBackgroundColor,
+ fillStyle: this.state.currentItemFillStyle,
+ strokeWidth: this.state.currentItemStrokeWidth,
+ strokeStyle: this.state.currentItemStrokeStyle,
+ roughness: this.state.currentItemRoughness,
+ opacity: this.state.currentItemOpacity,
+ strokeSharpness: this.state.currentItemStrokeSharpness,
+ text: "",
+ fontSize: this.state.currentItemFontSize,
+ fontFamily: this.state.currentItemFontFamily,
+ textAlign:
+ parentCenterPosition ? "center" : this.state.currentItemTextAlign,
+ verticalAlign:
+ parentCenterPosition ? "middle" : DEFAULT_VERTICAL_ALIGN,
+ });
this.setState({ editingElement: element });
@@ -3054,9 +3055,10 @@ class App extends React.Component<AppProps, AppState> {
},
}));
- const pressures = element.simulatePressure
- ? element.pressures
- : [...element.pressures, event.pressure];
+ const pressures =
+ element.simulatePressure
+ ? element.pressures
+ : [...element.pressures, event.pressure];
mutateElement(element, {
points: [[0, 0]],
@@ -3475,9 +3477,10 @@ class App extends React.Component<AppProps, AppState> {
const dx = pointerCoords.x - draggingElement.x;
const dy = pointerCoords.y - draggingElement.y;
- const pressures = draggingElement.simulatePressure
- ? draggingElement.pressures
- : [...draggingElement.pressures, event.pressure];
+ const pressures =
+ draggingElement.simulatePressure
+ ? draggingElement.pressures
+ : [...draggingElement.pressures, event.pressure];
mutateElement(draggingElement, {
points: [...points, [dx, dy]],
@@ -3686,9 +3689,10 @@ class App extends React.Component<AppProps, AppState> {
dx += 0.0001;
}
- const pressures = draggingElement.simulatePressure
- ? []
- : [...draggingElement.pressures, childEvent.pressure];
+ const pressures =
+ draggingElement.simulatePressure
+ ? []
+ : [...draggingElement.pressures, childEvent.pressure];
mutateElement(draggingElement, {
points: [...points, [dx, dy]],
diff --git ORI/excalidraw/src/components/ContextMenu.tsx ALT/excalidraw/src/components/ContextMenu.tsx
index d64492f..566fad9 100644
--- ORI/excalidraw/src/components/ContextMenu.tsx
+++ ALT/excalidraw/src/components/ContextMenu.tsx
@@ -48,9 +48,8 @@ const ContextMenu = ({
}
const actionName = option.name;
- const label = option.contextItemLabel
- ? t(option.contextItemLabel)
- : "";
+ const label =
+ option.contextItemLabel ? t(option.contextItemLabel) : "";
return (
<li key={idx} data-testid={actionName} onClick={onCloseRequest}>
<button
diff --git ORI/excalidraw/src/components/ImageExportDialog.tsx ALT/excalidraw/src/components/ImageExportDialog.tsx
index 213f384..76dabb3 100644
--- ORI/excalidraw/src/components/ImageExportDialog.tsx
+++ ALT/excalidraw/src/components/ImageExportDialog.tsx
@@ -101,9 +101,8 @@ const ImageExportModal = ({
const previewRef = useRef<HTMLDivElement>(null);
const { exportBackground, viewBackgroundColor } = appState;
- const exportedElements = exportSelected
- ? getSelectedElements(elements, appState)
- : elements;
+ const exportedElements =
+ exportSelected ? getSelectedElements(elements, appState) : elements;
useEffect(() => {
setExportSelected(someElementIsSelected);
diff --git ORI/excalidraw/src/components/LayerUI.tsx ALT/excalidraw/src/components/LayerUI.tsx
index 9f65f97..7b9cd35 100644
--- ORI/excalidraw/src/components/LayerUI.tsx
+++ ALT/excalidraw/src/components/LayerUI.tsx
@@ -266,22 +266,23 @@ const LayerUI = ({
});
}, [setAppState]);
- const libraryMenu = appState.isLibraryOpen ? (
- <LibraryMenu
- pendingElements={getSelectedElements(elements, appState)}
- onClose={closeLibrary}
- onInsertShape={onInsertElements}
- onAddToLibrary={deselectItems}
- setAppState={setAppState}
- libraryReturnUrl={libraryReturnUrl}
- focusContainer={focusContainer}
- library={library}
- theme={appState.theme}
- files={files}
- id={id}
- appState={appState}
- />
- ) : null;
+ const libraryMenu =
+ appState.isLibraryOpen ? (
+ <LibraryMenu
+ pendingElements={getSelectedElements(elements, appState)}
+ onClose={closeLibrary}
+ onInsertShape={onInsertElements}
+ onAddToLibrary={deselectItems}
+ setAppState={setAppState}
+ libraryReturnUrl={libraryReturnUrl}
+ focusContainer={focusContainer}
+ library={library}
+ theme={appState.theme}
+ files={files}
+ id={id}
+ appState={appState}
+ />
+ ) : null;
const renderFixedSideContainer = () => {
const shouldRenderSelectedShapeActions = showSelectedShapeActions(
diff --git ORI/excalidraw/src/components/LibraryMenuItems.tsx ALT/excalidraw/src/components/LibraryMenuItems.tsx
index b2dd630..d872309 100644
--- ORI/excalidraw/src/components/LibraryMenuItems.tsx
+++ ALT/excalidraw/src/components/LibraryMenuItems.tsx
@@ -57,12 +57,14 @@ const LibraryMenuItems = ({
resetLibrary: () => void;
}) => {
const renderRemoveLibAlert = useCallback(() => {
- const content = selectedItems.length
- ? t("alerts.removeItemsFromsLibrary", { count: selectedItems.length })
- : t("alerts.resetLibrary");
- const title = selectedItems.length
- ? t("confirmDialog.removeItemsFromLib")
- : t("confirmDialog.resetLibrary");
+ const content =
+ selectedItems.length
+ ? t("alerts.removeItemsFromsLibrary", { count: selectedItems.length })
+ : t("alerts.resetLibrary");
+ const title =
+ selectedItems.length
+ ? t("confirmDialog.removeItemsFromLib")
+ : t("confirmDialog.resetLibrary");
return (
<ConfirmDialog
onConfirm={() => {
@@ -89,12 +91,12 @@ const LibraryMenuItems = ({
const renderLibraryActions = () => {
const itemsSelected = !!selectedItems.length;
- const items = itemsSelected
- ? libraryItems.filter((item) => selectedItems.includes(item.id))
- : libraryItems;
- const resetLabel = itemsSelected
- ? t("buttons.remove")
- : t("buttons.resetLibrary");
+ const items =
+ itemsSelected
+ ? libraryItems.filter((item) => selectedItems.includes(item.id))
+ : libraryItems;
+ const resetLabel =
+ itemsSelected ? t("buttons.remove") : t("buttons.resetLibrary");
return (
<div className="library-actions">
{(!itemsSelected || !isMobile) && (
@@ -128,9 +130,8 @@ const LibraryMenuItems = ({
aria-label={t("buttons.export")}
icon={exportToFileIcon}
onClick={async () => {
- const libraryItems = itemsSelected
- ? items
- : await library.loadLibrary();
+ const libraryItems =
+ itemsSelected ? items : await library.loadLibrary();
saveLibraryAsJSON(libraryItems)
.catch(muteFSAbortError)
.catch((error) => {
diff --git ORI/excalidraw/src/data/encode.ts ALT/excalidraw/src/data/encode.ts
index 1d5a595..d54b029 100644
--- ORI/excalidraw/src/data/encode.ts
+++ ALT/excalidraw/src/data/encode.ts
@@ -103,9 +103,8 @@ export const decode = async (data: EncodedData): Promise<string> => {
switch (data.encoding) {
case "bstring":
// if compressed, do not double decode the bstring
- decoded = data.compressed
- ? data.encoded
- : await byteStringToString(data.encoded);
+ decoded =
+ data.compressed ? data.encoded : await byteStringToString(data.encoded);
break;
default:
throw new Error(`decode: unknown encoding "${data.encoding}"`);
diff --git ORI/excalidraw/src/data/json.ts ALT/excalidraw/src/data/json.ts
index e7ce527..e4fa412 100644
--- ORI/excalidraw/src/data/json.ts
+++ ALT/excalidraw/src/data/json.ts
@@ -81,9 +81,8 @@ export const saveAsJSON = async (
name: appState.name,
extension: "excalidraw",
description: "Excalidraw file",
- fileHandle: isImageFileHandle(appState.fileHandle)
- ? null
- : appState.fileHandle,
+ fileHandle:
+ isImageFileHandle(appState.fileHandle) ? null : appState.fileHandle,
});
return { fileHandle };
};
diff --git ORI/excalidraw/src/data/restore.ts ALT/excalidraw/src/data/restore.ts
index cb316b4..7474a40 100644
--- ORI/excalidraw/src/data/restore.ts
+++ ALT/excalidraw/src/data/restore.ts
@@ -246,9 +246,10 @@ export const restoreAppState = (
return {
...nextAppState,
- elementType: AllowedExcalidrawElementTypes[nextAppState.elementType]
- ? nextAppState.elementType
- : "selection",
+ elementType:
+ AllowedExcalidrawElementTypes[nextAppState.elementType]
+ ? nextAppState.elementType
+ : "selection",
// Migrates from previous version where appState.zoom was a number
zoom:
typeof appState.zoom === "number"
diff --git ORI/excalidraw/src/element/linearElementEditor.ts ALT/excalidraw/src/element/linearElementEditor.ts
index 1d07660..3f519f8 100644
--- ORI/excalidraw/src/element/linearElementEditor.ts
+++ ALT/excalidraw/src/element/linearElementEditor.ts
@@ -138,17 +138,18 @@ export class LinearElementEditor {
: element.points[0],
);
}
- const bindingElement = isBindingEnabled(appState)
- ? getHoveredElementForBinding(
- tupleToCoors(
- LinearElementEditor.getPointAtIndexGlobalCoordinates(
- element,
- activePointIndex!,
+ const bindingElement =
+ isBindingEnabled(appState)
+ ? getHoveredElementForBinding(
+ tupleToCoors(
+ LinearElementEditor.getPointAtIndexGlobalCoordinates(
+ element,
+ activePointIndex!,
+ ),
),
- ),
- Scene.getScene(element)!,
- )
- : null;
+ Scene.getScene(element)!,
+ )
+ : null;
binding = {
[activePointIndex === 0 ? "startBindingElement" : "endBindingElement"]:
bindingElement,
@@ -263,12 +264,13 @@ export class LinearElementEditor {
editingLinearElement: {
...appState.editingLinearElement,
activePointIndex: clickedPointIndex > -1 ? clickedPointIndex : null,
- pointerOffset: targetPoint
- ? {
- x: scenePointer.x - targetPoint[0],
- y: scenePointer.y - targetPoint[1],
- }
- : { x: 0, y: 0 },
+ pointerOffset:
+ targetPoint
+ ? {
+ x: scenePointer.x - targetPoint[0],
+ y: scenePointer.y - targetPoint[1],
+ }
+ : { x: 0, y: 0 },
},
});
return ret;
diff --git ORI/excalidraw/src/element/transformHandles.ts ALT/excalidraw/src/element/transformHandles.ts
index b259509..f79175c 100644
--- ORI/excalidraw/src/element/transformHandles.ts
+++ ALT/excalidraw/src/element/transformHandles.ts
@@ -99,65 +99,70 @@ export const getTransformHandlesFromCoords = (
const centeringOffset = (size - 8) / (2 * zoom.value);
const transformHandles: TransformHandles = {
- nw: omitSides.nw
- ? undefined
- : generateTransformHandle(
- x1 - dashedLineMargin - handleMarginX + centeringOffset,
- y1 - dashedLineMargin - handleMarginY + centeringOffset,
- handleWidth,
- handleHeight,
- cx,
- cy,
- angle,
- ),
- ne: omitSides.ne
- ? undefined
- : generateTransformHandle(
- x2 + dashedLineMargin - centeringOffset,
- y1 - dashedLineMargin - handleMarginY + centeringOffset,
- handleWidth,
- handleHeight,
- cx,
- cy,
- angle,
- ),
- sw: omitSides.sw
- ? undefined
- : generateTransformHandle(
- x1 - dashedLineMargin - handleMarginX + centeringOffset,
- y2 + dashedLineMargin - centeringOffset,
- handleWidth,
- handleHeight,
- cx,
- cy,
- angle,
- ),
- se: omitSides.se
- ? undefined
- : generateTransformHandle(
- x2 + dashedLineMargin - centeringOffset,
- y2 + dashedLineMargin - centeringOffset,
- handleWidth,
- handleHeight,
- cx,
- cy,
- angle,
- ),
- rotation: omitSides.rotation
- ? undefined
- : generateTransformHandle(
- x1 + width / 2 - handleWidth / 2,
- y1 -
- dashedLineMargin -
- handleMarginY +
- centeringOffset -
- ROTATION_RESIZE_HANDLE_GAP / zoom.value,
- handleWidth,
- handleHeight,
- cx,
- cy,
- angle,
- ),
+ nw:
+ omitSides.nw
+ ? undefined
+ : generateTransformHandle(
+ x1 - dashedLineMargin - handleMarginX + centeringOffset,
+ y1 - dashedLineMargin - handleMarginY + centeringOffset,
+ handleWidth,
+ handleHeight,
+ cx,
+ cy,
+ angle,
+ ),
+ ne:
+ omitSides.ne
+ ? undefined
+ : generateTransformHandle(
+ x2 + dashedLineMargin - centeringOffset,
+ y1 - dashedLineMargin - handleMarginY + centeringOffset,
+ handleWidth,
+ handleHeight,
+ cx,
+ cy,
+ angle,
+ ),
+ sw:
+ omitSides.sw
+ ? undefined
+ : generateTransformHandle(
+ x1 - dashedLineMargin - handleMarginX + centeringOffset,
+ y2 + dashedLineMargin - centeringOffset,
+ handleWidth,
+ handleHeight,
+ cx,
+ cy,
+ angle,
+ ),
+ se:
+ omitSides.se
+ ? undefined
+ : generateTransformHandle(
+ x2 + dashedLineMargin - centeringOffset,
+ y2 + dashedLineMargin - centeringOffset,
+ handleWidth,
+ handleHeight,
+ cx,
+ cy,
+ angle,
+ ),
+ rotation:
+ omitSides.rotation
+ ? undefined
+ : generateTransformHandle(
+ x1 + width / 2 - handleWidth / 2,
+ y1 -
+ dashedLineMargin -
+ handleMarginY +
+ centeringOffset -
+ ROTATION_RESIZE_HANDLE_GAP / zoom.value,
+ handleWidth,
+ handleHeight,
+ cx,
+ cy,
+ angle,
+ ),
};
// We only want to show height handles (all cardinal directions) above a certain size
diff --git ORI/excalidraw/src/excalidraw-app/collab/reconciliation.ts ALT/excalidraw/src/excalidraw-app/collab/reconciliation.ts
index 4c9019f..95a1ab4 100644
--- ORI/excalidraw/src/excalidraw-app/collab/reconciliation.ts
+++ ALT/excalidraw/src/excalidraw-app/collab/reconciliation.ts
@@ -109,9 +109,8 @@ export const reconcileElements = (
cursor++;
}
} else {
- let idx = localElementsData[parent]
- ? localElementsData[parent]![1]
- : null;
+ let idx =
+ localElementsData[parent] ? localElementsData[parent]![1] : null;
if (idx != null) {
idx += offset;
}
diff --git ORI/excalidraw/src/excalidraw-app/index.tsx ALT/excalidraw/src/excalidraw-app/index.tsx
index 915e386..9c46e47 100644
--- ORI/excalidraw/src/excalidraw-app/index.tsx
+++ ALT/excalidraw/src/excalidraw-app/index.tsx
@@ -502,9 +502,10 @@ const ExcalidrawWrapper = () => {
exportedElements,
{
...appState,
- viewBackgroundColor: appState.exportBackground
- ? appState.viewBackgroundColor
- : getDefaultAppState().viewBackgroundColor,
+ viewBackgroundColor:
+ appState.exportBackground
+ ? appState.viewBackgroundColor
+ : getDefaultAppState().viewBackgroundColor,
},
files,
);
diff --git ORI/excalidraw/src/excalidraw-app/sentry.ts ALT/excalidraw/src/excalidraw-app/sentry.ts
index 04b3246..03561b7 100644
--- ORI/excalidraw/src/excalidraw-app/sentry.ts
+++ ALT/excalidraw/src/excalidraw-app/sentry.ts
@@ -17,9 +17,10 @@ const onlineEnv =
);
Sentry.init({
- dsn: onlineEnv
- ? "https://[email protected]/5179260"
- : undefined,
+ dsn:
+ onlineEnv
+ ? "https://[email protected]/5179260"
+ : undefined,
environment: onlineEnv ? SentryEnvHostnameMap[onlineEnv] : undefined,
release: process.env.REACT_APP_GIT_SHA,
ignoreErrors: [
diff --git ORI/excalidraw/src/groups.ts ALT/excalidraw/src/groups.ts
index f374e81..0bc1de9 100644
--- ORI/excalidraw/src/groups.ts
+++ ALT/excalidraw/src/groups.ts
@@ -126,9 +126,8 @@ export const getNewGroupIdsForDuplication = (
mapper: (groupId: GroupId) => GroupId,
) => {
const copy = [...groupIds];
- const positionOfEditingGroupId = editingGroupId
- ? groupIds.indexOf(editingGroupId)
- : -1;
+ const positionOfEditingGroupId =
+ editingGroupId ? groupIds.indexOf(editingGroupId) : -1;
const endIndex =
positionOfEditingGroupId > -1 ? positionOfEditingGroupId : groupIds.length;
for (let index = 0; index < endIndex; index++) {
@@ -145,9 +144,8 @@ export const addToGroup = (
) => {
// insert before the editingGroupId, or push to the end.
const groupIds = [...prevGroupIds];
- const positionOfEditingGroupId = editingGroupId
- ? groupIds.indexOf(editingGroupId)
- : -1;
+ const positionOfEditingGroupId =
+ editingGroupId ? groupIds.indexOf(editingGroupId) : -1;
const positionToInsert =
positionOfEditingGroupId > -1 ? positionOfEditingGroupId : groupIds.length;
groupIds.splice(positionToInsert, 0, newGroupId);
diff --git ORI/excalidraw/src/i18n.ts ALT/excalidraw/src/i18n.ts
index 8eaf129..301ac76 100644
--- ORI/excalidraw/src/i18n.ts
+++ ALT/excalidraw/src/i18n.ts
@@ -110,9 +110,10 @@ export const t = (
replacement?: { [key: string]: string | number },
) => {
if (currentLang.code.startsWith(TEST_LANG_CODE)) {
- const name = replacement
- ? `${path}(${JSON.stringify(replacement).slice(1, -1)})`
- : path;
+ const name =
+ replacement
+ ? `${path}(${JSON.stringify(replacement).slice(1, -1)})`
+ : path;
return `\u{202a}[[${name}]]\u{202c}`;
}
diff --git ORI/excalidraw/src/renderer/renderElement.ts ALT/excalidraw/src/renderer/renderElement.ts
index 6fa5431..a17ae4b 100644
--- ORI/excalidraw/src/renderer/renderElement.ts
+++ ALT/excalidraw/src/renderer/renderElement.ts
@@ -228,9 +228,10 @@ const drawElementOnCanvas = (
break;
}
case "image": {
- const img = isInitializedImageElement(element)
- ? renderConfig.imageCache.get(element.fileId)?.image
- : undefined;
+ const img =
+ isInitializedImageElement(element)
+ ? renderConfig.imageCache.get(element.fileId)?.image
+ : undefined;
if (img != null && !(img instanceof Promise)) {
context.drawImage(
img,
@@ -968,11 +969,12 @@ export function getFreeDrawPath2D(element: ExcalidrawFreeDrawElement) {
export function getFreeDrawSvgPath(element: ExcalidrawFreeDrawElement) {
// If input points are empty (should they ever be?) return a dot
- const inputPoints = element.simulatePressure
- ? element.points
- : element.points.length
- ? element.points.map(([x, y], i) => [x, y, element.pressures[i]])
- : [[0, 0, 0.5]];
+ const inputPoints =
+ element.simulatePressure
+ ? element.points
+ : element.points.length
+ ? element.points.map(([x, y], i) => [x, y, element.pressures[i]])
+ : [[0, 0, 0.5]];
// Consider changing the options for simulated pressure vs real pressure
const options: StrokeOptions = {
diff --git ORI/excalidraw/src/renderer/renderScene.ts ALT/excalidraw/src/renderer/renderScene.ts
index 9fddadd..85ed2f8 100644
--- ORI/excalidraw/src/renderer/renderScene.ts
+++ ALT/excalidraw/src/renderer/renderScene.ts
@@ -654,9 +654,10 @@ const renderBindingHighlight = (
renderConfig: RenderConfig,
suggestedBinding: SuggestedBinding,
) => {
- const renderHighlight = Array.isArray(suggestedBinding)
- ? renderBindingHighlightForSuggestedPointBinding
- : renderBindingHighlightForBindableElement;
+ const renderHighlight =
+ Array.isArray(suggestedBinding)
+ ? renderBindingHighlightForSuggestedPointBinding
+ : renderBindingHighlightForBindableElement;
context.save();
context.translate(renderConfig.scrollX, renderConfig.scrollY);
diff --git ORI/excalidraw/src/scene/scrollbars.ts ALT/excalidraw/src/scene/scrollbars.ts
index c36acde..cc70adb 100644
--- ORI/excalidraw/src/scene/scrollbars.ts
+++ ALT/excalidraw/src/scene/scrollbars.ts
@@ -86,11 +86,12 @@ export const getScrollBars = (
viewportMinY === sceneMinY && viewportMaxY === sceneMaxY
? null
: {
- x: isRTL
- ? Math.max(safeArea.left, SCROLLBAR_MARGIN)
- : viewportWidth -
- SCROLLBAR_WIDTH -
- Math.max(safeArea.right, SCROLLBAR_MARGIN),
+ x:
+ isRTL
+ ? Math.max(safeArea.left, SCROLLBAR_MARGIN)
+ : viewportWidth -
+ SCROLLBAR_WIDTH -
+ Math.max(safeArea.right, SCROLLBAR_MARGIN),
y:
((viewportMinY - sceneMinY) / (sceneMaxY - sceneMinY)) *
viewportHeight +
diff --git ORI/excalidraw/src/tests/helpers/api.ts ALT/excalidraw/src/tests/helpers/api.ts
index 557d9e8..9655ad9 100644
--- ORI/excalidraw/src/tests/helpers/api.ts
+++ ALT/excalidraw/src/tests/helpers/api.ts
@@ -175,9 +175,10 @@ export class API {
filepath: string,
encoding?: T,
): Promise<T extends "utf8" ? string : Buffer> => {
- filepath = path.isAbsolute(filepath)
- ? filepath
- : path.resolve(path.join(__dirname, "../", filepath));
+ filepath =
+ path.isAbsolute(filepath)
+ ? filepath
+ : path.resolve(path.join(__dirname, "../", filepath));
return readFile(filepath, { encoding }) as any;
};
diff --git ORI/excalidraw/src/zindex.ts ALT/excalidraw/src/zindex.ts
index ac9cf7d..f0d922c 100644
--- ORI/excalidraw/src/zindex.ts
+++ ALT/excalidraw/src/zindex.ts
@@ -97,11 +97,12 @@ const getTargetIndex = (
return candidateIndex;
}
- const siblingGroupId = appState.editingGroupId
- ? nextElement.groupIds[
- nextElement.groupIds.indexOf(appState.editingGroupId) - 1
- ]
- : nextElement.groupIds[nextElement.groupIds.length - 1];
+ const siblingGroupId =
+ appState.editingGroupId
+ ? nextElement.groupIds[
+ nextElement.groupIds.indexOf(appState.editingGroupId) - 1
+ ]
+ : nextElement.groupIds[nextElement.groupIds.length - 1];
const elementsInSiblingGroup = getElementsInGroup(elements, siblingGroupId);
|
|
prettier/prettier#12087 VS prettier/prettier@main :: prettier/prettier@0e42acb Diff (954 lines)diff --git ORI/prettier/jest.config.js ALT/prettier/jest.config.js
index cef136f..e5d523f 100644
--- ORI/prettier/jest.config.js
+++ ALT/prettier/jest.config.js
@@ -9,9 +9,8 @@ const ENABLE_CODE_COVERAGE = Boolean(process.env.ENABLE_CODE_COVERAGE);
const TEST_STANDALONE = Boolean(process.env.TEST_STANDALONE);
const INSTALL_PACKAGE = Boolean(process.env.INSTALL_PACKAGE);
-let PRETTIER_DIR = isProduction
- ? path.join(PROJECT_ROOT, "dist")
- : PROJECT_ROOT;
+let PRETTIER_DIR =
+ isProduction ? path.join(PROJECT_ROOT, "dist") : PROJECT_ROOT;
if (INSTALL_PACKAGE || (isProduction && !TEST_STANDALONE)) {
PRETTIER_DIR = installPrettier(PRETTIER_DIR);
}
diff --git ORI/prettier/scripts/build-website.mjs ALT/prettier/scripts/build-website.mjs
index 8ec0afa..91f3278 100644
--- ORI/prettier/scripts/build-website.mjs
+++ ALT/prettier/scripts/build-website.mjs
@@ -24,9 +24,8 @@ const runYarn = (command, args, options) =>
...options,
});
const IS_PULL_REQUEST = process.env.PULL_REQUEST === "true";
-const PRETTIER_DIR = IS_PULL_REQUEST
- ? DIST_DIR
- : path.dirname(require.resolve("prettier"));
+const PRETTIER_DIR =
+ IS_PULL_REQUEST ? DIST_DIR : path.dirname(require.resolve("prettier"));
const PLAYGROUND_PRETTIER_DIR = path.join(WEBSITE_DIR, "static/lib");
async function buildPrettier() {
diff --git ORI/prettier/scripts/utils/changelog.mjs ALT/prettier/scripts/utils/changelog.mjs
index 92fdcb8..fa82ca2 100644
--- ORI/prettier/scripts/utils/changelog.mjs
+++ ALT/prettier/scripts/utils/changelog.mjs
@@ -28,13 +28,14 @@ export function getEntries(dirPath) {
const improvement = title.match(/\[IMPROVEMENT(:(\d+))?]/);
- const section = title.includes("[HIGHLIGHT]")
- ? "highlight"
- : title.includes("[BREAKING]")
- ? "breaking"
- : improvement
- ? "improvement"
- : undefined;
+ const section =
+ title.includes("[HIGHLIGHT]")
+ ? "highlight"
+ : title.includes("[BREAKING]")
+ ? "breaking"
+ : improvement
+ ? "improvement"
+ : undefined;
const order =
section === "improvement" && improvement[2] !== undefined
diff --git ORI/prettier/src/cli/format.js ALT/prettier/src/cli/format.js
index df9055c..1ff57e3 100644
--- ORI/prettier/src/cli/format.js
+++ ALT/prettier/src/cli/format.js
@@ -241,16 +241,18 @@ async function createIgnorerFromContextOrDie(context) {
}
async function formatStdin(context) {
- const filepath = context.argv["stdin-filepath"]
- ? path.resolve(process.cwd(), context.argv["stdin-filepath"])
- : process.cwd();
+ const filepath =
+ context.argv["stdin-filepath"]
+ ? path.resolve(process.cwd(), context.argv["stdin-filepath"])
+ : process.cwd();
const ignorer = await createIgnorerFromContextOrDie(context);
// If there's an ignore-path set, the filename must be relative to the
// ignore path, not the current working directory.
- const relativeFilepath = context.argv["ignore-path"]
- ? path.relative(path.dirname(context.argv["ignore-path"]), filepath)
- : path.relative(process.cwd(), filepath);
+ const relativeFilepath =
+ context.argv["ignore-path"]
+ ? path.relative(path.dirname(context.argv["ignore-path"]), filepath)
+ : path.relative(process.cwd(), filepath);
try {
const input = await getStdin();
@@ -297,9 +299,10 @@ async function formatFiles(context) {
const filename = pathOrError;
// If there's an ignore-path set, the filename must be relative to the
// ignore path, not the current working directory.
- const ignoreFilename = context.argv["ignore-path"]
- ? path.relative(path.dirname(context.argv["ignore-path"]), filename)
- : filename;
+ const ignoreFilename =
+ context.argv["ignore-path"]
+ ? path.relative(path.dirname(context.argv["ignore-path"]), filename)
+ : filename;
const fileIgnored = ignorer.ignores(fixWindowsSlashes(ignoreFilename));
if (
diff --git ORI/prettier/src/common/create-ignorer.js ALT/prettier/src/common/create-ignorer.js
index 677ca87..e086543 100644
--- ORI/prettier/src/common/create-ignorer.js
+++ ALT/prettier/src/common/create-ignorer.js
@@ -9,9 +9,8 @@ const getFileContentOrNull = require("../utils/get-file-content-or-null.js");
* @param {boolean?} withNodeModules
*/
async function createIgnorer(ignorePath, withNodeModules) {
- const ignoreContent = ignorePath
- ? await getFileContentOrNull(path.resolve(ignorePath))
- : null;
+ const ignoreContent =
+ ignorePath ? await getFileContentOrNull(path.resolve(ignorePath)) : null;
return _createIgnorer(ignoreContent, withNodeModules);
}
@@ -21,9 +20,8 @@ async function createIgnorer(ignorePath, withNodeModules) {
* @param {boolean?} withNodeModules
*/
createIgnorer.sync = function (ignorePath, withNodeModules) {
- const ignoreContent = !ignorePath
- ? null
- : getFileContentOrNull.sync(path.resolve(ignorePath));
+ const ignoreContent =
+ !ignorePath ? null : getFileContentOrNull.sync(path.resolve(ignorePath));
return _createIgnorer(ignoreContent, withNodeModules);
};
diff --git ORI/prettier/src/config/resolve-config.js ALT/prettier/src/config/resolve-config.js
index 5c0c091..c103b2f 100644
--- ORI/prettier/src/config/resolve-config.js
+++ ALT/prettier/src/config/resolve-config.js
@@ -167,9 +167,8 @@ function mergeOverrides(configResult, filePath) {
// Based on eslint: https://github.com/eslint/eslint/blob/master/lib/config/config-ops.js
function pathMatchesGlobs(filePath, patterns, excludedPatterns = []) {
const patternList = Array.isArray(patterns) ? patterns : [patterns];
- const excludedPatternList = Array.isArray(excludedPatterns)
- ? excludedPatterns
- : [excludedPatterns];
+ const excludedPatternList =
+ Array.isArray(excludedPatterns) ? excludedPatterns : [excludedPatterns];
const opts = { matchBase: true, dot: true };
return (
diff --git ORI/prettier/src/document/doc-utils.js ALT/prettier/src/document/doc-utils.js
index 015cf6e..88f17ea 100644
--- ORI/prettier/src/document/doc-utils.js
+++ ALT/prettier/src/document/doc-utils.js
@@ -313,9 +313,8 @@ function cleanDocFn(doc) {
if (!part) {
continue;
}
- const [currentPart, ...restParts] = isConcat(part)
- ? getDocParts(part)
- : [part];
+ const [currentPart, ...restParts] =
+ isConcat(part) ? getDocParts(part) : [part];
if (typeof currentPart === "string" && typeof getLast(parts) === "string") {
parts[parts.length - 1] += currentPart;
} else {
diff --git ORI/prettier/src/language-css/parser-postcss.js ALT/prettier/src/language-css/parser-postcss.js
index 69f687d..da0b3ba 100644
--- ORI/prettier/src/language-css/parser-postcss.js
+++ ALT/prettier/src/language-css/parser-postcss.js
@@ -307,11 +307,12 @@ function parseNestedCSS(node, options) {
let selector = "";
if (typeof node.selector === "string") {
- selector = node.raws.selector
- ? node.raws.selector.scss
+ selector =
+ node.raws.selector
? node.raws.selector.scss
- : node.raws.selector.raw
- : node.selector;
+ ? node.raws.selector.scss
+ : node.raws.selector.raw
+ : node.selector;
if (node.raws.between && node.raws.between.trim().length > 0) {
selector += node.raws.between;
@@ -323,11 +324,12 @@ function parseNestedCSS(node, options) {
let value = "";
if (typeof node.value === "string") {
- value = node.raws.value
- ? node.raws.value.scss
+ value =
+ node.raws.value
? node.raws.value.scss
- : node.raws.value.raw
- : node.value;
+ ? node.raws.value.scss
+ : node.raws.value.raw
+ : node.value;
value = value.trim();
@@ -337,11 +339,12 @@ function parseNestedCSS(node, options) {
let params = "";
if (typeof node.params === "string") {
- params = node.raws.params
- ? node.raws.params.scss
+ params =
+ node.raws.params
? node.raws.params.scss
- : node.raws.params.raw
- : node.params;
+ ? node.raws.params.scss
+ : node.raws.params.raw
+ : node.params;
if (node.raws.afterName && node.raws.afterName.trim().length > 0) {
params = node.raws.afterName + params;
@@ -621,9 +624,8 @@ function parseWithParser(parse, text, options) {
// TODO: make this only work on css
function parseCss(text, parsers, options = {}) {
const isSCSSParser = isSCSS(options.parser, text);
- const parseFunctions = isSCSSParser
- ? [parseScss, parseLess]
- : [parseLess, parseScss];
+ const parseFunctions =
+ isSCSSParser ? [parseScss, parseLess] : [parseLess, parseScss];
let error;
for (const parse of parseFunctions) {
diff --git ORI/prettier/src/language-css/printer-postcss.js ALT/prettier/src/language-css/printer-postcss.js
index 5758ba8..cac9ce8 100644
--- ORI/prettier/src/language-css/printer-postcss.js
+++ ALT/prettier/src/language-css/printer-postcss.js
@@ -144,9 +144,8 @@ function genericPrint(path, options, print) {
const trimmedBetween = rawBetween.trim();
const isColon = trimmedBetween === ":";
- let value = hasComposesNode(node)
- ? removeLines(print("value"))
- : print("value");
+ let value =
+ hasComposesNode(node) ? removeLines(print("value")) : print("value");
if (!isColon && lastLineHasInlineComment(trimmedBetween)) {
value = indent([hardline, dedent(value)]);
diff --git ORI/prettier/src/language-css/utils.js ALT/prettier/src/language-css/utils.js
index df9a586..65e15b3 100644
--- ORI/prettier/src/language-css/utils.js
+++ ALT/prettier/src/language-css/utils.js
@@ -150,9 +150,10 @@ function insideICSSRuleNode(path) {
}
function insideAtRuleNode(path, atRuleNameOrAtRuleNames) {
- const atRuleNames = Array.isArray(atRuleNameOrAtRuleNames)
- ? atRuleNameOrAtRuleNames
- : [atRuleNameOrAtRuleNames];
+ const atRuleNames =
+ Array.isArray(atRuleNameOrAtRuleNames)
+ ? atRuleNameOrAtRuleNames
+ : [atRuleNameOrAtRuleNames];
const atRuleAncestorNode = getAncestorNode(path, "css-atrule");
return (
diff --git ORI/prettier/src/language-handlebars/printer-glimmer.js ALT/prettier/src/language-handlebars/printer-glimmer.js
index 49df8a0..ec7733e 100644
--- ORI/prettier/src/language-handlebars/printer-glimmer.js
+++ ALT/prettier/src/language-handlebars/printer-glimmer.js
@@ -154,17 +154,18 @@ function print(path, options, print) {
// Let's assume quotes inside the content of text nodes are already
// properly escaped with entities, otherwise the parse wouldn't have parsed them.
- const quote = isText
- ? getPreferredQuote(node.value.chars, favoriteQuote).quote
- : node.value.type === "ConcatStatement"
- ? getPreferredQuote(
- node.value.parts
- .filter((part) => part.type === "TextNode")
- .map((part) => part.chars)
- .join(""),
- favoriteQuote
- ).quote
- : "";
+ const quote =
+ isText
+ ? getPreferredQuote(node.value.chars, favoriteQuote).quote
+ : node.value.type === "ConcatStatement"
+ ? getPreferredQuote(
+ node.value.parts
+ .filter((part) => part.type === "TextNode")
+ .map((part) => part.chars)
+ .join(""),
+ favoriteQuote
+ ).quote
+ : "";
const valueDoc = print("value");
@@ -577,9 +578,8 @@ function printCloseBlock(path, print, options) {
const node = path.getValue();
if (options.htmlWhitespaceSensitivity === "ignore") {
- const escape = blockStatementHasOnlyWhitespaceInProgram(node)
- ? softline
- : hardline;
+ const escape =
+ blockStatementHasOnlyWhitespaceInProgram(node) ? softline : hardline;
return [
escape,
diff --git ORI/prettier/src/language-html/embed.js ALT/prettier/src/language-html/embed.js
index 7c3f85b..d3452fa 100644
--- ORI/prettier/src/language-html/embed.js
+++ ALT/prettier/src/language-html/embed.js
@@ -129,9 +129,10 @@ function printEmbeddedAttributeValue(node, originalTextToDoc, options) {
const value = getValue();
return printMaybeHug(
attributeTextToDoc(value, {
- parser: isVueEventBindingExpression(value)
- ? "__js_expression"
- : "__vue_event_binding",
+ parser:
+ isVueEventBindingExpression(value)
+ ? "__js_expression"
+ : "__vue_event_binding",
})
);
}
diff --git ORI/prettier/src/language-html/parser-html.js ALT/prettier/src/language-html/parser-html.js
index a7494dc..aeb5000 100644
--- ORI/prettier/src/language-html/parser-html.js
+++ ALT/prettier/src/language-html/parser-html.js
@@ -168,15 +168,13 @@ function ngHtmlParser(
* @param {Attribute | Element} node
*/
const restoreName = (node) => {
- const namespace = node.name.startsWith(":")
- ? node.name.slice(1).split(":")[0]
- : null;
+ const namespace =
+ node.name.startsWith(":") ? node.name.slice(1).split(":")[0] : null;
const rawName = node.nameSpan.toString();
const hasExplicitNamespace =
namespace !== null && rawName.startsWith(`${namespace}:`);
- const name = hasExplicitNamespace
- ? rawName.slice(namespace.length + 1)
- : rawName;
+ const name =
+ hasExplicitNamespace ? rawName.slice(namespace.length + 1) : rawName;
node.name = name;
node.namespace = namespace;
@@ -296,9 +294,10 @@ function ngHtmlParser(
* @param {boolean} shouldParseFrontMatter
*/
function _parse(text, options, parserOptions, shouldParseFrontMatter = true) {
- const { frontMatter, content } = shouldParseFrontMatter
- ? parseFrontMatter(text)
- : { frontMatter: null, content: text };
+ const { frontMatter, content } =
+ shouldParseFrontMatter
+ ? parseFrontMatter(text)
+ : { frontMatter: null, content: text };
const file = new ParseSourceFile(text, options.filepath);
const start = new ParseLocation(file, 0, 0, 0);
diff --git ORI/prettier/src/language-html/print/children.js ALT/prettier/src/language-html/print/children.js
index 02d97a5..107f5fe 100644
--- ORI/prettier/src/language-html/print/children.js
+++ ALT/prettier/src/language-html/print/children.js
@@ -116,9 +116,8 @@ function printChildren(path, options, print) {
...path.map((childPath) => {
const childNode = childPath.getValue();
- const prevBetweenLine = !childNode.prev
- ? ""
- : printBetweenLine(childNode.prev, childNode);
+ const prevBetweenLine =
+ !childNode.prev ? "" : printBetweenLine(childNode.prev, childNode);
return [
!prevBetweenLine
? ""
@@ -154,13 +153,11 @@ function printChildren(path, options, print) {
const trailingParts = [];
const nextParts = [];
- const prevBetweenLine = childNode.prev
- ? printBetweenLine(childNode.prev, childNode)
- : "";
+ const prevBetweenLine =
+ childNode.prev ? printBetweenLine(childNode.prev, childNode) : "";
- const nextBetweenLine = childNode.next
- ? printBetweenLine(childNode, childNode.next)
- : "";
+ const nextBetweenLine =
+ childNode.next ? printBetweenLine(childNode, childNode.next) : "";
if (prevBetweenLine) {
if (forceNextEmptyLine(childNode.prev)) {
diff --git ORI/prettier/src/language-html/print/element.js ALT/prettier/src/language-html/print/element.js
index 98f63c0..345891f 100644
--- ORI/prettier/src/language-html/print/element.js
+++ ALT/prettier/src/language-html/print/element.js
@@ -116,9 +116,10 @@ function printElement(path, options, print) {
};
const printLineAfterChildren = () => {
- const needsToBorrow = node.next
- ? needsToBorrowPrevClosingTagEndMarker(node.next)
- : needsToBorrowLastChildClosingTagEndMarker(node.parent);
+ const needsToBorrow =
+ node.next
+ ? needsToBorrowPrevClosingTagEndMarker(node.next)
+ : needsToBorrowLastChildClosingTagEndMarker(node.parent);
if (needsToBorrow) {
if (
node.lastChild.hasTrailingSpaces &&
diff --git ORI/prettier/src/language-html/printer-html.js ALT/prettier/src/language-html/printer-html.js
index 101dce2..9cdbfb0 100644
--- ORI/prettier/src/language-html/printer-html.js
+++ ALT/prettier/src/language-html/printer-html.js
@@ -57,9 +57,10 @@ function genericPrint(path, options, print) {
// replace the trailing literalline with hardline for better readability
const trailingNewlineRegex = /\n[^\S\n]*?$/;
const hasTrailingNewline = trailingNewlineRegex.test(node.value);
- const value = hasTrailingNewline
- ? node.value.replace(trailingNewlineRegex, "")
- : node.value;
+ const value =
+ hasTrailingNewline
+ ? node.value.replace(trailingNewlineRegex, "")
+ : node.value;
return [
...replaceTextEndOfLine(value),
hasTrailingNewline ? hardline : "",
diff --git ORI/prettier/src/language-js/parse/babel.js ALT/prettier/src/language-js/parse/babel.js
index 1b2492f..b2f885c 100644
--- ORI/prettier/src/language-js/parse/babel.js
+++ ALT/prettier/src/language-js/parse/babel.js
@@ -124,9 +124,10 @@ function createParse(parseMethod, ...optionsCombinations) {
const shouldEnableV8intrinsicPlugin = /%[A-Z]/.test(text);
if (text.includes("|>")) {
- const conflictsPlugins = shouldEnableV8intrinsicPlugin
- ? [...pipelineOperatorPlugins, v8intrinsicPlugin]
- : pipelineOperatorPlugins;
+ const conflictsPlugins =
+ shouldEnableV8intrinsicPlugin
+ ? [...pipelineOperatorPlugins, v8intrinsicPlugin]
+ : pipelineOperatorPlugins;
combinations = conflictsPlugins.flatMap((pipelineOperatorPlugin) =>
combinations.map((options) =>
appendPlugins([pipelineOperatorPlugin], options)
diff --git ORI/prettier/src/language-js/print/array.js ALT/prettier/src/language-js/print/array.js
index 632ea7b..2f0eb72 100644
--- ORI/prettier/src/language-js/print/array.js
+++ ALT/prettier/src/language-js/print/array.js
@@ -82,15 +82,16 @@ function printArray(path, options, print) {
const shouldUseConciseFormatting = isConciselyPrintedArray(node, options);
- const trailingComma = !canHaveTrailingComma
- ? ""
- : needsForcedTrailingComma
- ? ","
- : !shouldPrintComma(options)
- ? ""
- : shouldUseConciseFormatting
- ? ifBreak(",", "", { groupId })
- : ifBreak(",");
+ const trailingComma =
+ !canHaveTrailingComma
+ ? ""
+ : needsForcedTrailingComma
+ ? ","
+ : !shouldPrintComma(options)
+ ? ""
+ : shouldUseConciseFormatting
+ ? ifBreak(",", "", { groupId })
+ : ifBreak(",");
parts.push(
group(
diff --git ORI/prettier/src/language-js/print/assignment.js ALT/prettier/src/language-js/print/assignment.js
index a448e51..02f43ea 100644
--- ORI/prettier/src/language-js/print/assignment.js
+++ ALT/prettier/src/language-js/print/assignment.js
@@ -445,9 +445,8 @@ function isCallExpressionWithComplexTypeArguments(node, print) {
return true;
}
}
- const typeArgsKeyName = node.typeParameters
- ? "typeParameters"
- : "typeArguments";
+ const typeArgsKeyName =
+ node.typeParameters ? "typeParameters" : "typeArguments";
if (willBreak(print(typeArgsKeyName))) {
return true;
}
diff --git ORI/prettier/src/language-js/print/binaryish.js ALT/prettier/src/language-js/print/binaryish.js
index 1b71976..23f5f6e 100644
--- ORI/prettier/src/language-js/print/binaryish.js
+++ ALT/prettier/src/language-js/print/binaryish.js
@@ -257,19 +257,20 @@ function printBinaryishExpressions(
right = [operator, " ", print("right"), rightSuffix];
} else {
const isHackPipeline = isEnabledHackPipeline(options) && operator === "|>";
- const rightContent = isHackPipeline
- ? path.call(
- (left) =>
- printBinaryishExpressions(
- left,
- print,
- options,
- /* isNested */ true,
- isInsideParenthesis
- ),
- "right"
- )
- : print("right");
+ const rightContent =
+ isHackPipeline
+ ? path.call(
+ (left) =>
+ printBinaryishExpressions(
+ left,
+ print,
+ options,
+ /* isNested */ true,
+ isInsideParenthesis
+ ),
+ "right"
+ )
+ : print("right");
right = [
lineBeforeOperator ? line : "",
operator,
diff --git ORI/prettier/src/language-js/print/flow.js ALT/prettier/src/language-js/print/flow.js
index 090d9ad..bd98e3f 100644
--- ORI/prettier/src/language-js/print/flow.js
+++ ALT/prettier/src/language-js/print/flow.js
@@ -194,11 +194,12 @@ function printFlow(path, options, print) {
case "EnumDefaultedMember":
return print("id");
case "FunctionTypeParam": {
- const name = node.name
- ? print("name")
- : path.getParentNode().this === node
- ? "this"
- : "";
+ const name =
+ node.name
+ ? print("name")
+ : path.getParentNode().this === node
+ ? "this"
+ : "";
return [
name,
printOptionalToken(path),
diff --git ORI/prettier/src/language-js/print/function-parameters.js ALT/prettier/src/language-js/print/function-parameters.js
index 1d9a29a..6daec02 100644
--- ORI/prettier/src/language-js/print/function-parameters.js
+++ ALT/prettier/src/language-js/print/function-parameters.js
@@ -32,9 +32,8 @@ function printFunctionParameters(
) {
const functionNode = path.getValue();
const parameters = getFunctionParameters(functionNode);
- const typeParams = printTypeParams
- ? printFunctionTypeParameters(path, options, print)
- : "";
+ const typeParams =
+ printTypeParams ? printFunctionTypeParameters(path, options, print) : "";
if (parameters.length === 0) {
return [
diff --git ORI/prettier/src/language-js/print/jsx.js ALT/prettier/src/language-js/print/jsx.js
index 42fcc57..0b5645f 100644
--- ORI/prettier/src/language-js/print/jsx.js
+++ ALT/prettier/src/language-js/print/jsx.js
@@ -115,9 +115,8 @@ function printJsxElementInternal(path, options, print) {
const isMdxBlock = path.getParentNode().rootMarker === "mdx";
const rawJsxWhitespace = options.singleQuote ? "{' '}" : '{" "}';
- const jsxWhitespace = isMdxBlock
- ? " "
- : ifBreak([rawJsxWhitespace, softline], " ");
+ const jsxWhitespace =
+ isMdxBlock ? " " : ifBreak([rawJsxWhitespace, softline], " ");
const isFacebookTranslationTag =
node.openingElement &&
@@ -231,9 +230,10 @@ function printJsxElementInternal(path, options, print) {
// If there is text we use `fill` to fit as much onto each line as possible.
// When there is no text (just tags and expressions) we use `group`
// to output each on a separate line.
- const content = containsText
- ? fill(multilineChildren)
- : group(multilineChildren, { shouldBreak: true });
+ const content =
+ containsText
+ ? fill(multilineChildren)
+ : group(multilineChildren, { shouldBreak: true });
if (isMdxBlock) {
return content;
diff --git ORI/prettier/src/language-js/print/object.js ALT/prettier/src/language-js/print/object.js
index bce115b..16b82d3 100644
--- ORI/prettier/src/language-js/print/object.js
+++ ALT/prettier/src/language-js/print/object.js
@@ -84,11 +84,12 @@ function printObject(path, options, print) {
locStart(firstProperty)
));
- const separator = isFlowInterfaceLikeBody
- ? ";"
- : node.type === "TSInterfaceBody" || node.type === "TSTypeLiteral"
- ? ifBreak(semi, ";")
- : ",";
+ const separator =
+ isFlowInterfaceLikeBody
+ ? ";"
+ : node.type === "TSInterfaceBody" || node.type === "TSTypeLiteral"
+ ? ifBreak(semi, ";")
+ : ",";
const leftBrace =
node.type === "RecordExpression" ? "#{" : node.exact ? "{|" : "{";
const rightBrace = node.exact ? "|}" : "}";
diff --git ORI/prettier/src/language-js/print/statement.js ALT/prettier/src/language-js/print/statement.js
index a552776..a24b2ad 100644
--- ORI/prettier/src/language-js/print/statement.js
+++ ALT/prettier/src/language-js/print/statement.js
@@ -227,9 +227,8 @@ function shouldPrintSemicolonAfterClassProperty(node, nextNode) {
return false;
}
- const isGenerator = nextNode.value
- ? nextNode.value.generator
- : nextNode.generator;
+ const isGenerator =
+ nextNode.value ? nextNode.value.generator : nextNode.generator;
if (nextNode.computed || isGenerator) {
return true;
}
diff --git ORI/prettier/src/language-js/print/ternary.js ALT/prettier/src/language-js/print/ternary.js
index aeb94dd..1c00219 100644
--- ORI/prettier/src/language-js/print/ternary.js
+++ ALT/prettier/src/language-js/print/ternary.js
@@ -108,15 +108,15 @@ function conditionalExpressionChainContainsJsx(node) {
function printTernaryTest(path, options, print) {
const node = path.getValue();
const isConditionalExpression = node.type === "ConditionalExpression";
- const alternateNodePropertyName = isConditionalExpression
- ? "alternate"
- : "falseType";
+ const alternateNodePropertyName =
+ isConditionalExpression ? "alternate" : "falseType";
const parent = path.getParentNode();
- const printed = isConditionalExpression
- ? print("test")
- : [print("checkType"), " ", "extends", " ", print("extendsType")];
+ const printed =
+ isConditionalExpression
+ ? print("test")
+ : [print("checkType"), " ", "extends", " ", print("extendsType")];
/**
* a
* ? b
@@ -194,15 +194,12 @@ function shouldExtraIndentForConditionalExpression(path) {
function printTernary(path, options, print) {
const node = path.getValue();
const isConditionalExpression = node.type === "ConditionalExpression";
- const consequentNodePropertyName = isConditionalExpression
- ? "consequent"
- : "trueType";
- const alternateNodePropertyName = isConditionalExpression
- ? "alternate"
- : "falseType";
- const testNodePropertyNames = isConditionalExpression
- ? ["test"]
- : ["checkType", "extendsType"];
+ const consequentNodePropertyName =
+ isConditionalExpression ? "consequent" : "trueType";
+ const alternateNodePropertyName =
+ isConditionalExpression ? "alternate" : "falseType";
+ const testNodePropertyNames =
+ isConditionalExpression ? ["test"] : ["checkType", "extendsType"];
const consequentNode = node[consequentNodePropertyName];
const alternateNode = node[alternateNodePropertyName];
const parts = [];
diff --git ORI/prettier/src/language-js/print/typescript.js ALT/prettier/src/language-js/print/typescript.js
index 9d55477..da4af5d 100644
--- ORI/prettier/src/language-js/print/typescript.js
+++ ALT/prettier/src/language-js/print/typescript.js
@@ -350,9 +350,8 @@ function printTypescript(path, options, print) {
/* printTypeParams */ true
);
- const returnTypePropertyName = node.returnType
- ? "returnType"
- : "typeAnnotation";
+ const returnTypePropertyName =
+ node.returnType ? "returnType" : "typeAnnotation";
const returnTypeNode = node[returnTypePropertyName];
const returnTypeDoc = returnTypeNode ? print(returnTypePropertyName) : "";
const shouldGroupParameters = shouldGroupFunctionParameters(
diff --git ORI/prettier/src/language-markdown/printer-markdown.js ALT/prettier/src/language-markdown/printer-markdown.js
index 1cd5f82..89f2cd3 100644
--- ORI/prettier/src/language-markdown/printer-markdown.js
+++ ALT/prettier/src/language-markdown/printer-markdown.js
@@ -316,16 +316,17 @@ function genericPrint(path, options, print) {
];
function getPrefix() {
- const rawPrefix = node.ordered
- ? (index === 0
- ? node.start
- : isGitDiffFriendlyOrderedList
- ? 1
- : node.start + index) +
- (nthSiblingIndex % 2 === 0 ? ". " : ") ")
- : nthSiblingIndex % 2 === 0
- ? "- "
- : "* ";
+ const rawPrefix =
+ node.ordered
+ ? (index === 0
+ ? node.start
+ : isGitDiffFriendlyOrderedList
+ ? 1
+ : node.start + index) +
+ (nthSiblingIndex % 2 === 0 ? ". " : ") ")
+ : nthSiblingIndex % 2 === 0
+ ? "- "
+ : "* ";
return node.isAligned ||
/* workaround for https://github.com/remarkjs/remark/issues/315 */ node.hasIndentedCodeblock
diff --git ORI/prettier/src/main/comments.js ALT/prettier/src/main/comments.js
index 2562cf2..59584f2 100644
--- ORI/prettier/src/main/comments.js
+++ ALT/prettier/src/main/comments.js
@@ -445,13 +445,14 @@ function printLeadingComment(path, options) {
// Leading block comments should see if they need to stay on the
// same line or not.
if (isBlock) {
- const lineBreak = hasNewline(originalText, locEnd(comment))
- ? hasNewline(originalText, locStart(comment), {
- backwards: true,
- })
- ? hardline
- : line
- : " ";
+ const lineBreak =
+ hasNewline(originalText, locEnd(comment))
+ ? hasNewline(originalText, locStart(comment), {
+ backwards: true,
+ })
+ ? hardline
+ : line
+ : " ";
parts.push(lineBreak);
} else {
diff --git ORI/prettier/src/main/options-normalizer.js ALT/prettier/src/main/options-normalizer.js
index 3240a08..ae9fb6b 100644
--- ORI/prettier/src/main/options-normalizer.js
+++ ALT/prettier/src/main/options-normalizer.js
@@ -54,19 +54,20 @@ function normalizeOptions(
optionInfos,
{ logger, isCLI = false, passThrough = false } = {}
) {
- const unknown = !passThrough
- ? (key, value, options) => {
- // Don't suggest `_` for unknown flags
- const { _, ...schemas } = options.schemas;
- return vnopts.levenUnknownHandler(key, value, {
- ...options,
- schemas,
- });
- }
- : Array.isArray(passThrough)
- ? (key, value) =>
- !passThrough.includes(key) ? undefined : { [key]: value }
- : (key, value) => ({ [key]: value });
+ const unknown =
+ !passThrough
+ ? (key, value, options) => {
+ // Don't suggest `_` for unknown flags
+ const { _, ...schemas } = options.schemas;
+ return vnopts.levenUnknownHandler(key, value, {
+ ...options,
+ schemas,
+ });
+ }
+ : Array.isArray(passThrough)
+ ? (key, value) =>
+ !passThrough.includes(key) ? undefined : { [key]: value }
+ : (key, value) => ({ [key]: value });
const descriptor = isCLI ? cliDescriptor : vnopts.apiDescriptor;
const schemas = optionInfosToSchemas(optionInfos, { isCLI });
diff --git ORI/prettier/src/utils/front-matter/print.js ALT/prettier/src/utils/front-matter/print.js
index 5de6ee7..e654ec1 100644
--- ORI/prettier/src/utils/front-matter/print.js
+++ ALT/prettier/src/utils/front-matter/print.js
@@ -7,9 +7,10 @@ const {
function print(node, textToDoc) {
if (node.lang === "yaml") {
const value = node.value.trim();
- const doc = value
- ? textToDoc(value, { parser: "yaml" }, { stripTrailingHardline: true })
- : "";
+ const doc =
+ value
+ ? textToDoc(value, { parser: "yaml" }, { stripTrailingHardline: true })
+ : "";
return markAsRoot([
node.startDelimiter,
hardline,
diff --git ORI/prettier/tests/config/format-test.js ALT/prettier/tests/config/format-test.js
index 41d5091..a1035ed 100644
--- ORI/prettier/tests/config/format-test.js
+++ ALT/prettier/tests/config/format-test.js
@@ -4,9 +4,8 @@ const { TEST_STANDALONE } = process.env;
const fs = require("fs");
const path = require("path");
-const prettier = !TEST_STANDALONE
- ? require("prettier-local")
- : require("prettier-standalone");
+const prettier =
+ !TEST_STANDALONE ? require("prettier-local") : require("prettier-standalone");
const checkParsers = require("./utils/check-parsers.js");
const createSnapshot = require("./utils/create-snapshot.js");
const visualizeEndOfLine = require("./utils/visualize-end-of-line.js");
@@ -40,9 +39,8 @@ const unstableTests = new Map(
"typescript/prettier-ignore/mapped-types.ts",
"js/comments/html-like/comment.js",
].map((fixture) => {
- const [file, isUnstable = () => true] = Array.isArray(fixture)
- ? fixture
- : [fixture];
+ const [file, isUnstable = () => true] =
+ Array.isArray(fixture) ? fixture : [fixture];
return [path.join(__dirname, "../format/", file), isUnstable];
})
);
@@ -206,9 +204,10 @@ function runSpec(fixtures, parsers, options) {
filepath: filename,
parser,
};
- const mainParserFormatResult = shouldThrowOnFormat(name, formatOptions)
- ? { options: formatOptions, error: true }
- : format(code, formatOptions);
+ const mainParserFormatResult =
+ shouldThrowOnFormat(name, formatOptions)
+ ? { options: formatOptions, error: true }
+ : format(code, formatOptions);
for (const currentParser of allParsers) {
runTest({
diff --git ORI/prettier/tests/integration/env.js ALT/prettier/tests/integration/env.js
index 6d3eb47..adf776e 100644
--- ORI/prettier/tests/integration/env.js
+++ ALT/prettier/tests/integration/env.js
@@ -9,9 +9,10 @@ const prettierCli = path.join(
typeof bin === "object" ? bin.prettier : bin
);
-const thirdParty = isProduction
- ? path.join(PRETTIER_DIR, "./third-party")
- : path.join(PRETTIER_DIR, "./src/common/third-party");
+const thirdParty =
+ isProduction
+ ? path.join(PRETTIER_DIR, "./third-party")
+ : path.join(PRETTIER_DIR, "./src/common/third-party");
const projectRoot = path.join(__dirname, "../..");
diff --git ORI/prettier/tests/integration/path-serializer.js ALT/prettier/tests/integration/path-serializer.js
index e1d6592..7a57e70 100644
--- ORI/prettier/tests/integration/path-serializer.js
+++ ALT/prettier/tests/integration/path-serializer.js
@@ -3,12 +3,13 @@
const replaceCWD = (text) => {
const cwd = process.cwd();
- const variants = /^[a-z]:\\/i.test(cwd)
- ? [
- cwd.charAt(0).toLowerCase() + cwd.slice(1),
- cwd.charAt(0).toUpperCase() + cwd.slice(1),
- ]
- : [cwd];
+ const variants =
+ /^[a-z]:\\/i.test(cwd)
+ ? [
+ cwd.charAt(0).toLowerCase() + cwd.slice(1),
+ cwd.charAt(0).toUpperCase() + cwd.slice(1),
+ ]
+ : [cwd];
for (const variant of variants) {
while (text.includes(variant)) {
diff --git ORI/prettier/website/pages/en/versions.js ALT/prettier/website/pages/en/versions.js
index e3c349e..e7bc211 100755
--- ORI/prettier/website/pages/en/versions.js
+++ ALT/prettier/website/pages/en/versions.js
@@ -18,9 +18,10 @@ const rootPackageJson = require(`${CWD}/../package.json`);
const defaultBranchVersion = rootPackageJson.version;
const isDefaultBranchDevVersion = defaultBranchVersion.endsWith("-dev");
const devVersion = isDefaultBranchDevVersion ? defaultBranchVersion : null;
-const latestVersion = isDefaultBranchDevVersion
- ? rootPackageJson.devDependencies.prettier
- : defaultBranchVersion;
+const latestVersion =
+ isDefaultBranchDevVersion
+ ? rootPackageJson.devDependencies.prettier
+ : defaultBranchVersion;
const [latestDocsVersion, ...pastDocsVersions] = versions;
function Versions(props) {
diff --git ORI/prettier/website/playground/sidebar/options.js ALT/prettier/website/playground/sidebar/options.js
index 7dd4450..97e98ce 100644
--- ORI/prettier/website/playground/sidebar/options.js
+++ ALT/prettier/website/playground/sidebar/options.js
@@ -56,8 +56,7 @@ export default function Option(props) {
}
function getDescription(option) {
- const description = option.inverted
- ? option.oppositeDescription
- : option.description;
+ const description =
+ option.inverted ? option.oppositeDescription : option.description;
return description && description.replace(/\n/g, " ");
}
diff --git ORI/prettier/website/playground/urlHash.js ALT/prettier/website/playground/urlHash.js
index 892f9a9..34210d6 100644
--- ORI/prettier/website/playground/urlHash.js
+++ ALT/prettier/website/playground/urlHash.js
@@ -7,9 +7,10 @@ export function read() {
}
// backwards support for old json encoded URIComponent
- const decode = hash.includes("%7B%22")
- ? decodeURIComponent
- : LZString.decompressFromEncodedURIComponent;
+ const decode =
+ hash.includes("%7B%22")
+ ? decodeURIComponent
+ : LZString.decompressFromEncodedURIComponent;
try {
return JSON.parse(decode(hash)); |
|
prettier/prettier#12087 VS prettier/prettier@main :: marmelab/react-admin@5395b13 Diff (1343 lines)diff --git ORI/react-admin/examples/crm/src/dataGenerator/contacts.ts ALT/react-admin/examples/crm/src/dataGenerator/contacts.ts
index 0586c04..48c516e 100644
--- ORI/react-admin/examples/crm/src/dataGenerator/contacts.ts
+++ ALT/react-admin/examples/crm/src/dataGenerator/contacts.ts
@@ -32,11 +32,12 @@ export const generateContacts = (db: Db): Contact[] => {
const first_name = name.firstName(gender as any);
const last_name = name.lastName();
const email = internet.email(first_name, last_name);
- const avatar = has_avatar
- ? 'https://marmelab.com/posters/avatar-' +
- (223 - numberOfContacts) +
- '.jpeg'
- : undefined;
+ const avatar =
+ has_avatar
+ ? 'https://marmelab.com/posters/avatar-' +
+ (223 - numberOfContacts) +
+ '.jpeg'
+ : undefined;
const title = fakerCompany.bsAdjective();
if (has_avatar) {
diff --git ORI/react-admin/examples/crm/src/deals/DealCard.tsx ALT/react-admin/examples/crm/src/deals/DealCard.tsx
index 3ba5953..48b551d 100644
--- ORI/react-admin/examples/crm/src/deals/DealCard.tsx
+++ ALT/react-admin/examples/crm/src/deals/DealCard.tsx
@@ -41,9 +41,8 @@ export const DealCard = ({ deal, index }: { deal: Deal; index: number }) => {
<Card
style={{
opacity: snapshot.isDragging ? 0.9 : 1,
- transform: snapshot.isDragging
- ? 'rotate(-2deg)'
- : '',
+ transform:
+ snapshot.isDragging ? 'rotate(-2deg)' : '',
}}
elevation={snapshot.isDragging ? 3 : 1}
>
diff --git ORI/react-admin/examples/crm/src/deals/DealListContent.tsx ALT/react-admin/examples/crm/src/deals/DealListContent.tsx
index c7e9219..53d7f24 100644
--- ORI/react-admin/examples/crm/src/deals/DealListContent.tsx
+++ ALT/react-admin/examples/crm/src/deals/DealListContent.tsx
@@ -242,9 +242,10 @@ export const DealListContent = () => {
dataProvider.update('deals', {
id: sourceDeal.id,
data: {
- index: destinationDeal
- ? destinationDeal.index
- : destinationDeals.pop()!.index + 1,
+ index:
+ destinationDeal
+ ? destinationDeal.index
+ : destinationDeals.pop()!.index + 1,
stage: destination.droppableId,
},
previousData: sourceDeal,
diff --git ORI/react-admin/examples/data-generator/src/customers.ts ALT/react-admin/examples/data-generator/src/customers.ts
index 74db3cf..daa0c17 100644
--- ORI/react-admin/examples/data-generator/src/customers.ts
+++ ALT/react-admin/examples/data-generator/src/customers.ts
@@ -16,11 +16,12 @@ export default (db, { serializeDate }) => {
const last_name = name.lastName();
const email = internet.email(first_name, last_name);
const birthday = has_ordered ? date.past(60) : null;
- const avatar = has_ordered
- ? 'https://marmelab.com/posters/avatar-' +
- numberOfCustomers +
- '.jpeg'
- : undefined;
+ const avatar =
+ has_ordered
+ ? 'https://marmelab.com/posters/avatar-' +
+ numberOfCustomers +
+ '.jpeg'
+ : undefined;
if (has_ordered) {
numberOfCustomers++;
diff --git ORI/react-admin/examples/data-generator/src/products.ts ALT/react-admin/examples/data-generator/src/products.ts
index aec0aab..496f7a4 100644
--- ORI/react-admin/examples/data-generator/src/products.ts
+++ ALT/react-admin/examples/data-generator/src/products.ts
@@ -195,9 +195,10 @@ export default db => {
(index + 1) +
'.jpeg',
description: lorem.paragraph(),
- stock: weightedBoolean(10)
- ? 0
- : random.number({ min: 0, max: 150 }),
+ stock:
+ weightedBoolean(10)
+ ? 0
+ : random.number({ min: 0, max: 150 }),
sales: 0,
};
}),
diff --git ORI/react-admin/examples/data-generator/src/reviews.ts ALT/react-admin/examples/data-generator/src/reviews.ts
index ff78583..df361a9 100644
--- ORI/react-admin/examples/data-generator/src/reviews.ts
+++ ALT/react-admin/examples/data-generator/src/reviews.ts
@@ -23,15 +23,16 @@ export default (db, { serializeDate }) => {
.filter(() => weightedBoolean(40)) // reviewers review 40% of their products
.map(product => {
const date = randomDate(command.date);
- const status = isAfter(aMonthAgo, date)
- ? weightedArrayElement(
- ['accepted', 'rejected'],
- [3, 1]
- )
- : weightedArrayElement(
- ['pending', 'accepted', 'rejected'],
- [5, 3, 1]
- );
+ const status =
+ isAfter(aMonthAgo, date)
+ ? weightedArrayElement(
+ ['accepted', 'rejected'],
+ [3, 1]
+ )
+ : weightedArrayElement(
+ ['pending', 'accepted', 'rejected'],
+ [5, 3, 1]
+ );
return {
id: id++,
diff --git ORI/react-admin/examples/demo/src/dashboard/PendingOrders.tsx ALT/react-admin/examples/demo/src/dashboard/PendingOrders.tsx
index d3b7579..844c220 100644
--- ORI/react-admin/examples/demo/src/dashboard/PendingOrders.tsx
+++ ALT/react-admin/examples/demo/src/dashboard/PendingOrders.tsx
@@ -60,15 +60,16 @@ const PendingOrders = (props: Props) => {
secondary={translate('pos.dashboard.order.items', {
smart_count: record.basket.length,
nb_items: record.basket.length,
- customer_name: customers[record.customer_id]
- ? `${
- customers[record.customer_id]
- .first_name
- } ${
- customers[record.customer_id]
- .last_name
- }`
- : '',
+ customer_name:
+ customers[record.customer_id]
+ ? `${
+ customers[record.customer_id]
+ .first_name
+ } ${
+ customers[record.customer_id]
+ .last_name
+ }`
+ : '',
})}
/>
<ListItemSecondaryAction>
diff --git ORI/react-admin/examples/demo/src/orders/Basket.tsx ALT/react-admin/examples/demo/src/orders/Basket.tsx
index 370a686..8c45a98 100644
--- ORI/react-admin/examples/demo/src/orders/Basket.tsx
+++ ALT/react-admin/examples/demo/src/orders/Basket.tsx
@@ -30,9 +30,8 @@ const Basket = (props: FieldProps<Order>) => {
},
{},
state => {
- const productIds = record
- ? record.basket.map(item => item.product_id)
- : [];
+ const productIds =
+ record ? record.basket.map(item => item.product_id) : [];
return productIds
.map<Product>(
diff --git ORI/react-admin/packages/ra-core/src/auth/useLogin.ts ALT/react-admin/packages/ra-core/src/auth/useLogin.ts
index 8d5c120..25620bd 100644
--- ORI/react-admin/packages/ra-core/src/auth/useLogin.ts
+++ ALT/react-admin/packages/ra-core/src/auth/useLogin.ts
@@ -41,10 +41,11 @@ const useLogin = (): Login => {
(params: any = {}, pathName) =>
authProvider.login(params).then(ret => {
dispatch(resetNotification());
- const redirectUrl = pathName
- ? pathName
- : nextPathName + nextSearch ||
- defaultAuthParams.afterLoginUrl;
+ const redirectUrl =
+ pathName
+ ? pathName
+ : nextPathName + nextSearch ||
+ defaultAuthParams.afterLoginUrl;
history.push(redirectUrl);
return ret;
}),
diff --git ORI/react-admin/packages/ra-core/src/controller/details/useCreateController.ts ALT/react-admin/packages/ra-core/src/controller/details/useCreateController.ts
index 5b0738e..07825be 100644
--- ORI/react-admin/packages/ra-core/src/controller/details/useCreateController.ts
+++ ALT/react-admin/packages/ra-core/src/controller/details/useCreateController.ts
@@ -157,49 +157,52 @@ export const useCreateController = <
{ payload: { data } },
{
action: CRUD_CREATE,
- onSuccess: onSuccessFromSave
- ? onSuccessFromSave
- : onSuccessRef.current
- ? onSuccessRef.current
- : ({ data: newRecord }) => {
- notify(
- successMessage ||
- 'ra.notification.created',
- {
- type: 'info',
- messageArgs: { smart_count: 1 },
- }
- );
- redirect(
- redirectTo,
- basePath,
- newRecord.id,
- newRecord
- );
- },
- onFailure: onFailureFromSave
- ? onFailureFromSave
- : onFailureRef.current
- ? onFailureRef.current
- : error => {
- notify(
- typeof error === 'string'
- ? error
- : error.message ||
- 'ra.notification.http_error',
- {
- type: 'warning',
- messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
- },
- }
- );
- },
+ onSuccess:
+ onSuccessFromSave
+ ? onSuccessFromSave
+ : onSuccessRef.current
+ ? onSuccessRef.current
+ : ({ data: newRecord }) => {
+ notify(
+ successMessage ||
+ 'ra.notification.created',
+ {
+ type: 'info',
+ messageArgs: { smart_count: 1 },
+ }
+ );
+ redirect(
+ redirectTo,
+ basePath,
+ newRecord.id,
+ newRecord
+ );
+ },
+ onFailure:
+ onFailureFromSave
+ ? onFailureFromSave
+ : onFailureRef.current
+ ? onFailureRef.current
+ : error => {
+ notify(
+ typeof error === 'string'
+ ? error
+ : error.message ||
+ 'ra.notification.http_error',
+ {
+ type: 'warning',
+ messageArgs: {
+ _:
+ typeof error === 'string'
+ ? error
+ : error &&
+ error.message
+ ? error.message
+ : undefined,
+ },
+ }
+ );
+ },
}
)
),
diff --git ORI/react-admin/packages/ra-core/src/controller/details/useEditController.ts ALT/react-admin/packages/ra-core/src/controller/details/useEditController.ts
index 6c68afa..157f3df 100644
--- ORI/react-admin/packages/ra-core/src/controller/details/useEditController.ts
+++ ALT/react-admin/packages/ra-core/src/controller/details/useEditController.ts
@@ -189,51 +189,60 @@ export const useEditController = <RecordType extends Record = Record>(
{ payload: { data } },
{
action: CRUD_UPDATE,
- onSuccess: onSuccessFromSave
- ? onSuccessFromSave
- : onSuccessRef.current
- ? onSuccessRef.current
- : () => {
- notify(
- successMessage ||
- 'ra.notification.updated',
- {
- type: 'info',
- messageArgs: { smart_count: 1 },
- undoable: mutationMode === 'undoable',
+ onSuccess:
+ onSuccessFromSave
+ ? onSuccessFromSave
+ : onSuccessRef.current
+ ? onSuccessRef.current
+ : () => {
+ notify(
+ successMessage ||
+ 'ra.notification.updated',
+ {
+ type: 'info',
+ messageArgs: { smart_count: 1 },
+ undoable:
+ mutationMode === 'undoable',
+ }
+ );
+ redirect(
+ redirectTo,
+ basePath,
+ data.id,
+ data
+ );
+ },
+ onFailure:
+ onFailureFromSave
+ ? onFailureFromSave
+ : onFailureRef.current
+ ? onFailureRef.current
+ : error => {
+ notify(
+ typeof error === 'string'
+ ? error
+ : error.message ||
+ 'ra.notification.http_error',
+ {
+ type: 'warning',
+ messageArgs: {
+ _:
+ typeof error === 'string'
+ ? error
+ : error &&
+ error.message
+ ? error.message
+ : undefined,
+ },
+ }
+ );
+ if (
+ mutationMode === 'undoable' ||
+ mutationMode === 'pessimistic'
+ ) {
+ refresh();
}
- );
- redirect(redirectTo, basePath, data.id, data);
- },
- onFailure: onFailureFromSave
- ? onFailureFromSave
- : onFailureRef.current
- ? onFailureRef.current
- : error => {
- notify(
- typeof error === 'string'
- ? error
- : error.message ||
- 'ra.notification.http_error',
- {
- type: 'warning',
- messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
- },
- }
- );
- if (
- mutationMode === 'undoable' ||
- mutationMode === 'pessimistic'
- ) {
- refresh();
- }
- },
+ },
mutationMode,
}
)
diff --git ORI/react-admin/packages/ra-core/src/controller/field/getResourceLinkPath.ts ALT/react-admin/packages/ra-core/src/controller/field/getResourceLinkPath.ts
index 268d56e..c86f478 100644
--- ORI/react-admin/packages/ra-core/src/controller/field/getResourceLinkPath.ts
+++ ALT/react-admin/packages/ra-core/src/controller/field/getResourceLinkPath.ts
@@ -62,9 +62,8 @@ const getResourceLinkPath = ({
);
}
const sourceId = get(record, source);
- const rootPath = basePath
- ? basePath.replace(resource, reference)
- : `/${reference}`;
+ const rootPath =
+ basePath ? basePath.replace(resource, reference) : `/${reference}`;
const linkTo: LinkToType = linkType !== undefined ? linkType : link;
// Backward compatibility: keep linkType but with warning
diff --git ORI/react-admin/packages/ra-core/src/controller/field/useReferenceArrayFieldController.ts ALT/react-admin/packages/ra-core/src/controller/field/useReferenceArrayFieldController.ts
index 48b0898..582073c 100644
--- ORI/react-admin/packages/ra-core/src/controller/field/useReferenceArrayFieldController.ts
+++ ALT/react-admin/packages/ra-core/src/controller/field/useReferenceArrayFieldController.ts
@@ -101,9 +101,8 @@ const useReferenceArrayFieldController = (
});
return {
- basePath: basePath
- ? basePath.replace(resource, reference)
- : `/${reference}`,
+ basePath:
+ basePath ? basePath.replace(resource, reference) : `/${reference}`,
...listProps,
defaultTitle: null,
hasCreate: false,
diff --git ORI/react-admin/packages/ra-core/src/controller/field/useReferenceManyFieldController.ts ALT/react-admin/packages/ra-core/src/controller/field/useReferenceManyFieldController.ts
index 695f932..3ece036 100644
--- ORI/react-admin/packages/ra-core/src/controller/field/useReferenceManyFieldController.ts
+++ ALT/react-admin/packages/ra-core/src/controller/field/useReferenceManyFieldController.ts
@@ -185,9 +185,8 @@ const useReferenceManyFieldController = (
);
return {
- basePath: basePath
- ? basePath.replace(resource, reference)
- : `/${reference}`,
+ basePath:
+ basePath ? basePath.replace(resource, reference) : `/${reference}`,
currentSort: sort,
data,
defaultTitle: null,
diff --git ORI/react-admin/packages/ra-core/src/controller/input/referenceDataStatus.ts ALT/react-admin/packages/ra-core/src/controller/input/referenceDataStatus.ts
index 2677b32..be366d7 100644
--- ORI/react-admin/packages/ra-core/src/controller/input/referenceDataStatus.ts
+++ ALT/react-admin/packages/ra-core/src/controller/input/referenceDataStatus.ts
@@ -21,13 +21,12 @@ export const getStatusForInput = ({
referenceRecord,
translate = x => x,
}: GetStatusForInputParams) => {
- const matchingReferencesError = isMatchingReferencesError(
- matchingReferences
- )
- ? translate(matchingReferences.error, {
- _: matchingReferences.error,
- })
- : null;
+ const matchingReferencesError =
+ isMatchingReferencesError(matchingReferences)
+ ? translate(matchingReferences.error, {
+ _: matchingReferences.error,
+ })
+ : null;
const selectedReferenceError =
input.value && !referenceRecord
? translate('ra.input.references.single_missing', {
@@ -49,9 +48,10 @@ export const getStatusForInput = ({
: matchingReferencesError
: null,
warning: selectedReferenceError || matchingReferencesError,
- choices: Array.isArray(matchingReferences)
- ? matchingReferences
- : [referenceRecord].filter(choice => choice),
+ choices:
+ Array.isArray(matchingReferences)
+ ? matchingReferences
+ : [referenceRecord].filter(choice => choice),
};
};
@@ -94,13 +94,12 @@ export const getStatusForArrayInput = ({
referenceRecords
);
- const matchingReferencesError = isMatchingReferencesError(
- matchingReferences
- )
- ? translate(matchingReferences.error, {
- _: matchingReferences.error,
- })
- : null;
+ const matchingReferencesError =
+ isMatchingReferencesError(matchingReferences)
+ ? translate(matchingReferences.error, {
+ _: matchingReferences.error,
+ })
+ : null;
return {
waiting:
@@ -126,8 +125,9 @@ export const getStatusForArrayInput = ({
_: 'ra.input.references.many_missing',
})
: null,
- choices: Array.isArray(matchingReferences)
- ? matchingReferences
- : referenceRecords,
+ choices:
+ Array.isArray(matchingReferences)
+ ? matchingReferences
+ : referenceRecords,
};
};
diff --git ORI/react-admin/packages/ra-core/src/controller/input/useReferenceArrayInputController.ts ALT/react-admin/packages/ra-core/src/controller/input/useReferenceArrayInputController.ts
index d8c30c4..3c95014 100644
--- ORI/react-admin/packages/ra-core/src/controller/input/useReferenceArrayInputController.ts
+++ ALT/react-admin/packages/ra-core/src/controller/input/useReferenceArrayInputController.ts
@@ -246,16 +246,16 @@ export const useReferenceArrayInputController = (
refetch: refetchGetMany,
} = useGetMany(reference, idsToFetch || EmptyArray);
- const referenceRecords = referenceRecordsFetched
- ? referenceRecordsFetched.concat(referenceRecordsFromStore)
- : referenceRecordsFromStore;
+ const referenceRecords =
+ referenceRecordsFetched
+ ? referenceRecordsFetched.concat(referenceRecordsFromStore)
+ : referenceRecordsFromStore;
// filter out not found references - happens when the dataProvider doesn't guarantee referential integrity
const finalReferenceRecords = referenceRecords.filter(Boolean);
- const isGetMatchingEnabled = enableGetChoices
- ? enableGetChoices(finalFilter)
- : true;
+ const isGetMatchingEnabled =
+ enableGetChoices ? enableGetChoices(finalFilter) : true;
const {
data: matchingReferences,
ids: matchingReferencesIds,
diff --git ORI/react-admin/packages/ra-core/src/controller/useList.ts ALT/react-admin/packages/ra-core/src/controller/useList.ts
index 5b9591e..82320d3 100644
--- ORI/react-admin/packages/ra-core/src/controller/useList.ts
+++ ALT/react-admin/packages/ra-core/src/controller/useList.ts
@@ -160,13 +160,16 @@ export const useList = (props: UseListOptions): UseListValue => {
let tempData = data.filter(record =>
Object.entries(filterValues).every(([filterName, filterValue]) => {
const recordValue = get(record, filterName);
- const result = Array.isArray(recordValue)
- ? Array.isArray(filterValue)
- ? recordValue.some(item => filterValue.includes(item))
- : recordValue.includes(filterValue)
- : Array.isArray(filterValue)
- ? filterValue.includes(recordValue)
- : filterValue == recordValue; // eslint-disable-line eqeqeq
+ const result =
+ Array.isArray(recordValue)
+ ? Array.isArray(filterValue)
+ ? recordValue.some(item =>
+ filterValue.includes(item)
+ )
+ : recordValue.includes(filterValue)
+ : Array.isArray(filterValue)
+ ? filterValue.includes(recordValue)
+ : filterValue == recordValue; // eslint-disable-line eqeqeq
return result;
})
);
diff --git ORI/react-admin/packages/ra-core/src/controller/useListParams.ts ALT/react-admin/packages/ra-core/src/controller/useListParams.ts
index 7faf4a7..1d1af1d 100644
--- ORI/react-admin/packages/ra-core/src/controller/useListParams.ts
+++ ALT/react-admin/packages/ra-core/src/controller/useListParams.ts
@@ -137,9 +137,8 @@ const useListParams = ({
syncWithLocation,
];
- const queryFromLocation = syncWithLocation
- ? parseQueryFromLocation(location)
- : {};
+ const queryFromLocation =
+ syncWithLocation ? parseQueryFromLocation(location) : {};
const query = useMemo(
() =>
diff --git ORI/react-admin/packages/ra-core/src/dataProvider/useMutation.ts ALT/react-admin/packages/ra-core/src/dataProvider/useMutation.ts
index 1d9cda2..5ee94e9 100644
--- ORI/react-admin/packages/ra-core/src/dataProvider/useMutation.ts
+++ ALT/react-admin/packages/ra-core/src/dataProvider/useMutation.ts
@@ -146,12 +146,10 @@ const useMutation = (
callTimeQuery?: Partial<Mutation> | Event,
callTimeOptions?: MutationOptions
): void | Promise<any> => {
- const finalDataProvider = hasDeclarativeSideEffectsSupport(
- options,
- callTimeOptions
- )
- ? dataProviderWithDeclarativeSideEffects
- : dataProvider;
+ const finalDataProvider =
+ hasDeclarativeSideEffectsSupport(options, callTimeOptions)
+ ? dataProviderWithDeclarativeSideEffects
+ : dataProvider;
const params = mergeDefinitionAndCallTimeParameters(
query,
callTimeQuery,
@@ -305,29 +303,32 @@ const mergeDefinitionAndCallTimeParameters = (
return {
type: callTimeQuery?.type || query.type,
resource: callTimeQuery?.resource || query.resource,
- payload: callTimeQuery
- ? merge({}, query.payload, callTimeQuery.payload)
- : query.payload,
- options: callTimeOptions
- ? merge(
- {},
- sanitizeOptions(options),
- sanitizeOptions(callTimeOptions)
- )
- : sanitizeOptions(options),
+ payload:
+ callTimeQuery
+ ? merge({}, query.payload, callTimeQuery.payload)
+ : query.payload,
+ options:
+ callTimeOptions
+ ? merge(
+ {},
+ sanitizeOptions(options),
+ sanitizeOptions(callTimeOptions)
+ )
+ : sanitizeOptions(options),
};
}
return {
type: callTimeQuery.type,
resource: callTimeQuery.resource,
payload: callTimeQuery.payload,
- options: options
- ? merge(
- {},
- sanitizeOptions(options),
- sanitizeOptions(callTimeOptions)
- )
- : sanitizeOptions(callTimeOptions),
+ options:
+ options
+ ? merge(
+ {},
+ sanitizeOptions(options),
+ sanitizeOptions(callTimeOptions)
+ )
+ : sanitizeOptions(callTimeOptions),
};
};
diff --git ORI/react-admin/packages/ra-core/src/dataProvider/useQuery.ts ALT/react-admin/packages/ra-core/src/dataProvider/useQuery.ts
index 19461e2..bb7ef01 100644
--- ORI/react-admin/packages/ra-core/src/dataProvider/useQuery.ts
+++ ALT/react-admin/packages/ra-core/src/dataProvider/useQuery.ts
@@ -111,9 +111,10 @@ export const useQuery = (
*
* @deprecated to be removed in 4.0
*/
- const finalDataProvider = withDeclarativeSideEffectsSupport
- ? dataProviderWithDeclarativeSideEffects
- : dataProvider;
+ const finalDataProvider =
+ withDeclarativeSideEffectsSupport
+ ? dataProviderWithDeclarativeSideEffects
+ : dataProvider;
setState(prevState => ({ ...prevState, loading: true }));
diff --git ORI/react-admin/packages/ra-core/src/form/FormField.tsx ALT/react-admin/packages/ra-core/src/form/FormField.tsx
index 1553785..41ca7c6 100644
--- ORI/react-admin/packages/ra-core/src/form/FormField.tsx
+++ ALT/react-admin/packages/ra-core/src/form/FormField.tsx
@@ -30,9 +30,8 @@ const FormField = (props: Props) => {
console.log('FormField is deprecated, use the useInput hook instead.');
}
- const sanitizedValidate = Array.isArray(validate)
- ? composeValidators(validate)
- : validate;
+ const sanitizedValidate =
+ Array.isArray(validate) ? composeValidators(validate) : validate;
const finalId = id || rest.source;
diff --git ORI/react-admin/packages/ra-core/src/form/useInput.ts ALT/react-admin/packages/ra-core/src/form/useInput.ts
index 799d14f..886f8d2 100644
--- ORI/react-admin/packages/ra-core/src/form/useInput.ts
+++ ALT/react-admin/packages/ra-core/src/form/useInput.ts
@@ -63,9 +63,8 @@ const useInput = ({
};
}, [formContext, formGroupName, source]);
- const sanitizedValidate = Array.isArray(validate)
- ? composeValidators(validate)
- : validate;
+ const sanitizedValidate =
+ Array.isArray(validate) ? composeValidators(validate) : validate;
const { input, meta } = useFinalFormField(finalName, {
initialValue,
diff --git ORI/react-admin/packages/ra-core/src/form/useSuggestions.ts ALT/react-admin/packages/ra-core/src/form/useSuggestions.ts
index 7e10224..b7a3874 100644
--- ORI/react-admin/packages/ra-core/src/form/useSuggestions.ts
+++ ALT/react-admin/packages/ra-core/src/form/useSuggestions.ts
@@ -283,9 +283,10 @@ const removeAlreadySelectedSuggestions = (
if (!selectedItems) {
return suggestions;
}
- const selectedValues = Array.isArray(selectedItems)
- ? selectedItems.map(getChoiceValue)
- : [getChoiceValue(selectedItems)];
+ const selectedValues =
+ Array.isArray(selectedItems)
+ ? selectedItems.map(getChoiceValue)
+ : [getChoiceValue(selectedItems)];
return suggestions.filter(
suggestion => !selectedValues.includes(getChoiceValue(suggestion))
diff --git ORI/react-admin/packages/ra-core/src/i18n/TestTranslationProvider.tsx ALT/react-admin/packages/ra-core/src/i18n/TestTranslationProvider.tsx
index 5c3537f..edfb9d7 100644
--- ORI/react-admin/packages/ra-core/src/i18n/TestTranslationProvider.tsx
+++ ALT/react-admin/packages/ra-core/src/i18n/TestTranslationProvider.tsx
@@ -9,12 +9,13 @@ export default ({ translate, messages, children }: any) => (
locale: 'en',
setLocale: () => Promise.resolve(),
i18nProvider: {
- translate: messages
- ? (key: string, options?: any) =>
- lodashGet(messages, key)
- ? lodashGet(messages, key)
- : options._
- : translate,
+ translate:
+ messages
+ ? (key: string, options?: any) =>
+ lodashGet(messages, key)
+ ? lodashGet(messages, key)
+ : options._
+ : translate,
changeLocale: () => Promise.resolve(),
getLocale: () => 'en',
},
diff --git ORI/react-admin/packages/ra-core/src/inference/getValuesFromRecords.ts ALT/react-admin/packages/ra-core/src/inference/getValuesFromRecords.ts
index 04de5bb..013c170 100644
--- ORI/react-admin/packages/ra-core/src/inference/getValuesFromRecords.ts
+++ ALT/react-admin/packages/ra-core/src/inference/getValuesFromRecords.ts
@@ -31,9 +31,10 @@ export default (records: any[]) =>
values[fieldName] = [];
}
if (record[fieldName] != null) {
- const value = Array.isArray(record[fieldName])
- ? [record[fieldName]]
- : record[fieldName];
+ const value =
+ Array.isArray(record[fieldName])
+ ? [record[fieldName]]
+ : record[fieldName];
values[fieldName] = values[fieldName].concat(value);
}
});
diff --git ORI/react-admin/packages/ra-core/src/reducer/admin/resource/data.ts ALT/react-admin/packages/ra-core/src/reducer/admin/resource/data.ts
index 987966f..d51221e 100644
--- ORI/react-admin/packages/ra-core/src/reducer/admin/resource/data.ts
+++ ALT/react-admin/packages/ra-core/src/reducer/admin/resource/data.ts
@@ -77,11 +77,12 @@ export const addRecordsAndRemoveOutdated = (
const records = { fetchedAt: newFetchedAt };
Object.keys(newFetchedAt).forEach(
id =>
- (records[id] = newRecordsById[id]
- ? isEqual(newRecordsById[id], oldRecords[id])
- ? oldRecords[id] // do not change the record to avoid a redraw
- : newRecordsById[id]
- : oldRecords[id])
+ (records[id] =
+ newRecordsById[id]
+ ? isEqual(newRecordsById[id], oldRecords[id])
+ ? oldRecords[id] // do not change the record to avoid a redraw
+ : newRecordsById[id]
+ : oldRecords[id])
);
return hideFetchedAt(records);
@@ -96,9 +97,10 @@ export const addRecords = (
): RecordSetWithDate => {
const newRecordsById = { ...oldRecords };
newRecords.forEach(record => {
- newRecordsById[record.id] = isEqual(record, oldRecords[record.id])
- ? (oldRecords[record.id] as Record)
- : record;
+ newRecordsById[record.id] =
+ isEqual(record, oldRecords[record.id])
+ ? (oldRecords[record.id] as Record)
+ : record;
});
const updatedFetchedAt = getFetchedAt(
@@ -121,9 +123,10 @@ export const addOneRecord = (
): RecordSetWithDate => {
const newRecordsById = {
...oldRecords,
- [newRecord.id]: isEqual(newRecord, oldRecords[newRecord.id])
- ? oldRecords[newRecord.id] // do not change the record to avoid a redraw
- : newRecord,
+ [newRecord.id]:
+ isEqual(newRecord, oldRecords[newRecord.id])
+ ? oldRecords[newRecord.id] // do not change the record to avoid a redraw
+ : newRecord,
} as RecordSetWithDate;
return Object.defineProperty(newRecordsById, 'fetchedAt', {
diff --git ORI/react-admin/packages/ra-core/src/reducer/admin/resource/list/queryReducer.ts ALT/react-admin/packages/ra-core/src/reducer/admin/resource/list/queryReducer.ts
index 9892d00..ca48d52 100644
--- ORI/react-admin/packages/ra-core/src/reducer/admin/resource/list/queryReducer.ts
+++ ALT/react-admin/packages/ra-core/src/reducer/admin/resource/list/queryReducer.ts
@@ -83,9 +83,10 @@ const queryReducer: Reducer<ListParams> = (
...previousState,
page: 1,
filter: action.payload.filter,
- displayedFilters: action.payload.displayedFilters
- ? action.payload.displayedFilters
- : previousState.displayedFilters,
+ displayedFilters:
+ action.payload.displayedFilters
+ ? action.payload.displayedFilters
+ : previousState.displayedFilters,
};
}
@@ -124,16 +125,17 @@ const queryReducer: Reducer<ListParams> = (
),
// we don't use lodash.set() for displayed filters
// to avoid problems with compound filter names (e.g. 'author.name')
- displayedFilters: previousState.displayedFilters
- ? Object.keys(previousState.displayedFilters).reduce(
- (filters, filter) => {
- return filter !== action.payload
- ? { ...filters, [filter]: true }
- : filters;
- },
- {}
- )
- : previousState.displayedFilters,
+ displayedFilters:
+ previousState.displayedFilters
+ ? Object.keys(previousState.displayedFilters).reduce(
+ (filters, filter) => {
+ return filter !== action.payload
+ ? { ...filters, [filter]: true }
+ : filters;
+ },
+ {}
+ )
+ : previousState.displayedFilters,
};
}
diff --git ORI/react-admin/packages/ra-data-graphql-simple/src/buildVariables.ts ALT/react-admin/packages/ra-data-graphql-simple/src/buildVariables.ts
index 09e49d6..a4c15a2 100644
--- ORI/react-admin/packages/ra-data-graphql-simple/src/buildVariables.ts
+++ ALT/react-admin/packages/ra-data-graphql-simple/src/buildVariables.ts
@@ -266,11 +266,12 @@ const buildGetListVariables =
if (isAList) {
return {
...acc,
- [key]: Array.isArray(params.filter[key])
- ? params.filter[key].map(value =>
- sanitizeValue(type, value)
- )
- : sanitizeValue(type, [params.filter[key]]),
+ [key]:
+ Array.isArray(params.filter[key])
+ ? params.filter[key].map(value =>
+ sanitizeValue(type, value)
+ )
+ : sanitizeValue(type, [params.filter[key]]),
};
}
diff --git ORI/react-admin/packages/ra-data-graphql-simple/src/getResponseParser.ts ALT/react-admin/packages/ra-data-graphql-simple/src/getResponseParser.ts
index 52f1571..aa812e3 100644
--- ORI/react-admin/packages/ra-data-graphql-simple/src/getResponseParser.ts
+++ ALT/react-admin/packages/ra-data-graphql-simple/src/getResponseParser.ts
@@ -58,9 +58,10 @@ const sanitizeResource = (data: any) => {
[`${key}.id`]: dataForKey.id,
}),
// We should only sanitize gql types, not objects
- [key]: dataForKey.__typename
- ? sanitizeResource(dataForKey)
- : dataForKey,
+ [key]:
+ dataForKey.__typename
+ ? sanitizeResource(dataForKey)
+ : dataForKey,
};
}
diff --git ORI/react-admin/packages/ra-data-graphql/src/index.ts ALT/react-admin/packages/ra-data-graphql/src/index.ts
index 0c439a3..65ff017 100644
--- ORI/react-admin/packages/ra-data-graphql/src/index.ts
+++ ALT/react-admin/packages/ra-data-graphql/src/index.ts
@@ -167,12 +167,13 @@ export default async (options: Options): Promise<DataProvider> => {
`${resource}.${raFetchMethod}`
);
- const { parseResponse, ...query } = overriddenBuildQuery
- ? {
- ...buildQuery(raFetchMethod, resource, params),
- ...overriddenBuildQuery(params),
- }
- : buildQuery(raFetchMethod, resource, params);
+ const { parseResponse, ...query } =
+ overriddenBuildQuery
+ ? {
+ ...buildQuery(raFetchMethod, resource, params),
+ ...overriddenBuildQuery(params),
+ }
+ : buildQuery(raFetchMethod, resource, params);
const operation = getQueryOperation(query.query);
diff --git ORI/react-admin/packages/ra-test/src/TestContext.tsx ALT/react-admin/packages/ra-test/src/TestContext.tsx
index 6c0755c..b017eb5 100644
--- ORI/react-admin/packages/ra-test/src/TestContext.tsx
+++ ALT/react-admin/packages/ra-test/src/TestContext.tsx
@@ -76,16 +76,17 @@ export class TestContext extends Component<TestContextProps> {
customReducers = {},
} = props;
- this.storeWithDefault = enableReducers
- ? createAdminStore({
- initialState: merge({}, defaultStore, initialState),
- dataProvider: convertLegacyDataProvider(() =>
- Promise.resolve(dataProviderDefaultResponse)
- ),
- history: createMemoryHistory(),
- customReducers,
- })
- : createStore(() => merge({}, defaultStore, initialState));
+ this.storeWithDefault =
+ enableReducers
+ ? createAdminStore({
+ initialState: merge({}, defaultStore, initialState),
+ dataProvider: convertLegacyDataProvider(() =>
+ Promise.resolve(dataProviderDefaultResponse)
+ ),
+ history: createMemoryHistory(),
+ customReducers,
+ })
+ : createStore(() => merge({}, defaultStore, initialState));
}
renderChildren = () => {
diff --git ORI/react-admin/packages/ra-test/src/renderHook.tsx ALT/react-admin/packages/ra-test/src/renderHook.tsx
index c1b3ae8..3585534 100644
--- ORI/react-admin/packages/ra-test/src/renderHook.tsx
+++ ALT/react-admin/packages/ra-test/src/renderHook.tsx
@@ -40,12 +40,13 @@ export function renderHook(hook, withRedux = true, reduxState?) {
return <p>child</p>;
};
const childrenMock = jest.fn().mockImplementation(children);
- const result = withRedux
- ? renderWithRedux(
- <TestHook children={childrenMock} hook={hook} />,
- reduxState
- )
- : render(<TestHook children={childrenMock} hook={hook} />);
+ const result =
+ withRedux
+ ? renderWithRedux(
+ <TestHook children={childrenMock} hook={hook} />,
+ reduxState
+ )
+ : render(<TestHook children={childrenMock} hook={hook} />);
return {
...result,
diff --git ORI/react-admin/packages/ra-ui-materialui/src/button/EditButton.tsx ALT/react-admin/packages/ra-ui-materialui/src/button/EditButton.tsx
index cfccdd1..500ea4a 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/button/EditButton.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/button/EditButton.tsx
@@ -33,9 +33,13 @@ const EditButton = (props: EditButtonProps) => {
component={Link}
to={useMemo(
() => ({
- pathname: record
- ? linkToRecord(basePath || `/${resource}`, record.id)
- : '',
+ pathname:
+ record
+ ? linkToRecord(
+ basePath || `/${resource}`,
+ record.id
+ )
+ : '',
state: { _scrollToTop: scrollToTop },
}),
[basePath, record, resource, scrollToTop]
diff --git ORI/react-admin/packages/ra-ui-materialui/src/button/ExportButton.tsx ALT/react-admin/packages/ra-ui-materialui/src/button/ExportButton.tsx
index 867ff31..c3c5d51 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/button/ExportButton.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/button/ExportButton.tsx
@@ -40,9 +40,8 @@ const ExportButton = (props: ExportButtonProps) => {
dataProvider
.getList(resource, {
sort: currentSort || sort,
- filter: filter
- ? { ...filterValues, ...filter }
- : filterValues,
+ filter:
+ filter ? { ...filterValues, ...filter } : filterValues,
pagination: { page: 1, perPage: maxResults },
})
.then(
diff --git ORI/react-admin/packages/ra-ui-materialui/src/button/ShowButton.tsx ALT/react-admin/packages/ra-ui-materialui/src/button/ShowButton.tsx
index 2a6a25d..2ac0521 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/button/ShowButton.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/button/ShowButton.tsx
@@ -32,12 +32,13 @@ const ShowButton = (props: ShowButtonProps) => {
component={Link}
to={useMemo(
() => ({
- pathname: record
- ? `${linkToRecord(
- basePath || `/${resource}`,
- record.id
- )}/show`
- : '',
+ pathname:
+ record
+ ? `${linkToRecord(
+ basePath || `/${resource}`,
+ record.id
+ )}/show`
+ : '',
state: { _scrollToTop: scrollToTop },
}),
[basePath, record, resource, scrollToTop]
diff --git ORI/react-admin/packages/ra-ui-materialui/src/field/DateField.tsx ALT/react-admin/packages/ra-ui-materialui/src/field/DateField.tsx
index 9d5f715..669f3b5 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/field/DateField.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/field/DateField.tsx
@@ -71,13 +71,14 @@ export const DateField: FC<DateFieldProps> = memo(props => {
}
const date = value instanceof Date ? value : new Date(value);
- const dateString = showTime
- ? toLocaleStringSupportsLocales
- ? date.toLocaleString(locales, options)
- : date.toLocaleString()
- : toLocaleStringSupportsLocales
- ? date.toLocaleDateString(locales, options)
- : date.toLocaleDateString();
+ const dateString =
+ showTime
+ ? toLocaleStringSupportsLocales
+ ? date.toLocaleString(locales, options)
+ : date.toLocaleString()
+ : toLocaleStringSupportsLocales
+ ? date.toLocaleDateString(locales, options)
+ : date.toLocaleDateString();
return (
<Typography
diff --git ORI/react-admin/packages/ra-ui-materialui/src/form/FormInput.tsx ALT/react-admin/packages/ra-ui-materialui/src/form/FormInput.tsx
index 600214f..f125171 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/form/FormInput.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/form/FormInput.tsx
@@ -29,9 +29,8 @@ const FormInput = <RecordType extends Record | Omit<Record, 'id'> = Record>(
) => {
const { input, classes: classesOverride, ...rest } = props;
const classes = useStyles(props);
- const { id, className, ...inputProps } = input
- ? input.props
- : { id: undefined, className: undefined };
+ const { id, className, ...inputProps } =
+ input ? input.props : { id: undefined, className: undefined };
return input ? (
<div
className={classnames(
diff --git ORI/react-admin/packages/ra-ui-materialui/src/form/TabbedFormTabs.tsx ALT/react-admin/packages/ra-ui-materialui/src/form/TabbedFormTabs.tsx
index 2408ebe..8051410 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/form/TabbedFormTabs.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/form/TabbedFormTabs.tsx
@@ -20,9 +20,10 @@ const TabbedFormTabs = (props: TabbedFormTabsProps) => {
// available tab. The current location will be applied again on the
// first render containing the targeted tab. This is almost transparent
// for the user who may just see a short tab selection animation
- const tabValue = validTabPaths.includes(location.pathname)
- ? location.pathname
- : validTabPaths[0];
+ const tabValue =
+ validTabPaths.includes(location.pathname)
+ ? location.pathname
+ : validTabPaths[0];
return (
<Tabs
diff --git ORI/react-admin/packages/ra-ui-materialui/src/form/TabbedFormView.tsx ALT/react-admin/packages/ra-ui-materialui/src/form/TabbedFormView.tsx
index ce5566f..6ca71eb 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/form/TabbedFormView.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/form/TabbedFormView.tsx
@@ -98,14 +98,16 @@ export const TabbedFormView = (props: TabbedFormViewProps): ReactElement => {
resource,
record,
basePath,
- hidden: syncWithLocation
- ? !routeProps.match
- : tabValue !== index,
+ hidden:
+ syncWithLocation
+ ? !routeProps.match
+ : tabValue !== index,
variant: tab.props.variant || variant,
margin: tab.props.margin || margin,
- value: syncWithLocation
- ? tabPath
- : index,
+ value:
+ syncWithLocation
+ ? tabPath
+ : index,
})
: null
}
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/ArrayInput/ArrayInput.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/ArrayInput/ArrayInput.tsx
index 0c976aa..9968ce2 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/ArrayInput/ArrayInput.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/ArrayInput/ArrayInput.tsx
@@ -74,9 +74,8 @@ export const ArrayInput: FC<ArrayInputProps> = ({
margin = 'dense',
...rest
}) => {
- const sanitizedValidate = Array.isArray(validate)
- ? composeSyncValidators(validate)
- : validate;
+ const sanitizedValidate =
+ Array.isArray(validate) ? composeSyncValidators(validate) : validate;
const fieldProps = useFieldArray(source, {
initialValue: defaultValue,
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/ArrayInput/SimpleFormIteratorItem.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/ArrayInput/SimpleFormIteratorItem.tsx
index bc041a4..1b63ea8 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/ArrayInput/SimpleFormIteratorItem.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/ArrayInput/SimpleFormIteratorItem.tsx
@@ -114,9 +114,10 @@ export const SimpleFormIteratorItem = React.forwardRef(
input.props.basePath || basePath
}
input={cloneElement(input, {
- source: source
- ? `${member}.${source}`
- : member,
+ source:
+ source
+ ? `${member}.${source}`
+ : member,
index: source ? undefined : index2,
label:
typeof input.props.label ===
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/AutocompleteArrayInput.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/AutocompleteArrayInput.tsx
index 7f7a077..0d841a2 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/AutocompleteArrayInput.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/AutocompleteArrayInput.tsx
@@ -224,9 +224,8 @@ const AutocompleteArrayInput = (props: AutocompleteArrayInputProps) => {
const handleFilterChange = useCallback(
(eventOrValue: React.ChangeEvent<{ value: string }> | string) => {
const event = eventOrValue as React.ChangeEvent<{ value: string }>;
- const value = event.target
- ? event.target.value
- : (eventOrValue as string);
+ const value =
+ event.target ? event.target.value : (eventOrValue as string);
setFilterValue(value);
if (setFilter) {
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/AutocompleteInput.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/AutocompleteInput.tsx
index d29d882..60227c6 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/AutocompleteInput.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/AutocompleteInput.tsx
@@ -294,9 +294,8 @@ export const AutocompleteInput = (props: AutocompleteInputProps) => {
const handleFilterChange = useCallback(
(eventOrValue: React.ChangeEvent<{ value: string }> | string) => {
const event = eventOrValue as React.ChangeEvent<{ value: string }>;
- const value = event.target
- ? event.target.value
- : (eventOrValue as string);
+ const value =
+ event.target ? event.target.value : (eventOrValue as string);
if (setFilter) {
setFilter(value);
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/ReferenceArrayInput.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/ReferenceArrayInput.tsx
index c1e3c28..6447d18 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/ReferenceArrayInput.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/ReferenceArrayInput.tsx
@@ -285,9 +285,8 @@ export const ReferenceArrayInputView = ({
return React.cloneElement(children, {
allowEmpty,
- basePath: basePath
- ? basePath.replace(resource, reference)
- : `/${reference}`,
+ basePath:
+ basePath ? basePath.replace(resource, reference) : `/${reference}`,
choices,
className,
error,
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/ReferenceInput.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/ReferenceInput.tsx
index eca6e2c..169c4ed 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/ReferenceInput.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/ReferenceInput.tsx
@@ -216,12 +216,13 @@ export const ReferenceInputView = (props: ReferenceInputViewProps) => {
// When the useReferenceInputController returns a warning, it means it
// had an issue trying to load the referenced record
// We display it by overriding the final-form meta
- const finalMeta = warning
- ? {
- ...meta,
- error: warning,
- }
- : meta;
+ const finalMeta =
+ warning
+ ? {
+ ...meta,
+ error: warning,
+ }
+ : meta;
// helperText should never be set on ReferenceInput, only in child component
// But in a Filter component, the child helperText have to be forced to false
diff --git ORI/react-admin/packages/ra-ui-materialui/src/layout/SidebarToggleButton.tsx ALT/react-admin/packages/ra-ui-materialui/src/layout/SidebarToggleButton.tsx
index be13bf1..28e44c2 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/layout/SidebarToggleButton.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/layout/SidebarToggleButton.tsx
@@ -35,9 +35,10 @@ export const SidebarToggleButton = (props: SidebarToggleButtonProps) => {
>
<MenuIcon
classes={{
- root: open
- ? classes.menuButtonIconOpen
- : classes.menuButtonIconClosed,
+ root:
+ open
+ ? classes.menuButtonIconOpen
+ : classes.menuButtonIconClosed,
}}
/>
</IconButton>
diff --git ORI/react-admin/packages/ra-ui-materialui/src/layout/Title.tsx ALT/react-admin/packages/ra-ui-materialui/src/layout/Title.tsx
index 27f33ba..b61dfaf 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/layout/Title.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/layout/Title.tsx
@@ -28,17 +28,18 @@ const Title: FC<TitleProps> = ({
warning(!defaultTitle && !title, 'Missing title prop in <Title> element');
- const titleElement = !title ? (
- <span className={className} {...rest}>
- {defaultTitle}
- </span>
- ) : typeof title === 'string' ? (
- <span className={className} {...rest}>
- {translate(title, { _: title })}
- </span>
- ) : (
- cloneElement(title, { className, record, ...rest })
- );
+ const titleElement =
+ !title ? (
+ <span className={className} {...rest}>
+ {defaultTitle}
+ </span>
+ ) : typeof title === 'string' ? (
+ <span className={className} {...rest}>
+ {translate(title, { _: title })}
+ </span>
+ ) : (
+ cloneElement(title, { className, record, ...rest })
+ );
return createPortal(titleElement, container);
};
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/SingleFieldList.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/SingleFieldList.tsx
index 3727fa4..6e04ded 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/SingleFieldList.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/SingleFieldList.tsx
@@ -102,9 +102,8 @@ const SingleFieldList = (props: SingleFieldListProps) => {
{...sanitizeListRestProps(rest)}
>
{ids.map(id => {
- const resourceLinkPath = !linkType
- ? false
- : linkToRecord(basePath, id, linkType);
+ const resourceLinkPath =
+ !linkType ? false : linkToRecord(basePath, id, linkType);
if (resourceLinkPath) {
return (
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/datagrid/Datagrid.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/datagrid/Datagrid.tsx
index f51b9c6..c226e92 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/datagrid/Datagrid.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/datagrid/Datagrid.tsx
@@ -164,9 +164,10 @@ const Datagrid: FC<DatagridProps> = React.forwardRef((props, ref) => {
Math.max(lastSelectedIndex, index) + 1
);
- const newSelectedIds = event.target.checked
- ? union(selectedIds, idsBetweenSelections)
- : difference(selectedIds, idsBetweenSelections);
+ const newSelectedIds =
+ event.target.checked
+ ? union(selectedIds, idsBetweenSelections)
+ : difference(selectedIds, idsBetweenSelections);
onSelect(
isRowSelectable
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridHeader.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridHeader.tsx
index ee72cf1..4ddc9d1 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridHeader.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridHeader.tsx
@@ -72,9 +72,8 @@ export const DatagridHeader = (props: DatagridHeaderProps) => {
[data, ids, onSelect, isRowSelectable, selectedIds]
);
- const selectableIds = isRowSelectable
- ? ids.filter(id => isRowSelectable(data[id]))
- : ids;
+ const selectableIds =
+ isRowSelectable ? ids.filter(id => isRowSelectable(data[id])) : ids;
return (
<TableHead className={classnames(className, classes.thead)}> |
|
prettier/prettier#12087 VS prettier/prettier@main :: typescript-eslint/typescript-eslint@833f822 Diff (1666 lines)diff --git ORI/typescript-eslint/packages/eslint-plugin-internal/src/rules/plugin-test-formatting.ts ALT/typescript-eslint/packages/eslint-plugin-internal/src/rules/plugin-test-formatting.ts
index 81fcb8c..b33b192 100644
--- ORI/typescript-eslint/packages/eslint-plugin-internal/src/rules/plugin-test-formatting.ts
+++ ALT/typescript-eslint/packages/eslint-plugin-internal/src/rules/plugin-test-formatting.ts
@@ -221,9 +221,8 @@ export default createRule<Options, MessageIds>({
if (output && output !== literal.value) {
context.report({
node: literal,
- messageId: isErrorTest
- ? 'invalidFormattingErrorTest'
- : 'invalidFormatting',
+ messageId:
+ isErrorTest ? 'invalidFormattingErrorTest' : 'invalidFormatting',
fix(fixer) {
if (output.includes('\n')) {
// formatted string is multiline, then have to use backticks
@@ -382,18 +381,18 @@ export default createRule<Options, MessageIds>({
const code = lines.join('\n');
const formatted = prettierFormat(code, literal);
if (formatted && formatted !== code) {
- const formattedIndented = requiresIndent
- ? formatted
- .split('\n')
- .map(l => doIndent(l, expectedIndent))
- .join('\n')
- : formatted;
+ const formattedIndented =
+ requiresIndent
+ ? formatted
+ .split('\n')
+ .map(l => doIndent(l, expectedIndent))
+ .join('\n')
+ : formatted;
return context.report({
node: literal,
- messageId: isErrorTest
- ? 'invalidFormattingErrorTest'
- : 'invalidFormatting',
+ messageId:
+ isErrorTest ? 'invalidFormattingErrorTest' : 'invalidFormatting',
fix(fixer) {
return fixer.replaceText(
literal,
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/array-type.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/array-type.ts
index 35045fd..25dddc9 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/array-type.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/array-type.ts
@@ -197,9 +197,8 @@ export default util.createRule<Options, MessageIds>({
}
const isReadonlyArrayType = node.typeName.name === 'ReadonlyArray';
- const currentOption = isReadonlyArrayType
- ? readonlyOption
- : defaultOption;
+ const currentOption =
+ isReadonlyArrayType ? readonlyOption : defaultOption;
if (currentOption === 'generic') {
return;
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/ban-types.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/ban-types.ts
index ad0620f..f22ba6d 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/ban-types.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/ban-types.ts
@@ -188,9 +188,10 @@ export default util.createRule<Options, MessageIds>({
name,
customMessage,
},
- fix: fixWith
- ? (fixer): TSESLint.RuleFix => fixer.replaceText(typeNode, fixWith)
- : null,
+ fix:
+ fixWith
+ ? (fixer): TSESLint.RuleFix => fixer.replaceText(typeNode, fixWith)
+ : null,
});
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/consistent-indexed-object-style.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/consistent-indexed-object-style.ts
index 8c2081a..6ed9c7e 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/consistent-indexed-object-style.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/consistent-indexed-object-style.ts
@@ -70,16 +70,18 @@ export default createRule<Options, MessageIds>({
context.report({
node,
messageId: 'preferRecord',
- fix: safeFix
- ? (fixer): TSESLint.RuleFix => {
- const key = sourceCode.getText(keyType.typeAnnotation);
- const value = sourceCode.getText(valueType.typeAnnotation);
- const record = member.readonly
- ? `Readonly<Record<${key}, ${value}>>`
- : `Record<${key}, ${value}>`;
- return fixer.replaceText(node, `${prefix}${record}${postfix}`);
- }
- : null,
+ fix:
+ safeFix
+ ? (fixer): TSESLint.RuleFix => {
+ const key = sourceCode.getText(keyType.typeAnnotation);
+ const value = sourceCode.getText(valueType.typeAnnotation);
+ const record =
+ member.readonly
+ ? `Readonly<Record<${key}, ${value}>>`
+ : `Record<${key}, ${value}>`;
+ return fixer.replaceText(node, `${prefix}${record}${postfix}`);
+ }
+ : null,
});
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-definitions.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-definitions.ts
index efb7bdd..2147ae0 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-definitions.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-definitions.ts
@@ -92,50 +92,54 @@ export default util.createRule({
* remove automatically fix when the interface is within a declare global
* @see {@link https://github.com/typescript-eslint/typescript-eslint/issues/2707}
*/
- fix: isCurrentlyTraversedNodeWithinModuleDeclaration()
- ? null
- : (fixer): TSESLint.RuleFix[] => {
- const typeNode = node.typeParameters ?? node.id;
- const fixes: TSESLint.RuleFix[] = [];
+ fix:
+ isCurrentlyTraversedNodeWithinModuleDeclaration()
+ ? null
+ : (fixer): TSESLint.RuleFix[] => {
+ const typeNode = node.typeParameters ?? node.id;
+ const fixes: TSESLint.RuleFix[] = [];
- const firstToken = sourceCode.getFirstToken(node);
- if (firstToken) {
- fixes.push(fixer.replaceText(firstToken, 'type'));
- fixes.push(
- fixer.replaceTextRange(
- [typeNode.range[1], node.body.range[0]],
- ' = ',
- ),
- );
- }
+ const firstToken = sourceCode.getFirstToken(node);
+ if (firstToken) {
+ fixes.push(fixer.replaceText(firstToken, 'type'));
+ fixes.push(
+ fixer.replaceTextRange(
+ [typeNode.range[1], node.body.range[0]],
+ ' = ',
+ ),
+ );
+ }
- if (node.extends) {
- node.extends.forEach(heritage => {
- const typeIdentifier = sourceCode.getText(heritage);
+ if (node.extends) {
+ node.extends.forEach(heritage => {
+ const typeIdentifier = sourceCode.getText(heritage);
+ fixes.push(
+ fixer.insertTextAfter(
+ node.body,
+ ` & ${typeIdentifier}`,
+ ),
+ );
+ });
+ }
+
+ if (
+ node.parent?.type ===
+ AST_NODE_TYPES.ExportDefaultDeclaration
+ ) {
fixes.push(
+ fixer.removeRange([
+ node.parent.range[0],
+ node.range[0],
+ ]),
fixer.insertTextAfter(
node.body,
- ` & ${typeIdentifier}`,
+ `\nexport default ${node.id.name}`,
),
);
- });
- }
-
- if (
- node.parent?.type ===
- AST_NODE_TYPES.ExportDefaultDeclaration
- ) {
- fixes.push(
- fixer.removeRange([node.parent.range[0], node.range[0]]),
- fixer.insertTextAfter(
- node.body,
- `\nexport default ${node.id.name}`,
- ),
- );
- }
+ }
- return fixes;
- },
+ return fixes;
+ },
});
},
}),
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/indent-new-do-not-use/OffsetStorage.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/indent-new-do-not-use/OffsetStorage.ts
index 6feea3d..3847326 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/indent-new-do-not-use/OffsetStorage.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/indent-new-do-not-use/OffsetStorage.ts
@@ -178,9 +178,8 @@ export class OffsetStorage {
fromToken.range[0] >= range[0] &&
fromToken.range[1] <= range[1];
// this has to be before the delete + insert below or else you'll get into a cycle
- const fromTokenDescriptor = fromTokenIsInRange
- ? this.getOffsetDescriptor(fromToken)
- : null;
+ const fromTokenDescriptor =
+ fromTokenIsInRange ? this.getOffsetDescriptor(fromToken) : null;
// First, remove any existing nodes in the range from the tree.
this.tree.deleteRange(range[0] + 1, range[1]);
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/indent-new-do-not-use/index.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/indent-new-do-not-use/index.ts
index 58da2c0..646fbb8 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/indent-new-do-not-use/index.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/indent-new-do-not-use/index.ts
@@ -708,13 +708,14 @@ export default createRule<Options, MessageIds>({
function addFunctionCallIndent(
node: TSESTree.CallExpression | TSESTree.NewExpression,
): void {
- const openingParen = node.arguments.length
- ? sourceCode.getFirstTokenBetween(
- node.callee,
- node.arguments[0],
- isOpeningParenToken,
- )!
- : sourceCode.getLastToken(node, 1)!;
+ const openingParen =
+ node.arguments.length
+ ? sourceCode.getFirstTokenBetween(
+ node.callee,
+ node.arguments[0],
+ isOpeningParenToken,
+ )!
+ : sourceCode.getLastToken(node, 1)!;
const closingParen = sourceCode.getLastToken(node)!;
parameterParens.add(openingParen);
@@ -1212,13 +1213,13 @@ export default createRule<Options, MessageIds>({
node.property,
{ filter: isClosingParenToken },
).length;
- const firstObjectToken = objectParenCount
- ? sourceCode.getTokenBefore(object, { skip: objectParenCount - 1 })!
- : sourceCode.getFirstToken(object)!;
+ const firstObjectToken =
+ objectParenCount
+ ? sourceCode.getTokenBefore(object, { skip: objectParenCount - 1 })!
+ : sourceCode.getFirstToken(object)!;
const lastObjectToken = sourceCode.getTokenBefore(firstNonObjectToken)!;
- const firstPropertyToken = isComputed
- ? firstNonObjectToken
- : secondNonObjectToken;
+ const firstPropertyToken =
+ isComputed ? firstNonObjectToken : secondNonObjectToken;
if (isComputed) {
// For computed MemberExpressions, match the closing bracket with the opening bracket.
@@ -1390,12 +1391,13 @@ export default createRule<Options, MessageIds>({
return;
}
- let variableIndent = Object.prototype.hasOwnProperty.call(
- options.VariableDeclarator,
- node.kind,
- )
- ? (options.VariableDeclarator as VariableDeclaratorObj)[node.kind]
- : DEFAULT_VARIABLE_INDENT;
+ let variableIndent =
+ Object.prototype.hasOwnProperty.call(
+ options.VariableDeclarator,
+ node.kind,
+ )
+ ? (options.VariableDeclarator as VariableDeclaratorObj)[node.kind]
+ : DEFAULT_VARIABLE_INDENT;
const firstToken = sourceCode.getFirstToken(node)!;
const lastToken = sourceCode.getLastToken(node)!;
@@ -1693,9 +1695,10 @@ export default createRule<Options, MessageIds>({
if (isCommentToken(firstTokenOfLine)) {
const tokenBefore = precedingTokens.get(firstTokenOfLine)!;
- const tokenAfter = tokenBefore
- ? sourceCode.getTokenAfter(tokenBefore)!
- : sourceCode.ast.tokens[0];
+ const tokenAfter =
+ tokenBefore
+ ? sourceCode.getTokenAfter(tokenBefore)!
+ : sourceCode.ast.tokens[0];
const mayAlignWithBefore =
tokenBefore &&
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/indent.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/indent.ts
index e057ca9..9a25b7d 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/indent.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/indent.ts
@@ -385,9 +385,10 @@ export default util.createRule<Options, MessageIds>({
],
loc: {
start: squareBracketStart.loc.start,
- end: node.typeAnnotation
- ? node.typeAnnotation.loc.end
- : squareBracketStart.loc.end,
+ end:
+ node.typeAnnotation
+ ? node.typeAnnotation.loc.end
+ : squareBracketStart.loc.end,
},
kind: 'init' as const,
computed: false,
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/lines-between-class-members.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/lines-between-class-members.ts
index c78216b..350fb0d 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/lines-between-class-members.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/lines-between-class-members.ts
@@ -58,9 +58,10 @@ export default util.createRule<Options, MessageIds>({
return {
ClassBody(node): void {
- const body = exceptAfterOverload
- ? node.body.filter(node => !isOverload(node))
- : node.body;
+ const body =
+ exceptAfterOverload
+ ? node.body.filter(node => !isOverload(node))
+ : node.body;
rules.ClassBody({ ...node, body });
},
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/member-delimiter-style.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/member-delimiter-style.ts
index 5fa5a86..b83e70a 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/member-delimiter-style.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/member-delimiter-style.ts
@@ -293,9 +293,10 @@ export default util.createRule<Options, MessageIds>({
node.type === AST_NODE_TYPES.TSInterfaceBody
? interfaceOptions
: typeLiteralOptions;
- const opts = isSingleLine
- ? { ...typeOpts.singleline, type: 'single-line' }
- : { ...typeOpts.multiline, type: 'multi-line' };
+ const opts =
+ isSingleLine
+ ? { ...typeOpts.singleline, type: 'single-line' }
+ : { ...typeOpts.multiline, type: 'multi-line' };
members.forEach((member, index) => {
checkLastToken(member, opts ?? {}, index === members.length - 1);
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 c4e6e36..99987a4 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
@@ -33,12 +33,13 @@ function normalizeOption(option: Selector): NormalizedSelector[] {
const normalizedOption = {
// format options
format: option.format ? option.format.map(f => PredefinedFormats[f]) : null,
- custom: option.custom
- ? {
- regex: new RegExp(option.custom.regex, 'u'),
- match: option.custom.match,
- }
- : null,
+ custom:
+ option.custom
+ ? {
+ regex: new RegExp(option.custom.regex, 'u'),
+ match: option.custom.match,
+ }
+ : null,
leadingUnderscore:
option.leadingUnderscore !== undefined
? UnderscoreOptions[option.leadingUnderscore]
@@ -67,14 +68,12 @@ function normalizeOption(option: Selector): NormalizedSelector[] {
modifierWeight: weight,
};
- const selectors = Array.isArray(option.selector)
- ? option.selector
- : [option.selector];
+ const selectors =
+ Array.isArray(option.selector) ? option.selector : [option.selector];
return selectors.map(selector => ({
- selector: isMetaSelector(selector)
- ? MetaSelectors[selector]
- : Selectors[selector],
+ selector:
+ isMetaSelector(selector) ? MetaSelectors[selector] : Selectors[selector],
...normalizedOption,
}));
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-confusing-non-null-assertion.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-confusing-non-null-assertion.ts
index 1535a64..a1a270f 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-confusing-non-null-assertion.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-confusing-non-null-assertion.ts
@@ -62,9 +62,8 @@ export default util.createRule({
messageId: isAssign ? 'confusingAssign' : 'confusingEqual',
suggest: [
{
- messageId: isAssign
- ? 'notNeedInAssign'
- : 'notNeedInEqualTest',
+ messageId:
+ isAssign ? 'notNeedInAssign' : 'notNeedInEqualTest',
fix: (fixer): TSESLint.RuleFix[] => [
fixer.remove(leftHandFinalToken),
],
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-inferrable-types.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-inferrable-types.ts
index 9c8a1a1..3db77ca 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-inferrable-types.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-inferrable-types.ts
@@ -115,9 +115,8 @@ export default util.createRule<Options, MessageIds>({
switch (annotation.type) {
case AST_NODE_TYPES.TSBigIntKeyword: {
// note that bigint cannot have + prefixed to it
- const unwrappedInit = hasUnaryPrefix(init, '-')
- ? init.argument
- : init;
+ const unwrappedInit =
+ hasUnaryPrefix(init, '-') ? init.argument : init;
return (
isFunctionCall(unwrappedInit, 'BigInt') ||
@@ -134,9 +133,8 @@ export default util.createRule<Options, MessageIds>({
);
case AST_NODE_TYPES.TSNumberKeyword: {
- const unwrappedInit = hasUnaryPrefix(init, '+', '-')
- ? init.argument
- : init;
+ const unwrappedInit =
+ hasUnaryPrefix(init, '+', '-') ? init.argument : init;
return (
isIdentifier(unwrappedInit, 'Infinity', 'NaN') ||
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 dceffa6..21bab0f 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
@@ -121,9 +121,10 @@ export default util.createRule<[Options], MessageIds>({
if (!allowInGenericTypeArguments) {
context.report({
- messageId: allowAsThisParameter
- ? 'invalidVoidNotReturnOrThisParam'
- : 'invalidVoidNotReturn',
+ messageId:
+ allowAsThisParameter
+ ? 'invalidVoidNotReturnOrThisParam'
+ : 'invalidVoidNotReturn',
node,
});
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-magic-numbers.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-magic-numbers.ts
index e63c806..097d5b9 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-magic-numbers.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-magic-numbers.ts
@@ -10,9 +10,10 @@ const baseRule = getESLintCoreRule('no-magic-numbers');
type Options = util.InferOptionsTypeFromRule<typeof baseRule>;
type MessageIds = util.InferMessageIdsTypeFromRule<typeof baseRule>;
-const baseRuleSchema = Array.isArray(baseRule.meta.schema)
- ? baseRule.meta.schema[0]
- : baseRule.meta.schema;
+const baseRuleSchema =
+ Array.isArray(baseRule.meta.schema)
+ ? baseRule.meta.schema[0]
+ : baseRule.meta.schema;
export default util.createRule<Options, MessageIds>({
name: 'no-magic-numbers',
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-misused-promises.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-misused-promises.ts
index 353b7d4..66b0384 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-misused-promises.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-misused-promises.ts
@@ -228,9 +228,10 @@ function voidFunctionParams(
for (const subType of tsutils.unionTypeParts(type)) {
// Standard function calls and `new` have two different types of signatures
- const signatures = ts.isCallExpression(node)
- ? subType.getCallSignatures()
- : subType.getConstructSignatures();
+ const signatures =
+ ts.isCallExpression(node)
+ ? subType.getCallSignatures()
+ : subType.getConstructSignatures();
for (const signature of signatures) {
for (const [index, parameter] of signature.parameters.entries()) {
const type = checker.getTypeOfSymbolAtLocation(
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-shadow.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-shadow.ts
index dfba42c..f2b3f6b 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-shadow.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-shadow.ts
@@ -420,9 +420,10 @@ export default util.createRule<Options, MessageIds>({
}
// Gets shadowed variable.
- const shadowed = scope.upper
- ? ASTUtils.findVariable(scope.upper, variable.name)
- : null;
+ const shadowed =
+ scope.upper
+ ? ASTUtils.findVariable(scope.upper, variable.name)
+ : null;
if (!shadowed) {
continue;
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-boolean-literal-compare.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-boolean-literal-compare.ts
index 41367d4..e7b7dac 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-boolean-literal-compare.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-boolean-literal-compare.ts
@@ -260,15 +260,16 @@ export default util.createRule<Options, MessageIds>({
yield fixer.insertTextBefore(node, '(');
yield fixer.insertTextAfter(node, ' ?? true)');
},
- messageId: comparison.expressionIsNullableBoolean
- ? comparison.literalBooleanInComparison
- ? comparison.negated
- ? 'comparingNullableToTrueNegated'
- : 'comparingNullableToTrueDirect'
- : 'comparingNullableToFalse'
- : comparison.negated
- ? 'negated'
- : 'direct',
+ messageId:
+ comparison.expressionIsNullableBoolean
+ ? comparison.literalBooleanInComparison
+ ? comparison.negated
+ ? 'comparingNullableToTrueNegated'
+ : 'comparingNullableToTrueDirect'
+ : 'comparingNullableToFalse'
+ : comparison.negated
+ ? 'negated'
+ : 'direct',
node,
});
},
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-type-assertion.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-type-assertion.ts
index cd5bce1..a796aec 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-type-assertion.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-type-assertion.ts
@@ -207,12 +207,10 @@ export default util.createRule<Options, MessageIds>({
// make sure that the parent accepts the same types
// i.e. assigning `string | null | undefined` to `string | undefined` is invalid
- const isValidUndefined = typeIncludesUndefined
- ? contextualTypeIncludesUndefined
- : true;
- const isValidNull = typeIncludesNull
- ? contextualTypeIncludesNull
- : true;
+ const isValidUndefined =
+ typeIncludesUndefined ? contextualTypeIncludesUndefined : true;
+ const isValidNull =
+ typeIncludesNull ? contextualTypeIncludesNull : true;
if (isValidUndefined && isValidNull) {
context.report({
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-type-constraint.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-type-constraint.ts
index 68895c0..b7339e0 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-type-constraint.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-type-constraint.ts
@@ -53,12 +53,13 @@ export default util.createRule({
// In theory, we could use the type checker for more advanced constraint types...
// ...but in practice, these types are rare, and likely not worth requiring type info.
// https://github.com/typescript-eslint/typescript-eslint/pull/2516#discussion_r495731858
- const unnecessaryConstraints = is3dot9
- ? new Map([
- [AST_NODE_TYPES.TSAnyKeyword, 'any'],
- [AST_NODE_TYPES.TSUnknownKeyword, 'unknown'],
- ])
- : new Map([[AST_NODE_TYPES.TSUnknownKeyword, 'unknown']]);
+ const unnecessaryConstraints =
+ is3dot9
+ ? new Map([
+ [AST_NODE_TYPES.TSAnyKeyword, 'any'],
+ [AST_NODE_TYPES.TSUnknownKeyword, 'unknown'],
+ ])
+ : new Map([[AST_NODE_TYPES.TSUnknownKeyword, 'unknown']]);
const inJsx = context.getFilename().toLowerCase().endsWith('tsx');
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unsafe-return.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unsafe-return.ts
index e226d52..8dc15e2 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unsafe-return.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unsafe-return.ts
@@ -83,9 +83,10 @@ export default util.createRule({
// so we have to use the contextual typing in these cases, i.e.
// const foo1: () => Set<string> = () => new Set<any>();
// the return type of the arrow function is Set<any> even though the variable is typed as Set<string>
- let functionType = tsutils.isExpression(functionTSNode)
- ? util.getContextualType(checker, functionTSNode)
- : checker.getTypeAtLocation(functionTSNode);
+ let functionType =
+ tsutils.isExpression(functionTSNode)
+ ? util.getContextualType(checker, functionTSNode)
+ : checker.getTypeAtLocation(functionTSNode);
if (!functionType) {
functionType = checker.getTypeAtLocation(functionTSNode);
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unused-vars.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unused-vars.ts
index 7cce473..df114ac 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unused-vars.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unused-vars.ts
@@ -345,9 +345,8 @@ export default util.createRule<Options, MessageIds>({
pattern = options.varsIgnorePattern.toString();
}
- const additional = type
- ? `. Allowed unused ${type} must match ${pattern}`
- : '';
+ const additional =
+ type ? `. Allowed unused ${type} must match ${pattern}` : '';
return {
varName: unusedVar.name,
@@ -365,9 +364,10 @@ export default util.createRule<Options, MessageIds>({
function getAssignedMessageData(
unusedVar: TSESLint.Scope.Variable,
): Record<string, unknown> {
- const additional = options.varsIgnorePattern
- ? `. Allowed unused vars must match ${options.varsIgnorePattern.toString()}`
- : '';
+ const additional =
+ options.varsIgnorePattern
+ ? `. Allowed unused vars must match ${options.varsIgnorePattern.toString()}`
+ : '';
return {
varName: unusedVar.name,
@@ -384,14 +384,16 @@ export default util.createRule<Options, MessageIds>({
// Report the first declaration.
if (unusedVar.defs.length > 0) {
context.report({
- node: unusedVar.references.length
- ? unusedVar.references[unusedVar.references.length - 1]
- .identifier
- : unusedVar.identifiers[0],
+ node:
+ unusedVar.references.length
+ ? unusedVar.references[unusedVar.references.length - 1]
+ .identifier
+ : unusedVar.identifiers[0],
messageId: 'unusedVar',
- data: unusedVar.references.some(ref => ref.isWrite())
- ? getAssignedMessageData(unusedVar)
- : getDefinedMessageData(unusedVar),
+ data:
+ unusedVar.references.some(ref => ref.isWrite())
+ ? getAssignedMessageData(unusedVar)
+ : getDefinedMessageData(unusedVar),
});
// If there are no regular declaration, report the first `/*globals*/` comment directive.
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/object-curly-spacing.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/object-curly-spacing.ts
index fe74c8f..b3a9d64 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/object-curly-spacing.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/object-curly-spacing.ts
@@ -201,9 +201,10 @@ export default createRule<Options, MessageIds>({
isClosingBracketToken(penultimate)) ||
(options.objectsInObjectsException &&
isClosingBraceToken(penultimate));
- const penultimateType = shouldCheckPenultimate
- ? sourceCode.getNodeByRangeIndex(penultimate.range[0])!.type
- : undefined;
+ const penultimateType =
+ shouldCheckPenultimate
+ ? sourceCode.getNodeByRangeIndex(penultimate.range[0])!.type
+ : undefined;
const closingCurlyBraceMustBeSpaced =
(options.arraysInObjectsException &&
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/padding-line-between-statements.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/padding-line-between-statements.ts
index 13a84c2..b692196 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/padding-line-between-statements.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/padding-line-between-statements.ts
@@ -467,9 +467,8 @@ function verifyForAlways(
return true;
},
}) as TSESTree.Token) || nextNode;
- const insertText = util.isTokenOnSameLine(prevToken, nextToken)
- ? '\n\n'
- : '\n';
+ const insertText =
+ util.isTokenOnSameLine(prevToken, nextToken) ? '\n\n' : '\n';
return fixer.insertTextAfter(prevToken, insertText);
},
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-function-type.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-function-type.ts
index ceeafcd..e3850c9 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-function-type.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-function-type.ts
@@ -110,87 +110,93 @@ export default util.createRule({
data: {
literalOrInterface: phrases[node.type],
},
- fix: fixable
- ? null
- : (fixer): TSESLint.RuleFix[] => {
- const fixes: TSESLint.RuleFix[] = [];
- const start = member.range[0];
- const colonPos = member.returnType!.range[0] - start;
- const text = sourceCode.getText().slice(start, member.range[1]);
- const comments = sourceCode
- .getCommentsBefore(member)
- .concat(sourceCode.getCommentsAfter(member));
- let suggestion = `${text.slice(0, colonPos)} =>${text.slice(
- colonPos + 1,
- )}`;
- const lastChar = suggestion.endsWith(';') ? ';' : '';
- if (lastChar) {
- suggestion = suggestion.slice(0, -1);
- }
- if (shouldWrapSuggestion(node.parent)) {
- suggestion = `(${suggestion})`;
- }
+ fix:
+ fixable
+ ? null
+ : (fixer): TSESLint.RuleFix[] => {
+ const fixes: TSESLint.RuleFix[] = [];
+ const start = member.range[0];
+ const colonPos = member.returnType!.range[0] - start;
+ const text = sourceCode
+ .getText()
+ .slice(start, member.range[1]);
+ const comments = sourceCode
+ .getCommentsBefore(member)
+ .concat(sourceCode.getCommentsAfter(member));
+ let suggestion = `${text.slice(0, colonPos)} =>${text.slice(
+ colonPos + 1,
+ )}`;
+ const lastChar = suggestion.endsWith(';') ? ';' : '';
+ if (lastChar) {
+ suggestion = suggestion.slice(0, -1);
+ }
+ if (shouldWrapSuggestion(node.parent)) {
+ suggestion = `(${suggestion})`;
+ }
- if (node.type === AST_NODE_TYPES.TSInterfaceDeclaration) {
- if (typeof node.typeParameters !== 'undefined') {
- suggestion = `type ${sourceCode
- .getText()
- .slice(
- node.id.range[0],
- node.typeParameters.range[1],
- )} = ${suggestion}${lastChar}`;
- } else {
- suggestion = `type ${node.id.name} = ${suggestion}${lastChar}`;
+ if (node.type === AST_NODE_TYPES.TSInterfaceDeclaration) {
+ if (typeof node.typeParameters !== 'undefined') {
+ suggestion = `type ${sourceCode
+ .getText()
+ .slice(
+ node.id.range[0],
+ node.typeParameters.range[1],
+ )} = ${suggestion}${lastChar}`;
+ } else {
+ suggestion = `type ${node.id.name} = ${suggestion}${lastChar}`;
+ }
}
- }
- const isParentExported =
- node.parent &&
- node.parent.type === AST_NODE_TYPES.ExportNamedDeclaration;
+ const isParentExported =
+ node.parent &&
+ node.parent.type === AST_NODE_TYPES.ExportNamedDeclaration;
- if (
- node.type === AST_NODE_TYPES.TSInterfaceDeclaration &&
- isParentExported
- ) {
- const commentsText = comments.reduce((text, comment) => {
- return (
- text +
- (comment.type === AST_TOKEN_TYPES.Line
- ? `//${comment.value}`
- : `/*${comment.value}*/`) +
- '\n'
+ if (
+ node.type === AST_NODE_TYPES.TSInterfaceDeclaration &&
+ isParentExported
+ ) {
+ const commentsText = comments.reduce((text, comment) => {
+ return (
+ text +
+ (comment.type === AST_TOKEN_TYPES.Line
+ ? `//${comment.value}`
+ : `/*${comment.value}*/`) +
+ '\n'
+ );
+ }, '');
+ // comments should move before export and not between export and interface declaration
+ fixes.push(
+ fixer.insertTextBefore(
+ node.parent as TSESTree.Node | TSESTree.Token,
+ commentsText,
+ ),
);
- }, '');
- // comments should move before export and not between export and interface declaration
+ } else {
+ comments.forEach(comment => {
+ let commentText =
+ comment.type === AST_TOKEN_TYPES.Line
+ ? `//${comment.value}`
+ : `/*${comment.value}*/`;
+ const isCommentOnTheSameLine =
+ comment.loc.start.line === member.loc.start.line;
+ if (!isCommentOnTheSameLine) {
+ commentText += '\n';
+ } else {
+ commentText += ' ';
+ }
+ suggestion = commentText + suggestion;
+ });
+ }
+
+ const fixStart = node.range[0];
fixes.push(
- fixer.insertTextBefore(
- node.parent as TSESTree.Node | TSESTree.Token,
- commentsText,
+ fixer.replaceTextRange(
+ [fixStart, node.range[1]],
+ suggestion,
),
);
- } else {
- comments.forEach(comment => {
- let commentText =
- comment.type === AST_TOKEN_TYPES.Line
- ? `//${comment.value}`
- : `/*${comment.value}*/`;
- const isCommentOnTheSameLine =
- comment.loc.start.line === member.loc.start.line;
- if (!isCommentOnTheSameLine) {
- commentText += '\n';
- } else {
- commentText += ' ';
- }
- suggestion = commentText + suggestion;
- });
- }
-
- const fixStart = node.range[0];
- fixes.push(
- fixer.replaceTextRange([fixStart, node.range[1]], suggestion),
- );
- return fixes;
- },
+ return fixes;
+ },
});
}
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-optional-chain.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-optional-chain.ts
index 84c2e15..c7ca142 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-optional-chain.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-optional-chain.ts
@@ -348,13 +348,14 @@ function isValidChainTarget(
ALLOWED_MEMBER_OBJECT_TYPES.has(node.object.type) &&
// make sure to validate the expression is of our expected structure
isValidChainTarget(node.object, true);
- const isPropertyValid = node.computed
- ? ALLOWED_COMPUTED_PROP_TYPES.has(node.property.type) &&
- // make sure to validate the member expression is of our expected structure
- (node.property.type === AST_NODE_TYPES.MemberExpression
- ? isValidChainTarget(node.property, allowIdentifier)
- : true)
- : ALLOWED_NON_COMPUTED_PROP_TYPES.has(node.property.type);
+ const isPropertyValid =
+ node.computed
+ ? ALLOWED_COMPUTED_PROP_TYPES.has(node.property.type) &&
+ // make sure to validate the member expression is of our expected structure
+ (node.property.type === AST_NODE_TYPES.MemberExpression
+ ? isValidChainTarget(node.property, allowIdentifier)
+ : true)
+ : ALLOWED_NON_COMPUTED_PROP_TYPES.has(node.property.type);
return isObjectValid && isPropertyValid;
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-ts-expect-error.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-ts-expect-error.ts
index 15c0702..c11749d 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-ts-expect-error.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-ts-expect-error.ts
@@ -75,9 +75,10 @@ export default util.createRule<[], MessageIds>({
context.report({
node: comment,
messageId: 'preferExpectErrorComment',
- fix: isLineComment(comment)
- ? lineCommentRuleFixer
- : blockCommentRuleFixer,
+ fix:
+ isLineComment(comment)
+ ? lineCommentRuleFixer
+ : blockCommentRuleFixer,
});
}
});
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/space-infix-ops.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/space-infix-ops.ts
index fddeaac..83c131b 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/space-infix-ops.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/space-infix-ops.ts
@@ -128,9 +128,10 @@ export default util.createRule<Options, MessageIds>({
const leftNode = sourceCode.getTokenByRangeStart(
node.typeAnnotation?.range[0] ?? node.range[0],
)!;
- const rightNode = node.value
- ? sourceCode.getTokenByRangeStart(node.value.range[0])
- : undefined;
+ const rightNode =
+ node.value
+ ? sourceCode.getTokenByRangeStart(node.value.range[0])
+ : undefined;
checkAndReportAssignmentSpace(node, leftNode, rightNode);
}
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 08f21e3..6d1417d 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
@@ -48,11 +48,12 @@ export default createRule({
): TSESLint.RuleFix | null {
const lastCase =
node.cases.length > 0 ? node.cases[node.cases.length - 1] : null;
- const caseIndent = lastCase
- ? ' '.repeat(lastCase.loc.start.column)
- : // if there are no cases, use indentation of the switch statement
- // and leave it to user to format it correctly
- ' '.repeat(node.loc.start.column);
+ const caseIndent =
+ lastCase
+ ? ' '.repeat(lastCase.loc.start.column)
+ : // if there are no cases, use indentation of the switch statement
+ // and leave it to user to format it correctly
+ ' '.repeat(node.loc.start.column);
const missingCases = [];
for (const missingBranchType of missingBranchTypes) {
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/unified-signatures.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/unified-signatures.ts
index 7481dcd..9b08cb3 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/unified-signatures.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/unified-signatures.ts
@@ -95,12 +95,14 @@ export default util.createRule({
const { p0, p1 } = unify;
const lineOfOtherOverload = only2 ? undefined : p0.loc.start.line;
- const typeAnnotation0 = isTSParameterProperty(p0)
- ? p0.parameter.typeAnnotation
- : p0.typeAnnotation;
- const typeAnnotation1 = isTSParameterProperty(p1)
- ? p1.parameter.typeAnnotation
- : p1.typeAnnotation;
+ const typeAnnotation0 =
+ isTSParameterProperty(p0)
+ ? p0.parameter.typeAnnotation
+ : p0.typeAnnotation;
+ const typeAnnotation1 =
+ isTSParameterProperty(p1)
+ ? p1.parameter.typeAnnotation
+ : p1.typeAnnotation;
context.report({
loc: p1.loc,
@@ -116,9 +118,8 @@ export default util.createRule({
}
case 'extra-parameter': {
const { extraParameter, otherSignature } = unify;
- const lineOfOtherOverload = only2
- ? undefined
- : otherSignature.loc.start.line;
+ const lineOfOtherOverload =
+ only2 ? undefined : otherSignature.loc.start.line;
context.report({
loc: extraParameter.loc,
@@ -275,12 +276,14 @@ export default util.createRule({
for (let i = 0; i < minLength; i++) {
const sig1i = sig1[i];
const sig2i = sig2[i];
- const typeAnnotation1 = isTSParameterProperty(sig1i)
- ? sig1i.parameter.typeAnnotation
- : sig1i.typeAnnotation;
- const typeAnnotation2 = isTSParameterProperty(sig2i)
- ? sig2i.parameter.typeAnnotation
- : sig2i.typeAnnotation;
+ const typeAnnotation1 =
+ isTSParameterProperty(sig1i)
+ ? sig1i.parameter.typeAnnotation
+ : sig1i.typeAnnotation;
+ const typeAnnotation2 =
+ isTSParameterProperty(sig2i)
+ ? sig2i.parameter.typeAnnotation
+ : sig2i.typeAnnotation;
if (!typesAreEqual(typeAnnotation1, typeAnnotation2)) {
return undefined;
@@ -363,12 +366,14 @@ export default util.createRule({
a: TSESTree.Parameter,
b: TSESTree.Parameter,
): boolean {
- const typeAnnotationA = isTSParameterProperty(a)
- ? a.parameter.typeAnnotation
- : a.typeAnnotation;
- const typeAnnotationB = isTSParameterProperty(b)
- ? b.parameter.typeAnnotation
- : b.typeAnnotation;
+ const typeAnnotationA =
+ isTSParameterProperty(a)
+ ? a.parameter.typeAnnotation
+ : a.typeAnnotation;
+ const typeAnnotationB =
+ isTSParameterProperty(b)
+ ? b.parameter.typeAnnotation
+ : b.typeAnnotation;
return (
parametersHaveEqualSigils(a, b) &&
@@ -378,9 +383,8 @@ export default util.createRule({
/** True for optional/rest parameters. */
function parameterMayBeMissing(p: TSESTree.Parameter): boolean | undefined {
- const optional = isTSParameterProperty(p)
- ? p.parameter.optional
- : p.optional;
+ const optional =
+ isTSParameterProperty(p) ? p.parameter.optional : p.optional;
return p.type === AST_NODE_TYPES.RestElement || optional;
}
@@ -390,12 +394,10 @@ export default util.createRule({
a: TSESTree.Parameter,
b: TSESTree.Parameter,
): boolean {
- const optionalA = isTSParameterProperty(a)
- ? a.parameter.optional
- : a.optional;
- const optionalB = isTSParameterProperty(b)
- ? b.parameter.optional
- : b.optional;
+ const optionalA =
+ isTSParameterProperty(a) ? a.parameter.optional : a.optional;
+ const optionalB =
+ isTSParameterProperty(b) ? b.parameter.optional : b.optional;
return (
(a.type === AST_NODE_TYPES.RestElement) ===
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 badfbc1..1b761f5 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/indent/utils.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/indent/utils.ts
@@ -74,14 +74,14 @@ export function expectedErrors(
let errors: ProvidedError[];
if (Array.isArray(providedIndentType)) {
- errors = is2DProvidedErrorArr(providedIndentType)
- ? providedIndentType
- : [providedIndentType];
+ errors =
+ is2DProvidedErrorArr(providedIndentType)
+ ? providedIndentType
+ : [providedIndentType];
indentType = 'space';
} else {
- errors = is2DProvidedErrorArr(providedErrors)
- ? providedErrors
- : [providedErrors!];
+ errors =
+ is2DProvidedErrorArr(providedErrors) ? providedErrors : [providedErrors!];
indentType = providedIndentType;
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/naming-convention.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/naming-convention.test.ts
index b8ad03a..a524994 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/naming-convention.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/naming-convention.test.ts
@@ -275,9 +275,10 @@ function createInvalidTestCases(
messageId: MessageIds,
data: Record<string, unknown> = {},
): TSESLint.InvalidTestCase<MessageIds, Options> => {
- const selectors = Array.isArray(test.options.selector)
- ? test.options.selector
- : [test.options.selector];
+ const selectors =
+ Array.isArray(test.options.selector)
+ ? test.options.selector
+ : [test.options.selector];
const errorsTemplate = selectors.map(selector => ({
messageId,
...(selector !== 'default' &&
diff --git ORI/typescript-eslint/packages/eslint-plugin/tools/generate-configs.ts ALT/typescript-eslint/packages/eslint-plugin/tools/generate-configs.ts
index ed84f28..326efe1 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tools/generate-configs.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tools/generate-configs.ts
@@ -92,11 +92,12 @@ function reducer<TMessageIds extends string>(
const ruleName = `${RULE_NAME_PREFIX}${key}`;
const recommendation = value.meta.docs?.recommended;
- const usedSetting = settings.errorLevel
- ? settings.errorLevel
- : !recommendation
- ? DEFAULT_RULE_SETTING
- : recommendation;
+ const usedSetting =
+ settings.errorLevel
+ ? settings.errorLevel
+ : !recommendation
+ ? DEFAULT_RULE_SETTING
+ : recommendation;
if (BASE_RULES_TO_BE_OVERRIDDEN.has(key)) {
const baseRuleName = BASE_RULES_TO_BE_OVERRIDDEN.get(key)!;
diff --git ORI/typescript-eslint/packages/experimental-utils/src/ts-eslint/CLIEngine.ts ALT/typescript-eslint/packages/experimental-utils/src/ts-eslint/CLIEngine.ts
index 9cc1c97..02dfd83 100644
--- ORI/typescript-eslint/packages/experimental-utils/src/ts-eslint/CLIEngine.ts
+++ ALT/typescript-eslint/packages/experimental-utils/src/ts-eslint/CLIEngine.ts
@@ -175,8 +175,9 @@ namespace CLIEngine {
* important information so you can deal with the output yourself.
* @deprecated use the ESLint class instead
*/
-const CLIEngine = ESLintCLIEngine
- ? class CLIEngine extends (ESLintCLIEngine as typeof CLIEngineBase) {}
- : undefined;
+const CLIEngine =
+ ESLintCLIEngine
+ ? class CLIEngine extends (ESLintCLIEngine as typeof CLIEngineBase) {}
+ : undefined;
export { CLIEngine };
diff --git ORI/typescript-eslint/packages/scope-manager/src/referencer/Referencer.ts ALT/typescript-eslint/packages/scope-manager/src/referencer/Referencer.ts
index 10273bf..a260d93 100644
--- ORI/typescript-eslint/packages/scope-manager/src/referencer/Referencer.ts
+++ ALT/typescript-eslint/packages/scope-manager/src/referencer/Referencer.ts
@@ -175,12 +175,13 @@ class Referencer extends Visitor {
this.visitPattern(
node.left,
(pattern, info) => {
- const maybeImplicitGlobal = !this.currentScope().isStrict
- ? {
- pattern,
- node,
- }
- : null;
+ const maybeImplicitGlobal =
+ !this.currentScope().isStrict
+ ? {
+ pattern,
+ node,
+ }
+ : null;
this.referencingDefaultValue(
pattern,
info.assignments,
@@ -331,12 +332,13 @@ class Referencer extends Visitor {
this.visitPattern(
left,
(pattern, info) => {
- const maybeImplicitGlobal = !this.currentScope().isStrict
- ? {
- pattern,
- node,
- }
- : null;
+ const maybeImplicitGlobal =
+ !this.currentScope().isStrict
+ ? {
+ pattern,
+ node,
+ }
+ : null;
this.referencingDefaultValue(
pattern,
info.assignments,
diff --git ORI/typescript-eslint/packages/scope-manager/src/scope/ScopeBase.ts ALT/typescript-eslint/packages/scope-manager/src/scope/ScopeBase.ts
index 18196d9..e50a8df 100644
--- ORI/typescript-eslint/packages/scope-manager/src/scope/ScopeBase.ts
+++ ALT/typescript-eslint/packages/scope-manager/src/scope/ScopeBase.ts
@@ -237,9 +237,8 @@ abstract class ScopeBase<
this.#dynamic =
this.type === ScopeType.global || this.type === ScopeType.with;
this.block = block;
- this.variableScope = this.isVariableScope()
- ? this
- : upperScopeAsScopeBase.variableScope;
+ this.variableScope =
+ this.isVariableScope() ? this : upperScopeAsScopeBase.variableScope;
this.upper = upperScope;
/**
diff --git ORI/typescript-eslint/packages/typescript-estree/src/convert.ts ALT/typescript-eslint/packages/typescript-estree/src/convert.ts
index f0fb7d3..ae54c46 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/convert.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/convert.ts
@@ -167,9 +167,10 @@ export class Converter {
const declarationIsDefault =
nextModifier && nextModifier.kind === SyntaxKind.DefaultKeyword;
- const varToken = declarationIsDefault
- ? findNextToken(nextModifier, this.ast, this.ast)
- : findNextToken(exportKeyword, this.ast, this.ast);
+ const varToken =
+ declarationIsDefault
+ ? findNextToken(nextModifier, this.ast, this.ast)
+ : findNextToken(exportKeyword, this.ast, this.ast);
result.range[0] = varToken!.getStart(this.ast);
result.loc = getLocFor(result.range[0], result.range[1], this.ast);
@@ -883,12 +884,13 @@ export class Converter {
case SyntaxKind.CatchClause:
return this.createNode<TSESTree.CatchClause>(node, {
type: AST_NODE_TYPES.CatchClause,
- param: node.variableDeclaration
- ? this.convertBindingNameWithTypeAnnotation(
- node.variableDeclaration.name,
- node.variableDeclaration.type,
- )
- : null,
+ param:
+ node.variableDeclaration
+ ? this.convertBindingNameWithTypeAnnotation(
+ node.variableDeclaration.name,
+ node.variableDeclaration.type,
+ )
+ : null,
body: this.convertChild(node.block),
});
@@ -1131,9 +1133,10 @@ export class Converter {
const result = this.createNode<
TSESTree.TSAbstractPropertyDefinition | TSESTree.PropertyDefinition
>(node, {
- type: isAbstract
- ? AST_NODE_TYPES.TSAbstractPropertyDefinition
- : AST_NODE_TYPES.PropertyDefinition,
+ type:
+ isAbstract
+ ? AST_NODE_TYPES.TSAbstractPropertyDefinition
+ : AST_NODE_TYPES.PropertyDefinition,
key: this.convertChild(node.name),
value: isAbstract ? null : this.convertChild(node.initializer),
computed: isComputedProperty(node.name),
@@ -1189,9 +1192,10 @@ export class Converter {
const method = this.createNode<
TSESTree.TSEmptyBodyFunctionExpression | TSESTree.FunctionExpression
>(node, {
- type: !node.body
- ? AST_NODE_TYPES.TSEmptyBodyFunctionExpression
- : AST_NODE_TYPES.FunctionExpression,
+ type:
+ !node.body
+ ? AST_NODE_TYPES.TSEmptyBodyFunctionExpression
+ : AST_NODE_TYPES.FunctionExpression,
id: null,
generator: !!node.asteriskToken,
expression: false, // ESTreeNode as ESTreeNode here
@@ -1242,12 +1246,10 @@ export class Converter {
/**
* TypeScript class methods can be defined as "abstract"
*/
- const methodDefinitionType = hasModifier(
- SyntaxKind.AbstractKeyword,
- node,
- )
- ? AST_NODE_TYPES.TSAbstractMethodDefinition
- : AST_NODE_TYPES.MethodDefinition;
+ const methodDefinitionType =
+ hasModifier(SyntaxKind.AbstractKeyword, node)
+ ? AST_NODE_TYPES.TSAbstractMethodDefinition
+ : AST_NODE_TYPES.MethodDefinition;
result = this.createNode<
TSESTree.TSAbstractMethodDefinition | TSESTree.MethodDefinition
@@ -1302,9 +1304,10 @@ export class Converter {
const constructor = this.createNode<
TSESTree.TSEmptyBodyFunctionExpression | TSESTree.FunctionExpression
>(node, {
- type: !node.body
- ? AST_NODE_TYPES.TSEmptyBodyFunctionExpression
- : AST_NODE_TYPES.FunctionExpression,
+ type:
+ !node.body
+ ? AST_NODE_TYPES.TSEmptyBodyFunctionExpression
+ : AST_NODE_TYPES.FunctionExpression,
id: null,
params: this.convertParameters(node.parameters),
generator: false,
@@ -1338,9 +1341,10 @@ export class Converter {
const result = this.createNode<
TSESTree.TSAbstractMethodDefinition | TSESTree.MethodDefinition
>(node, {
- type: hasModifier(SyntaxKind.AbstractKeyword, node)
- ? AST_NODE_TYPES.TSAbstractMethodDefinition
- : AST_NODE_TYPES.MethodDefinition,
+ type:
+ hasModifier(SyntaxKind.AbstractKeyword, node)
+ ? AST_NODE_TYPES.TSAbstractMethodDefinition
+ : AST_NODE_TYPES.MethodDefinition,
key: constructorKey,
value: constructor,
computed: false,
@@ -1537,12 +1541,13 @@ export class Converter {
case SyntaxKind.TaggedTemplateExpression:
return this.createNode<TSESTree.TaggedTemplateExpression>(node, {
type: AST_NODE_TYPES.TaggedTemplateExpression,
- typeParameters: node.typeArguments
- ? this.convertTypeArgumentsToTypeParameters(
- node.typeArguments,
- node,
- )
- : undefined,
+ typeParameters:
+ node.typeArguments
+ ? this.convertTypeArgumentsToTypeParameters(
+ node.typeArguments,
+ node,
+ )
+ : undefined,
tag: this.convertChild(node.tag),
quasi: this.convertChild(node.template),
});
@@ -1670,9 +1675,10 @@ export class Converter {
body: [],
range: [node.members.pos - 1, node.end],
}),
- superClass: superClass?.types[0]
- ? this.convertChild(superClass.types[0].expression)
- : null,
+ superClass:
+ superClass?.types[0]
+ ? this.convertChild(superClass.types[0].expression)
+ : null,
});
if (superClass) {
@@ -2013,9 +2019,8 @@ export class Converter {
return this.createNode<TSESTree.ImportExpression>(node, {
type: AST_NODE_TYPES.ImportExpression,
source: this.convertChild(node.arguments[0]),
- attributes: node.arguments[1]
- ? this.convertChild(node.arguments[1])
- : null,
+ attributes:
+ node.arguments[1] ? this.convertChild(node.arguments[1]) : null,
});
}
@@ -2044,9 +2049,10 @@ export class Converter {
const result = this.createNode<TSESTree.NewExpression>(node, {
type: AST_NODE_TYPES.NewExpression,
callee: this.convertChild(node.expression),
- arguments: node.arguments
- ? node.arguments.map(el => this.convertChild(el))
- : [],
+ arguments:
+ node.arguments
+ ? node.arguments.map(el => this.convertChild(el))
+ : [],
});
if (node.typeArguments) {
result.typeParameters = this.convertTypeArgumentsToTypeParameters(
@@ -2215,12 +2221,13 @@ export class Converter {
*/
openingElement: this.createNode<TSESTree.JSXOpeningElement>(node, {
type: AST_NODE_TYPES.JSXOpeningElement,
- typeParameters: node.typeArguments
- ? this.convertTypeArgumentsToTypeParameters(
- node.typeArguments,
- node,
- )
- : undefined,
+ typeParameters:
+ node.typeArguments
+ ? this.convertTypeArgumentsToTypeParameters(
+ node.typeArguments,
+ node,
+ )
+ : undefined,
selfClosing: true,
name: this.convertJSXTagName(node.tagName, node),
attributes: node.attributes.properties.map(el =>
@@ -2236,12 +2243,13 @@ export class Converter {
case SyntaxKind.JsxOpeningElement:
return this.createNode<TSESTree.JSXOpeningElement>(node, {
type: AST_NODE_TYPES.JSXOpeningElement,
- typeParameters: node.typeArguments
- ? this.convertTypeArgumentsToTypeParameters(
- node.typeArguments,
- node,
- )
- : undefined,
+ typeParameters:
+ node.typeArguments
+ ? this.convertTypeArgumentsToTypeParameters(
+ node.typeArguments,
+ node,
+ )
+ : undefined,
selfClosing: false,
name: this.convertJSXTagName(node.tagName, node),
attributes: node.attributes.properties.map(el =>
@@ -2266,12 +2274,13 @@ export class Converter {
});
case SyntaxKind.JsxExpression: {
- const expression = node.expression
- ? this.convertChild(node.expression)
- : this.createNode<TSESTree.JSXEmptyExpression>(node, {
- type: AST_NODE_TYPES.JSXEmptyExpression,
- range: [node.getStart(this.ast) + 1, node.getEnd() - 1],
- });
+ const expression =
+ node.expression
+ ? this.convertChild(node.expression)
+ : this.createNode<TSESTree.JSXEmptyExpression>(node, {
+ type: AST_NODE_TYPES.JSXEmptyExpression,
+ range: [node.getStart(this.ast) + 1, node.getEnd() - 1],
+ });
if (node.dotDotDotToken) {
return this.createNode<TSESTree.JSXSpreadChild>(node, {
@@ -2327,12 +2336,13 @@ export class Converter {
return this.createNode<TSESTree.TSTypeReference>(node, {
type: AST_NODE_TYPES.TSTypeReference,
typeName: this.convertType(node.typeName),
- typeParameters: node.typeArguments
- ? this.convertTypeArgumentsToTypeParameters(
- node.typeArguments,
- node,
- )
- : undefined,
+ typeParameters:
+ node.typeArguments
+ ? this.convertTypeArgumentsToTypeParameters(
+ node.typeArguments,
+ node,
+ )
+ : undefined,
});
}
@@ -2340,9 +2350,8 @@ export class Converter {
return this.createNode<TSESTree.TSTypeParameter>(node, {
type: AST_NODE_TYPES.TSTypeParameter,
name: this.convertType(node.name),
- constraint: node.constraint
- ? this.convertType(node.constraint)
- : undefined,
+ constraint:
+ node.constraint ? this.convertType(node.constraint) : undefined,
default: node.default ? this.convertType(node.default) : undefined,
});
}
@@ -2482,9 +2491,8 @@ export class Converter {
optional: isOptional(node) || undefined,
computed: isComputedProperty(node.name),
key: this.convertChild(node.name),
- typeAnnotation: node.type
- ? this.convertTypeAnnotation(node.type, node)
- : undefined,
+ typeAnnotation:
+ node.type ? this.convertTypeAnnotation(node.type, node) : undefined,
initializer: this.convertChild(node.initializer) || undefined,
readonly: hasModifier(SyntaxKind.ReadonlyKeyword, node) || undefined,
static: hasModifier(SyntaxKind.StaticKeyword, node) || undefined,
@@ -2678,12 +2686,13 @@ export class Converter {
isTypeOf: !!node.isTypeOf,
parameter: this.convertChild(node.argument),
qualifier: this.convertChild(node.qualifier),
- typeParameters: node.typeArguments
- ? this.convertTypeArgumentsToTypeParameters(
- node.typeArguments,
- node,
- )
- : null,
+ typeParameters:
+ node.typeArguments
+ ? this.convertTypeArgumentsToTypeParameters(
+ node.typeArguments,
+ node,
+ )
+ : null,
});
case SyntaxKind.EnumDeclaration: {
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 ae2dec4..b13f025 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/create-program/createWatchProgram.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/create-program/createWatchProgram.ts
@@ -122,11 +122,12 @@ function updateCachedFileList(
program: ts.Program,
extra: Extra,
): Set<CanonicalPath> {
- const fileList = extra.EXPERIMENTAL_useSourceOfProjectReferenceRedirect
- ? new Set(
- program.getSourceFiles().map(sf => getCanonicalFileName(sf.fileName)),
- )
- : new Set(program.getRootFileNames().map(f => getCanonicalFileName(f)));
+ const fileList =
+ extra.EXPERIMENTAL_useSourceOfProjectReferenceRedirect
+ ? new Set(
+ program.getSourceFiles().map(sf => getCanonicalFileName(sf.fileName)),
+ )
+ : new Set(program.getRootFileNames().map(f => getCanonicalFileName(f)));
programFileListCache.set(tsconfigPath, fileList);
return fileList;
}
diff --git ORI/typescript-eslint/packages/typescript-estree/src/create-program/shared.ts ALT/typescript-eslint/packages/typescript-estree/src/create-program/shared.ts
index a0e654c..32e66a3 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/create-program/shared.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/create-program/shared.ts
@@ -50,9 +50,10 @@ type CanonicalPath = string & { __brand: unknown };
// typescript doesn't provide a ts.sys implementation for browser environments
const useCaseSensitiveFileNames =
ts.sys !== undefined ? ts.sys.useCaseSensitiveFileNames : true;
-const correctPathCasing = useCaseSensitiveFileNames
- ? (filePath: string): string => filePath
- : (filePath: string): string => filePath.toLowerCase();
+const correctPathCasing =
+ useCaseSensitiveFileNames
+ ? (filePath: string): string => filePath
+ : (filePath: string): string => filePath.toLowerCase();
function getCanonicalFileName(filePath: string): CanonicalPath {
let normalized = path.normalize(filePath);
diff --git ORI/typescript-eslint/packages/typescript-estree/tests/lib/persistentParse.test.ts ALT/typescript-eslint/packages/typescript-estree/tests/lib/persistentParse.test.ts
index b79f66a..f71eed0 100644
--- ORI/typescript-eslint/packages/typescript-estree/tests/lib/persistentParse.test.ts
+++ ALT/typescript-eslint/packages/typescript-estree/tests/lib/persistentParse.test.ts
@@ -71,9 +71,10 @@ function parseFile(
parseAndGenerateServices(CONTENTS[filename], {
project: './tsconfig.json',
tsconfigRootDir: ignoreTsconfigRootDir ? undefined : tmpDir,
- filePath: relative
- ? path.join('src', `${filename}.ts`)
- : path.join(tmpDir, 'src', `${filename}.ts`),
+ filePath:
+ relative
+ ? path.join('src', `${filename}.ts`)
+ : path.join(tmpDir, 'src', `${filename}.ts`),
});
}
diff --git ORI/typescript-eslint/packages/typescript-estree/tools/test-utils.ts ALT/typescript-eslint/packages/typescript-estree/tools/test-utils.ts
index 65e1cb1..3f0c7e5 100644
--- ORI/typescript-eslint/packages/typescript-estree/tools/test-utils.ts
+++ ALT/typescript-eslint/packages/typescript-estree/tools/test-utils.ts
@@ -29,9 +29,10 @@ export function createSnapshotTestBlock(
* @returns the AST object
*/
function parse(): TSESTree.Program {
- const ast = generateServices
- ? parseAndGenerateServices(code, config).ast
- : parserParse(code, config);
+ const ast =
+ generateServices
+ ? parseAndGenerateServices(code, config).ast
+ : parserParse(code, config);
return deeplyCopy(ast);
}
diff --git ORI/typescript-eslint/packages/website/src/components/editor/useSandboxServices.ts ALT/typescript-eslint/packages/website/src/components/editor/useSandboxServices.ts
index ffd6aa6..1d42689 100644
--- ORI/typescript-eslint/packages/website/src/components/editor/useSandboxServices.ts
+++ ALT/typescript-eslint/packages/website/src/components/editor/useSandboxServices.ts
@@ -61,9 +61,8 @@ export const useSandboxServices = (
noResolve: true,
strict: true,
target: main.languages.typescript.ScriptTarget.ESNext,
- jsx: props.jsx
- ? main.languages.typescript.JsxEmit.React
- : undefined,
+ jsx:
+ props.jsx ? main.languages.typescript.JsxEmit.React : undefined,
module: main.languages.typescript.ModuleKind.ESNext,
},
domID: editorEmbedId,
diff --git ORI/typescript-eslint/packages/website/src/components/hooks/useHashState.ts ALT/typescript-eslint/packages/website/src/components/hooks/useHashState.ts
index d6a8e8c..fccd6af 100644
--- ORI/typescript-eslint/packages/website/src/components/hooks/useHashState.ts
+++ ALT/typescript-eslint/packages/website/src/components/hooks/useHashState.ts
@@ -30,19 +30,22 @@ const parseStateFromUrl = (hash: string): ConfigModel | undefined => {
searchParams.get('sourceType') === 'script'
? 'script'
: 'module',
- code: searchParams.has('code')
- ? readQueryParam(searchParams.get('code'), '')
- : '',
- rules: searchParams.has('rules')
- ? (JSON.parse(
- readQueryParam(searchParams.get('rules'), '{}'),
- ) as RulesRecord)
- : undefined,
- tsConfig: searchParams.has('tsConfig')
- ? (JSON.parse(
- readQueryParam(searchParams.get('tsConfig'), '{}'),
- ) as CompilerFlags)
- : undefined,
+ code:
+ searchParams.has('code')
+ ? readQueryParam(searchParams.get('code'), '')
+ : '',
+ rules:
+ searchParams.has('rules')
+ ? (JSON.parse(
+ readQueryParam(searchParams.get('rules'), '{}'),
+ ) as RulesRecord)
+ : undefined,
+ tsConfig:
+ searchParams.has('tsConfig')
+ ? (JSON.parse(
+ readQueryParam(searchParams.get('tsConfig'), '{}'),
+ ) as CompilerFlags)
+ : undefined,
};
} catch (e) {
// eslint-disable-next-line no-console
@@ -59,12 +62,14 @@ const writeStateToUrl = (newState: ConfigModel): string => {
sourceType: newState.sourceType,
showAST: newState.showAST,
code: newState.code ? writeQueryParam(newState.code) : undefined,
- rules: newState.rules
- ? writeQueryParam(JSON.stringify(newState.rules))
- : undefined,
- tsConfig: newState.tsConfig
- ? writeQueryParam(JSON.stringify(newState.tsConfig))
- : undefined,
+ rules:
+ newState.rules
+ ? writeQueryParam(JSON.stringify(newState.rules))
+ : undefined,
+ tsConfig:
+ newState.tsConfig
+ ? writeQueryParam(JSON.stringify(newState.tsConfig))
+ : undefined,
})
.filter(item => item[1])
.map(item => `${encodeURIComponent(item[0])}=${item[1]}`)
diff --git ORI/typescript-eslint/tests/integration/integration-test-base.ts ALT/typescript-eslint/tests/integration/integration-test-base.ts
index 71c5934..c1d99b1 100644
--- ORI/typescript-eslint/tests/integration/integration-test-base.ts
+++ ALT/typescript-eslint/tests/integration/integration-test-base.ts
@@ -58,9 +58,10 @@ export function integrationTest(testFilename: string, filesGlob: string): void {
...BASE_DEPENDENCIES,
...fixturePackageJson.devDependencies,
// install tslint with the base version if required
- tslint: fixturePackageJson.devDependencies.tslint
- ? rootPackageJson.devDependencies.tslint
- : undefined,
+ tslint:
+ fixturePackageJson.devDependencies.tslint
+ ? rootPackageJson.devDependencies.tslint
+ : undefined,
},
}),
); |
|
prettier/prettier#12087 VS prettier/prettier@main :: vega/vega-lite@675653d Diff (725 lines)diff --git ORI/vega-lite/src/channeldef.ts ALT/vega-lite/src/channeldef.ts
index 9505847..4fc7da6 100644
--- ORI/vega-lite/src/channeldef.ts
+++ ALT/vega-lite/src/channeldef.ts
@@ -1085,13 +1085,14 @@ export function initFieldOrDatumDef(
return initFieldOrDatumDef(rest, channel, config, opt);
}
} else {
- const guideType = isPositionFieldOrDatumDef(fd)
- ? 'axis'
- : isMarkPropFieldOrDatumDef(fd)
- ? 'legend'
- : isFacetFieldDef(fd)
- ? 'header'
- : null;
+ const guideType =
+ isPositionFieldOrDatumDef(fd)
+ ? 'axis'
+ : isMarkPropFieldOrDatumDef(fd)
+ ? 'legend'
+ : isFacetFieldDef(fd)
+ ? 'header'
+ : null;
if (guideType && fd[guideType]) {
const {format, formatType, ...newGuide} = fd[guideType];
if (isCustomFormatType(formatType) && !config.customFormatTypes) {
diff --git ORI/vega-lite/src/compile/common.ts ALT/vega-lite/src/compile/common.ts
index 2617aa7..7f62ba9 100644
--- ORI/vega-lite/src/compile/common.ts
+++ ALT/vega-lite/src/compile/common.ts
@@ -28,9 +28,10 @@ export const BIN_RANGE_DELIMITER = ' \u2013 ';
export function signalOrValueRefWithCondition<V extends Value | number[]>(
val: ConditionalAxisProperty<V, SignalRef | ExprRef>
): ConditionalAxisProperty<V, SignalRef> {
- const condition = isArray(val.condition)
- ? (val.condition as ConditionalPredicate<ValueDef<any> | ExprRef | SignalRef>[]).map(conditionalSignalRefOrValue)
- : conditionalSignalRefOrValue(val.condition);
+ const condition =
+ isArray(val.condition)
+ ? (val.condition as ConditionalPredicate<ValueDef<any> | ExprRef | SignalRef>[]).map(conditionalSignalRefOrValue)
+ : conditionalSignalRefOrValue(val.condition);
return {
...signalRefOrValue<ValueDef<any>>(val),
diff --git ORI/vega-lite/src/compile/data/bin.ts ALT/vega-lite/src/compile/data/bin.ts
index 999fae5..4644afd 100644
--- ORI/vega-lite/src/compile/data/bin.ts
+++ ALT/vega-lite/src/compile/data/bin.ts
@@ -16,9 +16,10 @@ function rangeFormula(model: ModelWithField, fieldDef: TypedFieldDef<string>, ch
if (binRequiresRange(fieldDef, channel)) {
// read format from axis or legend, if there is no format then use config.numberFormat
- const guide = isUnitModel(model)
- ? model.axis(channel as PositionChannel) ?? model.legend(channel as NonPositionScaleChannel) ?? {}
- : {};
+ const guide =
+ isUnitModel(model)
+ ? model.axis(channel as PositionChannel) ?? model.legend(channel as NonPositionScaleChannel) ?? {}
+ : {};
const startField = vgField(fieldDef, {expr: 'datum'});
const endField = vgField(fieldDef, {expr: 'datum', binSuffix: 'end'});
diff --git ORI/vega-lite/src/compile/header/assemble.ts ALT/vega-lite/src/compile/header/assemble.ts
index 1bc2959..67b1580 100644
--- ORI/vega-lite/src/compile/header/assemble.ts
+++ ALT/vega-lite/src/compile/header/assemble.ts
@@ -36,9 +36,10 @@ import {
export function assembleTitleGroup(model: Model, channel: FacetChannel) {
const title = model.component.layoutHeaders[channel].title;
const config = model.config ? model.config : undefined;
- const facetFieldDef = model.component.layoutHeaders[channel].facetFieldDef
- ? model.component.layoutHeaders[channel].facetFieldDef
- : undefined;
+ const facetFieldDef =
+ model.component.layoutHeaders[channel].facetFieldDef
+ ? model.component.layoutHeaders[channel].facetFieldDef
+ : undefined;
const {
titleAnchor,
@@ -140,13 +141,14 @@ export function assembleLabelTitle(
return {
text: {
- signal: labelExpr
- ? replaceAll(
- replaceAll(labelExpr, 'datum.label', titleTextExpr),
- 'datum.value',
- vgField(facetFieldDef, {expr: 'parent'})
- )
- : titleTextExpr
+ signal:
+ labelExpr
+ ? replaceAll(
+ replaceAll(labelExpr, 'datum.label', titleTextExpr),
+ 'datum.value',
+ vgField(facetFieldDef, {expr: 'parent'})
+ )
+ : titleTextExpr
},
...(channel === 'row' ? {orient: 'left'} : {}),
style: 'guide-label',
diff --git ORI/vega-lite/src/compile/legend/encode.ts ALT/vega-lite/src/compile/legend/encode.ts
index 180d875..e6844d5 100644
--- ORI/vega-lite/src/compile/legend/encode.ts
+++ ALT/vega-lite/src/compile/legend/encode.ts
@@ -150,15 +150,16 @@ export function labels(specifiedlabelsSpec: any, {fieldOrDatumDef, model, channe
const {format, formatType} = legend;
- const text = isCustomFormatType(formatType)
- ? formatCustomType({
- fieldOrDatumDef,
- field: 'datum.value',
- format,
- formatType,
- config
- })
- : undefined;
+ const text =
+ isCustomFormatType(formatType)
+ ? formatCustomType({
+ fieldOrDatumDef,
+ field: 'datum.value',
+ format,
+ formatType,
+ config
+ })
+ : undefined;
const labelsSpec = {
...(opacity ? {opacity} : {}),
diff --git ORI/vega-lite/src/compile/mark/encode/color.ts ALT/vega-lite/src/compile/mark/encode/color.ts
index c01b388..cb57f1d 100644
--- ORI/vega-lite/src/compile/mark/encode/color.ts
+++ ALT/vega-lite/src/compile/mark/encode/color.ts
@@ -12,9 +12,8 @@ export function color(model: UnitModel, opt: {filled: boolean | undefined} = {fi
// Allow filled to be overridden (for trail's "filled")
const filled = opt.filled ?? getMarkPropOrConfig('filled', markDef, config);
- const transparentIfNeeded = contains(['bar', 'point', 'circle', 'square', 'geoshape'], markType)
- ? 'transparent'
- : undefined;
+ const transparentIfNeeded =
+ contains(['bar', 'point', 'circle', 'square', 'geoshape'], markType) ? 'transparent' : undefined;
const defaultFill =
getMarkPropOrConfig(filled === true ? 'color' : undefined, markDef, config, {vgChannel: 'fill'}) ??
diff --git ORI/vega-lite/src/compile/mark/encode/position-range.ts ALT/vega-lite/src/compile/mark/encode/position-range.ts
index 28ca2e8..b3471eb 100644
--- ORI/vega-lite/src/compile/mark/encode/position-range.ts
+++ ALT/vega-lite/src/compile/mark/encode/position-range.ts
@@ -51,11 +51,12 @@ export function rangePosition(
const pos2Mixins = pointPosition2OrSize(model, defaultPos2, channel2);
- const vgChannel = pos2Mixins[sizeChannel]
- ? // If there is width/height, we need to position the marks based on the alignment.
- vgAlignedPositionChannel(channel, markDef, config)
- : // Otherwise, make sure to apply to the right Vg Channel (for arc mark)
- getVgPositionChannel(channel);
+ const vgChannel =
+ pos2Mixins[sizeChannel]
+ ? // If there is width/height, we need to position the marks based on the alignment.
+ vgAlignedPositionChannel(channel, markDef, config)
+ : // Otherwise, make sure to apply to the right Vg Channel (for arc mark)
+ getVgPositionChannel(channel);
return {
...pointPosition(channel, model, {defaultPos, vgChannel}),
diff --git ORI/vega-lite/src/compile/mark/encode/position-rect.ts ALT/vega-lite/src/compile/mark/encode/position-rect.ts
index 891cdbc..170cd9f 100644
--- ORI/vega-lite/src/compile/mark/encode/position-rect.ts
+++ ALT/vega-lite/src/compile/mark/encode/position-rect.ts
@@ -172,15 +172,16 @@ function positionAndSize(
stack,
offset,
defaultRef: pointPositionDefaultRef({model, defaultPos: 'mid', channel, scaleName, scale}),
- bandPosition: center
- ? offsetType === 'encoding'
- ? 0
- : 0.5
- : isSignalRef(bandSize)
- ? {signal: `(1-${bandSize})/2`}
- : isRelativeBandSize(bandSize)
- ? (1 - bandSize.band) / 2
- : 0
+ bandPosition:
+ center
+ ? offsetType === 'encoding'
+ ? 0
+ : 0.5
+ : isSignalRef(bandSize)
+ ? {signal: `(1-${bandSize})/2`}
+ : isRelativeBandSize(bandSize)
+ ? (1 - bandSize.band) / 2
+ : 0
});
if (vgSizeChannel) {
@@ -195,12 +196,13 @@ function positionAndSize(
[vgChannel]: posRef,
// posRef might be an array that wraps position invalid test
- [vgChannel2]: isArray(posRef)
- ? [posRef[0], {...posRef[1], offset: sizeOffset}]
- : {
- ...posRef,
- offset: sizeOffset
- }
+ [vgChannel2]:
+ isArray(posRef)
+ ? [posRef[0], {...posRef[1], offset: sizeOffset}]
+ : {
+ ...posRef,
+ offset: sizeOffset
+ }
};
}
}
@@ -267,11 +269,12 @@ function rectBinPosition({
const {offset} = positionOffset({channel, markDef, encoding, model, bandPosition: 0});
- const bandPosition = isSignalRef(bandSize)
- ? {signal: `(1-${bandSize.signal})/2`}
- : isRelativeBandSize(bandSize)
- ? (1 - bandSize.band) / 2
- : 0.5;
+ const bandPosition =
+ isSignalRef(bandSize)
+ ? {signal: `(1-${bandSize.signal})/2`}
+ : isRelativeBandSize(bandSize)
+ ? (1 - bandSize.band) / 2
+ : 0.5;
if (isBinning(fieldDef.bin) || fieldDef.timeUnit) {
return {
diff --git ORI/vega-lite/src/compile/mark/encode/tooltip.ts ALT/vega-lite/src/compile/mark/encode/tooltip.ts
index e753f29..eb931cb 100644
--- ORI/vega-lite/src/compile/mark/encode/tooltip.ts
+++ ALT/vega-lite/src/compile/mark/encode/tooltip.ts
@@ -79,12 +79,13 @@ export function tooltipData(
function add(fDef: TypedFieldDef<string> | SecondaryFieldDef<string>, channel: Channel) {
const mainChannel = getMainRangeChannel(channel);
- const fieldDef: TypedFieldDef<string> = isTypedFieldDef(fDef)
- ? fDef
- : {
- ...fDef,
- type: (encoding[mainChannel] as TypedFieldDef<any>).type // for secondary field def, copy type from main channel
- };
+ const fieldDef: TypedFieldDef<string> =
+ isTypedFieldDef(fDef)
+ ? fDef
+ : {
+ ...fDef,
+ type: (encoding[mainChannel] as TypedFieldDef<any>).type // for secondary field def, copy type from main channel
+ };
const title = fieldDef.title || defaultTitle(fieldDef, config);
const key = array(title).join(', ');
diff --git ORI/vega-lite/src/compile/mark/encode/valueref.ts ALT/vega-lite/src/compile/mark/encode/valueref.ts
index c68b668..73cbf8f 100644
--- ORI/vega-lite/src/compile/mark/encode/valueref.ts
+++ ALT/vega-lite/src/compile/mark/encode/valueref.ts
@@ -190,9 +190,10 @@ export function interpolatedSignalRef({
const val = bandPosition === 0 ? start : end;
ref.field = val;
} else {
- const datum = isSignalRef(bandPosition)
- ? `${bandPosition.signal} * ${start} + (1-${bandPosition.signal}) * ${end}`
- : `${bandPosition} * ${start} + ${1 - bandPosition} * ${end}`;
+ const datum =
+ isSignalRef(bandPosition)
+ ? `${bandPosition.signal} * ${start} + (1-${bandPosition.signal}) * ${end}`
+ : `${bandPosition} * ${start} + ${1 - bandPosition} * ${end}`;
ref.signal = `scale("${scaleName}", ${datum})`;
}
diff --git ORI/vega-lite/src/compile/mark/mark.ts ALT/vega-lite/src/compile/mark/mark.ts
index 119d32e..ce85230 100644
--- ORI/vega-lite/src/compile/mark/mark.ts
+++ ALT/vega-lite/src/compile/mark/mark.ts
@@ -315,9 +315,8 @@ function getMarkGroup(model: UnitModel, opt: {fromPrefix: string} = {fromPrefix:
const interactive = interactiveFlag(model);
const aria = getMarkPropOrConfig('aria', markDef, config);
- const postEncodingTransform = markCompiler[mark].postEncodingTransform
- ? markCompiler[mark].postEncodingTransform(model)
- : null;
+ const postEncodingTransform =
+ markCompiler[mark].postEncodingTransform ? markCompiler[mark].postEncodingTransform(model) : null;
return [
{
diff --git ORI/vega-lite/src/compile/scale/assemble.ts ALT/vega-lite/src/compile/scale/assemble.ts
index d0d7497..e23f0d0 100644
--- ORI/vega-lite/src/compile/scale/assemble.ts
+++ ALT/vega-lite/src/compile/scale/assemble.ts
@@ -32,9 +32,8 @@ export function assembleScalesForModel(model: Model): VgScale[] {
const range = assembleScaleRange(scale.range, name, channel, model);
const domain = assembleDomain(model, channel);
- const domainRaw = selectionExtent
- ? assembleSelectionScaleDomain(model, selectionExtent, scaleComponent, domain)
- : null;
+ const domainRaw =
+ selectionExtent ? assembleSelectionScaleDomain(model, selectionExtent, scaleComponent, domain) : null;
scales.push({
name,
diff --git ORI/vega-lite/src/compile/scale/domain.ts ALT/vega-lite/src/compile/scale/domain.ts
index bf4260d..e05b470 100644
--- ORI/vega-lite/src/compile/scale/domain.ts
+++ ALT/vega-lite/src/compile/scale/domain.ts
@@ -312,9 +312,10 @@ function parseSingleChannelDomain(
{
// If sort by aggregation of a specified sort field, we need to use RAW table,
// so we can aggregate values for the scale independently from the main aggregation.
- data: util.isBoolean(sort)
- ? model.requestDataName(DataSourceType.Main)
- : model.requestDataName(DataSourceType.Raw),
+ data:
+ util.isBoolean(sort)
+ ? model.requestDataName(DataSourceType.Main)
+ : model.requestDataName(DataSourceType.Raw),
// Use range if we added it and the scale does not support computing a range as a signal.
field: model.vgField(channel, binRequiresRange(fieldDef, channel) ? {binSuffix: 'range'} : {}),
// we have to use a sort object if sort = true to make the sort correct by bin start
@@ -373,9 +374,8 @@ function parseSingleChannelDomain(
{
// If sort by aggregation of a specified sort field, we need to use RAW table,
// so we can aggregate values for the scale independently from the main aggregation.
- data: util.isBoolean(sort)
- ? model.requestDataName(DataSourceType.Main)
- : model.requestDataName(DataSourceType.Raw),
+ data:
+ util.isBoolean(sort) ? model.requestDataName(DataSourceType.Main) : model.requestDataName(DataSourceType.Raw),
field: model.vgField(channel),
sort
}
@@ -440,9 +440,8 @@ export function domainSort(
}
const {stack} = model;
- const stackDimensions = stack
- ? new Set([...stack.groupbyFields, ...stack.stackBy.map(s => s.fieldDef.field)])
- : undefined;
+ const stackDimensions =
+ stack ? new Set([...stack.groupbyFields, ...stack.stackBy.map(s => s.fieldDef.field)]) : undefined;
// Sorted based on an aggregate calculation over a specified sort field (only for ordinal scale)
if (isSortField(sort)) {
diff --git ORI/vega-lite/src/compile/selection/inputs.ts ALT/vega-lite/src/compile/selection/inputs.ts
index a434dc2..8f0f4b4 100644
--- ORI/vega-lite/src/compile/selection/inputs.ts
+++ ALT/vega-lite/src/compile/selection/inputs.ts
@@ -35,14 +35,15 @@ const inputBindings: SelectionCompiler<'point'> = {
signals.unshift({
name: sgname,
...(init ? {init: assembleInit(init[i])} : {value: null}),
- on: selCmpt.events
- ? [
- {
- events: selCmpt.events,
- update: `datum && item().mark.marktype !== 'group' ? ${datum}[${stringValue(p.field)}] : null`
- }
- ]
- : [],
+ on:
+ selCmpt.events
+ ? [
+ {
+ events: selCmpt.events,
+ update: `datum && item().mark.marktype !== 'group' ? ${datum}[${stringValue(p.field)}] : null`
+ }
+ ]
+ : [],
bind: bind[p.field] ?? bind[p.channel] ?? bind
});
}
diff --git ORI/vega-lite/src/compile/selection/legends.ts ALT/vega-lite/src/compile/selection/legends.ts
index a649383..3fa741b 100644
--- ORI/vega-lite/src/compile/selection/legends.ts
+++ ALT/vega-lite/src/compile/selection/legends.ts
@@ -26,9 +26,10 @@ const legendBindings: SelectionCompiler<'point'> = {
parse: (model, selCmpt, selDef) => {
// Allow legend items to be toggleable by default even though direct manipulation is disabled.
const selDef_ = duplicate(selDef);
- selDef_.select = isString(selDef_.select)
- ? {type: selDef_.select, toggle: selCmpt.toggle}
- : {...selDef_.select, toggle: selCmpt.toggle};
+ selDef_.select =
+ isString(selDef_.select)
+ ? {type: selDef_.select, toggle: selCmpt.toggle}
+ : {...selDef_.select, toggle: selCmpt.toggle};
disableDirectManipulation(selCmpt, selDef_);
if (isObject(selDef.select) && (selDef.select.on || selDef.select.clear)) {
diff --git ORI/vega-lite/src/compile/selection/point.ts ALT/vega-lite/src/compile/selection/point.ts
index 8d9755a..be4641f 100644
--- ORI/vega-lite/src/compile/selection/point.ts
+++ ALT/vega-lite/src/compile/selection/point.ts
@@ -47,15 +47,16 @@ const point: SelectionCompiler<'point'> = {
return signals.concat([
{
name: name + TUPLE,
- on: events
- ? [
- {
- events,
- update: `${test} ? {${update}: [${values}]} : null`,
- force: true
- }
- ]
- : []
+ on:
+ events
+ ? [
+ {
+ events,
+ update: `${test} ? {${update}: [${values}]} : null`,
+ force: true
+ }
+ ]
+ : []
}
]);
}
diff --git ORI/vega-lite/src/compile/selection/translate.ts ALT/vega-lite/src/compile/selection/translate.ts
index f412e5f..7b64091 100644
--- ORI/vega-lite/src/compile/selection/translate.ts
+++ ALT/vega-lite/src/compile/selection/translate.ts
@@ -88,22 +88,24 @@ function onDelta(
const sign = !hasScales ? '' : channel === X ? (reversed ? '' : '-') : reversed ? '-' : '';
const extent = `${anchor}.extent_${channel}`;
const offset = `${sign}${delta}.${channel} / ${hasScales ? `${sizeSg}` : `span(${extent})`}`;
- const panFn = !hasScales
- ? 'panLinear'
- : scaleType === 'log'
- ? 'panLog'
- : scaleType === 'symlog'
- ? 'panSymlog'
- : scaleType === 'pow'
- ? 'panPow'
- : 'panLinear';
- const arg = !hasScales
- ? ''
- : scaleType === 'pow'
- ? `, ${scaleCmpt.get('exponent') ?? 1}`
- : scaleType === 'symlog'
- ? `, ${scaleCmpt.get('constant') ?? 1}`
- : '';
+ const panFn =
+ !hasScales
+ ? 'panLinear'
+ : scaleType === 'log'
+ ? 'panLog'
+ : scaleType === 'symlog'
+ ? 'panSymlog'
+ : scaleType === 'pow'
+ ? 'panPow'
+ : 'panLinear';
+ const arg =
+ !hasScales
+ ? ''
+ : scaleType === 'pow'
+ ? `, ${scaleCmpt.get('exponent') ?? 1}`
+ : scaleType === 'symlog'
+ ? `, ${scaleCmpt.get('constant') ?? 1}`
+ : '';
const update = `${panFn}(${extent}, ${offset}${arg})`;
signal.on.push({
diff --git ORI/vega-lite/src/compile/selection/zoom.ts ALT/vega-lite/src/compile/selection/zoom.ts
index accdfc3..cf998a9 100644
--- ORI/vega-lite/src/compile/selection/zoom.ts
+++ ALT/vega-lite/src/compile/selection/zoom.ts
@@ -36,13 +36,14 @@ const zoom: SelectionCompiler<'interval'> = {
on: [
{
events,
- update: !hasScales
- ? `{x: x(unit), y: y(unit)}`
- : '{' +
- [sx ? `x: invert(${sx}, x(unit))` : '', sy ? `y: invert(${sy}, y(unit))` : '']
- .filter(expr => !!expr)
- .join(', ') +
- '}'
+ update:
+ !hasScales
+ ? `{x: x(unit), y: y(unit)}`
+ : '{' +
+ [sx ? `x: invert(${sx}, x(unit))` : '', sy ? `y: invert(${sy}, y(unit))` : '']
+ .filter(expr => !!expr)
+ .join(', ') +
+ '}'
}
]
},
@@ -89,22 +90,24 @@ function onDelta(
const base = hasScales ? domain(model, channel) : signal.name;
const delta = name + DELTA;
const anchor = `${name}${ANCHOR}.${channel}`;
- const zoomFn = !hasScales
- ? 'zoomLinear'
- : scaleType === 'log'
- ? 'zoomLog'
- : scaleType === 'symlog'
- ? 'zoomSymlog'
- : scaleType === 'pow'
- ? 'zoomPow'
- : 'zoomLinear';
- const arg = !hasScales
- ? ''
- : scaleType === 'pow'
- ? `, ${scaleCmpt.get('exponent') ?? 1}`
- : scaleType === 'symlog'
- ? `, ${scaleCmpt.get('constant') ?? 1}`
- : '';
+ const zoomFn =
+ !hasScales
+ ? 'zoomLinear'
+ : scaleType === 'log'
+ ? 'zoomLog'
+ : scaleType === 'symlog'
+ ? 'zoomSymlog'
+ : scaleType === 'pow'
+ ? 'zoomPow'
+ : 'zoomLinear';
+ const arg =
+ !hasScales
+ ? ''
+ : scaleType === 'pow'
+ ? `, ${scaleCmpt.get('exponent') ?? 1}`
+ : scaleType === 'symlog'
+ ? `, ${scaleCmpt.get('constant') ?? 1}`
+ : '';
const update = `${zoomFn}(${base}, ${anchor}, ${delta}${arg})`;
signal.on.push({
diff --git ORI/vega-lite/src/compile/unit.ts ALT/vega-lite/src/compile/unit.ts
index 6ccf138..13101f0 100644
--- ORI/vega-lite/src/compile/unit.ts
+++ ALT/vega-lite/src/compile/unit.ts
@@ -103,13 +103,14 @@ export class UnitModel extends ModelWithField {
this.size = initLayoutSize({
encoding,
- size: isFrameMixins(spec)
- ? {
- ...parentGivenSize,
- ...(spec.width ? {width: spec.width} : {}),
- ...(spec.height ? {height: spec.height} : {})
- }
- : parentGivenSize
+ size:
+ isFrameMixins(spec)
+ ? {
+ ...parentGivenSize,
+ ...(spec.width ? {width: spec.width} : {}),
+ ...(spec.height ? {height: spec.height} : {})
+ }
+ : parentGivenSize
});
// calculate stack properties
@@ -186,9 +187,10 @@ export class UnitModel extends ModelWithField {
) {
const axisSpec = isFieldOrDatumDef(channelDef) ? channelDef.axis : undefined;
- _axis[channel] = axisSpec
- ? this.initAxis({...axisSpec}) // convert truthy value to object
- : axisSpec;
+ _axis[channel] =
+ axisSpec
+ ? this.initAxis({...axisSpec}) // convert truthy value to object
+ : axisSpec;
}
return _axis;
}, {});
@@ -199,9 +201,10 @@ export class UnitModel extends ModelWithField {
const axisInternal = {};
for (const prop of props) {
const val = axis[prop];
- axisInternal[prop as any] = isConditionalAxisValue<any, ExprRef | SignalRef>(val)
- ? signalOrValueRefWithCondition<any>(val)
- : signalRefOrValue(val);
+ axisInternal[prop as any] =
+ isConditionalAxisValue<any, ExprRef | SignalRef>(val)
+ ? signalOrValueRefWithCondition<any>(val)
+ : signalRefOrValue(val);
}
return axisInternal;
}
@@ -212,9 +215,10 @@ export class UnitModel extends ModelWithField {
if (fieldOrDatumDef && supportLegend(channel)) {
const legend = fieldOrDatumDef.legend;
- _legend[channel] = legend
- ? replaceExprRef(legend) // convert truthy value to object
- : legend;
+ _legend[channel] =
+ legend
+ ? replaceExprRef(legend) // convert truthy value to object
+ : legend;
}
return _legend;
diff --git ORI/vega-lite/src/compositemark/errorbar.ts ALT/vega-lite/src/compositemark/errorbar.ts
index 52d41fe..6658d5d 100644
--- ORI/vega-lite/src/compositemark/errorbar.ts
+++ ALT/vega-lite/src/compositemark/errorbar.ts
@@ -443,13 +443,14 @@ function errorBarAggregationAndCalculation<
let tooltipTitleWithFieldName = false;
if (inputType === 'raw') {
- const center: ErrorBarCenter = markDef.center
- ? markDef.center
- : markDef.extent
- ? markDef.extent === 'iqr'
- ? 'median'
- : 'mean'
- : config.errorbar.center;
+ const center: ErrorBarCenter =
+ markDef.center
+ ? markDef.center
+ : markDef.extent
+ ? markDef.extent === 'iqr'
+ ? 'median'
+ : 'mean'
+ : config.errorbar.center;
const extent: ErrorBarExtent = markDef.extent ? markDef.extent : center === 'mean' ? 'stderr' : 'iqr';
if ((center === 'median') !== (extent === 'iqr')) {
diff --git ORI/vega-lite/src/config.ts ALT/vega-lite/src/config.ts
index 66ab07b..72b24c1 100644
--- ORI/vega-lite/src/config.ts
+++ ALT/vega-lite/src/config.ts
@@ -467,9 +467,10 @@ function getAxisConfigInternal(axisConfig: AxisConfig<ExprRef | SignalRef>) {
const axisConfigInternal: AxisConfig<SignalRef> = {};
for (const prop of props) {
const val = axisConfig[prop];
- axisConfigInternal[prop as any] = isConditionalAxisValue<any, ExprRef | SignalRef>(val)
- ? signalOrValueRefWithCondition<any>(val)
- : signalRefOrValue(val);
+ axisConfigInternal[prop as any] =
+ isConditionalAxisValue<any, ExprRef | SignalRef>(val)
+ ? signalOrValueRefWithCondition<any>(val)
+ : signalRefOrValue(val);
}
return axisConfigInternal;
}
diff --git ORI/vega-lite/src/normalize/selectioncompat.ts ALT/vega-lite/src/normalize/selectioncompat.ts
index f5e64df..cba18c0 100644
--- ORI/vega-lite/src/normalize/selectioncompat.ts
+++ ALT/vega-lite/src/normalize/selectioncompat.ts
@@ -117,12 +117,13 @@ function normalizeChannelDef(obj: any, normParams: NormalizerParams): ChannelDef
});
} else {
const {selection, param, test, ...cond} = normalizeChannelDef(enc.condition, normParams) as any;
- enc.condition = param
- ? enc.condition
- : {
- ...cond,
- test: normalizePredicate(enc.condition, normParams)
- };
+ enc.condition =
+ param
+ ? enc.condition
+ : {
+ ...cond,
+ test: normalizePredicate(enc.condition, normParams)
+ };
}
}
diff --git ORI/vega-lite/src/predicate.ts ALT/vega-lite/src/predicate.ts
index 4f44e5b..81056d4 100644
--- ORI/vega-lite/src/predicate.ts
+++ ALT/vega-lite/src/predicate.ts
@@ -199,12 +199,13 @@ function predicateValuesExpr(vals: (number | string | boolean | DateTime)[], tim
export function fieldFilterExpression(predicate: FieldPredicate, useInRange = true) {
const {field} = predicate;
const timeUnit = normalizeTimeUnit(predicate.timeUnit)?.unit;
- const fieldExpr = timeUnit
- ? // For timeUnit, cast into integer with time() so we can use ===, inrange, indexOf to compare values directly.
- // TODO: We calculate timeUnit on the fly here. Consider if we would like to consolidate this with timeUnit pipeline
- // TODO: support utc
- `time(${timeUnitFieldExpr(timeUnit, field)})`
- : vgField(predicate, {expr: 'datum'});
+ const fieldExpr =
+ timeUnit
+ ? // For timeUnit, cast into integer with time() so we can use ===, inrange, indexOf to compare values directly.
+ // TODO: We calculate timeUnit on the fly here. Consider if we would like to consolidate this with timeUnit pipeline
+ // TODO: support utc
+ `time(${timeUnitFieldExpr(timeUnit, field)})`
+ : vgField(predicate, {expr: 'datum'});
if (isFieldEqualPredicate(predicate)) {
return `${fieldExpr}===${predicateValueExpr(predicate.equal, timeUnit)}`;
diff --git ORI/vega-lite/src/spec/base.ts ALT/vega-lite/src/spec/base.ts
index 9ab466b..1967b3f 100644
--- ORI/vega-lite/src/spec/base.ts
+++ ALT/vega-lite/src/spec/base.ts
@@ -314,12 +314,13 @@ export function extractCompositionLayout(
if (prop === 'spacing') {
const spacing: number | RowCol<number> = spec[prop];
- layout[prop] = isNumber(spacing)
- ? spacing
- : {
- row: spacing.row ?? spacingConfig,
- column: spacing.column ?? spacingConfig
- };
+ layout[prop] =
+ isNumber(spacing)
+ ? spacing
+ : {
+ row: spacing.row ?? spacingConfig,
+ column: spacing.column ?? spacingConfig
+ };
} else {
(layout[prop] as any) = spec[prop];
} |
4 tasks
|
Run #12087 |
|
prettier/prettier#12087 VS prettier/prettier@main :: babel/babel@36a5ac4 Diff (264 lines)diff --git ORI/babel/packages/babel-parser/src/parser/expression.js ALT/babel/packages/babel-parser/src/parser/expression.js
index e221d4d9..681dbc01 100644
--- ORI/babel/packages/babel-parser/src/parser/expression.js
+++ ALT/babel/packages/babel-parser/src/parser/expression.js
@@ -2395,11 +2395,12 @@ export default class ExpressionParser extends LValParser {
// This logic is here to align the error location with the ESTree plugin.
const errorPos =
// $FlowIgnore
- (node.kind === "method" || node.kind === "constructor") &&
- // $FlowIgnore
- !!node.key
- ? node.key.end
- : node.start;
+
+ (node.kind === "method" || node.kind === "constructor") &&
+ // $FlowIgnore
+ !!node.key
+ ? node.key.end
+ : node.start;
this.raise(errorPos, Errors.IllegalLanguageModeDirective);
}
diff --git ORI/babel/packages/babel-parser/src/parser/lval.js ALT/babel/packages/babel-parser/src/parser/lval.js
index 7cbb35e4..f37c668b 100644
--- ORI/babel/packages/babel-parser/src/parser/lval.js
+++ ALT/babel/packages/babel-parser/src/parser/lval.js
@@ -187,10 +187,9 @@ export default class LValParser extends NodeUtils {
isLHS: boolean,
) {
if (prop.type === "ObjectMethod") {
- const error =
- prop.kind === "get" || prop.kind === "set"
- ? Errors.PatternHasAccessor
- : Errors.PatternHasMethod;
+ const error = prop.kind === "get" || prop.kind === "set"
+ ? Errors.PatternHasAccessor
+ : Errors.PatternHasMethod;
/* eslint-disable @babel/development-internal/dry-error-messages */
this.raise(prop.key.start, error);
diff --git ORI/babel/packages/babel-parser/src/parser/statement.js ALT/babel/packages/babel-parser/src/parser/statement.js
index 4addc193..ef7e3474 100644
--- ORI/babel/packages/babel-parser/src/parser/statement.js
+++ ALT/babel/packages/babel-parser/src/parser/statement.js
@@ -1713,16 +1713,15 @@ export default class StatementParser extends ExpressionParser {
);
classBody.body.push(node);
- const kind =
- node.kind === "get"
- ? node.static
- ? CLASS_ELEMENT_STATIC_GETTER
- : CLASS_ELEMENT_INSTANCE_GETTER
- : node.kind === "set"
- ? node.static
- ? CLASS_ELEMENT_STATIC_SETTER
- : CLASS_ELEMENT_INSTANCE_SETTER
- : CLASS_ELEMENT_OTHER;
+ const kind = node.kind === "get"
+ ? node.static
+ ? CLASS_ELEMENT_STATIC_GETTER
+ : CLASS_ELEMENT_INSTANCE_GETTER
+ : node.kind === "set"
+ ? node.static
+ ? CLASS_ELEMENT_STATIC_SETTER
+ : CLASS_ELEMENT_INSTANCE_SETTER
+ : CLASS_ELEMENT_OTHER;
this.declareClassPrivateMethodInScope(node, kind);
}
@@ -2078,8 +2077,9 @@ export default class StatementParser extends ExpressionParser {
// Named exports
for (const specifier of node.specifiers) {
const { exported } = specifier;
- const exportedName =
- exported.type === "Identifier" ? exported.name : exported.value;
+ const exportedName = exported.type === "Identifier"
+ ? exported.name
+ : exported.value;
this.checkDuplicateExports(specifier, exportedName);
// $FlowIgnore
if (!isFrom && specifier.local) {
diff --git ORI/babel/packages/babel-parser/src/plugins/jsx/index.js ALT/babel/packages/babel-parser/src/plugins/jsx/index.js
index 682ad64e..9bf31f5e 100644
--- ORI/babel/packages/babel-parser/src/plugins/jsx/index.js
+++ ALT/babel/packages/babel-parser/src/plugins/jsx/index.js
@@ -120,8 +120,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
case charCodes.greaterThan:
case charCodes.rightCurlyBrace:
if (process.env.BABEL_8_BREAKING) {
- const htmlEntity =
- ch === charCodes.rightCurlyBrace ? "}" : ">";
+ const htmlEntity = ch === charCodes.rightCurlyBrace
+ ? "}"
+ : ">";
const char = this.input[this.state.pos];
this.raise(this.state.pos, {
code: ErrorCodes.SyntaxError,
diff --git ORI/babel/packages/babel-parser/src/plugins/typescript/index.js ALT/babel/packages/babel-parser/src/plugins/typescript/index.js
index c749d838..eadfc57b 100644
--- ORI/babel/packages/babel-parser/src/plugins/typescript/index.js
+++ ALT/babel/packages/babel-parser/src/plugins/typescript/index.js
@@ -1080,12 +1080,11 @@ export default (superClass: Class<Parser>): Class<Parser> =>
type === tt._void ||
type === tt._null
) {
- const nodeType =
- type === tt._void
- ? "TSVoidKeyword"
- : type === tt._null
- ? "TSNullKeyword"
- : keywordTypeFromName(this.state.value);
+ const nodeType = type === tt._void
+ ? "TSVoidKeyword"
+ : type === tt._null
+ ? "TSNullKeyword"
+ : keywordTypeFromName(this.state.value);
if (
nodeType !== undefined &&
this.lookaheadCharCode() !== charCodes.dot
@@ -2047,12 +2046,11 @@ export default (superClass: Class<Parser>): Class<Parser> =>
node.returnType = this.tsParseTypeOrTypePredicateAnnotation(tt.colon);
}
- const bodilessType =
- type === "FunctionDeclaration"
- ? "TSDeclareFunction"
- : type === "ClassMethod" || type === "ClassPrivateMethod"
- ? "TSDeclareMethod"
- : undefined;
+ const bodilessType = type === "FunctionDeclaration"
+ ? "TSDeclareFunction"
+ : type === "ClassMethod" || type === "ClassPrivateMethod"
+ ? "TSDeclareMethod"
+ : undefined;
if (bodilessType && !this.match(tt.braceL) && this.isLineTerminator()) {
this.finishNode(node, bodilessType);
return;
@@ -2557,10 +2555,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
node: N.ExpressionStatement,
expr: N.Expression,
): N.Statement {
- const decl =
- expr.type === "Identifier"
- ? this.tsParseExpressionStatement(node, expr)
- : undefined;
+ const decl = expr.type === "Identifier"
+ ? this.tsParseExpressionStatement(node, expr)
+ : undefined;
return decl || super.parseExpressionStatement(node, expr);
}
diff --git ORI/babel/packages/babel-parser/src/tokenizer/index.js ALT/babel/packages/babel-parser/src/tokenizer/index.js
index 528cb051..661cb2fd 100644
--- ORI/babel/packages/babel-parser/src/tokenizer/index.js
+++ ALT/babel/packages/babel-parser/src/tokenizer/index.js
@@ -764,8 +764,9 @@ export default class Tokenizer extends ParserErrors {
const next = this.input.charCodeAt(pos + 1);
if (next === charCodes.greaterThan) {
- const size =
- this.input.charCodeAt(pos + 2) === charCodes.greaterThan ? 3 : 2;
+ const size = this.input.charCodeAt(pos + 2) === charCodes.greaterThan
+ ? 3
+ : 2;
if (this.input.charCodeAt(pos + size) === charCodes.equalsTo) {
this.finishOp(tt.assign, size + 1);
return;
@@ -1113,18 +1114,16 @@ export default class Tokenizer extends ParserErrors {
allowNumSeparator: boolean = true,
): number | null {
const start = this.state.pos;
- const forbiddenSiblings =
- radix === 16
- ? forbiddenNumericSeparatorSiblings.hex
- : forbiddenNumericSeparatorSiblings.decBinOct;
- const allowedSiblings =
- radix === 16
- ? allowedNumericSeparatorSiblings.hex
- : radix === 10
- ? allowedNumericSeparatorSiblings.dec
- : radix === 8
- ? allowedNumericSeparatorSiblings.oct
- : allowedNumericSeparatorSiblings.bin;
+ const forbiddenSiblings = radix === 16
+ ? forbiddenNumericSeparatorSiblings.hex
+ : forbiddenNumericSeparatorSiblings.decBinOct;
+ const allowedSiblings = radix === 16
+ ? allowedNumericSeparatorSiblings.hex
+ : radix === 10
+ ? allowedNumericSeparatorSiblings.dec
+ : radix === 8
+ ? allowedNumericSeparatorSiblings.oct
+ : allowedNumericSeparatorSiblings.bin;
let invalid = false;
let total = 0;
@@ -1581,8 +1580,9 @@ export default class Tokenizer extends ParserErrors {
word += this.input.slice(chunkStart, this.state.pos);
const escStart = this.state.pos;
- const identifierCheck =
- this.state.pos === start ? isIdentifierStart : isIdentifierChar;
+ const identifierCheck = this.state.pos === start
+ ? isIdentifierStart
+ : isIdentifierChar;
if (this.input.charCodeAt(++this.state.pos) !== charCodes.lowercaseU) {
this.raise(this.state.pos, Errors.MissingUnicodeEscape);
diff --git ORI/babel/packages/babel-parser/src/tokenizer/state.js ALT/babel/packages/babel-parser/src/tokenizer/state.js
index 1502f5cb..ee469b51 100644
--- ORI/babel/packages/babel-parser/src/tokenizer/state.js
+++ ALT/babel/packages/babel-parser/src/tokenizer/state.js
@@ -33,12 +33,11 @@ export default class State {
endLoc: Position;
init({ strictMode, sourceType, startLine, startColumn }: Options): void {
- this.strict =
- strictMode === false
- ? false
- : strictMode === true
- ? true
- : sourceType === "module";
+ this.strict = strictMode === false
+ ? false
+ : strictMode === true
+ ? true
+ : sourceType === "module";
this.curLine = startLine;
this.lineStart = -startColumn;
diff --git ORI/babel/packages/babel-traverse/test/scope.js ALT/babel/packages/babel-traverse/test/scope.js
index 1045afa0..cea55ef8 100644
--- ORI/babel/packages/babel-traverse/test/scope.js
+++ ALT/babel/packages/babel-traverse/test/scope.js
@@ -5,8 +5,9 @@ import _traverse, { NodePath } from "../lib/index.js";
const traverse = _traverse.default;
function getPath(code, options): NodePath<t.Program> {
- const ast =
- typeof code === "string" ? parse(code, options) : createNode(code);
+ const ast = typeof code === "string"
+ ? parse(code, options)
+ : createNode(code);
let path;
traverse(ast, {
Program: function (_path) {
diff --git ORI/babel/packages/babel-types/scripts/generators/typescript-legacy.js ALT/babel/packages/babel-types/scripts/generators/typescript-legacy.js
index 40da48f4..918745df 100644
--- ORI/babel/packages/babel-types/scripts/generators/typescript-legacy.js
+++ ALT/babel/packages/babel-types/scripts/generators/typescript-legacy.js
@@ -122,10 +122,9 @@ for (const typeName of t.TYPES) {
const isDeprecated = !!t.DEPRECATED_KEYS[typeName];
const realName = isDeprecated ? t.DEPRECATED_KEYS[typeName] : typeName;
- const result =
- t.NODE_FIELDS[realName] || t.FLIPPED_ALIAS_KEYS[realName]
- ? `node is ${realName}`
- : "boolean";
+ const result = t.NODE_FIELDS[realName] || t.FLIPPED_ALIAS_KEYS[realName]
+ ? `node is ${realName}`
+ : "boolean";
if (isDeprecated) {
lines.push(`/** @deprecated Use \`is${realName}\` */`); |
|
prettier/prettier#12087 VS prettier/prettier@main :: vuejs/eslint-plugin-vue@10dd1a9 Diff (708 lines)diff --git ORI/eslint-plugin-vue/lib/rules/block-tag-newline.js ALT/eslint-plugin-vue/lib/rules/block-tag-newline.js
index c88a36c..f721777 100644
--- ORI/eslint-plugin-vue/lib/rules/block-tag-newline.js
+++ ALT/eslint-plugin-vue/lib/rules/block-tag-newline.js
@@ -256,12 +256,11 @@ module.exports = {
return
}
- const option =
- options.multiline === options.singleline
- ? options.singleline
- : /[\n\r\u2028\u2029]/u.test(text.trim())
- ? options.multiline
- : options.singleline
+ const option = options.multiline === options.singleline
+ ? options.singleline
+ : /[\n\r\u2028\u2029]/u.test(text.trim())
+ ? options.multiline
+ : options.singleline
if (option === 'ignore') {
return
}
@@ -335,10 +334,9 @@ module.exports = {
normalizeOptionValue({
singleline: elementsOptions.singleline || options.singleline,
multiline: elementsOptions.multiline || options.multiline,
- maxEmptyLines:
- elementsOptions.maxEmptyLines != null
- ? elementsOptions.maxEmptyLines
- : options.maxEmptyLines
+ maxEmptyLines: elementsOptions.maxEmptyLines != null
+ ? elementsOptions.maxEmptyLines
+ : options.maxEmptyLines
})(element)
}
}
diff --git ORI/eslint-plugin-vue/lib/rules/component-definition-name-casing.js ALT/eslint-plugin-vue/lib/rules/component-definition-name-casing.js
index 8e192df..24e381c 100644
--- ORI/eslint-plugin-vue/lib/rules/component-definition-name-casing.js
+++ ALT/eslint-plugin-vue/lib/rules/component-definition-name-casing.js
@@ -30,8 +30,9 @@ module.exports = {
/** @param {RuleContext} context */
create(context) {
const options = context.options[0]
- const caseType =
- allowedCaseOptions.indexOf(options) !== -1 ? options : 'PascalCase'
+ const caseType = allowedCaseOptions.indexOf(options) !== -1
+ ? options
+ : 'PascalCase'
// ----------------------------------------------------------------------
// Public
diff --git ORI/eslint-plugin-vue/lib/rules/component-name-in-template-casing.js ALT/eslint-plugin-vue/lib/rules/component-name-in-template-casing.js
index b2f60a6..4cd6961 100644
--- ORI/eslint-plugin-vue/lib/rules/component-name-in-template-casing.js
+++ ALT/eslint-plugin-vue/lib/rules/component-name-in-template-casing.js
@@ -58,8 +58,9 @@ module.exports = {
create(context) {
const caseOption = context.options[0]
const options = context.options[1] || {}
- const caseType =
- allowedCaseOptions.indexOf(caseOption) !== -1 ? caseOption : defaultCase
+ const caseType = allowedCaseOptions.indexOf(caseOption) !== -1
+ ? caseOption
+ : defaultCase
/** @type {RegExp[]} */
const ignores = (options.ignores || []).map(toRegExp)
const registeredComponentsOnly = options.registeredComponentsOnly !== false
diff --git ORI/eslint-plugin-vue/lib/rules/html-closing-bracket-newline.js ALT/eslint-plugin-vue/lib/rules/html-closing-bracket-newline.js
index 6963de8..f6bc88e 100644
--- ORI/eslint-plugin-vue/lib/rules/html-closing-bracket-newline.js
+++ ALT/eslint-plugin-vue/lib/rules/html-closing-bracket-newline.js
@@ -80,10 +80,9 @@ module.exports = {
}
const prevToken = template.getTokenBefore(closingBracketToken)
- const type =
- node.loc.start.line === prevToken.loc.end.line
- ? 'singleline'
- : 'multiline'
+ const type = node.loc.start.line === prevToken.loc.end.line
+ ? 'singleline'
+ : 'multiline'
const expectedLineBreaks = options[type] === 'always' ? 1 : 0
const actualLineBreaks =
closingBracketToken.loc.start.line - prevToken.loc.end.line
diff --git ORI/eslint-plugin-vue/lib/rules/html-comment-content-newline.js ALT/eslint-plugin-vue/lib/rules/html-comment-content-newline.js
index 3985f7d..41c17f8 100644
--- ORI/eslint-plugin-vue/lib/rules/html-comment-content-newline.js
+++ ALT/eslint-plugin-vue/lib/rules/html-comment-content-newline.js
@@ -108,8 +108,9 @@ module.exports = {
const endLine = closeDecoration
? closeDecoration.loc.start.line
: value.loc.end.line
- const newlineType =
- startLine === endLine ? option.singleline : option.multiline
+ const newlineType = startLine === endLine
+ ? option.singleline
+ : option.multiline
if (newlineType === 'ignore') {
return
}
diff --git ORI/eslint-plugin-vue/lib/rules/html-comment-indent.js ALT/eslint-plugin-vue/lib/rules/html-comment-indent.js
index d5992b5..6b0ef3f 100644
--- ORI/eslint-plugin-vue/lib/rules/html-comment-indent.js
+++ ALT/eslint-plugin-vue/lib/rules/html-comment-indent.js
@@ -112,8 +112,9 @@ module.exports = {
const startLine = comment.value.loc.start.line
endLine = comment.value.loc.end.line
- const checkStartLine =
- comment.open.loc.end.line === startLine ? startLine + 1 : startLine
+ const checkStartLine = comment.open.loc.end.line === startLine
+ ? startLine + 1
+ : startLine
for (let line = checkStartLine; line <= endLine; line++) {
validateIndentForLine(line, baseIndentText, 1)
diff --git ORI/eslint-plugin-vue/lib/rules/html-quotes.js ALT/eslint-plugin-vue/lib/rules/html-quotes.js
index 9f741b2..98fe62d 100644
--- ORI/eslint-plugin-vue/lib/rules/html-quotes.js
+++ ALT/eslint-plugin-vue/lib/rules/html-quotes.js
@@ -77,7 +77,9 @@ module.exports = {
const contentText = quoted ? text.slice(1, -1) : text
const fixToDouble =
- avoidEscape && !quoted && contentText.includes(quoteChar)
+ avoidEscape &&
+ !quoted &&
+ contentText.includes(quoteChar)
? double
? contentText.includes("'")
: !contentText.includes('"')
diff --git ORI/eslint-plugin-vue/lib/rules/max-len.js ALT/eslint-plugin-vue/lib/rules/max-len.js
index 773b626..35ee28e 100644
--- ORI/eslint-plugin-vue/lib/rules/max-len.js
+++ ALT/eslint-plugin-vue/lib/rules/max-len.js
@@ -257,8 +257,9 @@ module.exports = {
/** @type {number} */
const tabWidth = typeof options.tabWidth === 'number' ? options.tabWidth : 2 // default value of `vue/html-indent`
/** @type {number} */
- const templateMaxLength =
- typeof options.template === 'number' ? options.template : scriptMaxLength
+ const templateMaxLength = typeof options.template === 'number'
+ ? options.template
+ : scriptMaxLength
const ignoreComments = !!options.ignoreComments
const ignoreStrings = !!options.ignoreStrings
const ignoreTemplateLiterals = !!options.ignoreTemplateLiterals
@@ -442,12 +443,11 @@ module.exports = {
// out of range.
return
}
- const maxLength =
- inScript && inTemplate
- ? Math.max(scriptMaxLength, templateMaxLength)
- : inScript
- ? scriptMaxLength
- : templateMaxLength
+ const maxLength = inScript && inTemplate
+ ? Math.max(scriptMaxLength, templateMaxLength)
+ : inScript
+ ? scriptMaxLength
+ : templateMaxLength
if (
(ignoreStrings && stringsByLine[lineNumber]) ||
diff --git ORI/eslint-plugin-vue/lib/rules/name-property-casing.js ALT/eslint-plugin-vue/lib/rules/name-property-casing.js
index d86435a..055b015 100644
--- ORI/eslint-plugin-vue/lib/rules/name-property-casing.js
+++ ALT/eslint-plugin-vue/lib/rules/name-property-casing.js
@@ -33,8 +33,9 @@ module.exports = {
/** @param {RuleContext} context */
create(context) {
const options = context.options[0]
- const caseType =
- allowedCaseOptions.indexOf(options) !== -1 ? options : 'PascalCase'
+ const caseType = allowedCaseOptions.indexOf(options) !== -1
+ ? options
+ : 'PascalCase'
// ----------------------------------------------------------------------
// Public
diff --git ORI/eslint-plugin-vue/lib/rules/no-deprecated-events-api.js ALT/eslint-plugin-vue/lib/rules/no-deprecated-events-api.js
index f393f59..bce073b 100644
--- ORI/eslint-plugin-vue/lib/rules/no-deprecated-events-api.js
+++ ALT/eslint-plugin-vue/lib/rules/no-deprecated-events-api.js
@@ -36,10 +36,9 @@ module.exports = {
'CallExpression > MemberExpression, CallExpression > ChainExpression > MemberExpression'(
node
) {
- const call =
- node.parent.type === 'ChainExpression'
- ? node.parent.parent
- : node.parent
+ const call = node.parent.type === 'ChainExpression'
+ ? node.parent.parent
+ : node.parent
if (call.optional) {
// It is OK because checking whether it is deprecated.
diff --git ORI/eslint-plugin-vue/lib/rules/no-expose-after-await.js ALT/eslint-plugin-vue/lib/rules/no-expose-after-await.js
index e1e3104..05135c6 100644
--- ORI/eslint-plugin-vue/lib/rules/no-expose-after-await.js
+++ ALT/eslint-plugin-vue/lib/rules/no-expose-after-await.js
@@ -99,10 +99,9 @@ module.exports = {
}
const exposeParam = exposeProperty.value
// `setup(props, {emit})`
- const variable =
- exposeParam.type === 'Identifier'
- ? findVariable(context.getScope(), exposeParam)
- : null
+ const variable = exposeParam.type === 'Identifier'
+ ? findVariable(context.getScope(), exposeParam)
+ : null
if (!variable) {
return
}
diff --git ORI/eslint-plugin-vue/lib/rules/no-extra-parens.js ALT/eslint-plugin-vue/lib/rules/no-extra-parens.js
index 223bd63..ec4c7b9 100644
--- ORI/eslint-plugin-vue/lib/rules/no-extra-parens.js
+++ ALT/eslint-plugin-vue/lib/rules/no-extra-parens.js
@@ -124,10 +124,9 @@ function createForVueSyntax(context) {
return
}
- const expression =
- node.expression.type === 'VFilterSequenceExpression'
- ? node.expression.expression
- : node.expression
+ const expression = node.expression.type === 'VFilterSequenceExpression'
+ ? node.expression.expression
+ : node.expression
if (!isParenthesized(expression, tokenStore)) {
return
diff --git ORI/eslint-plugin-vue/lib/rules/no-restricted-v-bind.js ALT/eslint-plugin-vue/lib/rules/no-restricted-v-bind.js
index 3cc46e7..e9ff6ff 100644
--- ORI/eslint-plugin-vue/lib/rules/no-restricted-v-bind.js
+++ ALT/eslint-plugin-vue/lib/rules/no-restricted-v-bind.js
@@ -166,10 +166,9 @@ module.exports = {
*/
function defaultMessage(key, option) {
const vbind = key.name.rawName === ':' ? '' : 'v-bind'
- const arg =
- key.argument != null && key.argument.type === 'VIdentifier'
- ? `:${key.argument.rawName}`
- : ''
+ const arg = key.argument != null && key.argument.type === 'VIdentifier'
+ ? `:${key.argument.rawName}`
+ : ''
const mod = option.modifiers.length
? `.${option.modifiers.join('.')}`
: ''
diff --git ORI/eslint-plugin-vue/lib/rules/no-undef-properties.js ALT/eslint-plugin-vue/lib/rules/no-undef-properties.js
index 4246f77..d411a7b 100644
--- ORI/eslint-plugin-vue/lib/rules/no-undef-properties.js
+++ ALT/eslint-plugin-vue/lib/rules/no-undef-properties.js
@@ -69,10 +69,9 @@ function getPropertyDataFromObjectProperty(property) {
if (property == null) {
return null
}
- const propertyMap =
- property.value.type === 'ObjectExpression'
- ? getObjectPropertyMap(property.value)
- : null
+ const propertyMap = property.value.type === 'ObjectExpression'
+ ? getObjectPropertyMap(property.value)
+ : null
return {
hasNestProperty: Boolean(propertyMap),
get(name) {
diff --git ORI/eslint-plugin-vue/lib/rules/no-unused-vars.js ALT/eslint-plugin-vue/lib/rules/no-unused-vars.js
index 517480a..667d500 100644
--- ORI/eslint-plugin-vue/lib/rules/no-unused-vars.js
+++ ALT/eslint-plugin-vue/lib/rules/no-unused-vars.js
@@ -125,20 +125,19 @@ module.exports = {
data: {
name: variable.id.name
},
- suggest:
- ignorePattern === '^_'
- ? [
- {
- desc: `Replace the ${variable.id.name} with _${variable.id.name}`,
- fix(fixer) {
- return fixer.replaceText(
- variable.id,
- `_${variable.id.name}`
- )
- }
+ suggest: ignorePattern === '^_'
+ ? [
+ {
+ desc: `Replace the ${variable.id.name} with _${variable.id.name}`,
+ fix(fixer) {
+ return fixer.replaceText(
+ variable.id,
+ `_${variable.id.name}`
+ )
}
- ]
- : []
+ }
+ ]
+ : []
})
}
}
diff --git ORI/eslint-plugin-vue/lib/rules/no-use-v-if-with-v-for.js ALT/eslint-plugin-vue/lib/rules/no-use-v-if-with-v-for.js
index 4790462..e09c45d 100644
--- ORI/eslint-plugin-vue/lib/rules/no-use-v-if-with-v-for.js
+++ ALT/eslint-plugin-vue/lib/rules/no-use-v-if-with-v-for.js
@@ -95,14 +95,12 @@ module.exports = {
message:
"The '{{iteratorName}}' {{kind}} inside 'v-for' directive should be replaced with a computed property that returns filtered array instead. You should not mix 'v-for' with 'v-if'.",
data: {
- iteratorName:
- iteratorNode.type === 'Identifier'
- ? iteratorNode.name
- : context.getSourceCode().getText(iteratorNode),
- kind:
- iteratorNode.type === 'Identifier'
- ? 'variable'
- : 'expression'
+ iteratorName: iteratorNode.type === 'Identifier'
+ ? iteratorNode.name
+ : context.getSourceCode().getText(iteratorNode),
+ kind: iteratorNode.type === 'Identifier'
+ ? 'variable'
+ : 'expression'
}
})
}
diff --git ORI/eslint-plugin-vue/lib/rules/prop-name-casing.js ALT/eslint-plugin-vue/lib/rules/prop-name-casing.js
index b211479..6ef8f0d 100644
--- ORI/eslint-plugin-vue/lib/rules/prop-name-casing.js
+++ ALT/eslint-plugin-vue/lib/rules/prop-name-casing.js
@@ -20,8 +20,9 @@ const allowedCaseOptions = ['camelCase', 'snake_case']
/** @param {RuleContext} context */
function create(context) {
const options = context.options[0]
- const caseType =
- allowedCaseOptions.indexOf(options) !== -1 ? options : 'camelCase'
+ const caseType = allowedCaseOptions.indexOf(options) !== -1
+ ? options
+ : 'camelCase'
const checker = casing.getChecker(caseType)
// ----------------------------------------------------------------------
diff --git ORI/eslint-plugin-vue/lib/rules/require-default-prop.js ALT/eslint-plugin-vue/lib/rules/require-default-prop.js
index e3a8a40..3740ba4 100644
--- ORI/eslint-plugin-vue/lib/rules/require-default-prop.js
+++ ALT/eslint-plugin-vue/lib/rules/require-default-prop.js
@@ -158,10 +158,9 @@ module.exports = {
if (isBooleanProp(prop)) {
continue
}
- const propName =
- prop.propName != null
- ? prop.propName
- : `[${context.getSourceCode().getText(prop.node.key)}]`
+ const propName = prop.propName != null
+ ? prop.propName
+ : `[${context.getSourceCode().getText(prop.node.key)}]`
context.report({
node: prop.node,
diff --git ORI/eslint-plugin-vue/lib/rules/require-explicit-emits.js ALT/eslint-plugin-vue/lib/rules/require-explicit-emits.js
index eecac6d..abb62c4 100644
--- ORI/eslint-plugin-vue/lib/rules/require-explicit-emits.js
+++ ALT/eslint-plugin-vue/lib/rules/require-explicit-emits.js
@@ -137,10 +137,9 @@ module.exports = {
messageId: 'missing',
data: {
name,
- emitsKind:
- vueDefineNode.type === 'ObjectExpression'
- ? '`emits` option'
- : '`defineEmits`'
+ emitsKind: vueDefineNode.type === 'ObjectExpression'
+ ? '`emits` option'
+ : '`defineEmits`'
},
suggest: buildSuggest(vueDefineNode, emits, nameLiteralNode, context)
})
@@ -274,10 +273,9 @@ module.exports = {
}
const emitParam = node.parent.id
- const variable =
- emitParam.type === 'Identifier'
- ? findVariable(context.getScope(), emitParam)
- : null
+ const variable = emitParam.type === 'Identifier'
+ ? findVariable(context.getScope(), emitParam)
+ : null
if (!variable) {
return
}
@@ -344,10 +342,9 @@ module.exports = {
}
const emitParam = emitProperty.value
// `setup(props, {emit})`
- const variable =
- emitParam.type === 'Identifier'
- ? findVariable(context.getScope(), emitParam)
- : null
+ const variable = emitParam.type === 'Identifier'
+ ? findVariable(context.getScope(), emitParam)
+ : null
if (!variable) {
return
}
@@ -415,8 +412,9 @@ module.exports = {
* @returns {Rule.SuggestionReportDescriptor[]}
*/
function buildSuggest(define, emits, nameNode, context) {
- const emitsKind =
- define.type === 'ObjectExpression' ? '`emits` option' : '`defineEmits`'
+ const emitsKind = define.type === 'ObjectExpression'
+ ? '`emits` option'
+ : '`defineEmits`'
const certainEmits = emits.filter((e) => e.key)
if (certainEmits.length) {
const last = certainEmits[certainEmits.length - 1]
diff --git ORI/eslint-plugin-vue/lib/rules/require-expose.js ALT/eslint-plugin-vue/lib/rules/require-expose.js
index 91ca589..1b94c07 100644
--- ORI/eslint-plugin-vue/lib/rules/require-expose.js
+++ ALT/eslint-plugin-vue/lib/rules/require-expose.js
@@ -171,10 +171,9 @@ module.exports = {
}
const exposeParam = exposeProperty.value
// `setup(props, {emit})`
- const variable =
- exposeParam.type === 'Identifier'
- ? findVariable(context.getScope(), exposeParam)
- : null
+ const variable = exposeParam.type === 'Identifier'
+ ? findVariable(context.getScope(), exposeParam)
+ : null
if (!variable) {
return
}
diff --git ORI/eslint-plugin-vue/lib/rules/require-prop-type-constructor.js ALT/eslint-plugin-vue/lib/rules/require-prop-type-constructor.js
index f22da81..e29e5fe 100644
--- ORI/eslint-plugin-vue/lib/rules/require-prop-type-constructor.js
+++ ALT/eslint-plugin-vue/lib/rules/require-prop-type-constructor.js
@@ -56,8 +56,9 @@ module.exports = {
*/
function checkPropertyNode(propName, node) {
/** @type {ESNode[]} */
- const nodes =
- node.type === 'ArrayExpression' ? node.elements.filter(isDef) : [node]
+ const nodes = node.type === 'ArrayExpression'
+ ? node.elements.filter(isDef)
+ : [node]
nodes
.filter((prop) => isForbiddenType(prop))
diff --git ORI/eslint-plugin-vue/lib/rules/require-valid-default-prop.js ALT/eslint-plugin-vue/lib/rules/require-valid-default-prop.js
index ab03552..5479a91 100644
--- ORI/eslint-plugin-vue/lib/rules/require-valid-default-prop.js
+++ ALT/eslint-plugin-vue/lib/rules/require-valid-default-prop.js
@@ -226,10 +226,9 @@ module.exports = {
* @param {Iterable<string>} expectedTypeNames
*/
function report(node, prop, expectedTypeNames) {
- const propName =
- prop.propName != null
- ? prop.propName
- : `[${context.getSourceCode().getText(prop.node.key)}]`
+ const propName = prop.propName != null
+ ? prop.propName
+ : `[${context.getSourceCode().getText(prop.node.key)}]`
context.report({
node,
message:
diff --git ORI/eslint-plugin-vue/lib/rules/syntaxes/slot-attribute.js ALT/eslint-plugin-vue/lib/rules/syntaxes/slot-attribute.js
index 4cfe209..2e71bd5 100644
--- ORI/eslint-plugin-vue/lib/rules/syntaxes/slot-attribute.js
+++ ALT/eslint-plugin-vue/lib/rules/syntaxes/slot-attribute.js
@@ -79,10 +79,9 @@ module.exports = {
? `:[${slotName}]`
: `:${slotName}`
: ''
- const scopeValue =
- scopeAttr && scopeAttr.value
- ? `=${sourceCode.getText(scopeAttr.value)}`
- : ''
+ const scopeValue = scopeAttr && scopeAttr.value
+ ? `=${sourceCode.getText(scopeAttr.value)}`
+ : ''
const replaceText = `v-slot${nameArgument}${scopeValue}`
yield fixer.replaceText(slotAttr || scopeAttr, replaceText)
diff --git ORI/eslint-plugin-vue/lib/rules/syntaxes/slot-scope-attribute.js ALT/eslint-plugin-vue/lib/rules/syntaxes/slot-scope-attribute.js
index 53a54d6..1d80fa1 100644
--- ORI/eslint-plugin-vue/lib/rules/syntaxes/slot-scope-attribute.js
+++ ALT/eslint-plugin-vue/lib/rules/syntaxes/slot-scope-attribute.js
@@ -65,10 +65,9 @@ module.exports = {
* @returns {Fix} fix data
*/
function fixSlotScopeToVSlot(fixer, scopeAttr) {
- const scopeValue =
- scopeAttr && scopeAttr.value
- ? `=${sourceCode.getText(scopeAttr.value)}`
- : ''
+ const scopeValue = scopeAttr && scopeAttr.value
+ ? `=${sourceCode.getText(scopeAttr.value)}`
+ : ''
const replaceText = `v-slot${scopeValue}`
return fixer.replaceText(scopeAttr, replaceText)
diff --git ORI/eslint-plugin-vue/lib/rules/v-on-function-call.js ALT/eslint-plugin-vue/lib/rules/v-on-function-call.js
index 90da5ed..b2542f7 100644
--- ORI/eslint-plugin-vue/lib/rules/v-on-function-call.js
+++ ALT/eslint-plugin-vue/lib/rules/v-on-function-call.js
@@ -168,10 +168,9 @@ module.exports = {
? null /* The comment is included and cannot be fixed. */
: (fixer) => {
/** @type {Range} */
- const range =
- leftQuote && rightQuote
- ? [leftQuote.range[1], rightQuote.range[0]]
- : [tokens[0].range[0], tokens[tokens.length - 1].range[1]]
+ const range = leftQuote && rightQuote
+ ? [leftQuote.range[1], rightQuote.range[0]]
+ : [tokens[0].range[0], tokens[tokens.length - 1].range[1]]
return fixer.replaceTextRange(
range,
diff --git ORI/eslint-plugin-vue/lib/rules/valid-v-slot.js ALT/eslint-plugin-vue/lib/rules/valid-v-slot.js
index df0fa7c..1b900d3 100644
--- ORI/eslint-plugin-vue/lib/rules/valid-v-slot.js
+++ ALT/eslint-plugin-vue/lib/rules/valid-v-slot.js
@@ -295,8 +295,9 @@ module.exports = {
node.key.argument.name === 'default')
const element = node.parent.parent
const parentElement = element.parent
- const ownerElement =
- element.name === 'template' ? parentElement : element
+ const ownerElement = element.name === 'template'
+ ? parentElement
+ : element
if (ownerElement.type === 'VDocumentFragment') {
return
}
diff --git ORI/eslint-plugin-vue/lib/utils/html-comments.js ALT/eslint-plugin-vue/lib/utils/html-comments.js
index ec957af..66bd85a 100644
--- ORI/eslint-plugin-vue/lib/utils/html-comments.js
+++ ALT/eslint-plugin-vue/lib/utils/html-comments.js
@@ -134,8 +134,9 @@ function defineParser(sourceCode, config) {
const openDecorationText = getOpenDecoration(valueText)
valueText = valueText.slice(openDecorationText.length)
const firstCharIndex = valueText.search(/\S/)
- const beforeSpace =
- firstCharIndex >= 0 ? valueText.slice(0, firstCharIndex) : valueText
+ const beforeSpace = firstCharIndex >= 0
+ ? valueText.slice(0, firstCharIndex)
+ : valueText
valueText = valueText.slice(beforeSpace.length)
const closeDecorationText = getCloseDecoration(valueText)
@@ -143,8 +144,9 @@ function defineParser(sourceCode, config) {
valueText = valueText.slice(0, -closeDecorationText.length)
}
const lastCharIndex = valueText.search(/\S\s*$/)
- const afterSpace =
- lastCharIndex >= 0 ? valueText.slice(lastCharIndex + 1) : valueText
+ const afterSpace = lastCharIndex >= 0
+ ? valueText.slice(lastCharIndex + 1)
+ : valueText
if (afterSpace) {
valueText = valueText.slice(0, -afterSpace.length)
}
diff --git ORI/eslint-plugin-vue/lib/utils/indent-common.js ALT/eslint-plugin-vue/lib/utils/indent-common.js
index 39ef586..6656f01 100644
--- ORI/eslint-plugin-vue/lib/utils/indent-common.js
+++ ALT/eslint-plugin-vue/lib/utils/indent-common.js
@@ -1059,10 +1059,9 @@ module.exports.defineVisitor = function create(
options.alignAttributesVertically
)
if (closeToken != null && closeToken.type.endsWith('TagClose')) {
- const offset =
- closeToken.type !== 'HTMLSelfClosingTagClose'
- ? options.closeBracket.startTag
- : options.closeBracket.selfClosingTag
+ const offset = closeToken.type !== 'HTMLSelfClosingTagClose'
+ ? options.closeBracket.startTag
+ : options.closeBracket.selfClosingTag
setOffset(closeToken, offset, openToken)
}
},
@@ -1475,21 +1474,20 @@ module.exports.defineVisitor = function create(
const importToken = tokenStore.getFirstToken(node)
const tokens = tokenStore.getTokensBetween(importToken, node.source)
const fromIndex = tokens.map((t) => t.value).lastIndexOf('from')
- const { fromToken, beforeTokens, afterTokens } =
- fromIndex >= 0
- ? {
- fromToken: tokens[fromIndex],
- beforeTokens: tokens.slice(0, fromIndex),
- afterTokens: [
- ...tokens.slice(fromIndex + 1),
- tokenStore.getFirstToken(node.source)
- ]
- }
- : {
- fromToken: null,
- beforeTokens: [...tokens, tokenStore.getFirstToken(node.source)],
- afterTokens: []
- }
+ const { fromToken, beforeTokens, afterTokens } = fromIndex >= 0
+ ? {
+ fromToken: tokens[fromIndex],
+ beforeTokens: tokens.slice(0, fromIndex),
+ afterTokens: [
+ ...tokens.slice(fromIndex + 1),
+ tokenStore.getFirstToken(node.source)
+ ]
+ }
+ : {
+ fromToken: null,
+ beforeTokens: [...tokens, tokenStore.getFirstToken(node.source)],
+ afterTokens: []
+ }
/** @type {ImportSpecifier[]} */
const namedSpecifiers = []
diff --git ORI/eslint-plugin-vue/lib/utils/indent-ts.js ALT/eslint-plugin-vue/lib/utils/indent-ts.js
index b98e9d1..03906e1 100644
--- ORI/eslint-plugin-vue/lib/utils/indent-ts.js
+++ ALT/eslint-plugin-vue/lib/utils/indent-ts.js
@@ -1059,10 +1059,9 @@ function defineVisitor({
['TSAbstractMethodDefinition, TSAbstractPropertyDefinition, TSEnumMember,' +
// Deprecated in @typescript-eslint/parser v5
'ClassProperty, TSAbstractClassProperty'](node) {
- const { keyNode, valueNode } =
- node.type === 'TSEnumMember'
- ? { keyNode: node.id, valueNode: node.initializer }
- : { keyNode: node.key, valueNode: node.value }
+ const { keyNode, valueNode } = node.type === 'TSEnumMember'
+ ? { keyNode: node.id, valueNode: node.initializer }
+ : { keyNode: node.key, valueNode: node.value }
const firstToken = tokenStore.getFirstToken(node)
const keyTokens = getFirstAndLastTokens(keyNode)
const prefixTokens = tokenStore.getTokensBetween(
diff --git ORI/eslint-plugin-vue/lib/utils/index.js ALT/eslint-plugin-vue/lib/utils/index.js
index d6c3a6f..14f979b 100644
--- ORI/eslint-plugin-vue/lib/utils/index.js
+++ ALT/eslint-plugin-vue/lib/utils/index.js
@@ -1184,8 +1184,9 @@ module.exports = {
'Program > VariableDeclaration > VariableDeclarator, Program > ExpressionStatement'
] = (node) => {
if (!candidateMacro) {
- candidateMacro =
- node.type === 'VariableDeclarator' ? node.init : node.expression
+ candidateMacro = node.type === 'VariableDeclarator'
+ ? node.init
+ : node.expression
}
}
/** @param {VariableDeclarator|ExpressionStatement} node */
@@ -2695,8 +2696,9 @@ function getAttribute(node, name, value) {
* @returns {VDirective[]} The array of `v-slot` directives.
*/
function getDirectives(node, name) {
- const attributes =
- node.type === 'VElement' ? node.startTag.attributes : node.attributes
+ const attributes = node.type === 'VElement'
+ ? node.startTag.attributes
+ : node.attributes
return attributes.filter(
/**
* @param {VAttribute | VDirective} node
diff --git ORI/eslint-plugin-vue/tests/lib/rules/html-indent.js ALT/eslint-plugin-vue/tests/lib/rules/html-indent.js
index 316eb92..682f4c8 100644
--- ORI/eslint-plugin-vue/tests/lib/rules/html-indent.js
+++ ALT/eslint-plugin-vue/tests/lib/rules/html-indent.js
@@ -52,8 +52,9 @@ function loadPatterns(additionalValid, additionalInvalid) {
})
const invalid = valid
.map((pattern) => {
- const kind =
- (pattern.options && pattern.options[0]) === 'tab' ? 'tab' : 'space'
+ const kind = (pattern.options && pattern.options[0]) === 'tab'
+ ? 'tab'
+ : 'space'
const output = pattern.code
const lines = output.split('\n').map((text, number) => ({
number,
diff --git ORI/eslint-plugin-vue/tests/lib/rules/script-indent.js ALT/eslint-plugin-vue/tests/lib/rules/script-indent.js
index 229ea32..39664d0 100644
--- ORI/eslint-plugin-vue/tests/lib/rules/script-indent.js
+++ ALT/eslint-plugin-vue/tests/lib/rules/script-indent.js
@@ -70,8 +70,9 @@ function loadPatterns(additionalValid, additionalInvalid) {
})
const invalid = valid
.map((pattern) => {
- const kind =
- (pattern.options && pattern.options[0]) === 'tab' ? 'tab' : 'space'
+ const kind = (pattern.options && pattern.options[0]) === 'tab'
+ ? 'tab'
+ : 'space'
const output = pattern.code
const lines = output.split('\n').map((text, number) => ({
number, |
|
prettier/prettier#12087 VS prettier/prettier@main :: excalidraw/excalidraw@afa7932 Diff (937 lines)diff --git ORI/excalidraw/src/actions/actionCanvas.tsx ALT/excalidraw/src/actions/actionCanvas.tsx
index 7c3f9e2..db82a48 100644
--- ORI/excalidraw/src/actions/actionCanvas.tsx
+++ ALT/excalidraw/src/actions/actionCanvas.tsx
@@ -207,10 +207,9 @@ const zoomToFitElements = (
const nonDeletedElements = getNonDeletedElements(elements);
const selectedElements = getSelectedElements(nonDeletedElements, appState);
- const commonBounds =
- zoomToSelection && selectedElements.length > 0
- ? getCommonBounds(selectedElements)
- : getCommonBounds(nonDeletedElements);
+ const commonBounds = zoomToSelection && selectedElements.length > 0
+ ? getCommonBounds(selectedElements)
+ : getCommonBounds(nonDeletedElements);
const zoomValue = zoomValueToFitBoundsOnViewport(commonBounds, {
width: appState.width,
diff --git ORI/excalidraw/src/actions/actionDeleteSelected.tsx ALT/excalidraw/src/actions/actionDeleteSelected.tsx
index e38a4ed..25b84a3 100644
--- ORI/excalidraw/src/actions/actionDeleteSelected.tsx
+++ ALT/excalidraw/src/actions/actionDeleteSelected.tsx
@@ -86,12 +86,12 @@ export const actionDeleteSelected = register({
// We cannot do this inside `movePoint` because it is also called
// when deleting the uncommitted point (which hasn't caused any binding)
const binding = {
- startBindingElement:
- activePointIndex === 0 ? null : startBindingElement,
- endBindingElement:
- activePointIndex === element.points.length - 1
- ? null
- : endBindingElement,
+ startBindingElement: activePointIndex === 0
+ ? null
+ : startBindingElement,
+ endBindingElement: activePointIndex === element.points.length - 1
+ ? null
+ : endBindingElement,
};
LinearElementEditor.movePoint(element, activePointIndex, "delete");
diff --git ORI/excalidraw/src/align.ts ALT/excalidraw/src/align.ts
index 622e5c4..8891e53 100644
--- ORI/excalidraw/src/align.ts
+++ ALT/excalidraw/src/align.ts
@@ -39,10 +39,9 @@ export const getMaximumGroups = (
>();
elements.forEach((element: ExcalidrawElement) => {
- const groupId =
- element.groupIds.length === 0
- ? element.id
- : element.groupIds[element.groupIds.length - 1];
+ const groupId = element.groupIds.length === 0
+ ? element.id
+ : element.groupIds[element.groupIds.length - 1];
const currentGroupMembers = groups.get(groupId) || [];
@@ -59,8 +58,9 @@ const calculateTranslation = (
): { x: number; y: number } => {
const groupBoundingBox = getCommonBoundingBox(group);
- const [min, max]: ["minX" | "minY", "maxX" | "maxY"] =
- axis === "x" ? ["minX", "maxX"] : ["minY", "maxY"];
+ const [min, max]: ["minX" | "minY", "maxX" | "maxY"] = axis === "x"
+ ? ["minX", "maxX"]
+ : ["minY", "maxY"];
const noTranslation = { x: 0, y: 0 };
if (position === "start") {
diff --git ORI/excalidraw/src/components/App.tsx ALT/excalidraw/src/components/App.tsx
index ced146d..61281c8 100644
--- ORI/excalidraw/src/components/App.tsx
+++ ALT/excalidraw/src/components/App.tsx
@@ -754,10 +754,9 @@ class App extends React.Component<AppProps, AppState> {
scene.appState = {
...scene.appState,
- elementType:
- scene.appState.elementType === "image"
- ? "selection"
- : scene.appState.elementType,
+ elementType: scene.appState.elementType === "image"
+ ? "selection"
+ : scene.appState.elementType,
isLoading: false,
};
if (initialData?.scrollToContent) {
@@ -1337,18 +1336,16 @@ class App extends React.Component<AppProps, AppState> {
const elementsCenterX = distance(minX, maxX) / 2;
const elementsCenterY = distance(minY, maxY) / 2;
- const clientX =
- typeof opts.position === "object"
- ? opts.position.clientX
- : opts.position === "cursor"
- ? cursorX
- : this.state.width / 2 + this.state.offsetLeft;
- const clientY =
- typeof opts.position === "object"
- ? opts.position.clientY
- : opts.position === "cursor"
- ? cursorY
- : this.state.height / 2 + this.state.offsetTop;
+ const clientX = typeof opts.position === "object"
+ ? opts.position.clientX
+ : opts.position === "cursor"
+ ? cursorX
+ : this.state.width / 2 + this.state.offsetLeft;
+ const clientY = typeof opts.position === "object"
+ ? opts.position.clientY
+ : opts.position === "cursor"
+ ? cursorY
+ : this.state.height / 2 + this.state.offsetTop;
const { x, y } = viewportCoordsToSceneCoords(
{ clientX, clientY },
@@ -3168,10 +3165,9 @@ class App extends React.Component<AppProps, AppState> {
values from appState. */
const { currentItemStartArrowhead, currentItemEndArrowhead } = this.state;
- const [startArrowhead, endArrowhead] =
- elementType === "arrow"
- ? [currentItemStartArrowhead, currentItemEndArrowhead]
- : [null, null];
+ const [startArrowhead, endArrowhead] = elementType === "arrow"
+ ? [currentItemStartArrowhead, currentItemEndArrowhead]
+ : [null, null];
const element = newLinearElement({
type: elementType,
@@ -3623,10 +3619,9 @@ class App extends React.Component<AppProps, AppState> {
cursorButton: "up",
// text elements are reset on finalize, and resetting on pointerup
// may cause issues with double taps
- editingElement:
- multiElement || isTextElement(this.state.editingElement)
- ? this.state.editingElement
- : null,
+ editingElement: multiElement || isTextElement(this.state.editingElement)
+ ? this.state.editingElement
+ : null,
});
this.savePointer(childEvent.clientX, childEvent.clientY, "up");
@@ -4347,8 +4342,9 @@ class App extends React.Component<AppProps, AppState> {
this.scene,
);
this.setState({
- suggestedBindings:
- hoveredBindableElement != null ? [hoveredBindableElement] : [],
+ suggestedBindings: hoveredBindableElement != null
+ ? [hoveredBindableElement]
+ : [],
});
};
@@ -4609,10 +4605,9 @@ class App extends React.Component<AppProps, AppState> {
const image =
isInitializedImageElement(draggingElement) &&
this.imageCache.get(draggingElement.fileId)?.image;
- const aspectRatio =
- image && !(image instanceof Promise)
- ? image.width / image.height
- : null;
+ const aspectRatio = image && !(image instanceof Promise)
+ ? image.width / image.height
+ : null;
dragNewElement(
draggingElement,
@@ -4885,10 +4880,9 @@ class App extends React.Component<AppProps, AppState> {
},
),
selectedElementIds: {},
- previousSelectedElementIds:
- Object.keys(selectedElementIds).length !== 0
- ? selectedElementIds
- : previousSelectedElementIds,
+ previousSelectedElementIds: Object.keys(selectedElementIds).length !== 0
+ ? selectedElementIds
+ : previousSelectedElementIds,
shouldCacheIgnoreZoom: true,
}));
this.resetShouldCacheIgnoreZoomDebounced();
diff --git ORI/excalidraw/src/components/Tooltip.tsx ALT/excalidraw/src/components/Tooltip.tsx
index fc1c69c..87e27c6 100644
--- ORI/excalidraw/src/components/Tooltip.tsx
+++ ALT/excalidraw/src/components/Tooltip.tsx
@@ -43,14 +43,14 @@ const updateTooltip = (
const margin = 5;
const left = itemX + itemWidth / 2 - labelWidth / 2;
- const offsetLeft =
- left + labelWidth >= viewportWidth ? left + labelWidth - viewportWidth : 0;
+ const offsetLeft = left + labelWidth >= viewportWidth
+ ? left + labelWidth - viewportWidth
+ : 0;
const top = itemBottom + margin;
- const offsetTop =
- top + labelHeight >= viewportHeight
- ? itemBottom - itemTop + labelHeight + margin * 2
- : 0;
+ const offsetTop = top + labelHeight >= viewportHeight
+ ? itemBottom - itemTop + labelHeight + margin * 2
+ : 0;
Object.assign(tooltip.style, {
top: `${top - offsetTop}px`,
diff --git ORI/excalidraw/src/data/encode.ts ALT/excalidraw/src/data/encode.ts
index 1d5a595..71ad2cd 100644
--- ORI/excalidraw/src/data/encode.ts
+++ ALT/excalidraw/src/data/encode.ts
@@ -10,10 +10,9 @@ export const toByteString = (
data: string | Uint8Array | ArrayBuffer,
): Promise<string> => {
return new Promise((resolve, reject) => {
- const blob =
- typeof data === "string"
- ? new Blob([new TextEncoder().encode(data)])
- : new Blob([data instanceof Uint8Array ? data : new Uint8Array(data)]);
+ const blob = typeof data === "string"
+ ? new Blob([new TextEncoder().encode(data)])
+ : new Blob([data instanceof Uint8Array ? data : new Uint8Array(data)]);
const reader = new FileReader();
reader.onload = (event) => {
if (!event.target || typeof event.target.result !== "string") {
diff --git ORI/excalidraw/src/data/encryption.ts ALT/excalidraw/src/data/encryption.ts
index 21d3b85..952c55e 100644
--- ORI/excalidraw/src/data/encryption.ts
+++ ALT/excalidraw/src/data/encryption.ts
@@ -49,17 +49,17 @@ export const encryptData = async (
key: string | CryptoKey,
data: Uint8Array | ArrayBuffer | Blob | File | string,
): Promise<{ encryptedBuffer: ArrayBuffer; iv: Uint8Array }> => {
- const importedKey =
- typeof key === "string" ? await getCryptoKey(key, "encrypt") : key;
+ const importedKey = typeof key === "string"
+ ? await getCryptoKey(key, "encrypt")
+ : key;
const iv = createIV();
- const buffer: ArrayBuffer | Uint8Array =
- typeof data === "string"
- ? new TextEncoder().encode(data)
- : data instanceof Uint8Array
- ? data
- : data instanceof Blob
- ? await data.arrayBuffer()
- : data;
+ const buffer: ArrayBuffer | Uint8Array = typeof data === "string"
+ ? new TextEncoder().encode(data)
+ : data instanceof Uint8Array
+ ? data
+ : data instanceof Blob
+ ? await data.arrayBuffer()
+ : data;
// We use symmetric encryption. AES-GCM is the recommended algorithm and
// includes checks that the ciphertext has not been modified by an attacker.
diff --git ORI/excalidraw/src/data/json.ts ALT/excalidraw/src/data/json.ts
index e7ce527..eb3f297 100644
--- ORI/excalidraw/src/data/json.ts
+++ ALT/excalidraw/src/data/json.ts
@@ -49,19 +49,16 @@ export const serializeAsJSON = (
type: EXPORT_DATA_TYPES.excalidraw,
version: VERSIONS.excalidraw,
source: EXPORT_SOURCE,
- elements:
- type === "local"
- ? clearElementsForExport(elements)
- : clearElementsForDatabase(elements),
- appState:
- type === "local"
- ? cleanAppStateForExport(appState)
- : clearAppStateForDatabase(appState),
- files:
- type === "local"
- ? filterOutDeletedFiles(elements, files)
- : // will be stripped from JSON
- undefined,
+ elements: type === "local"
+ ? clearElementsForExport(elements)
+ : clearElementsForDatabase(elements),
+ appState: type === "local"
+ ? cleanAppStateForExport(appState)
+ : clearAppStateForDatabase(appState),
+ files: type === "local"
+ ? filterOutDeletedFiles(elements, files)
+ : // will be stripped from JSON
+ undefined,
};
return JSON.stringify(data, null, 2);
diff --git ORI/excalidraw/src/data/restore.ts ALT/excalidraw/src/data/restore.ts
index cb316b4..5c881e6 100644
--- ORI/excalidraw/src/data/restore.ts
+++ ALT/excalidraw/src/data/restore.ts
@@ -157,23 +157,21 @@ const restoreElement = (
let x = element.x;
let y = element.y;
- let points = // migrate old arrow model to new one
- !Array.isArray(element.points) || element.points.length < 2
- ? [
- [0, 0],
- [element.width, element.height],
- ]
- : element.points;
+ let points = !Array.isArray(element.points) || element.points.length < 2 // migrate old arrow model to new one
+ ? [
+ [0, 0],
+ [element.width, element.height],
+ ]
+ : element.points;
if (points[0][0] !== 0 || points[0][1] !== 0) {
({ points, x, y } = LinearElementEditor.getNormalizedPoints(element));
}
return restoreElementWithProperties(element, {
- type:
- (element.type as ExcalidrawElement["type"] | "draw") === "draw"
- ? "line"
- : element.type,
+ type: (element.type as ExcalidrawElement["type"] | "draw") === "draw"
+ ? "line"
+ : element.type,
startBinding: element.startBinding,
endBinding: element.endBinding,
lastCommittedPoint: null,
@@ -236,12 +234,11 @@ export const restoreAppState = (
][]) {
const suppliedValue = appState[key];
const localValue = localAppState ? localAppState[key] : undefined;
- (nextAppState as any)[key] =
- suppliedValue !== undefined
- ? suppliedValue
- : localValue !== undefined
- ? localValue
- : defaultValue;
+ (nextAppState as any)[key] = suppliedValue !== undefined
+ ? suppliedValue
+ : localValue !== undefined
+ ? localValue
+ : defaultValue;
}
return {
@@ -250,13 +247,12 @@ export const restoreAppState = (
? nextAppState.elementType
: "selection",
// Migrates from previous version where appState.zoom was a number
- zoom:
- typeof appState.zoom === "number"
- ? {
- value: appState.zoom as NormalizedZoomValue,
- translation: defaultAppState.zoom.translation,
- }
- : appState.zoom || defaultAppState.zoom,
+ zoom: typeof appState.zoom === "number"
+ ? {
+ value: appState.zoom as NormalizedZoomValue,
+ translation: defaultAppState.zoom.translation,
+ }
+ : appState.zoom || defaultAppState.zoom,
};
};
diff --git ORI/excalidraw/src/disitrubte.ts ALT/excalidraw/src/disitrubte.ts
index 8335f5c..c825257 100644
--- ORI/excalidraw/src/disitrubte.ts
+++ ALT/excalidraw/src/disitrubte.ts
@@ -22,10 +22,9 @@ export const distributeElements = (
selectedElements: ExcalidrawElement[],
distribution: Distribution,
): ExcalidrawElement[] => {
- const [start, mid, end, extent] =
- distribution.axis === "x"
- ? (["minX", "midX", "maxX", "width"] as const)
- : (["minY", "midY", "maxY", "height"] as const);
+ const [start, mid, end, extent] = distribution.axis === "x"
+ ? (["minX", "midX", "maxX", "width"] as const)
+ : (["minY", "midY", "maxY", "height"] as const);
const bounds = getCommonBoundingBox(selectedElements);
const groups = getMaximumGroups(selectedElements)
@@ -108,10 +107,9 @@ export const getMaximumGroups = (
>();
elements.forEach((element: ExcalidrawElement) => {
- const groupId =
- element.groupIds.length === 0
- ? element.id
- : element.groupIds[element.groupIds.length - 1];
+ const groupId = element.groupIds.length === 0
+ ? element.id
+ : element.groupIds[element.groupIds.length - 1];
const currentGroupMembers = groups.get(groupId) || [];
diff --git ORI/excalidraw/src/element/bounds.ts ALT/excalidraw/src/element/bounds.ts
index 59be00a..6a0e38c 100644
--- ORI/excalidraw/src/element/bounds.ts
+++ ALT/excalidraw/src/element/bounds.ts
@@ -267,10 +267,9 @@ export const getArrowheadPoints = (
if (arrowhead === "arrow") {
// Length for -> arrows is based on the length of the last section
const [cx, cy] = element.points[element.points.length - 1];
- const [px, py] =
- element.points.length > 1
- ? element.points[element.points.length - 2]
- : [0, 0];
+ const [px, py] = element.points.length > 1
+ ? element.points[element.points.length - 2]
+ : [0, 0];
length = Math.hypot(cx - px, cy - py);
} else {
@@ -444,16 +443,12 @@ export const getResizedElementAbsoluteCoords = (
} else {
// Line
const gen = rough.generator();
- const curve =
- element.strokeSharpness === "sharp"
- ? gen.linearPath(
- points as [number, number][],
- generateRoughOptions(element),
- )
- : gen.curve(
- points as [number, number][],
- generateRoughOptions(element),
- );
+ const curve = element.strokeSharpness === "sharp"
+ ? gen.linearPath(
+ points as [number, number][],
+ generateRoughOptions(element),
+ )
+ : gen.curve(points as [number, number][], generateRoughOptions(element));
const ops = getCurvePathOps(curve);
bounds = getMinMaxXYFromCurvePathOps(ops);
}
@@ -474,13 +469,12 @@ export const getElementPointsCoords = (
): [number, number, number, number] => {
// This might be computationally heavey
const gen = rough.generator();
- const curve =
- sharpness === "sharp"
- ? gen.linearPath(
- points as [number, number][],
- generateRoughOptions(element),
- )
- : gen.curve(points as [number, number][], generateRoughOptions(element));
+ const curve = sharpness === "sharp"
+ ? gen.linearPath(
+ points as [number, number][],
+ generateRoughOptions(element),
+ )
+ : gen.curve(points as [number, number][], generateRoughOptions(element));
const ops = getCurvePathOps(curve);
const [minX, minY, maxX, maxY] = getMinMaxXYFromCurvePathOps(ops);
return [
diff --git ORI/excalidraw/src/element/collision.ts ALT/excalidraw/src/element/collision.ts
index 3ac8b32..7e85887 100644
--- ORI/excalidraw/src/element/collision.ts
+++ ALT/excalidraw/src/element/collision.ts
@@ -90,12 +90,11 @@ const isHittingElementNotConsideringBoundingBox = (
): boolean => {
const threshold = 10 / appState.zoom.value;
- const check =
- element.type === "text"
- ? isStrictlyInside
- : isElementDraggableFromInside(element)
- ? isInsideCheck
- : isNearCheck;
+ const check = element.type === "text"
+ ? isStrictlyInside
+ : isElementDraggableFromInside(element)
+ ? isInsideCheck
+ : isNearCheck;
return hitTestPointAgainstElement({ element, point, threshold, check });
};
diff --git ORI/excalidraw/src/element/linearElementEditor.ts ALT/excalidraw/src/element/linearElementEditor.ts
index 1d07660..a9b3bb9 100644
--- ORI/excalidraw/src/element/linearElementEditor.ts
+++ ALT/excalidraw/src/element/linearElementEditor.ts
@@ -337,10 +337,9 @@ export class LinearElementEditor {
element: NonDeleted<ExcalidrawLinearElement>,
indexMaybeFromEnd: number, // -1 for last element
): Point {
- const index =
- indexMaybeFromEnd < 0
- ? element.points.length + indexMaybeFromEnd
- : indexMaybeFromEnd;
+ const index = indexMaybeFromEnd < 0
+ ? element.points.length + indexMaybeFromEnd
+ : indexMaybeFromEnd;
const [x1, y1, x2, y2] = getElementAbsoluteCoords(element);
const cx = (x1 + x2) / 2;
const cy = (y1 + y2) / 2;
diff --git ORI/excalidraw/src/element/newElement.ts ALT/excalidraw/src/element/newElement.ts
index b7adb2b..07004b7 100644
--- ORI/excalidraw/src/element/newElement.ts
+++ ALT/excalidraw/src/element/newElement.ts
@@ -97,12 +97,11 @@ const getTextElementPositionOffsets = (
},
) => {
return {
- x:
- opts.textAlign === "center"
- ? metrics.width / 2
- : opts.textAlign === "right"
- ? metrics.width
- : 0,
+ x: opts.textAlign === "center"
+ ? metrics.width / 2
+ : opts.textAlign === "right"
+ ? metrics.width
+ : 0,
y: opts.verticalAlign === "middle" ? metrics.height / 2 : 0,
};
};
@@ -276,10 +275,9 @@ export const deepCopyElement = (val: any, depth: number = 0) => {
}
if (Object.prototype.toString.call(val) === "[object Object]") {
- const tmp =
- typeof val.constructor === "function"
- ? Object.create(Object.getPrototypeOf(val))
- : {};
+ const tmp = typeof val.constructor === "function"
+ ? Object.create(Object.getPrototypeOf(val))
+ : {};
for (const key in val) {
if (val.hasOwnProperty(key)) {
// don't copy top-level shape property, which we want to regenerate
diff --git ORI/excalidraw/src/element/resizeElements.ts ALT/excalidraw/src/element/resizeElements.ts
index ac2106c..6a141a1 100644
--- ORI/excalidraw/src/element/resizeElements.ts
+++ ALT/excalidraw/src/element/resizeElements.ts
@@ -205,13 +205,12 @@ export const reshapeSingleTwoPointElement = (
cy,
-element.angle,
);
- let [width, height] =
- resizeArrowDirection === "end"
- ? [rotatedX - element.x, rotatedY - element.y]
- : [
- element.x + element.points[1][0] - rotatedX,
- element.y + element.points[1][1] - rotatedY,
- ];
+ let [width, height] = resizeArrowDirection === "end"
+ ? [rotatedX - element.x, rotatedY - element.y]
+ : [
+ element.x + element.points[1][0] - rotatedX,
+ element.y + element.points[1][1] - rotatedY,
+ ];
if (shouldRotateWithDiscreteAngle) {
[width, height] = getPerfectElementSizeWithRotation(
element.type,
@@ -737,10 +736,9 @@ export const getResizeOffsetXY = (
x: number,
y: number,
): [number, number] => {
- const [x1, y1, x2, y2] =
- selectedElements.length === 1
- ? getElementAbsoluteCoords(selectedElements[0])
- : getCommonBounds(selectedElements);
+ const [x1, y1, x2, y2] = selectedElements.length === 1
+ ? getElementAbsoluteCoords(selectedElements[0])
+ : getCommonBounds(selectedElements);
const cx = (x1 + x2) / 2;
const cy = (y1 + y2) / 2;
const angle = selectedElements.length === 1 ? selectedElements[0].angle : 0;
diff --git ORI/excalidraw/src/groups.ts ALT/excalidraw/src/groups.ts
index f374e81..80b23ee 100644
--- ORI/excalidraw/src/groups.ts
+++ ALT/excalidraw/src/groups.ts
@@ -129,8 +129,9 @@ export const getNewGroupIdsForDuplication = (
const positionOfEditingGroupId = editingGroupId
? groupIds.indexOf(editingGroupId)
: -1;
- const endIndex =
- positionOfEditingGroupId > -1 ? positionOfEditingGroupId : groupIds.length;
+ const endIndex = positionOfEditingGroupId > -1
+ ? positionOfEditingGroupId
+ : groupIds.length;
for (let index = 0; index < endIndex; index++) {
copy[index] = mapper(copy[index]);
}
@@ -148,8 +149,9 @@ export const addToGroup = (
const positionOfEditingGroupId = editingGroupId
? groupIds.indexOf(editingGroupId)
: -1;
- const positionToInsert =
- positionOfEditingGroupId > -1 ? positionOfEditingGroupId : groupIds.length;
+ const positionToInsert = positionOfEditingGroupId > -1
+ ? positionOfEditingGroupId
+ : groupIds.length;
groupIds.splice(positionToInsert, 0, newGroupId);
return groupIds;
};
diff --git ORI/excalidraw/src/points.ts ALT/excalidraw/src/points.ts
index 7806203..6dc0fc4 100644
--- ORI/excalidraw/src/points.ts
+++ ALT/excalidraw/src/points.ts
@@ -19,8 +19,9 @@ export const rescalePoints = (
const prevMinDimension = Math.min(...prevDimValues);
const prevDimensionSize = prevMaxDimension - prevMinDimension;
- const dimensionScaleFactor =
- prevDimensionSize === 0 ? 1 : nextDimensionSize / prevDimensionSize;
+ const dimensionScaleFactor = prevDimensionSize === 0
+ ? 1
+ : nextDimensionSize / prevDimensionSize;
let nextMinDimension = Infinity;
diff --git ORI/excalidraw/src/renderer/renderElement.ts ALT/excalidraw/src/renderer/renderElement.ts
index 6fa5431..eddea6c 100644
--- ORI/excalidraw/src/renderer/renderElement.ts
+++ ALT/excalidraw/src/renderer/renderElement.ts
@@ -101,19 +101,17 @@ const generateElementCanvas = (
distance(y1, y2) * window.devicePixelRatio * zoom.value +
padding * zoom.value * 2;
- canvasOffsetX =
- element.x > x1
- ? Math.floor(distance(element.x, x1)) *
- window.devicePixelRatio *
- zoom.value
- : 0;
-
- canvasOffsetY =
- element.y > y1
- ? Math.floor(distance(element.y, y1)) *
- window.devicePixelRatio *
- zoom.value
- : 0;
+ canvasOffsetX = element.x > x1
+ ? Math.floor(distance(element.x, x1)) *
+ window.devicePixelRatio *
+ zoom.value
+ : 0;
+
+ canvasOffsetY = element.y > y1
+ ? Math.floor(distance(element.y, y1)) *
+ window.devicePixelRatio *
+ zoom.value
+ : 0;
context.translate(canvasOffsetX, canvasOffsetY);
} else {
@@ -263,12 +261,11 @@ const drawElementOnCanvas = (
const lines = element.text.replace(/\r\n?/g, "\n").split("\n");
const lineHeight = element.height / lines.length;
const verticalOffset = element.height - element.baseline;
- const horizontalOffset =
- element.textAlign === "center"
- ? element.width / 2
- : element.textAlign === "right"
- ? element.width
- : 0;
+ const horizontalOffset = element.textAlign === "center"
+ ? element.width / 2
+ : element.textAlign === "right"
+ ? element.width
+ : 0;
for (let index = 0; index < lines.length; index++) {
context.fillText(
lines[index],
@@ -310,21 +307,19 @@ export const generateRoughOptions = (
): Options => {
const options: Options = {
seed: element.seed,
- strokeLineDash:
- element.strokeStyle === "dashed"
- ? getDashArrayDashed(element.strokeWidth)
- : element.strokeStyle === "dotted"
- ? getDashArrayDotted(element.strokeWidth)
- : undefined,
+ strokeLineDash: element.strokeStyle === "dashed"
+ ? getDashArrayDashed(element.strokeWidth)
+ : element.strokeStyle === "dotted"
+ ? getDashArrayDotted(element.strokeWidth)
+ : undefined,
// for non-solid strokes, disable multiStroke because it tends to make
// dashes/dots overlay each other
disableMultiStroke: element.strokeStyle !== "solid",
// for non-solid strokes, increase the width a bit to make it visually
// similar to solid strokes, because we're also disabling multiStroke
- strokeWidth:
- element.strokeStyle !== "solid"
- ? element.strokeWidth + 0.5
- : element.strokeWidth,
+ strokeWidth: element.strokeStyle !== "solid"
+ ? element.strokeWidth + 0.5
+ : element.strokeWidth,
// when increasing strokeWidth, we must explicitly set fillWeight and
// hachureGap because if not specified, roughjs uses strokeWidth to
// calculate them (and we don't want the fills to be modified)
@@ -342,10 +337,9 @@ export const generateRoughOptions = (
case "diamond":
case "ellipse": {
options.fillStyle = element.fillStyle;
- options.fill =
- element.backgroundColor === "transparent"
- ? undefined
- : element.backgroundColor;
+ options.fill = element.backgroundColor === "transparent"
+ ? undefined
+ : element.backgroundColor;
if (element.type === "ellipse") {
options.curveFitting = 1;
}
@@ -354,10 +348,9 @@ export const generateRoughOptions = (
case "line": {
if (isPathALoop(element.points)) {
options.fillStyle = element.fillStyle;
- options.fill =
- element.backgroundColor === "transparent"
- ? undefined
- : element.backgroundColor;
+ options.fill = element.backgroundColor === "transparent"
+ ? undefined
+ : element.backgroundColor;
}
return options;
}
@@ -918,19 +911,17 @@ export const renderElementToSvg = (
const lines = element.text.replace(/\r\n?/g, "\n").split("\n");
const lineHeight = element.height / lines.length;
const verticalOffset = element.height - element.baseline;
- const horizontalOffset =
- element.textAlign === "center"
- ? element.width / 2
- : element.textAlign === "right"
- ? element.width
- : 0;
+ const horizontalOffset = element.textAlign === "center"
+ ? element.width / 2
+ : element.textAlign === "right"
+ ? element.width
+ : 0;
const direction = isRTL(element.text) ? "rtl" : "ltr";
- const textAnchor =
- element.textAlign === "center"
- ? "middle"
- : element.textAlign === "right" || direction === "rtl"
- ? "end"
- : "start";
+ const textAnchor = element.textAlign === "center"
+ ? "middle"
+ : element.textAlign === "right" || direction === "rtl"
+ ? "end"
+ : "start";
for (let i = 0; i < lines.length; i++) {
const text = svgRoot.ownerDocument!.createElementNS(SVG_NS, "text");
text.textContent = lines[i];
diff --git ORI/excalidraw/src/renderer/renderScene.ts ALT/excalidraw/src/renderer/renderScene.ts
index 9fddadd..99bc5cb 100644
--- ORI/excalidraw/src/renderer/renderScene.ts
+++ ALT/excalidraw/src/renderer/renderScene.ts
@@ -735,8 +735,11 @@ const renderBindingHighlightForSuggestedPointBinding = (
context.strokeStyle = "rgba(0,0,0,0)";
context.fillStyle = "rgba(0,0,0,.05)";
- const pointIndices =
- startOrEnd === "both" ? [0, -1] : startOrEnd === "start" ? [0] : [-1];
+ const pointIndices = startOrEnd === "both"
+ ? [0, -1]
+ : startOrEnd === "start"
+ ? [0]
+ : [-1];
pointIndices.forEach((index) => {
const [x, y] = LinearElementEditor.getPointAtIndexGlobalCoordinates(
element,
diff --git ORI/excalidraw/src/scene/scrollbars.ts ALT/excalidraw/src/scene/scrollbars.ts
index c36acde..a421a12 100644
--- ORI/excalidraw/src/scene/scrollbars.ts
+++ ALT/excalidraw/src/scene/scrollbars.ts
@@ -64,43 +64,41 @@ export const getScrollBars = (
// The scrollbar represents where the viewport is in relationship to the scene
return {
- horizontal:
- viewportMinX === sceneMinX && viewportMaxX === sceneMaxX
- ? null
- : {
- x:
- Math.max(safeArea.left, SCROLLBAR_MARGIN) +
- ((viewportMinX - sceneMinX) / (sceneMaxX - sceneMinX)) *
- viewportWidth,
- y:
- viewportHeight -
+ horizontal: viewportMinX === sceneMinX && viewportMaxX === sceneMaxX
+ ? null
+ : {
+ x:
+ Math.max(safeArea.left, SCROLLBAR_MARGIN) +
+ ((viewportMinX - sceneMinX) / (sceneMaxX - sceneMinX)) *
+ viewportWidth,
+ y:
+ viewportHeight -
+ SCROLLBAR_WIDTH -
+ Math.max(SCROLLBAR_MARGIN, safeArea.bottom),
+ width:
+ ((viewportMaxX - viewportMinX) / (sceneMaxX - sceneMinX)) *
+ viewportWidth -
+ Math.max(SCROLLBAR_MARGIN * 2, safeArea.left + safeArea.right),
+ height: SCROLLBAR_WIDTH,
+ },
+ vertical: viewportMinY === sceneMinY && viewportMaxY === sceneMaxY
+ ? null
+ : {
+ x: isRTL
+ ? Math.max(safeArea.left, SCROLLBAR_MARGIN)
+ : viewportWidth -
SCROLLBAR_WIDTH -
- Math.max(SCROLLBAR_MARGIN, safeArea.bottom),
- width:
- ((viewportMaxX - viewportMinX) / (sceneMaxX - sceneMinX)) *
- viewportWidth -
- Math.max(SCROLLBAR_MARGIN * 2, safeArea.left + safeArea.right),
- height: SCROLLBAR_WIDTH,
- },
- vertical:
- viewportMinY === sceneMinY && viewportMaxY === sceneMaxY
- ? null
- : {
- x: isRTL
- ? Math.max(safeArea.left, SCROLLBAR_MARGIN)
- : viewportWidth -
- SCROLLBAR_WIDTH -
- Math.max(safeArea.right, SCROLLBAR_MARGIN),
- y:
- ((viewportMinY - sceneMinY) / (sceneMaxY - sceneMinY)) *
- viewportHeight +
- Math.max(safeArea.top, SCROLLBAR_MARGIN),
- width: SCROLLBAR_WIDTH,
- height:
- ((viewportMaxY - viewportMinY) / (sceneMaxY - sceneMinY)) *
- viewportHeight -
- Math.max(SCROLLBAR_MARGIN * 2, safeArea.top + safeArea.bottom),
- },
+ Math.max(safeArea.right, SCROLLBAR_MARGIN),
+ y:
+ ((viewportMinY - sceneMinY) / (sceneMaxY - sceneMinY)) *
+ viewportHeight +
+ Math.max(safeArea.top, SCROLLBAR_MARGIN),
+ width: SCROLLBAR_WIDTH,
+ height:
+ ((viewportMaxY - viewportMinY) / (sceneMaxY - sceneMinY)) *
+ viewportHeight -
+ Math.max(SCROLLBAR_MARGIN * 2, safeArea.top + safeArea.bottom),
+ },
};
};
diff --git ORI/excalidraw/src/zindex.ts ALT/excalidraw/src/zindex.ts
index ac9cf7d..1b18f6a 100644
--- ORI/excalidraw/src/zindex.ts
+++ ALT/excalidraw/src/zindex.ts
@@ -70,10 +70,9 @@ const getTargetIndex = (
return true;
};
- const candidateIndex =
- direction === "left"
- ? findLastIndex(elements, indexFilter, Math.max(0, boundaryIndex - 1))
- : findIndex(elements, indexFilter, boundaryIndex + 1);
+ const candidateIndex = direction === "left"
+ ? findLastIndex(elements, indexFilter, Math.max(0, boundaryIndex - 1))
+ : findIndex(elements, indexFilter, boundaryIndex + 1);
const nextElement = elements[candidateIndex];
@@ -158,34 +157,30 @@ const shiftElements = (
return;
}
- const leadingElements =
- direction === "left"
- ? elements.slice(0, targetIndex)
- : elements.slice(0, leadingIndex);
+ const leadingElements = direction === "left"
+ ? elements.slice(0, targetIndex)
+ : elements.slice(0, leadingIndex);
const targetElements = elements.slice(leadingIndex, trailingIndex + 1);
- const displacedElements =
- direction === "left"
- ? elements.slice(targetIndex, leadingIndex)
- : elements.slice(trailingIndex + 1, targetIndex + 1);
- const trailingElements =
- direction === "left"
- ? elements.slice(trailingIndex + 1)
- : elements.slice(targetIndex + 1);
-
- elements =
- direction === "left"
- ? [
- ...leadingElements,
- ...targetElements,
- ...displacedElements,
- ...trailingElements,
- ]
- : [
- ...leadingElements,
- ...displacedElements,
- ...targetElements,
- ...trailingElements,
- ];
+ const displacedElements = direction === "left"
+ ? elements.slice(targetIndex, leadingIndex)
+ : elements.slice(trailingIndex + 1, targetIndex + 1);
+ const trailingElements = direction === "left"
+ ? elements.slice(trailingIndex + 1)
+ : elements.slice(targetIndex + 1);
+
+ elements = direction === "left"
+ ? [
+ ...leadingElements,
+ ...targetElements,
+ ...displacedElements,
+ ...trailingElements,
+ ]
+ : [
+ ...leadingElements,
+ ...displacedElements,
+ ...targetElements,
+ ...trailingElements,
+ ];
});
return elements.map((element) => { |
|
prettier/prettier#12087 VS prettier/prettier@main :: prettier/prettier@0e42acb Diff (1002 lines)diff --git ORI/prettier/docs/rationale.md ALT/prettier/docs/rationale.md
index 4df64fa..d32168d 100644
--- ORI/prettier/docs/rationale.md
+++ ALT/prettier/docs/rationale.md
@@ -295,8 +295,9 @@ Prettier will turn the above into:
```js
// eslint-disable-next-line no-eval
-const result =
- safeToEval && settings.allowNativeEval ? eval(input) : fallback(input);
+const result = safeToEval && settings.allowNativeEval
+ ? eval(input)
+ : fallback(input);
```
Which means that the `eslint-disable-next-line` comment is no longer effective. In this case you need to move the comment:
diff --git ORI/prettier/scripts/build/bundler.mjs ALT/prettier/scripts/build/bundler.mjs
index b62b4e3..0d6c338 100644
--- ORI/prettier/scripts/build/bundler.mjs
+++ ALT/prettier/scripts/build/bundler.mjs
@@ -215,10 +215,9 @@ function getRollupConfig(bundle) {
}),
rollupPluginCommonjs({
ignoreGlobal: bundle.target === "node",
- ignore:
- bundle.type === "plugin"
- ? undefined
- : (id) => /\.\/parser-.*?/.test(id),
+ ignore: bundle.type === "plugin"
+ ? undefined
+ : (id) => /\.\/parser-.*?/.test(id),
requireReturnsDefault: "preferred",
ignoreDynamicRequires: true,
ignoreTryCatch: bundle.target === "node",
diff --git ORI/prettier/scripts/release/utils.js ALT/prettier/scripts/release/utils.js
index dfff55a..d4bfbb1 100644
--- ORI/prettier/scripts/release/utils.js
+++ ALT/prettier/scripts/release/utils.js
@@ -22,10 +22,9 @@ function fitTerminal(input) {
}
async function logPromise(name, promiseOrAsyncFunction) {
- const promise =
- typeof promiseOrAsyncFunction === "function"
- ? promiseOrAsyncFunction()
- : promiseOrAsyncFunction;
+ const promise = typeof promiseOrAsyncFunction === "function"
+ ? promiseOrAsyncFunction()
+ : promiseOrAsyncFunction;
process.stdout.write(fitTerminal(name));
diff --git ORI/prettier/scripts/tools/eslint-plugin-prettier-internal-rules/better-parent-property-check-in-needs-parens.js ALT/prettier/scripts/tools/eslint-plugin-prettier-internal-rules/better-parent-property-check-in-needs-parens.js
index f390690..7b8b150 100644
--- ORI/prettier/scripts/tools/eslint-plugin-prettier-internal-rules/better-parent-property-check-in-needs-parens.js
+++ ALT/prettier/scripts/tools/eslint-plugin-prettier-internal-rules/better-parent-property-check-in-needs-parens.js
@@ -70,10 +70,9 @@ module.exports = {
const { property } = [left, right].find(
({ type }) => type === "MemberExpression"
);
- const propertyText =
- property.type === "Identifier"
- ? `"${property.name}"`
- : sourceCode.getText(property);
+ const propertyText = property.type === "Identifier"
+ ? `"${property.name}"`
+ : sourceCode.getText(property);
context.report({
node,
diff --git ORI/prettier/scripts/tools/eslint-plugin-prettier-internal-rules/prefer-is-non-empty-array.js ALT/prettier/scripts/tools/eslint-plugin-prettier-internal-rules/prefer-is-non-empty-array.js
index 6b4a8e8..26f7312 100644
--- ORI/prettier/scripts/tools/eslint-plugin-prettier-internal-rules/prefer-is-non-empty-array.js
+++ ALT/prettier/scripts/tools/eslint-plugin-prettier-internal-rules/prefer-is-non-empty-array.js
@@ -80,8 +80,9 @@ module.exports = {
leftObject = leftObject.arguments[0];
}
- const rightObject =
- right.type === "BinaryExpression" ? right.left.object : right.object;
+ const rightObject = right.type === "BinaryExpression"
+ ? right.left.object
+ : right.object;
const objectText = sourceCode.getText(rightObject);
// Simple compare with code
if (sourceCode.getText(leftObject) !== objectText) {
@@ -115,10 +116,9 @@ module.exports = {
return;
}
- const rightObject =
- right.type === "UnaryExpression"
- ? right.argument.object
- : right.left.object;
+ const rightObject = right.type === "UnaryExpression"
+ ? right.argument.object
+ : right.left.object;
let leftObject = left.argument;
if (isArrayIsArrayCall(leftObject)) {
leftObject = leftObject.arguments[0];
diff --git ORI/prettier/scripts/utils/changelog.mjs ALT/prettier/scripts/utils/changelog.mjs
index 92fdcb8..780fb8e 100644
--- ORI/prettier/scripts/utils/changelog.mjs
+++ ALT/prettier/scripts/utils/changelog.mjs
@@ -36,10 +36,9 @@ export function getEntries(dirPath) {
? "improvement"
: undefined;
- const order =
- section === "improvement" && improvement[2] !== undefined
- ? Number(improvement[2])
- : undefined;
+ const order = section === "improvement" && improvement[2] !== undefined
+ ? Number(improvement[2])
+ : undefined;
const content = [processTitle(title), ...rest].join("\n");
diff --git ORI/prettier/src/cli/format.js ALT/prettier/src/cli/format.js
index df9055c..b749246 100644
--- ORI/prettier/src/cli/format.js
+++ ALT/prettier/src/cli/format.js
@@ -152,10 +152,9 @@ function format(context, input, opt) {
/* istanbul ignore next */
if (ast !== past) {
const MAX_AST_SIZE = 2097152; // 2MB
- const astDiff =
- ast.length > MAX_AST_SIZE || past.length > MAX_AST_SIZE
- ? "AST diff too large to render"
- : diff(ast, past);
+ const astDiff = ast.length > MAX_AST_SIZE || past.length > MAX_AST_SIZE
+ ? "AST diff too large to render"
+ : diff(ast, past);
throw new errors.DebugError(
"ast(input) !== ast(prettier(input))\n" +
astDiff +
diff --git ORI/prettier/src/cli/usage.js ALT/prettier/src/cli/usage.js
index e1be6ba..03304f8 100644
--- ORI/prettier/src/cli/usage.js
+++ ALT/prettier/src/cli/usage.js
@@ -44,10 +44,9 @@ function createOptionUsageHeader(option) {
}
function createOptionUsageRow(header, content, threshold) {
- const separator =
- header.length >= threshold
- ? `\n${" ".repeat(threshold)}`
- : " ".repeat(threshold - header.length);
+ const separator = header.length >= threshold
+ ? `\n${" ".repeat(threshold)}`
+ : " ".repeat(threshold - header.length);
const description = content.replace(/\n/g, `\n${" ".repeat(threshold)}`);
@@ -156,20 +155,18 @@ function createDetailedUsage(context, flag) {
const header = createOptionUsageHeader(option);
const description = `\n\n${indent(option.description, 2)}`;
- const choices =
- option.type !== "choice"
- ? ""
- : `\n\nValid options:\n\n${createChoiceUsages(
- option.choices,
- CHOICE_USAGE_MARGIN,
- CHOICE_USAGE_INDENTATION
- ).join("\n")}`;
+ const choices = option.type !== "choice"
+ ? ""
+ : `\n\nValid options:\n\n${createChoiceUsages(
+ option.choices,
+ CHOICE_USAGE_MARGIN,
+ CHOICE_USAGE_INDENTATION
+ ).join("\n")}`;
const optionDefaultValue = getOptionDefaultValue(context, option.name);
- const defaults =
- optionDefaultValue !== undefined
- ? `\n\nDefault: ${createDefaultValueDisplay(optionDefaultValue)}`
- : "";
+ const defaults = optionDefaultValue !== undefined
+ ? `\n\nDefault: ${createDefaultValueDisplay(optionDefaultValue)}`
+ : "";
const pluginDefaults =
option.pluginDefaults && Object.keys(option.pluginDefaults).length > 0
diff --git ORI/prettier/src/document/doc-debug.js ALT/prettier/src/document/doc-debug.js
index 02a65e4..8f802d6 100644
--- ORI/prettier/src/document/doc-debug.js
+++ ALT/prettier/src/document/doc-debug.js
@@ -141,8 +141,9 @@ function printDocToDebug(doc) {
optionsParts.push(`groupId: ${printGroupId(doc.groupId)}`);
}
- const options =
- optionsParts.length > 0 ? `, { ${optionsParts.join(", ")} }` : "";
+ const options = optionsParts.length > 0
+ ? `, { ${optionsParts.join(", ")} }`
+ : "";
return `indentIfBreak(${printDoc(doc.contents)}${options})`;
}
@@ -158,8 +159,9 @@ function printDocToDebug(doc) {
optionsParts.push(`id: ${printGroupId(doc.id)}`);
}
- const options =
- optionsParts.length > 0 ? `, { ${optionsParts.join(", ")} }` : "";
+ const options = optionsParts.length > 0
+ ? `, { ${optionsParts.join(", ")} }`
+ : "";
if (doc.expandedStates) {
return `conditionalGroup([${doc.expandedStates
diff --git ORI/prettier/src/document/doc-printer.js ALT/prettier/src/document/doc-printer.js
index 4b36f40..ff04f8c 100644
--- ORI/prettier/src/document/doc-printer.js
+++ ALT/prettier/src/document/doc-printer.js
@@ -36,17 +36,17 @@ function makeAlign(indent, widthOrDoc, options) {
return { ...indent, root: indent };
}
- const alignType =
- typeof widthOrDoc === "string" ? "stringAlign" : "numberAlign";
+ const alignType = typeof widthOrDoc === "string"
+ ? "stringAlign"
+ : "numberAlign";
return generateInd(indent, { type: alignType, n: widthOrDoc }, options);
}
function generateInd(ind, newPart, options) {
- const queue =
- newPart.type === "dedent"
- ? ind.queue.slice(0, -1)
- : [...ind.queue, newPart];
+ const queue = newPart.type === "dedent"
+ ? ind.queue.slice(0, -1)
+ : [...ind.queue, newPart];
let value = "";
let length = 0;
@@ -217,23 +217,21 @@ function fits(next, restCommands, width, options, hasLineSuffix, mustBeFlat) {
case "indent-if-break": {
const groupMode = doc.groupId ? groupModeMap[doc.groupId] : mode;
if (groupMode === MODE_BREAK) {
- const breakContents =
- doc.type === "if-break"
- ? doc.breakContents
- : doc.negate
- ? doc.contents
- : indent(doc.contents);
+ const breakContents = doc.type === "if-break"
+ ? doc.breakContents
+ : doc.negate
+ ? doc.contents
+ : indent(doc.contents);
if (breakContents) {
cmds.push([ind, mode, breakContents]);
}
}
if (groupMode === MODE_FLAT) {
- const flatContents =
- doc.type === "if-break"
- ? doc.flatContents
- : doc.negate
- ? indent(doc.contents)
- : doc.contents;
+ const flatContents = doc.type === "if-break"
+ ? doc.flatContents
+ : doc.negate
+ ? indent(doc.contents)
+ : doc.contents;
if (flatContents) {
cmds.push([ind, mode, flatContents]);
}
@@ -488,23 +486,21 @@ function printDocToString(doc, options) {
case "indent-if-break": {
const groupMode = doc.groupId ? groupModeMap[doc.groupId] : mode;
if (groupMode === MODE_BREAK) {
- const breakContents =
- doc.type === "if-break"
- ? doc.breakContents
- : doc.negate
- ? doc.contents
- : indent(doc.contents);
+ const breakContents = doc.type === "if-break"
+ ? doc.breakContents
+ : doc.negate
+ ? doc.contents
+ : indent(doc.contents);
if (breakContents) {
cmds.push([ind, mode, breakContents]);
}
}
if (groupMode === MODE_FLAT) {
- const flatContents =
- doc.type === "if-break"
- ? doc.flatContents
- : doc.negate
- ? indent(doc.contents)
- : doc.contents;
+ const flatContents = doc.type === "if-break"
+ ? doc.flatContents
+ : doc.negate
+ ? indent(doc.contents)
+ : doc.contents;
if (flatContents) {
cmds.push([ind, mode, flatContents]);
}
diff --git ORI/prettier/src/language-handlebars/printer-glimmer.js ALT/prettier/src/language-handlebars/printer-glimmer.js
index 49df8a0..5cacf1d 100644
--- ORI/prettier/src/language-handlebars/printer-glimmer.js
+++ ALT/prettier/src/language-handlebars/printer-glimmer.js
@@ -636,10 +636,9 @@ function printInverse(path, print, options) {
const node = path.getValue();
const inverse = print("inverse");
- const printed =
- options.htmlWhitespaceSensitivity === "ignore"
- ? [hardline, inverse]
- : inverse;
+ const printed = options.htmlWhitespaceSensitivity === "ignore"
+ ? [hardline, inverse]
+ : inverse;
if (blockStatementHasElseIf(node)) {
return printed;
diff --git ORI/prettier/src/language-html/embed.js ALT/prettier/src/language-html/embed.js
index 7c3f85b..9f4f6ae 100644
--- ORI/prettier/src/language-html/embed.js
+++ ALT/prettier/src/language-html/embed.js
@@ -39,16 +39,15 @@ function printEmbeddedAttributeValue(node, originalTextToDoc, options) {
let shouldHug = false;
const __onHtmlBindingRoot = (root, options) => {
- const rootNode =
- root.type === "NGRoot"
- ? root.node.type === "NGMicrosyntax" &&
- root.node.body.length === 1 &&
- root.node.body[0].type === "NGMicrosyntaxExpression"
- ? root.node.body[0].expression
- : root.node
- : root.type === "JsExpressionRoot"
- ? root.node
- : root;
+ const rootNode = root.type === "NGRoot"
+ ? root.node.type === "NGMicrosyntax" &&
+ root.node.body.length === 1 &&
+ root.node.body[0].type === "NGMicrosyntaxExpression"
+ ? root.node.body[0].expression
+ : root.node
+ : root.type === "JsExpressionRoot"
+ ? root.node
+ : root;
if (
rootNode &&
(rootNode.type === "ObjectExpression" ||
@@ -282,10 +281,9 @@ function embed(path, print, textToDoc, options) {
if (isScriptLikeTag(node.parent)) {
const parser = inferScriptParser(node.parent);
if (parser) {
- const value =
- parser === "markdown"
- ? dedentString(node.value.replace(/^[^\S\n]*?\n/, ""))
- : node.value;
+ const value = parser === "markdown"
+ ? dedentString(node.value.replace(/^[^\S\n]*?\n/, ""))
+ : node.value;
const textToDocOptions = { parser, __embeddedInHtml: true };
if (options.parser === "html" && parser === "babel") {
let sourceType = "script";
diff --git ORI/prettier/src/language-html/print-preprocess.js ALT/prettier/src/language-html/print-preprocess.js
index 7c713ec..cce6093 100644
--- ORI/prettier/src/language-html/print-preprocess.js
+++ ALT/prettier/src/language-html/print-preprocess.js
@@ -133,10 +133,9 @@ function mergeNodeIntoText(ast, shouldMerge, getValue) {
continue;
}
- const newChild =
- child.type === "text"
- ? child
- : child.clone({ type: "text", value: getValue(child) });
+ const newChild = child.type === "text"
+ ? child
+ : child.clone({ type: "text", value: getValue(child) });
if (
newChildren.length === 0 ||
@@ -270,19 +269,18 @@ function extractInterpolation(ast, options) {
newChildren.push({
type: "interpolation",
sourceSpan: new ParseSourceSpan(startSourceSpan, endSourceSpan),
- children:
- value.length === 0
- ? []
- : [
- {
- type: "text",
- value,
- sourceSpan: new ParseSourceSpan(
- startSourceSpan.moveBy(2),
- endSourceSpan.moveBy(-2)
- ),
- },
- ],
+ children: value.length === 0
+ ? []
+ : [
+ {
+ type: "text",
+ value,
+ sourceSpan: new ParseSourceSpan(
+ startSourceSpan.moveBy(2),
+ endSourceSpan.moveBy(-2)
+ ),
+ },
+ ],
});
}
}
@@ -437,16 +435,14 @@ function addIsSpaceSensitive(ast, options) {
}))
.map((child, index, children) => ({
...child,
- isLeadingSpaceSensitive:
- index === 0
- ? child.isLeadingSpaceSensitive
- : children[index - 1].isTrailingSpaceSensitive &&
- child.isLeadingSpaceSensitive,
- isTrailingSpaceSensitive:
- index === children.length - 1
- ? child.isTrailingSpaceSensitive
- : children[index + 1].isLeadingSpaceSensitive &&
- child.isTrailingSpaceSensitive,
+ isLeadingSpaceSensitive: index === 0
+ ? child.isLeadingSpaceSensitive
+ : children[index - 1].isTrailingSpaceSensitive &&
+ child.isLeadingSpaceSensitive,
+ isTrailingSpaceSensitive: index === children.length - 1
+ ? child.isTrailingSpaceSensitive
+ : children[index + 1].isLeadingSpaceSensitive &&
+ child.isTrailingSpaceSensitive,
}))
);
});
diff --git ORI/prettier/src/language-html/print/tag.js ALT/prettier/src/language-html/print/tag.js
index 63d9821..a64ab10 100644
--- ORI/prettier/src/language-html/print/tag.js
+++ ALT/prettier/src/language-html/print/tag.js
@@ -228,12 +228,11 @@ function printAttributes(path, options, print) {
node.prev.type === "comment" &&
getPrettierIgnoreAttributeCommentData(node.prev.value);
- const hasPrettierIgnoreAttribute =
- typeof ignoreAttributeData === "boolean"
- ? () => ignoreAttributeData
- : Array.isArray(ignoreAttributeData)
- ? (attribute) => ignoreAttributeData.includes(attribute.rawName)
- : () => false;
+ const hasPrettierIgnoreAttribute = typeof ignoreAttributeData === "boolean"
+ ? () => ignoreAttributeData
+ : Array.isArray(ignoreAttributeData)
+ ? (attribute) => ignoreAttributeData.includes(attribute.rawName)
+ : () => false;
const printedAttributes = path.map((attributePath) => {
const attribute = attributePath.getValue();
@@ -251,8 +250,9 @@ function printAttributes(path, options, print) {
node.attrs[0].fullName === "src" &&
node.children.length === 0;
- const attributeLine =
- options.singleAttributePerLine && node.attrs.length > 1 ? hardline : line;
+ const attributeLine = options.singleAttributePerLine && node.attrs.length > 1
+ ? hardline
+ : line;
/** @type {Doc[]} */
const parts = [
diff --git ORI/prettier/src/language-js/embed.js ALT/prettier/src/language-js/embed.js
index 23dfc2c..9f48df0 100644
--- ORI/prettier/src/language-js/embed.js
+++ ALT/prettier/src/language-js/embed.js
@@ -177,10 +177,9 @@ function isStyledComponents(path) {
return false;
}
- const tag =
- parent.tag.type === "ParenthesizedExpression"
- ? parent.tag.expression
- : parent.tag;
+ const tag = parent.tag.type === "ParenthesizedExpression"
+ ? parent.tag.expression
+ : parent.tag;
switch (tag.type) {
case "MemberExpression":
diff --git ORI/prettier/src/language-js/embed/html.js ALT/prettier/src/language-js/embed/html.js
index 8913f80..8081846 100644
--- ORI/prettier/src/language-js/embed/html.js
+++ ALT/prettier/src/language-js/embed/html.js
@@ -77,12 +77,11 @@ function format(path, print, textToDoc, options, { parser }) {
const leadingWhitespace = /^\s/.test(text) ? " " : "";
const trailingWhitespace = /\s$/.test(text) ? " " : "";
- const linebreak =
- options.htmlWhitespaceSensitivity === "ignore"
- ? hardline
- : leadingWhitespace && trailingWhitespace
- ? line
- : null;
+ const linebreak = options.htmlWhitespaceSensitivity === "ignore"
+ ? hardline
+ : leadingWhitespace && trailingWhitespace
+ ? line
+ : null;
if (linebreak) {
return group(["`", indent([linebreak, group(contentDoc)]), linebreak, "`"]);
diff --git ORI/prettier/src/language-js/needs-parens.js ALT/prettier/src/language-js/needs-parens.js
index c4ca50c..a0fceba 100644
--- ORI/prettier/src/language-js/needs-parens.js
+++ ALT/prettier/src/language-js/needs-parens.js
@@ -467,10 +467,9 @@ function needsParens(path, options) {
);
case "FunctionTypeAnnotation": {
- const ancestor =
- parent.type === "NullableTypeAnnotation"
- ? path.getParentNode(1)
- : parent;
+ const ancestor = parent.type === "NullableTypeAnnotation"
+ ? path.getParentNode(1)
+ : parent;
return (
ancestor.type === "UnionTypeAnnotation" ||
diff --git ORI/prettier/src/language-js/print/array.js ALT/prettier/src/language-js/print/array.js
index 632ea7b..b95a895 100644
--- ORI/prettier/src/language-js/print/array.js
+++ ALT/prettier/src/language-js/print/array.js
@@ -74,8 +74,9 @@ function printArray(path, options, print) {
return false;
}
- const itemsKey =
- elementType === "ArrayExpression" ? "elements" : "properties";
+ const itemsKey = elementType === "ArrayExpression"
+ ? "elements"
+ : "properties";
return element[itemsKey] && element[itemsKey].length > 1;
});
diff --git ORI/prettier/src/language-js/print/assignment.js ALT/prettier/src/language-js/print/assignment.js
index a448e51..b46e7e0 100644
--- ORI/prettier/src/language-js/print/assignment.js
+++ ALT/prettier/src/language-js/print/assignment.js
@@ -251,8 +251,9 @@ function isAssignmentOrVariableDeclarator(node) {
function isComplexTypeAliasParams(node) {
const typeParams = getTypeParametersFromTypeAlias(node);
if (isNonEmptyArray(typeParams)) {
- const constraintPropertyName =
- node.type === "TSTypeAliasDeclaration" ? "constraint" : "bound";
+ const constraintPropertyName = node.type === "TSTypeAliasDeclaration"
+ ? "constraint"
+ : "bound";
if (
typeParams.length > 1 &&
typeParams.some((param) => param[constraintPropertyName] || param.default)
diff --git ORI/prettier/src/language-js/print/call-arguments.js ALT/prettier/src/language-js/print/call-arguments.js
index e99cdf8..2a05b5a 100644
--- ORI/prettier/src/language-js/print/call-arguments.js
+++ ALT/prettier/src/language-js/print/call-arguments.js
@@ -79,10 +79,11 @@ function printCallArguments(path, options, print) {
const maybeTrailingComma =
// Dynamic imports cannot have trailing commas
- !(isDynamicImport || (node.callee && node.callee.type === "Import")) &&
- shouldPrintComma(options, "all")
- ? ","
- : "";
+
+ !(isDynamicImport || (node.callee && node.callee.type === "Import")) &&
+ shouldPrintComma(options, "all")
+ ? ","
+ : "";
function allArgsBrokenOut() {
return group(
diff --git ORI/prettier/src/language-js/print/flow.js ALT/prettier/src/language-js/print/flow.js
index 090d9ad..3499943 100644
--- ORI/prettier/src/language-js/print/flow.js
+++ ALT/prettier/src/language-js/print/flow.js
@@ -159,14 +159,13 @@ function printFlow(path, options, print) {
group(["{", printDanglingComments(path, options), softline, "}"])
);
} else {
- const members =
- node.members.length > 0
- ? [
- hardline,
- printArrayItems(path, options, "members", print),
- node.hasUnknownMembers || shouldPrintComma(options) ? "," : "",
- ]
- : [];
+ const members = node.members.length > 0
+ ? [
+ hardline,
+ printArrayItems(path, options, "members", print),
+ node.hasUnknownMembers || shouldPrintComma(options) ? "," : "",
+ ]
+ : [];
parts.push(
group([
diff --git ORI/prettier/src/language-js/print/jsx.js ALT/prettier/src/language-js/print/jsx.js
index 42fcc57..a9bd909 100644
--- ORI/prettier/src/language-js/print/jsx.js
+++ ALT/prettier/src/language-js/print/jsx.js
@@ -66,14 +66,12 @@ function printJsxElementInternal(path, options, print) {
return [print("openingElement"), print("closingElement")];
}
- const openingLines =
- node.type === "JSXElement"
- ? print("openingElement")
- : print("openingFragment");
- const closingLines =
- node.type === "JSXElement"
- ? print("closingElement")
- : print("closingFragment");
+ const openingLines = node.type === "JSXElement"
+ ? print("openingElement")
+ : print("openingFragment");
+ const closingLines = node.type === "JSXElement"
+ ? print("closingElement")
+ : print("closingFragment");
if (
node.children.length === 1 &&
diff --git ORI/prettier/src/language-js/print/object.js ALT/prettier/src/language-js/print/object.js
index bce115b..6b37003 100644
--- ORI/prettier/src/language-js/print/object.js
+++ ALT/prettier/src/language-js/print/object.js
@@ -89,8 +89,11 @@ function printObject(path, options, print) {
: node.type === "TSInterfaceBody" || node.type === "TSTypeLiteral"
? ifBreak(semi, ";")
: ",";
- const leftBrace =
- node.type === "RecordExpression" ? "#{" : node.exact ? "{|" : "{";
+ const leftBrace = node.type === "RecordExpression"
+ ? "#{"
+ : node.exact
+ ? "{|"
+ : "{";
const rightBrace = node.exact ? "|}" : "}";
// Unfortunately, things are grouped together in the ast can be
diff --git ORI/prettier/src/language-js/print/template-literal.js ALT/prettier/src/language-js/print/template-literal.js
index 02ca550..79f1d8d 100644
--- ORI/prettier/src/language-js/print/template-literal.js
+++ ALT/prettier/src/language-js/print/template-literal.js
@@ -97,10 +97,9 @@ function printTemplateLiteral(path, print, options) {
}
}
- const aligned =
- indentSize === 0 && quasi.value.raw.endsWith("\n")
- ? align(Number.NEGATIVE_INFINITY, printed)
- : addAlignmentToDoc(printed, indentSize, tabWidth);
+ const aligned = indentSize === 0 && quasi.value.raw.endsWith("\n")
+ ? align(Number.NEGATIVE_INFINITY, printed)
+ : addAlignmentToDoc(printed, indentSize, tabWidth);
parts.push(group(["${", aligned, lineSuffixBoundary, "}"]));
}
diff --git ORI/prettier/src/language-js/print/type-annotation.js ALT/prettier/src/language-js/print/type-annotation.js
index c1e2d64..6c6e26e 100644
--- ORI/prettier/src/language-js/print/type-annotation.js
+++ ALT/prettier/src/language-js/print/type-annotation.js
@@ -82,8 +82,9 @@ function printTypeAlias(path, options, print) {
parts.push("declare ");
}
parts.push("type ", print("id"), print("typeParameters"));
- const rightPropertyName =
- node.type === "TSTypeAliasDeclaration" ? "typeAnnotation" : "right";
+ const rightPropertyName = node.type === "TSTypeAliasDeclaration"
+ ? "typeAnnotation"
+ : "right";
return [
printAssignment(path, options, print, parts, " =", rightPropertyName),
semi,
@@ -255,15 +256,14 @@ function printFunctionType(path, options, print) {
// The returnType is not wrapped in a TypeAnnotation, so the colon
// needs to be added separately.
- const returnTypeDoc =
- node.returnType || node.predicate || node.typeAnnotation
- ? [
- isArrowFunctionTypeAnnotation ? " => " : ": ",
- print("returnType"),
- print("predicate"),
- print("typeAnnotation"),
- ]
- : "";
+ const returnTypeDoc = node.returnType || node.predicate || node.typeAnnotation
+ ? [
+ isArrowFunctionTypeAnnotation ? " => " : ": ",
+ print("returnType"),
+ print("predicate"),
+ print("typeAnnotation"),
+ ]
+ : "";
const shouldGroupParameters = shouldGroupFunctionParameters(
node,
@@ -310,7 +310,9 @@ function printTupleType(path, options, print) {
function printIndexedAccessType(path, options, print) {
const node = path.getValue();
const leftDelimiter =
- node.type === "OptionalIndexedAccessType" && node.optional ? "?.[" : "[";
+ node.type === "OptionalIndexedAccessType" && node.optional
+ ? "?.["
+ : "[";
return [print("objectType"), leftDelimiter, print("indexType"), "]"];
}
diff --git ORI/prettier/src/language-js/print/typescript.js ALT/prettier/src/language-js/print/typescript.js
index 9d55477..14f4126 100644
--- ORI/prettier/src/language-js/print/typescript.js
+++ ALT/prettier/src/language-js/print/typescript.js
@@ -209,10 +209,9 @@ function printTypescript(path, options, print) {
// using them, it makes sense to have a trailing comma. But if you
// aren't, this is more like a computed property name than an array.
// So we leave off the trailing comma when there's just one parameter.
- const trailingComma =
- node.parameters.length > 1
- ? ifBreak(shouldPrintComma(options) ? "," : "")
- : "";
+ const trailingComma = node.parameters.length > 1
+ ? ifBreak(shouldPrintComma(options) ? "," : "")
+ : "";
const parametersGroup = group([
indent([
diff --git ORI/prettier/src/language-markdown/printer-markdown.js ALT/prettier/src/language-markdown/printer-markdown.js
index 1cd5f82..e6c1d25 100644
--- ORI/prettier/src/language-markdown/printer-markdown.js
+++ ALT/prettier/src/language-markdown/printer-markdown.js
@@ -168,8 +168,9 @@ function genericPrint(path, options, print) {
nextNode.children.length > 0 &&
nextNode.children[0].type === "word" &&
!nextNode.children[0].hasLeadingPunctuation);
- style =
- hasPrevOrNextWord || getAncestorNode(path, "emphasis") ? "*" : "_";
+ style = hasPrevOrNextWord || getAncestorNode(path, "emphasis")
+ ? "*"
+ : "_";
}
return [style, printChildren(path, options, print), style];
}
@@ -199,13 +200,14 @@ function genericPrint(path, options, print) {
const mailto = "mailto:";
const url =
// <[email protected]> is parsed as { url: "mailto:[email protected]" }
- node.url.startsWith(mailto) &&
- options.originalText.slice(
- node.position.start.offset + 1,
- node.position.start.offset + 1 + mailto.length
- ) !== mailto
- ? node.url.slice(mailto.length)
- : node.url;
+
+ node.url.startsWith(mailto) &&
+ options.originalText.slice(
+ node.position.start.offset + 1,
+ node.position.start.offset + 1 + mailto.length
+ ) !== mailto
+ ? node.url.slice(mailto.length)
+ : node.url;
return ["<", url, ">"];
}
case "[":
@@ -887,14 +889,13 @@ function printTitle(title, options, printSpace = true) {
// faster than using RegExps: https://jsperf.com/performance-of-match-vs-split
const singleCount = title.split("'").length - 1;
const doubleCount = title.split('"').length - 1;
- const quote =
- singleCount > doubleCount
- ? '"'
- : doubleCount > singleCount
- ? "'"
- : options.singleQuote
- ? "'"
- : '"';
+ const quote = singleCount > doubleCount
+ ? '"'
+ : doubleCount > singleCount
+ ? "'"
+ : options.singleQuote
+ ? "'"
+ : '"';
title = title.replace(/\\/, "\\\\");
title = title.replace(new RegExp(`(${quote})`, "g"), "\\$1");
return `${quote}${title}${quote}`;
diff --git ORI/prettier/src/language-yaml/printer-yaml.js ALT/prettier/src/language-yaml/printer-yaml.js
index 272eb97..45299b5 100644
--- ORI/prettier/src/language-yaml/printer-yaml.js
+++ ALT/prettier/src/language-yaml/printer-yaml.js
@@ -277,8 +277,9 @@ function printNode(node, parentNode, path, options, print) {
) {
// only quoteDouble can use escape chars
// and quoteSingle do not need to escape backslashes
- const originalQuote =
- node.type === "quoteDouble" ? doubleQuote : singleQuote;
+ const originalQuote = node.type === "quoteDouble"
+ ? doubleQuote
+ : singleQuote;
return [
originalQuote,
printFlowScalarContent(node.type, raw, options),
diff --git ORI/prettier/src/language-yaml/utils.js ALT/prettier/src/language-yaml/utils.js
index 904ffc8..0e4e348 100644
--- ORI/prettier/src/language-yaml/utils.js
+++ ALT/prettier/src/language-yaml/utils.js
@@ -245,20 +245,18 @@ function getBlockValueLineContents(
node,
{ parentIndent, isLastDescendant, options }
) {
- const content =
- node.position.start.line === node.position.end.line
- ? ""
- : options.originalText
- .slice(node.position.start.offset, node.position.end.offset)
- // exclude open line `>` or `|`
- .match(/^[^\n]*?\n(.*)$/s)[1];
-
- const leadingSpaceCount =
- node.indent === null
- ? ((match) => (match ? match[1].length : Number.POSITIVE_INFINITY))(
- content.match(/^( *)\S/m)
- )
- : node.indent - 1 + parentIndent;
+ const content = node.position.start.line === node.position.end.line
+ ? ""
+ : options.originalText
+ .slice(node.position.start.offset, node.position.end.offset)
+ // exclude open line `>` or `|`
+ .match(/^[^\n]*?\n(.*)$/s)[1];
+
+ const leadingSpaceCount = node.indent === null
+ ? ((match) => (match ? match[1].length : Number.POSITIVE_INFINITY))(
+ content.match(/^( *)\S/m)
+ )
+ : node.indent - 1 + parentIndent;
const rawLineContents = content
.split("\n")
diff --git ORI/prettier/src/main/support.js ALT/prettier/src/main/support.js
index 6bf3ad8..8d10c6b 100644
--- ORI/prettier/src/main/support.js
+++ ALT/prettier/src/main/support.js
@@ -44,14 +44,13 @@ function getSupportInfo({
option = { ...option };
if (Array.isArray(option.default)) {
- option.default =
- option.default.length === 1
- ? option.default[0].value
- : option.default
- .filter(filterSince)
- .sort((info1, info2) =>
- semver.compare(info2.since, info1.since)
- )[0].value;
+ option.default = option.default.length === 1
+ ? option.default[0].value
+ : option.default
+ .filter(filterSince)
+ .sort((info1, info2) =>
+ semver.compare(info2.since, info1.since)
+ )[0].value;
}
if (Array.isArray(option.choices)) {
diff --git ORI/prettier/tests/config/format-test.js ALT/prettier/tests/config/format-test.js
index 41d5091..6972b97 100644
--- ORI/prettier/tests/config/format-test.js
+++ ALT/prettier/tests/config/format-test.js
@@ -98,8 +98,9 @@ const isTestDirectory = (dirname, name) =>
);
function runSpec(fixtures, parsers, options) {
- let { dirname, snippets = [] } =
- typeof fixtures === "string" ? { dirname: fixtures } : fixtures;
+ let { dirname, snippets = [] } = typeof fixtures === "string"
+ ? { dirname: fixtures }
+ : fixtures;
// `IS_PARSER_INFERENCE_TESTS` mean to test `inferParser` on `standalone`
const IS_PARSER_INFERENCE_TESTS = isTestDirectory(
@@ -334,13 +335,12 @@ function runTest({
formatOptions
).eolVisualizedOutput;
// Only if `endOfLine: "auto"` the result will be different
- const expected =
- formatOptions.endOfLine === "auto"
- ? visualizeEndOfLine(
- // All `code` use `LF`, so the `eol` of result is always `LF`
- formatResult.outputWithCursor.replace(/\n/g, eol)
- )
- : formatResult.eolVisualizedOutput;
+ const expected = formatOptions.endOfLine === "auto"
+ ? visualizeEndOfLine(
+ // All `code` use `LF`, so the `eol` of result is always `LF`
+ formatResult.outputWithCursor.replace(/\n/g, eol)
+ )
+ : formatResult.eolVisualizedOutput;
expect(output).toEqual(expected);
});
}
diff --git ORI/prettier/tests/config/utils/check-parsers.js ALT/prettier/tests/config/utils/check-parsers.js
index 2c4ee1d..7d38196 100644
--- ORI/prettier/tests/config/utils/check-parsers.js
+++ ALT/prettier/tests/config/utils/check-parsers.js
@@ -158,10 +158,9 @@ const checkParser = ({ dirname, files }, parsers = []) => {
if (allowedParsers && !allowedParsers.includes(parser)) {
const suggestCategories = getParserCategories(parser);
- const suggestion =
- suggestCategories.length === 0
- ? ""
- : outdent`
+ const suggestion = suggestCategories.length === 0
+ ? ""
+ : outdent`
Suggest move your tests to:
${suggestCategories
.map((category) => `- ${path.join(TESTS_ROOT, category)}`)
diff --git ORI/prettier/tests/format/json/json-superset/jsfmt.spec.js ALT/prettier/tests/format/json/json-superset/jsfmt.spec.js
index 4bc498a..38b10cd 100644
--- ORI/prettier/tests/format/json/json-superset/jsfmt.spec.js
+++ ALT/prettier/tests/format/json/json-superset/jsfmt.spec.js
@@ -23,10 +23,9 @@ run_spec(
...[...characters, LINE_FEED].map((character) => ({
name: `json(\\${characterCode(character)})`,
code: SINGLE_QUOTE + BACKSLASH + character + SINGLE_QUOTE,
- output:
- character === UNDERSCORE || character === SPACE
- ? DOUBLE_QUOTE + character + DOUBLE_QUOTE + LINE_FEED
- : DOUBLE_QUOTE + BACKSLASH + character + DOUBLE_QUOTE + LINE_FEED,
+ output: character === UNDERSCORE || character === SPACE
+ ? DOUBLE_QUOTE + character + DOUBLE_QUOTE + LINE_FEED
+ : DOUBLE_QUOTE + BACKSLASH + character + DOUBLE_QUOTE + LINE_FEED,
})),
...characters.map((character) => ({
name: `json(\\\\${characterCode(character)})`,
@@ -56,10 +55,9 @@ run_spec(
...[...characters, LINE_FEED].map((character) => ({
name: `json-stringify(\\${characterCode(character)})`,
code: SINGLE_QUOTE + BACKSLASH + character + SINGLE_QUOTE,
- output:
- character === UNDERSCORE || character === SPACE
- ? DOUBLE_QUOTE + character + DOUBLE_QUOTE + LINE_FEED
- : DOUBLE_QUOTE + DOUBLE_QUOTE + LINE_FEED,
+ output: character === UNDERSCORE || character === SPACE
+ ? DOUBLE_QUOTE + character + DOUBLE_QUOTE + LINE_FEED
+ : DOUBLE_QUOTE + DOUBLE_QUOTE + LINE_FEED,
})),
...characters.map((character) => ({
name: `json-stringify(\\\\${characterCode(character)})`,
diff --git ORI/prettier/website/playground/util.js ALT/prettier/website/playground/util.js
index 62e9917..93f26e2 100644
--- ORI/prettier/website/playground/util.js
+++ ALT/prettier/website/playground/util.js
@@ -10,8 +10,9 @@ export function getDefaults(availableOptions, optionNames) {
const defaults = {};
for (const option of availableOptions) {
if (optionNames.includes(option.name)) {
- defaults[option.name] =
- option.name === "parser" ? "babel" : option.default;
+ defaults[option.name] = option.name === "parser"
+ ? "babel"
+ : option.default;
}
}
return defaults;
diff --git ORI/prettier/website/versioned_docs/version-stable/rationale.md ALT/prettier/website/versioned_docs/version-stable/rationale.md
index d5c2726..53e3547 100644
--- ORI/prettier/website/versioned_docs/version-stable/rationale.md
+++ ALT/prettier/website/versioned_docs/version-stable/rationale.md
@@ -296,8 +296,9 @@ Prettier will turn the above into:
```js
// eslint-disable-next-line no-eval
-const result =
- safeToEval && settings.allowNativeEval ? eval(input) : fallback(input);
+const result = safeToEval && settings.allowNativeEval
+ ? eval(input)
+ : fallback(input);
```
Which means that the `eslint-disable-next-line` comment is no longer effective. In this case you need to move the comment: |
|
prettier/prettier#12087 VS prettier/prettier@main :: marmelab/react-admin@5395b13 Diff (1501 lines)diff --git ORI/react-admin/examples/crm/src/App.tsx ALT/react-admin/examples/crm/src/App.tsx
index 89a5a1c..d51cce6 100644
--- ORI/react-admin/examples/crm/src/App.tsx
+++ ALT/react-admin/examples/crm/src/App.tsx
@@ -14,10 +14,9 @@ import deals from './deals';
import { Dashboard } from './dashboard/Dashboard';
// FIXME MUI bug https://github.com/mui-org/material-ui/issues/13394
-const theme =
- process.env.NODE_ENV !== 'production'
- ? unstable_createMuiStrictModeTheme(defaultTheme)
- : createMuiTheme(defaultTheme);
+const theme = process.env.NODE_ENV !== 'production'
+ ? unstable_createMuiStrictModeTheme(defaultTheme)
+ : createMuiTheme(defaultTheme);
const App = () => (
<Admin
diff --git ORI/react-admin/examples/crm/src/dataGenerator/companies.ts ALT/react-admin/examples/crm/src/dataGenerator/companies.ts
index 1284053..3e52b86 100644
--- ORI/react-admin/examples/crm/src/dataGenerator/companies.ts
+++ ALT/react-admin/examples/crm/src/dataGenerator/companies.ts
@@ -43,8 +43,9 @@ export const generateCompanies = (db: Db): Company[] => {
nb_contacts: 0,
nb_deals: 0,
// at least 1/3rd of companies for Jane Doe
- sales_id:
- random.number(2) === 0 ? 0 : random.arrayElement(db.sales).id,
+ sales_id: random.number(2) === 0
+ ? 0
+ : random.arrayElement(db.sales).id,
created_at: randomDate().toISOString(),
};
});
diff --git ORI/react-admin/examples/crm/src/dataGenerator/utils.ts ALT/react-admin/examples/crm/src/dataGenerator/utils.ts
index 41f5bdf..cb4f665 100644
--- ORI/react-admin/examples/crm/src/dataGenerator/utils.ts
+++ ALT/react-admin/examples/crm/src/dataGenerator/utils.ts
@@ -13,10 +13,9 @@ export const weightedBoolean = (likelyhood: number) =>
faker.random.number(99) < likelyhood;
export const randomDate = (minDate?: Date, maxDate?: Date) => {
- const minTs =
- minDate instanceof Date
- ? minDate.getTime()
- : Date.now() - 5 * 365 * 24 * 60 * 60 * 1000; // 5 years
+ const minTs = minDate instanceof Date
+ ? minDate.getTime()
+ : Date.now() - 5 * 365 * 24 * 60 * 60 * 1000; // 5 years
const maxTs = maxDate instanceof Date ? maxDate.getTime() : Date.now();
const range = maxTs - minTs;
const randomRange = faker.random.number({ max: range });
diff --git ORI/react-admin/examples/data-generator/src/commands.ts ALT/react-admin/examples/data-generator/src/commands.ts
index b6c150b..d42288f 100644
--- ORI/react-admin/examples/data-generator/src/commands.ts
+++ ALT/react-admin/examples/data-generator/src/commands.ts
@@ -42,10 +42,9 @@ export default (db, { serializeDate }) => {
const customer = random.arrayElement<any>(realCustomers);
const date = randomDate(customer.first_seen, customer.last_seen);
- const status =
- isAfter(date, aMonthAgo) && random.boolean()
- ? 'ordered'
- : weightedArrayElement(['delivered', 'cancelled'], [10, 1]);
+ const status = isAfter(date, aMonthAgo) && random.boolean()
+ ? 'ordered'
+ : weightedArrayElement(['delivered', 'cancelled'], [10, 1]);
return {
id,
reference: random.alphaNumeric(6).toUpperCase(),
diff --git ORI/react-admin/examples/data-generator/src/customers.ts ALT/react-admin/examples/data-generator/src/customers.ts
index 74db3cf..5490b73 100644
--- ORI/react-admin/examples/data-generator/src/customers.ts
+++ ALT/react-admin/examples/data-generator/src/customers.ts
@@ -36,8 +36,9 @@ export default (db, { serializeDate }) => {
city: has_ordered ? address.city() : null,
stateAbbr: has_ordered ? address.stateAbbr() : null,
avatar,
- birthday:
- serializeDate && birthday ? birthday.toISOString() : birthday,
+ birthday: serializeDate && birthday
+ ? birthday.toISOString()
+ : birthday,
first_seen: serializeDate ? first_seen.toISOString() : first_seen,
last_seen: serializeDate ? last_seen.toISOString() : last_seen,
has_ordered: has_ordered,
diff --git ORI/react-admin/examples/data-generator/src/utils.ts ALT/react-admin/examples/data-generator/src/utils.ts
index b1f5d5f..4073952 100644
--- ORI/react-admin/examples/data-generator/src/utils.ts
+++ ALT/react-admin/examples/data-generator/src/utils.ts
@@ -13,10 +13,9 @@ export const weightedBoolean = likelyhood =>
faker.random.number(99) < likelyhood;
export const randomDate = (minDate?: Date, maxDate?: Date) => {
- const minTs =
- minDate instanceof Date
- ? minDate.getTime()
- : Date.now() - 5 * 365 * 24 * 60 * 60 * 1000; // 5 years
+ const minTs = minDate instanceof Date
+ ? minDate.getTime()
+ : Date.now() - 5 * 365 * 24 * 60 * 60 * 1000; // 5 years
const maxTs = maxDate instanceof Date ? maxDate.getTime() : Date.now();
const range = maxTs - minTs;
const randomRange = faker.random.number({ max: range });
diff --git ORI/react-admin/examples/demo/src/dashboard/Welcome.tsx ALT/react-admin/examples/demo/src/dashboard/Welcome.tsx
index 63d16fa..c2620fc 100644
--- ORI/react-admin/examples/demo/src/dashboard/Welcome.tsx
+++ ALT/react-admin/examples/demo/src/dashboard/Welcome.tsx
@@ -9,10 +9,9 @@ import publishArticleImage from './welcome_illustration.svg';
const useStyles = makeStyles(theme => ({
root: {
- background:
- theme.palette.type === 'dark'
- ? '#535353'
- : `linear-gradient(to right, #8975fb 0%, #746be7 35%), linear-gradient(to bottom, #8975fb 0%, #6f4ceb 50%), #6f4ceb`,
+ background: theme.palette.type === 'dark'
+ ? '#535353'
+ : `linear-gradient(to right, #8975fb 0%, #746be7 35%), linear-gradient(to bottom, #8975fb 0%, #6f4ceb 50%), #6f4ceb`,
color: '#fff',
padding: 20,
diff --git ORI/react-admin/examples/demo/src/layout/Login.tsx ALT/react-admin/examples/demo/src/layout/Login.tsx
index ac64d16..0732b16 100644
--- ORI/react-admin/examples/demo/src/layout/Login.tsx
+++ ALT/react-admin/examples/demo/src/layout/Login.tsx
@@ -102,12 +102,11 @@ const Login = () => {
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
);
diff --git ORI/react-admin/examples/demo/src/orders/OrderList.tsx ALT/react-admin/examples/demo/src/orders/OrderList.tsx
index 279534d..48ecefd 100644
--- ORI/react-admin/examples/demo/src/orders/OrderList.tsx
+++ ALT/react-admin/examples/demo/src/orders/OrderList.tsx
@@ -130,12 +130,11 @@ const TabbedDatagrid = (props: TabbedDatagridProps) => {
[displayedFilters, filterValues, setFilters]
);
- const selectedIds =
- filterValues.status === 'ordered'
- ? ordered
- : filterValues.status === 'delivered'
- ? delivered
- : cancelled;
+ const selectedIds = filterValues.status === 'ordered'
+ ? ordered
+ : filterValues.status === 'delivered'
+ ? delivered
+ : cancelled;
return (
<Fragment>
diff --git ORI/react-admin/examples/demo/src/visitors/Aside.tsx ALT/react-admin/examples/demo/src/visitors/Aside.tsx
index 9776030..4924048 100644
--- ORI/react-admin/examples/demo/src/visitors/Aside.tsx
+++ ALT/react-admin/examples/demo/src/visitors/Aside.tsx
@@ -200,10 +200,9 @@ const EventList = ({ record, basePath }: EventListProps) => {
>
<StepLabel
StepIconComponent={() => {
- const Component =
- event.type === 'order'
- ? order.icon
- : review.icon;
+ const Component = event.type === 'order'
+ ? order.icon
+ : review.icon;
return (
<Component
fontSize="small"
@@ -256,22 +255,20 @@ const mixOrdersAndReviews = (
reviews?: RecordMap<ReviewRecord>,
reviewIds?: Identifier[]
): AsideEvent[] => {
- const eventsFromOrders =
- orderIds && orders
- ? orderIds.map<AsideEvent>(id => ({
- type: 'order',
- date: orders[id].date,
- data: orders[id],
- }))
- : [];
- const eventsFromReviews =
- reviewIds && reviews
- ? reviewIds.map<AsideEvent>(id => ({
- type: 'review',
- date: reviews[id].date,
- data: reviews[id],
- }))
- : [];
+ const eventsFromOrders = orderIds && orders
+ ? orderIds.map<AsideEvent>(id => ({
+ type: 'order',
+ date: orders[id].date,
+ data: orders[id],
+ }))
+ : [];
+ const eventsFromReviews = reviewIds && reviews
+ ? reviewIds.map<AsideEvent>(id => ({
+ type: 'review',
+ date: reviews[id].date,
+ data: reviews[id],
+ }))
+ : [];
const events = eventsFromOrders.concat(eventsFromReviews);
events.sort(
(e1, e2) => new Date(e2.date).getTime() - new Date(e1.date).getTime()
diff --git ORI/react-admin/examples/no-code/src/main.tsx ALT/react-admin/examples/no-code/src/main.tsx
index 77c0ef2..97cbe0e 100644
--- ORI/react-admin/examples/no-code/src/main.tsx
+++ ALT/react-admin/examples/no-code/src/main.tsx
@@ -8,10 +8,9 @@ import {
} from '@material-ui/core/styles';
// FIXME MUI bug https://github.com/mui-org/material-ui/issues/13394
-const theme =
- process.env.NODE_ENV !== 'production'
- ? unstable_createMuiStrictModeTheme(defaultTheme)
- : createMuiTheme(defaultTheme);
+const theme = process.env.NODE_ENV !== 'production'
+ ? unstable_createMuiStrictModeTheme(defaultTheme)
+ : createMuiTheme(defaultTheme);
ReactDOM.render(
<React.StrictMode>
diff --git ORI/react-admin/packages/ra-core/src/auth/useLogoutIfAccessDenied.ts ALT/react-admin/packages/ra-core/src/auth/useLogoutIfAccessDenied.ts
index 5e9429d..2a11ef8 100644
--- ORI/react-admin/packages/ra-core/src/auth/useLogoutIfAccessDenied.ts
+++ ALT/react-admin/packages/ra-core/src/auth/useLogoutIfAccessDenied.ts
@@ -82,12 +82,11 @@ const useLogoutIfAccessDenied = (): LogoutIfAccessDenied => {
})
.catch(() => {});
}
- const redirectTo =
- e && e.redirectTo
- ? e.redirectTo
- : error && error.redirectTo
- ? error.redirectTo
- : undefined;
+ const redirectTo = e && e.redirectTo
+ ? e.redirectTo
+ : error && error.redirectTo
+ ? error.redirectTo
+ : undefined;
if (logoutUser) {
logout({}, redirectTo);
diff --git ORI/react-admin/packages/ra-core/src/controller/button/useDeleteWithConfirmController.tsx ALT/react-admin/packages/ra-core/src/controller/button/useDeleteWithConfirmController.tsx
index 576132e..4833d48 100644
--- ORI/react-admin/packages/ra-core/src/controller/button/useDeleteWithConfirmController.tsx
+++ ALT/react-admin/packages/ra-core/src/controller/button/useDeleteWithConfirmController.tsx
@@ -110,12 +110,11 @@ const useDeleteWithConfirmController = (
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
);
diff --git ORI/react-admin/packages/ra-core/src/controller/button/useDeleteWithUndoController.tsx ALT/react-admin/packages/ra-core/src/controller/button/useDeleteWithUndoController.tsx
index a354d05..97da5c3 100644
--- ORI/react-admin/packages/ra-core/src/controller/button/useDeleteWithUndoController.tsx
+++ ALT/react-admin/packages/ra-core/src/controller/button/useDeleteWithUndoController.tsx
@@ -65,40 +65,37 @@ const useDeleteWithUndoController = (
const [deleteOne, { loading }] = useDelete(resource, null, null, {
action: CRUD_DELETE,
- onSuccess:
- onSuccess !== undefined
- ? onSuccess
- : () => {
- notify('ra.notification.deleted', {
- type: 'info',
- messageArgs: { smart_count: 1 },
- undoable: true,
- });
- redirect(redirectTo, basePath || `/${resource}`);
- refresh();
- },
- onFailure:
- onFailure !== undefined
- ? onFailure
- : error => {
- notify(
- typeof error === 'string'
- ? error
- : error.message || 'ra.notification.http_error',
- {
- type: 'warning',
- messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
- },
- }
- );
- refresh();
- },
+ onSuccess: onSuccess !== undefined
+ ? onSuccess
+ : () => {
+ notify('ra.notification.deleted', {
+ type: 'info',
+ messageArgs: { smart_count: 1 },
+ undoable: true,
+ });
+ redirect(redirectTo, basePath || `/${resource}`);
+ refresh();
+ },
+ onFailure: onFailure !== undefined
+ ? onFailure
+ : error => {
+ notify(
+ typeof error === 'string'
+ ? error
+ : error.message || 'ra.notification.http_error',
+ {
+ type: 'warning',
+ messageArgs: {
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
+ },
+ }
+ );
+ refresh();
+ },
mutationMode: 'undoable',
});
const handleDelete = useCallback(
diff --git ORI/react-admin/packages/ra-core/src/controller/details/useCreateController.ts ALT/react-admin/packages/ra-core/src/controller/details/useCreateController.ts
index 5b0738e..13b2c4a 100644
--- ORI/react-admin/packages/ra-core/src/controller/details/useCreateController.ts
+++ ALT/react-admin/packages/ra-core/src/controller/details/useCreateController.ts
@@ -190,12 +190,11 @@ export const useCreateController = <
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
);
diff --git ORI/react-admin/packages/ra-core/src/controller/details/useEditController.ts ALT/react-admin/packages/ra-core/src/controller/details/useEditController.ts
index 6c68afa..a70b289 100644
--- ORI/react-admin/packages/ra-core/src/controller/details/useEditController.ts
+++ ALT/react-admin/packages/ra-core/src/controller/details/useEditController.ts
@@ -218,12 +218,11 @@ export const useEditController = <RecordType extends Record = Record>(
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
);
diff --git ORI/react-admin/packages/ra-core/src/controller/field/useReferenceArrayFieldController.ts ALT/react-admin/packages/ra-core/src/controller/field/useReferenceArrayFieldController.ts
index 48b0898..19cbd87 100644
--- ORI/react-admin/packages/ra-core/src/controller/field/useReferenceArrayFieldController.ts
+++ ALT/react-admin/packages/ra-core/src/controller/field/useReferenceArrayFieldController.ts
@@ -76,12 +76,11 @@ const useReferenceArrayFieldController = (
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
),
diff --git ORI/react-admin/packages/ra-core/src/controller/field/useReferenceManyFieldController.ts ALT/react-admin/packages/ra-core/src/controller/field/useReferenceManyFieldController.ts
index 695f932..b6faa99 100644
--- ORI/react-admin/packages/ra-core/src/controller/field/useReferenceManyFieldController.ts
+++ ALT/react-admin/packages/ra-core/src/controller/field/useReferenceManyFieldController.ts
@@ -172,12 +172,11 @@ const useReferenceManyFieldController = (
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
),
diff --git ORI/react-admin/packages/ra-core/src/controller/input/referenceDataStatus.ts ALT/react-admin/packages/ra-core/src/controller/input/referenceDataStatus.ts
index 2677b32..38c2c6e 100644
--- ORI/react-admin/packages/ra-core/src/controller/input/referenceDataStatus.ts
+++ ALT/react-admin/packages/ra-core/src/controller/input/referenceDataStatus.ts
@@ -28,12 +28,11 @@ export const getStatusForInput = ({
_: matchingReferences.error,
})
: null;
- const selectedReferenceError =
- input.value && !referenceRecord
- ? translate('ra.input.references.single_missing', {
- _: 'ra.input.references.single_missing',
- })
- : null;
+ const selectedReferenceError = input.value && !referenceRecord
+ ? translate('ra.input.references.single_missing', {
+ _: 'ra.input.references.single_missing',
+ })
+ : null;
return {
waiting:
diff --git ORI/react-admin/packages/ra-core/src/controller/input/useReferenceArrayInputController.ts ALT/react-admin/packages/ra-core/src/controller/input/useReferenceArrayInputController.ts
index d8c30c4..ed6913d 100644
--- ORI/react-admin/packages/ra-core/src/controller/input/useReferenceArrayInputController.ts
+++ ALT/react-admin/packages/ra-core/src/controller/input/useReferenceArrayInputController.ts
@@ -300,10 +300,9 @@ export const useReferenceArrayInputController = (
currentSort: sort,
// For the ListContext, we don't want to always display the selected items first.
// Indeed it wouldn't work well regarding sorting and pagination
- data:
- matchingReferences && matchingReferences.length > 0
- ? indexById(matchingReferences)
- : {},
+ data: matchingReferences && matchingReferences.length > 0
+ ? indexById(matchingReferences)
+ : {},
displayedFilters,
error: dataStatus.error,
filterValues,
diff --git ORI/react-admin/packages/ra-core/src/controller/useExpanded.tsx ALT/react-admin/packages/ra-core/src/controller/useExpanded.tsx
index 2b8fd65..f7ec855 100644
--- ORI/react-admin/packages/ra-core/src/controller/useExpanded.tsx
+++ ALT/react-admin/packages/ra-core/src/controller/useExpanded.tsx
@@ -29,10 +29,9 @@ const useExpanded = (
? reduxState.admin.resources[resource].list.expanded
: undefined
);
- const expanded =
- expandedList === undefined
- ? false
- : expandedList.map(el => el == id).indexOf(true) !== -1; // eslint-disable-line eqeqeq
+ const expanded = expandedList === undefined
+ ? false
+ : expandedList.map(el => el == id).indexOf(true) !== -1; // eslint-disable-line eqeqeq
const toggleExpanded = useCallback(() => {
dispatch(toggleListItemExpand(resource, id));
}, [dispatch, resource, id]);
diff --git ORI/react-admin/packages/ra-core/src/controller/useListController.ts ALT/react-admin/packages/ra-core/src/controller/useListController.ts
index 1961864..c7acbac 100644
--- ORI/react-admin/packages/ra-core/src/controller/useListController.ts
+++ ALT/react-admin/packages/ra-core/src/controller/useListController.ts
@@ -168,12 +168,11 @@ const useListController = <RecordType extends Record = Record>(
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
),
diff --git ORI/react-admin/packages/ra-core/src/controller/useListParams.ts ALT/react-admin/packages/ra-core/src/controller/useListParams.ts
index 7faf4a7..c3b2562 100644
--- ORI/react-admin/packages/ra-core/src/controller/useListParams.ts
+++ ALT/react-admin/packages/ra-core/src/controller/useListParams.ts
@@ -342,12 +342,11 @@ export const getQuery = ({
sort,
perPage,
}) => {
- const query: Partial<ListParams> =
- Object.keys(queryFromLocation).length > 0
- ? queryFromLocation
- : hasCustomParams(params)
- ? { ...params }
- : { filter: filterDefaultValues || {} };
+ const query: Partial<ListParams> = Object.keys(queryFromLocation).length > 0
+ ? queryFromLocation
+ : hasCustomParams(params)
+ ? { ...params }
+ : { filter: filterDefaultValues || {} };
if (!query.sort) {
query.sort = sort.field;
@@ -371,10 +370,9 @@ export const getNumberOrDefault = (
possibleNumber: string | number | undefined,
defaultValue: number
) => {
- const parsedNumber =
- typeof possibleNumber === 'string'
- ? parseInt(possibleNumber, 10)
- : possibleNumber;
+ const parsedNumber = typeof possibleNumber === 'string'
+ ? parseInt(possibleNumber, 10)
+ : possibleNumber;
return isNaN(parsedNumber) ? defaultValue : parsedNumber;
};
diff --git ORI/react-admin/packages/ra-core/src/controller/useSortState.ts ALT/react-admin/packages/ra-core/src/controller/useSortState.ts
index b6d5940..c94f97a 100644
--- ORI/react-admin/packages/ra-core/src/controller/useSortState.ts
+++ ALT/react-admin/packages/ra-core/src/controller/useSortState.ts
@@ -28,12 +28,11 @@ const sortReducer = (state: SortPayload, action: Action): SortPayload => {
return action.payload.sort;
case 'SET_SORT_FIELD': {
const { field } = action.payload;
- const order =
- state.field === field
- ? state.order === SORT_ASC
- ? SORT_DESC
- : SORT_ASC
- : SORT_ASC;
+ const order = state.field === field
+ ? state.order === SORT_ASC
+ ? SORT_DESC
+ : SORT_ASC
+ : SORT_ASC;
return { field, order };
}
case 'SET_SORT_ORDER': {
diff --git ORI/react-admin/packages/ra-core/src/core/CoreAdminContext.tsx ALT/react-admin/packages/ra-core/src/core/CoreAdminContext.tsx
index 089b013..c6e5279 100644
--- ORI/react-admin/packages/ra-core/src/core/CoreAdminContext.tsx
+++ ALT/react-admin/packages/ra-core/src/core/CoreAdminContext.tsx
@@ -58,15 +58,13 @@ const CoreAdminContext = (props: AdminContextProps) => {
React-admin requires a valid dataProvider function to work.`);
}
- const finalAuthProvider =
- authProvider instanceof Function
- ? convertLegacyAuthProvider(authProvider)
- : authProvider;
+ const finalAuthProvider = authProvider instanceof Function
+ ? convertLegacyAuthProvider(authProvider)
+ : authProvider;
- const finalDataProvider =
- dataProvider instanceof Function
- ? convertLegacyDataProvider(dataProvider)
- : dataProvider;
+ const finalDataProvider = dataProvider instanceof Function
+ ? convertLegacyDataProvider(dataProvider)
+ : dataProvider;
const finalHistory = history || createHashHistory();
diff --git ORI/react-admin/packages/ra-core/src/dataProvider/useQueryWithStore.ts ALT/react-admin/packages/ra-core/src/dataProvider/useQueryWithStore.ts
index 9f86d25..9a35ce5 100644
--- ORI/react-admin/packages/ra-core/src/dataProvider/useQueryWithStore.ts
+++ ALT/react-admin/packages/ra-core/src/dataProvider/useQueryWithStore.ts
@@ -219,8 +219,9 @@ export const useQueryWithStore = <
resolve({
error: null,
loading: false,
- loaded:
- options?.enabled === false ? false : true,
+ loaded: options?.enabled === false
+ ? false
+ : true,
});
})
.catch(error => {
diff --git ORI/react-admin/packages/ra-core/src/form/FormWithRedirect.tsx ALT/react-admin/packages/ra-core/src/form/FormWithRedirect.tsx
index 14022cb..661faa0 100644
--- ORI/react-admin/packages/ra-core/src/form/FormWithRedirect.tsx
+++ ALT/react-admin/packages/ra-core/src/form/FormWithRedirect.tsx
@@ -141,10 +141,9 @@ const FormWithRedirect = ({
);
const submit = values => {
- const finalRedirect =
- typeof redirect.current === undefined
- ? props.redirect
- : redirect.current;
+ const finalRedirect = typeof redirect.current === undefined
+ ? props.redirect
+ : redirect.current;
if (shouldSanitizeEmptyValues) {
const sanitizedValues = sanitizeEmptyValues(
diff --git ORI/react-admin/packages/ra-core/src/form/sanitizeEmptyValues.ts ALT/react-admin/packages/ra-core/src/form/sanitizeEmptyValues.ts
index bec5d15..3fb280f 100644
--- ORI/react-admin/packages/ra-core/src/form/sanitizeEmptyValues.ts
+++ ALT/react-admin/packages/ra-core/src/form/sanitizeEmptyValues.ts
@@ -33,8 +33,9 @@ const sanitizeEmptyValues = (initialValues: object, values: object) => {
) {
acc[key] = sanitizeEmptyValues(initialValues[key], values[key]);
} else {
- acc[key] =
- typeof values[key] === 'undefined' ? null : values[key];
+ acc[key] = typeof values[key] === 'undefined'
+ ? null
+ : values[key];
}
return acc;
},
diff --git ORI/react-admin/packages/ra-core/src/form/useChoices.ts ALT/react-admin/packages/ra-core/src/form/useChoices.ts
index e5ee20f..cf9f7dc 100644
--- ORI/react-admin/packages/ra-core/src/form/useChoices.ts
+++ ALT/react-admin/packages/ra-core/src/form/useChoices.ts
@@ -60,10 +60,9 @@ const useChoices = ({
record: choice,
});
}
- const choiceName =
- typeof optionText === 'function'
- ? optionText(choice)
- : get(choice, optionText);
+ const choiceName = typeof optionText === 'function'
+ ? optionText(choice)
+ : get(choice, optionText);
return translateChoice
? translate(choiceName, { _: choiceName })
diff --git ORI/react-admin/packages/ra-core/src/reducer/admin/resource/list/queryReducer.ts ALT/react-admin/packages/ra-core/src/reducer/admin/resource/list/queryReducer.ts
index 9892d00..ef09067 100644
--- ORI/react-admin/packages/ra-core/src/reducer/admin/resource/list/queryReducer.ts
+++ ALT/react-admin/packages/ra-core/src/reducer/admin/resource/list/queryReducer.ts
@@ -99,14 +99,13 @@ const queryReducer: Reducer<ListParams> = (
}
return {
...previousState,
- filter:
- typeof action.payload.defaultValue !== 'undefined'
- ? set(
- previousState.filter,
- action.payload.filterName,
- action.payload.defaultValue
- )
- : previousState.filter,
+ filter: typeof action.payload.defaultValue !== 'undefined'
+ ? set(
+ previousState.filter,
+ action.payload.filterName,
+ action.payload.defaultValue
+ )
+ : previousState.filter,
// we don't use lodash.set() for displayed filters
// to avoid problems with compound filter names (e.g. 'author.name')
displayedFilters: {
diff --git ORI/react-admin/packages/ra-data-simple-rest/src/index.ts ALT/react-admin/packages/ra-data-simple-rest/src/index.ts
index a9e1c4c..08c6888 100644
--- ORI/react-admin/packages/ra-data-simple-rest/src/index.ts
+++ ALT/react-admin/packages/ra-data-simple-rest/src/index.ts
@@ -51,15 +51,14 @@ export default (
filter: JSON.stringify(params.filter),
};
const url = `${apiUrl}/${resource}?${stringify(query)}`;
- const options =
- countHeader === 'Content-Range'
- ? {
- // Chrome doesn't return `Content-Range` header if no `Range` is provided in the request.
- headers: new Headers({
- Range: `${resource}=${rangeStart}-${rangeEnd}`,
- }),
- }
- : {};
+ const options = countHeader === 'Content-Range'
+ ? {
+ // Chrome doesn't return `Content-Range` header if no `Range` is provided in the request.
+ headers: new Headers({
+ Range: `${resource}=${rangeStart}-${rangeEnd}`,
+ }),
+ }
+ : {};
return httpClient(url, options).then(({ headers, json }) => {
if (!headers.has(countHeader)) {
@@ -69,13 +68,12 @@ export default (
}
return {
data: json,
- total:
- countHeader === 'Content-Range'
- ? parseInt(
- headers.get('content-range').split('/').pop(),
- 10
- )
- : parseInt(headers.get(countHeader.toLowerCase())),
+ total: countHeader === 'Content-Range'
+ ? parseInt(
+ headers.get('content-range').split('/').pop(),
+ 10
+ )
+ : parseInt(headers.get(countHeader.toLowerCase())),
};
});
},
@@ -109,15 +107,14 @@ export default (
}),
};
const url = `${apiUrl}/${resource}?${stringify(query)}`;
- const options =
- countHeader === 'Content-Range'
- ? {
- // Chrome doesn't return `Content-Range` header if no `Range` is provided in the request.
- headers: new Headers({
- Range: `${resource}=${rangeStart}-${rangeEnd}`,
- }),
- }
- : {};
+ const options = countHeader === 'Content-Range'
+ ? {
+ // Chrome doesn't return `Content-Range` header if no `Range` is provided in the request.
+ headers: new Headers({
+ Range: `${resource}=${rangeStart}-${rangeEnd}`,
+ }),
+ }
+ : {};
return httpClient(url, options).then(({ headers, json }) => {
if (!headers.has(countHeader)) {
@@ -127,13 +124,12 @@ export default (
}
return {
data: json,
- total:
- countHeader === 'Content-Range'
- ? parseInt(
- headers.get('content-range').split('/').pop(),
- 10
- )
- : parseInt(headers.get(countHeader.toLowerCase())),
+ total: countHeader === 'Content-Range'
+ ? parseInt(
+ headers.get('content-range').split('/').pop(),
+ 10
+ )
+ : parseInt(headers.get(countHeader.toLowerCase())),
};
});
},
diff --git ORI/react-admin/packages/ra-input-rich-text/src/index.tsx ALT/react-admin/packages/ra-input-rich-text/src/index.tsx
index 43526c8..085d611 100644
--- ORI/react-admin/packages/ra-input-rich-text/src/index.tsx
+++ ALT/react-admin/packages/ra-input-rich-text/src/index.tsx
@@ -71,10 +71,9 @@ const RichTextInput = (props: RichTextInputProps) => {
// eslint-disable-next-line react-hooks/exhaustive-deps
const onTextChange = useCallback(
debounce(() => {
- const value =
- editor.current.innerHTML === '<p><br></p>'
- ? ''
- : editor.current.innerHTML;
+ const value = editor.current.innerHTML === '<p><br></p>'
+ ? ''
+ : editor.current.innerHTML;
if (lastValueChange.current !== value) {
lastValueChange.current = value;
diff --git ORI/react-admin/packages/ra-input-rich-text/src/styles.ts ALT/react-admin/packages/ra-input-rich-text/src/styles.ts
index d649c9c..f00173f 100644
--- ORI/react-admin/packages/ra-input-rich-text/src/styles.ts
+++ ALT/react-admin/packages/ra-input-rich-text/src/styles.ts
@@ -13,15 +13,13 @@ export default (theme: Theme): StyleRules<string, any> => ({
fontSize: '1rem',
fontFamily: 'Roboto, sans-serif',
padding: '6px 12px',
- backgroundColor:
- theme.palette.type === 'dark'
- ? 'rgba(255, 255, 255, 0.04)'
- : 'rgba(0, 0, 0, 0.04)',
+ backgroundColor: theme.palette.type === 'dark'
+ ? 'rgba(255, 255, 255, 0.04)'
+ : 'rgba(0, 0, 0, 0.04)',
'&:hover::before': {
- backgroundColor:
- theme.palette.type === 'dark'
- ? 'rgba(255, 255, 255, 1)'
- : 'rgba(0, 0, 0, 1)',
+ backgroundColor: theme.palette.type === 'dark'
+ ? 'rgba(255, 255, 255, 1)'
+ : 'rgba(0, 0, 0, 1)',
height: 2,
},
@@ -34,10 +32,9 @@ export default (theme: Theme): StyleRules<string, any> => ({
position: 'absolute',
transition:
'background-color 200ms cubic-bezier(0.4, 0, 0.2, 1) 0ms',
- backgroundColor:
- theme.palette.type === 'dark'
- ? 'rgba(255, 255, 255, 0.7)'
- : 'rgba(0, 0, 0, 0.5)',
+ backgroundColor: theme.palette.type === 'dark'
+ ? 'rgba(255, 255, 255, 0.7)'
+ : 'rgba(0, 0, 0, 0.5)',
},
'&::after': {
diff --git ORI/react-admin/packages/ra-no-code/src/ApplicationsDashboard/ApplicationsDashboard.tsx ALT/react-admin/packages/ra-no-code/src/ApplicationsDashboard/ApplicationsDashboard.tsx
index 0422b62..79107b1 100644
--- ORI/react-admin/packages/ra-no-code/src/ApplicationsDashboard/ApplicationsDashboard.tsx
+++ ALT/react-admin/packages/ra-no-code/src/ApplicationsDashboard/ApplicationsDashboard.tsx
@@ -28,10 +28,9 @@ import {
storeApplicationsInStorage,
} from './applicationStorage';
-const defaultTheme =
- process.env.NODE_ENV !== 'production'
- ? unstable_createMuiStrictModeTheme(RaDefaultTheme)
- : createMuiTheme(RaDefaultTheme);
+const defaultTheme = process.env.NODE_ENV !== 'production'
+ ? unstable_createMuiStrictModeTheme(RaDefaultTheme)
+ : createMuiTheme(RaDefaultTheme);
export const ApplicationsDashboard = ({
onApplicationSelected,
diff --git ORI/react-admin/packages/ra-no-code/src/ResourceConfiguration/getFieldDefinitionsFromRecords.ts ALT/react-admin/packages/ra-no-code/src/ResourceConfiguration/getFieldDefinitionsFromRecords.ts
index 1242bde..07a6e1d 100644
--- ORI/react-admin/packages/ra-no-code/src/ResourceConfiguration/getFieldDefinitionsFromRecords.ts
+++ ALT/react-admin/packages/ra-no-code/src/ResourceConfiguration/getFieldDefinitionsFromRecords.ts
@@ -11,13 +11,12 @@ export const getFieldDefinitionsFromRecords = (
return {
...inferedDefinition,
- options:
- inferedDefinition.type === 'reference'
- ? {
- referenceField: 'id',
- selectionType: 'select',
- }
- : undefined,
+ options: inferedDefinition.type === 'reference'
+ ? {
+ referenceField: 'id',
+ selectionType: 'select',
+ }
+ : undefined,
views: ['list', 'create', 'edit', 'show'],
};
});
diff --git ORI/react-admin/packages/ra-ui-materialui/src/auth/LoginForm.tsx ALT/react-admin/packages/ra-ui-materialui/src/auth/LoginForm.tsx
index 13d8bc3..868d3ba 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/auth/LoginForm.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/auth/LoginForm.tsx
@@ -88,12 +88,11 @@ const LoginForm = (props: Props) => {
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
);
diff --git ORI/react-admin/packages/ra-ui-materialui/src/button/BulkDeleteWithConfirmButton.tsx ALT/react-admin/packages/ra-ui-materialui/src/button/BulkDeleteWithConfirmButton.tsx
index 68cf871..30aba4a 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/button/BulkDeleteWithConfirmButton.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/button/BulkDeleteWithConfirmButton.tsx
@@ -76,12 +76,11 @@ const BulkDeleteWithConfirmButton = (
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
);
diff --git ORI/react-admin/packages/ra-ui-materialui/src/button/BulkDeleteWithUndoButton.tsx ALT/react-admin/packages/ra-ui-materialui/src/button/BulkDeleteWithUndoButton.tsx
index d537875..9b79dcc 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/button/BulkDeleteWithUndoButton.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/button/BulkDeleteWithUndoButton.tsx
@@ -67,12 +67,11 @@ const BulkDeleteWithUndoButton = (props: BulkDeleteWithUndoButtonProps) => {
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
);
diff --git ORI/react-admin/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.tsx ALT/react-admin/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.tsx
index 94b79bc..937bff3 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.tsx
@@ -76,12 +76,11 @@ const BulkUpdateWithConfirmButton = (
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
);
diff --git ORI/react-admin/packages/ra-ui-materialui/src/button/BulkUpdateWithUndoButton.tsx ALT/react-admin/packages/ra-ui-materialui/src/button/BulkUpdateWithUndoButton.tsx
index d7d7c15..8a33f48 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/button/BulkUpdateWithUndoButton.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/button/BulkUpdateWithUndoButton.tsx
@@ -65,12 +65,11 @@ const BulkUpdateWithUndoButton = (props: BulkUpdateWithUndoButtonProps) => {
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
);
diff --git ORI/react-admin/packages/ra-ui-materialui/src/detail/CreateView.tsx ALT/react-admin/packages/ra-ui-materialui/src/detail/CreateView.tsx
index 94bc035..9f69afc 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/detail/CreateView.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/detail/CreateView.tsx
@@ -61,15 +61,13 @@ export const CreateView = (props: CreateViewProps) => {
{cloneElement(Children.only(children), {
basePath,
record,
- redirect:
- typeof children.props.redirect === 'undefined'
- ? redirect
- : children.props.redirect,
+ redirect: typeof children.props.redirect === 'undefined'
+ ? redirect
+ : children.props.redirect,
resource,
- save:
- typeof children.props.save === 'undefined'
- ? save
- : children.props.save,
+ save: typeof children.props.save === 'undefined'
+ ? save
+ : children.props.save,
saving,
version,
})}
@@ -79,10 +77,9 @@ export const CreateView = (props: CreateViewProps) => {
basePath,
record,
resource,
- save:
- typeof children.props.save === 'undefined'
- ? save
- : children.props.save,
+ save: typeof children.props.save === 'undefined'
+ ? save
+ : children.props.save,
saving,
version,
})}
diff --git ORI/react-admin/packages/ra-ui-materialui/src/detail/EditView.tsx ALT/react-admin/packages/ra-ui-materialui/src/detail/EditView.tsx
index 1e3c632..1f7f6cc 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/detail/EditView.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/detail/EditView.tsx
@@ -44,12 +44,11 @@ export const EditView = (props: EditViewProps) => {
version,
} = useEditContext(props);
- const finalActions =
- typeof actions === 'undefined' && hasShow ? (
- <DefaultActions />
- ) : (
- actions
- );
+ const finalActions = typeof actions === 'undefined' && hasShow ? (
+ <DefaultActions />
+ ) : (
+ actions
+ );
if (!children) {
return null;
}
@@ -88,10 +87,9 @@ export const EditView = (props: EditViewProps) => {
? redirect
: children.props.redirect,
resource,
- save:
- typeof children.props.save === 'undefined'
- ? save
- : children.props.save,
+ save: typeof children.props.save === 'undefined'
+ ? save
+ : children.props.save,
saving,
undoable,
mutationMode,
@@ -107,10 +105,9 @@ export const EditView = (props: EditViewProps) => {
record,
resource,
version,
- save:
- typeof children.props.save === 'undefined'
- ? save
- : children.props.save,
+ save: typeof children.props.save === 'undefined'
+ ? save
+ : children.props.save,
saving,
})}
</div>
diff --git ORI/react-admin/packages/ra-ui-materialui/src/detail/ShowView.tsx ALT/react-admin/packages/ra-ui-materialui/src/detail/ShowView.tsx
index f5ad3c3..c99e975 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/detail/ShowView.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/detail/ShowView.tsx
@@ -32,12 +32,11 @@ export const ShowView = (props: ShowViewProps) => {
useShowContext(props);
const { hasEdit } = useResourceDefinition(props);
- const finalActions =
- typeof actions === 'undefined' && hasEdit ? (
- <DefaultActions />
- ) : (
- actions
- );
+ const finalActions = typeof actions === 'undefined' && hasEdit ? (
+ <DefaultActions />
+ ) : (
+ actions
+ );
if (!children) {
return null;
diff --git ORI/react-admin/packages/ra-ui-materialui/src/form/Toolbar.tsx ALT/react-admin/packages/ra-ui-materialui/src/form/Toolbar.tsx
index 3f4366a..ad1b7db 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/form/Toolbar.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/form/Toolbar.tsx
@@ -24,10 +24,9 @@ import { Breakpoint } from '@material-ui/core/styles/createBreakpoints';
const useStyles = makeStyles(
theme => ({
toolbar: {
- backgroundColor:
- theme.palette.type === 'light'
- ? theme.palette.grey[100]
- : theme.palette.grey[900],
+ backgroundColor: theme.palette.type === 'light'
+ ? theme.palette.grey[100]
+ : theme.palette.grey[900],
},
desktopToolbar: {
marginTop: theme.spacing(2),
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/AutocompleteArrayInput.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/AutocompleteArrayInput.tsx
index 7f7a077..d314396 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/AutocompleteArrayInput.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/AutocompleteArrayInput.tsx
@@ -570,10 +570,9 @@ const useStyles = makeStyles(
inputRootFilled: {
flexWrap: 'wrap',
'& $chip': {
- backgroundColor:
- theme.palette.type === 'light'
- ? 'rgba(0, 0, 0, 0.09)'
- : 'rgba(255, 255, 255, 0.09)',
+ backgroundColor: theme.palette.type === 'light'
+ ? 'rgba(0, 0, 0, 0.09)'
+ : 'rgba(255, 255, 255, 0.09)',
},
},
inputInput: {
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/AutocompleteSuggestionItem.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/AutocompleteSuggestionItem.tsx
index ee99c72..987d00e 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/AutocompleteSuggestionItem.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/AutocompleteSuggestionItem.tsx
@@ -54,10 +54,9 @@ const AutocompleteSuggestionItem = (
} = props;
const classes = useStyles(props);
const isHighlighted = highlightedIndex === index;
- const suggestionText =
- 'id' in suggestion && suggestion.id === createValue
- ? suggestion.name
- : getSuggestionText(suggestion);
+ const suggestionText = 'id' in suggestion && suggestion.id === createValue
+ ? suggestion.name
+ : getSuggestionText(suggestion);
let matches;
let parts;
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/FileInput.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/FileInput.tsx
index eca4781..b964ce9 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/FileInput.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/FileInput.tsx
@@ -159,10 +159,9 @@ const FileInput = (props: FileInputProps & InputProps<FileInputOptions>) => {
}
};
- const childrenElement =
- children && isValidElement(Children.only(children))
- ? (Children.only(children) as ReactElement<any>)
- : undefined;
+ const childrenElement = children && isValidElement(Children.only(children))
+ ? (Children.only(children) as ReactElement<any>)
+ : undefined;
const { getRootProps, getInputProps } = useDropzone({
...options,
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/ResettableTextField.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/ResettableTextField.tsx
index ec00bb1..8ceba5c 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/ResettableTextField.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/ResettableTextField.tsx
@@ -155,10 +155,9 @@ const ResettableTextField = (props: ResettableTextFieldProps) => {
classes={restClasses}
value={value}
InputProps={{
- classes:
- props.select && variant === 'filled'
- ? { adornedEnd: inputAdornedEnd }
- : {},
+ classes: props.select && variant === 'filled'
+ ? { adornedEnd: inputAdornedEnd }
+ : {},
endAdornment: getEndAdornment(),
...InputPropsWithoutEndAdornment,
}}
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/SelectArrayInput.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/SelectArrayInput.tsx
index 1eafedf..545c1ad 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/SelectArrayInput.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/SelectArrayInput.tsx
@@ -169,8 +169,9 @@ const SelectArrayInput = (props: SelectArrayInputProps) => {
});
const createItem = create || onCreate ? getCreateItem() : null;
- const finalChoices =
- create || onCreate ? [...choices, createItem] : choices;
+ const finalChoices = create || onCreate
+ ? [...choices, createItem]
+ : choices;
const renderMenuItemOption = useCallback(
choice => getChoiceText(choice),
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/useSupportCreateSuggestion.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/useSupportCreateSuggestion.tsx
index c8c45e0..117e3e9 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/useSupportCreateSuggestion.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/useSupportCreateSuggestion.tsx
@@ -55,13 +55,12 @@ export const useSupportCreateSuggestion = (
if (typeof optionText !== 'string') {
return {
id: createValue,
- name:
- filter && createItemLabel
- ? translate(createItemLabel, {
- item: filter,
- _: createItemLabel,
- })
- : translate(createLabel, { _: createLabel }),
+ name: filter && createItemLabel
+ ? translate(createItemLabel, {
+ item: filter,
+ _: createItemLabel,
+ })
+ : translate(createLabel, { _: createLabel }),
};
}
return set(
@@ -100,12 +99,11 @@ export const useSupportCreateSuggestion = (
}
handleChange(eventOrValue, undefined);
},
- createElement:
- renderOnCreate && isValidElement(create) ? (
- <CreateSuggestionContext.Provider value={context}>
- {create}
- </CreateSuggestionContext.Provider>
- ) : null,
+ createElement: renderOnCreate && isValidElement(create) ? (
+ <CreateSuggestionContext.Provider value={context}>
+ {create}
+ </CreateSuggestionContext.Provider>
+ ) : null,
};
};
diff --git ORI/react-admin/packages/ra-ui-materialui/src/layout/Notification.tsx ALT/react-admin/packages/ra-ui-materialui/src/layout/Notification.tsx
index c8599f2..e88d376 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/layout/Notification.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/layout/Notification.tsx
@@ -37,10 +37,9 @@ const useStyles = makeStyles(
color: theme.palette.error.contrastText,
},
undo: (props: NotificationProps) => ({
- color:
- props.type === 'success'
- ? theme.palette.success.contrastText
- : theme.palette.primary.light,
+ color: props.type === 'success'
+ ? theme.palette.success.contrastText
+ : theme.palette.primary.light,
}),
multiLine: {
whiteSpace: 'pre-wrap',
diff --git ORI/react-admin/packages/ra-ui-materialui/src/layout/Responsive.tsx ALT/react-admin/packages/ra-ui-materialui/src/layout/Responsive.tsx
index 0cdfb9e..43df176 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/layout/Responsive.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/layout/Responsive.tsx
@@ -16,39 +16,35 @@ export const Responsive = ({
let element;
switch (width) {
case 'xs':
- element =
- typeof xsmall !== 'undefined'
- ? xsmall
- : typeof small !== 'undefined'
- ? small
- : typeof medium !== 'undefined'
- ? medium
- : large;
+ element = typeof xsmall !== 'undefined'
+ ? xsmall
+ : typeof small !== 'undefined'
+ ? small
+ : typeof medium !== 'undefined'
+ ? medium
+ : large;
break;
case 'sm':
- element =
- typeof small !== 'undefined'
- ? small
- : typeof medium !== 'undefined'
- ? medium
- : large;
+ element = typeof small !== 'undefined'
+ ? small
+ : typeof medium !== 'undefined'
+ ? medium
+ : large;
break;
case 'md':
- element =
- typeof medium !== 'undefined'
- ? medium
- : typeof large !== 'undefined'
- ? large
- : small;
+ element = typeof medium !== 'undefined'
+ ? medium
+ : typeof large !== 'undefined'
+ ? large
+ : small;
break;
case 'lg':
case 'xl':
- element =
- typeof large !== 'undefined'
- ? large
- : typeof medium !== 'undefined'
- ? medium
- : small;
+ element = typeof large !== 'undefined'
+ ? large
+ : typeof medium !== 'undefined'
+ ? medium
+ : small;
break;
default:
throw new Error(`Unknown width ${width}`);
diff --git ORI/react-admin/packages/ra-ui-materialui/src/layout/Title.tsx ALT/react-admin/packages/ra-ui-materialui/src/layout/Title.tsx
index 27f33ba..93ce914 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/layout/Title.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/layout/Title.tsx
@@ -19,10 +19,9 @@ const Title: FC<TitleProps> = ({
...rest
}) => {
const translate = useTranslate();
- const container =
- typeof document !== 'undefined'
- ? document.getElementById('react-admin-title')
- : null;
+ const container = typeof document !== 'undefined'
+ ? document.getElementById('react-admin-title')
+ : null;
if (!container) return null;
diff --git ORI/react-admin/packages/ra-ui-materialui/src/layout/createMuiTheme.ts ALT/react-admin/packages/ra-ui-materialui/src/layout/createMuiTheme.ts
index df668ea..dfd2090 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/layout/createMuiTheme.ts
+++ ALT/react-admin/packages/ra-ui-materialui/src/layout/createMuiTheme.ts
@@ -8,7 +8,6 @@ import {
*
* @see https://github.com/mui-org/material-ui/issues/13394
*/
-export const createMuiTheme =
- process.env.NODE_ENV === 'production'
- ? createLegacyModeTheme
- : createStrictModeTheme;
+export const createMuiTheme = process.env.NODE_ENV === 'production'
+ ? createLegacyModeTheme
+ : createStrictModeTheme;
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/BulkActionsToolbar.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/BulkActionsToolbar.tsx
index f9d6f5a..ffd0b61 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/BulkActionsToolbar.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/BulkActionsToolbar.tsx
@@ -17,15 +17,13 @@ const useStyles = makeStyles(
theme => ({
toolbar: {
zIndex: 3,
- color:
- theme.palette.type === 'light'
- ? theme.palette.primary.main
- : theme.palette.text.primary,
+ color: theme.palette.type === 'light'
+ ? theme.palette.primary.main
+ : theme.palette.text.primary,
justifyContent: 'space-between',
- backgroundColor:
- theme.palette.type === 'light'
- ? lighten(theme.palette.primary.light, 0.85)
- : theme.palette.primary.dark,
+ backgroundColor: theme.palette.type === 'light'
+ ? lighten(theme.palette.primary.light, 0.85)
+ : theme.palette.primary.dark,
minHeight: theme.spacing(8),
height: theme.spacing(8),
transition: `${theme.transitions.create(
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/Empty.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/Empty.tsx
index 3d78df9..36110a7 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/Empty.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/Empty.tsx
@@ -64,10 +64,9 @@ const useStyles = makeStyles(
textAlign: 'center',
opacity: theme.palette.type === 'light' ? 0.5 : 0.8,
margin: '0 1em',
- color:
- theme.palette.type === 'light'
- ? 'inherit'
- : theme.palette.text.primary,
+ color: theme.palette.type === 'light'
+ ? 'inherit'
+ : theme.palette.text.primary,
},
icon: {
width: '9em',
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/SimpleList.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/SimpleList.tsx
index 95869c9..184d09b 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/SimpleList.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/SimpleList.tsx
@@ -266,8 +266,9 @@ const LinkOrNot = (
...rest
} = props;
const classes = useLinkOrNotStyles({ classes: classesOverride });
- const link =
- typeof linkType === 'function' ? linkType(record, id) : linkType;
+ const link = typeof linkType === 'function'
+ ? linkType(record, id)
+ : linkType;
return link === 'edit' || link === true ? (
<ListItem
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridHeader.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridHeader.tsx
index ee72cf1..261a301 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridHeader.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridHeader.tsx
@@ -40,12 +40,11 @@ export const DatagridHeader = (props: DatagridHeaderProps) => {
event => {
event.stopPropagation();
const newField = event.currentTarget.dataset.field;
- const newOrder =
- currentSort.field === newField
- ? currentSort.order === 'ASC'
- ? 'DESC'
- : 'ASC'
- : event.currentTarget.dataset.order;
+ const newOrder = currentSort.field === newField
+ ? currentSort.order === 'ASC'
+ ? 'DESC'
+ : 'ASC'
+ : event.currentTarget.dataset.order;
setSort(newField, newOrder);
},
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridRow.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridRow.tsx
index b91e267..e220eec 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridRow.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridRow.tsx
@@ -115,10 +115,9 @@ const DatagridRow: FC<DatagridRowProps> = React.forwardRef((props, ref) => {
if (!rowClick) return;
event.persist();
- const effect =
- typeof rowClick === 'function'
- ? await rowClick(id, basePath || `/${resource}`, record)
- : rowClick;
+ const effect = typeof rowClick === 'function'
+ ? await rowClick(id, basePath || `/${resource}`, record)
+ : rowClick;
switch (effect) {
case 'edit':
history.push(linkToRecord(basePath || `/${resource}`, id));
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/filter/FilterFormInput.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/filter/FilterFormInput.tsx
index 30f08c5..9b502da 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/filter/FilterFormInput.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/filter/FilterFormInput.tsx
@@ -42,10 +42,9 @@ const FilterFormInput = props => {
</IconButton>
)}
{React.cloneElement(filterElement, {
- allowEmpty:
- filterElement.props.allowEmpty === undefined
- ? true
- : filterElement.props.allowEmpty,
+ allowEmpty: filterElement.props.allowEmpty === undefined
+ ? true
+ : filterElement.props.allowEmpty,
resource,
record: emptyRecord,
variant, |
|
prettier/prettier#12087 VS prettier/prettier@main :: typescript-eslint/typescript-eslint@833f822 Diff (1407 lines)diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/array-type.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/array-type.ts
index 35045fd..ced559e 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/array-type.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/array-type.ts
@@ -153,10 +153,9 @@ export default util.createRule<Options, MessageIds>({
return;
}
- const messageId =
- currentOption === 'generic'
- ? 'errorStringGeneric'
- : 'errorStringGenericSimple';
+ const messageId = currentOption === 'generic'
+ ? 'errorStringGeneric'
+ : 'errorStringGenericSimple';
const errorNode = isReadonly ? node.parent! : node;
context.report({
@@ -207,10 +206,9 @@ export default util.createRule<Options, MessageIds>({
const readonlyPrefix = isReadonlyArrayType ? 'readonly ' : '';
const typeParams = node.typeParameters?.params;
- const messageId =
- currentOption === 'array'
- ? 'errorStringArray'
- : 'errorStringArraySimple';
+ const messageId = currentOption === 'array'
+ ? 'errorStringArray'
+ : 'errorStringArraySimple';
if (!typeParams || typeParams.length === 0) {
// Create an 'any' array
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-assertions.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-assertions.ts
index 6173817..f3f9056 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-assertions.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-assertions.ts
@@ -97,10 +97,9 @@ export default util.createRule<Options, MessageIds>({
context.report({
node,
messageId,
- data:
- messageId !== 'never'
- ? { cast: sourceCode.getText(node.typeAnnotation) }
- : {},
+ data: messageId !== 'never'
+ ? { cast: sourceCode.getText(node.typeAnnotation) }
+ : {},
});
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/default-param-last.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/default-param-last.ts
index 9673d85..8adf591 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/default-param-last.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/default-param-last.ts
@@ -51,10 +51,9 @@ export default createRule({
let hasSeenPlainParam = false;
for (let i = node.params.length - 1; i >= 0; i--) {
const current = node.params[i];
- const param =
- current.type === AST_NODE_TYPES.TSParameterProperty
- ? current.parameter
- : current;
+ const param = current.type === AST_NODE_TYPES.TSParameterProperty
+ ? current.parameter
+ : current;
if (isPlainParam(param)) {
hasSeenPlainParam = true;
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/explicit-member-accessibility.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/explicit-member-accessibility.ts
index 8a8446e..d7f6a84 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/explicit-member-accessibility.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/explicit-member-accessibility.ts
@@ -264,11 +264,10 @@ export default util.createRule<Options, MessageIds>({
return;
}
- const nodeName =
- node.parameter.type === AST_NODE_TYPES.Identifier
- ? node.parameter.name
- : // has to be an Identifier or TSC will throw an error
- (node.parameter.left as TSESTree.Identifier).name;
+ const nodeName = node.parameter.type === AST_NODE_TYPES.Identifier
+ ? node.parameter.name
+ : // has to be an Identifier or TSC will throw an error
+ (node.parameter.left as TSESTree.Identifier).name;
switch (paramPropCheck) {
case 'explicit': {
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/indent-new-do-not-use/index.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/indent-new-do-not-use/index.ts
index 58da2c0..4e8de83 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/indent-new-do-not-use/index.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/indent-new-do-not-use/index.ts
@@ -450,13 +450,13 @@ export default createRule<Options, MessageIds>({
* Abbreviate the message if the expected indentation is also spaces.
* e.g. 'Expected 4 spaces but found 2' rather than 'Expected 4 spaces but found 2 spaces'
*/
- foundStatement =
- indentType === 'space'
- ? actualSpaces
- : `${actualSpaces} ${foundSpacesWord}`;
+ foundStatement = indentType === 'space'
+ ? actualSpaces
+ : `${actualSpaces} ${foundSpacesWord}`;
} else if (actualTabs > 0) {
- foundStatement =
- indentType === 'tab' ? actualTabs : `${actualTabs} ${foundTabsWord}`;
+ foundStatement = indentType === 'tab'
+ ? actualTabs
+ : `${actualTabs} ${foundTabsWord}`;
} else {
foundStatement = '0';
}
@@ -1177,10 +1177,9 @@ export default createRule<Options, MessageIds>({
)!;
if (fromToken) {
- const end =
- semiToken && semiToken.range[1] === sourceToken.range[1]
- ? node.range[1]
- : sourceToken.range[1];
+ const end = semiToken && semiToken.range[1] === sourceToken.range[1]
+ ? node.range[1]
+ : sourceToken.range[1];
offsets.setDesiredOffsets(
[fromToken.range[0], end],
@@ -1196,8 +1195,9 @@ export default createRule<Options, MessageIds>({
| TSESTree.JSXMemberExpression
| TSESTree.MetaProperty,
) {
- const object =
- node.type === AST_NODE_TYPES.MetaProperty ? node.meta : node.object;
+ const object = node.type === AST_NODE_TYPES.MetaProperty
+ ? node.meta
+ : node.object;
const isComputed = 'computed' in node && node.computed;
const firstNonObjectToken = sourceCode.getFirstTokenBetween(
object,
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/indent.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/indent.ts
index e057ca9..9383f31 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/indent.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/indent.ts
@@ -287,10 +287,9 @@ export default util.createRule<Options, MessageIds>({
},
},
},
- arguments:
- 'expression' in moduleReference
- ? [moduleReference.expression]
- : [],
+ arguments: 'expression' in moduleReference
+ ? [moduleReference.expression]
+ : [],
// location data
range: moduleReference.range,
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/member-delimiter-style.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/member-delimiter-style.ts
index 5fa5a86..57cead9 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/member-delimiter-style.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/member-delimiter-style.ts
@@ -274,8 +274,9 @@ export default util.createRule<Options, MessageIds>({
function checkMemberSeparatorStyle(
node: TSESTree.TSInterfaceBody | TSESTree.TSTypeLiteral,
): void {
- const members =
- node.type === AST_NODE_TYPES.TSInterfaceBody ? node.body : node.members;
+ const members = node.type === AST_NODE_TYPES.TSInterfaceBody
+ ? node.body
+ : node.members;
let isSingleLine = node.loc.start.line === node.loc.end.line;
if (
@@ -289,10 +290,9 @@ export default util.createRule<Options, MessageIds>({
}
}
- const typeOpts =
- node.type === AST_NODE_TYPES.TSInterfaceBody
- ? interfaceOptions
- : typeLiteralOptions;
+ const typeOpts = node.type === AST_NODE_TYPES.TSInterfaceBody
+ ? interfaceOptions
+ : typeLiteralOptions;
const opts = isSingleLine
? { ...typeOpts.singleline, type: 'single-line' }
: { ...typeOpts.multiline, type: 'multi-line' };
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/member-ordering.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/member-ordering.ts
index baaf32a..c9899a9 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/member-ordering.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/member-ordering.ts
@@ -372,16 +372,14 @@ function getRank(
node.type === AST_NODE_TYPES.TSAbstractPropertyDefinition ||
node.type === AST_NODE_TYPES.TSAbstractMethodDefinition;
- const scope =
- 'static' in node && node.static
- ? 'static'
- : abstract
- ? 'abstract'
- : 'instance';
- const accessibility =
- 'accessibility' in node && node.accessibility
- ? node.accessibility
- : 'public';
+ const scope = 'static' in node && node.static
+ ? 'static'
+ : abstract
+ ? 'abstract'
+ : 'instance';
+ const accessibility = 'accessibility' in node && node.accessibility
+ ? node.accessibility
+ : 'public';
// Collect all existing member groups (e.g. 'public-instance-field', 'instance-field', 'public-field', 'constructor' etc.)
const memberGroups = [];
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 b05c4f9..9cc9a1a 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
@@ -119,12 +119,11 @@ export default util.createRule<Options, MessageIds>({
...(mode === 'property' && {
TSMethodSignature(methodNode): void {
const parent = methodNode.parent;
- const members =
- parent?.type === AST_NODE_TYPES.TSInterfaceBody
- ? parent.body
- : parent?.type === AST_NODE_TYPES.TSTypeLiteral
- ? parent.members
- : [];
+ const members = parent?.type === AST_NODE_TYPES.TSInterfaceBody
+ ? parent.body
+ : parent?.type === AST_NODE_TYPES.TSTypeLiteral
+ ? parent.members
+ : [];
const duplicatedKeyMethodNodes: TSESTree.TSMethodSignature[] =
members.filter(
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 c4e6e36..f26f6a8 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
@@ -39,30 +39,27 @@ function normalizeOption(option: Selector): NormalizedSelector[] {
match: option.custom.match,
}
: null,
- leadingUnderscore:
- option.leadingUnderscore !== undefined
- ? UnderscoreOptions[option.leadingUnderscore]
- : null,
- trailingUnderscore:
- option.trailingUnderscore !== undefined
- ? UnderscoreOptions[option.trailingUnderscore]
- : null,
+ leadingUnderscore: option.leadingUnderscore !== undefined
+ ? UnderscoreOptions[option.leadingUnderscore]
+ : null,
+ trailingUnderscore: option.trailingUnderscore !== undefined
+ ? UnderscoreOptions[option.trailingUnderscore]
+ : null,
prefix: option.prefix && option.prefix.length > 0 ? option.prefix : null,
suffix: option.suffix && option.suffix.length > 0 ? option.suffix : null,
modifiers: option.modifiers?.map(m => Modifiers[m]) ?? null,
types: option.types?.map(m => TypeModifiers[m]) ?? null,
- filter:
- option.filter !== undefined
- ? typeof option.filter === 'string'
- ? {
- regex: new RegExp(option.filter, 'u'),
- match: true,
- }
- : {
- regex: new RegExp(option.filter.regex, 'u'),
- match: option.filter.match,
- }
- : null,
+ filter: option.filter !== undefined
+ ? typeof option.filter === 'string'
+ ? {
+ regex: new RegExp(option.filter, 'u'),
+ match: true,
+ }
+ : {
+ regex: new RegExp(option.filter.regex, 'u'),
+ match: option.filter.match,
+ }
+ : null,
// calculated ordering weight based on modifiers
modifierWeight: weight,
};
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 374302f..f01f31b 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
@@ -167,12 +167,11 @@ function createValidator(
affixes: affixes?.join(', '),
formats: formats?.map(f => PredefinedFormats[f]).join(', '),
regex: custom?.regex?.toString(),
- regexMatch:
- custom?.match === true
- ? 'match'
- : custom?.match === false
- ? 'not match'
- : null,
+ regexMatch: custom?.match === true
+ ? 'match'
+ : custom?.match === false
+ ? 'not match'
+ : null,
};
}
@@ -186,31 +185,26 @@ function createValidator(
node: TSESTree.Identifier | TSESTree.PrivateIdentifier | TSESTree.Literal,
originalName: string,
): string | null {
- const option =
- position === 'leading'
- ? config.leadingUnderscore
- : config.trailingUnderscore;
+ const option = position === 'leading'
+ ? config.leadingUnderscore
+ : config.trailingUnderscore;
if (!option) {
return name;
}
- const hasSingleUnderscore =
- position === 'leading'
- ? (): boolean => name.startsWith('_')
- : (): boolean => name.endsWith('_');
- const trimSingleUnderscore =
- position === 'leading'
- ? (): string => name.slice(1)
- : (): string => name.slice(0, -1);
-
- const hasDoubleUnderscore =
- position === 'leading'
- ? (): boolean => name.startsWith('__')
- : (): boolean => name.endsWith('__');
- const trimDoubleUnderscore =
- position === 'leading'
- ? (): string => name.slice(2)
- : (): string => name.slice(0, -2);
+ const hasSingleUnderscore = position === 'leading'
+ ? (): boolean => name.startsWith('_')
+ : (): boolean => name.endsWith('_');
+ const trimSingleUnderscore = position === 'leading'
+ ? (): string => name.slice(1)
+ : (): string => name.slice(0, -1);
+
+ const hasDoubleUnderscore = position === 'leading'
+ ? (): boolean => name.startsWith('__')
+ : (): boolean => name.endsWith('__');
+ const trimDoubleUnderscore = position === 'leading'
+ ? (): string => name.slice(2)
+ : (): string => name.slice(0, -2);
switch (option) {
// ALLOW - no conditions as the user doesn't care if it's there or not
@@ -313,12 +307,12 @@ function createValidator(
}
for (const affix of affixes) {
- const hasAffix =
- position === 'prefix' ? name.startsWith(affix) : name.endsWith(affix);
- const trimAffix =
- position === 'prefix'
- ? (): string => name.slice(affix.length)
- : (): string => name.slice(0, -affix.length);
+ const hasAffix = position === 'prefix'
+ ? name.startsWith(affix)
+ : name.endsWith(affix);
+ const trimAffix = position === 'prefix'
+ ? (): string => name.slice(affix.length)
+ : (): string => name.slice(0, -affix.length);
if (hasAffix) {
// matches, so trim it and return
@@ -394,10 +388,9 @@ function createValidator(
context.report({
node,
- messageId:
- originalName === name
- ? 'doesNotMatchFormat'
- : 'doesNotMatchFormatTrimmed',
+ messageId: originalName === name
+ ? 'doesNotMatchFormat'
+ : 'doesNotMatchFormatTrimmed',
data: formatReportData({
originalName,
processedName: name,
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-empty-function.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-empty-function.ts
index 06c04cb..2f87e18 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-empty-function.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-empty-function.ts
@@ -130,10 +130,9 @@ export default util.createRule<Options, MessageIds>({
node: TSESTree.FunctionExpression | TSESTree.FunctionDeclaration,
): boolean {
if (isAllowedDecoratedFunctions && isBodyEmpty(node)) {
- const decorators =
- node.parent?.type === AST_NODE_TYPES.MethodDefinition
- ? node.parent.decorators
- : undefined;
+ const decorators = node.parent?.type === AST_NODE_TYPES.MethodDefinition
+ ? node.parent.decorators
+ : undefined;
return !!decorators && !!decorators.length;
}
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 dceffa6..b8430dd 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
@@ -191,14 +191,13 @@ export default util.createRule<[Options], MessageIds>({
}
context.report({
- messageId:
- allowInGenericTypeArguments && allowAsThisParameter
- ? 'invalidVoidNotReturnOrThisParamOrGeneric'
- : allowInGenericTypeArguments
- ? 'invalidVoidNotReturnOrGeneric'
- : allowAsThisParameter
- ? 'invalidVoidNotReturnOrThisParam'
- : 'invalidVoidNotReturn',
+ messageId: allowInGenericTypeArguments && allowAsThisParameter
+ ? 'invalidVoidNotReturnOrThisParamOrGeneric'
+ : allowInGenericTypeArguments
+ ? 'invalidVoidNotReturnOrGeneric'
+ : allowAsThisParameter
+ ? 'invalidVoidNotReturnOrThisParam'
+ : 'invalidVoidNotReturn',
node,
});
},
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 4496dea..1eb2b38 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
@@ -157,10 +157,9 @@ function isSafe(
const variable = reference.resolved;
const definition = variable?.defs[0];
const declaration = definition?.parent;
- const kind =
- declaration?.type === AST_NODE_TYPES.VariableDeclaration
- ? declaration.kind
- : '';
+ const kind = declaration?.type === AST_NODE_TYPES.VariableDeclaration
+ ? declaration.kind
+ : '';
// type references are all safe
// this only really matters for global types that haven't been configured
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-parameter-properties.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-parameter-properties.ts
index 613b839..7f0692c 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-parameter-properties.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-parameter-properties.ts
@@ -93,11 +93,10 @@ export default util.createRule<Options, MessageIds>({
return;
}
- const name =
- node.parameter.type === AST_NODE_TYPES.Identifier
- ? node.parameter.name
- : // has to be an Identifier or TSC will throw an error
- (node.parameter.left as TSESTree.Identifier).name;
+ const name = node.parameter.type === AST_NODE_TYPES.Identifier
+ ? node.parameter.name
+ : // has to be an Identifier or TSC will throw an error
+ (node.parameter.left as TSESTree.Identifier).name;
context.report({
node,
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 914dd07..5010eb4 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-redeclare.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-redeclare.ts
@@ -215,16 +215,16 @@ export default util.createRule<Options, MessageIds>({
* the first declaration, it shows the location of the first
* declaration.
*/
- const detailMessageId =
- declaration.type === 'builtin'
- ? 'redeclaredAsBuiltin'
- : 'redeclaredBySyntax';
+ const detailMessageId = declaration.type === 'builtin'
+ ? 'redeclaredAsBuiltin'
+ : 'redeclaredBySyntax';
const data = { id: variable.name };
// Report extra declarations.
for (const { type, node, loc } of extraDeclarations) {
- const messageId =
- type === declaration.type ? 'redeclared' : detailMessageId;
+ const messageId = type === declaration.type
+ ? 'redeclared'
+ : detailMessageId;
if (node) {
context.report({ node, loc, messageId, data });
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-shadow.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-shadow.ts
index dfba42c..8f012ed 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-shadow.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-shadow.ts
@@ -136,8 +136,9 @@ export default util.createRule<Options, MessageIds>({
return false;
}
- const isShadowedValue =
- 'isValueVariable' in shadowed ? shadowed.isValueVariable : true;
+ const isShadowedValue = 'isValueVariable' in shadowed
+ ? shadowed.isValueVariable
+ : true;
if (!isShadowedValue) {
return false;
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-this-alias.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-this-alias.ts
index 82ab9b2..c618900 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-this-alias.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-this-alias.ts
@@ -60,17 +60,15 @@ export default util.createRule<Options, MessageIds>({
return;
}
- const hasAllowedName =
- id.type === AST_NODE_TYPES.Identifier
- ? allowedNames!.includes(id.name)
- : false;
+ const hasAllowedName = id.type === AST_NODE_TYPES.Identifier
+ ? allowedNames!.includes(id.name)
+ : false;
if (!hasAllowedName) {
context.report({
node: id,
- messageId:
- id.type === AST_NODE_TYPES.Identifier
- ? 'thisAssignment'
- : 'thisDestructure',
+ messageId: id.type === AST_NODE_TYPES.Identifier
+ ? 'thisAssignment'
+ : 'thisDestructure',
});
}
},
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-type-alias.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-type-alias.ts
index 347e36f..2c1eeb0 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-type-alias.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-type-alias.ts
@@ -184,10 +184,9 @@ export default util.createRule<Options, MessageIds>({
node,
messageId: 'noCompositionAlias',
data: {
- compositionType:
- compositionType === AST_NODE_TYPES.TSUnionType
- ? 'union'
- : 'intersection',
+ compositionType: compositionType === AST_NODE_TYPES.TSUnionType
+ ? 'union'
+ : 'intersection',
typeName: type,
},
});
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-boolean-literal-compare.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-boolean-literal-compare.ts
index 41367d4..a913649 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-boolean-literal-compare.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-boolean-literal-compare.ts
@@ -182,10 +182,9 @@ export default util.createRule<Options, MessageIds>({
forTruthy: literalBooleanInComparison ? !negated : negated,
expression,
negated,
- range:
- expression.range[0] < against.range[0]
- ? [expression.range[1], against.range[1]]
- : [against.range[0], expression.range[0]],
+ range: expression.range[0] < against.range[0]
+ ? [expression.range[1], against.range[1]]
+ : [against.range[0], expression.range[0]],
};
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-condition.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-condition.ts
index 4e73c06..1886523 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-condition.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-condition.ts
@@ -485,8 +485,9 @@ export default createRule<Options, MessageId>({
function optionChainContainsOptionArrayIndex(
node: TSESTree.MemberExpression | TSESTree.CallExpression,
): boolean {
- const lhsNode =
- node.type === AST_NODE_TYPES.CallExpression ? node.callee : node.object;
+ const lhsNode = node.type === AST_NODE_TYPES.CallExpression
+ ? node.callee
+ : node.object;
if (node.optional && isArrayIndexExpression(lhsNode)) {
return true;
}
@@ -564,10 +565,9 @@ export default createRule<Options, MessageId>({
node: TSESTree.LeftHandSideExpression,
): boolean {
const type = getNodeType(node);
- const isOwnNullable =
- node.type === AST_NODE_TYPES.MemberExpression
- ? !isNullableOriginFromPrev(node)
- : true;
+ const isOwnNullable = node.type === AST_NODE_TYPES.MemberExpression
+ ? !isNullableOriginFromPrev(node)
+ : true;
return (
isTypeAnyType(type) ||
isTypeUnknownType(type) ||
@@ -593,8 +593,9 @@ export default createRule<Options, MessageId>({
return;
}
- const nodeToCheck =
- node.type === AST_NODE_TYPES.CallExpression ? node.callee : node.object;
+ const nodeToCheck = node.type === AST_NODE_TYPES.CallExpression
+ ? node.callee
+ : node.object;
if (isOptionableExpression(nodeToCheck)) {
return;
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unsafe-assignment.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unsafe-assignment.ts
index cb4b8e7..bea6f59 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unsafe-assignment.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unsafe-assignment.ts
@@ -180,10 +180,9 @@ export default util.createRule({
let key: string;
if (receiverProperty.computed === false) {
- key =
- receiverProperty.key.type === AST_NODE_TYPES.Identifier
- ? receiverProperty.key.name
- : String(receiverProperty.key.value);
+ key = receiverProperty.key.type === AST_NODE_TYPES.Identifier
+ ? receiverProperty.key.name
+ : String(receiverProperty.key.value);
} else if (receiverProperty.key.type === AST_NODE_TYPES.Literal) {
key = String(receiverProperty.key.value);
} else if (
@@ -238,11 +237,10 @@ export default util.createRule({
comparisonType: ComparisonType,
): boolean {
const receiverTsNode = esTreeNodeToTSNodeMap.get(receiverNode);
- const receiverType =
- comparisonType === ComparisonType.Contextual
- ? util.getContextualType(checker, receiverTsNode as ts.Expression) ??
- checker.getTypeAtLocation(receiverTsNode)
- : checker.getTypeAtLocation(receiverTsNode);
+ const receiverType = comparisonType === ComparisonType.Contextual
+ ? util.getContextualType(checker, receiverTsNode as ts.Expression) ??
+ checker.getTypeAtLocation(receiverTsNode)
+ : checker.getTypeAtLocation(receiverTsNode);
const senderType = checker.getTypeAtLocation(
esTreeNodeToTSNodeMap.get(senderNode),
);
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-var-requires.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-var-requires.ts
index 1bf51ef..c9ef69d 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-var-requires.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-var-requires.ts
@@ -28,10 +28,9 @@ export default util.createRule<Options, MessageIds>({
'CallExpression[callee.name="require"]'(
node: TSESTree.CallExpression,
): void {
- const parent =
- node.parent?.type === AST_NODE_TYPES.ChainExpression
- ? node.parent.parent
- : node.parent;
+ const parent = node.parent?.type === AST_NODE_TYPES.ChainExpression
+ ? node.parent.parent
+ : node.parent;
if (
parent &&
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/padding-line-between-statements.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/padding-line-between-statements.ts
index 13a84c2..0df1ca3 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/padding-line-between-statements.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/padding-line-between-statements.ts
@@ -195,10 +195,9 @@ function isBlockLikeStatement(
// Checks the last token is a closing brace of blocks.
const lastToken = sourceCode.getLastToken(node, util.isNotSemicolonToken);
- const belongingNode =
- lastToken && util.isClosingBraceToken(lastToken)
- ? sourceCode.getNodeByRangeIndex(lastToken.range[0])
- : null;
+ const belongingNode = lastToken && util.isClosingBraceToken(lastToken)
+ ? sourceCode.getNodeByRangeIndex(lastToken.range[0])
+ : null;
return (
!!belongingNode &&
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-function-type.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-function-type.ts
index ceeafcd..d391a8d 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-function-type.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-function-type.ts
@@ -170,10 +170,9 @@ export default util.createRule({
);
} else {
comments.forEach(comment => {
- let commentText =
- comment.type === AST_TOKEN_TYPES.Line
- ? `//${comment.value}`
- : `/*${comment.value}*/`;
+ let commentText = comment.type === AST_TOKEN_TYPES.Line
+ ? `//${comment.value}`
+ : `/*${comment.value}*/`;
const isCommentOnTheSameLine =
comment.loc.start.line === member.loc.start.line;
if (!isCommentOnTheSameLine) {
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 f15a756..cc00ba7 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-includes.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-includes.ts
@@ -207,8 +207,9 @@ export default createRule({
node: TSESTree.MemberExpression,
): void {
const callNode = node.parent as TSESTree.CallExpression;
- const text =
- callNode.arguments.length === 1 ? parseRegExp(node.object) : null;
+ const text = callNode.arguments.length === 1
+ ? parseRegExp(node.object)
+ : null;
if (text == null) {
return;
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-readonly-parameter-types.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-readonly-parameter-types.ts
index ed3e4ba..c6f73ec 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-readonly-parameter-types.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-readonly-parameter-types.ts
@@ -86,10 +86,9 @@ export default util.createRule<Options, MessageIds>({
continue;
}
- const actualParam =
- param.type === AST_NODE_TYPES.TSParameterProperty
- ? param.parameter
- : param;
+ const actualParam = param.type === AST_NODE_TYPES.TSParameterProperty
+ ? param.parameter
+ : param;
if (ignoreInferredTypes && actualParam.typeAnnotation == null) {
continue;
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-string-starts-ends-with.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-string-starts-ends-with.ts
index 9bf63c0..504c713 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-string-starts-ends-with.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-string-starts-ends-with.ts
@@ -518,10 +518,9 @@ export default createRule({
return;
}
- const parsed =
- callNode.arguments.length === 1
- ? parseRegExp(callNode.arguments[0])
- : null;
+ const parsed = callNode.arguments.length === 1
+ ? parseRegExp(callNode.arguments[0])
+ : null;
if (parsed == null) {
return;
}
@@ -637,8 +636,9 @@ export default createRule({
node: TSESTree.MemberExpression,
): void {
const callNode = getParent(node) as TSESTree.CallExpression;
- const parsed =
- callNode.arguments.length === 1 ? parseRegExp(node.object) : null;
+ const parsed = callNode.arguments.length === 1
+ ? parseRegExp(node.object)
+ : null;
if (parsed == null) {
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 942cae4..9513fbb 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
@@ -200,10 +200,9 @@ export default util.createRule<Options, MessageIds>({
let messageId: MessageIds = 'notSorted';
const data = {
name: '',
- type:
- node.type === AST_NODE_TYPES.TSIntersectionType
- ? 'Intersection'
- : 'Union',
+ type: node.type === AST_NODE_TYPES.TSIntersectionType
+ ? 'Intersection'
+ : 'Union',
};
if (node.parent?.type === AST_NODE_TYPES.TSTypeAliasDeclaration) {
messageId = 'notSortedNamed';
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 08f21e3..c813062 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
@@ -46,8 +46,9 @@ export default createRule({
missingBranchTypes: Array<ts.Type>,
symbolName?: string,
): TSESLint.RuleFix | null {
- const lastCase =
- node.cases.length > 0 ? node.cases[node.cases.length - 1] : null;
+ const lastCase = node.cases.length > 0
+ ? node.cases[node.cases.length - 1]
+ : null;
const caseIndent = lastCase
? ' '.repeat(lastCase.loc.start.column)
: // if there are no cases, use indentation of the switch statement
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 15ddf8b..1e92ebf 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/unbound-method.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/unbound-method.ts
@@ -176,10 +176,9 @@ export default util.createRule<Options, MessageIds>({
const { dangerous, firstParamIsThis } = checkMethod(symbol, ignoreStatic);
if (dangerous) {
context.report({
- messageId:
- firstParamIsThis === false
- ? 'unboundWithoutThisAnnotation'
- : 'unbound',
+ messageId: firstParamIsThis === false
+ ? 'unboundWithoutThisAnnotation'
+ : 'unbound',
node,
});
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/unified-signatures.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/unified-signatures.ts
index 7481dcd..4054c6d 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/unified-signatures.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/unified-signatures.ts
@@ -80,10 +80,9 @@ export default util.createRule({
function failureStringStart(otherLine?: number): string {
// For only 2 overloads we don't need to specify which is the other one.
- const overloads =
- otherLine === undefined
- ? 'These overloads'
- : `This overload and the one on line ${otherLine}`;
+ const overloads = otherLine === undefined
+ ? 'These overloads'
+ : `This overload and the one on line ${otherLine}`;
return `${overloads} can be combined into one signature`;
}
@@ -122,10 +121,9 @@ export default util.createRule({
context.report({
loc: extraParameter.loc,
- messageId:
- extraParameter.type === AST_NODE_TYPES.RestElement
- ? 'omittingRestParameter'
- : 'omittingSingleParameter',
+ messageId: extraParameter.type === AST_NODE_TYPES.RestElement
+ ? 'omittingRestParameter'
+ : 'omittingSingleParameter',
data: {
failureStringStart: failureStringStart(lineOfOtherOverload),
},
@@ -197,10 +195,12 @@ export default util.createRule({
): boolean {
// Must return the same type.
- const aTypeParams =
- a.typeParameters !== undefined ? a.typeParameters.params : undefined;
- const bTypeParams =
- b.typeParameters !== undefined ? b.typeParameters.params : undefined;
+ const aTypeParams = a.typeParameters !== undefined
+ ? a.typeParameters.params
+ : undefined;
+ const bTypeParams = b.typeParameters !== undefined
+ ? b.typeParameters.params
+ : undefined;
return (
typesAreEqual(a.returnType, b.returnType) &&
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/func-call-spacing.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/func-call-spacing.test.ts
index 2c5d0e5..31486f2 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/func-call-spacing.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/func-call-spacing.test.ts
@@ -405,10 +405,9 @@ var a = foo
options: ['always'],
errors: [
{
- messageId:
- code.code.includes('\n') || code.code.includes('\r')
- ? 'unexpectedNewline'
- : 'unexpectedWhitespace',
+ messageId: code.code.includes('\n') || code.code.includes('\r')
+ ? 'unexpectedNewline'
+ : 'unexpectedWhitespace',
},
],
...code,
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 badfbc1..dfa725b 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/indent/utils.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/indent/utils.ts
@@ -91,10 +91,9 @@ export function expectedErrors(
return {
messageId: 'wrongIndentation',
data: {
- expected:
- typeof expected === 'string' && typeof actual === 'string'
- ? expected
- : `${expected} ${indentType}${expected === 1 ? '' : 's'}`,
+ expected: typeof expected === 'string' && typeof actual === 'string'
+ ? expected
+ : `${expected} ${indentType}${expected === 1 ? '' : 's'}`,
actual,
},
type,
diff --git ORI/typescript-eslint/packages/experimental-utils/src/eslint-utils/batchedSingleLineTests.ts ALT/typescript-eslint/packages/experimental-utils/src/eslint-utils/batchedSingleLineTests.ts
index 8eaef6e..1aecc6e 100644
--- ORI/typescript-eslint/packages/experimental-utils/src/eslint-utils/batchedSingleLineTests.ts
+++ ALT/typescript-eslint/packages/experimental-utils/src/eslint-utils/batchedSingleLineTests.ts
@@ -36,19 +36,17 @@ function batchedSingleLineTests<
): (ValidTestCase<TOptions> | InvalidTestCase<TMessageIds, TOptions>)[] {
// -- eslint counts lines from 1
const lineOffset = options.code.startsWith('\n') ? 2 : 1;
- const output =
- 'output' in options && options.output
- ? options.output.trim().split('\n')
- : null;
+ const output = 'output' in options && options.output
+ ? options.output.trim().split('\n')
+ : null;
return options.code
.trim()
.split('\n')
.map((code, i) => {
const lineNum = i + lineOffset;
- const errors =
- 'errors' in options
- ? options.errors.filter(e => e.line === lineNum)
- : [];
+ const errors = 'errors' in options
+ ? options.errors.filter(e => e.line === lineNum)
+ : [];
const returnVal = {
...options,
code,
diff --git ORI/typescript-eslint/packages/scope-manager/src/analyze.ts ALT/typescript-eslint/packages/scope-manager/src/analyze.ts
index febd7a2..0c2e926 100644
--- ORI/typescript-eslint/packages/scope-manager/src/analyze.ts
+++ ALT/typescript-eslint/packages/scope-manager/src/analyze.ts
@@ -113,10 +113,9 @@ function analyze(
globalReturn: providedOptions?.globalReturn ?? DEFAULT_OPTIONS.globalReturn,
impliedStrict:
providedOptions?.impliedStrict ?? DEFAULT_OPTIONS.impliedStrict,
- jsxPragma:
- providedOptions?.jsxPragma === undefined
- ? DEFAULT_OPTIONS.jsxPragma
- : providedOptions.jsxPragma,
+ jsxPragma: providedOptions?.jsxPragma === undefined
+ ? DEFAULT_OPTIONS.jsxPragma
+ : providedOptions.jsxPragma,
jsxFragmentName:
providedOptions?.jsxFragmentName ?? DEFAULT_OPTIONS.jsxFragmentName,
sourceType: providedOptions?.sourceType ?? DEFAULT_OPTIONS.sourceType,
diff --git ORI/typescript-eslint/packages/scope-manager/src/referencer/Referencer.ts ALT/typescript-eslint/packages/scope-manager/src/referencer/Referencer.ts
index 10273bf..f633d44 100644
--- ORI/typescript-eslint/packages/scope-manager/src/referencer/Referencer.ts
+++ ALT/typescript-eslint/packages/scope-manager/src/referencer/Referencer.ts
@@ -728,10 +728,9 @@ class Referencer extends Visitor {
}
protected VariableDeclaration(node: TSESTree.VariableDeclaration): void {
- const variableTargetScope =
- node.kind === 'var'
- ? this.currentScope().variableScope
- : this.currentScope();
+ const variableTargetScope = node.kind === 'var'
+ ? this.currentScope().variableScope
+ : this.currentScope();
for (const decl of node.declarations) {
const init = decl.init;
diff --git ORI/typescript-eslint/packages/scope-manager/src/referencer/Visitor.ts ALT/typescript-eslint/packages/scope-manager/src/referencer/Visitor.ts
index a3e1e98..4e9cd21 100644
--- ORI/typescript-eslint/packages/scope-manager/src/referencer/Visitor.ts
+++ ALT/typescript-eslint/packages/scope-manager/src/referencer/Visitor.ts
@@ -18,10 +18,9 @@ class Visitor extends VisitorBase {
: optionsOrVisitor,
);
- this.#options =
- optionsOrVisitor instanceof Visitor
- ? optionsOrVisitor.#options
- : optionsOrVisitor;
+ this.#options = optionsOrVisitor instanceof Visitor
+ ? optionsOrVisitor.#options
+ : optionsOrVisitor;
}
protected visitPattern(
diff --git ORI/typescript-eslint/packages/scope-manager/src/scope/ScopeBase.ts ALT/typescript-eslint/packages/scope-manager/src/scope/ScopeBase.ts
index 18196d9..17688d0 100644
--- ORI/typescript-eslint/packages/scope-manager/src/scope/ScopeBase.ts
+++ ALT/typescript-eslint/packages/scope-manager/src/scope/ScopeBase.ts
@@ -422,14 +422,14 @@ abstract class ScopeBase<
node: TSESTree.Identifier | null,
def: Definition | null,
): void {
- const name =
- typeof nameOrVariable === 'string' ? nameOrVariable : nameOrVariable.name;
+ const name = typeof nameOrVariable === 'string'
+ ? nameOrVariable
+ : nameOrVariable.name;
let variable = set.get(name);
if (!variable) {
- variable =
- typeof nameOrVariable === 'string'
- ? new Variable(name, this as Scope)
- : nameOrVariable;
+ variable = typeof nameOrVariable === 'string'
+ ? new Variable(name, this as Scope)
+ : nameOrVariable;
set.set(name, variable);
variables.push(variable);
}
diff --git ORI/typescript-eslint/packages/typescript-estree/src/convert-comments.ts ALT/typescript-eslint/packages/typescript-estree/src/convert-comments.ts
index 737b01b..e095b1a 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/convert-comments.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/convert-comments.ts
@@ -19,21 +19,19 @@ export function convertComments(
forEachComment(
ast,
(_, comment) => {
- const type =
- comment.kind == ts.SyntaxKind.SingleLineCommentTrivia
- ? AST_TOKEN_TYPES.Line
- : AST_TOKEN_TYPES.Block;
+ const type = comment.kind == ts.SyntaxKind.SingleLineCommentTrivia
+ ? AST_TOKEN_TYPES.Line
+ : AST_TOKEN_TYPES.Block;
const range: TSESTree.Range = [comment.pos, comment.end];
const loc = getLocFor(range[0], range[1], ast);
// both comments start with 2 characters - /* or //
const textStart = range[0] + 2;
- const textEnd =
- comment.kind === ts.SyntaxKind.SingleLineCommentTrivia
- ? // single line comments end at the end
- range[1] - textStart
- : // multiline comments end 2 characters early
- range[1] - textStart - 2;
+ const textEnd = comment.kind === ts.SyntaxKind.SingleLineCommentTrivia
+ ? // single line comments end at the end
+ range[1] - textStart
+ : // multiline comments end 2 characters early
+ range[1] - textStart - 2;
comments.push({
type,
value: code.substr(textStart, textEnd),
diff --git ORI/typescript-eslint/packages/typescript-estree/src/convert.ts ALT/typescript-eslint/packages/typescript-estree/src/convert.ts
index f0fb7d3..348ad23 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/convert.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/convert.ts
@@ -486,15 +486,16 @@ export class Converter {
if ('type' in node) {
result.typeAnnotation =
- node.type && 'kind' in node.type && ts.isTypeNode(node.type)
+ node.type &&
+ 'kind' in node.type &&
+ ts.isTypeNode(node.type)
? this.convertTypeAnnotation(node.type, node)
: null;
}
if ('typeArguments' in node) {
- result.typeParameters =
- node.typeArguments && 'pos' in node.typeArguments
- ? this.convertTypeArgumentsToTypeParameters(node.typeArguments, node)
- : null;
+ result.typeParameters = node.typeArguments && 'pos' in node.typeArguments
+ ? this.convertTypeArgumentsToTypeParameters(node.typeArguments, node)
+ : null;
}
if ('typeParameters' in node) {
result.typeParameters =
@@ -857,10 +858,9 @@ export class Converter {
return this.createNode<TSESTree.SwitchCase>(node, {
type: AST_NODE_TYPES.SwitchCase,
// expression is present in case only
- test:
- node.kind === SyntaxKind.CaseClause
- ? this.convertChild(node.expression)
- : null,
+ test: node.kind === SyntaxKind.CaseClause
+ ? this.convertChild(node.expression)
+ : null,
consequent: node.statements.map(el => this.convertChild(el)),
});
@@ -949,10 +949,9 @@ export class Converter {
const result = this.createNode<
TSESTree.TSDeclareFunction | TSESTree.FunctionDeclaration
>(node, {
- type:
- isDeclare || !node.body
- ? AST_NODE_TYPES.TSDeclareFunction
- : AST_NODE_TYPES.FunctionDeclaration,
+ type: isDeclare || !node.body
+ ? AST_NODE_TYPES.TSDeclareFunction
+ : AST_NODE_TYPES.FunctionDeclaration,
id: this.convertChild(node.name),
generator: !!node.asteriskToken,
expression: false,
@@ -1647,10 +1646,9 @@ export class Converter {
case SyntaxKind.ClassDeclaration:
case SyntaxKind.ClassExpression: {
const heritageClauses = node.heritageClauses ?? [];
- const classNodeType =
- node.kind === SyntaxKind.ClassDeclaration
- ? AST_NODE_TYPES.ClassDeclaration
- : AST_NODE_TYPES.ClassExpression;
+ const classNodeType = node.kind === SyntaxKind.ClassDeclaration
+ ? AST_NODE_TYPES.ClassDeclaration
+ : AST_NODE_TYPES.ClassExpression;
const superClass = heritageClauses.find(
clause => clause.token === SyntaxKind.ExtendsKeyword,
@@ -1828,10 +1826,11 @@ export class Converter {
// SyntaxKind.NamespaceExport does not exist yet (i.e. is undefined), this
// cannot be shortened to an optional chain, or else you end up with
// undefined === undefined, and the true path will hard error at runtime
- node.exportClause &&
- node.exportClause.kind === SyntaxKind.NamespaceExport
- ? this.convertChild(node.exportClause.name)
- : null,
+
+ node.exportClause &&
+ node.exportClause.kind === SyntaxKind.NamespaceExport
+ ? this.convertChild(node.exportClause.name)
+ : null,
assertions: this.convertAssertClasue(node.assertClause),
});
}
@@ -2092,10 +2091,9 @@ export class Converter {
case SyntaxKind.StringLiteral: {
return this.createNode<TSESTree.StringLiteral>(node, {
type: AST_NODE_TYPES.Literal,
- value:
- parent.kind === SyntaxKind.JsxAttribute
- ? unescapeStringLiteralText(node.text)
- : node.text,
+ value: parent.kind === SyntaxKind.JsxAttribute
+ ? unescapeStringLiteralText(node.text)
+ : node.text,
raw: node.getText(),
});
}
@@ -2548,12 +2546,11 @@ export class Converter {
case SyntaxKind.FunctionType:
case SyntaxKind.ConstructSignature:
case SyntaxKind.CallSignature: {
- const type =
- node.kind === SyntaxKind.ConstructSignature
- ? AST_NODE_TYPES.TSConstructSignatureDeclaration
- : node.kind === SyntaxKind.CallSignature
- ? AST_NODE_TYPES.TSCallSignatureDeclaration
- : AST_NODE_TYPES.TSFunctionType;
+ const type = node.kind === SyntaxKind.ConstructSignature
+ ? AST_NODE_TYPES.TSConstructSignatureDeclaration
+ : node.kind === SyntaxKind.CallSignature
+ ? AST_NODE_TYPES.TSCallSignatureDeclaration
+ : AST_NODE_TYPES.TSFunctionType;
const result = this.createNode<
| TSESTree.TSFunctionType
| TSESTree.TSCallSignatureDeclaration
@@ -2579,10 +2576,9 @@ export class Converter {
const result = this.createNode<
TSESTree.TSInterfaceHeritage | TSESTree.TSClassImplements
>(node, {
- type:
- parent && parent.kind === SyntaxKind.InterfaceDeclaration
- ? AST_NODE_TYPES.TSInterfaceHeritage
- : AST_NODE_TYPES.TSClassImplements,
+ type: parent && parent.kind === SyntaxKind.InterfaceDeclaration
+ ? AST_NODE_TYPES.TSInterfaceHeritage
+ : AST_NODE_TYPES.TSClassImplements,
expression: this.convertChild(node.expression),
});
@@ -2817,12 +2813,11 @@ export class Converter {
// In TS 4.0, the `elementTypes` property was changed to `elements`.
// To support both at compile time, we cast to access the newer version
// if the former does not exist.
- const elementTypes =
- 'elementTypes' in node
- ? (node as any).elementTypes.map((el: ts.Node) =>
- this.convertType(el),
- )
- : node.elements.map(el => this.convertType(el));
+ const elementTypes = 'elementTypes' in node
+ ? (node as any).elementTypes.map((el: ts.Node) =>
+ this.convertType(el),
+ )
+ : node.elements.map(el => this.convertType(el));
return this.createNode<TSESTree.TSTupleType>(node, {
type: AST_NODE_TYPES.TSTupleType,
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 ae2dec4..646dd36 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/create-program/createWatchProgram.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/create-program/createWatchProgram.ts
@@ -280,10 +280,9 @@ function createWatchProgram(
const oldReadFile = watchCompilerHost.readFile;
watchCompilerHost.readFile = (filePathIn, encoding): string | undefined => {
const filePath = getCanonicalFileName(filePathIn);
- const fileContent =
- filePath === currentLintOperationState.filePath
- ? currentLintOperationState.code
- : oldReadFile(filePath, encoding);
+ const fileContent = filePath === currentLintOperationState.filePath
+ ? currentLintOperationState.code
+ : oldReadFile(filePath, encoding);
if (fileContent !== undefined) {
parsedFilesSeenHash.set(filePath, createHash(fileContent));
}
diff --git ORI/typescript-eslint/packages/typescript-estree/src/create-program/shared.ts ALT/typescript-eslint/packages/typescript-estree/src/create-program/shared.ts
index a0e654c..a9250e7 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/create-program/shared.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/create-program/shared.ts
@@ -48,8 +48,9 @@ function createDefaultCompilerOptionsFromExtra(
type CanonicalPath = string & { __brand: unknown };
// typescript doesn't provide a ts.sys implementation for browser environments
-const useCaseSensitiveFileNames =
- ts.sys !== undefined ? ts.sys.useCaseSensitiveFileNames : true;
+const useCaseSensitiveFileNames = ts.sys !== undefined
+ ? ts.sys.useCaseSensitiveFileNames
+ : true;
const correctPathCasing = useCaseSensitiveFileNames
? (filePath: string): string => filePath
: (filePath: string): string => filePath.toLowerCase();
diff --git ORI/typescript-eslint/packages/typescript-estree/src/node-utils.ts ALT/typescript-eslint/packages/typescript-estree/src/node-utils.ts
index d8182aa..9f80048 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/node-utils.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/node-utils.ts
@@ -364,10 +364,9 @@ export function unescapeStringLiteralText(text: string): string {
return text.replace(/&(?:#\d+|#x[\da-fA-F]+|[0-9a-zA-Z]+);/g, entity => {
const item = entity.slice(1, -1);
if (item[0] === '#') {
- const codePoint =
- item[1] === 'x'
- ? parseInt(item.slice(2), 16)
- : parseInt(item.slice(1), 10);
+ const codePoint = item[1] === 'x'
+ ? parseInt(item.slice(2), 16)
+ : parseInt(item.slice(1), 10);
return codePoint > 0x10ffff // RangeError: Invalid code point
? entity
: String.fromCodePoint(codePoint);
@@ -534,10 +533,9 @@ export function convertToken(
token: ts.Token<ts.TokenSyntaxKind>,
ast: ts.SourceFile,
): TSESTree.Token {
- const start =
- token.kind === SyntaxKind.JsxText
- ? token.getFullStart()
- : token.getStart(ast);
+ const start = token.kind === SyntaxKind.JsxText
+ ? token.getFullStart()
+ : token.getStart(ast);
const end = token.getEnd();
const value = ast.text.slice(start, end);
const tokenType = getTokenType(token);
diff --git ORI/typescript-eslint/packages/typescript-estree/src/parser.ts ALT/typescript-eslint/packages/typescript-estree/src/parser.ts
index 8867e8a..d540f8f 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/parser.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/parser.ts
@@ -339,8 +339,9 @@ function applyParserOptionsToExtra(options: TSESTreeOptions): void {
function warnAboutTSVersion(): void {
if (!isRunningSupportedTypeScriptVersion && !warnedAboutTSVersion) {
- const isTTY =
- typeof process === 'undefined' ? false : process.stdout?.isTTY;
+ const isTTY = typeof process === 'undefined'
+ ? false
+ : process.stdout?.isTTY;
if (isTTY) {
const border = '=============';
const versionWarning = [
@@ -606,8 +607,9 @@ function parseAndGenerateServices<T extends TSESTreeOptions = TSESTreeOptions>(
* Convert the TypeScript AST to an ESTree-compatible one, and optionally preserve
* mappings between converted and original AST nodes
*/
- const preserveNodeMaps =
- typeof extra.preserveNodeMaps === 'boolean' ? extra.preserveNodeMaps : true;
+ const preserveNodeMaps = typeof extra.preserveNodeMaps === 'boolean'
+ ? extra.preserveNodeMaps
+ : true;
const { estree, astMaps } = astConverter(ast, extra, preserveNodeMaps);
/**
diff --git ORI/typescript-eslint/packages/typescript-estree/tests/lib/parse.test.ts ALT/typescript-eslint/packages/typescript-estree/tests/lib/parse.test.ts
index cd573fc..fd59b18 100644
--- ORI/typescript-eslint/packages/typescript-estree/tests/lib/parse.test.ts
+++ ALT/typescript-eslint/packages/typescript-estree/tests/lib/parse.test.ts
@@ -330,12 +330,11 @@ describe('parseAndGenerateServices', () => {
jsxSetting: boolean;
shouldThrow?: boolean;
}): void => {
- const code =
- ext === '.json'
- ? '{ "x": 1 }'
- : jsxContent
- ? 'const x = <div />;'
- : 'const x = 1';
+ const code = ext === '.json'
+ ? '{ "x": 1 }'
+ : jsxContent
+ ? 'const x = <div />;'
+ : 'const x = 1';
it(`should parse ${ext} file - ${
jsxContent ? 'with' : 'without'
} JSX content - parserOptions.jsx = ${jsxSetting}`, () => {
diff --git ORI/typescript-eslint/packages/website-eslint/rollup-plugin/replace.js ALT/typescript-eslint/packages/website-eslint/rollup-plugin/replace.js
index b8f3143..dd89909 100644
--- ORI/typescript-eslint/packages/website-eslint/rollup-plugin/replace.js
+++ ALT/typescript-eslint/packages/website-eslint/rollup-plugin/replace.js
@@ -35,8 +35,9 @@ module.exports = (options = {}) => {
return {
match: item.match,
test: item.test,
- replace:
- typeof item.replace === 'string' ? () => item.replace : item.replace,
+ replace: typeof item.replace === 'string'
+ ? () => item.replace
+ : item.replace,
matcher: createMatcher(item.match),
};
@@ -45,10 +46,9 @@ module.exports = (options = {}) => {
return {
name: 'rollup-plugin-replace',
resolveId(id, importerPath) {
- const importeePath =
- id.startsWith('./') || id.startsWith('../')
- ? Module.createRequire(importerPath).resolve(id)
- : id;
+ const importeePath = id.startsWith('./') || id.startsWith('../')
+ ? Module.createRequire(importerPath).resolve(id)
+ : id;
let result = aliasesCache.get(importeePath);
if (result) {
diff --git ORI/typescript-eslint/packages/website-eslint/src/linter/parser.js ALT/typescript-eslint/packages/website-eslint/src/linter/parser.js
index 282f67c..05cf1ad 100644
--- ORI/typescript-eslint/packages/website-eslint/src/linter/parser.js
+++ ALT/typescript-eslint/packages/website-eslint/src/linter/parser.js
@@ -32,8 +32,9 @@ export function parseForESLint(code, parserOptions) {
});
const scopeManager = analyze(ast, {
- ecmaVersion:
- parserOptions.ecmaVersion === 'latest' ? 1e8 : parserOptions.ecmaVersion,
+ ecmaVersion: parserOptions.ecmaVersion === 'latest'
+ ? 1e8
+ : parserOptions.ecmaVersion,
globalReturn: parserOptions.ecmaFeatures?.globalReturn ?? false,
sourceType: parserOptions.sourceType ?? 'script',
});
diff --git ORI/typescript-eslint/packages/website-eslint/src/mock/assert.js ALT/typescript-eslint/packages/website-eslint/src/mock/assert.js
index 70cbf7a..ea186d8 100644
--- ORI/typescript-eslint/packages/website-eslint/src/mock/assert.js
+++ ALT/typescript-eslint/packages/website-eslint/src/mock/assert.js
@@ -47,10 +47,9 @@ class AssertionError extends Error {
let out = err.stack;
// try to strip useless frames
- const fn_name =
- typeof stackStartFunction === 'function'
- ? stackStartFunction.name
- : stackStartFunction.toString();
+ const fn_name = typeof stackStartFunction === 'function'
+ ? stackStartFunction.name
+ : stackStartFunction.toString();
const idx = out.indexOf('\n' + fn_name);
if (idx >= 0) {
// once we have located the function frame
diff --git ORI/typescript-eslint/packages/website-eslint/src/mock/path.js ALT/typescript-eslint/packages/website-eslint/src/mock/path.js
index 3d04551..e8a401b 100644
--- ORI/typescript-eslint/packages/website-eslint/src/mock/path.js
+++ ALT/typescript-eslint/packages/website-eslint/src/mock/path.js
@@ -233,12 +233,11 @@ function filter(xs, f) {
}
// String.prototype.substr - negative index don't work in IE8
-const substr =
- 'ab'.substr(-1) === 'b'
- ? function (str, start, len) {
- return str.substr(start, len);
- }
- : function (str, start, len) {
- if (start < 0) start = str.length + start;
- return str.substr(start, len);
- };
+const substr = 'ab'.substr(-1) === 'b'
+ ? function (str, start, len) {
+ return str.substr(start, len);
+ }
+ : function (str, start, len) {
+ if (start < 0) start = str.length + start;
+ return str.substr(start, len);
+ }; |
|
prettier/prettier#12087 VS prettier/prettier@main :: vega/vega-lite@675653d Diff (537 lines)diff --git ORI/vega-lite/src/compile/axis/config.ts ALT/vega-lite/src/compile/axis/config.ts
index ee6b002..d7d1a39 100644
--- ORI/vega-lite/src/compile/axis/config.ts
+++ ALT/vega-lite/src/compile/axis/config.ts
@@ -51,16 +51,15 @@ export function getAxisConfigs(
orient: string | SignalRef,
config: Config
) {
- const typeBasedConfigTypes =
- scaleType === 'band'
- ? ['axisDiscrete', 'axisBand']
- : scaleType === 'point'
- ? ['axisDiscrete', 'axisPoint']
- : isQuantitative(scaleType)
- ? ['axisQuantitative']
- : scaleType === 'time' || scaleType === 'utc'
- ? ['axisTemporal']
- : [];
+ const typeBasedConfigTypes = scaleType === 'band'
+ ? ['axisDiscrete', 'axisBand']
+ : scaleType === 'point'
+ ? ['axisDiscrete', 'axisPoint']
+ : isQuantitative(scaleType)
+ ? ['axisQuantitative']
+ : scaleType === 'time' || scaleType === 'utc'
+ ? ['axisTemporal']
+ : [];
const axisChannel = channel === 'x' ? 'axisX' : 'axisY';
const axisOrient = isSignalRef(orient) ? 'axisOrient' : `axis${titleCase(orient)}`; // axisTop, axisBottom, ...
diff --git ORI/vega-lite/src/compile/axis/parse.ts ALT/vega-lite/src/compile/axis/parse.ts
index d61bb38..510c263 100644
--- ORI/vega-lite/src/compile/axis/parse.ts
+++ ALT/vega-lite/src/compile/axis/parse.ts
@@ -237,8 +237,9 @@ function parseAxis(channel: PositionScaleChannel, model: UnitModel): AxisCompone
const axisConfigs = getAxisConfigs(channel, scaleType, orient, model.config);
- const disable =
- axis !== undefined ? !axis : getAxisConfig('disable', config.style, axis?.style, axisConfigs).configValue;
+ const disable = axis !== undefined
+ ? !axis
+ : getAxisConfig('disable', config.style, axis?.style, axisConfigs).configValue;
axisComponent.set('disable', disable, axis !== undefined);
if (disable) {
return axisComponent;
@@ -261,8 +262,11 @@ function parseAxis(channel: PositionScaleChannel, model: UnitModel): AxisCompone
};
// 1.2. Add properties
for (const property of AXIS_COMPONENT_PROPERTIES) {
- const value =
- property in axisRules ? axisRules[property](ruleParams) : isAxisProperty(property) ? axis[property] : undefined;
+ const value = property in axisRules
+ ? axisRules[property](ruleParams)
+ : isAxisProperty(property)
+ ? axis[property]
+ : undefined;
const hasValue = value !== undefined;
@@ -271,10 +275,9 @@ function parseAxis(channel: PositionScaleChannel, model: UnitModel): AxisCompone
if (hasValue && explicit) {
axisComponent.set(property, value, explicit);
} else {
- const {configValue = undefined, configFrom = undefined} =
- isAxisProperty(property) && property !== 'values'
- ? getAxisConfig(property, config.style, axis.style, axisConfigs)
- : {};
+ const {configValue = undefined, configFrom = undefined} = isAxisProperty(property) && property !== 'values'
+ ? getAxisConfig(property, config.style, axis.style, axisConfigs)
+ : {};
const hasConfigValue = configValue !== undefined;
if (hasValue && !hasConfigValue) {
diff --git ORI/vega-lite/src/compile/data/debug.ts ALT/vega-lite/src/compile/data/debug.ts
index fb2e161..37d0419 100644
--- ORI/vega-lite/src/compile/data/debug.ts
+++ ALT/vega-lite/src/compile/data/debug.ts
@@ -81,10 +81,9 @@ export function dotString(roots: readonly DataFlowNode[]) {
nodes[id] = {
id,
label: getLabel(node),
- hash:
- node instanceof SourceNode
- ? node.data.url ?? node.data.name ?? node.debugName
- : String(node.hash()).replace(/"/g, '')
+ hash: node instanceof SourceNode
+ ? node.data.url ?? node.data.name ?? node.debugName
+ : String(node.hash()).replace(/"/g, '')
};
for (const child of node.children) {
diff --git ORI/vega-lite/src/compile/data/facet.ts ALT/vega-lite/src/compile/data/facet.ts
index 4c3e581..4224dcc 100644
--- ORI/vega-lite/src/compile/data/facet.ts
+++ ALT/vega-lite/src/compile/data/facet.ts
@@ -225,14 +225,13 @@ export class FacetNode extends DataFlowNode {
if (hasSharedAxis[headerChannel]) {
const cardinality = `length(data("${this.facet.name}"))`;
- const stop =
- headerChannel === 'row'
- ? columns
- ? {signal: `ceil(${cardinality} / ${columns})`}
- : 1
- : columns
- ? {signal: `min(${cardinality}, ${columns})`}
- : {signal: cardinality};
+ const stop = headerChannel === 'row'
+ ? columns
+ ? {signal: `ceil(${cardinality} / ${columns})`}
+ : 1
+ : columns
+ ? {signal: `min(${cardinality}, ${columns})`}
+ : {signal: cardinality};
data.push({
name: `${this.facet.name}_${headerChannel}`,
diff --git ORI/vega-lite/src/compile/data/parse.ts ALT/vega-lite/src/compile/data/parse.ts
index cf35136..0076c6f 100644
--- ORI/vega-lite/src/compile/data/parse.ts
+++ ALT/vega-lite/src/compile/data/parse.ts
@@ -303,8 +303,9 @@ export function parseData(model: Model): DataComponent {
const data = model.data;
const newData = data && (isGenerator(data) || isUrlData(data) || isInlineData(data));
- const ancestorParse =
- !newData && model.parent ? model.parent.component.data.ancestorParse.clone() : new AncestorParse();
+ const ancestorParse = !newData && model.parent
+ ? model.parent.component.data.ancestorParse.clone()
+ : new AncestorParse();
if (isGenerator(data)) {
// insert generator transform
diff --git ORI/vega-lite/src/compile/header/common.ts ALT/vega-lite/src/compile/header/common.ts
index dc252a9..f5d6626 100644
--- ORI/vega-lite/src/compile/header/common.ts
+++ ALT/vega-lite/src/compile/header/common.ts
@@ -23,8 +23,11 @@ export function getHeaderProperty<P extends keyof Header<SignalRef>>(
config: Config<SignalRef>,
channel: FacetChannel
): Header<SignalRef>[P] {
- const headerSpecificConfig =
- channel === 'row' ? config.headerRow : channel === 'column' ? config.headerColumn : config.headerFacet;
+ const headerSpecificConfig = channel === 'row'
+ ? config.headerRow
+ : channel === 'column'
+ ? config.headerColumn
+ : config.headerFacet;
return getFirstDefined((header || {})[prop], headerSpecificConfig[prop], config.header[prop]);
}
diff --git ORI/vega-lite/src/compile/header/parse.ts ALT/vega-lite/src/compile/header/parse.ts
index 5cdad78..a2c0403 100644
--- ORI/vega-lite/src/compile/header/parse.ts
+++ ALT/vega-lite/src/compile/header/parse.ts
@@ -48,8 +48,9 @@ function parseFacetHeader(model: FacetModel, channel: FacetChannel) {
const labelOrient = getHeaderProperty('labelOrient', fieldDef.header, config, channel);
- const labels =
- fieldDef.header !== null ? getFirstDefined(fieldDef.header?.labels, config.header.labels, true) : false;
+ const labels = fieldDef.header !== null
+ ? getFirstDefined(fieldDef.header?.labels, config.header.labels, true)
+ : false;
const headerType = contains(['bottom', 'right'], labelOrient) ? 'footer' : 'header';
component.layoutHeaders[channel] = {
diff --git ORI/vega-lite/src/compile/layoutsize/assemble.ts ALT/vega-lite/src/compile/layoutsize/assemble.ts
index 1b10bdd..34725c1 100644
--- ORI/vega-lite/src/compile/layoutsize/assemble.ts
+++ ALT/vega-lite/src/compile/layoutsize/assemble.ts
@@ -89,15 +89,14 @@ export function sizeExpr(scaleName: string, scaleComponent: ScaleComponent, card
const paddingOuter = getFirstDefined(scaleComponent.get('paddingOuter'), padding);
let paddingInner = scaleComponent.get('paddingInner');
- paddingInner =
- type === 'band'
- ? // only band has real paddingInner
- paddingInner !== undefined
- ? paddingInner
- : padding
- : // For point, as calculated in https://github.com/vega/vega-scale/blob/master/src/band.js#L128,
- // it's equivalent to have paddingInner = 1 since there is only n-1 steps between n points.
- 1;
+ paddingInner = type === 'band'
+ ? // only band has real paddingInner
+ paddingInner !== undefined
+ ? paddingInner
+ : padding
+ : // For point, as calculated in https://github.com/vega/vega-scale/blob/master/src/band.js#L128,
+ // it's equivalent to have paddingInner = 1 since there is only n-1 steps between n points.
+ 1;
return `bandspace(${cardinality}, ${signalOrStringValue(paddingInner)}, ${signalOrStringValue(
paddingOuter
)}) * ${scaleName}_step`;
diff --git ORI/vega-lite/src/compile/legend/parse.ts ALT/vega-lite/src/compile/legend/parse.ts
index 4e778ba..388dab1 100644
--- ORI/vega-lite/src/compile/legend/parse.ts
+++ ALT/vega-lite/src/compile/legend/parse.ts
@@ -150,10 +150,9 @@ export function parseLegendForChannel(model: UnitModel, channel: NonPositionScal
for (const part of ['labels', 'legend', 'title', 'symbols', 'gradient', 'entries']) {
const legendEncodingPart = guideEncodeEntry(legendEncoding[part] ?? {}, model);
- const value =
- part in legendEncodeRules
- ? legendEncodeRules[part](legendEncodingPart, legendEncodeParams) // apply rule
- : legendEncodingPart; // no rule -- just default values
+ const value = part in legendEncodeRules
+ ? legendEncodeRules[part](legendEncodingPart, legendEncodeParams) // apply rule
+ : legendEncodingPart; // no rule -- just default values
if (value !== undefined && !isEmpty(value)) {
legendEncode[part] = {
diff --git ORI/vega-lite/src/compile/mark/encode/position-point.ts ALT/vega-lite/src/compile/mark/encode/position-point.ts
index 1df089d..02f296a 100644
--- ORI/vega-lite/src/compile/mark/encode/position-point.ts
+++ ALT/vega-lite/src/compile/mark/encode/position-point.ts
@@ -55,23 +55,22 @@ export function pointPosition(
scale
});
- const valueRef =
- !channelDef && isXorY(channel) && (encoding.latitude || encoding.longitude)
- ? // use geopoint output if there are lat/long and there is no point position overriding lat/long.
- {field: model.getName(channel)}
- : positionRef({
- channel,
- channelDef,
- channel2Def,
- markDef,
- config,
- scaleName,
- scale,
- stack,
- offset,
- defaultRef,
- bandPosition: offsetType === 'encoding' ? 0 : undefined
- });
+ const valueRef = !channelDef && isXorY(channel) && (encoding.latitude || encoding.longitude)
+ ? // use geopoint output if there are lat/long and there is no point position overriding lat/long.
+ {field: model.getName(channel)}
+ : positionRef({
+ channel,
+ channelDef,
+ channel2Def,
+ markDef,
+ config,
+ scaleName,
+ scale,
+ stack,
+ offset,
+ defaultRef,
+ bandPosition: offsetType === 'encoding' ? 0 : undefined
+ });
return valueRef ? {[vgChannel || channel]: valueRef} : undefined;
}
diff --git ORI/vega-lite/src/compile/mark/encode/position-range.ts ALT/vega-lite/src/compile/mark/encode/position-range.ts
index 28ca2e8..4fe66a5 100644
--- ORI/vega-lite/src/compile/mark/encode/position-range.ts
+++ ALT/vega-lite/src/compile/mark/encode/position-range.ts
@@ -82,10 +82,9 @@ function pointPosition2OrSize(
const scaleName = model.scaleName(baseChannel);
const scale = model.getScaleComponent(baseChannel);
- const {offset} =
- channel in encoding || channel in markDef
- ? positionOffset({channel, markDef, encoding, model})
- : positionOffset({channel: baseChannel, markDef, encoding, model});
+ const {offset} = channel in encoding || channel in markDef
+ ? positionOffset({channel, markDef, encoding, model})
+ : positionOffset({channel: baseChannel, markDef, encoding, model});
if (!channelDef && (channel === 'x2' || channel === 'y2') && (encoding.latitude || encoding.longitude)) {
const vgSizeChannel = getSizeChannel(channel);
diff --git ORI/vega-lite/src/compile/mark/encode/valueref.ts ALT/vega-lite/src/compile/mark/encode/valueref.ts
index c68b668..a30323c 100644
--- ORI/vega-lite/src/compile/mark/encode/valueref.ts
+++ ALT/vega-lite/src/compile/mark/encode/valueref.ts
@@ -98,11 +98,10 @@ export function fieldInvalidTestValueRef(fieldDef: FieldDef<string>, channel: Po
const test = fieldInvalidPredicate(fieldDef, true);
const mainChannel = getMainRangeChannel(channel) as PositionChannel | PolarPositionChannel; // we can cast here as the output can't be other things.
- const zeroValueRef =
- mainChannel === 'y'
- ? {field: {group: 'height'}}
- : // x / angle / radius can all use 0
- {value: 0};
+ const zeroValueRef = mainChannel === 'y'
+ ? {field: {group: 'height'}}
+ : // x / angle / radius can all use 0
+ {value: 0};
return {test, ...zeroValueRef};
}
@@ -178,10 +177,9 @@ export function interpolatedSignalRef({
}): VgValueRef {
const expr = 0 < bandPosition && bandPosition < 1 ? 'datum' : undefined;
const start = vgField(fieldOrDatumDef, {expr, suffix: startSuffix});
- const end =
- fieldOrDatumDef2 !== undefined
- ? vgField(fieldOrDatumDef2, {expr})
- : vgField(fieldOrDatumDef, {suffix: 'end', expr});
+ const end = fieldOrDatumDef2 !== undefined
+ ? vgField(fieldOrDatumDef2, {expr})
+ : vgField(fieldOrDatumDef, {suffix: 'end', expr});
const ref: VgValueRef = {};
diff --git ORI/vega-lite/src/compile/mark/init.ts ALT/vega-lite/src/compile/mark/init.ts
index daa1646..d9150c0 100644
--- ORI/vega-lite/src/compile/mark/init.ts
+++ ALT/vega-lite/src/compile/mark/init.ts
@@ -40,7 +40,8 @@ export function initMarkdef(originalMarkDef: MarkDef, encoding: Encoding<string>
const cornerRadiusEnd = getMarkPropOrConfig('cornerRadiusEnd', markDef, config);
if (cornerRadiusEnd !== undefined) {
const newProps =
- (markDef.orient === 'horizontal' && encoding.x2) || (markDef.orient === 'vertical' && encoding.y2)
+ (markDef.orient === 'horizontal' && encoding.x2) ||
+ (markDef.orient === 'vertical' && encoding.y2)
? ['cornerRadius']
: BAR_CORNER_RADIUS_END_INDEX[markDef.orient];
diff --git ORI/vega-lite/src/compile/scale/domain.ts ALT/vega-lite/src/compile/scale/domain.ts
index bf4260d..b4ac990 100644
--- ORI/vega-lite/src/compile/scale/domain.ts
+++ ALT/vega-lite/src/compile/scale/domain.ts
@@ -277,8 +277,9 @@ function parseSingleChannelDomain(
]);
}
- const sort: undefined | true | VgSortField =
- isScaleChannel(channel) && isFieldDef(fieldOrDatumDef) ? domainSort(model, channel, scaleType) : undefined;
+ const sort: undefined | true | VgSortField = isScaleChannel(channel) && isFieldDef(fieldOrDatumDef)
+ ? domainSort(model, channel, scaleType)
+ : undefined;
if (isDatumDef(fieldOrDatumDef)) {
const d = convertDomainIfItIsDateTime([fieldOrDatumDef.datum], type, timeUnit);
@@ -318,13 +319,12 @@ function parseSingleChannelDomain(
// Use range if we added it and the scale does not support computing a range as a signal.
field: model.vgField(channel, binRequiresRange(fieldDef, channel) ? {binSuffix: 'range'} : {}),
// we have to use a sort object if sort = true to make the sort correct by bin start
- sort:
- sort === true || !isObject(sort)
- ? {
- field: model.vgField(channel, {}),
- op: 'min' // min or max doesn't matter since we sort by the start of the bin range
- }
- : sort
+ sort: sort === true || !isObject(sort)
+ ? {
+ field: model.vgField(channel, {}),
+ op: 'min' // min or max doesn't matter since we sort by the start of the bin range
+ }
+ : sort
}
]);
} else {
diff --git ORI/vega-lite/src/compile/scale/properties.ts ALT/vega-lite/src/compile/scale/properties.ts
index 501e9df..b49084f 100644
--- ORI/vega-lite/src/compile/scale/properties.ts
+++ ALT/vega-lite/src/compile/scale/properties.ts
@@ -106,23 +106,22 @@ function parseUnitScaleProperty(model: UnitModel, property: Exclude<keyof (Scale
);
}
} else {
- const value =
- property in scaleRules
- ? scaleRules[property]({
- model,
- channel,
- fieldOrDatumDef,
- scaleType,
- scalePadding,
- scalePaddingInner,
- domain: specifiedScale.domain,
- domainMin: specifiedScale.domainMin,
- domainMax: specifiedScale.domainMax,
- markDef,
- config,
- hasNestedOffsetScale: channelHasNestedOffsetScale(encoding, channel)
- })
- : config.scale[property];
+ const value = property in scaleRules
+ ? scaleRules[property]({
+ model,
+ channel,
+ fieldOrDatumDef,
+ scaleType,
+ scalePadding,
+ scalePaddingInner,
+ domain: specifiedScale.domain,
+ domainMin: specifiedScale.domainMin,
+ domainMax: specifiedScale.domainMax,
+ markDef,
+ config,
+ hasNestedOffsetScale: channelHasNestedOffsetScale(encoding, channel)
+ })
+ : config.scale[property];
if (value !== undefined) {
localScaleCmpt.set(property, value, false);
}
diff --git ORI/vega-lite/src/compile/selection/assemble.ts ALT/vega-lite/src/compile/selection/assemble.ts
index 57d1171..190675a 100644
--- ORI/vega-lite/src/compile/selection/assemble.ts
+++ ALT/vega-lite/src/compile/selection/assemble.ts
@@ -168,10 +168,9 @@ export function assembleSelectionScaleDomain(
const parsedExtent = parseSelectionExtent(model, extent.param, extent);
return {
- signal:
- hasContinuousDomain(scaleCmpt.get('type')) && isArray(domain) && domain[0] > domain[1]
- ? `isValid(${parsedExtent}) && reverse(${parsedExtent})`
- : parsedExtent
+ signal: hasContinuousDomain(scaleCmpt.get('type')) && isArray(domain) && domain[0] > domain[1]
+ ? `isValid(${parsedExtent}) && reverse(${parsedExtent})`
+ : parsedExtent
};
}
diff --git ORI/vega-lite/src/compile/selection/project.ts ALT/vega-lite/src/compile/selection/project.ts
index 6290d41..b71d009 100644
--- ORI/vega-lite/src/compile/selection/project.ts
+++ ALT/vega-lite/src/compile/selection/project.ts
@@ -64,10 +64,9 @@ const project: SelectionCompiler = {
const type = selCmpt.type;
const cfg = model.config.selection[type];
- const init =
- selDef.value !== undefined
- ? (array(selDef.value as any) as SelectionInitMapping[] | SelectionInitIntervalMapping[])
- : null;
+ const init = selDef.value !== undefined
+ ? (array(selDef.value as any) as SelectionInitMapping[] | SelectionInitIntervalMapping[])
+ : null;
// If no explicit projection (either fields or encodings) is specified, set some defaults.
// If an initial value is set, try to infer projections.
diff --git ORI/vega-lite/src/compositemark/boxplot.ts ALT/vega-lite/src/compositemark/boxplot.ts
index 8fbedcd..e85ab09 100644
--- ORI/vega-lite/src/compositemark/boxplot.ts
+++ ALT/vega-lite/src/compositemark/boxplot.ts
@@ -148,18 +148,17 @@ export function normalizeBoxPlot(
// ## Whisker Layers
const endTick: MarkDef = {type: 'tick', color: 'black', opacity: 1, orient: ticksOrient, invalid: null, aria: false};
- const whiskerTooltipEncoding: Encoding<string> =
- boxPlotType === 'min-max'
- ? fiveSummaryTooltipEncoding // for min-max, show five-summary tooltip for whisker
- : // for tukey / k-IQR, just show upper/lower-whisker
- getCompositeMarkTooltip(
- [
- {fieldPrefix: 'upper_whisker_', titlePrefix: 'Upper Whisker'},
- {fieldPrefix: 'lower_whisker_', titlePrefix: 'Lower Whisker'}
- ],
- continuousAxisChannelDef,
- encodingWithoutContinuousAxis
- );
+ const whiskerTooltipEncoding: Encoding<string> = boxPlotType === 'min-max'
+ ? fiveSummaryTooltipEncoding // for min-max, show five-summary tooltip for whisker
+ : // for tukey / k-IQR, just show upper/lower-whisker
+ getCompositeMarkTooltip(
+ [
+ {fieldPrefix: 'upper_whisker_', titlePrefix: 'Upper Whisker'},
+ {fieldPrefix: 'lower_whisker_', titlePrefix: 'Lower Whisker'}
+ ],
+ continuousAxisChannelDef,
+ encodingWithoutContinuousAxis
+ );
const whiskerLayers = [
...makeBoxPlotExtent({
@@ -375,24 +374,23 @@ function boxParams(
}
];
- const postAggregateCalculates: CalculateTransform[] =
- boxPlotType === 'min-max' || boxPlotType === 'tukey'
- ? []
- : [
- // This is for the original k-IQR, which we do not expose
- {
- calculate: `datum["upper_box_${continuousFieldName}"] - datum["lower_box_${continuousFieldName}"]`,
- as: `iqr_${continuousFieldName}`
- },
- {
- calculate: `min(datum["upper_box_${continuousFieldName}"] + datum["iqr_${continuousFieldName}"] * ${extent}, datum["max_${continuousFieldName}"])`,
- as: `upper_whisker_${continuousFieldName}`
- },
- {
- calculate: `max(datum["lower_box_${continuousFieldName}"] - datum["iqr_${continuousFieldName}"] * ${extent}, datum["min_${continuousFieldName}"])`,
- as: `lower_whisker_${continuousFieldName}`
- }
- ];
+ const postAggregateCalculates: CalculateTransform[] = boxPlotType === 'min-max' || boxPlotType === 'tukey'
+ ? []
+ : [
+ // This is for the original k-IQR, which we do not expose
+ {
+ calculate: `datum["upper_box_${continuousFieldName}"] - datum["lower_box_${continuousFieldName}"]`,
+ as: `iqr_${continuousFieldName}`
+ },
+ {
+ calculate: `min(datum["upper_box_${continuousFieldName}"] + datum["iqr_${continuousFieldName}"] * ${extent}, datum["max_${continuousFieldName}"])`,
+ as: `upper_whisker_${continuousFieldName}`
+ },
+ {
+ calculate: `max(datum["lower_box_${continuousFieldName}"] - datum["iqr_${continuousFieldName}"] * ${extent}, datum["min_${continuousFieldName}"])`,
+ as: `lower_whisker_${continuousFieldName}`
+ }
+ ];
const {[continuousAxis]: oldContinuousAxisChannelDef, ...oldEncodingWithoutContinuousAxis} = spec.encoding;
const {customTooltipWithoutAggregatedField, filteredEncoding} = filterTooltipWithAggregatedField(
diff --git ORI/vega-lite/test/normalize/core.test.ts ALT/vega-lite/test/normalize/core.test.ts
index 419ef6d..8c1d491 100644
--- ORI/vega-lite/test/normalize/core.test.ts
+++ ALT/vega-lite/test/normalize/core.test.ts
@@ -87,12 +87,11 @@ describe('normalize()', () => {
};
const config = initConfig(spec.config);
- const expectedFacet =
- channel === 'facet'
- ? fieldDef
- : {
- [channel]: fieldDef
- };
+ const expectedFacet = channel === 'facet'
+ ? fieldDef
+ : {
+ [channel]: fieldDef
+ };
expect(normalize(spec, config)).toEqual({
name: 'faceted', |
|
Run #12087 |
|
prettier/prettier#12087 VS prettier/prettier@main :: babel/babel@4e0e5f9 Diff (316 lines)diff --git ORI/babel/packages/babel-parser/src/parser/expression.js ALT/babel/packages/babel-parser/src/parser/expression.js
index bb37f6a8..5ebd93b4 100644
--- ORI/babel/packages/babel-parser/src/parser/expression.js
+++ ALT/babel/packages/babel-parser/src/parser/expression.js
@@ -1395,12 +1395,11 @@ export default class ExpressionParser extends LValParser {
// Determine the node type for the topic reference
// that is appropriate for the active pipe-operator proposal.
- const nodeType =
- pipeProposal === "smart"
- ? "PipelinePrimaryTopicReference"
- : // The proposal must otherwise be "hack",
- // as enforced by testTopicReferenceConfiguration.
- "TopicReference";
+ const nodeType = pipeProposal === "smart"
+ ? "PipelinePrimaryTopicReference"
+ : // The proposal must otherwise be "hack",
+ // as enforced by testTopicReferenceConfiguration.
+ "TopicReference";
if (!this.topicReferenceIsAllowedInCurrentContext()) {
this.raise(
@@ -2469,11 +2468,12 @@ export default class ExpressionParser extends LValParser {
// This logic is here to align the error location with the ESTree plugin.
const errorOrigin =
// $FlowIgnore
- (node.kind === "method" || node.kind === "constructor") &&
- // $FlowIgnore
- !!node.key
- ? { at: node.key.loc.end }
- : { node };
+
+ (node.kind === "method" || node.kind === "constructor") &&
+ // $FlowIgnore
+ !!node.key
+ ? { at: node.key.loc.end }
+ : { node };
this.raise(Errors.IllegalLanguageModeDirective, errorOrigin);
}
diff --git ORI/babel/packages/babel-parser/src/parser/statement.js ALT/babel/packages/babel-parser/src/parser/statement.js
index 0f7cbec4..ffb9b4a0 100644
--- ORI/babel/packages/babel-parser/src/parser/statement.js
+++ ALT/babel/packages/babel-parser/src/parser/statement.js
@@ -1854,16 +1854,15 @@ export default class StatementParser extends ExpressionParser {
);
classBody.body.push(node);
- const kind =
- node.kind === "get"
- ? node.static
- ? CLASS_ELEMENT_STATIC_GETTER
- : CLASS_ELEMENT_INSTANCE_GETTER
- : node.kind === "set"
- ? node.static
- ? CLASS_ELEMENT_STATIC_SETTER
- : CLASS_ELEMENT_INSTANCE_SETTER
- : CLASS_ELEMENT_OTHER;
+ const kind = node.kind === "get"
+ ? node.static
+ ? CLASS_ELEMENT_STATIC_GETTER
+ : CLASS_ELEMENT_INSTANCE_GETTER
+ : node.kind === "set"
+ ? node.static
+ ? CLASS_ELEMENT_STATIC_SETTER
+ : CLASS_ELEMENT_INSTANCE_SETTER
+ : CLASS_ELEMENT_OTHER;
this.declareClassPrivateMethodInScope(node, kind);
}
@@ -2241,8 +2240,9 @@ export default class StatementParser extends ExpressionParser {
// Named exports
for (const specifier of node.specifiers) {
const { exported } = specifier;
- const exportedName =
- exported.type === "Identifier" ? exported.name : exported.value;
+ const exportedName = exported.type === "Identifier"
+ ? exported.name
+ : exported.value;
this.checkDuplicateExports(specifier, exportedName);
// $FlowIgnore
if (!isFrom && specifier.local) {
diff --git ORI/babel/packages/babel-parser/src/parser/util.js ALT/babel/packages/babel-parser/src/parser/util.js
index f9bad51b..c51909e1 100644
--- ORI/babel/packages/babel-parser/src/parser/util.js
+++ ALT/babel/packages/babel-parser/src/parser/util.js
@@ -175,10 +175,9 @@ export default class UtilParser extends Tokenizer {
{
code: ErrorCodes.SyntaxError,
reasonCode: "UnexpectedToken",
- template:
- type != null
- ? `Unexpected token, expected "${tokenLabelName(type)}"`
- : "Unexpected token",
+ template: type != null
+ ? `Unexpected token, expected "${tokenLabelName(type)}"`
+ : "Unexpected token",
},
{ at: loc != null ? loc : this.state.startLoc },
);
diff --git ORI/babel/packages/babel-parser/src/plugin-utils.js ALT/babel/packages/babel-parser/src/plugin-utils.js
index d0ed132b..46990f25 100644
--- ORI/babel/packages/babel-parser/src/plugin-utils.js
+++ ALT/babel/packages/babel-parser/src/plugin-utils.js
@@ -21,8 +21,9 @@ export function hasPlugin(
// The expectedOptions object is by default an empty object if the given
// expectedConfig argument does not give an options object (i.e., if it is a
// string).
- const [expectedName, expectedOptions] =
- typeof expectedConfig === "string" ? [expectedConfig, {}] : expectedConfig;
+ const [expectedName, expectedOptions] = typeof expectedConfig === "string"
+ ? [expectedConfig, {}]
+ : expectedConfig;
const expectedKeys = Object.keys(expectedOptions);
diff --git ORI/babel/packages/babel-parser/src/plugins/jsx/index.js ALT/babel/packages/babel-parser/src/plugins/jsx/index.js
index 257fb76e..422f7d46 100644
--- ORI/babel/packages/babel-parser/src/plugins/jsx/index.js
+++ ALT/babel/packages/babel-parser/src/plugins/jsx/index.js
@@ -116,8 +116,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
case charCodes.greaterThan:
case charCodes.rightCurlyBrace:
if (process.env.BABEL_8_BREAKING) {
- const htmlEntity =
- ch === charCodes.rightCurlyBrace ? "}" : ">";
+ const htmlEntity = ch === charCodes.rightCurlyBrace
+ ? "}"
+ : ">";
const char = this.input[this.state.pos];
this.raise(
{
diff --git ORI/babel/packages/babel-parser/src/plugins/typescript/index.js ALT/babel/packages/babel-parser/src/plugins/typescript/index.js
index fae6d2fb..5dd76b64 100644
--- ORI/babel/packages/babel-parser/src/plugins/typescript/index.js
+++ ALT/babel/packages/babel-parser/src/plugins/typescript/index.js
@@ -1100,12 +1100,11 @@ export default (superClass: Class<Parser>): Class<Parser> =>
type === tt._void ||
type === tt._null
) {
- const nodeType =
- type === tt._void
- ? "TSVoidKeyword"
- : type === tt._null
- ? "TSNullKeyword"
- : keywordTypeFromName(this.state.value);
+ const nodeType = type === tt._void
+ ? "TSVoidKeyword"
+ : type === tt._null
+ ? "TSNullKeyword"
+ : keywordTypeFromName(this.state.value);
if (
nodeType !== undefined &&
this.lookaheadCharCode() !== charCodes.dot
@@ -2081,12 +2080,11 @@ export default (superClass: Class<Parser>): Class<Parser> =>
node.returnType = this.tsParseTypeOrTypePredicateAnnotation(tt.colon);
}
- const bodilessType =
- type === "FunctionDeclaration"
- ? "TSDeclareFunction"
- : type === "ClassMethod" || type === "ClassPrivateMethod"
- ? "TSDeclareMethod"
- : undefined;
+ const bodilessType = type === "FunctionDeclaration"
+ ? "TSDeclareFunction"
+ : type === "ClassMethod" || type === "ClassPrivateMethod"
+ ? "TSDeclareMethod"
+ : undefined;
if (bodilessType && !this.match(tt.braceL) && this.isLineTerminator()) {
this.finishNode(node, bodilessType);
return;
@@ -2595,10 +2593,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
node: N.ExpressionStatement,
expr: N.Expression,
): N.Statement {
- const decl =
- expr.type === "Identifier"
- ? this.tsParseExpressionStatement(node, expr)
- : undefined;
+ const decl = expr.type === "Identifier"
+ ? this.tsParseExpressionStatement(node, expr)
+ : undefined;
return decl || super.parseExpressionStatement(node, expr);
}
diff --git ORI/babel/packages/babel-parser/src/tokenizer/index.js ALT/babel/packages/babel-parser/src/tokenizer/index.js
index 075ccb96..beb295f1 100644
--- ORI/babel/packages/babel-parser/src/tokenizer/index.js
+++ ALT/babel/packages/babel-parser/src/tokenizer/index.js
@@ -809,8 +809,9 @@ export default class Tokenizer extends ParserErrors {
const next = this.input.charCodeAt(pos + 1);
if (next === charCodes.greaterThan) {
- const size =
- this.input.charCodeAt(pos + 2) === charCodes.greaterThan ? 3 : 2;
+ const size = this.input.charCodeAt(pos + 2) === charCodes.greaterThan
+ ? 3
+ : 2;
if (this.input.charCodeAt(pos + size) === charCodes.equalsTo) {
this.finishOp(tt.assign, size + 1);
return;
@@ -1177,18 +1178,16 @@ export default class Tokenizer extends ParserErrors {
allowNumSeparator: boolean = true,
): number | null {
const start = this.state.pos;
- const forbiddenSiblings =
- radix === 16
- ? forbiddenNumericSeparatorSiblings.hex
- : forbiddenNumericSeparatorSiblings.decBinOct;
- const allowedSiblings =
- radix === 16
- ? allowedNumericSeparatorSiblings.hex
- : radix === 10
- ? allowedNumericSeparatorSiblings.dec
- : radix === 8
- ? allowedNumericSeparatorSiblings.oct
- : allowedNumericSeparatorSiblings.bin;
+ const forbiddenSiblings = radix === 16
+ ? forbiddenNumericSeparatorSiblings.hex
+ : forbiddenNumericSeparatorSiblings.decBinOct;
+ const allowedSiblings = radix === 16
+ ? allowedNumericSeparatorSiblings.hex
+ : radix === 10
+ ? allowedNumericSeparatorSiblings.dec
+ : radix === 8
+ ? allowedNumericSeparatorSiblings.oct
+ : allowedNumericSeparatorSiblings.bin;
let invalid = false;
let total = 0;
@@ -1688,8 +1687,9 @@ export default class Tokenizer extends ParserErrors {
word += this.input.slice(chunkStart, this.state.pos);
const escStart = this.state.curPosition();
- const identifierCheck =
- this.state.pos === start ? isIdentifierStart : isIdentifierChar;
+ const identifierCheck = this.state.pos === start
+ ? isIdentifierStart
+ : isIdentifierChar;
if (this.input.charCodeAt(++this.state.pos) !== charCodes.lowercaseU) {
this.raise(Errors.MissingUnicodeEscape, {
diff --git ORI/babel/packages/babel-parser/src/tokenizer/state.js ALT/babel/packages/babel-parser/src/tokenizer/state.js
index ac9a0418..1105ca79 100644
--- ORI/babel/packages/babel-parser/src/tokenizer/state.js
+++ ALT/babel/packages/babel-parser/src/tokenizer/state.js
@@ -33,12 +33,11 @@ export default class State {
endLoc: Position;
init({ strictMode, sourceType, startLine, startColumn }: Options): void {
- this.strict =
- strictMode === false
- ? false
- : strictMode === true
- ? true
- : sourceType === "module";
+ this.strict = strictMode === false
+ ? false
+ : strictMode === true
+ ? true
+ : sourceType === "module";
this.curLine = startLine;
this.lineStart = -startColumn;
diff --git ORI/babel/packages/babel-parser/test/helpers/to-fuzzed-options.js ALT/babel/packages/babel-parser/test/helpers/to-fuzzed-options.js
index 4ed5de83..a3db4fb8 100644
--- ORI/babel/packages/babel-parser/test/helpers/to-fuzzed-options.js
+++ ALT/babel/packages/babel-parser/test/helpers/to-fuzzed-options.js
@@ -75,10 +75,9 @@ export default function toFuzzedOptions(options) {
// Make sure to include the original options in our set as well if the user
// is wanting to test a specific start position.
- const totalOptions =
- startLine !== 1 || startColumn !== 0
- ? [options, ...fuzzedOptions]
- : fuzzedOptions;
+ const totalOptions = startLine !== 1 || startColumn !== 0
+ ? [options, ...fuzzedOptions]
+ : fuzzedOptions;
// The last step is to create our fuzzing function for traversing the resulting AST.
// This allows us to efficiently try these different options without having to modify
diff --git ORI/babel/packages/babel-traverse/test/scope.js ALT/babel/packages/babel-traverse/test/scope.js
index e5c2dfaa..488c92a9 100644
--- ORI/babel/packages/babel-traverse/test/scope.js
+++ ALT/babel/packages/babel-traverse/test/scope.js
@@ -5,8 +5,9 @@ import _traverse, { NodePath } from "../lib/index.js";
const traverse = _traverse.default;
function getPath(code, options) {
- const ast =
- typeof code === "string" ? parse(code, options) : createNode(code);
+ const ast = typeof code === "string"
+ ? parse(code, options)
+ : createNode(code);
let path;
traverse(ast, {
Program: function (_path) {
diff --git ORI/babel/packages/babel-types/scripts/generators/typescript-legacy.js ALT/babel/packages/babel-types/scripts/generators/typescript-legacy.js
index 40da48f4..918745df 100644
--- ORI/babel/packages/babel-types/scripts/generators/typescript-legacy.js
+++ ALT/babel/packages/babel-types/scripts/generators/typescript-legacy.js
@@ -122,10 +122,9 @@ for (const typeName of t.TYPES) {
const isDeprecated = !!t.DEPRECATED_KEYS[typeName];
const realName = isDeprecated ? t.DEPRECATED_KEYS[typeName] : typeName;
- const result =
- t.NODE_FIELDS[realName] || t.FLIPPED_ALIAS_KEYS[realName]
- ? `node is ${realName}`
- : "boolean";
+ const result = t.NODE_FIELDS[realName] || t.FLIPPED_ALIAS_KEYS[realName]
+ ? `node is ${realName}`
+ : "boolean";
if (isDeprecated) {
lines.push(`/** @deprecated Use \`is${realName}\` */`); |
|
prettier/prettier#12087 VS prettier/prettier@main :: vuejs/eslint-plugin-vue@508ea0e Diff (740 lines)diff --git ORI/eslint-plugin-vue/lib/rules/block-tag-newline.js ALT/eslint-plugin-vue/lib/rules/block-tag-newline.js
index c88a36c..f721777 100644
--- ORI/eslint-plugin-vue/lib/rules/block-tag-newline.js
+++ ALT/eslint-plugin-vue/lib/rules/block-tag-newline.js
@@ -256,12 +256,11 @@ module.exports = {
return
}
- const option =
- options.multiline === options.singleline
- ? options.singleline
- : /[\n\r\u2028\u2029]/u.test(text.trim())
- ? options.multiline
- : options.singleline
+ const option = options.multiline === options.singleline
+ ? options.singleline
+ : /[\n\r\u2028\u2029]/u.test(text.trim())
+ ? options.multiline
+ : options.singleline
if (option === 'ignore') {
return
}
@@ -335,10 +334,9 @@ module.exports = {
normalizeOptionValue({
singleline: elementsOptions.singleline || options.singleline,
multiline: elementsOptions.multiline || options.multiline,
- maxEmptyLines:
- elementsOptions.maxEmptyLines != null
- ? elementsOptions.maxEmptyLines
- : options.maxEmptyLines
+ maxEmptyLines: elementsOptions.maxEmptyLines != null
+ ? elementsOptions.maxEmptyLines
+ : options.maxEmptyLines
})(element)
}
}
diff --git ORI/eslint-plugin-vue/lib/rules/component-definition-name-casing.js ALT/eslint-plugin-vue/lib/rules/component-definition-name-casing.js
index 8e192df..24e381c 100644
--- ORI/eslint-plugin-vue/lib/rules/component-definition-name-casing.js
+++ ALT/eslint-plugin-vue/lib/rules/component-definition-name-casing.js
@@ -30,8 +30,9 @@ module.exports = {
/** @param {RuleContext} context */
create(context) {
const options = context.options[0]
- const caseType =
- allowedCaseOptions.indexOf(options) !== -1 ? options : 'PascalCase'
+ const caseType = allowedCaseOptions.indexOf(options) !== -1
+ ? options
+ : 'PascalCase'
// ----------------------------------------------------------------------
// Public
diff --git ORI/eslint-plugin-vue/lib/rules/component-name-in-template-casing.js ALT/eslint-plugin-vue/lib/rules/component-name-in-template-casing.js
index b2f60a6..4cd6961 100644
--- ORI/eslint-plugin-vue/lib/rules/component-name-in-template-casing.js
+++ ALT/eslint-plugin-vue/lib/rules/component-name-in-template-casing.js
@@ -58,8 +58,9 @@ module.exports = {
create(context) {
const caseOption = context.options[0]
const options = context.options[1] || {}
- const caseType =
- allowedCaseOptions.indexOf(caseOption) !== -1 ? caseOption : defaultCase
+ const caseType = allowedCaseOptions.indexOf(caseOption) !== -1
+ ? caseOption
+ : defaultCase
/** @type {RegExp[]} */
const ignores = (options.ignores || []).map(toRegExp)
const registeredComponentsOnly = options.registeredComponentsOnly !== false
diff --git ORI/eslint-plugin-vue/lib/rules/html-closing-bracket-newline.js ALT/eslint-plugin-vue/lib/rules/html-closing-bracket-newline.js
index 6963de8..f6bc88e 100644
--- ORI/eslint-plugin-vue/lib/rules/html-closing-bracket-newline.js
+++ ALT/eslint-plugin-vue/lib/rules/html-closing-bracket-newline.js
@@ -80,10 +80,9 @@ module.exports = {
}
const prevToken = template.getTokenBefore(closingBracketToken)
- const type =
- node.loc.start.line === prevToken.loc.end.line
- ? 'singleline'
- : 'multiline'
+ const type = node.loc.start.line === prevToken.loc.end.line
+ ? 'singleline'
+ : 'multiline'
const expectedLineBreaks = options[type] === 'always' ? 1 : 0
const actualLineBreaks =
closingBracketToken.loc.start.line - prevToken.loc.end.line
diff --git ORI/eslint-plugin-vue/lib/rules/html-comment-content-newline.js ALT/eslint-plugin-vue/lib/rules/html-comment-content-newline.js
index 3985f7d..41c17f8 100644
--- ORI/eslint-plugin-vue/lib/rules/html-comment-content-newline.js
+++ ALT/eslint-plugin-vue/lib/rules/html-comment-content-newline.js
@@ -108,8 +108,9 @@ module.exports = {
const endLine = closeDecoration
? closeDecoration.loc.start.line
: value.loc.end.line
- const newlineType =
- startLine === endLine ? option.singleline : option.multiline
+ const newlineType = startLine === endLine
+ ? option.singleline
+ : option.multiline
if (newlineType === 'ignore') {
return
}
diff --git ORI/eslint-plugin-vue/lib/rules/html-comment-indent.js ALT/eslint-plugin-vue/lib/rules/html-comment-indent.js
index d5992b5..6b0ef3f 100644
--- ORI/eslint-plugin-vue/lib/rules/html-comment-indent.js
+++ ALT/eslint-plugin-vue/lib/rules/html-comment-indent.js
@@ -112,8 +112,9 @@ module.exports = {
const startLine = comment.value.loc.start.line
endLine = comment.value.loc.end.line
- const checkStartLine =
- comment.open.loc.end.line === startLine ? startLine + 1 : startLine
+ const checkStartLine = comment.open.loc.end.line === startLine
+ ? startLine + 1
+ : startLine
for (let line = checkStartLine; line <= endLine; line++) {
validateIndentForLine(line, baseIndentText, 1)
diff --git ORI/eslint-plugin-vue/lib/rules/html-quotes.js ALT/eslint-plugin-vue/lib/rules/html-quotes.js
index 9f741b2..98fe62d 100644
--- ORI/eslint-plugin-vue/lib/rules/html-quotes.js
+++ ALT/eslint-plugin-vue/lib/rules/html-quotes.js
@@ -77,7 +77,9 @@ module.exports = {
const contentText = quoted ? text.slice(1, -1) : text
const fixToDouble =
- avoidEscape && !quoted && contentText.includes(quoteChar)
+ avoidEscape &&
+ !quoted &&
+ contentText.includes(quoteChar)
? double
? contentText.includes("'")
: !contentText.includes('"')
diff --git ORI/eslint-plugin-vue/lib/rules/max-len.js ALT/eslint-plugin-vue/lib/rules/max-len.js
index a5cf396..c42c8ec 100644
--- ORI/eslint-plugin-vue/lib/rules/max-len.js
+++ ALT/eslint-plugin-vue/lib/rules/max-len.js
@@ -257,8 +257,9 @@ module.exports = {
/** @type {number} */
const tabWidth = typeof options.tabWidth === 'number' ? options.tabWidth : 2 // default value of `vue/html-indent`
/** @type {number} */
- const templateMaxLength =
- typeof options.template === 'number' ? options.template : scriptMaxLength
+ const templateMaxLength = typeof options.template === 'number'
+ ? options.template
+ : scriptMaxLength
const ignoreComments = !!options.ignoreComments
const ignoreStrings = !!options.ignoreStrings
const ignoreTemplateLiterals = !!options.ignoreTemplateLiterals
@@ -442,12 +443,11 @@ module.exports = {
// out of range.
return
}
- const maxLength =
- inScript && inTemplate
- ? Math.max(scriptMaxLength, templateMaxLength)
- : inScript
- ? scriptMaxLength
- : templateMaxLength
+ const maxLength = inScript && inTemplate
+ ? Math.max(scriptMaxLength, templateMaxLength)
+ : inScript
+ ? scriptMaxLength
+ : templateMaxLength
if (
(ignoreStrings && stringsByLine[lineNumber]) ||
diff --git ORI/eslint-plugin-vue/lib/rules/name-property-casing.js ALT/eslint-plugin-vue/lib/rules/name-property-casing.js
index 29c100d..3c1f50b 100644
--- ORI/eslint-plugin-vue/lib/rules/name-property-casing.js
+++ ALT/eslint-plugin-vue/lib/rules/name-property-casing.js
@@ -33,8 +33,9 @@ module.exports = {
/** @param {RuleContext} context */
create(context) {
const options = context.options[0]
- const caseType =
- allowedCaseOptions.indexOf(options) !== -1 ? options : 'PascalCase'
+ const caseType = allowedCaseOptions.indexOf(options) !== -1
+ ? options
+ : 'PascalCase'
// ----------------------------------------------------------------------
// Public
diff --git ORI/eslint-plugin-vue/lib/rules/no-deprecated-events-api.js ALT/eslint-plugin-vue/lib/rules/no-deprecated-events-api.js
index f393f59..bce073b 100644
--- ORI/eslint-plugin-vue/lib/rules/no-deprecated-events-api.js
+++ ALT/eslint-plugin-vue/lib/rules/no-deprecated-events-api.js
@@ -36,10 +36,9 @@ module.exports = {
'CallExpression > MemberExpression, CallExpression > ChainExpression > MemberExpression'(
node
) {
- const call =
- node.parent.type === 'ChainExpression'
- ? node.parent.parent
- : node.parent
+ const call = node.parent.type === 'ChainExpression'
+ ? node.parent.parent
+ : node.parent
if (call.optional) {
// It is OK because checking whether it is deprecated.
diff --git ORI/eslint-plugin-vue/lib/rules/no-expose-after-await.js ALT/eslint-plugin-vue/lib/rules/no-expose-after-await.js
index e1e3104..05135c6 100644
--- ORI/eslint-plugin-vue/lib/rules/no-expose-after-await.js
+++ ALT/eslint-plugin-vue/lib/rules/no-expose-after-await.js
@@ -99,10 +99,9 @@ module.exports = {
}
const exposeParam = exposeProperty.value
// `setup(props, {emit})`
- const variable =
- exposeParam.type === 'Identifier'
- ? findVariable(context.getScope(), exposeParam)
- : null
+ const variable = exposeParam.type === 'Identifier'
+ ? findVariable(context.getScope(), exposeParam)
+ : null
if (!variable) {
return
}
diff --git ORI/eslint-plugin-vue/lib/rules/no-extra-parens.js ALT/eslint-plugin-vue/lib/rules/no-extra-parens.js
index b193a0e..520477c 100644
--- ORI/eslint-plugin-vue/lib/rules/no-extra-parens.js
+++ ALT/eslint-plugin-vue/lib/rules/no-extra-parens.js
@@ -141,10 +141,9 @@ function createForVueSyntax(context) {
return
}
- const expression =
- node.expression.type === 'VFilterSequenceExpression'
- ? node.expression.expression
- : node.expression
+ const expression = node.expression.type === 'VFilterSequenceExpression'
+ ? node.expression.expression
+ : node.expression
if (!isParenthesized(expression, tokenStore)) {
return
diff --git ORI/eslint-plugin-vue/lib/rules/no-restricted-v-bind.js ALT/eslint-plugin-vue/lib/rules/no-restricted-v-bind.js
index 3cc46e7..e9ff6ff 100644
--- ORI/eslint-plugin-vue/lib/rules/no-restricted-v-bind.js
+++ ALT/eslint-plugin-vue/lib/rules/no-restricted-v-bind.js
@@ -166,10 +166,9 @@ module.exports = {
*/
function defaultMessage(key, option) {
const vbind = key.name.rawName === ':' ? '' : 'v-bind'
- const arg =
- key.argument != null && key.argument.type === 'VIdentifier'
- ? `:${key.argument.rawName}`
- : ''
+ const arg = key.argument != null && key.argument.type === 'VIdentifier'
+ ? `:${key.argument.rawName}`
+ : ''
const mod = option.modifiers.length
? `.${option.modifiers.join('.')}`
: ''
diff --git ORI/eslint-plugin-vue/lib/rules/no-undef-properties.js ALT/eslint-plugin-vue/lib/rules/no-undef-properties.js
index 4246f77..d411a7b 100644
--- ORI/eslint-plugin-vue/lib/rules/no-undef-properties.js
+++ ALT/eslint-plugin-vue/lib/rules/no-undef-properties.js
@@ -69,10 +69,9 @@ function getPropertyDataFromObjectProperty(property) {
if (property == null) {
return null
}
- const propertyMap =
- property.value.type === 'ObjectExpression'
- ? getObjectPropertyMap(property.value)
- : null
+ const propertyMap = property.value.type === 'ObjectExpression'
+ ? getObjectPropertyMap(property.value)
+ : null
return {
hasNestProperty: Boolean(propertyMap),
get(name) {
diff --git ORI/eslint-plugin-vue/lib/rules/no-unused-vars.js ALT/eslint-plugin-vue/lib/rules/no-unused-vars.js
index 517480a..667d500 100644
--- ORI/eslint-plugin-vue/lib/rules/no-unused-vars.js
+++ ALT/eslint-plugin-vue/lib/rules/no-unused-vars.js
@@ -125,20 +125,19 @@ module.exports = {
data: {
name: variable.id.name
},
- suggest:
- ignorePattern === '^_'
- ? [
- {
- desc: `Replace the ${variable.id.name} with _${variable.id.name}`,
- fix(fixer) {
- return fixer.replaceText(
- variable.id,
- `_${variable.id.name}`
- )
- }
+ suggest: ignorePattern === '^_'
+ ? [
+ {
+ desc: `Replace the ${variable.id.name} with _${variable.id.name}`,
+ fix(fixer) {
+ return fixer.replaceText(
+ variable.id,
+ `_${variable.id.name}`
+ )
}
- ]
- : []
+ }
+ ]
+ : []
})
}
}
diff --git ORI/eslint-plugin-vue/lib/rules/no-use-v-if-with-v-for.js ALT/eslint-plugin-vue/lib/rules/no-use-v-if-with-v-for.js
index 3d48d10..b4cb910 100644
--- ORI/eslint-plugin-vue/lib/rules/no-use-v-if-with-v-for.js
+++ ALT/eslint-plugin-vue/lib/rules/no-use-v-if-with-v-for.js
@@ -95,14 +95,12 @@ module.exports = {
message:
"The '{{iteratorName}}' {{kind}} inside 'v-for' directive should be replaced with a computed property that returns filtered array instead. You should not mix 'v-for' with 'v-if'.",
data: {
- iteratorName:
- iteratorNode.type === 'Identifier'
- ? iteratorNode.name
- : context.getSourceCode().getText(iteratorNode),
- kind:
- iteratorNode.type === 'Identifier'
- ? 'variable'
- : 'expression'
+ iteratorName: iteratorNode.type === 'Identifier'
+ ? iteratorNode.name
+ : context.getSourceCode().getText(iteratorNode),
+ kind: iteratorNode.type === 'Identifier'
+ ? 'variable'
+ : 'expression'
}
})
}
diff --git ORI/eslint-plugin-vue/lib/rules/prefer-separate-static-class.js ALT/eslint-plugin-vue/lib/rules/prefer-separate-static-class.js
index 0ebeb24..a2d8699 100644
--- ORI/eslint-plugin-vue/lib/rules/prefer-separate-static-class.js
+++ ALT/eslint-plugin-vue/lib/rules/prefer-separate-static-class.js
@@ -127,10 +127,9 @@ module.exports = {
const staticClassNameNodes = findStaticClasses(expressionNode)
for (const staticClassNameNode of staticClassNameNodes) {
- const className =
- staticClassNameNode.type === 'Identifier'
- ? staticClassNameNode.name
- : getStringLiteralValue(staticClassNameNode, true)
+ const className = staticClassNameNode.type === 'Identifier'
+ ? staticClassNameNode.name
+ : getStringLiteralValue(staticClassNameNode, true)
if (className === null) {
continue
@@ -166,10 +165,9 @@ module.exports = {
listNode.type === 'ArrayExpression' ||
listNode.type === 'ObjectExpression'
) {
- const elements =
- listNode.type === 'ObjectExpression'
- ? listNode.properties
- : listNode.elements
+ const elements = listNode.type === 'ObjectExpression'
+ ? listNode.properties
+ : listNode.elements
if (elements.length === 1 && listNode === expressionNode) {
yield fixer.remove(attributeNode)
diff --git ORI/eslint-plugin-vue/lib/rules/prop-name-casing.js ALT/eslint-plugin-vue/lib/rules/prop-name-casing.js
index 916dff0..b947c05 100644
--- ORI/eslint-plugin-vue/lib/rules/prop-name-casing.js
+++ ALT/eslint-plugin-vue/lib/rules/prop-name-casing.js
@@ -18,8 +18,9 @@ const allowedCaseOptions = ['camelCase', 'snake_case']
/** @param {RuleContext} context */
function create(context) {
const options = context.options[0]
- const caseType =
- allowedCaseOptions.indexOf(options) !== -1 ? options : 'camelCase'
+ const caseType = allowedCaseOptions.indexOf(options) !== -1
+ ? options
+ : 'camelCase'
const checker = casing.getChecker(caseType)
// ----------------------------------------------------------------------
diff --git ORI/eslint-plugin-vue/lib/rules/require-default-prop.js ALT/eslint-plugin-vue/lib/rules/require-default-prop.js
index 7cfdc7e..1a10550 100644
--- ORI/eslint-plugin-vue/lib/rules/require-default-prop.js
+++ ALT/eslint-plugin-vue/lib/rules/require-default-prop.js
@@ -157,10 +157,9 @@ module.exports = {
if (isBooleanProp(prop)) {
continue
}
- const propName =
- prop.propName != null
- ? prop.propName
- : `[${context.getSourceCode().getText(prop.node.key)}]`
+ const propName = prop.propName != null
+ ? prop.propName
+ : `[${context.getSourceCode().getText(prop.node.key)}]`
context.report({
node: prop.node,
diff --git ORI/eslint-plugin-vue/lib/rules/require-explicit-emits.js ALT/eslint-plugin-vue/lib/rules/require-explicit-emits.js
index aa83b88..0749c6d 100644
--- ORI/eslint-plugin-vue/lib/rules/require-explicit-emits.js
+++ ALT/eslint-plugin-vue/lib/rules/require-explicit-emits.js
@@ -133,10 +133,9 @@ module.exports = {
messageId: 'missing',
data: {
name,
- emitsKind:
- vueDefineNode.type === 'ObjectExpression'
- ? '`emits` option'
- : '`defineEmits`'
+ emitsKind: vueDefineNode.type === 'ObjectExpression'
+ ? '`emits` option'
+ : '`defineEmits`'
},
suggest: buildSuggest(vueDefineNode, emits, nameLiteralNode, context)
})
@@ -270,10 +269,9 @@ module.exports = {
}
const emitParam = node.parent.id
- const variable =
- emitParam.type === 'Identifier'
- ? findVariable(context.getScope(), emitParam)
- : null
+ const variable = emitParam.type === 'Identifier'
+ ? findVariable(context.getScope(), emitParam)
+ : null
if (!variable) {
return
}
@@ -346,10 +344,9 @@ module.exports = {
}
const emitParam = emitProperty.value
// `setup(props, {emit})`
- const variable =
- emitParam.type === 'Identifier'
- ? findVariable(context.getScope(), emitParam)
- : null
+ const variable = emitParam.type === 'Identifier'
+ ? findVariable(context.getScope(), emitParam)
+ : null
if (!variable) {
return
}
@@ -417,8 +414,9 @@ module.exports = {
* @returns {Rule.SuggestionReportDescriptor[]}
*/
function buildSuggest(define, emits, nameNode, context) {
- const emitsKind =
- define.type === 'ObjectExpression' ? '`emits` option' : '`defineEmits`'
+ const emitsKind = define.type === 'ObjectExpression'
+ ? '`emits` option'
+ : '`defineEmits`'
const certainEmits = emits.filter((e) => e.key)
if (certainEmits.length) {
const last = certainEmits[certainEmits.length - 1]
diff --git ORI/eslint-plugin-vue/lib/rules/require-expose.js ALT/eslint-plugin-vue/lib/rules/require-expose.js
index 91ca589..1b94c07 100644
--- ORI/eslint-plugin-vue/lib/rules/require-expose.js
+++ ALT/eslint-plugin-vue/lib/rules/require-expose.js
@@ -171,10 +171,9 @@ module.exports = {
}
const exposeParam = exposeProperty.value
// `setup(props, {emit})`
- const variable =
- exposeParam.type === 'Identifier'
- ? findVariable(context.getScope(), exposeParam)
- : null
+ const variable = exposeParam.type === 'Identifier'
+ ? findVariable(context.getScope(), exposeParam)
+ : null
if (!variable) {
return
}
diff --git ORI/eslint-plugin-vue/lib/rules/require-prop-type-constructor.js ALT/eslint-plugin-vue/lib/rules/require-prop-type-constructor.js
index aa022fa..5054976 100644
--- ORI/eslint-plugin-vue/lib/rules/require-prop-type-constructor.js
+++ ALT/eslint-plugin-vue/lib/rules/require-prop-type-constructor.js
@@ -54,8 +54,9 @@ module.exports = {
*/
function checkPropertyNode(propName, node) {
/** @type {ESNode[]} */
- const nodes =
- node.type === 'ArrayExpression' ? node.elements.filter(isDef) : [node]
+ const nodes = node.type === 'ArrayExpression'
+ ? node.elements.filter(isDef)
+ : [node]
nodes
.filter((prop) => isForbiddenType(prop))
diff --git ORI/eslint-plugin-vue/lib/rules/require-valid-default-prop.js ALT/eslint-plugin-vue/lib/rules/require-valid-default-prop.js
index 21191e8..3efe2b3 100644
--- ORI/eslint-plugin-vue/lib/rules/require-valid-default-prop.js
+++ ALT/eslint-plugin-vue/lib/rules/require-valid-default-prop.js
@@ -227,10 +227,9 @@ module.exports = {
* @param {Iterable<string>} expectedTypeNames
*/
function report(node, prop, expectedTypeNames) {
- const propName =
- prop.propName != null
- ? prop.propName
- : `[${context.getSourceCode().getText(prop.node.key)}]`
+ const propName = prop.propName != null
+ ? prop.propName
+ : `[${context.getSourceCode().getText(prop.node.key)}]`
context.report({
node,
message:
diff --git ORI/eslint-plugin-vue/lib/rules/syntaxes/slot-attribute.js ALT/eslint-plugin-vue/lib/rules/syntaxes/slot-attribute.js
index 4cfe209..2e71bd5 100644
--- ORI/eslint-plugin-vue/lib/rules/syntaxes/slot-attribute.js
+++ ALT/eslint-plugin-vue/lib/rules/syntaxes/slot-attribute.js
@@ -79,10 +79,9 @@ module.exports = {
? `:[${slotName}]`
: `:${slotName}`
: ''
- const scopeValue =
- scopeAttr && scopeAttr.value
- ? `=${sourceCode.getText(scopeAttr.value)}`
- : ''
+ const scopeValue = scopeAttr && scopeAttr.value
+ ? `=${sourceCode.getText(scopeAttr.value)}`
+ : ''
const replaceText = `v-slot${nameArgument}${scopeValue}`
yield fixer.replaceText(slotAttr || scopeAttr, replaceText)
diff --git ORI/eslint-plugin-vue/lib/rules/syntaxes/slot-scope-attribute.js ALT/eslint-plugin-vue/lib/rules/syntaxes/slot-scope-attribute.js
index 53a54d6..1d80fa1 100644
--- ORI/eslint-plugin-vue/lib/rules/syntaxes/slot-scope-attribute.js
+++ ALT/eslint-plugin-vue/lib/rules/syntaxes/slot-scope-attribute.js
@@ -65,10 +65,9 @@ module.exports = {
* @returns {Fix} fix data
*/
function fixSlotScopeToVSlot(fixer, scopeAttr) {
- const scopeValue =
- scopeAttr && scopeAttr.value
- ? `=${sourceCode.getText(scopeAttr.value)}`
- : ''
+ const scopeValue = scopeAttr && scopeAttr.value
+ ? `=${sourceCode.getText(scopeAttr.value)}`
+ : ''
const replaceText = `v-slot${scopeValue}`
return fixer.replaceText(scopeAttr, replaceText)
diff --git ORI/eslint-plugin-vue/lib/rules/v-on-function-call.js ALT/eslint-plugin-vue/lib/rules/v-on-function-call.js
index 90da5ed..b2542f7 100644
--- ORI/eslint-plugin-vue/lib/rules/v-on-function-call.js
+++ ALT/eslint-plugin-vue/lib/rules/v-on-function-call.js
@@ -168,10 +168,9 @@ module.exports = {
? null /* The comment is included and cannot be fixed. */
: (fixer) => {
/** @type {Range} */
- const range =
- leftQuote && rightQuote
- ? [leftQuote.range[1], rightQuote.range[0]]
- : [tokens[0].range[0], tokens[tokens.length - 1].range[1]]
+ const range = leftQuote && rightQuote
+ ? [leftQuote.range[1], rightQuote.range[0]]
+ : [tokens[0].range[0], tokens[tokens.length - 1].range[1]]
return fixer.replaceTextRange(
range,
diff --git ORI/eslint-plugin-vue/lib/rules/valid-v-slot.js ALT/eslint-plugin-vue/lib/rules/valid-v-slot.js
index df0fa7c..1b900d3 100644
--- ORI/eslint-plugin-vue/lib/rules/valid-v-slot.js
+++ ALT/eslint-plugin-vue/lib/rules/valid-v-slot.js
@@ -295,8 +295,9 @@ module.exports = {
node.key.argument.name === 'default')
const element = node.parent.parent
const parentElement = element.parent
- const ownerElement =
- element.name === 'template' ? parentElement : element
+ const ownerElement = element.name === 'template'
+ ? parentElement
+ : element
if (ownerElement.type === 'VDocumentFragment') {
return
}
diff --git ORI/eslint-plugin-vue/lib/utils/html-comments.js ALT/eslint-plugin-vue/lib/utils/html-comments.js
index ec957af..66bd85a 100644
--- ORI/eslint-plugin-vue/lib/utils/html-comments.js
+++ ALT/eslint-plugin-vue/lib/utils/html-comments.js
@@ -134,8 +134,9 @@ function defineParser(sourceCode, config) {
const openDecorationText = getOpenDecoration(valueText)
valueText = valueText.slice(openDecorationText.length)
const firstCharIndex = valueText.search(/\S/)
- const beforeSpace =
- firstCharIndex >= 0 ? valueText.slice(0, firstCharIndex) : valueText
+ const beforeSpace = firstCharIndex >= 0
+ ? valueText.slice(0, firstCharIndex)
+ : valueText
valueText = valueText.slice(beforeSpace.length)
const closeDecorationText = getCloseDecoration(valueText)
@@ -143,8 +144,9 @@ function defineParser(sourceCode, config) {
valueText = valueText.slice(0, -closeDecorationText.length)
}
const lastCharIndex = valueText.search(/\S\s*$/)
- const afterSpace =
- lastCharIndex >= 0 ? valueText.slice(lastCharIndex + 1) : valueText
+ const afterSpace = lastCharIndex >= 0
+ ? valueText.slice(lastCharIndex + 1)
+ : valueText
if (afterSpace) {
valueText = valueText.slice(0, -afterSpace.length)
}
diff --git ORI/eslint-plugin-vue/lib/utils/indent-common.js ALT/eslint-plugin-vue/lib/utils/indent-common.js
index 020b637..f871d5a 100644
--- ORI/eslint-plugin-vue/lib/utils/indent-common.js
+++ ALT/eslint-plugin-vue/lib/utils/indent-common.js
@@ -1060,10 +1060,9 @@ module.exports.defineVisitor = function create(
options.alignAttributesVertically
)
if (closeToken != null && closeToken.type.endsWith('TagClose')) {
- const offset =
- closeToken.type !== 'HTMLSelfClosingTagClose'
- ? options.closeBracket.startTag
- : options.closeBracket.selfClosingTag
+ const offset = closeToken.type !== 'HTMLSelfClosingTagClose'
+ ? options.closeBracket.startTag
+ : options.closeBracket.selfClosingTag
setOffset(closeToken, offset, openToken)
}
},
@@ -1532,21 +1531,20 @@ module.exports.defineVisitor = function create(
const importToken = tokenStore.getFirstToken(node)
const tokens = tokenStore.getTokensBetween(importToken, node.source)
const fromIndex = tokens.map((t) => t.value).lastIndexOf('from')
- const { fromToken, beforeTokens, afterTokens } =
- fromIndex >= 0
- ? {
- fromToken: tokens[fromIndex],
- beforeTokens: tokens.slice(0, fromIndex),
- afterTokens: [
- ...tokens.slice(fromIndex + 1),
- tokenStore.getFirstToken(node.source)
- ]
- }
- : {
- fromToken: null,
- beforeTokens: [...tokens, tokenStore.getFirstToken(node.source)],
- afterTokens: []
- }
+ const { fromToken, beforeTokens, afterTokens } = fromIndex >= 0
+ ? {
+ fromToken: tokens[fromIndex],
+ beforeTokens: tokens.slice(0, fromIndex),
+ afterTokens: [
+ ...tokens.slice(fromIndex + 1),
+ tokenStore.getFirstToken(node.source)
+ ]
+ }
+ : {
+ fromToken: null,
+ beforeTokens: [...tokens, tokenStore.getFirstToken(node.source)],
+ afterTokens: []
+ }
/** @type {ImportSpecifier[]} */
const namedSpecifiers = []
diff --git ORI/eslint-plugin-vue/lib/utils/indent-ts.js ALT/eslint-plugin-vue/lib/utils/indent-ts.js
index 496e892..2f51cba 100644
--- ORI/eslint-plugin-vue/lib/utils/indent-ts.js
+++ ALT/eslint-plugin-vue/lib/utils/indent-ts.js
@@ -1059,10 +1059,9 @@ function defineVisitor({
['TSAbstractMethodDefinition, TSAbstractPropertyDefinition, TSEnumMember,' +
// Deprecated in @typescript-eslint/parser v5
'ClassProperty, TSAbstractClassProperty'](node) {
- const { keyNode, valueNode } =
- node.type === 'TSEnumMember'
- ? { keyNode: node.id, valueNode: node.initializer }
- : { keyNode: node.key, valueNode: node.value }
+ const { keyNode, valueNode } = node.type === 'TSEnumMember'
+ ? { keyNode: node.id, valueNode: node.initializer }
+ : { keyNode: node.key, valueNode: node.value }
const firstToken = tokenStore.getFirstToken(node)
const keyTokens = getFirstAndLastTokens(keyNode)
const prefixTokens = tokenStore.getTokensBetween(
diff --git ORI/eslint-plugin-vue/lib/utils/index.js ALT/eslint-plugin-vue/lib/utils/index.js
index 69cd84a..92e11ad 100644
--- ORI/eslint-plugin-vue/lib/utils/index.js
+++ ALT/eslint-plugin-vue/lib/utils/index.js
@@ -1206,8 +1206,9 @@ module.exports = {
'Program > VariableDeclaration > VariableDeclarator, Program > ExpressionStatement'
] = (node) => {
if (!candidateMacro) {
- candidateMacro =
- node.type === 'VariableDeclarator' ? node.init : node.expression
+ candidateMacro = node.type === 'VariableDeclarator'
+ ? node.init
+ : node.expression
}
}
/** @param {VariableDeclarator|ExpressionStatement} node */
@@ -2718,8 +2719,9 @@ function getAttribute(node, name, value) {
* @returns {VDirective[]} The array of `v-slot` directives.
*/
function getDirectives(node, name) {
- const attributes =
- node.type === 'VElement' ? node.startTag.attributes : node.attributes
+ const attributes = node.type === 'VElement'
+ ? node.startTag.attributes
+ : node.attributes
return attributes.filter(
/**
* @param {VAttribute | VDirective} node
diff --git ORI/eslint-plugin-vue/tests/lib/rules/html-indent.js ALT/eslint-plugin-vue/tests/lib/rules/html-indent.js
index 8340f94..de80efd 100644
--- ORI/eslint-plugin-vue/tests/lib/rules/html-indent.js
+++ ALT/eslint-plugin-vue/tests/lib/rules/html-indent.js
@@ -52,8 +52,9 @@ function loadPatterns(additionalValid, additionalInvalid) {
})
const invalid = valid
.map((pattern) => {
- const kind =
- (pattern.options && pattern.options[0]) === 'tab' ? 'tab' : 'space'
+ const kind = (pattern.options && pattern.options[0]) === 'tab'
+ ? 'tab'
+ : 'space'
const output = pattern.code
const lines = output.split('\n').map((text, number) => ({
number,
diff --git ORI/eslint-plugin-vue/tests/lib/rules/script-indent.js ALT/eslint-plugin-vue/tests/lib/rules/script-indent.js
index 229ea32..39664d0 100644
--- ORI/eslint-plugin-vue/tests/lib/rules/script-indent.js
+++ ALT/eslint-plugin-vue/tests/lib/rules/script-indent.js
@@ -70,8 +70,9 @@ function loadPatterns(additionalValid, additionalInvalid) {
})
const invalid = valid
.map((pattern) => {
- const kind =
- (pattern.options && pattern.options[0]) === 'tab' ? 'tab' : 'space'
+ const kind = (pattern.options && pattern.options[0]) === 'tab'
+ ? 'tab'
+ : 'space'
const output = pattern.code
const lines = output.split('\n').map((text, number) => ({
number, |
|
prettier/prettier#12087 VS prettier/prettier@main :: excalidraw/excalidraw@49172ac Diff (1039 lines)diff --git ORI/excalidraw/src/actions/actionCanvas.tsx ALT/excalidraw/src/actions/actionCanvas.tsx
index 2e56954..3c47321 100644
--- ORI/excalidraw/src/actions/actionCanvas.tsx
+++ ALT/excalidraw/src/actions/actionCanvas.tsx
@@ -67,8 +67,9 @@ export const actionClearCanvas = register({
gridSize: appState.gridSize,
showStats: appState.showStats,
pasteDialog: appState.pasteDialog,
- elementType:
- appState.elementType === "image" ? "selection" : appState.elementType,
+ elementType: appState.elementType === "image"
+ ? "selection"
+ : appState.elementType,
},
commitToHistory: true,
};
@@ -213,10 +214,9 @@ const zoomToFitElements = (
const nonDeletedElements = getNonDeletedElements(elements);
const selectedElements = getSelectedElements(nonDeletedElements, appState);
- const commonBounds =
- zoomToSelection && selectedElements.length > 0
- ? getCommonBounds(selectedElements)
- : getCommonBounds(nonDeletedElements);
+ const commonBounds = zoomToSelection && selectedElements.length > 0
+ ? getCommonBounds(selectedElements)
+ : getCommonBounds(nonDeletedElements);
const newZoom = {
value: zoomValueToFitBoundsOnViewport(commonBounds, {
diff --git ORI/excalidraw/src/actions/actionDeleteSelected.tsx ALT/excalidraw/src/actions/actionDeleteSelected.tsx
index 0e7b0d0..67b5628 100644
--- ORI/excalidraw/src/actions/actionDeleteSelected.tsx
+++ ALT/excalidraw/src/actions/actionDeleteSelected.tsx
@@ -111,10 +111,9 @@ export const actionDeleteSelected = register({
editingLinearElement: {
...appState.editingLinearElement,
...binding,
- selectedPointsIndices:
- selectedPointsIndices?.[0] > 0
- ? [selectedPointsIndices[0] - 1]
- : [0],
+ selectedPointsIndices: selectedPointsIndices?.[0] > 0
+ ? [selectedPointsIndices[0] - 1]
+ : [0],
},
},
commitToHistory: true,
diff --git ORI/excalidraw/src/actions/actionProperties.tsx ALT/excalidraw/src/actions/actionProperties.tsx
index 203c625..9ce55cf 100644
--- ORI/excalidraw/src/actions/actionProperties.tsx
+++ ALT/excalidraw/src/actions/actionProperties.tsx
@@ -127,12 +127,11 @@ const offsetElementAfterFontResize = (
return mutateElement(
nextElement,
{
- x:
- prevElement.textAlign === "left"
- ? prevElement.x
- : prevElement.x +
- (prevElement.width - nextElement.width) /
- (prevElement.textAlign === "center" ? 2 : 1),
+ x: prevElement.textAlign === "left"
+ ? prevElement.x
+ : prevElement.x +
+ (prevElement.width - nextElement.width) /
+ (prevElement.textAlign === "center" ? 2 : 1),
// centering vertically is non-standard, but for Excalidraw I think
// it makes sense
y: prevElement.y + (prevElement.height - nextElement.height) / 2,
@@ -180,10 +179,9 @@ const changeFontSize = (
...appState,
// update state only if we've set all select text elements to
// the same font size
- currentItemFontSize:
- newFontSizes.size === 1
- ? [...newFontSizes][0]
- : fallbackValue ?? appState.currentItemFontSize,
+ currentItemFontSize: newFontSizes.size === 1
+ ? [...newFontSizes][0]
+ : fallbackValue ?? appState.currentItemFontSize,
},
commitToHistory: true,
};
diff --git ORI/excalidraw/src/align.ts ALT/excalidraw/src/align.ts
index b9971c2..56a7372 100644
--- ORI/excalidraw/src/align.ts
+++ ALT/excalidraw/src/align.ts
@@ -38,8 +38,9 @@ const calculateTranslation = (
): { x: number; y: number } => {
const groupBoundingBox = getCommonBoundingBox(group);
- const [min, max]: ["minX" | "minY", "maxX" | "maxY"] =
- axis === "x" ? ["minX", "maxX"] : ["minY", "maxY"];
+ const [min, max]: ["minX" | "minY", "maxX" | "maxY"] = axis === "x"
+ ? ["minX", "maxX"]
+ : ["minY", "maxY"];
const noTranslation = { x: 0, y: 0 };
if (position === "start") {
diff --git ORI/excalidraw/src/components/App.tsx ALT/excalidraw/src/components/App.tsx
index ae5376f..ee14d7d 100644
--- ORI/excalidraw/src/components/App.tsx
+++ ALT/excalidraw/src/components/App.tsx
@@ -795,10 +795,9 @@ class App extends React.Component<AppProps, AppState> {
scene.appState = {
...scene.appState,
- elementType:
- scene.appState.elementType === "image"
- ? "selection"
- : scene.appState.elementType,
+ elementType: scene.appState.elementType === "image"
+ ? "selection"
+ : scene.appState.elementType,
isLoading: false,
};
if (initialData?.scrollToContent) {
@@ -1417,18 +1416,16 @@ class App extends React.Component<AppProps, AppState> {
const elementsCenterX = distance(minX, maxX) / 2;
const elementsCenterY = distance(minY, maxY) / 2;
- const clientX =
- typeof opts.position === "object"
- ? opts.position.clientX
- : opts.position === "cursor"
- ? cursorX
- : this.state.width / 2 + this.state.offsetLeft;
- const clientY =
- typeof opts.position === "object"
- ? opts.position.clientY
- : opts.position === "cursor"
- ? cursorY
- : this.state.height / 2 + this.state.offsetTop;
+ const clientX = typeof opts.position === "object"
+ ? opts.position.clientX
+ : opts.position === "cursor"
+ ? cursorX
+ : this.state.width / 2 + this.state.offsetLeft;
+ const clientY = typeof opts.position === "object"
+ ? opts.position.clientY
+ : opts.position === "cursor"
+ ? cursorY
+ : this.state.height / 2 + this.state.offsetTop;
const { x, y } = viewportCoordsToSceneCoords(
{ clientX, clientY },
@@ -2158,14 +2155,13 @@ class App extends React.Component<AppProps, AppState> {
// bind to container when shouldBind is true or
// clicked on center of container
- const container =
- shouldBind || parentCenterPosition
- ? getElementContainingPosition(
- this.scene.getElements().filter((ele) => !isTextElement(ele)),
- sceneX,
- sceneY,
- )
- : null;
+ const container = shouldBind || parentCenterPosition
+ ? getElementContainingPosition(
+ this.scene.getElements().filter((ele) => !isTextElement(ele)),
+ sceneX,
+ sceneY,
+ )
+ : null;
let existingTextElement = this.getTextElementAtPosition(sceneX, sceneY);
@@ -3590,10 +3586,9 @@ class App extends React.Component<AppProps, AppState> {
values from appState. */
const { currentItemStartArrowhead, currentItemEndArrowhead } = this.state;
- const [startArrowhead, endArrowhead] =
- elementType === "arrow"
- ? [currentItemStartArrowhead, currentItemEndArrowhead]
- : [null, null];
+ const [startArrowhead, endArrowhead] = elementType === "arrow"
+ ? [currentItemStartArrowhead, currentItemEndArrowhead]
+ : [null, null];
const element = newLinearElement({
type: elementType,
@@ -4090,10 +4085,9 @@ class App extends React.Component<AppProps, AppState> {
cursorButton: "up",
// text elements are reset on finalize, and resetting on pointerup
// may cause issues with double taps
- editingElement:
- multiElement || isTextElement(this.state.editingElement)
- ? this.state.editingElement
- : null,
+ editingElement: multiElement || isTextElement(this.state.editingElement)
+ ? this.state.editingElement
+ : null,
});
this.savePointer(childEvent.clientX, childEvent.clientY, "up");
@@ -4833,8 +4827,9 @@ class App extends React.Component<AppProps, AppState> {
this.scene,
);
this.setState({
- suggestedBindings:
- hoveredBindableElement != null ? [hoveredBindableElement] : [],
+ suggestedBindings: hoveredBindableElement != null
+ ? [hoveredBindableElement]
+ : [],
});
};
@@ -5116,10 +5111,9 @@ class App extends React.Component<AppProps, AppState> {
const image =
isInitializedImageElement(draggingElement) &&
this.imageCache.get(draggingElement.fileId)?.image;
- const aspectRatio =
- image && !(image instanceof Promise)
- ? image.width / image.height
- : null;
+ const aspectRatio = image && !(image instanceof Promise)
+ ? image.width / image.height
+ : null;
dragNewElement(
draggingElement,
@@ -5405,10 +5399,9 @@ class App extends React.Component<AppProps, AppState> {
state,
),
selectedElementIds: {},
- previousSelectedElementIds:
- Object.keys(selectedElementIds).length !== 0
- ? selectedElementIds
- : previousSelectedElementIds,
+ previousSelectedElementIds: Object.keys(selectedElementIds).length !== 0
+ ? selectedElementIds
+ : previousSelectedElementIds,
shouldCacheIgnoreZoom: true,
}));
this.resetShouldCacheIgnoreZoomDebounced();
diff --git ORI/excalidraw/src/components/Card.tsx ALT/excalidraw/src/components/Card.tsx
index dd5f059..8a28233 100644
--- ORI/excalidraw/src/components/Card.tsx
+++ ALT/excalidraw/src/components/Card.tsx
@@ -9,16 +9,15 @@ export const Card: React.FC<{
<div
className="Card"
style={{
- ["--card-color" as any]:
- color === "primary" ? "var(--color-primary)" : OpenColor[color][7],
- ["--card-color-darker" as any]:
- color === "primary"
- ? "var(--color-primary-darker)"
- : OpenColor[color][8],
- ["--card-color-darkest" as any]:
- color === "primary"
- ? "var(--color-primary-darkest)"
- : OpenColor[color][9],
+ ["--card-color" as any]: color === "primary"
+ ? "var(--color-primary)"
+ : OpenColor[color][7],
+ ["--card-color-darker" as any]: color === "primary"
+ ? "var(--color-primary-darker)"
+ : OpenColor[color][8],
+ ["--card-color-darkest" as any]: color === "primary"
+ ? "var(--color-primary-darkest)"
+ : OpenColor[color][9],
}}
>
{children}
diff --git ORI/excalidraw/src/data/encode.ts ALT/excalidraw/src/data/encode.ts
index 1d5a595..71ad2cd 100644
--- ORI/excalidraw/src/data/encode.ts
+++ ALT/excalidraw/src/data/encode.ts
@@ -10,10 +10,9 @@ export const toByteString = (
data: string | Uint8Array | ArrayBuffer,
): Promise<string> => {
return new Promise((resolve, reject) => {
- const blob =
- typeof data === "string"
- ? new Blob([new TextEncoder().encode(data)])
- : new Blob([data instanceof Uint8Array ? data : new Uint8Array(data)]);
+ const blob = typeof data === "string"
+ ? new Blob([new TextEncoder().encode(data)])
+ : new Blob([data instanceof Uint8Array ? data : new Uint8Array(data)]);
const reader = new FileReader();
reader.onload = (event) => {
if (!event.target || typeof event.target.result !== "string") {
diff --git ORI/excalidraw/src/data/encryption.ts ALT/excalidraw/src/data/encryption.ts
index 21d3b85..952c55e 100644
--- ORI/excalidraw/src/data/encryption.ts
+++ ALT/excalidraw/src/data/encryption.ts
@@ -49,17 +49,17 @@ export const encryptData = async (
key: string | CryptoKey,
data: Uint8Array | ArrayBuffer | Blob | File | string,
): Promise<{ encryptedBuffer: ArrayBuffer; iv: Uint8Array }> => {
- const importedKey =
- typeof key === "string" ? await getCryptoKey(key, "encrypt") : key;
+ const importedKey = typeof key === "string"
+ ? await getCryptoKey(key, "encrypt")
+ : key;
const iv = createIV();
- const buffer: ArrayBuffer | Uint8Array =
- typeof data === "string"
- ? new TextEncoder().encode(data)
- : data instanceof Uint8Array
- ? data
- : data instanceof Blob
- ? await data.arrayBuffer()
- : data;
+ const buffer: ArrayBuffer | Uint8Array = typeof data === "string"
+ ? new TextEncoder().encode(data)
+ : data instanceof Uint8Array
+ ? data
+ : data instanceof Blob
+ ? await data.arrayBuffer()
+ : data;
// We use symmetric encryption. AES-GCM is the recommended algorithm and
// includes checks that the ciphertext has not been modified by an attacker.
diff --git ORI/excalidraw/src/data/json.ts ALT/excalidraw/src/data/json.ts
index e7ce527..eb3f297 100644
--- ORI/excalidraw/src/data/json.ts
+++ ALT/excalidraw/src/data/json.ts
@@ -49,19 +49,16 @@ export const serializeAsJSON = (
type: EXPORT_DATA_TYPES.excalidraw,
version: VERSIONS.excalidraw,
source: EXPORT_SOURCE,
- elements:
- type === "local"
- ? clearElementsForExport(elements)
- : clearElementsForDatabase(elements),
- appState:
- type === "local"
- ? cleanAppStateForExport(appState)
- : clearAppStateForDatabase(appState),
- files:
- type === "local"
- ? filterOutDeletedFiles(elements, files)
- : // will be stripped from JSON
- undefined,
+ elements: type === "local"
+ ? clearElementsForExport(elements)
+ : clearElementsForDatabase(elements),
+ appState: type === "local"
+ ? cleanAppStateForExport(appState)
+ : clearAppStateForDatabase(appState),
+ files: type === "local"
+ ? filterOutDeletedFiles(elements, files)
+ : // will be stripped from JSON
+ undefined,
};
return JSON.stringify(data, null, 2);
diff --git ORI/excalidraw/src/data/restore.ts ALT/excalidraw/src/data/restore.ts
index b55bd95..f8b6d3a 100644
--- ORI/excalidraw/src/data/restore.ts
+++ ALT/excalidraw/src/data/restore.ts
@@ -165,23 +165,21 @@ const restoreElement = (
let x = element.x;
let y = element.y;
- let points = // migrate old arrow model to new one
- !Array.isArray(element.points) || element.points.length < 2
- ? [
- [0, 0],
- [element.width, element.height],
- ]
- : element.points;
+ let points = !Array.isArray(element.points) || element.points.length < 2 // migrate old arrow model to new one
+ ? [
+ [0, 0],
+ [element.width, element.height],
+ ]
+ : element.points;
if (points[0][0] !== 0 || points[0][1] !== 0) {
({ points, x, y } = LinearElementEditor.getNormalizedPoints(element));
}
return restoreElementWithProperties(element, {
- type:
- (element.type as ExcalidrawElement["type"] | "draw") === "draw"
- ? "line"
- : element.type,
+ type: (element.type as ExcalidrawElement["type"] | "draw") === "draw"
+ ? "line"
+ : element.type,
startBinding: element.startBinding,
endBinding: element.endBinding,
lastCommittedPoint: null,
@@ -244,12 +242,11 @@ export const restoreAppState = (
][]) {
const suppliedValue = appState[key];
const localValue = localAppState ? localAppState[key] : undefined;
- (nextAppState as any)[key] =
- suppliedValue !== undefined
- ? suppliedValue
- : localValue !== undefined
- ? localValue
- : defaultValue;
+ (nextAppState as any)[key] = suppliedValue !== undefined
+ ? suppliedValue
+ : localValue !== undefined
+ ? localValue
+ : defaultValue;
}
return {
@@ -258,12 +255,11 @@ export const restoreAppState = (
? nextAppState.elementType
: "selection",
// Migrates from previous version where appState.zoom was a number
- zoom:
- typeof appState.zoom === "number"
- ? {
- value: appState.zoom as NormalizedZoomValue,
- }
- : appState.zoom || defaultAppState.zoom,
+ zoom: typeof appState.zoom === "number"
+ ? {
+ value: appState.zoom as NormalizedZoomValue,
+ }
+ : appState.zoom || defaultAppState.zoom,
};
};
diff --git ORI/excalidraw/src/disitrubte.ts ALT/excalidraw/src/disitrubte.ts
index acad09b..6f30453 100644
--- ORI/excalidraw/src/disitrubte.ts
+++ ALT/excalidraw/src/disitrubte.ts
@@ -12,10 +12,9 @@ export const distributeElements = (
selectedElements: ExcalidrawElement[],
distribution: Distribution,
): ExcalidrawElement[] => {
- const [start, mid, end, extent] =
- distribution.axis === "x"
- ? (["minX", "midX", "maxX", "width"] as const)
- : (["minY", "midY", "maxY", "height"] as const);
+ const [start, mid, end, extent] = distribution.axis === "x"
+ ? (["minX", "midX", "maxX", "width"] as const)
+ : (["minY", "midY", "maxY", "height"] as const);
const bounds = getCommonBoundingBox(selectedElements);
const groups = getMaximumGroups(selectedElements)
diff --git ORI/excalidraw/src/element/bounds.ts ALT/excalidraw/src/element/bounds.ts
index 8290b1c..99aec8d 100644
--- ORI/excalidraw/src/element/bounds.ts
+++ ALT/excalidraw/src/element/bounds.ts
@@ -267,10 +267,9 @@ export const getArrowheadPoints = (
if (arrowhead === "arrow") {
// Length for -> arrows is based on the length of the last section
const [cx, cy] = element.points[element.points.length - 1];
- const [px, py] =
- element.points.length > 1
- ? element.points[element.points.length - 2]
- : [0, 0];
+ const [px, py] = element.points.length > 1
+ ? element.points[element.points.length - 2]
+ : [0, 0];
length = Math.hypot(cx - px, cy - py);
} else {
@@ -444,16 +443,12 @@ export const getResizedElementAbsoluteCoords = (
} else {
// Line
const gen = rough.generator();
- const curve =
- element.strokeSharpness === "sharp"
- ? gen.linearPath(
- points as [number, number][],
- generateRoughOptions(element),
- )
- : gen.curve(
- points as [number, number][],
- generateRoughOptions(element),
- );
+ const curve = element.strokeSharpness === "sharp"
+ ? gen.linearPath(
+ points as [number, number][],
+ generateRoughOptions(element),
+ )
+ : gen.curve(points as [number, number][], generateRoughOptions(element));
const ops = getCurvePathOps(curve);
bounds = getMinMaxXYFromCurvePathOps(ops);
}
@@ -474,13 +469,12 @@ export const getElementPointsCoords = (
): [number, number, number, number] => {
// This might be computationally heavey
const gen = rough.generator();
- const curve =
- sharpness === "sharp"
- ? gen.linearPath(
- points as [number, number][],
- generateRoughOptions(element),
- )
- : gen.curve(points as [number, number][], generateRoughOptions(element));
+ const curve = sharpness === "sharp"
+ ? gen.linearPath(
+ points as [number, number][],
+ generateRoughOptions(element),
+ )
+ : gen.curve(points as [number, number][], generateRoughOptions(element));
const ops = getCurvePathOps(curve);
const [minX, minY, maxX, maxY] = getMinMaxXYFromCurvePathOps(ops);
return [
diff --git ORI/excalidraw/src/element/linearElementEditor.ts ALT/excalidraw/src/element/linearElementEditor.ts
index ee4da2d..c2adfe8 100644
--- ORI/excalidraw/src/element/linearElementEditor.ts
+++ ALT/excalidraw/src/element/linearElementEditor.ts
@@ -273,10 +273,9 @@ export class LinearElementEditor {
LinearElementEditor.movePoints(element, [
{
index: selectedPoint,
- point:
- selectedPoint === 0
- ? element.points[element.points.length - 1]
- : element.points[0],
+ point: selectedPoint === 0
+ ? element.points[element.points.length - 1]
+ : element.points[0],
},
]);
}
@@ -306,22 +305,20 @@ export class LinearElementEditor {
// if clicking without previously dragging a point(s), and not holding
// shift, deselect all points except the one clicked. If holding shift,
// toggle the point.
- selectedPointsIndices:
- isDragging || event.shiftKey
- ? !isDragging &&
- event.shiftKey &&
- pointerDownState.prevSelectedPointsIndices?.includes(
- pointerDownState.lastClickedPoint,
+ selectedPointsIndices: isDragging || event.shiftKey
+ ? !isDragging &&
+ event.shiftKey &&
+ pointerDownState.prevSelectedPointsIndices?.includes(
+ pointerDownState.lastClickedPoint,
+ )
+ ? selectedPointsIndices &&
+ selectedPointsIndices.filter(
+ (pointIndex) => pointIndex !== pointerDownState.lastClickedPoint,
)
- ? selectedPointsIndices &&
- selectedPointsIndices.filter(
- (pointIndex) =>
- pointIndex !== pointerDownState.lastClickedPoint,
- )
- : selectedPointsIndices
- : selectedPointsIndices?.includes(pointerDownState.lastClickedPoint)
- ? [pointerDownState.lastClickedPoint]
- : selectedPointsIndices,
+ : selectedPointsIndices
+ : selectedPointsIndices?.includes(pointerDownState.lastClickedPoint)
+ ? [pointerDownState.lastClickedPoint]
+ : selectedPointsIndices,
isDragging: false,
pointerOffset: { x: 0, y: 0 },
};
@@ -429,18 +426,17 @@ export class LinearElementEditor {
element.angle,
);
- const nextSelectedPointsIndices =
- clickedPointIndex > -1 || event.shiftKey
- ? event.shiftKey ||
- appState.editingLinearElement.selectedPointsIndices?.includes(
+ const nextSelectedPointsIndices = clickedPointIndex > -1 || event.shiftKey
+ ? event.shiftKey ||
+ appState.editingLinearElement.selectedPointsIndices?.includes(
+ clickedPointIndex,
+ )
+ ? normalizeSelectedPoints([
+ ...(appState.editingLinearElement.selectedPointsIndices || []),
clickedPointIndex,
- )
- ? normalizeSelectedPoints([
- ...(appState.editingLinearElement.selectedPointsIndices || []),
- clickedPointIndex,
- ])
- : [clickedPointIndex]
- : null;
+ ])
+ : [clickedPointIndex]
+ : null;
setState({
editingLinearElement: {
@@ -541,10 +537,9 @@ export class LinearElementEditor {
element: NonDeleted<ExcalidrawLinearElement>,
indexMaybeFromEnd: number, // -1 for last element
): Point {
- const index =
- indexMaybeFromEnd < 0
- ? element.points.length + indexMaybeFromEnd
- : indexMaybeFromEnd;
+ const index = indexMaybeFromEnd < 0
+ ? element.points.length + indexMaybeFromEnd
+ : indexMaybeFromEnd;
const [x1, y1, x2, y2] = getElementAbsoluteCoords(element);
const cx = (x1 + x2) / 2;
const cy = (y1 + y2) / 2;
diff --git ORI/excalidraw/src/element/newElement.ts ALT/excalidraw/src/element/newElement.ts
index 95312c4..de5849b 100644
--- ORI/excalidraw/src/element/newElement.ts
+++ ALT/excalidraw/src/element/newElement.ts
@@ -107,12 +107,11 @@ const getTextElementPositionOffsets = (
},
) => {
return {
- x:
- opts.textAlign === "center"
- ? metrics.width / 2
- : opts.textAlign === "right"
- ? metrics.width
- : 0,
+ x: opts.textAlign === "center"
+ ? metrics.width / 2
+ : opts.textAlign === "right"
+ ? metrics.width
+ : 0,
y: opts.verticalAlign === "middle" ? metrics.height / 2 : 0,
};
};
@@ -330,10 +329,9 @@ export const deepCopyElement = (val: any, depth: number = 0) => {
}
if (Object.prototype.toString.call(val) === "[object Object]") {
- const tmp =
- typeof val.constructor === "function"
- ? Object.create(Object.getPrototypeOf(val))
- : {};
+ const tmp = typeof val.constructor === "function"
+ ? Object.create(Object.getPrototypeOf(val))
+ : {};
for (const key in val) {
if (val.hasOwnProperty(key)) {
// don't copy top-level shape property, which we want to regenerate
diff --git ORI/excalidraw/src/element/resizeElements.ts ALT/excalidraw/src/element/resizeElements.ts
index 634e9dd..38d684e 100644
--- ORI/excalidraw/src/element/resizeElements.ts
+++ ALT/excalidraw/src/element/resizeElements.ts
@@ -219,13 +219,12 @@ export const reshapeSingleTwoPointElement = (
cy,
-element.angle,
);
- let [width, height] =
- resizeArrowDirection === "end"
- ? [rotatedX - element.x, rotatedY - element.y]
- : [
- element.x + element.points[1][0] - rotatedX,
- element.y + element.points[1][1] - rotatedY,
- ];
+ let [width, height] = resizeArrowDirection === "end"
+ ? [rotatedX - element.x, rotatedY - element.y]
+ : [
+ element.x + element.points[1][0] - rotatedX,
+ element.y + element.points[1][1] - rotatedY,
+ ];
if (shouldRotateWithDiscreteAngle) {
[width, height] = getPerfectElementSizeWithRotation(
element.type,
@@ -830,10 +829,9 @@ export const getResizeOffsetXY = (
x: number,
y: number,
): [number, number] => {
- const [x1, y1, x2, y2] =
- selectedElements.length === 1
- ? getElementAbsoluteCoords(selectedElements[0])
- : getCommonBounds(selectedElements);
+ const [x1, y1, x2, y2] = selectedElements.length === 1
+ ? getElementAbsoluteCoords(selectedElements[0])
+ : getCommonBounds(selectedElements);
const cx = (x1 + x2) / 2;
const cy = (y1 + y2) / 2;
const angle = selectedElements.length === 1 ? selectedElements[0].angle : 0;
diff --git ORI/excalidraw/src/groups.ts ALT/excalidraw/src/groups.ts
index 4bbf2bc..25fe6e8 100644
--- ORI/excalidraw/src/groups.ts
+++ ALT/excalidraw/src/groups.ts
@@ -136,8 +136,9 @@ export const getNewGroupIdsForDuplication = (
const positionOfEditingGroupId = editingGroupId
? groupIds.indexOf(editingGroupId)
: -1;
- const endIndex =
- positionOfEditingGroupId > -1 ? positionOfEditingGroupId : groupIds.length;
+ const endIndex = positionOfEditingGroupId > -1
+ ? positionOfEditingGroupId
+ : groupIds.length;
for (let index = 0; index < endIndex; index++) {
copy[index] = mapper(copy[index]);
}
@@ -155,8 +156,9 @@ export const addToGroup = (
const positionOfEditingGroupId = editingGroupId
? groupIds.indexOf(editingGroupId)
: -1;
- const positionToInsert =
- positionOfEditingGroupId > -1 ? positionOfEditingGroupId : groupIds.length;
+ const positionToInsert = positionOfEditingGroupId > -1
+ ? positionOfEditingGroupId
+ : groupIds.length;
groupIds.splice(positionToInsert, 0, newGroupId);
return groupIds;
};
@@ -175,10 +177,9 @@ export const getMaximumGroups = (
>();
elements.forEach((element: ExcalidrawElement) => {
- const groupId =
- element.groupIds.length === 0
- ? element.id
- : element.groupIds[element.groupIds.length - 1];
+ const groupId = element.groupIds.length === 0
+ ? element.id
+ : element.groupIds[element.groupIds.length - 1];
const currentGroupMembers = groups.get(groupId) || [];
diff --git ORI/excalidraw/src/points.ts ALT/excalidraw/src/points.ts
index 7806203..6dc0fc4 100644
--- ORI/excalidraw/src/points.ts
+++ ALT/excalidraw/src/points.ts
@@ -19,8 +19,9 @@ export const rescalePoints = (
const prevMinDimension = Math.min(...prevDimValues);
const prevDimensionSize = prevMaxDimension - prevMinDimension;
- const dimensionScaleFactor =
- prevDimensionSize === 0 ? 1 : nextDimensionSize / prevDimensionSize;
+ const dimensionScaleFactor = prevDimensionSize === 0
+ ? 1
+ : nextDimensionSize / prevDimensionSize;
let nextMinDimension = Infinity;
diff --git ORI/excalidraw/src/renderer/renderElement.ts ALT/excalidraw/src/renderer/renderElement.ts
index 6db858d..adc4f98 100644
--- ORI/excalidraw/src/renderer/renderElement.ts
+++ ALT/excalidraw/src/renderer/renderElement.ts
@@ -98,15 +98,13 @@ const generateElementCanvas = (
distance(y1, y2) * window.devicePixelRatio * zoom.value +
padding * zoom.value * 2;
- canvasOffsetX =
- element.x > x1
- ? distance(element.x, x1) * window.devicePixelRatio * zoom.value
- : 0;
+ canvasOffsetX = element.x > x1
+ ? distance(element.x, x1) * window.devicePixelRatio * zoom.value
+ : 0;
- canvasOffsetY =
- element.y > y1
- ? distance(element.y, y1) * window.devicePixelRatio * zoom.value
- : 0;
+ canvasOffsetY = element.y > y1
+ ? distance(element.y, y1) * window.devicePixelRatio * zoom.value
+ : 0;
context.translate(canvasOffsetX, canvasOffsetY);
} else {
@@ -265,12 +263,11 @@ const drawElementOnCanvas = (
? getApproxLineHeight(getFontString(element))
: element.height / lines.length;
const verticalOffset = element.height - element.baseline;
- const horizontalOffset =
- element.textAlign === "center"
- ? element.width / 2
- : element.textAlign === "right"
- ? element.width
- : 0;
+ const horizontalOffset = element.textAlign === "center"
+ ? element.width / 2
+ : element.textAlign === "right"
+ ? element.width
+ : 0;
for (let index = 0; index < lines.length; index++) {
context.fillText(
lines[index],
@@ -328,21 +325,19 @@ export const generateRoughOptions = (
): Options => {
const options: Options = {
seed: element.seed,
- strokeLineDash:
- element.strokeStyle === "dashed"
- ? getDashArrayDashed(element.strokeWidth)
- : element.strokeStyle === "dotted"
- ? getDashArrayDotted(element.strokeWidth)
- : undefined,
+ strokeLineDash: element.strokeStyle === "dashed"
+ ? getDashArrayDashed(element.strokeWidth)
+ : element.strokeStyle === "dotted"
+ ? getDashArrayDotted(element.strokeWidth)
+ : undefined,
// for non-solid strokes, disable multiStroke because it tends to make
// dashes/dots overlay each other
disableMultiStroke: element.strokeStyle !== "solid",
// for non-solid strokes, increase the width a bit to make it visually
// similar to solid strokes, because we're also disabling multiStroke
- strokeWidth:
- element.strokeStyle !== "solid"
- ? element.strokeWidth + 0.5
- : element.strokeWidth,
+ strokeWidth: element.strokeStyle !== "solid"
+ ? element.strokeWidth + 0.5
+ : element.strokeWidth,
// when increasing strokeWidth, we must explicitly set fillWeight and
// hachureGap because if not specified, roughjs uses strokeWidth to
// calculate them (and we don't want the fills to be modified)
@@ -358,10 +353,9 @@ export const generateRoughOptions = (
case "diamond":
case "ellipse": {
options.fillStyle = element.fillStyle;
- options.fill =
- element.backgroundColor === "transparent"
- ? undefined
- : element.backgroundColor;
+ options.fill = element.backgroundColor === "transparent"
+ ? undefined
+ : element.backgroundColor;
if (element.type === "ellipse") {
options.curveFitting = 1;
}
@@ -371,10 +365,9 @@ export const generateRoughOptions = (
case "freedraw": {
if (isPathALoop(element.points)) {
options.fillStyle = element.fillStyle;
- options.fill =
- element.backgroundColor === "transparent"
- ? undefined
- : element.backgroundColor;
+ options.fill = element.backgroundColor === "transparent"
+ ? undefined
+ : element.backgroundColor;
}
return options;
}
@@ -998,19 +991,17 @@ export const renderElementToSvg = (
const lines = element.text.replace(/\r\n?/g, "\n").split("\n");
const lineHeight = element.height / lines.length;
const verticalOffset = element.height - element.baseline;
- const horizontalOffset =
- element.textAlign === "center"
- ? element.width / 2
- : element.textAlign === "right"
- ? element.width
- : 0;
+ const horizontalOffset = element.textAlign === "center"
+ ? element.width / 2
+ : element.textAlign === "right"
+ ? element.width
+ : 0;
const direction = isRTL(element.text) ? "rtl" : "ltr";
- const textAnchor =
- element.textAlign === "center"
- ? "middle"
- : element.textAlign === "right" || direction === "rtl"
- ? "end"
- : "start";
+ const textAnchor = element.textAlign === "center"
+ ? "middle"
+ : element.textAlign === "right" || direction === "rtl"
+ ? "end"
+ : "start";
for (let i = 0; i < lines.length; i++) {
const text = svgRoot.ownerDocument!.createElementNS(SVG_NS, "text");
text.textContent = lines[i];
diff --git ORI/excalidraw/src/renderer/renderScene.ts ALT/excalidraw/src/renderer/renderScene.ts
index 00557ae..16d3430 100644
--- ORI/excalidraw/src/renderer/renderScene.ts
+++ ALT/excalidraw/src/renderer/renderScene.ts
@@ -736,8 +736,11 @@ const renderBindingHighlightForSuggestedPointBinding = (
context.strokeStyle = "rgba(0,0,0,0)";
context.fillStyle = "rgba(0,0,0,.05)";
- const pointIndices =
- startOrEnd === "both" ? [0, -1] : startOrEnd === "start" ? [0] : [-1];
+ const pointIndices = startOrEnd === "both"
+ ? [0, -1]
+ : startOrEnd === "start"
+ ? [0]
+ : [-1];
pointIndices.forEach((index) => {
const [x, y] = LinearElementEditor.getPointAtIndexGlobalCoordinates(
element,
diff --git ORI/excalidraw/src/scene/scrollbars.ts ALT/excalidraw/src/scene/scrollbars.ts
index c36acde..a421a12 100644
--- ORI/excalidraw/src/scene/scrollbars.ts
+++ ALT/excalidraw/src/scene/scrollbars.ts
@@ -64,43 +64,41 @@ export const getScrollBars = (
// The scrollbar represents where the viewport is in relationship to the scene
return {
- horizontal:
- viewportMinX === sceneMinX && viewportMaxX === sceneMaxX
- ? null
- : {
- x:
- Math.max(safeArea.left, SCROLLBAR_MARGIN) +
- ((viewportMinX - sceneMinX) / (sceneMaxX - sceneMinX)) *
- viewportWidth,
- y:
- viewportHeight -
+ horizontal: viewportMinX === sceneMinX && viewportMaxX === sceneMaxX
+ ? null
+ : {
+ x:
+ Math.max(safeArea.left, SCROLLBAR_MARGIN) +
+ ((viewportMinX - sceneMinX) / (sceneMaxX - sceneMinX)) *
+ viewportWidth,
+ y:
+ viewportHeight -
+ SCROLLBAR_WIDTH -
+ Math.max(SCROLLBAR_MARGIN, safeArea.bottom),
+ width:
+ ((viewportMaxX - viewportMinX) / (sceneMaxX - sceneMinX)) *
+ viewportWidth -
+ Math.max(SCROLLBAR_MARGIN * 2, safeArea.left + safeArea.right),
+ height: SCROLLBAR_WIDTH,
+ },
+ vertical: viewportMinY === sceneMinY && viewportMaxY === sceneMaxY
+ ? null
+ : {
+ x: isRTL
+ ? Math.max(safeArea.left, SCROLLBAR_MARGIN)
+ : viewportWidth -
SCROLLBAR_WIDTH -
- Math.max(SCROLLBAR_MARGIN, safeArea.bottom),
- width:
- ((viewportMaxX - viewportMinX) / (sceneMaxX - sceneMinX)) *
- viewportWidth -
- Math.max(SCROLLBAR_MARGIN * 2, safeArea.left + safeArea.right),
- height: SCROLLBAR_WIDTH,
- },
- vertical:
- viewportMinY === sceneMinY && viewportMaxY === sceneMaxY
- ? null
- : {
- x: isRTL
- ? Math.max(safeArea.left, SCROLLBAR_MARGIN)
- : viewportWidth -
- SCROLLBAR_WIDTH -
- Math.max(safeArea.right, SCROLLBAR_MARGIN),
- y:
- ((viewportMinY - sceneMinY) / (sceneMaxY - sceneMinY)) *
- viewportHeight +
- Math.max(safeArea.top, SCROLLBAR_MARGIN),
- width: SCROLLBAR_WIDTH,
- height:
- ((viewportMaxY - viewportMinY) / (sceneMaxY - sceneMinY)) *
- viewportHeight -
- Math.max(SCROLLBAR_MARGIN * 2, safeArea.top + safeArea.bottom),
- },
+ Math.max(safeArea.right, SCROLLBAR_MARGIN),
+ y:
+ ((viewportMinY - sceneMinY) / (sceneMaxY - sceneMinY)) *
+ viewportHeight +
+ Math.max(safeArea.top, SCROLLBAR_MARGIN),
+ width: SCROLLBAR_WIDTH,
+ height:
+ ((viewportMaxY - viewportMinY) / (sceneMaxY - sceneMinY)) *
+ viewportHeight -
+ Math.max(SCROLLBAR_MARGIN * 2, safeArea.top + safeArea.bottom),
+ },
};
};
diff --git ORI/excalidraw/src/zindex.ts ALT/excalidraw/src/zindex.ts
index 4b96c8e..22b4b0c 100644
--- ORI/excalidraw/src/zindex.ts
+++ ALT/excalidraw/src/zindex.ts
@@ -114,10 +114,9 @@ const getTargetIndex = (
return true;
};
- const candidateIndex =
- direction === "left"
- ? findLastIndex(elements, indexFilter, Math.max(0, boundaryIndex - 1))
- : findIndex(elements, indexFilter, boundaryIndex + 1);
+ const candidateIndex = direction === "left"
+ ? findLastIndex(elements, indexFilter, Math.max(0, boundaryIndex - 1))
+ : findIndex(elements, indexFilter, boundaryIndex + 1);
const nextElement = elements[candidateIndex];
@@ -208,34 +207,30 @@ const shiftElements = (
return;
}
- const leadingElements =
- direction === "left"
- ? elements.slice(0, targetIndex)
- : elements.slice(0, leadingIndex);
+ const leadingElements = direction === "left"
+ ? elements.slice(0, targetIndex)
+ : elements.slice(0, leadingIndex);
const targetElements = elements.slice(leadingIndex, trailingIndex + 1);
- const displacedElements =
- direction === "left"
- ? elements.slice(targetIndex, leadingIndex)
- : elements.slice(trailingIndex + 1, targetIndex + 1);
- const trailingElements =
- direction === "left"
- ? elements.slice(trailingIndex + 1)
- : elements.slice(targetIndex + 1);
-
- elements =
- direction === "left"
- ? [
- ...leadingElements,
- ...targetElements,
- ...displacedElements,
- ...trailingElements,
- ]
- : [
- ...leadingElements,
- ...displacedElements,
- ...targetElements,
- ...trailingElements,
- ];
+ const displacedElements = direction === "left"
+ ? elements.slice(targetIndex, leadingIndex)
+ : elements.slice(trailingIndex + 1, targetIndex + 1);
+ const trailingElements = direction === "left"
+ ? elements.slice(trailingIndex + 1)
+ : elements.slice(targetIndex + 1);
+
+ elements = direction === "left"
+ ? [
+ ...leadingElements,
+ ...targetElements,
+ ...displacedElements,
+ ...trailingElements,
+ ]
+ : [
+ ...leadingElements,
+ ...displacedElements,
+ ...targetElements,
+ ...trailingElements,
+ ];
});
return elements.map((element) => { |
|
prettier/prettier#12087 VS prettier/prettier@main :: prettier/prettier@e949a54 Diff (971 lines)diff --git ORI/prettier/docs/rationale.md ALT/prettier/docs/rationale.md
index 4df64fa..d32168d 100644
--- ORI/prettier/docs/rationale.md
+++ ALT/prettier/docs/rationale.md
@@ -295,8 +295,9 @@ Prettier will turn the above into:
```js
// eslint-disable-next-line no-eval
-const result =
- safeToEval && settings.allowNativeEval ? eval(input) : fallback(input);
+const result = safeToEval && settings.allowNativeEval
+ ? eval(input)
+ : fallback(input);
```
Which means that the `eslint-disable-next-line` comment is no longer effective. In this case you need to move the comment:
diff --git ORI/prettier/scripts/build/esbuild-plugins/replace-module.mjs ALT/prettier/scripts/build/esbuild-plugins/replace-module.mjs
index 7f166f6..a35e1d7 100644
--- ORI/prettier/scripts/build/esbuild-plugins/replace-module.mjs
+++ ALT/prettier/scripts/build/esbuild-plugins/replace-module.mjs
@@ -11,8 +11,9 @@ export default function esbuildPluginReplaceModule(replacements = {}) {
return;
}
- options =
- typeof options === "string" ? { path: options } : { ...options };
+ options = typeof options === "string"
+ ? { path: options }
+ : { ...options };
let {
path: file,
diff --git ORI/prettier/scripts/release/utils.js ALT/prettier/scripts/release/utils.js
index 27910ab..af0ba86 100644
--- ORI/prettier/scripts/release/utils.js
+++ ALT/prettier/scripts/release/utils.js
@@ -22,10 +22,9 @@ function fitTerminal(input) {
}
async function logPromise(name, promiseOrAsyncFunction) {
- const promise =
- typeof promiseOrAsyncFunction === "function"
- ? promiseOrAsyncFunction()
- : promiseOrAsyncFunction;
+ const promise = typeof promiseOrAsyncFunction === "function"
+ ? promiseOrAsyncFunction()
+ : promiseOrAsyncFunction;
process.stdout.write(fitTerminal(name));
diff --git ORI/prettier/scripts/tools/eslint-plugin-prettier-internal-rules/better-parent-property-check-in-needs-parens.js ALT/prettier/scripts/tools/eslint-plugin-prettier-internal-rules/better-parent-property-check-in-needs-parens.js
index f390690..7b8b150 100644
--- ORI/prettier/scripts/tools/eslint-plugin-prettier-internal-rules/better-parent-property-check-in-needs-parens.js
+++ ALT/prettier/scripts/tools/eslint-plugin-prettier-internal-rules/better-parent-property-check-in-needs-parens.js
@@ -70,10 +70,9 @@ module.exports = {
const { property } = [left, right].find(
({ type }) => type === "MemberExpression"
);
- const propertyText =
- property.type === "Identifier"
- ? `"${property.name}"`
- : sourceCode.getText(property);
+ const propertyText = property.type === "Identifier"
+ ? `"${property.name}"`
+ : sourceCode.getText(property);
context.report({
node,
diff --git ORI/prettier/scripts/tools/eslint-plugin-prettier-internal-rules/prefer-is-non-empty-array.js ALT/prettier/scripts/tools/eslint-plugin-prettier-internal-rules/prefer-is-non-empty-array.js
index 6b4a8e8..26f7312 100644
--- ORI/prettier/scripts/tools/eslint-plugin-prettier-internal-rules/prefer-is-non-empty-array.js
+++ ALT/prettier/scripts/tools/eslint-plugin-prettier-internal-rules/prefer-is-non-empty-array.js
@@ -80,8 +80,9 @@ module.exports = {
leftObject = leftObject.arguments[0];
}
- const rightObject =
- right.type === "BinaryExpression" ? right.left.object : right.object;
+ const rightObject = right.type === "BinaryExpression"
+ ? right.left.object
+ : right.object;
const objectText = sourceCode.getText(rightObject);
// Simple compare with code
if (sourceCode.getText(leftObject) !== objectText) {
@@ -115,10 +116,9 @@ module.exports = {
return;
}
- const rightObject =
- right.type === "UnaryExpression"
- ? right.argument.object
- : right.left.object;
+ const rightObject = right.type === "UnaryExpression"
+ ? right.argument.object
+ : right.left.object;
let leftObject = left.argument;
if (isArrayIsArrayCall(leftObject)) {
leftObject = leftObject.arguments[0];
diff --git ORI/prettier/scripts/utils/changelog.mjs ALT/prettier/scripts/utils/changelog.mjs
index 92fdcb8..780fb8e 100644
--- ORI/prettier/scripts/utils/changelog.mjs
+++ ALT/prettier/scripts/utils/changelog.mjs
@@ -36,10 +36,9 @@ export function getEntries(dirPath) {
? "improvement"
: undefined;
- const order =
- section === "improvement" && improvement[2] !== undefined
- ? Number(improvement[2])
- : undefined;
+ const order = section === "improvement" && improvement[2] !== undefined
+ ? Number(improvement[2])
+ : undefined;
const content = [processTitle(title), ...rest].join("\n");
diff --git ORI/prettier/src/cli/format.js ALT/prettier/src/cli/format.js
index 0180652..a9adc1c 100644
--- ORI/prettier/src/cli/format.js
+++ ALT/prettier/src/cli/format.js
@@ -158,10 +158,9 @@ function format(context, input, opt) {
/* istanbul ignore next */
if (ast !== past) {
const MAX_AST_SIZE = 2097152; // 2MB
- const astDiff =
- ast.length > MAX_AST_SIZE || past.length > MAX_AST_SIZE
- ? "AST diff too large to render"
- : diff(ast, past);
+ const astDiff = ast.length > MAX_AST_SIZE || past.length > MAX_AST_SIZE
+ ? "AST diff too large to render"
+ : diff(ast, past);
throw new errors.DebugError(
"ast(input) !== ast(prettier(input))\n" +
astDiff +
diff --git ORI/prettier/src/cli/usage.js ALT/prettier/src/cli/usage.js
index e1be6ba..03304f8 100644
--- ORI/prettier/src/cli/usage.js
+++ ALT/prettier/src/cli/usage.js
@@ -44,10 +44,9 @@ function createOptionUsageHeader(option) {
}
function createOptionUsageRow(header, content, threshold) {
- const separator =
- header.length >= threshold
- ? `\n${" ".repeat(threshold)}`
- : " ".repeat(threshold - header.length);
+ const separator = header.length >= threshold
+ ? `\n${" ".repeat(threshold)}`
+ : " ".repeat(threshold - header.length);
const description = content.replace(/\n/g, `\n${" ".repeat(threshold)}`);
@@ -156,20 +155,18 @@ function createDetailedUsage(context, flag) {
const header = createOptionUsageHeader(option);
const description = `\n\n${indent(option.description, 2)}`;
- const choices =
- option.type !== "choice"
- ? ""
- : `\n\nValid options:\n\n${createChoiceUsages(
- option.choices,
- CHOICE_USAGE_MARGIN,
- CHOICE_USAGE_INDENTATION
- ).join("\n")}`;
+ const choices = option.type !== "choice"
+ ? ""
+ : `\n\nValid options:\n\n${createChoiceUsages(
+ option.choices,
+ CHOICE_USAGE_MARGIN,
+ CHOICE_USAGE_INDENTATION
+ ).join("\n")}`;
const optionDefaultValue = getOptionDefaultValue(context, option.name);
- const defaults =
- optionDefaultValue !== undefined
- ? `\n\nDefault: ${createDefaultValueDisplay(optionDefaultValue)}`
- : "";
+ const defaults = optionDefaultValue !== undefined
+ ? `\n\nDefault: ${createDefaultValueDisplay(optionDefaultValue)}`
+ : "";
const pluginDefaults =
option.pluginDefaults && Object.keys(option.pluginDefaults).length > 0
diff --git ORI/prettier/src/document/doc-debug.js ALT/prettier/src/document/doc-debug.js
index 02a65e4..8f802d6 100644
--- ORI/prettier/src/document/doc-debug.js
+++ ALT/prettier/src/document/doc-debug.js
@@ -141,8 +141,9 @@ function printDocToDebug(doc) {
optionsParts.push(`groupId: ${printGroupId(doc.groupId)}`);
}
- const options =
- optionsParts.length > 0 ? `, { ${optionsParts.join(", ")} }` : "";
+ const options = optionsParts.length > 0
+ ? `, { ${optionsParts.join(", ")} }`
+ : "";
return `indentIfBreak(${printDoc(doc.contents)}${options})`;
}
@@ -158,8 +159,9 @@ function printDocToDebug(doc) {
optionsParts.push(`id: ${printGroupId(doc.id)}`);
}
- const options =
- optionsParts.length > 0 ? `, { ${optionsParts.join(", ")} }` : "";
+ const options = optionsParts.length > 0
+ ? `, { ${optionsParts.join(", ")} }`
+ : "";
if (doc.expandedStates) {
return `conditionalGroup([${doc.expandedStates
diff --git ORI/prettier/src/document/doc-printer.js ALT/prettier/src/document/doc-printer.js
index 1a45f78..1b93150 100644
--- ORI/prettier/src/document/doc-printer.js
+++ ALT/prettier/src/document/doc-printer.js
@@ -37,17 +37,17 @@ function makeAlign(indent, widthOrDoc, options) {
return { ...indent, root: indent };
}
- const alignType =
- typeof widthOrDoc === "string" ? "stringAlign" : "numberAlign";
+ const alignType = typeof widthOrDoc === "string"
+ ? "stringAlign"
+ : "numberAlign";
return generateInd(indent, { type: alignType, n: widthOrDoc }, options);
}
function generateInd(ind, newPart, options) {
- const queue =
- newPart.type === "dedent"
- ? ind.queue.slice(0, -1)
- : [...ind.queue, newPart];
+ const queue = newPart.type === "dedent"
+ ? ind.queue.slice(0, -1)
+ : [...ind.queue, newPart];
let value = "";
let length = 0;
@@ -218,23 +218,21 @@ function fits(next, restCommands, width, options, hasLineSuffix, mustBeFlat) {
case "indent-if-break": {
const groupMode = doc.groupId ? groupModeMap[doc.groupId] : mode;
if (groupMode === MODE_BREAK) {
- const breakContents =
- doc.type === "if-break"
- ? doc.breakContents
- : doc.negate
- ? doc.contents
- : indent(doc.contents);
+ const breakContents = doc.type === "if-break"
+ ? doc.breakContents
+ : doc.negate
+ ? doc.contents
+ : indent(doc.contents);
if (breakContents) {
cmds.push([ind, mode, breakContents]);
}
}
if (groupMode === MODE_FLAT) {
- const flatContents =
- doc.type === "if-break"
- ? doc.flatContents
- : doc.negate
- ? indent(doc.contents)
- : doc.contents;
+ const flatContents = doc.type === "if-break"
+ ? doc.flatContents
+ : doc.negate
+ ? indent(doc.contents)
+ : doc.contents;
if (flatContents) {
cmds.push([ind, mode, flatContents]);
}
@@ -489,23 +487,21 @@ function printDocToString(doc, options) {
case "indent-if-break": {
const groupMode = doc.groupId ? groupModeMap[doc.groupId] : mode;
if (groupMode === MODE_BREAK) {
- const breakContents =
- doc.type === "if-break"
- ? doc.breakContents
- : doc.negate
- ? doc.contents
- : indent(doc.contents);
+ const breakContents = doc.type === "if-break"
+ ? doc.breakContents
+ : doc.negate
+ ? doc.contents
+ : indent(doc.contents);
if (breakContents) {
cmds.push([ind, mode, breakContents]);
}
}
if (groupMode === MODE_FLAT) {
- const flatContents =
- doc.type === "if-break"
- ? doc.flatContents
- : doc.negate
- ? indent(doc.contents)
- : doc.contents;
+ const flatContents = doc.type === "if-break"
+ ? doc.flatContents
+ : doc.negate
+ ? indent(doc.contents)
+ : doc.contents;
if (flatContents) {
cmds.push([ind, mode, flatContents]);
}
diff --git ORI/prettier/src/language-handlebars/printer-glimmer.js ALT/prettier/src/language-handlebars/printer-glimmer.js
index 49df8a0..5cacf1d 100644
--- ORI/prettier/src/language-handlebars/printer-glimmer.js
+++ ALT/prettier/src/language-handlebars/printer-glimmer.js
@@ -636,10 +636,9 @@ function printInverse(path, print, options) {
const node = path.getValue();
const inverse = print("inverse");
- const printed =
- options.htmlWhitespaceSensitivity === "ignore"
- ? [hardline, inverse]
- : inverse;
+ const printed = options.htmlWhitespaceSensitivity === "ignore"
+ ? [hardline, inverse]
+ : inverse;
if (blockStatementHasElseIf(node)) {
return printed;
diff --git ORI/prettier/src/language-html/embed.js ALT/prettier/src/language-html/embed.js
index ef83e63..5bc1ff0 100644
--- ORI/prettier/src/language-html/embed.js
+++ ALT/prettier/src/language-html/embed.js
@@ -39,16 +39,15 @@ function printEmbeddedAttributeValue(node, htmlTextToDoc, options) {
let shouldHug = false;
const __onHtmlBindingRoot = (root, options) => {
- const rootNode =
- root.type === "NGRoot"
- ? root.node.type === "NGMicrosyntax" &&
- root.node.body.length === 1 &&
- root.node.body[0].type === "NGMicrosyntaxExpression"
- ? root.node.body[0].expression
- : root.node
- : root.type === "JsExpressionRoot"
- ? root.node
- : root;
+ const rootNode = root.type === "NGRoot"
+ ? root.node.type === "NGMicrosyntax" &&
+ root.node.body.length === 1 &&
+ root.node.body[0].type === "NGMicrosyntaxExpression"
+ ? root.node.body[0].expression
+ : root.node
+ : root.type === "JsExpressionRoot"
+ ? root.node
+ : root;
if (
rootNode &&
(rootNode.type === "ObjectExpression" ||
@@ -282,10 +281,9 @@ function embed(path, print, textToDoc, options) {
if (isScriptLikeTag(node.parent)) {
const parser = inferScriptParser(node.parent);
if (parser) {
- const value =
- parser === "markdown"
- ? dedentString(node.value.replace(/^[^\S\n]*\n/, ""))
- : node.value;
+ const value = parser === "markdown"
+ ? dedentString(node.value.replace(/^[^\S\n]*\n/, ""))
+ : node.value;
const textToDocOptions = { parser, __embeddedInHtml: true };
if (options.parser === "html" && parser === "babel") {
let sourceType = "script";
diff --git ORI/prettier/src/language-html/print-preprocess.js ALT/prettier/src/language-html/print-preprocess.js
index 0add77b..7bc4610 100644
--- ORI/prettier/src/language-html/print-preprocess.js
+++ ALT/prettier/src/language-html/print-preprocess.js
@@ -232,19 +232,18 @@ function extractInterpolation(ast, options) {
node.insertChildBefore(child, {
type: "interpolation",
sourceSpan: new ParseSourceSpan(startSourceSpan, endSourceSpan),
- children:
- value.length === 0
- ? []
- : [
- {
- type: "text",
- value,
- sourceSpan: new ParseSourceSpan(
- startSourceSpan.moveBy(2),
- endSourceSpan.moveBy(-2)
- ),
- },
- ],
+ children: value.length === 0
+ ? []
+ : [
+ {
+ type: "text",
+ value,
+ sourceSpan: new ParseSourceSpan(
+ startSourceSpan.moveBy(2),
+ endSourceSpan.moveBy(-2)
+ ),
+ },
+ ],
});
}
@@ -394,16 +393,12 @@ function addIsSpaceSensitive(ast, options) {
}
for (let index = 0; index < children.length; index++) {
const child = children[index];
- child.isLeadingSpaceSensitive =
- index === 0
- ? child.isLeadingSpaceSensitive
- : child.prev.isTrailingSpaceSensitive &&
- child.isLeadingSpaceSensitive;
- child.isTrailingSpaceSensitive =
- index === children.length - 1
- ? child.isTrailingSpaceSensitive
- : child.next.isLeadingSpaceSensitive &&
- child.isTrailingSpaceSensitive;
+ child.isLeadingSpaceSensitive = index === 0
+ ? child.isLeadingSpaceSensitive
+ : child.prev.isTrailingSpaceSensitive && child.isLeadingSpaceSensitive;
+ child.isTrailingSpaceSensitive = index === children.length - 1
+ ? child.isTrailingSpaceSensitive
+ : child.next.isLeadingSpaceSensitive && child.isTrailingSpaceSensitive;
}
});
}
diff --git ORI/prettier/src/language-html/print/tag.js ALT/prettier/src/language-html/print/tag.js
index 7d97ec0..d317398 100644
--- ORI/prettier/src/language-html/print/tag.js
+++ ALT/prettier/src/language-html/print/tag.js
@@ -228,12 +228,11 @@ function printAttributes(path, options, print) {
node.prev.type === "comment" &&
getPrettierIgnoreAttributeCommentData(node.prev.value);
- const hasPrettierIgnoreAttribute =
- typeof ignoreAttributeData === "boolean"
- ? () => ignoreAttributeData
- : Array.isArray(ignoreAttributeData)
- ? (attribute) => ignoreAttributeData.includes(attribute.rawName)
- : () => false;
+ const hasPrettierIgnoreAttribute = typeof ignoreAttributeData === "boolean"
+ ? () => ignoreAttributeData
+ : Array.isArray(ignoreAttributeData)
+ ? (attribute) => ignoreAttributeData.includes(attribute.rawName)
+ : () => false;
const printedAttributes = path.map((attributePath) => {
const attribute = attributePath.getValue();
@@ -251,8 +250,9 @@ function printAttributes(path, options, print) {
node.attrs[0].fullName === "src" &&
node.children.length === 0;
- const attributeLine =
- options.singleAttributePerLine && node.attrs.length > 1 ? hardline : line;
+ const attributeLine = options.singleAttributePerLine && node.attrs.length > 1
+ ? hardline
+ : line;
/** @type {Doc[]} */
const parts = [
diff --git ORI/prettier/src/language-js/embed.js ALT/prettier/src/language-js/embed.js
index 8703ad9..49273b6 100644
--- ORI/prettier/src/language-js/embed.js
+++ ALT/prettier/src/language-js/embed.js
@@ -177,10 +177,9 @@ function isStyledComponents(path) {
return false;
}
- const tag =
- parent.tag.type === "ParenthesizedExpression"
- ? parent.tag.expression
- : parent.tag;
+ const tag = parent.tag.type === "ParenthesizedExpression"
+ ? parent.tag.expression
+ : parent.tag;
switch (tag.type) {
case "MemberExpression":
diff --git ORI/prettier/src/language-js/embed/html.js ALT/prettier/src/language-js/embed/html.js
index 8913f80..8081846 100644
--- ORI/prettier/src/language-js/embed/html.js
+++ ALT/prettier/src/language-js/embed/html.js
@@ -77,12 +77,11 @@ function format(path, print, textToDoc, options, { parser }) {
const leadingWhitespace = /^\s/.test(text) ? " " : "";
const trailingWhitespace = /\s$/.test(text) ? " " : "";
- const linebreak =
- options.htmlWhitespaceSensitivity === "ignore"
- ? hardline
- : leadingWhitespace && trailingWhitespace
- ? line
- : null;
+ const linebreak = options.htmlWhitespaceSensitivity === "ignore"
+ ? hardline
+ : leadingWhitespace && trailingWhitespace
+ ? line
+ : null;
if (linebreak) {
return group(["`", indent([linebreak, group(contentDoc)]), linebreak, "`"]);
diff --git ORI/prettier/src/language-js/needs-parens.js ALT/prettier/src/language-js/needs-parens.js
index 0695e97..79d5f46 100644
--- ORI/prettier/src/language-js/needs-parens.js
+++ ALT/prettier/src/language-js/needs-parens.js
@@ -467,10 +467,9 @@ function needsParens(path, options) {
);
case "FunctionTypeAnnotation": {
- const ancestor =
- parent.type === "NullableTypeAnnotation"
- ? path.getParentNode(1)
- : parent;
+ const ancestor = parent.type === "NullableTypeAnnotation"
+ ? path.getParentNode(1)
+ : parent;
return (
ancestor.type === "UnionTypeAnnotation" ||
diff --git ORI/prettier/src/language-js/print/array.js ALT/prettier/src/language-js/print/array.js
index 551f675..aeb7390 100644
--- ORI/prettier/src/language-js/print/array.js
+++ ALT/prettier/src/language-js/print/array.js
@@ -74,8 +74,9 @@ function printArray(path, options, print) {
return false;
}
- const itemsKey =
- elementType === "ArrayExpression" ? "elements" : "properties";
+ const itemsKey = elementType === "ArrayExpression"
+ ? "elements"
+ : "properties";
return element[itemsKey] && element[itemsKey].length > 1;
});
diff --git ORI/prettier/src/language-js/print/assignment.js ALT/prettier/src/language-js/print/assignment.js
index 1cb8bc8..a52bb7b 100644
--- ORI/prettier/src/language-js/print/assignment.js
+++ ALT/prettier/src/language-js/print/assignment.js
@@ -251,8 +251,9 @@ function isAssignmentOrVariableDeclarator(node) {
function isComplexTypeAliasParams(node) {
const typeParams = getTypeParametersFromTypeAlias(node);
if (isNonEmptyArray(typeParams)) {
- const constraintPropertyName =
- node.type === "TSTypeAliasDeclaration" ? "constraint" : "bound";
+ const constraintPropertyName = node.type === "TSTypeAliasDeclaration"
+ ? "constraint"
+ : "bound";
if (
typeParams.length > 1 &&
typeParams.some((param) => param[constraintPropertyName] || param.default)
diff --git ORI/prettier/src/language-js/print/call-arguments.js ALT/prettier/src/language-js/print/call-arguments.js
index 187521a..a22cf62 100644
--- ORI/prettier/src/language-js/print/call-arguments.js
+++ ALT/prettier/src/language-js/print/call-arguments.js
@@ -79,10 +79,11 @@ function printCallArguments(path, options, print) {
const maybeTrailingComma =
// Dynamic imports cannot have trailing commas
- !(isDynamicImport || (node.callee && node.callee.type === "Import")) &&
- shouldPrintComma(options, "all")
- ? ","
- : "";
+
+ !(isDynamicImport || (node.callee && node.callee.type === "Import")) &&
+ shouldPrintComma(options, "all")
+ ? ","
+ : "";
function allArgsBrokenOut() {
return group(
diff --git ORI/prettier/src/language-js/print/flow.js ALT/prettier/src/language-js/print/flow.js
index 47ffce0..73284d5 100644
--- ORI/prettier/src/language-js/print/flow.js
+++ ALT/prettier/src/language-js/print/flow.js
@@ -159,14 +159,13 @@ function printFlow(path, options, print) {
group(["{", printDanglingComments(path, options), softline, "}"])
);
} else {
- const members =
- node.members.length > 0
- ? [
- hardline,
- printArrayItems(path, options, "members", print),
- node.hasUnknownMembers || shouldPrintComma(options) ? "," : "",
- ]
- : [];
+ const members = node.members.length > 0
+ ? [
+ hardline,
+ printArrayItems(path, options, "members", print),
+ node.hasUnknownMembers || shouldPrintComma(options) ? "," : "",
+ ]
+ : [];
parts.push(
group([
diff --git ORI/prettier/src/language-js/print/jsx.js ALT/prettier/src/language-js/print/jsx.js
index cb307e4..dd01390 100644
--- ORI/prettier/src/language-js/print/jsx.js
+++ ALT/prettier/src/language-js/print/jsx.js
@@ -66,14 +66,12 @@ function printJsxElementInternal(path, options, print) {
return [print("openingElement"), print("closingElement")];
}
- const openingLines =
- node.type === "JSXElement"
- ? print("openingElement")
- : print("openingFragment");
- const closingLines =
- node.type === "JSXElement"
- ? print("closingElement")
- : print("closingFragment");
+ const openingLines = node.type === "JSXElement"
+ ? print("openingElement")
+ : print("openingFragment");
+ const closingLines = node.type === "JSXElement"
+ ? print("closingElement")
+ : print("closingFragment");
if (
node.children.length === 1 &&
diff --git ORI/prettier/src/language-js/print/object.js ALT/prettier/src/language-js/print/object.js
index f1c789a..c8b13a7 100644
--- ORI/prettier/src/language-js/print/object.js
+++ ALT/prettier/src/language-js/print/object.js
@@ -89,8 +89,11 @@ function printObject(path, options, print) {
: node.type === "TSInterfaceBody" || node.type === "TSTypeLiteral"
? ifBreak(semi, ";")
: ",";
- const leftBrace =
- node.type === "RecordExpression" ? "#{" : node.exact ? "{|" : "{";
+ const leftBrace = node.type === "RecordExpression"
+ ? "#{"
+ : node.exact
+ ? "{|"
+ : "{";
const rightBrace = node.exact ? "|}" : "}";
// Unfortunately, things are grouped together in the ast can be
diff --git ORI/prettier/src/language-js/print/template-literal.js ALT/prettier/src/language-js/print/template-literal.js
index c7bd211..938163d 100644
--- ORI/prettier/src/language-js/print/template-literal.js
+++ ALT/prettier/src/language-js/print/template-literal.js
@@ -97,10 +97,9 @@ function printTemplateLiteral(path, print, options) {
}
}
- const aligned =
- indentSize === 0 && quasi.value.raw.endsWith("\n")
- ? align(Number.NEGATIVE_INFINITY, printed)
- : addAlignmentToDoc(printed, indentSize, tabWidth);
+ const aligned = indentSize === 0 && quasi.value.raw.endsWith("\n")
+ ? align(Number.NEGATIVE_INFINITY, printed)
+ : addAlignmentToDoc(printed, indentSize, tabWidth);
parts.push(group(["${", aligned, lineSuffixBoundary, "}"]));
}
diff --git ORI/prettier/src/language-js/print/type-annotation.js ALT/prettier/src/language-js/print/type-annotation.js
index 88f4c78..fea59be 100644
--- ORI/prettier/src/language-js/print/type-annotation.js
+++ ALT/prettier/src/language-js/print/type-annotation.js
@@ -82,8 +82,9 @@ function printTypeAlias(path, options, print) {
parts.push("declare ");
}
parts.push("type ", print("id"), print("typeParameters"));
- const rightPropertyName =
- node.type === "TSTypeAliasDeclaration" ? "typeAnnotation" : "right";
+ const rightPropertyName = node.type === "TSTypeAliasDeclaration"
+ ? "typeAnnotation"
+ : "right";
return [
printAssignment(path, options, print, parts, " =", rightPropertyName),
semi,
@@ -255,15 +256,14 @@ function printFunctionType(path, options, print) {
// The returnType is not wrapped in a TypeAnnotation, so the colon
// needs to be added separately.
- const returnTypeDoc =
- node.returnType || node.predicate || node.typeAnnotation
- ? [
- isArrowFunctionTypeAnnotation ? " => " : ": ",
- print("returnType"),
- print("predicate"),
- print("typeAnnotation"),
- ]
- : "";
+ const returnTypeDoc = node.returnType || node.predicate || node.typeAnnotation
+ ? [
+ isArrowFunctionTypeAnnotation ? " => " : ": ",
+ print("returnType"),
+ print("predicate"),
+ print("typeAnnotation"),
+ ]
+ : "";
const shouldGroupParameters = shouldGroupFunctionParameters(
node,
@@ -310,7 +310,9 @@ function printTupleType(path, options, print) {
function printIndexedAccessType(path, options, print) {
const node = path.getValue();
const leftDelimiter =
- node.type === "OptionalIndexedAccessType" && node.optional ? "?.[" : "[";
+ node.type === "OptionalIndexedAccessType" && node.optional
+ ? "?.["
+ : "[";
return [print("objectType"), leftDelimiter, print("indexType"), "]"];
}
diff --git ORI/prettier/src/language-js/print/typescript.js ALT/prettier/src/language-js/print/typescript.js
index ea7c79f..eb6925a 100644
--- ORI/prettier/src/language-js/print/typescript.js
+++ ALT/prettier/src/language-js/print/typescript.js
@@ -210,10 +210,9 @@ function printTypescript(path, options, print) {
// using them, it makes sense to have a trailing comma. But if you
// aren't, this is more like a computed property name than an array.
// So we leave off the trailing comma when there's just one parameter.
- const trailingComma =
- node.parameters.length > 1
- ? ifBreak(shouldPrintComma(options) ? "," : "")
- : "";
+ const trailingComma = node.parameters.length > 1
+ ? ifBreak(shouldPrintComma(options) ? "," : "")
+ : "";
const parametersGroup = group([
indent([
diff --git ORI/prettier/src/language-markdown/printer-markdown.js ALT/prettier/src/language-markdown/printer-markdown.js
index 1cd5f82..e6c1d25 100644
--- ORI/prettier/src/language-markdown/printer-markdown.js
+++ ALT/prettier/src/language-markdown/printer-markdown.js
@@ -168,8 +168,9 @@ function genericPrint(path, options, print) {
nextNode.children.length > 0 &&
nextNode.children[0].type === "word" &&
!nextNode.children[0].hasLeadingPunctuation);
- style =
- hasPrevOrNextWord || getAncestorNode(path, "emphasis") ? "*" : "_";
+ style = hasPrevOrNextWord || getAncestorNode(path, "emphasis")
+ ? "*"
+ : "_";
}
return [style, printChildren(path, options, print), style];
}
@@ -199,13 +200,14 @@ function genericPrint(path, options, print) {
const mailto = "mailto:";
const url =
// <[email protected]> is parsed as { url: "mailto:[email protected]" }
- node.url.startsWith(mailto) &&
- options.originalText.slice(
- node.position.start.offset + 1,
- node.position.start.offset + 1 + mailto.length
- ) !== mailto
- ? node.url.slice(mailto.length)
- : node.url;
+
+ node.url.startsWith(mailto) &&
+ options.originalText.slice(
+ node.position.start.offset + 1,
+ node.position.start.offset + 1 + mailto.length
+ ) !== mailto
+ ? node.url.slice(mailto.length)
+ : node.url;
return ["<", url, ">"];
}
case "[":
@@ -887,14 +889,13 @@ function printTitle(title, options, printSpace = true) {
// faster than using RegExps: https://jsperf.com/performance-of-match-vs-split
const singleCount = title.split("'").length - 1;
const doubleCount = title.split('"').length - 1;
- const quote =
- singleCount > doubleCount
- ? '"'
- : doubleCount > singleCount
- ? "'"
- : options.singleQuote
- ? "'"
- : '"';
+ const quote = singleCount > doubleCount
+ ? '"'
+ : doubleCount > singleCount
+ ? "'"
+ : options.singleQuote
+ ? "'"
+ : '"';
title = title.replace(/\\/, "\\\\");
title = title.replace(new RegExp(`(${quote})`, "g"), "\\$1");
return `${quote}${title}${quote}`;
diff --git ORI/prettier/src/language-yaml/printer-yaml.js ALT/prettier/src/language-yaml/printer-yaml.js
index 272eb97..45299b5 100644
--- ORI/prettier/src/language-yaml/printer-yaml.js
+++ ALT/prettier/src/language-yaml/printer-yaml.js
@@ -277,8 +277,9 @@ function printNode(node, parentNode, path, options, print) {
) {
// only quoteDouble can use escape chars
// and quoteSingle do not need to escape backslashes
- const originalQuote =
- node.type === "quoteDouble" ? doubleQuote : singleQuote;
+ const originalQuote = node.type === "quoteDouble"
+ ? doubleQuote
+ : singleQuote;
return [
originalQuote,
printFlowScalarContent(node.type, raw, options),
diff --git ORI/prettier/src/language-yaml/utils.js ALT/prettier/src/language-yaml/utils.js
index 39b768f..ed34589 100644
--- ORI/prettier/src/language-yaml/utils.js
+++ ALT/prettier/src/language-yaml/utils.js
@@ -245,13 +245,12 @@ function getBlockValueLineContents(
node,
{ parentIndent, isLastDescendant, options }
) {
- const content =
- node.position.start.line === node.position.end.line
- ? ""
- : options.originalText
- .slice(node.position.start.offset, node.position.end.offset)
- // exclude open line `>` or `|`
- .match(/^[^\n]*\n(.*)$/s)[1];
+ const content = node.position.start.line === node.position.end.line
+ ? ""
+ : options.originalText
+ .slice(node.position.start.offset, node.position.end.offset)
+ // exclude open line `>` or `|`
+ .match(/^[^\n]*\n(.*)$/s)[1];
let leadingSpaceCount;
if (node.indent === null) {
diff --git ORI/prettier/src/main/support.js ALT/prettier/src/main/support.js
index 6bf3ad8..8d10c6b 100644
--- ORI/prettier/src/main/support.js
+++ ALT/prettier/src/main/support.js
@@ -44,14 +44,13 @@ function getSupportInfo({
option = { ...option };
if (Array.isArray(option.default)) {
- option.default =
- option.default.length === 1
- ? option.default[0].value
- : option.default
- .filter(filterSince)
- .sort((info1, info2) =>
- semver.compare(info2.since, info1.since)
- )[0].value;
+ option.default = option.default.length === 1
+ ? option.default[0].value
+ : option.default
+ .filter(filterSince)
+ .sort((info1, info2) =>
+ semver.compare(info2.since, info1.since)
+ )[0].value;
}
if (Array.isArray(option.choices)) {
diff --git ORI/prettier/tests/config/format-test.js ALT/prettier/tests/config/format-test.js
index 667b747..8e2a0c7 100644
--- ORI/prettier/tests/config/format-test.js
+++ ALT/prettier/tests/config/format-test.js
@@ -100,8 +100,9 @@ const isTestDirectory = (dirname, name) =>
);
function runSpec(fixtures, parsers, options) {
- let { dirname, snippets = [] } =
- typeof fixtures === "string" ? { dirname: fixtures } : fixtures;
+ let { dirname, snippets = [] } = typeof fixtures === "string"
+ ? { dirname: fixtures }
+ : fixtures;
// `IS_PARSER_INFERENCE_TESTS` mean to test `inferParser` on `standalone`
const IS_PARSER_INFERENCE_TESTS = isTestDirectory(
@@ -339,13 +340,12 @@ function runTest({
formatOptions
).eolVisualizedOutput;
// Only if `endOfLine: "auto"` the result will be different
- const expected =
- formatOptions.endOfLine === "auto"
- ? visualizeEndOfLine(
- // All `code` use `LF`, so the `eol` of result is always `LF`
- formatResult.outputWithCursor.replace(/\n/g, eol)
- )
- : formatResult.eolVisualizedOutput;
+ const expected = formatOptions.endOfLine === "auto"
+ ? visualizeEndOfLine(
+ // All `code` use `LF`, so the `eol` of result is always `LF`
+ formatResult.outputWithCursor.replace(/\n/g, eol)
+ )
+ : formatResult.eolVisualizedOutput;
expect(output).toEqual(expected);
});
}
diff --git ORI/prettier/tests/config/utils/check-parsers.js ALT/prettier/tests/config/utils/check-parsers.js
index 8234ebe..810941c 100644
--- ORI/prettier/tests/config/utils/check-parsers.js
+++ ALT/prettier/tests/config/utils/check-parsers.js
@@ -159,10 +159,9 @@ const checkParser = ({ dirname, files }, parsers = []) => {
if (allowedParsers && !allowedParsers.includes(parser)) {
const suggestCategories = getParserCategories(parser);
- const suggestion =
- suggestCategories.length === 0
- ? ""
- : outdent`
+ const suggestion = suggestCategories.length === 0
+ ? ""
+ : outdent`
Suggest move your tests to:
${suggestCategories
.map((category) => `- ${path.join(TESTS_ROOT, category)}`)
diff --git ORI/prettier/tests/format/json/json-superset/jsfmt.spec.js ALT/prettier/tests/format/json/json-superset/jsfmt.spec.js
index 4bc498a..38b10cd 100644
--- ORI/prettier/tests/format/json/json-superset/jsfmt.spec.js
+++ ALT/prettier/tests/format/json/json-superset/jsfmt.spec.js
@@ -23,10 +23,9 @@ run_spec(
...[...characters, LINE_FEED].map((character) => ({
name: `json(\\${characterCode(character)})`,
code: SINGLE_QUOTE + BACKSLASH + character + SINGLE_QUOTE,
- output:
- character === UNDERSCORE || character === SPACE
- ? DOUBLE_QUOTE + character + DOUBLE_QUOTE + LINE_FEED
- : DOUBLE_QUOTE + BACKSLASH + character + DOUBLE_QUOTE + LINE_FEED,
+ output: character === UNDERSCORE || character === SPACE
+ ? DOUBLE_QUOTE + character + DOUBLE_QUOTE + LINE_FEED
+ : DOUBLE_QUOTE + BACKSLASH + character + DOUBLE_QUOTE + LINE_FEED,
})),
...characters.map((character) => ({
name: `json(\\\\${characterCode(character)})`,
@@ -56,10 +55,9 @@ run_spec(
...[...characters, LINE_FEED].map((character) => ({
name: `json-stringify(\\${characterCode(character)})`,
code: SINGLE_QUOTE + BACKSLASH + character + SINGLE_QUOTE,
- output:
- character === UNDERSCORE || character === SPACE
- ? DOUBLE_QUOTE + character + DOUBLE_QUOTE + LINE_FEED
- : DOUBLE_QUOTE + DOUBLE_QUOTE + LINE_FEED,
+ output: character === UNDERSCORE || character === SPACE
+ ? DOUBLE_QUOTE + character + DOUBLE_QUOTE + LINE_FEED
+ : DOUBLE_QUOTE + DOUBLE_QUOTE + LINE_FEED,
})),
...characters.map((character) => ({
name: `json-stringify(\\\\${characterCode(character)})`,
diff --git ORI/prettier/website/playground/util.js ALT/prettier/website/playground/util.js
index 2752aeb..921f214 100644
--- ORI/prettier/website/playground/util.js
+++ ALT/prettier/website/playground/util.js
@@ -10,8 +10,9 @@ export function getDefaults(availableOptions, optionNames) {
const defaults = {};
for (const option of availableOptions) {
if (optionNames.includes(option.name)) {
- defaults[option.name] =
- option.name === "parser" ? "babel" : option.default;
+ defaults[option.name] = option.name === "parser"
+ ? "babel"
+ : option.default;
}
}
return defaults;
diff --git ORI/prettier/website/versioned_docs/version-stable/rationale.md ALT/prettier/website/versioned_docs/version-stable/rationale.md
index d5c2726..53e3547 100644
--- ORI/prettier/website/versioned_docs/version-stable/rationale.md
+++ ALT/prettier/website/versioned_docs/version-stable/rationale.md
@@ -296,8 +296,9 @@ Prettier will turn the above into:
```js
// eslint-disable-next-line no-eval
-const result =
- safeToEval && settings.allowNativeEval ? eval(input) : fallback(input);
+const result = safeToEval && settings.allowNativeEval
+ ? eval(input)
+ : fallback(input);
```
Which means that the `eslint-disable-next-line` comment is no longer effective. In this case you need to move the comment: |
|
prettier/prettier#12087 VS prettier/prettier@main :: marmelab/react-admin@5ae855a Diff (1499 lines)diff --git ORI/react-admin/examples/crm/src/App.tsx ALT/react-admin/examples/crm/src/App.tsx
index 8f58b4c..6a2f31e 100644
--- ORI/react-admin/examples/crm/src/App.tsx
+++ ALT/react-admin/examples/crm/src/App.tsx
@@ -14,10 +14,9 @@ import deals from './deals';
import { Dashboard } from './dashboard/Dashboard';
// FIXME MUI bug https://github.com/mui-org/material-ui/issues/13394
-const theme =
- process.env.NODE_ENV !== 'production'
- ? unstable_createMuiStrictModeTheme(defaultTheme)
- : createTheme(defaultTheme);
+const theme = process.env.NODE_ENV !== 'production'
+ ? unstable_createMuiStrictModeTheme(defaultTheme)
+ : createTheme(defaultTheme);
const App = () => (
<Admin
diff --git ORI/react-admin/examples/crm/src/dataGenerator/companies.ts ALT/react-admin/examples/crm/src/dataGenerator/companies.ts
index 1284053..3e52b86 100644
--- ORI/react-admin/examples/crm/src/dataGenerator/companies.ts
+++ ALT/react-admin/examples/crm/src/dataGenerator/companies.ts
@@ -43,8 +43,9 @@ export const generateCompanies = (db: Db): Company[] => {
nb_contacts: 0,
nb_deals: 0,
// at least 1/3rd of companies for Jane Doe
- sales_id:
- random.number(2) === 0 ? 0 : random.arrayElement(db.sales).id,
+ sales_id: random.number(2) === 0
+ ? 0
+ : random.arrayElement(db.sales).id,
created_at: randomDate().toISOString(),
};
});
diff --git ORI/react-admin/examples/crm/src/dataGenerator/utils.ts ALT/react-admin/examples/crm/src/dataGenerator/utils.ts
index 41f5bdf..cb4f665 100644
--- ORI/react-admin/examples/crm/src/dataGenerator/utils.ts
+++ ALT/react-admin/examples/crm/src/dataGenerator/utils.ts
@@ -13,10 +13,9 @@ export const weightedBoolean = (likelyhood: number) =>
faker.random.number(99) < likelyhood;
export const randomDate = (minDate?: Date, maxDate?: Date) => {
- const minTs =
- minDate instanceof Date
- ? minDate.getTime()
- : Date.now() - 5 * 365 * 24 * 60 * 60 * 1000; // 5 years
+ const minTs = minDate instanceof Date
+ ? minDate.getTime()
+ : Date.now() - 5 * 365 * 24 * 60 * 60 * 1000; // 5 years
const maxTs = maxDate instanceof Date ? maxDate.getTime() : Date.now();
const range = maxTs - minTs;
const randomRange = faker.random.number({ max: range });
diff --git ORI/react-admin/examples/data-generator/src/commands.ts ALT/react-admin/examples/data-generator/src/commands.ts
index b6c150b..d42288f 100644
--- ORI/react-admin/examples/data-generator/src/commands.ts
+++ ALT/react-admin/examples/data-generator/src/commands.ts
@@ -42,10 +42,9 @@ export default (db, { serializeDate }) => {
const customer = random.arrayElement<any>(realCustomers);
const date = randomDate(customer.first_seen, customer.last_seen);
- const status =
- isAfter(date, aMonthAgo) && random.boolean()
- ? 'ordered'
- : weightedArrayElement(['delivered', 'cancelled'], [10, 1]);
+ const status = isAfter(date, aMonthAgo) && random.boolean()
+ ? 'ordered'
+ : weightedArrayElement(['delivered', 'cancelled'], [10, 1]);
return {
id,
reference: random.alphaNumeric(6).toUpperCase(),
diff --git ORI/react-admin/examples/data-generator/src/customers.ts ALT/react-admin/examples/data-generator/src/customers.ts
index 74db3cf..5490b73 100644
--- ORI/react-admin/examples/data-generator/src/customers.ts
+++ ALT/react-admin/examples/data-generator/src/customers.ts
@@ -36,8 +36,9 @@ export default (db, { serializeDate }) => {
city: has_ordered ? address.city() : null,
stateAbbr: has_ordered ? address.stateAbbr() : null,
avatar,
- birthday:
- serializeDate && birthday ? birthday.toISOString() : birthday,
+ birthday: serializeDate && birthday
+ ? birthday.toISOString()
+ : birthday,
first_seen: serializeDate ? first_seen.toISOString() : first_seen,
last_seen: serializeDate ? last_seen.toISOString() : last_seen,
has_ordered: has_ordered,
diff --git ORI/react-admin/examples/data-generator/src/utils.ts ALT/react-admin/examples/data-generator/src/utils.ts
index b1f5d5f..4073952 100644
--- ORI/react-admin/examples/data-generator/src/utils.ts
+++ ALT/react-admin/examples/data-generator/src/utils.ts
@@ -13,10 +13,9 @@ export const weightedBoolean = likelyhood =>
faker.random.number(99) < likelyhood;
export const randomDate = (minDate?: Date, maxDate?: Date) => {
- const minTs =
- minDate instanceof Date
- ? minDate.getTime()
- : Date.now() - 5 * 365 * 24 * 60 * 60 * 1000; // 5 years
+ const minTs = minDate instanceof Date
+ ? minDate.getTime()
+ : Date.now() - 5 * 365 * 24 * 60 * 60 * 1000; // 5 years
const maxTs = maxDate instanceof Date ? maxDate.getTime() : Date.now();
const range = maxTs - minTs;
const randomRange = faker.random.number({ max: range });
diff --git ORI/react-admin/examples/demo/src/dashboard/Welcome.tsx ALT/react-admin/examples/demo/src/dashboard/Welcome.tsx
index 63d16fa..c2620fc 100644
--- ORI/react-admin/examples/demo/src/dashboard/Welcome.tsx
+++ ALT/react-admin/examples/demo/src/dashboard/Welcome.tsx
@@ -9,10 +9,9 @@ import publishArticleImage from './welcome_illustration.svg';
const useStyles = makeStyles(theme => ({
root: {
- background:
- theme.palette.type === 'dark'
- ? '#535353'
- : `linear-gradient(to right, #8975fb 0%, #746be7 35%), linear-gradient(to bottom, #8975fb 0%, #6f4ceb 50%), #6f4ceb`,
+ background: theme.palette.type === 'dark'
+ ? '#535353'
+ : `linear-gradient(to right, #8975fb 0%, #746be7 35%), linear-gradient(to bottom, #8975fb 0%, #6f4ceb 50%), #6f4ceb`,
color: '#fff',
padding: 20,
diff --git ORI/react-admin/examples/demo/src/layout/Login.tsx ALT/react-admin/examples/demo/src/layout/Login.tsx
index 20c4100..0585b9a 100644
--- ORI/react-admin/examples/demo/src/layout/Login.tsx
+++ ALT/react-admin/examples/demo/src/layout/Login.tsx
@@ -102,12 +102,11 @@ const Login = () => {
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
);
diff --git ORI/react-admin/examples/demo/src/orders/OrderList.tsx ALT/react-admin/examples/demo/src/orders/OrderList.tsx
index 279534d..48ecefd 100644
--- ORI/react-admin/examples/demo/src/orders/OrderList.tsx
+++ ALT/react-admin/examples/demo/src/orders/OrderList.tsx
@@ -130,12 +130,11 @@ const TabbedDatagrid = (props: TabbedDatagridProps) => {
[displayedFilters, filterValues, setFilters]
);
- const selectedIds =
- filterValues.status === 'ordered'
- ? ordered
- : filterValues.status === 'delivered'
- ? delivered
- : cancelled;
+ const selectedIds = filterValues.status === 'ordered'
+ ? ordered
+ : filterValues.status === 'delivered'
+ ? delivered
+ : cancelled;
return (
<Fragment>
diff --git ORI/react-admin/examples/demo/src/visitors/Aside.tsx ALT/react-admin/examples/demo/src/visitors/Aside.tsx
index 9776030..4924048 100644
--- ORI/react-admin/examples/demo/src/visitors/Aside.tsx
+++ ALT/react-admin/examples/demo/src/visitors/Aside.tsx
@@ -200,10 +200,9 @@ const EventList = ({ record, basePath }: EventListProps) => {
>
<StepLabel
StepIconComponent={() => {
- const Component =
- event.type === 'order'
- ? order.icon
- : review.icon;
+ const Component = event.type === 'order'
+ ? order.icon
+ : review.icon;
return (
<Component
fontSize="small"
@@ -256,22 +255,20 @@ const mixOrdersAndReviews = (
reviews?: RecordMap<ReviewRecord>,
reviewIds?: Identifier[]
): AsideEvent[] => {
- const eventsFromOrders =
- orderIds && orders
- ? orderIds.map<AsideEvent>(id => ({
- type: 'order',
- date: orders[id].date,
- data: orders[id],
- }))
- : [];
- const eventsFromReviews =
- reviewIds && reviews
- ? reviewIds.map<AsideEvent>(id => ({
- type: 'review',
- date: reviews[id].date,
- data: reviews[id],
- }))
- : [];
+ const eventsFromOrders = orderIds && orders
+ ? orderIds.map<AsideEvent>(id => ({
+ type: 'order',
+ date: orders[id].date,
+ data: orders[id],
+ }))
+ : [];
+ const eventsFromReviews = reviewIds && reviews
+ ? reviewIds.map<AsideEvent>(id => ({
+ type: 'review',
+ date: reviews[id].date,
+ data: reviews[id],
+ }))
+ : [];
const events = eventsFromOrders.concat(eventsFromReviews);
events.sort(
(e1, e2) => new Date(e2.date).getTime() - new Date(e1.date).getTime()
diff --git ORI/react-admin/examples/no-code/src/main.tsx ALT/react-admin/examples/no-code/src/main.tsx
index 984421f..4ef4e03 100644
--- ORI/react-admin/examples/no-code/src/main.tsx
+++ ALT/react-admin/examples/no-code/src/main.tsx
@@ -8,10 +8,9 @@ import {
} from '@material-ui/core/styles';
// FIXME MUI bug https://github.com/mui-org/material-ui/issues/13394
-const theme =
- process.env.NODE_ENV !== 'production'
- ? unstable_createMuiStrictModeTheme(defaultTheme)
- : createTheme(defaultTheme);
+const theme = process.env.NODE_ENV !== 'production'
+ ? unstable_createMuiStrictModeTheme(defaultTheme)
+ : createTheme(defaultTheme);
ReactDOM.render(
<React.StrictMode>
diff --git ORI/react-admin/packages/ra-core/src/auth/useLogoutIfAccessDenied.ts ALT/react-admin/packages/ra-core/src/auth/useLogoutIfAccessDenied.ts
index d49e4ab..eecf1d0 100644
--- ORI/react-admin/packages/ra-core/src/auth/useLogoutIfAccessDenied.ts
+++ ALT/react-admin/packages/ra-core/src/auth/useLogoutIfAccessDenied.ts
@@ -83,12 +83,11 @@ const useLogoutIfAccessDenied = (): LogoutIfAccessDenied => {
})
.catch(() => {});
}
- const redirectTo =
- e && e.redirectTo
- ? e.redirectTo
- : error && error.redirectTo
- ? error.redirectTo
- : undefined;
+ const redirectTo = e && e.redirectTo
+ ? e.redirectTo
+ : error && error.redirectTo
+ ? error.redirectTo
+ : undefined;
if (logoutUser) {
logout({}, redirectTo);
diff --git ORI/react-admin/packages/ra-core/src/controller/button/useDeleteWithConfirmController.tsx ALT/react-admin/packages/ra-core/src/controller/button/useDeleteWithConfirmController.tsx
index 576132e..4833d48 100644
--- ORI/react-admin/packages/ra-core/src/controller/button/useDeleteWithConfirmController.tsx
+++ ALT/react-admin/packages/ra-core/src/controller/button/useDeleteWithConfirmController.tsx
@@ -110,12 +110,11 @@ const useDeleteWithConfirmController = (
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
);
diff --git ORI/react-admin/packages/ra-core/src/controller/button/useDeleteWithUndoController.tsx ALT/react-admin/packages/ra-core/src/controller/button/useDeleteWithUndoController.tsx
index a354d05..97da5c3 100644
--- ORI/react-admin/packages/ra-core/src/controller/button/useDeleteWithUndoController.tsx
+++ ALT/react-admin/packages/ra-core/src/controller/button/useDeleteWithUndoController.tsx
@@ -65,40 +65,37 @@ const useDeleteWithUndoController = (
const [deleteOne, { loading }] = useDelete(resource, null, null, {
action: CRUD_DELETE,
- onSuccess:
- onSuccess !== undefined
- ? onSuccess
- : () => {
- notify('ra.notification.deleted', {
- type: 'info',
- messageArgs: { smart_count: 1 },
- undoable: true,
- });
- redirect(redirectTo, basePath || `/${resource}`);
- refresh();
- },
- onFailure:
- onFailure !== undefined
- ? onFailure
- : error => {
- notify(
- typeof error === 'string'
- ? error
- : error.message || 'ra.notification.http_error',
- {
- type: 'warning',
- messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
- },
- }
- );
- refresh();
- },
+ onSuccess: onSuccess !== undefined
+ ? onSuccess
+ : () => {
+ notify('ra.notification.deleted', {
+ type: 'info',
+ messageArgs: { smart_count: 1 },
+ undoable: true,
+ });
+ redirect(redirectTo, basePath || `/${resource}`);
+ refresh();
+ },
+ onFailure: onFailure !== undefined
+ ? onFailure
+ : error => {
+ notify(
+ typeof error === 'string'
+ ? error
+ : error.message || 'ra.notification.http_error',
+ {
+ type: 'warning',
+ messageArgs: {
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
+ },
+ }
+ );
+ refresh();
+ },
mutationMode: 'undoable',
});
const handleDelete = useCallback(
diff --git ORI/react-admin/packages/ra-core/src/controller/details/useCreateController.ts ALT/react-admin/packages/ra-core/src/controller/details/useCreateController.ts
index 5b0738e..13b2c4a 100644
--- ORI/react-admin/packages/ra-core/src/controller/details/useCreateController.ts
+++ ALT/react-admin/packages/ra-core/src/controller/details/useCreateController.ts
@@ -190,12 +190,11 @@ export const useCreateController = <
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
);
diff --git ORI/react-admin/packages/ra-core/src/controller/details/useEditController.ts ALT/react-admin/packages/ra-core/src/controller/details/useEditController.ts
index 6c68afa..a70b289 100644
--- ORI/react-admin/packages/ra-core/src/controller/details/useEditController.ts
+++ ALT/react-admin/packages/ra-core/src/controller/details/useEditController.ts
@@ -218,12 +218,11 @@ export const useEditController = <RecordType extends Record = Record>(
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
);
diff --git ORI/react-admin/packages/ra-core/src/controller/field/useReferenceArrayFieldController.ts ALT/react-admin/packages/ra-core/src/controller/field/useReferenceArrayFieldController.ts
index 48b0898..19cbd87 100644
--- ORI/react-admin/packages/ra-core/src/controller/field/useReferenceArrayFieldController.ts
+++ ALT/react-admin/packages/ra-core/src/controller/field/useReferenceArrayFieldController.ts
@@ -76,12 +76,11 @@ const useReferenceArrayFieldController = (
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
),
diff --git ORI/react-admin/packages/ra-core/src/controller/field/useReferenceManyFieldController.ts ALT/react-admin/packages/ra-core/src/controller/field/useReferenceManyFieldController.ts
index 695f932..b6faa99 100644
--- ORI/react-admin/packages/ra-core/src/controller/field/useReferenceManyFieldController.ts
+++ ALT/react-admin/packages/ra-core/src/controller/field/useReferenceManyFieldController.ts
@@ -172,12 +172,11 @@ const useReferenceManyFieldController = (
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
),
diff --git ORI/react-admin/packages/ra-core/src/controller/input/referenceDataStatus.ts ALT/react-admin/packages/ra-core/src/controller/input/referenceDataStatus.ts
index 2677b32..38c2c6e 100644
--- ORI/react-admin/packages/ra-core/src/controller/input/referenceDataStatus.ts
+++ ALT/react-admin/packages/ra-core/src/controller/input/referenceDataStatus.ts
@@ -28,12 +28,11 @@ export const getStatusForInput = ({
_: matchingReferences.error,
})
: null;
- const selectedReferenceError =
- input.value && !referenceRecord
- ? translate('ra.input.references.single_missing', {
- _: 'ra.input.references.single_missing',
- })
- : null;
+ const selectedReferenceError = input.value && !referenceRecord
+ ? translate('ra.input.references.single_missing', {
+ _: 'ra.input.references.single_missing',
+ })
+ : null;
return {
waiting:
diff --git ORI/react-admin/packages/ra-core/src/controller/input/useReferenceArrayInputController.ts ALT/react-admin/packages/ra-core/src/controller/input/useReferenceArrayInputController.ts
index 339e30e..ed61d3b 100644
--- ORI/react-admin/packages/ra-core/src/controller/input/useReferenceArrayInputController.ts
+++ ALT/react-admin/packages/ra-core/src/controller/input/useReferenceArrayInputController.ts
@@ -301,10 +301,9 @@ export const useReferenceArrayInputController = (
currentSort: sort,
// For the ListContext, we don't want to always display the selected items first.
// Indeed it wouldn't work well regarding sorting and pagination
- data:
- matchingReferences && matchingReferences.length > 0
- ? indexById(matchingReferences)
- : {},
+ data: matchingReferences && matchingReferences.length > 0
+ ? indexById(matchingReferences)
+ : {},
displayedFilters,
error: dataStatus.error,
filterValues,
diff --git ORI/react-admin/packages/ra-core/src/controller/useExpanded.tsx ALT/react-admin/packages/ra-core/src/controller/useExpanded.tsx
index 2b8fd65..f7ec855 100644
--- ORI/react-admin/packages/ra-core/src/controller/useExpanded.tsx
+++ ALT/react-admin/packages/ra-core/src/controller/useExpanded.tsx
@@ -29,10 +29,9 @@ const useExpanded = (
? reduxState.admin.resources[resource].list.expanded
: undefined
);
- const expanded =
- expandedList === undefined
- ? false
- : expandedList.map(el => el == id).indexOf(true) !== -1; // eslint-disable-line eqeqeq
+ const expanded = expandedList === undefined
+ ? false
+ : expandedList.map(el => el == id).indexOf(true) !== -1; // eslint-disable-line eqeqeq
const toggleExpanded = useCallback(() => {
dispatch(toggleListItemExpand(resource, id));
}, [dispatch, resource, id]);
diff --git ORI/react-admin/packages/ra-core/src/controller/useListController.ts ALT/react-admin/packages/ra-core/src/controller/useListController.ts
index 1961864..c7acbac 100644
--- ORI/react-admin/packages/ra-core/src/controller/useListController.ts
+++ ALT/react-admin/packages/ra-core/src/controller/useListController.ts
@@ -168,12 +168,11 @@ const useListController = <RecordType extends Record = Record>(
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
),
diff --git ORI/react-admin/packages/ra-core/src/controller/useListParams.ts ALT/react-admin/packages/ra-core/src/controller/useListParams.ts
index 7faf4a7..c3b2562 100644
--- ORI/react-admin/packages/ra-core/src/controller/useListParams.ts
+++ ALT/react-admin/packages/ra-core/src/controller/useListParams.ts
@@ -342,12 +342,11 @@ export const getQuery = ({
sort,
perPage,
}) => {
- const query: Partial<ListParams> =
- Object.keys(queryFromLocation).length > 0
- ? queryFromLocation
- : hasCustomParams(params)
- ? { ...params }
- : { filter: filterDefaultValues || {} };
+ const query: Partial<ListParams> = Object.keys(queryFromLocation).length > 0
+ ? queryFromLocation
+ : hasCustomParams(params)
+ ? { ...params }
+ : { filter: filterDefaultValues || {} };
if (!query.sort) {
query.sort = sort.field;
@@ -371,10 +370,9 @@ export const getNumberOrDefault = (
possibleNumber: string | number | undefined,
defaultValue: number
) => {
- const parsedNumber =
- typeof possibleNumber === 'string'
- ? parseInt(possibleNumber, 10)
- : possibleNumber;
+ const parsedNumber = typeof possibleNumber === 'string'
+ ? parseInt(possibleNumber, 10)
+ : possibleNumber;
return isNaN(parsedNumber) ? defaultValue : parsedNumber;
};
diff --git ORI/react-admin/packages/ra-core/src/controller/useSortState.ts ALT/react-admin/packages/ra-core/src/controller/useSortState.ts
index b6d5940..c94f97a 100644
--- ORI/react-admin/packages/ra-core/src/controller/useSortState.ts
+++ ALT/react-admin/packages/ra-core/src/controller/useSortState.ts
@@ -28,12 +28,11 @@ const sortReducer = (state: SortPayload, action: Action): SortPayload => {
return action.payload.sort;
case 'SET_SORT_FIELD': {
const { field } = action.payload;
- const order =
- state.field === field
- ? state.order === SORT_ASC
- ? SORT_DESC
- : SORT_ASC
- : SORT_ASC;
+ const order = state.field === field
+ ? state.order === SORT_ASC
+ ? SORT_DESC
+ : SORT_ASC
+ : SORT_ASC;
return { field, order };
}
case 'SET_SORT_ORDER': {
diff --git ORI/react-admin/packages/ra-core/src/core/CoreAdminContext.tsx ALT/react-admin/packages/ra-core/src/core/CoreAdminContext.tsx
index 089b013..c6e5279 100644
--- ORI/react-admin/packages/ra-core/src/core/CoreAdminContext.tsx
+++ ALT/react-admin/packages/ra-core/src/core/CoreAdminContext.tsx
@@ -58,15 +58,13 @@ const CoreAdminContext = (props: AdminContextProps) => {
React-admin requires a valid dataProvider function to work.`);
}
- const finalAuthProvider =
- authProvider instanceof Function
- ? convertLegacyAuthProvider(authProvider)
- : authProvider;
+ const finalAuthProvider = authProvider instanceof Function
+ ? convertLegacyAuthProvider(authProvider)
+ : authProvider;
- const finalDataProvider =
- dataProvider instanceof Function
- ? convertLegacyDataProvider(dataProvider)
- : dataProvider;
+ const finalDataProvider = dataProvider instanceof Function
+ ? convertLegacyDataProvider(dataProvider)
+ : dataProvider;
const finalHistory = history || createHashHistory();
diff --git ORI/react-admin/packages/ra-core/src/dataProvider/useQueryWithStore.ts ALT/react-admin/packages/ra-core/src/dataProvider/useQueryWithStore.ts
index 9f86d25..9a35ce5 100644
--- ORI/react-admin/packages/ra-core/src/dataProvider/useQueryWithStore.ts
+++ ALT/react-admin/packages/ra-core/src/dataProvider/useQueryWithStore.ts
@@ -219,8 +219,9 @@ export const useQueryWithStore = <
resolve({
error: null,
loading: false,
- loaded:
- options?.enabled === false ? false : true,
+ loaded: options?.enabled === false
+ ? false
+ : true,
});
})
.catch(error => {
diff --git ORI/react-admin/packages/ra-core/src/form/FormWithRedirect.tsx ALT/react-admin/packages/ra-core/src/form/FormWithRedirect.tsx
index d0ab045..37601e0 100644
--- ORI/react-admin/packages/ra-core/src/form/FormWithRedirect.tsx
+++ ALT/react-admin/packages/ra-core/src/form/FormWithRedirect.tsx
@@ -142,10 +142,9 @@ const FormWithRedirect = ({
);
const submit = values => {
- const finalRedirect =
- typeof redirect.current === undefined
- ? props.redirect
- : redirect.current;
+ const finalRedirect = typeof redirect.current === undefined
+ ? props.redirect
+ : redirect.current;
if (shouldSanitizeEmptyValues) {
const sanitizedValues = sanitizeEmptyValues(
diff --git ORI/react-admin/packages/ra-core/src/form/sanitizeEmptyValues.ts ALT/react-admin/packages/ra-core/src/form/sanitizeEmptyValues.ts
index bec5d15..3fb280f 100644
--- ORI/react-admin/packages/ra-core/src/form/sanitizeEmptyValues.ts
+++ ALT/react-admin/packages/ra-core/src/form/sanitizeEmptyValues.ts
@@ -33,8 +33,9 @@ const sanitizeEmptyValues = (initialValues: object, values: object) => {
) {
acc[key] = sanitizeEmptyValues(initialValues[key], values[key]);
} else {
- acc[key] =
- typeof values[key] === 'undefined' ? null : values[key];
+ acc[key] = typeof values[key] === 'undefined'
+ ? null
+ : values[key];
}
return acc;
},
diff --git ORI/react-admin/packages/ra-core/src/form/useChoices.ts ALT/react-admin/packages/ra-core/src/form/useChoices.ts
index 65e3858..9ac9f5f 100644
--- ORI/react-admin/packages/ra-core/src/form/useChoices.ts
+++ ALT/react-admin/packages/ra-core/src/form/useChoices.ts
@@ -60,10 +60,9 @@ const useChoices = ({
record: choice,
});
}
- const choiceName =
- typeof optionText === 'function'
- ? optionText(choice)
- : get(choice, optionText);
+ const choiceName = typeof optionText === 'function'
+ ? optionText(choice)
+ : get(choice, optionText);
return isValidElement(choiceName)
? choiceName
diff --git ORI/react-admin/packages/ra-core/src/reducer/admin/resource/list/queryReducer.ts ALT/react-admin/packages/ra-core/src/reducer/admin/resource/list/queryReducer.ts
index 9892d00..ef09067 100644
--- ORI/react-admin/packages/ra-core/src/reducer/admin/resource/list/queryReducer.ts
+++ ALT/react-admin/packages/ra-core/src/reducer/admin/resource/list/queryReducer.ts
@@ -99,14 +99,13 @@ const queryReducer: Reducer<ListParams> = (
}
return {
...previousState,
- filter:
- typeof action.payload.defaultValue !== 'undefined'
- ? set(
- previousState.filter,
- action.payload.filterName,
- action.payload.defaultValue
- )
- : previousState.filter,
+ filter: typeof action.payload.defaultValue !== 'undefined'
+ ? set(
+ previousState.filter,
+ action.payload.filterName,
+ action.payload.defaultValue
+ )
+ : previousState.filter,
// we don't use lodash.set() for displayed filters
// to avoid problems with compound filter names (e.g. 'author.name')
displayedFilters: {
diff --git ORI/react-admin/packages/ra-data-simple-rest/src/index.ts ALT/react-admin/packages/ra-data-simple-rest/src/index.ts
index a9e1c4c..08c6888 100644
--- ORI/react-admin/packages/ra-data-simple-rest/src/index.ts
+++ ALT/react-admin/packages/ra-data-simple-rest/src/index.ts
@@ -51,15 +51,14 @@ export default (
filter: JSON.stringify(params.filter),
};
const url = `${apiUrl}/${resource}?${stringify(query)}`;
- const options =
- countHeader === 'Content-Range'
- ? {
- // Chrome doesn't return `Content-Range` header if no `Range` is provided in the request.
- headers: new Headers({
- Range: `${resource}=${rangeStart}-${rangeEnd}`,
- }),
- }
- : {};
+ const options = countHeader === 'Content-Range'
+ ? {
+ // Chrome doesn't return `Content-Range` header if no `Range` is provided in the request.
+ headers: new Headers({
+ Range: `${resource}=${rangeStart}-${rangeEnd}`,
+ }),
+ }
+ : {};
return httpClient(url, options).then(({ headers, json }) => {
if (!headers.has(countHeader)) {
@@ -69,13 +68,12 @@ export default (
}
return {
data: json,
- total:
- countHeader === 'Content-Range'
- ? parseInt(
- headers.get('content-range').split('/').pop(),
- 10
- )
- : parseInt(headers.get(countHeader.toLowerCase())),
+ total: countHeader === 'Content-Range'
+ ? parseInt(
+ headers.get('content-range').split('/').pop(),
+ 10
+ )
+ : parseInt(headers.get(countHeader.toLowerCase())),
};
});
},
@@ -109,15 +107,14 @@ export default (
}),
};
const url = `${apiUrl}/${resource}?${stringify(query)}`;
- const options =
- countHeader === 'Content-Range'
- ? {
- // Chrome doesn't return `Content-Range` header if no `Range` is provided in the request.
- headers: new Headers({
- Range: `${resource}=${rangeStart}-${rangeEnd}`,
- }),
- }
- : {};
+ const options = countHeader === 'Content-Range'
+ ? {
+ // Chrome doesn't return `Content-Range` header if no `Range` is provided in the request.
+ headers: new Headers({
+ Range: `${resource}=${rangeStart}-${rangeEnd}`,
+ }),
+ }
+ : {};
return httpClient(url, options).then(({ headers, json }) => {
if (!headers.has(countHeader)) {
@@ -127,13 +124,12 @@ export default (
}
return {
data: json,
- total:
- countHeader === 'Content-Range'
- ? parseInt(
- headers.get('content-range').split('/').pop(),
- 10
- )
- : parseInt(headers.get(countHeader.toLowerCase())),
+ total: countHeader === 'Content-Range'
+ ? parseInt(
+ headers.get('content-range').split('/').pop(),
+ 10
+ )
+ : parseInt(headers.get(countHeader.toLowerCase())),
};
});
},
diff --git ORI/react-admin/packages/ra-input-rich-text/src/index.tsx ALT/react-admin/packages/ra-input-rich-text/src/index.tsx
index 43526c8..085d611 100644
--- ORI/react-admin/packages/ra-input-rich-text/src/index.tsx
+++ ALT/react-admin/packages/ra-input-rich-text/src/index.tsx
@@ -71,10 +71,9 @@ const RichTextInput = (props: RichTextInputProps) => {
// eslint-disable-next-line react-hooks/exhaustive-deps
const onTextChange = useCallback(
debounce(() => {
- const value =
- editor.current.innerHTML === '<p><br></p>'
- ? ''
- : editor.current.innerHTML;
+ const value = editor.current.innerHTML === '<p><br></p>'
+ ? ''
+ : editor.current.innerHTML;
if (lastValueChange.current !== value) {
lastValueChange.current = value;
diff --git ORI/react-admin/packages/ra-input-rich-text/src/styles.ts ALT/react-admin/packages/ra-input-rich-text/src/styles.ts
index d649c9c..f00173f 100644
--- ORI/react-admin/packages/ra-input-rich-text/src/styles.ts
+++ ALT/react-admin/packages/ra-input-rich-text/src/styles.ts
@@ -13,15 +13,13 @@ export default (theme: Theme): StyleRules<string, any> => ({
fontSize: '1rem',
fontFamily: 'Roboto, sans-serif',
padding: '6px 12px',
- backgroundColor:
- theme.palette.type === 'dark'
- ? 'rgba(255, 255, 255, 0.04)'
- : 'rgba(0, 0, 0, 0.04)',
+ backgroundColor: theme.palette.type === 'dark'
+ ? 'rgba(255, 255, 255, 0.04)'
+ : 'rgba(0, 0, 0, 0.04)',
'&:hover::before': {
- backgroundColor:
- theme.palette.type === 'dark'
- ? 'rgba(255, 255, 255, 1)'
- : 'rgba(0, 0, 0, 1)',
+ backgroundColor: theme.palette.type === 'dark'
+ ? 'rgba(255, 255, 255, 1)'
+ : 'rgba(0, 0, 0, 1)',
height: 2,
},
@@ -34,10 +32,9 @@ export default (theme: Theme): StyleRules<string, any> => ({
position: 'absolute',
transition:
'background-color 200ms cubic-bezier(0.4, 0, 0.2, 1) 0ms',
- backgroundColor:
- theme.palette.type === 'dark'
- ? 'rgba(255, 255, 255, 0.7)'
- : 'rgba(0, 0, 0, 0.5)',
+ backgroundColor: theme.palette.type === 'dark'
+ ? 'rgba(255, 255, 255, 0.7)'
+ : 'rgba(0, 0, 0, 0.5)',
},
'&::after': {
diff --git ORI/react-admin/packages/ra-no-code/src/ApplicationsDashboard/ApplicationsDashboard.tsx ALT/react-admin/packages/ra-no-code/src/ApplicationsDashboard/ApplicationsDashboard.tsx
index 0422b62..79107b1 100644
--- ORI/react-admin/packages/ra-no-code/src/ApplicationsDashboard/ApplicationsDashboard.tsx
+++ ALT/react-admin/packages/ra-no-code/src/ApplicationsDashboard/ApplicationsDashboard.tsx
@@ -28,10 +28,9 @@ import {
storeApplicationsInStorage,
} from './applicationStorage';
-const defaultTheme =
- process.env.NODE_ENV !== 'production'
- ? unstable_createMuiStrictModeTheme(RaDefaultTheme)
- : createMuiTheme(RaDefaultTheme);
+const defaultTheme = process.env.NODE_ENV !== 'production'
+ ? unstable_createMuiStrictModeTheme(RaDefaultTheme)
+ : createMuiTheme(RaDefaultTheme);
export const ApplicationsDashboard = ({
onApplicationSelected,
diff --git ORI/react-admin/packages/ra-no-code/src/ResourceConfiguration/getFieldDefinitionsFromRecords.ts ALT/react-admin/packages/ra-no-code/src/ResourceConfiguration/getFieldDefinitionsFromRecords.ts
index 1242bde..07a6e1d 100644
--- ORI/react-admin/packages/ra-no-code/src/ResourceConfiguration/getFieldDefinitionsFromRecords.ts
+++ ALT/react-admin/packages/ra-no-code/src/ResourceConfiguration/getFieldDefinitionsFromRecords.ts
@@ -11,13 +11,12 @@ export const getFieldDefinitionsFromRecords = (
return {
...inferedDefinition,
- options:
- inferedDefinition.type === 'reference'
- ? {
- referenceField: 'id',
- selectionType: 'select',
- }
- : undefined,
+ options: inferedDefinition.type === 'reference'
+ ? {
+ referenceField: 'id',
+ selectionType: 'select',
+ }
+ : undefined,
views: ['list', 'create', 'edit', 'show'],
};
});
diff --git ORI/react-admin/packages/ra-ui-materialui/src/auth/LoginForm.tsx ALT/react-admin/packages/ra-ui-materialui/src/auth/LoginForm.tsx
index 13d8bc3..868d3ba 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/auth/LoginForm.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/auth/LoginForm.tsx
@@ -88,12 +88,11 @@ const LoginForm = (props: Props) => {
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
);
diff --git ORI/react-admin/packages/ra-ui-materialui/src/button/BulkDeleteWithConfirmButton.tsx ALT/react-admin/packages/ra-ui-materialui/src/button/BulkDeleteWithConfirmButton.tsx
index 68cf871..30aba4a 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/button/BulkDeleteWithConfirmButton.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/button/BulkDeleteWithConfirmButton.tsx
@@ -76,12 +76,11 @@ const BulkDeleteWithConfirmButton = (
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
);
diff --git ORI/react-admin/packages/ra-ui-materialui/src/button/BulkDeleteWithUndoButton.tsx ALT/react-admin/packages/ra-ui-materialui/src/button/BulkDeleteWithUndoButton.tsx
index d537875..9b79dcc 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/button/BulkDeleteWithUndoButton.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/button/BulkDeleteWithUndoButton.tsx
@@ -67,12 +67,11 @@ const BulkDeleteWithUndoButton = (props: BulkDeleteWithUndoButtonProps) => {
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
);
diff --git ORI/react-admin/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.tsx ALT/react-admin/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.tsx
index 035683d..c8ee0dc 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/button/BulkUpdateWithConfirmButton.tsx
@@ -76,12 +76,11 @@ const BulkUpdateWithConfirmButton = (
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
);
diff --git ORI/react-admin/packages/ra-ui-materialui/src/button/BulkUpdateWithUndoButton.tsx ALT/react-admin/packages/ra-ui-materialui/src/button/BulkUpdateWithUndoButton.tsx
index 0c8d07f..e64a9e2 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/button/BulkUpdateWithUndoButton.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/button/BulkUpdateWithUndoButton.tsx
@@ -65,12 +65,11 @@ const BulkUpdateWithUndoButton = (props: BulkUpdateWithUndoButtonProps) => {
{
type: 'warning',
messageArgs: {
- _:
- typeof error === 'string'
- ? error
- : error && error.message
- ? error.message
- : undefined,
+ _: typeof error === 'string'
+ ? error
+ : error && error.message
+ ? error.message
+ : undefined,
},
}
);
diff --git ORI/react-admin/packages/ra-ui-materialui/src/detail/CreateView.tsx ALT/react-admin/packages/ra-ui-materialui/src/detail/CreateView.tsx
index 94bc035..9f69afc 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/detail/CreateView.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/detail/CreateView.tsx
@@ -61,15 +61,13 @@ export const CreateView = (props: CreateViewProps) => {
{cloneElement(Children.only(children), {
basePath,
record,
- redirect:
- typeof children.props.redirect === 'undefined'
- ? redirect
- : children.props.redirect,
+ redirect: typeof children.props.redirect === 'undefined'
+ ? redirect
+ : children.props.redirect,
resource,
- save:
- typeof children.props.save === 'undefined'
- ? save
- : children.props.save,
+ save: typeof children.props.save === 'undefined'
+ ? save
+ : children.props.save,
saving,
version,
})}
@@ -79,10 +77,9 @@ export const CreateView = (props: CreateViewProps) => {
basePath,
record,
resource,
- save:
- typeof children.props.save === 'undefined'
- ? save
- : children.props.save,
+ save: typeof children.props.save === 'undefined'
+ ? save
+ : children.props.save,
saving,
version,
})}
diff --git ORI/react-admin/packages/ra-ui-materialui/src/detail/EditView.tsx ALT/react-admin/packages/ra-ui-materialui/src/detail/EditView.tsx
index 1e3c632..1f7f6cc 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/detail/EditView.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/detail/EditView.tsx
@@ -44,12 +44,11 @@ export const EditView = (props: EditViewProps) => {
version,
} = useEditContext(props);
- const finalActions =
- typeof actions === 'undefined' && hasShow ? (
- <DefaultActions />
- ) : (
- actions
- );
+ const finalActions = typeof actions === 'undefined' && hasShow ? (
+ <DefaultActions />
+ ) : (
+ actions
+ );
if (!children) {
return null;
}
@@ -88,10 +87,9 @@ export const EditView = (props: EditViewProps) => {
? redirect
: children.props.redirect,
resource,
- save:
- typeof children.props.save === 'undefined'
- ? save
- : children.props.save,
+ save: typeof children.props.save === 'undefined'
+ ? save
+ : children.props.save,
saving,
undoable,
mutationMode,
@@ -107,10 +105,9 @@ export const EditView = (props: EditViewProps) => {
record,
resource,
version,
- save:
- typeof children.props.save === 'undefined'
- ? save
- : children.props.save,
+ save: typeof children.props.save === 'undefined'
+ ? save
+ : children.props.save,
saving,
})}
</div>
diff --git ORI/react-admin/packages/ra-ui-materialui/src/detail/ShowView.tsx ALT/react-admin/packages/ra-ui-materialui/src/detail/ShowView.tsx
index f5ad3c3..c99e975 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/detail/ShowView.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/detail/ShowView.tsx
@@ -32,12 +32,11 @@ export const ShowView = (props: ShowViewProps) => {
useShowContext(props);
const { hasEdit } = useResourceDefinition(props);
- const finalActions =
- typeof actions === 'undefined' && hasEdit ? (
- <DefaultActions />
- ) : (
- actions
- );
+ const finalActions = typeof actions === 'undefined' && hasEdit ? (
+ <DefaultActions />
+ ) : (
+ actions
+ );
if (!children) {
return null;
diff --git ORI/react-admin/packages/ra-ui-materialui/src/form/Toolbar.tsx ALT/react-admin/packages/ra-ui-materialui/src/form/Toolbar.tsx
index 1cf8310..4c0cd19 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/form/Toolbar.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/form/Toolbar.tsx
@@ -24,10 +24,9 @@ import { Breakpoint } from '@material-ui/core/styles/createBreakpoints';
const useStyles = makeStyles(
theme => ({
toolbar: {
- backgroundColor:
- theme.palette.type === 'light'
- ? theme.palette.grey[100]
- : theme.palette.grey[900],
+ backgroundColor: theme.palette.type === 'light'
+ ? theme.palette.grey[100]
+ : theme.palette.grey[900],
},
desktopToolbar: {
marginTop: theme.spacing(2),
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/AutocompleteArrayInput.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/AutocompleteArrayInput.tsx
index b6ba266..03d0adc 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/AutocompleteArrayInput.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/AutocompleteArrayInput.tsx
@@ -572,10 +572,9 @@ const useStyles = makeStyles(
inputRootFilled: {
flexWrap: 'wrap',
'& $chip': {
- backgroundColor:
- theme.palette.type === 'light'
- ? 'rgba(0, 0, 0, 0.09)'
- : 'rgba(255, 255, 255, 0.09)',
+ backgroundColor: theme.palette.type === 'light'
+ ? 'rgba(0, 0, 0, 0.09)'
+ : 'rgba(255, 255, 255, 0.09)',
},
},
inputInput: {
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/FileInput.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/FileInput.tsx
index eca4781..b964ce9 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/FileInput.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/FileInput.tsx
@@ -159,10 +159,9 @@ const FileInput = (props: FileInputProps & InputProps<FileInputOptions>) => {
}
};
- const childrenElement =
- children && isValidElement(Children.only(children))
- ? (Children.only(children) as ReactElement<any>)
- : undefined;
+ const childrenElement = children && isValidElement(Children.only(children))
+ ? (Children.only(children) as ReactElement<any>)
+ : undefined;
const { getRootProps, getInputProps } = useDropzone({
...options,
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/ResettableTextField.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/ResettableTextField.tsx
index ec00bb1..8ceba5c 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/ResettableTextField.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/ResettableTextField.tsx
@@ -155,10 +155,9 @@ const ResettableTextField = (props: ResettableTextFieldProps) => {
classes={restClasses}
value={value}
InputProps={{
- classes:
- props.select && variant === 'filled'
- ? { adornedEnd: inputAdornedEnd }
- : {},
+ classes: props.select && variant === 'filled'
+ ? { adornedEnd: inputAdornedEnd }
+ : {},
endAdornment: getEndAdornment(),
...InputPropsWithoutEndAdornment,
}}
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/SelectArrayInput.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/SelectArrayInput.tsx
index abed0d0..29bbd79 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/SelectArrayInput.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/SelectArrayInput.tsx
@@ -169,8 +169,9 @@ const SelectArrayInput = (props: SelectArrayInputProps) => {
});
const createItem = create || onCreate ? getCreateItem() : null;
- const finalChoices =
- create || onCreate ? [...choices, createItem] : choices;
+ const finalChoices = create || onCreate
+ ? [...choices, createItem]
+ : choices;
const renderMenuItemOption = useCallback(
choice =>
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/SelectInput.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/SelectInput.tsx
index 125b8d8..dd61871 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/SelectInput.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/SelectInput.tsx
@@ -204,8 +204,9 @@ export const SelectInput = (props: SelectInputProps) => {
});
const createItem = create || onCreate ? getCreateItem() : null;
- const finalChoices =
- create || onCreate ? [...choices, createItem] : choices;
+ const finalChoices = create || onCreate
+ ? [...choices, createItem]
+ : choices;
const renderMenuItem = useCallback(
choice => {
diff --git ORI/react-admin/packages/ra-ui-materialui/src/input/useSupportCreateSuggestion.tsx ALT/react-admin/packages/ra-ui-materialui/src/input/useSupportCreateSuggestion.tsx
index c8c45e0..117e3e9 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/useSupportCreateSuggestion.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/useSupportCreateSuggestion.tsx
@@ -55,13 +55,12 @@ export const useSupportCreateSuggestion = (
if (typeof optionText !== 'string') {
return {
id: createValue,
- name:
- filter && createItemLabel
- ? translate(createItemLabel, {
- item: filter,
- _: createItemLabel,
- })
- : translate(createLabel, { _: createLabel }),
+ name: filter && createItemLabel
+ ? translate(createItemLabel, {
+ item: filter,
+ _: createItemLabel,
+ })
+ : translate(createLabel, { _: createLabel }),
};
}
return set(
@@ -100,12 +99,11 @@ export const useSupportCreateSuggestion = (
}
handleChange(eventOrValue, undefined);
},
- createElement:
- renderOnCreate && isValidElement(create) ? (
- <CreateSuggestionContext.Provider value={context}>
- {create}
- </CreateSuggestionContext.Provider>
- ) : null,
+ createElement: renderOnCreate && isValidElement(create) ? (
+ <CreateSuggestionContext.Provider value={context}>
+ {create}
+ </CreateSuggestionContext.Provider>
+ ) : null,
};
};
diff --git ORI/react-admin/packages/ra-ui-materialui/src/layout/Notification.tsx ALT/react-admin/packages/ra-ui-materialui/src/layout/Notification.tsx
index e505153..87ca76d 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/layout/Notification.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/layout/Notification.tsx
@@ -37,10 +37,9 @@ const useStyles = makeStyles(
color: theme.palette.error.contrastText,
},
undo: (props: NotificationProps) => ({
- color:
- props.type === 'success'
- ? theme.palette.success.contrastText
- : theme.palette.primary.light,
+ color: props.type === 'success'
+ ? theme.palette.success.contrastText
+ : theme.palette.primary.light,
}),
multiLine: {
whiteSpace: 'pre-wrap',
diff --git ORI/react-admin/packages/ra-ui-materialui/src/layout/Responsive.tsx ALT/react-admin/packages/ra-ui-materialui/src/layout/Responsive.tsx
index 0cdfb9e..43df176 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/layout/Responsive.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/layout/Responsive.tsx
@@ -16,39 +16,35 @@ export const Responsive = ({
let element;
switch (width) {
case 'xs':
- element =
- typeof xsmall !== 'undefined'
- ? xsmall
- : typeof small !== 'undefined'
- ? small
- : typeof medium !== 'undefined'
- ? medium
- : large;
+ element = typeof xsmall !== 'undefined'
+ ? xsmall
+ : typeof small !== 'undefined'
+ ? small
+ : typeof medium !== 'undefined'
+ ? medium
+ : large;
break;
case 'sm':
- element =
- typeof small !== 'undefined'
- ? small
- : typeof medium !== 'undefined'
- ? medium
- : large;
+ element = typeof small !== 'undefined'
+ ? small
+ : typeof medium !== 'undefined'
+ ? medium
+ : large;
break;
case 'md':
- element =
- typeof medium !== 'undefined'
- ? medium
- : typeof large !== 'undefined'
- ? large
- : small;
+ element = typeof medium !== 'undefined'
+ ? medium
+ : typeof large !== 'undefined'
+ ? large
+ : small;
break;
case 'lg':
case 'xl':
- element =
- typeof large !== 'undefined'
- ? large
- : typeof medium !== 'undefined'
- ? medium
- : small;
+ element = typeof large !== 'undefined'
+ ? large
+ : typeof medium !== 'undefined'
+ ? medium
+ : small;
break;
default:
throw new Error(`Unknown width ${width}`);
diff --git ORI/react-admin/packages/ra-ui-materialui/src/layout/Title.tsx ALT/react-admin/packages/ra-ui-materialui/src/layout/Title.tsx
index 27f33ba..93ce914 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/layout/Title.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/layout/Title.tsx
@@ -19,10 +19,9 @@ const Title: FC<TitleProps> = ({
...rest
}) => {
const translate = useTranslate();
- const container =
- typeof document !== 'undefined'
- ? document.getElementById('react-admin-title')
- : null;
+ const container = typeof document !== 'undefined'
+ ? document.getElementById('react-admin-title')
+ : null;
if (!container) return null;
diff --git ORI/react-admin/packages/ra-ui-materialui/src/layout/createMuiTheme.ts ALT/react-admin/packages/ra-ui-materialui/src/layout/createMuiTheme.ts
index df668ea..dfd2090 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/layout/createMuiTheme.ts
+++ ALT/react-admin/packages/ra-ui-materialui/src/layout/createMuiTheme.ts
@@ -8,7 +8,6 @@ import {
*
* @see https://github.com/mui-org/material-ui/issues/13394
*/
-export const createMuiTheme =
- process.env.NODE_ENV === 'production'
- ? createLegacyModeTheme
- : createStrictModeTheme;
+export const createMuiTheme = process.env.NODE_ENV === 'production'
+ ? createLegacyModeTheme
+ : createStrictModeTheme;
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/BulkActionsToolbar.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/BulkActionsToolbar.tsx
index f9d6f5a..ffd0b61 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/BulkActionsToolbar.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/BulkActionsToolbar.tsx
@@ -17,15 +17,13 @@ const useStyles = makeStyles(
theme => ({
toolbar: {
zIndex: 3,
- color:
- theme.palette.type === 'light'
- ? theme.palette.primary.main
- : theme.palette.text.primary,
+ color: theme.palette.type === 'light'
+ ? theme.palette.primary.main
+ : theme.palette.text.primary,
justifyContent: 'space-between',
- backgroundColor:
- theme.palette.type === 'light'
- ? lighten(theme.palette.primary.light, 0.85)
- : theme.palette.primary.dark,
+ backgroundColor: theme.palette.type === 'light'
+ ? lighten(theme.palette.primary.light, 0.85)
+ : theme.palette.primary.dark,
minHeight: theme.spacing(8),
height: theme.spacing(8),
transition: `${theme.transitions.create(
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/Empty.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/Empty.tsx
index 3d78df9..36110a7 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/Empty.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/Empty.tsx
@@ -64,10 +64,9 @@ const useStyles = makeStyles(
textAlign: 'center',
opacity: theme.palette.type === 'light' ? 0.5 : 0.8,
margin: '0 1em',
- color:
- theme.palette.type === 'light'
- ? 'inherit'
- : theme.palette.text.primary,
+ color: theme.palette.type === 'light'
+ ? 'inherit'
+ : theme.palette.text.primary,
},
icon: {
width: '9em',
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/SimpleList.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/SimpleList.tsx
index 95869c9..184d09b 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/SimpleList.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/SimpleList.tsx
@@ -266,8 +266,9 @@ const LinkOrNot = (
...rest
} = props;
const classes = useLinkOrNotStyles({ classes: classesOverride });
- const link =
- typeof linkType === 'function' ? linkType(record, id) : linkType;
+ const link = typeof linkType === 'function'
+ ? linkType(record, id)
+ : linkType;
return link === 'edit' || link === true ? (
<ListItem
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridHeader.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridHeader.tsx
index 1dd4c24..afba13f 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridHeader.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridHeader.tsx
@@ -40,12 +40,11 @@ export const DatagridHeader = (props: DatagridHeaderProps) => {
event => {
event.stopPropagation();
const newField = event.currentTarget.dataset.field;
- const newOrder =
- currentSort.field === newField
- ? currentSort.order === 'ASC'
- ? 'DESC'
- : 'ASC'
- : event.currentTarget.dataset.order;
+ const newOrder = currentSort.field === newField
+ ? currentSort.order === 'ASC'
+ ? 'DESC'
+ : 'ASC'
+ : event.currentTarget.dataset.order;
setSort(newField, newOrder);
},
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridRow.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridRow.tsx
index b91e267..e220eec 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridRow.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/datagrid/DatagridRow.tsx
@@ -115,10 +115,9 @@ const DatagridRow: FC<DatagridRowProps> = React.forwardRef((props, ref) => {
if (!rowClick) return;
event.persist();
- const effect =
- typeof rowClick === 'function'
- ? await rowClick(id, basePath || `/${resource}`, record)
- : rowClick;
+ const effect = typeof rowClick === 'function'
+ ? await rowClick(id, basePath || `/${resource}`, record)
+ : rowClick;
switch (effect) {
case 'edit':
history.push(linkToRecord(basePath || `/${resource}`, id));
diff --git ORI/react-admin/packages/ra-ui-materialui/src/list/filter/FilterFormInput.tsx ALT/react-admin/packages/ra-ui-materialui/src/list/filter/FilterFormInput.tsx
index 30f08c5..9b502da 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/list/filter/FilterFormInput.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/list/filter/FilterFormInput.tsx
@@ -42,10 +42,9 @@ const FilterFormInput = props => {
</IconButton>
)}
{React.cloneElement(filterElement, {
- allowEmpty:
- filterElement.props.allowEmpty === undefined
- ? true
- : filterElement.props.allowEmpty,
+ allowEmpty: filterElement.props.allowEmpty === undefined
+ ? true
+ : filterElement.props.allowEmpty,
resource,
record: emptyRecord,
variant, |
|
prettier/prettier#12087 VS prettier/prettier@main :: typescript-eslint/typescript-eslint@9d47a8b Diff (1407 lines)diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/array-type.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/array-type.ts
index 3c0cad9..f26771d 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/array-type.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/array-type.ts
@@ -151,10 +151,9 @@ export default util.createRule<Options, MessageIds>({
return;
}
- const messageId =
- currentOption === 'generic'
- ? 'errorStringGeneric'
- : 'errorStringGenericSimple';
+ const messageId = currentOption === 'generic'
+ ? 'errorStringGeneric'
+ : 'errorStringGenericSimple';
const errorNode = isReadonly ? node.parent! : node;
context.report({
@@ -205,10 +204,9 @@ export default util.createRule<Options, MessageIds>({
const readonlyPrefix = isReadonlyArrayType ? 'readonly ' : '';
const typeParams = node.typeParameters?.params;
- const messageId =
- currentOption === 'array'
- ? 'errorStringArray'
- : 'errorStringArraySimple';
+ const messageId = currentOption === 'array'
+ ? 'errorStringArray'
+ : 'errorStringArraySimple';
if (!typeParams || typeParams.length === 0) {
// Create an 'any' array
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-assertions.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-assertions.ts
index 4a75edd..6630c3c 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-assertions.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-assertions.ts
@@ -94,10 +94,9 @@ export default util.createRule<Options, MessageIds>({
context.report({
node,
messageId,
- data:
- messageId !== 'never'
- ? { cast: sourceCode.getText(node.typeAnnotation) }
- : {},
+ data: messageId !== 'never'
+ ? { cast: sourceCode.getText(node.typeAnnotation) }
+ : {},
});
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/default-param-last.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/default-param-last.ts
index a701e37..5fdb27a 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/default-param-last.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/default-param-last.ts
@@ -48,10 +48,9 @@ export default createRule({
let hasSeenPlainParam = false;
for (let i = node.params.length - 1; i >= 0; i--) {
const current = node.params[i];
- const param =
- current.type === AST_NODE_TYPES.TSParameterProperty
- ? current.parameter
- : current;
+ const param = current.type === AST_NODE_TYPES.TSParameterProperty
+ ? current.parameter
+ : current;
if (isPlainParam(param)) {
hasSeenPlainParam = true;
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/explicit-member-accessibility.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/explicit-member-accessibility.ts
index b67221a..5edd2e3 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/explicit-member-accessibility.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/explicit-member-accessibility.ts
@@ -264,11 +264,10 @@ export default util.createRule<Options, MessageIds>({
return;
}
- const nodeName =
- node.parameter.type === AST_NODE_TYPES.Identifier
- ? node.parameter.name
- : // has to be an Identifier or TSC will throw an error
- (node.parameter.left as TSESTree.Identifier).name;
+ const nodeName = node.parameter.type === AST_NODE_TYPES.Identifier
+ ? node.parameter.name
+ : // has to be an Identifier or TSC will throw an error
+ (node.parameter.left as TSESTree.Identifier).name;
switch (paramPropCheck) {
case 'explicit': {
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/indent-new-do-not-use/index.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/indent-new-do-not-use/index.ts
index fa7013b..804be83 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/indent-new-do-not-use/index.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/indent-new-do-not-use/index.ts
@@ -450,13 +450,13 @@ export default createRule<Options, MessageIds>({
* Abbreviate the message if the expected indentation is also spaces.
* e.g. 'Expected 4 spaces but found 2' rather than 'Expected 4 spaces but found 2 spaces'
*/
- foundStatement =
- indentType === 'space'
- ? actualSpaces
- : `${actualSpaces} ${foundSpacesWord}`;
+ foundStatement = indentType === 'space'
+ ? actualSpaces
+ : `${actualSpaces} ${foundSpacesWord}`;
} else if (actualTabs > 0) {
- foundStatement =
- indentType === 'tab' ? actualTabs : `${actualTabs} ${foundTabsWord}`;
+ foundStatement = indentType === 'tab'
+ ? actualTabs
+ : `${actualTabs} ${foundTabsWord}`;
} else {
foundStatement = '0';
}
@@ -1177,10 +1177,9 @@ export default createRule<Options, MessageIds>({
)!;
if (fromToken) {
- const end =
- semiToken && semiToken.range[1] === sourceToken.range[1]
- ? node.range[1]
- : sourceToken.range[1];
+ const end = semiToken && semiToken.range[1] === sourceToken.range[1]
+ ? node.range[1]
+ : sourceToken.range[1];
offsets.setDesiredOffsets(
[fromToken.range[0], end],
@@ -1196,8 +1195,9 @@ export default createRule<Options, MessageIds>({
| TSESTree.JSXMemberExpression
| TSESTree.MetaProperty,
) {
- const object =
- node.type === AST_NODE_TYPES.MetaProperty ? node.meta : node.object;
+ const object = node.type === AST_NODE_TYPES.MetaProperty
+ ? node.meta
+ : node.object;
const isComputed = 'computed' in node && node.computed;
const firstNonObjectToken = sourceCode.getFirstTokenBetween(
object,
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/indent.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/indent.ts
index 748d720..3d82fa5 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/indent.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/indent.ts
@@ -284,10 +284,9 @@ export default util.createRule<Options, MessageIds>({
},
},
},
- arguments:
- 'expression' in moduleReference
- ? [moduleReference.expression]
- : [],
+ arguments: 'expression' in moduleReference
+ ? [moduleReference.expression]
+ : [],
// location data
range: moduleReference.range,
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/member-delimiter-style.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/member-delimiter-style.ts
index e35b645..67f07cc 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/member-delimiter-style.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/member-delimiter-style.ts
@@ -270,8 +270,9 @@ export default util.createRule<Options, MessageIds>({
function checkMemberSeparatorStyle(
node: TSESTree.TSInterfaceBody | TSESTree.TSTypeLiteral,
): void {
- const members =
- node.type === AST_NODE_TYPES.TSInterfaceBody ? node.body : node.members;
+ const members = node.type === AST_NODE_TYPES.TSInterfaceBody
+ ? node.body
+ : node.members;
let isSingleLine = node.loc.start.line === node.loc.end.line;
if (
@@ -285,10 +286,9 @@ export default util.createRule<Options, MessageIds>({
}
}
- const typeOpts =
- node.type === AST_NODE_TYPES.TSInterfaceBody
- ? interfaceOptions
- : typeLiteralOptions;
+ const typeOpts = node.type === AST_NODE_TYPES.TSInterfaceBody
+ ? interfaceOptions
+ : typeLiteralOptions;
const opts = isSingleLine
? { ...typeOpts.singleline, type: 'single-line' }
: { ...typeOpts.multiline, type: 'multi-line' };
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/member-ordering.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/member-ordering.ts
index 92c794c..05f4fa3 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/member-ordering.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/member-ordering.ts
@@ -392,16 +392,14 @@ function getRank(
node.type === AST_NODE_TYPES.TSAbstractPropertyDefinition ||
node.type === AST_NODE_TYPES.TSAbstractMethodDefinition;
- const scope =
- 'static' in node && node.static
- ? 'static'
- : abstract
- ? 'abstract'
- : 'instance';
- const accessibility =
- 'accessibility' in node && node.accessibility
- ? node.accessibility
- : 'public';
+ const scope = 'static' in node && node.static
+ ? 'static'
+ : abstract
+ ? 'abstract'
+ : 'instance';
+ const accessibility = 'accessibility' in node && node.accessibility
+ ? node.accessibility
+ : 'public';
// Collect all existing member groups (e.g. 'public-instance-field', 'instance-field', 'public-field', 'constructor' etc.)
const memberGroups = [];
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 d9dfbda..4bf4f73 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
@@ -116,12 +116,11 @@ export default util.createRule<Options, MessageIds>({
...(mode === 'property' && {
TSMethodSignature(methodNode): void {
const parent = methodNode.parent;
- const members =
- parent?.type === AST_NODE_TYPES.TSInterfaceBody
- ? parent.body
- : parent?.type === AST_NODE_TYPES.TSTypeLiteral
- ? parent.members
- : [];
+ const members = parent?.type === AST_NODE_TYPES.TSInterfaceBody
+ ? parent.body
+ : parent?.type === AST_NODE_TYPES.TSTypeLiteral
+ ? parent.members
+ : [];
const duplicatedKeyMethodNodes: TSESTree.TSMethodSignature[] =
members.filter(
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 c4e6e36..f26f6a8 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
@@ -39,30 +39,27 @@ function normalizeOption(option: Selector): NormalizedSelector[] {
match: option.custom.match,
}
: null,
- leadingUnderscore:
- option.leadingUnderscore !== undefined
- ? UnderscoreOptions[option.leadingUnderscore]
- : null,
- trailingUnderscore:
- option.trailingUnderscore !== undefined
- ? UnderscoreOptions[option.trailingUnderscore]
- : null,
+ leadingUnderscore: option.leadingUnderscore !== undefined
+ ? UnderscoreOptions[option.leadingUnderscore]
+ : null,
+ trailingUnderscore: option.trailingUnderscore !== undefined
+ ? UnderscoreOptions[option.trailingUnderscore]
+ : null,
prefix: option.prefix && option.prefix.length > 0 ? option.prefix : null,
suffix: option.suffix && option.suffix.length > 0 ? option.suffix : null,
modifiers: option.modifiers?.map(m => Modifiers[m]) ?? null,
types: option.types?.map(m => TypeModifiers[m]) ?? null,
- filter:
- option.filter !== undefined
- ? typeof option.filter === 'string'
- ? {
- regex: new RegExp(option.filter, 'u'),
- match: true,
- }
- : {
- regex: new RegExp(option.filter.regex, 'u'),
- match: option.filter.match,
- }
- : null,
+ filter: option.filter !== undefined
+ ? typeof option.filter === 'string'
+ ? {
+ regex: new RegExp(option.filter, 'u'),
+ match: true,
+ }
+ : {
+ regex: new RegExp(option.filter.regex, 'u'),
+ match: option.filter.match,
+ }
+ : null,
// calculated ordering weight based on modifiers
modifierWeight: weight,
};
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 8e8c871..0ebad03 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
@@ -164,12 +164,11 @@ function createValidator(
affixes: affixes?.join(', '),
formats: formats?.map(f => PredefinedFormats[f]).join(', '),
regex: custom?.regex?.toString(),
- regexMatch:
- custom?.match === true
- ? 'match'
- : custom?.match === false
- ? 'not match'
- : null,
+ regexMatch: custom?.match === true
+ ? 'match'
+ : custom?.match === false
+ ? 'not match'
+ : null,
};
}
@@ -183,31 +182,26 @@ function createValidator(
node: TSESTree.Identifier | TSESTree.PrivateIdentifier | TSESTree.Literal,
originalName: string,
): string | null {
- const option =
- position === 'leading'
- ? config.leadingUnderscore
- : config.trailingUnderscore;
+ const option = position === 'leading'
+ ? config.leadingUnderscore
+ : config.trailingUnderscore;
if (!option) {
return name;
}
- const hasSingleUnderscore =
- position === 'leading'
- ? (): boolean => name.startsWith('_')
- : (): boolean => name.endsWith('_');
- const trimSingleUnderscore =
- position === 'leading'
- ? (): string => name.slice(1)
- : (): string => name.slice(0, -1);
-
- const hasDoubleUnderscore =
- position === 'leading'
- ? (): boolean => name.startsWith('__')
- : (): boolean => name.endsWith('__');
- const trimDoubleUnderscore =
- position === 'leading'
- ? (): string => name.slice(2)
- : (): string => name.slice(0, -2);
+ const hasSingleUnderscore = position === 'leading'
+ ? (): boolean => name.startsWith('_')
+ : (): boolean => name.endsWith('_');
+ const trimSingleUnderscore = position === 'leading'
+ ? (): string => name.slice(1)
+ : (): string => name.slice(0, -1);
+
+ const hasDoubleUnderscore = position === 'leading'
+ ? (): boolean => name.startsWith('__')
+ : (): boolean => name.endsWith('__');
+ const trimDoubleUnderscore = position === 'leading'
+ ? (): string => name.slice(2)
+ : (): string => name.slice(0, -2);
switch (option) {
// ALLOW - no conditions as the user doesn't care if it's there or not
@@ -310,12 +304,12 @@ function createValidator(
}
for (const affix of affixes) {
- const hasAffix =
- position === 'prefix' ? name.startsWith(affix) : name.endsWith(affix);
- const trimAffix =
- position === 'prefix'
- ? (): string => name.slice(affix.length)
- : (): string => name.slice(0, -affix.length);
+ const hasAffix = position === 'prefix'
+ ? name.startsWith(affix)
+ : name.endsWith(affix);
+ const trimAffix = position === 'prefix'
+ ? (): string => name.slice(affix.length)
+ : (): string => name.slice(0, -affix.length);
if (hasAffix) {
// matches, so trim it and return
@@ -391,10 +385,9 @@ function createValidator(
context.report({
node,
- messageId:
- originalName === name
- ? 'doesNotMatchFormat'
- : 'doesNotMatchFormatTrimmed',
+ messageId: originalName === name
+ ? 'doesNotMatchFormat'
+ : 'doesNotMatchFormatTrimmed',
data: formatReportData({
originalName,
processedName: name,
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-empty-function.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-empty-function.ts
index 806312b..fe59438 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-empty-function.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-empty-function.ts
@@ -128,10 +128,9 @@ export default util.createRule<Options, MessageIds>({
node: TSESTree.FunctionExpression | TSESTree.FunctionDeclaration,
): boolean {
if (isAllowedDecoratedFunctions && isBodyEmpty(node)) {
- const decorators =
- node.parent?.type === AST_NODE_TYPES.MethodDefinition
- ? node.parent.decorators
- : undefined;
+ const decorators = node.parent?.type === AST_NODE_TYPES.MethodDefinition
+ ? node.parent.decorators
+ : undefined;
return !!decorators && !!decorators.length;
}
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 cd28cfa..25d24b9 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
@@ -188,14 +188,13 @@ export default util.createRule<[Options], MessageIds>({
}
context.report({
- messageId:
- allowInGenericTypeArguments && allowAsThisParameter
- ? 'invalidVoidNotReturnOrThisParamOrGeneric'
- : allowInGenericTypeArguments
- ? 'invalidVoidNotReturnOrGeneric'
- : allowAsThisParameter
- ? 'invalidVoidNotReturnOrThisParam'
- : 'invalidVoidNotReturn',
+ messageId: allowInGenericTypeArguments && allowAsThisParameter
+ ? 'invalidVoidNotReturnOrThisParamOrGeneric'
+ : allowInGenericTypeArguments
+ ? 'invalidVoidNotReturnOrGeneric'
+ : allowAsThisParameter
+ ? 'invalidVoidNotReturnOrThisParam'
+ : 'invalidVoidNotReturn',
node,
});
},
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 7d4a238..4c1a2f1 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
@@ -153,10 +153,9 @@ function isSafe(
const variable = reference.resolved;
const definition = variable?.defs[0];
const declaration = definition?.parent;
- const kind =
- declaration?.type === AST_NODE_TYPES.VariableDeclaration
- ? declaration.kind
- : '';
+ const kind = declaration?.type === AST_NODE_TYPES.VariableDeclaration
+ ? declaration.kind
+ : '';
// type references are all safe
// this only really matters for global types that haven't been configured
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-parameter-properties.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-parameter-properties.ts
index 3ab0161..1b2b864 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-parameter-properties.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-parameter-properties.ts
@@ -90,11 +90,10 @@ export default util.createRule<Options, MessageIds>({
return;
}
- const name =
- node.parameter.type === AST_NODE_TYPES.Identifier
- ? node.parameter.name
- : // has to be an Identifier or TSC will throw an error
- (node.parameter.left as TSESTree.Identifier).name;
+ const name = node.parameter.type === AST_NODE_TYPES.Identifier
+ ? node.parameter.name
+ : // has to be an Identifier or TSC will throw an error
+ (node.parameter.left as TSESTree.Identifier).name;
context.report({
node,
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 d81c522..1aabcff 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-redeclare.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-redeclare.ts
@@ -211,16 +211,16 @@ export default util.createRule<Options, MessageIds>({
* the first declaration, it shows the location of the first
* declaration.
*/
- const detailMessageId =
- declaration.type === 'builtin'
- ? 'redeclaredAsBuiltin'
- : 'redeclaredBySyntax';
+ const detailMessageId = declaration.type === 'builtin'
+ ? 'redeclaredAsBuiltin'
+ : 'redeclaredBySyntax';
const data = { id: variable.name };
// Report extra declarations.
for (const { type, node, loc } of extraDeclarations) {
- const messageId =
- type === declaration.type ? 'redeclared' : detailMessageId;
+ const messageId = type === declaration.type
+ ? 'redeclared'
+ : detailMessageId;
if (node) {
context.report({ node, loc, messageId, data });
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-shadow.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-shadow.ts
index 3f13f58..beab13d 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-shadow.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-shadow.ts
@@ -138,8 +138,9 @@ export default util.createRule<Options, MessageIds>({
return false;
}
- const isShadowedValue =
- 'isValueVariable' in shadowed ? shadowed.isValueVariable : true;
+ const isShadowedValue = 'isValueVariable' in shadowed
+ ? shadowed.isValueVariable
+ : true;
if (!isShadowedValue) {
return false;
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-this-alias.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-this-alias.ts
index 5c9c9f5..6170a5c 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-this-alias.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-this-alias.ts
@@ -57,17 +57,15 @@ export default util.createRule<Options, MessageIds>({
return;
}
- const hasAllowedName =
- id.type === AST_NODE_TYPES.Identifier
- ? allowedNames!.includes(id.name)
- : false;
+ const hasAllowedName = id.type === AST_NODE_TYPES.Identifier
+ ? allowedNames!.includes(id.name)
+ : false;
if (!hasAllowedName) {
context.report({
node: id,
- messageId:
- id.type === AST_NODE_TYPES.Identifier
- ? 'thisAssignment'
- : 'thisDestructure',
+ messageId: id.type === AST_NODE_TYPES.Identifier
+ ? 'thisAssignment'
+ : 'thisDestructure',
});
}
},
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-type-alias.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-type-alias.ts
index 2d9847e..bf9d1da 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-type-alias.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-type-alias.ts
@@ -184,10 +184,9 @@ export default util.createRule<Options, MessageIds>({
node,
messageId: 'noCompositionAlias',
data: {
- compositionType:
- compositionType === AST_NODE_TYPES.TSUnionType
- ? 'union'
- : 'intersection',
+ compositionType: compositionType === AST_NODE_TYPES.TSUnionType
+ ? 'union'
+ : 'intersection',
typeName: type,
},
});
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-boolean-literal-compare.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-boolean-literal-compare.ts
index e3768b2..3641b47 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-boolean-literal-compare.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-boolean-literal-compare.ts
@@ -179,10 +179,9 @@ export default util.createRule<Options, MessageIds>({
forTruthy: literalBooleanInComparison ? !negated : negated,
expression,
negated,
- range:
- expression.range[0] < against.range[0]
- ? [expression.range[1], against.range[1]]
- : [against.range[0], expression.range[0]],
+ range: expression.range[0] < against.range[0]
+ ? [expression.range[1], against.range[1]]
+ : [against.range[0], expression.range[0]],
};
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-condition.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-condition.ts
index 4e18a9f..f1cde4f 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-condition.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-condition.ts
@@ -485,8 +485,9 @@ export default createRule<Options, MessageId>({
function optionChainContainsOptionArrayIndex(
node: TSESTree.MemberExpression | TSESTree.CallExpression,
): boolean {
- const lhsNode =
- node.type === AST_NODE_TYPES.CallExpression ? node.callee : node.object;
+ const lhsNode = node.type === AST_NODE_TYPES.CallExpression
+ ? node.callee
+ : node.object;
if (node.optional && isArrayIndexExpression(lhsNode)) {
return true;
}
@@ -564,10 +565,9 @@ export default createRule<Options, MessageId>({
node: TSESTree.LeftHandSideExpression,
): boolean {
const type = getNodeType(node);
- const isOwnNullable =
- node.type === AST_NODE_TYPES.MemberExpression
- ? !isNullableOriginFromPrev(node)
- : true;
+ const isOwnNullable = node.type === AST_NODE_TYPES.MemberExpression
+ ? !isNullableOriginFromPrev(node)
+ : true;
return (
isTypeAnyType(type) ||
isTypeUnknownType(type) ||
@@ -593,8 +593,9 @@ export default createRule<Options, MessageId>({
return;
}
- const nodeToCheck =
- node.type === AST_NODE_TYPES.CallExpression ? node.callee : node.object;
+ const nodeToCheck = node.type === AST_NODE_TYPES.CallExpression
+ ? node.callee
+ : node.object;
if (isOptionableExpression(nodeToCheck)) {
return;
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unsafe-assignment.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unsafe-assignment.ts
index d40c06f..3b1fc0f 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unsafe-assignment.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unsafe-assignment.ts
@@ -177,10 +177,9 @@ export default util.createRule({
let key: string;
if (receiverProperty.computed === false) {
- key =
- receiverProperty.key.type === AST_NODE_TYPES.Identifier
- ? receiverProperty.key.name
- : String(receiverProperty.key.value);
+ key = receiverProperty.key.type === AST_NODE_TYPES.Identifier
+ ? receiverProperty.key.name
+ : String(receiverProperty.key.value);
} else if (receiverProperty.key.type === AST_NODE_TYPES.Literal) {
key = String(receiverProperty.key.value);
} else if (
@@ -235,11 +234,10 @@ export default util.createRule({
comparisonType: ComparisonType,
): boolean {
const receiverTsNode = esTreeNodeToTSNodeMap.get(receiverNode);
- const receiverType =
- comparisonType === ComparisonType.Contextual
- ? util.getContextualType(checker, receiverTsNode as ts.Expression) ??
- checker.getTypeAtLocation(receiverTsNode)
- : checker.getTypeAtLocation(receiverTsNode);
+ const receiverType = comparisonType === ComparisonType.Contextual
+ ? util.getContextualType(checker, receiverTsNode as ts.Expression) ??
+ checker.getTypeAtLocation(receiverTsNode)
+ : checker.getTypeAtLocation(receiverTsNode);
const senderType = checker.getTypeAtLocation(
esTreeNodeToTSNodeMap.get(senderNode),
);
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-var-requires.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-var-requires.ts
index 36f0e75..b567415 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-var-requires.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-var-requires.ts
@@ -24,10 +24,9 @@ export default util.createRule<Options, MessageIds>({
'CallExpression[callee.name="require"]'(
node: TSESTree.CallExpression,
): void {
- const parent =
- node.parent?.type === AST_NODE_TYPES.ChainExpression
- ? node.parent.parent
- : node.parent;
+ const parent = node.parent?.type === AST_NODE_TYPES.ChainExpression
+ ? node.parent.parent
+ : node.parent;
if (
parent &&
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/padding-line-between-statements.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/padding-line-between-statements.ts
index bc5f30a..c9f20cf 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/padding-line-between-statements.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/padding-line-between-statements.ts
@@ -200,10 +200,9 @@ function isBlockLikeStatement(
// Checks the last token is a closing brace of blocks.
const lastToken = sourceCode.getLastToken(node, util.isNotSemicolonToken);
- const belongingNode =
- lastToken && util.isClosingBraceToken(lastToken)
- ? sourceCode.getNodeByRangeIndex(lastToken.range[0])
- : null;
+ const belongingNode = lastToken && util.isClosingBraceToken(lastToken)
+ ? sourceCode.getNodeByRangeIndex(lastToken.range[0])
+ : null;
return (
!!belongingNode &&
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-function-type.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-function-type.ts
index d13d187..75c1215 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-function-type.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-function-type.ts
@@ -170,10 +170,9 @@ export default util.createRule({
);
} else {
comments.forEach(comment => {
- let commentText =
- comment.type === AST_TOKEN_TYPES.Line
- ? `//${comment.value}`
- : `/*${comment.value}*/`;
+ let commentText = comment.type === AST_TOKEN_TYPES.Line
+ ? `//${comment.value}`
+ : `/*${comment.value}*/`;
const isCommentOnTheSameLine =
comment.loc.start.line === member.loc.start.line;
if (!isCommentOnTheSameLine) {
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 0e12b4c..a327a52 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-includes.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-includes.ts
@@ -203,8 +203,9 @@ export default createRule({
node: TSESTree.MemberExpression,
): void {
const callNode = node.parent as TSESTree.CallExpression;
- const text =
- callNode.arguments.length === 1 ? parseRegExp(node.object) : null;
+ const text = callNode.arguments.length === 1
+ ? parseRegExp(node.object)
+ : null;
if (text == null) {
return;
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-readonly-parameter-types.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-readonly-parameter-types.ts
index 23e2752..8022f3e 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-readonly-parameter-types.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-readonly-parameter-types.ts
@@ -83,10 +83,9 @@ export default util.createRule<Options, MessageIds>({
continue;
}
- const actualParam =
- param.type === AST_NODE_TYPES.TSParameterProperty
- ? param.parameter
- : param;
+ const actualParam = param.type === AST_NODE_TYPES.TSParameterProperty
+ ? param.parameter
+ : param;
if (ignoreInferredTypes && actualParam.typeAnnotation == null) {
continue;
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-string-starts-ends-with.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-string-starts-ends-with.ts
index 501693e..e459018 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-string-starts-ends-with.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-string-starts-ends-with.ts
@@ -514,10 +514,9 @@ export default createRule({
return;
}
- const parsed =
- callNode.arguments.length === 1
- ? parseRegExp(callNode.arguments[0])
- : null;
+ const parsed = callNode.arguments.length === 1
+ ? parseRegExp(callNode.arguments[0])
+ : null;
if (parsed == null) {
return;
}
@@ -633,8 +632,9 @@ export default createRule({
node: TSESTree.MemberExpression,
): void {
const callNode = getParent(node) as TSESTree.CallExpression;
- const parsed =
- callNode.arguments.length === 1 ? parseRegExp(node.object) : null;
+ const parsed = callNode.arguments.length === 1
+ ? parseRegExp(node.object)
+ : null;
if (parsed == null) {
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 fe7f698..f700b5b 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
@@ -199,10 +199,9 @@ export default util.createRule<Options, MessageIds>({
let messageId: MessageIds = 'notSorted';
const data = {
name: '',
- type:
- node.type === AST_NODE_TYPES.TSIntersectionType
- ? 'Intersection'
- : 'Union',
+ type: node.type === AST_NODE_TYPES.TSIntersectionType
+ ? 'Intersection'
+ : 'Union',
};
if (node.parent?.type === AST_NODE_TYPES.TSTypeAliasDeclaration) {
messageId = 'notSortedNamed';
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 49ed2d9..3a2b9b6 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
@@ -46,8 +46,9 @@ export default createRule({
missingBranchTypes: Array<ts.Type>,
symbolName?: string,
): TSESLint.RuleFix | null {
- const lastCase =
- node.cases.length > 0 ? node.cases[node.cases.length - 1] : null;
+ const lastCase = node.cases.length > 0
+ ? node.cases[node.cases.length - 1]
+ : null;
const caseIndent = lastCase
? ' '.repeat(lastCase.loc.start.column)
: // if there are no cases, use indentation of the switch statement
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 2dd6aaf..d87cd41 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/unbound-method.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/unbound-method.ts
@@ -173,10 +173,9 @@ export default util.createRule<Options, MessageIds>({
const { dangerous, firstParamIsThis } = checkMethod(symbol, ignoreStatic);
if (dangerous) {
context.report({
- messageId:
- firstParamIsThis === false
- ? 'unboundWithoutThisAnnotation'
- : 'unbound',
+ messageId: firstParamIsThis === false
+ ? 'unboundWithoutThisAnnotation'
+ : 'unbound',
node,
});
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/unified-signatures.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/unified-signatures.ts
index b5a1d8a..9ed46e3 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/unified-signatures.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/unified-signatures.ts
@@ -77,10 +77,9 @@ export default util.createRule({
function failureStringStart(otherLine?: number): string {
// For only 2 overloads we don't need to specify which is the other one.
- const overloads =
- otherLine === undefined
- ? 'These overloads'
- : `This overload and the one on line ${otherLine}`;
+ const overloads = otherLine === undefined
+ ? 'These overloads'
+ : `This overload and the one on line ${otherLine}`;
return `${overloads} can be combined into one signature`;
}
@@ -119,10 +118,9 @@ export default util.createRule({
context.report({
loc: extraParameter.loc,
- messageId:
- extraParameter.type === AST_NODE_TYPES.RestElement
- ? 'omittingRestParameter'
- : 'omittingSingleParameter',
+ messageId: extraParameter.type === AST_NODE_TYPES.RestElement
+ ? 'omittingRestParameter'
+ : 'omittingSingleParameter',
data: {
failureStringStart: failureStringStart(lineOfOtherOverload),
},
@@ -194,10 +192,12 @@ export default util.createRule({
): boolean {
// Must return the same type.
- const aTypeParams =
- a.typeParameters !== undefined ? a.typeParameters.params : undefined;
- const bTypeParams =
- b.typeParameters !== undefined ? b.typeParameters.params : undefined;
+ const aTypeParams = a.typeParameters !== undefined
+ ? a.typeParameters.params
+ : undefined;
+ const bTypeParams = b.typeParameters !== undefined
+ ? b.typeParameters.params
+ : undefined;
return (
typesAreEqual(a.returnType, b.returnType) &&
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/func-call-spacing.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/func-call-spacing.test.ts
index 11650e2..d8b1823 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/func-call-spacing.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/func-call-spacing.test.ts
@@ -405,10 +405,9 @@ var a = foo
options: ['always'],
errors: [
{
- messageId:
- code.code.includes('\n') || code.code.includes('\r')
- ? 'unexpectedNewline'
- : 'unexpectedWhitespace',
+ messageId: code.code.includes('\n') || code.code.includes('\r')
+ ? 'unexpectedNewline'
+ : 'unexpectedWhitespace',
},
],
...code,
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 628389a..a663a1a 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/indent/utils.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/indent/utils.ts
@@ -91,10 +91,9 @@ export function expectedErrors(
return {
messageId: 'wrongIndentation',
data: {
- expected:
- typeof expected === 'string' && typeof actual === 'string'
- ? expected
- : `${expected} ${indentType}${expected === 1 ? '' : 's'}`,
+ expected: typeof expected === 'string' && typeof actual === 'string'
+ ? expected
+ : `${expected} ${indentType}${expected === 1 ? '' : 's'}`,
actual,
},
type,
diff --git ORI/typescript-eslint/packages/scope-manager/src/analyze.ts ALT/typescript-eslint/packages/scope-manager/src/analyze.ts
index febd7a2..0c2e926 100644
--- ORI/typescript-eslint/packages/scope-manager/src/analyze.ts
+++ ALT/typescript-eslint/packages/scope-manager/src/analyze.ts
@@ -113,10 +113,9 @@ function analyze(
globalReturn: providedOptions?.globalReturn ?? DEFAULT_OPTIONS.globalReturn,
impliedStrict:
providedOptions?.impliedStrict ?? DEFAULT_OPTIONS.impliedStrict,
- jsxPragma:
- providedOptions?.jsxPragma === undefined
- ? DEFAULT_OPTIONS.jsxPragma
- : providedOptions.jsxPragma,
+ jsxPragma: providedOptions?.jsxPragma === undefined
+ ? DEFAULT_OPTIONS.jsxPragma
+ : providedOptions.jsxPragma,
jsxFragmentName:
providedOptions?.jsxFragmentName ?? DEFAULT_OPTIONS.jsxFragmentName,
sourceType: providedOptions?.sourceType ?? DEFAULT_OPTIONS.sourceType,
diff --git ORI/typescript-eslint/packages/scope-manager/src/referencer/Referencer.ts ALT/typescript-eslint/packages/scope-manager/src/referencer/Referencer.ts
index 10273bf..f633d44 100644
--- ORI/typescript-eslint/packages/scope-manager/src/referencer/Referencer.ts
+++ ALT/typescript-eslint/packages/scope-manager/src/referencer/Referencer.ts
@@ -728,10 +728,9 @@ class Referencer extends Visitor {
}
protected VariableDeclaration(node: TSESTree.VariableDeclaration): void {
- const variableTargetScope =
- node.kind === 'var'
- ? this.currentScope().variableScope
- : this.currentScope();
+ const variableTargetScope = node.kind === 'var'
+ ? this.currentScope().variableScope
+ : this.currentScope();
for (const decl of node.declarations) {
const init = decl.init;
diff --git ORI/typescript-eslint/packages/scope-manager/src/referencer/Visitor.ts ALT/typescript-eslint/packages/scope-manager/src/referencer/Visitor.ts
index a3e1e98..4e9cd21 100644
--- ORI/typescript-eslint/packages/scope-manager/src/referencer/Visitor.ts
+++ ALT/typescript-eslint/packages/scope-manager/src/referencer/Visitor.ts
@@ -18,10 +18,9 @@ class Visitor extends VisitorBase {
: optionsOrVisitor,
);
- this.#options =
- optionsOrVisitor instanceof Visitor
- ? optionsOrVisitor.#options
- : optionsOrVisitor;
+ this.#options = optionsOrVisitor instanceof Visitor
+ ? optionsOrVisitor.#options
+ : optionsOrVisitor;
}
protected visitPattern(
diff --git ORI/typescript-eslint/packages/scope-manager/src/scope/ScopeBase.ts ALT/typescript-eslint/packages/scope-manager/src/scope/ScopeBase.ts
index 18196d9..17688d0 100644
--- ORI/typescript-eslint/packages/scope-manager/src/scope/ScopeBase.ts
+++ ALT/typescript-eslint/packages/scope-manager/src/scope/ScopeBase.ts
@@ -422,14 +422,14 @@ abstract class ScopeBase<
node: TSESTree.Identifier | null,
def: Definition | null,
): void {
- const name =
- typeof nameOrVariable === 'string' ? nameOrVariable : nameOrVariable.name;
+ const name = typeof nameOrVariable === 'string'
+ ? nameOrVariable
+ : nameOrVariable.name;
let variable = set.get(name);
if (!variable) {
- variable =
- typeof nameOrVariable === 'string'
- ? new Variable(name, this as Scope)
- : nameOrVariable;
+ variable = typeof nameOrVariable === 'string'
+ ? new Variable(name, this as Scope)
+ : nameOrVariable;
set.set(name, variable);
variables.push(variable);
}
diff --git ORI/typescript-eslint/packages/typescript-estree/src/convert-comments.ts ALT/typescript-eslint/packages/typescript-estree/src/convert-comments.ts
index 737b01b..e095b1a 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/convert-comments.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/convert-comments.ts
@@ -19,21 +19,19 @@ export function convertComments(
forEachComment(
ast,
(_, comment) => {
- const type =
- comment.kind == ts.SyntaxKind.SingleLineCommentTrivia
- ? AST_TOKEN_TYPES.Line
- : AST_TOKEN_TYPES.Block;
+ const type = comment.kind == ts.SyntaxKind.SingleLineCommentTrivia
+ ? AST_TOKEN_TYPES.Line
+ : AST_TOKEN_TYPES.Block;
const range: TSESTree.Range = [comment.pos, comment.end];
const loc = getLocFor(range[0], range[1], ast);
// both comments start with 2 characters - /* or //
const textStart = range[0] + 2;
- const textEnd =
- comment.kind === ts.SyntaxKind.SingleLineCommentTrivia
- ? // single line comments end at the end
- range[1] - textStart
- : // multiline comments end 2 characters early
- range[1] - textStart - 2;
+ const textEnd = comment.kind === ts.SyntaxKind.SingleLineCommentTrivia
+ ? // single line comments end at the end
+ range[1] - textStart
+ : // multiline comments end 2 characters early
+ range[1] - textStart - 2;
comments.push({
type,
value: code.substr(textStart, textEnd),
diff --git ORI/typescript-eslint/packages/typescript-estree/src/convert.ts ALT/typescript-eslint/packages/typescript-estree/src/convert.ts
index f0fb7d3..348ad23 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/convert.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/convert.ts
@@ -486,15 +486,16 @@ export class Converter {
if ('type' in node) {
result.typeAnnotation =
- node.type && 'kind' in node.type && ts.isTypeNode(node.type)
+ node.type &&
+ 'kind' in node.type &&
+ ts.isTypeNode(node.type)
? this.convertTypeAnnotation(node.type, node)
: null;
}
if ('typeArguments' in node) {
- result.typeParameters =
- node.typeArguments && 'pos' in node.typeArguments
- ? this.convertTypeArgumentsToTypeParameters(node.typeArguments, node)
- : null;
+ result.typeParameters = node.typeArguments && 'pos' in node.typeArguments
+ ? this.convertTypeArgumentsToTypeParameters(node.typeArguments, node)
+ : null;
}
if ('typeParameters' in node) {
result.typeParameters =
@@ -857,10 +858,9 @@ export class Converter {
return this.createNode<TSESTree.SwitchCase>(node, {
type: AST_NODE_TYPES.SwitchCase,
// expression is present in case only
- test:
- node.kind === SyntaxKind.CaseClause
- ? this.convertChild(node.expression)
- : null,
+ test: node.kind === SyntaxKind.CaseClause
+ ? this.convertChild(node.expression)
+ : null,
consequent: node.statements.map(el => this.convertChild(el)),
});
@@ -949,10 +949,9 @@ export class Converter {
const result = this.createNode<
TSESTree.TSDeclareFunction | TSESTree.FunctionDeclaration
>(node, {
- type:
- isDeclare || !node.body
- ? AST_NODE_TYPES.TSDeclareFunction
- : AST_NODE_TYPES.FunctionDeclaration,
+ type: isDeclare || !node.body
+ ? AST_NODE_TYPES.TSDeclareFunction
+ : AST_NODE_TYPES.FunctionDeclaration,
id: this.convertChild(node.name),
generator: !!node.asteriskToken,
expression: false,
@@ -1647,10 +1646,9 @@ export class Converter {
case SyntaxKind.ClassDeclaration:
case SyntaxKind.ClassExpression: {
const heritageClauses = node.heritageClauses ?? [];
- const classNodeType =
- node.kind === SyntaxKind.ClassDeclaration
- ? AST_NODE_TYPES.ClassDeclaration
- : AST_NODE_TYPES.ClassExpression;
+ const classNodeType = node.kind === SyntaxKind.ClassDeclaration
+ ? AST_NODE_TYPES.ClassDeclaration
+ : AST_NODE_TYPES.ClassExpression;
const superClass = heritageClauses.find(
clause => clause.token === SyntaxKind.ExtendsKeyword,
@@ -1828,10 +1826,11 @@ export class Converter {
// SyntaxKind.NamespaceExport does not exist yet (i.e. is undefined), this
// cannot be shortened to an optional chain, or else you end up with
// undefined === undefined, and the true path will hard error at runtime
- node.exportClause &&
- node.exportClause.kind === SyntaxKind.NamespaceExport
- ? this.convertChild(node.exportClause.name)
- : null,
+
+ node.exportClause &&
+ node.exportClause.kind === SyntaxKind.NamespaceExport
+ ? this.convertChild(node.exportClause.name)
+ : null,
assertions: this.convertAssertClasue(node.assertClause),
});
}
@@ -2092,10 +2091,9 @@ export class Converter {
case SyntaxKind.StringLiteral: {
return this.createNode<TSESTree.StringLiteral>(node, {
type: AST_NODE_TYPES.Literal,
- value:
- parent.kind === SyntaxKind.JsxAttribute
- ? unescapeStringLiteralText(node.text)
- : node.text,
+ value: parent.kind === SyntaxKind.JsxAttribute
+ ? unescapeStringLiteralText(node.text)
+ : node.text,
raw: node.getText(),
});
}
@@ -2548,12 +2546,11 @@ export class Converter {
case SyntaxKind.FunctionType:
case SyntaxKind.ConstructSignature:
case SyntaxKind.CallSignature: {
- const type =
- node.kind === SyntaxKind.ConstructSignature
- ? AST_NODE_TYPES.TSConstructSignatureDeclaration
- : node.kind === SyntaxKind.CallSignature
- ? AST_NODE_TYPES.TSCallSignatureDeclaration
- : AST_NODE_TYPES.TSFunctionType;
+ const type = node.kind === SyntaxKind.ConstructSignature
+ ? AST_NODE_TYPES.TSConstructSignatureDeclaration
+ : node.kind === SyntaxKind.CallSignature
+ ? AST_NODE_TYPES.TSCallSignatureDeclaration
+ : AST_NODE_TYPES.TSFunctionType;
const result = this.createNode<
| TSESTree.TSFunctionType
| TSESTree.TSCallSignatureDeclaration
@@ -2579,10 +2576,9 @@ export class Converter {
const result = this.createNode<
TSESTree.TSInterfaceHeritage | TSESTree.TSClassImplements
>(node, {
- type:
- parent && parent.kind === SyntaxKind.InterfaceDeclaration
- ? AST_NODE_TYPES.TSInterfaceHeritage
- : AST_NODE_TYPES.TSClassImplements,
+ type: parent && parent.kind === SyntaxKind.InterfaceDeclaration
+ ? AST_NODE_TYPES.TSInterfaceHeritage
+ : AST_NODE_TYPES.TSClassImplements,
expression: this.convertChild(node.expression),
});
@@ -2817,12 +2813,11 @@ export class Converter {
// In TS 4.0, the `elementTypes` property was changed to `elements`.
// To support both at compile time, we cast to access the newer version
// if the former does not exist.
- const elementTypes =
- 'elementTypes' in node
- ? (node as any).elementTypes.map((el: ts.Node) =>
- this.convertType(el),
- )
- : node.elements.map(el => this.convertType(el));
+ const elementTypes = 'elementTypes' in node
+ ? (node as any).elementTypes.map((el: ts.Node) =>
+ this.convertType(el),
+ )
+ : node.elements.map(el => this.convertType(el));
return this.createNode<TSESTree.TSTupleType>(node, {
type: AST_NODE_TYPES.TSTupleType,
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 ae2dec4..646dd36 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/create-program/createWatchProgram.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/create-program/createWatchProgram.ts
@@ -280,10 +280,9 @@ function createWatchProgram(
const oldReadFile = watchCompilerHost.readFile;
watchCompilerHost.readFile = (filePathIn, encoding): string | undefined => {
const filePath = getCanonicalFileName(filePathIn);
- const fileContent =
- filePath === currentLintOperationState.filePath
- ? currentLintOperationState.code
- : oldReadFile(filePath, encoding);
+ const fileContent = filePath === currentLintOperationState.filePath
+ ? currentLintOperationState.code
+ : oldReadFile(filePath, encoding);
if (fileContent !== undefined) {
parsedFilesSeenHash.set(filePath, createHash(fileContent));
}
diff --git ORI/typescript-eslint/packages/typescript-estree/src/create-program/shared.ts ALT/typescript-eslint/packages/typescript-estree/src/create-program/shared.ts
index a0e654c..a9250e7 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/create-program/shared.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/create-program/shared.ts
@@ -48,8 +48,9 @@ function createDefaultCompilerOptionsFromExtra(
type CanonicalPath = string & { __brand: unknown };
// typescript doesn't provide a ts.sys implementation for browser environments
-const useCaseSensitiveFileNames =
- ts.sys !== undefined ? ts.sys.useCaseSensitiveFileNames : true;
+const useCaseSensitiveFileNames = ts.sys !== undefined
+ ? ts.sys.useCaseSensitiveFileNames
+ : true;
const correctPathCasing = useCaseSensitiveFileNames
? (filePath: string): string => filePath
: (filePath: string): string => filePath.toLowerCase();
diff --git ORI/typescript-eslint/packages/typescript-estree/src/node-utils.ts ALT/typescript-eslint/packages/typescript-estree/src/node-utils.ts
index d8182aa..9f80048 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/node-utils.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/node-utils.ts
@@ -364,10 +364,9 @@ export function unescapeStringLiteralText(text: string): string {
return text.replace(/&(?:#\d+|#x[\da-fA-F]+|[0-9a-zA-Z]+);/g, entity => {
const item = entity.slice(1, -1);
if (item[0] === '#') {
- const codePoint =
- item[1] === 'x'
- ? parseInt(item.slice(2), 16)
- : parseInt(item.slice(1), 10);
+ const codePoint = item[1] === 'x'
+ ? parseInt(item.slice(2), 16)
+ : parseInt(item.slice(1), 10);
return codePoint > 0x10ffff // RangeError: Invalid code point
? entity
: String.fromCodePoint(codePoint);
@@ -534,10 +533,9 @@ export function convertToken(
token: ts.Token<ts.TokenSyntaxKind>,
ast: ts.SourceFile,
): TSESTree.Token {
- const start =
- token.kind === SyntaxKind.JsxText
- ? token.getFullStart()
- : token.getStart(ast);
+ const start = token.kind === SyntaxKind.JsxText
+ ? token.getFullStart()
+ : token.getStart(ast);
const end = token.getEnd();
const value = ast.text.slice(start, end);
const tokenType = getTokenType(token);
diff --git ORI/typescript-eslint/packages/typescript-estree/src/parser.ts ALT/typescript-eslint/packages/typescript-estree/src/parser.ts
index 8867e8a..d540f8f 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/parser.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/parser.ts
@@ -339,8 +339,9 @@ function applyParserOptionsToExtra(options: TSESTreeOptions): void {
function warnAboutTSVersion(): void {
if (!isRunningSupportedTypeScriptVersion && !warnedAboutTSVersion) {
- const isTTY =
- typeof process === 'undefined' ? false : process.stdout?.isTTY;
+ const isTTY = typeof process === 'undefined'
+ ? false
+ : process.stdout?.isTTY;
if (isTTY) {
const border = '=============';
const versionWarning = [
@@ -606,8 +607,9 @@ function parseAndGenerateServices<T extends TSESTreeOptions = TSESTreeOptions>(
* Convert the TypeScript AST to an ESTree-compatible one, and optionally preserve
* mappings between converted and original AST nodes
*/
- const preserveNodeMaps =
- typeof extra.preserveNodeMaps === 'boolean' ? extra.preserveNodeMaps : true;
+ const preserveNodeMaps = typeof extra.preserveNodeMaps === 'boolean'
+ ? extra.preserveNodeMaps
+ : true;
const { estree, astMaps } = astConverter(ast, extra, preserveNodeMaps);
/**
diff --git ORI/typescript-eslint/packages/typescript-estree/tests/lib/parse.test.ts ALT/typescript-eslint/packages/typescript-estree/tests/lib/parse.test.ts
index cd573fc..fd59b18 100644
--- ORI/typescript-eslint/packages/typescript-estree/tests/lib/parse.test.ts
+++ ALT/typescript-eslint/packages/typescript-estree/tests/lib/parse.test.ts
@@ -330,12 +330,11 @@ describe('parseAndGenerateServices', () => {
jsxSetting: boolean;
shouldThrow?: boolean;
}): void => {
- const code =
- ext === '.json'
- ? '{ "x": 1 }'
- : jsxContent
- ? 'const x = <div />;'
- : 'const x = 1';
+ const code = ext === '.json'
+ ? '{ "x": 1 }'
+ : jsxContent
+ ? 'const x = <div />;'
+ : 'const x = 1';
it(`should parse ${ext} file - ${
jsxContent ? 'with' : 'without'
} JSX content - parserOptions.jsx = ${jsxSetting}`, () => {
diff --git ORI/typescript-eslint/packages/utils/src/eslint-utils/batchedSingleLineTests.ts ALT/typescript-eslint/packages/utils/src/eslint-utils/batchedSingleLineTests.ts
index 8eaef6e..1aecc6e 100644
--- ORI/typescript-eslint/packages/utils/src/eslint-utils/batchedSingleLineTests.ts
+++ ALT/typescript-eslint/packages/utils/src/eslint-utils/batchedSingleLineTests.ts
@@ -36,19 +36,17 @@ function batchedSingleLineTests<
): (ValidTestCase<TOptions> | InvalidTestCase<TMessageIds, TOptions>)[] {
// -- eslint counts lines from 1
const lineOffset = options.code.startsWith('\n') ? 2 : 1;
- const output =
- 'output' in options && options.output
- ? options.output.trim().split('\n')
- : null;
+ const output = 'output' in options && options.output
+ ? options.output.trim().split('\n')
+ : null;
return options.code
.trim()
.split('\n')
.map((code, i) => {
const lineNum = i + lineOffset;
- const errors =
- 'errors' in options
- ? options.errors.filter(e => e.line === lineNum)
- : [];
+ const errors = 'errors' in options
+ ? options.errors.filter(e => e.line === lineNum)
+ : [];
const returnVal = {
...options,
code,
diff --git ORI/typescript-eslint/packages/website-eslint/rollup-plugin/replace.js ALT/typescript-eslint/packages/website-eslint/rollup-plugin/replace.js
index b8f3143..dd89909 100644
--- ORI/typescript-eslint/packages/website-eslint/rollup-plugin/replace.js
+++ ALT/typescript-eslint/packages/website-eslint/rollup-plugin/replace.js
@@ -35,8 +35,9 @@ module.exports = (options = {}) => {
return {
match: item.match,
test: item.test,
- replace:
- typeof item.replace === 'string' ? () => item.replace : item.replace,
+ replace: typeof item.replace === 'string'
+ ? () => item.replace
+ : item.replace,
matcher: createMatcher(item.match),
};
@@ -45,10 +46,9 @@ module.exports = (options = {}) => {
return {
name: 'rollup-plugin-replace',
resolveId(id, importerPath) {
- const importeePath =
- id.startsWith('./') || id.startsWith('../')
- ? Module.createRequire(importerPath).resolve(id)
- : id;
+ const importeePath = id.startsWith('./') || id.startsWith('../')
+ ? Module.createRequire(importerPath).resolve(id)
+ : id;
let result = aliasesCache.get(importeePath);
if (result) {
diff --git ORI/typescript-eslint/packages/website-eslint/src/linter/parser.js ALT/typescript-eslint/packages/website-eslint/src/linter/parser.js
index 41c0b24..6a6006f 100644
--- ORI/typescript-eslint/packages/website-eslint/src/linter/parser.js
+++ ALT/typescript-eslint/packages/website-eslint/src/linter/parser.js
@@ -33,8 +33,9 @@ export function parseForESLint(code, parserOptions) {
});
const scopeManager = analyze(ast, {
- ecmaVersion:
- parserOptions.ecmaVersion === 'latest' ? 1e8 : parserOptions.ecmaVersion,
+ ecmaVersion: parserOptions.ecmaVersion === 'latest'
+ ? 1e8
+ : parserOptions.ecmaVersion,
globalReturn: parserOptions.ecmaFeatures?.globalReturn ?? false,
sourceType: parserOptions.sourceType ?? 'script',
});
diff --git ORI/typescript-eslint/packages/website-eslint/src/mock/assert.js ALT/typescript-eslint/packages/website-eslint/src/mock/assert.js
index 70cbf7a..ea186d8 100644
--- ORI/typescript-eslint/packages/website-eslint/src/mock/assert.js
+++ ALT/typescript-eslint/packages/website-eslint/src/mock/assert.js
@@ -47,10 +47,9 @@ class AssertionError extends Error {
let out = err.stack;
// try to strip useless frames
- const fn_name =
- typeof stackStartFunction === 'function'
- ? stackStartFunction.name
- : stackStartFunction.toString();
+ const fn_name = typeof stackStartFunction === 'function'
+ ? stackStartFunction.name
+ : stackStartFunction.toString();
const idx = out.indexOf('\n' + fn_name);
if (idx >= 0) {
// once we have located the function frame
diff --git ORI/typescript-eslint/packages/website-eslint/src/mock/path.js ALT/typescript-eslint/packages/website-eslint/src/mock/path.js
index 3d04551..e8a401b 100644
--- ORI/typescript-eslint/packages/website-eslint/src/mock/path.js
+++ ALT/typescript-eslint/packages/website-eslint/src/mock/path.js
@@ -233,12 +233,11 @@ function filter(xs, f) {
}
// String.prototype.substr - negative index don't work in IE8
-const substr =
- 'ab'.substr(-1) === 'b'
- ? function (str, start, len) {
- return str.substr(start, len);
- }
- : function (str, start, len) {
- if (start < 0) start = str.length + start;
- return str.substr(start, len);
- };
+const substr = 'ab'.substr(-1) === 'b'
+ ? function (str, start, len) {
+ return str.substr(start, len);
+ }
+ : function (str, start, len) {
+ if (start < 0) start = str.length + start;
+ return str.substr(start, len);
+ }; |
|
prettier/prettier#12087 VS prettier/prettier@main :: vega/vega-lite@16bc913 Diff (554 lines)diff --git ORI/vega-lite/src/compile/axis/config.ts ALT/vega-lite/src/compile/axis/config.ts
index ee6b002..d7d1a39 100644
--- ORI/vega-lite/src/compile/axis/config.ts
+++ ALT/vega-lite/src/compile/axis/config.ts
@@ -51,16 +51,15 @@ export function getAxisConfigs(
orient: string | SignalRef,
config: Config
) {
- const typeBasedConfigTypes =
- scaleType === 'band'
- ? ['axisDiscrete', 'axisBand']
- : scaleType === 'point'
- ? ['axisDiscrete', 'axisPoint']
- : isQuantitative(scaleType)
- ? ['axisQuantitative']
- : scaleType === 'time' || scaleType === 'utc'
- ? ['axisTemporal']
- : [];
+ const typeBasedConfigTypes = scaleType === 'band'
+ ? ['axisDiscrete', 'axisBand']
+ : scaleType === 'point'
+ ? ['axisDiscrete', 'axisPoint']
+ : isQuantitative(scaleType)
+ ? ['axisQuantitative']
+ : scaleType === 'time' || scaleType === 'utc'
+ ? ['axisTemporal']
+ : [];
const axisChannel = channel === 'x' ? 'axisX' : 'axisY';
const axisOrient = isSignalRef(orient) ? 'axisOrient' : `axis${titleCase(orient)}`; // axisTop, axisBottom, ...
diff --git ORI/vega-lite/src/compile/axis/parse.ts ALT/vega-lite/src/compile/axis/parse.ts
index d61bb38..510c263 100644
--- ORI/vega-lite/src/compile/axis/parse.ts
+++ ALT/vega-lite/src/compile/axis/parse.ts
@@ -237,8 +237,9 @@ function parseAxis(channel: PositionScaleChannel, model: UnitModel): AxisCompone
const axisConfigs = getAxisConfigs(channel, scaleType, orient, model.config);
- const disable =
- axis !== undefined ? !axis : getAxisConfig('disable', config.style, axis?.style, axisConfigs).configValue;
+ const disable = axis !== undefined
+ ? !axis
+ : getAxisConfig('disable', config.style, axis?.style, axisConfigs).configValue;
axisComponent.set('disable', disable, axis !== undefined);
if (disable) {
return axisComponent;
@@ -261,8 +262,11 @@ function parseAxis(channel: PositionScaleChannel, model: UnitModel): AxisCompone
};
// 1.2. Add properties
for (const property of AXIS_COMPONENT_PROPERTIES) {
- const value =
- property in axisRules ? axisRules[property](ruleParams) : isAxisProperty(property) ? axis[property] : undefined;
+ const value = property in axisRules
+ ? axisRules[property](ruleParams)
+ : isAxisProperty(property)
+ ? axis[property]
+ : undefined;
const hasValue = value !== undefined;
@@ -271,10 +275,9 @@ function parseAxis(channel: PositionScaleChannel, model: UnitModel): AxisCompone
if (hasValue && explicit) {
axisComponent.set(property, value, explicit);
} else {
- const {configValue = undefined, configFrom = undefined} =
- isAxisProperty(property) && property !== 'values'
- ? getAxisConfig(property, config.style, axis.style, axisConfigs)
- : {};
+ const {configValue = undefined, configFrom = undefined} = isAxisProperty(property) && property !== 'values'
+ ? getAxisConfig(property, config.style, axis.style, axisConfigs)
+ : {};
const hasConfigValue = configValue !== undefined;
if (hasValue && !hasConfigValue) {
diff --git ORI/vega-lite/src/compile/data/debug.ts ALT/vega-lite/src/compile/data/debug.ts
index fb2e161..37d0419 100644
--- ORI/vega-lite/src/compile/data/debug.ts
+++ ALT/vega-lite/src/compile/data/debug.ts
@@ -81,10 +81,9 @@ export function dotString(roots: readonly DataFlowNode[]) {
nodes[id] = {
id,
label: getLabel(node),
- hash:
- node instanceof SourceNode
- ? node.data.url ?? node.data.name ?? node.debugName
- : String(node.hash()).replace(/"/g, '')
+ hash: node instanceof SourceNode
+ ? node.data.url ?? node.data.name ?? node.debugName
+ : String(node.hash()).replace(/"/g, '')
};
for (const child of node.children) {
diff --git ORI/vega-lite/src/compile/data/facet.ts ALT/vega-lite/src/compile/data/facet.ts
index 4c3e581..4224dcc 100644
--- ORI/vega-lite/src/compile/data/facet.ts
+++ ALT/vega-lite/src/compile/data/facet.ts
@@ -225,14 +225,13 @@ export class FacetNode extends DataFlowNode {
if (hasSharedAxis[headerChannel]) {
const cardinality = `length(data("${this.facet.name}"))`;
- const stop =
- headerChannel === 'row'
- ? columns
- ? {signal: `ceil(${cardinality} / ${columns})`}
- : 1
- : columns
- ? {signal: `min(${cardinality}, ${columns})`}
- : {signal: cardinality};
+ const stop = headerChannel === 'row'
+ ? columns
+ ? {signal: `ceil(${cardinality} / ${columns})`}
+ : 1
+ : columns
+ ? {signal: `min(${cardinality}, ${columns})`}
+ : {signal: cardinality};
data.push({
name: `${this.facet.name}_${headerChannel}`,
diff --git ORI/vega-lite/src/compile/data/parse.ts ALT/vega-lite/src/compile/data/parse.ts
index cf35136..0076c6f 100644
--- ORI/vega-lite/src/compile/data/parse.ts
+++ ALT/vega-lite/src/compile/data/parse.ts
@@ -303,8 +303,9 @@ export function parseData(model: Model): DataComponent {
const data = model.data;
const newData = data && (isGenerator(data) || isUrlData(data) || isInlineData(data));
- const ancestorParse =
- !newData && model.parent ? model.parent.component.data.ancestorParse.clone() : new AncestorParse();
+ const ancestorParse = !newData && model.parent
+ ? model.parent.component.data.ancestorParse.clone()
+ : new AncestorParse();
if (isGenerator(data)) {
// insert generator transform
diff --git ORI/vega-lite/src/compile/header/common.ts ALT/vega-lite/src/compile/header/common.ts
index dc252a9..f5d6626 100644
--- ORI/vega-lite/src/compile/header/common.ts
+++ ALT/vega-lite/src/compile/header/common.ts
@@ -23,8 +23,11 @@ export function getHeaderProperty<P extends keyof Header<SignalRef>>(
config: Config<SignalRef>,
channel: FacetChannel
): Header<SignalRef>[P] {
- const headerSpecificConfig =
- channel === 'row' ? config.headerRow : channel === 'column' ? config.headerColumn : config.headerFacet;
+ const headerSpecificConfig = channel === 'row'
+ ? config.headerRow
+ : channel === 'column'
+ ? config.headerColumn
+ : config.headerFacet;
return getFirstDefined((header || {})[prop], headerSpecificConfig[prop], config.header[prop]);
}
diff --git ORI/vega-lite/src/compile/header/parse.ts ALT/vega-lite/src/compile/header/parse.ts
index 5cdad78..a2c0403 100644
--- ORI/vega-lite/src/compile/header/parse.ts
+++ ALT/vega-lite/src/compile/header/parse.ts
@@ -48,8 +48,9 @@ function parseFacetHeader(model: FacetModel, channel: FacetChannel) {
const labelOrient = getHeaderProperty('labelOrient', fieldDef.header, config, channel);
- const labels =
- fieldDef.header !== null ? getFirstDefined(fieldDef.header?.labels, config.header.labels, true) : false;
+ const labels = fieldDef.header !== null
+ ? getFirstDefined(fieldDef.header?.labels, config.header.labels, true)
+ : false;
const headerType = contains(['bottom', 'right'], labelOrient) ? 'footer' : 'header';
component.layoutHeaders[channel] = {
diff --git ORI/vega-lite/src/compile/layoutsize/assemble.ts ALT/vega-lite/src/compile/layoutsize/assemble.ts
index 1b10bdd..34725c1 100644
--- ORI/vega-lite/src/compile/layoutsize/assemble.ts
+++ ALT/vega-lite/src/compile/layoutsize/assemble.ts
@@ -89,15 +89,14 @@ export function sizeExpr(scaleName: string, scaleComponent: ScaleComponent, card
const paddingOuter = getFirstDefined(scaleComponent.get('paddingOuter'), padding);
let paddingInner = scaleComponent.get('paddingInner');
- paddingInner =
- type === 'band'
- ? // only band has real paddingInner
- paddingInner !== undefined
- ? paddingInner
- : padding
- : // For point, as calculated in https://github.com/vega/vega-scale/blob/master/src/band.js#L128,
- // it's equivalent to have paddingInner = 1 since there is only n-1 steps between n points.
- 1;
+ paddingInner = type === 'band'
+ ? // only band has real paddingInner
+ paddingInner !== undefined
+ ? paddingInner
+ : padding
+ : // For point, as calculated in https://github.com/vega/vega-scale/blob/master/src/band.js#L128,
+ // it's equivalent to have paddingInner = 1 since there is only n-1 steps between n points.
+ 1;
return `bandspace(${cardinality}, ${signalOrStringValue(paddingInner)}, ${signalOrStringValue(
paddingOuter
)}) * ${scaleName}_step`;
diff --git ORI/vega-lite/src/compile/legend/parse.ts ALT/vega-lite/src/compile/legend/parse.ts
index 4e778ba..388dab1 100644
--- ORI/vega-lite/src/compile/legend/parse.ts
+++ ALT/vega-lite/src/compile/legend/parse.ts
@@ -150,10 +150,9 @@ export function parseLegendForChannel(model: UnitModel, channel: NonPositionScal
for (const part of ['labels', 'legend', 'title', 'symbols', 'gradient', 'entries']) {
const legendEncodingPart = guideEncodeEntry(legendEncoding[part] ?? {}, model);
- const value =
- part in legendEncodeRules
- ? legendEncodeRules[part](legendEncodingPart, legendEncodeParams) // apply rule
- : legendEncodingPart; // no rule -- just default values
+ const value = part in legendEncodeRules
+ ? legendEncodeRules[part](legendEncodingPart, legendEncodeParams) // apply rule
+ : legendEncodingPart; // no rule -- just default values
if (value !== undefined && !isEmpty(value)) {
legendEncode[part] = {
diff --git ORI/vega-lite/src/compile/mark/encode/position-point.ts ALT/vega-lite/src/compile/mark/encode/position-point.ts
index 1df089d..02f296a 100644
--- ORI/vega-lite/src/compile/mark/encode/position-point.ts
+++ ALT/vega-lite/src/compile/mark/encode/position-point.ts
@@ -55,23 +55,22 @@ export function pointPosition(
scale
});
- const valueRef =
- !channelDef && isXorY(channel) && (encoding.latitude || encoding.longitude)
- ? // use geopoint output if there are lat/long and there is no point position overriding lat/long.
- {field: model.getName(channel)}
- : positionRef({
- channel,
- channelDef,
- channel2Def,
- markDef,
- config,
- scaleName,
- scale,
- stack,
- offset,
- defaultRef,
- bandPosition: offsetType === 'encoding' ? 0 : undefined
- });
+ const valueRef = !channelDef && isXorY(channel) && (encoding.latitude || encoding.longitude)
+ ? // use geopoint output if there are lat/long and there is no point position overriding lat/long.
+ {field: model.getName(channel)}
+ : positionRef({
+ channel,
+ channelDef,
+ channel2Def,
+ markDef,
+ config,
+ scaleName,
+ scale,
+ stack,
+ offset,
+ defaultRef,
+ bandPosition: offsetType === 'encoding' ? 0 : undefined
+ });
return valueRef ? {[vgChannel || channel]: valueRef} : undefined;
}
diff --git ORI/vega-lite/src/compile/mark/encode/position-range.ts ALT/vega-lite/src/compile/mark/encode/position-range.ts
index 28ca2e8..4fe66a5 100644
--- ORI/vega-lite/src/compile/mark/encode/position-range.ts
+++ ALT/vega-lite/src/compile/mark/encode/position-range.ts
@@ -82,10 +82,9 @@ function pointPosition2OrSize(
const scaleName = model.scaleName(baseChannel);
const scale = model.getScaleComponent(baseChannel);
- const {offset} =
- channel in encoding || channel in markDef
- ? positionOffset({channel, markDef, encoding, model})
- : positionOffset({channel: baseChannel, markDef, encoding, model});
+ const {offset} = channel in encoding || channel in markDef
+ ? positionOffset({channel, markDef, encoding, model})
+ : positionOffset({channel: baseChannel, markDef, encoding, model});
if (!channelDef && (channel === 'x2' || channel === 'y2') && (encoding.latitude || encoding.longitude)) {
const vgSizeChannel = getSizeChannel(channel);
diff --git ORI/vega-lite/src/compile/mark/encode/valueref.ts ALT/vega-lite/src/compile/mark/encode/valueref.ts
index c68b668..a30323c 100644
--- ORI/vega-lite/src/compile/mark/encode/valueref.ts
+++ ALT/vega-lite/src/compile/mark/encode/valueref.ts
@@ -98,11 +98,10 @@ export function fieldInvalidTestValueRef(fieldDef: FieldDef<string>, channel: Po
const test = fieldInvalidPredicate(fieldDef, true);
const mainChannel = getMainRangeChannel(channel) as PositionChannel | PolarPositionChannel; // we can cast here as the output can't be other things.
- const zeroValueRef =
- mainChannel === 'y'
- ? {field: {group: 'height'}}
- : // x / angle / radius can all use 0
- {value: 0};
+ const zeroValueRef = mainChannel === 'y'
+ ? {field: {group: 'height'}}
+ : // x / angle / radius can all use 0
+ {value: 0};
return {test, ...zeroValueRef};
}
@@ -178,10 +177,9 @@ export function interpolatedSignalRef({
}): VgValueRef {
const expr = 0 < bandPosition && bandPosition < 1 ? 'datum' : undefined;
const start = vgField(fieldOrDatumDef, {expr, suffix: startSuffix});
- const end =
- fieldOrDatumDef2 !== undefined
- ? vgField(fieldOrDatumDef2, {expr})
- : vgField(fieldOrDatumDef, {suffix: 'end', expr});
+ const end = fieldOrDatumDef2 !== undefined
+ ? vgField(fieldOrDatumDef2, {expr})
+ : vgField(fieldOrDatumDef, {suffix: 'end', expr});
const ref: VgValueRef = {};
diff --git ORI/vega-lite/src/compile/mark/init.ts ALT/vega-lite/src/compile/mark/init.ts
index daa1646..d9150c0 100644
--- ORI/vega-lite/src/compile/mark/init.ts
+++ ALT/vega-lite/src/compile/mark/init.ts
@@ -40,7 +40,8 @@ export function initMarkdef(originalMarkDef: MarkDef, encoding: Encoding<string>
const cornerRadiusEnd = getMarkPropOrConfig('cornerRadiusEnd', markDef, config);
if (cornerRadiusEnd !== undefined) {
const newProps =
- (markDef.orient === 'horizontal' && encoding.x2) || (markDef.orient === 'vertical' && encoding.y2)
+ (markDef.orient === 'horizontal' && encoding.x2) ||
+ (markDef.orient === 'vertical' && encoding.y2)
? ['cornerRadius']
: BAR_CORNER_RADIUS_END_INDEX[markDef.orient];
diff --git ORI/vega-lite/src/compile/scale/domain.ts ALT/vega-lite/src/compile/scale/domain.ts
index bf4260d..b4ac990 100644
--- ORI/vega-lite/src/compile/scale/domain.ts
+++ ALT/vega-lite/src/compile/scale/domain.ts
@@ -277,8 +277,9 @@ function parseSingleChannelDomain(
]);
}
- const sort: undefined | true | VgSortField =
- isScaleChannel(channel) && isFieldDef(fieldOrDatumDef) ? domainSort(model, channel, scaleType) : undefined;
+ const sort: undefined | true | VgSortField = isScaleChannel(channel) && isFieldDef(fieldOrDatumDef)
+ ? domainSort(model, channel, scaleType)
+ : undefined;
if (isDatumDef(fieldOrDatumDef)) {
const d = convertDomainIfItIsDateTime([fieldOrDatumDef.datum], type, timeUnit);
@@ -318,13 +319,12 @@ function parseSingleChannelDomain(
// Use range if we added it and the scale does not support computing a range as a signal.
field: model.vgField(channel, binRequiresRange(fieldDef, channel) ? {binSuffix: 'range'} : {}),
// we have to use a sort object if sort = true to make the sort correct by bin start
- sort:
- sort === true || !isObject(sort)
- ? {
- field: model.vgField(channel, {}),
- op: 'min' // min or max doesn't matter since we sort by the start of the bin range
- }
- : sort
+ sort: sort === true || !isObject(sort)
+ ? {
+ field: model.vgField(channel, {}),
+ op: 'min' // min or max doesn't matter since we sort by the start of the bin range
+ }
+ : sort
}
]);
} else {
diff --git ORI/vega-lite/src/compile/scale/properties.ts ALT/vega-lite/src/compile/scale/properties.ts
index 501e9df..b49084f 100644
--- ORI/vega-lite/src/compile/scale/properties.ts
+++ ALT/vega-lite/src/compile/scale/properties.ts
@@ -106,23 +106,22 @@ function parseUnitScaleProperty(model: UnitModel, property: Exclude<keyof (Scale
);
}
} else {
- const value =
- property in scaleRules
- ? scaleRules[property]({
- model,
- channel,
- fieldOrDatumDef,
- scaleType,
- scalePadding,
- scalePaddingInner,
- domain: specifiedScale.domain,
- domainMin: specifiedScale.domainMin,
- domainMax: specifiedScale.domainMax,
- markDef,
- config,
- hasNestedOffsetScale: channelHasNestedOffsetScale(encoding, channel)
- })
- : config.scale[property];
+ const value = property in scaleRules
+ ? scaleRules[property]({
+ model,
+ channel,
+ fieldOrDatumDef,
+ scaleType,
+ scalePadding,
+ scalePaddingInner,
+ domain: specifiedScale.domain,
+ domainMin: specifiedScale.domainMin,
+ domainMax: specifiedScale.domainMax,
+ markDef,
+ config,
+ hasNestedOffsetScale: channelHasNestedOffsetScale(encoding, channel)
+ })
+ : config.scale[property];
if (value !== undefined) {
localScaleCmpt.set(property, value, false);
}
diff --git ORI/vega-lite/src/compile/selection/assemble.ts ALT/vega-lite/src/compile/selection/assemble.ts
index 57d1171..190675a 100644
--- ORI/vega-lite/src/compile/selection/assemble.ts
+++ ALT/vega-lite/src/compile/selection/assemble.ts
@@ -168,10 +168,9 @@ export function assembleSelectionScaleDomain(
const parsedExtent = parseSelectionExtent(model, extent.param, extent);
return {
- signal:
- hasContinuousDomain(scaleCmpt.get('type')) && isArray(domain) && domain[0] > domain[1]
- ? `isValid(${parsedExtent}) && reverse(${parsedExtent})`
- : parsedExtent
+ signal: hasContinuousDomain(scaleCmpt.get('type')) && isArray(domain) && domain[0] > domain[1]
+ ? `isValid(${parsedExtent}) && reverse(${parsedExtent})`
+ : parsedExtent
};
}
diff --git ORI/vega-lite/src/compile/selection/project.ts ALT/vega-lite/src/compile/selection/project.ts
index 6290d41..b71d009 100644
--- ORI/vega-lite/src/compile/selection/project.ts
+++ ALT/vega-lite/src/compile/selection/project.ts
@@ -64,10 +64,9 @@ const project: SelectionCompiler = {
const type = selCmpt.type;
const cfg = model.config.selection[type];
- const init =
- selDef.value !== undefined
- ? (array(selDef.value as any) as SelectionInitMapping[] | SelectionInitIntervalMapping[])
- : null;
+ const init = selDef.value !== undefined
+ ? (array(selDef.value as any) as SelectionInitMapping[] | SelectionInitIntervalMapping[])
+ : null;
// If no explicit projection (either fields or encodings) is specified, set some defaults.
// If an initial value is set, try to infer projections.
diff --git ORI/vega-lite/src/compositemark/boxplot.ts ALT/vega-lite/src/compositemark/boxplot.ts
index 8fbedcd..e85ab09 100644
--- ORI/vega-lite/src/compositemark/boxplot.ts
+++ ALT/vega-lite/src/compositemark/boxplot.ts
@@ -148,18 +148,17 @@ export function normalizeBoxPlot(
// ## Whisker Layers
const endTick: MarkDef = {type: 'tick', color: 'black', opacity: 1, orient: ticksOrient, invalid: null, aria: false};
- const whiskerTooltipEncoding: Encoding<string> =
- boxPlotType === 'min-max'
- ? fiveSummaryTooltipEncoding // for min-max, show five-summary tooltip for whisker
- : // for tukey / k-IQR, just show upper/lower-whisker
- getCompositeMarkTooltip(
- [
- {fieldPrefix: 'upper_whisker_', titlePrefix: 'Upper Whisker'},
- {fieldPrefix: 'lower_whisker_', titlePrefix: 'Lower Whisker'}
- ],
- continuousAxisChannelDef,
- encodingWithoutContinuousAxis
- );
+ const whiskerTooltipEncoding: Encoding<string> = boxPlotType === 'min-max'
+ ? fiveSummaryTooltipEncoding // for min-max, show five-summary tooltip for whisker
+ : // for tukey / k-IQR, just show upper/lower-whisker
+ getCompositeMarkTooltip(
+ [
+ {fieldPrefix: 'upper_whisker_', titlePrefix: 'Upper Whisker'},
+ {fieldPrefix: 'lower_whisker_', titlePrefix: 'Lower Whisker'}
+ ],
+ continuousAxisChannelDef,
+ encodingWithoutContinuousAxis
+ );
const whiskerLayers = [
...makeBoxPlotExtent({
@@ -375,24 +374,23 @@ function boxParams(
}
];
- const postAggregateCalculates: CalculateTransform[] =
- boxPlotType === 'min-max' || boxPlotType === 'tukey'
- ? []
- : [
- // This is for the original k-IQR, which we do not expose
- {
- calculate: `datum["upper_box_${continuousFieldName}"] - datum["lower_box_${continuousFieldName}"]`,
- as: `iqr_${continuousFieldName}`
- },
- {
- calculate: `min(datum["upper_box_${continuousFieldName}"] + datum["iqr_${continuousFieldName}"] * ${extent}, datum["max_${continuousFieldName}"])`,
- as: `upper_whisker_${continuousFieldName}`
- },
- {
- calculate: `max(datum["lower_box_${continuousFieldName}"] - datum["iqr_${continuousFieldName}"] * ${extent}, datum["min_${continuousFieldName}"])`,
- as: `lower_whisker_${continuousFieldName}`
- }
- ];
+ const postAggregateCalculates: CalculateTransform[] = boxPlotType === 'min-max' || boxPlotType === 'tukey'
+ ? []
+ : [
+ // This is for the original k-IQR, which we do not expose
+ {
+ calculate: `datum["upper_box_${continuousFieldName}"] - datum["lower_box_${continuousFieldName}"]`,
+ as: `iqr_${continuousFieldName}`
+ },
+ {
+ calculate: `min(datum["upper_box_${continuousFieldName}"] + datum["iqr_${continuousFieldName}"] * ${extent}, datum["max_${continuousFieldName}"])`,
+ as: `upper_whisker_${continuousFieldName}`
+ },
+ {
+ calculate: `max(datum["lower_box_${continuousFieldName}"] - datum["iqr_${continuousFieldName}"] * ${extent}, datum["min_${continuousFieldName}"])`,
+ as: `lower_whisker_${continuousFieldName}`
+ }
+ ];
const {[continuousAxis]: oldContinuousAxisChannelDef, ...oldEncodingWithoutContinuousAxis} = spec.encoding;
const {customTooltipWithoutAggregatedField, filteredEncoding} = filterTooltipWithAggregatedField(
diff --git ORI/vega-lite/src/mark.ts ALT/vega-lite/src/mark.ts
index 5a27f5d..1270686 100644
--- ORI/vega-lite/src/mark.ts
+++ ALT/vega-lite/src/mark.ts
@@ -599,8 +599,10 @@ export interface RelativeBandSize {
}
// Point/Line OverlayMixins are only for area, line, and trail but we don't want to declare multiple types of MarkDef
-export interface MarkDef<M extends string | Mark = Mark, ES extends ExprRef | SignalRef = ExprRef | SignalRef>
- extends GenericMarkDef<M>,
+export interface MarkDef<
+ M extends string | Mark = Mark,
+ ES extends ExprRef | SignalRef = ExprRef | SignalRef
+> extends GenericMarkDef<M>,
Omit<
MarkConfig<ES> &
AreaConfig<ES> &
diff --git ORI/vega-lite/test/normalize/core.test.ts ALT/vega-lite/test/normalize/core.test.ts
index 419ef6d..8c1d491 100644
--- ORI/vega-lite/test/normalize/core.test.ts
+++ ALT/vega-lite/test/normalize/core.test.ts
@@ -87,12 +87,11 @@ describe('normalize()', () => {
};
const config = initConfig(spec.config);
- const expectedFacet =
- channel === 'facet'
- ? fieldDef
- : {
- [channel]: fieldDef
- };
+ const expectedFacet = channel === 'facet'
+ ? fieldDef
+ : {
+ [channel]: fieldDef
+ };
expect(normalize(spec, config)).toEqual({
name: 'faceted', |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
prettier/prettier#12087
The text was updated successfully, but these errors were encountered: