From 316b392f2eb093223d7e93a65d510d973a9125ae Mon Sep 17 00:00:00 2001 From: akvlad Date: Tue, 3 Sep 2024 11:01:37 +0300 Subject: [PATCH 1/4] fix security alerts --- package-lock.json | 2902 ++++++++++++++++++--------------------------- package.json | 4 +- 2 files changed, 1133 insertions(+), 1773 deletions(-) diff --git a/package-lock.json b/package-lock.json index 75bd57f4..7fe30994 100644 --- a/package-lock.json +++ b/package-lock.json @@ -56,7 +56,7 @@ "snappyjs": "^0.6.1", "stream-chain": "^2.2.4", "stream-json": "^1.7.3", - "ws": "^8.0.0", + "ws": "^8.17.1", "xxhash-wasm": "^0.4.2", "yaml": "^1.10.2" }, @@ -82,7 +82,7 @@ "eslint-plugin-jest": "^25.3.0", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^5.2.0", - "jest": "^27.4.5", + "jest": "^29.7.0", "node-abort-controller": "^3.1.1", "node-fetch": "^2.6.7", "pino-pretty": "^7.5.1", @@ -91,6 +91,19 @@ "standard": "^16.0.4" } }, + "node_modules/@ampproject/remapping": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", + "dev": true, + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/@apla/clickhouse": { "version": "1.6.4", "resolved": "https://registry.npmjs.org/@apla/clickhouse/-/clickhouse-1.6.4.tgz", @@ -109,35 +122,35 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.16.4", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz", - "integrity": "sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==", + "version": "7.25.4", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz", + "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.16.5", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.5.tgz", - "integrity": "sha512-wUcenlLzuWMZ9Zt8S0KmFwGlH6QKRh3vsm/dhDA3CHkiTA45YuG1XkHRcNRl73EFPXDp/d5kVOU0/y7x2w6OaQ==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.16.0", - "@babel/generator": "^7.16.5", - "@babel/helper-compilation-targets": "^7.16.3", - "@babel/helper-module-transforms": "^7.16.5", - "@babel/helpers": "^7.16.5", - "@babel/parser": "^7.16.5", - "@babel/template": "^7.16.0", - "@babel/traverse": "^7.16.5", - "@babel/types": "^7.16.0", - "convert-source-map": "^1.7.0", + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz", + "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==", + "dev": true, + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.24.7", + "@babel/generator": "^7.25.0", + "@babel/helper-compilation-targets": "^7.25.2", + "@babel/helper-module-transforms": "^7.25.2", + "@babel/helpers": "^7.25.0", + "@babel/parser": "^7.25.0", + "@babel/template": "^7.25.0", + "@babel/traverse": "^7.25.2", + "@babel/types": "^7.25.2", + "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", - "json5": "^2.1.2", - "semver": "^6.3.0", - "source-map": "^0.5.0" + "json5": "^2.2.3", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -148,12 +161,13 @@ } }, "node_modules/@babel/core/node_modules/@babel/code-frame": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz", - "integrity": "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", + "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", "dev": true, "dependencies": { - "@babel/highlight": "^7.16.0" + "@babel/highlight": "^7.24.7", + "picocolors": "^1.0.0" }, "engines": { "node": ">=6.9.0" @@ -168,24 +182,15 @@ "semver": "bin/semver.js" } }, - "node_modules/@babel/core/node_modules/source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/@babel/generator": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", - "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz", + "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==", "dev": true, "dependencies": { - "@babel/types": "^7.23.0", - "@jridgewell/gen-mapping": "^0.3.2", - "@jridgewell/trace-mapping": "^0.3.17", + "@babel/types": "^7.25.6", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^2.5.1" }, "engines": { @@ -193,21 +198,28 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.16.3", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz", - "integrity": "sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA==", + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz", + "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.16.0", - "@babel/helper-validator-option": "^7.14.5", - "browserslist": "^4.17.5", - "semver": "^6.3.0" + "@babel/compat-data": "^7.25.2", + "@babel/helper-validator-option": "^7.24.8", + "browserslist": "^4.23.1", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "dependencies": { + "yallist": "^3.0.2" } }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { @@ -219,154 +231,115 @@ "semver": "bin/semver.js" } }, - "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.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/template": "^7.22.15", - "@babel/types": "^7.23.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-compilation-targets/node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true }, "node_modules/@babel/helper-module-imports": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz", - "integrity": "sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", + "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", "dev": true, "dependencies": { - "@babel/types": "^7.16.0" + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.16.5", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.5.tgz", - "integrity": "sha512-CkvMxgV4ZyyioElFwcuWnDCcNIeyqTkCm9BxXZi73RR1ozqlpboqsbGUNvRTflgZtFbbJ1v5Emvm+lkjMYY/LQ==", + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz", + "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==", "dev": true, "dependencies": { - "@babel/helper-environment-visitor": "^7.16.5", - "@babel/helper-module-imports": "^7.16.0", - "@babel/helper-simple-access": "^7.16.0", - "@babel/helper-split-export-declaration": "^7.16.0", - "@babel/helper-validator-identifier": "^7.15.7", - "@babel/template": "^7.16.0", - "@babel/traverse": "^7.16.5", - "@babel/types": "^7.16.0" + "@babel/helper-module-imports": "^7.24.7", + "@babel/helper-simple-access": "^7.24.7", + "@babel/helper-validator-identifier": "^7.24.7", + "@babel/traverse": "^7.25.2" }, "engines": { "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.16.5", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.5.tgz", - "integrity": "sha512-59KHWHXxVA9K4HNF4sbHCf+eJeFe0Te/ZFGqBT4OjXhrwvA04sGfaEGsVTdsjoszq0YTP49RC9UKe5g8uN2RwQ==", + "version": "7.24.8", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz", + "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-simple-access": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz", - "integrity": "sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw==", - "dev": true, - "dependencies": { - "@babel/types": "^7.16.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-split-export-declaration": { - "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==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", + "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", "dev": true, "dependencies": { - "@babel/types": "^7.22.5" + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" }, "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==", + "version": "7.24.8", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz", + "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "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==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", + "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz", - "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==", + "version": "7.24.8", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz", + "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.16.5", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.5.tgz", - "integrity": "sha512-TLgi6Lh71vvMZGEkFuIxzaPsyeYCHQ5jJOOX1f0xXn0uciFuE8cEk0wyBquMcCxBXZ5BJhE2aUB7pnWTD150Tw==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz", + "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==", "dev": true, "dependencies": { - "@babel/template": "^7.16.0", - "@babel/traverse": "^7.16.5", - "@babel/types": "^7.16.0" + "@babel/template": "^7.25.0", + "@babel/types": "^7.25.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", - "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", + "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.22.20", + "@babel/helper-validator-identifier": "^7.24.7", "chalk": "^2.4.2", - "js-tokens": "^4.0.0" + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" }, "engines": { "node": ">=6.9.0" @@ -444,10 +417,13 @@ } }, "node_modules/@babel/parser": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", - "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz", + "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==", "dev": true, + "dependencies": { + "@babel/types": "^7.25.6" + }, "bin": { "parser": "bin/babel-parser.js" }, @@ -491,6 +467,36 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/plugin-syntax-class-static-block": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", + "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-import-attributes": { + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.6.tgz", + "integrity": "sha512-sXaDXaJN9SNLymBdlWFA+bjzBhFD617ZaFiY13dGt7TVslVvVgA6fkZOP7Ki3IGElC45lwHdOTrCtKZGVAWeLQ==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.24.8" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, "node_modules/@babel/plugin-syntax-import-meta": { "version": "7.10.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", @@ -515,6 +521,21 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/plugin-syntax-jsx": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz", + "integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, "node_modules/@babel/plugin-syntax-logical-assignment-operators": { "version": "7.10.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", @@ -587,10 +608,10 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-syntax-top-level-await": { + "node_modules/@babel/plugin-syntax-private-property-in-object": { "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", - "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", + "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" @@ -602,13 +623,13 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-syntax-typescript": { - "version": "7.16.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.5.tgz", - "integrity": "sha512-/d4//lZ1Vqb4mZ5xTep3dDK888j7BGM/iKqBmndBaoYAFPlPKrGU608VVBz5JeyAb6YQDjRu1UKqj86UhwWVgw==", + "node_modules/@babel/plugin-syntax-top-level-await": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", + "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.16.5" + "@babel/helper-plugin-utils": "^7.14.5" }, "engines": { "node": ">=6.9.0" @@ -617,119 +638,60 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/template": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", - "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "node_modules/@babel/plugin-syntax-typescript": { + "version": "7.25.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.4.tgz", + "integrity": "sha512-uMOCoHVU52BsSWxPOMVv5qKRdeSlPuImUCB2dlPuBSU+W2/ROE7/Zg8F2Kepbk+8yBa68LlRKxO+xgEVWorsDg==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.22.13", - "@babel/parser": "^7.22.15", - "@babel/types": "^7.22.15" + "@babel/helper-plugin-utils": "^7.24.8" }, "engines": { "node": ">=6.9.0" - } - }, - "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/highlight": "^7.22.13", - "chalk": "^2.4.2" }, - "engines": { - "node": ">=6.9.0" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/template/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "node_modules/@babel/template": { + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz", + "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==", "dev": true, "dependencies": { - "color-convert": "^1.9.0" + "@babel/code-frame": "^7.24.7", + "@babel/parser": "^7.25.0", + "@babel/types": "^7.25.0" }, "engines": { - "node": ">=4" + "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==", + "node_modules/@babel/template/node_modules/@babel/code-frame": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", + "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", "dev": true, "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "@babel/highlight": "^7.24.7", + "picocolors": "^1.0.0" }, "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/template/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/template/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "node_modules/@babel/template/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/@babel/template/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "engines": { - "node": ">=4" + "node": ">=6.9.0" } }, - "node_modules/@babel/template/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "node_modules/@babel/traverse": { + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz", + "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==", "dev": true, "dependencies": { - "has-flag": "^3.0.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", + "@babel/code-frame": "^7.24.7", + "@babel/generator": "^7.25.6", + "@babel/parser": "^7.25.6", + "@babel/template": "^7.25.0", + "@babel/types": "^7.25.6", + "debug": "^4.3.1", "globals": "^11.1.0" }, "engines": { @@ -737,68 +699,18 @@ } }, "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==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", + "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", "dev": true, "dependencies": { - "@babel/highlight": "^7.22.13", - "chalk": "^2.4.2" + "@babel/highlight": "^7.24.7", + "picocolors": "^1.0.0" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/traverse/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "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/traverse/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/traverse/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "node_modules/@babel/traverse/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, "node_modules/@babel/traverse/node_modules/globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", @@ -808,35 +720,14 @@ "node": ">=4" } }, - "node_modules/@babel/traverse/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/traverse/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, "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==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz", + "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==", "dev": true, "dependencies": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.20", + "@babel/helper-string-parser": "^7.24.8", + "@babel/helper-validator-identifier": "^7.24.7", "to-fast-properties": "^2.0.0" }, "engines": { @@ -1146,49 +1037,11 @@ "node": ">=6" } }, - "node_modules/@grpc/proto-loader/node_modules/cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, "node_modules/@grpc/proto-loader/node_modules/long": { "version": "5.2.3", "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz", "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==" }, - "node_modules/@grpc/proto-loader/node_modules/yargs": { - "version": "17.7.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", - "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "dependencies": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@grpc/proto-loader/node_modules/yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "engines": { - "node": ">=12" - } - }, "node_modules/@humanwhocodes/config-array": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", @@ -1311,59 +1164,59 @@ } }, "node_modules/@jest/console": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.4.2.tgz", - "integrity": "sha512-xknHThRsPB/To1FUbi6pCe43y58qFC03zfb6R7fDb/FfC7k2R3i1l+izRBJf8DI46KhYGRaF14Eo9A3qbBoixg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz", + "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==", "dev": true, "dependencies": { - "@jest/types": "^27.4.2", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", - "jest-message-util": "^27.4.2", - "jest-util": "^27.4.2", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", "slash": "^3.0.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/core": { - "version": "27.4.5", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.4.5.tgz", - "integrity": "sha512-3tm/Pevmi8bDsgvo73nX8p/WPng6KWlCyScW10FPEoN1HU4pwI83tJ3TsFvi1FfzsjwUlMNEPowgb/rPau/LTQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz", + "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==", "dev": true, "dependencies": { - "@jest/console": "^27.4.2", - "@jest/reporters": "^27.4.5", - "@jest/test-result": "^27.4.2", - "@jest/transform": "^27.4.5", - "@jest/types": "^27.4.2", + "@jest/console": "^29.7.0", + "@jest/reporters": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "ansi-escapes": "^4.2.1", "chalk": "^4.0.0", - "emittery": "^0.8.1", + "ci-info": "^3.2.0", "exit": "^0.1.2", - "graceful-fs": "^4.2.4", - "jest-changed-files": "^27.4.2", - "jest-config": "^27.4.5", - "jest-haste-map": "^27.4.5", - "jest-message-util": "^27.4.2", - "jest-regex-util": "^27.4.0", - "jest-resolve": "^27.4.5", - "jest-resolve-dependencies": "^27.4.5", - "jest-runner": "^27.4.5", - "jest-runtime": "^27.4.5", - "jest-snapshot": "^27.4.5", - "jest-util": "^27.4.2", - "jest-validate": "^27.4.2", - "jest-watcher": "^27.4.2", + "graceful-fs": "^4.2.9", + "jest-changed-files": "^29.7.0", + "jest-config": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-resolve-dependencies": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "jest-watcher": "^29.7.0", "micromatch": "^4.0.4", - "rimraf": "^3.0.0", + "pretty-format": "^29.7.0", "slash": "^3.0.0", "strip-ansi": "^6.0.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -1375,21 +1228,21 @@ } }, "node_modules/@jest/core/node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" } }, "node_modules/@jest/core/node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -1408,13 +1261,13 @@ } }, "node_modules/@jest/core/node_modules/micromatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", - "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "dependencies": { - "braces": "^3.0.1", - "picomatch": "^2.2.3" + "braces": "^3.0.3", + "picomatch": "^2.3.1" }, "engines": { "node": ">=8.6" @@ -1433,85 +1286,110 @@ } }, "node_modules/@jest/environment": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.4.4.tgz", - "integrity": "sha512-q+niMx7cJgt/t/b6dzLOh4W8Ef/8VyKG7hxASK39jakijJzbFBGpptx3RXz13FFV7OishQ9lTbv+dQ5K3EhfDQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", + "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==", "dev": true, "dependencies": { - "@jest/fake-timers": "^27.4.2", - "@jest/types": "^27.4.2", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", - "jest-mock": "^27.4.2" + "jest-mock": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/expect": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==", + "dev": true, + "dependencies": { + "expect": "^29.7.0", + "jest-snapshot": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/expect-utils": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", + "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", + "dev": true, + "dependencies": { + "jest-get-type": "^29.6.3" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/fake-timers": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.4.2.tgz", - "integrity": "sha512-f/Xpzn5YQk5adtqBgvw1V6bF8Nx3hY0OIRRpCvWcfPl0EAjdqWPdhH3t/3XpiWZqtjIEHDyMKP9ajpva1l4Zmg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz", + "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==", "dev": true, "dependencies": { - "@jest/types": "^27.4.2", - "@sinonjs/fake-timers": "^8.0.1", + "@jest/types": "^29.6.3", + "@sinonjs/fake-timers": "^10.0.2", "@types/node": "*", - "jest-message-util": "^27.4.2", - "jest-mock": "^27.4.2", - "jest-util": "^27.4.2" + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/globals": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.4.4.tgz", - "integrity": "sha512-bqpqQhW30BOreXM8bA8t8JbOQzsq/WnPTnBl+It3UxAD9J8yxEAaBEylHx1dtBapAr/UBk8GidXbzmqnee8tYQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz", + "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==", "dev": true, "dependencies": { - "@jest/environment": "^27.4.4", - "@jest/types": "^27.4.2", - "expect": "^27.4.2" + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/types": "^29.6.3", + "jest-mock": "^29.7.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/reporters": { - "version": "27.4.5", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.4.5.tgz", - "integrity": "sha512-3orsG4vi8zXuBqEoy2LbnC1kuvkg1KQUgqNxmxpQgIOQEPeV0onvZu+qDQnEoX8qTQErtqn/xzcnbpeTuOLSiA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz", + "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==", "dev": true, "dependencies": { "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^27.4.2", - "@jest/test-result": "^27.4.2", - "@jest/transform": "^27.4.5", - "@jest/types": "^27.4.2", + "@jest/console": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", "@types/node": "*", "chalk": "^4.0.0", "collect-v8-coverage": "^1.0.0", "exit": "^0.1.2", - "glob": "^7.1.2", - "graceful-fs": "^4.2.4", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-instrument": "^4.0.3", + "istanbul-lib-instrument": "^6.0.0", "istanbul-lib-report": "^3.0.0", "istanbul-lib-source-maps": "^4.0.0", - "istanbul-reports": "^3.0.2", - "jest-haste-map": "^27.4.5", - "jest-resolve": "^27.4.5", - "jest-util": "^27.4.2", - "jest-worker": "^27.4.5", + "istanbul-reports": "^3.1.3", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", "slash": "^3.0.0", - "source-map": "^0.6.0", "string-length": "^4.0.1", - "terminal-link": "^2.0.0", - "v8-to-istanbul": "^8.1.0" + "strip-ansi": "^6.0.0", + "v8-to-istanbul": "^9.0.1" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -1522,92 +1400,104 @@ } } }, + "node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, "node_modules/@jest/source-map": { - "version": "27.4.0", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.4.0.tgz", - "integrity": "sha512-Ntjx9jzP26Bvhbm93z/AKcPRj/9wrkI88/gK60glXDx1q+IeI0rf7Lw2c89Ch6ofonB0On/iRDreQuQ6te9pgQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz", + "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==", "dev": true, "dependencies": { + "@jridgewell/trace-mapping": "^0.3.18", "callsites": "^3.0.0", - "graceful-fs": "^4.2.4", - "source-map": "^0.6.0" + "graceful-fs": "^4.2.9" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/test-result": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.4.2.tgz", - "integrity": "sha512-kr+bCrra9jfTgxHXHa2UwoQjxvQk3Am6QbpAiJ5x/50LW8llOYrxILkqY0lZRW/hu8FXesnudbql263+EW9iNA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz", + "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==", "dev": true, "dependencies": { - "@jest/console": "^27.4.2", - "@jest/types": "^27.4.2", + "@jest/console": "^29.7.0", + "@jest/types": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "collect-v8-coverage": "^1.0.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/test-sequencer": { - "version": "27.4.5", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.4.5.tgz", - "integrity": "sha512-n5woIn/1v+FT+9hniymHPARA9upYUmfi5Pw9ewVwXCDlK4F5/Gkees9v8vdjGdAIJ2MPHLHodiajLpZZanWzEQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz", + "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==", "dev": true, "dependencies": { - "@jest/test-result": "^27.4.2", - "graceful-fs": "^4.2.4", - "jest-haste-map": "^27.4.5", - "jest-runtime": "^27.4.5" + "@jest/test-result": "^29.7.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "slash": "^3.0.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/transform": { - "version": "27.4.5", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.4.5.tgz", - "integrity": "sha512-PuMet2UlZtlGzwc6L+aZmR3I7CEBpqadO03pU40l2RNY2fFJ191b9/ITB44LNOhVtsyykx0OZvj0PCyuLm7Eew==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", + "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", "dev": true, "dependencies": { - "@babel/core": "^7.1.0", - "@jest/types": "^27.4.2", - "babel-plugin-istanbul": "^6.0.0", + "@babel/core": "^7.11.6", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", + "babel-plugin-istanbul": "^6.1.1", "chalk": "^4.0.0", - "convert-source-map": "^1.4.0", - "fast-json-stable-stringify": "^2.0.0", - "graceful-fs": "^4.2.4", - "jest-haste-map": "^27.4.5", - "jest-regex-util": "^27.4.0", - "jest-util": "^27.4.2", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", "micromatch": "^4.0.4", - "pirates": "^4.0.1", + "pirates": "^4.0.4", "slash": "^3.0.0", - "source-map": "^0.6.1", - "write-file-atomic": "^3.0.0" + "write-file-atomic": "^4.0.2" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/transform/node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" } }, "node_modules/@jest/transform/node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -1626,13 +1516,13 @@ } }, "node_modules/@jest/transform/node_modules/micromatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", - "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "dependencies": { - "braces": "^3.0.1", - "picomatch": "^2.2.3" + "braces": "^3.0.3", + "picomatch": "^2.3.1" }, "engines": { "node": ">=8.6" @@ -1651,63 +1541,64 @@ } }, "node_modules/@jest/types": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz", - "integrity": "sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", - "@types/yargs": "^16.0.0", + "@types/yargs": "^17.0.8", "chalk": "^4.0.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", - "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", "dev": true, "dependencies": { - "@jridgewell/set-array": "^1.0.1", + "@jridgewell/set-array": "^1.2.1", "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" + "@jridgewell/trace-mapping": "^0.3.24" }, "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", - "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", "dev": true, "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", "dev": true, "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "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==", + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", "dev": true, "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", @@ -2522,22 +2413,28 @@ "node": ">=0.10.0" } }, + "node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true + }, "node_modules/@sinonjs/commons": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz", - "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", + "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", "dev": true, "dependencies": { "type-detect": "4.0.8" } }, "node_modules/@sinonjs/fake-timers": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz", - "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", + "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", "dev": true, "dependencies": { - "@sinonjs/commons": "^1.7.0" + "@sinonjs/commons": "^3.0.0" } }, "node_modules/@stricjs/router": { @@ -2550,41 +2447,32 @@ "resolved": "https://registry.npmjs.org/@stricjs/utils/-/utils-1.6.1.tgz", "integrity": "sha512-dslPWhGMNLN+gYW/TkpCiTCgmFQGRhVdZV122sFL0oxS2WuqGDQL51bEZOj/RmONamjIdlSWzNQecexix44NOA==" }, - "node_modules/@tootallnate/once": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", - "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, "node_modules/@types/babel__core": { - "version": "7.1.17", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.17.tgz", - "integrity": "sha512-6zzkezS9QEIL8yCBvXWxPTJPNuMeECJVxSOhxNY/jfq9LxOTHivaYTqr37n9LknWWRTIkzqH2UilS5QFvfa90A==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", + "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", "dev": true, "dependencies": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0", + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", "@types/babel__generator": "*", "@types/babel__template": "*", "@types/babel__traverse": "*" } }, "node_modules/@types/babel__generator": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.3.tgz", - "integrity": "sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA==", + "version": "7.6.8", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", + "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", "dev": true, "dependencies": { "@babel/types": "^7.0.0" } }, "node_modules/@types/babel__template": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz", - "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", + "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", "dev": true, "dependencies": { "@babel/parser": "^7.1.0", @@ -2592,12 +2480,12 @@ } }, "node_modules/@types/babel__traverse": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz", - "integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==", + "version": "7.20.6", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz", + "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==", "dev": true, "dependencies": { - "@babel/types": "^7.3.0" + "@babel/types": "^7.20.7" } }, "node_modules/@types/connect": { @@ -2610,33 +2498,33 @@ } }, "node_modules/@types/graceful-fs": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz", - "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==", + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz", + "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/istanbul-lib-coverage": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz", - "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", + "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", "dev": true }, "node_modules/@types/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", + "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", "dev": true, "dependencies": { "@types/istanbul-lib-coverage": "*" } }, "node_modules/@types/istanbul-reports": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", - "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", + "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", "dev": true, "dependencies": { "@types/istanbul-lib-report": "*" @@ -2665,31 +2553,25 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.12.tgz", "integrity": "sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw==" }, - "node_modules/@types/prettier": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.2.tgz", - "integrity": "sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA==", - "dev": true - }, "node_modules/@types/stack-utils": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", - "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", + "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", "dev": true }, "node_modules/@types/yargs": { - "version": "16.0.4", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz", - "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==", + "version": "17.0.33", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", + "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, "node_modules/@types/yargs-parser": { - "version": "20.2.1", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz", - "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==", + "version": "21.0.3", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", + "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", "dev": true }, "node_modules/@typescript-eslint/scope-manager": { @@ -2780,12 +2662,6 @@ "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==" }, - "node_modules/abab": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", - "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==", - "dev": true - }, "node_modules/abort-controller": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", @@ -2814,16 +2690,6 @@ "node": ">=0.4.0" } }, - "node_modules/acorn-globals": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", - "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", - "dev": true, - "dependencies": { - "acorn": "^7.1.1", - "acorn-walk": "^7.1.1" - } - }, "node_modules/acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", @@ -2833,27 +2699,6 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, - "node_modules/acorn-walk": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", - "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, "node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -3598,22 +3443,21 @@ } }, "node_modules/babel-jest": { - "version": "27.4.5", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.4.5.tgz", - "integrity": "sha512-3uuUTjXbgtODmSv/DXO9nZfD52IyC2OYTFaXGRzL0kpykzroaquCrD5+lZNafTvZlnNqZHt5pb0M08qVBZnsnA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", + "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", "dev": true, "dependencies": { - "@jest/transform": "^27.4.5", - "@jest/types": "^27.4.2", + "@jest/transform": "^29.7.0", "@types/babel__core": "^7.1.14", - "babel-plugin-istanbul": "^6.0.0", - "babel-preset-jest": "^27.4.0", + "babel-plugin-istanbul": "^6.1.1", + "babel-preset-jest": "^29.6.3", "chalk": "^4.0.0", - "graceful-fs": "^4.2.4", + "graceful-fs": "^4.2.9", "slash": "^3.0.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "@babel/core": "^7.8.0" @@ -3636,9 +3480,9 @@ } }, "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz", - "integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", + "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", "dev": true, "dependencies": { "@babel/core": "^7.12.3", @@ -3661,54 +3505,57 @@ } }, "node_modules/babel-plugin-jest-hoist": { - "version": "27.4.0", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.4.0.tgz", - "integrity": "sha512-Jcu7qS4OX5kTWBc45Hz7BMmgXuJqRnhatqpUhnzGC3OBYpOmf2tv6jFNwZpwM7wU7MUuv2r9IPS/ZlYOuburVw==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", + "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==", "dev": true, "dependencies": { "@babel/template": "^7.3.3", "@babel/types": "^7.3.3", - "@types/babel__core": "^7.0.0", + "@types/babel__core": "^7.1.14", "@types/babel__traverse": "^7.0.6" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/babel-preset-current-node-syntax": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", - "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz", + "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==", "dev": true, "dependencies": { "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-bigint": "^7.8.3", - "@babel/plugin-syntax-class-properties": "^7.8.3", - "@babel/plugin-syntax-import-meta": "^7.8.3", + "@babel/plugin-syntax-class-properties": "^7.12.13", + "@babel/plugin-syntax-class-static-block": "^7.14.5", + "@babel/plugin-syntax-import-attributes": "^7.24.7", + "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.10.4", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-top-level-await": "^7.8.3" + "@babel/plugin-syntax-private-property-in-object": "^7.14.5", + "@babel/plugin-syntax-top-level-await": "^7.14.5" }, "peerDependencies": { "@babel/core": "^7.0.0" } }, "node_modules/babel-preset-jest": { - "version": "27.4.0", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.4.0.tgz", - "integrity": "sha512-NK4jGYpnBvNxcGo7/ZpZJr51jCGT+3bwwpVIDY2oNfTxJJldRtB4VAcYdgp1loDE50ODuTu+yBjpMAswv5tlpg==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz", + "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==", "dev": true, "dependencies": { - "babel-plugin-jest-hoist": "^27.4.0", + "babel-plugin-jest-hoist": "^29.6.3", "babel-preset-current-node-syntax": "^1.0.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "@babel/core": "^7.0.0" @@ -3826,33 +3673,36 @@ "node": ">=0.10.0" } }, - "node_modules/browser-process-hrtime": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", - "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", - "dev": true - }, "node_modules/browserslist": { - "version": "4.19.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz", - "integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==", + "version": "4.23.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz", + "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==", "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "dependencies": { - "caniuse-lite": "^1.0.30001286", - "electron-to-chromium": "^1.4.17", - "escalade": "^3.1.1", - "node-releases": "^2.0.1", - "picocolors": "^1.0.0" + "caniuse-lite": "^1.0.30001646", + "electron-to-chromium": "^1.5.4", + "node-releases": "^2.0.18", + "update-browserslist-db": "^1.1.0" }, "bin": { "browserslist": "cli.js" }, "engines": { "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" } }, "node_modules/bser": { @@ -3942,9 +3792,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001379", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001379.tgz", - "integrity": "sha512-zXf+qxuN8OJrK5Bl5HbJg8cc5/Zm01WNW4ooVWUh92YlKqQZW3fwN5lXLB+kI8wkP5vTWkIIN+rutZuJhf4ykw==", + "version": "1.0.30001655", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz", + "integrity": "sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==", "dev": true, "funding": [ { @@ -3954,6 +3804,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ] }, @@ -4062,15 +3916,24 @@ } }, "node_modules/ci-info": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz", - "integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==", - "dev": true + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "engines": { + "node": ">=8" + } }, "node_modules/cjs-module-lexer": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz", - "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.0.tgz", + "integrity": "sha512-N1NGmowPlGBLsOZLPvm48StN04V4YvQRL0i6b7ctrVY3epjP/ct7hFLOItz6pDIvRjwpfPxi52a2UWV2ziir8g==", "dev": true }, "node_modules/class-utils": { @@ -4164,14 +4027,16 @@ } }, "node_modules/cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dev": true, + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", "dependencies": { "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", + "strip-ansi": "^6.0.1", "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" } }, "node_modules/clone": { @@ -4190,7 +4055,7 @@ "node_modules/co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", + "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", "dev": true, "engines": { "iojs": ">= 1.0.0", @@ -4198,9 +4063,9 @@ } }, "node_modules/collect-v8-coverage": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", - "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", + "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", "dev": true }, "node_modules/collection-visit": { @@ -4278,13 +4143,10 @@ } }, "node_modules/convert-source-map": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", - "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", - "dev": true, - "dependencies": { - "safe-buffer": "~5.1.1" - } + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true }, "node_modules/cookie": { "version": "0.5.0", @@ -4397,6 +4259,27 @@ "node": ">=0.10.0" } }, + "node_modules/create-jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", + "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "prompts": "^2.0.1" + }, + "bin": { + "create-jest": "bin/create-jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -4419,49 +4302,11 @@ "node": "*" } }, - "node_modules/cssom": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", - "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", - "dev": true - }, - "node_modules/cssstyle": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", - "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", - "dev": true, - "dependencies": { - "cssom": "~0.3.6" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/cssstyle/node_modules/cssom": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", - "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", - "dev": true - }, "node_modules/csv-writer": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/csv-writer/-/csv-writer-1.6.0.tgz", "integrity": "sha512-NOx7YDFWEsM/fTRAJjRpPp8t+MKRVvniAg9wQlUKx20MFrPs73WLJhFf5iteqrxNYnsy924K3Iroh3yNHeYd2g==" }, - "node_modules/data-urls": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", - "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", - "dev": true, - "dependencies": { - "abab": "^2.0.3", - "whatwg-mimetype": "^2.3.0", - "whatwg-url": "^8.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/date-fns": { "version": "2.27.0", "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.27.0.tgz", @@ -4528,12 +4373,6 @@ "node": ">=0.10.0" } }, - "node_modules/decimal.js": { - "version": "10.3.1", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz", - "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==", - "dev": true - }, "node_modules/decode-uri-component": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", @@ -4543,10 +4382,18 @@ } }, "node_modules/dedent": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", - "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=", - "dev": true + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz", + "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==", + "dev": true, + "peerDependencies": { + "babel-plugin-macros": "^3.1.0" + }, + "peerDependenciesMeta": { + "babel-plugin-macros": { + "optional": true + } + } }, "node_modules/deep-is": { "version": "0.1.4", @@ -4555,9 +4402,9 @@ "dev": true }, "node_modules/deepmerge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", - "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", "dev": true, "engines": { "node": ">=0.10.0" @@ -4631,12 +4478,12 @@ } }, "node_modules/diff-sequences": { - "version": "27.4.0", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.4.0.tgz", - "integrity": "sha512-YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", + "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", "dev": true, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/dir-glob": { @@ -4663,27 +4510,6 @@ "node": ">=6.0.0" } }, - "node_modules/domexception": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", - "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", - "dev": true, - "dependencies": { - "webidl-conversions": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/domexception/node_modules/webidl-conversions": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", - "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/duplexify": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz", @@ -4701,18 +4527,18 @@ "integrity": "sha1-Xxu08GKa9lnDJgMgTUMw1SwM47k=" }, "node_modules/electron-to-chromium": { - "version": "1.4.26", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.26.tgz", - "integrity": "sha512-cA1YwlRzO6TGp7yd3+KAqh9Tt6Z4CuuKqsAJP6uF/H5MQryjAGDhMhnY5cEXo8MaRCczpzSBhMPdqRIodkbZYw==", + "version": "1.5.13", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz", + "integrity": "sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q==", "dev": true }, "node_modules/emittery": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz", - "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==", + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", + "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", "dev": true, "engines": { - "node": ">=10" + "node": ">=12" }, "funding": { "url": "https://github.com/sindresorhus/emittery?sponsor=1" @@ -4817,110 +4643,28 @@ } }, "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "engines": { - "node": ">=6" - } - }, - "node_modules/escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" - }, - "node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/escodegen": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz", - "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==", - "dev": true, - "dependencies": { - "esprima": "^4.0.1", - "estraverse": "^5.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1" - }, - "bin": { - "escodegen": "bin/escodegen.js", - "esgenerate": "bin/esgenerate.js" - }, - "engines": { - "node": ">=6.0" - }, - "optionalDependencies": { - "source-map": "~0.6.1" - } - }, - "node_modules/escodegen/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/escodegen/node_modules/levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, - "dependencies": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/escodegen/node_modules/optionator": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", - "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", - "dev": true, - "dependencies": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.6", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "word-wrap": "~1.2.3" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/escodegen/node_modules/prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", - "dev": true, + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "engines": { - "node": ">= 0.8.0" + "node": ">=6" } }, - "node_modules/escodegen/node_modules/type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "node_modules/escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true, - "dependencies": { - "prelude-ls": "~1.1.2" - }, "engines": { - "node": ">= 0.8.0" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/eslint": { @@ -5420,7 +5164,7 @@ "node_modules/exit": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", + "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", "dev": true, "engines": { "node": ">= 0.8.0" @@ -5544,32 +5288,19 @@ } }, "node_modules/expect": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/expect/-/expect-27.4.2.tgz", - "integrity": "sha512-BjAXIDC6ZOW+WBFNg96J22D27Nq5ohn+oGcuP2rtOtcjuxNoV9McpQ60PcQWhdFOSBIQdR72e+4HdnbZTFSTyg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", "dev": true, "dependencies": { - "@jest/types": "^27.4.2", - "ansi-styles": "^5.0.0", - "jest-get-type": "^27.4.0", - "jest-matcher-utils": "^27.4.2", - "jest-message-util": "^27.4.2", - "jest-regex-util": "^27.4.0" + "@jest/expect-utils": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } - }, - "node_modules/expect/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/extend-shallow": { @@ -5918,9 +5649,9 @@ } }, "node_modules/fb-watchman": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz", - "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", + "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", "dev": true, "dependencies": { "bser": "2.1.1" @@ -6378,20 +6109,6 @@ "node": ">=0.10.0" } }, - "node_modules/form-data": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", - "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", - "dev": true, - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -6468,6 +6185,19 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -6759,9 +6489,9 @@ "integrity": "sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA==" }, "node_modules/graceful-fs": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz", - "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==" + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" }, "node_modules/gulp-header": { "version": "1.8.12", @@ -7080,18 +6810,6 @@ "node": ">=14" } }, - "node_modules/html-encoding-sniffer": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", - "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", - "dev": true, - "dependencies": { - "whatwg-encoding": "^1.0.5" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/html-escaper": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", @@ -7125,33 +6843,6 @@ "node": ">= 0.8" } }, - "node_modules/http-proxy-agent": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", - "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", - "dev": true, - "dependencies": { - "@tootallnate/once": "1", - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/https-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", - "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", - "dev": true, - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/human-signals": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", @@ -7161,18 +6852,6 @@ "node": ">=10.17.0" } }, - "node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", @@ -7218,9 +6897,9 @@ } }, "node_modules/import-local": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz", - "integrity": "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", + "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==", "dev": true, "dependencies": { "pkg-dir": "^4.2.0", @@ -7231,6 +6910,9 @@ }, "engines": { "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/import-local/node_modules/find-up": { @@ -7679,12 +7361,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-potential-custom-element-name": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", - "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", - "dev": true - }, "node_modules/is-property": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", @@ -7768,12 +7444,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true - }, "node_modules/is-unc-path": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz", @@ -7848,50 +7518,42 @@ } }, "node_modules/istanbul-lib-coverage": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz", - "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", + "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", "dev": true, "engines": { "node": ">=8" } }, "node_modules/istanbul-lib-instrument": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", - "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", + "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", "dev": true, "dependencies": { - "@babel/core": "^7.7.5", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.0.0", - "semver": "^6.3.0" + "@babel/core": "^7.23.9", + "@babel/parser": "^7.23.9", + "@istanbuljs/schema": "^0.1.3", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^7.5.4" }, "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" + "node": ">=10" } }, "node_modules/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", "dev": true, "dependencies": { "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^3.0.0", + "make-dir": "^4.0.0", "supports-color": "^7.1.0" }, "engines": { - "node": ">=8" + "node": ">=10" } }, "node_modules/istanbul-lib-source-maps": { @@ -7909,9 +7571,9 @@ } }, "node_modules/istanbul-reports": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.1.tgz", - "integrity": "sha512-q1kvhAXWSsXfMjCdNHNPKZZv94OlspKnoGv+R9RGbnqOOQ0VbNfLFgQDVgi7hHenKsndGq3/o0OBdzDXthWcNw==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", + "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", "dev": true, "dependencies": { "html-escaper": "^2.0.0", @@ -7922,20 +7584,21 @@ } }, "node_modules/jest": { - "version": "27.4.5", - "resolved": "https://registry.npmjs.org/jest/-/jest-27.4.5.tgz", - "integrity": "sha512-uT5MiVN3Jppt314kidCk47MYIRilJjA/l2mxwiuzzxGUeJIvA8/pDaJOAX5KWvjAo7SCydcW0/4WEtgbLMiJkg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", + "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", "dev": true, "dependencies": { - "@jest/core": "^27.4.5", + "@jest/core": "^29.7.0", + "@jest/types": "^29.6.3", "import-local": "^3.0.2", - "jest-cli": "^27.4.5" + "jest-cli": "^29.7.0" }, "bin": { "jest": "bin/jest.js" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -7947,106 +7610,144 @@ } }, "node_modules/jest-changed-files": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.4.2.tgz", - "integrity": "sha512-/9x8MjekuzUQoPjDHbBiXbNEBauhrPU2ct7m8TfCg69ywt1y/N+yYwGh3gCpnqUS3klYWDU/lSNgv+JhoD2k1A==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz", + "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==", "dev": true, "dependencies": { - "@jest/types": "^27.4.2", "execa": "^5.0.0", - "throat": "^6.0.1" + "jest-util": "^29.7.0", + "p-limit": "^3.1.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-circus": { - "version": "27.4.5", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.4.5.tgz", - "integrity": "sha512-eTNWa9wsvBwPykhMMShheafbwyakcdHZaEYh5iRrQ0PFJxkDP/e3U/FvzGuKWu2WpwUA3C3hPlfpuzvOdTVqnw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz", + "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==", "dev": true, "dependencies": { - "@jest/environment": "^27.4.4", - "@jest/test-result": "^27.4.2", - "@jest/types": "^27.4.2", + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", "co": "^4.6.0", - "dedent": "^0.7.0", - "expect": "^27.4.2", + "dedent": "^1.0.0", "is-generator-fn": "^2.0.0", - "jest-each": "^27.4.2", - "jest-matcher-utils": "^27.4.2", - "jest-message-util": "^27.4.2", - "jest-runtime": "^27.4.5", - "jest-snapshot": "^27.4.5", - "jest-util": "^27.4.2", - "pretty-format": "^27.4.2", + "jest-each": "^29.7.0", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "p-limit": "^3.1.0", + "pretty-format": "^29.7.0", + "pure-rand": "^6.0.0", "slash": "^3.0.0", - "stack-utils": "^2.0.3", - "throat": "^6.0.1" + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-cli": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", + "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==", + "dev": true, + "dependencies": { + "@jest/core": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "create-jest": "^29.7.0", + "exit": "^0.1.2", + "import-local": "^3.0.2", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "yargs": "^17.3.1" + }, + "bin": { + "jest": "bin/jest.js" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } } }, "node_modules/jest-config": { - "version": "27.4.5", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.4.5.tgz", - "integrity": "sha512-t+STVJtPt+fpqQ8GBw850NtSQbnDOw/UzdPfzDaHQ48/AylQlW7LHj3dH+ndxhC1UxJ0Q3qkq7IH+nM1skwTwA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz", + "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==", "dev": true, "dependencies": { - "@babel/core": "^7.1.0", - "@jest/test-sequencer": "^27.4.5", - "@jest/types": "^27.4.2", - "babel-jest": "^27.4.5", + "@babel/core": "^7.11.6", + "@jest/test-sequencer": "^29.7.0", + "@jest/types": "^29.6.3", + "babel-jest": "^29.7.0", "chalk": "^4.0.0", "ci-info": "^3.2.0", "deepmerge": "^4.2.2", - "glob": "^7.1.1", - "graceful-fs": "^4.2.4", - "jest-circus": "^27.4.5", - "jest-environment-jsdom": "^27.4.4", - "jest-environment-node": "^27.4.4", - "jest-get-type": "^27.4.0", - "jest-jasmine2": "^27.4.5", - "jest-regex-util": "^27.4.0", - "jest-resolve": "^27.4.5", - "jest-runner": "^27.4.5", - "jest-util": "^27.4.2", - "jest-validate": "^27.4.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-circus": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", "micromatch": "^4.0.4", - "pretty-format": "^27.4.2", - "slash": "^3.0.0" + "parse-json": "^5.2.0", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "strip-json-comments": "^3.1.1" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { + "@types/node": "*", "ts-node": ">=9.0.0" }, "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, "ts-node": { "optional": true } } }, "node_modules/jest-config/node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" } }, "node_modules/jest-config/node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -8065,18 +7766,36 @@ } }, "node_modules/jest-config/node_modules/micromatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", - "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "dependencies": { - "braces": "^3.0.1", - "picomatch": "^2.2.3" + "braces": "^3.0.3", + "picomatch": "^2.3.1" }, "engines": { "node": ">=8.6" } }, + "node_modules/jest-config/node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/jest-config/node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -8090,134 +7809,115 @@ } }, "node_modules/jest-diff": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.4.2.tgz", - "integrity": "sha512-ujc9ToyUZDh9KcqvQDkk/gkbf6zSaeEg9AiBxtttXW59H/AcqEYp1ciXAtJp+jXWva5nAf/ePtSsgWwE5mqp4Q==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", + "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", "dev": true, "dependencies": { "chalk": "^4.0.0", - "diff-sequences": "^27.4.0", - "jest-get-type": "^27.4.0", - "pretty-format": "^27.4.2" + "diff-sequences": "^29.6.3", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-docblock": { - "version": "27.4.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.4.0.tgz", - "integrity": "sha512-7TBazUdCKGV7svZ+gh7C8esAnweJoG+SvcF6Cjqj4l17zA2q1cMwx2JObSioubk317H+cjcHgP+7fTs60paulg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", + "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==", "dev": true, "dependencies": { "detect-newline": "^3.0.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-each": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.4.2.tgz", - "integrity": "sha512-53V2MNyW28CTruB3lXaHNk6PkiIFuzdOC9gR3C6j8YE/ACfrPnz+slB0s17AgU1TtxNzLuHyvNlLJ+8QYw9nBg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz", + "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==", "dev": true, "dependencies": { - "@jest/types": "^27.4.2", + "@jest/types": "^29.6.3", "chalk": "^4.0.0", - "jest-get-type": "^27.4.0", - "jest-util": "^27.4.2", - "pretty-format": "^27.4.2" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } - }, - "node_modules/jest-environment-jsdom": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.4.4.tgz", - "integrity": "sha512-cYR3ndNfHBqQgFvS1RL7dNqSvD//K56j/q1s2ygNHcfTCAp12zfIromO1w3COmXrxS8hWAh7+CmZmGCIoqGcGA==", - "dev": true, - "dependencies": { - "@jest/environment": "^27.4.4", - "@jest/fake-timers": "^27.4.2", - "@jest/types": "^27.4.2", - "@types/node": "*", - "jest-mock": "^27.4.2", - "jest-util": "^27.4.2", - "jsdom": "^16.6.0" + "jest-get-type": "^29.6.3", + "jest-util": "^29.7.0", + "pretty-format": "^29.7.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-environment-node": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.4.4.tgz", - "integrity": "sha512-D+v3lbJ2GjQTQR23TK0kY3vFVmSeea05giInI41HHOaJnAwOnmUHTZgUaZL+VxUB43pIzoa7PMwWtCVlIUoVoA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz", + "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==", "dev": true, "dependencies": { - "@jest/environment": "^27.4.4", - "@jest/fake-timers": "^27.4.2", - "@jest/types": "^27.4.2", + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", - "jest-mock": "^27.4.2", - "jest-util": "^27.4.2" + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-get-type": { - "version": "27.4.0", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.4.0.tgz", - "integrity": "sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", + "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", "dev": true, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-haste-map": { - "version": "27.4.5", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.4.5.tgz", - "integrity": "sha512-oJm1b5qhhPs78K24EDGifWS0dELYxnoBiDhatT/FThgB9yxqUm5F6li3Pv+Q+apMBmmPNzOBnZ7ZxWMB1Leq1Q==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", + "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", "dev": true, "dependencies": { - "@jest/types": "^27.4.2", - "@types/graceful-fs": "^4.1.2", + "@jest/types": "^29.6.3", + "@types/graceful-fs": "^4.1.3", "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", - "graceful-fs": "^4.2.4", - "jest-regex-util": "^27.4.0", - "jest-serializer": "^27.4.0", - "jest-util": "^27.4.2", - "jest-worker": "^27.4.5", + "graceful-fs": "^4.2.9", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", "micromatch": "^4.0.4", - "walker": "^1.0.7" + "walker": "^1.0.8" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "optionalDependencies": { "fsevents": "^2.3.2" } }, "node_modules/jest-haste-map/node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" } }, "node_modules/jest-haste-map/node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -8236,13 +7936,13 @@ } }, "node_modules/jest-haste-map/node_modules/micromatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", - "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "dependencies": { - "braces": "^3.0.1", - "picomatch": "^2.2.3" + "braces": "^3.0.3", + "picomatch": "^2.3.1" }, "engines": { "node": ">=8.6" @@ -8260,111 +7960,83 @@ "node": ">=8.0" } }, - "node_modules/jest-jasmine2": { - "version": "27.4.5", - "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.4.5.tgz", - "integrity": "sha512-oUnvwhJDj2LhOiUB1kdnJjkx8C5PwgUZQb9urF77mELH9DGR4e2GqpWQKBOYXWs5+uTN9BGDqRz3Aeg5Wts7aw==", - "dev": true, - "dependencies": { - "@babel/traverse": "^7.1.0", - "@jest/environment": "^27.4.4", - "@jest/source-map": "^27.4.0", - "@jest/test-result": "^27.4.2", - "@jest/types": "^27.4.2", - "@types/node": "*", - "chalk": "^4.0.0", - "co": "^4.6.0", - "expect": "^27.4.2", - "is-generator-fn": "^2.0.0", - "jest-each": "^27.4.2", - "jest-matcher-utils": "^27.4.2", - "jest-message-util": "^27.4.2", - "jest-runtime": "^27.4.5", - "jest-snapshot": "^27.4.5", - "jest-util": "^27.4.2", - "pretty-format": "^27.4.2", - "throat": "^6.0.1" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } - }, "node_modules/jest-leak-detector": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.4.2.tgz", - "integrity": "sha512-ml0KvFYZllzPBJWDei3mDzUhyp/M4ubKebX++fPaudpe8OsxUE+m+P6ciVLboQsrzOCWDjE20/eXew9QMx/VGw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz", + "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==", "dev": true, "dependencies": { - "jest-get-type": "^27.4.0", - "pretty-format": "^27.4.2" + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-matcher-utils": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.4.2.tgz", - "integrity": "sha512-jyP28er3RRtMv+fmYC/PKG8wvAmfGcSNproVTW2Y0P/OY7/hWUOmsPfxN1jOhM+0u2xU984u2yEagGivz9OBGQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", + "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", "dev": true, "dependencies": { "chalk": "^4.0.0", - "jest-diff": "^27.4.2", - "jest-get-type": "^27.4.0", - "pretty-format": "^27.4.2" + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-message-util": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.4.2.tgz", - "integrity": "sha512-OMRqRNd9E0DkBLZpFtZkAGYOXl6ZpoMtQJWTAREJKDOFa0M6ptB7L67tp+cszMBkvSgKOhNtQp2Vbcz3ZZKo/w==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", + "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", "dev": true, "dependencies": { "@babel/code-frame": "^7.12.13", - "@jest/types": "^27.4.2", + "@jest/types": "^29.6.3", "@types/stack-utils": "^2.0.0", "chalk": "^4.0.0", - "graceful-fs": "^4.2.4", + "graceful-fs": "^4.2.9", "micromatch": "^4.0.4", - "pretty-format": "^27.4.2", + "pretty-format": "^29.7.0", "slash": "^3.0.0", "stack-utils": "^2.0.3" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-message-util/node_modules/@babel/code-frame": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz", - "integrity": "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", + "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", "dev": true, "dependencies": { - "@babel/highlight": "^7.16.0" + "@babel/highlight": "^7.24.7", + "picocolors": "^1.0.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/jest-message-util/node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" } }, "node_modules/jest-message-util/node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -8383,13 +8055,13 @@ } }, "node_modules/jest-message-util/node_modules/micromatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", - "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "dependencies": { - "braces": "^3.0.1", - "picomatch": "^2.2.3" + "braces": "^3.0.3", + "picomatch": "^2.3.1" }, "engines": { "node": ">=8.6" @@ -8408,22 +8080,23 @@ } }, "node_modules/jest-mock": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.4.2.tgz", - "integrity": "sha512-PDDPuyhoukk20JrQKeofK12hqtSka7mWH0QQuxSNgrdiPsrnYYLS6wbzu/HDlxZRzji5ylLRULeuI/vmZZDrYA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", + "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==", "dev": true, "dependencies": { - "@jest/types": "^27.4.2", - "@types/node": "*" + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-util": "^29.7.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-pnp-resolver": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz", - "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", + "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", "dev": true, "engines": { "node": ">=6" @@ -8438,205 +8111,181 @@ } }, "node_modules/jest-regex-util": { - "version": "27.4.0", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.4.0.tgz", - "integrity": "sha512-WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", + "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", "dev": true, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-resolve": { - "version": "27.4.5", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.4.5.tgz", - "integrity": "sha512-xU3z1BuOz/hUhVUL+918KqUgK+skqOuUsAi7A+iwoUldK6/+PW+utK8l8cxIWT9AW7IAhGNXjSAh1UYmjULZZw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz", + "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==", "dev": true, "dependencies": { - "@jest/types": "^27.4.2", "chalk": "^4.0.0", - "graceful-fs": "^4.2.4", - "jest-haste-map": "^27.4.5", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", "jest-pnp-resolver": "^1.2.2", - "jest-util": "^27.4.2", - "jest-validate": "^27.4.2", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", "resolve": "^1.20.0", - "resolve.exports": "^1.1.0", + "resolve.exports": "^2.0.0", "slash": "^3.0.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-resolve-dependencies": { - "version": "27.4.5", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.4.5.tgz", - "integrity": "sha512-elEVvkvRK51y037NshtEkEnukMBWvlPzZHiL847OrIljJ8yIsujD2GXRPqDXC4rEVKbcdsy7W0FxoZb4WmEs7w==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz", + "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==", "dev": true, "dependencies": { - "@jest/types": "^27.4.2", - "jest-regex-util": "^27.4.0", - "jest-snapshot": "^27.4.5" + "jest-regex-util": "^29.6.3", + "jest-snapshot": "^29.7.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-runner": { - "version": "27.4.5", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.4.5.tgz", - "integrity": "sha512-/irauncTfmY1WkTaRQGRWcyQLzK1g98GYG/8QvIPviHgO1Fqz1JYeEIsSfF+9mc/UTA6S+IIHFgKyvUrtiBIZg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz", + "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==", "dev": true, "dependencies": { - "@jest/console": "^27.4.2", - "@jest/environment": "^27.4.4", - "@jest/test-result": "^27.4.2", - "@jest/transform": "^27.4.5", - "@jest/types": "^27.4.2", + "@jest/console": "^29.7.0", + "@jest/environment": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", - "emittery": "^0.8.1", - "exit": "^0.1.2", - "graceful-fs": "^4.2.4", - "jest-docblock": "^27.4.0", - "jest-environment-jsdom": "^27.4.4", - "jest-environment-node": "^27.4.4", - "jest-haste-map": "^27.4.5", - "jest-leak-detector": "^27.4.2", - "jest-message-util": "^27.4.2", - "jest-resolve": "^27.4.5", - "jest-runtime": "^27.4.5", - "jest-util": "^27.4.2", - "jest-worker": "^27.4.5", - "source-map-support": "^0.5.6", - "throat": "^6.0.1" + "emittery": "^0.13.1", + "graceful-fs": "^4.2.9", + "jest-docblock": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-leak-detector": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-resolve": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-util": "^29.7.0", + "jest-watcher": "^29.7.0", + "jest-worker": "^29.7.0", + "p-limit": "^3.1.0", + "source-map-support": "0.5.13" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-runtime": { - "version": "27.4.5", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.4.5.tgz", - "integrity": "sha512-CIYqwuJQXHQtPd/idgrx4zgJ6iCb6uBjQq1RSAGQrw2S8XifDmoM1Ot8NRd80ooAm+ZNdHVwsktIMGlA1F1FAQ==", - "dev": true, - "dependencies": { - "@jest/console": "^27.4.2", - "@jest/environment": "^27.4.4", - "@jest/globals": "^27.4.4", - "@jest/source-map": "^27.4.0", - "@jest/test-result": "^27.4.2", - "@jest/transform": "^27.4.5", - "@jest/types": "^27.4.2", - "@types/yargs": "^16.0.0", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz", + "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/globals": "^29.7.0", + "@jest/source-map": "^29.6.3", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", "chalk": "^4.0.0", "cjs-module-lexer": "^1.0.0", "collect-v8-coverage": "^1.0.0", - "execa": "^5.0.0", - "exit": "^0.1.2", "glob": "^7.1.3", - "graceful-fs": "^4.2.4", - "jest-haste-map": "^27.4.5", - "jest-message-util": "^27.4.2", - "jest-mock": "^27.4.2", - "jest-regex-util": "^27.4.0", - "jest-resolve": "^27.4.5", - "jest-snapshot": "^27.4.5", - "jest-util": "^27.4.2", - "jest-validate": "^27.4.2", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", "slash": "^3.0.0", - "strip-bom": "^4.0.0", - "yargs": "^16.2.0" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } - }, - "node_modules/jest-serializer": { - "version": "27.4.0", - "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.4.0.tgz", - "integrity": "sha512-RDhpcn5f1JYTX2pvJAGDcnsNTnsV9bjYPU8xcV+xPwOXnUPOQwf4ZEuiU6G9H1UztH+OapMgu/ckEVwO87PwnQ==", - "dev": true, - "dependencies": { - "@types/node": "*", - "graceful-fs": "^4.2.4" + "strip-bom": "^4.0.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-snapshot": { - "version": "27.4.5", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.4.5.tgz", - "integrity": "sha512-eCi/iM1YJFrJWiT9de4+RpWWWBqsHiYxFG9V9o/n0WXs6GpW4lUt4FAHAgFPTLPqCUVzrMQmSmTZSgQzwqR7IQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz", + "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==", "dev": true, "dependencies": { - "@babel/core": "^7.7.2", + "@babel/core": "^7.11.6", "@babel/generator": "^7.7.2", - "@babel/parser": "^7.7.2", + "@babel/plugin-syntax-jsx": "^7.7.2", "@babel/plugin-syntax-typescript": "^7.7.2", - "@babel/traverse": "^7.7.2", - "@babel/types": "^7.0.0", - "@jest/transform": "^27.4.5", - "@jest/types": "^27.4.2", - "@types/babel__traverse": "^7.0.4", - "@types/prettier": "^2.1.5", + "@babel/types": "^7.3.3", + "@jest/expect-utils": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", "babel-preset-current-node-syntax": "^1.0.0", "chalk": "^4.0.0", - "expect": "^27.4.2", - "graceful-fs": "^4.2.4", - "jest-diff": "^27.4.2", - "jest-get-type": "^27.4.0", - "jest-haste-map": "^27.4.5", - "jest-matcher-utils": "^27.4.2", - "jest-message-util": "^27.4.2", - "jest-resolve": "^27.4.5", - "jest-util": "^27.4.2", + "expect": "^29.7.0", + "graceful-fs": "^4.2.9", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", "natural-compare": "^1.4.0", - "pretty-format": "^27.4.2", - "semver": "^7.3.2" + "pretty-format": "^29.7.0", + "semver": "^7.5.3" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-util": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.4.2.tgz", - "integrity": "sha512-YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, "dependencies": { - "@jest/types": "^27.4.2", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", "ci-info": "^3.2.0", - "graceful-fs": "^4.2.4", + "graceful-fs": "^4.2.9", "picomatch": "^2.2.3" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-validate": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.4.2.tgz", - "integrity": "sha512-hWYsSUej+Fs8ZhOm5vhWzwSLmVaPAxRy+Mr+z5MzeaHm9AxUpXdoVMEW4R86y5gOobVfBsMFLk4Rb+QkiEpx1A==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz", + "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==", "dev": true, "dependencies": { - "@jest/types": "^27.4.2", + "@jest/types": "^29.6.3", "camelcase": "^6.2.0", "chalk": "^4.0.0", - "jest-get-type": "^27.4.0", + "jest-get-type": "^29.6.3", "leven": "^3.1.0", - "pretty-format": "^27.4.2" + "pretty-format": "^29.7.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-validate/node_modules/camelcase": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz", - "integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", "dev": true, "engines": { "node": ">=10" @@ -8646,84 +8295,52 @@ } }, "node_modules/jest-watcher": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.4.2.tgz", - "integrity": "sha512-NJvMVyyBeXfDezhWzUOCOYZrUmkSCiatpjpm+nFUid74OZEHk6aMLrZAukIiFDwdbqp6mTM6Ui1w4oc+8EobQg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", + "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==", "dev": true, "dependencies": { - "@jest/test-result": "^27.4.2", - "@jest/types": "^27.4.2", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "ansi-escapes": "^4.2.1", "chalk": "^4.0.0", - "jest-util": "^27.4.2", + "emittery": "^0.13.1", + "jest-util": "^29.7.0", "string-length": "^4.0.1" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-worker": { - "version": "27.4.5", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.5.tgz", - "integrity": "sha512-f2s8kEdy15cv9r7q4KkzGXvlY0JTcmCbMHZBfSQDwW77REr45IDWwd0lksDFeVHH2jJ5pqb90T77XscrjeGzzg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", + "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", "dev": true, "dependencies": { "@types/node": "*", + "jest-util": "^29.7.0", "merge-stream": "^2.0.0", "supports-color": "^8.0.0" }, "engines": { - "node": ">= 10.13.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-worker/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/jest/node_modules/jest-cli": { - "version": "27.4.5", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.4.5.tgz", - "integrity": "sha512-hrky3DSgE0u7sQxaCL7bdebEPHx5QzYmrGuUjaPLmPE8jx5adtvGuOlRspvMoVLTTDOHRnZDoRLYJuA+VCI7Hg==", - "dev": true, - "dependencies": { - "@jest/core": "^27.4.5", - "@jest/test-result": "^27.4.2", - "@jest/types": "^27.4.2", - "chalk": "^4.0.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.4", - "import-local": "^3.0.2", - "jest-config": "^27.4.5", - "jest-util": "^27.4.2", - "jest-validate": "^27.4.2", - "prompts": "^2.0.1", - "yargs": "^16.2.0" - }, - "bin": { - "jest": "bin/jest.js" + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - }, - "peerDependencies": { - "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + "node": ">=10" }, - "peerDependenciesMeta": { - "node-notifier": { - "optional": true - } + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" } }, "node_modules/joycon": { @@ -8753,85 +8370,6 @@ "js-yaml": "bin/js-yaml.js" } }, - "node_modules/jsdom": { - "version": "16.7.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz", - "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==", - "dev": true, - "dependencies": { - "abab": "^2.0.5", - "acorn": "^8.2.4", - "acorn-globals": "^6.0.0", - "cssom": "^0.4.4", - "cssstyle": "^2.3.0", - "data-urls": "^2.0.0", - "decimal.js": "^10.2.1", - "domexception": "^2.0.1", - "escodegen": "^2.0.0", - "form-data": "^3.0.0", - "html-encoding-sniffer": "^2.0.1", - "http-proxy-agent": "^4.0.1", - "https-proxy-agent": "^5.0.0", - "is-potential-custom-element-name": "^1.0.1", - "nwsapi": "^2.2.0", - "parse5": "6.0.1", - "saxes": "^5.0.1", - "symbol-tree": "^3.2.4", - "tough-cookie": "^4.0.0", - "w3c-hr-time": "^1.0.2", - "w3c-xmlserializer": "^2.0.0", - "webidl-conversions": "^6.1.0", - "whatwg-encoding": "^1.0.5", - "whatwg-mimetype": "^2.3.0", - "whatwg-url": "^8.5.0", - "ws": "^7.4.6", - "xml-name-validator": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "canvas": "^2.5.0" - }, - "peerDependenciesMeta": { - "canvas": { - "optional": true - } - } - }, - "node_modules/jsdom/node_modules/acorn": { - "version": "8.6.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz", - "integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/jsdom/node_modules/ws": { - "version": "7.5.6", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz", - "integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==", - "dev": true, - "engines": { - "node": ">=8.3.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, "node_modules/jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", @@ -8850,6 +8388,12 @@ "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", "dev": true }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true + }, "node_modules/json-schema-ref-resolver": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-schema-ref-resolver/-/json-schema-ref-resolver-1.0.1.tgz", @@ -9002,6 +8546,12 @@ "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-2.3.0.tgz", "integrity": "sha512-N6mp1+2jpQr3oCFMz6SeHRGbv6Slb20bRhj4v3xR99HqNToAcOe1MFOp4tytyzOfJn+QtN8Rf7U/h2KAn4kC6g==" }, + "node_modules/lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true + }, "node_modules/load-json-file": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz", @@ -9213,29 +8763,20 @@ } }, "node_modules/make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", "dev": true, "dependencies": { - "semver": "^6.0.0" + "semver": "^7.5.3" }, "engines": { - "node": ">=8" + "node": ">=10" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/make-dir/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/makeerror": { "version": "1.0.12", "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", @@ -9644,13 +9185,13 @@ "node_modules/node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", - "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=", + "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", "dev": true }, "node_modules/node-releases": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz", - "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==", + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", + "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", "dev": true }, "node_modules/normalize-package-data": { @@ -9694,12 +9235,6 @@ "node": ">=8" } }, - "node_modules/nwsapi": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", - "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==", - "dev": true - }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -10093,12 +9628,6 @@ "node": ">=0.10.0" } }, - "node_modules/parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", - "dev": true - }, "node_modules/pascalcase": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", @@ -10362,15 +9891,15 @@ } }, "node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", + "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", "dev": true }, "node_modules/picomatch": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", - "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "engines": { "node": ">=8.6" }, @@ -10444,9 +9973,9 @@ "integrity": "sha512-cK0pekc1Kjy5w9V2/n+8MkZwusa6EyyxfeQCB799CQRhRt/CqYKiWs5adeu8Shve2ZNffvfC/7J64A2PJo1W/Q==" }, "node_modules/pirates": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz", - "integrity": "sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", + "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", "dev": true, "engines": { "node": ">= 6" @@ -10580,18 +10109,17 @@ } }, "node_modules/pretty-format": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.2.tgz", - "integrity": "sha512-p0wNtJ9oLuvgOQDEIZ9zQjZffK7KtyR6Si0jnXULIDwrlNF8Cuir3AZP0hHv0jmKuNN/edOnbMjnzd4uTcmWiw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", "dev": true, "dependencies": { - "@jest/types": "^27.4.2", - "ansi-regex": "^5.0.1", + "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", - "react-is": "^17.0.1" + "react-is": "^18.0.0" }, "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/pretty-format/node_modules/ansi-styles": { @@ -10798,12 +10326,6 @@ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" }, - "node_modules/psl": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", - "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", - "dev": true - }, "node_modules/pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", @@ -10831,11 +10353,21 @@ "node": ">=6" } }, - "node_modules/querystringify": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", - "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", - "dev": true + "node_modules/pure-rand": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz", + "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/dubzzz" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fast-check" + } + ] }, "node_modules/queue-microtask": { "version": "1.2.3", @@ -10863,9 +10395,9 @@ "integrity": "sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==" }, "node_modules/react-is": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", - "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", + "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", "dev": true }, "node_modules/read-pkg": { @@ -11171,12 +10703,6 @@ "integrity": "sha1-VMIlMN/1pSd5SyZsNxe+SYFaisk=", "deprecated": "no longer maintained" }, - "node_modules/requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", - "dev": true - }, "node_modules/rereadable-stream": { "version": "1.4.12", "resolved": "https://registry.npmjs.org/rereadable-stream/-/rereadable-stream-1.4.12.tgz", @@ -11247,9 +10773,9 @@ "deprecated": "https://github.com/lydell/resolve-url#deprecated" }, "node_modules/resolve.exports": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz", - "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz", + "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==", "dev": true, "engines": { "node": ">=10" @@ -11351,24 +10877,6 @@ "node": ">=10" } }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "node_modules/saxes": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", - "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", - "dev": true, - "dependencies": { - "xmlchars": "^2.2.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/scramjet": { "version": "4.36.1", "resolved": "https://registry.npmjs.org/scramjet/-/scramjet-4.36.1.tgz", @@ -11509,9 +11017,9 @@ } }, "node_modules/signal-exit": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz", - "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==", + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true }, "node_modules/signed-varint": { @@ -11739,9 +11247,9 @@ } }, "node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "version": "0.5.13", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", + "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", "dev": true, "dependencies": { "buffer-from": "^1.0.0", @@ -11845,9 +11353,9 @@ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, "node_modules/stack-utils": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz", - "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", + "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", "dev": true, "dependencies": { "escape-string-regexp": "^2.0.0" @@ -12480,19 +11988,6 @@ "node": ">=8" } }, - "node_modules/supports-hyperlinks": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz", - "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0", - "supports-color": "^7.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", @@ -12505,12 +12000,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/symbol-tree": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", - "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", - "dev": true - }, "node_modules/table": { "version": "6.7.5", "resolved": "https://registry.npmjs.org/table/-/table-6.7.5.tgz", @@ -12557,22 +12046,6 @@ "bintrees": "1.0.2" } }, - "node_modules/terminal-link": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz", - "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==", - "dev": true, - "dependencies": { - "ansi-escapes": "^4.2.1", - "supports-hyperlinks": "^2.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", @@ -12601,12 +12074,6 @@ "real-require": "^0.1.0" } }, - "node_modules/throat": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz", - "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==", - "dev": true - }, "node_modules/through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", @@ -12671,7 +12138,7 @@ "node_modules/to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", "dev": true, "engines": { "node": ">=4" @@ -12784,42 +12251,6 @@ "node": ">=0.6" } }, - "node_modules/tough-cookie": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", - "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", - "dev": true, - "dependencies": { - "psl": "^1.1.33", - "punycode": "^2.1.1", - "universalify": "^0.2.0", - "url-parse": "^1.5.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/tough-cookie/node_modules/universalify": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", - "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", - "dev": true, - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/tr46": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", - "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", - "dev": true, - "dependencies": { - "punycode": "^2.1.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/tsconfig-paths": { "version": "3.12.0", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz", @@ -12907,15 +12338,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "dev": true, - "dependencies": { - "is-typedarray": "^1.0.0" - } - }, "node_modules/typeof-article": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/typeof-article/-/typeof-article-0.1.1.tgz", @@ -13065,6 +12487,36 @@ "node": ">=0.10.0" } }, + "node_modules/update-browserslist-db": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz", + "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "escalade": "^3.1.2", + "picocolors": "^1.0.1" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -13079,16 +12531,6 @@ "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", "deprecated": "Please see https://github.com/lydell/urix#deprecated" }, - "node_modules/url-parse": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", - "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", - "dev": true, - "dependencies": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, "node_modules/use": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", @@ -13109,28 +12551,19 @@ "dev": true }, "node_modules/v8-to-istanbul": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz", - "integrity": "sha512-/PRhfd8aTNp9Ggr62HPzXg2XasNFGy5PBt0Rp04du7/8GNNSgxFL6WBTkgMKSL9bFjH+8kKEG3f37FmxiTqUUA==", + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", + "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", "dev": true, "dependencies": { + "@jridgewell/trace-mapping": "^0.3.12", "@types/istanbul-lib-coverage": "^2.0.1", - "convert-source-map": "^1.6.0", - "source-map": "^0.7.3" + "convert-source-map": "^2.0.0" }, "engines": { "node": ">=10.12.0" } }, - "node_modules/v8-to-istanbul/node_modules/source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, "node_modules/validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", @@ -13172,28 +12605,6 @@ "node": ">=0.10.0" } }, - "node_modules/w3c-hr-time": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", - "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", - "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.", - "dev": true, - "dependencies": { - "browser-process-hrtime": "^1.0.0" - } - }, - "node_modules/w3c-xmlserializer": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", - "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", - "dev": true, - "dependencies": { - "xml-name-validator": "^3.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/walker": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", @@ -13211,44 +12622,6 @@ "node": ">=0.10.0" } }, - "node_modules/webidl-conversions": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", - "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", - "dev": true, - "engines": { - "node": ">=10.4" - } - }, - "node_modules/whatwg-encoding": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", - "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", - "dev": true, - "dependencies": { - "iconv-lite": "0.4.24" - } - }, - "node_modules/whatwg-mimetype": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", - "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", - "dev": true - }, - "node_modules/whatwg-url": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", - "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", - "dev": true, - "dependencies": { - "lodash": "^4.7.0", - "tr46": "^2.1.0", - "webidl-conversions": "^6.1.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -13321,15 +12694,16 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "node_modules/write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", + "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", "dev": true, "dependencies": { "imurmurhash": "^0.1.4", - "is-typedarray": "^1.0.0", - "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" + "signal-exit": "^3.0.7" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, "node_modules/ws": { @@ -13361,18 +12735,6 @@ "node": ">=8" } }, - "node_modules/xml-name-validator": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", - "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", - "dev": true - }, - "node_modules/xmlchars": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", - "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", - "dev": true - }, "node_modules/xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", @@ -13408,30 +12770,28 @@ } }, "node_modules/yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dev": true, + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "dependencies": { - "cliui": "^7.0.2", + "cliui": "^8.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", - "string-width": "^4.2.0", + "string-width": "^4.2.3", "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" + "yargs-parser": "^21.1.1" }, "engines": { - "node": ">=10" + "node": ">=12" } }, "node_modules/yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", - "dev": true, + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "engines": { - "node": ">=10" + "node": ">=12" } }, "node_modules/year": { diff --git a/package.json b/package.json index 1a7a51c8..253b8fb0 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "snappyjs": "^0.6.1", "stream-chain": "^2.2.4", "stream-json": "^1.7.3", - "ws": "^8.0.0", + "ws": "^8.17.1", "xxhash-wasm": "^0.4.2", "yaml": "^1.10.2", "@stricjs/utils": "^1.6.1", @@ -101,7 +101,7 @@ "eslint-plugin-jest": "^25.3.0", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^5.2.0", - "jest": "^27.4.5", + "jest": "^29.7.0", "node-abort-controller": "^3.1.1", "node-fetch": "^2.6.7", "pino-pretty": "^7.5.1", From 422c99225e37132c0ad197d6cb2d2b813fcecba5 Mon Sep 17 00:00:00 2001 From: akvlad Date: Tue, 3 Sep 2024 15:28:08 +0300 Subject: [PATCH 2/4] fix security alerts --- jest.config.js | 2 +- parser/bnf.js | 40 +- qryn_node.js | 4 +- test/__snapshots__/parser.test.js.snap | 150 +- test/__snapshots__/transpiler.test.js.snap | 4926 ++++++++++---------- 5 files changed, 2568 insertions(+), 2554 deletions(-) diff --git a/jest.config.js b/jest.config.js index 85caef4e..ba622f5f 100644 --- a/jest.config.js +++ b/jest.config.js @@ -2,6 +2,6 @@ const path = require('path') module.exports = { setupFilesAfterEnv: [path.join(__dirname, '/test/jest.setup.js')], moduleNameMapper: { - '^axios$': 'axios/dist/node/axios.cjs' + '^axios$': require.resolve('axios'),//'axios/dist/node/axios.cjs' } } diff --git a/parser/bnf.js b/parser/bnf.js index a0635c56..b4985ce0 100644 --- a/parser/bnf.js +++ b/parser/bnf.js @@ -79,21 +79,35 @@ compiler._ParseScript = compiler.ParseScript compiler.ParseScript = function (script) { const qLiterals = [] const aqLiterals = [] - const quotedStrings = script.replaceAll(/"([^"\\]|\\.)*"/g, (str) => { - if (str.length < 512) { - return str + let _script = script + let res = '' + let qsMatch = _script.match(/^([^"]*)("([^"\\]|\\.)*")?/) + while (qsMatch && qsMatch[0]) { + let repl = qsMatch[2] || '' + if (repl.length > 512) { + qLiterals.push(repl) + repl = `"QL_${qLiterals.length - 1}"` } - qLiterals.push(str) - return `"QL_${qLiterals.length - 1}"` - }) - const aQuotedStrings = quotedStrings.replaceAll(/`([^`\\]|\\.)*`/g, (str) => { - if (str.length < 512) { - return str + res = res + qsMatch[1] + repl + _script = _script.slice(qsMatch[0].length) + qsMatch = _script.match(/^([^"]*)("([^"\\]|\\.)*")?/) + } + + _script = res + res = '' + qsMatch = _script.match(/^([^`]*)(`([^`\\]|\\.)*`)?/) + while (qsMatch && qsMatch[0]) { + let repl = qsMatch[2] || '' + if (repl.length > 512) { + aqLiterals.push(repl) + repl = `\`AL_${qLiterals.length - 1}\`` } - aqLiterals.push(str) - return `\`AL_${aqLiterals.length - 1}\`` - }) - const parsedScript = this._ParseScript(aQuotedStrings) + res = res + qsMatch[1] + repl + _script = _script.slice(qsMatch[0].length) + qsMatch = _script.match(/^([^`]*)(`([^`\\]|\\.)*`)?/) + } + + const parsedScript = this._ParseScript(res) if (!parsedScript) { return parsedScript } diff --git a/qryn_node.js b/qryn_node.js index 38e48349..6a10b4e4 100755 --- a/qryn_node.js +++ b/qryn_node.js @@ -124,7 +124,7 @@ let fastify = require('fastify')({ done() })) await fastify.register(require('@fastify/compress'), { - encodings: ['gzip'], + encodings: ['gzip']/*, zlib: { createGzip: () => { const deflator = new pako.Deflate({ gzip: true }) @@ -152,7 +152,7 @@ let fastify = require('fastify')({ } return res } - } + }*/ }) await fastify.register(require('@fastify/url-data')) await fastify.register(require('@fastify/websocket')) diff --git a/test/__snapshots__/parser.test.js.snap b/test/__snapshots__/parser.test.js.snap index 7c41b4f9..9d5fa0f5 100644 --- a/test/__snapshots__/parser.test.js.snap +++ b/test/__snapshots__/parser.test.js.snap @@ -1,8 +1,8 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`should compile regex 1`] = ` -"SCRIPT: abcd\\\\( - SYNTAX: abcd\\\\( +"SCRIPT: abcd\\( + SYNTAX: abcd\\( literal: a letter: a literal: b @@ -11,20 +11,20 @@ exports[`should compile regex 1`] = ` letter: c literal: d letter: d - literal: \\\\( - quoted_brack: \\\\( + literal: \\( + quoted_brack: \\( " `; exports[`should compile regex 2`] = ` -"SCRIPT: (a\\\\(bc) - SYNTAX: (a\\\\(bc) - any_group: (a\\\\(bc) - group_tail: a\\\\(bc +"SCRIPT: (a\\(bc) + SYNTAX: (a\\(bc) + any_group: (a\\(bc) + group_tail: a\\(bc literal: a letter: a - literal: \\\\( - quoted_brack: \\\\( + literal: \\( + quoted_brack: \\( literal: b letter: b literal: c @@ -33,26 +33,26 @@ exports[`should compile regex 2`] = ` `; exports[`should compile regex 3`] = ` -"SCRIPT: (?a[^\\\\[\\\\(\\\\)]bc) - SYNTAX: (?a[^\\\\[\\\\(\\\\)]bc) - any_group: (?a[^\\\\[\\\\(\\\\)]bc) +"SCRIPT: (?a[^\\[\\(\\)]bc) + SYNTAX: (?a[^\\[\\(\\)]bc) + any_group: (?a[^\\[\\(\\)]bc) group_name: ? label: label1 - group_tail: a[^\\\\[\\\\(\\\\)]bc + group_tail: a[^\\[\\(\\)]bc literal: a letter: a literal: [ letter: [ literal: ^ letter: ^ - literal: \\\\ - letter: \\\\ + literal: \\ + letter: \\ literal: [ letter: [ - literal: \\\\( - quoted_brack: \\\\( - literal: \\\\) - quoted_brack: \\\\) + literal: \\( + quoted_brack: \\( + literal: \\) + quoted_brack: \\) literal: ] letter: ] literal: b @@ -63,28 +63,28 @@ exports[`should compile regex 3`] = ` `; exports[`should compile regex 4`] = ` -"SCRIPT: (a(?[^\\\\[\\\\(\\\\)]bc)) - SYNTAX: (a(?[^\\\\[\\\\(\\\\)]bc)) - any_group: (a(?[^\\\\[\\\\(\\\\)]bc)) - group_tail: a(?[^\\\\[\\\\(\\\\)]bc) +"SCRIPT: (a(?[^\\[\\(\\)]bc)) + SYNTAX: (a(?[^\\[\\(\\)]bc)) + any_group: (a(?[^\\[\\(\\)]bc)) + group_tail: a(?[^\\[\\(\\)]bc) literal: a letter: a - any_group: (?[^\\\\[\\\\(\\\\)]bc) + any_group: (?[^\\[\\(\\)]bc) group_name: ? label: label1 - group_tail: [^\\\\[\\\\(\\\\)]bc + group_tail: [^\\[\\(\\)]bc literal: [ letter: [ literal: ^ letter: ^ - literal: \\\\ - letter: \\\\ + literal: \\ + letter: \\ literal: [ letter: [ - literal: \\\\( - quoted_brack: \\\\( - literal: \\\\) - quoted_brack: \\\\) + literal: \\( + quoted_brack: \\( + literal: \\) + quoted_brack: \\) literal: ] letter: ] literal: b @@ -95,18 +95,18 @@ exports[`should compile regex 4`] = ` `; exports[`should compile regex 5`] = ` -"SCRIPT: (a[\\\\(\\\\)]+(?b)(?[^\\\\[\\\\(\\\\)]bc)) - SYNTAX: (a[\\\\(\\\\)]+(?b)(?[^\\\\[\\\\(\\\\)]bc)) - any_group: (a[\\\\(\\\\)]+(?b)(?[^\\\\[\\\\(\\\\)]bc)) - group_tail: a[\\\\(\\\\)]+(?b)(?[^\\\\[\\\\(\\\\)]bc) +"SCRIPT: (a[\\(\\)]+(?b)(?[^\\[\\(\\)]bc)) + SYNTAX: (a[\\(\\)]+(?b)(?[^\\[\\(\\)]bc)) + any_group: (a[\\(\\)]+(?b)(?[^\\[\\(\\)]bc)) + group_tail: a[\\(\\)]+(?b)(?[^\\[\\(\\)]bc) literal: a letter: a literal: [ letter: [ - literal: \\\\( - quoted_brack: \\\\( - literal: \\\\) - quoted_brack: \\\\) + literal: \\( + quoted_brack: \\( + literal: \\) + quoted_brack: \\) literal: ] letter: ] literal: + @@ -117,22 +117,22 @@ exports[`should compile regex 5`] = ` group_tail: b literal: b letter: b - any_group: (?[^\\\\[\\\\(\\\\)]bc) + any_group: (?[^\\[\\(\\)]bc) group_name: ? label: label1 - group_tail: [^\\\\[\\\\(\\\\)]bc + group_tail: [^\\[\\(\\)]bc literal: [ letter: [ literal: ^ letter: ^ - literal: \\\\ - letter: \\\\ + literal: \\ + letter: \\ literal: [ letter: [ - literal: \\\\( - quoted_brack: \\\\( - literal: \\\\) - quoted_brack: \\\\) + literal: \\( + quoted_brack: \\( + literal: \\) + quoted_brack: \\) literal: ] letter: ] literal: b @@ -142,71 +142,71 @@ exports[`should compile regex 5`] = ` " `; -exports[`should erase names 1`] = `"abcd\\\\("`; +exports[`should erase names 1`] = `"abcd\\("`; -exports[`should erase names 2`] = `"(a\\\\(bc)"`; +exports[`should erase names 2`] = `"(a\\(bc)"`; -exports[`should erase names 3`] = `"(a[^\\\\[\\\\(\\\\)]bc)"`; +exports[`should erase names 3`] = `"(a[^\\[\\(\\)]bc)"`; -exports[`should erase names 4`] = `"(a([^\\\\[\\\\(\\\\)]bc))"`; +exports[`should erase names 4`] = `"(a([^\\[\\(\\)]bc))"`; -exports[`should erase names 5`] = `"(a[\\\\(\\\\)]+(b)([^\\\\[\\\\(\\\\)]bc))"`; +exports[`should erase names 5`] = `"(a[\\(\\)]+(b)([^\\[\\(\\)]bc))"`; -exports[`should get named groups 1`] = `Array []`; +exports[`should get named groups 1`] = `[]`; exports[`should get named groups 2`] = ` -Array [ - Object { - "val": "a\\\\(bc", +[ + { + "val": "a\\(bc", }, ] `; exports[`should get named groups 3`] = ` -Array [ - Object { +[ + { "name": "label1", - "val": "a[^\\\\[\\\\(\\\\)]bc", + "val": "a[^\\[\\(\\)]bc", }, ] `; exports[`should get named groups 4`] = ` -Array [ - Object { - "val": "a(?[^\\\\[\\\\(\\\\)]bc)", +[ + { + "val": "a(?[^\\[\\(\\)]bc)", }, - Object { + { "name": "label1", - "val": "[^\\\\[\\\\(\\\\)]bc", + "val": "[^\\[\\(\\)]bc", }, ] `; exports[`should get named groups 5`] = ` -Array [ - Object { - "val": "a[\\\\(\\\\)]+(?b)(?[^\\\\[\\\\(\\\\)]bc)", +[ + { + "val": "a[\\(\\)]+(?b)(?[^\\[\\(\\)]bc)", }, - Object { + { "name": "l2", "val": "b", }, - Object { + { "name": "label1", - "val": "[^\\\\[\\\\(\\\\)]bc", + "val": "[^\\[\\(\\)]bc", }, ] `; exports[`should process regex 1`] = ` -Object { - "labels": Array [ - Object { +{ + "labels": [ + { "name": "helper", "val": "[a-zA-Z0-9]+", }, - Object { + { "name": "token", "val": "[a-zA-Z]+", }, diff --git a/test/__snapshots__/transpiler.test.js.snap b/test/__snapshots__/transpiler.test.js.snap index 96261a19..415e0654 100644 --- a/test/__snapshots__/transpiler.test.js.snap +++ b/test/__snapshots__/transpiler.test.js.snap @@ -2,14 +2,14 @@ exports[`log_range_aggregation 1 1`] = ` Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object { + "ctx": { "duration": 300000, "idxId": 1, "matrix": true, @@ -18,22 +18,22 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "labels", "asc", ], - Array [ + [ "timestamp_ns", "asc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -64,44 +64,44 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ Raw { "raw": "labels", }, "labels", ], - Array [ + [ Raw { "raw": "", "toString": [Function], }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "toFloat64(count(1)) * 1000 / 300000", }, "value", ], ], - "tables": Array [ - Array [ + "tables": [ + [ WithReference { "ref": With { "alias": "rate_a", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -112,7 +112,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -134,39 +134,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -194,33 +194,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -228,7 +228,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -240,7 +240,7 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "duration": 300000, "idxId": 1, "matrix": true, @@ -249,18 +249,18 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -291,20 +291,20 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -312,8 +312,8 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": "loki.samples_vX", @@ -323,50 +323,50 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, ], ], - "withs": Object { + "withs": { "idx_sel": With { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -394,33 +394,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -428,19 +428,19 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, "rate_a": With { "alias": "rate_a", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -451,7 +451,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -473,39 +473,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -533,33 +533,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -567,7 +567,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -579,7 +579,7 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "duration": 300000, "idxId": 1, "matrix": true, @@ -588,18 +588,18 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -630,20 +630,20 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -651,8 +651,8 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": "loki.samples_vX", @@ -662,7 +662,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -673,14 +673,14 @@ exports[`log_range_aggregation 1 2`] = `"WITH idx_sel AS (select \`sel_1\`.\`fin exports[`log_range_aggregation 2 1`] = ` Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object { + "ctx": { "duration": 300000, "idxId": 1, "matrix": true, @@ -689,22 +689,22 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "labels", "asc", ], - Array [ + [ "timestamp_ns", "asc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -735,44 +735,44 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ Raw { "raw": "labels", }, "labels", ], - Array [ + [ Raw { "raw": "", "toString": [Function], }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "toFloat64(count(1)) * 1000 / 300000", }, "value", ], ], - "tables": Array [ - Array [ + "tables": [ + [ WithReference { "ref": With { "alias": "rate_a", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -783,7 +783,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -805,39 +805,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -869,33 +869,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -903,7 +903,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -924,7 +924,7 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "duration": 300000, "idxId": 1, "matrix": true, @@ -933,18 +933,18 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -975,20 +975,20 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -996,8 +996,8 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": "loki.samples_vX", @@ -1007,50 +1007,50 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, ], ], - "withs": Object { + "withs": { "idx_sel": With { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -1082,33 +1082,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -1116,19 +1116,19 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, "rate_a": With { "alias": "rate_a", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -1139,7 +1139,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -1161,39 +1161,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -1225,33 +1225,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -1259,7 +1259,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -1280,7 +1280,7 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "duration": 300000, "idxId": 1, "matrix": true, @@ -1289,18 +1289,18 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -1331,20 +1331,20 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -1352,8 +1352,8 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": "loki.samples_vX", @@ -1363,7 +1363,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -1374,14 +1374,14 @@ exports[`log_range_aggregation 2 2`] = `"WITH idx_sel AS (select \`sel_1\`.\`fin exports[`log_range_aggregation 3 1`] = ` Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object { + "ctx": { "duration": 300000, "idxId": 1, "matrix": true, @@ -1390,22 +1390,22 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "labels", "asc", ], - Array [ + [ "timestamp_ns", "asc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -1436,44 +1436,44 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ Raw { "raw": "labels", }, "labels", ], - Array [ + [ Raw { "raw": "", "toString": [Function], }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "toFloat64(count(1)) * 1000 / 300000", }, "value", ], ], - "tables": Array [ - Array [ + "tables": [ + [ WithReference { "ref": With { "alias": "rate_a", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -1484,7 +1484,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -1506,39 +1506,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -1566,33 +1566,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -1600,7 +1600,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -1621,7 +1621,7 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "duration": 300000, "idxId": 1, "matrix": true, @@ -1630,18 +1630,18 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -1672,20 +1672,20 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -1693,8 +1693,8 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": "loki.samples_vX", @@ -1704,50 +1704,50 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, ], ], - "withs": Object { + "withs": { "idx_sel": With { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -1775,33 +1775,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -1809,19 +1809,19 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, "rate_a": With { "alias": "rate_a", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -1832,7 +1832,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -1854,39 +1854,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -1914,33 +1914,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -1948,7 +1948,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -1969,7 +1969,7 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "duration": 300000, "idxId": 1, "matrix": true, @@ -1978,18 +1978,18 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -2020,20 +2020,20 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -2041,8 +2041,8 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": "loki.samples_vX", @@ -2052,7 +2052,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -2063,14 +2063,14 @@ exports[`log_range_aggregation 3 2`] = `"WITH idx_sel AS (select \`sel_1\`.\`fin exports[`log_range_aggregation 4 1`] = ` Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object { + "ctx": { "duration": 1000, "idxId": 1, "matrix": true, @@ -2079,22 +2079,22 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "labels", "asc", ], - Array [ + [ "timestamp_ns", "asc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -2125,70 +2125,70 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "labels", - Array [ + [ Raw { "raw": "intDiv(timestamp_ns, 5000) * 5000", }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "argMin(rate_b.value, rate_b.timestamp_ns)", }, "value", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "rate_b", }, ], ], - "withs": Object { + "withs": { "idx_sel": With { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -2220,33 +2220,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -2254,19 +2254,19 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, "rate_a": With { "alias": "rate_a", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -2277,7 +2277,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -2299,39 +2299,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -2363,33 +2363,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -2397,7 +2397,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -2418,7 +2418,7 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "duration": 1000, "idxId": 1, "matrix": true, @@ -2427,18 +2427,18 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -2469,20 +2469,20 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -2490,8 +2490,8 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": "loki.samples_vX", @@ -2501,79 +2501,79 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, "rate_b": With { "alias": "rate_b", "inline": undefined, "query": Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "labels", "asc", ], - Array [ + [ "timestamp_ns", "asc", ], ], - "params": Object {}, + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ Raw { "raw": "labels", }, "labels", ], - Array [ + [ Raw { "raw": "", "toString": [Function], }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "toFloat64(count(1)) * 1000 / 1000", }, "value", ], ], - "tables": Array [ - Array [ + "tables": [ + [ WithReference { "ref": With { "alias": "rate_a", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -2584,7 +2584,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -2606,39 +2606,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -2670,33 +2670,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -2704,7 +2704,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -2725,7 +2725,7 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "duration": 1000, "idxId": 1, "matrix": true, @@ -2734,18 +2734,18 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -2776,20 +2776,20 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -2797,8 +2797,8 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": "loki.samples_vX", @@ -2808,13 +2808,13 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -2825,14 +2825,14 @@ exports[`log_range_aggregation 4 2`] = `"WITH idx_sel AS (select \`sel_1\`.\`fin exports[`shoud transpile unwrap 1`] = ` Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object { + "ctx": { "duration": 60000, "idxId": 1, "matrix": true, @@ -2841,22 +2841,22 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "labels", "asc", ], - Array [ + [ "timestamp_ns", "asc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": null, @@ -2887,72 +2887,72 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "labels", - Array [ + [ Raw { "raw": "intDiv(timestamp_ns, 120000) * 120000", }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "argMin(uw_rate_b.value, uw_rate_b.timestamp_ns)", }, "value", ], ], - "tables": Array [ - Array [ + "tables": [ + [ WithReference { "ref": With { "alias": "uw_rate_b", "inline": undefined, "query": Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ + "order_expressions": [ "labels", "timestamp_ns", ], - "params": Object {}, + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ Raw { "raw": "arraySort(arrayFilter(x -> arrayExists(y -> x.1 == y, ['fmt']) != 0, labels))", }, "labels", ], - Array [ + [ Raw { "raw": "SUM(unwrapped) / 60", }, "value", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -2960,19 +2960,19 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ WithReference { "ref": With { "alias": "uw_rate_a", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -2983,7 +2983,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -3005,39 +3005,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -3065,33 +3065,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -3099,7 +3099,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -3111,7 +3111,7 @@ Select { }, Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Raw { "raw": "arrayExists(x -> x.1 == 'int_lbl', labels)", @@ -3139,7 +3139,7 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "duration": 60000, "idxId": 1, "matrix": true, @@ -3148,18 +3148,18 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": null, @@ -3190,35 +3190,35 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "toFloat64OrNull(arrayFirst(x -> x.1 == 'int_lbl', labels).2)", }, "unwrapped", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": null, @@ -3228,56 +3228,56 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, ], ], - "withs": Object { + "withs": { "idx_sel": With { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -3305,33 +3305,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -3339,19 +3339,19 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, "uw_rate_a": With { "alias": "uw_rate_a", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -3362,7 +3362,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -3384,39 +3384,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -3444,33 +3444,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -3478,7 +3478,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -3490,7 +3490,7 @@ Select { }, Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Raw { "raw": "arrayExists(x -> x.1 == 'int_lbl', labels)", @@ -3518,7 +3518,7 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "duration": 60000, "idxId": 1, "matrix": true, @@ -3527,18 +3527,18 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": null, @@ -3569,35 +3569,35 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "toFloat64OrNull(arrayFirst(x -> x.1 == 'int_lbl', labels).2)", }, "unwrapped", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": null, @@ -3607,53 +3607,53 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, "uw_rate_b": With { "alias": "uw_rate_b", "inline": undefined, "query": Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ + "order_expressions": [ "labels", "timestamp_ns", ], - "params": Object {}, + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ Raw { "raw": "arraySort(arrayFilter(x -> arrayExists(y -> x.1 == y, ['fmt']) != 0, labels))", }, "labels", ], - Array [ + [ Raw { "raw": "SUM(unwrapped) / 60", }, "value", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -3661,19 +3661,19 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ WithReference { "ref": With { "alias": "uw_rate_a", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -3684,7 +3684,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -3706,39 +3706,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -3766,33 +3766,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -3800,7 +3800,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -3812,7 +3812,7 @@ Select { }, Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Raw { "raw": "arrayExists(x -> x.1 == 'int_lbl', labels)", @@ -3840,7 +3840,7 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "duration": 60000, "idxId": 1, "matrix": true, @@ -3849,18 +3849,18 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": null, @@ -3891,35 +3891,35 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "toFloat64OrNull(arrayFirst(x -> x.1 == 'int_lbl', labels).2)", }, "unwrapped", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": null, @@ -3929,13 +3929,13 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -3944,14 +3944,14 @@ Select { exports[`shoud transpile unwrap 2`] = ` Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object { + "ctx": { "duration": 60000, "idxId": 1, "matrix": true, @@ -3960,22 +3960,22 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "labels", "asc", ], - Array [ + [ "timestamp_ns", "asc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": null, @@ -4006,72 +4006,72 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "labels", - Array [ + [ Raw { "raw": "intDiv(timestamp_ns, 120000) * 120000", }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "argMin(uw_rate_b.value, uw_rate_b.timestamp_ns)", }, "value", ], ], - "tables": Array [ - Array [ + "tables": [ + [ WithReference { "ref": With { "alias": "uw_rate_b", "inline": undefined, "query": Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ + "order_expressions": [ "labels", "timestamp_ns", ], - "params": Object {}, + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ Raw { "raw": "arraySort(arrayFilter(x -> arrayExists(y -> x.1 == y, ['fmt']) != 0, arraySort(arrayConcat(arrayFilter(x -> arrayExists(y -> y.1 == x.1, extra_labels) == 0, labels), extra_labels))))", }, "labels", ], - Array [ + [ Raw { "raw": "SUM(unwrapped) / 60", }, "value", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -4079,19 +4079,19 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ WithReference { "ref": With { "alias": "uw_rate_a", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -4102,7 +4102,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -4124,39 +4124,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -4184,33 +4184,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -4218,7 +4218,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -4239,9 +4239,9 @@ Select { }, Condition { "column": Conjunction { - "args": Array [ + "args": [ Disjunction { - "args": Array [ + "args": [ Condition { "column": Raw { "raw": "arrayFirstIndex(x -> x.1 == 'int_lbl2', extra_labels)", @@ -4280,7 +4280,7 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "duration": 60000, "idxId": 1, "matrix": true, @@ -4289,18 +4289,18 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": null, @@ -4331,41 +4331,41 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "arrayFilter((x) -> x.2 != '', [('int_lbl2', if(JSONType(samples.string, 'int_val') == 'String', JSONExtractString(samples.string, 'int_val'), JSONExtractRaw(samples.string, 'int_val')))])", }, "extra_labels", ], - Array [ + [ Raw { "raw": "toFloat64OrNull(if(arrayExists(x -> x.1 == 'int_lbl2', extra_labels), arrayFirst(x -> x.1 == 'int_lbl2', extra_labels).2, arrayFirst(x -> x.1 == 'int_lbl2', labels).2))", }, "unwrapped", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": null, @@ -4375,56 +4375,56 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, ], ], - "withs": Object { + "withs": { "idx_sel": With { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -4452,33 +4452,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -4486,19 +4486,19 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, "uw_rate_a": With { "alias": "uw_rate_a", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -4509,7 +4509,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -4531,39 +4531,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -4591,33 +4591,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -4625,7 +4625,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -4646,9 +4646,9 @@ Select { }, Condition { "column": Conjunction { - "args": Array [ + "args": [ Disjunction { - "args": Array [ + "args": [ Condition { "column": Raw { "raw": "arrayFirstIndex(x -> x.1 == 'int_lbl2', extra_labels)", @@ -4687,7 +4687,7 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "duration": 60000, "idxId": 1, "matrix": true, @@ -4696,18 +4696,18 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": null, @@ -4738,41 +4738,41 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "arrayFilter((x) -> x.2 != '', [('int_lbl2', if(JSONType(samples.string, 'int_val') == 'String', JSONExtractString(samples.string, 'int_val'), JSONExtractRaw(samples.string, 'int_val')))])", }, "extra_labels", ], - Array [ + [ Raw { "raw": "toFloat64OrNull(if(arrayExists(x -> x.1 == 'int_lbl2', extra_labels), arrayFirst(x -> x.1 == 'int_lbl2', extra_labels).2, arrayFirst(x -> x.1 == 'int_lbl2', labels).2))", }, "unwrapped", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": null, @@ -4782,53 +4782,53 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, "uw_rate_b": With { "alias": "uw_rate_b", "inline": undefined, "query": Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ + "order_expressions": [ "labels", "timestamp_ns", ], - "params": Object {}, + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ Raw { "raw": "arraySort(arrayFilter(x -> arrayExists(y -> x.1 == y, ['fmt']) != 0, arraySort(arrayConcat(arrayFilter(x -> arrayExists(y -> y.1 == x.1, extra_labels) == 0, labels), extra_labels))))", }, "labels", ], - Array [ + [ Raw { "raw": "SUM(unwrapped) / 60", }, "value", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -4836,19 +4836,19 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ WithReference { "ref": With { "alias": "uw_rate_a", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -4859,7 +4859,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -4881,39 +4881,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -4941,33 +4941,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -4975,7 +4975,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -4996,9 +4996,9 @@ Select { }, Condition { "column": Conjunction { - "args": Array [ + "args": [ Disjunction { - "args": Array [ + "args": [ Condition { "column": Raw { "raw": "arrayFirstIndex(x -> x.1 == 'int_lbl2', extra_labels)", @@ -5037,7 +5037,7 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "duration": 60000, "idxId": 1, "matrix": true, @@ -5046,18 +5046,18 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": null, @@ -5088,41 +5088,41 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "arrayFilter((x) -> x.2 != '', [('int_lbl2', if(JSONType(samples.string, 'int_val') == 'String', JSONExtractString(samples.string, 'int_val'), JSONExtractRaw(samples.string, 'int_val')))])", }, "extra_labels", ], - Array [ + [ Raw { "raw": "toFloat64OrNull(if(arrayExists(x -> x.1 == 'int_lbl2', extra_labels), arrayFirst(x -> x.1 == 'int_lbl2', extra_labels).2, arrayFirst(x -> x.1 == 'int_lbl2', labels).2))", }, "unwrapped", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": null, @@ -5132,13 +5132,13 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -5147,14 +5147,14 @@ Select { exports[`shoud transpile unwrap 3`] = ` Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object { + "ctx": { "duration": 60000, "idxId": 1, "matrix": true, @@ -5163,22 +5163,22 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "labels", "asc", ], - Array [ + [ "timestamp_ns", "asc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": null, @@ -5209,72 +5209,72 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "labels", - Array [ + [ Raw { "raw": "intDiv(timestamp_ns, 120000) * 120000", }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "argMin(uw_rate_b.value, uw_rate_b.timestamp_ns)", }, "value", ], ], - "tables": Array [ - Array [ + "tables": [ + [ WithReference { "ref": With { "alias": "uw_rate_b", "inline": undefined, "query": Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ + "order_expressions": [ "labels", "timestamp_ns", ], - "params": Object {}, + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ Raw { "raw": "arraySort(arrayFilter(x -> arrayExists(y -> x.1 == y, ['int_lbl2']) != 0, arraySort(arrayConcat(arrayFilter(x -> arrayExists(y -> y.1 == x.1, extra_labels) == 0, labels), extra_labels))))", }, "labels", ], - Array [ + [ Raw { "raw": "SUM(unwrapped) / 60", }, "value", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -5282,19 +5282,19 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ WithReference { "ref": With { "alias": "uw_rate_a", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -5305,7 +5305,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -5327,39 +5327,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -5387,33 +5387,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -5421,7 +5421,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -5442,9 +5442,9 @@ Select { }, Condition { "column": Conjunction { - "args": Array [ + "args": [ Disjunction { - "args": Array [ + "args": [ Condition { "column": Raw { "raw": "arrayFirstIndex(x -> x.1 == 'int_lbl', extra_labels)", @@ -5483,7 +5483,7 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "duration": 60000, "idxId": 1, "matrix": true, @@ -5492,18 +5492,18 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": null, @@ -5534,41 +5534,41 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "arrayFilter((x) -> x.2 != '', [('int_lbl2', if(JSONType(samples.string, 'int_val') == 'String', JSONExtractString(samples.string, 'int_val'), JSONExtractRaw(samples.string, 'int_val')))])", }, "extra_labels", ], - Array [ + [ Raw { "raw": "toFloat64OrNull(if(arrayExists(x -> x.1 == 'int_lbl', extra_labels), arrayFirst(x -> x.1 == 'int_lbl', extra_labels).2, arrayFirst(x -> x.1 == 'int_lbl', labels).2))", }, "unwrapped", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": null, @@ -5578,56 +5578,56 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, ], ], - "withs": Object { + "withs": { "idx_sel": With { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -5655,33 +5655,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -5689,19 +5689,19 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, "uw_rate_a": With { "alias": "uw_rate_a", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -5712,7 +5712,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -5734,39 +5734,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -5794,33 +5794,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -5828,7 +5828,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -5849,9 +5849,9 @@ Select { }, Condition { "column": Conjunction { - "args": Array [ + "args": [ Disjunction { - "args": Array [ + "args": [ Condition { "column": Raw { "raw": "arrayFirstIndex(x -> x.1 == 'int_lbl', extra_labels)", @@ -5890,7 +5890,7 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "duration": 60000, "idxId": 1, "matrix": true, @@ -5899,18 +5899,18 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": null, @@ -5941,41 +5941,41 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "arrayFilter((x) -> x.2 != '', [('int_lbl2', if(JSONType(samples.string, 'int_val') == 'String', JSONExtractString(samples.string, 'int_val'), JSONExtractRaw(samples.string, 'int_val')))])", }, "extra_labels", ], - Array [ + [ Raw { "raw": "toFloat64OrNull(if(arrayExists(x -> x.1 == 'int_lbl', extra_labels), arrayFirst(x -> x.1 == 'int_lbl', extra_labels).2, arrayFirst(x -> x.1 == 'int_lbl', labels).2))", }, "unwrapped", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": null, @@ -5985,53 +5985,53 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, "uw_rate_b": With { "alias": "uw_rate_b", "inline": undefined, "query": Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ + "order_expressions": [ "labels", "timestamp_ns", ], - "params": Object {}, + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ Raw { "raw": "arraySort(arrayFilter(x -> arrayExists(y -> x.1 == y, ['int_lbl2']) != 0, arraySort(arrayConcat(arrayFilter(x -> arrayExists(y -> y.1 == x.1, extra_labels) == 0, labels), extra_labels))))", }, "labels", ], - Array [ + [ Raw { "raw": "SUM(unwrapped) / 60", }, "value", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -6039,19 +6039,19 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ WithReference { "ref": With { "alias": "uw_rate_a", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -6062,7 +6062,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -6084,39 +6084,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -6144,33 +6144,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -6178,7 +6178,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -6199,9 +6199,9 @@ Select { }, Condition { "column": Conjunction { - "args": Array [ + "args": [ Disjunction { - "args": Array [ + "args": [ Condition { "column": Raw { "raw": "arrayFirstIndex(x -> x.1 == 'int_lbl', extra_labels)", @@ -6240,7 +6240,7 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "duration": 60000, "idxId": 1, "matrix": true, @@ -6249,18 +6249,18 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": null, @@ -6291,41 +6291,41 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "arrayFilter((x) -> x.2 != '', [('int_lbl2', if(JSONType(samples.string, 'int_val') == 'String', JSONExtractString(samples.string, 'int_val'), JSONExtractRaw(samples.string, 'int_val')))])", }, "extra_labels", ], - Array [ + [ Raw { "raw": "toFloat64OrNull(if(arrayExists(x -> x.1 == 'int_lbl', extra_labels), arrayFirst(x -> x.1 == 'int_lbl', extra_labels).2, arrayFirst(x -> x.1 == 'int_lbl', labels).2))", }, "unwrapped", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": null, @@ -6335,13 +6335,13 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -6350,14 +6350,14 @@ Select { exports[`should transpile aggregation_operator 1`] = ` Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object { + "ctx": { "duration": 300000, "end": 3600000, "idxId": 1, @@ -6367,16 +6367,16 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ + "order_expressions": [ "labels", "timestamp_ns", ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -6407,40 +6407,40 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ Raw { "raw": "arrayFilter(x -> x.1 IN ('label_1'), labels)", }, "labels", ], "timestamp_ns", - Array [ + [ Raw { "raw": "sum(value)", }, "value", ], ], - "tables": Array [ - Array [ + "tables": [ + [ WithReference { "ref": With { "alias": "agg_a", "inline": undefined, "query": Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object { + "ctx": { "duration": 300000, "end": 3600000, "idxId": 1, @@ -6450,22 +6450,22 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "labels", "asc", ], - Array [ + [ "timestamp_ns", "asc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -6496,51 +6496,51 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "labels", - Array [ + [ Raw { "raw": "intDiv(timestamp_ns, undefined) * undefined", }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "argMin(rate_b.value, rate_b.timestamp_ns)", }, "value", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "rate_b", }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, ], ], - "withs": Object { + "withs": { "agg_a": With { "alias": "agg_a", "inline": undefined, "query": Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object { + "ctx": { "duration": 300000, "end": 3600000, "idxId": 1, @@ -6550,22 +6550,22 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "labels", "asc", ], - Array [ + [ "timestamp_ns", "asc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -6596,72 +6596,72 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "labels", - Array [ + [ Raw { "raw": "intDiv(timestamp_ns, undefined) * undefined", }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "argMin(rate_b.value, rate_b.timestamp_ns)", }, "value", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "rate_b", }, ], ], - "withs": Object {}, + "withs": {}, }, }, "idx_sel": With { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -6689,33 +6689,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -6723,19 +6723,19 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, "rate_a": With { "alias": "rate_a", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -6746,7 +6746,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -6768,39 +6768,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -6828,33 +6828,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -6862,7 +6862,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -6874,7 +6874,7 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "duration": 300000, "end": 3600000, "idxId": 1, @@ -6884,18 +6884,18 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -6926,20 +6926,20 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -6947,8 +6947,8 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": "loki.samples_vX", @@ -6958,79 +6958,79 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, "rate_b": With { "alias": "rate_b", "inline": undefined, "query": Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "labels", "asc", ], - Array [ + [ "timestamp_ns", "asc", ], ], - "params": Object {}, + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ Raw { "raw": "labels", }, "labels", ], - Array [ + [ Raw { "raw": "", "toString": [Function], }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "toFloat64(count(1)) * 1000 / 300000", }, "value", ], ], - "tables": Array [ - Array [ + "tables": [ + [ WithReference { "ref": With { "alias": "rate_a", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -7041,7 +7041,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -7063,39 +7063,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -7123,33 +7123,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -7157,7 +7157,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -7169,7 +7169,7 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "duration": 300000, "end": 3600000, "idxId": 1, @@ -7179,18 +7179,18 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -7221,20 +7221,20 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -7242,8 +7242,8 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": "loki.samples_vX", @@ -7253,13 +7253,13 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -7270,14 +7270,14 @@ exports[`should transpile aggregation_operator 2`] = `"WITH idx_sel AS (select \ exports[`should transpile aggregation_operator 3`] = ` Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object { + "ctx": { "duration": 300000, "end": 3600000, "idxId": 2, @@ -7287,16 +7287,16 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ + "order_expressions": [ "labels", "timestamp_ns", ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -7327,40 +7327,40 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ Raw { "raw": "arrayFilter(x -> x.1 IN ('label_1'), labels)", }, "labels", ], "timestamp_ns", - Array [ + [ Raw { "raw": "sum(value)", }, "value", ], ], - "tables": Array [ - Array [ + "tables": [ + [ WithReference { "ref": With { "alias": "agg_a", "inline": undefined, "query": Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object { + "ctx": { "duration": 300000, "end": 3600000, "idxId": 2, @@ -7370,22 +7370,22 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "labels", "asc", ], - Array [ + [ "timestamp_ns", "asc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -7416,51 +7416,51 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "labels", - Array [ + [ Raw { "raw": "intDiv(timestamp_ns, undefined) * undefined", }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "argMin(rate_b.value, rate_b.timestamp_ns)", }, "value", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "rate_b", }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, ], ], - "withs": Object { + "withs": { "agg_a": With { "alias": "agg_a", "inline": undefined, "query": Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object { + "ctx": { "duration": 300000, "end": 3600000, "idxId": 2, @@ -7470,22 +7470,22 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "labels", "asc", ], - Array [ + [ "timestamp_ns", "asc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -7516,72 +7516,72 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "labels", - Array [ + [ Raw { "raw": "intDiv(timestamp_ns, undefined) * undefined", }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "argMin(rate_b.value, rate_b.timestamp_ns)", }, "value", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "rate_b", }, ], ], - "withs": Object {}, + "withs": {}, }, }, "idx_sel": With { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_2.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -7613,33 +7613,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -7647,19 +7647,19 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, "rate_a": With { "alias": "rate_a", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -7670,7 +7670,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -7693,39 +7693,39 @@ Select { "fmt": undefined, "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -7753,33 +7753,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -7787,7 +7787,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -7806,39 +7806,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_2.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -7870,33 +7870,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -7904,7 +7904,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -7925,7 +7925,7 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "duration": 300000, "end": 3600000, "idxId": 2, @@ -7935,18 +7935,18 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -7977,20 +7977,20 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -7998,8 +7998,8 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": "loki.samples_vX", @@ -8009,79 +8009,79 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, "rate_b": With { "alias": "rate_b", "inline": undefined, "query": Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "labels", "asc", ], - Array [ + [ "timestamp_ns", "asc", ], ], - "params": Object {}, + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ Raw { "raw": "labels", }, "labels", ], - Array [ + [ Raw { "raw": "", "toString": [Function], }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "toFloat64(count(1)) * 1000 / 300000", }, "value", ], ], - "tables": Array [ - Array [ + "tables": [ + [ WithReference { "ref": With { "alias": "rate_a", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -8092,7 +8092,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -8115,39 +8115,39 @@ Select { "fmt": undefined, "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -8175,33 +8175,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -8209,7 +8209,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -8228,39 +8228,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_2.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -8292,33 +8292,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -8326,7 +8326,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -8347,7 +8347,7 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "duration": 300000, "end": 3600000, "idxId": 2, @@ -8357,18 +8357,18 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -8399,20 +8399,20 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -8420,8 +8420,8 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": "loki.samples_vX", @@ -8431,13 +8431,13 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -8448,14 +8448,14 @@ exports[`should transpile aggregation_operator 4`] = `"WITH idx_sel AS (select \ exports[`should transpile aggregation_operator 5`] = ` Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object { + "ctx": { "duration": 300000, "end": 3600000, "idxId": 1, @@ -8465,16 +8465,16 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ + "order_expressions": [ "labels", "timestamp_ns", ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -8505,40 +8505,40 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ Raw { "raw": "arrayFilter(x -> x.1 IN ('label_1'), labels)", }, "labels", ], "timestamp_ns", - Array [ + [ Raw { "raw": "sum(value)", }, "value", ], ], - "tables": Array [ - Array [ + "tables": [ + [ WithReference { "ref": With { "alias": "agg_a", "inline": undefined, "query": Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object { + "ctx": { "duration": 300000, "end": 3600000, "idxId": 1, @@ -8548,22 +8548,22 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "labels", "asc", ], - Array [ + [ "timestamp_ns", "asc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -8594,51 +8594,51 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "labels", - Array [ + [ Raw { "raw": "intDiv(timestamp_ns, undefined) * undefined", }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "argMin(rate_b.value, rate_b.timestamp_ns)", }, "value", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "rate_b", }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, ], ], - "withs": Object { + "withs": { "agg_a": With { "alias": "agg_a", "inline": undefined, "query": Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object { + "ctx": { "duration": 300000, "end": 3600000, "idxId": 1, @@ -8648,22 +8648,22 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "labels", "asc", ], - Array [ + [ "timestamp_ns", "asc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -8694,72 +8694,72 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "labels", - Array [ + [ Raw { "raw": "intDiv(timestamp_ns, undefined) * undefined", }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "argMin(rate_b.value, rate_b.timestamp_ns)", }, "value", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "rate_b", }, ], ], - "withs": Object {}, + "withs": {}, }, }, "idx_sel": With { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -8787,33 +8787,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -8821,19 +8821,19 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, "rate_a": With { "alias": "rate_a", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -8844,7 +8844,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -8866,39 +8866,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -8926,33 +8926,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -8960,7 +8960,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -8972,7 +8972,7 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "duration": 300000, "end": 3600000, "idxId": 1, @@ -8982,18 +8982,18 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -9024,20 +9024,20 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -9045,8 +9045,8 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": "loki.samples_vX", @@ -9056,79 +9056,79 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, "rate_b": With { "alias": "rate_b", "inline": undefined, "query": Select { - "aggregations": Array [ + "aggregations": [ "labels", "timestamp_ns", ], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "labels", "asc", ], - Array [ + [ "timestamp_ns", "asc", ], ], - "params": Object {}, + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ Raw { "raw": "labels", }, "labels", ], - Array [ + [ Raw { "raw": "", "toString": [Function], }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "toFloat64(count(1)) * 1000 / 300000", }, "value", ], ], - "tables": Array [ - Array [ + "tables": [ + [ WithReference { "ref": With { "alias": "rate_a", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -9139,7 +9139,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -9161,39 +9161,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -9221,33 +9221,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -9255,7 +9255,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -9267,7 +9267,7 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "duration": 300000, "end": 3600000, "idxId": 1, @@ -9277,18 +9277,18 @@ Select { "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -9319,20 +9319,20 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -9340,8 +9340,8 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": "loki.samples_vX", @@ -9351,13 +9351,13 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -9367,22 +9367,22 @@ Select { exports[`should transpile aggregation_operator 6`] = `"WITH idx_sel AS (select \`sel_1\`.\`fingerprint\` from (select \`fingerprint\` from \`loki\`.\`time_series_gin\` where ((\`key\` = 'minus_nam') and (\`val\` = 'aut illo'))) as \`sel_1\`), rate_a AS (select \`samples\`.\`string\` as \`string\`,\`samples\`.\`fingerprint\` as \`fingerprint\`,samples.timestamp_ns as \`timestamp_ns\` from loki.samples_vX as \`samples\` where ((\`samples\`.\`timestamp_ns\` between 1 and 2) and (\`samples\`.\`type\` in (0,0))) and (samples.fingerprint IN idx_sel) order by \`timestamp_ns\` desc), rate_b AS (select labels as \`labels\`,intDiv(timestamp_ns, 300000) * 300000 as \`timestamp_ns\`,toFloat64(count(1)) * 1000 / 300000 as \`value\` from rate_a group by \`labels\`,\`timestamp_ns\` order by \`labels\` asc,\`timestamp_ns\` asc), agg_a AS (select \`labels\`,intDiv(timestamp_ns, undefined) * undefined as \`timestamp_ns\`,argMin(rate_b.value, rate_b.timestamp_ns) as \`value\` from \`rate_b\` group by \`labels\`,\`timestamp_ns\` order by \`labels\` asc,\`timestamp_ns\` asc) select arrayFilter(x -> x.1 IN ('label_1'), labels) as \`labels\`,\`timestamp_ns\`,sum(value) as \`value\` from agg_a group by \`labels\`,\`timestamp_ns\` order by \`labels\`,\`timestamp_ns\`"`; exports[`should transpile complex pipelines 1`] = ` -Object { +{ "duration": 1000, "matrix": false, "query": "WITH str_sel AS (select DISTINCT \`fingerprint\` from loki.time_series where ((JSONHas(labels, 'test_id') = 1) and (JSONExtractString(labels, 'test_id') = '\${testID}')) and ((JSONHas(labels, 'freq') = 1) and (toFloat64OrNull(JSONExtractString(labels, 'freq')) >= '4'))), sel_a AS (select \`samples\`.\`string\` as \`string\`,\`samples\`.\`fingerprint\` as \`fingerprint\`,samples.timestamp_ns as \`timestamp_ns\`,JSONExtractKeysAndValues(time_series.labels, 'String') as \`labels\` from loki.samples_vX as \`samples\` left any join \`loki\`.\`time_series\` AS time_series on \`samples\`.\`fingerprint\` = time_series.fingerprint where ((\`samples\`.\`timestamp_ns\` between 0000000 and 100000000000000) and (\`samples\`.\`type\` in (0,0))) and (\`samples\`.\`fingerprint\` in (select \`fingerprint\` from str_sel)) order by \`timestamp_ns\` asc limit 1000) select * from sel_a order by \`labels\` asc,\`timestamp_ns\` asc", - "stream": Array [], + "stream": [], } `; exports[`should transpile json requests 1`] = ` Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -9393,7 +9393,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -9415,39 +9415,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -9475,33 +9475,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -9509,7 +9509,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -9530,30 +9530,30 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "idxId": 1, }, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, - "limits": Object { + "limits": { "number": Parameter { "name": "limit", "value": 3, }, "offset": undefined, }, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -9580,35 +9580,35 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], }, "timestamp_ns", ], - Array [ + [ Raw { "raw": "arrayFilter((x) -> x.2 != '', [('odit_iusto', if(JSONType(samples.string, 'dicta') == 'String', JSONExtractString(samples.string, 'dicta'), JSONExtractRaw(samples.string, 'dicta')))])", }, "extra_labels", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": "loki.samples_vX", @@ -9618,44 +9618,44 @@ Select { }, ], ], - "withs": Object { + "withs": { "idx_sel": With { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -9683,33 +9683,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -9717,7 +9717,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -9725,23 +9725,23 @@ Select { `; exports[`should transpile json requests 2`] = ` -Array [ - Object { - "labels": Object { +[ + { + "labels": { "autem_quis": "quidem sit", "l1": "v3", "l2": "v2", "l3": "v4", }, - "string": "{\\"l1\\":\\"v3\\",\\"l3\\":\\"v4\\"}", + "string": "{\"l1\":\"v3\",\"l3\":\"v4\"}", }, ] `; exports[`should transpile line format 1`] = ` -Array [ - Object { - "labels": Object { +[ + { + "labels": { "int": 10, "lbl1": "a", }, @@ -9751,23 +9751,23 @@ Array [ `; exports[`should transpile line format 2`] = ` -Array [ - Object { - "labels": Object { +[ + { + "labels": { "entry": "str", "int": 10, "intval": "5", "lbl1": "a", }, - "string": "{ \\"entry\\": \\"str\\", \\"intval\\": 5 }", + "string": "{ \"entry\": \"str\", \"intval\": 5 }", }, ] `; exports[`should transpile line format 3`] = ` -Array [ - Object { - "labels": Object { +[ + { + "labels": { "entry": "str", "int": 10, "intval": "5", @@ -9776,7 +9776,7 @@ Array [ "timestamp_ns": "0", "value": 5, }, - Object { + { "EOF": true, }, ] @@ -9784,12 +9784,12 @@ Array [ exports[`should transpile log_stream_selector 1`] = ` Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -9800,7 +9800,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -9822,19 +9822,19 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [ - Object { - "conditions": Array [ + "joins": [ + { + "conditions": [ Condition { "column": Term { "term": "sel_1.fingerprint", @@ -9850,12 +9850,12 @@ Select { "term": "sel_2", }, "sel": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -9883,33 +9883,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, "type": " inner any ", @@ -9917,26 +9917,26 @@ Select { ], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -9964,33 +9964,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -9998,7 +9998,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -10010,30 +10010,30 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "idxId": 2, }, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, - "limits": Object { + "limits": { "number": Parameter { "name": "limit", "value": 3, }, "offset": undefined, }, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -10060,20 +10060,20 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -10081,8 +10081,8 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": "loki.samples_vX", @@ -10092,24 +10092,24 @@ Select { }, ], ], - "withs": Object { + "withs": { "idx_sel": With { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [ - Object { - "conditions": Array [ + "joins": [ + { + "conditions": [ Condition { "column": Term { "term": "sel_1.fingerprint", @@ -10125,12 +10125,12 @@ Select { "term": "sel_2", }, "sel": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -10158,33 +10158,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, "type": " inner any ", @@ -10192,26 +10192,26 @@ Select { ], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -10239,33 +10239,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -10273,7 +10273,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -10284,12 +10284,12 @@ exports[`should transpile log_stream_selector 2`] = `"WITH idx_sel AS (select \` exports[`should transpile log_stream_selector 3`] = ` Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -10300,7 +10300,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -10322,39 +10322,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -10386,33 +10386,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -10420,7 +10420,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -10432,30 +10432,30 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "idxId": 1, }, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, - "limits": Object { + "limits": { "number": Parameter { "name": "limit", "value": 3, }, "offset": undefined, }, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -10482,20 +10482,20 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -10503,8 +10503,8 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": "loki.samples_vX", @@ -10514,44 +10514,44 @@ Select { }, ], ], - "withs": Object { + "withs": { "idx_sel": With { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -10583,33 +10583,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -10617,7 +10617,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -10628,12 +10628,12 @@ exports[`should transpile log_stream_selector 4`] = `"WITH idx_sel AS (select \` exports[`should transpile log_stream_selector 5`] = ` Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -10644,7 +10644,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -10666,39 +10666,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -10726,33 +10726,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -10760,7 +10760,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -10772,30 +10772,30 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "idxId": 1, }, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, - "limits": Object { + "limits": { "number": Parameter { "name": "limit", "value": 3, }, "offset": undefined, }, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -10822,20 +10822,20 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -10843,8 +10843,8 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": "loki.samples_vX", @@ -10854,44 +10854,44 @@ Select { }, ], ], - "withs": Object { + "withs": { "idx_sel": With { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -10919,33 +10919,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -10953,7 +10953,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -10964,12 +10964,12 @@ exports[`should transpile log_stream_selector 6`] = `"WITH idx_sel AS (select \` exports[`should transpile log_stream_selector 7`] = ` Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -10980,7 +10980,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -11002,39 +11002,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -11066,33 +11066,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -11100,7 +11100,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -11112,30 +11112,30 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "idxId": 1, }, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, - "limits": Object { + "limits": { "number": Parameter { "name": "limit", "value": 3, }, "offset": undefined, }, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -11162,20 +11162,20 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -11183,8 +11183,8 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": "loki.samples_vX", @@ -11194,44 +11194,44 @@ Select { }, ], ], - "withs": Object { + "withs": { "idx_sel": With { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -11263,33 +11263,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -11297,7 +11297,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -11308,12 +11308,12 @@ exports[`should transpile log_stream_selector 8`] = `"WITH idx_sel AS (select \` exports[`should transpile log_stream_selector with stream filter 1`] = ` Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -11324,7 +11324,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -11346,19 +11346,19 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [ - Object { - "conditions": Array [ + "joins": [ + { + "conditions": [ Condition { "column": Term { "term": "sel_1.fingerprint", @@ -11374,12 +11374,12 @@ Select { "term": "sel_2", }, "sel": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -11407,33 +11407,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, "type": " inner any ", @@ -11441,26 +11441,26 @@ Select { ], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -11488,33 +11488,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -11522,7 +11522,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -11543,30 +11543,30 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "idxId": 2, }, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, - "limits": Object { + "limits": { "number": Parameter { "name": "limit", "value": 3, }, "offset": undefined, }, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -11593,20 +11593,20 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -11614,8 +11614,8 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": "loki.samples_vX", @@ -11625,24 +11625,24 @@ Select { }, ], ], - "withs": Object { + "withs": { "idx_sel": With { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [ - Object { - "conditions": Array [ + "joins": [ + { + "conditions": [ Condition { "column": Term { "term": "sel_1.fingerprint", @@ -11658,12 +11658,12 @@ Select { "term": "sel_2", }, "sel": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -11691,33 +11691,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, "type": " inner any ", @@ -11725,26 +11725,26 @@ Select { ], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -11772,33 +11772,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -11806,7 +11806,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -11817,12 +11817,12 @@ exports[`should transpile log_stream_selector with stream filter 2`] = `"WITH id exports[`should transpile log_stream_selector with stream filter 3`] = ` Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -11833,7 +11833,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -11855,39 +11855,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -11919,33 +11919,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -11953,7 +11953,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -11974,30 +11974,30 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "idxId": 1, }, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, - "limits": Object { + "limits": { "number": Parameter { "name": "limit", "value": 3, }, "offset": undefined, }, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -12024,20 +12024,20 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -12045,8 +12045,8 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": "loki.samples_vX", @@ -12056,44 +12056,44 @@ Select { }, ], ], - "withs": Object { + "withs": { "idx_sel": With { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -12125,33 +12125,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -12159,7 +12159,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -12170,12 +12170,12 @@ exports[`should transpile log_stream_selector with stream filter 4`] = `"WITH id exports[`should transpile log_stream_selector with stream filter 5`] = ` Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -12186,7 +12186,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -12208,39 +12208,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -12268,33 +12268,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -12302,7 +12302,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -12323,30 +12323,30 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "idxId": 1, }, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, - "limits": Object { + "limits": { "number": Parameter { "name": "limit", "value": 3, }, "offset": undefined, }, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -12373,20 +12373,20 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -12394,8 +12394,8 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": "loki.samples_vX", @@ -12405,44 +12405,44 @@ Select { }, ], ], - "withs": Object { + "withs": { "idx_sel": With { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -12470,33 +12470,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -12504,7 +12504,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -12515,12 +12515,12 @@ exports[`should transpile log_stream_selector with stream filter 6`] = `"WITH id exports[`should transpile log_stream_selector with stream filter 7`] = ` Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Raw { "raw": "", "toString": [Function], @@ -12531,7 +12531,7 @@ Select { }, "operator": "in", "value": Value { - "value": Array [ + "value": [ 0, 0, ], @@ -12553,39 +12553,39 @@ Select { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -12617,33 +12617,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -12651,7 +12651,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -12672,30 +12672,30 @@ Select { }, ], }, - "ctx": Object { + "ctx": { "idxId": 1, }, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, - "limits": Object { + "limits": { "number": Parameter { "name": "limit", "value": 3, }, "offset": undefined, }, - "order_expressions": Array [ - Array [ + "order_expressions": [ + [ "timestamp_ns", "desc", ], ], - "params": Object { + "params": { "from": Parameter { "name": "from", "value": 1, @@ -12722,20 +12722,20 @@ Select { }, }, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ - Array [ + "select_list": [ + [ "samples.string", "string", ], - Array [ + [ "samples.fingerprint", "fingerprint", ], - Array [ + [ Raw { "raw": "", "toString": [Function], @@ -12743,8 +12743,8 @@ Select { "timestamp_ns", ], ], - "tables": Array [ - Array [ + "tables": [ + [ Parameter { "name": "samplesTable", "value": "loki.samples_vX", @@ -12754,44 +12754,44 @@ Select { }, ], ], - "withs": Object { + "withs": { "idx_sel": With { "alias": "idx_sel", "inline": undefined, "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [], + "args": [], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "sel_1.fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Subquery { "query": Select { - "aggregations": Array [], + "aggregations": [], "conditions": Conjunction { - "args": Array [ + "args": [ Condition { "column": Conjunction { - "args": Array [ + "args": [ Condition { "column": Term { "term": "key", @@ -12823,33 +12823,33 @@ Select { }, ], }, - "ctx": Object {}, + "ctx": {}, "dist": false, "fmt": undefined, "having_conditions": Conjunction { - "args": Array [], + "args": [], }, - "joins": Array [], + "joins": [], "limitbycolumns": undefined, "limits": undefined, - "order_expressions": Array [], - "params": Object {}, + "order_expressions": [], + "params": {}, "preconditions": Conjunction { - "args": Array [], + "args": [], }, "request_totals": undefined, "sampling": undefined, - "select_list": Array [ + "select_list": [ "fingerprint", ], - "tables": Array [ - Array [ + "tables": [ + [ Term { "term": "loki.time_series_gin", }, ], ], - "withs": Object {}, + "withs": {}, }, }, Term { @@ -12857,7 +12857,7 @@ Select { }, ], ], - "withs": Object {}, + "withs": {}, }, }, }, @@ -12867,83 +12867,83 @@ Select { exports[`should transpile log_stream_selector with stream filter 8`] = `"WITH idx_sel AS (select \`sel_1\`.\`fingerprint\` from (select \`fingerprint\` from \`loki\`.\`time_series_gin\` where ((\`key\` = 'rerum_laborum') and (match(val, '^con.+q.at[a-z]r') = 0))) as \`sel_1\`) select \`samples\`.\`string\` as \`string\`,\`samples\`.\`fingerprint\` as \`fingerprint\`,samples.timestamp_ns as \`timestamp_ns\` from loki.samples_vX as \`samples\` where ((\`samples\`.\`timestamp_ns\` between 1 and 2) and (\`samples\`.\`type\` in (0,0))) and (samples.fingerprint IN idx_sel) and (match(string, 'cons[eE][^ ]+r nam soluta') = 0) order by \`timestamp_ns\` desc limit 3"`; exports[`should transpile logfmt requests 1`] = ` -Array [ - Object { - "labels": Object { +[ + { + "labels": { "autem_quis": "quidem sit", "l1": "v3", "l2": "v2", "l3": "v4", }, - "string": "l1=\\"v3\\" l3=\\"v4\\" ", + "string": "l1=\"v3\" l3=\"v4\" ", }, ] `; exports[`should transpile new style 1 1`] = ` -Object { +{ "duration": 1000, "matrix": false, "query": "WITH str_sel AS (select DISTINCT \`fingerprint\` from loki.time_series where ((JSONHas(labels, 'test_id') = 1) and (JSONExtractString(labels, 'test_id') = '0.7387779420506657'))), sel_a AS (select \`samples\`.\`string\` as \`string\`,\`samples\`.\`fingerprint\` as \`fingerprint\`,samples.timestamp_ns as \`timestamp_ns\` from loki.samples_vX as \`samples\` where ((\`samples\`.\`timestamp_ns\` between 1638802620000000000 and 1638803220000000000) and (\`samples\`.\`type\` in (0,0))) and (\`samples\`.\`fingerprint\` in (select \`fingerprint\` from str_sel)) order by \`timestamp_ns\` desc limit 2000) select JSONExtractKeysAndValues(time_series.labels, 'String') as \`labels\`,sel_a.* from sel_a left any join \`loki\`.\`time_series\` AS time_series on \`sel_a\`.\`fingerprint\` = time_series.fingerprint order by \`labels\` desc,\`timestamp_ns\` desc", - "stream": Array [], + "stream": [], } `; exports[`should transpile new style 2 1`] = ` -Object { +{ "duration": 1000, "matrix": false, "query": "WITH str_sel AS (select DISTINCT \`fingerprint\` from loki.time_series where ((JSONHas(labels, 'test_id') = 1) and (JSONExtractString(labels, 'test_id') = '0.2119268970232')) and ((JSONHas(labels, 'freq') = 1) and (JSONExtractString(labels, 'freq') = '2'))), sel_a AS (select \`samples\`.\`string\` as \`string\`,\`samples\`.\`fingerprint\` as \`fingerprint\`,samples.timestamp_ns as \`timestamp_ns\` from loki.samples_vX as \`samples\` where ((\`samples\`.\`timestamp_ns\` between 1638802620000000000 and 1638803220000000000) and (\`samples\`.\`type\` in (0,0))) and (\`samples\`.\`fingerprint\` in (select \`fingerprint\` from str_sel)) and (match(string, '2[0-9]$') = 1) order by \`timestamp_ns\` desc limit 2000) select JSONExtractKeysAndValues(time_series.labels, 'String') as \`labels\`,sel_a.* from sel_a left any join \`loki\`.\`time_series\` AS time_series on \`sel_a\`.\`fingerprint\` = time_series.fingerprint order by \`labels\` desc,\`timestamp_ns\` desc", - "stream": Array [], + "stream": [], } `; exports[`should transpile new style 3 1`] = ` -Object { +{ "duration": 1000, "matrix": true, "query": "WITH str_sel AS (select DISTINCT \`fingerprint\` from loki.time_series where ((JSONHas(labels, 'test_id') = 1) and (JSONExtractString(labels, 'test_id') = '0.7026038163617259')) and ((JSONHas(labels, 'freq') = 1) and (JSONExtractString(labels, 'freq') = '2'))), rate_a AS (select \`samples\`.\`string\` as \`string\`,\`samples\`.\`fingerprint\` as \`fingerprint\`,intDiv(samples.timestamp_ns, 1000000) as \`timestamp_ns\`,JSONExtractKeysAndValues(time_series.labels, 'String') as \`labels\` from loki.samples_vX as \`samples\` left any join \`loki\`.\`time_series\` AS time_series on \`samples\`.\`fingerprint\` = time_series.fingerprint where ((\`samples\`.\`timestamp_ns\` between 1638802620000000000 and 1638803220000000000) and (\`samples\`.\`type\` in (0,0))) and (\`samples\`.\`fingerprint\` in (select \`fingerprint\` from str_sel)) and (match(string, '2[0-9]$') = 1) order by \`timestamp_ns\` desc), rate_b AS (select labels as \`labels\`,intDiv(timestamp_ns, 1000) * 1000 as \`timestamp_ns\`,toFloat64(count(1)) * 1000 / 1000 as \`value\` from rate_a group by \`labels\`,\`timestamp_ns\` order by \`labels\` asc,\`timestamp_ns\` asc) select \`labels\`,intDiv(timestamp_ns, 2000) * 2000 as \`timestamp_ns\`,argMin(rate_b.value, rate_b.timestamp_ns) as \`value\` from \`rate_b\` group by \`labels\`,\`timestamp_ns\` order by \`labels\` asc,\`timestamp_ns\` asc", - "stream": Array [], + "stream": [], } `; exports[`should transpile new style 4 1`] = ` -Object { +{ "duration": 1000, "matrix": true, "query": "WITH str_sel AS (select DISTINCT \`fingerprint\` from loki.time_series where ((JSONHas(labels, 'test_id') = 1) and (JSONExtractString(labels, 'test_id') = '0.7026038163617259')) and ((JSONHas(labels, 'freq') = 1) and (JSONExtractString(labels, 'freq') = '2'))) select \`labels\`,toUInt64(intDiv(timestamp_ns, 1000000000) * 1000) as \`timestamp_ns\`,toFloat64(0) as \`value\` from loki.samples_vX as \`samples\` left any join \`loki\`.\`time_series\` AS time_series on \`samples\`.\`fingerprint\` = time_series.fingerprint where ((\`samples\`.\`timestamp_ns\` between 1638802620000000000 and 1638803220000000000) and (\`samples\`.\`type\` in (0,0))) and (\`samples\`.\`fingerprint\` in (select \`fingerprint\` from str_sel)) and (match(string, '2[0-9]$') = 1) group by \`labels\`,\`timestamp_ns\` order by \`labels\` asc,\`timestamp_ns\` asc", - "stream": Array [ + "stream": [ [Function], ], } `; exports[`should transpile new style 5 1`] = ` -Object { +{ "duration": 1000, "matrix": false, "query": "WITH str_sel AS (select DISTINCT \`fingerprint\` from loki.time_series where ((JSONHas(labels, 'test_id') = 1) and (JSONExtractString(labels, 'test_id') = '0.000341166036469831_json'))), sel_a AS (select \`samples\`.\`string\` as \`string\`,\`samples\`.\`fingerprint\` as \`fingerprint\`,samples.timestamp_ns as \`timestamp_ns\`,JSONExtractKeysAndValues(time_series.labels, 'String') as \`labels\` from loki.samples_vX as \`samples\` left any join \`loki\`.\`time_series\` AS time_series on \`samples\`.\`fingerprint\` = time_series.fingerprint where ((\`samples\`.\`timestamp_ns\` between 1638802620000000000 and 1638803220000000000) and (\`samples\`.\`type\` in (0,0))) and (\`samples\`.\`fingerprint\` in (select \`fingerprint\` from str_sel)) order by \`timestamp_ns\` desc limit 2000) select * from sel_a order by \`labels\` desc,\`timestamp_ns\` desc", - "stream": Array [ + "stream": [ [Function], ], } `; exports[`should transpile new style 6 1`] = ` -Object { +{ "duration": 1000, "matrix": false, "query": "WITH str_sel AS (select DISTINCT \`fingerprint\` from loki.time_series where ((JSONHas(labels, 'test_id') = 1) and (JSONExtractString(labels, 'test_id') = '0.2053747382122484_json'))), sel_a AS (select \`samples\`.\`string\` as \`string\`,\`samples\`.\`fingerprint\` as \`fingerprint\`,samples.timestamp_ns as \`timestamp_ns\`,JSONExtractKeysAndValues(time_series.labels, 'String') as \`labels\`,arrayFilter((x) -> x.2 != '', [('lbl_repl', if(JSONType(samples.string, 'new_lbl') == 'String', JSONExtractString(samples.string, 'new_lbl'), JSONExtractRaw(samples.string, 'new_lbl')))]) as \`extra_labels\` from loki.samples_vX as \`samples\` left any join \`loki\`.\`time_series\` AS time_series on \`samples\`.\`fingerprint\` = time_series.fingerprint where ((\`samples\`.\`timestamp_ns\` between 1638802620000000000 and 1638803220000000000) and (\`samples\`.\`type\` in (0,0))) and (\`samples\`.\`fingerprint\` in (select \`fingerprint\` from str_sel)) and (isValidJSON(samples.string) = 1) and ((indexOf(extra_labels, ('lbl_repl', 'new_val')) > 0) or ((arrayExists(x -> x.1 == 'lbl_repl', extra_labels) = 0) and ((arrayExists(x -> x.1 == 'lbl_repl', labels) = 1) and (arrayFirst(x -> x.1 == 'lbl_repl', labels).2 = 'new_val')))) order by \`timestamp_ns\` desc limit 2000) select * from sel_a order by \`labels\` desc,\`timestamp_ns\` desc", - "stream": Array [], + "stream": [], } `; exports[`should transpile new style 7 1`] = ` -Object { +{ "duration": 3000, "matrix": true, "query": "WITH str_sel AS (select DISTINCT \`fingerprint\` from loki.time_series where ((JSONHas(labels, 'test_id') = 1) and (JSONExtractString(labels, 'test_id') = '0.1547558751138609_json'))) select \`samples\`.\`string\` as \`string\`,\`samples\`.\`fingerprint\` as \`fingerprint\`,intDiv(samples.timestamp_ns, 1000000) as \`timestamp_ns\`,JSONExtractKeysAndValues(time_series.labels, 'String') as \`labels\` from loki.samples_vX as \`samples\` left any join \`loki\`.\`time_series\` AS time_series on \`samples\`.\`fingerprint\` = time_series.fingerprint where ((\`samples\`.\`timestamp_ns\` between 1638802620000000000 and 1638803220000000000) and (\`samples\`.\`type\` in (0,0))) and (\`samples\`.\`fingerprint\` in (select \`fingerprint\` from str_sel)) order by \`timestamp_ns\` desc", - "stream": Array [ + "stream": [ [Function], [Function], [Function], @@ -12955,11 +12955,11 @@ Object { `; exports[`should transpile new style 8 1`] = ` -Object { +{ "duration": 1000, "matrix": true, "query": "WITH str_sel AS (select DISTINCT \`fingerprint\` from loki.time_series where ((JSONHas(labels, 'test_id') = 1) and (JSONExtractString(labels, 'test_id') = '0.4075242197275857'))) select \`samples\`.\`string\` as \`string\`,\`samples\`.\`fingerprint\` as \`fingerprint\`,intDiv(samples.timestamp_ns, 1000000) as \`timestamp_ns\`,JSONExtractKeysAndValues(time_series.labels, 'String') as \`labels\` from loki.samples_vX as \`samples\` left any join \`loki\`.\`time_series\` AS time_series on \`samples\`.\`fingerprint\` = time_series.fingerprint where ((\`samples\`.\`timestamp_ns\` between 1638802620000000000 and 1638803220000000000) and (\`samples\`.\`type\` in (0,0))) and (\`samples\`.\`fingerprint\` in (select \`fingerprint\` from str_sel)) order by \`timestamp_ns\` desc", - "stream": Array [ + "stream": [ [Function], [Function], [Function], @@ -12971,38 +12971,38 @@ Object { `; exports[`should transpile new style 9 1`] = ` -Object { +{ "duration": 1000, "matrix": false, "query": "WITH str_sel AS (select DISTINCT \`fingerprint\` from loki.time_series where ((JSONHas(labels, 'test_id') = 1) and (JSONExtractString(labels, 'test_id') = '0.7186063017626447_json'))), sel_a AS (select \`samples\`.\`string\` as \`string\`,\`samples\`.\`fingerprint\` as \`fingerprint\`,samples.timestamp_ns as \`timestamp_ns\`,JSONExtractKeysAndValues(time_series.labels, 'String') as \`labels\`,arrayFilter((x) -> x.2 != '', [('sid', if(JSONType(samples.string, 'str_id') == 'String', JSONExtractString(samples.string, 'str_id'), JSONExtractRaw(samples.string, 'str_id')))]) as \`extra_labels\` from loki.samples_vX as \`samples\` left any join \`loki\`.\`time_series\` AS time_series on \`samples\`.\`fingerprint\` = time_series.fingerprint where ((\`samples\`.\`timestamp_ns\` between 1638802620000000000 and 1638803220000000000) and (\`samples\`.\`type\` in (0,0))) and (\`samples\`.\`fingerprint\` in (select \`fingerprint\` from str_sel)) and (isValidJSON(samples.string) = 1) and ((arrayExists(x -> x.1 == 'sid' AND (coalesce(toFloat64OrNull(x.2) >= '598', 0)), extra_labels) != 0) or ((arrayExists(x -> x.1 == 'sid', extra_labels) = 0) and (arrayExists(x -> x.1 == 'sid', labels) = 1) and (toFloat64OrNull(arrayFirst(x -> x.1 == 'sid', labels).2) >= '598'))) order by \`timestamp_ns\` desc limit 2000) select * from sel_a order by \`labels\` desc,\`timestamp_ns\` desc", - "stream": Array [], + "stream": [], } `; exports[`should transpile new style 10 1`] = ` -Object { +{ "duration": 1000, "matrix": false, "query": "WITH str_sel AS (select DISTINCT \`fingerprint\` from loki.time_series where ((JSONHas(labels, 'test_id') = 1) and (JSONExtractString(labels, 'test_id') = '0.5505504081219323'))), sel_a AS (select \`samples\`.\`string\` as \`string\`,\`samples\`.\`fingerprint\` as \`fingerprint\`,samples.timestamp_ns as \`timestamp_ns\`,JSONExtractKeysAndValues(time_series.labels, 'String') as \`labels\`,arrayFilter(x -> x.1 != '' AND x.2 != '', arrayZip(['e'], arrayMap(x -> x[length(x)], extractAllGroupsHorizontal(string, '^([^0-9]+)[0-9]+$')))) as \`extra_labels\` from loki.samples_vX as \`samples\` left any join \`loki\`.\`time_series\` AS time_series on \`samples\`.\`fingerprint\` = time_series.fingerprint where ((\`samples\`.\`timestamp_ns\` between 1638802620000000000 and 1638803220000000000) and (\`samples\`.\`type\` in (0,0))) and (\`samples\`.\`fingerprint\` in (select \`fingerprint\` from str_sel)) order by \`timestamp_ns\` desc limit 2000) select * from sel_a order by \`labels\` desc,\`timestamp_ns\` desc", - "stream": Array [], + "stream": [], } `; exports[`should transpile new style 11 1`] = ` -Object { +{ "duration": 1000, "matrix": true, "query": "WITH str_sel AS (select DISTINCT \`fingerprint\` from loki.time_series where ((JSONHas(labels, 'label') = 1) and (JSONExtractString(labels, 'label') = 'val'))), uw_rate_a AS (select \`samples\`.\`string\` as \`string\`,\`samples\`.\`fingerprint\` as \`fingerprint\`,intDiv(samples.timestamp_ns, 1000000) as \`timestamp_ns\`,JSONExtractKeysAndValues(time_series.labels, 'String') as \`labels\`,toFloat64OrNull(arrayFirst(x -> x.1 == 'b', labels).2) as \`unwrapped\` from loki.samples_vX as \`samples\` left any join \`loki\`.\`time_series\` AS time_series on \`samples\`.\`fingerprint\` = time_series.fingerprint where ((\`samples\`.\`timestamp_ns\` between 1638802620000000000 and 1638803220000000000) and (\`samples\`.\`type\` in (0,0))) and (\`samples\`.\`fingerprint\` in (select \`fingerprint\` from str_sel)) and ((arrayExists(x -> x.1 == 'b', labels) = 1) and (isNotNull(unwrapped) = 1)) order by \`timestamp_ns\` desc), uw_rate_b AS (select labels as \`labels\`,SUM(unwrapped) / 1 as \`value\`,intDiv(timestamp_ns, 1000) * 1000 as \`timestamp_ns\` from uw_rate_a group by \`labels\`,\`timestamp_ns\` order by \`labels\`,\`timestamp_ns\`) select \`labels\`,intDiv(timestamp_ns, 2000) * 2000 as \`timestamp_ns\`,argMin(uw_rate_b.value, uw_rate_b.timestamp_ns) as \`value\` from uw_rate_b group by \`labels\`,\`timestamp_ns\` order by \`labels\` asc,\`timestamp_ns\` asc", - "stream": Array [], + "stream": [], } `; exports[`should transpile new style 12 1`] = ` -Object { +{ "duration": 1000, "matrix": false, "query": "WITH str_sel AS (select DISTINCT \`fingerprint\` from loki.time_series where ((JSONHas(labels, 'freq') = 1) and (JSONExtractString(labels, 'freq') = '1'))), sel_a AS (select \`samples\`.\`string\` as \`string\`,\`samples\`.\`fingerprint\` as \`fingerprint\`,samples.timestamp_ns as \`timestamp_ns\`,JSONExtractKeysAndValues(time_series.labels, 'String') as \`labels\` from loki.samples_vX as \`samples\` left any join \`loki\`.\`time_series\` AS time_series on \`samples\`.\`fingerprint\` = time_series.fingerprint where ((\`samples\`.\`timestamp_ns\` between 1638802620000000000 and 1638803220000000000) and (\`samples\`.\`type\` in (0,0))) and (\`samples\`.\`fingerprint\` in (select \`fingerprint\` from str_sel)) order by \`timestamp_ns\` desc limit 2000) select * from sel_a order by \`labels\` desc,\`timestamp_ns\` desc", - "stream": Array [ + "stream": [ [Function], [Function], ], @@ -13010,15 +13010,15 @@ Object { `; exports[`should transpile plugins 1`] = ` -Array [ - Object { - "labels": Object { +[ + { + "labels": { "lbl1": "a", }, "timestamp_ns": "0", "value": 10, }, - Object { + { "EOF": true, }, ] @@ -13027,8 +13027,8 @@ Array [ exports[`should transpile series 1`] = `"WITH idx_sel AS ((select \`sel_1\`.\`fingerprint\` from (select \`fingerprint\` from \`loki\`.\`time_series_gin\` where ((\`key\` = 'test_id') and (\`val\` = '123'))) as \`sel_1\`)) select DISTINCT \`fingerprint\`,\`labels\` from loki.time_series where (\`fingerprint\` in (idx_sel)) and (1 == 1)"`; exports[`should transpile tail 1`] = ` -Object { +{ "query": "WITH str_sel AS (select DISTINCT \`fingerprint\` from loki.time_series where ((JSONHas(labels, 'test_id') = 1) and (extractAllGroups(JSONExtractString(labels, 'test_id'), '(_ws)') != '[]'))) select \`samples\`.\`string\` as \`string\`,\`samples\`.\`fingerprint\` as \`fingerprint\`,samples.timestamp_ns as \`timestamp_ns\`,JSONExtractKeysAndValues(time_series.labels, 'String') as \`labels\` from loki.samples_v3 as \`samples\` left any join \`loki\`.\`time_series\` AS time_series on \`samples\`.\`fingerprint\` = time_series.fingerprint where ((\`samples\`.\`timestamp_ns\` > (toUnixTimestamp(now()) - 5) * 1000000000) and (\`samples\`.\`type\` in (0,0))) and (\`samples\`.\`fingerprint\` in (select \`fingerprint\` from str_sel)) order by \`timestamp_ns\` asc", - "stream": Array [], + "stream": [], } `; From b24e9192bbfbf103e96b745fd21a30fef298f672 Mon Sep 17 00:00:00 2001 From: akvlad Date: Tue, 3 Sep 2024 15:28:59 +0300 Subject: [PATCH 3/4] tests upd --- test/e2e | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e b/test/e2e index 14260227..929315ed 160000 --- a/test/e2e +++ b/test/e2e @@ -1 +1 @@ -Subproject commit 142602272531e9cb4548d6d4bbd5ffe0329a9ca4 +Subproject commit 929315ed5dc45d59055a5a240015f7b7c22f5504 From 44886ae79ba71c613e096b77e08c165f2afe8f72 Mon Sep 17 00:00:00 2001 From: akvlad Date: Tue, 3 Sep 2024 16:02:06 +0300 Subject: [PATCH 4/4] uncomment pako --- qryn_node.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qryn_node.js b/qryn_node.js index 6a10b4e4..38e48349 100755 --- a/qryn_node.js +++ b/qryn_node.js @@ -124,7 +124,7 @@ let fastify = require('fastify')({ done() })) await fastify.register(require('@fastify/compress'), { - encodings: ['gzip']/*, + encodings: ['gzip'], zlib: { createGzip: () => { const deflator = new pako.Deflate({ gzip: true }) @@ -152,7 +152,7 @@ let fastify = require('fastify')({ } return res } - }*/ + } }) await fastify.register(require('@fastify/url-data')) await fastify.register(require('@fastify/websocket'))