Comments (62)
thorn0
commented on May 17, 2024
run #10457
from prettier-regression-testing.
github-actions
commented on May 17, 2024
prettier/prettier#10457 VS prettier/prettier@main
- babel/babel@b63be94
- vuejs/eslint-plugin-vue@cc9c140
- excalidraw/excalidraw@1973ae9
- prettier/prettier@2c1b8f6
- typescript-eslint/typescript-eslint@7b701a3
- vega/vega-lite@e89e9e6
The diff is empty.
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run #10032
from prettier-regression-testing.
github-actions
commented on May 17, 2024
prettier/prettier#10032 VS prettier/prettier@main
- babel/babel@b63be94
- vuejs/eslint-plugin-vue@cc9c140
- excalidraw/excalidraw@1973ae9
- prettier/prettier@2c1b8f6
- typescript-eslint/typescript-eslint@7b701a3
- vega/vega-lite@e89e9e6
The diff is empty.
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run thorn0/prettier#couldGroupArg-experiments
from prettier-regression-testing.
github-actions
commented on May 17, 2024
thorn0/prettier@couldGroupArg-experiments VS prettier/prettier@main
- babel/babel@b63be94
- vuejs/eslint-plugin-vue@cc9c140
- excalidraw/excalidraw@1973ae9
- prettier/prettier@2c1b8f6
- typescript-eslint/typescript-eslint@7b701a3
- vega/vega-lite@e89e9e6
Diff (3991 lines)
diff --git ORI/babel/eslint/babel-eslint-plugin-development-internal/src/rules/dry-error-messages.js ALT/babel/eslint/babel-eslint-plugin-development-internal/src/rules/dry-error-messages.js
index d6e2226e2..1d16d1fde 100644
--- ORI/babel/eslint/babel-eslint-plugin-development-internal/src/rules/dry-error-messages.js
+++ ALT/babel/eslint/babel-eslint-plugin-development-internal/src/rules/dry-error-messages.js
@@ -151,8 +151,9 @@ export default {
if (
Array.isArray(nodesToCheck) &&
- nodesToCheck.every(node =>
- referencesImportedBinding(node, getScope(), importedBindings),
+ nodesToCheck.every(
+ node =>
+ referencesImportedBinding(node, getScope(), importedBindings),
)
) {
return;
diff --git ORI/babel/eslint/babel-eslint-tests/test/integration/eslint-plugin-import.js ALT/babel/eslint/babel-eslint-tests/test/integration/eslint-plugin-import.js
index 28aa3d6ac..bbb3f5d2b 100644
--- ORI/babel/eslint/babel-eslint-tests/test/integration/eslint-plugin-import.js
+++ ALT/babel/eslint/babel-eslint-tests/test/integration/eslint-plugin-import.js
@@ -5,8 +5,9 @@ describe("https://github.com/babel/babel-eslint/issues/558", () => {
it("doesn't crash with eslint-plugin-import", () => {
const engine = new eslint.CLIEngine({ ignore: false });
engine.executeOnFiles(
- ["a.js", "b.js", "c.js"].map(file =>
- path.resolve(__dirname, `../fixtures/eslint-plugin-import/${file}`),
+ ["a.js", "b.js", "c.js"].map(
+ file =>
+ path.resolve(__dirname, `../fixtures/eslint-plugin-import/${file}`),
),
);
});
diff --git ORI/babel/packages/babel-compat-data/scripts/utils-build-data.js ALT/babel/packages/babel-compat-data/scripts/utils-build-data.js
index e8a21f4f2..f47584427 100644
--- ORI/babel/packages/babel-compat-data/scripts/utils-build-data.js
+++ ALT/babel/packages/babel-compat-data/scripts/utils-build-data.js
@@ -35,17 +35,20 @@ exports.environments = [
"samsung",
];
-const compatibilityTests = flatMap(compatSources, data =>
- flatMap(data.tests, test => {
- if (!test.subtests) return test;
-
- return test.subtests.map(subtest =>
- Object.assign({}, subtest, {
- name: test.name + " / " + subtest.name,
- group: test.name,
- })
- );
- })
+const compatibilityTests = flatMap(
+ compatSources,
+ data =>
+ flatMap(data.tests, test => {
+ if (!test.subtests) return test;
+
+ return test.subtests.map(
+ subtest =>
+ Object.assign({}, subtest, {
+ name: test.name + " / " + subtest.name,
+ group: test.name,
+ })
+ );
+ })
);
exports.getLowestImplementedVersion = (
diff --git ORI/babel/packages/babel-core/src/config/config-chain.js ALT/babel/packages/babel-core/src/config/config-chain.js
index 6e586eeaf..33a224355 100644
--- ORI/babel/packages/babel-core/src/config/config-chain.js
+++ ALT/babel/packages/babel-core/src/config/config-chain.js
@@ -85,42 +85,48 @@ export const buildPresetChainWalker: (arg: PresetInstance, context: *) => * =
loadPresetOverridesEnvDescriptors(preset)(index)(envName),
createLogger: () => () => {}, // Currently we don't support logging how preset is expanded
});
-const loadPresetDescriptors = makeWeakCacheSync((preset: PresetInstance) =>
- buildRootDescriptors(preset, preset.alias, createUncachedDescriptors),
-);
-const loadPresetEnvDescriptors = makeWeakCacheSync((preset: PresetInstance) =>
- makeStrongCacheSync((envName: string) =>
- buildEnvDescriptors(
- preset,
- preset.alias,
- createUncachedDescriptors,
- envName,
- ),
- ),
+const loadPresetDescriptors = makeWeakCacheSync(
+ (preset: PresetInstance) =>
+ buildRootDescriptors(preset, preset.alias, createUncachedDescriptors),
);
-const loadPresetOverridesDescriptors = makeWeakCacheSync(
+const loadPresetEnvDescriptors = makeWeakCacheSync(
(preset: PresetInstance) =>
- makeStrongCacheSync((index: number) =>
- buildOverrideDescriptors(
- preset,
- preset.alias,
- createUncachedDescriptors,
- index,
- ),
+ makeStrongCacheSync(
+ (envName: string) =>
+ buildEnvDescriptors(
+ preset,
+ preset.alias,
+ createUncachedDescriptors,
+ envName,
+ ),
),
);
-const loadPresetOverridesEnvDescriptors = makeWeakCacheSync(
+const loadPresetOverridesDescriptors = makeWeakCacheSync(
(preset: PresetInstance) =>
- makeStrongCacheSync((index: number) =>
- makeStrongCacheSync((envName: string) =>
- buildOverrideEnvDescriptors(
+ makeStrongCacheSync(
+ (index: number) =>
+ buildOverrideDescriptors(
preset,
preset.alias,
createUncachedDescriptors,
index,
- envName,
),
- ),
+ ),
+);
+const loadPresetOverridesEnvDescriptors = makeWeakCacheSync(
+ (preset: PresetInstance) =>
+ makeStrongCacheSync(
+ (index: number) =>
+ makeStrongCacheSync(
+ (envName: string) =>
+ buildOverrideEnvDescriptors(
+ preset,
+ preset.alias,
+ createUncachedDescriptors,
+ index,
+ envName,
+ ),
+ ),
),
);
@@ -390,41 +396,48 @@ function* loadFileChain(input, context, files, baseLogger) {
return chain;
}
-const loadFileDescriptors = makeWeakCacheSync((file: ValidatedFile) =>
- buildRootDescriptors(file, file.filepath, createUncachedDescriptors),
-);
-const loadFileEnvDescriptors = makeWeakCacheSync((file: ValidatedFile) =>
- makeStrongCacheSync((envName: string) =>
- buildEnvDescriptors(
- file,
- file.filepath,
- createUncachedDescriptors,
- envName,
- ),
- ),
+const loadFileDescriptors = makeWeakCacheSync(
+ (file: ValidatedFile) =>
+ buildRootDescriptors(file, file.filepath, createUncachedDescriptors),
);
-const loadFileOverridesDescriptors = makeWeakCacheSync((file: ValidatedFile) =>
- makeStrongCacheSync((index: number) =>
- buildOverrideDescriptors(
- file,
- file.filepath,
- createUncachedDescriptors,
- index,
+const loadFileEnvDescriptors = makeWeakCacheSync(
+ (file: ValidatedFile) =>
+ makeStrongCacheSync(
+ (envName: string) =>
+ buildEnvDescriptors(
+ file,
+ file.filepath,
+ createUncachedDescriptors,
+ envName,
+ ),
),
- ),
);
-const loadFileOverridesEnvDescriptors = makeWeakCacheSync(
+const loadFileOverridesDescriptors = makeWeakCacheSync(
(file: ValidatedFile) =>
- makeStrongCacheSync((index: number) =>
- makeStrongCacheSync((envName: string) =>
- buildOverrideEnvDescriptors(
+ makeStrongCacheSync(
+ (index: number) =>
+ buildOverrideDescriptors(
file,
file.filepath,
createUncachedDescriptors,
index,
- envName,
),
- ),
+ ),
+);
+const loadFileOverridesEnvDescriptors = makeWeakCacheSync(
+ (file: ValidatedFile) =>
+ makeStrongCacheSync(
+ (index: number) =>
+ makeStrongCacheSync(
+ (envName: string) =>
+ buildOverrideEnvDescriptors(
+ file,
+ file.filepath,
+ createUncachedDescriptors,
+ index,
+ envName,
+ ),
+ ),
),
);
@@ -572,8 +585,12 @@ function makeChainWalker<ArgT: { options: ValidatedOptions, dirname: string }>({
// that we don't do extra work loading extended configs if a file is
// ignored.
if (
- flattenedConfigs.some(({ config: { options: { ignore, only } } }) =>
- shouldIgnore(context, ignore, only, dirname),
+ flattenedConfigs.some(
+ ({
+ config: {
+ options: { ignore, only },
+ },
+ }) => shouldIgnore(context, ignore, only, dirname),
)
) {
return null;
@@ -810,8 +827,8 @@ function matchesPatterns(
patterns: IgnoreList,
dirname: string,
): boolean {
- return patterns.some(pattern =>
- matchPattern(pattern, dirname, context.filename, context),
+ return patterns.some(
+ pattern => matchPattern(pattern, dirname, context.filename, context),
);
}
diff --git ORI/babel/packages/babel-core/src/config/config-descriptors.js ALT/babel/packages/babel-core/src/config/config-descriptors.js
index c203dbc74..681d124d3 100644
--- ORI/babel/packages/babel-core/src/config/config-descriptors.js
+++ ALT/babel/packages/babel-core/src/config/config-descriptors.js
@@ -133,15 +133,17 @@ const PRESET_DESCRIPTOR_CACHE = new WeakMap();
const createCachedPresetDescriptors = makeWeakCacheSync(
(items: PluginList, cache: CacheConfigurator<string>) => {
const dirname = cache.using(dir => dir);
- return makeStrongCacheSync((alias: string) =>
- makeStrongCacheSync((passPerPreset: boolean) =>
- createPresetDescriptors(items, dirname, alias, passPerPreset).map(
- // Items are cached using the overall preset array identity when
- // possibly, but individual descriptors are also cached if a match
- // can be found in the previously-used descriptor lists.
- desc => loadCachedDescriptor(PRESET_DESCRIPTOR_CACHE, desc),
+ return makeStrongCacheSync(
+ (alias: string) =>
+ makeStrongCacheSync(
+ (passPerPreset: boolean) =>
+ createPresetDescriptors(items, dirname, alias, passPerPreset).map(
+ // Items are cached using the overall preset array identity when
+ // possibly, but individual descriptors are also cached if a match
+ // can be found in the previously-used descriptor lists.
+ desc => loadCachedDescriptor(PRESET_DESCRIPTOR_CACHE, desc),
+ ),
),
- ),
);
},
);
@@ -150,13 +152,14 @@ const PLUGIN_DESCRIPTOR_CACHE = new WeakMap();
const createCachedPluginDescriptors = makeWeakCacheSync(
(items: PluginList, cache: CacheConfigurator<string>) => {
const dirname = cache.using(dir => dir);
- return makeStrongCacheSync((alias: string) =>
- createPluginDescriptors(items, dirname, alias).map(
- // Items are cached using the overall plugin array identity when
- // possibly, but individual descriptors are also cached if a match
- // can be found in the previously-used descriptor lists.
- desc => loadCachedDescriptor(PLUGIN_DESCRIPTOR_CACHE, desc),
- ),
+ return makeStrongCacheSync(
+ (alias: string) =>
+ createPluginDescriptors(items, dirname, alias).map(
+ // Items are cached using the overall plugin array identity when
+ // possibly, but individual descriptors are also cached if a match
+ // can be found in the previously-used descriptor lists.
+ desc => loadCachedDescriptor(PLUGIN_DESCRIPTOR_CACHE, desc),
+ ),
);
},
);
@@ -192,8 +195,8 @@ function loadCachedDescriptor(
}
if (possibilities.indexOf(desc) === -1) {
- const matches = possibilities.filter(possibility =>
- isEqualDescriptor(possibility, desc),
+ const matches = possibilities.filter(
+ possibility => isEqualDescriptor(possibility, desc),
);
if (matches.length > 0) {
return matches[0];
@@ -229,12 +232,13 @@ function createDescriptors(
alias: string,
ownPass?: boolean,
): Array<UnloadedDescriptor> {
- const descriptors = items.map((item, index) =>
- createDescriptor(item, dirname, {
- type,
- alias: `${alias}$${index}`,
- ownPass: !!ownPass,
- }),
+ const descriptors = items.map(
+ (item, index) =>
+ createDescriptor(item, dirname, {
+ type,
+ alias: `${alias}$${index}`,
+ ownPass: !!ownPass,
+ }),
);
assertNoDuplicates(descriptors);
diff --git ORI/babel/packages/babel-core/src/config/files/configuration.js ALT/babel/packages/babel-core/src/config/files/configuration.js
index 8a3bed914..e6b3189de 100644
--- ORI/babel/packages/babel-core/src/config/files/configuration.js
+++ ALT/babel/packages/babel-core/src/config/files/configuration.js
@@ -106,8 +106,8 @@ function* loadOneConfig(
previousConfig?: ConfigFile | null = null,
): Handler<ConfigFile | null> {
const configs = yield* gensync.all(
- names.map(filename =>
- readConfig(path.join(dirname, filename), envName, caller),
+ names.map(
+ filename => readConfig(path.join(dirname, filename), envName, caller),
),
);
const config = configs.reduce((previousConfig: ConfigFile | null, config) => {
@@ -292,8 +292,8 @@ const readIgnoreConfig = makeStaticFileCache((filepath, content) => {
return {
filepath,
dirname: path.dirname(filepath),
- ignore: ignorePatterns.map(pattern =>
- pathPatternToRegex(pattern, ignoreDir),
+ ignore: ignorePatterns.map(
+ pattern => pathPatternToRegex(pattern, ignoreDir),
),
};
});
diff --git ORI/babel/packages/babel-core/src/config/full.js ALT/babel/packages/babel-core/src/config/full.js
index 75fbe293c..1abf3dce0 100644
--- ORI/babel/packages/babel-core/src/config/full.js
+++ ALT/babel/packages/babel-core/src/config/full.js
@@ -356,8 +356,9 @@ const validatePreset = (
const { options } = preset;
validateIfOptionNeedsFilename(options, descriptor);
if (options.overrides) {
- options.overrides.forEach(overrideOptions =>
- validateIfOptionNeedsFilename(overrideOptions, descriptor),
+ options.overrides.forEach(
+ overrideOptions =>
+ validateIfOptionNeedsFilename(overrideOptions, descriptor),
);
}
}
diff --git ORI/babel/packages/babel-core/src/config/partial.js ALT/babel/packages/babel-core/src/config/partial.js
index b42b4ec04..075c03f82 100644
--- ORI/babel/packages/babel-core/src/config/partial.js
+++ ALT/babel/packages/babel-core/src/config/partial.js
@@ -133,11 +133,11 @@ export default function* loadPrivatePartialConfig(
options.filename =
typeof context.filename === "string" ? context.filename : undefined;
- options.plugins = configChain.plugins.map(descriptor =>
- createItemFromDescriptor(descriptor),
+ options.plugins = configChain.plugins.map(
+ descriptor => createItemFromDescriptor(descriptor),
);
- options.presets = configChain.presets.map(descriptor =>
- createItemFromDescriptor(descriptor),
+ options.presets = configChain.presets.map(
+ descriptor => createItemFromDescriptor(descriptor),
);
return {
diff --git ORI/babel/packages/babel-core/test/api.js ALT/babel/packages/babel-core/test/api.js
index a8aed41cc..af6a23126 100644
--- ORI/babel/packages/babel-core/test/api.js
+++ ALT/babel/packages/babel-core/test/api.js
@@ -820,24 +820,25 @@ describe("api", function () {
describe("missing helpers", function () {
it("should always throw", function () {
- expect(() =>
- babel.transformSync(``, {
- configFile: false,
- plugins: [
- function () {
- return {
- visitor: {
- Program(path) {
- try {
+ expect(
+ () =>
+ babel.transformSync(``, {
+ configFile: false,
+ plugins: [
+ function () {
+ return {
+ visitor: {
+ Program(path) {
+ try {
+ path.pushContainer("body", this.addHelper("fooBar"));
+ } catch {}
path.pushContainer("body", this.addHelper("fooBar"));
- } catch {}
- path.pushContainer("body", this.addHelper("fooBar"));
+ },
},
- },
- };
- },
- ],
- }),
+ };
+ },
+ ],
+ }),
).toThrow();
});
});
diff --git ORI/babel/packages/babel-core/test/async.js ALT/babel/packages/babel-core/test/async.js
index 0e2bbdce8..54009cec9 100644
--- ORI/babel/packages/babel-core/test/async.js
+++ ALT/babel/packages/babel-core/test/async.js
@@ -25,8 +25,8 @@ describe("asynchronicity", () => {
nodeGte8("called synchronously", () => {
process.chdir("config-file-async-function");
- expect(() =>
- babel.transformSync(""),
+ expect(
+ () => babel.transformSync(""),
).toThrowErrorMatchingInlineSnapshot(
`"You appear to be using an async configuration, which your current version of Babel does` +
` not support. We may add support for this in the future, but if you're on the most recent` +
@@ -53,8 +53,8 @@ describe("asynchronicity", () => {
it("called synchronously", () => {
process.chdir("config-file-promise");
- expect(() =>
- babel.transformSync(""),
+ expect(
+ () => babel.transformSync(""),
).toThrowErrorMatchingInlineSnapshot(
`"You appear to be using an async configuration, which your current version of Babel does` +
` not support. We may add support for this in the future, but if you're on the most recent` +
@@ -81,8 +81,8 @@ describe("asynchronicity", () => {
nodeGte8("called synchronously", () => {
process.chdir("config-cache");
- expect(() =>
- babel.transformSync(""),
+ expect(
+ () => babel.transformSync(""),
).toThrowErrorMatchingInlineSnapshot(
`"You appear to be using an async cache handler, which your current version of Babel does` +
` not support. We may add support for this in the future, but if you're on the most recent` +
@@ -111,8 +111,8 @@ describe("asynchronicity", () => {
nodeGte8("called synchronously", () => {
process.chdir("plugin");
- expect(() =>
- babel.transformSync(""),
+ expect(
+ () => babel.transformSync(""),
).toThrowErrorMatchingInlineSnapshot(
`"[BABEL] unknown: You appear to be using an async plugin, which your current version of Babel` +
` does not support. If you're using a published plugin, you may need to upgrade your` +
@@ -137,8 +137,8 @@ describe("asynchronicity", () => {
nodeGte8("called synchronously", () => {
process.chdir("plugin-pre");
- expect(() =>
- babel.transformSync(""),
+ expect(
+ () => babel.transformSync(""),
).toThrowErrorMatchingInlineSnapshot(
`"unknown: You appear to be using an plugin with an async .pre, which your current version` +
` of Babel does not support. If you're using a published plugin, you may need to upgrade your` +
@@ -163,8 +163,8 @@ describe("asynchronicity", () => {
nodeGte8("called synchronously", () => {
process.chdir("plugin-post");
- expect(() =>
- babel.transformSync(""),
+ expect(
+ () => babel.transformSync(""),
).toThrowErrorMatchingInlineSnapshot(
`"unknown: You appear to be using an plugin with an async .post, which your current version` +
` of Babel does not support. If you're using a published plugin, you may need to upgrade your` +
@@ -189,8 +189,8 @@ describe("asynchronicity", () => {
nodeGte8("called synchronously", () => {
process.chdir("plugin-inherits");
- expect(() =>
- babel.transformSync(""),
+ expect(
+ () => babel.transformSync(""),
).toThrowErrorMatchingInlineSnapshot(
`"[BABEL] unknown: You appear to be using an async plugin, which your current version of Babel` +
` does not support. If you're using a published plugin, you may need to upgrade your` +
diff --git ORI/babel/packages/babel-core/test/config-chain.js ALT/babel/packages/babel-core/test/config-chain.js
index 4b3c1d10b..cb73d4ecf 100644
--- ORI/babel/packages/babel-core/test/config-chain.js
+++ ALT/babel/packages/babel-core/test/config-chain.js
@@ -54,11 +54,12 @@ const pfs =
}
return (...args) =>
- new Promise((resolve, reject) =>
- target[name](...args, (error, result) => {
- if (error) reject(error);
- else resolve(result);
- }),
+ new Promise(
+ (resolve, reject) =>
+ target[name](...args, (error, result) => {
+ if (error) reject(error);
+ else resolve(result);
+ }),
);
},
});
diff --git ORI/babel/packages/babel-core/test/option-manager.js ALT/babel/packages/babel-core/test/option-manager.js
index 75698baec..98b14eb06 100644
--- ORI/babel/packages/babel-core/test/option-manager.js
+++ ALT/babel/packages/babel-core/test/option-manager.js
@@ -247,12 +247,13 @@ describe("option-manager", () => {
function presetThrowsTest(name, msg) {
it(name, function () {
- expect(() =>
- loadOptions({
- presets: [
- path.join(__dirname, "fixtures/option-manager/presets", name),
- ],
- }),
+ expect(
+ () =>
+ loadOptions({
+ presets: [
+ path.join(__dirname, "fixtures/option-manager/presets", name),
+ ],
+ }),
).toThrow(msg);
});
}
diff --git ORI/babel/packages/babel-helper-compilation-targets/src/index.js ALT/babel/packages/babel-helper-compilation-targets/src/index.js
index 4fff39876..a74ae8f6a 100644
--- ORI/babel/packages/babel-helper-compilation-targets/src/index.js
+++ ALT/babel/packages/babel-helper-compilation-targets/src/index.js
@@ -104,8 +104,8 @@ function outputDecimalWarning(
}
console.warn("Warning, the following targets are using a decimal version:\n");
- decimalTargets.forEach(({ target, value }) =>
- console.warn(` ${target}: ${value}`),
+ decimalTargets.forEach(
+ ({ target, value }) => console.warn(` ${target}: ${value}`),
);
console.warn(`
We recommend using a string for minor/patch versions to avoid numbers like 6.10
diff --git ORI/babel/packages/babel-helper-compilation-targets/test/targets-parser.spec.js ALT/babel/packages/babel-helper-compilation-targets/test/targets-parser.spec.js
index 562ee2fc3..3f150c08c 100644
--- ORI/babel/packages/babel-helper-compilation-targets/test/targets-parser.spec.js
+++ ALT/babel/packages/babel-helper-compilation-targets/test/targets-parser.spec.js
@@ -263,8 +263,8 @@ describe("getTargets", () => {
describe("exception", () => {
it("throws when version is not a semver", () => {
- expect(() =>
- getTargets({ chrome: "seventy-two" }),
+ expect(
+ () => getTargets({ chrome: "seventy-two" }),
).toThrowErrorMatchingSnapshot();
});
});
diff --git ORI/babel/packages/babel-helper-module-imports/test/index.js ALT/babel/packages/babel-helper-module-imports/test/index.js
index 7f6a2206c..f4ade63bb 100644
--- ORI/babel/packages/babel-helper-module-imports/test/index.js
+++ ALT/babel/packages/babel-helper-module-imports/test/index.js
@@ -24,11 +24,13 @@ function test(sourceType, opts, initializer, inputCode, expectedCode) {
function ({ types: t }) {
return {
pre(file) {
- file.set("helperGenerator", name =>
- t.memberExpression(
- t.identifier("babelHelpers"),
- t.identifier(name),
- ),
+ file.set(
+ "helperGenerator",
+ name =>
+ t.memberExpression(
+ t.identifier("babelHelpers"),
+ t.identifier(name),
+ ),
);
},
visitor: {
@@ -1133,10 +1135,12 @@ describe("@babel/helper-module-imports", () => {
});
it("is disallowed in CJS modules", () => {
- expect(() =>
- testScript({ importPosition: "after" }, m =>
- m.addNamed("read", "source"),
- ),
+ expect(
+ () =>
+ testScript(
+ { importPosition: "after" },
+ m => m.addNamed("read", "source"),
+ ),
).toThrow(`"importPosition": "after" is only supported in modules`);
});
});
diff --git ORI/babel/packages/babel-helper-validator-option/test/validator.spec.js ALT/babel/packages/babel-helper-validator-option/test/validator.spec.js
index dc27b524d..c3721b419 100644
--- ORI/babel/packages/babel-helper-validator-option/test/validator.spec.js
+++ ALT/babel/packages/babel-helper-validator-option/test/validator.spec.js
@@ -7,25 +7,27 @@ describe("OptionValidator", () => {
v = new OptionValidator("test-descriptor");
});
it("should throw when option key is not found", () => {
- expect(() =>
- v.validateTopLevelOptions(
- { unknown: "options" },
- { foo: "foo" },
- "test",
- ),
+ expect(
+ () =>
+ v.validateTopLevelOptions(
+ { unknown: "options" },
+ { foo: "foo" },
+ "test",
+ ),
).toThrow();
});
it("should throw when option key is an own property but not found", () => {
- expect(() =>
- v.validateTopLevelOptions(
- { hasOwnProperty: "foo" },
- {
- foo: "foo",
- bar: "bar",
- aLongPropertyKeyToSeeLevenPerformance: "a",
- },
- "test",
- ),
+ expect(
+ () =>
+ v.validateTopLevelOptions(
+ { hasOwnProperty: "foo" },
+ {
+ foo: "foo",
+ bar: "bar",
+ aLongPropertyKeyToSeeLevenPerformance: "a",
+ },
+ "test",
+ ),
).toThrow();
});
});
diff --git ORI/babel/packages/babel-parser/src/index.js ALT/babel/packages/babel-parser/src/index.js
index b14033df8..6271748dd 100755
--- ORI/babel/packages/babel-parser/src/index.js
+++ ALT/babel/packages/babel-parser/src/index.js
@@ -83,8 +83,8 @@ const parserClassCache: { [key: string]: Class<Parser> } = {};
/** Get a Parser class with plugins applied. */
function getParserClass(pluginsFromOptions: PluginList): Class<Parser> {
- const pluginList = mixinPluginNames.filter(name =>
- hasPlugin(pluginsFromOptions, name),
+ const pluginList = mixinPluginNames.filter(
+ name => hasPlugin(pluginsFromOptions, name),
);
const key = pluginList.join("/");
diff --git ORI/babel/packages/babel-parser/src/parser/expression.js ALT/babel/packages/babel-parser/src/parser/expression.js
index b50aed34e..d15ad3ad5 100644
--- ORI/babel/packages/babel-parser/src/parser/expression.js
+++ ALT/babel/packages/babel-parser/src/parser/expression.js
@@ -175,8 +175,8 @@ export default class ExpressionParser extends LValParser {
refExpressionErrors?: ExpressionErrors,
): N.Expression {
if (disallowIn) {
- return this.disallowInAnd(() =>
- this.parseExpressionBase(refExpressionErrors),
+ return this.disallowInAnd(
+ () => this.parseExpressionBase(refExpressionErrors),
);
}
return this.allowInAnd(() => this.parseExpressionBase(refExpressionErrors));
@@ -205,12 +205,13 @@ export default class ExpressionParser extends LValParser {
afterLeftParse?: Function,
refNeedsArrowPos?: ?Pos,
) {
- return this.disallowInAnd(() =>
- this.parseMaybeAssign(
- refExpressionErrors,
- afterLeftParse,
- refNeedsArrowPos,
- ),
+ return this.disallowInAnd(
+ () =>
+ this.parseMaybeAssign(
+ refExpressionErrors,
+ afterLeftParse,
+ refNeedsArrowPos,
+ ),
);
}
@@ -220,12 +221,13 @@ export default class ExpressionParser extends LValParser {
afterLeftParse?: Function,
refNeedsArrowPos?: ?Pos,
) {
- return this.allowInAnd(() =>
- this.parseMaybeAssign(
- refExpressionErrors,
- afterLeftParse,
- refNeedsArrowPos,
- ),
+ return this.allowInAnd(
+ () =>
+ this.parseMaybeAssign(
+ refExpressionErrors,
+ afterLeftParse,
+ refNeedsArrowPos,
+ ),
);
}
diff --git ORI/babel/packages/babel-parser/src/parser/statement.js ALT/babel/packages/babel-parser/src/parser/statement.js
index a1b0e5824..e4b3e113f 100644
--- ORI/babel/packages/babel-parser/src/parser/statement.js
+++ ALT/babel/packages/babel-parser/src/parser/statement.js
@@ -464,9 +464,10 @@ export default class StatementParser extends ExpressionParser {
// For the smartPipelines plugin: Disable topic references from outer
// contexts within the loop body. They are permitted in test expressions,
// outside of the loop body.
- this.withTopicForbiddingContext(() =>
- // Parse the loop body's body.
- this.parseStatement("do"),
+ this.withTopicForbiddingContext(
+ () =>
+ // Parse the loop body's body.
+ this.parseStatement("do"),
);
this.state.labels.pop();
@@ -672,9 +673,10 @@ export default class StatementParser extends ExpressionParser {
clause.body =
// For the smartPipelines plugin: Disable topic references from outer
// contexts within the catch clause's body.
- this.withTopicForbiddingContext(() =>
- // Parse the catch clause's body.
- this.parseBlock(false, false),
+ this.withTopicForbiddingContext(
+ () =>
+ // Parse the catch clause's body.
+ this.parseBlock(false, false),
);
this.scope.exit();
@@ -709,9 +711,10 @@ export default class StatementParser extends ExpressionParser {
// For the smartPipelines plugin:
// Disable topic references from outer contexts within the loop body.
// They are permitted in test expressions, outside of the loop body.
- this.withTopicForbiddingContext(() =>
- // Parse loop body.
- this.parseStatement("while"),
+ this.withTopicForbiddingContext(
+ () =>
+ // Parse loop body.
+ this.parseStatement("while"),
);
this.state.labels.pop();
@@ -731,9 +734,10 @@ export default class StatementParser extends ExpressionParser {
// Disable topic references from outer contexts within the with statement's body.
// They are permitted in function default-parameter expressions, which are
// part of the outer context, outside of the with statement's body.
- this.withTopicForbiddingContext(() =>
- // Parse the statement body.
- this.parseStatement("with"),
+ this.withTopicForbiddingContext(
+ () =>
+ // Parse the statement body.
+ this.parseStatement("with"),
);
return this.finishNode(node, "WithStatement");
@@ -923,9 +927,10 @@ export default class StatementParser extends ExpressionParser {
// For the smartPipelines plugin: Disable topic references from outer
// contexts within the loop body. They are permitted in test expressions,
// outside of the loop body.
- this.withTopicForbiddingContext(() =>
- // Parse the loop body.
- this.parseStatement("for"),
+ this.withTopicForbiddingContext(
+ () =>
+ // Parse the loop body.
+ this.parseStatement("for"),
);
this.scope.exit();
@@ -978,9 +983,10 @@ export default class StatementParser extends ExpressionParser {
// For the smartPipelines plugin:
// Disable topic references from outer contexts within the loop body.
// They are permitted in test expressions, outside of the loop body.
- this.withTopicForbiddingContext(() =>
- // Parse loop body.
- this.parseStatement("for"),
+ this.withTopicForbiddingContext(
+ () =>
+ // Parse loop body.
+ this.parseStatement("for"),
);
this.scope.exit();
diff --git ORI/babel/packages/babel-parser/src/plugins/estree.js ALT/babel/packages/babel-parser/src/plugins/estree.js
index d9416b95e..e75ac28ce 100644
--- ORI/babel/packages/babel-parser/src/plugins/estree.js
+++ ALT/babel/packages/babel-parser/src/plugins/estree.js
@@ -132,8 +132,8 @@ export default (superClass: Class<Parser>): Class<Parser> =>
): void {
super.parseBlockBody(node, ...args);
- const directiveStatements = node.directives.map(d =>
- this.directiveToStmt(d),
+ const directiveStatements = node.directives.map(
+ d => this.directiveToStmt(d),
);
node.body = directiveStatements.concat(node.body);
// $FlowIgnore - directives isn't optional in the type definition
diff --git ORI/babel/packages/babel-parser/src/plugins/flow.js ALT/babel/packages/babel-parser/src/plugins/flow.js
index 6dfbe03ea..c9ab193eb 100644
--- ORI/babel/packages/babel-parser/src/plugins/flow.js
+++ ALT/babel/packages/babel-parser/src/plugins/flow.js
@@ -1696,8 +1696,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
isMethod?: boolean = false,
): void {
if (allowExpressionBody) {
- return this.forwardNoArrowParamsConversionAt(node, () =>
- super.parseFunctionBody(node, true, isMethod),
+ return this.forwardNoArrowParamsConversionAt(
+ node,
+ () => super.parseFunctionBody(node, true, isMethod),
);
}
@@ -1829,8 +1830,8 @@ export default (superClass: Class<Parser>): Class<Parser> =>
// only use the expensive "tryParse" method if there is a question mark
// and if we come from inside parens
if (refNeedsArrowPos) {
- const result = this.tryParse(() =>
- super.parseConditional(expr, startPos, startLoc),
+ const result = this.tryParse(
+ () => super.parseConditional(expr, startPos, startLoc),
);
if (!result.node) {
@@ -1888,8 +1889,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
node.test = expr;
node.consequent = consequent;
- node.alternate = this.forwardNoArrowParamsConversionAt(node, () =>
- this.parseMaybeAssign(undefined, undefined, undefined),
+ node.alternate = this.forwardNoArrowParamsConversionAt(
+ node,
+ () => this.parseMaybeAssign(undefined, undefined, undefined),
);
return this.finishNode(node, "ConditionalExpression");
@@ -1944,8 +1946,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
return [arrows, []];
}
- return partition(arrows, node =>
- node.params.every(param => this.isAssignable(param, true)),
+ return partition(
+ arrows,
+ node => node.params.every(param => this.isAssignable(param, true)),
);
}
@@ -2992,8 +2995,8 @@ export default (superClass: Class<Parser>): Class<Parser> =>
parseNewArguments(node: N.NewExpression): void {
let targs = null;
if (this.shouldParseTypes() && this.isRelational("<")) {
- targs = this.tryParse(() =>
- this.flowParseTypeParameterInstantiationCallOrNew(),
+ targs = this.tryParse(
+ () => this.flowParseTypeParameterInstantiationCallOrNew(),
).node;
}
node.typeArguments = targs;
diff --git ORI/babel/packages/babel-parser/src/plugins/typescript/index.js ALT/babel/packages/babel-parser/src/plugins/typescript/index.js
index 3b4aea59c..d69a3194f 100644
--- ORI/babel/packages/babel-parser/src/plugins/typescript/index.js
+++ ALT/babel/packages/babel-parser/src/plugins/typescript/index.js
@@ -920,8 +920,8 @@ export default (superClass: Class<Parser>): Class<Parser> =>
}
tsParseTypeOperatorOrHigher(): N.TsType {
- const operator = ["keyof", "unique", "readonly"].find(kw =>
- this.isContextual(kw),
+ const operator = ["keyof", "unique", "readonly"].find(
+ kw => this.isContextual(kw),
);
return operator
? this.tsParseTypeOperator(operator)
@@ -1686,15 +1686,16 @@ export default (superClass: Class<Parser>): Class<Parser> =>
tsParseTypeArguments(): N.TsTypeParameterInstantiation {
const node = this.startNode();
- node.params = this.tsInType(() =>
- // Temporarily remove a JSX parsing context, which makes us scan different tokens.
- this.tsInNoContext(() => {
- this.expectRelational("<");
- return this.tsParseDelimitedList(
- "TypeParametersOrArguments",
- this.tsParseType.bind(this),
- );
- }),
+ node.params = this.tsInType(
+ () =>
+ // Temporarily remove a JSX parsing context, which makes us scan different tokens.
+ this.tsInNoContext(() => {
+ this.expectRelational("<");
+ return this.tsParseDelimitedList(
+ "TypeParametersOrArguments",
+ this.tsParseType.bind(this),
+ );
+ }),
);
if (node.params.length === 0) {
this.raise(node.start, TSErrors.EmptyTypeArguments);
@@ -2238,8 +2239,8 @@ export default (superClass: Class<Parser>): Class<Parser> =>
);
}
- const result = this.tryParse(() =>
- super.parseConditional(expr, startPos, startLoc),
+ const result = this.tryParse(
+ () => super.parseConditional(expr, startPos, startLoc),
);
if (!result.node) {
@@ -2798,8 +2799,8 @@ export default (superClass: Class<Parser>): Class<Parser> =>
node: N.JSXOpeningElement,
): N.JSXOpeningElement {
if (this.isRelational("<")) {
- const typeArguments = this.tsTryParseAndCatch(() =>
- this.tsParseTypeArguments(),
+ const typeArguments = this.tsTryParseAndCatch(
+ () => this.tsParseTypeArguments(),
);
if (typeArguments) node.typeParameters = typeArguments;
}
diff --git ORI/babel/packages/babel-parser/src/tokenizer/index.js ALT/babel/packages/babel-parser/src/tokenizer/index.js
index 7c119c7d1..874730760 100644
--- ORI/babel/packages/babel-parser/src/tokenizer/index.js
+++ ALT/babel/packages/babel-parser/src/tokenizer/index.js
@@ -215,9 +215,10 @@ export default class Tokenizer extends ParserErrors {
// after a "use strict" directive. Strict mode will be set at parse
// time for any literals that occur after the next node of the strict
// directive.
- this.state.strictErrors.forEach((message, pos) =>
- /* eslint-disable @babel/development-internal/dry-error-messages */
- this.raise(pos, message),
+ this.state.strictErrors.forEach(
+ (message, pos) =>
+ /* eslint-disable @babel/development-internal/dry-error-messages */
+ this.raise(pos, message),
);
this.state.strictErrors.clear();
}
diff --git ORI/babel/packages/babel-plugin-proposal-object-rest-spread/src/index.js ALT/babel/packages/babel-plugin-proposal-object-rest-spread/src/index.js
index 387e2634c..d3e77efd2 100644
--- ORI/babel/packages/babel-plugin-proposal-object-rest-spread/src/index.js
+++ ALT/babel/packages/babel-plugin-proposal-object-rest-spread/src/index.js
@@ -353,8 +353,8 @@ export default declare((api, opts) => {
);
});
- const objectPatternPath = path.findParent(path =>
- path.isObjectPattern(),
+ const objectPatternPath = path.findParent(
+ path => path.isObjectPattern(),
);
const [impureComputedPropertyDeclarators, argument, callExpression] =
diff --git ORI/babel/packages/babel-plugin-transform-flow-comments/src/index.js ALT/babel/packages/babel-plugin-transform-flow-comments/src/index.js
index db926052c..abe719cac 100644
--- ORI/babel/packages/babel-plugin-transform-flow-comments/src/index.js
+++ ALT/babel/packages/babel-plugin-transform-flow-comments/src/index.js
@@ -179,8 +179,8 @@ export default declare(api => {
return;
}
- const typeSpecifiers = node.specifiers.filter(specifier =>
- isTypeImport(specifier.importKind),
+ const typeSpecifiers = node.specifiers.filter(
+ specifier => isTypeImport(specifier.importKind),
);
const nonTypeSpecifiers = node.specifiers.filter(
diff --git ORI/babel/packages/babel-plugin-transform-for-of/src/index.js ALT/babel/packages/babel-plugin-transform-for-of/src/index.js
index 42b238aef..415985256 100644
--- ORI/babel/packages/babel-plugin-transform-for-of/src/index.js
+++ ALT/babel/packages/babel-plugin-transform-for-of/src/index.js
@@ -67,8 +67,8 @@ export default declare((api, options) => {
const body = path.get("body");
if (
body.isBlockStatement() &&
- Object.keys(path.getBindingIdentifiers()).some(id =>
- body.scope.hasOwnBinding(id),
+ Object.keys(path.getBindingIdentifiers()).some(
+ id => body.scope.hasOwnBinding(id),
)
) {
blockBody = t.blockStatement([assignment, body.node]);
diff --git ORI/babel/packages/babel-plugin-transform-react-inline-elements/src/index.js ALT/babel/packages/babel-plugin-transform-react-inline-elements/src/index.js
index 925d46032..f05d2055d 100644
--- ORI/babel/packages/babel-plugin-transform-react-inline-elements/src/index.js
+++ ALT/babel/packages/babel-plugin-transform-react-inline-elements/src/index.js
@@ -47,8 +47,8 @@ export default declare(api => {
const props = state.args[1];
let hasKey = false;
if (t.isObjectExpression(props)) {
- const keyIndex = props.properties.findIndex(prop =>
- t.isIdentifier(prop.key, { name: "key" }),
+ const keyIndex = props.properties.findIndex(
+ prop => t.isIdentifier(prop.key, { name: "key" }),
);
if (keyIndex > -1) {
state.args.splice(2, 0, props.properties[keyIndex].value);
diff --git ORI/babel/packages/babel-plugin-transform-typeof-symbol/test/helper.spec.js ALT/babel/packages/babel-plugin-transform-typeof-symbol/test/helper.spec.js
index 74f6b1379..461208b1c 100644
--- ORI/babel/packages/babel-plugin-transform-typeof-symbol/test/helper.spec.js
+++ ALT/babel/packages/babel-plugin-transform-typeof-symbol/test/helper.spec.js
@@ -4,11 +4,12 @@ import fs from "fs";
import transformTypeofSymbol from "..";
const readFile = path =>
- new Promise((resolve, reject) =>
- fs.readFile(path, "utf8", (err, contents) => {
- if (err) reject(err);
- else resolve(contents);
- }),
+ new Promise(
+ (resolve, reject) =>
+ fs.readFile(path, "utf8", (err, contents) => {
+ if (err) reject(err);
+ else resolve(contents);
+ }),
);
describe("@babel/plugin-transform-typeof-symbol", () => {
diff --git ORI/babel/packages/babel-plugin-transform-typescript/src/enum.js ALT/babel/packages/babel-plugin-transform-typescript/src/enum.js
index 808f2fcf4..5d3e39d21 100644
--- ORI/babel/packages/babel-plugin-transform-typescript/src/enum.js
+++ ALT/babel/packages/babel-plugin-transform-typescript/src/enum.js
@@ -76,12 +76,13 @@ const buildEnumMember = (isString, options) =>
*/
function enumFill(path, t, id) {
const x = translateEnumValues(path, t);
- const assignments = x.map(([memberName, memberValue]) =>
- buildEnumMember(t.isStringLiteral(memberValue), {
- ENUM: t.cloneNode(id),
- NAME: memberName,
- VALUE: memberValue,
- }),
+ const assignments = x.map(
+ ([memberName, memberValue]) =>
+ buildEnumMember(t.isStringLiteral(memberValue), {
+ ENUM: t.cloneNode(id),
+ NAME: memberName,
+ VALUE: memberValue,
+ }),
);
return buildEnumWrapper({
diff --git ORI/babel/packages/babel-plugin-transform-typescript/src/index.js ALT/babel/packages/babel-plugin-transform-typescript/src/index.js
index 89b24c810..1ea816f73 100644
--- ORI/babel/packages/babel-plugin-transform-typescript/src/index.js
+++ ALT/babel/packages/babel-plugin-transform-typescript/src/index.js
@@ -301,8 +301,8 @@ export default declare((api, opts) => {
if (
!path.node.source &&
path.node.specifiers.length > 0 &&
- path.node.specifiers.every(({ local }) =>
- isGlobalType(path, local.name),
+ path.node.specifiers.every(
+ ({ local }) => isGlobalType(path, local.name),
)
) {
path.remove();
diff --git ORI/babel/packages/babel-preset-env/src/normalize-options.js ALT/babel/packages/babel-preset-env/src/normalize-options.js
index 417353bc4..e1c90afb1 100644
--- ORI/babel/packages/babel-preset-env/src/normalize-options.js
+++ ALT/babel/packages/babel-preset-env/src/normalize-options.js
@@ -71,8 +71,8 @@ const expandIncludesAndExcludes = (
) => {
if (plugins.length === 0) return [];
- const selectedPlugins = plugins.map(plugin =>
- selectPlugins(pluginToRegExp(plugin), type, corejs),
+ const selectedPlugins = plugins.map(
+ plugin => selectPlugins(pluginToRegExp(plugin), type, corejs),
);
const invalidRegExpList = plugins.filter(
(p, i) => selectedPlugins[i].length === 0,
diff --git ORI/babel/packages/babel-preset-env/test/normalize-options.spec.js ALT/babel/packages/babel-preset-env/test/normalize-options.spec.js
index 948c107ce..a2721be12 100644
--- ORI/babel/packages/babel-preset-env/test/normalize-options.spec.js
+++ ALT/babel/packages/babel-preset-env/test/normalize-options.spec.js
@@ -59,8 +59,8 @@ describe("normalize-options", () => {
`(
"should throw if with includes $include and excludes $exclude",
({ include, exclude }) => {
- expect(() =>
- normalizeOptions.default({ include, exclude }),
+ expect(
+ () => normalizeOptions.default({ include, exclude }),
).toThrowError(/were found in both/);
},
);
@@ -68,8 +68,8 @@ describe("normalize-options", () => {
it("should not throw if corejs version is valid", () => {
[2, 2.1, 3, 3.5].forEach(corejs => {
["entry", "usage"].forEach(useBuiltIns => {
- expect(() =>
- normalizeOptions.default({ useBuiltIns, corejs }),
+ expect(
+ () => normalizeOptions.default({ useBuiltIns, corejs }),
).not.toThrowError();
});
});
@@ -78,28 +78,31 @@ describe("normalize-options", () => {
it("should throw if corejs version is invalid", () => {
[1, 1.2, 4, 4.5].forEach(corejs => {
["entry", "usage"].forEach(useBuiltIns => {
- expect(() =>
- normalizeOptions.default({ useBuiltIns, corejs }),
+ expect(
+ () => normalizeOptions.default({ useBuiltIns, corejs }),
).toThrowError(/The version passed to `corejs` is invalid./);
});
});
});
it("throws when including module plugins", () => {
- expect(() =>
- normalizeOptions.default({ include: ["proposal-dynamic-import"] }),
+ expect(
+ () =>
+ normalizeOptions.default({ include: ["proposal-dynamic-import"] }),
).toThrow();
- expect(() =>
- normalizeOptions.default({ include: ["transform-modules-amd"] }),
+ expect(
+ () => normalizeOptions.default({ include: ["transform-modules-amd"] }),
).toThrow();
});
it("allows exclusion of module plugins ", () => {
- expect(() =>
- normalizeOptions.default({ exclude: ["proposal-dynamic-import"] }),
+ expect(
+ () =>
+ normalizeOptions.default({ exclude: ["proposal-dynamic-import"] }),
).not.toThrow();
- expect(() =>
- normalizeOptions.default({ exclude: ["transform-modules-commonjs"] }),
+ expect(
+ () =>
+ normalizeOptions.default({ exclude: ["transform-modules-commonjs"] }),
).not.toThrow();
});
});
diff --git ORI/babel/packages/babel-preset-typescript/test/normalize-options.spec.js ALT/babel/packages/babel-preset-typescript/test/normalize-options.spec.js
index b84c91c4f..a5c1a7b46 100644
--- ORI/babel/packages/babel-preset-typescript/test/normalize-options.spec.js
+++ ALT/babel/packages/babel-preset-typescript/test/normalize-options.spec.js
@@ -42,8 +42,8 @@ describe("normalize options", () => {
});
(process.env.BABEL_8_BREAKING ? describe.skip : describe)("Babel 7", () => {
it("should not throw on unknown options", () => {
- expect(() =>
- normalizeOptions({ allowNamespace: true }),
+ expect(
+ () => normalizeOptions({ allowNamespace: true }),
).not.toThrowError();
});
it.each(["allowDeclareFields", "allowNamespaces", "onlyRemoveTypeImports"])(
diff --git ORI/babel/packages/babel-standalone/src/index.js ALT/babel/packages/babel-standalone/src/index.js
index f2e218e89..96e7d5453 100644
--- ORI/babel/packages/babel-standalone/src/index.js
+++ ALT/babel/packages/babel-standalone/src/index.js
@@ -127,8 +127,8 @@ export function registerPlugin(name: string, plugin: Object | Function): void {
export function registerPlugins(newPlugins: {
[string]: Object | Function,
}): void {
- Object.keys(newPlugins).forEach(name =>
- registerPlugin(name, newPlugins[name]),
+ Object.keys(newPlugins).forEach(
+ name => registerPlugin(name, newPlugins[name]),
);
}
@@ -156,8 +156,8 @@ export function registerPreset(name: string, preset: Object | Function): void {
export function registerPresets(newPresets: {
[string]: Object | Function,
}): void {
- Object.keys(newPresets).forEach(name =>
- registerPreset(name, newPresets[name]),
+ Object.keys(newPresets).forEach(
+ name => registerPreset(name, newPresets[name]),
);
}
diff --git ORI/babel/packages/babel-standalone/test/babel.js ALT/babel/packages/babel-standalone/test/babel.js
index 1afeb7baa..9069dc9e0 100644
--- ORI/babel/packages/babel-standalone/test/babel.js
+++ ALT/babel/packages/babel-standalone/test/babel.js
@@ -99,14 +99,14 @@
});
it("throws on invalid preset name", () => {
- expect(() =>
- Babel.transform("var foo", { presets: ["lolfail"] }),
+ expect(
+ () => Babel.transform("var foo", { presets: ["lolfail"] }),
).toThrow(/Invalid preset specified in Babel options: "lolfail"/);
});
it("throws on invalid plugin name", () => {
- expect(() =>
- Babel.transform("var foo", { plugins: ["lolfail"] }),
+ expect(
+ () => Babel.transform("var foo", { plugins: ["lolfail"] }),
).toThrow(/Invalid plugin specified in Babel options: "lolfail"/);
});
@@ -199,22 +199,24 @@
describe("regressions", () => {
it("#11534 - supports quantifiers in unicode regexps", () => {
- expect(() =>
- Babel.transform("/a*/u", { presets: ["es2015"] }),
+ expect(
+ () => Babel.transform("/a*/u", { presets: ["es2015"] }),
).not.toThrow();
});
it("#11628 - supports stage-0 passing importAssertionsVersion to stage-1", () => {
- expect(() =>
- Babel.transform("const getMessage = () => 'Hello World'", {
- presets: [["stage-0", { decoratorsBeforeExport: false }]],
- }),
+ expect(
+ () =>
+ Babel.transform("const getMessage = () => 'Hello World'", {
+ presets: [["stage-0", { decoratorsBeforeExport: false }]],
+ }),
).not.toThrow();
});
it("#11897 - [...map.keys()] in Babel source should be transformed correctly", () => {
- expect(() =>
- Babel.transform("for (let el of []) { s => el }", {
- plugins: ["transform-block-scoping"],
- }),
+ expect(
+ () =>
+ Babel.transform("for (let el of []) { s => el }", {
+ plugins: ["transform-block-scoping"],
+ }),
).not.toThrow();
});
});
diff --git ORI/babel/packages/babel-types/test/builders/es2015/templateElement.js ALT/babel/packages/babel-types/test/builders/es2015/templateElement.js
index 3afe2c114..7e3493f3c 100644
--- ORI/babel/packages/babel-types/test/builders/es2015/templateElement.js
+++ ALT/babel/packages/babel-types/test/builders/es2015/templateElement.js
@@ -10,12 +10,12 @@ describe("builders", function () {
expect(t.templateElement({ raw: "foo" })).toMatchSnapshot();
- expect(() =>
- t.templateElement({ raw: 1 }),
+ expect(
+ () => t.templateElement({ raw: 1 }),
).toThrowErrorMatchingSnapshot();
- expect(() =>
- t.templateElement({ raw: "foo", cooked: 1 }),
+ expect(
+ () => t.templateElement({ raw: "foo", cooked: 1 }),
).toThrowErrorMatchingSnapshot();
expect(() => t.templateElement("foo")).toThrowErrorMatchingSnapshot();
@@ -33,20 +33,20 @@ describe("builders", function () {
expect(t.templateLiteral([foo, bar], [baz])).toMatchSnapshot();
- expect(() =>
- t.templateLiteral([foo, bar], [baz, qux]),
+ expect(
+ () => t.templateLiteral([foo, bar], [baz, qux]),
).toThrowErrorMatchingSnapshot();
- expect(() =>
- t.templateLiteral([foo, bar], []),
+ expect(
+ () => t.templateLiteral([foo, bar], []),
).toThrowErrorMatchingSnapshot();
- expect(() =>
- t.templateLiteral({}, [baz]),
+ expect(
+ () => t.templateLiteral({}, [baz]),
).toThrowErrorMatchingSnapshot();
- expect(() =>
- t.templateLiteral([foo, bar]),
+ expect(
+ () => t.templateLiteral([foo, bar]),
).toThrowErrorMatchingSnapshot();
});
});
diff --git ORI/babel/packages/babel-types/test/builders/flow/createTypeAnnotationBasedOnTypeof.js ALT/babel/packages/babel-types/test/builders/flow/createTypeAnnotationBasedOnTypeof.js
index d686e5c49..40a5098f5 100644
--- ORI/babel/packages/babel-types/test/builders/flow/createTypeAnnotationBasedOnTypeof.js
+++ ALT/babel/packages/babel-types/test/builders/flow/createTypeAnnotationBasedOnTypeof.js
@@ -22,8 +22,8 @@ describe("builders", function () {
}
it("invalid", function () {
- expect(() =>
- createTypeAnnotationBasedOnTypeof("thisdoesnotexist"),
+ expect(
+ () => createTypeAnnotationBasedOnTypeof("thisdoesnotexist"),
).toThrow(Error);
});
});
diff --git ORI/babel/packages/babel-types/test/builders/flow/declareClass.js ALT/babel/packages/babel-types/test/builders/flow/declareClass.js
index 71cc376ea..831eaccc5 100644
--- ORI/babel/packages/babel-types/test/builders/flow/declareClass.js
+++ ALT/babel/packages/babel-types/test/builders/flow/declareClass.js
@@ -16,15 +16,16 @@ describe("builders", function () {
});
it("not accept typeParameterInstantiation as typeParameters", function () {
- expect(() =>
- t.declareClass(
- t.identifier("A"),
- t.typeParameterInstantiation([
- t.genericTypeAnnotation(t.identifier("T")),
- ]),
- [],
- t.objectTypeAnnotation([], [], [], []),
- ),
+ expect(
+ () =>
+ t.declareClass(
+ t.identifier("A"),
+ t.typeParameterInstantiation([
+ t.genericTypeAnnotation(t.identifier("T")),
+ ]),
+ [],
+ t.objectTypeAnnotation([], [], [], []),
+ ),
).toThrow(Error);
});
});
diff --git ORI/eslint-plugin-vue/docs/.vuepress/config.js ALT/eslint-plugin-vue/docs/.vuepress/config.js
index fb7719f..2f61174 100644
--- ORI/eslint-plugin-vue/docs/.vuepress/config.js
+++ ALT/eslint-plugin-vue/docs/.vuepress/config.js
@@ -62,15 +62,17 @@ const categorizedRules = []
for (const { title, categoryIds } of sidebarCategories) {
const categoryRules = rules
.filter((rule) => rule.meta.docs.categories && !rule.meta.deprecated)
- .filter((rule) =>
- categoryIds.every((categoryId) =>
- rule.meta.docs.categories.includes(categoryId)
- )
+ .filter(
+ (rule) =>
+ categoryIds.every(
+ (categoryId) => rule.meta.docs.categories.includes(categoryId)
+ )
)
const children = categoryRules
.filter(({ ruleId }) => {
- const exists = categorizedRules.some(({ children }) =>
- children.some(([, alreadyRuleId]) => alreadyRuleId === ruleId)
+ const exists = categorizedRules.some(
+ ({ children }) =>
+ children.some(([, alreadyRuleId]) => alreadyRuleId === ruleId)
)
return !exists
})
diff --git ORI/eslint-plugin-vue/lib/rules/comment-directive.js ALT/eslint-plugin-vue/lib/rules/comment-directive.js
index 9ff9d2f..960f5d9 100644
--- ORI/eslint-plugin-vue/lib/rules/comment-directive.js
+++ ALT/eslint-plugin-vue/lib/rules/comment-directive.js
@@ -268,12 +268,13 @@ function extractTopLevelHTMLElements(documentFragment) {
function extractTopLevelDocumentFragmentComments(documentFragment) {
const elements = extractTopLevelHTMLElements(documentFragment)
- return documentFragment.comments.filter((comment) =>
- elements.every(
- (element) =>
- comment.range[1] <= element.range[0] ||
- element.range[1] <= comment.range[0]
- )
+ return documentFragment.comments.filter(
+ (comment) =>
+ elements.every(
+ (element) =>
+ comment.range[1] <= element.range[0] ||
+ element.range[1] <= comment.range[0]
+ )
)
}
diff --git ORI/eslint-plugin-vue/lib/rules/experimental-script-setup-vars.js ALT/eslint-plugin-vue/lib/rules/experimental-script-setup-vars.js
index d215a27..1ab212c 100644
--- ORI/eslint-plugin-vue/lib/rules/experimental-script-setup-vars.js
+++ ALT/eslint-plugin-vue/lib/rules/experimental-script-setup-vars.js
@@ -57,9 +57,11 @@ module.exports = {
let eslintScope
try {
- eslintScope = getESLintModule('eslint-scope', () =>
- // @ts-ignore
- require('eslint-scope')
+ eslintScope = getESLintModule(
+ 'eslint-scope',
+ () =>
+ // @ts-ignore
+ require('eslint-scope')
)
} catch (_e) {
context.report({
@@ -70,9 +72,11 @@ module.exports = {
}
let espree
try {
- espree = getESLintModule('espree', () =>
- // @ts-ignore
- require('espree')
+ espree = getESLintModule(
+ 'espree',
+ () =>
+ // @ts-ignore
+ require('espree')
)
} catch (_e) {
context.report({
diff --git ORI/eslint-plugin-vue/lib/rules/no-confusing-v-for-v-if.js ALT/eslint-plugin-vue/lib/rules/no-confusing-v-for-v-if.js
index 4135f16..33bc411 100644
--- ORI/eslint-plugin-vue/lib/rules/no-confusing-v-for-v-if.js
+++ ALT/eslint-plugin-vue/lib/rules/no-confusing-v-for-v-if.js
@@ -24,11 +24,13 @@ function isUsingIterationVar(vIf) {
const element = vIf.parent.parent
return Boolean(
vIf.value &&
- vIf.value.references.some((reference) =>
- element.variables.some(
- (variable) =>
- variable.id.name === reference.id.name && variable.kind === 'v-for'
- )
+ vIf.value.references.some(
+ (reference) =>
+ element.variables.some(
+ (variable) =>
+ variable.id.name === reference.id.name &&
+ variable.kind === 'v-for'
+ )
)
)
}
diff --git ORI/eslint-plugin-vue/lib/rules/no-deprecated-v-on-number-modifiers.js ALT/eslint-plugin-vue/lib/rules/no-deprecated-v-on-number-modifiers.js
index a7e91a0..58f8e42 100644
--- ORI/eslint-plugin-vue/lib/rules/no-deprecated-v-on-number-modifiers.js
+++ ALT/eslint-plugin-vue/lib/rules/no-deprecated-v-on-number-modifiers.js
@@ -36,8 +36,8 @@ module.exports = {
return utils.defineTemplateBodyVisitor(context, {
/** @param {VDirectiveKey} node */
"VAttribute[directive=true][key.name.name='on'] > VDirectiveKey"(node) {
- const modifier = node.modifiers.find((mod) =>
- Number.isInteger(parseInt(mod.name, 10))
+ const modifier = node.modifiers.find(
+ (mod) => Number.isInteger(parseInt(mod.name, 10))
)
if (!modifier) return
diff --git ORI/eslint-plugin-vue/lib/rules/no-dupe-v-else-if.js ALT/eslint-plugin-vue/lib/rules/no-dupe-v-else-if.js
index 8e3a3de..4e4415c 100644
--- ORI/eslint-plugin-vue/lib/rules/no-dupe-v-else-if.js
+++ ALT/eslint-plugin-vue/lib/rules/no-dupe-v-else-if.js
@@ -135,8 +135,9 @@ module.exports = {
* @returns {boolean} `true` if the `andOperandsA` is a subset of the `andOperandsB`.
*/
function isSubset(operandsA, operandsB) {
- return operandsA.operands.every((operandA) =>
- operandsB.operands.some((operandB) => equal(operandA, operandB))
+ return operandsA.operands.every(
+ (operandA) =>
+ operandsB.operands.some((operandB) => equal(operandA, operandB))
)
}
@@ -168,8 +169,8 @@ module.exports = {
for (const condition of listToCheck) {
const operands = (condition.operands = condition.operands.filter(
(orOperand) => {
- return !currentOrOperands.operands.some((currentOrOperand) =>
- isSubset(currentOrOperand, orOperand)
+ return !currentOrOperands.operands.some(
+ (currentOrOperand) => isSubset(currentOrOperand, orOperand)
)
}
))
diff --git ORI/eslint-plugin-vue/lib/rules/no-unregistered-components.js ALT/eslint-plugin-vue/lib/rules/no-unregistered-components.js
index 6e6cb2a..0c26dc7 100644
--- ORI/eslint-plugin-vue/lib/rules/no-unregistered-components.js
+++ ALT/eslint-plugin-vue/lib/rules/no-unregistered-components.js
@@ -167,15 +167,16 @@ module.exports = {
// Otherwise
return registeredComponentNames.indexOf(kebabCaseName) === -1
})
- .forEach(({ node, name }) =>
- context.report({
- node,
- message:
- 'The "{{name}}" component has been used but not registered.',
- data: {
- name
- }
- })
+ .forEach(
+ ({ node, name }) =>
+ context.report({
+ node,
+ message:
+ 'The "{{name}}" component has been used but not registered.',
+ data: {
+ name
+ }
+ })
)
}
},
diff --git ORI/eslint-plugin-vue/lib/rules/no-unused-components.js ALT/eslint-plugin-vue/lib/rules/no-unused-components.js
index e067e3e..c3244f0 100644
--- ORI/eslint-plugin-vue/lib/rules/no-unused-components.js
+++ ALT/eslint-plugin-vue/lib/rules/no-unused-components.js
@@ -123,15 +123,16 @@ module.exports = {
return !usedComponents.has(name)
}
})
- .forEach(({ node, name }) =>
- context.report({
- node,
- message:
- 'The "{{name}}" component has been registered but not used.',
- data: {
- name
- }
- })
+ .forEach(
+ ({ node, name }) =>
+ context.report({
+ node,
+ message:
+ 'The "{{name}}" component has been registered but not used.',
+ data: {
+ name
+ }
+ })
)
}
},
diff --git ORI/eslint-plugin-vue/lib/rules/no-unused-properties.js ALT/eslint-plugin-vue/lib/rules/no-unused-properties.js
index f89c518..ff66c1b 100644
--- ORI/eslint-plugin-vue/lib/rules/no-unused-properties.js
+++ ALT/eslint-plugin-vue/lib/rules/no-unused-properties.js
@@ -381,8 +381,9 @@ function extractPatternOrThisProperties(node, context, withInTemplate) {
// `arg.foo`
const name = utils.getStaticPropertyName(parent)
if (name) {
- result.addUsed(name, () =>
- extractPatternOrThisProperties(parent, context, withInTemplate)
+ result.addUsed(
+ name,
+ () => extractPatternOrThisProperties(parent, context, withInTemplate)
)
} else {
result.unknown = true
diff --git ORI/eslint-plugin-vue/lib/rules/no-v-for-template-key-on-child.js ALT/eslint-plugin-vue/lib/rules/no-v-for-template-key-on-child.js
index 79ee1d9..c58c2bd 100644
--- ORI/eslint-plugin-vue/lib/rules/no-v-for-template-key-on-child.js
+++ ALT/eslint-plugin-vue/lib/rules/no-v-for-template-key-on-child.js
@@ -27,11 +27,12 @@ function isUsingIterationVar(vFor, vBindKey) {
}
const references = vBindKey.value.references
const variables = vFor.parent.parent.variables
- return references.some((reference) =>
- variables.some(
- (variable) =>
- variable.id.name === reference.id.name && variable.kind === 'v-for'
- )
+ return references.some(
+ (reference) =>
+ variables.some(
+ (variable) =>
+ variable.id.name === reference.id.name && variable.kind === 'v-for'
+ )
)
}
diff --git ORI/eslint-plugin-vue/lib/rules/order-in-components.js ALT/eslint-plugin-vue/lib/rules/order-in-components.js
index 5f33734..03fc5d0 100644
--- ORI/eslint-plugin-vue/lib/rules/order-in-components.js
+++ ALT/eslint-plugin-vue/lib/rules/order-in-components.js
@@ -275,8 +275,9 @@ module.exports = {
.filter(
(p) => getOrderPosition(p.name) > getOrderPosition(property.name)
)
- .sort((p1, p2) =>
- getOrderPosition(p1.name) > getOrderPosition(p2.name) ? 1 : -1
+ .sort(
+ (p1, p2) =>
+ getOrderPosition(p1.name) > getOrderPosition(p2.name) ? 1 : -1
)
const firstUnorderedProperty = unorderedProperties[0]
diff --git ORI/eslint-plugin-vue/lib/rules/padding-line-between-blocks.js ALT/eslint-plugin-vue/lib/rules/padding-line-between-blocks.js
index c1b6524..15ead16 100644
--- ORI/eslint-plugin-vue/lib/rules/padding-line-between-blocks.js
+++ ALT/eslint-plugin-vue/lib/rules/padding-line-between-blocks.js
@@ -170,8 +170,9 @@ module.exports = {
(token) => token.type !== 'HTMLWhitespace'
),
...documentFragment.comments
- ].sort((a, b) =>
- a.range[0] > b.range[0] ? 1 : a.range[0] < b.range[0] ? -1 : 0
+ ].sort(
+ (a, b) =>
+ a.range[0] > b.range[0] ? 1 : a.range[0] < b.range[0] ? -1 : 0
)
}
diff --git ORI/eslint-plugin-vue/lib/rules/require-explicit-emits.js ALT/eslint-plugin-vue/lib/rules/require-explicit-emits.js
index 7974282..1ceeecf 100644
--- ORI/eslint-plugin-vue/lib/rules/require-explicit-emits.js
+++ ALT/eslint-plugin-vue/lib/rules/require-explicit-emits.js
@@ -427,8 +427,9 @@ function buildSuggest(object, emits, nameNode, context) {
}
const sourceCode = context.getSourceCode()
- const afterOptionNode = propertyNodes.find((p) =>
- FIX_EMITS_AFTER_OPTIONS.includes(utils.getStaticPropertyName(p) || '')
+ const afterOptionNode = propertyNodes.find(
+ (p) =>
+ FIX_EMITS_AFTER_OPTIONS.includes(utils.getStaticPropertyName(p) || '')
)
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 0f94f0f..b87b2a3 100644
--- ORI/eslint-plugin-vue/lib/rules/require-prop-type-constructor.js
+++ ALT/eslint-plugin-vue/lib/rules/require-prop-type-constructor.js
@@ -55,24 +55,28 @@ module.exports = {
nodes
.filter((prop) => isForbiddenType(prop))
- .forEach((prop) =>
- context.report({
- node: prop,
- message,
- data: {
- name: propName
- },
- fix: (fixer) => {
- if (prop.type === 'Literal' || prop.type === 'TemplateLiteral') {
- const newText = utils.getStringLiteralValue(prop, true)
+ .forEach(
+ (prop) =>
+ context.report({
+ node: prop,
+ message,
+ data: {
+ name: propName
+ },
+ fix: (fixer) => {
+ if (
+ prop.type === 'Literal' ||
+ prop.type === 'TemplateLiteral'
+ ) {
+ const newText = utils.getStringLiteralValue(prop, true)
- if (newText) {
- return fixer.replaceText(prop, newText)
+ if (newText) {
+ return fixer.replaceText(prop, newText)
+ }
}
+ return null
}
- return null
- }
- })
+ })
)
}
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 ef9453b..0d8888b 100644
--- ORI/eslint-plugin-vue/lib/rules/require-valid-default-prop.js
+++ ALT/eslint-plugin-vue/lib/rules/require-valid-default-prop.js
@@ -256,8 +256,8 @@ module.exports = {
report(
def.value,
prop,
- Array.from(typeNames).map((type) =>
- FUNCTION_VALUE_TYPES.has(type) ? 'Function' : type
+ Array.from(typeNames).map(
+ (type) => (FUNCTION_VALUE_TYPES.has(type) ? 'Function' : type)
)
)
} else {
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..6fbc1cb 100644
--- ORI/eslint-plugin-vue/lib/rules/use-v-on-exact.js
+++ ALT/eslint-plugin-vue/lib/rules/use-v-on-exact.js
@@ -206,8 +206,8 @@ module.exports = {
Object.keys(grouppedEvents).forEach((eventName) => {
const eventsInGroup = grouppedEvents[eventName]
- const hasEventWithKeyModifier = eventsInGroup.some((event) =>
- hasSystemModifier(event.modifiers)
+ const hasEventWithKeyModifier = eventsInGroup.some(
+ (event) => hasSystemModifier(event.modifiers)
)
if (!hasEventWithKeyModifier) return
diff --git ORI/eslint-plugin-vue/lib/rules/valid-v-for.js ALT/eslint-plugin-vue/lib/rules/valid-v-for.js
index 0d560aa..22f026d 100644
--- ORI/eslint-plugin-vue/lib/rules/valid-v-for.js
+++ ALT/eslint-plugin-vue/lib/rules/valid-v-for.js
@@ -27,11 +27,12 @@ function isUsingIterationVar(vFor, vBindKey) {
}
const references = vBindKey.value.references
const variables = vFor.parent.parent.variables
- return references.some((reference) =>
- variables.some(
- (variable) =>
- variable.id.name === reference.id.name && variable.kind === 'v-for'
- )
+ return references.some(
+ (reference) =>
+ variables.some(
+ (variable) =>
+ variable.id.name === reference.id.name && variable.kind === 'v-for'
+ )
)
}
@@ -47,11 +48,12 @@ function checkChildKey(context, vFor, child) {
if (childFor != null) {
const childForRefs = (childFor.value && childFor.value.references) || []
const variables = vFor.parent.parent.variables
- const usedInFor = childForRefs.some((cref) =>
- variables.some(
- (variable) =>
- cref.id.name === variable.id.name && variable.kind === 'v-for'
- )
+ const usedInFor = childForRefs.some(
+ (cref) =>
+ variables.some(
+ (variable) =>
+ cref.id.name === variable.id.name && variable.kind === 'v-for'
+ )
)
// if parent iterator is used, skip other checks
// iterator usage will be checked later by child v-for
diff --git ORI/eslint-plugin-vue/lib/rules/valid-v-on.js ALT/eslint-plugin-vue/lib/rules/valid-v-on.js
index 4d55d7f..7f372fa 100644
--- ORI/eslint-plugin-vue/lib/rules/valid-v-on.js
+++ ALT/eslint-plugin-vue/lib/rules/valid-v-on.js
@@ -115,8 +115,8 @@ module.exports = {
if (
(!node.value || !node.value.expression) &&
- !node.key.modifiers.some((modifier) =>
- VERB_MODIFIERS.has(modifier.name)
+ !node.key.modifiers.some(
+ (modifier) => VERB_MODIFIERS.has(modifier.name)
)
) {
if (node.value && !utils.isEmptyValueDirective(node, context)) {
diff --git ORI/eslint-plugin-vue/lib/rules/valid-v-slot.js ALT/eslint-plugin-vue/lib/rules/valid-v-slot.js
index f5ff3a0..6a51eee 100644
--- ORI/eslint-plugin-vue/lib/rules/valid-v-slot.js
+++ ALT/eslint-plugin-vue/lib/rules/valid-v-slot.js
@@ -66,14 +66,16 @@ function getSlotDirectivesOnChildren(node) {
vIf: false
}
)
- .groups.map((group) =>
- group
- .map((childElement) =>
- childElement.name === 'template'
- ? utils.getDirective(childElement, 'slot')
- : null
- )
- .filter(utils.isDef)
+ .groups.map(
+ (group) =>
+ group
+ .map(
+ (childElement) =>
+ childElement.name === 'template'
+ ? utils.getDirective(childElement, 'slot')
+ : null
+ )
+ .filter(utils.isDef)
)
.filter((group) => group.length >= 1)
}
@@ -111,26 +113,27 @@ function filterSameSlot(
) {
const currentName = getNormalizedName(currentVSlot, sourceCode)
return vSlotGroups
- .map((vSlots) =>
- vSlots.filter((vSlot) => {
- if (getNormalizedName(vSlot, sourceCode) !== currentName) {
- return false
- }
- const vForExpr = getVSlotVForVariableIfUsingIterationVars(
- vSlot,
- utils.getDirective(vSlot.parent.parent, 'for')
- )
- if (!currentVSlotVForVars || !vForExpr) {
- return !currentVSlotVForVars && !vForExpr
- }
- if (
- !equalVSlotVForVariables(currentVSlotVForVars, vForExpr, tokenStore)
- ) {
- return false
- }
- //
- return true
- })
+ .map(
+ (vSlots) =>
+ vSlots.filter((vSlot) => {
+ if (getNormalizedName(vSlot, sourceCode) !== currentName) {
+ return false
+ }
+ const vForExpr = getVSlotVForVariableIfUsingIterationVars(
+ vSlot,
+ utils.getDirective(vSlot.parent.parent, 'for')
+ )
+ if (!currentVSlotVForVars || !vForExpr) {
+ return !currentVSlotVForVars && !vForExpr
+ }
+ if (
+ !equalVSlotVForVariables(currentVSlotVForVars, vForExpr, tokenStore)
+ ) {
+ return false
+ }
+ //
+ return true
+ })
)
.filter((slots) => slots.length >= 1)
}
diff --git ORI/eslint-plugin-vue/lib/utils/index.js ALT/eslint-plugin-vue/lib/utils/index.js
index 055ffb4..917983d 100644
--- ORI/eslint-plugin-vue/lib/utils/index.js
+++ ALT/eslint-plugin-vue/lib/utils/index.js
@@ -1348,8 +1348,8 @@ module.exports = {
}
const alen = a.length
const blen = b.length
- const dp = Array.from({ length: alen + 1 }).map((_) =>
- Array.from({ length: blen + 1 }).fill(0)
+ const dp = Array.from({ length: alen + 1 }).map(
+ (_) => Array.from({ length: blen + 1 }).fill(0)
)
for (let i = 0; i <= alen; i++) {
dp[i][0] = i
diff --git ORI/eslint-plugin-vue/tests/lib/rules/html-indent.js ALT/eslint-plugin-vue/tests/lib/rules/html-indent.js
index 316eb92..10406b1 100644
--- ORI/eslint-plugin-vue/tests/lib/rules/html-indent.js
+++ ALT/eslint-plugin-vue/tests/lib/rules/html-indent.js
@@ -64,15 +64,16 @@ function loadPatterns(additionalValid, additionalInvalid) {
.map((line) => line.text.replace(/^[ \t]+/, ''))
.join('\n')
const errors = lines
- .map((line) =>
- line.indentSize === 0
- ? null
- : {
- message: `Expected indentation of ${line.indentSize} ${kind}${
- line.indentSize === 1 ? '' : 's'
- } but found 0 ${kind}s.`,
- line: line.number + 1
- }
+ .map(
+ (line) =>
+ line.indentSize === 0
+ ? null
+ : {
+ message: `Expected indentation of ${line.indentSize} ${kind}${
+ line.indentSize === 1 ? '' : 's'
+ } but found 0 ${kind}s.`,
+ line: line.number + 1
+ }
)
.filter(Boolean)
diff --git ORI/eslint-plugin-vue/tests/lib/rules/no-irregular-whitespace.js ALT/eslint-plugin-vue/tests/lib/rules/no-irregular-whitespace.js
index 9c3a40c..48516bb 100644
--- ORI/eslint-plugin-vue/tests/lib/rules/no-irregular-whitespace.js
+++ ALT/eslint-plugin-vue/tests/lib/rules/no-irregular-whitespace.js
@@ -20,8 +20,8 @@ const ALL_IRREGULAR_WHITESPACES = [].concat(
IRREGULAR_WHITESPACES,
IRREGULAR_LINE_TERMINATORS
)
-const ALL_IRREGULAR_WHITESPACE_CODES = ALL_IRREGULAR_WHITESPACES.map((s) =>
- `000${s.charCodeAt(0).toString(16)}`.slice(-4)
+const ALL_IRREGULAR_WHITESPACE_CODES = ALL_IRREGULAR_WHITESPACES.map(
+ (s) => `000${s.charCodeAt(0).toString(16)}`.slice(-4)
)
tester.run('no-irregular-whitespace', rule, {
diff --git ORI/eslint-plugin-vue/tests/lib/rules/script-indent.js ALT/eslint-plugin-vue/tests/lib/rules/script-indent.js
index 865e731..aa930ff 100644
--- ORI/eslint-plugin-vue/tests/lib/rules/script-indent.js
+++ ALT/eslint-plugin-vue/tests/lib/rules/script-indent.js
@@ -65,15 +65,16 @@ function loadPatterns(additionalValid, additionalInvalid) {
.map((line) => line.text.replace(/^[ \t]+/, ''))
.join('\n')
const errors = lines
- .map((line) =>
- line.indentSize === 0
- ? null
- : {
- message: `Expected indentation of ${line.indentSize} ${kind}${
- line.indentSize === 1 ? '' : 's'
- } but found 0 ${kind}s.`,
- line: line.number + 1
- }
+ .map(
+ (line) =>
+ line.indentSize === 0
+ ? null
+ : {
+ message: `Expected indentation of ${line.indentSize} ${kind}${
+ line.indentSize === 1 ? '' : 's'
+ } but found 0 ${kind}s.`,
+ line: line.number + 1
+ }
)
.filter(Boolean)
diff --git ORI/eslint-plugin-vue/tests/lib/utils/html-comments.js ALT/eslint-plugin-vue/tests/lib/utils/html-comments.js
index 066c73e..6a0297e 100644
--- ORI/eslint-plugin-vue/tests/lib/utils/html-comments.js
+++ ALT/eslint-plugin-vue/tests/lib/utils/html-comments.js
@@ -37,10 +37,12 @@ function tokenize(code, option) {
const linter = new Linter()
const result = []
- linter.defineRule('vue/html-comments-test', (content) =>
- htmlComments.defineVisitor(content, option, (commentTokens) => {
- result.push(commentTokens)
- })
+ linter.defineRule(
+ 'vue/html-comments-test',
+ (content) =>
+ htmlComments.defineVisitor(content, option, (commentTokens) => {
+ result.push(commentTokens)
+ })
)
linter.defineParser('vue-eslint-parser', require('vue-eslint-parser'))
linter.verify(
diff --git ORI/prettier/scripts/build/bundler.js ALT/prettier/scripts/build/bundler.js
index 69349bb32..3c9d0e847 100644
--- ORI/prettier/scripts/build/bundler.js
+++ ALT/prettier/scripts/build/bundler.js
@@ -338,8 +338,8 @@ module.exports = async function createBundle(bundle, cache, options) {
!options["purge-cache"] &&
(
await Promise.all(
- outputOptions.map((outputOption) =>
- cache.isCached(inputOptions, outputOption)
+ outputOptions.map(
+ (outputOption) => cache.isCached(inputOptions, outputOption)
)
)
).every((cached) => cached)
diff --git ORI/prettier/scripts/clean-cspell.js ALT/prettier/scripts/clean-cspell.js
index df3577649..d47228164 100644
--- ORI/prettier/scripts/clean-cspell.js
+++ ALT/prettier/scripts/clean-cspell.js
@@ -31,8 +31,8 @@ const updateConfig = (config) =>
return lowerCased === word || !words.includes(lowerCased);
});
// Compare function from https://github.com/streetsidesoftware/vscode-spell-checker/blob/2fde3bc5c658ee51da5a56580aa1370bf8174070/packages/client/src/settings/CSpellSettings.ts#L78
- words = words.sort((a, b) =>
- a.toLowerCase().localeCompare(b.toLowerCase())
+ words = words.sort(
+ (a, b) => a.toLowerCase().localeCompare(b.toLowerCase())
);
config.words = words;
}
diff --git ORI/prettier/scripts/release/steps/update-dependents-count.js ALT/prettier/scripts/release/steps/update-dependents-count.js
index b8e717537..d0b63ad35 100644
--- ORI/prettier/scripts/release/steps/update-dependents-count.js
+++ ALT/prettier/scripts/release/steps/update-dependents-count.js
@@ -8,8 +8,8 @@ const { logPromise, processFile } = require("../utils");
async function update() {
const npmPage = await logPromise(
"Fetching npm dependents count",
- fetch("https://www.npmjs.com/package/prettier").then((response) =>
- response.text()
+ fetch("https://www.npmjs.com/package/prettier").then(
+ (response) => response.text()
)
);
const dependentsCountNpm = Number(
@@ -41,16 +41,18 @@ async function update() {
);
}
- processFile("website/pages/en/index.js", (content) =>
- content
- .replace(
- /(<strong data-placeholder="dependent-npm">)(.*?)(<\/strong>)/,
- `$1${formatNumber(dependentsCountNpm)}$3`
- )
- .replace(
- /(<strong data-placeholder="dependent-github">)(.*?)(<\/strong>)/,
- `$1${formatNumber(dependentsCountGithub)}$3`
- )
+ processFile(
+ "website/pages/en/index.js",
+ (content) =>
+ content
+ .replace(
+ /(<strong data-placeholder="dependent-npm">)(.*?)(<\/strong>)/,
+ `$1${formatNumber(dependentsCountNpm)}$3`
+ )
+ .replace(
+ /(<strong data-placeholder="dependent-github">)(.*?)(<\/strong>)/,
+ `$1${formatNumber(dependentsCountGithub)}$3`
+ )
);
const isUpdated = await logPromise(
diff --git ORI/prettier/scripts/release/steps/update-version.js ALT/prettier/scripts/release/steps/update-version.js
index 081820765..cdf24f1a4 100644
--- ORI/prettier/scripts/release/steps/update-version.js
+++ ALT/prettier/scripts/release/steps/update-version.js
@@ -9,19 +9,25 @@ async function bump({ version }) {
await writeJson("package.json", pkg, { spaces: 2 });
// Update github issue templates
- processFile(".github/ISSUE_TEMPLATE/formatting.md", (content) =>
- content.replace(/^(\*\*Prettier ).*?(\*\*)$/m, `$1${version}$2`)
+ processFile(
+ ".github/ISSUE_TEMPLATE/formatting.md",
+ (content) =>
+ content.replace(/^(\*\*Prettier ).*?(\*\*)$/m, `$1${version}$2`)
);
- processFile(".github/ISSUE_TEMPLATE/integration.md", (content) =>
- content.replace(/^(- Prettier Version: ).*?$/m, `$1${version}`)
+ processFile(
+ ".github/ISSUE_TEMPLATE/integration.md",
+ (content) => content.replace(/^(- Prettier Version: ).*?$/m, `$1${version}`)
);
- processFile("docs/install.md", (content) =>
- content.replace(/^(npx prettier@)\S+/m, `$1${version}`)
+ processFile(
+ "docs/install.md",
+ (content) => content.replace(/^(npx prettier@)\S+/m, `$1${version}`)
);
// Update unpkg link in docs
- processFile("docs/browser.md", (content) =>
- content.replace(/(\/\/unpkg\.com\/prettier@).*?\//g, `$1${version}/`)
+ processFile(
+ "docs/browser.md",
+ (content) =>
+ content.replace(/(\/\/unpkg\.com\/prettier@).*?\//g, `$1${version}/`)
);
await execa("yarn", ["update-stable-docs"], {
diff --git ORI/prettier/src/cli/create-minimist-options.js ALT/prettier/src/cli/create-minimist-options.js
index 91b8d1c3e..4384991d7 100644
--- ORI/prettier/src/cli/create-minimist-options.js
+++ ALT/prettier/src/cli/create-minimist-options.js
@@ -8,10 +8,13 @@ module.exports = function createMinimistOptions(detailedOptions) {
const [boolean, string] = partition(
detailedOptions,
({ type }) => type === "boolean"
- ).map((detailedOptions) =>
- flat(
- detailedOptions.map(({ name, alias }) => (alias ? [name, alias] : [name]))
- )
+ ).map(
+ (detailedOptions) =>
+ flat(
+ detailedOptions.map(
+ ({ name, alias }) => (alias ? [name, alias] : [name])
+ )
+ )
);
const defaults = fromPairs(
diff --git ORI/prettier/src/cli/usage.js ALT/prettier/src/cli/usage.js
index 2685b3bc6..4abd598ea 100644
--- ORI/prettier/src/cli/usage.js
+++ ALT/prettier/src/cli/usage.js
@@ -77,11 +77,12 @@ function createChoiceUsages(choices, margin, indentation) {
activeChoices
.map((choice) => choice.value.length)
.reduce((current, length) => Math.max(current, length), 0) + margin;
- return activeChoices.map((choice) =>
- indent(
- createOptionUsageRow(choice.value, choice.description, threshold),
- indentation
- )
+ return activeChoices.map(
+ (choice) =>
+ indent(
+ createOptionUsageRow(choice.value, choice.description, threshold),
+ indentation
+ )
);
}
@@ -141,8 +142,8 @@ function createUsage(context) {
const optionsUsage = allCategories.map((category) => {
const categoryOptions = groupedOptions[category]
- .map((option) =>
- createOptionUsage(context, option, OPTION_USAGE_THRESHOLD)
+ .map(
+ (option) => createOptionUsage(context, option, OPTION_USAGE_THRESHOLD)
)
.join("\n");
return `${category} options:\n\n${indent(categoryOptions, 2)}`;
diff --git ORI/prettier/src/config/resolve-config.js ALT/prettier/src/config/resolve-config.js
index 011fb6a50..d433faac4 100644
--- ORI/prettier/src/config/resolve-config.js
+++ ALT/prettier/src/config/resolve-config.js
@@ -87,10 +87,11 @@ function _resolveConfig(filePath, opts, sync) {
for (const optionName of ["plugins", "pluginSearchDirs"]) {
if (Array.isArray(merged[optionName])) {
- merged[optionName] = merged[optionName].map((value) =>
- typeof value === "string" && value.startsWith(".") // relative path
- ? path.resolve(path.dirname(result.filepath), value)
- : value
+ merged[optionName] = merged[optionName].map(
+ (value) =>
+ typeof value === "string" && value.startsWith(".") // relative path
+ ? path.resolve(path.dirname(result.filepath), value)
+ : value
);
}
}
@@ -163,8 +164,8 @@ function pathMatchesGlobs(filePath, patterns, excludedPatterns = []) {
return (
patternList.some((pattern) => minimatch(filePath, pattern, opts)) &&
- !excludedPatternList.some((excludedPattern) =>
- minimatch(filePath, excludedPattern, opts)
+ !excludedPatternList.some(
+ (excludedPattern) => minimatch(filePath, excludedPattern, opts)
)
);
}
diff --git ORI/prettier/src/document/doc-utils.js ALT/prettier/src/document/doc-utils.js
index 738527336..5481bf386 100644
--- ORI/prettier/src/document/doc-utils.js
+++ ALT/prettier/src/document/doc-utils.js
@@ -358,14 +358,16 @@ function normalizeDoc(doc) {
}
function replaceNewlinesWithLiterallines(doc) {
- return mapDoc(doc, (currentDoc) =>
- typeof currentDoc === "string" && currentDoc.includes("\n")
- ? concat(
- currentDoc
- .split(/(\n)/g)
- .map((v, i) => (i % 2 === 0 ? v : literalline))
- )
- : currentDoc
+ return mapDoc(
+ doc,
+ (currentDoc) =>
+ typeof currentDoc === "string" && currentDoc.includes("\n")
+ ? concat(
+ currentDoc
+ .split(/(\n)/g)
+ .map((v, i) => (i % 2 === 0 ? v : literalline))
+ )
+ : currentDoc
);
}
diff --git ORI/prettier/src/language-css/printer-postcss.js ALT/prettier/src/language-css/printer-postcss.js
index 971bd3160..264286b0e 100644
--- ORI/prettier/src/language-css/printer-postcss.js
+++ ALT/prettier/src/language-css/printer-postcss.js
@@ -521,8 +521,8 @@ function genericPrint(path, options, print) {
const atRuleAncestorNode = getAncestorNode(path, "css-atrule");
const isControlDirective =
atRuleAncestorNode && isSCSSControlDirectiveNode(atRuleAncestorNode);
- const hasInlineComment = node.groups.some((node) =>
- isInlineValueCommentNode(node)
+ const hasInlineComment = node.groups.some(
+ (node) => isInlineValueCommentNode(node)
);
const printed = path.map(print, "groups");
diff --git ORI/prettier/src/language-html/ast.js ALT/prettier/src/language-html/ast.js
index 52b709ac6..4add11003 100644
--- ORI/prettier/src/language-html/ast.js
+++ ALT/prettier/src/language-html/ast.js
@@ -98,8 +98,8 @@ function mapNodesIfChanged(nodes, fn) {
}
function cloneAndUpdateNodes(nodes, parent) {
- const siblings = nodes.map((node) =>
- node instanceof Node ? node.clone() : new Node(node)
+ const siblings = nodes.map(
+ (node) => (node instanceof Node ? node.clone() : new Node(node))
);
let prev = null;
diff --git ORI/prettier/src/language-html/constants.evaluate.js ALT/prettier/src/language-html/constants.evaluate.js
index 3ffadd67b..06891bd58 100644
--- ORI/prettier/src/language-html/constants.evaluate.js
+++ ALT/prettier/src/language-html/constants.evaluate.js
@@ -9,12 +9,13 @@ const getCssStyleTags = (property) =>
flat(
htmlStyles
.filter((htmlStyle) => htmlStyle.style[property])
- .map((htmlStyle) =>
- htmlStyle.selectorText
- .split(",")
- .map((selector) => selector.trim())
- .filter((selector) => /^[\dA-Za-z]+$/.test(selector))
- .map((tagName) => [tagName, htmlStyle.style[property]])
+ .map(
+ (htmlStyle) =>
+ htmlStyle.selectorText
+ .split(",")
+ .map((selector) => selector.trim())
+ .filter((selector) => /^[\dA-Za-z]+$/.test(selector))
+ .map((tagName) => [tagName, htmlStyle.style[property]])
)
)
);
diff --git ORI/prettier/src/language-html/print-preprocess.js ALT/prettier/src/language-html/print-preprocess.js
index 600947b77..5c786ec87 100644
--- ORI/prettier/src/language-html/print-preprocess.js
+++ ALT/prettier/src/language-html/print-preprocess.js
@@ -386,38 +386,41 @@ function extractWhitespaces(ast /*, options*/) {
}
function addIsSelfClosing(ast /*, options */) {
- return ast.map((node) =>
- Object.assign(node, {
- isSelfClosing:
- !node.children ||
- (node.type === "element" &&
- (node.tagDefinition.isVoid ||
- // self-closing
- node.startSourceSpan === node.endSourceSpan)),
- })
+ return ast.map(
+ (node) =>
+ Object.assign(node, {
+ isSelfClosing:
+ !node.children ||
+ (node.type === "element" &&
+ (node.tagDefinition.isVoid ||
+ // self-closing
+ node.startSourceSpan === node.endSourceSpan)),
+ })
);
}
function addHasHtmComponentClosingTag(ast, options) {
- return ast.map((node) =>
- node.type !== "element"
- ? node
- : Object.assign(node, {
- hasHtmComponentClosingTag:
- node.endSourceSpan &&
- /^<\s*\/\s*\/\s*>$/.test(
- options.originalText.slice(
- node.endSourceSpan.start.offset,
- node.endSourceSpan.end.offset
- )
- ),
- })
+ return ast.map(
+ (node) =>
+ node.type !== "element"
+ ? node
+ : Object.assign(node, {
+ hasHtmComponentClosingTag:
+ node.endSourceSpan &&
+ /^<\s*\/\s*\/\s*>$/.test(
+ options.originalText.slice(
+ node.endSourceSpan.start.offset,
+ node.endSourceSpan.end.offset
+ )
+ ),
+ })
);
}
function addCssDisplay(ast, options) {
- return ast.map((node) =>
- Object.assign(node, { cssDisplay: getNodeCssStyleDisplay(node, options) })
+ return ast.map(
+ (node) =>
+ Object.assign(node, { cssDisplay: getNodeCssStyleDisplay(node, options) })
);
}
diff --git ORI/prettier/src/language-html/printer-html.js ALT/prettier/src/language-html/printer-html.js
index 46aec9c30..40fbf2a41 100644
--- ORI/prettier/src/language-html/printer-html.js
+++ ALT/prettier/src/language-html/printer-html.js
@@ -199,8 +199,10 @@ function embed(path, print, textToDoc, options) {
node.rawName,
'="',
group(
- mapDoc(embeddedAttributeValueDoc, (doc) =>
- typeof doc === "string" ? doc.replace(/"/g, """) : doc
+ mapDoc(
+ embeddedAttributeValueDoc,
+ (doc) =>
+ typeof doc === "string" ? doc.replace(/"/g, """) : doc
)
),
'"',
diff --git ORI/prettier/src/language-js/embed/graphql.js ALT/prettier/src/language-js/embed/graphql.js
index 80d9d4764..8497aecd8 100644
--- ORI/prettier/src/language-js/embed/graphql.js
+++ ALT/prettier/src/language-js/embed/graphql.js
@@ -36,8 +36,8 @@ function format(path, print, textToDoc) {
lines[numLines - 1].trim() === "" &&
lines[numLines - 2].trim() === "";
- const commentsAndWhitespaceOnly = lines.every((line) =>
- /^\s*(?:#[^\n\r]*)?$/.test(line)
+ const commentsAndWhitespaceOnly = lines.every(
+ (line) => /^\s*(?:#[^\n\r]*)?$/.test(line)
);
// Bail out if an interpolation occurs within a comment.
diff --git ORI/prettier/src/language-js/embed/html.js ALT/prettier/src/language-js/embed/html.js
index cb2e41306..b46a68a29 100644
--- ORI/prettier/src/language-js/embed/html.js
+++ ALT/prettier/src/language-js/embed/html.js
@@ -20,10 +20,11 @@ function format(path, print, textToDoc, options, { parser }) {
`PRETTIER_HTML_PLACEHOLDER_${index}_${counter}_IN_JS`;
const text = node.quasis
- .map((quasi, index, quasis) =>
- index === quasis.length - 1
- ? quasi.value.cooked
- : quasi.value.cooked + composePlaceholder(index)
+ .map(
+ (quasi, index, quasis) =>
+ index === quasis.length - 1
+ ? quasi.value.cooked
+ : quasi.value.cooked + composePlaceholder(index)
)
.join("");
diff --git ORI/prettier/src/language-js/parser-babel.js ALT/prettier/src/language-js/parser-babel.js
index b9f3282f7..c18a45c94 100644
--- ORI/prettier/src/language-js/parser-babel.js
+++ ALT/prettier/src/language-js/parser-babel.js
@@ -114,8 +114,9 @@ function createParse(parseMethod, ...pluginCombinations) {
let combinations = pluginCombinations;
if (text.includes("|>")) {
combinations = flatten(
- pipelineOperatorPlugins.map((pipelineOperatorPlugin) =>
- combinations.map((plugins) => [...plugins, pipelineOperatorPlugin])
+ pipelineOperatorPlugins.map(
+ (pipelineOperatorPlugin) =>
+ combinations.map((plugins) => [...plugins, pipelineOperatorPlugin])
)
);
}
diff --git ORI/prettier/src/language-js/print/comment.js ALT/prettier/src/language-js/print/comment.js
index a1de75358..fed438e6d 100644
--- ORI/prettier/src/language-js/print/comment.js
+++ ALT/prettier/src/language-js/print/comment.js
@@ -61,10 +61,11 @@ function printIndentableBlockComment(comment) {
"/*",
join(
hardline,
- lines.map((line, index) =>
- index === 0
- ? line.trimEnd()
- : " " + (index < lines.length - 1 ? line.trim() : line.trimStart())
+ lines.map(
+ (line, index) =>
+ index === 0
+ ? line.trimEnd()
+ : " " + (index < lines.length - 1 ? line.trim() : line.trimStart())
)
),
"*/",
diff --git ORI/prettier/src/language-js/print/template-literal.js ALT/prettier/src/language-js/print/template-literal.js
index 23e5d5692..37c97759c 100644
--- ORI/prettier/src/language-js/print/template-literal.js
+++ ALT/prettier/src/language-js/print/template-literal.js
@@ -179,16 +179,20 @@ function printJestEachTemplateLiteral(path, options, print) {
hardline,
join(
hardline,
- table.map((row) =>
- join(
- " | ",
- row.cells.map((cell, index) =>
- row.hasLineBreak
- ? cell
- : cell +
- " ".repeat(maxColumnWidths[index] - getStringWidth(cell))
+ table.map(
+ (row) =>
+ join(
+ " | ",
+ row.cells.map(
+ (cell, index) =>
+ row.hasLineBreak
+ ? cell
+ : cell +
+ " ".repeat(
+ maxColumnWidths[index] - getStringWidth(cell)
+ )
+ )
)
- )
)
),
]),
diff --git ORI/prettier/src/language-js/print/ternary.js ALT/prettier/src/language-js/print/ternary.js
index 976f7b9cf..0b9083183 100644
--- ORI/prettier/src/language-js/print/ternary.js
+++ ALT/prettier/src/language-js/print/ternary.js
@@ -275,8 +275,8 @@ function printTernary(path, options, print) {
// break if any of them break. That means we should only group around the
// outer-most ConditionalExpression.
const comments = flat([
- ...testNodePropertyNames.map((propertyName) =>
- getComments(node[propertyName])
+ ...testNodePropertyNames.map(
+ (propertyName) => getComments(node[propertyName])
),
getComments(consequentNode),
getComments(alternateNode),
diff --git ORI/prettier/src/language-js/utils.js ALT/prettier/src/language-js/utils.js
index 744685678..0b4fde320 100644
--- ORI/prettier/src/language-js/utils.js
+++ ALT/prettier/src/language-js/utils.js
@@ -684,8 +684,10 @@ function hasLeadingOwnLineComment(text, node) {
return hasNodeIgnoreComment(node);
}
- return hasComment(node, CommentCheckFlags.Leading, (comment) =>
- hasNewline(text, locEnd(comment))
+ return hasComment(
+ node,
+ CommentCheckFlags.Leading,
+ (comment) => hasNewline(text, locEnd(comment))
);
}
diff --git ORI/prettier/src/language-markdown/print-preprocess.js ALT/prettier/src/language-markdown/print-preprocess.js
index fcbac279a..b76735e89 100644
--- ORI/prettier/src/language-markdown/print-preprocess.js
+++ ALT/prettier/src/language-markdown/print-preprocess.js
@@ -39,20 +39,23 @@ function transformInlineCode(ast) {
}
function restoreUnescapedCharacter(ast, options) {
- return mapAst(ast, (node) =>
- node.type !== "text" ||
- node.value === "*" ||
- node.value === "_" || // handle these cases in printer
- !isSingleCharRegex.test(node.value) ||
- node.position.end.offset - node.position.start.offset === node.value.length
- ? node
- : {
- ...node,
- value: options.originalText.slice(
- node.position.start.offset,
- node.position.end.offset
- ),
- }
+ return mapAst(
+ ast,
+ (node) =>
+ node.type !== "text" ||
+ node.value === "*" ||
+ node.value === "_" || // handle these cases in printer
+ !isSingleCharRegex.test(node.value) ||
+ node.position.end.offset - node.position.start.offset ===
+ node.value.length
+ ? node
+ : {
+ ...node,
+ value: options.originalText.slice(
+ node.position.start.offset,
+ node.position.end.offset
+ ),
+ }
);
}
diff --git ORI/prettier/src/language-markdown/printer-markdown.js ALT/prettier/src/language-markdown/printer-markdown.js
index 179132dc2..1878803da 100644
--- ORI/prettier/src/language-markdown/printer-markdown.js
+++ ALT/prettier/src/language-markdown/printer-markdown.js
@@ -64,12 +64,13 @@ function genericPrint(path, options, print) {
node.position.end.offset
),
options
- ).map((node) =>
- node.type === "word"
- ? node.value
- : node.value === ""
- ? ""
- : printLine(path, node.value, options)
+ ).map(
+ (node) =>
+ node.type === "word"
+ ? node.value
+ : node.value === ""
+ ? ""
+ : printLine(path, node.value, options)
);
}
@@ -129,8 +130,9 @@ function genericPrint(path, options, print) {
))
) {
// backslash is parsed as part of autolinks, so we need to remove it
- escapedValue = escapedValue.replace(/^(\\?[*_])+/, (prefix) =>
- prefix.replace(/\\/g, "")
+ escapedValue = escapedValue.replace(
+ /^(\\?[*_])+/,
+ (prefix) => prefix.replace(/\\/g, "")
);
}
diff --git ORI/prettier/src/language-markdown/utils.js ALT/prettier/src/language-markdown/utils.js
index 4b7d2608e..8083f809d 100644
--- ORI/prettier/src/language-markdown/utils.js
+++ ALT/prettier/src/language-markdown/utils.js
@@ -210,8 +210,8 @@ function mapAst(ast, handler) {
return (function preorder(node, index, parentStack) {
const newNode = { ...handler(node, index, parentStack) };
if (newNode.children) {
- newNode.children = newNode.children.map((child, index) =>
- preorder(child, index, [newNode, ...parentStack])
+ newNode.children = newNode.children.map(
+ (child, index) => preorder(child, index, [newNode, ...parentStack])
);
}
diff --git ORI/prettier/src/language-yaml/print/block.js ALT/prettier/src/language-yaml/print/block.js
index fcb603908..0b24de0f1 100644
--- ORI/prettier/src/language-yaml/print/block.js
+++ ALT/prettier/src/language-yaml/print/block.js
@@ -26,8 +26,9 @@ const { alignWithSpaces } = require("./misc");
function printBlock(path, print, options) {
const node = path.getValue();
- const parentIndent = getAncestorCount(path, (ancestorNode) =>
- isNode(ancestorNode, ["sequence", "mapping"])
+ const parentIndent = getAncestorCount(
+ path,
+ (ancestorNode) => isNode(ancestorNode, ["sequence", "mapping"])
);
const isLastDescendant = isLastDescendantNode(path);
/** @type {Doc[]} */
diff --git ORI/prettier/src/language-yaml/printer-yaml.js ALT/prettier/src/language-yaml/printer-yaml.js
index 3e2510d67..d6180f267 100644
--- ORI/prettier/src/language-yaml/printer-yaml.js
+++ ALT/prettier/src/language-yaml/printer-yaml.js
@@ -423,8 +423,8 @@ function printFlowScalarContent(nodeType, content, options) {
const lineContents = getFlowScalarLineContents(nodeType, content, options);
return join(
hardline,
- lineContents.map((lineContentWords) =>
- fill(getDocParts(join(line, lineContentWords)))
+ lineContents.map(
+ (lineContentWords) => fill(getDocParts(join(line, lineContentWords)))
)
);
}
diff --git ORI/prettier/src/language-yaml/utils.js ALT/prettier/src/language-yaml/utils.js
index 2151c65bc..c407ffafa 100644
--- ORI/prettier/src/language-yaml/utils.js
+++ ALT/prettier/src/language-yaml/utils.js
@@ -31,8 +31,8 @@ function mapNode(node, callback, parent) {
"children" in node
? {
...node,
- children: node.children.map((childNode) =>
- mapNode(childNode, callback, node)
+ children: node.children.map(
+ (childNode) => mapNode(childNode, callback, node)
),
}
: node,
@@ -195,25 +195,27 @@ function splitWithSingleSpace(text) {
function getFlowScalarLineContents(nodeType, content, options) {
const rawLineContents = content
.split("\n")
- .map((lineContent, index, lineContents) =>
- index === 0 && index === lineContents.length - 1
- ? lineContent
- : index !== 0 && index !== lineContents.length - 1
- ? lineContent.trim()
- : index === 0
- ? lineContent.trimEnd()
- : lineContent.trimStart()
+ .map(
+ (lineContent, index, lineContents) =>
+ index === 0 && index === lineContents.length - 1
+ ? lineContent
+ : index !== 0 && index !== lineContents.length - 1
+ ? lineContent.trim()
+ : index === 0
+ ? lineContent.trimEnd()
+ : lineContent.trimStart()
);
if (options.proseWrap === "preserve") {
- return rawLineContents.map((lineContent) =>
- lineContent.length === 0 ? [] : [lineContent]
+ return rawLineContents.map(
+ (lineContent) => (lineContent.length === 0 ? [] : [lineContent])
);
}
return rawLineContents
- .map((lineContent) =>
- lineContent.length === 0 ? [] : splitWithSingleSpace(lineContent)
+ .map(
+ (lineContent) =>
+ lineContent.length === 0 ? [] : splitWithSingleSpace(lineContent)
)
.reduce(
(reduced, lineContentWords, index) =>
@@ -234,10 +236,11 @@ function getFlowScalarLineContents(nodeType, content, options) {
: [...reduced, lineContentWords],
[]
)
- .map((lineContentWords) =>
- options.proseWrap === "never"
- ? [lineContentWords.join(" ")]
- : lineContentWords
+ .map(
+ (lineContentWords) =>
+ options.proseWrap === "never"
+ ? [lineContentWords.join(" ")]
+ : lineContentWords
);
}
@@ -266,16 +269,17 @@ function getBlockValueLineContents(
if (options.proseWrap === "preserve" || node.type === "blockLiteral") {
return removeUnnecessaryTrailingNewlines(
- rawLineContents.map((lineContent) =>
- lineContent.length === 0 ? [] : [lineContent]
+ rawLineContents.map(
+ (lineContent) => (lineContent.length === 0 ? [] : [lineContent])
)
);
}
return removeUnnecessaryTrailingNewlines(
rawLineContents
- .map((lineContent) =>
- lineContent.length === 0 ? [] : splitWithSingleSpace(lineContent)
+ .map(
+ (lineContent) =>
+ lineContent.length === 0 ? [] : splitWithSingleSpace(lineContent)
)
.reduce(
(reduced, lineContentWords, index) =>
@@ -291,20 +295,22 @@ function getBlockValueLineContents(
: [...reduced, lineContentWords],
[]
)
- .map((lineContentWords) =>
- lineContentWords.reduce(
- (reduced, word) =>
- // disallow trailing spaces
- reduced.length > 0 && /\s$/.test(getLast(reduced))
- ? [...reduced.slice(0, -1), getLast(reduced) + " " + word]
- : [...reduced, word],
- []
- )
+ .map(
+ (lineContentWords) =>
+ lineContentWords.reduce(
+ (reduced, word) =>
+ // disallow trailing spaces
+ reduced.length > 0 && /\s$/.test(getLast(reduced))
+ ? [...reduced.slice(0, -1), getLast(reduced) + " " + word]
+ : [...reduced, word],
+ []
+ )
)
- .map((lineContentWords) =>
- options.proseWrap === "never"
- ? [lineContentWords.join(" ")]
- : lineContentWords
+ .map(
+ (lineContentWords) =>
+ options.proseWrap === "never"
+ ? [lineContentWords.join(" ")]
+ : lineContentWords
)
);
diff --git ORI/prettier/src/main/options-normalizer.js ALT/prettier/src/main/options-normalizer.js
index 4c6d0c16e..ac39f14f5 100644
--- ORI/prettier/src/main/options-normalizer.js
+++ ALT/prettier/src/main/options-normalizer.js
@@ -131,15 +131,16 @@ function optionInfoToSchema(optionInfo, { isCLI, optionInfos }) {
break;
case "choice":
SchemaConstructor = vnopts.ChoiceSchema;
- parameters.choices = optionInfo.choices.map((choiceInfo) =>
- typeof choiceInfo === "object" && choiceInfo.redirect
- ? {
- ...choiceInfo,
- redirect: {
- to: { key: optionInfo.name, value: choiceInfo.redirect },
- },
- }
- : choiceInfo
+ parameters.choices = optionInfo.choices.map(
+ (choiceInfo) =>
+ typeof choiceInfo === "object" && choiceInfo.redirect
+ ? {
+ ...choiceInfo,
+ redirect: {
+ to: { key: optionInfo.name, value: choiceInfo.redirect },
+ },
+ }
+ : choiceInfo
);
break;
case "boolean":
@@ -148,12 +149,13 @@ function optionInfoToSchema(optionInfo, { isCLI, optionInfos }) {
case "flag":
SchemaConstructor = FlagSchema;
parameters.flags = flat(
- optionInfos.map((optionInfo) =>
- [
- optionInfo.alias,
- optionInfo.description && optionInfo.name,
- optionInfo.oppositeDescription && `no-${optionInfo.name}`,
- ].filter(Boolean)
+ optionInfos.map(
+ (optionInfo) =>
+ [
+ optionInfo.alias,
+ optionInfo.description && optionInfo.name,
+ optionInfo.oppositeDescription && `no-${optionInfo.name}`,
+ ].filter(Boolean)
)
);
break;
diff --git ORI/prettier/src/main/options.js ALT/prettier/src/main/options.js
index a12b5bcad..6e162ab89 100644
--- ORI/prettier/src/main/options.js
+++ ALT/prettier/src/main/options.js
@@ -178,8 +178,8 @@ function inferParser(filepath, plugins) {
let language = languages.find(
(language) =>
(language.extensions &&
- language.extensions.some((extension) =>
- filename.endsWith(extension)
+ language.extensions.some(
+ (extension) => filename.endsWith(extension)
)) ||
(language.filenames &&
language.filenames.some((name) => name.toLowerCase() === filename))
diff --git ORI/prettier/src/main/support.js ALT/prettier/src/main/support.js
index a6aa0d83f..b79cb0a23 100644
--- ORI/prettier/src/main/support.js
+++ ALT/prettier/src/main/support.js
@@ -49,8 +49,8 @@ function getSupportInfo({
? option.default[0].value
: option.default
.filter(filterSince)
- .sort((info1, info2) =>
- semver.compare(info2.since, info1.since)
+ .sort(
+ (info1, info2) => semver.compare(info2.since, info1.since)
)[0].value;
}
diff --git ORI/prettier/tests_config/utils/stringify-options-for-title.js ALT/prettier/tests_config/utils/stringify-options-for-title.js
index dbc95627f..b08780695 100644
--- ORI/prettier/tests_config/utils/stringify-options-for-title.js
+++ ALT/prettier/tests_config/utils/stringify-options-for-title.js
@@ -1,12 +1,14 @@
"use strict";
function stringifyOptions(options) {
- const string = JSON.stringify(options || {}, (key, value) =>
- key === "plugins" || key === "errors"
- ? undefined
- : value === Number.POSITIVE_INFINITY
- ? "Infinity"
- : value
+ const string = JSON.stringify(
+ options || {},
+ (key, value) =>
+ key === "plugins" || key === "errors"
+ ? undefined
+ : value === Number.POSITIVE_INFINITY
+ ? "Infinity"
+ : value
);
return string === "{}" ? "" : string;
diff --git ORI/prettier/tests_integration/__tests__/format.js ALT/prettier/tests_integration/__tests__/format.js
index 6a83e86e6..f3bd8cabc 100644
--- ORI/prettier/tests_integration/__tests__/format.js
+++ ALT/prettier/tests_integration/__tests__/format.js
@@ -24,8 +24,8 @@ const App = () => (
label:
`;
- expect(() =>
- prettier.format(input, { parser: "typescript" })
+ expect(
+ () => prettier.format(input, { parser: "typescript" })
).toThrowErrorMatchingSnapshot();
});
@@ -62,7 +62,7 @@ test("should work with foo plugin instance", () => {
test("'Adjacent JSX' error should not be swallowed by Babel's error recovery", () => {
const input = "<a></a>\n<b></b>";
- expect(() =>
- prettier.format(input, { parser: "babel" })
+ expect(
+ () => prettier.format(input, { parser: "babel" })
).toThrowErrorMatchingSnapshot();
});
diff --git ORI/prettier/tests_integration/runPrettier.js ALT/prettier/tests_integration/runPrettier.js
index 50848a9bd..854818a7b 100644
--- ORI/prettier/tests_integration/runPrettier.js
+++ ALT/prettier/tests_integration/runPrettier.js
@@ -78,22 +78,20 @@ function runPrettier(dir, args = [], options = {}) {
jest
.spyOn(require(thirdParty), "isCI")
.mockImplementation(() => !!options.ci);
- jest
- .spyOn(require(thirdParty), "cosmiconfig")
- .mockImplementation((moduleName, options) =>
+ jest.spyOn(require(thirdParty), "cosmiconfig").mockImplementation(
+ (moduleName, options) =>
require("cosmiconfig").cosmiconfig(moduleName, {
...options,
stopDir: path.join(__dirname, "cli"),
})
- );
- jest
- .spyOn(require(thirdParty), "cosmiconfigSync")
- .mockImplementation((moduleName, options) =>
+ );
+ jest.spyOn(require(thirdParty), "cosmiconfigSync").mockImplementation(
+ (moduleName, options) =>
require("cosmiconfig").cosmiconfigSync(moduleName, {
...options,
stopDir: path.join(__dirname, "cli"),
})
- );
+ );
jest
.spyOn(require(thirdParty), "findParentDir")
.mockImplementation(() => process.cwd());
diff --git ORI/prettier/website/playground/sidebar/SidebarOptions.js ALT/prettier/website/playground/sidebar/SidebarOptions.js
index c6b8e080a..b7ed746ac 100644
--- ORI/prettier/website/playground/sidebar/SidebarOptions.js
+++ ALT/prettier/website/playground/sidebar/SidebarOptions.js
@@ -11,18 +11,19 @@ export default function ({
onOptionValueChange,
}) {
const options = groupBy(availableOptions, "category");
- return categories.map((category) =>
- options[category] ? (
- <SidebarCategory key={category} title={category}>
- {options[category].map((option) => (
- <Option
- key={option.name}
- option={option}
- value={optionValues[option.name]}
- onChange={onOptionValueChange}
- />
- ))}
- </SidebarCategory>
- ) : null
+ return categories.map(
+ (category) =>
+ options[category] ? (
+ <SidebarCategory key={category} title={category}>
+ {options[category].map((option) => (
+ <Option
+ key={option.name}
+ option={option}
+ value={optionValues[option.name]}
+ onChange={onOptionValueChange}
+ />
+ ))}
+ </SidebarCategory>
+ ) : null
);
}
diff --git ORI/typescript-eslint/packages/eslint-plugin-internal/src/rules/no-poorly-typed-ts-props.ts ALT/typescript-eslint/packages/eslint-plugin-internal/src/rules/no-poorly-typed-ts-props.ts
index 1fa44708..3aeeed71 100644
--- ORI/typescript-eslint/packages/eslint-plugin-internal/src/rules/no-poorly-typed-ts-props.ts
+++ ALT/typescript-eslint/packages/eslint-plugin-internal/src/rules/no-poorly-typed-ts-props.ts
@@ -78,8 +78,11 @@ export default createRule({
const tsNode = esTreeNodeToTSNodeMap.get(node.property);
const symbol = checker.getSymbolAtLocation(tsNode);
const decls = symbol?.getDeclarations();
- const isFromTs = decls?.some(decl =>
- decl.getSourceFile().fileName.includes('/node_modules/typescript/'),
+ const isFromTs = decls?.some(
+ decl =>
+ decl
+ .getSourceFile()
+ .fileName.includes('/node_modules/typescript/'),
);
if (isFromTs !== true) {
continue;
diff --git ORI/typescript-eslint/packages/eslint-plugin-tslint/src/rules/config.ts ALT/typescript-eslint/packages/eslint-plugin-tslint/src/rules/config.ts
index b6da50bb..2a2d746d 100644
--- ORI/typescript-eslint/packages/eslint-plugin-tslint/src/rules/config.ts
+++ ALT/typescript-eslint/packages/eslint-plugin-tslint/src/rules/config.ts
@@ -159,11 +159,12 @@ export default createRule<Options, MessageIds>({
const replacements = failure.getFix();
return Array.isArray(replacements)
- ? replacements.map(replacement =>
- fixer.replaceTextRange(
- [replacement.start, replacement.end],
- replacement.text,
- ),
+ ? replacements.map(
+ replacement =>
+ fixer.replaceTextRange(
+ [replacement.start, replacement.end],
+ replacement.text,
+ ),
)
: replacements !== undefined
? fixer.replaceTextRange(
diff --git ORI/typescript-eslint/packages/eslint-plugin-tslint/tests/index.spec.ts ALT/typescript-eslint/packages/eslint-plugin-tslint/tests/index.spec.ts
index ab889708..48fff899 100644
--- ORI/typescript-eslint/packages/eslint-plugin-tslint/tests/index.spec.ts
+++ ALT/typescript-eslint/packages/eslint-plugin-tslint/tests/index.spec.ts
@@ -186,20 +186,21 @@ describe('tslint/error', () => {
jest.spyOn(console, 'warn').mockImplementation();
linter.defineRule('tslint/config', rule);
linter.defineParser('@typescript-eslint/parser', parser);
- expect(() =>
- linter.verify(
- 'foo;',
- {
- parserOptions: {
- project: `${__dirname}/test-project/tsconfig.json`,
- },
- rules: {
- 'tslint/config': [2, {}],
+ expect(
+ () =>
+ linter.verify(
+ 'foo;',
+ {
+ parserOptions: {
+ project: `${__dirname}/test-project/tsconfig.json`,
+ },
+ rules: {
+ 'tslint/config': [2, {}],
+ },
+ parser: '@typescript-eslint/parser',
},
- parser: '@typescript-eslint/parser',
- },
- `${__dirname}/test-project/extra.ts`,
- ),
+ `${__dirname}/test-project/extra.ts`,
+ ),
).not.toThrow();
expect(console.warn).toHaveBeenCalledWith(
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/adjacent-overload-signatures.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/adjacent-overload-signatures.ts
index 05f120b4..629ef915 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/adjacent-overload-signatures.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/adjacent-overload-signatures.ts
@@ -143,8 +143,8 @@ export default util.createRule({
return;
}
- const index = seenMethods.findIndex(seenMethod =>
- isSameMethod(method, seenMethod),
+ const index = seenMethods.findIndex(
+ seenMethod => isSameMethod(method, seenMethod),
);
if (index > -1 && !isSameMethod(method, lastMethod)) {
context.report({
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-imports.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-imports.ts
index f59fdee5..d398ee85 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-imports.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/consistent-type-imports.ts
@@ -497,8 +497,8 @@ export default util.createRule<Options, MessageIds>({
}
} else {
if (
- namedSpecifiers.every(specifier =>
- report.typeSpecifiers.includes(specifier),
+ namedSpecifiers.every(
+ specifier => report.typeSpecifiers.includes(specifier),
) &&
!namespaceSpecifier
) {
@@ -509,8 +509,8 @@ export default util.createRule<Options, MessageIds>({
}
}
- const typeNamedSpecifiers = namedSpecifiers.filter(specifier =>
- report.typeSpecifiers.includes(specifier),
+ const typeNamedSpecifiers = namedSpecifiers.filter(
+ specifier => report.typeSpecifiers.includes(specifier),
);
const fixesNamedSpecifiers = getFixesNamedSpecifiers(
@@ -704,8 +704,8 @@ export default util.createRule<Options, MessageIds>({
}
} else {
if (
- namedSpecifiers.every(specifier =>
- report.valueSpecifiers.includes(specifier),
+ namedSpecifiers.every(
+ specifier => report.valueSpecifiers.includes(specifier),
)
) {
// e.g.
@@ -715,8 +715,8 @@ export default util.createRule<Options, MessageIds>({
}
}
- const valueNamedSpecifiers = namedSpecifiers.filter(specifier =>
- report.valueSpecifiers.includes(specifier),
+ const valueNamedSpecifiers = namedSpecifiers.filter(
+ specifier => report.valueSpecifiers.includes(specifier),
);
const fixesNamedSpecifiers = getFixesNamedSpecifiers(
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/explicit-function-return-type.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/explicit-function-return-type.ts
index f0904f07..b7987274 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/explicit-function-return-type.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/explicit-function-return-type.ts
@@ -82,21 +82,29 @@ export default util.createRule<Options, MessageIds>({
return;
}
- checkFunctionExpressionReturnType(node, options, sourceCode, loc =>
- context.report({
- node,
- loc,
- messageId: 'missingReturnType',
- }),
+ checkFunctionExpressionReturnType(
+ node,
+ options,
+ sourceCode,
+ loc =>
+ context.report({
+ node,
+ loc,
+ messageId: 'missingReturnType',
+ }),
);
},
FunctionDeclaration(node): void {
- checkFunctionReturnType(node, options, sourceCode, loc =>
- context.report({
- node,
- loc,
- messageId: 'missingReturnType',
- }),
+ checkFunctionReturnType(
+ node,
+ options,
+ sourceCode,
+ loc =>
+ context.report({
+ node,
+ loc,
+ messageId: 'missingReturnType',
+ }),
);
},
};
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 adbee1e3..6bd18c91 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-redeclare.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-redeclare.ts
@@ -131,8 +131,8 @@ export default util.createRule<Options, MessageIds>({
if (
// class + interface/namespace merging
- identifiers.every(({ parent }) =>
- CLASS_DECLARATION_MERGE_NODES.has(parent.type),
+ identifiers.every(
+ ({ parent }) => CLASS_DECLARATION_MERGE_NODES.has(parent.type),
)
) {
const classDecls = identifiers.filter(
@@ -152,8 +152,8 @@ export default util.createRule<Options, MessageIds>({
if (
// class + interface/namespace merging
- identifiers.every(({ parent }) =>
- FUNCTION_DECLARATION_MERGE_NODES.has(parent.type),
+ identifiers.every(
+ ({ parent }) => FUNCTION_DECLARATION_MERGE_NODES.has(parent.type),
)
) {
const functionDecls = identifiers.filter(
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 fcf11f3f..10c889db 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
@@ -499,8 +499,8 @@ export default createRule<Options, MessageId>({
propertyType: ts.Type,
): boolean {
if (propertyType.isUnion()) {
- return propertyType.types.some(type =>
- isNullablePropertyType(objType, type),
+ return propertyType.types.some(
+ type => isNullablePropertyType(objType, type),
);
}
if (propertyType.isNumberLiteral() || propertyType.isStringLiteral()) {
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-qualifier.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-qualifier.ts
index 014b2c22..b5404ebd 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-qualifier.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-qualifier.ts
@@ -46,8 +46,8 @@ export default util.createRule({
const symbolDeclarations = symbol.getDeclarations() ?? [];
if (
- symbolDeclarations.some(decl =>
- namespacesInScope.some(ns => ns === decl),
+ symbolDeclarations.some(
+ decl => namespacesInScope.some(ns => ns === decl),
)
) {
return true;
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-type-arguments.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-type-arguments.ts
index 2ff89c59..9a3d132c 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-type-arguments.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/no-unnecessary-type-arguments.ts
@@ -117,12 +117,14 @@ function getTypeParametersFromType(
return undefined;
}
- return findFirstResult(declarations, decl =>
- tsutils.isClassLikeDeclaration(decl) ||
- ts.isTypeAliasDeclaration(decl) ||
- ts.isInterfaceDeclaration(decl)
- ? decl.typeParameters
- : undefined,
+ return findFirstResult(
+ declarations,
+ decl =>
+ tsutils.isClassLikeDeclaration(decl) ||
+ ts.isTypeAliasDeclaration(decl) ||
+ ts.isInterfaceDeclaration(decl)
+ ? decl.typeParameters
+ : undefined,
);
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-includes.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-includes.ts
index d21b088d..027d75d2 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/prefer-includes.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/prefer-includes.ts
@@ -166,8 +166,9 @@ export default createRule({
?.getDeclarations();
if (
includesMethodDecl == null ||
- !includesMethodDecl.some(includesMethodDecl =>
- hasSameParameters(includesMethodDecl, instanceofMethodDecl),
+ !includesMethodDecl.some(
+ includesMethodDecl =>
+ hasSameParameters(includesMethodDecl, instanceofMethodDecl),
)
) {
return;
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/strict-boolean-expressions.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/strict-boolean-expressions.ts
index 51265feb..d1ae5fd9 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/strict-boolean-expressions.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/strict-boolean-expressions.ts
@@ -298,19 +298,22 @@ export default util.createRule<Options, MessageId>({
const variantTypes = new Set<VariantType>();
if (
- types.some(type =>
- tsutils.isTypeFlagSet(
- type,
- ts.TypeFlags.Null | ts.TypeFlags.Undefined | ts.TypeFlags.VoidLike,
- ),
+ types.some(
+ type =>
+ tsutils.isTypeFlagSet(
+ type,
+ ts.TypeFlags.Null |
+ ts.TypeFlags.Undefined |
+ ts.TypeFlags.VoidLike,
+ ),
)
) {
variantTypes.add('nullish');
}
if (
- types.some(type =>
- tsutils.isTypeFlagSet(type, ts.TypeFlags.BooleanLike),
+ types.some(
+ type => tsutils.isTypeFlagSet(type, ts.TypeFlags.BooleanLike),
)
) {
variantTypes.add('boolean');
@@ -323,11 +326,12 @@ export default util.createRule<Options, MessageId>({
}
if (
- types.some(type =>
- tsutils.isTypeFlagSet(
- type,
- ts.TypeFlags.NumberLike | ts.TypeFlags.BigIntLike,
- ),
+ types.some(
+ type =>
+ tsutils.isTypeFlagSet(
+ type,
+ ts.TypeFlags.NumberLike | ts.TypeFlags.BigIntLike,
+ ),
)
) {
variantTypes.add('number');
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/rules/switch-exhaustiveness-check.ts ALT/typescript-eslint/packages/eslint-plugin/src/rules/switch-exhaustiveness-check.ts
index 8881473d..9c72023e 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
@@ -142,10 +142,11 @@ export default createRule({
messageId: 'switchIsNotExhaustive',
data: {
missingBranches: missingBranchTypes
- .map(missingType =>
- isTypeFlagSet(missingType, ts.TypeFlags.ESSymbolLike)
- ? `typeof ${missingType.getSymbol()?.escapedName}`
- : checker.typeToString(missingType),
+ .map(
+ missingType =>
+ isTypeFlagSet(missingType, ts.TypeFlags.ESSymbolLike)
+ ? `typeof ${missingType.getSymbol()?.escapedName}`
+ : checker.typeToString(missingType),
)
.join(' | '),
},
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 e9049042..a21531fc 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/rules/unified-signatures.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/rules/unified-signatures.ts
@@ -322,12 +322,13 @@ export default util.createRule({
sig: SignatureDefinition,
isTypeParameter: IsTypeParameter,
): boolean {
- return sig.params.some((p: TSESTree.Parameter) =>
- typeContainsTypeParameter(
- isTSParameterProperty(p)
- ? p.parameter.typeAnnotation
- : p.typeAnnotation,
- ),
+ return sig.params.some(
+ (p: TSESTree.Parameter) =>
+ typeContainsTypeParameter(
+ isTSParameterProperty(p)
+ ? p.parameter.typeAnnotation
+ : p.typeAnnotation,
+ ),
);
function typeContainsTypeParameter(
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/util/isTypeReadonly.ts ALT/typescript-eslint/packages/eslint-plugin/src/util/isTypeReadonly.ts
index b10f0000..0d42a7a5 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/util/isTypeReadonly.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/util/isTypeReadonly.ts
@@ -143,8 +143,8 @@ function isTypeReadonlyRecurser(
if (isUnionType(type)) {
// all types in the union must be readonly
- const result = unionTypeParts(type).every(t =>
- isTypeReadonlyRecurser(checker, t, seenTypes),
+ const result = unionTypeParts(type).every(
+ t => isTypeReadonlyRecurser(checker, t, seenTypes),
);
const readonlyness = result ? Readonlyness.Readonly : Readonlyness.Mutable;
return readonlyness;
diff --git ORI/typescript-eslint/packages/eslint-plugin/src/util/types.ts ALT/typescript-eslint/packages/eslint-plugin/src/util/types.ts
index d29349f8..4671157e 100644
--- ORI/typescript-eslint/packages/eslint-plugin/src/util/types.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/src/util/types.ts
@@ -57,8 +57,8 @@ export function containsAllTypesByName(
}
if (isUnionOrIntersectionType(type)) {
- return type.types.every(t =>
- containsAllTypesByName(t, allowAny, allowedNames),
+ return type.types.every(
+ t => containsAllTypesByName(t, allowAny, allowedNames),
);
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/configs.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/configs.test.ts
index f8fc068a..90b15529 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/configs.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/configs.test.ts
@@ -22,8 +22,8 @@ function entriesToObject<T = unknown>(value: [string, T][]): Record<string, T> {
}
function filterRules(values: Record<string, string>): [string, string][] {
- return Object.entries(values).filter(([name]) =>
- name.startsWith(RULE_NAME_PREFIX),
+ return Object.entries(values).filter(
+ ([name]) => name.startsWith(RULE_NAME_PREFIX),
);
}
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/indent/indent.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/indent/indent.test.ts
index 8296bf19..34f9bbb8 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/indent/indent.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/indent/indent.test.ts
@@ -624,12 +624,13 @@ type Foo = string | {
const validCases = [...acc.valid];
const invalidCases = [...acc.invalid];
- const codeCases = testCase.code.map(code =>
- [
- '', // newline to make test error messages nicer
- `// ${testCase.node}`, // add comment to easily identify which node a test belongs to
- code.trim(), // remove leading/trailing spaces from the case
- ].join('\n'),
+ const codeCases = testCase.code.map(
+ code =>
+ [
+ '', // newline to make test error messages nicer
+ `// ${testCase.node}`, // add comment to easily identify which node a test belongs to
+ code.trim(), // remove leading/trailing spaces from the case
+ ].join('\n'),
);
codeCases.forEach(code => {
diff --git ORI/typescript-eslint/packages/eslint-plugin/tests/rules/no-inferrable-types.test.ts ALT/typescript-eslint/packages/eslint-plugin/tests/rules/no-inferrable-types.test.ts
index fc216c6c..86eba137 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tests/rules/no-inferrable-types.test.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tests/rules/no-inferrable-types.test.ts
@@ -74,21 +74,22 @@ const validTestCases = flatten(
);
const invalidTestCases: TSESLint.InvalidTestCase<MessageIds, Options>[] =
flatten(
- testCases.map(cas =>
- cas.code.map(code => ({
- code: `const a: ${cas.type} = ${code}`,
- output: `const a = ${code}`,
- errors: [
- {
- messageId: 'noInferrableType',
- data: {
- type: cas.type,
+ testCases.map(
+ cas =>
+ cas.code.map(code => ({
+ code: `const a: ${cas.type} = ${code}`,
+ output: `const a = ${code}`,
+ errors: [
+ {
+ messageId: 'noInferrableType',
+ data: {
+ type: cas.type,
+ },
+ line: 1,
+ column: 7,
},
- line: 1,
- column: 7,
- },
- ],
- })),
+ ],
+ })),
),
);
diff --git ORI/typescript-eslint/packages/eslint-plugin/tools/generate-rules-lists.ts ALT/typescript-eslint/packages/eslint-plugin/tools/generate-rules-lists.ts
index cffe4006..daa9e374 100644
--- ORI/typescript-eslint/packages/eslint-plugin/tools/generate-rules-lists.ts
+++ ALT/typescript-eslint/packages/eslint-plugin/tools/generate-rules-lists.ts
@@ -66,8 +66,9 @@ const buildRulesTable = (rules: RuleDetails[]): string[][] => [
staticElements.listHeaderRow,
staticElements.listSpacerRow,
...rules
- .sort(({ name: ruleNameA }, { name: ruleNameB }) =>
- ruleNameA.localeCompare(ruleNameB),
+ .sort(
+ ({ name: ruleNameA }, { name: ruleNameB }) =>
+ ruleNameA.localeCompare(ruleNameB),
)
.map(buildRuleRow),
];
diff --git ORI/typescript-eslint/packages/scope-manager/tests/eslint-scope/implicit-global-reference.test.ts ALT/typescript-eslint/packages/scope-manager/tests/eslint-scope/implicit-global-reference.test.ts
index bc2d589a..869d9b45 100644
--- ORI/typescript-eslint/packages/scope-manager/tests/eslint-scope/implicit-global-reference.test.ts
+++ ALT/typescript-eslint/packages/scope-manager/tests/eslint-scope/implicit-global-reference.test.ts
@@ -15,10 +15,11 @@ describe('implicit global reference', () => {
const scopes = scopeManager.scopes;
expect(
- scopes.map(scope =>
- getRealVariables(scope.variables).map(variable =>
- variable.defs.map(def => def.type),
- ),
+ scopes.map(
+ scope =>
+ getRealVariables(scope.variables).map(
+ variable => variable.defs.map(def => def.type),
+ ),
),
).toEqual([[[DefinitionType.Variable]]]);
@@ -37,10 +38,11 @@ describe('implicit global reference', () => {
const scopes = scopeManager.scopes;
expect(
- scopes.map(scope =>
- getRealVariables(scope.variables).map(variable =>
- variable.defs.map(def => def.type),
- ),
+ scopes.map(
+ scope =>
+ getRealVariables(scope.variables).map(
+ variable => variable.defs.map(def => def.type),
+ ),
),
).toEqual([[]]);
@@ -61,10 +63,11 @@ describe('implicit global reference', () => {
const scopes = scopeManager.scopes;
expect(
- scopes.map(scope =>
- getRealVariables(scope.variables).map(variable =>
- variable.defs.map(def => def.type),
- ),
+ scopes.map(
+ scope =>
+ getRealVariables(scope.variables).map(
+ variable => variable.defs.map(def => def.type),
+ ),
),
).toEqual([[[DefinitionType.FunctionName]], [[]]]);
@@ -84,8 +87,9 @@ describe('implicit global reference', () => {
const scopes = scopeManager.scopes;
expect(
- scopes.map(scope =>
- getRealVariables(scope.variables).map(variable => variable.name),
+ scopes.map(
+ scope =>
+ getRealVariables(scope.variables).map(variable => variable.name),
),
).toEqual([['outer'], ['arguments']]);
@@ -108,8 +112,9 @@ describe('implicit global reference', () => {
const scopes = scopeManager.scopes;
expect(
- scopes.map(scope =>
- getRealVariables(scope.variables).map(variable => variable.name),
+ scopes.map(
+ scope =>
+ getRealVariables(scope.variables).map(variable => variable.name),
),
).toEqual([['outer'], ['arguments', 'inner', 'x'], ['arguments']]);
@@ -129,8 +134,9 @@ describe('implicit global reference', () => {
const scopes = scopeManager.scopes;
expect(
- scopes.map(scope =>
- getRealVariables(scope.variables).map(variable => variable.name),
+ scopes.map(
+ scope =>
+ getRealVariables(scope.variables).map(variable => variable.name),
),
).toEqual([['outer'], ['arguments'], []]);
@@ -153,8 +159,9 @@ describe('implicit global reference', () => {
const scopes = scopeManager.scopes;
expect(
- scopes.map(scope =>
- getRealVariables(scope.variables).map(variable => variable.name),
+ scopes.map(
+ scope =>
+ getRealVariables(scope.variables).map(variable => variable.name),
),
).toEqual([['outer'], ['arguments', 'inner', 'x'], ['arguments'], []]);
diff --git ORI/typescript-eslint/packages/scope-manager/tests/eslint-scope/references.test.ts ALT/typescript-eslint/packages/scope-manager/tests/eslint-scope/references.test.ts
index 5f07dd67..5db92c77 100644
--- ORI/typescript-eslint/packages/scope-manager/tests/eslint-scope/references.test.ts
+++ ALT/typescript-eslint/packages/scope-manager/tests/eslint-scope/references.test.ts
@@ -447,24 +447,25 @@ describe('References:', () => {
'new function({b: a = 0} = {}) {}',
];
- trueCodes.forEach(code =>
- it(`"${code}", all references should be true.`, () => {
- const { scopeManager } = parseAndAnalyze(code);
+ trueCodes.forEach(
+ code =>
+ it(`"${code}", all references should be true.`, () => {
+ const { scopeManager } = parseAndAnalyze(code);
- expect(scopeManager.scopes.length).toBeGreaterThanOrEqual(1);
+ expect(scopeManager.scopes.length).toBeGreaterThanOrEqual(1);
- const scope = scopeManager.scopes[scopeManager.scopes.length - 1];
- const variables = getRealVariables(scope.variables);
+ const scope = scopeManager.scopes[scopeManager.scopes.length - 1];
+ const variables = getRealVariables(scope.variables);
- expect(variables.length).toBeGreaterThanOrEqual(1);
- expect(scope.references.length).toBeGreaterThanOrEqual(1);
+ expect(variables.length).toBeGreaterThanOrEqual(1);
+ expect(scope.references.length).toBeGreaterThanOrEqual(1);
- scope.references.forEach(reference => {
- expect(reference.identifier.name).toBe('a');
- expect(reference.isWrite()).toBeTruthy();
- expect(reference.init).toBeTruthy();
- });
- }),
+ scope.references.forEach(reference => {
+ expect(reference.identifier.name).toBe('a');
+ expect(reference.isWrite()).toBeTruthy();
+ expect(reference.init).toBeTruthy();
+ });
+ }),
);
let falseCodes = [
@@ -481,24 +482,25 @@ describe('References:', () => {
'let a; for ({a = 0} in []);',
];
- falseCodes.forEach(code =>
- it(`"${code}", all references should be false.`, () => {
- const { scopeManager } = parseAndAnalyze(code);
+ falseCodes.forEach(
+ code =>
+ it(`"${code}", all references should be false.`, () => {
+ const { scopeManager } = parseAndAnalyze(code);
- expect(scopeManager.scopes.length).toBeGreaterThanOrEqual(1);
+ expect(scopeManager.scopes.length).toBeGreaterThanOrEqual(1);
- const scope = scopeManager.scopes[scopeManager.scopes.length - 1];
- const variables = getRealVariables(scope.variables);
+ const scope = scopeManager.scopes[scopeManager.scopes.length - 1];
+ const variables = getRealVariables(scope.variables);
- expect(variables).toHaveLength(1);
- expect(scope.references.length).toBeGreaterThanOrEqual(1);
+ expect(variables).toHaveLength(1);
+ expect(scope.references.length).toBeGreaterThanOrEqual(1);
- scope.references.forEach(reference => {
- expect(reference.identifier.name).toBe('a');
- expect(reference.isWrite()).toBeTruthy();
- expect(reference.init).toBeFalsy();
- });
- }),
+ scope.references.forEach(reference => {
+ expect(reference.identifier.name).toBe('a');
+ expect(reference.isWrite()).toBeTruthy();
+ expect(reference.init).toBeFalsy();
+ });
+ }),
);
falseCodes = [
@@ -517,27 +519,28 @@ describe('References:', () => {
'let a; a.foo = 0;',
'let a,b; b = a.foo;',
];
- falseCodes.forEach(code =>
- it(`"${code}", readonly references of "a" should be undefined.`, () => {
- const { scopeManager } = parseAndAnalyze(code);
+ falseCodes.forEach(
+ code =>
+ it(`"${code}", readonly references of "a" should be undefined.`, () => {
+ const { scopeManager } = parseAndAnalyze(code);
- expect(scopeManager.scopes.length).toBeGreaterThanOrEqual(1);
+ expect(scopeManager.scopes.length).toBeGreaterThanOrEqual(1);
- const scope = scopeManager.scopes[0];
- const variables = getRealVariables(scope.variables);
+ const scope = scopeManager.scopes[0];
+ const variables = getRealVariables(scope.variables);
- expect(variables.length).toBeGreaterThanOrEqual(1);
- expect(variables[0].name).toBe('a');
+ expect(variables.length).toBeGreaterThanOrEqual(1);
+ expect(variables[0].name).toBe('a');
- const references = variables[0].references;
+ const references = variables[0].references;
- expect(references.length).toBeGreaterThanOrEqual(1);
+ expect(references.length).toBeGreaterThanOrEqual(1);
- references.forEach(reference => {
- expect(reference.isRead()).toBeTruthy();
- expect(reference.init).toBeUndefined();
- });
- }),
+ references.forEach(reference => {
+ expect(reference.isRead()).toBeTruthy();
+ expect(reference.init).toBeUndefined();
+ });
+ }),
);
});
diff --git ORI/typescript-eslint/packages/typescript-estree/src/convert.ts ALT/typescript-eslint/packages/typescript-estree/src/convert.ts
index 9fd64b39..8c6a7bd8 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/convert.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/convert.ts
@@ -372,8 +372,8 @@ export class Converter {
type: AST_NODE_TYPES.TSTypeParameterDeclaration,
range: [typeParameters.pos - 1, greaterThanToken.end],
loc: getLocFor(typeParameters.pos - 1, greaterThanToken.end, this.ast),
- params: typeParameters.map(typeParameter =>
- this.convertType(typeParameter),
+ params: typeParameters.map(
+ typeParameter => this.convertType(typeParameter),
),
};
}
@@ -393,8 +393,8 @@ export class Converter {
const convertedParam = this.convertChild(param) as TSESTree.Parameter;
if (param.decorators?.length) {
- convertedParam.decorators = param.decorators.map(el =>
- this.convertChild(el),
+ convertedParam.decorators = param.decorators.map(
+ el => this.convertChild(el),
);
}
return convertedParam;
@@ -877,8 +877,8 @@ export class Converter {
case SyntaxKind.VariableStatement: {
const result = this.createNode<TSESTree.VariableDeclaration>(node, {
type: AST_NODE_TYPES.VariableDeclaration,
- declarations: node.declarationList.declarations.map(el =>
- this.convertChild(el),
+ declarations: node.declarationList.declarations.map(
+ el => this.convertChild(el),
),
kind: getDeclarationKind(node.declarationList),
});
@@ -889,8 +889,8 @@ export class Converter {
* so we handle them here too.
*/
if (node.decorators) {
- (result as any).decorators = node.decorators.map(el =>
- this.convertChild(el),
+ (result as any).decorators = node.decorators.map(
+ el => this.convertChild(el),
);
}
@@ -1125,8 +1125,8 @@ export class Converter {
});
if (node.decorators) {
- result.decorators = node.decorators.map(el =>
- this.convertChild(el),
+ result.decorators = node.decorators.map(
+ el => this.convertChild(el),
);
}
@@ -1557,8 +1557,8 @@ export class Converter {
}
if (implementsClause) {
- result.implements = implementsClause.types.map(el =>
- this.convertChild(el),
+ result.implements = implementsClause.types.map(
+ el => this.convertChild(el),
);
}
@@ -1620,8 +1620,8 @@ export class Converter {
break;
case SyntaxKind.NamedImports:
result.specifiers = result.specifiers.concat(
- node.importClause.namedBindings.elements.map(el =>
- this.convertChild(el),
+ node.importClause.namedBindings.elements.map(
+ el => this.convertChild(el),
),
);
break;
@@ -1658,8 +1658,8 @@ export class Converter {
return this.createNode<TSESTree.ExportNamedDeclaration>(node, {
type: AST_NODE_TYPES.ExportNamedDeclaration,
source: this.convertChild(node.moduleSpecifier),
- specifiers: node.exportClause.elements.map(el =>
- this.convertChild(el),
+ specifiers: node.exportClause.elements.map(
+ el => this.convertChild(el),
),
exportKind: node.isTypeOnly ? 'type' : 'value',
declaration: null,
@@ -2065,8 +2065,8 @@ export class Converter {
: undefined,
selfClosing: true,
name: this.convertJSXTagName(node.tagName, node),
- attributes: node.attributes.properties.map(el =>
- this.convertChild(el),
+ attributes: node.attributes.properties.map(
+ el => this.convertChild(el),
),
range: getRange(node, this.ast),
}),
@@ -2086,8 +2086,8 @@ export class Converter {
: undefined,
selfClosing: false,
name: this.convertJSXTagName(node.tagName, node),
- attributes: node.attributes.properties.map(el =>
- this.convertChild(el),
+ attributes: node.attributes.properties.map(
+ el => this.convertChild(el),
),
});
@@ -2709,8 +2709,8 @@ export class Converter {
// if the former does not exist.
const elementTypes =
'elementTypes' in node
- ? (node as any).elementTypes.map((el: ts.Node) =>
- this.convertType(el),
+ ? (node as any).elementTypes.map(
+ (el: ts.Node) => this.convertType(el),
)
: node.elements.map((el: ts.Node) => this.convertType(el));
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 e00663a1..f338e8cf 100644
--- ORI/typescript-eslint/packages/typescript-estree/src/create-program/createWatchProgram.ts
+++ ALT/typescript-eslint/packages/typescript-estree/src/create-program/createWatchProgram.ts
@@ -158,8 +158,8 @@ function getProgramsForProjects(
fileWatchCallbacks &&
fileWatchCallbacks.size > 0
) {
- fileWatchCallbacks.forEach(cb =>
- cb(filePath, ts.FileWatcherEventKind.Changed),
+ fileWatchCallbacks.forEach(
+ cb => cb(filePath, ts.FileWatcherEventKind.Changed),
);
}
@@ -511,8 +511,8 @@ function maybeInvalidateProgram(
}
log('Marking file as deleted. %s', deletedFile);
- fileWatchCallbacks.forEach(cb =>
- cb(deletedFile, ts.FileWatcherEventKind.Deleted),
+ fileWatchCallbacks.forEach(
+ cb => cb(deletedFile, ts.FileWatcherEventKind.Deleted),
);
// deleted files means that the file list _has_ changed, so clear the cache
diff --git ORI/typescript-eslint/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts ALT/typescript-eslint/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts
index e0a2426b..ce421387 100644
--- ORI/typescript-eslint/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts
+++ ALT/typescript-eslint/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts
@@ -91,14 +91,15 @@ class FixturesTester {
public getFixtures(): Fixture[] {
return this.fixtures
- .map(fixture =>
- glob
- .sync(`${fixture.directory}/${fixture.pattern}`, {})
- .map(filename => ({
- filename,
- ignoreSourceType: fixture.ignoreSourceType,
- jsx: fixture.jsx,
- })),
+ .map(
+ fixture =>
+ glob
+ .sync(`${fixture.directory}/${fixture.pattern}`, {})
+ .map(filename => ({
+ filename,
+ ignoreSourceType: fixture.ignoreSourceType,
+ jsx: fixture.jsx,
+ })),
)
.reduce((acc, x) => acc.concat(x), []);
}
diff --git ORI/typescript-eslint/packages/typescript-estree/tests/lib/semanticInfo.test.ts ALT/typescript-eslint/packages/typescript-estree/tests/lib/semanticInfo.test.ts
index ed7c05c6..cf968bdb 100644
--- ORI/typescript-eslint/packages/typescript-estree/tests/lib/semanticInfo.test.ts
+++ ALT/typescript-eslint/packages/typescript-estree/tests/lib/semanticInfo.test.ts
@@ -236,11 +236,12 @@ describe('semanticInfo', () => {
});
it(`non-existent file should throw error when project provided`, () => {
- expect(() =>
- parseCodeAndGenerateServices(
- `function M() { return Base }`,
- createOptions('<input>'),
- ),
+ expect(
+ () =>
+ parseCodeAndGenerateServices(
+ `function M() { return Base }`,
+ createOptions('<input>'),
+ ),
).toThrow(/The file does not match your project config: estree.ts/);
});
@@ -248,8 +249,9 @@ describe('semanticInfo', () => {
const fileName = resolve(FIXTURES_DIR, 'isolated-file.src.ts');
const badConfig = createOptions(fileName);
badConfig.project = './tsconfigs.json';
- expect(() =>
- parseCodeAndGenerateServices(readFileSync(fileName, 'utf8'), badConfig),
+ expect(
+ () =>
+ parseCodeAndGenerateServices(readFileSync(fileName, 'utf8'), badConfig),
).toThrow(/Cannot read file .+tsconfigs\.json'/);
});
@@ -257,8 +259,9 @@ describe('semanticInfo', () => {
const fileName = resolve(FIXTURES_DIR, 'isolated-file.src.ts');
const badConfig = createOptions(fileName);
badConfig.project = '.';
- expect(() =>
- parseCodeAndGenerateServices(readFileSync(fileName, 'utf8'), badConfig),
+ expect(
+ () =>
+ parseCodeAndGenerateServices(readFileSync(fileName, 'utf8'), badConfig),
).toThrow(
// case insensitive because unix based systems are case insensitive
/Cannot read file .+semanticInfo'./i,
@@ -269,8 +272,9 @@ describe('semanticInfo', () => {
const fileName = resolve(FIXTURES_DIR, 'isolated-file.src.ts');
const badConfig = createOptions(fileName);
badConfig.project = './badTSConfig/tsconfig.json';
- expect(() =>
- parseCodeAndGenerateServices(readFileSync(fileName, 'utf8'), badConfig),
+ expect(
+ () =>
+ parseCodeAndGenerateServices(readFileSync(fileName, 'utf8'), badConfig),
).toThrowErrorMatchingSnapshot();
});
diff --git ORI/vega-lite/src/compile/mark/mark.ts ALT/vega-lite/src/compile/mark/mark.ts
index 4e092c794..60a9d184f 100644
--- ORI/vega-lite/src/compile/mark/mark.ts
+++ ALT/vega-lite/src/compile/mark/mark.ts
@@ -46,8 +46,8 @@ export function parseMarkGroups(model: UnitModel): any[] {
}
// otherwise use standard mark groups
} else if (model.mark === BAR) {
- const hasCornerRadius = VG_CORNERRADIUS_CHANNELS.some(prop =>
- getMarkPropOrConfig(prop, model.markDef, model.config)
+ const hasCornerRadius = VG_CORNERRADIUS_CHANNELS.some(
+ prop => getMarkPropOrConfig(prop, model.markDef, model.config)
);
if (model.stack && !model.fieldDef('size') && hasCornerRadius) {
return getGroupsForStackedBarWithCornerRadius(model);
diff --git ORI/vega-lite/src/normalize/selectioncompat.ts ALT/vega-lite/src/normalize/selectioncompat.ts
index f5e64df73..b3634cf3d 100644
--- ORI/vega-lite/src/normalize/selectioncompat.ts
+++ ALT/vega-lite/src/normalize/selectioncompat.ts
@@ -153,7 +153,8 @@ function normalizePredicate(op: any, normParams: NormalizerParams) {
return op.selection
? normalizeSelectionComposition(op.selection)
- : normalizeLogicalComposition(op.test || op.filter, o =>
- o.selection ? normalizeSelectionComposition(o.selection) : o
+ : normalizeLogicalComposition(
+ op.test || op.filter,
+ o => (o.selection ? normalizeSelectionComposition(o.selection) : o)
);
}
diff --git ORI/vega-lite/test/bin.test.ts ALT/vega-lite/test/bin.test.ts
index aa2312361..26bc3217b 100644
--- ORI/vega-lite/test/bin.test.ts
+++ ALT/vega-lite/test/bin.test.ts
@@ -16,8 +16,8 @@ import {
describe('autoMaxBins', () => {
it('should assign generate correct defaults for different channels', () => {
// Not testing case for 10 because it's already tested
- [COLOR, FILL, STROKE, STROKEWIDTH, SIZE, OPACITY, FILLOPACITY, STROKEOPACITY, SHAPE, ROW, COLUMN].forEach(a =>
- expect(autoMaxBins(a)).toEqual(6)
+ [COLOR, FILL, STROKE, STROKEWIDTH, SIZE, OPACITY, FILLOPACITY, STROKEOPACITY, SHAPE, ROW, COLUMN].forEach(
+ a => expect(autoMaxBins(a)).toEqual(6)
);
});
});from prettier-regression-testing.
thorn0
commented on May 17, 2024
run #10495
from prettier-regression-testing.
github-actions
commented on May 17, 2024
prettier/prettier#10495 VS prettier/prettier@main
- babel/babel@b63be94
- vuejs/eslint-plugin-vue@cc9c140
- excalidraw/excalidraw@1973ae9
- prettier/prettier@2c1b8f6
- typescript-eslint/typescript-eslint@7b701a3
- vega/vega-lite@e89e9e6
The diff is empty.
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run #10517
from prettier-regression-testing.
github-actions
commented on May 17, 2024
prettier/prettier#10517 VS prettier/prettier@main
- babel/babel@b63be94
- vuejs/eslint-plugin-vue@cc9c140
- excalidraw/excalidraw@1973ae9
- prettier/prettier@2c1b8f6
- typescript-eslint/typescript-eslint@7b701a3
- vega/vega-lite@e89e9e6
The diff is empty.
from prettier-regression-testing.
sosukesuzuki
commented on May 17, 2024
run #10702
from prettier-regression-testing.
github-actions
commented on May 17, 2024
prettier/prettier#10702 VS prettier/prettier@main
- babel/babel@2ae19d0
- vuejs/eslint-plugin-vue@62f577d
- excalidraw/excalidraw@25fd275
- prettier/prettier@5f8bad8
- typescript-eslint/typescript-eslint@d0d7186
- vega/vega-lite@2dff36f
Diff (139 lines)
diff --git ORI/excalidraw/src/data/restore.ts ALT/excalidraw/src/data/restore.ts
index 99b4f88..4a88c65 100644
--- ORI/excalidraw/src/data/restore.ts
+++ ALT/excalidraw/src/data/restore.ts
@@ -57,11 +57,11 @@ const restoreElementWithProperties = <T extends ExcalidrawElement>(
boundElementIds: element.boundElementIds ?? [],
};
- return ({
+ return {
...base,
...getNormalizedDimensions(base),
...extra,
- } as unknown) as T;
+ } as unknown as T;
};
const restoreElement = (
diff --git ORI/excalidraw/src/element/bounds.ts ALT/excalidraw/src/element/bounds.ts
index 2641b94..143d632 100644
--- ORI/excalidraw/src/element/bounds.ts
+++ ALT/excalidraw/src/element/bounds.ts
@@ -71,7 +71,7 @@ const getMinMaxXYFromCurvePathOps = (
// move, bcurveTo, lineTo, and curveTo
if (op === "move") {
// change starting point
- currentP = (data as unknown) as Point;
+ currentP = data as unknown as Point;
// move operation does not draw anything; so, it always
// returns false
} else if (op === "bcurveTo") {
@@ -185,7 +185,7 @@ export const getArrowheadPoints = (
const prevOp = ops[index - 1];
let p0: Point = [0, 0];
if (prevOp.op === "move") {
- p0 = (prevOp.data as unknown) as Point;
+ p0 = prevOp.data as unknown as Point;
} else if (prevOp.op === "bcurveTo") {
p0 = [prevOp.data[4], prevOp.data[5]];
}
diff --git ORI/excalidraw/src/element/collision.ts ALT/excalidraw/src/element/collision.ts
index 9a2d36f..8c15b08 100644
--- ORI/excalidraw/src/element/collision.ts
+++ ALT/excalidraw/src/element/collision.ts
@@ -762,7 +762,7 @@ const hitTestRoughShape = (
// move, bcurveTo, lineTo, and curveTo
if (op === "move") {
// change starting point
- currentP = (data as unknown) as Point;
+ currentP = data as unknown as Point;
// move operation does not draw anything; so, it always
// returns false
} else if (op === "bcurveTo") {
diff --git ORI/excalidraw/src/ga.ts ALT/excalidraw/src/ga.ts
index 23bee4e..f2e27e0 100644
--- ORI/excalidraw/src/ga.ts
+++ ALT/excalidraw/src/ga.ts
@@ -67,7 +67,7 @@ export const nvector = (value: number = 0, index: number = 0): NVector => {
if (value !== 0) {
result[index] = value;
}
- return (result as unknown) as NVector;
+ return result as unknown as NVector;
};
const STRING_EPSILON = 0.000001;
diff --git ORI/excalidraw/src/galines.ts ALT/excalidraw/src/galines.ts
index e57527b..015476a 100644
--- ORI/excalidraw/src/galines.ts
+++ ALT/excalidraw/src/galines.ts
@@ -36,7 +36,7 @@ export const orthogonalThrough = (against: Point, intersection: Point): Line =>
export const parallel = (line: Line, distance: number): Line => {
const result = line.slice();
result[1] -= distance;
- return (result as unknown) as Line;
+ return result as unknown as Line;
};
export const parallelThrough = (line: Line, point: Point): Line =>
diff --git ORI/excalidraw/src/is-mobile.tsx ALT/excalidraw/src/is-mobile.tsx
index 466fcd0..fed931e 100644
--- ORI/excalidraw/src/is-mobile.tsx
+++ ALT/excalidraw/src/is-mobile.tsx
@@ -6,11 +6,11 @@ const context = React.createContext(false);
const getIsMobileMatcher = () => {
return window.matchMedia
? window.matchMedia(variables.isMobileQuery)
- : (({
+ : ({
matches: false,
addListener: () => {},
removeListener: () => {},
- } as any) as MediaQueryList);
+ } as any as MediaQueryList);
};
export const IsMobileProvider = ({
diff --git ORI/typescript-eslint/packages/scope-manager/src/scope/ScopeBase.ts ALT/typescript-eslint/packages/scope-manager/src/scope/ScopeBase.ts
index 90e2c0f..c6c6106 100644
--- ORI/typescript-eslint/packages/scope-manager/src/scope/ScopeBase.ts
+++ ALT/typescript-eslint/packages/scope-manager/src/scope/ScopeBase.ts
@@ -389,7 +389,7 @@ abstract class ScopeBase<
}
protected delegateToUpperScope(ref: Reference): void {
- const upper = (this.upper as Scope) as AnyScope;
+ const upper = this.upper as Scope as AnyScope;
if (upper?.leftToResolve) {
upper.leftToResolve.push(ref);
}
diff --git ORI/typescript-eslint/packages/scope-manager/tests/eslint-scope/map-ecma-version.test.ts ALT/typescript-eslint/packages/scope-manager/tests/eslint-scope/map-ecma-version.test.ts
index 3a5957b..d8646fb 100644
--- ORI/typescript-eslint/packages/scope-manager/tests/eslint-scope/map-ecma-version.test.ts
+++ ALT/typescript-eslint/packages/scope-manager/tests/eslint-scope/map-ecma-version.test.ts
@@ -33,7 +33,7 @@ describe('ecma version mapping', () => {
});
});
-const fakeNode = ({} as unknown) as TSESTree.Node;
+const fakeNode = {} as unknown as TSESTree.Node;
function expectMapping(ecmaVersion: number | undefined, lib: Lib): void {
(Referencer as jest.Mock).mockClear();
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 d4acba1..3b903fa 100644
--- ORI/typescript-eslint/packages/typescript-estree/tests/lib/parse.test.ts
+++ ALT/typescript-eslint/packages/typescript-estree/tests/lib/parse.test.ts
@@ -90,7 +90,7 @@ describe('parseWithNodeMaps()', () => {
describe('non string code', () => {
// testing a non string code..
// eslint-disable-next-line @typescript-eslint/no-explicit-any
- const code = (12345 as any) as string;
+ const code = 12345 as any as string;
const config: TSESTreeOptions = {
comment: true,
tokens: true,
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run #13115
from prettier-regression-testing.
github-actions
commented on May 17, 2024
prettier/prettier#13115 VS prettier/prettier@main
- babel/babel@4e0e5f9
- vuejs/eslint-plugin-vue@508ea0e
- excalidraw/excalidraw@49172ac
- prettier/prettier@e949a54
- marmelab/react-admin@5ae855a
- typescript-eslint/typescript-eslint@9d47a8b
- vega/vega-lite@16bc913
The diff is empty.
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run #13115 vs prettier/prettier#67efa96da68a4bae5620db0b2cbc4efd8b18b4df
from prettier-regression-testing.
github-actions
commented on May 17, 2024
prettier/prettier#13115 VS prettier/prettier@67efa96
- babel/babel@4e0e5f9
- vuejs/eslint-plugin-vue@508ea0e
- excalidraw/excalidraw@49172ac
- prettier/prettier@e949a54
- marmelab/react-admin@5ae855a
- typescript-eslint/typescript-eslint@9d47a8b
- vega/vega-lite@16bc913
The diff is empty.
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run thorn0/prettier@call-args VS prettier/prettier@next
from prettier-regression-testing.
github-actions
commented on May 17, 2024
[Error]
Error: Command failed with exit code 128: git checkout next
hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
hint: you can do so by fully qualifying the name with the --track option:
hint:
hint: git checkout --track origin/<name>
hint:
hint: If you'd like to always have checkouts of an ambiguous <name> prefer
hint: one remote, e.g. the 'origin' remote, consider setting
hint: checkout.defaultRemote=origin in your config.
fatal: 'next' matched multiple (2) remote tracking branches
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run thorn0/prettier@call-args VS prettier/prettier@6afb16b
from prettier-regression-testing.
github-actions
commented on May 17, 2024
[Error]
Error: Command failed with exit code 1: yarn
�[94m➤�[39m �[90mYN0000�[39m: ┌ Resolution step
::group::Resolution step
�[93m➤�[39m YN0002: │ �[38;5;173mprettier�[39m�[38;5;111m@�[39m�[38;5;111mworkspace:.�[39m doesn't provide �[38;5;166m@typescript-eslint/�[39m�[38;5;173mparser�[39m (�[38;5;111mp94a20�[39m), requested by �[38;5;166m@typescript-eslint/�[39m�[38;5;173meslint-plugin�[39m
�[93m➤�[39m YN0002: │ �[38;5;173mprettier�[39m�[38;5;111m@�[39m�[38;5;111mworkspace:.�[39m doesn't provide �[38;5;173mrollup�[39m (�[38;5;111mp291e4�[39m), requested by �[38;5;173mrollup-plugin-license�[39m
�[93m➤�[39m YN0000: │ Some peer dependencies are incorrectly met; run �[38;5;111myarn explain peer-requirements <hash>�[39m for details, where �[38;5;111m<hash>�[39m is the six-letter p-prefixed code
::endgroup::
�[94m➤�[39m �[90mYN0000�[39m: └ Completed in 0s 289ms
�[94m➤�[39m �[90mYN0000�[39m: ┌ Post-resolution validation
::group::Post-resolution validation
�[94m➤�[39m �[90mYN0000�[39m: │ @@ -1626,15 +1626,8 @@
�[94m➤�[39m �[90mYN0000�[39m: │ �[90m checksum: ddf88835bc87b3ad946aaeb29b770a49a8e1c3c5e294ee9cb93b1936f432a1016efb97803f197eea1be61545cbc79b5526cc05e9339ca9beada22fc83801ddea�[39m
�[94m➤�[39m �[90mYN0000�[39m: │ �[90m languageName: node�[39m
�[94m➤�[39m �[90mYN0000�[39m: │ �[90m linkType: hard�[39m
�[94m➤�[39m �[90mYN0000�[39m: │ �[90m �[39m
�[91m➤�[39m YN0028: │ �[38;5;160m-"@typescript-eslint/types@npm:5.33.0":�[39m
�[91m➤�[39m YN0028: │ �[38;5;160m- version: 5.33.0�[39m
�[91m➤�[39m YN0028: │ �[38;5;160m- resolution: "@typescript-eslint/types@npm:5.33.0"�[39m
�[91m➤�[39m YN0028: │ �[38;5;160m- checksum: 8bbddda84cb3adf5c659b0d42547a2d6ab87f4eea574aca5dd63a3bd85169f32796ecbddad3b27f18a609070f6b1d18a54018d488bad746ae0f6ea5c02206109�[39m
�[91m➤�[39m YN0028: │ �[38;5;160m- languageName: node�[39m
�[91m➤�[39m YN0028: │ �[38;5;160m- linkType: hard�[39m
�[91m➤�[39m YN0028: │ �[38;5;160m-�[39m
�[94m➤�[39m �[90mYN0000�[39m: │ �[90m "@typescript-eslint/types@npm:5.33.1":�[39m
�[94m➤�[39m �[90mYN0000�[39m: │ �[90m version: 5.33.1�[39m
�[94m➤�[39m �[90mYN0000�[39m: │ �[90m resolution: "@typescript-eslint/types@npm:5.33.1"�[39m
�[94m➤�[39m �[90mYN0000�[39m: │ �[90m checksum: 122891bd4ab4b930b1d33f3ce43a010825c1e61b9879520a0f3dc34cf92df71e2a873410845ab8d746333511c455c115eaafdec149298a161cef713829dfdb77�[39m
�[94m➤�[39m �[90mYN0000�[39m: │ @@ -1674,18 +1667,8 @@
�[94m➤�[39m �[90mYN0000�[39m: │ �[90m checksum: c550504d62fc72f29bf3d7a651bd3a81f49fb1fccaf47583721c2ab1abd2ef78a1e4bc392cb4be4a61a45a4f24fc14a59d67b98aac8a16a207a7cace86538cab�[39m
�[94m➤�[39m �[90mYN0000�[39m: │ �[90m languageName: node�[39m
�[94m➤�[39m �[90mYN0000�[39m: │ �[90m linkType: hard�[39m
�[94m➤�[39m �[90mYN0000�[39m: │ �[90m �[39m
�[91m➤�[39m YN0028: │ �[38;5;160m-"@typescript-eslint/visitor-keys@npm:5.33.0":�[39m
�[91m➤�[39m YN0028: │ �[38;5;160m- version: 5.33.0�[39m
�[91m➤�[39m YN0028: │ �[38;5;160m- resolution: "@typescript-eslint/visitor-keys@npm:5.33.0"�[39m
�[91m➤�[39m YN0028: │ �[38;5;160m- dependencies:�[39m
�[91m➤�[39m YN0028: │ �[38;5;160m- "@typescript-eslint/types": 5.33.0�[39m
�[91m➤�[39m YN0028: │ �[38;5;160m- eslint-visitor-keys: ^3.3.0�[39m
�[91m➤�[39m YN0028: │ �[38;5;160m- checksum: d7e3653de6bac6841e6fcc54226b93ad6bdca4aa76ebe7d83459c016c3eebcc50d4f65ee713174bc267d765295b642d1927a778c5de707b8389e3fcc052aa4a1�[39m
�[91m➤�[39m YN0028: │ �[38;5;160m- languageName: node�[39m
�[91m➤�[39m YN0028: │ �[38;5;160m- linkType: hard�[39m
�[91m➤�[39m YN0028: │ �[38;5;160m-�[39m
�[94m➤�[39m �[90mYN0000�[39m: │ �[90m "@typescript-eslint/visitor-keys@npm:5.33.1":�[39m
�[94m➤�[39m �[90mYN0000�[39m: │ �[90m version: 5.33.1�[39m
�[94m➤�[39m �[90mYN0000�[39m: │ �[90m resolution: "@typescript-eslint/visitor-keys@npm:5.33.1"�[39m
�[94m➤�[39m �[90mYN0000�[39m: │ �[90m dependencies:�[39m
�[94m➤�[39m �[90mYN0000�[39m: │
�[91m➤�[39m YN0028: │ The lockfile would have been modified by this install, which is explicitly forbidden.
::endgroup::
�[94m➤�[39m �[90mYN0000�[39m: └ Completed
�[91m➤�[39m YN0000: Failed with errors in 0s 407ms
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run thorn0/prettier@call-args VS thorn0/prettier@fix-show-doc
from prettier-regression-testing.
github-actions
commented on May 17, 2024
[Error]
Error: Command failed with exit code 2: /home/runner/work/prettier-regression-testing/prettier-regression-testing/prettier/bin/prettier.js --write "./**/*.{css,scss,json,md,html,yml,ts,tsx,js}" --ignore-path .eslintignore
[error] Invalid configuration file `.eslintrc.json`: Cannot find package '@excalidraw/prettier-config' imported from /home/runner/work/prettier-regression-testing/prettier-regression-testing/repos/excalidraw/package.json
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run thorn0/prettier@call-args VS prettier/prettier@67e1348
from prettier-regression-testing.
github-actions
commented on May 17, 2024
[Error]
Error: Command failed with exit code 2: /home/runner/work/prettier-regression-testing/prettier-regression-testing/prettier/bin/prettier.js --write "./**/*.{css,scss,json,md,html,yml,ts,tsx,js}" --ignore-path .eslintignore
[error] Invalid configuration file `.eslintrc.json`: Cannot find package '@excalidraw/prettier-config' imported from /home/runner/work/prettier-regression-testing/prettier-regression-testing/repos/excalidraw/package.json
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run thorn0/prettier#call-args VS prettier/prettier#fe1c28e
from prettier-regression-testing.
github-actions
commented on May 17, 2024
[Error]
Error: Command failed with exit code 2: /home/runner/work/prettier-regression-testing/prettier-regression-testing/prettier/bin/prettier.js --write "./**/*.{css,scss,json,md,html,yml,ts,tsx,js}" --ignore-path .eslintignore
[error] Invalid configuration file `.eslintrc.json`: Cannot find package '@excalidraw/prettier-config' imported from /home/runner/work/prettier-regression-testing/prettier-regression-testing/repos/excalidraw/package.json
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run #13341 VS prettier/prettier#fe1c28e
from prettier-regression-testing.
github-actions
commented on May 17, 2024
[Error]
Error: Command failed with exit code 2: /home/runner/work/prettier-regression-testing/prettier-regression-testing/prettier/bin/prettier.js --write "./**/*.{css,scss,json,md,html,yml,ts,tsx,js}" --ignore-path .eslintignore
[error] Invalid configuration file `.eslintrc.json`: Cannot find package '@excalidraw/prettier-config' imported from /home/runner/work/prettier-regression-testing/prettier-regression-testing/repos/excalidraw/package.json
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run #13341 VS prettier/prettier#fe1c28e
from prettier-regression-testing.
github-actions
commented on May 17, 2024
[Error]
Error: Command failed with exit code 2: /home/runner/work/prettier-regression-testing/prettier-regression-testing/prettier/bin/prettier.js --write "./**/*.{css,scss,json,md,html,yml,ts,tsx,js}" --ignore-path .eslintignore
[error] Invalid configuration file `.eslintrc.json`: Cannot find package '@excalidraw/prettier-config' imported from /home/runner/work/prettier-regression-testing/prettier-regression-testing/repos/excalidraw/package.json
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run #13341 VS prettier/prettier#fe1c28e
from prettier-regression-testing.
github-actions
commented on May 17, 2024
prettier/prettier#13341 VS prettier/prettier@fe1c28e
- babel/babel@4e0e5f9
- vuejs/eslint-plugin-vue@508ea0e
- excalidraw/excalidraw@49172ac
- prettier/prettier@e949a54
- marmelab/react-admin@5ae855a
- typescript-eslint/typescript-eslint@9d47a8b
- vega/vega-lite@16bc913
Diff (609 lines)
diff --git ORI/babel/packages/babel-cli/test/index.js ALT/babel/packages/babel-cli/test/index.js
index 1941b84c..bb21b8f2 100644
--- ORI/babel/packages/babel-cli/test/index.js
+++ ALT/babel/packages/babel-cli/test/index.js
@@ -288,9 +288,11 @@ fs.readdirSync(fixtureLoc).forEach(function (binName) {
parseInt(process.versions.node, 10) < opts.minNodeVersion;
// eslint-disable-next-line jest/valid-title
- (skip
- ? it.skip
- : it)(testName, buildTest(binName, testName, opts), 20000);
+ (skip ? it.skip : it)(
+ testName,
+ buildTest(binName, testName, opts),
+ 20000,
+ );
});
});
});
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..dd23f010 100644
--- ORI/babel/packages/babel-parser/test/helpers/to-fuzzed-options.js
+++ ALT/babel/packages/babel-parser/test/helpers/to-fuzzed-options.js
@@ -35,12 +35,12 @@ const toAdjustedSyntaxError = (adjust, error) =>
line: parseInt(line, 10),
column: parseInt(column, 10),
};
- return `(${adjust(
+ return `(${adjust(adjust, loc.line, "line", loc)}:${adjust(
adjust,
- loc.line,
- "line",
+ loc.column,
+ "column",
loc,
- )}:${adjust(adjust, loc.column, "column", loc)})`;
+ )})`;
}),
)
: error;
diff --git ORI/excalidraw/src/components/App.tsx ALT/excalidraw/src/components/App.tsx
index ae5376f..0455796 100644
--- ORI/excalidraw/src/components/App.tsx
+++ ALT/excalidraw/src/components/App.tsx
@@ -3094,10 +3094,13 @@ class App extends React.Component<AppProps, AppState> {
),
// we need to duplicate because we'll be updating this state
lastCoords: { ...origin },
- originalElements: this.scene.getElements().reduce((acc, element) => {
- acc.set(element.id, deepCopyElement(element));
- return acc;
- }, new Map() as PointerDownState["originalElements"]),
+ originalElements: this.scene.getElements().reduce(
+ (acc, element) => {
+ acc.set(element.id, deepCopyElement(element));
+ return acc;
+ },
+ new Map() as PointerDownState["originalElements"],
+ ),
resize: {
handleType: false,
isResizing: false,
diff --git ORI/excalidraw/src/data/library.ts ALT/excalidraw/src/data/library.ts
index 248db51..23fa79c 100644
--- ORI/excalidraw/src/data/library.ts
+++ ALT/excalidraw/src/data/library.ts
@@ -85,13 +85,16 @@ class Library {
return resolve([]);
}
- const items = libraryItems.reduce((acc, item) => {
- const restoredItem = this.restoreLibraryItem(item);
- if (restoredItem) {
- acc.push(item);
- }
- return acc;
- }, [] as Mutable<LibraryItems>);
+ const items = libraryItems.reduce(
+ (acc, item) => {
+ const restoredItem = this.restoreLibraryItem(item);
+ if (restoredItem) {
+ acc.push(item);
+ }
+ return acc;
+ },
+ [] as Mutable<LibraryItems>,
+ );
// clone to ensure we don't mutate the cached library elements in the app
this.libraryCache = JSON.parse(JSON.stringify(items));
diff --git ORI/excalidraw/src/element/image.ts ALT/excalidraw/src/element/image.ts
index 17ba245..fe9f1a9 100644
--- ORI/excalidraw/src/element/image.ts
+++ ALT/excalidraw/src/element/image.ts
@@ -40,37 +40,40 @@ export const updateImageCache = async ({
const erroredFiles = new Map<FileId, true>();
await Promise.all(
- fileIds.reduce((promises, fileId) => {
- const fileData = files[fileId as string];
- if (fileData && !updatedFiles.has(fileId)) {
- updatedFiles.set(fileId, true);
- return promises.concat(
- (async () => {
- try {
- if (fileData.mimeType === MIME_TYPES.binary) {
- throw new Error("Only images can be added to ImageCache");
- }
+ fileIds.reduce(
+ (promises, fileId) => {
+ const fileData = files[fileId as string];
+ if (fileData && !updatedFiles.has(fileId)) {
+ updatedFiles.set(fileId, true);
+ return promises.concat(
+ (async () => {
+ try {
+ if (fileData.mimeType === MIME_TYPES.binary) {
+ throw new Error("Only images can be added to ImageCache");
+ }
- const imagePromise = loadHTMLImageElement(fileData.dataURL);
- const data = {
- image: imagePromise,
- mimeType: fileData.mimeType,
- } as const;
- // store the promise immediately to indicate there's an in-progress
- // initialization
- imageCache.set(fileId, data);
+ const imagePromise = loadHTMLImageElement(fileData.dataURL);
+ const data = {
+ image: imagePromise,
+ mimeType: fileData.mimeType,
+ } as const;
+ // store the promise immediately to indicate there's an in-progress
+ // initialization
+ imageCache.set(fileId, data);
- const image = await imagePromise;
+ const image = await imagePromise;
- imageCache.set(fileId, { ...data, image });
- } catch (error: any) {
- erroredFiles.set(fileId, true);
- }
- })(),
- );
- }
- return promises;
- }, [] as Promise<any>[]),
+ imageCache.set(fileId, { ...data, image });
+ } catch (error: any) {
+ erroredFiles.set(fileId, true);
+ }
+ })(),
+ );
+ }
+ return promises;
+ },
+ [] as Promise<any>[],
+ ),
);
return {
diff --git ORI/excalidraw/src/element/resizeTest.ts ALT/excalidraw/src/element/resizeTest.ts
index dbdab5a..81de543 100644
--- ORI/excalidraw/src/element/resizeTest.ts
+++ ALT/excalidraw/src/element/resizeTest.ts
@@ -70,20 +70,26 @@ export const getElementWithTransformHandleType = (
zoom: Zoom,
pointerType: PointerType,
) => {
- return elements.reduce((result, element) => {
- if (result) {
- return result;
- }
- const transformHandleType = resizeTest(
- element,
- appState,
- scenePointerX,
- scenePointerY,
- zoom,
- pointerType,
- );
- return transformHandleType ? { element, transformHandleType } : null;
- }, null as { element: NonDeletedExcalidrawElement; transformHandleType: MaybeTransformHandleType } | null);
+ return elements.reduce(
+ (result, element) => {
+ if (result) {
+ return result;
+ }
+ const transformHandleType = resizeTest(
+ element,
+ appState,
+ scenePointerX,
+ scenePointerY,
+ zoom,
+ pointerType,
+ );
+ return transformHandleType ? { element, transformHandleType } : null;
+ },
+ null as {
+ element: NonDeletedExcalidrawElement;
+ transformHandleType: MaybeTransformHandleType;
+ } | null,
+ );
};
export const getTransformHandleTypeFromCoords = (
diff --git ORI/excalidraw/src/history.ts ALT/excalidraw/src/history.ts
index cc620ca..a87ce4f 100644
--- ORI/excalidraw/src/history.ts
+++ ALT/excalidraw/src/history.ts
@@ -103,35 +103,38 @@ class History {
): DehydratedHistoryEntry =>
this.dehydrateHistoryEntry({
appState: clearAppStatePropertiesForHistory(appState),
- elements: elements.reduce((elements, element) => {
- if (
- isLinearElement(element) &&
- appState.multiElement &&
- appState.multiElement.id === element.id
- ) {
- // don't store multi-point arrow if still has only one point
+ elements: elements.reduce(
+ (elements, element) => {
if (
+ isLinearElement(element) &&
appState.multiElement &&
- appState.multiElement.id === element.id &&
- element.points.length < 2
+ appState.multiElement.id === element.id
) {
- return elements;
+ // don't store multi-point arrow if still has only one point
+ if (
+ appState.multiElement &&
+ appState.multiElement.id === element.id &&
+ element.points.length < 2
+ ) {
+ return elements;
+ }
+
+ elements.push({
+ ...element,
+ // don't store last point if not committed
+ points:
+ element.lastCommittedPoint !==
+ element.points[element.points.length - 1]
+ ? element.points.slice(0, -1)
+ : element.points,
+ });
+ } else {
+ elements.push(element);
}
-
- elements.push({
- ...element,
- // don't store last point if not committed
- points:
- element.lastCommittedPoint !==
- element.points[element.points.length - 1]
- ? element.points.slice(0, -1)
- : element.points,
- });
- } else {
- elements.push(element);
- }
- return elements;
- }, [] as Mutable<typeof elements>),
+ return elements;
+ },
+ [] as Mutable<typeof elements>,
+ ),
});
shouldCreateEntry(nextEntry: HistoryEntry): boolean {
diff --git ORI/excalidraw/src/renderer/renderScene.ts ALT/excalidraw/src/renderer/renderScene.ts
index 00557ae..06d34dc 100644
--- ORI/excalidraw/src/renderer/renderScene.ts
+++ ALT/excalidraw/src/renderer/renderScene.ts
@@ -304,40 +304,50 @@ export const renderScene = (
!appState.multiElement &&
!appState.editingLinearElement
) {
- const selections = elements.reduce((acc, element) => {
- const selectionColors = [];
- // local user
- if (
- appState.selectedElementIds[element.id] &&
- !isSelectedViaGroup(appState, element)
- ) {
- selectionColors.push(oc.black);
- }
- // remote users
- if (renderConfig.remoteSelectedElementIds[element.id]) {
- selectionColors.push(
- ...renderConfig.remoteSelectedElementIds[element.id].map(
- (socketId) => {
- const { background } = getClientColors(socketId, appState);
- return background;
- },
- ),
- );
- }
- if (selectionColors.length) {
- const [elementX1, elementY1, elementX2, elementY2] =
- getElementAbsoluteCoords(element);
- acc.push({
- angle: element.angle,
- elementX1,
- elementY1,
- elementX2,
- elementY2,
- selectionColors,
- });
- }
- return acc;
- }, [] as { angle: number; elementX1: number; elementY1: number; elementX2: number; elementY2: number; selectionColors: string[] }[]);
+ const selections = elements.reduce(
+ (acc, element) => {
+ const selectionColors = [];
+ // local user
+ if (
+ appState.selectedElementIds[element.id] &&
+ !isSelectedViaGroup(appState, element)
+ ) {
+ selectionColors.push(oc.black);
+ }
+ // remote users
+ if (renderConfig.remoteSelectedElementIds[element.id]) {
+ selectionColors.push(
+ ...renderConfig.remoteSelectedElementIds[element.id].map(
+ (socketId) => {
+ const { background } = getClientColors(socketId, appState);
+ return background;
+ },
+ ),
+ );
+ }
+ if (selectionColors.length) {
+ const [elementX1, elementY1, elementX2, elementY2] =
+ getElementAbsoluteCoords(element);
+ acc.push({
+ angle: element.angle,
+ elementX1,
+ elementY1,
+ elementX2,
+ elementY2,
+ selectionColors,
+ });
+ }
+ return acc;
+ },
+ [] as {
+ angle: number;
+ elementX1: number;
+ elementY1: number;
+ elementX2: number;
+ elementY2: number;
+ selectionColors: string[];
+ }[],
+ );
const addSelectionForGroupId = (groupId: GroupId) => {
const groupElements = getElementsInGroup(elements, groupId);
diff --git ORI/excalidraw/src/tests/helpers/api.ts ALT/excalidraw/src/tests/helpers/api.ts
index 25196e0..b61fb4b 100644
--- ORI/excalidraw/src/tests/helpers/api.ts
+++ ALT/excalidraw/src/tests/helpers/api.ts
@@ -22,10 +22,13 @@ const { h } = window;
export class API {
static setSelectedElements = (elements: ExcalidrawElement[]) => {
h.setState({
- selectedElementIds: elements.reduce((acc, element) => {
- acc[element.id] = true;
- return acc;
- }, {} as Record<ExcalidrawElement["id"], true>),
+ selectedElementIds: elements.reduce(
+ (acc, element) => {
+ acc[element.id] = true;
+ return acc;
+ },
+ {} as Record<ExcalidrawElement["id"], true>,
+ ),
});
};
diff --git ORI/excalidraw/src/zindex.ts ALT/excalidraw/src/zindex.ts
index 4b96c8e..ac9dcbe 100644
--- ORI/excalidraw/src/zindex.ts
+++ ALT/excalidraw/src/zindex.ts
@@ -172,11 +172,14 @@ const getTargetElementsMap = (
elements: readonly ExcalidrawElement[],
indices: number[],
) => {
- return indices.reduce((acc, index) => {
- const element = elements[index];
- acc[element.id] = element;
- return acc;
- }, {} as Record<string, ExcalidrawElement>);
+ return indices.reduce(
+ (acc, index) => {
+ const element = elements[index];
+ acc[element.id] = element;
+ return acc;
+ },
+ {} as Record<string, ExcalidrawElement>,
+ );
};
const shiftElements = (
diff --git ORI/prettier/src/common/ast-path.js ALT/prettier/src/common/ast-path.js
index ade4952..622b159 100644
--- ORI/prettier/src/common/ast-path.js
+++ ALT/prettier/src/common/ast-path.js
@@ -104,9 +104,12 @@ class AstPath {
// the end of the iteration.
map(callback, ...names) {
const result = [];
- this.each((path, index, value) => {
- result[index] = callback(path, index, value);
- }, ...names);
+ this.each(
+ (path, index, value) => {
+ result[index] = callback(path, index, value);
+ },
+ ...names,
+ );
return result;
}
diff --git ORI/react-admin/examples/demo/src/dashboard/OrderChart.tsx ALT/react-admin/examples/demo/src/dashboard/OrderChart.tsx
index 3a58fd3..7543ba2 100644
--- ORI/react-admin/examples/demo/src/dashboard/OrderChart.tsx
+++ ALT/react-admin/examples/demo/src/dashboard/OrderChart.tsx
@@ -24,14 +24,17 @@ const dateFormatter = (date: number): string =>
const aggregateOrdersByDay = (orders: Order[]): { [key: string]: number } =>
orders
.filter((order: Order) => order.status !== 'cancelled')
- .reduce((acc, curr) => {
- const day = format(curr.date, 'YYYY-MM-DD');
- if (!acc[day]) {
- acc[day] = 0;
- }
- acc[day] += curr.total;
- return acc;
- }, {} as { [key: string]: number });
+ .reduce(
+ (acc, curr) => {
+ const day = format(curr.date, 'YYYY-MM-DD');
+ if (!acc[day]) {
+ acc[day] = 0;
+ }
+ acc[day] += curr.total;
+ return acc;
+ },
+ {} as { [key: string]: number }
+ );
const getRevenuePerDay = (orders: Order[]): TotalByDay[] => {
const daysWithRevenue = aggregateOrdersByDay(orders);
diff --git ORI/react-admin/examples/demo/src/orders/Basket.tsx ALT/react-admin/examples/demo/src/orders/Basket.tsx
index 370a686..b7f6d6f 100644
--- ORI/react-admin/examples/demo/src/orders/Basket.tsx
+++ ALT/react-admin/examples/demo/src/orders/Basket.tsx
@@ -42,10 +42,13 @@ const Basket = (props: FieldProps<Order>) => {
] as Product
)
.filter(r => typeof r !== 'undefined')
- .reduce((prev, next) => {
- prev[next.id] = next;
- return prev;
- }, {} as { [key: string]: Product });
+ .reduce(
+ (prev, next) => {
+ prev[next.id] = next;
+ return prev;
+ },
+ {} as { [key: string]: Product }
+ );
}
);
diff --git ORI/vega-lite/src/compile/data/bin.ts ALT/vega-lite/src/compile/data/bin.ts
index 999fae5..b3ba5e6 100644
--- ORI/vega-lite/src/compile/data/bin.ts
+++ ALT/vega-lite/src/compile/data/bin.ts
@@ -110,17 +110,20 @@ export class BinNode extends DataFlowNode {
}
public static makeFromEncoding(parent: DataFlowNode, model: ModelWithField) {
- const bins = model.reduceFieldDef((binComponentIndex: Dict<BinComponent>, fieldDef, channel) => {
- if (isTypedFieldDef(fieldDef) && isBinning(fieldDef.bin)) {
- const {key, binComponent} = createBinComponent(fieldDef, fieldDef.bin, model);
- binComponentIndex[key] = {
- ...binComponent,
- ...binComponentIndex[key],
- ...rangeFormula(model, fieldDef, channel, model.config)
- };
- }
- return binComponentIndex;
- }, {} as Dict<BinComponent>);
+ const bins = model.reduceFieldDef(
+ (binComponentIndex: Dict<BinComponent>, fieldDef, channel) => {
+ if (isTypedFieldDef(fieldDef) && isBinning(fieldDef.bin)) {
+ const {key, binComponent} = createBinComponent(fieldDef, fieldDef.bin, model);
+ binComponentIndex[key] = {
+ ...binComponent,
+ ...binComponentIndex[key],
+ ...rangeFormula(model, fieldDef, channel, model.config)
+ };
+ }
+ return binComponentIndex;
+ },
+ {} as Dict<BinComponent>
+ );
if (isEmpty(bins)) {
return null;
diff --git ORI/vega-lite/src/compile/data/filterinvalid.ts ALT/vega-lite/src/compile/data/filterinvalid.ts
index e0cadf5..844bca6 100644
--- ORI/vega-lite/src/compile/data/filterinvalid.ts
+++ ALT/vega-lite/src/compile/data/filterinvalid.ts
@@ -25,20 +25,23 @@ export class FilterInvalidNode extends DataFlowNode {
return null;
}
- const filter = model.reduceFieldDef((aggregator: Dict<TypedFieldDef<string>>, fieldDef, channel) => {
- const scaleComponent = isScaleChannel(channel) && model.getScaleComponent(channel);
- if (scaleComponent) {
- const scaleType = scaleComponent.get('type');
+ const filter = model.reduceFieldDef(
+ (aggregator: Dict<TypedFieldDef<string>>, fieldDef, channel) => {
+ const scaleComponent = isScaleChannel(channel) && model.getScaleComponent(channel);
+ if (scaleComponent) {
+ const scaleType = scaleComponent.get('type');
- // While discrete domain scales can handle invalid values, continuous scales can't.
- // Thus, for non-path marks, we have to filter null for scales with continuous domains.
- // (For path marks, we will use "defined" property and skip these values instead.)
- if (hasContinuousDomain(scaleType) && fieldDef.aggregate !== 'count' && !isPathMark(mark)) {
- aggregator[fieldDef.field] = fieldDef as any; // we know that the fieldDef is a typed field def
+ // While discrete domain scales can handle invalid values, continuous scales can't.
+ // Thus, for non-path marks, we have to filter null for scales with continuous domains.
+ // (For path marks, we will use "defined" property and skip these values instead.)
+ if (hasContinuousDomain(scaleType) && fieldDef.aggregate !== 'count' && !isPathMark(mark)) {
+ aggregator[fieldDef.field] = fieldDef as any; // we know that the fieldDef is a typed field def
+ }
}
- }
- return aggregator;
- }, {} as Dict<TypedFieldDef<string>>);
+ return aggregator;
+ },
+ {} as Dict<TypedFieldDef<string>>
+ );
if (!keys(filter).length) {
return null;
diff --git ORI/vega-lite/src/compile/data/timeunit.ts ALT/vega-lite/src/compile/data/timeunit.ts
index 1fe59a4..6a79a21 100644
--- ORI/vega-lite/src/compile/data/timeunit.ts
+++ ALT/vega-lite/src/compile/data/timeunit.ts
@@ -18,25 +18,28 @@ export class TimeUnitNode extends DataFlowNode {
}
public static makeFromEncoding(parent: DataFlowNode, model: ModelWithField) {
- const formula = model.reduceFieldDef((timeUnitComponent: TimeUnitComponent, fieldDef) => {
- const {field, timeUnit} = fieldDef;
-
- if (timeUnit) {
- const as = vgField(fieldDef, {forAs: true});
- timeUnitComponent[
- hash({
+ const formula = model.reduceFieldDef(
+ (timeUnitComponent: TimeUnitComponent, fieldDef) => {
+ const {field, timeUnit} = fieldDef;
+
+ if (timeUnit) {
+ const as = vgField(fieldDef, {forAs: true});
+ timeUnitComponent[
+ hash({
+ as,
+ field,
+ timeUnit
+ })
+ ] = {
as,
field,
timeUnit
- })
- ] = {
- as,
- field,
- timeUnit
- };
- }
- return timeUnitComponent;
- }, {} as Dict<TimeUnitComponent>);
+ };
+ }
+ return timeUnitComponent;
+ },
+ {} as Dict<TimeUnitComponent>
+ );
if (isEmpty(formula)) {
return null;from prettier-regression-testing.
thorn0
commented on May 17, 2024
run #13341 VS prettier/prettier#next
from prettier-regression-testing.
github-actions
commented on May 17, 2024
prettier/prettier#13341 VS prettier/prettier@next
- babel/babel@4e0e5f9
- vuejs/eslint-plugin-vue@508ea0e
- excalidraw/excalidraw@49172ac
- prettier/prettier@e949a54
- marmelab/react-admin@5ae855a
- typescript-eslint/typescript-eslint@9d47a8b
- vega/vega-lite@16bc913
Diff (423 lines)
diff --git ORI/babel/packages/babel-cli/test/index.js ALT/babel/packages/babel-cli/test/index.js
index 1941b84c..bb21b8f2 100644
--- ORI/babel/packages/babel-cli/test/index.js
+++ ALT/babel/packages/babel-cli/test/index.js
@@ -288,9 +288,11 @@ fs.readdirSync(fixtureLoc).forEach(function (binName) {
parseInt(process.versions.node, 10) < opts.minNodeVersion;
// eslint-disable-next-line jest/valid-title
- (skip
- ? it.skip
- : it)(testName, buildTest(binName, testName, opts), 20000);
+ (skip ? it.skip : it)(
+ testName,
+ buildTest(binName, testName, opts),
+ 20000,
+ );
});
});
});
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..dd23f010 100644
--- ORI/babel/packages/babel-parser/test/helpers/to-fuzzed-options.js
+++ ALT/babel/packages/babel-parser/test/helpers/to-fuzzed-options.js
@@ -35,12 +35,12 @@ const toAdjustedSyntaxError = (adjust, error) =>
line: parseInt(line, 10),
column: parseInt(column, 10),
};
- return `(${adjust(
+ return `(${adjust(adjust, loc.line, "line", loc)}:${adjust(
adjust,
- loc.line,
- "line",
+ loc.column,
+ "column",
loc,
- )}:${adjust(adjust, loc.column, "column", loc)})`;
+ )})`;
}),
)
: error;
diff --git ORI/excalidraw/src/components/App.tsx ALT/excalidraw/src/components/App.tsx
index ae5376f..0455796 100644
--- ORI/excalidraw/src/components/App.tsx
+++ ALT/excalidraw/src/components/App.tsx
@@ -3094,10 +3094,13 @@ class App extends React.Component<AppProps, AppState> {
),
// we need to duplicate because we'll be updating this state
lastCoords: { ...origin },
- originalElements: this.scene.getElements().reduce((acc, element) => {
- acc.set(element.id, deepCopyElement(element));
- return acc;
- }, new Map() as PointerDownState["originalElements"]),
+ originalElements: this.scene.getElements().reduce(
+ (acc, element) => {
+ acc.set(element.id, deepCopyElement(element));
+ return acc;
+ },
+ new Map() as PointerDownState["originalElements"],
+ ),
resize: {
handleType: false,
isResizing: false,
diff --git ORI/excalidraw/src/element/resizeTest.ts ALT/excalidraw/src/element/resizeTest.ts
index dbdab5a..81de543 100644
--- ORI/excalidraw/src/element/resizeTest.ts
+++ ALT/excalidraw/src/element/resizeTest.ts
@@ -70,20 +70,26 @@ export const getElementWithTransformHandleType = (
zoom: Zoom,
pointerType: PointerType,
) => {
- return elements.reduce((result, element) => {
- if (result) {
- return result;
- }
- const transformHandleType = resizeTest(
- element,
- appState,
- scenePointerX,
- scenePointerY,
- zoom,
- pointerType,
- );
- return transformHandleType ? { element, transformHandleType } : null;
- }, null as { element: NonDeletedExcalidrawElement; transformHandleType: MaybeTransformHandleType } | null);
+ return elements.reduce(
+ (result, element) => {
+ if (result) {
+ return result;
+ }
+ const transformHandleType = resizeTest(
+ element,
+ appState,
+ scenePointerX,
+ scenePointerY,
+ zoom,
+ pointerType,
+ );
+ return transformHandleType ? { element, transformHandleType } : null;
+ },
+ null as {
+ element: NonDeletedExcalidrawElement;
+ transformHandleType: MaybeTransformHandleType;
+ } | null,
+ );
};
export const getTransformHandleTypeFromCoords = (
diff --git ORI/excalidraw/src/history.ts ALT/excalidraw/src/history.ts
index cc620ca..a87ce4f 100644
--- ORI/excalidraw/src/history.ts
+++ ALT/excalidraw/src/history.ts
@@ -103,35 +103,38 @@ class History {
): DehydratedHistoryEntry =>
this.dehydrateHistoryEntry({
appState: clearAppStatePropertiesForHistory(appState),
- elements: elements.reduce((elements, element) => {
- if (
- isLinearElement(element) &&
- appState.multiElement &&
- appState.multiElement.id === element.id
- ) {
- // don't store multi-point arrow if still has only one point
+ elements: elements.reduce(
+ (elements, element) => {
if (
+ isLinearElement(element) &&
appState.multiElement &&
- appState.multiElement.id === element.id &&
- element.points.length < 2
+ appState.multiElement.id === element.id
) {
- return elements;
+ // don't store multi-point arrow if still has only one point
+ if (
+ appState.multiElement &&
+ appState.multiElement.id === element.id &&
+ element.points.length < 2
+ ) {
+ return elements;
+ }
+
+ elements.push({
+ ...element,
+ // don't store last point if not committed
+ points:
+ element.lastCommittedPoint !==
+ element.points[element.points.length - 1]
+ ? element.points.slice(0, -1)
+ : element.points,
+ });
+ } else {
+ elements.push(element);
}
-
- elements.push({
- ...element,
- // don't store last point if not committed
- points:
- element.lastCommittedPoint !==
- element.points[element.points.length - 1]
- ? element.points.slice(0, -1)
- : element.points,
- });
- } else {
- elements.push(element);
- }
- return elements;
- }, [] as Mutable<typeof elements>),
+ return elements;
+ },
+ [] as Mutable<typeof elements>,
+ ),
});
shouldCreateEntry(nextEntry: HistoryEntry): boolean {
diff --git ORI/excalidraw/src/renderer/renderScene.ts ALT/excalidraw/src/renderer/renderScene.ts
index 00557ae..06d34dc 100644
--- ORI/excalidraw/src/renderer/renderScene.ts
+++ ALT/excalidraw/src/renderer/renderScene.ts
@@ -304,40 +304,50 @@ export const renderScene = (
!appState.multiElement &&
!appState.editingLinearElement
) {
- const selections = elements.reduce((acc, element) => {
- const selectionColors = [];
- // local user
- if (
- appState.selectedElementIds[element.id] &&
- !isSelectedViaGroup(appState, element)
- ) {
- selectionColors.push(oc.black);
- }
- // remote users
- if (renderConfig.remoteSelectedElementIds[element.id]) {
- selectionColors.push(
- ...renderConfig.remoteSelectedElementIds[element.id].map(
- (socketId) => {
- const { background } = getClientColors(socketId, appState);
- return background;
- },
- ),
- );
- }
- if (selectionColors.length) {
- const [elementX1, elementY1, elementX2, elementY2] =
- getElementAbsoluteCoords(element);
- acc.push({
- angle: element.angle,
- elementX1,
- elementY1,
- elementX2,
- elementY2,
- selectionColors,
- });
- }
- return acc;
- }, [] as { angle: number; elementX1: number; elementY1: number; elementX2: number; elementY2: number; selectionColors: string[] }[]);
+ const selections = elements.reduce(
+ (acc, element) => {
+ const selectionColors = [];
+ // local user
+ if (
+ appState.selectedElementIds[element.id] &&
+ !isSelectedViaGroup(appState, element)
+ ) {
+ selectionColors.push(oc.black);
+ }
+ // remote users
+ if (renderConfig.remoteSelectedElementIds[element.id]) {
+ selectionColors.push(
+ ...renderConfig.remoteSelectedElementIds[element.id].map(
+ (socketId) => {
+ const { background } = getClientColors(socketId, appState);
+ return background;
+ },
+ ),
+ );
+ }
+ if (selectionColors.length) {
+ const [elementX1, elementY1, elementX2, elementY2] =
+ getElementAbsoluteCoords(element);
+ acc.push({
+ angle: element.angle,
+ elementX1,
+ elementY1,
+ elementX2,
+ elementY2,
+ selectionColors,
+ });
+ }
+ return acc;
+ },
+ [] as {
+ angle: number;
+ elementX1: number;
+ elementY1: number;
+ elementX2: number;
+ elementY2: number;
+ selectionColors: string[];
+ }[],
+ );
const addSelectionForGroupId = (groupId: GroupId) => {
const groupElements = getElementsInGroup(elements, groupId);
diff --git ORI/excalidraw/src/tests/helpers/api.ts ALT/excalidraw/src/tests/helpers/api.ts
index 25196e0..b61fb4b 100644
--- ORI/excalidraw/src/tests/helpers/api.ts
+++ ALT/excalidraw/src/tests/helpers/api.ts
@@ -22,10 +22,13 @@ const { h } = window;
export class API {
static setSelectedElements = (elements: ExcalidrawElement[]) => {
h.setState({
- selectedElementIds: elements.reduce((acc, element) => {
- acc[element.id] = true;
- return acc;
- }, {} as Record<ExcalidrawElement["id"], true>),
+ selectedElementIds: elements.reduce(
+ (acc, element) => {
+ acc[element.id] = true;
+ return acc;
+ },
+ {} as Record<ExcalidrawElement["id"], true>,
+ ),
});
};
diff --git ORI/excalidraw/src/zindex.ts ALT/excalidraw/src/zindex.ts
index 4b96c8e..ac9dcbe 100644
--- ORI/excalidraw/src/zindex.ts
+++ ALT/excalidraw/src/zindex.ts
@@ -172,11 +172,14 @@ const getTargetElementsMap = (
elements: readonly ExcalidrawElement[],
indices: number[],
) => {
- return indices.reduce((acc, index) => {
- const element = elements[index];
- acc[element.id] = element;
- return acc;
- }, {} as Record<string, ExcalidrawElement>);
+ return indices.reduce(
+ (acc, index) => {
+ const element = elements[index];
+ acc[element.id] = element;
+ return acc;
+ },
+ {} as Record<string, ExcalidrawElement>,
+ );
};
const shiftElements = (
diff --git ORI/prettier/src/common/ast-path.js ALT/prettier/src/common/ast-path.js
index ade4952..622b159 100644
--- ORI/prettier/src/common/ast-path.js
+++ ALT/prettier/src/common/ast-path.js
@@ -104,9 +104,12 @@ class AstPath {
// the end of the iteration.
map(callback, ...names) {
const result = [];
- this.each((path, index, value) => {
- result[index] = callback(path, index, value);
- }, ...names);
+ this.each(
+ (path, index, value) => {
+ result[index] = callback(path, index, value);
+ },
+ ...names,
+ );
return result;
}
diff --git ORI/react-admin/examples/demo/src/dashboard/OrderChart.tsx ALT/react-admin/examples/demo/src/dashboard/OrderChart.tsx
index 3a58fd3..7543ba2 100644
--- ORI/react-admin/examples/demo/src/dashboard/OrderChart.tsx
+++ ALT/react-admin/examples/demo/src/dashboard/OrderChart.tsx
@@ -24,14 +24,17 @@ const dateFormatter = (date: number): string =>
const aggregateOrdersByDay = (orders: Order[]): { [key: string]: number } =>
orders
.filter((order: Order) => order.status !== 'cancelled')
- .reduce((acc, curr) => {
- const day = format(curr.date, 'YYYY-MM-DD');
- if (!acc[day]) {
- acc[day] = 0;
- }
- acc[day] += curr.total;
- return acc;
- }, {} as { [key: string]: number });
+ .reduce(
+ (acc, curr) => {
+ const day = format(curr.date, 'YYYY-MM-DD');
+ if (!acc[day]) {
+ acc[day] = 0;
+ }
+ acc[day] += curr.total;
+ return acc;
+ },
+ {} as { [key: string]: number }
+ );
const getRevenuePerDay = (orders: Order[]): TotalByDay[] => {
const daysWithRevenue = aggregateOrdersByDay(orders);
diff --git ORI/react-admin/examples/demo/src/orders/Basket.tsx ALT/react-admin/examples/demo/src/orders/Basket.tsx
index 370a686..b7f6d6f 100644
--- ORI/react-admin/examples/demo/src/orders/Basket.tsx
+++ ALT/react-admin/examples/demo/src/orders/Basket.tsx
@@ -42,10 +42,13 @@ const Basket = (props: FieldProps<Order>) => {
] as Product
)
.filter(r => typeof r !== 'undefined')
- .reduce((prev, next) => {
- prev[next.id] = next;
- return prev;
- }, {} as { [key: string]: Product });
+ .reduce(
+ (prev, next) => {
+ prev[next.id] = next;
+ return prev;
+ },
+ {} as { [key: string]: Product }
+ );
}
);
diff --git ORI/vega-lite/src/compile/data/filterinvalid.ts ALT/vega-lite/src/compile/data/filterinvalid.ts
index e0cadf5..844bca6 100644
--- ORI/vega-lite/src/compile/data/filterinvalid.ts
+++ ALT/vega-lite/src/compile/data/filterinvalid.ts
@@ -25,20 +25,23 @@ export class FilterInvalidNode extends DataFlowNode {
return null;
}
- const filter = model.reduceFieldDef((aggregator: Dict<TypedFieldDef<string>>, fieldDef, channel) => {
- const scaleComponent = isScaleChannel(channel) && model.getScaleComponent(channel);
- if (scaleComponent) {
- const scaleType = scaleComponent.get('type');
+ const filter = model.reduceFieldDef(
+ (aggregator: Dict<TypedFieldDef<string>>, fieldDef, channel) => {
+ const scaleComponent = isScaleChannel(channel) && model.getScaleComponent(channel);
+ if (scaleComponent) {
+ const scaleType = scaleComponent.get('type');
- // While discrete domain scales can handle invalid values, continuous scales can't.
- // Thus, for non-path marks, we have to filter null for scales with continuous domains.
- // (For path marks, we will use "defined" property and skip these values instead.)
- if (hasContinuousDomain(scaleType) && fieldDef.aggregate !== 'count' && !isPathMark(mark)) {
- aggregator[fieldDef.field] = fieldDef as any; // we know that the fieldDef is a typed field def
+ // While discrete domain scales can handle invalid values, continuous scales can't.
+ // Thus, for non-path marks, we have to filter null for scales with continuous domains.
+ // (For path marks, we will use "defined" property and skip these values instead.)
+ if (hasContinuousDomain(scaleType) && fieldDef.aggregate !== 'count' && !isPathMark(mark)) {
+ aggregator[fieldDef.field] = fieldDef as any; // we know that the fieldDef is a typed field def
+ }
}
- }
- return aggregator;
- }, {} as Dict<TypedFieldDef<string>>);
+ return aggregator;
+ },
+ {} as Dict<TypedFieldDef<string>>
+ );
if (!keys(filter).length) {
return null;from prettier-regression-testing.
thorn0
commented on May 17, 2024
run #13359 vs prettier/prettier#next
from prettier-regression-testing.
github-actions
commented on May 17, 2024
prettier/prettier#13359 VS prettier/prettier@next
- babel/babel@4e0e5f9
- vuejs/eslint-plugin-vue@508ea0e
- excalidraw/excalidraw@49172ac
- prettier/prettier@e949a54
- marmelab/react-admin@5ae855a
- typescript-eslint/typescript-eslint@9d47a8b
- vega/vega-lite@16bc913
The diff is empty.
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run #13341 VS prettier/prettier#next
from prettier-regression-testing.
github-actions
commented on May 17, 2024
prettier/prettier#13341 VS prettier/prettier@next
- babel/babel@4e0e5f9
- vuejs/eslint-plugin-vue@508ea0e
- excalidraw/excalidraw@49172ac
- prettier/prettier@e949a54
- marmelab/react-admin@5ae855a
- typescript-eslint/typescript-eslint@9d47a8b
- vega/vega-lite@16bc913
Diff (423 lines)
diff --git ORI/babel/packages/babel-cli/test/index.js ALT/babel/packages/babel-cli/test/index.js
index 1941b84c..bb21b8f2 100644
--- ORI/babel/packages/babel-cli/test/index.js
+++ ALT/babel/packages/babel-cli/test/index.js
@@ -288,9 +288,11 @@ fs.readdirSync(fixtureLoc).forEach(function (binName) {
parseInt(process.versions.node, 10) < opts.minNodeVersion;
// eslint-disable-next-line jest/valid-title
- (skip
- ? it.skip
- : it)(testName, buildTest(binName, testName, opts), 20000);
+ (skip ? it.skip : it)(
+ testName,
+ buildTest(binName, testName, opts),
+ 20000,
+ );
});
});
});
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..dd23f010 100644
--- ORI/babel/packages/babel-parser/test/helpers/to-fuzzed-options.js
+++ ALT/babel/packages/babel-parser/test/helpers/to-fuzzed-options.js
@@ -35,12 +35,12 @@ const toAdjustedSyntaxError = (adjust, error) =>
line: parseInt(line, 10),
column: parseInt(column, 10),
};
- return `(${adjust(
+ return `(${adjust(adjust, loc.line, "line", loc)}:${adjust(
adjust,
- loc.line,
- "line",
+ loc.column,
+ "column",
loc,
- )}:${adjust(adjust, loc.column, "column", loc)})`;
+ )})`;
}),
)
: error;
diff --git ORI/excalidraw/src/components/App.tsx ALT/excalidraw/src/components/App.tsx
index ae5376f..0455796 100644
--- ORI/excalidraw/src/components/App.tsx
+++ ALT/excalidraw/src/components/App.tsx
@@ -3094,10 +3094,13 @@ class App extends React.Component<AppProps, AppState> {
),
// we need to duplicate because we'll be updating this state
lastCoords: { ...origin },
- originalElements: this.scene.getElements().reduce((acc, element) => {
- acc.set(element.id, deepCopyElement(element));
- return acc;
- }, new Map() as PointerDownState["originalElements"]),
+ originalElements: this.scene.getElements().reduce(
+ (acc, element) => {
+ acc.set(element.id, deepCopyElement(element));
+ return acc;
+ },
+ new Map() as PointerDownState["originalElements"],
+ ),
resize: {
handleType: false,
isResizing: false,
diff --git ORI/excalidraw/src/element/resizeTest.ts ALT/excalidraw/src/element/resizeTest.ts
index dbdab5a..81de543 100644
--- ORI/excalidraw/src/element/resizeTest.ts
+++ ALT/excalidraw/src/element/resizeTest.ts
@@ -70,20 +70,26 @@ export const getElementWithTransformHandleType = (
zoom: Zoom,
pointerType: PointerType,
) => {
- return elements.reduce((result, element) => {
- if (result) {
- return result;
- }
- const transformHandleType = resizeTest(
- element,
- appState,
- scenePointerX,
- scenePointerY,
- zoom,
- pointerType,
- );
- return transformHandleType ? { element, transformHandleType } : null;
- }, null as { element: NonDeletedExcalidrawElement; transformHandleType: MaybeTransformHandleType } | null);
+ return elements.reduce(
+ (result, element) => {
+ if (result) {
+ return result;
+ }
+ const transformHandleType = resizeTest(
+ element,
+ appState,
+ scenePointerX,
+ scenePointerY,
+ zoom,
+ pointerType,
+ );
+ return transformHandleType ? { element, transformHandleType } : null;
+ },
+ null as {
+ element: NonDeletedExcalidrawElement;
+ transformHandleType: MaybeTransformHandleType;
+ } | null,
+ );
};
export const getTransformHandleTypeFromCoords = (
diff --git ORI/excalidraw/src/history.ts ALT/excalidraw/src/history.ts
index cc620ca..a87ce4f 100644
--- ORI/excalidraw/src/history.ts
+++ ALT/excalidraw/src/history.ts
@@ -103,35 +103,38 @@ class History {
): DehydratedHistoryEntry =>
this.dehydrateHistoryEntry({
appState: clearAppStatePropertiesForHistory(appState),
- elements: elements.reduce((elements, element) => {
- if (
- isLinearElement(element) &&
- appState.multiElement &&
- appState.multiElement.id === element.id
- ) {
- // don't store multi-point arrow if still has only one point
+ elements: elements.reduce(
+ (elements, element) => {
if (
+ isLinearElement(element) &&
appState.multiElement &&
- appState.multiElement.id === element.id &&
- element.points.length < 2
+ appState.multiElement.id === element.id
) {
- return elements;
+ // don't store multi-point arrow if still has only one point
+ if (
+ appState.multiElement &&
+ appState.multiElement.id === element.id &&
+ element.points.length < 2
+ ) {
+ return elements;
+ }
+
+ elements.push({
+ ...element,
+ // don't store last point if not committed
+ points:
+ element.lastCommittedPoint !==
+ element.points[element.points.length - 1]
+ ? element.points.slice(0, -1)
+ : element.points,
+ });
+ } else {
+ elements.push(element);
}
-
- elements.push({
- ...element,
- // don't store last point if not committed
- points:
- element.lastCommittedPoint !==
- element.points[element.points.length - 1]
- ? element.points.slice(0, -1)
- : element.points,
- });
- } else {
- elements.push(element);
- }
- return elements;
- }, [] as Mutable<typeof elements>),
+ return elements;
+ },
+ [] as Mutable<typeof elements>,
+ ),
});
shouldCreateEntry(nextEntry: HistoryEntry): boolean {
diff --git ORI/excalidraw/src/renderer/renderScene.ts ALT/excalidraw/src/renderer/renderScene.ts
index 00557ae..06d34dc 100644
--- ORI/excalidraw/src/renderer/renderScene.ts
+++ ALT/excalidraw/src/renderer/renderScene.ts
@@ -304,40 +304,50 @@ export const renderScene = (
!appState.multiElement &&
!appState.editingLinearElement
) {
- const selections = elements.reduce((acc, element) => {
- const selectionColors = [];
- // local user
- if (
- appState.selectedElementIds[element.id] &&
- !isSelectedViaGroup(appState, element)
- ) {
- selectionColors.push(oc.black);
- }
- // remote users
- if (renderConfig.remoteSelectedElementIds[element.id]) {
- selectionColors.push(
- ...renderConfig.remoteSelectedElementIds[element.id].map(
- (socketId) => {
- const { background } = getClientColors(socketId, appState);
- return background;
- },
- ),
- );
- }
- if (selectionColors.length) {
- const [elementX1, elementY1, elementX2, elementY2] =
- getElementAbsoluteCoords(element);
- acc.push({
- angle: element.angle,
- elementX1,
- elementY1,
- elementX2,
- elementY2,
- selectionColors,
- });
- }
- return acc;
- }, [] as { angle: number; elementX1: number; elementY1: number; elementX2: number; elementY2: number; selectionColors: string[] }[]);
+ const selections = elements.reduce(
+ (acc, element) => {
+ const selectionColors = [];
+ // local user
+ if (
+ appState.selectedElementIds[element.id] &&
+ !isSelectedViaGroup(appState, element)
+ ) {
+ selectionColors.push(oc.black);
+ }
+ // remote users
+ if (renderConfig.remoteSelectedElementIds[element.id]) {
+ selectionColors.push(
+ ...renderConfig.remoteSelectedElementIds[element.id].map(
+ (socketId) => {
+ const { background } = getClientColors(socketId, appState);
+ return background;
+ },
+ ),
+ );
+ }
+ if (selectionColors.length) {
+ const [elementX1, elementY1, elementX2, elementY2] =
+ getElementAbsoluteCoords(element);
+ acc.push({
+ angle: element.angle,
+ elementX1,
+ elementY1,
+ elementX2,
+ elementY2,
+ selectionColors,
+ });
+ }
+ return acc;
+ },
+ [] as {
+ angle: number;
+ elementX1: number;
+ elementY1: number;
+ elementX2: number;
+ elementY2: number;
+ selectionColors: string[];
+ }[],
+ );
const addSelectionForGroupId = (groupId: GroupId) => {
const groupElements = getElementsInGroup(elements, groupId);
diff --git ORI/excalidraw/src/tests/helpers/api.ts ALT/excalidraw/src/tests/helpers/api.ts
index 25196e0..b61fb4b 100644
--- ORI/excalidraw/src/tests/helpers/api.ts
+++ ALT/excalidraw/src/tests/helpers/api.ts
@@ -22,10 +22,13 @@ const { h } = window;
export class API {
static setSelectedElements = (elements: ExcalidrawElement[]) => {
h.setState({
- selectedElementIds: elements.reduce((acc, element) => {
- acc[element.id] = true;
- return acc;
- }, {} as Record<ExcalidrawElement["id"], true>),
+ selectedElementIds: elements.reduce(
+ (acc, element) => {
+ acc[element.id] = true;
+ return acc;
+ },
+ {} as Record<ExcalidrawElement["id"], true>,
+ ),
});
};
diff --git ORI/excalidraw/src/zindex.ts ALT/excalidraw/src/zindex.ts
index 4b96c8e..ac9dcbe 100644
--- ORI/excalidraw/src/zindex.ts
+++ ALT/excalidraw/src/zindex.ts
@@ -172,11 +172,14 @@ const getTargetElementsMap = (
elements: readonly ExcalidrawElement[],
indices: number[],
) => {
- return indices.reduce((acc, index) => {
- const element = elements[index];
- acc[element.id] = element;
- return acc;
- }, {} as Record<string, ExcalidrawElement>);
+ return indices.reduce(
+ (acc, index) => {
+ const element = elements[index];
+ acc[element.id] = element;
+ return acc;
+ },
+ {} as Record<string, ExcalidrawElement>,
+ );
};
const shiftElements = (
diff --git ORI/prettier/src/common/ast-path.js ALT/prettier/src/common/ast-path.js
index ade4952..622b159 100644
--- ORI/prettier/src/common/ast-path.js
+++ ALT/prettier/src/common/ast-path.js
@@ -104,9 +104,12 @@ class AstPath {
// the end of the iteration.
map(callback, ...names) {
const result = [];
- this.each((path, index, value) => {
- result[index] = callback(path, index, value);
- }, ...names);
+ this.each(
+ (path, index, value) => {
+ result[index] = callback(path, index, value);
+ },
+ ...names,
+ );
return result;
}
diff --git ORI/react-admin/examples/demo/src/dashboard/OrderChart.tsx ALT/react-admin/examples/demo/src/dashboard/OrderChart.tsx
index 3a58fd3..7543ba2 100644
--- ORI/react-admin/examples/demo/src/dashboard/OrderChart.tsx
+++ ALT/react-admin/examples/demo/src/dashboard/OrderChart.tsx
@@ -24,14 +24,17 @@ const dateFormatter = (date: number): string =>
const aggregateOrdersByDay = (orders: Order[]): { [key: string]: number } =>
orders
.filter((order: Order) => order.status !== 'cancelled')
- .reduce((acc, curr) => {
- const day = format(curr.date, 'YYYY-MM-DD');
- if (!acc[day]) {
- acc[day] = 0;
- }
- acc[day] += curr.total;
- return acc;
- }, {} as { [key: string]: number });
+ .reduce(
+ (acc, curr) => {
+ const day = format(curr.date, 'YYYY-MM-DD');
+ if (!acc[day]) {
+ acc[day] = 0;
+ }
+ acc[day] += curr.total;
+ return acc;
+ },
+ {} as { [key: string]: number }
+ );
const getRevenuePerDay = (orders: Order[]): TotalByDay[] => {
const daysWithRevenue = aggregateOrdersByDay(orders);
diff --git ORI/react-admin/examples/demo/src/orders/Basket.tsx ALT/react-admin/examples/demo/src/orders/Basket.tsx
index 370a686..b7f6d6f 100644
--- ORI/react-admin/examples/demo/src/orders/Basket.tsx
+++ ALT/react-admin/examples/demo/src/orders/Basket.tsx
@@ -42,10 +42,13 @@ const Basket = (props: FieldProps<Order>) => {
] as Product
)
.filter(r => typeof r !== 'undefined')
- .reduce((prev, next) => {
- prev[next.id] = next;
- return prev;
- }, {} as { [key: string]: Product });
+ .reduce(
+ (prev, next) => {
+ prev[next.id] = next;
+ return prev;
+ },
+ {} as { [key: string]: Product }
+ );
}
);
diff --git ORI/vega-lite/src/compile/data/filterinvalid.ts ALT/vega-lite/src/compile/data/filterinvalid.ts
index e0cadf5..844bca6 100644
--- ORI/vega-lite/src/compile/data/filterinvalid.ts
+++ ALT/vega-lite/src/compile/data/filterinvalid.ts
@@ -25,20 +25,23 @@ export class FilterInvalidNode extends DataFlowNode {
return null;
}
- const filter = model.reduceFieldDef((aggregator: Dict<TypedFieldDef<string>>, fieldDef, channel) => {
- const scaleComponent = isScaleChannel(channel) && model.getScaleComponent(channel);
- if (scaleComponent) {
- const scaleType = scaleComponent.get('type');
+ const filter = model.reduceFieldDef(
+ (aggregator: Dict<TypedFieldDef<string>>, fieldDef, channel) => {
+ const scaleComponent = isScaleChannel(channel) && model.getScaleComponent(channel);
+ if (scaleComponent) {
+ const scaleType = scaleComponent.get('type');
- // While discrete domain scales can handle invalid values, continuous scales can't.
- // Thus, for non-path marks, we have to filter null for scales with continuous domains.
- // (For path marks, we will use "defined" property and skip these values instead.)
- if (hasContinuousDomain(scaleType) && fieldDef.aggregate !== 'count' && !isPathMark(mark)) {
- aggregator[fieldDef.field] = fieldDef as any; // we know that the fieldDef is a typed field def
+ // While discrete domain scales can handle invalid values, continuous scales can't.
+ // Thus, for non-path marks, we have to filter null for scales with continuous domains.
+ // (For path marks, we will use "defined" property and skip these values instead.)
+ if (hasContinuousDomain(scaleType) && fieldDef.aggregate !== 'count' && !isPathMark(mark)) {
+ aggregator[fieldDef.field] = fieldDef as any; // we know that the fieldDef is a typed field def
+ }
}
- }
- return aggregator;
- }, {} as Dict<TypedFieldDef<string>>);
+ return aggregator;
+ },
+ {} as Dict<TypedFieldDef<string>>
+ );
if (!keys(filter).length) {
return null;from prettier-regression-testing.
thorn0
commented on May 17, 2024
run #13341 VS thorn0/prettier#6369b4020f5ee8
from prettier-regression-testing.
github-actions
commented on May 17, 2024
prettier/prettier#13341 VS thorn0/prettier@6369b4020f5ee8
- babel/babel@4e0e5f9
- vuejs/eslint-plugin-vue@508ea0e
- excalidraw/excalidraw@49172ac
- prettier/prettier@e949a54
- marmelab/react-admin@5ae855a
- typescript-eslint/typescript-eslint@9d47a8b
- vega/vega-lite@16bc913
Diff (423 lines)
diff --git ORI/babel/packages/babel-cli/test/index.js ALT/babel/packages/babel-cli/test/index.js
index 1941b84c..bb21b8f2 100644
--- ORI/babel/packages/babel-cli/test/index.js
+++ ALT/babel/packages/babel-cli/test/index.js
@@ -288,9 +288,11 @@ fs.readdirSync(fixtureLoc).forEach(function (binName) {
parseInt(process.versions.node, 10) < opts.minNodeVersion;
// eslint-disable-next-line jest/valid-title
- (skip
- ? it.skip
- : it)(testName, buildTest(binName, testName, opts), 20000);
+ (skip ? it.skip : it)(
+ testName,
+ buildTest(binName, testName, opts),
+ 20000,
+ );
});
});
});
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..dd23f010 100644
--- ORI/babel/packages/babel-parser/test/helpers/to-fuzzed-options.js
+++ ALT/babel/packages/babel-parser/test/helpers/to-fuzzed-options.js
@@ -35,12 +35,12 @@ const toAdjustedSyntaxError = (adjust, error) =>
line: parseInt(line, 10),
column: parseInt(column, 10),
};
- return `(${adjust(
+ return `(${adjust(adjust, loc.line, "line", loc)}:${adjust(
adjust,
- loc.line,
- "line",
+ loc.column,
+ "column",
loc,
- )}:${adjust(adjust, loc.column, "column", loc)})`;
+ )})`;
}),
)
: error;
diff --git ORI/excalidraw/src/components/App.tsx ALT/excalidraw/src/components/App.tsx
index ae5376f..0455796 100644
--- ORI/excalidraw/src/components/App.tsx
+++ ALT/excalidraw/src/components/App.tsx
@@ -3094,10 +3094,13 @@ class App extends React.Component<AppProps, AppState> {
),
// we need to duplicate because we'll be updating this state
lastCoords: { ...origin },
- originalElements: this.scene.getElements().reduce((acc, element) => {
- acc.set(element.id, deepCopyElement(element));
- return acc;
- }, new Map() as PointerDownState["originalElements"]),
+ originalElements: this.scene.getElements().reduce(
+ (acc, element) => {
+ acc.set(element.id, deepCopyElement(element));
+ return acc;
+ },
+ new Map() as PointerDownState["originalElements"],
+ ),
resize: {
handleType: false,
isResizing: false,
diff --git ORI/excalidraw/src/element/resizeTest.ts ALT/excalidraw/src/element/resizeTest.ts
index dbdab5a..81de543 100644
--- ORI/excalidraw/src/element/resizeTest.ts
+++ ALT/excalidraw/src/element/resizeTest.ts
@@ -70,20 +70,26 @@ export const getElementWithTransformHandleType = (
zoom: Zoom,
pointerType: PointerType,
) => {
- return elements.reduce((result, element) => {
- if (result) {
- return result;
- }
- const transformHandleType = resizeTest(
- element,
- appState,
- scenePointerX,
- scenePointerY,
- zoom,
- pointerType,
- );
- return transformHandleType ? { element, transformHandleType } : null;
- }, null as { element: NonDeletedExcalidrawElement; transformHandleType: MaybeTransformHandleType } | null);
+ return elements.reduce(
+ (result, element) => {
+ if (result) {
+ return result;
+ }
+ const transformHandleType = resizeTest(
+ element,
+ appState,
+ scenePointerX,
+ scenePointerY,
+ zoom,
+ pointerType,
+ );
+ return transformHandleType ? { element, transformHandleType } : null;
+ },
+ null as {
+ element: NonDeletedExcalidrawElement;
+ transformHandleType: MaybeTransformHandleType;
+ } | null,
+ );
};
export const getTransformHandleTypeFromCoords = (
diff --git ORI/excalidraw/src/history.ts ALT/excalidraw/src/history.ts
index cc620ca..a87ce4f 100644
--- ORI/excalidraw/src/history.ts
+++ ALT/excalidraw/src/history.ts
@@ -103,35 +103,38 @@ class History {
): DehydratedHistoryEntry =>
this.dehydrateHistoryEntry({
appState: clearAppStatePropertiesForHistory(appState),
- elements: elements.reduce((elements, element) => {
- if (
- isLinearElement(element) &&
- appState.multiElement &&
- appState.multiElement.id === element.id
- ) {
- // don't store multi-point arrow if still has only one point
+ elements: elements.reduce(
+ (elements, element) => {
if (
+ isLinearElement(element) &&
appState.multiElement &&
- appState.multiElement.id === element.id &&
- element.points.length < 2
+ appState.multiElement.id === element.id
) {
- return elements;
+ // don't store multi-point arrow if still has only one point
+ if (
+ appState.multiElement &&
+ appState.multiElement.id === element.id &&
+ element.points.length < 2
+ ) {
+ return elements;
+ }
+
+ elements.push({
+ ...element,
+ // don't store last point if not committed
+ points:
+ element.lastCommittedPoint !==
+ element.points[element.points.length - 1]
+ ? element.points.slice(0, -1)
+ : element.points,
+ });
+ } else {
+ elements.push(element);
}
-
- elements.push({
- ...element,
- // don't store last point if not committed
- points:
- element.lastCommittedPoint !==
- element.points[element.points.length - 1]
- ? element.points.slice(0, -1)
- : element.points,
- });
- } else {
- elements.push(element);
- }
- return elements;
- }, [] as Mutable<typeof elements>),
+ return elements;
+ },
+ [] as Mutable<typeof elements>,
+ ),
});
shouldCreateEntry(nextEntry: HistoryEntry): boolean {
diff --git ORI/excalidraw/src/renderer/renderScene.ts ALT/excalidraw/src/renderer/renderScene.ts
index 00557ae..06d34dc 100644
--- ORI/excalidraw/src/renderer/renderScene.ts
+++ ALT/excalidraw/src/renderer/renderScene.ts
@@ -304,40 +304,50 @@ export const renderScene = (
!appState.multiElement &&
!appState.editingLinearElement
) {
- const selections = elements.reduce((acc, element) => {
- const selectionColors = [];
- // local user
- if (
- appState.selectedElementIds[element.id] &&
- !isSelectedViaGroup(appState, element)
- ) {
- selectionColors.push(oc.black);
- }
- // remote users
- if (renderConfig.remoteSelectedElementIds[element.id]) {
- selectionColors.push(
- ...renderConfig.remoteSelectedElementIds[element.id].map(
- (socketId) => {
- const { background } = getClientColors(socketId, appState);
- return background;
- },
- ),
- );
- }
- if (selectionColors.length) {
- const [elementX1, elementY1, elementX2, elementY2] =
- getElementAbsoluteCoords(element);
- acc.push({
- angle: element.angle,
- elementX1,
- elementY1,
- elementX2,
- elementY2,
- selectionColors,
- });
- }
- return acc;
- }, [] as { angle: number; elementX1: number; elementY1: number; elementX2: number; elementY2: number; selectionColors: string[] }[]);
+ const selections = elements.reduce(
+ (acc, element) => {
+ const selectionColors = [];
+ // local user
+ if (
+ appState.selectedElementIds[element.id] &&
+ !isSelectedViaGroup(appState, element)
+ ) {
+ selectionColors.push(oc.black);
+ }
+ // remote users
+ if (renderConfig.remoteSelectedElementIds[element.id]) {
+ selectionColors.push(
+ ...renderConfig.remoteSelectedElementIds[element.id].map(
+ (socketId) => {
+ const { background } = getClientColors(socketId, appState);
+ return background;
+ },
+ ),
+ );
+ }
+ if (selectionColors.length) {
+ const [elementX1, elementY1, elementX2, elementY2] =
+ getElementAbsoluteCoords(element);
+ acc.push({
+ angle: element.angle,
+ elementX1,
+ elementY1,
+ elementX2,
+ elementY2,
+ selectionColors,
+ });
+ }
+ return acc;
+ },
+ [] as {
+ angle: number;
+ elementX1: number;
+ elementY1: number;
+ elementX2: number;
+ elementY2: number;
+ selectionColors: string[];
+ }[],
+ );
const addSelectionForGroupId = (groupId: GroupId) => {
const groupElements = getElementsInGroup(elements, groupId);
diff --git ORI/excalidraw/src/tests/helpers/api.ts ALT/excalidraw/src/tests/helpers/api.ts
index 25196e0..b61fb4b 100644
--- ORI/excalidraw/src/tests/helpers/api.ts
+++ ALT/excalidraw/src/tests/helpers/api.ts
@@ -22,10 +22,13 @@ const { h } = window;
export class API {
static setSelectedElements = (elements: ExcalidrawElement[]) => {
h.setState({
- selectedElementIds: elements.reduce((acc, element) => {
- acc[element.id] = true;
- return acc;
- }, {} as Record<ExcalidrawElement["id"], true>),
+ selectedElementIds: elements.reduce(
+ (acc, element) => {
+ acc[element.id] = true;
+ return acc;
+ },
+ {} as Record<ExcalidrawElement["id"], true>,
+ ),
});
};
diff --git ORI/excalidraw/src/zindex.ts ALT/excalidraw/src/zindex.ts
index 4b96c8e..ac9dcbe 100644
--- ORI/excalidraw/src/zindex.ts
+++ ALT/excalidraw/src/zindex.ts
@@ -172,11 +172,14 @@ const getTargetElementsMap = (
elements: readonly ExcalidrawElement[],
indices: number[],
) => {
- return indices.reduce((acc, index) => {
- const element = elements[index];
- acc[element.id] = element;
- return acc;
- }, {} as Record<string, ExcalidrawElement>);
+ return indices.reduce(
+ (acc, index) => {
+ const element = elements[index];
+ acc[element.id] = element;
+ return acc;
+ },
+ {} as Record<string, ExcalidrawElement>,
+ );
};
const shiftElements = (
diff --git ORI/prettier/src/common/ast-path.js ALT/prettier/src/common/ast-path.js
index ade4952..622b159 100644
--- ORI/prettier/src/common/ast-path.js
+++ ALT/prettier/src/common/ast-path.js
@@ -104,9 +104,12 @@ class AstPath {
// the end of the iteration.
map(callback, ...names) {
const result = [];
- this.each((path, index, value) => {
- result[index] = callback(path, index, value);
- }, ...names);
+ this.each(
+ (path, index, value) => {
+ result[index] = callback(path, index, value);
+ },
+ ...names,
+ );
return result;
}
diff --git ORI/react-admin/examples/demo/src/dashboard/OrderChart.tsx ALT/react-admin/examples/demo/src/dashboard/OrderChart.tsx
index 3a58fd3..7543ba2 100644
--- ORI/react-admin/examples/demo/src/dashboard/OrderChart.tsx
+++ ALT/react-admin/examples/demo/src/dashboard/OrderChart.tsx
@@ -24,14 +24,17 @@ const dateFormatter = (date: number): string =>
const aggregateOrdersByDay = (orders: Order[]): { [key: string]: number } =>
orders
.filter((order: Order) => order.status !== 'cancelled')
- .reduce((acc, curr) => {
- const day = format(curr.date, 'YYYY-MM-DD');
- if (!acc[day]) {
- acc[day] = 0;
- }
- acc[day] += curr.total;
- return acc;
- }, {} as { [key: string]: number });
+ .reduce(
+ (acc, curr) => {
+ const day = format(curr.date, 'YYYY-MM-DD');
+ if (!acc[day]) {
+ acc[day] = 0;
+ }
+ acc[day] += curr.total;
+ return acc;
+ },
+ {} as { [key: string]: number }
+ );
const getRevenuePerDay = (orders: Order[]): TotalByDay[] => {
const daysWithRevenue = aggregateOrdersByDay(orders);
diff --git ORI/react-admin/examples/demo/src/orders/Basket.tsx ALT/react-admin/examples/demo/src/orders/Basket.tsx
index 370a686..b7f6d6f 100644
--- ORI/react-admin/examples/demo/src/orders/Basket.tsx
+++ ALT/react-admin/examples/demo/src/orders/Basket.tsx
@@ -42,10 +42,13 @@ const Basket = (props: FieldProps<Order>) => {
] as Product
)
.filter(r => typeof r !== 'undefined')
- .reduce((prev, next) => {
- prev[next.id] = next;
- return prev;
- }, {} as { [key: string]: Product });
+ .reduce(
+ (prev, next) => {
+ prev[next.id] = next;
+ return prev;
+ },
+ {} as { [key: string]: Product }
+ );
}
);
diff --git ORI/vega-lite/src/compile/data/filterinvalid.ts ALT/vega-lite/src/compile/data/filterinvalid.ts
index e0cadf5..844bca6 100644
--- ORI/vega-lite/src/compile/data/filterinvalid.ts
+++ ALT/vega-lite/src/compile/data/filterinvalid.ts
@@ -25,20 +25,23 @@ export class FilterInvalidNode extends DataFlowNode {
return null;
}
- const filter = model.reduceFieldDef((aggregator: Dict<TypedFieldDef<string>>, fieldDef, channel) => {
- const scaleComponent = isScaleChannel(channel) && model.getScaleComponent(channel);
- if (scaleComponent) {
- const scaleType = scaleComponent.get('type');
+ const filter = model.reduceFieldDef(
+ (aggregator: Dict<TypedFieldDef<string>>, fieldDef, channel) => {
+ const scaleComponent = isScaleChannel(channel) && model.getScaleComponent(channel);
+ if (scaleComponent) {
+ const scaleType = scaleComponent.get('type');
- // While discrete domain scales can handle invalid values, continuous scales can't.
- // Thus, for non-path marks, we have to filter null for scales with continuous domains.
- // (For path marks, we will use "defined" property and skip these values instead.)
- if (hasContinuousDomain(scaleType) && fieldDef.aggregate !== 'count' && !isPathMark(mark)) {
- aggregator[fieldDef.field] = fieldDef as any; // we know that the fieldDef is a typed field def
+ // While discrete domain scales can handle invalid values, continuous scales can't.
+ // Thus, for non-path marks, we have to filter null for scales with continuous domains.
+ // (For path marks, we will use "defined" property and skip these values instead.)
+ if (hasContinuousDomain(scaleType) && fieldDef.aggregate !== 'count' && !isPathMark(mark)) {
+ aggregator[fieldDef.field] = fieldDef as any; // we know that the fieldDef is a typed field def
+ }
}
- }
- return aggregator;
- }, {} as Dict<TypedFieldDef<string>>);
+ return aggregator;
+ },
+ {} as Dict<TypedFieldDef<string>>
+ );
if (!keys(filter).length) {
return null;from prettier-regression-testing.
thorn0
commented on May 17, 2024
run thorn0/prettier#6369b4020f5ee8 VS prettier/prettier#next
from prettier-regression-testing.
github-actions
commented on May 17, 2024
thorn0/prettier@6369b4020f5ee8 VS prettier/prettier@next
- babel/babel@4e0e5f9
- vuejs/eslint-plugin-vue@508ea0e
- excalidraw/excalidraw@49172ac
- prettier/prettier@e949a54
- marmelab/react-admin@5ae855a
- typescript-eslint/typescript-eslint@9d47a8b
- vega/vega-lite@16bc913
The diff is empty.
from prettier-regression-testing.
fisker
commented on May 17, 2024
run #13343 vs prettier/prettier#next
from prettier-regression-testing.
github-actions
commented on May 17, 2024
prettier/prettier#13343 VS prettier/prettier@next
- babel/babel@4e0e5f9
- vuejs/eslint-plugin-vue@508ea0e
- excalidraw/excalidraw@49172ac
- prettier/prettier@e949a54
- marmelab/react-admin@5ae855a
- typescript-eslint/typescript-eslint@9d47a8b
- vega/vega-lite@16bc913
The diff is empty.
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run #13391 vs prettier/prettier#next
from prettier-regression-testing.
github-actions
commented on May 17, 2024
prettier/prettier#13391 VS prettier/prettier@next
- babel/babel@4e0e5f9
- vuejs/eslint-plugin-vue@508ea0e
- excalidraw/excalidraw@49172ac
- prettier/prettier@e949a54
- marmelab/react-admin@5ae855a
- typescript-eslint/typescript-eslint@9d47a8b
- vega/vega-lite@16bc913
Diff (215 lines)
diff --git ORI/react-admin/packages/ra-core/src/dataProvider/useDeclarativeSideEffects.ts ALT/react-admin/packages/ra-core/src/dataProvider/useDeclarativeSideEffects.ts
index 7935a8a..0f941e1 100644
--- ORI/react-admin/packages/ra-core/src/dataProvider/useDeclarativeSideEffects.ts
+++ ALT/react-admin/packages/ra-core/src/dataProvider/useDeclarativeSideEffects.ts
@@ -21,56 +21,56 @@ const useDeclarativeSideEffects = () => {
return useMemo(
() =>
- (
- resource,
- {
- onSuccess,
- onFailure,
- }: DeclarativeSideEffects = defaultSideEffects
- ): FunctionSideEffects => {
- const convertToFunctionSideEffect = (resource, sideEffects) => {
- if (!sideEffects || typeof sideEffects === 'function') {
- return sideEffects;
- }
+ (
+ resource,
+ {
+ onSuccess,
+ onFailure,
+ }: DeclarativeSideEffects = defaultSideEffects
+ ): FunctionSideEffects => {
+ const convertToFunctionSideEffect = (resource, sideEffects) => {
+ if (!sideEffects || typeof sideEffects === 'function') {
+ return sideEffects;
+ }
- if (Object.keys(sideEffects).length === 0) {
- return undefined;
- }
+ if (Object.keys(sideEffects).length === 0) {
+ return undefined;
+ }
- const {
- notification,
- redirectTo,
- refresh: needRefresh,
- unselectAll: needUnselectAll,
- } = sideEffects;
+ const {
+ notification,
+ redirectTo,
+ refresh: needRefresh,
+ unselectAll: needUnselectAll,
+ } = sideEffects;
- return () => {
- if (notification) {
- notify(notification.body, {
- type: notification.level,
- messageArgs: notification.messageArgs,
- });
- }
+ return () => {
+ if (notification) {
+ notify(notification.body, {
+ type: notification.level,
+ messageArgs: notification.messageArgs,
+ });
+ }
- if (redirectTo) {
- redirect(redirectTo);
- }
+ if (redirectTo) {
+ redirect(redirectTo);
+ }
- if (needRefresh) {
- refresh();
- }
+ if (needRefresh) {
+ refresh();
+ }
- if (needUnselectAll) {
- unselectAll(resource);
- }
- };
+ if (needUnselectAll) {
+ unselectAll(resource);
+ }
};
+ };
- return {
- onSuccess: convertToFunctionSideEffect(resource, onSuccess),
- onFailure: convertToFunctionSideEffect(resource, onFailure),
- };
- },
+ return {
+ onSuccess: convertToFunctionSideEffect(resource, onSuccess),
+ onFailure: convertToFunctionSideEffect(resource, onFailure),
+ };
+ },
[notify, redirect, refresh, unselectAll]
);
};
diff --git ORI/react-admin/packages/ra-core/src/form/validate.ts ALT/react-admin/packages/ra-core/src/form/validate.ts
index ce5b79e..0006798 100644
--- ORI/react-admin/packages/ra-core/src/form/validate.ts
+++ ALT/react-admin/packages/ra-core/src/form/validate.ts
@@ -164,10 +164,10 @@ export const required = memoize((message = 'ra.validation.required') =>
*/
export const minLength = memoize(
(min, message = 'ra.validation.minLength') =>
- (value, values) =>
- !isEmpty(value) && value.length < min
- ? getMessage(message, { min }, value, values)
- : undefined
+ (value, values) =>
+ !isEmpty(value) && value.length < min
+ ? getMessage(message, { min }, value, values)
+ : undefined
);
/**
@@ -185,10 +185,10 @@ export const minLength = memoize(
*/
export const maxLength = memoize(
(max, message = 'ra.validation.maxLength') =>
- (value, values) =>
- !isEmpty(value) && value.length > max
- ? getMessage(message, { max }, value, values)
- : undefined
+ (value, values) =>
+ !isEmpty(value) && value.length > max
+ ? getMessage(message, { max }, value, values)
+ : undefined
);
/**
@@ -206,10 +206,10 @@ export const maxLength = memoize(
*/
export const minValue = memoize(
(min, message = 'ra.validation.minValue') =>
- (value, values) =>
- !isEmpty(value) && value < min
- ? getMessage(message, { min }, value, values)
- : undefined
+ (value, values) =>
+ !isEmpty(value) && value < min
+ ? getMessage(message, { min }, value, values)
+ : undefined
);
/**
@@ -227,10 +227,10 @@ export const minValue = memoize(
*/
export const maxValue = memoize(
(max, message = 'ra.validation.maxValue') =>
- (value, values) =>
- !isEmpty(value) && value > max
- ? getMessage(message, { max }, value, values)
- : undefined
+ (value, values) =>
+ !isEmpty(value) && value > max
+ ? getMessage(message, { max }, value, values)
+ : undefined
);
/**
@@ -247,10 +247,10 @@ export const maxValue = memoize(
*/
export const number = memoize(
(message = 'ra.validation.number') =>
- (value, values) =>
- !isEmpty(value) && isNaN(Number(value))
- ? getMessage(message, undefined, value, values)
- : undefined
+ (value, values) =>
+ !isEmpty(value) && isNaN(Number(value))
+ ? getMessage(message, undefined, value, values)
+ : undefined
);
/**
@@ -268,10 +268,10 @@ export const number = memoize(
*/
export const regex = lodashMemoize(
(pattern, message = 'ra.validation.regex') =>
- (value, values) =>
- !isEmpty(value) && typeof value === 'string' && !pattern.test(value)
- ? getMessage(message, { pattern }, value, values)
- : undefined,
+ (value, values) =>
+ !isEmpty(value) && typeof value === 'string' && !pattern.test(value)
+ ? getMessage(message, { pattern }, value, values)
+ : undefined,
(pattern, message) => {
return pattern.toString() + message;
}
@@ -313,8 +313,8 @@ const oneOfTypeMessage: MessageFunc = ({ args }) => ({
*/
export const choices = memoize(
(list, message = oneOfTypeMessage) =>
- (value, values) =>
- !isEmpty(value) && list.indexOf(value) === -1
- ? getMessage(message, { list }, value, values)
- : undefined
+ (value, values) =>
+ !isEmpty(value) && list.indexOf(value) === -1
+ ? getMessage(message, { list }, value, values)
+ : undefined
);
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run #13391 vs prettier/prettier#next
from prettier-regression-testing.
github-actions
commented on May 17, 2024
prettier/prettier#13391 VS prettier/prettier@next
- babel/babel@4e0e5f9
- vuejs/eslint-plugin-vue@508ea0e
- excalidraw/excalidraw@49172ac
- prettier/prettier@e949a54
- marmelab/react-admin@5ae855a
- typescript-eslint/typescript-eslint@9d47a8b
- vega/vega-lite@16bc913
The diff is empty.
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run #13396 vs prettier/prettier#next
from prettier-regression-testing.
github-actions
commented on May 17, 2024
prettier/prettier#13396 VS prettier/prettier@next
- babel/babel@4e0e5f9
- vuejs/eslint-plugin-vue@508ea0e
- excalidraw/excalidraw@49172ac
- prettier/prettier@e949a54
- marmelab/react-admin@5ae855a
- typescript-eslint/typescript-eslint@9d47a8b
- vega/vega-lite@16bc913
The diff is empty.
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run #13396 vs prettier/prettier#next
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run #13410 vs prettier/prettier#next
from prettier-regression-testing.
github-actions
commented on May 17, 2024
prettier/prettier#13410 VS prettier/prettier@next
- babel/babel@4e0e5f9
- vuejs/eslint-plugin-vue@508ea0e
- excalidraw/excalidraw@49172ac
- prettier/prettier@e949a54
- marmelab/react-admin@5ae855a
- typescript-eslint/typescript-eslint@9d47a8b
- vega/vega-lite@16bc913
diff --git ORI/babel/packages/babel-core/test/api.js ALT/babel/packages/babel-core/test/api.js
index d1da2a93..02dec083 100644
--- ORI/babel/packages/babel-core/test/api.js
+++ ALT/babel/packages/babel-core/test/api.js
@@ -558,19 +558,19 @@ describe("api", function () {
});
it("code option false", function () {
- return transformAsync("foo('bar');", { code: false }).then(function (
- result,
- ) {
- expect(result.code).toBeFalsy();
- });
+ return transformAsync("foo('bar');", { code: false }).then(
+ function (result) {
+ expect(result.code).toBeFalsy();
+ },
+ );
});
it("ast option false", function () {
- return transformAsync("foo('bar');", { ast: false }).then(function (
- result,
- ) {
- expect(result.ast).toBeFalsy();
- });
+ return transformAsync("foo('bar');", { ast: false }).then(
+ function (result) {
+ expect(result.ast).toBeFalsy();
+ },
+ );
});
it("ast option true", function () {
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run #13438 vs prettier/prettier#next
from prettier-regression-testing.
github-actions
commented on May 17, 2024
prettier/prettier#13438 VS prettier/prettier@next
- babel/babel@4e0e5f9
- vuejs/eslint-plugin-vue@508ea0e
- excalidraw/excalidraw@49172ac
- prettier/prettier@e949a54
- marmelab/react-admin@5ae855a
- typescript-eslint/typescript-eslint@9d47a8b
- vega/vega-lite@16bc913
The diff is empty.
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run #13532 vs prettier/prettier#next
from prettier-regression-testing.
github-actions
commented on May 17, 2024
[Error]
Error: Command failed with exit code 1: /home/runner/work/prettier-regression-testing/prettier-regression-testing/prettier/bin/prettier.js --write "./{packages,codemods,eslint}/**/*.js" --ignore-path .eslintignore
prettier requires at least version 16 of Node, please upgrade
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run #13532 vs prettier/prettier#next
from prettier-regression-testing.
github-actions
commented on May 17, 2024
[Error]
Error: Command failed with exit code 1: /home/runner/work/prettier-regression-testing/prettier-regression-testing/prettier/bin/prettier.js --write "./{packages,codemods,eslint}/**/*.js" --ignore-path .eslintignore
prettier requires at least version 16 of Node, please upgrade
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run #13532 vs prettier/prettier#next
from prettier-regression-testing.
github-actions
commented on May 17, 2024
prettier/prettier#13532 VS prettier/prettier@next
- babel/babel@4e0e5f9
- vuejs/eslint-plugin-vue@508ea0e
- excalidraw/excalidraw@49172ac
- prettier/prettier@e949a54
- marmelab/react-admin@5ae855a
- typescript-eslint/typescript-eslint@9d47a8b
- vega/vega-lite@16bc913
Diff (106 lines)
diff --git ORI/babel/packages/babel-preset-flow/test/normalize-options.spec.js ALT/babel/packages/babel-preset-flow/test/normalize-options.spec.js
index 39bf9f23..0f6346e2 100644
--- ORI/babel/packages/babel-preset-flow/test/normalize-options.spec.js
+++ ALT/babel/packages/babel-preset-flow/test/normalize-options.spec.js
@@ -4,8 +4,9 @@ const normalizeOptions = _normalizeOptions.default;
describe("normalize options", () => {
(process.env.BABEL_8_BREAKING ? describe : describe.skip)("Babel 8", () => {
it("should throw on unknown options", () => {
- expect(() => normalizeOptions({ al: true }))
- .toThrowErrorMatchingInlineSnapshot(`
+ expect(() =>
+ normalizeOptions({ al: true }),
+ ).toThrowErrorMatchingInlineSnapshot(`
"@babel/preset-flow: 'al' is not a valid top-level option.
- Did you mean 'all'?"
`);
diff --git ORI/babel/packages/babel-preset-react/test/normalize-options.skip-bundled.js ALT/babel/packages/babel-preset-react/test/normalize-options.skip-bundled.js
index 7ed49982..c23f665e 100644
--- ORI/babel/packages/babel-preset-react/test/normalize-options.skip-bundled.js
+++ ALT/babel/packages/babel-preset-react/test/normalize-options.skip-bundled.js
@@ -25,8 +25,9 @@ describe("normalize options", () => {
},
);
it("should throw on Babel 7 'useBuiltIns' option", () => {
- expect(() => normalizeOptions({ useBuiltIns: true }))
- .toThrowErrorMatchingInlineSnapshot(`
+ expect(() =>
+ normalizeOptions({ useBuiltIns: true }),
+ ).toThrowErrorMatchingInlineSnapshot(`
"@babel/preset-react: Since \\"useBuiltIns\\" is removed in Babel 8, you can remove it from the config.
- Babel 8 now transforms JSX spread to object spread. If you need to transpile object spread with
\`useBuiltIns: true\`, you can use the following config
@@ -46,8 +47,9 @@ describe("normalize options", () => {
);
});
it("should throw on unknown 'runtime' option", () => {
- expect(() => normalizeOptions({ runtime: "classical" }))
- .toThrowErrorMatchingInlineSnapshot(`
+ expect(() =>
+ normalizeOptions({ runtime: "classical" }),
+ ).toThrowErrorMatchingInlineSnapshot(`
"@babel/preset-react: 'runtime' must be one of ['automatic', 'classic'] but we have 'classical'
- Did you mean 'classic'?"
`);
diff --git ORI/react-admin/packages/ra-core/src/controller/input/useGetMatchingReferences.ts ALT/react-admin/packages/ra-core/src/controller/input/useGetMatchingReferences.ts
index b367ad9..3a3e4b4 100644
--- ORI/react-admin/packages/ra-core/src/controller/input/useGetMatchingReferences.ts
+++ ALT/react-admin/packages/ra-core/src/controller/input/useGetMatchingReferences.ts
@@ -121,8 +121,10 @@ const useGetMatchingReferenceSelector = ({
// no registered resource matching the reference
!referenceResource
) {
- throw new Error(`Cannot fetch a reference to "${reference}" (unknown resource).
-You must add <Resource name="${reference}" /> as child of <Admin> to use "${reference}" in a reference`);
+ throw new Error(
+ `Cannot fetch a reference to "${reference}" (unknown resource).
+You must add <Resource name="${reference}" /> as child of <Admin> to use "${reference}" in a reference`
+ );
}
const possibleValues = getPossibleReferenceValues(state, {
referenceSource,
diff --git ORI/react-admin/packages/ra-data-graphql-simple/src/buildQuery.test.ts ALT/react-admin/packages/ra-data-graphql-simple/src/buildQuery.test.ts
index 7533005..be584e6 100644
--- ORI/react-admin/packages/ra-data-graphql-simple/src/buildQuery.test.ts
+++ ALT/react-admin/packages/ra-data-graphql-simple/src/buildQuery.test.ts
@@ -31,12 +31,11 @@ describe('buildQuery', () => {
it('correctly builds a query and returns it along with variables and parseResponse', () => {
const buildVariables = jest.fn(() => ({ foo: true }));
const buildGqlQuery = jest.fn(
- () =>
- gql`
- query {
- id
- }
- `
+ () => gql`
+ query {
+ id
+ }
+ `
);
const getResponseParser = jest.fn(() => 'parseResponseFunction');
const buildVariablesFactory = jest.fn(() => buildVariables);
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 a69991e..ac44186 100644
--- ORI/react-admin/packages/ra-ui-materialui/src/input/AutocompleteInput.tsx
+++ ALT/react-admin/packages/ra-ui-materialui/src/input/AutocompleteInput.tsx
@@ -159,10 +159,12 @@ export const AutocompleteInput = (props: AutocompleteInputProps) => {
} = props;
if (isValidElement(optionText) && !inputText) {
- throw new Error(`If the optionText prop is a React element, you must also specify the inputText prop:
+ throw new Error(
+ `If the optionText prop is a React element, you must also specify the inputText prop:
<AutocompleteInput
inputText={(record) => record.title}
- />`);
+ />`
+ );
}
warning(
from prettier-regression-testing.
thorn0
commented on May 17, 2024
run #13532 vs prettier/prettier#next
from prettier-regression-testing.
Related Issues (20)
- v3 HOT 23
- for 12349 HOT 5
- For #12359 and #12362 HOT 8
- Regression testing for 2.6 HOT 3
- For 12563 HOT 6
- 2.7 HOT 2
- compact multiline imports HOT 8
- for 13532 (Fix unstable embedded template literals) HOT 4
- misc tests HOT 38
- for 11103 (Break multiline parenthesized logical expression) HOT 8
- for 13621 (Fix template literal indention) HOT 4
- for 13735 (Print `ChainExpression`) HOT 8
- v2.8.0 HOT 5
- 2.8.1 HOT 2
- Misc tests HOT 52
- v3 HOT 23
- 15447 HOT 26
- 3.1 HOT 34
- 3.2 HOT 2
- 15909 & 15993 HOT 12
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from prettier-regression-testing.