Fix issues #2103 and #2113 (#2119)

* Fix issues #2103 and #2113

* Allow tagging released version as canary

---------

Co-authored-by: David Fahlander <[email protected]>

Author: dfahlander

Diff for: addons/dexie-cloud/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dexie-cloud-addon",
-  "version": "4.0.8",
+  "version": "4.0.11",
   "description": "Dexie addon that syncs with to Dexie Cloud",
   "main": "dist/umd/dexie-cloud-addon.js",
   "type": "module",
@@ -95,6 +95,6 @@
     "rxjs": "^7.x"
   },
   "peerDependencies": {
-    "dexie": "^4.0.1"
+    "dexie": "workspace:^"
   }
 }

Diff for: addons/dexie-cloud/src/TSON.ts

@@ -1,5 +1,5 @@
 import { TypesonSimplified } from 'dreambase-library/dist/typeson-simplified/TypesonSimplified';
-import { Bison } from "dreambase-library/dist/typeson-simplified/Bison";
+import { Bison } from 'dreambase-library/dist/typeson-simplified/Bison';
 import undefinedDef from 'dreambase-library/dist/typeson-simplified/types/undefined.js';
 import tsonBuiltinDefs from 'dreambase-library/dist/typeson-simplified/presets/builtin.js';
 import { TypeDefSet } from 'dreambase-library/dist/typeson-simplified/TypeDefSet';
@@ -20,7 +20,8 @@ import { PropModSpec, PropModification } from 'dexie';
 //     serverRev.rev = bigIntDef.bigint.revive(server.rev)
 //   else
 //     serverRev.rev = new FakeBigInt(server.rev)
-export const hasBigIntSupport = typeof BigInt === 'function' && typeof BigInt(0) === 'bigint';
+export const hasBigIntSupport =
+  typeof BigInt === 'function' && typeof BigInt(0) === 'bigint';
 
 function getValueOfBigInt(x: bigint | FakeBigInt | string) {
   if (typeof x === 'bigint') {
@@ -33,7 +34,10 @@ function getValueOfBigInt(x: bigint | FakeBigInt | string) {
   }
 }
 
-export function compareBigInts(a: bigint | FakeBigInt | string, b:bigint | FakeBigInt | string) {
+export function compareBigInts(
+  a: bigint | FakeBigInt | string,
+  b: bigint | FakeBigInt | string
+) {
   const valA = getValueOfBigInt(a);
   const valB = getValueOfBigInt(b);
   return valA < valB ? -1 : valA > valB ? 1 : 0;
@@ -48,42 +52,40 @@ export class FakeBigInt {
   }
 }
 
-const defs: TypeDefSet = {
-  ...undefinedDef,
-  ...(hasBigIntSupport
-    ? {}
-    : {
-        bigint: {
-          test: (val: any) => val instanceof FakeBigInt,
-          replace: (fakeBigInt: any) => {
-            return {
-              $t: 'bigint',
-              ...fakeBigInt
-            };
-          },
-          revive: ({
-            v,
-          }: {
-            $t: 'bigint';
-            v: string;
-          }) => new FakeBigInt(v) as any as bigint
-        }
-      }),
-      PropModification: {
-        test: (val: any) => val instanceof PropModification,
-        replace: (propModification: any) => {
+const bigIntDef = hasBigIntSupport
+  ? {}
+  : {
+      bigint: {
+        test: (val: any) => val instanceof FakeBigInt,
+        replace: (fakeBigInt: any) => {
           return {
-            $t: 'PropModification',
-            ...propModification
+            $t: 'bigint',
+            ...fakeBigInt,
           };
         },
-        revive: ({
-          $t,
-          ...propModification
-        }: {
-          $t: 'PropModification';
-        } & PropModSpec) => new PropModification(propModification)
-      }
+        revive: ({ v }: { $t: 'bigint'; v: string }) =>
+          new FakeBigInt(v) as any as bigint,
+      },
+    };
+
+const defs: TypeDefSet = {
+  ...undefinedDef,
+  ...bigIntDef,
+  PropModification: {
+    test: (val: any) => val instanceof PropModification,
+    replace: (propModification: any) => {
+      return {
+        $t: 'PropModification',
+        ...propModification['@@propmod'],
+      };
+    },
+    revive: ({
+      $t, // strip '$t'
+      ...propModSpec // keep the rest
+    }: {
+      $t: 'PropModification';
+    } & PropModSpec) => new PropModification(propModSpec),
+  },
 };
 
 export const TSON = TypesonSimplified(tsonBuiltinDefs, defs);

Diff for: import-wrapper-prod.mjs

@@ -9,7 +9,7 @@ if (_Dexie.semVer !== Dexie.semVer) {
 }
 const {
     liveQuery, mergeRanges, rangesOverlap, RangeSet, cmp, Entity,
-    PropModSymbol, PropModification, replacePrefix, add, remove } = Dexie;
+    PropModification, replacePrefix, add, remove } = Dexie;
 export { liveQuery, mergeRanges, rangesOverlap, RangeSet, cmp, Dexie, Entity,
-    PropModSymbol, PropModification, replacePrefix, add, remove };
+    PropModification, replacePrefix, add, remove };
 export default Dexie;

Diff for: import-wrapper.mjs

@@ -8,7 +8,7 @@ if (_Dexie.semVer !== Dexie.semVer) {
     throw new Error(`Two different versions of Dexie loaded in the same app: ${_Dexie.semVer} and ${Dexie.semVer}`);
 }
 const { liveQuery, mergeRanges, rangesOverlap, RangeSet, cmp, Entity,
-    PropModSymbol, PropModification, replacePrefix, add, remove } = Dexie;
+    PropModification, replacePrefix, add, remove } = Dexie;
 export { liveQuery, mergeRanges, rangesOverlap, RangeSet, cmp, Dexie, Entity,
-    PropModSymbol, PropModification, replacePrefix, add, remove };
+    PropModification, replacePrefix, add, remove };
 export default Dexie;

Diff for: libs/dexie-react-hooks/package.json

@@ -55,7 +55,7 @@
   "homepage": "https://dexie.org",
   "peerDependencies": {
     "@types/react": ">=16",
-    "dexie": "^3.2 || ^4.0.1",
+    "dexie": "workspace:^",
     "react": ">=16"
   },
   "devDependencies": {
@@ -65,7 +65,7 @@
     "@types/qunit": "^2.9.6",
     "@types/react": "^17.0.0",
     "@types/react-dom": "^17.0.0",
-    "dexie": "^3.2 || ^4.0.1",
+    "dexie": "workspace:^",
     "just-build": "^0.9.24",
     "qunit": "^2.12.0",
     "react": "^17.0.1",

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "dexie",
-  "version": "4.0.10",
+  "version": "4.0.11",
   "description": "A Minimalistic Wrapper for IndexedDB",
   "main": "dist/dexie.js",
   "module": "dist/dexie.mjs",