@sebspark/opensearch 0.2.3 → 0.3.0

package/dist/index.d.mts

@@ -127,11 +127,6 @@ type OpenSearchFilter<T> = {
 type Collapse<T> = {
     field: keyof NestedFields<T>;
 };
-type Aggregations<T> = {
-    [key: string]: {
-        field?: keyof NestedFields<T>;
-    };
-};
 type ScriptScore = {
     script: {
         source: string;
@@ -224,26 +219,35 @@ type OpenSearchQueryBody<T extends {
         match_phrase_prefix?: MatchPhrasePrefix<T>;
         more_like_this?: MoreLikeThis<T>;
     };
+    sort?: Sort<T>[];
+    from?: number;
+    size?: number;
     _source?: OpenSearchFields<K>;
 } : never;
+type Order = 'asc' | 'desc';
+type Mode = 'min' | 'max' | 'sum' | 'avg' | 'median';
+type Missing = '_first' | '_last' | 'custom_value';
 type Sort<T> = {
-    [P in keyof NestedFields<T>]?: {
-        order: 'asc' | 'desc';
+    [P in NestedPaths<T>]?: Order | {
+        order?: Order;
+        mode?: Mode;
+        missing?: Missing;
+        unmapped_type?: BasicOpenSearchFieldTypes;
+        numeric_type?: NumberTypes;
+        format?: string;
     };
-}[];
+};
 type OpenSearchQuery<T extends {
     id: string;
 }, K = T> = RequestParams.Search<OpenSearchQueryBody<T, K>> & K extends DeepPartial<T> ? {
     index: string;
     body: OpenSearchQueryBody<T, K>;
-    aggregations?: Aggregations<K>;
-    sort?: Sort<K>;
-    from?: number;
-    size?: number;
 } : never;
-type BasicOpenSearchFieldTypes = 'text' | 'keyword' | 'long' | 'integer' | 'short' | 'byte' | 'double' | 'float' | 'date' | 'boolean' | 'binary' | 'nested';
+type StringTypes = 'text' | 'keyword';
+type NumberTypes = 'long' | 'integer' | 'short' | 'byte' | 'double' | 'float';
+type BasicOpenSearchFieldTypes = StringTypes | NumberTypes | 'date' | 'boolean' | 'binary' | 'nested';
 type ElementType<T> = T extends Array<infer U> ? U : T;
-type OpenSearchFieldType<T> = ElementType<T> extends string ? 'text' | 'keyword' : ElementType<T> extends number ? 'long' | 'integer' | 'short' | 'byte' | 'double' | 'float' : ElementType<T> extends boolean ? 'boolean' : ElementType<T> extends Date ? 'date' : BasicOpenSearchFieldTypes;
+type OpenSearchFieldType<T> = ElementType<T> extends string ? StringTypes : ElementType<T> extends number ? NumberTypes : ElementType<T> extends boolean ? 'boolean' : ElementType<T> extends Date ? 'date' : BasicOpenSearchFieldTypes;
 type FieldOptions<T> = {
     type: OpenSearchFieldType<NotUndefined<T>>;
 };

package/dist/index.d.ts

@@ -127,11 +127,6 @@ type OpenSearchFilter<T> = {
 type Collapse<T> = {
     field: keyof NestedFields<T>;
 };
-type Aggregations<T> = {
-    [key: string]: {
-        field?: keyof NestedFields<T>;
-    };
-};
 type ScriptScore = {
     script: {
         source: string;
@@ -224,26 +219,35 @@ type OpenSearchQueryBody<T extends {
         match_phrase_prefix?: MatchPhrasePrefix<T>;
         more_like_this?: MoreLikeThis<T>;
     };
+    sort?: Sort<T>[];
+    from?: number;
+    size?: number;
     _source?: OpenSearchFields<K>;
 } : never;
+type Order = 'asc' | 'desc';
+type Mode = 'min' | 'max' | 'sum' | 'avg' | 'median';
+type Missing = '_first' | '_last' | 'custom_value';
 type Sort<T> = {
-    [P in keyof NestedFields<T>]?: {
-        order: 'asc' | 'desc';
+    [P in NestedPaths<T>]?: Order | {
+        order?: Order;
+        mode?: Mode;
+        missing?: Missing;
+        unmapped_type?: BasicOpenSearchFieldTypes;
+        numeric_type?: NumberTypes;
+        format?: string;
     };
-}[];
+};
 type OpenSearchQuery<T extends {
     id: string;
 }, K = T> = RequestParams.Search<OpenSearchQueryBody<T, K>> & K extends DeepPartial<T> ? {
     index: string;
     body: OpenSearchQueryBody<T, K>;
-    aggregations?: Aggregations<K>;
-    sort?: Sort<K>;
-    from?: number;
-    size?: number;
 } : never;
-type BasicOpenSearchFieldTypes = 'text' | 'keyword' | 'long' | 'integer' | 'short' | 'byte' | 'double' | 'float' | 'date' | 'boolean' | 'binary' | 'nested';
+type StringTypes = 'text' | 'keyword';
+type NumberTypes = 'long' | 'integer' | 'short' | 'byte' | 'double' | 'float';
+type BasicOpenSearchFieldTypes = StringTypes | NumberTypes | 'date' | 'boolean' | 'binary' | 'nested';
 type ElementType<T> = T extends Array<infer U> ? U : T;
-type OpenSearchFieldType<T> = ElementType<T> extends string ? 'text' | 'keyword' : ElementType<T> extends number ? 'long' | 'integer' | 'short' | 'byte' | 'double' | 'float' : ElementType<T> extends boolean ? 'boolean' : ElementType<T> extends Date ? 'date' : BasicOpenSearchFieldTypes;
+type OpenSearchFieldType<T> = ElementType<T> extends string ? StringTypes : ElementType<T> extends number ? NumberTypes : ElementType<T> extends boolean ? 'boolean' : ElementType<T> extends Date ? 'date' : BasicOpenSearchFieldTypes;
 type FieldOptions<T> = {
     type: OpenSearchFieldType<NotUndefined<T>>;
 };

package/dist/index.js

@@ -41,16 +41,14 @@ var import_assert = __toESM(require("assert"));
 var import_omit = __toESM(require("omit"));
 var omitId = (0, import_omit.default)("id");
 var fixIds = (searchQuery) => {
-  const q = searchQuery.body.query;
+  const { query: q, _source, from, size, sort } = searchQuery.body;
   const body = {
     query: {
       bool: q.bool ? fixBool(q.bool) : void 0,
       match: q.match ? fixId(q.match) : void 0,
       collapse: q.collapse,
       exists: q.exists ? fixExists(q.exists) : void 0,
-      fields: q.fields,
       filter: q.filter ? fixFilter(q.filter) : void 0,
-      from: q.from,
       fuzzy: q.fuzzy ? fixId(q.fuzzy) : void 0,
       highlight: q.highlight,
       match_all: q.match_all,
@@ -62,17 +60,18 @@ var fixIds = (searchQuery) => {
       range: q.range ? fixId(q.range) : void 0,
       regexp: q.regexp ? fixId(q.regexp) : void 0,
       script_score: q.script_score,
-      size: q.size,
       term: q.term ? fixId(q.term) : void 0,
       terms: q.terms ? fixId(q.terms) : void 0,
       wildcard: q.wildcard ? fixId(q.wildcard) : void 0
-    }
+    },
+    _source,
+    from,
+    size,
+    sort: sort ? fixId(sort) : void 0
   };
   return {
     ...searchQuery,
-    body: {
-      ...clean(body)
-    }
+    body: clean(body)
   };
 };
 var fixBool = (bool) => ({
@@ -116,7 +115,15 @@ var fixId = (old) => {
   return fixed;
 };
 var fixIdValue = (val) => val === "id" ? "_id" : val;
-var clean = (obj) => Object.entries(obj).filter(([, val]) => val !== void 0).reduce((m, [prop, val]) => ({ ...m, [prop]: val }), {});
+var clean = (obj) => {
+  const cleaned = JSON.parse(JSON.stringify(obj));
+  for (const [key, value] of Object.entries(obj)) {
+    if (Array.isArray(value)) {
+      cleaned[key] = value.filter(Boolean);
+    }
+  }
+  return cleaned;
+};
 
 // src/openSearchHelper.ts
 var typedSearch = async (client, searchQuery) => {

package/dist/index.mjs

@@ -5,16 +5,14 @@ import assert from "assert";
 import omit from "omit";
 var omitId = omit("id");
 var fixIds = (searchQuery) => {
-  const q = searchQuery.body.query;
+  const { query: q, _source, from, size, sort } = searchQuery.body;
   const body = {
     query: {
       bool: q.bool ? fixBool(q.bool) : void 0,
       match: q.match ? fixId(q.match) : void 0,
       collapse: q.collapse,
       exists: q.exists ? fixExists(q.exists) : void 0,
-      fields: q.fields,
       filter: q.filter ? fixFilter(q.filter) : void 0,
-      from: q.from,
       fuzzy: q.fuzzy ? fixId(q.fuzzy) : void 0,
       highlight: q.highlight,
       match_all: q.match_all,
@@ -26,17 +24,18 @@ var fixIds = (searchQuery) => {
       range: q.range ? fixId(q.range) : void 0,
       regexp: q.regexp ? fixId(q.regexp) : void 0,
       script_score: q.script_score,
-      size: q.size,
       term: q.term ? fixId(q.term) : void 0,
       terms: q.terms ? fixId(q.terms) : void 0,
       wildcard: q.wildcard ? fixId(q.wildcard) : void 0
-    }
+    },
+    _source,
+    from,
+    size,
+    sort: sort ? fixId(sort) : void 0
   };
   return {
     ...searchQuery,
-    body: {
-      ...clean(body)
-    }
+    body: clean(body)
   };
 };
 var fixBool = (bool) => ({
@@ -80,7 +79,15 @@ var fixId = (old) => {
   return fixed;
 };
 var fixIdValue = (val) => val === "id" ? "_id" : val;
-var clean = (obj) => Object.entries(obj).filter(([, val]) => val !== void 0).reduce((m, [prop, val]) => ({ ...m, [prop]: val }), {});
+var clean = (obj) => {
+  const cleaned = JSON.parse(JSON.stringify(obj));
+  for (const [key, value] of Object.entries(obj)) {
+    if (Array.isArray(value)) {
+      cleaned[key] = value.filter(Boolean);
+    }
+  }
+  return cleaned;
+};
 
 // src/openSearchHelper.ts
 var typedSearch = async (client, searchQuery) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sebspark/opensearch",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -20,7 +20,7 @@
     "tsconfig": "*"
   },
   "dependencies": {
-    "@opensearch-project/opensearch": "2.5.0",
+    "@opensearch-project/opensearch": "2.6.0",
     "omit": "1.0.1"
   }
 }