@pooder/kit 6.2.0 → 6.2.1

package/.test-dist/src/extensions/dieline/DielineTool.js

@@ -11,6 +11,7 @@ const commands_1 = require("./commands");
 const config_1 = require("./config");
 const model_1 = require("./model");
 const renderBuilder_1 = require("./renderBuilder");
+const featurePlacement_1 = require("../featurePlacement");
 class DielineTool {
     constructor(options) {
         this.id = "pooder.kit.dieline";
@@ -250,15 +251,27 @@ class DielineTool {
         const visualRadius = radius * scale;
         const visualOffset = (cutW - sceneLayout.trimRect.width) / 2;
         const cutR = visualRadius === 0 ? 0 : Math.max(0, visualRadius + visualOffset);
-        const absoluteFeatures = (features || []).map((f) => ({
-            ...f,
-            x: f.x,
-            y: f.y,
-            width: (f.width || 0) * scale,
-            height: (f.height || 0) * scale,
-            radius: (f.radius || 0) * scale,
-        }));
-        const cutFeatures = absoluteFeatures.filter((f) => !f.skipCut);
+        const placements = (0, featurePlacement_1.resolveFeaturePlacements)(features || [], {
+            shape,
+            shapeStyle,
+            pathData,
+            customSourceWidthPx: this.state.customSourceWidthPx,
+            customSourceHeightPx: this.state.customSourceHeightPx,
+            canvasWidth: canvasW,
+            canvasHeight: canvasH,
+            x: cx,
+            y: cy,
+            width: sceneLayout.trimRect.width,
+            height: sceneLayout.trimRect.height,
+            radius: visualRadius,
+            scale,
+        });
+        const cutFeatures = (0, featurePlacement_1.projectPlacedFeatures)(placements.filter((placement) => !placement.feature.skipCut), {
+            x: cx,
+            y: cy,
+            width: cutW,
+            height: cutH,
+        }, scale);
         const generatedPathData = (0, geometry_1.generateDielinePath)({
             shape,
             width: cutW,

package/.test-dist/src/extensions/dieline/renderBuilder.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildDielineRenderBundle = buildDielineRenderBundle;
 const geometry_1 = require("../geometry");
+const featurePlacement_1 = require("../featurePlacement");
 const layers_1 = require("../../shared/constants/layers");
 const DEFAULT_IDS = {
     inside: "dieline.inside",
@@ -11,16 +12,6 @@ const DEFAULT_IDS = {
     clip: "dieline.clip.image",
     clipSource: "dieline.effect.clip-path",
 };
-function scaleFeatures(state, scale) {
-    return (state.features || []).map((feature) => ({
-        ...feature,
-        x: feature.x,
-        y: feature.y,
-        width: (feature.width || 0) * scale,
-        height: (feature.height || 0) * scale,
-        radius: (feature.radius || 0) * scale,
-    }));
-}
 function buildDielineRenderBundle(options) {
     const ids = { ...DEFAULT_IDS, ...(options.ids || {}) };
     const { state, sceneLayout, canvasWidth, canvasHeight, hasImages, createHatchPattern, includeImageClipEffect = true, clipTargetPassIds = [layers_1.IMAGE_OBJECT_LAYER_ID], clipVisibility, } = options;
@@ -35,8 +26,33 @@ function buildDielineRenderBundle(options) {
     const cutH = sceneLayout.cutRect.height;
     const visualOffset = (cutW - visualWidth) / 2;
     const cutR = visualRadius === 0 ? 0 : Math.max(0, visualRadius + visualOffset);
-    const absoluteFeatures = scaleFeatures(state, scale);
-    const cutFeatures = absoluteFeatures.filter((feature) => !feature.skipCut);
+    const placements = (0, featurePlacement_1.resolveFeaturePlacements)(state.features || [], {
+        shape,
+        shapeStyle,
+        pathData: state.pathData,
+        customSourceWidthPx: state.customSourceWidthPx,
+        customSourceHeightPx: state.customSourceHeightPx,
+        canvasWidth,
+        canvasHeight,
+        x: cx,
+        y: cy,
+        width: visualWidth,
+        height: visualHeight,
+        radius: visualRadius,
+        scale,
+    });
+    const absoluteFeatures = (0, featurePlacement_1.projectPlacedFeatures)(placements, {
+        x: cx,
+        y: cy,
+        width: visualWidth,
+        height: visualHeight,
+    }, scale);
+    const cutFeatures = (0, featurePlacement_1.projectPlacedFeatures)(placements.filter((placement) => !placement.feature.skipCut), {
+        x: cx,
+        y: cy,
+        width: cutW,
+        height: cutH,
+    }, scale);
     const common = {
         shape,
         shapeStyle,

package/.test-dist/src/extensions/feature/FeatureTool.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FeatureTool = void 0;
 const core_1 = require("@pooder/core");
 const fabric_1 = require("fabric");
-const geometry_1 = require("../geometry");
 const constraints_1 = require("../constraints");
 const featureComplete_1 = require("../featureComplete");
+const featurePlacement_1 = require("../featurePlacement");
 const sceneLayoutModel_1 = require("../../shared/scene/sceneLayoutModel");
 const layers_1 = require("../../shared/constants/layers");
 const subscriptions_1 = require("../../shared/runtime/subscriptions");
@@ -726,9 +726,26 @@ class FeatureTool {
         }
         const groups = new Map();
         const singles = [];
-        this.workingFeatures.forEach((feature, index) => {
+        const placements = (0, featurePlacement_1.resolveFeaturePlacements)(this.workingFeatures, {
+            shape: this.currentGeometry.shape,
+            shapeStyle: this.currentGeometry.shapeStyle,
+            pathData: this.currentGeometry.pathData,
+            customSourceWidthPx: this.currentGeometry.customSourceWidthPx,
+            customSourceHeightPx: this.currentGeometry.customSourceHeightPx,
+            x: this.currentGeometry.x,
+            y: this.currentGeometry.y,
+            width: this.currentGeometry.width,
+            height: this.currentGeometry.height,
+            radius: this.currentGeometry.radius,
+            scale: this.currentGeometry.scale || 1,
+        });
+        placements.forEach((placement, index) => {
+            const feature = placement.feature;
             const geometry = this.getGeometryForFeature(this.currentGeometry, feature);
-            const position = (0, geometry_1.resolveFeaturePosition)(feature, geometry);
+            const position = {
+                x: placement.centerX,
+                y: placement.centerY,
+            };
             const scale = geometry.scale || 1;
             const marker = {
                 feature,

package/.test-dist/src/extensions/featureCoordinates.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveFeaturePosition = resolveFeaturePosition;
+exports.normalizePointInGeometry = normalizePointInGeometry;
+function resolveFeaturePosition(feature, geometry) {
+    const { x, y, width, height } = geometry;
+    const left = x - width / 2;
+    const top = y - height / 2;
+    return {
+        x: left + feature.x * width,
+        y: top + feature.y * height,
+    };
+}
+function normalizePointInGeometry(point, geometry) {
+    const left = geometry.x - geometry.width / 2;
+    const top = geometry.y - geometry.height / 2;
+    return {
+        x: geometry.width > 0 ? (point.x - left) / geometry.width : 0.5,
+        y: geometry.height > 0 ? (point.y - top) / geometry.height : 0.5,
+    };
+}

package/.test-dist/src/extensions/featurePlacement.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveFeaturePlacements = resolveFeaturePlacements;
+exports.projectPlacedFeatures = projectPlacedFeatures;
+const constraints_1 = require("./constraints");
+const featureCoordinates_1 = require("./featureCoordinates");
+function scaleFeatureForRender(feature, scale, x, y) {
+    return {
+        ...feature,
+        x,
+        y,
+        width: feature.width !== undefined ? feature.width * scale : undefined,
+        height: feature.height !== undefined ? feature.height * scale : undefined,
+        radius: feature.radius !== undefined ? feature.radius * scale : undefined,
+    };
+}
+function resolveFeaturePlacements(features, geometry) {
+    const dielineWidth = geometry.scale > 0 ? geometry.width / geometry.scale : geometry.width;
+    const dielineHeight = geometry.scale > 0 ? geometry.height / geometry.scale : geometry.height;
+    return (features || []).map((feature) => {
+        const activeConstraints = feature.constraints?.filter((constraint) => !constraint.validateOnly);
+        const constrained = constraints_1.ConstraintRegistry.apply(feature.x, feature.y, feature, {
+            dielineWidth,
+            dielineHeight,
+            geometry,
+        }, activeConstraints);
+        const center = (0, featureCoordinates_1.resolveFeaturePosition)({
+            ...feature,
+            x: constrained.x,
+            y: constrained.y,
+        }, geometry);
+        return {
+            feature,
+            normalizedX: constrained.x,
+            normalizedY: constrained.y,
+            centerX: center.x,
+            centerY: center.y,
+        };
+    });
+}
+function projectPlacedFeatures(placements, geometry, scale) {
+    return placements.map((placement) => {
+        const normalized = (0, featureCoordinates_1.normalizePointInGeometry)({ x: placement.centerX, y: placement.centerY }, geometry);
+        return scaleFeatureForRender(placement.feature, scale, normalized.x, normalized.y);
+    });
+}

package/.test-dist/src/extensions/ruler/RulerTool.js

@@ -13,6 +13,7 @@ const DEFAULT_FONT_SIZE = 10;
 const DEFAULT_BACKGROUND_COLOR = "#f0f0f0";
 const DEFAULT_TEXT_COLOR = "#333333";
 const DEFAULT_LINE_COLOR = "#999999";
+const RULER_DEBUG_KEY = "ruler.debug";
 const RULER_THICKNESS_MIN = 10;
 const RULER_THICKNESS_MAX = 100;
 const RULER_GAP_MIN = 0;
@@ -31,6 +32,7 @@ class RulerTool {
         this.textColor = DEFAULT_TEXT_COLOR;
         this.lineColor = DEFAULT_LINE_COLOR;
         this.fontSize = DEFAULT_FONT_SIZE;
+        this.debugEnabled = false;
         this.renderSeq = 0;
         this.numericProps = new Set(["thickness", "gap", "fontSize"]);
         this.specs = [];
@@ -72,7 +74,15 @@ class RulerTool {
             this.syncConfig(configService);
             configService.onAnyChange((e) => {
                 let shouldUpdate = false;
-                if (e.key.startsWith("ruler.")) {
+                if (e.key === RULER_DEBUG_KEY) {
+                    this.debugEnabled = e.value === true;
+                    this.log("config:update", {
+                        key: e.key,
+                        raw: e.value,
+                        normalized: this.debugEnabled,
+                    });
+                }
+                else if (e.key.startsWith("ruler.")) {
                     const prop = e.key.split(".")[1];
                     if (prop && prop in this) {
                         if (this.numericProps.has(prop)) {
@@ -158,6 +168,12 @@ class RulerTool {
                     max: RULER_FONT_SIZE_MAX,
                     default: DEFAULT_FONT_SIZE,
                 },
+                {
+                    id: RULER_DEBUG_KEY,
+                    type: "boolean",
+                    label: "Ruler Debug Log",
+                    default: false,
+                },
             ],
             [core_1.ContributionPointIds.COMMANDS]: [
                 {
@@ -187,7 +203,12 @@ class RulerTool {
             ],
         };
     }
+    isDebugEnabled() {
+        return this.debugEnabled;
+    }
     log(step, payload) {
+        if (!this.isDebugEnabled())
+            return;
         if (payload) {
             console.debug(`[RulerTool] ${step}`, payload);
             return;
@@ -201,6 +222,8 @@ class RulerTool {
         this.textColor = configService.get("ruler.textColor", this.textColor);
         this.lineColor = configService.get("ruler.lineColor", this.lineColor);
         this.fontSize = this.toFiniteNumber(configService.get("ruler.fontSize", this.fontSize), DEFAULT_FONT_SIZE);
+        this.debugEnabled =
+            configService.get(RULER_DEBUG_KEY, this.debugEnabled) === true;
         this.log("config:loaded", {
             thickness: this.thickness,
             gap: this.gap,

package/.test-dist/tests/run.js

@@ -11,6 +11,7 @@ const commands_2 = require("../src/extensions/white-ink/commands");
 const config_2 = require("../src/extensions/white-ink/config");
 const commands_3 = require("../src/extensions/dieline/commands");
 const config_3 = require("../src/extensions/dieline/config");
+const featureCoordinates_1 = require("../src/extensions/featureCoordinates");
 function assert(condition, message) {
     if (!condition)
         throw new Error(message);
@@ -91,6 +92,29 @@ function testEdgeScale() {
     assert(width === 140, `expected width 140, got ${width}`);
     assert(height === 80, `expected height 80, got ${height}`);
 }
+function testFeaturePlacementProjection() {
+    const trimGeometry = {
+        x: 100,
+        y: 120,
+        width: 120,
+        height: 180,
+    };
+    const cutGeometry = {
+        x: 100,
+        y: 120,
+        width: 150,
+        height: 210,
+    };
+    const trimFeature = {
+        x: 0.82,
+        y: 0.68,
+    };
+    const trimCenter = (0, featureCoordinates_1.resolveFeaturePosition)(trimFeature, trimGeometry);
+    const cutFeature = (0, featureCoordinates_1.normalizePointInGeometry)(trimCenter, cutGeometry);
+    const cutCenter = (0, featureCoordinates_1.resolveFeaturePosition)(cutFeature, cutGeometry);
+    assert(Math.abs(trimCenter.x - cutCenter.x) < 1e-6, `expected projected feature x to stay fixed, got ${trimCenter.x} vs ${cutCenter.x}`);
+    assert(Math.abs(trimCenter.y - cutCenter.y) < 1e-6, `expected projected feature y to stay fixed, got ${trimCenter.y} vs ${cutCenter.y}`);
+}
 function testVisibilityDsl() {
     const layers = new Map([
         ["ruler-overlay", { exists: true, objectCount: 2 }],
@@ -259,6 +283,7 @@ function main() {
     testBridgeSelection();
     testMaskOps();
     testEdgeScale();
+    testFeaturePlacementProjection();
     testVisibilityDsl();
     testContributionCompatibility();
     console.log("ok");

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @pooder/kit
 
+## 6.2.1
+
+### Patch Changes
+
+- bugfix
+
 ## 6.2.0
 
 ### Minor Changes

package/dist/index.d.mts

@@ -907,6 +907,7 @@ declare class RulerTool implements Extension {
     private textColor;
     private lineColor;
     private fontSize;
+    private debugEnabled;
     private renderSeq;
     private readonly numericProps;
     private specs;
@@ -928,6 +929,7 @@ declare class RulerTool implements Extension {
         [ContributionPointIds.CONFIGURATIONS]: ConfigurationContribution[];
         [ContributionPointIds.COMMANDS]: CommandContribution[];
     };
+    private isDebugEnabled;
     private log;
     private syncConfig;
     private toFiniteNumber;

package/dist/index.d.ts

@@ -907,6 +907,7 @@ declare class RulerTool implements Extension {
     private textColor;
     private lineColor;
     private fontSize;
+    private debugEnabled;
     private renderSeq;
     private readonly numericProps;
     private specs;
@@ -928,6 +929,7 @@ declare class RulerTool implements Extension {
         [ContributionPointIds.CONFIGURATIONS]: ConfigurationContribution[];
         [ContributionPointIds.COMMANDS]: CommandContribution[];
     };
+    private isDebugEnabled;
     private log;
     private syncConfig;
     private toFiniteNumber;