goatdee-canvas 0.0.33 → 0.0.34

package/dist/index.cjs

@@ -1169,22 +1169,308 @@ const initializeFonts = async () => {
     }
 };
 
+// ─────────────────────────────────────────────────────────────────────────────
+// 子类型 schema（CanvasShadow / CanvasLinearGradient）
+//
+// 通过 `satisfies SchemaFor<T>` 与 types.ts 强绑定：
+//   - T 字段新增   → schema 缺少该 key                → 编译报错
+//   - T 字段改类型  → schema FieldType 不满足新约束     → 编译报错
+//   - schema 多余 key → 编译报错（excess property check）
+// ─────────────────────────────────────────────────────────────────────────────
+const shadowSchema = {
+    blur: 'number',
+    color: 'string',
+    offsetX: 'number',
+    offsetY: 'number',
+};
+const linearGradientSchema = {
+    type: 'string',
+    coords: 'object',
+    colorStops: 'array',
+};
+// ─────────────────────────────────────────────────────────────────────────────
+// 基础类型校验（供子类型 schema 驱动的循环内使用，避免递归调用 matchesFieldType）
+// ─────────────────────────────────────────────────────────────────────────────
+function checkPrimitive(value, ft) {
+    if (ft === 'array')
+        return Array.isArray(value);
+    if (ft === 'object')
+        return typeof value === 'object' && value !== null && !Array.isArray(value);
+    return typeof value === ft;
+}
+// ─────────────────────────────────────────────────────────────────────────────
+// 复合类型守卫
+// ─────────────────────────────────────────────────────────────────────────────
+/** CanvasFill / CanvasStroke：string | CanvasLinearGradient | null */
+function isFill(value) {
+    if (value === null || typeof value === 'string')
+        return true;
+    if (typeof value === 'object' && !Array.isArray(value)) {
+        const v = value;
+        return Object.entries(linearGradientSchema)
+            .every(([key, ft]) => checkPrimitive(v[key], ft));
+    }
+    return false;
+}
+/** CanvasShadow：由 shadowSchema 驱动，与 types.ts 中 CanvasShadow 强绑定 */
+function isShadow(value) {
+    if (typeof value !== 'object' || value === null || Array.isArray(value))
+        return false;
+    const v = value;
+    return Object.entries(shadowSchema)
+        .every(([key, ft]) => checkPrimitive(v[key], ft));
+}
+/** TextStyles（unknown）：null / object / array 均合法，拒绝 string / number / boolean 等原始值 */
+function isTextStyles(value) {
+    return value === null || typeof value === 'object';
+}
+// ─────────────────────────────────────────────────────────────────────────────
+// 主校验函数
+// ─────────────────────────────────────────────────────────────────────────────
+/** 判断值是否符合 FieldType 规则 */
+function matchesFieldType(value, fieldType) {
+    switch (fieldType) {
+        case 'array': return Array.isArray(value);
+        case 'object': return typeof value === 'object' && value !== null && !Array.isArray(value);
+        case 'fill': return isFill(value);
+        case 'shadow': return isShadow(value);
+        case 'shadow-or-null': return value === null || isShadow(value);
+        case 'number-or-null': return value === null || typeof value === 'number';
+        case 'string-or-null': return value === null || typeof value === 'string';
+        case 'text-styles': return isTextStyles(value);
+        default: return typeof value === fieldType;
+    }
+}
+
+/**
+ * 所有对象类型共享的公共字段 schema。
+ * 各对象类型 schema 通过扩展此对象来复用这些字段。
+ */
+const baseSchema = {
+    id: 'string',
+    name: 'string',
+    left: 'number',
+    top: 'number',
+    width: 'number',
+    height: 'number',
+    scaleX: 'number',
+    scaleY: 'number',
+    angle: 'number',
+    strokeWidth: 'number',
+    opacity: 'number',
+    visible: 'boolean',
+    locked: 'boolean',
+    selectable: 'boolean',
+    lockMovementX: 'boolean',
+    lockMovementY: 'boolean',
+    lockRotation: 'boolean',
+    lockScalingX: 'boolean',
+    lockScalingY: 'boolean',
+    lockUniScaling: 'boolean',
+};
+
+const textboxSchema = {
+    ...baseSchema,
+    type: 'string',
+    flipX: 'boolean',
+    flipY: 'boolean',
+    text: 'string',
+    fontSize: 'number',
+    lineHeight: 'number',
+    fontFamily: 'string',
+    fill: 'fill',
+    stroke: 'fill',
+    shadow: 'shadow-or-null',
+    textAlign: 'string',
+    charSpacing: 'number',
+    underline: 'boolean',
+    linethrough: 'boolean',
+    bold: 'boolean',
+    italic: 'boolean',
+    styles: 'text-styles',
+    editable: 'boolean',
+};
+
+const imageSchema = {
+    ...baseSchema,
+    type: 'string',
+    flipX: 'boolean',
+    flipY: 'boolean',
+    src: 'string',
+    cropX: 'number',
+    cropY: 'number',
+    loading: 'string-or-null',
+    rx: 'number',
+    ry: 'number',
+    backgroundColor: 'fill',
+    stroke: 'fill',
+    shadow: 'shadow-or-null',
+};
+
+const circleSchema = {
+    ...baseSchema,
+    type: 'string',
+    flipX: 'boolean',
+    flipY: 'boolean',
+    fill: 'fill',
+    stroke: 'fill',
+    shadow: 'shadow-or-null',
+    borderDashArray: 'array',
+    radius: 'number',
+};
+
+const rectangleSchema = {
+    ...baseSchema,
+    type: 'string',
+    flipX: 'boolean',
+    flipY: 'boolean',
+    fill: 'fill',
+    stroke: 'fill',
+    shadow: 'shadow-or-null',
+    borderDashArray: 'array',
+    rx: 'number',
+    ry: 'number',
+};
+
+const triangleSchema = {
+    ...baseSchema,
+    type: 'string',
+    flipX: 'boolean',
+    flipY: 'boolean',
+    fill: 'fill',
+    stroke: 'fill',
+    shadow: 'shadow-or-null',
+    borderDashArray: 'array',
+};
+
+const groupSchema = {
+    ...baseSchema,
+    type: 'string',
+    flipX: 'boolean',
+    flipY: 'boolean',
+    objects: 'array',
+};
+
+const frameSchema = {
+    ...baseSchema,
+    type: 'string',
+    backgroundColor: 'fill',
+    stroke: 'fill',
+    autoScaleBg: 'boolean',
+    crossable: 'boolean',
+    clipContent: 'boolean',
+    showName: 'boolean',
+    showSize: 'boolean',
+    objects: 'array',
+};
+
+const slideSchema = {
+    ...baseSchema,
+    type: 'string',
+    backgroundColor: 'fill',
+    stroke: 'fill',
+    contentBackgroundColor: 'fill',
+    contentStrokeWidth: 'number',
+    contentStroke: 'fill',
+    paddingX: 'number',
+    paddingY: 'number',
+    rx: 'number',
+    ry: 'number',
+    crossable: 'boolean',
+    showName: 'boolean',
+    showSize: 'boolean',
+    objects: 'array',
+};
+
+const placeholderSchema = {
+    type: 'string',
+    id: 'string',
+    name: 'string',
+    left: 'number',
+    top: 'number',
+    width: 'number',
+    height: 'number',
+    export: 'boolean',
+    locked: 'boolean',
+    lockMovementX: 'boolean',
+    lockMovementY: 'boolean',
+    lockRotation: 'boolean',
+    lockScalingX: 'boolean',
+    lockScalingY: 'boolean',
+    lockUniScaling: 'boolean',
+    selectable: 'boolean',
+    visible: 'boolean',
+};
+
+const pathSchema = {
+    ...baseSchema,
+    type: 'string',
+    flipX: 'boolean',
+    flipY: 'boolean',
+    stroke: 'fill',
+    points: 'array',
+};
+
+/**
+ * 对象类型 → schema 映射表。
+ * grid / line / grid-cell 使用宽松 schema（CanvasGridLineCellLoose），透传不校验。
+ *
+ * 各 schema 值以 `as SchemaEntry` 断言：schema 文件用 satisfies 保证了每个字段的
+ * 值都是合法的 FieldType 字面量，断言仅消除 TS 对字面量宽泛推断的误报。
+ */
+const schemaMap = {
+    textbox: textboxSchema,
+    image: imageSchema,
+    circle: circleSchema,
+    rectangle: rectangleSchema,
+    triangle: triangleSchema,
+    group: groupSchema,
+    frame: frameSchema,
+    slide: slideSchema,
+    placeholder: placeholderSchema,
+    path: pathSchema,
+};
+
 var utils;
 (function (utils) {
+    /**
+     * 对属性对象进行安全校验：
+     * - null / undefined / 非对象：原样返回
+     * - 已知对象类型（textbox / image / circle 等）：按 schema 逐字段校验类型，
+     *   类型不符的字段打印警告并丢弃，合法字段保留
+     * - 未知类型（grid / line / grid-cell 等）：透传不校验
+     */
     function safeProperties(properties) {
-        // console.log('safeProperties', properties);
-        return properties;
+        if (properties === null || properties === undefined)
+            return properties;
+        if (typeof properties !== 'object' || Array.isArray(properties))
+            return properties;
+        const schema = schemaMap[properties.type];
+        if (!schema)
+            return properties;
+        const result = {};
+        for (const [key, fieldType] of Object.entries(schema)) {
+            if (!(key in properties))
+                continue;
+            const value = properties[key];
+            if (matchesFieldType(value, fieldType)) {
+                result[key] = (key === 'objects' && Array.isArray(value))
+                    ? value.map(item => safeProperties(item))
+                    : value;
+            }
+            else {
+                console.warn(`[safeProperties] 属性 "${key}" 类型不符：期望 ${fieldType}，实际 ${Array.isArray(value) ? 'array' : typeof value}，已忽略`);
+            }
+        }
+        return result;
     }
     utils.safeProperties = safeProperties;
     function safeAddOptions(options) {
         if (!options)
             return options;
         // 如果包含 points 属性，则过滤掉该属性
-        if (options.points) {
-            delete options.points;
-        }
-        console.log('safeAddOptions', options);
-        return options;
+        const { points: _points, ...rest } = options;
+        return rest;
     }
     utils.safeAddOptions = safeAddOptions;
     /**
@@ -1195,19 +1481,13 @@ var utils;
      */
     function debounce(fn, delay) {
         let timer = null;
-        let lastCallTime = 0;
         return function (...args) {
-            const now = Date.now();
-            lastCallTime = now;
             if (timer !== null) {
                 clearTimeout(timer);
             }
             timer = window.setTimeout(() => {
-                // 只有在延迟时间后没有新的调用时才执行
-                if (Date.now() - lastCallTime >= delay) {
-                    fn.apply(this, args);
-                    timer = null;
-                }
+                fn.apply(this, args);
+                timer = null;
             }, delay);
         };
     }
@@ -3763,8 +4043,15 @@ const setObjectProperties = async (id, properties) => {
         if (properties.src && typeof properties.src === "string") {
             await manager.registerImageIfNeeded(properties.src);
         }
-        // 安全处理 properties
-        const safeProperties = utils.safeProperties(properties);
+        // 如果调用方没有传 type，从对象数据中补充，确保 safeProperties 能找到对应 schema
+        let propsForValidation = properties;
+        if (!properties.type) {
+            const obj = getObject(id);
+            if (obj === null || obj === void 0 ? void 0 : obj.type) {
+                propsForValidation = { ...properties, type: obj.type };
+            }
+        }
+        const safeProperties = utils.safeProperties(propsForValidation);
         canvas.setObjectProperties(id, safeProperties);
     }
     catch (error) {
@@ -3779,8 +4066,8 @@ const setObjectProperties = async (id, properties) => {
 const setCanvasProperties = async (properties) => {
     try {
         const canvas = manager.getCanvas();
-        const safeProperties = utils.safeProperties(properties);
-        canvas.setCanvasProperties(safeProperties);
+        // const safeProperties = utils.safeProperties(properties);
+        canvas.setCanvasProperties(properties);
     }
     catch (error) {
         console.warn("Canvas operation（setCanvasProperties） failed:", error);