Fix linting and style errors
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
import { XmlAttributeComponent } from "file/xml-components";
|
||||
import { Distance } from "../drawing";
|
||||
import { IDistance } from "../drawing";
|
||||
|
||||
export interface IAnchorAttributes extends Distance {
|
||||
export interface IAnchorAttributes extends IDistance {
|
||||
allowOverlap?: "0" | "1";
|
||||
behindDoc?: "0" | "1";
|
||||
layoutInCell?: "0" | "1";
|
||||
|
@ -1,10 +1,10 @@
|
||||
import { assert } from "chai";
|
||||
|
||||
import { Utility } from "../../../tests/utility";
|
||||
import { DrawingOptions, TextWrapStyle } from ".././";
|
||||
import { IDrawingOptions, TextWrapStyle } from ".././";
|
||||
import { Anchor } from "./";
|
||||
|
||||
function createDrawing(drawingOptions: DrawingOptions) {
|
||||
function createDrawing(drawingOptions: IDrawingOptions): Anchor {
|
||||
return new Anchor(
|
||||
1,
|
||||
{
|
||||
|
@ -1,24 +1,24 @@
|
||||
// http://officeopenxml.com/drwPicFloating.php
|
||||
import { IMediaDataDimensions } from "file/media";
|
||||
import { XmlComponent } from "file/xml-components";
|
||||
import { IDrawingOptions } from "../drawing";
|
||||
import {
|
||||
HorizontalPosition,
|
||||
HorizontalPositionRelativeFrom,
|
||||
IFloating,
|
||||
SimplePos,
|
||||
VerticalPosition,
|
||||
VerticalPositionRelativeFrom,
|
||||
} from "../floating";
|
||||
import { Graphic } from "../inline/graphic";
|
||||
import { TextWrapStyle, WrapNone, WrapSquare, WrapTight, WrapTopAndBottom } from "../text-wrap";
|
||||
import { DocProperties } from "./../doc-properties/doc-properties";
|
||||
import { EffectExtent } from "./../effect-extent/effect-extent";
|
||||
import { Extent } from "./../extent/extent";
|
||||
import { Graphic } from "./../graphic";
|
||||
import { GraphicFrameProperties } from "./../graphic-frame/graphic-frame-properties";
|
||||
import { AnchorAttributes } from "./anchor-attributes";
|
||||
import { DrawingOptions } from "../drawing";
|
||||
import {
|
||||
SimplePos,
|
||||
HorizontalPosition,
|
||||
VerticalPosition,
|
||||
Floating,
|
||||
VerticalPositionRelativeFrom,
|
||||
HorizontalPositionRelativeFrom,
|
||||
} from "../floating";
|
||||
import { WrapNone, TextWrapStyle, WrapSquare, WrapTight, WrapTopAndBottom } from "../text-wrap";
|
||||
|
||||
const defaultOptions: Floating = {
|
||||
const defaultOptions: IFloating = {
|
||||
allowOverlap: true,
|
||||
behindDocument: false,
|
||||
lockAnchor: false,
|
||||
@ -34,7 +34,7 @@ const defaultOptions: Floating = {
|
||||
};
|
||||
|
||||
export class Anchor extends XmlComponent {
|
||||
constructor(referenceId: number, dimensions: IMediaDataDimensions, drawingOptions: DrawingOptions) {
|
||||
constructor(referenceId: number, dimensions: IMediaDataDimensions, drawingOptions: IDrawingOptions) {
|
||||
super("wp:anchor");
|
||||
|
||||
const floating = {
|
||||
|
@ -2,9 +2,9 @@ import { assert } from "chai";
|
||||
import * as fs from "fs";
|
||||
|
||||
import { Utility } from "../../tests/utility";
|
||||
import { Drawing, DrawingOptions, PlacementPosition } from "./";
|
||||
import { Drawing, IDrawingOptions, PlacementPosition } from "./";
|
||||
|
||||
function createDrawing(drawingOptions?: DrawingOptions) {
|
||||
function createDrawing(drawingOptions?: IDrawingOptions): Drawing {
|
||||
const path = "./demo/images/image1.jpeg";
|
||||
return new Drawing(
|
||||
{
|
||||
|
@ -1,36 +1,36 @@
|
||||
import { IMediaData } from "file/media";
|
||||
import { XmlComponent } from "file/xml-components";
|
||||
import { Inline } from "./inline";
|
||||
import { Anchor } from "./anchor";
|
||||
import { TextWrapping } from "./text-wrap";
|
||||
import { Floating } from "./floating";
|
||||
import { IFloating } from "./floating";
|
||||
import { Inline } from "./inline";
|
||||
import { ITextWrapping } from "./text-wrap";
|
||||
|
||||
export enum PlacementPosition {
|
||||
INLINE,
|
||||
FLOATING,
|
||||
}
|
||||
|
||||
export interface Distance {
|
||||
export interface IDistance {
|
||||
distT?: number;
|
||||
distB?: number;
|
||||
distL?: number;
|
||||
distR?: number;
|
||||
}
|
||||
|
||||
export interface DrawingOptions {
|
||||
export interface IDrawingOptions {
|
||||
position?: PlacementPosition;
|
||||
textWrapping?: TextWrapping;
|
||||
floating?: Floating;
|
||||
textWrapping?: ITextWrapping;
|
||||
floating?: IFloating;
|
||||
}
|
||||
|
||||
const defaultDrawingOptions: DrawingOptions = {
|
||||
const defaultDrawingOptions: IDrawingOptions = {
|
||||
position: PlacementPosition.INLINE,
|
||||
};
|
||||
|
||||
export class Drawing extends XmlComponent {
|
||||
private inline: Inline;
|
||||
|
||||
constructor(imageData: IMediaData, drawingOptions?: DrawingOptions) {
|
||||
constructor(imageData: IMediaData, drawingOptions?: IDrawingOptions) {
|
||||
super("w:drawing");
|
||||
|
||||
if (imageData === undefined) {
|
||||
@ -42,7 +42,6 @@ export class Drawing extends XmlComponent {
|
||||
...drawingOptions,
|
||||
};
|
||||
|
||||
|
||||
if (mergedOptions.position === PlacementPosition.INLINE) {
|
||||
this.inline = new Inline(imageData.referenceId, imageData.dimensions);
|
||||
this.root.push(this.inline);
|
||||
|
@ -1,8 +1,8 @@
|
||||
import { assert } from "chai";
|
||||
|
||||
import { Align } from "./align";
|
||||
import { Utility } from "../../../tests/utility";
|
||||
import { VerticalPositionAlign } from ".";
|
||||
import { Utility } from "../../../tests/utility";
|
||||
import { Align } from "./align";
|
||||
|
||||
describe("Align", () => {
|
||||
describe("#constructor()", () => {
|
||||
|
@ -38,21 +38,21 @@ export enum VerticalPositionAlign {
|
||||
TOP = "top",
|
||||
}
|
||||
|
||||
export interface HorizontalPositionOptions {
|
||||
export interface IHorizontalPositionOptions {
|
||||
relative: HorizontalPositionRelativeFrom;
|
||||
align?: HorizontalPositionAlign;
|
||||
offset?: number;
|
||||
}
|
||||
|
||||
export interface VerticalPositionOptions {
|
||||
export interface IVerticalPositionOptions {
|
||||
relative: VerticalPositionRelativeFrom;
|
||||
align?: VerticalPositionAlign;
|
||||
offset?: number;
|
||||
}
|
||||
|
||||
export interface Floating {
|
||||
horizontalPosition: HorizontalPositionOptions;
|
||||
verticalPosition: VerticalPositionOptions;
|
||||
export interface IFloating {
|
||||
horizontalPosition: IHorizontalPositionOptions;
|
||||
verticalPosition: IVerticalPositionOptions;
|
||||
allowOverlap?: boolean;
|
||||
lockAnchor?: boolean;
|
||||
behindDocument?: boolean;
|
||||
|
@ -1,8 +1,8 @@
|
||||
import { assert } from "chai";
|
||||
|
||||
import { HorizontalPosition } from "./horizontal-position";
|
||||
import { HorizontalPositionAlign, HorizontalPositionRelativeFrom } from ".";
|
||||
import { Utility } from "../../../tests/utility";
|
||||
import { HorizontalPositionRelativeFrom, HorizontalPositionAlign } from ".";
|
||||
import { HorizontalPosition } from "./horizontal-position";
|
||||
|
||||
describe("HorizontalPosition", () => {
|
||||
describe("#constructor()", () => {
|
||||
|
@ -1,7 +1,7 @@
|
||||
// http://officeopenxml.com/drwPicFloating-position.php
|
||||
import { XmlComponent, XmlAttributeComponent } from "file/xml-components";
|
||||
import { HorizontalPositionRelativeFrom, HorizontalPositionOptions } from "./floating-position";
|
||||
import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
|
||||
import { Align } from "./align";
|
||||
import { HorizontalPositionRelativeFrom, IHorizontalPositionOptions } from "./floating-position";
|
||||
import { PositionOffset } from "./position-offset";
|
||||
|
||||
interface IHorizontalPositionAttributes {
|
||||
@ -15,7 +15,7 @@ class HorizontalPositionAttributes extends XmlAttributeComponent<IHorizontalPosi
|
||||
}
|
||||
|
||||
export class HorizontalPosition extends XmlComponent {
|
||||
constructor(horizontalPosition: HorizontalPositionOptions) {
|
||||
constructor(horizontalPosition: IHorizontalPositionOptions) {
|
||||
super("wp:positionH");
|
||||
|
||||
this.root.push(
|
||||
|
@ -1,7 +1,7 @@
|
||||
import { assert } from "chai";
|
||||
|
||||
import { PositionOffset } from "./position-offset";
|
||||
import { Utility } from "../../../tests/utility";
|
||||
import { PositionOffset } from "./position-offset";
|
||||
|
||||
describe("PositionOffset", () => {
|
||||
describe("#constructor()", () => {
|
||||
|
@ -1,5 +1,5 @@
|
||||
// http://officeopenxml.com/drwPicFloating-position.php
|
||||
import { XmlComponent, XmlAttributeComponent } from "file/xml-components";
|
||||
import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
|
||||
|
||||
interface ISimplePosAttributes {
|
||||
x: number;
|
||||
|
@ -1,8 +1,8 @@
|
||||
import { assert } from "chai";
|
||||
|
||||
import { VerticalPosition } from "./vertical-position";
|
||||
import { VerticalPositionAlign, VerticalPositionRelativeFrom } from ".";
|
||||
import { Utility } from "../../../tests/utility";
|
||||
import { VerticalPositionRelativeFrom, VerticalPositionAlign } from ".";
|
||||
import { VerticalPosition } from "./vertical-position";
|
||||
|
||||
describe("VerticalPosition", () => {
|
||||
describe("#constructor()", () => {
|
||||
|
@ -1,7 +1,7 @@
|
||||
// http://officeopenxml.com/drwPicFloating-position.php
|
||||
import { XmlComponent, XmlAttributeComponent } from "file/xml-components";
|
||||
import { VerticalPositionRelativeFrom, VerticalPositionOptions } from "./floating-position";
|
||||
import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
|
||||
import { Align } from "./align";
|
||||
import { IVerticalPositionOptions, VerticalPositionRelativeFrom } from "./floating-position";
|
||||
import { PositionOffset } from "./position-offset";
|
||||
|
||||
interface IVerticalPositionAttributes {
|
||||
@ -15,7 +15,7 @@ class VerticalPositionAttributes extends XmlAttributeComponent<IVerticalPosition
|
||||
}
|
||||
|
||||
export class VerticalPosition extends XmlComponent {
|
||||
constructor(verticalPosition: VerticalPositionOptions) {
|
||||
constructor(verticalPosition: IVerticalPositionOptions) {
|
||||
super("wp:positionV");
|
||||
|
||||
this.root.push(
|
||||
|
@ -1,7 +1,8 @@
|
||||
import { XmlAttributeComponent } from "file/xml-components";
|
||||
import { Distance } from "../drawing";
|
||||
import { IDistance } from "../drawing";
|
||||
|
||||
export interface IInlineAttributes extends Distance {}
|
||||
// tslint:disable-next-line:no-empty-interface
|
||||
export interface IInlineAttributes extends IDistance {}
|
||||
|
||||
export class InlineAttributes extends XmlAttributeComponent<IInlineAttributes> {
|
||||
protected xmlKeys = {
|
||||
|
@ -4,8 +4,8 @@ import { XmlComponent } from "file/xml-components";
|
||||
import { DocProperties } from "./../doc-properties/doc-properties";
|
||||
import { EffectExtent } from "./../effect-extent/effect-extent";
|
||||
import { Extent } from "./../extent/extent";
|
||||
import { Graphic } from "./../graphic";
|
||||
import { GraphicFrameProperties } from "./../graphic-frame/graphic-frame-properties";
|
||||
import { Graphic } from "./../inline/graphic";
|
||||
import { InlineAttributes } from "./inline-attributes";
|
||||
|
||||
export class Inline extends XmlComponent {
|
||||
|
@ -1,5 +1,5 @@
|
||||
// http://officeopenxml.com/drwPicFloating-textWrap.php
|
||||
import { Distance } from "../drawing";
|
||||
import { IDistance } from "../drawing";
|
||||
|
||||
export enum TextWrapStyle {
|
||||
NONE,
|
||||
@ -15,8 +15,8 @@ export enum WrapTextOption {
|
||||
LARGEST = "largest",
|
||||
}
|
||||
|
||||
export interface TextWrapping {
|
||||
export interface ITextWrapping {
|
||||
textWrapStyle: TextWrapStyle;
|
||||
wrapTextOption?: WrapTextOption;
|
||||
distanceFromText?: Distance;
|
||||
distanceFromText?: IDistance;
|
||||
}
|
||||
|
@ -1,9 +1,9 @@
|
||||
// http://officeopenxml.com/drwPicFloating-textWrap.php
|
||||
import { XmlComponent, XmlAttributeComponent } from "file/xml-components";
|
||||
import { TextWrapping, WrapTextOption } from ".";
|
||||
import { Distance } from "../drawing";
|
||||
import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
|
||||
import { ITextWrapping, WrapTextOption } from ".";
|
||||
import { IDistance } from "../drawing";
|
||||
|
||||
interface IWrapSquareAttributes extends Distance {
|
||||
interface IWrapSquareAttributes extends IDistance {
|
||||
wrapText?: WrapTextOption;
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@ class WrapSquareAttributes extends XmlAttributeComponent<IWrapSquareAttributes>
|
||||
}
|
||||
|
||||
export class WrapSquare extends XmlComponent {
|
||||
constructor(textWrapping: TextWrapping) {
|
||||
constructor(textWrapping: ITextWrapping) {
|
||||
super("wp:wrapSquare");
|
||||
|
||||
this.root.push(
|
||||
|
@ -1,6 +1,6 @@
|
||||
// http://officeopenxml.com/drwPicFloating-textWrap.php
|
||||
import { XmlComponent, XmlAttributeComponent } from "file/xml-components";
|
||||
import { Distance } from "../drawing";
|
||||
import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
|
||||
import { IDistance } from "../drawing";
|
||||
|
||||
interface IWrapTightAttributes {
|
||||
distT?: number;
|
||||
@ -15,7 +15,7 @@ class WrapTightAttributes extends XmlAttributeComponent<IWrapTightAttributes> {
|
||||
}
|
||||
|
||||
export class WrapTight extends XmlComponent {
|
||||
constructor(distanceFromText?: Distance) {
|
||||
constructor(distanceFromText?: IDistance) {
|
||||
super("wp:wrapTight");
|
||||
|
||||
distanceFromText = distanceFromText || {
|
||||
|
@ -1,6 +1,6 @@
|
||||
// http://officeopenxml.com/drwPicFloating-textWrap.php
|
||||
import { XmlComponent, XmlAttributeComponent } from "file/xml-components";
|
||||
import { Distance } from "../drawing";
|
||||
import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
|
||||
import { IDistance } from "../drawing";
|
||||
|
||||
interface IWrapTopAndBottomAttributes {
|
||||
distT?: number;
|
||||
@ -15,7 +15,7 @@ class WrapTopAndBottomAttributes extends XmlAttributeComponent<IWrapTopAndBottom
|
||||
}
|
||||
|
||||
export class WrapTopAndBottom extends XmlComponent {
|
||||
constructor(distanceFromText?: Distance) {
|
||||
constructor(distanceFromText?: IDistance) {
|
||||
super("wp:wrapTopAndBottom");
|
||||
|
||||
distanceFromText = distanceFromText || {
|
||||
|
@ -1,9 +1,9 @@
|
||||
import { XmlComponent } from "file/xml-components";
|
||||
import { Footer } from "./footer/footer";
|
||||
import { IMediaData, Media } from "./media";
|
||||
import { Paragraph } from "./paragraph";
|
||||
import { Relationships } from "./relationships";
|
||||
import { Table } from "./table";
|
||||
import { XmlComponent } from ".";
|
||||
|
||||
export class FooterWrapper {
|
||||
private readonly footer: Footer;
|
||||
@ -36,7 +36,7 @@ export class FooterWrapper {
|
||||
this.footer.addDrawing(imageData);
|
||||
}
|
||||
|
||||
public addChildElement(childElement: XmlComponent | string) {
|
||||
public addChildElement(childElement: XmlComponent | string): void {
|
||||
this.footer.addChildElement(childElement);
|
||||
}
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
import { XmlComponent } from "file/xml-components";
|
||||
import { Header } from "./header/header";
|
||||
import { IMediaData, Media } from "./media";
|
||||
import { Paragraph } from "./paragraph";
|
||||
import { Relationships } from "./relationships";
|
||||
import { Table } from "./table";
|
||||
import { XmlComponent } from ".";
|
||||
|
||||
export class FirstPageHeaderWrapper {
|
||||
private readonly header: Header;
|
||||
@ -86,7 +86,7 @@ export class HeaderWrapper {
|
||||
this.header.addDrawing(imageData);
|
||||
}
|
||||
|
||||
public addChildElement(childElement: XmlComponent | string) {
|
||||
public addChildElement(childElement: XmlComponent | string): void {
|
||||
this.header.addChildElement(childElement);
|
||||
}
|
||||
|
||||
|
@ -1,12 +1,12 @@
|
||||
import { Drawing } from "../../drawing";
|
||||
import { DrawingOptions } from "../../drawing/drawing";
|
||||
import { IDrawingOptions } from "../../drawing/drawing";
|
||||
import { IMediaData } from "../../media/data";
|
||||
import { Run } from "../run";
|
||||
|
||||
export class PictureRun extends Run {
|
||||
private drawing: Drawing;
|
||||
|
||||
constructor(imageData: IMediaData, drawingOptions?: DrawingOptions) {
|
||||
constructor(imageData: IMediaData, drawingOptions?: IDrawingOptions) {
|
||||
super();
|
||||
|
||||
if (imageData === undefined) {
|
||||
|
@ -1,6 +1,6 @@
|
||||
import { Styles } from "./";
|
||||
import * as fastXmlParser from "fast-xml-parser";
|
||||
import { ImportedXmlComponent, ImportedRootElementAttributes, parseOptions, convertToXmlComponent } from "./../../file/xml-components";
|
||||
import { convertToXmlComponent, ImportedRootElementAttributes, ImportedXmlComponent, parseOptions } from "file/xml-components";
|
||||
import { Styles } from "./";
|
||||
|
||||
export class ExternalStylesFactory {
|
||||
/**
|
||||
|
@ -1,3 +1,4 @@
|
||||
/* tslint:disable */
|
||||
import { XmlComponent, IXmlableObject } from ".";
|
||||
import * as fastXmlParser from "fast-xml-parser";
|
||||
import { flatMap } from "lodash";
|
||||
|
Reference in New Issue
Block a user