akari-video 0.1.20 → 0.1.21

package/vendor/packages/edit-store/lib/internal-model.js

@@ -12,6 +12,7 @@ exports.projectLegacyEdit = projectLegacyEdit;
 exports.toLegacyTrack = toLegacyTrack;
 exports.derivedLegacyTracks = derivedLegacyTracks;
 const edit_v2_1 = require("./edit-v2");
+const cut_adjacency_1 = require("./cut-adjacency");
 const error_1 = require("./migrate/error");
 /**
  * edit.json v2 を内部表現へ読む。v0/v1 は凍結変換ユニットのみが読む。
@@ -172,6 +173,7 @@ function readV2Internal(raw) {
     // 旧 top-level audio と tracks[] 音声が同居すると、後者に加えてこの fallback も射影される。
     // どちらを優先するかは未裁定なので、旧 fixture の互換挙動を変えず二重計上の可能性を残す。
     addV2AudioItems(tracks, edit.audio, fps, legacyIndexCounters);
+    synthesizeHiddenTransitionHandlesForRender(tracks, fps);
     return {
         output: {
             width: edit.output.width,
@@ -191,6 +193,66 @@ function readV2Internal(raw) {
         }
     };
 }
+/**
+ * render-cut に加え shell プレビューの summary と Web UI の readRenderEdit も
+ * item.declaration を読む。そのため出荷プレビューはこの合成済み実重なりを既存窓として描く。
+ * UI / lint が読む item の at/duration/source と legacy.value は生タイムラインのまま保ち、
+ * 突き合わせ境界の隠れのりしろだけを declaration 上の物理重なりへ合成して既存
+ * xfade/acrossfade と 2 つのプレビューへ渡す。生 cuts を直接読む消費者の隠れのりしろ経路とは
+ * packages/edit-store/test/transition-window-path-equivalence.test.mjs で等価性を固定する。
+ */
+function synthesizeHiddenTransitionHandlesForRender(tracks, fps) {
+    const speedOf = (item) => {
+        const speed = item.declaration.speed;
+        return typeof speed === 'number' && Number.isFinite(speed) && speed > 0 ? speed : 1;
+    };
+    for (const track of tracks) {
+        if (track.lane !== 'visual')
+            continue;
+        const cuts = track.items.filter((item) => item.legacy.collection === 'cuts' && item.source.kind === 'media');
+        for (let index = 0; index + 1 < cuts.length; index++) {
+            const outgoing = cuts[index];
+            const incoming = cuts[index + 1];
+            if ((0, cut_adjacency_1.cutOverlapFrames)({ tlEnd: outgoing.at + outgoing.duration }, { tlStart: incoming.at }, fps) !== 0)
+                continue;
+            const transition = outgoing.declaration.transition_out;
+            if (!isRecord(transition)
+                || typeof transition.duration !== 'number'
+                || !Number.isFinite(transition.duration)
+                || transition.duration <= 0)
+                continue;
+            const incomingSpeed = speedOf(incoming);
+            const incomingStill = (0, cut_adjacency_1.isStillImageSourcePath)(incoming.source.path);
+            const plan = (0, cut_adjacency_1.planTransitionHandleWindow)({
+                declaredSeconds: transition.duration,
+                outgoingTailRoomSeconds: Number.POSITIVE_INFINITY,
+                incomingHeadRoomSeconds: incomingStill
+                    ? Number.POSITIVE_INFINITY : incoming.source.in / incomingSpeed,
+                outgoingDurationSeconds: outgoing.duration,
+                incomingDurationSeconds: incoming.duration
+            });
+            if (plan.effectiveSeconds <= 0)
+                continue;
+            const outgoingSpeed = speedOf(outgoing);
+            outgoing.declaration = {
+                ...outgoing.declaration,
+                out: Number(outgoing.declaration.out) + plan.halfSeconds * outgoingSpeed,
+                transition_out: { ...transition, duration: plan.effectiveSeconds }
+            };
+            incoming.declaration = incomingStill
+                ? {
+                    ...incoming.declaration,
+                    at: Number(incoming.declaration.at) - plan.halfSeconds,
+                    out: Number(incoming.declaration.out) + plan.halfSeconds * incomingSpeed
+                }
+                : {
+                    ...incoming.declaration,
+                    at: Number(incoming.declaration.at) - plan.halfSeconds,
+                    in: Number(incoming.declaration.in) - plan.halfSeconds * incomingSpeed
+                };
+        }
+    }
+}
 function legacyKindOfV2Track(track, chromaKeyOf, overlappingItemIds) {
     if (!('items' in track)) {
         return 'captions';

package/vendor/packages/edit-store/lib/migrate/legacy-parse.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseEdit = parseEdit;
+const transition_vocabulary_1 = require("../transition-vocabulary");
 const LAYER_BLEND_MODES = [
     'normal', 'screen', 'multiply', 'add', 'difference',
     'darken', 'lighten', 'overlay', 'hardlight', 'softlight'
@@ -78,16 +79,18 @@ function parseEdit(source) {
                 let transitionOut;
                 if (rawCut.transition_out !== undefined && rawCut.transition_out !== null) {
                     const transition = rawCut.transition_out;
-                    const validType = transition?.type === 'dissolve'
-                        || transition?.type === 'fade-black'
-                        || transition?.type === 'fade-white'
-                        || transition?.type === 'reveal-down'
-                        || transition?.type === 'reveal-up';
+                    // 正準語彙に加え、手編集で先行した非空文字列も読み取りだけは保持する。
+                    // 書き込み API は isTransitionType で閉じたまま、preview の汎用フォールバックへ渡す。
+                    const validType = (0, transition_vocabulary_1.isTransitionType)(transition?.type)
+                        || (typeof transition?.type === 'string' && transition.type.trim().length > 0);
                     const validDuration = typeof transition?.duration === 'number'
                         && Number.isFinite(transition.duration) && transition.duration > 0;
                     if (transition && typeof transition === 'object' && !Array.isArray(transition)
                         && validType && validDuration) {
-                        transitionOut = { type: transition.type, duration: transition.duration };
+                        transitionOut = {
+                            type: transition.type,
+                            duration: transition.duration
+                        };
                     }
                     else {
                         warnings.push(`${index + 1} 番目のクリップの transition_out が不正なため無視します。`);

package/vendor/packages/edit-store/lib/timeline-map.d.ts

@@ -56,6 +56,11 @@ export interface TimelineMapResult {
 export declare function transitionProgressAt(window: TimelineTransitionWindow, outputT: number): number;
 export declare function buildTimelineMap(cuts: readonly EditCut[], options?: {
     trackZ?: (track: number) => number;
+    fps?: number;
+    handleRoom?: (cutIndex: number) => {
+        tailSeconds?: number;
+        headSeconds?: number;
+    } | undefined;
 }): TimelineMapResult;
 /**
  * 出力秒 → ソース秒。トランジション重なり区間（隣接 src が重なる出力時刻）は

package/vendor/packages/edit-store/lib/timeline-map.js

@@ -16,6 +16,7 @@ exports.transitionProgressAt = transitionProgressAt;
 exports.buildTimelineMap = buildTimelineMap;
 exports.outputToSource = outputToSource;
 const edit_store_1 = require("./edit-store");
+const cut_adjacency_1 = require("./cut-adjacency");
 function transitionProgressAt(window, outputT) {
     if (!(window.duration > 0))
         return 0;
@@ -37,10 +38,49 @@ function buildTimelineMap(cuts, options) {
     const resolved = trackSegments.map(segment => ({
         start: segment.at,
         end: segment.end,
+        baseStart: segment.at,
+        baseEnd: segment.end,
         track: segment.track,
         cut: usableCuts[segment.index],
         cutIndex: usable[segment.index].index
     }));
+    const fps = options?.fps ?? cut_adjacency_1.DEFAULT_CUT_ADJACENCY_FPS;
+    // 隠れのりしろは、フレーム量子化で突き合わせとなる境界にだけ合成する。
+    // 実重なり済みの境界は一切変更せず、従来の窓計算へそのまま流す。
+    for (let outgoingIndex = 0; outgoingIndex < resolved.length; outgoingIndex++) {
+        const outgoing = resolved[outgoingIndex];
+        const transition = outgoing.cut.transitionOut;
+        if (!transition || !(typeof transition.duration === 'number' && Number.isFinite(transition.duration)
+            && transition.duration > 0))
+            continue;
+        const incoming = resolved.slice(outgoingIndex + 1).find(candidate => candidate.track === outgoing.track);
+        if (!incoming || (0, cut_adjacency_1.cutOverlapFrames)({ tlEnd: outgoing.end }, { tlStart: incoming.start }, fps) !== 0)
+            continue;
+        const outgoingRoom = options?.handleRoom?.(outgoing.cutIndex);
+        const incomingRoom = options?.handleRoom?.(incoming.cutIndex);
+        const incomingSpeed = typeof incoming.cut.speed === 'number' && incoming.cut.speed > 0
+            ? incoming.cut.speed : 1;
+        const plan = (0, cut_adjacency_1.planTransitionHandleWindow)({
+            declaredSeconds: transition.duration,
+            outgoingTailRoomSeconds: outgoingRoom?.tailSeconds ?? Number.POSITIVE_INFINITY,
+            incomingHeadRoomSeconds: incomingRoom?.headSeconds ?? incoming.cut.in / incomingSpeed,
+            outgoingDurationSeconds: outgoing.baseEnd - outgoing.baseStart,
+            incomingDurationSeconds: incoming.baseEnd - incoming.baseStart
+        });
+        if (plan.effectiveSeconds <= 0)
+            continue;
+        const cutPoint = outgoing.end;
+        outgoing.end = cutPoint + plan.halfSeconds;
+        outgoing.cut = {
+            ...outgoing.cut,
+            transitionOut: { ...transition, duration: plan.effectiveSeconds }
+        };
+        incoming.start = cutPoint - plan.halfSeconds;
+        incoming.cut = {
+            ...incoming.cut,
+            in: Math.max(0, incoming.cut.in - plan.halfSeconds * incomingSpeed)
+        };
+    }
     const segmentSlice = (entry, start, end, transitionOut = null) => {
         const cut = entry.cut;
         const speed = typeof cut.speed === 'number' && cut.speed > 0 ? cut.speed : 1;

package/vendor/packages/edit-store/lib/transition-vocabulary.d.ts

@@ -0,0 +1,223 @@
+/**
+ * edit.json の transition_out.type に使える正準語彙。
+ * JSON Schema はリテラル enum を保つため別置きだが、drift test でこの表と一致させる。
+ */
+export declare const TRANSITION_VOCABULARY: readonly [{
+    readonly id: "dissolve";
+    readonly xfadeName: "dissolve";
+    readonly labelJa: "ディゾルブ";
+    readonly category: "フェード";
+    readonly previewKind: "dissolve";
+    readonly glyph: "D";
+}, {
+    readonly id: "fade";
+    readonly xfadeName: "fade";
+    readonly labelJa: "クロスフェード";
+    readonly category: "フェード";
+    readonly previewKind: "fade";
+    readonly glyph: "F";
+}, {
+    readonly id: "fade-black";
+    readonly xfadeName: "fadeblack";
+    readonly labelJa: "黒フェード";
+    readonly category: "フェード";
+    readonly previewKind: "fade-black";
+    readonly glyph: "B";
+}, {
+    readonly id: "fade-white";
+    readonly xfadeName: "fadewhite";
+    readonly labelJa: "白フェード";
+    readonly category: "フェード";
+    readonly previewKind: "fade-white";
+    readonly glyph: "W";
+}, {
+    readonly id: "fade-grays";
+    readonly xfadeName: "fadegrays";
+    readonly labelJa: "モノクロフェード";
+    readonly category: "フェード";
+    readonly previewKind: "fade-grays";
+    readonly glyph: "G";
+}, {
+    readonly id: "wipe-left";
+    readonly xfadeName: "wipeleft";
+    readonly labelJa: "ワイプ（左へ）";
+    readonly category: "ワイプ";
+    readonly previewKind: "wipe-left";
+    readonly glyph: "←";
+}, {
+    readonly id: "wipe-right";
+    readonly xfadeName: "wiperight";
+    readonly labelJa: "ワイプ（右へ）";
+    readonly category: "ワイプ";
+    readonly previewKind: "wipe-right";
+    readonly glyph: "→";
+}, {
+    readonly id: "wipe-up";
+    readonly xfadeName: "wipeup";
+    readonly labelJa: "ワイプ（上へ）";
+    readonly category: "ワイプ";
+    readonly previewKind: "wipe-up";
+    readonly glyph: "↑";
+}, {
+    readonly id: "wipe-down";
+    readonly xfadeName: "wipedown";
+    readonly labelJa: "ワイプ（下へ）";
+    readonly category: "ワイプ";
+    readonly previewKind: "wipe-down";
+    readonly glyph: "↓";
+}, {
+    readonly id: "radial";
+    readonly xfadeName: "radial";
+    readonly labelJa: "時計ワイプ";
+    readonly category: "ワイプ";
+    readonly previewKind: "radial";
+    readonly glyph: "◷";
+}, {
+    readonly id: "slide-left";
+    readonly xfadeName: "slideleft";
+    readonly labelJa: "スライド（左へ）";
+    readonly category: "スライド";
+    readonly previewKind: "slide-left";
+    readonly glyph: "←";
+}, {
+    readonly id: "slide-right";
+    readonly xfadeName: "slideright";
+    readonly labelJa: "スライド（右へ）";
+    readonly category: "スライド";
+    readonly previewKind: "slide-right";
+    readonly glyph: "→";
+}, {
+    readonly id: "slide-up";
+    readonly xfadeName: "slideup";
+    readonly labelJa: "スライド（上へ）";
+    readonly category: "スライド";
+    readonly previewKind: "slide-up";
+    readonly glyph: "↑";
+}, {
+    readonly id: "slide-down";
+    readonly xfadeName: "slidedown";
+    readonly labelJa: "スライド（下へ）";
+    readonly category: "スライド";
+    readonly previewKind: "slide-down";
+    readonly glyph: "↓";
+}, {
+    readonly id: "cover-left";
+    readonly xfadeName: "coverleft";
+    readonly labelJa: "カバー（左へ）";
+    readonly category: "カバー";
+    readonly previewKind: "cover-left";
+    readonly glyph: "←";
+}, {
+    readonly id: "cover-right";
+    readonly xfadeName: "coverright";
+    readonly labelJa: "カバー（右へ）";
+    readonly category: "カバー";
+    readonly previewKind: "cover-right";
+    readonly glyph: "→";
+}, {
+    readonly id: "cover-up";
+    readonly xfadeName: "coverup";
+    readonly labelJa: "カバー（上へ）";
+    readonly category: "カバー";
+    readonly previewKind: "cover-up";
+    readonly glyph: "↑";
+}, {
+    readonly id: "cover-down";
+    readonly xfadeName: "coverdown";
+    readonly labelJa: "カバー（下へ）";
+    readonly category: "カバー";
+    readonly previewKind: "cover-down";
+    readonly glyph: "↓";
+}, {
+    readonly id: "reveal-left";
+    readonly xfadeName: "revealleft";
+    readonly labelJa: "リビール（左へ）";
+    readonly category: "リビール";
+    readonly previewKind: "reveal-left";
+    readonly glyph: "←";
+}, {
+    readonly id: "reveal-right";
+    readonly xfadeName: "revealright";
+    readonly labelJa: "リビール（右へ）";
+    readonly category: "リビール";
+    readonly previewKind: "reveal-right";
+    readonly glyph: "→";
+}, {
+    readonly id: "reveal-down";
+    readonly xfadeName: "revealdown";
+    readonly labelJa: "上からリビール";
+    readonly category: "リビール";
+    readonly previewKind: "reveal-down";
+    readonly glyph: "↓";
+}, {
+    readonly id: "reveal-up";
+    readonly xfadeName: "revealup";
+    readonly labelJa: "下からリビール";
+    readonly category: "リビール";
+    readonly previewKind: "reveal-up";
+    readonly glyph: "↑";
+}, {
+    readonly id: "circle-open";
+    readonly xfadeName: "circleopen";
+    readonly labelJa: "サークル（開く）";
+    readonly category: "形状";
+    readonly previewKind: "circle-open";
+    readonly glyph: "○";
+}, {
+    readonly id: "circle-close";
+    readonly xfadeName: "circleclose";
+    readonly labelJa: "サークル（閉じる）";
+    readonly category: "形状";
+    readonly previewKind: "circle-close";
+    readonly glyph: "●";
+}, {
+    readonly id: "zoom-in";
+    readonly xfadeName: "zoomin";
+    readonly labelJa: "ズームイン";
+    readonly category: "変形";
+    readonly previewKind: "zoom-in";
+    readonly glyph: "＋";
+}, {
+    readonly id: "squeeze-h";
+    readonly xfadeName: "squeezeh";
+    readonly labelJa: "スクイーズ（縦つぶし）";
+    readonly category: "変形";
+    readonly previewKind: "squeeze-h";
+    readonly glyph: "↕";
+}, {
+    readonly id: "squeeze-v";
+    readonly xfadeName: "squeezev";
+    readonly labelJa: "スクイーズ（横つぶし）";
+    readonly category: "変形";
+    readonly previewKind: "squeeze-v";
+    readonly glyph: "↔";
+}, {
+    readonly id: "blur";
+    readonly xfadeName: "hblur";
+    readonly labelJa: "ブラー";
+    readonly category: "質感";
+    readonly previewKind: "blur";
+    readonly glyph: "B";
+}, {
+    readonly id: "pixelize";
+    readonly xfadeName: "pixelize";
+    readonly labelJa: "ピクセレート";
+    readonly category: "質感";
+    readonly previewKind: "pixelize";
+    readonly glyph: "P";
+}];
+export type TransitionDefinition = typeof TRANSITION_VOCABULARY[number];
+export type TransitionType = TransitionDefinition['id'];
+export type TransitionCategory = TransitionDefinition['category'];
+export type TransitionPreviewKind = TransitionDefinition['previewKind'];
+declare const unknownTransitionTypeBrand: unique symbol;
+/** 読み取り側だけが保持する、schema より先行した未知種別。書き込み API には使わない。 */
+export type UnknownTransitionType = string & {
+    readonly [unknownTransitionTypeBrand]: true;
+};
+export type ReadableTransitionType = TransitionType | UnknownTransitionType;
+export declare const TRANSITION_TYPE_IDS: readonly TransitionType[];
+export declare const TRANSITION_CATEGORIES: readonly TransitionCategory[];
+export declare const TRANSITION_BY_ID: Readonly<Record<TransitionType, TransitionDefinition>>;
+export declare function isTransitionType(value: unknown): value is TransitionType;
+export {};

package/vendor/packages/edit-store/lib/transition-vocabulary.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TRANSITION_BY_ID = exports.TRANSITION_CATEGORIES = exports.TRANSITION_TYPE_IDS = exports.TRANSITION_VOCABULARY = void 0;
+exports.isTransitionType = isTransitionType;
+/**
+ * edit.json の transition_out.type に使える正準語彙。
+ * JSON Schema はリテラル enum を保つため別置きだが、drift test でこの表と一致させる。
+ */
+exports.TRANSITION_VOCABULARY = [
+    { id: 'dissolve', xfadeName: 'dissolve', labelJa: 'ディゾルブ', category: 'フェード', previewKind: 'dissolve', glyph: 'D' },
+    { id: 'fade', xfadeName: 'fade', labelJa: 'クロスフェード', category: 'フェード', previewKind: 'fade', glyph: 'F' },
+    { id: 'fade-black', xfadeName: 'fadeblack', labelJa: '黒フェード', category: 'フェード', previewKind: 'fade-black', glyph: 'B' },
+    { id: 'fade-white', xfadeName: 'fadewhite', labelJa: '白フェード', category: 'フェード', previewKind: 'fade-white', glyph: 'W' },
+    { id: 'fade-grays', xfadeName: 'fadegrays', labelJa: 'モノクロフェード', category: 'フェード', previewKind: 'fade-grays', glyph: 'G' },
+    { id: 'wipe-left', xfadeName: 'wipeleft', labelJa: 'ワイプ（左へ）', category: 'ワイプ', previewKind: 'wipe-left', glyph: '←' },
+    { id: 'wipe-right', xfadeName: 'wiperight', labelJa: 'ワイプ（右へ）', category: 'ワイプ', previewKind: 'wipe-right', glyph: '→' },
+    { id: 'wipe-up', xfadeName: 'wipeup', labelJa: 'ワイプ（上へ）', category: 'ワイプ', previewKind: 'wipe-up', glyph: '↑' },
+    { id: 'wipe-down', xfadeName: 'wipedown', labelJa: 'ワイプ（下へ）', category: 'ワイプ', previewKind: 'wipe-down', glyph: '↓' },
+    { id: 'radial', xfadeName: 'radial', labelJa: '時計ワイプ', category: 'ワイプ', previewKind: 'radial', glyph: '◷' },
+    { id: 'slide-left', xfadeName: 'slideleft', labelJa: 'スライド（左へ）', category: 'スライド', previewKind: 'slide-left', glyph: '←' },
+    { id: 'slide-right', xfadeName: 'slideright', labelJa: 'スライド（右へ）', category: 'スライド', previewKind: 'slide-right', glyph: '→' },
+    { id: 'slide-up', xfadeName: 'slideup', labelJa: 'スライド（上へ）', category: 'スライド', previewKind: 'slide-up', glyph: '↑' },
+    { id: 'slide-down', xfadeName: 'slidedown', labelJa: 'スライド（下へ）', category: 'スライド', previewKind: 'slide-down', glyph: '↓' },
+    { id: 'cover-left', xfadeName: 'coverleft', labelJa: 'カバー（左へ）', category: 'カバー', previewKind: 'cover-left', glyph: '←' },
+    { id: 'cover-right', xfadeName: 'coverright', labelJa: 'カバー（右へ）', category: 'カバー', previewKind: 'cover-right', glyph: '→' },
+    { id: 'cover-up', xfadeName: 'coverup', labelJa: 'カバー（上へ）', category: 'カバー', previewKind: 'cover-up', glyph: '↑' },
+    { id: 'cover-down', xfadeName: 'coverdown', labelJa: 'カバー（下へ）', category: 'カバー', previewKind: 'cover-down', glyph: '↓' },
+    { id: 'reveal-left', xfadeName: 'revealleft', labelJa: 'リビール（左へ）', category: 'リビール', previewKind: 'reveal-left', glyph: '←' },
+    { id: 'reveal-right', xfadeName: 'revealright', labelJa: 'リビール（右へ）', category: 'リビール', previewKind: 'reveal-right', glyph: '→' },
+    { id: 'reveal-down', xfadeName: 'revealdown', labelJa: '上からリビール', category: 'リビール', previewKind: 'reveal-down', glyph: '↓' },
+    { id: 'reveal-up', xfadeName: 'revealup', labelJa: '下からリビール', category: 'リビール', previewKind: 'reveal-up', glyph: '↑' },
+    { id: 'circle-open', xfadeName: 'circleopen', labelJa: 'サークル（開く）', category: '形状', previewKind: 'circle-open', glyph: '○' },
+    { id: 'circle-close', xfadeName: 'circleclose', labelJa: 'サークル（閉じる）', category: '形状', previewKind: 'circle-close', glyph: '●' },
+    { id: 'zoom-in', xfadeName: 'zoomin', labelJa: 'ズームイン', category: '変形', previewKind: 'zoom-in', glyph: '＋' },
+    { id: 'squeeze-h', xfadeName: 'squeezeh', labelJa: 'スクイーズ（縦つぶし）', category: '変形', previewKind: 'squeeze-h', glyph: '↕' },
+    { id: 'squeeze-v', xfadeName: 'squeezev', labelJa: 'スクイーズ（横つぶし）', category: '変形', previewKind: 'squeeze-v', glyph: '↔' },
+    { id: 'blur', xfadeName: 'hblur', labelJa: 'ブラー', category: '質感', previewKind: 'blur', glyph: 'B' },
+    { id: 'pixelize', xfadeName: 'pixelize', labelJa: 'ピクセレート', category: '質感', previewKind: 'pixelize', glyph: 'P' }
+];
+exports.TRANSITION_TYPE_IDS = exports.TRANSITION_VOCABULARY.map(entry => entry.id);
+exports.TRANSITION_CATEGORIES = [...new Set(exports.TRANSITION_VOCABULARY.map(entry => entry.category))];
+exports.TRANSITION_BY_ID = Object.fromEntries(exports.TRANSITION_VOCABULARY.map(entry => [entry.id, entry]));
+function isTransitionType(value) {
+    return typeof value === 'string' && Object.prototype.hasOwnProperty.call(exports.TRANSITION_BY_ID, value);
+}

package/vendor/packages/edit-store/lib/webview-kernel.js

@@ -28,6 +28,42 @@ var AkariEditKernel = (() => {
     transitionProgressAt: () => transitionProgressAt
   });
 
+  // src/transition-vocabulary.ts
+  var TRANSITION_VOCABULARY = [
+    { id: "dissolve", xfadeName: "dissolve", labelJa: "\u30C7\u30A3\u30BE\u30EB\u30D6", category: "\u30D5\u30A7\u30FC\u30C9", previewKind: "dissolve", glyph: "D" },
+    { id: "fade", xfadeName: "fade", labelJa: "\u30AF\u30ED\u30B9\u30D5\u30A7\u30FC\u30C9", category: "\u30D5\u30A7\u30FC\u30C9", previewKind: "fade", glyph: "F" },
+    { id: "fade-black", xfadeName: "fadeblack", labelJa: "\u9ED2\u30D5\u30A7\u30FC\u30C9", category: "\u30D5\u30A7\u30FC\u30C9", previewKind: "fade-black", glyph: "B" },
+    { id: "fade-white", xfadeName: "fadewhite", labelJa: "\u767D\u30D5\u30A7\u30FC\u30C9", category: "\u30D5\u30A7\u30FC\u30C9", previewKind: "fade-white", glyph: "W" },
+    { id: "fade-grays", xfadeName: "fadegrays", labelJa: "\u30E2\u30CE\u30AF\u30ED\u30D5\u30A7\u30FC\u30C9", category: "\u30D5\u30A7\u30FC\u30C9", previewKind: "fade-grays", glyph: "G" },
+    { id: "wipe-left", xfadeName: "wipeleft", labelJa: "\u30EF\u30A4\u30D7\uFF08\u5DE6\u3078\uFF09", category: "\u30EF\u30A4\u30D7", previewKind: "wipe-left", glyph: "\u2190" },
+    { id: "wipe-right", xfadeName: "wiperight", labelJa: "\u30EF\u30A4\u30D7\uFF08\u53F3\u3078\uFF09", category: "\u30EF\u30A4\u30D7", previewKind: "wipe-right", glyph: "\u2192" },
+    { id: "wipe-up", xfadeName: "wipeup", labelJa: "\u30EF\u30A4\u30D7\uFF08\u4E0A\u3078\uFF09", category: "\u30EF\u30A4\u30D7", previewKind: "wipe-up", glyph: "\u2191" },
+    { id: "wipe-down", xfadeName: "wipedown", labelJa: "\u30EF\u30A4\u30D7\uFF08\u4E0B\u3078\uFF09", category: "\u30EF\u30A4\u30D7", previewKind: "wipe-down", glyph: "\u2193" },
+    { id: "radial", xfadeName: "radial", labelJa: "\u6642\u8A08\u30EF\u30A4\u30D7", category: "\u30EF\u30A4\u30D7", previewKind: "radial", glyph: "\u25F7" },
+    { id: "slide-left", xfadeName: "slideleft", labelJa: "\u30B9\u30E9\u30A4\u30C9\uFF08\u5DE6\u3078\uFF09", category: "\u30B9\u30E9\u30A4\u30C9", previewKind: "slide-left", glyph: "\u2190" },
+    { id: "slide-right", xfadeName: "slideright", labelJa: "\u30B9\u30E9\u30A4\u30C9\uFF08\u53F3\u3078\uFF09", category: "\u30B9\u30E9\u30A4\u30C9", previewKind: "slide-right", glyph: "\u2192" },
+    { id: "slide-up", xfadeName: "slideup", labelJa: "\u30B9\u30E9\u30A4\u30C9\uFF08\u4E0A\u3078\uFF09", category: "\u30B9\u30E9\u30A4\u30C9", previewKind: "slide-up", glyph: "\u2191" },
+    { id: "slide-down", xfadeName: "slidedown", labelJa: "\u30B9\u30E9\u30A4\u30C9\uFF08\u4E0B\u3078\uFF09", category: "\u30B9\u30E9\u30A4\u30C9", previewKind: "slide-down", glyph: "\u2193" },
+    { id: "cover-left", xfadeName: "coverleft", labelJa: "\u30AB\u30D0\u30FC\uFF08\u5DE6\u3078\uFF09", category: "\u30AB\u30D0\u30FC", previewKind: "cover-left", glyph: "\u2190" },
+    { id: "cover-right", xfadeName: "coverright", labelJa: "\u30AB\u30D0\u30FC\uFF08\u53F3\u3078\uFF09", category: "\u30AB\u30D0\u30FC", previewKind: "cover-right", glyph: "\u2192" },
+    { id: "cover-up", xfadeName: "coverup", labelJa: "\u30AB\u30D0\u30FC\uFF08\u4E0A\u3078\uFF09", category: "\u30AB\u30D0\u30FC", previewKind: "cover-up", glyph: "\u2191" },
+    { id: "cover-down", xfadeName: "coverdown", labelJa: "\u30AB\u30D0\u30FC\uFF08\u4E0B\u3078\uFF09", category: "\u30AB\u30D0\u30FC", previewKind: "cover-down", glyph: "\u2193" },
+    { id: "reveal-left", xfadeName: "revealleft", labelJa: "\u30EA\u30D3\u30FC\u30EB\uFF08\u5DE6\u3078\uFF09", category: "\u30EA\u30D3\u30FC\u30EB", previewKind: "reveal-left", glyph: "\u2190" },
+    { id: "reveal-right", xfadeName: "revealright", labelJa: "\u30EA\u30D3\u30FC\u30EB\uFF08\u53F3\u3078\uFF09", category: "\u30EA\u30D3\u30FC\u30EB", previewKind: "reveal-right", glyph: "\u2192" },
+    { id: "reveal-down", xfadeName: "revealdown", labelJa: "\u4E0A\u304B\u3089\u30EA\u30D3\u30FC\u30EB", category: "\u30EA\u30D3\u30FC\u30EB", previewKind: "reveal-down", glyph: "\u2193" },
+    { id: "reveal-up", xfadeName: "revealup", labelJa: "\u4E0B\u304B\u3089\u30EA\u30D3\u30FC\u30EB", category: "\u30EA\u30D3\u30FC\u30EB", previewKind: "reveal-up", glyph: "\u2191" },
+    { id: "circle-open", xfadeName: "circleopen", labelJa: "\u30B5\u30FC\u30AF\u30EB\uFF08\u958B\u304F\uFF09", category: "\u5F62\u72B6", previewKind: "circle-open", glyph: "\u25CB" },
+    { id: "circle-close", xfadeName: "circleclose", labelJa: "\u30B5\u30FC\u30AF\u30EB\uFF08\u9589\u3058\u308B\uFF09", category: "\u5F62\u72B6", previewKind: "circle-close", glyph: "\u25CF" },
+    { id: "zoom-in", xfadeName: "zoomin", labelJa: "\u30BA\u30FC\u30E0\u30A4\u30F3", category: "\u5909\u5F62", previewKind: "zoom-in", glyph: "\uFF0B" },
+    { id: "squeeze-h", xfadeName: "squeezeh", labelJa: "\u30B9\u30AF\u30A4\u30FC\u30BA\uFF08\u7E26\u3064\u3076\u3057\uFF09", category: "\u5909\u5F62", previewKind: "squeeze-h", glyph: "\u2195" },
+    { id: "squeeze-v", xfadeName: "squeezev", labelJa: "\u30B9\u30AF\u30A4\u30FC\u30BA\uFF08\u6A2A\u3064\u3076\u3057\uFF09", category: "\u5909\u5F62", previewKind: "squeeze-v", glyph: "\u2194" },
+    { id: "blur", xfadeName: "hblur", labelJa: "\u30D6\u30E9\u30FC", category: "\u8CEA\u611F", previewKind: "blur", glyph: "B" },
+    { id: "pixelize", xfadeName: "pixelize", labelJa: "\u30D4\u30AF\u30BB\u30EC\u30FC\u30C8", category: "\u8CEA\u611F", previewKind: "pixelize", glyph: "P" }
+  ];
+  var TRANSITION_TYPE_IDS = TRANSITION_VOCABULARY.map((entry) => entry.id);
+  var TRANSITION_CATEGORIES = [...new Set(TRANSITION_VOCABULARY.map((entry) => entry.category))];
+  var TRANSITION_BY_ID = Object.fromEntries(TRANSITION_VOCABULARY.map((entry) => [entry.id, entry]));
+
   // src/edit-store.ts
   function computeCutTrackSegments(cuts) {
     const cursorByTrack = /* @__PURE__ */ new Map();
@@ -50,6 +86,32 @@ var AkariEditKernel = (() => {
     return segments;
   }
 
+  // src/cut-adjacency.ts
+  var DEFAULT_CUT_ADJACENCY_FPS = 30;
+  function effectiveCutFps(fps) {
+    return Number.isFinite(fps) && fps > 0 ? fps : DEFAULT_CUT_ADJACENCY_FPS;
+  }
+  function cutOverlapFrames(earlier, later, fps = DEFAULT_CUT_ADJACENCY_FPS) {
+    const resolvedFps = effectiveCutFps(fps);
+    return Math.round(earlier.tlEnd * resolvedFps) - Math.round(later.tlStart * resolvedFps);
+  }
+  var nonNegativeRoom = (value) => value === Number.POSITIVE_INFINITY ? value : Number.isFinite(value) && value > 0 ? value : 0;
+  function planTransitionHandleWindow(input) {
+    const declaredSeconds = Number.isFinite(input.declaredSeconds) && input.declaredSeconds > 0 ? input.declaredSeconds : 0;
+    const effectiveSeconds = Math.max(0, Math.min(
+      declaredSeconds,
+      2 * nonNegativeRoom(input.outgoingTailRoomSeconds),
+      2 * nonNegativeRoom(input.incomingHeadRoomSeconds),
+      2 * nonNegativeRoom(input.outgoingDurationSeconds),
+      2 * nonNegativeRoom(input.incomingDurationSeconds)
+    ));
+    return {
+      effectiveSeconds,
+      halfSeconds: effectiveSeconds / 2,
+      outcome: effectiveSeconds <= 0 ? "none" : effectiveSeconds < declaredSeconds ? "clamped" : "full"
+    };
+  }
+
   // src/timeline-map.ts
   function transitionProgressAt(window, outputT) {
     if (!(window.duration > 0)) return 0;
@@ -68,10 +130,46 @@ var AkariEditKernel = (() => {
     const resolved = trackSegments.map((segment) => ({
       start: segment.at,
       end: segment.end,
+      baseStart: segment.at,
+      baseEnd: segment.end,
       track: segment.track,
       cut: usableCuts[segment.index],
       cutIndex: usable[segment.index].index
     }));
+    const fps = options?.fps ?? DEFAULT_CUT_ADJACENCY_FPS;
+    for (let outgoingIndex = 0; outgoingIndex < resolved.length; outgoingIndex++) {
+      const outgoing = resolved[outgoingIndex];
+      const transition = outgoing.cut.transitionOut;
+      if (!transition || !(typeof transition.duration === "number" && Number.isFinite(transition.duration) && transition.duration > 0)) continue;
+      const incoming = resolved.slice(outgoingIndex + 1).find((candidate) => candidate.track === outgoing.track);
+      if (!incoming || cutOverlapFrames(
+        { tlEnd: outgoing.end },
+        { tlStart: incoming.start },
+        fps
+      ) !== 0) continue;
+      const outgoingRoom = options?.handleRoom?.(outgoing.cutIndex);
+      const incomingRoom = options?.handleRoom?.(incoming.cutIndex);
+      const incomingSpeed = typeof incoming.cut.speed === "number" && incoming.cut.speed > 0 ? incoming.cut.speed : 1;
+      const plan = planTransitionHandleWindow({
+        declaredSeconds: transition.duration,
+        outgoingTailRoomSeconds: outgoingRoom?.tailSeconds ?? Number.POSITIVE_INFINITY,
+        incomingHeadRoomSeconds: incomingRoom?.headSeconds ?? incoming.cut.in / incomingSpeed,
+        outgoingDurationSeconds: outgoing.baseEnd - outgoing.baseStart,
+        incomingDurationSeconds: incoming.baseEnd - incoming.baseStart
+      });
+      if (plan.effectiveSeconds <= 0) continue;
+      const cutPoint = outgoing.end;
+      outgoing.end = cutPoint + plan.halfSeconds;
+      outgoing.cut = {
+        ...outgoing.cut,
+        transitionOut: { ...transition, duration: plan.effectiveSeconds }
+      };
+      incoming.start = cutPoint - plan.halfSeconds;
+      incoming.cut = {
+        ...incoming.cut,
+        in: Math.max(0, incoming.cut.in - plan.halfSeconds * incomingSpeed)
+      };
+    }
     const segmentSlice = (entry, start, end, transitionOut = null) => {
       const cut = entry.cut;
       const speed = typeof cut.speed === "number" && cut.speed > 0 ? cut.speed : 1;

package/vendor/packages/matte-rvm/package.json

@@ -0,0 +1,22 @@
+{
+  "name": "@akari-video/matte-rvm",
+  "version": "0.1.0",
+  "private": true,
+  "type": "module",
+  "description": "Robust Video Matting model deployment and raw BGRA inference helper.",
+  "main": "src/index.mjs",
+  "exports": {
+    ".": "./src/index.mjs"
+  },
+  "scripts": {
+    "postinstall": "node scripts/fetch-models.mjs",
+    "fetch:resnet50": "node scripts/fetch-models.mjs --model resnet50",
+    "test": "node --test \"test/*.test.mjs\""
+  },
+  "dependencies": {
+    "onnxruntime-node": "1.29.0"
+  },
+  "engines": {
+    "node": ">=20"
+  }
+}

package/vendor/packages/schemas/bin/validate-edit.mjs

@@ -6,6 +6,9 @@
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
+import { createRequire } from "node:module";
+
+const { TRANSITION_TYPE_IDS } = createRequire(import.meta.url)("../../edit-store/lib/index.js");
 
 const LAYER_KINDS = new Set(["baked", "video", "filter"]);
 const LAYER_BLEND_MODES = new Set([
@@ -1063,8 +1066,8 @@ function validateTransitionOut(value, label) {
     fail(`${label} は object である必要があります`);
     return;
   }
-  if (!["dissolve", "fade-black", "fade-white", "reveal-down", "reveal-up"].includes(value.type)) {
-    fail(`${label}.type は dissolve/fade-black/fade-white/reveal-down/reveal-up のいずれかである必要があります`);
+  if (!TRANSITION_TYPE_IDS.includes(value.type)) {
+    fail(`${label}.type は ${TRANSITION_TYPE_IDS.join("/")} のいずれかである必要があります`);
   }
   if (!isFiniteNumber(value.duration) || value.duration <= 0) {
     fail(`${label}.duration は 0 より大きい有限数である必要があります`);

package/vendor/packages/schemas/edit.schema.json

@@ -279,10 +279,10 @@
       "additionalProperties": true,
       "required": ["type", "duration"],
       "properties": {
-        "type": { "enum": ["dissolve", "fade-black", "fade-white", "reveal-down", "reveal-up"] },
+        "type": { "enum": ["dissolve", "fade", "fade-black", "fade-white", "fade-grays", "wipe-left", "wipe-right", "wipe-up", "wipe-down", "radial", "slide-left", "slide-right", "slide-up", "slide-down", "cover-left", "cover-right", "cover-up", "cover-down", "reveal-left", "reveal-right", "reveal-down", "reveal-up", "circle-open", "circle-close", "zoom-in", "squeeze-h", "squeeze-v", "blur", "pixelize"] },
         "duration": { "$ref": "#/$defs/positiveNumber" }
       },
-      "$comment": "docs/contract-2026-07-22-render-basics.md #3。v0 は指定されたカット境界のみ xfade 経路（残裁定3）。ffmpeg xfade の transition 名へ直接対応: dissolve/fadeblack/fadewhite/revealdown/revealup。reveal-down / reveal-up は前カットが丸ごとその方向へ動いて画面外へ抜け、空いた側から次カットが現れる（2026-08-14 追加）。"
+      "$comment": "docs/contract-2026-07-22-render-basics.md #3。v0 は指定されたカット境界のみ xfade 経路（残裁定3）。enum は packages/edit-store の正準トランジション語彙と drift test で一致させる。"
     },
     "cutTransform": {
       "type": "object",