@lossless.org/client 1.21.1 → 1.22.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/.smartconfig.json +1 -2
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/nosqldb/classes.atomicdelete.js +8 -4
- package/dist_ts/nosqldb/classes.atomicfindoneandupdate.js +19 -4
- package/dist_ts/nosqldb/classes.atomicupdate.js +16 -5
- package/dist_ts/nosqldb/classes.bootstraprecord.js +31 -5
- package/dist_ts/nosqldb/classes.collection.js +17 -14
- package/dist_ts/nosqldb/classes.connection.d.ts +3 -0
- package/dist_ts/nosqldb/classes.connection.js +3 -2
- package/dist_ts/nosqldb/classes.db.d.ts +27 -2
- package/dist_ts/nosqldb/classes.db.js +42 -3
- package/dist_ts/nosqldb/classes.doc.d.ts +3 -1
- package/dist_ts/nosqldb/classes.doc.js +15 -9
- package/dist_ts/nosqldb/classes.exactpersistence.d.ts +13 -2
- package/dist_ts/nosqldb/classes.exactpersistence.js +64 -17
- package/dist_ts/nosqldb/classes.operationdeadline.d.ts +5 -0
- package/dist_ts/nosqldb/classes.operationdeadline.js +8 -1
- package/dist_ts/nosqldb/classes.readtracker.d.ts +26 -0
- package/dist_ts/nosqldb/classes.readtracker.js +124 -1
- package/dist_ts/nosqldb/classes.session.d.ts +34 -5
- package/dist_ts/nosqldb/classes.session.js +134 -8
- package/dist_ts/nosqldb/classes.storedinspection.js +7 -4
- package/dist_ts/nosqldb/classes.writeobserver.d.ts +5 -0
- package/dist_ts/nosqldb/classes.writeobserver.js +1 -1
- package/dist_ts/nosqldb/classes.writerevisions.d.ts +81 -0
- package/dist_ts/nosqldb/classes.writerevisions.js +246 -0
- package/package.json +8 -5
- package/readme.md +10 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/nosqldb/classes.atomicdelete.ts +11 -2
- package/ts/nosqldb/classes.atomicfindoneandupdate.ts +25 -2
- package/ts/nosqldb/classes.atomicupdate.ts +25 -3
- package/ts/nosqldb/classes.bootstraprecord.ts +29 -4
- package/ts/nosqldb/classes.collection.ts +20 -12
- package/ts/nosqldb/classes.connection.ts +5 -1
- package/ts/nosqldb/classes.db.ts +65 -2
- package/ts/nosqldb/classes.doc.ts +16 -8
- package/ts/nosqldb/classes.exactpersistence.ts +83 -21
- package/ts/nosqldb/classes.operationdeadline.ts +8 -0
- package/ts/nosqldb/classes.readtracker.ts +139 -0
- package/ts/nosqldb/classes.session.ts +191 -8
- package/ts/nosqldb/classes.storedinspection.ts +6 -3
- package/ts/nosqldb/classes.writeobserver.ts +5 -0
- package/ts/nosqldb/classes.writerevisions.ts +328 -0
package/.smartconfig.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@lossless.org/client',
|
|
6
|
-
version: '1.
|
|
6
|
+
version: '1.22.1',
|
|
7
7
|
description: 'One typed client for NoSQLDB, MongoDB, SQLDB, MariaDB, ClickHouse and S3 object storage.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxzQkFBc0I7SUFDNUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLDBGQUEwRjtDQUN4RyxDQUFBIn0=
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
|
-
import { reportSmartdataCollectionWrite, runWithOrdinarySmartdataSession, } from './classes.session.js';
|
|
2
|
+
import { readPreviousWriteRevisions, reportSmartdataCollectionWrite, runWithOrdinarySmartdataSession, } from './classes.session.js';
|
|
3
3
|
/**
|
|
4
4
|
* Executes a model-validated atomic delete against MongoDB.
|
|
5
5
|
*
|
|
@@ -11,16 +11,18 @@ export const executeAtomicDelete = async (collectionArg, filterArg, optsArg) =>
|
|
|
11
11
|
return runWithOrdinarySmartdataSession(optsArg?.session, collectionArg.smartdataDb, {
|
|
12
12
|
ordinaryWrite: true,
|
|
13
13
|
prepared: collectionArg.isInitializedForCurrentDatabase(),
|
|
14
|
+
prepare: () => collectionArg.init(),
|
|
14
15
|
collectionName: collectionArg.collectionName,
|
|
15
16
|
timeoutMS: optsArg?.timeoutMS,
|
|
16
17
|
}, async (rawSessionArg, deadlineArg) => {
|
|
17
18
|
await deadlineArg.join(collectionArg.init());
|
|
19
|
+
const previousPartitionsRead = await readPreviousWriteRevisions(collectionArg.smartdataDb, collectionArg.mongoDbCollection, rawSessionArg, filterArg, deadlineArg);
|
|
18
20
|
const result = await collectionArg.mongoDbCollection.deleteOne(filterArg, {
|
|
19
21
|
session: rawSessionArg,
|
|
20
22
|
...deadlineArg.commandOptions(),
|
|
21
23
|
});
|
|
22
24
|
if (result.deletedCount > 0) {
|
|
23
|
-
reportSmartdataCollectionWrite(collectionArg, optsArg?.session, 'delete', null, filterArg, { images: 'none' });
|
|
25
|
+
reportSmartdataCollectionWrite(collectionArg, optsArg?.session, 'delete', null, filterArg, { images: 'none', ...(previousPartitionsRead ? { previousPartitionsRead } : {}) });
|
|
24
26
|
}
|
|
25
27
|
return result;
|
|
26
28
|
});
|
|
@@ -37,19 +39,21 @@ export const executeAtomicDeleteMany = async (collectionArg, filterArg, optsArg)
|
|
|
37
39
|
return runWithOrdinarySmartdataSession(optsArg?.session, collectionArg.smartdataDb, {
|
|
38
40
|
ordinaryWrite: true,
|
|
39
41
|
prepared: collectionArg.isInitializedForCurrentDatabase(),
|
|
42
|
+
prepare: () => collectionArg.init(),
|
|
40
43
|
collectionName: collectionArg.collectionName,
|
|
41
44
|
timeoutMS: optsArg?.timeoutMS,
|
|
42
45
|
signal: optsArg?.signal,
|
|
43
46
|
}, async (rawSessionArg, deadlineArg) => {
|
|
44
47
|
await deadlineArg.join(collectionArg.init());
|
|
48
|
+
const previousPartitionsRead = await readPreviousWriteRevisions(collectionArg.smartdataDb, collectionArg.mongoDbCollection, rawSessionArg, filterArg, deadlineArg);
|
|
45
49
|
const result = await collectionArg.mongoDbCollection.deleteMany(filterArg, {
|
|
46
50
|
session: rawSessionArg,
|
|
47
51
|
...deadlineArg.commandOptions(),
|
|
48
52
|
});
|
|
49
53
|
if (result.deletedCount > 0) {
|
|
50
|
-
reportSmartdataCollectionWrite(collectionArg, optsArg?.session, 'delete', null, filterArg, { images: 'none' });
|
|
54
|
+
reportSmartdataCollectionWrite(collectionArg, optsArg?.session, 'delete', null, filterArg, { images: 'none', ...(previousPartitionsRead ? { previousPartitionsRead } : {}) });
|
|
51
55
|
}
|
|
52
56
|
return result;
|
|
53
57
|
});
|
|
54
58
|
};
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5hdG9taWNkZWxldGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9ub3NxbGRiL2NsYXNzZXMuYXRvbWljZGVsZXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBRXhDLE9BQU8sRUFDTCwwQkFBMEIsRUFDMUIsOEJBQThCLEVBQzlCLCtCQUErQixHQUVoQyxNQUFNLHNCQUFzQixDQUFDO0FBRTlCOzs7Ozs7R0FNRztBQUNILE1BQU0sQ0FBQyxNQUFNLG1CQUFtQixHQUFHLEtBQUssRUFDdEMsYUFBcUMsRUFDckMsU0FBMkQsRUFDM0QsT0FHQyxFQUNzQyxFQUFFO0lBQ3pDLE9BQU8sK0JBQStCLENBQ3BDLE9BQU8sRUFBRSxPQUFPLEVBQ2hCLGFBQWEsQ0FBQyxXQUFXLEVBQ3pCO1FBQ0UsYUFBYSxFQUFFLElBQUk7UUFDbkIsUUFBUSxFQUFFLGFBQWEsQ0FBQywrQkFBK0IsRUFBRTtRQUN6RCxPQUFPLEVBQUUsR0FBRyxFQUFFLENBQUMsYUFBYSxDQUFDLElBQUksRUFBRTtRQUNuQyxjQUFjLEVBQUUsYUFBYSxDQUFDLGNBQWM7UUFDNUMsU0FBUyxFQUFFLE9BQU8sRUFBRSxTQUFTO0tBQzlCLEVBQ0QsS0FBSyxFQUFFLGFBQWEsRUFBRSxXQUFXLEVBQUUsRUFBRTtRQUNuQyxNQUFNLFdBQVcsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7UUFDN0MsTUFBTSxzQkFBc0IsR0FBRyxNQUFNLDBCQUEwQixDQUM3RCxhQUFhLENBQUMsV0FBVyxFQUFFLGFBQWEsQ0FBQyxpQkFBaUIsRUFBRSxhQUFhLEVBQUUsU0FBUyxFQUFFLFdBQVcsQ0FDbEcsQ0FBQztRQUNGLE1BQU0sTUFBTSxHQUFHLE1BQU0sYUFBYSxDQUFDLGlCQUFpQixDQUFDLFNBQVMsQ0FDNUQsU0FBUyxFQUNUO1lBQ0UsT0FBTyxFQUFFLGFBQWE7WUFDdEIsR0FBRyxXQUFXLENBQUMsY0FBYyxFQUFFO1NBQ2hDLENBQ0YsQ0FBQztRQUNGLElBQUksTUFBTSxDQUFDLFlBQVksR0FBRyxDQUFDLEVBQUUsQ0FBQztZQUM1Qiw4QkFBOEIsQ0FDNUIsYUFBYSxFQUNiLE9BQU8sRUFBRSxPQUFPLEVBQ2hCLFFBQVEsRUFDUixJQUFJLEVBQ0osU0FBUyxFQUNULEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxHQUFHLENBQUMsc0JBQXNCLENBQUMsQ0FBQyxDQUFDLEVBQUUsc0JBQXNCLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FDbEYsQ0FBQztRQUNKLENBQUM7UUFDRCxPQUFPLE1BQU0sQ0FBQztJQUNoQixDQUFDLENBQ0YsQ0FBQztBQUNKLENBQUMsQ0FBQztBQUVGOzs7Ozs7O0dBT0c7QUFDSCxNQUFNLENBQUMsTUFBTSx1QkFBdUIsR0FBRyxLQUFLLEVBQzFDLGFBQXFDLEVBQ3JDLFNBQTJELEVBQzNELE9BSUMsRUFDc0MsRUFBRTtJQUN6QyxPQUFPLCtCQUErQixDQUNwQyxPQUFPLEVBQUUsT0FBTyxFQUNoQixhQUFhLENBQUMsV0FBVyxFQUN6QjtRQUNFLGFBQWEsRUFBRSxJQUFJO1FBQ25CLFFBQVEsRUFBRSxhQUFhLENBQUMsK0JBQStCLEVBQUU7UUFDekQsT0FBTyxFQUFFLEdBQUcsRUFBRSxDQUFDLGFBQWEsQ0FBQyxJQUFJLEVBQUU7UUFDbkMsY0FBYyxFQUFFLGFBQWEsQ0FBQyxjQUFjO1FBQzVDLFNBQVMsRUFBRSxPQUFPLEVBQUUsU0FBUztRQUM3QixNQUFNLEVBQUUsT0FBTyxFQUFFLE1BQU07S0FDeEIsRUFDRCxLQUFLLEVBQUUsYUFBYSxFQUFFLFdBQVcsRUFBRSxFQUFFO1FBQ25DLE1BQU0sV0FBVyxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUM3QyxNQUFNLHNCQUFzQixHQUFHLE1BQU0sMEJBQTBCLENBQzdELGFBQWEsQ0FBQyxXQUFXLEVBQUUsYUFBYSxDQUFDLGlCQUFpQixFQUFFLGFBQWEsRUFBRSxTQUFTLEVBQUUsV0FBVyxDQUNsRyxDQUFDO1FBQ0YsTUFBTSxNQUFNLEdBQUcsTUFBTSxhQUFhLENBQUMsaUJBQWlCLENBQUMsVUFBVSxDQUM3RCxTQUFTLEVBQ1Q7WUFDRSxPQUFPLEVBQUUsYUFBYTtZQUN0QixHQUFHLFdBQVcsQ0FBQyxjQUFjLEVBQUU7U0FDaEMsQ0FDRixDQUFDO1FBQ0YsSUFBSSxNQUFNLENBQUMsWUFBWSxHQUFHLENBQUMsRUFBRSxDQUFDO1lBQzVCLDhCQUE4QixDQUM1QixhQUFhLEVBQ2IsT0FBTyxFQUFFLE9BQU8sRUFDaEIsUUFBUSxFQUNSLElBQUksRUFDSixTQUFTLEVBQ1QsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLEdBQUcsQ0FBQyxzQkFBc0IsQ0FBQyxDQUFDLENBQUMsRUFBRSxzQkFBc0IsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUNsRixDQUFDO1FBQ0osQ0FBQztRQUNELE9BQU8sTUFBTSxDQUFDO0lBQ2hCLENBQUMsQ0FDRixDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
import { normalizeOrdinaryPersistenceError, SmartdataPersistenceError, } from './classes.persistence.js';
|
|
3
|
-
import { reportSmartdataCollectionWrite, runWithOrdinarySmartdataSession, isSmartdataSession, failSmartdataTransaction, } from './classes.session.js';
|
|
3
|
+
import { readPreviousWriteRevisions, reportSmartdataCollectionWrite, runWithOrdinarySmartdataSession, isOrdinarySessionInTransaction, isSmartdataSession, failSmartdataTransaction, } from './classes.session.js';
|
|
4
4
|
import { validateOrdinaryStoredDocument } from './classes.ordinarypersistence.js';
|
|
5
5
|
const unsupportedResult = () => {
|
|
6
6
|
throw new SmartdataPersistenceError('unsupported_operation', 'MongoDB returned unsupported atomic find-one-and-update metadata.');
|
|
@@ -44,12 +44,17 @@ const classifyResult = (resultArg, optionsArg) => {
|
|
|
44
44
|
*/
|
|
45
45
|
export const executeAtomicFindOneAndUpdate = async (collectionArg, filterArg, updateArg, optionsArg) => {
|
|
46
46
|
const policy = collectionArg.getBoundModelSchema()?.ordinaryPersistence;
|
|
47
|
-
|
|
47
|
+
// The caller's own transaction: one SmartData starts for write revisions
|
|
48
|
+
// would let a validated update run where it is otherwise refused.
|
|
49
|
+
if (policy && (!isSmartdataSession(optionsArg.session)
|
|
50
|
+
|| !isOrdinarySessionInTransaction(optionsArg.session)
|
|
51
|
+
|| optionsArg.returnDocument !== 'after')) {
|
|
48
52
|
throw new SmartdataPersistenceError('unsupported_operation', 'Validated ordinary updates require an owned transaction and an after image.');
|
|
49
53
|
}
|
|
50
54
|
return runWithOrdinarySmartdataSession(optionsArg.session, collectionArg.smartdataDb, {
|
|
51
55
|
ordinaryWrite: true,
|
|
52
56
|
prepared: collectionArg.isInitializedForCurrentDatabase(),
|
|
57
|
+
prepare: () => collectionArg.init(),
|
|
53
58
|
collectionName: collectionArg.collectionName,
|
|
54
59
|
timeoutMS: optionsArg.timeoutMS,
|
|
55
60
|
}, async (rawSessionArg, deadlineArg) => {
|
|
@@ -58,6 +63,9 @@ export const executeAtomicFindOneAndUpdate = async (collectionArg, filterArg, up
|
|
|
58
63
|
}
|
|
59
64
|
await deadlineArg.join(collectionArg.init());
|
|
60
65
|
try {
|
|
66
|
+
// A before image states the document's previous partition itself.
|
|
67
|
+
const previousPartitionsRead = optionsArg.returnDocument === 'after'
|
|
68
|
+
&& await readPreviousWriteRevisions(collectionArg.smartdataDb, collectionArg.mongoDbCollection, rawSessionArg, filterArg, deadlineArg);
|
|
61
69
|
const result = await collectionArg.mongoDbCollection.findOneAndUpdate(filterArg, updateArg, {
|
|
62
70
|
includeResultMetadata: true,
|
|
63
71
|
returnDocument: optionsArg.returnDocument,
|
|
@@ -75,6 +83,7 @@ export const executeAtomicFindOneAndUpdate = async (collectionArg, filterArg, up
|
|
|
75
83
|
reportSmartdataCollectionWrite(collectionArg, optionsArg.session, classified.status === 'upserted' ? 'insert' : 'update', classified.document ? [classified.document] : null, filterArg, {
|
|
76
84
|
images: classified.document ? optionsArg.returnDocument : 'none',
|
|
77
85
|
update: updateArg,
|
|
86
|
+
...(previousPartitionsRead ? { previousPartitionsRead } : {}),
|
|
78
87
|
});
|
|
79
88
|
}
|
|
80
89
|
return classified;
|
|
@@ -109,11 +118,14 @@ export const executeAtomicFindOneAndReplace = async (collectionArg, filterArg, r
|
|
|
109
118
|
return runWithOrdinarySmartdataSession(optionsArg.session, collectionArg.smartdataDb, {
|
|
110
119
|
ordinaryWrite: true,
|
|
111
120
|
prepared: collectionArg.isInitializedForCurrentDatabase(),
|
|
121
|
+
prepare: () => collectionArg.init(),
|
|
112
122
|
collectionName: collectionArg.collectionName,
|
|
113
123
|
timeoutMS: optionsArg.timeoutMS,
|
|
114
124
|
}, async (rawSessionArg, deadlineArg) => {
|
|
115
125
|
await deadlineArg.join(collectionArg.init());
|
|
116
126
|
try {
|
|
127
|
+
const previousPartitionsRead = optionsArg.returnDocument === 'after'
|
|
128
|
+
&& await readPreviousWriteRevisions(collectionArg.smartdataDb, collectionArg.mongoDbCollection, rawSessionArg, filterArg, deadlineArg);
|
|
117
129
|
const result = await collectionArg.mongoDbCollection.findOneAndReplace(filterArg, replacementArg, {
|
|
118
130
|
includeResultMetadata: true,
|
|
119
131
|
returnDocument: optionsArg.returnDocument,
|
|
@@ -133,7 +145,10 @@ export const executeAtomicFindOneAndReplace = async (collectionArg, filterArg, r
|
|
|
133
145
|
// A before image leaves the replacement as the only image of the new state.
|
|
134
146
|
reportSmartdataCollectionWrite(collectionArg, optionsArg.session, 'replace', optionsArg.returnDocument === 'after'
|
|
135
147
|
? [classified.document]
|
|
136
|
-
: [classified.document, replacementArg], filterArg, {
|
|
148
|
+
: [classified.document, replacementArg], filterArg, {
|
|
149
|
+
images: optionsArg.returnDocument === 'after' ? 'after' : 'beforeAndAfter',
|
|
150
|
+
...(previousPartitionsRead ? { previousPartitionsRead } : {}),
|
|
151
|
+
});
|
|
137
152
|
}
|
|
138
153
|
return classified;
|
|
139
154
|
}
|
|
@@ -142,4 +157,4 @@ export const executeAtomicFindOneAndReplace = async (collectionArg, filterArg, r
|
|
|
142
157
|
}
|
|
143
158
|
});
|
|
144
159
|
};
|
|
145
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
160
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5hdG9taWNmaW5kb25lYW5kdXBkYXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvbm9zcWxkYi9jbGFzc2VzLmF0b21pY2ZpbmRvbmVhbmR1cGRhdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxjQUFjLENBQUM7QUFFeEMsT0FBTyxFQUNMLGlDQUFpQyxFQUNqQyx5QkFBeUIsR0FDMUIsTUFBTSwwQkFBMEIsQ0FBQztBQUNsQyxPQUFPLEVBQ0wsMEJBQTBCLEVBQzFCLDhCQUE4QixFQUM5QiwrQkFBK0IsRUFDL0IsOEJBQThCLEVBQzlCLGtCQUFrQixFQUNsQix3QkFBd0IsR0FHekIsTUFBTSxzQkFBc0IsQ0FBQztBQUM5QixPQUFPLEVBQUUsOEJBQThCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQWFsRixNQUFNLGlCQUFpQixHQUFHLEdBQVUsRUFBRTtJQUNwQyxNQUFNLElBQUkseUJBQXlCLENBQ2pDLHVCQUF1QixFQUN2QixtRUFBbUUsQ0FDcEUsQ0FBQztBQUNKLENBQUMsQ0FBQztBQUVGLE1BQU0sY0FBYyxHQUFHLENBQ3JCLFNBQWlFLEVBQ2pFLFVBR0MsRUFDdUMsRUFBRTtJQUMxQyxNQUFNLFFBQVEsR0FBRyxTQUFTLENBQUMsZUFBZSxDQUFDO0lBQzNDLElBQUksU0FBUyxDQUFDLEVBQUUsS0FBSyxDQUFDLElBQUksQ0FBQyxRQUFRO1FBQUUsT0FBTyxpQkFBaUIsRUFBRSxDQUFDO0lBQ2hFLE1BQU0sV0FBVyxHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsVUFBVSxDQUFDLENBQUM7SUFDL0UsTUFBTSxRQUFRLEdBQUcsUUFBUSxDQUFDLFFBQVEsQ0FBQztJQUVuQyxJQUNFLFFBQVEsQ0FBQyxDQUFDLEtBQUssQ0FBQztXQUNiLFFBQVEsQ0FBQyxlQUFlLEtBQUssSUFBSTtXQUNqQyxDQUFDLFdBQVc7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
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
import { getMongoBulkWriteErrorIndexes, normalizeOrdinaryPersistenceError, } from './classes.persistence.js';
|
|
3
|
-
import { reportSmartdataCollectionWrite, runWithOrdinarySmartdataSession, } from './classes.session.js';
|
|
3
|
+
import { readPreviousWriteRevisions, reportSmartdataCollectionWrite, runWithOrdinarySmartdataSession, } from './classes.session.js';
|
|
4
4
|
/**
|
|
5
5
|
* Executes a model-validated atomic update against MongoDB.
|
|
6
6
|
*
|
|
@@ -12,18 +12,20 @@ export const executeAtomicUpdate = async (collectionArg, filterArg, updateArg, o
|
|
|
12
12
|
return runWithOrdinarySmartdataSession(optsArg?.session, collectionArg.smartdataDb, {
|
|
13
13
|
ordinaryWrite: true,
|
|
14
14
|
prepared: collectionArg.isInitializedForCurrentDatabase(),
|
|
15
|
+
prepare: () => collectionArg.init(),
|
|
15
16
|
collectionName: collectionArg.collectionName,
|
|
16
17
|
timeoutMS: optsArg?.timeoutMS,
|
|
17
18
|
}, async (rawSessionArg, deadlineArg) => {
|
|
18
19
|
await deadlineArg.join(collectionArg.init());
|
|
19
20
|
try {
|
|
21
|
+
const previousPartitionsRead = await readPreviousWriteRevisions(collectionArg.smartdataDb, collectionArg.mongoDbCollection, rawSessionArg, filterArg, deadlineArg);
|
|
20
22
|
const result = await collectionArg.mongoDbCollection.updateOne(filterArg, updateArg, {
|
|
21
23
|
upsert: optsArg?.upsert === true,
|
|
22
24
|
session: rawSessionArg,
|
|
23
25
|
...deadlineArg.commandOptions(),
|
|
24
26
|
});
|
|
25
27
|
if (result.upsertedCount > 0 || result.matchedCount > 0) {
|
|
26
|
-
reportSmartdataCollectionWrite(collectionArg, optsArg?.session, result.upsertedCount > 0 ? 'insert' : 'update', optsArg?.observedDocument ? [optsArg.observedDocument] : null, filterArg, { images: 'none', update: updateArg });
|
|
28
|
+
reportSmartdataCollectionWrite(collectionArg, optsArg?.session, result.upsertedCount > 0 ? 'insert' : 'update', optsArg?.observedDocument ? [optsArg.observedDocument] : null, filterArg, { images: 'none', update: updateArg, ...(previousPartitionsRead ? { previousPartitionsRead } : {}) });
|
|
27
29
|
}
|
|
28
30
|
return result;
|
|
29
31
|
}
|
|
@@ -45,10 +47,12 @@ export const executeAtomicUpsertMany = async (collectionArg, operationsArg, opts
|
|
|
45
47
|
return runWithOrdinarySmartdataSession(optsArg?.session, collectionArg.smartdataDb, {
|
|
46
48
|
ordinaryWrite: true,
|
|
47
49
|
prepared: collectionArg.isInitializedForCurrentDatabase(),
|
|
50
|
+
prepare: () => collectionArg.init(),
|
|
48
51
|
collectionName: collectionArg.collectionName,
|
|
49
52
|
timeoutMS: optsArg?.timeoutMS,
|
|
50
53
|
}, async (rawSessionArg, deadlineArg) => {
|
|
51
54
|
await deadlineArg.join(collectionArg.init());
|
|
55
|
+
let previousPartitionsRead = false;
|
|
52
56
|
/**
|
|
53
57
|
* Every entry upserts, so an entry that neither inserted nor failed
|
|
54
58
|
* matched its document.
|
|
@@ -57,10 +61,15 @@ export const executeAtomicUpsertMany = async (collectionArg, operationsArg, opts
|
|
|
57
61
|
operationsArg.forEach((operationArg, indexArg) => {
|
|
58
62
|
if (failedIndexesArg.has(indexArg))
|
|
59
63
|
return;
|
|
60
|
-
reportSmartdataCollectionWrite(collectionArg, optsArg?.session, Object.hasOwn(upsertedIdsArg ?? {}, indexArg) ? 'insert' : 'update', null, operationArg.filter, {
|
|
64
|
+
reportSmartdataCollectionWrite(collectionArg, optsArg?.session, Object.hasOwn(upsertedIdsArg ?? {}, indexArg) ? 'insert' : 'update', null, operationArg.filter, {
|
|
65
|
+
images: 'none',
|
|
66
|
+
update: operationArg.update,
|
|
67
|
+
...(previousPartitionsRead ? { previousPartitionsRead } : {}),
|
|
68
|
+
});
|
|
61
69
|
});
|
|
62
70
|
};
|
|
63
71
|
try {
|
|
72
|
+
previousPartitionsRead = await readPreviousWriteRevisions(collectionArg.smartdataDb, collectionArg.mongoDbCollection, rawSessionArg, { $or: operationsArg.map((operationArg) => operationArg.filter) }, deadlineArg);
|
|
64
73
|
const result = await collectionArg.mongoDbCollection.bulkWrite(operationsArg.map((operationArg) => ({
|
|
65
74
|
updateOne: {
|
|
66
75
|
filter: operationArg.filter,
|
|
@@ -105,17 +114,19 @@ export const executeAtomicUpdateMany = async (collectionArg, filterArg, updateAr
|
|
|
105
114
|
return runWithOrdinarySmartdataSession(optsArg?.session, collectionArg.smartdataDb, {
|
|
106
115
|
ordinaryWrite: true,
|
|
107
116
|
prepared: collectionArg.isInitializedForCurrentDatabase(),
|
|
117
|
+
prepare: () => collectionArg.init(),
|
|
108
118
|
collectionName: collectionArg.collectionName,
|
|
109
119
|
timeoutMS: optsArg?.timeoutMS,
|
|
110
120
|
}, async (rawSessionArg, deadlineArg) => {
|
|
111
121
|
await deadlineArg.join(collectionArg.init());
|
|
112
122
|
try {
|
|
123
|
+
const previousPartitionsRead = await readPreviousWriteRevisions(collectionArg.smartdataDb, collectionArg.mongoDbCollection, rawSessionArg, filterArg, deadlineArg);
|
|
113
124
|
const result = await collectionArg.mongoDbCollection.updateMany(filterArg, updateArg, {
|
|
114
125
|
session: rawSessionArg,
|
|
115
126
|
...deadlineArg.commandOptions(),
|
|
116
127
|
});
|
|
117
128
|
if (result.matchedCount > 0) {
|
|
118
|
-
reportSmartdataCollectionWrite(collectionArg, optsArg?.session, 'update', null, filterArg, { images: 'none', update: updateArg });
|
|
129
|
+
reportSmartdataCollectionWrite(collectionArg, optsArg?.session, 'update', null, filterArg, { images: 'none', update: updateArg, ...(previousPartitionsRead ? { previousPartitionsRead } : {}) });
|
|
119
130
|
}
|
|
120
131
|
return result;
|
|
121
132
|
}
|
|
@@ -124,4 +135,4 @@ export const executeAtomicUpdateMany = async (collectionArg, filterArg, updateAr
|
|
|
124
135
|
}
|
|
125
136
|
});
|
|
126
137
|
};
|
|
127
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
138
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5hdG9taWN1cGRhdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9ub3NxbGRiL2NsYXNzZXMuYXRvbWljdXBkYXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBRXhDLE9BQU8sRUFDTCw2QkFBNkIsRUFDN0IsaUNBQWlDLEdBQ2xDLE1BQU0sMEJBQTBCLENBQUM7QUFDbEMsT0FBTyxFQUNMLDBCQUEwQixFQUMxQiw4QkFBOEIsRUFDOUIsK0JBQStCLEdBRWhDLE1BQU0sc0JBQXNCLENBQUM7QUFFOUI7Ozs7OztHQU1HO0FBQ0gsTUFBTSxDQUFDLE1BQU0sbUJBQW1CLEdBQUcsS0FBSyxFQUN0QyxhQUFxQyxFQUNyQyxTQUEyRCxFQUMzRCxTQUFpRSxFQUNqRSxPQU1DLEVBQ3NDLEVBQUU7SUFDekMsT0FBTywrQkFBK0IsQ0FDcEMsT0FBTyxFQUFFLE9BQU8sRUFDaEIsYUFBYSxDQUFDLFdBQVcsRUFDekI7UUFDRSxhQUFhLEVBQUUsSUFBSTtRQUNuQixRQUFRLEVBQUUsYUFBYSxDQUFDLCtCQUErQixFQUFFO1FBQ3pELE9BQU8sRUFBRSxHQUFHLEVBQUUsQ0FBQyxhQUFhLENBQUMsSUFBSSxFQUFFO1FBQ25DLGNBQWMsRUFBRSxhQUFhLENBQUMsY0FBYztRQUM1QyxTQUFTLEVBQUUsT0FBTyxFQUFFLFNBQVM7S0FDOUIsRUFDRCxLQUFLLEVBQUUsYUFBYSxFQUFFLFdBQVcsRUFBRSxFQUFFO1FBQ25DLE1BQU0sV0FBVyxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUM3QyxJQUFJLENBQUM7WUFDSCxNQUFNLHNCQUFzQixHQUFHLE1BQU0sMEJBQTBCLENBQzdELGFBQWEsQ0FBQyxXQUFXLEVBQUUsYUFBYSxDQUFDLGlCQUFpQixFQUFFLGFBQWEsRUFBRSxTQUFTLEVBQUUsV0FBVyxDQUNsRyxDQUFDO1lBQ0Ys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
|
|
@@ -4,8 +4,9 @@ import { snapshotBoundedBsonDocument } from './classes.bsonsnapshot.js';
|
|
|
4
4
|
import { validateOrdinaryStoredDocument } from './classes.ordinarypersistence.js';
|
|
5
5
|
import { SmartdataPersistenceError, isMongoDuplicateKeyError } from './classes.persistence.js';
|
|
6
6
|
import { readBoundedInspectionCursor } from './classes.namespaceinspection.js';
|
|
7
|
-
import { reportSmartdataWrite, reportSmartdataWriteFailure } from './classes.session.js';
|
|
7
|
+
import { reportSmartdataWrite, reportSmartdataWriteFailure, runWithOrdinarySmartdataSession, } from './classes.session.js';
|
|
8
8
|
import { runSmartdataWrite } from './classes.readtracker.js';
|
|
9
|
+
import { isSmartdataWriteRevisionsActive } from './classes.writerevisions.js';
|
|
9
10
|
import { collectionModelSchemaResolverSymbol, collectionTopologyDbInspectionSymbol, getExpectedCollectionTopologyForSchema, inspectCollectionTopologySnapshot, } from './classes.collectiontopology.js';
|
|
10
11
|
/** @internal One validated insert command; no collection/index DDL or readiness publication. */
|
|
11
12
|
export const insertBootstrapRecord = async (modelArg, dbArg, recordArg, optionsArg = {}) => {
|
|
@@ -29,7 +30,11 @@ export const insertBootstrapRecord = async (modelArg, dbArg, recordArg, optionsA
|
|
|
29
30
|
}
|
|
30
31
|
const document = validateOrdinaryStoredDocument(snapshotBoundedBsonDocument(recordArg, maxBytes, () => new SmartdataPersistenceError('invalid_document', 'Bootstrap record must be bounded, inert, canonical BSON with an explicit string ID.')), schema.ordinaryPersistence, schema.persistedFields);
|
|
31
32
|
const expected = getExpectedCollectionTopologyForSchema(schema);
|
|
33
|
+
const reportInsert = () => reportSmartdataWrite(dbArg, undefined, {
|
|
34
|
+
collection: schema.collectionName, kind: 'insert', documents: [document], images: 'after',
|
|
35
|
+
});
|
|
32
36
|
let dispatched = false;
|
|
37
|
+
let reported = false;
|
|
33
38
|
let outcome;
|
|
34
39
|
try {
|
|
35
40
|
// Explicit preparation uses this same connection-generation guard.
|
|
@@ -52,6 +57,28 @@ export const insertBootstrapRecord = async (modelArg, dbArg, recordArg, optionsA
|
|
|
52
57
|
return 'invalid_configuration';
|
|
53
58
|
const insertOptions = budget.operationOptions();
|
|
54
59
|
dispatched = true;
|
|
60
|
+
if (isSmartdataWriteRevisionsActive(dbArg)) {
|
|
61
|
+
// The insert runs in a transaction of its own that commits its write revisions with it.
|
|
62
|
+
try {
|
|
63
|
+
const inserted = await runWithOrdinarySmartdataSession(undefined, dbArg, {
|
|
64
|
+
ordinaryWrite: true, prepared: true, ...insertOptions,
|
|
65
|
+
}, async (rawSessionArg, deadlineArg) => {
|
|
66
|
+
const result = await collection.insertOne(document, {
|
|
67
|
+
session: rawSessionArg, ...deadlineArg.commandOptions(),
|
|
68
|
+
});
|
|
69
|
+
if (!result.acknowledged || result.insertedId !== document._id)
|
|
70
|
+
return false;
|
|
71
|
+
reportInsert();
|
|
72
|
+
return true;
|
|
73
|
+
});
|
|
74
|
+
reported = inserted;
|
|
75
|
+
budget.check();
|
|
76
|
+
return inserted ? 'inserted' : 'ambiguous_write';
|
|
77
|
+
}
|
|
78
|
+
catch (errorArg) {
|
|
79
|
+
return isMongoDuplicateKeyError(errorArg) ? 'unique_conflict' : 'ambiguous_write';
|
|
80
|
+
}
|
|
81
|
+
}
|
|
55
82
|
try {
|
|
56
83
|
const result = await collection.insertOne(document, insertOptions);
|
|
57
84
|
budget.check();
|
|
@@ -69,9 +96,8 @@ export const insertBootstrapRecord = async (modelArg, dbArg, recordArg, optionsA
|
|
|
69
96
|
: 'Bootstrap insertion could not inspect the current database connection.');
|
|
70
97
|
}
|
|
71
98
|
if (outcome === 'inserted') {
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
});
|
|
99
|
+
if (!reported)
|
|
100
|
+
reportInsert();
|
|
75
101
|
return Object.freeze({ acknowledged: true, insertedId: document._id });
|
|
76
102
|
}
|
|
77
103
|
if (outcome === 'ambiguous_write')
|
|
@@ -87,4 +113,4 @@ export const insertBootstrapRecord = async (modelArg, dbArg, recordArg, optionsA
|
|
|
87
113
|
budget.close();
|
|
88
114
|
}
|
|
89
115
|
};
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
116
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5ib290c3RyYXByZWNvcmQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9ub3NxbGRiL2NsYXNzZXMuYm9vdHN0cmFwcmVjb3JkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBR3hDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQzNGLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3hFLE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ2xGLE9BQU8sRUFBRSx5QkFBeUIsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQy9GLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQy9FLE9BQU8sRUFDTCxvQkFBb0IsRUFBRSwyQkFBMkIsRUFBRSwrQkFBK0IsR0FDbkYsTUFBTSxzQkFBc0IsQ0FBQztBQUM5QixPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM3RCxPQUFPLEVBQUUsK0JBQStCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUM5RSxPQUFPLEVBQ0wsbUNBQW1DLEVBQUUsb0NBQW9DLEVBQ3pFLHNDQUFzQyxFQUFFLGlDQUFpQyxHQUMxRSxNQUFNLGlDQUFpQyxDQUFDO0FBaUJ6QyxnR0FBZ0c7QUFDaEcsTUFBTSxDQUFDLE1BQU0scUJBQXFCLEdBQUcsS0FBSyxFQUN4QyxRQUFpQixFQUNqQixLQUFrQixFQUNsQixTQUFrQixFQUNsQixVQUFVLEdBQXFDLEVBQUUsRUFDUCxFQUFFO0lBQzVDLE1BQU0sT0FBTyxHQUFHLGlCQUFpQixDQUFDLFVBQVUsRUFBRSxDQUFDLFdBQVcsRUFBRSxRQUFRLEVBQUUsVUFBVSxDQUFDLENBQUMsQ0FBQztJQUNuRixNQUFNLFFBQVEsR0FB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
|