@dittolive/ditto 4.12.0 → 5.0.0-experimental.js-cocoapods-publishing.3

package/node/ditto.cjs.js

@@ -52,8 +52,7 @@ class KeepAlive {
     }
     /** @internal */
     countForID(id) {
-        var _a;
-        return (_a = this.countsByID[id]) !== null && _a !== void 0 ? _a : null;
+        return this.countsByID[id] ?? null;
     }
 }
 KeepAlive.finalizationRegistry = new FinalizationRegistry(clearInterval);
@@ -387,11 +386,9 @@ function ditto_logger_set_custom_log_cb(...args) { return ditto.ditto_logger_set
 function ditto_logger_set_log_file(...args) { return ditto.ditto_logger_set_log_file(...args) }
 function ditto_new_attachment_from_bytes(...args) { return ditto.ditto_new_attachment_from_bytes(...args) }
 function ditto_new_attachment_from_file(...args) { return ditto.ditto_new_attachment_from_file(...args) }
-function ditto_presence_v1(...args) { return ditto.ditto_presence_v1(...args) }
 function ditto_presence_v3(...args) { return ditto.ditto_presence_v3(...args) }
 function ditto_read_transaction(...args) { return ditto.ditto_read_transaction(...args) }
 function ditto_read_transaction_free(...args) { return ditto.ditto_read_transaction_free(...args) }
-function ditto_register_presence_v1_callback(...args) { return ditto.ditto_register_presence_v1_callback(...args) }
 function ditto_register_presence_v3_callback(...args) { return ditto.ditto_register_presence_v3_callback(...args) }
 function ditto_register_transport_condition_changed_callback(...args) { return ditto.ditto_register_transport_condition_changed_callback(...args) }
 function ditto_remove_subscription(...args) { return ditto.ditto_remove_subscription(...args) }
@@ -462,18 +459,23 @@ function dittoffi_query_result_mutated_document_id_at(...args) { return ditto.di
 function dittoffi_query_result_mutated_document_id_count(...args) { return ditto.dittoffi_query_result_mutated_document_id_count(...args) }
 function dittoffi_store_begin_transaction_async_throws(...args) { return ditto.dittoffi_store_begin_transaction_async_throws(...args) }
 function dittoffi_store_transactions(...args) { return ditto.dittoffi_store_transactions(...args) }
+function dittoffi_sync_register_subscription_throws(...args) { return ditto.dittoffi_sync_register_subscription_throws(...args) }
+function dittoffi_sync_subscription_cancel(...args) { return ditto.dittoffi_sync_subscription_cancel(...args) }
+function dittoffi_sync_subscription_free(...args) { return ditto.dittoffi_sync_subscription_free(...args) }
+function dittoffi_sync_subscription_is_cancelled(...args) { return ditto.dittoffi_sync_subscription_is_cancelled(...args) }
+function dittoffi_sync_subscription_query_arguments_cbor(...args) { return ditto.dittoffi_sync_subscription_query_arguments_cbor(...args) }
+function dittoffi_sync_subscription_query_arguments_json(...args) { return ditto.dittoffi_sync_subscription_query_arguments_json(...args) }
+function dittoffi_sync_subscription_query_string(...args) { return ditto.dittoffi_sync_subscription_query_string(...args) }
+function dittoffi_sync_subscriptions(...args) { return ditto.dittoffi_sync_subscriptions(...args) }
 function dittoffi_transaction_complete_async_throws(...args) { return ditto.dittoffi_transaction_complete_async_throws(...args) }
 function dittoffi_transaction_execute_async_throws(...args) { return ditto.dittoffi_transaction_execute_async_throws(...args) }
 function dittoffi_transaction_free(...args) { return ditto.dittoffi_transaction_free(...args) }
 function dittoffi_transaction_info(...args) { return ditto.dittoffi_transaction_info(...args) }
-function dittoffi_try_add_sync_subscription(...args) { return ditto.dittoffi_try_add_sync_subscription(...args) }
 function dittoffi_try_base64_decode(...args) { return ditto.dittoffi_try_base64_decode(...args) }
 function dittoffi_try_exec_statement(...args) { return ditto.dittoffi_try_exec_statement(...args) }
 function dittoffi_try_experimental_register_change_observer_str_detached(...args) { return ditto.dittoffi_try_experimental_register_change_observer_str_detached(...args) }
-function dittoffi_try_remove_sync_subscription(...args) { return ditto.dittoffi_try_remove_sync_subscription(...args) }
 function dittoffi_try_verify_license(...args) { return ditto.dittoffi_try_verify_license(...args) }
 function getDeadlockTimeout$1(...args) { return ditto.getDeadlockTimeout(...args) }
-function jsDocsToCDocs(...args) { return ditto.jsDocsToCDocs(...args) }
 function refCBytesIntoBuffer(...args) { return ditto.refCBytesIntoBuffer(...args) }
 function refCStringToString(...args) { return ditto.refCStringToString(...args) }
 function setDeadlockTimeout$1(...args) { return ditto.setDeadlockTimeout(...args) }
@@ -762,7 +764,7 @@ async function collectionInsertValue(ditto, collectionName, doc_cbor, writeStrat
         default:
             throw new Error(`Unsupported write strategy '${writeStrategy}' provided.`);
     }
-    const { status_code: errorCode, id } = await ditto_collection_insert_value(ditto, collectionNameX, doc_cbor, strategy, null, writeTransaction !== null && writeTransaction !== void 0 ? writeTransaction : null);
+    const { status_code: errorCode, id } = await ditto_collection_insert_value(ditto, collectionNameX, doc_cbor, strategy, null, writeTransaction ?? null);
     if (errorCode !== 0) {
         throw new Error(errorMessage() ||
             `ditto_collection_insert_value() failed with error code: ${errorCode}`);
@@ -807,8 +809,7 @@ async function collectionUpdate(ditto, collectionName, writeTransaction, documen
 async function collectionUpdateMultiple(ditto, collectionName, writeTransaction, documents) {
     ensureInitialized();
     const collectionNameX = bytesFromString(collectionName);
-    const cDocuments = jsDocsToCDocs(documents);
-    const errorCode = await ditto_collection_update_multiple(ditto, collectionNameX, writeTransaction, cDocuments);
+    const errorCode = await ditto_collection_update_multiple(ditto, collectionNameX, writeTransaction, documents);
     if (errorCode !== 0) {
         throw new Error(errorMessage() ||
             `ditto_collection_update_multiple() failed with error code: ${errorCode}`);
@@ -873,18 +874,56 @@ function removeSubscription(ditto, collectionName, query, queryArgsCBOR, orderBy
     }
 }
 /** @internal */
-function tryAddSyncSubscription(dittoPointer, query, queryArgsCBOR) {
+function syncRegisterSubscriptionThrows(dittoPointer, query, queryArgsCBOR) {
     ensureInitialized();
     const queryBuffer = bytesFromString(query);
-    const result = dittoffi_try_add_sync_subscription(dittoPointer, queryBuffer, queryArgsCBOR);
-    throwOnErrorResult(result.error, 'dittoffi_try_add_sync_subscription');
+    const result = dittoffi_sync_register_subscription_throws(dittoPointer, queryBuffer, queryArgsCBOR);
+    throwOnErrorResult(result.error, 'dittoffi_sync_register_subscription_throws');
+    return result.success;
 }
 /** @internal */
-function tryRemoveSyncSubscription(dittoPointer, query, queryArgsCBOR) {
+function syncSubscriptions(dittoPointer) {
     ensureInitialized();
-    const queryBuffer = bytesFromString(query);
-    const result = dittoffi_try_remove_sync_subscription(dittoPointer, queryBuffer, queryArgsCBOR);
-    throwOnErrorResult(result.error, 'dittoffi_try_remove_sync_subscription');
+    return dittoffi_sync_subscriptions(dittoPointer);
+}
+/** @internal */
+function syncSubscriptionQueryString(syncSubscriptionPointer) {
+    ensureInitialized();
+    const queryStringBytes = dittoffi_sync_subscription_query_string(syncSubscriptionPointer);
+    return boxCStringIntoString(queryStringBytes);
+}
+/** @internal */
+function syncSubscriptionQueryArgumentsCBOR(syncSubscriptionPointer) {
+    ensureInitialized();
+    const queryArgsCBORBytes = dittoffi_sync_subscription_query_arguments_cbor(syncSubscriptionPointer);
+    if (queryArgsCBORBytes === null)
+        return null;
+    return boxCBytesIntoBuffer(queryArgsCBORBytes);
+}
+/** @internal */
+function syncSubscriptionQueryArgumentsJSON(syncSubscriptionPointer) {
+    ensureInitialized();
+    const queryArgsJSONBytes = dittoffi_sync_subscription_query_arguments_json(syncSubscriptionPointer);
+    if (queryArgsJSONBytes === null)
+        return null;
+    const jsonBuffer = boxCBytesIntoBuffer(queryArgsJSONBytes);
+    const textDecoder = new TextDecoder();
+    return textDecoder.decode(jsonBuffer);
+}
+/** @internal */
+function syncSubscriptionCancel(syncSubscriptionPointer) {
+    ensureInitialized();
+    dittoffi_sync_subscription_cancel(syncSubscriptionPointer);
+}
+/** @internal */
+function syncSubscriptionIsCancelled(syncSubscriptionPointer) {
+    ensureInitialized();
+    return dittoffi_sync_subscription_is_cancelled(syncSubscriptionPointer);
+}
+/** @internal */
+function syncSubscriptionFree(syncSubscriptionPointer) {
+    ensureInitialized();
+    dittoffi_sync_subscription_free(syncSubscriptionPointer);
 }
 // ----------------------------------------------------------- QueryResult ------
 /**
@@ -1445,14 +1484,6 @@ function cryptoGenerateSecureRandomToken() {
     return boxCStringIntoString(docIDString);
 }
 /** @internal */
-function dittoRegisterPresenceV1Callback(self, cb) {
-    ensureInitialized();
-    ditto_register_presence_v1_callback(self, wrapBackgroundCbForFFI((err) => log('Error', `The registered presence callback v1 errored with ${err}`), (cJsonStr) => {
-        const jsonStr = refCStringToString(cJsonStr);
-        cb(jsonStr);
-    }));
-}
-/** @internal */
 async function dittoClearPresenceCallback(self) {
     ensureInitialized();
     return ditto_clear_presence_callback(self);
@@ -1709,12 +1740,6 @@ function dittoGetSDKSemver() {
     return boxCStringIntoString(cString);
 }
 /** @internal */
-function dittoPresenceV1(self) {
-    ensureInitialized();
-    const cString = ditto_presence_v1(self);
-    return boxCStringIntoString(cString);
-}
-/** @internal */
 function dittoPresenceV3(self) {
     ensureInitialized();
     const cString = ditto_presence_v3(self);
@@ -1867,7 +1892,8 @@ function defaultDeviceName() {
 const NOT_FOUND_ERROR_CODE = -30798;
 /** @internal */
 function wrapBackgroundCbForFFI(onError, cb) {
-    const errorHandler = onError !== null && onError !== void 0 ? onError : ((err) => log('Error', `The registered callback failed with ${err}`));
+    const errorHandler = onError ??
+        ((err) => log('Error', `The registered callback failed with ${err}`));
     return (ret_sender, ...args) => {
         let ret;
         try {
@@ -1886,7 +1912,8 @@ function wrapBackgroundCbForFFI(onError, cb) {
 }
 /** @internal */
 function wrapAsyncBackgroundCbForFFI(onError, cb) {
-    const errorHandler = onError !== null && onError !== void 0 ? onError : ((err) => log('Error', `The registered callback failed with ${err}`));
+    const errorHandler = onError ??
+        ((err) => log('Error', `The registered callback failed with ${err}`));
     return async (ret_sender, ...args) => {
         let ret;
         try {
@@ -2288,7 +2315,6 @@ async function mapFFIErrorsAsync(closure, statusCodeMapping, context) {
     }
 }
 const translateFFIError = (ffiError, customStatusCodeMapping, context) => {
-    var _a;
     // Convert the status code to a string because it may be a negative number,
     // which can't be used as an index into an object.
     const statusCode = ffiError.code.toString();
@@ -2299,7 +2325,8 @@ const translateFFIError = (ffiError, customStatusCodeMapping, context) => {
     }
     else {
         [code, message] =
-            (_a = DEFAULT_STATUS_CODE_MAPPING[statusCode]) !== null && _a !== void 0 ? _a : DEFAULT_STATUS_CODE_MAPPING.default;
+            DEFAULT_STATUS_CODE_MAPPING[statusCode] ??
+                DEFAULT_STATUS_CODE_MAPPING.default;
     }
     return DittoError.fromFFIError(ffiError, code, message, context);
 };
@@ -2349,6 +2376,10 @@ class AttachmentToken {
         const id = jsObj['_id'];
         if (!(id instanceof Uint8Array))
             throw new Error('Invalid attachment token id');
+        // Ensure that id is a true Uint8Array and not a Node.js Buffer so that
+        // attachment tokens pass any deep equality checks. Buffer extends
+        // Uint8Array but has a different constructor.
+        const _id = id.constructor === Uint8Array ? id : new Uint8Array(id);
         const len = jsObj['_len'];
         if ((typeof len !== 'number' && typeof len !== 'bigint') || len < 0) {
             throw new Error('Invalid attachment token length, must be a non-negative number or bigint');
@@ -2356,7 +2387,7 @@ class AttachmentToken {
         const meta = jsObj['_meta'];
         if (typeof meta !== 'object')
             throw new Error('Invalid attachment token meta');
-        return { id, len, meta };
+        return { id: _id, len, meta };
     }
     /**
      * Validate an untyped input value and return its contents.
@@ -2393,7 +2424,7 @@ class AttachmentToken {
 
 // NOTE: this is patched up with the actual build version by Jake task
 // build:package and has to be a valid semantic version as defined here: https://semver.org.
-const fullBuildVersionString = '4.12.0';
+const fullBuildVersionString = '5.0.0-experimental.js-cocoapods-publishing.3';
 
 //
 // Copyright © 2021 DittoLive Incorporated. All rights reserved.
@@ -2495,8 +2526,7 @@ class Logger {
      * @deprecated this method is deprecated and will be removed in a future version.
      */
     static setLogFileURL(url) {
-        var _a;
-        this.setLogFile((_a = url === null || url === void 0 ? void 0 : url.pathname) !== null && _a !== void 0 ? _a : null);
+        this.setLogFile(url?.pathname ?? null);
     }
     /**
      * Whether the logger is currently enabled.
@@ -3695,6 +3725,11 @@ class CBOR {
         return new Uint8Array(arrayBuffer);
     }
     /** @internal */
+    static encodeWithReplacer(data, replacer) {
+        const arrayBuffer = CBOR$1.encode(data, replacer);
+        return new Uint8Array(arrayBuffer);
+    }
+    /** @internal */
     static decode(data, reviver) {
         const arrayBuffer = data.buffer;
         return CBOR$1.decode(arrayBuffer, reviver);
@@ -3833,7 +3868,7 @@ function validateDocumentIDValue(id) {
 /** @internal */
 function validateDocumentIDCBOR(idCBOR) {
     const validatedIDCBOROrNull = validateDocumentID(idCBOR);
-    return validatedIDCBOROrNull !== null && validatedIDCBOROrNull !== void 0 ? validatedIDCBOROrNull : idCBOR;
+    return validatedIDCBOROrNull ?? idCBOR;
 }
 
 //
@@ -3897,14 +3932,13 @@ class Handle {
      * has been closed, garbage collected, or unregistered.
      */
     derefOrNull() {
-        var _b;
         if (this.isClosed)
             return null;
         if (this.isFinalized)
             return null;
         if (this.isUnregistered)
             return null;
-        return (_b = this.pointer) !== null && _b !== void 0 ? _b : null;
+        return this.pointer ?? null;
     }
     /**
      * Returns the object associated with this handle.
@@ -3930,13 +3964,12 @@ class Handle {
      * has been closed, unregistered, or garbage collected.
      */
     objectOrNull() {
-        var _b;
-        return (_b = this.objectWeakRef.deref()) !== null && _b !== void 0 ? _b : null;
+        return this.objectWeakRef.deref() ?? null;
     }
     /** @internal */
     toString() {
         const pointer = this.derefOrNull();
-        return `{ Handle | type: ${this.bridge.type}, object: ${this.objectWeakRef.deref()}, FFI address: ${pointer === null || pointer === void 0 ? void 0 : pointer.addr}, FFI type: ${pointer === null || pointer === void 0 ? void 0 : pointer.type} }`;
+        return `{ Handle | type: ${this.bridge.type}, object: ${this.objectWeakRef.deref()}, FFI address: ${pointer?.addr}, FFI type: ${pointer?.type} }`;
     }
     /** @internal */
     bridgeWillClose() {
@@ -4306,6 +4339,8 @@ Bridge.transaction = new _a(transactionFree);
 /** @internal */
 Bridge.differ = new _a(differFree);
 /** @internal */
+Bridge.syncSubscription = new _a(syncSubscriptionFree);
+/** @internal */
 Bridge.ditto = new _a(async (dittoPointer) => {
     // HACK: quick and dirty, clear all presence callbacks. This covers presence
     // v1 and v2 callbacks. v3 should be cleared properly by the `Presence`
@@ -4427,7 +4462,7 @@ function validateAttachmentMetadata(metadata) {
 // represented by `Counter` objects and attachments get represented by
 // `Attachment` objects.
 function augmentJSONValue(json, mutDoc, workingPath) {
-    if (json && typeof json === 'object') {
+    if (json && !(json instanceof Uint8Array) && typeof json === 'object') {
         if (Array.isArray(json)) {
             return json.map((v, idx) => augmentJSONValue(v, mutDoc, `${workingPath}[${idx}]`));
         }
@@ -4450,6 +4485,33 @@ function augmentJSONValue(json, mutDoc, workingPath) {
         return json;
     }
 }
+/**
+ * Takes any value and checks if it is an instance of `Attachment` or
+ * `AttachmentToken`. If it is, it returns a plain JS object with the
+ * attachment's ID, length and metadata. Otherwise, it returns the value
+ * unchanged.
+ *
+ * This is intended to be used as the `replacer` function for
+ * `JSON.stringify()` or CBOR.encode() and doesn't recursively traverse
+ * objects or arrays like `desugarJSObject()` does.
+ */
+const desugarJSObjectV2 = (_key, value) => {
+    if (value instanceof Attachment) {
+        return {
+            _id: value.token.idBytes,
+            _len: value.token.len,
+            _meta: value.token.metadata,
+        };
+    }
+    else if (value instanceof AttachmentToken) {
+        return {
+            _id: value.idBytes,
+            _len: value.len,
+            _meta: value.metadata,
+        };
+    }
+    return value;
+};
 /**
  * Converts objects that may contain instances of classes of this SDK, i.e.
  * `DocumentID`, `Counter`, `Register` and `Attachment`, into plain JS objects
@@ -4461,7 +4523,7 @@ function augmentJSONValue(json, mutDoc, workingPath) {
  * @throws {Error} If `jsObj` contains a non-finite float value.
  */
 function desugarJSObject(jsObj) {
-    if (jsObj && typeof jsObj === 'object') {
+    if (jsObj && !(jsObj instanceof Uint8Array) && typeof jsObj === 'object') {
         if (Array.isArray(jsObj)) {
             return jsObj.map((v, idx) => desugarJSObject(v));
         }
@@ -4489,6 +4551,15 @@ function desugarJSObject(jsObj) {
             attachmentJSON[DittoCRDTTypeKey] = DittoCRDTType.attachment;
             return attachmentJSON;
         }
+        else if (jsObj instanceof AttachmentToken) {
+            const attachmentTokenJSON = {
+                _id: jsObj.idBytes,
+                _len: jsObj.len, // may be a BigInt
+                _meta: jsObj.metadata,
+            };
+            attachmentTokenJSON[DittoCRDTTypeKey] = DittoCRDTType.attachment;
+            return attachmentTokenJSON;
+        }
         else {
             // Create a copy to not mutate the original object
             const jsObjJSON = {};
@@ -4587,11 +4658,9 @@ function defaultAuthURL(appID) {
  * `errorMessagePrefix`, which defaults to `"Number validation failed:"`.
  *
  * @internal
- * @deprecated
  */
 function validateNumber(value, options = {}) {
-    var _a;
-    const errorMessagePrefix = (_a = options['errorMessagePrefix']) !== null && _a !== void 0 ? _a : 'Number validation failed:';
+    const errorMessagePrefix = options['errorMessagePrefix'] ?? 'Number validation failed:';
     const integer = !!options['integer'];
     const min = options['min'];
     const max = options['max'];
@@ -4611,10 +4680,8 @@ function validateNumber(value, options = {}) {
         throw new Error(`${errorMessagePrefix} '${value}' must be < ${maxX}.`);
     return value;
 }
-/** @deprecated */
 function validateQuery(query, options = {}) {
-    var _a;
-    const errorMessagePrefix = (_a = options['errorMessagePrefix']) !== null && _a !== void 0 ? _a : 'Query validation failed,';
+    const errorMessagePrefix = options['errorMessagePrefix'] ?? 'Query validation failed,';
     if (typeof query !== 'string')
         throw new Error(`${errorMessagePrefix} query is not a string: ${query}`);
     if (query === '')
@@ -4722,8 +4789,7 @@ class KeyPath {
      * its syntax. Throws if syntax is invalid.
      */
     static validate(keyPath, options = {}) {
-        var _a;
-        const isInitial = (_a = options.isInitial) !== null && _a !== void 0 ? _a : false;
+        const isInitial = options.isInitial ?? false;
         if (typeof keyPath === 'number')
             return Math.floor(Math.abs(keyPath));
         if (typeof keyPath !== 'string') {
@@ -4742,8 +4808,7 @@ class KeyPath {
      * @internal
      */
     static evaluate(keyPath, object, options = {}) {
-        var _a;
-        const stopAtLastContainer = (_a = options.stopAtLastContainer) !== null && _a !== void 0 ? _a : false;
+        const stopAtLastContainer = options.stopAtLastContainer ?? false;
         const evaluationResult = {
             keyPath: keyPath,
             object: object,
@@ -5614,7 +5679,8 @@ class BasePendingCursorOperation {
         return ditto.deferCloseAsync(async (dittoHandle) => {
             return await performAsyncToWorkaroundNonAsyncFFIAPI(async () => {
                 const query = this.query;
-                const transactionPointer = writeTransactionPointer !== null && writeTransactionPointer !== void 0 ? writeTransactionPointer : (await writeTransaction(dittoHandle.deref()));
+                const transactionPointer = writeTransactionPointer ??
+                    (await writeTransaction(dittoHandle.deref()));
                 const documentsX = await collectionExecQueryStr(dittoHandle.deref(), this.collection.name, transactionPointer, query, this.queryArgsCBOR, this.orderBys, this.currentLimit, this.currentOffset);
                 const mutableDocuments = documentsX.map((documentX) => {
                     return Bridge.mutableDocument.bridge(documentX, () => new MutableDocument());
@@ -5753,7 +5819,6 @@ class BasePendingIDSpecificOperation {
     async updateWithClosure(closure, throwOnAsyncClosure, throwOnDocumentNotFound, publicAPIName, transaction) {
         const ditto = this.collection.store.ditto;
         return ditto.deferCloseAsync(async (dittoHandle) => {
-            var _a;
             let documentPointer = null;
             if (transaction == null) {
                 const readTransactionPointer = await readTransaction(dittoHandle.deref());
@@ -5787,7 +5852,8 @@ class BasePendingIDSpecificOperation {
                     throw new TypeError(errorMessageAsyncClosure);
                 Logger.warning(errorMessageAsyncClosure);
             }
-            const writeTransactionPointer = (_a = transaction === null || transaction === void 0 ? void 0 : transaction.writeTransactionPointer) !== null && _a !== void 0 ? _a : (await writeTransaction(dittoHandle.deref()));
+            const writeTransactionPointer = transaction?.writeTransactionPointer ??
+                (await writeTransaction(dittoHandle.deref()));
             // Ownership is transferred back to the FFI layer via collectionUpdate(),
             // we therefore need to explicitly unregister the instance.
             Bridge.mutableDocument.unregister(mutableDocument);
@@ -5907,11 +5973,10 @@ class ConnectionRequest {
 class ObserverManager {
     /** @internal */
     constructor(id, options = {}) {
-        var _a, _b, _c, _d;
-        const keepAlive = (_a = options.keepAlive) !== null && _a !== void 0 ? _a : null;
-        const register = (_b = options.register) !== null && _b !== void 0 ? _b : null;
-        const unregister = (_c = options.unregister) !== null && _c !== void 0 ? _c : null;
-        const process = (_d = options.process) !== null && _d !== void 0 ? _d : null;
+        const keepAlive = options.keepAlive ?? null;
+        const register = options.register ?? null;
+        const unregister = options.unregister ?? null;
+        const process = options.process ?? null;
         this.id = id;
         this.keepAlive = keepAlive;
         this.isClosed = false;
@@ -5926,7 +5991,6 @@ class ObserverManager {
     }
     /** @internal */
     addObserver(callback) {
-        var _a;
         if (this.isClosed) {
             // REFACTOR: throw a catchable error here, such that calling code
             // can be more specific when forwarding it to the user.
@@ -5935,12 +5999,11 @@ class ObserverManager {
         this.registerIfNeeded();
         const token = cryptoGenerateSecureRandomToken();
         this.callbacksByToken[token] = callback;
-        (_a = this.keepAlive) === null || _a === void 0 ? void 0 : _a.retain(`${this.id}.${token}`);
+        this.keepAlive?.retain(`${this.id}.${token}`);
         return token;
     }
     /** @internal */
     removeObserver(token) {
-        var _a;
         const callback = this.callbacksByToken[token];
         if (typeof callback === 'undefined') {
             throw new Error(`Can't remove '${this.id}' observer, token '${token}' has never been registered before.`);
@@ -5957,7 +6020,7 @@ class ObserverManager {
         // observers that have been removed and observers that have
         // never been registered before.
         this.callbacksByToken[token] = null;
-        (_a = this.keepAlive) === null || _a === void 0 ? void 0 : _a.release(`${this.id}.${token}`);
+        this.keepAlive?.release(`${this.id}.${token}`);
         this.unregisterIfNeeded();
     }
     hasObserver(token) {
@@ -6123,12 +6186,6 @@ class Authenticator {
      * @returns A promise that resolves to a `LoginResult` object.
      */
     async login(token, provider) {
-        if (typeof token !== 'string') {
-            throw new TypeError(`Expected parameter token to have type string, but got '${typeof token}'`);
-        }
-        if (typeof provider !== 'string') {
-            throw new TypeError(`Expected parameter provider to have type string, but got '${typeof provider}'`);
-        }
         throw new Error(`Authenticator.login() is abstract and must be implemented by subclasses.`);
     }
     /**
@@ -6141,12 +6198,6 @@ class Authenticator {
      * provided by the authentication service.
      */
     loginWithToken(token, provider) {
-        if (typeof token !== 'string') {
-            throw new TypeError(`Expected parameter token to have type string, but got '${typeof token}'`);
-        }
-        if (typeof provider !== 'string') {
-            throw new TypeError(`Expected parameter provider to have type string, but got '${typeof provider}'`);
-        }
         throw new Error(`Authenticator.loginWithToken() is abstract and must be implemented by subclasses.`);
     }
     /**
@@ -6160,15 +6211,6 @@ class Authenticator {
      * version.
      */
     loginWithUsernameAndPassword(username, password, provider) {
-        if (typeof username !== 'string') {
-            throw new TypeError(`Expected parameter username to have type string, but got '${typeof username}'`);
-        }
-        if (typeof password !== 'string') {
-            throw new TypeError(`Expected parameter password to have type string, but got '${typeof password}'`);
-        }
-        if (typeof provider !== 'string') {
-            throw new TypeError(`Expected parameter provider to have type string, but got '${typeof provider}'`);
-        }
         throw new Error(`Authenticator.loginWithUsernameAndPassword() is abstract and must be implemented by subclasses.`);
     }
     /**
@@ -6184,9 +6226,6 @@ class Authenticator {
      * required cleanup of the store as part of the logout process.
      */
     logout(cleanupFn) {
-        if (cleanupFn !== undefined && typeof cleanupFn !== 'function') {
-            throw new TypeError(`Expected parameter cleanupFn to have type function, but got '${typeof cleanupFn}'`);
-        }
         throw new Error(`Authenticator.logout() is abstract and must be implemented by subclasses.`);
     }
     /*
@@ -6195,9 +6234,6 @@ class Authenticator {
      * you want to receive the updates.
      */
     observeStatus(callback) {
-        if (typeof callback !== 'function') {
-            throw new TypeError(`Expected parameter callback to have type function, but got '${typeof callback}'`);
-        }
         const token = this.observerManager.addObserver(callback);
         return new Observer(this.observerManager, token, {
             stopsWhenFinalized: true,
@@ -6211,7 +6247,7 @@ class Authenticator {
         this.observerManager = new ObserverManager('AuthenticationStatusObservation', { keepAlive });
     }
     /** @internal */
-    '@ditto.authenticationExpiring'(secondsRemaining) {
+    '@ditto.authenticationExpiring'(number) {
         throw new Error(`Authenticator['@ditto.authenticationExpiring']() is abstract and must be implemented by subclasses.`);
     }
     /** @internal */
@@ -6223,12 +6259,6 @@ class Authenticator {
 /** @internal */
 class OnlineAuthenticator extends Authenticator {
     async login(token, provider) {
-        if (typeof token !== 'string') {
-            throw new TypeError(`Expected parameter token to have type string, but got '${typeof token}'`);
-        }
-        if (typeof provider !== 'string') {
-            throw new TypeError(`Expected parameter provider to have type string, but got '${typeof provider}'`);
-        }
         const ditto = this.ditto.deref();
         if (!ditto || ditto.isClosed) {
             throw new DittoError('authentication/failed-to-authenticate', 'Ditto instance is closed');
@@ -6242,12 +6272,6 @@ class OnlineAuthenticator extends Authenticator {
         });
     }
     async loginWithToken(token, provider) {
-        if (typeof token !== 'string') {
-            throw new TypeError(`Expected parameter token to have type string, but got '${typeof token}'`);
-        }
-        if (typeof provider !== 'string') {
-            throw new TypeError(`Expected parameter provider to have type string, but got '${typeof provider}'`);
-        }
         const ditto = this.ditto.deref();
         if (!ditto || ditto.isClosed)
             return;
@@ -6256,15 +6280,6 @@ class OnlineAuthenticator extends Authenticator {
         });
     }
     async loginWithUsernameAndPassword(username, password, provider) {
-        if (typeof username !== 'string') {
-            throw new TypeError(`Expected parameter username to have type string, but got '${typeof username}'`);
-        }
-        if (typeof password !== 'string') {
-            throw new TypeError(`Expected parameter password to have type string, but got '${typeof password}'`);
-        }
-        if (typeof provider !== 'string') {
-            throw new TypeError(`Expected parameter provider to have type string, but got '${typeof provider}'`);
-        }
         const ditto = this.ditto.deref();
         if (!ditto || ditto.isClosed)
             return;
@@ -6273,16 +6288,13 @@ class OnlineAuthenticator extends Authenticator {
         });
     }
     async logout(cleanupFn) {
-        if (cleanupFn !== undefined && typeof cleanupFn !== 'function') {
-            throw new TypeError(`Expected parameter cleanupFn to have type function, but got '${typeof cleanupFn}'`);
-        }
         const ditto = this.ditto.deref();
         if (!ditto || ditto.isClosed)
             return;
         return ditto.deferCloseAsync(async (dittoHandle) => {
             await dittoAuthClientLogout(dittoHandle.deref());
             ditto.stopSync();
-            cleanupFn === null || cleanupFn === void 0 ? void 0 : cleanupFn(ditto);
+            cleanupFn?.(ditto);
         });
     }
     constructor(keepAlive, ditto, authenticationHandler) {
@@ -6328,14 +6340,13 @@ class OnlineAuthenticator extends Authenticator {
             authenticationHandler.authenticationRequired(this);
     }
     authenticationStatusUpdated(authenticationStatus) {
-        var _a;
         const previousStatus = this.status;
         this._status = authenticationStatus;
         const sameStatus = !!previousStatus.isAuthenticated ===
             !!authenticationStatus.isAuthenticated &&
             previousStatus.userID === authenticationStatus.userID;
         if (!sameStatus) {
-            (_a = this.authenticationHandler.authenticationStatusDidChange) === null || _a === void 0 ? void 0 : _a.call(this.authenticationHandler, this);
+            this.authenticationHandler.authenticationStatusDidChange?.call(this.authenticationHandler, this);
             this.observerManager.notify(authenticationStatus);
         }
     }
@@ -6380,9 +6391,6 @@ class OnlineAuthenticatorV2 extends Authenticator {
         return this._expirationHandler;
     }
     async setExpirationHandler(handler) {
-        if (handler !== null && typeof handler !== 'function') {
-            throw new TypeError(`Expected parameter handler to have type function or null, but got '${typeof handler}'`);
-        }
         const ditto = this.ditto.deref();
         if (!ditto || ditto.isClosed) {
             Logger.error('Ditto instance is closed, cannot set authentication expiration handler.');
@@ -6426,12 +6434,6 @@ class OnlineAuthenticatorV2 extends Authenticator {
         this.updateAndNotify(false);
     }
     async login(token, provider) {
-        if (typeof token !== 'string') {
-            throw new TypeError(`Expected parameter token to have type string, but got '${typeof token}'`);
-        }
-        if (typeof provider !== 'string') {
-            throw new TypeError(`Expected parameter provider to have type string, but got '${typeof provider}'`);
-        }
         const ditto = this.ditto.deref();
         if (!ditto || ditto.isClosed) {
             throw new DittoError('authentication/failed-to-authenticate', 'Ditto instance is closed');
@@ -6445,12 +6447,6 @@ class OnlineAuthenticatorV2 extends Authenticator {
         });
     }
     async loginWithToken(token, provider) {
-        if (typeof token !== 'string') {
-            throw new TypeError(`Expected parameter token to have type string, but got '${typeof token}'`);
-        }
-        if (typeof provider !== 'string') {
-            throw new TypeError(`Expected parameter provider to have type string, but got '${typeof provider}'`);
-        }
         const ditto = this.ditto.deref();
         if (!ditto || ditto.isClosed)
             return;
@@ -6459,15 +6455,6 @@ class OnlineAuthenticatorV2 extends Authenticator {
         });
     }
     async loginWithUsernameAndPassword(username, password, provider) {
-        if (typeof username !== 'string') {
-            throw new TypeError(`Expected parameter username to have type string, but got '${typeof username}'`);
-        }
-        if (typeof password !== 'string') {
-            throw new TypeError(`Expected parameter password to have type string, but got '${typeof password}'`);
-        }
-        if (typeof provider !== 'string') {
-            throw new TypeError(`Expected parameter provider to have type string, but got '${typeof provider}'`);
-        }
         const ditto = this.ditto.deref();
         if (!ditto || ditto.isClosed)
             return;
@@ -6476,16 +6463,13 @@ class OnlineAuthenticatorV2 extends Authenticator {
         });
     }
     async logout(cleanupFn) {
-        if (cleanupFn !== undefined && typeof cleanupFn !== 'function') {
-            throw new TypeError(`Expected parameter cleanupFn to have type function, but got '${typeof cleanupFn}'`);
-        }
         const ditto = this.ditto.deref();
         if (!ditto || ditto.isClosed)
             return;
         return ditto.deferCloseAsync(async (dittoHandle) => {
             await dittoAuthClientLogout(dittoHandle.deref());
             ditto.stopSync();
-            cleanupFn === null || cleanupFn === void 0 ? void 0 : cleanupFn(ditto);
+            cleanupFn?.(ditto);
         });
     }
     authenticationStatusUpdated(authenticationStatus) {
@@ -6593,9 +6577,8 @@ const IdentityTypesRequiringOfflineLicenseToken = [
  * @deprecated
  */
 function makeIdentityConfig(identity) {
-    var _a, _b, _c;
     if (identity.type === 'offlinePlayground') {
-        return dittoIdentityConfigMakeOfflinePlayground(identity.appID, (_a = identity.siteID) !== null && _a !== void 0 ? _a : 0);
+        return dittoIdentityConfigMakeOfflinePlayground(identity.appID, identity.siteID ?? 0);
     }
     if (identity.type === 'manual') {
         return dittoIdentityConfigMakeManual(identity.certificate);
@@ -6604,11 +6587,11 @@ function makeIdentityConfig(identity) {
         return dittoIdentityConfigMakeSharedKey(identity.appID, identity.sharedKey, identity.siteID);
     }
     if (identity.type === 'onlinePlayground') {
-        const authURL = (_b = identity.customAuthURL) !== null && _b !== void 0 ? _b : defaultAuthURL(identity.appID);
+        const authURL = identity.customAuthURL ?? defaultAuthURL(identity.appID);
         return dittoIdentityConfigMakeOnlinePlayground(identity.appID, identity.token, authURL);
     }
     if (identity.type === 'onlineWithAuthentication') {
-        const authURL = (_c = identity.customAuthURL) !== null && _c !== void 0 ? _c : defaultAuthURL(identity.appID);
+        const authURL = identity.customAuthURL ?? defaultAuthURL(identity.appID);
         return dittoIdentityConfigMakeOnlineWithAuthentication(identity.appID, authURL);
     }
 }
@@ -6768,7 +6751,6 @@ class DittoConfig {
  * @internal
  */
 function toFFICBORData(config) {
-    var _a;
     let connectFFI;
     if (config.connect.mode === 'server') {
         connectFFI = {
@@ -6789,7 +6771,7 @@ function toFFICBORData(config) {
     const ffiConfig = {
         database_id: config.databaseID,
         connect: connectFFI,
-        persistence_directory: (_a = config.persistenceDirectory) !== null && _a !== void 0 ? _a : null, // MUST not be undefined
+        persistence_directory: config.persistenceDirectory ?? null, // MUST not be undefined
         experimental: {}, // Currently no experimental features in JS SDK
     };
     return ffiConfig;
@@ -8089,7 +8071,7 @@ class Collection {
      * @deprecated Use DQL (Ditto Query Language) instead. For more information see: https://ditto.com/link/dql-legacy-to-dql-adoption
      */
     find(query, queryArgs) {
-        return new PendingCursorOperation(query, queryArgs !== null && queryArgs !== void 0 ? queryArgs : null, this);
+        return new PendingCursorOperation(query, queryArgs ?? null, this);
     }
     /**
      * @deprecated Use DQL (Ditto Query Language) instead. For more information see: https://ditto.com/link/dql-legacy-to-dql-adoption
@@ -8125,8 +8107,7 @@ class Collection {
             `For more information see: ` +
             `https://ditto.com/link/dql-legacy-to-dql-adoption`);
         return this.store.ditto.deferCloseAsync(async (dittoHandle) => {
-            var _a;
-            const writeStrategy = (_a = options.writeStrategy) !== null && _a !== void 0 ? _a : 'merge';
+            const writeStrategy = options.writeStrategy ?? 'merge';
             const documentValueJSON = desugarJSObject(value);
             const documentValueCBOR = CBOR.encode(documentValueJSON);
             const idCBOR = await performAsyncToWorkaroundNonAsyncFFIAPI(async () => {
@@ -8873,7 +8854,7 @@ class WriteTransactionCollection {
      * see: https://ditto.com/link/dql-legacy-to-dql-adoption
      */
     find(query, queryArgs) {
-        return new WriteTransactionPendingCursorOperation(query, queryArgs !== null && queryArgs !== void 0 ? queryArgs : null, this);
+        return new WriteTransactionPendingCursorOperation(query, queryArgs ?? null, this);
     }
     /**
      * Convenience method, equivalent to calling {@link find | find()} and passing
@@ -8905,8 +8886,7 @@ class WriteTransactionCollection {
     async upsert(value, options = {}) {
         const ditto = this.store.ditto;
         return ditto.deferCloseAsync(async (dittoHandle) => {
-            var _a;
-            const writeStrategy = (_a = options.writeStrategy) !== null && _a !== void 0 ? _a : 'merge';
+            const writeStrategy = options.writeStrategy ?? 'merge';
             const documentValueJSON = desugarJSObject(value);
             const documentValueCBOR = CBOR.encode(documentValueJSON);
             const idCBOR = await performAsyncToWorkaroundNonAsyncFFIAPI(async () => {
@@ -9187,7 +9167,7 @@ class Store {
         if (typeof query !== 'string') {
             throw new DittoError('query/invalid', `Expected parameter 'query' to be of type 'string', found: ${typeof query}`);
         }
-        const storeObserver = new StoreObserver(this.ditto, query, queryArguments !== null && queryArguments !== void 0 ? queryArguments : null, observationHandler);
+        const storeObserver = new StoreObserver(this.ditto, query, queryArguments ?? null, observationHandler);
         // @ts-expect-error modifying readonly property
         this.observers = Object.freeze([...this.observers, storeObserver]);
         // We have two requirements for this step: (1) we want to be able to wait
@@ -9303,7 +9283,7 @@ class Store {
             }
             catch (error) {
                 await transaction.rollback();
-                Logger.warning(`Transaction rolled back due to an error: ${error === null || error === void 0 ? void 0 : error.message}`);
+                Logger.warning(`Transaction rolled back due to an error: ${error?.message}`);
                 throw error;
             }
             await transaction.commit();
@@ -9660,9 +9640,9 @@ class Store {
      */
     async transaction(scope, options = {}) {
         return this.ditto.deferCloseAsync(async () => {
-            if ((options === null || options === void 0 ? void 0 : options.isReadOnly) && typeof options.isReadOnly !== 'boolean')
+            if (options?.isReadOnly && typeof options.isReadOnly !== 'boolean')
                 throw new TypeError("Expected 'options.isReadOnly' to be a boolean");
-            if ((options === null || options === void 0 ? void 0 : options.hint) && typeof options.hint !== 'string')
+            if (options?.hint && typeof options.hint !== 'string')
                 throw new TypeError("Expected 'options.hint' to be a string");
             const transaction = await this.beginTransaction(options);
             // REFACTOR: completing with action `rollback` should never fail even
@@ -9688,12 +9668,11 @@ class Store {
     /** @internal */
     async beginTransaction(options = {}) {
         return this.ditto.deferCloseAsync(async (dittoHandle) => {
-            var _a, _b;
             // We explicitely set the default value here to maintain consistency with
             // other API that we already have, while acknowledging that default values
             // are generally better to be dictated from Core (via a factory method).
-            const isReadOnly = (_a = options.isReadOnly) !== null && _a !== void 0 ? _a : false;
-            const hint = (_b = options.hint) !== null && _b !== void 0 ? _b : null;
+            const isReadOnly = options.isReadOnly ?? false;
+            const hint = options.hint ?? null;
             const storePointer = dittoPointerToStorePointer(dittoHandle.deref());
             const transactionPointer = await storeBeginTransaction(storePointer, {
                 isReadOnly,
@@ -10009,137 +9988,6 @@ class LiveQueryManager {
     }
 }
 
-//
-// Copyright © 2021 DittoLive Incorporated. All rights reserved.
-//
-/**
- * @internal
- * @deprecated Replaced by `Presence`.
- */
-class PresenceManager {
-    constructor(ditto) {
-        this.ditto = ditto;
-        this.isClosed = false;
-        this.isRegistered = false;
-        this.currentRemotePeers = [];
-        this.callbacksByPresenceToken = {};
-    }
-    /** @internal */
-    addObserver(callback) {
-        if (this.isClosed) {
-            // REFACTOR: throw a catchable error here, such that calling code
-            // can be more specific when forwarding it to the user.
-            throw new Error(`Internal inconsistency, can't add presence observer, observer mananger close()-ed.`);
-        }
-        this.registerIfNeeded();
-        const token = cryptoGenerateSecureRandomToken();
-        this.callbacksByPresenceToken[token] = callback;
-        this.ditto.keepAlive.retain(`PresenceObservation.${token}`);
-        // REFACTOR: make the initial callback call async, too (othewise we'd be
-        // mixing sync with async, which is a bit problematic in general but might
-        // be OK with single-threaded JS). This is a bit tricky, simply
-        // setTimeout(..., 0) here could lead us to a situation where the initial
-        // call would be sent AFTER the regular notification.
-        callback(this.currentRemotePeers);
-        return token;
-    }
-    /** @internal */
-    async removeObserver(token) {
-        const callback = this.callbacksByPresenceToken[token];
-        if (typeof callback === 'undefined') {
-            throw new Error(`Can't remove presence observer, token '${token}' has never been registered before.`);
-        }
-        if (callback === null) {
-            // Observer has already been removed, no-op.
-            return;
-        }
-        if (typeof this.callbacksByPresenceToken[token] != 'undefined') {
-            this.ditto.keepAlive.release(`PresenceObservation.${token}`);
-            // REFACTOR: not deleting the token here will keep eating up
-            // memory over long periods of time. We actually need to track
-            // the observer objects themselves and remove it from the table
-            // as soon as the observer object is garbage collected.
-            this.callbacksByPresenceToken[token] = null;
-            return this.unregisterIfNeeded();
-        }
-    }
-    /** @internal */
-    hasObserver(token) {
-        return typeof this.callbacksByPresenceToken[token] != 'undefined';
-    }
-    /** @internal */
-    async close() {
-        this.isClosed = true;
-        const tokens = Object.keys(this.callbacksByPresenceToken);
-        return Promise.all(tokens.map((token) => this.removeObserver(token)));
-    }
-    hasObservers() {
-        return Object.keys(this.callbacksByPresenceToken).length > 0;
-    }
-    registerIfNeeded() {
-        this.ditto.deferClose((dittoHandle) => {
-            const needsToRegister = !this.isRegistered;
-            if (needsToRegister) {
-                this.isRegistered = true;
-                const remotePeersJSONString = dittoPresenceV1(dittoHandle.deref());
-                this.currentRemotePeers = this.decode(remotePeersJSONString).sort(this.compareRemotePeers);
-                dittoRegisterPresenceV1Callback(dittoHandle.deref(), this.handlePresenceV1Callback.bind(this));
-            }
-        });
-    }
-    unregisterIfNeeded() {
-        return this.ditto.deferCloseAsync(async (dittoHandle) => {
-            const needsToUnregister = !this.hasObservers() && this.isRegistered;
-            if (needsToUnregister) {
-                this.isRegistered = false;
-                await dittoClearPresenceCallback(dittoHandle.deref());
-                this.currentRemotePeers = [];
-            }
-        });
-    }
-    handlePresenceV1Callback(remotePeersJSONString) {
-        const remotePeers = this.decode(remotePeersJSONString).sort(this.compareRemotePeers);
-        this.currentRemotePeers = remotePeers;
-        this.notify();
-    }
-    notify() {
-        if (this.isClosed) {
-            // NOTE: we don't notify observers after closing.
-            return;
-        }
-        for (const token in this.callbacksByPresenceToken) {
-            const callback = this.callbacksByPresenceToken[token];
-            if (callback)
-                callback(this.currentRemotePeers);
-        }
-    }
-    decode(remotePeersJSONString) {
-        const remotePeersJSON = JSON.parse(remotePeersJSONString);
-        return remotePeersJSON.map((remotePeerJSON) => {
-            var _a, _b;
-            return {
-                networkID: remotePeerJSON['network_id'],
-                deviceName: remotePeerJSON['device_name'],
-                rssi: (_a = remotePeerJSON['rssi']) !== null && _a !== void 0 ? _a : undefined,
-                approximateDistanceInMeters: (_b = remotePeerJSON['approximate_distance_in_meters']) !== null && _b !== void 0 ? _b : undefined,
-                connections: remotePeerJSON['connections'],
-            };
-        });
-    }
-    compareRemotePeers(left, right) {
-        // NOTE: we use the exact same sort order here as in the ObjC version.
-        if (left.connections.length === 0 && right.connections.length > 0)
-            return +1;
-        if (left.connections.length > 0 && right.connections.length === 0)
-            return -1;
-        if (left.deviceName < right.deviceName)
-            return -1;
-        if (left.deviceName > right.deviceName)
-            return +1;
-        return 0;
-    }
-}
-
 //
 // Copyright © 2021 DittoLive Incorporated. All rights reserved.
 //
@@ -10242,16 +10090,69 @@ class TransportConditionsManager extends ObserverManager {
  *
  * Create a sync subscription by calling
  * {@link Sync.registerSubscription | `ditto.sync.registerSubscription()`}.
- *
- * @template T The type of query arguments passed to the sync subscription.
  */
 class SyncSubscription {
+    /**
+     * Documents matching this query will be included in the sync subscription.
+     */
+    get queryString() {
+        return syncSubscriptionQueryString(this.deref());
+    }
+    /**
+     * The query arguments of the sync subscription (as passed when adding it to
+     * the store).
+     *
+     * Note that this value is not guaranteed to be strictly equal to the value
+     * used when registering the sync subscription. In particular, any
+     * {@link Attachment} values in query arguments will be represented by that
+     * attachment's {@link AttachmentToken} here.
+     *
+     * Also see {@link queryArgumentsCBORData} and
+     * {@link queryArgumentsJSONString} for the raw serialized representations of
+     * the query arguments.
+     */
+    get queryArguments() {
+        const queryArgumentsCBOR = this.queryArgumentsCBORData;
+        if (queryArgumentsCBOR == null)
+            return undefined;
+        try {
+            const queryArguments = CBOR.decode(queryArgumentsCBOR);
+            return Object.freeze(queryArguments);
+        }
+        catch (error) {
+            throw new DittoError('query/arguments-invalid', `Failed to decode query arguments: ${error.message}`);
+        }
+    }
+    /**
+     * The query arguments of the sync subscription, serialized as CBOR, (as
+     * passed when adding it to the store).
+     *
+     * Note that any {@link Attachment} values passed in as query arguments when
+     * creating this sync subscription will be represented by that attachment's
+     * {@link AttachmentToken} here.
+     */
+    get queryArgumentsCBORData() {
+        const queryArgumentsCBOR = syncSubscriptionQueryArgumentsCBOR(this.deref());
+        return queryArgumentsCBOR == null ? undefined : queryArgumentsCBOR;
+    }
+    /**
+     * The query arguments of the sync subscription, serialized as JSON, (as
+     * passed when adding it to the store).
+     *
+     * Note that any {@link Attachment} values passed in as query arguments when
+     * creating this sync subscription will be represented by that attachment's
+     * {@link AttachmentToken} here.
+     */
+    get queryArgumentsJSONString() {
+        const queryArgumentsJSON = syncSubscriptionQueryArgumentsJSON(this.deref());
+        return queryArgumentsJSON == null ? undefined : queryArgumentsJSON;
+    }
     /**
      * `true` when the sync subscription has been cancelled or the {@link Ditto}
      * instance managing this subscription has been closed.
      */
     get isCancelled() {
-        return this._isCancelled;
+        return syncSubscriptionIsCancelled(this.deref());
     }
     /**
      * Cancels the sync subscription and unregisters it. No-op
@@ -10259,32 +10160,16 @@ class SyncSubscription {
      * instance managing this subscription has been closed.
      */
     cancel() {
-        if (this._isCancelled)
-            return;
-        this._isCancelled = true;
-        this.ditto.sync.unregisterSubscription(this);
+        syncSubscriptionCancel(this.deref());
     }
     // --------------------------- Internal --------------------------------------
     /** @internal */
-    constructor(ditto, query, queryArguments, queryArgumentsCBOR) {
-        // --------------------------- Private --------------------------------------
-        /**
-         * `true` when the sync subscription has been cancelled.
-         *
-         * We mark the sync subscription as cancelled here as an optimization to avoid
-         * a scan of all subscriptions in the store whenever the `isCancelled`
-         * property is checked.
-         */
-        this._isCancelled = false;
-        if ((queryArguments == null) !== (queryArgumentsCBOR == null)) {
-            throw new DittoError('internal', 'Internal inconsistency, query arguments and query arguments CBOR must be both null or both non-null', { queryArguments, queryArgumentsCBOR });
-        }
+    constructor(ditto) {
         this.ditto = ditto;
-        this.queryString = query;
-        this.queryArguments = queryArguments
-            ? Object.freeze({ ...queryArguments })
-            : undefined;
-        this.queryArgumentsCBOR = queryArgumentsCBOR;
+    }
+    // --------------------------- Private --------------------------------------
+    deref() {
+        return Bridge.syncSubscription.handleFor(this).deref();
     }
 }
 
@@ -10297,6 +10182,19 @@ class SyncSubscription {
  * Access this object via {@link Ditto.sync | Ditto.sync} on any Ditto instance.
  */
 class Sync {
+    /**
+     * All currently active {@link SyncSubscription | sync subscriptions}.
+     *
+     * **Note:** Manage sync subscriptions using
+     * {@link registerSubscription | registerSubscription()} to register a new
+     * sync subscription and
+     * {@link SyncSubscription.cancel | SyncSubscription.cancel()} to remove an
+     * existing sync subscription.
+     */
+    get subscriptions() {
+        const ffiSyncSubscriptions = this.ditto.deferClose((dittoHandle) => mapFFIErrors(() => syncSubscriptions(dittoHandle.deref())));
+        return ffiSyncSubscriptions.map((pointer) => Bridge.syncSubscription.bridge(pointer, () => new SyncSubscription(this.ditto)));
+    }
     /**
      * Returns `true` if sync is active, otherwise returns `false`. Use
      * {@link Sync.start | ditto.sync.start()} to activate and
@@ -10353,7 +10251,6 @@ class Sync {
      * @param query a string containing a valid query expressed in DQL.
      * @param queryArguments an object containing the arguments for the query.
      * Example: `{mileage: 123}` for a query with `:mileage` placeholder.
-     * @template T The type of the query arguments.
      * @returns An active `SyncSubscription` for the passed in query and
      * arguments. It will remain active until it is
      * {@link SyncSubscription.cancel | cancelled} or the {@link Ditto} instance
@@ -10373,71 +10270,20 @@ class Sync {
         let queryArgumentsCBOR = null;
         if (queryArguments != null) {
             try {
-                const queryArgumentsJSON = desugarJSObject(queryArguments);
-                queryArgumentsCBOR = CBOR.encode(queryArgumentsJSON);
+                queryArgumentsCBOR = CBOR.encodeWithReplacer(queryArguments, desugarJSObjectV2);
             }
             catch (error) {
                 throw new DittoError('query/arguments-invalid', `Unable to encode query arguments: ${error.message}`);
             }
         }
-        this.ditto.deferClose((dittoHandle) => {
-            mapFFIErrors(() => tryAddSyncSubscription(dittoHandle.deref(), query, queryArgumentsCBOR));
-        });
-        const subscription = new SyncSubscription(this.ditto, query, queryArguments || null, queryArgumentsCBOR);
-        // @ts-expect-error modifying readonly property
-        this.subscriptions = Object.freeze([...this.subscriptions, subscription]);
-        return subscription;
+        const syncSubscriptionPointer = this.ditto.deferClose((dittoHandle) => mapFFIErrors(() => syncRegisterSubscriptionThrows(dittoHandle.deref(), query, queryArgumentsCBOR)));
+        return Bridge.syncSubscription.bridge(syncSubscriptionPointer, () => new SyncSubscription(this.ditto));
     }
     // ---------------------------------------------------------- Internal ------
     /** @internal */
     constructor(ditto) {
-        /**
-         * All currently active {@link SyncSubscription | sync subscriptions}.
-         *
-         * **Note:** Manage sync subscriptions using
-         * {@link registerSubscription | registerSubscription()} to register a new
-         * sync subscription and
-         * {@link SyncSubscription.cancel | SyncSubscription.cancel()} to remove an
-         * existing sync subscription.
-         */
-        this.subscriptions = Object.freeze([]);
         this.ditto = ditto;
     }
-    /**
-     * Removes the passed in `syncSubscription`, configuring Ditto to not receive
-     * updates for documents matching the corresponding query anymore. No-op if
-     * the passed in `syncSubscription` has already been removed.
-     *
-     * This must only be called by the sync subscription itself.
-     *
-     * @param syncSubscription the sync subscription to remove
-     * @returns `true` if the passed in sync subscription could be found and has
-     * been removed, otherwise returns `false`.
-     * @throws {@link DittoError} `internal`: if the replication subscription does not
-     * belong to this store
-     * @throws {@link DittoError} `internal`: if the replication subscription has not
-     * been cancelled yet
-     * @internal
-     */
-    unregisterSubscription(syncSubscription) {
-        if (syncSubscription.ditto !== this.ditto) {
-            throw new DittoError('internal', `Can't remove replication subscription that does not belong to this store`);
-        }
-        if (!syncSubscription.isCancelled) {
-            throw new DittoError('internal', "Internal inconsistency, can't remove replication subscription that has not been cancelled");
-        }
-        const indexToDelete = this.subscriptions.findIndex((s) => s === syncSubscription);
-        if (indexToDelete === -1)
-            return false;
-        const newSyncSubscriptions = [...this.subscriptions];
-        newSyncSubscriptions.splice(indexToDelete, 1);
-        // @ts-expect-error modifying readonly property
-        this.subscriptions = Object.freeze(newSyncSubscriptions);
-        this.ditto.deferClose((dittoHandle) => {
-            mapFFIErrors(() => tryRemoveSyncSubscription(dittoHandle.deref(), syncSubscription.queryString, syncSubscription.queryArgumentsCBOR));
-        });
-        return true;
-    }
     /** @internal */
     close() {
         for (const subscription of this.subscriptions)
@@ -10497,7 +10343,7 @@ class SubscriptionManager {
         this.ditto.deferClose(() => {
             for (const subscriptionID in this.subscriptions) {
                 const subscription = this.subscriptions[subscriptionID].deref();
-                subscription === null || subscription === void 0 ? void 0 : subscription.cancel();
+                subscription?.cancel();
             }
         });
     }
@@ -10924,7 +10770,6 @@ class ConfigOrParameters {
         }
     }
     validateIdentity(identity) {
-        var _a, _b;
         if (!identity || typeof identity !== 'object') {
             throw new TypeError('Expected `identity` to be an object, but got: ' + typeof identity);
         }
@@ -10986,8 +10831,8 @@ class ConfigOrParameters {
             if (authHandlerType !== 'object') {
                 throw new TypeError(`Property .authHandler on identity of type onlineWithAuthentication must be an object, but is of type '${authHandlerType}'.`);
             }
-            const expiringSoonType = typeof ((_a = identity.authHandler) === null || _a === void 0 ? void 0 : _a.authenticationExpiringSoon);
-            const authenticationRequiredType = typeof ((_b = identity.authHandler) === null || _b === void 0 ? void 0 : _b.authenticationRequired);
+            const expiringSoonType = typeof identity.authHandler?.authenticationExpiringSoon;
+            const authenticationRequiredType = typeof identity.authHandler?.authenticationRequired;
             if (expiringSoonType !== 'function') {
                 throw new TypeError(`Property .authHandler.authenticationExpiringSoon on identity of type onlineWithAuthentication must be a function, but is of type '${expiringSoonType}'.`);
             }
@@ -11331,8 +11176,7 @@ class Ditto {
      * `false`.
      */
     get isClosed() {
-        var _a;
-        return (_a = this._isClosed) !== null && _a !== void 0 ? _a : false;
+        return this._isClosed ?? false;
     }
     /**
      * Returns `true` if sync is active, otherwise returns `false`. Use
@@ -11375,7 +11219,6 @@ class Ditto {
     // async part of making a new Ditto instance can be done in Ditto.open() and
     // this constructor uses the outputs of that to set up the Ditto instance.
     constructor(identity, persistenceDirectory) {
-        var _a, _b, _c, _d, _e;
         // ------------------------------------------------------------ Private ------
         this.deferCloseAllowed = true;
         this._isClosed = false;
@@ -11403,7 +11246,7 @@ class Ditto {
         }
         else {
             // the constructor was called directly
-            const identityOrDefault = identity !== null && identity !== void 0 ? identity : DEFAULT_IDENTITY;
+            const identityOrDefault = identity ?? DEFAULT_IDENTITY;
             configOrParameters = new ConfigOrParameters(identityOrDefault, persistenceDirectory);
         }
         this.configOrParameters = configOrParameters.redactingSensitiveData();
@@ -11437,14 +11280,15 @@ class Ditto {
             // set.
             this.auth = new OnlineAuthenticatorV2(this.keepAlive, this);
         }
-        else if (((_a = configOrParameters.identity) === null || _a === void 0 ? void 0 : _a.type) === 'onlineWithAuthentication') {
+        else if (configOrParameters.identity?.type === 'onlineWithAuthentication') {
             // IMPORTANT: Keeping the auth client around accumulates run-times and
             // resources which becomes a problem specifically in tests (where we use one
             // Ditto instance per test). We therefore keep it only if needed, i.e.
             // _only_ for the onlineWithAuthentication and online identities and
             // transfer ownership of it to the authenticator.
             enableDittoCloudSync =
-                (_c = (_b = configOrParameters.identity) === null || _b === void 0 ? void 0 : _b.enableDittoCloudSync) !== null && _c !== void 0 ? _c : true;
+                configOrParameters.identity
+                    ?.enableDittoCloudSync ?? true;
             this.auth = new OnlineAuthenticator(this.keepAlive, this, configOrParameters.identity.authHandler);
             const weakThis = new WeakRef(this);
             const loginProviderPointer = dittoAuthClientMakeLoginProvider(function (secondsRemaining) {
@@ -11468,9 +11312,9 @@ class Ditto {
             // constructor finishes
             void dittoAuthSetLoginProvider(dittoPointer, loginProviderPointer);
         }
-        else if (((_d = configOrParameters.identity) === null || _d === void 0 ? void 0 : _d.type) === 'onlinePlayground') {
+        else if (configOrParameters.identity?.type === 'onlinePlayground') {
             enableDittoCloudSync =
-                (_e = configOrParameters.identity.enableDittoCloudSync) !== null && _e !== void 0 ? _e : true;
+                configOrParameters.identity.enableDittoCloudSync ?? true;
             this.auth = new OnlineAuthenticator(this.keepAlive, this, {
                 authenticationRequired: function (authenticator) {
                     // No-op.
@@ -11494,7 +11338,6 @@ class Ditto {
         this.store = new Store(this);
         this.smallPeerInfo = new SmallPeerInfo(this);
         this.presence = new Presence(this);
-        this.presenceManager = new PresenceManager(this);
         this.liveQueryManager = new LiveQueryManager(this, this.keepAlive);
         this.attachmentFetcherManager = new AttachmentFetcherManager(this);
         this.transportConditionsManager = new TransportConditionsManager(this);
@@ -11531,7 +11374,7 @@ class Ditto {
                     setDeadlockTimeout(0);
                 }
                 catch (e) {
-                    throw new Error(`Failed to disable deadlock detection: ${e === null || e === void 0 ? void 0 : e.message}`);
+                    throw new Error(`Failed to disable deadlock detection: ${e?.message}`);
                 }
             }
         }
@@ -11721,26 +11564,6 @@ class Ditto {
             dittoStopSync(dittoHandle.deref());
         });
     }
-    /**
-     * Registers an observer for info about Ditto peers in range of this device.
-     *
-     * Ditto will prevent the process from exiting as long as there are active
-     * peers observers (not relevant when running in the browser).
-     *
-     * @param callback called immediately with the current state of peers
-     * in range and whenever that state changes. Then it will be invoked
-     * repeatedly when Ditto devices come and go, or the active connections to
-     * them change.
-     *
-     * @deprecated please use {@link Presence.observe | presence.observe()} instead.
-     */
-    observePeers(callback) {
-        Logger.warning('`ditto.observePeers()` is deprecated, please use `ditto.presence.observe()` instead.');
-        const token = this.presenceManager.addObserver(callback);
-        return new Observer(this.presenceManager, token, {
-            stopsWhenFinalized: true,
-        });
-    }
     /**
      * Register observer for changes of underlying transport conditions.
      *
@@ -11815,7 +11638,6 @@ class Ditto {
         this.presence.close();
         this.auth.close();
         this.sync.close();
-        await this.presenceManager.close();
         this.liveQueryManager.close();
         this.attachmentFetcherManager.close();
         this.transportConditionsManager.close();
@@ -11925,11 +11747,10 @@ const checkAPIs = (_globalObject) => {
  * @internal
  */
 const disableDeadlockTimeoutWhenDebugging = () => {
-    var _a, _b;
     {
         const hasInspector = process &&
-            ((_a = process === null || process === void 0 ? void 0 : process.execArgv) === null || _a === void 0 ? void 0 : _a.some((arg) => arg.includes('--inspect') || arg.includes('--debug')));
-        const hasLegacyDebugMode = (process && ((_b = process === null || process === void 0 ? void 0 : process.execArgv) === null || _b === void 0 ? void 0 : _b.some((arg) => arg.includes('--debug')))) ||
+            process?.execArgv?.some((arg) => arg.includes('--inspect') || arg.includes('--debug'));
+        const hasLegacyDebugMode = (process && process?.execArgv?.some((arg) => arg.includes('--debug'))) ||
             // @ts-ignore - v8debug may be undefined
             typeof v8debug === 'object';
         if (hasInspector || hasLegacyDebugMode) {
@@ -11938,7 +11759,7 @@ const disableDeadlockTimeoutWhenDebugging = () => {
                 Logger.warning('Detected Node running with inspector enabled, disabling deadlock timeout.');
             }
             catch (e) {
-                Logger.error(`Detected Node running with inspector enabled but failed to disable deadlock timeout: ${e === null || e === void 0 ? void 0 : e.message}`);
+                Logger.error(`Detected Node running with inspector enabled but failed to disable deadlock timeout: ${e?.message}`);
             }
         }
     }
@@ -12149,13 +11970,14 @@ function getBridgeLoad() {
 // immediately require the bridged type, oftentimes leading to an import cycle.
 Bridge.attachment.registerType(Attachment);
 Bridge.connectionRequest.registerType(ConnectionRequest);
+Bridge.differ.registerType(Differ);
+Bridge.ditto.registerType(Ditto);
 Bridge.document.registerType(Document);
+Bridge.mutableDocument.registerType(MutableDocument);
+Bridge.queryResult.registerType(QueryResult);
 Bridge.queryResultItem.registerType(QueryResultItem);
-Bridge.differ.registerType(Differ);
 Bridge.transaction.registerType(Transaction);
-Bridge.queryResult.registerType(QueryResult);
-Bridge.mutableDocument.registerType(MutableDocument);
-Bridge.ditto.registerType(Ditto);
+Bridge.syncSubscription.registerType(SyncSubscription);
 
 exports.Attachment = Attachment;
 exports.AttachmentFetcher = AttachmentFetcher;