@remotion/studio-server 4.0.501 → 4.0.503

package/dist/preview-server/routes/element-install-plan.js

@@ -0,0 +1,122 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getElementInstallPlan = exports.makeRelativeElementImportPath = exports.validateElementForInstallation = exports.validateElementInstallPosition = exports.getElementSourceHash = exports.normalizeElementSourceForComparison = void 0;
+const node_crypto_1 = require("node:crypto");
+const node_fs_1 = require("node:fs");
+const node_path_1 = __importDefault(require("node:path"));
+const studio_protocol_1 = require("@remotion/studio-protocol");
+const resolve_composition_component_1 = require("../../helpers/resolve-composition-component");
+const safe_element_install_path_1 = require("./safe-element-install-path");
+const normalizeElementSourceForComparison = (source) => {
+    return source.replace(/\r\n/g, '\n').trim();
+};
+exports.normalizeElementSourceForComparison = normalizeElementSourceForComparison;
+const getElementSourceHash = (source) => {
+    return (0, node_crypto_1.createHash)('sha256').update(source).digest('hex');
+};
+exports.getElementSourceHash = getElementSourceHash;
+const validateElementInstallPosition = (position) => {
+    if (position === null) {
+        return;
+    }
+    if (!Number.isFinite(position.x) || !Number.isFinite(position.y)) {
+        throw new Error('Position must be finite');
+    }
+};
+exports.validateElementInstallPosition = validateElementInstallPosition;
+const validateDimensions = (dimensions) => {
+    if (dimensions === null) {
+        return;
+    }
+    if (!Number.isFinite(dimensions.width) ||
+        !Number.isFinite(dimensions.height) ||
+        dimensions.width <= 0 ||
+        dimensions.height <= 0) {
+        throw new Error('Element dimensions must be positive finite numbers');
+    }
+};
+const validateElementForInstallation = (element) => {
+    if (studio_protocol_1.StudioProtocolInternals.makeElementFileNameFromSlug(element.slug) === null) {
+        throw new Error('Element slug must produce a safe lowercase .tsx file name');
+    }
+    if (typeof element.sourceCode !== 'string' ||
+        element.sourceCode.trim().length === 0 ||
+        element.sourceCode.length > 200000) {
+        throw new Error('Unsupported Element source code');
+    }
+    if (studio_protocol_1.StudioProtocolInternals.getElementComponentNameFromSourceCode(element.sourceCode) === null) {
+        throw new Error('Element source must export exactly one named component');
+    }
+    validateDimensions(element.dimensions);
+};
+exports.validateElementForInstallation = validateElementForInstallation;
+const makeRelativeElementImportPath = ({ fromFile, toFile, }) => {
+    const withoutExtension = toFile.replace(/\.tsx$/, '');
+    let relative = node_path_1.default
+        .relative(node_path_1.default.dirname(fromFile), withoutExtension)
+        .split(node_path_1.default.sep)
+        .join('/');
+    if (!relative.startsWith('.')) {
+        relative = `./${relative}`;
+    }
+    return relative;
+};
+exports.makeRelativeElementImportPath = makeRelativeElementImportPath;
+const getExpectedFileState = (existingSource) => {
+    if (existingSource === null) {
+        return { exists: false };
+    }
+    return {
+        exists: true,
+        sourceHash: (0, exports.getElementSourceHash)(existingSource),
+    };
+};
+const getElementInstallPlan = async ({ compositionFile, compositionId, element, remotionRoot, }) => {
+    (0, exports.validateElementForInstallation)(element);
+    const componentName = studio_protocol_1.StudioProtocolInternals.getElementComponentNameFromSourceCode(element.sourceCode);
+    if (componentName === null) {
+        throw new Error('Element source must export exactly one named component');
+    }
+    const location = await (0, resolve_composition_component_1.resolveCompositionComponentWithFile)({
+        remotionRoot,
+        compositionFile,
+        compositionId,
+    });
+    if (!location.canAddSequence) {
+        throw new Error('Cannot insert Element into this composition component');
+    }
+    const derivedElementFileName = studio_protocol_1.StudioProtocolInternals.makeElementFileNameFromSlug(element.slug);
+    if (derivedElementFileName === null) {
+        throw new Error('Element slug must produce a safe lowercase .tsx file name');
+    }
+    const safePaths = await (0, safe_element_install_path_1.getSafeElementInstallPaths)({
+        compositionFileName: location.fileName,
+        elementFileName: node_path_1.default.resolve(node_path_1.default.dirname(location.fileName), derivedElementFileName),
+        remotionRoot,
+    });
+    const elementFileExists = (0, node_fs_1.existsSync)(safePaths.elementFileName);
+    const existingElementSource = elementFileExists
+        ? (0, node_fs_1.readFileSync)(safePaths.elementFileName, 'utf-8')
+        : null;
+    return {
+        componentName,
+        elementFileExists,
+        elementFileName: safePaths.elementFileName,
+        existingElementSource,
+        expectedFileState: getExpectedFileState(existingElementSource),
+        filePath: node_path_1.default
+            .relative(safePaths.remotionRoot, safePaths.elementFileName)
+            .split(node_path_1.default.sep)
+            .join('/'),
+        importPath: (0, exports.makeRelativeElementImportPath)({
+            fromFile: safePaths.compositionFileName,
+            toFile: safePaths.elementFileName,
+        }),
+        location,
+        safePaths,
+    };
+};
+exports.getElementInstallPlan = getElementInstallPlan;

package/dist/preview-server/routes/insert-element.d.ts

@@ -1,3 +1,3 @@
-import { type InsertElementRequest, type InsertElementResponse } from '@remotion/studio-shared';
+import type { InsertElementRequest, InsertElementResponse } from '@remotion/studio-shared';
 import type { ApiHandler } from '../api-types';
 export declare const insertElementHandler: ApiHandler<InsertElementRequest, InsertElementResponse>;

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

@@ -1,138 +1,85 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.insertElementHandler = void 0;
-const node_fs_1 = require("node:fs");
-const node_path_1 = __importDefault(require("node:path"));
-const drag_and_drop_1 = require("@remotion/drag-and-drop");
 const renderer_1 = require("@remotion/renderer");
 const file_watcher_1 = require("../../file-watcher");
 const resolve_composition_component_1 = require("../../helpers/resolve-composition-component");
 const format_log_file_location_1 = require("../format-log-file-location");
 const undo_stack_1 = require("../undo-stack");
+const element_install_plan_1 = require("./element-install-plan");
 const log_update_1 = require("./log-updates/log-update");
 const source_file_write_queue_1 = require("./source-file-write-queue");
-const validatePosition = (position) => {
-    if (position === null) {
-        return;
+const hasExpectedFileState = ({ expected, actual, }) => {
+    if (expected.exists !== actual.exists) {
+        return false;
     }
-    if (!Number.isFinite(position.x) || !Number.isFinite(position.y)) {
-        throw new Error('Position must be finite');
+    if (!expected.exists) {
+        return true;
     }
-};
-const isInside = ({ child, parent }) => {
-    const relative = node_path_1.default.relative(parent, child);
-    return (relative === '' ||
-        (!relative.startsWith('..') && !node_path_1.default.isAbsolute(relative)));
-};
-const withoutTsxExtension = (fileName) => {
-    return fileName.replace(/\.tsx$/, '');
-};
-const normalizeSourceForComparison = (source) => {
-    return source.replace(/\r\n/g, '\n').trim();
-};
-const makeRelativeImportPath = ({ fromFile, toFile, }) => {
-    const withoutExtension = withoutTsxExtension(toFile);
-    let relative = node_path_1.default
-        .relative(node_path_1.default.dirname(fromFile), withoutExtension)
-        .split(node_path_1.default.sep)
-        .join('/');
-    if (!relative.startsWith('.')) {
-        relative = `./${relative}`;
+    if (!actual.exists) {
+        return false;
     }
-    return relative;
+    return actual.sourceHash === expected.sourceHash;
 };
-const validateDimensions = (dimensions) => {
-    if (dimensions === null) {
-        return;
-    }
-    if (!Number.isFinite(dimensions.width) ||
-        !Number.isFinite(dimensions.height) ||
-        dimensions.width <= 0 ||
-        dimensions.height <= 0) {
-        throw new Error('Element dimensions must be positive finite numbers');
-    }
-};
-const validateElement = (element) => {
-    if (drag_and_drop_1.DragAndDropInternals.makeElementFileNameFromSlug(element.slug) === null) {
-        throw new Error('Element slug must produce a safe lowercase .tsx file name');
-    }
-    if (typeof element.sourceCode !== 'string' ||
-        element.sourceCode.trim().length === 0 ||
-        element.sourceCode.length > 200000) {
-        throw new Error('Unsupported Element source code');
-    }
-    if (drag_and_drop_1.DragAndDropInternals.getElementComponentNameFromSourceCode(element.sourceCode) === null) {
-        throw new Error('Element source must export exactly one named component');
-    }
-    validateDimensions(element.dimensions);
-};
-const insertElementHandler = ({ input: { compositionFile, compositionId, element, from, position, overwriteExisting, }, remotionRoot, logLevel, }) => (0, source_file_write_queue_1.withSourceFileWriteQueue)(async () => {
+const insertElementHandler = ({ input: { compositionFile, compositionId, element, expectedFileState, from, position, overwriteExisting, }, remotionRoot, logLevel, }) => (0, source_file_write_queue_1.withSourceFileWriteQueue)(async () => {
     try {
-        validateElement(element);
-        validatePosition(position);
+        (0, element_install_plan_1.validateElementInstallPosition)(position);
         if (from !== null &&
             (!Number.isInteger(from) || !Number.isFinite(from) || from < 0)) {
             throw new Error('from must be a non-negative integer');
         }
-        const componentName = drag_and_drop_1.DragAndDropInternals.getElementComponentNameFromSourceCode(element.sourceCode);
-        if (componentName === null) {
-            throw new Error('Element source must export exactly one named component');
-        }
         renderer_1.RenderInternals.Log.trace({ indent: false, logLevel }, `[insert-element] Received request for compositionFile="${compositionFile}" compositionId="${compositionId}" element="${element.slug}"`);
-        const location = await (0, resolve_composition_component_1.resolveCompositionComponentWithFile)({
-            remotionRoot,
+        const plan = await (0, element_install_plan_1.getElementInstallPlan)({
             compositionFile,
             compositionId,
+            element,
+            remotionRoot,
         });
-        if (!location.canAddSequence) {
-            throw new Error('Cannot insert Element into this composition component');
-        }
-        const derivedElementFileName = drag_and_drop_1.DragAndDropInternals.makeElementFileNameFromSlug(element.slug);
-        if (derivedElementFileName === null) {
-            throw new Error('Element slug must produce a safe lowercase .tsx file name');
-        }
-        const elementFileName = node_path_1.default.resolve(node_path_1.default.dirname(location.fileName), derivedElementFileName);
-        if (!isInside({ child: elementFileName, parent: remotionRoot })) {
-            throw new Error('Element file must stay inside the Remotion project');
+        if (expectedFileState !== null &&
+            !hasExpectedFileState({
+                actual: plan.expectedFileState,
+                expected: expectedFileState,
+            })) {
+            const { existingElementSource } = plan;
+            if (existingElementSource !== null) {
+                return {
+                    success: false,
+                    type: 'file-conflict',
+                    conflict: {
+                        filePath: plan.filePath,
+                        existingSource: existingElementSource,
+                        incomingSource: element.sourceCode,
+                    },
+                };
+            }
+            throw new Error('Element source changed during installation');
         }
-        const elementFileExists = (0, node_fs_1.existsSync)(elementFileName);
-        const existingElementSource = elementFileExists
-            ? (0, node_fs_1.readFileSync)(elementFileName, 'utf-8')
-            : null;
-        const elementSourcesDiffer = existingElementSource !== null &&
-            normalizeSourceForComparison(existingElementSource) !==
-                normalizeSourceForComparison(element.sourceCode);
-        if (elementSourcesDiffer && !overwriteExisting) {
+        const elementSourcesDiffer = plan.existingElementSource !== null &&
+            (0, element_install_plan_1.normalizeElementSourceForComparison)(plan.existingElementSource) !==
+                (0, element_install_plan_1.normalizeElementSourceForComparison)(element.sourceCode);
+        if (elementSourcesDiffer &&
+            !overwriteExisting &&
+            plan.existingElementSource !== null) {
             return {
                 success: false,
                 type: 'file-conflict',
                 conflict: {
-                    filePath: node_path_1.default
-                        .relative(remotionRoot, elementFileName)
-                        .split(node_path_1.default.sep)
-                        .join('/'),
-                    existingSource: existingElementSource,
+                    filePath: plan.filePath,
+                    existingSource: plan.existingElementSource,
                     incomingSource: element.sourceCode,
                 },
             };
         }
-        const shouldWriteElementFile = !elementFileExists || elementSourcesDiffer;
-        const importPath = makeRelativeImportPath({
-            fromFile: location.fileName,
-            toFile: elementFileName,
-        });
+        const shouldWriteElementFile = !plan.elementFileExists || elementSourcesDiffer;
         const inserted = await (0, resolve_composition_component_1.insertJsxElementIntoComposition)({
             remotionRoot,
             compositionFile,
             compositionId,
             element: {
                 type: 'component',
-                componentName,
-                importName: componentName,
-                importPath,
+                componentName: plan.componentName,
+                importName: plan.componentName,
+                importPath: plan.importPath,
                 props: [],
                 position: null,
             },
@@ -145,13 +92,29 @@ const insertElementHandler = ({ input: { compositionFile, compositionId, element
                 position,
             },
         });
+        const finalPlan = await (0, element_install_plan_1.getElementInstallPlan)({
+            compositionFile,
+            compositionId,
+            element,
+            remotionRoot,
+        });
+        if (finalPlan.safePaths.compositionFileName !==
+            plan.safePaths.compositionFileName) {
+            throw new Error('Composition source changed during Element installation');
+        }
+        if (!hasExpectedFileState({
+            actual: finalPlan.expectedFileState,
+            expected: plan.expectedFileState,
+        })) {
+            throw new Error('Element source changed during installation');
+        }
         (0, undo_stack_1.pushTransactionToUndoStack)({
             snapshots: [
                 ...(shouldWriteElementFile
                     ? [
                         {
-                            filePath: elementFileName,
-                            oldContents: existingElementSource,
+                            filePath: plan.elementFileName,
+                            oldContents: plan.existingElementSource,
                             newContents: element.sourceCode,
                             logLine: 1,
                         },
@@ -174,11 +137,11 @@ const insertElementHandler = ({ input: { compositionFile, compositionId, element
             suppressHmrOnFileRestore: false,
         });
         if (shouldWriteElementFile) {
-            (0, undo_stack_1.suppressUndoStackInvalidation)(elementFileName);
+            (0, undo_stack_1.suppressUndoStackInvalidation)(plan.elementFileName);
         }
         (0, undo_stack_1.suppressUndoStackInvalidation)(inserted.fileName);
         if (shouldWriteElementFile) {
-            (0, file_watcher_1.writeFileAndNotifyFileWatchers)(elementFileName, element.sourceCode, undefined);
+            (0, file_watcher_1.writeFileAndNotifyFileWatchers)(plan.elementFileName, element.sourceCode, undefined);
         }
         (0, file_watcher_1.writeFileAndNotifyFileWatchers)(inserted.fileName, inserted.output, undefined);
         const compositionLocationLabel = (0, format_log_file_location_1.formatLogFileLocation)({
@@ -188,23 +151,21 @@ const insertElementHandler = ({ input: { compositionFile, compositionId, element
         });
         const elementLocationLabel = (0, format_log_file_location_1.formatLogFileLocation)({
             remotionRoot,
-            absolutePath: elementFileName,
+            absolutePath: plan.elementFileName,
             line: 1,
         });
         const elementFileAction = elementSourcesDiffer
             ? 'Overwrote existing Element source'
-            : elementFileExists
+            : plan.elementFileExists
                 ? 'Reused existing Element source'
                 : 'Created Element source';
         renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, `${renderer_1.RenderInternals.chalk.blueBright(elementLocationLabel)} ${elementFileAction}`);
-        renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, `${renderer_1.RenderInternals.chalk.blueBright(compositionLocationLabel)} Added <${componentName}>`);
+        renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, `${renderer_1.RenderInternals.chalk.blueBright(compositionLocationLabel)} Added <${plan.componentName}>`);
         if (!inserted.formatted) {
             (0, log_update_1.warnAboutPrettierOnce)(logLevel);
         }
         (0, undo_stack_1.printUndoHint)(logLevel);
-        return {
-            success: true,
-        };
+        return { success: true };
     }
     catch (err) {
         return {

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

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.insertJsxElementHandler = void 0;
 const node_path_1 = __importDefault(require("node:path"));
-const drag_and_drop_1 = require("@remotion/drag-and-drop");
 const renderer_1 = require("@remotion/renderer");
+const studio_protocol_1 = require("@remotion/studio-protocol");
 const studio_shared_1 = require("@remotion/studio-shared");
 const file_watcher_1 = require("../../file-watcher");
 const resolve_composition_component_1 = require("../../helpers/resolve-composition-component");
@@ -79,16 +79,16 @@ const validateElement = (element, remotionRoot) => {
         return;
     }
     if (element.type === 'component') {
-        if (!drag_and_drop_1.DragAndDropInternals.isComponentIdentifier(element.componentName)) {
+        if (!studio_protocol_1.StudioProtocolInternals.isComponentIdentifier(element.componentName)) {
             throw new Error('Unsupported component name');
         }
-        if (!drag_and_drop_1.DragAndDropInternals.isComponentIdentifier(element.importName)) {
+        if (!studio_protocol_1.StudioProtocolInternals.isComponentIdentifier(element.importName)) {
             throw new Error('Unsupported component import name');
         }
-        if (!drag_and_drop_1.DragAndDropInternals.isComponentImportPath(element.importPath)) {
+        if (!studio_protocol_1.StudioProtocolInternals.isComponentImportPath(element.importPath)) {
             throw new Error('Unsupported component import path');
         }
-        if (!drag_and_drop_1.DragAndDropInternals.areComponentProps(element.props)) {
+        if (!studio_protocol_1.StudioProtocolInternals.areComponentProps(element.props)) {
             throw new Error('Unsupported component props');
         }
         return;

package/dist/preview-server/routes/open-in-editor.d.ts

@@ -1,4 +1,8 @@
+import { type DefaultEditor } from '@remotion/renderer';
 import type { OpenInEditorRequest, OpenInEditorResponse } from '@remotion/studio-shared';
 import type { ApiHandler } from '../api-types';
-export declare const getEditorName: () => Promise<string | null>;
+export declare const getEditorName: ({ getDefaultEditor, logLevel, }: {
+    getDefaultEditor: () => DefaultEditor | null;
+    logLevel: "error" | "info" | "trace" | "verbose" | "warn";
+}) => Promise<string | null>;
 export declare const openInEditorHandler: ApiHandler<OpenInEditorRequest, OpenInEditorResponse>;

package/dist/preview-server/routes/open-in-editor.js

@@ -5,28 +5,58 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.openInEditorHandler = exports.getEditorName = void 0;
 const node_path_1 = __importDefault(require("node:path"));
+const renderer_1 = require("@remotion/renderer");
+const custom_editor_1 = require("../../helpers/custom-editor");
 const open_in_editor_1 = require("../../helpers/open-in-editor");
-const editorGuess = (0, open_in_editor_1.guessEditor)();
-const getEditorName = async () => {
-    const [edit] = await editorGuess;
-    return (0, open_in_editor_1.getDisplayNameForEditor)(edit ? edit.command : null);
+const resolve_editor_1 = require("../../helpers/resolve-editor");
+const getEditorName = async ({ getDefaultEditor, logLevel, }) => {
+    var _a;
+    const editor = await (0, resolve_editor_1.resolveEditor)({
+        defaultEditor: getDefaultEditor(),
+        logLevel,
+        preferredEditor: null,
+    });
+    return (_a = editor === null || editor === void 0 ? void 0 : editor.name) !== null && _a !== void 0 ? _a : null;
 };
 exports.getEditorName = getEditorName;
-const openInEditorHandler = async ({ input, remotionRoot, logLevel }) => {
+const openInEditorHandler = async ({ input, remotionRoot, logLevel, getDefaultEditor }) => {
     try {
         if (!('stack' in input)) {
             throw new TypeError('Need to pass stack');
         }
         const { stack } = input;
-        const guess = await editorGuess;
-        const didOpen = await (0, open_in_editor_1.launchEditor)({
-            colNumber: stack.originalColumnNumber,
-            editor: guess[0],
-            fileName: node_path_1.default.resolve(remotionRoot, stack.originalFileName),
-            lineNumber: stack.originalLineNumber,
-            vsCodeNewWindow: false,
+        if (input.editorId !== null &&
+            input.editorId !== 'custom' &&
+            !renderer_1.defaultEditorIds.includes(input.editorId)) {
+            return { success: false };
+        }
+        const editor = await (0, resolve_editor_1.resolveEditor)({
+            defaultEditor: getDefaultEditor(),
             logLevel,
+            preferredEditor: input.editorId,
         });
+        if (!editor) {
+            return { success: false };
+        }
+        const fileName = node_path_1.default.resolve(remotionRoot, stack.originalFileName);
+        const didOpen = editor.type === 'custom'
+            ? await (0, custom_editor_1.launchCustomEditor)({
+                editor: editor.editor,
+                resolvedExecutable: editor,
+                targetPath: fileName,
+                lineNumber: stack.originalLineNumber,
+                columnNumber: stack.originalColumnNumber,
+                logLevel,
+                spawnProcess: null,
+            })
+            : await (0, open_in_editor_1.launchEditor)({
+                colNumber: stack.originalColumnNumber,
+                editor,
+                fileName,
+                lineNumber: stack.originalLineNumber,
+                vsCodeNewWindow: false,
+                logLevel,
+            });
         return {
             success: didOpen,
         };

package/dist/preview-server/routes/prepare-element-install.d.ts

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

package/dist/preview-server/routes/prepare-element-install.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prepareElementInstallHandler = void 0;
+const element_install_plan_1 = require("./element-install-plan");
+const source_file_write_queue_1 = require("./source-file-write-queue");
+const prepareElementInstallHandler = ({ input, remotionRoot }) => (0, source_file_write_queue_1.withSourceFileWriteQueue)(async () => {
+    try {
+        const plan = await (0, element_install_plan_1.getElementInstallPlan)({ ...input, remotionRoot });
+        return {
+            success: true,
+            plan: {
+                expectedFileState: plan.expectedFileState,
+                filePath: plan.filePath,
+            },
+        };
+    }
+    catch (error) {
+        return {
+            success: false,
+            reason: error.message,
+            stack: error.stack,
+        };
+    }
+});
+exports.prepareElementInstallHandler = prepareElementInstallHandler;

package/dist/preview-server/routes/safe-element-install-path.d.ts

@@ -0,0 +1,9 @@
+export declare const getSafeElementInstallPaths: ({ compositionFileName, elementFileName, remotionRoot, }: {
+    compositionFileName: string;
+    elementFileName: string;
+    remotionRoot: string;
+}) => Promise<{
+    compositionFileName: string;
+    elementFileName: string;
+    remotionRoot: string;
+}>;

package/dist/preview-server/routes/safe-element-install-path.js

@@ -0,0 +1,58 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSafeElementInstallPaths = void 0;
+const promises_1 = require("node:fs/promises");
+const node_path_1 = __importDefault(require("node:path"));
+const isInside = ({ child, parent }) => {
+    const relative = node_path_1.default.relative(parent, child);
+    return (relative === '' ||
+        (!relative.startsWith('..') && !node_path_1.default.isAbsolute(relative)));
+};
+const assertInsideProject = ({ fileName, remotionRoot, }) => {
+    if (!isInside({ child: fileName, parent: remotionRoot })) {
+        throw new Error('Element installation must stay inside the Remotion project');
+    }
+};
+const getCanonicalProjectRoot = async (remotionRoot) => {
+    return (0, promises_1.realpath)(remotionRoot);
+};
+const getSafeElementInstallPaths = async ({ compositionFileName, elementFileName, remotionRoot, }) => {
+    const canonicalRoot = await getCanonicalProjectRoot(remotionRoot);
+    const canonicalCompositionFile = await (0, promises_1.realpath)(compositionFileName);
+    assertInsideProject({
+        fileName: canonicalCompositionFile,
+        remotionRoot: canonicalRoot,
+    });
+    // The Element directory already exists because it is the composition file's
+    // directory. Resolving it before appending the file name prevents writes
+    // through a directory symlink that leaves the project.
+    const canonicalElementDirectory = await (0, promises_1.realpath)(node_path_1.default.dirname(elementFileName));
+    assertInsideProject({
+        fileName: canonicalElementDirectory,
+        remotionRoot: canonicalRoot,
+    });
+    const canonicalElementFile = node_path_1.default.join(canonicalElementDirectory, node_path_1.default.basename(elementFileName));
+    try {
+        const elementStats = await (0, promises_1.lstat)(canonicalElementFile);
+        if (elementStats.isSymbolicLink()) {
+            throw new Error('Element source file must not be a symbolic link');
+        }
+        if (!elementStats.isFile()) {
+            throw new Error('Element source path must be a file');
+        }
+    }
+    catch (error) {
+        if (error.code !== 'ENOENT') {
+            throw error;
+        }
+    }
+    return {
+        compositionFileName: canonicalCompositionFile,
+        elementFileName: canonicalElementFile,
+        remotionRoot: canonicalRoot,
+    };
+};
+exports.getSafeElementInstallPaths = getSafeElementInstallPaths;

package/dist/preview-server/routes/save-props-mutex.d.ts

@@ -0,0 +1 @@
+export declare const withSavePropsLock: <T>(fn: () => Promise<T>) => Promise<T>;

package/dist/preview-server/routes/save-props-mutex.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withSavePropsLock = void 0;
+let chain = Promise.resolve();
+const withSavePropsLock = (fn) => {
+    const run = () => fn();
+    const next = chain.then(run, run);
+    chain = next.then(() => undefined, () => undefined);
+    return next;
+};
+exports.withSavePropsLock = withSavePropsLock;

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

@@ -85,9 +85,10 @@ const getSequencePropsStatus = ({ fileName, line, column, preferredNodePath, com
             };
         }
     }
-    const status = (0, can_update_sequence_props_1.computeSequencePropsStatusFromFilenameByLine)({
+    const status = (0, can_update_sequence_props_1.computeSequencePropsStatusFromFilenameByLocation)({
         fileName,
         line,
+        column,
         componentIdentity,
         keys,
         assetKeys,

package/dist/preview-server/start-server.d.ts

@@ -1,4 +1,5 @@
 import type { BundlerOverrideFn, RspackOverrideFn, WebpackOverrideFn } from '@remotion/bundler';
+import type { DefaultEditor } from '@remotion/renderer';
 import type { GitSource, RenderDefaults, RenderJob, StudioRuntimeConfig } from '@remotion/studio-shared';
 import type { QueueMethods } from './api-types';
 import type { LiveEventsServer } from './live-events';
@@ -41,5 +42,6 @@ export declare const startServer: (options: {
     forceNew: boolean;
     rspack: boolean;
     getStudioRuntimeConfig: () => StudioRuntimeConfig;
+    getDefaultEditor: () => DefaultEditor | null;
     configFile: string | null;
 }) => Promise<StartServerResult>;

package/dist/preview-server/start-server.js

@@ -102,6 +102,7 @@ const startServer = async (options) => {
                 getPreviewSampleRate: options.getPreviewSampleRate,
                 enableCrossSiteIsolation: options.enableCrossSiteIsolation,
                 getStudioRuntimeConfig: options.getStudioRuntimeConfig,
+                getDefaultEditor: options.getDefaultEditor,
                 configFile: options.configFile,
             });
         })