@neetru/sdk 3.0.1 → 3.1.0

package/dist/db.d.cts

@@ -1,4 +1,3 @@
-export { C as ConflictRecord, a as CreateOfflineDocumentsOptions, D as DbBatchOp, b as DbChangeType, c as DbCollectionRef, d as DbDoc, e as DbDocRef, f as DbGetResult, g as DbListResult, h as DbQuery, i as DbWhereFilter, N as NeetruDbDocuments, R as RealtimeTransport, S as SyncState } from './collection-ref-DqAAhuhX.cjs';
-export { k as DbSqlLease, p as NeetruDb, q as NeetruDbEngine, r as NeetruDbError, s as NeetruDbErrorCode, t as NeetruDbOptions, u as NeetruDbTransport, w as NeetruSqlClient, K as SqlOptions, a7 as createNeetruDb, a9 as createRestSyncTransport, ab as getWebSocketRealtimeClient } from './types-Lfd3LiAF.cjs';
+export { i as ConflictRecord, j as CreateOfflineDocumentsOptions, l as DbBatchOp, m as DbChangeType, n as DbCollectionRef, o as DbDoc, p as DbDocRef, q as DbGetResult, r as DbListResult, t as DbQuery, u as DbSqlLease, w as DbWhereFilter, F as FieldSentinel, I as IncrementSentinel, N as NEETRU_SENTINEL_KEY, G as NeetruDb, H as NeetruDbDocuments, J as NeetruDbEngine, K as NeetruDbError, O as NeetruDbErrorCode, P as NeetruDbOptions, Q as NeetruDbTransport, S as NeetruSqlClient, $ as RealtimeTransport, a3 as ServerTimestampSentinel, a5 as SqlOptions, aa as SyncState, ap as WithFieldSentinels, ar as createNeetruDb, at as createRestSyncTransport, av as getWebSocketRealtimeClient, aw as increment, ax as isFieldSentinel, ay as isIncrementSentinel, az as isServerTimestampSentinel, aA as serverTimestamp } from './types-nwErcRX8.cjs';
 import 'drizzle-orm/node-postgres';
 import './errors.cjs';

package/dist/db.d.ts

@@ -1,4 +1,3 @@
-export { C as ConflictRecord, a as CreateOfflineDocumentsOptions, D as DbBatchOp, b as DbChangeType, c as DbCollectionRef, d as DbDoc, e as DbDocRef, f as DbGetResult, g as DbListResult, h as DbQuery, i as DbWhereFilter, N as NeetruDbDocuments, R as RealtimeTransport, S as SyncState } from './collection-ref-DqAAhuhX.js';
-export { k as DbSqlLease, p as NeetruDb, q as NeetruDbEngine, r as NeetruDbError, s as NeetruDbErrorCode, t as NeetruDbOptions, u as NeetruDbTransport, w as NeetruSqlClient, K as SqlOptions, a7 as createNeetruDb, a9 as createRestSyncTransport, ab as getWebSocketRealtimeClient } from './types-DALIhcbq.js';
+export { i as ConflictRecord, j as CreateOfflineDocumentsOptions, l as DbBatchOp, m as DbChangeType, n as DbCollectionRef, o as DbDoc, p as DbDocRef, q as DbGetResult, r as DbListResult, t as DbQuery, u as DbSqlLease, w as DbWhereFilter, F as FieldSentinel, I as IncrementSentinel, N as NEETRU_SENTINEL_KEY, G as NeetruDb, H as NeetruDbDocuments, J as NeetruDbEngine, K as NeetruDbError, O as NeetruDbErrorCode, P as NeetruDbOptions, Q as NeetruDbTransport, S as NeetruSqlClient, $ as RealtimeTransport, a3 as ServerTimestampSentinel, a5 as SqlOptions, aa as SyncState, ap as WithFieldSentinels, ar as createNeetruDb, at as createRestSyncTransport, av as getWebSocketRealtimeClient, aw as increment, ax as isFieldSentinel, ay as isIncrementSentinel, az as isServerTimestampSentinel, aA as serverTimestamp } from './types-BRv8wBxX.js';
 import 'drizzle-orm/node-postgres';
 import './errors.js';

package/dist/db.mjs

@@ -1350,7 +1350,71 @@ var MutationQueue = class {
   }
 };
 
+// src/db/field-value.ts
+var NEETRU_SENTINEL_KEY = "__neetru__";
+function serverTimestamp() {
+  return { __neetru__: "serverTimestamp" };
+}
+function increment(n) {
+  if (typeof n !== "number" || !Number.isFinite(n)) {
+    throw new TypeError(
+      `increment(n): n deve ser um n\xFAmero finito (recebido: ${String(n)}).`
+    );
+  }
+  return { __neetru__: "increment", operand: n };
+}
+function isFieldSentinel(v) {
+  return typeof v === "object" && v !== null && NEETRU_SENTINEL_KEY in v && typeof v[NEETRU_SENTINEL_KEY] === "string";
+}
+function isServerTimestampSentinel(v) {
+  return isFieldSentinel(v) && v.__neetru__ === "serverTimestamp";
+}
+function isIncrementSentinel(v) {
+  return isFieldSentinel(v) && v.__neetru__ === "increment" && typeof v.operand === "number" && Number.isFinite(v.operand);
+}
+function resolveSentinelLocally(value, baseValue) {
+  if (isServerTimestampSentinel(value)) {
+    return Date.now();
+  }
+  if (isIncrementSentinel(value)) {
+    const base = typeof baseValue === "number" && Number.isFinite(baseValue) ? baseValue : 0;
+    return base + value.operand;
+  }
+  return value;
+}
+function resolveSentinelsLocally(data, existing) {
+  let touched = false;
+  const out = {};
+  for (const [k, v] of Object.entries(data)) {
+    if (isFieldSentinel(v)) {
+      touched = true;
+      out[k] = resolveSentinelLocally(v, existing?.[k]);
+    } else {
+      out[k] = v;
+    }
+  }
+  return touched ? out : data;
+}
+function hasFieldSentinel(data) {
+  for (const v of Object.values(data)) {
+    if (isFieldSentinel(v)) return true;
+  }
+  return false;
+}
+
 // src/db/offline/sync-engine.ts
+function hasSentinels(payload) {
+  return payload !== null && hasFieldSentinel(payload);
+}
+function sanitizeSentinelPayload(payload) {
+  if (payload === null) return null;
+  if (!hasFieldSentinel(payload)) return payload;
+  const out = {};
+  for (const [k, v] of Object.entries(payload)) {
+    if (!isFieldSentinel(v)) out[k] = v;
+  }
+  return out;
+}
 var SyncEngine = class {
   _store;
   _queue;
@@ -1538,7 +1602,7 @@ var SyncEngine = class {
     return true;
   }
   /** Atualiza o cache após confirmação de escrita (outcome=confirmed). */
-  async _applySyncedDoc(collection, docId, serverVersion, serverTimestamp, mut, busChanges) {
+  async _applySyncedDoc(collection, docId, serverVersion, serverTimestamp2, mut, busChanges) {
     const existing = await this._store.getDoc(collection, docId);
     if (mut.op === "remove") {
       if (existing) {
@@ -1547,7 +1611,7 @@ var SyncEngine = class {
           meta: {
             ...existing.meta,
             serverVersion,
-            updatedAtServer: serverTimestamp,
+            updatedAtServer: serverTimestamp2,
             updatedAtLocal: Date.now(),
             state: "synced",
             deleted: true,
@@ -1558,14 +1622,19 @@ var SyncEngine = class {
       }
       return;
     }
-    const newData = mut.payload ?? (existing?.data ?? {});
+    const literalPayload = sanitizeSentinelPayload(mut.payload);
+    const newData = literalPayload ?? (existing?.data ?? {});
     const updatedDoc = {
       collection,
       id: docId,
-      data: mut.op === "update" ? { ...existing?.data ?? {}, ...newData } : newData,
+      data: mut.op === "update" ? { ...existing?.data ?? {}, ...newData } : (
+        // add/set: se o payload tinha sentinels, o cache otimista (existing.data)
+        // é a fonte de verdade até o pull; senão usa o payload literal.
+        hasSentinels(mut.payload) ? { ...existing?.data ?? {}, ...newData } : newData
+      ),
       meta: {
         serverVersion,
-        updatedAtServer: serverTimestamp,
+        updatedAtServer: serverTimestamp2,
         updatedAtLocal: Date.now(),
         state: "synced",
         pendingMutationIds: [],
@@ -2772,10 +2841,12 @@ var DbCollectionRefImpl = class {
     return this._buildListResult(q);
   }
   async add(data) {
+    const rawData = data;
+    const localData = resolveSentinelsLocally(rawData, void 0);
     const mutation = await this._queue.enqueue({
       collection: this._collection,
       op: "add",
-      payload: data,
+      payload: rawData,
       baseVersion: null,
       batchId: null
     });
@@ -2783,7 +2854,7 @@ var DbCollectionRefImpl = class {
     await this._store.putDoc({
       collection: this._collection,
       id: docId,
-      data,
+      data: localData,
       meta: {
         serverVersion: null,
         updatedAtServer: null,
@@ -2797,25 +2868,27 @@ var DbCollectionRefImpl = class {
     this._bus.emit([{
       type: "added",
       collection: this._collection,
-      doc: { id: docId, data }
+      doc: { id: docId, data: localData }
     }]);
     return { ok: true, id: docId };
   }
   async set(id, data) {
     assertValidId(id);
     const existing = await this._store.getDoc(this._collection, id);
+    const rawData = data;
+    const localData = resolveSentinelsLocally(rawData, void 0);
     const mutation = await this._queue.enqueue({
       collection: this._collection,
       docId: id,
       op: "set",
-      payload: data,
+      payload: rawData,
       baseVersion: existing?.meta.serverVersion ?? null,
       batchId: null
     });
     await this._store.putDoc({
       collection: this._collection,
       id,
-      data,
+      data: localData,
       meta: {
         serverVersion: existing?.meta.serverVersion ?? null,
         updatedAtServer: existing?.meta.updatedAtServer ?? null,
@@ -2829,19 +2902,22 @@ var DbCollectionRefImpl = class {
     this._bus.emit([{
       type: existing && !existing.meta.deleted ? "modified" : "added",
       collection: this._collection,
-      doc: { id, data }
+      doc: { id, data: localData }
     }]);
     return { ok: true };
   }
   async update(id, data) {
     assertValidId(id);
     const existing = await this._store.getDoc(this._collection, id);
-    const mergedData = existing?.meta.deleted ? { ...data } : { ...existing?.data ?? {}, ...data };
+    const rawData = data;
+    const existingBase = existing?.meta.deleted ? void 0 : existing?.data;
+    const localData = resolveSentinelsLocally(rawData, existingBase);
+    const mergedData = existing?.meta.deleted ? { ...localData } : { ...existing?.data ?? {}, ...localData };
     const mutation = await this._queue.enqueue({
       collection: this._collection,
       docId: id,
       op: "update",
-      payload: data,
+      payload: rawData,
       baseVersion: existing?.meta.serverVersion ?? null,
       batchId: null
     });
@@ -2898,6 +2974,7 @@ var DbCollectionRefImpl = class {
       const collection = this._collection;
       if (op.kind === "add") {
         const data = op.data;
+        const localData = resolveSentinelsLocally(data, void 0);
         const mutation = await this._queue.enqueue({
           collection,
           op: "add",
@@ -2909,7 +2986,7 @@ var DbCollectionRefImpl = class {
         await this._store.putDoc({
           collection,
           id: docId,
-          data,
+          data: localData,
           meta: {
             serverVersion: null,
             updatedAtServer: null,
@@ -2920,11 +2997,12 @@ var DbCollectionRefImpl = class {
             ownerId: null
           }
         });
-        busChanges.push({ type: "added", collection, doc: { id: docId, data } });
+        busChanges.push({ type: "added", collection, doc: { id: docId, data: localData } });
       } else if (op.kind === "set") {
         const id = op.id;
         const data = op.data;
         const existing = await this._store.getDoc(collection, id);
+        const localData = resolveSentinelsLocally(data, void 0);
         const mutation = await this._queue.enqueue({
           collection,
           docId: id,
@@ -2936,7 +3014,7 @@ var DbCollectionRefImpl = class {
         await this._store.putDoc({
           collection,
           id,
-          data,
+          data: localData,
           meta: {
             serverVersion: existing?.meta.serverVersion ?? null,
             updatedAtServer: existing?.meta.updatedAtServer ?? null,
@@ -2950,13 +3028,15 @@ var DbCollectionRefImpl = class {
         busChanges.push({
           type: existing && !existing.meta.deleted ? "modified" : "added",
           collection,
-          doc: { id, data }
+          doc: { id, data: localData }
         });
       } else if (op.kind === "update") {
         const id = op.id;
         const data = op.data;
         const existing = await this._store.getDoc(collection, id);
-        const merged = { ...existing?.data ?? {}, ...data };
+        const existingBase = existing?.meta.deleted ? void 0 : existing?.data;
+        const localData = resolveSentinelsLocally(data, existingBase);
+        const merged = { ...existing?.data ?? {}, ...localData };
         const mutation = await this._queue.enqueue({
           collection,
           docId: id,
@@ -3988,6 +4068,6 @@ function createLazyCollectionRef(name, getDocsPromise) {
   };
 }
 
-export { NeetruDbError, createNeetruDb, createRestSyncTransport, getWebSocketRealtimeClient };
+export { NEETRU_SENTINEL_KEY, NeetruDbError, createNeetruDb, createRestSyncTransport, getWebSocketRealtimeClient, increment, isFieldSentinel, isIncrementSentinel, isServerTimestampSentinel, serverTimestamp };
 //# sourceMappingURL=db.mjs.map
 //# sourceMappingURL=db.mjs.map