Merge pull request #105 from lamchakchan/99-dedup-hoek-reach-invocations

Closes #99
xogroup · Feb 18, 2017 · ccd1d4a · ccd1d4a
2 parents a7c1b99 + 0638128
commit ccd1d4a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/helpers.js b/lib/helpers.js
@@ -589,8 +589,9 @@ internals.object = function (schema, options) {
         Object.keys(schemaDescription.children).forEach((childKey) => {
 
             const childSchema = schemaDescription.children[childKey];
-            const childIsOptional = Hoek.reach(childSchema, 'flags.presence') === 'optional';
-            const childIsForbidden = Hoek.reach(childSchema, 'flags.presence') === 'forbidden';
+            const flagsPresence = Hoek.reach(childSchema, 'flags.presence');
+            const childIsOptional = flagsPresence === 'optional';
+            const childIsForbidden = flagsPresence === 'forbidden';
             const shouldStrip = Hoek.reach(childSchema, 'flags.strip');
 
             if (shouldStrip || childIsForbidden || (childIsOptional && !(Hoek.reach(options, 'config.includeOptional')))) {

diff --git a/lib/joiGenerator.js b/lib/joiGenerator.js
@@ -51,8 +51,9 @@ const generate = function (schemaInput, options) {
 
             childrenKeys.forEach((childKey) => {
 
-                const childIsOptional = Hoek.reach(schemaDescription.children[childKey], 'flags.presence') === 'optional';
-                const childIsForbidden = Hoek.reach(schemaDescription.children[childKey], 'flags.presence') === 'forbidden';
+                const flagsPresence = Hoek.reach(schemaDescription.children[childKey], 'flags.presence');
+                const childIsOptional = flagsPresence === 'optional';
+                const childIsForbidden = flagsPresence === 'forbidden';
 
                 if (childIsForbidden || (childIsOptional && !(Hoek.reach(config, 'includeOptional')))) {
                     return;