From 89202afe2bb45a7a646aaa8906b279262ebb941f Mon Sep 17 00:00:00 2001 From: alec-mccormick Date: Tue, 30 Jul 2019 17:11:49 -0700 Subject: [PATCH] Allow values to be 'null' for types with a defined custom wrapper --- src/converter.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/converter.js b/src/converter.js index 44d952e61..2bd590fa6 100644 --- a/src/converter.js +++ b/src/converter.js @@ -6,7 +6,8 @@ var converter = exports; var Enum = require("./enum"), - util = require("./util"); + util = require("./util"), + wrappers = require("./wrappers"); /** * Generates a partial value fromObject conveter. @@ -129,7 +130,11 @@ converter.fromObject = function fromObject(mtype) { genValuePartial_fromObject(gen, field, /* not sorted */ i, prop + "[i]") ("}") ("}"); - + // Wrapper fields + } else if (field.resolvedType && wrappers[field.resolvedType.fullName]) { gen + ("if(typeof d%s!==\"undefined\"){", prop); + genValuePartial_fromObject(gen, field, /* not sorted */ i, prop) + ("}"); // Non-repeated fields } else { if (!(field.resolvedType instanceof Enum)) gen // no need to test for null/undefined if an enum (uses switch)