arocapi 5.0.0-beta.5 → 5.0.0-beta.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE.md +1 -1
- package/README.md +2 -2
- package/dist/app.d.ts +19 -13
- package/dist/app.js +13 -10
- package/dist/app.js.map +1 -1
- package/dist/routes/capabilities.d.ts +2 -2
- package/dist/routes/capabilities.js +2 -2
- package/dist/routes/capabilities.js.map +1 -1
- package/dist/routes/entities.js +8 -9
- package/dist/routes/entities.js.map +1 -1
- package/dist/routes/search.d.ts +2 -4
- package/dist/routes/search.js +75 -97
- package/dist/routes/search.js.map +1 -1
- package/dist/search/advanced.d.ts +8 -0
- package/dist/search/advanced.js +198 -0
- package/dist/search/advanced.js.map +1 -0
- package/dist/search/backend.d.ts +95 -0
- package/dist/search/backend.js +5 -0
- package/dist/search/backend.js.map +1 -0
- package/dist/search/fields.d.ts +63 -0
- package/dist/search/fields.js +203 -0
- package/dist/search/fields.js.map +1 -0
- package/dist/search/opensearch/advanced.d.ts +4 -0
- package/dist/search/opensearch/advanced.js +28 -0
- package/dist/search/opensearch/advanced.js.map +1 -0
- package/dist/search/opensearch/opensearch.d.ts +16 -0
- package/dist/search/opensearch/opensearch.js +187 -0
- package/dist/search/opensearch/opensearch.js.map +1 -0
- package/dist/search/opensearch/visibility.d.ts +3 -0
- package/dist/search/opensearch/visibility.js +27 -0
- package/dist/search/opensearch/visibility.js.map +1 -0
- package/dist/search/postgres/advanced.d.ts +7 -0
- package/dist/search/postgres/advanced.js +54 -0
- package/dist/search/postgres/advanced.js.map +1 -0
- package/dist/search/postgres/facets.d.ts +2 -0
- package/dist/search/postgres/facets.js +27 -0
- package/dist/search/postgres/facets.js.map +1 -0
- package/dist/search/postgres/geo.d.ts +6 -0
- package/dist/search/postgres/geo.js +42 -0
- package/dist/search/postgres/geo.js.map +1 -0
- package/dist/search/postgres/postgres.d.ts +19 -0
- package/dist/search/postgres/postgres.js +157 -0
- package/dist/search/postgres/postgres.js.map +1 -0
- package/dist/search/postgres/values.d.ts +8 -0
- package/dist/search/postgres/values.js +20 -0
- package/dist/search/postgres/values.js.map +1 -0
- package/dist/search/postgres/visibility.d.ts +4 -0
- package/dist/search/postgres/visibility.js +38 -0
- package/dist/search/postgres/visibility.js.map +1 -0
- package/dist/search/requestFilters.d.ts +39 -0
- package/dist/search/requestFilters.js +125 -0
- package/dist/search/requestFilters.js.map +1 -0
- package/dist/search/visibility.d.ts +51 -0
- package/dist/search/visibility.js +100 -0
- package/dist/search/visibility.js.map +1 -0
- package/dist/types/visibility.d.ts +3 -2
- package/dist/utils/visibility.js +1 -1
- package/dist/utils/visibility.js.map +1 -1
- package/package.json +46 -26
- package/prisma/models/entity.prisma +9 -8
- package/prisma/models/entitySearch.prisma +21 -0
- package/prisma/models/file.prisma +3 -3
- package/src/app.ts +53 -24
- package/src/routes/capabilities.ts +4 -4
- package/src/routes/entities.ts +10 -9
- package/src/routes/search.ts +104 -118
- package/src/search/advanced.ts +258 -0
- package/src/search/backend.ts +91 -0
- package/src/search/fields.ts +320 -0
- package/src/search/opensearch/advanced.ts +36 -0
- package/src/search/opensearch/opensearch.ts +290 -0
- package/src/search/opensearch/visibility.ts +38 -0
- package/src/search/postgres/advanced.ts +76 -0
- package/src/search/postgres/facets.ts +34 -0
- package/src/search/postgres/geo.ts +58 -0
- package/src/search/postgres/postgres.ts +232 -0
- package/src/search/postgres/values.ts +33 -0
- package/src/search/postgres/visibility.ts +54 -0
- package/src/search/requestFilters.ts +178 -0
- package/src/search/visibility.ts +193 -0
- package/src/types/visibility.ts +6 -3
- package/src/utils/visibility.ts +1 -1
- package/dist/app.test.d.ts +0 -1
- package/dist/app.test.js +0 -67
- package/dist/app.test.js.map +0 -1
- package/dist/errorHandling.test.d.ts +0 -1
- package/dist/errorHandling.test.js +0 -222
- package/dist/errorHandling.test.js.map +0 -1
- package/dist/index.dev.d.ts +0 -1
- package/dist/index.dev.js +0 -157
- package/dist/index.dev.js.map +0 -1
- package/dist/routes/capabilities.test.d.ts +0 -1
- package/dist/routes/capabilities.test.js +0 -81
- package/dist/routes/capabilities.test.js.map +0 -1
- package/dist/routes/crate.test.d.ts +0 -1
- package/dist/routes/crate.test.js +0 -390
- package/dist/routes/crate.test.js.map +0 -1
- package/dist/routes/entities.test.d.ts +0 -1
- package/dist/routes/entities.test.js +0 -277
- package/dist/routes/entities.test.js.map +0 -1
- package/dist/routes/entity.test.d.ts +0 -1
- package/dist/routes/entity.test.js +0 -136
- package/dist/routes/entity.test.js.map +0 -1
- package/dist/routes/file.test.d.ts +0 -1
- package/dist/routes/file.test.js +0 -435
- package/dist/routes/file.test.js.map +0 -1
- package/dist/routes/files.test.d.ts +0 -1
- package/dist/routes/files.test.js +0 -245
- package/dist/routes/files.test.js.map +0 -1
- package/dist/routes/search.test.d.ts +0 -1
- package/dist/routes/search.test.js +0 -833
- package/dist/routes/search.test.js.map +0 -1
- package/dist/test/helpers/fastify.d.ts +0 -9
- package/dist/test/helpers/fastify.js +0 -17
- package/dist/test/helpers/fastify.js.map +0 -1
- package/dist/test/integration.setup.d.ts +0 -47
- package/dist/test/integration.setup.js +0 -195
- package/dist/test/integration.setup.js.map +0 -1
- package/dist/test/integration.test.d.ts +0 -1
- package/dist/test/integration.test.js +0 -762
- package/dist/test/integration.test.js.map +0 -1
- package/dist/transformers/default.test.d.ts +0 -1
- package/dist/transformers/default.test.js +0 -225
- package/dist/transformers/default.test.js.map +0 -1
- package/dist/transformers/transformer.test.d.ts +0 -1
- package/dist/transformers/transformer.test.js +0 -165
- package/dist/transformers/transformer.test.js.map +0 -1
- package/dist/utils/errors.test.d.ts +0 -1
- package/dist/utils/errors.test.js +0 -79
- package/dist/utils/errors.test.js.map +0 -1
- package/dist/utils/queryBuilder.d.ts +0 -47
- package/dist/utils/queryBuilder.js +0 -107
- package/dist/utils/queryBuilder.js.map +0 -1
- package/prisma.config.ts +0 -9
- package/src/app.test.ts +0 -91
- package/src/errorHandling.test.ts +0 -288
- package/src/index.dev.ts +0 -202
- package/src/reset.d.ts +0 -1
- package/src/routes/__snapshots__/capabilities.test.ts.snap +0 -34
- package/src/routes/__snapshots__/entities.test.ts.snap +0 -96
- package/src/routes/__snapshots__/entity.test.ts.snap +0 -74
- package/src/routes/__snapshots__/search.test.ts.snap +0 -165
- package/src/routes/capabilities.test.ts +0 -102
- package/src/routes/crate.test.ts +0 -484
- package/src/routes/entities.test.ts +0 -324
- package/src/routes/entity.test.ts +0 -166
- package/src/routes/file.test.ts +0 -538
- package/src/routes/files.test.ts +0 -304
- package/src/routes/search.test.ts +0 -959
- package/src/test/__snapshots__/integration.test.ts.snap +0 -18
- package/src/test/helpers/fastify.ts +0 -26
- package/src/test/integration.setup.ts +0 -220
- package/src/test/integration.test.ts +0 -953
- package/src/transformers/default.test.ts +0 -276
- package/src/transformers/transformer.test.ts +0 -226
- package/src/utils/errors.test.ts +0 -90
- package/src/utils/queryBuilder.ts +0 -157
|
@@ -0,0 +1,187 @@
|
|
|
1
|
+
import { isDeepStrictEqual } from 'node:util';
|
|
2
|
+
import { GEOHASH_GRID_CELLS, SearchQueryError, } from '../backend.js';
|
|
3
|
+
import { capabilitiesFromFields, isBasic, resolveFields, storeDocuments, } from '../fields.js';
|
|
4
|
+
import { filtersCondition } from '../requestFilters.js';
|
|
5
|
+
import { checkSearchVisibility } from '../visibility.js';
|
|
6
|
+
import { advancedQueryFor } from './advanced.js';
|
|
7
|
+
import { visibilityQuery } from './visibility.js';
|
|
8
|
+
const EXACT_FORM = { exact: { type: 'keyword', ignore_above: 8191 } };
|
|
9
|
+
const mappingFor = (declaration) => {
|
|
10
|
+
const { type } = declaration;
|
|
11
|
+
switch (type) {
|
|
12
|
+
case 'text':
|
|
13
|
+
return { type, fields: EXACT_FORM };
|
|
14
|
+
case 'number':
|
|
15
|
+
return { type: 'double' };
|
|
16
|
+
case 'geo':
|
|
17
|
+
return { type: 'geo_point' };
|
|
18
|
+
default:
|
|
19
|
+
return { type };
|
|
20
|
+
}
|
|
21
|
+
};
|
|
22
|
+
const FACET_ORDER = [{ _count: 'desc' }, { _key: 'asc' }];
|
|
23
|
+
const GEOHASH_GRID = 'geohash-grid';
|
|
24
|
+
const geoBox = ({ topRight, bottomLeft }) => ({
|
|
25
|
+
top_left: { lat: topRight.lat, lon: bottomLeft.lng },
|
|
26
|
+
bottom_right: { lat: bottomLeft.lat, lon: topRight.lng },
|
|
27
|
+
});
|
|
28
|
+
export const OpenSearchBackend = ({ client, fields, indexName = 'entities', refresh = false, }) => {
|
|
29
|
+
const capabilities = capabilitiesFromFields(fields);
|
|
30
|
+
const { basic, facets, geoField } = resolveFields(fields);
|
|
31
|
+
const exactField = (name) => (fields[name]?.type === 'text' ? `${name}.exact` : name);
|
|
32
|
+
const basicFields = basic.map(({ name, weight }) => `${name}^${weight}`);
|
|
33
|
+
const highlight = {
|
|
34
|
+
fields: Object.fromEntries(Object.entries(fields)
|
|
35
|
+
.filter(([, declaration]) => ['text', 'keyword'].includes(declaration.type) && (isBasic(declaration) || declaration.advanced))
|
|
36
|
+
.map(([name]) => [name, {}])),
|
|
37
|
+
};
|
|
38
|
+
const queryFor = (request) => {
|
|
39
|
+
if (request.searchType === 'advanced') {
|
|
40
|
+
return advancedQueryFor(request.query, fields);
|
|
41
|
+
}
|
|
42
|
+
if (request.query.trim() === '') {
|
|
43
|
+
return { match_all: {} };
|
|
44
|
+
}
|
|
45
|
+
if (basicFields.length === 0) {
|
|
46
|
+
return { match_none: {} };
|
|
47
|
+
}
|
|
48
|
+
return {
|
|
49
|
+
multi_match: {
|
|
50
|
+
query: request.query,
|
|
51
|
+
fields: basicFields,
|
|
52
|
+
type: 'best_fields',
|
|
53
|
+
fuzziness: 'AUTO',
|
|
54
|
+
zero_terms_query: 'all',
|
|
55
|
+
},
|
|
56
|
+
};
|
|
57
|
+
};
|
|
58
|
+
const sortFor = ({ sort, order }) => [
|
|
59
|
+
sort === 'relevance' ? { _score: { order: 'desc' } } : { [exactField(sort)]: { order, missing: '_last' } },
|
|
60
|
+
{ id: { order: 'asc' } },
|
|
61
|
+
];
|
|
62
|
+
const aggregations = Object.fromEntries(facets.map(({ name, type, size }) => [
|
|
63
|
+
name,
|
|
64
|
+
type === 'date'
|
|
65
|
+
? {
|
|
66
|
+
date_histogram: {
|
|
67
|
+
field: name,
|
|
68
|
+
calendar_interval: 'year',
|
|
69
|
+
format: 'yyyy',
|
|
70
|
+
time_zone: 'UTC',
|
|
71
|
+
min_doc_count: 1,
|
|
72
|
+
order: { _key: 'asc' },
|
|
73
|
+
},
|
|
74
|
+
}
|
|
75
|
+
: {
|
|
76
|
+
terms: {
|
|
77
|
+
field: exactField(name),
|
|
78
|
+
size,
|
|
79
|
+
order: FACET_ORDER,
|
|
80
|
+
},
|
|
81
|
+
},
|
|
82
|
+
]));
|
|
83
|
+
const properties = {
|
|
84
|
+
id: { type: 'keyword' },
|
|
85
|
+
...Object.fromEntries(Object.entries(fields).map(([name, declaration]) => [name, mappingFor(declaration)])),
|
|
86
|
+
};
|
|
87
|
+
const bulk = async (operations, tolerated = []) => {
|
|
88
|
+
if (operations.length === 0) {
|
|
89
|
+
return;
|
|
90
|
+
}
|
|
91
|
+
const { body } = await client.bulk({ body: operations, refresh });
|
|
92
|
+
const failure = body.items
|
|
93
|
+
.map((item) => Object.values(item)[0])
|
|
94
|
+
.find(({ error, status }) => error && !tolerated.includes(status));
|
|
95
|
+
if (failure?.error) {
|
|
96
|
+
const { _id, error } = failure;
|
|
97
|
+
throw new Error(`Search document "${_id}" failed in index "${indexName}": ${error.type}: ${error.reason}`);
|
|
98
|
+
}
|
|
99
|
+
};
|
|
100
|
+
return {
|
|
101
|
+
capabilities,
|
|
102
|
+
search: async (request) => {
|
|
103
|
+
const { boundingBox, geohashPrecision } = request;
|
|
104
|
+
const filter = [
|
|
105
|
+
visibilityQuery(filtersCondition(request.filters), exactField),
|
|
106
|
+
...(geoField && boundingBox ? [{ geo_bounding_box: { [geoField]: geoBox(boundingBox) } }] : []),
|
|
107
|
+
visibilityQuery(checkSearchVisibility(fields, request.visibility), exactField),
|
|
108
|
+
];
|
|
109
|
+
const geohashGrid = geoField && geohashPrecision !== undefined
|
|
110
|
+
? {
|
|
111
|
+
[GEOHASH_GRID]: {
|
|
112
|
+
geohash_grid: { field: geoField, precision: geohashPrecision, size: GEOHASH_GRID_CELLS },
|
|
113
|
+
},
|
|
114
|
+
}
|
|
115
|
+
: {};
|
|
116
|
+
let response;
|
|
117
|
+
try {
|
|
118
|
+
response = await client.search({
|
|
119
|
+
index: indexName,
|
|
120
|
+
body: {
|
|
121
|
+
query: { bool: { must: [queryFor(request)], filter } },
|
|
122
|
+
aggs: { ...aggregations, ...geohashGrid },
|
|
123
|
+
highlight,
|
|
124
|
+
sort: sortFor(request),
|
|
125
|
+
from: request.offset,
|
|
126
|
+
size: request.limit,
|
|
127
|
+
track_total_hits: true,
|
|
128
|
+
_source: false,
|
|
129
|
+
},
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
catch (error) {
|
|
133
|
+
const { statusCode, message } = error;
|
|
134
|
+
if (statusCode === 400) {
|
|
135
|
+
throw new SearchQueryError(message);
|
|
136
|
+
}
|
|
137
|
+
throw error;
|
|
138
|
+
}
|
|
139
|
+
const { hits, aggregations: buckets = {} } = response.body;
|
|
140
|
+
return {
|
|
141
|
+
total: hits.total.value,
|
|
142
|
+
hits: hits.hits.map(({ _id, _score, highlight: highlighted }) => {
|
|
143
|
+
const searchExtra = {
|
|
144
|
+
...(typeof _score === 'number' && { score: _score }),
|
|
145
|
+
...(highlighted && Object.keys(highlighted).length > 0 && { highlight: highlighted }),
|
|
146
|
+
};
|
|
147
|
+
return { id: _id, ...(Object.keys(searchExtra).length > 0 && { searchExtra }) };
|
|
148
|
+
}),
|
|
149
|
+
facets: Object.fromEntries(facets.map(({ name }) => [
|
|
150
|
+
name,
|
|
151
|
+
buckets[name].buckets.map(({ key, key_as_string, doc_count }) => ({
|
|
152
|
+
name: key_as_string ?? String(key),
|
|
153
|
+
count: doc_count,
|
|
154
|
+
})),
|
|
155
|
+
])),
|
|
156
|
+
...(GEOHASH_GRID in buckets && {
|
|
157
|
+
geohashGrid: Object.fromEntries(buckets[GEOHASH_GRID].buckets.map(({ key, doc_count }) => [key, doc_count])),
|
|
158
|
+
}),
|
|
159
|
+
};
|
|
160
|
+
},
|
|
161
|
+
createIndex: async () => {
|
|
162
|
+
const { body: exists } = await client.indices.exists({ index: indexName });
|
|
163
|
+
if (!exists) {
|
|
164
|
+
await client.indices.create({ index: indexName, body: { mappings: { dynamic: 'strict', properties } } });
|
|
165
|
+
return;
|
|
166
|
+
}
|
|
167
|
+
const { body } = await client.indices.getMapping({ index: indexName });
|
|
168
|
+
const existing = (body[indexName].mappings.properties ?? {});
|
|
169
|
+
const differing = [...new Set([...Object.keys(properties), ...Object.keys(existing)])].find((name) => !isDeepStrictEqual(properties[name], existing[name]));
|
|
170
|
+
if (differing) {
|
|
171
|
+
throw new Error(`Index "${indexName}" exists with a different mapping for field "${differing}" than its declaration: ` +
|
|
172
|
+
`${JSON.stringify(existing[differing] ?? null)} instead of ${JSON.stringify(properties[differing] ?? null)}`);
|
|
173
|
+
}
|
|
174
|
+
},
|
|
175
|
+
index: async (docs) => {
|
|
176
|
+
const stored = storeDocuments(fields, docs);
|
|
177
|
+
await bulk(stored.flatMap(({ id, values, point }) => [
|
|
178
|
+
{ index: { _index: indexName, _id: id } },
|
|
179
|
+
{ id, ...values, ...(geoField && point && { [geoField]: { lat: point.lat, lon: point.lng } }) },
|
|
180
|
+
]));
|
|
181
|
+
},
|
|
182
|
+
remove: async (ids) => {
|
|
183
|
+
await bulk(ids.map((id) => ({ delete: { _index: indexName, _id: id } })), [404]);
|
|
184
|
+
},
|
|
185
|
+
};
|
|
186
|
+
};
|
|
187
|
+
//# sourceMappingURL=opensearch.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"opensearch.js","sourceRoot":"","sources":["../../../src/search/opensearch/opensearch.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import type { QueryContainer } from '@opensearch-project/opensearch/api/_types/_common.query_dsl.js';
|
|
2
|
+
import type { VisibilityCondition } from '../visibility.js';
|
|
3
|
+
export declare const visibilityQuery: (condition: VisibilityCondition, exactField: (name: string) => string) => QueryContainer;
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { toWire } from '../fields.js';
|
|
2
|
+
export const visibilityQuery = (condition, exactField) => {
|
|
3
|
+
const translate = (node) => {
|
|
4
|
+
switch (node.type) {
|
|
5
|
+
case 'and':
|
|
6
|
+
return { bool: { filter: node.clauses.map(translate) } };
|
|
7
|
+
case 'or':
|
|
8
|
+
return node.clauses.length === 0
|
|
9
|
+
? { match_none: {} }
|
|
10
|
+
: { bool: { should: node.clauses.map(translate), minimum_should_match: 1 } };
|
|
11
|
+
case 'not':
|
|
12
|
+
return { bool: { must_not: [translate(node.clause)] } };
|
|
13
|
+
case 'in':
|
|
14
|
+
return { terms: { [exactField(node.field)]: node.values.map(toWire) } };
|
|
15
|
+
case 'present':
|
|
16
|
+
return { exists: { field: node.field } };
|
|
17
|
+
case 'range':
|
|
18
|
+
return {
|
|
19
|
+
range: {
|
|
20
|
+
[node.field]: Object.fromEntries(Object.entries(node.bounds).map(([bound, value]) => [bound, toWire(value)])),
|
|
21
|
+
},
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
};
|
|
25
|
+
return translate(condition);
|
|
26
|
+
};
|
|
27
|
+
//# sourceMappingURL=visibility.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"visibility.js","sourceRoot":"","sources":["../../../src/search/opensearch/visibility.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAMtC,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,SAA8B,EAC9B,UAAoC,EACpB,EAAE;IAClB,MAAM,SAAS,GAAG,CAAC,IAAyB,EAAkB,EAAE;QAC9D,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,KAAK,KAAK;gBACR,OAAO,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC;YAC3D,KAAK,IAAI;gBACP,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;oBAC9B,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE;oBACpB,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,oBAAoB,EAAE,CAAC,EAAE,EAAE,CAAC;YACjF,KAAK,KAAK;gBACR,OAAO,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC;YAC1D,KAAK,IAAI;gBACP,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YAC1E,KAAK,SAAS;gBACZ,OAAO,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;YAC3C,KAAK,OAAO;gBACV,OAAO;oBACL,KAAK,EAAE;wBACL,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,WAAW,CAC9B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAC5E;qBACF;iBACF,CAAC;QACN,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,SAAS,CAAC,SAAS,CAAC,CAAC;AAC9B,CAAC,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { type Sql } from '@prisma/client/runtime/client';
|
|
2
|
+
import { type AdvancedQuery } from '../backend.js';
|
|
3
|
+
import type { FieldDeclarations } from '../fields.js';
|
|
4
|
+
export declare const advancedQueryFor: (query: AdvancedQuery, fields: FieldDeclarations) => {
|
|
5
|
+
condition: Sql;
|
|
6
|
+
rank: Sql;
|
|
7
|
+
};
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import { join, sqltag as sql } from '@prisma/client/runtime/client';
|
|
2
|
+
import { matchedDateSpan } from '../advanced.js';
|
|
3
|
+
import { SearchQueryError } from '../backend.js';
|
|
4
|
+
import { fieldValue, parameter, TEXT_SEARCH_CONFIG, valuesOf } from './values.js';
|
|
5
|
+
const LEXEME = "'((?:[^']|'')*)'";
|
|
6
|
+
const exactValue = (field, type, value) => {
|
|
7
|
+
if (type === 'boolean' && value !== 'true' && value !== 'false') {
|
|
8
|
+
throw new SearchQueryError(`"${field}" is a boolean field: "${value}" isn't true or false`);
|
|
9
|
+
}
|
|
10
|
+
return type === 'boolean' ? value === 'true' : value;
|
|
11
|
+
};
|
|
12
|
+
const exactCondition = (field, type, value) => {
|
|
13
|
+
if (type === 'date') {
|
|
14
|
+
const { first, last } = matchedDateSpan(field, value);
|
|
15
|
+
return sql `${fieldValue(type)} BETWEEN ${parameter(type, first)} AND ${parameter(type, last)}`;
|
|
16
|
+
}
|
|
17
|
+
return sql `${fieldValue(type)} = ${parameter(type, exactValue(field, type, value))}`;
|
|
18
|
+
};
|
|
19
|
+
export const advancedQueryFor = (query, fields) => {
|
|
20
|
+
const ranked = [];
|
|
21
|
+
const tsquery = (field, value, phrase) => {
|
|
22
|
+
const parsed = phrase
|
|
23
|
+
? sql `phraseto_tsquery(${TEXT_SEARCH_CONFIG}, ${value}::text)`
|
|
24
|
+
: sql `plainto_tsquery(${TEXT_SEARCH_CONFIG}, ${value}::text)`;
|
|
25
|
+
return sql `regexp_replace(${parsed}::text, ${LEXEME}::text, ${`'${field}.\\1'`}::text, 'g')::tsquery`;
|
|
26
|
+
};
|
|
27
|
+
const translate = (node, negated) => {
|
|
28
|
+
switch (node.type) {
|
|
29
|
+
case 'and':
|
|
30
|
+
case 'or':
|
|
31
|
+
return sql `(${join(node.clauses.map((clause) => translate(clause, negated)), node.type === 'and' ? ' AND ' : ' OR ')})`;
|
|
32
|
+
case 'not':
|
|
33
|
+
return sql `NOT ${translate(node.clause, !negated)}`;
|
|
34
|
+
case 'match': {
|
|
35
|
+
const { field, value, phrase } = node;
|
|
36
|
+
const { type } = fields[field];
|
|
37
|
+
if (type === 'text') {
|
|
38
|
+
const matching = tsquery(field, value, phrase);
|
|
39
|
+
if (!negated) {
|
|
40
|
+
ranked.push(matching);
|
|
41
|
+
}
|
|
42
|
+
return sql `search.text @@ ${matching}`;
|
|
43
|
+
}
|
|
44
|
+
return sql `EXISTS (SELECT FROM ${valuesOf(field)} WHERE ${exactCondition(field, type, value)})`;
|
|
45
|
+
}
|
|
46
|
+
default:
|
|
47
|
+
return sql `TRUE`;
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
const condition = translate(query, false);
|
|
51
|
+
const rank = ranked.length > 0 ? sql `ts_rank(search.text, ${join(ranked, ' || ')})` : sql `0`;
|
|
52
|
+
return { condition, rank };
|
|
53
|
+
};
|
|
54
|
+
//# sourceMappingURL=advanced.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"advanced.js","sourceRoot":"","sources":["../../../src/search/postgres/advanced.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { sqltag as sql } from '@prisma/client/runtime/client';
|
|
2
|
+
import { fieldValue, valuesOf } from './values.js';
|
|
3
|
+
export const valueBuckets = (name, size) => sql `(
|
|
4
|
+
SELECT coalesce(jsonb_agg(
|
|
5
|
+
jsonb_build_object('name', bucket.name, 'count', bucket.count) ORDER BY bucket.count DESC, bucket.name COLLATE "C"
|
|
6
|
+
), '[]')
|
|
7
|
+
FROM (
|
|
8
|
+
SELECT value.name, count(*)::int AS count
|
|
9
|
+
FROM matched AS search, LATERAL (SELECT DISTINCT field.value AS name FROM ${valuesOf(name)}) AS value
|
|
10
|
+
GROUP BY value.name
|
|
11
|
+
ORDER BY count DESC, value.name COLLATE "C"
|
|
12
|
+
LIMIT ${size}::int
|
|
13
|
+
) AS bucket
|
|
14
|
+
)`;
|
|
15
|
+
export const yearBuckets = (name) => sql `(
|
|
16
|
+
SELECT coalesce(jsonb_agg(
|
|
17
|
+
jsonb_build_object('name', to_char(bucket.year, 'YYYY'), 'count', bucket.count) ORDER BY bucket.year
|
|
18
|
+
), '[]')
|
|
19
|
+
FROM (
|
|
20
|
+
SELECT value.year, count(*)::int AS count
|
|
21
|
+
FROM matched AS search, LATERAL (
|
|
22
|
+
SELECT DISTINCT date_trunc('year', ${fieldValue('date')} AT TIME ZONE 'UTC') AS year FROM ${valuesOf(name)}
|
|
23
|
+
) AS value
|
|
24
|
+
GROUP BY value.year
|
|
25
|
+
) AS bucket
|
|
26
|
+
)`;
|
|
27
|
+
//# sourceMappingURL=facets.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"facets.js","sourceRoot":"","sources":["../../../src/search/postgres/facets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,GAAG,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAKnD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,IAAY,EAAE,EAAE,CAAC,GAAG,CAAA;;;;;;gFAMiB,QAAQ,CAAC,IAAI,CAAC;;;YAGlF,IAAI;;EAEd,CAAC;AAKH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,GAAG,CAAA;;;;;;;2CAOL,UAAU,CAAC,MAAM,CAAC,qCAAqC,QAAQ,CAAC,IAAI,CAAC;;;;EAI9G,CAAC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { type Sql } from '@prisma/client/runtime/client';
|
|
2
|
+
import { type BoundingBox } from '../backend.js';
|
|
3
|
+
import type { GeoPoint } from '../fields.js';
|
|
4
|
+
export declare const geohash: ({ lat, lng }: GeoPoint) => string;
|
|
5
|
+
export declare const boundingBoxCondition: ({ topRight, bottomLeft }: BoundingBox) => Sql;
|
|
6
|
+
export declare const geohashGrid: (precision: number) => Sql;
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import { sqltag as sql } from '@prisma/client/runtime/client';
|
|
2
|
+
import { GEOHASH_GRID_CELLS } from '../backend.js';
|
|
3
|
+
const GEOHASH_ALPHABET = '0123456789bcdefghjkmnpqrstuvwxyz';
|
|
4
|
+
export const geohash = ({ lat, lng }) => {
|
|
5
|
+
const ranges = [
|
|
6
|
+
[-180, 180],
|
|
7
|
+
[-90, 90],
|
|
8
|
+
];
|
|
9
|
+
let hash = '';
|
|
10
|
+
let bits = 0;
|
|
11
|
+
for (let bit = 0; bit < 60; bit++) {
|
|
12
|
+
const axis = bit % 2;
|
|
13
|
+
const range = ranges[axis];
|
|
14
|
+
const middle = (range[0] + range[1]) / 2;
|
|
15
|
+
const upper = (axis === 0 ? lng : lat) >= middle;
|
|
16
|
+
range[upper ? 0 : 1] = middle;
|
|
17
|
+
bits = bits * 2 + Number(upper);
|
|
18
|
+
if (bit % 5 === 4) {
|
|
19
|
+
hash += GEOHASH_ALPHABET[bits];
|
|
20
|
+
bits = 0;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
return hash;
|
|
24
|
+
};
|
|
25
|
+
export const boundingBoxCondition = ({ topRight, bottomLeft }) => {
|
|
26
|
+
const box = (west, east) => sql `search.point <@ box(point(${west}::float8, ${bottomLeft.lat}::float8), point(${east}::float8, ${topRight.lat}::float8))`;
|
|
27
|
+
return bottomLeft.lng <= topRight.lng
|
|
28
|
+
? box(bottomLeft.lng, topRight.lng)
|
|
29
|
+
: sql `(${box(bottomLeft.lng, 180)} OR ${box(-180, topRight.lng)})`;
|
|
30
|
+
};
|
|
31
|
+
export const geohashGrid = (precision) => sql `(
|
|
32
|
+
SELECT coalesce(jsonb_object_agg(cell.geohash, cell.count), '{}')
|
|
33
|
+
FROM (
|
|
34
|
+
SELECT left(search.geohash, ${precision}::int) COLLATE "C" AS geohash, count(*)::int AS count
|
|
35
|
+
FROM matched AS search
|
|
36
|
+
WHERE search.geohash IS NOT NULL
|
|
37
|
+
GROUP BY 1
|
|
38
|
+
ORDER BY count DESC, geohash
|
|
39
|
+
LIMIT ${GEOHASH_GRID_CELLS}::int
|
|
40
|
+
) AS cell
|
|
41
|
+
)`;
|
|
42
|
+
//# sourceMappingURL=geo.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"geo.js","sourceRoot":"","sources":["../../../src/search/postgres/geo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,IAAI,GAAG,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAoB,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAGrE,MAAM,gBAAgB,GAAG,kCAAkC,CAAC;AAK5D,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAY,EAAE,EAAE;IAChD,MAAM,MAAM,GAAG;QACb,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC;QACX,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC;KACV,CAAC;IACF,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC;QACrB,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,KAAK,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC;QACjD,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;QAC9B,IAAI,GAAG,IAAI,GAAG,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAChC,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAClB,IAAI,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;YAC/B,IAAI,GAAG,CAAC,CAAC;QACX,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAKF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAe,EAAO,EAAE;IACjF,MAAM,GAAG,GAAG,CAAC,IAAY,EAAE,IAAY,EAAE,EAAE,CACzC,GAAG,CAAA,6BAA6B,IAAI,aAAa,UAAU,CAAC,GAAG,oBAAoB,IAAI,aAAa,QAAQ,CAAC,GAAG,YAAY,CAAC;IAE/H,OAAO,UAAU,CAAC,GAAG,IAAI,QAAQ,CAAC,GAAG;QACnC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC;QACnC,CAAC,CAAC,GAAG,CAAA,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC;AACvE,CAAC,CAAC;AAKF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,SAAiB,EAAE,EAAE,CAAC,GAAG,CAAA;;;kCAGnB,SAAS;;;;;YAK/B,kBAAkB;;EAE5B,CAAC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { type Sql } from '@prisma/client/runtime/client';
|
|
2
|
+
import { type SearchRequest, type SearchResult } from '../backend.js';
|
|
3
|
+
import { type FieldDeclarations, type SearchDocument } from '../fields.js';
|
|
4
|
+
export type PostgresClient = {
|
|
5
|
+
$queryRaw<T = unknown>(query: Sql): PromiseLike<T>;
|
|
6
|
+
$executeRaw(query: Sql): PromiseLike<number>;
|
|
7
|
+
};
|
|
8
|
+
export type PostgresBackendOptions<Fields extends FieldDeclarations> = {
|
|
9
|
+
prisma: PostgresClient;
|
|
10
|
+
fields: Fields;
|
|
11
|
+
};
|
|
12
|
+
export declare const PostgresBackend: <const Fields extends FieldDeclarations>({ prisma, fields, }: PostgresBackendOptions<Fields>) => {
|
|
13
|
+
capabilities: import("../backend.js").BackendSearchCapability;
|
|
14
|
+
search: (request: SearchRequest) => Promise<SearchResult>;
|
|
15
|
+
index: (docs: SearchDocument<Fields>[], { tx }?: {
|
|
16
|
+
tx?: PostgresClient;
|
|
17
|
+
}) => Promise<void>;
|
|
18
|
+
remove: (ids: string[]) => Promise<void>;
|
|
19
|
+
};
|
|
@@ -0,0 +1,157 @@
|
|
|
1
|
+
import { join, sqltag as sql } from '@prisma/client/runtime/client';
|
|
2
|
+
import { SearchQueryError } from '../backend.js';
|
|
3
|
+
import { capabilitiesFromFields, resolveFields, storeDocuments, toWire, } from '../fields.js';
|
|
4
|
+
import { filtersCondition } from '../requestFilters.js';
|
|
5
|
+
import { checkSearchVisibility } from '../visibility.js';
|
|
6
|
+
import { advancedQueryFor } from './advanced.js';
|
|
7
|
+
import { valueBuckets, yearBuckets } from './facets.js';
|
|
8
|
+
import { boundingBoxCondition, geohash, geohashGrid } from './geo.js';
|
|
9
|
+
import { TEXT_SEARCH_CONFIG, typed } from './values.js';
|
|
10
|
+
import { visibilityCondition } from './visibility.js';
|
|
11
|
+
const WEIGHT_LABELS = ['D', 'C', 'B', 'A'];
|
|
12
|
+
export const PostgresBackend = ({ prisma, fields, }) => {
|
|
13
|
+
const capabilities = capabilitiesFromFields(fields);
|
|
14
|
+
const { basic, facets } = resolveFields(fields);
|
|
15
|
+
const textFields = Object.keys(fields).filter((name) => fields[name].type === 'text');
|
|
16
|
+
const basicVectors = basic.map(({ name, weight }) => sql `coalesce(setweight(to_tsvector(${TEXT_SEARCH_CONFIG}, docs."values" -> ${name}), ${WEIGHT_LABELS[weight - 1]}::"char"), '')`);
|
|
17
|
+
const basicVector = basicVectors.length > 0 ? join(basicVectors, ' || ') : sql `''::tsvector`;
|
|
18
|
+
const textVector = sql `(
|
|
19
|
+
SELECT coalesce(string_agg(
|
|
20
|
+
'''' || replace(replace(field || '.' || lexeme, '\\', '\\\\'), '''', '''''') || ''':' || array_to_string(positions, ','),
|
|
21
|
+
' '
|
|
22
|
+
), '')::tsvector
|
|
23
|
+
FROM unnest(${textFields}::text[]) AS field, unnest(to_tsvector(${TEXT_SEARCH_CONFIG}, docs."values" -> field))
|
|
24
|
+
)`;
|
|
25
|
+
const facetBuckets = facets.map(({ name, type, size }) => sql `jsonb_build_object(${name}::text, ${type === 'date' ? yearBuckets(name) : valueBuckets(name, size)})`);
|
|
26
|
+
const queryFor = (request) => {
|
|
27
|
+
if (request.searchType === 'advanced') {
|
|
28
|
+
return advancedQueryFor(request.query, fields);
|
|
29
|
+
}
|
|
30
|
+
if (request.query.trim() === '') {
|
|
31
|
+
return { condition: sql `TRUE`, rank: sql `0` };
|
|
32
|
+
}
|
|
33
|
+
const tsquery = sql `websearch_to_tsquery(${TEXT_SEARCH_CONFIG}, ${request.query}::text)`;
|
|
34
|
+
return {
|
|
35
|
+
condition: sql `(numnode(${tsquery}) = 0 OR search.basic @@ ${tsquery})`,
|
|
36
|
+
rank: sql `ts_rank(search.basic, ${tsquery})`,
|
|
37
|
+
};
|
|
38
|
+
};
|
|
39
|
+
return {
|
|
40
|
+
capabilities,
|
|
41
|
+
search: async (request) => {
|
|
42
|
+
const { condition: matches, rank } = queryFor(request);
|
|
43
|
+
const conditions = [
|
|
44
|
+
matches,
|
|
45
|
+
visibilityCondition(filtersCondition(request.filters), fields),
|
|
46
|
+
...(request.boundingBox ? [boundingBoxCondition(request.boundingBox)] : []),
|
|
47
|
+
visibilityCondition(checkSearchVisibility(fields, request.visibility), fields),
|
|
48
|
+
];
|
|
49
|
+
const { sort, order, geohashPrecision } = request;
|
|
50
|
+
const [key, direction] = sort === 'relevance'
|
|
51
|
+
? [rank, sql `DESC`]
|
|
52
|
+
: [
|
|
53
|
+
typed(fields[sort].type, sql `search."values" ->> ${sort}::text`),
|
|
54
|
+
order === 'asc' ? sql `ASC NULLS LAST` : sql `DESC NULLS LAST`,
|
|
55
|
+
];
|
|
56
|
+
const [result] = await asQueryErrors(prisma.$queryRaw(sql `
|
|
57
|
+
WITH matched AS (
|
|
58
|
+
SELECT search.id, search."values", search.geohash, ${key} AS key
|
|
59
|
+
FROM entity_search AS search
|
|
60
|
+
WHERE ${join(conditions, ' AND ')}
|
|
61
|
+
)
|
|
62
|
+
SELECT
|
|
63
|
+
(SELECT count(*)::int FROM matched) AS total,
|
|
64
|
+
(
|
|
65
|
+
SELECT coalesce(jsonb_agg(page.id ORDER BY page.key ${direction}, page.id COLLATE "C"), '[]')
|
|
66
|
+
FROM (
|
|
67
|
+
SELECT search.id, search.key
|
|
68
|
+
FROM matched AS search
|
|
69
|
+
ORDER BY search.key ${direction}, search.id COLLATE "C"
|
|
70
|
+
LIMIT ${request.limit}::int OFFSET ${request.offset}::int
|
|
71
|
+
) AS page
|
|
72
|
+
) AS hits,
|
|
73
|
+
${join([sql `'{}'::jsonb`, ...facetBuckets], ' || ')} AS facets,
|
|
74
|
+
${geohashPrecision === undefined ? sql `NULL` : geohashGrid(geohashPrecision)} AS "geohashGrid"
|
|
75
|
+
`));
|
|
76
|
+
return {
|
|
77
|
+
total: result.total,
|
|
78
|
+
hits: result.hits.map((id) => ({ id })),
|
|
79
|
+
facets: result.facets,
|
|
80
|
+
...(result.geohashGrid && { geohashGrid: result.geohashGrid }),
|
|
81
|
+
};
|
|
82
|
+
},
|
|
83
|
+
index: async (docs, { tx } = {}) => {
|
|
84
|
+
const stored = storeDocuments(fields, docs);
|
|
85
|
+
const rows = [...new Map(stored.map((doc) => [doc.id, doc])).values()].map(({ id, values, point }) => ({
|
|
86
|
+
id,
|
|
87
|
+
values: Object.fromEntries(Object.entries(values).map(([name, value]) => [
|
|
88
|
+
name,
|
|
89
|
+
Array.isArray(value) ? value.map(toWire) : toWire(value),
|
|
90
|
+
])),
|
|
91
|
+
...(point && { ...point, geohash: geohash(point) }),
|
|
92
|
+
}));
|
|
93
|
+
const ids = rows.map(({ id }) => id);
|
|
94
|
+
const upsert = (tx ?? prisma).$queryRaw(sql `
|
|
95
|
+
WITH docs AS (
|
|
96
|
+
SELECT * FROM jsonb_to_recordset(${JSON.stringify(rows)}::jsonb)
|
|
97
|
+
AS docs(id text, "values" jsonb, lat float8, lng float8, geohash text)
|
|
98
|
+
),
|
|
99
|
+
missing AS (
|
|
100
|
+
SELECT docs.id FROM docs WHERE NOT EXISTS (SELECT FROM entity WHERE entity.id = docs.id)
|
|
101
|
+
),
|
|
102
|
+
upserted AS (
|
|
103
|
+
INSERT INTO entity_search (id, "values", basic, text, point, geohash)
|
|
104
|
+
SELECT docs.id, docs."values", ${basicVector}, ${textVector}, point(docs.lng, docs.lat), docs.geohash
|
|
105
|
+
FROM docs
|
|
106
|
+
WHERE NOT EXISTS (SELECT FROM missing)
|
|
107
|
+
ON CONFLICT (id) DO UPDATE SET
|
|
108
|
+
"values" = excluded."values",
|
|
109
|
+
basic = excluded.basic,
|
|
110
|
+
text = excluded.text,
|
|
111
|
+
point = excluded.point,
|
|
112
|
+
geohash = excluded.geohash
|
|
113
|
+
)
|
|
114
|
+
SELECT id FROM missing ORDER BY id
|
|
115
|
+
`);
|
|
116
|
+
let missing;
|
|
117
|
+
try {
|
|
118
|
+
missing = await upsert;
|
|
119
|
+
}
|
|
120
|
+
catch (error) {
|
|
121
|
+
if (driverErrorOf(error)?.originalCode !== FOREIGN_KEY_VIOLATION) {
|
|
122
|
+
throw error;
|
|
123
|
+
}
|
|
124
|
+
missing = await prisma.$queryRaw(sql `
|
|
125
|
+
SELECT doc.id FROM unnest(${ids}::text[]) AS doc(id)
|
|
126
|
+
WHERE NOT EXISTS (SELECT FROM entity WHERE entity.id = doc.id)
|
|
127
|
+
ORDER BY doc.id
|
|
128
|
+
`);
|
|
129
|
+
if (missing.length === 0) {
|
|
130
|
+
throw error;
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
if (missing.length > 0) {
|
|
134
|
+
throw new Error(`Search documents reference entities that don't exist: ${missing.map(({ id }) => JSON.stringify(id)).join(', ')}`);
|
|
135
|
+
}
|
|
136
|
+
},
|
|
137
|
+
remove: async (ids) => {
|
|
138
|
+
await prisma.$executeRaw(sql `DELETE FROM entity_search WHERE id = ANY(${ids}::text[])`);
|
|
139
|
+
},
|
|
140
|
+
};
|
|
141
|
+
};
|
|
142
|
+
const driverErrorOf = (error) => error.meta?.driverAdapterError?.cause;
|
|
143
|
+
const FOREIGN_KEY_VIOLATION = '23503';
|
|
144
|
+
const QUERY_ERROR_CLASSES = ['22', '54'];
|
|
145
|
+
const asQueryErrors = async (query) => {
|
|
146
|
+
try {
|
|
147
|
+
return await query;
|
|
148
|
+
}
|
|
149
|
+
catch (error) {
|
|
150
|
+
const cause = driverErrorOf(error);
|
|
151
|
+
if (cause && QUERY_ERROR_CLASSES.some((errorClass) => cause.originalCode?.startsWith(errorClass))) {
|
|
152
|
+
throw new SearchQueryError(cause.originalMessage);
|
|
153
|
+
}
|
|
154
|
+
throw error;
|
|
155
|
+
}
|
|
156
|
+
};
|
|
157
|
+
//# sourceMappingURL=postgres.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"postgres.js","sourceRoot":"","sources":["../../../src/search/postgres/postgres.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { type Sql } from '@prisma/client/runtime/client';
|
|
2
|
+
import { type FieldType, type Scalar } from '../fields.js';
|
|
3
|
+
export declare const TEXT_SEARCH_CONFIG: Sql;
|
|
4
|
+
export declare const valuesPath: (field: string) => string;
|
|
5
|
+
export declare const valuesOf: (field: string) => Sql;
|
|
6
|
+
export declare const typed: (type: FieldType, text: Sql) => Sql;
|
|
7
|
+
export declare const fieldValue: (type: FieldType) => Sql;
|
|
8
|
+
export declare const parameter: (type: FieldType, value: Scalar) => Sql;
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { sqltag as sql } from '@prisma/client/runtime/client';
|
|
2
|
+
import { toWire } from '../fields.js';
|
|
3
|
+
export const TEXT_SEARCH_CONFIG = sql `'simple'::regconfig`;
|
|
4
|
+
export const valuesPath = (field) => `$."${field}"[*]`;
|
|
5
|
+
export const valuesOf = (field) => sql `LATERAL (SELECT jsonb_path_query(search."values", ${valuesPath(field)}::jsonpath) #>> '{}' AS value) AS field`;
|
|
6
|
+
export const typed = (type, text) => {
|
|
7
|
+
switch (type) {
|
|
8
|
+
case 'number':
|
|
9
|
+
return sql `(${text})::float8`;
|
|
10
|
+
case 'date':
|
|
11
|
+
return sql `(${text})::timestamptz`;
|
|
12
|
+
case 'boolean':
|
|
13
|
+
return sql `(${text})::boolean`;
|
|
14
|
+
default:
|
|
15
|
+
return sql `(${text}) COLLATE "C"`;
|
|
16
|
+
}
|
|
17
|
+
};
|
|
18
|
+
export const fieldValue = (type) => typed(type, sql `field.value`);
|
|
19
|
+
export const parameter = (type, value) => typed(type, sql `${String(toWire(value))}::text`);
|
|
20
|
+
//# sourceMappingURL=values.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"values.js","sourceRoot":"","sources":["../../../src/search/postgres/values.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,IAAI,GAAG,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAA+B,MAAM,EAAE,MAAM,cAAc,CAAC;AAEnE,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAA,qBAAqB,CAAC;AAG3D,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,MAAM,KAAK,MAAM,CAAC;AAK/D,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAE,EAAE,CACxC,GAAG,CAAA,qDAAqD,UAAU,CAAC,KAAK,CAAC,yCAAyC,CAAC;AAKrH,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,IAAe,EAAE,IAAS,EAAE,EAAE;IAClD,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,QAAQ;YACX,OAAO,GAAG,CAAA,IAAI,IAAI,WAAW,CAAC;QAChC,KAAK,MAAM;YACT,OAAO,GAAG,CAAA,IAAI,IAAI,gBAAgB,CAAC;QACrC,KAAK,SAAS;YACZ,OAAO,GAAG,CAAA,IAAI,IAAI,YAAY,CAAC;QACjC;YACE,OAAO,GAAG,CAAA,IAAI,IAAI,eAAe,CAAC;IACtC,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAe,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAA,aAAa,CAAC,CAAC;AAE7E,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAe,EAAE,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAA,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { type Sql } from '@prisma/client/runtime/client';
|
|
2
|
+
import { type FieldDeclarations } from '../fields.js';
|
|
3
|
+
import type { VisibilityCondition } from '../visibility.js';
|
|
4
|
+
export declare const visibilityCondition: (condition: VisibilityCondition, fields: FieldDeclarations) => Sql;
|