@antelopejs/rethinkdb 1.2.3 → 1.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +33 -0
- package/dist/connection.d.ts +3 -5
- package/dist/connection.js +5 -11
- package/dist/connection.js.map +1 -1
- package/dist/implementations/database/atomic.d.ts +3 -0
- package/dist/implementations/database/atomic.js +104 -0
- package/dist/implementations/database/atomic.js.map +1 -0
- package/dist/implementations/database/expression.d.ts +3 -1
- package/dist/implementations/database/expression.js +80 -5
- package/dist/implementations/database/expression.js.map +1 -1
- package/dist/implementations/database/query.d.ts +1 -5
- package/dist/implementations/database/query.js +17 -76
- package/dist/implementations/database/query.js.map +1 -1
- package/dist/implementations/database/schema.js.map +1 -1
- package/dist/implementations/database/selection.d.ts +3 -1
- package/dist/implementations/database/selection.js +28 -18
- package/dist/implementations/database/selection.js.map +1 -1
- package/dist/implementations/database/stream.d.ts +0 -3
- package/dist/implementations/database/stream.js +12 -14
- package/dist/implementations/database/stream.js.map +1 -1
- package/dist/implementations/rethinkdb/index.js.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/test/atomic-mutation.test.js +277 -0
- package/dist/test/atomic-mutation.test.js.map +1 -0
- package/dist/test/write-results.test.d.ts +1 -0
- package/dist/test/write-results.test.js +64 -0
- package/dist/test/write-results.test.js.map +1 -0
- package/dist/write-result.d.ts +2 -0
- package/dist/write-result.js +19 -0
- package/dist/write-result.js.map +1 -0
- package/package.json +38 -31
- package/dist/implementations/database/index.js +0 -3
- package/dist/implementations/database/index.js.map +0 -1
- /package/dist/{implementations/database/index.d.ts → test/atomic-mutation.test.d.ts} +0 -0
package/README.md
CHANGED
|
@@ -83,6 +83,39 @@ The module supports two connection methods:
|
|
|
83
83
|
- Direct connection using `r.connect()` with `RConnectionOptions`
|
|
84
84
|
- Connection pool using `r.connectPool()` with `RPoolConnectionOptions`
|
|
85
85
|
|
|
86
|
+
## Atomic single-record mutations
|
|
87
|
+
|
|
88
|
+
`table.atomicMutation(key, request).run()` checks one primary key, its instance,
|
|
89
|
+
and the requested condition inside a deterministic native RethinkDB `replace`
|
|
90
|
+
function. It never inserts a missing record or retries a submitted mutation.
|
|
91
|
+
`CROSS_INSTANCE` and selections are not supported.
|
|
92
|
+
|
|
93
|
+
Revision-based updates replace the supplied top-level fields, including complete
|
|
94
|
+
nested objects, and install `nextRevision` in the same write. Revision-based
|
|
95
|
+
deletes remove the matching record. The `{ kind: "missing" }` expected revision
|
|
96
|
+
matches an absent field on an existing record, not a stored `null` value. Callers
|
|
97
|
+
must use fresh revision tokens and must not reuse an identity across incarnations.
|
|
98
|
+
|
|
99
|
+
`deleteIfEqual` checks one scalar field, including a `Date`, before deleting the
|
|
100
|
+
record. It does not provide revision-based protection against a value changing
|
|
101
|
+
and later changing back. Retention callers must keep their cutoff fixed and
|
|
102
|
+
re-evaluate eligibility when they observe a different value.
|
|
103
|
+
|
|
104
|
+
The result is `applied`, `not-applied`, or `unknown`. Missing records, wrong
|
|
105
|
+
instances, and condition mismatches return `not-applied`. Lost acknowledgements,
|
|
106
|
+
indeterminate driver errors, untyped write-result errors, and malformed
|
|
107
|
+
acknowledgements return `unknown`; callers must reconcile them rather than infer
|
|
108
|
+
that no write occurred. Invalid requests and definite typed query-validation
|
|
109
|
+
errors throw. Ordinary insert/update/replace/delete operations reject write
|
|
110
|
+
errors, including duplicate primary keys; a multi-record write may have partially
|
|
111
|
+
succeeded before it reports an error.
|
|
112
|
+
|
|
113
|
+
This implementation requires `@antelopejs/interface-database` version `0.1.6`
|
|
114
|
+
or later within the supported range. Its shared real-backend conformance suite
|
|
115
|
+
runs automatically through `ajs module test`, alongside this provider's native
|
|
116
|
+
acknowledgement, storage, and fault tests. Install the published dependencies
|
|
117
|
+
with `pnpm install --frozen-lockfile`; no local artifact is required.
|
|
118
|
+
|
|
86
119
|
## License
|
|
87
120
|
|
|
88
121
|
This project is licensed under the Apache License 2.0 - see the [LICENSE](LICENSE) file for details.
|
package/dist/connection.d.ts
CHANGED
|
@@ -1,12 +1,10 @@
|
|
|
1
|
-
import type { SchemaDefinition } from "@antelopejs/interface-database/schema";
|
|
2
|
-
import { type Connection, type MasterPool, type RConnectionOptions, type RPoolConnectionOptions, type RunOptions } from "rethinkdb-ts";
|
|
3
|
-
import type { TermJson } from "rethinkdb-ts/lib/internal-types";
|
|
4
1
|
import type { Cursor } from "rethinkdb-ts/lib/response/cursor";
|
|
2
|
+
import type { TermJson } from "rethinkdb-ts/lib/internal-types";
|
|
3
|
+
import type { SchemaDefinition } from "@antelopejs/interface-database/schema";
|
|
4
|
+
import { type RConnectionOptions, type RPoolConnectionOptions, type RunOptions } from "rethinkdb-ts";
|
|
5
5
|
export declare function ConnectDirect(options: RConnectionOptions): Promise<void>;
|
|
6
6
|
export declare function ConnectPool(options: RPoolConnectionOptions): Promise<void>;
|
|
7
7
|
export declare function Disconnect(): void;
|
|
8
|
-
export declare function GetConnection(): Connection | MasterPool | undefined;
|
|
9
|
-
export declare function GetConnectionType(): "direct" | "none" | "pool";
|
|
10
8
|
export declare function SendQuery(query: TermJson, opts?: RunOptions): Promise<Cursor | undefined>;
|
|
11
9
|
export declare function executeTermJson(term: TermJson): Promise<any>;
|
|
12
10
|
export declare function InitializeSchemaDatabase(dbName: string, schema: SchemaDefinition): Promise<void>;
|
package/dist/connection.js
CHANGED
|
@@ -6,17 +6,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.ConnectDirect = ConnectDirect;
|
|
7
7
|
exports.ConnectPool = ConnectPool;
|
|
8
8
|
exports.Disconnect = Disconnect;
|
|
9
|
-
exports.GetConnection = GetConnection;
|
|
10
|
-
exports.GetConnectionType = GetConnectionType;
|
|
11
9
|
exports.SendQuery = SendQuery;
|
|
12
10
|
exports.executeTermJson = executeTermJson;
|
|
13
11
|
exports.InitializeSchemaDatabase = InitializeSchemaDatabase;
|
|
14
12
|
const node_assert_1 = __importDefault(require("node:assert"));
|
|
15
|
-
const rethinkdb_ts_1 = require("rethinkdb-ts");
|
|
16
|
-
const term_backtrace_1 = require("rethinkdb-ts/lib/error/term-backtrace");
|
|
17
13
|
const enums_1 = require("rethinkdb-ts/lib/proto/enums");
|
|
18
|
-
const
|
|
14
|
+
const term_backtrace_1 = require("rethinkdb-ts/lib/error/term-backtrace");
|
|
15
|
+
const rethinkdb_ts_1 = require("rethinkdb-ts");
|
|
19
16
|
const logger_1 = require("./utils/logger");
|
|
17
|
+
const write_result_1 = require("./write-result");
|
|
18
|
+
const utils_1 = require("./implementations/database/utils");
|
|
20
19
|
let connection;
|
|
21
20
|
async function ConnectDirect(options) {
|
|
22
21
|
logger_1.Logger.Debug("Connecting directly to RethinkDB", options.host ?? "localhost");
|
|
@@ -49,12 +48,6 @@ function Disconnect() {
|
|
|
49
48
|
}
|
|
50
49
|
}
|
|
51
50
|
}
|
|
52
|
-
function GetConnection() {
|
|
53
|
-
return connection?.connection;
|
|
54
|
-
}
|
|
55
|
-
function GetConnectionType() {
|
|
56
|
-
return connection?.type ?? "none";
|
|
57
|
-
}
|
|
58
51
|
function SendQuery(query, opts) {
|
|
59
52
|
(0, node_assert_1.default)(connection, "No connection established");
|
|
60
53
|
logger_1.Logger.Debug("Sending query via", connection.type);
|
|
@@ -77,6 +70,7 @@ async function executeTermJson(term) {
|
|
|
77
70
|
}
|
|
78
71
|
const cursorType = cursor.getType();
|
|
79
72
|
if (cursorType === "Atom") {
|
|
73
|
+
(0, write_result_1.validateWriteResult)(term, results[0]);
|
|
80
74
|
return results[0];
|
|
81
75
|
}
|
|
82
76
|
if (cursorType === "Cursor") {
|
package/dist/connection.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import type { TermJson } from "rethinkdb-ts/lib/internal-types";
|
|
2
|
+
import { type AtomicMutation, type AtomicMutationOutcome } from "@antelopejs/interface-database/atomic";
|
|
3
|
+
export declare function runAtomicMutation(table: TermJson, tenantId: string, key: string, request: AtomicMutation<Record<string, unknown>>): Promise<AtomicMutationOutcome>;
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.runAtomicMutation = runAtomicMutation;
|
|
4
|
+
const enums_1 = require("rethinkdb-ts/lib/proto/enums");
|
|
5
|
+
const error_1 = require("rethinkdb-ts/lib/error/error");
|
|
6
|
+
const rethinkdb_ts_1 = require("rethinkdb-ts");
|
|
7
|
+
const atomic_1 = require("@antelopejs/interface-database/atomic");
|
|
8
|
+
const connection_1 = require("../../connection");
|
|
9
|
+
const utils_1 = require("./utils");
|
|
10
|
+
const DEFINITIVE_ERRORS = new Set([
|
|
11
|
+
rethinkdb_ts_1.RethinkDBErrorType.AUTH,
|
|
12
|
+
rethinkdb_ts_1.RethinkDBErrorType.PARSE,
|
|
13
|
+
rethinkdb_ts_1.RethinkDBErrorType.ARITY,
|
|
14
|
+
rethinkdb_ts_1.RethinkDBErrorType.QUERY_LOGIC,
|
|
15
|
+
rethinkdb_ts_1.RethinkDBErrorType.NON_EXISTENCE,
|
|
16
|
+
rethinkdb_ts_1.RethinkDBErrorType.PERMISSION_ERROR,
|
|
17
|
+
]);
|
|
18
|
+
const WRITE_COUNTS = ["replaced", "deleted", "unchanged", "skipped"];
|
|
19
|
+
async function runAtomicMutation(table, tenantId, key, request) {
|
|
20
|
+
(0, atomic_1.ValidateAtomicMutation)(key, request, [utils_1.TENANT_ID_FIELD]);
|
|
21
|
+
const term = buildAtomicTerm(table, tenantId, key, request);
|
|
22
|
+
try {
|
|
23
|
+
return mutationOutcome(await (0, connection_1.executeTermJson)(term));
|
|
24
|
+
}
|
|
25
|
+
catch (error) {
|
|
26
|
+
if ((0, error_1.isRethinkDBError)(error) && DEFINITIVE_ERRORS.has(error.type)) {
|
|
27
|
+
throw error;
|
|
28
|
+
}
|
|
29
|
+
return "unknown";
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
function buildAtomicTerm(table, tenantId, key, request) {
|
|
33
|
+
const argId = (0, utils_1.allocateArgNumber)();
|
|
34
|
+
const doc = [enums_1.TermType.VAR, [argId]];
|
|
35
|
+
const condition = mutationCondition(doc, tenantId, request);
|
|
36
|
+
const isDelete = request.type !== "update";
|
|
37
|
+
const patch = isDelete
|
|
38
|
+
? null
|
|
39
|
+
: Object.fromEntries([
|
|
40
|
+
...Object.entries(request.patch).map(([field, value]) => [
|
|
41
|
+
field,
|
|
42
|
+
[enums_1.TermType.LITERAL, [rethinkdb_ts_1.r.expr(value).term]],
|
|
43
|
+
]),
|
|
44
|
+
[request.revisionField, request.nextRevision],
|
|
45
|
+
]);
|
|
46
|
+
const replacement = isDelete
|
|
47
|
+
? null
|
|
48
|
+
: [enums_1.TermType.MERGE, [doc, patch]];
|
|
49
|
+
const body = [enums_1.TermType.BRANCH, [condition, replacement, doc]];
|
|
50
|
+
const mutation = [
|
|
51
|
+
enums_1.TermType.FUNC,
|
|
52
|
+
[[enums_1.TermType.MAKE_ARRAY, [argId]], body],
|
|
53
|
+
];
|
|
54
|
+
return [
|
|
55
|
+
enums_1.TermType.REPLACE,
|
|
56
|
+
[[enums_1.TermType.GET, [table, key]], mutation],
|
|
57
|
+
{ durability: "hard", non_atomic: false },
|
|
58
|
+
];
|
|
59
|
+
}
|
|
60
|
+
function mutationCondition(doc, tenantId, request) {
|
|
61
|
+
const scope = fieldEquals(doc, utils_1.TENANT_ID_FIELD, tenantId);
|
|
62
|
+
const expected = expectedCondition(doc, request);
|
|
63
|
+
return [
|
|
64
|
+
enums_1.TermType.BRANCH,
|
|
65
|
+
[[enums_1.TermType.EQ, [doc, null]], false, [enums_1.TermType.AND, [scope, expected]]],
|
|
66
|
+
];
|
|
67
|
+
}
|
|
68
|
+
function expectedCondition(doc, request) {
|
|
69
|
+
if (request.type === "deleteIfEqual") {
|
|
70
|
+
return fieldEquals(doc, request.field, request.expectedValue);
|
|
71
|
+
}
|
|
72
|
+
if (typeof request.expectedRevision === "string") {
|
|
73
|
+
return fieldEquals(doc, request.revisionField, request.expectedRevision);
|
|
74
|
+
}
|
|
75
|
+
return [
|
|
76
|
+
enums_1.TermType.NOT,
|
|
77
|
+
[[enums_1.TermType.CONTAINS, [[enums_1.TermType.KEYS, [doc]], request.revisionField]]],
|
|
78
|
+
];
|
|
79
|
+
}
|
|
80
|
+
function fieldEquals(doc, field, value) {
|
|
81
|
+
return [
|
|
82
|
+
enums_1.TermType.DEFAULT,
|
|
83
|
+
[
|
|
84
|
+
[
|
|
85
|
+
enums_1.TermType.EQ,
|
|
86
|
+
[
|
|
87
|
+
[enums_1.TermType.BRACKET, [doc, field]],
|
|
88
|
+
rethinkdb_ts_1.r.expr(value).term,
|
|
89
|
+
],
|
|
90
|
+
],
|
|
91
|
+
false,
|
|
92
|
+
],
|
|
93
|
+
];
|
|
94
|
+
}
|
|
95
|
+
function mutationOutcome(result) {
|
|
96
|
+
if (result?.errors !== 0 ||
|
|
97
|
+
result?.inserted !== 0 ||
|
|
98
|
+
!WRITE_COUNTS.every((field) => Number.isInteger(result[field]) && result[field] >= 0) ||
|
|
99
|
+
WRITE_COUNTS.reduce((sum, field) => sum + result[field], 0) !== 1) {
|
|
100
|
+
return "unknown";
|
|
101
|
+
}
|
|
102
|
+
return result.replaced + result.deleted === 1 ? "applied" : "not-applied";
|
|
103
|
+
}
|
|
104
|
+
//# sourceMappingURL=atomic.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"atomic.js","sourceRoot":"","sources":["../../../src/implementations/database/atomic.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
import type { TermJson } from "rethinkdb-ts/lib/internal-types";
|
|
2
|
+
import type { Value } from "@antelopejs/interface-database/common";
|
|
2
3
|
import { type DecodingContext, type QueryStage } from "./utils";
|
|
3
|
-
export declare function
|
|
4
|
+
export declare function DecodeValue(value: Value<unknown>, context: DecodingContext): TermJson;
|
|
5
|
+
export declare function DecodeFunction(func: QueryStage, context: DecodingContext, argTerms: TermJson[]): TermJson;
|
|
@@ -1,8 +1,14 @@
|
|
|
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
|
-
exports.
|
|
6
|
+
exports.DecodeValue = DecodeValue;
|
|
7
|
+
exports.DecodeFunction = DecodeFunction;
|
|
8
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
4
9
|
const enums_1 = require("rethinkdb-ts/lib/proto/enums");
|
|
5
|
-
const
|
|
10
|
+
const interface_database_1 = require("@antelopejs/interface-database");
|
|
11
|
+
const selection_1 = require("./selection");
|
|
6
12
|
const utils_1 = require("./utils");
|
|
7
13
|
const SIMPLE_STAGE_MAP = {
|
|
8
14
|
default: enums_1.TermType.DEFAULT,
|
|
@@ -128,7 +134,7 @@ const FUNC_STAGE_MAP = {
|
|
|
128
134
|
const func = stage.args[0];
|
|
129
135
|
const argId = (0, utils_1.allocateArgNumber)();
|
|
130
136
|
const row = [enums_1.TermType.VAR, [argId]];
|
|
131
|
-
const body =
|
|
137
|
+
const body = DecodeFunction(func, expr.context, [row]);
|
|
132
138
|
return [
|
|
133
139
|
enums_1.TermType.FILTER,
|
|
134
140
|
[expr.value, [enums_1.TermType.FUNC, [[enums_1.TermType.MAKE_ARRAY, [argId]], body]]],
|
|
@@ -138,7 +144,7 @@ const FUNC_STAGE_MAP = {
|
|
|
138
144
|
const func = stage.args[0];
|
|
139
145
|
const argId = (0, utils_1.allocateArgNumber)();
|
|
140
146
|
const row = [enums_1.TermType.VAR, [argId]];
|
|
141
|
-
const body =
|
|
147
|
+
const body = DecodeFunction(func, expr.context, [row]);
|
|
142
148
|
return [
|
|
143
149
|
enums_1.TermType.MAP,
|
|
144
150
|
[expr.value, [enums_1.TermType.FUNC, [[enums_1.TermType.MAKE_ARRAY, [argId]], body]]],
|
|
@@ -160,7 +166,7 @@ function decodeExpression(stages, context, startValue = [enums_1.TermType.IMPLIC
|
|
|
160
166
|
builder.value = funcHandler(builder, stage);
|
|
161
167
|
continue;
|
|
162
168
|
}
|
|
163
|
-
const decodedArgs = stage.args.map((arg) =>
|
|
169
|
+
const decodedArgs = stage.args.map((arg) => DecodeValue(arg, context));
|
|
164
170
|
const simpleType = SIMPLE_STAGE_MAP[stage.stage];
|
|
165
171
|
if (simpleType !== undefined) {
|
|
166
172
|
builder.value = applySimpleStage(builder.value, simpleType, decodedArgs);
|
|
@@ -176,4 +182,73 @@ function decodeExpression(stages, context, startValue = [enums_1.TermType.IMPLIC
|
|
|
176
182
|
delete builder.options;
|
|
177
183
|
return builder.value;
|
|
178
184
|
}
|
|
185
|
+
function DecodeValue(value, context) {
|
|
186
|
+
if (value instanceof interface_database_1.ValueProxy) {
|
|
187
|
+
return decodeExpression(value.build(), context);
|
|
188
|
+
}
|
|
189
|
+
if (value instanceof interface_database_1.Query) {
|
|
190
|
+
return decodeSubquery(value.build(), context);
|
|
191
|
+
}
|
|
192
|
+
if (value && typeof value === "object") {
|
|
193
|
+
if (Array.isArray(value)) {
|
|
194
|
+
return [
|
|
195
|
+
enums_1.TermType.MAKE_ARRAY,
|
|
196
|
+
value.map((val) => DecodeValue(val, context)),
|
|
197
|
+
];
|
|
198
|
+
}
|
|
199
|
+
if (value instanceof Date) {
|
|
200
|
+
return dateToReql(value);
|
|
201
|
+
}
|
|
202
|
+
if (value instanceof Object) {
|
|
203
|
+
return Object.fromEntries(Object.entries(value).map(([key, val]) => [
|
|
204
|
+
key,
|
|
205
|
+
DecodeValue(val, context),
|
|
206
|
+
]));
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
if (value === undefined) {
|
|
210
|
+
return undefined;
|
|
211
|
+
}
|
|
212
|
+
return value;
|
|
213
|
+
}
|
|
214
|
+
function dateToReql(date) {
|
|
215
|
+
const timeZone = date.getTimezoneOffset();
|
|
216
|
+
return {
|
|
217
|
+
$reql_type$: "TIME",
|
|
218
|
+
epoch_time: +date / 1000,
|
|
219
|
+
timezone: `${timeZone <= 0 ? "+" : "-"}${Math.abs(Math.floor(timeZone / 60))
|
|
220
|
+
.toFixed(0)
|
|
221
|
+
.padStart(2, "0")}:${Math.abs(timeZone % 60)
|
|
222
|
+
.toFixed(0)
|
|
223
|
+
.padStart(2, "0")}`,
|
|
224
|
+
};
|
|
225
|
+
}
|
|
226
|
+
function decodeSubquery(stages, context) {
|
|
227
|
+
if (stages[0]?.stage === "arg") {
|
|
228
|
+
const num = stages[0].args[0];
|
|
229
|
+
const provider = context.args[num];
|
|
230
|
+
(0, node_assert_1.default)(provider, "Unknown arg used");
|
|
231
|
+
return provider(stages);
|
|
232
|
+
}
|
|
233
|
+
return selection_1.SelectionQuery.buildTermJson(stages, context);
|
|
234
|
+
}
|
|
235
|
+
function DecodeFunction(func, context, argTerms) {
|
|
236
|
+
const argNumbers = func.args[0];
|
|
237
|
+
const oldArgs = {};
|
|
238
|
+
for (let i = 0; i < argNumbers.length; ++i) {
|
|
239
|
+
oldArgs[argNumbers[i]] = context.args[argNumbers[i]];
|
|
240
|
+
const argTerm = argTerms[i];
|
|
241
|
+
context.args[argNumbers[i]] = () => argTerm;
|
|
242
|
+
}
|
|
243
|
+
const val = DecodeValue(func.args[1], context);
|
|
244
|
+
for (let i = 0; i < argNumbers.length; ++i) {
|
|
245
|
+
if (oldArgs[argNumbers[i]] !== undefined) {
|
|
246
|
+
context.args[argNumbers[i]] = oldArgs[argNumbers[i]];
|
|
247
|
+
}
|
|
248
|
+
else {
|
|
249
|
+
delete context.args[argNumbers[i]];
|
|
250
|
+
}
|
|
251
|
+
}
|
|
252
|
+
return val;
|
|
253
|
+
}
|
|
179
254
|
//# sourceMappingURL=expression.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expression.js","sourceRoot":"","sources":["../../../src/implementations/database/expression.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"expression.js","sourceRoot":"","sources":["../../../src/implementations/database/expression.ts"],"names":[],"mappings":";;;;;AA2NA,kCAqCC;AA4BD,wCAqBC;AAjTD,8DAAiC;AACjC,wDAAwD;AAExD,uEAAmE;AAOnE,2CAA6C;AAC7C,mCAIiB;AAYjB,MAAM,gBAAgB,GAA2B;IAC/C,OAAO,EAAE,gBAAQ,CAAC,OAAO;IACzB,GAAG,EAAE,gBAAQ,CAAC,GAAG;IACjB,EAAE,EAAE,gBAAQ,CAAC,EAAE;IACf,GAAG,EAAE,gBAAQ,CAAC,GAAG;IACjB,EAAE,EAAE,gBAAQ,CAAC,EAAE;IACf,EAAE,EAAE,gBAAQ,CAAC,EAAE;IACf,GAAG,EAAE,gBAAQ,CAAC,GAAG;IACjB,GAAG,EAAE,gBAAQ,CAAC,GAAG;IACjB,GAAG,EAAE,gBAAQ,CAAC,GAAG;IACjB,GAAG,EAAE,gBAAQ,CAAC,GAAG;IACjB,GAAG,EAAE,gBAAQ,CAAC,GAAG;IACjB,KAAK,EAAE,gBAAQ,CAAC,KAAK;IACrB,IAAI,EAAE,gBAAQ,CAAC,IAAI;IACnB,KAAK,EAAE,gBAAQ,CAAC,KAAK;IACrB,OAAO,EAAE,gBAAQ,CAAC,OAAO;IACzB,MAAM,EAAE,gBAAQ,CAAC,MAAM;IACvB,OAAO,EAAE,gBAAQ,CAAC,OAAO;IACzB,OAAO,EAAE,gBAAQ,CAAC,OAAO;IACzB,UAAU,EAAE,gBAAQ,CAAC,OAAO;IAC5B,UAAU,EAAE,gBAAQ,CAAC,OAAO;IAC5B,MAAM,EAAE,gBAAQ,CAAC,EAAE;IACnB,MAAM,EAAE,gBAAQ,CAAC,EAAE;IACnB,MAAM,EAAE,gBAAQ,CAAC,EAAE;IACnB,MAAM,EAAE,gBAAQ,CAAC,EAAE;IACnB,UAAU,EAAE,gBAAQ,CAAC,MAAM;IAC3B,YAAY,EAAE,gBAAQ,CAAC,QAAQ;IAC/B,UAAU,EAAE,gBAAQ,CAAC,GAAG;IACxB,SAAS,EAAE,gBAAQ,CAAC,QAAQ;IAC5B,SAAS,EAAE,gBAAQ,CAAC,KAAK;IACzB,OAAO,EAAE,gBAAQ,CAAC,GAAG;IACrB,OAAO,EAAE,gBAAQ,CAAC,GAAG;IACrB,OAAO,EAAE,gBAAQ,CAAC,GAAG;IACrB,OAAO,EAAE,gBAAQ,CAAC,GAAG;IACrB,YAAY,EAAE,gBAAQ,CAAC,QAAQ;IAC/B,SAAS,EAAE,gBAAQ,CAAC,KAAK;IACzB,QAAQ,EAAE,gBAAQ,CAAC,IAAI;IACvB,UAAU,EAAE,gBAAQ,CAAC,MAAM;IAC3B,QAAQ,EAAE,gBAAQ,CAAC,WAAW;IAC9B,SAAS,EAAE,gBAAQ,CAAC,IAAI;IACxB,UAAU,EAAE,gBAAQ,CAAC,KAAK;IAC1B,QAAQ,EAAE,gBAAQ,CAAC,GAAG;IACtB,QAAQ,EAAE,gBAAQ,CAAC,WAAW;IAC9B,QAAQ,EAAE,gBAAQ,CAAC,WAAW;IAC9B,UAAU,EAAE,gBAAQ,CAAC,KAAK;IAC1B,YAAY,EAAE,gBAAQ,CAAC,OAAO;IAC9B,YAAY,EAAE,gBAAQ,CAAC,OAAO;IAC9B,UAAU,EAAE,gBAAQ,CAAC,aAAa;IAClC,WAAW,EAAE,gBAAQ,CAAC,MAAM;CAC7B,CAAC;AAEF,MAAM,iBAAiB,GAAiC;IACtD,GAAG,EAAE,CAAC,IAAI,EAAE,GAAW,EAAE,EAAE;QACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QACnD,CAAC;QACD,OAAO,CAAC,gBAAQ,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/B,CAAC;IACD,QAAQ,EAAE,CAAC,KAAK,EAAE,QAAkB,EAAE,EAAE,CAAC,QAAQ;IACjD,kBAAkB,EAAE,CAAC,IAAI,EAAE,QAAkB,EAAE,EAAE,CAAC;QAChD,gBAAQ,CAAC,WAAW;QACpB,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC;KACvB;IACD,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;QAClB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,SAAS,IAAI,GAAG,CAAC;QAC3C,MAAM,MAAM,GAAa,CAAC,gBAAQ,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;QAC7D,IAAI,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC;YAC5B,OAAO,CAAC,gBAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACjB,gBAAQ,CAAC,OAAO;QAChB;YACE;gBACE,gBAAQ,CAAC,IAAI;gBACb;oBACE,CAAC,gBAAQ,CAAC,UAAU,EAAE,CAAC,IAAA,yBAAiB,GAAE,CAAC,CAAC;oBAC5C,CAAC,gBAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,gBAAQ,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;iBACvD;aACF;YACD,IAAI,CAAC,KAAK;SACX;KACF;IACD,SAAS,EAAE,CAAC,IAAI,EAAE,KAAe,EAAE,EAAE;QACnC,MAAM,KAAK,GAAG,IAAA,yBAAiB,GAAE,CAAC;QAClC,OAAO;YACL,gBAAQ,CAAC,OAAO;YAChB;gBACE;oBACE,gBAAQ,CAAC,IAAI;oBACb;wBACE,CAAC,gBAAQ,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC;wBAC9B,CAAC,gBAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,gBAAQ,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;qBAC7D;iBACF;gBACD,IAAI,CAAC,KAAK;aACX;SACF,CAAC;IACJ,CAAC;IACD,SAAS,EAAE,CAAC,IAAI,EAAE,GAAa,EAAE,EAAE,CAAC,CAAC,gBAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACzE,SAAS,EAAE,CAAC,IAAI,EAAE,KAAe,EAAE,GAAc,EAAE,EAAE;QACnD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACtB,OAAO,CAAC,gBAAQ,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,CAAC,gBAAQ,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAC/C,CAAC;IACD,SAAS,EAAE,CAAC,IAAI,EAAE,GAAa,EAAE,GAAc,EAAE,EAAE;QACjD,MAAM,OAAO,GAAa,CAAC,gBAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;QAChE,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACtB,OAAO,CAAC,gBAAQ,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;QAC5C,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;CACF,CAAC;AAOF,MAAM,cAAc,GAAqC;IACvD,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACvB,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAa,CAAC;QACzC,OAAO,CAAC,gBAAQ,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;IACxD,CAAC;IACD,UAAU,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QAC1B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,KAAK,GAAG,IAAA,yBAAiB,GAAE,CAAC;QAClC,MAAM,GAAG,GAAa,CAAC,gBAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;QAC9C,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACvD,OAAO;YACL,gBAAQ,CAAC,MAAM;YACf,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,gBAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,gBAAQ,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;SACtE,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACvB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,KAAK,GAAG,IAAA,yBAAiB,GAAE,CAAC;QAClC,MAAM,GAAG,GAAa,CAAC,gBAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;QAC9C,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACvD,OAAO;YACL,gBAAQ,CAAC,GAAG;YACZ,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,gBAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,gBAAQ,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;SACtE,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,SAAS,gBAAgB,CACvB,IAAc,EACd,QAAgB,EAChB,IAAgB;IAEhB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,gBAAgB,CACvB,MAAoB,EACpB,OAAwB,EACxB,aAAuB,CAAC,gBAAQ,CAAC,YAAY,CAAC;IAE9C,MAAM,OAAO,GAAsB,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;IAElE,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAChC,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAChD,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,CAAC,KAAK,GAAG,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC5C,SAAS;QACX,CAAC;QACD,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;QACvE,MAAM,UAAU,GAAG,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACjD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO,CAAC,KAAK,GAAG,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;YACzE,SAAS;QACX,CAAC;QACD,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACtD,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO,CAAC,KAAK,GAAI,cAAsB,CAAC,OAAO,EAAE,GAAG,WAAW,CAAC,CAAC;YACjE,SAAS;QACX,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,mCAAmC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC;IACvB,OAAO,OAAO,CAAC,KAAK,CAAC;AACvB,CAAC;AAED,SAAgB,WAAW,CACzB,KAAqB,EACrB,OAAwB;IAExB,IAAI,KAAK,YAAY,+BAAU,EAAE,CAAC;QAChC,OAAO,gBAAgB,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,KAAK,YAAY,0BAAK,EAAE,CAAC;QAC3B,OAAO,cAAc,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACvC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO;gBACL,gBAAQ,CAAC,UAAU;gBACnB,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;aAClC,CAAC;QAChB,CAAC;QACD,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;YAC1B,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI,KAAK,YAAY,MAAM,EAAE,CAAC;YAC5B,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;gBACxC,GAAG;gBACH,WAAW,CAAC,GAAG,EAAE,OAAO,CAAC;aAC1B,CAAC,CACH,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,SAAgB,CAAC;IAC1B,CAAC;IAED,OAAO,KAAiB,CAAC;AAC3B,CAAC;AAED,SAAS,UAAU,CAAC,IAAU;IAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC1C,OAAO;QACL,WAAW,EAAE,MAAM;QACnB,UAAU,EAAE,CAAC,IAAI,GAAG,IAAI;QACxB,QAAQ,EAAE,GAAG,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC;aACzE,OAAO,CAAC,CAAC,CAAC;aACV,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,EAAE,CAAC;aAC3C,OAAO,CAAC,CAAC,CAAC;aACV,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE;KACtB,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CACrB,MAAoB,EACpB,OAAwB;IAExB,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,KAAK,EAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC9B,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnC,IAAA,qBAAM,EAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACrC,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;IACD,OAAO,0BAAc,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AACvD,CAAC;AAED,SAAgB,cAAc,CAC5B,IAAgB,EAChB,OAAwB,EACxB,QAAoB;IAEpB,MAAM,UAAU,GAAa,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC1C,MAAM,OAAO,GAAwB,EAAE,CAAC;IACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;QAC3C,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5B,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC;IAC9C,CAAC;IACD,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAC/C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;QAC3C,IAAI,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;YACzC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QACvD,CAAC;aAAM,CAAC;YACN,OAAO,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -1,8 +1,4 @@
|
|
|
1
|
-
import type
|
|
2
|
-
import type { TermJson } from "rethinkdb-ts/lib/internal-types";
|
|
3
|
-
import { DecodingContext, type QueryStage } from "./utils";
|
|
4
|
-
export declare function DecodeValue(value: Value<unknown>, context: DecodingContext): TermJson;
|
|
5
|
-
export declare function DecodeFunction(func: QueryStage, context: DecodingContext, argTerms: TermJson[]): TermJson;
|
|
1
|
+
import { type QueryStage } from "./utils";
|
|
6
2
|
export declare function RunQuery(stages: QueryStage[]): Promise<any>;
|
|
7
3
|
export declare function ReadCursor(reqId: number, stages: QueryStage[]): Promise<{
|
|
8
4
|
done: boolean;
|
|
@@ -4,92 +4,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.executeTermJson = void 0;
|
|
7
|
-
exports.DecodeValue = DecodeValue;
|
|
8
|
-
exports.DecodeFunction = DecodeFunction;
|
|
9
7
|
exports.RunQuery = RunQuery;
|
|
10
8
|
exports.ReadCursor = ReadCursor;
|
|
11
9
|
exports.CloseCursor = CloseCursor;
|
|
12
10
|
const node_assert_1 = __importDefault(require("node:assert"));
|
|
13
|
-
const
|
|
14
|
-
const enums_1 = require("rethinkdb-ts/lib/proto/enums");
|
|
15
|
-
const connection_1 = require("../../connection");
|
|
11
|
+
const atomic_1 = require("@antelopejs/interface-database/atomic");
|
|
16
12
|
const logger_1 = require("../../utils/logger");
|
|
17
|
-
const
|
|
18
|
-
const schema_1 = require("./schema");
|
|
13
|
+
const connection_1 = require("../../connection");
|
|
19
14
|
const selection_1 = require("./selection");
|
|
15
|
+
const atomic_2 = require("./atomic");
|
|
20
16
|
const utils_1 = require("./utils");
|
|
21
|
-
|
|
22
|
-
if (value instanceof interface_database_1.ValueProxy) {
|
|
23
|
-
return (0, expression_1.decodeExpression)(value.build(), context);
|
|
24
|
-
}
|
|
25
|
-
if (value instanceof interface_database_1.Query) {
|
|
26
|
-
return decodeSubquery(value.build(), context);
|
|
27
|
-
}
|
|
28
|
-
if (value && typeof value === "object") {
|
|
29
|
-
if (Array.isArray(value)) {
|
|
30
|
-
return [
|
|
31
|
-
enums_1.TermType.MAKE_ARRAY,
|
|
32
|
-
value.map((val) => DecodeValue(val, context)),
|
|
33
|
-
];
|
|
34
|
-
}
|
|
35
|
-
if (value instanceof Date) {
|
|
36
|
-
return dateToReql(value);
|
|
37
|
-
}
|
|
38
|
-
if (value instanceof Object) {
|
|
39
|
-
return Object.fromEntries(Object.entries(value).map(([key, val]) => [
|
|
40
|
-
key,
|
|
41
|
-
DecodeValue(val, context),
|
|
42
|
-
]));
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
if (value === undefined) {
|
|
46
|
-
return undefined;
|
|
47
|
-
}
|
|
48
|
-
return value;
|
|
49
|
-
}
|
|
50
|
-
function dateToReql(date) {
|
|
51
|
-
const timeZone = date.getTimezoneOffset();
|
|
52
|
-
return {
|
|
53
|
-
$reql_type$: "TIME",
|
|
54
|
-
epoch_time: +date / 1000,
|
|
55
|
-
timezone: `${timeZone <= 0 ? "+" : "-"}${Math.abs(Math.floor(timeZone / 60))
|
|
56
|
-
.toFixed(0)
|
|
57
|
-
.padStart(2, "0")}:${Math.abs(timeZone % 60)
|
|
58
|
-
.toFixed(0)
|
|
59
|
-
.padStart(2, "0")}`,
|
|
60
|
-
};
|
|
61
|
-
}
|
|
62
|
-
function decodeSubquery(stages, context) {
|
|
63
|
-
if (stages[0]?.stage === "arg") {
|
|
64
|
-
const num = stages[0].args[0];
|
|
65
|
-
const provider = context.args[num];
|
|
66
|
-
(0, node_assert_1.default)(provider, "Unknown arg used");
|
|
67
|
-
return provider(stages);
|
|
68
|
-
}
|
|
69
|
-
return selection_1.SelectionQuery.buildTermJson(stages, context);
|
|
70
|
-
}
|
|
71
|
-
function DecodeFunction(func, context, argTerms) {
|
|
72
|
-
const argNumbers = func.args[0];
|
|
73
|
-
const oldArgs = {};
|
|
74
|
-
for (let i = 0; i < argNumbers.length; ++i) {
|
|
75
|
-
oldArgs[argNumbers[i]] = context.args[argNumbers[i]];
|
|
76
|
-
const argTerm = argTerms[i];
|
|
77
|
-
context.args[argNumbers[i]] = () => argTerm;
|
|
78
|
-
}
|
|
79
|
-
const val = DecodeValue(func.args[1], context);
|
|
80
|
-
for (let i = 0; i < argNumbers.length; ++i) {
|
|
81
|
-
if (oldArgs[argNumbers[i]] !== undefined) {
|
|
82
|
-
context.args[argNumbers[i]] = oldArgs[argNumbers[i]];
|
|
83
|
-
}
|
|
84
|
-
else {
|
|
85
|
-
delete context.args[argNumbers[i]];
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
return val;
|
|
89
|
-
}
|
|
17
|
+
const schema_1 = require("./schema");
|
|
90
18
|
const SCHEMA_STAGE_HANDLERS = {
|
|
91
19
|
instance: async (schemaId, stages) => {
|
|
92
20
|
await (0, schema_1.WaitForSchemaReady)(schemaId);
|
|
21
|
+
if (stages.some((stage) => stage.stage === "atomicMutation")) {
|
|
22
|
+
return runAtomicStages(stages);
|
|
23
|
+
}
|
|
93
24
|
const context = new utils_1.DecodingContext();
|
|
94
25
|
return selection_1.SelectionQuery.decode(stages, context).run();
|
|
95
26
|
},
|
|
@@ -106,6 +37,16 @@ async function RunQuery(stages) {
|
|
|
106
37
|
(0, node_assert_1.default)(handler, `Unknown schema stage '${next}'`);
|
|
107
38
|
return handler(schemaId, stages);
|
|
108
39
|
}
|
|
40
|
+
function runAtomicStages(stages) {
|
|
41
|
+
const terminal = stages.at(-1);
|
|
42
|
+
(0, node_assert_1.default)(terminal?.stage === "atomicMutation", "Atomic mutation must be terminal");
|
|
43
|
+
(0, node_assert_1.default)(terminal.options === undefined && terminal.args?.length === 2, "Atomic mutation requires one key and request without options");
|
|
44
|
+
const prefix = stages.slice(0, -1);
|
|
45
|
+
(0, atomic_1.ValidateAtomicMutationTable)(prefix);
|
|
46
|
+
const query = selection_1.SelectionQuery.decode(prefix, new utils_1.DecodingContext());
|
|
47
|
+
(0, node_assert_1.default)(typeof query.instanceId !== "symbol", "Atomic mutation must be scoped");
|
|
48
|
+
return (0, atomic_2.runAtomicMutation)(query.getTableTerm(), query.instanceId ?? "", terminal.args[0], terminal.args[1]);
|
|
49
|
+
}
|
|
109
50
|
const openCursors = new Map();
|
|
110
51
|
async function ReadCursor(reqId, stages) {
|
|
111
52
|
if (!openCursors.has(reqId)) {
|
|
@@ -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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/implementations/database/schema.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/implementations/database/schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { CROSS_INSTANCE } from "@antelopejs/interface-database/schema";
|
|
2
1
|
import type { TermJson } from "rethinkdb-ts/lib/internal-types";
|
|
2
|
+
import { CROSS_INSTANCE } from "@antelopejs/interface-database/schema";
|
|
3
3
|
import { DecodingContext, type QueryStage } from "./utils";
|
|
4
4
|
type ResultType = "stream" | "table" | "selection" | "insert" | "update" | "replace" | "delete";
|
|
5
5
|
export declare class SelectionQuery {
|
|
@@ -16,6 +16,7 @@ export declare class SelectionQuery {
|
|
|
16
16
|
private insertRawArgs?;
|
|
17
17
|
private term;
|
|
18
18
|
private readonly tenant;
|
|
19
|
+
private scopedGet;
|
|
19
20
|
constructor(schemaId: string, instanceId: string | typeof CROSS_INSTANCE | undefined, tableName: string, database: string, context: DecodingContext);
|
|
20
21
|
static buildTermJson(stages: QueryStage[], context: DecodingContext): TermJson;
|
|
21
22
|
static decode(stages: QueryStage[], context: DecodingContext): SelectionQuery;
|
|
@@ -27,6 +28,7 @@ export declare class SelectionQuery {
|
|
|
27
28
|
private buildConflictInsertKeys;
|
|
28
29
|
private stampTenantId;
|
|
29
30
|
getTableTerm(): TermJson;
|
|
31
|
+
setGet(key: TermJson): void;
|
|
30
32
|
buildTenantFilterTerm(baseTerm: TermJson): TermJson;
|
|
31
33
|
isScopedTenant(): boolean;
|
|
32
34
|
isSimpleTable(): boolean;
|