From 127ef260b961e07c5f82a7494b51dd3f04294e87 Mon Sep 17 00:00:00 2001
From: Bill Collins <bilbocollins@gmail.com>
Date: Thu, 29 Sep 2022 12:42:23 +0100
Subject: [PATCH] fix: remove GenericObject shim (#2177)

This was declared in the local stubs file but not shipped, meaning that
consumers with typescript libchecking enabled would have to also add the
GenericObject definition to their local stubs file.

This commit inlines the definition where necessary, or replaces it with
object where appropriate.
---
 custom.d.ts                                        | 2 --
 src/components/DropdownOrLabel/DropdownOrLabel.tsx | 2 +-
 src/services/OpenAPIParser.ts                      | 4 ++--
 src/utils/object.ts                                | 4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/custom.d.ts b/custom.d.ts
index b0df57d6..10c4180c 100644
--- a/custom.d.ts
+++ b/custom.d.ts
@@ -23,5 +23,3 @@ declare var reactHotLoaderGlobal: any;
 interface Element {
   scrollIntoViewIfNeeded(centerIfNeeded?: boolean): void;
 }
-
-type GenericObject = Record<string, any>;
diff --git a/src/components/DropdownOrLabel/DropdownOrLabel.tsx b/src/components/DropdownOrLabel/DropdownOrLabel.tsx
index 29fefd58..c5a6c780 100644
--- a/src/components/DropdownOrLabel/DropdownOrLabel.tsx
+++ b/src/components/DropdownOrLabel/DropdownOrLabel.tsx
@@ -4,7 +4,7 @@ import { StyledComponent } from 'styled-components';
 import { DropdownProps, MimeLabel, SimpleDropdown } from '../../common-elements/Dropdown';
 
 export interface DropdownOrLabelProps extends DropdownProps {
-  Label?: StyledComponent<any, any, GenericObject, never>;
+  Label?: StyledComponent<any, any, Record<string, any>, never>;
   Dropdown?: StyledComponent<
     React.NamedExoticComponent<DropdownProps>,
     any,
diff --git a/src/services/OpenAPIParser.ts b/src/services/OpenAPIParser.ts
index 61a755d5..1542cf7e 100644
--- a/src/services/OpenAPIParser.ts
+++ b/src/services/OpenAPIParser.ts
@@ -41,7 +41,7 @@ export class OpenAPIParser {
     }
   }
 
-  validate(spec: GenericObject): void {
+  validate(spec: Record<string, any>): void {
     if (spec.openapi === undefined) {
       throw new Error('Document must be valid OpenAPI 3.0.0 definition');
     }
@@ -153,7 +153,7 @@ export class OpenAPIParser {
     } else {
       // small optimization
       return {
-        ...(resolved as GenericObject),
+        ...(resolved as object),
         ...rest,
       } as T;
     }
diff --git a/src/utils/object.ts b/src/utils/object.ts
index 1a220764..6efaab15 100644
--- a/src/utils/object.ts
+++ b/src/utils/object.ts
@@ -1,4 +1,4 @@
-export function objectHas(object: GenericObject, path: string | Array<string>): boolean {
+export function objectHas(object: object, path: string | Array<string>): boolean {
   let _path = <Array<string>>path;
 
   if (typeof path === 'string') {
@@ -12,7 +12,7 @@ export function objectHas(object: GenericObject, path: string | Array<string>):
   });
 }
 
-export function objectSet(object: GenericObject, path: string | Array<string>, value: any): void {
+export function objectSet(object: object, path: string | Array<string>, value: any): void {
   let _path = <Array<string>>path;
 
   if (typeof path === 'string') {