@remotion/paths 4.0.0-newpaths.13 → 4.0.0-newpaths.40

package/dist/translate-path.js

@@ -1,43 +1,61 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.translatePath = void 0;
-const parse_1 = require("./helpers/parse");
-const serialize = (path) => {
-    return path.reduce((str, seg) => {
-        return (str + ' ' + seg[0] + ' ' + seg.slice(1).join(' ')).trim();
-    }, '');
-};
-const translateSegments = (path, x, y) => {
-    const segments = (0, parse_1.parsePath)(path);
+const parse_path_1 = require("./parse-path");
+const serialize_instructions_1 = require("./serialize-instructions");
+const translateSegments = (segments, x, y) => {
     return segments.map((segment) => {
-        const cmd = segment[0];
         // Shift coords only for commands with absolute values
-        if ('ACHLMRQSTVZ'.indexOf(cmd) === -1) {
+        if (segment.type === 'a' ||
+            segment.type === 'c' ||
+            segment.type === 'v' ||
+            segment.type === 's' ||
+            segment.type === 'z' ||
+            segment.type === 'h' ||
+            segment.type === 'l' ||
+            segment.type === 'm' ||
+            segment.type === 'q' ||
+            segment.type === 't') {
             return segment;
         }
-        const name = cmd.toLowerCase();
         // V is the only command, with shifted coords parity
-        if (name === 'v') {
-            segment[1] = segment[1] + y;
-            return segment;
+        if (segment.type === 'V') {
+            return {
+                type: 'V',
+                y: segment.y + y,
+            };
+        }
+        if (segment.type === 'H') {
+            return {
+                type: 'H',
+                x: segment.x + x,
+            };
         }
         // ARC is: ['A', rx, ry, x-axis-rotation, large-arc-flag, sweep-flag, x, y]
         // touch x, y only
-        if (name === 'a') {
-            segment[6] = segment[6] + x;
-            segment[7] = segment[7] + (y !== null && y !== void 0 ? y : 0);
+        if (segment.type === 'A') {
+            return {
+                type: 'A',
+                rx: segment.rx,
+                ry: segment.ry,
+                largeArcFlag: segment.largeArcFlag,
+                sweepFlag: segment.sweepFlag,
+                xAxisRotation: segment.xAxisRotation,
+                x: segment.x + x,
+                y: segment.y + y,
+            };
+        }
+        if (segment.type === 'Z') {
             return segment;
         }
-        // All other commands have [cmd, x1, y1, x2, y2, x3, y3, ...] format
-        return segment.map((val, i) => {
-            if (!i) {
-                return val;
-            }
-            return i % 2 ? val + x : val + (y !== null && y !== void 0 ? y : 0);
-        });
+        return {
+            ...segment,
+            x: segment.x + x,
+            y: segment.y + y,
+        };
     });
 };
 const translatePath = (path, x, y) => {
-    return serialize(translateSegments(path, x, y));
+    return (0, serialize_instructions_1.serializeInstructions)(translateSegments((0, parse_path_1.parsePath)(path), x, y));
 };
 exports.translatePath = translatePath;

package/dist/unarc.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unarc = void 0;
+const iterate_1 = require("./helpers/iterate");
 const parse_1 = require("./helpers/parse");
 const TAU = Math.PI * 2;
 function approximate_unit_arc(theta1, delta_theta) {
@@ -79,67 +80,36 @@ function a2c({ x1, y1, x2, y2, fa, fs, rx, ry, phi, }) {
         return curve;
     });
 }
+// Requires path to be normalized
 const unarc = (d) => {
     const segments = (0, parse_1.parsePath)(d);
-    let x = 0;
-    let y = 0;
-    const newSegments = segments.map((s) => {
-        switch (s[0]) {
-            case 'M':
-            case 'L': {
-                x = s[1];
-                y = s[2];
-                return [s];
-            }
-            case 'A': {
-                const nextX = s[6];
-                const nextY = s[7];
-                const new_segments = a2c({
-                    x1: x,
-                    y1: y,
-                    x2: nextX,
-                    y2: nextY,
-                    fa: s[4],
-                    fs: s[5],
-                    rx: s[1],
-                    ry: s[2],
-                    phi: s[3],
-                });
-                // Degenerated arcs can be ignored by renderer, but should not be dropped
-                // to avoid collisions with `S A S` and so on. Replace with empty line.
-                if (new_segments.length === 0) {
-                    return [['L', s[6], s[7]]];
-                }
-                const result = [];
-                new_segments.forEach((_s) => {
-                    result.push(['C', _s[2], _s[3], _s[4], _s[5], _s[6], _s[7]]);
-                });
-                return result;
-            }
-            case 'V': {
-                y = s[1];
-                return [s];
-            }
-            case 'H': {
-                x = s[1];
-                return [s];
-            }
-            case 'C': {
-                x = s[5];
-                y = s[6];
-                return [s];
-            }
-            case 'Q': {
-                x = s[3];
-                y = s[4];
-                return [s];
-            }
-            default:
-                throw new Error(`Unexpected instruction ${s[0]}`);
+    const x = 0;
+    const y = 0;
+    return (0, iterate_1.iterateOverSegments)(segments, ({ segment }) => {
+        const nextX = segment[6];
+        const nextY = segment[7];
+        const new_segments = a2c({
+            x1: x,
+            y1: y,
+            x2: nextX,
+            y2: nextY,
+            fa: segment[4],
+            fs: segment[5],
+            rx: segment[1],
+            ry: segment[2],
+            phi: segment[3],
+        });
+        // Degenerated arcs can be ignored by renderer, but should not be dropped
+        // to avoid collisions with `S A S` and so on. Replace with empty line.
+        if (new_segments.length === 0) {
+            return [['L', segment[6], segment[7]]];
         }
+        const result = [];
+        new_segments.forEach((_s) => {
+            result.push(['C', _s[2], _s[3], _s[4], _s[5], _s[6], _s[7]]);
+        });
+        return result;
     });
-    const flatted = newSegments.flat(1);
-    return flatted;
 };
 exports.unarc = unarc;
 function get_arc_center({ x1, y1, x2, y2, fa, fs, rx, ry, sin_phi, cos_phi, }) {

package/dist/unshort.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unshort = void 0;
+// Requires that the path is already normalized
 const unshort = function (segments) {
     let prevControlX = 0;
     let prevControlY = 0;
@@ -21,26 +22,24 @@ const unshort = function (segments) {
             }
             case 'V': {
                 y = s[1];
-                newSegments[i] = s;
                 break;
             }
             case 'H': {
                 x = s[1];
-                newSegments[i] = s;
                 break;
             }
             case 'C': {
                 x = s[5];
                 y = s[6];
-                newSegments[i] = s;
                 break;
             }
             case 'Q': {
                 x = s[3];
                 y = s[4];
-                newSegments[i] = s;
                 break;
             }
+            case 'Z':
+                break;
             default:
                 throw new Error('Unexpected command: ' + s[0]);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/paths",
-	"version": "4.0.0-newpaths.13+40cc970bd",
+	"version": "4.0.0-newpaths.40+09405cced",
 	"description": "Utility functions for SVG paths",
 	"main": "dist/index.js",
 	"sideEffects": false,
@@ -35,5 +35,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "40cc970bd20f2c9fde0c1644f1c9f33cd47f3dc7"
+	"gitHead": "09405cced148038402b72b568f349e0bc7bbb949"
 }