@fluxstack/live-client 0.6.1 → 0.7.0

package/package.json

@@ -1,49 +1,49 @@
-{
-  "name": "@fluxstack/live-client",
-  "version": "0.6.1",
-  "description": "Browser WebSocket client for @fluxstack/live — connection, state sync, rooms, and file upload (framework-agnostic)",
-  "type": "module",
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "sideEffects": false,
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "bun": "./src/index.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
-    },
-    "./browser": "./dist/live-client.browser.global.js"
-  },
-  "files": [
-    "dist",
-    "src"
-  ],
-  "scripts": {
-    "build": "tsup",
-    "dev": "tsup --watch",
-    "clean": "rm -rf dist",
-    "typecheck": "tsc --noEmit"
-  },
-  "dependencies": {
-    "@fluxstack/live": "^0.6.0"
-  },
-  "devDependencies": {
-    "tsup": "^8.4.0",
-    "typescript": "^5.8.3"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/FluxStackCore/fluxstack-live",
-    "directory": "packages/client"
-  },
-  "license": "MIT",
-  "keywords": ["websocket", "client", "realtime", "state-sync", "live-components", "fluxstack"],
-  "engines": {
-    "node": ">=18.0.0"
-  }
-}
+{
+  "name": "@fluxstack/live-client",
+  "version": "0.7.0",
+  "description": "Browser WebSocket client for @fluxstack/live — connection, state sync, rooms, and file upload (framework-agnostic)",
+  "type": "module",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "bun": "./src/index.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    },
+    "./browser": "./dist/live-client.browser.global.js"
+  },
+  "files": [
+    "dist",
+    "src"
+  ],
+  "scripts": {
+    "build": "tsup",
+    "dev": "tsup --watch",
+    "clean": "rm -rf dist",
+    "typecheck": "tsc --noEmit"
+  },
+  "dependencies": {
+    "@fluxstack/live": "^0.7.0"
+  },
+  "devDependencies": {
+    "tsup": "^8.4.0",
+    "typescript": "^5.8.3"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/FluxStackCore/fluxstack-live",
+    "directory": "packages/client"
+  },
+  "license": "MIT",
+  "keywords": ["websocket", "client", "realtime", "state-sync", "live-components", "fluxstack"],
+  "engines": {
+    "node": ">=18.0.0"
+  }
+}

package/src/component.ts

@@ -20,7 +20,19 @@ function isPlainObject(v: unknown): v is Record<string, any> {
     && Object.getPrototypeOf(v) === Object.prototype
 }
 
+/**
+ * Apply a STATE_DELTA coming from the server (component state).
+ *
+ * Semantics (matches core's `deepAssign`, fixes #6):
+ * - Top-level `null` is a real value (set to null).
+ * - Nested `null` is the deletion sentinel from `computeDeepDiff`.
+ * - `undefined` is skipped — it never crosses the wire.
+ */
 function deepMerge<T extends Record<string, any>>(target: T, source: Partial<T>, seen?: Set<object>): T {
+  return deepMergeImpl(target, source, 0, seen)
+}
+
+function deepMergeImpl<T extends Record<string, any>>(target: T, source: Partial<T>, depth: number, seen?: Set<object>): T {
   if (!seen) seen = new Set()
   if (seen.has(source as object)) return target
   seen.add(source as object)
@@ -28,13 +40,18 @@ function deepMerge<T extends Record<string, any>>(target: T, source: Partial<T>,
   const result = { ...target }
   for (const key of Object.keys(source) as Array<keyof T>) {
     const newVal = source[key]
+    if (newVal === undefined) continue
     if (newVal === null) {
-      delete result[key]
+      if (depth === 0) {
+        result[key] = null as T[keyof T]
+      } else {
+        delete result[key]
+      }
       continue
     }
     const oldVal = result[key]
     if (isPlainObject(oldVal) && isPlainObject(newVal)) {
-      result[key] = deepMerge(oldVal as any, newVal as any, seen)
+      result[key] = deepMergeImpl(oldVal as any, newVal as any, depth + 1, seen) as T[keyof T]
     } else {
       result[key] = newVal as T[keyof T]
     }

package/src/rooms.ts

@@ -10,7 +10,19 @@ function isPlainObject(v: unknown): v is Record<string, any> {
     && Object.getPrototypeOf(v) === Object.prototype
 }
 
+/**
+ * Apply a room STATE_DELTA coming from the server.
+ *
+ * Semantics (matches core's `deepAssign`, fixes #6):
+ * - Top-level `null` is a real value (set to null).
+ * - Nested `null` is the deletion sentinel from `computeDeepDiff`.
+ * - `undefined` is skipped — it never crosses the wire.
+ */
 function deepMerge<T extends Record<string, any>>(target: T, source: Partial<T>, seen?: Set<object>): T {
+  return deepMergeImpl(target, source, 0, seen)
+}
+
+function deepMergeImpl<T extends Record<string, any>>(target: T, source: Partial<T>, depth: number, seen?: Set<object>): T {
   if (!seen) seen = new Set()
   if (seen.has(source as object)) return target
   seen.add(source as object)
@@ -18,13 +30,18 @@ function deepMerge<T extends Record<string, any>>(target: T, source: Partial<T>,
   const result = { ...target }
   for (const key of Object.keys(source) as Array<keyof T>) {
     const newVal = source[key]
+    if (newVal === undefined) continue
     if (newVal === null) {
-      delete result[key]
+      if (depth === 0) {
+        result[key] = null as T[keyof T]
+      } else {
+        delete result[key]
+      }
       continue
     }
     const oldVal = result[key]
     if (isPlainObject(oldVal) && isPlainObject(newVal)) {
-      result[key] = deepMerge(oldVal as any, newVal as any, seen)
+      result[key] = deepMergeImpl(oldVal as any, newVal as any, depth + 1, seen) as T[keyof T]
     } else {
       result[key] = newVal as T[keyof T]
     }