@drakkar.software/starfish-client 3.0.0-alpha.12 → 3.0.0-alpha.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/sync.d.ts CHANGED
@@ -74,6 +74,16 @@ export declare class SyncManager {
74
74
  abort(): void;
75
75
  get isAborted(): boolean;
76
76
  getData(): Record<string, unknown>;
77
+ /**
78
+ * Merge a remote snapshot with local (optimistic) data using this manager's
79
+ * conflict resolver — the same resolver the push-conflict path uses. A plain
80
+ * {@link pull} overwrites the store's data with the server snapshot, which
81
+ * would drop un-pushed local writes (they live only in the store, never in
82
+ * `localData` until a push succeeds). The zustand binding calls this on pull
83
+ * while the store is dirty so those writes survive. `local` wins by the same
84
+ * rules as a push conflict.
85
+ */
86
+ resolve(local: Record<string, unknown>, remote: Record<string, unknown>): Record<string, unknown>;
77
87
  getHash(): string | null;
78
88
  /** Set the last-known server hash. Used by persistence layers to restore state across restarts. */
79
89
  setHash(hash: string | null): void;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@drakkar.software/starfish-client",
3
- "version": "3.0.0-alpha.12",
3
+ "version": "3.0.0-alpha.14",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "https://github.com/Drakkar-Software/starfish.git",
@@ -60,7 +60,7 @@
60
60
  }
61
61
  },
62
62
  "dependencies": {
63
- "@drakkar.software/starfish-protocol": "3.0.0-alpha.12"
63
+ "@drakkar.software/starfish-protocol": "3.0.0-alpha.14"
64
64
  },
65
65
  "devDependencies": {
66
66
  "@legendapp/state": "^2.0.0",