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
package/LICENSE.md
CHANGED
package/README.md
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
# arocapi
|
|
2
2
|
|
|
3
3
|
arocapi implements the [RO-Crate API](https://ro-crate-api.crate-works.org) for data collections, packaged as a
|
|
4
|
-
Fastify plugin. You mount it into your own Fastify
|
|
4
|
+
Fastify plugin. You mount it into your own Fastify app and bring your storage, search index and access
|
|
5
5
|
rules; arocapi serves the routes for entities, files, search and RO-Crate metadata, following the
|
|
6
6
|
[PILARS](https://w3id.org/ldac/pilars) protocols for long-term archival repositories.
|
|
7
7
|
|
|
@@ -29,7 +29,7 @@ You need Node.js 22.18 or later, pnpm, and Docker with Docker Compose.
|
|
|
29
29
|
|
|
30
30
|
```sh
|
|
31
31
|
pnpm install
|
|
32
|
-
docker compose up -d #
|
|
32
|
+
docker compose up -d # Postgres, OpenSearch and the Oni UI
|
|
33
33
|
pnpm generate # generate the Prisma client
|
|
34
34
|
pnpm db:migrate # apply migrations
|
|
35
35
|
pnpm seed # load the sample data in example/data
|
|
@@ -45,7 +45,7 @@ pnpm dev # build and serve src/index.dev.ts on http://localhost:90
|
|
|
45
45
|
| `pnpm test src/app.test.ts` | Run one test file |
|
|
46
46
|
| `pnpm test:watch` | Run the tests in watch mode |
|
|
47
47
|
| `pnpm test:coverage` | Run the tests with an HTML coverage report |
|
|
48
|
-
| `pnpm dbconsole` | Open a
|
|
48
|
+
| `pnpm dbconsole` | Open a psql console on the development database |
|
|
49
49
|
| `pnpm --filter website dev` | Run the documentation site locally |
|
|
50
50
|
| `pnpm --filter website build` | Build the documentation site, checking its diagrams and every link |
|
|
51
51
|
|
package/dist/app.d.ts
CHANGED
|
@@ -1,13 +1,17 @@
|
|
|
1
|
-
import type { Client } from '@opensearch-project/opensearch';
|
|
2
1
|
import type { FastifyPluginAsync } from 'fastify';
|
|
3
|
-
import type {
|
|
2
|
+
import type { SearchBackend } from './search/backend.js';
|
|
3
|
+
import type { SearchVisibilityWhere } from './search/visibility.js';
|
|
4
4
|
import type { AccessFunction } from './types/access.js';
|
|
5
|
-
import type { IsAuthenticated } from './types/context.js';
|
|
5
|
+
import type { IsAuthenticated, RequestContext } from './types/context.js';
|
|
6
6
|
import type { FileHandler, RoCrateHandler } from './types/fileHandlers.js';
|
|
7
7
|
import type { EntityTransformer, FileTransformer } from './types/transformers.js';
|
|
8
|
-
import type { EntityVisibilityFilter
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
import type { EntityVisibilityFilter } from './types/visibility.js';
|
|
9
|
+
export type { AdvancedQuery, BackendSearchCapability, BoundingBox, FacetBucket, RangeBound, RangeFilter, SearchBackend, SearchExtra, SearchRequest, SearchResult, } from './search/backend.js';
|
|
10
|
+
export { SearchQueryError } from './search/backend.js';
|
|
11
|
+
export type { FieldDeclaration, FieldDeclarations, FieldType, GeoPoint, SearchDocument, } from './search/fields.js';
|
|
12
|
+
export { capabilitiesFromFields } from './search/fields.js';
|
|
13
|
+
export type { SearchVisibilityWhere, VisibilityCondition } from './search/visibility.js';
|
|
14
|
+
export { checkSearchVisibility } from './search/visibility.js';
|
|
11
15
|
export type { AuthorisedEntity, AuthorisedFile, BaseEntity, StandardEntity, StandardFile, } from './transformers/default.js';
|
|
12
16
|
export type { AccessFunction, AccessInfo } from './types/access.js';
|
|
13
17
|
export type { IsAuthenticated, RequestContext } from './types/context.js';
|
|
@@ -19,20 +23,22 @@ export { AllPublicAccess, LicenceAccess } from './utils/access.js';
|
|
|
19
23
|
export type { ErrorCode, StandardErrorResponse } from './utils/errors.js';
|
|
20
24
|
export { createAuthenticationRequiredError, createError, createForbiddenError, createInternalError, createNotFoundError, createValidationError, ERROR_CODES, errorHandler, notFoundHandler, } from './utils/errors.js';
|
|
21
25
|
export { AllVisibleEntityFilter, AllVisibleSearchFilter } from './utils/visibility.js';
|
|
22
|
-
|
|
23
|
-
|
|
26
|
+
type PrismaMethod = (args: never) => PromiseLike<unknown>;
|
|
27
|
+
type PrismaDelegate = Record<'findMany' | 'findFirst' | 'count', PrismaMethod>;
|
|
28
|
+
export type ArocapiPrismaClient = {
|
|
29
|
+
entity: PrismaDelegate;
|
|
30
|
+
file: PrismaDelegate;
|
|
31
|
+
};
|
|
24
32
|
export type Options = {
|
|
25
|
-
prisma:
|
|
26
|
-
|
|
27
|
-
queryBuilderClass?: typeof OpensearchQueryBuilder;
|
|
28
|
-
queryBuilderOptions?: QueryBuilderOptions;
|
|
33
|
+
prisma: ArocapiPrismaClient;
|
|
34
|
+
search: SearchBackend;
|
|
29
35
|
access: AccessFunction;
|
|
30
36
|
entityTransformers?: EntityTransformer[];
|
|
31
37
|
fileTransformers?: FileTransformer[];
|
|
32
38
|
fileHandler: FileHandler;
|
|
33
39
|
roCrateHandler: RoCrateHandler;
|
|
34
40
|
entityVisibilityFilter: EntityVisibilityFilter;
|
|
35
|
-
searchVisibilityFilter:
|
|
41
|
+
searchVisibilityFilter: (context: RequestContext) => Promise<SearchVisibilityWhere> | SearchVisibilityWhere;
|
|
36
42
|
isAuthenticated?: IsAuthenticated;
|
|
37
43
|
promptLoginForHidden?: boolean;
|
|
38
44
|
};
|
package/dist/app.js
CHANGED
|
@@ -7,12 +7,13 @@ import files from './routes/files.js';
|
|
|
7
7
|
import metadata from './routes/metadata.js';
|
|
8
8
|
import search from './routes/search.js';
|
|
9
9
|
import { notFoundHandler } from './utils/errors.js';
|
|
10
|
-
import { OpensearchQueryBuilder } from './utils/queryBuilder.js';
|
|
11
10
|
import { setupValidation } from './utils/validation.js';
|
|
11
|
+
export { SearchQueryError } from './search/backend.js';
|
|
12
|
+
export { capabilitiesFromFields } from './search/fields.js';
|
|
13
|
+
export { checkSearchVisibility } from './search/visibility.js';
|
|
12
14
|
export { AllPublicAccess, LicenceAccess } from './utils/access.js';
|
|
13
15
|
export { createAuthenticationRequiredError, createError, createForbiddenError, createInternalError, createNotFoundError, createValidationError, ERROR_CODES, errorHandler, notFoundHandler, } from './utils/errors.js';
|
|
14
16
|
export { AllVisibleEntityFilter, AllVisibleSearchFilter } from './utils/visibility.js';
|
|
15
|
-
export { OpensearchQueryBuilder };
|
|
16
17
|
const DOCS_URL = 'https://arocapi.crate-works.org';
|
|
17
18
|
const REMOVED_OPTIONS = {
|
|
18
19
|
accessTransformer: { replacement: 'access', docs: `${DOCS_URL}/configuration/access/` },
|
|
@@ -23,12 +24,16 @@ const REMOVED_OPTIONS = {
|
|
|
23
24
|
},
|
|
24
25
|
};
|
|
25
26
|
const app = async (fastify, options) => {
|
|
26
|
-
const {
|
|
27
|
-
if (!prisma) {
|
|
27
|
+
const { search: searchBackend, access, entityTransformers, fileTransformers, fileHandler, roCrateHandler, entityVisibilityFilter, searchVisibilityFilter, isAuthenticated, promptLoginForHidden = false, } = options;
|
|
28
|
+
if (!options.prisma) {
|
|
28
29
|
throw new Error('Prisma client is required');
|
|
29
30
|
}
|
|
30
|
-
if (
|
|
31
|
-
throw new Error('
|
|
31
|
+
if (typeof options.prisma.entity?.findMany !== 'function' || typeof options.prisma.file?.findMany !== 'function') {
|
|
32
|
+
throw new Error('prisma must be a Prisma 7 client generated from a schema that includes the arocapi models');
|
|
33
|
+
}
|
|
34
|
+
const prisma = options.prisma;
|
|
35
|
+
if (!searchBackend) {
|
|
36
|
+
throw new Error('search is required');
|
|
32
37
|
}
|
|
33
38
|
for (const [removed, { replacement, docs }] of Object.entries(REMOVED_OPTIONS)) {
|
|
34
39
|
if (options[removed] !== undefined) {
|
|
@@ -60,8 +65,7 @@ const app = async (fastify, options) => {
|
|
|
60
65
|
if (prefix && prefix !== '/') {
|
|
61
66
|
fastify.setNotFoundHandler(notFoundHandler);
|
|
62
67
|
}
|
|
63
|
-
|
|
64
|
-
fastify.register(capabilities, { queryBuilder });
|
|
68
|
+
fastify.register(capabilities, { search: searchBackend });
|
|
65
69
|
fastify.register(entities, { prisma, access, entityTransformers, entityVisibilityFilter });
|
|
66
70
|
fastify.register(entity, { prisma, access, entityTransformers, entityVisibilityFilter, refusal });
|
|
67
71
|
fastify.register(files, { prisma, access, fileTransformers, entityVisibilityFilter });
|
|
@@ -69,10 +73,9 @@ const app = async (fastify, options) => {
|
|
|
69
73
|
fastify.register(metadata, { prisma, roCrateHandler, access, entityVisibilityFilter, refusal });
|
|
70
74
|
fastify.register(search, {
|
|
71
75
|
prisma,
|
|
72
|
-
|
|
76
|
+
search: searchBackend,
|
|
73
77
|
access,
|
|
74
78
|
entityTransformers,
|
|
75
|
-
queryBuilder,
|
|
76
79
|
entityVisibilityFilter,
|
|
77
80
|
searchVisibilityFilter,
|
|
78
81
|
});
|
package/dist/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { FastifyPluginAsync } from 'fastify';
|
|
2
|
-
import type {
|
|
2
|
+
import type { SearchBackend } from '../search/backend.js';
|
|
3
3
|
type CapabilitiesRouteOptions = {
|
|
4
|
-
|
|
4
|
+
search: SearchBackend;
|
|
5
5
|
};
|
|
6
6
|
declare const capabilities: FastifyPluginAsync<CapabilitiesRouteOptions>;
|
|
7
7
|
export default capabilities;
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
const SPEC_VERSION = '0.
|
|
1
|
+
const SPEC_VERSION = '0.5.0';
|
|
2
2
|
const capabilities = async (fastify, opts) => {
|
|
3
3
|
const document = {
|
|
4
4
|
apiVersion: SPEC_VERSION,
|
|
5
5
|
deposit: { supported: false },
|
|
6
6
|
tombstonePolicy: '404',
|
|
7
7
|
extensions: {},
|
|
8
|
-
search: opts.
|
|
8
|
+
search: opts.search.capabilities,
|
|
9
9
|
};
|
|
10
10
|
fastify.get('/capabilities', async () => document);
|
|
11
11
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capabilities.js","sourceRoot":"","sources":["../../src/routes/capabilities.ts"],"names":[],"mappings":"AAGA,MAAM,YAAY,GAAG,OAAO,CAAC;AAM7B,MAAM,YAAY,GAAiD,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACzF,MAAM,QAAQ,GAAG;QACf,UAAU,EAAE,YAAY;QACxB,OAAO,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE;QAC7B,eAAe,EAAE,KAAK;QACtB,UAAU,EAAE,EAAE;QACd,MAAM,EAAE,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"capabilities.js","sourceRoot":"","sources":["../../src/routes/capabilities.ts"],"names":[],"mappings":"AAGA,MAAM,YAAY,GAAG,OAAO,CAAC;AAM7B,MAAM,YAAY,GAAiD,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACzF,MAAM,QAAQ,GAAG;QACf,UAAU,EAAE,YAAY;QACxB,OAAO,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE;QAC7B,eAAe,EAAE,KAAK;QACtB,UAAU,EAAE,EAAE;QACd,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;KACjC,CAAC;IAEF,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,KAAK,IAAI,EAAE,CAAC,QAAQ,CAAC,CAAC;AACrD,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC"}
|
package/dist/routes/entities.js
CHANGED
|
@@ -3,14 +3,13 @@ import { applyTransformers, authoriseEntities } from '../transformers/default.js
|
|
|
3
3
|
const querySchema = z.object({
|
|
4
4
|
memberOf: z.url().optional(),
|
|
5
5
|
entityType: z
|
|
6
|
-
.string()
|
|
7
|
-
.
|
|
8
|
-
.transform((val) =>
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
.pipe(z.array(z.string()).optional()),
|
|
6
|
+
.union([z.string(), z.array(z.string())])
|
|
7
|
+
.default([])
|
|
8
|
+
.transform((val) => [val]
|
|
9
|
+
.flat()
|
|
10
|
+
.map((value) => value.trim())
|
|
11
|
+
.filter(Boolean))
|
|
12
|
+
.pipe(z.array(z.url())),
|
|
14
13
|
limit: z.coerce.number().int().min(1).max(1000).default(100),
|
|
15
14
|
offset: z.coerce.number().int().min(0).default(0),
|
|
16
15
|
sort: z.enum(['id', 'name', 'createdAt', 'updatedAt']).default('id'),
|
|
@@ -28,7 +27,7 @@ const entities = async (fastify, opts) => {
|
|
|
28
27
|
if (memberOf) {
|
|
29
28
|
where.memberOf = memberOf;
|
|
30
29
|
}
|
|
31
|
-
if (entityType
|
|
30
|
+
if (entityType.length > 0) {
|
|
32
31
|
where.entityType = {
|
|
33
32
|
in: entityType,
|
|
34
33
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entities.js","sourceRoot":"","sources":["../../src/routes/entities.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAKlF,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,QAAQ,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;IAC5B,UAAU,EAAE,CAAC;SACV,MAAM,EAAE
|
|
1
|
+
{"version":3,"file":"entities.js","sourceRoot":"","sources":["../../src/routes/entities.ts"],"names":[],"mappings":"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"}
|
package/dist/routes/file.js
CHANGED
|
@@ -11,7 +11,11 @@ const paramsSchema = z.object({
|
|
|
11
11
|
const querySchema = z.object({
|
|
12
12
|
disposition: z.enum(['inline', 'attachment']).optional().default('inline'),
|
|
13
13
|
filename: z.string().optional(),
|
|
14
|
-
noRedirect: z
|
|
14
|
+
noRedirect: z
|
|
15
|
+
.enum(['true', 'false'])
|
|
16
|
+
.optional()
|
|
17
|
+
.default('false')
|
|
18
|
+
.transform((value) => value === 'true'),
|
|
15
19
|
});
|
|
16
20
|
const file = async (fastify, opts) => {
|
|
17
21
|
const { prisma, fileHandler, access, entityVisibilityFilter, refusal } = opts;
|
package/dist/routes/file.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/routes/file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,MAAM,IAAI,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAGnE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,yBAAyB,EAAuB,MAAM,wBAAwB,CAAC;AAExF,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5B,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE;CACZ,CAAC,CAAC;AAEH,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC;IAC1E,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC/B,UAAU,EAAE,CAAC,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/routes/file.ts"],"names":[],"mappings":"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"}
|
package/dist/routes/search.d.ts
CHANGED
|
@@ -1,16 +1,14 @@
|
|
|
1
|
-
import type { Client } from '@opensearch-project/opensearch';
|
|
2
1
|
import type { FastifyPluginAsync } from 'fastify';
|
|
3
2
|
import type { PrismaClient } from '../generated/prisma/client.js';
|
|
3
|
+
import { type SearchBackend } from '../search/backend.js';
|
|
4
4
|
import type { AccessFunction } from '../types/access.js';
|
|
5
5
|
import type { EntityTransformer } from '../types/transformers.js';
|
|
6
6
|
import type { EntityVisibilityFilter, SearchVisibilityFilter } from '../types/visibility.js';
|
|
7
|
-
import type { OpensearchQueryBuilder } from '../utils/queryBuilder.js';
|
|
8
7
|
type SearchRouteOptions = {
|
|
9
8
|
prisma: PrismaClient;
|
|
10
|
-
|
|
9
|
+
search: SearchBackend;
|
|
11
10
|
access: AccessFunction;
|
|
12
11
|
entityTransformers?: EntityTransformer[];
|
|
13
|
-
queryBuilder: OpensearchQueryBuilder;
|
|
14
12
|
entityVisibilityFilter: EntityVisibilityFilter;
|
|
15
13
|
searchVisibilityFilter: SearchVisibilityFilter;
|
|
16
14
|
};
|
package/dist/routes/search.js
CHANGED
|
@@ -1,137 +1,115 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
+
import { normaliseQuery } from '../search/advanced.js';
|
|
3
|
+
import { SearchQueryError, } from '../search/backend.js';
|
|
4
|
+
import { boundingBoxSchema, filterValueSchema, geoViolations, splitFilters, } from '../search/requestFilters.js';
|
|
2
5
|
import { applyTransformers, authoriseEntities } from '../transformers/default.js';
|
|
3
|
-
import { createError, ERROR_CODES } from '../utils/errors.js';
|
|
4
|
-
const boundingBoxSchema = z.object({
|
|
5
|
-
topRight: z.object({
|
|
6
|
-
lat: z.number(),
|
|
7
|
-
lng: z.number(),
|
|
8
|
-
}),
|
|
9
|
-
bottomLeft: z.object({
|
|
10
|
-
lat: z.number(),
|
|
11
|
-
lng: z.number(),
|
|
12
|
-
}),
|
|
13
|
-
});
|
|
6
|
+
import { createError, createValidationError, ERROR_CODES } from '../utils/errors.js';
|
|
14
7
|
const searchParamsSchema = z.object({
|
|
15
8
|
searchType: z.enum(['basic', 'advanced']).default('basic'),
|
|
16
9
|
query: z.string(),
|
|
17
|
-
filters: z.record(z.string(),
|
|
10
|
+
filters: z.record(z.string(), filterValueSchema).default({}),
|
|
18
11
|
boundingBox: boundingBoxSchema.optional(),
|
|
19
12
|
geohashPrecision: z.number().int().min(1).max(12).optional(),
|
|
20
13
|
limit: z.number().int().min(1).max(1000).default(100),
|
|
21
14
|
offset: z.number().int().min(0).default(0),
|
|
22
|
-
sort: z.
|
|
15
|
+
sort: z.string().default('relevance'),
|
|
23
16
|
order: z.enum(['asc', 'desc']).default('asc'),
|
|
24
17
|
});
|
|
18
|
+
const visibleExtra = (searchExtra, { metadata, content }) => {
|
|
19
|
+
if (!searchExtra || (metadata && content)) {
|
|
20
|
+
return searchExtra;
|
|
21
|
+
}
|
|
22
|
+
const { highlight: _, ...rest } = searchExtra;
|
|
23
|
+
return Object.keys(rest).length > 0 ? rest : undefined;
|
|
24
|
+
};
|
|
25
25
|
const search = async (fastify, opts) => {
|
|
26
|
-
const { prisma,
|
|
26
|
+
const { prisma, search: backend, access, entityTransformers = [], entityVisibilityFilter, searchVisibilityFilter, } = opts;
|
|
27
|
+
const { capabilities } = backend;
|
|
28
|
+
const noFacets = Object.fromEntries(Object.keys(capabilities.facets).map((name) => [name, []]));
|
|
29
|
+
const violations = ({ searchType, sort }) => {
|
|
30
|
+
const found = [];
|
|
31
|
+
if (!Object.hasOwn(capabilities.searchTypes, searchType)) {
|
|
32
|
+
found.push({ field: '/searchType', message: `${searchType} search isn't supported`, value: searchType });
|
|
33
|
+
}
|
|
34
|
+
if (sort !== 'relevance' && !Object.hasOwn(capabilities.sorts, sort)) {
|
|
35
|
+
found.push({ field: '/sort', message: `${sort} isn't a declared sort`, value: sort });
|
|
36
|
+
}
|
|
37
|
+
return found;
|
|
38
|
+
};
|
|
27
39
|
fastify.withTypeProvider().post('/search', {
|
|
28
40
|
schema: {
|
|
29
41
|
body: searchParamsSchema,
|
|
30
42
|
},
|
|
31
43
|
}, async (request, reply) => {
|
|
32
|
-
const {
|
|
44
|
+
const { filters, violations: filterProblems } = splitFilters(capabilities.filters, request.body.filters);
|
|
45
|
+
const problems = [
|
|
46
|
+
...violations(request.body),
|
|
47
|
+
...filterProblems,
|
|
48
|
+
...geoViolations(capabilities.geo, request.body),
|
|
49
|
+
];
|
|
50
|
+
if (problems.length > 0) {
|
|
51
|
+
return reply.code(400).send(createValidationError('The request parameters are invalid', problems));
|
|
52
|
+
}
|
|
53
|
+
const { searchType, query, filters: _, boundingBox, geohashPrecision, ...paging } = request.body;
|
|
54
|
+
const searchQuery = normaliseQuery(searchType, query, capabilities.searchTypes.advanced?.fields ?? {});
|
|
55
|
+
if ('problem' in searchQuery) {
|
|
56
|
+
const { problem } = searchQuery;
|
|
57
|
+
return reply.code(422).send(createValidationError(problem, [{ field: 'query', message: problem }]));
|
|
58
|
+
}
|
|
33
59
|
const context = { request, fastify };
|
|
34
|
-
const
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
filter: [visibilityQuery],
|
|
45
|
-
},
|
|
46
|
-
},
|
|
47
|
-
aggs: queryBuilder.buildAggregations(geohashPrecision, boundingBox),
|
|
48
|
-
highlight: {
|
|
49
|
-
fields: {
|
|
50
|
-
name: {},
|
|
51
|
-
description: {},
|
|
52
|
-
},
|
|
53
|
-
},
|
|
54
|
-
sort: queryBuilder.buildSort(sort, order),
|
|
55
|
-
from: offset,
|
|
56
|
-
size: limit,
|
|
57
|
-
},
|
|
60
|
+
const visibilityWhere = Promise.resolve(entityVisibilityFilter(context));
|
|
61
|
+
visibilityWhere.catch(() => undefined);
|
|
62
|
+
const visibility = await searchVisibilityFilter(context);
|
|
63
|
+
const searchRequest = {
|
|
64
|
+
...searchQuery,
|
|
65
|
+
filters,
|
|
66
|
+
...(boundingBox && { boundingBox }),
|
|
67
|
+
...(geohashPrecision !== undefined && { geohashPrecision }),
|
|
68
|
+
...paging,
|
|
69
|
+
visibility,
|
|
58
70
|
};
|
|
59
|
-
|
|
60
|
-
let
|
|
71
|
+
const start = performance.now();
|
|
72
|
+
let result;
|
|
61
73
|
try {
|
|
62
|
-
|
|
74
|
+
result = await backend.search(searchRequest, context);
|
|
63
75
|
}
|
|
64
76
|
catch (error) {
|
|
65
|
-
|
|
66
|
-
|
|
77
|
+
await visibilityWhere.catch((visibilityError) => {
|
|
78
|
+
fastify.log.error({ err: error }, 'Search backend failed');
|
|
79
|
+
throw visibilityError;
|
|
80
|
+
});
|
|
81
|
+
if (!(error instanceof SearchQueryError)) {
|
|
67
82
|
throw error;
|
|
68
83
|
}
|
|
69
|
-
fastify.log.warn(`Invalid search query: ${message}`);
|
|
70
|
-
return reply.code(422).send(createError(ERROR_CODES.VALIDATION_ERROR, message));
|
|
71
|
-
}
|
|
72
|
-
if (!response.body?.hits?.hits) {
|
|
73
|
-
throw new Error('Invalid search response: missing hits data');
|
|
84
|
+
fastify.log.warn(`Invalid search query: ${error.message}`);
|
|
85
|
+
return reply.code(422).send(createError(ERROR_CODES.VALIDATION_ERROR, error.message));
|
|
74
86
|
}
|
|
75
|
-
const
|
|
87
|
+
const searchTime = Math.round(performance.now() - start);
|
|
76
88
|
const dbEntities = await prisma.entity.findMany({
|
|
77
89
|
where: {
|
|
78
|
-
AND: [{ id: { in:
|
|
90
|
+
AND: [{ id: { in: result.hits.map(({ id }) => id) } }, await visibilityWhere],
|
|
79
91
|
},
|
|
80
92
|
include: { file: { select: { id: true } } },
|
|
81
93
|
});
|
|
82
94
|
const authorisedEntities = await authoriseEntities(dbEntities, prisma, access, context);
|
|
83
95
|
const entityMap = new Map(authorisedEntities.map((entity) => [entity.id, entity]));
|
|
84
|
-
const entities = await Promise.all(
|
|
85
|
-
|
|
86
|
-
throw new Error('Missing id in search hit');
|
|
87
|
-
}
|
|
88
|
-
const authorisedEntity = entityMap.get(hit._source.id);
|
|
96
|
+
const entities = await Promise.all(result.hits.map(async ({ id, searchExtra }) => {
|
|
97
|
+
const authorisedEntity = entityMap.get(id);
|
|
89
98
|
if (!authorisedEntity) {
|
|
90
|
-
fastify.log.warn(`Entity ${
|
|
99
|
+
fastify.log.warn(`Entity ${id} found by the search backend but missing or not visible in database`);
|
|
91
100
|
return null;
|
|
92
101
|
}
|
|
93
|
-
const
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
};
|
|
101
|
-
})).then((results) => results.filter(Boolean));
|
|
102
|
-
const facets = {};
|
|
103
|
-
if (response.body.aggregations) {
|
|
104
|
-
Object.keys(response.body.aggregations).forEach((key) => {
|
|
105
|
-
if (key !== 'geohash_grid') {
|
|
106
|
-
const agg = response.body.aggregations?.[key];
|
|
107
|
-
if (agg?.buckets && Array.isArray(agg.buckets)) {
|
|
108
|
-
facets[key] = agg.buckets.map((bucket) => ({
|
|
109
|
-
name: bucket.key,
|
|
110
|
-
count: bucket.doc_count,
|
|
111
|
-
}));
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
});
|
|
115
|
-
}
|
|
116
|
-
let geohashGrid;
|
|
117
|
-
if (response.body.aggregations?.geohash_grid) {
|
|
118
|
-
const geohashAgg = response.body.aggregations.geohash_grid;
|
|
119
|
-
if (geohashAgg?.buckets && Array.isArray(geohashAgg.buckets)) {
|
|
120
|
-
geohashAgg.buckets.forEach((bucket) => {
|
|
121
|
-
geohashGrid ||= {};
|
|
122
|
-
geohashGrid[bucket.key] = bucket.doc_count;
|
|
123
|
-
});
|
|
124
|
-
}
|
|
125
|
-
}
|
|
126
|
-
const total = typeof response.body.hits.total === 'number' ? response.body.hits.total : response.body.hits.total?.value || 0;
|
|
127
|
-
const result = {
|
|
128
|
-
total,
|
|
129
|
-
searchTime: response.body.took,
|
|
102
|
+
const transformed = await applyTransformers(authorisedEntity, entityTransformers, context);
|
|
103
|
+
const extra = visibleExtra(searchExtra, authorisedEntity.access);
|
|
104
|
+
return extra === undefined ? transformed : { ...transformed, searchExtra: extra };
|
|
105
|
+
})).then((results) => results.filter((entity) => entity !== null));
|
|
106
|
+
return {
|
|
107
|
+
total: result.total,
|
|
108
|
+
searchTime,
|
|
130
109
|
entities,
|
|
131
|
-
facets:
|
|
132
|
-
geohashGrid,
|
|
110
|
+
facets: { ...noFacets, ...result.facets },
|
|
111
|
+
...(result.geohashGrid && { geohashGrid: result.geohashGrid }),
|
|
133
112
|
};
|
|
134
|
-
return result;
|
|
135
113
|
});
|
|
136
114
|
};
|
|
137
115
|
export default search;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/routes/search.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/routes/search.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { type SearchQuery } from './backend.js';
|
|
2
|
+
export declare const normaliseQuery: (searchType: 'basic' | 'advanced', query: string, advancedFields: Record<string, unknown>) => SearchQuery | {
|
|
3
|
+
problem: string;
|
|
4
|
+
};
|
|
5
|
+
export declare const matchedDateSpan: (field: string, value: string) => {
|
|
6
|
+
first: Date;
|
|
7
|
+
last: Date;
|
|
8
|
+
};
|