Bump typescript to 4.6.4 (opensearch-project#879)

* typescript bump: 4.1.6 Signed-off-by: Danila Gulderov <danila@gulderov.me> * typescript bump: 4.2.4 Signed-off-by: Danila Gulderov <danila@gulderov.me> * typescript bump: 4.3.5 Signed-off-by: Danila Gulderov <danila@gulderov.me> * typescript bump: 4.4.4 Signed-off-by: Danila Gulderov <danila@gulderov.me> * typescript bump: 4.5.5 Signed-off-by: Danila Gulderov <danila@gulderov.me> * typescript bump: 4.6.4 Signed-off-by: Danila Gulderov <danila@gulderov.me> * CHANGELOG.md updated Signed-off-by: Danila Gulderov <danila@gulderov.me> * bump typescript-eslint/eslint-plugin: 5.62.0 bump typescript-eslint/parser: 5.62.0 node 16 is required for typescript-eslint: 6.0.0 Signed-off-by: Danila Gulderov <danila@gulderov.me> * CHANGELOG.md update Signed-off-by: Danila Gulderov <danila@gulderov.me> * move typescript update to regular section Signed-off-by: Danila Gulderov <danila@gulderov.me> * changelog message improvement Signed-off-by: Danila Gulderov <danila@gulderov.me> * fix typings Signed-off-by: Danila Gulderov <danila@gulderov.me> * cleanup useUnknownInCatchVariables Signed-off-by: Danila Gulderov <danila@gulderov.me> * logical or => nullish coalescing Signed-off-by: Danila Gulderov <danila@gulderov.me> * wrap with String Signed-off-by: Danila Gulderov <danila@gulderov.me> * Update CHANGELOG.md Move CHANGELOG entry to the unreleased section Signed-off-by: Miki <miki@amazon.com> * Add back `onPinClick` check in `OuiPinnableListGroup` Update pinnable_list_group.tsx Signed-off-by: Miki <miki@amazon.com> * Enhance error message extraction in `validateFieldValue` Update default_syntax.ts Signed-off-by: Miki <miki@amazon.com> * Remove e.code from default_syntax.ts Update default_syntax.ts Signed-off-by: Miki <miki@amazon.com> * Lint default_syntax.ts Signed-off-by: Miki <miki@amazon.com> --------- Signed-off-by: Danila Gulderov <danila@gulderov.me> Signed-off-by: Matt Provost <provomat@amazon.com> Signed-off-by: Miki <miki@amazon.com> Co-authored-by: Matt Provost <provomat@amazon.com> Co-authored-by: Josh Romero <rmerqg@amazon.com> Co-authored-by: Miki <miki@amazon.com>
AMoo-Miki · Sep 28, 2023 · 1fe770c · 1fe770c
1 parent db94845
commit 1fe770c
Show file tree

Hide file tree

Showing 14 changed files with 164 additions and 133 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,7 @@
 ### 🛠 Maintenance
 
 - Update caniuse database ([#1046](https://github.com/opensearch-project/oui/pull/1046))
+- Bump TypeScript to v4.6.4 ([#879](https://github.com/opensearch-project/oui/pull/879))
 
 ### 🪛 Refactoring
 

diff --git a/i18ntokens.json b/i18ntokens.json
@@ -2543,14 +2543,14 @@
     "highlighting": "string",
     "loc": {
       "start": {
-        "line": 125,
+        "line": 124,
         "column": 4,
-        "index": 3690
+        "index": 3665
       },
       "end": {
-        "line": 125,
+        "line": 124,
         "column": 75,
-        "index": 3761
+        "index": 3736
       }
     },
     "filepath": "src/components/header/header_links/header_links.tsx"
@@ -2561,14 +2561,14 @@
     "highlighting": "string",
     "loc": {
       "start": {
-        "line": 138,
+        "line": 137,
         "column": 4,
-        "index": 4083
+        "index": 4058
       },
       "end": {
-        "line": 138,
+        "line": 137,
         "column": 69,
-        "index": 4148
+        "index": 4123
       }
     },
     "filepath": "src/components/header/header_links/header_links.tsx"
@@ -2653,12 +2653,12 @@
       "start": {
         "line": 143,
         "column": 4,
-        "index": 4714
+        "index": 4700
       },
       "end": {
         "line": 148,
         "column": 44,
-        "index": 4899
+        "index": 4885
       }
     },
     "filepath": "src/components/list_group/pinnable_list_group/pinnable_list_group.tsx"
@@ -2671,12 +2671,12 @@
       "start": {
         "line": 143,
         "column": 4,
-        "index": 4714
+        "index": 4700
       },
       "end": {
         "line": 148,
         "column": 44,
-        "index": 4899
+        "index": 4885
       }
     },
     "filepath": "src/components/list_group/pinnable_list_group/pinnable_list_group.tsx"
@@ -3535,12 +3535,12 @@
       "start": {
         "line": 267,
         "column": 12,
-        "index": 7947
+        "index": 7990
       },
       "end": {
         "line": 270,
         "column": 14,
-        "index": 8069
+        "index": 8112
       }
     },
     "filepath": "src/components/selectable/selectable_templates/selectable_template_sitewide.tsx"

diff --git a/package.json b/package.json
@@ -160,8 +160,8 @@
     "@types/react-router-dom": "^5.3.3",
     "@types/url-parse": "^1.4.8",
     "@types/uuid": "^9.0.1",
-    "@typescript-eslint/eslint-plugin": "^4.8.1",
-    "@typescript-eslint/parser": "^4.8.1",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "@typescript-eslint/parser": "^5.62.0",
     "autoprefixer": "^9.8.6",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "^10.1.0",
@@ -242,7 +242,7 @@
     "start-server-and-test": "^2.0.0",
     "style-loader": "^1.2.1",
     "terser-webpack-plugin": "^4.1.0",
-    "typescript": "4.0.5",
+    "typescript": "4.6.4",
     "url-loader": "^4.1.0",
     "webpack": "npm:@amoo-miki/webpack@4.46.0-rc.2",
     "webpack-cli": "^3.3.12",

diff --git a/src-docs/src/components/guide_section/guide_section.tsx b/src-docs/src/components/guide_section/guide_section.tsx
@@ -135,7 +135,7 @@ export const GuideSection: FunctionComponent<GuideSection> = ({
     const isPlaygroundUnsupported =
       typeof window !== 'undefined' &&
       typeof document !== 'undefined' &&
-      !!window.MSInputMethodContext &&
+      !!(window as any).MSInputMethodContext &&
       // @ts-ignore doesn't exist?
       !!document.documentMode;
 

diff --git a/src/components/datagrid/data_grid_inmemory_renderer.tsx b/src/components/datagrid/data_grid_inmemory_renderer.tsx
@@ -56,11 +56,7 @@ export interface OuiDataGridInMemoryRendererProps {
 function noop() {}
 
 function getElementText(element: HTMLElement) {
-  return 'innerText' in element
-    ? element.innerText
-    : // (this line left here to satisfy Prettier since a ts-ignore is used on the next line)
-      // @ts-ignore TypeScript thinks element.innerText always exists, however it doesn't in jest/jsdom environment
-      element.textContent || undefined;
+  return 'innerText' in element ? element.innerText : element.textContent || '';
 }
 
 export const OuiDataGridInMemoryRenderer: FunctionComponent<OuiDataGridInMemoryRendererProps> = ({

diff --git a/src/components/header/header_links/header_links.tsx b/src/components/header/header_links/header_links.tsx
@@ -95,16 +95,15 @@ export const OuiHeaderLinks: FunctionComponent<OuiHeaderLinksProps> = ({
   popoverProps,
   ...rest
 }) => {
-  const { onClick: _onClick, iconType = 'apps', ...popoverButtonRest } = {
-    ...popoverButtonProps,
-  };
+  const { onClick, iconType = 'apps', ...popoverButtonRest } =
+    popoverButtonProps ?? {};
 
   const [mobileMenuIsOpen, setMobileMenuIsOpen] = useState(false);
 
   const onMenuButtonClick: MouseEventHandler<
     HTMLButtonElement & HTMLAnchorElement
   > = (e) => {
-    _onClick && _onClick(e);
+    onClick?.(e);
     setMobileMenuIsOpen(!mobileMenuIsOpen);
   };
 

diff --git a/src/components/icon/icon.test.tsx b/src/components/icon/icon.test.tsx
@@ -56,7 +56,7 @@ const prettyHtml = cheerio.load('');
 function testIcon(props: PropsOf<OuiIcon>) {
   return () => {
     expect.assertions(1);
-    return new Promise((resolve) => {
+    return new Promise<void>((resolve) => {
       const onIconLoad = () => {
         component.update();
         expect(prettyHtml(component.html())).toMatchSnapshot();

diff --git a/src/components/list_group/pinnable_list_group/pinnable_list_group.tsx b/src/components/list_group/pinnable_list_group/pinnable_list_group.tsx
@@ -115,7 +115,7 @@ export const OuiPinnableListGroup: FunctionComponent<OuiPinnableListGroupProps>
       );
 
       // Add the pinning action unless the item has it's own extra action
-      if (onPinClick && !itemProps.extraAction && pinnable) {
+      if (pinnable && !itemProps.extraAction) {
         // Different displays for pinned vs unpinned
         if (pinned) {
           itemProps.extraAction = {
@@ -132,8 +132,8 @@ export const OuiPinnableListGroup: FunctionComponent<OuiPinnableListGroupProps>
             'aria-label': pinTitle ? pinTitle(item) : pinExtraActionLabel,
           };
         }
-        // Return the item on click
-        itemProps.extraAction.onClick = () => onPinClick(item);
+        // On click, return the item
+        if (onPinClick) itemProps.extraAction.onClick = () => onPinClick(item);
       }
 
       return itemProps;

diff --git a/src/components/markdown_editor/markdown_editor.tsx b/src/components/markdown_editor/markdown_editor.tsx
@@ -260,7 +260,7 @@ export const OuiMarkdownEditor = forwardRef<
         const parsed = parser.processSync(value);
         return [parsed, null];
       } catch (e) {
-        return [null, e];
+        return [null, e as OuiMarkdownParseError];
       }
     }, [parser, value]);
 

diff --git a/src/components/search_bar/query/default_syntax.ts b/src/components/search_bar/query/default_syntax.ts
@@ -353,8 +353,16 @@ const validateFieldValue = (
     try {
       schemaField.validate(value);
     } catch (e) {
+      // While e.message is the normal convention, it is optional. e.name is used for completeness
+      const message = (e instanceof Error
+        ? e.message || e.name
+        : String(e)
+      )?.trim();
+
       error(
-        `Invalid value \`${expression}\` set for field \`${field}\` - ${e.message}`,
+        `Invalid value \`${expression}\` set for field \`${field}\`${
+          message ? ` - ${message}` : ''
+        }`,
         location
       );
     }

diff --git a/src/components/search_bar/search_bar.tsx b/src/components/search_bar/search_bar.tsx
@@ -189,7 +189,11 @@ export class OuiSearchBar extends Component<OuiSearchBarProps, State> {
       this.notifyControllingParent({ query, queryText, error: null });
       this.setState({ query, queryText, error: null });
     } catch (e) {
-      const error: Error = { name: e.name, message: e.message };
+      const error: Error =
+        e instanceof Error
+          ? { name: e.name, message: e.message }
+          : { name: 'Unexpected error', message: String(e) };
+
       this.notifyControllingParent({ query: null, queryText, error });
       this.setState({ queryText, error });
     }

diff --git a/src/components/selectable/selectable_templates/selectable_template_sitewide.tsx b/src/components/selectable/selectable_templates/selectable_template_sitewide.tsx
@@ -252,7 +252,7 @@ export const OuiSelectableTemplateSitewide: FunctionComponent<OuiSelectableTempl
       searchProps={{
         placeholder: searchPlaceholder,
         isClearable: true,
-        ...searchProps,
+        ...(searchProps as Omit<typeof searchProps, 'className'>),
         onFocus: searchOnFocus,
         onBlur: searchOnBlur,
         onInput: onSearchInput,

diff --git a/src/components/suggest/suggest_item.tsx b/src/components/suggest/suggest_item.tsx
@@ -32,7 +32,6 @@ import React, {
   FunctionComponent,
   HTMLAttributes,
   ButtonHTMLAttributes,
-  MouseEventHandler,
 } from 'react';
 import { CommonProps, ExclusiveUnion, keysOf } from '../common';
 import classNames from 'classnames';
@@ -77,12 +76,7 @@ interface OuiSuggestItemPropsBase {
 }
 
 type PropsForDiv = Omit<HTMLAttributes<HTMLDivElement>, 'onClick'>;
-type PropsForButton = Omit<
-  ButtonHTMLAttributes<HTMLButtonElement>,
-  'onClick' | 'type'
-> & {
-  onClick: MouseEventHandler<HTMLButtonElement> | undefined;
-};
+type PropsForButton = Omit<ButtonHTMLAttributes<HTMLButtonElement>, 'type'>;
 
 export type OuiSuggestItemProps = CommonProps &
   OuiSuggestItemPropsBase &
@@ -193,8 +187,8 @@ export const OuiSuggestItem: FunctionComponent<OuiSuggestItemProps> = ({
   if (onClick) {
     return (
       <button
-        onClick={onClick}
         className={classes}
+        onClick={onClick}
         {...(rest as PropsForButton)}>
         {innerContent}
       </button>