@inkbar/core 0.2.0 → 0.3.0

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { $ as NoteAnnotation, A as summarise, At as multiplyMatrix, B as AnnotationInput, Bt as unionRects, C as createAnnotationStore, Ct as Matrix, D as importEmbeddedPage, Dt as applyMatrix, E as SUPPORTED_SUBTYPES, Et as Rect, F as ANNOTATION_FORMAT, Ft as rectFromPoints, G as ForeignAnnotation, H as AnnotationSchema, I as ANNOTATION_VERSION, It as rectFromQuad, J as InkAnnotation, K as FreeTextAnnotation, L as Annotation, Lt as rectsIntersect, M as cssVariableDefaults, Mt as quadFromRect, N as normalizeColor, Nt as quadsFromFlat, O as importedId, Ot as approxEqual, P as staticDefaults, Pt as rectContainsPoint, Q as LineSchema, R as AnnotationDocument, Rt as translateQuad, S as StoreOptions, St as PdfAssets, T as EmbeddedSummary, Tt as Quad, U as AnnotationType, V as AnnotationOfType, W as ConfidenceBucket, X as LineAnnotation, Y as InkSchema, Z as LineEndingSchema, _ as History, _t as derived, a as OpenOptions, at as RectSchema, b as AnnotationStore, bt as PageInfo, c as TextItem, ct as ShapeAnnotation, d as InkErrorCode, dt as SuggestionSchema, et as NoteSchema, f as isInkError, ft as TextMarkupAnnotation, g as importAnnotations, gt as Writable, h as exportAnnotations, ht as Readable, i as InkStatus, it as QuadSchema, j as AnnotationDefaults, jt as pointsFromFlat, k as pdfColorToHex, kt as invertMatrix, l as DocumentSource, lt as ShapeSchema, m as ImportResult, mt as confidenceBucket, n as DocumentStatus, nt as PolyAnnotation, o as openDocument, ot as RedactAnnotation, p as ImportOptions, pt as TextMarkupSchema, q as FreeTextSchema, r as InkDocument, rt as PolySchema, s as TextContent, st as RedactSchema, t as DocumentInfo, tt as PointSchema, u as InkError, ut as Suggestion, v as createHistory, vt as readonly, w as deriveRect, wt as Point, x as StoreMode, xt as PageRotation, y as AnnotationChange, yt as writable, z as AnnotationDocumentSchema, zt as translateRect } from "./document-Cywnv8Sz.mjs";
+import { $ as LineEndingSchema, A as summarise, At as approxEqual, B as AnnotationInput, Bt as translateQuad, C as createAnnotationStore, Ct as PageRotation, D as importEmbeddedPage, Dt as Quad, E as SUPPORTED_SUBTYPES, Et as Point, F as ANNOTATION_FORMAT, Ft as quadsFromFlat, G as ExportedAnnotation, H as AnnotationSchema, Ht as unionRects, I as ANNOTATION_VERSION, It as rectContainsPoint, J as FreeTextAnnotation, K as ExportedAnnotationSchema, L as Annotation, Lt as rectFromPoints, M as cssVariableDefaults, Mt as multiplyMatrix, N as normalizeColor, Nt as pointsFromFlat, O as importedId, Ot as Rect, P as staticDefaults, Pt as quadFromRect, Q as LineAnnotation, R as AnnotationDocument, Rt as rectFromQuad, S as StoreOptions, St as PageInfo, T as EmbeddedSummary, Tt as Matrix, U as AnnotationType, V as AnnotationOfType, Vt as translateRect, W as ConfidenceBucket, X as InkAnnotation, Y as FreeTextSchema, Z as InkSchema, _ as History, _t as Readable, a as OpenOptions, at as PolySchema, b as AnnotationStore, bt as readonly, c as TextItem, ct as RedactAnnotation, d as InkErrorCode, dt as ShapeSchema, et as LineSchema, f as isInkError, ft as Suggestion, g as importAnnotations, gt as confidenceBucket, h as exportAnnotations, ht as TextMarkupSchema, i as InkStatus, it as PolyAnnotation, j as AnnotationDefaults, jt as invertMatrix, k as pdfColorToHex, kt as applyMatrix, l as DocumentSource, lt as RedactSchema, m as ImportResult, mt as TextMarkupAnnotation, n as DocumentStatus, nt as NoteSchema, o as openDocument, ot as QuadSchema, p as ImportOptions, pt as SuggestionSchema, q as ForeignAnnotation, r as InkDocument, rt as PointSchema, s as TextContent, st as RectSchema, t as DocumentInfo, tt as NoteAnnotation, u as InkError, ut as ShapeAnnotation, v as createHistory, vt as Writable, w as deriveRect, wt as PdfAssets, x as StoreMode, xt as writable, y as AnnotationChange, yt as derived, z as AnnotationDocumentSchema, zt as rectsIntersect } from "./document-BftlPZKU.mjs";
 //#region src/model/events.d.ts
 export type Listener<T> = (payload: T) => void;
 export declare class Emitter<Events extends Record<string, unknown>> {
@@ -95,5 +95,5 @@ export declare function parsePdfDate(value: string | null | undefined, fallback:
 /** The @inkbar/core version, from its package.json. */
 export declare const version: string;
 //#endregion
-export { ANNOTATION_FORMAT, ANNOTATION_VERSION, Annotation, AnnotationChange, AnnotationDefaults, AnnotationDocument, AnnotationDocumentSchema, AnnotationInput, AnnotationOfType, AnnotationSchema, AnnotationStore, AnnotationType, ConfidenceBucket, type DocumentInfo, type DocumentSource, type DocumentStatus, EmbeddedSummary, ForeignAnnotation, FreeTextAnnotation, FreeTextSchema, History, type ImportOptions, type ImportResult, InkAnnotation, type InkDocument, InkError, InkErrorCode, InkSchema, type InkStatus, LineAnnotation, LineEndingSchema, LineSchema, Matrix, NoteAnnotation, NoteSchema, type OpenOptions, type PageInfo, type PageRotation, type PdfAssets, Point, PointSchema, PolyAnnotation, PolySchema, Quad, QuadSchema, Readable, Rect, RectSchema, RedactAnnotation, RedactSchema, SUPPORTED_SUBTYPES, ShapeAnnotation, ShapeSchema, type SnapshotHistory, type SnapshotHistoryOptions, StoreMode, StoreOptions, Suggestion, SuggestionSchema, type TextContent, type TextItem, TextMarkupAnnotation, TextMarkupSchema, Writable, applyMatrix, approxEqual, confidenceBucket, createAnnotationStore, createHistory, cssVariableDefaults, deriveRect, derived, exportAnnotations, importAnnotations, importEmbeddedPage, importedId, invertMatrix, isInkError, multiplyMatrix, normalizeColor, openDocument, pdfColorToHex, pointsFromFlat, quadFromRect, quadsFromFlat, readonly, rectContainsPoint, rectFromPoints, rectFromQuad, rectsIntersect, staticDefaults, summarise, translateQuad, translateRect, unionRects, writable };
+export { ANNOTATION_FORMAT, ANNOTATION_VERSION, Annotation, AnnotationChange, AnnotationDefaults, AnnotationDocument, AnnotationDocumentSchema, AnnotationInput, AnnotationOfType, AnnotationSchema, AnnotationStore, AnnotationType, ConfidenceBucket, type DocumentInfo, type DocumentSource, type DocumentStatus, EmbeddedSummary, ExportedAnnotation, ExportedAnnotationSchema, ForeignAnnotation, FreeTextAnnotation, FreeTextSchema, History, type ImportOptions, type ImportResult, InkAnnotation, type InkDocument, InkError, InkErrorCode, InkSchema, type InkStatus, LineAnnotation, LineEndingSchema, LineSchema, Matrix, NoteAnnotation, NoteSchema, type OpenOptions, type PageInfo, type PageRotation, type PdfAssets, Point, PointSchema, PolyAnnotation, PolySchema, Quad, QuadSchema, Readable, Rect, RectSchema, RedactAnnotation, RedactSchema, SUPPORTED_SUBTYPES, ShapeAnnotation, ShapeSchema, type SnapshotHistory, type SnapshotHistoryOptions, StoreMode, StoreOptions, Suggestion, SuggestionSchema, type TextContent, type TextItem, TextMarkupAnnotation, TextMarkupSchema, Writable, applyMatrix, approxEqual, confidenceBucket, createAnnotationStore, createHistory, cssVariableDefaults, deriveRect, derived, exportAnnotations, importAnnotations, importEmbeddedPage, importedId, invertMatrix, isInkError, multiplyMatrix, normalizeColor, openDocument, pdfColorToHex, pointsFromFlat, quadFromRect, quadsFromFlat, readonly, rectContainsPoint, rectFromPoints, rectFromQuad, rectsIntersect, staticDefaults, summarise, translateQuad, translateRect, unionRects, writable };
 //# sourceMappingURL=index.d.mts.map

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { $ as rectFromQuad, A as RectSchema, B as mergeLineRects, C as InkSchema, D as PointSchema, E as NoteSchema, F as confidenceBucket, G as approxEqual, H as readonly, I as parsePdfDate, J as pointsFromFlat, K as invertMatrix, L as cssVariableDefaults, M as ShapeSchema, N as SuggestionSchema, O as PolySchema, P as TextMarkupSchema, Q as rectFromPoints, R as normalizeColor, S as FreeTextSchema, T as LineSchema, U as writable, V as derived, W as applyMatrix, X as quadsFromFlat, Y as quadFromRect, Z as rectContainsPoint, _ as summarise, a as acceptSuggestion, at as InkError, b as AnnotationDocumentSchema, c as deriveRect, d as createHistory, et as rectsIntersect, f as isProduction, g as pdfColorToHex, h as importedId, i as threadRoot, it as Emitter, j as RedactSchema, k as QuadSchema, l as exportAnnotations, m as importEmbeddedPage, n as repliesTo, nt as translateRect, o as openDocument, ot as isInkError, p as SUPPORTED_SUBTYPES, q as multiplyMatrix, r as threadOf, rt as unionRects, s as createAnnotationStore, t as isAbandonedNote, tt as translateQuad, u as importAnnotations, v as ANNOTATION_FORMAT, w as LineEndingSchema, x as AnnotationSchema, y as ANNOTATION_VERSION, z as staticDefaults } from "./threads-BtvtrAhL.mjs";
+import { $ as rectFromPoints, A as QuadSchema, B as staticDefaults, C as FreeTextSchema, D as NoteSchema, E as LineSchema, F as TextMarkupSchema, G as applyMatrix, H as derived, I as confidenceBucket, J as multiplyMatrix, K as approxEqual, L as parsePdfDate, M as RedactSchema, N as ShapeSchema, O as PointSchema, P as SuggestionSchema, Q as rectContainsPoint, R as cssVariableDefaults, S as ExportedAnnotationSchema, T as LineEndingSchema, U as readonly, V as mergeLineRects, W as writable, X as quadFromRect, Y as pointsFromFlat, Z as quadsFromFlat, _ as summarise, a as acceptSuggestion, at as Emitter, b as AnnotationDocumentSchema, c as deriveRect, d as createHistory, et as rectFromQuad, f as isProduction, g as pdfColorToHex, h as importedId, i as threadRoot, it as unionRects, j as RectSchema, k as PolySchema, l as exportAnnotations, m as importEmbeddedPage, n as repliesTo, nt as translateQuad, o as openDocument, ot as InkError, p as SUPPORTED_SUBTYPES, q as invertMatrix, r as threadOf, rt as translateRect, s as createAnnotationStore, st as isInkError, t as isAbandonedNote, tt as rectsIntersect, u as importAnnotations, v as ANNOTATION_FORMAT, w as InkSchema, x as AnnotationSchema, y as ANNOTATION_VERSION, z as normalizeColor } from "./threads-2USvyGpX.mjs";
 //#region src/model/annotations/snapshot-history.ts
 function createSnapshotHistory(opts) {
 	const limit = Math.max(1, opts.limit ?? 200);
@@ -129,8 +129,8 @@ function presentKeys(o) {
 //#endregion
 //#region src/index.ts
 /** The @inkbar/core version, from its package.json. */
-const version = "0.2.0";
+const version = "0.3.0";
 //#endregion
-export { ANNOTATION_FORMAT, ANNOTATION_VERSION, AnnotationDocumentSchema, AnnotationSchema, Emitter, FreeTextSchema, InkError, InkSchema, LineEndingSchema, LineSchema, NoteSchema, PointSchema, PolySchema, QuadSchema, RectSchema, RedactSchema, SUPPORTED_SUBTYPES, ShapeSchema, SuggestionSchema, TextMarkupSchema, acceptSuggestion, applyMatrix, approxEqual, confidenceBucket, createAnnotationStore, createHistory, createSnapshotHistory, cssVariableDefaults, deriveRect, derived, exportAnnotations, importAnnotations, importEmbeddedPage, importedId, invertMatrix, isAbandonedNote, isInkError, mergeLineRects, multiplyMatrix, normalizeColor, openDocument, parsePdfDate, pdfColorToHex, pointsFromFlat, quadFromRect, quadsFromFlat, readonly, rectContainsPoint, rectFromPoints, rectFromQuad, rectsIntersect, repliesTo, staticDefaults, summarise, threadOf, threadRoot, translateQuad, translateRect, unionRects, version, writable };
+export { ANNOTATION_FORMAT, ANNOTATION_VERSION, AnnotationDocumentSchema, AnnotationSchema, Emitter, ExportedAnnotationSchema, FreeTextSchema, InkError, InkSchema, LineEndingSchema, LineSchema, NoteSchema, PointSchema, PolySchema, QuadSchema, RectSchema, RedactSchema, SUPPORTED_SUBTYPES, ShapeSchema, SuggestionSchema, TextMarkupSchema, acceptSuggestion, applyMatrix, approxEqual, confidenceBucket, createAnnotationStore, createHistory, createSnapshotHistory, cssVariableDefaults, deriveRect, derived, exportAnnotations, importAnnotations, importEmbeddedPage, importedId, invertMatrix, isAbandonedNote, isInkError, mergeLineRects, multiplyMatrix, normalizeColor, openDocument, parsePdfDate, pdfColorToHex, pointsFromFlat, quadFromRect, quadsFromFlat, readonly, rectContainsPoint, rectFromPoints, rectFromQuad, rectsIntersect, repliesTo, staticDefaults, summarise, threadOf, threadRoot, translateQuad, translateRect, unionRects, version, writable };
 
 //# sourceMappingURL=index.mjs.map

package/dist/{threads-BtvtrAhL.mjs → threads-2USvyGpX.mjs}

@@ -409,8 +409,8 @@ const COLORS = {
 	underline: "#2B5A9E",
 	strikeout: "#C0392B",
 	squiggly: "#1F7A4D",
-	note: "#F2C230",
-	freeText: "#151820",
+	text: "#F2C230",
+	freetext: "#151820",
 	square: "#C0392B",
 	circle: "#C0392B",
 	line: "#151820",
@@ -439,8 +439,8 @@ const VARIABLES = {
 	underline: "--ink-underline",
 	strikeout: "--ink-strikeout",
 	squiggly: "--ink-squiggly",
-	note: "--ink-note",
-	freeText: "--ink-free-text",
+	text: "--ink-note",
+	freetext: "--ink-free-text",
 	square: "--ink-shape",
 	circle: "--ink-shape",
 	line: "--ink-shape",
@@ -533,11 +533,13 @@ const Base = z.object({
 	contents: z.string().optional(),
 	/** Id of the parent note; replies form threads. */
 	inReplyTo: z.string().optional(),
-	createdAt: z.string(),
-	modifiedAt: z.string(),
-	/** Created in this session, or imported from the file. */
+	/** ISO 8601 date-time. */
+	createdAt: z.iso.datetime({ offset: true }),
+	/** ISO 8601 date-time. */
+	modifiedAt: z.iso.datetime({ offset: true }),
+	/** Created in this session, or imported from the file. Viewer state, never exported. */
 	source: z.enum(["session", "pdf"]),
-	/** Embedded annotations are locked until the engine can rewrite the file. */
+	/** Embedded annotations are locked until the engine can rewrite the file. Viewer state, never exported. */
 	locked: z.boolean().optional(),
 	/** Host data. Preserved, never interpreted. */
 	custom: z.record(z.string(), z.unknown()).optional()
@@ -552,7 +554,7 @@ const TextMarkupSchema = Base.extend({
 	quads: z.array(QuadSchema).min(1)
 });
 const NoteSchema = Base.extend({
-	type: z.literal("note"),
+	type: z.literal("text"),
 	icon: z.enum([
 		"comment",
 		"note",
@@ -563,8 +565,9 @@ const NoteSchema = Base.extend({
 	]).default("comment")
 });
 const FreeTextSchema = Base.extend({
-	type: z.literal("freeText"),
-	text: z.string(),
+	type: z.literal("freetext"),
+	/** The text shown on the page. */
+	contents: z.string(),
 	fontSize: z.number().positive().default(12),
 	fontFamily: z.string().default("Helvetica"),
 	align: z.enum([
@@ -576,8 +579,8 @@ const FreeTextSchema = Base.extend({
 });
 const ShapeSchema = Base.extend({
 	type: z.enum(["square", "circle"]),
-	strokeWidth: z.number().nonnegative().default(1),
-	fill: Hex.optional()
+	width: z.number().nonnegative().default(1),
+	interiorColor: Hex.optional()
 });
 const LineEndingSchema = z.enum([
 	"none",
@@ -593,19 +596,20 @@ const LineSchema = Base.extend({
 	type: z.literal("line"),
 	start: PointSchema,
 	end: PointSchema,
-	strokeWidth: z.number().nonnegative().default(1),
-	endings: z.tuple([LineEndingSchema, LineEndingSchema]).optional()
+	width: z.number().nonnegative().default(1),
+	head: LineEndingSchema.optional(),
+	tail: LineEndingSchema.optional()
 });
 const PolySchema = Base.extend({
 	type: z.enum(["polyline", "polygon"]),
 	vertices: z.array(PointSchema).min(2),
-	strokeWidth: z.number().nonnegative().default(1),
-	fill: Hex.optional()
+	width: z.number().nonnegative().default(1),
+	interiorColor: Hex.optional()
 });
 const InkSchema = Base.extend({
 	type: z.literal("ink"),
-	paths: z.array(z.array(PointSchema).min(1)).min(1),
-	strokeWidth: z.number().nonnegative().default(2)
+	inklist: z.array(z.array(PointSchema).min(1)).min(1),
+	width: z.number().nonnegative().default(2)
 });
 const SuggestionSchema = z.object({
 	jobId: z.string().optional(),
@@ -626,7 +630,7 @@ const RedactSchema = Base.extend({
 	suggestion: SuggestionSchema.optional(),
 	overlayText: z.string().optional(),
 	/** Colour the redaction will be filled with when applied. */
-	fill: Hex
+	interiorColor: Hex
 });
 const AnnotationSchema = z.discriminatedUnion("type", [
 	TextMarkupSchema,
@@ -638,6 +642,22 @@ const AnnotationSchema = z.discriminatedUnion("type", [
 	InkSchema,
 	RedactSchema
 ]);
+/** The viewer's own state on an annotation, left out of exports. */
+const VIEWER_STATE = {
+	source: true,
+	locked: true
+};
+/** One exported annotation: the stored annotation without its viewer state. */
+const ExportedAnnotationSchema = z.discriminatedUnion("type", [
+	TextMarkupSchema.omit(VIEWER_STATE),
+	NoteSchema.omit(VIEWER_STATE),
+	FreeTextSchema.omit(VIEWER_STATE),
+	ShapeSchema.omit(VIEWER_STATE),
+	LineSchema.omit(VIEWER_STATE),
+	PolySchema.omit(VIEWER_STATE),
+	InkSchema.omit(VIEWER_STATE),
+	RedactSchema.omit(VIEWER_STATE)
+]);
 const AnnotationDocumentSchema = z.object({
 	format: z.literal(ANNOTATION_FORMAT),
 	version: z.literal(1),
@@ -758,7 +778,7 @@ function convert(page, d, importedAt) {
 		source: "pdf",
 		locked: true
 	});
-	const fillOf = (c) => c && c.length >= 3 ? { fill: pdfColorToHex(c, "#FFFFFF") } : {};
+	const fillOf = (c) => c && c.length >= 3 ? { interiorColor: pdfColorToHex(c, "#FFFFFF") } : {};
 	let candidate;
 	switch (d.subtype) {
 		case "Highlight":
@@ -776,17 +796,17 @@ function convert(page, d, importedAt) {
 		}
 		case "Text":
 			candidate = {
-				...base("note"),
-				type: "note",
+				...base("text"),
+				type: "text",
 				icon: ICONS[(d.name ?? "comment").toLowerCase()] ?? "comment"
 			};
 			break;
 		case "FreeText": {
 			const da = d.defaultAppearanceData;
 			candidate = {
-				...base("freeText", pdfColorToHex(da?.fontColor, staticDefaults.color("freeText"))),
-				type: "freeText",
-				text: contents ?? "",
+				...base("freetext", pdfColorToHex(da?.fontColor, staticDefaults.color("freetext"))),
+				type: "freetext",
+				contents: contents ?? "",
 				...da && da.fontSize > 0 ? { fontSize: da.fontSize } : {}
 			};
 			break;
@@ -797,7 +817,7 @@ function convert(page, d, importedAt) {
 			candidate = {
 				...base(type),
 				type,
-				strokeWidth: stroke,
+				width: stroke,
 				...fillOf(d.interiorColor)
 			};
 			break;
@@ -821,8 +841,11 @@ function convert(page, d, importedAt) {
 					x: l[2],
 					y: l[3]
 				},
-				strokeWidth: stroke,
-				...endings && endings.length === 2 && endings.some((e) => e !== "none") ? { endings } : {}
+				width: stroke,
+				...endings && endings.length === 2 && endings.some((e) => e !== "none") ? {
+					head: endings[0],
+					tail: endings[1]
+				} : {}
 			};
 			break;
 		}
@@ -835,19 +858,19 @@ function convert(page, d, importedAt) {
 				...base(type),
 				type,
 				vertices,
-				strokeWidth: stroke,
+				width: stroke,
 				...fillOf(d.interiorColor)
 			};
 			break;
 		}
 		case "Ink": {
-			const paths = (d.inkLists ?? []).map((p) => pointsFromFlat(p)).filter((p) => p.length > 0);
-			if (paths.length === 0) return void 0;
+			const inklist = (d.inkLists ?? []).map((p) => pointsFromFlat(p)).filter((p) => p.length > 0);
+			if (inklist.length === 0) return void 0;
 			candidate = {
 				...base("ink"),
 				type: "ink",
-				paths,
-				strokeWidth: stroke
+				inklist,
+				width: stroke
 			};
 			break;
 		}
@@ -856,7 +879,7 @@ function convert(page, d, importedAt) {
 				...base("redact"),
 				type: "redact",
 				origin: "user",
-				fill: pdfColorToHex(d.interiorColor, staticDefaults.fill()),
+				interiorColor: pdfColorToHex(d.interiorColor, staticDefaults.fill()),
 				...quads.length > 0 ? { quads } : {}
 			};
 			break;
@@ -1012,10 +1035,10 @@ function sameAnnotations(a, b) {
 }
 //#endregion
 //#region src/model/annotations/json.ts
-const KNOWN_TYPES = new Set(AnnotationSchema.options.flatMap((o) => [...o.shape.type._zod.values]));
+const KNOWN_TYPES = new Set(ExportedAnnotationSchema.options.flatMap((o) => [...o.shape.type._zod.values]));
 /**
 * Session annotations plus any preserved foreign items. Embedded (`source: 'pdf'`) ones stay in
-* the file.
+* the file. `source` and `locked` are viewer state and are left out.
 *
 * The result is a JSON copy (`JSON.parse(JSON.stringify(...))`), the same data a serialised
 * export would carry: editing it never touches the store, and values JSON cannot hold, such as
@@ -1026,7 +1049,7 @@ const KNOWN_TYPES = new Set(AnnotationSchema.options.flatMap((o) => [...o.shape.
 * describes only the types it knows.
 */
 function exportAnnotations(store, preserved = [], documentKey) {
-	const session = store.list.get().filter((a) => a.source === "session");
+	const session = store.list.get().filter((a) => a.source === "session").map(({ source: _source, locked: _locked, ...rest }) => rest);
 	return {
 		format: ANNOTATION_FORMAT,
 		version: 1,
@@ -1102,7 +1125,7 @@ function planImport(store, data, opts) {
 			else if (claim(item.id, index)) result.unknown.push(item);
 			return;
 		}
-		const parsed = AnnotationSchema.safeParse(item);
+		const parsed = ExportedAnnotationSchema.safeParse(item);
 		if (!parsed.success) {
 			result.errors.push({
 				index,
@@ -1150,7 +1173,7 @@ const LOCKED_KEYS = /* @__PURE__ */ new Set([
 	"page",
 	"rect",
 	"quads",
-	"paths",
+	"inklist",
 	"start",
 	"end",
 	"vertices",
@@ -1186,8 +1209,8 @@ function deriveRect(input) {
 			if (input.quads) return unionRects(input.quads.map(rectFromQuad));
 			break;
 		case "ink": {
-			const pad = (input.strokeWidth ?? 2) / 2;
-			const r = bounds(input.paths.flat());
+			const pad = (input.width ?? 2) / 2;
+			const r = bounds(input.inklist.flat());
 			return {
 				x: r.x - pad,
 				y: r.y - pad,
@@ -1277,7 +1300,7 @@ function createAnnotationStore(opts) {
 			source: "session"
 		};
 		if (input.type === "redact") {
-			if (input.fill === void 0) candidate.fill = opts.defaults.fill();
+			if (input.interiorColor === void 0) candidate.interiorColor = opts.defaults.fill();
 			if (input.origin === "suggested" && input.suggestion && input.color === void 0) candidate.color = opts.defaults.suggestion(confidenceBucket(input.suggestion.confidence));
 		}
 		return AnnotationSchema.parse(candidate);
@@ -1845,7 +1868,7 @@ function threadRoot(list, start) {
 	let current = start;
 	while (current.inReplyTo) {
 		const parent = list.find((a) => a.id === current.inReplyTo);
-		if (parent?.type !== "note" || seen.has(parent.id)) break;
+		if (parent?.type !== "text" || seen.has(parent.id)) break;
 		seen.add(parent.id);
 		current = parent;
 	}
@@ -1869,10 +1892,10 @@ function threadOf(list, root) {
 /** An unlocked root note with no text and no replies: nothing a reader would miss. */
 function isAbandonedNote(list, id) {
 	const a = list.find((x) => x.id === id);
-	if (a?.type !== "note" || a.locked || a.inReplyTo || a.contents?.trim()) return false;
+	if (a?.type !== "text" || a.locked || a.inReplyTo || a.contents?.trim()) return false;
 	return repliesTo(list, id).length === 0;
 }
 //#endregion
-export { rectFromQuad as $, RectSchema as A, mergeLineRects as B, InkSchema as C, PointSchema as D, NoteSchema as E, confidenceBucket as F, approxEqual as G, readonly as H, parsePdfDate as I, pointsFromFlat as J, invertMatrix as K, cssVariableDefaults as L, ShapeSchema as M, SuggestionSchema as N, PolySchema as O, TextMarkupSchema as P, rectFromPoints as Q, normalizeColor as R, FreeTextSchema as S, LineSchema as T, writable as U, derived as V, applyMatrix as W, quadsFromFlat as X, quadFromRect as Y, rectContainsPoint as Z, summarise as _, acceptSuggestion as a, InkError as at, AnnotationDocumentSchema as b, deriveRect as c, createHistory as d, rectsIntersect as et, isProduction as f, pdfColorToHex as g, importedId as h, threadRoot as i, Emitter as it, RedactSchema as j, QuadSchema as k, exportAnnotations as l, importEmbeddedPage as m, repliesTo as n, translateRect as nt, openDocument as o, isInkError as ot, SUPPORTED_SUBTYPES as p, multiplyMatrix as q, threadOf as r, unionRects as rt, createAnnotationStore as s, isAbandonedNote as t, translateQuad as tt, importAnnotations as u, ANNOTATION_FORMAT as v, LineEndingSchema as w, AnnotationSchema as x, ANNOTATION_VERSION as y, staticDefaults as z };
+export { rectFromPoints as $, QuadSchema as A, staticDefaults as B, FreeTextSchema as C, NoteSchema as D, LineSchema as E, TextMarkupSchema as F, applyMatrix as G, derived as H, confidenceBucket as I, multiplyMatrix as J, approxEqual as K, parsePdfDate as L, RedactSchema as M, ShapeSchema as N, PointSchema as O, SuggestionSchema as P, rectContainsPoint as Q, cssVariableDefaults as R, ExportedAnnotationSchema as S, LineEndingSchema as T, readonly as U, mergeLineRects as V, writable as W, quadFromRect as X, pointsFromFlat as Y, quadsFromFlat as Z, summarise as _, acceptSuggestion as a, Emitter as at, AnnotationDocumentSchema as b, deriveRect as c, createHistory as d, rectFromQuad as et, isProduction as f, pdfColorToHex as g, importedId as h, threadRoot as i, unionRects as it, RectSchema as j, PolySchema as k, exportAnnotations as l, importEmbeddedPage as m, repliesTo as n, translateQuad as nt, openDocument as o, InkError as ot, SUPPORTED_SUBTYPES as p, invertMatrix as q, threadOf as r, translateRect as rt, createAnnotationStore as s, isInkError as st, isAbandonedNote as t, rectsIntersect as tt, importAnnotations as u, ANNOTATION_FORMAT as v, InkSchema as w, AnnotationSchema as x, ANNOTATION_VERSION as y, normalizeColor as z };
 
-//# sourceMappingURL=threads-BtvtrAhL.mjs.map
+//# sourceMappingURL=threads-2USvyGpX.mjs.map