@ikijs/editor 0.15.0 → 0.16.1

package/dist/index.d.mts

@@ -73,11 +73,12 @@ declare class SetPartTransform extends FieldCommand<number | undefined> {
 }
 /**
  * Capture the warp deformer's grid as one keyform at the driving parameter
- * `value`, upserting `offsets` into `warps[0].keyforms`. The 4-tuple-style
+ * `value`, upserting `offsets` into the deformer's single grid warp. The 4-tuple-style
  * mutable `offsets` array is cloned on construction so a later caller mutation
  * cannot corrupt apply/redo (mirrors {@link SetPartColor}).
  *
- * `apply` validates BEFORE mutating: the deformer must have a grid warp, the
+ * `apply` validates BEFORE mutating: the deformer must have exactly one grid
+ * warp (several are refused — which driver to write into is ambiguous), the
  * offsets length must equal `grid.points.length`, and `value` must lie within
  * the driving parameter's declared `[min,max]` (fail fast, before
  * `parseIkiModel` would reject it). Prior keyforms are deep-copied once on the
@@ -185,7 +186,8 @@ declare class SetDeformerBindings implements EditCommand {
 /**
  * Reparent a deformer (matrix or warp) under a new parent, or promote it to
  * root (`newParentId === undefined`). Calls {@link validateDeformerReparent}
- * FIRST so invalid reparents (cycles, warp parent, unknown id) throw before any
+ * FIRST so invalid reparents (cycles, warp-under-warp, a pivot outside the new
+ * warp parent's grid, unknown id) throw before any
  * capture or mutation — a throwing apply leaves the model and undo stack
  * untouched.
  *
@@ -1181,8 +1183,10 @@ declare function uvRectFor(placement: AtlasPlacement, page: {
 /**
  * Validate that reparenting `deformerId` under `newParentId` keeps the deformer
  * hierarchy valid. Pass `newParentId === undefined` to move to root (always legal).
- * Checks: existence, self-reference, undeclared parent, kind constraint (warp
- * deformers cannot be parents), and cycle detection via the proposed edge.
+ * Checks: existence, self-reference, undeclared parent, kind constraint (a warp
+ * deformer cannot be the parent of another warp deformer), a matrix deformer's
+ * pivot inside its new warp parent's rest grid, and cycle detection via the
+ * proposed edge.
  */
 declare function validateDeformerReparent(deformers: IkiDeformer[], deformerId: string, newParentId: string | undefined): void;
 /**

package/dist/index.d.ts

@@ -73,11 +73,12 @@ declare class SetPartTransform extends FieldCommand<number | undefined> {
 }
 /**
  * Capture the warp deformer's grid as one keyform at the driving parameter
- * `value`, upserting `offsets` into `warps[0].keyforms`. The 4-tuple-style
+ * `value`, upserting `offsets` into the deformer's single grid warp. The 4-tuple-style
  * mutable `offsets` array is cloned on construction so a later caller mutation
  * cannot corrupt apply/redo (mirrors {@link SetPartColor}).
  *
- * `apply` validates BEFORE mutating: the deformer must have a grid warp, the
+ * `apply` validates BEFORE mutating: the deformer must have exactly one grid
+ * warp (several are refused — which driver to write into is ambiguous), the
  * offsets length must equal `grid.points.length`, and `value` must lie within
  * the driving parameter's declared `[min,max]` (fail fast, before
  * `parseIkiModel` would reject it). Prior keyforms are deep-copied once on the
@@ -185,7 +186,8 @@ declare class SetDeformerBindings implements EditCommand {
 /**
  * Reparent a deformer (matrix or warp) under a new parent, or promote it to
  * root (`newParentId === undefined`). Calls {@link validateDeformerReparent}
- * FIRST so invalid reparents (cycles, warp parent, unknown id) throw before any
+ * FIRST so invalid reparents (cycles, warp-under-warp, a pivot outside the new
+ * warp parent's grid, unknown id) throw before any
  * capture or mutation — a throwing apply leaves the model and undo stack
  * untouched.
  *
@@ -1181,8 +1183,10 @@ declare function uvRectFor(placement: AtlasPlacement, page: {
 /**
  * Validate that reparenting `deformerId` under `newParentId` keeps the deformer
  * hierarchy valid. Pass `newParentId === undefined` to move to root (always legal).
- * Checks: existence, self-reference, undeclared parent, kind constraint (warp
- * deformers cannot be parents), and cycle detection via the proposed edge.
+ * Checks: existence, self-reference, undeclared parent, kind constraint (a warp
+ * deformer cannot be the parent of another warp deformer), a matrix deformer's
+ * pivot inside its new warp parent's rest grid, and cycle detection via the
+ * proposed edge.
  */
 declare function validateDeformerReparent(deformers: IkiDeformer[], deformerId: string, newParentId: string | undefined): void;
 /**

package/dist/index.js

@@ -520,11 +520,24 @@ function validateDeformerReparent(deformers2, deformerId, newParentId) {
       `deformers."${deformerId}".parent "${newParentId}" is not a declared deformer`
     );
   }
-  if (kindOf(parent) === "warp") {
+  if (kindOf(parent) === "warp" && kindOf(target) === "warp") {
     throw new Error(
-      `deformers."${deformerId}".parent "${newParentId}" must be a matrix deformer (warp deformers cannot be parents)`
+      `deformers."${deformerId}".parent "${newParentId}" must be a matrix deformer (warp deformers cannot be nested under a warp deformer)`
     );
   }
+  if (parent.kind === "warp" && target.kind !== "warp") {
+    const { pivot } = target;
+    const { cols, rows, points } = parent.grid;
+    const xMin = points[0];
+    const xMax = points[2 * cols];
+    const yMax = points[1];
+    const yMin = points[rows * (cols + 1) * 2 + 1];
+    if (pivot.x < xMin || pivot.x > xMax || pivot.y < yMin || pivot.y > yMax) {
+      throw new Error(
+        `deformers."${deformerId}".pivot (${pivot.x}, ${pivot.y}) lies outside its warp parent "${newParentId}" rest grid x ${xMin}..${xMax}, y ${yMin}..${yMax}`
+      );
+    }
+  }
   const parentOf = /* @__PURE__ */ new Map();
   for (const d of deformers2) {
     if (d.parent !== void 0) parentOf.set(d.id, d.parent);
@@ -708,6 +721,12 @@ var CaptureGridKeyform = class {
   prevKeyforms;
   apply(doc) {
     const deformer = doc.findWarpDeformer(this.deformerId);
+    const count = deformer.warps?.length ?? 0;
+    if (count > 1) {
+      throw new Error(
+        `deformers."${this.deformerId}".warps: ${count} grid warps \u2014 capture targets a deformer with exactly one grid warp (which entry to write into is ambiguous)`
+      );
+    }
     const warp = deformer.warps?.[0];
     if (!warp) {
       throw new Error(