refactor: resolved PR comments

apimatic · Jul 18, 2024 · 3b120ab · 3b120ab
1 parent 7d7a6a1
commit 3b120ab
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/packages/schema/src/types/discriminatedObject.ts b/packages/schema/src/types/discriminatedObject.ts
@@ -23,7 +23,7 @@ export function discriminatedObject<
   const selectSchemaWithDisc = (
     value: unknown,
     discriminatorProp: string | TDiscrimProp | TDiscrimMappedProp,
-    isAttr: boolean
+    isAttr?: boolean
   ) => {
     if (
       typeof value === 'object' &&
@@ -51,16 +51,16 @@ export function discriminatedObject<
   const selectSchema = (
     value: unknown,
     discriminatorProp: string | TDiscrimProp | TDiscrimMappedProp,
-    checker: (schema: TSchema) => SchemaValidationError[],
-    isAttr: boolean = false
+    validater: (schema: TSchema) => SchemaValidationError[],
+    isAttr?: boolean
   ) => {
     const schema = selectSchemaWithDisc(value, discriminatorProp, isAttr);
     if (typeof schema !== 'undefined') {
       return schema;
     }
     // Try checking with discriminator matching
     for (const key in allSchemas) {
-      if (checker(allSchemas[key]).length === 0) {
+      if (validater(allSchemas[key]).length === 0) {
         return allSchemas[key];
       }
     }

diff --git a/packages/schema/src/types/object.ts b/packages/schema/src/types/object.ts
@@ -9,6 +9,7 @@ import { OptionalizeObject } from '../typeUtils';
 import {
   isOptional,
   isOptionalNullable,
+  isOptionalOrNullableType,
   literalToString,
   objectEntries,
   objectKeyEncode,
@@ -377,10 +378,7 @@ function validateValueObject({
             ctxt.createChild(propTypePrefix + key, valueObject[key], schema)
           )
         );
-      } else if (
-        !schema.type().startsWith('Optional<') &&
-        !schema.type().startsWith('Nullable<')
-      ) {
+      } else if (!isOptionalOrNullableType(schema.type())) {
         // Add to missing keys if it is not an optional property
         missingProps.add(key);
       }

diff --git a/packages/schema/src/utils.ts b/packages/schema/src/utils.ts
@@ -161,9 +161,16 @@ export function isOptional(type: string, value: unknown): boolean {
 }
 
 export function isOptionalNullable(type: string, value: unknown): boolean {
+  return isOptionalAndNullableType(type) && isNullOrMissing(value);
+}
+
+export function isOptionalAndNullableType(type: string): boolean {
   return (
-    (type.startsWith('Optional<Nullable<') ||
-      type.startsWith('Nullable<Optional<')) &&
-    isNullOrMissing(value)
+    type.startsWith('Optional<Nullable<') ||
+    type.startsWith('Nullable<Optional<')
   );
 }
+
+export function isOptionalOrNullableType(type: string): boolean {
+  return type.startsWith('Optional<') || type.startsWith('Nullable<');
+}