smartyellow/docx-js
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17 from felipeochoa/cleanup

Browse Source 
More cleanup
This commit is contained in:
Dolan
2017-03-10 14:53:42 +00:00
committed by GitHub
parent b00e4fa5b5 35ddda444a
commit 738cac0253
24 changed files with 191 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -30,12 +30,8 @@
"@types/app-root-path": "^1.2.4",
"@types/archiver": "^0.15.37",
"@types/express": "^4.0.35",
"@types/lodash": "^4.14.54",
"app-root-path": "^2.0.1",
"archiver": "^1.3.0",
"install": "^0.8.7",
"lodash": "^4.6.1",
"npm": "^4.3.0",
"xml": "^1.0.1"
},
"author": "Dolan Miu",

15
ts/docx/document/document-attributes.ts
View File

@ -26,10 +26,8 @@ interface IDocumentAttributesProperties {
type?: string;
}
export class DocumentAttributes extends XmlAttributeComponent {
constructor(properties?: IDocumentAttributesProperties) {
super({
export class DocumentAttributes extends XmlAttributeComponent<IDocumentAttributesProperties> {
protected xmlKeys = {
wpc: "xmlns:wpc",
mc: "xmlns:mc",
o: "xmlns:o",
@ -53,12 +51,5 @@ export class DocumentAttributes extends XmlAttributeComponent {
dcmitype: "xmlns:dcmitype",
xsi: "xmlns:xsi",
type: "xsi:type",
}, properties);
this.root = properties;
if (!properties) {
this.root = {};
}
}
};
}

6
ts/docx/document/index.ts
View File

@ -33,4 +33,10 @@ export class Document extends XmlComponent {
public addParagraph(paragraph: Paragraph): void {
this.body.push(paragraph);
}
public createParagraph(text?: string): Paragraph {
const para = new Paragraph(text);
this.addParagraph(para);
return para;
}
}

15
ts/docx/paragraph/indent.ts
View File

@ -1,18 +1,15 @@
import { XmlAttributeComponent, XmlComponent } from "../xml-components";
interface IndentAttributesProperties {
left: number;
hanging: number;
interface IIndentAttributesProperties {
left?: number;
hanging?: number;
}
class IndentAttributes extends XmlAttributeComponent {
constructor(properties: IndentAttributesProperties) {
super({
class IndentAttributes extends XmlAttributeComponent<IIndentAttributesProperties> {
protected xmlKeys = {
left: "w:left",
hanging: "w:hanging",
}, properties);
}
};
}
export class Indent extends XmlComponent {

6
ts/docx/paragraph/index.ts
View File

@ -38,6 +38,12 @@ export class Paragraph extends XmlComponent {
return this;
}
public createTextRun(text: string): TextRun {
const run = new TextRun(text);
this.addText(run);
return run;
}
public heading1(): Paragraph {
this.properties.push(new Style("Heading1"));
return this;

8
ts/docx/paragraph/spacing.ts
View File

@ -6,14 +6,12 @@ export interface ISpacingProperties {
line?: number;
}
class SpacingAttributes extends XmlAttributeComponent {
constructor(properties: ISpacingProperties) {
super({
class SpacingAttributes extends XmlAttributeComponent<ISpacingProperties> {
protected xmlKeys = {
after: "w:after",
before: "w:before",
line: "w:line",
}, properties);
}
};
}
export class Spacing extends XmlComponent {

9
ts/docx/run/run-fonts.ts
View File

@ -6,15 +6,12 @@ interface IRunFontAttributesProperties {
hint?: string;
}
class RunFontAttributes extends XmlAttributeComponent {
constructor(properties: IRunFontAttributesProperties) {
super({
class RunFontAttributes extends XmlAttributeComponent<IRunFontAttributesProperties> {
protected xmlKeys = {
ascii: "w:ascii",
hAnsi: "w:hAnsi",
hint: "w:hint",
}, properties);
}
};
}
export class RunFonts extends XmlComponent {

9
ts/docx/xml-components/attributes.ts
View File

@ -22,10 +22,8 @@ interface IAttributesProperties {
pos?: string | number; // Little strange. Perhaps it is normal. Need to clarify in the spec.
}
export class Attributes extends XmlAttributeComponent {
constructor(properties?: IAttributesProperties) {
super({
export class Attributes extends XmlAttributeComponent<IAttributesProperties> {
protected xmlKeys = {
val: "w:val",
color: "w:color",
space: "w:space",
@ -45,6 +43,5 @@ export class Attributes extends XmlAttributeComponent {
gutter: "w:gutter",
linePitch: "w:linePitch",
pos: "w:pos",
}, properties);
}
};
}

22
ts/docx/xml-components/default-attributes.ts
View File

@ -1,31 +1,25 @@
import * as _ from "lodash";
import { BaseXmlComponent } from "./base";
export abstract class XmlAttributeComponent extends BaseXmlComponent {
protected root: object;
private xmlKeys: object;
type AttributeMap<T> = {[P in keyof T]: string};
constructor(xmlKeys: object, properties: object) {
export abstract class XmlAttributeComponent<T> extends BaseXmlComponent {
protected root: T;
protected xmlKeys: AttributeMap<T>;
constructor(properties: T) {
super("_attr");
this.xmlKeys = xmlKeys;
this.root = properties;
if (!properties) {
this.root = {};
}
}
public prepForXml(): {_attr: {[key: string]: (string | number | boolean)}} {
const attrs = {};
if (this.root !== undefined) {
_.forOwn(this.root, (value, key) => {
Object.keys(this.root).forEach((key) => {
const value = this.root[key];
if (value !== undefined) {
const newKey = this.xmlKeys[key];
attrs[newKey] = value;
}
});
}
return {_attr: attrs};
}
}

1
ts/export/index.ts
View File

@ -1,2 +1,3 @@
export { LocalPacker } from "./packer/local";
export { ExpressPacker } from "./packer/express";
export { Packer } from "./packer/packer";

15
ts/export/packer/packer.ts
View File

@ -20,17 +20,18 @@ export abstract class Packer {
constructor(document: Document, style?: Styles, properties?: Properties, numbering?: Numbering) {
this.formatter = new Formatter();
this.document = document;
this.style = style;
this.properties = properties;
this.numbering = numbering;
this.archive = archiver.create("zip", {});
if (!style) {
if (style) {
this.style = style;
} else {
const stylesFactory = new DefaultStylesFactory();
this.style = stylesFactory.newInstance();
}
if (!properties) {
if (properties) {
this.properties = properties;
} else {
this.properties = new Properties({
creator: "Un-named",
revision: "1",
@ -38,7 +39,9 @@ export abstract class Packer {
});
}
if (!numbering) {
if (numbering) {
this.numbering = numbering;
} else {
this.numbering = new Numbering();
}

1
ts/index.ts
View File

@ -2,3 +2,4 @@ export * from "./docx";
export * from "./export";
export { Numbering } from "./numbering";
export { Styles } from "./styles";
export * from './export';

9
ts/numbering/abstract-numbering.ts
View File

@ -7,14 +7,11 @@ interface IAbstractNumberingAttributesProperties {
restartNumberingAfterBreak?: number;
}
class AbstractNumberingAttributes extends XmlAttributeComponent {
constructor(properties: IAbstractNumberingAttributesProperties) {
super({
class AbstractNumberingAttributes extends XmlAttributeComponent<IAbstractNumberingAttributesProperties> {
protected xmlKeys = {
abstractNumId: "w:abstractNumId",
restartNumberingAfterBreak: "w15:restartNumberingAfterBreak",
}, properties);
}
};
}
export class AbstractNumbering extends XmlComponent {

9
ts/numbering/level.ts
View File

@ -7,14 +7,11 @@ interface ILevelAttributesProperties {
tentative?: number;
}
class LevelAttributes extends XmlAttributeComponent {
constructor(properties: ILevelAttributesProperties) {
super({
class LevelAttributes extends XmlAttributeComponent<ILevelAttributesProperties> {
protected xmlKeys = {
ilvl: "w:ilvl",
tentative: "w15:tentative",
}, properties);
}
};
}
class Start extends XmlComponent {

9
ts/numbering/num.ts
View File

@ -14,13 +14,8 @@ interface INumAttributesProperties {
numId: number;
}
class NumAttributes extends XmlAttributeComponent {
constructor(properties: INumAttributesProperties) {
super({
numId: "w:numId",
}, properties);
}
class NumAttributes extends XmlAttributeComponent<INumAttributesProperties> {
protected xmlKeys = {numId: "w:numId"};
}
export class Num extends XmlComponent {

1
ts/styles/index.ts
View File

@ -3,7 +3,6 @@ import { XmlComponent } from "../docx/xml-components";
import { DocumentDefaults } from "./defaults";
import { LatentStyles } from "./latent-styles";
import { LatentStyleException } from "./latent-styles/exceptions";
import { LatentStyleExceptionAttributes } from "./latent-styles/exceptions/attributes";
import { ParagraphStyle } from "./style";
export class Styles extends XmlComponent {

27
ts/styles/latent-styles/exceptions.ts Normal file
View File

@ -0,0 +1,27 @@
import { XmlAttributeComponent, XmlComponent } from "../../docx/xml-components";
interface ILatentStyleExceptionAttributesProperties {
name?: string;
uiPriority?: string;
qFormat?: string;
semiHidden?: string;
unhideWhenUsed?: string;
}
class LatentStyleExceptionAttributes extends XmlAttributeComponent<ILatentStyleExceptionAttributesProperties> {
protected xmlKeys = {
name: "w:name",
uiPriority: "w:uiPriority",
qFormat: "w:qFormat",
semiHidden: "w:semiHidden",
unhideWhenUsed: "w:unhideWhenUsed",
};
}
export class LatentStyleException extends XmlComponent {
constructor(attributes: ILatentStyleExceptionAttributesProperties) {
super("w:lsdException");
this.root.push(new LatentStyleExceptionAttributes(attributes));
}
}

33
ts/styles/latent-styles/exceptions/attributes.ts
View File

@ -1,33 +0,0 @@
import {XmlComponent} from "../../../docx/xml-components";
interface ILatentStyleExceptionAttributesProperties {
name?: string;
uiPriority?: string;
qFormat?: string;
semiHidden?: string;
unhideWhenUsed?: string;
}
export class LatentStyleExceptionAttributes extends XmlComponent {
/* tslint:disable */
private _attr: ILatentStyleExceptionAttributesProperties;
/* tslint:enable */
private xmlKeys = {
name: "w:name",
uiPriority: "w:uiPriority",
qFormat: "w:qFormat",
semiHidden: "w:semiHidden",
unhideWhenUsed: "w:unhideWhenUsed",
};
constructor(properties?: ILatentStyleExceptionAttributesProperties) {
super("_attr");
this._attr = properties;
if (!properties) {
this._attr = {};
}
// this._attr.xmlKeys = this.xmlKeys;
}
}

10
ts/styles/latent-styles/exceptions/index.ts
View File

@ -1,10 +0,0 @@
import { XmlComponent } from "../../../docx/xml-components";
import { LatentStyleExceptionAttributes } from "./attributes";
export class LatentStyleException extends XmlComponent {
constructor(attributes: LatentStyleExceptionAttributes) {
super("w:lsdException");
this.root.push(attributes);
}
}

6
ts/styles/style/components.ts
View File

@ -4,10 +4,8 @@ interface IComponentAttributes {
val: string;
}
class ComponentAttributes extends XmlAttributeComponent {
constructor(properties: IComponentAttributes) {
super({val: "w:val"}, properties);
}
class ComponentAttributes extends XmlAttributeComponent<IComponentAttributes> {
protected xmlKeys = {val: "w:val"};
}
export class Name extends XmlComponent {

8
ts/styles/style/index.ts
View File

@ -14,15 +14,13 @@ export interface IStyleAttributes {
customStyle?: string;
}
class StyleAttributes extends XmlAttributeComponent {
constructor(properties: IStyleAttributes) {
super({
class StyleAttributes extends XmlAttributeComponent<IStyleAttributes> {
protected xmlKeys = {
type: "w:type",
styleId: "w:styleId",
default: "w:default",
customStyle: "w:customStyle",
}, properties);
}
};
}
export class Style extends XmlComponent {

26
ts/tests/docx/document/documentTest.ts
View File

@ -1,5 +1,6 @@
import { assert } from "chai";
import { assert, expect } from "chai";
import * as docx from "../../../docx";
import { Formatter } from "../../../export/formatter";
describe("Document", () => {
let document: docx.Document;
@ -22,4 +23,27 @@ describe("Document", () => {
assert.isTrue(true);
});
});
describe("#createParagraph", () => {
it("should create a new paragraph and append it to body", () => {
const para = document.createParagraph();
expect(para).to.be.an.instanceof(docx.Paragraph);
const body = new Formatter().format(document)["w:document"][1]["w:body"];
expect(body).to.be.an("array").which.has.length.at.least(1);
expect(body[0]).to.have.property("w:p");
});
it("should use the text given to create a run in the paragraph", () => {
const para = document.createParagraph("sample paragraph text");
expect(para).to.be.an.instanceof(docx.Paragraph);
const body = new Formatter().format(document)["w:document"][1]["w:body"];
expect(body).to.be.an("array").which.has.length.at.least(1);
expect(body[0]).to.have.property("w:p").which.includes({
"w:r": [
{"w:rPr": []},
{"w:t": ["sample paragraph text"]},
],
});
});
});
});

14
ts/tests/docx/paragraph/paragraphTests.ts
View File

@ -32,6 +32,20 @@ describe("Paragraph", () => {
});
});
describe("#createTextRun", () => {
it("should add a new run to the paragraph and return it", () => {
const run = paragraph.createTextRun("this is a test run");
expect(run).to.be.instanceof(docx.TextRun);
const tree = new Formatter().format(paragraph)["w:p"];
expect(tree).to.be.an("array").which.includes({
"w:r": [
{"w:rPr": []},
{"w:t": ["this is a test run"]},
],
});
});
});
describe("#heading1()", () => {
it("should add heading style to JSON", () => {
paragraph.heading1();

13
ts/tests/docx/xml-components/attributeTest.ts
View File

@ -2,21 +2,8 @@ import { assert } from "chai";
import { Attributes } from "../../../docx/xml-components";
describe("Attribute", () => {
let attributes: Attributes;
beforeEach(() => {
attributes = new Attributes();
});
describe("#constructor()", () => {
it("should not add val with empty constructor", () => {
const newAttrs = new Attributes();
const stringifiedJson = JSON.stringify(newAttrs);
const newJson = JSON.parse(stringifiedJson);
assert.isUndefined(newJson.root.val);
});
it("should have val as defined with populated constructor", () => {
const newAttrs = new Attributes({
val: "test",