modern-idoc 0.10.21 → 0.11.0

package/dist/index.mjs

@@ -1386,7 +1386,7 @@ function isPresetFill(fill) {
   return typeof fill === "string" ? false : isPresetFillObject(fill);
 }
 function normalizeFill(fill) {
-  const enabled = fill && typeof fill === "object" ? fill.enabled : void 0;
+  const enabled = fill && typeof fill === "object" ? fill.enabled ?? true : true;
   const obj = { enabled };
   if (isColorFill(fill)) {
     Object.assign(obj, normalizeColorFill(fill));
@@ -1401,6 +1401,7 @@ function normalizeFill(fill) {
     Object.assign(obj, normalizePresetFill(fill));
   }
   return pick(clearUndef(obj), Array.from(/* @__PURE__ */ new Set([
+    "enabled",
     ...colorFillFields,
     ...imageFillFiedls,
     ...gradientFillFields,
@@ -1421,48 +1422,106 @@ function normalizeBackground(background) {
   }
 }
 
-function getDefaultInnerShadow() {
+function getDefaultBackgroundStyle() {
   return {
-    color: defaultColor,
-    offsetX: 0,
-    offsetY: 0,
-    blurRadius: 1
+    backgroundImage: "none",
+    backgroundSize: "auto, auto",
+    backgroundColor: "none",
+    backgroundColormap: "none"
   };
 }
-function normalizeInnerShadow(shadow) {
-  return {
-    ...getDefaultInnerShadow(),
-    ...clearUndef({
-      ...shadow,
-      color: isNone(shadow.color) ? defaultColor : normalizeColor(shadow.color)
-    })
-  };
+
+function normalizeOutline(outline) {
+  if (typeof outline === "string") {
+    return {
+      ...normalizeFill(outline)
+    };
+  } else {
+    return {
+      ...normalizeFill(outline),
+      ...pick(outline, ["width", "style", "lineCap", "lineJoin", "headEnd", "tailEnd"])
+    };
+  }
 }
 
-function getDefaultOuterShadow() {
+function getDefaultOutlineStyle() {
   return {
-    ...getDefaultInnerShadow(),
-    scaleX: 1,
-    scaleY: 1
+    outlineWidth: 0,
+    outlineOffset: 0,
+    outlineColor: "none",
+    outlineStyle: "none"
   };
 }
-function normalizeOuterShadow(shadow) {
+
+function normalizeShadow(shadow) {
+  if (typeof shadow === "string") {
+    return {
+      enabled: true,
+      color: normalizeColor(shadow)
+    };
+  } else {
+    return {
+      ...shadow,
+      enabled: shadow.enabled ?? true,
+      color: isNone(shadow.color) ? defaultColor : normalizeColor(shadow.color)
+    };
+  }
+}
+
+function getDefaultShadowStyle() {
   return {
-    ...getDefaultOuterShadow(),
-    ...normalizeInnerShadow(shadow)
+    boxShadow: "none"
   };
 }
 
-function normalizeSoftEdge(softEdge) {
-  return softEdge;
+const effectFields = [
+  "fill",
+  "outline",
+  "shadow",
+  "transform",
+  "transformOrigin"
+];
+function normalizeEffectV0(effect) {
+  const _effect = pick(effect, effectFields);
+  const { rotate, scaleX, scaleY, skewX, skewY, translateX, translateY } = effect;
+  const transforms = [];
+  (translateX || translateY) && transforms.push(`translate(${translateX || 0}, ${translateY || 0})`);
+  rotate && transforms.push(`rotate(${rotate}deg)`);
+  (scaleX || scaleY) && transforms.push(`scale(${scaleX ?? 1}, ${scaleY ?? 1})`);
+  skewX && transforms.push(`skewX(${skewX}deg)`);
+  skewY && transforms.push(`skewY(${skewY}deg)`);
+  if (transforms.length > 0) {
+    _effect.transform = transforms.join(" ");
+  }
+  if (effect.textStrokeWidth || effect.textStrokeColor) {
+    _effect.outline = {
+      color: effect.textStrokeColor,
+      width: effect.textStrokeWidth
+    };
+  }
+  if (effect.color) {
+    _effect.fill = {
+      color: effect.color
+    };
+  }
+  if (effect.shadowOffsetX || effect.shadowOffsetY || effect.shadowBlur || effect.shadowColor) {
+    _effect.shadow = {
+      offsetX: effect.shadowOffsetX,
+      offsetY: effect.shadowOffsetY,
+      blur: effect.shadowBlur,
+      color: effect.shadowColor
+    };
+  }
+  return _effect;
 }
-
 function normalizeEffect(effect) {
+  const _effect = normalizeEffectV0(effect);
   return clearUndef({
-    ...effect,
-    softEdge: isNone(effect.softEdge) ? void 0 : normalizeSoftEdge(effect.softEdge),
-    outerShadow: isNone(effect.outerShadow) ? void 0 : normalizeOuterShadow(effect.outerShadow),
-    innerShadow: isNone(effect.innerShadow) ? void 0 : normalizeInnerShadow(effect.innerShadow)
+    fill: isNone(_effect.fill) ? void 0 : normalizeFill(_effect.fill),
+    outline: isNone(_effect.outline) ? void 0 : normalizeOutline(_effect.outline),
+    shadow: isNone(_effect.shadow) ? void 0 : normalizeShadow(_effect.shadow),
+    transform: isNone(_effect.transform) ? void 0 : _effect.transform,
+    transformOrigin: _effect.transformOrigin
   });
 }
 
@@ -1484,52 +1543,16 @@ const nanoid = () => {
 };
 const idGenerator = nanoid;
 
-function normalizeOutline(outline) {
-  if (typeof outline === "string") {
-    return {
-      ...normalizeFill(outline)
-    };
-  } else {
-    return {
-      ...normalizeFill(outline),
-      ...pick(outline, [
-        "width",
-        "style",
-        "lineCap",
-        "lineJoin",
-        "headEnd",
-        "tailEnd"
-      ])
-    };
-  }
-}
-
-function normalizeShadow(shadow) {
-  if (typeof shadow === "string") {
-    return {
-      color: normalizeColor(shadow)
-    };
-  } else {
-    return {
-      ...shadow,
-      color: isNone(shadow.color) ? defaultColor : normalizeColor(shadow.color)
-    };
-  }
-}
-function getDefaultShadowStyle() {
-  return {
-    boxShadow: "none"
-  };
-}
-
 function normalizeShape(shape) {
   if (typeof shape === "string") {
     if (shape.startsWith("<svg")) {
       return {
+        enabled: true,
         svg: shape
       };
     } else {
       return {
+        enabled: true,
         paths: [
           { data: shape }
         ]
@@ -1537,6 +1560,7 @@ function normalizeShape(shape) {
     }
   } else if (Array.isArray(shape)) {
     return {
+      enabled: true,
       paths: shape.map((data) => {
         if (typeof data === "string") {
           return {
@@ -1606,13 +1630,6 @@ function getDefaultLayoutStyle() {
 
 function getDefaultTransformStyle() {
   return {
-    rotate: 0,
-    scaleX: 1,
-    scaleY: 1,
-    skewX: 0,
-    skewY: 0,
-    translateX: 0,
-    translateY: 0,
     transform: "none",
     transformOrigin: "center"
   };
@@ -1623,20 +1640,12 @@ function getDefaultElementStyle() {
     ...getDefaultLayoutStyle(),
     ...getDefaultTransformStyle(),
     ...getDefaultShadowStyle(),
-    // background
-    backgroundImage: "none",
-    backgroundSize: "auto, auto",
-    backgroundColor: "none",
-    backgroundColormap: "none",
+    ...getDefaultBackgroundStyle(),
+    ...getDefaultOutlineStyle(),
     // border
     borderRadius: 0,
     borderColor: "none",
     borderStyle: "solid",
-    // outline
-    outlineWidth: 0,
-    outlineOffset: 0,
-    outlineColor: "none",
-    outlineStyle: "none",
     // other
     visibility: "visible",
     filter: "none",
@@ -1845,18 +1854,18 @@ function isFragmentObject(value) {
 function normalizeText(value) {
   if (typeof value === "string" || Array.isArray(value)) {
     return {
+      enabled: true,
       content: normalizeTextContent(value)
     };
   } else {
     return clearUndef({
-      ...value,
+      enabled: value.enabled ?? true,
       content: normalizeTextContent(value.content ?? ""),
       style: value.style ? normalizeStyle(value.style) : void 0,
-      effects: value.effects ? value.effects.map((v) => normalizeStyle(v)) : void 0,
       measureDom: value.measureDom,
       fonts: value.fonts,
-      fill: value.fill ? normalizeFill(value.fill) : void 0,
-      outline: value.outline ? normalizeOutline(value.outline) : void 0
+      ...normalizeEffect(value),
+      effects: value.effects ? value.effects.map((v) => normalizeEffect(v)) : void 0
     });
   }
 }
@@ -1882,19 +1891,15 @@ function normalizeVideo(video) {
 
 function normalizeElement(element) {
   return clearUndef({
-    ...element,
     id: element.id ?? idGenerator(),
     style: isNone(element.style) ? void 0 : normalizeStyle(element.style),
     text: isNone(element.text) ? void 0 : normalizeText(element.text),
     background: isNone(element.background) ? void 0 : normalizeBackground(element.background),
     shape: isNone(element.shape) ? void 0 : normalizeShape(element.shape),
-    fill: isNone(element.fill) ? void 0 : normalizeFill(element.fill),
-    outline: isNone(element.outline) ? void 0 : normalizeOutline(element.outline),
     foreground: isNone(element.foreground) ? void 0 : normalizeForeground(element.foreground),
-    shadow: isNone(element.shadow) ? void 0 : normalizeShadow(element.shadow),
     video: isNone(element.video) ? void 0 : normalizeVideo(element.video),
     audio: isNone(element.audio) ? void 0 : normalizeAudio(element.audio),
-    effect: isNone(element.effect) ? void 0 : normalizeEffect(element.effect),
+    ...normalizeEffect(element),
     children: element.children?.map((child) => normalizeElement(child))
   });
 }
@@ -1955,4 +1960,4 @@ function flatDocumentToDocument(flatDoc) {
   return doc;
 }
 
-export { EventEmitter, Observable, RawWeakMap, Reactivable, clearUndef, colorFillFields, defaultColor, defineProperty, flatDocumentToDocument, getDeclarations, getDefaultElementStyle, getDefaultHighlightStyle, getDefaultInnerShadow, getDefaultLayoutStyle, getDefaultListStyleStyle, getDefaultOuterShadow, getDefaultShadowStyle, getDefaultStyle, getDefaultTextInlineStyle, getDefaultTextLineStyle, getDefaultTextStyle, getDefaultTransformStyle, getNestedValue, getObjectValueByPath, getPropertyDescriptor, gradientFillFields, hasCRLF, idGenerator, imageFillFiedls, isCRLF, isColor, isColorFill, isColorFillObject, isEqualObject, isFragmentObject, isGradient, isGradientFill, isGradientFillObject, isImageFill, isImageFillObject, isNone, isParagraphObject, isPresetFill, isPresetFillObject, nanoid, normalizeAudio, normalizeBackground, normalizeCRLF, normalizeColor, normalizeColorFill, normalizeDocument, normalizeEffect, normalizeElement, normalizeFill, normalizeFlatDocument, normalizeForeground, normalizeGradient, normalizeGradientFill, normalizeImageFill, normalizeInnerShadow, normalizeOuterShadow, normalizeOutline, normalizePresetFill, normalizeShadow, normalizeShape, normalizeSoftEdge, normalizeStyle, normalizeText, normalizeTextContent, normalizeVideo, parseColor, parseGradient, pick, presetFillFiedls, property, property2, propertyOffsetFallback, propertyOffsetGet, propertyOffsetSet, round, setNestedValue, setObjectValueByPath, stringifyGradient, textContentToString };
+export { EventEmitter, Observable, RawWeakMap, Reactivable, clearUndef, colorFillFields, defaultColor, defineProperty, flatDocumentToDocument, getDeclarations, getDefaultBackgroundStyle, getDefaultElementStyle, getDefaultHighlightStyle, getDefaultLayoutStyle, getDefaultListStyleStyle, getDefaultOutlineStyle, getDefaultShadowStyle, getDefaultStyle, getDefaultTextInlineStyle, getDefaultTextLineStyle, getDefaultTextStyle, getDefaultTransformStyle, getNestedValue, getObjectValueByPath, getPropertyDescriptor, gradientFillFields, hasCRLF, idGenerator, imageFillFiedls, isCRLF, isColor, isColorFill, isColorFillObject, isEqualObject, isFragmentObject, isGradient, isGradientFill, isGradientFillObject, isImageFill, isImageFillObject, isNone, isParagraphObject, isPresetFill, isPresetFillObject, nanoid, normalizeAudio, normalizeBackground, normalizeCRLF, normalizeColor, normalizeColorFill, normalizeDocument, normalizeElement, normalizeFill, normalizeFlatDocument, normalizeForeground, normalizeGradient, normalizeGradientFill, normalizeImageFill, normalizeOutline, normalizePresetFill, normalizeShadow, normalizeShape, normalizeStyle, normalizeText, normalizeTextContent, normalizeVideo, parseColor, parseGradient, pick, presetFillFiedls, property, property2, propertyOffsetFallback, propertyOffsetGet, propertyOffsetSet, round, setNestedValue, setObjectValueByPath, stringifyGradient, textContentToString };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modern-idoc",
   "type": "module",
-  "version": "0.10.21",
+  "version": "0.11.0",
   "packageManager": "pnpm@10.18.1",
   "description": "Intermediate document for modern codec libs",
   "author": "wxm",
@@ -46,7 +46,7 @@
     "build": "vite build && unbuild",
     "build:schema": "npx ts-json-schema-generator --minify --expose 'export' --no-top-ref --path 'src/index.ts' --type 'NormalizedDocument' --tsconfig=./tsconfig.json > dist/schema.json",
     "dev": "vite docs",
-    "lint": "eslint .",
+    "lint": "eslint src",
     "version": "conventional-changelog -p angular -i CHANGELOG.md -s && git add CHANGELOG.md",
     "release": "bumpp package.json --commit \"release: v%s\" --push --all --tag",
     "start": "esno src/index.ts",
@@ -56,25 +56,25 @@
   },
   "dependencies": {
     "colord": "^2.9.3",
-    "nanoid": "^5.1.6"
+    "nanoid": "^5.1.11"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^7.2.0",
-    "@types/node": "^25.2.0",
-    "bumpp": "^10.4.0",
+    "@antfu/eslint-config": "^8.2.0",
+    "@types/node": "^25.6.0",
+    "bumpp": "^11.0.1",
     "conventional-changelog-cli": "^5.0.0",
-    "eslint": "^9.39.2",
-    "lint-staged": "^16.2.7",
+    "eslint": "^10.3.0",
+    "lint-staged": "^16.4.0",
     "simple-git-hooks": "^2.13.1",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "unbuild": "^3.6.1",
-    "vite": "^7.3.1",
-    "vitest": "^4.0.18"
+    "vite": "^8.0.10",
+    "vitest": "^4.1.5"
   },
   "simple-git-hooks": {
     "pre-commit": "pnpm lint-staged"
   },
   "lint-staged": {
-    "*": "eslint --fix"
+    "*": "eslint src --fix"
   }
 }