cry-search 2.0.2 → 2.1.0

package/dist/index.cjs

@@ -39,69 +39,73 @@ var __export = (target, all) => {
 // src/index.ts
 var exports_src = {};
 __export(exports_src, {
-  upsertPrimaryItem: () => upsertPrimaryItemNumeric,
-  upsertLinkedItem: () => upsertLinkedItemNumeric,
-  updateSearchMetadataBatch: () => updateSearchMetadataBatchNumeric,
-  updateSearchMetadata: () => updateSearchMetadataNumeric,
-  tokens: () => tokens,
-  tokenize: () => tokenize,
-  syncSearchArrayMetadataWithPrevious: () => syncSearchArrayMetadataNumericWithPrevious,
-  syncSearchArrayMetadata: () => syncSearchArrayMetadataNumeric,
-  syncLinkedItemsForPrimary: () => syncLinkedItemsForPrimaryNumeric,
-  searchableDataToArray: () => searchableDataToArray,
-  searchInDataWithLimit: () => searchInDataReturnIdsWithLimitNumeric,
-  searchInDataReturnObjects: () => searchInDataReturnObjectsNumeric,
-  searchInDataReturnIds: () => searchInDataReturnIdsNumeric,
-  searchInData: () => searchInDataReturnIdsNumeric,
-  searchAndRankNumeric: () => searchAndRankNumeric,
-  searchAndRank: () => searchAndRankNumeric,
-  scoreOrderAndPresence: () => scoreOrderAndPresence,
-  scoreOne: () => scoreOne,
-  scoreBag: () => scoreBag,
-  sanitiseString: () => sanitiseString,
-  resolvePhoneQueryNormalizer: () => resolvePhoneQueryNormalizer,
-  resetTokenRegistry: () => resetTokenRegistry,
-  removePrimaryItem: () => removePrimaryItemNumeric,
-  removeLinkedItem: () => removeLinkedItemNumeric,
-  removeFromSearchMetadataBatch: () => removeFromSearchMetadataBatchNumeric,
-  removeFromSearchMetadata: () => removeFromSearchMetadataNumeric,
-  registerToken: () => registerToken,
-  preprocessString: () => preprocessString,
-  prepareStringForSearch: () => prepareStringForSearch,
-  prepareQueryTokens: () => prepareQueryTokens,
-  prepareObjectForSearch: () => prepareObjectForSearchNumeric,
-  orderedTokenize: () => orderedTokenize,
-  normalizeDates: () => normalizeDates,
-  matchTokenInSortedListNumeric: () => matchTokenInSortedListNumeric,
-  matchPreparedTokenInSortedList: () => matchPreparedTokenInSortedList,
-  isDeletedOrBlocked: () => isDeletedOrBlocked,
-  getTokenCount: () => getTokenCount,
-  getTokenById: () => getTokenById,
-  getOrCreateTokenId: () => getOrCreateTokenId,
-  findTokenId: () => findTokenId,
-  findInLinkedArraysSimpleNumeric: () => findInLinkedArraysSimpleNumeric,
-  findInLinkedArraysNumeric: () => findInLinkedArraysNumeric,
-  encodeTokenWithMode: () => encodeTokenWithMode,
-  defaultQueryPhoneNormalizer: () => defaultQueryPhoneNormalizer,
-  defaultPhoneNormalizer: () => defaultPhoneNormalizer,
-  decodeTokenId: () => decodeTokenId,
-  decodeMatchMode: () => decodeMatchMode,
-  createTokensMap: () => createTokensMap,
-  createSearchLinkedMetadata: () => createSearchLinkedMetadataNumeric,
-  createSearchArrayMetadata: () => createSearchArrayMetadataNumeric,
-  clearTokensMap: () => clearTokensMap,
-  binarySearchUint32: () => binarySearchUint32,
-  arrayToSearchableData: () => arrayToSearchableData,
-  allTokensMatchNumeric: () => allTokensMatchNumeric,
-  allPreparedTokensMatch: () => allPreparedTokensMatch,
-  TOKEN_ID_MASK: () => TOKEN_ID_MASK,
-  SearchUniverse: () => SearchUniverse,
-  PREFIX_TO_MATCH_MODE: () => PREFIX_TO_MATCH_MODE,
-  MATCH_MODE_PREFIXES: () => MATCH_MODE_PREFIXES,
-  MATCH_MODE_BITS: () => MATCH_MODE_BITS,
-  DEFAULT_SEARCH_OPTS: () => DEFAULT_SEARCH_OPTS,
+  AugmentedMetadata: () => AugmentedMetadata,
   DEFAULT_PHONE_FIELDS: () => DEFAULT_PHONE_FIELDS,
-  AugmentedMetadata: () => AugmentedMetadata
+  DEFAULT_SEARCH_OPTS: () => DEFAULT_SEARCH_OPTS,
+  MATCH_MODE_BITS: () => MATCH_MODE_BITS,
+  MATCH_MODE_PREFIXES: () => MATCH_MODE_PREFIXES,
+  PREFIX_TO_MATCH_MODE: () => PREFIX_TO_MATCH_MODE,
+  SearchUniverse: () => SearchUniverse,
+  TOKEN_ID_MASK: () => TOKEN_ID_MASK,
+  allPreparedTokensMatch: () => allPreparedTokensMatch,
+  allTokensMatchNumeric: () => allTokensMatchNumeric,
+  arrayToSearchableData: () => arrayToSearchableData,
+  binarySearchUint32: () => binarySearchUint32,
+  clearTokensMap: () => clearTokensMap,
+  compareTokenized: () => compareTokenized,
+  createSearchArrayMetadata: () => createSearchArrayMetadataNumeric,
+  createSearchLinkedMetadata: () => createSearchLinkedMetadataNumeric,
+  createTokensMap: () => createTokensMap,
+  decodeMatchMode: () => decodeMatchMode,
+  decodeTokenId: () => decodeTokenId,
+  defaultPhoneNormalizer: () => defaultPhoneNormalizer,
+  defaultQueryPhoneNormalizer: () => defaultQueryPhoneNormalizer,
+  encodeTokenWithMode: () => encodeTokenWithMode,
+  findInLinkedArraysNumeric: () => findInLinkedArraysNumeric,
+  findInLinkedArraysSimpleNumeric: () => findInLinkedArraysSimpleNumeric,
+  findTokenId: () => findTokenId,
+  getOrCreateTokenId: () => getOrCreateTokenId,
+  getTokenById: () => getTokenById,
+  getTokenCount: () => getTokenCount,
+  isDeletedOrBlocked: () => isDeletedOrBlocked,
+  itemClasses: () => itemClasses,
+  matchMany: () => matchMany,
+  matchPreparedTokenInSortedList: () => matchPreparedTokenInSortedList,
+  matchTokenInSortedListNumeric: () => matchTokenInSortedListNumeric,
+  normalizeDates: () => normalizeDates,
+  normalizeQueryWithOpts: () => normalizeQueryWithOpts,
+  orderedTokenize: () => orderedTokenize,
+  prepareObjectForSearch: () => prepareObjectForSearchNumeric,
+  prepareQueryTokens: () => prepareQueryTokens,
+  prepareStringForSearch: () => prepareStringForSearch,
+  preprocessString: () => preprocessString,
+  registerToken: () => registerToken,
+  removeFromSearchMetadata: () => removeFromSearchMetadataNumeric,
+  removeFromSearchMetadataBatch: () => removeFromSearchMetadataBatchNumeric,
+  removeLinkedItem: () => removeLinkedItemNumeric,
+  removePrimaryItem: () => removePrimaryItemNumeric,
+  resetTokenRegistry: () => resetTokenRegistry,
+  resolvePhoneQueryNormalizer: () => resolvePhoneQueryNormalizer,
+  sanitiseString: () => sanitiseString,
+  scoreBag: () => scoreBag,
+  scoreOne: () => scoreOne,
+  scoreOrderAndPresence: () => scoreOrderAndPresence,
+  searchAndRank: () => searchAndRankNumeric,
+  searchAndRankNumeric: () => searchAndRankNumeric,
+  searchInData: () => searchInDataReturnIdsNumeric,
+  searchInDataReturnIds: () => searchInDataReturnIdsNumeric,
+  searchInDataReturnObjects: () => searchInDataReturnObjectsNumeric,
+  searchInDataWithLimit: () => searchInDataReturnIdsWithLimitNumeric,
+  searchableDataToArray: () => searchableDataToArray,
+  syncLinkedItemsForPrimary: () => syncLinkedItemsForPrimaryNumeric,
+  syncSearchArrayMetadata: () => syncSearchArrayMetadataNumeric,
+  syncSearchArrayMetadataWithPrevious: () => syncSearchArrayMetadataNumericWithPrevious,
+  tokenize: () => tokenize,
+  tokens: () => tokens,
+  updateSearchMetadata: () => updateSearchMetadataNumeric,
+  updateSearchMetadataBatch: () => updateSearchMetadataBatchNumeric,
+  upsertLinkedItem: () => upsertLinkedItemNumeric,
+  upsertPrimaryItem: () => upsertPrimaryItemNumeric
 });
 module.exports = __toCommonJS(exports_src);
 
@@ -319,6 +323,22 @@ function prepareStringForSearch(input) {
   const tokens = tokenize(sanitised, DEFAULT_TOKENIZE_CONFIG);
   return tokens.sort();
 }
+// src/utils/compareTokenized.ts
+function compareTokenized(a, b) {
+  const aTokens = new Set(prepareStringForSearch(a));
+  const bTokens = new Set(prepareStringForSearch(b));
+  if (aTokens.size === 0 && bTokens.size === 0)
+    return 1;
+  let intersection = 0;
+  for (const token of aTokens) {
+    if (bTokens.has(token))
+      intersection++;
+  }
+  const union = aTokens.size + bTokens.size - intersection;
+  if (union === 0)
+    return 0;
+  return intersection / union;
+}
 // src/utils/phoneNormalization.ts
 var RE_ASCII_DIGITS = /^[0-9]+$/;
 var RE_PHONE_LIKE_QUERY = /^[\d+()/\-. ]+$/;
@@ -517,6 +537,38 @@ function extractStringsFromValue(value, results) {
     }
   }
 }
+function applyValueNormalizers(value, field, normalizers) {
+  let text = value;
+  const classes = {};
+  if (!normalizers?.length)
+    return { text, classes };
+  for (const normalizer of normalizers) {
+    if (normalizer.fields && !normalizer.fields.includes(field))
+      continue;
+    const izhod = normalizer.fn(text, field);
+    if (izhod === undefined)
+      continue;
+    if (typeof izhod === "string") {
+      text = izhod;
+      continue;
+    }
+    text = izhod.text;
+    for (const [kljuc, vrednost] of Object.entries(izhod.classes ?? {})) {
+      const seznam = Array.isArray(vrednost) ? vrednost : [vrednost];
+      const obstojeci = classes[kljuc] ?? [];
+      for (const v of seznam) {
+        if (v != null && v !== "" && !obstojeci.includes(String(v)))
+          obstojeci.push(String(v));
+      }
+      classes[kljuc] = obstojeci;
+    }
+  }
+  return { text, classes };
+}
+function itemClasses(metadata, id) {
+  const zapis = metadata.classes?.get(id);
+  return zapis && Object.keys(zapis).length ? zapis : undefined;
+}
 function prepareObjectForSearchNumeric(obj, spec, tokensMap) {
   if (isDeletedOrBlocked(obj)) {
     return;
@@ -524,11 +576,12 @@ function prepareObjectForSearchNumeric(obj, spec, tokensMap) {
   if (spec?.enrichSearchObjectFn) {
     spec.enrichSearchObjectFn(obj, spec.searchContext);
   }
-  const sorted = spec?.extractSearchableStringFn ? buildSortedFromExtractFn(obj, spec.extractSearchableStringFn, tokensMap) : buildSortedFromFields(obj, spec, tokensMap);
+  const classes = {};
+  const sorted = spec?.extractSearchableStringFn ? buildSortedFromExtractFn(obj, spec.extractSearchableStringFn, tokensMap) : buildSortedFromFields(obj, spec, tokensMap, classes);
   if (sorted === undefined)
     return;
-  const firstN = spec?.keyFields && spec.keyFields.length > 0 ? buildFirstNFromKeyFields(obj, spec.keyFields, spec.firstTokensN ?? DEFAULT_FIRST_TOKENS_N, spec.phoneFields ?? DEFAULT_PHONE_FIELDS, tokensMap) : undefined;
-  return { sorted, firstN };
+  const firstN = spec?.keyFields && spec.keyFields.length > 0 ? buildFirstNFromKeyFields(obj, spec.keyFields, spec.firstTokensN ?? DEFAULT_FIRST_TOKENS_N, spec.phoneFields ?? DEFAULT_PHONE_FIELDS, tokensMap, spec.valueNormalizers) : undefined;
+  return Object.keys(classes).length ? { sorted, firstN, classes } : { sorted, firstN };
 }
 function buildSortedFromExtractFn(obj, extractFn, tokensMap) {
   const str = extractFn(obj);
@@ -536,7 +589,7 @@ function buildSortedFromExtractFn(obj, extractFn, tokensMap) {
     return;
   return prepareStringForSearchNumeric(str, tokensMap).sorted;
 }
-function buildSortedFromFields(obj, spec, tokensMap) {
+function buildSortedFromFields(obj, spec, tokensMap, classesOut = {}) {
   const allTokens = [];
   const fieldMatchModes = spec?.fieldMatchModes;
   const fieldsToSearch = spec?.searchInFields ?? Object.keys(obj);
@@ -569,7 +622,19 @@ function buildSortedFromFields(obj, spec, tokensMap) {
     }
     if (fieldStrings.length === 0)
       continue;
-    const fieldText = fieldStrings.join(" ");
+    const normalizirane = spec?.valueNormalizers?.length ? fieldStrings.map((s) => applyValueNormalizers(s, keyStr, spec.valueNormalizers)) : undefined;
+    const fieldText = normalizirane ? normalizirane.map((n) => n.text).join(" ") : fieldStrings.join(" ");
+    if (normalizirane) {
+      for (const n of normalizirane) {
+        for (const [kljuc, vrednosti] of Object.entries(n.classes)) {
+          const obstojeci = classesOut[kljuc] ?? [];
+          for (const v of vrednosti)
+            if (!obstojeci.includes(v))
+              obstojeci.push(v);
+          classesOut[kljuc] = obstojeci;
+        }
+      }
+    }
     const datesNormalized = normalizeDates(fieldText);
     const preprocessed = preprocessString(datesNormalized);
     const sanitised = sanitiseString(preprocessed);
@@ -587,7 +652,7 @@ function buildSortedFromFields(obj, spec, tokensMap) {
   const uniqueTokens = [...new Set(allTokens)].sort((a, b) => a - b);
   return new Uint32Array(uniqueTokens);
 }
-function buildFirstNFromKeyFields(obj, keyFields, n, phoneFields, tokensMap) {
+function buildFirstNFromKeyFields(obj, keyFields, n, phoneFields, tokensMap, normalizers) {
   const strings = [];
   const phoneFieldPaths = new Set(phoneFields);
   for (const field of keyFields) {
@@ -597,7 +662,9 @@ function buildFirstNFromKeyFields(obj, keyFields, n, phoneFields, tokensMap) {
     const value = isDotNotation(keyStr) ? getValueByPath(obj, keyStr) : obj[field];
     if (value == null)
       continue;
-    extractStringsFromValue(value, strings);
+    const zacasno = [];
+    extractStringsFromValue(value, zacasno);
+    strings.push(...normalizers?.length ? zacasno.map((s) => applyValueNormalizers(s, keyStr, normalizers).text) : zacasno);
   }
   if (strings.length === 0)
     return;
@@ -626,6 +693,9 @@ function createSearchArrayMetadataNumeric(data, spec) {
         if (result.firstN !== undefined) {
           metadata.unsorted.set(id, result.firstN);
         }
+        if (result.classes !== undefined) {
+          (metadata.classes ??= new Map).set(id, result.classes);
+        }
       }
     }
     return metadata;
@@ -661,6 +731,7 @@ function updateSearchMetadataNumeric(metadata, objectId, obj, spec, tokensMap) {
   if (result === undefined) {
     metadata.sorted.delete(objectId);
     metadata.unsorted.delete(objectId);
+    metadata.classes?.delete(objectId);
     return false;
   }
   metadata.sorted.set(objectId, result.sorted);
@@ -669,6 +740,11 @@ function updateSearchMetadataNumeric(metadata, objectId, obj, spec, tokensMap) {
   } else {
     metadata.unsorted.delete(objectId);
   }
+  if (result.classes !== undefined) {
+    (metadata.classes ??= new Map).set(objectId, result.classes);
+  } else {
+    metadata.classes?.delete(objectId);
+  }
   return true;
 }
 function updateSearchMetadataBatchNumeric(metadata, batch, spec) {
@@ -897,20 +973,49 @@ function allTokensMatchNumeric(searchTokenStrs, targetTokens, opts) {
 }
 
 // src/common/numeric/prepareQueryVariants.ts
+function normalizeQueryWithOpts(query, opts) {
+  const normalizers = opts?.queryNormalizers;
+  if (!normalizers?.length)
+    return { text: query, classes: {} };
+  let text = query;
+  const classes = {};
+  for (const normalizer of normalizers) {
+    const fn = typeof normalizer === "function" ? normalizer : normalizer.fn;
+    const izhod = fn(text, "");
+    if (izhod === undefined)
+      continue;
+    if (typeof izhod === "string") {
+      text = izhod;
+      continue;
+    }
+    text = izhod.text;
+    for (const [kljuc, vrednost] of Object.entries(izhod.classes ?? {})) {
+      const seznam = Array.isArray(vrednost) ? vrednost : [vrednost];
+      const obstojeci = classes[kljuc] ?? [];
+      for (const v of seznam) {
+        if (v != null && v !== "" && !obstojeci.includes(String(v)))
+          obstojeci.push(String(v));
+      }
+      classes[kljuc] = obstojeci;
+    }
+  }
+  return { text, classes };
+}
 function prepareQueryVariants(query, opts) {
-  const rawTokenStrs = prepareStringForSearch(query);
+  const { text: normalizirano, classes } = normalizeQueryWithOpts(query, opts);
+  const rawTokenStrs = prepareStringForSearch(normalizirano);
   const rawTokens = prepareQueryTokens(rawTokenStrs);
   const normalizers = opts?.phoneQueryNormalizers ?? [defaultQueryPhoneNormalizer];
   const seenPhones = new Set;
   const phoneTokens = [];
   for (const normalizer of normalizers) {
-    const normalized = validateNormalizedPhone(normalizer(query), "Phone query normalizer");
+    const normalized = validateNormalizedPhone(normalizer(normalizirano), "Phone query normalizer");
     if (normalized === undefined || seenPhones.has(normalized))
       continue;
     seenPhones.add(normalized);
     phoneTokens.push(prepareQueryTokens([normalized]));
   }
-  return { rawTokenStrs, rawTokens, phoneTokens };
+  return { rawTokenStrs, rawTokens, phoneTokens, classes };
 }
 
 // src/common/numeric/scoring.ts
@@ -1029,12 +1134,13 @@ function searchInDataReturnObjectsNumeric(query, metadata, data, opts) {
   return results;
 }
 function searchInDataReturnIdsWithLimitNumeric(query, metadata, limit, opts) {
-  const { rawTokenStrs, rawTokens, phoneTokens } = prepareQueryVariants(query, opts);
+  const { rawTokens, phoneTokens } = prepareQueryVariants(query, opts);
   const phoneCandidates = findMatchingCandidates(metadata, phoneTokens, opts);
   const candidates = phoneCandidates.length > 0 ? phoneCandidates : findMatchingCandidates(metadata, rawTokens.length > 0 ? [rawTokens] : [], opts);
   if (candidates.length === 0)
     return [];
-  const qTokens = orderedTokenize(query);
+  const qText = normalizeQueryWithOpts(query, opts).text;
+  const qTokens = orderedTokenize(qText);
   const hasUnsorted = metadata.unsorted.size > 0;
   if (!hasUnsorted) {
     if (limit === Infinity || limit >= candidates.length)
@@ -1053,7 +1159,7 @@ function searchInDataReturnIdsWithLimitNumeric(query, metadata, limit, opts) {
     for (let j = 0;j < unsortedIds.length; j++) {
       itemTokens[j] = tokens[unsortedIds[j]] ?? "";
     }
-    scored[i] = { id, score: scoreOne(query, qTokens, itemTokens), order: i };
+    scored[i] = { id, score: scoreOne(qText, qTokens, itemTokens), order: i };
   }
   scored.sort((a, b) => {
     if (a.score !== b.score)
@@ -1505,10 +1611,16 @@ function applyPreparedTokens(metadata, id, result) {
   } else {
     metadata.unsorted.delete(id);
   }
+  if (result.classes !== undefined) {
+    (metadata.classes ??= new Map).set(id, result.classes);
+  } else {
+    metadata.classes?.delete(id);
+  }
 }
 function deletePreparedTokens(metadata, id) {
   metadata.sorted.delete(id);
   metadata.unsorted.delete(id);
+  metadata.classes?.delete(id);
 }
 function syncSearchArrayMetadataNumeric(metadata, newData, spec) {
   const result = {
@@ -1598,6 +1710,135 @@ function syncSearchArrayMetadataNumericWithPrevious(metadata, previousData, newD
   clearTokensMap(tokensMap);
   return result;
 }
+// src/common/numeric/searchAndRank.ts
+function tokenIdsToStrings(tokenIds) {
+  if (tokenIds === undefined)
+    return;
+  const out = new Array(tokenIds.length);
+  for (let i = 0;i < tokenIds.length; i++) {
+    out[i] = tokens[tokenIds[i]] ?? "";
+  }
+  return out;
+}
+function searchAndRankNumeric(query, data, metadata, options) {
+  const { primaryTextFn, exactKeysFn, limit, opts } = options;
+  const ids = searchInDataReturnIdsNumeric(query, metadata, opts);
+  if (ids.length === 0)
+    return [];
+  const qText = normalizeQueryWithOpts(query, opts).text;
+  const qTokens = orderedTokenize(qText);
+  const scored = [];
+  for (const id of ids) {
+    const item = data.get(id);
+    if (!item)
+      continue;
+    const itemTokens = tokenIdsToStrings(metadata.unsorted.get(id)) ?? orderedTokenize(primaryTextFn(item) || "");
+    const exactKeys = exactKeysFn?.(item);
+    const score = scoreOne(qText, qTokens, itemTokens, exactKeys);
+    scored.push({ id, item, score });
+  }
+  scored.sort((x, y) => {
+    if (y.score !== x.score)
+      return y.score - x.score;
+    const xText = primaryTextFn(x.item) || "";
+    const yText = primaryTextFn(y.item) || "";
+    return xText.localeCompare(yText);
+  });
+  if (limit === undefined || limit === Infinity || limit >= scored.length)
+    return scored;
+  return scored.slice(0, limit);
+}
+
+// src/common/numeric/matchMany.ts
+function naSezname(classes) {
+  if (!classes)
+    return;
+  const out = {};
+  for (const [kljuc, vrednost] of Object.entries(classes)) {
+    const seznam = Array.isArray(vrednost) ? vrednost.map(String) : [String(vrednost)];
+    if (seznam.length)
+      out[kljuc] = seznam;
+  }
+  return Object.keys(out).length ? out : undefined;
+}
+async function* matchMany(prepared, queries, options) {
+  const { queryOf, idOf, limit = 3, minScore = 0, kos = 50, samoEnolicno, rank, accept, opts } = options;
+  const retrievalLimit = options.retrievalLimit ?? Math.max(20, limit * 4);
+  const primaryTextOf = options.primaryTextOf ?? ((item) => item["naziv"]);
+  const porabljeni = samoEnolicno ? new Set : undefined;
+  let kosZbirka = [];
+  for (let indeks = 0;indeks < queries.length; indeks++) {
+    const query = queries[indeks];
+    const vhod = queryOf(query);
+    const text = typeof vhod === "string" ? vhod : vhod.text;
+    const queryClasses = typeof vhod === "string" ? undefined : naSezname(vhod.classes);
+    const id = idOf ? idOf(query, indeks) : String(query["_id"] ?? query["id"] ?? indeks);
+    const poisciKandidate = (besedilo, razredi) => {
+      if (!besedilo.trim())
+        return { kandidati: [], zadetkov: 0 };
+      const zadetki = searchAndRankNumeric(besedilo, prepared.data, prepared.metadata, {
+        primaryTextFn: primaryTextOf,
+        ...options.exactKeysOf ? { exactKeysFn: options.exactKeysOf } : {},
+        ...opts ? { opts } : {},
+        limit: retrievalLimit
+      });
+      const poizvedbaZaDomeno = { text: besedilo, ...razredi ? { classes: razredi } : {} };
+      const najdeni = [];
+      for (const zadetek of zadetki) {
+        const classes = itemClasses(prepared.metadata, zadetek.id);
+        const kandidat = {
+          id: zadetek.id,
+          item: zadetek.item,
+          ...classes ? { classes } : {}
+        };
+        if (accept && !accept(kandidat, poizvedbaZaDomeno))
+          continue;
+        const ocena = rank ? rank(kandidat, poizvedbaZaDomeno) : zadetek.score;
+        if (ocena < minScore)
+          continue;
+        if (porabljeni?.has(zadetek.id))
+          continue;
+        najdeni.push({ id: zadetek.id, item: zadetek.item, score: ocena, ...classes ? { classes } : {} });
+      }
+      najdeni.sort((a, b) => {
+        if (b.score !== a.score)
+          return b.score - a.score;
+        return (primaryTextOf(a.item) ?? "").localeCompare(primaryTextOf(b.item) ?? "");
+      });
+      if (najdeni.length > limit)
+        najdeni.length = limit;
+      return { kandidati: najdeni, zadetkov: zadetki.length };
+    };
+    let { kandidati, zadetkov } = poisciKandidate(text, queryClasses);
+    const poskusiAlternative = kandidati.length === 0 && (options.alternativneLeCeNiZadetkov ? zadetkov === 0 : true);
+    if (poskusiAlternative && options.alternativnePoizvedbe) {
+      for (const alternativa of options.alternativnePoizvedbe(query)) {
+        const altBesedilo = typeof alternativa === "string" ? alternativa : alternativa.text;
+        if (!altBesedilo?.trim() || altBesedilo === text)
+          continue;
+        const altRazredi = typeof alternativa === "string" ? undefined : naSezname(alternativa.classes);
+        ({ kandidati } = poisciKandidate(altBesedilo, altRazredi));
+        if (kandidati.length)
+          break;
+      }
+    }
+    if (porabljeni) {
+      for (const kandidat of kandidati)
+        porabljeni.add(kandidat.id);
+    }
+    kosZbirka.push({
+      id,
+      ...queryClasses ? { queryClasses } : {},
+      kandidati
+    });
+    if (kosZbirka.length >= kos) {
+      yield kosZbirka;
+      kosZbirka = [];
+    }
+  }
+  if (kosZbirka.length)
+    yield kosZbirka;
+}
 // src/common/numeric/updateSearchLinkedMetadata.ts
 function tokensEqual2(a, b) {
   if (a.length !== b.length)
@@ -1750,43 +1991,6 @@ function syncLinkedItemsForPrimaryNumeric(linked, primaryId, newLinkedItems, for
   clearTokensMap(tokensMap);
   return result;
 }
-// src/common/numeric/searchAndRank.ts
-function tokenIdsToStrings(tokenIds) {
-  if (tokenIds === undefined)
-    return;
-  const out = new Array(tokenIds.length);
-  for (let i = 0;i < tokenIds.length; i++) {
-    out[i] = tokens[tokenIds[i]] ?? "";
-  }
-  return out;
-}
-function searchAndRankNumeric(query, data, metadata, options) {
-  const { primaryTextFn, exactKeysFn, limit, opts } = options;
-  const ids = searchInDataReturnIdsNumeric(query, metadata, opts);
-  if (ids.length === 0)
-    return [];
-  const qTokens = orderedTokenize(query);
-  const scored = [];
-  for (const id of ids) {
-    const item = data.get(id);
-    if (!item)
-      continue;
-    const itemTokens = tokenIdsToStrings(metadata.unsorted.get(id)) ?? orderedTokenize(primaryTextFn(item) || "");
-    const exactKeys = exactKeysFn?.(item);
-    const score = scoreOne(query, qTokens, itemTokens, exactKeys);
-    scored.push({ id, item, score });
-  }
-  scored.sort((x, y) => {
-    if (y.score !== x.score)
-      return y.score - x.score;
-    const xText = primaryTextFn(x.item) || "";
-    const yText = primaryTextFn(y.item) || "";
-    return xText.localeCompare(yText);
-  });
-  if (limit === undefined || limit === Infinity || limit >= scored.length)
-    return scored;
-  return scored.slice(0, limit);
-}
 // src/common/SearchUniverse.ts
 function tokensEqual3(a, b) {
   if (a.length !== b.length)

package/dist/index.d.cts

@@ -11,15 +11,20 @@ export { preprocessString } from './utils/preprocessString';
 export { sanitiseString } from './utils/sanitiseString';
 export { tokenize } from './utils/tokenize';
 export { normalizeDates } from './utils/normalizeDates';
+export { compareTokenized } from './utils/compareTokenized';
 export { defaultPhoneNormalizer, defaultQueryPhoneNormalizer, resolvePhoneQueryNormalizer, } from './utils/phoneNormalization';
 export { tokens, getTokenCount, getTokenById, findTokenId, registerToken, getOrCreateTokenId, createTokensMap, clearTokensMap, resetTokenRegistry, } from './utils/tokenRegistry';
-export { createSearchArrayMetadataNumeric as createSearchArrayMetadata, prepareObjectForSearchNumeric as prepareObjectForSearch, encodeTokenWithMode, decodeTokenId, decodeMatchMode, TOKEN_ID_MASK, MATCH_MODE_BITS, MATCH_MODE_PREFIXES, PREFIX_TO_MATCH_MODE, isDeletedOrBlocked, } from './common/numeric/createSearchArrayMetadata';
+export { createSearchArrayMetadataNumeric as createSearchArrayMetadata, prepareObjectForSearchNumeric as prepareObjectForSearch, encodeTokenWithMode, decodeTokenId, decodeMatchMode, TOKEN_ID_MASK, MATCH_MODE_BITS, MATCH_MODE_PREFIXES, PREFIX_TO_MATCH_MODE, isDeletedOrBlocked, 
+/** Domenski razredi elementa (`spec.valueNormalizers`). */
+itemClasses, } from './common/numeric/createSearchArrayMetadata';
 export { createSearchLinkedMetadataNumeric as createSearchLinkedMetadata, type NumericLinkedSearchMetadataWithData, } from './common/numeric/createSearchLinkedMetadata';
 export { updateSearchMetadataNumeric as updateSearchMetadata, updateSearchMetadataBatchNumeric as updateSearchMetadataBatch, removeFromSearchMetadataNumeric as removeFromSearchMetadata, removeFromSearchMetadataBatchNumeric as removeFromSearchMetadataBatch, } from './common/numeric/updateSearchMetadata';
 export { searchInDataReturnIdsNumeric as searchInData, searchInDataReturnIdsNumeric as searchInDataReturnIds, searchInDataReturnObjectsNumeric as searchInDataReturnObjects, searchInDataReturnIdsWithLimitNumeric as searchInDataWithLimit, } from './common/numeric/searchInData';
 export { findInLinkedArraysNumeric, findInLinkedArraysSimpleNumeric, } from './common/numeric/findInLinkedArrays';
 export { AugmentedMetadata } from './common/numeric/AugmentedMetadata';
 export { syncSearchArrayMetadataNumeric as syncSearchArrayMetadata, syncSearchArrayMetadataNumericWithPrevious as syncSearchArrayMetadataWithPrevious, } from './common/numeric/syncSearchArrayMetadata';
+export { normalizeQueryWithOpts } from './common/numeric/prepareQueryVariants';
+export { matchMany, type MatchManyKandidat, type MatchManyOptions, type MatchManyRezultat, type PreparedCollection, } from './common/numeric/matchMany';
 export { upsertPrimaryItemNumeric as upsertPrimaryItem, removePrimaryItemNumeric as removePrimaryItem, upsertLinkedItemNumeric as upsertLinkedItem, removeLinkedItemNumeric as removeLinkedItem, syncLinkedItemsForPrimaryNumeric as syncLinkedItemsForPrimary, } from './common/numeric/updateSearchLinkedMetadata';
 export { matchTokenInSortedListNumeric, allTokensMatchNumeric, binarySearchUint32, prepareQueryTokens, matchPreparedTokenInSortedList, allPreparedTokensMatch, type PreparedQueryToken, } from './utils/matchTokenNumeric';
 export { searchAndRankNumeric as searchAndRank, searchAndRankNumeric, scoreOne, scoreOrderAndPresence, scoreBag, orderedTokenize, type ScoredResult, type SearchAndRankOptions, type OrderAndPresenceWeights, } from './common/numeric/searchAndRank';

package/dist/index.d.ts

@@ -11,15 +11,20 @@ export { preprocessString } from './utils/preprocessString';
 export { sanitiseString } from './utils/sanitiseString';
 export { tokenize } from './utils/tokenize';
 export { normalizeDates } from './utils/normalizeDates';
+export { compareTokenized } from './utils/compareTokenized';
 export { defaultPhoneNormalizer, defaultQueryPhoneNormalizer, resolvePhoneQueryNormalizer, } from './utils/phoneNormalization';
 export { tokens, getTokenCount, getTokenById, findTokenId, registerToken, getOrCreateTokenId, createTokensMap, clearTokensMap, resetTokenRegistry, } from './utils/tokenRegistry';
-export { createSearchArrayMetadataNumeric as createSearchArrayMetadata, prepareObjectForSearchNumeric as prepareObjectForSearch, encodeTokenWithMode, decodeTokenId, decodeMatchMode, TOKEN_ID_MASK, MATCH_MODE_BITS, MATCH_MODE_PREFIXES, PREFIX_TO_MATCH_MODE, isDeletedOrBlocked, } from './common/numeric/createSearchArrayMetadata';
+export { createSearchArrayMetadataNumeric as createSearchArrayMetadata, prepareObjectForSearchNumeric as prepareObjectForSearch, encodeTokenWithMode, decodeTokenId, decodeMatchMode, TOKEN_ID_MASK, MATCH_MODE_BITS, MATCH_MODE_PREFIXES, PREFIX_TO_MATCH_MODE, isDeletedOrBlocked, 
+/** Domenski razredi elementa (`spec.valueNormalizers`). */
+itemClasses, } from './common/numeric/createSearchArrayMetadata';
 export { createSearchLinkedMetadataNumeric as createSearchLinkedMetadata, type NumericLinkedSearchMetadataWithData, } from './common/numeric/createSearchLinkedMetadata';
 export { updateSearchMetadataNumeric as updateSearchMetadata, updateSearchMetadataBatchNumeric as updateSearchMetadataBatch, removeFromSearchMetadataNumeric as removeFromSearchMetadata, removeFromSearchMetadataBatchNumeric as removeFromSearchMetadataBatch, } from './common/numeric/updateSearchMetadata';
 export { searchInDataReturnIdsNumeric as searchInData, searchInDataReturnIdsNumeric as searchInDataReturnIds, searchInDataReturnObjectsNumeric as searchInDataReturnObjects, searchInDataReturnIdsWithLimitNumeric as searchInDataWithLimit, } from './common/numeric/searchInData';
 export { findInLinkedArraysNumeric, findInLinkedArraysSimpleNumeric, } from './common/numeric/findInLinkedArrays';
 export { AugmentedMetadata } from './common/numeric/AugmentedMetadata';
 export { syncSearchArrayMetadataNumeric as syncSearchArrayMetadata, syncSearchArrayMetadataNumericWithPrevious as syncSearchArrayMetadataWithPrevious, } from './common/numeric/syncSearchArrayMetadata';
+export { normalizeQueryWithOpts } from './common/numeric/prepareQueryVariants';
+export { matchMany, type MatchManyKandidat, type MatchManyOptions, type MatchManyRezultat, type PreparedCollection, } from './common/numeric/matchMany';
 export { upsertPrimaryItemNumeric as upsertPrimaryItem, removePrimaryItemNumeric as removePrimaryItem, upsertLinkedItemNumeric as upsertLinkedItem, removeLinkedItemNumeric as removeLinkedItem, syncLinkedItemsForPrimaryNumeric as syncLinkedItemsForPrimary, } from './common/numeric/updateSearchLinkedMetadata';
 export { matchTokenInSortedListNumeric, allTokensMatchNumeric, binarySearchUint32, prepareQueryTokens, matchPreparedTokenInSortedList, allPreparedTokensMatch, type PreparedQueryToken, } from './utils/matchTokenNumeric';
 export { searchAndRankNumeric as searchAndRank, searchAndRankNumeric, scoreOne, scoreOrderAndPresence, scoreBag, orderedTokenize, type ScoredResult, type SearchAndRankOptions, type OrderAndPresenceWeights, } from './common/numeric/searchAndRank';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA;;;GAGG;AAKH,YAAY,EAEV,EAAE,EACF,WAAW,EACX,qBAAqB,EACrB,cAAc,EAEd,YAAY,EACZ,sBAAsB,EACtB,qBAAqB,EAErB,gBAAgB,EAChB,SAAS,EACT,eAAe,EACf,oBAAoB,EACpB,oBAAoB,EAEpB,UAAU,EAEV,2BAA2B,EAC3B,kBAAkB,EAClB,0BAA0B,EAE1B,oBAAoB,EAEpB,UAAU,EACV,WAAW,EACX,gBAAgB,EAChB,YAAY,EACZ,6BAA6B,EAE7B,mBAAmB,EACnB,gBAAgB,EAChB,YAAY,EACZ,iBAAiB,GAClB,MAAM,SAAS,CAAC;AAGjB,YAAY,EAAE,qBAAqB,IAAI,cAAc,EAAE,MAAM,SAAS,CAAC;AAGvE,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAGpE,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAKvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EACL,sBAAsB,EACtB,2BAA2B,EAC3B,2BAA2B,GAC5B,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EACL,MAAM,EACN,aAAa,EACb,YAAY,EACZ,WAAW,EACX,aAAa,EACb,kBAAkB,EAClB,eAAe,EACf,cAAc,EACd,kBAAkB,GACnB,MAAM,uBAAuB,CAAC;AAO/B,OAAO,EACL,gCAAgC,IAAI,yBAAyB,EAC7D,6BAA6B,IAAI,sBAAsB,EACvD,mBAAmB,EACnB,aAAa,EACb,eAAe,EACf,aAAa,EACb,eAAe,EACf,mBAAmB,EACnB,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,4CAA4C,CAAC;AAEpD,OAAO,EACL,iCAAiC,IAAI,0BAA0B,EAC/D,KAAK,mCAAmC,GACzC,MAAM,6CAA6C,CAAC;AAGrD,OAAO,EACL,2BAA2B,IAAI,oBAAoB,EACnD,gCAAgC,IAAI,yBAAyB,EAC7D,+BAA+B,IAAI,wBAAwB,EAC3D,oCAAoC,IAAI,6BAA6B,GACtE,MAAM,uCAAuC,CAAC;AAG/C,OAAO,EACL,4BAA4B,IAAI,YAAY,EAC5C,4BAA4B,IAAI,qBAAqB,EACrD,gCAAgC,IAAI,yBAAyB,EAC7D,qCAAqC,IAAI,qBAAqB,GAC/D,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EACL,yBAAyB,EACzB,+BAA+B,GAChC,MAAM,qCAAqC,CAAC;AAG7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAGvE,OAAO,EACL,8BAA8B,IAAI,uBAAuB,EACzD,0CAA0C,IAAI,mCAAmC,GAClF,MAAM,0CAA0C,CAAC;AAGlD,OAAO,EACL,wBAAwB,IAAI,iBAAiB,EAC7C,wBAAwB,IAAI,iBAAiB,EAC7C,uBAAuB,IAAI,gBAAgB,EAC3C,uBAAuB,IAAI,gBAAgB,EAC3C,gCAAgC,IAAI,yBAAyB,GAC9D,MAAM,6CAA6C,CAAC;AAGrD,OAAO,EACL,6BAA6B,EAC7B,qBAAqB,EACrB,kBAAkB,EAElB,kBAAkB,EAClB,8BAA8B,EAC9B,sBAAsB,EACtB,KAAK,kBAAkB,GACxB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EACL,oBAAoB,IAAI,aAAa,EACrC,oBAAoB,EACpB,QAAQ,EACR,qBAAqB,EACrB,QAAQ,EACR,eAAe,EACf,KAAK,YAAY,EACjB,KAAK,oBAAoB,EACzB,KAAK,uBAAuB,GAC7B,MAAM,gCAAgC,CAAC;AAKxC,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}