unify Shading; breaking change: Paragraph/Run shading option key type changed to val, and shadow alias removed

src/file/paragraph/paragraph.spec.ts

@@ -7,8 +7,8 @@ import { EMPTY_OBJECT } from "file/xml-components";
 
 import { IViewWrapper } from "../document-wrapper";
 import { File } from "../file";
+import { ShadingType } from "../shading";
 import { HorizontalPositionAlign, VerticalPositionAlign } from "../shared";
-import { ShadingType } from "../table/shading";
 import { AlignmentType, HeadingLevel, LeaderType, PageBreak, TabStopPosition, TabStopType } from "./formatting";
 import { FrameAnchorType } from "./frame";
 import { Bookmark, ExternalHyperlink } from "./links";
@@ -835,7 +835,7 @@ describe("Paragraph", () => {
         it("should set shading to the given value", () => {
             const paragraph = new Paragraph({
                 shading: {
-                    type: ShadingType.REVERSE_DIAGONAL_STRIPE,
+                    val: ShadingType.REVERSE_DIAGONAL_STRIPE,
                     color: "00FFFF",
                     fill: "FF0000",
                 },

src/file/paragraph/properties.ts

@@ -1,7 +1,7 @@
 // http://officeopenxml.com/WPparagraphProperties.php
 import { IContext, IgnoreIfEmptyXmlComponent, IXmlableObject, XmlComponent } from "file/xml-components";
 import { DocumentWrapper } from "../document-wrapper";
-import { ShadingType } from "../table/shading";
+import { IShadingAttributesProperties, Shading } from "../shading";
 import { Alignment, AlignmentType } from "./formatting/alignment";
 import { Bidirectional } from "./formatting/bidirectional";
 import { Border, IBorderOptions, ThematicBreak } from "./formatting/border";
@@ -15,7 +15,6 @@ import { NumberProperties } from "./formatting/unordered-list";
 import { WidowControl } from "./formatting/widow-control";
 import { FrameProperties, IFrameOptions } from "./frame/frame-properties";
 import { OutlineLevel } from "./links";
-import { Shading } from "./run/formatting";
 
 export interface IParagraphStylePropertiesOptions {
     readonly alignment?: AlignmentType;
@@ -50,11 +49,7 @@ export interface IParagraphPropertiesOptions extends IParagraphStylePropertiesOp
         readonly instance?: number;
         readonly custom?: boolean;
     };
-    readonly shading?: {
-        readonly type: ShadingType;
-        readonly fill: string;
-        readonly color: string;
-    };
+    readonly shading?: IShadingAttributesProperties;
     readonly widowControl?: boolean;
     readonly frame?: IFrameOptions;
 }
@@ -131,7 +126,7 @@ export class ParagraphProperties extends IgnoreIfEmptyXmlComponent {
         }
 
         if (options.shading) {
-            this.push(new Shading(options.shading.type, options.shading.fill, options.shading.color));
+            this.push(new Shading(options.shading));
         }
 
         if (options.rightTabStop) {

src/file/paragraph/run/formatting.ts

@@ -186,16 +186,3 @@ export class HighlightComplexScript extends XmlComponent {
         );
     }
 }
-
-export class Shading extends XmlComponent {
-    constructor(value: string, fill: string, color: string) {
-        super("w:shd");
-        this.root.push(
-            new Attributes({
-                val: value,
-                fill: fill,
-                color: color,
-            }),
-        );
-    }
-}

src/file/paragraph/run/properties.ts

@@ -1,4 +1,4 @@
-import { ShadingType } from "file/table";
+import { IShadingAttributesProperties, Shading } from "file/shading";
 import { IgnoreIfEmptyXmlComponent, XmlComponent } from "file/xml-components";
 import { EmphasisMark, EmphasisMarkType } from "./emphasis-mark";
 import {
@@ -15,7 +15,6 @@ import {
     Italics,
     ItalicsComplexScript,
     RightToLeft,
-    Shading,
     Size,
     SizeComplexScript,
     SmallCaps,
@@ -57,12 +56,7 @@ export interface IRunStylePropertiesOptions {
     readonly highlight?: string;
     readonly highlightComplexScript?: boolean | string;
     readonly characterSpacing?: number;
-    readonly shading?: {
-        readonly type: ShadingType;
-        readonly fill: string;
-        readonly color: string;
-    };
-    readonly shadow?: IRunStylePropertiesOptions["shading"];
+    readonly shading?: IShadingAttributesProperties;
     readonly emboss?: boolean;
     readonly imprint?: boolean;
 }
@@ -179,9 +173,8 @@ export class RunProperties extends IgnoreIfEmptyXmlComponent {
             this.push(new Imprint());
         }
 
-        const shading = options.shading || options.shadow;
-        if (shading) {
-            this.push(new Shading(shading.type, shading.fill, shading.color));
+        if (options.shading) {
+            this.push(new Shading(options.shading));
         }
     }
 

src/file/paragraph/run/run.spec.ts

@@ -2,7 +2,7 @@ import { expect } from "chai";
 
 import { Formatter } from "export/formatter";
 // import { FootnoteReferenceRun } from "file/footnotes/footnote/run/reference-run";
-import { ShadingType } from "file/table";
+import { ShadingType } from "file/shading";
 
 import { Run } from "./";
 import { EmphasisMarkType } from "./emphasis-mark";
@@ -234,7 +234,7 @@ describe("Run", () => {
         it("it should add shadow to the properties", () => {
             const run = new Run({
                 shading: {
-                    type: ShadingType.PERCENT_10,
+                    val: ShadingType.PERCENT_10,
                     fill: "00FFFF",
                     color: "FF0000",
                 },