@valencets/cms 0.5.0 → 0.6.1
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 +2 -0
- package/dist/admin/admin-routes.d.ts.map +1 -1
- package/dist/admin/admin-routes.js +7 -5
- package/dist/admin/admin-routes.js.map +1 -1
- package/dist/admin/edit-view.d.ts +9 -1
- package/dist/admin/edit-view.d.ts.map +1 -1
- package/dist/admin/edit-view.js +105 -35
- package/dist/admin/edit-view.js.map +1 -1
- package/dist/admin/editor/admin-client.js +1 -1
- package/dist/admin/editor/admin-client.js.map +1 -1
- package/dist/admin/field-renderers.d.ts +13 -1
- package/dist/admin/field-renderers.d.ts.map +1 -1
- package/dist/admin/field-renderers.js +48 -8
- package/dist/admin/field-renderers.js.map +1 -1
- package/dist/admin/layout.d.ts.map +1 -1
- package/dist/admin/layout.js +49 -2
- package/dist/admin/layout.js.map +1 -1
- package/dist/admin/list-view.d.ts +9 -0
- package/dist/admin/list-view.d.ts.map +1 -1
- package/dist/admin/list-view.js +109 -7
- package/dist/admin/list-view.js.map +1 -1
- package/dist/admin-client.js +1 -1
- package/dist/api/local-api.d.ts +14 -3
- package/dist/api/local-api.d.ts.map +1 -1
- package/dist/api/local-api.js +112 -7
- package/dist/api/local-api.js.map +1 -1
- package/dist/api/rest-api.d.ts +8 -1
- package/dist/api/rest-api.d.ts.map +1 -1
- package/dist/api/rest-api.js +76 -12
- package/dist/api/rest-api.js.map +1 -1
- package/dist/auth/auth-routes.d.ts.map +1 -1
- package/dist/auth/auth-routes.js +6 -3
- package/dist/auth/auth-routes.js.map +1 -1
- package/dist/auth/index.d.ts +1 -1
- package/dist/auth/index.d.ts.map +1 -1
- package/dist/auth/index.js +1 -1
- package/dist/auth/index.js.map +1 -1
- package/dist/auth/session.d.ts +7 -1
- package/dist/auth/session.d.ts.map +1 -1
- package/dist/auth/session.js +10 -3
- package/dist/auth/session.js.map +1 -1
- package/dist/config/cms-config.d.ts +12 -0
- package/dist/config/cms-config.d.ts.map +1 -1
- package/dist/config/cms-config.js +13 -3
- package/dist/config/cms-config.js.map +1 -1
- package/dist/config/index.d.ts +1 -1
- package/dist/config/index.d.ts.map +1 -1
- package/dist/db/column-helpers.d.ts +25 -0
- package/dist/db/column-helpers.d.ts.map +1 -0
- package/dist/db/column-helpers.js +34 -0
- package/dist/db/column-helpers.js.map +1 -0
- package/dist/db/migration-generator.d.ts +3 -3
- package/dist/db/migration-generator.d.ts.map +1 -1
- package/dist/db/migration-generator.js +27 -9
- package/dist/db/migration-generator.js.map +1 -1
- package/dist/db/query-builder.d.ts +3 -1
- package/dist/db/query-builder.d.ts.map +1 -1
- package/dist/db/query-builder.js +54 -14
- package/dist/db/query-builder.js.map +1 -1
- package/dist/db/sql-sanitize.d.ts.map +1 -1
- package/dist/db/sql-sanitize.js +5 -1
- package/dist/db/sql-sanitize.js.map +1 -1
- package/dist/hooks/hook-types.d.ts +5 -1
- package/dist/hooks/hook-types.d.ts.map +1 -1
- package/dist/index.d.ts +12 -7
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +7 -4
- package/dist/index.js.map +1 -1
- package/dist/media/image-processor.d.ts +17 -0
- package/dist/media/image-processor.d.ts.map +1 -0
- package/dist/media/image-processor.js +90 -0
- package/dist/media/image-processor.js.map +1 -0
- package/dist/media/index.d.ts +8 -3
- package/dist/media/index.d.ts.map +1 -1
- package/dist/media/index.js +4 -2
- package/dist/media/index.js.map +1 -1
- package/dist/media/media-config.d.ts +14 -0
- package/dist/media/media-config.d.ts.map +1 -1
- package/dist/media/media-config.js +8 -1
- package/dist/media/media-config.js.map +1 -1
- package/dist/media/serve-handler.d.ts +3 -1
- package/dist/media/serve-handler.d.ts.map +1 -1
- package/dist/media/serve-handler.js +39 -17
- package/dist/media/serve-handler.js.map +1 -1
- package/dist/media/storage-adapter.d.ts +10 -0
- package/dist/media/storage-adapter.d.ts.map +1 -0
- package/dist/media/storage-adapter.js +46 -0
- package/dist/media/storage-adapter.js.map +1 -0
- package/dist/media/upload-handler.d.ts +13 -1
- package/dist/media/upload-handler.d.ts.map +1 -1
- package/dist/media/upload-handler.js +140 -30
- package/dist/media/upload-handler.js.map +1 -1
- package/dist/scheduler.d.ts +7 -0
- package/dist/scheduler.d.ts.map +1 -0
- package/dist/scheduler.js +14 -0
- package/dist/scheduler.js.map +1 -0
- package/dist/schema/collection.d.ts +9 -1
- package/dist/schema/collection.d.ts.map +1 -1
- package/dist/schema/collection.js.map +1 -1
- package/dist/schema/index.d.ts +2 -2
- package/dist/schema/index.d.ts.map +1 -1
- package/dist/schema/index.js +1 -1
- package/dist/schema/index.js.map +1 -1
- package/dist/schema/types.d.ts +5 -0
- package/dist/schema/types.d.ts.map +1 -1
- package/dist/schema/types.js +4 -0
- package/dist/schema/types.js.map +1 -1
- package/dist/telemetry-scheduler.d.ts +14 -0
- package/dist/telemetry-scheduler.d.ts.map +1 -0
- package/dist/telemetry-scheduler.js +61 -0
- package/dist/telemetry-scheduler.js.map +1 -0
- package/dist/validation/index.d.ts +1 -1
- package/dist/validation/index.d.ts.map +1 -1
- package/dist/validation/index.js +1 -1
- package/dist/validation/index.js.map +1 -1
- package/dist/validation/zod-generator.d.ts +4 -0
- package/dist/validation/zod-generator.d.ts.map +1 -1
- package/dist/validation/zod-generator.js +12 -1
- package/dist/validation/zod-generator.js.map +1 -1
- package/package.json +4 -3
|
@@ -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;
|
|
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;AAElD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAWxD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CACvB;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAA;IAC9B,QAAQ,CAAC,OAAO,EAAE,SAAS,YAAY,EAAE,CAAA;IACzC,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CACxC;AAED,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,WAAW,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC1C,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3C,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7C,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3C,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAA;IACjD,QAAQ,CAAC,YAAY,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAA;CACvD;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,CAgE/E"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ok, err } from 'neverthrow';
|
|
2
|
+
import { CmsErrorCode } from '../schema/types.js';
|
|
2
3
|
import { createCollectionRegistry, createGlobalRegistry } from '../schema/registry.js';
|
|
3
4
|
import { createLocalApi } from '../api/local-api.js';
|
|
4
5
|
import { createRestRoutes } from '../api/rest-api.js';
|
|
@@ -12,6 +13,15 @@ export function buildCms(inputConfig) {
|
|
|
12
13
|
const config = inputConfig.plugins
|
|
13
14
|
? inputConfig.plugins.reduce((cfg, plugin) => plugin(cfg), inputConfig)
|
|
14
15
|
: inputConfig;
|
|
16
|
+
if (config.localization) {
|
|
17
|
+
if (config.localization.locales.length === 0) {
|
|
18
|
+
return err({ code: CmsErrorCode.INVALID_INPUT, message: 'localization.locales must contain at least one locale' });
|
|
19
|
+
}
|
|
20
|
+
const localeExists = config.localization.locales.some(l => l.code === config.localization?.defaultLocale);
|
|
21
|
+
if (!localeExists) {
|
|
22
|
+
return err({ code: CmsErrorCode.INVALID_INPUT, message: `defaultLocale "${config.localization.defaultLocale}" must exist in the locales array` });
|
|
23
|
+
}
|
|
24
|
+
}
|
|
15
25
|
const collections = createCollectionRegistry();
|
|
16
26
|
const globals = createGlobalRegistry();
|
|
17
27
|
for (const col of config.collections) {
|
|
@@ -27,9 +37,9 @@ export function buildCms(inputConfig) {
|
|
|
27
37
|
return err(result.error);
|
|
28
38
|
}
|
|
29
39
|
}
|
|
30
|
-
const api = createLocalApi(config.db, collections, globals);
|
|
31
|
-
const restRoutes = createRestRoutes(config.db, collections, globals);
|
|
32
|
-
const adminRoutes = createAdminRoutes(config.db, collections, { requireAuth: config.requireAuth, telemetryPool: config.telemetryPool, headTags: config.headTags });
|
|
40
|
+
const api = createLocalApi(config.db, collections, globals, config.localization?.defaultLocale);
|
|
41
|
+
const restRoutes = createRestRoutes(config.db, collections, globals, config.localization);
|
|
42
|
+
const adminRoutes = createAdminRoutes(config.db, collections, { requireAuth: config.requireAuth, telemetryPool: config.telemetryPool, telemetrySiteId: config.telemetrySiteId, sessionMaxAge: config.sessionMaxAge, headTags: config.headTags });
|
|
33
43
|
const hasAuthCollection = config.collections.some(c => isAuthEnabled(c));
|
|
34
44
|
if (hasAuthCollection) {
|
|
35
45
|
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;
|
|
1
|
+
{"version":3,"file":"cms-config.js","sourceRoot":"","sources":["../../src/config/cms-config.ts"],"names":[],"mappings":"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"}
|
package/dist/config/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export { buildCms } from './cms-config.js';
|
|
2
|
-
export type { CmsConfig, CmsInstance } from './cms-config.js';
|
|
2
|
+
export type { CmsConfig, CmsInstance, LocaleConfig, LocalizationConfig } from './cms-config.js';
|
|
3
3
|
export type { Plugin } from './plugin.js';
|
|
4
4
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC1C,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC1C,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAC/F,YAAY,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Column name utilities for custom SQL queries against CMS-managed tables.
|
|
3
|
+
*
|
|
4
|
+
* CMS system columns use snake_case in the database:
|
|
5
|
+
* id, created_at, updated_at, deleted_at
|
|
6
|
+
*
|
|
7
|
+
* User-defined field names are stored as-is (matching the name in valence.config.ts).
|
|
8
|
+
* If you define field.text({ name: 'avatarUrl' }), the column is "avatarUrl" (quoted).
|
|
9
|
+
* If you define field.text({ name: 'avatar_url' }), the column is avatar_url.
|
|
10
|
+
*/
|
|
11
|
+
/** System columns present on every CMS-managed table. Always snake_case. */
|
|
12
|
+
export declare const SYSTEM_COLUMNS: {
|
|
13
|
+
readonly id: "id";
|
|
14
|
+
readonly createdAt: "created_at";
|
|
15
|
+
readonly updatedAt: "updated_at";
|
|
16
|
+
readonly deletedAt: "deleted_at";
|
|
17
|
+
};
|
|
18
|
+
/** Convert a camelCase field name to its DB column name. System columns map to snake_case. */
|
|
19
|
+
export declare function toColumn(fieldName: string): string;
|
|
20
|
+
/**
|
|
21
|
+
* Build a SELECT clause from field names, mapping system columns to snake_case.
|
|
22
|
+
* @example selectColumns('id', 'username', 'createdAt') => 'id, username, created_at'
|
|
23
|
+
*/
|
|
24
|
+
export declare function selectColumns(...fields: string[]): string;
|
|
25
|
+
//# sourceMappingURL=column-helpers.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"column-helpers.d.ts","sourceRoot":"","sources":["../../src/db/column-helpers.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AAEH,4EAA4E;AAC5E,eAAO,MAAM,cAAc;;;;;CAKjB,CAAA;AAEV,8FAA8F;AAC9F,wBAAgB,QAAQ,CAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAInD;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAE,GAAG,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAE1D"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { isValidIdentifier } from './sql-sanitize.js';
|
|
2
|
+
/**
|
|
3
|
+
* Column name utilities for custom SQL queries against CMS-managed tables.
|
|
4
|
+
*
|
|
5
|
+
* CMS system columns use snake_case in the database:
|
|
6
|
+
* id, created_at, updated_at, deleted_at
|
|
7
|
+
*
|
|
8
|
+
* User-defined field names are stored as-is (matching the name in valence.config.ts).
|
|
9
|
+
* If you define field.text({ name: 'avatarUrl' }), the column is "avatarUrl" (quoted).
|
|
10
|
+
* If you define field.text({ name: 'avatar_url' }), the column is avatar_url.
|
|
11
|
+
*/
|
|
12
|
+
/** System columns present on every CMS-managed table. Always snake_case. */
|
|
13
|
+
export const SYSTEM_COLUMNS = {
|
|
14
|
+
id: 'id',
|
|
15
|
+
createdAt: 'created_at',
|
|
16
|
+
updatedAt: 'updated_at',
|
|
17
|
+
deletedAt: 'deleted_at'
|
|
18
|
+
};
|
|
19
|
+
/** Convert a camelCase field name to its DB column name. System columns map to snake_case. */
|
|
20
|
+
export function toColumn(fieldName) {
|
|
21
|
+
if (fieldName in SYSTEM_COLUMNS)
|
|
22
|
+
return SYSTEM_COLUMNS[fieldName];
|
|
23
|
+
if (!isValidIdentifier(fieldName))
|
|
24
|
+
return fieldName;
|
|
25
|
+
return /[A-Z]/.test(fieldName) ? `"${fieldName}"` : fieldName;
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* Build a SELECT clause from field names, mapping system columns to snake_case.
|
|
29
|
+
* @example selectColumns('id', 'username', 'createdAt') => 'id, username, created_at'
|
|
30
|
+
*/
|
|
31
|
+
export function selectColumns(...fields) {
|
|
32
|
+
return fields.map(toColumn).join(', ');
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=column-helpers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"column-helpers.js","sourceRoot":"","sources":["../../src/db/column-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAErD;;;;;;;;;GASG;AAEH,4EAA4E;AAC5E,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,EAAE,EAAE,IAAI;IACR,SAAS,EAAE,YAAY;IACvB,SAAS,EAAE,YAAY;IACvB,SAAS,EAAE,YAAY;CACf,CAAA;AAEV,8FAA8F;AAC9F,MAAM,UAAU,QAAQ,CAAE,SAAiB;IACzC,IAAI,SAAS,IAAI,cAAc;QAAE,OAAO,cAAc,CAAC,SAAwC,CAAC,CAAA;IAChG,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC;QAAE,OAAO,SAAS,CAAA;IACnD,OAAO,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,SAAS,GAAG,CAAC,CAAC,CAAC,SAAS,CAAA;AAC/D,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAE,GAAG,MAAgB;IAChD,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACxC,CAAC"}
|
|
@@ -7,12 +7,12 @@ export interface MigrationOutput {
|
|
|
7
7
|
readonly up: string;
|
|
8
8
|
readonly down: string;
|
|
9
9
|
}
|
|
10
|
-
export declare function generateCreateTableSql(collection: CollectionConfig): string;
|
|
10
|
+
export declare function generateCreateTableSql(collection: CollectionConfig, hasLocalization?: boolean): string;
|
|
11
11
|
export interface SchemaChanges {
|
|
12
12
|
readonly added: readonly FieldConfig[];
|
|
13
13
|
readonly removed: readonly string[];
|
|
14
14
|
readonly changed: readonly FieldConfig[];
|
|
15
15
|
}
|
|
16
|
-
export declare function generateAlterTableSql(slug: string, changes: SchemaChanges): string;
|
|
17
|
-
export declare function generateCreateTable(collection: CollectionConfig): Result<MigrationOutput, CmsError>;
|
|
16
|
+
export declare function generateAlterTableSql(slug: string, changes: SchemaChanges, hasLocalization?: boolean): string;
|
|
17
|
+
export declare function generateCreateTable(collection: CollectionConfig, hasLocalization?: boolean): Result<MigrationOutput, CmsError>;
|
|
18
18
|
//# sourceMappingURL=migration-generator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migration-generator.d.ts","sourceRoot":"","sources":["../../src/db/migration-generator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAE3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"migration-generator.d.ts","sourceRoot":"","sources":["../../src/db/migration-generator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAE3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAKlD,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB;AAsDD,wBAAgB,sBAAsB,CAAE,UAAU,EAAE,gBAAgB,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM,CAqDvG;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,KAAK,EAAE,SAAS,WAAW,EAAE,CAAA;IACtC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;IACnC,QAAQ,CAAC,OAAO,EAAE,SAAS,WAAW,EAAE,CAAA;CACzC;AAED,wBAAgB,qBAAqB,CAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM,CA0B9G;AAED,wBAAgB,mBAAmB,CAAE,UAAU,EAAE,gBAAgB,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,CAS/H"}
|
|
@@ -2,17 +2,21 @@ import { ok, err } from 'neverthrow';
|
|
|
2
2
|
import { CmsErrorCode } from '../schema/types.js';
|
|
3
3
|
import { getColumnType, getColumnConstraints } from './column-map.js';
|
|
4
4
|
import { isValidIdentifier } from './sql-sanitize.js';
|
|
5
|
+
import { getUploadConfig } from '../media/media-config.js';
|
|
5
6
|
function checkIdentifier(name) {
|
|
6
7
|
if (!isValidIdentifier(name)) {
|
|
7
8
|
return { code: CmsErrorCode.INVALID_INPUT, message: `Invalid SQL identifier: ${name}` };
|
|
8
9
|
}
|
|
9
10
|
return null;
|
|
10
11
|
}
|
|
11
|
-
function
|
|
12
|
+
function resolveColumnType(f, hasLocalization) {
|
|
13
|
+
return hasLocalization && f.localized ? 'JSONB' : getColumnType(f);
|
|
14
|
+
}
|
|
15
|
+
function buildColumnDef(f, hasLocalization) {
|
|
12
16
|
const idErr = checkIdentifier(f.name);
|
|
13
17
|
if (idErr)
|
|
14
18
|
return err(idErr);
|
|
15
|
-
const colType =
|
|
19
|
+
const colType = resolveColumnType(f, hasLocalization);
|
|
16
20
|
const constraints = getColumnConstraints(f);
|
|
17
21
|
const parts = [`"${f.name}" ${colType}`];
|
|
18
22
|
if (constraints)
|
|
@@ -50,7 +54,7 @@ function buildIndexStatements(collection) {
|
|
|
50
54
|
}
|
|
51
55
|
return ok(statements);
|
|
52
56
|
}
|
|
53
|
-
export function generateCreateTableSql(collection) {
|
|
57
|
+
export function generateCreateTableSql(collection, hasLocalization) {
|
|
54
58
|
const slugErr = checkIdentifier(collection.slug);
|
|
55
59
|
if (slugErr)
|
|
56
60
|
return `-- ERROR: ${slugErr.message}`;
|
|
@@ -58,11 +62,25 @@ export function generateCreateTableSql(collection) {
|
|
|
58
62
|
' "id" UUID PRIMARY KEY DEFAULT gen_random_uuid()'
|
|
59
63
|
];
|
|
60
64
|
for (const f of collection.fields) {
|
|
61
|
-
const colResult = buildColumnDef(f);
|
|
65
|
+
const colResult = buildColumnDef(f, hasLocalization ?? false);
|
|
62
66
|
if (colResult.isErr())
|
|
63
67
|
return `-- ERROR: ${colResult.error.message}`;
|
|
64
68
|
columns.push(` ${colResult.value}`);
|
|
65
69
|
}
|
|
70
|
+
const uploadConfig = getUploadConfig(collection);
|
|
71
|
+
if (uploadConfig !== null) {
|
|
72
|
+
if (uploadConfig.focalPoint) {
|
|
73
|
+
columns.push(' "focalX" NUMERIC DEFAULT 0.5');
|
|
74
|
+
columns.push(' "focalY" NUMERIC DEFAULT 0.5');
|
|
75
|
+
}
|
|
76
|
+
if (uploadConfig.imageSizes && uploadConfig.imageSizes.length > 0) {
|
|
77
|
+
columns.push(' "sizes" JSONB');
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
if (collection.versions?.drafts) {
|
|
81
|
+
columns.push(' "_status" TEXT NOT NULL DEFAULT \'draft\' CHECK ("_status" IN (\'draft\', \'published\'))');
|
|
82
|
+
columns.push(' "publish_at" TIMESTAMPTZ');
|
|
83
|
+
}
|
|
66
84
|
if (collection.timestamps) {
|
|
67
85
|
columns.push(' "created_at" TIMESTAMPTZ NOT NULL DEFAULT NOW()');
|
|
68
86
|
columns.push(' "updated_at" TIMESTAMPTZ NOT NULL DEFAULT NOW()');
|
|
@@ -84,13 +102,13 @@ export function generateCreateTableSql(collection) {
|
|
|
84
102
|
}
|
|
85
103
|
return parts.join('\n');
|
|
86
104
|
}
|
|
87
|
-
export function generateAlterTableSql(slug, changes) {
|
|
105
|
+
export function generateAlterTableSql(slug, changes, hasLocalization) {
|
|
88
106
|
const slugErr = checkIdentifier(slug);
|
|
89
107
|
if (slugErr)
|
|
90
108
|
return `-- ERROR: ${slugErr.message}`;
|
|
91
109
|
const statements = [];
|
|
92
110
|
for (const f of changes.added) {
|
|
93
|
-
const colResult = buildColumnDef(f);
|
|
111
|
+
const colResult = buildColumnDef(f, hasLocalization ?? false);
|
|
94
112
|
if (colResult.isErr())
|
|
95
113
|
return `-- ERROR: ${colResult.error.message}`;
|
|
96
114
|
statements.push(`ADD COLUMN ${colResult.value}`);
|
|
@@ -105,21 +123,21 @@ export function generateAlterTableSql(slug, changes) {
|
|
|
105
123
|
const nameErr = checkIdentifier(f.name);
|
|
106
124
|
if (nameErr)
|
|
107
125
|
return `-- ERROR: ${nameErr.message}`;
|
|
108
|
-
const colType =
|
|
126
|
+
const colType = resolveColumnType(f, hasLocalization ?? false);
|
|
109
127
|
statements.push(`ALTER COLUMN "${f.name}" TYPE ${colType}`);
|
|
110
128
|
}
|
|
111
129
|
if (statements.length === 0)
|
|
112
130
|
return '';
|
|
113
131
|
return `ALTER TABLE "${slug}"\n ${statements.join(',\n ')};`;
|
|
114
132
|
}
|
|
115
|
-
export function generateCreateTable(collection) {
|
|
133
|
+
export function generateCreateTable(collection, hasLocalization) {
|
|
116
134
|
const slugErr = checkIdentifier(collection.slug);
|
|
117
135
|
if (slugErr)
|
|
118
136
|
return err(slugErr);
|
|
119
137
|
const timestamp = Date.now();
|
|
120
138
|
return ok({
|
|
121
139
|
name: `${timestamp}_create_${collection.slug}`,
|
|
122
|
-
up: generateCreateTableSql(collection),
|
|
140
|
+
up: generateCreateTableSql(collection, hasLocalization),
|
|
123
141
|
down: `DROP TABLE IF EXISTS "${collection.slug}" CASCADE;`
|
|
124
142
|
});
|
|
125
143
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migration-generator.js","sourceRoot":"","sources":["../../src/db/migration-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAIpC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEjD,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"migration-generator.js","sourceRoot":"","sources":["../../src/db/migration-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,9 @@ export interface CollectionQueryBuilder {
|
|
|
20
20
|
limit(n: number): CollectionQueryBuilder;
|
|
21
21
|
offset(n: number): CollectionQueryBuilder;
|
|
22
22
|
withDeleted(): CollectionQueryBuilder;
|
|
23
|
+
includeDrafts(): CollectionQueryBuilder;
|
|
23
24
|
search(query: string, language?: string): CollectionQueryBuilder;
|
|
25
|
+
locale(code: string): CollectionQueryBuilder;
|
|
24
26
|
all<T = DocumentRow>(): ResultAsync<T[], CmsError>;
|
|
25
27
|
first<T = DocumentRow>(): ResultAsync<T | null, CmsError>;
|
|
26
28
|
count(): ResultAsync<number, CmsError>;
|
|
@@ -32,5 +34,5 @@ export interface CollectionQueryBuilder {
|
|
|
32
34
|
export interface QueryBuilderFactory {
|
|
33
35
|
query(slug: string): CollectionQueryBuilder;
|
|
34
36
|
}
|
|
35
|
-
export declare function createQueryBuilder(pool: DbPool, registry: CollectionRegistry): QueryBuilderFactory;
|
|
37
|
+
export declare function createQueryBuilder(pool: DbPool, registry: CollectionRegistry, defaultLocale?: string): QueryBuilderFactory;
|
|
36
38
|
//# sourceMappingURL=query-builder.d.ts.map
|
|
@@ -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;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;
|
|
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;AA8JD,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,aAAa,IAAK,sBAAsB,CAAA;IACxC,MAAM,CAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,sBAAsB,CAAA;IACjE,MAAM,CAAE,IAAI,EAAE,MAAM,GAAG,sBAAsB,CAAA;IAC7C,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;AAmKD,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAE,IAAI,EAAE,MAAM,GAAG,sBAAsB,CAAA;CAC7C;AAED,wBAAgB,kBAAkB,CAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAoB3H"}
|
package/dist/db/query-builder.js
CHANGED
|
@@ -44,12 +44,29 @@ function validateDataKeys(data, allowedFields) {
|
|
|
44
44
|
}
|
|
45
45
|
return null;
|
|
46
46
|
}
|
|
47
|
+
function escapeLocale(code) {
|
|
48
|
+
return code.replace(/'/g, "''");
|
|
49
|
+
}
|
|
50
|
+
function buildLocaleExtracts(state) {
|
|
51
|
+
if (state.locale === null || state.localizedFields.size === 0)
|
|
52
|
+
return '';
|
|
53
|
+
const defaultLocale = state.defaultLocale ?? state.locale;
|
|
54
|
+
const safeLocale = escapeLocale(state.locale);
|
|
55
|
+
const safeDefault = escapeLocale(defaultLocale);
|
|
56
|
+
return [...state.localizedFields].map(f => `COALESCE("${f}"->>'${safeLocale}', "${f}"->>'${safeDefault}') AS "${f}"`).join(', ');
|
|
57
|
+
}
|
|
47
58
|
function buildSelectSql(state, table) {
|
|
59
|
+
const extras = [];
|
|
60
|
+
const localeExtracts = buildLocaleExtracts(state);
|
|
61
|
+
if (localeExtracts.length > 0)
|
|
62
|
+
extras.push(localeExtracts);
|
|
48
63
|
if (state.searchQuery !== null) {
|
|
49
64
|
const searchParamIdx = getWhereParamCount(state) + 1;
|
|
50
65
|
const lang = sanitizeLanguage(state.searchLanguage);
|
|
51
|
-
|
|
66
|
+
extras.push(`ts_rank(search_vector, plainto_tsquery('${lang}', $${searchParamIdx})) AS search_rank`);
|
|
52
67
|
}
|
|
68
|
+
if (extras.length > 0)
|
|
69
|
+
return `SELECT *, ${extras.join(', ')} FROM ${table}`;
|
|
53
70
|
return `SELECT * FROM ${table}`;
|
|
54
71
|
}
|
|
55
72
|
function getWhereParamCount(state) {
|
|
@@ -61,6 +78,9 @@ function buildWhereSql(state) {
|
|
|
61
78
|
if (!state.includeDeleted) {
|
|
62
79
|
parts.push('"deleted_at" IS NULL');
|
|
63
80
|
}
|
|
81
|
+
if (state.isVersioned && !state.includeDrafts) {
|
|
82
|
+
parts.push('"_status" = \'published\'');
|
|
83
|
+
}
|
|
64
84
|
for (const w of state.wheres) {
|
|
65
85
|
const col = `"${w.field}"`;
|
|
66
86
|
if (w.operator === 'exists') {
|
|
@@ -120,11 +140,14 @@ function createBuilder(pool, registry, state) {
|
|
|
120
140
|
const result = registry.get(state.slug);
|
|
121
141
|
if (result.isErr())
|
|
122
142
|
return { error: result.error };
|
|
123
|
-
const
|
|
143
|
+
const collection = result.value;
|
|
144
|
+
const allowedFields = getValidFieldNames(collection);
|
|
124
145
|
const fieldErr = validateFields(state, allowedFields);
|
|
125
146
|
if (fieldErr)
|
|
126
147
|
return { error: fieldErr };
|
|
127
|
-
|
|
148
|
+
const isVersioned = result.value.versions?.drafts === true;
|
|
149
|
+
const localizedFields = new Set(collection.fields.filter(f => f.localized === true).map(f => f.name));
|
|
150
|
+
return { allowedFields, localizedFields, resolved: { ...state, isVersioned } };
|
|
128
151
|
}
|
|
129
152
|
function whereImpl(fieldOrName, operatorOrValue, maybeValue) {
|
|
130
153
|
const hasOperator = maybeValue !== undefined;
|
|
@@ -152,6 +175,9 @@ function createBuilder(pool, registry, state) {
|
|
|
152
175
|
withDeleted() {
|
|
153
176
|
return createBuilder(pool, registry, { ...state, includeDeleted: true });
|
|
154
177
|
},
|
|
178
|
+
includeDrafts() {
|
|
179
|
+
return createBuilder(pool, registry, { ...state, includeDrafts: true });
|
|
180
|
+
},
|
|
155
181
|
search(query, language) {
|
|
156
182
|
return createBuilder(pool, registry, {
|
|
157
183
|
...state,
|
|
@@ -159,19 +185,27 @@ function createBuilder(pool, registry, state) {
|
|
|
159
185
|
searchLanguage: language ?? state.searchLanguage
|
|
160
186
|
});
|
|
161
187
|
},
|
|
188
|
+
locale(code) {
|
|
189
|
+
return createBuilder(pool, registry, {
|
|
190
|
+
...state,
|
|
191
|
+
locale: code
|
|
192
|
+
});
|
|
193
|
+
},
|
|
162
194
|
all() {
|
|
163
195
|
const g = guard();
|
|
164
196
|
if ('error' in g)
|
|
165
197
|
return errAsync(g.error);
|
|
166
198
|
const table = `"${state.slug}"`;
|
|
167
|
-
|
|
199
|
+
const resolved = { ...g.resolved, localizedFields: g.localizedFields };
|
|
200
|
+
return executeQuery(pool, `${buildSelectSql(resolved, table)}${buildWhereSql(resolved)}${buildOrderSql(resolved)}${buildLimitOffsetSql(resolved)}`, getWhereValues(resolved));
|
|
168
201
|
},
|
|
169
202
|
first() {
|
|
170
203
|
const g = guard();
|
|
171
204
|
if ('error' in g)
|
|
172
205
|
return errAsync(g.error);
|
|
173
206
|
const table = `"${state.slug}"`;
|
|
174
|
-
|
|
207
|
+
const resolved = { ...g.resolved, localizedFields: g.localizedFields };
|
|
208
|
+
return executeQuery(pool, `${buildSelectSql(resolved, table)}${buildWhereSql(resolved)}${buildOrderSql(resolved)} LIMIT 1`, getWhereValues(resolved))
|
|
175
209
|
.map((rows) => rows[0] ?? null);
|
|
176
210
|
},
|
|
177
211
|
count() {
|
|
@@ -179,7 +213,7 @@ function createBuilder(pool, registry, state) {
|
|
|
179
213
|
if ('error' in g)
|
|
180
214
|
return errAsync(g.error);
|
|
181
215
|
const table = `"${state.slug}"`;
|
|
182
|
-
return executeQuery(pool, `SELECT COUNT(*) as count FROM ${table}${buildWhereSql(
|
|
216
|
+
return executeQuery(pool, `SELECT COUNT(*) as count FROM ${table}${buildWhereSql(g.resolved)}`, getWhereValues(g.resolved))
|
|
183
217
|
.map(rows => Number(rows[0]?.count ?? 0));
|
|
184
218
|
},
|
|
185
219
|
insert(data) {
|
|
@@ -204,10 +238,10 @@ function createBuilder(pool, registry, state) {
|
|
|
204
238
|
if (dataErr)
|
|
205
239
|
return errAsync(dataErr);
|
|
206
240
|
const keys = Object.keys(data);
|
|
207
|
-
const whereParams = getWhereValues(
|
|
241
|
+
const whereParams = getWhereValues(g.resolved);
|
|
208
242
|
const setClauses = keys.map((k, i) => `"${k}" = $${whereParams.length + i + 1}`).join(', ');
|
|
209
243
|
const table = `"${state.slug}"`;
|
|
210
|
-
return executeQuery(pool, `UPDATE ${table} SET ${setClauses}${buildWhereSql(
|
|
244
|
+
return executeQuery(pool, `UPDATE ${table} SET ${setClauses}${buildWhereSql(g.resolved)} RETURNING *`, [...whereParams, ...Object.values(data)])
|
|
211
245
|
.map(rows => rows[0]);
|
|
212
246
|
},
|
|
213
247
|
delete() {
|
|
@@ -215,7 +249,7 @@ function createBuilder(pool, registry, state) {
|
|
|
215
249
|
if ('error' in g)
|
|
216
250
|
return errAsync(g.error);
|
|
217
251
|
const table = `"${state.slug}"`;
|
|
218
|
-
return executeQuery(pool, `UPDATE ${table} SET "deleted_at" = NOW()${buildWhereSql(
|
|
252
|
+
return executeQuery(pool, `UPDATE ${table} SET "deleted_at" = NOW()${buildWhereSql(g.resolved)} RETURNING *`, getWhereValues(g.resolved))
|
|
219
253
|
.map(rows => rows[0]);
|
|
220
254
|
},
|
|
221
255
|
page(pageNum, perPage) {
|
|
@@ -223,8 +257,9 @@ function createBuilder(pool, registry, state) {
|
|
|
223
257
|
if ('error' in g)
|
|
224
258
|
return errAsync(g.error);
|
|
225
259
|
const table = `"${state.slug}"`;
|
|
226
|
-
const
|
|
227
|
-
const
|
|
260
|
+
const resolved = { ...g.resolved, localizedFields: g.localizedFields };
|
|
261
|
+
const where = buildWhereSql(resolved);
|
|
262
|
+
const whereParams = getWhereValues(resolved);
|
|
228
263
|
const safePerPage = Number(perPage);
|
|
229
264
|
const safePageNum = Number(pageNum);
|
|
230
265
|
return executeQuery(pool, `SELECT COUNT(*) as count FROM ${table}${where}`, whereParams)
|
|
@@ -232,7 +267,7 @@ function createBuilder(pool, registry, state) {
|
|
|
232
267
|
const totalDocs = Number(countRows[0]?.count ?? 0);
|
|
233
268
|
const totalPages = Math.ceil(totalDocs / safePerPage);
|
|
234
269
|
const pageOffset = (safePageNum - 1) * safePerPage;
|
|
235
|
-
return executeQuery(pool, `${buildSelectSql(
|
|
270
|
+
return executeQuery(pool, `${buildSelectSql(resolved, table)}${where}${buildOrderSql(resolved)} LIMIT ${safePerPage} OFFSET ${pageOffset}`, whereParams)
|
|
236
271
|
.map((docs) => ({
|
|
237
272
|
docs,
|
|
238
273
|
totalDocs,
|
|
@@ -246,7 +281,7 @@ function createBuilder(pool, registry, state) {
|
|
|
246
281
|
}
|
|
247
282
|
};
|
|
248
283
|
}
|
|
249
|
-
export function createQueryBuilder(pool, registry) {
|
|
284
|
+
export function createQueryBuilder(pool, registry, defaultLocale) {
|
|
250
285
|
return {
|
|
251
286
|
query(slug) {
|
|
252
287
|
return createBuilder(pool, registry, {
|
|
@@ -256,8 +291,13 @@ export function createQueryBuilder(pool, registry) {
|
|
|
256
291
|
limitVal: null,
|
|
257
292
|
offsetVal: null,
|
|
258
293
|
includeDeleted: false,
|
|
294
|
+
includeDrafts: false,
|
|
295
|
+
isVersioned: false,
|
|
259
296
|
searchQuery: null,
|
|
260
|
-
searchLanguage: 'english'
|
|
297
|
+
searchLanguage: 'english',
|
|
298
|
+
locale: null,
|
|
299
|
+
defaultLocale: defaultLocale ?? null,
|
|
300
|
+
localizedFields: new Set()
|
|
261
301
|
});
|
|
262
302
|
}
|
|
263
303
|
};
|
|
@@ -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":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql-sanitize.d.ts","sourceRoot":"","sources":["../../src/db/sql-sanitize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAQ/D,wBAAgB,iBAAiB,CAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAExD;AAED,wBAAgB,kBAAkB,CAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAKxD;AAED,wBAAgB,kBAAkB,CAAE,UAAU,EAAE,gBAAgB,GAAG,GAAG,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"sql-sanitize.d.ts","sourceRoot":"","sources":["../../src/db/sql-sanitize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAQ/D,wBAAgB,iBAAiB,CAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAExD;AAED,wBAAgB,kBAAkB,CAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAKxD;AAED,wBAAgB,kBAAkB,CAAE,UAAU,EAAE,gBAAgB,GAAG,GAAG,CAAC,MAAM,CAAC,CAU7E;AAED,wBAAgB,cAAc,CAAE,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,OAAO,CAEtF;AAED,wBAAgB,mBAAmB,CAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAE1D"}
|
package/dist/db/sql-sanitize.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
const IDENTIFIER_RE = /^[a-zA-
|
|
1
|
+
const IDENTIFIER_RE = /^[a-zA-Z_][a-zA-Z0-9_-]*$/;
|
|
2
2
|
const SYSTEM_COLUMNS = new Set([
|
|
3
3
|
'id', 'created_at', 'updated_at', 'deleted_at'
|
|
4
4
|
]);
|
|
@@ -16,6 +16,10 @@ export function getValidFieldNames(collection) {
|
|
|
16
16
|
for (const f of collection.fields) {
|
|
17
17
|
names.add(f.name);
|
|
18
18
|
}
|
|
19
|
+
if (collection.versions?.drafts) {
|
|
20
|
+
names.add('_status');
|
|
21
|
+
names.add('publish_at');
|
|
22
|
+
}
|
|
19
23
|
return names;
|
|
20
24
|
}
|
|
21
25
|
export function isAllowedField(fieldName, allowedFields) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql-sanitize.js","sourceRoot":"","sources":["../../src/db/sql-sanitize.ts"],"names":[],"mappings":"AAEA,MAAM,aAAa,GAAG,
|
|
1
|
+
{"version":3,"file":"sql-sanitize.js","sourceRoot":"","sources":["../../src/db/sql-sanitize.ts"],"names":[],"mappings":"AAEA,MAAM,aAAa,GAAG,2BAA2B,CAAA;AAEjD,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC;IAC7B,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY;CAC/C,CAAC,CAAA;AAEF,MAAM,UAAU,iBAAiB,CAAE,IAAY;IAC7C,OAAO,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,EAAE,CAAA;AACtD,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAE,IAAY;IAC9C,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7B,OAAO,EAAE,CAAA;IACX,CAAC;IACD,OAAO,IAAI,IAAI,GAAG,CAAA;AACpB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAE,UAA4B;IAC9D,MAAM,KAAK,GAAG,IAAI,GAAG,CAAS,cAAc,CAAC,CAAA;IAC7C,KAAK,MAAM,CAAC,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;QAClC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IACnB,CAAC;IACD,IAAI,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;QAChC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QACpB,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;IACzB,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAED,MAAM,UAAU,cAAc,CAAE,SAAiB,EAAE,aAA0B;IAC3E,OAAO,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,iBAAiB,CAAC,SAAS,CAAC,CAAA;AACrE,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAE,KAAa;IAChD,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;AAClC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export interface HookData {
|
|
2
|
-
readonly [key: string]: string | number | boolean | null | undefined;
|
|
2
|
+
readonly [key: string]: string | number | boolean | null | readonly string[] | readonly number[] | undefined;
|
|
3
3
|
}
|
|
4
4
|
export interface HookArgs {
|
|
5
5
|
readonly data: HookData;
|
|
@@ -15,6 +15,10 @@ export interface CollectionHooks {
|
|
|
15
15
|
readonly afterRead?: readonly HookFunction[] | undefined;
|
|
16
16
|
readonly beforeDelete?: readonly HookFunction[] | undefined;
|
|
17
17
|
readonly afterDelete?: readonly HookFunction[] | undefined;
|
|
18
|
+
readonly beforePublish?: readonly HookFunction[] | undefined;
|
|
19
|
+
readonly afterPublish?: readonly HookFunction[] | undefined;
|
|
20
|
+
readonly beforeUnpublish?: readonly HookFunction[] | undefined;
|
|
21
|
+
readonly afterUnpublish?: readonly HookFunction[] | undefined;
|
|
18
22
|
}
|
|
19
23
|
export interface FieldHooks {
|
|
20
24
|
readonly beforeValidate?: readonly HookFunction[] | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hook-types.d.ts","sourceRoot":"","sources":["../../src/hooks/hook-types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"hook-types.d.ts","sourceRoot":"","sources":["../../src/hooks/hook-types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,GAAG,SAAS,CAAA;CAC7G;AAED,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;IACvB,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAChC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACzC;AAED,MAAM,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE,QAAQ,KAAK,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAA;AAEnG,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,cAAc,CAAC,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,CAAA;IAC7D,QAAQ,CAAC,YAAY,CAAC,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,CAAA;IAC3D,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,CAAA;IAC1D,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,CAAA;IACzD,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,CAAA;IACxD,QAAQ,CAAC,YAAY,CAAC,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,CAAA;IAC3D,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,CAAA;IAC1D,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,CAAA;IAC5D,QAAQ,CAAC,YAAY,CAAC,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,CAAA;IAC3D,QAAQ,CAAC,eAAe,CAAC,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,CAAA;IAC9D,QAAQ,CAAC,cAAc,CAAC,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,CAAA;CAC9D;AAED,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,cAAc,CAAC,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,CAAA;IAC7D,QAAQ,CAAC,YAAY,CAAC,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,CAAA;IAC3D,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,CAAA;IAC1D,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,CAAA;CACzD"}
|