@xnestjs/elasticsearch 1.12.3 → 1.13.0

package/{esm/elasticsearch-core.module.js → elasticsearch-core.module.js}

@@ -9,6 +9,9 @@ import { ELASTICSEARCH_CONNECTION_OPTIONS, ELASTICSEARCH_MODULE_ID, } from './co
 import { getElasticsearchConfig } from './get-elasticsearch-config.js';
 const CLIENT_TOKEN = Symbol('CLIENT_TOKEN');
 let ElasticsearchCoreModule = ElasticsearchCoreModule_1 = class ElasticsearchCoreModule {
+    client;
+    logger;
+    connectionOptions;
     /**
      *
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xnestjs/elasticsearch",
-  "version": "1.12.3",
+  "version": "1.13.0",
   "description": "NestJS extension library for ElasticSearch",
   "author": "Panates",
   "license": "MIT",
@@ -17,38 +17,22 @@
     "@nestjs/elasticsearch": "^10.0.0 || ^11.0.0"
   },
   "type": "module",
+  "module": "./index.js",
+  "types": "./index.d.ts",
   "exports": {
     ".": {
-      "import": {
-        "types": "./types/index.d.ts",
-        "default": "./esm/index.js"
-      },
-      "require": {
-        "types": "./types/index.d.cts",
-        "default": "./cjs/index.js"
-      },
-      "default": "./esm/index.js"
+      "types": "./index.d.ts",
+      "default": "./index.js"
     },
     "./package.json": "./package.json"
   },
-  "main": "./cjs/index.js",
-  "module": "./esm/index.js",
-  "types": "./types/index.d.ts",
+  "engines": {
+    "node": ">=20.0"
+  },
   "repository": {
     "registry": "https://github.com/panates/xnestjs.git",
     "directory": "packages/elasticsearch"
   },
-  "engines": {
-    "node": ">=16.0",
-    "npm": ">=7.0.0"
-  },
-  "files": [
-    "cjs/",
-    "esm/",
-    "types/",
-    "LICENSE",
-    "README.md"
-  ],
   "keywords": [
     "nestjs",
     "elasticsearch"

package/cjs/constants.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ELASTICSEARCH_MODULE_ID = exports.ELASTICSEARCH_CONNECTION_OPTIONS = void 0;
-exports.ELASTICSEARCH_CONNECTION_OPTIONS = Symbol('ELASTICSEARCH_CONNECTION_OPTIONS');
-exports.ELASTICSEARCH_MODULE_ID = Symbol('ELASTICSEARCH_MODULE_ID');

package/cjs/elasticsearch-core.module.js

@@ -1,134 +0,0 @@
-"use strict";
-var ElasticsearchCoreModule_1;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ElasticsearchCoreModule = void 0;
-const tslib_1 = require("tslib");
-const node_assert_1 = tslib_1.__importDefault(require("node:assert"));
-const crypto = tslib_1.__importStar(require("node:crypto"));
-const common_1 = require("@nestjs/common");
-const elasticsearch_1 = require("@nestjs/elasticsearch");
-const ansi_colors_1 = tslib_1.__importDefault(require("ansi-colors"));
-const constants_js_1 = require("./constants.js");
-const get_elasticsearch_config_js_1 = require("./get-elasticsearch-config.js");
-const CLIENT_TOKEN = Symbol('CLIENT_TOKEN');
-let ElasticsearchCoreModule = ElasticsearchCoreModule_1 = class ElasticsearchCoreModule {
-    /**
-     *
-     */
-    static forRoot(moduleOptions) {
-        const connectionOptions = (0, get_elasticsearch_config_js_1.getElasticsearchConfig)(moduleOptions.useValue || {}, moduleOptions.envPrefix);
-        return this._createDynamicModule(moduleOptions, {
-            providers: [
-                {
-                    provide: constants_js_1.ELASTICSEARCH_CONNECTION_OPTIONS,
-                    useValue: connectionOptions,
-                },
-            ],
-        });
-    }
-    /**
-     *
-     */
-    static forRootAsync(asyncOptions) {
-        node_assert_1.default.ok(asyncOptions.useFactory, 'useFactory is required');
-        return this._createDynamicModule(asyncOptions, {
-            providers: [
-                {
-                    provide: constants_js_1.ELASTICSEARCH_CONNECTION_OPTIONS,
-                    inject: asyncOptions.inject,
-                    useFactory: async (...args) => {
-                        const opts = await asyncOptions.useFactory(...args);
-                        return (0, get_elasticsearch_config_js_1.getElasticsearchConfig)(opts, asyncOptions.envPrefix);
-                    },
-                },
-            ],
-        });
-    }
-    static _createDynamicModule(opts, metadata) {
-        const token = opts.token ?? elasticsearch_1.ElasticsearchService;
-        const logger = typeof opts.logger === 'string' ? new common_1.Logger(opts.logger) : opts.logger;
-        const exports = [
-            constants_js_1.ELASTICSEARCH_CONNECTION_OPTIONS,
-            ...(metadata.exports ?? []),
-        ];
-        const providers = [
-            ...(metadata.providers ?? []),
-            {
-                provide: common_1.Logger,
-                useValue: logger,
-            },
-            {
-                provide: CLIENT_TOKEN,
-                useExisting: elasticsearch_1.ElasticsearchService,
-            },
-            {
-                provide: constants_js_1.ELASTICSEARCH_MODULE_ID,
-                useValue: crypto.randomUUID(),
-            },
-        ];
-        if (token !== elasticsearch_1.ElasticsearchService) {
-            exports.push(token);
-            providers.push({
-                provide: token,
-                useExisting: elasticsearch_1.ElasticsearchService,
-            });
-        }
-        else
-            exports.push(elasticsearch_1.ElasticsearchModule);
-        class InnerProvidersModule {
-        }
-        return {
-            global: opts.global,
-            module: ElasticsearchCoreModule_1,
-            providers,
-            imports: [
-                ...(metadata.imports ?? []),
-                elasticsearch_1.ElasticsearchModule.registerAsync({
-                    imports: [
-                        {
-                            module: InnerProvidersModule,
-                            providers: metadata.providers,
-                            exports: metadata.providers,
-                        },
-                    ],
-                    inject: [constants_js_1.ELASTICSEARCH_CONNECTION_OPTIONS],
-                    useFactory: async (connectionOptions) => {
-                        return connectionOptions;
-                    },
-                }),
-            ],
-            exports,
-        };
-    }
-    /**
-     *
-     * @constructor
-     */
-    constructor(client, logger, connectionOptions) {
-        this.client = client;
-        this.logger = logger;
-        this.connectionOptions = connectionOptions;
-    }
-    async onApplicationBootstrap() {
-        const options = this.connectionOptions;
-        if (options.lazyConnect)
-            return;
-        const nodes = options.node || options.nodes;
-        this.logger?.log(`Connecting to ElasticSearch at ${ansi_colors_1.default.blue(String(nodes))}`);
-        common_1.Logger.flush();
-        await this.client.ping({}).catch(e => {
-            this.logger.error('ElasticSearch connection failed: ' + e.message);
-            throw e;
-        });
-    }
-    onApplicationShutdown() {
-        return this.client.close();
-    }
-};
-exports.ElasticsearchCoreModule = ElasticsearchCoreModule;
-exports.ElasticsearchCoreModule = ElasticsearchCoreModule = ElasticsearchCoreModule_1 = tslib_1.__decorate([
-    tslib_1.__param(0, (0, common_1.Inject)(CLIENT_TOKEN)),
-    tslib_1.__param(2, (0, common_1.Inject)(constants_js_1.ELASTICSEARCH_CONNECTION_OPTIONS)),
-    tslib_1.__metadata("design:paramtypes", [elasticsearch_1.ElasticsearchService,
-        common_1.Logger, Object])
-], ElasticsearchCoreModule);

package/cjs/elasticsearch.module.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ElasticsearchModule = void 0;
-const elasticsearch_core_module_js_1 = require("./elasticsearch-core.module.js");
-/**
- * The ElasticsearchModule class is responsible for providing integration with Elasticsearch
- * through dynamic module configurations. It allows synchronous and asynchronous setup of
- * Elasticsearch configurations for use in a Node.js application.
- */
-class ElasticsearchModule {
-    /**
-     * Configures and returns the dynamic module for the Elasticsearch integration.
-     *
-     */
-    static forRoot(options) {
-        return {
-            module: ElasticsearchModule,
-            imports: [elasticsearch_core_module_js_1.ElasticsearchCoreModule.forRoot(options || {})],
-        };
-    }
-    /**
-     * Configures and returns the async dynamic module for the Elasticsearch integration.
-     *
-     */
-    static forRootAsync(options) {
-        return {
-            module: ElasticsearchModule,
-            imports: [elasticsearch_core_module_js_1.ElasticsearchCoreModule.forRootAsync(options)],
-        };
-    }
-}
-exports.ElasticsearchModule = ElasticsearchModule;

package/cjs/get-elasticsearch-config.js

@@ -1,78 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getElasticsearchConfig = getElasticsearchConfig;
-const tslib_1 = require("tslib");
-const node_process_1 = tslib_1.__importDefault(require("node:process"));
-const objects_1 = require("@jsopen/objects");
-const putil_varhelpers_1 = require("putil-varhelpers");
-function getElasticsearchConfig(moduleOptions, prefix = 'ELASTIC_') {
-    const options = (0, objects_1.clone)(moduleOptions);
-    const env = node_process_1.default.env;
-    options.node = options.node || env[prefix + 'NODE'];
-    if (options.node) {
-        if (typeof options.node === 'string' && options.node.includes(','))
-            options.node.split(/\s*,\s*/);
-    }
-    else {
-        options.nodes = options.nodes || env[prefix + 'NODES'];
-        if (options.nodes) {
-            if (typeof options.nodes === 'string' && options.nodes.includes(','))
-                options.nodes.split(/\s*,\s*/);
-        }
-    }
-    if (!(options.node || options.nodes))
-        options.node = 'http://localhost:9200';
-    options.maxRetries = options.maxRetries ?? (0, putil_varhelpers_1.toInt)(env[prefix + 'MAX_RETRIES']);
-    options.requestTimeout =
-        options.requestTimeout ?? (0, putil_varhelpers_1.toInt)(env[prefix + 'REQUEST_TIMEOUT']);
-    options.pingTimeout =
-        options.pingTimeout ?? (0, putil_varhelpers_1.toInt)(env[prefix + 'PING_TIMEOUT']);
-    if (options.tls == null && (0, putil_varhelpers_1.toBoolean)(env[prefix + 'TLS'])) {
-        options.tls = {
-            ca: [env[prefix + 'TLS_CA_CERT'] || ''],
-            cert: env[prefix + 'TLS_CERT_FILE'],
-            key: env[prefix + 'TLS_KEY_FILE'],
-            passphrase: env[prefix + 'TLS_KEY_PASSPHRASE'],
-            rejectUnauthorized: (0, putil_varhelpers_1.toBoolean)(env[prefix + 'TLS_REJECT_UNAUTHORIZED']),
-            checkServerIdentity: (host, cert) => {
-                if (cert.subject.CN !== host) {
-                    return new Error(`Certificate CN (${cert.subject.CN}) does not match host (${host})`);
-                }
-            },
-        };
-    }
-    options.name = options.name ?? env[prefix + 'NAME'];
-    if (!options.auth) {
-        if (env[prefix + 'AUTH_USERNAME']) {
-            options.auth = {
-                username: env[prefix + 'AUTH_USERNAME'],
-                password: env[prefix + 'AUTH_PASSWORD'] || '',
-            };
-        }
-        else if (env[prefix + 'AUTH_BEARER']) {
-            options.auth = {
-                bearer: env[prefix + 'AUTH_BEARER'],
-            };
-        }
-        else if (env[prefix + 'AUTH_API_KEY']) {
-            if (env[prefix + 'API_KEY_ID'])
-                options.auth = {
-                    apiKey: {
-                        id: env[prefix + 'API_KEY_ID'],
-                        api_key: env[prefix + 'API_KEY'],
-                    },
-                };
-            options.auth = {
-                apiKey: env[prefix + 'API_KEY'],
-            };
-        }
-    }
-    options.caFingerprint =
-        options.caFingerprint ?? env[prefix + 'CA_FINGERPRINT'];
-    options.maxResponseSize =
-        options.maxResponseSize ?? (0, putil_varhelpers_1.toInt)(env[prefix + 'MAX_RESPONSE_SIZE']);
-    options.maxCompressedResponseSize =
-        options.maxCompressedResponseSize ??
-            (0, putil_varhelpers_1.toInt)(env[prefix + 'MAX_COMPRESSED_RESPONSE_SIZE']);
-    return options;
-}

package/cjs/index.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ElasticsearchService = void 0;
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./constants.js"), exports);
-tslib_1.__exportStar(require("./elasticsearch.module.js"), exports);
-tslib_1.__exportStar(require("./get-elasticsearch-config.js"), exports);
-tslib_1.__exportStar(require("./types.js"), exports);
-var elasticsearch_1 = require("@nestjs/elasticsearch");
-Object.defineProperty(exports, "ElasticsearchService", { enumerable: true, get: function () { return elasticsearch_1.ElasticsearchService; } });

package/cjs/package.json

@@ -1,3 +0,0 @@
-{
-  "type": "commonjs"
-}

package/cjs/types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/esm/package.json

@@ -1,3 +0,0 @@
-{
-  "type": "module"
-}

package/types/index.d.cts

@@ -1,5 +0,0 @@
-export * from './constants.js';
-export * from './elasticsearch.module.js';
-export * from './get-elasticsearch-config.js';
-export * from './types.js';
-export { ElasticsearchService } from '@nestjs/elasticsearch';