arocapi 5.0.0-beta.4 → 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 +3 -3
- 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/file.js +5 -1
- package/dist/routes/file.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/file.ts +5 -1
- 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 -425
- 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 -526
- 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,38 @@
|
|
|
1
|
+
import { join, sqltag as sql } from '@prisma/client/runtime/client';
|
|
2
|
+
import { toWire } from '../fields.js';
|
|
3
|
+
import { fieldValue, parameter, valuesOf, valuesPath } from './values.js';
|
|
4
|
+
const OPERATORS = { lt: sql `<`, lte: sql `<=`, gt: sql `>`, gte: sql `>=` };
|
|
5
|
+
const literal = (type, value) => JSON.stringify(type === 'boolean' && (value === 'true' || value === 'false') ? value === 'true' : toWire(value));
|
|
6
|
+
export const visibilityCondition = (condition, fields) => {
|
|
7
|
+
const translate = (node) => {
|
|
8
|
+
switch (node.type) {
|
|
9
|
+
case 'and':
|
|
10
|
+
return sql `(${join([sql `TRUE`, ...node.clauses.map(translate)], ' AND ')})`;
|
|
11
|
+
case 'or':
|
|
12
|
+
return sql `(${join([sql `FALSE`, ...node.clauses.map(translate)], ' OR ')})`;
|
|
13
|
+
case 'not':
|
|
14
|
+
return sql `NOT ${translate(node.clause)}`;
|
|
15
|
+
case 'present':
|
|
16
|
+
return node.field === 'id' ? sql `TRUE` : sql `search."values" @? ${valuesPath(node.field)}::jsonpath`;
|
|
17
|
+
case 'in': {
|
|
18
|
+
const { field, values } = node;
|
|
19
|
+
if (field === 'id') {
|
|
20
|
+
return sql `search.id = ANY(${values.map(String)}::text[])`;
|
|
21
|
+
}
|
|
22
|
+
if (values.length === 0) {
|
|
23
|
+
return sql `FALSE`;
|
|
24
|
+
}
|
|
25
|
+
const { type } = fields[field];
|
|
26
|
+
const equals = values.map((value) => `@ == ${literal(type, value)}`).join(' || ');
|
|
27
|
+
return sql `search."values" @? ${`${valuesPath(field)} ? (${equals})`}::jsonpath`;
|
|
28
|
+
}
|
|
29
|
+
case 'range': {
|
|
30
|
+
const { type } = fields[node.field];
|
|
31
|
+
const bounds = Object.entries(node.bounds).map(([bound, value]) => sql `${fieldValue(type)} ${OPERATORS[bound]} ${parameter(type, value)}`);
|
|
32
|
+
return sql `EXISTS (SELECT FROM ${valuesOf(node.field)} WHERE ${join(bounds, ' AND ')})`;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
return translate(condition);
|
|
37
|
+
};
|
|
38
|
+
//# sourceMappingURL=visibility.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"visibility.js","sourceRoot":"","sources":["../../../src/search/postgres/visibility.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import type { BackendSearchCapability, BoundingBox, RangeFilter, SearchRequest } from './backend.js';
|
|
3
|
+
import type { VisibilityCondition } from './visibility.js';
|
|
4
|
+
export declare const filterValueSchema: z.ZodUnion<readonly [z.ZodArray<z.ZodString>, z.ZodObject<{
|
|
5
|
+
gte: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
|
|
6
|
+
lte: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
|
|
7
|
+
}, z.core.$strict>, z.ZodArray<z.ZodObject<{
|
|
8
|
+
gte: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
|
|
9
|
+
lte: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
|
|
10
|
+
}, z.core.$strict>>]>;
|
|
11
|
+
export declare const boundingBoxSchema: z.ZodObject<{
|
|
12
|
+
topRight: z.ZodObject<{
|
|
13
|
+
lat: z.ZodNumber;
|
|
14
|
+
lng: z.ZodNumber;
|
|
15
|
+
}, z.core.$strip>;
|
|
16
|
+
bottomLeft: z.ZodObject<{
|
|
17
|
+
lat: z.ZodNumber;
|
|
18
|
+
lng: z.ZodNumber;
|
|
19
|
+
}, z.core.$strip>;
|
|
20
|
+
}, z.core.$strip>;
|
|
21
|
+
type FilterValue = z.infer<typeof filterValueSchema>;
|
|
22
|
+
export type Violation = {
|
|
23
|
+
field: string;
|
|
24
|
+
message: string;
|
|
25
|
+
value?: unknown;
|
|
26
|
+
};
|
|
27
|
+
export declare const splitFilters: (declared: BackendSearchCapability['filters'], filters: Record<string, FilterValue>) => {
|
|
28
|
+
filters: {
|
|
29
|
+
terms: Record<string, string[]>;
|
|
30
|
+
ranges: Record<string, RangeFilter[]>;
|
|
31
|
+
};
|
|
32
|
+
violations: Violation[];
|
|
33
|
+
};
|
|
34
|
+
export declare const filtersCondition: ({ terms, ranges }: SearchRequest['filters']) => VisibilityCondition;
|
|
35
|
+
export declare const geoViolations: (geo: BackendSearchCapability['geo'], { boundingBox, geohashPrecision }: {
|
|
36
|
+
boundingBox?: BoundingBox;
|
|
37
|
+
geohashPrecision?: number;
|
|
38
|
+
}) => Violation[];
|
|
39
|
+
export {};
|
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import { dateSpan } from './fields.js';
|
|
3
|
+
const boundSchema = z.union([z.string(), z.number()]);
|
|
4
|
+
const rangeSchema = z
|
|
5
|
+
.strictObject({ gte: boundSchema.optional(), lte: boundSchema.optional() })
|
|
6
|
+
.refine(({ gte, lte }) => gte !== undefined || lte !== undefined, 'A range needs gte, lte or both');
|
|
7
|
+
export const filterValueSchema = z.union([z.array(z.string()), rangeSchema, z.array(rangeSchema).min(1)]);
|
|
8
|
+
const pointSchema = z.object({ lat: z.number().min(-90).max(90), lng: z.number().min(-180).max(180) });
|
|
9
|
+
export const boundingBoxSchema = z.object({ topRight: pointSchema, bottomLeft: pointSchema });
|
|
10
|
+
const FILTER_DATE = /^\d{4}-\d{2}-\d{2}(?:[Tt ]|$)/;
|
|
11
|
+
const DATE_FORMS = 'a YYYY-MM-DD date or an RFC 3339 date-time';
|
|
12
|
+
const filterDateSpan = (value) => (FILTER_DATE.test(value) ? dateSpan(value) : undefined);
|
|
13
|
+
const toBound = (type, side, value) => {
|
|
14
|
+
if (type === 'number') {
|
|
15
|
+
return typeof value === 'number' ? value : undefined;
|
|
16
|
+
}
|
|
17
|
+
const span = typeof value === 'string' ? filterDateSpan(value) : undefined;
|
|
18
|
+
return span && (side === 'gte' ? span.first : span.last);
|
|
19
|
+
};
|
|
20
|
+
const normaliseRange = (type, range) => {
|
|
21
|
+
const normalised = {};
|
|
22
|
+
for (const side of ['gte', 'lte']) {
|
|
23
|
+
const value = range[side];
|
|
24
|
+
if (value === undefined) {
|
|
25
|
+
continue;
|
|
26
|
+
}
|
|
27
|
+
const bound = toBound(type, side, value);
|
|
28
|
+
if (bound === undefined) {
|
|
29
|
+
return { problem: `${side} must be ${type === 'date' ? DATE_FORMS : 'a number'}` };
|
|
30
|
+
}
|
|
31
|
+
normalised[side] = bound;
|
|
32
|
+
}
|
|
33
|
+
const { gte, lte } = normalised;
|
|
34
|
+
if (gte !== undefined && lte !== undefined && Number(gte) > Number(lte)) {
|
|
35
|
+
return { problem: 'has gte above lte' };
|
|
36
|
+
}
|
|
37
|
+
return { range: normalised };
|
|
38
|
+
};
|
|
39
|
+
const exactRange = (type, value) => {
|
|
40
|
+
if (type === 'number') {
|
|
41
|
+
const number = Number(value);
|
|
42
|
+
return value.trim() !== '' && Number.isFinite(number)
|
|
43
|
+
? { range: { gte: number, lte: number } }
|
|
44
|
+
: { problem: `values must be numbers, not ${JSON.stringify(value)}` };
|
|
45
|
+
}
|
|
46
|
+
const span = filterDateSpan(value);
|
|
47
|
+
return span
|
|
48
|
+
? { range: { gte: span.first, lte: span.last } }
|
|
49
|
+
: { problem: `values must be ${DATE_FORMS}, not ${JSON.stringify(value)}` };
|
|
50
|
+
};
|
|
51
|
+
const isExact = (value) => Array.isArray(value) && value.every((item) => typeof item === 'string');
|
|
52
|
+
const normalise = (type, value) => {
|
|
53
|
+
if (type !== 'date' && type !== 'number') {
|
|
54
|
+
return { problem: `is a ${type} filter, which takes exact values, not ranges` };
|
|
55
|
+
}
|
|
56
|
+
const normalised = isExact(value)
|
|
57
|
+
? value.map((item) => exactRange(type, item))
|
|
58
|
+
: (Array.isArray(value) ? value : [value]).map((range) => normaliseRange(type, range));
|
|
59
|
+
const failed = normalised.find((item) => 'problem' in item);
|
|
60
|
+
return failed ?? { range: normalised.map((item) => item.range) };
|
|
61
|
+
};
|
|
62
|
+
export const splitFilters = (declared, filters) => {
|
|
63
|
+
const split = { terms: {}, ranges: {} };
|
|
64
|
+
const violations = [];
|
|
65
|
+
for (const [key, value] of Object.entries(filters)) {
|
|
66
|
+
if (!Object.hasOwn(declared, key)) {
|
|
67
|
+
violations.push({ field: `/filters/${key}`, message: `${key} isn't a declared filter`, value });
|
|
68
|
+
continue;
|
|
69
|
+
}
|
|
70
|
+
const { type } = declared[key];
|
|
71
|
+
if ((type === 'string' || type === 'boolean') && isExact(value)) {
|
|
72
|
+
const notBoolean = type === 'boolean' ? value.find((item) => item !== 'true' && item !== 'false') : undefined;
|
|
73
|
+
if (notBoolean === undefined) {
|
|
74
|
+
split.terms[key] = value;
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
violations.push({
|
|
78
|
+
field: `/filters/${key}`,
|
|
79
|
+
message: `${key} values must be true or false, not ${JSON.stringify(notBoolean)}`,
|
|
80
|
+
value,
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
continue;
|
|
84
|
+
}
|
|
85
|
+
const result = normalise(type, value);
|
|
86
|
+
if ('problem' in result) {
|
|
87
|
+
violations.push({ field: `/filters/${key}`, message: `${key} ${result.problem}`, value });
|
|
88
|
+
}
|
|
89
|
+
else {
|
|
90
|
+
split.ranges[key] = result.range;
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
return { filters: split, violations };
|
|
94
|
+
};
|
|
95
|
+
export const filtersCondition = ({ terms, ranges }) => ({
|
|
96
|
+
type: 'and',
|
|
97
|
+
clauses: [
|
|
98
|
+
...Object.entries(terms).map(([field, values]) => ({ type: 'in', field, values })),
|
|
99
|
+
...Object.entries(ranges).map(([field, filters]) => ({
|
|
100
|
+
type: 'or',
|
|
101
|
+
clauses: filters.map((bounds) => ({ type: 'range', field, bounds })),
|
|
102
|
+
})),
|
|
103
|
+
],
|
|
104
|
+
});
|
|
105
|
+
export const geoViolations = (geo, { boundingBox, geohashPrecision }) => {
|
|
106
|
+
const violations = [];
|
|
107
|
+
if (!geo.supported) {
|
|
108
|
+
const message = "Geo search isn't supported";
|
|
109
|
+
if (boundingBox) {
|
|
110
|
+
violations.push({ field: '/boundingBox', message });
|
|
111
|
+
}
|
|
112
|
+
if (geohashPrecision !== undefined) {
|
|
113
|
+
violations.push({ field: '/geohashPrecision', message });
|
|
114
|
+
}
|
|
115
|
+
return violations;
|
|
116
|
+
}
|
|
117
|
+
if (geohashPrecision !== undefined && !boundingBox) {
|
|
118
|
+
violations.push({ field: '/geohashPrecision', message: 'geohashPrecision needs a boundingBox' });
|
|
119
|
+
}
|
|
120
|
+
if (boundingBox && boundingBox.bottomLeft.lat > boundingBox.topRight.lat) {
|
|
121
|
+
violations.push({ field: '/boundingBox', message: 'bottomLeft.lat is north of topRight.lat' });
|
|
122
|
+
}
|
|
123
|
+
return violations;
|
|
124
|
+
};
|
|
125
|
+
//# sourceMappingURL=requestFilters.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"requestFilters.js","sourceRoot":"","sources":["../../src/search/requestFilters.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { type FieldDeclarations, type FieldType, type Scalar } from './fields.js';
|
|
2
|
+
type ValueOf<Type extends FieldType> = Type extends 'number' ? number : Type extends 'boolean' ? boolean : Type extends 'date' ? string | Date : string;
|
|
3
|
+
type Equality<Value> = {
|
|
4
|
+
equals?: Value | null;
|
|
5
|
+
not?: Value | null;
|
|
6
|
+
in?: Value[];
|
|
7
|
+
notIn?: Value[];
|
|
8
|
+
};
|
|
9
|
+
type Ordered<Value> = {
|
|
10
|
+
lt?: Value;
|
|
11
|
+
lte?: Value;
|
|
12
|
+
gt?: Value;
|
|
13
|
+
gte?: Value;
|
|
14
|
+
};
|
|
15
|
+
type ConditionOf<Type extends FieldType> = Type extends 'date' | 'number' ? ValueOf<Type> | null | (Equality<ValueOf<Type>> & Ordered<ValueOf<Type>>) : ValueOf<Type> | null | Equality<ValueOf<Type>>;
|
|
16
|
+
type AnyCondition = ConditionOf<Exclude<FieldType, 'geo'>>;
|
|
17
|
+
type TypedWhere<Fields extends FieldDeclarations> = {
|
|
18
|
+
AND?: TypedWhere<Fields>[];
|
|
19
|
+
OR?: TypedWhere<Fields>[];
|
|
20
|
+
NOT?: TypedWhere<Fields>[];
|
|
21
|
+
id?: ConditionOf<'keyword'>;
|
|
22
|
+
} & {
|
|
23
|
+
-readonly [Name in keyof Fields as Fields[Name]['type'] extends 'geo' ? never : Name]?: ConditionOf<Fields[Name]['type']>;
|
|
24
|
+
};
|
|
25
|
+
type UntypedWhere = {
|
|
26
|
+
AND?: UntypedWhere[];
|
|
27
|
+
OR?: UntypedWhere[];
|
|
28
|
+
NOT?: UntypedWhere[];
|
|
29
|
+
[name: string]: AnyCondition | UntypedWhere[] | undefined;
|
|
30
|
+
};
|
|
31
|
+
export type SearchVisibilityWhere<Fields extends FieldDeclarations = FieldDeclarations> = string extends keyof Fields ? UntypedWhere : TypedWhere<Fields>;
|
|
32
|
+
export type VisibilityCondition = {
|
|
33
|
+
type: 'and' | 'or';
|
|
34
|
+
clauses: VisibilityCondition[];
|
|
35
|
+
} | {
|
|
36
|
+
type: 'not';
|
|
37
|
+
clause: VisibilityCondition;
|
|
38
|
+
} | {
|
|
39
|
+
type: 'in';
|
|
40
|
+
field: string;
|
|
41
|
+
values: Scalar[];
|
|
42
|
+
} | {
|
|
43
|
+
type: 'present';
|
|
44
|
+
field: string;
|
|
45
|
+
} | {
|
|
46
|
+
type: 'range';
|
|
47
|
+
field: string;
|
|
48
|
+
bounds: Partial<Record<'lt' | 'lte' | 'gt' | 'gte', number | Date>>;
|
|
49
|
+
};
|
|
50
|
+
export declare const checkSearchVisibility: (fields: FieldDeclarations, where: unknown) => VisibilityCondition;
|
|
51
|
+
export {};
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
import { DATE_FORMS, storeScalar, withId, } from './fields.js';
|
|
2
|
+
const COMBINATORS = ['AND', 'OR', 'NOT'];
|
|
3
|
+
const EQUALITY = ['equals', 'not', 'in', 'notIn'];
|
|
4
|
+
const RANGE = ['lt', 'lte', 'gt', 'gte'];
|
|
5
|
+
const isPlainObject = (value) => {
|
|
6
|
+
if (typeof value !== 'object' || value === null) {
|
|
7
|
+
return false;
|
|
8
|
+
}
|
|
9
|
+
const prototype = Object.getPrototypeOf(value);
|
|
10
|
+
return prototype === Object.prototype || prototype === null;
|
|
11
|
+
};
|
|
12
|
+
export const checkSearchVisibility = (fields, where) => {
|
|
13
|
+
const declarations = withId(fields);
|
|
14
|
+
const fail = (key, problem) => {
|
|
15
|
+
throw new Error(`Search visibility filter: "${key}" ${problem}`);
|
|
16
|
+
};
|
|
17
|
+
const scalar = (field, type, value) => {
|
|
18
|
+
if (type === 'date' && value instanceof Date && !Number.isNaN(value.getTime())) {
|
|
19
|
+
return value;
|
|
20
|
+
}
|
|
21
|
+
const stored = storeScalar(type, value);
|
|
22
|
+
if ('problem' in stored) {
|
|
23
|
+
const problem = type === 'date' ? `must be a Date or ${DATE_FORMS}` : stored.problem;
|
|
24
|
+
return fail(field, `${problem}, not ${JSON.stringify(value)}`);
|
|
25
|
+
}
|
|
26
|
+
return stored.value;
|
|
27
|
+
};
|
|
28
|
+
const equals = (field, type, value) => value === null
|
|
29
|
+
? { type: 'not', clause: { type: 'present', field } }
|
|
30
|
+
: { type: 'in', field, values: [scalar(field, type, value)] };
|
|
31
|
+
const list = (field, type, operator, value) => {
|
|
32
|
+
if (!Array.isArray(value)) {
|
|
33
|
+
return fail(field, `takes an array for ${operator}`);
|
|
34
|
+
}
|
|
35
|
+
return { type: 'in', field, values: value.map((item) => scalar(field, type, item)) };
|
|
36
|
+
};
|
|
37
|
+
const condition = (field, declaration, value) => {
|
|
38
|
+
const { type } = declaration;
|
|
39
|
+
if (type === 'geo') {
|
|
40
|
+
return fail(field, "is a geo field, which a search visibility filter can't use");
|
|
41
|
+
}
|
|
42
|
+
if (!isPlainObject(value)) {
|
|
43
|
+
return equals(field, type, value);
|
|
44
|
+
}
|
|
45
|
+
const ordered = type === 'date' || type === 'number';
|
|
46
|
+
const clauses = [];
|
|
47
|
+
const bounds = {};
|
|
48
|
+
for (const [operator, operand] of Object.entries(value)) {
|
|
49
|
+
if (operand === undefined) {
|
|
50
|
+
continue;
|
|
51
|
+
}
|
|
52
|
+
if (ordered && RANGE.includes(operator)) {
|
|
53
|
+
bounds[operator] = scalar(field, type, operand);
|
|
54
|
+
continue;
|
|
55
|
+
}
|
|
56
|
+
if (!EQUALITY.includes(operator)) {
|
|
57
|
+
return fail(field, `is a ${type} field, which can't take ${operator}`);
|
|
58
|
+
}
|
|
59
|
+
const positive = operator === 'equals' || operator === 'not'
|
|
60
|
+
? equals(field, type, operand)
|
|
61
|
+
: list(field, type, operator, operand);
|
|
62
|
+
clauses.push(operator === 'not' || operator === 'notIn' ? { type: 'not', clause: positive } : positive);
|
|
63
|
+
}
|
|
64
|
+
if (Object.keys(bounds).length > 0) {
|
|
65
|
+
clauses.push({ type: 'range', field, bounds });
|
|
66
|
+
}
|
|
67
|
+
return clauses.length === 1 ? clauses[0] : { type: 'and', clauses };
|
|
68
|
+
};
|
|
69
|
+
const check = (node, path) => {
|
|
70
|
+
if (!isPlainObject(node)) {
|
|
71
|
+
return fail(path, 'must be an object of field conditions');
|
|
72
|
+
}
|
|
73
|
+
const clauses = [];
|
|
74
|
+
for (const [key, value] of Object.entries(node)) {
|
|
75
|
+
if (value === undefined) {
|
|
76
|
+
continue;
|
|
77
|
+
}
|
|
78
|
+
if (COMBINATORS.includes(key)) {
|
|
79
|
+
if (!Array.isArray(value)) {
|
|
80
|
+
return fail(key, 'takes an array of filters');
|
|
81
|
+
}
|
|
82
|
+
const nested = value.map((item, index) => check(item, `${key}[${index}]`));
|
|
83
|
+
clauses.push(key === 'AND'
|
|
84
|
+
? { type: 'and', clauses: nested }
|
|
85
|
+
: key === 'OR'
|
|
86
|
+
? { type: 'or', clauses: nested }
|
|
87
|
+
: { type: 'not', clause: { type: 'or', clauses: nested } });
|
|
88
|
+
continue;
|
|
89
|
+
}
|
|
90
|
+
const declaration = Object.hasOwn(declarations, key) ? declarations[key] : undefined;
|
|
91
|
+
if (!declaration) {
|
|
92
|
+
return fail(key, "isn't a declared field");
|
|
93
|
+
}
|
|
94
|
+
clauses.push(condition(key, declaration, value));
|
|
95
|
+
}
|
|
96
|
+
return clauses.length === 1 ? clauses[0] : { type: 'and', clauses };
|
|
97
|
+
};
|
|
98
|
+
return check(where, 'filter');
|
|
99
|
+
};
|
|
100
|
+
//# sourceMappingURL=visibility.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"visibility.js","sourceRoot":"","sources":["../../src/search/visibility.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import type { QueryContainer } from '@opensearch-project/opensearch/api/_types/_common.query_dsl.js';
|
|
2
1
|
import type { Prisma } from '../generated/prisma/client.js';
|
|
2
|
+
import type { FieldDeclarations } from '../search/fields.js';
|
|
3
|
+
import type { SearchVisibilityWhere } from '../search/visibility.js';
|
|
3
4
|
import type { RequestContext } from './context.js';
|
|
4
5
|
export type EntityVisibilityFilter = (context: RequestContext) => Promise<Prisma.EntityWhereInput> | Prisma.EntityWhereInput;
|
|
5
|
-
export type SearchVisibilityFilter = (context: RequestContext) => Promise<
|
|
6
|
+
export type SearchVisibilityFilter<Fields extends FieldDeclarations = FieldDeclarations> = (context: RequestContext) => Promise<SearchVisibilityWhere<Fields>> | SearchVisibilityWhere<Fields>;
|
package/dist/utils/visibility.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createNotFoundError, sendRefusal } from './errors.js';
|
|
2
2
|
export const AllVisibleEntityFilter = () => ({});
|
|
3
|
-
export const AllVisibleSearchFilter = () => ({
|
|
3
|
+
export const AllVisibleSearchFilter = () => ({});
|
|
4
4
|
export const isAnonymous = async (isAuthenticated, context) => isAuthenticated ? !(await isAuthenticated(context)) : false;
|
|
5
5
|
export const createNotVisibleResponder = ({ promptLoginForHidden, isAuthenticated, notFoundMessage, exists }) => async (reply, id, context) => {
|
|
6
6
|
if (promptLoginForHidden && (await isAnonymous(isAuthenticated, context)) && (await exists(id))) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visibility.js","sourceRoot":"","sources":["../../src/utils/visibility.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAO/D,MAAM,CAAC,MAAM,sBAAsB,GAA2B,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;AAOzE,MAAM,CAAC,MAAM,sBAAsB,GAA2B,GAAG,EAAE,CAAC,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"visibility.js","sourceRoot":"","sources":["../../src/utils/visibility.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAO/D,MAAM,CAAC,MAAM,sBAAsB,GAA2B,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;AAOzE,MAAM,CAAC,MAAM,sBAAsB,GAA2B,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;AAKzE,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAAE,eAA4C,EAAE,OAAuB,EAAE,EAAE,CACzG,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAgB9D,MAAM,CAAC,MAAM,yBAAyB,GACpC,CAAC,EAAE,oBAAoB,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,EAA8B,EAAE,EAAE,CACnG,KAAK,EAAE,KAAmB,EAAE,EAAU,EAAE,OAAuB,EAAE,EAAE;IACjE,IAAI,oBAAoB,IAAI,CAAC,MAAM,WAAW,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QAChG,OAAO,WAAW,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IACtC,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC;AACxE,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,MAAoB,EAAE,OAAuB,EAAE,EAAE,CAC/F,yBAAyB,CAAC;IACxB,GAAG,OAAO;IACV,eAAe,EAAE,oCAAoC;IACrD,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC;CACzE,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"type": "module",
|
|
3
3
|
"name": "arocapi",
|
|
4
|
-
"version": "5.0.0-beta.
|
|
4
|
+
"version": "5.0.0-beta.6",
|
|
5
5
|
"description": "An RO-Crate API",
|
|
6
6
|
"main": "dist/app.js",
|
|
7
7
|
"exports": {
|
|
8
|
-
".": "./dist/app.js"
|
|
8
|
+
".": "./dist/app.js",
|
|
9
|
+
"./opensearch": "./dist/search/opensearch/opensearch.js",
|
|
10
|
+
"./postgres": "./dist/search/postgres/postgres.js"
|
|
9
11
|
},
|
|
10
12
|
"keywords": [
|
|
11
13
|
"rocrate",
|
|
@@ -15,50 +17,59 @@
|
|
|
15
17
|
"license": "ISC",
|
|
16
18
|
"dependencies": {
|
|
17
19
|
"@fastify/sensible": "^6.0.7",
|
|
18
|
-
"@opensearch-project/opensearch": "^3.9.0",
|
|
19
|
-
"@prisma/config": "^7.10.0",
|
|
20
20
|
"content-disposition": "^3.0.0",
|
|
21
|
-
"dotenv": "^18.0.7",
|
|
22
|
-
"fastify": "^5.12.5",
|
|
23
21
|
"fastify-type-provider-zod": "^7.0.0",
|
|
24
|
-
"zod": "^4.6.
|
|
22
|
+
"zod": "^4.6.7"
|
|
25
23
|
},
|
|
26
24
|
"devDependencies": {
|
|
27
25
|
"@biomejs/biome": "^2.5.15",
|
|
28
|
-
"@commitlint/cli": "^21.2.
|
|
29
|
-
"@commitlint/config-conventional": "^21.2.
|
|
30
|
-
"@
|
|
31
|
-
"@prisma/
|
|
26
|
+
"@commitlint/cli": "^21.2.4",
|
|
27
|
+
"@commitlint/config-conventional": "^21.2.4",
|
|
28
|
+
"@opensearch-project/opensearch": "^3.9.0",
|
|
29
|
+
"@prisma/adapter-pg": "^7.10.1",
|
|
30
|
+
"@prisma/client": "^7.10.1",
|
|
31
|
+
"@prisma/config": "^7.10.1",
|
|
32
32
|
"@semantic-release/changelog": "^7.0.0",
|
|
33
33
|
"@semantic-release/git": "^11.0.1",
|
|
34
34
|
"@total-typescript/ts-reset": "^0.6.1",
|
|
35
35
|
"@types/node": "^26.6.5",
|
|
36
|
-
"@vitest/coverage-v8": "^5.0.
|
|
37
|
-
"@vitest/ui": "^5.0.
|
|
36
|
+
"@vitest/coverage-v8": "^5.0.5",
|
|
37
|
+
"@vitest/ui": "^5.0.5",
|
|
38
38
|
"concurrently": "^10.0.6",
|
|
39
39
|
"conventional-changelog-conventionalcommits": "^9.3.1",
|
|
40
|
+
"dotenv": "^18.0.8",
|
|
41
|
+
"fastify": "^5.12.7",
|
|
40
42
|
"fastify-tsconfig": "^3.0.0",
|
|
41
|
-
"knip": "^6.
|
|
42
|
-
"lefthook": "^2.2.
|
|
43
|
-
"prisma": "^7.10.
|
|
44
|
-
"prisma-json-types-generator": "^5.1.1",
|
|
43
|
+
"knip": "^6.42.0",
|
|
44
|
+
"lefthook": "^2.2.2",
|
|
45
|
+
"prisma": "^7.10.1",
|
|
45
46
|
"semantic-release": "^25.0.9",
|
|
46
47
|
"tsx": "^4.23.15",
|
|
47
48
|
"typescript": "^7.0.2",
|
|
48
|
-
"vitest": "^5.0.
|
|
49
|
+
"vitest": "^5.0.5",
|
|
49
50
|
"vitest-mock-extended": "^5.1.1"
|
|
50
51
|
},
|
|
51
52
|
"peerDependencies": {
|
|
52
|
-
"@
|
|
53
|
+
"@opensearch-project/opensearch": "^3.9.0",
|
|
54
|
+
"@prisma/client": "^7.10.0",
|
|
55
|
+
"fastify": "^5.12.7"
|
|
53
56
|
},
|
|
54
57
|
"files": [
|
|
55
58
|
"src",
|
|
56
59
|
"!src/generated",
|
|
60
|
+
"!src/index.dev.ts",
|
|
61
|
+
"!src/reset.d.ts",
|
|
62
|
+
"!src/**/*.test.ts",
|
|
63
|
+
"!src/test/**",
|
|
64
|
+
"!src/**/__snapshots__/**",
|
|
57
65
|
"dist",
|
|
58
|
-
"!dist/generated",
|
|
66
|
+
"!dist/generated/**/*.js",
|
|
67
|
+
"!dist/generated/**/*.js.map",
|
|
68
|
+
"!dist/index.dev.*",
|
|
69
|
+
"!dist/**/*.test.*",
|
|
70
|
+
"!dist/test/**",
|
|
59
71
|
"README.md",
|
|
60
|
-
"prisma/models"
|
|
61
|
-
"prisma.config.ts"
|
|
72
|
+
"prisma/models"
|
|
62
73
|
],
|
|
63
74
|
"scripts": {
|
|
64
75
|
"build": "tsc",
|
|
@@ -66,13 +77,14 @@
|
|
|
66
77
|
"dev": "pnpm run dev:clean && pnpm run build && concurrently -k -p \"[{name}]\" -n \"TypeScript,App\" -c \"yellow.bold,cyan.bold\" \"pnpm:dev:start\" \"pnpm:watch\" ",
|
|
67
78
|
"dev:start": "node --watch --env-file=.env dist/index.dev.js",
|
|
68
79
|
"dev:clean": "rm -rf dist",
|
|
69
|
-
"dbconsole": "docker compose exec db
|
|
70
|
-
"load-test-data": "tsx
|
|
80
|
+
"dbconsole": "docker compose exec db psql -U postgres catalog",
|
|
81
|
+
"load-test-data": "tsx scripts/loadEntities.ts",
|
|
71
82
|
"lint:biome": "biome check",
|
|
72
83
|
"lint:types": "tsc --noEmit",
|
|
73
84
|
"lint:examples": "tsc --emitDeclarationOnly && tsc -p website/examples",
|
|
85
|
+
"lint:consumer": "./scripts/check-consumer-types.sh",
|
|
74
86
|
"lint:knip": "knip",
|
|
75
|
-
"lint": "prisma generate >/dev/null && concurrently -p \"[{name}]\" -n \"biome,types,knip,examples\" -c \"yellow.bold,cyan.bold,magenta.bold,green.bold\" \"pnpm:lint:biome\" \"pnpm:lint:types\" \"pnpm:lint:knip\" \"pnpm:lint:examples\"",
|
|
87
|
+
"lint": "prisma generate >/dev/null && concurrently -p \"[{name}]\" -n \"biome,types,knip,examples,consumer\" -c \"yellow.bold,cyan.bold,magenta.bold,green.bold,blue.bold\" \"pnpm:lint:biome\" \"pnpm:lint:types\" \"pnpm:lint:knip\" \"pnpm:lint:examples\" \"pnpm:lint:consumer\"",
|
|
76
88
|
"test": "./scripts/setup-integration.sh vitest run",
|
|
77
89
|
"test:ci": "vitest run",
|
|
78
90
|
"test:watch": "./scripts/setup-integration.sh && vitest",
|
|
@@ -91,5 +103,13 @@
|
|
|
91
103
|
"registry": "https://registry.npmjs.org/",
|
|
92
104
|
"provenance": true
|
|
93
105
|
},
|
|
94
|
-
"packageManager": "pnpm@12.11.2"
|
|
106
|
+
"packageManager": "pnpm@12.11.2",
|
|
107
|
+
"peerDependenciesMeta": {
|
|
108
|
+
"@opensearch-project/opensearch": {
|
|
109
|
+
"optional": true
|
|
110
|
+
}
|
|
111
|
+
},
|
|
112
|
+
"engines": {
|
|
113
|
+
"node": ">=22.18"
|
|
114
|
+
}
|
|
95
115
|
}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
model Entity {
|
|
2
|
-
id String @id
|
|
2
|
+
id String @id
|
|
3
3
|
|
|
4
|
-
name String
|
|
5
|
-
description String
|
|
4
|
+
name String
|
|
5
|
+
description String
|
|
6
6
|
|
|
7
|
-
entityType String
|
|
8
|
-
memberOf String?
|
|
9
|
-
rootCollection String?
|
|
10
|
-
metadataLicenseId String
|
|
11
|
-
contentLicenseId String
|
|
7
|
+
entityType String
|
|
8
|
+
memberOf String?
|
|
9
|
+
rootCollection String?
|
|
10
|
+
metadataLicenseId String
|
|
11
|
+
contentLicenseId String
|
|
12
12
|
|
|
13
13
|
meta Json?
|
|
14
14
|
|
|
@@ -16,6 +16,7 @@ model Entity {
|
|
|
16
16
|
updatedAt DateTime @updatedAt
|
|
17
17
|
|
|
18
18
|
file File?
|
|
19
|
+
search EntitySearch?
|
|
19
20
|
|
|
20
21
|
@@index([memberOf])
|
|
21
22
|
@@index([rootCollection])
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/// One entity's search document, written by PostgresBackend through raw SQL
|
|
2
|
+
model EntitySearch {
|
|
3
|
+
id String @id
|
|
4
|
+
|
|
5
|
+
/// The document's declared values by field name, with dates as UTC ISO strings and without the geo field
|
|
6
|
+
values Json @default("{}")
|
|
7
|
+
/// Basic search text, weighted A–D from field weights 4–1
|
|
8
|
+
basic Unsupported("tsvector")
|
|
9
|
+
/// Every text field's lexemes, each prefixed with `<field>.`
|
|
10
|
+
text Unsupported("tsvector")
|
|
11
|
+
point Unsupported("point")?
|
|
12
|
+
geohash String?
|
|
13
|
+
|
|
14
|
+
entity Entity @relation(fields: [id], references: [id], onDelete: Cascade)
|
|
15
|
+
|
|
16
|
+
@@index([values(ops: JsonbPathOps)], type: Gin)
|
|
17
|
+
@@index([basic], type: Gin)
|
|
18
|
+
@@index([text], type: Gin)
|
|
19
|
+
@@index([point], type: Gist)
|
|
20
|
+
@@map("entity_search")
|
|
21
|
+
}
|