@seed-hypermedia/client 0.0.35 → 0.0.37

package/dist/hm-types.mjs

@@ -149,6 +149,8 @@ import {
   ParsedFragmentSchema,
   StrikeAnnotationSchema,
   TextColorAnnotationSchema,
+  TextFamilyAnnotationSchema,
+  TextSizeAnnotationSchema,
   UnderlineAnnotationSchema,
   codePointLength,
   entityQueryPathToHmIdPath,
@@ -167,7 +169,7 @@ import {
   toNumber,
   unpackHmId,
   unpackedHmIdSchema
-} from "./chunk-RDTEH34P.mjs";
+} from "./chunk-2BRMXRIG.mjs";
 export {
   BackgroundColorAnnotationSchema,
   BlockRangeSchema,
@@ -319,6 +321,8 @@ export {
   ParsedFragmentSchema,
   StrikeAnnotationSchema,
   TextColorAnnotationSchema,
+  TextFamilyAnnotationSchema,
+  TextSizeAnnotationSchema,
   UnderlineAnnotationSchema,
   codePointLength,
   entityQueryPathToHmIdPath,

package/dist/index.mjs

@@ -17,7 +17,7 @@ import {
   serializeBlockRange,
   toNumber,
   unpackHmId
-} from "./chunk-RDTEH34P.mjs";
+} from "./chunk-2BRMXRIG.mjs";
 
 // src/capability.ts
 import { encode as cborEncode2 } from "@ipld/dag-cbor";
@@ -530,6 +530,120 @@ function stripUndefined(obj) {
 import { decode as cborDecode2, encode as cborEncode6 } from "@ipld/dag-cbor";
 import { CID as CID3 } from "multiformats";
 import { base58btc as base58btc3 } from "multiformats/bases/base58";
+
+// src/unicode.ts
+var AnnotationSet = class {
+  annotations;
+  constructor() {
+    this.annotations = /* @__PURE__ */ new Map();
+  }
+  addSpan(type, attributes, start, end) {
+    const id = this._annotationId(type, attributes);
+    let annotation = this.annotations.get(id);
+    if (!annotation) {
+      const annAttrs = attributes ? { ...attributes } : {};
+      let link;
+      if (type == "Link" || type == "Embed") {
+        link = attributes == null ? void 0 : attributes.link;
+        delete annAttrs.link;
+      }
+      annotation = {
+        type,
+        attributes: annAttrs,
+        link: link || "",
+        starts: [],
+        ends: []
+      };
+      this.annotations.set(id, annotation);
+    }
+    addSpanToAnnotation(annotation, start, end);
+  }
+  _annotationId(type, attributes) {
+    if (attributes) {
+      if (attributes.link) {
+        return `${type}-${attributes.link}`;
+      }
+      if (attributes.href) {
+        return `${type}-${attributes.href}`;
+      }
+      if (attributes.value) {
+        return `${type}-${attributes.value}`;
+      }
+    }
+    return type;
+  }
+  list() {
+    const keys = Array.from(this.annotations.keys()).sort();
+    let out = new Array(keys.length);
+    for (let i in keys) {
+      const annotation = this.annotations.get(keys[i]);
+      if (annotation) out[i] = annotation;
+    }
+    out = out.sort((a, b) => {
+      let startA = a.starts[0];
+      let startB = b.starts[0];
+      return (startA || 0) - (startB || 0);
+    });
+    return out;
+  }
+};
+function addSpanToAnnotation(annotation, start, end) {
+  if (!annotation.starts) {
+    annotation.starts = [];
+  }
+  if (!annotation.ends) {
+    annotation.ends = [];
+  }
+  if (annotation.starts.length == 0) {
+    pushSpanToAnnotation(annotation, start, end);
+    return;
+  }
+  const lastIdx = annotation.starts.length - 1;
+  if (annotation.ends[lastIdx] == start) {
+    annotation.ends[lastIdx] = end;
+    return;
+  }
+  pushSpanToAnnotation(annotation, start, end);
+}
+function pushSpanToAnnotation(annotation, start, end) {
+  annotation.starts.push(start);
+  annotation.ends.push(end);
+}
+var EXCLUSIVE_TYPES = ["TextColor", "BackgroundColor", "TextSize", "TextFamily"];
+function spansOverlap(a, b) {
+  for (let i = 0; i < a.starts.length; i++) {
+    const aStart = a.starts[i];
+    const aEnd = a.ends[i];
+    if (aStart === void 0 || aEnd === void 0) continue;
+    for (let j = 0; j < b.starts.length; j++) {
+      const bStart = b.starts[j];
+      const bEnd = b.ends[j];
+      if (bStart === void 0 || bEnd === void 0) continue;
+      if (aStart < bEnd && bStart < aEnd) return true;
+    }
+  }
+  return false;
+}
+function validateExclusiveAnnotations(annotations) {
+  var _a, _b;
+  for (const type of EXCLUSIVE_TYPES) {
+    const ofType = annotations.filter((a) => a.type === type);
+    for (let i = 0; i < ofType.length; i++) {
+      for (let j = i + 1; j < ofType.length; j++) {
+        const a = ofType[i];
+        const b = ofType[j];
+        const aVal = (_a = a.attributes) == null ? void 0 : _a.value;
+        const bVal = (_b = b.attributes) == null ? void 0 : _b.value;
+        if (aVal && bVal && aVal === bVal) continue;
+        if (spansOverlap(a, b)) {
+          throw new Error(`${type} annotations with different values have overlapping ranges`);
+        }
+      }
+    }
+  }
+}
+
+// src/comment.ts
 function trimTrailingEmptyBlocks(blocks) {
   let end = blocks.length;
   while (end > 0) {
@@ -546,7 +660,9 @@ function isEmptyBlockNode(node) {
   return !block.text || block.text.trim() === "";
 }
 function annotationsToPublishable(annotations) {
+  validateExclusiveAnnotations(annotations);
   return annotations.map((annotation) => {
+    var _a, _b, _c, _d;
     const { type, starts, ends } = annotation;
     if (type === "Bold") return { type: "Bold", starts, ends };
     if (type === "Italic") return { type: "Italic", starts, ends };
@@ -555,6 +671,19 @@ function annotationsToPublishable(annotations) {
     if (type === "Code") return { type: "Code", starts, ends };
     if (type === "Link") return { type: "Link", starts, ends, link: annotation.link || "" };
     if (type === "Embed") return { type: "Embed", starts, ends, link: annotation.link || "" };
+    if (type === "TextColor")
+      return { type: "TextColor", starts, ends, attributes: { value: ((_a = annotation.attributes) == null ? void 0 : _a.value) || "" } };
+    if (type === "BackgroundColor")
+      return {
+        type: "BackgroundColor",
+        starts,
+        ends,
+        attributes: { value: ((_b = annotation.attributes) == null ? void 0 : _b.value) || "" }
+      };
+    if (type === "TextSize")
+      return { type: "TextSize", starts, ends, attributes: { value: ((_c = annotation.attributes) == null ? void 0 : _c.value) || "" } };
+    if (type === "TextFamily")
+      return { type: "TextFamily", starts, ends, attributes: { value: ((_d = annotation.attributes) == null ? void 0 : _d.value) || "" } };
     throw new Error(`Unsupported annotation type: ${type}`);
   });
 }
@@ -2071,15 +2200,17 @@ async function resolveHypermediaUrl(url, opts) {
       const uid = await opts.domainResolver(parsedHostname);
       if (uid) {
         const pathSegments = parsedUrl.pathname.split("/").filter(Boolean);
-        const path = pathSegments.length > 0 ? pathSegments : null;
+        const profilePath = resolveProfilePath(uid, pathSegments);
+        const resolvedUid = (profilePath == null ? void 0 : profilePath.uid) || uid;
+        const path = (profilePath == null ? void 0 : profilePath.path) || (pathSegments.length > 0 ? pathSegments : null);
         const version = parsedUrl.searchParams.get("v") || null;
         const pathStr = path ? "/" + path.join("/") : "";
         const siteHostname = parsedUrl.origin;
         return {
-          id: `hm://${uid}${pathStr}`,
+          id: `hm://${resolvedUid}${pathStr}`,
           hmId: {
-            id: `hm://${uid}${pathStr}`,
-            uid,
+            id: `hm://${resolvedUid}${pathStr}`,
+            uid: resolvedUid,
             path,
             version,
             blockRef,
@@ -2159,6 +2290,13 @@ async function resolveId(input, opts) {
   }
   throw new Error(`Invalid Hypermedia ID: ${input}`);
 }
+function resolveProfilePath(siteUid, pathSegments) {
+  if (pathSegments[0] !== ":profile") return null;
+  return {
+    uid: pathSegments[1] || siteUid,
+    path: [":profile"]
+  };
+}
 
 // src/file-to-ipfs.ts
 import { MemoryBlockstore } from "blockstore-core/memory";
@@ -3412,85 +3550,6 @@ function generateBlockId5() {
   return id;
 }
 
-// src/unicode.ts
-var AnnotationSet = class {
-  annotations;
-  constructor() {
-    this.annotations = /* @__PURE__ */ new Map();
-  }
-  addSpan(type, attributes, start, end) {
-    const id = this._annotationId(type, attributes);
-    let annotation = this.annotations.get(id);
-    if (!annotation) {
-      const annAttrs = attributes ? { ...attributes } : {};
-      let link;
-      if (type == "Link" || type == "Embed") {
-        link = attributes == null ? void 0 : attributes.link;
-        delete annAttrs.link;
-      }
-      annotation = {
-        type,
-        attributes: annAttrs,
-        link: link || "",
-        starts: [],
-        ends: []
-      };
-      this.annotations.set(id, annotation);
-    }
-    addSpanToAnnotation(annotation, start, end);
-  }
-  _annotationId(type, attributes) {
-    if (attributes) {
-      if (attributes.link) {
-        return `${type}-${attributes.link}`;
-      }
-      if (attributes.href) {
-        return `${type}-${attributes.href}`;
-      }
-      if (attributes.color) {
-        return `${type}-${attributes.color}`;
-      }
-    }
-    return type;
-  }
-  list() {
-    const keys = Array.from(this.annotations.keys()).sort();
-    let out = new Array(keys.length);
-    for (let i in keys) {
-      const annotation = this.annotations.get(keys[i]);
-      if (annotation) out[i] = annotation;
-    }
-    out = out.sort((a, b) => {
-      let startA = a.starts[0];
-      let startB = b.starts[0];
-      return (startA || 0) - (startB || 0);
-    });
-    return out;
-  }
-};
-function addSpanToAnnotation(annotation, start, end) {
-  if (!annotation.starts) {
-    annotation.starts = [];
-  }
-  if (!annotation.ends) {
-    annotation.ends = [];
-  }
-  if (annotation.starts.length == 0) {
-    pushSpanToAnnotation(annotation, start, end);
-    return;
-  }
-  const lastIdx = annotation.starts.length - 1;
-  if (annotation.ends[lastIdx] == start) {
-    annotation.ends[lastIdx] = end;
-    return;
-  }
-  pushSpanToAnnotation(annotation, start, end);
-}
-function pushSpanToAnnotation(annotation, start, end) {
-  annotation.starts.push(start);
-  annotation.ends.push(end);
-}
-
 // src/editorblock-to-hmblock.ts
 function toHMBlockType(editorBlockType) {
   if (editorBlockType === "heading") return "Heading";
@@ -3514,7 +3573,7 @@ function toImageWidthNumber(width) {
   return toNumber(width);
 }
 function editorBlockToHMBlock(editorBlock) {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   const blockType = toHMBlockType(editorBlock.type);
   if (!blockType) throw new Error("Unsupported block type " + editorBlock.type);
   let block = {
@@ -3570,10 +3629,16 @@ function editorBlockToHMBlock(editorBlock) {
       annotations.addSpan("Link", { link: leaf.href }, start, end);
     }
     if ((_g = leaf.styles) == null ? void 0 : _g.textColor) {
-      annotations.addSpan("TextColor", { color: leaf.styles.textColor }, start, end);
+      annotations.addSpan("TextColor", { value: leaf.styles.textColor }, start, end);
     }
     if ((_h = leaf.styles) == null ? void 0 : _h.backgroundColor) {
-      annotations.addSpan("BackgroundColor", { color: leaf.styles.backgroundColor }, start, end);
+      annotations.addSpan("BackgroundColor", { value: leaf.styles.backgroundColor }, start, end);
+    }
+    if ((_i = leaf.styles) == null ? void 0 : _i.textSize) {
+      annotations.addSpan("TextSize", { value: leaf.styles.textSize }, start, end);
+    }
+    if ((_j = leaf.styles) == null ? void 0 : _j.textFamily) {
+      annotations.addSpan("TextFamily", { value: leaf.styles.textFamily }, start, end);
     }
     block.text += leaf.text;
     pos += charCount;
@@ -3912,7 +3977,7 @@ function hmBlockToEditorBlock(block) {
     i += codeUnits;
   }
   function startLeaf(posAnnotations) {
-    var _a2, _b2;
+    var _a2, _b2, _c2, _d2;
     const newLeaf = {
       type: "text",
       text: "",
@@ -3939,19 +4004,33 @@ function hmBlockToEditorBlock(block) {
         newLeaf.styles[styleKey] = true;
       }
       if (annotationData.type === "TextColor") {
-        const color = (_a2 = annotationData.attributes) == null ? void 0 : _a2.color;
+        const color = (_a2 = annotationData.attributes) == null ? void 0 : _a2.value;
         if (typeof color === "string" && color) {
           ;
           newLeaf.styles.textColor = color;
         }
       }
       if (annotationData.type === "BackgroundColor") {
-        const color = (_b2 = annotationData.attributes) == null ? void 0 : _b2.color;
+        const color = (_b2 = annotationData.attributes) == null ? void 0 : _b2.value;
         if (typeof color === "string" && color) {
           ;
           newLeaf.styles.backgroundColor = color;
         }
       }
+      if (annotationData.type === "TextSize") {
+        const size = (_c2 = annotationData.attributes) == null ? void 0 : _c2.value;
+        if (typeof size === "string" && size) {
+          ;
+          newLeaf.styles.textSize = size;
+        }
+      }
+      if (annotationData.type === "TextFamily") {
+        const family = (_d2 = annotationData.attributes) == null ? void 0 : _d2.value;
+        if (typeof family === "string" && family) {
+          ;
+          newLeaf.styles.textFamily = family;
+        }
+      }
     }
     if (linkAnnotation) {
       if (linkAnnotation.type === "Embed") {

package/dist/unicode.d.ts

@@ -1,4 +1,4 @@
-import type { HMAnnotations } from './hm-types';
+import type { HMAnnotation, HMAnnotations } from './hm-types';
 /**
  * Mutable annotation shape used during construction.
  * Structurally compatible with HMAnnotation but uses plain objects
@@ -31,5 +31,10 @@ export declare class AnnotationSet {
 export declare function addSpanToAnnotation(annotation: SpanAnnotation, start: number, end: number): void;
 /** Push a span to an annotation without checking adjacency. */
 export declare function pushSpanToAnnotation(annotation: SpanAnnotation, start: number, end: number): void;
+/**
+ * Validate that exclusive annotations of the same type with different values
+ * do not have overlapping ranges. Throws on invalid state.
+ */
+export declare function validateExclusiveAnnotations(annotations: HMAnnotation[]): void;
 /** @deprecated Import from `@seed-hypermedia/client/hm-types` instead. */
 export { codePointLength, isSurrogate } from './hm-types';

package/package.json

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