perf: replace accumulator spread with assignment (#274)

Author: Fdawgs

src/ObjectSchema.js

@@ -139,10 +139,8 @@ const ObjectSchema = ({ schema = initialState, ...options } = {}) => {
             "'patternProperties' invalid options. Provide a valid map e.g. { '^fo.*$': S.string() }"
           )
         }
-        return {
-          ...memo,
-          [pattern]: omit(schema.valueOf({ isRoot: false }), ['$schema'])
-        }
+        memo[pattern] = omit(schema.valueOf({ isRoot: false }), ['$schema'])
+        return memo
       }, {})
       return setAttribute({ schema, ...options }, [
         'patternProperties',
@@ -169,12 +167,10 @@ const ObjectSchema = ({ schema = initialState, ...options } = {}) => {
             "'dependencies' invalid options. Provide a valid map e.g. { 'foo': ['bar'] } or { 'foo': S.string() }"
           )
         }
-        return {
-          ...memo,
-          [prop]: Array.isArray(schema)
-            ? schema
-            : omit(schema.valueOf({ isRoot: false }), ['$schema', 'type', 'definitions'])
-        }
+        memo[prop] = Array.isArray(schema)
+          ? schema
+          : omit(schema.valueOf({ isRoot: false }), ['$schema', 'type', 'definitions'])
+        return memo
       }, {})
       return setAttribute({ schema, ...options }, [
         'dependencies',
@@ -199,10 +195,8 @@ const ObjectSchema = ({ schema = initialState, ...options } = {}) => {
             "'dependentRequired' invalid options. Provide a valid array e.g. { 'foo': ['bar'] }"
           )
         }
-        return {
-          ...memo,
-          [prop]: schema
-        }
+        memo[prop] = schema
+        return memo
       }, {})
 
       return setAttribute({ schema, ...options }, [
@@ -228,10 +222,8 @@ const ObjectSchema = ({ schema = initialState, ...options } = {}) => {
           )
         }
 
-        return {
-          ...memo,
-          [prop]: omit(schema.valueOf({ isRoot: false }), ['$schema', 'type', 'definitions'])
-        }
+        memo[prop] = omit(schema.valueOf({ isRoot: false }), ['$schema', 'type', 'definitions'])
+        return memo
       }, {})
 
       return setAttribute({ schema, ...options }, [
@@ -309,12 +301,15 @@ const ObjectSchema = ({ schema = initialState, ...options } = {}) => {
       // strip undefined values or empty arrays or internals
       attributes = Object.entries({ ...attributes, $id, type }).reduce(
         (memo, [key, value]) => {
-          return key === '$schema' ||
-            key === 'def' ||
-            value === undefined ||
-            (Array.isArray(value) && value.length === 0 && key !== 'default')
-            ? memo
-            : { ...memo, [key]: value }
+          if (
+            key !== '$schema' &&
+            key !== 'def' &&
+            value !== undefined &&
+            !(Array.isArray(value) && value.length === 0 && key !== 'default')
+          ) {
+            memo[key] = value
+          }
+          return memo
         },
         {}
       )

src/utils.js

@@ -1,6 +1,6 @@
 'use strict'
 const deepmerge = require('@fastify/deepmerge')
-const isFluentSchema = (obj) => obj && obj.isFluentSchema
+const isFluentSchema = (obj) => obj?.isFluentSchema
 
 const hasCombiningKeywords = (attributes) =>
   attributes.allOf || attributes.anyOf || attributes.oneOf || attributes.not
@@ -25,20 +25,17 @@ const isBoolean = (value) => typeof value === 'boolean'
 
 const omit = (obj, props) =>
   Object.entries(obj).reduce((memo, [key, value]) => {
-    if (props.includes(key)) return memo
-    return {
-      ...memo,
-      [key]: value
+    if (!props.includes(key)) {
+      memo[key] = value
     }
+    return memo
   }, {})
 
 const flat = (array) =>
   array.reduce((memo, prop) => {
     const { name, ...rest } = prop
-    return {
-      ...memo,
-      [name]: rest
-    }
+    memo[name] = rest
+    return memo
   }, {})
 
 const combineArray = (options) => {
@@ -132,16 +129,14 @@ const patchIdsWithParentId = ({ schema, generateIds, parentId }) => {
     ...schema,
     properties: properties.reduce((memo, [key, props]) => {
       const $id = props.$id || (generateIds ? `#properties/${key}` : undefined)
-      return {
-        ...memo,
-        [key]: {
-          ...props,
-          $id:
-            generateIds && parentId
-              ? `${parentId}/${$id.replace('#', '')}`
-              : $id // e.g. #properties/foo/properties/bar
-        }
+      memo[key] = {
+        ...props,
+        $id:
+          generateIds && parentId
+            ? `${parentId}/${$id.replace('#', '')}`
+            : $id // e.g. #properties/foo/properties/bar
       }
+      return memo
     }, {})
   }
 }
@@ -152,17 +147,14 @@ const appendRequired = ({
 }) => {
   const { schemaRequired, attributeRequired } = (required || []).reduce(
     (memo, item) => {
-      return item === REQUIRED
-        ? {
-            ...memo,
-            // append prop name to the schema.required
-            schemaRequired: [...memo.schemaRequired, name]
-          }
-        : {
-            ...memo,
-            // propagate required attributes
-            attributeRequired: [...memo.attributeRequired, item]
-          }
+      if (item === REQUIRED) {
+        // Append prop name to the schema.required
+        memo.schemaRequired.push(name)
+      } else {
+        // Propagate required attributes
+        memo.attributeRequired.push(item)
+      }
+      return memo
     },
     { schemaRequired: [], attributeRequired: [] }
   )