From 3505912f74b6b8a65d9703967b6e482cdc447432 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Mar 2023 11:57:03 +0000 Subject: [PATCH 01/17] build(deps-dev): bump cspell from 6.30.2 to 6.31.1 Bumps [cspell](https://github.com/streetsidesoftware/cspell) from 6.30.2 to 6.31.1. - [Release notes](https://github.com/streetsidesoftware/cspell/releases) - [Changelog](https://github.com/streetsidesoftware/cspell/blob/main/CHANGELOG.md) - [Commits](https://github.com/streetsidesoftware/cspell/compare/v6.30.2...v6.31.1) --- updated-dependencies: - dependency-name: cspell dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 312 +++++++++++++++++++++++----------------------- 1 file changed, 156 insertions(+), 156 deletions(-) diff --git a/package-lock.json b/package-lock.json index 978dfacf64..4ac4e74e7d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -399,9 +399,9 @@ } }, "node_modules/@cspell/cspell-bundled-dicts": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-6.30.2.tgz", - "integrity": "sha512-M6Y7FKF6UVvCVS5QoMHZ9EeAaA1NUNHqp5hI+KWT8T0dbJnvSzYGuIMi6fMclip4uZeXMtVFiobJET8PacvzvA==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-6.31.1.tgz", + "integrity": "sha512-rsIev+dk1Vd8H1OKZhNhXycIVsMfeWJaeW3QUi1l4oIoGwQfJVbs1ZPZPHE5cglzyHOW1jQNStXf34UKaC6siA==", "dev": true, "dependencies": { "@cspell/dict-ada": "^4.0.1", @@ -417,12 +417,12 @@ "@cspell/dict-docker": "^1.1.6", "@cspell/dict-dotnet": "^5.0.0", "@cspell/dict-elixir": "^4.0.2", - "@cspell/dict-en_us": "^4.3.1", + "@cspell/dict-en_us": "^4.3.2", "@cspell/dict-en-common-misspellings": "^1.0.2", "@cspell/dict-en-gb": "1.1.33", "@cspell/dict-filetypes": "^3.0.0", "@cspell/dict-fonts": "^3.0.1", - "@cspell/dict-fullstack": "^3.1.4", + "@cspell/dict-fullstack": "^3.1.5", "@cspell/dict-gaming-terms": "^1.0.4", "@cspell/dict-git": "^2.0.0", "@cspell/dict-golang": "^6.0.1", @@ -444,7 +444,7 @@ "@cspell/dict-ruby": "^5.0.0", "@cspell/dict-rust": "^4.0.1", "@cspell/dict-scala": "^5.0.0", - "@cspell/dict-software-terms": "^3.1.5", + "@cspell/dict-software-terms": "^3.1.6", "@cspell/dict-sql": "^2.1.0", "@cspell/dict-svelte": "^1.0.2", "@cspell/dict-swift": "^2.0.1", @@ -456,27 +456,27 @@ } }, "node_modules/@cspell/cspell-pipe": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-6.30.2.tgz", - "integrity": "sha512-iPmlAM0qJetiMBY76kz4FpT41xL9wLjXfVP3Zb1xpSPxi38ElpJmJIOxSjyzagOnk4w1JQtdm3jGx3QFhgrKIA==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-6.31.1.tgz", + "integrity": "sha512-zk1olZi4dr6GLm5PAjvsiZ01HURNSruUYFl1qSicGnTwYN8GaN4RhAwannAytcJ7zJPIcyXlid0YsB58nJf3wQ==", "dev": true, "engines": { "node": ">=14" } }, "node_modules/@cspell/cspell-service-bus": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-6.30.2.tgz", - "integrity": "sha512-UxXLM1ViwM14MiJ/qfhfy8VNjieN02/kRdsUNBTVzWzitIzyU4q8Xa56/oH8iBCCEcruk0ft4uJe7mWW+Viq3A==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-6.31.1.tgz", + "integrity": "sha512-YyBicmJyZ1uwKVxujXw7sgs9x+Eps43OkWmCtDZmZlnq489HdTSuhF1kTbVi2yeFSeaXIS87+uHo12z97KkQpg==", "dev": true, "engines": { "node": ">=14" } }, "node_modules/@cspell/cspell-types": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-6.30.2.tgz", - "integrity": "sha512-UDnnR4hslBv2SIUlkHNnnX/VbSUBqeWRdM36lISDO5oLJV88g3sRLSSVJB6E9bhtfAXyxTdVio4C23NWf98Rng==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-6.31.1.tgz", + "integrity": "sha512-1KeTQFiHMssW1eRoF2NZIEg4gPVIfXLsL2+VSD/AV6YN7lBcuf6gRRgV5KWYarhxtEfjxhDdDTmu26l/iJEUtw==", "dev": true, "engines": { "node": ">=14" @@ -561,9 +561,9 @@ "dev": true }, "node_modules/@cspell/dict-en_us": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.3.1.tgz", - "integrity": "sha512-akfx/Q+4J3rfawtGaqe1Yp+fNyCGJCKmTQT14LXxGLN7DEjGvOFzlYoS+DdD3aDwAJih79bEFGiG+Lqs0zOauA==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.3.2.tgz", + "integrity": "sha512-o8xtHDLPNzW6hK5b1TaDTWt25vVi9lWlL6/dZ9YoS+ZMj+Dy/yuXatqfOgeGyU3a9+2gxC0kbr4oufMUQXI2mQ==", "dev": true }, "node_modules/@cspell/dict-en-common-misspellings": { @@ -591,9 +591,9 @@ "dev": true }, "node_modules/@cspell/dict-fullstack": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/@cspell/dict-fullstack/-/dict-fullstack-3.1.4.tgz", - "integrity": "sha512-OnCIn3GgAhdhsU6xMYes7/WXnbV6R/5k/zRAu/d+WZP4Ltf48z7oFfNFjHXH6b8ZwnMhpekLAnCeIfT5dcxRqw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/@cspell/dict-fullstack/-/dict-fullstack-3.1.5.tgz", + "integrity": "sha512-6ppvo1dkXUZ3fbYn/wwzERxCa76RtDDl5Afzv2lijLoijGGUw5yYdLBKJnx8PJBGNLh829X352ftE7BElG4leA==", "dev": true }, "node_modules/@cspell/dict-gaming-terms": { @@ -723,9 +723,9 @@ "dev": true }, "node_modules/@cspell/dict-software-terms": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.1.5.tgz", - "integrity": "sha512-wmkWHHkp2AN9EDWNBLB0VASB5OtsC3KnhoAHxCJzC6AB3xjYoBfKsvgI/o50gfbsCVQceHpqXjOEYSw/xxTKNw==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.1.6.tgz", + "integrity": "sha512-w46+pIMRVtrDuTZXK/YxDP5NL5yVoX0ImEPO0s9WbxdyyfhzAF3sGYHBGN/50OGLHExcqe6Idb9feoRC9mCLxw==", "dev": true }, "node_modules/@cspell/dict-sql": { @@ -759,9 +759,9 @@ "dev": true }, "node_modules/@cspell/dynamic-import": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-6.30.2.tgz", - "integrity": "sha512-q6oWWJx9SZMc0NXz2bPReBWqN8ZlEZovLDrC2fznMWenD+YflY9gqcc3Hl3Ebw+RujOVAETc/YUpWn1TTxKgzw==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-6.31.1.tgz", + "integrity": "sha512-uliIUv9uZlnyYmjUlcw/Dm3p0xJOEnWJNczHAfqAl4Ytg6QZktw0GtUA9b1umbRXLv0KRTPtSC6nMq3cR7rRmQ==", "dev": true, "dependencies": { "import-meta-resolve": "^2.2.2" @@ -771,9 +771,9 @@ } }, "node_modules/@cspell/strong-weak-map": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-6.30.2.tgz", - "integrity": "sha512-ON7lhyER4jAanAjt1LOQxmwBYRKYBaAtpyQGV8eHzYl5pmf6HHevDSmd65HtFcM0Zq4MnQyk+W7qjd3BF6lMYw==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-6.31.1.tgz", + "integrity": "sha512-z8AuWvUuSnugFKJOA9Ke0aiFuehcqLFqia9bk8XaQNEWr44ahPVn3sEWnAncTxPbpWuUw5UajoJa0egRAE1CCg==", "dev": true, "engines": { "node": ">=14.6" @@ -3349,19 +3349,19 @@ } }, "node_modules/cspell": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/cspell/-/cspell-6.30.2.tgz", - "integrity": "sha512-2++f3cA4bCDON0Evd0D5GvhUU25yQx6Mhrm+DDBapBXKo6oXHn88mLNWU9csc6oVXrUcCAx3uH5U6FNKEiKGQQ==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/cspell/-/cspell-6.31.1.tgz", + "integrity": "sha512-gyCtpkOpwI/TGibbtIgMBFnAUUp2hnYdvW/9Ky4RcneHtLH0+V/jUEbZD8HbRKz0GVZ6mhKWbNRSEyP9p3Cejw==", "dev": true, "dependencies": { - "@cspell/cspell-pipe": "6.30.2", - "@cspell/dynamic-import": "6.30.2", + "@cspell/cspell-pipe": "6.31.1", + "@cspell/dynamic-import": "6.31.1", "chalk": "^4.1.2", "commander": "^10.0.0", - "cspell-gitignore": "6.30.2", - "cspell-glob": "6.30.2", - "cspell-io": "6.30.2", - "cspell-lib": "6.30.2", + "cspell-gitignore": "6.31.1", + "cspell-glob": "6.31.1", + "cspell-io": "6.31.1", + "cspell-lib": "6.31.1", "fast-glob": "^3.2.12", "fast-json-stable-stringify": "^2.1.0", "file-entry-cache": "^6.0.1", @@ -3383,14 +3383,14 @@ } }, "node_modules/cspell-dictionary": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-6.30.2.tgz", - "integrity": "sha512-ZRdN42T+9EknDzfWKg2CBKV1wH6/DIic6Y/DhKkHGcJ/02ys+5N587nR8zS5vB/d8Be4qOXVLFZ39nfdZ0vT1A==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-6.31.1.tgz", + "integrity": "sha512-7+K7aQGarqbpucky26wled7QSCJeg6VkLUWS+hLjyf0Cqc9Zew5xsLa4QjReExWUJx+a97jbiflITZNuWxgMrg==", "dev": true, "dependencies": { - "@cspell/cspell-pipe": "6.30.2", - "@cspell/cspell-types": "6.30.2", - "cspell-trie-lib": "6.30.2", + "@cspell/cspell-pipe": "6.31.1", + "@cspell/cspell-types": "6.31.1", + "cspell-trie-lib": "6.31.1", "fast-equals": "^4.0.3", "gensequence": "^5.0.2" }, @@ -3399,12 +3399,12 @@ } }, "node_modules/cspell-gitignore": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-6.30.2.tgz", - "integrity": "sha512-I/14FKE0CZTmx5HgAx3ieFk7k97hJkqin6w8VT/YiPf20lm2ca2VgXOMT+sndLw+cFIX1EdRU/KECRIYwipKXg==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-6.31.1.tgz", + "integrity": "sha512-PAcmjN6X89Z8qgjem6HYb+VmvVtKuc+fWs4sk21+jv2MiLk23Bkp+8slSaIDVR//58fxJkMx17PHyo2cDO/69A==", "dev": true, "dependencies": { - "cspell-glob": "6.30.2", + "cspell-glob": "6.31.1", "find-up": "^5.0.0" }, "bin": { @@ -3415,9 +3415,9 @@ } }, "node_modules/cspell-glob": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/cspell-glob/-/cspell-glob-6.30.2.tgz", - "integrity": "sha512-lINrcHJaUFkK0X3Je1uBTXozv41HvPsZBwQnHiXzKiuSin4oE7dQ+D/MQIa9UryvMfnJV/BeCiIDkuHO4oA17A==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/cspell-glob/-/cspell-glob-6.31.1.tgz", + "integrity": "sha512-ygEmr5hgE4QtO5+L3/ihfMKBhPipbapfS22ilksFSChKMc15Regds0z+z/1ZBoe+OFAPneQfIuBxMwQ/fB00GQ==", "dev": true, "dependencies": { "micromatch": "^4.0.5" @@ -3427,13 +3427,13 @@ } }, "node_modules/cspell-grammar": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-6.30.2.tgz", - "integrity": "sha512-x9x80/uPwpXGLu2Vg/vb9Ncn1Mw8Y0Xzz2WXqzLufKyWk2S0tGHVvkDS6YkQRuK6gOabk5nDwhtnpwt93sgn1Q==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-6.31.1.tgz", + "integrity": "sha512-AsRVP0idcNFVSb9+p9XjMumFj3BUV67WIPWApaAzJl/dYyiIygQObRE+si0/QtFWGNw873b7hNhWZiKjqIdoaQ==", "dev": true, "dependencies": { - "@cspell/cspell-pipe": "6.30.2", - "@cspell/cspell-types": "6.30.2" + "@cspell/cspell-pipe": "6.31.1", + "@cspell/cspell-types": "6.31.1" }, "bin": { "cspell-grammar": "bin.mjs" @@ -3443,12 +3443,12 @@ } }, "node_modules/cspell-io": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/cspell-io/-/cspell-io-6.30.2.tgz", - "integrity": "sha512-moklQX2sYf2QC60i6RQCzIXyNONrOqNCa99UH4bFwxaHltMMef3bBOuVoDDfs/9vjeEPVgBwWQi+PEuhbyKq4w==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/cspell-io/-/cspell-io-6.31.1.tgz", + "integrity": "sha512-deZcpvTYY/NmLfOdOtzcm+nDvJZozKmj4TY3pPpX0HquPX0A/w42bFRT/zZNmRslFl8vvrCZZUog7SOc6ha3uA==", "dev": true, "dependencies": { - "@cspell/cspell-service-bus": "6.30.2", + "@cspell/cspell-service-bus": "6.31.1", "node-fetch": "^2.6.9" }, "engines": { @@ -3456,24 +3456,24 @@ } }, "node_modules/cspell-lib": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/cspell-lib/-/cspell-lib-6.30.2.tgz", - "integrity": "sha512-5qkiRLGrjVV7unnobrma2V2istiDg9TEdY0UsBVGmjty57KXaoiSuTeEOmSS5QLp4IBF5Uo1P9F+Q3Svp8yCQw==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/cspell-lib/-/cspell-lib-6.31.1.tgz", + "integrity": "sha512-KgSiulbLExY+z2jGwkO77+aAkyugsPAw7y07j3hTQLpd+0esPCZqrmbo2ItnkvkDNd/c34PqQCr7/044/rz8gw==", "dev": true, "dependencies": { - "@cspell/cspell-bundled-dicts": "6.30.2", - "@cspell/cspell-pipe": "6.30.2", - "@cspell/cspell-types": "6.30.2", - "@cspell/strong-weak-map": "6.30.2", + "@cspell/cspell-bundled-dicts": "6.31.1", + "@cspell/cspell-pipe": "6.31.1", + "@cspell/cspell-types": "6.31.1", + "@cspell/strong-weak-map": "6.31.1", "clear-module": "^4.1.2", "comment-json": "^4.2.3", "configstore": "^5.0.1", "cosmiconfig": "8.0.0", - "cspell-dictionary": "6.30.2", - "cspell-glob": "6.30.2", - "cspell-grammar": "6.30.2", - "cspell-io": "6.30.2", - "cspell-trie-lib": "6.30.2", + "cspell-dictionary": "6.31.1", + "cspell-glob": "6.31.1", + "cspell-grammar": "6.31.1", + "cspell-io": "6.31.1", + "cspell-trie-lib": "6.31.1", "fast-equals": "^4.0.3", "find-up": "^5.0.0", "gensequence": "^5.0.2", @@ -3488,13 +3488,13 @@ } }, "node_modules/cspell-trie-lib": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-6.30.2.tgz", - "integrity": "sha512-xj8gmMKT4oz8740Rvy/d4hw9bRcyrCJ4q2O2nArJtpukURuW+UgYfwjyVqz2Zh+Lx86nNd7fEjPZM5+oIY5Vxw==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-6.31.1.tgz", + "integrity": "sha512-MtYh7s4Sbr1rKT31P2BK6KY+YfOy3dWsuusq9HnqCXmq6aZ1HyFgjH/9p9uvqGi/TboMqn1KOV8nifhXK3l3jg==", "dev": true, "dependencies": { - "@cspell/cspell-pipe": "6.30.2", - "@cspell/cspell-types": "6.30.2", + "@cspell/cspell-pipe": "6.31.1", + "@cspell/cspell-types": "6.31.1", "gensequence": "^5.0.2" }, "engines": { @@ -11924,9 +11924,9 @@ "dev": true }, "@cspell/cspell-bundled-dicts": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-6.30.2.tgz", - "integrity": "sha512-M6Y7FKF6UVvCVS5QoMHZ9EeAaA1NUNHqp5hI+KWT8T0dbJnvSzYGuIMi6fMclip4uZeXMtVFiobJET8PacvzvA==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-6.31.1.tgz", + "integrity": "sha512-rsIev+dk1Vd8H1OKZhNhXycIVsMfeWJaeW3QUi1l4oIoGwQfJVbs1ZPZPHE5cglzyHOW1jQNStXf34UKaC6siA==", "dev": true, "requires": { "@cspell/dict-ada": "^4.0.1", @@ -11942,12 +11942,12 @@ "@cspell/dict-docker": "^1.1.6", "@cspell/dict-dotnet": "^5.0.0", "@cspell/dict-elixir": "^4.0.2", - "@cspell/dict-en_us": "^4.3.1", + "@cspell/dict-en_us": "^4.3.2", "@cspell/dict-en-common-misspellings": "^1.0.2", "@cspell/dict-en-gb": "1.1.33", "@cspell/dict-filetypes": "^3.0.0", "@cspell/dict-fonts": "^3.0.1", - "@cspell/dict-fullstack": "^3.1.4", + "@cspell/dict-fullstack": "^3.1.5", "@cspell/dict-gaming-terms": "^1.0.4", "@cspell/dict-git": "^2.0.0", "@cspell/dict-golang": "^6.0.1", @@ -11969,7 +11969,7 @@ "@cspell/dict-ruby": "^5.0.0", "@cspell/dict-rust": "^4.0.1", "@cspell/dict-scala": "^5.0.0", - "@cspell/dict-software-terms": "^3.1.5", + "@cspell/dict-software-terms": "^3.1.6", "@cspell/dict-sql": "^2.1.0", "@cspell/dict-svelte": "^1.0.2", "@cspell/dict-swift": "^2.0.1", @@ -11978,21 +11978,21 @@ } }, "@cspell/cspell-pipe": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-6.30.2.tgz", - "integrity": "sha512-iPmlAM0qJetiMBY76kz4FpT41xL9wLjXfVP3Zb1xpSPxi38ElpJmJIOxSjyzagOnk4w1JQtdm3jGx3QFhgrKIA==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-6.31.1.tgz", + "integrity": "sha512-zk1olZi4dr6GLm5PAjvsiZ01HURNSruUYFl1qSicGnTwYN8GaN4RhAwannAytcJ7zJPIcyXlid0YsB58nJf3wQ==", "dev": true }, "@cspell/cspell-service-bus": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-6.30.2.tgz", - "integrity": "sha512-UxXLM1ViwM14MiJ/qfhfy8VNjieN02/kRdsUNBTVzWzitIzyU4q8Xa56/oH8iBCCEcruk0ft4uJe7mWW+Viq3A==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-6.31.1.tgz", + "integrity": "sha512-YyBicmJyZ1uwKVxujXw7sgs9x+Eps43OkWmCtDZmZlnq489HdTSuhF1kTbVi2yeFSeaXIS87+uHo12z97KkQpg==", "dev": true }, "@cspell/cspell-types": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-6.30.2.tgz", - "integrity": "sha512-UDnnR4hslBv2SIUlkHNnnX/VbSUBqeWRdM36lISDO5oLJV88g3sRLSSVJB6E9bhtfAXyxTdVio4C23NWf98Rng==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-6.31.1.tgz", + "integrity": "sha512-1KeTQFiHMssW1eRoF2NZIEg4gPVIfXLsL2+VSD/AV6YN7lBcuf6gRRgV5KWYarhxtEfjxhDdDTmu26l/iJEUtw==", "dev": true }, "@cspell/dict-ada": { @@ -12074,9 +12074,9 @@ "dev": true }, "@cspell/dict-en_us": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.3.1.tgz", - "integrity": "sha512-akfx/Q+4J3rfawtGaqe1Yp+fNyCGJCKmTQT14LXxGLN7DEjGvOFzlYoS+DdD3aDwAJih79bEFGiG+Lqs0zOauA==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.3.2.tgz", + "integrity": "sha512-o8xtHDLPNzW6hK5b1TaDTWt25vVi9lWlL6/dZ9YoS+ZMj+Dy/yuXatqfOgeGyU3a9+2gxC0kbr4oufMUQXI2mQ==", "dev": true }, "@cspell/dict-en-common-misspellings": { @@ -12104,9 +12104,9 @@ "dev": true }, "@cspell/dict-fullstack": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/@cspell/dict-fullstack/-/dict-fullstack-3.1.4.tgz", - "integrity": "sha512-OnCIn3GgAhdhsU6xMYes7/WXnbV6R/5k/zRAu/d+WZP4Ltf48z7oFfNFjHXH6b8ZwnMhpekLAnCeIfT5dcxRqw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/@cspell/dict-fullstack/-/dict-fullstack-3.1.5.tgz", + "integrity": "sha512-6ppvo1dkXUZ3fbYn/wwzERxCa76RtDDl5Afzv2lijLoijGGUw5yYdLBKJnx8PJBGNLh829X352ftE7BElG4leA==", "dev": true }, "@cspell/dict-gaming-terms": { @@ -12236,9 +12236,9 @@ "dev": true }, "@cspell/dict-software-terms": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.1.5.tgz", - "integrity": "sha512-wmkWHHkp2AN9EDWNBLB0VASB5OtsC3KnhoAHxCJzC6AB3xjYoBfKsvgI/o50gfbsCVQceHpqXjOEYSw/xxTKNw==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.1.6.tgz", + "integrity": "sha512-w46+pIMRVtrDuTZXK/YxDP5NL5yVoX0ImEPO0s9WbxdyyfhzAF3sGYHBGN/50OGLHExcqe6Idb9feoRC9mCLxw==", "dev": true }, "@cspell/dict-sql": { @@ -12272,18 +12272,18 @@ "dev": true }, "@cspell/dynamic-import": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-6.30.2.tgz", - "integrity": "sha512-q6oWWJx9SZMc0NXz2bPReBWqN8ZlEZovLDrC2fznMWenD+YflY9gqcc3Hl3Ebw+RujOVAETc/YUpWn1TTxKgzw==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-6.31.1.tgz", + "integrity": "sha512-uliIUv9uZlnyYmjUlcw/Dm3p0xJOEnWJNczHAfqAl4Ytg6QZktw0GtUA9b1umbRXLv0KRTPtSC6nMq3cR7rRmQ==", "dev": true, "requires": { "import-meta-resolve": "^2.2.2" } }, "@cspell/strong-weak-map": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-6.30.2.tgz", - "integrity": "sha512-ON7lhyER4jAanAjt1LOQxmwBYRKYBaAtpyQGV8eHzYl5pmf6HHevDSmd65HtFcM0Zq4MnQyk+W7qjd3BF6lMYw==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-6.31.1.tgz", + "integrity": "sha512-z8AuWvUuSnugFKJOA9Ke0aiFuehcqLFqia9bk8XaQNEWr44ahPVn3sEWnAncTxPbpWuUw5UajoJa0egRAE1CCg==", "dev": true }, "@cspotcode/source-map-support": { @@ -14227,19 +14227,19 @@ "dev": true }, "cspell": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/cspell/-/cspell-6.30.2.tgz", - "integrity": "sha512-2++f3cA4bCDON0Evd0D5GvhUU25yQx6Mhrm+DDBapBXKo6oXHn88mLNWU9csc6oVXrUcCAx3uH5U6FNKEiKGQQ==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/cspell/-/cspell-6.31.1.tgz", + "integrity": "sha512-gyCtpkOpwI/TGibbtIgMBFnAUUp2hnYdvW/9Ky4RcneHtLH0+V/jUEbZD8HbRKz0GVZ6mhKWbNRSEyP9p3Cejw==", "dev": true, "requires": { - "@cspell/cspell-pipe": "6.30.2", - "@cspell/dynamic-import": "6.30.2", + "@cspell/cspell-pipe": "6.31.1", + "@cspell/dynamic-import": "6.31.1", "chalk": "^4.1.2", "commander": "^10.0.0", - "cspell-gitignore": "6.30.2", - "cspell-glob": "6.30.2", - "cspell-io": "6.30.2", - "cspell-lib": "6.30.2", + "cspell-gitignore": "6.31.1", + "cspell-glob": "6.31.1", + "cspell-io": "6.31.1", + "cspell-lib": "6.31.1", "fast-glob": "^3.2.12", "fast-json-stable-stringify": "^2.1.0", "file-entry-cache": "^6.0.1", @@ -14347,76 +14347,76 @@ } }, "cspell-dictionary": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-6.30.2.tgz", - "integrity": "sha512-ZRdN42T+9EknDzfWKg2CBKV1wH6/DIic6Y/DhKkHGcJ/02ys+5N587nR8zS5vB/d8Be4qOXVLFZ39nfdZ0vT1A==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-6.31.1.tgz", + "integrity": "sha512-7+K7aQGarqbpucky26wled7QSCJeg6VkLUWS+hLjyf0Cqc9Zew5xsLa4QjReExWUJx+a97jbiflITZNuWxgMrg==", "dev": true, "requires": { - "@cspell/cspell-pipe": "6.30.2", - "@cspell/cspell-types": "6.30.2", - "cspell-trie-lib": "6.30.2", + "@cspell/cspell-pipe": "6.31.1", + "@cspell/cspell-types": "6.31.1", + "cspell-trie-lib": "6.31.1", "fast-equals": "^4.0.3", "gensequence": "^5.0.2" } }, "cspell-gitignore": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-6.30.2.tgz", - "integrity": "sha512-I/14FKE0CZTmx5HgAx3ieFk7k97hJkqin6w8VT/YiPf20lm2ca2VgXOMT+sndLw+cFIX1EdRU/KECRIYwipKXg==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-6.31.1.tgz", + "integrity": "sha512-PAcmjN6X89Z8qgjem6HYb+VmvVtKuc+fWs4sk21+jv2MiLk23Bkp+8slSaIDVR//58fxJkMx17PHyo2cDO/69A==", "dev": true, "requires": { - "cspell-glob": "6.30.2", + "cspell-glob": "6.31.1", "find-up": "^5.0.0" } }, "cspell-glob": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/cspell-glob/-/cspell-glob-6.30.2.tgz", - "integrity": "sha512-lINrcHJaUFkK0X3Je1uBTXozv41HvPsZBwQnHiXzKiuSin4oE7dQ+D/MQIa9UryvMfnJV/BeCiIDkuHO4oA17A==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/cspell-glob/-/cspell-glob-6.31.1.tgz", + "integrity": "sha512-ygEmr5hgE4QtO5+L3/ihfMKBhPipbapfS22ilksFSChKMc15Regds0z+z/1ZBoe+OFAPneQfIuBxMwQ/fB00GQ==", "dev": true, "requires": { "micromatch": "^4.0.5" } }, "cspell-grammar": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-6.30.2.tgz", - "integrity": "sha512-x9x80/uPwpXGLu2Vg/vb9Ncn1Mw8Y0Xzz2WXqzLufKyWk2S0tGHVvkDS6YkQRuK6gOabk5nDwhtnpwt93sgn1Q==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-6.31.1.tgz", + "integrity": "sha512-AsRVP0idcNFVSb9+p9XjMumFj3BUV67WIPWApaAzJl/dYyiIygQObRE+si0/QtFWGNw873b7hNhWZiKjqIdoaQ==", "dev": true, "requires": { - "@cspell/cspell-pipe": "6.30.2", - "@cspell/cspell-types": "6.30.2" + "@cspell/cspell-pipe": "6.31.1", + "@cspell/cspell-types": "6.31.1" } }, "cspell-io": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/cspell-io/-/cspell-io-6.30.2.tgz", - "integrity": "sha512-moklQX2sYf2QC60i6RQCzIXyNONrOqNCa99UH4bFwxaHltMMef3bBOuVoDDfs/9vjeEPVgBwWQi+PEuhbyKq4w==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/cspell-io/-/cspell-io-6.31.1.tgz", + "integrity": "sha512-deZcpvTYY/NmLfOdOtzcm+nDvJZozKmj4TY3pPpX0HquPX0A/w42bFRT/zZNmRslFl8vvrCZZUog7SOc6ha3uA==", "dev": true, "requires": { - "@cspell/cspell-service-bus": "6.30.2", + "@cspell/cspell-service-bus": "6.31.1", "node-fetch": "^2.6.9" } }, "cspell-lib": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/cspell-lib/-/cspell-lib-6.30.2.tgz", - "integrity": "sha512-5qkiRLGrjVV7unnobrma2V2istiDg9TEdY0UsBVGmjty57KXaoiSuTeEOmSS5QLp4IBF5Uo1P9F+Q3Svp8yCQw==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/cspell-lib/-/cspell-lib-6.31.1.tgz", + "integrity": "sha512-KgSiulbLExY+z2jGwkO77+aAkyugsPAw7y07j3hTQLpd+0esPCZqrmbo2ItnkvkDNd/c34PqQCr7/044/rz8gw==", "dev": true, "requires": { - "@cspell/cspell-bundled-dicts": "6.30.2", - "@cspell/cspell-pipe": "6.30.2", - "@cspell/cspell-types": "6.30.2", - "@cspell/strong-weak-map": "6.30.2", + "@cspell/cspell-bundled-dicts": "6.31.1", + "@cspell/cspell-pipe": "6.31.1", + "@cspell/cspell-types": "6.31.1", + "@cspell/strong-weak-map": "6.31.1", "clear-module": "^4.1.2", "comment-json": "^4.2.3", "configstore": "^5.0.1", "cosmiconfig": "8.0.0", - "cspell-dictionary": "6.30.2", - "cspell-glob": "6.30.2", - "cspell-grammar": "6.30.2", - "cspell-io": "6.30.2", - "cspell-trie-lib": "6.30.2", + "cspell-dictionary": "6.31.1", + "cspell-glob": "6.31.1", + "cspell-grammar": "6.31.1", + "cspell-io": "6.31.1", + "cspell-trie-lib": "6.31.1", "fast-equals": "^4.0.3", "find-up": "^5.0.0", "gensequence": "^5.0.2", @@ -14428,13 +14428,13 @@ } }, "cspell-trie-lib": { - "version": "6.30.2", - "resolved": "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-6.30.2.tgz", - "integrity": "sha512-xj8gmMKT4oz8740Rvy/d4hw9bRcyrCJ4q2O2nArJtpukURuW+UgYfwjyVqz2Zh+Lx86nNd7fEjPZM5+oIY5Vxw==", + "version": "6.31.1", + "resolved": "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-6.31.1.tgz", + "integrity": "sha512-MtYh7s4Sbr1rKT31P2BK6KY+YfOy3dWsuusq9HnqCXmq6aZ1HyFgjH/9p9uvqGi/TboMqn1KOV8nifhXK3l3jg==", "dev": true, "requires": { - "@cspell/cspell-pipe": "6.30.2", - "@cspell/cspell-types": "6.30.2", + "@cspell/cspell-pipe": "6.31.1", + "@cspell/cspell-types": "6.31.1", "gensequence": "^5.0.2" } }, From bfc302023ffd3ba2dcf71619f067be4bacc6050f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Mar 2023 11:57:32 +0000 Subject: [PATCH 02/17] build(deps-dev): bump sinon from 15.0.2 to 15.0.3 Bumps [sinon](https://github.com/sinonjs/sinon) from 15.0.2 to 15.0.3. - [Release notes](https://github.com/sinonjs/sinon/releases) - [Changelog](https://github.com/sinonjs/sinon/blob/main/docs/changelog.md) - [Commits](https://github.com/sinonjs/sinon/compare/v15.0.2...v15.0.3) --- updated-dependencies: - dependency-name: sinon dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 978dfacf64..4fec50db44 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1138,9 +1138,9 @@ } }, "node_modules/@sinonjs/samsam": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-7.0.1.tgz", - "integrity": "sha512-zsAk2Jkiq89mhZovB2LLOdTCxJF4hqqTToGP0ASWlhp4I1hqOjcfmZGafXntCN7MDC6yySH0mFHrYtHceOeLmw==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.0.tgz", + "integrity": "sha512-Bp8KUVlLp8ibJZrnvq2foVhP0IVX2CIprMJPK0vqGqgrDa0OHVKeZyBykqskkrdxV6yKBPmGasO8LVjAKR3Gew==", "dev": true, "dependencies": { "@sinonjs/commons": "^2.0.0", @@ -9677,14 +9677,14 @@ "dev": true }, "node_modules/sinon": { - "version": "15.0.2", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-15.0.2.tgz", - "integrity": "sha512-PCVP63XZkg0/LOqQH5rEU4LILuvTFMb5tNxTHfs6VUMNnZz2XrnGSTZbAGITjzwQWbl/Bl/8hi4G3zZWjyBwHg==", + "version": "15.0.3", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-15.0.3.tgz", + "integrity": "sha512-si3geiRkeovP7Iel2O+qGL4NrO9vbMf3KsrJEi0ghP1l5aBkB5UxARea5j0FUsSqH3HLBh0dQPAyQ8fObRUqHw==", "dev": true, "dependencies": { "@sinonjs/commons": "^3.0.0", "@sinonjs/fake-timers": "^10.0.2", - "@sinonjs/samsam": "^7.0.1", + "@sinonjs/samsam": "^8.0.0", "diff": "^5.1.0", "nise": "^5.1.4", "supports-color": "^7.2.0" @@ -12559,9 +12559,9 @@ } }, "@sinonjs/samsam": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-7.0.1.tgz", - "integrity": "sha512-zsAk2Jkiq89mhZovB2LLOdTCxJF4hqqTToGP0ASWlhp4I1hqOjcfmZGafXntCN7MDC6yySH0mFHrYtHceOeLmw==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.0.tgz", + "integrity": "sha512-Bp8KUVlLp8ibJZrnvq2foVhP0IVX2CIprMJPK0vqGqgrDa0OHVKeZyBykqskkrdxV6yKBPmGasO8LVjAKR3Gew==", "dev": true, "requires": { "@sinonjs/commons": "^2.0.0", @@ -18982,14 +18982,14 @@ "dev": true }, "sinon": { - "version": "15.0.2", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-15.0.2.tgz", - "integrity": "sha512-PCVP63XZkg0/LOqQH5rEU4LILuvTFMb5tNxTHfs6VUMNnZz2XrnGSTZbAGITjzwQWbl/Bl/8hi4G3zZWjyBwHg==", + "version": "15.0.3", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-15.0.3.tgz", + "integrity": "sha512-si3geiRkeovP7Iel2O+qGL4NrO9vbMf3KsrJEi0ghP1l5aBkB5UxARea5j0FUsSqH3HLBh0dQPAyQ8fObRUqHw==", "dev": true, "requires": { "@sinonjs/commons": "^3.0.0", "@sinonjs/fake-timers": "^10.0.2", - "@sinonjs/samsam": "^7.0.1", + "@sinonjs/samsam": "^8.0.0", "diff": "^5.1.0", "nise": "^5.1.4", "supports-color": "^7.2.0" From 66c7624b40a892270ed1a065b24107fa72d2563d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Mar 2023 11:58:06 +0000 Subject: [PATCH 03/17] build(deps-dev): bump @types/webpack from 5.28.0 to 5.28.1 Bumps [@types/webpack](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/webpack) from 5.28.0 to 5.28.1. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/webpack) --- updated-dependencies: - dependency-name: "@types/webpack" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 978dfacf64..4763067a61 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1393,9 +1393,9 @@ } }, "node_modules/@types/webpack": { - "version": "5.28.0", - "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-5.28.0.tgz", - "integrity": "sha512-8cP0CzcxUiFuA9xGJkfeVpqmWTk9nx6CWwamRGCj95ph1SmlRRk9KlCZ6avhCbZd4L68LvYT6l1kpdEnQXrF8w==", + "version": "5.28.1", + "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-5.28.1.tgz", + "integrity": "sha512-qw1MqGZclCoBrpiSe/hokSgQM/su8Ocpl3L/YHE0L6moyaypg4+5F7Uzq7NgaPKPxUxUbQ4fLPLpDWdR27bCZw==", "dev": true, "dependencies": { "@types/node": "*", @@ -12810,9 +12810,9 @@ } }, "@types/webpack": { - "version": "5.28.0", - "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-5.28.0.tgz", - "integrity": "sha512-8cP0CzcxUiFuA9xGJkfeVpqmWTk9nx6CWwamRGCj95ph1SmlRRk9KlCZ6avhCbZd4L68LvYT6l1kpdEnQXrF8w==", + "version": "5.28.1", + "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-5.28.1.tgz", + "integrity": "sha512-qw1MqGZclCoBrpiSe/hokSgQM/su8Ocpl3L/YHE0L6moyaypg4+5F7Uzq7NgaPKPxUxUbQ4fLPLpDWdR27bCZw==", "dev": true, "requires": { "@types/node": "*", From 20b62f57681b57f089ef2672b4fe6e74e11686b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Mar 2023 11:56:56 +0000 Subject: [PATCH 04/17] build(deps-dev): bump eslint from 8.36.0 to 8.37.0 Bumps [eslint](https://github.com/eslint/eslint) from 8.36.0 to 8.37.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.36.0...v8.37.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 87 ++++++++++++++++++++++++----------------------- 1 file changed, 45 insertions(+), 42 deletions(-) diff --git a/package-lock.json b/package-lock.json index 978dfacf64..45558fecc1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -839,14 +839,14 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.1.tgz", - "integrity": "sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.2.tgz", + "integrity": "sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==", "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.5.0", + "espree": "^9.5.1", "globals": "^13.19.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", @@ -915,9 +915,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.36.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.36.0.tgz", - "integrity": "sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==", + "version": "8.37.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.37.0.tgz", + "integrity": "sha512-x5vzdtOOGgFVDCUs81QRB2+liax8rFg3+7hqM+QhBG0/G3F1ZsoYl97UrqgHgQ9KKT7G6c4V+aTUCgu/n22v1A==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -4299,15 +4299,15 @@ } }, "node_modules/eslint": { - "version": "8.36.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz", - "integrity": "sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==", + "version": "8.37.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.37.0.tgz", + "integrity": "sha512-NU3Ps9nI05GUoVMxcZx1J8CNR6xOvUT4jAUMH5+z8lpp3aEdPVCImKw6PWG4PY+Vfkpr+jvMpxs/qoE7wq0sPw==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.4.0", - "@eslint/eslintrc": "^2.0.1", - "@eslint/js": "8.36.0", + "@eslint/eslintrc": "^2.0.2", + "@eslint/js": "8.37.0", "@humanwhocodes/config-array": "^0.11.8", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -4318,8 +4318,8 @@ "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", "eslint-scope": "^7.1.1", - "eslint-visitor-keys": "^3.3.0", - "espree": "^9.5.0", + "eslint-visitor-keys": "^3.4.0", + "espree": "^9.5.1", "esquery": "^1.4.2", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -4778,12 +4778,15 @@ } }, "node_modules/eslint-visitor-keys": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", - "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz", + "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, "node_modules/eslint/node_modules/ansi-regex": { @@ -5027,14 +5030,14 @@ } }, "node_modules/espree": { - "version": "9.5.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.0.tgz", - "integrity": "sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw==", + "version": "9.5.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz", + "integrity": "sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==", "dev": true, "dependencies": { "acorn": "^8.8.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.3.0" + "eslint-visitor-keys": "^3.4.0" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -12328,14 +12331,14 @@ "dev": true }, "@eslint/eslintrc": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.1.tgz", - "integrity": "sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.2.tgz", + "integrity": "sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==", "dev": true, "requires": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.5.0", + "espree": "^9.5.1", "globals": "^13.19.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", @@ -12383,9 +12386,9 @@ } }, "@eslint/js": { - "version": "8.36.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.36.0.tgz", - "integrity": "sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==", + "version": "8.37.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.37.0.tgz", + "integrity": "sha512-x5vzdtOOGgFVDCUs81QRB2+liax8rFg3+7hqM+QhBG0/G3F1ZsoYl97UrqgHgQ9KKT7G6c4V+aTUCgu/n22v1A==", "dev": true }, "@humanwhocodes/config-array": { @@ -14975,15 +14978,15 @@ "dev": true }, "eslint": { - "version": "8.36.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz", - "integrity": "sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==", + "version": "8.37.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.37.0.tgz", + "integrity": "sha512-NU3Ps9nI05GUoVMxcZx1J8CNR6xOvUT4jAUMH5+z8lpp3aEdPVCImKw6PWG4PY+Vfkpr+jvMpxs/qoE7wq0sPw==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.4.0", - "@eslint/eslintrc": "^2.0.1", - "@eslint/js": "8.36.0", + "@eslint/eslintrc": "^2.0.2", + "@eslint/js": "8.37.0", "@humanwhocodes/config-array": "^0.11.8", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -14994,8 +14997,8 @@ "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", "eslint-scope": "^7.1.1", - "eslint-visitor-keys": "^3.3.0", - "espree": "^9.5.0", + "eslint-visitor-keys": "^3.4.0", + "espree": "^9.5.1", "esquery": "^1.4.2", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -15509,20 +15512,20 @@ } }, "eslint-visitor-keys": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", - "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz", + "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==", "dev": true }, "espree": { - "version": "9.5.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.0.tgz", - "integrity": "sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw==", + "version": "9.5.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz", + "integrity": "sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==", "dev": true, "requires": { "acorn": "^8.8.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.3.0" + "eslint-visitor-keys": "^3.4.0" } }, "esprima": { From 2fe7a2e3d385b945b96ff66c8328e8367e1e6ef2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Mar 2023 11:57:27 +0000 Subject: [PATCH 05/17] build(deps): bump @types/node from 18.15.7 to 18.15.11 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.15.7 to 18.15.11. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 978dfacf64..be65c4a229 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1284,9 +1284,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.15.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.7.tgz", - "integrity": "sha512-LFmUbFunqmBn26wJZgZPYZPrDR1RwGOu2v79Mgcka1ndO6V0/cwjivPTc4yoK6n9kmw4/ls1r8cLrvh2iMibFA==" + "version": "18.15.11", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz", + "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==" }, "node_modules/@types/normalize-package-data": { "version": "2.4.1", @@ -12702,9 +12702,9 @@ "dev": true }, "@types/node": { - "version": "18.15.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.7.tgz", - "integrity": "sha512-LFmUbFunqmBn26wJZgZPYZPrDR1RwGOu2v79Mgcka1ndO6V0/cwjivPTc4yoK6n9kmw4/ls1r8cLrvh2iMibFA==" + "version": "18.15.11", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz", + "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==" }, "@types/normalize-package-data": { "version": "2.4.1", From 0f4f24c3f3e83570f2227d4e820dfc94dfef86aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Mar 2023 11:56:49 +0000 Subject: [PATCH 06/17] build(deps-dev): bump tsconfig-paths from 4.1.2 to 4.2.0 Bumps [tsconfig-paths](https://github.com/dividab/tsconfig-paths) from 4.1.2 to 4.2.0. - [Release notes](https://github.com/dividab/tsconfig-paths/releases) - [Changelog](https://github.com/dividab/tsconfig-paths/blob/master/CHANGELOG.md) - [Commits](https://github.com/dividab/tsconfig-paths/compare/v4.1.2...v4.2.0) --- updated-dependencies: - dependency-name: tsconfig-paths dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 978dfacf64..e4e7c58f02 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10473,9 +10473,9 @@ } }, "node_modules/tsconfig-paths": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.1.2.tgz", - "integrity": "sha512-uhxiMgnXQp1IR622dUXI+9Ehnws7i/y6xvpZB9IbUVOPy0muvdvgXeZOn88UcGPiT98Vp3rJPTa8bFoalZ3Qhw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", + "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", "dev": true, "dependencies": { "json5": "^2.2.2", @@ -19571,9 +19571,9 @@ } }, "tsconfig-paths": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.1.2.tgz", - "integrity": "sha512-uhxiMgnXQp1IR622dUXI+9Ehnws7i/y6xvpZB9IbUVOPy0muvdvgXeZOn88UcGPiT98Vp3rJPTa8bFoalZ3Qhw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", + "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", "dev": true, "requires": { "json5": "^2.2.2", From 6362b498a628dca2782b2910499fe1cfeb454a2a Mon Sep 17 00:00:00 2001 From: Dolan Miu Date: Thu, 30 Mar 2023 20:14:08 +0100 Subject: [PATCH 07/17] Add docsify sign off sheet --- docs/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/index.html b/docs/index.html index 73978e40a5..44c52c0c82 100644 --- a/docs/index.html +++ b/docs/index.html @@ -38,6 +38,7 @@ + From c3a617fefdc831106374f6def2c350ca55c441d7 Mon Sep 17 00:00:00 2001 From: Dolan Miu Date: Fri, 31 Mar 2023 00:13:36 +0100 Subject: [PATCH 08/17] #2028 - Null check --- demo/89-template-document.ts | 29 ++++++++++++++++++++++++++ demo/assets/simple-template-3.docx | Bin 0 -> 16452 bytes src/patcher/paragraph-split-inject.ts | 4 ++++ 3 files changed, 33 insertions(+) create mode 100644 demo/89-template-document.ts create mode 100644 demo/assets/simple-template-3.docx diff --git a/demo/89-template-document.ts b/demo/89-template-document.ts new file mode 100644 index 0000000000..1220a6a8f6 --- /dev/null +++ b/demo/89-template-document.ts @@ -0,0 +1,29 @@ +// Patch a document with patches +// Import from 'docx' rather than '../build' if you install from npm +import * as fs from "fs"; +import { IPatch, patchDocument, PatchType, TextRun } from "../src"; + +export const font = "Trebuchet MS"; +export const getPatches = (fields: { [key: string]: string }) => { + const patches: { [key: string]: IPatch } = {}; + + for (const field in fields) { + patches[field] = { + type: PatchType.PARAGRAPH, + children: [new TextRun({ text: fields[field], font })], + }; + } + + return patches; +}; + +const patches = getPatches({ + salutation: "Mr.", + "first-name": "John", +}); + +patchDocument(fs.readFileSync("demo/assets/simple-template-3.docx"), { + patches, +}).then((doc) => { + fs.writeFileSync("My Document.docx", doc); +}); diff --git a/demo/assets/simple-template-3.docx b/demo/assets/simple-template-3.docx new file mode 100644 index 0000000000000000000000000000000000000000..8d8fa9aacfe5700030d91465fa8c7be52e9e29dd GIT binary patch literal 16452 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 e.type === "element" && e.name === "w:t"); for (const text of textElement) { + if (!text.elements?.[0]) { + continue; + } + if ((text.elements?.[0].text as string)?.includes(token)) { return i; } From 680c938dcfe2f175890919add724a922655528c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Mar 2023 11:57:07 +0000 Subject: [PATCH 09/17] build(deps-dev): bump typescript from 5.0.2 to 5.0.3 Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.0.2 to 5.0.3. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/commits) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 978dfacf64..029276a4b4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -59,7 +59,7 @@ "tsconfig-paths": "^4.0.0", "tsconfig-paths-webpack-plugin": "^4.0.0", "typedoc": "^0.23.2", - "typescript": "5.0.2", + "typescript": "5.0.3", "unzipper": "^0.10.11", "webpack": "^5.28.0", "webpack-cli": "^5.0.0" @@ -10720,9 +10720,9 @@ } }, "node_modules/typescript": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.2.tgz", - "integrity": "sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.3.tgz", + "integrity": "sha512-xv8mOEDnigb/tN9PSMTwSEqAnUvkoXMQlicOb0IUVDBSQCgBSaAAROUZYy2IcUy5qU6XajK5jjjO7TMWqBTKZA==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -19759,9 +19759,9 @@ } }, "typescript": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.2.tgz", - "integrity": "sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.3.tgz", + "integrity": "sha512-xv8mOEDnigb/tN9PSMTwSEqAnUvkoXMQlicOb0IUVDBSQCgBSaAAROUZYy2IcUy5qU6XajK5jjjO7TMWqBTKZA==", "dev": true }, "unbox-primitive": { diff --git a/package.json b/package.json index 1d4120e3cf..3db32ba7f4 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "tsconfig-paths": "^4.0.0", "tsconfig-paths-webpack-plugin": "^4.0.0", "typedoc": "^0.23.2", - "typescript": "5.0.2", + "typescript": "5.0.3", "unzipper": "^0.10.11", "webpack": "^5.28.0", "webpack-cli": "^5.0.0" From 10c866bdea248ee839aec7391f9715309a0c7e5b Mon Sep 17 00:00:00 2001 From: Dolan Miu Date: Fri, 31 Mar 2023 17:16:05 +0100 Subject: [PATCH 10/17] Add tests --- src/patcher/paragraph-split-inject.spec.ts | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/patcher/paragraph-split-inject.spec.ts b/src/patcher/paragraph-split-inject.spec.ts index 5228a88d2d..c0b8eec459 100644 --- a/src/patcher/paragraph-split-inject.spec.ts +++ b/src/patcher/paragraph-split-inject.spec.ts @@ -86,6 +86,29 @@ describe("paragraph-split-inject", () => { ), ).to.throw(); }); + + it("should continue if text run doesn't have text", () => { + const output = findRunElementIndexWithToken( + { + name: "w:p", + type: "element", + elements: [ + { + name: "w:r", + type: "element", + elements: [ + { + name: "w:t", + type: "element", + }, + ], + }, + ], + }, + "hello", + ); + expect(output).to.deep.equal(0); + }); }); describe("splitRunElement", () => { From 18f015a959130a162254ff136c0d1f4f42927f2b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Apr 2023 11:56:55 +0000 Subject: [PATCH 11/17] build(deps-dev): bump @typescript-eslint/eslint-plugin Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.56.0 to 5.57.1. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.57.1/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 232 +++++++++++++++++++++++----------------------- 1 file changed, 116 insertions(+), 116 deletions(-) diff --git a/package-lock.json b/package-lock.json index 978dfacf64..69fc371084 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1404,15 +1404,15 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.56.0.tgz", - "integrity": "sha512-ZNW37Ccl3oMZkzxrYDUX4o7cnuPgU+YrcaYXzsRtLB16I1FR5SHMqga3zGsaSliZADCWo2v8qHWqAYIj8nWCCg==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.57.1.tgz", + "integrity": "sha512-1MeobQkQ9tztuleT3v72XmY0XuKXVXusAhryoLuU5YZ+mXoYKZP9SQ7Flulh1NX4DTjpGTc2b/eMu4u7M7dhnQ==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.56.0", - "@typescript-eslint/type-utils": "5.56.0", - "@typescript-eslint/utils": "5.56.0", + "@typescript-eslint/scope-manager": "5.57.1", + "@typescript-eslint/type-utils": "5.57.1", + "@typescript-eslint/utils": "5.57.1", "debug": "^4.3.4", "grapheme-splitter": "^1.0.4", "ignore": "^5.2.0", @@ -1438,13 +1438,13 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.56.0.tgz", - "integrity": "sha512-jGYKyt+iBakD0SA5Ww8vFqGpoV2asSjwt60Gl6YcO8ksQ8s2HlUEyHBMSa38bdLopYqGf7EYQMUIGdT/Luw+sw==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.57.1.tgz", + "integrity": "sha512-N/RrBwEUKMIYxSKl0oDK5sFVHd6VI7p9K5MyUlVYAY6dyNb/wHUqndkTd3XhpGlXgnQsBkRZuu4f9kAHghvgPw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.56.0", - "@typescript-eslint/visitor-keys": "5.56.0" + "@typescript-eslint/types": "5.57.1", + "@typescript-eslint/visitor-keys": "5.57.1" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1455,9 +1455,9 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.56.0.tgz", - "integrity": "sha512-JyAzbTJcIyhuUhogmiu+t79AkdnqgPUEsxMTMc/dCZczGMJQh1MK2wgrju++yMN6AWroVAy2jxyPcPr3SWCq5w==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.57.1.tgz", + "integrity": "sha512-bSs4LOgyV3bJ08F5RDqO2KXqg3WAdwHCu06zOqcQ6vqbTJizyBhuh1o1ImC69X4bV2g1OJxbH71PJqiO7Y1RuA==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1468,12 +1468,12 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.56.0.tgz", - "integrity": "sha512-1mFdED7u5bZpX6Xxf5N9U2c18sb+8EvU3tyOIj6LQZ5OOvnmj8BVeNNP603OFPm5KkS1a7IvCIcwrdHXaEMG/Q==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.57.1.tgz", + "integrity": "sha512-RjQrAniDU0CEk5r7iphkm731zKlFiUjvcBS2yHAg8WWqFMCaCrD0rKEVOMUyMMcbGPZ0bPp56srkGWrgfZqLRA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.56.0", + "@typescript-eslint/types": "5.57.1", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -1608,13 +1608,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.56.0.tgz", - "integrity": "sha512-8WxgOgJjWRy6m4xg9KoSHPzBNZeQbGlQOH7l2QEhQID/+YseaFxg5J/DLwWSsi9Axj4e/cCiKx7PVzOq38tY4A==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.57.1.tgz", + "integrity": "sha512-/RIPQyx60Pt6ga86hKXesXkJ2WOS4UemFrmmq/7eOyiYjYv/MUSHPlkhU6k9T9W1ytnTJueqASW+wOmW4KrViw==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "5.56.0", - "@typescript-eslint/utils": "5.56.0", + "@typescript-eslint/typescript-estree": "5.57.1", + "@typescript-eslint/utils": "5.57.1", "debug": "^4.3.4", "tsutils": "^3.21.0" }, @@ -1635,9 +1635,9 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.56.0.tgz", - "integrity": "sha512-JyAzbTJcIyhuUhogmiu+t79AkdnqgPUEsxMTMc/dCZczGMJQh1MK2wgrju++yMN6AWroVAy2jxyPcPr3SWCq5w==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.57.1.tgz", + "integrity": "sha512-bSs4LOgyV3bJ08F5RDqO2KXqg3WAdwHCu06zOqcQ6vqbTJizyBhuh1o1ImC69X4bV2g1OJxbH71PJqiO7Y1RuA==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1648,13 +1648,13 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.56.0.tgz", - "integrity": "sha512-41CH/GncsLXOJi0jb74SnC7jVPWeVJ0pxQj8bOjH1h2O26jXN3YHKDT1ejkVz5YeTEQPeLCCRY0U2r68tfNOcg==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.57.1.tgz", + "integrity": "sha512-A2MZqD8gNT0qHKbk2wRspg7cHbCDCk2tcqt6ScCFLr5Ru8cn+TCfM786DjPhqwseiS+PrYwcXht5ztpEQ6TFTw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.56.0", - "@typescript-eslint/visitor-keys": "5.56.0", + "@typescript-eslint/types": "5.57.1", + "@typescript-eslint/visitor-keys": "5.57.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -1675,12 +1675,12 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.56.0.tgz", - "integrity": "sha512-1mFdED7u5bZpX6Xxf5N9U2c18sb+8EvU3tyOIj6LQZ5OOvnmj8BVeNNP603OFPm5KkS1a7IvCIcwrdHXaEMG/Q==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.57.1.tgz", + "integrity": "sha512-RjQrAniDU0CEk5r7iphkm731zKlFiUjvcBS2yHAg8WWqFMCaCrD0rKEVOMUyMMcbGPZ0bPp56srkGWrgfZqLRA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.56.0", + "@typescript-eslint/types": "5.57.1", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -1844,17 +1844,17 @@ "dev": true }, "node_modules/@typescript-eslint/utils": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.56.0.tgz", - "integrity": "sha512-XhZDVdLnUJNtbzaJeDSCIYaM+Tgr59gZGbFuELgF7m0IY03PlciidS7UQNKLE0+WpUTn1GlycEr6Ivb/afjbhA==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.57.1.tgz", + "integrity": "sha512-kN6vzzf9NkEtawECqze6v99LtmDiUJCVpvieTFA1uL7/jDghiJGubGZ5csicYHU1Xoqb3oH/R5cN5df6W41Nfg==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@types/json-schema": "^7.0.9", "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.56.0", - "@typescript-eslint/types": "5.56.0", - "@typescript-eslint/typescript-estree": "5.56.0", + "@typescript-eslint/scope-manager": "5.57.1", + "@typescript-eslint/types": "5.57.1", + "@typescript-eslint/typescript-estree": "5.57.1", "eslint-scope": "^5.1.1", "semver": "^7.3.7" }, @@ -1870,13 +1870,13 @@ } }, "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.56.0.tgz", - "integrity": "sha512-jGYKyt+iBakD0SA5Ww8vFqGpoV2asSjwt60Gl6YcO8ksQ8s2HlUEyHBMSa38bdLopYqGf7EYQMUIGdT/Luw+sw==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.57.1.tgz", + "integrity": "sha512-N/RrBwEUKMIYxSKl0oDK5sFVHd6VI7p9K5MyUlVYAY6dyNb/wHUqndkTd3XhpGlXgnQsBkRZuu4f9kAHghvgPw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.56.0", - "@typescript-eslint/visitor-keys": "5.56.0" + "@typescript-eslint/types": "5.57.1", + "@typescript-eslint/visitor-keys": "5.57.1" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1887,9 +1887,9 @@ } }, "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.56.0.tgz", - "integrity": "sha512-JyAzbTJcIyhuUhogmiu+t79AkdnqgPUEsxMTMc/dCZczGMJQh1MK2wgrju++yMN6AWroVAy2jxyPcPr3SWCq5w==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.57.1.tgz", + "integrity": "sha512-bSs4LOgyV3bJ08F5RDqO2KXqg3WAdwHCu06zOqcQ6vqbTJizyBhuh1o1ImC69X4bV2g1OJxbH71PJqiO7Y1RuA==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1900,13 +1900,13 @@ } }, "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.56.0.tgz", - "integrity": "sha512-41CH/GncsLXOJi0jb74SnC7jVPWeVJ0pxQj8bOjH1h2O26jXN3YHKDT1ejkVz5YeTEQPeLCCRY0U2r68tfNOcg==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.57.1.tgz", + "integrity": "sha512-A2MZqD8gNT0qHKbk2wRspg7cHbCDCk2tcqt6ScCFLr5Ru8cn+TCfM786DjPhqwseiS+PrYwcXht5ztpEQ6TFTw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.56.0", - "@typescript-eslint/visitor-keys": "5.56.0", + "@typescript-eslint/types": "5.57.1", + "@typescript-eslint/visitor-keys": "5.57.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -1927,12 +1927,12 @@ } }, "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.56.0.tgz", - "integrity": "sha512-1mFdED7u5bZpX6Xxf5N9U2c18sb+8EvU3tyOIj6LQZ5OOvnmj8BVeNNP603OFPm5KkS1a7IvCIcwrdHXaEMG/Q==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.57.1.tgz", + "integrity": "sha512-RjQrAniDU0CEk5r7iphkm731zKlFiUjvcBS2yHAg8WWqFMCaCrD0rKEVOMUyMMcbGPZ0bPp56srkGWrgfZqLRA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.56.0", + "@typescript-eslint/types": "5.57.1", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -12821,15 +12821,15 @@ } }, "@typescript-eslint/eslint-plugin": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.56.0.tgz", - "integrity": "sha512-ZNW37Ccl3oMZkzxrYDUX4o7cnuPgU+YrcaYXzsRtLB16I1FR5SHMqga3zGsaSliZADCWo2v8qHWqAYIj8nWCCg==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.57.1.tgz", + "integrity": "sha512-1MeobQkQ9tztuleT3v72XmY0XuKXVXusAhryoLuU5YZ+mXoYKZP9SQ7Flulh1NX4DTjpGTc2b/eMu4u7M7dhnQ==", "dev": true, "requires": { "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.56.0", - "@typescript-eslint/type-utils": "5.56.0", - "@typescript-eslint/utils": "5.56.0", + "@typescript-eslint/scope-manager": "5.57.1", + "@typescript-eslint/type-utils": "5.57.1", + "@typescript-eslint/utils": "5.57.1", "debug": "^4.3.4", "grapheme-splitter": "^1.0.4", "ignore": "^5.2.0", @@ -12839,28 +12839,28 @@ }, "dependencies": { "@typescript-eslint/scope-manager": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.56.0.tgz", - "integrity": "sha512-jGYKyt+iBakD0SA5Ww8vFqGpoV2asSjwt60Gl6YcO8ksQ8s2HlUEyHBMSa38bdLopYqGf7EYQMUIGdT/Luw+sw==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.57.1.tgz", + "integrity": "sha512-N/RrBwEUKMIYxSKl0oDK5sFVHd6VI7p9K5MyUlVYAY6dyNb/wHUqndkTd3XhpGlXgnQsBkRZuu4f9kAHghvgPw==", "dev": true, "requires": { - "@typescript-eslint/types": "5.56.0", - "@typescript-eslint/visitor-keys": "5.56.0" + "@typescript-eslint/types": "5.57.1", + "@typescript-eslint/visitor-keys": "5.57.1" } }, "@typescript-eslint/types": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.56.0.tgz", - "integrity": "sha512-JyAzbTJcIyhuUhogmiu+t79AkdnqgPUEsxMTMc/dCZczGMJQh1MK2wgrju++yMN6AWroVAy2jxyPcPr3SWCq5w==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.57.1.tgz", + "integrity": "sha512-bSs4LOgyV3bJ08F5RDqO2KXqg3WAdwHCu06zOqcQ6vqbTJizyBhuh1o1ImC69X4bV2g1OJxbH71PJqiO7Y1RuA==", "dev": true }, "@typescript-eslint/visitor-keys": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.56.0.tgz", - "integrity": "sha512-1mFdED7u5bZpX6Xxf5N9U2c18sb+8EvU3tyOIj6LQZ5OOvnmj8BVeNNP603OFPm5KkS1a7IvCIcwrdHXaEMG/Q==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.57.1.tgz", + "integrity": "sha512-RjQrAniDU0CEk5r7iphkm731zKlFiUjvcBS2yHAg8WWqFMCaCrD0rKEVOMUyMMcbGPZ0bPp56srkGWrgfZqLRA==", "dev": true, "requires": { - "@typescript-eslint/types": "5.56.0", + "@typescript-eslint/types": "5.57.1", "eslint-visitor-keys": "^3.3.0" } }, @@ -12945,31 +12945,31 @@ } }, "@typescript-eslint/type-utils": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.56.0.tgz", - "integrity": "sha512-8WxgOgJjWRy6m4xg9KoSHPzBNZeQbGlQOH7l2QEhQID/+YseaFxg5J/DLwWSsi9Axj4e/cCiKx7PVzOq38tY4A==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.57.1.tgz", + "integrity": "sha512-/RIPQyx60Pt6ga86hKXesXkJ2WOS4UemFrmmq/7eOyiYjYv/MUSHPlkhU6k9T9W1ytnTJueqASW+wOmW4KrViw==", "dev": true, "requires": { - "@typescript-eslint/typescript-estree": "5.56.0", - "@typescript-eslint/utils": "5.56.0", + "@typescript-eslint/typescript-estree": "5.57.1", + "@typescript-eslint/utils": "5.57.1", "debug": "^4.3.4", "tsutils": "^3.21.0" }, "dependencies": { "@typescript-eslint/types": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.56.0.tgz", - "integrity": "sha512-JyAzbTJcIyhuUhogmiu+t79AkdnqgPUEsxMTMc/dCZczGMJQh1MK2wgrju++yMN6AWroVAy2jxyPcPr3SWCq5w==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.57.1.tgz", + "integrity": "sha512-bSs4LOgyV3bJ08F5RDqO2KXqg3WAdwHCu06zOqcQ6vqbTJizyBhuh1o1ImC69X4bV2g1OJxbH71PJqiO7Y1RuA==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.56.0.tgz", - "integrity": "sha512-41CH/GncsLXOJi0jb74SnC7jVPWeVJ0pxQj8bOjH1h2O26jXN3YHKDT1ejkVz5YeTEQPeLCCRY0U2r68tfNOcg==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.57.1.tgz", + "integrity": "sha512-A2MZqD8gNT0qHKbk2wRspg7cHbCDCk2tcqt6ScCFLr5Ru8cn+TCfM786DjPhqwseiS+PrYwcXht5ztpEQ6TFTw==", "dev": true, "requires": { - "@typescript-eslint/types": "5.56.0", - "@typescript-eslint/visitor-keys": "5.56.0", + "@typescript-eslint/types": "5.57.1", + "@typescript-eslint/visitor-keys": "5.57.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -12978,12 +12978,12 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.56.0.tgz", - "integrity": "sha512-1mFdED7u5bZpX6Xxf5N9U2c18sb+8EvU3tyOIj6LQZ5OOvnmj8BVeNNP603OFPm5KkS1a7IvCIcwrdHXaEMG/Q==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.57.1.tgz", + "integrity": "sha512-RjQrAniDU0CEk5r7iphkm731zKlFiUjvcBS2yHAg8WWqFMCaCrD0rKEVOMUyMMcbGPZ0bPp56srkGWrgfZqLRA==", "dev": true, "requires": { - "@typescript-eslint/types": "5.56.0", + "@typescript-eslint/types": "5.57.1", "eslint-visitor-keys": "^3.3.0" } }, @@ -13091,45 +13091,45 @@ } }, "@typescript-eslint/utils": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.56.0.tgz", - "integrity": "sha512-XhZDVdLnUJNtbzaJeDSCIYaM+Tgr59gZGbFuELgF7m0IY03PlciidS7UQNKLE0+WpUTn1GlycEr6Ivb/afjbhA==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.57.1.tgz", + "integrity": "sha512-kN6vzzf9NkEtawECqze6v99LtmDiUJCVpvieTFA1uL7/jDghiJGubGZ5csicYHU1Xoqb3oH/R5cN5df6W41Nfg==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", "@types/json-schema": "^7.0.9", "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.56.0", - "@typescript-eslint/types": "5.56.0", - "@typescript-eslint/typescript-estree": "5.56.0", + "@typescript-eslint/scope-manager": "5.57.1", + "@typescript-eslint/types": "5.57.1", + "@typescript-eslint/typescript-estree": "5.57.1", "eslint-scope": "^5.1.1", "semver": "^7.3.7" }, "dependencies": { "@typescript-eslint/scope-manager": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.56.0.tgz", - "integrity": "sha512-jGYKyt+iBakD0SA5Ww8vFqGpoV2asSjwt60Gl6YcO8ksQ8s2HlUEyHBMSa38bdLopYqGf7EYQMUIGdT/Luw+sw==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.57.1.tgz", + "integrity": "sha512-N/RrBwEUKMIYxSKl0oDK5sFVHd6VI7p9K5MyUlVYAY6dyNb/wHUqndkTd3XhpGlXgnQsBkRZuu4f9kAHghvgPw==", "dev": true, "requires": { - "@typescript-eslint/types": "5.56.0", - "@typescript-eslint/visitor-keys": "5.56.0" + "@typescript-eslint/types": "5.57.1", + "@typescript-eslint/visitor-keys": "5.57.1" } }, "@typescript-eslint/types": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.56.0.tgz", - "integrity": "sha512-JyAzbTJcIyhuUhogmiu+t79AkdnqgPUEsxMTMc/dCZczGMJQh1MK2wgrju++yMN6AWroVAy2jxyPcPr3SWCq5w==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.57.1.tgz", + "integrity": "sha512-bSs4LOgyV3bJ08F5RDqO2KXqg3WAdwHCu06zOqcQ6vqbTJizyBhuh1o1ImC69X4bV2g1OJxbH71PJqiO7Y1RuA==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.56.0.tgz", - "integrity": "sha512-41CH/GncsLXOJi0jb74SnC7jVPWeVJ0pxQj8bOjH1h2O26jXN3YHKDT1ejkVz5YeTEQPeLCCRY0U2r68tfNOcg==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.57.1.tgz", + "integrity": "sha512-A2MZqD8gNT0qHKbk2wRspg7cHbCDCk2tcqt6ScCFLr5Ru8cn+TCfM786DjPhqwseiS+PrYwcXht5ztpEQ6TFTw==", "dev": true, "requires": { - "@typescript-eslint/types": "5.56.0", - "@typescript-eslint/visitor-keys": "5.56.0", + "@typescript-eslint/types": "5.57.1", + "@typescript-eslint/visitor-keys": "5.57.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -13138,12 +13138,12 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.56.0.tgz", - "integrity": "sha512-1mFdED7u5bZpX6Xxf5N9U2c18sb+8EvU3tyOIj6LQZ5OOvnmj8BVeNNP603OFPm5KkS1a7IvCIcwrdHXaEMG/Q==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.57.1.tgz", + "integrity": "sha512-RjQrAniDU0CEk5r7iphkm731zKlFiUjvcBS2yHAg8WWqFMCaCrD0rKEVOMUyMMcbGPZ0bPp56srkGWrgfZqLRA==", "dev": true, "requires": { - "@typescript-eslint/types": "5.56.0", + "@typescript-eslint/types": "5.57.1", "eslint-visitor-keys": "^3.3.0" } }, From d4585f60b3b5038f270acaad06d2f2b4cbdd6a80 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Apr 2023 11:57:39 +0000 Subject: [PATCH 12/17] build(deps-dev): bump @typescript-eslint/parser from 5.56.0 to 5.57.1 Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.56.0 to 5.57.1. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.57.1/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 92 +++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/package-lock.json b/package-lock.json index 978dfacf64..d588c60c65 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1541,14 +1541,14 @@ "dev": true }, "node_modules/@typescript-eslint/parser": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.56.0.tgz", - "integrity": "sha512-sn1OZmBxUsgxMmR8a8U5QM/Wl+tyqlH//jTqCg8daTAmhAk26L2PFhcqPLlYBhYUJMZJK276qLXlHN3a83o2cg==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.57.1.tgz", + "integrity": "sha512-hlA0BLeVSA/wBPKdPGxoVr9Pp6GutGoY380FEhbVi0Ph4WNe8kLvqIRx76RSQt1lynZKfrXKs0/XeEk4zZycuA==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.56.0", - "@typescript-eslint/types": "5.56.0", - "@typescript-eslint/typescript-estree": "5.56.0", + "@typescript-eslint/scope-manager": "5.57.1", + "@typescript-eslint/types": "5.57.1", + "@typescript-eslint/typescript-estree": "5.57.1", "debug": "^4.3.4" }, "engines": { @@ -1591,13 +1591,13 @@ "dev": true }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.56.0.tgz", - "integrity": "sha512-jGYKyt+iBakD0SA5Ww8vFqGpoV2asSjwt60Gl6YcO8ksQ8s2HlUEyHBMSa38bdLopYqGf7EYQMUIGdT/Luw+sw==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.57.1.tgz", + "integrity": "sha512-N/RrBwEUKMIYxSKl0oDK5sFVHd6VI7p9K5MyUlVYAY6dyNb/wHUqndkTd3XhpGlXgnQsBkRZuu4f9kAHghvgPw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.56.0", - "@typescript-eslint/visitor-keys": "5.56.0" + "@typescript-eslint/types": "5.57.1", + "@typescript-eslint/visitor-keys": "5.57.1" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1748,9 +1748,9 @@ "dev": true }, "node_modules/@typescript-eslint/types": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.56.0.tgz", - "integrity": "sha512-JyAzbTJcIyhuUhogmiu+t79AkdnqgPUEsxMTMc/dCZczGMJQh1MK2wgrju++yMN6AWroVAy2jxyPcPr3SWCq5w==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.57.1.tgz", + "integrity": "sha512-bSs4LOgyV3bJ08F5RDqO2KXqg3WAdwHCu06zOqcQ6vqbTJizyBhuh1o1ImC69X4bV2g1OJxbH71PJqiO7Y1RuA==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1761,13 +1761,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.56.0.tgz", - "integrity": "sha512-41CH/GncsLXOJi0jb74SnC7jVPWeVJ0pxQj8bOjH1h2O26jXN3YHKDT1ejkVz5YeTEQPeLCCRY0U2r68tfNOcg==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.57.1.tgz", + "integrity": "sha512-A2MZqD8gNT0qHKbk2wRspg7cHbCDCk2tcqt6ScCFLr5Ru8cn+TCfM786DjPhqwseiS+PrYwcXht5ztpEQ6TFTw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.56.0", - "@typescript-eslint/visitor-keys": "5.56.0", + "@typescript-eslint/types": "5.57.1", + "@typescript-eslint/visitor-keys": "5.57.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -2000,12 +2000,12 @@ "dev": true }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.56.0.tgz", - "integrity": "sha512-1mFdED7u5bZpX6Xxf5N9U2c18sb+8EvU3tyOIj6LQZ5OOvnmj8BVeNNP603OFPm5KkS1a7IvCIcwrdHXaEMG/Q==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.57.1.tgz", + "integrity": "sha512-RjQrAniDU0CEk5r7iphkm731zKlFiUjvcBS2yHAg8WWqFMCaCrD0rKEVOMUyMMcbGPZ0bPp56srkGWrgfZqLRA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.56.0", + "@typescript-eslint/types": "5.57.1", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -12906,14 +12906,14 @@ } }, "@typescript-eslint/parser": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.56.0.tgz", - "integrity": "sha512-sn1OZmBxUsgxMmR8a8U5QM/Wl+tyqlH//jTqCg8daTAmhAk26L2PFhcqPLlYBhYUJMZJK276qLXlHN3a83o2cg==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.57.1.tgz", + "integrity": "sha512-hlA0BLeVSA/wBPKdPGxoVr9Pp6GutGoY380FEhbVi0Ph4WNe8kLvqIRx76RSQt1lynZKfrXKs0/XeEk4zZycuA==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.56.0", - "@typescript-eslint/types": "5.56.0", - "@typescript-eslint/typescript-estree": "5.56.0", + "@typescript-eslint/scope-manager": "5.57.1", + "@typescript-eslint/types": "5.57.1", + "@typescript-eslint/typescript-estree": "5.57.1", "debug": "^4.3.4" }, "dependencies": { @@ -12935,13 +12935,13 @@ } }, "@typescript-eslint/scope-manager": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.56.0.tgz", - "integrity": "sha512-jGYKyt+iBakD0SA5Ww8vFqGpoV2asSjwt60Gl6YcO8ksQ8s2HlUEyHBMSa38bdLopYqGf7EYQMUIGdT/Luw+sw==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.57.1.tgz", + "integrity": "sha512-N/RrBwEUKMIYxSKl0oDK5sFVHd6VI7p9K5MyUlVYAY6dyNb/wHUqndkTd3XhpGlXgnQsBkRZuu4f9kAHghvgPw==", "dev": true, "requires": { - "@typescript-eslint/types": "5.56.0", - "@typescript-eslint/visitor-keys": "5.56.0" + "@typescript-eslint/types": "5.57.1", + "@typescript-eslint/visitor-keys": "5.57.1" } }, "@typescript-eslint/type-utils": { @@ -13029,19 +13029,19 @@ } }, "@typescript-eslint/types": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.56.0.tgz", - "integrity": "sha512-JyAzbTJcIyhuUhogmiu+t79AkdnqgPUEsxMTMc/dCZczGMJQh1MK2wgrju++yMN6AWroVAy2jxyPcPr3SWCq5w==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.57.1.tgz", + "integrity": "sha512-bSs4LOgyV3bJ08F5RDqO2KXqg3WAdwHCu06zOqcQ6vqbTJizyBhuh1o1ImC69X4bV2g1OJxbH71PJqiO7Y1RuA==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.56.0.tgz", - "integrity": "sha512-41CH/GncsLXOJi0jb74SnC7jVPWeVJ0pxQj8bOjH1h2O26jXN3YHKDT1ejkVz5YeTEQPeLCCRY0U2r68tfNOcg==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.57.1.tgz", + "integrity": "sha512-A2MZqD8gNT0qHKbk2wRspg7cHbCDCk2tcqt6ScCFLr5Ru8cn+TCfM786DjPhqwseiS+PrYwcXht5ztpEQ6TFTw==", "dev": true, "requires": { - "@typescript-eslint/types": "5.56.0", - "@typescript-eslint/visitor-keys": "5.56.0", + "@typescript-eslint/types": "5.57.1", + "@typescript-eslint/visitor-keys": "5.57.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -13189,12 +13189,12 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "5.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.56.0.tgz", - "integrity": "sha512-1mFdED7u5bZpX6Xxf5N9U2c18sb+8EvU3tyOIj6LQZ5OOvnmj8BVeNNP603OFPm5KkS1a7IvCIcwrdHXaEMG/Q==", + "version": "5.57.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.57.1.tgz", + "integrity": "sha512-RjQrAniDU0CEk5r7iphkm731zKlFiUjvcBS2yHAg8WWqFMCaCrD0rKEVOMUyMMcbGPZ0bPp56srkGWrgfZqLRA==", "dev": true, "requires": { - "@typescript-eslint/types": "5.56.0", + "@typescript-eslint/types": "5.57.1", "eslint-visitor-keys": "^3.3.0" } }, From 03868107141a422ca41ad242c95d5f7c59dd581f Mon Sep 17 00:00:00 2001 From: Dolan Miu Date: Tue, 4 Apr 2023 22:21:01 +0100 Subject: [PATCH 13/17] Write tests and simplify logic --- demo/89-template-document.ts | 2 +- src/patcher/paragraph-split-inject.spec.ts | 70 +++++++++++++++------- src/patcher/paragraph-split-inject.ts | 2 +- 3 files changed, 52 insertions(+), 22 deletions(-) diff --git a/demo/89-template-document.ts b/demo/89-template-document.ts index 1220a6a8f6..547c77404d 100644 --- a/demo/89-template-document.ts +++ b/demo/89-template-document.ts @@ -1,7 +1,7 @@ // Patch a document with patches // Import from 'docx' rather than '../build' if you install from npm import * as fs from "fs"; -import { IPatch, patchDocument, PatchType, TextRun } from "../src"; +import { IPatch, patchDocument, PatchType, TextRun } from "../build"; export const font = "Trebuchet MS"; export const getPatches = (fields: { [key: string]: string }) => { diff --git a/src/patcher/paragraph-split-inject.spec.ts b/src/patcher/paragraph-split-inject.spec.ts index c0b8eec459..7b207ba82b 100644 --- a/src/patcher/paragraph-split-inject.spec.ts +++ b/src/patcher/paragraph-split-inject.spec.ts @@ -88,26 +88,56 @@ describe("paragraph-split-inject", () => { }); it("should continue if text run doesn't have text", () => { - const output = findRunElementIndexWithToken( - { - name: "w:p", - type: "element", - elements: [ - { - name: "w:r", - type: "element", - elements: [ - { - name: "w:t", - type: "element", - }, - ], - }, - ], - }, - "hello", - ); - expect(output).to.deep.equal(0); + expect(() => + findRunElementIndexWithToken( + { + name: "w:p", + type: "element", + elements: [ + { + name: "w:r", + type: "element", + elements: [ + { + name: "w:t", + type: "element", + }, + ], + }, + ], + }, + "hello", + ), + ).to.throw(); + }); + + it("should continue if text run doesn't have text", () => { + expect(() => + findRunElementIndexWithToken( + { + name: "w:p", + type: "element", + elements: [ + { + name: "w:r", + type: "element", + elements: [ + { + name: "w:t", + type: "element", + elements: [ + { + type: "text", + }, + ], + }, + ], + }, + ], + }, + "hello", + ), + ).to.throw(); }); }); diff --git a/src/patcher/paragraph-split-inject.ts b/src/patcher/paragraph-split-inject.ts index 3cb3a9705d..d7485e4991 100644 --- a/src/patcher/paragraph-split-inject.ts +++ b/src/patcher/paragraph-split-inject.ts @@ -12,7 +12,7 @@ export const findRunElementIndexWithToken = (paragraphElement: Element, token: s continue; } - if ((text.elements?.[0].text as string)?.includes(token)) { + if ((text.elements[0].text as string)?.includes(token)) { return i; } } From accb1d44d0d36fb66549b3f7f456b35995b42ea0 Mon Sep 17 00:00:00 2001 From: Dolan Miu Date: Wed, 5 Apr 2023 02:03:30 +0100 Subject: [PATCH 14/17] Version bump --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index bc7d76e1e2..44b79e327a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "docx", - "version": "8.0.1", + "version": "8.0.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "docx", - "version": "8.0.1", + "version": "8.0.2", "license": "MIT", "dependencies": { "@types/node": "^18.0.0", diff --git a/package.json b/package.json index 3db32ba7f4..73c219e54b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "docx", - "version": "8.0.1", + "version": "8.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": { From c59c5350fdbd55ff5bc71506917c75fbfb202457 Mon Sep 17 00:00:00 2001 From: Lentyaev Pavel Date: Tue, 18 Apr 2023 15:15:38 +0300 Subject: [PATCH 15/17] fix: added unique numeric id creator to avoid numbering render errors --- src/file/drawing/doc-properties/doc-properties.ts | 4 +++- src/file/numbering/numbering.ts | 11 +++++++---- src/file/paragraph/links/bookmark.ts | 4 +++- src/util/convenience-functions.ts | 8 +++++--- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/file/drawing/doc-properties/doc-properties.ts b/src/file/drawing/doc-properties/doc-properties.ts index ab5145cd5d..423317d6c8 100644 --- a/src/file/drawing/doc-properties/doc-properties.ts +++ b/src/file/drawing/doc-properties/doc-properties.ts @@ -2,7 +2,7 @@ import { IContext, IXmlableObject, NextAttributeComponent, XmlComponent } from "@file/xml-components"; import { ConcreteHyperlink } from "@file/paragraph"; -import { uniqueNumericId } from "@util/convenience-functions"; +import { uniqueNumericIdCreator } from "@util/convenience-functions"; import { createHyperlinkClick } from "./doc-properties-children"; @@ -24,6 +24,8 @@ export interface DocPropertiesOptions { readonly title: string; } +const uniqueNumericId = uniqueNumericIdCreator(); + export class DocProperties extends XmlComponent { public constructor({ name, description, title }: DocPropertiesOptions = { name: "", description: "", title: "" }) { super("wp:docPr"); diff --git a/src/file/numbering/numbering.ts b/src/file/numbering/numbering.ts index b52d6ba56c..b8eeef2feb 100644 --- a/src/file/numbering/numbering.ts +++ b/src/file/numbering/numbering.ts @@ -2,7 +2,7 @@ // https://stackoverflow.com/questions/58622437/purpose-of-abstractnum-and-numberinginstance import { AlignmentType } from "@file/paragraph"; import { IContext, IXmlableObject, XmlComponent } from "@file/xml-components"; -import { convertInchesToTwip, uniqueNumericId } from "@util/convenience-functions"; +import { convertInchesToTwip, uniqueNumericIdCreator } from "@util/convenience-functions"; import { DocumentAttributes } from "../document/document-attributes"; import { AbstractNumbering } from "./abstract-numbering"; @@ -16,6 +16,9 @@ export interface INumberingOptions { }[]; } +const abstractNumUniqueNumericId = uniqueNumericIdCreator(); +const concreteNumUniqueNumericId = uniqueNumericIdCreator(1); // Setting initial to 1 as we have numId = 1 for "default-bullet-numbering" + // // // @@ -55,7 +58,7 @@ export class Numbering extends XmlComponent { }), ); - const abstractNumbering = new AbstractNumbering(uniqueNumericId(), [ + const abstractNumbering = new AbstractNumbering(abstractNumUniqueNumericId(), [ { level: 0, format: LevelFormat.BULLET, @@ -176,7 +179,7 @@ export class Numbering extends XmlComponent { this.abstractNumberingMap.set("default-bullet-numbering", abstractNumbering); for (const con of options.config) { - this.abstractNumberingMap.set(con.reference, new AbstractNumbering(uniqueNumericId(), con.levels)); + this.abstractNumberingMap.set(con.reference, new AbstractNumbering(abstractNumUniqueNumericId(), con.levels)); this.referenceConfigMap.set(con.reference, con.levels); } } @@ -209,7 +212,7 @@ export class Numbering extends XmlComponent { const firstLevelStartNumber = referenceConfigLevels && referenceConfigLevels[0].start; const concreteNumberingSettings = { - numId: uniqueNumericId(), + numId: concreteNumUniqueNumericId(), abstractNumId: abstractNumbering.id, reference, instance, diff --git a/src/file/paragraph/links/bookmark.ts b/src/file/paragraph/links/bookmark.ts index 5a74cb1c5d..d88bfd7f46 100644 --- a/src/file/paragraph/links/bookmark.ts +++ b/src/file/paragraph/links/bookmark.ts @@ -1,10 +1,12 @@ // http://officeopenxml.com/WPbookmark.php import { XmlComponent } from "@file/xml-components"; -import { uniqueNumericId } from "@util/convenience-functions"; +import { uniqueNumericIdCreator } from "@util/convenience-functions"; import { ParagraphChild } from "../paragraph"; import { BookmarkEndAttributes, BookmarkStartAttributes } from "./bookmark-attributes"; +const uniqueNumericId = uniqueNumericIdCreator(); + export class Bookmark { public readonly start: BookmarkStart; public readonly children: readonly ParagraphChild[]; diff --git a/src/util/convenience-functions.ts b/src/util/convenience-functions.ts index 64f451e066..8dac4a929b 100644 --- a/src/util/convenience-functions.ts +++ b/src/util/convenience-functions.ts @@ -1,12 +1,14 @@ import { nanoid } from "nanoid/non-secure"; -let currentCount = 0; - // Twip - twentieths of a point export const convertMillimetersToTwip = (millimeters: number): number => Math.floor((millimeters / 25.4) * 72 * 20); export const convertInchesToTwip = (inches: number): number => Math.floor(inches * 72 * 20); -export const uniqueNumericId = (): number => ++currentCount; +export const uniqueNumericIdCreator = (initial = 0): (() => number) => { + let currentCount = initial; + + return () => ++currentCount; +}; export const uniqueId = (): string => nanoid().toLowerCase(); From 704c678333d7ba2abe0462531b30dd134d5f54ae Mon Sep 17 00:00:00 2001 From: Lentyaev Pavel Date: Wed, 19 Apr 2023 16:51:03 +0300 Subject: [PATCH 16/17] fix: unit tests fix --- src/file/drawing/anchor/anchor.spec.ts | 4 ++-- src/file/drawing/doc-properties/doc-properties.ts | 6 ++---- src/file/drawing/drawing.spec.ts | 4 ++-- src/file/numbering/numbering.spec.ts | 6 ++++-- src/file/numbering/numbering.ts | 5 +---- src/file/paragraph/links/bookmark.ts | 6 ++---- src/file/paragraph/paragraph.spec.ts | 4 ++-- src/file/paragraph/run/image-run.spec.ts | 4 ++-- src/util/convenience-functions.spec.ts | 5 +++-- src/util/convenience-functions.ts | 5 +++++ 10 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/file/drawing/anchor/anchor.spec.ts b/src/file/drawing/anchor/anchor.spec.ts index d2da912761..b6a368b4e6 100644 --- a/src/file/drawing/anchor/anchor.spec.ts +++ b/src/file/drawing/anchor/anchor.spec.ts @@ -41,11 +41,11 @@ const createAnchor = (drawingOptions: IDrawingOptions): Anchor => describe("Anchor", () => { before(() => { - stub(convenienceFunctions, "uniqueNumericId").callsFake(() => 0); + stub(convenienceFunctions, "docPropertiesUniqueNumericId").callsFake(() => 0); }); after(() => { - (convenienceFunctions.uniqueNumericId as SinonStub).restore(); + (convenienceFunctions.docPropertiesUniqueNumericId as SinonStub).restore(); }); let anchor: Anchor; diff --git a/src/file/drawing/doc-properties/doc-properties.ts b/src/file/drawing/doc-properties/doc-properties.ts index 423317d6c8..8b0093c7f1 100644 --- a/src/file/drawing/doc-properties/doc-properties.ts +++ b/src/file/drawing/doc-properties/doc-properties.ts @@ -2,7 +2,7 @@ import { IContext, IXmlableObject, NextAttributeComponent, XmlComponent } from "@file/xml-components"; import { ConcreteHyperlink } from "@file/paragraph"; -import { uniqueNumericIdCreator } from "@util/convenience-functions"; +import { docPropertiesUniqueNumericId } from "@util/convenience-functions"; import { createHyperlinkClick } from "./doc-properties-children"; @@ -24,8 +24,6 @@ export interface DocPropertiesOptions { readonly title: string; } -const uniqueNumericId = uniqueNumericIdCreator(); - export class DocProperties extends XmlComponent { public constructor({ name, description, title }: DocPropertiesOptions = { name: "", description: "", title: "" }) { super("wp:docPr"); @@ -34,7 +32,7 @@ export class DocProperties extends XmlComponent { new NextAttributeComponent({ id: { key: "id", - value: uniqueNumericId(), + value: docPropertiesUniqueNumericId(), }, name: { key: "name", diff --git a/src/file/drawing/drawing.spec.ts b/src/file/drawing/drawing.spec.ts index d445a01055..8850881159 100644 --- a/src/file/drawing/drawing.spec.ts +++ b/src/file/drawing/drawing.spec.ts @@ -31,11 +31,11 @@ const createDrawing = (drawingOptions?: IDrawingOptions): Drawing => describe("Drawing", () => { before(() => { - stub(convenienceFunctions, "uniqueNumericId").callsFake(() => 0); + stub(convenienceFunctions, "docPropertiesUniqueNumericId").callsFake(() => 0); }); after(() => { - (convenienceFunctions.uniqueNumericId as SinonStub).restore(); + (convenienceFunctions.docPropertiesUniqueNumericId as SinonStub).restore(); }); let currentBreak: Drawing; diff --git a/src/file/numbering/numbering.spec.ts b/src/file/numbering/numbering.spec.ts index 71540f8691..ff4c781ebe 100644 --- a/src/file/numbering/numbering.spec.ts +++ b/src/file/numbering/numbering.spec.ts @@ -8,11 +8,13 @@ import { Numbering } from "./numbering"; describe("Numbering", () => { before(() => { - stub(convenienceFunctions, "uniqueNumericId").callsFake(() => 0); + stub(convenienceFunctions, "abstractNumUniqueNumericId").callsFake(() => 0); + stub(convenienceFunctions, "concreteNumUniqueNumericId").callsFake(() => 0); }); after(() => { - (convenienceFunctions.uniqueNumericId as SinonStub).restore(); + (convenienceFunctions.abstractNumUniqueNumericId as SinonStub).restore(); + (convenienceFunctions.concreteNumUniqueNumericId as SinonStub).restore(); }); describe("#constructor", () => { diff --git a/src/file/numbering/numbering.ts b/src/file/numbering/numbering.ts index b8eeef2feb..4ec5206327 100644 --- a/src/file/numbering/numbering.ts +++ b/src/file/numbering/numbering.ts @@ -2,7 +2,7 @@ // https://stackoverflow.com/questions/58622437/purpose-of-abstractnum-and-numberinginstance import { AlignmentType } from "@file/paragraph"; import { IContext, IXmlableObject, XmlComponent } from "@file/xml-components"; -import { convertInchesToTwip, uniqueNumericIdCreator } from "@util/convenience-functions"; +import { abstractNumUniqueNumericId, concreteNumUniqueNumericId, convertInchesToTwip } from "@util/convenience-functions"; import { DocumentAttributes } from "../document/document-attributes"; import { AbstractNumbering } from "./abstract-numbering"; @@ -16,9 +16,6 @@ export interface INumberingOptions { }[]; } -const abstractNumUniqueNumericId = uniqueNumericIdCreator(); -const concreteNumUniqueNumericId = uniqueNumericIdCreator(1); // Setting initial to 1 as we have numId = 1 for "default-bullet-numbering" - // // // diff --git a/src/file/paragraph/links/bookmark.ts b/src/file/paragraph/links/bookmark.ts index d88bfd7f46..8bb7c9b5ed 100644 --- a/src/file/paragraph/links/bookmark.ts +++ b/src/file/paragraph/links/bookmark.ts @@ -1,19 +1,17 @@ // http://officeopenxml.com/WPbookmark.php import { XmlComponent } from "@file/xml-components"; -import { uniqueNumericIdCreator } from "@util/convenience-functions"; +import { bookmarkUniqueNumericId } from "@util/convenience-functions"; import { ParagraphChild } from "../paragraph"; import { BookmarkEndAttributes, BookmarkStartAttributes } from "./bookmark-attributes"; -const uniqueNumericId = uniqueNumericIdCreator(); - export class Bookmark { public readonly start: BookmarkStart; public readonly children: readonly ParagraphChild[]; public readonly end: BookmarkEnd; public constructor(options: { readonly id: string; readonly children: readonly ParagraphChild[] }) { - const linkId = uniqueNumericId(); + const linkId = bookmarkUniqueNumericId(); this.start = new BookmarkStart(options.id, linkId); this.children = options.children; diff --git a/src/file/paragraph/paragraph.spec.ts b/src/file/paragraph/paragraph.spec.ts index b74359de86..7d21b5d171 100644 --- a/src/file/paragraph/paragraph.spec.ts +++ b/src/file/paragraph/paragraph.spec.ts @@ -20,12 +20,12 @@ import { TextRun } from "./run"; describe("Paragraph", () => { before(() => { stub(convenienceFunctions, "uniqueId").callsFake(() => "test-unique-id"); - stub(convenienceFunctions, "uniqueNumericId").callsFake(() => -101); + stub(convenienceFunctions, "bookmarkUniqueNumericId").callsFake(() => -101); }); after(() => { (convenienceFunctions.uniqueId as SinonStub).restore(); - (convenienceFunctions.uniqueNumericId as SinonStub).restore(); + (convenienceFunctions.bookmarkUniqueNumericId as SinonStub).restore(); }); describe("#constructor()", () => { diff --git a/src/file/paragraph/run/image-run.spec.ts b/src/file/paragraph/run/image-run.spec.ts index edc4aa5910..9e9ad89505 100644 --- a/src/file/paragraph/run/image-run.spec.ts +++ b/src/file/paragraph/run/image-run.spec.ts @@ -11,12 +11,12 @@ import { ImageRun } from "./image-run"; describe("ImageRun", () => { before(() => { stub(convenienceFunctions, "uniqueId").callsFake(() => "test-unique-id"); - stub(convenienceFunctions, "uniqueNumericId").callsFake(() => 0); + stub(convenienceFunctions, "docPropertiesUniqueNumericId").callsFake(() => 0); }); after(() => { (convenienceFunctions.uniqueId as SinonStub).restore(); - (convenienceFunctions.uniqueNumericId as SinonStub).restore(); + (convenienceFunctions.docPropertiesUniqueNumericId as SinonStub).restore(); }); describe("#constructor()", () => { diff --git a/src/util/convenience-functions.spec.ts b/src/util/convenience-functions.spec.ts index 8fa26f61a3..4bca649b6b 100644 --- a/src/util/convenience-functions.spec.ts +++ b/src/util/convenience-functions.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { convertInchesToTwip, convertMillimetersToTwip, uniqueId, uniqueNumericId } from "./convenience-functions"; +import { convertInchesToTwip, convertMillimetersToTwip, uniqueId, uniqueNumericIdCreator } from "./convenience-functions"; describe("Utility", () => { describe("#convertMillimetersToTwip", () => { @@ -17,8 +17,9 @@ describe("Utility", () => { }); }); - describe("#uniqueNumericId", () => { + describe("#uniqueNumericIdCreator", () => { it("should generate a unique incrementing ID", () => { + const uniqueNumericId = uniqueNumericIdCreator(); expect(uniqueNumericId()).to.not.be.undefined; }); }); diff --git a/src/util/convenience-functions.ts b/src/util/convenience-functions.ts index 8dac4a929b..543b6e9c7c 100644 --- a/src/util/convenience-functions.ts +++ b/src/util/convenience-functions.ts @@ -11,4 +11,9 @@ export const uniqueNumericIdCreator = (initial = 0): (() => number) => { return () => ++currentCount; }; +export const abstractNumUniqueNumericId = uniqueNumericIdCreator(); +export const concreteNumUniqueNumericId = uniqueNumericIdCreator(1); // Setting initial to 1 as we have numId = 1 for "default-bullet-numbering" +export const docPropertiesUniqueNumericId = uniqueNumericIdCreator(); +export const bookmarkUniqueNumericId = uniqueNumericIdCreator(); + export const uniqueId = (): string => nanoid().toLowerCase(); From bb686bbcbea4e2ba0d8f4faee157f3c02b0e5bb3 Mon Sep 17 00:00:00 2001 From: Dolan Miu Date: Thu, 20 Apr 2023 00:58:11 +0100 Subject: [PATCH 17/17] Version bump --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 44b79e327a..9d7bc23753 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "docx", - "version": "8.0.2", + "version": "8.0.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "docx", - "version": "8.0.2", + "version": "8.0.3", "license": "MIT", "dependencies": { "@types/node": "^18.0.0", diff --git a/package.json b/package.json index 73c219e54b..7f437a5e86 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "docx", - "version": "8.0.2", + "version": "8.0.3", "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": {