@pooder/kit 4.0.0 → 4.1.0

package/src/coordinate.ts

@@ -1,106 +1,106 @@
-export interface Point {
-  x: number;
-  y: number;
-}
-
-export interface Size {
-  width: number;
-  height: number;
-}
-
-export type Unit = "px" | "mm" | "cm" | "in";
-
-export interface Layout {
-  scale: number;
-  offsetX: number;
-  offsetY: number;
-  width: number;
-  height: number;
-}
-
-export class Coordinate {
-  /**
-   * Calculate layout to fit content within container while preserving aspect ratio.
-   */
-  static calculateLayout(
-    container: Size,
-    content: Size,
-    padding: number = 0,
-  ): Layout {
-    const availableWidth = Math.max(0, container.width - padding * 2);
-    const availableHeight = Math.max(0, container.height - padding * 2);
-
-    if (content.width === 0 || content.height === 0) {
-      return { scale: 1, offsetX: 0, offsetY: 0, width: 0, height: 0 };
-    }
-
-    const scaleX = availableWidth / content.width;
-    const scaleY = availableHeight / content.height;
-    const scale = Math.min(scaleX, scaleY);
-
-    const width = content.width * scale;
-    const height = content.height * scale;
-
-    const offsetX = (container.width - width) / 2;
-    const offsetY = (container.height - height) / 2;
-
-    return { scale, offsetX, offsetY, width, height };
-  }
-
-  /**
-   * Convert an absolute value to a normalized value (0-1).
-   * @param value Absolute value (e.g., pixels)
-   * @param total Total dimension size (e.g., canvas width)
-   */
-  static toNormalized(value: number, total: number): number {
-    return total === 0 ? 0 : value / total;
-  }
-
-  /**
-   * Convert a normalized value (0-1) to an absolute value.
-   * @param normalized Normalized value (0-1)
-   * @param total Total dimension size (e.g., canvas width)
-   */
-  static toAbsolute(normalized: number, total: number): number {
-    return normalized * total;
-  }
-
-  /**
-   * Normalize a point's coordinates.
-   */
-  static normalizePoint(point: Point, size: Size): Point {
-    return {
-      x: this.toNormalized(point.x, size.width),
-      y: this.toNormalized(point.y, size.height),
-    };
-  }
-
-  /**
-   * Denormalize a point's coordinates to absolute pixels.
-   */
-  static denormalizePoint(point: Point, size: Size): Point {
-    return {
-      x: this.toAbsolute(point.x, size.width),
-      y: this.toAbsolute(point.y, size.height),
-    };
-  }
-
-  static convertUnit(value: number, from: Unit, to: Unit): number {
-    if (from === to) return value;
-    
-    // Base unit: mm
-    const toMM: Record<Unit, number> = {
-      px: 0.264583, // 1px = 0.264583mm (96 DPI)
-      mm: 1,
-      cm: 10,
-      in: 25.4
-    };
-
-    const mmValue = value * (from === 'px' ? toMM.px : toMM[from] || 1);
-    
-    if (to === 'px') {
-        return mmValue / toMM.px;
-    }
-    return mmValue / (toMM[to] || 1);
-  }
-}
+export interface Point {
+  x: number;
+  y: number;
+}
+
+export interface Size {
+  width: number;
+  height: number;
+}
+
+export type Unit = "px" | "mm" | "cm" | "in";
+
+export interface Layout {
+  scale: number;
+  offsetX: number;
+  offsetY: number;
+  width: number;
+  height: number;
+}
+
+export class Coordinate {
+  /**
+   * Calculate layout to fit content within container while preserving aspect ratio.
+   */
+  static calculateLayout(
+    container: Size,
+    content: Size,
+    padding: number = 0,
+  ): Layout {
+    const availableWidth = Math.max(0, container.width - padding * 2);
+    const availableHeight = Math.max(0, container.height - padding * 2);
+
+    if (content.width === 0 || content.height === 0) {
+      return { scale: 1, offsetX: 0, offsetY: 0, width: 0, height: 0 };
+    }
+
+    const scaleX = availableWidth / content.width;
+    const scaleY = availableHeight / content.height;
+    const scale = Math.min(scaleX, scaleY);
+
+    const width = content.width * scale;
+    const height = content.height * scale;
+
+    const offsetX = (container.width - width) / 2;
+    const offsetY = (container.height - height) / 2;
+
+    return { scale, offsetX, offsetY, width, height };
+  }
+
+  /**
+   * Convert an absolute value to a normalized value (0-1).
+   * @param value Absolute value (e.g., pixels)
+   * @param total Total dimension size (e.g., canvas width)
+   */
+  static toNormalized(value: number, total: number): number {
+    return total === 0 ? 0 : value / total;
+  }
+
+  /**
+   * Convert a normalized value (0-1) to an absolute value.
+   * @param normalized Normalized value (0-1)
+   * @param total Total dimension size (e.g., canvas width)
+   */
+  static toAbsolute(normalized: number, total: number): number {
+    return normalized * total;
+  }
+
+  /**
+   * Normalize a point's coordinates.
+   */
+  static normalizePoint(point: Point, size: Size): Point {
+    return {
+      x: this.toNormalized(point.x, size.width),
+      y: this.toNormalized(point.y, size.height),
+    };
+  }
+
+  /**
+   * Denormalize a point's coordinates to absolute pixels.
+   */
+  static denormalizePoint(point: Point, size: Size): Point {
+    return {
+      x: this.toAbsolute(point.x, size.width),
+      y: this.toAbsolute(point.y, size.height),
+    };
+  }
+
+  static convertUnit(value: number, from: Unit, to: Unit): number {
+    if (from === to) return value;
+    
+    // Base unit: mm
+    const toMM: Record<Unit, number> = {
+      px: 0.264583, // 1px = 0.264583mm (96 DPI)
+      mm: 1,
+      cm: 10,
+      in: 25.4
+    };
+
+    const mmValue = value * (from === 'px' ? toMM.px : toMM[from] || 1);
+    
+    if (to === 'px') {
+        return mmValue / toMM.px;
+    }
+    return mmValue / (toMM[to] || 1);
+  }
+}

package/src/dieline.ts

@@ -16,6 +16,7 @@ import {
   getPathBounds,
   DielineFeature,
 } from "./geometry";
+import { ConstraintRegistry } from "./constraints";
 
 export interface DielineGeometry {
   shape: "rect" | "circle" | "ellipse" | "custom";
@@ -332,6 +333,40 @@ export class DielineTool implements Extension {
         },
       ] as ConfigurationContribution[],
       [ContributionPointIds.COMMANDS]: [
+        {
+          command: "updateFeaturePosition",
+          title: "Update Feature Position",
+          handler: (groupId: string, x: number, y: number) => {
+            const configService = this.context?.services.get<any>(
+              "ConfigurationService",
+            );
+            if (!configService) return;
+
+            const features = configService.get("dieline.features") || [];
+            const dielineWidth = configService.get("dieline.width") || 500;
+            const dielineHeight = configService.get("dieline.height") || 500;
+
+            let changed = false;
+            const newFeatures = features.map((f: any) => {
+              if (f.groupId === groupId) {
+                const constrained = ConstraintRegistry.apply(x, y, f, {
+                  dielineWidth,
+                  dielineHeight,
+                });
+
+                if (f.x !== constrained.x || f.y !== constrained.y) {
+                  changed = true;
+                  return { ...f, x: constrained.x, y: constrained.y };
+                }
+              }
+              return f;
+            });
+
+            if (changed) {
+              configService.update("dieline.features", newFeatures);
+            }
+          },
+        },
         {
           command: "getGeometry",
           title: "Get Geometry",

package/src/feature.ts

@@ -15,6 +15,7 @@ import {
   resolveFeaturePosition,
 } from "./geometry";
 import { Coordinate } from "./coordinate";
+import { ConstraintRegistry } from "./constraints";
 
 export class FeatureTool implements Extension {
   id = "pooder.kit.feature";
@@ -435,6 +436,30 @@ export class FeatureTool implements Extension {
     limit: number,
     feature?: DielineFeature
   ): { x: number; y: number } {
+    if (feature && feature.constraints) {
+      // Use Constraint Registry
+      // Convert to normalized coordinates
+      const minX = geometry.x - geometry.width / 2;
+      const minY = geometry.y - geometry.height / 2;
+      
+      const nx = geometry.width > 0 ? (p.x - minX) / geometry.width : 0.5;
+      const ny = geometry.height > 0 ? (p.y - minY) / geometry.height : 0.5;
+
+      const scale = geometry.scale || 1;
+      const dielineWidth = geometry.width / scale;
+      const dielineHeight = geometry.height / scale;
+
+      const constrained = ConstraintRegistry.apply(nx, ny, feature, {
+        dielineWidth,
+        dielineHeight,
+      });
+
+      return {
+        x: minX + constrained.x * geometry.width,
+        y: minY + constrained.y * geometry.height,
+      };
+    }
+
     if (feature && feature.placement === "internal") {
        // Constrain to bounds
        // geometry.x/y is center

package/src/film.ts

@@ -1,194 +1,194 @@
-import {
-  Extension,
-  ExtensionContext,
-  ContributionPointIds,
-  CommandContribution,
-  ConfigurationContribution,
-} from "@pooder/core";
-import { FabricImage as Image } from "fabric";
-import CanvasService from "./CanvasService";
-
-export class FilmTool implements Extension {
-  id = "pooder.kit.film";
-
-  public metadata = {
-    name: "FilmTool",
-  };
-
-  private url: string = "";
-  private opacity: number = 0.5;
-
-  private canvasService?: CanvasService;
-
-  constructor(
-    options?: Partial<{
-      url: string;
-      opacity: number;
-    }>,
-  ) {
-    if (options) {
-      Object.assign(this, options);
-    }
-  }
-
-  activate(context: ExtensionContext) {
-    this.canvasService = context.services.get<CanvasService>("CanvasService");
-    if (!this.canvasService) {
-      console.warn("CanvasService not found for FilmTool");
-      return;
-    }
-
-    const configService = context.services.get<any>("ConfigurationService");
-    if (configService) {
-      // Load initial config
-      this.url = configService.get("film.url", this.url);
-      this.opacity = configService.get("film.opacity", this.opacity);
-
-      // Listen for changes
-      configService.onAnyChange((e: { key: string; value: any }) => {
-        if (e.key.startsWith("film.")) {
-          const prop = e.key.split(".")[1];
-          console.log(
-            `[FilmTool] Config change detected: ${e.key} -> ${e.value}`,
-          );
-          if (prop && prop in this) {
-            (this as any)[prop] = e.value;
-            this.updateFilm();
-          }
-        }
-      });
-    }
-
-    this.initLayer();
-    this.updateFilm();
-  }
-
-  deactivate(context: ExtensionContext) {
-    if (this.canvasService) {
-      const layer = this.canvasService.getLayer("overlay");
-      if (layer) {
-        const img = this.canvasService.getObject("film-image", "overlay");
-        if (img) {
-          layer.remove(img);
-          this.canvasService.requestRenderAll();
-        }
-      }
-      this.canvasService = undefined;
-    }
-  }
-
-  contribute() {
-    return {
-      [ContributionPointIds.CONFIGURATIONS]: [
-        {
-          id: "film.url",
-          type: "string",
-          label: "Film Image URL",
-          default: "",
-        },
-        {
-          id: "film.opacity",
-          type: "number",
-          label: "Opacity",
-          min: 0,
-          max: 1,
-          step: 0.1,
-          default: 0.5,
-        },
-      ] as ConfigurationContribution[],
-      [ContributionPointIds.COMMANDS]: [
-        {
-          command: "setFilmImage",
-          title: "Set Film Image",
-          handler: (url: string, opacity: number) => {
-            if (this.url === url && this.opacity === opacity) return true;
-
-            this.url = url;
-            this.opacity = opacity;
-
-            this.updateFilm();
-
-            return true;
-          },
-        },
-      ] as CommandContribution[],
-    };
-  }
-
-  private initLayer() {
-    if (!this.canvasService) return;
-    let overlayLayer = this.canvasService.getLayer("overlay");
-    if (!overlayLayer) {
-      const width = this.canvasService.canvas.width || 800;
-      const height = this.canvasService.canvas.height || 600;
-
-      const layer = this.canvasService.createLayer("overlay", {
-        width,
-        height,
-        left: 0,
-        top: 0,
-        originX: "left",
-        originY: "top",
-        selectable: false,
-        evented: false,
-        subTargetCheck: false,
-        interactive: false,
-      });
-
-      this.canvasService.canvas.bringObjectToFront(layer);
-    }
-  }
-
-  private async updateFilm() {
-    if (!this.canvasService) return;
-    const layer = this.canvasService.getLayer("overlay");
-    if (!layer) {
-      console.warn("[FilmTool] Overlay layer not found");
-      return;
-    }
-
-    const { url, opacity } = this;
-
-    if (!url) {
-      const img = this.canvasService.getObject("film-image", "overlay");
-      if (img) {
-        layer.remove(img);
-        this.canvasService.requestRenderAll();
-      }
-      return;
-    }
-
-    const width = this.canvasService.canvas.width || 800;
-    const height = this.canvasService.canvas.height || 600;
-
-    let img = this.canvasService.getObject("film-image", "overlay") as Image;
-    try {
-      if (img) {
-        if (img.getSrc() !== url) {
-          await img.setSrc(url);
-        }
-        img.set({ opacity });
-      } else {
-        img = await Image.fromURL(url, { crossOrigin: "anonymous" });
-        img.scaleToWidth(width);
-        if (img.getScaledHeight() < height) img.scaleToHeight(height);
-        img.set({
-          originX: "left",
-          originY: "top",
-          left: 0,
-          top: 0,
-          opacity,
-          selectable: false,
-          evented: false,
-          data: { id: "film-image" },
-        });
-        layer.add(img);
-      }
-      this.canvasService.requestRenderAll();
-    } catch (error) {
-      console.error("[FilmTool] Failed to load film image", url, error);
-    }
-    layer.dirty = true;
-    this.canvasService.requestRenderAll();
-  }
-}
+import {
+  Extension,
+  ExtensionContext,
+  ContributionPointIds,
+  CommandContribution,
+  ConfigurationContribution,
+} from "@pooder/core";
+import { FabricImage as Image } from "fabric";
+import CanvasService from "./CanvasService";
+
+export class FilmTool implements Extension {
+  id = "pooder.kit.film";
+
+  public metadata = {
+    name: "FilmTool",
+  };
+
+  private url: string = "";
+  private opacity: number = 0.5;
+
+  private canvasService?: CanvasService;
+
+  constructor(
+    options?: Partial<{
+      url: string;
+      opacity: number;
+    }>,
+  ) {
+    if (options) {
+      Object.assign(this, options);
+    }
+  }
+
+  activate(context: ExtensionContext) {
+    this.canvasService = context.services.get<CanvasService>("CanvasService");
+    if (!this.canvasService) {
+      console.warn("CanvasService not found for FilmTool");
+      return;
+    }
+
+    const configService = context.services.get<any>("ConfigurationService");
+    if (configService) {
+      // Load initial config
+      this.url = configService.get("film.url", this.url);
+      this.opacity = configService.get("film.opacity", this.opacity);
+
+      // Listen for changes
+      configService.onAnyChange((e: { key: string; value: any }) => {
+        if (e.key.startsWith("film.")) {
+          const prop = e.key.split(".")[1];
+          console.log(
+            `[FilmTool] Config change detected: ${e.key} -> ${e.value}`,
+          );
+          if (prop && prop in this) {
+            (this as any)[prop] = e.value;
+            this.updateFilm();
+          }
+        }
+      });
+    }
+
+    this.initLayer();
+    this.updateFilm();
+  }
+
+  deactivate(context: ExtensionContext) {
+    if (this.canvasService) {
+      const layer = this.canvasService.getLayer("overlay");
+      if (layer) {
+        const img = this.canvasService.getObject("film-image", "overlay");
+        if (img) {
+          layer.remove(img);
+          this.canvasService.requestRenderAll();
+        }
+      }
+      this.canvasService = undefined;
+    }
+  }
+
+  contribute() {
+    return {
+      [ContributionPointIds.CONFIGURATIONS]: [
+        {
+          id: "film.url",
+          type: "string",
+          label: "Film Image URL",
+          default: "",
+        },
+        {
+          id: "film.opacity",
+          type: "number",
+          label: "Opacity",
+          min: 0,
+          max: 1,
+          step: 0.1,
+          default: 0.5,
+        },
+      ] as ConfigurationContribution[],
+      [ContributionPointIds.COMMANDS]: [
+        {
+          command: "setFilmImage",
+          title: "Set Film Image",
+          handler: (url: string, opacity: number) => {
+            if (this.url === url && this.opacity === opacity) return true;
+
+            this.url = url;
+            this.opacity = opacity;
+
+            this.updateFilm();
+
+            return true;
+          },
+        },
+      ] as CommandContribution[],
+    };
+  }
+
+  private initLayer() {
+    if (!this.canvasService) return;
+    let overlayLayer = this.canvasService.getLayer("overlay");
+    if (!overlayLayer) {
+      const width = this.canvasService.canvas.width || 800;
+      const height = this.canvasService.canvas.height || 600;
+
+      const layer = this.canvasService.createLayer("overlay", {
+        width,
+        height,
+        left: 0,
+        top: 0,
+        originX: "left",
+        originY: "top",
+        selectable: false,
+        evented: false,
+        subTargetCheck: false,
+        interactive: false,
+      });
+
+      this.canvasService.canvas.bringObjectToFront(layer);
+    }
+  }
+
+  private async updateFilm() {
+    if (!this.canvasService) return;
+    const layer = this.canvasService.getLayer("overlay");
+    if (!layer) {
+      console.warn("[FilmTool] Overlay layer not found");
+      return;
+    }
+
+    const { url, opacity } = this;
+
+    if (!url) {
+      const img = this.canvasService.getObject("film-image", "overlay");
+      if (img) {
+        layer.remove(img);
+        this.canvasService.requestRenderAll();
+      }
+      return;
+    }
+
+    const width = this.canvasService.canvas.width || 800;
+    const height = this.canvasService.canvas.height || 600;
+
+    let img = this.canvasService.getObject("film-image", "overlay") as Image;
+    try {
+      if (img) {
+        if (img.getSrc() !== url) {
+          await img.setSrc(url);
+        }
+        img.set({ opacity });
+      } else {
+        img = await Image.fromURL(url, { crossOrigin: "anonymous" });
+        img.scaleToWidth(width);
+        if (img.getScaledHeight() < height) img.scaleToHeight(height);
+        img.set({
+          originX: "left",
+          originY: "top",
+          left: 0,
+          top: 0,
+          opacity,
+          selectable: false,
+          evented: false,
+          data: { id: "film-image" },
+        });
+        layer.add(img);
+      }
+      this.canvasService.requestRenderAll();
+    } catch (error) {
+      console.error("[FilmTool] Failed to load film image", url, error);
+    }
+    layer.dirty = true;
+    this.canvasService.requestRenderAll();
+  }
+}