From c30ed398e3cdcbe4bcc45b3e003c5bed54560e81 Mon Sep 17 00:00:00 2001 From: sharpshark28 Date: Thu, 22 Feb 2018 19:28:53 -0600 Subject: [PATCH 1/2] 1.1.3 --- README.md | 10 +- coverage/clover.xml | 38 ++++ coverage/coverage-final.json | 2 + coverage/lcov-report/base.css | 212 +++++++++++++++++++ coverage/lcov-report/index.html | 93 +++++++++ coverage/lcov-report/index.js.html | 230 +++++++++++++++++++++ coverage/lcov-report/prettify.css | 1 + coverage/lcov-report/prettify.js | 1 + coverage/lcov-report/sort-arrow-sprite.png | Bin 0 -> 209 bytes coverage/lcov-report/sorter.js | 158 ++++++++++++++ coverage/lcov.info | 73 +++++++ index.js | 49 +++-- index.test.js | 126 ++++++++++- package.json | 2 +- 14 files changed, 962 insertions(+), 33 deletions(-) create mode 100644 coverage/clover.xml create mode 100644 coverage/coverage-final.json create mode 100644 coverage/lcov-report/base.css create mode 100644 coverage/lcov-report/index.html create mode 100644 coverage/lcov-report/index.js.html create mode 100644 coverage/lcov-report/prettify.css create mode 100644 coverage/lcov-report/prettify.js create mode 100644 coverage/lcov-report/sort-arrow-sprite.png create mode 100644 coverage/lcov-report/sorter.js create mode 100644 coverage/lcov.info diff --git a/README.md b/README.md index 82c5da3..0674050 100644 --- a/README.md +++ b/README.md @@ -48,22 +48,26 @@ Simpler version of search using a custom function in the chain. #### Sort +``` +.sort((a, b) => a > b) +``` + ##### By Boolean ```javascript -.sort('isActiveUser', true) +.sortBy('isActiveUser') ``` ##### By String ```javascript -.sort('name') +.sortBy('name') ``` ##### By Number ```javascript -.sort('netWorth') +.sortBy('netWorth') ``` #### Pagination diff --git a/coverage/clover.xml b/coverage/clover.xml new file mode 100644 index 0000000..91c71be --- /dev/null +++ b/coverage/clover.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/coverage/coverage-final.json b/coverage/coverage-final.json new file mode 100644 index 0000000..9948dec --- /dev/null +++ b/coverage/coverage-final.json @@ -0,0 +1,2 @@ +{"/Users/sharpshark28/web/json-query-chain/index.js": {"path":"/Users/sharpshark28/web/json-query-chain/index.js","statementMap":{"0":{"start":{"line":1,"column":0},"end":{"line":55,"column":1}},"1":{"start":{"line":3,"column":4},"end":{"line":6,"column":6}},"2":{"start":{"line":4,"column":6},"end":{"line":4,"column":24}},"3":{"start":{"line":5,"column":6},"end":{"line":5,"column":17}},"4":{"start":{"line":10,"column":4},"end":{"line":10,"column":20}},"5":{"start":{"line":14,"column":4},"end":{"line":14,"column":38}},"6":{"start":{"line":15,"column":4},"end":{"line":15,"column":15}},"7":{"start":{"line":19,"column":4},"end":{"line":19,"column":57}},"8":{"start":{"line":19,"column":41},"end":{"line":19,"column":56}},"9":{"start":{"line":20,"column":4},"end":{"line":20,"column":15}},"10":{"start":{"line":24,"column":4},"end":{"line":36,"column":5}},"11":{"start":{"line":26,"column":8},"end":{"line":26,"column":64}},"12":{"start":{"line":26,"column":45},"end":{"line":26,"column":63}},"13":{"start":{"line":27,"column":8},"end":{"line":27,"column":13}},"14":{"start":{"line":29,"column":8},"end":{"line":34,"column":10}},"15":{"start":{"line":30,"column":24},"end":{"line":30,"column":46}},"16":{"start":{"line":31,"column":28},"end":{"line":31,"column":67}},"17":{"start":{"line":32,"column":10},"end":{"line":32,"column":39}},"18":{"start":{"line":33,"column":10},"end":{"line":33,"column":28}},"19":{"start":{"line":35,"column":8},"end":{"line":35,"column":13}},"20":{"start":{"line":37,"column":4},"end":{"line":37,"column":15}},"21":{"start":{"line":41,"column":4},"end":{"line":45,"column":6}},"22":{"start":{"line":42,"column":6},"end":{"line":42,"column":36}},"23":{"start":{"line":42,"column":27},"end":{"line":42,"column":36}},"24":{"start":{"line":43,"column":6},"end":{"line":43,"column":35}},"25":{"start":{"line":43,"column":27},"end":{"line":43,"column":35}},"26":{"start":{"line":44,"column":6},"end":{"line":44,"column":14}},"27":{"start":{"line":46,"column":4},"end":{"line":46,"column":15}},"28":{"start":{"line":50,"column":14},"end":{"line":50,"column":38}},"29":{"start":{"line":51,"column":14},"end":{"line":51,"column":27}},"30":{"start":{"line":52,"column":4},"end":{"line":52,"column":41}},"31":{"start":{"line":53,"column":4},"end":{"line":53,"column":15}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":2,"column":2},"end":{"line":2,"column":3}},"loc":{"start":{"line":2,"column":21},"end":{"line":7,"column":3}},"line":2},"1":{"name":"(anonymous_1)","decl":{"start":{"line":3,"column":25},"end":{"line":3,"column":26}},"loc":{"start":{"line":3,"column":33},"end":{"line":6,"column":5}},"line":3},"2":{"name":"(anonymous_2)","decl":{"start":{"line":9,"column":2},"end":{"line":9,"column":3}},"loc":{"start":{"line":9,"column":17},"end":{"line":11,"column":3}},"line":9},"3":{"name":"(anonymous_3)","decl":{"start":{"line":13,"column":2},"end":{"line":13,"column":3}},"loc":{"start":{"line":13,"column":16},"end":{"line":16,"column":3}},"line":13},"4":{"name":"(anonymous_4)","decl":{"start":{"line":18,"column":2},"end":{"line":18,"column":3}},"loc":{"start":{"line":18,"column":23},"end":{"line":21,"column":3}},"line":18},"5":{"name":"(anonymous_5)","decl":{"start":{"line":19,"column":33},"end":{"line":19,"column":34}},"loc":{"start":{"line":19,"column":41},"end":{"line":19,"column":56}},"line":19},"6":{"name":"(anonymous_6)","decl":{"start":{"line":23,"column":2},"end":{"line":23,"column":3}},"loc":{"start":{"line":23,"column":32},"end":{"line":38,"column":3}},"line":23},"7":{"name":"(anonymous_7)","decl":{"start":{"line":26,"column":37},"end":{"line":26,"column":38}},"loc":{"start":{"line":26,"column":45},"end":{"line":26,"column":63}},"line":26},"8":{"name":"(anonymous_8)","decl":{"start":{"line":29,"column":37},"end":{"line":29,"column":38}},"loc":{"start":{"line":29,"column":45},"end":{"line":34,"column":9}},"line":29},"9":{"name":"(anonymous_9)","decl":{"start":{"line":40,"column":2},"end":{"line":40,"column":3}},"loc":{"start":{"line":40,"column":27},"end":{"line":47,"column":3}},"line":40},"10":{"name":"(anonymous_10)","decl":{"start":{"line":41,"column":31},"end":{"line":41,"column":32}},"loc":{"start":{"line":41,"column":41},"end":{"line":45,"column":5}},"line":41},"11":{"name":"(anonymous_11)","decl":{"start":{"line":49,"column":2},"end":{"line":49,"column":3}},"loc":{"start":{"line":49,"column":36},"end":{"line":54,"column":3}},"line":49}},"branchMap":{"0":{"loc":{"start":{"line":23,"column":21},"end":{"line":23,"column":30}},"type":"default-arg","locations":[{"start":{"line":23,"column":29},"end":{"line":23,"column":30}}],"line":23},"1":{"loc":{"start":{"line":24,"column":4},"end":{"line":36,"column":5}},"type":"switch","locations":[{"start":{"line":25,"column":6},"end":{"line":27,"column":13}},{"start":{"line":28,"column":6},"end":{"line":35,"column":13}}],"line":24},"2":{"loc":{"start":{"line":31,"column":29},"end":{"line":31,"column":59}},"type":"binary-expr","locations":[{"start":{"line":31,"column":29},"end":{"line":31,"column":53}},{"start":{"line":31,"column":57},"end":{"line":31,"column":59}}],"line":31},"3":{"loc":{"start":{"line":40,"column":8},"end":{"line":40,"column":25}},"type":"default-arg","locations":[{"start":{"line":40,"column":14},"end":{"line":40,"column":25}}],"line":40},"4":{"loc":{"start":{"line":42,"column":6},"end":{"line":42,"column":36}},"type":"if","locations":[{"start":{"line":42,"column":6},"end":{"line":42,"column":36}},{"start":{"line":42,"column":6},"end":{"line":42,"column":36}}],"line":42},"5":{"loc":{"start":{"line":43,"column":6},"end":{"line":43,"column":35}},"type":"if","locations":[{"start":{"line":43,"column":6},"end":{"line":43,"column":35}},{"start":{"line":43,"column":6},"end":{"line":43,"column":35}}],"line":43},"6":{"loc":{"start":{"line":49,"column":12},"end":{"line":49,"column":20}},"type":"default-arg","locations":[{"start":{"line":49,"column":19},"end":{"line":49,"column":20}}],"line":49},"7":{"loc":{"start":{"line":49,"column":22},"end":{"line":49,"column":34}},"type":"default-arg","locations":[{"start":{"line":49,"column":32},"end":{"line":49,"column":34}}],"line":49}},"s":{"0":1,"1":12,"2":108,"3":108,"4":12,"5":1,"6":1,"7":1,"8":9,"9":1,"10":3,"11":2,"12":18,"13":2,"14":1,"15":9,"16":9,"17":9,"18":9,"19":1,"20":3,"21":4,"22":48,"23":10,"24":38,"25":27,"26":11,"27":4,"28":4,"29":4,"30":4,"31":4},"f":{"0":12,"1":108,"2":12,"3":1,"4":1,"5":9,"6":3,"7":18,"8":9,"9":4,"10":48,"11":4},"b":{"0":[3],"1":[2,1],"2":[9,7],"3":[0],"4":[10,38],"5":[27,11],"6":[1],"7":[1]},"_coverageSchema":"332fd63041d2c1bcb487cc26dd0d5f7d97098a6c","hash":"0a1d673eb68d152c72702b26f3e41837a2997536"} +} diff --git a/coverage/lcov-report/base.css b/coverage/lcov-report/base.css new file mode 100644 index 0000000..417c7ad --- /dev/null +++ b/coverage/lcov-report/base.css @@ -0,0 +1,212 @@ +body, html { + margin:0; padding: 0; + height: 100%; +} +body { + font-family: Helvetica Neue, Helvetica, Arial; + font-size: 14px; + color:#333; +} +.small { font-size: 12px; } +*, *:after, *:before { + -webkit-box-sizing:border-box; + -moz-box-sizing:border-box; + box-sizing:border-box; + } +h1 { font-size: 20px; margin: 0;} +h2 { font-size: 14px; } +pre { + font: 12px/1.4 Consolas, "Liberation Mono", Menlo, Courier, monospace; + margin: 0; + padding: 0; + -moz-tab-size: 2; + -o-tab-size: 2; + tab-size: 2; +} +a { color:#0074D9; text-decoration:none; } +a:hover { text-decoration:underline; } +.strong { font-weight: bold; } +.space-top1 { padding: 10px 0 0 0; } +.pad2y { padding: 20px 0; } +.pad1y { padding: 10px 0; } +.pad2x { padding: 0 20px; } +.pad2 { padding: 20px; } +.pad1 { padding: 10px; } +.space-left2 { padding-left:55px; } +.space-right2 { padding-right:20px; } +.center { text-align:center; } +.clearfix { display:block; } +.clearfix:after { + content:''; + display:block; + height:0; + clear:both; + visibility:hidden; + } +.fl { float: left; } +@media only screen and (max-width:640px) { + .col3 { width:100%; max-width:100%; } + .hide-mobile { display:none!important; } +} + +.quiet { + color: #7f7f7f; + color: rgba(0,0,0,0.5); +} +.quiet a { opacity: 0.7; } + +.fraction { + font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace; + font-size: 10px; + color: #555; + background: #E8E8E8; + padding: 4px 5px; + border-radius: 3px; + vertical-align: middle; +} + +div.path a:link, div.path a:visited { color: #333; } +table.coverage { + border-collapse: collapse; + margin: 10px 0 0 0; + padding: 0; +} + +table.coverage td { + margin: 0; + padding: 0; + vertical-align: top; +} +table.coverage td.line-count { + text-align: right; + padding: 0 5px 0 20px; +} +table.coverage td.line-coverage { + text-align: right; + padding-right: 10px; + min-width:20px; +} + +table.coverage td span.cline-any { + display: inline-block; + padding: 0 5px; + width: 100%; +} +.missing-if-branch { + display: inline-block; + margin-right: 5px; + border-radius: 3px; + position: relative; + padding: 0 4px; + background: #333; + color: yellow; +} + +.skip-if-branch { + display: none; + margin-right: 10px; + position: relative; + padding: 0 4px; + background: #ccc; + color: white; +} +.missing-if-branch .typ, .skip-if-branch .typ { + color: inherit !important; +} +.coverage-summary { + border-collapse: collapse; + width: 100%; +} +.coverage-summary tr { border-bottom: 1px solid #bbb; } +.keyline-all { border: 1px solid #ddd; } +.coverage-summary td, .coverage-summary th { padding: 10px; } +.coverage-summary tbody { border: 1px solid #bbb; } +.coverage-summary td { border-right: 1px solid #bbb; } +.coverage-summary td:last-child { border-right: none; } +.coverage-summary th { + text-align: left; + font-weight: normal; + white-space: nowrap; +} +.coverage-summary th.file { border-right: none !important; } +.coverage-summary th.pct { } +.coverage-summary th.pic, +.coverage-summary th.abs, +.coverage-summary td.pct, +.coverage-summary td.abs { text-align: right; } +.coverage-summary td.file { white-space: nowrap; } +.coverage-summary td.pic { min-width: 120px !important; } +.coverage-summary tfoot td { } + +.coverage-summary .sorter { + height: 10px; + width: 7px; + display: inline-block; + margin-left: 0.5em; + background: url(sort-arrow-sprite.png) no-repeat scroll 0 0 transparent; +} +.coverage-summary .sorted .sorter { + background-position: 0 -20px; +} +.coverage-summary .sorted-desc .sorter { + background-position: 0 -10px; +} +.status-line { height: 10px; } +/* dark red */ +.red.solid, .status-line.low, .low .cover-fill { background:#C21F39 } +.low .chart { border:1px solid #C21F39 } +/* medium red */ +.cstat-no, .fstat-no, .cbranch-no, .cbranch-no { background:#F6C6CE } +/* light red */ +.low, .cline-no { background:#FCE1E5 } +/* light green */ +.high, .cline-yes { background:rgb(230,245,208) } +/* medium green */ +.cstat-yes { background:rgb(161,215,106) } +/* dark green */ +.status-line.high, .high .cover-fill { background:rgb(77,146,33) } +.high .chart { border:1px solid rgb(77,146,33) } + + +.medium .chart { border:1px solid #666; } +.medium .cover-fill { background: #666; } + +.cbranch-no { background: yellow !important; color: #111; } + +.cstat-skip { background: #ddd; color: #111; } +.fstat-skip { background: #ddd; color: #111 !important; } +.cbranch-skip { background: #ddd !important; color: #111; } + +span.cline-neutral { background: #eaeaea; } +.medium { background: #eaeaea; } + +.cover-fill, .cover-empty { + display:inline-block; + height: 12px; +} +.chart { + line-height: 0; +} +.cover-empty { + background: white; +} +.cover-full { + border-right: none !important; +} +pre.prettyprint { + border: none !important; + padding: 0 !important; + margin: 0 !important; +} +.com { color: #999 !important; } +.ignore-none { color: #999; font-weight: normal; } + +.wrapper { + min-height: 100%; + height: auto !important; + height: 100%; + margin: 0 auto -48px; +} +.footer, .push { + height: 48px; +} diff --git a/coverage/lcov-report/index.html b/coverage/lcov-report/index.html new file mode 100644 index 0000000..ec53c33 --- /dev/null +++ b/coverage/lcov-report/index.html @@ -0,0 +1,93 @@ + + + + Code coverage report for All files + + + + + + + +
+
+

+ All files +

+
+
+ 100% + Statements + 32/32 +
+
+ 91.67% + Branches + 11/12 +
+
+ 100% + Functions + 12/12 +
+
+ 100% + Lines + 28/28 +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FileStatementsBranchesFunctionsLines
index.js
100%32/3291.67%11/12100%12/12100%28/28
+
+
+
+ Code coverage + generated by istanbul at Thu Mar 01 2018 10:11:05 GMT-0600 (CST) +
+ + + + + + diff --git a/coverage/lcov-report/index.js.html b/coverage/lcov-report/index.js.html new file mode 100644 index 0000000..0ca72de --- /dev/null +++ b/coverage/lcov-report/index.js.html @@ -0,0 +1,230 @@ + + + + Code coverage report for index.js + + + + + + + +
+
+

+ All files index.js +

+
+
+ 100% + Statements + 32/32 +
+
+ 91.67% + Branches + 11/12 +
+
+ 100% + Functions + 12/12 +
+
+ 100% + Lines + 28/28 +
+
+
+
+

+
+
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+561x
+ 
+12x
+108x
+108x
+ 
+ 
+ 
+ 
+12x
+ 
+ 
+ 
+1x
+1x
+ 
+ 
+ 
+9x
+1x
+ 
+ 
+ 
+3x
+ 
+18x
+2x
+ 
+1x
+9x
+9x
+9x
+9x
+ 
+1x
+ 
+3x
+ 
+ 
+ 
+4x
+48x
+38x
+11x
+ 
+4x
+ 
+ 
+ 
+4x
+4x
+4x
+4x
+ 
+ 
+ 
module.exports = class Query {
+  constructor (data) {
+    this.data = data.map(item => {
+      item.sortScore = 0
+      return item
+    })
+  }
+ 
+  get results () {
+    return this.data
+  }
+ 
+  filter (func) {
+    this.data = this.data.filter(func)
+    return this
+  }
+ 
+  filterBy (key, func) {
+    this.data = this.data.filter(item => func(item[key]))
+    return this
+  }
+ 
+  search (key, term, score = 0) {
+    switch (typeof term) {
+      case 'boolean':
+        this.data = this.data.filter(item => item[key] === term)
+        break
+      case 'string':
+        this.data = this.data.filter(item => {
+          let regFind = new RegExp(term, 'gi')
+          let termMatches = (item[key].match(regFind) || []).length
+          item.sortScore += termMatches
+          return termMatches
+        })
+        break
+    }
+    return this
+  }
+ 
+  sort (key = 'sortScore') {
+    this.data = this.data.sort((a, b) => {
+      if (a[key] < b[key]) return -1
+      if (a[key] > b[key]) return 1
+      return 0
+    })
+    return this
+  }
+ 
+  paginate (page = 1, perPage = 10) {
+    let min = page * perPage - perPage
+    let max = min + perPage
+    this.data = this.data.slice(min, max)
+    return this
+  }
+}
+ 
+
+
+
+ Code coverage + generated by istanbul at Thu Mar 01 2018 10:11:05 GMT-0600 (CST) +
+ + + + + + diff --git a/coverage/lcov-report/prettify.css b/coverage/lcov-report/prettify.css new file mode 100644 index 0000000..b317a7c --- /dev/null +++ b/coverage/lcov-report/prettify.css @@ -0,0 +1 @@ +.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{padding:2px;border:1px solid #888}ol.linenums{margin-top:0;margin-bottom:0}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee} diff --git a/coverage/lcov-report/prettify.js b/coverage/lcov-report/prettify.js new file mode 100644 index 0000000..ef51e03 --- /dev/null +++ b/coverage/lcov-report/prettify.js @@ -0,0 +1 @@ +window.PR_SHOULD_USE_CONTINUATION=true;(function(){var h=["break,continue,do,else,for,if,return,while"];var u=[h,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"];var p=[u,"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"];var l=[p,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"];var x=[p,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"];var R=[x,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"];var r="all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes";var w=[p,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"];var s="caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END";var I=[h,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"];var f=[h,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"];var H=[h,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"];var A=[l,R,w,s+I,f,H];var e=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/;var C="str";var z="kwd";var j="com";var O="typ";var G="lit";var L="pun";var F="pln";var m="tag";var E="dec";var J="src";var P="atn";var n="atv";var N="nocode";var M="(?:^^\\.?|[+-]|\\!|\\!=|\\!==|\\#|\\%|\\%=|&|&&|&&=|&=|\\(|\\*|\\*=|\\+=|\\,|\\-=|\\->|\\/|\\/=|:|::|\\;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|\\?|\\@|\\[|\\^|\\^=|\\^\\^|\\^\\^=|\\{|\\||\\|=|\\|\\||\\|\\|=|\\~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*";function k(Z){var ad=0;var S=false;var ac=false;for(var V=0,U=Z.length;V122)){if(!(al<65||ag>90)){af.push([Math.max(65,ag)|32,Math.min(al,90)|32])}if(!(al<97||ag>122)){af.push([Math.max(97,ag)&~32,Math.min(al,122)&~32])}}}}af.sort(function(av,au){return(av[0]-au[0])||(au[1]-av[1])});var ai=[];var ap=[NaN,NaN];for(var ar=0;arat[0]){if(at[1]+1>at[0]){an.push("-")}an.push(T(at[1]))}}an.push("]");return an.join("")}function W(al){var aj=al.source.match(new RegExp("(?:\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]|\\\\u[A-Fa-f0-9]{4}|\\\\x[A-Fa-f0-9]{2}|\\\\[0-9]+|\\\\[^ux0-9]|\\(\\?[:!=]|[\\(\\)\\^]|[^\\x5B\\x5C\\(\\)\\^]+)","g"));var ah=aj.length;var an=[];for(var ak=0,am=0;ak=2&&ai==="["){aj[ak]=X(ag)}else{if(ai!=="\\"){aj[ak]=ag.replace(/[a-zA-Z]/g,function(ao){var ap=ao.charCodeAt(0);return"["+String.fromCharCode(ap&~32,ap|32)+"]"})}}}}return aj.join("")}var aa=[];for(var V=0,U=Z.length;V=0;){S[ac.charAt(ae)]=Y}}var af=Y[1];var aa=""+af;if(!ag.hasOwnProperty(aa)){ah.push(af);ag[aa]=null}}ah.push(/[\0-\uffff]/);V=k(ah)})();var X=T.length;var W=function(ah){var Z=ah.sourceCode,Y=ah.basePos;var ad=[Y,F];var af=0;var an=Z.match(V)||[];var aj={};for(var ae=0,aq=an.length;ae=5&&"lang-"===ap.substring(0,5);if(am&&!(ai&&typeof ai[1]==="string")){am=false;ap=J}if(!am){aj[ag]=ap}}var ab=af;af+=ag.length;if(!am){ad.push(Y+ab,ap)}else{var al=ai[1];var ak=ag.indexOf(al);var ac=ak+al.length;if(ai[2]){ac=ag.length-ai[2].length;ak=ac-al.length}var ar=ap.substring(5);B(Y+ab,ag.substring(0,ak),W,ad);B(Y+ab+ak,al,q(ar,al),ad);B(Y+ab+ac,ag.substring(ac),W,ad)}}ah.decorations=ad};return W}function i(T){var W=[],S=[];if(T.tripleQuotedStrings){W.push([C,/^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,null,"'\""])}else{if(T.multiLineStrings){W.push([C,/^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,null,"'\"`"])}else{W.push([C,/^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/,null,"\"'"])}}if(T.verbatimStrings){S.push([C,/^@\"(?:[^\"]|\"\")*(?:\"|$)/,null])}var Y=T.hashComments;if(Y){if(T.cStyleComments){if(Y>1){W.push([j,/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,null,"#"])}else{W.push([j,/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\r\n]*)/,null,"#"])}S.push([C,/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,null])}else{W.push([j,/^#[^\r\n]*/,null,"#"])}}if(T.cStyleComments){S.push([j,/^\/\/[^\r\n]*/,null]);S.push([j,/^\/\*[\s\S]*?(?:\*\/|$)/,null])}if(T.regexLiterals){var X=("/(?=[^/*])(?:[^/\\x5B\\x5C]|\\x5C[\\s\\S]|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+/");S.push(["lang-regex",new RegExp("^"+M+"("+X+")")])}var V=T.types;if(V){S.push([O,V])}var U=(""+T.keywords).replace(/^ | $/g,"");if(U.length){S.push([z,new RegExp("^(?:"+U.replace(/[\s,]+/g,"|")+")\\b"),null])}W.push([F,/^\s+/,null," \r\n\t\xA0"]);S.push([G,/^@[a-z_$][a-z_$@0-9]*/i,null],[O,/^(?:[@_]?[A-Z]+[a-z][A-Za-z_$@0-9]*|\w+_t\b)/,null],[F,/^[a-z_$][a-z_$@0-9]*/i,null],[G,new RegExp("^(?:0x[a-f0-9]+|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)(?:e[+\\-]?\\d+)?)[a-z]*","i"),null,"0123456789"],[F,/^\\[\s\S]?/,null],[L,/^.[^\s\w\.$@\'\"\`\/\#\\]*/,null]);return g(W,S)}var K=i({keywords:A,hashComments:true,cStyleComments:true,multiLineStrings:true,regexLiterals:true});function Q(V,ag){var U=/(?:^|\s)nocode(?:\s|$)/;var ab=/\r\n?|\n/;var ac=V.ownerDocument;var S;if(V.currentStyle){S=V.currentStyle.whiteSpace}else{if(window.getComputedStyle){S=ac.defaultView.getComputedStyle(V,null).getPropertyValue("white-space")}}var Z=S&&"pre"===S.substring(0,3);var af=ac.createElement("LI");while(V.firstChild){af.appendChild(V.firstChild)}var W=[af];function ae(al){switch(al.nodeType){case 1:if(U.test(al.className)){break}if("BR"===al.nodeName){ad(al);if(al.parentNode){al.parentNode.removeChild(al)}}else{for(var an=al.firstChild;an;an=an.nextSibling){ae(an)}}break;case 3:case 4:if(Z){var am=al.nodeValue;var aj=am.match(ab);if(aj){var ai=am.substring(0,aj.index);al.nodeValue=ai;var ah=am.substring(aj.index+aj[0].length);if(ah){var ak=al.parentNode;ak.insertBefore(ac.createTextNode(ah),al.nextSibling)}ad(al);if(!ai){al.parentNode.removeChild(al)}}}break}}function ad(ak){while(!ak.nextSibling){ak=ak.parentNode;if(!ak){return}}function ai(al,ar){var aq=ar?al.cloneNode(false):al;var ao=al.parentNode;if(ao){var ap=ai(ao,1);var an=al.nextSibling;ap.appendChild(aq);for(var am=an;am;am=an){an=am.nextSibling;ap.appendChild(am)}}return aq}var ah=ai(ak.nextSibling,0);for(var aj;(aj=ah.parentNode)&&aj.nodeType===1;){ah=aj}W.push(ah)}for(var Y=0;Y=S){ah+=2}if(V>=ap){Z+=2}}}var t={};function c(U,V){for(var S=V.length;--S>=0;){var T=V[S];if(!t.hasOwnProperty(T)){t[T]=U}else{if(window.console){console.warn("cannot override language handler %s",T)}}}}function q(T,S){if(!(T&&t.hasOwnProperty(T))){T=/^\s*]*(?:>|$)/],[j,/^<\!--[\s\S]*?(?:-\->|$)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],[L,/^(?:<[%?]|[%?]>)/],["lang-",/^]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-js",/^]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),["default-markup","htm","html","mxml","xhtml","xml","xsl"]);c(g([[F,/^[\s]+/,null," \t\r\n"],[n,/^(?:\"[^\"]*\"?|\'[^\']*\'?)/,null,"\"'"]],[[m,/^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],[P,/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],[L,/^[=<>\/]+/],["lang-js",/^on\w+\s*=\s*\"([^\"]+)\"/i],["lang-js",/^on\w+\s*=\s*\'([^\']+)\'/i],["lang-js",/^on\w+\s*=\s*([^\"\'>\s]+)/i],["lang-css",/^style\s*=\s*\"([^\"]+)\"/i],["lang-css",/^style\s*=\s*\'([^\']+)\'/i],["lang-css",/^style\s*=\s*([^\"\'>\s]+)/i]]),["in.tag"]);c(g([],[[n,/^[\s\S]+/]]),["uq.val"]);c(i({keywords:l,hashComments:true,cStyleComments:true,types:e}),["c","cc","cpp","cxx","cyc","m"]);c(i({keywords:"null,true,false"}),["json"]);c(i({keywords:R,hashComments:true,cStyleComments:true,verbatimStrings:true,types:e}),["cs"]);c(i({keywords:x,cStyleComments:true}),["java"]);c(i({keywords:H,hashComments:true,multiLineStrings:true}),["bsh","csh","sh"]);c(i({keywords:I,hashComments:true,multiLineStrings:true,tripleQuotedStrings:true}),["cv","py"]);c(i({keywords:s,hashComments:true,multiLineStrings:true,regexLiterals:true}),["perl","pl","pm"]);c(i({keywords:f,hashComments:true,multiLineStrings:true,regexLiterals:true}),["rb"]);c(i({keywords:w,cStyleComments:true,regexLiterals:true}),["js"]);c(i({keywords:r,hashComments:3,cStyleComments:true,multilineStrings:true,tripleQuotedStrings:true,regexLiterals:true}),["coffee"]);c(g([],[[C,/^[\s\S]+/]]),["regex"]);function d(V){var U=V.langExtension;try{var S=a(V.sourceNode);var T=S.sourceCode;V.sourceCode=T;V.spans=S.spans;V.basePos=0;q(U,T)(V);D(V)}catch(W){if("console" in window){console.log(W&&W.stack?W.stack:W)}}}function y(W,V,U){var S=document.createElement("PRE");S.innerHTML=W;if(U){Q(S,U)}var T={langExtension:V,numberLines:U,sourceNode:S};d(T);return S.innerHTML}function b(ad){function Y(af){return document.getElementsByTagName(af)}var ac=[Y("pre"),Y("code"),Y("xmp")];var T=[];for(var aa=0;aa=0){var ah=ai.match(ab);var am;if(!ah&&(am=o(aj))&&"CODE"===am.tagName){ah=am.className.match(ab)}if(ah){ah=ah[1]}var al=false;for(var ak=aj.parentNode;ak;ak=ak.parentNode){if((ak.tagName==="pre"||ak.tagName==="code"||ak.tagName==="xmp")&&ak.className&&ak.className.indexOf("prettyprint")>=0){al=true;break}}if(!al){var af=aj.className.match(/\blinenums\b(?::(\d+))?/);af=af?af[1]&&af[1].length?+af[1]:true:false;if(af){Q(aj,af)}S={langExtension:ah,sourceNode:aj,numberLines:af};d(S)}}}if(X]*(?:>|$)/],[PR.PR_COMMENT,/^<\!--[\s\S]*?(?:-\->|$)/],[PR.PR_PUNCTUATION,/^(?:<[%?]|[%?]>)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],["lang-",/^]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-handlebars",/^]*type\s*=\s*['"]?text\/x-handlebars-template['"]?\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-js",/^]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i],[PR.PR_DECLARATION,/^{{[#^>/]?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{&?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{{>?\s*[\w.][^}]*}}}/],[PR.PR_COMMENT,/^{{![^}]*}}/]]),["handlebars","hbs"]);PR.registerLangHandler(PR.createSimpleLexer([[PR.PR_PLAIN,/^[ \t\r\n\f]+/,null," \t\r\n\f"]],[[PR.PR_STRING,/^\"(?:[^\n\r\f\\\"]|\\(?:\r\n?|\n|\f)|\\[\s\S])*\"/,null],[PR.PR_STRING,/^\'(?:[^\n\r\f\\\']|\\(?:\r\n?|\n|\f)|\\[\s\S])*\'/,null],["lang-css-str",/^url\(([^\)\"\']*)\)/i],[PR.PR_KEYWORD,/^(?:url|rgb|\!important|@import|@page|@media|@charset|inherit)(?=[^\-\w]|$)/i,null],["lang-css-kw",/^(-?(?:[_a-z]|(?:\\[0-9a-f]+ ?))(?:[_a-z0-9\-]|\\(?:\\[0-9a-f]+ ?))*)\s*:/i],[PR.PR_COMMENT,/^\/\*[^*]*\*+(?:[^\/*][^*]*\*+)*\//],[PR.PR_COMMENT,/^(?:)/],[PR.PR_LITERAL,/^(?:\d+|\d*\.\d+)(?:%|[a-z]+)?/i],[PR.PR_LITERAL,/^#(?:[0-9a-f]{3}){1,2}/i],[PR.PR_PLAIN,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i],[PR.PR_PUNCTUATION,/^[^\s\w\'\"]+/]]),["css"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_KEYWORD,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i]]),["css-kw"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_STRING,/^[^\)\"\']+/]]),["css-str"]); diff --git a/coverage/lcov-report/sort-arrow-sprite.png b/coverage/lcov-report/sort-arrow-sprite.png new file mode 100644 index 0000000000000000000000000000000000000000..03f704a609c6fd0dbfdac63466a7d7c958b5cbf3 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^>_9Bd!3HEZxJ@+%Qj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS>Jii$m5978H@?Fn+^JD|Y9yzj{W`447Gxa{7*dM7nnnD-Lb z6^}Hx2)'; + } + } + return cols; + } + // attaches a data attribute to every tr element with an object + // of data values keyed by column name + function loadRowData(tableRow) { + var tableCols = tableRow.querySelectorAll('td'), + colNode, + col, + data = {}, + i, + val; + for (i = 0; i < tableCols.length; i += 1) { + colNode = tableCols[i]; + col = cols[i]; + val = colNode.getAttribute('data-value'); + if (col.type === 'number') { + val = Number(val); + } + data[col.key] = val; + } + return data; + } + // loads all row data + function loadData() { + var rows = getTableBody().querySelectorAll('tr'), + i; + + for (i = 0; i < rows.length; i += 1) { + rows[i].data = loadRowData(rows[i]); + } + } + // sorts the table using the data for the ith column + function sortByIndex(index, desc) { + var key = cols[index].key, + sorter = function (a, b) { + a = a.data[key]; + b = b.data[key]; + return a < b ? -1 : a > b ? 1 : 0; + }, + finalSorter = sorter, + tableBody = document.querySelector('.coverage-summary tbody'), + rowNodes = tableBody.querySelectorAll('tr'), + rows = [], + i; + + if (desc) { + finalSorter = function (a, b) { + return -1 * sorter(a, b); + }; + } + + for (i = 0; i < rowNodes.length; i += 1) { + rows.push(rowNodes[i]); + tableBody.removeChild(rowNodes[i]); + } + + rows.sort(finalSorter); + + for (i = 0; i < rows.length; i += 1) { + tableBody.appendChild(rows[i]); + } + } + // removes sort indicators for current column being sorted + function removeSortIndicators() { + var col = getNthColumn(currentSort.index), + cls = col.className; + + cls = cls.replace(/ sorted$/, '').replace(/ sorted-desc$/, ''); + col.className = cls; + } + // adds sort indicators for current column being sorted + function addSortIndicators() { + getNthColumn(currentSort.index).className += currentSort.desc ? ' sorted-desc' : ' sorted'; + } + // adds event listeners for all sorter widgets + function enableUI() { + var i, + el, + ithSorter = function ithSorter(i) { + var col = cols[i]; + + return function () { + var desc = col.defaultDescSort; + + if (currentSort.index === i) { + desc = !currentSort.desc; + } + sortByIndex(i, desc); + removeSortIndicators(); + currentSort.index = i; + currentSort.desc = desc; + addSortIndicators(); + }; + }; + for (i =0 ; i < cols.length; i += 1) { + if (cols[i].sortable) { + // add the click event handler on the th so users + // dont have to click on those tiny arrows + el = getNthColumn(i).querySelector('.sorter').parentElement; + if (el.addEventListener) { + el.addEventListener('click', ithSorter(i)); + } else { + el.attachEvent('onclick', ithSorter(i)); + } + } + } + } + // adds sorting functionality to the UI + return function () { + if (!getTable()) { + return; + } + cols = loadColumns(); + loadData(cols); + addSortIndicators(); + enableUI(); + }; +})(); + +window.addEventListener('load', addSorting); diff --git a/coverage/lcov.info b/coverage/lcov.info new file mode 100644 index 0000000..3c77eff --- /dev/null +++ b/coverage/lcov.info @@ -0,0 +1,73 @@ +TN: +SF:/Users/sharpshark28/web/json-query-chain/index.js +FN:2,(anonymous_0) +FN:3,(anonymous_1) +FN:9,(anonymous_2) +FN:13,(anonymous_3) +FN:18,(anonymous_4) +FN:19,(anonymous_5) +FN:23,(anonymous_6) +FN:26,(anonymous_7) +FN:29,(anonymous_8) +FN:40,(anonymous_9) +FN:41,(anonymous_10) +FN:49,(anonymous_11) +FNF:12 +FNH:12 +FNDA:12,(anonymous_0) +FNDA:108,(anonymous_1) +FNDA:12,(anonymous_2) +FNDA:1,(anonymous_3) +FNDA:1,(anonymous_4) +FNDA:9,(anonymous_5) +FNDA:3,(anonymous_6) +FNDA:18,(anonymous_7) +FNDA:9,(anonymous_8) +FNDA:4,(anonymous_9) +FNDA:48,(anonymous_10) +FNDA:4,(anonymous_11) +DA:1,1 +DA:3,12 +DA:4,108 +DA:5,108 +DA:10,12 +DA:14,1 +DA:15,1 +DA:19,9 +DA:20,1 +DA:24,3 +DA:26,18 +DA:27,2 +DA:29,1 +DA:30,9 +DA:31,9 +DA:32,9 +DA:33,9 +DA:35,1 +DA:37,3 +DA:41,4 +DA:42,48 +DA:43,38 +DA:44,11 +DA:46,4 +DA:50,4 +DA:51,4 +DA:52,4 +DA:53,4 +LF:28 +LH:28 +BRDA:23,0,0,3 +BRDA:24,1,0,2 +BRDA:24,1,1,1 +BRDA:31,2,0,9 +BRDA:31,2,1,7 +BRDA:40,3,0,0 +BRDA:42,4,0,10 +BRDA:42,4,1,38 +BRDA:43,5,0,27 +BRDA:43,5,1,11 +BRDA:49,6,0,1 +BRDA:49,7,0,1 +BRF:12 +BRH:11 +end_of_record diff --git a/index.js b/index.js index a7c32d9..9626309 100644 --- a/index.js +++ b/index.js @@ -1,9 +1,6 @@ module.exports = class Query { constructor (data) { - this.data = data.map(item => { - item.sortScore = 0 - return item - }) + this.data = data } get results () { @@ -16,33 +13,47 @@ module.exports = class Query { } filterBy (key, func) { - this.data = this.data.filter(item => func(item[key])) + if (this.data.length && typeof this.data[0] === 'object') { + this.data = this.data.filter(item => func(item[key])) + } else console.warn('Attempted to use filterBy with a flat array') return this } - search (key, term, score = 0) { + search (term, key) { switch (typeof term) { case 'boolean': - this.data = this.data.filter(item => item[key] === term) + if (this.data.length && typeof this.data[0] === 'object') { + this.data = this.data.filter(item => item[key] === term) + } else console.warn('Attempted to use search by boolean with a flat array') break case 'string': - this.data = this.data.filter(item => { - let regFind = new RegExp(term, 'gi') - let termMatches = (item[key].match(regFind) || []).length - item.sortScore += termMatches - return termMatches - }) + let regFind = new RegExp(term, 'gi') + let getMatches = item => { + if (typeof item === 'string') { + return (item.match(regFind) || []).length + } else { + return (item[key].match(regFind) || []).length + } + } + this.data = [...this.data].sort(getMatches).filter(getMatches) break } return this } - sort (key = 'sortScore') { - this.data = this.data.sort((a, b) => { - if (a[key] < b[key]) return -1 - if (a[key] > b[key]) return 1 - return 0 - }) + sort (func) { + this.data = [...this.data].sort(func) + return this + } + + sortBy (key) { + if (this.data.length && typeof this.data[0] === 'object') { + this.data = [...this.data].sort((a, b) => { + if (a[key] < b[key]) return -1 + if (a[key] > b[key]) return 1 + return 0 + }) + } else console.warn('Attempted to use sortBy with a flat array') return this } diff --git a/index.test.js b/index.test.js index 38f4bd9..0bf96ef 100644 --- a/index.test.js +++ b/index.test.js @@ -1,6 +1,8 @@ const Query = require('./index') const TestData = require('./testdata.json') +const arrayOf100Things = [...Array(100).keys()] + test('should not modify passed data without chain alterations', () => { let query = new Query(TestData) .results @@ -8,6 +10,14 @@ test('should not modify passed data without chain alterations', () => { expect(query).toMatchObject(TestData) }) +test('should paginate with flat array data', () => { + let query = new Query(arrayOf100Things) + .paginate() + .results + + expect(query.length).toBe(10) +}) + test('should paginate with default params', () => { let query = new Query(TestData) .paginate() @@ -34,33 +44,103 @@ test('should paginate to second page with custom page length', () => { expect(query[0].name).toBe('Howard Buckley') }) +test('should search and sort on flat array of strings', () => { + let query = new Query(['bar', 'foo', 'foobar', 'foofoobar']) + .search('foo') + .results + + expect(query[0]).toBe('foofoobar') + expect(query).toContain('foo') + expect(query).not.toContain('bar') +}) + +test('should search by flat array by boolean', () => { + let consoleWarnSpy = jest.spyOn(global.console, 'warn') + consoleWarnSpy.mockImplementation(() => {}) + + let query = new Query(arrayOf100Things) + .search(true, 'dumbKey') + .results + + expect(query).toEqual(arrayOf100Things) + expect(consoleWarnSpy).toHaveBeenCalled() + + consoleWarnSpy.mockReset() + consoleWarnSpy.mockRestore() +}) + test('should search by boolean isActive', () => { let query = new Query(TestData) - .search('isActive', true) + .search(true, 'isActive') .results expect(query.length).toBe(4) }) +test('should search partial matching on strings with flat array', () => { + let query = new Query(['foo', 'bar', 'foobar']) + .search('foo') + .results + + expect(query[0]).toBe('foobar') + expect(query[1]).toBe('foo') +}) + test('should search by name', () => { let query = new Query(TestData) - .search('name', 'steele') + .search('steele', 'name') .results expect(query.length).toBe(2) }) -test('should sort by boolean isActive', () => { +test('should sort alphabetically with custom function', () => { + let alphabetical = (a, b) => a.name > b.name + let query = new Query(TestData) - .sort('isActive') + .sort(alphabetical) + .results + + expect(query[0].name).toBe('Dudley Conner') + expect(query[query.length - 1].name).toBe('Wade Steele') +}) + +test('should sort alphabetically with flat array', () => { + let query = new Query(['foo', 'bar', 'foobar']) + .sort((a, b) => a > b) + .results + + expect(query[0]).toBe('bar') + expect(query[1]).toBe('foo') + expect(query[2]).toBe('foobar') +}) + +test('should sortBy do nothing with flat array', () => { + let consoleWarnSpy = jest.spyOn(global.console, 'warn') + consoleWarnSpy.mockImplementation(() => {}) + + let query = new Query(arrayOf100Things) + .sortBy('dumbKey') + .results + + expect(query).toEqual(arrayOf100Things) + expect(consoleWarnSpy).toHaveBeenCalled() + + consoleWarnSpy.mockReset() + consoleWarnSpy.mockRestore() +}) + +test('should sortBy boolean isActive', () => { + let query = new Query(TestData) + .sortBy('isActive') .results expect(query[0].name).toBe('Katelyn Steele') }) -test('should sort by number netWorth', () => { +test('should sortBy number netWorth', () => { let query = new Query(TestData) - .sort('netWorth') + .sortBy('netWorth') .results expect(query[0].name).toBe('Howard Buckley') // Negative @@ -68,14 +148,25 @@ test('should sort by number netWorth', () => { expect(query[query.length - 1].name).toBe('Newman Mays') // Richest }) -test('should sort by string name', () => { +test('should sortBy string name', () => { let query = new Query(TestData) - .sort('name') + .sortBy('name') .results expect(query[0].name).toBe('Dudley Conner') }) +test('should filter a flat array', () => { + let isEven = a => !(a % 2) + + let query = new Query(arrayOf100Things) + .filter(isEven) + .results + + expect(query).toContain(2) + expect(query).not.toContain(1) +}) + test('should filter', () => { let isAgeOver33 = a => a.age > 33 @@ -86,6 +177,21 @@ test('should filter', () => { expect(query[0].name).toBe('Howard Buckley') }) +test('should filter by key, with flat array', () => { + let consoleWarnSpy = jest.spyOn(global.console, 'warn') + consoleWarnSpy.mockImplementation(() => {}) + + let query = new Query(arrayOf100Things) + .filterBy('dumbKey', () => {}) + .results + + expect(query).toEqual(arrayOf100Things) + expect(consoleWarnSpy).toHaveBeenCalled() + + consoleWarnSpy.mockReset() + consoleWarnSpy.mockRestore() +}) + test('should filter by key', () => { let isNumGT33 = num => num > 33 @@ -98,8 +204,8 @@ test('should filter by key', () => { test('should chain everything together', () => { let query = new Query(TestData) - .search('isActive', true) - .sort('name') + .search(true, 'isActive') + .sortBy('name') .paginate(1, 2) .results diff --git a/package.json b/package.json index 0b3f68f..1eaf40c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "json-query-chain", - "version": "1.1.2", + "version": "1.1.3", "description": "Chain queries onto POJOs to return precise results.", "main": "index.js", "scripts": { -- 2.45.3 From 48c87a946f28b37275c3f51cc79ea5dd129e4406 Mon Sep 17 00:00:00 2001 From: sharpshark28 Date: Sun, 18 Mar 2018 17:34:32 -0500 Subject: [PATCH 2/2] Flat array support --- README.md | 28 +- coverage/clover.xml | 38 -- coverage/coverage-final.json | 2 - coverage/lcov-report/base.css | 212 ----------- coverage/lcov-report/index.html | 93 ----- coverage/lcov-report/index.js.html | 230 ------------ coverage/lcov-report/prettify.css | 1 - coverage/lcov-report/prettify.js | 1 - coverage/lcov-report/sort-arrow-sprite.png | Bin 209 -> 0 bytes coverage/lcov-report/sorter.js | 158 --------- coverage/lcov.info | 73 ---- index.js | 2 +- index.test.js | 389 +++++++++++---------- 13 files changed, 230 insertions(+), 997 deletions(-) delete mode 100644 coverage/clover.xml delete mode 100644 coverage/coverage-final.json delete mode 100644 coverage/lcov-report/base.css delete mode 100644 coverage/lcov-report/index.html delete mode 100644 coverage/lcov-report/index.js.html delete mode 100644 coverage/lcov-report/prettify.css delete mode 100644 coverage/lcov-report/prettify.js delete mode 100644 coverage/lcov-report/sort-arrow-sprite.png delete mode 100644 coverage/lcov-report/sorter.js delete mode 100644 coverage/lcov.info diff --git a/README.md b/README.md index 0674050..d837168 100644 --- a/README.md +++ b/README.md @@ -2,34 +2,38 @@ [![Build Status](https://travis-ci.org/sharpshark28/json-query-chain.svg?branch=master)](https://travis-ci.org/sharpshark28/json-query-chain) [![npm version](https://badge.fury.io/js/json-query-chain.svg)](https://badge.fury.io/js/json-query-chain) ![Code Coverage](coverage.svg) [![Maintainability](https://api.codeclimate.com/v1/badges/4dc20d8b5e6a7334044d/maintainability)](https://codeclimate.com/github/sharpshark28/json-query-chain/maintainability) -Chain queries onto POJOs to return precise results. +Chain queries onto arrays and arrays of objects to return precise results. See [example usages in the tests](./index.test.js) running on [this test data](./testdata.json). ## Usage ```javascript import Query from 'json-query-chain'; -let myQ = new Query(someJsonData) +let query = new Query(someJsonData) .search('isActiveUser', true) .results; + +console.log('Results: ', query); ``` ### Chainable Methods #### Search -Currently supports booleans and strings. (See [#1](https://github.com/sharpshark28/json-query-chain/issues/1) for Integer Support) - ##### By Boolean +Acts as a smart filter returning only elements who's key matches the expected result. + ```javascript -.search('isActiveUser', true) +.search(true, 'isActiveUser') ``` ##### By String +Sorts and filters out any elements in the array not matching the requested value while attempting to raise the best results to the top (most frequent number of occurrences). + ```javascript -.search('name', 'steele') +.search('steele', 'name') ``` #### Filter @@ -42,30 +46,40 @@ Simpler version of search using a custom function in the chain. ##### By Key +Like `.filter()`, but narrowed down by key. + ```javascript .filterBy('age', x => x >= 21) ``` #### Sort +A chainable version of javascript's built in array sort. + ``` .sort((a, b) => a > b) ``` ##### By Boolean +Abstracted sort by matching a key to a boolean. + ```javascript .sortBy('isActiveUser') ``` ##### By String +Sorts alphabetically based on key. + ```javascript .sortBy('name') ``` ##### By Number +Sorts by ascending numerical order based on key. + ```javascript .sortBy('netWorth') ``` @@ -78,7 +92,7 @@ Page 1 with 5 results per page. .paginate(1, 5) ``` -Page 2 wtih default of 10 results per page. +Page 2 with default of 10 results per page. ```javascript .paginate(2) diff --git a/coverage/clover.xml b/coverage/clover.xml deleted file mode 100644 index 91c71be..0000000 --- a/coverage/clover.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/coverage/coverage-final.json b/coverage/coverage-final.json deleted file mode 100644 index 9948dec..0000000 --- a/coverage/coverage-final.json +++ /dev/null @@ -1,2 +0,0 @@ -{"/Users/sharpshark28/web/json-query-chain/index.js": {"path":"/Users/sharpshark28/web/json-query-chain/index.js","statementMap":{"0":{"start":{"line":1,"column":0},"end":{"line":55,"column":1}},"1":{"start":{"line":3,"column":4},"end":{"line":6,"column":6}},"2":{"start":{"line":4,"column":6},"end":{"line":4,"column":24}},"3":{"start":{"line":5,"column":6},"end":{"line":5,"column":17}},"4":{"start":{"line":10,"column":4},"end":{"line":10,"column":20}},"5":{"start":{"line":14,"column":4},"end":{"line":14,"column":38}},"6":{"start":{"line":15,"column":4},"end":{"line":15,"column":15}},"7":{"start":{"line":19,"column":4},"end":{"line":19,"column":57}},"8":{"start":{"line":19,"column":41},"end":{"line":19,"column":56}},"9":{"start":{"line":20,"column":4},"end":{"line":20,"column":15}},"10":{"start":{"line":24,"column":4},"end":{"line":36,"column":5}},"11":{"start":{"line":26,"column":8},"end":{"line":26,"column":64}},"12":{"start":{"line":26,"column":45},"end":{"line":26,"column":63}},"13":{"start":{"line":27,"column":8},"end":{"line":27,"column":13}},"14":{"start":{"line":29,"column":8},"end":{"line":34,"column":10}},"15":{"start":{"line":30,"column":24},"end":{"line":30,"column":46}},"16":{"start":{"line":31,"column":28},"end":{"line":31,"column":67}},"17":{"start":{"line":32,"column":10},"end":{"line":32,"column":39}},"18":{"start":{"line":33,"column":10},"end":{"line":33,"column":28}},"19":{"start":{"line":35,"column":8},"end":{"line":35,"column":13}},"20":{"start":{"line":37,"column":4},"end":{"line":37,"column":15}},"21":{"start":{"line":41,"column":4},"end":{"line":45,"column":6}},"22":{"start":{"line":42,"column":6},"end":{"line":42,"column":36}},"23":{"start":{"line":42,"column":27},"end":{"line":42,"column":36}},"24":{"start":{"line":43,"column":6},"end":{"line":43,"column":35}},"25":{"start":{"line":43,"column":27},"end":{"line":43,"column":35}},"26":{"start":{"line":44,"column":6},"end":{"line":44,"column":14}},"27":{"start":{"line":46,"column":4},"end":{"line":46,"column":15}},"28":{"start":{"line":50,"column":14},"end":{"line":50,"column":38}},"29":{"start":{"line":51,"column":14},"end":{"line":51,"column":27}},"30":{"start":{"line":52,"column":4},"end":{"line":52,"column":41}},"31":{"start":{"line":53,"column":4},"end":{"line":53,"column":15}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":2,"column":2},"end":{"line":2,"column":3}},"loc":{"start":{"line":2,"column":21},"end":{"line":7,"column":3}},"line":2},"1":{"name":"(anonymous_1)","decl":{"start":{"line":3,"column":25},"end":{"line":3,"column":26}},"loc":{"start":{"line":3,"column":33},"end":{"line":6,"column":5}},"line":3},"2":{"name":"(anonymous_2)","decl":{"start":{"line":9,"column":2},"end":{"line":9,"column":3}},"loc":{"start":{"line":9,"column":17},"end":{"line":11,"column":3}},"line":9},"3":{"name":"(anonymous_3)","decl":{"start":{"line":13,"column":2},"end":{"line":13,"column":3}},"loc":{"start":{"line":13,"column":16},"end":{"line":16,"column":3}},"line":13},"4":{"name":"(anonymous_4)","decl":{"start":{"line":18,"column":2},"end":{"line":18,"column":3}},"loc":{"start":{"line":18,"column":23},"end":{"line":21,"column":3}},"line":18},"5":{"name":"(anonymous_5)","decl":{"start":{"line":19,"column":33},"end":{"line":19,"column":34}},"loc":{"start":{"line":19,"column":41},"end":{"line":19,"column":56}},"line":19},"6":{"name":"(anonymous_6)","decl":{"start":{"line":23,"column":2},"end":{"line":23,"column":3}},"loc":{"start":{"line":23,"column":32},"end":{"line":38,"column":3}},"line":23},"7":{"name":"(anonymous_7)","decl":{"start":{"line":26,"column":37},"end":{"line":26,"column":38}},"loc":{"start":{"line":26,"column":45},"end":{"line":26,"column":63}},"line":26},"8":{"name":"(anonymous_8)","decl":{"start":{"line":29,"column":37},"end":{"line":29,"column":38}},"loc":{"start":{"line":29,"column":45},"end":{"line":34,"column":9}},"line":29},"9":{"name":"(anonymous_9)","decl":{"start":{"line":40,"column":2},"end":{"line":40,"column":3}},"loc":{"start":{"line":40,"column":27},"end":{"line":47,"column":3}},"line":40},"10":{"name":"(anonymous_10)","decl":{"start":{"line":41,"column":31},"end":{"line":41,"column":32}},"loc":{"start":{"line":41,"column":41},"end":{"line":45,"column":5}},"line":41},"11":{"name":"(anonymous_11)","decl":{"start":{"line":49,"column":2},"end":{"line":49,"column":3}},"loc":{"start":{"line":49,"column":36},"end":{"line":54,"column":3}},"line":49}},"branchMap":{"0":{"loc":{"start":{"line":23,"column":21},"end":{"line":23,"column":30}},"type":"default-arg","locations":[{"start":{"line":23,"column":29},"end":{"line":23,"column":30}}],"line":23},"1":{"loc":{"start":{"line":24,"column":4},"end":{"line":36,"column":5}},"type":"switch","locations":[{"start":{"line":25,"column":6},"end":{"line":27,"column":13}},{"start":{"line":28,"column":6},"end":{"line":35,"column":13}}],"line":24},"2":{"loc":{"start":{"line":31,"column":29},"end":{"line":31,"column":59}},"type":"binary-expr","locations":[{"start":{"line":31,"column":29},"end":{"line":31,"column":53}},{"start":{"line":31,"column":57},"end":{"line":31,"column":59}}],"line":31},"3":{"loc":{"start":{"line":40,"column":8},"end":{"line":40,"column":25}},"type":"default-arg","locations":[{"start":{"line":40,"column":14},"end":{"line":40,"column":25}}],"line":40},"4":{"loc":{"start":{"line":42,"column":6},"end":{"line":42,"column":36}},"type":"if","locations":[{"start":{"line":42,"column":6},"end":{"line":42,"column":36}},{"start":{"line":42,"column":6},"end":{"line":42,"column":36}}],"line":42},"5":{"loc":{"start":{"line":43,"column":6},"end":{"line":43,"column":35}},"type":"if","locations":[{"start":{"line":43,"column":6},"end":{"line":43,"column":35}},{"start":{"line":43,"column":6},"end":{"line":43,"column":35}}],"line":43},"6":{"loc":{"start":{"line":49,"column":12},"end":{"line":49,"column":20}},"type":"default-arg","locations":[{"start":{"line":49,"column":19},"end":{"line":49,"column":20}}],"line":49},"7":{"loc":{"start":{"line":49,"column":22},"end":{"line":49,"column":34}},"type":"default-arg","locations":[{"start":{"line":49,"column":32},"end":{"line":49,"column":34}}],"line":49}},"s":{"0":1,"1":12,"2":108,"3":108,"4":12,"5":1,"6":1,"7":1,"8":9,"9":1,"10":3,"11":2,"12":18,"13":2,"14":1,"15":9,"16":9,"17":9,"18":9,"19":1,"20":3,"21":4,"22":48,"23":10,"24":38,"25":27,"26":11,"27":4,"28":4,"29":4,"30":4,"31":4},"f":{"0":12,"1":108,"2":12,"3":1,"4":1,"5":9,"6":3,"7":18,"8":9,"9":4,"10":48,"11":4},"b":{"0":[3],"1":[2,1],"2":[9,7],"3":[0],"4":[10,38],"5":[27,11],"6":[1],"7":[1]},"_coverageSchema":"332fd63041d2c1bcb487cc26dd0d5f7d97098a6c","hash":"0a1d673eb68d152c72702b26f3e41837a2997536"} -} diff --git a/coverage/lcov-report/base.css b/coverage/lcov-report/base.css deleted file mode 100644 index 417c7ad..0000000 --- a/coverage/lcov-report/base.css +++ /dev/null @@ -1,212 +0,0 @@ -body, html { - margin:0; padding: 0; - height: 100%; -} -body { - font-family: Helvetica Neue, Helvetica, Arial; - font-size: 14px; - color:#333; -} -.small { font-size: 12px; } -*, *:after, *:before { - -webkit-box-sizing:border-box; - -moz-box-sizing:border-box; - box-sizing:border-box; - } -h1 { font-size: 20px; margin: 0;} -h2 { font-size: 14px; } -pre { - font: 12px/1.4 Consolas, "Liberation Mono", Menlo, Courier, monospace; - margin: 0; - padding: 0; - -moz-tab-size: 2; - -o-tab-size: 2; - tab-size: 2; -} -a { color:#0074D9; text-decoration:none; } -a:hover { text-decoration:underline; } -.strong { font-weight: bold; } -.space-top1 { padding: 10px 0 0 0; } -.pad2y { padding: 20px 0; } -.pad1y { padding: 10px 0; } -.pad2x { padding: 0 20px; } -.pad2 { padding: 20px; } -.pad1 { padding: 10px; } -.space-left2 { padding-left:55px; } -.space-right2 { padding-right:20px; } -.center { text-align:center; } -.clearfix { display:block; } -.clearfix:after { - content:''; - display:block; - height:0; - clear:both; - visibility:hidden; - } -.fl { float: left; } -@media only screen and (max-width:640px) { - .col3 { width:100%; max-width:100%; } - .hide-mobile { display:none!important; } -} - -.quiet { - color: #7f7f7f; - color: rgba(0,0,0,0.5); -} -.quiet a { opacity: 0.7; } - -.fraction { - font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace; - font-size: 10px; - color: #555; - background: #E8E8E8; - padding: 4px 5px; - border-radius: 3px; - vertical-align: middle; -} - -div.path a:link, div.path a:visited { color: #333; } -table.coverage { - border-collapse: collapse; - margin: 10px 0 0 0; - padding: 0; -} - -table.coverage td { - margin: 0; - padding: 0; - vertical-align: top; -} -table.coverage td.line-count { - text-align: right; - padding: 0 5px 0 20px; -} -table.coverage td.line-coverage { - text-align: right; - padding-right: 10px; - min-width:20px; -} - -table.coverage td span.cline-any { - display: inline-block; - padding: 0 5px; - width: 100%; -} -.missing-if-branch { - display: inline-block; - margin-right: 5px; - border-radius: 3px; - position: relative; - padding: 0 4px; - background: #333; - color: yellow; -} - -.skip-if-branch { - display: none; - margin-right: 10px; - position: relative; - padding: 0 4px; - background: #ccc; - color: white; -} -.missing-if-branch .typ, .skip-if-branch .typ { - color: inherit !important; -} -.coverage-summary { - border-collapse: collapse; - width: 100%; -} -.coverage-summary tr { border-bottom: 1px solid #bbb; } -.keyline-all { border: 1px solid #ddd; } -.coverage-summary td, .coverage-summary th { padding: 10px; } -.coverage-summary tbody { border: 1px solid #bbb; } -.coverage-summary td { border-right: 1px solid #bbb; } -.coverage-summary td:last-child { border-right: none; } -.coverage-summary th { - text-align: left; - font-weight: normal; - white-space: nowrap; -} -.coverage-summary th.file { border-right: none !important; } -.coverage-summary th.pct { } -.coverage-summary th.pic, -.coverage-summary th.abs, -.coverage-summary td.pct, -.coverage-summary td.abs { text-align: right; } -.coverage-summary td.file { white-space: nowrap; } -.coverage-summary td.pic { min-width: 120px !important; } -.coverage-summary tfoot td { } - -.coverage-summary .sorter { - height: 10px; - width: 7px; - display: inline-block; - margin-left: 0.5em; - background: url(sort-arrow-sprite.png) no-repeat scroll 0 0 transparent; -} -.coverage-summary .sorted .sorter { - background-position: 0 -20px; -} -.coverage-summary .sorted-desc .sorter { - background-position: 0 -10px; -} -.status-line { height: 10px; } -/* dark red */ -.red.solid, .status-line.low, .low .cover-fill { background:#C21F39 } -.low .chart { border:1px solid #C21F39 } -/* medium red */ -.cstat-no, .fstat-no, .cbranch-no, .cbranch-no { background:#F6C6CE } -/* light red */ -.low, .cline-no { background:#FCE1E5 } -/* light green */ -.high, .cline-yes { background:rgb(230,245,208) } -/* medium green */ -.cstat-yes { background:rgb(161,215,106) } -/* dark green */ -.status-line.high, .high .cover-fill { background:rgb(77,146,33) } -.high .chart { border:1px solid rgb(77,146,33) } - - -.medium .chart { border:1px solid #666; } -.medium .cover-fill { background: #666; } - -.cbranch-no { background: yellow !important; color: #111; } - -.cstat-skip { background: #ddd; color: #111; } -.fstat-skip { background: #ddd; color: #111 !important; } -.cbranch-skip { background: #ddd !important; color: #111; } - -span.cline-neutral { background: #eaeaea; } -.medium { background: #eaeaea; } - -.cover-fill, .cover-empty { - display:inline-block; - height: 12px; -} -.chart { - line-height: 0; -} -.cover-empty { - background: white; -} -.cover-full { - border-right: none !important; -} -pre.prettyprint { - border: none !important; - padding: 0 !important; - margin: 0 !important; -} -.com { color: #999 !important; } -.ignore-none { color: #999; font-weight: normal; } - -.wrapper { - min-height: 100%; - height: auto !important; - height: 100%; - margin: 0 auto -48px; -} -.footer, .push { - height: 48px; -} diff --git a/coverage/lcov-report/index.html b/coverage/lcov-report/index.html deleted file mode 100644 index ec53c33..0000000 --- a/coverage/lcov-report/index.html +++ /dev/null @@ -1,93 +0,0 @@ - - - - Code coverage report for All files - - - - - - - -
-
-

- All files -

-
-
- 100% - Statements - 32/32 -
-
- 91.67% - Branches - 11/12 -
-
- 100% - Functions - 12/12 -
-
- 100% - Lines - 28/28 -
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
FileStatementsBranchesFunctionsLines
index.js
100%32/3291.67%11/12100%12/12100%28/28
-
-
-
- Code coverage - generated by istanbul at Thu Mar 01 2018 10:11:05 GMT-0600 (CST) -
- - - - - - diff --git a/coverage/lcov-report/index.js.html b/coverage/lcov-report/index.js.html deleted file mode 100644 index 0ca72de..0000000 --- a/coverage/lcov-report/index.js.html +++ /dev/null @@ -1,230 +0,0 @@ - - - - Code coverage report for index.js - - - - - - - -
-
-

- All files index.js -

-
-
- 100% - Statements - 32/32 -
-
- 91.67% - Branches - 11/12 -
-
- 100% - Functions - 12/12 -
-
- 100% - Lines - 28/28 -
-
-
-
-

-
-
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-561x
- 
-12x
-108x
-108x
- 
- 
- 
- 
-12x
- 
- 
- 
-1x
-1x
- 
- 
- 
-9x
-1x
- 
- 
- 
-3x
- 
-18x
-2x
- 
-1x
-9x
-9x
-9x
-9x
- 
-1x
- 
-3x
- 
- 
- 
-4x
-48x
-38x
-11x
- 
-4x
- 
- 
- 
-4x
-4x
-4x
-4x
- 
- 
- 
module.exports = class Query {
-  constructor (data) {
-    this.data = data.map(item => {
-      item.sortScore = 0
-      return item
-    })
-  }
- 
-  get results () {
-    return this.data
-  }
- 
-  filter (func) {
-    this.data = this.data.filter(func)
-    return this
-  }
- 
-  filterBy (key, func) {
-    this.data = this.data.filter(item => func(item[key]))
-    return this
-  }
- 
-  search (key, term, score = 0) {
-    switch (typeof term) {
-      case 'boolean':
-        this.data = this.data.filter(item => item[key] === term)
-        break
-      case 'string':
-        this.data = this.data.filter(item => {
-          let regFind = new RegExp(term, 'gi')
-          let termMatches = (item[key].match(regFind) || []).length
-          item.sortScore += termMatches
-          return termMatches
-        })
-        break
-    }
-    return this
-  }
- 
-  sort (key = 'sortScore') {
-    this.data = this.data.sort((a, b) => {
-      if (a[key] < b[key]) return -1
-      if (a[key] > b[key]) return 1
-      return 0
-    })
-    return this
-  }
- 
-  paginate (page = 1, perPage = 10) {
-    let min = page * perPage - perPage
-    let max = min + perPage
-    this.data = this.data.slice(min, max)
-    return this
-  }
-}
- 
-
-
-
- Code coverage - generated by istanbul at Thu Mar 01 2018 10:11:05 GMT-0600 (CST) -
- - - - - - diff --git a/coverage/lcov-report/prettify.css b/coverage/lcov-report/prettify.css deleted file mode 100644 index b317a7c..0000000 --- a/coverage/lcov-report/prettify.css +++ /dev/null @@ -1 +0,0 @@ -.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{padding:2px;border:1px solid #888}ol.linenums{margin-top:0;margin-bottom:0}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee} diff --git a/coverage/lcov-report/prettify.js b/coverage/lcov-report/prettify.js deleted file mode 100644 index ef51e03..0000000 --- a/coverage/lcov-report/prettify.js +++ /dev/null @@ -1 +0,0 @@ -window.PR_SHOULD_USE_CONTINUATION=true;(function(){var h=["break,continue,do,else,for,if,return,while"];var u=[h,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"];var p=[u,"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"];var l=[p,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"];var x=[p,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"];var R=[x,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"];var r="all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes";var w=[p,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"];var s="caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END";var I=[h,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"];var f=[h,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"];var H=[h,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"];var A=[l,R,w,s+I,f,H];var e=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/;var C="str";var z="kwd";var j="com";var O="typ";var G="lit";var L="pun";var F="pln";var m="tag";var E="dec";var J="src";var P="atn";var n="atv";var N="nocode";var M="(?:^^\\.?|[+-]|\\!|\\!=|\\!==|\\#|\\%|\\%=|&|&&|&&=|&=|\\(|\\*|\\*=|\\+=|\\,|\\-=|\\->|\\/|\\/=|:|::|\\;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|\\?|\\@|\\[|\\^|\\^=|\\^\\^|\\^\\^=|\\{|\\||\\|=|\\|\\||\\|\\|=|\\~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*";function k(Z){var ad=0;var S=false;var ac=false;for(var V=0,U=Z.length;V122)){if(!(al<65||ag>90)){af.push([Math.max(65,ag)|32,Math.min(al,90)|32])}if(!(al<97||ag>122)){af.push([Math.max(97,ag)&~32,Math.min(al,122)&~32])}}}}af.sort(function(av,au){return(av[0]-au[0])||(au[1]-av[1])});var ai=[];var ap=[NaN,NaN];for(var ar=0;arat[0]){if(at[1]+1>at[0]){an.push("-")}an.push(T(at[1]))}}an.push("]");return an.join("")}function W(al){var aj=al.source.match(new RegExp("(?:\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]|\\\\u[A-Fa-f0-9]{4}|\\\\x[A-Fa-f0-9]{2}|\\\\[0-9]+|\\\\[^ux0-9]|\\(\\?[:!=]|[\\(\\)\\^]|[^\\x5B\\x5C\\(\\)\\^]+)","g"));var ah=aj.length;var an=[];for(var ak=0,am=0;ak=2&&ai==="["){aj[ak]=X(ag)}else{if(ai!=="\\"){aj[ak]=ag.replace(/[a-zA-Z]/g,function(ao){var ap=ao.charCodeAt(0);return"["+String.fromCharCode(ap&~32,ap|32)+"]"})}}}}return aj.join("")}var aa=[];for(var V=0,U=Z.length;V=0;){S[ac.charAt(ae)]=Y}}var af=Y[1];var aa=""+af;if(!ag.hasOwnProperty(aa)){ah.push(af);ag[aa]=null}}ah.push(/[\0-\uffff]/);V=k(ah)})();var X=T.length;var W=function(ah){var Z=ah.sourceCode,Y=ah.basePos;var ad=[Y,F];var af=0;var an=Z.match(V)||[];var aj={};for(var ae=0,aq=an.length;ae=5&&"lang-"===ap.substring(0,5);if(am&&!(ai&&typeof ai[1]==="string")){am=false;ap=J}if(!am){aj[ag]=ap}}var ab=af;af+=ag.length;if(!am){ad.push(Y+ab,ap)}else{var al=ai[1];var ak=ag.indexOf(al);var ac=ak+al.length;if(ai[2]){ac=ag.length-ai[2].length;ak=ac-al.length}var ar=ap.substring(5);B(Y+ab,ag.substring(0,ak),W,ad);B(Y+ab+ak,al,q(ar,al),ad);B(Y+ab+ac,ag.substring(ac),W,ad)}}ah.decorations=ad};return W}function i(T){var W=[],S=[];if(T.tripleQuotedStrings){W.push([C,/^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,null,"'\""])}else{if(T.multiLineStrings){W.push([C,/^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,null,"'\"`"])}else{W.push([C,/^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/,null,"\"'"])}}if(T.verbatimStrings){S.push([C,/^@\"(?:[^\"]|\"\")*(?:\"|$)/,null])}var Y=T.hashComments;if(Y){if(T.cStyleComments){if(Y>1){W.push([j,/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,null,"#"])}else{W.push([j,/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\r\n]*)/,null,"#"])}S.push([C,/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,null])}else{W.push([j,/^#[^\r\n]*/,null,"#"])}}if(T.cStyleComments){S.push([j,/^\/\/[^\r\n]*/,null]);S.push([j,/^\/\*[\s\S]*?(?:\*\/|$)/,null])}if(T.regexLiterals){var X=("/(?=[^/*])(?:[^/\\x5B\\x5C]|\\x5C[\\s\\S]|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+/");S.push(["lang-regex",new RegExp("^"+M+"("+X+")")])}var V=T.types;if(V){S.push([O,V])}var U=(""+T.keywords).replace(/^ | $/g,"");if(U.length){S.push([z,new RegExp("^(?:"+U.replace(/[\s,]+/g,"|")+")\\b"),null])}W.push([F,/^\s+/,null," \r\n\t\xA0"]);S.push([G,/^@[a-z_$][a-z_$@0-9]*/i,null],[O,/^(?:[@_]?[A-Z]+[a-z][A-Za-z_$@0-9]*|\w+_t\b)/,null],[F,/^[a-z_$][a-z_$@0-9]*/i,null],[G,new RegExp("^(?:0x[a-f0-9]+|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)(?:e[+\\-]?\\d+)?)[a-z]*","i"),null,"0123456789"],[F,/^\\[\s\S]?/,null],[L,/^.[^\s\w\.$@\'\"\`\/\#\\]*/,null]);return g(W,S)}var K=i({keywords:A,hashComments:true,cStyleComments:true,multiLineStrings:true,regexLiterals:true});function Q(V,ag){var U=/(?:^|\s)nocode(?:\s|$)/;var ab=/\r\n?|\n/;var ac=V.ownerDocument;var S;if(V.currentStyle){S=V.currentStyle.whiteSpace}else{if(window.getComputedStyle){S=ac.defaultView.getComputedStyle(V,null).getPropertyValue("white-space")}}var Z=S&&"pre"===S.substring(0,3);var af=ac.createElement("LI");while(V.firstChild){af.appendChild(V.firstChild)}var W=[af];function ae(al){switch(al.nodeType){case 1:if(U.test(al.className)){break}if("BR"===al.nodeName){ad(al);if(al.parentNode){al.parentNode.removeChild(al)}}else{for(var an=al.firstChild;an;an=an.nextSibling){ae(an)}}break;case 3:case 4:if(Z){var am=al.nodeValue;var aj=am.match(ab);if(aj){var ai=am.substring(0,aj.index);al.nodeValue=ai;var ah=am.substring(aj.index+aj[0].length);if(ah){var ak=al.parentNode;ak.insertBefore(ac.createTextNode(ah),al.nextSibling)}ad(al);if(!ai){al.parentNode.removeChild(al)}}}break}}function ad(ak){while(!ak.nextSibling){ak=ak.parentNode;if(!ak){return}}function ai(al,ar){var aq=ar?al.cloneNode(false):al;var ao=al.parentNode;if(ao){var ap=ai(ao,1);var an=al.nextSibling;ap.appendChild(aq);for(var am=an;am;am=an){an=am.nextSibling;ap.appendChild(am)}}return aq}var ah=ai(ak.nextSibling,0);for(var aj;(aj=ah.parentNode)&&aj.nodeType===1;){ah=aj}W.push(ah)}for(var Y=0;Y=S){ah+=2}if(V>=ap){Z+=2}}}var t={};function c(U,V){for(var S=V.length;--S>=0;){var T=V[S];if(!t.hasOwnProperty(T)){t[T]=U}else{if(window.console){console.warn("cannot override language handler %s",T)}}}}function q(T,S){if(!(T&&t.hasOwnProperty(T))){T=/^\s*]*(?:>|$)/],[j,/^<\!--[\s\S]*?(?:-\->|$)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],[L,/^(?:<[%?]|[%?]>)/],["lang-",/^]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-js",/^]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),["default-markup","htm","html","mxml","xhtml","xml","xsl"]);c(g([[F,/^[\s]+/,null," \t\r\n"],[n,/^(?:\"[^\"]*\"?|\'[^\']*\'?)/,null,"\"'"]],[[m,/^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],[P,/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],[L,/^[=<>\/]+/],["lang-js",/^on\w+\s*=\s*\"([^\"]+)\"/i],["lang-js",/^on\w+\s*=\s*\'([^\']+)\'/i],["lang-js",/^on\w+\s*=\s*([^\"\'>\s]+)/i],["lang-css",/^style\s*=\s*\"([^\"]+)\"/i],["lang-css",/^style\s*=\s*\'([^\']+)\'/i],["lang-css",/^style\s*=\s*([^\"\'>\s]+)/i]]),["in.tag"]);c(g([],[[n,/^[\s\S]+/]]),["uq.val"]);c(i({keywords:l,hashComments:true,cStyleComments:true,types:e}),["c","cc","cpp","cxx","cyc","m"]);c(i({keywords:"null,true,false"}),["json"]);c(i({keywords:R,hashComments:true,cStyleComments:true,verbatimStrings:true,types:e}),["cs"]);c(i({keywords:x,cStyleComments:true}),["java"]);c(i({keywords:H,hashComments:true,multiLineStrings:true}),["bsh","csh","sh"]);c(i({keywords:I,hashComments:true,multiLineStrings:true,tripleQuotedStrings:true}),["cv","py"]);c(i({keywords:s,hashComments:true,multiLineStrings:true,regexLiterals:true}),["perl","pl","pm"]);c(i({keywords:f,hashComments:true,multiLineStrings:true,regexLiterals:true}),["rb"]);c(i({keywords:w,cStyleComments:true,regexLiterals:true}),["js"]);c(i({keywords:r,hashComments:3,cStyleComments:true,multilineStrings:true,tripleQuotedStrings:true,regexLiterals:true}),["coffee"]);c(g([],[[C,/^[\s\S]+/]]),["regex"]);function d(V){var U=V.langExtension;try{var S=a(V.sourceNode);var T=S.sourceCode;V.sourceCode=T;V.spans=S.spans;V.basePos=0;q(U,T)(V);D(V)}catch(W){if("console" in window){console.log(W&&W.stack?W.stack:W)}}}function y(W,V,U){var S=document.createElement("PRE");S.innerHTML=W;if(U){Q(S,U)}var T={langExtension:V,numberLines:U,sourceNode:S};d(T);return S.innerHTML}function b(ad){function Y(af){return document.getElementsByTagName(af)}var ac=[Y("pre"),Y("code"),Y("xmp")];var T=[];for(var aa=0;aa=0){var ah=ai.match(ab);var am;if(!ah&&(am=o(aj))&&"CODE"===am.tagName){ah=am.className.match(ab)}if(ah){ah=ah[1]}var al=false;for(var ak=aj.parentNode;ak;ak=ak.parentNode){if((ak.tagName==="pre"||ak.tagName==="code"||ak.tagName==="xmp")&&ak.className&&ak.className.indexOf("prettyprint")>=0){al=true;break}}if(!al){var af=aj.className.match(/\blinenums\b(?::(\d+))?/);af=af?af[1]&&af[1].length?+af[1]:true:false;if(af){Q(aj,af)}S={langExtension:ah,sourceNode:aj,numberLines:af};d(S)}}}if(X]*(?:>|$)/],[PR.PR_COMMENT,/^<\!--[\s\S]*?(?:-\->|$)/],[PR.PR_PUNCTUATION,/^(?:<[%?]|[%?]>)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],["lang-",/^]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-handlebars",/^]*type\s*=\s*['"]?text\/x-handlebars-template['"]?\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-js",/^]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i],[PR.PR_DECLARATION,/^{{[#^>/]?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{&?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{{>?\s*[\w.][^}]*}}}/],[PR.PR_COMMENT,/^{{![^}]*}}/]]),["handlebars","hbs"]);PR.registerLangHandler(PR.createSimpleLexer([[PR.PR_PLAIN,/^[ \t\r\n\f]+/,null," \t\r\n\f"]],[[PR.PR_STRING,/^\"(?:[^\n\r\f\\\"]|\\(?:\r\n?|\n|\f)|\\[\s\S])*\"/,null],[PR.PR_STRING,/^\'(?:[^\n\r\f\\\']|\\(?:\r\n?|\n|\f)|\\[\s\S])*\'/,null],["lang-css-str",/^url\(([^\)\"\']*)\)/i],[PR.PR_KEYWORD,/^(?:url|rgb|\!important|@import|@page|@media|@charset|inherit)(?=[^\-\w]|$)/i,null],["lang-css-kw",/^(-?(?:[_a-z]|(?:\\[0-9a-f]+ ?))(?:[_a-z0-9\-]|\\(?:\\[0-9a-f]+ ?))*)\s*:/i],[PR.PR_COMMENT,/^\/\*[^*]*\*+(?:[^\/*][^*]*\*+)*\//],[PR.PR_COMMENT,/^(?:)/],[PR.PR_LITERAL,/^(?:\d+|\d*\.\d+)(?:%|[a-z]+)?/i],[PR.PR_LITERAL,/^#(?:[0-9a-f]{3}){1,2}/i],[PR.PR_PLAIN,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i],[PR.PR_PUNCTUATION,/^[^\s\w\'\"]+/]]),["css"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_KEYWORD,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i]]),["css-kw"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_STRING,/^[^\)\"\']+/]]),["css-str"]); diff --git a/coverage/lcov-report/sort-arrow-sprite.png b/coverage/lcov-report/sort-arrow-sprite.png deleted file mode 100644 index 03f704a609c6fd0dbfdac63466a7d7c958b5cbf3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^>_9Bd!3HEZxJ@+%Qj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS>Jii$m5978H@?Fn+^JD|Y9yzj{W`447Gxa{7*dM7nnnD-Lb z6^}Hx2)'; - } - } - return cols; - } - // attaches a data attribute to every tr element with an object - // of data values keyed by column name - function loadRowData(tableRow) { - var tableCols = tableRow.querySelectorAll('td'), - colNode, - col, - data = {}, - i, - val; - for (i = 0; i < tableCols.length; i += 1) { - colNode = tableCols[i]; - col = cols[i]; - val = colNode.getAttribute('data-value'); - if (col.type === 'number') { - val = Number(val); - } - data[col.key] = val; - } - return data; - } - // loads all row data - function loadData() { - var rows = getTableBody().querySelectorAll('tr'), - i; - - for (i = 0; i < rows.length; i += 1) { - rows[i].data = loadRowData(rows[i]); - } - } - // sorts the table using the data for the ith column - function sortByIndex(index, desc) { - var key = cols[index].key, - sorter = function (a, b) { - a = a.data[key]; - b = b.data[key]; - return a < b ? -1 : a > b ? 1 : 0; - }, - finalSorter = sorter, - tableBody = document.querySelector('.coverage-summary tbody'), - rowNodes = tableBody.querySelectorAll('tr'), - rows = [], - i; - - if (desc) { - finalSorter = function (a, b) { - return -1 * sorter(a, b); - }; - } - - for (i = 0; i < rowNodes.length; i += 1) { - rows.push(rowNodes[i]); - tableBody.removeChild(rowNodes[i]); - } - - rows.sort(finalSorter); - - for (i = 0; i < rows.length; i += 1) { - tableBody.appendChild(rows[i]); - } - } - // removes sort indicators for current column being sorted - function removeSortIndicators() { - var col = getNthColumn(currentSort.index), - cls = col.className; - - cls = cls.replace(/ sorted$/, '').replace(/ sorted-desc$/, ''); - col.className = cls; - } - // adds sort indicators for current column being sorted - function addSortIndicators() { - getNthColumn(currentSort.index).className += currentSort.desc ? ' sorted-desc' : ' sorted'; - } - // adds event listeners for all sorter widgets - function enableUI() { - var i, - el, - ithSorter = function ithSorter(i) { - var col = cols[i]; - - return function () { - var desc = col.defaultDescSort; - - if (currentSort.index === i) { - desc = !currentSort.desc; - } - sortByIndex(i, desc); - removeSortIndicators(); - currentSort.index = i; - currentSort.desc = desc; - addSortIndicators(); - }; - }; - for (i =0 ; i < cols.length; i += 1) { - if (cols[i].sortable) { - // add the click event handler on the th so users - // dont have to click on those tiny arrows - el = getNthColumn(i).querySelector('.sorter').parentElement; - if (el.addEventListener) { - el.addEventListener('click', ithSorter(i)); - } else { - el.attachEvent('onclick', ithSorter(i)); - } - } - } - } - // adds sorting functionality to the UI - return function () { - if (!getTable()) { - return; - } - cols = loadColumns(); - loadData(cols); - addSortIndicators(); - enableUI(); - }; -})(); - -window.addEventListener('load', addSorting); diff --git a/coverage/lcov.info b/coverage/lcov.info deleted file mode 100644 index 3c77eff..0000000 --- a/coverage/lcov.info +++ /dev/null @@ -1,73 +0,0 @@ -TN: -SF:/Users/sharpshark28/web/json-query-chain/index.js -FN:2,(anonymous_0) -FN:3,(anonymous_1) -FN:9,(anonymous_2) -FN:13,(anonymous_3) -FN:18,(anonymous_4) -FN:19,(anonymous_5) -FN:23,(anonymous_6) -FN:26,(anonymous_7) -FN:29,(anonymous_8) -FN:40,(anonymous_9) -FN:41,(anonymous_10) -FN:49,(anonymous_11) -FNF:12 -FNH:12 -FNDA:12,(anonymous_0) -FNDA:108,(anonymous_1) -FNDA:12,(anonymous_2) -FNDA:1,(anonymous_3) -FNDA:1,(anonymous_4) -FNDA:9,(anonymous_5) -FNDA:3,(anonymous_6) -FNDA:18,(anonymous_7) -FNDA:9,(anonymous_8) -FNDA:4,(anonymous_9) -FNDA:48,(anonymous_10) -FNDA:4,(anonymous_11) -DA:1,1 -DA:3,12 -DA:4,108 -DA:5,108 -DA:10,12 -DA:14,1 -DA:15,1 -DA:19,9 -DA:20,1 -DA:24,3 -DA:26,18 -DA:27,2 -DA:29,1 -DA:30,9 -DA:31,9 -DA:32,9 -DA:33,9 -DA:35,1 -DA:37,3 -DA:41,4 -DA:42,48 -DA:43,38 -DA:44,11 -DA:46,4 -DA:50,4 -DA:51,4 -DA:52,4 -DA:53,4 -LF:28 -LH:28 -BRDA:23,0,0,3 -BRDA:24,1,0,2 -BRDA:24,1,1,1 -BRDA:31,2,0,9 -BRDA:31,2,1,7 -BRDA:40,3,0,0 -BRDA:42,4,0,10 -BRDA:42,4,1,38 -BRDA:43,5,0,27 -BRDA:43,5,1,11 -BRDA:49,6,0,1 -BRDA:49,7,0,1 -BRF:12 -BRH:11 -end_of_record diff --git a/index.js b/index.js index 9626309..ef6fad7 100644 --- a/index.js +++ b/index.js @@ -53,7 +53,7 @@ module.exports = class Query { if (a[key] > b[key]) return 1 return 0 }) - } else console.warn('Attempted to use sortBy with a flat array') + } else console.warn('Attempted to use sortBy with a flat array. Try .sort(func) instead.') return this } diff --git a/index.test.js b/index.test.js index 0bf96ef..422092e 100644 --- a/index.test.js +++ b/index.test.js @@ -10,206 +10,233 @@ test('should not modify passed data without chain alterations', () => { expect(query).toMatchObject(TestData) }) -test('should paginate with flat array data', () => { - let query = new Query(arrayOf100Things) - .paginate() - .results +describe('.paginate()', () => { + test('with a flat array', () => { + let query = new Query(arrayOf100Things) + .paginate() + .results - expect(query.length).toBe(10) + expect(query.length).toBe(10) + }) + + test('using default params', () => { + let query = new Query(TestData) + .paginate() + .results + + expect(query.length).toBe(9) + }) + + test('with custom page length, first page', () => { + let query = new Query(TestData) + .paginate(1, 3) + .results + + expect(query.length).toBe(3) + expect(query[0].name).toBe('Haynes Meadows') + }) + + test('with custom page length, second page', () => { + let query = new Query(TestData) + .paginate(2, 3) + .results + + expect(query.length).toBe(3) + expect(query[0].name).toBe('Howard Buckley') + }) }) -test('should paginate with default params', () => { - let query = new Query(TestData) - .paginate() - .results +describe('.search()', () => { + test('partial string in flat array of strings', () => { + let query = new Query(['bar', 'foo', 'foobar', 'foofoobar']) + .search('foo') + .results - expect(query.length).toBe(9) + expect(query[0]).toBe('foofoobar') + expect(query).toContain('foo') + expect(query).not.toContain('bar') + }) + + test('by name with value/key', () => { + let query = new Query(TestData) + .search('steele', 'name') + .results + + expect(query.length).toBe(2) + }) + + test('by boolean isActive', () => { + let query = new Query(TestData) + .search(true, 'isActive') + .results + + expect(query.length).toBe(4) + }) + + test('by boolean isActive, false', () => { + let query = new Query(TestData) + .search(false, 'isActive') + .results + + expect(query.length).toBe(5) + }) + + test('warn when searching a flat array of booleans', () => { + let consoleWarnSpy = jest.spyOn(global.console, 'warn') + consoleWarnSpy.mockImplementation(() => {}) + + let query = new Query(arrayOf100Things) + .search(true, 'N/A') + .results + + expect(query).toEqual(arrayOf100Things) + expect(consoleWarnSpy).toHaveBeenCalled() + + consoleWarnSpy.mockReset() + consoleWarnSpy.mockRestore() + }) }) -test('should paginate with custom page length', () => { - let query = new Query(TestData) - .paginate(1, 3) - .results +describe('.sort()', () => { + test('with flat array', () => { + let alphabetical = (a, b) => a > b - expect(query.length).toBe(3) - expect(query[0].name).toBe('Haynes Meadows') + let query = new Query(['foo', 'bar', 'foobar']) + .sort(alphabetical) + .results + + expect(query[0]).toBe('bar') + expect(query[1]).toBe('foo') + expect(query[2]).toBe('foobar') + }) + + test('with an array of objects', () => { + let alphabetical = (a, b) => a.name > b.name + + let query = new Query(TestData) + .sort(alphabetical) + .results + + expect(query[0].name).toBe('Dudley Conner') + expect(query[query.length - 1].name).toBe('Wade Steele') + }) }) -test('should paginate to second page with custom page length', () => { - let query = new Query(TestData) - .paginate(2, 3) - .results +describe('.sortBy()', () => { + test('by boolean', () => { + let query = new Query(TestData) + .sortBy('isActive') + .results - expect(query.length).toBe(3) - expect(query[0].name).toBe('Howard Buckley') + expect(query[0].name).toBe('Katelyn Steele') + }) + + test('by number', () => { + let query = new Query(TestData) + .sortBy('netWorth') + .results + + expect(query[0].name).toBe('Howard Buckley') // Negative + expect(query[1].name).toBe('Natalia Petty') // 0 + expect(query[query.length - 1].name).toBe('Newman Mays') // Richest + }) + + test('by string', () => { + let query = new Query(TestData) + .sortBy('name') + .results + + expect(query[0].name).toBe('Dudley Conner') + }) + + test('warn when using sortBy with a flat array', () => { + let consoleWarnSpy = jest.spyOn(global.console, 'warn') + consoleWarnSpy.mockImplementation(() => {}) + + let query = new Query(arrayOf100Things) + .sortBy('N/A') + .results + + expect(query).toEqual(arrayOf100Things) + expect(consoleWarnSpy).toHaveBeenCalled() + + consoleWarnSpy.mockReset() + consoleWarnSpy.mockRestore() + }) }) -test('should search and sort on flat array of strings', () => { - let query = new Query(['bar', 'foo', 'foobar', 'foofoobar']) - .search('foo') - .results +describe('.filter()', () => { + test('with a flat array', () => { + let isEven = a => !(a % 2) - expect(query[0]).toBe('foofoobar') - expect(query).toContain('foo') - expect(query).not.toContain('bar') + let query = new Query(arrayOf100Things) + .filter(isEven) + .results + + expect(query).toContain(2) + expect(query).not.toContain(1) + }) + + test('with an array of objects', () => { + let isAgeOver33 = a => a.age > 33 + + let query = new Query(TestData) + .filter(isAgeOver33) + .results + + expect(query[0].name).toBe('Howard Buckley') + }) }) -test('should search by flat array by boolean', () => { - let consoleWarnSpy = jest.spyOn(global.console, 'warn') - consoleWarnSpy.mockImplementation(() => {}) +describe('.filterBy()', () => { + test('by key', () => { + let isNumGT33 = num => num > 33 - let query = new Query(arrayOf100Things) - .search(true, 'dumbKey') - .results + let query = new Query(TestData) + .filterBy('age', isNumGT33) + .results - expect(query).toEqual(arrayOf100Things) - expect(consoleWarnSpy).toHaveBeenCalled() + expect(query[0].name).toBe('Howard Buckley') + }) - consoleWarnSpy.mockReset() - consoleWarnSpy.mockRestore() + test('warn when using filterBy with a flat array', () => { + let consoleWarnSpy = jest.spyOn(global.console, 'warn') + consoleWarnSpy.mockImplementation(() => {}) + + let query = new Query(arrayOf100Things) + .filterBy('N/A', () => {}) + .results + + expect(query).toEqual(arrayOf100Things) + expect(consoleWarnSpy).toHaveBeenCalled() + + consoleWarnSpy.mockReset() + consoleWarnSpy.mockRestore() + }) }) -test('should search by boolean isActive', () => { - let query = new Query(TestData) - .search(true, 'isActive') - .results +describe('chaining everything together', () => { + test('with a flat array', () => { + let query = new Query(['bar', 'foo', 'foobar', 'foofoobar']) + .search('foo') + .sort() + .paginate(1, 2) + .results - expect(query.length).toBe(4) -}) - -test('should search partial matching on strings with flat array', () => { - let query = new Query(['foo', 'bar', 'foobar']) - .search('foo') - .results - - expect(query[0]).toBe('foobar') - expect(query[1]).toBe('foo') -}) - -test('should search by name', () => { - let query = new Query(TestData) - .search('steele', 'name') - .results - - expect(query.length).toBe(2) -}) - -test('should sort alphabetically with custom function', () => { - let alphabetical = (a, b) => a.name > b.name - - let query = new Query(TestData) - .sort(alphabetical) - .results - - expect(query[0].name).toBe('Dudley Conner') - expect(query[query.length - 1].name).toBe('Wade Steele') -}) - -test('should sort alphabetically with flat array', () => { - let query = new Query(['foo', 'bar', 'foobar']) - .sort((a, b) => a > b) - .results - - expect(query[0]).toBe('bar') - expect(query[1]).toBe('foo') - expect(query[2]).toBe('foobar') -}) - -test('should sortBy do nothing with flat array', () => { - let consoleWarnSpy = jest.spyOn(global.console, 'warn') - consoleWarnSpy.mockImplementation(() => {}) - - let query = new Query(arrayOf100Things) - .sortBy('dumbKey') - .results - - expect(query).toEqual(arrayOf100Things) - expect(consoleWarnSpy).toHaveBeenCalled() - - consoleWarnSpy.mockReset() - consoleWarnSpy.mockRestore() -}) - -test('should sortBy boolean isActive', () => { - let query = new Query(TestData) - .sortBy('isActive') - .results - - expect(query[0].name).toBe('Katelyn Steele') -}) - -test('should sortBy number netWorth', () => { - let query = new Query(TestData) - .sortBy('netWorth') - .results - - expect(query[0].name).toBe('Howard Buckley') // Negative - expect(query[1].name).toBe('Natalia Petty') // 0 - expect(query[query.length - 1].name).toBe('Newman Mays') // Richest -}) - -test('should sortBy string name', () => { - let query = new Query(TestData) - .sortBy('name') - .results - - expect(query[0].name).toBe('Dudley Conner') -}) - -test('should filter a flat array', () => { - let isEven = a => !(a % 2) - - let query = new Query(arrayOf100Things) - .filter(isEven) - .results - - expect(query).toContain(2) - expect(query).not.toContain(1) -}) - -test('should filter', () => { - let isAgeOver33 = a => a.age > 33 - - let query = new Query(TestData) - .filter(isAgeOver33) - .results - - expect(query[0].name).toBe('Howard Buckley') -}) - -test('should filter by key, with flat array', () => { - let consoleWarnSpy = jest.spyOn(global.console, 'warn') - consoleWarnSpy.mockImplementation(() => {}) - - let query = new Query(arrayOf100Things) - .filterBy('dumbKey', () => {}) - .results - - expect(query).toEqual(arrayOf100Things) - expect(consoleWarnSpy).toHaveBeenCalled() - - consoleWarnSpy.mockReset() - consoleWarnSpy.mockRestore() -}) - -test('should filter by key', () => { - let isNumGT33 = num => num > 33 - - let query = new Query(TestData) - .filterBy('age', isNumGT33) - .results - - expect(query[0].name).toBe('Howard Buckley') -}) - -test('should chain everything together', () => { - let query = new Query(TestData) - .search(true, 'isActive') - .sortBy('name') - .paginate(1, 2) - .results - - expect(query.length).toBe(2) - expect(query[0].name).toBe('Dudley Conner') - expect(query[query.length - 1].name).toBe('Haynes Meadows') + expect(query.length).toBe(2) + expect(query[0]).toBe('foo') + expect(query[1]).toBe('foobar') + }) + + test('with an array of objects', () => { + let query = new Query(TestData) + .search(true, 'isActive') + .sortBy('name') + .paginate(1, 2) + .results + + expect(query.length).toBe(2) + expect(query[0].name).toBe('Dudley Conner') + expect(query[query.length - 1].name).toBe('Haynes Meadows') + }) }) -- 2.45.3