1
0
mirror of https://github.com/nextapps-de/flexsearch.git synced 2025-10-03 00:21:51 +02:00

document resolver, reduce code duplication, refactoring

This commit is contained in:
Thomas Wilkerling
2025-03-19 14:33:22 +01:00
parent 0455fa4b74
commit d9f235ce3b
107 changed files with 11949 additions and 10740 deletions

View File

@@ -1,13 +1,17 @@
import Index from "./index.js";
import default_resolver from "./resolve/default.js";
import { set_resolve } from "./index/search.js";
import { ResolverOptions } from "./type.js";
//import { set_resolve } from "./index/search.js";
import { apply_enrich } from "./document/search.js";
import { ResolverOptions, IntermediateSearchResults } from "./type.js";
import "./resolve/handler.js";
import "./resolve/or.js";
import "./resolve/and.js";
import "./resolve/xor.js";
import "./resolve/not.js";
/**
* @param {Array|ResolverOptions=} result
* @param {IntermediateSearchResults|ResolverOptions=} result
* @return {Resolver}
* @constructor
*/
@@ -15,23 +19,30 @@ export default function Resolver(result) {
if (!this || this.constructor !== Resolver) {
return new Resolver(result);
}
// if(result && result.constructor === Resolver){
// // todo test this branch
// //console.log("Resolver Loopback")
// return /** @type {Resolver} */ (result);
// }
if (result && result.index) {
result.resolve = /* suggest */ /* append: */ /* enrich */!1;
this.index = result.index;
// result = /** @type {ResolverOptions} */ (result);
result.resolve = /* suggest */ /* append: */ /* enrich */ /* resolve: */!1;
this.index = /** @type {Index} */result.index;
this.boostval = result.boost || 0;
this.result = result.index.search(result).result;
return this;
}
if (result.constructor === Resolver) {
// todo test this branch
//console.log("Resolver Loopback")
return result;
}
/** @type {Index|null} */
this.index = null;
this.result = result || [];
/** @type {IntermediateSearchResults} */
this.result = /** @type {IntermediateSearchResults} */result || [];
/** @type {number} */
this.boostval = 0;
}
/**
* @param {number} limit
*/
Resolver.prototype.limit = function (limit) {
if (this.result.length) {
const final = [];
@@ -51,6 +62,9 @@ Resolver.prototype.limit = function (limit) {
return this;
};
/**
* @param {number} offset
*/
Resolver.prototype.offset = function (offset) {
if (this.result.length) {
const final = [];
@@ -69,6 +83,9 @@ Resolver.prototype.offset = function (offset) {
return this;
};
/**
* @param {number} boost
*/
Resolver.prototype.boost = function (boost) {
this.boostval += boost;
return this;
@@ -79,10 +96,12 @@ Resolver.prototype.boost = function (boost) {
* @param {number=} offset
* @param {boolean=} enrich
*/
Resolver.prototype.resolve = function (limit, offset, enrich) {
set_resolve(1);
const result = this.result;
//set_resolve(1);
const result = this.result,
index = this.index;
this.index = null;
this.result = null;
@@ -92,7 +111,16 @@ Resolver.prototype.resolve = function (limit, offset, enrich) {
offset = limit.offset;
limit = limit.limit;
}
return default_resolver(result, limit || 100, offset, enrich);
// const document = this.index;
// if(document.index){
// result = default_resolver(result, limit || 100, offset, false);
// return enrich
// ? apply_enrich.call(document, result)
// : result;
// }
// else{
return default_resolver.call(index, result, limit || 100, offset, enrich);
// }
}
return result;