fix query default bug (#85)

Profiscience · Jul 18, 2016 · 6d18b10 · 6d18b10
1 parent 03e69da
commit 6d18b10
Show file tree

Hide file tree

Showing 10 changed files with 98 additions and 14 deletions.
diff --git a/dist/ko-component-router.js b/dist/ko-component-router.js
@@ -347,6 +347,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	      var push = arguments.length <= 2 || arguments[2] === undefined ? true : arguments[2];
 	      var query = arguments.length <= 3 || arguments[3] === undefined ? false : arguments[3];
 
+	      // debugger
 	      var url = this.resolveUrl(origUrl);
 	      var route = this.getRouteForUrl(url);
 	      var firstRun = this.route() === '';
@@ -1166,7 +1167,6 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	      if (!cache[guid][prop]) {
 	        cache[guid][prop] = {
-	          defaultVal: defaultVal,
 	          parser: parser,
 	          value: _knockout2.default.pureComputed({
 	            read: function read() {
@@ -1201,6 +1201,18 @@ return /******/ (function(modules) { // webpackBootstrap
 	          })
 	        };
 	      }
+
+	      if (defaultVal) {
+	        // clone to prevent defaultVal from being changed by reference
+	        if ((0, _utils.isArray)(defaultVal)) {
+	          cache[guid][prop].defaultVal = defaultVal.slice(0);
+	        } else if ((0, _utils.isPlainObject)(defaultVal)) {
+	          cache[guid][prop].defaultVal = (0, _utils.extend)({}, defaultVal, false);
+	        } else {
+	          cache[guid][prop].defaultVal = defaultVal;
+	        }
+	      }
+
 	      return cache[guid][prop].value;
 	    }
 	  }, {
@@ -1242,7 +1254,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	      var guid = this.ctx.config.depth + pathname;
 	      for (var pn in cache[guid]) {
 	        var p = cache[guid][pn];
-	        p.value(p.defaultVal);
+	        this.get(pn)(p.defaultVal);
 	      }
 	    }
 	  }, {
@@ -1357,6 +1369,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports.extend = extend;
 	exports.identity = identity;
 	exports.isUndefined = isUndefined;
+	exports.isFunction = isFunction;
+	exports.isPlainObject = isPlainObject;
+	exports.isArray = isArray;
 	exports.mapKeys = mapKeys;
 	exports.merge = merge;
 
@@ -1507,11 +1522,13 @@ return /******/ (function(modules) { // webpackBootstrap
 	        }
 	      } else if (isUndefined(src[prop])) {
 	        dest[prop] = undefined;
-	      } else if (src[prop].constructor === Object) {
+	      } else if (isPlainObject(src[prop])) {
 	        if (_shallow) {
 	          dest[prop] = {};
 	        }
 	        extend(dest[prop], src[prop], createAsObservable);
+	      } else if (isArray(src[prop])) {
+	        dest[prop] = src[prop].slice(0);
 	      } else {
 	        dest[prop] = src[prop];
 	      }
@@ -1542,6 +1559,18 @@ return /******/ (function(modules) { // webpackBootstrap
 	  return typeof x === 'undefined';
 	}
 
+	function isFunction(x) {
+	  return typeof x === 'function';
+	}
+
+	function isPlainObject(x) {
+	  return x.constructor === Object;
+	}
+
+	function isArray(x) {
+	  return isFunction(x.splice);
+	}
+
 	function mapKeys(obj, fn) {
 	  var mappedObj = {};
 	  Object.keys(obj).forEach(function (k) {

diff --git a/dist/ko-component-router.min.js b/dist/ko-component-router.min.js
diff --git a/example/dist/bundle.js b/example/dist/bundle.js
diff --git a/example/dist/bundle.js.map b/example/dist/bundle.js.map
diff --git a/lib/context.js b/lib/context.js
@@ -80,6 +80,7 @@ var Context = function () {
       var push = arguments.length <= 2 || arguments[2] === undefined ? true : arguments[2];
       var query = arguments.length <= 3 || arguments[3] === undefined ? false : arguments[3];
 
+      // debugger
       var url = this.resolveUrl(origUrl);
       var route = this.getRouteForUrl(url);
       var firstRun = this.route() === '';

diff --git a/lib/query.js b/lib/query.js
@@ -62,7 +62,6 @@ var Query = function () {
 
       if (!cache[guid][prop]) {
         cache[guid][prop] = {
-          defaultVal: defaultVal,
           parser: parser,
           value: _knockout2.default.pureComputed({
             read: function read() {
@@ -97,6 +96,18 @@ var Query = function () {
           })
         };
       }
+
+      if (defaultVal) {
+        // clone to prevent defaultVal from being changed by reference
+        if ((0, _utils.isArray)(defaultVal)) {
+          cache[guid][prop].defaultVal = defaultVal.slice(0);
+        } else if ((0, _utils.isPlainObject)(defaultVal)) {
+          cache[guid][prop].defaultVal = (0, _utils.extend)({}, defaultVal, false);
+        } else {
+          cache[guid][prop].defaultVal = defaultVal;
+        }
+      }
+
       return cache[guid][prop].value;
     }
   }, {
@@ -138,7 +149,7 @@ var Query = function () {
       var guid = this.ctx.config.depth + pathname;
       for (var pn in cache[guid]) {
         var p = cache[guid][pn];
-        p.value(p.defaultVal);
+        this.get(pn)(p.defaultVal);
       }
     }
   }, {

diff --git a/lib/utils.js b/lib/utils.js
@@ -12,6 +12,9 @@ exports.deepEquals = deepEquals;
 exports.extend = extend;
 exports.identity = identity;
 exports.isUndefined = isUndefined;
+exports.isFunction = isFunction;
+exports.isPlainObject = isPlainObject;
+exports.isArray = isArray;
 exports.mapKeys = mapKeys;
 exports.merge = merge;
 
@@ -162,11 +165,13 @@ function extend(dest, src) {
         }
       } else if (isUndefined(src[prop])) {
         dest[prop] = undefined;
-      } else if (src[prop].constructor === Object) {
+      } else if (isPlainObject(src[prop])) {
         if (_shallow) {
           dest[prop] = {};
         }
         extend(dest[prop], src[prop], createAsObservable);
+      } else if (isArray(src[prop])) {
+        dest[prop] = src[prop].slice(0);
       } else {
         dest[prop] = src[prop];
       }
@@ -197,6 +202,18 @@ function isUndefined(x) {
   return typeof x === 'undefined';
 }
 
+function isFunction(x) {
+  return typeof x === 'function';
+}
+
+function isPlainObject(x) {
+  return x.constructor === Object;
+}
+
+function isArray(x) {
+  return isFunction(x.splice);
+}
+
 function mapKeys(obj, fn) {
   var mappedObj = {};
   Object.keys(obj).forEach(function (k) {

diff --git a/src/context.js b/src/context.js
@@ -46,6 +46,7 @@ export default class Context {
   }
 
   update(origUrl = this.canonicalPath(), state = false, push = true, query = false) {
+    // debugger
     const url = this.resolveUrl(origUrl)
     const route = this.getRouteForUrl(url)
     const firstRun = this.route() === ''

diff --git a/src/query.js b/src/query.js
@@ -1,6 +1,6 @@
 import ko from 'knockout'
 import qs from 'qs'
-import { deepEquals, identity, isUndefined, mapKeys, merge } from './utils'
+import { deepEquals, extend, identity, isArray, isPlainObject, isUndefined, mapKeys, merge } from './utils'
 
 const qsParams = {}
 const trigger = ko.observable(true)
@@ -34,7 +34,6 @@ class Query {
 
     if (!cache[guid][prop]) {
       cache[guid][prop] = {
-        defaultVal,
         parser,
         value: ko.pureComputed({
           read() {
@@ -67,6 +66,18 @@ class Query {
         })
       }
     }
+
+    if (defaultVal) {
+      // clone to prevent defaultVal from being changed by reference
+      if (isArray(defaultVal)) {
+        cache[guid][prop].defaultVal = defaultVal.slice(0)
+      } else if (isPlainObject(defaultVal)) {
+        cache[guid][prop].defaultVal = extend({}, defaultVal, false)
+      } else {
+        cache[guid][prop].defaultVal = defaultVal
+      }
+    }
+
     return cache[guid][prop].value
   }
 
@@ -105,7 +116,7 @@ class Query {
     const guid = this.ctx.config.depth + pathname
     for (const pn in cache[guid]) {
       const p = cache[guid][pn]
-      p.value(p.defaultVal)
+      this.get(pn)(p.defaultVal)
     }
   }
 

diff --git a/src/utils.js b/src/utils.js
@@ -81,11 +81,13 @@ export function extend(dest, src, createAsObservable = true, _shallow = true) {
       }
     } else if (isUndefined(src[prop])) {
       dest[prop] = undefined
-    } else if (src[prop].constructor === Object) {
+    } else if (isPlainObject(src[prop])) {
       if (_shallow) {
         dest[prop] = {}
       }
       extend(dest[prop], src[prop], createAsObservable)
+    } else if (isArray(src[prop])) {
+      dest[prop] = src[prop].slice(0)
     } else {
       dest[prop] = src[prop]
     }
@@ -102,6 +104,18 @@ export function isUndefined(x) {
   return typeof x === 'undefined'
 }
 
+export function isFunction(x) {
+  return typeof x === 'function'
+}
+
+export function isPlainObject(x) {
+  return x.constructor === Object
+}
+
+export function isArray(x) {
+  return isFunction(x.splice)
+}
+
 export function mapKeys(obj, fn) {
   const mappedObj = {}
   Object.keys(obj).forEach((k) => mappedObj[k] = fn(k))