prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

treat unknown fields as text search

Browse source
This commit is contained in:
Hongbo Wu 2023-12-12 16:14:51 +08:00
parent a7c74cef6f
commit 55cc5f5769
1 changed files with 48 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
packages/api/src/services/library_item.ts
View file

@ -1,4 +1,4 @@
import { LiqeQuery } from '@omnivore/liqe'
import { ExpressionToken, LiqeQuery } from '@omnivore/liqe'
import { DateTime } from 'luxon'
import { DeepPartial, ObjectLiteral } from 'typeorm'
import { QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity'
@ -167,6 +167,34 @@ export const buildQuery = (
return query
}
const serializeImplicitField = (
expression: ExpressionToken
): string | null => {
if (expression.type !== 'LiteralExpression') {
throw new Error('Expected a literal expression.')
}
const value = expression.value?.toString()
if (value === undefined || value === '') {
return null
}
const param = `implicit_field_${parameters.length}`
const alias = `rank_${parameters.length}`
selects.push({
column: `ts_rank_cd(library_item.search_tsv, websearch_to_tsquery('english', :${param}))`,
alias,
})
orders.push({ by: alias, order: SortOrder.DESCENDING })
return escapeQueryWithParameters(
`websearch_to_tsquery('english', :${param}) @@ library_item.search_tsv`,
{ [param]: value }
)
}
const serializeTagExpression = (ast: LiqeQuery): string | null => {
if (ast.type !== 'Tag') {
throw new Error('Expected a tag expression.')
@ -175,29 +203,7 @@ export const buildQuery = (
const { field, expression } = ast
if (field.type === 'ImplicitField') {
if (expression.type !== 'LiteralExpression') {
throw new Error('Expected a literal expression.')
}
const value = expression.value?.toString()
if (value === undefined || value === '') {
return null
}
const param = `implicit_field_${parameters.length}`
const alias = `rank_${parameters.length}`
selects.push({
column: `ts_rank_cd(library_item.search_tsv, websearch_to_tsquery('english', :${param}))`,
alias,
})
orders.push({ by: alias, order: SortOrder.DESCENDING })
return escapeQueryWithParameters(
`websearch_to_tsquery('english', :${param}) @@ library_item.search_tsv`,
{ [param]: value }
)
return serializeImplicitField(expression)
} else {
switch (field.name) {
case 'in': {
@ -576,8 +582,24 @@ export const buildQuery = (
}
)
}
default:
throw new Error(`Unexpected keyword: ${field.name}`)
default: {
if (expression.type !== 'LiteralExpression') {
// ignore unknown fields without values
return null
}
const fieldValue = expression.value?.toString()
if (!fieldValue) {
// ignore empty values
return null
}
// treat all other unknown fields as implicit fields
return serializeImplicitField({
...expression,
value: `${field.name}:${fieldValue}`,
})
}
}
}
}