fixed nested schema definitions

nickforddev · nickforddev · commit b650de418f53 · 2017-10-05T12:28:28.000-04:00
diff --git a/index.html b/index.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>vue-request</title>
+    <title>vue-models</title>
   </head>
   <body>
     <div id="app"></div>
diff --git a/src/demo/App.vue b/src/demo/App.vue
@@ -1,34 +1,80 @@
 <template>
   <div id="app">
-    <button @click="test('get')">Get</button>
-    <button @click="test('put')">Put</button>
-    <button @click="test('post')">Post</button>
-    <button @click="test('delete')">Delete</button>
-
-    <div>
-      <button @click="jsfiddle">Get JSFiddle</button>
-    </div>
+    <h1>vue-models</h1>
+    <button @click="setUser">Set User</button>
+    <button @click="resetUser">Reset User</button>
+    <h2>decoded model:</h2>
+    <pre>{{ $user }}</pre>
+    <h2>encoded model:</h2>
+    <pre>{{ encoded }}</pre>
   </div>
 </template>
 
 <script>
+import User from './user'
 export default {
   name: 'app',
+  models: {
+    user() {
+      return new User()
+    }
+  },
+  computed: {
+    encoded() {
+      return this.$user.encode()
+    }
+  },
   methods: {
-    test(method) {
-      this.$request('/thing', {
-        method
-      })
-        .then(response => {
-          console.log({response})
-        })
-        .catch(err => {
-          console.warn(err)
-        })
+    setUser() {
+      this.$user = {
+        id: {
+          $oid: '586e6d75b7a7bc5c852c60a5'
+        },
+        created: {
+          $date: '2016-12-16T00:00:00'
+        },
+        updated: '2016-12-16T00:00:00',
+        role: 'admin',
+        first_name: 'Tony',
+        last_name: 'Tiger',
+        email: 'tonytiger@gmail.com',
+        notifications: {
+          alarm: {
+            $date: '2016-12-16T00:00:00'
+          },
+          test: {
+            one: {
+              $date: '2016-12-16T00:00:00'
+            },
+            two: {
+              three: {
+                $date: '2016-12-16T00:00:00'
+              }
+            }
+          }
+        },
+        things: [
+          {
+            id: {
+              $oid: '42356d75b7a7bc5c52c11a90'
+            },
+            created: {
+              $date: '2016-12-16T00:00:00'
+            }
+          },
+          {
+            id: {
+              $oid: '09a11c25c5cb7a7b57d65324"'
+            },
+            created: {
+              $date: '2016-12-16T00:00:00'
+            }
+          }
+        ]
+      }
     },
-    async jsfiddle() {
-      const response = await this.$request('http://google.com/')
-      console.log({response})
+    resetUser() {
+      this.$user.reset()
     }
   }
 }
@@ -41,6 +87,7 @@ export default {
   -moz-osx-font-smoothing: grayscale;
   text-align: center;
   color: #2c3e50;
-  margin-top: 60px;
+  text-align: left;
+  padding: 30px;
 }
 </style>
diff --git a/src/demo/index.js b/src/demo/index.js
@@ -1,26 +1,10 @@
 import Vue from 'vue'
 import App from './App'
-import VueRequest from '../index'
 
+import VueModels from '../index'
 Vue.config.productionTip = false
 
-const token = 'test'
-
-Vue.use(VueRequest, {
-  root: 'http://localhost:8080',
-  headers: {
-    Access() {
-      return token
-    },
-    Refresh: 'test_refresh_token'
-  },
-  before() {
-    console.log('fire this before')
-  },
-  timeout() {
-    console.log('fire this on timeout')
-  }
-})
+Vue.use(VueModels)
 
 /* eslint-disable no-new */
 new Vue({
diff --git a/src/demo/user.js b/src/demo/user.js
@@ -1,19 +1,27 @@
-import _ from 'lodash'
+// import _ from 'lodash'
 import { Model } from '../index'
 import { ObjectId, ISODate } from './types'
 
 const defaults = {
   name: 'user',
   computed: {
     basePath() {
-      const basePath = this.$options.basePath
-      return basePath || this.role + 's'
+      if (this.role) {
+        const basePath = this.$options.basePath
+        return basePath || this.role + 's'
+      } else {
+        return ''
+      }
     },
     full_name() {
-      return `${this.first_name} ${this.last_name}`
+      return this.role
+        ? `${this.first_name} ${this.last_name}`
+        : ``
     },
     initials() {
-      return `${this.first_name[0]}${this.last_name[0]}`.toUpperCase()
+      return this.role
+        ? `${this.first_name[0]}${this.last_name[0]}`.toUpperCase()
+        : ``
     }
   }
 }
@@ -45,26 +53,43 @@ export default class User extends Model {
       role: {
         type: String
       },
-      password: {
-        type: String
-      },
-      avatar_color: {
-        type: String
-      },
-      dwolla: {
-        type: Object
-      },
       notifications: {
-        type: Object
+        type: Object,
+        properties: {
+          alarm: {
+            type: ISODate
+          },
+          test: {
+            type: Object,
+            properties: {
+              one: {
+                type: ISODate
+              },
+              two: {
+                type: Object,
+                properties: {
+                  three: {
+                    type: ISODate
+                  }
+                }
+              }
+            }
+          }
+        }
       },
       status: {
         type: Object
       },
-      leases: {
-        type: Array
-      },
-      terms_accepted: {
-        type: Object
+      things: {
+        type: Array,
+        items: {
+          id: {
+            type: ObjectId
+          },
+          created: {
+            type: ISODate
+          }
+        }
       }
     }
   }
diff --git a/src/mixin.js b/src/mixin.js
@@ -26,7 +26,7 @@ const init = (vm) => {
   }
   if (isDef(vm.$models)) {
     if (!vm.$options.computed) {
-      vm.$options.computed = {};
+      vm.$options.computed = {}
     }
     for (let key in vm.$models) {
       makeComputedProp(vm, key)
diff --git a/src/model.js b/src/model.js
@@ -34,7 +34,7 @@ export default class Model {
           return basePath || this.$options.name + 's'
         },
         urlRoot() {
-          return `${this.basePath}/${this.id}`;
+          return `${this.basePath}/${this.id}`
         },
         isNew() {
           return this.id === undefined
@@ -98,6 +98,7 @@ export default class Model {
           return req
         },
         set(data) {
+          console.log('set', data)
           const data_decoded = this.decode(data)
           _.merge(this, data_decoded)
           return this
diff --git a/src/utils/index.js b/src/utils/index.js
@@ -103,15 +103,21 @@ const traverse = (data, schema, func) => {
     output = data.map(item => {
       for (let key in item) {
         if (schema.items && key in schema.items) {
-          item[key] = traverse(item[key], schema[key], func)
+          if ([Object, Array, Function].includes(schema.items[key])) {
+            item[key] = traverse(item[key], schema[key], func)
+          } else {
+            item[key] = func(item[key], schema.items[key])
+          }
         }
       }
       return item
     })
   } else if (data instanceof Object) {
     for (let key in data) {
-      if (schema.properties && key in schema.properties) {
+      if (schema[key].items) {
         output[key] = traverse(data[key], schema[key], func)
+      } else if (schema[key] && schema[key].properties) {
+        output[key] = traverse(data[key], schema[key].properties, func)
       } else if (key in schema) {
         output[key] = func(data[key], schema[key])
       } else {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ const init = (vm) => {`
`26`	`26`	`}`
`27`	`27`	`if (isDef(vm.$models)) {`
`28`	`28`	`if (!vm.$options.computed) {`
`29`		`- vm.$options.computed = {};`
	`29`	`+ vm.$options.computed = {}`
`30`	`30`	`}`
`31`	`31`	`for (let key in vm.$models) {`
`32`	`32`	`makeComputedProp(vm, key)`