@remotion/paths 4.0.526 → 4.0.528

package/dist/esm/index.mjs

@@ -1144,9 +1144,31 @@ var makeInstructions = (arr, instruction, cb) => {
 };
 var segmentRegExp = /([astvzqmhlc])([^astvzqmhlc]*)/gi;
 var numberRegExp = /-?[0-9]*\.?[0-9]+(?:e[-+]?\d+)?/gi;
+var arcNumberRegExp = /[\s,]*([-+]?(?:[0-9]+\.?[0-9]*|\.[0-9]+)(?:e[-+]?\d+)?)/iy;
+var arcFlagRegExp = /[\s,]*([01])/y;
 var parseValues = (args, instructionType) => {
-  const numbers = args.match(numberRegExp);
-  if (!numbers) {
+  let numbers;
+  if (instructionType === "A" || instructionType === "a") {
+    numbers = [];
+    let match;
+    let lastIndex = 0;
+    do {
+      const regExp = numbers.length % 7 === 3 || numbers.length % 7 === 4 ? arcFlagRegExp : arcNumberRegExp;
+      regExp.lastIndex = lastIndex;
+      match = regExp.exec(args);
+      if (match) {
+        numbers.push(match[1]);
+        lastIndex = regExp.lastIndex;
+      }
+    } while (match);
+    const rest = args.slice(lastIndex);
+    if (!/^[\s,]*$/.test(rest)) {
+      throw new Error(`Malformed path data: ${instructionType} has an invalid value at "${rest.trim()}"`);
+    }
+  } else {
+    numbers = args.match(numberRegExp);
+  }
+  if (!numbers || numbers.length === 0) {
     if (instructionType === "Z" || instructionType === "z") {
       return [];
     }
@@ -1788,8 +1810,8 @@ var normalizeInstructions = (instructions) => {
       moveX = instruction.x;
       moveY = instruction.y;
     } else if (instruction.type === "m") {
-      moveX += instruction.dx;
-      moveY += instruction.dy;
+      moveX = x + instruction.dx;
+      moveY = y + instruction.dy;
     }
     if (instruction.type === "A" || instruction.type === "C" || instruction.type === "L" || instruction.type === "M" || instruction.type === "Q" || instruction.type === "S" || instruction.type === "T") {
       normalized.push(instruction);

package/dist/normalize-path.js

@@ -17,8 +17,8 @@ const normalizeInstructions = (instructions) => {
             moveY = instruction.y;
         }
         else if (instruction.type === 'm') {
-            moveX += instruction.dx;
-            moveY += instruction.dy;
+            moveX = x + instruction.dx;
+            moveY = y + instruction.dy;
         }
         if (instruction.type === 'A' ||
             instruction.type === 'C' ||

package/dist/parse-path.js

@@ -42,9 +42,36 @@ const makeInstructions = (arr, instruction, cb) => {
 };
 const segmentRegExp = /([astvzqmhlc])([^astvzqmhlc]*)/gi;
 const numberRegExp = /-?[0-9]*\.?[0-9]+(?:e[-+]?\d+)?/gi;
+const arcNumberRegExp = /[\s,]*([-+]?(?:[0-9]+\.?[0-9]*|\.[0-9]+)(?:e[-+]?\d+)?)/iy;
+const arcFlagRegExp = /[\s,]*([01])/y;
 const parseValues = (args, instructionType) => {
-    const numbers = args.match(numberRegExp);
-    if (!numbers) {
+    let numbers;
+    if (instructionType === 'A' || instructionType === 'a') {
+        // Arc flags are a single "0" or "1" and don't need a separator,
+        // e.g. "A1 1 0 011 1" (https://www.w3.org/TR/SVG2/paths.html#PathDataBNF)
+        numbers = [];
+        let match;
+        let lastIndex = 0;
+        do {
+            const regExp = numbers.length % 7 === 3 || numbers.length % 7 === 4
+                ? arcFlagRegExp
+                : arcNumberRegExp;
+            regExp.lastIndex = lastIndex;
+            match = regExp.exec(args);
+            if (match) {
+                numbers.push(match[1]);
+                lastIndex = regExp.lastIndex;
+            }
+        } while (match);
+        const rest = args.slice(lastIndex);
+        if (!/^[\s,]*$/.test(rest)) {
+            throw new Error(`Malformed path data: ${instructionType} has an invalid value at "${rest.trim()}"`);
+        }
+    }
+    else {
+        numbers = args.match(numberRegExp);
+    }
+    if (!numbers || numbers.length === 0) {
         if (instructionType === 'Z' || instructionType === 'z') {
             return [];
         }

package/package.json

@@ -3,7 +3,7 @@
 		"url": "https://github.com/remotion-dev/remotion/tree/main/packages/paths"
 	},
 	"name": "@remotion/paths",
-	"version": "4.0.526",
+	"version": "4.0.528",
 	"description": "Utilities for working with SVG paths",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -26,7 +26,7 @@
 		"utilities"
 	],
 	"devDependencies": {
-		"@remotion/eslint-config-internal": "4.0.526",
+		"@remotion/eslint-config-internal": "4.0.528",
 		"eslint": "9.19.0",
 		"@typescript/native-preview": "7.0.0-dev.20260217.1"
 	},