Version bump

#851 Use predictive unique id generation

demo/64-complex-numbering-text.ts

@@ -0,0 +1,111 @@
+// Numbered lists - With complex number text
+// Import from 'docx' rather than '../build' if you install from npm
+import * as fs from "fs";
+import { Document, Packer, Paragraph, LevelFormat } from "../build";
+
+const doc = new Document({
+    numbering: {
+        config: [
+            {
+                reference: "ref1",
+                levels: [
+                    {
+                        level: 0,
+                        format: LevelFormat.DECIMAL,
+                        text: "%1",
+                    },
+                    {
+                        level: 1,
+                        format: LevelFormat.DECIMAL,
+                        text: "%1.%2",
+                    },
+                    {
+                        level: 2,
+                        format: LevelFormat.DECIMAL,
+                        text: "%1.%2.%3",
+                    },
+                ],
+            },
+        ],
+    },
+    sections: [
+        {
+            children: [
+                new Paragraph({
+                    text: "REF1 - lvl:0",
+                    numbering: {
+                        reference: "ref1",
+                        level: 0,
+                    },
+                }),
+                new Paragraph({
+                    text: "REF1 - lvl:1",
+                    numbering: {
+                        reference: "ref1",
+                        level: 1,
+                    },
+                }),
+                new Paragraph({
+                    text: "REF1  - lvl:2",
+                    numbering: {
+                        reference: "ref1",
+                        level: 2,
+                    },
+                }),
+                new Paragraph({
+                    text: "REF1 - lvl:0",
+                    numbering: {
+                        reference: "ref1",
+                        level: 0,
+                    },
+                }),
+                new Paragraph({
+                    text: "REF1 - lvl:0",
+                    numbering: {
+                        reference: "ref1",
+                        level: 0,
+                    },
+                }),
+                new Paragraph({
+                    text: "REF1 - lvl:0",
+                    numbering: {
+                        reference: "ref1",
+                        level: 0,
+                    },
+                }),
+                new Paragraph({
+                    text: "Random text",
+                }),
+                new Paragraph({
+                    text: "REF1 - inst:1 - lvl:0",
+                    numbering: {
+                        reference: "ref1",
+                        instance: 1,
+                        level: 0,
+                    },
+                }),
+                new Paragraph({
+                    text: "REF1 - inst:0 - lvl:0",
+                    numbering: {
+                        reference: "ref1",
+                        instance: 0,
+                        level: 0,
+                    },
+                }),
+                new Paragraph({
+                    text: "REF1 - inst:0 - lvl:0",
+                    numbering: {
+                        reference: "ref1",
+                        instance: 0,
+                        level: 0,
+                    },
+                }),
+            ],
+        },
+    ],
+});
+
+// Used to export the file into a .docx file
+Packer.toBuffer(doc).then((buffer) => {
+    fs.writeFileSync("6-numbering.docx", buffer);
+});

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "docx",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -5640,9 +5640,9 @@
       "dev": true
     },
     "nise": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/nise/-/nise-4.0.4.tgz",
-      "integrity": "sha512-bTTRUNlemx6deJa+ZyoCUTRvH3liK5+N6VQZ4NIw90AgDXY6iPnsqplNFf6STcj+ePk0H/xqxnP75Lr0J0Fq3A==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/nise/-/nise-4.1.0.tgz",
+      "integrity": "sha512-eQMEmGN/8arp0xsvGoQ+B1qvSkR73B1nWSCh7nOt5neMCtwcQVYQGdzQMhcNscktTsWB54xnlSQFzOAPJD8nXA==",
       "dev": true,
       "requires": {
         "@sinonjs/commons": "^1.7.0",
@@ -7361,16 +7361,16 @@
       "dev": true
     },
     "sinon": {
-      "version": "9.2.4",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz",
-      "integrity": "sha512-zljcULZQsJxVra28qIAL6ow1Z9tpattkCTEJR4RBP3TGc00FcttsP5pK284Nas5WjMZU5Yzy3kAIp3B3KRf5Yg==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-10.0.0.tgz",
+      "integrity": "sha512-XAn5DxtGVJBlBWYrcYKEhWCz7FLwZGdyvANRyK06419hyEpdT0dMc5A8Vcxg5SCGHc40CsqoKsc1bt1CbJPfNw==",
       "dev": true,
       "requires": {
         "@sinonjs/commons": "^1.8.1",
         "@sinonjs/fake-timers": "^6.0.1",
         "@sinonjs/samsam": "^5.3.1",
         "diff": "^4.0.2",
-        "nise": "^4.0.4",
+        "nise": "^4.1.0",
         "supports-color": "^7.1.0"
       },
       "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "docx",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "Easily generate .docx files with JS/TS with a nice declarative API. Works for Node and on the Browser.",
   "main": "build/index.js",
   "scripts": {
@@ -85,7 +85,7 @@
     "request-promise": "^4.2.2",
     "rimraf": "^3.0.2",
     "shelljs": "^0.8.4",
-    "sinon": "^9.0.2",
+    "sinon": "^10.0.0",
     "ts-node": "^9.0.0",
     "tslint": "^6.1.3",
     "tslint-immutable": "^6.0.1",

src/convenience-functions.spec.ts

@@ -20,7 +20,7 @@ describe("Utility", () => {
     describe("#uniqueNumericId", () => {
         it("should generate a unique ID", () => {
             // tslint:disable-next-line: no-unused-expression
-            expect(uniqueNumericId()).to.not.be.empty;
+            expect(uniqueNumericId()).to.not.be.undefined;
         });
     });
 

src/convenience-functions.ts

@@ -1,6 +1,6 @@
-import { customAlphabet, nanoid } from "nanoid/non-secure";
+import { nanoid } from "nanoid/non-secure";
 
-const numericNanoId = customAlphabet("0123456789", 15);
+let currentCount = 0;
 
 // Twip - twentieths of a point
 export const convertMillimetersToTwip = (millimeters: number): number => {
@@ -12,7 +12,7 @@ export const convertInchesToTwip = (inches: number): number => {
 };
 
 export const uniqueNumericId = (): number => {
-    return parseFloat(numericNanoId());
+    return currentCount++;
 };
 
 export const uniqueId = (): string => {