@coaction/yjs 1.4.0 → 1.5.0

package/dist/index.js

@@ -44,9 +44,12 @@ __export(src_exports, {
   bindYjs: () => bindYjs,
   yjs: () => yjs
 });
-var Y = __toESM(require("yjs"));
-__reExport(src_exports, require("yjs"));
-var STATE_KEY = "state";
+var Y4 = __toESM(require("yjs"));
+
+// src/remoteOperations.ts
+var Y2 = __toESM(require("yjs"));
+
+// src/shared.ts
 var scheduleMicrotask = (callback) => {
   if (typeof queueMicrotask === "function") {
     queueMicrotask(callback);
@@ -67,6 +70,9 @@ function isPlainObject(value) {
   const prototype = Object.getPrototypeOf(value);
   return prototype === Object.prototype || prototype === null;
 }
+
+// src/yjsValue.ts
+var Y = __toESM(require("yjs"));
 function toPlainObject(value) {
   const next = {};
   value.forEach((item, key) => {
@@ -115,6 +121,125 @@ function toYValue(value) {
   }
   return value;
 }
+
+// src/remoteOperations.ts
+function isSetStateReentryError(error) {
+  return error instanceof Error && error.message === "setState cannot be called within the updater";
+}
+function cloneForStore(value) {
+  if (typeof value === "object" && value !== null) {
+    return clone(value);
+  }
+  return value;
+}
+function toPathKey(path) {
+  return path.map((segment) => `${typeof segment}:${String(segment)}`).join("|");
+}
+function compactOperations(operations) {
+  const deduplicated = /* @__PURE__ */ new Map();
+  for (const operation of operations) {
+    const key = toPathKey(operation.path);
+    if (deduplicated.has(key)) {
+      deduplicated.delete(key);
+    }
+    deduplicated.set(key, operation);
+  }
+  return Array.from(deduplicated.values()).sort(
+    (left, right) => left.path.length - right.path.length
+  );
+}
+function getYValueAtPath(root, path) {
+  let current = root;
+  for (const segment of path) {
+    if (current instanceof Y2.Map) {
+      current = current.get(String(segment));
+      continue;
+    }
+    if (current instanceof Y2.Array) {
+      const index = typeof segment === "number" ? segment : Number.parseInt(segment, 10);
+      if (!Number.isInteger(index)) {
+        return void 0;
+      }
+      current = current.get(index);
+      continue;
+    }
+    return void 0;
+  }
+  return current;
+}
+function setAtPath(target, path, value) {
+  if (path.length === 0) {
+    return;
+  }
+  let current = target;
+  for (let index = 0; index < path.length - 1; index += 1) {
+    const segment = path[index];
+    const nextSegment = path[index + 1];
+    const nextValue = current[segment];
+    if (typeof nextValue !== "object" || nextValue === null) {
+      current[segment] = typeof nextSegment === "number" ? [] : {};
+    }
+    current = current[segment];
+  }
+  const leaf = path[path.length - 1];
+  current[leaf] = cloneForStore(value);
+}
+function deleteAtPath(target, path) {
+  if (path.length === 0) {
+    return;
+  }
+  let current = target;
+  for (let index = 0; index < path.length - 1; index += 1) {
+    current = current[path[index]];
+    if (typeof current !== "object" || current === null) {
+      return;
+    }
+  }
+  const leaf = path[path.length - 1];
+  if (Array.isArray(current) && typeof leaf === "number") {
+    if (leaf >= 0 && leaf < current.length) {
+      current.splice(leaf, 1);
+    }
+    return;
+  }
+  delete current[leaf];
+}
+function collectRemoteOperations(events, stateMap) {
+  const operations = [];
+  for (const event of events) {
+    if (event instanceof Y2.YMapEvent) {
+      for (const changedKey of event.keysChanged) {
+        const path = [...event.path, changedKey];
+        const keyChange = event.changes.keys.get(changedKey);
+        if (keyChange?.action === "delete") {
+          operations.push({
+            type: "delete",
+            path
+          });
+          continue;
+        }
+        operations.push({
+          type: "set",
+          path,
+          value: toPlainValue(getYValueAtPath(stateMap, path))
+        });
+      }
+      continue;
+    }
+    if (event instanceof Y2.YArrayEvent) {
+      const path = [...event.path];
+      operations.push({
+        type: "set",
+        path,
+        value: toPlainValue(getYValueAtPath(stateMap, path))
+      });
+    }
+  }
+  return operations;
+}
+
+// src/sync.ts
+var Y3 = __toESM(require("yjs"));
 function isEqualValue(left, right) {
   if (Object.is(left, right)) {
     return true;
@@ -164,7 +289,7 @@ function syncObjectToYMap(target, previous, source) {
     }
     const current = target.get(key);
     if (Array.isArray(nextValue)) {
-      if (Array.isArray(previousValue) && current instanceof Y.Array) {
+      if (Array.isArray(previousValue) && current instanceof Y3.Array) {
         syncArrayToYArray(current, previousValue, nextValue);
       } else {
         target.set(key, createYArray(nextValue));
@@ -172,7 +297,7 @@ function syncObjectToYMap(target, previous, source) {
       continue;
     }
     if (isPlainObject(nextValue)) {
-      if (isPlainObject(previousValue) && current instanceof Y.Map) {
+      if (isPlainObject(previousValue) && current instanceof Y3.Map) {
         syncObjectToYMap(current, previousValue, nextValue);
       } else {
         target.set(key, createYMap(nextValue));
@@ -207,7 +332,7 @@ function syncArrayToYArray(target, previous, source) {
     }
     const current = target.get(index);
     if (Array.isArray(nextValue)) {
-      if (Array.isArray(previousValue) && current instanceof Y.Array) {
+      if (Array.isArray(previousValue) && current instanceof Y3.Array) {
         syncArrayToYArray(current, previousValue, nextValue);
       } else {
         target.delete(index, 1);
@@ -216,7 +341,7 @@ function syncArrayToYArray(target, previous, source) {
       continue;
     }
     if (isPlainObject(nextValue)) {
-      if (isPlainObject(previousValue) && current instanceof Y.Map) {
+      if (isPlainObject(previousValue) && current instanceof Y3.Map) {
         syncObjectToYMap(current, previousValue, nextValue);
       } else {
         target.delete(index, 1);
@@ -231,120 +356,10 @@ function syncArrayToYArray(target, previous, source) {
     }
   }
 }
-function isSetStateReentryError(error) {
-  return error instanceof Error && error.message === "setState cannot be called within the updater";
-}
-function cloneForStore(value) {
-  if (typeof value === "object" && value !== null) {
-    return clone(value);
-  }
-  return value;
-}
-function toPathKey(path) {
-  return path.map((segment) => `${typeof segment}:${String(segment)}`).join("|");
-}
-function compactOperations(operations) {
-  const deduplicated = /* @__PURE__ */ new Map();
-  for (const operation of operations) {
-    const key = toPathKey(operation.path);
-    if (deduplicated.has(key)) {
-      deduplicated.delete(key);
-    }
-    deduplicated.set(key, operation);
-  }
-  return Array.from(deduplicated.values()).sort(
-    (left, right) => left.path.length - right.path.length
-  );
-}
-function getYValueAtPath(root, path) {
-  let current = root;
-  for (const segment of path) {
-    if (current instanceof Y.Map) {
-      current = current.get(String(segment));
-      continue;
-    }
-    if (current instanceof Y.Array) {
-      const index = typeof segment === "number" ? segment : Number.parseInt(segment, 10);
-      if (!Number.isInteger(index)) {
-        return void 0;
-      }
-      current = current.get(index);
-      continue;
-    }
-    return void 0;
-  }
-  return current;
-}
-function setAtPath(target, path, value) {
-  if (path.length === 0) {
-    return;
-  }
-  let current = target;
-  for (let index = 0; index < path.length - 1; index += 1) {
-    const segment = path[index];
-    const nextSegment = path[index + 1];
-    const nextValue = current[segment];
-    if (typeof nextValue !== "object" || nextValue === null) {
-      current[segment] = typeof nextSegment === "number" ? [] : {};
-    }
-    current = current[segment];
-  }
-  const leaf = path[path.length - 1];
-  current[leaf] = cloneForStore(value);
-}
-function deleteAtPath(target, path) {
-  if (path.length === 0) {
-    return;
-  }
-  let current = target;
-  for (let index = 0; index < path.length - 1; index += 1) {
-    current = current[path[index]];
-    if (typeof current !== "object" || current === null) {
-      return;
-    }
-  }
-  const leaf = path[path.length - 1];
-  if (Array.isArray(current) && typeof leaf === "number") {
-    if (leaf >= 0 && leaf < current.length) {
-      current.splice(leaf, 1);
-    }
-    return;
-  }
-  delete current[leaf];
-}
-function collectRemoteOperations(events, stateMap) {
-  const operations = [];
-  for (const event of events) {
-    if (event instanceof Y.YMapEvent) {
-      for (const changedKey of event.keysChanged) {
-        const path = [...event.path, changedKey];
-        const keyChange = event.changes.keys.get(changedKey);
-        if (keyChange?.action === "delete") {
-          operations.push({
-            type: "delete",
-            path
-          });
-          continue;
-        }
-        operations.push({
-          type: "set",
-          path,
-          value: toPlainValue(getYValueAtPath(stateMap, path))
-        });
-      }
-      continue;
-    }
-    if (event instanceof Y.YArrayEvent) {
-      const path = [...event.path];
-      operations.push({
-        type: "set",
-        path,
-        value: toPlainValue(getYValueAtPath(stateMap, path))
-      });
-    }
-  }
-  return operations;
-}
+
+// src/index.ts
+__reExport(src_exports, require("yjs"));
+var STATE_KEY = "state";
 var __unsafeTestOnly__ = {
   getYValueAtPath: (root, path) => getYValueAtPath(root, path),
   setAtPath: (target, path, value) => {
@@ -358,7 +373,7 @@ var bindYjs = (store, options = {}) => {
   if (store.share === "client") {
     throw new Error("Yjs binding is not supported in client store mode.");
   }
-  const doc = options.doc ?? new Y.Doc();
+  const doc = options.doc ?? new Y4.Doc();
   const key = options.key ?? `coaction:${store.name}`;
   const map = doc.getMap(key);
   const localOrigin = /* @__PURE__ */ Symbol(`coaction-yjs:${store.name}`);
@@ -406,7 +421,7 @@ var bindYjs = (store, options = {}) => {
   };
   const getStateMap = () => {
     const state = map.get(STATE_KEY);
-    if (state instanceof Y.Map) {
+    if (state instanceof Y4.Map) {
       return state;
     }
     return null;

package/dist/index.mjs

@@ -31,10 +31,12 @@ __export(src_exports, {
   bindYjs: () => bindYjs,
   yjs: () => yjs
 });
-__reExport(src_exports, yjs_star);
-import * as Y from "yjs";
-import * as yjs_star from "yjs";
-var STATE_KEY = "state";
+import * as Y4 from "yjs";
+
+// src/remoteOperations.ts
+import * as Y2 from "yjs";
+
+// src/shared.ts
 var scheduleMicrotask = (callback) => {
   if (typeof queueMicrotask === "function") {
     queueMicrotask(callback);
@@ -55,6 +57,9 @@ function isPlainObject(value) {
   const prototype = Object.getPrototypeOf(value);
   return prototype === Object.prototype || prototype === null;
 }
+
+// src/yjsValue.ts
+import * as Y from "yjs";
 function toPlainObject(value) {
   const next = {};
   value.forEach((item, key) => {
@@ -103,6 +108,125 @@ function toYValue(value) {
   }
   return value;
 }
+
+// src/remoteOperations.ts
+function isSetStateReentryError(error) {
+  return error instanceof Error && error.message === "setState cannot be called within the updater";
+}
+function cloneForStore(value) {
+  if (typeof value === "object" && value !== null) {
+    return clone(value);
+  }
+  return value;
+}
+function toPathKey(path) {
+  return path.map((segment) => `${typeof segment}:${String(segment)}`).join("|");
+}
+function compactOperations(operations) {
+  const deduplicated = /* @__PURE__ */ new Map();
+  for (const operation of operations) {
+    const key = toPathKey(operation.path);
+    if (deduplicated.has(key)) {
+      deduplicated.delete(key);
+    }
+    deduplicated.set(key, operation);
+  }
+  return Array.from(deduplicated.values()).sort(
+    (left, right) => left.path.length - right.path.length
+  );
+}
+function getYValueAtPath(root, path) {
+  let current = root;
+  for (const segment of path) {
+    if (current instanceof Y2.Map) {
+      current = current.get(String(segment));
+      continue;
+    }
+    if (current instanceof Y2.Array) {
+      const index = typeof segment === "number" ? segment : Number.parseInt(segment, 10);
+      if (!Number.isInteger(index)) {
+        return void 0;
+      }
+      current = current.get(index);
+      continue;
+    }
+    return void 0;
+  }
+  return current;
+}
+function setAtPath(target, path, value) {
+  if (path.length === 0) {
+    return;
+  }
+  let current = target;
+  for (let index = 0; index < path.length - 1; index += 1) {
+    const segment = path[index];
+    const nextSegment = path[index + 1];
+    const nextValue = current[segment];
+    if (typeof nextValue !== "object" || nextValue === null) {
+      current[segment] = typeof nextSegment === "number" ? [] : {};
+    }
+    current = current[segment];
+  }
+  const leaf = path[path.length - 1];
+  current[leaf] = cloneForStore(value);
+}
+function deleteAtPath(target, path) {
+  if (path.length === 0) {
+    return;
+  }
+  let current = target;
+  for (let index = 0; index < path.length - 1; index += 1) {
+    current = current[path[index]];
+    if (typeof current !== "object" || current === null) {
+      return;
+    }
+  }
+  const leaf = path[path.length - 1];
+  if (Array.isArray(current) && typeof leaf === "number") {
+    if (leaf >= 0 && leaf < current.length) {
+      current.splice(leaf, 1);
+    }
+    return;
+  }
+  delete current[leaf];
+}
+function collectRemoteOperations(events, stateMap) {
+  const operations = [];
+  for (const event of events) {
+    if (event instanceof Y2.YMapEvent) {
+      for (const changedKey of event.keysChanged) {
+        const path = [...event.path, changedKey];
+        const keyChange = event.changes.keys.get(changedKey);
+        if (keyChange?.action === "delete") {
+          operations.push({
+            type: "delete",
+            path
+          });
+          continue;
+        }
+        operations.push({
+          type: "set",
+          path,
+          value: toPlainValue(getYValueAtPath(stateMap, path))
+        });
+      }
+      continue;
+    }
+    if (event instanceof Y2.YArrayEvent) {
+      const path = [...event.path];
+      operations.push({
+        type: "set",
+        path,
+        value: toPlainValue(getYValueAtPath(stateMap, path))
+      });
+    }
+  }
+  return operations;
+}
+
+// src/sync.ts
+import * as Y3 from "yjs";
 function isEqualValue(left, right) {
   if (Object.is(left, right)) {
     return true;
@@ -152,7 +276,7 @@ function syncObjectToYMap(target, previous, source) {
     }
     const current = target.get(key);
     if (Array.isArray(nextValue)) {
-      if (Array.isArray(previousValue) && current instanceof Y.Array) {
+      if (Array.isArray(previousValue) && current instanceof Y3.Array) {
         syncArrayToYArray(current, previousValue, nextValue);
       } else {
         target.set(key, createYArray(nextValue));
@@ -160,7 +284,7 @@ function syncObjectToYMap(target, previous, source) {
       continue;
     }
     if (isPlainObject(nextValue)) {
-      if (isPlainObject(previousValue) && current instanceof Y.Map) {
+      if (isPlainObject(previousValue) && current instanceof Y3.Map) {
         syncObjectToYMap(current, previousValue, nextValue);
       } else {
         target.set(key, createYMap(nextValue));
@@ -195,7 +319,7 @@ function syncArrayToYArray(target, previous, source) {
     }
     const current = target.get(index);
     if (Array.isArray(nextValue)) {
-      if (Array.isArray(previousValue) && current instanceof Y.Array) {
+      if (Array.isArray(previousValue) && current instanceof Y3.Array) {
         syncArrayToYArray(current, previousValue, nextValue);
       } else {
         target.delete(index, 1);
@@ -204,7 +328,7 @@ function syncArrayToYArray(target, previous, source) {
       continue;
     }
     if (isPlainObject(nextValue)) {
-      if (isPlainObject(previousValue) && current instanceof Y.Map) {
+      if (isPlainObject(previousValue) && current instanceof Y3.Map) {
         syncObjectToYMap(current, previousValue, nextValue);
       } else {
         target.delete(index, 1);
@@ -219,120 +343,11 @@ function syncArrayToYArray(target, previous, source) {
     }
   }
 }
-function isSetStateReentryError(error) {
-  return error instanceof Error && error.message === "setState cannot be called within the updater";
-}
-function cloneForStore(value) {
-  if (typeof value === "object" && value !== null) {
-    return clone(value);
-  }
-  return value;
-}
-function toPathKey(path) {
-  return path.map((segment) => `${typeof segment}:${String(segment)}`).join("|");
-}
-function compactOperations(operations) {
-  const deduplicated = /* @__PURE__ */ new Map();
-  for (const operation of operations) {
-    const key = toPathKey(operation.path);
-    if (deduplicated.has(key)) {
-      deduplicated.delete(key);
-    }
-    deduplicated.set(key, operation);
-  }
-  return Array.from(deduplicated.values()).sort(
-    (left, right) => left.path.length - right.path.length
-  );
-}
-function getYValueAtPath(root, path) {
-  let current = root;
-  for (const segment of path) {
-    if (current instanceof Y.Map) {
-      current = current.get(String(segment));
-      continue;
-    }
-    if (current instanceof Y.Array) {
-      const index = typeof segment === "number" ? segment : Number.parseInt(segment, 10);
-      if (!Number.isInteger(index)) {
-        return void 0;
-      }
-      current = current.get(index);
-      continue;
-    }
-    return void 0;
-  }
-  return current;
-}
-function setAtPath(target, path, value) {
-  if (path.length === 0) {
-    return;
-  }
-  let current = target;
-  for (let index = 0; index < path.length - 1; index += 1) {
-    const segment = path[index];
-    const nextSegment = path[index + 1];
-    const nextValue = current[segment];
-    if (typeof nextValue !== "object" || nextValue === null) {
-      current[segment] = typeof nextSegment === "number" ? [] : {};
-    }
-    current = current[segment];
-  }
-  const leaf = path[path.length - 1];
-  current[leaf] = cloneForStore(value);
-}
-function deleteAtPath(target, path) {
-  if (path.length === 0) {
-    return;
-  }
-  let current = target;
-  for (let index = 0; index < path.length - 1; index += 1) {
-    current = current[path[index]];
-    if (typeof current !== "object" || current === null) {
-      return;
-    }
-  }
-  const leaf = path[path.length - 1];
-  if (Array.isArray(current) && typeof leaf === "number") {
-    if (leaf >= 0 && leaf < current.length) {
-      current.splice(leaf, 1);
-    }
-    return;
-  }
-  delete current[leaf];
-}
-function collectRemoteOperations(events, stateMap) {
-  const operations = [];
-  for (const event of events) {
-    if (event instanceof Y.YMapEvent) {
-      for (const changedKey of event.keysChanged) {
-        const path = [...event.path, changedKey];
-        const keyChange = event.changes.keys.get(changedKey);
-        if (keyChange?.action === "delete") {
-          operations.push({
-            type: "delete",
-            path
-          });
-          continue;
-        }
-        operations.push({
-          type: "set",
-          path,
-          value: toPlainValue(getYValueAtPath(stateMap, path))
-        });
-      }
-      continue;
-    }
-    if (event instanceof Y.YArrayEvent) {
-      const path = [...event.path];
-      operations.push({
-        type: "set",
-        path,
-        value: toPlainValue(getYValueAtPath(stateMap, path))
-      });
-    }
-  }
-  return operations;
-}
+
+// src/index.ts
+__reExport(src_exports, yjs_star);
+import * as yjs_star from "yjs";
+var STATE_KEY = "state";
 var __unsafeTestOnly__ = {
   getYValueAtPath: (root, path) => getYValueAtPath(root, path),
   setAtPath: (target, path, value) => {
@@ -346,7 +361,7 @@ var bindYjs = (store, options = {}) => {
   if (store.share === "client") {
     throw new Error("Yjs binding is not supported in client store mode.");
   }
-  const doc = options.doc ?? new Y.Doc();
+  const doc = options.doc ?? new Y4.Doc();
   const key = options.key ?? `coaction:${store.name}`;
   const map = doc.getMap(key);
   const localOrigin = /* @__PURE__ */ Symbol(`coaction-yjs:${store.name}`);
@@ -394,7 +409,7 @@ var bindYjs = (store, options = {}) => {
   };
   const getStateMap = () => {
     const state = map.get(STATE_KEY);
-    if (state instanceof Y.Map) {
+    if (state instanceof Y4.Map) {
       return state;
     }
     return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coaction/yjs",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "A Coaction integration tool for Yjs",
   "keywords": [
     "state",
@@ -38,7 +38,7 @@
     "url": "https://github.com/unadlib/coaction/issues"
   },
   "peerDependencies": {
-    "coaction": "^1.4.0",
+    "coaction": "^1.5.0",
     "yjs": "^13.6.0"
   },
   "peerDependenciesMeta": {
@@ -51,7 +51,7 @@
   },
   "devDependencies": {
     "yjs": "^13.6.27",
-    "coaction": "1.4.0"
+    "coaction": "1.5.0"
   },
   "publishConfig": {
     "access": "public",