dexie-cloud-addon 4.0.0-beta.24 → 4.0.1-beta.27

package/dist/types/DXCWebSocketStatus.d.ts

@@ -1 +1 @@
-export declare type DXCWebSocketStatus = "not-started" | "connecting" | "connected" | "disconnected" | "error";
+export type DXCWebSocketStatus = "not-started" | "connecting" | "connected" | "disconnected" | "error";

package/dist/types/DexieCloudTable.d.ts

@@ -1,2 +1,18 @@
-import { Table } from 'dexie';
-export declare type DexieCloudTable<T = any, TKey = string> = Table<T, TKey, 'realmId' | 'owner'>;
+import { EntityTable, InsertType } from 'dexie';
+export interface DexieCloudEntity {
+    owner: string;
+    realmId: string;
+}
+/** Don't force the declaration of owner and realmId on every entity (some
+ * types may not be interested of these props if they are never going to be shared)
+ * Let the type system behave the same as the runtime and merge these props in automatically
+ * when declaring the table where the props aren't explicitely declared.
+ * User may also explicitely declare these props in order to manually set them when
+ * they are interested of taking control over access.
+ */
+type WithDexieCloudProps<T> = T extends DexieCloudEntity ? T : T & DexieCloudEntity;
+/** Syntactic sugar for declaring a synced table of arbritary entity.
+ *
+ */
+export type DexieCloudTable<T = any, TKeyPropName extends keyof T = never> = EntityTable<WithDexieCloudProps<T>, TKeyPropName, InsertType<WithDexieCloudProps<T>, TKeyPropName | 'owner' | 'realmId'>>;
+export {};

package/dist/types/PermissionChecker.d.ts

@@ -1,6 +1,6 @@
 import { KeyPaths } from 'dexie';
 import { DBPermissionSet } from 'dexie-cloud-common';
-declare type TableName<T> = T extends {
+type TableName<T> = T extends {
     table: () => infer TABLE;
 } ? TABLE extends string ? TABLE : string : string;
 export declare class PermissionChecker<T, TableNames extends string = TableName<T>> {

package/dist/types/TSON.d.ts

@@ -1,5 +1,5 @@
 export declare const hasBigIntSupport: boolean;
-export declare function compareBigInts(a: bigint | FakeBigInt | string, b: bigint | FakeBigInt | string): 1 | 0 | -1;
+export declare function compareBigInts(a: bigint | FakeBigInt | string, b: bigint | FakeBigInt | string): 0 | 1 | -1;
 export declare class FakeBigInt {
     v: string;
     toString(): string;

package/dist/types/WSObservable.d.ts

@@ -1,12 +1,12 @@
 import { DBOperationsSet } from 'dexie-cloud-common';
 import { BehaviorSubject, Observable, Subscriber, Subscription } from 'rxjs';
 import { DXCWebSocketStatus } from './DXCWebSocketStatus';
-export declare type WSClientToServerMsg = ReadyForChangesMessage;
+export type WSClientToServerMsg = ReadyForChangesMessage;
 export interface ReadyForChangesMessage {
     type: 'ready';
     rev: string;
 }
-export declare type WSConnectionMsg = RevisionChangedMessage | RealmAddedMessage | RealmAcceptedMessage | RealmRemovedMessage | RealmsChangedMessage | ChangesFromServerMessage | TokenExpiredMessage;
+export type WSConnectionMsg = RevisionChangedMessage | RealmAddedMessage | RealmAcceptedMessage | RealmRemovedMessage | RealmsChangedMessage | ChangesFromServerMessage | TokenExpiredMessage;
 export interface ChangesFromServerMessage {
     type: 'changes';
     baseRev: string;

package/dist/types/authentication/authenticate.d.ts

@@ -3,7 +3,7 @@ import { BehaviorSubject } from 'rxjs';
 import { DexieCloudDB } from '../db/DexieCloudDB';
 import { UserLogin } from '../db/entities/UserLogin';
 import { DXCUserInteraction } from '../types/DXCUserInteraction';
-export declare type FetchTokenCallback = (tokenParams: {
+export type FetchTokenCallback = (tokenParams: {
     public_key: string;
     hints?: {
         userId?: string;

package/dist/types/db/DexieCloudDB.d.ts

@@ -14,7 +14,7 @@ export interface SyncStateChangedEventData {
     error?: Error;
     progress?: number;
 }
-declare type SyncStateTable = Table<PersistedSyncState | DexieCloudSchema | DexieCloudOptions, 'syncState' | 'options' | 'schema'>;
+type SyncStateTable = Table<PersistedSyncState | DexieCloudSchema | DexieCloudOptions, 'syncState' | 'options' | 'schema'>;
 export interface DexieCloudDBBase {
     readonly name: Dexie['name'];
     readonly close: Dexie['close'];

package/dist/types/extend-dexie-interface.d.ts

@@ -1,12 +1,13 @@
 import { DBRealm, DBRealmMember, DBRealmRole } from 'dexie-cloud-common';
 import { DexieCloudAPI } from './DexieCloudAPI';
 import { NewIdOptions } from './types/NewIdOptions';
+type Optional<T, Props extends keyof T> = Omit<T, Props> & Partial<T>;
 declare module 'dexie' {
     interface Dexie {
         cloud: DexieCloudAPI;
-        realms: Table<DBRealm, 'realmId', 'owner'>;
-        members: Table<DBRealmMember, 'id', 'realmId' | 'owner'>;
-        roles: Table<DBRealmRole, [string, string], 'owner'>;
+        realms: Table<DBRealm, string, Optional<DBRealm, 'realmId' | 'owner'>>;
+        members: Table<DBRealmMember, string, Optional<DBRealmMember, 'id' | 'owner'>>;
+        roles: Table<DBRealmRole, [string, string], Optional<DBRealmRole, 'owner'>>;
     }
     interface Table {
         newId(options: NewIdOptions): string;
@@ -19,3 +20,4 @@ declare module 'dexie' {
         };
     }
 }
+export {};

package/dist/types/getInternalAccessControlObservable.d.ts

@@ -1,6 +1,6 @@
 import Dexie from 'dexie';
 import { DBRealm, DBRealmMember } from 'dexie-cloud-common';
-export declare type InternalAccessControlData = {
+export type InternalAccessControlData = {
     readonly selfMembers: DBRealmMember[];
     readonly realms: DBRealm[];
     readonly userId: string;

package/dist/types/getPermissionsLookupObservable.d.ts

@@ -1,12 +1,12 @@
 import Dexie from 'dexie';
 import { DBPermissionSet, DBRealm } from 'dexie-cloud-common';
 import { Observable } from 'rxjs';
-export declare type PermissionsLookup = {
+export type PermissionsLookup = {
     [realmId: string]: DBRealm & {
         permissions: DBPermissionSet;
     };
 };
-export declare type PermissionsLookupObservable = Observable<PermissionsLookup> & {
+export type PermissionsLookupObservable = Observable<PermissionsLookup> & {
     getValue(): PermissionsLookup;
 };
 export declare const getPermissionsLookupObservable: (x: Dexie) => import("./mapValueObservable").ObservableWithCurrentValue<{

package/dist/types/sync/getTablesToSyncify.d.ts

@@ -1,3 +1,3 @@
 import { DexieCloudDB } from "../db/DexieCloudDB";
 import { PersistedSyncState } from "../db/entities/PersistedSyncState";
-export declare function getTablesToSyncify(db: DexieCloudDB, syncState: PersistedSyncState | undefined): import("dexie").Table<import("../db/entities/EntityCommon").EntityCommon, import("dexie").IndexableType, void>[];
+export declare function getTablesToSyncify(db: DexieCloudDB, syncState: PersistedSyncState | undefined): import("dexie").Table<import("../db/entities/EntityCommon").EntityCommon, import("dexie").IndexableType, import("../db/entities/EntityCommon").EntityCommon>[];

package/dist/types/sync/messagesFromServerQueue.d.ts

@@ -1,7 +1,7 @@
 import { BehaviorSubject } from 'rxjs';
 import { DexieCloudDB } from '../db/DexieCloudDB';
 import { WSConnectionMsg } from '../WSObservable';
-export declare type MessagesFromServerConsumer = ReturnType<typeof MessagesFromServerConsumer>;
+export type MessagesFromServerConsumer = ReturnType<typeof MessagesFromServerConsumer>;
 export declare function MessagesFromServerConsumer(db: DexieCloudDB): {
     enqueue: (msg: WSConnectionMsg) => void;
     readyToServe: BehaviorSubject<boolean>;

package/dist/types/types/DXCAlert.d.ts

@@ -1,4 +1,4 @@
-export declare type DXCAlert = DXCErrorAlert | DXCWarningAlert | DXCInfoAlert;
+export type DXCAlert = DXCErrorAlert | DXCWarningAlert | DXCInfoAlert;
 export interface DXCErrorAlert {
     type: 'error';
     messageCode: 'INVALID_OTP' | 'INVALID_EMAIL' | 'LICENSE_LIMIT_REACHED' | 'GENERIC_ERROR';

package/dist/types/types/DXCInputField.d.ts

@@ -1,4 +1,4 @@
-export declare type DXCInputField = DXCTextField | DXCPasswordField;
+export type DXCInputField = DXCTextField | DXCPasswordField;
 export interface DXCTextField {
     type: 'text' | 'email' | 'otp';
     label?: string;

package/dist/types/types/DXCUserInteraction.d.ts

@@ -1,6 +1,6 @@
 import { DXCAlert } from './DXCAlert';
 import { DXCInputField } from './DXCInputField';
-export declare type DXCUserInteraction = DXCGenericUserInteraction | DXCEmailPrompt | DXCOTPPrompt | DXCMessageAlert;
+export type DXCUserInteraction = DXCGenericUserInteraction | DXCEmailPrompt | DXCOTPPrompt | DXCMessageAlert;
 export interface DXCGenericUserInteraction<Type extends string = "generic", TFields extends {
     [name: string]: DXCInputField;
 } = any> {

package/dist/types/types/SWSyncEvent.d.ts

@@ -1,4 +1,4 @@
-export declare type SyncEvent = Event & {
+export type SyncEvent = Event & {
     tag: string;
     waitUntil(promise: Promise<any>): void;
 };

package/dist/types/types/SyncState.d.ts

@@ -1,5 +1,5 @@
-export declare type SyncStatePhase = "initial" | "not-in-sync" | "pushing" | "pulling" | "in-sync" | 'error' | 'offline';
-export declare type SyncStatus = "not-started" | "connecting" | "connected" | "disconnected" | "error" | "offline";
+export type SyncStatePhase = "initial" | "not-in-sync" | "pushing" | "pulling" | "in-sync" | 'error' | 'offline';
+export type SyncStatus = "not-started" | "connecting" | "connected" | "disconnected" | "error" | "offline";
 export interface SyncState {
     status: SyncStatus;
     phase: SyncStatePhase;

package/dist/umd/dexie-cloud-addon.js

@@ -108,7 +108,7 @@
      *
      * ==========================================================================
      *
-     * Version 4.0.0-beta.24, Mon Oct 17 2022
+     * Version 4.0.1-beta.27, Mon Mar 06 2023
      *
      * https://dexie.org
      *
@@ -313,7 +313,7 @@
         function settle(resolve, reject, d, v) { Promise.resolve(v).then(function (v) { resolve({ value: v, done: d }); }, reject); }
     }
     //@ts-check
-    var randomFillSync = crypto.getRandomValues;
+    var randomFillSync = crypto.getRandomValues.bind(crypto);
     function assert(b) {
         if (!b)
             throw new Error('Assertion Failed');
@@ -374,17 +374,17 @@
             }
         }
     }
-    var randomString$1 = typeof Buffer !== 'undefined' ? function (bytes) {
-        // Node
-        var buf = Buffer.alloc(bytes);
-        randomFillSync(buf);
-        return buf.toString("base64");
-    } : function (bytes) {
+    var randomString$1 = typeof self !== 'undefined' && typeof crypto !== 'undefined' ? function (bytes) {
         // Web
         var buf = new Uint8Array(bytes);
         crypto.getRandomValues(buf);
         return btoa(String.fromCharCode.apply(null, buf));
-    };
+    } : typeof Buffer !== 'undefined' ? function (bytes) {
+        // Node
+        var buf = Buffer.alloc(bytes);
+        randomFillSync(buf);
+        return buf.toString("base64");
+    } : function () { throw new Error("No implementation of randomString was found"); };
     /** Verifies that given primary key is valid.
      * The reason we narrow validity for valid keys are twofold:
      *  1: Make sure to only support types that can be used as an object index in DBKeyMutationSet.
@@ -3591,7 +3591,7 @@
     //     serverRev.rev = bigIntDef.bigint.revive(server.rev)
     //   else
     //     serverRev.rev = new FakeBigInt(server.rev)
-    var hasBigIntSupport = typeof BigInt(0) === 'bigint';
+    var hasBigIntSupport = typeof BigInt === 'function' && typeof BigInt(0) === 'bigint';
     var FakeBigInt = /** @class */ (function () {
         function FakeBigInt(value) {
             this.v = value;
@@ -4787,7 +4787,17 @@
                     return db.$syncState.get('syncState');
                 },
                 getSchema: function () {
-                    return db.$syncState.get('schema');
+                    return db.$syncState.get('schema').then(function (schema) {
+                        if (schema) {
+                            for (var _k = 0, _l = db.tables; _k < _l.length; _k++) {
+                                var table = _l[_k];
+                                if (table.schema.primKey && table.schema.primKey.keyPath && schema[table.name]) {
+                                    schema[table.name].primaryKey = nameFromKeyPath(table.schema.primKey.keyPath);
+                                }
+                            }
+                        }
+                        return schema;
+                    });
                 },
                 getOptions: function () {
                     return db.$syncState.get('options');
@@ -4805,6 +4815,11 @@
         }
         return db;
     }
+    function nameFromKeyPath(keyPath) {
+        return typeof keyPath === 'string' ?
+            keyPath :
+            keyPath ? ('[' + [].join.call(keyPath, '+') + ']') : "";
+    }
     // @ts-ignore
     var isFirefox = typeof InstallTrigger !== 'undefined';
     var isSafari = typeof navigator !== 'undefined' &&
@@ -5052,7 +5067,7 @@
                                                 // modify operations. Reason: Server may not have
                                                 // the object. Object should be created on server only
                                                 // if is being updated. An update operation won't create it
-                                                // so we must delete req.changeSpec to decrate operation to
+                                                // so we must delete req.changeSpec to degrade operation to
                                                 // an upsert operation with timestamp so that it will be created.
                                                 // We must also degrade from consistent modify operations for the
                                                 // same reason - object might be there on server. Must but put up instead.
@@ -5064,7 +5079,7 @@
                                                 if (req.type === 'put') {
                                                     delete req.criteria;
                                                     delete req.changeSpec;
-                                                    delete req.changeSpecs;
+                                                    delete req.updates;
                                                     obj.$ts = Date.now();
                                                 }
                                             }
@@ -5266,11 +5281,10 @@
                                 var hasFailures = res.numFailures, failures = res.failures;
                                 var keys = type === 'delete' ? req.keys : res.results;
                                 var values = 'values' in req ? req.values : [];
-                                var changeSpecs = 'changeSpecs' in req ? req.changeSpecs : [];
+                                var updates = 'updates' in req && req.updates;
                                 if (hasFailures) {
                                     keys = keys.filter(function (_, idx) { return !failures[idx]; });
                                     values = values.filter(function (_, idx) { return !failures[idx]; });
-                                    changeSpecs = changeSpecs.filter(function (_, idx) { return !failures[idx]; });
                                 }
                                 var ts = Date.now();
                                 var mut = req.type === 'delete'
@@ -5302,13 +5316,13 @@
                                                 txid: txid,
                                                 userId: userId
                                             }
-                                            : req.changeSpecs
+                                            : updates
                                                 ? {
                                                     // One changeSpec per key
                                                     type: 'update',
                                                     ts: ts,
-                                                    keys: keys,
-                                                    changeSpecs: changeSpecs,
+                                                    keys: updates.keys,
+                                                    changeSpecs: updates.changeSpecs,
                                                     txid: txid,
                                                     userId: userId
                                                 }
@@ -6831,10 +6845,10 @@
         return o;
     }
     var getInvitesObservable = associate(function (db) {
-        var membersByEmail = getCurrentUserEmitter(db._novip).pipe(rxjs.switchMap(function (currentUser) { return Dexie.liveQuery(function () { return db.members.where({ email: currentUser.email || '' }).toArray(); }); }));
+        var membersByEmail = getCurrentUserEmitter(db._novip).pipe(switchMap(function (currentUser) { return Dexie.liveQuery(function () { return db.members.where({ email: currentUser.email || '' }).toArray(); }); }));
         var permissions = getPermissionsLookupObservable(db._novip);
         var accessControl = getInternalAccessControlObservable(db._novip);
-        return createSharedValueObservable(rxjs.combineLatest([membersByEmail, accessControl, permissions]).pipe(rxjs.map(function (_k) {
+        return createSharedValueObservable(rxjs.combineLatest([membersByEmail, accessControl, permissions]).pipe(map(function (_k) {
             var membersByEmail = _k[0], accessControl = _k[1], realmLookup = _k[2];
             var reducer = function (result, m) {
                 var _k;
@@ -6922,7 +6936,7 @@
             currentUserEmitter.next(UNAUTHORIZED_USER);
         });
         dexie.cloud = {
-            version: '4.0.0-beta.24',
+            version: '4.0.1-beta.27',
             options: Object.assign({}, DEFAULT_OPTIONS),
             schema: null,
             get currentUserId() {
@@ -7082,7 +7096,7 @@
                         case 3:
                             swRegistrations = _k;
                             return [4 /*yield*/, db.transaction('rw', db.$syncState, function () { return __awaiter(_this_1, void 0, void 0, function () {
-                                    var _h, _j, _k, options, schema, _l, persistedOptions, persistedSchema, persistedSyncState, newPersistedSchema, _m, _o, _p, table, tblSchema, newTblSchema;
+                                    var _h, _j, _k, options, schema, _l, persistedOptions, persistedSchema, persistedSyncState, newPersistedOptions, newPersistedSchema, _m, _o, _p, table, tblSchema, newTblSchema;
                                     return __generator$1(this, function (_q) {
                                         switch (_q.label) {
                                             case 0:
@@ -7105,7 +7119,9 @@
                                                 // Update persisted options:
                                                 if (!options)
                                                     throw new Error("Internal error"); // options cannot be null if configuredProgramatically is set.
-                                                return [4 /*yield*/, db.$syncState.put(options, 'options')];
+                                                newPersistedOptions = Object.assign({}, options);
+                                                delete newPersistedOptions.fetchTokens;
+                                                return [4 /*yield*/, db.$syncState.put(newPersistedOptions, 'options')];
                                             case 3:
                                                 _q.sent();
                                                 _q.label = 4;
@@ -7253,7 +7269,7 @@
             });
         }
     }
-    dexieCloud.version = '4.0.0-beta.24';
+    dexieCloud.version = '4.0.1-beta.27';
     Dexie__default["default"].Cloud = dexieCloud;
 
     exports["default"] = dexieCloud;