Merge pull request #64 from HubSpot/fix-table-bug

Fix bug with isObject
HubSpot · Nov 14, 2023 · 661ddee · 661ddee
2 parents 6a1ed62 + 7005327
commit 661ddee
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/lib/cms/functions.ts b/lib/cms/functions.ts
@@ -4,7 +4,6 @@ import findup from 'findup-sync';
 import { getCwd } from '../path';
 import { downloadGithubRepoContents } from '../github';
 import { debug, makeTypedLogger } from '../../utils/logger';
-import { isObject } from '../../utils/objectUtils';
 import { throwErrorWithMessage } from '../../errors/standardErrors';
 import { throwFileSystemError } from '../../errors/fileSystemErrors';
 import { BaseError } from '../../types/Error';
@@ -25,6 +24,11 @@ type Config = {
   };
 };
 
+function isObjectOrFunction(value: object): boolean {
+  const type = typeof value;
+  return value != null && (type === 'object' || type === 'function');
+}
+
 function createEndpoint(
   endpointMethod: string,
   filename: string
@@ -92,7 +96,7 @@ function updateExistingConfig(
     });
   }
 
-  if (!isObject(config)) {
+  if (!isObjectOrFunction(config)) {
     throwErrorWithMessage(
       `${i18nKey}.updateExistingConfig.errors.configIsNotObjectError`,
       { configFilePath }

diff --git a/utils/objectUtils.ts b/utils/objectUtils.ts
@@ -1,6 +1,6 @@
-export function isObject(value: object): boolean {
-  const type = typeof value;
-  return value != null && (type === 'object' || type === 'function');
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function isObject(item: any) {
+  return item && typeof item === 'object' && !Array.isArray(item);
 }
 
 export function mergeDeep(