@mengine/medeo-client 2.1.1-dsl.5 → 2.1.1-dsl.7

package/dist/{dsl-DQ63zFgu.js → dsl-DbYqFFOb.js}

@@ -327,6 +327,7 @@ function assertChangeAdmitted(change) {
 		for (const field of referenceFields[table] ?? []) if (!old || fields.has(field)) assertReferenceAdmitted(after, table, id, field, row[field]);
 		const marker = row.seqMarker;
 		if (table === "clip-entities" && (!old || fields.has("seqMarker")) && marker?.outMs <= marker?.inMs) throw new Error("Clip window must be nonempty");
+		if (table === "clip-entities" && (!old || fields.has("seqMarker") || fields.has("source"))) assertFillsWithWholeSource(after, marker, row.source);
 	}
 	if (change.entities.has("timeline-entities") && Object.keys(after["timeline-entities"]).length > 1) throw new Error("Document already has a Timeline");
 	for (const [table, ids] of change.relations) for (const id of ids) {
@@ -334,6 +335,16 @@ function assertChangeAdmitted(change) {
 		if (value !== void 0) assertRelationAdmitted(after, table, id, value);
 	}
 }
+/**
+* A Clip that fills the Timeline plays its whole source at 1×: the player loops a short source and
+* cuts a long one at the Timeline's end (RFC 02 §3.3), so a window or speed of its own has no meaning.
+*/
+function assertFillsWithWholeSource(rows, marker, source) {
+	if (marker?.fillTimeline !== true) return;
+	const media = typeof source === "string" ? rows["media-entities"][source] : void 0;
+	const durationMs = typeof media?.durationMs === "number" ? media.durationMs : void 0;
+	if (marker.inMs !== 0 || marker.rate !== void 0 && marker.rate !== 1 || durationMs !== void 0 && marker.outMs !== durationMs) throw new Error(`A Clip that fills the Timeline plays its whole source at 1×: inMs 0, outMs ${durationMs ?? "its length"}, no rate; the Timeline's end cuts it`);
+}
 //#endregion
 //#region src/dsl/projection/types.ts
 /** Unsupported legacy representations fail explicitly; recoverable CRDT state is returned as diagnostics. */
@@ -5633,7 +5644,7 @@ function toVideoDraft(snapshot) {
 					audio_storage_key: source.storageKey,
 					origin_speech_id: source.key,
 					volume: clip.volume,
-					audio_script: spokenText(snapshot, sourceId),
+					audio_script: spokenText(snapshot, sourceId, captionIds),
 					voice: voice ? {
 						id: voice.key,
 						name: voice.name
@@ -5718,11 +5729,30 @@ function toVideoDraft(snapshot) {
 function requireWholeAudio(media, clip, fail) {
 	if (media.kind === "image" || clip.inMs !== 0 || clip.outMs !== media.durationMs || clip.rate !== 1) fail("VideoDraft audio has no trim or speed fields");
 }
-function spokenText(snapshot, recordingId) {
+/**
+* The words a speech Clip says. A script voiced in several takes is said one part per take, and
+* the Captions following the Clip select that part: its words are the segments they select, in
+* script order. A Clip no Caption of its script follows says the whole script.
+*/
+function spokenText(snapshot, recordingId, captionClipIds) {
 	const scripts = new Set(spokenScripts(snapshot, recordingId).map((spoken) => spoken.audioScriptId));
 	if (scripts.size > 1) projectionError("ambiguous-script", `media-entities/${recordingId}`, "Multiple scripts cannot be silently concatenated into audio_script");
 	const id = [...scripts][0];
-	return id ? snapshot.richText[id]?.plainText ?? "" : "";
+	if (!id) return "";
+	const body = snapshot.richText[id]?.plainText ?? "";
+	const segments = lines(body);
+	const said = /* @__PURE__ */ new Set();
+	for (const clipId of captionClipIds) {
+		const captionId = snapshot["clip-entities"][clipId]?.source;
+		const caption = captionId === void 0 ? void 0 : snapshot["caption-entities"][captionId];
+		const shown = captionId === void 0 ? void 0 : snapshot.captionText[captionId];
+		if (caption?.selection?.audioScriptId !== id || caption.text !== void 0 || !shown) continue;
+		segments.forEach((line, index) => {
+			if (shown.start < Math.max(line.end, line.start + 1) && shown.end > line.start) said.add(index);
+		});
+	}
+	if (!said.size) return body;
+	return [...said].sort((a, b) => a - b).map((index) => segments[index].text).join("\n");
 }
 //#endregion
 //#region src/dsl/projection/from-video-draft.ts

package/dist/dsl.js

@@ -1,3 +1,3 @@
 import { a as documentFormat, c as isInvalidAtomic, ft as defaultIdFactory, ht as tupleHash, i as assertDslDocument, l as timeAnchorCodec, mt as resourceId, o as medeoDslLoroShape, pt as relationId, r as UnsupportedDocumentFormatError, s as captionContentCodec, t as DEFAULT_UNIT_TIME_MS } from "./video-draft-types-Ce8NDenQ.js";
-import { a as DslEditor, c as DslProjectionError, i as createInitialMedeoDsl, n as toVideoDraft, o as MedeoDsl, r as toAudioScriptViews, s as resolveDslLayout, t as fromVideoDraft } from "./dsl-DQ63zFgu.js";
+import { a as DslEditor, c as DslProjectionError, i as createInitialMedeoDsl, n as toVideoDraft, o as MedeoDsl, r as toAudioScriptViews, s as resolveDslLayout, t as fromVideoDraft } from "./dsl-DbYqFFOb.js";
 export { DEFAULT_UNIT_TIME_MS, DslEditor, DslProjectionError, MedeoDsl, UnsupportedDocumentFormatError, assertDslDocument, captionContentCodec, createInitialMedeoDsl, defaultIdFactory, documentFormat, fromVideoDraft, isInvalidAtomic, medeoDslLoroShape, relationId, resolveDslLayout, resourceId, timeAnchorCodec, toAudioScriptViews, toVideoDraft, tupleHash };

package/dist/index.js

@@ -1,7 +1,7 @@
 import { n as bytesToBase64, t as base64ToBytes } from "./base64-D-jd-dr5.js";
 import { a as covers, c as readMengineEventStream, d as MenginePushRejectedError, i as openManualDocument, l as MengineHttpClient, n as MedeoHttpDocStorage, o as decodeDocVersionMark, r as ManualSyncTransport, s as encodeDocVersionMark, t as MemoryDocStorage, u as MengineHttpRequestError } from "./storage-BW3tI_ER.js";
 import { a as documentFormat, c as isInvalidAtomic, ft as defaultIdFactory, ht as tupleHash, i as assertDslDocument, l as timeAnchorCodec, mt as resourceId, o as medeoDslLoroShape, pt as relationId, r as UnsupportedDocumentFormatError, s as captionContentCodec, t as DEFAULT_UNIT_TIME_MS } from "./video-draft-types-Ce8NDenQ.js";
-import { a as DslEditor, c as DslProjectionError, i as createInitialMedeoDsl, n as toVideoDraft, o as MedeoDsl, r as toAudioScriptViews, s as resolveDslLayout, t as fromVideoDraft } from "./dsl-DQ63zFgu.js";
+import { a as DslEditor, c as DslProjectionError, i as createInitialMedeoDsl, n as toVideoDraft, o as MedeoDsl, r as toAudioScriptViews, s as resolveDslLayout, t as fromVideoDraft } from "./dsl-DbYqFFOb.js";
 import { UndoManager, VersionVector, decodeImportBlobMeta } from "loro-crdt";
 import { ClientServerSynchronizer, DocManager } from "@mengine/sync";
 import { DisposableSet, EventBus } from "@mengine/utils";

package/dist/testing.js

@@ -1,6 +1,6 @@
 import { n as bytesToBase64, t as base64ToBytes } from "./base64-D-jd-dr5.js";
 import { a as documentFormat, i as assertDslDocument } from "./video-draft-types-Ce8NDenQ.js";
-import { a as DslEditor, i as createInitialMedeoDsl, n as toVideoDraft, o as MedeoDsl } from "./dsl-DQ63zFgu.js";
+import { a as DslEditor, i as createInitialMedeoDsl, n as toVideoDraft, o as MedeoDsl } from "./dsl-DbYqFFOb.js";
 import { t as classifyUpdate } from "./loro-relay-doc-Bi6JKqtQ.js";
 import { LoroDoc, VersionVector, encodeFrontiers } from "loro-crdt";
 //#region src/testing/in-memory-mengine-server.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mengine/medeo-client",
-  "version": "2.1.1-dsl.5",
+  "version": "2.1.1-dsl.7",
   "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.5",
-    "@mengine/utils": "2.1.1-dsl.5",
-    "@mengine/sync": "2.1.1-dsl.5"
+    "@mengine/storage": "2.1.1-dsl.7",
+    "@mengine/sync": "2.1.1-dsl.7",
+    "@mengine/utils": "2.1.1-dsl.7"
   },
   "devDependencies": {
     "@types/node": "^25.9.1",