modern-idoc 0.2.2 → 0.2.3

package/dist/index.cjs

@@ -49,10 +49,6 @@ function getDefaultLayoutStyle() {
 
 function getDefaultShadowStyle() {
   return {
-    shadowColor: "transparent",
-    shadowOffsetX: 0,
-    shadowOffsetY: 0,
-    shadowBlur: 0,
     boxShadow: "none"
   };
 }
@@ -136,11 +132,41 @@ function getDefaultStyle() {
   };
 }
 
+function clearUndef(obj, deep = false) {
+  if (typeof obj !== "object" || !obj) {
+    return obj;
+  }
+  if (Array.isArray(obj)) {
+    if (deep) {
+      return obj.map((v) => clearUndef(v, deep));
+    } else {
+      return obj;
+    }
+  }
+  const newObj = {};
+  for (const key in obj) {
+    const value = obj[key];
+    if (value === void 0 || value === null) {
+      continue;
+    }
+    if (deep) {
+      newObj[key] = clearUndef(value, deep);
+    } else {
+      newObj[key] = value;
+    }
+  }
+  return newObj;
+}
+function deepClearUndef(obj) {
+  return clearUndef(obj, true);
+}
+
 function normalizeFill(fill) {
   if (!fill || fill === "none") {
     return void 0;
   } else if (typeof fill === "string") {
     return {
+      type: "color",
       color: fill
     };
   } else {
@@ -185,15 +211,27 @@ function normalizeImage(image) {
   }
 }
 
-function normalizeStroke(stroke) {
-  if (!stroke || stroke === "none") {
+function normalizeOutline(outline) {
+  if (!outline || outline === "none") {
     return void 0;
-  } else if (typeof stroke === "string") {
+  } else if (typeof outline === "string") {
     return {
-      color: stroke
+      color: outline
     };
   } else {
-    return stroke;
+    return outline;
+  }
+}
+
+function normalizeShadow(shadow) {
+  if (!shadow || shadow === "none") {
+    return void 0;
+  } else if (typeof shadow === "string") {
+    return {
+      color: shadow
+    };
+  } else {
+    return shadow;
   }
 }
 
@@ -277,18 +315,21 @@ function normalizeVideo(video) {
 }
 
 function normalizeElement(element) {
-  return {
+  return clearUndef({
     ...element,
     image: normalizeImage(element.image),
     video: normalizeVideo(element.video),
     text: normalizeText(element.text),
     geometry: normalizeGeometry(element.geometry),
     fill: normalizeFill(element.fill),
-    stroke: normalizeStroke(element.stroke),
+    outline: normalizeOutline(element.outline),
+    shadow: normalizeShadow(element.shadow),
     children: element.children?.map((child) => normalizeElement(child))
-  };
+  });
 }
 
+exports.clearUndef = clearUndef;
+exports.deepClearUndef = deepClearUndef;
 exports.getDefaultElementStyle = getDefaultElementStyle;
 exports.getDefaultShadowStyle = getDefaultShadowStyle;
 exports.getDefaultStyle = getDefaultStyle;
@@ -298,7 +339,8 @@ exports.normalizeElement = normalizeElement;
 exports.normalizeFill = normalizeFill;
 exports.normalizeGeometry = normalizeGeometry;
 exports.normalizeImage = normalizeImage;
-exports.normalizeStroke = normalizeStroke;
+exports.normalizeOutline = normalizeOutline;
+exports.normalizeShadow = normalizeShadow;
 exports.normalizeText = normalizeText;
 exports.normalizeTextContent = normalizeTextContent;
 exports.normalizeVideo = normalizeVideo;

package/dist/index.d.cts

@@ -1,3 +1,6 @@
+type Noneable = 'none';
+type Sizeable = `${number}%` | `${number}rem` | number;
+
 interface ImageFillRect {
     left?: number;
     top?: number;
@@ -16,7 +19,8 @@ interface CommonFillDeclaration {
     opacity?: number;
 }
 interface ImageFillDeclaration extends CommonFillDeclaration {
-    image?: string;
+    type: 'image';
+    image: string;
     dpi?: number;
     rotateWithShape?: boolean;
     srcRect?: ImageFillRect;
@@ -24,10 +28,11 @@ interface ImageFillDeclaration extends CommonFillDeclaration {
     tile?: ImageFillTile;
 }
 interface ColorFillDeclaration extends CommonFillDeclaration {
-    color?: string;
-}
-interface FillDeclaration extends ImageFillDeclaration, ColorFillDeclaration {
+    type: 'color';
+    color: string;
 }
+type FillDeclaration = ImageFillDeclaration | ColorFillDeclaration;
+type FillProp = Noneable | string | FillDeclaration;
 
 type SVGPathData = string;
 type FillRule = 'nonzero' | 'evenodd';
@@ -59,12 +64,6 @@ interface Path2DDeclaration extends Partial<Path2DStyle> {
 interface GeometryDeclaration {
     data: Path2DDeclaration[];
 }
-
-type Noneable = 'none';
-type Sizeable = `${number}%` | `${number}rem` | number;
-
-type FillProp = Noneable | string | FillDeclaration;
-
 type GeometryProp = Noneable | SVGPathData | SVGPathData[] | Path2DDeclaration[] | GeometryDeclaration;
 
 interface MetaProp {
@@ -81,18 +80,27 @@ interface ImageDeclaration {
     url: string;
     opacity?: number;
 }
-
 type ImageProp = Noneable | string | ImageDeclaration;
 
-interface StrokeDeclaration {
+interface OutlineDeclaration {
     width?: number;
     style?: 'dashed' | 'solid' | string;
     image?: string;
     color?: string;
     opacity?: number;
 }
+type OutlineProp = Noneable | string | Partial<OutlineDeclaration>;
 
-type StrokeProp = Noneable | string | StrokeDeclaration;
+interface ShadowDeclaration {
+    color: string;
+    offsetX?: number;
+    offsetY?: number;
+    blur?: number;
+}
+type ShadowProp = Noneable | string | ShadowDeclaration;
+interface ShadowStyleDeclaration {
+    boxShadow: Noneable | string;
+}
 
 type Overflow = 'hidden' | 'visible';
 type Visibility = 'hidden' | 'visible';
@@ -169,22 +177,6 @@ interface LayoutStyleDeclaration {
     width: number | 'auto' | `${number}%`;
 }
 
-interface ShadowDeclaration {
-    color: string;
-    offsetX: number;
-    offsetY: number;
-    blur: number;
-}
-
-interface ShadowStyleDeclaration {
-    shadow?: Partial<ShadowDeclaration>;
-    shadowColor: string;
-    shadowOffsetX: number;
-    shadowOffsetY: number;
-    shadowBlur: number;
-    boxShadow: 'none' | string;
-}
-
 interface TransformStyleDeclaration {
     rotate: number;
     scaleX: number;
@@ -215,7 +207,6 @@ interface HighlightDeclaration {
     size: HighlightSize;
     thickness: HighlightThickness;
 }
-
 interface HighlightStyleDeclaration {
     highlight?: Partial<HighlightDeclaration>;
     highlightImage: HighlightImage;
@@ -233,7 +224,6 @@ interface ListStyleDeclaration {
     size: ListStyleSize;
     position: ListStylePosition;
 }
-
 interface ListStyleStyleDeclaration {
     listStyle?: Partial<ListStyleDeclaration>;
     listStyleType: ListStyleType;
@@ -275,7 +265,6 @@ interface TextStyleDeclaration extends TextLineStyleDeclaration, TextInlineStyle
 
 interface StyleDeclaration extends TextStyleDeclaration, ElementStyleDeclaration {
 }
-
 type StyleProp = Partial<StyleDeclaration>;
 
 interface FragmentContent extends Partial<StyleDeclaration> {
@@ -293,7 +282,6 @@ interface TextDeclaration {
     measureDom?: any;
     fonts?: any;
 }
-
 type TextProp = string | TextContent | (TextDeclaration & {
     content: TextContent;
 }) | TextDeclaration;
@@ -302,7 +290,6 @@ interface VideoDeclaration {
     url: string;
     opacity?: number;
 }
-
 type VideoProp = Noneable | string | VideoDeclaration;
 
 interface IDOCElement extends IDOCNode {
@@ -312,18 +299,19 @@ interface IDOCElement extends IDOCNode {
     text?: TextProp;
     geometry?: GeometryProp;
     fill?: FillProp;
-    stroke?: StrokeProp;
+    outline?: OutlineProp;
+    shadow?: ShadowProp;
     children?: IDOCElement[];
 }
-
-interface ElementDeclaration extends IDOCElement {
+interface IDOCElementDeclaration extends IDOCElement {
     image?: ImageDeclaration;
     video?: VideoDeclaration;
     text?: TextDeclaration;
     geometry?: GeometryDeclaration;
     fill?: FillDeclaration;
-    stroke?: StrokeDeclaration;
-    children?: ElementDeclaration[];
+    outline?: OutlineDeclaration;
+    shadow?: ShadowDeclaration;
+    children?: IDOCElementDeclaration[];
 }
 
 interface IDOCDocument extends IDOCElement {
@@ -340,7 +328,10 @@ declare function getDefaultTextStyle(): TextStyleDeclaration;
 
 declare function getDefaultTransformStyle(): TransformStyleDeclaration;
 
-declare function normalizeElement(element: IDOCElement): ElementDeclaration;
+declare function clearUndef<T>(obj: T, deep?: boolean): T;
+declare function deepClearUndef<T>(obj: T): T;
+
+declare function normalizeElement(element: IDOCElement): IDOCElementDeclaration;
 
 declare function normalizeFill(fill?: FillProp): FillDeclaration | undefined;
 
@@ -348,7 +339,9 @@ declare function normalizeGeometry(geometry?: GeometryProp): GeometryDeclaration
 
 declare function normalizeImage(image?: ImageProp): ImageDeclaration | undefined;
 
-declare function normalizeStroke(stroke?: StrokeProp): StrokeDeclaration | undefined;
+declare function normalizeOutline(outline?: OutlineProp): OutlineDeclaration | undefined;
+
+declare function normalizeShadow(shadow?: ShadowProp): ShadowDeclaration | undefined;
 
 declare function normalizeText(text?: TextProp): TextDeclaration | undefined;
 
@@ -356,4 +349,4 @@ declare function normalizeTextContent(content?: TextContent): TextContentDeclara
 
 declare function normalizeVideo(video?: VideoProp): VideoDeclaration | undefined;
 
-export { type ColorFillDeclaration, type CommonFillDeclaration, type ElementDeclaration, type ElementStyleDeclaration, type FillDeclaration, type FillProp, type FillRule, type FragmentContent, type GeometryDeclaration, type GeometryProp, type HighlightDeclaration, type HighlightStyleDeclaration, type IDOCDocument, type IDOCElement, type IDOCNode, type ImageDeclaration, type ImageFillDeclaration, type ImageFillRect, type ImageFillTile, type ImageProp, type LayoutStyleDeclaration, type ListStyleDeclaration, type ListStyleStyleDeclaration, type MetaProp, type ParagraphContent, type Path2DDeclaration, type Path2DStyle, type SVGPathData, type ShadowDeclaration, type ShadowStyleDeclaration, type StrokeDeclaration, type StrokeLinecap, type StrokeLinejoin, type StrokeProp, type StyleDeclaration, type StyleProp, type TextContent, type TextContentDeclaration, type TextContentFlat, type TextDeclaration, type TextDrawStyleDeclaration, type TextInlineStyleDeclaration, type TextLineStyleDeclaration, type TextProp, type TextStyleDeclaration, type TransformStyleDeclaration, type VideoDeclaration, type VideoProp, getDefaultElementStyle, getDefaultShadowStyle, getDefaultStyle, getDefaultTextStyle, getDefaultTransformStyle, normalizeElement, normalizeFill, normalizeGeometry, normalizeImage, normalizeStroke, normalizeText, normalizeTextContent, normalizeVideo };
+export { type ColorFillDeclaration, type CommonFillDeclaration, type ElementStyleDeclaration, type FillDeclaration, type FillProp, type FillRule, type FragmentContent, type GeometryDeclaration, type GeometryProp, type HighlightDeclaration, type HighlightStyleDeclaration, type IDOCDocument, type IDOCElement, type IDOCElementDeclaration, type IDOCNode, type ImageDeclaration, type ImageFillDeclaration, type ImageFillRect, type ImageFillTile, type ImageProp, type LayoutStyleDeclaration, type ListStyleDeclaration, type ListStyleStyleDeclaration, type MetaProp, type OutlineDeclaration, type OutlineProp, type ParagraphContent, type Path2DDeclaration, type Path2DStyle, type SVGPathData, type ShadowDeclaration, type ShadowProp, type ShadowStyleDeclaration, type StrokeLinecap, type StrokeLinejoin, type StyleDeclaration, type StyleProp, type TextContent, type TextContentDeclaration, type TextContentFlat, type TextDeclaration, type TextDrawStyleDeclaration, type TextInlineStyleDeclaration, type TextLineStyleDeclaration, type TextProp, type TextStyleDeclaration, type TransformStyleDeclaration, type VideoDeclaration, type VideoProp, clearUndef, deepClearUndef, getDefaultElementStyle, getDefaultShadowStyle, getDefaultStyle, getDefaultTextStyle, getDefaultTransformStyle, normalizeElement, normalizeFill, normalizeGeometry, normalizeImage, normalizeOutline, normalizeShadow, normalizeText, normalizeTextContent, normalizeVideo };

package/dist/index.d.mts

@@ -1,3 +1,6 @@
+type Noneable = 'none';
+type Sizeable = `${number}%` | `${number}rem` | number;
+
 interface ImageFillRect {
     left?: number;
     top?: number;
@@ -16,7 +19,8 @@ interface CommonFillDeclaration {
     opacity?: number;
 }
 interface ImageFillDeclaration extends CommonFillDeclaration {
-    image?: string;
+    type: 'image';
+    image: string;
     dpi?: number;
     rotateWithShape?: boolean;
     srcRect?: ImageFillRect;
@@ -24,10 +28,11 @@ interface ImageFillDeclaration extends CommonFillDeclaration {
     tile?: ImageFillTile;
 }
 interface ColorFillDeclaration extends CommonFillDeclaration {
-    color?: string;
-}
-interface FillDeclaration extends ImageFillDeclaration, ColorFillDeclaration {
+    type: 'color';
+    color: string;
 }
+type FillDeclaration = ImageFillDeclaration | ColorFillDeclaration;
+type FillProp = Noneable | string | FillDeclaration;
 
 type SVGPathData = string;
 type FillRule = 'nonzero' | 'evenodd';
@@ -59,12 +64,6 @@ interface Path2DDeclaration extends Partial<Path2DStyle> {
 interface GeometryDeclaration {
     data: Path2DDeclaration[];
 }
-
-type Noneable = 'none';
-type Sizeable = `${number}%` | `${number}rem` | number;
-
-type FillProp = Noneable | string | FillDeclaration;
-
 type GeometryProp = Noneable | SVGPathData | SVGPathData[] | Path2DDeclaration[] | GeometryDeclaration;
 
 interface MetaProp {
@@ -81,18 +80,27 @@ interface ImageDeclaration {
     url: string;
     opacity?: number;
 }
-
 type ImageProp = Noneable | string | ImageDeclaration;
 
-interface StrokeDeclaration {
+interface OutlineDeclaration {
     width?: number;
     style?: 'dashed' | 'solid' | string;
     image?: string;
     color?: string;
     opacity?: number;
 }
+type OutlineProp = Noneable | string | Partial<OutlineDeclaration>;
 
-type StrokeProp = Noneable | string | StrokeDeclaration;
+interface ShadowDeclaration {
+    color: string;
+    offsetX?: number;
+    offsetY?: number;
+    blur?: number;
+}
+type ShadowProp = Noneable | string | ShadowDeclaration;
+interface ShadowStyleDeclaration {
+    boxShadow: Noneable | string;
+}
 
 type Overflow = 'hidden' | 'visible';
 type Visibility = 'hidden' | 'visible';
@@ -169,22 +177,6 @@ interface LayoutStyleDeclaration {
     width: number | 'auto' | `${number}%`;
 }
 
-interface ShadowDeclaration {
-    color: string;
-    offsetX: number;
-    offsetY: number;
-    blur: number;
-}
-
-interface ShadowStyleDeclaration {
-    shadow?: Partial<ShadowDeclaration>;
-    shadowColor: string;
-    shadowOffsetX: number;
-    shadowOffsetY: number;
-    shadowBlur: number;
-    boxShadow: 'none' | string;
-}
-
 interface TransformStyleDeclaration {
     rotate: number;
     scaleX: number;
@@ -215,7 +207,6 @@ interface HighlightDeclaration {
     size: HighlightSize;
     thickness: HighlightThickness;
 }
-
 interface HighlightStyleDeclaration {
     highlight?: Partial<HighlightDeclaration>;
     highlightImage: HighlightImage;
@@ -233,7 +224,6 @@ interface ListStyleDeclaration {
     size: ListStyleSize;
     position: ListStylePosition;
 }
-
 interface ListStyleStyleDeclaration {
     listStyle?: Partial<ListStyleDeclaration>;
     listStyleType: ListStyleType;
@@ -275,7 +265,6 @@ interface TextStyleDeclaration extends TextLineStyleDeclaration, TextInlineStyle
 
 interface StyleDeclaration extends TextStyleDeclaration, ElementStyleDeclaration {
 }
-
 type StyleProp = Partial<StyleDeclaration>;
 
 interface FragmentContent extends Partial<StyleDeclaration> {
@@ -293,7 +282,6 @@ interface TextDeclaration {
     measureDom?: any;
     fonts?: any;
 }
-
 type TextProp = string | TextContent | (TextDeclaration & {
     content: TextContent;
 }) | TextDeclaration;
@@ -302,7 +290,6 @@ interface VideoDeclaration {
     url: string;
     opacity?: number;
 }
-
 type VideoProp = Noneable | string | VideoDeclaration;
 
 interface IDOCElement extends IDOCNode {
@@ -312,18 +299,19 @@ interface IDOCElement extends IDOCNode {
     text?: TextProp;
     geometry?: GeometryProp;
     fill?: FillProp;
-    stroke?: StrokeProp;
+    outline?: OutlineProp;
+    shadow?: ShadowProp;
     children?: IDOCElement[];
 }
-
-interface ElementDeclaration extends IDOCElement {
+interface IDOCElementDeclaration extends IDOCElement {
     image?: ImageDeclaration;
     video?: VideoDeclaration;
     text?: TextDeclaration;
     geometry?: GeometryDeclaration;
     fill?: FillDeclaration;
-    stroke?: StrokeDeclaration;
-    children?: ElementDeclaration[];
+    outline?: OutlineDeclaration;
+    shadow?: ShadowDeclaration;
+    children?: IDOCElementDeclaration[];
 }
 
 interface IDOCDocument extends IDOCElement {
@@ -340,7 +328,10 @@ declare function getDefaultTextStyle(): TextStyleDeclaration;
 
 declare function getDefaultTransformStyle(): TransformStyleDeclaration;
 
-declare function normalizeElement(element: IDOCElement): ElementDeclaration;
+declare function clearUndef<T>(obj: T, deep?: boolean): T;
+declare function deepClearUndef<T>(obj: T): T;
+
+declare function normalizeElement(element: IDOCElement): IDOCElementDeclaration;
 
 declare function normalizeFill(fill?: FillProp): FillDeclaration | undefined;
 
@@ -348,7 +339,9 @@ declare function normalizeGeometry(geometry?: GeometryProp): GeometryDeclaration
 
 declare function normalizeImage(image?: ImageProp): ImageDeclaration | undefined;
 
-declare function normalizeStroke(stroke?: StrokeProp): StrokeDeclaration | undefined;
+declare function normalizeOutline(outline?: OutlineProp): OutlineDeclaration | undefined;
+
+declare function normalizeShadow(shadow?: ShadowProp): ShadowDeclaration | undefined;
 
 declare function normalizeText(text?: TextProp): TextDeclaration | undefined;
 
@@ -356,4 +349,4 @@ declare function normalizeTextContent(content?: TextContent): TextContentDeclara
 
 declare function normalizeVideo(video?: VideoProp): VideoDeclaration | undefined;
 
-export { type ColorFillDeclaration, type CommonFillDeclaration, type ElementDeclaration, type ElementStyleDeclaration, type FillDeclaration, type FillProp, type FillRule, type FragmentContent, type GeometryDeclaration, type GeometryProp, type HighlightDeclaration, type HighlightStyleDeclaration, type IDOCDocument, type IDOCElement, type IDOCNode, type ImageDeclaration, type ImageFillDeclaration, type ImageFillRect, type ImageFillTile, type ImageProp, type LayoutStyleDeclaration, type ListStyleDeclaration, type ListStyleStyleDeclaration, type MetaProp, type ParagraphContent, type Path2DDeclaration, type Path2DStyle, type SVGPathData, type ShadowDeclaration, type ShadowStyleDeclaration, type StrokeDeclaration, type StrokeLinecap, type StrokeLinejoin, type StrokeProp, type StyleDeclaration, type StyleProp, type TextContent, type TextContentDeclaration, type TextContentFlat, type TextDeclaration, type TextDrawStyleDeclaration, type TextInlineStyleDeclaration, type TextLineStyleDeclaration, type TextProp, type TextStyleDeclaration, type TransformStyleDeclaration, type VideoDeclaration, type VideoProp, getDefaultElementStyle, getDefaultShadowStyle, getDefaultStyle, getDefaultTextStyle, getDefaultTransformStyle, normalizeElement, normalizeFill, normalizeGeometry, normalizeImage, normalizeStroke, normalizeText, normalizeTextContent, normalizeVideo };
+export { type ColorFillDeclaration, type CommonFillDeclaration, type ElementStyleDeclaration, type FillDeclaration, type FillProp, type FillRule, type FragmentContent, type GeometryDeclaration, type GeometryProp, type HighlightDeclaration, type HighlightStyleDeclaration, type IDOCDocument, type IDOCElement, type IDOCElementDeclaration, type IDOCNode, type ImageDeclaration, type ImageFillDeclaration, type ImageFillRect, type ImageFillTile, type ImageProp, type LayoutStyleDeclaration, type ListStyleDeclaration, type ListStyleStyleDeclaration, type MetaProp, type OutlineDeclaration, type OutlineProp, type ParagraphContent, type Path2DDeclaration, type Path2DStyle, type SVGPathData, type ShadowDeclaration, type ShadowProp, type ShadowStyleDeclaration, type StrokeLinecap, type StrokeLinejoin, type StyleDeclaration, type StyleProp, type TextContent, type TextContentDeclaration, type TextContentFlat, type TextDeclaration, type TextDrawStyleDeclaration, type TextInlineStyleDeclaration, type TextLineStyleDeclaration, type TextProp, type TextStyleDeclaration, type TransformStyleDeclaration, type VideoDeclaration, type VideoProp, clearUndef, deepClearUndef, getDefaultElementStyle, getDefaultShadowStyle, getDefaultStyle, getDefaultTextStyle, getDefaultTransformStyle, normalizeElement, normalizeFill, normalizeGeometry, normalizeImage, normalizeOutline, normalizeShadow, normalizeText, normalizeTextContent, normalizeVideo };

package/dist/index.d.ts

@@ -1,3 +1,6 @@
+type Noneable = 'none';
+type Sizeable = `${number}%` | `${number}rem` | number;
+
 interface ImageFillRect {
     left?: number;
     top?: number;
@@ -16,7 +19,8 @@ interface CommonFillDeclaration {
     opacity?: number;
 }
 interface ImageFillDeclaration extends CommonFillDeclaration {
-    image?: string;
+    type: 'image';
+    image: string;
     dpi?: number;
     rotateWithShape?: boolean;
     srcRect?: ImageFillRect;
@@ -24,10 +28,11 @@ interface ImageFillDeclaration extends CommonFillDeclaration {
     tile?: ImageFillTile;
 }
 interface ColorFillDeclaration extends CommonFillDeclaration {
-    color?: string;
-}
-interface FillDeclaration extends ImageFillDeclaration, ColorFillDeclaration {
+    type: 'color';
+    color: string;
 }
+type FillDeclaration = ImageFillDeclaration | ColorFillDeclaration;
+type FillProp = Noneable | string | FillDeclaration;
 
 type SVGPathData = string;
 type FillRule = 'nonzero' | 'evenodd';
@@ -59,12 +64,6 @@ interface Path2DDeclaration extends Partial<Path2DStyle> {
 interface GeometryDeclaration {
     data: Path2DDeclaration[];
 }
-
-type Noneable = 'none';
-type Sizeable = `${number}%` | `${number}rem` | number;
-
-type FillProp = Noneable | string | FillDeclaration;
-
 type GeometryProp = Noneable | SVGPathData | SVGPathData[] | Path2DDeclaration[] | GeometryDeclaration;
 
 interface MetaProp {
@@ -81,18 +80,27 @@ interface ImageDeclaration {
     url: string;
     opacity?: number;
 }
-
 type ImageProp = Noneable | string | ImageDeclaration;
 
-interface StrokeDeclaration {
+interface OutlineDeclaration {
     width?: number;
     style?: 'dashed' | 'solid' | string;
     image?: string;
     color?: string;
     opacity?: number;
 }
+type OutlineProp = Noneable | string | Partial<OutlineDeclaration>;
 
-type StrokeProp = Noneable | string | StrokeDeclaration;
+interface ShadowDeclaration {
+    color: string;
+    offsetX?: number;
+    offsetY?: number;
+    blur?: number;
+}
+type ShadowProp = Noneable | string | ShadowDeclaration;
+interface ShadowStyleDeclaration {
+    boxShadow: Noneable | string;
+}
 
 type Overflow = 'hidden' | 'visible';
 type Visibility = 'hidden' | 'visible';
@@ -169,22 +177,6 @@ interface LayoutStyleDeclaration {
     width: number | 'auto' | `${number}%`;
 }
 
-interface ShadowDeclaration {
-    color: string;
-    offsetX: number;
-    offsetY: number;
-    blur: number;
-}
-
-interface ShadowStyleDeclaration {
-    shadow?: Partial<ShadowDeclaration>;
-    shadowColor: string;
-    shadowOffsetX: number;
-    shadowOffsetY: number;
-    shadowBlur: number;
-    boxShadow: 'none' | string;
-}
-
 interface TransformStyleDeclaration {
     rotate: number;
     scaleX: number;
@@ -215,7 +207,6 @@ interface HighlightDeclaration {
     size: HighlightSize;
     thickness: HighlightThickness;
 }
-
 interface HighlightStyleDeclaration {
     highlight?: Partial<HighlightDeclaration>;
     highlightImage: HighlightImage;
@@ -233,7 +224,6 @@ interface ListStyleDeclaration {
     size: ListStyleSize;
     position: ListStylePosition;
 }
-
 interface ListStyleStyleDeclaration {
     listStyle?: Partial<ListStyleDeclaration>;
     listStyleType: ListStyleType;
@@ -275,7 +265,6 @@ interface TextStyleDeclaration extends TextLineStyleDeclaration, TextInlineStyle
 
 interface StyleDeclaration extends TextStyleDeclaration, ElementStyleDeclaration {
 }
-
 type StyleProp = Partial<StyleDeclaration>;
 
 interface FragmentContent extends Partial<StyleDeclaration> {
@@ -293,7 +282,6 @@ interface TextDeclaration {
     measureDom?: any;
     fonts?: any;
 }
-
 type TextProp = string | TextContent | (TextDeclaration & {
     content: TextContent;
 }) | TextDeclaration;
@@ -302,7 +290,6 @@ interface VideoDeclaration {
     url: string;
     opacity?: number;
 }
-
 type VideoProp = Noneable | string | VideoDeclaration;
 
 interface IDOCElement extends IDOCNode {
@@ -312,18 +299,19 @@ interface IDOCElement extends IDOCNode {
     text?: TextProp;
     geometry?: GeometryProp;
     fill?: FillProp;
-    stroke?: StrokeProp;
+    outline?: OutlineProp;
+    shadow?: ShadowProp;
     children?: IDOCElement[];
 }
-
-interface ElementDeclaration extends IDOCElement {
+interface IDOCElementDeclaration extends IDOCElement {
     image?: ImageDeclaration;
     video?: VideoDeclaration;
     text?: TextDeclaration;
     geometry?: GeometryDeclaration;
     fill?: FillDeclaration;
-    stroke?: StrokeDeclaration;
-    children?: ElementDeclaration[];
+    outline?: OutlineDeclaration;
+    shadow?: ShadowDeclaration;
+    children?: IDOCElementDeclaration[];
 }
 
 interface IDOCDocument extends IDOCElement {
@@ -340,7 +328,10 @@ declare function getDefaultTextStyle(): TextStyleDeclaration;
 
 declare function getDefaultTransformStyle(): TransformStyleDeclaration;
 
-declare function normalizeElement(element: IDOCElement): ElementDeclaration;
+declare function clearUndef<T>(obj: T, deep?: boolean): T;
+declare function deepClearUndef<T>(obj: T): T;
+
+declare function normalizeElement(element: IDOCElement): IDOCElementDeclaration;
 
 declare function normalizeFill(fill?: FillProp): FillDeclaration | undefined;
 
@@ -348,7 +339,9 @@ declare function normalizeGeometry(geometry?: GeometryProp): GeometryDeclaration
 
 declare function normalizeImage(image?: ImageProp): ImageDeclaration | undefined;
 
-declare function normalizeStroke(stroke?: StrokeProp): StrokeDeclaration | undefined;
+declare function normalizeOutline(outline?: OutlineProp): OutlineDeclaration | undefined;
+
+declare function normalizeShadow(shadow?: ShadowProp): ShadowDeclaration | undefined;
 
 declare function normalizeText(text?: TextProp): TextDeclaration | undefined;
 
@@ -356,4 +349,4 @@ declare function normalizeTextContent(content?: TextContent): TextContentDeclara
 
 declare function normalizeVideo(video?: VideoProp): VideoDeclaration | undefined;
 
-export { type ColorFillDeclaration, type CommonFillDeclaration, type ElementDeclaration, type ElementStyleDeclaration, type FillDeclaration, type FillProp, type FillRule, type FragmentContent, type GeometryDeclaration, type GeometryProp, type HighlightDeclaration, type HighlightStyleDeclaration, type IDOCDocument, type IDOCElement, type IDOCNode, type ImageDeclaration, type ImageFillDeclaration, type ImageFillRect, type ImageFillTile, type ImageProp, type LayoutStyleDeclaration, type ListStyleDeclaration, type ListStyleStyleDeclaration, type MetaProp, type ParagraphContent, type Path2DDeclaration, type Path2DStyle, type SVGPathData, type ShadowDeclaration, type ShadowStyleDeclaration, type StrokeDeclaration, type StrokeLinecap, type StrokeLinejoin, type StrokeProp, type StyleDeclaration, type StyleProp, type TextContent, type TextContentDeclaration, type TextContentFlat, type TextDeclaration, type TextDrawStyleDeclaration, type TextInlineStyleDeclaration, type TextLineStyleDeclaration, type TextProp, type TextStyleDeclaration, type TransformStyleDeclaration, type VideoDeclaration, type VideoProp, getDefaultElementStyle, getDefaultShadowStyle, getDefaultStyle, getDefaultTextStyle, getDefaultTransformStyle, normalizeElement, normalizeFill, normalizeGeometry, normalizeImage, normalizeStroke, normalizeText, normalizeTextContent, normalizeVideo };
+export { type ColorFillDeclaration, type CommonFillDeclaration, type ElementStyleDeclaration, type FillDeclaration, type FillProp, type FillRule, type FragmentContent, type GeometryDeclaration, type GeometryProp, type HighlightDeclaration, type HighlightStyleDeclaration, type IDOCDocument, type IDOCElement, type IDOCElementDeclaration, type IDOCNode, type ImageDeclaration, type ImageFillDeclaration, type ImageFillRect, type ImageFillTile, type ImageProp, type LayoutStyleDeclaration, type ListStyleDeclaration, type ListStyleStyleDeclaration, type MetaProp, type OutlineDeclaration, type OutlineProp, type ParagraphContent, type Path2DDeclaration, type Path2DStyle, type SVGPathData, type ShadowDeclaration, type ShadowProp, type ShadowStyleDeclaration, type StrokeLinecap, type StrokeLinejoin, type StyleDeclaration, type StyleProp, type TextContent, type TextContentDeclaration, type TextContentFlat, type TextDeclaration, type TextDrawStyleDeclaration, type TextInlineStyleDeclaration, type TextLineStyleDeclaration, type TextProp, type TextStyleDeclaration, type TransformStyleDeclaration, type VideoDeclaration, type VideoProp, clearUndef, deepClearUndef, getDefaultElementStyle, getDefaultShadowStyle, getDefaultStyle, getDefaultTextStyle, getDefaultTransformStyle, normalizeElement, normalizeFill, normalizeGeometry, normalizeImage, normalizeOutline, normalizeShadow, normalizeText, normalizeTextContent, normalizeVideo };

package/dist/index.js

@@ -1 +1 @@
-(function(n,i){typeof exports=="object"&&typeof module<"u"?i(exports):typeof define=="function"&&define.amd?define(["exports"],i):(n=typeof globalThis<"u"?globalThis:n||self,i(n.modernIdoc={}))})(this,function(n){"use strict";function i(){return{overflow:"visible",alignContent:"stretch",alignItems:"stretch",alignSelf:"auto",borderTop:"none",borderLeft:"none",borderRight:"none",borderBottom:"none",borderWidth:0,border:"none",direction:"inherit",display:"flex",flex:0,flexBasis:"auto",flexDirection:"row",flexGrow:0,flexShrink:1,flexWrap:"nowrap",height:"auto",justifyContent:"flex-start",gap:0,marginTop:0,marginLeft:0,marginRight:0,marginBottom:0,margin:0,maxHeight:0,maxWidth:0,minHeight:0,minWidth:0,paddingTop:0,paddingLeft:0,paddingRight:0,paddingBottom:0,padding:0,top:0,bottom:0,left:0,right:0,position:"static",boxSizing:"content-box",width:"auto"}}function a(){return{shadowColor:"transparent",shadowOffsetX:0,shadowOffsetY:0,shadowBlur:0,boxShadow:"none"}}function f(){return{rotate:0,scaleX:1,scaleY:1,skewX:0,skewY:0,translateX:0,translateY:0,transform:"none",transformOrigin:"center"}}function u(){return{...f(),...i(),...a(),visibility:"visible",filter:"none",opacity:1,backgroundImage:"none",backgroundColor:"transparent",borderRadius:0,borderColor:"transparent"}}function s(){return{writingMode:"horizontal-tb",verticalAlign:"baseline",lineHeight:1.2,letterSpacing:0,wordSpacing:0,fontSize:14,fontWeight:"normal",fontFamily:"",fontStyle:"normal",fontKerning:"normal",textWrap:"wrap",textAlign:"start",textIndent:0,textTransform:"none",textOrientation:"mixed",textDecoration:"none",textStrokeWidth:0,textStrokeColor:"black",color:"black",listStyleType:"none",listStyleImage:"none",listStyleColormap:"none",listStyleSize:"cover",listStylePosition:"outside",highlightImage:"none",highlightReferImage:"none",highlightColormap:"none",highlightLine:"none",highlightSize:"cover",highlightThickness:"100%"}}function p(){return{...u(),...s()}}function g(e){if(!(!e||e==="none"))return typeof e=="string"?{color:e}:e}function d(e){if(!(!e||e==="none"))return typeof e=="string"?{data:[{data:e}]}:Array.isArray(e)?{data:e.map(r=>typeof r=="string"?{data:r}:r)}:e}function m(e){if(!(!e||e==="none"))return typeof e=="string"?{url:e}:e}function c(e){if(!(!e||e==="none"))return typeof e=="string"?{color:e}:e}function l(e=""){return(Array.isArray(e)?e:[e]).map(t=>typeof t=="string"?{fragments:[{content:t}]}:"content"in t?{fragments:[{...t}]}:"fragments"in t?{...t,fragments:t.fragments.map(o=>({...o}))}:Array.isArray(t)?{fragments:t.map(o=>typeof o=="string"?{content:o}:{...o})}:{fragments:[]})}function h(e){if(!(!e||e==="none"))return typeof e=="string"?{content:[{fragments:[{content:e}]}]}:"content"in e?{...e,content:l(e.content)}:{content:l(e)}}function y(e){if(!(!e||e==="none"))return typeof e=="string"?{url:e}:{...e}}function S(e){var r;return{...e,image:m(e.image),video:y(e.video),text:h(e.text),geometry:d(e.geometry),fill:g(e.fill),stroke:c(e.stroke),children:(r=e.children)==null?void 0:r.map(t=>S(t))}}n.getDefaultElementStyle=u,n.getDefaultShadowStyle=a,n.getDefaultStyle=p,n.getDefaultTextStyle=s,n.getDefaultTransformStyle=f,n.normalizeElement=S,n.normalizeFill=g,n.normalizeGeometry=d,n.normalizeImage=m,n.normalizeStroke=c,n.normalizeText=h,n.normalizeTextContent=l,n.normalizeVideo=y,Object.defineProperty(n,Symbol.toStringTag,{value:"Module"})});
+(function(n,o){typeof exports=="object"&&typeof module<"u"?o(exports):typeof define=="function"&&define.amd?define(["exports"],o):(n=typeof globalThis<"u"?globalThis:n||self,o(n.modernIdoc={}))})(this,function(n){"use strict";function o(){return{overflow:"visible",alignContent:"stretch",alignItems:"stretch",alignSelf:"auto",borderTop:"none",borderLeft:"none",borderRight:"none",borderBottom:"none",borderWidth:0,border:"none",direction:"inherit",display:"flex",flex:0,flexBasis:"auto",flexDirection:"row",flexGrow:0,flexShrink:1,flexWrap:"nowrap",height:"auto",justifyContent:"flex-start",gap:0,marginTop:0,marginLeft:0,marginRight:0,marginBottom:0,margin:0,maxHeight:0,maxWidth:0,minHeight:0,minWidth:0,paddingTop:0,paddingLeft:0,paddingRight:0,paddingBottom:0,padding:0,top:0,bottom:0,left:0,right:0,position:"static",boxSizing:"content-box",width:"auto"}}function u(){return{boxShadow:"none"}}function s(){return{rotate:0,scaleX:1,scaleY:1,skewX:0,skewY:0,translateX:0,translateY:0,transform:"none",transformOrigin:"center"}}function g(){return{...s(),...o(),...u(),visibility:"visible",filter:"none",opacity:1,backgroundImage:"none",backgroundColor:"transparent",borderRadius:0,borderColor:"transparent"}}function c(){return{writingMode:"horizontal-tb",verticalAlign:"baseline",lineHeight:1.2,letterSpacing:0,wordSpacing:0,fontSize:14,fontWeight:"normal",fontFamily:"",fontStyle:"normal",fontKerning:"normal",textWrap:"wrap",textAlign:"start",textIndent:0,textTransform:"none",textOrientation:"mixed",textDecoration:"none",textStrokeWidth:0,textStrokeColor:"black",color:"black",listStyleType:"none",listStyleImage:"none",listStyleColormap:"none",listStyleSize:"cover",listStylePosition:"outside",highlightImage:"none",highlightReferImage:"none",highlightColormap:"none",highlightLine:"none",highlightSize:"cover",highlightThickness:"100%"}}function T(){return{...g(),...c()}}function l(e,r=!1){if(typeof e!="object"||!e)return e;if(Array.isArray(e))return r?e.map(i=>l(i,r)):e;const t={};for(const i in e){const a=e[i];a!=null&&(r?t[i]=l(a,r):t[i]=a)}return t}function v(e){return l(e,!0)}function d(e){if(!(!e||e==="none"))return typeof e=="string"?{type:"color",color:e}:e}function m(e){if(!(!e||e==="none"))return typeof e=="string"?{data:[{data:e}]}:Array.isArray(e)?{data:e.map(r=>typeof r=="string"?{data:r}:r)}:e}function h(e){if(!(!e||e==="none"))return typeof e=="string"?{url:e}:e}function y(e){if(!(!e||e==="none"))return typeof e=="string"?{color:e}:e}function S(e){if(!(!e||e==="none"))return typeof e=="string"?{color:e}:e}function f(e=""){return(Array.isArray(e)?e:[e]).map(t=>typeof t=="string"?{fragments:[{content:t}]}:"content"in t?{fragments:[{...t}]}:"fragments"in t?{...t,fragments:t.fragments.map(i=>({...i}))}:Array.isArray(t)?{fragments:t.map(i=>typeof i=="string"?{content:i}:{...i})}:{fragments:[]})}function p(e){if(!(!e||e==="none"))return typeof e=="string"?{content:[{fragments:[{content:e}]}]}:"content"in e?{...e,content:f(e.content)}:{content:f(e)}}function z(e){if(!(!e||e==="none"))return typeof e=="string"?{url:e}:{...e}}function b(e){var r;return l({...e,image:h(e.image),video:z(e.video),text:p(e.text),geometry:m(e.geometry),fill:d(e.fill),outline:y(e.outline),shadow:S(e.shadow),children:(r=e.children)==null?void 0:r.map(t=>b(t))})}n.clearUndef=l,n.deepClearUndef=v,n.getDefaultElementStyle=g,n.getDefaultShadowStyle=u,n.getDefaultStyle=T,n.getDefaultTextStyle=c,n.getDefaultTransformStyle=s,n.normalizeElement=b,n.normalizeFill=d,n.normalizeGeometry=m,n.normalizeImage=h,n.normalizeOutline=y,n.normalizeShadow=S,n.normalizeText=p,n.normalizeTextContent=f,n.normalizeVideo=z,Object.defineProperty(n,Symbol.toStringTag,{value:"Module"})});

package/dist/index.mjs

@@ -47,10 +47,6 @@ function getDefaultLayoutStyle() {
 
 function getDefaultShadowStyle() {
   return {
-    shadowColor: "transparent",
-    shadowOffsetX: 0,
-    shadowOffsetY: 0,
-    shadowBlur: 0,
     boxShadow: "none"
   };
 }
@@ -134,11 +130,41 @@ function getDefaultStyle() {
   };
 }
 
+function clearUndef(obj, deep = false) {
+  if (typeof obj !== "object" || !obj) {
+    return obj;
+  }
+  if (Array.isArray(obj)) {
+    if (deep) {
+      return obj.map((v) => clearUndef(v, deep));
+    } else {
+      return obj;
+    }
+  }
+  const newObj = {};
+  for (const key in obj) {
+    const value = obj[key];
+    if (value === void 0 || value === null) {
+      continue;
+    }
+    if (deep) {
+      newObj[key] = clearUndef(value, deep);
+    } else {
+      newObj[key] = value;
+    }
+  }
+  return newObj;
+}
+function deepClearUndef(obj) {
+  return clearUndef(obj, true);
+}
+
 function normalizeFill(fill) {
   if (!fill || fill === "none") {
     return void 0;
   } else if (typeof fill === "string") {
     return {
+      type: "color",
       color: fill
     };
   } else {
@@ -183,15 +209,27 @@ function normalizeImage(image) {
   }
 }
 
-function normalizeStroke(stroke) {
-  if (!stroke || stroke === "none") {
+function normalizeOutline(outline) {
+  if (!outline || outline === "none") {
     return void 0;
-  } else if (typeof stroke === "string") {
+  } else if (typeof outline === "string") {
     return {
-      color: stroke
+      color: outline
     };
   } else {
-    return stroke;
+    return outline;
+  }
+}
+
+function normalizeShadow(shadow) {
+  if (!shadow || shadow === "none") {
+    return void 0;
+  } else if (typeof shadow === "string") {
+    return {
+      color: shadow
+    };
+  } else {
+    return shadow;
   }
 }
 
@@ -275,16 +313,17 @@ function normalizeVideo(video) {
 }
 
 function normalizeElement(element) {
-  return {
+  return clearUndef({
     ...element,
     image: normalizeImage(element.image),
     video: normalizeVideo(element.video),
     text: normalizeText(element.text),
     geometry: normalizeGeometry(element.geometry),
     fill: normalizeFill(element.fill),
-    stroke: normalizeStroke(element.stroke),
+    outline: normalizeOutline(element.outline),
+    shadow: normalizeShadow(element.shadow),
     children: element.children?.map((child) => normalizeElement(child))
-  };
+  });
 }
 
-export { getDefaultElementStyle, getDefaultShadowStyle, getDefaultStyle, getDefaultTextStyle, getDefaultTransformStyle, normalizeElement, normalizeFill, normalizeGeometry, normalizeImage, normalizeStroke, normalizeText, normalizeTextContent, normalizeVideo };
+export { clearUndef, deepClearUndef, getDefaultElementStyle, getDefaultShadowStyle, getDefaultStyle, getDefaultTextStyle, getDefaultTransformStyle, normalizeElement, normalizeFill, normalizeGeometry, normalizeImage, normalizeOutline, normalizeShadow, normalizeText, normalizeTextContent, normalizeVideo };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modern-idoc",
   "type": "module",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "packageManager": "pnpm@9.15.1",
   "description": "Intermediate document for modern codec libs",
   "author": "wxm",