Merge pull request #12 from hckrnews/feature/optimize

Finetune data merge

.nvmrc

@@ -1 +1 @@
-20.9.0
+20.10.0

package.json

@@ -1,7 +1,7 @@
 {
     "name": "@hckrnews/openapi-model",
     "description": "OpenAPI Model",
-    "version": "0.2.8",
+    "version": "0.3.0",
     "author": {
         "name": "Pieter Wigboldus",
         "url": "https://hckr.news/"
@@ -53,6 +53,7 @@
         "ajv"
     ],
     "dependencies": {
+        "@hckrnews/deep-merge": "^0.1.2",
         "ajv": "^8.12.0",
         "ajv-formats": "^2.1.1"
     },
@@ -64,4 +65,4 @@
         "semver": "^7.5.3",
         "xml2js": "^0.5.0"
     }
-}
+}

src/model.js

@@ -1,5 +1,6 @@
 import Ajv from 'ajv'
 import addFormats from 'ajv-formats'
+import { deepMerge } from '@hckrnews/deep-merge'
 
 const defaultExtraAjvFormats = ['date', 'time', 'uri', 'uuid', 'email', 'hostname', 'regex']
 /**
@@ -49,7 +50,7 @@ const openapiToModel = (schema, options = {}) => {
      */
     constructor (data) {
       this.errors = undefined
-      this.data = data
+      this.data = data || {}
       this.schema = schema
       this.emptyObject = emptyObject
     }
@@ -59,10 +60,7 @@ const openapiToModel = (schema, options = {}) => {
      * @param {object=} data
      */
     set data (data) {
-      const newData = {
-        ...emptyObject,
-        ...data
-      }
+      const newData = deepMerge(emptyObject, data)
       const valid = compile(newData)
 
       if (validate && !valid) {

src/model.test.js

@@ -94,7 +94,7 @@ test('Test the openapiToModel helpers', async (t) => {
       // eslint-disable-next-line no-new
       new ExampleModel({
         baz: {
-          qux: '42'
+          qux: 42
         }
       })
     } catch (error) {
@@ -103,13 +103,13 @@ test('Test the openapiToModel helpers', async (t) => {
         error.errors,
         [
           {
-            instancePath: '/baz',
-            keyword: 'required',
-            message: "must have required property 'quux'",
+            instancePath: '/baz/qux',
+            keyword: 'type',
+            message: 'must be string',
             params: {
-              missingProperty: 'quux'
+              type: 'string'
             },
-            schemaPath: '#/properties/baz/required'
+            schemaPath: '#/properties/baz/properties/qux/type'
           }
         ]
       )
@@ -130,6 +130,7 @@ test('Test the openapiToModel helpers', async (t) => {
         {
           bar: 42,
           baz: {
+            quux: 3.14,
             qux: '42'
           },
           foo: 'bar'