superdoc 2.18.0 → 2.18.1-next.2

package/dist/chunks/{create-super-doc-ui-wKzxrztu.es.js → create-super-doc-ui-B-Zlfpi_.es.js}

@@ -1660,9 +1660,12 @@ function collectEntityHitsFromChain(start, stopAt) {
 	const hits = [];
 	const seen = /* @__PURE__ */ new Set();
 	let pendingStory = [];
+	let nearestStoryKey = null;
+	let nearestLayoutStory = null;
 	let el = start;
 	while (el) {
 		const node = el;
+		nearestStoryKey ??= node.getAttribute("data-story-key");
 		const trackChangeIds = getTrackChangeIds(node);
 		const storyKey = trackChangeIds.length > 0 ? node.getAttribute("data-story-key") : null;
 		for (const trackChangeId of trackChangeIds) {
@@ -1679,6 +1682,7 @@ function collectEntityHitsFromChain(start, stopAt) {
 			}
 		}
 		const layoutStory = node.getAttribute("data-layout-story");
+		nearestLayoutStory ??= layoutStory;
 		if (layoutStory && pendingStory.length > 0) {
 			for (const hit of pendingStory) hit.story = layoutStory;
 			pendingStory = [];
@@ -1717,6 +1721,9 @@ function collectEntityHitsFromChain(start, stopAt) {
 					type: "contentControl",
 					id: sdtId
 				};
+				if (nearestStoryKey) hit.storyKey = nearestStoryKey;
+				if (nearestLayoutStory) hit.story = nearestLayoutStory;
+				else pendingStory.push(hit);
 				if (scopeAttr === "block" || scopeAttr === "inline") hit.scope = scopeAttr;
 				if (tag) hit.tag = tag;
 				hits.push(hit);
@@ -2699,6 +2706,11 @@ function layoutStoryDatasetToStoryLocator(raw) {
 			storyType: "headerFooterPart",
 			refId: decoded.id
 		} : void 0;
+		case "textbox": return decoded.id ? {
+			kind: "story",
+			storyType: "textbox",
+			textboxId: decoded.id
+		} : void 0;
 		default: return;
 	}
 }
@@ -10619,10 +10631,18 @@ function createSuperDocUI(options) {
 		const hits = [];
 		for (const hit of rawHits) {
 			if (hit.type !== "trackedChange") {
-				const key = `${hit.type}:${hit.id}`;
+				const layoutStory = hit.type === "contentControl" ? layoutStoryDatasetToStoryLocator(hit.story) : void 0;
+				const story = hit.type === "contentControl" ? isTextboxStory(layoutStory) ? layoutStory : storyKeyToStoryLocator(hit.storyKey) ?? layoutStory : void 0;
+				const key = `${hit.type}:${hit.id}:${JSON.stringify(story ?? null)}`;
 				if (seen.has(key)) continue;
 				seen.add(key);
-				hits.push(hit);
+				if (hit.type === "contentControl") {
+					const { storyKey: _storyKey, story: _paintedStory, ...publicHit } = hit;
+					hits.push(story ? {
+						...publicHit,
+						story
+					} : publicHit);
+				} else hits.push(hit);
 				continue;
 			}
 			const story = storyKeyToStoryLocator(hit.storyKey) ?? layoutStoryDatasetToStoryLocator(hit.story);
@@ -10828,20 +10848,25 @@ function createSuperDocUI(options) {
 		return target && typeof target === "object" ? target : null;
 	};
 	const metadataResolveKey = (id) => `metadata:resolve:${id}`;
+	const metadataResolutionToken = () => {
+		const host = getHost();
+		const localRevision = typeof host?.getLocalMutationRevision === "function" ? safeCall(() => host.getLocalMutationRevision(), null) : null;
+		return `${contentToken()}|local:${typeof localRevision === "number" ? localRevision : "unknown"}`;
+	};
 	/** Resolve a metadata id to its SelectionTarget, or null when unresolved. */
 	const resolveMetadataTarget = (id) => {
 		const metaApi = getDoc()?.metadata;
 		if (!metaApi || typeof metaApi.resolve !== "function") return null;
-		const { value } = readAsync(metadataResolveKey(id), contentToken(), () => metaApi.resolve({ id }), readMetadataResolvedTarget);
-		return value;
+		const { value, status } = readAsync(metadataResolveKey(id), metadataResolutionToken(), () => metaApi.resolve({ id }), readMetadataResolvedTarget);
+		return status === "ready" ? value : null;
 	};
 	const resolveMetadataTargetAsync = async (id) => {
 		const metaApi = getDoc()?.metadata;
 		if (!metaApi || typeof metaApi.resolve !== "function") return null;
 		try {
-			const token = contentToken();
+			const token = metadataResolutionToken();
 			const resolved = await Promise.resolve(metaApi.resolve({ id }));
-			if (token !== contentToken()) return null;
+			if (token !== metadataResolutionToken()) return null;
 			const target = readMetadataResolvedTarget(resolved);
 			asyncReads.set(metadataResolveKey(id), {
 				token,

package/dist/chunks/{create-super-doc-ui-wDvhW9Tz.cjs → create-super-doc-ui-DpNGRfzi.cjs}

@@ -1660,9 +1660,12 @@ function collectEntityHitsFromChain(start, stopAt) {
 	const hits = [];
 	const seen = /* @__PURE__ */ new Set();
 	let pendingStory = [];
+	let nearestStoryKey = null;
+	let nearestLayoutStory = null;
 	let el = start;
 	while (el) {
 		const node = el;
+		nearestStoryKey ??= node.getAttribute("data-story-key");
 		const trackChangeIds = getTrackChangeIds(node);
 		const storyKey = trackChangeIds.length > 0 ? node.getAttribute("data-story-key") : null;
 		for (const trackChangeId of trackChangeIds) {
@@ -1679,6 +1682,7 @@ function collectEntityHitsFromChain(start, stopAt) {
 			}
 		}
 		const layoutStory = node.getAttribute("data-layout-story");
+		nearestLayoutStory ??= layoutStory;
 		if (layoutStory && pendingStory.length > 0) {
 			for (const hit of pendingStory) hit.story = layoutStory;
 			pendingStory = [];
@@ -1717,6 +1721,9 @@ function collectEntityHitsFromChain(start, stopAt) {
 					type: "contentControl",
 					id: sdtId
 				};
+				if (nearestStoryKey) hit.storyKey = nearestStoryKey;
+				if (nearestLayoutStory) hit.story = nearestLayoutStory;
+				else pendingStory.push(hit);
 				if (scopeAttr === "block" || scopeAttr === "inline") hit.scope = scopeAttr;
 				if (tag) hit.tag = tag;
 				hits.push(hit);
@@ -2699,6 +2706,11 @@ function layoutStoryDatasetToStoryLocator(raw) {
 			storyType: "headerFooterPart",
 			refId: decoded.id
 		} : void 0;
+		case "textbox": return decoded.id ? {
+			kind: "story",
+			storyType: "textbox",
+			textboxId: decoded.id
+		} : void 0;
 		default: return;
 	}
 }
@@ -10619,10 +10631,18 @@ function createSuperDocUI(options) {
 		const hits = [];
 		for (const hit of rawHits) {
 			if (hit.type !== "trackedChange") {
-				const key = `${hit.type}:${hit.id}`;
+				const layoutStory = hit.type === "contentControl" ? layoutStoryDatasetToStoryLocator(hit.story) : void 0;
+				const story = hit.type === "contentControl" ? isTextboxStory(layoutStory) ? layoutStory : storyKeyToStoryLocator(hit.storyKey) ?? layoutStory : void 0;
+				const key = `${hit.type}:${hit.id}:${JSON.stringify(story ?? null)}`;
 				if (seen.has(key)) continue;
 				seen.add(key);
-				hits.push(hit);
+				if (hit.type === "contentControl") {
+					const { storyKey: _storyKey, story: _paintedStory, ...publicHit } = hit;
+					hits.push(story ? {
+						...publicHit,
+						story
+					} : publicHit);
+				} else hits.push(hit);
 				continue;
 			}
 			const story = storyKeyToStoryLocator(hit.storyKey) ?? layoutStoryDatasetToStoryLocator(hit.story);
@@ -10828,20 +10848,25 @@ function createSuperDocUI(options) {
 		return target && typeof target === "object" ? target : null;
 	};
 	const metadataResolveKey = (id) => `metadata:resolve:${id}`;
+	const metadataResolutionToken = () => {
+		const host = getHost();
+		const localRevision = typeof host?.getLocalMutationRevision === "function" ? safeCall(() => host.getLocalMutationRevision(), null) : null;
+		return `${contentToken()}|local:${typeof localRevision === "number" ? localRevision : "unknown"}`;
+	};
 	/** Resolve a metadata id to its SelectionTarget, or null when unresolved. */
 	const resolveMetadataTarget = (id) => {
 		const metaApi = getDoc()?.metadata;
 		if (!metaApi || typeof metaApi.resolve !== "function") return null;
-		const { value } = readAsync(metadataResolveKey(id), contentToken(), () => metaApi.resolve({ id }), readMetadataResolvedTarget);
-		return value;
+		const { value, status } = readAsync(metadataResolveKey(id), metadataResolutionToken(), () => metaApi.resolve({ id }), readMetadataResolvedTarget);
+		return status === "ready" ? value : null;
 	};
 	const resolveMetadataTargetAsync = async (id) => {
 		const metaApi = getDoc()?.metadata;
 		if (!metaApi || typeof metaApi.resolve !== "function") return null;
 		try {
-			const token = contentToken();
+			const token = metadataResolutionToken();
 			const resolved = await Promise.resolve(metaApi.resolve({ id }));
-			if (token !== contentToken()) return null;
+			if (token !== metadataResolutionToken()) return null;
 			const target = readMetadataResolvedTarget(resolved);
 			asyncReads.set(metadataResolveKey(id), {
 				token,

package/dist/collaboration-upgrade-engine.cjs

@@ -19,7 +19,7 @@ var COLLABORATION_UPGRADE_ENGINE_MINIMUM_NODE_MAJOR = 20;
 var PRIVATE_ENGINE_INFO = (0, _superdoc_docx_engine_collaboration_upgrade_engine.getCollaborationUpgradeEngineInfo)();
 var ENGINE_INFO = Object.freeze({
 	...PRIVATE_ENGINE_INFO,
-	superdocVersion: "2.18.0",
+	superdocVersion: "2.18.1-next.2",
 	roomSchemaVersion: Object.freeze({ ...PRIVATE_ENGINE_INFO.roomSchemaVersion }),
 	supportedBundleVersions: SUPPORTED_COLLABORATION_UPGRADE_BUNDLE_VERSIONS,
 	supportedV1ReaderContractVersions: SUPPORTED_V1_READER_CONTRACT_VERSIONS

package/dist/collaboration-upgrade-engine.es.js

@@ -18,7 +18,7 @@ var COLLABORATION_UPGRADE_ENGINE_MINIMUM_NODE_MAJOR = 20;
 var PRIVATE_ENGINE_INFO = getCollaborationUpgradeEngineInfo$1();
 var ENGINE_INFO = Object.freeze({
 	...PRIVATE_ENGINE_INFO,
-	superdocVersion: "2.18.0",
+	superdocVersion: "2.18.1-next.2",
 	roomSchemaVersion: Object.freeze({ ...PRIVATE_ENGINE_INFO.roomSchemaVersion }),
 	supportedBundleVersions: SUPPORTED_COLLABORATION_UPGRADE_BUNDLE_VERSIONS,
 	supportedV1ReaderContractVersions: SUPPORTED_V1_READER_CONTRACT_VERSIONS

package/dist/public/ui-react.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-wDvhW9Tz.cjs");
+const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-DpNGRfzi.cjs");
 const require_slice_source = require("../chunks/slice-source-CFaqq0Vo.cjs");
 let react = require("react");
 //#region src/public/ui/react.ts

package/dist/public/ui-react.es.js

@@ -1,4 +1,4 @@
-import { t as createSuperDocUI } from "../chunks/create-super-doc-ui-wKzxrztu.es.js";
+import { t as createSuperDocUI } from "../chunks/create-super-doc-ui-B-Zlfpi_.es.js";
 import { t as toSliceSource } from "../chunks/slice-source-gfOhG2MW.es.js";
 import { createContext, createElement, useCallback, useContext, useEffect, useRef, useState } from "react";
 //#region src/public/ui/react.ts

package/dist/public/ui-vue.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-wDvhW9Tz.cjs");
+const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-DpNGRfzi.cjs");
 const require_slice_source = require("../chunks/slice-source-CFaqq0Vo.cjs");
 let vue = require("vue");
 //#region src/public/ui/vue.ts

package/dist/public/ui-vue.es.js

@@ -1,4 +1,4 @@
-import { t as createSuperDocUI } from "../chunks/create-super-doc-ui-wKzxrztu.es.js";
+import { t as createSuperDocUI } from "../chunks/create-super-doc-ui-B-Zlfpi_.es.js";
 import { t as toSliceSource } from "../chunks/slice-source-gfOhG2MW.es.js";
 import { computed, inject, onScopeDispose, provide, shallowRef, toRaw, toValue, watch } from "vue";
 //#region src/public/ui/vue.ts

package/dist/public/ui.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-wDvhW9Tz.cjs");
+const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-DpNGRfzi.cjs");
 exports.BUILT_IN_COMMAND_IDS = require_create_super_doc_ui.BUILT_IN_COMMAND_IDS;
 exports.createSuperDocUI = require_create_super_doc_ui.createSuperDocUI;
 exports.shallowEqual = require_create_super_doc_ui.shallowEqual;

package/dist/public/ui.es.js

@@ -1,2 +1,2 @@
-import { i as BUILT_IN_COMMAND_IDS, s as shallowEqual, t as createSuperDocUI } from "../chunks/create-super-doc-ui-wKzxrztu.es.js";
+import { i as BUILT_IN_COMMAND_IDS, s as shallowEqual, t as createSuperDocUI } from "../chunks/create-super-doc-ui-B-Zlfpi_.es.js";
 export { BUILT_IN_COMMAND_IDS, createSuperDocUI, shallowEqual };

package/dist/superdoc/src/public/ui/types.d.ts

@@ -370,11 +370,9 @@ export interface ViewportEntityHit {
     tag?: string;
     scope?: 'block' | 'inline';
     /**
-     * Painted story locator for a tracked-change hit. Meaningful only for
-     * `type: 'trackedChange'`; absent for body-only content and for comment,
-     * content-control, and citation hits. Lets point hit-testing disambiguate a tracked-change
-     * id that repeats across stories (body, footnote, header/footer, textbox) by
-     * resolving to the occurrence actually under the point.
+     * Painted story locator for a tracked-change or content-control hit.
+     * Absent for body-only content and comment or citation hits. Disambiguates
+     * an id reused in another document story from the occurrence under the point.
      */
     story?: unknown;
 }

package/dist/superdoc.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("./chunks/rolldown-runtime-74VwNCz7.cjs");
 const require_blank_docx = require("./chunks/blank-docx-BuFAbRjs.cjs");
-const require_create_super_doc_ui = require("./chunks/create-super-doc-ui-wDvhW9Tz.cjs");
+const require_create_super_doc_ui = require("./chunks/create-super-doc-ui-DpNGRfzi.cjs");
 const require_eventemitter3 = require("./chunks/eventemitter3-C_TAnXOl.cjs");
 const require_uuid = require("./chunks/uuid-BhG0ngwk.cjs");
 const require_jszip = require("./chunks/jszip-D8mAFF-r.cjs");
@@ -316,7 +316,7 @@ var shuffleArray = (array) => {
 var DEFAULT_ENDPOINT = "https://ingest.superdoc.dev/v1/collect";
 function getSuperdocVersion() {
 	try {
-		return "2.18.0";
+		return "2.18.1-next.2";
 	} catch {
 		return "unknown";
 	}
@@ -45750,7 +45750,7 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 		this.config.colors = shuffleArray(this.config.colors);
 		this.userColorMap = /* @__PURE__ */ new Map();
 		this.colorIndex = 0;
-		this.version = "2.18.0";
+		this.version = "2.18.1-next.2";
 		this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
 		this.superdocId = config.superdocId || require_uuid.v4();
 		this.colors = this.config.colors ?? [];

package/dist/superdoc.es.js

@@ -1,6 +1,6 @@
 import { i as __toESM$2 } from "./chunks/rolldown-runtime-0pSA04fp.es.js";
 import { t as blank_default } from "./chunks/blank-docx-DzQccOlW.es.js";
-import { a as applyV2CommentInvalidationFromMutation, c as DOM_CLASS_NAMES, d as recordInteraction, l as closeInteractionHistory, n as executeFirstPartyCommandAsync, o as getV2TrackedChangeMutationImpact, r as registerFirstPartyCommandMutation, t as createSuperDocUI, u as createInteractionHistory } from "./chunks/create-super-doc-ui-wKzxrztu.es.js";
+import { a as applyV2CommentInvalidationFromMutation, c as DOM_CLASS_NAMES, d as recordInteraction, l as closeInteractionHistory, n as executeFirstPartyCommandAsync, o as getV2TrackedChangeMutationImpact, r as registerFirstPartyCommandMutation, t as createSuperDocUI, u as createInteractionHistory } from "./chunks/create-super-doc-ui-B-Zlfpi_.es.js";
 import { t as import_eventemitter3 } from "./chunks/eventemitter3-DEIiXiH2.es.js";
 import { t as v4 } from "./chunks/uuid-H0Xcmmhy.es.js";
 import { a as init_dist$1, i as global, n as init_dist$2, o as Buffer, r as process$1, s as init_dist, t as require_jszip_min } from "./chunks/jszip-BzJ3CyxR.es.js";
@@ -315,7 +315,7 @@ var shuffleArray = (array) => {
 var DEFAULT_ENDPOINT = "https://ingest.superdoc.dev/v1/collect";
 function getSuperdocVersion() {
 	try {
-		return "2.18.0";
+		return "2.18.1-next.2";
 	} catch {
 		return "unknown";
 	}
@@ -45681,7 +45681,7 @@ var SuperDoc = class extends import_eventemitter3.default {
 		this.config.colors = shuffleArray(this.config.colors);
 		this.userColorMap = /* @__PURE__ */ new Map();
 		this.colorIndex = 0;
-		this.version = "2.18.0";
+		this.version = "2.18.1-next.2";
 		this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
 		this.superdocId = config.superdocId || v4();
 		this.colors = this.config.colors ?? [];