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

Merge branch 'master' into feat/deprecate-shelljs

Browse Source 
# Conflicts:
#	src/file/numbering/numbering.ts
This commit is contained in:
Dolan Miu
2023-06-01 02:08:08 +01:00
parent 0cbb5fb0a3 b59fa6bb16
commit a89919397d
11 changed files with 39 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/file/drawing/anchor/anchor.spec.ts
View File

@ -1,8 +1,6 @@
import { assert, expect } from "chai";
import { SinonStub, stub } from "sinon";
import { Formatter } from "@export/formatter";
import * as convenienceFunctions from "@util/convenience-functions";
import { Utility } from "tests/utility";
@ -40,14 +38,6 @@ const createAnchor = (drawingOptions: IDrawingOptions): Anchor =>
);
describe("Anchor", () => {
before(() => {
stub(convenienceFunctions, "docPropertiesUniqueNumericId").callsFake(() => 0);
});
after(() => {
(convenienceFunctions.docPropertiesUniqueNumericId as SinonStub).restore();
});
let anchor: Anchor;
describe("#constructor()", () => {
@ -466,7 +456,7 @@ describe("Anchor", () => {
"wp:docPr": {
_attr: {
descr: "test",
id: 0,
id: 1,
name: "test",
title: "test",
},

6
src/file/drawing/doc-properties/doc-properties.ts
View File

@ -2,7 +2,7 @@
import { IContext, IXmlableObject, NextAttributeComponent, XmlComponent } from "@file/xml-components";
import { ConcreteHyperlink } from "@file/paragraph";
import { docPropertiesUniqueNumericId } from "@util/convenience-functions";
import { docPropertiesUniqueNumericIdGen } from "@util/convenience-functions";
import { createHyperlinkClick } from "./doc-properties-children";
@ -25,6 +25,8 @@ export interface DocPropertiesOptions {
}
export class DocProperties extends XmlComponent {
private readonly docPropertiesUniqueNumericId = docPropertiesUniqueNumericIdGen();
public constructor({ name, description, title }: DocPropertiesOptions = { name: "", description: "", title: "" }) {
super("wp:docPr");
@ -32,7 +34,7 @@ export class DocProperties extends XmlComponent {
new NextAttributeComponent({
id: {
key: "id",
value: docPropertiesUniqueNumericId(),
value: this.docPropertiesUniqueNumericId(),
},
name: {
key: "name",

16
src/file/drawing/drawing.spec.ts
View File

@ -1,9 +1,7 @@
import { expect } from "chai";
import { SinonStub, stub } from "sinon";
import { IContext } from "@file/xml-components";
import { Formatter } from "@export/formatter";
import * as convenienceFunctions from "@util/convenience-functions";
import { ConcreteHyperlink, TextRun } from "../";
import { Drawing, IDrawingOptions } from "./drawing";
@ -30,14 +28,6 @@ const createDrawing = (drawingOptions?: IDrawingOptions): Drawing =>
);
describe("Drawing", () => {
before(() => {
stub(convenienceFunctions, "docPropertiesUniqueNumericId").callsFake(() => 0);
});
after(() => {
(convenienceFunctions.docPropertiesUniqueNumericId as SinonStub).restore();
});
let currentBreak: Drawing;
describe("#constructor()", () => {
@ -78,7 +68,7 @@ describe("Drawing", () => {
"wp:docPr": {
_attr: {
descr: "",
id: 0,
id: 1,
name: "",
title: "",
},
@ -309,7 +299,7 @@ describe("Drawing", () => {
"wp:docPr": {
_attr: {
descr: "",
id: 0,
id: 1,
name: "",
title: "",
},
@ -543,7 +533,7 @@ describe("Drawing", () => {
{
_attr: {
descr: "",
id: 0,
id: 1,
name: "",
title: "",
},