fix(utilities): Resolved issue with isSetObject passing invalid types

storm-software · Jan 2, 2024 · a6c1dcf · a6c1dcf
1 parent 97ec2c7
commit a6c1dcf
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/docs/api-reports/packages/logging/api-report.md b/docs/api-reports/packages/logging/api-report.md
@@ -127,6 +127,7 @@ export { LoggingConfig as LoggingConfig_alias_1 };
 export const LoggingConfigSchema: z.ZodObject<
   {
     stacktrace: z.ZodOptional<z.ZodBoolean>;
+    fileLoggingDisabled: z.ZodDefault<z.ZodBoolean>;
     fileName: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     fileExtension: z.ZodDefault<z.ZodString>;
     path: z.ZodOptional<z.ZodString>;
@@ -155,6 +156,7 @@ export const LoggingConfigSchema: z.ZodObject<
   "strip",
   z.ZodTypeAny,
   {
+    fileLoggingDisabled: boolean;
     fileName: string;
     fileExtension: string;
     stacktrace?: boolean | undefined;
@@ -169,6 +171,7 @@ export const LoggingConfigSchema: z.ZodObject<
   },
   {
     stacktrace?: boolean | undefined;
+    fileLoggingDisabled?: boolean | undefined;
     fileName?: string | undefined;
     fileExtension?: string | undefined;
     path?: string | undefined;

diff --git a/docs/api-reports/packages/logging/documents-model.api.json b/docs/api-reports/packages/logging/documents-model.api.json
@@ -2068,6 +2068,24 @@
               "text": "z.ZodBoolean",
               "canonicalReference": "!z.ZodBoolean:type"
             },
+            {
+              "kind": "Content",
+              "text": ">;\n    fileLoggingDisabled: "
+            },
+            {
+              "kind": "Reference",
+              "text": "z.ZodDefault",
+              "canonicalReference": "!z.ZodDefault:type"
+            },
+            {
+              "kind": "Content",
+              "text": "<"
+            },
+            {
+              "kind": "Reference",
+              "text": "z.ZodBoolean",
+              "canonicalReference": "!z.ZodBoolean:type"
+            },
             {
               "kind": "Content",
               "text": ">;\n    fileName: "
@@ -2205,7 +2223,7 @@
             },
             {
               "kind": "Content",
-              "text": ", {\n    fileName: string;\n    fileExtension: string;\n    stacktrace?: boolean | undefined;\n    path?: string | undefined;\n    loki?: {\n        host: string;\n        username: string;\n        password: string;\n    } | undefined;\n}, {\n    stacktrace?: boolean | undefined;\n    fileName?: string | undefined;\n    fileExtension?: string | undefined;\n    path?: string | undefined;\n    loki?: {\n        username: string;\n        password: string;\n        host?: string | undefined;\n    } | undefined;\n}>"
+              "text": ", {\n    fileLoggingDisabled: boolean;\n    fileName: string;\n    fileExtension: string;\n    stacktrace?: boolean | undefined;\n    path?: string | undefined;\n    loki?: {\n        host: string;\n        username: string;\n        password: string;\n    } | undefined;\n}, {\n    stacktrace?: boolean | undefined;\n    fileLoggingDisabled?: boolean | undefined;\n    fileName?: string | undefined;\n    fileExtension?: string | undefined;\n    path?: string | undefined;\n    loki?: {\n        username: string;\n        password: string;\n        host?: string | undefined;\n    } | undefined;\n}>"
             }
           ],
           "fileUrlPath": "packages/logging/src/schema.ts",
@@ -2214,7 +2232,7 @@
           "name": "LoggingConfigSchema",
           "variableTypeTokenRange": {
             "startIndex": 1,
-            "endIndex": 37
+            "endIndex": 41
           }
         },
         {

diff --git a/packages/utilities/src/type-checks/is-set-object.ts b/packages/utilities/src/type-checks/is-set-object.ts
@@ -1,4 +1,5 @@
 import { isEmptyOrEmptyObject } from "./is-empty-object";
+import { isObject } from "./is-object";
 
 /**
  * Check if the provided value's type is NOT `null` nor `undefined` nor `{}`
@@ -8,7 +9,11 @@ import { isEmptyOrEmptyObject } from "./is-empty-object";
  */
 export const isSetObject = (value: unknown): value is NonNullable<object> => {
   try {
-    return isEmptyOrEmptyObject(value);
+    return (
+      !isEmptyOrEmptyObject(value) &&
+      isObject(value) &&
+      Object.keys(value).length > 0
+    );
   } catch (e) {
     return true;
   }