fix(gen): properly handle nullables

Author: rvagg

lib/gen/typescript.js

@@ -178,7 +178,11 @@ export function generateTypeScript (schema) {
             fieldValidators.push(`      (${inCheck} (${fieldDefn.nullable ? `value.${fieldName} === null || ` : ''}(Array.isArray(value.${fieldName}) && value.${fieldName}.every(${elementType}.is${elementType}))))`)
           }
         } else {
-          fieldValidators.push(`      (${inCheck} ${fieldDefn.nullable ? `value.${fieldName} === null || ` : ''}(${fieldType}.is${fieldType}(value.${fieldName})))`)
+          if (fieldDefn.nullable) {
+            fieldValidators.push(`      (${inCheck} (value.${fieldName} === null || ${fieldType}.is${fieldType}(value.${fieldName})))`)
+          } else {
+            fieldValidators.push(`      (${inCheck} (${fieldType}.is${fieldType}(value.${fieldName})))`)
+          }
         }
       }
 

test/fixtures/gen/optionals.md

@@ -149,9 +149,9 @@ export namespace Profile {
     const keyCount = Object.keys(value).length
     return keyCount >= 2 && keyCount <= 4 &&
       ('userId' in value && (KindString.isKindString(value.userId))) &&
-      (!('bio' in value) || value.bio === null || (KindString.isKindString(value.bio))) &&
+      (!('bio' in value) || (value.bio === null || KindString.isKindString(value.bio))) &&
       (!('avatar' in value) || (KindString.isKindString(value.avatar))) &&
-      ('lastLogin' in value && value.lastLogin === null || (KindInt.isKindInt(value.lastLogin)))
+      ('lastLogin' in value && (value.lastLogin === null || KindInt.isKindInt(value.lastLogin)))
   }
 }
 

test/fixtures/gen/unions-kinded.md

@@ -240,7 +240,7 @@ export namespace Settings {
     const keyCount = Object.keys(value).length
     return keyCount === 2 &&
       ('name' in value && (KindString.isKindString(value.name))) &&
-      ('config' in value && value.config === null || (ConfigValue.isConfigValue(value.config)))
+      ('config' in value && (value.config === null || ConfigValue.isConfigValue(value.config)))
   }
 }
 ```