π₯ Make videos programmatically with React
`@remotion/canvas`: Add headless timeline primitives
JonnyBurger8e14106cdeac
diff --git a/bun.lock b/bun.lockindex fabad543e8..eb6fdd40a5 100644--- a/bun.lock+++ b/bun.lock@@ -191,6 +191,18 @@"react-dom": ">=16.8.0",},},+ "packages/canvas": {+ "name": "@remotion/canvas",+ "version": "4.0.516",+ "dependencies": {+ "remotion": "workspace:*",+ },+ "devDependencies": {+ "@remotion/eslint-config-internal": "workspace:*",+ "@typescript/native-preview": "catalog:",+ "eslint": "catalog:",+ },+ },"packages/canvas-capture-extension": {"name": "@remotion/canvas-capture-extension","version": "4.0.516",@@ -1774,6 +1786,7 @@"version": "4.0.516","dependencies": {"@jridgewell/trace-mapping": "0.3.31",+ "@remotion/canvas": "workspace:*","@remotion/captions": "workspace:*","@remotion/media-utils": "workspace:*","@remotion/player": "workspace:*",@@ -4348,6 +4361,8 @@"@remotion/bundler": ["@remotion/bundler@workspace:packages/bundler"],+ "@remotion/canvas": ["@remotion/canvas@workspace:packages/canvas"],+"@remotion/canvas-capture-extension": ["@remotion/canvas-capture-extension@workspace:packages/canvas-capture-extension"],"@remotion/captions": ["@remotion/captions@workspace:packages/captions"],diff --git a/packages/canvas/.npmignore b/packages/canvas/.npmignorenew file mode 100644index 0000000000..eb76a5ae81--- /dev/null+++ b/packages/canvas/.npmignore@@ -0,0 +1,10 @@+dist/test/**+src+eslint.config.mjs+tsconfig.tsbuildinfo+*.tgz+.turbo+tsconfig.json+.prettierrc.js+bundle.ts+dist/cjs/testdiff --git a/packages/canvas/README.md b/packages/canvas/README.mdnew file mode 100644index 0000000000..6f43f4d533--- /dev/null+++ b/packages/canvas/README.md@@ -0,0 +1,6 @@+# @remotion/canvas++Headless primitives for Remotion authoring interfaces.++This package is an internal dependency of Remotion Studio. Its API is not yet+ready for general use.diff --git a/packages/canvas/bundle.ts b/packages/canvas/bundle.tsnew file mode 100644index 0000000000..4b515570bb--- /dev/null+++ b/packages/canvas/bundle.ts@@ -0,0 +1,40 @@+import path from 'path';+import {build} from 'bun';++if (process.env.NODE_ENV !== 'production') {+ throw new Error('This script must be run using NODE_ENV=production');+}++const external = ['remotion'];++console.time('Generated.');+const esmOutput = await build({+ entrypoints: ['src/index.ts'],+ naming: '[name].mjs',+ external,+});+const cjsOutput = await build({+ entrypoints: ['src/index.ts'],+ naming: '[name].cjs',+ format: 'cjs',+ external,+});++for (const output of [esmOutput, cjsOutput]) {+ if (!output.success) {+ console.log(output.logs.join('\n'));+ process.exit(1);+ }+}++for (const file of esmOutput.outputs) {+ const str = await file.text();+ await Bun.write(path.join('dist', 'esm', file.path), str);+}++for (const file of cjsOutput.outputs) {+ const str = await file.text();+ await Bun.write(path.join('dist', file.path), str);+}++console.timeEnd('Generated.');diff --git a/packages/canvas/eslint.config.mjs b/packages/canvas/eslint.config.mjsnew file mode 100644index 0000000000..04fd4fac11--- /dev/null+++ b/packages/canvas/eslint.config.mjs@@ -0,0 +1,7 @@+import {remotionFlatConfig} from '@remotion/eslint-config-internal';++const config = remotionFlatConfig({react: false});++export default {+ ...config,+};diff --git a/packages/canvas/package.json b/packages/canvas/package.jsonnew file mode 100644index 0000000000..50d1485c6e--- /dev/null+++ b/packages/canvas/package.json@@ -0,0 +1,52 @@+{+ "repository": {+ "url": "https://github.com/remotion-dev/remotion/tree/main/packages/canvas"+ },+ "name": "@remotion/canvas",+ "version": "4.0.516",+ "description": "Headless primitives for Remotion authoring interfaces",+ "main": "dist/index.cjs",+ "types": "dist/index.d.ts",+ "module": "dist/esm/index.mjs",+ "type": "module",+ "scripts": {+ "test": "bun test src/test",+ "formatting": "oxfmt src --check",+ "format": "oxfmt src",+ "lint": "eslint src",+ "watch": "tsgo -w",+ "make": "tsgo && bun --env-file=../.env.bundle bundle.ts"+ },+ "author": "Jonny Burger <[email protected]>",+ "contributors": [],+ "license": "Remotion License",+ "bugs": {+ "url": "https://github.com/remotion-dev/remotion/issues"+ },+ "dependencies": {+ "remotion": "workspace:*"+ },+ "exports": {+ "./package.json": "./package.json",+ ".": {+ "types": "./dist/index.d.ts",+ "require": "./dist/index.cjs",+ "module": "./dist/esm/index.mjs",+ "import": "./dist/esm/index.mjs"+ }+ },+ "devDependencies": {+ "@remotion/eslint-config-internal": "workspace:*",+ "@typescript/native-preview": "catalog:",+ "eslint": "catalog:"+ },+ "keywords": [+ "remotion",+ "canvas",+ "timeline"+ ],+ "publishConfig": {+ "access": "public"+ },+ "homepage": "https://www.remotion.dev"+}diff --git a/packages/canvas/src/calculate-timeline.ts b/packages/canvas/src/calculate-timeline.tsnew file mode 100644index 0000000000..95460488f0--- /dev/null+++ b/packages/canvas/src/calculate-timeline.ts@@ -0,0 +1,206 @@+import type {+ _InternalTypes,+ LoopDisplay,+ OverrideIdToNodePaths,+ TSequence,+} from 'remotion';+import {getConnectedCompositions} from './get-connected-compositions';+import {+ getCascadedStart,+ getCascadedStartWithTrim,+ getTimelineVisibleDuration,+ getTimelineVisibleStart,+} from './get-sequence-visible-range';+import {getTimelineNestedLevel} from './get-timeline-nestedness';+import type {+ TimelineTrackData,+ TimelineTrackWithOriginalTimings,+} from './get-timeline-sequence-sort-key';+import {getTimelineSequenceSortKey} from './get-timeline-sequence-sort-key';+import {sortItemsByNonceHistory} from './sort-by-nonce-history';+import {timelineSequenceNodePathToKey} from './timeline-sequence-node-path-to-key';++const getInheritedLoopDisplay = (+ sequence: TSequence,+ sequences: TSequence[],+): LoopDisplay | undefined => {+ if (sequence.loopDisplay) {+ return sequence.loopDisplay;+ }++ if (!sequence.parent) {+ return undefined;+ }++ const parent = sequences.find((s) => s.id === sequence.parent);+ if (!parent) {+ return undefined;+ }++ return getInheritedLoopDisplay(parent, sequences);+};++export const calculateTimeline = ({+ sequences,+ overrideIdsToNodePaths,+ compositions = [],+}: {+ sequences: TSequence[];+ overrideIdsToNodePaths: OverrideIdToNodePaths;+ compositions?: readonly _InternalTypes['AnyComposition'][];+}): TimelineTrackData[] => {+ const sortedSequences = sortItemsByNonceHistory(sequences);+ const tracks: TimelineTrackWithOriginalTimings[] = [];++ if (sortedSequences.length === 0) {+ return [];+ }++ const connectedCompositionsBySequenceId = new Map<+ string,+ readonly _InternalTypes['AnyComposition'][]+ >();+ for (const sequence of sortedSequences) {+ const connectedCompositions = getConnectedCompositions({+ compositions,+ singleChildComponent: sequence.singleChildComponent,+ });+ if (connectedCompositions.length > 0) {+ connectedCompositionsBySequenceId.set(sequence.id, connectedCompositions);+ }+ }++ const sequencesById = new Map(+ sortedSequences.map((sequence) => [sequence.id, sequence]),+ );+ const timelineSequences = sortedSequences.filter((sequence) => {+ let parentId = sequence.parent;+ while (parentId !== null) {+ if (connectedCompositionsBySequenceId.has(parentId)) {+ return false;+ }++ parentId = sequencesById.get(parentId)?.parent ?? null;+ }++ return true;+ });++ for (let i = 0; i < timelineSequences.length; i++) {+ const sequence = timelineSequences[i];+ const cascadedStart = getCascadedStart(sequence, sortedSequences);+ const cascadedStartWithTrim = getCascadedStartWithTrim(+ sequence,+ sortedSequences,+ );+ const effectiveFrom =+ sequence.trimBefore === null+ ? sequence.from+ : sequence.from - sequence.trimBefore;++ const visibleStart = getTimelineVisibleStart(sequence, sortedSequences);+ const visibleDuration = getTimelineVisibleDuration(+ sequence,+ sortedSequences,+ );++ const overrideId = sequence.controls?.overrideId ?? null;+ const nodePath = overrideId ? overrideIdsToNodePaths[overrideId] : null;+ const hasKeyframeRows =+ sequence.controls !== null || sequence.effects.length > 0;+ const connectedCompositions =+ connectedCompositionsBySequenceId.get(sequence.id) ?? [];++ tracks.push({+ ...(connectedCompositions.length > 0 ? {connectedCompositions} : {}),+ sequence: {+ ...sequence,+ from: visibleStart,+ duration: visibleDuration,+ loopDisplay:+ sequence.type === 'audio' || sequence.type === 'video'+ ? getInheritedLoopDisplay(sequence, sortedSequences)+ : sequence.loopDisplay,+ },+ depth: getTimelineNestedLevel(sequence, sortedSequences, 0),+ cascadedStart,+ localStart: sequence.from,+ cascadedDuration: sequence.duration,+ keyframeDisplayOffset: hasKeyframeRows+ ? cascadedStartWithTrim - effectiveFrom+ : 0,+ sequenceFrameOffset: visibleStart - cascadedStartWithTrim,+ nodePathInfo: nodePath+ ? {+ sequenceSubscriptionKey: nodePath,+ auxiliaryKeys: [],+ index: 0,+ numberOfSequencesWithThisNodePath: 0,+ supportsEffects: sequence.controls?.supportsEffects === true,+ }+ : null,+ });+ }++ const nonceRanks = new Map<string, number>();+ for (let i = 0; i < tracks.length; i++) {+ nonceRanks.set(tracks[i].sequence.id, i);+ }++ const sortedTracks: TimelineTrackData[] = tracks+ .sort((a, b) => {+ const sortKeyA = getTimelineSequenceSortKey(a, tracks, nonceRanks);+ const sortKeyB = getTimelineSequenceSortKey(b, tracks, nonceRanks);+ return sortKeyA.localeCompare(sortKeyB);+ })+ .map((track) => {+ const {cascadedDuration, ...cleanTrack} = track;+ return cleanTrack;+ });++ const nodePathIndexCounters = new Map<string, number>();++ return sortedTracks+ .map((track): TimelineTrackData => {+ if (track.nodePathInfo === null) {+ return track;+ }++ const key = timelineSequenceNodePathToKey(+ track.nodePathInfo.sequenceSubscriptionKey,+ );+ const index = nodePathIndexCounters.get(key) ?? 0;+ nodePathIndexCounters.set(key, index + 1);+ return {+ ...track,+ nodePathInfo: {+ sequenceSubscriptionKey: track.nodePathInfo.sequenceSubscriptionKey,+ auxiliaryKeys: track.nodePathInfo.auxiliaryKeys,+ index,+ numberOfSequencesWithThisNodePath: 0,+ supportsEffects: track.nodePathInfo.supportsEffects,+ },+ };+ })+ .map((track) => {+ if (track.nodePathInfo === null) {+ return track;+ }++ const key = timelineSequenceNodePathToKey(+ track.nodePathInfo.sequenceSubscriptionKey,+ );++ return {+ ...track,+ nodePathInfo: {+ sequenceSubscriptionKey: track.nodePathInfo.sequenceSubscriptionKey,+ auxiliaryKeys: track.nodePathInfo.auxiliaryKeys,+ index: track.nodePathInfo.index,+ numberOfSequencesWithThisNodePath:+ nodePathIndexCounters.get(key) ?? 0,+ supportsEffects: track.nodePathInfo.supportsEffects,+ },+ };+ });+};diff --git a/packages/canvas/src/get-connected-compositions.ts b/packages/canvas/src/get-connected-compositions.tsnew file mode 100644index 0000000000..0a140a4140--- /dev/null+++ b/packages/canvas/src/get-connected-compositions.ts@@ -0,0 +1,20 @@+export const getConnectedCompositions = <+ Composition extends {readonly componentFromProps?: unknown},+>({+ compositions,+ singleChildComponent,+}: {+ readonly compositions: readonly Composition[];+ readonly singleChildComponent: unknown;+}): Composition[] => {+ if (+ singleChildComponent === null ||+ typeof singleChildComponent === 'undefined'+ ) {+ return [];+ }++ return compositions.filter(+ (composition) => composition.componentFromProps === singleChildComponent,+ );+};diff --git a/packages/canvas/src/get-sequence-visible-range.ts b/packages/canvas/src/get-sequence-visible-range.tsnew file mode 100644index 0000000000..0f0311006c--- /dev/null+++ b/packages/canvas/src/get-sequence-visible-range.ts@@ -0,0 +1,75 @@+import type {TSequence} from 'remotion';++export const getCascadedStart = (+ sequence: TSequence,+ sequences: TSequence[],+): number => {+ if (!sequence.parent) {+ return sequence.from;+ }++ const parent = sequences.find((s) => s.id === sequence.parent);+ if (!parent) {+ throw new TypeError('Parent not found for sequence ' + sequence.id);+ }++ return getCascadedStart(parent, sequences) + sequence.from;+};++export const getCascadedStartWithTrim = (+ sequence: TSequence,+ sequences: TSequence[],+): number => {+ const effectiveFrom =+ sequence.trimBefore === null+ ? sequence.from+ : sequence.from - sequence.trimBefore;+ if (!sequence.parent) {+ return effectiveFrom;+ }++ const parent = sequences.find((s) => s.id === sequence.parent);+ if (!parent) {+ throw new TypeError('Parent not found for sequence ' + sequence.id);+ }++ return getCascadedStartWithTrim(parent, sequences) + effectiveFrom;+};++export const getTimelineVisibleStart = (+ sequence: TSequence,+ sequences: TSequence[],+): number => {+ const cascadedStart = Math.max(0, getCascadedStart(sequence, sequences));+ if (!sequence.parent) {+ return cascadedStart;+ }++ const parent = sequences.find((s) => s.id === sequence.parent);+ if (!parent) {+ throw new TypeError('Parent not found for sequence ' + sequence.id);+ }++ const timelineVisibleStart = getTimelineVisibleStart(parent, sequences);+ return Math.max(timelineVisibleStart, cascadedStart);+};++export const getTimelineVisibleDuration = (+ sequence: TSequence,+ sequences: TSequence[],+): number => {+ const visibleDuration = sequence.duration + Math.min(sequence.from, 0);+ if (!sequence.parent) {+ return visibleDuration;+ }++ const parent = sequences.find((s) => s.id === sequence.parent);+ if (!parent) {+ throw new TypeError('Parent not found for sequence ' + sequence.id);+ }++ return Math.min(+ visibleDuration,+ getTimelineVisibleDuration(parent, sequences),+ );+};diff --git a/packages/canvas/src/get-timeline-nestedness.ts b/packages/canvas/src/get-timeline-nestedness.tsnew file mode 100644index 0000000000..f0bebc9ce0--- /dev/null+++ b/packages/canvas/src/get-timeline-nestedness.ts@@ -0,0 +1,23 @@+import type {TSequence} from 'remotion';++export const getTimelineNestedLevel = (+ sequence: TSequence,+ allSequences: TSequence[],+ depth: number,+): number => {+ if (!sequence.parent) {+ return depth;+ }++ const parentSequence = allSequences.find((s) => s.id === sequence.parent);+ if (!parentSequence) {+ throw new Error('has parentId but no parent');+ }++ const parentContributes = parentSequence.showInTimeline;+ return getTimelineNestedLevel(+ parentSequence,+ allSequences,+ parentContributes ? depth + 1 : depth,+ );+};diff --git a/packages/canvas/src/get-timeline-sequence-sort-key.ts b/packages/canvas/src/get-timeline-sequence-sort-key.tsnew file mode 100644index 0000000000..691f8466a1--- /dev/null+++ b/packages/canvas/src/get-timeline-sequence-sort-key.ts@@ -0,0 +1,49 @@+import type {+ _InternalTypes,+ SequencePropsSubscriptionKey,+ TSequence,+} from 'remotion';++export type SequenceNodePathInfo = {+ sequenceSubscriptionKey: SequencePropsSubscriptionKey;+ auxiliaryKeys: string[];+ index: number;+ numberOfSequencesWithThisNodePath: number;+ supportsEffects: boolean;+};++export type TimelineTrackData = {+ sequence: TSequence;+ connectedCompositions?: readonly _InternalTypes['AnyComposition'][];+ depth: number;+ nodePathInfo: SequenceNodePathInfo | null;+ keyframeDisplayOffset: number;+ sequenceFrameOffset: number;+ cascadedStart: number;+ localStart: number;+};++export type TimelineTrackWithOriginalTimings = TimelineTrackData & {+ cascadedDuration: number;+};++export const getTimelineSequenceSortKey = (+ track: TimelineTrackData,+ tracks: TimelineTrackData[],+ nonceRanks: Map<string, number>,+): string => {+ const rank = nonceRanks.get(track.sequence.id) ?? 0;+ const id = String(rank).padStart(6, '0');+ if (!track.sequence.parent) {+ return id;+ }++ const parent = tracks.find((t) => t.sequence.id === track.sequence.parent);+ if (!parent) {+ // Due to effects and conditional `showInTimeline`, a parent+ // may not exist in the `allTracks` array.+ return id;+ }++ return `${getTimelineSequenceSortKey(parent, tracks, nonceRanks)}-${id}`;+};diff --git a/packages/canvas/src/index.ts b/packages/canvas/src/index.tsnew file mode 100644index 0000000000..0bf302a9bd--- /dev/null+++ b/packages/canvas/src/index.ts@@ -0,0 +1,20 @@+export {calculateTimeline} from './calculate-timeline';+export type {+ SequenceNodePathInfo,+ TimelineTrackData,+ TimelineTrackWithOriginalTimings,+} from './get-timeline-sequence-sort-key';+export {getConnectedCompositions} from './get-connected-compositions';+export {+ getCascadedStart,+ getCascadedStartWithTrim,+ getTimelineVisibleDuration,+ getTimelineVisibleStart,+} from './get-sequence-visible-range';+export {getTimelineNestedLevel} from './get-timeline-nestedness';+export {getTimelineSequenceSortKey} from './get-timeline-sequence-sort-key';+export {+ compareNonceHistories,+ sortItemsByNonceHistory,+} from './sort-by-nonce-history';+export {timelineSequenceNodePathToKey} from './timeline-sequence-node-path-to-key';diff --git a/packages/canvas/src/sort-by-nonce-history.ts b/packages/canvas/src/sort-by-nonce-history.tsnew file mode 100644index 0000000000..631d4ea896--- /dev/null+++ b/packages/canvas/src/sort-by-nonce-history.ts@@ -0,0 +1,190 @@+import type {NonceHistory} from 'remotion';++const getSharedEpochOrder = (+ a: NonceHistory,+ b: NonceHistory,+): number | null => {+ const aMap = new Map(a);+ const bMap = new Map(b);++ const allEpochs = [...new Set([...aMap.keys(), ...bMap.keys()])].sort(+ (x, y) => y - x,+ );++ for (const epoch of allEpochs) {+ const aNonce = aMap.get(epoch);+ const bNonce = bMap.get(epoch);++ if (aNonce !== undefined && bNonce !== undefined) {+ return aNonce - bNonce;+ }+ }++ return null;+};++export const compareNonceHistories = (+ a: NonceHistory,+ b: NonceHistory,+): number => {+ const shared = getSharedEpochOrder(a, b);+ if (shared !== null) {+ return shared;+ }++ // No shared epoch β items from a lower latest epoch come first+ const aLatestEpoch = a[a.length - 1][0];+ const bLatestEpoch = b[b.length - 1][0];+ return aLatestEpoch - bLatestEpoch;+};++// Compare two histories, each pre-collapsed to parallel arrays of epochs and+// nonces sorted by descending epoch, without rebuilding a Map per comparison.+// Equivalent to getSharedEpochOrder: both find the newest shared epoch and+// compare its nonces.+const sharedEpochOrderFromSorted = (+ aEpochs: number[],+ aNonces: number[],+ bEpochs: number[],+ bNonces: number[],+): number | null => {+ let i = 0;+ let j = 0;+ while (i < aEpochs.length && j < bEpochs.length) {+ const ae = aEpochs[i];+ const be = bEpochs[j];+ if (ae === be) {+ return aNonces[i] - bNonces[j];+ }++ if (ae > be) {+ i++;+ } else {+ j++;+ }+ }++ return null;+};++export const sortItemsByNonceHistory: <T extends {nonce: NonceHistory}>(+ items: T[],+) => T[] = (items) => {+ const n = items.length;+ if (n <= 1) {+ return items.slice();+ }++ // Collapse each history once into epoch/nonce arrays sorted by descending+ // epoch. `new Map(nonce)` keeps the last value per duplicated epoch, matching+ // getSharedEpochOrder. This removes the per-pair Map/Set construction the+ // pairwise loop below would otherwise repeat O(n^2) times.+ const epochsOf: number[][] = new Array(n);+ const noncesOf: number[][] = new Array(n);+ for (let i = 0; i < n; i++) {+ const map = new Map(items[i].nonce);+ const epochs = [...map.keys()].sort((x, y) => y - x);+ epochsOf[i] = epochs;+ noncesOf[i] = epochs.map((e) => map.get(e)!);+ }++ // Pairwise "strictly before" relation, stored as bitsets: `before[i]` has+ // bit j set when i must come before j, `known[i]` has bit j set when the+ // pair (i, j) is directly determined by a shared epoch. Bitsets let the+ // transitive closure below combine 32 relationships per word.+ const words = (n + 31) >> 5;+ const before = new Uint32Array(n * words);+ const known = new Uint32Array(n * words);+ // Direct comparison sign per ordered pair; only read where `known` is set.+ const sign = new Int8Array(n * n);++ for (let i = 0; i < n; i++) {+ for (let j = i + 1; j < n; j++) {+ const cmp = sharedEpochOrderFromSorted(+ epochsOf[i],+ noncesOf[i],+ epochsOf[j],+ noncesOf[j],+ );+ if (cmp === null) {+ continue;+ }++ known[i * words + (j >> 5)] |= 1 << (j & 31);+ known[j * words + (i >> 5)] |= 1 << (i & 31);+ sign[i * n + j] = cmp < 0 ? -1 : cmp > 0 ? 1 : 0;+ sign[j * n + i] = cmp < 0 ? 1 : cmp > 0 ? -1 : 0;+ if (cmp < 0) {+ before[i * words + (j >> 5)] |= 1 << (j & 31);+ } else if (cmp > 0) {+ before[j * words + (i >> 5)] |= 1 << (i & 31);+ }+ }+ }++ // Transitive closure: if i < k and k < j, then i < j. This is the same+ // Floyd-Warshall relation as before, but the inner sweep is bitwise+ // (`before[k] & ~known[i]` finds all reachable j at once). A newly derived+ // edge is marked known immediately so the first path decides an otherwise+ // undetermined pair β preserving behavior on the inputs where the pairwise+ // comparison is intentionally non-transitive.+ for (let k = 0; k < n; k++) {+ const kBase = k * words;+ const kWord = k >> 5;+ const kBit = 1 << (k & 31);+ for (let i = 0; i < n; i++) {+ if (i === k) {+ continue;+ }++ const iBase = i * words;+ if ((before[iBase + kWord] & kBit) === 0) {+ continue; // i is not before k, so k adds nothing for i+ }++ for (let w = 0; w < words; w++) {+ const add = before[kBase + w] & ~known[iBase + w];+ if (add === 0) {+ continue;+ }++ before[iBase + w] |= add;+ known[iBase + w] |= add;+ // Set the mirror relationship (j after i) for each newly known pair.+ let bits = add;+ while (bits !== 0) {+ const lowest = bits & -bits;+ const j = (w << 5) + (31 - Math.clz32(lowest));+ sign[i * n + j] = -1;+ known[j * words + (i >> 5)] |= 1 << (i & 31);+ sign[j * n + i] = 1;+ bits ^= lowest;+ }+ }+ }+ }++ const indexMap = new Map(items.map((item, i) => [item, i]));+ const result = items.slice();+ result.sort((a, b) => {+ const ai = indexMap.get(a)!;+ const bi = indexMap.get(b)!;++ if ((known[ai * words + (bi >> 5)] >> (bi & 31)) & 1) {+ return sign[ai * n + bi];+ }++ if ((before[ai * words + (bi >> 5)] >> (bi & 31)) & 1) {+ return -1;+ }++ if ((before[bi * words + (ai >> 5)] >> (ai & 31)) & 1) {+ return 1;+ }++ // No transitive relationship β lower latest epoch first+ return a.nonce[a.nonce.length - 1][0] - b.nonce[b.nonce.length - 1][0];+ });++ return result;+};diff --git a/packages/canvas/src/test/calculate-timeline.test.ts b/packages/canvas/src/test/calculate-timeline.test.tsnew file mode 100644index 0000000000..d711cd3b8e--- /dev/null+++ b/packages/canvas/src/test/calculate-timeline.test.ts@@ -0,0 +1,64 @@+import {expect, test} from 'bun:test';+import type {TSequence} from 'remotion';+import {calculateTimeline} from '../calculate-timeline';++const makeSequence = ({+ id,+ parent,+ from,+ nonce,+}: {+ id: string;+ parent: string | null;+ from: number;+ nonce: number;+}): TSequence => ({+ controls: null,+ displayName: id,+ documentationLink: null,+ duration: 100,+ effects: [],+ effectRuntimeValues: null,+ from,+ frozenFrame: null,+ getStack: () => null,+ id,+ isInsideSeries: false,+ loopDisplay: undefined,+ nonce: [[0, nonce]],+ parent,+ postmountDisplay: null,+ premountDisplay: null,+ refForOutline: null,+ showInTimeline: true,+ trimBefore: null,+ type: 'sequence',+});++test('returns an empty timeline when there are no sequences', () => {+ expect(+ calculateTimeline({overrideIdsToNodePaths: {}, sequences: []}),+ ).toEqual([]);+});++test('normalizes nesting and visible starts', () => {+ const timeline = calculateTimeline({+ overrideIdsToNodePaths: {},+ sequences: [+ makeSequence({id: 'child', parent: 'parent', from: -10, nonce: 1}),+ makeSequence({id: 'parent', parent: null, from: 20, nonce: 0}),+ ],+ });++ expect(+ timeline.map(({depth, sequence, sequenceFrameOffset}) => ({+ depth,+ from: sequence.from,+ id: sequence.id,+ sequenceFrameOffset,+ })),+ ).toEqual([+ {id: 'parent', depth: 0, from: 20, sequenceFrameOffset: 0},+ {id: 'child', depth: 1, from: 20, sequenceFrameOffset: 10},+ ]);+});diff --git a/packages/studio/src/test/connected-compositions.test.ts b/packages/canvas/src/test/connected-compositions.test.tssimilarity index 89%rename from packages/studio/src/test/connected-compositions.test.tsrename to packages/canvas/src/test/connected-compositions.test.tsindex 5f3a76885c..b395a372b9 100644--- a/packages/studio/src/test/connected-compositions.test.ts+++ b/packages/canvas/src/test/connected-compositions.test.ts@@ -1,5 +1,5 @@import {expect, test} from 'bun:test';-import {getConnectedCompositions} from '../helpers/get-connected-compositions';+import {getConnectedCompositions} from '../get-connected-compositions';const Child = () => null;const OtherChild = () => null;diff --git a/packages/studio/src/test/sort-by-nonce-history.test.ts b/packages/canvas/src/test/sort-by-nonce-history.test.tssimilarity index 99%rename from packages/studio/src/test/sort-by-nonce-history.test.tsrename to packages/canvas/src/test/sort-by-nonce-history.test.tsindex 92418b874e..730f4e2d2c 100644--- a/packages/studio/src/test/sort-by-nonce-history.test.ts+++ b/packages/canvas/src/test/sort-by-nonce-history.test.ts@@ -3,7 +3,7 @@ import type {TSequence} from 'remotion';import {compareNonceHistories,sortItemsByNonceHistory,-} from '../helpers/sort-by-nonce-history';+} from '../sort-by-nonce-history';type NonceHistory = TSequence['nonce'];diff --git a/packages/canvas/src/timeline-sequence-node-path-to-key.ts b/packages/canvas/src/timeline-sequence-node-path-to-key.tsnew file mode 100644index 0000000000..fbfda6dcd6--- /dev/null+++ b/packages/canvas/src/timeline-sequence-node-path-to-key.ts@@ -0,0 +1,5 @@+import type {SequencePropsSubscriptionKey} from 'remotion';++export const timelineSequenceNodePathToKey = (+ key: SequencePropsSubscriptionKey,+): string => `${key.absolutePath}:${JSON.stringify(key.nodePath)}`;diff --git a/packages/canvas/tsconfig.json b/packages/canvas/tsconfig.jsonnew file mode 100644index 0000000000..143a0d2e89--- /dev/null+++ b/packages/canvas/tsconfig.json@@ -0,0 +1,15 @@+{+ "extends": "../tsconfig.settings.json",+ "compilerOptions": {+ "rootDir": "src",+ "outDir": "dist",+ "skipLibCheck": true,+ "target": "ES2022",+ "module": "es2020",+ "moduleResolution": "bundler",+ "declaration": true,+ "emitDeclarationOnly": true+ },+ "include": ["src"],+ "references": [{"path": "../core"}]+}diff --git a/packages/cli/src/list-of-remotion-packages.ts b/packages/cli/src/list-of-remotion-packages.tsindex f5e271b3da..9913a6e553 100644--- a/packages/cli/src/list-of-remotion-packages.ts+++ b/packages/cli/src/list-of-remotion-packages.ts@@ -9,6 +9,7 @@ export const listOfRemotionPackages = ['@remotion/brand','@remotion/bundler','@remotion/browser-studio',+ '@remotion/canvas','@remotion/claude-code-plugin','@remotion/cli','@remotion/cloudrun',diff --git a/packages/create-video/src/list-of-remotion-packages.ts b/packages/create-video/src/list-of-remotion-packages.tsindex f5e271b3da..9913a6e553 100644--- a/packages/create-video/src/list-of-remotion-packages.ts+++ b/packages/create-video/src/list-of-remotion-packages.ts@@ -9,6 +9,7 @@ export const listOfRemotionPackages = ['@remotion/brand','@remotion/bundler','@remotion/browser-studio',+ '@remotion/canvas','@remotion/claude-code-plugin','@remotion/cli','@remotion/cloudrun',diff --git a/packages/studio-shared/src/package-info.ts b/packages/studio-shared/src/package-info.tsindex c72f4f873e..eab6167430 100644--- a/packages/studio-shared/src/package-info.ts+++ b/packages/studio-shared/src/package-info.ts@@ -11,6 +11,7 @@ const allPackages = ['brand','bundler','browser-studio',+ 'canvas','claude-code-plugin','cli','cloudrun',@@ -170,6 +171,7 @@ export const descriptions: {[key in Pkgs]: string | null} = {lambda: 'Render Remotion videos on AWS Lambda',bundler: 'Bundle Remotion compositions using Webpack','browser-studio': 'Run Remotion Studio in the browser',+ canvas: 'Headless primitives for Remotion authoring interfaces','studio-codemods': 'Shared codemods for Remotion Studio','studio-server': 'Run a Remotion Studio with a server backend','install-whisper-cpp': 'Helpers for installing and using Whisper.cpp',@@ -279,6 +281,7 @@ export const installableMap: {[key in Pkgs]: boolean} = {brand: false,bundler: false,'browser-studio': false,+ canvas: false,cli: false,cloudrun: true,'claude-code-plugin': false,@@ -403,6 +406,7 @@ export const apiDocs: {[key in Pkgs]: string | null} = {lambda: 'https://www.remotion.dev/docs/lambda',bundler: 'https://www.remotion.dev/docs/bundler','browser-studio': null,+ canvas: null,'studio-codemods': null,'lambda-client': null,'serverless-client': null,diff --git a/packages/studio/bundle.ts b/packages/studio/bundle.tsindex 5b3580bc74..4d4b10fad8 100644--- a/packages/studio/bundle.ts+++ b/packages/studio/bundle.ts@@ -3,6 +3,7 @@ import {buildPackage} from '../.monorepo/builder';const external = ['react','remotion',+ '@remotion/canvas','react-dom','react','@remotion/media-utils',diff --git a/packages/studio/package.json b/packages/studio/package.jsonindex 58ae8eda3a..443b21829d 100644--- a/packages/studio/package.json+++ b/packages/studio/package.json@@ -25,6 +25,7 @@},"dependencies": {"@tanstack/react-virtual": "3.14.9",+ "@remotion/canvas": "workspace:*","@remotion/studio-protocol": "workspace:*","semver": "7.5.3","remotion": "workspace:*",diff --git a/packages/studio/src/helpers/calculate-timeline.ts b/packages/studio/src/helpers/calculate-timeline.tsindex 49c2bec662..6283223621 100644--- a/packages/studio/src/helpers/calculate-timeline.ts+++ b/packages/studio/src/helpers/calculate-timeline.ts@@ -1,206 +1 @@-import type {- _InternalTypes,- LoopDisplay,- OverrideIdToNodePaths,- TSequence,-} from 'remotion';-import {getConnectedCompositions} from './get-connected-compositions';-import {- getCascadedStart,- getCascadedStartWithTrim,- getTimelineVisibleDuration,- getTimelineVisibleStart,-} from './get-sequence-visible-range';-import {getTimelineNestedLevel} from './get-timeline-nestedness';-import type {- TimelineTrackData,- TimelineTrackWithOriginalTimings,-} from './get-timeline-sequence-sort-key';-import {getTimelineSequenceSortKey} from './get-timeline-sequence-sort-key';-import {sortItemsByNonceHistory} from './sort-by-nonce-history';-import {timelineSequenceNodePathToKey} from './timeline-node-path-key';--const getInheritedLoopDisplay = (- sequence: TSequence,- sequences: TSequence[],-): LoopDisplay | undefined => {- if (sequence.loopDisplay) {- return sequence.loopDisplay;- }-- if (!sequence.parent) {- return undefined;- }-- const parent = sequences.find((s) => s.id === sequence.parent);- if (!parent) {- return undefined;- }-- return getInheritedLoopDisplay(parent, sequences);-};--export const calculateTimeline = ({- sequences,- overrideIdsToNodePaths,- compositions = [],-}: {- sequences: TSequence[];- overrideIdsToNodePaths: OverrideIdToNodePaths;- compositions?: readonly _InternalTypes['AnyComposition'][];-}): TimelineTrackData[] => {- const sortedSequences = sortItemsByNonceHistory(sequences);- const tracks: TimelineTrackWithOriginalTimings[] = [];-- if (sortedSequences.length === 0) {- return [];- }-- const connectedCompositionsBySequenceId = new Map<- string,- readonly _InternalTypes['AnyComposition'][]- >();- for (const sequence of sortedSequences) {- const connectedCompositions = getConnectedCompositions({- compositions,- singleChildComponent: sequence.singleChildComponent,- });- if (connectedCompositions.length > 0) {- connectedCompositionsBySequenceId.set(sequence.id, connectedCompositions);- }- }-- const sequencesById = new Map(- sortedSequences.map((sequence) => [sequence.id, sequence]),- );- const timelineSequences = sortedSequences.filter((sequence) => {- let parentId = sequence.parent;- while (parentId !== null) {- if (connectedCompositionsBySequenceId.has(parentId)) {- return false;- }-- parentId = sequencesById.get(parentId)?.parent ?? null;- }-- return true;- });-- for (let i = 0; i < timelineSequences.length; i++) {- const sequence = timelineSequences[i];- const cascadedStart = getCascadedStart(sequence, sortedSequences);- const cascadedStartWithTrim = getCascadedStartWithTrim(- sequence,- sortedSequences,- );- const effectiveFrom =- sequence.trimBefore === null- ? sequence.from- : sequence.from - sequence.trimBefore;-- const visibleStart = getTimelineVisibleStart(sequence, sortedSequences);- const visibleDuration = getTimelineVisibleDuration(- sequence,- sortedSequences,- );-- const overrideId = sequence.controls?.overrideId ?? null;- const nodePath = overrideId ? overrideIdsToNodePaths[overrideId] : null;- const hasKeyframeRows =- sequence.controls !== null || sequence.effects.length > 0;- const connectedCompositions =- connectedCompositionsBySequenceId.get(sequence.id) ?? [];-- tracks.push({- ...(connectedCompositions.length > 0 ? {connectedCompositions} : {}),- sequence: {- ...sequence,- from: visibleStart,- duration: visibleDuration,- loopDisplay:- sequence.type === 'audio' || sequence.type === 'video'- ? getInheritedLoopDisplay(sequence, sortedSequences)- : sequence.loopDisplay,- },- depth: getTimelineNestedLevel(sequence, sortedSequences, 0),- cascadedStart,- localStart: sequence.from,- cascadedDuration: sequence.duration,- keyframeDisplayOffset: hasKeyframeRows- ? cascadedStartWithTrim - effectiveFrom- : 0,- sequenceFrameOffset: visibleStart - cascadedStartWithTrim,- nodePathInfo: nodePath- ? {- sequenceSubscriptionKey: nodePath,- auxiliaryKeys: [],- index: 0,- numberOfSequencesWithThisNodePath: 0,- supportsEffects: sequence.controls?.supportsEffects === true,- }- : null,- });- }-- const nonceRanks = new Map<string, number>();- for (let i = 0; i < tracks.length; i++) {- nonceRanks.set(tracks[i].sequence.id, i);- }-- const sortedTracks: TimelineTrackData[] = tracks- .sort((a, b) => {- const sortKeyA = getTimelineSequenceSortKey(a, tracks, nonceRanks);- const sortKeyB = getTimelineSequenceSortKey(b, tracks, nonceRanks);- return sortKeyA.localeCompare(sortKeyB);- })- .map((track) => {- const {cascadedDuration, ...cleanTrack} = track;- return cleanTrack;- });-- const nodePathIndexCounters = new Map<string, number>();-- return sortedTracks- .map((track): TimelineTrackData => {- if (track.nodePathInfo === null) {- return track;- }-- const key = timelineSequenceNodePathToKey(- track.nodePathInfo.sequenceSubscriptionKey,- );- const index = nodePathIndexCounters.get(key) ?? 0;- nodePathIndexCounters.set(key, index + 1);- return {- ...track,- nodePathInfo: {- sequenceSubscriptionKey: track.nodePathInfo.sequenceSubscriptionKey,- auxiliaryKeys: track.nodePathInfo.auxiliaryKeys,- index,- numberOfSequencesWithThisNodePath: 0,- supportsEffects: track.nodePathInfo.supportsEffects,- },- };- })- .map((track) => {- if (track.nodePathInfo === null) {- return track;- }-- const key = timelineSequenceNodePathToKey(- track.nodePathInfo.sequenceSubscriptionKey,- );-- return {- ...track,- nodePathInfo: {- sequenceSubscriptionKey: track.nodePathInfo.sequenceSubscriptionKey,- auxiliaryKeys: track.nodePathInfo.auxiliaryKeys,- index: track.nodePathInfo.index,- numberOfSequencesWithThisNodePath:- nodePathIndexCounters.get(key) ?? 0,- supportsEffects: track.nodePathInfo.supportsEffects,- },- };- });-};+export {calculateTimeline} from '@remotion/canvas';diff --git a/packages/studio/src/helpers/get-connected-compositions.ts b/packages/studio/src/helpers/get-connected-compositions.tsindex 0a140a4140..53bed258e0 100644--- a/packages/studio/src/helpers/get-connected-compositions.ts+++ b/packages/studio/src/helpers/get-connected-compositions.ts@@ -1,20 +1 @@-export const getConnectedCompositions = <- Composition extends {readonly componentFromProps?: unknown},->({- compositions,- singleChildComponent,-}: {- readonly compositions: readonly Composition[];- readonly singleChildComponent: unknown;-}): Composition[] => {- if (- singleChildComponent === null ||- typeof singleChildComponent === 'undefined'- ) {- return [];- }-- return compositions.filter(- (composition) => composition.componentFromProps === singleChildComponent,- );-};+export {getConnectedCompositions} from '@remotion/canvas';diff --git a/packages/studio/src/helpers/get-sequence-visible-range.ts b/packages/studio/src/helpers/get-sequence-visible-range.tsindex 0f0311006c..6fd1543c76 100644--- a/packages/studio/src/helpers/get-sequence-visible-range.ts+++ b/packages/studio/src/helpers/get-sequence-visible-range.ts@@ -1,75 +1,6 @@-import type {TSequence} from 'remotion';--export const getCascadedStart = (- sequence: TSequence,- sequences: TSequence[],-): number => {- if (!sequence.parent) {- return sequence.from;- }-- const parent = sequences.find((s) => s.id === sequence.parent);- if (!parent) {- throw new TypeError('Parent not found for sequence ' + sequence.id);- }-- return getCascadedStart(parent, sequences) + sequence.from;-};--export const getCascadedStartWithTrim = (- sequence: TSequence,- sequences: TSequence[],-): number => {- const effectiveFrom =- sequence.trimBefore === null- ? sequence.from- : sequence.from - sequence.trimBefore;- if (!sequence.parent) {- return effectiveFrom;- }-- const parent = sequences.find((s) => s.id === sequence.parent);- if (!parent) {- throw new TypeError('Parent not found for sequence ' + sequence.id);- }-- return getCascadedStartWithTrim(parent, sequences) + effectiveFrom;-};--export const getTimelineVisibleStart = (- sequence: TSequence,- sequences: TSequence[],-): number => {- const cascadedStart = Math.max(0, getCascadedStart(sequence, sequences));- if (!sequence.parent) {- return cascadedStart;- }-- const parent = sequences.find((s) => s.id === sequence.parent);- if (!parent) {- throw new TypeError('Parent not found for sequence ' + sequence.id);- }-- const timelineVisibleStart = getTimelineVisibleStart(parent, sequences);- return Math.max(timelineVisibleStart, cascadedStart);-};--export const getTimelineVisibleDuration = (- sequence: TSequence,- sequences: TSequence[],-): number => {- const visibleDuration = sequence.duration + Math.min(sequence.from, 0);- if (!sequence.parent) {- return visibleDuration;- }-- const parent = sequences.find((s) => s.id === sequence.parent);- if (!parent) {- throw new TypeError('Parent not found for sequence ' + sequence.id);- }-- return Math.min(- visibleDuration,- getTimelineVisibleDuration(parent, sequences),- );-};+export {+ getCascadedStart,+ getCascadedStartWithTrim,+ getTimelineVisibleDuration,+ getTimelineVisibleStart,+} from '@remotion/canvas';diff --git a/packages/studio/src/helpers/get-timeline-nestedness.ts b/packages/studio/src/helpers/get-timeline-nestedness.tsindex f0bebc9ce0..9f3a57edc5 100644--- a/packages/studio/src/helpers/get-timeline-nestedness.ts+++ b/packages/studio/src/helpers/get-timeline-nestedness.ts@@ -1,23 +1 @@-import type {TSequence} from 'remotion';--export const getTimelineNestedLevel = (- sequence: TSequence,- allSequences: TSequence[],- depth: number,-): number => {- if (!sequence.parent) {- return depth;- }-- const parentSequence = allSequences.find((s) => s.id === sequence.parent);- if (!parentSequence) {- throw new Error('has parentId but no parent');- }-- const parentContributes = parentSequence.showInTimeline;- return getTimelineNestedLevel(- parentSequence,- allSequences,- parentContributes ? depth + 1 : depth,- );-};+export {getTimelineNestedLevel} from '@remotion/canvas';diff --git a/packages/studio/src/helpers/get-timeline-sequence-sort-key.ts b/packages/studio/src/helpers/get-timeline-sequence-sort-key.tsindex 691f8466a1..268ea16faa 100644--- a/packages/studio/src/helpers/get-timeline-sequence-sort-key.ts+++ b/packages/studio/src/helpers/get-timeline-sequence-sort-key.ts@@ -1,49 +1,6 @@-import type {- _InternalTypes,- SequencePropsSubscriptionKey,- TSequence,-} from 'remotion';--export type SequenceNodePathInfo = {- sequenceSubscriptionKey: SequencePropsSubscriptionKey;- auxiliaryKeys: string[];- index: number;- numberOfSequencesWithThisNodePath: number;- supportsEffects: boolean;-};--export type TimelineTrackData = {- sequence: TSequence;- connectedCompositions?: readonly _InternalTypes['AnyComposition'][];- depth: number;- nodePathInfo: SequenceNodePathInfo | null;- keyframeDisplayOffset: number;- sequenceFrameOffset: number;- cascadedStart: number;- localStart: number;-};--export type TimelineTrackWithOriginalTimings = TimelineTrackData & {- cascadedDuration: number;-};--export const getTimelineSequenceSortKey = (- track: TimelineTrackData,- tracks: TimelineTrackData[],- nonceRanks: Map<string, number>,-): string => {- const rank = nonceRanks.get(track.sequence.id) ?? 0;- const id = String(rank).padStart(6, '0');- if (!track.sequence.parent) {- return id;- }-- const parent = tracks.find((t) => t.sequence.id === track.sequence.parent);- if (!parent) {- // Due to effects and conditional `showInTimeline`, a parent- // may not exist in the `allTracks` array.- return id;- }-- return `${getTimelineSequenceSortKey(parent, tracks, nonceRanks)}-${id}`;-};+export {getTimelineSequenceSortKey} from '@remotion/canvas';+export type {+ SequenceNodePathInfo,+ TimelineTrackData,+ TimelineTrackWithOriginalTimings,+} from '@remotion/canvas';diff --git a/packages/studio/src/helpers/sort-by-nonce-history.ts b/packages/studio/src/helpers/sort-by-nonce-history.tsindex 631d4ea896..59ccbd34f2 100644--- a/packages/studio/src/helpers/sort-by-nonce-history.ts+++ b/packages/studio/src/helpers/sort-by-nonce-history.ts@@ -1,190 +1 @@-import type {NonceHistory} from 'remotion';--const getSharedEpochOrder = (- a: NonceHistory,- b: NonceHistory,-): number | null => {- const aMap = new Map(a);- const bMap = new Map(b);-- const allEpochs = [...new Set([...aMap.keys(), ...bMap.keys()])].sort(- (x, y) => y - x,- );-- for (const epoch of allEpochs) {- const aNonce = aMap.get(epoch);- const bNonce = bMap.get(epoch);-- if (aNonce !== undefined && bNonce !== undefined) {- return aNonce - bNonce;- }- }-- return null;-};--export const compareNonceHistories = (- a: NonceHistory,- b: NonceHistory,-): number => {- const shared = getSharedEpochOrder(a, b);- if (shared !== null) {- return shared;- }-- // No shared epoch β items from a lower latest epoch come first- const aLatestEpoch = a[a.length - 1][0];- const bLatestEpoch = b[b.length - 1][0];- return aLatestEpoch - bLatestEpoch;-};--// Compare two histories, each pre-collapsed to parallel arrays of epochs and-// nonces sorted by descending epoch, without rebuilding a Map per comparison.-// Equivalent to getSharedEpochOrder: both find the newest shared epoch and-// compare its nonces.-const sharedEpochOrderFromSorted = (- aEpochs: number[],- aNonces: number[],- bEpochs: number[],- bNonces: number[],-): number | null => {- let i = 0;- let j = 0;- while (i < aEpochs.length && j < bEpochs.length) {- const ae = aEpochs[i];- const be = bEpochs[j];- if (ae === be) {- return aNonces[i] - bNonces[j];- }-- if (ae > be) {- i++;- } else {- j++;- }- }-- return null;-};--export const sortItemsByNonceHistory: <T extends {nonce: NonceHistory}>(- items: T[],-) => T[] = (items) => {- const n = items.length;- if (n <= 1) {- return items.slice();- }-- // Collapse each history once into epoch/nonce arrays sorted by descending- // epoch. `new Map(nonce)` keeps the last value per duplicated epoch, matching- // getSharedEpochOrder. This removes the per-pair Map/Set construction the- // pairwise loop below would otherwise repeat O(n^2) times.- const epochsOf: number[][] = new Array(n);- const noncesOf: number[][] = new Array(n);- for (let i = 0; i < n; i++) {- const map = new Map(items[i].nonce);- const epochs = [...map.keys()].sort((x, y) => y - x);- epochsOf[i] = epochs;- noncesOf[i] = epochs.map((e) => map.get(e)!);- }-- // Pairwise "strictly before" relation, stored as bitsets: `before[i]` has- // bit j set when i must come before j, `known[i]` has bit j set when the- // pair (i, j) is directly determined by a shared epoch. Bitsets let the- // transitive closure below combine 32 relationships per word.- const words = (n + 31) >> 5;- const before = new Uint32Array(n * words);- const known = new Uint32Array(n * words);- // Direct comparison sign per ordered pair; only read where `known` is set.- const sign = new Int8Array(n * n);-- for (let i = 0; i < n; i++) {- for (let j = i + 1; j < n; j++) {- const cmp = sharedEpochOrderFromSorted(- epochsOf[i],- noncesOf[i],- epochsOf[j],- noncesOf[j],- );- if (cmp === null) {- continue;- }-- known[i * words + (j >> 5)] |= 1 << (j & 31);- known[j * words + (i >> 5)] |= 1 << (i & 31);- sign[i * n + j] = cmp < 0 ? -1 : cmp > 0 ? 1 : 0;- sign[j * n + i] = cmp < 0 ? 1 : cmp > 0 ? -1 : 0;- if (cmp < 0) {- before[i * words + (j >> 5)] |= 1 << (j & 31);- } else if (cmp > 0) {- before[j * words + (i >> 5)] |= 1 << (i & 31);- }- }- }-- // Transitive closure: if i < k and k < j, then i < j. This is the same- // Floyd-Warshall relation as before, but the inner sweep is bitwise- // (`before[k] & ~known[i]` finds all reachable j at once). A newly derived- // edge is marked known immediately so the first path decides an otherwise- // undetermined pair β preserving behavior on the inputs where the pairwise- // comparison is intentionally non-transitive.- for (let k = 0; k < n; k++) {- const kBase = k * words;- const kWord = k >> 5;- const kBit = 1 << (k & 31);- for (let i = 0; i < n; i++) {- if (i === k) {- continue;- }-- const iBase = i * words;- if ((before[iBase + kWord] & kBit) === 0) {- continue; // i is not before k, so k adds nothing for i- }-- for (let w = 0; w < words; w++) {- const add = before[kBase + w] & ~known[iBase + w];- if (add === 0) {- continue;- }-- before[iBase + w] |= add;- known[iBase + w] |= add;- // Set the mirror relationship (j after i) for each newly known pair.- let bits = add;- while (bits !== 0) {- const lowest = bits & -bits;- const j = (w << 5) + (31 - Math.clz32(lowest));- sign[i * n + j] = -1;- known[j * words + (i >> 5)] |= 1 << (i & 31);- sign[j * n + i] = 1;- bits ^= lowest;- }- }- }- }-- const indexMap = new Map(items.map((item, i) => [item, i]));- const result = items.slice();- result.sort((a, b) => {- const ai = indexMap.get(a)!;- const bi = indexMap.get(b)!;-- if ((known[ai * words + (bi >> 5)] >> (bi & 31)) & 1) {- return sign[ai * n + bi];- }-- if ((before[ai * words + (bi >> 5)] >> (bi & 31)) & 1) {- return -1;- }-- if ((before[bi * words + (ai >> 5)] >> (ai & 31)) & 1) {- return 1;- }-- // No transitive relationship β lower latest epoch first- return a.nonce[a.nonce.length - 1][0] - b.nonce[b.nonce.length - 1][0];- });-- return result;-};+export {compareNonceHistories, sortItemsByNonceHistory} from '@remotion/canvas';diff --git a/packages/studio/src/helpers/timeline-node-path-key.ts b/packages/studio/src/helpers/timeline-node-path-key.tsindex a6de704789..38564a826e 100644--- a/packages/studio/src/helpers/timeline-node-path-key.ts+++ b/packages/studio/src/helpers/timeline-node-path-key.ts@@ -1,10 +1,7 @@import {stringifySequenceExpandedRowKey} from '@remotion/studio-shared';-import type {SequencePropsSubscriptionKey} from 'remotion';import type {SequenceNodePathInfo} from './get-timeline-sequence-sort-key';-export const timelineSequenceNodePathToKey = (- key: SequencePropsSubscriptionKey,-): string => `${key.absolutePath}:${JSON.stringify(key.nodePath)}`;+export {timelineSequenceNodePathToKey} from '@remotion/canvas';export const timelineNodePathInfoToKey = (info: SequenceNodePathInfo): string =>[diff --git a/packages/studio/tsconfig.json b/packages/studio/tsconfig.jsonindex 24bf22701c..846851819b 100644--- a/packages/studio/tsconfig.json+++ b/packages/studio/tsconfig.json@@ -9,6 +9,9 @@},"include": ["src"],"references": [+ {+ "path": "../canvas"+ },{"path": "../core"},diff --git a/tsconfig.json b/tsconfig.jsonindex e23afd70ec..de3eea01a2 100644--- a/tsconfig.json+++ b/tsconfig.json@@ -27,6 +27,9 @@{"path": "./packages/browser-studio"},+ {+ "path": "./packages/canvas"+ },{"path": "./packages/cloudrun"},