@reearth/core 0.0.7-alpha.57 → 0.0.7-alpha.59

package/dist/index.d.ts

@@ -280,7 +280,7 @@ declare type CommonProps = {
     sketchEditingFeature?: SketchEditingFeature;
 };
 
-export declare function computeAtom(cache?: typeof globalDataFeaturesCache): WritableAtom<ComputedLayer | undefined, Command, void>;
+export declare function computeAtom(cache?: typeof globalDataFeaturesCache): WritableAtom<ComputedLayer | undefined, [Command], void>;
 
 export declare type ComputedFeature = CommonFeature<"computedFeature"> & Partial<AppearanceTypes>;
 
@@ -794,11 +794,11 @@ export declare function getCompat(l: Layer | undefined): LayerCompat | undefined
 
 declare const globalDataFeaturesCache: {
     get: Atom_2<(key: string, key2: string) => Feature[] | undefined>;
-    set: WritableAtom<null, {
+    set: WritableAtom<null, [value: {
     key: string;
     key2: string;
     value?: Feature[] | undefined;
-    }, void> & {
+    }], void> & {
         init: null;
     };
     getAll: Atom_2<(key: string) => Feature[][] | undefined>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reearth/core",
-  "version": "0.0.7-alpha.57",
+  "version": "0.0.7-alpha.59",
   "author": "Re:Earth contributors <community@reearth.io>",
   "license": "Apache-2.0",
   "description": "A library that abstracts a map engine as one common API.",
@@ -42,21 +42,21 @@
     "@radix-ui/react-slot": "^1.2.4",
     "@radix-ui/react-switch": "^1.2.6",
     "@radix-ui/react-toggle": "^1.1.10",
-    "@reearth/cesium-mvt-imagery-provider": "1.6.1",
+    "@reearth/cesium-mvt-imagery-provider": "1.6.2",
     "@reearth/spatial-id-sdk": "0.0.0",
     "@rot1024/use-transition": "1.0.0",
     "@seznam/compose-react-refs": "1.0.6",
     "@turf/invariant": "^7.3.3",
     "@turf/turf": "^7.3.3",
     "@ungap/event-target": "0.2.4",
-    "@xstate/react": "3.2.1",
+    "@xstate/react": "^6.1.0",
     "cesium-dnd": "1.1.0",
     "csv-parse": "^6.1.0",
     "d3": "^7.9.0",
     "fast-xml-parser": "^5.3.3",
     "framer-motion": "^12.29.2",
     "geojson": "0.5.0",
-    "jotai": "1.12.1",
+    "jotai": "^2.18.0",
     "js-md5": "^0.8.3",
     "jsep": "^1.4.0",
     "jsonpath-plus": "^10.3.0",
@@ -65,7 +65,7 @@
     "lru-cache": "^11.2.5",
     "pbf": "^4.0.1",
     "proj4": "^2.20.2",
-    "protomaps": "1.23.1",
+    "protomaps-leaflet": "^5.1.0",
     "react-dnd": "16.0.1",
     "react-dnd-html5-backend": "16.0.1",
     "react-error-boundary": "^6.1.0",
@@ -73,14 +73,14 @@
     "react-use": "^17.6.0",
     "resium": "^1.19.3",
     "suspend-react": "0.1.3",
-    "tailwind-merge": "^2.5.5",
-    "tailwindcss": "^3.4.17",
+    "tailwind-merge": "^3.5.0",
+    "tailwindcss": "^4.2.1",
     "tailwindcss-animate": "^1.0.7",
     "tiny-invariant": "1.3.3",
     "use-callback-ref": "1.3.3",
     "use-custom-compare": "1.5.0",
     "uuid": "^13.0.0",
-    "xstate": "4.38.2"
+    "xstate": "^5.28.0"
   },
   "devDependencies": {
     "@apollo/client": "^4.1.2",
@@ -105,6 +105,7 @@
     "@types/scheduler": "^0.26.0",
     "@vitejs/plugin-react": "^5.1.2",
     "@xstate/cli": "0.5.17",
+    "@tailwindcss/postcss": "^4.2.1",
     "autoprefixer": "^10.4.23",
     "cesium": "^1.137.0",
     "class-variance-authority": "^0.7.1",
@@ -112,7 +113,7 @@
     "eslint": "8.57.0",
     "eslint-config-reearth": "0.3.0",
     "eslint-plugin-storybook": "^10.2.3",
-    "jsdom": "^27.4.0",
+    "jsdom": "^28.1.0",
     "postcss": "^8.5.6",
     "prettier": "^3.8.1",
     "react": "^19.2.4",

package/src/Map/Sketch/hooks.ts

@@ -13,7 +13,7 @@ import {
   useState,
 } from "react";
 import { v4 as uuidv4 } from "uuid";
-import { InterpreterFrom, StateFrom } from "xstate";
+import { ActorRefFrom, StateFrom } from "xstate";
 
 import { ControlPointMouseEventHandler } from "../../engines/Cesium/Sketch";
 import { InteractionModeType } from "../../shared/interactionMode";
@@ -65,7 +65,7 @@ type Props = {
 const sketchMachine = createSketchMachine();
 
 export type sketchState = StateFrom<typeof sketchMachine>;
-export type SketchInterpreter = InterpreterFrom<typeof sketchMachine>;
+export type SketchInterpreter = ActorRefFrom<typeof sketchMachine>;
 
 export default function ({
   ref,

package/src/Map/Sketch/sketchMachine.ts

@@ -1,6 +1,6 @@
 // TODO: Refactor: move cesium related code to engine.
 import invariant from "tiny-invariant";
-import { createMachine, type StateFrom } from "xstate";
+import { createMachine, assign, type StateFrom } from "xstate";
 
 import { type SketchType } from "./types";
 
@@ -133,6 +133,7 @@ export function createSketchMachine() {
           },
         },
         drawing: {
+          initial: "marker",
           states: {
             marker: {
               initial: "vertex",
@@ -147,7 +148,7 @@ export function createSketchMachine() {
                   on: {
                     NEXT: {
                       target: "vertex",
-                      internal: true,
+                      reenter: false,
                       actions: ["pushPosition"],
                     },
                   },
@@ -175,7 +176,7 @@ export function createSketchMachine() {
                     NEXT: [
                       {
                         target: "vertex",
-                        internal: true,
+                        reenter: false,
                         actions: ["pushPosition"],
                       },
                     ],
@@ -191,12 +192,12 @@ export function createSketchMachine() {
                     NEXT: [
                       {
                         target: "#sketch.extruding",
-                        cond: "willRectangleComplete",
+                        guard: "willRectangleComplete",
                         actions: ["pushPosition", "recordOriginalControlPoint"],
                       },
                       {
                         target: "vertex",
-                        internal: true,
+                        reenter: false,
                         actions: ["pushPosition"],
                       },
                     ],
@@ -211,7 +212,7 @@ export function createSketchMachine() {
                   on: {
                     NEXT: {
                       target: "vertex",
-                      internal: true,
+                      reenter: false,
                       actions: ["pushPosition"],
                     },
                   },
@@ -225,7 +226,7 @@ export function createSketchMachine() {
                   on: {
                     NEXT: {
                       target: "vertex",
-                      internal: true,
+                      reenter: false,
                       actions: ["pushPosition"],
                     },
                     EXTRUDE: {
@@ -244,7 +245,7 @@ export function createSketchMachine() {
             CANCEL: [
               {
                 target: ".history",
-                cond: "canPopPosition",
+                guard: "canPopPosition",
                 actions: ["popPosition"],
               },
               {
@@ -279,6 +280,7 @@ export function createSketchMachine() {
           },
         },
         editing: {
+          initial: "marker",
           states: {
             marker: {
               initial: "waiting",
@@ -287,7 +289,7 @@ export function createSketchMachine() {
                   on: {
                     CATCH: {
                       target: "moving",
-                      internal: true,
+                      reenter: false,
                       actions: ["catchControlPoint"],
                     },
                   },
@@ -296,7 +298,7 @@ export function createSketchMachine() {
                   on: {
                     MOVE: {
                       target: "moving",
-                      internal: true,
+                      reenter: false,
                       actions: ["moveControlPoint"],
                     },
                     RELEASE: {
@@ -314,12 +316,12 @@ export function createSketchMachine() {
                   on: {
                     CATCH: {
                       target: "moving",
-                      internal: true,
+                      reenter: false,
                       actions: ["catchControlPoint"],
                     },
                     UPDATE: {
                       target: "waiting",
-                      internal: true,
+                      reenter: false,
                       actions: ["updateControlPoints"],
                     },
                   },
@@ -328,7 +330,7 @@ export function createSketchMachine() {
                   on: {
                     MOVE: {
                       target: "moving",
-                      internal: true,
+                      reenter: false,
                       actions: ["moveControlPoint"],
                     },
                     RELEASE: {
@@ -346,7 +348,7 @@ export function createSketchMachine() {
                   on: {
                     CATCH: {
                       target: "moving",
-                      internal: true,
+                      reenter: false,
                       actions: ["catchControlPoint"],
                     },
                   },
@@ -355,7 +357,7 @@ export function createSketchMachine() {
                   on: {
                     MOVE: {
                       target: "moving",
-                      internal: true,
+                      reenter: false,
                       actions: ["moveControlPoint"],
                     },
                     RELEASE: {
@@ -373,7 +375,7 @@ export function createSketchMachine() {
                   on: {
                     CATCH: {
                       target: "moving",
-                      internal: true,
+                      reenter: false,
                       actions: ["catchControlPoint"],
                     },
                   },
@@ -382,7 +384,7 @@ export function createSketchMachine() {
                   on: {
                     MOVE: {
                       target: "moving",
-                      internal: true,
+                      reenter: false,
                       actions: ["moveControlPoint"],
                     },
                     RELEASE: {
@@ -400,12 +402,12 @@ export function createSketchMachine() {
                   on: {
                     CATCH: {
                       target: "moving",
-                      internal: true,
+                      reenter: false,
                       actions: ["catchControlPoint"],
                     },
                     UPDATE: {
                       target: "waiting",
-                      internal: true,
+                      reenter: false,
                       actions: ["updateControlPoints"],
                     },
                   },
@@ -414,7 +416,7 @@ export function createSketchMachine() {
                   on: {
                     MOVE: {
                       target: "moving",
-                      internal: true,
+                      reenter: false,
                       actions: ["moveControlPoint"],
                     },
                     RELEASE: {
@@ -432,7 +434,7 @@ export function createSketchMachine() {
                   on: {
                     CATCH: {
                       target: "moving",
-                      internal: true,
+                      reenter: false,
                       actions: ["catchControlPoint"],
                     },
                   },
@@ -441,7 +443,7 @@ export function createSketchMachine() {
                   on: {
                     MOVE: {
                       target: "moving",
-                      internal: true,
+                      reenter: false,
                       actions: ["moveControlPoint"],
                     },
                     RELEASE: {
@@ -459,7 +461,7 @@ export function createSketchMachine() {
                   on: {
                     CATCH: {
                       target: "moving",
-                      internal: true,
+                      reenter: false,
                       actions: ["catchControlPoint"],
                     },
                   },
@@ -468,7 +470,7 @@ export function createSketchMachine() {
                   on: {
                     MOVE: {
                       target: "moving",
-                      internal: true,
+                      reenter: false,
                       actions: ["moveControlPoint"],
                     },
                     RELEASE: {
@@ -486,12 +488,12 @@ export function createSketchMachine() {
                   on: {
                     CATCH: {
                       target: "moving",
-                      internal: true,
+                      reenter: false,
                       actions: ["catchControlPoint"],
                     },
                     UPDATE: {
                       target: "waiting",
-                      internal: true,
+                      reenter: false,
                       actions: ["updateControlPoints"],
                     },
                   },
@@ -500,7 +502,7 @@ export function createSketchMachine() {
                   on: {
                     MOVE: {
                       target: "moving",
-                      internal: true,
+                      reenter: false,
                       actions: ["moveControlPoint"],
                     },
                     RELEASE: {
@@ -520,158 +522,126 @@ export function createSketchMachine() {
           },
         },
       },
-      schema: {
-        events: {} as unknown as EventObject,
-      },
-      predictableActionArguments: true,
-      preserveActionOrder: true,
-      tsTypes: {} as import("./sketchMachine.typegen").Typegen0,
     },
-    {
-      guards: {
-        canPopPosition: context => {
-          return context.controlPoints != null && context.controlPoints.length > 1;
-        },
-        willRectangleComplete: context => {
-          return context.controlPoints != null && context.controlPoints.length === 2;
-        },
-      },
-      actions: {
-        createMarker: (context, event) => {
-          context.lastPointerPosition = [...event.pointerPosition];
-          const controlPoint = [...event.controlPoint] as Position3d;
-          context.lastControlPoint = controlPoint;
-          context.type = "marker";
-          context.controlPoints = [controlPoint];
-        },
-        editMarker: (context, event) => {
-          context.lastControlPoint = undefined;
-          context.type = "marker";
-          context.controlPoints = event.controlPoints;
-        },
-        createPolyline: (context, event) => {
-          context.lastPointerPosition = [...event.pointerPosition];
-          const controlPoint = [...event.controlPoint] as Position3d;
-          context.lastControlPoint = controlPoint;
-          context.type = "polyline";
-          context.controlPoints = [controlPoint];
-        },
-        editPolyline: (context, event) => {
-          context.lastControlPoint = undefined;
-          context.type = "polyline";
-          context.controlPoints = event.controlPoints;
-        },
-        createCircle: (context, event) => {
-          context.lastPointerPosition = [...event.pointerPosition];
-          const controlPoint = [...event.controlPoint] as Position3d;
-          context.lastControlPoint = controlPoint;
-          context.type = "circle";
-          context.controlPoints = [controlPoint];
-        },
-        editCircle: (context, event) => {
-          context.lastControlPoint = undefined;
-          context.type = "circle";
-          context.controlPoints = event.controlPoints;
-        },
-        createRectangle: (context, event) => {
-          context.lastPointerPosition = [...event.pointerPosition];
-          const controlPoint = [...event.controlPoint] as Position3d;
-          context.lastControlPoint = controlPoint;
-          context.type = "rectangle";
-          context.controlPoints = [controlPoint];
-        },
-        editRectangle: (context, event) => {
-          context.lastControlPoint = undefined;
-          context.type = "rectangle";
-          context.controlPoints = event.controlPoints;
-        },
-        createPolygon: (context, event) => {
-          context.lastPointerPosition = [...event.pointerPosition];
-          const controlPoint = [...event.controlPoint] as Position3d;
-          context.lastControlPoint = controlPoint;
-          context.type = "polygon";
-          context.controlPoints = [controlPoint];
-        },
-        editPolygon: (context, event) => {
-          context.lastControlPoint = undefined;
-          context.type = "polygon";
-          context.controlPoints = event.controlPoints;
-        },
-        createExtrudedCircle: (context, event) => {
-          context.lastPointerPosition = [...event.pointerPosition];
-          const controlPoint = [...event.controlPoint] as Position3d;
-          context.lastControlPoint = controlPoint;
-          context.type = "extrudedCircle";
-          context.controlPoints = [controlPoint];
-        },
-        editExtrudedCircle: (context, event) => {
-          context.lastControlPoint = undefined;
-          context.type = "extrudedCircle";
-          context.controlPoints = event.controlPoints;
-        },
-        createExtrudedRectangle: (context, event) => {
-          context.lastPointerPosition = [...event.pointerPosition];
-          const controlPoint = [...event.controlPoint] as Position3d;
-          context.lastControlPoint = controlPoint;
-          context.type = "extrudedRectangle";
-          context.controlPoints = [controlPoint];
-        },
-        editExtrudedRectangle: (context, event) => {
-          context.lastControlPoint = undefined;
-          context.type = "extrudedRectangle";
-          context.controlPoints = event.controlPoints;
-        },
-        createExtrudedPolygon: (context, event) => {
-          context.lastPointerPosition = [...event.pointerPosition];
-          const controlPoint = [...event.controlPoint] as Position3d;
-          context.lastControlPoint = controlPoint;
-          context.type = "extrudedPolygon";
-          context.controlPoints = [controlPoint];
-        },
-        editExtrudedPolygon: (context, event) => {
-          context.lastControlPoint = undefined;
-          context.type = "extrudedPolygon";
-          context.controlPoints = event.controlPoints;
-        },
-        pushPosition: (context, event) => {
-          context.lastPointerPosition = [...event.pointerPosition];
-          const controlPoint = [...event.controlPoint] as Position3d;
-          context.lastControlPoint = controlPoint;
-          context.controlPoints?.push(controlPoint);
-        },
-        popPosition: context => {
-          invariant(context.controlPoints != null);
-          invariant(context.controlPoints.length > 1);
-          context.controlPoints.pop();
-        },
-        clearDrawing: context => {
-          delete context.lastControlPoint;
-          delete context.type;
-          delete context.controlPoints;
-          delete context.catchedControlPointIndex;
-          delete context.catchedExtrudedPoint;
-          delete context.originalControlPoint;
-        },
-        catchControlPoint: (context, event) => {
-          context.catchedControlPointIndex = event.catchedControlPointIndex;
-          context.catchedExtrudedPoint = event.catchedExtrudedPoint;
-        },
-        moveControlPoint: (context, event) => {
-          context.controlPoints = event.controlPoints;
-        },
-        releaseControlPoint: context => {
-          delete context.catchedControlPointIndex;
-          delete context.catchedExtrudedPoint;
-        },
-        updateControlPoints: (context, event) => {
-          context.controlPoints = event.controlPoints;
-        },
-        recordOriginalControlPoint: (context, event) => {
-          context.originalControlPoint = [...event.controlPoint] as Position3d;
-        },
-      },
+  ).provide({
+    guards: {
+      canPopPosition: ({ context }) => context.controlPoints != null && context.controlPoints.length > 1,
+      willRectangleComplete: ({ context }) => context.controlPoints != null && context.controlPoints.length === 2,
+    },
+    actions: {
+      createMarker: assign(({ event }) => {
+        const e = event as Extract<EventObject, { type: "MARKER" }>;
+        const controlPoint = [...e.controlPoint] as Position3d;
+        return { lastPointerPosition: [...e.pointerPosition] as Position2d, lastControlPoint: controlPoint, type: "marker" as SketchType, controlPoints: [controlPoint] };
+      }),
+      editMarker: assign(({ event }) => {
+        const e = event as Extract<EventObject, { type: "EDIT_MARKER" }>;
+        return { lastControlPoint: undefined, type: "marker" as SketchType, controlPoints: e.controlPoints };
+      }),
+      createPolyline: assign(({ event }) => {
+        const e = event as Extract<EventObject, { type: "POLYLINE" }>;
+        const controlPoint = [...e.controlPoint] as Position3d;
+        return { lastPointerPosition: [...e.pointerPosition] as Position2d, lastControlPoint: controlPoint, type: "polyline" as SketchType, controlPoints: [controlPoint] };
+      }),
+      editPolyline: assign(({ event }) => {
+        const e = event as Extract<EventObject, { type: "EDIT_POLYLINE" }>;
+        return { lastControlPoint: undefined, type: "polyline" as SketchType, controlPoints: e.controlPoints };
+      }),
+      createCircle: assign(({ event }) => {
+        const e = event as Extract<EventObject, { type: "CIRCLE" }>;
+        const controlPoint = [...e.controlPoint] as Position3d;
+        return { lastPointerPosition: [...e.pointerPosition] as Position2d, lastControlPoint: controlPoint, type: "circle" as SketchType, controlPoints: [controlPoint] };
+      }),
+      editCircle: assign(({ event }) => {
+        const e = event as Extract<EventObject, { type: "EDIT_CIRCLE" }>;
+        return { lastControlPoint: undefined, type: "circle" as SketchType, controlPoints: e.controlPoints };
+      }),
+      createRectangle: assign(({ event }) => {
+        const e = event as Extract<EventObject, { type: "RECTANGLE" }>;
+        const controlPoint = [...e.controlPoint] as Position3d;
+        return { lastPointerPosition: [...e.pointerPosition] as Position2d, lastControlPoint: controlPoint, type: "rectangle" as SketchType, controlPoints: [controlPoint] };
+      }),
+      editRectangle: assign(({ event }) => {
+        const e = event as Extract<EventObject, { type: "EDIT_RECTANGLE" }>;
+        return { lastControlPoint: undefined, type: "rectangle" as SketchType, controlPoints: e.controlPoints };
+      }),
+      createPolygon: assign(({ event }) => {
+        const e = event as Extract<EventObject, { type: "POLYGON" }>;
+        const controlPoint = [...e.controlPoint] as Position3d;
+        return { lastPointerPosition: [...e.pointerPosition] as Position2d, lastControlPoint: controlPoint, type: "polygon" as SketchType, controlPoints: [controlPoint] };
+      }),
+      editPolygon: assign(({ event }) => {
+        const e = event as Extract<EventObject, { type: "EDIT_POLYGON" }>;
+        return { lastControlPoint: undefined, type: "polygon" as SketchType, controlPoints: e.controlPoints };
+      }),
+      createExtrudedCircle: assign(({ event }) => {
+        const e = event as Extract<EventObject, { type: "EXTRUDED_CIRCLE" }>;
+        const controlPoint = [...e.controlPoint] as Position3d;
+        return { lastPointerPosition: [...e.pointerPosition] as Position2d, lastControlPoint: controlPoint, type: "extrudedCircle" as SketchType, controlPoints: [controlPoint] };
+      }),
+      editExtrudedCircle: assign(({ event }) => {
+        const e = event as Extract<EventObject, { type: "EDIT_EXTRUDED_CIRCLE" }>;
+        return { lastControlPoint: undefined, type: "extrudedCircle" as SketchType, controlPoints: e.controlPoints };
+      }),
+      createExtrudedRectangle: assign(({ event }) => {
+        const e = event as Extract<EventObject, { type: "EXTRUDED_RECTANGLE" }>;
+        const controlPoint = [...e.controlPoint] as Position3d;
+        return { lastPointerPosition: [...e.pointerPosition] as Position2d, lastControlPoint: controlPoint, type: "extrudedRectangle" as SketchType, controlPoints: [controlPoint] };
+      }),
+      editExtrudedRectangle: assign(({ event }) => {
+        const e = event as Extract<EventObject, { type: "EDIT_EXTRUDED_RECTANGLE" }>;
+        return { lastControlPoint: undefined, type: "extrudedRectangle" as SketchType, controlPoints: e.controlPoints };
+      }),
+      createExtrudedPolygon: assign(({ event }) => {
+        const e = event as Extract<EventObject, { type: "EXTRUDED_POLYGON" }>;
+        const controlPoint = [...e.controlPoint] as Position3d;
+        return { lastPointerPosition: [...e.pointerPosition] as Position2d, lastControlPoint: controlPoint, type: "extrudedPolygon" as SketchType, controlPoints: [controlPoint] };
+      }),
+      editExtrudedPolygon: assign(({ event }) => {
+        const e = event as Extract<EventObject, { type: "EDIT_EXTRUDED_POLYGON" }>;
+        return { lastControlPoint: undefined, type: "extrudedPolygon" as SketchType, controlPoints: e.controlPoints };
+      }),
+      pushPosition: assign(({ context, event }) => {
+        const e = event as Extract<EventObject, { type: "NEXT" | "EXTRUDE" }>;
+        const controlPoint = [...e.controlPoint] as Position3d;
+        return {
+          lastPointerPosition: [...e.pointerPosition] as Position2d,
+          lastControlPoint: controlPoint,
+          controlPoints: [...(context.controlPoints ?? []), controlPoint],
+        };
+      }),
+      popPosition: assign(({ context }) => {
+        invariant(context.controlPoints != null);
+        invariant(context.controlPoints.length > 1);
+        return { controlPoints: context.controlPoints.slice(0, -1) };
+      }),
+      clearDrawing: assign(() => ({
+        lastControlPoint: undefined,
+        type: undefined,
+        controlPoints: undefined,
+        catchedControlPointIndex: undefined,
+        catchedExtrudedPoint: undefined,
+        originalControlPoint: undefined,
+      })),
+      catchControlPoint: assign(({ event }) => {
+        const e = event as Extract<EventObject, { type: "CATCH" }>;
+        return { catchedControlPointIndex: e.catchedControlPointIndex, catchedExtrudedPoint: e.catchedExtrudedPoint };
+      }),
+      moveControlPoint: assign(({ event }) => {
+        const e = event as Extract<EventObject, { type: "MOVE" }>;
+        return { controlPoints: e.controlPoints };
+      }),
+      releaseControlPoint: assign(() => ({ catchedControlPointIndex: undefined, catchedExtrudedPoint: undefined })),
+      updateControlPoints: assign(({ event }) => {
+        const e = event as Extract<EventObject, { type: "UPDATE" }>;
+        return { controlPoints: e.controlPoints };
+      }),
+      recordOriginalControlPoint: assign(({ event }) => {
+        const e = event as Extract<EventObject, { type: "NEXT" }>;
+        return { originalControlPoint: [...e.controlPoint] as Position3d };
+      }),
     },
-  );
+  });
 }
 
 export type SketchMachine = ReturnType<typeof createSketchMachine>;