@remotion/vercel 4.0.507 → 4.0.508

package/dist/esm/index.mjs

@@ -305,9 +305,45 @@ var parseTransformOriginValue = (output, parts) => {
   });
   return {
     kind: "translate",
-    values: [x.value, y.value, z.value],
-    units: [x.unit, y.unit, z.unit],
-    dimensions: parts[2] === undefined ? 2 : 3
+    values: [x.value, y.value, z.value, 0],
+    units: [x.unit, y.unit, z.unit, null],
+    dimensions: parts[2] === undefined ? 2 : 3,
+    axisRotation: false
+  };
+};
+var parseAxisRotationValue = (output) => {
+  const parts = output.trim().split(/\\s+/);
+  const keywordAxis = parts.length === 2 ? parts[0].toLowerCase() : null;
+  if (keywordAxis === "x" || keywordAxis === "y" || keywordAxis === "z") {
+    const keywordAngle = parseStringInterpolationComponent(parts[1], output);
+    if (keywordAngle.kind !== "rotate") {
+      return null;
+    }
+    return {
+      kind: "rotate",
+      values: keywordAxis === "x" ? [1, 0, 0, keywordAngle.value] : keywordAxis === "y" ? [0, 1, 0, keywordAngle.value] : [0, 0, 1, keywordAngle.value],
+      units: [null, null, null, keywordAngle.unit],
+      dimensions: 4,
+      axisRotation: true
+    };
+  }
+  if (parts.length !== 4) {
+    return null;
+  }
+  const axis = parts.slice(0, 3).map(Number);
+  if (!axis.every(Number.isFinite)) {
+    return null;
+  }
+  const vectorAngle = parseStringInterpolationComponent(parts[3], output);
+  if (vectorAngle.kind !== "rotate") {
+    return null;
+  }
+  return {
+    kind: "rotate",
+    values: [axis[0], axis[1], axis[2], vectorAngle.value],
+    units: [null, null, null, vectorAngle.unit],
+    dimensions: 4,
+    axisRotation: true
   };
 };
 var parseStringInterpolationValue = (output) => {
@@ -317,11 +353,16 @@ var parseStringInterpolationValue = (output) => {
     }
     return {
       kind: "scale",
-      values: [output, output, 1],
-      units: [null, null, null],
-      dimensions: 1
+      values: [output, output, 1, 0],
+      units: [null, null, null, null],
+      dimensions: 1,
+      axisRotation: false
     };
   }
+  const axisRotation = parseAxisRotationValue(output);
+  if (axisRotation !== null) {
+    return axisRotation;
+  }
   const parts = output.trim().split(/\\s+/);
   if (parts.length < 1 || parts.length > 3 || parts[0] === "") {
     throw new TypeError(\`String outputRange values must contain 1 to 3 components, but got "\${output}"\`);
@@ -342,24 +383,35 @@ var parseStringInterpolationValue = (output) => {
     const z = parsed[2]?.value ?? 1;
     return {
       kind,
-      values: [x, y, z],
-      units: [null, null, null],
-      dimensions: parsed.length
+      values: [x, y, z, 0],
+      units: [null, null, null, null],
+      dimensions: parsed.length,
+      axisRotation: false
     };
   }
   return {
     kind,
-    values: [parsed[0].value, parsed[1]?.value ?? 0, parsed[2]?.value ?? 0],
-    units: [parsed[0].unit, parsed[1]?.unit ?? null, parsed[2]?.unit ?? null],
-    dimensions: parsed.length
+    values: [parsed[0].value, parsed[1]?.value ?? 0, parsed[2]?.value ?? 0, 0],
+    units: [
+      parsed[0].unit,
+      parsed[1]?.unit ?? null,
+      parsed[2]?.unit ?? null,
+      null
+    ],
+    dimensions: parsed.length,
+    axisRotation: false
   };
 };
 var serializeStringInterpolationValue = ({
   kind,
   values,
   units,
-  dimensions
+  dimensions,
+  axisRotation
 }) => {
+  if (axisRotation) {
+    return \`\${stringifyNumber(values[0])} \${stringifyNumber(values[1])} \${stringifyNumber(values[2])} \${stringifyNumber(values[3])}\${units[3]}\`;
+  }
   if (kind === "scale") {
     return values.slice(0, dimensions).map((value) => stringifyNumber(value)).join(" ");
   }
@@ -527,7 +579,26 @@ var interpolateString = ({
   outputRange,
   options
 }) => {
-  const parsedOutputRange = outputRange.map(parseStringInterpolationValue);
+  const initiallyParsedOutputRange = outputRange.map(parseStringInterpolationValue);
+  const hasAxisRotation = initiallyParsedOutputRange.some((parsed) => parsed.axisRotation);
+  const parsedOutputRange = hasAxisRotation ? initiallyParsedOutputRange.map((parsed) => {
+    if (parsed.kind !== "rotate") {
+      return parsed;
+    }
+    if (parsed.axisRotation) {
+      return parsed;
+    }
+    if (parsed.dimensions !== 1) {
+      throw new TypeError("Cannot interpolate a multi-angle rotate value with an axis rotation");
+    }
+    return {
+      kind: "rotate",
+      values: [0, 0, 1, parsed.values[0]],
+      units: [null, null, null, parsed.units[0]],
+      dimensions: 4,
+      axisRotation: true
+    };
+  }) : initiallyParsedOutputRange;
   const kind = parsedOutputRange[0]?.kind;
   if (kind === undefined) {
     throw new Error("outputRange must have at least 1 element");
@@ -539,12 +610,16 @@ var interpolateString = ({
   }
   const dimensions = Math.max(...parsedOutputRange.map((parsed) => parsed.dimensions));
   const units = [
+    null,
     null,
     null,
     null
   ];
   if (kind !== "scale") {
     for (let axis = 0;axis < dimensions; axis++) {
+      if (hasAxisRotation && axis < 3) {
+        continue;
+      }
       for (const parsed of parsedOutputRange) {
         const unit = parsed.units[axis];
         if (unit === null) {
@@ -563,7 +638,7 @@ var interpolateString = ({
       }
     }
   }
-  const values = [0, 0, 0];
+  const values = [0, 0, 0, 0];
   for (let axis = 0;axis < dimensions; axis++) {
     values[axis] = interpolateNumber({
       input,
@@ -576,7 +651,8 @@ var interpolateString = ({
     kind,
     values,
     units,
-    dimensions
+    dimensions,
+    axisRotation: hasAxisRotation
   });
 };
 var validateTupleOutputRange = (outputRange) => {
@@ -2064,9 +2140,45 @@ var parseTransformOriginValue = (output, parts) => {
   });
   return {
     kind: "translate",
-    values: [x.value, y.value, z.value],
-    units: [x.unit, y.unit, z.unit],
-    dimensions: parts[2] === undefined ? 2 : 3
+    values: [x.value, y.value, z.value, 0],
+    units: [x.unit, y.unit, z.unit, null],
+    dimensions: parts[2] === undefined ? 2 : 3,
+    axisRotation: false
+  };
+};
+var parseAxisRotationValue = (output) => {
+  const parts = output.trim().split(/\\s+/);
+  const keywordAxis = parts.length === 2 ? parts[0].toLowerCase() : null;
+  if (keywordAxis === "x" || keywordAxis === "y" || keywordAxis === "z") {
+    const keywordAngle = parseStringInterpolationComponent(parts[1], output);
+    if (keywordAngle.kind !== "rotate") {
+      return null;
+    }
+    return {
+      kind: "rotate",
+      values: keywordAxis === "x" ? [1, 0, 0, keywordAngle.value] : keywordAxis === "y" ? [0, 1, 0, keywordAngle.value] : [0, 0, 1, keywordAngle.value],
+      units: [null, null, null, keywordAngle.unit],
+      dimensions: 4,
+      axisRotation: true
+    };
+  }
+  if (parts.length !== 4) {
+    return null;
+  }
+  const axis = parts.slice(0, 3).map(Number);
+  if (!axis.every(Number.isFinite)) {
+    return null;
+  }
+  const vectorAngle = parseStringInterpolationComponent(parts[3], output);
+  if (vectorAngle.kind !== "rotate") {
+    return null;
+  }
+  return {
+    kind: "rotate",
+    values: [axis[0], axis[1], axis[2], vectorAngle.value],
+    units: [null, null, null, vectorAngle.unit],
+    dimensions: 4,
+    axisRotation: true
   };
 };
 var parseStringInterpolationValue = (output) => {
@@ -2076,11 +2188,16 @@ var parseStringInterpolationValue = (output) => {
     }
     return {
       kind: "scale",
-      values: [output, output, 1],
-      units: [null, null, null],
-      dimensions: 1
+      values: [output, output, 1, 0],
+      units: [null, null, null, null],
+      dimensions: 1,
+      axisRotation: false
     };
   }
+  const axisRotation = parseAxisRotationValue(output);
+  if (axisRotation !== null) {
+    return axisRotation;
+  }
   const parts = output.trim().split(/\\s+/);
   if (parts.length < 1 || parts.length > 3 || parts[0] === "") {
     throw new TypeError(\`String outputRange values must contain 1 to 3 components, but got "\${output}"\`);
@@ -2101,24 +2218,35 @@ var parseStringInterpolationValue = (output) => {
     const z = parsed[2]?.value ?? 1;
     return {
       kind,
-      values: [x, y, z],
-      units: [null, null, null],
-      dimensions: parsed.length
+      values: [x, y, z, 0],
+      units: [null, null, null, null],
+      dimensions: parsed.length,
+      axisRotation: false
     };
   }
   return {
     kind,
-    values: [parsed[0].value, parsed[1]?.value ?? 0, parsed[2]?.value ?? 0],
-    units: [parsed[0].unit, parsed[1]?.unit ?? null, parsed[2]?.unit ?? null],
-    dimensions: parsed.length
+    values: [parsed[0].value, parsed[1]?.value ?? 0, parsed[2]?.value ?? 0, 0],
+    units: [
+      parsed[0].unit,
+      parsed[1]?.unit ?? null,
+      parsed[2]?.unit ?? null,
+      null
+    ],
+    dimensions: parsed.length,
+    axisRotation: false
   };
 };
 var serializeStringInterpolationValue = ({
   kind,
   values,
   units,
-  dimensions
+  dimensions,
+  axisRotation
 }) => {
+  if (axisRotation) {
+    return \`\${stringifyNumber(values[0])} \${stringifyNumber(values[1])} \${stringifyNumber(values[2])} \${stringifyNumber(values[3])}\${units[3]}\`;
+  }
   if (kind === "scale") {
     return values.slice(0, dimensions).map((value) => stringifyNumber(value)).join(" ");
   }
@@ -2286,7 +2414,26 @@ var interpolateString = ({
   outputRange,
   options
 }) => {
-  const parsedOutputRange = outputRange.map(parseStringInterpolationValue);
+  const initiallyParsedOutputRange = outputRange.map(parseStringInterpolationValue);
+  const hasAxisRotation = initiallyParsedOutputRange.some((parsed) => parsed.axisRotation);
+  const parsedOutputRange = hasAxisRotation ? initiallyParsedOutputRange.map((parsed) => {
+    if (parsed.kind !== "rotate") {
+      return parsed;
+    }
+    if (parsed.axisRotation) {
+      return parsed;
+    }
+    if (parsed.dimensions !== 1) {
+      throw new TypeError("Cannot interpolate a multi-angle rotate value with an axis rotation");
+    }
+    return {
+      kind: "rotate",
+      values: [0, 0, 1, parsed.values[0]],
+      units: [null, null, null, parsed.units[0]],
+      dimensions: 4,
+      axisRotation: true
+    };
+  }) : initiallyParsedOutputRange;
   const kind = parsedOutputRange[0]?.kind;
   if (kind === undefined) {
     throw new Error("outputRange must have at least 1 element");
@@ -2298,12 +2445,16 @@ var interpolateString = ({
   }
   const dimensions = Math.max(...parsedOutputRange.map((parsed) => parsed.dimensions));
   const units = [
+    null,
     null,
     null,
     null
   ];
   if (kind !== "scale") {
     for (let axis = 0;axis < dimensions; axis++) {
+      if (hasAxisRotation && axis < 3) {
+        continue;
+      }
       for (const parsed of parsedOutputRange) {
         const unit = parsed.units[axis];
         if (unit === null) {
@@ -2322,7 +2473,7 @@ var interpolateString = ({
       }
     }
   }
-  const values = [0, 0, 0];
+  const values = [0, 0, 0, 0];
   for (let axis = 0;axis < dimensions; axis++) {
     values[axis] = interpolateNumber({
       input,
@@ -2335,7 +2486,8 @@ var interpolateString = ({
     kind,
     values,
     units,
-    dimensions
+    dimensions,
+    axisRotation: hasAxisRotation
   });
 };
 var validateTupleOutputRange = (outputRange) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/vercel",
-	"version": "4.0.507",
+	"version": "4.0.508",
 	"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.507",
-		"remotion": "4.0.507"
+		"@remotion/renderer": "4.0.508",
+		"remotion": "4.0.508"
 	},
 	"peerDependencies": {
 		"@vercel/sandbox": ">=1.0.0"
@@ -38,7 +38,7 @@
 		"./package.json": "./package.json"
 	},
 	"devDependencies": {
-		"@remotion/eslint-config-internal": "4.0.507",
+		"@remotion/eslint-config-internal": "4.0.508",
 		"@vercel/blob": "2.3.0",
 		"@vercel/sandbox": "1.6.0",
 		"eslint": "9.19.0",