From 1c5f396b1ae241cb4b36d8927f0cfc094ce07838 Mon Sep 17 00:00:00 2001 From: Jake Bailey <5341706+jakebailey@users.noreply.github.com> Date: Mon, 4 Mar 2024 19:08:45 -0800 Subject: [PATCH] Fix up getSettings --- packages/eslint-plugin/src/rules/expect.ts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/eslint-plugin/src/rules/expect.ts b/packages/eslint-plugin/src/rules/expect.ts index 2964b4debc..3fc9972ebe 100644 --- a/packages/eslint-plugin/src/rules/expect.ts +++ b/packages/eslint-plugin/src/rules/expect.ts @@ -138,18 +138,17 @@ interface Settings { } function getSettings(context: Parameters<(typeof rule)["create"]>[0]): Settings { - const dt = context.settings.dt; - if (!dt || typeof dt !== "object") { - return {}; + const dt = context.settings.dt ?? {}; + if (typeof dt !== "object") { + throw new Error("Invalid dt settings"); } - let versionsToTest = (dt as Record).versionsToTest; - versionsToTest ??= undefined; - if (!Array.isArray(versionsToTest)) { + const versionsToTest = (dt as Record).versionsToTest ?? undefined; + if (versionsToTest !== undefined && !Array.isArray(versionsToTest)) { throw new Error("Invalid versionsToTest"); } - for (const version of versionsToTest) { + for (const version of versionsToTest ?? []) { if (typeof version !== "object" || typeof version.versionName !== "string" || typeof version.path !== "string") { throw new Error("Invalid version to test"); }