@lark-sh/client 0.1.12 → 0.1.13

package/dist/index.js

@@ -930,6 +930,39 @@ function getSortedKeys(data, queryParams) {
 }
 
 // src/connection/View.ts
+function expandPathKeys(obj) {
+  const result = {};
+  for (const [key, value] of Object.entries(obj)) {
+    if (key.includes("/")) {
+      const segments = key.split("/").filter((s) => s.length > 0);
+      let current = result;
+      for (let i = 0; i < segments.length - 1; i++) {
+        const segment = segments[i];
+        if (!(segment in current) || typeof current[segment] !== "object" || current[segment] === null) {
+          current[segment] = {};
+        }
+        current = current[segment];
+      }
+      current[segments[segments.length - 1]] = value;
+    } else {
+      result[key] = value;
+    }
+  }
+  return result;
+}
+function deepMerge(target, source) {
+  const result = { ...target };
+  for (const [key, value] of Object.entries(source)) {
+    if (value === null) {
+      delete result[key];
+    } else if (value !== null && typeof value === "object" && !Array.isArray(value) && result[key] !== null && typeof result[key] === "object" && !Array.isArray(result[key])) {
+      result[key] = deepMerge(result[key], value);
+    } else {
+      result[key] = value;
+    }
+  }
+  return result;
+}
 var View = class {
   constructor(path, queryParams) {
     /** Event callbacks organized by event type */
@@ -1234,29 +1267,19 @@ var View = class {
       return this.setAtPath(base, relativePath, value);
     }
     if (operation === "update") {
+      const expanded = expandPathKeys(value);
       if (relativePath === "/") {
         if (base === null || base === void 0 || typeof base !== "object") {
           base = {};
         }
-        const merged2 = { ...base, ...value };
-        for (const key of Object.keys(merged2)) {
-          if (merged2[key] === null) {
-            delete merged2[key];
-          }
-        }
-        return merged2;
+        return deepMerge(base, expanded);
       }
       const current = getValueAtPath(base, relativePath);
       let merged;
-      if (current && typeof current === "object") {
-        merged = { ...current, ...value };
-        for (const key of Object.keys(merged)) {
-          if (merged[key] === null) {
-            delete merged[key];
-          }
-        }
+      if (current && typeof current === "object" && !Array.isArray(current)) {
+        merged = deepMerge(current, expanded);
       } else {
-        merged = value;
+        merged = expanded;
       }
       return this.setAtPath(base, relativePath, merged);
     }
@@ -3250,6 +3273,7 @@ var DatabaseReference = class _DatabaseReference {
     while (retries < maxRetries) {
       const currentSnapshot = await this.once();
       const currentValue = currentSnapshot.val();
+      const rawValue = currentSnapshot.exportVal();
       const newValue = updateFunction(currentValue);
       if (newValue === void 0) {
         return {
@@ -3258,13 +3282,18 @@ var DatabaseReference = class _DatabaseReference {
         };
       }
       let condition;
-      if (isPrimitive(currentValue)) {
-        condition = { o: "c", p: this._path, v: currentValue };
+      if (isPrimitive(rawValue)) {
+        condition = { o: "c", p: this._path, v: rawValue };
       } else {
-        const hash = await hashValue(currentValue);
+        const hash = await hashValue(rawValue);
         condition = { o: "c", p: this._path, h: hash };
       }
-      const ops = [condition, { o: "s", p: this._path, v: newValue }];
+      let valueToSet = newValue;
+      const existingPriority = currentSnapshot.getPriority();
+      if (existingPriority !== null && isPrimitive(newValue) && newValue !== null) {
+        valueToSet = { ".priority": existingPriority, ".value": newValue };
+      }
+      const ops = [condition, { o: "s", p: this._path, v: valueToSet }];
       try {
         await this._db._sendTransaction(ops);
         const finalSnapshot = await this.once();
@@ -3855,7 +3884,10 @@ function stripPriorityMetadata(data) {
     if (key === ".priority") {
       continue;
     }
-    result[key] = stripPriorityMetadata(value);
+    const stripped = stripPriorityMetadata(value);
+    if (stripped !== null) {
+      result[key] = stripped;
+    }
   }
   return Object.keys(result).length > 0 ? result : null;
 }