@sebspark/opensearch 0.1.1 → 0.2.0

package/dist/index.d.mts

@@ -20,6 +20,7 @@ type WithId = {
 };
 type ExcludeId<T> = Omit<T, 'id'>;
 type SubstringOf<T extends string> = T extends `${infer Prefix}${infer _Rest}` ? Prefix | SubstringOf<Exclude<T, Prefix>> : never;
+type NotUndefined<T> = T extends undefined ? never : T;
 
 type FieldName<T> = NestedStringPaths<ExcludeId<T>> | '*' | (string & {});
 type FieldObject<T> = {
@@ -237,11 +238,18 @@ type OpenSearchQuery<T extends {
     from?: number;
     size?: number;
 } : never;
-type BasicOpenSearchFieldTypes = 'text' | 'keyword' | 'long' | 'integer' | 'short' | 'byte' | 'double' | 'float' | 'date' | 'boolean' | 'binary';
+type BasicOpenSearchFieldTypes = 'text' | 'keyword' | 'long' | 'integer' | 'short' | 'byte' | 'double' | 'float' | '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 FieldOptions<T> = {
-    type: OpenSearchFieldType<T>;
+    type: OpenSearchFieldType<NotUndefined<T>>;
+};
+type NestedFieldOptions<T> = {
+    type: 'nested';
+    properties: IndexProperties<T>;
+};
+type IndexProperties<T> = {
+    [K in keyof Partial<T>]: T[K] extends Date ? FieldOptions<T[K]> : NotUndefined<T[K]> extends object ? NotUndefined<T[K]> extends Array<infer U> ? U extends object ? NestedFieldOptions<U> : FieldOptions<T[K]> : IndexProperties<T[K]> : FieldOptions<T[K]>;
 };
 type IndexOptions<T extends WithId> = {
     settings?: {
@@ -255,9 +263,6 @@ type IndexOptions<T extends WithId> = {
     };
     aliases?: Record<string, Record<string, never>>;
 };
-type IndexProperties<T> = {
-    [K in keyof Partial<T>]: T[K] extends object ? T[K] extends Array<infer U> ? FieldOptions<T[K]> : IndexProperties<T[K]> : FieldOptions<T[K]>;
-};
 
 interface OpenSearchHelper extends Client {
     typedSearch: <DataType extends WithId, ReturnType = DataType>(query: OpenSearchQuery<DataType, ReturnType>) => Promise<{

package/dist/index.d.ts

@@ -20,6 +20,7 @@ type WithId = {
 };
 type ExcludeId<T> = Omit<T, 'id'>;
 type SubstringOf<T extends string> = T extends `${infer Prefix}${infer _Rest}` ? Prefix | SubstringOf<Exclude<T, Prefix>> : never;
+type NotUndefined<T> = T extends undefined ? never : T;
 
 type FieldName<T> = NestedStringPaths<ExcludeId<T>> | '*' | (string & {});
 type FieldObject<T> = {
@@ -237,11 +238,18 @@ type OpenSearchQuery<T extends {
     from?: number;
     size?: number;
 } : never;
-type BasicOpenSearchFieldTypes = 'text' | 'keyword' | 'long' | 'integer' | 'short' | 'byte' | 'double' | 'float' | 'date' | 'boolean' | 'binary';
+type BasicOpenSearchFieldTypes = 'text' | 'keyword' | 'long' | 'integer' | 'short' | 'byte' | 'double' | 'float' | '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 FieldOptions<T> = {
-    type: OpenSearchFieldType<T>;
+    type: OpenSearchFieldType<NotUndefined<T>>;
+};
+type NestedFieldOptions<T> = {
+    type: 'nested';
+    properties: IndexProperties<T>;
+};
+type IndexProperties<T> = {
+    [K in keyof Partial<T>]: T[K] extends Date ? FieldOptions<T[K]> : NotUndefined<T[K]> extends object ? NotUndefined<T[K]> extends Array<infer U> ? U extends object ? NestedFieldOptions<U> : FieldOptions<T[K]> : IndexProperties<T[K]> : FieldOptions<T[K]>;
 };
 type IndexOptions<T extends WithId> = {
     settings?: {
@@ -255,9 +263,6 @@ type IndexOptions<T extends WithId> = {
     };
     aliases?: Record<string, Record<string, never>>;
 };
-type IndexProperties<T> = {
-    [K in keyof Partial<T>]: T[K] extends object ? T[K] extends Array<infer U> ? FieldOptions<T[K]> : IndexProperties<T[K]> : FieldOptions<T[K]>;
-};
 
 interface OpenSearchHelper extends Client {
     typedSearch: <DataType extends WithId, ReturnType = DataType>(query: OpenSearchQuery<DataType, ReturnType>) => Promise<{

package/dist/index.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -25,6 +35,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/openSearchHelper.ts
+var import_assert = __toESM(require("assert"));
 var typedSearch = async (client, searchQuery) => {
   const response = await client.search(
     searchQuery
@@ -73,10 +84,18 @@ var typedBulkUpsert = async (client, index, items) => {
   return response;
 };
 var isLeafNode = (obj) => {
+  if (Object.values(obj).some((value) => value === "nested"))
+    return true;
   return !Object.values(obj).some(
     (value) => typeof value === "object" && value !== null && !Array.isArray(value)
   );
 };
+(0, import_assert.default)(
+  isLeafNode({
+    type: "nested",
+    properties: { name: { type: "keyword" }, type: { type: "keyword" } }
+  })
+);
 var flattenObject = (obj, parentKey = "", result = {}) => {
   for (const [key, value] of Object.entries(obj)) {
     const newKey = parentKey ? `${parentKey}.${key}` : key;

package/dist/index.mjs

@@ -1,4 +1,5 @@
 // src/openSearchHelper.ts
+import assert from "assert";
 var typedSearch = async (client, searchQuery) => {
   const response = await client.search(
     searchQuery
@@ -47,10 +48,18 @@ var typedBulkUpsert = async (client, index, items) => {
   return response;
 };
 var isLeafNode = (obj) => {
+  if (Object.values(obj).some((value) => value === "nested"))
+    return true;
   return !Object.values(obj).some(
     (value) => typeof value === "object" && value !== null && !Array.isArray(value)
   );
 };
+assert(
+  isLeafNode({
+    type: "nested",
+    properties: { name: { type: "keyword" }, type: { type: "keyword" } }
+  })
+);
 var flattenObject = (obj, parentKey = "", result = {}) => {
   for (const [key, value] of Object.entries(obj)) {
     const newKey = parentKey ? `${parentKey}.${key}` : key;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sebspark/opensearch",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "module": "dist/index.mjs",