@pooder/kit 6.0.0 → 6.1.0

package/.test-dist/src/shared/scene/frame.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.emptyFrameRect = emptyFrameRect;
+exports.resolveCutFrameRect = resolveCutFrameRect;
+exports.toLayoutSceneRect = toLayoutSceneRect;
+const sceneLayoutModel_1 = require("./sceneLayoutModel");
+function emptyFrameRect() {
+    return { left: 0, top: 0, width: 0, height: 0 };
+}
+function resolveCutFrameRect(canvasService, configService) {
+    if (!canvasService || !configService) {
+        return emptyFrameRect();
+    }
+    const sizeState = (0, sceneLayoutModel_1.readSizeState)(configService);
+    const layout = (0, sceneLayoutModel_1.computeSceneLayout)(canvasService, sizeState);
+    if (!layout) {
+        return emptyFrameRect();
+    }
+    return canvasService.toSceneRect({
+        left: layout.cutRect.left,
+        top: layout.cutRect.top,
+        width: layout.cutRect.width,
+        height: layout.cutRect.height,
+    });
+}
+function toLayoutSceneRect(rect) {
+    return {
+        left: rect.left,
+        top: rect.top,
+        width: rect.width,
+        height: rect.height,
+        space: "scene",
+    };
+}

package/.test-dist/src/shared/scene/sceneLayoutModel.js

@@ -0,0 +1,202 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sanitizeMmValue = sanitizeMmValue;
+exports.normalizeUnit = normalizeUnit;
+exports.normalizeConstraintMode = normalizeConstraintMode;
+exports.normalizeCutMode = normalizeCutMode;
+exports.toMm = toMm;
+exports.fromMm = fromMm;
+exports.resolvePaddingPx = resolvePaddingPx;
+exports.readSizeState = readSizeState;
+exports.computeSceneLayout = computeSceneLayout;
+exports.buildSceneGeometry = buildSceneGeometry;
+const coordinate_1 = require("../../coordinate");
+const units_1 = require("../../units");
+const dielineShape_1 = require("../../extensions/dielineShape");
+const DEFAULT_SIZE_STATE = {
+    unit: "mm",
+    actualWidthMm: 500,
+    actualHeightMm: 500,
+    constraintMode: "free",
+    aspectRatio: 1,
+    cutMode: "trim",
+    cutMarginMm: 0,
+    viewPadding: 140,
+    minMm: 10,
+    maxMm: 2000,
+    stepMm: 0.1,
+};
+function clamp(value, min, max) {
+    return Math.max(min, Math.min(max, value));
+}
+function roundToStep(value, step) {
+    if (!Number.isFinite(step) || step <= 0)
+        return value;
+    return Math.round(value / step) * step;
+}
+function sanitizeMmValue(valueMm, limits) {
+    if (!Number.isFinite(valueMm))
+        return limits.minMm;
+    const rounded = roundToStep(valueMm, limits.stepMm);
+    return clamp(rounded, limits.minMm, limits.maxMm);
+}
+function normalizeUnit(value) {
+    if (value === "cm" || value === "in")
+        return value;
+    return "mm";
+}
+function normalizeConstraintMode(value) {
+    if (value === "lockAspect" || value === "equal")
+        return value;
+    return "free";
+}
+function normalizeCutMode(value) {
+    if (value === "outset" || value === "inset")
+        return value;
+    return "trim";
+}
+function toMm(value, fromUnit) {
+    return coordinate_1.Coordinate.convertUnit(value, fromUnit, "mm");
+}
+function fromMm(valueMm, toUnit) {
+    return coordinate_1.Coordinate.convertUnit(valueMm, "mm", toUnit);
+}
+function resolvePaddingPx(raw, containerWidth, containerHeight) {
+    if (typeof raw === "number")
+        return Math.max(0, raw);
+    if (typeof raw === "string") {
+        if (raw.endsWith("%")) {
+            const percent = parseFloat(raw) / 100;
+            if (!Number.isFinite(percent))
+                return 0;
+            return Math.max(0, Math.min(containerWidth, containerHeight) * percent);
+        }
+        const fixed = parseFloat(raw);
+        return Number.isFinite(fixed) ? Math.max(0, fixed) : 0;
+    }
+    return 0;
+}
+function readSizeState(configService) {
+    const unit = normalizeUnit(configService.get("size.unit", DEFAULT_SIZE_STATE.unit));
+    const minMm = Math.max(0.1, Number(configService.get("size.minMm", DEFAULT_SIZE_STATE.minMm)));
+    const maxMm = Math.max(minMm, Number(configService.get("size.maxMm", DEFAULT_SIZE_STATE.maxMm)));
+    const stepMm = Math.max(0.001, Number(configService.get("size.stepMm", DEFAULT_SIZE_STATE.stepMm)));
+    const actualWidthMm = sanitizeMmValue((0, units_1.parseLengthToMm)(configService.get("size.actualWidthMm", DEFAULT_SIZE_STATE.actualWidthMm), "mm"), { minMm, maxMm, stepMm });
+    const actualHeightMm = sanitizeMmValue((0, units_1.parseLengthToMm)(configService.get("size.actualHeightMm", DEFAULT_SIZE_STATE.actualHeightMm), "mm"), { minMm, maxMm, stepMm });
+    const aspectRaw = Number(configService.get("size.aspectRatio", DEFAULT_SIZE_STATE.aspectRatio));
+    const aspectRatio = Number.isFinite(aspectRaw) && aspectRaw > 0
+        ? aspectRaw
+        : actualWidthMm / Math.max(0.001, actualHeightMm);
+    const cutMarginMm = Math.max(0, (0, units_1.parseLengthToMm)(configService.get("size.cutMarginMm", DEFAULT_SIZE_STATE.cutMarginMm), "mm"));
+    const viewPadding = configService.get("size.viewPadding", DEFAULT_SIZE_STATE.viewPadding);
+    return {
+        unit,
+        actualWidthMm,
+        actualHeightMm,
+        constraintMode: normalizeConstraintMode(configService.get("size.constraintMode", DEFAULT_SIZE_STATE.constraintMode)),
+        aspectRatio,
+        cutMode: normalizeCutMode(configService.get("size.cutMode", DEFAULT_SIZE_STATE.cutMode)),
+        cutMarginMm,
+        viewPadding,
+        minMm,
+        maxMm,
+        stepMm,
+    };
+}
+function rectByCenter(centerX, centerY, width, height) {
+    return {
+        left: centerX - width / 2,
+        top: centerY - height / 2,
+        width,
+        height,
+        centerX,
+        centerY,
+    };
+}
+function getCutSizeMm(size) {
+    if (size.cutMode === "trim") {
+        return { widthMm: size.actualWidthMm, heightMm: size.actualHeightMm };
+    }
+    const delta = size.cutMarginMm * 2;
+    if (size.cutMode === "outset") {
+        return {
+            widthMm: size.actualWidthMm + delta,
+            heightMm: size.actualHeightMm + delta,
+        };
+    }
+    return {
+        widthMm: Math.max(size.minMm, size.actualWidthMm - delta),
+        heightMm: Math.max(size.minMm, size.actualHeightMm - delta),
+    };
+}
+function computeSceneLayout(canvasService, size) {
+    const canvasWidth = canvasService.canvas.width || 0;
+    const canvasHeight = canvasService.canvas.height || 0;
+    if (canvasWidth <= 0 || canvasHeight <= 0)
+        return null;
+    const { widthMm: cutWidthMm, heightMm: cutHeightMm } = getCutSizeMm(size);
+    const viewWidthMm = Math.max(size.actualWidthMm, cutWidthMm);
+    const viewHeightMm = Math.max(size.actualHeightMm, cutHeightMm);
+    if (!Number.isFinite(viewWidthMm) ||
+        !Number.isFinite(viewHeightMm) ||
+        viewWidthMm <= 0 ||
+        viewHeightMm <= 0) {
+        return null;
+    }
+    const paddingPx = resolvePaddingPx(size.viewPadding, canvasWidth, canvasHeight);
+    canvasService.viewport.updateContainer(canvasWidth, canvasHeight);
+    canvasService.viewport.setPadding(paddingPx);
+    canvasService.viewport.updatePhysical(viewWidthMm, viewHeightMm);
+    const layout = canvasService.viewport.layout;
+    if (!Number.isFinite(layout.scale) ||
+        !Number.isFinite(layout.offsetX) ||
+        !Number.isFinite(layout.offsetY) ||
+        layout.scale <= 0) {
+        return null;
+    }
+    const centerX = layout.offsetX + layout.width / 2;
+    const centerY = layout.offsetY + layout.height / 2;
+    const trimWidthPx = size.actualWidthMm * layout.scale;
+    const trimHeightPx = size.actualHeightMm * layout.scale;
+    const cutWidthPx = cutWidthMm * layout.scale;
+    const cutHeightPx = cutHeightMm * layout.scale;
+    const trimRect = rectByCenter(centerX, centerY, trimWidthPx, trimHeightPx);
+    const cutRect = rectByCenter(centerX, centerY, cutWidthPx, cutHeightPx);
+    const bleedRect = rectByCenter(centerX, centerY, Math.max(trimWidthPx, cutWidthPx), Math.max(trimHeightPx, cutHeightPx));
+    return {
+        scale: layout.scale,
+        canvasWidth,
+        canvasHeight,
+        trimRect,
+        cutRect,
+        bleedRect,
+        trimWidthMm: size.actualWidthMm,
+        trimHeightMm: size.actualHeightMm,
+        cutWidthMm,
+        cutHeightMm,
+        cutMode: size.cutMode,
+        cutMarginMm: size.cutMarginMm,
+    };
+}
+function buildSceneGeometry(configService, layout) {
+    const radiusMm = (0, units_1.parseLengthToMm)(configService.get("dieline.radius", 0), "mm");
+    const offset = (layout.cutRect.width - layout.trimRect.width) / 2;
+    const sourceWidth = Number(configService.get("dieline.customSourceWidthPx", 0));
+    const sourceHeight = Number(configService.get("dieline.customSourceHeightPx", 0));
+    const shapeStyle = (0, dielineShape_1.normalizeShapeStyle)(configService.get("dieline.shapeStyle", dielineShape_1.DEFAULT_DIELINE_SHAPE_STYLE));
+    return {
+        shape: (0, dielineShape_1.normalizeDielineShape)(configService.get("dieline.shape", dielineShape_1.DEFAULT_DIELINE_SHAPE)),
+        shapeStyle,
+        unit: "px",
+        x: layout.trimRect.centerX,
+        y: layout.trimRect.centerY,
+        width: layout.trimRect.width,
+        height: layout.trimRect.height,
+        radius: radiusMm * layout.scale,
+        offset,
+        scale: layout.scale,
+        pathData: configService.get("dieline.pathData"),
+        customSourceWidthPx: Number.isFinite(sourceWidth) && sourceWidth > 0 ? sourceWidth : undefined,
+        customSourceHeightPx: Number.isFinite(sourceHeight) && sourceHeight > 0 ? sourceHeight : undefined,
+    };
+}

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

@@ -5,6 +5,12 @@ const wrappedOffsets_1 = require("../src/extensions/wrappedOffsets");
 const maskOps_1 = require("../src/extensions/maskOps");
 const edgeScale_1 = require("../src/extensions/edgeScale");
 const visibility_1 = require("../src/services/visibility");
+const commands_1 = require("../src/extensions/image/commands");
+const config_1 = require("../src/extensions/image/config");
+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");
 function assert(condition, message) {
     if (!condition)
         throw new Error(message);
@@ -93,6 +99,7 @@ function testVisibilityDsl() {
     const context = {
         activeToolId: "pooder.kit.image",
         isSessionActive: (toolId) => toolId === "pooder.kit.feature",
+        hasAnyActiveSession: () => true,
         layers,
     };
     assert((0, visibility_1.evaluateVisibilityExpr)({ op: "const", value: true }, context) === true, "const true failed");
@@ -101,6 +108,7 @@ function testVisibilityDsl() {
     assert((0, visibility_1.evaluateVisibilityExpr)({ op: "activeToolIn", ids: ["pooder.kit.white-ink"] }, context) === false, "activeToolIn false failed");
     assert((0, visibility_1.evaluateVisibilityExpr)({ op: "sessionActive", toolId: "pooder.kit.feature" }, context) === true, "sessionActive true failed");
     assert((0, visibility_1.evaluateVisibilityExpr)({ op: "sessionActive", toolId: "pooder.kit.ruler" }, context) === false, "sessionActive false failed");
+    assert((0, visibility_1.evaluateVisibilityExpr)({ op: "anySessionActive" }, context) === true, "anySessionActive true failed");
     assert((0, visibility_1.evaluateVisibilityExpr)({ op: "layerExists", layerId: "ruler-overlay" }, context) === true, "layerExists true failed");
     assert((0, visibility_1.evaluateVisibilityExpr)({ op: "layerExists", layerId: "missing-layer" }, context) === false, "layerExists false failed");
     const comparisons = [
@@ -137,12 +145,122 @@ function testVisibilityDsl() {
         ],
     }, context) === true, "any failed");
 }
+function testContributionCompatibility() {
+    const imageCommandNames = (0, commands_1.createImageCommands)({}).map((entry) => entry.command);
+    const whiteInkCommandNames = (0, commands_2.createWhiteInkCommands)({}).map((entry) => entry.command);
+    const dielineCommandNames = (0, commands_3.createDielineCommands)({}, {
+        width: 0,
+        height: 0,
+    }).map((entry) => entry.command);
+    const expectedImageCommands = [
+        "addImage",
+        "upsertImage",
+        "getWorkingImages",
+        "setWorkingImage",
+        "resetWorkingImages",
+        "completeImages",
+        "exportUserCroppedImage",
+        "fitImageToArea",
+        "fitImageToDefaultArea",
+        "focusImage",
+        "removeImage",
+        "updateImage",
+        "clearImages",
+        "bringToFront",
+        "sendToBack",
+    ];
+    const expectedWhiteInkCommands = [
+        "addWhiteInk",
+        "upsertWhiteInk",
+        "getWhiteInks",
+        "getWhiteInkSettings",
+        "setWhiteInkPrintEnabled",
+        "setWhiteInkPreviewImageVisible",
+        "getWorkingWhiteInks",
+        "setWorkingWhiteInk",
+        "updateWhiteInk",
+        "removeWhiteInk",
+        "clearWhiteInks",
+        "resetWorkingWhiteInks",
+        "completeWhiteInks",
+        "setWhiteInkImage",
+    ];
+    const expectedDielineCommands = [
+        "updateFeaturePosition",
+        "exportCutImage",
+        "detectEdge",
+    ];
+    assert(JSON.stringify(imageCommandNames) === JSON.stringify(expectedImageCommands), `image command set changed: ${JSON.stringify(imageCommandNames)}`);
+    assert(JSON.stringify(whiteInkCommandNames) ===
+        JSON.stringify(expectedWhiteInkCommands), `white-ink command set changed: ${JSON.stringify(whiteInkCommandNames)}`);
+    assert(JSON.stringify(dielineCommandNames) ===
+        JSON.stringify(expectedDielineCommands), `dieline command set changed: ${JSON.stringify(dielineCommandNames)}`);
+    const imageConfigKeys = (0, config_1.createImageConfigurations)().map((entry) => entry.id);
+    const whiteInkConfigKeys = (0, config_2.createWhiteInkConfigurations)().map((entry) => entry.id);
+    const dielineConfigKeys = (0, config_3.createDielineConfigurations)({
+        shape: "rect",
+        radius: 0,
+        shapeStyle: {},
+        showBleedLines: true,
+        mainLine: { width: 1, color: "#000", dashLength: 1, style: "solid" },
+        offsetLine: { width: 1, color: "#000", dashLength: 1, style: "solid" },
+        insideColor: "#000",
+        features: [],
+    }).map((entry) => entry.id);
+    const expectedImageConfigKeys = [
+        "image.items",
+        "image.debug",
+        "image.control.cornerSize",
+        "image.control.touchCornerSize",
+        "image.control.cornerStyle",
+        "image.control.cornerColor",
+        "image.control.cornerStrokeColor",
+        "image.control.transparentCorners",
+        "image.control.borderColor",
+        "image.control.borderScaleFactor",
+        "image.control.padding",
+        "image.frame.strokeColor",
+        "image.frame.strokeWidth",
+        "image.frame.strokeStyle",
+        "image.frame.dashLength",
+        "image.frame.innerBackground",
+        "image.frame.outerBackground",
+    ];
+    const expectedWhiteInkConfigKeys = [
+        "whiteInk.items",
+        "whiteInk.printWithWhiteInk",
+        "whiteInk.previewImageVisible",
+        "whiteInk.debug",
+    ];
+    const expectedDielineConfigKeys = [
+        "dieline.shape",
+        "dieline.radius",
+        "dieline.shapeStyle",
+        "dieline.showBleedLines",
+        "dieline.strokeWidth",
+        "dieline.strokeColor",
+        "dieline.dashLength",
+        "dieline.style",
+        "dieline.offsetStrokeWidth",
+        "dieline.offsetStrokeColor",
+        "dieline.offsetDashLength",
+        "dieline.offsetStyle",
+        "dieline.insideColor",
+        "dieline.features",
+    ];
+    assert(JSON.stringify(imageConfigKeys) === JSON.stringify(expectedImageConfigKeys), `image config keys changed: ${JSON.stringify(imageConfigKeys)}`);
+    assert(JSON.stringify(whiteInkConfigKeys) ===
+        JSON.stringify(expectedWhiteInkConfigKeys), `white-ink config keys changed: ${JSON.stringify(whiteInkConfigKeys)}`);
+    assert(JSON.stringify(dielineConfigKeys) ===
+        JSON.stringify(expectedDielineConfigKeys), `dieline config keys changed: ${JSON.stringify(dielineConfigKeys)}`);
+}
 function main() {
     testWrappedOffsets();
     testBridgeSelection();
     testMaskOps();
     testEdgeScale();
     testVisibilityDsl();
+    testContributionCompatibility();
     console.log("ok");
 }
 main();

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @pooder/kit
 
+## 6.1.0
+
+### Minor Changes
+
+- project structure
+
+## 6.0.1
+
+### Patch Changes
+
+- image control
+
 ## 6.0.0
 
 ### Major Changes