Merge pull request #3 from davestewart/fix/0002-global-state

Revert to previous prototype walk algorithm

Author: davestewart

package.json

@@ -1,7 +1,7 @@
 {
   "name": "vue-class-store",
   "description": "Universal Vue stores you write once and use anywhere",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "author": "Dave Stewart",
   "license": "MIT",
   "main": "dist/vue-class-store.js",

src/index.ts

@@ -1,23 +1,21 @@
-import Vue, { ComponentOptions, VueConstructor } from 'vue'
+import Vue, { ComponentOptions } from 'vue'
 
 type C = { new (...args: any[]): {} }
 
 type R = Record<any, any>
 
-function getDescriptors (model: R) {
+export function makeOptions(model: R): ComponentOptions<any> {
+  // prototype
   const prototype = Object.getPrototypeOf(model)
-  if (prototype === null || prototype === Object.prototype) {
+  if (!prototype || prototype === Object.prototype) {
     return {}
   }
-  const prototypeDescriptors = getDescriptors(prototype)
-  const descriptors = Object.getOwnPropertyDescriptors(prototype)
-  return { ...prototypeDescriptors, ...descriptors }
-}
 
-export function makeOptions(model: R): ComponentOptions<any> {
-  // prototype
-  const prototype = Object.getPrototypeOf(model)
-  const descriptors = getDescriptors(prototype)
+  // parent options
+  const extendsOptions = makeOptions(prototype)
+
+  // descriptors
+  const descriptors = Object.getOwnPropertyDescriptors(prototype)
 
   // options
   const name = prototype.constructor.name
@@ -59,6 +57,7 @@ export function makeOptions(model: R): ComponentOptions<any> {
   // return
   return {
     name,
+    extends: extendsOptions,
     computed,
     methods,
     watch,