@automerge/automerge-repo-solid-primitives 2.5.6 → 2.6.0-alpha.1

package/dist/index.js

@@ -1,5 +1,5 @@
 import { onCleanup, createMemo, createContext, useContext, createResource, createEffect, createSignal } from 'solid-js';
-import { createStore, produce, reconcile } from 'solid-js/store';
+import { createStore, reconcile, produce } from 'solid-js/store';
 
 // Properties of the document root object
 const STATE = Symbol.for("_am_meta"); // symbol used to hide application metadata on automerge objects
@@ -1232,51 +1232,6 @@ function getObjectId(doc, prop) {
         return _obj(doc);
     }
 }
-/**
- * Create a set of patches representing the change from one set of heads to another
- *
- * If either of the heads are missing from the document the returned set of patches will be empty
- */
-function diff(doc, before, after) {
-    checkHeads(before, "before");
-    checkHeads(after, "after");
-    const state = _state(doc);
-    if (state.mostRecentPatch &&
-        equals(state.mostRecentPatch.before, before) &&
-        equals(state.mostRecentPatch.after, after)) {
-        return state.mostRecentPatch.patches;
-    }
-    return state.handle.diff(before, after);
-}
-function checkHeads(heads, fieldname) {
-    if (!Array.isArray(heads)) {
-        throw new Error(`${fieldname} must be an array`);
-    }
-}
-/** @hidden */
-// FIXME : no tests
-// FIXME can we just use deep equals now?
-function equals(val1, val2) {
-    if (!isObject(val1) || !isObject(val2))
-        return val1 === val2;
-    const keys1 = Object.keys(val1).sort(), keys2 = Object.keys(val2).sort();
-    if (keys1.length !== keys2.length)
-        return false;
-    for (let i = 0; i < keys1.length; i++) {
-        if (keys1[i] !== keys2[i])
-            return false;
-        if (!equals(val1[keys1[i]], val2[keys2[i]]))
-            return false;
-    }
-    return true;
-}
-/**
- * Get the hashes of the heads of this document
- */
-function getHeads(doc) {
-    const state = _state(doc);
-    return state.heads || state.handle.getHeads();
-}
 function isAutomerge(doc) {
     if (typeof doc == "object" && doc !== null) {
         return getObjectId(doc) === "_root" && !!Reflect.get(doc, STATE);
@@ -1285,9 +1240,6 @@ function isAutomerge(doc) {
         return false;
     }
 }
-function isObject(obj) {
-    return typeof obj === "object" && obj !== null;
-}
 /**
  * Modify a string
  *
@@ -1361,7 +1313,7 @@ function autoproduce(payload) {
 const cache = /* @__PURE__ */ new WeakMap();
 function initial(handle) {
   const template = {};
-  applyPatches(template, diff(handle.doc(), [], getHeads(handle.doc())));
+  applyPatches(template, handle.diff([], handle.heads()));
   return template;
 }
 function makeDocumentProjection(handle) {
@@ -1388,6 +1340,10 @@ function makeDocumentProjection(handle) {
     }
   });
   function patch(payload) {
+    if (payload.scopeReplaced) {
+      set(reconcile(payload.doc ?? {}));
+      return;
+    }
     set(produce(autoproduce(payload)));
   }
   function ondelete() {
@@ -1410,8 +1366,6 @@ const RepoContext = createContext(
   null
 );
 
-const readyStates = ["ready", "deleted", "unavailable"];
-const badStates = ["deleted", "unavailable"];
 function useDocHandle(url, options) {
   const contextRepo = useContext(RepoContext);
   if (!options?.repo && !contextRepo) {
@@ -1422,35 +1376,12 @@ function useDocHandle(url, options) {
     if (options?.["~skipInitialValue"]) return void 0;
     const unwrappedURL = typeof url == "function" ? url() : url;
     if (!unwrappedURL) return void 0;
-    try {
-      const documentId = new URL(unwrappedURL).pathname;
-      const existingHandle = repo.handles[documentId];
-      if (existingHandle?.isReady()) {
-        return existingHandle;
-      }
-    } catch (error) {
-      console.error("Error parsing URL:", error);
-    }
+    const state = repo.findWithProgress(unwrappedURL).peek();
+    return state.state === "ready" ? state.handle : void 0;
   }
   const [handle, { mutate }] = createResource(
     url,
-    async (url2) => {
-      const handle2 = await repo.find(url2, {
-        allowableStates: readyStates
-      });
-      const reject = (state) => Promise.reject(new Error(`document not available: [${state}]`));
-      if (handle2.isReady()) {
-        return handle2;
-      } else if (handle2.inState(badStates)) {
-        return reject(handle2.state);
-      }
-      return handle2.whenReady(readyStates).then(() => {
-        if (handle2.isReady()) {
-          return handle2;
-        }
-        return reject(handle2.state);
-      });
-    },
+    (url2) => repo.findWithProgress(url2).whenReady(),
     {
       initialValue: getExistingHandle()
     }