@remotion/vercel 4.0.525 → 4.0.527

package/dist/esm/index.mjs

@@ -345,13 +345,19 @@ function springCalculation({
 }) {
   const from = 0;
   const to = 1;
+  const resolvedConfig = {
+    damping: config.damping ?? defaultSpringConfig.damping,
+    mass: config.mass ?? defaultSpringConfig.mass,
+    stiffness: config.stiffness ?? defaultSpringConfig.stiffness,
+    overshootClamping: config.overshootClamping ?? defaultSpringConfig.overshootClamping
+  };
   const cacheKey = [
     frame,
     fps,
-    config.damping,
-    config.mass,
-    config.overshootClamping,
-    config.stiffness
+    resolvedConfig.damping,
+    resolvedConfig.mass,
+    resolvedConfig.overshootClamping,
+    resolvedConfig.stiffness
   ].join("-");
   if (calculationCache[cacheKey]) {
     return calculationCache[cacheKey];
@@ -370,20 +376,14 @@ function springCalculation({
     animation = advance({
       animation,
       now: time,
-      config: {
-        ...defaultSpringConfig,
-        ...config
-      }
+      config: resolvedConfig
     });
   }
   if (unevenRest > 0) {
     animation = advance({
       animation,
       now: frameClamped / fps * 1000,
-      config: {
-        ...defaultSpringConfig,
-        ...config
-      }
+      config: resolvedConfig
     });
   }
   calculationCache[cacheKey] = animation;
@@ -848,7 +848,7 @@ var parseAxisRotationValue = (output) => {
     axisRotation: true
   };
 };
-var parseStringInterpolationValue = (output) => {
+var parseStringInterpolationValue = (output, outputType) => {
   if (typeof output === "number") {
     if (!Number.isFinite(output)) {
       throw new Error(\`outputRange must contain only finite numbers, but got [\${output}]\`);
@@ -861,8 +861,18 @@ var parseStringInterpolationValue = (output) => {
       axisRotation: false
     };
   }
+  if (outputType === "transform-origin") {
+    const transformOriginParts = output.trim().split(/\\s+/);
+    if (transformOriginParts.length < 1 || transformOriginParts.length > 3 || transformOriginParts[0] === "") {
+      throw new TypeError(\`String outputRange values must contain 1 to 3 components, but got "\${output}"\`);
+    }
+    return parseTransformOriginValue(output, transformOriginParts);
+  }
   const axisRotation = parseAxisRotationValue(output);
   if (axisRotation !== null) {
+    if (outputType !== undefined && outputType !== "rotate") {
+      throw new TypeError(\`Cannot interpolate "\${output}" as \${outputType} because it is a rotate value\`);
+    }
     return axisRotation;
   }
   const parts = output.trim().split(/\\s+/);
@@ -870,6 +880,9 @@ var parseStringInterpolationValue = (output) => {
     throw new TypeError(\`String outputRange values must contain 1 to 3 components, but got "\${output}"\`);
   }
   if (parts.some((part) => transformOriginKeywords.has(part.toLowerCase()))) {
+    if (outputType !== undefined) {
+      throw new TypeError(\`Cannot interpolate "\${output}" as \${outputType} because it is a transform-origin value\`);
+    }
     return parseTransformOriginValue(output, parts);
   }
   const parsed = parts.map((part) => parseStringInterpolationComponent(part, output));
@@ -879,6 +892,9 @@ var parseStringInterpolationValue = (output) => {
       throw new TypeError(\`Cannot interpolate "\${output}" because it mixes \${kind} and \${part.kind} values\`);
     }
   }
+  if (outputType !== undefined && outputType !== kind) {
+    throw new TypeError(\`Cannot interpolate "\${output}" as \${outputType} because it is a \${kind} value\`);
+  }
   if (kind === "scale") {
     const x = parsed[0].value;
     const y = parsed[1]?.value ?? x;
@@ -1079,9 +1095,10 @@ var interpolateString = ({
   input,
   inputRange,
   outputRange,
-  options
+  options,
+  outputType
 }) => {
-  const initiallyParsedOutputRange = outputRange.map(parseStringInterpolationValue);
+  const initiallyParsedOutputRange = outputRange.map((output) => parseStringInterpolationValue(output, outputType));
   const hasAxisRotation = initiallyParsedOutputRange.some((parsed) => parsed.axisRotation);
   const posterizedInput = options?.posterize === undefined ? input : Math.floor(input / options.posterize) * options.posterize;
   const segmentIndex = inputRange.length === 1 ? 0 : findRange(posterizedInput, inputRange);
@@ -1161,6 +1178,36 @@ var interpolateString = ({
     axisRotation: hasAxisRotation
   });
 };
+var interpolateFontWeight = ({
+  input,
+  inputRange,
+  outputRange,
+  options
+}) => {
+  const normalizedOutputRange = outputRange.map((output) => {
+    if (typeof output === "string") {
+      const lowerCaseOutput = output.toLowerCase();
+      if (lowerCaseOutput === "normal") {
+        return 400;
+      }
+      if (lowerCaseOutput === "bold") {
+        return 700;
+      }
+    }
+    const match = typeof output === "string" ? cssNumberRegex.exec(output) : null;
+    const value = typeof output === "number" ? output : match !== null && match[2] === undefined ? Number(match[1]) : Number.NaN;
+    if (!Number.isFinite(value) || value < 1 || value > 1000) {
+      throw new TypeError(\`Cannot interpolate font weight "\${output}". Expected "normal", "bold", or a number between 1 and 1000\`);
+    }
+    return value;
+  });
+  return interpolateNumber({
+    input,
+    inputRange,
+    outputRange: normalizedOutputRange,
+    options
+  });
+};
 var interpolateDiscreteString = ({
   input,
   inputRange,
@@ -1292,6 +1339,12 @@ function assertValidInterpolateOutputOption(output) {
   }
   throw new Error(\`output must be "linear" or "perceptual-scale", but got \${String(output)}\`);
 }
+function assertValidInterpolateOutputType(outputType) {
+  if (outputType === undefined || outputType === "font-weight" || outputType === "scale" || outputType === "translate" || outputType === "rotate" || outputType === "transform-origin") {
+    return;
+  }
+  throw new Error(\`outputType must be "font-weight", "scale", "translate", "rotate", or "transform-origin", but got \${String(outputType)}\`);
+}
 function interpolate(input, inputRange, outputRange, options) {
   if (typeof input === "undefined") {
     throw new Error("input can not be undefined");
@@ -1310,26 +1363,48 @@ function interpolate(input, inputRange, outputRange, options) {
   assertValidInterpolateEasingOption(options?.easing, inputRange.length);
   assertValidInterpolatePosterizeOption(options?.posterize);
   assertValidInterpolateOutputOption(options?.output);
+  assertValidInterpolateOutputType(options?.outputType);
   if (typeof input !== "number") {
     throw new TypeError("Cannot interpolate an input which is not a number");
   }
   if (!Array.isArray(outputRange)) {
     throw new Error("outputRange must contain only numbers");
   }
+  const outputType = options?.outputType;
+  if (outputType === "font-weight") {
+    if (!outputRange.every((output) => typeof output === "number" || typeof output === "string")) {
+      throw new TypeError("Font weight outputRange must contain only numbers or strings");
+    }
+    return interpolateFontWeight({
+      input,
+      inputRange,
+      outputRange,
+      options
+    });
+  }
   const hasStringOutput = outputRange.some((output) => typeof output === "string");
+  if (outputType !== undefined && outputType !== "scale" && !hasStringOutput) {
+    throw new TypeError(\`\${outputType} outputRange must contain strings with the appropriate CSS units\`);
+  }
   if (hasStringOutput) {
     if (!outputRange.every((output) => typeof output === "string" || typeof output === "number")) {
       throw new TypeError("outputRange must contain only numbers, or supported scale, translate, and rotate strings");
     }
     try {
-      return interpolateString({ input, inputRange, outputRange, options });
+      return interpolateString({
+        input,
+        inputRange,
+        outputRange,
+        options,
+        outputType
+      });
     } catch (error) {
       if (!outputRange.every((output) => typeof output === "string")) {
         throw error;
       }
       const hasNonNumericString = outputRange.some((output) => {
         try {
-          parseStringInterpolationValue(output);
+          parseStringInterpolationValue(output, outputType);
           return false;
         } catch (parseError) {
           return parseError instanceof UnsupportedStringInterpolationValueError;
@@ -2750,13 +2825,19 @@ function springCalculation({
 }) {
   const from = 0;
   const to = 1;
+  const resolvedConfig = {
+    damping: config.damping ?? defaultSpringConfig.damping,
+    mass: config.mass ?? defaultSpringConfig.mass,
+    stiffness: config.stiffness ?? defaultSpringConfig.stiffness,
+    overshootClamping: config.overshootClamping ?? defaultSpringConfig.overshootClamping
+  };
   const cacheKey = [
     frame,
     fps,
-    config.damping,
-    config.mass,
-    config.overshootClamping,
-    config.stiffness
+    resolvedConfig.damping,
+    resolvedConfig.mass,
+    resolvedConfig.overshootClamping,
+    resolvedConfig.stiffness
   ].join("-");
   if (calculationCache[cacheKey]) {
     return calculationCache[cacheKey];
@@ -2775,20 +2856,14 @@ function springCalculation({
     animation = advance({
       animation,
       now: time,
-      config: {
-        ...defaultSpringConfig,
-        ...config
-      }
+      config: resolvedConfig
     });
   }
   if (unevenRest > 0) {
     animation = advance({
       animation,
       now: frameClamped / fps * 1000,
-      config: {
-        ...defaultSpringConfig,
-        ...config
-      }
+      config: resolvedConfig
     });
   }
   calculationCache[cacheKey] = animation;
@@ -3253,7 +3328,7 @@ var parseAxisRotationValue = (output) => {
     axisRotation: true
   };
 };
-var parseStringInterpolationValue = (output) => {
+var parseStringInterpolationValue = (output, outputType) => {
   if (typeof output === "number") {
     if (!Number.isFinite(output)) {
       throw new Error(\`outputRange must contain only finite numbers, but got [\${output}]\`);
@@ -3266,8 +3341,18 @@ var parseStringInterpolationValue = (output) => {
       axisRotation: false
     };
   }
+  if (outputType === "transform-origin") {
+    const transformOriginParts = output.trim().split(/\\s+/);
+    if (transformOriginParts.length < 1 || transformOriginParts.length > 3 || transformOriginParts[0] === "") {
+      throw new TypeError(\`String outputRange values must contain 1 to 3 components, but got "\${output}"\`);
+    }
+    return parseTransformOriginValue(output, transformOriginParts);
+  }
   const axisRotation = parseAxisRotationValue(output);
   if (axisRotation !== null) {
+    if (outputType !== undefined && outputType !== "rotate") {
+      throw new TypeError(\`Cannot interpolate "\${output}" as \${outputType} because it is a rotate value\`);
+    }
     return axisRotation;
   }
   const parts = output.trim().split(/\\s+/);
@@ -3275,6 +3360,9 @@ var parseStringInterpolationValue = (output) => {
     throw new TypeError(\`String outputRange values must contain 1 to 3 components, but got "\${output}"\`);
   }
   if (parts.some((part) => transformOriginKeywords.has(part.toLowerCase()))) {
+    if (outputType !== undefined) {
+      throw new TypeError(\`Cannot interpolate "\${output}" as \${outputType} because it is a transform-origin value\`);
+    }
     return parseTransformOriginValue(output, parts);
   }
   const parsed = parts.map((part) => parseStringInterpolationComponent(part, output));
@@ -3284,6 +3372,9 @@ var parseStringInterpolationValue = (output) => {
       throw new TypeError(\`Cannot interpolate "\${output}" because it mixes \${kind} and \${part.kind} values\`);
     }
   }
+  if (outputType !== undefined && outputType !== kind) {
+    throw new TypeError(\`Cannot interpolate "\${output}" as \${outputType} because it is a \${kind} value\`);
+  }
   if (kind === "scale") {
     const x = parsed[0].value;
     const y = parsed[1]?.value ?? x;
@@ -3484,9 +3575,10 @@ var interpolateString = ({
   input,
   inputRange,
   outputRange,
-  options
+  options,
+  outputType
 }) => {
-  const initiallyParsedOutputRange = outputRange.map(parseStringInterpolationValue);
+  const initiallyParsedOutputRange = outputRange.map((output) => parseStringInterpolationValue(output, outputType));
   const hasAxisRotation = initiallyParsedOutputRange.some((parsed) => parsed.axisRotation);
   const posterizedInput = options?.posterize === undefined ? input : Math.floor(input / options.posterize) * options.posterize;
   const segmentIndex = inputRange.length === 1 ? 0 : findRange(posterizedInput, inputRange);
@@ -3566,6 +3658,36 @@ var interpolateString = ({
     axisRotation: hasAxisRotation
   });
 };
+var interpolateFontWeight = ({
+  input,
+  inputRange,
+  outputRange,
+  options
+}) => {
+  const normalizedOutputRange = outputRange.map((output) => {
+    if (typeof output === "string") {
+      const lowerCaseOutput = output.toLowerCase();
+      if (lowerCaseOutput === "normal") {
+        return 400;
+      }
+      if (lowerCaseOutput === "bold") {
+        return 700;
+      }
+    }
+    const match = typeof output === "string" ? cssNumberRegex.exec(output) : null;
+    const value = typeof output === "number" ? output : match !== null && match[2] === undefined ? Number(match[1]) : Number.NaN;
+    if (!Number.isFinite(value) || value < 1 || value > 1000) {
+      throw new TypeError(\`Cannot interpolate font weight "\${output}". Expected "normal", "bold", or a number between 1 and 1000\`);
+    }
+    return value;
+  });
+  return interpolateNumber({
+    input,
+    inputRange,
+    outputRange: normalizedOutputRange,
+    options
+  });
+};
 var interpolateDiscreteString = ({
   input,
   inputRange,
@@ -3697,6 +3819,12 @@ function assertValidInterpolateOutputOption(output) {
   }
   throw new Error(\`output must be "linear" or "perceptual-scale", but got \${String(output)}\`);
 }
+function assertValidInterpolateOutputType(outputType) {
+  if (outputType === undefined || outputType === "font-weight" || outputType === "scale" || outputType === "translate" || outputType === "rotate" || outputType === "transform-origin") {
+    return;
+  }
+  throw new Error(\`outputType must be "font-weight", "scale", "translate", "rotate", or "transform-origin", but got \${String(outputType)}\`);
+}
 function interpolate(input, inputRange, outputRange, options) {
   if (typeof input === "undefined") {
     throw new Error("input can not be undefined");
@@ -3715,26 +3843,48 @@ function interpolate(input, inputRange, outputRange, options) {
   assertValidInterpolateEasingOption(options?.easing, inputRange.length);
   assertValidInterpolatePosterizeOption(options?.posterize);
   assertValidInterpolateOutputOption(options?.output);
+  assertValidInterpolateOutputType(options?.outputType);
   if (typeof input !== "number") {
     throw new TypeError("Cannot interpolate an input which is not a number");
   }
   if (!Array.isArray(outputRange)) {
     throw new Error("outputRange must contain only numbers");
   }
+  const outputType = options?.outputType;
+  if (outputType === "font-weight") {
+    if (!outputRange.every((output) => typeof output === "number" || typeof output === "string")) {
+      throw new TypeError("Font weight outputRange must contain only numbers or strings");
+    }
+    return interpolateFontWeight({
+      input,
+      inputRange,
+      outputRange,
+      options
+    });
+  }
   const hasStringOutput = outputRange.some((output) => typeof output === "string");
+  if (outputType !== undefined && outputType !== "scale" && !hasStringOutput) {
+    throw new TypeError(\`\${outputType} outputRange must contain strings with the appropriate CSS units\`);
+  }
   if (hasStringOutput) {
     if (!outputRange.every((output) => typeof output === "string" || typeof output === "number")) {
       throw new TypeError("outputRange must contain only numbers, or supported scale, translate, and rotate strings");
     }
     try {
-      return interpolateString({ input, inputRange, outputRange, options });
+      return interpolateString({
+        input,
+        inputRange,
+        outputRange,
+        options,
+        outputType
+      });
     } catch (error) {
       if (!outputRange.every((output) => typeof output === "string")) {
         throw error;
       }
       const hasNonNumericString = outputRange.some((output) => {
         try {
-          parseStringInterpolationValue(output);
+          parseStringInterpolationValue(output, outputType);
           return false;
         } catch (parseError) {
           return parseError instanceof UnsupportedStringInterpolationValueError;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/vercel",
-	"version": "4.0.525",
+	"version": "4.0.527",
 	"description": "Render Remotion videos on Vercel Sandbox",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -23,8 +23,8 @@
 		"url": "https://github.com/remotion-dev/remotion/issues"
 	},
 	"dependencies": {
-		"@remotion/renderer": "4.0.525",
-		"remotion": "4.0.525"
+		"@remotion/renderer": "4.0.527",
+		"remotion": "4.0.527"
 	},
 	"peerDependencies": {
 		"@vercel/sandbox": ">=1.0.0"
@@ -38,7 +38,7 @@
 		"./package.json": "./package.json"
 	},
 	"devDependencies": {
-		"@remotion/eslint-config-internal": "4.0.525",
+		"@remotion/eslint-config-internal": "4.0.527",
 		"@vercel/blob": "2.3.0",
 		"@vercel/sandbox": "1.6.0",
 		"eslint": "9.19.0",