@appweaver/data 2.4.1 → 2.6.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/README.md +4 -2
- package/config.d.ts +3 -0
- package/config.js +3 -0
- package/database/database-config.d.ts +9 -0
- package/database/database-config.js +56 -1
- package/database/database-error.d.ts +8 -0
- package/database/database-error.js +18 -0
- package/database/prisma-database.js +18 -1
- package/database/setup-database.d.ts +23 -0
- package/database/setup-database.js +59 -0
- package/database/sqlserver-extension.d.ts +18 -0
- package/database/sqlserver-extension.js +183 -0
- package/database/telemetry-extension.d.ts +10 -0
- package/database/telemetry-extension.js +52 -0
- package/export/export-service.js +4 -0
- package/factory/create-model.d.ts +1 -1
- package/factory/create-model.js +135 -5
- package/factory/create-service.js +8 -0
- package/index.d.ts +3 -0
- package/index.js +6 -0
- package/internal.d.ts +2 -0
- package/internal.js +3 -1
- package/module.js +23 -3
- package/package.json +3 -3
- package/prisma/client/browser.d.ts +10 -0
- package/prisma/client/client.d.ts +10 -0
- package/prisma/client/commonInputTypes.d.ts +81 -0
- package/prisma/client/enums.d.ts +6 -1
- package/prisma/client/enums.js +6 -0
- package/prisma/client/internal/class.d.ts +22 -0
- package/prisma/client/internal/class.js +4 -4
- package/prisma/client/internal/prismaNamespace.d.ts +175 -1
- package/prisma/client/internal/prismaNamespace.js +19 -1
- package/prisma/client/internal/prismaNamespaceBrowser.d.ts +20 -0
- package/prisma/client/internal/prismaNamespaceBrowser.js +19 -1
- package/prisma/client/models/TwoFactorMethod.d.ts +1140 -0
- package/prisma/client/models/TwoFactorMethod.js +2 -0
- package/prisma/client/models/TwoFactorRecoveryCode.d.ts +1005 -0
- package/prisma/client/models/TwoFactorRecoveryCode.js +2 -0
- package/prisma/client/models.d.ts +2 -0
- package/resource/resource-service.d.ts +32 -7
- package/resource/resource-service.js +248 -35
- package/resource/schemas/resource-filter-schema.d.ts +8 -0
- package/resource/schemas/resource-filter-schema.js +40 -1
- package/resource/schemas/resource-sort-schema.js +10 -0
- package/resource/utils/cursor-util.d.ts +13 -0
- package/resource/utils/cursor-util.js +21 -0
- package/resource/utils/filter-util.d.ts +9 -0
- package/resource/utils/filter-util.js +17 -0
- package/resource/utils/prune-util.js +3 -1
- package/resource/utils/sort-util.d.ts +14 -0
- package/resource/utils/sort-util.js +1 -0
- package/resource/utils/where-util.d.ts +20 -0
- package/resource/utils/where-util.js +210 -0
- package/resources.d.ts +4 -0
- package/resources.js +17 -9
- package/security/auth-config.d.ts +3 -0
- package/security/auth-config.js +6 -1
- package/security/create-auth-resources.d.ts +3 -3
- package/security/create-auth-resources.js +44 -7
- package/security/helper.d.ts +6 -0
- package/security/helper.js +11 -0
- package/security/resources/two-factor-method/model.d.ts +2 -0
- package/security/resources/two-factor-method/model.js +64 -0
- package/security/resources/two-factor-method/service.d.ts +2 -0
- package/security/resources/two-factor-method/service.js +7 -0
- package/security/resources/two-factor-recovery-code/model.d.ts +2 -0
- package/security/resources/two-factor-recovery-code/model.js +49 -0
- package/security/resources/two-factor-recovery-code/service.d.ts +2 -0
- package/security/resources/two-factor-recovery-code/service.js +7 -0
- package/security/store/database-security-store.d.ts +2 -2
- package/security/store/database-security-store.js +11 -1
- package/seeder/create-seeder.d.ts +3 -0
- package/seeder/create-seeder.js +6 -2
- package/seeder/seeder.d.ts +4 -2
- package/seeder/seeder.js +56 -23
- package/spatial/geo-schema.d.ts +22 -0
- package/spatial/geo-schema.js +60 -0
- package/spatial/spatial-config.d.ts +21 -0
- package/spatial/spatial-config.js +52 -0
- package/spatial/spatial-engine.d.ts +78 -0
- package/spatial/spatial-engine.js +232 -0
- package/spatial/spatial-extension.d.ts +10 -0
- package/spatial/spatial-extension.js +100 -0
- package/spatial/spatial-service.d.ts +54 -0
- package/spatial/spatial-service.js +213 -0
- package/spatial/utils/box-util.d.ts +31 -0
- package/spatial/utils/box-util.js +62 -0
- package/timeseries/database-series-config.d.ts +5 -0
- package/timeseries/database-series-config.js +15 -0
- package/timeseries/database-time-series.d.ts +36 -0
- package/timeseries/database-time-series.js +147 -0
- package/timeseries/index.d.ts +2 -0
- package/timeseries/index.js +18 -0
- package/timeseries/timescale-config.d.ts +6 -0
- package/timeseries/timescale-config.js +19 -0
- package/timeseries/timescale-time-series.d.ts +21 -0
- package/timeseries/timescale-time-series.js +158 -0
- package/timeseries/utils/series-sql-util.d.ts +90 -0
- package/timeseries/utils/series-sql-util.js +313 -0
- package/types/generated.d.ts +92 -0
- package/utils/schema-util.d.ts +8 -0
- package/utils/schema-util.js +22 -0
- package/utils/write-data-util.d.ts +22 -0
- package/utils/write-data-util.js +144 -0
package/README.md
CHANGED
|
@@ -20,12 +20,14 @@
|
|
|
20
20
|
- **Resources** – `createModel`, `createService` and `createPolicy`, the resource services with filtering, sorting,
|
|
21
21
|
cursor pagination, aggregation and CSV export, and the transactions.
|
|
22
22
|
- **Auth data model** – `createAuthModel`, `createAuthService`, roles, permissions, API keys, one-time tokens,
|
|
23
|
-
connected accounts and password hashing.
|
|
23
|
+
connected accounts, the two-factor methods and recovery codes, and password hashing.
|
|
24
24
|
- **Files** – `FileService` with the File model, storing the files in any `Storage` provider.
|
|
25
25
|
- **Seeders** – `createSeeder` and the database security store.
|
|
26
|
+
- **Time series** – the `database` and `timescale` (TimescaleDB hypertables) stores of the `series` fields of the
|
|
27
|
+
models, written to `<Model>Series` tables with their retention.
|
|
26
28
|
|
|
27
29
|
The framework models reach only the applications using them: the auth tables with an auth model, File with a model
|
|
28
|
-
declaring `files`, Seeder with a seeders directory
|
|
30
|
+
declaring `files`, Seeder with a seeders directory, and the series tables with a model declaring `series`.
|
|
29
31
|
|
|
30
32
|
## Installation
|
|
31
33
|
|
package/config.d.ts
CHANGED
|
@@ -3,4 +3,7 @@ export * from './database/database-config';
|
|
|
3
3
|
export * from './export/export-config';
|
|
4
4
|
export * from './resource/resource-config';
|
|
5
5
|
export * from './security/auth-config';
|
|
6
|
+
export * from './spatial/spatial-config';
|
|
6
7
|
export * from './storage/image-config';
|
|
8
|
+
export * from './timeseries/database-series-config';
|
|
9
|
+
export * from './timeseries/timescale-config';
|
package/config.js
CHANGED
|
@@ -19,4 +19,7 @@ __exportStar(require("./database/database-config"), exports);
|
|
|
19
19
|
__exportStar(require("./export/export-config"), exports);
|
|
20
20
|
__exportStar(require("./resource/resource-config"), exports);
|
|
21
21
|
__exportStar(require("./security/auth-config"), exports);
|
|
22
|
+
__exportStar(require("./spatial/spatial-config"), exports);
|
|
22
23
|
__exportStar(require("./storage/image-config"), exports);
|
|
24
|
+
__exportStar(require("./timeseries/database-series-config"), exports);
|
|
25
|
+
__exportStar(require("./timeseries/timescale-config"), exports);
|
|
@@ -2,6 +2,7 @@ import { DatabaseEvent, DatabaseType } from '@appweaver/common';
|
|
|
2
2
|
export declare const databaseConfig: Readonly<{
|
|
3
3
|
TYPE?: DatabaseType | undefined;
|
|
4
4
|
URL: string;
|
|
5
|
+
MIGRATION_URL: string;
|
|
5
6
|
SCHEMA_PATH: string;
|
|
6
7
|
MIGRATIONS_DIR_PATH: string;
|
|
7
8
|
SEEDERS_DIR_PATH: string;
|
|
@@ -13,3 +14,11 @@ export declare const databaseConfig: Readonly<{
|
|
|
13
14
|
SLOW_QUERY_THRESHOLD: number;
|
|
14
15
|
PROVIDER: string;
|
|
15
16
|
}>;
|
|
17
|
+
/**
|
|
18
|
+
* Returns the URL the migrations run with: `database.migrationUrl`, or `database.url` when it is not set.
|
|
19
|
+
*
|
|
20
|
+
* @return {string} The connection URL of the migrations.
|
|
21
|
+
* @throws {ConfigurationError} `CONFIGURATION_INVALID` when the migration URL points to another type of database, or
|
|
22
|
+
* another database name, than the URL of the application, i.e. an environment overriding one URL but not the other.
|
|
23
|
+
*/
|
|
24
|
+
export declare function migrationUrl(): string;
|
|
@@ -1,13 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.databaseConfig = void 0;
|
|
7
|
+
exports.migrationUrl = migrationUrl;
|
|
8
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
4
9
|
const typebox_1 = require("@sinclair/typebox");
|
|
5
10
|
const common_1 = require("@appweaver/common");
|
|
6
11
|
exports.databaseConfig = (0, common_1.defineConfig)('database', {
|
|
7
12
|
/** Database type. Values: `sqlite`, `postgresql`, `mysql`, `sqlserver`. */
|
|
8
13
|
TYPE: typebox_1.Type.Optional(typebox_1.Type.Enum(common_1.DatabaseType)),
|
|
9
|
-
/** Database connection URL/DSN. Default: `''`. */
|
|
14
|
+
/** Database connection URL/DSN the application queries the data with. Default: `''`. */
|
|
10
15
|
URL: typebox_1.Type.String({ default: '' }),
|
|
16
|
+
/** Database connection URL/DSN of the migrations (`prisma.config.ts`) and of the database setup of `weaver migrate`,
|
|
17
|
+
* i.e. a user owning the tables, or a direct connection beside the pooled one of `URL`. Default: `''` (the `URL`). */
|
|
18
|
+
MIGRATION_URL: typebox_1.Type.String({ default: '' }),
|
|
11
19
|
/** Path to a Prisma schema file. Default: `'./database/schema.prisma'`. */
|
|
12
20
|
SCHEMA_PATH: typebox_1.Type.String({
|
|
13
21
|
default: './database/schema.prisma'
|
|
@@ -41,3 +49,50 @@ exports.databaseConfig = (0, common_1.defineConfig)('database', {
|
|
|
41
49
|
/** Database provider: `auto` or `prisma`, or `none` for an application without a database. Default: `'auto'`. */
|
|
42
50
|
PROVIDER: typebox_1.Type.String({ default: 'auto' })
|
|
43
51
|
});
|
|
52
|
+
/**
|
|
53
|
+
* Returns the URL the migrations run with: `database.migrationUrl`, or `database.url` when it is not set.
|
|
54
|
+
*
|
|
55
|
+
* @return {string} The connection URL of the migrations.
|
|
56
|
+
* @throws {ConfigurationError} `CONFIGURATION_INVALID` when the migration URL points to another type of database, or
|
|
57
|
+
* another database name, than the URL of the application, i.e. an environment overriding one URL but not the other.
|
|
58
|
+
*/
|
|
59
|
+
function migrationUrl() {
|
|
60
|
+
const url = exports.databaseConfig.URL;
|
|
61
|
+
const migration = exports.databaseConfig.MIGRATION_URL;
|
|
62
|
+
if (!migration || !url) {
|
|
63
|
+
return migration || url;
|
|
64
|
+
}
|
|
65
|
+
// Compared by the URLs alone, since database.type names the type of both
|
|
66
|
+
const type = (0, common_1.resolveDatabaseType)(undefined, url);
|
|
67
|
+
const migrationType = (0, common_1.resolveDatabaseType)(undefined, migration);
|
|
68
|
+
const name = databaseName(url);
|
|
69
|
+
const migrationName = databaseName(migration);
|
|
70
|
+
if (type !== migrationType || name !== migrationName) {
|
|
71
|
+
const describe = (dbType, dbName) => `the ${dbType} database${dbName ? ` ${dbName}` : ''}`;
|
|
72
|
+
throw new common_1.ConfigurationError(common_1.ErrorCode.ConfigurationInvalid, `DATABASE_MIGRATION_URL (config.database.migrationUrl) points to ${describe(migrationType, migrationName)}, ` +
|
|
73
|
+
`while DATABASE_URL (config.database.url) points to ${describe(type, name)}`);
|
|
74
|
+
}
|
|
75
|
+
return migration;
|
|
76
|
+
}
|
|
77
|
+
/** The name of the database of a connection URL, or the path of a SQLite file. */
|
|
78
|
+
function databaseName(url) {
|
|
79
|
+
if (/^sqlserver:/i.test(url)) {
|
|
80
|
+
return /;\s*(?:database|initial catalog)\s*=\s*([^;]+)/i
|
|
81
|
+
.exec(url)?.[1]
|
|
82
|
+
?.trim();
|
|
83
|
+
}
|
|
84
|
+
if (/^(postgres(ql)?|mysql|mariadb):/i.test(url)) {
|
|
85
|
+
try {
|
|
86
|
+
return decodeURIComponent(new URL(url).pathname.slice(1)) || undefined;
|
|
87
|
+
}
|
|
88
|
+
catch {
|
|
89
|
+
return undefined;
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
// With forward slashes on every platform, so a Windows path compares and reads the same
|
|
93
|
+
const file = url
|
|
94
|
+
.replace(/^file:/, '')
|
|
95
|
+
.split('?')[0]
|
|
96
|
+
.replace(/\\/g, '/');
|
|
97
|
+
return node_path_1.default.posix.normalize(file);
|
|
98
|
+
}
|
|
@@ -40,6 +40,14 @@ export declare function isPrismaError(error: unknown): error is PrismaError;
|
|
|
40
40
|
* cause, or the error as it is.
|
|
41
41
|
*/
|
|
42
42
|
export declare function toDatabaseError(error: unknown, model?: string): unknown;
|
|
43
|
+
/**
|
|
44
|
+
* Checks whether an error was raised because the user of the connection lacks a privilege, i.e. a PostgreSQL
|
|
45
|
+
* `insufficient_privilege` (`42501`) on a `CREATE` or on a table the user does not own.
|
|
46
|
+
*
|
|
47
|
+
* @param {unknown} error The error an operation failed with.
|
|
48
|
+
* @return {boolean} Whether the database refused the operation for a missing privilege.
|
|
49
|
+
*/
|
|
50
|
+
export declare function isPrivilegeError(error: unknown): boolean;
|
|
43
51
|
/**
|
|
44
52
|
* Returns the explanation of a Prisma error, without the invocation and the
|
|
45
53
|
* code frame its message starts with, i.e. "Unique constraint failed on the
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.isPrismaError = isPrismaError;
|
|
4
4
|
exports.toDatabaseError = toDatabaseError;
|
|
5
|
+
exports.isPrivilegeError = isPrivilegeError;
|
|
5
6
|
exports.prismaErrorMessage = prismaErrorMessage;
|
|
6
7
|
const common_1 = require("@appweaver/common");
|
|
7
8
|
const core_1 = require("@appweaver/core");
|
|
@@ -86,6 +87,23 @@ function toDatabaseError(error, model) {
|
|
|
86
87
|
};
|
|
87
88
|
return new common_1.DatabaseError(code, violationMessage(code, subject, fields), details, options);
|
|
88
89
|
}
|
|
90
|
+
/**
|
|
91
|
+
* Checks whether an error was raised because the user of the connection lacks a privilege, i.e. a PostgreSQL
|
|
92
|
+
* `insufficient_privilege` (`42501`) on a `CREATE` or on a table the user does not own.
|
|
93
|
+
*
|
|
94
|
+
* @param {unknown} error The error an operation failed with.
|
|
95
|
+
* @return {boolean} Whether the database refused the operation for a missing privilege.
|
|
96
|
+
*/
|
|
97
|
+
function isPrivilegeError(error) {
|
|
98
|
+
for (let current = error, depth = 0; current && depth < 5; current = current.cause, depth++) {
|
|
99
|
+
// A raw query error of the driver adapter, or the error of the driver itself
|
|
100
|
+
const cause = current.meta?.driverAdapterError?.cause ?? current;
|
|
101
|
+
if (cause.code === '42501') {
|
|
102
|
+
return true;
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
return false;
|
|
106
|
+
}
|
|
89
107
|
/**
|
|
90
108
|
* Returns the explanation of a Prisma error, without the invocation and the
|
|
91
109
|
* code frame its message starts with, i.e. "Unique constraint failed on the
|
|
@@ -4,6 +4,9 @@ exports.PrismaDatabase = void 0;
|
|
|
4
4
|
const common_1 = require("@appweaver/common");
|
|
5
5
|
const database_config_1 = require("./database-config");
|
|
6
6
|
const create_client_1 = require("./create-client");
|
|
7
|
+
const sqlserver_extension_1 = require("./sqlserver-extension");
|
|
8
|
+
const spatial_extension_1 = require("../spatial/spatial-extension");
|
|
9
|
+
const telemetry_extension_1 = require("./telemetry-extension");
|
|
7
10
|
const internal_1 = require("@appweaver/core/internal");
|
|
8
11
|
const logger = (0, common_1.createLogger)('database');
|
|
9
12
|
// Members that act on the connection itself, never on a transaction
|
|
@@ -125,7 +128,21 @@ class PrismaDatabase extends common_1.Database {
|
|
|
125
128
|
/** @internal */
|
|
126
129
|
clientInstance() {
|
|
127
130
|
if (!this._client) {
|
|
128
|
-
|
|
131
|
+
const dbType = (0, common_1.resolveDatabaseType)(database_config_1.databaseConfig.TYPE, database_config_1.databaseConfig.URL);
|
|
132
|
+
// The outer extension runs first, so the geo values are normalized
|
|
133
|
+
// before SQL Server serializes the JSON fields, and the telemetry
|
|
134
|
+
// extension last, so the span of an operation covers only its query
|
|
135
|
+
let client = (0, create_client_1.createClient)();
|
|
136
|
+
if ((0, common_1.telemetryEnabled)('database')) {
|
|
137
|
+
client = client.$extends((0, telemetry_extension_1.telemetryExtension)(dbType));
|
|
138
|
+
}
|
|
139
|
+
if ([...internal_1.context.resource.models.values()].some((model) => (0, common_1.hasGeo)(model.config))) {
|
|
140
|
+
client = client.$extends((0, spatial_extension_1.spatialExtension)());
|
|
141
|
+
}
|
|
142
|
+
if (dbType === common_1.DatabaseType.SQLServer) {
|
|
143
|
+
client = client.$extends((0, sqlserver_extension_1.sqlServerExtension)(this));
|
|
144
|
+
}
|
|
145
|
+
this._client = client;
|
|
129
146
|
}
|
|
130
147
|
return this._client;
|
|
131
148
|
}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
export type SetupDatabaseParams = {
|
|
2
|
+
/** The directory of the application source code the models are loaded from. (default: ./dist/src) */
|
|
3
|
+
scanPath?: string;
|
|
4
|
+
};
|
|
5
|
+
export type SetupDatabaseResult = {
|
|
6
|
+
/** The directory the models were loaded from */
|
|
7
|
+
scanPath: string;
|
|
8
|
+
/** Whether the directory exists, the setup being skipped otherwise, i.e. before the build */
|
|
9
|
+
built: boolean;
|
|
10
|
+
/** The parts set up, empty when the models need none */
|
|
11
|
+
parts: string[];
|
|
12
|
+
};
|
|
13
|
+
/**
|
|
14
|
+
* Sets up the parts of the database the Prisma migrations do not hold, which the application otherwise sets up when
|
|
15
|
+
* it starts: the hypertables and the policies of the `timescale` time series provider, and the geometry triggers of
|
|
16
|
+
* the `postgis` spatial provider. Run by `weaver migrate` with the user of `database.migrationUrl`, so the user of the
|
|
17
|
+
* application needs no privilege to change the schema.
|
|
18
|
+
*
|
|
19
|
+
* @param {SetupDatabaseParams} [params={}] - The setup parameters.
|
|
20
|
+
* @return {Promise<SetupDatabaseResult>} The parts set up, and whether the models were built.
|
|
21
|
+
* @throws {ConfigurationError} `CONFIGURATION_INVALID` when a part cannot be set up, i.e. without the extension.
|
|
22
|
+
*/
|
|
23
|
+
export declare function setupDatabase(params?: SetupDatabaseParams): Promise<SetupDatabaseResult>;
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.setupDatabase = setupDatabase;
|
|
7
|
+
const node_fs_1 = __importDefault(require("node:fs"));
|
|
8
|
+
const common_1 = require("@appweaver/common");
|
|
9
|
+
const core_1 = require("@appweaver/core");
|
|
10
|
+
const internal_1 = require("@appweaver/core/internal");
|
|
11
|
+
const resource_loader_1 = require("../resource/resource-loader");
|
|
12
|
+
const spatial_config_1 = require("../spatial/spatial-config");
|
|
13
|
+
const spatial_engine_1 = require("../spatial/spatial-engine");
|
|
14
|
+
const spatial_service_1 = require("../spatial/spatial-service");
|
|
15
|
+
const timescale_time_series_1 = require("../timeseries/timescale-time-series");
|
|
16
|
+
/**
|
|
17
|
+
* Sets up the parts of the database the Prisma migrations do not hold, which the application otherwise sets up when
|
|
18
|
+
* it starts: the hypertables and the policies of the `timescale` time series provider, and the geometry triggers of
|
|
19
|
+
* the `postgis` spatial provider. Run by `weaver migrate` with the user of `database.migrationUrl`, so the user of the
|
|
20
|
+
* application needs no privilege to change the schema.
|
|
21
|
+
*
|
|
22
|
+
* @param {SetupDatabaseParams} [params={}] - The setup parameters.
|
|
23
|
+
* @return {Promise<SetupDatabaseResult>} The parts set up, and whether the models were built.
|
|
24
|
+
* @throws {ConfigurationError} `CONFIGURATION_INVALID` when a part cannot be set up, i.e. without the extension.
|
|
25
|
+
*/
|
|
26
|
+
async function setupDatabase(params = {}) {
|
|
27
|
+
const scanPath = (0, common_1.resolveSourcePath)(common_1.appConfig.BUILD_PATH, common_1.appConfig.SOURCE_PATH, params.scanPath, './dist/src');
|
|
28
|
+
if (!node_fs_1.default.existsSync(scanPath)) {
|
|
29
|
+
return { scanPath, built: false, parts: [] };
|
|
30
|
+
}
|
|
31
|
+
const modules = await (0, core_1.discoverModules)({ scanPath });
|
|
32
|
+
await (0, internal_1.loadProviders)(modules, scanPath);
|
|
33
|
+
await (0, resource_loader_1.loadResources)(scanPath, undefined, modules.flatMap(({ module }) => module.resources ? [module.resources] : []));
|
|
34
|
+
const store = (0, core_1.inject)(common_1.TimeSeries, false);
|
|
35
|
+
const seriesModels = store instanceof timescale_time_series_1.TimescaleTimeSeries
|
|
36
|
+
? ((0, core_1.inject)(core_1.TimeSeriesService, false)?.models() ?? [])
|
|
37
|
+
: [];
|
|
38
|
+
const spatial = (0, core_1.inject)(spatial_service_1.SpatialService, false);
|
|
39
|
+
const geoModels = spatial && (0, spatial_config_1.spatialProvider)() === 'postgis' ? spatial.models() : [];
|
|
40
|
+
const parts = [];
|
|
41
|
+
if (seriesModels.length === 0 && geoModels.length === 0) {
|
|
42
|
+
return { scanPath, built: true, parts };
|
|
43
|
+
}
|
|
44
|
+
const db = (0, core_1.inject)(common_1.Database);
|
|
45
|
+
try {
|
|
46
|
+
if (seriesModels.length > 0) {
|
|
47
|
+
await store.register(seriesModels);
|
|
48
|
+
parts.push('time series hypertables');
|
|
49
|
+
}
|
|
50
|
+
if (geoModels.length > 0) {
|
|
51
|
+
await new spatial_engine_1.PostgisSpatialEngine(db).setup(geoModels);
|
|
52
|
+
parts.push('spatial geometry triggers');
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
finally {
|
|
56
|
+
await db.disconnect();
|
|
57
|
+
}
|
|
58
|
+
return { scanPath, built: true, parts };
|
|
59
|
+
}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/** The database the extension runs its queries on. */
|
|
2
|
+
export type ExtendedDatabase = {
|
|
3
|
+
/** Returns the client running in the transaction of the current call */
|
|
4
|
+
client<T = any>(): T;
|
|
5
|
+
/** Runs a function in a transaction, or in the current one */
|
|
6
|
+
transaction<T>(fn: (tx: any) => Promise<T>): Promise<T>;
|
|
7
|
+
};
|
|
8
|
+
/**
|
|
9
|
+
* Creates the Prisma client extension of SQL Server, which has no JSON type and rejects the referential actions forming
|
|
10
|
+
* a cycle or a second path between two tables. The JSON fields are stored serialized in a string column, so they are
|
|
11
|
+
* serialized on every write and parsed in every result. A delete first applies the actions on delete SQL Server leaves
|
|
12
|
+
* to the data layer (see `sqlServerForeignKeys`), cascading to or setting null the referencing records, in the
|
|
13
|
+
* transaction of the delete.
|
|
14
|
+
*
|
|
15
|
+
* @param {ExtendedDatabase} database - The database whose transaction-aware client runs the referential actions.
|
|
16
|
+
* @return {Object} The Prisma client extension.
|
|
17
|
+
*/
|
|
18
|
+
export declare function sqlServerExtension(database: ExtendedDatabase): any;
|
|
@@ -0,0 +1,183 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.sqlServerExtension = sqlServerExtension;
|
|
4
|
+
const common_1 = require("@appweaver/common");
|
|
5
|
+
const internal_1 = require("@appweaver/core/internal");
|
|
6
|
+
const write_data_util_1 = require("../utils/write-data-util");
|
|
7
|
+
// The operations whose result holds no records
|
|
8
|
+
const COUNT_OPERATIONS = new Set([
|
|
9
|
+
'count',
|
|
10
|
+
'aggregate',
|
|
11
|
+
'groupBy',
|
|
12
|
+
'createMany',
|
|
13
|
+
'updateMany',
|
|
14
|
+
'deleteMany'
|
|
15
|
+
]);
|
|
16
|
+
let cached;
|
|
17
|
+
/**
|
|
18
|
+
* Creates the Prisma client extension of SQL Server, which has no JSON type and rejects the referential actions forming
|
|
19
|
+
* a cycle or a second path between two tables. The JSON fields are stored serialized in a string column, so they are
|
|
20
|
+
* serialized on every write and parsed in every result. A delete first applies the actions on delete SQL Server leaves
|
|
21
|
+
* to the data layer (see `sqlServerForeignKeys`), cascading to or setting null the referencing records, in the
|
|
22
|
+
* transaction of the delete.
|
|
23
|
+
*
|
|
24
|
+
* @param {ExtendedDatabase} database - The database whose transaction-aware client runs the referential actions.
|
|
25
|
+
* @return {Object} The Prisma client extension.
|
|
26
|
+
*/
|
|
27
|
+
function sqlServerExtension(database) {
|
|
28
|
+
return {
|
|
29
|
+
name: 'appweaver-sqlserver',
|
|
30
|
+
query: {
|
|
31
|
+
$allModels: {
|
|
32
|
+
async $allOperations({ model, operation, args, query }) {
|
|
33
|
+
const schema = sqlServerSchema();
|
|
34
|
+
if ((operation === 'delete' || operation === 'deleteMany') &&
|
|
35
|
+
schema.deleteActions.has(model)) {
|
|
36
|
+
if (!(0, internal_1.currentTransaction)()) {
|
|
37
|
+
return database.transaction((tx) => tx[(0, common_1.uncapitalize)(model)][operation](args));
|
|
38
|
+
}
|
|
39
|
+
const client = database.client();
|
|
40
|
+
const records = await client[(0, common_1.uncapitalize)(model)].findMany({
|
|
41
|
+
where: args?.where,
|
|
42
|
+
select: { id: true }
|
|
43
|
+
});
|
|
44
|
+
await applyDeleteActions(client, model, records.map((record) => record.id));
|
|
45
|
+
}
|
|
46
|
+
const result = await query(serializeArgs(model, operation, args));
|
|
47
|
+
return COUNT_OPERATIONS.has(operation)
|
|
48
|
+
? result
|
|
49
|
+
: parseJsonFields(model, result);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
/**
|
|
56
|
+
* Cascades to or sets null the records referencing the deleted ones through a foreign key whose action on delete
|
|
57
|
+
* SQL Server leaves to the data layer, and does the same for the records the database cascade deletes with them. A
|
|
58
|
+
* cascade of the data layer deletes through the extension again, so it applies the actions of its records too.
|
|
59
|
+
*/
|
|
60
|
+
async function applyDeleteActions(client, modelName, ids) {
|
|
61
|
+
const { foreignKeys, deleteActions } = sqlServerSchema();
|
|
62
|
+
if (ids.length === 0) {
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
for (const fk of foreignKeys) {
|
|
66
|
+
if (fk.referencedName !== modelName ||
|
|
67
|
+
fk.dbOnDelete !== 'cascade' ||
|
|
68
|
+
!deleteActions.has(fk.modelName)) {
|
|
69
|
+
continue;
|
|
70
|
+
}
|
|
71
|
+
const cascaded = await client[(0, common_1.uncapitalize)(fk.modelName)].findMany({
|
|
72
|
+
where: { [fk.foreignKey]: { in: ids } },
|
|
73
|
+
select: { id: true }
|
|
74
|
+
});
|
|
75
|
+
await applyDeleteActions(client, fk.modelName, cascaded.map((record) => record.id));
|
|
76
|
+
}
|
|
77
|
+
for (const fk of (0, common_1.emulatedForeignKeys)(foreignKeys, modelName)) {
|
|
78
|
+
const delegate = client[(0, common_1.uncapitalize)(fk.modelName)];
|
|
79
|
+
const referencing = {
|
|
80
|
+
[fk.foreignKey]: { in: ids },
|
|
81
|
+
// The deleted records referencing each other are deleted anyway
|
|
82
|
+
...(fk.modelName === modelName ? { id: { notIn: ids } } : {})
|
|
83
|
+
};
|
|
84
|
+
if (fk.onDelete === 'cascade') {
|
|
85
|
+
await delegate.deleteMany({ where: referencing });
|
|
86
|
+
}
|
|
87
|
+
else {
|
|
88
|
+
await delegate.updateMany({
|
|
89
|
+
where: referencing,
|
|
90
|
+
data: { [fk.foreignKey]: null }
|
|
91
|
+
});
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
/** Serializes the JSON fields of the data a write operation stores. */
|
|
96
|
+
function serializeArgs(modelName, operation, args) {
|
|
97
|
+
return (0, write_data_util_1.mapWriteArgs)(modelName, operation, args, serializeRecord);
|
|
98
|
+
}
|
|
99
|
+
/** Serializes the JSON fields of the data of a record. */
|
|
100
|
+
function serializeRecord(modelName, data) {
|
|
101
|
+
const jsonFields = sqlServerSchema().jsonFields.get(modelName);
|
|
102
|
+
const serialized = { ...data };
|
|
103
|
+
for (const [key, value] of Object.entries(data)) {
|
|
104
|
+
if (jsonFields?.has(key) && value !== undefined) {
|
|
105
|
+
serialized[key] = serializeJson(value);
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
return serialized;
|
|
109
|
+
}
|
|
110
|
+
/** Serializes a JSON value, storing the null sentinels of Prisma as null. */
|
|
111
|
+
function serializeJson(value) {
|
|
112
|
+
if (value === null || isNullSentinel(value)) {
|
|
113
|
+
return null;
|
|
114
|
+
}
|
|
115
|
+
return JSON.stringify(value);
|
|
116
|
+
}
|
|
117
|
+
/** Whether a value is `Prisma.DbNull`, `Prisma.JsonNull` or `Prisma.AnyNull`. */
|
|
118
|
+
function isNullSentinel(value) {
|
|
119
|
+
return (typeof value === 'object' &&
|
|
120
|
+
value !== null &&
|
|
121
|
+
/^(Db|Json|Any)Null(Class)?$/.test(value.constructor?.name ?? ''));
|
|
122
|
+
}
|
|
123
|
+
/** Parses the JSON fields of the records of a result, and of their included relations. */
|
|
124
|
+
function parseJsonFields(modelName, result) {
|
|
125
|
+
return (0, write_data_util_1.mapResultRecords)(modelName, result, parseRecord);
|
|
126
|
+
}
|
|
127
|
+
/** Parses the JSON fields of a record. */
|
|
128
|
+
function parseRecord(modelName, record) {
|
|
129
|
+
const jsonFields = sqlServerSchema().jsonFields.get(modelName);
|
|
130
|
+
for (const [key, value] of Object.entries(record)) {
|
|
131
|
+
if (jsonFields?.has(key) && typeof value === 'string') {
|
|
132
|
+
record[key] = JSON.parse(value);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
return record;
|
|
136
|
+
}
|
|
137
|
+
/**
|
|
138
|
+
* The models whose delete needs the actions of the data layer: the ones referenced through a foreign key whose action
|
|
139
|
+
* the database leaves out, and the ones the database cascades from to such a model.
|
|
140
|
+
*/
|
|
141
|
+
function deleteActionModels(foreignKeys) {
|
|
142
|
+
const models = new Set(foreignKeys
|
|
143
|
+
.filter((fk) => (0, common_1.emulatedForeignKeys)([fk], fk.referencedName).length > 0)
|
|
144
|
+
.map((fk) => fk.referencedName));
|
|
145
|
+
for (let size = -1; size !== models.size;) {
|
|
146
|
+
size = models.size;
|
|
147
|
+
for (const fk of foreignKeys) {
|
|
148
|
+
if (fk.dbOnDelete === 'cascade' && models.has(fk.modelName)) {
|
|
149
|
+
models.add(fk.referencedName);
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
return models;
|
|
154
|
+
}
|
|
155
|
+
/** Derives the schema of the loaded models, recomputed when the models change. */
|
|
156
|
+
function sqlServerSchema() {
|
|
157
|
+
const loaded = [
|
|
158
|
+
...internal_1.context.resource.models.values()
|
|
159
|
+
];
|
|
160
|
+
if (cached?.models.length === loaded.length &&
|
|
161
|
+
cached.models.every((model, i) => model === loaded[i])) {
|
|
162
|
+
return cached.schema;
|
|
163
|
+
}
|
|
164
|
+
const models = Object.fromEntries(loaded.map((m) => [m.name, m]));
|
|
165
|
+
const jsonFields = new Map();
|
|
166
|
+
for (const model of Object.values(models)) {
|
|
167
|
+
jsonFields.set(model.name, new Set([
|
|
168
|
+
...Object.entries(model.config.scalars ?? {})
|
|
169
|
+
.filter(([, scalar]) => scalar.type === 'json')
|
|
170
|
+
.map(([field]) => field),
|
|
171
|
+
// A geo field holds its GeoJSON geometry
|
|
172
|
+
...Object.keys(model.config.geo ?? {})
|
|
173
|
+
]));
|
|
174
|
+
}
|
|
175
|
+
const foreignKeys = (0, common_1.sqlServerForeignKeys)(models);
|
|
176
|
+
const schema = {
|
|
177
|
+
foreignKeys,
|
|
178
|
+
deleteActions: deleteActionModels(foreignKeys),
|
|
179
|
+
jsonFields
|
|
180
|
+
};
|
|
181
|
+
cached = { models: loaded, schema };
|
|
182
|
+
return schema;
|
|
183
|
+
}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { DatabaseType } from '@appweaver/common';
|
|
2
|
+
/**
|
|
3
|
+
* Creates the Prisma client extension tracing every operation of the client in a client span named after the
|
|
4
|
+
* operation and its model (`findMany User`, `$queryRaw`), and measuring its duration. Neither the query nor its
|
|
5
|
+
* arguments are recorded.
|
|
6
|
+
*
|
|
7
|
+
* @param {DatabaseType} dbType - The type of the database.
|
|
8
|
+
* @return {Object} The Prisma client extension.
|
|
9
|
+
*/
|
|
10
|
+
export declare function telemetryExtension(dbType: DatabaseType): any;
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.telemetryExtension = telemetryExtension;
|
|
4
|
+
const common_1 = require("@appweaver/common");
|
|
5
|
+
// The names of the databases in the OpenTelemetry semantic conventions
|
|
6
|
+
const DB_SYSTEMS = {
|
|
7
|
+
[common_1.DatabaseType.Sqlite]: 'sqlite',
|
|
8
|
+
[common_1.DatabaseType.PostgreSQL]: 'postgresql',
|
|
9
|
+
[common_1.DatabaseType.MySQL]: 'mysql',
|
|
10
|
+
[common_1.DatabaseType.SQLServer]: 'microsoft.sql_server'
|
|
11
|
+
};
|
|
12
|
+
const operationDuration = (0, common_1.telemetryHistogram)('db.client.operation.duration', {
|
|
13
|
+
description: 'Duration of the database operations.',
|
|
14
|
+
unit: 's',
|
|
15
|
+
advice: { explicitBucketBoundaries: common_1.DURATION_BUCKETS }
|
|
16
|
+
});
|
|
17
|
+
/**
|
|
18
|
+
* Creates the Prisma client extension tracing every operation of the client in a client span named after the
|
|
19
|
+
* operation and its model (`findMany User`, `$queryRaw`), and measuring its duration. Neither the query nor its
|
|
20
|
+
* arguments are recorded.
|
|
21
|
+
*
|
|
22
|
+
* @param {DatabaseType} dbType - The type of the database.
|
|
23
|
+
* @return {Object} The Prisma client extension.
|
|
24
|
+
*/
|
|
25
|
+
function telemetryExtension(dbType) {
|
|
26
|
+
const system = DB_SYSTEMS[dbType];
|
|
27
|
+
return {
|
|
28
|
+
name: 'appweaver-telemetry',
|
|
29
|
+
query: {
|
|
30
|
+
$allOperations({ model, operation, args, query }) {
|
|
31
|
+
const attributes = {
|
|
32
|
+
'db.system.name': system,
|
|
33
|
+
'db.operation.name': operation,
|
|
34
|
+
...(model ? { 'db.collection.name': model } : {})
|
|
35
|
+
};
|
|
36
|
+
const start = performance.now();
|
|
37
|
+
// The query starts in the same tick, so it stays in the transaction
|
|
38
|
+
// of a batch
|
|
39
|
+
return (0, common_1.withSpan)(model ? `${operation} ${model}` : operation, { kind: common_1.SpanKind.CLIENT, attributes }, () => query(args)).then((result) => {
|
|
40
|
+
(0, common_1.recordDuration)(operationDuration(), start, attributes);
|
|
41
|
+
return result;
|
|
42
|
+
}, (error) => {
|
|
43
|
+
(0, common_1.recordDuration)(operationDuration(), start, {
|
|
44
|
+
...attributes,
|
|
45
|
+
'error.type': (0, common_1.spanErrorType)(error)
|
|
46
|
+
});
|
|
47
|
+
throw error;
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
};
|
|
52
|
+
}
|
package/export/export-service.js
CHANGED
|
@@ -155,6 +155,10 @@ class ExportService {
|
|
|
155
155
|
}
|
|
156
156
|
}
|
|
157
157
|
}
|
|
158
|
+
// A geometry is written as its GeoJSON
|
|
159
|
+
if (resourceModel.config.geo?.[key] && (0, common_1.isPlainObject)(value)) {
|
|
160
|
+
value = JSON.stringify(value);
|
|
161
|
+
}
|
|
158
162
|
// Recursively map relation and file fields if the value is an object.
|
|
159
163
|
// Arrays of plain values are written as a single column below.
|
|
160
164
|
if ((0, common_1.isPlainObject)(value) || (isArrayValue && (0, common_1.isPlainObject)(value[0]))) {
|
|
@@ -8,4 +8,4 @@ import { ResourceModel, ResourceModelConfig } from '@appweaver/common';
|
|
|
8
8
|
* @param {boolean} [override=false] - Whether to replace a model already defined under the same name.
|
|
9
9
|
* @return {ResourceModel} The created resource model.
|
|
10
10
|
*/
|
|
11
|
-
export declare function createModel<S extends string, R extends string, F extends string, V extends string>(modelConfig: ResourceModelConfig<S, R, F, V>, override?: boolean): ResourceModel;
|
|
11
|
+
export declare function createModel<S extends string, R extends string, F extends string, V extends string, G extends string>(modelConfig: ResourceModelConfig<S, R, F, V, never, G>, override?: boolean): ResourceModel;
|