@valencets/cms 0.2.2 → 0.3.0
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/dist/admin/admin-routes.d.ts +1 -0
- package/dist/admin/admin-routes.d.ts.map +1 -1
- package/dist/admin/admin-routes.js +88 -16
- package/dist/admin/admin-routes.js.map +1 -1
- package/dist/admin/edit-view.d.ts +1 -1
- package/dist/admin/edit-view.d.ts.map +1 -1
- package/dist/admin/edit-view.js +3 -2
- package/dist/admin/edit-view.js.map +1 -1
- package/dist/admin/editor/lexical-entry.d.ts.map +1 -1
- package/dist/admin/editor/lexical-entry.js +21 -36
- package/dist/admin/editor/lexical-entry.js.map +1 -1
- package/dist/admin/flash.js +2 -2
- package/dist/admin/flash.js.map +1 -1
- package/dist/admin/layout.d.ts +2 -0
- package/dist/admin/layout.d.ts.map +1 -1
- package/dist/admin/layout.js +4 -2
- package/dist/admin/layout.js.map +1 -1
- package/dist/admin/list-view.d.ts +18 -3
- package/dist/admin/list-view.d.ts.map +1 -1
- package/dist/admin/list-view.js +137 -11
- package/dist/admin/list-view.js.map +1 -1
- package/dist/admin-client.js +11 -11
- package/dist/api/local-api.d.ts +11 -2
- package/dist/api/local-api.d.ts.map +1 -1
- package/dist/api/local-api.js +15 -0
- package/dist/api/local-api.js.map +1 -1
- package/dist/api/rest-api.d.ts.map +1 -1
- package/dist/api/rest-api.js +77 -3
- package/dist/api/rest-api.js.map +1 -1
- package/dist/config/cms-config.d.ts +1 -0
- package/dist/config/cms-config.d.ts.map +1 -1
- package/dist/config/cms-config.js +1 -1
- package/dist/config/cms-config.js.map +1 -1
- package/dist/db/query-builder.d.ts +1 -0
- package/dist/db/query-builder.d.ts.map +1 -1
- package/dist/db/query-builder.js +52 -9
- package/dist/db/query-builder.js.map +1 -1
- package/dist/db/query-types.d.ts +4 -0
- package/dist/db/query-types.d.ts.map +1 -1
- package/dist/db/search-migration.d.ts +5 -0
- package/dist/db/search-migration.d.ts.map +1 -0
- package/dist/db/search-migration.js +67 -0
- package/dist/db/search-migration.js.map +1 -0
- package/dist/schema/collection.d.ts +2 -0
- package/dist/schema/collection.d.ts.map +1 -1
- package/dist/schema/collection.js.map +1 -1
- package/package.json +8 -4
package/dist/api/local-api.d.ts
CHANGED
|
@@ -4,10 +4,19 @@ import type { CollectionRegistry } from '../schema/registry.js';
|
|
|
4
4
|
import type { GlobalRegistry } from '../schema/registry.js';
|
|
5
5
|
import type { CmsError } from '../schema/types.js';
|
|
6
6
|
import type { DocumentRow, DocumentData } from '../db/query-builder.js';
|
|
7
|
-
|
|
7
|
+
import type { PaginatedResult } from '../db/query-types.js';
|
|
8
|
+
export interface FindArgs {
|
|
8
9
|
readonly collection: string;
|
|
9
10
|
readonly where?: Record<string, string | number | boolean | null> | undefined;
|
|
11
|
+
readonly orderBy?: {
|
|
12
|
+
field: string;
|
|
13
|
+
direction: 'asc' | 'desc';
|
|
14
|
+
} | undefined;
|
|
15
|
+
readonly page?: number | undefined;
|
|
16
|
+
readonly perPage?: number | undefined;
|
|
17
|
+
readonly search?: string | undefined;
|
|
10
18
|
readonly limit?: number | undefined;
|
|
19
|
+
readonly filters?: Record<string, string> | undefined;
|
|
11
20
|
}
|
|
12
21
|
interface FindByIDArgs {
|
|
13
22
|
readonly collection: string;
|
|
@@ -38,7 +47,7 @@ interface UpdateGlobalArgs {
|
|
|
38
47
|
readonly data: DocumentData;
|
|
39
48
|
}
|
|
40
49
|
export interface LocalApi {
|
|
41
|
-
find(args: FindArgs): ResultAsync<DocumentRow[]
|
|
50
|
+
find(args: FindArgs): ResultAsync<DocumentRow[] | PaginatedResult<DocumentRow>, CmsError>;
|
|
42
51
|
findByID(args: FindByIDArgs): ResultAsync<DocumentRow | null, CmsError>;
|
|
43
52
|
create(args: CreateArgs): ResultAsync<DocumentRow, CmsError>;
|
|
44
53
|
update(args: UpdateArgs): ResultAsync<DocumentRow, CmsError>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-api.d.ts","sourceRoot":"","sources":["../../src/api/local-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAY,MAAM,YAAY,CAAA;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"local-api.d.ts","sourceRoot":"","sources":["../../src/api/local-api.ts"],"names":[],"mappings":"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"}
|
package/dist/api/local-api.js
CHANGED
|
@@ -13,6 +13,21 @@ export function createLocalApi(pool, collections, globals) {
|
|
|
13
13
|
builder = builder.where(k, v);
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
|
+
if (args.filters) {
|
|
17
|
+
for (const [k, v] of Object.entries(args.filters)) {
|
|
18
|
+
if (v === '')
|
|
19
|
+
continue;
|
|
20
|
+
const coerced = v === 'true' ? true : v === 'false' ? false : v;
|
|
21
|
+
builder = builder.where(k, coerced);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
if (args.search)
|
|
25
|
+
builder = builder.search(args.search);
|
|
26
|
+
if (args.orderBy)
|
|
27
|
+
builder = builder.orderBy(args.orderBy.field, args.orderBy.direction);
|
|
28
|
+
if (args.page !== undefined && args.perPage !== undefined) {
|
|
29
|
+
return builder.page(args.page, args.perPage);
|
|
30
|
+
}
|
|
16
31
|
if (args.limit)
|
|
17
32
|
builder = builder.limit(args.limit);
|
|
18
33
|
return builder.all();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-api.js","sourceRoot":"","sources":["../../src/api/local-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,QAAQ,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"local-api.js","sourceRoot":"","sources":["../../src/api/local-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rest-api.d.ts","sourceRoot":"","sources":["../../src/api/rest-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAChE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"rest-api.d.ts","sourceRoot":"","sources":["../../src/api/rest-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAChE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAS/E,MAAM,MAAM,gBAAgB,GAAG,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AAExH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,GAAG,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAA;IAC3C,QAAQ,CAAC,IAAI,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAA;IAC5C,QAAQ,CAAC,KAAK,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAA;IAC7C,QAAQ,CAAC,MAAM,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAA;CAC/C;AAmFD,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,kBAAkB,EAC/B,OAAO,EAAE,cAAc,GACtB,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAuG7B"}
|
package/dist/api/rest-api.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { createLocalApi } from './local-api.js';
|
|
2
2
|
import { sendJson, sendErrorJson, safeReadBody, safeJsonParse } from './http-utils.js';
|
|
3
3
|
import { generateZodSchema, generatePartialSchema } from '../validation/zod-generator.js';
|
|
4
|
+
const SYSTEM_COLUMNS = new Set(['id', 'created_at', 'updated_at', 'deleted_at']);
|
|
5
|
+
const RESERVED_PARAMS = new Set(['search', 'sort', 'dir', 'page', 'limit']);
|
|
4
6
|
function requireJsonContentType(req, res) {
|
|
5
7
|
const ct = req.headers['content-type'] ?? '';
|
|
6
8
|
if (!ct.includes('application/json')) {
|
|
@@ -9,6 +11,57 @@ function requireJsonContentType(req, res) {
|
|
|
9
11
|
}
|
|
10
12
|
return true;
|
|
11
13
|
}
|
|
14
|
+
function sendPaginatedJson(res, data) {
|
|
15
|
+
const body = JSON.stringify(data);
|
|
16
|
+
res.writeHead(200, {
|
|
17
|
+
'Content-Type': 'application/json; charset=utf-8',
|
|
18
|
+
'Content-Length': Buffer.byteLength(body)
|
|
19
|
+
});
|
|
20
|
+
res.end(body);
|
|
21
|
+
}
|
|
22
|
+
function getAllowedFields(col) {
|
|
23
|
+
const names = col.fields.map(f => f.name);
|
|
24
|
+
const allowed = new Set(names);
|
|
25
|
+
for (const sys of SYSTEM_COLUMNS)
|
|
26
|
+
allowed.add(sys);
|
|
27
|
+
return allowed;
|
|
28
|
+
}
|
|
29
|
+
function parseQueryParams(url, col) {
|
|
30
|
+
const qmark = url.indexOf('?');
|
|
31
|
+
const qs = qmark >= 0 ? url.slice(qmark + 1) : '';
|
|
32
|
+
const params = new URLSearchParams(qs);
|
|
33
|
+
const allowed = getAllowedFields(col);
|
|
34
|
+
const sortField = params.get('sort');
|
|
35
|
+
if (sortField !== null && !allowed.has(sortField)) {
|
|
36
|
+
return { ok: false, message: `Invalid sort field: ${sortField}` };
|
|
37
|
+
}
|
|
38
|
+
const dirRaw = params.get('dir') ?? 'asc';
|
|
39
|
+
const direction = dirRaw === 'desc' ? 'desc' : 'asc';
|
|
40
|
+
const pageRaw = params.get('page');
|
|
41
|
+
const page = pageRaw !== null ? parseInt(pageRaw, 10) : undefined;
|
|
42
|
+
const limitRaw = params.get('limit');
|
|
43
|
+
const perPage = limitRaw !== null ? parseInt(limitRaw, 10) : 25;
|
|
44
|
+
const searchVal = params.get('search') ?? undefined;
|
|
45
|
+
const where = {};
|
|
46
|
+
for (const [key, value] of params.entries()) {
|
|
47
|
+
if (RESERVED_PARAMS.has(key))
|
|
48
|
+
continue;
|
|
49
|
+
if (!allowed.has(key)) {
|
|
50
|
+
return { ok: false, message: `Invalid filter field: ${key}` };
|
|
51
|
+
}
|
|
52
|
+
where[key] = value;
|
|
53
|
+
}
|
|
54
|
+
return {
|
|
55
|
+
ok: true,
|
|
56
|
+
args: {
|
|
57
|
+
search: searchVal,
|
|
58
|
+
orderBy: sortField !== null ? { field: sortField, direction } : undefined,
|
|
59
|
+
page,
|
|
60
|
+
perPage,
|
|
61
|
+
filters: Object.keys(where).length > 0 ? where : undefined
|
|
62
|
+
}
|
|
63
|
+
};
|
|
64
|
+
}
|
|
12
65
|
export function createRestRoutes(pool, collections, globals) {
|
|
13
66
|
const api = createLocalApi(pool, collections, globals);
|
|
14
67
|
const routes = new Map();
|
|
@@ -16,9 +69,30 @@ export function createRestRoutes(pool, collections, globals) {
|
|
|
16
69
|
const slug = col.slug;
|
|
17
70
|
const zodSchema = generateZodSchema(col.fields);
|
|
18
71
|
routes.set(`/api/${slug}`, {
|
|
19
|
-
GET: async (
|
|
20
|
-
const
|
|
21
|
-
|
|
72
|
+
GET: async (req, res) => {
|
|
73
|
+
const url = req.url ?? `/${slug}`;
|
|
74
|
+
const parsed = parseQueryParams(url, col);
|
|
75
|
+
if (!parsed.ok) {
|
|
76
|
+
sendErrorJson(res, parsed.message, 400);
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
const { search, orderBy, page, perPage, filters } = parsed.args;
|
|
80
|
+
const result = await api.find({
|
|
81
|
+
collection: slug,
|
|
82
|
+
search,
|
|
83
|
+
orderBy,
|
|
84
|
+
page,
|
|
85
|
+
perPage: page !== undefined ? perPage : undefined,
|
|
86
|
+
filters
|
|
87
|
+
});
|
|
88
|
+
result.match((docs) => {
|
|
89
|
+
if (page !== undefined) {
|
|
90
|
+
sendPaginatedJson(res, docs);
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
sendJson(res, docs);
|
|
94
|
+
}
|
|
95
|
+
}, (err) => sendErrorJson(res, err.message, 500));
|
|
22
96
|
},
|
|
23
97
|
POST: async (req, res) => {
|
|
24
98
|
if (!requireJsonContentType(req, res))
|
package/dist/api/rest-api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rest-api.js","sourceRoot":"","sources":["../../src/api/rest-api.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAEtF,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAA;
|
|
1
|
+
{"version":3,"file":"rest-api.js","sourceRoot":"","sources":["../../src/api/rest-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ export interface CmsConfig {
|
|
|
15
15
|
readonly plugins?: readonly Plugin[] | undefined;
|
|
16
16
|
readonly uploadDir?: string | undefined;
|
|
17
17
|
readonly telemetryPool?: DbPool | undefined;
|
|
18
|
+
readonly headTags?: readonly string[] | undefined;
|
|
18
19
|
}
|
|
19
20
|
export interface CmsInstance {
|
|
20
21
|
readonly api: LocalApi;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cms-config.d.ts","sourceRoot":"","sources":["../../src/config/cms-config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAC/E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAWxD,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,WAAW,EAAE,SAAS,gBAAgB,EAAE,CAAA;IACjD,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,CAAA;IACtD,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAA;IAChD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACvC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"cms-config.d.ts","sourceRoot":"","sources":["../../src/config/cms-config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAC/E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAWxD,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,WAAW,EAAE,SAAS,gBAAgB,EAAE,CAAA;IACjD,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,CAAA;IACtD,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAA;IAChD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACvC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3C,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAA;CAClD;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAA;IACtB,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAA;IACxC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAA;IAChC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;IAChD,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;CAClD;AAED,wBAAgB,QAAQ,CAAE,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAsD/E"}
|
|
@@ -29,7 +29,7 @@ export function buildCms(inputConfig) {
|
|
|
29
29
|
}
|
|
30
30
|
const api = createLocalApi(config.db, collections, globals);
|
|
31
31
|
const restRoutes = createRestRoutes(config.db, collections, globals);
|
|
32
|
-
const adminRoutes = createAdminRoutes(config.db, collections, { telemetryPool: config.telemetryPool });
|
|
32
|
+
const adminRoutes = createAdminRoutes(config.db, collections, { telemetryPool: config.telemetryPool, headTags: config.headTags });
|
|
33
33
|
const hasAuthCollection = config.collections.some(c => isAuthEnabled(c));
|
|
34
34
|
if (hasAuthCollection) {
|
|
35
35
|
const authRoutes = createAuthRoutes(config.db, collections);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cms-config.js","sourceRoot":"","sources":["../../src/config/cms-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAUpC,OAAO,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AACtF,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;
|
|
1
|
+
{"version":3,"file":"cms-config.js","sourceRoot":"","sources":["../../src/config/cms-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,7 @@ export interface CollectionQueryBuilder {
|
|
|
20
20
|
limit(n: number): CollectionQueryBuilder;
|
|
21
21
|
offset(n: number): CollectionQueryBuilder;
|
|
22
22
|
withDeleted(): CollectionQueryBuilder;
|
|
23
|
+
search(query: string, language?: string): CollectionQueryBuilder;
|
|
23
24
|
all<T = DocumentRow>(): ResultAsync<T[], CmsError>;
|
|
24
25
|
first<T = DocumentRow>(): ResultAsync<T | null, CmsError>;
|
|
25
26
|
count(): ResultAsync<number, CmsError>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-builder.d.ts","sourceRoot":"","sources":["../../src/db/query-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAY,MAAM,YAAY,CAAA;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAE/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"query-builder.d.ts","sourceRoot":"","sources":["../../src/db/query-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAY,MAAM,YAAY,CAAA;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAE/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAgBhF,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACxC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACxC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IAC/C,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAAA;CAC7C;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAA;CACjC;AAmID,MAAM,WAAW,sBAAsB;IACrC,KAAK,CAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,sBAAsB,CAAA;IAC9D,KAAK,CAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,GAAG,sBAAsB,CAAA;IACvF,OAAO,CAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,GAAG,MAAM,GAAG,sBAAsB,CAAA;IAC1E,KAAK,CAAE,CAAC,EAAE,MAAM,GAAG,sBAAsB,CAAA;IACzC,MAAM,CAAE,CAAC,EAAE,MAAM,GAAG,sBAAsB,CAAA;IAC1C,WAAW,IAAK,sBAAsB,CAAA;IACtC,MAAM,CAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,sBAAsB,CAAA;IACjE,GAAG,CAAC,CAAC,GAAG,WAAW,KAAM,WAAW,CAAC,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAA;IACnD,KAAK,CAAC,CAAC,GAAG,WAAW,KAAM,WAAW,CAAC,CAAC,GAAG,IAAI,EAAE,QAAQ,CAAC,CAAA;IAC1D,KAAK,IAAK,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IACvC,MAAM,CAAC,CAAC,GAAG,WAAW,EAAG,IAAI,EAAE,YAAY,GAAG,WAAW,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;IACtE,MAAM,CAAC,CAAC,GAAG,WAAW,EAAG,IAAI,EAAE,YAAY,GAAG,WAAW,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;IACtE,MAAM,CAAC,CAAC,GAAG,WAAW,KAAM,WAAW,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;IACpD,IAAI,CAAC,CAAC,GAAG,WAAW,EAAG,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;CACpG;AAkJD,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAE,IAAI,EAAE,MAAM,GAAG,sBAAsB,CAAA;CAC7C;AAED,wBAAgB,kBAAkB,CAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,GAAG,mBAAmB,CAenG"}
|
package/dist/db/query-builder.js
CHANGED
|
@@ -2,6 +2,16 @@ import { errAsync } from 'neverthrow';
|
|
|
2
2
|
import { CmsErrorCode } from '../schema/types.js';
|
|
3
3
|
import { isValidIdentifier, getValidFieldNames, isAllowedField } from './sql-sanitize.js';
|
|
4
4
|
import { safeQuery } from './safe-query.js';
|
|
5
|
+
const VALID_TS_LANGUAGES = new Set([
|
|
6
|
+
'simple', 'arabic', 'armenian', 'basque', 'catalan', 'danish', 'dutch',
|
|
7
|
+
'english', 'finnish', 'french', 'german', 'greek', 'hindi', 'hungarian',
|
|
8
|
+
'indonesian', 'irish', 'italian', 'lithuanian', 'nepali', 'norwegian',
|
|
9
|
+
'portuguese', 'romanian', 'russian', 'serbian', 'spanish', 'swedish',
|
|
10
|
+
'tamil', 'turkish', 'yiddish'
|
|
11
|
+
]);
|
|
12
|
+
function sanitizeLanguage(lang) {
|
|
13
|
+
return VALID_TS_LANGUAGES.has(lang) ? lang : 'english';
|
|
14
|
+
}
|
|
5
15
|
const OPERATOR_SQL = {
|
|
6
16
|
equals: '=',
|
|
7
17
|
not_equals: '!=',
|
|
@@ -34,6 +44,17 @@ function validateDataKeys(data, allowedFields) {
|
|
|
34
44
|
}
|
|
35
45
|
return null;
|
|
36
46
|
}
|
|
47
|
+
function buildSelectSql(state, table) {
|
|
48
|
+
if (state.searchQuery !== null) {
|
|
49
|
+
const searchParamIdx = getWhereParamCount(state) + 1;
|
|
50
|
+
const lang = sanitizeLanguage(state.searchLanguage);
|
|
51
|
+
return `SELECT *, ts_rank(search_vector, plainto_tsquery('${lang}', $${searchParamIdx})) AS search_rank FROM ${table}`;
|
|
52
|
+
}
|
|
53
|
+
return `SELECT * FROM ${table}`;
|
|
54
|
+
}
|
|
55
|
+
function getWhereParamCount(state) {
|
|
56
|
+
return state.wheres.filter(w => w.operator !== 'exists').length;
|
|
57
|
+
}
|
|
37
58
|
function buildWhereSql(state) {
|
|
38
59
|
const parts = [];
|
|
39
60
|
let paramIdx = 0;
|
|
@@ -54,13 +75,22 @@ function buildWhereSql(state) {
|
|
|
54
75
|
parts.push(`${col} ${OPERATOR_SQL[w.operator]} $${paramIdx}`);
|
|
55
76
|
}
|
|
56
77
|
}
|
|
78
|
+
if (state.searchQuery !== null) {
|
|
79
|
+
const searchParamIdx = paramIdx + 1;
|
|
80
|
+
const lang = sanitizeLanguage(state.searchLanguage);
|
|
81
|
+
parts.push(`search_vector @@ plainto_tsquery('${lang}', $${searchParamIdx})`);
|
|
82
|
+
}
|
|
57
83
|
return parts.length > 0 ? ` WHERE ${parts.join(' AND ')}` : '';
|
|
58
84
|
}
|
|
59
85
|
function buildOrderSql(state) {
|
|
60
|
-
if (state.orderBys.length
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
86
|
+
if (state.orderBys.length > 0) {
|
|
87
|
+
const parts = state.orderBys.map(o => `"${o.field}" ${o.direction.toUpperCase()}`);
|
|
88
|
+
return ` ORDER BY ${parts.join(', ')}`;
|
|
89
|
+
}
|
|
90
|
+
if (state.searchQuery !== null) {
|
|
91
|
+
return ' ORDER BY search_rank DESC';
|
|
92
|
+
}
|
|
93
|
+
return '';
|
|
64
94
|
}
|
|
65
95
|
function buildLimitOffsetSql(state) {
|
|
66
96
|
let sql = '';
|
|
@@ -71,9 +101,13 @@ function buildLimitOffsetSql(state) {
|
|
|
71
101
|
return sql;
|
|
72
102
|
}
|
|
73
103
|
function getWhereValues(state) {
|
|
74
|
-
|
|
104
|
+
const values = state.wheres
|
|
75
105
|
.filter(w => w.operator !== 'exists')
|
|
76
106
|
.map(w => w.value);
|
|
107
|
+
if (state.searchQuery !== null) {
|
|
108
|
+
return [...values, state.searchQuery];
|
|
109
|
+
}
|
|
110
|
+
return values;
|
|
77
111
|
}
|
|
78
112
|
function executeQuery(pool, queryStr, params) {
|
|
79
113
|
return safeQuery(pool, queryStr, params);
|
|
@@ -118,19 +152,26 @@ function createBuilder(pool, registry, state) {
|
|
|
118
152
|
withDeleted() {
|
|
119
153
|
return createBuilder(pool, registry, { ...state, includeDeleted: true });
|
|
120
154
|
},
|
|
155
|
+
search(query, language) {
|
|
156
|
+
return createBuilder(pool, registry, {
|
|
157
|
+
...state,
|
|
158
|
+
searchQuery: query,
|
|
159
|
+
searchLanguage: language ?? state.searchLanguage
|
|
160
|
+
});
|
|
161
|
+
},
|
|
121
162
|
all() {
|
|
122
163
|
const g = guard();
|
|
123
164
|
if ('error' in g)
|
|
124
165
|
return errAsync(g.error);
|
|
125
166
|
const table = `"${state.slug}"`;
|
|
126
|
-
return executeQuery(pool,
|
|
167
|
+
return executeQuery(pool, `${buildSelectSql(state, table)}${buildWhereSql(state)}${buildOrderSql(state)}${buildLimitOffsetSql(state)}`, getWhereValues(state));
|
|
127
168
|
},
|
|
128
169
|
first() {
|
|
129
170
|
const g = guard();
|
|
130
171
|
if ('error' in g)
|
|
131
172
|
return errAsync(g.error);
|
|
132
173
|
const table = `"${state.slug}"`;
|
|
133
|
-
return executeQuery(pool,
|
|
174
|
+
return executeQuery(pool, `${buildSelectSql(state, table)}${buildWhereSql(state)}${buildOrderSql(state)} LIMIT 1`, getWhereValues(state))
|
|
134
175
|
.map((rows) => rows[0] ?? null);
|
|
135
176
|
},
|
|
136
177
|
count() {
|
|
@@ -191,7 +232,7 @@ function createBuilder(pool, registry, state) {
|
|
|
191
232
|
const totalDocs = Number(countRows[0]?.count ?? 0);
|
|
192
233
|
const totalPages = Math.ceil(totalDocs / safePerPage);
|
|
193
234
|
const pageOffset = (safePageNum - 1) * safePerPage;
|
|
194
|
-
return executeQuery(pool,
|
|
235
|
+
return executeQuery(pool, `${buildSelectSql(state, table)}${where}${buildOrderSql(state)} LIMIT ${safePerPage} OFFSET ${pageOffset}`, whereParams)
|
|
195
236
|
.map((docs) => ({
|
|
196
237
|
docs,
|
|
197
238
|
totalDocs,
|
|
@@ -214,7 +255,9 @@ export function createQueryBuilder(pool, registry) {
|
|
|
214
255
|
orderBys: [],
|
|
215
256
|
limitVal: null,
|
|
216
257
|
offsetVal: null,
|
|
217
|
-
includeDeleted: false
|
|
258
|
+
includeDeleted: false,
|
|
259
|
+
searchQuery: null,
|
|
260
|
+
searchLanguage: 'english'
|
|
218
261
|
});
|
|
219
262
|
}
|
|
220
263
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-builder.js","sourceRoot":"","sources":["../../src/db/query-builder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"query-builder.js","sourceRoot":"","sources":["../../src/db/query-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,QAAQ,EAAE,MAAM,YAAY,CAAA;AAGlD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAGjD,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACzF,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE3C,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC;IACjC,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO;IACtE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW;IACvE,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW;IACrE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS;IACpE,OAAO,EAAE,SAAS,EAAE,SAAS;CAC9B,CAAC,CAAA;AAEF,SAAS,gBAAgB,CAAE,IAAY;IACrC,OAAO,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAA;AACxD,CAAC;AA+BD,MAAM,YAAY,GAAkC;IAClD,MAAM,EAAE,GAAG;IACX,UAAU,EAAE,IAAI;IAChB,YAAY,EAAE,GAAG;IACjB,SAAS,EAAE,GAAG;IACd,qBAAqB,EAAE,IAAI;IAC3B,kBAAkB,EAAE,IAAI;IACxB,IAAI,EAAE,MAAM;IACZ,EAAE,EAAE,OAAO;IACX,MAAM,EAAE,aAAa;CACtB,CAAA;AAED,SAAS,YAAY,CAAE,IAAY;IACjC,OAAO,EAAE,IAAI,EAAE,YAAY,CAAC,aAAa,EAAE,OAAO,EAAE,uBAAuB,IAAI,EAAE,EAAE,CAAA;AACrF,CAAC;AAED,SAAS,cAAc,CAAE,KAAiB,EAAE,aAA0B;IACpE,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QAC7B,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,EAAE,aAAa,CAAC;YAAE,OAAO,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IAC3E,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC/B,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,EAAE,aAAa,CAAC;YAAE,OAAO,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IAC3E,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED,SAAS,gBAAgB,CAAE,IAAkB,EAAE,aAA0B;IACvE,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACpC,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,aAAa,CAAC;YAAE,OAAO,YAAY,CAAC,GAAG,CAAC,CAAA;IACnE,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED,SAAS,cAAc,CAAE,KAAiB,EAAE,KAAa;IACvD,IAAI,KAAK,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;QAC/B,MAAM,cAAc,GAAG,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACpD,MAAM,IAAI,GAAG,gBAAgB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;QACnD,OAAO,qDAAqD,IAAI,OAAO,cAAc,0BAA0B,KAAK,EAAE,CAAA;IACxH,CAAC;IACD,OAAO,iBAAiB,KAAK,EAAE,CAAA;AACjC,CAAC;AAED,SAAS,kBAAkB,CAAE,KAAiB;IAC5C,OAAO,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,MAAM,CAAA;AACjE,CAAC;AAED,SAAS,aAAa,CAAE,KAAiB;IACvC,MAAM,KAAK,GAAa,EAAE,CAAA;IAC1B,IAAI,QAAQ,GAAG,CAAC,CAAA;IAEhB,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;QAC1B,KAAK,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;IACpC,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,KAAK,GAAG,CAAA;QAC1B,IAAI,CAAC,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC5B,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAA;QAC7D,CAAC;aAAM,IAAI,CAAC,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YAC/B,QAAQ,EAAE,CAAA;YACV,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,WAAW,QAAQ,GAAG,CAAC,CAAA;QAC1C,CAAC;aAAM,CAAC;YACN,QAAQ,EAAE,CAAA;YACV,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,QAAQ,EAAE,CAAC,CAAA;QAC/D,CAAC;IACH,CAAC;IAED,IAAI,KAAK,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;QAC/B,MAAM,cAAc,GAAG,QAAQ,GAAG,CAAC,CAAA;QACnC,MAAM,IAAI,GAAG,gBAAgB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;QACnD,KAAK,CAAC,IAAI,CAAC,qCAAqC,IAAI,OAAO,cAAc,GAAG,CAAC,CAAA;IAC/E,CAAC;IAED,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;AAChE,CAAC;AAED,SAAS,aAAa,CAAE,KAAiB;IACvC,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA;QAClF,OAAO,aAAa,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAA;IACxC,CAAC;IACD,IAAI,KAAK,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;QAC/B,OAAO,4BAA4B,CAAA;IACrC,CAAC;IACD,OAAO,EAAE,CAAA;AACX,CAAC;AAED,SAAS,mBAAmB,CAAE,KAAiB;IAC7C,IAAI,GAAG,GAAG,EAAE,CAAA;IACZ,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI;QAAE,GAAG,IAAI,UAAU,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAA;IACtE,IAAI,KAAK,CAAC,SAAS,KAAK,IAAI;QAAE,GAAG,IAAI,WAAW,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAA;IACzE,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,SAAS,cAAc,CAAE,KAAiB;IACxC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM;SACxB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC;SACpC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IACpB,IAAI,KAAK,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;QAC/B,OAAO,CAAC,GAAG,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,CAAA;IACvC,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAED,SAAS,YAAY,CACnB,IAAY,EACZ,QAAgB,EAChB,MAAkB;IAElB,OAAO,SAAS,CAAI,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;AAC7C,CAAC;AAmBD,SAAS,aAAa,CACpB,IAAY,EACZ,QAA4B,EAC5B,KAAiB;IAEjB,SAAS,KAAK;QACZ,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YACnC,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,YAAY,CAAC,aAAa,EAAE,OAAO,EAAE,4BAA4B,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,CAAA;QAC3G,CAAC;QACD,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACvC,IAAI,MAAM,CAAC,KAAK,EAAE;YAAE,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAA;QAClD,MAAM,aAAa,GAAG,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACtD,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,EAAE,aAAa,CAAC,CAAA;QACrD,IAAI,QAAQ;YAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAA;QACxC,OAAO,EAAE,aAAa,EAAE,CAAA;IAC1B,CAAC;IAED,SAAS,SAAS,CAAE,WAAmB,EAAE,eAAyC,EAAE,UAAqB;QACvG,MAAM,WAAW,GAAG,UAAU,KAAK,SAAS,CAAA;QAC5C,MAAM,QAAQ,GAAkB,WAAW,CAAC,CAAC,CAAC,eAAgC,CAAC,CAAC,CAAC,QAAQ,CAAA;QACzF,MAAM,KAAK,GAAa,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,eAA2B,CAAA;QAC9E,OAAO,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE;YACnC,GAAG,KAAK;YACR,MAAM,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;SACnE,CAAC,CAAA;IACJ,CAAC;IAED,OAAO;QACL,KAAK,EAAE,SAA4C;QAEnD,OAAO,CAAE,CAAC,EAAE,SAAS;YACnB,OAAO,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE;gBACnC,GAAG,KAAK;gBACR,QAAQ,EAAE,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC;aACvD,CAAC,CAAA;QACJ,CAAC;QAED,KAAK,CAAE,CAAC;YACN,OAAO,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAA;QACjE,CAAC;QAED,MAAM,CAAE,CAAC;YACP,OAAO,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,GAAG,KAAK,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAA;QAClE,CAAC;QAED,WAAW;YACT,OAAO,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,GAAG,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAA;QAC1E,CAAC;QAED,MAAM,CAAE,KAAK,EAAE,QAAQ;YACrB,OAAO,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE;gBACnC,GAAG,KAAK;gBACR,WAAW,EAAE,KAAK;gBAClB,cAAc,EAAE,QAAQ,IAAI,KAAK,CAAC,cAAc;aACjD,CAAC,CAAA;QACJ,CAAC;QAED,GAAG;YACD,MAAM,CAAC,GAAG,KAAK,EAAE,CAAA;YACjB,IAAI,OAAO,IAAI,CAAC;gBAAE,OAAO,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;YAC1C,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,GAAG,CAAA;YAC/B,OAAO,YAAY,CAAM,IAAI,EAAE,GAAG,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC,KAAK,CAAC,EAAE,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;QACrK,CAAC;QAED,KAAK;YACH,MAAM,CAAC,GAAG,KAAK,EAAE,CAAA;YACjB,IAAI,OAAO,IAAI,CAAC;gBAAE,OAAO,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;YAC1C,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,GAAG,CAAA;YAC/B,OAAO,YAAY,CAAM,IAAI,EAAE,GAAG,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC;iBAC3I,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAE,IAAI,CAAC,CAAC,CAAmB,IAAI,IAAI,CAAC,CAAA;QAC3D,CAAC;QAED,KAAK;YACH,MAAM,CAAC,GAAG,KAAK,EAAE,CAAA;YACjB,IAAI,OAAO,IAAI,CAAC;gBAAE,OAAO,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;YAC1C,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,GAAG,CAAA;YAC/B,OAAO,YAAY,CAA2B,IAAI,EAAE,iCAAiC,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,EAAE,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC;iBACxI,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,CAAA;QAC7C,CAAC;QAED,MAAM,CAAK,IAAkB;YAC3B,MAAM,CAAC,GAAG,KAAK,EAAE,CAAA;YACjB,IAAI,OAAO,IAAI,CAAC;gBAAE,OAAO,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;YAC1C,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC,aAAa,CAAC,CAAA;YACvD,IAAI,OAAO;gBAAE,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAA;YACrC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC/C,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC/D,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,GAAG,CAAA;YAC/B,OAAO,YAAY,CAAM,IAAI,EAAE,eAAe,KAAK,KAAK,IAAI,aAAa,YAAY,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;iBACvH,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAM,CAAC,CAAA;QAC9B,CAAC;QAED,MAAM,CAAK,IAAkB;YAC3B,MAAM,CAAC,GAAG,KAAK,EAAE,CAAA;YACjB,IAAI,OAAO,IAAI,CAAC;gBAAE,OAAO,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;YAC1C,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC,aAAa,CAAC,CAAA;YACvD,IAAI,OAAO;gBAAE,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAA;YACrC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC9B,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,CAAC,CAAA;YACzC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,WAAW,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC3F,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,GAAG,CAAA;YAC/B,OAAO,YAAY,CAAM,IAAI,EAAE,UAAU,KAAK,QAAQ,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,GAAG,WAAW,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;iBAC7I,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAM,CAAC,CAAA;QAC9B,CAAC;QAED,MAAM;YACJ,MAAM,CAAC,GAAG,KAAK,EAAE,CAAA;YACjB,IAAI,OAAO,IAAI,CAAC;gBAAE,OAAO,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;YAC1C,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,GAAG,CAAA;YAC/B,OAAO,YAAY,CAAM,IAAI,EAAE,UAAU,KAAK,4BAA4B,aAAa,CAAC,KAAK,CAAC,cAAc,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC;iBACjI,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAM,CAAC,CAAA;QAC9B,CAAC;QAED,IAAI,CAAK,OAAe,EAAE,OAAe;YACvC,MAAM,CAAC,GAAG,KAAK,EAAE,CAAA;YACjB,IAAI,OAAO,IAAI,CAAC;gBAAE,OAAO,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;YAC1C,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,GAAG,CAAA;YAC/B,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,CAAA;YAClC,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,CAAC,CAAA;YACzC,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,CAAA;YACnC,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,CAAA;YAEnC,OAAO,YAAY,CAA2B,IAAI,EAAE,iCAAiC,KAAK,GAAG,KAAK,EAAE,EAAE,WAAW,CAAC;iBAC/G,OAAO,CAAC,SAAS,CAAC,EAAE;gBACnB,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC,CAAA;gBAClD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC,CAAA;gBACrD,MAAM,UAAU,GAAG,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,WAAW,CAAA;gBAElD,OAAO,YAAY,CAAM,IAAI,EAAE,GAAG,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,UAAU,WAAW,WAAW,UAAU,EAAE,EAAE,WAAW,CAAC;qBACpJ,GAAG,CAAC,CAAC,IAAI,EAAsB,EAAE,CAAC,CAAC;oBAClC,IAAI;oBACJ,SAAS;oBACT,IAAI,EAAE,WAAW;oBACjB,UAAU;oBACV,KAAK,EAAE,WAAW;oBAClB,WAAW,EAAE,WAAW,GAAG,UAAU;oBACrC,WAAW,EAAE,WAAW,GAAG,CAAC;iBAC7B,CAAC,CAAC,CAAA;YACP,CAAC,CAAC,CAAA;QACN,CAAC;KACF,CAAA;AACH,CAAC;AAMD,MAAM,UAAU,kBAAkB,CAAE,IAAY,EAAE,QAA4B;IAC5E,OAAO;QACL,KAAK,CAAE,IAAY;YACjB,OAAO,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE;gBACnC,IAAI;gBACJ,MAAM,EAAE,EAAE;gBACV,QAAQ,EAAE,EAAE;gBACZ,QAAQ,EAAE,IAAI;gBACd,SAAS,EAAE,IAAI;gBACf,cAAc,EAAE,KAAK;gBACrB,WAAW,EAAE,IAAI;gBACjB,cAAc,EAAE,SAAS;aAC1B,CAAC,CAAA;QACJ,CAAC;KACF,CAAA;AACH,CAAC"}
|
package/dist/db/query-types.d.ts
CHANGED
|
@@ -33,4 +33,8 @@ export interface PaginatedResult<T> {
|
|
|
33
33
|
readonly hasNextPage: boolean;
|
|
34
34
|
readonly hasPrevPage: boolean;
|
|
35
35
|
}
|
|
36
|
+
export interface SearchConfig {
|
|
37
|
+
readonly fields?: readonly string[] | undefined;
|
|
38
|
+
readonly language?: string | undefined;
|
|
39
|
+
}
|
|
36
40
|
//# sourceMappingURL=query-types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-types.d.ts","sourceRoot":"","sources":["../../src/db/query-types.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa;;;;;;;;;;CAUhB,CAAA;AAEV,MAAM,MAAM,aAAa,GAAG,OAAO,aAAa,CAAC,MAAM,OAAO,aAAa,CAAC,CAAA;AAE5E,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,CAAA;AAE/F,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAA;IAChC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAA;CACzB;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,GAAG,CAAC,EAAE,SAAS,cAAc,EAAE,GAAG,SAAS,CAAA;IACpD,QAAQ,CAAC,EAAE,CAAC,EAAE,SAAS,cAAc,EAAE,GAAG,SAAS,CAAA;CACpD;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAAA;CACnC;AAED,MAAM,WAAW,eAAe,CAAC,CAAC;IAChC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,CAAA;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAA;IAC7B,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAA;CAC9B"}
|
|
1
|
+
{"version":3,"file":"query-types.d.ts","sourceRoot":"","sources":["../../src/db/query-types.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa;;;;;;;;;;CAUhB,CAAA;AAEV,MAAM,MAAM,aAAa,GAAG,OAAO,aAAa,CAAC,MAAM,OAAO,aAAa,CAAC,CAAA;AAE5E,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,CAAA;AAE/F,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAA;IAChC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAA;CACzB;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,GAAG,CAAC,EAAE,SAAS,cAAc,EAAE,GAAG,SAAS,CAAA;IACpD,QAAQ,CAAC,EAAE,CAAC,EAAE,SAAS,cAAc,EAAE,GAAG,SAAS,CAAA;CACpD;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAAA;CACnC;AAED,MAAM,WAAW,eAAe,CAAC,CAAC;IAChC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,CAAA;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAA;IAC7B,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAA;CAC9B;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAA;IAC/C,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACvC"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { Result } from 'neverthrow';
|
|
2
|
+
import type { CollectionConfig } from '../schema/collection.js';
|
|
3
|
+
import type { CmsError } from '../schema/types.js';
|
|
4
|
+
export declare function generateSearchMigration(col: CollectionConfig): Result<string, CmsError>;
|
|
5
|
+
//# sourceMappingURL=search-migration.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"search-migration.d.ts","sourceRoot":"","sources":["../../src/db/search-migration.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAG/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AA6BlD,wBAAgB,uBAAuB,CAAE,GAAG,EAAE,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CA4CxF"}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { ok, err } from 'neverthrow';
|
|
2
|
+
import { CmsErrorCode } from '../schema/types.js';
|
|
3
|
+
import { isValidIdentifier } from './sql-sanitize.js';
|
|
4
|
+
const TEXT_FIELD_TYPES = new Set(['text', 'textarea', 'richtext', 'slug', 'email']);
|
|
5
|
+
function getSearchableFields(col) {
|
|
6
|
+
const searchConfig = col.search;
|
|
7
|
+
if (searchConfig !== undefined && searchConfig.fields !== undefined && searchConfig.fields.length > 0) {
|
|
8
|
+
return searchConfig.fields;
|
|
9
|
+
}
|
|
10
|
+
return col.fields
|
|
11
|
+
.filter(f => TEXT_FIELD_TYPES.has(f.type))
|
|
12
|
+
.map(f => f.name);
|
|
13
|
+
}
|
|
14
|
+
function getLanguage(col) {
|
|
15
|
+
const searchConfig = col.search;
|
|
16
|
+
if (searchConfig !== undefined && searchConfig.language !== undefined) {
|
|
17
|
+
return searchConfig.language;
|
|
18
|
+
}
|
|
19
|
+
return 'english';
|
|
20
|
+
}
|
|
21
|
+
function buildTsvectorExpression(fields, language) {
|
|
22
|
+
const parts = fields.map(f => `to_tsvector('${language}', COALESCE(NEW."${f}", ''))`);
|
|
23
|
+
return parts.join(' || ');
|
|
24
|
+
}
|
|
25
|
+
export function generateSearchMigration(col) {
|
|
26
|
+
const fields = getSearchableFields(col);
|
|
27
|
+
for (const f of fields) {
|
|
28
|
+
if (!isValidIdentifier(f)) {
|
|
29
|
+
return err({
|
|
30
|
+
code: CmsErrorCode.INVALID_INPUT,
|
|
31
|
+
message: `Invalid search field name: "${f}"`
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
if (fields.length === 0) {
|
|
36
|
+
return err({
|
|
37
|
+
code: CmsErrorCode.INVALID_INPUT,
|
|
38
|
+
message: `Collection "${col.slug}" has no searchable text fields`
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
const slug = col.slug;
|
|
42
|
+
const language = getLanguage(col);
|
|
43
|
+
const tsvectorExpr = buildTsvectorExpression(fields, language);
|
|
44
|
+
const functionName = `${slug}_search_vector_update`;
|
|
45
|
+
const triggerName = `${slug}_search_vector_trigger`;
|
|
46
|
+
const indexName = `idx_${slug}_search_vector`;
|
|
47
|
+
const sql = [
|
|
48
|
+
`-- Search vector migration for "${slug}"`,
|
|
49
|
+
`ALTER TABLE "${slug}" ADD COLUMN IF NOT EXISTS search_vector TSVECTOR;`,
|
|
50
|
+
'',
|
|
51
|
+
`CREATE INDEX IF NOT EXISTS "${indexName}" ON "${slug}" USING GIN (search_vector);`,
|
|
52
|
+
'',
|
|
53
|
+
`CREATE OR REPLACE FUNCTION "${functionName}"() RETURNS trigger AS $$`,
|
|
54
|
+
'BEGIN',
|
|
55
|
+
` NEW.search_vector := ${tsvectorExpr};`,
|
|
56
|
+
' RETURN NEW;',
|
|
57
|
+
'END;',
|
|
58
|
+
'$$ LANGUAGE plpgsql;',
|
|
59
|
+
'',
|
|
60
|
+
`DROP TRIGGER IF EXISTS "${triggerName}" ON "${slug}";`,
|
|
61
|
+
`CREATE TRIGGER "${triggerName}"`,
|
|
62
|
+
` BEFORE INSERT OR UPDATE ON "${slug}"`,
|
|
63
|
+
` FOR EACH ROW EXECUTE FUNCTION "${functionName}"();`
|
|
64
|
+
].join('\n');
|
|
65
|
+
return ok(sql);
|
|
66
|
+
}
|
|
67
|
+
//# sourceMappingURL=search-migration.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"search-migration.js","sourceRoot":"","sources":["../../src/db/search-migration.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { FieldConfig } from './field-types.js';
|
|
2
|
+
import type { SearchConfig } from '../db/query-types.js';
|
|
2
3
|
export interface CollectionLabels {
|
|
3
4
|
readonly singular: string;
|
|
4
5
|
readonly plural: string;
|
|
@@ -10,6 +11,7 @@ export interface CollectionConfig {
|
|
|
10
11
|
readonly timestamps: boolean;
|
|
11
12
|
readonly auth?: boolean | undefined;
|
|
12
13
|
readonly upload?: boolean | undefined;
|
|
14
|
+
readonly search?: SearchConfig | undefined;
|
|
13
15
|
}
|
|
14
16
|
type CollectionInput = Omit<CollectionConfig, 'timestamps'> & {
|
|
15
17
|
readonly timestamps?: boolean | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../../src/schema/collection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../../src/schema/collection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAExD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CACxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,MAAM,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAA;IAC9C,QAAQ,CAAC,MAAM,EAAE,SAAS,WAAW,EAAE,CAAA;IACvC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAA;IAC5B,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACnC,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACrC,QAAQ,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,SAAS,CAAA;CAC3C;AAED,KAAK,eAAe,GAAG,IAAI,CAAC,gBAAgB,EAAE,YAAY,CAAC,GAAG;IAC5D,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAC1C,CAAA;AAED,wBAAgB,UAAU,CAAE,KAAK,EAAE,eAAe,GAAG,gBAAgB,CAKpE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collection.js","sourceRoot":"","sources":["../../src/schema/collection.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"collection.js","sourceRoot":"","sources":["../../src/schema/collection.ts"],"names":[],"mappings":"AAsBA,MAAM,UAAU,UAAU,CAAE,KAAsB;IAChD,OAAO;QACL,GAAG,KAAK;QACR,UAAU,EAAE,KAAK,CAAC,UAAU,IAAI,IAAI;KACrC,CAAA;AACH,CAAC"}
|