teamplay 0.5.0-alpha.23 → 0.5.0-alpha.25

package/dist/orm/Compat/SignalCompat.js

@@ -159,21 +159,6 @@ class SignalCompat extends Signal {
             return;
         return setReplaceOnSignal(this, value);
     }
-    async create(value) {
-        const forwarded = forwardRef(this, 'create', arguments);
-        if (forwarded)
-            return forwarded;
-        if (arguments.length > 1)
-            throw Error('Signal.create() expects zero or one argument');
-        if (arguments.length === 0) {
-            value = {};
-        }
-        ensureCreateTarget(this, 'Signal.create()');
-        if (this.get() != null) {
-            throw Error(`Signal.create() may only be used on a non-existing document path. Path: ${this.path()}`);
-        }
-        return setReplaceOnSignal(this, value);
-    }
     async setDiffDeep(value) {
         const forwarded = forwardRef(this, 'setDiffDeep', arguments);
         if (forwarded)
@@ -956,15 +941,6 @@ function ensureValueTarget($signal) {
         throw Error('Mutators can\'t be used on a query signal');
     return segments;
 }
-function ensureCreateTarget($signal, methodName) {
-    const segments = $signal[SEGMENTS];
-    if ($signal[IS_QUERY])
-        throw Error(`${methodName} can't be used on a query signal`);
-    if (segments.length !== 2) {
-        throw Error(`${methodName} may only be used on a document path`);
-    }
-    return segments;
-}
 async function arrayPushOnSignal($signal, value) {
     const segments = ensureArrayTarget($signal);
     const idFields = getIdFieldsForSegments(segments);

package/dist/orm/dataTree.js

@@ -178,14 +178,14 @@ export async function setPublicDoc(segments, value, deleteValue = false) {
     if (isIdFieldPath(segments, idFields))
         return;
     const doc = getConnection().get(collection, docId);
-    let docState = resolvePublicDocState({ collection, docId, doc, idFields, hydrateCompatDocData: true });
+    let docState = resolvePublicDocState({ collection, docId, doc, idFields, hydrateDocDataFromLocal: true });
     if (!docState.exists && segments.length > 2) {
-        docState = await resolvePublicDocStateWithCompatFetchFallback({
+        docState = await resolvePublicDocStateWithFetchFallback({
             collection,
             docId,
             doc,
             idFields,
-            hydrateCompatDocData: true
+            hydrateDocDataFromLocal: true
         });
     }
     if (!docState.exists && deleteValue)
@@ -286,14 +286,14 @@ export async function setPublicDocReplace(segments, value) {
     if (isIdFieldPath(segments, idFields))
         return;
     const doc = getConnection().get(collection, docId);
-    let docState = resolvePublicDocState({ collection, docId, doc, idFields, hydrateCompatDocData: true });
+    let docState = resolvePublicDocState({ collection, docId, doc, idFields, hydrateDocDataFromLocal: true });
     if (!docState.exists && segments.length > 2) {
-        docState = await resolvePublicDocStateWithCompatFetchFallback({
+        docState = await resolvePublicDocStateWithFetchFallback({
             collection,
             docId,
             doc,
             idFields,
-            hydrateCompatDocData: true
+            hydrateDocDataFromLocal: true
         });
     }
     // make sure that the value is not observable to not trigger extra reads. And clone it
@@ -374,9 +374,10 @@ async function createPublicDocAndHydrateLocal({ doc, collection, docId, newDoc,
     await new Promise((resolve, reject) => {
         doc.create(newDoc, err => err ? reject(err) : resolve());
     });
-    // In compatibility mode we must allow immediate subpath writes after create()
-    // even when the ShareDB snapshot hasn't been loaded via subscribe/fetch yet.
-    if (isCompatEnv() && doc?.data == null) {
+    // Keep public creates immediately writable even when the ShareDB snapshot has
+    // not been loaded via subscribe/fetch yet. UI flows rely on optimistic add()
+    // followed by child writes without waiting for DB confirmation.
+    if (doc?.data == null) {
         const localDoc = JSON.parse(JSON.stringify(newDoc || {}));
         if (isPlainObject(localDoc))
             injectIdFields(localDoc, idFields, docId);
@@ -387,7 +388,7 @@ async function createPublicDocAndHydrateLocal({ doc, collection, docId, newDoc,
     }
     ensureLocalDocSyncedWithShareDoc({ collection, docId, doc, idFields });
 }
-function resolvePublicDocState({ collection, docId, doc, idFields, hydrateCompatDocData = false }) {
+function resolvePublicDocState({ collection, docId, doc, idFields, hydrateDocDataFromLocal = false }) {
     ensureLocalDocSyncedWithShareDoc({ collection, docId, doc, idFields });
     if (isMissingShareDoc(doc)) {
         return { exists: false, snapshot: undefined, source: 'none' };
@@ -400,24 +401,29 @@ function resolvePublicDocState({ collection, docId, doc, idFields, hydrateCompat
         };
     }
     const localSnapshot = getRaw([collection, docId]);
-    if (!(isCompatEnv() && localSnapshot != null)) {
+    if (localSnapshot == null) {
         return { exists: false, snapshot: undefined, source: 'none' };
     }
-    // In compat mode local raw data can be the source of truth between create/add
-    // and later subpath mutations even if ShareDB doc.data is currently empty.
-    if (hydrateCompatDocData) {
+    // Local raw data can be the source of truth between add() and later subpath
+    // mutations even if ShareDB doc.data is currently empty or was recreated.
+    if (hydrateDocDataFromLocal) {
         doc.data = localSnapshot;
     }
     return { exists: true, snapshot: localSnapshot, source: 'local' };
 }
-async function resolvePublicDocStateWithCompatFetchFallback({ collection, docId, doc, idFields, hydrateCompatDocData = false }) {
-    let docState = resolvePublicDocState({ collection, docId, doc, idFields, hydrateCompatDocData });
-    if (docState.exists || !isCompatEnv())
+async function resolvePublicDocStateWithFetchFallback({ collection, docId, doc, idFields, hydrateDocDataFromLocal = false }) {
+    let docState = resolvePublicDocState({ collection, docId, doc, idFields, hydrateDocDataFromLocal });
+    if (docState.exists)
+        return docState;
+    const shouldFetch = isCompatEnv() || (getRaw([collection, docId]) != null &&
+        isMissingShareDoc(doc) &&
+        doc.version == null);
+    if (!shouldFetch)
         return docState;
     await new Promise((resolve, reject) => {
         doc.fetch(err => err ? reject(err) : resolve());
     });
-    docState = resolvePublicDocState({ collection, docId, doc, idFields, hydrateCompatDocData });
+    docState = resolvePublicDocState({ collection, docId, doc, idFields, hydrateDocDataFromLocal });
     return docState;
 }
 function ensureLocalDocSyncedWithShareDoc({ collection, docId, doc, idFields }) {
@@ -572,12 +578,12 @@ export async function incrementPublic(segments, byNumber) {
         throw Error(ERRORS.publicDoc(segments));
     const doc = getConnection().get(collection, docId);
     const idFields = getIdFieldsForSegments([collection, docId]);
-    const docState = await resolvePublicDocStateWithCompatFetchFallback({
+    const docState = await resolvePublicDocStateWithFetchFallback({
         collection,
         docId,
         doc,
         idFields,
-        hydrateCompatDocData: true
+        hydrateDocDataFromLocal: true
     });
     if (!docState.exists)
         throw Error(ERRORS.nonExistingDoc(segments));
@@ -615,12 +621,12 @@ export async function arrayInsertPublic(segments, index, values) {
         throw Error(ERRORS.publicDoc(segments));
     const doc = getConnection().get(collection, docId);
     const idFields = getIdFieldsForSegments([collection, docId]);
-    const docState = await resolvePublicDocStateWithCompatFetchFallback({
+    const docState = await resolvePublicDocStateWithFetchFallback({
         collection,
         docId,
         doc,
         idFields,
-        hydrateCompatDocData: true
+        hydrateDocDataFromLocal: true
     });
     if (!docState.exists)
         throw Error(ERRORS.nonExistingDoc(segments));
@@ -674,12 +680,12 @@ export async function arrayRemovePublic(segments, index, howMany = 1) {
         throw Error(ERRORS.publicDoc(segments));
     const doc = getConnection().get(collection, docId);
     const idFields = getIdFieldsForSegments([collection, docId]);
-    const docState = await resolvePublicDocStateWithCompatFetchFallback({
+    const docState = await resolvePublicDocStateWithFetchFallback({
         collection,
         docId,
         doc,
         idFields,
-        hydrateCompatDocData: true
+        hydrateDocDataFromLocal: true
     });
     if (!docState.exists)
         throw Error(ERRORS.nonExistingDoc(segments));
@@ -702,12 +708,12 @@ export async function arrayMovePublic(segments, from, to, howMany = 1) {
         throw Error(ERRORS.publicDoc(segments));
     const doc = getConnection().get(collection, docId);
     const idFields = getIdFieldsForSegments([collection, docId]);
-    const docState = await resolvePublicDocStateWithCompatFetchFallback({
+    const docState = await resolvePublicDocStateWithFetchFallback({
         collection,
         docId,
         doc,
         idFields,
-        hydrateCompatDocData: true
+        hydrateDocDataFromLocal: true
     });
     if (!docState.exists)
         throw Error(ERRORS.nonExistingDoc(segments));
@@ -780,12 +786,12 @@ export async function stringInsertPublic(segments, index, text) {
         throw Error(ERRORS.publicDoc(segments));
     const doc = getConnection().get(collection, docId);
     const idFields = getIdFieldsForSegments([collection, docId]);
-    const docState = await resolvePublicDocStateWithCompatFetchFallback({
+    const docState = await resolvePublicDocStateWithFetchFallback({
         collection,
         docId,
         doc,
         idFields,
-        hydrateCompatDocData: true
+        hydrateDocDataFromLocal: true
     });
     if (!docState.exists)
         throw Error(ERRORS.nonExistingDoc(segments));
@@ -814,12 +820,12 @@ export async function stringRemovePublic(segments, index, howMany) {
         throw Error(ERRORS.publicDoc(segments));
     const doc = getConnection().get(collection, docId);
     const idFields = getIdFieldsForSegments([collection, docId]);
-    const docState = await resolvePublicDocStateWithCompatFetchFallback({
+    const docState = await resolvePublicDocStateWithFetchFallback({
         collection,
         docId,
         doc,
         idFields,
-        hydrateCompatDocData: true
+        hydrateDocDataFromLocal: true
     });
     if (!docState.exists)
         throw Error(ERRORS.nonExistingDoc(segments));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teamplay",
-  "version": "0.5.0-alpha.23",
+  "version": "0.5.0-alpha.25",
   "description": "Full-stack signals ORM with multiplayer",
   "type": "module",
   "main": "./dist/index.js",
@@ -134,5 +134,5 @@
     ]
   },
   "license": "MIT",
-  "gitHead": "b3dcd5e4b680a5a380fe68ce41f6da93b1deeb85"
+  "gitHead": "f1dcc0b025c80535acfe03a583e828c491f2a1e6"
 }