From 5dce28fb99dcd17d0ba0671be55c1cf0298d5d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wieland=20Sch=C3=B6bl?= Date: Wed, 7 Jul 2021 10:18:46 +0200 Subject: [PATCH] refactor: update dependencies --- package-lock.json | 200 +++++++++++++++++++++++----- package.json | 6 +- src/storage/elasticsearch/common.ts | 3 +- src/storage/elasticsearch/query.ts | 19 ++- 4 files changed, 180 insertions(+), 48 deletions(-) diff --git a/package-lock.json b/package-lock.json index 11cb3a1c..c0ff0d50 100644 --- a/package-lock.json +++ b/package-lock.json @@ -349,6 +349,11 @@ "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", "dev": true }, + "@krlwlfrt/async-pool": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@krlwlfrt/async-pool/-/async-pool-0.5.0.tgz", + "integrity": "sha512-ZwdRzVEQ89zKVsXFyM6mPwJ5NwaPwvGB5rN5VyJ7SFKBPtjZhzY2VBHLszdKC7f1lFvCXISDace6SE+O/M+4eg==" + }, "@nodelib/fs.scandir": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz", @@ -404,15 +409,14 @@ } }, "@openstapps/core": { - "version": "0.47.0", - "resolved": "https://registry.npmjs.org/@openstapps/core/-/core-0.47.0.tgz", - "integrity": "sha512-iwnAVd3ukKGV1+b36EAUTF7oKlAmkErPfIWqiO28JfYSHPWKIvkAxMgUviOITJscUz6SIo8qRNK27MreQsbLdw==", + "version": "0.48.0", + "resolved": "https://registry.npmjs.org/@openstapps/core/-/core-0.48.0.tgz", + "integrity": "sha512-HJVRPSDwk1Enw4pQ03jvzK5xotsdyrJstXWo8L3Q8qSeH5vkEjzZ56ohuG5Axa7kZsQkWcLkRNBdRGYzKt0/ew==", "requires": { "@openstapps/core-tools": "0.21.0", - "@types/geojson": "1.0.6", "@types/json-patch": "0.0.30", "@types/json-schema": "7.0.7", - "@types/node": "14.17.3", + "@types/node": "14.17.4", "fast-clone": "1.5.13", "fast-deep-equal": "3.1.3", "http-status-codes": "2.1.4", @@ -421,17 +425,83 @@ "ts-optchain": "0.1.8" }, "dependencies": { - "@types/node": { - "version": "14.17.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.3.tgz", - "integrity": "sha512-e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw==" + "@openstapps/core-tools": { + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/@openstapps/core-tools/-/core-tools-0.21.0.tgz", + "integrity": "sha512-8zJfuGImeAjqUddYVxRD1mgqpVsmn8k5ZiEeDX0JW1q590OCbAZsoTiaLPtfHjUK4bu2hoNkaPs5cyYTAxD8Ew==", + "requires": { + "@krlwlfrt/async-pool": "0.5.0", + "@openstapps/logger": "0.6.0", + "@types/glob": "7.1.3", + "@types/json-schema": "7.0.7", + "@types/mustache": "4.1.1", + "@types/node": "14.14.41", + "ajv": "6.12.6", + "better-ajv-errors": "0.7.0", + "chai": "4.3.4", + "commander": "7.2.0", + "deepmerge": "4.2.2", + "del": "6.0.0", + "flatted": "3.1.1", + "glob": "7.1.6", + "got": "11.8.2", + "humanize-string": "2.1.0", + "json-schema": "0.3.0", + "mustache": "4.2.0", + "plantuml-encoder": "1.4.0", + "toposort": "2.0.2", + "ts-json-schema-generator": "0.70.2", + "ts-node": "9.1.1", + "typedoc": "0.18.0", + "typescript": "3.8.3" + }, + "dependencies": { + "@types/node": { + "version": "14.14.41", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz", + "integrity": "sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g==" + } + } + }, + "@openstapps/logger": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@openstapps/logger/-/logger-0.6.0.tgz", + "integrity": "sha512-l/ILWPOSxhawcdDxn9vkdzib4xlRTnFmG4YygX8l8z0m9cocitMMZGw/DquZ0x6zGt2suOwSVRckYiSlk/6Erw==", + "requires": { + "@types/node": "14.14.37", + "@types/nodemailer": "6.4.1", + "chalk": "4.1.0", + "flatted": "3.1.1", + "moment": "2.29.1", + "nodemailer": "6.5.0" + }, + "dependencies": { + "@types/node": { + "version": "14.14.37", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.37.tgz", + "integrity": "sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==" + } + } + }, + "@types/nodemailer": { + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.1.tgz", + "integrity": "sha512-8081UY/0XTTDpuGqCnDc8IY+Q3DSg604wB3dBH0CaZlj4nZWHWuxtZ3NRZ9c9WUrz1Vfm6wioAUnqL3bsh49uQ==", + "requires": { + "@types/node": "*" + } + }, + "nodemailer": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.5.0.tgz", + "integrity": "sha512-Tm4RPrrIZbnqDKAvX+/4M+zovEReiKlEXWDzG4iwtpL9X34MJY+D5LnQPH/+eghe8DLlAVshHAJZAZWBGhkguw==" } } }, "@openstapps/core-tools": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@openstapps/core-tools/-/core-tools-0.21.0.tgz", - "integrity": "sha512-8zJfuGImeAjqUddYVxRD1mgqpVsmn8k5ZiEeDX0JW1q590OCbAZsoTiaLPtfHjUK4bu2hoNkaPs5cyYTAxD8Ew==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@openstapps/core-tools/-/core-tools-0.22.0.tgz", + "integrity": "sha512-WOuAeFjuSw4MQatima4HTXEjPiNs3ZDZxog9ZRm2IfBuVVe69mbx+BbjNfSYox2a/r0h+rEcIASks13WiKPE2Q==", "requires": { "@krlwlfrt/async-pool": "0.5.0", "@openstapps/logger": "0.6.0", @@ -470,6 +540,7 @@ "integrity": "sha512-l/ILWPOSxhawcdDxn9vkdzib4xlRTnFmG4YygX8l8z0m9cocitMMZGw/DquZ0x6zGt2suOwSVRckYiSlk/6Erw==", "requires": { "@types/node": "14.14.37", + "@types/nodemailer": "6.4.1", "chalk": "4.1.0", "flatted": "3.1.1", "moment": "2.29.1", @@ -480,11 +551,6 @@ "version": "14.14.37", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.37.tgz", "integrity": "sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==" - }, - "nodemailer": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.5.0.tgz", - "integrity": "sha512-Tm4RPrrIZbnqDKAvX+/4M+zovEReiKlEXWDzG4iwtpL9X34MJY+D5LnQPH/+eghe8DLlAVshHAJZAZWBGhkguw==" } } }, @@ -493,6 +559,14 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz", "integrity": "sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g==" }, + "@types/nodemailer": { + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.1.tgz", + "integrity": "sha512-8081UY/0XTTDpuGqCnDc8IY+Q3DSg604wB3dBH0CaZlj4nZWHWuxtZ3NRZ9c9WUrz1Vfm6wioAUnqL3bsh49uQ==", + "requires": { + "@types/node": "*" + } + }, "del": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz", @@ -514,9 +588,9 @@ "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==" }, "globby": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz", - "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==", + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", + "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==", "requires": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", @@ -526,6 +600,11 @@ "slash": "^3.0.0" } }, + "nodemailer": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.5.0.tgz", + "integrity": "sha512-Tm4RPrrIZbnqDKAvX+/4M+zovEReiKlEXWDzG4iwtpL9X34MJY+D5LnQPH/+eghe8DLlAVshHAJZAZWBGhkguw==" + }, "p-map": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", @@ -542,6 +621,7 @@ "integrity": "sha512-oVtHX7Y6VplOlsM3MUOUk1tRsZEfFn4F1vqtb/3K1Bpi2UQ0rMhiMwnLZCea+9yXQkRUi96CtmOgdhGBHQ2jLw==", "requires": { "@types/node": "14.14.45", + "@types/nodemailer": "6.4.1", "chalk": "4.1.1", "flatted": "3.1.1", "moment": "2.29.1", @@ -553,6 +633,14 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.45.tgz", "integrity": "sha512-DssMqTV9UnnoxDWu959sDLZzfvqCF0qDNRjaWeYSui9xkFe61kKo4l1TWNTQONpuXEm+gLMRvdlzvNHBamzmEw==" }, + "@types/nodemailer": { + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.1.tgz", + "integrity": "sha512-8081UY/0XTTDpuGqCnDc8IY+Q3DSg604wB3dBH0CaZlj4nZWHWuxtZ3NRZ9c9WUrz1Vfm6wioAUnqL3bsh49uQ==", + "requires": { + "@types/node": "*" + } + }, "chalk": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", @@ -712,7 +800,7 @@ }, "@types/express-prometheus-middleware": { "version": "1.2.0", - "resolved": "http://127.0.0.1:4873/@types%2fexpress-prometheus-middleware/-/express-prometheus-middleware-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/@types/express-prometheus-middleware/-/express-prometheus-middleware-1.2.0.tgz", "integrity": "sha512-zNjFdtJ+WHzvItaRTvVPwTsuRsXOuo3OJE95w6uQdw4GqPqLSQWjfT1V+bJW0QvaLMED8uh+kCx1TOC9sp/SOw==", "requires": { "@types/express": "*" @@ -738,9 +826,10 @@ } }, "@types/geojson": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-1.0.6.tgz", - "integrity": "sha512-Xqg/lIZMrUd0VRmSRbCAewtwGZiAk3mEUDvV4op1tGl+LvyPcb/MIOSxTl9z+9+J+R4/vpjiCAT4xeKzH9ji1w==" + "version": "7946.0.8", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.8.tgz", + "integrity": "sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==", + "dev": true }, "@types/glob": { "version": "7.1.3", @@ -1172,7 +1261,7 @@ }, "bintrees": { "version": "1.0.1", - "resolved": "http://127.0.0.1:4873/bintrees/-/bintrees-1.0.1.tgz", + "resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz", "integrity": "sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ=" }, "body-parser": { @@ -1908,6 +1997,31 @@ "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==" }, + "del": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz", + "integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==", + "requires": { + "globby": "^11.0.1", + "graceful-fs": "^4.2.4", + "is-glob": "^4.0.1", + "is-path-cwd": "^2.2.0", + "is-path-inside": "^3.0.2", + "p-map": "^4.0.0", + "rimraf": "^3.0.2", + "slash": "^3.0.0" + }, + "dependencies": { + "p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "requires": { + "aggregate-error": "^3.0.0" + } + } + } + }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -2096,7 +2210,7 @@ }, "express-prometheus-middleware": { "version": "1.2.0", - "resolved": "http://127.0.0.1:4873/express-prometheus-middleware/-/express-prometheus-middleware-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/express-prometheus-middleware/-/express-prometheus-middleware-1.2.0.tgz", "integrity": "sha512-efSwft67rdtiW40D0im1f7Rz1TCGHGzPj6lfK0MxZDcPj6z4f/Ab5VNkWPYZEjvLqZiZ7fbS00CYzpigO8tS+g==", "requires": { "prometheus-gc-stats": "^0.6.2", @@ -2220,6 +2334,11 @@ "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", "dev": true }, + "flatted": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz", + "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==" + }, "foreground-child": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", @@ -2291,7 +2410,7 @@ }, "gc-stats": { "version": "1.4.0", - "resolved": "http://127.0.0.1:4873/gc-stats/-/gc-stats-1.4.0.tgz", + "resolved": "https://registry.npmjs.org/gc-stats/-/gc-stats-1.4.0.tgz", "integrity": "sha512-4FcCj9e8j8rCjvLkqRpGZBLgTC/xr9XEf5By3x77cDucWWB3pJK6FEwXZCTCbb4z8xdaOoi4owBNrvn3ciDdxA==", "optional": true, "requires": { @@ -3081,6 +3200,19 @@ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "dev": true }, + "globby": { + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", + "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==", + "requires": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.1.1", + "ignore": "^5.1.4", + "merge2": "^1.3.0", + "slash": "^3.0.0" + } + }, "got": { "version": "11.8.2", "resolved": "https://registry.npmjs.org/got/-/got-11.8.2.tgz", @@ -4207,7 +4339,7 @@ }, "nan": { "version": "2.14.2", - "resolved": "http://127.0.0.1:4873/nan/-/nan-2.14.2.tgz", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz", "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==", "optional": true }, @@ -4502,7 +4634,7 @@ }, "optional": { "version": "0.1.4", - "resolved": "http://127.0.0.1:4873/optional/-/optional-0.1.4.tgz", + "resolved": "https://registry.npmjs.org/optional/-/optional-0.1.4.tgz", "integrity": "sha512-gtvrrCfkE08wKcgXaVwQVgwEQ8vel2dc5DDBn9RLQZ3YtmtkBss6A2HY6BnJH4N/4Ku97Ri/SF8sNWE2225WJw==", "optional": true }, @@ -4707,7 +4839,7 @@ }, "prom-client": { "version": "12.0.0", - "resolved": "http://127.0.0.1:4873/prom-client/-/prom-client-12.0.0.tgz", + "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-12.0.0.tgz", "integrity": "sha512-JbzzHnw0VDwCvoqf8y1WDtq4wSBAbthMB1pcVI/0lzdqHGJI3KBJDXle70XK+c7Iv93Gihqo0a5LlOn+g8+DrQ==", "requires": { "tdigest": "^0.1.1" @@ -4715,7 +4847,7 @@ }, "prometheus-gc-stats": { "version": "0.6.3", - "resolved": "http://127.0.0.1:4873/prometheus-gc-stats/-/prometheus-gc-stats-0.6.3.tgz", + "resolved": "https://registry.npmjs.org/prometheus-gc-stats/-/prometheus-gc-stats-0.6.3.tgz", "integrity": "sha512-vCX+HZ1jZHkha25r5dAcRSNjue+K3Hn0B33EcZl7y3hgp3o1YsQ4Y3x7oJWKvDdbelFIL0McsXGmRg3zBrmq+g==", "optional": true, "requires": { @@ -5047,7 +5179,7 @@ }, "response-time": { "version": "2.3.2", - "resolved": "http://127.0.0.1:4873/response-time/-/response-time-2.3.2.tgz", + "resolved": "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz", "integrity": "sha1-/6cbq5UtYvfB1Jt0NDVfvGjf/Fo=", "requires": { "depd": "~1.1.0", @@ -5497,7 +5629,7 @@ }, "tdigest": { "version": "0.1.1", - "resolved": "http://127.0.0.1:4873/tdigest/-/tdigest-0.1.1.tgz", + "resolved": "https://registry.npmjs.org/tdigest/-/tdigest-0.1.1.tgz", "integrity": "sha1-Ljyyw56kSeVdHmzZEReszKRYgCE=", "requires": { "bintrees": "1.0.1" @@ -5874,7 +6006,7 @@ }, "url-value-parser": { "version": "2.0.3", - "resolved": "http://127.0.0.1:4873/url-value-parser/-/url-value-parser-2.0.3.tgz", + "resolved": "https://registry.npmjs.org/url-value-parser/-/url-value-parser-2.0.3.tgz", "integrity": "sha512-FjIX+Q9lYmDM9uYIGdMYfQW0uLbWVwN2NrL2ayAI7BTOvEwzH+VoDdNquwB9h4dFAx+u6mb0ONLa3sHD5DvyvA==" }, "utf8-byte-length": { diff --git a/package.json b/package.json index e1af111f..581f6e6c 100644 --- a/package.json +++ b/package.json @@ -33,8 +33,8 @@ }, "dependencies": { "@elastic/elasticsearch": "5.6.22", - "@openstapps/core": "0.47.0", - "@openstapps/core-tools": "0.21.0", + "@openstapps/core": "0.48.0", + "@openstapps/core-tools": "0.22.0", "@openstapps/logger": "0.7.0", "@types/express-prometheus-middleware": "1.2.0", "@types/node": "14.17.4", @@ -45,7 +45,6 @@ "express-prometheus-middleware": "1.2.0", "express-promise-router": "4.1.0", "fs-extra": "9.1.0", - "geojson": "0.5.0", "got": "11.8.2", "moment": "2.29.1", "morgan": "1.10.0", @@ -69,6 +68,7 @@ "@types/elasticsearch": "5.0.37", "@types/express": "4.17.12", "@types/fs-extra": "9.0.11", + "@types/geojson": "7946.0.8", "@types/mocha": "8.2.2", "@types/morgan": "1.9.2", "@types/node-cron": "2.0.3", diff --git a/src/storage/elasticsearch/common.ts b/src/storage/elasticsearch/common.ts index 53f0884b..f2f0ecf7 100644 --- a/src/storage/elasticsearch/common.ts +++ b/src/storage/elasticsearch/common.ts @@ -24,6 +24,7 @@ import { // @elastic/elasticsearch package // tslint:disable-next-line:no-implicit-dependencies import {NameList} from 'elasticsearch'; +// tslint:disable-next-line:no-implicit-dependencies import {Polygon} from 'geojson'; /** @@ -430,7 +431,7 @@ export interface ESGeoShapeFilter { * * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.6/query-dsl-geo-shape-query.html#_spatial_relations */ - relation: 'intersects' | 'disjoint' | 'within' | 'contains'; + relation?: 'intersects' | 'disjoint' | 'within' | 'contains'; /** * Geo Shape diff --git a/src/storage/elasticsearch/query.ts b/src/storage/elasticsearch/query.ts index e4f14e86..52958501 100644 --- a/src/storage/elasticsearch/query.ts +++ b/src/storage/elasticsearch/query.ts @@ -27,23 +27,24 @@ import { } from '@openstapps/core'; import { ElasticsearchConfig, - ESDateRange, - ESDateRangeFilter, ESGenericRange, ESGeoShapeFilter, ESNumericRangeFilter, - ESRangeFilter, - ScriptSort, -} from './common'; -import { ESBooleanFilter, ESBooleanFilterArguments, + ESDateRange, + ESDateRangeFilter, ESFunctionScoreQuery, ESFunctionScoreQueryFunction, + ESGenericRange, ESGenericSort, ESGeoDistanceFilter, ESGeoDistanceFilterArguments, ESGeoDistanceSort, ESGeoDistanceSortArguments, + ESGeoShapeFilter, + ESNumericRangeFilter, + ESRangeFilter, ESTermFilter, ESTypeFilter, + ScriptSort, } from './common'; /** @@ -95,7 +96,7 @@ export function buildBooleanFilter(booleanFilter: SCSearchBooleanFilter): ESBool * @param filter A search filter for the retrieval of the data */ export function buildFilter(filter: SCSearchFilter): - ESTermFilter | ESGeoDistanceFilter | ESBooleanFilter | ESRangeFilter { + ESTermFilter | ESGeoDistanceFilter | ESGeoShapeFilter | ESBooleanFilter | ESRangeFilter { switch (filter.type) { case 'value': @@ -178,14 +179,12 @@ export function buildFilter(filter: SCSearchFilter): return dateRangeFilter; case 'geo': - const geoShapeObject: ESGeoShapeFilter = { + return { [filter.arguments.field]: { shape: filter.arguments.shape, relation: filter.arguments.spatialRelation, }, }; - - return geoShapeObject; } }