@echovisionlab/geul-common 0.2.2 → 0.2.4

package/package.json

@@ -2,7 +2,7 @@
   "name": "@echovisionlab/geul-common",
   "description": "Shared TypeScript contracts and helpers for Geul editors, collaboration, localized content, media blocks, pages, posts, and runtime events.",
   "author": "state303 <state303@dsub.io>",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "private": false,
   "type": "module",
   "repository": {

package/src/collaboration/block-room-codec/inline-content-model.ts

@@ -0,0 +1,308 @@
+import type { JsonValue } from "@bufbuild/protobuf";
+import { fail } from "./internal.ts";
+
+export const RICH_TEXT_STYLE_KEYS = [
+  "bold",
+  "italic",
+  "underline",
+  "strike",
+  "code",
+  "textColor",
+  "backgroundColor",
+] as const;
+const styleKeys = RICH_TEXT_STYLE_KEYS;
+
+export type RichTextStyleKey = (typeof styleKeys)[number];
+
+export type StyleValue = boolean | string;
+export type Style = Partial<Record<(typeof styleKeys)[number], StyleValue>>;
+export type StyledRun = { text: string; styles: Style };
+
+interface DesiredTextGroup {
+  readonly kind: "text";
+  readonly runs: StyledRun[];
+}
+
+interface DesiredLinkGroup {
+  readonly kind: "link";
+  readonly href: string;
+  readonly runs: StyledRun[];
+}
+
+interface DesiredMathGroup {
+  readonly kind: "mathInline";
+  readonly source: string;
+}
+
+interface DesiredHardBreakGroup {
+  readonly kind: "hardBreak";
+}
+
+export type DesiredGroup =
+  | DesiredTextGroup
+  | DesiredLinkGroup
+  | DesiredMathGroup
+  | DesiredHardBreakGroup;
+
+function object(value: unknown, reason: string): Record<string, unknown> {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return fail(reason);
+  }
+  return value as Record<string, unknown>;
+}
+
+function checkedStyles(value: unknown, reason: string): Style {
+  if (value === undefined || value === null) {
+    return {};
+  }
+  const raw = object(value, reason);
+  const result: Style = {};
+  for (const key of styleKeys) {
+    const style = raw[key];
+    if (style === undefined || style === null) {
+      continue;
+    }
+    if (key === "textColor" || key === "backgroundColor") {
+      if (typeof style !== "string") {
+        return fail(`${reason}:${key}`);
+      }
+    } else if (typeof style !== "boolean") {
+      return fail(`${reason}:${key}`);
+    }
+    result[key] = style;
+  }
+  return result;
+}
+
+function normalizeStyles(value: Style): Style {
+  const result: Style = {};
+  for (const key of styleKeys) {
+    const style = value[key];
+    if (style === undefined || style === false || style === "") {
+      continue;
+    }
+    result[key] = style;
+  }
+  return result;
+}
+
+function styleKey(value: Style): string {
+  return JSON.stringify(normalizeStyles(value));
+}
+
+function appendRun(target: StyledRun[], next: StyledRun): void {
+  const previous = target[target.length - 1];
+  if (previous && styleKey(previous.styles) === styleKey(next.styles)) {
+    previous.text += next.text;
+    return;
+  }
+  target.push({ text: next.text, styles: { ...next.styles } });
+}
+
+function appendSourceRun(target: StyledRun[], next: StyledRun): void {
+  if (next.text.length > 0) {
+    target.push({ text: next.text, styles: { ...next.styles } });
+  }
+}
+
+export function styledInput(value: unknown, reason: string): StyledRun {
+  if (typeof value === "string") {
+    return { text: value, styles: {} };
+  }
+  const styled = object(value, reason);
+  if (typeof styled.text !== "string") {
+    return fail(`${reason}:text`);
+  }
+  return {
+    text: styled.text,
+    styles: checkedStyles(styled.styles, `${reason}:styles`),
+  };
+}
+
+function inputItem(value: JsonValue, reason: string): DesiredGroup {
+  const item = object(value, reason);
+  const cases = ["text", "link", "mathInline", "hardBreak"].filter(
+    (key) => item[key] !== undefined,
+  );
+  if (cases.length !== 1) {
+    return fail(`${reason}:oneof`);
+  }
+  const selected = cases[0]!;
+  if (selected === "text") {
+    const run = styledInput(item.text, `${reason}:text`);
+    return { kind: "text", runs: run.text ? [run] : [] };
+  }
+  if (selected === "link") {
+    const link = object(item.link, `${reason}:link`);
+    if (typeof link.href !== "string" || !Array.isArray(link.content)) {
+      return fail(`${reason}:link_shape`);
+    }
+    const runs: StyledRun[] = [];
+    link.content.forEach((child, index) => {
+      appendSourceRun(
+        runs,
+        styledInput(child, `${reason}:link_content:${index}`),
+      );
+    });
+    return { kind: "link", href: link.href, runs };
+  }
+  if (selected === "mathInline") {
+    const math = object(item.mathInline, `${reason}:math`);
+    if (math.source !== undefined && typeof math.source !== "string") {
+      return fail(`${reason}:math_source`);
+    }
+    return {
+      kind: "mathInline",
+      source: (math.source as string | undefined) ?? "",
+    };
+  }
+  return { kind: "hardBreak" };
+}
+
+export function desiredGroups(values: readonly JsonValue[]): DesiredGroup[] {
+  const result: DesiredGroup[] = [];
+  values.forEach((value, index) => {
+    const group = inputItem(value, `inline_content:input:${index}`);
+    const previous = result[result.length - 1];
+    if (group.kind === "text" && previous?.kind === "text") {
+      for (const run of group.runs) {
+        appendSourceRun(previous.runs, run);
+      }
+      return;
+    }
+    if (group.kind === "text" && group.runs.length === 0) {
+      return;
+    }
+    result.push(group);
+  });
+  return result;
+}
+
+export function normalizeInlineContent(values: readonly JsonValue[]): string {
+  const normalized = desiredGroups(values).map((group) => {
+    if (group.kind === "text") {
+      const canonicalRuns: StyledRun[] = [];
+      for (const run of group.runs) {
+        appendRun(canonicalRuns, run);
+      }
+      return {
+        text: canonicalRuns.map((run) => ({
+          text: run.text,
+          styles: normalizeStyles(run.styles),
+        })),
+      };
+    }
+    if (group.kind === "link") {
+      const canonicalRuns: StyledRun[] = [];
+      for (const run of group.runs) {
+        appendRun(canonicalRuns, run);
+      }
+      return {
+        link: {
+          href: group.href,
+          content: canonicalRuns.map((run) => ({
+            text: run.text,
+            styles: normalizeStyles(run.styles),
+          })),
+        },
+      };
+    }
+    if (group.kind === "mathInline") {
+      return { mathInline: { source: group.source } };
+    }
+    return { hardBreak: {} };
+  });
+  return JSON.stringify(normalized);
+}
+
+export interface StyleSpan {
+  readonly from: number;
+  readonly to: number;
+  readonly styles: Style;
+}
+
+export function styleSpans(runs: readonly StyledRun[], start = 0): StyleSpan[] {
+  const result: StyleSpan[] = [];
+  let from = start;
+  for (const run of runs) {
+    const to = from + run.text.length;
+    result.push({ from, to, styles: normalizeStyles(run.styles) });
+    from = to;
+  }
+  return result;
+}
+
+export function changedStyleAttributes(
+  before: Style,
+  after: Style,
+): Record<string, StyleValue> {
+  const current = normalizeStyles(before);
+  const desired = normalizeStyles(after);
+  const result: Record<string, StyleValue> = {};
+  for (const key of styleKeys) {
+    if (current[key] === desired[key]) {
+      continue;
+    }
+    const value = desired[key];
+    result[key] =
+      value !== undefined
+        ? value
+        : key === "textColor" || key === "backgroundColor"
+          ? ""
+          : false;
+  }
+  return result;
+}
+
+function isSurrogatePairBoundary(value: string, boundary: number): boolean {
+  if (boundary <= 0 || boundary >= value.length) {
+    return false;
+  }
+  const before = value.charCodeAt(boundary - 1);
+  const after = value.charCodeAt(boundary);
+  return (
+    before >= 0xd800 && before <= 0xdbff && after >= 0xdc00 && after <= 0xdfff
+  );
+}
+
+export function minimalDiff(
+  before: string,
+  after: string,
+): {
+  from: number;
+  oldTo: number;
+  newTo: number;
+} {
+  let from = 0;
+  while (
+    from < before.length &&
+    from < after.length &&
+    before[from] === after[from]
+  ) {
+    from += 1;
+  }
+  if (
+    isSurrogatePairBoundary(before, from) ||
+    isSurrogatePairBoundary(after, from)
+  ) {
+    from -= 1;
+  }
+  let oldTo = before.length;
+  let newTo = after.length;
+  while (
+    oldTo > from &&
+    newTo > from &&
+    before[oldTo - 1] === after[newTo - 1]
+  ) {
+    oldTo -= 1;
+    newTo -= 1;
+  }
+  if (
+    isSurrogatePairBoundary(before, oldTo) ||
+    isSurrogatePairBoundary(after, newTo)
+  ) {
+    oldTo += 1;
+    newTo += 1;
+  }
+  return { from, oldTo, newTo };
+}

package/src/collaboration/block-room-codec/inline-content-mutations.ts

@@ -14,8 +14,17 @@ import {
 import {
   fromYInlineContent,
   projectedStyledTextRuns,
-  richTextStyleKeys,
 } from "./inline-content-projection.ts";
+import {
+  changedStyleAttributes,
+  desiredGroups,
+  minimalDiff,
+  normalizeInlineContent,
+  styledInput,
+  styleSpans,
+  type DesiredGroup,
+  type StyledRun,
+} from "./inline-content-model.ts";
 import {
   nodeKind,
   payloadArray,
@@ -32,12 +41,6 @@ type RichTextCatalogEntry = {
 const richTextCatalog = richTextBlockCatalog as Readonly<
   Record<string, RichTextCatalogEntry>
 >;
-const styleKeys = richTextStyleKeys();
-
-type StyleValue = boolean | string;
-type Style = Partial<Record<(typeof styleKeys)[number], StyleValue>>;
-type StyledRun = { text: string; styles: Style };
-
 interface RawTextSegment {
   text?: Y.Text;
   readonly styledText: Y.Map<unknown>;
@@ -75,39 +78,6 @@ interface RawHardBreakGroup {
 
 type RawGroup = RawTextGroup | RawLinkGroup | RawMathGroup | RawHardBreakGroup;
 
-interface DesiredTextGroup {
-  readonly kind: "text";
-  readonly runs: StyledRun[];
-}
-
-interface DesiredLinkGroup {
-  readonly kind: "link";
-  readonly href: string;
-  readonly runs: StyledRun[];
-}
-
-interface DesiredMathGroup {
-  readonly kind: "mathInline";
-  readonly source: string;
-}
-
-interface DesiredHardBreakGroup {
-  readonly kind: "hardBreak";
-}
-
-type DesiredGroup =
-  | DesiredTextGroup
-  | DesiredLinkGroup
-  | DesiredMathGroup
-  | DesiredHardBreakGroup;
-
-function object(value: unknown, reason: string): Record<string, unknown> {
-  if (!value || typeof value !== "object" || Array.isArray(value)) {
-    return fail(reason);
-  }
-  return value as Record<string, unknown>;
-}
-
 function yMap(value: unknown, reason: string): Y.Map<unknown> {
   if (!(value instanceof Y.Map)) {
     return fail(reason);
@@ -115,170 +85,6 @@ function yMap(value: unknown, reason: string): Y.Map<unknown> {
   return value;
 }
 
-function checkedStyles(value: unknown, reason: string): Style {
-  if (value === undefined || value === null) {
-    return {};
-  }
-  const raw = object(value, reason);
-  const result: Style = {};
-  for (const key of styleKeys) {
-    const style = raw[key];
-    if (style === undefined || style === null) {
-      continue;
-    }
-    if (key === "textColor" || key === "backgroundColor") {
-      if (typeof style !== "string") {
-        return fail(`${reason}:${key}`);
-      }
-    } else if (typeof style !== "boolean") {
-      return fail(`${reason}:${key}`);
-    }
-    result[key] = style;
-  }
-  return result;
-}
-
-function normalizeStyles(value: Style): Style {
-  const result: Style = {};
-  for (const key of styleKeys) {
-    const style = value[key];
-    if (style === undefined || style === false || style === "") {
-      continue;
-    }
-    result[key] = style;
-  }
-  return result;
-}
-
-function styleKey(value: Style): string {
-  return JSON.stringify(normalizeStyles(value));
-}
-
-function appendRun(target: StyledRun[], next: StyledRun): void {
-  const previous = target[target.length - 1];
-  if (previous && styleKey(previous.styles) === styleKey(next.styles)) {
-    previous.text += next.text;
-    return;
-  }
-  target.push({ text: next.text, styles: { ...next.styles } });
-}
-
-function appendSourceRun(target: StyledRun[], next: StyledRun): void {
-  if (next.text.length > 0) {
-    target.push({ text: next.text, styles: { ...next.styles } });
-  }
-}
-
-function styledInput(value: unknown, reason: string): StyledRun {
-  if (typeof value === "string") {
-    return { text: value, styles: {} };
-  }
-  const styled = object(value, reason);
-  if (typeof styled.text !== "string") {
-    return fail(`${reason}:text`);
-  }
-  return {
-    text: styled.text,
-    styles: checkedStyles(styled.styles, `${reason}:styles`),
-  };
-}
-
-function inputItem(value: JsonValue, reason: string): DesiredGroup {
-  const item = object(value, reason);
-  const cases = ["text", "link", "mathInline", "hardBreak"].filter(
-    (key) => item[key] !== undefined,
-  );
-  if (cases.length !== 1) {
-    return fail(`${reason}:oneof`);
-  }
-  const selected = cases[0]!;
-  if (selected === "text") {
-    const run = styledInput(item.text, `${reason}:text`);
-    return { kind: "text", runs: run.text ? [run] : [] };
-  }
-  if (selected === "link") {
-    const link = object(item.link, `${reason}:link`);
-    if (typeof link.href !== "string" || !Array.isArray(link.content)) {
-      return fail(`${reason}:link_shape`);
-    }
-    const runs: StyledRun[] = [];
-    link.content.forEach((child, index) => {
-      appendSourceRun(
-        runs,
-        styledInput(child, `${reason}:link_content:${index}`),
-      );
-    });
-    return { kind: "link", href: link.href, runs };
-  }
-  if (selected === "mathInline") {
-    const math = object(item.mathInline, `${reason}:math`);
-    if (math.source !== undefined && typeof math.source !== "string") {
-      return fail(`${reason}:math_source`);
-    }
-    return {
-      kind: "mathInline",
-      source: (math.source as string | undefined) ?? "",
-    };
-  }
-  return { kind: "hardBreak" };
-}
-
-function desiredGroups(values: readonly JsonValue[]): DesiredGroup[] {
-  const result: DesiredGroup[] = [];
-  values.forEach((value, index) => {
-    const group = inputItem(value, `inline_content:input:${index}`);
-    const previous = result[result.length - 1];
-    if (group.kind === "text" && previous?.kind === "text") {
-      for (const run of group.runs) {
-        appendSourceRun(previous.runs, run);
-      }
-      return;
-    }
-    if (group.kind === "text" && group.runs.length === 0) {
-      return;
-    }
-    result.push(group);
-  });
-  return result;
-}
-
-function normalizeInlineContent(values: readonly JsonValue[]): string {
-  const normalized = desiredGroups(values).map((group) => {
-    if (group.kind === "text") {
-      const canonicalRuns: StyledRun[] = [];
-      for (const run of group.runs) {
-        appendRun(canonicalRuns, run);
-      }
-      return {
-        text: canonicalRuns.map((run) => ({
-          text: run.text,
-          styles: normalizeStyles(run.styles),
-        })),
-      };
-    }
-    if (group.kind === "link") {
-      const canonicalRuns: StyledRun[] = [];
-      for (const run of group.runs) {
-        appendRun(canonicalRuns, run);
-      }
-      return {
-        link: {
-          href: group.href,
-          content: canonicalRuns.map((run) => ({
-            text: run.text,
-            styles: normalizeStyles(run.styles),
-          })),
-        },
-      };
-    }
-    if (group.kind === "mathInline") {
-      return { mathInline: { source: group.source } };
-    }
-    return { hardBreak: {} };
-  });
-  return JSON.stringify(normalized);
-}
-
 function rawStyledText(
   value: unknown,
   rawIndex: number,
@@ -374,74 +180,6 @@ function rawGroupKind(group: RawGroup): DesiredGroup["kind"] {
   return group.kind;
 }
 
-interface StyleSpan {
-  readonly from: number;
-  readonly to: number;
-  readonly styles: Style;
-}
-
-function styleSpans(runs: readonly StyledRun[], start = 0): StyleSpan[] {
-  const result: StyleSpan[] = [];
-  let from = start;
-  for (const run of runs) {
-    const to = from + run.text.length;
-    result.push({ from, to, styles: normalizeStyles(run.styles) });
-    from = to;
-  }
-  return result;
-}
-
-function changedStyleAttributes(
-  before: Style,
-  after: Style,
-): Record<string, StyleValue> {
-  const current = normalizeStyles(before);
-  const desired = normalizeStyles(after);
-  const result: Record<string, StyleValue> = {};
-  for (const key of styleKeys) {
-    if (current[key] === desired[key]) {
-      continue;
-    }
-    const value = desired[key];
-    result[key] =
-      value !== undefined
-        ? value
-        : key === "textColor" || key === "backgroundColor"
-          ? ""
-          : false;
-  }
-  return result;
-}
-
-function minimalDiff(
-  before: string,
-  after: string,
-): {
-  from: number;
-  oldTo: number;
-  newTo: number;
-} {
-  let from = 0;
-  while (
-    from < before.length &&
-    from < after.length &&
-    before[from] === after[from]
-  ) {
-    from += 1;
-  }
-  let oldTo = before.length;
-  let newTo = after.length;
-  while (
-    oldTo > from &&
-    newTo > from &&
-    before[oldTo - 1] === after[newTo - 1]
-  ) {
-    oldTo -= 1;
-    newTo -= 1;
-  }
-  return { from, oldTo, newTo };
-}
-
 function segmentText(segment: RawTextSegment): string {
   return segment.text?.toString() ?? "";
 }
@@ -621,7 +359,9 @@ function reconcileRawGroup(
     return;
   }
   if (raw.kind === "link" && desired.kind === "link") {
-    raw.link.set("href", desired.href);
+    if (raw.link.get("href") !== desired.href) {
+      raw.link.set("href", desired.href);
+    }
     const content = raw.content ?? new Y.Array<unknown>();
     if (!raw.content && desired.runs.some((run) => run.text.length > 0)) {
       raw.link.set("content", content);

package/src/collaboration/block-room-codec/inline-content-projection.ts

@@ -12,17 +12,10 @@ import {
   type JsonObject,
 } from "./internal.ts";
 
-const RICH_TEXT_STYLE_KEYS = [
-  "bold",
-  "italic",
-  "underline",
-  "strike",
-  "code",
-  "textColor",
-  "backgroundColor",
-] as const;
-
-type RichTextStyleKey = (typeof RICH_TEXT_STYLE_KEYS)[number];
+import {
+  RICH_TEXT_STYLE_KEYS,
+  type RichTextStyleKey,
+} from "./inline-content-model.ts";
 type RichTextStyleValue = boolean | string;
 type RichTextStyle = Partial<Record<RichTextStyleKey, RichTextStyleValue>>;
 type ProjectedTextRun = JsonObject & { text: string };
@@ -167,9 +160,13 @@ function projectedTextField(
       return fail(`${reason}:embed`);
     }
     const item: ProjectedTextRun = { text: operation.insert };
-    const style = jsonStyle(mergedTextStyle(legacyStyle, operation.attributes));
-    if (style) {
-      item.styles = style;
+    if (operation.attributes !== undefined || styleValue !== undefined) {
+      const style = jsonStyle(
+        mergedTextStyle(legacyStyle, operation.attributes),
+      );
+      if (style) {
+        item.styles = style;
+      }
     }
     appendProjectedText(result, item);
   }
@@ -347,13 +344,12 @@ export function fromYRichTextBlockPayload(
       "inline_content:payload_json",
     ) as JsonValue;
   }
-  const payload = Object.fromEntries(value.entries());
   const projected = decodeOtherFields(
     value,
     "content",
     "inline_content:payload_json",
   );
-  const rawContent = payload.content;
+  const rawContent = value.get("content");
   if (rawContent === undefined) {
     return projected as JsonValue;
   }
@@ -366,10 +362,6 @@ export function fromYRichTextBlockPayload(
   return projected as JsonValue;
 }
 
-export function richTextStyleKeys(): readonly RichTextStyleKey[] {
-  return RICH_TEXT_STYLE_KEYS;
-}
-
 export function projectedStyledTextRuns(
   value: unknown,
   reason = "inline_content:styled_text",