@webiny/api-elasticsearch 5.21.0-beta.0 → 5.22.0-beta.2

package/client.js

@@ -19,9 +19,9 @@ var _awsElasticsearchConnector = _interopRequireDefault(require("aws-elasticsear
 
 const _excluded = ["endpoint", "node"];
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 const createElasticsearchClient = options => {
   const {

package/index.d.ts

@@ -1,5 +1,5 @@
 import { ElasticsearchContext } from "./types";
-import { ContextPlugin } from "@webiny/handler/plugins/ContextPlugin";
+import { ContextPlugin } from "@webiny/handler";
 import { ElasticsearchClientOptions } from "./client";
 import { Client } from "@elastic/elasticsearch";
 declare const _default: (params: ElasticsearchClientOptions | Client) => ContextPlugin<ElasticsearchContext>;

package/index.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _ContextPlugin = require("@webiny/handler/plugins/ContextPlugin");
+var _handler = require("@webiny/handler");
 
 var _error = _interopRequireDefault(require("@webiny/error"));
 
@@ -21,7 +21,7 @@ var _elasticsearch = require("@elastic/elasticsearch");
  * We must accept either Elasticsearch client or options that create the client.
  */
 var _default = params => {
-  return new _ContextPlugin.ContextPlugin(context => {
+  return new _handler.ContextPlugin(context => {
     if (context.elasticsearch) {
       throw new _error.default("Elasticsearch client is already initialized, no need to define it again. Check your code for duplicate initializations.", "ELASTICSEARCH_ALREADY_INITIALIZED");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-elasticsearch",
-	"version": "5.21.0-beta.0",
+	"version": "5.22.0-beta.2",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/webiny/webiny-js.git",
@@ -13,19 +13,19 @@
 	"license": "MIT",
 	"dependencies": {
 		"@elastic/elasticsearch": "7.12.0",
-		"@webiny/error": "5.21.0-beta.0",
-		"@webiny/handler": "5.21.0-beta.0",
-		"@webiny/plugins": "5.21.0-beta.0",
-		"@webiny/utils": "5.21.0-beta.0",
+		"@webiny/error": "5.22.0-beta.2",
+		"@webiny/handler": "5.22.0-beta.2",
+		"@webiny/plugins": "5.22.0-beta.2",
+		"@webiny/utils": "5.22.0-beta.2",
 		"aws-elasticsearch-connector": "9.0.3",
-		"aws-sdk": "2.1032.0",
+		"aws-sdk": "2.1056.0",
 		"elastic-ts": "0.7.0"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.5.5",
-		"@babel/core": "^7.5.5",
-		"@webiny/cli": "^5.21.0-beta.0",
-		"@webiny/project-utils": "^5.21.0-beta.0",
+		"@babel/cli": "^7.16.0",
+		"@babel/core": "^7.16.0",
+		"@webiny/cli": "^5.22.0-beta.2",
+		"@webiny/project-utils": "^5.22.0-beta.2",
 		"rimraf": "^3.0.2",
 		"ttypescript": "^1.5.12",
 		"typescript": "^4.1.3"
@@ -45,5 +45,5 @@
 			]
 		}
 	},
-	"gitHead": "cad155812edbdd577a1cc858b41038fdd7a6d2d9"
+	"gitHead": "c472d20682885fb538354c206a148deaae14bfe8"
 }

package/plugins/definition/ElasticsearchFieldPlugin.js

@@ -11,9 +11,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _plugins = require("@webiny/plugins");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 const keywordLessUnmappedType = ["date", "long"];
 

package/plugins/operator/equal.js

@@ -27,11 +27,21 @@ class ElasticsearchQueryBuilderOperatorEqualPlugin extends _ElasticsearchQueryBu
       path,
       basePath
     } = params;
+
+    if (value === null) {
+      query.must_not.push({
+        exists: {
+          field: path
+        }
+      });
+      return;
+    }
     /**
      * In case we are searching for a string, use regular path.
      * Otherwise use base path
      */
 
+
     const useBasePath = typeof value !== "string";
     query.must.push({
       term: {

package/plugins/operator/not.js

@@ -27,6 +27,16 @@ class ElasticsearchQueryBuilderOperatorNotPlugin extends _ElasticsearchQueryBuil
       path,
       basePath
     } = params;
+
+    if (value === null) {
+      query.must.push({
+        exists: {
+          field: path
+        }
+      });
+      return;
+    }
+
     const useBasePath = typeof value !== "string";
     query.must_not.push({
       term: {

package/types.d.ts

@@ -1,8 +1,8 @@
 import { Client } from "@elastic/elasticsearch";
 import { BoolQueryConfig as esBoolQueryConfig, Query as esQuery } from "elastic-ts";
-import { ContextInterface } from "@webiny/handler/types";
+import { Context } from "@webiny/handler/types";
 export * from "elastic-ts";
-export interface ElasticsearchContext extends ContextInterface {
+export interface ElasticsearchContext extends Context {
     elasticsearch: Client;
 }
 /**