🎥 Make videos programmatically with React
Drop "Jsx" from the Studio operations protocol
JonnyBurger17ce6cae4fbb
diff --git a/packages/browser-studio/src/browser-studio-operations.ts b/packages/browser-studio/src/browser-studio-operations.tsindex 7dfec9ae73..926465ee5f 100644--- a/packages/browser-studio/src/browser-studio-operations.ts+++ b/packages/browser-studio/src/browser-studio-operations.ts@@ -25,7 +25,7 @@ import {reorderNode,resolveCompositionComponent,setCompositionDefaultProps,- splitSequences,+ splitSequences as splitSequencesCodemod,unwrapFolder,updateCompositionMetadata,updateEffectKeyframes,@@ -56,7 +56,7 @@ import {type ElementInstallExpectedFileState,type EventSourceEvent,type InsertElementResponse,- type InsertJsxElementRequest,+ type InsertCompositionElementRequest,type RecastCodemod,type SequenceNodePathRemapping,type SubscribeToSequencePropsRequest,@@ -120,7 +120,7 @@ const insertIntoProject = async ({wrapInSequence,}: {project: VirtualProject;- request: InsertJsxElementRequest;+ request: InsertCompositionElementRequest;wrapInSequence: InsertableSequenceWrapper | null;}): Promise<{changes: CodemodFileChange[];@@ -1461,7 +1461,7 @@ export const createBrowserStudioOperations = ({},};- const deleteJsxNodes: BrowserStudioOperations['deleteJsxNodes'] = async ({+ const deleteNodes: BrowserStudioOperations['deleteNodes'] = async ({nodes,}) => {try {@@ -1498,7 +1498,7 @@ export const createBrowserStudioOperations = ({}};- const duplicateJsxNode: BrowserStudioOperations['duplicateJsxNode'] = async ({+ const duplicateNodes: BrowserStudioOperations['duplicateNodes'] = async ({nodes,}) => {try {@@ -1531,7 +1531,7 @@ export const createBrowserStudioOperations = ({}};- const wrapJsxNode: BrowserStudioOperations['wrapJsxNode'] = ({+ const wrapNode: BrowserStudioOperations['wrapNode'] = ({fileName,nodePath,wrapper,@@ -1585,7 +1585,7 @@ export const createBrowserStudioOperations = ({}};- const splitJsxSequence: BrowserStudioOperations['splitJsxSequence'] = async ({+ const splitSequences: BrowserStudioOperations['splitSequences'] = async ({sequences,}) => {try {@@ -1594,7 +1594,7 @@ export const createBrowserStudioOperations = ({}const project = getProject();- const result = await splitSequences({+ const result = await splitSequencesCodemod({project,splits: sequences.map((sequence) => ({node: {filePath: sequence.fileName, nodePath: sequence.nodePath},@@ -2187,78 +2187,77 @@ export const createBrowserStudioOperations = ({}};- const insertJsxElement: BrowserStudioOperations['insertJsxElement'] = async (- request,- ) => {- try {- const requiredPackage = getRequiredPackageForInsertableElement(- request.element,- );- const installedDependencies =- requiredPackage === null- ? {}- : await resolveElementDependencies([- {name: requiredPackage, version: null},- ]);- const project = addDependenciesToProject({- dependencies: installedDependencies,- project: getProject(),- });- const result = await insertIntoProject({- project,- request,- wrapInSequence: null,- });- const {changes} = result;- const nodePathMutation = controller.applyMutation({- undoRedoNavigation: null,- timelineSelection:- result.insertedNodePath === null- ? null- : {- absolutePath: result.filePath,- compositionId: request.compositionId,- nodePath: result.insertedNodePath,- },- fileName: result.filePath,- mutate: (current) =>- applyCodemodChanges(- addDependenciesToProject({- dependencies: installedDependencies,- project: current,- }),- changes,- ),- nodePathMutationFiles: [- {- absolutePath: result.filePath,- remappings: result.nodePathRemappings,- },- ],- });- if (nodePathMutation === null) {- throw new Error('Could not insert JSX element');- }+ const insertCompositionElement: BrowserStudioOperations['insertCompositionElement'] =+ async (request) => {+ try {+ const requiredPackage = getRequiredPackageForInsertableElement(+ request.element,+ );+ const installedDependencies =+ requiredPackage === null+ ? {}+ : await resolveElementDependencies([+ {name: requiredPackage, version: null},+ ]);+ const project = addDependenciesToProject({+ dependencies: installedDependencies,+ project: getProject(),+ });+ const result = await insertIntoProject({+ project,+ request,+ wrapInSequence: null,+ });+ const {changes} = result;+ const nodePathMutation = controller.applyMutation({+ undoRedoNavigation: null,+ timelineSelection:+ result.insertedNodePath === null+ ? null+ : {+ absolutePath: result.filePath,+ compositionId: request.compositionId,+ nodePath: result.insertedNodePath,+ },+ fileName: result.filePath,+ mutate: (current) =>+ applyCodemodChanges(+ addDependenciesToProject({+ dependencies: installedDependencies,+ project: current,+ }),+ changes,+ ),+ nodePathMutationFiles: [+ {+ absolutePath: result.filePath,+ remappings: result.nodePathRemappings,+ },+ ],+ });+ if (nodePathMutation === null) {+ throw new Error('Could not insert JSX element');+ }- return {- success: true,- insertedNodePath:- result.insertedNodePath === null- ? null- : {- absolutePath: result.filePath,- nodePath: result.insertedNodePath,- },- nodePathMutation,- };- } catch (error) {- return {- success: false,- reason: error instanceof Error ? error.message : String(error),- stack: error instanceof Error && error.stack ? error.stack : '',- };- }- };+ return {+ success: true,+ insertedNodePath:+ result.insertedNodePath === null+ ? null+ : {+ absolutePath: result.filePath,+ nodePath: result.insertedNodePath,+ },+ nodePathMutation,+ };+ } catch (error) {+ return {+ success: false,+ reason: error instanceof Error ? error.message : String(error),+ stack: error instanceof Error && error.stack ? error.stack : '',+ };+ }+ };return {applyCodemod,@@ -2276,7 +2275,7 @@ export const createBrowserStudioOperations = ({sourceOrigin: value.sourceOrigin,};},- deleteJsxNodes,+ deleteNodes,deleteStaticFile: controller.deleteStaticFile,downloadRemoteAsset: (request) =>downloadRemoteAssetInBrowserStudio({@@ -2290,8 +2289,8 @@ export const createBrowserStudioOperations = ({project: getProject(),}),duplicateComposition,- duplicateJsxNode,- wrapJsxNode,+ duplicateNodes,+ wrapNode,effects: effectOperations,emitEvent: controller.emitEvent,findInFile: controller.findInFile,@@ -2567,8 +2566,7 @@ export const createBrowserStudioOperations = ({} satisfies InsertElementResponse;}},- insertJsxElement,- insertSolid: insertJsxElement,+ insertCompositionElement,keyframes,packageInstallation,prepareElementInstall: async (request) => {@@ -2717,7 +2715,7 @@ export const createBrowserStudioOperations = ({lastDefaultPropsResults.set(compositionId, JSON.stringify(result));return Promise.resolve(result);},- splitJsxSequence,+ splitSequences,subscribeToEvent: controller.subscribeToEvent,subscribeToSequenceProps: (request) => {const result = getSequencePropsSubscription(request);diff --git a/packages/browser-studio/src/test/browser-studio-operations.test.ts b/packages/browser-studio/src/test/browser-studio-operations.test.tsindex 0dc723c175..622e553a4d 100644--- a/packages/browser-studio/src/test/browser-studio-operations.test.ts+++ b/packages/browser-studio/src/test/browser-studio-operations.test.ts@@ -179,7 +179,7 @@ export const MyComponent = () => <AbsoluteFill>Existing</AbsoluteFill>;},});- const result = await operations.insertSolid({+ const result = await operations.insertCompositionElement({compositionFile: 'src/index.tsx',compositionId: 'MyComp',from: null,@@ -290,7 +290,7 @@ export const Root = () => <Composition id="MyComp" component={Component} duratio}events.length = 0;- const result = await operations.insertSolid({+ const result = await operations.insertCompositionElement({compositionFile: fileName,compositionId: 'MyComp',from: null,@@ -531,7 +531,7 @@ test('reports invalid timeline Solid input without changing the project', asyncresolveDependencies: null,});- const result = await operations.insertSolid({+ const result = await operations.insertCompositionElement({compositionFile: '/project/src/Composition.tsx',compositionId: 'MyComp',from: 1.5,@@ -884,7 +884,7 @@ registerRoot(Root);`,throw new Error('Expected sequence props subscription to succeed');}- const failure = await operations.splitJsxSequence({+ const failure = await operations.splitSequences({sequences: [{fileName: 'src/Composition.tsx',@@ -901,7 +901,7 @@ registerRoot(Root);`,});expect(currentProject.files[fileName]).toBe(initialContents);- const splitResult = await operations.splitJsxSequence({+ const splitResult = await operations.splitSequences({sequences: [{fileName: 'src/Composition.tsx',@@ -977,7 +977,7 @@ export const Component = () => <AbsoluteFill><div /></AbsoluteFill>;`;throw new Error('Expected an AbsoluteFill node');}- const result = await operations.wrapJsxNode({+ const result = await operations.wrapNode({fileName,nodePath,wrapper: 'Sequence',@@ -1037,7 +1037,7 @@ registerRoot(Root);`,throw new Error('Expected sequence props subscription to succeed');}- const failure = await operations.duplicateJsxNode({+ const failure = await operations.duplicateNodes({nodes: [{fileName: 'src/Composition.tsx',@@ -1053,7 +1053,7 @@ registerRoot(Root);`,});expect(getProject().files[fileName]).toBe(initialContents);- const result = await operations.duplicateJsxNode({+ const result = await operations.duplicateNodes({nodes: [{fileName: 'src/Composition.tsx',diff --git a/packages/browser-studio/src/test/browser-studio-project-operations.test.ts b/packages/browser-studio/src/test/browser-studio-project-operations.test.tsindex 0158a6e8cb..2bb8ddd24c 100644--- a/packages/browser-studio/src/test/browser-studio-project-operations.test.ts+++ b/packages/browser-studio/src/test/browser-studio-project-operations.test.ts@@ -129,7 +129,7 @@ test('mutates virtual files, emits events, and preserves undo and redo history',}),).toEqual({lineNumber: 14, columnNumber: 7});- const insertResult = await operations.insertSolid({+ const insertResult = await operations.insertCompositionElement({compositionFile: '/project/src/Composition.tsx',compositionId: 'MyComp',element: {@@ -194,7 +194,7 @@ test('mutates virtual files, emits events, and preserves undo and redo history',throw new Error('Expected the inserted Solid to have a node path');}- const deleteResult = await operations.deleteJsxNodes({+ const deleteResult = await operations.deleteNodes({nodes: [{fileName: '/project/src/Composition.tsx',@@ -1173,7 +1173,7 @@ test('inserts generic elements with pinned Remotion dependencies', async () => {},resolveDependencies: null,});- const result = await operations.insertJsxElement({+ const result = await operations.insertCompositionElement({compositionFile: '/project/src/Composition.tsx',compositionId: 'MyComp',element: {@@ -1213,7 +1213,7 @@ test('rejects inline SVG importing in Browser Studio', async () => {},resolveDependencies: null,});- const result = await operations.insertJsxElement({+ const result = await operations.insertCompositionElement({compositionFile: '/project/src/Composition.tsx',compositionId: 'MyComp',element: {diff --git a/packages/browser-studio/src/test/download-project.test.ts b/packages/browser-studio/src/test/download-project.test.tsindex b6b5f2eda6..1cea4a07ce 100644--- a/packages/browser-studio/src/test/download-project.test.ts+++ b/packages/browser-studio/src/test/download-project.test.ts@@ -29,7 +29,7 @@ test('downloads the current Browser Studio project as a runnable archive', asyncresolveDependencies: null,});- const insertResult = await operations.insertSolid({+ const insertResult = await operations.insertCompositionElement({compositionFile: '/project/src/Composition.tsx',compositionId: 'MyComp',element: {diff --git a/packages/codemods/src/insert-jsx-element.ts b/packages/codemods/src/insert-jsx-element.tsindex c6c0c6b683..cf97ff159e 100644--- a/packages/codemods/src/insert-jsx-element.ts+++ b/packages/codemods/src/insert-jsx-element.ts@@ -13,7 +13,7 @@ import type {ObjectProperty,} from '@babel/types';import type {- InsertJsxElementRequest,+ InsertCompositionElementRequest,InsertableCompositionElement,InsertableCompositionElementPosition,SequenceNodePathRemapping,@@ -2296,7 +2296,7 @@ export const insertJsxElementIntoProjectWithNodePathRemappings = async ({wrapInSequence,}: {project: {files: Record<string, string>; rootDir: string};- request: InsertJsxElementRequest;+ request: InsertCompositionElementRequest;svgMarkupToJsx: CodemodEnvironment['svgMarkupToJsx'];wrapInSequence: {dimensions: {width: number; height: number} | null;diff --git a/packages/studio-server/src/preview-server/api-routes.ts b/packages/studio-server/src/preview-server/api-routes.tsindex 03b967e5ad..a365cdf94e 100644--- a/packages/studio-server/src/preview-server/api-routes.ts+++ b/packages/studio-server/src/preview-server/api-routes.ts@@ -18,16 +18,16 @@ import {} from './routes/default-coding-agent';import {getDefaultEditorInfoHandler} from './routes/default-editor';import {deleteEffectHandler} from './routes/delete-effect';-import {deleteJsxNodesHandler} from './routes/delete-jsx-nodes';import {deleteKeyframesHandler} from './routes/delete-keyframes';+import {deleteNodesHandler} from './routes/delete-nodes';import {deleteStaticFileHandler} from './routes/delete-static-file';import {downloadRemoteAssetHandler} from './routes/download-remote-asset';import {duplicateEffectHandler} from './routes/duplicate-effect';-import {duplicateJsxNodeHandler} from './routes/duplicate-jsx-node';+import {duplicateNodesHandler} from './routes/duplicate-nodes';import {findInFileHandler} from './routes/find-in-file';import {insertBasicCaptionsHandler} from './routes/insert-basic-captions';+import {insertCompositionElementHandler} from './routes/insert-composition-element';import {insertElementHandler} from './routes/insert-element';-import {insertJsxElementHandler} from './routes/insert-jsx-element';import {installRemotionSkillHandler,removeRemotionSkillHandler,@@ -56,7 +56,7 @@ import {saveEffectPropsHandler} from './routes/save-effect-props';import {saveMultipleEffectPropsHandler} from './routes/save-multiple-effect-props';import {saveSequencePropsHandler} from './routes/save-sequence-props';import {handleShutdownStudio} from './routes/shutdown-studio';-import {splitJsxSequenceHandler} from './routes/split-jsx-sequence';+import {splitSequencesHandler} from './routes/split-sequences';import {splitVideoFromAudioHandler} from './routes/split-video-from-audio';import {subscribeToDefaultProps} from './routes/subscribe-to-default-props';import {subscribeToFileExistence} from './routes/subscribe-to-file-existence';@@ -72,7 +72,7 @@ import {updateEffectKeyframeSettingsHandler} from './routes/update-effect-keyfraimport {updateElementInstallTargetHandler} from './routes/update-element-install-target';import {updateSequenceKeyframeSettingsHandler} from './routes/update-sequence-keyframe-settings';import {handleUpgradeRemotion} from './routes/upgrade-remotion';-import {wrapJsxNodeHandler} from './routes/wrap-jsx-node';+import {wrapNodeHandler} from './routes/wrap-node';type StandardApiRoute = Exclude<keyof ApiRoutes,@@ -127,10 +127,10 @@ export const allApiRoutes: {'/api/batch-update-keyframe-settings': batchUpdateKeyframeSettingsHandler,'/api/delete-effect': deleteEffectHandler,'/api/paste-effects': pasteEffectsHandler,- '/api/delete-jsx-nodes': deleteJsxNodesHandler,- '/api/duplicate-jsx-node': duplicateJsxNodeHandler,- '/api/wrap-jsx-node': wrapJsxNodeHandler,- '/api/split-jsx-sequence': splitJsxSequenceHandler,+ '/api/delete-nodes': deleteNodesHandler,+ '/api/duplicate-nodes': duplicateNodesHandler,+ '/api/wrap-node': wrapNodeHandler,+ '/api/split-sequences': splitSequencesHandler,'/api/split-video-from-audio': splitVideoFromAudioHandler,'/api/insert-basic-captions': insertBasicCaptionsHandler,'/api/replace-video-source': replaceVideoSourceHandler,@@ -147,7 +147,7 @@ export const allApiRoutes: {'/api/restart-studio': handleRestartStudio,'/api/default-coding-agent-info': getDefaultCodingAgentInfoHandler,'/api/default-editor-info': getDefaultEditorInfoHandler,- '/api/insert-jsx-element': insertJsxElementHandler,+ '/api/insert-composition-element': insertCompositionElementHandler,'/api/insert-element': insertElementHandler,'/api/prepare-element-install': prepareElementInstallHandler,'/api/update-element-install-target': updateElementInstallTargetHandler,diff --git a/packages/studio-server/src/preview-server/routes/delete-jsx-nodes.ts b/packages/studio-server/src/preview-server/routes/delete-nodes.tssimilarity index 91%rename from packages/studio-server/src/preview-server/routes/delete-jsx-nodes.tsrename to packages/studio-server/src/preview-server/routes/delete-nodes.tsindex f609b0c440..7efa6d8982 100644--- a/packages/studio-server/src/preview-server/routes/delete-jsx-nodes.ts+++ b/packages/studio-server/src/preview-server/routes/delete-nodes.ts@@ -2,8 +2,8 @@ import {readFileSync} from 'node:fs';import {deleteNodes} from '@remotion/codemods';import {RenderInternals} from '@remotion/renderer';import type {- DeleteJsxNodesRequest,- DeleteJsxNodesResponse,+ DeleteNodesRequest,+ DeleteNodesResponse,} from '@remotion/studio-shared';import {writeFileAndNotifyFileWatchers} from '../../file-watcher';import {resolveFileInsideProject} from '../../helpers/resolve-file-inside-project';@@ -29,16 +29,16 @@ const getDeletedNodeDescription = (nodeLabels: string[]): string => {return `${nodeLabels.length} JSX nodes`;};-export const deleteJsxNodesHandler: ApiHandler<- DeleteJsxNodesRequest,- DeleteJsxNodesResponse+export const deleteNodesHandler: ApiHandler<+ DeleteNodesRequest,+ DeleteNodesResponse> = ({input: {nodes}, remotionRoot, logLevel}) => {return withSourceFileWriteQueue(async () => {try {logHmrTiming({detail: null,logLevel,- stage: 'delete-jsx-nodes-request-start',+ stage: 'delete-nodes-request-start',});if (nodes.length === 0) {@@ -47,7 +47,7 @@ export const deleteJsxNodesHandler: ApiHandler<RenderInternals.Log.trace({indent: false, logLevel},- `[delete-jsx-nodes] Received request to delete ${nodes.length} JSX node${nodes.length === 1 ? '' : 's'}`,+ `[delete-nodes] Received request to delete ${nodes.length} JSX node${nodes.length === 1 ? '' : 's'}`,);const itemsByFileName = new Map<string, typeof nodes>();@@ -97,7 +97,7 @@ export const deleteJsxNodesHandler: ApiHandler<logHmrTiming({detail: `files=${updates.length}`,logLevel,- stage: 'delete-jsx-nodes-codemod-complete',+ stage: 'delete-nodes-codemod-complete',});const nodePathMutation = broadcastSequenceNodePathMutation(updates.map((update) => ({@@ -123,7 +123,7 @@ export const deleteJsxNodesHandler: ApiHandler<undoMessage: `↩️ Deletion of ${deletedNodeDescription}`,redoMessage: `↪️ Deletion of ${deletedNodeDescription}`,},- entryType: 'delete-jsx-nodes',+ entryType: 'delete-nodes',suppressHmrOnFileRestore: false,nodePathRemappings: update.nodePathRemappings,});@@ -156,7 +156,7 @@ export const deleteJsxNodesHandler: ApiHandler<);RenderInternals.Log.verbose({indent: false, logLevel},- `[delete-jsx-nodes] Wrote ${update.fileRelativeToRoot}`,+ `[delete-nodes] Wrote ${update.fileRelativeToRoot}`,);}diff --git a/packages/studio-server/src/preview-server/routes/duplicate-jsx-node.ts b/packages/studio-server/src/preview-server/routes/duplicate-nodes.tssimilarity index 92%rename from packages/studio-server/src/preview-server/routes/duplicate-jsx-node.tsrename to packages/studio-server/src/preview-server/routes/duplicate-nodes.tsindex 3a70edb6f2..0942847653 100644--- a/packages/studio-server/src/preview-server/routes/duplicate-jsx-node.ts+++ b/packages/studio-server/src/preview-server/routes/duplicate-nodes.ts@@ -2,8 +2,8 @@ import {readFileSync} from 'node:fs';import {duplicateNodes} from '@remotion/codemods';import {RenderInternals} from '@remotion/renderer';import type {- DuplicateJsxNodeRequest,- DuplicateJsxNodeResponse,+ DuplicateNodesRequest,+ DuplicateNodesResponse,} from '@remotion/studio-shared';import {writeFileAndNotifyFileWatchers} from '../../file-watcher';import {resolveFileInsideProject} from '../../helpers/resolve-file-inside-project';@@ -20,9 +20,9 @@ import {withSourceFileWriteQueue,} from './source-file-write-queue';-export const duplicateJsxNodeHandler: ApiHandler<- DuplicateJsxNodeRequest,- DuplicateJsxNodeResponse+export const duplicateNodesHandler: ApiHandler<+ DuplicateNodesRequest,+ DuplicateNodesResponse> = ({input: {nodes}, remotionRoot, logLevel}) => {return withSourceFileWriteQueue(async () => {try {@@ -32,7 +32,7 @@ export const duplicateJsxNodeHandler: ApiHandler<RenderInternals.Log.trace({indent: false, logLevel},- `[duplicate-jsx-node] Received request to duplicate ${nodes.length} JSX node${nodes.length === 1 ? '' : 's'}`,+ `[duplicate-nodes] Received request to duplicate ${nodes.length} JSX node${nodes.length === 1 ? '' : 's'}`,);const itemsByFileName = new Map<string, typeof nodes>();@@ -103,7 +103,7 @@ export const duplicateJsxNodeHandler: ApiHandler<undoMessage: `↩️ Duplication of ${duplicatedNodeDescription}`,redoMessage: `↪️ Duplication of ${duplicatedNodeDescription}`,},- entryType: 'duplicate-jsx-node',+ entryType: 'duplicate-nodes',suppressHmrOnFileRestore: false,undoRedoNavigation: null,});@@ -133,7 +133,7 @@ export const duplicateJsxNodeHandler: ApiHandler<RenderInternals.Log.verbose({indent: false, logLevel},- `[duplicate-jsx-node] Wrote ${update.fileRelativeToRoot}`,+ `[duplicate-nodes] Wrote ${update.fileRelativeToRoot}`,);}diff --git a/packages/studio-server/src/preview-server/routes/insert-jsx-element.ts b/packages/studio-server/src/preview-server/routes/insert-composition-element.tssimilarity index 94%rename from packages/studio-server/src/preview-server/routes/insert-jsx-element.tsrename to packages/studio-server/src/preview-server/routes/insert-composition-element.tsindex 82c69ba51f..d191392236 100644--- a/packages/studio-server/src/preview-server/routes/insert-jsx-element.ts+++ b/packages/studio-server/src/preview-server/routes/insert-composition-element.ts@@ -3,8 +3,8 @@ import {RenderInternals} from '@remotion/renderer';import {StudioProtocolInternals} from '@remotion/studio-protocol';import {isUrl,- type InsertJsxElementRequest,- type InsertJsxElementResponse,+ type InsertCompositionElementRequest,+ type InsertCompositionElementResponse,type InsertableCompositionElementPosition,type InsertableCompositionElement,} from '@remotion/studio-shared';@@ -217,9 +217,9 @@ const getElementLabel = (element: InsertableCompositionElement) => {throw new Error('Unsupported element type');};-export const insertJsxElementHandler: ApiHandler<- InsertJsxElementRequest,- InsertJsxElementResponse+export const insertCompositionElementHandler: ApiHandler<+ InsertCompositionElementRequest,+ InsertCompositionElementResponse> = ({input: {compositionFile, compositionId, element, from},remotionRoot,@@ -239,7 +239,7 @@ export const insertJsxElementHandler: ApiHandler<RenderInternals.Log.trace({indent: false, logLevel},- `[insert-jsx-element] Received request for compositionFile="${compositionFile}" compositionId="${compositionId}" element="${element.type}"`,+ `[insert-composition-element] Received request for compositionFile="${compositionFile}" compositionId="${compositionId}" element="${element.type}"`,);const {@@ -292,7 +292,7 @@ export const insertJsxElementHandler: ApiHandler<undoMessage: `↩️ Added ${elementLabel}`,redoMessage: `↪️ Added ${elementLabel}`,},- entryType: 'insert-jsx-element',+ entryType: 'insert-composition-element',suppressHmrOnFileRestore: false,nodePathRemappings,});@@ -315,7 +315,7 @@ export const insertJsxElementHandler: ApiHandler<);RenderInternals.Log.verbose({indent: false, logLevel},- `[insert-jsx-element] Wrote ${source}`,+ `[insert-composition-element] Wrote ${source}`,);printUndoHint(logLevel);diff --git a/packages/studio-server/src/preview-server/routes/insert-element.ts b/packages/studio-server/src/preview-server/routes/insert-element.tsindex 9d784aba3a..088692657c 100644--- a/packages/studio-server/src/preview-server/routes/insert-element.ts+++ b/packages/studio-server/src/preview-server/routes/insert-element.ts@@ -534,7 +534,7 @@ export const insertElementHandler: ApiHandler<undoMessage: `↩️ Installation of ${element.displayName} into composition "${compositionId}"`,redoMessage: `↪️ Installation of ${element.displayName} into composition "${compositionId}"`,},- entryType: 'insert-jsx-element',+ entryType: 'insert-composition-element',suppressHmrOnFileRestore: false,undoRedoNavigation,});diff --git a/packages/studio-server/src/preview-server/routes/split-jsx-sequence.ts b/packages/studio-server/src/preview-server/routes/split-sequences.tssimilarity index 92%rename from packages/studio-server/src/preview-server/routes/split-jsx-sequence.tsrename to packages/studio-server/src/preview-server/routes/split-sequences.tsindex 07056a9d24..a43e47ac15 100644--- a/packages/studio-server/src/preview-server/routes/split-jsx-sequence.ts+++ b/packages/studio-server/src/preview-server/routes/split-sequences.ts@@ -2,8 +2,8 @@ import {readFileSync} from 'node:fs';import {splitSequences} from '@remotion/codemods';import {RenderInternals} from '@remotion/renderer';import type {- SplitJsxSequenceRequest,- SplitJsxSequenceResponse,+ SplitSequencesRequest,+ SplitSequencesResponse,} from '@remotion/studio-shared';import {writeFileAndNotifyFileWatchers} from '../../file-watcher';import {resolveFileInsideProject} from '../../helpers/resolve-file-inside-project';@@ -20,9 +20,9 @@ import {withSourceFileWriteQueue,} from './source-file-write-queue';-export const splitJsxSequenceHandler: ApiHandler<- SplitJsxSequenceRequest,- SplitJsxSequenceResponse+export const splitSequencesHandler: ApiHandler<+ SplitSequencesRequest,+ SplitSequencesResponse> = ({input: {sequences}, remotionRoot, logLevel}) =>withSourceFileWriteQueue(async () => {try {@@ -32,7 +32,7 @@ export const splitJsxSequenceHandler: ApiHandler<RenderInternals.Log.trace({indent: false, logLevel},- `[split-jsx-sequence] Received request to split ${sequences.length} JSX sequence${sequences.length === 1 ? '' : 's'}`,+ `[split-sequences] Received request to split ${sequences.length} JSX sequence${sequences.length === 1 ? '' : 's'}`,);const sequencesByFileName = new Map<string, typeof sequences>();for (const sequence of sequences) {@@ -105,7 +105,7 @@ export const splitJsxSequenceHandler: ApiHandler<undoMessage: `↩️ Split of ${splitDescription}`,redoMessage: `↪️ Split of ${splitDescription}`,},- entryType: 'split-jsx-sequence',+ entryType: 'split-sequences',suppressHmrOnFileRestore: false,undoRedoNavigation: null,});@@ -136,7 +136,7 @@ export const splitJsxSequenceHandler: ApiHandler<);RenderInternals.Log.verbose({indent: false, logLevel},- `[split-jsx-sequence] Wrote ${update.fileRelativeToRoot}`,+ `[split-sequences] Wrote ${update.fileRelativeToRoot}`,);}diff --git a/packages/studio-server/src/preview-server/routes/wrap-jsx-node.ts b/packages/studio-server/src/preview-server/routes/wrap-node.tssimilarity index 91%rename from packages/studio-server/src/preview-server/routes/wrap-jsx-node.tsrename to packages/studio-server/src/preview-server/routes/wrap-node.tsindex bf06eb089a..786a6e57dc 100644--- a/packages/studio-server/src/preview-server/routes/wrap-jsx-node.ts+++ b/packages/studio-server/src/preview-server/routes/wrap-node.ts@@ -1,10 +1,7 @@import {readFileSync} from 'node:fs';import {canWrapNode, createElement, wrapNode} from '@remotion/codemods';import {RenderInternals} from '@remotion/renderer';-import type {- WrapJsxNodeRequest,- WrapJsxNodeResponse,-} from '@remotion/studio-shared';+import type {WrapNodeRequest, WrapNodeResponse} from '@remotion/studio-shared';import {writeFileAndNotifyFileWatchers} from '../../file-watcher';import {resolveFileInsideProject} from '../../helpers/resolve-file-inside-project';import type {ApiHandler} from '../api-types';@@ -20,15 +17,12 @@ import {withSourceFileWriteQueue,} from './source-file-write-queue';-export const wrapJsxNodeHandler: ApiHandler<- WrapJsxNodeRequest,- WrapJsxNodeResponse-> = ({+export const wrapNodeHandler: ApiHandler<WrapNodeRequest, WrapNodeResponse> = ({input: {fileName, nodePath, wrapper, width, height},remotionRoot,logLevel,}) => {- return withSourceFileWriteQueue((): Promise<WrapJsxNodeResponse> => {+ return withSourceFileWriteQueue((): Promise<WrapNodeResponse> => {try {const {absolutePath, fileRelativeToRoot} = resolveFileInsideProject({remotionRoot,@@ -103,7 +97,7 @@ export const wrapJsxNodeHandler: ApiHandler<undoMessage: `↩️ Wrapping in ${wrapper}`,redoMessage: `↪️ Wrapping in ${wrapper}`,},- entryType: 'wrap-jsx-node',+ entryType: 'wrap-node',suppressHmrOnFileRestore: false,undoRedoNavigation: null,});@@ -125,7 +119,7 @@ export const wrapJsxNodeHandler: ApiHandler<);RenderInternals.Log.verbose({indent: false, logLevel},- `[wrap-jsx-node] Wrote ${fileRelativeToRoot}`,+ `[wrap-node] Wrote ${fileRelativeToRoot}`,);printUndoHint(logLevel);return Promise.resolve({success: true, ...eligibility, nodePathMutation});diff --git a/packages/studio-server/src/preview-server/undo-stack.ts b/packages/studio-server/src/preview-server/undo-stack.tsindex 4cd51e06dd..040b55a5e4 100644--- a/packages/studio-server/src/preview-server/undo-stack.ts+++ b/packages/studio-server/src/preview-server/undo-stack.ts@@ -38,14 +38,14 @@ type UndoEntryType =| 'paste-effects'| 'reorder-effect'| 'reorder-sequence'- | 'delete-jsx-nodes'- | 'duplicate-jsx-node'- | 'wrap-jsx-node'- | 'split-jsx-sequence'+ | 'delete-nodes'+ | 'duplicate-nodes'+ | 'wrap-node'+ | 'split-sequences'| 'split-video-from-audio'| 'insert-basic-captions'| 'replace-video-source'- | 'insert-jsx-element'+ | 'insert-composition-element'| 'delete-composition'| 'rename-composition'| 'update-composition-metadata'diff --git a/packages/studio-server/src/test/delete-jsx-nodes.test.ts b/packages/studio-server/src/test/delete-nodes.test.tssimilarity index 98%rename from packages/studio-server/src/test/delete-jsx-nodes.test.tsrename to packages/studio-server/src/test/delete-nodes.test.tsindex 287cf94be9..4f46a294aa 100644--- a/packages/studio-server/src/test/delete-jsx-nodes.test.ts+++ b/packages/studio-server/src/test/delete-nodes.test.ts@@ -11,7 +11,7 @@ import {setFileWatcherRegistry,} from '../file-watcher';import {setLiveEventsListener} from '../preview-server/live-events';-import {deleteJsxNodesHandler} from '../preview-server/routes/delete-jsx-nodes';+import {deleteNodesHandler} from '../preview-server/routes/delete-nodes';import {subscribeToSequenceProps} from '../preview-server/routes/subscribe-to-sequence-props';import {unsubscribeClientSequencePropsWatchers} from '../preview-server/sequence-props-watchers';import {@@ -117,7 +117,7 @@ test('deleting a JSX node broadcasts node path mutations for all clients', async});expect(subscription.results.every((result) => result.success)).toBe(true);- const response = await deleteJsxNodesHandler({+ const response = await deleteNodesHandler({...apiHandlerContext,input: {nodes: [diff --git a/packages/studio-server/src/test/jsx-node-path-mutation-routes.test.ts b/packages/studio-server/src/test/node-path-mutation-routes.test.tssimilarity index 95%rename from packages/studio-server/src/test/jsx-node-path-mutation-routes.test.tsrename to packages/studio-server/src/test/node-path-mutation-routes.test.tsindex 0b2d81ae17..7dc0952a70 100644--- a/packages/studio-server/src/test/jsx-node-path-mutation-routes.test.ts+++ b/packages/studio-server/src/test/node-path-mutation-routes.test.ts@@ -11,10 +11,10 @@ import {setFileWatcherRegistry,} from '../file-watcher';import {setLiveEventsListener} from '../preview-server/live-events';-import {duplicateJsxNodeHandler} from '../preview-server/routes/duplicate-jsx-node';-import {insertJsxElementHandler} from '../preview-server/routes/insert-jsx-element';+import {duplicateNodesHandler} from '../preview-server/routes/duplicate-nodes';+import {insertCompositionElementHandler} from '../preview-server/routes/insert-composition-element';import {reorderSequenceHandler} from '../preview-server/routes/reorder-sequence';-import {splitJsxSequenceHandler} from '../preview-server/routes/split-jsx-sequence';+import {splitSequencesHandler} from '../preview-server/routes/split-sequences';import {clearUndoStackForTests,popRedo,@@ -156,7 +156,7 @@ test('JSX structure routes broadcast and return node path mutations before writi).toBe(true);before = readFileSync(filePath, 'utf-8');- const duplicateResponse = await duplicateJsxNodeHandler({+ const duplicateResponse = await duplicateNodesHandler({...handlerContext,input: {nodes: [@@ -187,7 +187,7 @@ test('JSX structure routes broadcast and return node path mutations before writiexpect(readFileSync(filePath, 'utf-8')).toContain('name="c-copy"');before = readFileSync(filePath, 'utf-8');- const splitResponse = await splitJsxSequenceHandler({+ const splitResponse = await splitSequencesHandler({...handlerContext,input: {sequences: [@@ -214,7 +214,7 @@ test('JSX structure routes broadcast and return node path mutations before writi).toBe(true);before = readFileSync(filePath, 'utf-8');- const insertResponse = await insertJsxElementHandler({+ const insertResponse = await insertCompositionElementHandler({...handlerContext,input: {compositionFile: fileName,diff --git a/packages/studio-server/src/test/resolve-composition-component.test.ts b/packages/studio-server/src/test/resolve-composition-component.test.tsindex fe8d819b7b..9ea8174a55 100644--- a/packages/studio-server/src/test/resolve-composition-component.test.ts+++ b/packages/studio-server/src/test/resolve-composition-component.test.ts@@ -7,7 +7,7 @@ import {insertJsxElementIntoComposition,resolveCompositionComponent,} from '../helpers/resolve-composition-component';-import {insertJsxElementHandler} from '../preview-server/routes/insert-jsx-element';+import {insertCompositionElementHandler} from '../preview-server/routes/insert-composition-element';import {lineContainingToNodePath} from './test-utils';const remotionRoot = path.join(__dirname, '..', '..', '..', 'example');@@ -1995,7 +1995,7 @@ test('rejects inserting a composition whose component is not exported', async ()const targetFile = path.join(tempDir, 'Target.tsx');await fs.writeFile(targetFile, targetContents);- const response = await insertJsxElementHandler({+ const response = await insertCompositionElementHandler({input: {compositionFile: 'Root.tsx',compositionId: 'target',@@ -2189,7 +2189,7 @@ test('rejects array payloads for resolved composition props', async () => {test('rejects composition insertion requests that traverse out of the project root', async () => {const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'remotion-resolve-'));try {- const response = await insertJsxElementHandler({+ const response = await insertCompositionElementHandler({input: {compositionFile: 'Root.tsx',compositionId: 'target',diff --git a/packages/studio-server/src/test/split-jsx-sequence.test.ts b/packages/studio-server/src/test/split-sequences.test.tssimilarity index 92%rename from packages/studio-server/src/test/split-jsx-sequence.test.tsrename to packages/studio-server/src/test/split-sequences.test.tsindex ab4fd96f5a..14fe9feac5 100644--- a/packages/studio-server/src/test/split-jsx-sequence.test.ts+++ b/packages/studio-server/src/test/split-sequences.test.ts@@ -7,7 +7,7 @@ import {setFileWatcherRegistry,} from '../file-watcher';import {setLiveEventsListener} from '../preview-server/live-events';-import {splitJsxSequenceHandler} from '../preview-server/routes/split-jsx-sequence';+import {splitSequencesHandler} from '../preview-server/routes/split-sequences';import {getUndoStack} from '../preview-server/undo-stack';import {lineContainingToNodePath} from './test-utils';@@ -58,7 +58,7 @@ const getHandlerOptions = <T>({getDefaultEditor: () => null,});-test('splitJsxSequenceHandler writes success and failure responses', async () => {+test('splitSequencesHandler writes success and failure responses', async () => {const remotionRoot = mkdtempSync(path.join(tmpdir(), 'remotion-split-'));const cleanupFileWatcher = setFileWatcherRegistry(createFileWatcherRegistry(),@@ -79,7 +79,7 @@ test('splitJsxSequenceHandler writes success and failure responses', async () =>);writeFileSync(entryPoint, input);- const success = await splitJsxSequenceHandler(+ const success = await splitSequencesHandler(getHandlerOptions({input: {sequences: [@@ -111,7 +111,7 @@ test('splitJsxSequenceHandler writes success and failure responses', async () =>);expect(getUndoStack().length).toBe(1);- const failure = await splitJsxSequenceHandler(+ const failure = await splitSequencesHandler(getHandlerOptions({input: {sequences: [diff --git a/packages/studio-server/src/test/wrap-jsx-node.test.ts b/packages/studio-server/src/test/wrap-node.test.tssimilarity index 95%rename from packages/studio-server/src/test/wrap-jsx-node.test.tsrename to packages/studio-server/src/test/wrap-node.test.tsindex f7253c58e9..169c34fdbe 100644--- a/packages/studio-server/src/test/wrap-jsx-node.test.ts+++ b/packages/studio-server/src/test/wrap-node.test.ts@@ -7,7 +7,7 @@ import {setFileWatcherRegistry,} from '../file-watcher';import {setLiveEventsListener} from '../preview-server/live-events';-import {wrapJsxNodeHandler} from '../preview-server/routes/wrap-jsx-node';+import {wrapNodeHandler} from '../preview-server/routes/wrap-node';import {clearUndoStackForTests} from '../preview-server/undo-stack';import {lineContainingToNodePath} from './test-utils';@@ -41,7 +41,7 @@ export const Comp = () => {`;writeFileSync(entryPoint, input);- const result = await wrapJsxNodeHandler({+ const result = await wrapNodeHandler({input: {fileName: entryPoint,nodePath: lineContainingToNodePath(input, '<AbsoluteFill'),diff --git a/packages/studio-shared/src/api-requests.ts b/packages/studio-shared/src/api-requests.tsindex d603c5c792..4d92bd962a 100644--- a/packages/studio-shared/src/api-requests.ts+++ b/packages/studio-shared/src/api-requests.ts@@ -851,16 +851,16 @@ export type PasteEffectsResponse =stack: string;};-export type DeleteJsxNodesRequestItem = {+export type DeleteNodesRequestItem = {fileName: string;nodePath: SequenceNodePath;};-export type DeleteJsxNodesRequest = {- nodes: DeleteJsxNodesRequestItem[];+export type DeleteNodesRequest = {+ nodes: DeleteNodesRequestItem[];};-export type DeleteJsxNodesResponse =+export type DeleteNodesResponse =| {success: true;nodePathMutation: SequenceNodePathMutation;@@ -871,16 +871,16 @@ export type DeleteJsxNodesResponse =stack: string;};-export type DuplicateJsxNodeRequestItem = {+export type DuplicateNodesRequestItem = {fileName: string;nodePath: SequenceNodePath;};-export type DuplicateJsxNodeRequest = {- nodes: DuplicateJsxNodeRequestItem[];+export type DuplicateNodesRequest = {+ nodes: DuplicateNodesRequestItem[];};-export type DuplicateJsxNodeResponse =+export type DuplicateNodesResponse =| {success: true;nodePathMutation: SequenceNodePathMutation;@@ -891,21 +891,21 @@ export type DuplicateJsxNodeResponse =stack: string;};-export type JsxWrapper =+export type NodeWrapper =| 'AbsoluteFill'| 'Sequence'| 'HtmlInCanvas'| 'HtmlInCanvasMotionBlur';-export type WrapJsxNodeRequest = {+export type WrapNodeRequest = {fileName: string;nodePath: SequenceNodePath;- wrapper: JsxWrapper | null;+ wrapper: NodeWrapper | null;width: number | null;height: number | null;};-export type WrapJsxNodeResponse =+export type WrapNodeResponse =| {success: true;canWrap: boolean;@@ -914,18 +914,18 @@ export type WrapJsxNodeResponse =}| {success: false; reason: string; stack: string};-export type SplitJsxSequenceRequestItem = {+export type SplitSequencesRequestItem = {fileName: string;nodePath: SequenceNodePath;sequenceKeys: string[];splitFrame: number;};-export type SplitJsxSequenceRequest = {- sequences: SplitJsxSequenceRequestItem[];+export type SplitSequencesRequest = {+ sequences: SplitSequencesRequestItem[];};-export type SplitJsxSequenceResponse =+export type SplitSequencesResponse =| {success: true;nodePathMutation: SequenceNodePathMutation;@@ -1028,14 +1028,14 @@ export type InsertableCompositionElementPosition = {y: number;};-export type InsertJsxElementRequest = {+export type InsertCompositionElementRequest = {compositionFile: string;compositionId: string;element: InsertableCompositionElement;from: number | null;};-export type InsertJsxElementResponse =+export type InsertCompositionElementResponse =| {success: true;insertedNodePath: Pick<@@ -1459,18 +1459,15 @@ export type ApiRoutes = {>;'/api/delete-effect': ReqAndRes<DeleteEffectRequest, DeleteEffectResponse>;'/api/paste-effects': ReqAndRes<PasteEffectsRequest, PasteEffectsResponse>;- '/api/delete-jsx-nodes': ReqAndRes<- DeleteJsxNodesRequest,- DeleteJsxNodesResponse+ '/api/delete-nodes': ReqAndRes<DeleteNodesRequest, DeleteNodesResponse>;+ '/api/duplicate-nodes': ReqAndRes<+ DuplicateNodesRequest,+ DuplicateNodesResponse>;- '/api/duplicate-jsx-node': ReqAndRes<- DuplicateJsxNodeRequest,- DuplicateJsxNodeResponse- >;- '/api/wrap-jsx-node': ReqAndRes<WrapJsxNodeRequest, WrapJsxNodeResponse>;- '/api/split-jsx-sequence': ReqAndRes<- SplitJsxSequenceRequest,- SplitJsxSequenceResponse+ '/api/wrap-node': ReqAndRes<WrapNodeRequest, WrapNodeResponse>;+ '/api/split-sequences': ReqAndRes<+ SplitSequencesRequest,+ SplitSequencesResponse>;'/api/split-video-from-audio': ReqAndRes<SplitVideoFromAudioRequest,@@ -1484,9 +1481,9 @@ export type ApiRoutes = {ReplaceVideoSourceRequest,ReplaceVideoSourceResponse>;- '/api/insert-jsx-element': ReqAndRes<- InsertJsxElementRequest,- InsertJsxElementResponse+ '/api/insert-composition-element': ReqAndRes<+ InsertCompositionElementRequest,+ InsertCompositionElementResponse>;'/api/convert-figma-clipboard-to-svg': ReqAndRes<ConvertFigmaClipboardToSvgRequest,diff --git a/packages/studio-shared/src/browser-studio-operations.ts b/packages/studio-shared/src/browser-studio-operations.tsindex b65b921362..d6080f3585 100644--- a/packages/studio-shared/src/browser-studio-operations.ts+++ b/packages/studio-shared/src/browser-studio-operations.ts@@ -13,8 +13,8 @@ import type {BatchUpdateKeyframeSettingsResponse,CompositionComponentInfoRequest,CompositionComponentInfoResponse,- DeleteJsxNodesRequest,- DeleteJsxNodesResponse,+ DeleteNodesRequest,+ DeleteNodesResponse,DeleteKeyframesRequest,DeleteKeyframesResponse,DeleteEffectRequest,@@ -27,12 +27,12 @@ import type {FindInFileResponse,DuplicateEffectRequest,DuplicateEffectResponse,- DuplicateJsxNodeRequest,- DuplicateJsxNodeResponse,- WrapJsxNodeRequest,- WrapJsxNodeResponse,- InsertJsxElementRequest,- InsertJsxElementResponse,+ DuplicateNodesRequest,+ DuplicateNodesResponse,+ WrapNodeRequest,+ WrapNodeResponse,+ InsertCompositionElementRequest,+ InsertCompositionElementResponse,InsertElementRequest,InsertElementResponse,InstallPackageRequest,@@ -58,8 +58,8 @@ import type {SaveMultipleEffectPropsRequest,SaveMultipleEffectPropsResponse,SimpleDiff,- SplitJsxSequenceRequest,- SplitJsxSequenceResponse,+ SplitSequencesRequest,+ SplitSequencesResponse,SplitVideoFromAudioRequest,SplitVideoFromAudioResponse,InsertBasicCaptionsRequest,@@ -172,9 +172,7 @@ export type BrowserStudioOperations = {sourceOrigin: string | null;} | null;applyCodemod: (request: ApplyCodemodRequest) => Promise<ApplyCodemodResponse>;- deleteJsxNodes: (- request: DeleteJsxNodesRequest,- ) => Promise<DeleteJsxNodesResponse>;+ deleteNodes: (request: DeleteNodesRequest) => Promise<DeleteNodesResponse>;deleteStaticFile: (request: DeleteStaticFileRequest,) => Promise<DeleteStaticFileResponse>;@@ -188,10 +186,10 @@ export type BrowserStudioOperations = {duplicateComposition: (request: DuplicateCompositionRequest,) => Promise<DuplicateCompositionResponse>;- duplicateJsxNode: (- request: DuplicateJsxNodeRequest,- ) => Promise<DuplicateJsxNodeResponse>;- wrapJsxNode: (request: WrapJsxNodeRequest) => Promise<WrapJsxNodeResponse>;+ duplicateNodes: (+ request: DuplicateNodesRequest,+ ) => Promise<DuplicateNodesResponse>;+ wrapNode: (request: WrapNodeRequest) => Promise<WrapNodeResponse>;effects: BrowserStudioEffectOperations;findInFile: (request: FindInFileRequest) => Promise<FindInFileResponse>;getFileSource: (fileName: string) => Promise<string | null>;@@ -199,15 +197,12 @@ export type BrowserStudioOperations = {getCompositionComponentInfo: (request: CompositionComponentInfoRequest,) => Promise<CompositionComponentInfoResponse>;- insertSolid: (- request: InsertJsxElementRequest,- ) => Promise<InsertJsxElementResponse>;insertElement: (request: InsertElementRequest,) => Promise<InsertElementResponse>;- insertJsxElement: (- request: InsertJsxElementRequest,- ) => Promise<InsertJsxElementResponse>;+ insertCompositionElement: (+ request: InsertCompositionElementRequest,+ ) => Promise<InsertCompositionElementResponse>;keyframes: BrowserStudioKeyframeOperations;packageInstallation: BrowserStudioPackageInstallationOperations;prepareElementInstall: (@@ -223,9 +218,9 @@ export type BrowserStudioOperations = {saveSequenceProps: (request: SaveSequencePropsRequest,) => Promise<SaveSequencePropsResponse>;- splitJsxSequence: (- request: SplitJsxSequenceRequest,- ) => Promise<SplitJsxSequenceResponse>;+ splitSequences: (+ request: SplitSequencesRequest,+ ) => Promise<SplitSequencesResponse>;splitVideoFromAudio: (request: SplitVideoFromAudioRequest,) => Promise<SplitVideoFromAudioResponse>;diff --git a/packages/studio-shared/src/index.ts b/packages/studio-shared/src/index.tsindex f2495560b5..195e72597c 100644--- a/packages/studio-shared/src/index.ts+++ b/packages/studio-shared/src/index.ts@@ -37,9 +37,9 @@ export {DeleteEffectRequest,DeleteEffectRequestItem,DeleteEffectResponse,- DeleteJsxNodesRequest,- DeleteJsxNodesRequestItem,- DeleteJsxNodesResponse,+ DeleteNodesRequest,+ DeleteNodesRequestItem,+ DeleteNodesResponse,DeleteKeyframesRequest,DeleteKeyframesResponse,DeleteSequenceKeyframe,@@ -50,12 +50,12 @@ export {DuplicateEffectRequest,DuplicateEffectRequestItem,DuplicateEffectResponse,- DuplicateJsxNodeRequest,- DuplicateJsxNodeRequestItem,- DuplicateJsxNodeResponse,- JsxWrapper,- WrapJsxNodeRequest,- WrapJsxNodeResponse,+ DuplicateNodesRequest,+ DuplicateNodesRequestItem,+ DuplicateNodesResponse,+ NodeWrapper,+ WrapNodeRequest,+ WrapNodeResponse,EditorPickerId,EffectDefinition,ElementInstallDestination,@@ -82,8 +82,8 @@ export {ReplaceVideoSourceResponse,InsertElementRequest,InsertElementResponse,- InsertJsxElementRequest,- InsertJsxElementResponse,+ InsertCompositionElementRequest,+ InsertCompositionElementResponse,InsertableCompositionElement,InsertableCompositionElementPosition,InstallableElement,@@ -137,9 +137,9 @@ export {SaveSequencePropsResponse,SaveSequencePropsResult,SimpleDiff,- SplitJsxSequenceRequest,- SplitJsxSequenceRequestItem,- SplitJsxSequenceResponse,+ SplitSequencesRequest,+ SplitSequencesRequestItem,+ SplitSequencesResponse,SplitVideoFromAudioRequest,SplitVideoFromAudioResponse,SubscribeToDefaultPropsRequest,diff --git a/packages/studio/src/components/InspectorPanel/SequenceWrapAction.tsx b/packages/studio/src/components/InspectorPanel/SequenceWrapAction.tsxindex 348fbdbc88..c919562cfc 100644--- a/packages/studio/src/components/InspectorPanel/SequenceWrapAction.tsx+++ b/packages/studio/src/components/InspectorPanel/SequenceWrapAction.tsx@@ -1,4 +1,4 @@-import type {JsxWrapper} from '@remotion/studio-shared';+import type {NodeWrapper} from '@remotion/studio-shared';import React, {useCallback, useEffect, useMemo, useState} from 'react';import {isHtmlInCanvasSupported, useVideoConfig} from 'remotion';import {LIGHT_TEXT} from '../../helpers/colors';@@ -11,13 +11,13 @@ import {INSPECTOR_PANEL_HORIZONTAL_PADDING} from '../InspectorPanelLayout';import type {ComboboxValue} from '../NewComposition/ComboBox';import {showNotification} from '../Notifications/NotificationCenter';import {SegmentedButton, type SegmentedButtonSegment} from '../SegmentedButton';-import {wrapJsxNode} from '../wrap-jsx-node-api';+import {wrapNode} from '../wrap-node-api';import {largeInspectorActionIconContainerStyle,largeInspectorActionIconStyle,} from './common';-const wrapperNames: JsxWrapper[] = [+const wrapperNames: NodeWrapper[] = ['AbsoluteFill','Sequence','HtmlInCanvas',@@ -83,7 +83,7 @@ export const SequenceWrapAction: React.FC<{const nodePath = JSON.parse(nodePathKey,) as SequenceNodePathInfo['sequenceSubscriptionKey'];- wrapJsxNode({+ wrapNode({fileName: nodePath.absolutePath,nodePath: nodePath.nodePath,wrapper: null,@@ -105,7 +105,7 @@ export const SequenceWrapAction: React.FC<{}, [nodePathKey, sequence, sourceActionsDisabled]);const onWrap = useCallback(- async (wrapper: JsxWrapper) => {+ async (wrapper: NodeWrapper) => {if (busy || sourceActionsDisabled || !eligibility?.canWrap) {return;}@@ -121,7 +121,7 @@ export const SequenceWrapAction: React.FC<{]);}- const result = await wrapJsxNode({+ const result = await wrapNode({fileName: nodePath.absolutePath,nodePath: nodePath.nodePath,wrapper,diff --git a/packages/studio/src/components/InspectorPanel/use-composition-actions.ts b/packages/studio/src/components/InspectorPanel/use-composition-actions.tsindex bfcbdd2355..f632b665f1 100644--- a/packages/studio/src/components/InspectorPanel/use-composition-actions.ts+++ b/packages/studio/src/components/InspectorPanel/use-composition-actions.ts@@ -1,4 +1,4 @@-import type {InsertJsxElementRequest} from '@remotion/studio-shared';+import type {InsertCompositionElementRequest} from '@remotion/studio-shared';import {useCallback, useContext, useMemo, useState} from 'react';import {Internals, type _InternalTypes} from 'remotion';import {getBrowserStudioOperations} from '../../helpers/browser-studio-operations';@@ -95,7 +95,7 @@ export const useCompositionActions = () => {setIsAddingSolid(true);try {- const request: InsertJsxElementRequest = {+ const request: InsertCompositionElementRequest = {compositionFile,compositionId: currentCompositionId,from: null,@@ -107,8 +107,8 @@ export const useCompositionActions = () => {},};const result = browserStudioOperations- ? await browserStudioOperations.insertSolid(request)- : await callApi('/api/insert-jsx-element', request);+ ? await browserStudioOperations.insertCompositionElement(request)+ : await callApi('/api/insert-composition-element', request);if (result.success) {return;diff --git a/packages/studio/src/components/Timeline/Timeline.tsx b/packages/studio/src/components/Timeline/Timeline.tsxindex 6adc0b1eb6..008ba5fad1 100644--- a/packages/studio/src/components/Timeline/Timeline.tsx+++ b/packages/studio/src/components/Timeline/Timeline.tsx@@ -1,4 +1,4 @@-import type {InsertJsxElementRequest} from '@remotion/studio-shared';+import type {InsertCompositionElementRequest} from '@remotion/studio-shared';import React, {useCallback,useContext,@@ -157,7 +157,7 @@ const TimelineContextMenuArea: React.FC<{setIsAddingSolid(true);try {- const request: InsertJsxElementRequest = {+ const request: InsertCompositionElementRequest = {compositionFile,compositionId: currentCompositionId,from: null,@@ -169,8 +169,8 @@ const TimelineContextMenuArea: React.FC<{},};const result = browserStudioOperations- ? await browserStudioOperations.insertSolid(request)- : await callApi('/api/insert-jsx-element', request);+ ? await browserStudioOperations.insertCompositionElement(request)+ : await callApi('/api/insert-composition-element', request);if (result.success) {return;diff --git a/packages/studio/src/components/Timeline/delete-selected-timeline-item.ts b/packages/studio/src/components/Timeline/delete-selected-timeline-item.tsindex 4e7ddc5f93..58683fa1ab 100644--- a/packages/studio/src/components/Timeline/delete-selected-timeline-item.ts+++ b/packages/studio/src/components/Timeline/delete-selected-timeline-item.ts@@ -2,7 +2,7 @@ import type {OverrideIdToNodePaths, PropStatuses, TSequence} from 'remotion';import {canUseEffectOperations} from '../../helpers/browser-studio-operations';import type {SequenceNodePathInfo} from '../../helpers/get-timeline-sequence-sort-key';import type {ConfirmationDialogFunction} from '../ConfirmationDialog-types';-import {deleteJsxNodes} from '../delete-jsx-nodes-api';+import {deleteNodes} from '../delete-nodes-api';import {deleteEffects as deleteEffectsApi} from '../effect-operations-api';import {showNotification} from '../Notifications/NotificationCenter';import {deleteSelectedKeyframes} from './delete-selected-keyframe';@@ -53,7 +53,7 @@ export const deleteSequencesFromSource = async (return false;}- return deleteJsxNodes({+ return deleteNodes({nodes: nodePathInfos.map((nodePathInfo) => {const nodePath = nodePathInfo.sequenceSubscriptionKey;diff --git a/packages/studio/src/components/Timeline/duplicate-selected-timeline-item.ts b/packages/studio/src/components/Timeline/duplicate-selected-timeline-item.tsindex cd1575dbd1..f6afa9467c 100644--- a/packages/studio/src/components/Timeline/duplicate-selected-timeline-item.ts+++ b/packages/studio/src/components/Timeline/duplicate-selected-timeline-item.ts@@ -1,7 +1,7 @@import {canUseEffectOperations} from '../../helpers/browser-studio-operations';import type {SequenceNodePathInfo} from '../../helpers/get-timeline-sequence-sort-key';import type {ConfirmationDialogFunction} from '../ConfirmationDialog-types';-import {duplicateJsxNode} from '../duplicate-jsx-node-api';+import {duplicateNodes} from '../duplicate-nodes-api';import {duplicateEffects} from '../effect-operations-api';import {showNotification} from '../Notifications/NotificationCenter';import type {TimelineSelection} from './TimelineSelection';@@ -69,7 +69,7 @@ export const duplicateSequencesFromSource = async (return;}- const result = await duplicateJsxNode({nodes});+ const result = await duplicateNodes({nodes});if (!result.success) {showNotification(result.reason, 4000);}diff --git a/packages/studio/src/components/Timeline/split-selected-timeline-item.ts b/packages/studio/src/components/Timeline/split-selected-timeline-item.tsindex 6bab6c234d..f8243e90cc 100644--- a/packages/studio/src/components/Timeline/split-selected-timeline-item.ts+++ b/packages/studio/src/components/Timeline/split-selected-timeline-item.ts@@ -8,7 +8,7 @@ import type {import {Internals} from 'remotion';import type {SequenceNodePathInfo} from '../../helpers/get-timeline-sequence-sort-key';import {showNotification} from '../Notifications/NotificationCenter';-import {splitJsxSequence} from '../split-jsx-sequence-api';+import {splitSequences as splitSequencesApi} from '../split-sequences-api';import {findTrackForNodePathInfo} from './find-track-for-node-path-info';import type {TimelineSelection} from './TimelineSelection';@@ -164,7 +164,7 @@ export const splitTimelineSequencesFromSource = ({splitFrame: number;}>;}): Promise<boolean> => {- return splitJsxSequence({+ return splitSequencesApi({sequences: sequences.map(({nodePathInfo, splitFrame}) => {const nodePath = nodePathInfo.sequenceSubscriptionKey;return {diff --git a/packages/studio/src/components/delete-jsx-nodes-api.ts b/packages/studio/src/components/delete-nodes-api.tssimilarity index 51%rename from packages/studio/src/components/delete-jsx-nodes-api.tsrename to packages/studio/src/components/delete-nodes-api.tsindex f51bfcab80..3e756a6301 100644--- a/packages/studio/src/components/delete-jsx-nodes-api.ts+++ b/packages/studio/src/components/delete-nodes-api.ts@@ -1,15 +1,15 @@import type {- DeleteJsxNodesRequest,- DeleteJsxNodesResponse,+ DeleteNodesRequest,+ DeleteNodesResponse,} from '@remotion/studio-shared';import {getBrowserStudioOperations} from '../helpers/browser-studio-operations';import {callApi} from './call-api';-export const deleteJsxNodes = (- request: DeleteJsxNodesRequest,-): Promise<DeleteJsxNodesResponse> => {+export const deleteNodes = (+ request: DeleteNodesRequest,+): Promise<DeleteNodesResponse> => {const browserStudioOperations = getBrowserStudioOperations();return browserStudioOperations- ? browserStudioOperations.deleteJsxNodes(request)- : callApi('/api/delete-jsx-nodes', request);+ ? browserStudioOperations.deleteNodes(request)+ : callApi('/api/delete-nodes', request);};diff --git a/packages/studio/src/components/duplicate-jsx-node-api.ts b/packages/studio/src/components/duplicate-jsx-node-api.tsdeleted file mode 100644index 2b9c0ce6dc..0000000000--- a/packages/studio/src/components/duplicate-jsx-node-api.ts+++ /dev/null@@ -1,15 +0,0 @@-import type {- DuplicateJsxNodeRequest,- DuplicateJsxNodeResponse,-} from '@remotion/studio-shared';-import {getBrowserStudioOperations} from '../helpers/browser-studio-operations';-import {callApi} from './call-api';--export const duplicateJsxNode = (- request: DuplicateJsxNodeRequest,-): Promise<DuplicateJsxNodeResponse> => {- const browserStudioOperations = getBrowserStudioOperations();- return browserStudioOperations- ? browserStudioOperations.duplicateJsxNode(request)- : callApi('/api/duplicate-jsx-node', request);-};diff --git a/packages/studio/src/components/duplicate-nodes-api.ts b/packages/studio/src/components/duplicate-nodes-api.tsnew file mode 100644index 0000000000..3f697739ae--- /dev/null+++ b/packages/studio/src/components/duplicate-nodes-api.ts@@ -0,0 +1,15 @@+import type {+ DuplicateNodesRequest,+ DuplicateNodesResponse,+} from '@remotion/studio-shared';+import {getBrowserStudioOperations} from '../helpers/browser-studio-operations';+import {callApi} from './call-api';++export const duplicateNodes = (+ request: DuplicateNodesRequest,+): Promise<DuplicateNodesResponse> => {+ const browserStudioOperations = getBrowserStudioOperations();+ return browserStudioOperations+ ? browserStudioOperations.duplicateNodes(request)+ : callApi('/api/duplicate-nodes', request);+};diff --git a/packages/studio/src/components/import-assets.ts b/packages/studio/src/components/import-assets.tsindex 240c4a277d..c9fd2b9bf5 100644--- a/packages/studio/src/components/import-assets.ts+++ b/packages/studio/src/components/import-assets.ts@@ -694,8 +694,8 @@ const insertCompositionElement = async ({const request = {compositionFile, compositionId, element, from};const result = browserStudioOperations- ? await browserStudioOperations.insertJsxElement(request)- : await callApi('/api/insert-jsx-element', request);+ ? await browserStudioOperations.insertCompositionElement(request)+ : await callApi('/api/insert-composition-element', request);if (!result.success) {showNotification(result.reason, 4000);diff --git a/packages/studio/src/components/split-jsx-sequence-api.ts b/packages/studio/src/components/split-jsx-sequence-api.tsdeleted file mode 100644index 6c776e21cf..0000000000--- a/packages/studio/src/components/split-jsx-sequence-api.ts+++ /dev/null@@ -1,15 +0,0 @@-import type {- SplitJsxSequenceRequest,- SplitJsxSequenceResponse,-} from '@remotion/studio-shared';-import {getBrowserStudioOperations} from '../helpers/browser-studio-operations';-import {callApi} from './call-api';--export const splitJsxSequence = (- request: SplitJsxSequenceRequest,-): Promise<SplitJsxSequenceResponse> => {- const browserStudioOperations = getBrowserStudioOperations();- return browserStudioOperations- ? browserStudioOperations.splitJsxSequence(request)- : callApi('/api/split-jsx-sequence', request);-};diff --git a/packages/studio/src/components/split-sequences-api.ts b/packages/studio/src/components/split-sequences-api.tsnew file mode 100644index 0000000000..b9813369e5--- /dev/null+++ b/packages/studio/src/components/split-sequences-api.ts@@ -0,0 +1,15 @@+import type {+ SplitSequencesRequest,+ SplitSequencesResponse,+} from '@remotion/studio-shared';+import {getBrowserStudioOperations} from '../helpers/browser-studio-operations';+import {callApi} from './call-api';++export const splitSequences = (+ request: SplitSequencesRequest,+): Promise<SplitSequencesResponse> => {+ const browserStudioOperations = getBrowserStudioOperations();+ return browserStudioOperations+ ? browserStudioOperations.splitSequences(request)+ : callApi('/api/split-sequences', request);+};diff --git a/packages/studio/src/components/wrap-jsx-node-api.ts b/packages/studio/src/components/wrap-jsx-node-api.tsdeleted file mode 100644index ddeccf78b7..0000000000--- a/packages/studio/src/components/wrap-jsx-node-api.ts+++ /dev/null@@ -1,17 +0,0 @@-import type {- WrapJsxNodeRequest,- WrapJsxNodeResponse,-} from '@remotion/studio-shared';-import {getBrowserStudioOperations} from '../helpers/browser-studio-operations';-import {callApi} from './call-api';--export const wrapJsxNode = (- request: WrapJsxNodeRequest,-): Promise<WrapJsxNodeResponse> => {- const browserStudioOperations = getBrowserStudioOperations();- if (browserStudioOperations) {- return browserStudioOperations.wrapJsxNode(request);- }-- return callApi('/api/wrap-jsx-node', request);-};diff --git a/packages/studio/src/components/wrap-node-api.ts b/packages/studio/src/components/wrap-node-api.tsnew file mode 100644index 0000000000..81e3098470--- /dev/null+++ b/packages/studio/src/components/wrap-node-api.ts@@ -0,0 +1,14 @@+import type {WrapNodeRequest, WrapNodeResponse} from '@remotion/studio-shared';+import {getBrowserStudioOperations} from '../helpers/browser-studio-operations';+import {callApi} from './call-api';++export const wrapNode = (+ request: WrapNodeRequest,+): Promise<WrapNodeResponse> => {+ const browserStudioOperations = getBrowserStudioOperations();+ if (browserStudioOperations) {+ return browserStudioOperations.wrapNode(request);+ }++ return callApi('/api/wrap-node', request);+};diff --git a/packages/studio/src/test/browser-studio-duplicate-jsx-node.test.ts b/packages/studio/src/test/browser-studio-duplicate-nodes.test.tssimilarity index 81%rename from packages/studio/src/test/browser-studio-duplicate-jsx-node.test.tsrename to packages/studio/src/test/browser-studio-duplicate-nodes.test.tsindex 4771390fe8..2fd6a16ede 100644--- a/packages/studio/src/test/browser-studio-duplicate-jsx-node.test.ts+++ b/packages/studio/src/test/browser-studio-duplicate-nodes.test.ts@@ -1,6 +1,6 @@import {afterEach, expect, test} from 'bun:test';-import type {DuplicateJsxNodeRequest} from '@remotion/studio-shared';-import {duplicateJsxNode} from '../components/duplicate-jsx-node-api';+import type {DuplicateNodesRequest} from '@remotion/studio-shared';+import {duplicateNodes} from '../components/duplicate-nodes-api';import {makeBrowserStudioOperations} from './make-browser-studio-operations';const originalWindowDescriptor = Object.getOwnPropertyDescriptor(@@ -19,12 +19,12 @@ afterEach(() => {test('routes JSX duplication through Browser Studio', async () => {const nodePath = ['program', 'body', 1];- const receivedRequests: DuplicateJsxNodeRequest[] = [];+ const receivedRequests: DuplicateNodesRequest[] = [];Object.defineProperty(globalThis, 'window', {configurable: true,value: {remotion_browserStudio: makeBrowserStudioOperations({- duplicateJsxNode: (request) => {+ duplicateNodes: (request) => {receivedRequests.push(request);return Promise.resolve({success: true,@@ -39,7 +39,7 @@ test('routes JSX duplication through Browser Studio', async () => {},});- const result = await duplicateJsxNode({+ const result = await duplicateNodes({nodes: [{fileName: '/project/src/Composition.tsx',diff --git a/packages/studio/src/test/make-browser-studio-operations.ts b/packages/studio/src/test/make-browser-studio-operations.tsindex 3d31837ef3..7294b36afd 100644--- a/packages/studio/src/test/make-browser-studio-operations.ts+++ b/packages/studio/src/test/make-browser-studio-operations.ts@@ -10,13 +10,13 @@ export const makeBrowserStudioOperations = (return {applyCodemod: () => unusedOperation('applyCodemod'),consumeInitialElement: () => null,- deleteJsxNodes: () => unusedOperation('deleteJsxNodes'),+ deleteNodes: () => unusedOperation('deleteNodes'),deleteStaticFile: () => unusedOperation('deleteStaticFile'),downloadRemoteAsset: () => unusedOperation('downloadRemoteAsset'),downloadProject: () => unusedOperation('downloadProject'),duplicateComposition: () => unusedOperation('duplicateComposition'),- duplicateJsxNode: () => unusedOperation('duplicateJsxNode'),- wrapJsxNode: () => unusedOperation('wrapJsxNode'),+ duplicateNodes: () => unusedOperation('duplicateNodes'),+ wrapNode: () => unusedOperation('wrapNode'),effects: {addEffect: () => unusedOperation('effects'),deleteEffects: () => unusedOperation('effects'),@@ -32,8 +32,7 @@ export const makeBrowserStudioOperations = (getCompositionFile: () => unusedOperation('getCompositionFile'),getFileSource: () => unusedOperation('getFileSource'),insertElement: () => unusedOperation('insertElement'),- insertJsxElement: () => unusedOperation('insertJsxElement'),- insertSolid: () => unusedOperation('insertSolid'),+ insertCompositionElement: () => unusedOperation('insertCompositionElement'),keyframes: {addEffectKeyframe: () => unusedOperation('keyframes'),addKeyframes: () => unusedOperation('keyframes'),@@ -52,7 +51,7 @@ export const makeBrowserStudioOperations = (renameStaticFile: () => unusedOperation('renameStaticFile'),reorderSequence: () => unusedOperation('reorderSequence'),saveSequenceProps: () => unusedOperation('saveSequenceProps'),- splitJsxSequence: () => unusedOperation('splitJsxSequence'),+ splitSequences: () => unusedOperation('splitSequences'),splitVideoFromAudio: () => unusedOperation('splitVideoFromAudio'),insertBasicCaptions: () => unusedOperation('insertBasicCaptions'),subscribeToDefaultProps: () => unusedOperation('subscribeToDefaultProps'),