@sqb/nestjs 4.15.0 → 4.16.1

package/cjs/package.json

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

package/esm/index.js

@@ -1,10 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SqbClient = void 0;
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./sqb.decorators.js"), exports);
-tslib_1.__exportStar(require("./sqb.interface.js"), exports);
-tslib_1.__exportStar(require("./sqb.module.js"), exports);
-tslib_1.__exportStar(require("./sqb.utils.js"), exports);
-var connect_1 = require("@sqb/connect");
-Object.defineProperty(exports, "SqbClient", { enumerable: true, get: function () { return connect_1.SqbClient; } });
+export * from './sqb.decorators.js';
+export * from './sqb.interface.js';
+export * from './sqb.module.js';
+export * from './sqb.utils.js';
+export { SqbClient } from '@sqb/connect';

package/esm/package.json

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

package/esm/sqb-core.module.js

@@ -1,16 +1,13 @@
-"use strict";
 var SqbCoreModule_1;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SqbCoreModule = void 0;
-const tslib_1 = require("tslib");
-const common_1 = require("@nestjs/common");
-const core_1 = require("@nestjs/core");
-const connect_1 = require("@sqb/connect");
-const crypto = tslib_1.__importStar(require("crypto"));
-const rxjs_1 = require("rxjs");
-const rxjs = tslib_1.__importStar(require("rxjs"));
-const sqb_constants_js_1 = require("./sqb.constants.js");
-const sqb_utils_js_1 = require("./sqb.utils.js");
+import { __decorate, __metadata, __param } from "tslib";
+import { Global, Inject, Module } from '@nestjs/common';
+import { ModuleRef } from '@nestjs/core';
+import { SqbClient } from '@sqb/connect';
+import * as crypto from 'crypto';
+import { defer } from 'rxjs';
+import * as rxjs from 'rxjs';
+import { SQB_MODULE_ID, SQB_MODULE_OPTIONS } from './sqb.constants.js';
+import { getSQBToken, handleRetry } from './sqb.utils.js';
 let SqbCoreModule = SqbCoreModule_1 = class SqbCoreModule {
     constructor(options, moduleRef) {
         this.options = options;
@@ -18,11 +15,11 @@ let SqbCoreModule = SqbCoreModule_1 = class SqbCoreModule {
     }
     static forRoot(options = {}) {
         const optionsProvider = {
-            provide: sqb_constants_js_1.SQB_MODULE_OPTIONS,
+            provide: SQB_MODULE_OPTIONS,
             useValue: options,
         };
         const connectionProvider = {
-            provide: (0, sqb_utils_js_1.getSQBToken)(options.name),
+            provide: getSQBToken(options.name),
             useFactory: () => this.createConnection(options),
         };
         return {
@@ -33,8 +30,8 @@ let SqbCoreModule = SqbCoreModule_1 = class SqbCoreModule {
     }
     static forRootAsync(options) {
         const connectionProvider = {
-            provide: (0, sqb_utils_js_1.getSQBToken)(options.name),
-            inject: [sqb_constants_js_1.SQB_MODULE_OPTIONS],
+            provide: getSQBToken(options.name),
+            inject: [SQB_MODULE_OPTIONS],
             useFactory: async (sqbOptions) => this.createConnection(sqbOptions),
         };
         const asyncProviders = this.createAsyncProviders(options);
@@ -45,7 +42,7 @@ let SqbCoreModule = SqbCoreModule_1 = class SqbCoreModule {
                 ...asyncProviders,
                 connectionProvider,
                 {
-                    provide: sqb_constants_js_1.SQB_MODULE_ID,
+                    provide: SQB_MODULE_ID,
                     useValue: crypto.randomUUID(),
                 },
             ],
@@ -53,7 +50,7 @@ let SqbCoreModule = SqbCoreModule_1 = class SqbCoreModule {
         };
     }
     async onApplicationShutdown() {
-        const client = this.moduleRef.get((0, sqb_utils_js_1.getSQBToken)(this.options.name));
+        const client = this.moduleRef.get(getSQBToken(this.options.name));
         if (client)
             await client.close(this.options.shutdownWaitMs);
     }
@@ -74,7 +71,7 @@ let SqbCoreModule = SqbCoreModule_1 = class SqbCoreModule {
     static createAsyncOptionsProvider(options) {
         if (options.useFactory) {
             return {
-                provide: sqb_constants_js_1.SQB_MODULE_OPTIONS,
+                provide: SQB_MODULE_OPTIONS,
                 useFactory: options.useFactory,
                 inject: options.inject || [],
             };
@@ -82,7 +79,7 @@ let SqbCoreModule = SqbCoreModule_1 = class SqbCoreModule {
         const useClass = options.useClass || options.useExisting;
         if (useClass) {
             return {
-                provide: sqb_constants_js_1.SQB_MODULE_OPTIONS,
+                provide: SQB_MODULE_OPTIONS,
                 useFactory: (optionsFactory) => optionsFactory.createSqbOptions(options.name),
                 inject: [useClass],
             };
@@ -95,27 +92,27 @@ let SqbCoreModule = SqbCoreModule_1 = class SqbCoreModule {
         // @ts-ignore
         if (rxjs.lastValueFrom) {
             // @ts-ignore
-            return await rxjs.lastValueFrom((0, rxjs_1.defer)(async () => {
-                const client = new connect_1.SqbClient(options);
+            return await rxjs.lastValueFrom(defer(async () => {
+                const client = new SqbClient(options);
                 await client.test();
                 return client;
-            }).pipe((0, sqb_utils_js_1.handleRetry)(connectionToken, options.retryAttempts, options.retryDelay, options.verboseRetryLog, options.toRetry)));
+            }).pipe(handleRetry(connectionToken, options.retryAttempts, options.retryDelay, options.verboseRetryLog, options.toRetry)));
         }
         // NestJS 7
         // @ts-ignore
-        return await (0, rxjs_1.defer)(async () => {
-            const client = new connect_1.SqbClient(options);
+        return await defer(async () => {
+            const client = new SqbClient(options);
             await client.test();
             return client;
         })
-            .pipe((0, sqb_utils_js_1.handleRetry)(connectionToken, options.retryAttempts, options.retryDelay, options.verboseRetryLog, options.toRetry))
+            .pipe(handleRetry(connectionToken, options.retryAttempts, options.retryDelay, options.verboseRetryLog, options.toRetry))
             .toPromise();
     }
 };
-exports.SqbCoreModule = SqbCoreModule;
-exports.SqbCoreModule = SqbCoreModule = SqbCoreModule_1 = tslib_1.__decorate([
-    (0, common_1.Global)(),
-    (0, common_1.Module)({}),
-    tslib_1.__param(0, (0, common_1.Inject)(sqb_constants_js_1.SQB_MODULE_OPTIONS)),
-    tslib_1.__metadata("design:paramtypes", [Object, core_1.ModuleRef])
+SqbCoreModule = SqbCoreModule_1 = __decorate([
+    Global(),
+    Module({}),
+    __param(0, Inject(SQB_MODULE_OPTIONS)),
+    __metadata("design:paramtypes", [Object, ModuleRef])
 ], SqbCoreModule);
+export { SqbCoreModule };

package/esm/sqb.constants.js

@@ -1,5 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SQB_MODULE_ID = exports.SQB_MODULE_OPTIONS = void 0;
-exports.SQB_MODULE_OPTIONS = Symbol('SQB_MODULE_OPTIONS');
-exports.SQB_MODULE_ID = Symbol('SQB_MODULE_ID');
+export const SQB_MODULE_OPTIONS = Symbol('SQB_MODULE_OPTIONS');
+export const SQB_MODULE_ID = Symbol('SQB_MODULE_ID');

package/esm/sqb.decorators.js

@@ -1,7 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.InjectSQB = void 0;
-const common_1 = require("@nestjs/common");
-const sqb_utils_js_1 = require("./sqb.utils.js");
-const InjectSQB = (name) => (0, common_1.Inject)((0, sqb_utils_js_1.getSQBToken)(name));
-exports.InjectSQB = InjectSQB;
+import { Inject } from '@nestjs/common';
+import { getSQBToken } from './sqb.utils.js';
+export const InjectSQB = (name) => Inject(getSQBToken(name));

package/esm/sqb.interface.js

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

package/esm/sqb.module.js

@@ -1,25 +1,22 @@
-"use strict";
 var SqbModule_1;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SqbModule = void 0;
-const tslib_1 = require("tslib");
-const common_1 = require("@nestjs/common");
-const sqb_core_module_js_1 = require("./sqb-core.module.js");
+import { __decorate } from "tslib";
+import { Module } from '@nestjs/common';
+import { SqbCoreModule } from './sqb-core.module.js';
 let SqbModule = SqbModule_1 = class SqbModule {
     static forRoot(options) {
         return {
             module: SqbModule_1,
-            imports: [sqb_core_module_js_1.SqbCoreModule.forRoot(options)],
+            imports: [SqbCoreModule.forRoot(options)],
         };
     }
     static forRootAsync(options) {
         return {
             module: SqbModule_1,
-            imports: [sqb_core_module_js_1.SqbCoreModule.forRootAsync(options)],
+            imports: [SqbCoreModule.forRootAsync(options)],
         };
     }
 };
-exports.SqbModule = SqbModule;
-exports.SqbModule = SqbModule = SqbModule_1 = tslib_1.__decorate([
-    (0, common_1.Module)({})
+SqbModule = SqbModule_1 = __decorate([
+    Module({})
 ], SqbModule);
+export { SqbModule };

package/esm/sqb.utils.js

@@ -1,35 +1,31 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSQBToken = getSQBToken;
-exports.handleRetry = handleRetry;
-const common_1 = require("@nestjs/common");
-const connect_1 = require("@sqb/connect");
-const operators_1 = require("rxjs/operators");
-const logger = new common_1.Logger('SqbModule');
+import { Logger } from '@nestjs/common';
+import { SqbClient } from '@sqb/connect';
+import { delay, retryWhen, scan } from 'rxjs/operators';
+const logger = new Logger('SqbModule');
 /**
  * This function returns a Connection injection token for the given connection name.
  * @param {string | symbol} [name=SQB_DEFAULT_CONNECTION] This optional parameter is either
  * a SqbClient, or a ConnectionOptions or a string.
  * @returns {string | symbol} The Connection injection token.
  */
-function getSQBToken(name) {
+export function getSQBToken(name) {
     if (!name)
-        return connect_1.SqbClient;
+        return SqbClient;
     if (typeof name === 'symbol' || typeof name === 'function')
         return name;
     return `${name}_SqbConnection`;
 }
-function handleRetry(connectionName, retryAttempts = 9, retryDelay = 3000, verboseRetryLog = false, toRetry) {
-    return (source) => source.pipe((0, operators_1.retryWhen)(e => e.pipe((0, operators_1.scan)((errorCount, error) => {
+export function handleRetry(connectionName, retryAttempts = 9, retryDelay = 3000, verboseRetryLog = false, toRetry) {
+    return (source) => source.pipe(retryWhen(e => e.pipe(scan((errorCount, error) => {
         if (toRetry && !toRetry(error)) {
             throw error;
         }
-        const connectionInfo = !connectionName || connectionName === connect_1.SqbClient ? 'default' : ` (${String(connectionName)})`;
+        const connectionInfo = !connectionName || connectionName === SqbClient ? 'default' : ` (${String(connectionName)})`;
         const verboseMessage = verboseRetryLog ? ` Message: ${error.message}.` : '';
         logger.error(`Unable to connect to the database ${connectionInfo}.${verboseMessage} Retrying (${errorCount + 1})...`, error.stack);
         if (errorCount + 1 >= retryAttempts) {
             throw error;
         }
         return errorCount + 1;
-    }, 0), (0, operators_1.delay)(retryDelay))));
+    }, 0), delay(retryDelay))));
 }

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@sqb/nestjs",
   "description": "Nestjs module for data connection using SQB",
-  "version": "4.15.0",
+  "version": "4.16.1",
   "author": "Panates",
   "license": "Apache-2.0",
   "scripts": {
     "compile": "tsc",
     "prebuild": "npm run lint && npm run clean",
     "build": "npm run build:cjs && npm run build:esm",
-    "build:cjs": "tsc -b tsconfig-build-cjs.json",
-    "build:esm": "tsc -b tsconfig-build-esm.json",
+    "build:cjs": "tsc -b tsconfig-build-cjs.json && cp ../../support/package.cjs.json ../../build/nestjs/cjs/package.json",
+    "build:esm": "tsc -b tsconfig-build-esm.json && cp ../../support/package.esm.json ../../build/nestjs/esm/package.json",
     "postbuild": "cp README.md package.json ../../LICENSE ../../build/nestjs",
     "lint": "eslint . --max-warnings=0",
     "lint:fix": "eslint . --max-warnings=0 --fix",
@@ -21,33 +21,44 @@
     "clean:dist": "rimraf ../../build/postgres",
     "clean:cover": "rimraf ../../coverage/postgres"
   },
+  "dependencies": {
+    "tslib": "^2.6.3"
+  },
   "devDependencies": {
-    "@nestjs/common": "^10.3.10",
-    "@nestjs/core": "^10.3.10",
-    "@nestjs/platform-express": "^10.3.10",
-    "@nestjs/testing": "^10.3.10",
-    "postgrejs": "^2.16.0",
+    "@nestjs/common": "^10.4.0",
+    "@nestjs/core": "^10.4.0",
+    "@nestjs/platform-express": "^10.4.0",
+    "@nestjs/testing": "^10.4.0",
+    "postgrejs": "^2.18.1",
     "rxjs": "^7.8.1",
     "supertest": "^7.0.0"
   },
   "peerDependencies": {
     "@nestjs/common": ">=7.4.0",
     "@nestjs/core": ">=7.4.0",
-    "@sqb/builder": "^4.15.0",
-    "@sqb/connect": "^4.15.0",
+    "@sqb/builder": "^4.16.1",
+    "@sqb/connect": "^4.16.1",
     "reflect-metadata": "^0.2.2",
     "rxjs": ">=6.6.0"
   },
-  "main": "./cjs/index.js",
-  "module": "./esm/index.js",
-  "types": "./types/index.d.ts",
+  "type": "module",
   "exports": {
     ".": {
-      "require": "./cjs/index.js",
-      "import": "./esm/index.js",
-      "types": "./types/index.d.ts"
-    }
+      "import": {
+        "types": "./types/index.d.ts",
+        "default": "./esm/index.js"
+      },
+      "require": {
+        "types": "./types/index.d.ts",
+        "default": "./cjs/index.js"
+      },
+      "default": "./esm/index.js"
+    },
+    "./package.json": "./package.json"
   },
+  "main": "./cjs/index.js",
+  "module": "./esm/index.js",
+  "types": "./types/index.d.ts",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>",
     "Ilker Gurelli <i.gurelli@panates.com>"