tinybase 8.0.0-beta.1 → 8.0.0-beta.3

package/synchronizers/synchronizer-ws-client/with-schemas/index.js

@@ -278,8 +278,8 @@ const getStoreFunctions = (
   persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
-        store.getMergeableContent,
-        () => store.getTransactionMergeableChanges(!isSynchronizer),
+        store.__[1],
+        () => store.__[2](!isSynchronizer),
         ([[changedTables], [changedValues]]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
@@ -287,8 +287,8 @@ const getStoreFunctions = (
     : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
-          store.getContent,
-          store.getTransactionChanges,
+          store._[7],
+          store._[8],
           ([changedTables, changedValues]) =>
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setContent,
@@ -353,7 +353,7 @@ const createCustomPersister = (
         : store.setContent)(contentOrChanges);
   };
   const saveAfterMutated = async () => {
-    if (isAutoSaving() && store.hadMutated?.()) {
+    if (isAutoSaving() && store.__?.[0]?.()) {
       await save();
     }
   };

package/synchronizers/synchronizer-ws-server/index.js

@@ -290,8 +290,8 @@ const getStoreFunctions = (
   persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
-        store.getMergeableContent,
-        () => store.getTransactionMergeableChanges(!isSynchronizer),
+        store.__[1],
+        () => store.__[2](!isSynchronizer),
         ([[changedTables], [changedValues]]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
@@ -299,8 +299,8 @@ const getStoreFunctions = (
     : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
-          store.getContent,
-          store.getTransactionChanges,
+          store._[7],
+          store._[8],
           ([changedTables, changedValues]) =>
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setContent,
@@ -365,7 +365,7 @@ const createCustomPersister = (
         : store.setContent)(contentOrChanges);
   };
   const saveAfterMutated = async () => {
-    if (isAutoSaving() && store.hadMutated?.()) {
+    if (isAutoSaving() && store.__?.[0]?.()) {
       await save();
     }
   };

package/synchronizers/synchronizer-ws-server/with-schemas/index.js

@@ -290,8 +290,8 @@ const getStoreFunctions = (
   persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
-        store.getMergeableContent,
-        () => store.getTransactionMergeableChanges(!isSynchronizer),
+        store.__[1],
+        () => store.__[2](!isSynchronizer),
         ([[changedTables], [changedValues]]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
@@ -299,8 +299,8 @@ const getStoreFunctions = (
     : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
-          store.getContent,
-          store.getTransactionChanges,
+          store._[7],
+          store._[8],
           ([changedTables, changedValues]) =>
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setContent,
@@ -365,7 +365,7 @@ const createCustomPersister = (
         : store.setContent)(contentOrChanges);
   };
   const saveAfterMutated = async () => {
-    if (isAutoSaving() && store.hadMutated?.()) {
+    if (isAutoSaving() && store.__?.[0]?.()) {
       await save();
     }
   };

package/synchronizers/synchronizer-ws-server-durable-object/index.js

@@ -280,8 +280,8 @@ const getStoreFunctions = (
   persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
-        store.getMergeableContent,
-        () => store.getTransactionMergeableChanges(!isSynchronizer),
+        store.__[1],
+        () => store.__[2](!isSynchronizer),
         ([[changedTables], [changedValues]]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
@@ -289,8 +289,8 @@ const getStoreFunctions = (
     : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
-          store.getContent,
-          store.getTransactionChanges,
+          store._[7],
+          store._[8],
           ([changedTables, changedValues]) =>
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setContent,
@@ -355,7 +355,7 @@ const createCustomPersister = (
         : store.setContent)(contentOrChanges);
   };
   const saveAfterMutated = async () => {
-    if (isAutoSaving() && store.hadMutated?.()) {
+    if (isAutoSaving() && store.__?.[0]?.()) {
       await save();
     }
   };

package/synchronizers/synchronizer-ws-server-durable-object/with-schemas/index.js

@@ -280,8 +280,8 @@ const getStoreFunctions = (
   persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
-        store.getMergeableContent,
-        () => store.getTransactionMergeableChanges(!isSynchronizer),
+        store.__[1],
+        () => store.__[2](!isSynchronizer),
         ([[changedTables], [changedValues]]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
@@ -289,8 +289,8 @@ const getStoreFunctions = (
     : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
-          store.getContent,
-          store.getTransactionChanges,
+          store._[7],
+          store._[8],
           ([changedTables, changedValues]) =>
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setContent,
@@ -355,7 +355,7 @@ const createCustomPersister = (
         : store.setContent)(contentOrChanges);
   };
   const saveAfterMutated = async () => {
-    if (isAutoSaving() && store.hadMutated?.()) {
+    if (isAutoSaving() && store.__?.[0]?.()) {
       await save();
     }
   };

package/synchronizers/with-schemas/index.js

@@ -236,8 +236,8 @@ const getStoreFunctions = (
   persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
-        store.getMergeableContent,
-        () => store.getTransactionMergeableChanges(!isSynchronizer),
+        store.__[1],
+        () => store.__[2](!isSynchronizer),
         ([[changedTables], [changedValues]]) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
@@ -245,8 +245,8 @@ const getStoreFunctions = (
     : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
-          store.getContent,
-          store.getTransactionChanges,
+          store._[7],
+          store._[8],
           ([changedTables, changedValues]) =>
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setContent,
@@ -311,7 +311,7 @@ const createCustomPersister = (
         : store.setContent)(contentOrChanges);
   };
   const saveAfterMutated = async () => {
-    if (isAutoSaving() && store.hadMutated?.()) {
+    if (isAutoSaving() && store.__?.[0]?.()) {
       await save();
     }
   };

package/ui-react/index.js

@@ -113,6 +113,8 @@ const objIsEqual = (
   );
 };
 
+const jsonString = JSON.stringify;
+
 const {
   PureComponent,
   createContext,
@@ -352,6 +354,10 @@ const IS_EQUALS = [
   (paramValues1, paramValues2) =>
     objIsEqual(paramValues1, paramValues2, arrayOrValueEqual),
   arrayOrValueEqual,
+  (thing1, thing2) =>
+    thing1 === thing2 ||
+    ((isObject(thing1) || isArray(thing1)) &&
+      jsonString(thing1) === jsonString(thing2)),
 ];
 const isEqual = (thing1, thing2) => thing1 === thing2;
 const useCreate = (store, create, createDeps = EMPTY_ARRAY) => {

package/ui-react/with-schemas/index.js

@@ -113,6 +113,8 @@ const objIsEqual = (
   );
 };
 
+const jsonString = JSON.stringify;
+
 const {
   PureComponent,
   createContext,
@@ -352,6 +354,10 @@ const IS_EQUALS = [
   (paramValues1, paramValues2) =>
     objIsEqual(paramValues1, paramValues2, arrayOrValueEqual),
   arrayOrValueEqual,
+  (thing1, thing2) =>
+    thing1 === thing2 ||
+    ((isObject(thing1) || isArray(thing1)) &&
+      jsonString(thing1) === jsonString(thing2)),
 ];
 const isEqual = (thing1, thing2) => thing1 === thing2;
 const useCreate = (store, create, createDeps = EMPTY_ARRAY) => {

package/ui-react-dom/index.js

@@ -10,6 +10,8 @@ const STRING = getTypeOf(EMPTY_STRING);
 const BOOLEAN = getTypeOf(true);
 const NUMBER = getTypeOf(0);
 const FUNCTION = getTypeOf(getTypeOf);
+const OBJECT = 'object';
+const ARRAY = 'array';
 const NULL = 'null';
 const LISTENER = 'Listener';
 const RESULT = 'Result';
@@ -111,6 +113,9 @@ const objIsEqual = (
   );
 };
 
+const jsonString = JSON.stringify;
+const jsonParse = JSON.parse;
+
 const {
   PureComponent,
   createContext,
@@ -186,6 +191,10 @@ const IS_EQUALS = [
   (paramValues1, paramValues2) =>
     objIsEqual(paramValues1, paramValues2, arrayOrValueEqual),
   arrayOrValueEqual,
+  (thing1, thing2) =>
+    thing1 === thing2 ||
+    ((isObject(thing1) || isArray(thing1)) &&
+      jsonString(thing1) === jsonString(thing2)),
 ];
 const isEqual = (thing1, thing2) => thing1 === thing2;
 const addAndDelListener = (thing, listenable, ...args) => {
@@ -463,20 +472,37 @@ const getCellOrValueType = (cellOrValue) => {
   if (isNull(cellOrValue)) {
     return NULL;
   }
+  if (isArray(cellOrValue)) {
+    return ARRAY;
+  }
+  if (isObject(cellOrValue)) {
+    return OBJECT;
+  }
   const type = getTypeOf(cellOrValue);
   return isTypeStringOrBoolean(type) ||
     (type == NUMBER && isFiniteNumber(cellOrValue))
     ? type
     : void 0;
 };
-const getTypeCase = (type, stringCase, numberCase, booleanCase) =>
+const getTypeCase = (
+  type,
+  stringCase,
+  numberCase,
+  booleanCase,
+  objectCase,
+  arrayCase,
+) =>
   type == STRING
     ? stringCase
     : type == NUMBER
       ? numberCase
       : type == BOOLEAN
         ? booleanCase
-        : null;
+        : type == OBJECT
+          ? objectCase
+          : type == ARRAY
+            ? arrayCase
+            : null;
 
 const useStoreCellComponentProps = (store, tableId) =>
   useMemo(() => ({store, tableId}), [store, tableId]);
@@ -652,12 +678,20 @@ const EditableThing = ({
   const [stringThing, setStringThing] = useState();
   const [numberThing, setNumberThing] = useState();
   const [booleanThing, setBooleanThing] = useState();
+  const [objectThingJson, setObjectThingJson] = useState(EMPTY_STRING);
+  const [arrayThingJson, setArrayThingJson] = useState(EMPTY_STRING);
   if (currentThing !== thing) {
     setThingType(getCellOrValueType(thing));
     setCurrentThing(thing);
-    setStringThing(String(thing));
-    setNumberThing(Number(thing) || 0);
-    setBooleanThing(Boolean(thing));
+    if (isObject(thing)) {
+      setObjectThingJson(jsonString(thing));
+    } else if (isArray(thing)) {
+      setArrayThingJson(jsonString(thing));
+    } else {
+      setStringThing(String(thing));
+      setNumberThing(Number(thing) || 0);
+      setBooleanThing(Boolean(thing));
+    }
   }
   const handleThingChange = useCallback(
     (thing2, setTypedThing) => {
@@ -669,12 +703,21 @@ const EditableThing = ({
   );
   const handleTypeChange = useCallback(() => {
     if (!hasSchema?.()) {
-      const nextType = getTypeCase(thingType, NUMBER, BOOLEAN, STRING);
+      const nextType = getTypeCase(
+        thingType,
+        NUMBER,
+        BOOLEAN,
+        OBJECT,
+        ARRAY,
+        STRING,
+      );
       const thing2 = getTypeCase(
         nextType,
         stringThing,
         numberThing,
         booleanThing,
+        objectThingJson ? jsonParse(objectThingJson) : {},
+        arrayThingJson ? jsonParse(arrayThingJson) : [],
       );
       setThingType(nextType);
       setCurrentThing(thing2);
@@ -686,6 +729,8 @@ const EditableThing = ({
     stringThing,
     numberThing,
     booleanThing,
+    objectThingJson,
+    arrayThingJson,
     thingType,
   ]);
   const widget = getTypeCase(
@@ -737,6 +782,46 @@ const EditableThing = ({
       },
       thingType,
     ),
+    /* @__PURE__ */ jsx(
+      'textarea',
+      {
+        value: objectThingJson,
+        onChange: useCallback(
+          (event) => {
+            const str = event[CURRENT_TARGET][_VALUE];
+            setObjectThingJson(str);
+            try {
+              const parsed = jsonParse(str);
+              if (isObject(parsed)) {
+                onThingChange(parsed);
+              }
+            } catch {}
+          },
+          [onThingChange],
+        ),
+      },
+      thingType,
+    ),
+    /* @__PURE__ */ jsx(
+      'textarea',
+      {
+        value: arrayThingJson,
+        onChange: useCallback(
+          (event) => {
+            const str = event[CURRENT_TARGET][_VALUE];
+            setArrayThingJson(str);
+            try {
+              const parsed = jsonParse(str);
+              if (isArray(parsed)) {
+                onThingChange(parsed);
+              }
+            } catch {}
+          },
+          [onThingChange],
+        ),
+      },
+      thingType,
+    ),
   );
   return /* @__PURE__ */ jsxs('div', {
     className,

package/ui-react-dom/with-schemas/index.js

@@ -10,6 +10,8 @@ const STRING = getTypeOf(EMPTY_STRING);
 const BOOLEAN = getTypeOf(true);
 const NUMBER = getTypeOf(0);
 const FUNCTION = getTypeOf(getTypeOf);
+const OBJECT = 'object';
+const ARRAY = 'array';
 const NULL = 'null';
 const LISTENER = 'Listener';
 const RESULT = 'Result';
@@ -111,6 +113,9 @@ const objIsEqual = (
   );
 };
 
+const jsonString = JSON.stringify;
+const jsonParse = JSON.parse;
+
 const {
   PureComponent,
   createContext,
@@ -186,6 +191,10 @@ const IS_EQUALS = [
   (paramValues1, paramValues2) =>
     objIsEqual(paramValues1, paramValues2, arrayOrValueEqual),
   arrayOrValueEqual,
+  (thing1, thing2) =>
+    thing1 === thing2 ||
+    ((isObject(thing1) || isArray(thing1)) &&
+      jsonString(thing1) === jsonString(thing2)),
 ];
 const isEqual = (thing1, thing2) => thing1 === thing2;
 const addAndDelListener = (thing, listenable, ...args) => {
@@ -463,20 +472,37 @@ const getCellOrValueType = (cellOrValue) => {
   if (isNull(cellOrValue)) {
     return NULL;
   }
+  if (isArray(cellOrValue)) {
+    return ARRAY;
+  }
+  if (isObject(cellOrValue)) {
+    return OBJECT;
+  }
   const type = getTypeOf(cellOrValue);
   return isTypeStringOrBoolean(type) ||
     (type == NUMBER && isFiniteNumber(cellOrValue))
     ? type
     : void 0;
 };
-const getTypeCase = (type, stringCase, numberCase, booleanCase) =>
+const getTypeCase = (
+  type,
+  stringCase,
+  numberCase,
+  booleanCase,
+  objectCase,
+  arrayCase,
+) =>
   type == STRING
     ? stringCase
     : type == NUMBER
       ? numberCase
       : type == BOOLEAN
         ? booleanCase
-        : null;
+        : type == OBJECT
+          ? objectCase
+          : type == ARRAY
+            ? arrayCase
+            : null;
 
 const useStoreCellComponentProps = (store, tableId) =>
   useMemo(() => ({store, tableId}), [store, tableId]);
@@ -652,12 +678,20 @@ const EditableThing = ({
   const [stringThing, setStringThing] = useState();
   const [numberThing, setNumberThing] = useState();
   const [booleanThing, setBooleanThing] = useState();
+  const [objectThingJson, setObjectThingJson] = useState(EMPTY_STRING);
+  const [arrayThingJson, setArrayThingJson] = useState(EMPTY_STRING);
   if (currentThing !== thing) {
     setThingType(getCellOrValueType(thing));
     setCurrentThing(thing);
-    setStringThing(String(thing));
-    setNumberThing(Number(thing) || 0);
-    setBooleanThing(Boolean(thing));
+    if (isObject(thing)) {
+      setObjectThingJson(jsonString(thing));
+    } else if (isArray(thing)) {
+      setArrayThingJson(jsonString(thing));
+    } else {
+      setStringThing(String(thing));
+      setNumberThing(Number(thing) || 0);
+      setBooleanThing(Boolean(thing));
+    }
   }
   const handleThingChange = useCallback(
     (thing2, setTypedThing) => {
@@ -669,12 +703,21 @@ const EditableThing = ({
   );
   const handleTypeChange = useCallback(() => {
     if (!hasSchema?.()) {
-      const nextType = getTypeCase(thingType, NUMBER, BOOLEAN, STRING);
+      const nextType = getTypeCase(
+        thingType,
+        NUMBER,
+        BOOLEAN,
+        OBJECT,
+        ARRAY,
+        STRING,
+      );
       const thing2 = getTypeCase(
         nextType,
         stringThing,
         numberThing,
         booleanThing,
+        objectThingJson ? jsonParse(objectThingJson) : {},
+        arrayThingJson ? jsonParse(arrayThingJson) : [],
       );
       setThingType(nextType);
       setCurrentThing(thing2);
@@ -686,6 +729,8 @@ const EditableThing = ({
     stringThing,
     numberThing,
     booleanThing,
+    objectThingJson,
+    arrayThingJson,
     thingType,
   ]);
   const widget = getTypeCase(
@@ -737,6 +782,46 @@ const EditableThing = ({
       },
       thingType,
     ),
+    /* @__PURE__ */ jsx(
+      'textarea',
+      {
+        value: objectThingJson,
+        onChange: useCallback(
+          (event) => {
+            const str = event[CURRENT_TARGET][_VALUE];
+            setObjectThingJson(str);
+            try {
+              const parsed = jsonParse(str);
+              if (isObject(parsed)) {
+                onThingChange(parsed);
+              }
+            } catch {}
+          },
+          [onThingChange],
+        ),
+      },
+      thingType,
+    ),
+    /* @__PURE__ */ jsx(
+      'textarea',
+      {
+        value: arrayThingJson,
+        onChange: useCallback(
+          (event) => {
+            const str = event[CURRENT_TARGET][_VALUE];
+            setArrayThingJson(str);
+            try {
+              const parsed = jsonParse(str);
+              if (isArray(parsed)) {
+                onThingChange(parsed);
+              }
+            } catch {}
+          },
+          [onThingChange],
+        ),
+      },
+      thingType,
+    ),
   );
   return /* @__PURE__ */ jsxs('div', {
     className,