@mengine/medeo-client 2.1.1-dsl.2 → 2.1.1-dsl.3

package/dist/{video-draft-types-TXRv3wS6.js → video-draft-types-DvPeam87.js}

@@ -21,29 +21,22 @@ function resourceId(kind, system, key) {
 function relationId(table, value) {
 	const v = value;
 	switch (table) {
-		case "clip-source-relations": return `cs:${v.clipId}`;
-		case "time-anchor-relations": return `ta:${v.from}`;
-		case "caption-content-relations": return `cc:${v.captionId}`;
-		case "caption-alignment-relations": return `ca:${v.captionId}`;
 		case "voice-timbre-relations": return `voice-timbre:${tupleHash([v.recordingId, v.voiceId])}`;
 		case "derived-from-relations": return `derived-from:${tupleHash([v.entityId, v.sourceId])}`;
-		case "from-asset-relations": return `from-asset:${v.audioScriptId}`;
-		case "to-asset-relations": return `to-asset:${v.audioScriptId}`;
 	}
 	throw new Error(`Unknown relation table: ${table}`);
 }
 const defaultIdFactory = (kind) => `${kind}_${globalThis.crypto.randomUUID()}`;
 const resourceKinds = {
 	"media-entities": "media",
-	"voice-entities": "voice",
-	"asset-entities": "asset"
+	"voice-entities": "voice"
 };
 /** A resource row's ID is derived from its locator, so one external resource is one entity. */
 function assertResourceIdentity(table, id, value) {
 	const kind = resourceKinds[table];
 	if (kind && id !== resourceId(kind, value.system, value.key)) throw new Error("Resource identity does not match locator");
 }
-/** A relation row's ID is derived from its uniqueness key. */
+/** A relation row's ID is derived from its two ends. */
 function assertRelationIdentity(table, id, value) {
 	if (id !== relationId(table, value)) throw new Error("Relation ID does not match endpoints");
 }
@@ -61,16 +54,19 @@ const optional$1 = (check) => ({
 	check,
 	optional: true
 });
+const reservedIds = [
+	"$cid",
+	"__proto__",
+	"constructor",
+	"prototype"
+];
+const id = (v) => nonempty(v) && !reservedIds.includes(v);
+const cursor = (v) => v instanceof Cursor;
 function isRecord(value) {
 	return value !== null && typeof value === "object" && !Array.isArray(value) && !(value instanceof Cursor);
 }
 function assertId(value) {
-	if (!nonempty(value) || [
-		"$cid",
-		"__proto__",
-		"constructor",
-		"prototype"
-	].includes(value)) throw new Error("Expected a nonempty, non-reserved ID");
+	if (!id(value)) throw new Error("Expected a nonempty, non-reserved ID");
 }
 function validLanguage(value) {
 	if (typeof value !== "string") return false;
@@ -126,6 +122,30 @@ const seqMarkerFields = {
 function assertSeqMarker(value) {
 	checkFields(value, seqMarkerFields);
 }
+const timeAnchorFields = {
+	to: required(id),
+	offsetMs: required(integer),
+	fallback_abs_ms: required(nonnegative)
+};
+/** A time anchor's own fields; what it points at is checked by `assertReferenceAdmitted`. */
+function assertTimeAnchor(value) {
+	checkFields(value, timeAnchorFields);
+}
+const captionContentFields = {
+	audioScriptId: required(id),
+	start: required(cursor),
+	end: required(cursor)
+};
+function assertCaptionContent(value) {
+	checkFields(value, captionContentFields);
+}
+const phonemeFields = {
+	audioScriptId: required(id),
+	phonemeScript: optional$1(string)
+};
+function assertPhoneme(value) {
+	checkFields(value, phonemeFields);
+}
 const locator = {
 	system: required(oneOf("memota", "memota-speech")),
 	key: required(nonempty)
@@ -138,7 +158,9 @@ const entityFields = {
 	},
 	"clip-entities": {
 		seqMarker: required(object(seqMarkerFields)),
-		volume: optional$1(finite)
+		volume: optional$1(finite),
+		source: required(id),
+		anchor: optional$1(object(timeAnchorFields))
 	},
 	"media-entities": {
 		...locator,
@@ -151,7 +173,9 @@ const entityFields = {
 		body: required(string),
 		defaultLanguage: optional$1(validLanguage)
 	},
+	"phonetic-script-entities": { phoneme: required(object(phonemeFields)) },
 	"caption-entities": {
+		selection: optional$1(object(captionContentFields)),
 		text: optional$1(string),
 		style: optional$1(object(styleFields))
 	},
@@ -159,52 +183,26 @@ const entityFields = {
 		system: required(oneOf("voice-library")),
 		key: required(nonempty),
 		name: optional$1(string)
-	},
-	"asset-entities": {
-		...locator,
-		storageKey: optional$1(nonempty),
-		digest: optional$1(nonempty)
 	}
 };
 const entityTables = Object.keys(entityFields);
+/**
+* Fields stored as one encoded string: written whole, never merged field by field. A patch to one
+* is merged into the current value first, then the whole value is written.
+*/
+const atomicFields = {
+	"clip-entities": ["seqMarker", "anchor"],
+	"phonetic-script-entities": ["phoneme"],
+	"caption-entities": ["selection"]
+};
 const relationFields = {
-	"clip-source-relations": {
-		clipId: required(nonempty),
-		sourceId: required(nonempty)
-	},
-	"time-anchor-relations": {
-		from: required(nonempty),
-		to: required(nonempty),
-		offsetMs: required(integer),
-		fallback_abs_ms: required(nonnegative)
-	},
-	"caption-content-relations": {
-		captionId: required(nonempty),
-		audioScriptId: required(nonempty),
-		start: required((v) => v instanceof Cursor),
-		end: required((v) => v instanceof Cursor)
-	},
-	"caption-alignment-relations": {
-		captionId: required(nonempty),
-		mediaId: required(nonempty),
-		startMs: required(nonnegative),
-		endMs: required(nonnegative)
-	},
 	"voice-timbre-relations": {
-		recordingId: required(nonempty),
-		voiceId: required(nonempty)
+		recordingId: required(id),
+		voiceId: required(id)
 	},
 	"derived-from-relations": {
-		entityId: required(nonempty),
-		sourceId: required(nonempty)
-	},
-	"from-asset-relations": {
-		audioScriptId: required(nonempty),
-		assetId: required(nonempty)
-	},
-	"to-asset-relations": {
-		audioScriptId: required(nonempty),
-		assetId: required(nonempty)
+		entityId: required(id),
+		sourceId: required(id)
 	}
 };
 const relationTables = Object.keys(relationFields);
@@ -222,12 +220,12 @@ function assertEntityPatch(table, patch, current) {
 	if (table === "audio-script-entities" && Object.hasOwn(patch, "body")) throw new Error("Edit body through the Text adapter");
 	if (table === "caption-entities" && current.style !== void 0 && Object.hasOwn(patch, "style") && patch.style === void 0) throw new Error("Reset individual style fields; retain the style Map");
 	if (table === "caption-entities" && current.text !== void 0 && patch.text !== void 0) throw new Error("Edit Caption text through the Text adapter");
-	const next = mergeFields(current, patch);
+	const next = patchRow(table, current, patch);
 	for (const key of Object.keys(patch)) {
 		const field = entityFields[table][key];
 		if (!field || !field.optional && next[key] === void 0 || next[key] !== void 0 && !field.check(next[key])) throw new Error(`Invalid patch field: ${key}`);
 	}
-	if (table === "media-entities" || table === "voice-entities" || table === "asset-entities") {
+	if (table === "media-entities" || table === "voice-entities") {
 		for (const key of [
 			"system",
 			"key",
@@ -243,18 +241,25 @@ function assertEntityPatch(table, patch, current) {
 }
 function assertRelation(table, value) {
 	checkFields(value, relationFields[table]);
-	for (const [key, endpoint] of Object.entries(value)) if (key.endsWith("Id") || key === "from" || key === "to") assertId(endpoint);
+}
+/**
+* The row after a patch. An atomic field merges into its current value, so a partial patch keeps
+* the rest of it; an unreadable stored value is replaced instead, so writing a whole value repairs it.
+*/
+function patchRow(table, current, patch) {
+	const next = mergeFields(current, patch);
+	for (const key of atomicFields[table] ?? []) {
+		const old = current[key];
+		const value = patch[key];
+		if (value !== void 0 && isRecord(old) && old.invalid === true) next[key] = isRecord(value) ? mergeFields({}, value) : value;
+	}
+	return next;
 }
 /** Undefined deletes; nested patches retain sibling fields and an existing empty style Map. */
 function mergeFields(target, patch) {
 	const result = { ...target };
 	for (const [key, value] of Object.entries(patch)) {
-		if ([
-			"$cid",
-			"__proto__",
-			"constructor",
-			"prototype"
-		].includes(key)) throw new Error(`Reserved field: ${key}`);
+		if (reservedIds.includes(key)) throw new Error(`Reserved field: ${key}`);
 		if (value === void 0) delete result[key];
 		else result[key] = isRecord(value) ? mergeFields(isRecord(result[key]) ? result[key] : {}, value) : value;
 	}
@@ -1252,23 +1257,23 @@ function codec(encode, decode) {
 		}
 	};
 }
+/** A Clip's time anchor; the Clip holding it is the anchored end. */
 const timeAnchorCodec = codec((v) => {
-	assertRelation("time-anchor-relations", v);
+	assertTimeAnchor(v);
 	return JSON.stringify({
-		from: v.from,
 		to: v.to,
 		offsetMs: v.offsetMs,
 		fallback_abs_ms: v.fallback_abs_ms
 	});
 }, (raw) => {
 	const v = JSON.parse(raw);
-	assertRelation("time-anchor-relations", v);
+	assertTimeAnchor(v);
 	return v;
 });
+/** A Caption's selection; Cursors are stored as their native bytes in unpadded base64url. */
 const captionContentCodec = codec((v) => {
-	assertRelation("caption-content-relations", v);
+	assertCaptionContent(v);
 	return JSON.stringify({
-		captionId: v.captionId,
 		audioScriptId: v.audioScriptId,
 		start: bytesToBase64url(v.start.encode()),
 		end: bytesToBase64url(v.end.encode())
@@ -1281,9 +1286,21 @@ const captionContentCodec = codec((v) => {
 		start: Cursor.decode(base64urlToBytes(v.start)),
 		end: Cursor.decode(base64urlToBytes(v.end))
 	};
-	assertRelation("caption-content-relations", value);
+	assertCaptionContent(value);
 	return value;
 });
+/** A phonetic script's base script and pronunciation, stored as one string so they move together. */
+const phonemeCodec = codec((v) => {
+	assertPhoneme(v);
+	return JSON.stringify({
+		audioScriptId: v.audioScriptId,
+		...v.phonemeScript === void 0 ? {} : { phonemeScript: v.phonemeScript }
+	});
+}, (raw) => {
+	const v = JSON.parse(raw);
+	assertPhoneme(v);
+	return v;
+});
 /** A Clip's sequence marker is stored as one string, so it is taken or replaced whole. */
 const seqMarkerCodec = codec((v) => {
 	assertSeqMarker(v);
@@ -1304,13 +1321,19 @@ const optional = { required: false };
 const mergeable = { mergeableMapChildContainers: true };
 const strings = (keys) => Object.fromEntries(keys.map((key) => [key, schema.String()]));
 const relation = (keys) => schema.LoroMapRecord(schema.LoroMap(strings(keys)), mergeable);
-const atomicValue = (codec) => schema.String().transform({
+const transform = (codec) => ({
 	...codec,
 	isEqual: "encoded-value-equality",
 	validateEncodedType: true
 });
-const atomic = (codec) => schema.LoroMapRecord(atomicValue(codec));
-/** Only direct children inherit mergeable identity. Body and ordinary entity rows keep normal identities. */
+/** One field stored as one encoded string, so it is taken or replaced whole. */
+const atomicValue = (codec) => schema.String().transform(transform(codec));
+const optionalAtomicValue = (codec) => schema.String(optional).transform(transform(codec));
+/**
+* Only direct children inherit mergeable identity. Body and ordinary entity rows keep normal
+* identities, so deleting a row also drops what a peer wrote into it concurrently: a relation an
+* entity holds at most one of is a field of that row and never outlives it.
+*/
 const medeoDslLoroShape = schema({
 	"timeline-entities": schema.LoroMapRecord(schema.LoroMap({})),
 	"track-entities": schema.LoroMapRecord(schema.LoroMap({
@@ -1319,7 +1342,9 @@ const medeoDslLoroShape = schema({
 	})),
 	"clip-entities": schema.LoroMapRecord(schema.LoroMap({
 		seqMarker: atomicValue(seqMarkerCodec),
-		volume: schema.Number(optional)
+		volume: schema.Number(optional),
+		source: schema.String(),
+		anchor: optionalAtomicValue(timeAnchorCodec)
 	})),
 	"media-entities": schema.LoroMapRecord(schema.LoroMap({
 		kind: schema.String(),
@@ -1333,7 +1358,9 @@ const medeoDslLoroShape = schema({
 		body: schema.LoroText(),
 		defaultLanguage: schema.String(optional)
 	})),
+	"phonetic-script-entities": schema.LoroMapRecord(schema.LoroMap({ phoneme: atomicValue(phonemeCodec) })),
 	"caption-entities": schema.LoroMapRecord(schema.LoroMap({
+		selection: optionalAtomicValue(captionContentCodec),
 		text: schema.LoroText(optional),
 		style: schema.LoroMap({
 			font: schema.LoroMap({
@@ -1359,26 +1386,9 @@ const medeoDslLoroShape = schema({
 		key: schema.String(),
 		name: schema.String(optional)
 	}), mergeable),
-	"asset-entities": schema.LoroMapRecord(schema.LoroMap({
-		system: schema.String(),
-		key: schema.String(),
-		storageKey: schema.String(optional),
-		digest: schema.String(optional)
-	}), mergeable),
 	"contain-relations": schema.LoroTree(schema.LoroMap({ entityId: schema.String() })),
-	"clip-source-relations": relation(["clipId", "sourceId"]),
-	"time-anchor-relations": atomic(timeAnchorCodec),
-	"caption-content-relations": atomic(captionContentCodec),
-	"caption-alignment-relations": schema.LoroMapRecord(schema.LoroMap({
-		captionId: schema.String(),
-		mediaId: schema.String(),
-		startMs: schema.Number(),
-		endMs: schema.Number()
-	}), mergeable),
 	"voice-timbre-relations": relation(["recordingId", "voiceId"]),
-	"derived-from-relations": relation(["entityId", "sourceId"]),
-	"from-asset-relations": relation(["audioScriptId", "assetId"]),
-	"to-asset-relations": relation(["audioScriptId", "assetId"])
+	"derived-from-relations": relation(["entityId", "sourceId"])
 });
 //#endregion
 //#region ../medeo-dsl/src/schema/document-format.ts
@@ -1407,13 +1417,10 @@ function assertDslDocument(doc) {
 }
 //#endregion
 //#region ../medeo-dsl/src/schema/text-styles.ts
-/** How rich-text marks extend at their edges: a language runs on into new text, a pause stays on its space. */
-const textStyles = {
-	language: { expand: "after" },
-	pauseMs: { expand: "none" }
-};
+/** How rich-text marks extend at their edges: a language runs on into text typed after it. */
+const textStyles = { language: { expand: "after" } };
 //#endregion
 //#region src/dsl/projection/video-draft-types.ts
 const DEFAULT_UNIT_TIME_MS = 33.333;
 //#endregion
-export { assertRelation as $, hardenCidDescriptors as A, safeStringify as B, applySchemaToInferOptions as C, deepEqual as D, decodeNestedJsonValues as E, isObject as F, valuesEqual as G, stripUndefined as H, isObjectLike as I, getChildSchema as J, CID_KEY as K, isStateAndSchemaOfType as L, inferContainerTypeFromValue as M, insertChildToMap as N, defineCidProperty as O, isArrayLike as P, assertId as Q, isTreeID as R, applyEncode as S, containerIdToContainerType as T, tryInferContainerType as U, schemaToContainerType as V, tryUpdateToContainer as W, assertEntity as X, getMapFieldSchema as Y, assertEntityPatch as Z, isLoroTreeSchema as _, documentFormat as a, assertRelationIdentity as at, validateSchema as b, isInvalidAtomic as c, relationId as ct, getDefaultValue as d, entityTables as et, isContainerSchema as f, isLoroMovableListSchema as g, isLoroMapSchema as h, assertDslDocument as i, validLanguage as it, hasTransform as j, getRootContainerByType as k, timeAnchorCodec as l, resourceId as lt, isLoroListSchema as m, textStyles as n, mergeFields as nt, medeoDslLoroShape as o, assertResourceIdentity as ot, isListLikeSchema as p, getChildContainerSchema as q, UnsupportedDocumentFormatError as r, relationTables as rt, captionContentCodec as s, defaultIdFactory as st, DEFAULT_UNIT_TIME_MS as t, isRecord as tt, schema as u, tupleHash as ut, isRootSchemaType as v, cidsEqual as w, applyDecode as x, schemaContainsIgnoreField as y, isValueOfContainerType as z };
+export { assertId as $, hardenCidDescriptors as A, safeStringify as B, applySchemaToInferOptions as C, deepEqual as D, decodeNestedJsonValues as E, isObject as F, valuesEqual as G, stripUndefined as H, isObjectLike as I, getChildSchema as J, CID_KEY as K, isStateAndSchemaOfType as L, inferContainerTypeFromValue as M, insertChildToMap as N, defineCidProperty as O, isArrayLike as P, assertEntityPatch as Q, isTreeID as R, applyEncode as S, containerIdToContainerType as T, tryInferContainerType as U, schemaToContainerType as V, tryUpdateToContainer as W, assertCaptionContent as X, getMapFieldSchema as Y, assertEntity as Z, isLoroTreeSchema as _, documentFormat as a, isRecord as at, validateSchema as b, isInvalidAtomic as c, relationTables as ct, getDefaultValue as d, assertResourceIdentity as dt, assertPhoneme as et, isContainerSchema as f, defaultIdFactory as ft, isLoroMovableListSchema as g, isLoroMapSchema as h, tupleHash as ht, assertDslDocument as i, entityTables as it, hasTransform as j, getRootContainerByType as k, timeAnchorCodec as l, validLanguage as lt, isLoroListSchema as m, resourceId as mt, textStyles as n, assertTimeAnchor as nt, medeoDslLoroShape as o, mergeFields as ot, isListLikeSchema as p, relationId as pt, getChildContainerSchema as q, UnsupportedDocumentFormatError as r, atomicFields as rt, captionContentCodec as s, patchRow as st, DEFAULT_UNIT_TIME_MS as t, assertRelation as tt, schema as u, assertRelationIdentity as ut, isRootSchemaType as v, cidsEqual as w, applyDecode as x, schemaContainsIgnoreField as y, isValueOfContainerType as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mengine/medeo-client",
-  "version": "2.1.1-dsl.2",
+  "version": "2.1.1-dsl.3",
   "license": "UNLICENSED",
   "repository": {
     "type": "git",
@@ -29,9 +29,9 @@
     "@noble/hashes": "^2.4.0",
     "immer": "^10.2.0",
     "zod": "^4.4.3",
-    "@mengine/storage": "2.1.1-dsl.2",
-    "@mengine/sync": "2.1.1-dsl.2",
-    "@mengine/utils": "2.1.1-dsl.2"
+    "@mengine/storage": "2.1.1-dsl.3",
+    "@mengine/sync": "2.1.1-dsl.3",
+    "@mengine/utils": "2.1.1-dsl.3"
   },
   "devDependencies": {
     "@types/node": "^25.9.1",
@@ -42,8 +42,8 @@
     "typescript": "^6.0.3",
     "vite-plugin-wasm": "^3.6.0",
     "vite-plus": "^0.1.23",
-    "@mengine/idl-codegen": "0.0.0",
-    "@mengine/medeo-dsl": "0.0.0"
+    "@mengine/medeo-dsl": "0.0.0",
+    "@mengine/idl-codegen": "0.0.0"
   },
   "peerDependencies": {
     "loro-crdt": "^1.16.1"