Skip to content

Commit e0112a5

Browse files
committed
Document search query with resolved: false causing error #506
1 parent ad725c3 commit e0112a5

28 files changed

+99
-50
lines changed

dist/flexsearch.bundle.debug.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**!
2-
* FlexSearch.js v0.8.212 (Bundle/Debug)
2+
* FlexSearch.js v0.8.213 (Bundle/Debug)
33
* Author and Copyright: Thomas Wilkerling
44
* Licence: Apache-2.0
55
* Hosted by Nextapps GmbH
@@ -1589,8 +1589,9 @@ function db(a, c, b, e, d) {
15891589
}
15901590
}
15911591
} else {
1592-
for (let k = 0, h, l; k < a.result.length; k++) {
1593-
for (h = a.result[k], c = 0; c < h.length; c++) {
1592+
a = a.result || a;
1593+
for (let k = 0, h, l; k < a.length; k++) {
1594+
for (h = a[k], c = 0; c < h.length; c++) {
15941595
l = h[c], f[l] && ((g[k] || (g[k] = [])).push(l), f[l] = 0);
15951596
}
15961597
}
@@ -1616,7 +1617,7 @@ Na.prototype.search = function(a, c, b, e) {
16161617
h = b.suggest;
16171618
r = b.resolve !== !1;
16181619
m = b.cache;
1619-
this.store && b.highlight && !r ? console.warn("Highlighting results can only be done on a final resolver task or when calling .resolve({ highlight: ... })") : this.store && b.enrich && !r && console.warn("Enrich results can only be done on a final resolver task or when calling .resolve({ enrich: true })");
1620+
this.store && b.highlight && !r ? console.warn("Highlighting results can only be done within a resolver stage (and/or/not/xor) or when calling .resolve({ highlight: ... })") : this.store && b.enrich && !r && console.warn("Enrich results can only be done on a final resolver task or when calling .resolve({ enrich: true })");
16201621
t = r && this.store && b.highlight;
16211622
var q = !!t || r && this.store && b.enrich;
16221623
c = b.limit || c;

dist/flexsearch.bundle.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/flexsearch.bundle.module.debug.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**!
2-
* FlexSearch.js v0.8.212 (Bundle/Module/Debug)
2+
* FlexSearch.js v0.8.213 (Bundle/Module/Debug)
33
* Author and Copyright: Thomas Wilkerling
44
* Licence: Apache-2.0
55
* Hosted by Nextapps GmbH
@@ -1588,8 +1588,9 @@ function eb(a, c, b, e, d) {
15881588
}
15891589
}
15901590
} else {
1591-
for (let k = 0, h, l; k < a.result.length; k++) {
1592-
for (h = a.result[k], c = 0; c < h.length; c++) {
1591+
a = a.result || a;
1592+
for (let k = 0, h, l; k < a.length; k++) {
1593+
for (h = a[k], c = 0; c < h.length; c++) {
15931594
l = h[c], f[l] && ((g[k] || (g[k] = [])).push(l), f[l] = 0);
15941595
}
15951596
}
@@ -1615,7 +1616,7 @@ Na.prototype.search = function(a, c, b, e) {
16151616
h = b.suggest;
16161617
r = b.resolve !== !1;
16171618
m = b.cache;
1618-
this.store && b.highlight && !r ? console.warn("Highlighting results can only be done on a final resolver task or when calling .resolve({ highlight: ... })") : this.store && b.enrich && !r && console.warn("Enrich results can only be done on a final resolver task or when calling .resolve({ enrich: true })");
1619+
this.store && b.highlight && !r ? console.warn("Highlighting results can only be done within a resolver stage (and/or/not/xor) or when calling .resolve({ highlight: ... })") : this.store && b.enrich && !r && console.warn("Enrich results can only be done on a final resolver task or when calling .resolve({ enrich: true })");
16191620
t = r && this.store && b.highlight;
16201621
var q = !!t || r && this.store && b.enrich;
16211622
c = b.limit || c;

dist/flexsearch.bundle.module.debug.mjs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**!
2-
* FlexSearch.js v0.8.212 (Bundle/Module/Debug)
2+
* FlexSearch.js v0.8.213 (Bundle/Module/Debug)
33
* Author and Copyright: Thomas Wilkerling
44
* Licence: Apache-2.0
55
* Hosted by Nextapps GmbH
@@ -1588,8 +1588,9 @@ function eb(a, c, b, e, d) {
15881588
}
15891589
}
15901590
} else {
1591-
for (let k = 0, h, l; k < a.result.length; k++) {
1592-
for (h = a.result[k], c = 0; c < h.length; c++) {
1591+
a = a.result || a;
1592+
for (let k = 0, h, l; k < a.length; k++) {
1593+
for (h = a[k], c = 0; c < h.length; c++) {
15931594
l = h[c], f[l] && ((g[k] || (g[k] = [])).push(l), f[l] = 0);
15941595
}
15951596
}
@@ -1615,7 +1616,7 @@ Na.prototype.search = function(a, c, b, e) {
16151616
h = b.suggest;
16161617
r = b.resolve !== !1;
16171618
m = b.cache;
1618-
this.store && b.highlight && !r ? console.warn("Highlighting results can only be done on a final resolver task or when calling .resolve({ highlight: ... })") : this.store && b.enrich && !r && console.warn("Enrich results can only be done on a final resolver task or when calling .resolve({ enrich: true })");
1619+
this.store && b.highlight && !r ? console.warn("Highlighting results can only be done within a resolver stage (and/or/not/xor) or when calling .resolve({ highlight: ... })") : this.store && b.enrich && !r && console.warn("Enrich results can only be done on a final resolver task or when calling .resolve({ enrich: true })");
16191620
t = r && this.store && b.highlight;
16201621
var q = !!t || r && this.store && b.enrich;
16211622
c = b.limit || c;

dist/flexsearch.bundle.module.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/flexsearch.bundle.module.min.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**!
2-
* FlexSearch.js v0.8.212 (Bundle/Module)
2+
* FlexSearch.js v0.8.213 (Bundle/Module)
33
* Author and Copyright: Thomas Wilkerling
44
* Licence: Apache-2.0
55
* Hosted by Nextapps GmbH
@@ -54,7 +54,7 @@ w.resolve=function(a,c,b,e,d){let f=this.await?Wa(this,!0):this.result;if(f.then
5454
w.finalize=function(a,c){if(a.then){const e=this;return a.then(function(d){return e.finalize(d,c)})}c&&a.length&&this.query&&(a=cb(this.query,a,this.index.index,this.field,c));const b=this.return;this.highlight=this.index=this.result=this.C=this.await=this.return=null;this.query=this.field="";b&&b(a);return a};function $a(a,c,b,e,d,f,g){const k=a.length;let h=[],l,m;l=I();for(let p=0,u,r,t,n;p<c;p++)for(let q=0;q<k;q++)if(t=a[q],p<t.length&&(u=t[p]))for(let x=0;x<u.length;x++){r=u[x];(m=l[r])?l[r]++:(m=0,l[r]=1);n=h[m]||(h[m]=[]);if(!g){let v=p+(q||!d?0:f||0);n=n[v]||(n[v]=[])}n.push(r);if(g&&b&&m===k-1&&n.length-e===b)return e?n.slice(e):n}if(a=h.length)if(d)h=h.length>1?Ya(h,b,e,g,f):(h=h[0])&&b&&h.length>b||e?h.slice(e,b+e):h;else{if(a<k)return[];h=h[a-1];if(b||e)if(g){if(h.length>b||e)h=h.slice(e,b+
5555
e)}else{d=[];for(let p=0,u;p<h.length;p++)if(u=h[p])if(e&&u.length>e)e-=u.length;else{if(b&&u.length>b||e)u=u.slice(e,b+e),b-=u.length,e&&(e-=u.length);d.push(u);if(!b)break}h=d}}return h}
5656
function Ya(a,c,b,e,d){const f=[],g=I();let k;var h=a.length;let l;if(e)for(d=h-1;d>=0;d--){if(l=(e=a[d])&&e.length)for(h=0;h<l;h++)if(k=e[h],!g[k])if(g[k]=1,b)b--;else if(f.push(k),f.length===c)return f}else for(let m=h-1,p,u=0;m>=0;m--){p=a[m];for(let r=0;r<p.length;r++)if(l=(e=p[r])&&e.length)for(let t=0;t<l;t++)if(k=e[t],!g[k])if(g[k]=1,b)b--;else{let n=(r+(m<h-1?d||0:0))/(m+1)|0;(f[n]||(f[n]=[])).push(k);if(++u===c)return f}}return f}
57-
function eb(a,c,b,e,d){const f=I(),g=[];for(let k=0,h;k<c.length;k++){h=c[k];for(let l=0;l<h.length;l++)f[h[l]]=1}if(d)for(let k=0,h;k<a.length;k++){if(h=a[k],f[h])if(e)e--;else if(g.push(h),f[h]=0,b&&--b===0)break}else for(let k=0,h,l;k<a.result.length;k++)for(h=a.result[k],c=0;c<h.length;c++)l=h[c],f[l]&&((g[k]||(g[k]=[])).push(l),f[l]=0);return g};I();Na.prototype.search=function(a,c,b,e){b||(!c&&ba(a)?(b=a,a=""):ba(c)&&(b=c,c=0));let d=[];var f=[];let g;let k,h,l,m,p;let u=0,r=!0,t;if(b){b.constructor===Array&&(b={index:b});a=b.query||a;g=b.pluck;k=b.merge;l=b.boost;p=g||b.field||(p=b.index)&&(p.index?null:p);var n=this.tag&&b.tag;h=b.suggest;r=b.resolve!==!1;m=b.cache;t=r&&this.store&&b.highlight;var q=!!t||r&&this.store&&b.enrich;c=b.limit||c;var x=b.offset||0;c||(c=r?100:0);if(n&&(!this.db||!e)){n.constructor!==Array&&(n=[n]);var v=[];for(let B=
57+
function eb(a,c,b,e,d){const f=I(),g=[];for(let k=0,h;k<c.length;k++){h=c[k];for(let l=0;l<h.length;l++)f[h[l]]=1}if(d)for(let k=0,h;k<a.length;k++){if(h=a[k],f[h])if(e)e--;else if(g.push(h),f[h]=0,b&&--b===0)break}else{a=a.result||a;for(let k=0,h,l;k<a.length;k++)for(h=a[k],c=0;c<h.length;c++)l=h[c],f[l]&&((g[k]||(g[k]=[])).push(l),f[l]=0)}return g};I();Na.prototype.search=function(a,c,b,e){b||(!c&&ba(a)?(b=a,a=""):ba(c)&&(b=c,c=0));let d=[];var f=[];let g;let k,h,l,m,p;let u=0,r=!0,t;if(b){b.constructor===Array&&(b={index:b});a=b.query||a;g=b.pluck;k=b.merge;l=b.boost;p=g||b.field||(p=b.index)&&(p.index?null:p);var n=this.tag&&b.tag;h=b.suggest;r=b.resolve!==!1;m=b.cache;t=r&&this.store&&b.highlight;var q=!!t||r&&this.store&&b.enrich;c=b.limit||c;var x=b.offset||0;c||(c=r?100:0);if(n&&(!this.db||!e)){n.constructor!==Array&&(n=[n]);var v=[];for(let B=
5858
0,z;B<n.length;B++)if(z=n[B],z.field&&z.tag){var A=z.tag;if(A.constructor===Array)for(var D=0;D<A.length;D++)v.push(z.field,A[D]);else v.push(z.field,A)}else{A=Object.keys(z);for(let C=0,J,G;C<A.length;C++)if(J=A[C],G=z[J],G.constructor===Array)for(D=0;D<G.length;D++)v.push(J,G[D]);else v.push(J,G)}n=v;if(!a){f=[];if(v.length)for(n=0;n<v.length;n+=2){if(this.db){e=this.index.get(v[n]);if(!e)continue;f.push(e=e.db.tag(v[n+1],c,x,q))}else e=fb.call(this,v[n],v[n+1],c,x,q);d.push(r?{field:v[n],tag:v[n+
5959
1],result:e}:[e])}if(f.length){const B=this;return Promise.all(f).then(function(z){for(let C=0;C<z.length;C++)r?d[C].result=z[C]:d[C]=z[C];return r?d:new X(d.length>1?$a(d,1,0,0,h,l):d[0],B)})}return r?d:new X(d.length>1?$a(d,1,0,0,h,l):d[0],this)}}r||g||!(p=p||this.field)||(M(p)?g=p:(p.constructor===Array&&p.length===1&&(p=p[0]),g=p.field||p.index));p&&p.constructor!==Array&&(p=[p])}p||(p=this.field);let F;v=(this.worker||this.db)&&!e&&[];for(let B=0,z,C,J;B<p.length;B++){C=p[B];if(this.db&&this.tag&&
6060
!this.B[B])continue;let G;M(C)||(G=C,C=G.field,a=G.query||a,c=aa(G.limit,c),x=aa(G.offset,x),h=aa(G.suggest,h),t=r&&this.store&&aa(G.highlight,t),q=!!t||r&&this.store&&aa(G.enrich,q),m=aa(G.cache,m));if(e)z=e[B];else{A=G||b||{};D=A.enrich;var E=this.index.get(C);n&&(this.db&&(A.tag=n,A.field=p,F=E.db.support_tag_search),!F&&D&&(A.enrich=!1),F||(A.limit=0,A.offset=0));z=m?E.searchCache(a,n&&!F?0:c,A):E.search(a,n&&!F?0:c,A);n&&!F&&(A.limit=c,A.offset=x);D&&(A.enrich=D);if(v){v[B]=z;continue}}J=(z=

0 commit comments

Comments
 (0)