@tstdl/base 0.85.14 → 0.86.0-beta2

package/search-index/elastic/search-index.js

@@ -1,166 +1,145 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var search_index_exports = {};
-__export(search_index_exports, {
-  ElasticSearchIndex: () => ElasticSearchIndex
-});
-module.exports = __toCommonJS(search_index_exports);
-var import_container = require("../../container/index.js");
-var import_bad_request_error = require("../../error/bad-request.error.js");
-var import_multi_error = require("../../error/multi.error.js");
-var import_search_index = require("../../search-index/index.js");
-var import_base64 = require("../../utils/base64.js");
-var import_encoding = require("../../utils/encoding.js");
-var import_object = require("../../utils/object/object.js");
-var import_type_guards = require("../../utils/type-guards.js");
-var import_keyword_rewriter = require("./keyword-rewriter.js");
-var import_query_converter = require("./query-converter.js");
-var import_sort_converter = require("./sort-converter.js");
-class ElasticSearchIndex extends import_search_index.SearchIndex {
-  logger;
-  client;
-  indexName;
-  indexSettings;
-  indexMapping;
-  keywordRewriter;
-  constructor(client, config, indexSettings, indexMapping, keywordRewrites, logger) {
-    super();
-    this.client = client;
-    this.indexName = config.indexName;
-    this.indexSettings = indexSettings;
-    this.indexMapping = indexMapping;
-    this.logger = logger;
-    this.keywordRewriter = new import_keyword_rewriter.KeywordRewriter(keywordRewrites);
-  }
-  async [import_container.afterResolve]() {
-    await this.initialize();
-  }
-  async initialize() {
-    const exists = await this.exists();
-    if (!exists) {
-      await this.client.indices.create({ index: this.indexName, mappings: this.indexMapping, settings: this.indexSettings });
-      this.logger.info(`created index ${this.indexName}`);
+import { afterResolve } from '../../container/index.js';
+import { BadRequestError } from '../../error/bad-request.error.js';
+import { MultiError } from '../../error/multi.error.js';
+import { SearchIndex, SearchIndexError } from '../../search-index/index.js';
+import { decodeBase64, encodeBase64 } from '../../utils/base64.js';
+import { decodeText, encodeUtf8 } from '../../utils/encoding.js';
+import { filterObject } from '../../utils/object/object.js';
+import { isDefined, isNumber, isString } from '../../utils/type-guards.js';
+import { KeywordRewriter } from './keyword-rewriter.js';
+import { convertQuery } from './query-converter.js';
+import { convertSort } from './sort-converter.js';
+export class ElasticSearchIndex extends SearchIndex {
+    logger;
+    client;
+    indexName;
+    indexSettings;
+    indexMapping;
+    keywordRewriter;
+    constructor(client, config, indexSettings, indexMapping, keywordRewrites, logger) {
+        super();
+        this.client = client;
+        this.indexName = config.indexName;
+        this.indexSettings = indexSettings;
+        this.indexMapping = indexMapping;
+        this.logger = logger;
+        this.keywordRewriter = new KeywordRewriter(keywordRewrites);
     }
-  }
-  async refresh() {
-    await this.client.indices.refresh({ index: this.indexName });
-  }
-  async updateSettings() {
-    this.logger.info(`closing index ${this.indexName} for updates`);
-    await this.client.indices.close({ index: this.indexName });
-    this.logger.info(`closed index ${this.indexName} for updates`);
-    this.logger.info(`updating settings for index ${this.indexName}`);
-    await this.client.indices.putSettings({ index: this.indexName, body: this.indexSettings });
-    this.logger.info(`updated settings for index ${this.indexName}`);
-    this.logger.info(`updating mapping for index ${this.indexName}`);
-    await this.client.indices.putMapping({ index: this.indexName, body: this.indexMapping });
-    this.logger.info(`updated mapping for index ${this.indexName}`);
-    this.logger.info(`reopening index ${this.indexName}`);
-    await this.client.indices.open({ index: this.indexName });
-    this.logger.info(`reopened index ${this.indexName}`);
-    this.logger.info(`refreshing index ${this.indexName}`);
-    await this.client.indices.refresh({ index: this.indexName });
-    this.logger.info(`refreshed index ${this.indexName}`);
-  }
-  async index(entities) {
-    const request = {
-      index: this.indexName,
-      refresh: false,
-      operations: entities.flatMap((entity) => {
-        const { id: _, ...entityWithoutId } = entity;
-        return [{ index: { _id: entity.id } }, entityWithoutId];
-      })
-    };
-    const result = await this.client.bulk(request);
-    if (result.errors) {
-      const errorItems = result.items.filter((item) => (0, import_type_guards.isDefined)(item.index.error)).map((item) => item.index);
-      const errors = errorItems.map((item) => convertError(item.error, item));
-      if (errors.length == 1) {
-        throw errors[0];
-      }
-      const multiError = new import_multi_error.MultiError(errors);
-      throw new import_search_index.SearchIndexError("index error", "multiple errors", { cause: multiError });
+    async [afterResolve]() {
+        await this.initialize();
     }
-  }
-  async delete(id) {
-    await this.client.delete({ index: this.indexName, id });
-  }
-  async deleteByQuery(query) {
-    const queryBody = (0, import_query_converter.convertQuery)(query);
-    await this.client.deleteByQuery({ index: this.indexName, body: { query: queryBody } });
-  }
-  // eslint-disable-next-line max-statements
-  async search(searchQueryOrCursor, options) {
-    const cursorData = (0, import_type_guards.isString)(searchQueryOrCursor) ? deserializeCursor(searchQueryOrCursor) : void 0;
-    const queryBody = (0, import_type_guards.isDefined)(cursorData) ? cursorData.query : (0, import_query_converter.convertQuery)(searchQueryOrCursor);
-    const search = { index: this.indexName, query: queryBody };
-    const windowLimit = this.indexSettings.max_result_window ?? 1e4;
-    if ((options?.skip ?? 0) + (options?.limit ?? 0) > windowLimit) {
-      throw new import_bad_request_error.BadRequestError(`Result window is too large, skip + limit must be less than or equal to ${windowLimit}. Use cursor for more results`);
+    async initialize() {
+        const exists = await this.exists();
+        if (!exists) {
+            await this.client.indices.create({ index: this.indexName, mappings: this.indexMapping, settings: this.indexSettings });
+            this.logger.info(`created index ${this.indexName}`);
+        }
     }
-    if ((0, import_type_guards.isDefined)(cursorData) && (0, import_type_guards.isDefined)(options?.skip)) {
-      throw new Error("cursor and skip cannot be used at the same time");
+    async refresh() {
+        await this.client.indices.refresh({ index: this.indexName });
     }
-    const sort = cursorData?.sort ?? (options?.sort ?? []).map((sortItem) => (0, import_sort_converter.convertSort)(sortItem, this.keywordRewriter));
-    search.sort = sort;
-    search.from = options?.skip;
-    search.size = options?.limit ?? cursorData?.options?.limit;
-    search.search_after = cursorData?.searchAfter;
-    const response = await this.client.search(search);
-    const hits = response.hits.hits;
-    const resultItems = hits.map(({ _id, _score, _source }) => ({ score: _score ?? 1, entity: { id: _id, ..._source } }));
-    const total = (0, import_type_guards.isNumber)(response.hits.total) ? response.hits.total : response.hits.total?.value;
-    const totalIsLowerBound = (0, import_type_guards.isNumber)(response.hits.total) ? false : response.hits.total?.relation == "gte";
-    const cursor = hits.length > 0 && (0, import_type_guards.isDefined)(hits[hits.length - 1].sort) ? serializeCursor(queryBody, sort, { limit: search.size }, hits[hits.length - 1].sort) : void 0;
-    const result = { total, milliseconds: response.took, totalIsLowerBound, cursor, items: resultItems };
-    return result;
-  }
-  async count(query, options) {
-    if ((0, import_type_guards.isDefined)(options?.skip) || (0, import_type_guards.isDefined)(options?.limit)) {
-      throw new Error("Options skip and limit for count are not support in ElasticSearchIndex.");
+    async updateSettings() {
+        this.logger.info(`closing index ${this.indexName} for updates`);
+        await this.client.indices.close({ index: this.indexName });
+        this.logger.info(`closed index ${this.indexName} for updates`);
+        this.logger.info(`updating settings for index ${this.indexName}`);
+        await this.client.indices.putSettings({ index: this.indexName, body: this.indexSettings });
+        this.logger.info(`updated settings for index ${this.indexName}`);
+        this.logger.info(`updating mapping for index ${this.indexName}`);
+        await this.client.indices.putMapping({ index: this.indexName, body: this.indexMapping });
+        this.logger.info(`updated mapping for index ${this.indexName}`);
+        this.logger.info(`reopening index ${this.indexName}`);
+        await this.client.indices.open({ index: this.indexName });
+        this.logger.info(`reopened index ${this.indexName}`);
+        this.logger.info(`refreshing index ${this.indexName}`);
+        await this.client.indices.refresh({ index: this.indexName });
+        this.logger.info(`refreshed index ${this.indexName}`);
     }
-    const result = await this.client.count({
-      index: this.indexName,
-      query: (0, import_query_converter.convertQuery)(query ?? {})
-    });
-    return result.count;
-  }
-  async drop() {
-    const exists = await this.exists();
-    if (!exists) {
-      return;
+    async index(entities) {
+        const request = {
+            index: this.indexName,
+            refresh: false,
+            operations: entities.flatMap((entity) => {
+                const { id: _, ...entityWithoutId } = entity;
+                return [{ index: { _id: entity.id } }, entityWithoutId];
+            })
+        };
+        const result = await this.client.bulk(request);
+        if (result.errors) {
+            const errorItems = result.items
+                .filter((item) => isDefined(item.index.error))
+                .map((item) => item.index);
+            const errors = errorItems.map((item) => convertError(item.error, item));
+            if (errors.length == 1) {
+                throw errors[0];
+            }
+            const multiError = new MultiError(errors);
+            throw new SearchIndexError('index error', 'multiple errors', { cause: multiError });
+        }
+    }
+    async delete(id) {
+        await this.client.delete({ index: this.indexName, id });
+    }
+    async deleteByQuery(query) {
+        const queryBody = convertQuery(query);
+        await this.client.deleteByQuery({ index: this.indexName, body: { query: queryBody } });
+    }
+    // eslint-disable-next-line max-statements
+    async search(searchQueryOrCursor, options) {
+        const cursorData = isString(searchQueryOrCursor) ? deserializeCursor(searchQueryOrCursor) : undefined;
+        const queryBody = isDefined(cursorData) ? cursorData.query : convertQuery(searchQueryOrCursor);
+        const search = { index: this.indexName, query: queryBody };
+        const windowLimit = this.indexSettings.max_result_window ?? 10000;
+        if ((options?.skip ?? 0) + (options?.limit ?? 0) > windowLimit) {
+            throw new BadRequestError(`Result window is too large, skip + limit must be less than or equal to ${windowLimit}. Use cursor for more results`);
+        }
+        if (isDefined(cursorData) && isDefined(options?.skip)) {
+            throw new Error('cursor and skip cannot be used at the same time');
+        }
+        const sort = cursorData?.sort ?? (options?.sort ?? []).map((sortItem) => convertSort(sortItem, this.keywordRewriter));
+        search.sort = sort;
+        search.from = options?.skip;
+        search.size = options?.limit ?? cursorData?.options?.limit;
+        search.search_after = cursorData?.searchAfter;
+        const response = await this.client.search(search);
+        const hits = response.hits.hits;
+        const resultItems = hits.map(({ _id, _score, _source }) => ({ score: _score ?? 1, entity: { id: _id, ..._source } }));
+        const total = isNumber(response.hits.total) ? response.hits.total : response.hits.total?.value;
+        const totalIsLowerBound = isNumber(response.hits.total) ? false : (response.hits.total?.relation == 'gte');
+        const cursor = (hits.length > 0) && (isDefined(hits[hits.length - 1].sort)) ? serializeCursor(queryBody, sort, { limit: search.size }, hits[hits.length - 1].sort) : undefined;
+        const result = { total, milliseconds: response.took, totalIsLowerBound, cursor, items: resultItems };
+        return result;
+    }
+    async count(query, options) {
+        if (isDefined(options?.skip) || isDefined(options?.limit)) {
+            throw new Error('Options skip and limit for count are not support in ElasticSearchIndex.');
+        }
+        const result = await this.client.count({
+            index: this.indexName,
+            query: convertQuery(query ?? {})
+        });
+        return result.count;
+    }
+    async drop() {
+        const exists = await this.exists();
+        if (!exists) {
+            return;
+        }
+        await this.client.indices.delete({ index: this.indexName });
+    }
+    async exists() {
+        return this.client.indices.exists({ index: this.indexName });
     }
-    await this.client.indices.delete({ index: this.indexName });
-  }
-  async exists() {
-    return this.client.indices.exists({ index: this.indexName });
-  }
 }
 function serializeCursor(query, sort, options, searchAfter) {
-  const filteredOptions = (0, import_type_guards.isDefined)(options) ? (0, import_object.filterObject)(options, import_type_guards.isDefined) : void 0;
-  const data = { query, sort, options: filteredOptions, searchAfter };
-  return (0, import_base64.encodeBase64)((0, import_encoding.encodeUtf8)(JSON.stringify(data)));
+    const filteredOptions = isDefined(options) ? filterObject(options, isDefined) : undefined;
+    const data = { query, sort, options: filteredOptions, searchAfter };
+    return encodeBase64(encodeUtf8(JSON.stringify(data)));
 }
 function deserializeCursor(cursor) {
-  return JSON.parse((0, import_encoding.decodeText)((0, import_base64.decodeBase64)(cursor)));
+    return JSON.parse(decodeText(decodeBase64(cursor)));
 }
 function convertError(error, raw) {
-  const cause = (0, import_type_guards.isDefined)(error.caused_by) ? convertError(error.caused_by) : void 0;
-  return new import_search_index.SearchIndexError(error.type, error.reason ?? "No error message provided.", { raw, cause });
+    const cause = (isDefined(error.caused_by)) ? convertError(error.caused_by) : undefined;
+    return new SearchIndexError(error.type, error.reason ?? 'No error message provided.', { raw, cause });
 }

package/search-index/elastic/sort-converter.js

@@ -1,36 +1,14 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var sort_converter_exports = {};
-__export(sort_converter_exports, {
-  convertSort: () => convertSort
-});
-module.exports = __toCommonJS(sort_converter_exports);
-const renameMap = /* @__PURE__ */ new Map([
-  ["id", "_id"],
-  ["$score", "_score"]
+const renameMap = new Map([
+    ['id', '_id'],
+    ['$score', '_score']
 ]);
-function convertSort(sort, keywordRewriter) {
-  const name = renameMap.get(sort.field) ?? sort.field;
-  const field = keywordRewriter.rewriteIfRequired(name);
-  const order = sort.order ?? "asc";
-  if (field != "_score" && order == "asc" || field == "_score" && order == "desc") {
-    return field;
-  }
-  return { [field]: order };
+// eslint-disable-next-line max-lines-per-function, max-statements, complexity
+export function convertSort(sort, keywordRewriter) {
+    const name = renameMap.get(sort.field) ?? sort.field;
+    const field = keywordRewriter.rewriteIfRequired(name);
+    const order = sort.order ?? 'asc';
+    if (((field != '_score') && (order == 'asc')) || ((field == '_score') && (order == 'desc'))) {
+        return field;
+    }
+    return { [field]: order };
 }

package/search-index/elastic/types.js

@@ -1,16 +1 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var types_exports = {};
-module.exports = __toCommonJS(types_exports);
+export {};

package/search-index/error.js

@@ -1,37 +1,14 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var error_exports = {};
-__export(error_exports, {
-  SearchIndexError: () => SearchIndexError
-});
-module.exports = __toCommonJS(error_exports);
-var import_custom_error = require("../error/custom.error.js");
-var import_type_guards = require("../utils/type-guards.js");
-class SearchIndexError extends import_custom_error.CustomError {
-  static errorName = "SearchIndexError";
-  type;
-  raw;
-  constructor(type, message, { raw, cause } = {}) {
-    super({ message, cause });
-    this.type = type;
-    if ((0, import_type_guards.isDefined)(raw)) {
-      this.raw = raw;
+import { CustomError } from '../error/custom.error.js';
+import { isDefined } from '../utils/type-guards.js';
+export class SearchIndexError extends CustomError {
+    static errorName = 'SearchIndexError';
+    type;
+    raw;
+    constructor(type, message, { raw, cause } = {}) {
+        super({ message, cause });
+        this.type = type;
+        if (isDefined(raw)) {
+            this.raw = raw;
+        }
     }
-  }
 }

package/search-index/index.js

@@ -1,20 +1,3 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var search_index_exports = {};
-module.exports = __toCommonJS(search_index_exports);
-__reExport(search_index_exports, require("./error.js"), module.exports);
-__reExport(search_index_exports, require("./search-index.js"), module.exports);
-__reExport(search_index_exports, require("./search-result.js"), module.exports);
+export * from './error.js';
+export * from './search-index.js';
+export * from './search-result.js';

package/search-index/memory/index.js

@@ -1,18 +1 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var memory_exports = {};
-module.exports = __toCommonJS(memory_exports);
-__reExport(memory_exports, require("./memory-search-index.js"), module.exports);
+export * from './memory-search-index.js';