diff --git a/package-lock.json b/package-lock.json index dec806467b..3bf8e92202 100644 --- a/package-lock.json +++ b/package-lock.json @@ -92,51 +92,94 @@ } }, "node_modules/@babel/generator": { - "version": "7.11.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz", - "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", + "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", "dev": true, "dependencies": { - "@babel/types": "^7.11.5", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" + "@babel/types": "^7.23.0", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + }, + "engines": { + "node": ">=6.9.0" } }, - "node_modules/@babel/generator/node_modules/@babel/helper-validator-identifier": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", - "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", - "dev": true - }, "node_modules/@babel/generator/node_modules/@babel/types": { - "version": "7.12.12", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz", - "integrity": "sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.12.11", - "lodash": "^4.17.19", + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-environment-visitor": { + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", + "dev": true, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz", - "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", "dev": true, "dependencies": { - "@babel/helper-get-function-arity": "^7.10.4", - "@babel/template": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" + }, + "engines": { + "node": ">=6.9.0" } }, - "node_modules/@babel/helper-get-function-arity": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz", - "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==", + "node_modules/@babel/helper-function-name/node_modules/@babel/types": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", "dev": true, "dependencies": { - "@babel/types": "^7.10.4" + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-hoist-variables": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", + "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", + "dev": true, + "dependencies": { + "@babel/types": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-hoist-variables/node_modules/@babel/types": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", + "dev": true, + "dependencies": { + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/helper-member-expression-to-functions": { @@ -196,46 +239,6 @@ "lodash": "^4.17.19" } }, - "node_modules/@babel/helper-module-transforms/node_modules/@babel/generator": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz", - "integrity": "sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==", - "dev": true, - "dependencies": { - "@babel/types": "^7.12.1", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - } - }, - "node_modules/@babel/helper-module-transforms/node_modules/@babel/parser": { - "version": "7.12.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz", - "integrity": "sha512-kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw==", - "dev": true, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/helper-module-transforms/node_modules/@babel/traverse": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz", - "integrity": "sha512-MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.12.1", - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/parser": "^7.12.1", - "@babel/types": "^7.12.1", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.19" - } - }, "node_modules/@babel/helper-module-transforms/node_modules/@babel/types": { "version": "7.12.1", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz", @@ -274,46 +277,6 @@ "@babel/types": "^7.12.1" } }, - "node_modules/@babel/helper-replace-supers/node_modules/@babel/generator": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz", - "integrity": "sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==", - "dev": true, - "dependencies": { - "@babel/types": "^7.12.1", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - } - }, - "node_modules/@babel/helper-replace-supers/node_modules/@babel/parser": { - "version": "7.12.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz", - "integrity": "sha512-kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw==", - "dev": true, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz", - "integrity": "sha512-MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.12.1", - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/parser": "^7.12.1", - "@babel/types": "^7.12.1", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.19" - } - }, "node_modules/@babel/helper-replace-supers/node_modules/@babel/types": { "version": "7.12.1", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz", @@ -346,36 +309,48 @@ } }, "node_modules/@babel/helper-split-export-declaration": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz", - "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", + "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", "dev": true, "dependencies": { - "@babel/types": "^7.11.0" + "@babel/types": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" } }, - "node_modules/@babel/helper-split-export-declaration/node_modules/@babel/helper-validator-identifier": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", - "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", - "dev": true - }, "node_modules/@babel/helper-split-export-declaration/node_modules/@babel/types": { - "version": "7.12.12", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz", - "integrity": "sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.12.11", - "lodash": "^4.17.19", + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", + "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", + "dev": true, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } }, "node_modules/@babel/helpers": { "version": "7.10.4", @@ -389,14 +364,17 @@ } }, "node_modules/@babel/highlight": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", - "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", + "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.10.4", - "chalk": "^2.0.0", + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@babel/highlight/node_modules/chalk": { @@ -414,9 +392,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.11.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz", - "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", + "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -558,48 +536,120 @@ } }, "node_modules/@babel/template": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz", - "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.10.4", - "@babel/parser": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" + }, + "engines": { + "node": ">=6.9.0" } }, - "node_modules/@babel/traverse": { - "version": "7.11.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz", - "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==", + "node_modules/@babel/template/node_modules/@babel/code-frame": { + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", + "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.11.5", - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/parser": "^7.11.5", - "@babel/types": "^7.11.5", + "@babel/highlight": "^7.22.13", + "chalk": "^2.4.2" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/template/node_modules/@babel/types": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", + "dev": true, + "dependencies": { + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/template/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/traverse": { + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", + "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.0", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.23.0", + "@babel/types": "^7.23.0", "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.19" + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" } }, - "node_modules/@babel/traverse/node_modules/@babel/helper-validator-identifier": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", - "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", - "dev": true + "node_modules/@babel/traverse/node_modules/@babel/code-frame": { + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", + "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", + "dev": true, + "dependencies": { + "@babel/highlight": "^7.22.13", + "chalk": "^2.4.2" + }, + "engines": { + "node": ">=6.9.0" + } }, "node_modules/@babel/traverse/node_modules/@babel/types": { - "version": "7.12.12", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz", - "integrity": "sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.12.11", - "lodash": "^4.17.19", + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" } }, "node_modules/@babel/types": { @@ -1493,13 +1543,13 @@ "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.14", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz", - "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==", + "version": "0.3.19", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz", + "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==", "dev": true, "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "node_modules/@lang/rollup-plugin-dts": { @@ -5760,17 +5810,6 @@ "semver": "bin/semver" } }, - "node_modules/istanbul-lib-instrument/node_modules/@babel/generator": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz", - "integrity": "sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==", - "dev": true, - "dependencies": { - "@babel/types": "^7.12.1", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - } - }, "node_modules/istanbul-lib-instrument/node_modules/@babel/helpers": { "version": "7.12.1", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.1.tgz", @@ -5782,35 +5821,6 @@ "@babel/types": "^7.12.1" } }, - "node_modules/istanbul-lib-instrument/node_modules/@babel/parser": { - "version": "7.12.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz", - "integrity": "sha512-kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw==", - "dev": true, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/istanbul-lib-instrument/node_modules/@babel/traverse": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz", - "integrity": "sha512-MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.12.1", - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/parser": "^7.12.1", - "@babel/types": "^7.12.1", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.19" - } - }, "node_modules/istanbul-lib-instrument/node_modules/@babel/types": { "version": "7.12.1", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz", @@ -11137,53 +11147,79 @@ } }, "@babel/generator": { - "version": "7.11.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz", - "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", + "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", "dev": true, "requires": { - "@babel/types": "^7.11.5", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" + "@babel/types": "^7.23.0", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" }, "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", - "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", - "dev": true - }, "@babel/types": { - "version": "7.12.12", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz", - "integrity": "sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.12.11", - "lodash": "^4.17.19", + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" } } } }, + "@babel/helper-environment-visitor": { + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", + "dev": true + }, "@babel/helper-function-name": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz", - "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "^7.10.4", - "@babel/template": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" + }, + "dependencies": { + "@babel/types": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + } + } } }, - "@babel/helper-get-function-arity": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz", - "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==", + "@babel/helper-hoist-variables": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", + "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", "dev": true, "requires": { - "@babel/types": "^7.10.4" + "@babel/types": "^7.22.5" + }, + "dependencies": { + "@babel/types": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/helper-member-expression-to-functions": { @@ -11247,40 +11283,6 @@ "lodash": "^4.17.19" }, "dependencies": { - "@babel/generator": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz", - "integrity": "sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==", - "dev": true, - "requires": { - "@babel/types": "^7.12.1", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - } - }, - "@babel/parser": { - "version": "7.12.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz", - "integrity": "sha512-kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw==", - "dev": true - }, - "@babel/traverse": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz", - "integrity": "sha512-MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.12.1", - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/parser": "^7.12.1", - "@babel/types": "^7.12.1", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.19" - } - }, "@babel/types": { "version": "7.12.1", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz", @@ -11321,40 +11323,6 @@ "@babel/types": "^7.12.1" }, "dependencies": { - "@babel/generator": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz", - "integrity": "sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==", - "dev": true, - "requires": { - "@babel/types": "^7.12.1", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - } - }, - "@babel/parser": { - "version": "7.12.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz", - "integrity": "sha512-kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw==", - "dev": true - }, - "@babel/traverse": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz", - "integrity": "sha512-MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.12.1", - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/parser": "^7.12.1", - "@babel/types": "^7.12.1", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.19" - } - }, "@babel/types": { "version": "7.12.1", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz", @@ -11391,37 +11359,37 @@ } }, "@babel/helper-split-export-declaration": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz", - "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", + "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", "dev": true, "requires": { - "@babel/types": "^7.11.0" + "@babel/types": "^7.22.5" }, "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", - "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", - "dev": true - }, "@babel/types": { - "version": "7.12.12", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz", - "integrity": "sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.12.11", - "lodash": "^4.17.19", + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" } } } }, + "@babel/helper-string-parser": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", + "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", + "dev": true + }, "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "dev": true }, "@babel/helpers": { @@ -11436,13 +11404,13 @@ } }, "@babel/highlight": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", - "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", + "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.10.4", - "chalk": "^2.0.0", + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, "dependencies": { @@ -11460,9 +11428,9 @@ } }, "@babel/parser": { - "version": "7.11.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz", - "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", + "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", "dev": true }, "@babel/plugin-syntax-async-generators": { @@ -11565,49 +11533,99 @@ } }, "@babel/template": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz", - "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dev": true, "requires": { - "@babel/code-frame": "^7.10.4", - "@babel/parser": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", + "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", + "dev": true, + "requires": { + "@babel/highlight": "^7.22.13", + "chalk": "^2.4.2" + } + }, + "@babel/types": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + } } }, "@babel/traverse": { - "version": "7.11.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz", - "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.11.5", - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/parser": "^7.11.5", - "@babel/types": "^7.11.5", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", + "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.0", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.23.0", + "@babel/types": "^7.23.0", "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.19" + "globals": "^11.1.0" }, "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", - "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", - "dev": true + "@babel/code-frame": { + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", + "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", + "dev": true, + "requires": { + "@babel/highlight": "^7.22.13", + "chalk": "^2.4.2" + } }, "@babel/types": { - "version": "7.12.12", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz", - "integrity": "sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.12.11", - "lodash": "^4.17.19", + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } } } }, @@ -12340,13 +12358,13 @@ "dev": true }, "@jridgewell/trace-mapping": { - "version": "0.3.14", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz", - "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==", + "version": "0.3.19", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz", + "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==", "dev": true, "requires": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "@lang/rollup-plugin-dts": { @@ -15772,17 +15790,6 @@ } } }, - "@babel/generator": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz", - "integrity": "sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==", - "dev": true, - "requires": { - "@babel/types": "^7.12.1", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - } - }, "@babel/helpers": { "version": "7.12.1", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.1.tgz", @@ -15794,29 +15801,6 @@ "@babel/types": "^7.12.1" } }, - "@babel/parser": { - "version": "7.12.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz", - "integrity": "sha512-kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw==", - "dev": true - }, - "@babel/traverse": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz", - "integrity": "sha512-MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.12.1", - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/parser": "^7.12.1", - "@babel/types": "^7.12.1", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.19" - } - }, "@babel/types": { "version": "7.12.1", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz", diff --git a/src/chart/sunburst/SunburstPiece.ts b/src/chart/sunburst/SunburstPiece.ts index 091d8a1d77..92114e11ee 100644 --- a/src/chart/sunburst/SunburstPiece.ts +++ b/src/chart/sunburst/SunburstPiece.ts @@ -215,14 +215,20 @@ class SunburstPiece extends graphic.Sector { let r; const labelPadding = getLabelAttr(labelStateModel, 'distance') || 0; let textAlign = getLabelAttr(labelStateModel, 'align'); + const rotateType = getLabelAttr(labelStateModel, 'rotate'); + const flipStartAngle = Math.PI * 0.5; + const flipEndAngle = Math.PI * 1.5; + const midAngleNormal = normalizeRadian(rotateType === 'tangential' ? Math.PI / 2 - midAngle : midAngle); + + // For text that is up-side down, rotate 180 degrees to make sure + // it's readable + const needsFlip = midAngleNormal > flipStartAngle + && !isRadianAroundZero(midAngleNormal - flipStartAngle) + && midAngleNormal < flipEndAngle; + if (labelPosition === 'outside') { r = layout.r + labelPadding; - if (layout.clockwise) { - textAlign = midAngle > Math.PI / 2 ? 'right' : 'left'; - } - else { - textAlign = midAngle > -Math.PI * 3 / 2 ? 'right' : 'left'; - } + textAlign = needsFlip ? 'right' : 'left'; } else { if (!textAlign || textAlign === 'center') { @@ -237,29 +243,11 @@ class SunburstPiece extends graphic.Sector { } else if (textAlign === 'left') { r = layout.r0 + labelPadding; - if (layout.clockwise) { - if (midAngle > Math.PI / 2 && !isRadianAroundZero(midAngle - Math.PI / 2)) { - textAlign = 'right'; - } - } - else { - if (midAngle > -Math.PI * 3 / 2 && !isRadianAroundZero(midAngle - Math.PI / 2)) { - textAlign = 'right'; - } - } + textAlign = needsFlip ? 'right' : 'left'; } else if (textAlign === 'right') { r = layout.r - labelPadding; - if (layout.clockwise) { - if (midAngle > Math.PI / 2 && !isRadianAroundZero(midAngle - Math.PI / 2)) { - textAlign = 'left'; - } - } - else { - if (midAngle > -Math.PI * 3 / 2 && !isRadianAroundZero(midAngle - Math.PI / 2)) { - textAlign = 'left'; - } - } + textAlign = needsFlip ? 'left' : 'right'; } } @@ -269,22 +257,14 @@ class SunburstPiece extends graphic.Sector { state.x = r * dx + layout.cx; state.y = r * dy + layout.cy; - const rotateType = getLabelAttr(labelStateModel, 'rotate'); let rotate = 0; if (rotateType === 'radial') { - rotate = normalizeRadian(-midAngle); - if (((rotate > Math.PI / 2 && rotate < Math.PI * 1.5))) { - rotate += Math.PI; - } + rotate = normalizeRadian(-midAngle) + + (needsFlip ? Math.PI : 0); } else if (rotateType === 'tangential') { - rotate = Math.PI / 2 - midAngle; - if (rotate > Math.PI / 2) { - rotate -= Math.PI; - } - else if (rotate < -Math.PI / 2) { - rotate += Math.PI; - } + rotate = normalizeRadian(Math.PI / 2 - midAngle) + + (needsFlip ? Math.PI : 0); } else if (zrUtil.isNumber(rotateType)) { rotate = rotateType * Math.PI / 180; diff --git a/src/component/tooltip/TooltipHTMLContent.ts b/src/component/tooltip/TooltipHTMLContent.ts index da1960835e..7e08b53f98 100644 --- a/src/component/tooltip/TooltipHTMLContent.ts +++ b/src/component/tooltip/TooltipHTMLContent.ts @@ -520,7 +520,11 @@ class TooltipHTMLContent { } dispose() { - this.el.parentNode.removeChild(this.el); + clearTimeout(this._hideTimeout); + clearTimeout(this._longHideTimeout); + + const parentNode = this.el.parentNode; + parentNode && parentNode.removeChild(this.el); this.el = this._container = null; } diff --git a/src/core/echarts.ts b/src/core/echarts.ts index 1c342ce413..7757dd22fc 100644 --- a/src/core/echarts.ts +++ b/src/core/echarts.ts @@ -412,20 +412,19 @@ class ECharts extends Eventful { let defaultRenderer = 'canvas'; let defaultCoarsePointer: 'auto' | boolean = 'auto'; let defaultUseDirtyRect = false; + if (__DEV__) { const root = ( /* eslint-disable-next-line */ env.hasGlobalWindow ? window : global ) as any; - defaultRenderer = root.__ECHARTS__DEFAULT__RENDERER__ || defaultRenderer; - - defaultCoarsePointer = retrieve2(root.__ECHARTS__DEFAULT__COARSE_POINTER, defaultCoarsePointer); + if (root) { + defaultRenderer = retrieve2(root.__ECHARTS__DEFAULT__RENDERER__, defaultRenderer); + defaultCoarsePointer = retrieve2(root.__ECHARTS__DEFAULT__COARSE_POINTER, defaultCoarsePointer); + defaultUseDirtyRect = retrieve2(root.__ECHARTS__DEFAULT__USE_DIRTY_RECT__, defaultUseDirtyRect); + } - const devUseDirtyRect = root.__ECHARTS__DEFAULT__USE_DIRTY_RECT__; - defaultUseDirtyRect = devUseDirtyRect == null - ? defaultUseDirtyRect - : devUseDirtyRect; } const zr = this._zr = zrender.init(dom, { diff --git a/src/i18n/langAR.ts b/src/i18n/langAR.ts new file mode 100644 index 0000000000..ea65233f99 --- /dev/null +++ b/src/i18n/langAR.ts @@ -0,0 +1,147 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/** + * Language: Arabic. + */ + +export default { + + time: { + month: [ + 'يناير', 'فبراير', 'مارس', 'أبريل', 'مايو', 'يونيو', + 'يوليو', 'أغسطس', 'سبتمبر', 'أكتوبر', 'نوفمبر', 'ديسمبر' + ], + monthAbbr: [ + 'يناير', 'فبراير', 'مارس', 'أبريل', 'مايو', 'يونيو', + 'يوليو', 'أغسطس', 'سبتمبر', 'أكتوبر', 'نوفمبر', 'ديسمبر' + ], + dayOfWeek: [ + 'الأحد', 'الإثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت' + ], + dayOfWeekAbbr: [ + 'الأحد', 'الإثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت' + ] + }, + legend: { + selector: { + all: 'تحديد الكل', + inverse: 'عكس التحديد' + } + }, + toolbox: { + brush: { + title: { + rect: 'تحديد صندوقي', + polygon: 'تحديد حلقي', + lineX: 'تحديد أفقي', + lineY: 'تحديد عمودي', + keep: 'الاحتفاظ بالمحدد', + clear: 'إلغاء التحديد' + } + }, + dataView: { + title: 'عرض البيانات', + lang: ['عرض البيانات', 'إغلاق', 'تحديث'] + }, + dataZoom: { + title: { + zoom: 'تكبير', + back: 'استعادة التكبير' + } + }, + magicType: { + title: { + line: 'خطوط', + bar: 'أشرطة', + stack: 'تكديس', + tiled: 'مربعات' + } + }, + restore: { + title: 'استعادة' + }, + saveAsImage: { + title: 'حفظ كملف صورة', + lang: ['للحفظ كصورة انقر بالزر الأيمن'] + } + }, + series: { + typeNames: { + pie: 'رسم بياني دائري', + bar: 'رسم بياني شريطي', + line: 'رسم بياني خطي', + scatter: 'نقاط مبعثرة', + effectScatter: 'نقاط مبعثرة متموجة', + radar: 'رسم بياني راداري', + tree: 'شجرة', + treemap: 'مخطط شجري', + boxplot: 'مخطط صندوقي', + candlestick: 'مخطط شمعدان', + k: 'رسم بياني خطي من النوع K', + heatmap: 'خريطة حرارية', + map: 'خريطة', + parallel: 'خريطة الإحداثيات المتناظرة', + lines: 'خطوط', + graph: 'مخطط علائقي', + sankey: 'مخطط ثعباني', + funnel: 'مخطط هرمي', + gauge: 'مقياس', + pictorialBar: 'مخطط مصوّر', + themeRiver: 'نمط خريطة النهر', + sunburst: 'مخطط شمسي', + custom: 'مخطط مخصص', + chart: 'مخطط' + } + }, + aria: { + general: { + withTitle: 'هذا رسم بياني حول "{title}".', + withoutTitle: 'هذا رسم بياني.' + }, + series: { + single: { + prefix: '', + withName: ' من النوع {seriesType} اسمه {seriesName}.', + withoutName: ' من النوع {seriesType}.' + }, + multiple: { + prefix: '. يتكون من {seriesCount} سلسلة.', + withName: ' الـ {seriesId} هي سلسلة من النوع {seriesType} تستعرض {seriesName}.', + withoutName: ' الـ {seriesId} هي سلسلة من النوع {seriesType}.', + separator: { + middle: '، ', + end: '. ' + } + } + }, + data: { + allData: 'البيانات هي كالتالي: ', + partialData: 'أول {displayCnt} عناصر هي: ', + withName: 'قيمة العنصر {name} هي {value}', + withoutName: '{value}', + separator: { + middle: '، ', + end: '. ' + } + } + } + + +}; diff --git a/src/i18n/langCS.ts b/src/i18n/langCS.ts index f5e4d812db..12f07b62de 100644 --- a/src/i18n/langCS.ts +++ b/src/i18n/langCS.ts @@ -104,7 +104,9 @@ gauge: 'Indikátor', pictorialBar: 'Obrázkový sloupcový graf', themeRiver: 'Theme River Map', - sunburst: 'Vícevrstvý prstencový graf' + sunburst: 'Vícevrstvý prstencový graf', + custom: 'Graficu persunalizatu', + chart: 'Graf' } }, aria: { diff --git a/src/i18n/langDE.ts b/src/i18n/langDE.ts index 8bd9f2cc8e..1c25d73620 100644 --- a/src/i18n/langDE.ts +++ b/src/i18n/langDE.ts @@ -104,7 +104,9 @@ export default { gauge: 'Meßanzeige', pictorialBar: 'Bildlicher Balken', themeRiver: 'Thematische Flusskarte', - sunburst: 'Sonnenausbruch' + sunburst: 'Sonnenausbruch', + custom: 'Graficu persunalizatu', + chart: 'Diagramm' } }, aria: { diff --git a/src/i18n/langEN.ts b/src/i18n/langEN.ts index 266280cf6c..0b7f304320 100644 --- a/src/i18n/langEN.ts +++ b/src/i18n/langEN.ts @@ -104,7 +104,9 @@ export default { gauge: 'Gauge', pictorialBar: 'Pictorial bar', themeRiver: 'Theme River Map', - sunburst: 'Sunburst' + sunburst: 'Sunburst', + custom: 'Custom chart', + chart: 'Chart' } }, aria: { diff --git a/src/i18n/langES.ts b/src/i18n/langES.ts index d6b9c2d8fe..4e7d96ef46 100644 --- a/src/i18n/langES.ts +++ b/src/i18n/langES.ts @@ -76,5 +76,65 @@ export default { title: 'Guardar como imagen', lang: ['Clic derecho para guardar imagen'] } + }, + series: { + typeNames: { + pie: 'Gráfico circular', + bar: 'Gráfico de barras', + line: 'Gráfico de líneas', + scatter: 'Diagrama de dispersión', + effectScatter: 'Diagrama de dispersión de ondas', + radar: 'Gráfico de radar', + tree: 'Árbol', + treemap: 'Mapa de árbol', + boxplot: 'Diagrama de caja', + candlestick: 'Gráfico de velas', + k: 'Gráfico de líneas K', + heatmap: 'Mapa de calor', + map: 'Mapa', + parallel: 'Mapa de coordenadas paralelas', + lines: 'Gráfico de líneas', + graph: 'Gráfico de relaciones', + sankey: 'Diagrama de Sankey', + funnel: 'Gráfico de embudo', + gauge: 'Medidor', + pictorialBar: 'Gráfico de barras pictóricas', + themeRiver: 'Mapa de río temático', + sunburst: 'Sunburst', + custom: 'Gráfico personalizado', + chart: 'Gráfico' + } + }, + aria: { + general: { + withTitle: 'Este es un gráfico sobre “{title}”', + withoutTitle: 'Este es un gráfico' + }, + series: { + single: { + prefix: '', + withName: ' con tipo {seriesType} llamado {seriesName}.', + withoutName: ' con tipo {seriesType}.' + }, + multiple: { + prefix: '. Consta de {seriesCount} series.', + withName: ' La serie {seriesId} es un {seriesType} que representa {seriesName}.', + withoutName: ' La serie {seriesId} es un {seriesType}.', + separator: { + middle: '', + end: '' + } + } + }, + data: { + allData: 'Los datos son los siguientes: ', + partialData: 'Los primeros {displayCnt} elementos son: ', + withName: 'los datos para {name} son {value}', + withoutName: '{value}', + separator: { + middle: ', ', + end: '. ' + } + } } }; diff --git a/src/i18n/langFI.ts b/src/i18n/langFI.ts index edbc852a48..b7cb1da456 100644 --- a/src/i18n/langFI.ts +++ b/src/i18n/langFI.ts @@ -76,5 +76,65 @@ export default { title: 'Tallenna kuvana', lang: ['Paina oikeaa hiirennappia tallentaaksesi kuva'] } + }, + series: { + typeNames: { + pie: 'Ympyrädiagrammi', + bar: 'Pylväsdiagrammi', + line: 'Viivakaavio', + scatter: 'Pisteplot', + effectScatter: 'Ripple-pisteplot', + radar: 'Sädekaavio', + tree: 'Puu', + treemap: 'Tilastoaluekartta', + boxplot: 'Viivadiagrammi', + candlestick: 'Kynttiläkaavio', + k: 'K-linjakaavio', + heatmap: 'Lämpökartta', + map: 'Kartta', + parallel: 'Rinnakkaiskoordinaattikartta', + lines: 'Viivakuvaaja', + graph: 'Suhdekuvaaja', + sankey: 'Sankey-kaavio', + funnel: 'Suppilokaavio', + gauge: 'Mittari', + pictorialBar: 'Kuvallinen pylväs', + themeRiver: 'Teemajokikartta', + sunburst: 'Auringonkehä', + custom: 'Mukautettu kaavio', + chart: 'Kaavio' + } + }, + aria: { + general: { + withTitle: 'Tämä on kaavio “{title}”', + withoutTitle: 'Tämä on kaavio' + }, + series: { + single: { + prefix: '', + withName: ' tyyppiä {seriesType} nimeltään {seriesName}.', + withoutName: ' tyyppiä {seriesType}.' + }, + multiple: { + prefix: '. Se koostuu {seriesCount} sarjasta.', + withName: ' Sarja {seriesId} on {seriesType}, joka edustaa {seriesName}.', + withoutName: ' Sarja {seriesId} on {seriesType}.', + separator: { + middle: '', + end: '' + } + } + }, + data: { + allData: 'Tiedot ovat seuraavat: ', + partialData: 'Ensimmäiset {displayCnt} kohtaa ovat: ', + withName: 'tiedot nimelle {name} ovat {value}', + withoutName: '{value}', + separator: { + middle: ', ', + end: '. ' + } + } } }; diff --git a/src/i18n/langFR.ts b/src/i18n/langFR.ts index 2a501aff87..362226a8ef 100644 --- a/src/i18n/langFR.ts +++ b/src/i18n/langFR.ts @@ -104,7 +104,9 @@ export default { gauge: 'Jauge', pictorialBar: 'Barres à images', themeRiver: 'Stream Graph', - sunburst: 'Sunburst' + sunburst: 'Sunburst', + custom: 'Graphique personnalisé', + chart: 'Graphique' } }, aria: { diff --git a/src/i18n/langHU.ts b/src/i18n/langHU.ts index 3cdce9b837..e0aaae96e0 100644 --- a/src/i18n/langHU.ts +++ b/src/i18n/langHU.ts @@ -104,7 +104,9 @@ export default { gauge: 'Mérőeszköz', pictorialBar: 'Képes sávdiagram', themeRiver: 'Folyó témájú térkép', - sunburst: 'Napégés' + sunburst: 'Napégés', + custom: 'Egyedi diagram', + chart: 'Diagram' } }, aria: { diff --git a/src/i18n/langIT.ts b/src/i18n/langIT.ts index 75199920ce..1007db008f 100644 --- a/src/i18n/langIT.ts +++ b/src/i18n/langIT.ts @@ -104,7 +104,9 @@ export default { gauge: 'Gauge', pictorialBar: 'Pictorial bar', themeRiver: 'Theme River Map', - sunburst: 'Radiale' + sunburst: 'Radiale', + custom: 'Egyedi diagram', + chart: 'Grafico' } }, aria: { diff --git a/src/i18n/langJA.ts b/src/i18n/langJA.ts index cd431d5046..8c47c0c461 100644 --- a/src/i18n/langJA.ts +++ b/src/i18n/langJA.ts @@ -104,7 +104,9 @@ export default { gauge: 'ゲージ', pictorialBar: '絵入り棒グラフ', themeRiver: 'テーマリバー', - sunburst: 'サンバースト' + sunburst: 'サンバースト', + custom: 'カスタムチャート', + chart: 'チャート' } }, aria: { diff --git a/src/i18n/langKO.ts b/src/i18n/langKO.ts index 6901ac1b9f..d1bc78df7b 100644 --- a/src/i18n/langKO.ts +++ b/src/i18n/langKO.ts @@ -104,7 +104,9 @@ export default { gauge: '계기', pictorialBar: '픽토그램 차트', themeRiver: '스트림 그래프', - sunburst: '선버스트 차트' + sunburst: '선버스트 차트', + custom: '맞춤 차트', + chart: '차트' } }, aria: { diff --git a/src/i18n/langNL.ts b/src/i18n/langNL.ts new file mode 100644 index 0000000000..8a8abd02e9 --- /dev/null +++ b/src/i18n/langNL.ts @@ -0,0 +1,144 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/** + * Language: Dutch. + */ + +export default { + time: { + month: [ + 'januari', 'februari', 'maart', 'april', 'mei', 'juni', + 'juli', 'augustus', 'september', 'oktober', 'november', 'december' + ], + monthAbbr: [ + 'jan', 'feb', 'mrt', 'apr', 'mei', 'jun', + 'jul', 'aug', 'sep', 'okt', 'nov', 'dec' + ], + dayOfWeek: [ + 'zondag', 'maandag', 'dinsdag', 'woensdag', 'donderdag', 'vrijdag', 'zaterdag' + ], + dayOfWeekAbbr: [ + 'zo', 'ma', 'di', 'wo', 'do', 'vr', 'za' + ] + }, + legend: { + selector: { + all: 'Alle', + inverse: 'Omgekeerd' + } + }, + toolbox: { + brush: { + title: { + rect: 'Vakselectie', + polygon: 'Lasso selectie', + lineX: 'Horizontale selectie', + lineY: 'Verticale selectie', + keep: 'Selecties behouden', + clear: 'Selecties wissen' + } + }, + dataView: { + title: 'Gegevensweergave', + lang: ['Gegevensweergave', 'Sluiten', 'Vernieuwen'] + }, + dataZoom: { + title: { + zoom: 'Zoom', + back: 'Zoom herstellen' + } + }, + magicType: { + title: { + line: 'Omzetten naar lijndiagram', + bar: 'Omzetten naar staafdiagram', + stack: 'Omzetten naar stapeldiagram', + tiled: 'Omzetten naar tegeldiagram' + } + }, + restore: { + title: 'Herstellen' + }, + saveAsImage: { + title: 'Opslaan als afbeelding', + lang: ['Klik rechtermuisknop om de afbeelding op te slaan'] + } + }, + series: { + typeNames: { + pie: 'Cirkeldiagram', + bar: 'Staafdiagram', + line: 'Lijndiagram', + scatter: 'Spreidingsdiagram', + effectScatter: 'Spreidingsdiagram met rimpeleffect', + radar: 'Radardiagram', + tree: 'Boomdiagram', + treemap: 'Boomkaart', + boxplot: 'Boxplot', + candlestick: 'Kandelaardiagram', + k: 'K-lijndiagram', + heatmap: 'Hittekaart', + map: 'Kaart', + parallel: 'Parallele coördinatendiagram', + lines: 'Lijnendiagram', + graph: 'Relatiediagram', + sankey: 'Sankey-diagram', + funnel: 'Trechterdiagram', + gauge: 'Graadmeter', + pictorialBar: 'Staafdiagram met afbeeldingen', + themeRiver: 'Thematische rivierdiagram', + sunburst: 'Zonnestraaldiagram', + custom: 'Aangepast diagram', + chart: 'Diagram' + } + }, + aria: { + general: { + withTitle: 'Dit is een diagram over "{title}"', + withoutTitle: 'Dit is een diagram' + }, + series: { + single: { + prefix: '', + withName: ' van het type {seriesType} genaamd {seriesName}.', + withoutName: ' van het type {seriesType}.' + }, + multiple: { + prefix: '. Het bestaat uit {seriesCount} series.', + withName: ' De serie {seriesId} is een {seriesType} met de naam {seriesName}.', + withoutName: ' De serie {seriesId} is een {seriesType}.', + separator: { + middle: '', + end: '' + } + } + }, + data: { + allData: 'De gegevens zijn als volgt: ', + partialData: 'De eerste {displayCnt} items zijn: ', + withName: 'de gegevens voor {name} zijn {value}', + withoutName: '{value}', + separator: { + middle: ', ', + end: '. ' + } + } + } +}; diff --git a/src/i18n/langPL.ts b/src/i18n/langPL.ts index c84be2ebee..d5342eb7d1 100644 --- a/src/i18n/langPL.ts +++ b/src/i18n/langPL.ts @@ -104,7 +104,9 @@ gauge: 'Wykres zegarowy', pictorialBar: 'Wykres słupkowy obrazkowy', themeRiver: 'Wykres rzeki tematycznej', - sunburst: 'Wykres hierarchiczny słonecznikowy' + sunburst: 'Wykres hierarchiczny słonecznikowy', + custom: 'Wykres niestandardowy', + chart: 'Wykres' } }, aria: { diff --git a/src/i18n/langPT-br.ts b/src/i18n/langPT-br.ts index 47c098661b..6188a36953 100644 --- a/src/i18n/langPT-br.ts +++ b/src/i18n/langPT-br.ts @@ -105,7 +105,9 @@ export default { gauge: 'Gauge', pictorialBar: 'Pictorial bar', themeRiver: 'Theme River Map', - sunburst: 'Sunburst' + sunburst: 'Sunburst', + custom: 'Gráfico personalizado', + chart: 'Gráfico' } }, aria: { diff --git a/src/i18n/langRO.ts b/src/i18n/langRO.ts index 51ee51ef12..e872a4269b 100644 --- a/src/i18n/langRO.ts +++ b/src/i18n/langRO.ts @@ -104,7 +104,9 @@ gauge: 'Calibru', pictorialBar: 'Diagramă cu bare picturale', themeRiver: 'Streamgraph', - sunburst: 'Diagramă rază de soare' + sunburst: 'Diagramă rază de soare', + custom: 'Diagramă personalizată', + chart: 'Diagramă' } }, aria: { diff --git a/src/i18n/langRU.ts b/src/i18n/langRU.ts index ef24b7fefd..e778d76e16 100644 --- a/src/i18n/langRU.ts +++ b/src/i18n/langRU.ts @@ -104,7 +104,9 @@ export default { gauge: 'Шкала', pictorialBar: 'Столбец-картинка', themeRiver: 'Тематическая река', - sunburst: 'Солнечные лучи' + sunburst: 'Солнечные лучи', + custom: 'Пользовательская диаграмма', + chart: 'диаграмма' } }, aria: { diff --git a/src/i18n/langSI.ts b/src/i18n/langSI.ts index 6a1d287463..a54fd576e5 100644 --- a/src/i18n/langSI.ts +++ b/src/i18n/langSI.ts @@ -104,7 +104,9 @@ export default { gauge: 'Števec', pictorialBar: 'Stolpčni grafikon s podobo', themeRiver: 'Tematski rečni grafikon', - sunburst: 'Večnivojski tortni grafikon' + sunburst: 'Večnivojski tortni grafikon', + custom: 'Grafikon po meri', + chart: 'Grafikon' } }, aria: { diff --git a/src/i18n/langTH.ts b/src/i18n/langTH.ts index 540ea71d37..6283140af8 100644 --- a/src/i18n/langTH.ts +++ b/src/i18n/langTH.ts @@ -76,5 +76,65 @@ export default { title: 'บันทึกไปยังรูปภาพ', lang: ['คลิกขวาเพื่อบันทึกรูปภาพ'] } + }, + series: { + typeNames: { + pie: 'แผนภูมิวงกลม', + bar: 'แผนภูมิแท่ง', + line: 'แผนภูมิเส้น', + scatter: 'แผนภูมิกระจาย', + effectScatter: 'แผนภูมิกระจายคลื่น', + radar: 'แผนภูมิเรดาร์', + tree: 'ต้นไม้', + treemap: 'แผนที่ต้นไม้', + boxplot: 'แผนภูมิกล่อง', + candlestick: 'แผนภูมิเทียน', + k: 'แผนภูมิเส้น K', + heatmap: 'แผนที่ความร้อน', + map: 'แผนที่', + parallel: 'แผนที่พิกัดขนาน', + lines: 'กราฟเส้น', + graph: 'กราฟความสัมพันธ์', + sankey: 'แผนภูมิซันกีย์', + funnel: 'แผนภูมิกรวย', + gauge: 'เกจ', + pictorialBar: 'แผนภูมิแท่งภาพ', + themeRiver: 'แผนที่แม่น้ำธีม', + sunburst: 'Sunburst', + custom: 'แผนภูมิที่กำหนดเอง', + chart: 'แผนภูมิ' + } + }, + aria: { + general: { + withTitle: 'นี่คือแผนภูมิเกี่ยวกับ “{title}”', + withoutTitle: 'นี่คือแผนภูมิ' + }, + series: { + single: { + prefix: '', + withName: ' ด้วยประเภท {seriesType} ชื่อ {seriesName} ', + withoutName: ' ด้วยประเภท {seriesType} ' + }, + multiple: { + prefix: ' มีทั้งหมด {seriesCount} ชุดข้อมูล ', + withName: ' ชุดข้อมูลที่ {seriesId} เป็นประเภท {seriesType} แทน {seriesName} ', + withoutName: ' ชุดข้อมูลที่ {seriesId} เป็นประเภท {seriesType} ', + separator: { + middle: '', + end: '' + } + } + }, + data: { + allData: 'ข้อมูลดังต่อไปนี้: ', + partialData: 'ข้อมูล {displayCnt} รายการแรกคือ: ', + withName: 'ข้อมูลสำหรับ {name} คือ {value} ', + withoutName: '{value} ', + separator: { + middle: ', ', + end: '. ' + } + } } }; diff --git a/src/i18n/langTR.ts b/src/i18n/langTR.ts index f984abcd71..aa1ab103a8 100644 --- a/src/i18n/langTR.ts +++ b/src/i18n/langTR.ts @@ -104,7 +104,9 @@ export default { gauge: 'Gösterge', pictorialBar: 'Resimli Çubuk Grafiği', themeRiver: 'Akış Haritası', - sunburst: 'Güeş Patlaması Tablosu' + sunburst: 'Güeş Patlaması Tablosu', + custom: 'Özel grafik', + chart: 'Grafiği' } }, aria: { diff --git a/src/i18n/langUK.ts b/src/i18n/langUK.ts index 38b2e10498..4b48181cbd 100644 --- a/src/i18n/langUK.ts +++ b/src/i18n/langUK.ts @@ -104,7 +104,9 @@ export default { gauge: 'Шкала', pictorialBar: 'Стовпчик-картинка', themeRiver: 'Тематична ріка', - sunburst: 'Сонячне проміння' + sunburst: 'Сонячне проміння', + custom: 'Спеціальна діаграма', + chart: 'діаграма' } }, aria: { diff --git a/src/i18n/langVI.ts b/src/i18n/langVI.ts index 287e2e39c5..5d968c215d 100644 --- a/src/i18n/langVI.ts +++ b/src/i18n/langVI.ts @@ -128,7 +128,9 @@ export default { gauge: 'Biểu đồ cung tròn', pictorialBar: 'Biểu diễn hình ảnh', themeRiver: 'Bản đồ sông', - sunburst: 'Biểu đồ bậc' + sunburst: 'Biểu đồ bậc', + custom: 'Biểu đồ tùy chỉnh', + chart: 'Đồ thị' } }, aria: { diff --git a/src/i18n/langZH.ts b/src/i18n/langZH.ts index 3bd239cdec..d927fd71b3 100644 --- a/src/i18n/langZH.ts +++ b/src/i18n/langZH.ts @@ -100,7 +100,9 @@ export default { gauge: '仪表盘图', pictorialBar: '象形柱图', themeRiver: '主题河流图', - sunburst: '旭日图' + sunburst: '旭日图', + custom: '自定义图表', + chart: '图表' } }, aria: { diff --git a/src/label/labelGuideHelper.ts b/src/label/labelGuideHelper.ts index fdb70665e1..1177ceef09 100644 --- a/src/label/labelGuideHelper.ts +++ b/src/label/labelGuideHelper.ts @@ -547,7 +547,6 @@ function setLabelLineState( if (smooth > 0) { (stateObj.shape as Polyline['shape']).smooth = smooth as number; } - const styleObj = stateModel.getModel('lineStyle').getLineStyle(); isNormal ? labelLine.useStyle(styleObj) : stateObj.style = styleObj; } @@ -622,6 +621,9 @@ export function setLabelLineStyle( if (stateObj) { stateObj.ignore = true; } + if (!!labelLine) { + setLabelLineState(labelLine, true, stateName, stateModel); + } continue; } // Create labelLine if not exists diff --git a/src/visual/aria.ts b/src/visual/aria.ts index 7237c36cdd..3f420588bc 100644 --- a/src/visual/aria.ts +++ b/src/visual/aria.ts @@ -264,6 +264,7 @@ export default function ariaVisual(ecModel: GlobalModel, api: ExtensionAPI) { } function getSeriesTypeName(type: SeriesTypes) { - return ecModel.getLocaleModel().get(['series', 'typeNames'])[type] || '自定义图'; + const typeNames = ecModel.getLocaleModel().get(['series', 'typeNames']); + return typeNames[type] || typeNames.chart; } } diff --git a/test/roseType-labeline.html b/test/roseType-labeline.html new file mode 100644 index 0000000000..a763dcc0e2 --- /dev/null +++ b/test/roseType-labeline.html @@ -0,0 +1,120 @@ + + + + + + + + + + + +
+ + + diff --git a/test/runTest/actions/__meta__.json b/test/runTest/actions/__meta__.json index f0887adea0..fb743cb9c7 100644 --- a/test/runTest/actions/__meta__.json +++ b/test/runTest/actions/__meta__.json @@ -168,6 +168,7 @@ "radar3": 2, "radar4": 1, "resize-animation": 1, + "roseType-labeline": 1, "sankey-depth": 1, "sankey-emphasis-lineStyle": 1, "sankey-jump": 1, diff --git a/test/runTest/actions/roseType-labeline.json b/test/runTest/actions/roseType-labeline.json new file mode 100644 index 0000000000..a15b1ced2c --- /dev/null +++ b/test/runTest/actions/roseType-labeline.json @@ -0,0 +1 @@ +[{"name":"Action 1","ops":[{"type":"mousemove","time":170,"x":251,"y":401},{"type":"mousemove","time":371,"x":256,"y":385},{"type":"mousemove","time":571,"x":257,"y":352},{"type":"mousemove","time":771,"x":362,"y":265},{"type":"mousemove","time":971,"x":428,"y":210},{"type":"mousemove","time":1172,"x":448,"y":203},{"type":"mousemove","time":1380,"x":494,"y":194},{"type":"mousemove","time":1580,"x":541,"y":268},{"type":"mousemove","time":1782,"x":542,"y":276},{"type":"mousemove","time":1895,"x":542,"y":276},{"type":"mousemove","time":2095,"x":516,"y":339},{"type":"mousemove","time":2296,"x":515,"y":341},{"type":"mousemove","time":2504,"x":452,"y":388},{"type":"mousemove","time":2704,"x":447,"y":388},{"type":"mousemove","time":2904,"x":415,"y":384},{"type":"mousemove","time":3105,"x":391,"y":340},{"type":"mousemove","time":3307,"x":389,"y":329},{"type":"mousemove","time":3512,"x":400,"y":291},{"type":"mousemove","time":3716,"x":400,"y":282},{"type":"mousemove","time":3929,"x":428,"y":269},{"type":"mousemove","time":4129,"x":429,"y":269},{"type":"mousemove","time":4204,"x":429,"y":269},{"type":"mousemove","time":4407,"x":429,"y":270},{"type":"mousemove","time":5029,"x":429,"y":270},{"type":"mousemove","time":5229,"x":424,"y":270},{"type":"mousemove","time":5429,"x":376,"y":276},{"type":"mousemove","time":5633,"x":350,"y":298},{"type":"mousemove","time":5838,"x":386,"y":293},{"type":"mousemove","time":6041,"x":410,"y":300},{"type":"mousemove","time":6562,"x":410,"y":299},{"type":"mousemove","time":6770,"x":410,"y":299},{"type":"mousemove","time":6970,"x":409,"y":299},{"type":"mousemove","time":8195,"x":409,"y":299},{"type":"screenshot","time":8577},{"type":"mousemove","time":9020,"x":409,"y":299},{"type":"mousemove","time":9221,"x":386,"y":302},{"type":"mousemove","time":9429,"x":377,"y":310},{"type":"mousemove","time":9629,"x":383,"y":332},{"type":"mousemove","time":9831,"x":386,"y":333},{"type":"mousemove","time":10036,"x":397,"y":343},{"type":"mousemove","time":10237,"x":420,"y":351},{"type":"mousemove","time":10437,"x":459,"y":366},{"type":"mousemove","time":10637,"x":459,"y":367},{"type":"mousemove","time":10846,"x":461,"y":366},{"type":"screenshot","time":11116},{"type":"mousemove","time":11138,"x":461,"y":366},{"type":"mousemove","time":11337,"x":520,"y":332},{"type":"mousemove","time":11537,"x":528,"y":309},{"type":"mousemove","time":11739,"x":532,"y":267},{"type":"screenshot","time":12240},{"type":"mousemove","time":12271,"x":532,"y":267},{"type":"mousemove","time":12471,"x":481,"y":197},{"type":"mousemove","time":12674,"x":480,"y":195},{"type":"mousemove","time":12787,"x":480,"y":196},{"type":"screenshot","time":13084},{"type":"mousemove","time":13112,"x":480,"y":196},{"type":"mousemove","time":13313,"x":480,"y":197},{"type":"mousemove","time":13513,"x":454,"y":222},{"type":"mousemove","time":13715,"x":440,"y":240},{"type":"mousemove","time":13924,"x":436,"y":247},{"type":"mousemove","time":14128,"x":437,"y":248},{"type":"mousemove","time":14329,"x":437,"y":249}],"scrollY":0,"scrollX":0,"timestamp":1687699940477}] \ No newline at end of file diff --git a/test/sunburst-label-align.html b/test/sunburst-label-align.html index 0bb6e3a637..4522c75ba8 100644 --- a/test/sunburst-label-align.html +++ b/test/sunburst-label-align.html @@ -41,9 +41,7 @@
- - - +
@@ -1158,6 +1156,42 @@ }); }); + + + + + \ No newline at end of file diff --git a/test/sunburst-label.html b/test/sunburst-label.html index 51f2c14ef1..7895a98f84 100644 --- a/test/sunburst-label.html +++ b/test/sunburst-label.html @@ -197,7 +197,12 @@ radius: [0, '90%'], label: { rotate: 'radial' - } + }, + levels: [{}, { + label: { + rotate: 'tangential' + } + }] } }; var chart = testHelper.create(echarts, 'main1', {