@seed-hypermedia/client 0.0.26 → 0.0.28

package/dist/auto-link.d.ts

@@ -20,6 +20,11 @@ export declare function documentContainsLinkToChild(document: HMDocument, childI
 /**
  * Check if a document has a self-referential Query block
  * (a query to itself that would automatically include children).
+ *
+ * A query block is self-referential when one of its `query.includes` entries
+ * has `space === documentId.uid` AND a path that, after normalization, equals
+ * the document's path. Empty `space` or `path` does not count as self — that
+ * represents an unconfigured query block, which the editor renders empty.
  */
 export declare function documentHasSelfQuery(document: HMDocument, documentId: UnpackedHypermediaId): boolean;
 /**

package/dist/{chunk-GBZ545NB.mjs → chunk-F2YINBVV.mjs}

@@ -606,7 +606,18 @@ var HMDraftContentSchema = z.object({
   // EditorBlock validation is handled elsewhere
   deps: z.array(z.string().min(1)).default([]),
   navigation: z.array(HMNavigationItemSchema).optional(),
-  cursorPosition: z.number().optional()
+  cursorPosition: z.number().optional(),
+  /**
+   * Block IDs the local user touched since starting this draft. Used by the
+   * auto-rebase classifier to distinguish locally-edited blocks from incoming
+   * remote edits. Persisted so reload-after-rebase keeps the touch history.
+   */
+  mineTouchedIds: z.array(z.string()).optional(),
+  /**
+   * Snapshot of the published HMBlockNode[] tree at the time the draft was
+   * started (or last rebased). Acts as the merge base for three-way diff.
+   */
+  baseBlocks: z.array(z.any()).optional()
 });
 var HMDraftMetaBaseSchema = z.object({
   id: z.string(),

package/dist/hm-types.d.ts

@@ -12297,6 +12297,17 @@ export declare const HMDraftContentSchema: z.ZodObject<{
         text: string;
     }>, "many">>;
     cursorPosition: z.ZodOptional<z.ZodNumber>;
+    /**
+     * Block IDs the local user touched since starting this draft. Used by the
+     * auto-rebase classifier to distinguish locally-edited blocks from incoming
+     * remote edits. Persisted so reload-after-rebase keeps the touch history.
+     */
+    mineTouchedIds: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    /**
+     * Snapshot of the published HMBlockNode[] tree at the time the draft was
+     * started (or last rebased). Acts as the merge base for three-way diff.
+     */
+    baseBlocks: z.ZodOptional<z.ZodArray<z.ZodAny, "many">>;
 }, "strip", z.ZodTypeAny, {
     content: any[];
     deps: string[];
@@ -12307,6 +12318,8 @@ export declare const HMDraftContentSchema: z.ZodObject<{
         text: string;
     }[] | undefined;
     cursorPosition?: number | undefined;
+    mineTouchedIds?: string[] | undefined;
+    baseBlocks?: any[] | undefined;
 }, {
     content: any[];
     deps?: string[] | undefined;
@@ -12317,6 +12330,8 @@ export declare const HMDraftContentSchema: z.ZodObject<{
         text: string;
     }[] | undefined;
     cursorPosition?: number | undefined;
+    mineTouchedIds?: string[] | undefined;
+    baseBlocks?: any[] | undefined;
 }>;
 export type HMDraftContent = z.infer<typeof HMDraftContentSchema>;
 export declare const HMDraftMetaSchema: z.ZodEffects<z.ZodObject<{

package/dist/hm-types.mjs

@@ -165,7 +165,7 @@ import {
   toNumber,
   unpackHmId,
   unpackedHmIdSchema
-} from "./chunk-GBZ545NB.mjs";
+} from "./chunk-F2YINBVV.mjs";
 export {
   BlockRangeSchema,
   BoldAnnotationSchema,

package/dist/index.mjs

@@ -17,7 +17,7 @@ import {
   serializeBlockRange,
   toNumber,
   unpackHmId
-} from "./chunk-GBZ545NB.mjs";
+} from "./chunk-F2YINBVV.mjs";
 
 // src/capability.ts
 import { encode as cborEncode2 } from "@ipld/dag-cbor";
@@ -3279,21 +3279,19 @@ function documentContainsLinkToChild(document, childId) {
   return searchBlocks(document.content || []);
 }
 function documentHasSelfQuery(document, documentId) {
-  var _a;
-  const documentPathWithSlash = hmIdPathToEntityQueryPath(documentId.path);
-  const documentPathWithoutSlash = ((_a = documentId.path) == null ? void 0 : _a.join("/")) || "";
+  const parentPathStr = (documentId.path || []).join("/");
+  function isSelfMatch(include) {
+    if (!include) return false;
+    if (include.space !== documentId.uid) return false;
+    const includePath = entityQueryPathToHmIdPath(include.path);
+    return (includePath || []).join("/") === parentPathStr;
+  }
   function searchBlocks(nodes) {
-    var _a2;
+    var _a, _b;
     for (const node of nodes) {
       if (node.block.type === "Query") {
-        const query = (_a2 = node.block.attributes) == null ? void 0 : _a2.query;
-        if (query == null ? void 0 : query.includes) {
-          for (const inc of query.includes) {
-            const isSpaceMatch = !inc.space || inc.space === documentId.uid;
-            const isPathMatch = !inc.path || inc.path === documentPathWithSlash || inc.path === documentPathWithoutSlash;
-            if (isSpaceMatch && isPathMatch) return true;
-          }
-        }
+        const includes = (_b = (_a = node.block.attributes) == null ? void 0 : _a.query) == null ? void 0 : _b.includes;
+        if (includes == null ? void 0 : includes.some(isSelfMatch)) return true;
       }
       if (node.children && searchBlocks(node.children)) return true;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seed-hypermedia/client",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "repository": {
     "type": "git",
     "url": "https://github.com/seed-hypermedia/seed",