@leeoniya/ufuzzy - npm Package Compare versions

Comparing version 1.0.14 to 1.0.15

dist/uFuzzy.cjs.js

 /**
-* Copyright (c) 2023, Leon Sorokin
+* Copyright (c) 2024, Leon Sorokin
 * All rights reserved. (MIT Licensed)
@@ -7,3 +7,3 @@ *
 * A tiny, efficient fuzzy matcher that doesn't suck
-* https://github.com/leeoniya/uFuzzy (v1.0.14)
+* https://github.com/leeoniya/uFuzzy (v1.0.15)
 */
@@ -23,2 +23,4 @@
 
+const PUNCT_RE = /\p{P}/gu;
+
 const LATIN_UPPER = 'A-Z';
@@ -39,2 +41,4 @@ const LATIN_LOWER = 'a-z';
 
+	// inter bounds that will be used to increase lft2/rgt2 info counters
+	interBound: "[^A-Za-z\\d]",
 	// intra bounds that will be used to increase lft1/rgt1 info counters
@@ -88,2 +92,3 @@ intraBound: "[A-Za-z]\\d|\\d[A-Za-z]|[a-z][A-Z]",
 			interIns,
+			cases,
 		} = info;
@@ -107,2 +112,4 @@
 			start[ia] - start[ib] ||
+			// case match
+			cases[ib] - cases[ia] ||
 			// alphabetic
@@ -140,2 +147,3 @@ cmp(haystack[idx[ia]], haystack[idx[ib]])
 		intraBound: _intraBound,
+		interBound: _interBound,
 		intraChars,
@@ -157,2 +165,3 @@ } = opts;
 		_intraSplit = swapAlpha(_intraSplit, upper, lower);
+		_interBound = swapAlpha(_interBound, upper, lower);
 		_intraBound = swapAlpha(_intraBound, upper, lower);
@@ -224,3 +233,3 @@ intraChars = swapAlpha(intraChars, upper, lower);
 
-	const split = needle => {
+	const split = (needle, keepCase = false) => {
 		let exacts = [];
@@ -233,4 +242,7 @@
 
-		needle = needle.replace(trimRe, '').toLocaleLowerCase();
+		needle = needle.replace(trimRe, '');
 
+		if (!keepCase)
+			needle = needle.toLocaleLowerCase();
+
 		if (withIntraSplit)
@@ -414,3 +426,3 @@ needle = needle.replace(intraSplit, m => m[0] + ' ' + m[1]);
 
-	let interBound = new RegExp(_interSplit, uFlag);
+	let interBound = new RegExp(_interBound, uFlag);
 	let intraBound = new RegExp(_intraBound, uFlag);
@@ -421,5 +433,20 @@
 		let [query, parts, contrs] = prepQuery(needle, 1);
+		let partsCased = split(needle, true);
 		let [queryR] = prepQuery(needle, 2);
 		let partsLen = parts.length;
 
+		let _terms      = Array(partsLen);
+		let _termsCased = Array(partsLen);
+
+		for (let j = 0; j < partsLen; j++) {
+			let part      = parts[j];
+			let partCased = partsCased[j];
+
+			let term      = part[0]      == '"' ? part.slice(1, -1)      : part      + contrs[j];
+			let termCased = partCased[0] == '"' ? partCased.slice(1, -1) : partCased + contrs[j];
+
+			_terms[j]      = term;
+			_termsCased[j] = termCased;
+		}
+
 		let len = idxs.length;
@@ -441,2 +468,5 @@
 
+			// case matched in term (via term.includes(match))
+			case: field.slice(),
+
 			// contiguous (no fuzz) and bounded terms (intra=0, lft2/1, rgt2/1)
@@ -483,2 +513,3 @@ // excludes terms that are contiguous but have < 2 bounds (substrings)
 			let terms = 0;
+			let cases = 0;
 			let inter = 0;
@@ -490,9 +521,12 @@ let intra = 0;
 			for (let j = 0, k = 2; j < partsLen; j++, k+=2) {
-				let group = m[k].toLocaleLowerCase();
-				let part = parts[j];
-				let term = part[0] == '"' ? part.slice(1, -1) : part + contrs[j];
-				let termLen = term.length;
-				let groupLen = group.length;
+				let group     = m[k].toLocaleLowerCase();
+				let term      = _terms[j];
+				let termCased = _termsCased[j];
+				let termLen   = term.length;
+				let groupLen  = group.length;
 				let fullMatch = group == term;
 
+				if (m[k] == termCased)
+					cases++;
+
 				// this won't handle the case when an exact match exists across the boundary of the current group and the next junk
@@ -647,2 +681,3 @@ // e.g. blob,ob when searching for 'bob' but finding the earlier `blob` (with extra insertion)
 				info.terms[ii]     = terms;
+				info.cases[ii]     = cases;
 				info.interIns[ii]  = inter;
@@ -749,6 +784,7 @@ info.intraIns[ii]  = intra;
 
-			if (neg[0] === '"')
-				neg = escapeRegExp(neg.slice(1,-1));
+			neg = neg[0] === '"' ? escapeRegExp(neg.slice(1,-1)) :  neg.replace(PUNCT_RE, '');
 
-			negs.push(neg);
+			if (neg != '')
+				negs.push(neg);
+
 			return '';
@@ -755,0 +791,0 @@ });

dist/uFuzzy.d.ts

@@ -37,3 +37,3 @@ declare class uFuzzy {
 	/** utility for splitting needle into terms following defined interSplit/intraSplit opts. useful for out-of-order permutes */
-	split(needle: string): uFuzzy.Terms;
+	split(needle: string, keepCase?: boolean): uFuzzy.Terms;
 
@@ -114,5 +114,7 @@ /** util for creating out-of-order permutations of a needle terms array */
 		/** term segmentation & punct/whitespace merging */
-		interSplit?: PartialRegExp;         // '[^A-Za-z0-9]+'
+		interSplit?: PartialRegExp;         // '[^A-Za-z\\d']+'
 		intraSplit?: PartialRegExp | null;  // '[a-z][A-Z]'
 
+		/** inter bounds that will be used to increase lft2/rgt2 info counters */
+		interBound?: PartialRegExp | null;  // '[^A-Za-z\\d]'
 		/** intra bounds that will be used to increase lft1/rgt1 info counters */
@@ -191,2 +193,5 @@ intraBound?: PartialRegExp | null;  // '[A-Za-z][0-9]|[0-9][A-Za-z]|[a-z][A-Z]'
 
+		/** number of needle terms with case-sensitive partial matches */
+		cases: number[];
+
 		/** offset ranges within match for highlighting: [startIdx0, endIdx0, startIdx1, endIdx1,...] */
@@ -193,0 +198,0 @@ ranges: number[][];

dist/uFuzzy.esm.js

 /**
-* Copyright (c) 2023, Leon Sorokin
+* Copyright (c) 2024, Leon Sorokin
 * All rights reserved. (MIT Licensed)
@@ -7,3 +7,3 @@ *
 * A tiny, efficient fuzzy matcher that doesn't suck
-* https://github.com/leeoniya/uFuzzy (v1.0.14)
+* https://github.com/leeoniya/uFuzzy (v1.0.15)
 */
@@ -21,2 +21,4 @@
 
+const PUNCT_RE = /\p{P}/gu;
+
 const LATIN_UPPER = 'A-Z';
@@ -37,2 +39,4 @@ const LATIN_LOWER = 'a-z';
 
+	// inter bounds that will be used to increase lft2/rgt2 info counters
+	interBound: "[^A-Za-z\\d]",
 	// intra bounds that will be used to increase lft1/rgt1 info counters
@@ -86,2 +90,3 @@ intraBound: "[A-Za-z]\\d|\\d[A-Za-z]|[a-z][A-Z]",
 			interIns,
+			cases,
 		} = info;
@@ -105,2 +110,4 @@
 			start[ia] - start[ib] ||
+			// case match
+			cases[ib] - cases[ia] ||
 			// alphabetic
@@ -138,2 +145,3 @@ cmp(haystack[idx[ia]], haystack[idx[ib]])
 		intraBound: _intraBound,
+		interBound: _interBound,
 		intraChars,
@@ -155,2 +163,3 @@ } = opts;
 		_intraSplit = swapAlpha(_intraSplit, upper, lower);
+		_interBound = swapAlpha(_interBound, upper, lower);
 		_intraBound = swapAlpha(_intraBound, upper, lower);
@@ -222,3 +231,3 @@ intraChars = swapAlpha(intraChars, upper, lower);
 
-	const split = needle => {
+	const split = (needle, keepCase = false) => {
 		let exacts = [];
@@ -231,4 +240,7 @@
 
-		needle = needle.replace(trimRe, '').toLocaleLowerCase();
+		needle = needle.replace(trimRe, '');
 
+		if (!keepCase)
+			needle = needle.toLocaleLowerCase();
+
 		if (withIntraSplit)
@@ -412,3 +424,3 @@ needle = needle.replace(intraSplit, m => m[0] + ' ' + m[1]);
 
-	let interBound = new RegExp(_interSplit, uFlag);
+	let interBound = new RegExp(_interBound, uFlag);
 	let intraBound = new RegExp(_intraBound, uFlag);
@@ -419,5 +431,20 @@
 		let [query, parts, contrs] = prepQuery(needle, 1);
+		let partsCased = split(needle, true);
 		let [queryR] = prepQuery(needle, 2);
 		let partsLen = parts.length;
 
+		let _terms      = Array(partsLen);
+		let _termsCased = Array(partsLen);
+
+		for (let j = 0; j < partsLen; j++) {
+			let part      = parts[j];
+			let partCased = partsCased[j];
+
+			let term      = part[0]      == '"' ? part.slice(1, -1)      : part      + contrs[j];
+			let termCased = partCased[0] == '"' ? partCased.slice(1, -1) : partCased + contrs[j];
+
+			_terms[j]      = term;
+			_termsCased[j] = termCased;
+		}
+
 		let len = idxs.length;
@@ -439,2 +466,5 @@
 
+			// case matched in term (via term.includes(match))
+			case: field.slice(),
+
 			// contiguous (no fuzz) and bounded terms (intra=0, lft2/1, rgt2/1)
@@ -481,2 +511,3 @@ // excludes terms that are contiguous but have < 2 bounds (substrings)
 			let terms = 0;
+			let cases = 0;
 			let inter = 0;
@@ -488,9 +519,12 @@ let intra = 0;
 			for (let j = 0, k = 2; j < partsLen; j++, k+=2) {
-				let group = m[k].toLocaleLowerCase();
-				let part = parts[j];
-				let term = part[0] == '"' ? part.slice(1, -1) : part + contrs[j];
-				let termLen = term.length;
-				let groupLen = group.length;
+				let group     = m[k].toLocaleLowerCase();
+				let term      = _terms[j];
+				let termCased = _termsCased[j];
+				let termLen   = term.length;
+				let groupLen  = group.length;
 				let fullMatch = group == term;
 
+				if (m[k] == termCased)
+					cases++;
+
 				// this won't handle the case when an exact match exists across the boundary of the current group and the next junk
@@ -645,2 +679,3 @@ // e.g. blob,ob when searching for 'bob' but finding the earlier `blob` (with extra insertion)
 				info.terms[ii]     = terms;
+				info.cases[ii]     = cases;
 				info.interIns[ii]  = inter;
@@ -747,6 +782,7 @@ info.intraIns[ii]  = intra;
 
-			if (neg[0] === '"')
-				neg = escapeRegExp(neg.slice(1,-1));
+			neg = neg[0] === '"' ? escapeRegExp(neg.slice(1,-1)) :  neg.replace(PUNCT_RE, '');
 
-			negs.push(neg);
+			if (neg != '')
+				negs.push(neg);
+
 			return '';
@@ -753,0 +789,0 @@ });

dist/uFuzzy.iife.js

 /**
-* Copyright (c) 2023, Leon Sorokin
+* Copyright (c) 2024, Leon Sorokin
 * All rights reserved. (MIT Licensed)
@@ -7,3 +7,3 @@ *
 * A tiny, efficient fuzzy matcher that doesn't suck
-* https://github.com/leeoniya/uFuzzy (v1.0.14)
+* https://github.com/leeoniya/uFuzzy (v1.0.15)
 */
@@ -24,2 +24,4 @@
 
+	const PUNCT_RE = /\p{P}/gu;
+
 	const LATIN_UPPER = 'A-Z';
@@ -40,2 +42,4 @@ const LATIN_LOWER = 'a-z';
 
+		// inter bounds that will be used to increase lft2/rgt2 info counters
+		interBound: "[^A-Za-z\\d]",
 		// intra bounds that will be used to increase lft1/rgt1 info counters
@@ -89,2 +93,3 @@ intraBound: "[A-Za-z]\\d|\\d[A-Za-z]|[a-z][A-Z]",
 				interIns,
+				cases,
 			} = info;
@@ -108,2 +113,4 @@
 				start[ia] - start[ib] ||
+				// case match
+				cases[ib] - cases[ia] ||
 				// alphabetic
@@ -141,2 +148,3 @@ cmp(haystack[idx[ia]], haystack[idx[ib]])
 			intraBound: _intraBound,
+			interBound: _interBound,
 			intraChars,
@@ -158,2 +166,3 @@ } = opts;
 			_intraSplit = swapAlpha(_intraSplit, upper, lower);
+			_interBound = swapAlpha(_interBound, upper, lower);
 			_intraBound = swapAlpha(_intraBound, upper, lower);
@@ -225,3 +234,3 @@ intraChars = swapAlpha(intraChars, upper, lower);
 
-		const split = needle => {
+		const split = (needle, keepCase = false) => {
 			let exacts = [];
@@ -234,4 +243,7 @@
 
-			needle = needle.replace(trimRe, '').toLocaleLowerCase();
+			needle = needle.replace(trimRe, '');
 
+			if (!keepCase)
+				needle = needle.toLocaleLowerCase();
+
 			if (withIntraSplit)
@@ -415,3 +427,3 @@ needle = needle.replace(intraSplit, m => m[0] + ' ' + m[1]);
 
-		let interBound = new RegExp(_interSplit, uFlag);
+		let interBound = new RegExp(_interBound, uFlag);
 		let intraBound = new RegExp(_intraBound, uFlag);
@@ -422,5 +434,20 @@
 			let [query, parts, contrs] = prepQuery(needle, 1);
+			let partsCased = split(needle, true);
 			let [queryR] = prepQuery(needle, 2);
 			let partsLen = parts.length;
 
+			let _terms      = Array(partsLen);
+			let _termsCased = Array(partsLen);
+
+			for (let j = 0; j < partsLen; j++) {
+				let part      = parts[j];
+				let partCased = partsCased[j];
+
+				let term      = part[0]      == '"' ? part.slice(1, -1)      : part      + contrs[j];
+				let termCased = partCased[0] == '"' ? partCased.slice(1, -1) : partCased + contrs[j];
+
+				_terms[j]      = term;
+				_termsCased[j] = termCased;
+			}
+
 			let len = idxs.length;
@@ -442,2 +469,5 @@
 
+				// case matched in term (via term.includes(match))
+				case: field.slice(),
+
 				// contiguous (no fuzz) and bounded terms (intra=0, lft2/1, rgt2/1)
@@ -484,2 +514,3 @@ // excludes terms that are contiguous but have < 2 bounds (substrings)
 				let terms = 0;
+				let cases = 0;
 				let inter = 0;
@@ -491,9 +522,12 @@ let intra = 0;
 				for (let j = 0, k = 2; j < partsLen; j++, k+=2) {
-					let group = m[k].toLocaleLowerCase();
-					let part = parts[j];
-					let term = part[0] == '"' ? part.slice(1, -1) : part + contrs[j];
-					let termLen = term.length;
-					let groupLen = group.length;
+					let group     = m[k].toLocaleLowerCase();
+					let term      = _terms[j];
+					let termCased = _termsCased[j];
+					let termLen   = term.length;
+					let groupLen  = group.length;
 					let fullMatch = group == term;
 
+					if (m[k] == termCased)
+						cases++;
+
 					// this won't handle the case when an exact match exists across the boundary of the current group and the next junk
@@ -648,2 +682,3 @@ // e.g. blob,ob when searching for 'bob' but finding the earlier `blob` (with extra insertion)
 					info.terms[ii]     = terms;
+					info.cases[ii]     = cases;
 					info.interIns[ii]  = inter;
@@ -750,6 +785,7 @@ info.intraIns[ii]  = intra;
 
-				if (neg[0] === '"')
-					neg = escapeRegExp(neg.slice(1,-1));
+				neg = neg[0] === '"' ? escapeRegExp(neg.slice(1,-1)) :  neg.replace(PUNCT_RE, '');
 
-				negs.push(neg);
+				if (neg != '')
+					negs.push(neg);
+
 				return '';
@@ -756,0 +792,0 @@ });

dist/uFuzzy.iife.min.js

@@ -1,2 +0,2 @@
-/*! https://github.com/leeoniya/uFuzzy (v1.0.14) */
-var uFuzzy=function(){"use strict";const e=new Intl.Collator("en",{numeric:!0,sensitivity:"base"}).compare,t=1/0,l=e=>e.replace(/[.*+?^${}()|[\]\\]/g,"\\$&"),n="eexxaacctt",r=(e,t,l)=>e.replace("A-Z",t).replace("a-z",l),i={unicode:!1,alpha:null,interSplit:"[^A-Za-z\\d']+",intraSplit:"[a-z][A-Z]",intraBound:"[A-Za-z]\\d|\\d[A-Za-z]|[a-z][A-Z]",interLft:0,interRgt:0,interChars:".",interIns:t,intraChars:"[a-z\\d']",intraIns:null,intraContr:"'[a-z]{1,2}\\b",intraMode:0,intraSlice:[1,t],intraSub:null,intraTrn:null,intraDel:null,intraFilt:()=>!0,sort:(t,l)=>{let{idx:n,chars:r,terms:i,interLft2:s,interLft1:a,start:g,intraIns:f,interIns:h}=t;return n.map(((e,t)=>t)).sort(((t,u)=>r[u]-r[t]||f[t]-f[u]||i[u]+s[u]+.5*a[u]-(i[t]+s[t]+.5*a[t])||h[t]-h[u]||g[t]-g[u]||e(l[n[t]],l[n[u]])))}},s=(e,l)=>0==l?"":1==l?e+"??":l==t?e+"*?":e+`{0,${l}}?`,a="(?:\\b|_)";function g(e){e=Object.assign({},i,e);let{unicode:t,interLft:g,interRgt:f,intraMode:u,intraSlice:c,intraIns:o,intraSub:p,intraTrn:d,intraDel:m,intraContr:x,intraSplit:b,interSplit:R,intraBound:L,intraChars:A}=e;o??=u,p??=u,d??=u,m??=u;let S=e.letters??e.alpha;if(null!=S){let e=S.toLocaleUpperCase(),t=S.toLocaleLowerCase();R=r(R,e,t),b=r(b,e,t),L=r(L,e,t),A=r(A,e,t),x=r(x,e,t)}let E=t?"u":"";const I='".+?"',z=RegExp(I,"gi"+E),C=RegExp(`(?:\\s+|^)-(?:${A}+|${I})`,"gi"+E);let{intraRules:y}=e;null==y&&(y=e=>{let t=i.intraSlice,l=0,n=0,r=0,s=0;if(/[^\d]/.test(e)){let i=e.length;i>4?(t=c,l=o,n=p,r=d,s=m):3>i||(r=Math.min(d,1),4==i&&(l=Math.min(o,1)))}return{intraSlice:t,intraIns:l,intraSub:n,intraTrn:r,intraDel:s}});let k=!!b,j=RegExp(b,"g"+E),$=RegExp(R,"g"+E),w=RegExp("^"+R+"|"+R+"$","g"+E),Z=RegExp(x,"gi"+E);const M=e=>{let t=[];e=(e=e.replace(z,(e=>(t.push(e),n)))).replace(w,"").toLocaleLowerCase(),k&&(e=e.replace(j,(e=>e[0]+" "+e[1])));let l=0;return e.split($).filter((e=>""!=e)).map((e=>e===n?t[l++]:e))},D=/[^\d]+|\d+/g,T=(t,n=0,r=!1)=>{let i=M(t);if(0==i.length)return[];let h,c=Array(i.length).fill("");if(i=i.map(((e,t)=>e.replace(Z,(e=>(c[t]=e,""))))),1==u)h=i.map(((e,t)=>{if('"'===e[0])return l(e.slice(1,-1));let n="";for(let l of e.matchAll(D)){let e=l[0],{intraSlice:r,intraIns:i,intraSub:a,intraTrn:g,intraDel:f}=y(e);if(i+a+g+f==0)n+=e+c[t];else{let[l,h]=r,u=e.slice(0,l),o=e.slice(h),p=e.slice(l,h);1==i&&1==u.length&&u!=p[0]&&(u+="(?!"+u+")");let d=p.length,m=[e];if(a)for(let e=0;d>e;e++)m.push(u+p.slice(0,e)+A+p.slice(e+1)+o);if(g)for(let e=0;d-1>e;e++)p[e]!=p[e+1]&&m.push(u+p.slice(0,e)+p[e+1]+p[e]+p.slice(e+2)+o);if(f)for(let e=0;d>e;e++)m.push(u+p.slice(0,e+1)+"?"+p.slice(e+1)+o);if(i){let e=s(A,1);for(let t=0;d>t;t++)m.push(u+p.slice(0,t)+e+p.slice(t)+o)}n+="(?:"+m.join("|")+")"+c[t]}}return n}));else{let e=s(A,o);2==n&&o>0&&(e=")("+e+")("),h=i.map(((t,n)=>'"'===t[0]?l(t.slice(1,-1)):t.split("").map(((e,t,l)=>(1==o&&0==t&&l.length>1&&e!=l[t+1]&&(e+="(?!"+e+")"),e))).join(e)+c[n]))}let p=2==g?a:"",d=2==f?a:"",m=d+s(e.interChars,e.interIns)+p;return n>0?r?h=p+"("+h.join(")"+d+"|"+p+"(")+")"+d:(h="("+h.join(")("+m+")(")+")",h="(.??"+p+")"+h+"("+d+".*)"):(h=h.join(m),h=p+h+d),[RegExp(h,"i"+E),i,c]},F=(e,t,l)=>{let[n]=T(t);if(null==n)return null;let r=[];if(null!=l)for(let t=0;l.length>t;t++){let i=l[t];n.test(e[i])&&r.push(i)}else for(let t=0;e.length>t;t++)n.test(e[t])&&r.push(t);return r};let O=!!L,v=RegExp(R,E),B=RegExp(L,E);const U=(t,l,n)=>{let[r,i,s]=T(n,1),[a]=T(n,2),h=i.length,u=t.length,c=Array(u).fill(0),o={idx:Array(u),start:c.slice(),chars:c.slice(),terms:c.slice(),interIns:c.slice(),intraIns:c.slice(),interLft2:c.slice(),interRgt2:c.slice(),interLft1:c.slice(),interRgt1:c.slice(),ranges:Array(u)},p=1==g||1==f,d=0;for(let n=0;t.length>n;n++){let u=l[t[n]],c=u.match(r),m=c.index+c[1].length,x=m,b=!1,R=0,L=0,A=0,S=0,I=0,z=0,C=0,y=0,k=[];for(let t=0,l=2;h>t;t++,l+=2){let n=c[l].toLocaleLowerCase(),r=i[t],a='"'==r[0]?r.slice(1,-1):r+s[t],o=a.length,d=n.length,j=n==a;if(!j&&c[l+1].length>=o){let e=c[l+1].toLocaleLowerCase().indexOf(a);e>-1&&(k.push(x,d,e,o),x+=N(c,l,e,o),n=a,d=o,j=!0,0==t&&(m=x))}if(p||j){let e=x-1,r=x+d,i=!1,s=!1;if(-1==e||v.test(u[e]))j&&R++,i=!0;else{if(2==g){b=!0;break}if(O&&B.test(u[e]+u[e+1]))j&&L++,i=!0;else if(1==g){let e=c[l+1],r=x+d;if(e.length>=o){let s,g=0,f=!1,h=RegExp(a,"ig"+E);for(;s=h.exec(e);){g=s.index;let e=r+g,t=e-1;if(-1==t||v.test(u[t])){R++,f=!0;break}if(B.test(u[t]+u[e])){L++,f=!0;break}}f&&(i=!0,k.push(x,d,g,o),x+=N(c,l,g,o),n=a,d=o,j=!0,0==t&&(m=x))}if(!i){b=!0;break}}}if(r==u.length||v.test(u[r]))j&&A++,s=!0;else{if(2==f){b=!0;break}if(O&&B.test(u[r-1]+u[r]))j&&S++,s=!0;else if(1==f){b=!0;break}}j&&(I+=o,i&&s&&z++)}if(d>o&&(y+=d-o),t>0&&(C+=c[l-1].length),!e.intraFilt(a,n,x)){b=!0;break}h-1>t&&(x+=d+c[l+1].length)}if(!b){o.idx[d]=t[n],o.interLft2[d]=R,o.interLft1[d]=L,o.interRgt2[d]=A,o.interRgt1[d]=S,o.chars[d]=I,o.terms[d]=z,o.interIns[d]=C,o.intraIns[d]=y,o.start[d]=m;let e=u.match(a),l=e.index+e[1].length,r=k.length,i=r>0?0:1/0,s=r-4;for(let t=2;e.length>t;)if(i>s||k[i]!=l)l+=e[t].length,t++;else{let n=k[i+1],r=k[i+2],s=k[i+3],a=t,g="";for(let t=0;n>t;a++)g+=e[a],t+=e[a].length;e.splice(t,a-t,g),l+=N(e,t,r,s),i+=4}l=e.index+e[1].length;let g=o.ranges[d]=[],f=l,h=l;for(let t=2;e.length>t;t++){let n=e[t].length;l+=n,t%2==0?h=l:n>0&&(g.push(f,h),f=h=l)}h>f&&g.push(f,h),d++}}if(t.length>d)for(let e in o)o[e]=o[e].slice(0,d);return o},N=(e,t,l,n)=>{let r=e[t]+e[t+1].slice(0,l);return e[t-1]+=r,e[t]=e[t+1].slice(l,l+n),e[t+1]=e[t+1].slice(l+n),r.length};return{search:(...t)=>((t,n,r,i=1e3,s)=>{r=r?!0===r?5:r:0;let a=null,g=null,f=[];n=n.replace(C,(e=>{let t=e.trim().slice(1);return'"'===t[0]&&(t=l(t.slice(1,-1))),f.push(t),""}));let u,c=M(n);if(f.length>0){if(u=RegExp(f.join("|"),"i"+E),0==c.length){let e=[];for(let l=0;t.length>l;l++)u.test(t[l])||e.push(l);return[e,null,null]}}else if(0==c.length)return[null,null,null];if(r>0){let e=M(n);if(e.length>1){let l=e.slice().sort(((e,t)=>t.length-e.length));for(let e=0;l.length>e;e++){if(0==s?.length)return[[],null,null];s=F(t,l[e],s)}if(e.length>r)return[s,null,null];a=h(e).map((e=>e.join(" "))),g=[];let n=new Set;for(let e=0;a.length>e;e++)if(s.length>n.size){let l=s.filter((e=>!n.has(e))),r=F(t,a[e],l);for(let e=0;r.length>e;e++)n.add(r[e]);g.push(r)}else g.push([])}}null==a&&(a=[n],g=[s?.length>0?s:F(t,n)]);let o=null,p=null;if(f.length>0&&(g=g.map((e=>e.filter((e=>!u.test(t[e])))))),i>=g.reduce(((e,t)=>e+t.length),0)){o={},p=[];for(let l=0;g.length>l;l++){let n=g[l];if(null==n||0==n.length)continue;let r=a[l],i=U(n,t,r),s=e.sort(i,t,r);if(l>0)for(let e=0;s.length>e;e++)s[e]+=p.length;for(let e in i)o[e]=(o[e]??[]).concat(i[e]);p=p.concat(s)}}return[[].concat(...g),o,p]})(...t),split:M,filter:F,info:U,sort:e.sort}}const f=(()=>{let e={A:"ÁÀÃÂÄĄ",a:"áàãâäą",E:"ÉÈÊËĖ",e:"éèêëę",I:"ÍÌÎÏĮ",i:"íìîïį",O:"ÓÒÔÕÖ",o:"óòôõö",U:"ÚÙÛÜŪŲ",u:"úùûüūų",C:"ÇČĆ",c:"çčć",L:"Ł",l:"ł",N:"ÑŃ",n:"ñń",S:"ŠŚ",s:"šś",Z:"ŻŹ",z:"żź"},t=new Map,l="";for(let n in e)e[n].split("").forEach((e=>{l+=e,t.set(e,n)}));let n=RegExp(`[${l}]`,"g"),r=e=>t.get(e);return e=>{if("string"==typeof e)return e.replace(n,r);let t=Array(e.length);for(let l=0;e.length>l;l++)t[l]=e[l].replace(n,r);return t}})();function h(e){let t,l,n=(e=e.slice()).length,r=[e.slice()],i=Array(n).fill(0),s=1;for(;n>s;)s>i[s]?(t=s%2&&i[s],l=e[s],e[s]=e[t],e[t]=l,++i[s],s=1,r.push(e.slice())):(i[s]=0,++s);return r}const u=(e,t)=>t?`<mark>${e}</mark>`:e,c=(e,t)=>e+t;return g.latinize=f,g.permute=e=>h([...Array(e.length).keys()]).sort(((e,t)=>{for(let l=0;e.length>l;l++)if(e[l]!=t[l])return e[l]-t[l];return 0})).map((t=>t.map((t=>e[t])))),g.highlight=function(e,t,l=u,n="",r=c){n=r(n,l(e.substring(0,t[0]),!1))??n;for(let i=0;t.length>i;i+=2)n=r(n,l(e.substring(t[i],t[i+1]),!0))??n,t.length-3>i&&(n=r(n,l(e.substring(t[i+1],t[i+2]),!1))??n);return r(n,l(e.substring(t[t.length-1]),!1))??n},g}();
+/*! https://github.com/leeoniya/uFuzzy (v1.0.15) */
+var uFuzzy=function(){"use strict";const e=new Intl.Collator("en",{numeric:!0,sensitivity:"base"}).compare,t=1/0,l=e=>e.replace(/[.*+?^${}()|[\]\\]/g,"\\$&"),n="eexxaacctt",r=/\p{P}/gu,i=(e,t,l)=>e.replace("A-Z",t).replace("a-z",l),s={unicode:!1,alpha:null,interSplit:"[^A-Za-z\\d']+",intraSplit:"[a-z][A-Z]",interBound:"[^A-Za-z\\d]",intraBound:"[A-Za-z]\\d|\\d[A-Za-z]|[a-z][A-Z]",interLft:0,interRgt:0,interChars:".",interIns:t,intraChars:"[a-z\\d']",intraIns:null,intraContr:"'[a-z]{1,2}\\b",intraMode:0,intraSlice:[1,t],intraSub:null,intraTrn:null,intraDel:null,intraFilt:()=>!0,sort:(t,l)=>{let{idx:n,chars:r,terms:i,interLft2:s,interLft1:a,start:g,intraIns:c,interIns:u,cases:f}=t;return n.map(((e,t)=>t)).sort(((t,h)=>r[h]-r[t]||c[t]-c[h]||i[h]+s[h]+.5*a[h]-(i[t]+s[t]+.5*a[t])||u[t]-u[h]||g[t]-g[h]||f[h]-f[t]||e(l[n[t]],l[n[h]])))}},a=(e,l)=>0==l?"":1==l?e+"??":l==t?e+"*?":e+`{0,${l}}?`,g="(?:\\b|_)";function c(e){e=Object.assign({},s,e);let{unicode:t,interLft:c,interRgt:u,intraMode:h,intraSlice:o,intraIns:p,intraSub:d,intraTrn:m,intraDel:x,intraContr:b,intraSplit:R,interSplit:A,intraBound:L,interBound:S,intraChars:z}=e;p??=h,d??=h,m??=h,x??=h;let E=e.letters??e.alpha;if(null!=E){let e=E.toLocaleUpperCase(),t=E.toLocaleLowerCase();A=i(A,e,t),R=i(R,e,t),S=i(S,e,t),L=i(L,e,t),z=i(z,e,t),b=i(b,e,t)}let I=t?"u":"";const y='".+?"',C=RegExp(y,"gi"+I),k=RegExp(`(?:\\s+|^)-(?:${z}+|${y})`,"gi"+I);let{intraRules:j}=e;null==j&&(j=e=>{let t=s.intraSlice,l=0,n=0,r=0,i=0;if(/[^\d]/.test(e)){let s=e.length;s>4?(t=o,l=p,n=d,r=m,i=x):3>s||(r=Math.min(m,1),4==s&&(l=Math.min(p,1)))}return{intraSlice:t,intraIns:l,intraSub:n,intraTrn:r,intraDel:i}});let Z=!!R,$=RegExp(R,"g"+I),w=RegExp(A,"g"+I),M=RegExp("^"+A+"|"+A+"$","g"+I),B=RegExp(b,"gi"+I);const D=(e,t=!1)=>{let l=[];e=(e=e.replace(C,(e=>(l.push(e),n)))).replace(M,""),t||(e=e.toLocaleLowerCase()),Z&&(e=e.replace($,(e=>e[0]+" "+e[1])));let r=0;return e.split(w).filter((e=>""!=e)).map((e=>e===n?l[r++]:e))},T=/[^\d]+|\d+/g,F=(t,n=0,r=!1)=>{let i=D(t);if(0==i.length)return[];let s,f=Array(i.length).fill("");if(i=i.map(((e,t)=>e.replace(B,(e=>(f[t]=e,""))))),1==h)s=i.map(((e,t)=>{if('"'===e[0])return l(e.slice(1,-1));let n="";for(let l of e.matchAll(T)){let e=l[0],{intraSlice:r,intraIns:i,intraSub:s,intraTrn:g,intraDel:c}=j(e);if(i+s+g+c==0)n+=e+f[t];else{let[l,u]=r,h=e.slice(0,l),o=e.slice(u),p=e.slice(l,u);1==i&&1==h.length&&h!=p[0]&&(h+="(?!"+h+")");let d=p.length,m=[e];if(s)for(let e=0;d>e;e++)m.push(h+p.slice(0,e)+z+p.slice(e+1)+o);if(g)for(let e=0;d-1>e;e++)p[e]!=p[e+1]&&m.push(h+p.slice(0,e)+p[e+1]+p[e]+p.slice(e+2)+o);if(c)for(let e=0;d>e;e++)m.push(h+p.slice(0,e+1)+"?"+p.slice(e+1)+o);if(i){let e=a(z,1);for(let t=0;d>t;t++)m.push(h+p.slice(0,t)+e+p.slice(t)+o)}n+="(?:"+m.join("|")+")"+f[t]}}return n}));else{let e=a(z,p);2==n&&p>0&&(e=")("+e+")("),s=i.map(((t,n)=>'"'===t[0]?l(t.slice(1,-1)):t.split("").map(((e,t,l)=>(1==p&&0==t&&l.length>1&&e!=l[t+1]&&(e+="(?!"+e+")"),e))).join(e)+f[n]))}let o=2==c?g:"",d=2==u?g:"",m=d+a(e.interChars,e.interIns)+o;return n>0?r?s=o+"("+s.join(")"+d+"|"+o+"(")+")"+d:(s="("+s.join(")("+m+")(")+")",s="(.??"+o+")"+s+"("+d+".*)"):(s=s.join(m),s=o+s+d),[RegExp(s,"i"+I),i,f]},O=(e,t,l)=>{let[n]=F(t);if(null==n)return null;let r=[];if(null!=l)for(let t=0;l.length>t;t++){let i=l[t];n.test(e[i])&&r.push(i)}else for(let t=0;e.length>t;t++)n.test(e[t])&&r.push(t);return r};let v=!!L,U=RegExp(S,I),N=RegExp(L,I);const P=(t,l,n)=>{let[r,i,s]=F(n,1),a=D(n,!0),[g]=F(n,2),f=i.length,h=Array(f),o=Array(f);for(let e=0;f>e;e++){let t=i[e],l=a[e],n='"'==t[0]?t.slice(1,-1):t+s[e],r='"'==l[0]?l.slice(1,-1):l+s[e];h[e]=n,o[e]=r}let p=t.length,d=Array(p).fill(0),m={idx:Array(p),start:d.slice(),chars:d.slice(),case:d.slice(),terms:d.slice(),interIns:d.slice(),intraIns:d.slice(),interLft2:d.slice(),interRgt2:d.slice(),interLft1:d.slice(),interRgt1:d.slice(),ranges:Array(p)},x=1==c||1==u,b=0;for(let n=0;t.length>n;n++){let i=l[t[n]],s=i.match(r),a=s.index+s[1].length,p=a,d=!1,R=0,A=0,L=0,S=0,z=0,E=0,y=0,C=0,k=0,j=[];for(let t=0,l=2;f>t;t++,l+=2){let n=s[l].toLocaleLowerCase(),r=h[t],g=r.length,m=n.length,b=n==r;if(s[l]==o[t]&&y++,!b&&s[l+1].length>=g){let e=s[l+1].toLocaleLowerCase().indexOf(r);e>-1&&(j.push(p,m,e,g),p+=_(s,l,e,g),n=r,m=g,b=!0,0==t&&(a=p))}if(x||b){let e=p-1,f=p+m,h=!1,o=!1;if(-1==e||U.test(i[e]))b&&R++,h=!0;else{if(2==c){d=!0;break}if(v&&N.test(i[e]+i[e+1]))b&&A++,h=!0;else if(1==c){let e=s[l+1],c=p+m;if(e.length>=g){let u,f=0,o=!1,d=RegExp(r,"ig"+I);for(;u=d.exec(e);){f=u.index;let e=c+f,t=e-1;if(-1==t||U.test(i[t])){R++,o=!0;break}if(N.test(i[t]+i[e])){A++,o=!0;break}}o&&(h=!0,j.push(p,m,f,g),p+=_(s,l,f,g),n=r,m=g,b=!0,0==t&&(a=p))}if(!h){d=!0;break}}}if(f==i.length||U.test(i[f]))b&&L++,o=!0;else{if(2==u){d=!0;break}if(v&&N.test(i[f-1]+i[f]))b&&S++,o=!0;else if(1==u){d=!0;break}}b&&(z+=g,h&&o&&E++)}if(m>g&&(k+=m-g),t>0&&(C+=s[l-1].length),!e.intraFilt(r,n,p)){d=!0;break}f-1>t&&(p+=m+s[l+1].length)}if(!d){m.idx[b]=t[n],m.interLft2[b]=R,m.interLft1[b]=A,m.interRgt2[b]=L,m.interRgt1[b]=S,m.chars[b]=z,m.terms[b]=E,m.cases[b]=y,m.interIns[b]=C,m.intraIns[b]=k,m.start[b]=a;let e=i.match(g),l=e.index+e[1].length,r=j.length,s=r>0?0:1/0,c=r-4;for(let t=2;e.length>t;)if(s>c||j[s]!=l)l+=e[t].length,t++;else{let n=j[s+1],r=j[s+2],i=j[s+3],a=t,g="";for(let t=0;n>t;a++)g+=e[a],t+=e[a].length;e.splice(t,a-t,g),l+=_(e,t,r,i),s+=4}l=e.index+e[1].length;let u=m.ranges[b]=[],f=l,h=l;for(let t=2;e.length>t;t++){let n=e[t].length;l+=n,t%2==0?h=l:n>0&&(u.push(f,h),f=h=l)}h>f&&u.push(f,h),b++}}if(t.length>b)for(let e in m)m[e]=m[e].slice(0,b);return m},_=(e,t,l,n)=>{let r=e[t]+e[t+1].slice(0,l);return e[t-1]+=r,e[t]=e[t+1].slice(l,l+n),e[t+1]=e[t+1].slice(l+n),r.length};return{search:(...t)=>((t,n,i,s=1e3,a)=>{i=i?!0===i?5:i:0;let g=null,c=null,u=[];n=n.replace(k,(e=>{let t=e.trim().slice(1);return t='"'===t[0]?l(t.slice(1,-1)):t.replace(r,""),""!=t&&u.push(t),""}));let h,o=D(n);if(u.length>0){if(h=RegExp(u.join("|"),"i"+I),0==o.length){let e=[];for(let l=0;t.length>l;l++)h.test(t[l])||e.push(l);return[e,null,null]}}else if(0==o.length)return[null,null,null];if(i>0){let e=D(n);if(e.length>1){let l=e.slice().sort(((e,t)=>t.length-e.length));for(let e=0;l.length>e;e++){if(0==a?.length)return[[],null,null];a=O(t,l[e],a)}if(e.length>i)return[a,null,null];g=f(e).map((e=>e.join(" "))),c=[];let n=new Set;for(let e=0;g.length>e;e++)if(a.length>n.size){let l=a.filter((e=>!n.has(e))),r=O(t,g[e],l);for(let e=0;r.length>e;e++)n.add(r[e]);c.push(r)}else c.push([])}}null==g&&(g=[n],c=[a?.length>0?a:O(t,n)]);let p=null,d=null;if(u.length>0&&(c=c.map((e=>e.filter((e=>!h.test(t[e])))))),s>=c.reduce(((e,t)=>e+t.length),0)){p={},d=[];for(let l=0;c.length>l;l++){let n=c[l];if(null==n||0==n.length)continue;let r=g[l],i=P(n,t,r),s=e.sort(i,t,r);if(l>0)for(let e=0;s.length>e;e++)s[e]+=d.length;for(let e in i)p[e]=(p[e]??[]).concat(i[e]);d=d.concat(s)}}return[[].concat(...c),p,d]})(...t),split:D,filter:O,info:P,sort:e.sort}}const u=(()=>{let e={A:"ÁÀÃÂÄĄ",a:"áàãâäą",E:"ÉÈÊËĖ",e:"éèêëę",I:"ÍÌÎÏĮ",i:"íìîïį",O:"ÓÒÔÕÖ",o:"óòôõö",U:"ÚÙÛÜŪŲ",u:"úùûüūų",C:"ÇČĆ",c:"çčć",L:"Ł",l:"ł",N:"ÑŃ",n:"ñń",S:"ŠŚ",s:"šś",Z:"ŻŹ",z:"żź"},t=new Map,l="";for(let n in e)e[n].split("").forEach((e=>{l+=e,t.set(e,n)}));let n=RegExp(`[${l}]`,"g"),r=e=>t.get(e);return e=>{if("string"==typeof e)return e.replace(n,r);let t=Array(e.length);for(let l=0;e.length>l;l++)t[l]=e[l].replace(n,r);return t}})();function f(e){let t,l,n=(e=e.slice()).length,r=[e.slice()],i=Array(n).fill(0),s=1;for(;n>s;)s>i[s]?(t=s%2&&i[s],l=e[s],e[s]=e[t],e[t]=l,++i[s],s=1,r.push(e.slice())):(i[s]=0,++s);return r}const h=(e,t)=>t?`<mark>${e}</mark>`:e,o=(e,t)=>e+t;return c.latinize=u,c.permute=e=>f([...Array(e.length).keys()]).sort(((e,t)=>{for(let l=0;e.length>l;l++)if(e[l]!=t[l])return e[l]-t[l];return 0})).map((t=>t.map((t=>e[t])))),c.highlight=function(e,t,l=h,n="",r=o){n=r(n,l(e.substring(0,t[0]),!1))??n;for(let i=0;t.length>i;i+=2)n=r(n,l(e.substring(t[i],t[i+1]),!0))??n,t.length-3>i&&(n=r(n,l(e.substring(t[i+1],t[i+2]),!1))??n);return r(n,l(e.substring(t[t.length-1]),!1))??n},c}();

package.json

 {
   "name": "@leeoniya/ufuzzy",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "description": "A tiny, efficient fuzzy matcher that doesn't suck",
@@ -8,4 +8,5 @@ "main": "./dist/uFuzzy.cjs.js",
   "types": "./dist/uFuzzy.d.ts",
+  "type": "module",
   "scripts": {
-    "build": "rollup -c --bundleConfigAsCjs",
+    "build": "rollup -c",
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -43,4 +44,4 @@ },
     "@rollup/plugin-terser": "^0.4.4",
-    "rollup": "^4.9.1"
+    "rollup": "^4.27.3"
   }
 }

README.md

@@ -457,2 +457,5 @@ ## ▒ μFuzzy
 
+**UPDATE (2024):** The critique below regarding bizzare matches is only true for the *default* config of Fuse.js.
+Counterintuitively, [setting `ignoreFieldNorm: true`](https://github.com/krisk/Fuse/issues/753#issuecomment-1871416557) improved the results considerably, but ordering of the high quality matches remains ungreat.
+
 Let's take a look at some matches produced by the most popular fuzzy search library, [Fuse.js](https://github.com/krisk/Fuse) and some others for which match highlighting is implemented in the demo.
@@ -459,0 +462,0 @@

No alert changes

Improved metrics

Total package byte prevSize

132781

increased by2.95%

Lines of code

2618

increased by3.4%

Number of lines in readme file

958

increased by0.31%

Is type module

Yes

No dependency changes