@sebspark/opensearch 0.3.3 → 1.0.1

package/dist/index.js

@@ -1,9 +1,7 @@
 "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)
@@ -17,208 +15,62 @@ 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
-var src_exports = {};
-__export(src_exports, {
-  helper: () => helper
+var index_exports = {};
+__export(index_exports, {
+  OpenSearchClient: () => OpenSearchClient,
+  bulkCreate: () => bulkCreate,
+  bulkDelete: () => bulkDelete,
+  bulkIndex: () => bulkIndex,
+  bulkUpdate: () => bulkUpdate
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 
-// src/openSearchHelper.ts
-var import_node_assert = __toESM(require("assert"));
-
-// src/fixIds.ts
-var import_omit = __toESM(require("omit"));
-var omitId = (0, import_omit.default)("id");
-var fixIds = (searchQuery) => {
-  const { query: q, _source, from, size, sort } = searchQuery.body;
-  const body = {
-    query: {
-      ids: q.ids,
-      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,
-      filter: q.filter ? fixFilter(q.filter) : void 0,
-      fuzzy: q.fuzzy ? fixId(q.fuzzy) : void 0,
-      highlight: q.highlight,
-      match_all: q.match_all,
-      match_phrase: q.match_phrase ? fixId(q.match_phrase) : void 0,
-      match_phrase_prefix: q.match_phrase_prefix ? fixId(q.match_phrase_prefix) : void 0,
-      more_like_this: q.more_like_this ? fixWithFields(q.more_like_this) : void 0,
-      multi_match: q.multi_match ? fixId(q.multi_match) : void 0,
-      prefix: q.prefix ? fixId(q.prefix) : void 0,
-      range: q.range ? fixId(q.range) : void 0,
-      regexp: q.regexp ? fixId(q.regexp) : void 0,
-      script_score: q.script_score,
-      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)
-  };
-};
-var fixBool = (bool) => ({
-  ...bool,
-  filter: bool.filter ? Array.isArray(bool.filter) ? bool.filter.map(fixFilter) : fixFilter(bool.filter) : void 0,
-  boost: bool.boost,
-  minimum_should_match: bool.minimum_should_match,
-  must: bool.must ? Array.isArray(bool.must) ? bool.must.map(fixFilter) : fixFilter(bool.must) : void 0,
-  must_not: bool.must_not ? Array.isArray(bool.must_not) ? bool.must_not.map(fixFilter) : fixFilter(bool.must_not) : void 0,
-  should: bool.should ? Array.isArray(bool.should) ? bool.should.map(fixFilter) : fixFilter(bool.should) : void 0
-});
-var fixFilter = (filter) => clean({
-  bool: filter.bool ? fixBool(filter.bool) : void 0,
-  exists: filter.exists ? fixExists(filter.exists) : void 0,
-  fuzzy: filter.fuzzy ? fixId(filter.fuzzy) : void 0,
-  match: filter.match ? fixId(filter.match) : void 0,
-  match_phrase: filter.match_phrase ? fixId(filter.match_phrase) : void 0,
-  multi_match: filter.multi_match ? fixId(filter.multi_match) : void 0,
-  match_phrase_prefix: filter.match_phrase_prefix ? fixId(filter.match_phrase_prefix) : void 0,
-  prefix: filter.prefix ? fixId(filter.prefix) : void 0,
-  query_string: filter.query_string ? fixWithFields(filter.query_string) : void 0,
-  range: filter.range ? fixId(filter.range) : void 0,
-  regexp: filter.regexp ? fixId(filter.regexp) : void 0,
-  simple_query_string: filter.simple_query_string ? fixWithFields(filter.simple_query_string) : void 0,
-  term: filter.term ? fixId(filter.term) : void 0,
-  terms: filter.terms ? fixId(filter.terms) : void 0,
-  wildcard: filter.wildcard ? fixId(filter.wildcard) : void 0
-});
-var fixWithFields = (old) => ({
-  ...old,
-  fields: old.fields ? old.fields.map(fixIdValue) : void 0
-});
-var fixExists = (exists) => ({
-  ...exists,
-  field: fixIdValue(exists.field)
-});
-var fixId = (old) => {
-  const fixed = omitId(old);
-  if (old.id) fixed._id = old.id;
-  return fixed;
-};
-var fixIdValue = (val) => val === "id" ? "_id" : 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/client.ts
+var import_opensearch = require("@opensearch-project/opensearch");
+var OpenSearchClient = function(...args) {
+  const clientInstance = new import_opensearch.Client(...args);
+  return clientInstance;
 };
 
-// src/openSearchHelper.ts
-var typedSearch = async (client, searchQuery) => {
-  const response = await client.search(
-    fixIds(searchQuery)
-  );
-  const results = response.body.hits.hits.map(
-    // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-    (hit) => ({
-      id: hit._id,
-      ...hit._source
-    })
-  );
-  return { results, response };
-};
-var typedIndex = async (client, index, data) => {
-  const { id, ...body } = data;
-  const response = await client.index({
-    index,
-    id,
-    body,
-    refresh: true
-    // Adjust based on your requirement
+// src/helpers.ts
+function bulkIndex(index, docs, idFn) {
+  const body = docs.flatMap((doc) => {
+    const op = idFn ? { _id: idFn(doc) } : {};
+    return [{ index: op }, doc];
   });
-  return response;
-};
-var typedUpsert = async (client, index, data) => {
-  const { id, ...doc } = data;
-  const response = await client.update({
-    index,
-    id,
-    body: {
-      doc,
-      doc_as_upsert: true
-    }
+  return { index, body };
+}
+function bulkCreate(index, docs, idFn) {
+  const body = docs.flatMap((doc) => {
+    const op = { _id: idFn(doc) };
+    return [{ create: op }, doc];
   });
-  return response;
-};
-var typedBulkUpsert = async (client, index, items) => {
-  const body = items.flatMap((item) => {
-    const { id, ...doc } = item;
-    return [
-      { update: { _index: index, _id: id } },
-      { doc, doc_as_upsert: true }
-    ];
+  return { index, body };
+}
+function bulkUpdate(index, updates, idFn) {
+  const body = updates.flatMap((update) => {
+    const op = {
+      _id: idFn(update.doc || update.upsert)
+    };
+    return [{ update: op }, update];
   });
-  const response = await client.bulk({ body });
-  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_node_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;
-    if (typeof value === "object" && value !== null && !isLeafNode(value)) {
-      flattenObject(value, newKey, result);
-    } else {
-      result[newKey] = value;
-    }
-  }
-  return result;
-};
-var typedIndexCreate = async (client, index, { mappings, ...props }) => {
-  const { body: exists } = await client.indices.exists({ index });
-  if (exists) {
-    return;
-  }
-  const response = await client.indices.create({
-    index,
-    body: {
-      ...props,
-      mappings: (mappings == null ? void 0 : mappings.properties) ? { properties: flattenObject(mappings.properties) } : void 0
-    }
+  return { index, body };
+}
+function bulkDelete(index, ids) {
+  const body = ids.map((_id) => {
+    const op = { _id };
+    return { delete: op };
   });
-  return response;
-};
-var helper = (client) => ({
-  ...client,
-  typedBulkUpsert: (index, data) => typedBulkUpsert(client, index, data),
-  typedIndexCreate: (index, options) => typedIndexCreate(client, index, options),
-  typedIndex: (index, data) => typedIndex(client, index, data),
-  typedSearch: (query) => typedSearch(client, query),
-  typedUpsert: (index, data) => typedUpsert(client, index, data)
-});
+  return { index, body };
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  helper
+  OpenSearchClient,
+  bulkCreate,
+  bulkDelete,
+  bulkIndex,
+  bulkUpdate
 });

package/dist/index.mjs

@@ -1,187 +1,45 @@
-// src/openSearchHelper.ts
-import assert from "node:assert";
-
-// src/fixIds.ts
-import omit from "omit";
-var omitId = omit("id");
-var fixIds = (searchQuery) => {
-  const { query: q, _source, from, size, sort } = searchQuery.body;
-  const body = {
-    query: {
-      ids: q.ids,
-      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,
-      filter: q.filter ? fixFilter(q.filter) : void 0,
-      fuzzy: q.fuzzy ? fixId(q.fuzzy) : void 0,
-      highlight: q.highlight,
-      match_all: q.match_all,
-      match_phrase: q.match_phrase ? fixId(q.match_phrase) : void 0,
-      match_phrase_prefix: q.match_phrase_prefix ? fixId(q.match_phrase_prefix) : void 0,
-      more_like_this: q.more_like_this ? fixWithFields(q.more_like_this) : void 0,
-      multi_match: q.multi_match ? fixId(q.multi_match) : void 0,
-      prefix: q.prefix ? fixId(q.prefix) : void 0,
-      range: q.range ? fixId(q.range) : void 0,
-      regexp: q.regexp ? fixId(q.regexp) : void 0,
-      script_score: q.script_score,
-      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)
-  };
-};
-var fixBool = (bool) => ({
-  ...bool,
-  filter: bool.filter ? Array.isArray(bool.filter) ? bool.filter.map(fixFilter) : fixFilter(bool.filter) : void 0,
-  boost: bool.boost,
-  minimum_should_match: bool.minimum_should_match,
-  must: bool.must ? Array.isArray(bool.must) ? bool.must.map(fixFilter) : fixFilter(bool.must) : void 0,
-  must_not: bool.must_not ? Array.isArray(bool.must_not) ? bool.must_not.map(fixFilter) : fixFilter(bool.must_not) : void 0,
-  should: bool.should ? Array.isArray(bool.should) ? bool.should.map(fixFilter) : fixFilter(bool.should) : void 0
-});
-var fixFilter = (filter) => clean({
-  bool: filter.bool ? fixBool(filter.bool) : void 0,
-  exists: filter.exists ? fixExists(filter.exists) : void 0,
-  fuzzy: filter.fuzzy ? fixId(filter.fuzzy) : void 0,
-  match: filter.match ? fixId(filter.match) : void 0,
-  match_phrase: filter.match_phrase ? fixId(filter.match_phrase) : void 0,
-  multi_match: filter.multi_match ? fixId(filter.multi_match) : void 0,
-  match_phrase_prefix: filter.match_phrase_prefix ? fixId(filter.match_phrase_prefix) : void 0,
-  prefix: filter.prefix ? fixId(filter.prefix) : void 0,
-  query_string: filter.query_string ? fixWithFields(filter.query_string) : void 0,
-  range: filter.range ? fixId(filter.range) : void 0,
-  regexp: filter.regexp ? fixId(filter.regexp) : void 0,
-  simple_query_string: filter.simple_query_string ? fixWithFields(filter.simple_query_string) : void 0,
-  term: filter.term ? fixId(filter.term) : void 0,
-  terms: filter.terms ? fixId(filter.terms) : void 0,
-  wildcard: filter.wildcard ? fixId(filter.wildcard) : void 0
-});
-var fixWithFields = (old) => ({
-  ...old,
-  fields: old.fields ? old.fields.map(fixIdValue) : void 0
-});
-var fixExists = (exists) => ({
-  ...exists,
-  field: fixIdValue(exists.field)
-});
-var fixId = (old) => {
-  const fixed = omitId(old);
-  if (old.id) fixed._id = old.id;
-  return fixed;
-};
-var fixIdValue = (val) => val === "id" ? "_id" : 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/client.ts
+import { Client } from "@opensearch-project/opensearch";
+var OpenSearchClient = function(...args) {
+  const clientInstance = new Client(...args);
+  return clientInstance;
 };
 
-// src/openSearchHelper.ts
-var typedSearch = async (client, searchQuery) => {
-  const response = await client.search(
-    fixIds(searchQuery)
-  );
-  const results = response.body.hits.hits.map(
-    // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-    (hit) => ({
-      id: hit._id,
-      ...hit._source
-    })
-  );
-  return { results, response };
-};
-var typedIndex = async (client, index, data) => {
-  const { id, ...body } = data;
-  const response = await client.index({
-    index,
-    id,
-    body,
-    refresh: true
-    // Adjust based on your requirement
+// src/helpers.ts
+function bulkIndex(index, docs, idFn) {
+  const body = docs.flatMap((doc) => {
+    const op = idFn ? { _id: idFn(doc) } : {};
+    return [{ index: op }, doc];
   });
-  return response;
-};
-var typedUpsert = async (client, index, data) => {
-  const { id, ...doc } = data;
-  const response = await client.update({
-    index,
-    id,
-    body: {
-      doc,
-      doc_as_upsert: true
-    }
+  return { index, body };
+}
+function bulkCreate(index, docs, idFn) {
+  const body = docs.flatMap((doc) => {
+    const op = { _id: idFn(doc) };
+    return [{ create: op }, doc];
   });
-  return response;
-};
-var typedBulkUpsert = async (client, index, items) => {
-  const body = items.flatMap((item) => {
-    const { id, ...doc } = item;
-    return [
-      { update: { _index: index, _id: id } },
-      { doc, doc_as_upsert: true }
-    ];
+  return { index, body };
+}
+function bulkUpdate(index, updates, idFn) {
+  const body = updates.flatMap((update) => {
+    const op = {
+      _id: idFn(update.doc || update.upsert)
+    };
+    return [{ update: op }, update];
   });
-  const response = await client.bulk({ body });
-  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;
-    if (typeof value === "object" && value !== null && !isLeafNode(value)) {
-      flattenObject(value, newKey, result);
-    } else {
-      result[newKey] = value;
-    }
-  }
-  return result;
-};
-var typedIndexCreate = async (client, index, { mappings, ...props }) => {
-  const { body: exists } = await client.indices.exists({ index });
-  if (exists) {
-    return;
-  }
-  const response = await client.indices.create({
-    index,
-    body: {
-      ...props,
-      mappings: (mappings == null ? void 0 : mappings.properties) ? { properties: flattenObject(mappings.properties) } : void 0
-    }
+  return { index, body };
+}
+function bulkDelete(index, ids) {
+  const body = ids.map((_id) => {
+    const op = { _id };
+    return { delete: op };
   });
-  return response;
-};
-var helper = (client) => ({
-  ...client,
-  typedBulkUpsert: (index, data) => typedBulkUpsert(client, index, data),
-  typedIndexCreate: (index, options) => typedIndexCreate(client, index, options),
-  typedIndex: (index, data) => typedIndex(client, index, data),
-  typedSearch: (query) => typedSearch(client, query),
-  typedUpsert: (index, data) => typedUpsert(client, index, data)
-});
+  return { index, body };
+}
 export {
-  helper
+  OpenSearchClient,
+  bulkCreate,
+  bulkDelete,
+  bulkIndex,
+  bulkUpdate
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sebspark/opensearch",
-  "version": "0.3.3",
+  "version": "1.0.1",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -13,14 +13,14 @@
     "dev": "tsc --watch --noEmit",
     "lint": "biome check .",
     "test": "vitest run --passWithNoTests --coverage",
+    "test:e2e": "vitest --config vitest.config.e2e.ts --run",
     "typecheck": "vitest --typecheck.only --passWithNoTests"
   },
   "devDependencies": {
-    "@types/omit": "1.0.3",
+    "testcontainers": "10.25.0",
     "tsconfig": "*"
   },
   "dependencies": {
-    "@opensearch-project/opensearch": "2.13.0",
-    "omit": "1.0.1"
+    "@opensearch-project/opensearch": "3.2.0"
   }
 }