@antelopejs/rethinkdb 1.5.0 → 1.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/README.md +36 -16
- package/dist/config.d.ts +25 -0
- package/dist/config.js +106 -0
- package/dist/config.js.map +1 -0
- package/dist/connection.d.ts +16 -1
- package/dist/connection.js +95 -6
- package/dist/connection.js.map +1 -1
- package/dist/implementations/catalog/discovery.d.ts +11 -0
- package/dist/implementations/catalog/discovery.js +209 -0
- package/dist/implementations/catalog/discovery.js.map +1 -0
- package/dist/implementations/catalog/index.d.ts +7 -0
- package/dist/implementations/catalog/index.js +65 -0
- package/dist/implementations/catalog/index.js.map +1 -0
- package/dist/implementations/catalog/locate.d.ts +10 -0
- package/dist/implementations/catalog/locate.js +36 -0
- package/dist/implementations/catalog/locate.js.map +1 -0
- package/dist/implementations/catalog/measures.d.ts +21 -0
- package/dist/implementations/catalog/measures.js +126 -0
- package/dist/implementations/catalog/measures.js.map +1 -0
- package/dist/implementations/catalog/profile.d.ts +2 -0
- package/dist/implementations/catalog/profile.js +218 -0
- package/dist/implementations/catalog/profile.js.map +1 -0
- package/dist/implementations/catalog/reference.d.ts +2 -0
- package/dist/implementations/catalog/reference.js +63 -0
- package/dist/implementations/catalog/reference.js.map +1 -0
- package/dist/implementations/catalog/rows.d.ts +2 -0
- package/dist/implementations/catalog/rows.js +44 -0
- package/dist/implementations/catalog/rows.js.map +1 -0
- package/dist/implementations/catalog/text.d.ts +4 -0
- package/dist/implementations/catalog/text.js +13 -0
- package/dist/implementations/catalog/text.js.map +1 -0
- package/dist/implementations/database/atomic.d.ts +1 -1
- package/dist/implementations/database/atomic.js +17 -10
- package/dist/implementations/database/atomic.js.map +1 -1
- package/dist/implementations/database/expression.js +1 -1
- package/dist/implementations/database/expression.js.map +1 -1
- package/dist/implementations/database/external-descriptor.d.ts +36 -0
- package/dist/implementations/database/external-descriptor.js +154 -0
- package/dist/implementations/database/external-descriptor.js.map +1 -0
- package/dist/implementations/database/external-probe.d.ts +26 -0
- package/dist/implementations/database/external-probe.js +89 -0
- package/dist/implementations/database/external-probe.js.map +1 -0
- package/dist/implementations/database/external-read.d.ts +11 -0
- package/dist/implementations/database/external-read.js +123 -0
- package/dist/implementations/database/external-read.js.map +1 -0
- package/dist/implementations/database/external-registration.d.ts +4 -0
- package/dist/implementations/database/external-registration.js +18 -0
- package/dist/implementations/database/external-registration.js.map +1 -0
- package/dist/implementations/database/external-selection.d.ts +25 -0
- package/dist/implementations/database/external-selection.js +230 -0
- package/dist/implementations/database/external-selection.js.map +1 -0
- package/dist/implementations/database/external-writes.d.ts +14 -0
- package/dist/implementations/database/external-writes.js +355 -0
- package/dist/implementations/database/external-writes.js.map +1 -0
- package/dist/implementations/database/initialize.js.map +1 -1
- package/dist/implementations/database/query.js +67 -15
- package/dist/implementations/database/query.js.map +1 -1
- package/dist/implementations/database/schema.d.ts +2 -0
- package/dist/implementations/database/schema.js +21 -0
- package/dist/implementations/database/schema.js.map +1 -1
- package/dist/implementations/database/selection-stages.d.ts +5 -0
- package/dist/implementations/database/selection-stages.js +110 -0
- package/dist/implementations/database/selection-stages.js.map +1 -0
- package/dist/implementations/database/selection.d.ts +10 -3
- package/dist/implementations/database/selection.js +67 -91
- package/dist/implementations/database/selection.js.map +1 -1
- package/dist/implementations/database/stream.d.ts +4 -1
- package/dist/implementations/database/stream.js +30 -16
- package/dist/implementations/database/stream.js.map +1 -1
- package/dist/implementations/database/utils.d.ts +3 -0
- package/dist/implementations/database/utils.js +12 -0
- package/dist/implementations/database/utils.js.map +1 -1
- package/dist/implementations/rethinkdb/index.d.ts +1 -1
- package/dist/implementations/rethinkdb/index.js.map +1 -1
- package/dist/index.d.ts +3 -7
- package/dist/index.js +11 -7
- package/dist/index.js.map +1 -1
- package/dist/test/antelope.test.js +28 -12
- package/dist/test/antelope.test.js.map +1 -1
- package/dist/test/atomic-mutation.test.js.map +1 -1
- package/dist/test/instance-indexes.test.js.map +1 -1
- package/dist/test/primitive-guards.test.d.ts +1 -0
- package/dist/test/primitive-guards.test.js +49 -0
- package/dist/test/primitive-guards.test.js.map +1 -0
- package/dist/test/write-results.test.js.map +1 -1
- package/dist/test-external/catalog.test.d.ts +1 -0
- package/dist/test-external/catalog.test.js +136 -0
- package/dist/test-external/catalog.test.js.map +1 -0
- package/dist/test-external/erp.d.ts +18 -0
- package/dist/test-external/erp.js +74 -0
- package/dist/test-external/erp.js.map +1 -0
- package/dist/test-external/fixture.d.ts +12 -0
- package/dist/test-external/fixture.js +182 -0
- package/dist/test-external/fixture.js.map +1 -0
- package/dist/test-external/reads.test.d.ts +1 -0
- package/dist/test-external/reads.test.js +220 -0
- package/dist/test-external/reads.test.js.map +1 -0
- package/dist/test-external/refusals.test.d.ts +1 -0
- package/dist/test-external/refusals.test.js +53 -0
- package/dist/test-external/refusals.test.js.map +1 -0
- package/dist/test-external/startup.test.d.ts +1 -0
- package/dist/test-external/startup.test.js +41 -0
- package/dist/test-external/startup.test.js.map +1 -0
- package/dist/test-external/writes.test.d.ts +1 -0
- package/dist/test-external/writes.test.js +179 -0
- package/dist/test-external/writes.test.js.map +1 -0
- package/dist/write-result.js.map +1 -1
- package/package.json +23 -7
|
@@ -0,0 +1,355 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.RunExternalWrite = RunExternalWrite;
|
|
4
|
+
const enums_1 = require("rethinkdb-ts/lib/proto/enums");
|
|
5
|
+
const interface_database_1 = require("@antelopejs/interface-database");
|
|
6
|
+
const config_1 = require("../../config");
|
|
7
|
+
const connection_1 = require("../../connection");
|
|
8
|
+
const external_read_1 = require("./external-read");
|
|
9
|
+
const utils_1 = require("./utils");
|
|
10
|
+
class ExternalWriteError extends Error {
|
|
11
|
+
kind;
|
|
12
|
+
fields;
|
|
13
|
+
constructor(message, kind, fields = []) {
|
|
14
|
+
super(message);
|
|
15
|
+
this.kind = kind;
|
|
16
|
+
this.fields = fields;
|
|
17
|
+
this.name = "ExternalWriteError";
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
const ID_FIELD = "_id";
|
|
21
|
+
const DROPPED_KEYS = new Set(["_instance", "tenant_id"]);
|
|
22
|
+
const SCALAR_KINDS = new Set(["string", "number", "boolean", "date"]);
|
|
23
|
+
const PERMISSION_ERROR = /does not have the required `write` permission/;
|
|
24
|
+
const KEY_CONSTRUCTORS = new Map([
|
|
25
|
+
[String, "string"],
|
|
26
|
+
[Number, "number"],
|
|
27
|
+
]);
|
|
28
|
+
const CONSTRUCTORS = new Map([
|
|
29
|
+
["string", String],
|
|
30
|
+
["number", Number],
|
|
31
|
+
["boolean", Boolean],
|
|
32
|
+
["date", Date],
|
|
33
|
+
]);
|
|
34
|
+
function Text(value) {
|
|
35
|
+
if (value === null || value === undefined || value instanceof Object) {
|
|
36
|
+
return undefined;
|
|
37
|
+
}
|
|
38
|
+
return String(value);
|
|
39
|
+
}
|
|
40
|
+
function TimeOf(date) {
|
|
41
|
+
return {
|
|
42
|
+
$reql_type$: "TIME",
|
|
43
|
+
epoch_time: date.getTime() / 1000,
|
|
44
|
+
timezone: "+00:00",
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
function Written(descriptor, value) {
|
|
48
|
+
if (value === null || value === undefined) {
|
|
49
|
+
return null;
|
|
50
|
+
}
|
|
51
|
+
if (descriptor.kind === "date") {
|
|
52
|
+
const date = value instanceof Date
|
|
53
|
+
? value
|
|
54
|
+
: new Date((0, utils_1.IsText)(value) ? value : Number.NaN);
|
|
55
|
+
return Number.isNaN(date.getTime()) ? undefined : TimeOf(date);
|
|
56
|
+
}
|
|
57
|
+
const fits = value.constructor === CONSTRUCTORS.get(descriptor.kind);
|
|
58
|
+
const finite = descriptor.kind !== "number" || Number.isFinite(value);
|
|
59
|
+
return fits && finite ? value : undefined;
|
|
60
|
+
}
|
|
61
|
+
function Invalid(table, failures) {
|
|
62
|
+
return new ExternalWriteError(failures
|
|
63
|
+
.map(([field, reason]) => `Field '${field}' of ${table} ${reason}`)
|
|
64
|
+
.join("; "), "invalid", failures.map(([field]) => field));
|
|
65
|
+
}
|
|
66
|
+
function RequireKey(table) {
|
|
67
|
+
if (!table.key) {
|
|
68
|
+
throw new Error(`Table ${table.table} has primary keys of more than one type, so its rows cannot be written: it is read-only through this instance`);
|
|
69
|
+
}
|
|
70
|
+
return table.key;
|
|
71
|
+
}
|
|
72
|
+
function KeyOf(table, value, failures) {
|
|
73
|
+
const key = RequireKey(table);
|
|
74
|
+
const byId = value[ID_FIELD] === undefined
|
|
75
|
+
? undefined
|
|
76
|
+
: (0, external_read_1.KeyValue)(key, Text(value[ID_FIELD]) ?? "");
|
|
77
|
+
const byField = KeyFieldTerm(value[table.primaryKey]);
|
|
78
|
+
for (const [field, term] of [
|
|
79
|
+
[ID_FIELD, byId],
|
|
80
|
+
[table.primaryKey, byField],
|
|
81
|
+
]) {
|
|
82
|
+
if (term !== undefined && KeyClassOf(term) !== key) {
|
|
83
|
+
failures.push([field, `expects a key of type ${key}`]);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
if (byId !== undefined &&
|
|
87
|
+
byField !== undefined &&
|
|
88
|
+
JSON.stringify(byId) !== JSON.stringify(byField)) {
|
|
89
|
+
failures.push([table.primaryKey, `names another row than _id`]);
|
|
90
|
+
}
|
|
91
|
+
return byId ?? byField;
|
|
92
|
+
}
|
|
93
|
+
function KeyFieldTerm(value) {
|
|
94
|
+
if (value === undefined || value === null) {
|
|
95
|
+
return undefined;
|
|
96
|
+
}
|
|
97
|
+
return (0, external_read_1.KeyDataTerm)(value) ?? null;
|
|
98
|
+
}
|
|
99
|
+
function KeyClassOf(term) {
|
|
100
|
+
if (Array.isArray(term)) {
|
|
101
|
+
return term[0] === enums_1.TermType.MAKE_ARRAY ? "array" : undefined;
|
|
102
|
+
}
|
|
103
|
+
return KEY_CONSTRUCTORS.get(term?.constructor);
|
|
104
|
+
}
|
|
105
|
+
function KeyData(term) {
|
|
106
|
+
return Array.isArray(term) && term[0] === enums_1.TermType.MAKE_ARRAY
|
|
107
|
+
? term[1].map(KeyData)
|
|
108
|
+
: term;
|
|
109
|
+
}
|
|
110
|
+
function Split(table, mode, value) {
|
|
111
|
+
const failures = [];
|
|
112
|
+
const payload = {
|
|
113
|
+
key: KeyOf(table, value, failures),
|
|
114
|
+
fields: {},
|
|
115
|
+
descriptors: [],
|
|
116
|
+
removed: [],
|
|
117
|
+
};
|
|
118
|
+
for (const [name, field] of Object.entries(value)) {
|
|
119
|
+
const descriptor = table.fields[name];
|
|
120
|
+
if (name === ID_FIELD ||
|
|
121
|
+
name === table.primaryKey ||
|
|
122
|
+
DROPPED_KEYS.has(name)) {
|
|
123
|
+
continue;
|
|
124
|
+
}
|
|
125
|
+
if (!descriptor) {
|
|
126
|
+
failures.push([
|
|
127
|
+
name,
|
|
128
|
+
"is not a declared field: only declared fields of an external table can be written",
|
|
129
|
+
]);
|
|
130
|
+
}
|
|
131
|
+
else if (!SCALAR_KINDS.has(descriptor.kind)) {
|
|
132
|
+
if (mode === "insert" && field !== undefined) {
|
|
133
|
+
failures.push([
|
|
134
|
+
name,
|
|
135
|
+
`is read-only: a ${descriptor.kind} value comes back altered by a read, so it is never written`,
|
|
136
|
+
]);
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
else if (!(mode === "insert" && field === undefined)) {
|
|
140
|
+
const written = Written(descriptor, field);
|
|
141
|
+
if (written === undefined) {
|
|
142
|
+
failures.push([name, `expects a ${descriptor.kind}`]);
|
|
143
|
+
}
|
|
144
|
+
payload.fields[name] = written ?? null;
|
|
145
|
+
payload.descriptors.push(descriptor);
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
if (mode === "replace") {
|
|
149
|
+
payload.removed = Object.values(table.fields)
|
|
150
|
+
.filter((descriptor) => SCALAR_KINDS.has(descriptor.kind) &&
|
|
151
|
+
descriptor.field !== table.primaryKey &&
|
|
152
|
+
!(descriptor.field in value))
|
|
153
|
+
.map((descriptor) => descriptor.field);
|
|
154
|
+
}
|
|
155
|
+
if (failures.length > 0) {
|
|
156
|
+
throw Invalid(table.table, failures);
|
|
157
|
+
}
|
|
158
|
+
return payload;
|
|
159
|
+
}
|
|
160
|
+
function GuardedUpdate(payload) {
|
|
161
|
+
return (0, external_read_1.Func)((row) => {
|
|
162
|
+
const changed = payload.descriptors.map((descriptor) => {
|
|
163
|
+
const incoming = payload.fields[descriptor.field];
|
|
164
|
+
return [
|
|
165
|
+
enums_1.TermType.BRANCH,
|
|
166
|
+
[
|
|
167
|
+
[enums_1.TermType.EQ, [(0, external_read_1.ReadField)(row, descriptor), incoming]],
|
|
168
|
+
null,
|
|
169
|
+
[enums_1.TermType.MAKE_ARRAY, [descriptor.field, incoming]],
|
|
170
|
+
],
|
|
171
|
+
];
|
|
172
|
+
});
|
|
173
|
+
const kept = [
|
|
174
|
+
enums_1.TermType.FILTER,
|
|
175
|
+
[
|
|
176
|
+
[enums_1.TermType.MAKE_ARRAY, changed],
|
|
177
|
+
(0, external_read_1.Func)((pair) => [enums_1.TermType.NE, [pair, null]]),
|
|
178
|
+
],
|
|
179
|
+
];
|
|
180
|
+
return [enums_1.TermType.COERCE_TO, [kept, "OBJECT"]];
|
|
181
|
+
});
|
|
182
|
+
}
|
|
183
|
+
function KeyedTarget(table, target, key) {
|
|
184
|
+
if (key === undefined) {
|
|
185
|
+
return target;
|
|
186
|
+
}
|
|
187
|
+
const stream = Array.isArray(target) && target[0] === enums_1.TermType.GET
|
|
188
|
+
? [enums_1.TermType.GET_ALL, target[1]]
|
|
189
|
+
: target;
|
|
190
|
+
return [
|
|
191
|
+
enums_1.TermType.FILTER,
|
|
192
|
+
[
|
|
193
|
+
stream,
|
|
194
|
+
(0, external_read_1.Func)((row) => [
|
|
195
|
+
enums_1.TermType.EQ,
|
|
196
|
+
[[enums_1.TermType.BRACKET, [row, table.primaryKey]], key],
|
|
197
|
+
]),
|
|
198
|
+
],
|
|
199
|
+
];
|
|
200
|
+
}
|
|
201
|
+
function Sends(incoming, field) {
|
|
202
|
+
return [enums_1.TermType.CONTAINS, [[enums_1.TermType.KEYS, [incoming]], field]];
|
|
203
|
+
}
|
|
204
|
+
function ConflictMerge(table, conflict) {
|
|
205
|
+
const [oldId, newId] = [(0, utils_1.allocateArgNumber)(), (0, utils_1.allocateArgNumber)()];
|
|
206
|
+
const old = [enums_1.TermType.VAR, [oldId]];
|
|
207
|
+
const incoming = [enums_1.TermType.VAR, [newId]];
|
|
208
|
+
const declared = Object.values(table.fields).filter((descriptor) => SCALAR_KINDS.has(descriptor.kind) &&
|
|
209
|
+
descriptor.field !== table.primaryKey);
|
|
210
|
+
const changed = declared.map((descriptor) => {
|
|
211
|
+
const sent = [enums_1.TermType.BRACKET, [incoming, descriptor.field]];
|
|
212
|
+
return [
|
|
213
|
+
enums_1.TermType.BRANCH,
|
|
214
|
+
[
|
|
215
|
+
[
|
|
216
|
+
enums_1.TermType.AND,
|
|
217
|
+
[
|
|
218
|
+
Sends(incoming, descriptor.field),
|
|
219
|
+
[enums_1.TermType.NE, [(0, external_read_1.ReadField)(old, descriptor), sent]],
|
|
220
|
+
],
|
|
221
|
+
],
|
|
222
|
+
[enums_1.TermType.MAKE_ARRAY, [descriptor.field, sent]],
|
|
223
|
+
null,
|
|
224
|
+
],
|
|
225
|
+
];
|
|
226
|
+
});
|
|
227
|
+
const changes = [
|
|
228
|
+
enums_1.TermType.COERCE_TO,
|
|
229
|
+
[
|
|
230
|
+
[
|
|
231
|
+
enums_1.TermType.FILTER,
|
|
232
|
+
[
|
|
233
|
+
[enums_1.TermType.MAKE_ARRAY, changed],
|
|
234
|
+
(0, external_read_1.Func)((pair) => [enums_1.TermType.NE, [pair, null]]),
|
|
235
|
+
],
|
|
236
|
+
],
|
|
237
|
+
"OBJECT",
|
|
238
|
+
],
|
|
239
|
+
];
|
|
240
|
+
const left = [
|
|
241
|
+
enums_1.TermType.FILTER,
|
|
242
|
+
[
|
|
243
|
+
[enums_1.TermType.MAKE_ARRAY, declared.map((descriptor) => descriptor.field)],
|
|
244
|
+
(0, external_read_1.Func)((field) => [enums_1.TermType.NOT, [Sends(incoming, field)]]),
|
|
245
|
+
],
|
|
246
|
+
];
|
|
247
|
+
const base = conflict === "replace"
|
|
248
|
+
? [enums_1.TermType.WITHOUT, [old, [enums_1.TermType.ARGS, [left]]]]
|
|
249
|
+
: old;
|
|
250
|
+
return [
|
|
251
|
+
enums_1.TermType.FUNC,
|
|
252
|
+
[
|
|
253
|
+
[enums_1.TermType.MAKE_ARRAY, [(0, utils_1.allocateArgNumber)(), oldId, newId]],
|
|
254
|
+
[enums_1.TermType.MERGE, [base, changes]],
|
|
255
|
+
],
|
|
256
|
+
];
|
|
257
|
+
}
|
|
258
|
+
function TableTerm(database, table) {
|
|
259
|
+
return [enums_1.TermType.TABLE, [[enums_1.TermType.DB, [database]], table.table]];
|
|
260
|
+
}
|
|
261
|
+
async function Insert(database, table, values, conflict) {
|
|
262
|
+
const key = RequireKey(table);
|
|
263
|
+
const documents = values.map((value) => {
|
|
264
|
+
const payload = Split(table, "insert", value);
|
|
265
|
+
if (payload.key === undefined && !table.generatesKeys) {
|
|
266
|
+
throw Invalid(table.table, [
|
|
267
|
+
[ID_FIELD, `is required: keys of type ${key} are not generated`],
|
|
268
|
+
]);
|
|
269
|
+
}
|
|
270
|
+
return payload.key === undefined
|
|
271
|
+
? payload.fields
|
|
272
|
+
: { ...payload.fields, [table.primaryKey]: payload.key };
|
|
273
|
+
});
|
|
274
|
+
const options = conflict ? { conflict: ConflictMerge(table, conflict) } : {};
|
|
275
|
+
const result = await (0, connection_1.executeTermJson)([
|
|
276
|
+
enums_1.TermType.INSERT,
|
|
277
|
+
[TableTerm(database, table), [enums_1.TermType.MAKE_ARRAY, documents]],
|
|
278
|
+
options,
|
|
279
|
+
]).catch((error) => {
|
|
280
|
+
throw (0, interface_database_1.IsDuplicateKeyError)(error)
|
|
281
|
+
? new interface_database_1.DuplicateKeyError(table.primaryKey, [table.primaryKey])
|
|
282
|
+
: error;
|
|
283
|
+
});
|
|
284
|
+
const generated = [...(result?.generated_keys ?? [])];
|
|
285
|
+
return documents.map((document) => {
|
|
286
|
+
const stored = document[table.primaryKey] ?? generated.shift() ?? null;
|
|
287
|
+
return key === "array"
|
|
288
|
+
? JSON.stringify(KeyData(stored))
|
|
289
|
+
: (Text(stored) ?? "");
|
|
290
|
+
});
|
|
291
|
+
}
|
|
292
|
+
const BY_KEY = new Set([enums_1.TermType.GET, enums_1.TermType.GET_ALL]);
|
|
293
|
+
async function Pinned(database, table, target) {
|
|
294
|
+
const byPrimaryKey = Array.isArray(target) &&
|
|
295
|
+
BY_KEY.has(target[0]) &&
|
|
296
|
+
target[2]?.index === undefined;
|
|
297
|
+
if (byPrimaryKey) {
|
|
298
|
+
return target;
|
|
299
|
+
}
|
|
300
|
+
const read = [
|
|
301
|
+
enums_1.TermType.MAP,
|
|
302
|
+
[target, (0, external_read_1.Func)((row) => [enums_1.TermType.BRACKET, [row, table.primaryKey]])],
|
|
303
|
+
];
|
|
304
|
+
const timeoutMs = (0, config_1.GetOptions)().statementTimeoutMs;
|
|
305
|
+
const keys = timeoutMs === undefined
|
|
306
|
+
? await (0, connection_1.executeTermJson)(read)
|
|
307
|
+
: await (0, connection_1.executeBounded)(read, timeoutMs);
|
|
308
|
+
if (keys.length === 0) {
|
|
309
|
+
return target;
|
|
310
|
+
}
|
|
311
|
+
return [
|
|
312
|
+
enums_1.TermType.GET_ALL,
|
|
313
|
+
[
|
|
314
|
+
TableTerm(database, table),
|
|
315
|
+
...keys.flatMap((key) => (0, external_read_1.KeyDataTerm)(key) ?? []),
|
|
316
|
+
],
|
|
317
|
+
];
|
|
318
|
+
}
|
|
319
|
+
async function Run(database, table, write) {
|
|
320
|
+
if (write.kind === "insert") {
|
|
321
|
+
return Insert(database, table, [write.value].flat(), write.conflict);
|
|
322
|
+
}
|
|
323
|
+
if (write.kind === "delete") {
|
|
324
|
+
return ((await (0, connection_1.executeTermJson)([enums_1.TermType.DELETE, [write.target]]))?.deleted ?? 0);
|
|
325
|
+
}
|
|
326
|
+
const [value] = [write.value].flat();
|
|
327
|
+
const payload = Split(table, write.kind === "replace" ? "replace" : "update", value);
|
|
328
|
+
const selected = payload.removed.length > 0
|
|
329
|
+
? await Pinned(database, table, write.target)
|
|
330
|
+
: write.target;
|
|
331
|
+
const target = KeyedTarget(table, selected, payload.key);
|
|
332
|
+
const updated = await (0, connection_1.executeTermJson)([
|
|
333
|
+
enums_1.TermType.UPDATE,
|
|
334
|
+
[target, GuardedUpdate(payload)],
|
|
335
|
+
]);
|
|
336
|
+
if (payload.removed.length === 0) {
|
|
337
|
+
return updated?.replaced ?? 0;
|
|
338
|
+
}
|
|
339
|
+
const removals = Object.fromEntries(payload.removed.map((field) => [field, [enums_1.TermType.LITERAL, []]]));
|
|
340
|
+
const removed = await (0, connection_1.executeTermJson)([enums_1.TermType.UPDATE, [target, removals]]);
|
|
341
|
+
return Math.max(updated?.replaced ?? 0, removed?.replaced ?? 0);
|
|
342
|
+
}
|
|
343
|
+
async function RunExternalWrite(database, table, write) {
|
|
344
|
+
RequireKey(table);
|
|
345
|
+
try {
|
|
346
|
+
return await Run(database, table, write);
|
|
347
|
+
}
|
|
348
|
+
catch (error) {
|
|
349
|
+
if (error instanceof Error && PERMISSION_ERROR.test(error.message)) {
|
|
350
|
+
throw new ExternalWriteError(`The connected account may not write to table ${table.table}`, "forbidden");
|
|
351
|
+
}
|
|
352
|
+
throw error;
|
|
353
|
+
}
|
|
354
|
+
}
|
|
355
|
+
//# sourceMappingURL=external-writes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"external-writes.js","sourceRoot":"","sources":["../../../src/implementations/database/external-writes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initialize.js","sourceRoot":"","sources":["../../../src/implementations/database/initialize.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"initialize.js","sourceRoot":"","sources":["../../../src/implementations/database/initialize.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,31 +9,49 @@ exports.ReadCursor = ReadCursor;
|
|
|
9
9
|
exports.CloseCursor = CloseCursor;
|
|
10
10
|
const node_assert_1 = __importDefault(require("node:assert"));
|
|
11
11
|
const atomic_1 = require("@antelopejs/interface-database/atomic");
|
|
12
|
+
const schema_1 = require("@antelopejs/interface-database/schema");
|
|
12
13
|
const logger_1 = require("../../utils/logger");
|
|
13
14
|
const connection_1 = require("../../connection");
|
|
14
15
|
const selection_1 = require("./selection");
|
|
16
|
+
const config_1 = require("../../config");
|
|
17
|
+
const external_selection_1 = require("./external-selection");
|
|
15
18
|
const atomic_2 = require("./atomic");
|
|
16
19
|
const utils_1 = require("./utils");
|
|
17
|
-
const
|
|
20
|
+
const schema_2 = require("./schema");
|
|
21
|
+
const EXTERNAL_LIFECYCLE_HANDLERS = new Map([
|
|
22
|
+
[
|
|
23
|
+
"createInstance",
|
|
24
|
+
(_schemaId, stages) => Promise.reject((0, external_selection_1.ExternalInstanceRefusal)(stages[1].stage)),
|
|
25
|
+
],
|
|
26
|
+
[
|
|
27
|
+
"destroyInstance",
|
|
28
|
+
(_schemaId, stages) => Promise.reject((0, external_selection_1.ExternalInstanceRefusal)(stages[1].stage)),
|
|
29
|
+
],
|
|
30
|
+
["listInstances", () => Promise.resolve([])],
|
|
31
|
+
]);
|
|
18
32
|
const SCHEMA_STAGE_HANDLERS = {
|
|
19
33
|
instance: async (schemaId, stages) => {
|
|
20
|
-
await (0,
|
|
34
|
+
await (0, schema_2.WaitForSchemaReady)(schemaId);
|
|
21
35
|
if (stages.some((stage) => stage.stage === "atomicMutation")) {
|
|
36
|
+
if ((0, config_1.IsExternal)()) {
|
|
37
|
+
throw (0, external_selection_1.ExternalAtomicRefusal)(stages[2]?.options?.id);
|
|
38
|
+
}
|
|
22
39
|
return runAtomicStages(stages);
|
|
23
40
|
}
|
|
24
41
|
const context = new utils_1.DecodingContext();
|
|
25
42
|
return selection_1.SelectionQuery.decode(stages, context).run();
|
|
26
43
|
},
|
|
27
|
-
createInstance: (schemaId, stages) => (0,
|
|
28
|
-
destroyInstance: (schemaId, stages) => (0,
|
|
29
|
-
listInstances: (schemaId) => (0,
|
|
44
|
+
createInstance: (schemaId, stages) => (0, schema_2.CreateInstance)(schemaId, stages[1]?.options?.id),
|
|
45
|
+
destroyInstance: (schemaId, stages) => (0, schema_2.DestroyInstance)(schemaId, stages[1]?.options?.id),
|
|
46
|
+
listInstances: (schemaId) => (0, schema_2.ListInstances)(schemaId),
|
|
30
47
|
};
|
|
31
48
|
async function RunQuery(stages) {
|
|
32
49
|
(0, node_assert_1.default)(stages[0]?.stage === "schema", "Expected schema stage");
|
|
33
50
|
const schemaId = stages[0].options?.id;
|
|
34
51
|
(0, node_assert_1.default)(schemaId, "Unknown schema");
|
|
35
52
|
const next = stages[1]?.stage;
|
|
36
|
-
const
|
|
53
|
+
const external = (0, config_1.IsExternal)() && next ? EXTERNAL_LIFECYCLE_HANDLERS.get(next) : undefined;
|
|
54
|
+
const handler = external ?? (next ? SCHEMA_STAGE_HANDLERS[next] : undefined);
|
|
37
55
|
(0, node_assert_1.default)(handler, `Unknown schema stage '${next}'`);
|
|
38
56
|
return handler(schemaId, stages);
|
|
39
57
|
}
|
|
@@ -44,39 +62,72 @@ function runAtomicStages(stages) {
|
|
|
44
62
|
const prefix = stages.slice(0, -1);
|
|
45
63
|
(0, atomic_1.ValidateAtomicMutationTable)(prefix);
|
|
46
64
|
const query = selection_1.SelectionQuery.decode(prefix, new utils_1.DecodingContext());
|
|
47
|
-
(0, node_assert_1.default)(
|
|
65
|
+
(0, node_assert_1.default)(query.instanceId !== schema_1.CROSS_INSTANCE, "Atomic mutation must be scoped");
|
|
48
66
|
return (0, atomic_2.runAtomicMutation)(query.getTableTerm(), query.instanceId ?? "", terminal.args[0], terminal.args[1]);
|
|
49
67
|
}
|
|
68
|
+
async function Opened(query, term) {
|
|
69
|
+
const timeoutMs = query.external
|
|
70
|
+
? (0, config_1.GetOptions)().statementTimeoutMs
|
|
71
|
+
: undefined;
|
|
72
|
+
if (timeoutMs === undefined) {
|
|
73
|
+
const cursor = await (0, connection_1.SendQuery)(term);
|
|
74
|
+
(0, node_assert_1.default)(cursor, "Query returned no cursor.");
|
|
75
|
+
return { cursor };
|
|
76
|
+
}
|
|
77
|
+
return { ...(await (0, connection_1.OpenBoundedCursor)(term, timeoutMs)), timeoutMs };
|
|
78
|
+
}
|
|
79
|
+
function Release(reqId) {
|
|
80
|
+
openCursors.get(reqId)?.release?.();
|
|
81
|
+
openCursors.delete(reqId);
|
|
82
|
+
}
|
|
50
83
|
const openCursors = new Map();
|
|
51
84
|
async function ReadCursor(reqId, stages) {
|
|
52
85
|
if (!openCursors.has(reqId)) {
|
|
53
86
|
(0, node_assert_1.default)(stages[0]?.stage === "schema", "Expected schema stage");
|
|
54
87
|
const schemaId = stages[0].options?.id;
|
|
55
88
|
(0, node_assert_1.default)(schemaId, "Unknown schema");
|
|
56
|
-
await (0,
|
|
89
|
+
await (0, schema_2.WaitForSchemaReady)(schemaId);
|
|
57
90
|
const context = new utils_1.DecodingContext();
|
|
58
91
|
const query = selection_1.SelectionQuery.decode(stages, context);
|
|
59
92
|
const term = query.buildTerm();
|
|
60
93
|
logger_1.Logger.Debug("Opening cursor #", reqId);
|
|
61
|
-
const
|
|
62
|
-
|
|
94
|
+
const opened = await Opened(query, term);
|
|
95
|
+
const { cursor } = opened;
|
|
63
96
|
const entry = {
|
|
64
|
-
|
|
97
|
+
...opened,
|
|
65
98
|
iterator: cursor[Symbol.asyncIterator](),
|
|
66
99
|
isChangeStream: query.isChangeStream,
|
|
67
100
|
};
|
|
68
101
|
openCursors.set(reqId, entry);
|
|
69
102
|
cursor.on("close", () => {
|
|
70
103
|
logger_1.Logger.Debug("Cursor #", reqId, "closed by server");
|
|
71
|
-
|
|
104
|
+
if (!entry.expired?.()) {
|
|
105
|
+
Release(reqId);
|
|
106
|
+
}
|
|
72
107
|
});
|
|
73
108
|
cursor.init();
|
|
74
109
|
}
|
|
75
110
|
const entry = openCursors.get(reqId);
|
|
76
111
|
(0, node_assert_1.default)(entry, `Cursor #${reqId} not found.`);
|
|
77
|
-
|
|
112
|
+
if (entry.expired?.()) {
|
|
113
|
+
Release(reqId);
|
|
114
|
+
throw new connection_1.QueryTimeoutError(entry.timeoutMs ?? 0);
|
|
115
|
+
}
|
|
116
|
+
entry.arm?.();
|
|
117
|
+
const result = await entry.iterator
|
|
118
|
+
.next()
|
|
119
|
+
.finally(() => entry.disarm?.())
|
|
120
|
+
.catch((error) => {
|
|
121
|
+
const expired = entry.expired?.() ?? false;
|
|
122
|
+
Release(reqId);
|
|
123
|
+
throw expired ? new connection_1.QueryTimeoutError(entry.timeoutMs ?? 0) : error;
|
|
124
|
+
});
|
|
78
125
|
if (result.done) {
|
|
79
|
-
|
|
126
|
+
const expired = entry.expired?.() ?? false;
|
|
127
|
+
Release(reqId);
|
|
128
|
+
if (expired) {
|
|
129
|
+
throw new connection_1.QueryTimeoutError(entry.timeoutMs ?? 0);
|
|
130
|
+
}
|
|
80
131
|
return { done: true, value: undefined };
|
|
81
132
|
}
|
|
82
133
|
if (entry.isChangeStream) {
|
|
@@ -102,7 +153,8 @@ async function CloseCursor(reqId) {
|
|
|
102
153
|
if (entry) {
|
|
103
154
|
logger_1.Logger.Debug("Closing cursor #", reqId);
|
|
104
155
|
openCursors.delete(reqId);
|
|
105
|
-
await entry.cursor.close();
|
|
156
|
+
await entry.cursor.close().catch(() => undefined);
|
|
157
|
+
entry.release?.();
|
|
106
158
|
}
|
|
107
159
|
}
|
|
108
160
|
var connection_2 = require("../../connection");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/implementations/database/query.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/implementations/database/query.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import type { IndexDefinition, SchemaDefinition } from "@antelopejs/interface-database/schema";
|
|
2
|
+
import { type ExternalTable } from "./external-registration";
|
|
3
|
+
export declare function GetExternalTable(schemaId: string, tableId: string): ExternalTable;
|
|
2
4
|
export declare const Schemas: {
|
|
3
5
|
register(schemaId: string, schema: SchemaDefinition): Promise<void>;
|
|
4
6
|
unregister(schemaId: string): void;
|
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.Schemas = void 0;
|
|
7
|
+
exports.GetExternalTable = GetExternalTable;
|
|
7
8
|
exports.WaitForSchemaReady = WaitForSchemaReady;
|
|
8
9
|
exports.GetSchema = GetSchema;
|
|
9
10
|
exports.GetTable = GetTable;
|
|
@@ -16,15 +17,34 @@ exports.ListInstances = ListInstances;
|
|
|
16
17
|
const node_assert_1 = __importDefault(require("node:assert"));
|
|
17
18
|
const enums_1 = require("rethinkdb-ts/lib/proto/enums");
|
|
18
19
|
const connection_1 = require("../../connection");
|
|
20
|
+
const config_1 = require("../../config");
|
|
21
|
+
const external_registration_1 = require("./external-registration");
|
|
19
22
|
const initialize_1 = require("./initialize");
|
|
20
23
|
const indexes_1 = require("./indexes");
|
|
21
24
|
const utils_1 = require("./utils");
|
|
22
25
|
const existingSchemas = {};
|
|
23
26
|
const schemaReady = {};
|
|
24
27
|
const existingInstances = {};
|
|
28
|
+
const externalTables = new Map();
|
|
29
|
+
async function registerExternal(schemaId, schema) {
|
|
30
|
+
const registration = (0, external_registration_1.RegisterExternalSchema)(schemaId, schema).then((tables) => {
|
|
31
|
+
externalTables.set(schemaId, tables);
|
|
32
|
+
});
|
|
33
|
+
schemaReady[schemaId] = registration;
|
|
34
|
+
registration.catch(() => undefined);
|
|
35
|
+
await registration;
|
|
36
|
+
}
|
|
37
|
+
function GetExternalTable(schemaId, tableId) {
|
|
38
|
+
const table = externalTables.get(schemaId)?.[tableId];
|
|
39
|
+
(0, node_assert_1.default)(table, `Table '${schemaId}.${tableId}' is not registered`);
|
|
40
|
+
return table;
|
|
41
|
+
}
|
|
25
42
|
exports.Schemas = {
|
|
26
43
|
async register(schemaId, schema) {
|
|
27
44
|
existingSchemas[schemaId] = { definition: schema };
|
|
45
|
+
if ((0, config_1.IsExternal)()) {
|
|
46
|
+
return registerExternal(schemaId, schema);
|
|
47
|
+
}
|
|
28
48
|
const ready = initializeSchema(schemaId, schema);
|
|
29
49
|
schemaReady[schemaId] = ready;
|
|
30
50
|
try {
|
|
@@ -38,6 +58,7 @@ exports.Schemas = {
|
|
|
38
58
|
}
|
|
39
59
|
},
|
|
40
60
|
unregister(schemaId) {
|
|
61
|
+
externalTables.delete(schemaId);
|
|
41
62
|
delete existingSchemas[schemaId];
|
|
42
63
|
delete schemaReady[schemaId];
|
|
43
64
|
delete existingInstances[schemaId];
|