typing cleanup

thatmattlove · thatmattlove · commit 090626f952ec · 2021-01-10T01:15:13.000-07:00
diff --git a/hyperglass/ui/.eslintrc b/hyperglass/ui/.eslintrc
@@ -48,6 +48,8 @@
     "@typescript-eslint/no-inferrable-types": "off",
     "@typescript-eslint/explicit-function-return-type": "off",
     "@typescript-eslint/no-var-requires": "off",
+    "@typescript-eslint/no-non-null-assertion": "off",
+    "@typescript-eslint/no-namespace": "off",
     "@typescript-eslint/no-empty-interface": [
       "error",
       {
diff --git a/hyperglass/ui/components/form/resolvedTarget.tsx b/hyperglass/ui/components/form/resolvedTarget.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useMemo } from 'react';
 import dynamic from 'next/dynamic';
-import { Button, chakra, Icon, Stack, Text, VStack } from '@chakra-ui/react';
+import { Button, chakra, Stack, Text, VStack } from '@chakra-ui/react';
 import { useConfig, useColorValue } from '~/context';
 import { useStrf, useLGState, useDNSQuery } from '~/hooks';
 
@@ -24,7 +24,7 @@ function findAnswer(data: DnsOverHttps.Response | undefined): string {
   return answer;
 }
 
-export const ResolvedTarget = (props: TResolvedTarget) => {
+export const ResolvedTarget: React.FC<TResolvedTarget> = (props: TResolvedTarget) => {
   const { setTarget, errorClose } = props;
   const { web } = useConfig();
   const { displayTarget, isSubmitting, families, queryTarget } = useLGState();
diff --git a/hyperglass/ui/components/markdown/elements.tsx b/hyperglass/ui/components/markdown/elements.tsx
@@ -31,6 +31,7 @@ type MDProps = {
   node: Dict;
 };
 
+/* eslint @typescript-eslint/no-explicit-any: off */
 function hasNode<C>(p: any): p is C & MDProps {
   return 'node' in p;
 }
diff --git a/hyperglass/ui/hooks/useDevice.ts b/hyperglass/ui/hooks/useDevice.ts
@@ -1,6 +1,5 @@
 import { useCallback, useMemo } from 'react';
 import { useConfig } from '~/context';
-import { flatten } from '~/util';
 
 import type { TDevice } from '~/types';
 import type { TUseDevice } from './types';
@@ -11,7 +10,7 @@ import type { TUseDevice } from './types';
 export function useDevice(): TUseDevice {
   const { networks } = useConfig();
 
-  const devices = useMemo(() => flatten<TDevice>(networks.map(n => n.locations)), []);
+  const devices = useMemo(() => networks.map(n => n.locations).flat(), []);
 
   function getDevice(id: string): TDevice {
     return devices.filter(dev => dev.name === id)[0];
diff --git a/hyperglass/ui/hooks/useTableToString.ts b/hyperglass/ui/hooks/useTableToString.ts
@@ -87,7 +87,7 @@ export function useTableToString(
             const [header, accessor, align] = field;
             if (align !== null) {
               let value = route[accessor];
-              const fmtFunc = getFmtFunc(accessor);
+              const fmtFunc = getFmtFunc(accessor) as (v: typeof value) => string;
               value = fmtFunc(value);
               if (accessor === 'prefix') {
                 tableStringParts.push(`  - ${header}: ${value}`);
diff --git a/hyperglass/ui/pages/_document.tsx b/hyperglass/ui/pages/_document.tsx
@@ -17,7 +17,6 @@ class MyDocument extends Document {
           <link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="true" />
         </Head>
         <body>
-          <script src="noflash.js" />
           <Main />
           <NextScript />
         </body>
diff --git a/hyperglass/ui/types/guards.ts b/hyperglass/ui/types/guards.ts
@@ -1,9 +1,11 @@
-import type { State, InferredStateKeysType } from '@hookstate/core';
+/* eslint @typescript-eslint/explicit-module-boundary-types: off */
+/* eslint @typescript-eslint/no-explicit-any: off */
+import type { State } from '@hookstate/core';
 import type { TValidQueryTypes, TStringTableData, TQueryResponseString } from './data';
 import type { TSelectOption } from './common';
 import type { TQueryContent } from './config';
 
-export function isQueryType(q: any): q is TValidQueryTypes {
+export function isQueryType(q: unknown): q is TValidQueryTypes {
   let result = false;
   if (
     typeof q === 'string' &&
@@ -14,7 +16,7 @@ export function isQueryType(q: any): q is TValidQueryTypes {
   return result;
 }
 
-export function isString(a: any): a is string {
+export function isString(a: unknown): a is string {
   return typeof a === 'string';
 }
 
diff --git a/hyperglass/ui/types/react-table-config.d.ts b/hyperglass/ui/types/react-table-config.d.ts
@@ -1,3 +1,5 @@
+/* eslint-disable */
+
 import type {
   TableInstance,
   UseSortByHooks,
diff --git a/hyperglass/ui/util/common.ts b/hyperglass/ui/util/common.ts
@@ -7,12 +7,6 @@ export function all<I extends unknown>(...iter: I[]): boolean {
   return true;
 }
 
-export function flatten<T extends unknown>(arr: any[][]): T[] {
-  return arr.reduce(function (flat, toFlatten) {
-    return flat.concat(Array.isArray(toFlatten) ? flatten(toFlatten) : toFlatten);
-  }, []);
-}
-
 export function chunkArray<A extends unknown>(array: A[], size: number): A[][] {
   const result = [] as A[][];
   for (let i = 0; i < array.length; i += size) {
diff --git a/hyperglass/ui/util/theme.ts b/hyperglass/ui/util/theme.ts
@@ -34,11 +34,11 @@ const defaultMonoFonts = [
   'monospace',
 ];
 
-export function isLight(color: string) {
+export function isLight(color: string): boolean {
   return readableColorIsBlack(color);
 }
 
-export function isDark(color: string) {
+export function isDark(color: string): boolean {
   return !readableColorIsBlack(color);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,8 @@`
`48`	`48`	`"@typescript-eslint/no-inferrable-types": "off",`
`49`	`49`	`"@typescript-eslint/explicit-function-return-type": "off",`
`50`	`50`	`"@typescript-eslint/no-var-requires": "off",`
	`51`	`+ "@typescript-eslint/no-non-null-assertion": "off",`
	`52`	`+ "@typescript-eslint/no-namespace": "off",`
`51`	`53`	`"@typescript-eslint/no-empty-interface": [`
`52`	`54`	`"error",`
`53`	`55`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ type MDProps = {`
`31`	`31`	`node: Dict;`
`32`	`32`	`};`
`33`	`33`
	`34`	`+/* eslint @typescript-eslint/no-explicit-any: off */`
`34`	`35`	`function hasNode<C>(p: any): p is C & MDProps {`
`35`	`36`	`return 'node' in p;`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+/* eslint-disable */`
	`2`	`+`
`1`	`3`	`import type {`
`2`	`4`	`TableInstance,`
`3`	`5`	`UseSortByHooks,`
Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,11 @@ const defaultMonoFonts = [`
`34`	`34`	`'monospace',`
`35`	`35`	`];`
`36`	`36`
`37`		`-export function isLight(color: string) {`
	`37`	`+export function isLight(color: string): boolean {`
`38`	`38`	`return readableColorIsBlack(color);`
`39`	`39`	`}`
`40`	`40`
`41`		`-export function isDark(color: string) {`
	`41`	`+export function isDark(color: string): boolean {`
`42`	`42`	`return !readableColorIsBlack(color);`
`43`	`43`	`}`
`44`	`44`