fix: remove unnecessary patch type errors

push-based · Feb 25, 2024 · ff5ca9e · ff5ca9e
1 parent dc45f93
commit ff5ca9e
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 57 deletions.
diff --git a/...nds/assert/options/budgetPath.constant.ts → .../cli/src/lib/commands/assert/constants.ts b/...nds/assert/options/budgetPath.constant.ts → .../cli/src/lib/commands/assert/constants.ts
diff --git a/packages/cli/src/lib/commands/assert/options.ts b/packages/cli/src/lib/commands/assert/options.ts
@@ -1,3 +1,4 @@
+import { SharedFlagsSettings } from 'lighthouse/types/lhr/settings';
 import { Options } from 'yargs';
 
 const budgets = {
@@ -17,3 +18,10 @@ export const assertOptions = {
   budgetPath,
   budgets
 } satisfies Record<string, Options>;
+
+// @TODO this type has overlap with the one in rc-json.ts we should fix that and only have one
+export type AssertRcOptions = {
+  budgetPath?: string,
+  budgets?: SharedFlagsSettings['budgets']
+}
+export type AssertArgvOptions = AssertRcOptions;
diff --git a/packages/cli/src/lib/commands/assert/options/budgetPath.model.ts b/packages/cli/src/lib/commands/assert/options/budgetPath.model.ts
diff --git a/packages/cli/src/lib/commands/assert/options/budgets.model.ts b/packages/cli/src/lib/commands/assert/options/budgets.model.ts
diff --git a/packages/cli/src/lib/commands/assert/options/types.ts b/packages/cli/src/lib/commands/assert/options/types.ts
diff --git a/packages/cli/src/lib/commands/assert/utils/budgets/index.ts b/packages/cli/src/lib/commands/assert/utils/budgets/index.ts
@@ -1,21 +1,11 @@
-import { readFile, writeFile } from '../../../../core/file';
-import { logVerbose } from '../../../../core/loggin';
 import Budget from 'lighthouse/types/lhr/budget';
-import { DEFAULT_ASSERT_BUDGET_PATH } from '../../options/budgetPath.constant';
+import { readFile } from '../../../../core/file';
+import { DEFAULT_ASSERT_BUDGET_PATH } from '../../constants';
 
 export function readBudgets(budgetPath: string = DEFAULT_ASSERT_BUDGET_PATH): Budget[] {
   const budgetsJson = JSON.parse(readFile(budgetPath, {fail: true}) || '{}');
   return budgetsJson;
 }
 
-export function writeBudgets(config: Budget[], budgetPath: string = DEFAULT_ASSERT_BUDGET_PATH): void {
-  logVerbose(`Update budgets under ${budgetPath}`);
 
-  if (JSON.stringify(readBudgets()) !== JSON.stringify(config)) {
-    writeFile(budgetPath, JSON.stringify(config));
-    logVerbose(`New budgets ${JSON.stringify(config)}`);
-  } else {
-    logVerbose(`No updates for ${budgetPath} to save.`);
-  }
-}
 
diff --git a/packages/cli/src/lib/commands/collect/options/types.ts b/packages/cli/src/lib/commands/collect/options/types.ts
@@ -1,11 +1,4 @@
-import { Param as OpenReport } from './openReport.model';
-import { Param as UfPath } from './ufPath.model';
-import { Param as Url } from './url.model';
-import { Param as ServeCommand } from './serveCommand.model';
-import { Param as AwaitServeStdout } from './awaitServeStdout.model';
-import { Param as OutPath } from './outPath.model';
-import { Param as Format } from './format.model';
-import { AssertArgvOptions } from '../../assert/options/types';
+import { AssertArgvOptions } from '../../assert/options';
 import { LhConfigJson } from '../../../hacky-things/lighthouse';
 
 export type CollectRcOptions = {

diff --git a/packages/cli/src/lib/commands/collect/utils/params.ts b/packages/cli/src/lib/commands/collect/utils/params.ts
@@ -5,7 +5,7 @@ import {
   PersistArgvOptions,
   PersistRcOptions
 } from '../options/types';
-import { AssertArgvOptions } from '../../assert/options/types';
+import { AssertArgvOptions } from '../../assert/options';
 import { CollectOptions } from '../options';
 
 

diff --git a/packages/cli/src/lib/commands/collect/utils/user-flow/collect-flow.ts b/packages/cli/src/lib/commands/collect/utils/user-flow/collect-flow.ts
@@ -11,7 +11,7 @@ import { detectCliMode } from '../../../../global/cli-mode/cli-mode';
 import { CollectArgvOptions } from '../../options/types';
 import { getLhConfigFromArgv, mergeLhConfig } from '../config';
 import { PersistArgvOptions } from '../../options/types';
-import { AssertRcOptions } from '../../../assert/options/types';
+import { AssertRcOptions } from '../../../assert/options';
 
 export async function collectFlow(
   cliOption: CollectArgvOptions & PersistArgvOptions & AssertRcOptions,

diff --git a/packages/cli/src/lib/commands/init/utils.ts b/packages/cli/src/lib/commands/init/utils.ts
@@ -1,6 +1,6 @@
 import { CollectRcOptions, PersistRcOptions } from '../collect/options/types';
-import { AssertRcOptions } from '../assert/options/types';
 import { InitOptions } from './options';
+import { AssertRcOptions } from '../assert/options';
 
 export function getInitCommandOptionsFromArgv(argv: InitOptions) {
   let {

diff --git a/packages/cli/src/lib/types.ts b/packages/cli/src/lib/types.ts
@@ -5,7 +5,7 @@ import {
   PersistArgvOptions,
   PersistRcOptions
 } from './commands/collect/options/types';
-import { AssertArgvOptions, AssertRcOptions } from './commands/assert/options/types';
+import { AssertArgvOptions, AssertRcOptions } from './commands/assert/options';
 
 export type ArgvPreset =
   { rcPath: GlobalOptionsArgv['rcPath'] } &
@@ -18,8 +18,4 @@ export type RcJson = {
   collect: CollectRcOptions;
   persist: PersistRcOptions;
   assert?: AssertRcOptions;
-  // eslint-disable-next-line @typescript-eslint/ban-types
 } & Object;
-
-export type RcJsonAsArgv = CollectRcOptions & PersistRcOptions & AssertRcOptions;
-