@remotion/studio-server 4.0.535 → 4.0.537

package/dist/helpers/resolve-composition-component.d.ts

@@ -12,13 +12,12 @@ export declare const resolveCompositionComponent: ({ remotionRoot, compositionFi
     compositionFile: string;
     compositionId: string;
 }) => Promise<ResolvedCompositionComponent>;
-export declare const insertJsxElementIntoComposition: ({ remotionRoot, compositionFile, compositionId, element, from, premountFor, prettierConfigOverride, wrapInSequence, sourceFileOverrides, }: {
+export declare const insertJsxElementIntoComposition: ({ remotionRoot, compositionFile, compositionId, element, from, prettierConfigOverride, wrapInSequence, sourceFileOverrides, }: {
     remotionRoot: string;
     compositionFile: string;
     compositionId: string;
     element: InsertableCompositionElement;
     from: number | null;
-    premountFor: number | null;
     prettierConfigOverride: Record<string, unknown> | null;
     wrapInSequence?: {
         dimensions: {

package/dist/helpers/resolve-composition-component.js

@@ -40,7 +40,7 @@ const resolveCompositionComponent = ({ remotionRoot, compositionFile, compositio
     environment: makeCodemodEnvironment(remotionRoot, null),
 });
 exports.resolveCompositionComponent = resolveCompositionComponent;
-const insertJsxElementIntoComposition = async ({ remotionRoot, compositionFile, compositionId, element, from, premountFor, prettierConfigOverride, wrapInSequence = null, sourceFileOverrides, }) => {
+const insertJsxElementIntoComposition = async ({ remotionRoot, compositionFile, compositionId, element, from, prettierConfigOverride, wrapInSequence = null, sourceFileOverrides, }) => {
     var _a;
     var _b, _c;
     const environment = makeCodemodEnvironment(remotionRoot, sourceFileOverrides);
@@ -61,7 +61,6 @@ const insertJsxElementIntoComposition = async ({ remotionRoot, compositionFile,
             element,
             environment,
             from,
-            premountFor,
             prettierConfigOverride,
             wrapInSequence: sequence,
         });
@@ -69,7 +68,6 @@ const insertJsxElementIntoComposition = async ({ remotionRoot, compositionFile,
     const codemodElement = createElementFromInsertable({
         element,
         from,
-        premountFor,
         wrapInSequence: sequence,
     });
     const location = await resolveCompositionComponentWithFileCodemod({

package/dist/preview-server/api-routes.js

@@ -71,6 +71,7 @@ const unsubscribe_from_default_props_1 = require("./routes/unsubscribe-from-defa
 const unsubscribe_from_file_existence_1 = require("./routes/unsubscribe-from-file-existence");
 const unsubscribe_from_sequence_props_1 = require("./routes/unsubscribe-from-sequence-props");
 const unwrap_folder_1 = require("./routes/unwrap-folder");
+const unwrap_node_1 = require("./routes/unwrap-node");
 const update_available_1 = require("./routes/update-available");
 const update_composition_metadata_1 = require("./routes/update-composition-metadata");
 const update_default_props_1 = require("./routes/update-default-props");
@@ -133,6 +134,7 @@ exports.allApiRoutes = {
     '/api/paste-effects': paste_effects_1.pasteEffectsHandler,
     '/api/delete-nodes': delete_nodes_1.deleteNodesHandler,
     '/api/duplicate-nodes': duplicate_nodes_1.duplicateNodesHandler,
+    '/api/unwrap-node': unwrap_node_1.unwrapNodeHandler,
     '/api/wrap-node': wrap_node_1.wrapNodeHandler,
     '/api/precompose-jsx-nodes': precompose_jsx_nodes_1.precomposeJsxNodesHandler,
     '/api/split-sequences': split_sequences_1.splitSequencesHandler,

package/dist/preview-server/default-props-watchers.d.ts

@@ -1,7 +1,8 @@
-import type { CanUpdateDefaultPropsResponse } from '@remotion/studio-shared';
-export declare const subscribeToDefaultPropsWatchers: ({ compositionId, clientId, remotionRoot, entryPoint, }: {
+import type { CanUpdateDefaultPropsResponse, SymbolicatedStackFrame } from '@remotion/studio-shared';
+export declare const subscribeToDefaultPropsWatchers: ({ compositionId, clientId, symbolicatedStack, remotionRoot, entryPoint, }: {
     compositionId: string;
     clientId: string;
+    symbolicatedStack: SymbolicatedStackFrame | null;
     remotionRoot: string;
     entryPoint: string;
 }) => Promise<CanUpdateDefaultPropsResponse>;

package/dist/preview-server/default-props-watchers.js

@@ -4,104 +4,75 @@ exports.unsubscribeClientDefaultPropsWatchers = exports.unsubscribeFromDefaultPr
 const file_watcher_1 = require("../file-watcher");
 const live_events_1 = require("./live-events");
 const can_update_default_props_1 = require("./routes/can-update-default-props");
-// Global file watcher — at most one for the root file
-let globalWatcher = null;
-// Per-compositionId set of subscribed clientIds
-const subscriptions = {};
-// Cached config for recomputation on file change
-let watcherConfig = null;
-const ensureGlobalWatcher = (rootFile) => {
-    if (globalWatcher) {
-        globalWatcher.refCount++;
+// Each client watches its own resolved registration file or root-file fallback.
+const watchers = {};
+const removeClient = (compositionId, clientId) => {
+    const compositionWatchers = watchers[compositionId];
+    if (!compositionWatchers) {
         return;
     }
-    const { unwatch } = (0, file_watcher_1.installFileWatcher)({
-        file: rootFile,
-        existenceOnly: false,
-        onChange: (event) => {
-            if (event.type === 'deleted') {
-                return;
-            }
-            if (!watcherConfig) {
-                return;
-            }
-            const compositionIds = Object.keys(subscriptions);
-            for (const compositionId of compositionIds) {
-                if (subscriptions[compositionId].size === 0) {
-                    continue;
+    for (const [file, watcher] of compositionWatchers) {
+        watcher.clientIds.delete(clientId);
+        if (watcher.clientIds.size === 0) {
+            watcher.unwatch();
+            compositionWatchers.delete(file);
+        }
+    }
+    if (compositionWatchers.size === 0) {
+        delete watchers[compositionId];
+    }
+};
+const subscribeToDefaultPropsWatchers = async ({ compositionId, clientId, symbolicatedStack, remotionRoot, entryPoint, }) => {
+    var _a;
+    const { result, compositionFile } = await (0, can_update_default_props_1.computeCanUpdateDefaultProps)({
+        compositionId,
+        symbolicatedStack,
+        remotionRoot,
+        entryPoint,
+    });
+    // Remove from any previous subscription for this client+composition
+    removeClient(compositionId, clientId);
+    if (!compositionFile) {
+        return result;
+    }
+    (_a = watchers[compositionId]) !== null && _a !== void 0 ? _a : (watchers[compositionId] = new Map());
+    const compositionWatchers = watchers[compositionId];
+    if (!compositionWatchers.has(compositionFile)) {
+        const clientIds = new Set();
+        const { unwatch } = (0, file_watcher_1.installFileWatcher)({
+            file: compositionFile,
+            existenceOnly: false,
+            onChange: (event) => {
+                if (event.type === 'deleted') {
+                    return;
                 }
-                const clientIds = [...subscriptions[compositionId]];
                 const newResult = (0, can_update_default_props_1.computeCanUpdateDefaultPropsFromContent)(event.content, compositionId);
+                const subscribedClientIds = [...clientIds];
                 (0, live_events_1.waitForLiveEventsListener)().then((listener) => {
                     const updateEvent = {
                         type: 'default-props-updatable-changed',
                         compositionId,
                         result: newResult,
                     };
-                    for (const cId of clientIds) {
+                    for (const cId of subscribedClientIds) {
                         listener.sendEventToClientId(cId, updateEvent);
                     }
                 });
-            }
-        },
-    });
-    globalWatcher = { unwatch, rootFile, refCount: 1 };
-};
-const releaseGlobalWatcher = () => {
-    if (!globalWatcher) {
-        return;
-    }
-    globalWatcher.refCount--;
-    if (globalWatcher.refCount <= 0) {
-        globalWatcher.unwatch();
-        globalWatcher = null;
-        watcherConfig = null;
-    }
-};
-const subscribeToDefaultPropsWatchers = async ({ compositionId, clientId, remotionRoot, entryPoint, }) => {
-    var _a;
-    const { result, rootFile } = await (0, can_update_default_props_1.computeCanUpdateDefaultProps)({
-        compositionId,
-        remotionRoot,
-        entryPoint,
-    });
-    // Remove from any previous subscription for this client+composition
-    if ((_a = subscriptions[compositionId]) === null || _a === void 0 ? void 0 : _a.has(clientId)) {
-        subscriptions[compositionId].delete(clientId);
-        releaseGlobalWatcher();
-    }
-    if (rootFile) {
-        watcherConfig = { remotionRoot, entryPoint };
-        if (!subscriptions[compositionId]) {
-            subscriptions[compositionId] = new Set();
-        }
-        subscriptions[compositionId].add(clientId);
-        ensureGlobalWatcher(rootFile);
+            },
+        });
+        compositionWatchers.set(compositionFile, { unwatch, clientIds });
     }
+    compositionWatchers.get(compositionFile).clientIds.add(clientId);
     return result;
 };
 exports.subscribeToDefaultPropsWatchers = subscribeToDefaultPropsWatchers;
 const unsubscribeFromDefaultPropsWatchers = ({ compositionId, clientId, }) => {
-    var _a;
-    if (!((_a = subscriptions[compositionId]) === null || _a === void 0 ? void 0 : _a.has(clientId))) {
-        return;
-    }
-    subscriptions[compositionId].delete(clientId);
-    if (subscriptions[compositionId].size === 0) {
-        delete subscriptions[compositionId];
-    }
-    releaseGlobalWatcher();
+    removeClient(compositionId, clientId);
 };
 exports.unsubscribeFromDefaultPropsWatchers = unsubscribeFromDefaultPropsWatchers;
 const unsubscribeClientDefaultPropsWatchers = (clientId) => {
-    for (const compositionId of Object.keys(subscriptions)) {
-        if (subscriptions[compositionId].has(clientId)) {
-            subscriptions[compositionId].delete(clientId);
-            if (subscriptions[compositionId].size === 0) {
-                delete subscriptions[compositionId];
-            }
-            releaseGlobalWatcher();
-        }
+    for (const compositionId of Object.keys(watchers)) {
+        removeClient(compositionId, clientId);
     }
 };
 exports.unsubscribeClientDefaultPropsWatchers = unsubscribeClientDefaultPropsWatchers;

package/dist/preview-server/routes/can-update-default-props.d.ts

@@ -1,11 +1,17 @@
-import type { CanUpdateDefaultPropsResponse } from '@remotion/studio-shared';
+import type { CanUpdateDefaultPropsResponse, SymbolicatedStackFrame } from '@remotion/studio-shared';
 export declare const computeCanUpdateDefaultPropsFromContent: (content: string, compositionId: string) => CanUpdateDefaultPropsResponse;
 export declare const checkIfTypeScriptFile: (file: string) => void;
-export declare const computeCanUpdateDefaultProps: ({ compositionId, remotionRoot, entryPoint, }: {
+export declare const getDefaultPropsFile: ({ symbolicatedStack, remotionRoot, entryPoint, }: {
+    symbolicatedStack: SymbolicatedStackFrame | null;
+    remotionRoot: string;
+    entryPoint: string;
+}) => Promise<string>;
+export declare const computeCanUpdateDefaultProps: ({ compositionId, symbolicatedStack, remotionRoot, entryPoint, }: {
     compositionId: string;
+    symbolicatedStack: SymbolicatedStackFrame | null;
     remotionRoot: string;
     entryPoint: string;
 }) => Promise<{
     result: CanUpdateDefaultPropsResponse;
-    rootFile: string | null;
+    compositionFile: string | null;
 }>;

package/dist/preview-server/routes/can-update-default-props.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.computeCanUpdateDefaultProps = exports.checkIfTypeScriptFile = exports.computeCanUpdateDefaultPropsFromContent = void 0;
+exports.computeCanUpdateDefaultProps = exports.getDefaultPropsFile = exports.checkIfTypeScriptFile = exports.computeCanUpdateDefaultPropsFromContent = void 0;
 const node_fs_1 = require("node:fs");
 const codemods_1 = require("@remotion/codemods");
+const resolve_file_inside_project_1 = require("../../helpers/resolve-file-inside-project");
 const project_info_1 = require("../project-info");
 ({ computeCanUpdateDefaultPropsFromContent: exports.computeCanUpdateDefaultPropsFromContent } = codemods_1.CodemodsInternals);
 const checkIfTypeScriptFile = (file) => {
@@ -14,18 +15,50 @@ const checkIfTypeScriptFile = (file) => {
     }
 };
 exports.checkIfTypeScriptFile = checkIfTypeScriptFile;
-const computeCanUpdateDefaultProps = async ({ compositionId, remotionRoot, entryPoint, }) => {
+// Compositions can be registered in files imported by the root file. The
+// client sends the location of the registration, otherwise use the root file.
+const getDefaultPropsFile = async ({ symbolicatedStack, remotionRoot, entryPoint, }) => {
+    if (symbolicatedStack === null || symbolicatedStack === void 0 ? void 0 : symbolicatedStack.originalFileName) {
+        return (0, resolve_file_inside_project_1.resolveFileInsideProject)({
+            remotionRoot,
+            fileName: symbolicatedStack.originalFileName,
+            action: 'update default props in',
+        }).absolutePath;
+    }
+    const { rootFile } = await (0, project_info_1.getProjectInfo)(remotionRoot, entryPoint);
+    if (!rootFile) {
+        throw new Error('Cannot find root file in project');
+    }
+    return rootFile;
+};
+exports.getDefaultPropsFile = getDefaultPropsFile;
+const computeCanUpdateDefaultProps = async ({ compositionId, symbolicatedStack, remotionRoot, entryPoint, }) => {
     try {
-        const projectInfo = await (0, project_info_1.getProjectInfo)(remotionRoot, entryPoint);
-        if (!projectInfo.rootFile) {
-            throw new Error('Cannot find root file in project');
-        }
-        (0, exports.checkIfTypeScriptFile)(projectInfo.rootFile);
-        const input = (0, node_fs_1.readFileSync)(projectInfo.rootFile, 'utf-8');
+        const compositionFile = await (0, exports.getDefaultPropsFile)({
+            symbolicatedStack,
+            remotionRoot,
+            entryPoint,
+        });
+        (0, exports.checkIfTypeScriptFile)(compositionFile);
+        const input = (0, node_fs_1.readFileSync)(compositionFile, 'utf-8');
         const result = (0, exports.computeCanUpdateDefaultPropsFromContent)(input, compositionId);
+        if (!result.canUpdate &&
+            !(symbolicatedStack === null || symbolicatedStack === void 0 ? void 0 : symbolicatedStack.originalFileName) &&
+            codemods_1.CodemodsInternals.getCompositionFile({
+                compositionId,
+                project: { files: { [compositionFile]: input }, rootDir: remotionRoot },
+            }) === null) {
+            return {
+                result: {
+                    canUpdate: false,
+                    reason: `Could not determine which file registers this composition, checked the root file: ${result.reason}`,
+                },
+                compositionFile,
+            };
+        }
         return {
             result,
-            rootFile: projectInfo.rootFile,
+            compositionFile,
         };
     }
     catch (err) {
@@ -34,7 +67,7 @@ const computeCanUpdateDefaultProps = async ({ compositionId, remotionRoot, entry
                 canUpdate: false,
                 reason: err.message,
             },
-            rootFile: null,
+            compositionFile: null,
         };
     }
 };

package/dist/preview-server/routes/insert-basic-captions.js

@@ -11,7 +11,7 @@ const sequence_node_path_mutation_1 = require("../sequence-node-path-mutation");
 const undo_stack_1 = require("../undo-stack");
 const source_file_write_queue_1 = require("./source-file-write-queue");
 const { basicCaptionsElementSource, getBasicCaptionsElementFile, insertBasicCaptions, } = codemods_1.CodemodsInternals;
-const insertBasicCaptionsHandler = ({ input: { fileName, nodePath, captions, durationInFrames, premountFor }, remotionRoot, logLevel, }) => (0, source_file_write_queue_1.withSourceFileWriteQueue)(() => {
+const insertBasicCaptionsHandler = ({ input: { fileName, nodePath, captions, durationInFrames }, remotionRoot, logLevel, }) => (0, source_file_write_queue_1.withSourceFileWriteQueue)(() => {
     var _a;
     try {
         const { absolutePath } = (0, resolve_file_inside_project_1.resolveFileInsideProject)({
@@ -50,7 +50,6 @@ const insertBasicCaptionsHandler = ({ input: { fileName, nodePath, captions, dur
             nodePath,
             captions,
             durationInFrames,
-            premountFor,
             importPath: elementFile.importPath,
         });
         const nodePathMutation = (0, sequence_node_path_mutation_1.broadcastSequenceNodePathMutation)([{ absolutePath, remappings: nodePathRemappings }], null);

package/dist/preview-server/routes/insert-composition-element.js

@@ -54,6 +54,16 @@ const validateElement = (element, remotionRoot) => {
         validateDimension('height', element.height);
         return;
     }
+    if (element.type === 'text') {
+        if (typeof element.text !== 'string' || element.text.trim() === '') {
+            throw new Error('Text must be a non-empty string');
+        }
+        validateDimension('fontSize', element.fontSize);
+        if (typeof element.color !== 'string' || element.color.trim() === '') {
+            throw new Error('Text color must be a non-empty string');
+        }
+        return;
+    }
     if (element.type === 'svg') {
         if (typeof element.markup !== 'string' || element.markup.trim() === '') {
             throw new Error('SVG markup must be a non-empty string');
@@ -118,6 +128,9 @@ const validateElement = (element, remotionRoot) => {
     throw new Error('Unsupported element type');
 };
 const getElementLabel = (element) => {
+    if (element.type === 'text') {
+        return '<Interactive.Div>';
+    }
     if (element.type === 'solid') {
         return '<Solid>';
     }
@@ -149,17 +162,13 @@ const getElementLabel = (element) => {
     }
     throw new Error('Unsupported element type');
 };
-const insertCompositionElementHandler = ({ input: { compositionFile, compositionId, element, from, premountFor }, remotionRoot, logLevel, }) => (0, source_file_write_queue_1.withSourceFileWriteQueue)(async () => {
+const insertCompositionElementHandler = ({ input: { compositionFile, compositionId, element, from }, remotionRoot, logLevel, }) => (0, source_file_write_queue_1.withSourceFileWriteQueue)(async () => {
     try {
         validateElement(element, remotionRoot);
         if (from !== null &&
             (!Number.isInteger(from) || !Number.isFinite(from) || from < 0)) {
             throw new Error('from must be a non-negative integer');
         }
-        if (premountFor !== null &&
-            (!Number.isInteger(premountFor) || premountFor < 0)) {
-            throw new Error('premountFor must be a non-negative integer');
-        }
         const elementLabel = getElementLabel(element);
         renderer_1.RenderInternals.Log.trace({ indent: false, logLevel }, `[insert-composition-element] Received request for compositionFile="${compositionFile}" compositionId="${compositionId}" element="${element.type}"`);
         const { fileName, source, oldContents, output, insertedNodePath, logLine, nodePathRemappings, } = await (0, resolve_composition_component_1.insertJsxElementIntoComposition)({
@@ -168,7 +177,6 @@ const insertCompositionElementHandler = ({ input: { compositionFile, composition
             compositionId,
             element,
             from,
-            premountFor,
             prettierConfigOverride: null,
             sourceFileOverrides: null,
         });

package/dist/preview-server/routes/insert-element.js

@@ -34,7 +34,7 @@ const hasExpectedFileState = ({ expected, actual, }) => {
     }
     return actual.sourceHash === expected.sourceHash;
 };
-const insertElementHandler = async ({ input: { compositionFile, compositionId, captionTarget, element, installationName, expectedFileState, from, premountFor, position, overwriteExisting, undoRedoNavigation, newComposition, }, entryPoint, remotionRoot, logLevel, publicDir, }) => {
+const insertElementHandler = async ({ input: { compositionFile, compositionId, captionTarget, element, installationName, expectedFileState, from, position, overwriteExisting, undoRedoNavigation, newComposition, }, entryPoint, remotionRoot, logLevel, publicDir, }) => {
     var _a;
     let resolvedAssets;
     try {
@@ -237,7 +237,6 @@ const insertElementHandler = async ({ input: { compositionFile, compositionId, c
                     position: componentOwnsSequence ? position : null,
                 },
                 from: componentOwnsSequence ? from : null,
-                premountFor,
                 prettierConfigOverride: null,
                 wrapInSequence: componentOwnsSequence
                     ? null

package/dist/preview-server/routes/subscribe-to-default-props.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.subscribeToDefaultProps = void 0;
 const default_props_watchers_1 = require("../default-props-watchers");
-const subscribeToDefaultProps = ({ input: { compositionId, clientId }, remotionRoot, entryPoint }) => {
+const subscribeToDefaultProps = ({ input: { compositionId, clientId, symbolicatedStack }, remotionRoot, entryPoint, }) => {
     return (0, default_props_watchers_1.subscribeToDefaultPropsWatchers)({
         compositionId,
         clientId,
+        symbolicatedStack,
         remotionRoot,
         entryPoint,
     });

package/dist/preview-server/routes/unsubscribe-from-sequence-props.d.ts

@@ -1,3 +1,3 @@
-import type { UnsubscribeFromSequencePropsRequest } from '@remotion/studio-shared';
+import type { UnsubscribeFromSequencePropsBatchRequest } from '@remotion/studio-shared';
 import type { ApiHandler } from '../api-types';
-export declare const unsubscribeFromSequenceProps: ApiHandler<UnsubscribeFromSequencePropsRequest, undefined>;
+export declare const unsubscribeFromSequenceProps: ApiHandler<UnsubscribeFromSequencePropsBatchRequest, undefined>;

package/dist/preview-server/routes/unsubscribe-from-sequence-props.js

@@ -2,16 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unsubscribeFromSequenceProps = void 0;
 const sequence_props_watchers_1 = require("../sequence-props-watchers");
-const unsubscribeFromSequenceProps = ({ input: { fileName, nodePath, clientId, sequenceKeys, assetKeys = [], effectKeys, }, remotionRoot, }) => {
-    (0, sequence_props_watchers_1.unsubscribeFromSequencePropsWatchers)({
-        fileName,
-        nodePath: nodePath.nodePath,
-        remotionRoot,
-        clientId,
-        sequenceKeys,
-        assetKeys,
-        effectKeys,
-    });
+const unsubscribeFromSequenceProps = ({ input, remotionRoot }) => {
+    for (const { fileName, nodePath, clientId, sequenceKeys, assetKeys = [], effectKeys, } of input.requests) {
+        (0, sequence_props_watchers_1.unsubscribeFromSequencePropsWatchers)({
+            fileName,
+            nodePath: nodePath.nodePath,
+            remotionRoot,
+            clientId,
+            sequenceKeys,
+            assetKeys,
+            effectKeys,
+        });
+    }
     return Promise.resolve(undefined);
 };
 exports.unsubscribeFromSequenceProps = unsubscribeFromSequenceProps;

package/dist/preview-server/routes/unwrap-node.d.ts

@@ -0,0 +1,3 @@
+import type { UnwrapNodeRequest, UnwrapNodeResponse } from '@remotion/studio-shared';
+import type { ApiHandler } from '../api-types';
+export declare const unwrapNodeHandler: ApiHandler<UnwrapNodeRequest, UnwrapNodeResponse>;

package/dist/preview-server/routes/{wrap-jsx-node.js → unwrap-node.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.wrapJsxNodeHandler = void 0;
+exports.unwrapNodeHandler = void 0;
 const node_fs_1 = require("node:fs");
 const codemods_1 = require("@remotion/codemods");
 const renderer_1 = require("@remotion/renderer");
@@ -10,7 +10,7 @@ const format_log_file_location_1 = require("../format-log-file-location");
 const sequence_node_path_mutation_1 = require("../sequence-node-path-mutation");
 const undo_stack_1 = require("../undo-stack");
 const source_file_write_queue_1 = require("./source-file-write-queue");
-const wrapJsxNodeHandler = ({ input: { fileName, nodePath, wrapper, width, height }, remotionRoot, logLevel, }) => {
+const unwrapNodeHandler = ({ input: { fileName, compositionId, nodePath, dryRun }, remotionRoot, logLevel, }) => {
     return (0, source_file_write_queue_1.withSourceFileWriteQueue)(() => {
         var _a;
         try {
@@ -20,33 +20,34 @@ const wrapJsxNodeHandler = ({ input: { fileName, nodePath, wrapper, width, heigh
                 action: 'modify',
             });
             const fileContents = (0, node_fs_1.readFileSync)(absolutePath, 'utf-8');
-            const eligibility = (0, codemods_1.canWrapJsxNode)({ input: fileContents, nodePath });
-            if (wrapper === null) {
+            const canUnwrap = (0, codemods_1.canUnwrapNode)({ input: fileContents, nodePath });
+            if (dryRun) {
                 return Promise.resolve({
                     success: true,
-                    ...eligibility,
+                    canUnwrap,
                     nodePathMutation: null,
                 });
             }
-            if (!eligibility.canWrap ||
-                (wrapper === 'HtmlInCanvas' && !eligibility.canWrapHtmlInCanvas)) {
-                throw new Error('This JSX element cannot be wrapped');
-            }
-            const result = (0, codemods_1.wrapJsxNode)({
+            const result = (0, codemods_1.unwrapNode)({
                 project: { files: { [absolutePath]: fileContents }, rootDir: remotionRoot },
                 node: { filePath: absolutePath, nodePath },
-                wrapper,
-                width: width !== null && width !== void 0 ? width : 0,
-                height: height !== null && height !== void 0 ? height : 0,
             });
             const change = result.changes.find(({ filePath }) => filePath === absolutePath);
             if ((change === null || change === void 0 ? void 0 : change.previousContents) !== fileContents ||
                 change.nextContents === null) {
-                throw new Error('Could not wrap JSX node');
+                throw new Error('Could not unwrap JSX node');
             }
             const output = change.nextContents;
-            const remappings = result.nodePathRemappings.map(({ oldNodePath, newNodePath }) => ({ oldNodePath, newNodePath }));
-            const nodePathMutation = (0, sequence_node_path_mutation_1.broadcastSequenceNodePathMutation)([{ absolutePath, remappings }], null);
+            const remappings = result.nodePathRemappings.map(({ oldNodePath, newNodePath, oldJsxName, newJsxName }) => ({
+                oldNodePath,
+                newNodePath,
+                oldJsxName,
+                newJsxName,
+            }));
+            const { childNodePath } = result;
+            const nodePathMutation = (0, sequence_node_path_mutation_1.broadcastSequenceNodePathMutation)([{ absolutePath, remappings }], childNodePath !== null
+                ? { compositionId, absolutePath, nodePath: childNodePath }
+                : null);
             const line = result.logLine;
             (0, undo_stack_1.pushTransactionToUndoStack)({
                 snapshots: [
@@ -61,10 +62,10 @@ const wrapJsxNodeHandler = ({ input: { fileName, nodePath, wrapper, width, heigh
                 logLevel,
                 remotionRoot,
                 description: {
-                    undoMessage: `↩️  Wrapping in ${wrapper}`,
-                    redoMessage: `↪️  Wrapping in ${wrapper}`,
+                    undoMessage: '↩️  Unwrapping JSX',
+                    redoMessage: '↪️  Unwrapping JSX',
                 },
-                entryType: 'wrap-jsx-node',
+                entryType: 'unwrap-node',
                 suppressHmrOnFileRestore: false,
                 undoRedoNavigation: null,
             });
@@ -80,10 +81,10 @@ const wrapJsxNodeHandler = ({ input: { fileName, nodePath, wrapper, width, heigh
                 absolutePath,
                 line,
             });
-            renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, `${(0, source_file_write_queue_1.getCodemodTimingPrefix)(logLevel)}${renderer_1.RenderInternals.chalk.blueBright(locationLabel)} Wrapped JSX in <${wrapper}>`);
-            renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel }, `[wrap-jsx-node] Wrote ${fileRelativeToRoot}`);
+            renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, `${(0, source_file_write_queue_1.getCodemodTimingPrefix)(logLevel)}${renderer_1.RenderInternals.chalk.blueBright(locationLabel)} Unwrapped JSX`);
+            renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel }, `[unwrap-node] Wrote ${fileRelativeToRoot}`);
             (0, undo_stack_1.printUndoHint)(logLevel);
-            return Promise.resolve({ success: true, ...eligibility, nodePathMutation });
+            return Promise.resolve({ success: true, canUnwrap, nodePathMutation });
         }
         catch (err) {
             return Promise.resolve({
@@ -94,4 +95,4 @@ const wrapJsxNodeHandler = ({ input: { fileName, nodePath, wrapper, width, heigh
         }
     });
 };
-exports.wrapJsxNodeHandler = wrapJsxNodeHandler;
+exports.unwrapNodeHandler = unwrapNodeHandler;

package/dist/preview-server/routes/update-default-props.js

@@ -6,29 +6,29 @@ const codemods_1 = require("@remotion/codemods");
 const renderer_1 = require("@remotion/renderer");
 const file_watcher_1 = require("../../file-watcher");
 const format_log_file_location_1 = require("../format-log-file-location");
-const project_info_1 = require("../project-info");
 const undo_stack_1 = require("../undo-stack");
 const watch_ignore_next_change_1 = require("../watch-ignore-next-change");
 const can_update_default_props_1 = require("./can-update-default-props");
 const source_file_write_queue_1 = require("./source-file-write-queue");
-const updateDefaultPropsHandler = ({ input: { compositionId, defaultProps, enumPaths }, remotionRoot, entryPoint, logLevel, }) => {
+const updateDefaultPropsHandler = ({ input: { compositionId, defaultProps, enumPaths, symbolicatedStack }, remotionRoot, entryPoint, logLevel, }) => {
     return (0, source_file_write_queue_1.withSourceFileWriteQueue)(async () => {
         var _a;
         var _b;
         try {
             renderer_1.RenderInternals.Log.trace({ indent: false, logLevel }, `[update-default-props] Received request for compositionId="${compositionId}"`);
-            const projectInfo = await (0, project_info_1.getProjectInfo)(remotionRoot, entryPoint);
-            if (!projectInfo.rootFile) {
-                throw new Error('Cannot find root file in project');
-            }
-            (0, can_update_default_props_1.checkIfTypeScriptFile)(projectInfo.rootFile);
-            const fileContents = (0, node_fs_1.readFileSync)(projectInfo.rootFile, 'utf-8');
+            const compositionFile = await (0, can_update_default_props_1.getDefaultPropsFile)({
+                symbolicatedStack,
+                remotionRoot,
+                entryPoint,
+            });
+            (0, can_update_default_props_1.checkIfTypeScriptFile)(compositionFile);
+            const fileContents = (0, node_fs_1.readFileSync)(compositionFile, 'utf-8');
             const result = (0, codemods_1.setCompositionDefaultProps)({
                 project: {
-                    files: { [projectInfo.rootFile]: fileContents },
+                    files: { [compositionFile]: fileContents },
                     rootDir: remotionRoot,
                 },
-                compositionFile: projectInfo.rootFile,
+                compositionFile,
                 compositionId,
                 defaultProps: JSON.parse(defaultProps),
                 enumPaths,
@@ -36,7 +36,7 @@ const updateDefaultPropsHandler = ({ input: { compositionId, defaultProps, enumP
             const { logLine } = result;
             const output = (_b = (_a = result.changes[0]) === null || _a === void 0 ? void 0 : _a.nextContents) !== null && _b !== void 0 ? _b : fileContents;
             (0, undo_stack_1.pushToUndoStack)({
-                filePath: projectInfo.rootFile,
+                filePath: compositionFile,
                 oldContents: fileContents,
                 newContents: null,
                 logLevel,
@@ -50,17 +50,17 @@ const updateDefaultPropsHandler = ({ input: { compositionId, defaultProps, enumP
                 suppressHmrOnFileRestore: true,
                 nodePathRemappings: null,
             });
-            (0, undo_stack_1.suppressUndoStackInvalidation)(projectInfo.rootFile);
-            (0, watch_ignore_next_change_1.suppressBundlerUpdateForFile)(projectInfo.rootFile);
+            (0, undo_stack_1.suppressUndoStackInvalidation)(compositionFile);
+            (0, watch_ignore_next_change_1.suppressBundlerUpdateForFile)(compositionFile);
             (0, file_watcher_1.writeFileAndNotifyFileWatchers)({
-                file: projectInfo.rootFile,
+                file: compositionFile,
                 content: output,
                 originatorClientId: undefined,
                 metadata: null,
             });
             const locationLabel = (0, format_log_file_location_1.formatLogFileLocation)({
                 remotionRoot,
-                absolutePath: projectInfo.rootFile,
+                absolutePath: compositionFile,
                 line: logLine,
             });
             renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, `${(0, source_file_write_queue_1.getCodemodTimingPrefix)(logLevel)}${renderer_1.RenderInternals.chalk.blueBright(`${locationLabel}`)} Updated default props for "${compositionId}"`);