Merge branch '0.1.4'

freearhey · Dec 1, 2016 · 8d34f47 · 8d34f47
2 parents 932713e + bbbf118
commit 8d34f47
Show file tree

Hide file tree

Showing 13 changed files with 367 additions and 34 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015"]
+}
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,2 @@
 node_modules
-npm-debug.log
-example.html
+npm-debug.log
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,3 @@
+language: node_js
+node_js:
+  - 6.1
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Simply include `vue2-filters` after Vue and it will install itself automatically
 
 ```html
 <script src="https://unpkg.com/vue/dist/vue.js"></script>
-<script src="https://cdn.jsdelivr.net/vue2-filters/0.1.3/vue2-filters.min.js"></script>
+<script src="https://cdn.jsdelivr.net/vue2-filters/0.1.4/vue2-filters.min.js"></script>
 ```
 
 ### NPM

diff --git a/dist/vue2-filters.js b/dist/vue2-filters.js
@@ -180,6 +180,14 @@ util.convertArray = function (value) {
     }
 }
 
+function multiIndex(obj,is) {  // obj,['1','2','3'] -> ((obj['1'])['2'])['3']
+    return is.length ? multiIndex(obj[is[0]],is.slice(1)) : obj
+}
+
+util.getPath = function(obj,is) {   // obj,'1.2.3' -> multiIndex(obj,['1','2','3'])
+    return multiIndex(obj,is.split('.'))
+}
+
 /**
  * Strict object type check. Only returns true
  * for plain JavaScript objects.
@@ -283,7 +291,7 @@ function filterBy (arr, search) {
       while (j--) {
         key = keys[j]
         if ((key === '$key' && contains(item.$key, search)) ||
-            contains(item[key], search)) {
+            contains(__WEBPACK_IMPORTED_MODULE_0__util_index__["a" /* default */].getPath(val, key), search)) {
           res.push(item)
           break
         }
@@ -361,7 +369,7 @@ function limitBy (arr, n, offset) {
 
 function orderBy (arr) {
   var comparator = null
-  var sortKey
+  var sortKeys
   arr = __WEBPACK_IMPORTED_MODULE_0__util_index__["a" /* default */].convertArray(arr)
 
   // determine order (last argument)
@@ -375,7 +383,7 @@ function orderBy (arr) {
   }
 
   // determine sortKeys & comparator
-  var firstArg = sortKey = args[0]
+  var firstArg = args[0]
   if (!firstArg) {
     return arr
   } else if (typeof firstArg === 'function') {
@@ -384,20 +392,25 @@ function orderBy (arr) {
       return firstArg(a, b) * order
     }
   } else {
-    comparator = function (a, b) {
-      return baseCompare(a, b)
+    // string keys. flatten first
+    sortKeys = Array.prototype.concat.apply([], args)
+    comparator = function (a, b, i) {
+      i = i || 0
+      return i >= sortKeys.length - 1
+        ? baseCompare(a, b, i)
+        : baseCompare(a, b, i) || comparator(a, b, i + 1)
     }
   }
 
-  function baseCompare(a, b) {
+  function baseCompare (a, b, sortKeyIndex) {
+    const sortKey = sortKeys[sortKeyIndex]
     if (sortKey) {
-      if (a[sortKey] > b[sortKey]) {
-        return order
-      }
-      if (a[sortKey] < b[sortKey]) {
-        return -order
+      if (sortKey !== '$key') {
+        if (__WEBPACK_IMPORTED_MODULE_0__util_index__["a" /* default */].isObject(a) && '$value' in a) a = a.$value
+        if (__WEBPACK_IMPORTED_MODULE_0__util_index__["a" /* default */].isObject(b) && '$value' in b) b = b.$value
       }
-      return 0
+      a = __WEBPACK_IMPORTED_MODULE_0__util_index__["a" /* default */].isObject(a) ? __WEBPACK_IMPORTED_MODULE_0__util_index__["a" /* default */].getPath(a, sortKey) : a
+      b = __WEBPACK_IMPORTED_MODULE_0__util_index__["a" /* default */].isObject(b) ? __WEBPACK_IMPORTED_MODULE_0__util_index__["a" /* default */].getPath(b, sortKey) : b
     }
     return a === b ? 0 : a > b ? order : -order
   }
@@ -469,7 +482,6 @@ function currency (value, currency, decimals) {
 
 function pluralize (value) {
   var args = __WEBPACK_IMPORTED_MODULE_0__util_index__["a" /* default */].toArray(arguments, 1)
-  args.shift()
   return args.length > 1
     ? (args[value % 10 - 1] || args[args.length - 1])
     : (args[0] + (value === 1 ? '' : 's'))

diff --git a/dist/vue2-filters.min.js b/dist/vue2-filters.min.js
diff --git a/package.json b/package.json
@@ -1,12 +1,12 @@
 {
   "name": "vue2-filters",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "The list of standard filters Vue.js 1.* adapted for use in Vue.js 2.*",
   "main": "dist/vue2-filters.js",
   "scripts": {
-    "build": "webpack src/index.js dist/vue2-filters.min.js --output-library-target umd --optimize-minimize",
-    "dev": "webpack src/index.js dist/vue2-filters.js --output-library-target umd --watch",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "build": "node_modules/.bin/webpack src/index.js dist/vue2-filters.min.js --output-library-target umd --optimize-minimize",
+    "dev": "node_modules/.bin/webpack src/index.js dist/vue2-filters.js --output-library-target umd --watch",
+    "test": "node_modules/.bin/karma start test/karma.conf.js --single-run --no-auto-watch"
   },
   "keywords": [
     "vuejs",
@@ -17,6 +17,14 @@
   "author": "Arhey",
   "license": "MIT",
   "devDependencies": {
+    "babel-core": "^6.18.2",
+    "babel-loader": "^6.2.8",
+    "babel-preset-es2015": "^6.18.0",
+    "jasmine": "^2.5.2",
+    "karma": "^1.3.0",
+    "karma-jasmine": "^1.0.2",
+    "karma-phantomjs-launcher": "^1.0.2",
+    "karma-webpack": "^1.8.0",
     "webpack": "^2.1.0-beta.27"
   },
   "dependencies": {}

diff --git a/src/array/filterBy.js b/src/array/filterBy.js
@@ -31,7 +31,7 @@ function filterBy (arr, search) {
       while (j--) {
         key = keys[j]
         if ((key === '$key' && contains(item.$key, search)) ||
-            contains(item[key], search)) {
+            contains(util.getPath(val, key), search)) {
           res.push(item)
           break
         }

diff --git a/src/array/orderBy.js b/src/array/orderBy.js
@@ -9,7 +9,7 @@ import util from '../util/index'
 
 function orderBy (arr) {
   var comparator = null
-  var sortKey
+  var sortKeys
   arr = util.convertArray(arr)
 
   // determine order (last argument)
@@ -23,7 +23,7 @@ function orderBy (arr) {
   }
 
   // determine sortKeys & comparator
-  var firstArg = sortKey = args[0]
+  var firstArg = args[0]
   if (!firstArg) {
     return arr
   } else if (typeof firstArg === 'function') {
@@ -32,20 +32,25 @@ function orderBy (arr) {
       return firstArg(a, b) * order
     }
   } else {
-    comparator = function (a, b) {
-      return baseCompare(a, b)
+    // string keys. flatten first
+    sortKeys = Array.prototype.concat.apply([], args)
+    comparator = function (a, b, i) {
+      i = i || 0
+      return i >= sortKeys.length - 1
+        ? baseCompare(a, b, i)
+        : baseCompare(a, b, i) || comparator(a, b, i + 1)
     }
   }
 
-  function baseCompare(a, b) {
+  function baseCompare (a, b, sortKeyIndex) {
+    const sortKey = sortKeys[sortKeyIndex]
     if (sortKey) {
-      if (a[sortKey] > b[sortKey]) {
-        return order
-      }
-      if (a[sortKey] < b[sortKey]) {
-        return -order
+      if (sortKey !== '$key') {
+        if (util.isObject(a) && '$value' in a) a = a.$value
+        if (util.isObject(b) && '$value' in b) b = b.$value
       }
-      return 0
+      a = util.isObject(a) ? util.getPath(a, sortKey) : a
+      b = util.isObject(b) ? util.getPath(b, sortKey) : b
     }
     return a === b ? 0 : a > b ? order : -order
   }

diff --git a/src/other/pluralize.js b/src/other/pluralize.js
@@ -15,7 +15,6 @@ import util from '../util/index'
 
 function pluralize (value) {
   var args = util.toArray(arguments, 1)
-  args.shift()
   return args.length > 1
     ? (args[value % 10 - 1] || args[args.length - 1])
     : (args[0] + (value === 1 ? '' : 's'))

diff --git a/src/util/index.js b/src/util/index.js
@@ -99,6 +99,14 @@ util.convertArray = function (value) {
     }
 }
 
+function multiIndex(obj,is) {  // obj,['1','2','3'] -> ((obj['1'])['2'])['3']
+    return is.length ? multiIndex(obj[is[0]],is.slice(1)) : obj
+}
+
+util.getPath = function(obj,is) {   // obj,'1.2.3' -> multiIndex(obj,['1','2','3'])
+    return multiIndex(obj,is.split('.'))
+}
+
 /**
  * Strict object type check. Only returns true
  * for plain JavaScript objects.