@sqb/nestjs 4.0.1 → 4.0.5

package/dist/index.d.ts

@@ -1,4 +1,5 @@
-export * from './common/sqb.decorators';
-export * from './common/sqb.utils';
-export * from './interfaces/sqb-options.interface';
+export * from './sqb.decorators';
+export * from './sqb.interface';
 export * from './sqb.module';
+export * from './sqb.utils';
+export { SqbClient } from '@sqb/connect';

package/dist/index.js

@@ -10,7 +10,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./common/sqb.decorators"), exports);
-__exportStar(require("./common/sqb.utils"), exports);
-__exportStar(require("./interfaces/sqb-options.interface"), exports);
+exports.SqbClient = void 0;
+__exportStar(require("./sqb.decorators"), exports);
+__exportStar(require("./sqb.interface"), exports);
 __exportStar(require("./sqb.module"), exports);
+__exportStar(require("./sqb.utils"), exports);
+var connect_1 = require("@sqb/connect");
+Object.defineProperty(exports, "SqbClient", { enumerable: true, get: function () { return connect_1.SqbClient; } });

package/dist/sqb-core.module.d.ts

@@ -1,6 +1,6 @@
 import { DynamicModule, OnApplicationShutdown } from '@nestjs/common';
 import { ModuleRef } from '@nestjs/core';
-import { SqbModuleAsyncOptions, SqbModuleOptions } from './interfaces/sqb-options.interface';
+import { SqbModuleAsyncOptions, SqbModuleOptions } from './sqb.interface';
 export declare class SqbCoreModule implements OnApplicationShutdown {
     private readonly options;
     private readonly moduleRef;
@@ -10,5 +10,5 @@ export declare class SqbCoreModule implements OnApplicationShutdown {
     onApplicationShutdown(): Promise<void>;
     private static createAsyncProviders;
     private static createAsyncOptionsProvider;
-    private static createConnectionFactory;
+    private static createConnection;
 }

package/dist/sqb-core.module.js

@@ -33,12 +33,13 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 var SqbCoreModule_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqbCoreModule = void 0;
+const crypto = __importStar(require("crypto"));
 const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
 const rxjs_1 = require("rxjs");
 const rxjs = __importStar(require("rxjs"));
 const connect_1 = require("@sqb/connect");
-const sqb_utils_1 = require("./common/sqb.utils");
+const sqb_utils_1 = require("./sqb.utils");
 const sqb_constants_1 = require("./sqb.constants");
 let SqbCoreModule = SqbCoreModule_1 = class SqbCoreModule {
     constructor(options, moduleRef) {
@@ -51,8 +52,8 @@ let SqbCoreModule = SqbCoreModule_1 = class SqbCoreModule {
             useValue: options,
         };
         const connectionProvider = {
-            provide: (0, sqb_utils_1.getConnectionToken)(options),
-            useFactory: () => this.createConnectionFactory(options),
+            provide: (0, sqb_utils_1.getSQBToken)(options.name),
+            useFactory: () => this.createConnection(options),
         };
         return {
             module: SqbCoreModule_1,
@@ -62,11 +63,11 @@ let SqbCoreModule = SqbCoreModule_1 = class SqbCoreModule {
     }
     static forRootAsync(options) {
         const connectionProvider = {
-            provide: (0, sqb_utils_1.getConnectionToken)(options),
+            provide: (0, sqb_utils_1.getSQBToken)(options.name),
             inject: [sqb_constants_1.SQB_MODULE_OPTIONS],
             useFactory: async (sqbOptions) => {
                 const name = options.name || sqbOptions.name;
-                return await this.createConnectionFactory({
+                return this.createConnection({
                     ...sqbOptions,
                     name
                 });
@@ -81,14 +82,14 @@ let SqbCoreModule = SqbCoreModule_1 = class SqbCoreModule {
                 connectionProvider,
                 {
                     provide: sqb_constants_1.SQB_MODULE_ID,
-                    useValue: (0, sqb_utils_1.generateString)(),
+                    useValue: crypto.randomUUID(),
                 },
             ],
             exports: [connectionProvider],
         };
     }
     async onApplicationShutdown() {
-        const client = this.moduleRef.get((0, sqb_utils_1.getConnectionToken)(this.options));
+        const client = this.moduleRef.get((0, sqb_utils_1.getSQBToken)(this.options.name));
         if (client)
             await client.close(this.options.shutdownWaitMs);
     }
@@ -117,14 +118,14 @@ let SqbCoreModule = SqbCoreModule_1 = class SqbCoreModule {
         if (useClass) {
             return {
                 provide: sqb_constants_1.SQB_MODULE_OPTIONS,
-                useFactory: async (optionsFactory) => await optionsFactory.createSqbOptions(options.name),
+                useFactory: (optionsFactory) => optionsFactory.createSqbOptions(options.name),
                 inject: [useClass],
             };
         }
         throw new Error('Invalid configuration. Must provide useFactory, useClass or useExisting');
     }
-    static async createConnectionFactory(options) {
-        const connectionToken = options.name || sqb_constants_1.DEFAULT_CONNECTION_NAME;
+    static async createConnection(options) {
+        const connectionToken = options.name;
         // NestJS 8
         // @ts-ignore
         if (rxjs.lastValueFrom) {
@@ -133,7 +134,7 @@ let SqbCoreModule = SqbCoreModule_1 = class SqbCoreModule {
                 const client = new connect_1.SqbClient(options);
                 await client.test();
                 return client;
-            }).pipe((0, sqb_utils_1.handleRetry)(options.retryAttempts, options.retryDelay, connectionToken, options.verboseRetryLog, options.toRetry)));
+            }).pipe((0, sqb_utils_1.handleRetry)(connectionToken, options.retryAttempts, options.retryDelay, options.verboseRetryLog, options.toRetry)));
         }
         else {
             // NestJS 7
@@ -143,7 +144,7 @@ let SqbCoreModule = SqbCoreModule_1 = class SqbCoreModule {
                 await client.test();
                 return client;
             })
-                .pipe((0, sqb_utils_1.handleRetry)(options.retryAttempts, options.retryDelay, connectionToken, options.verboseRetryLog, options.toRetry))
+                .pipe((0, sqb_utils_1.handleRetry)(connectionToken, options.retryAttempts, options.retryDelay, options.verboseRetryLog, options.toRetry))
                 .toPromise();
         }
     }

package/dist/sqb.constants.d.ts

@@ -1,3 +1,2 @@
-export declare const SQB_MODULE_OPTIONS = "SqbModuleOptions";
-export declare const SQB_MODULE_ID = "SqbModuleId";
-export declare const DEFAULT_CONNECTION_NAME = "default";
+export declare const SQB_MODULE_OPTIONS: unique symbol;
+export declare const SQB_MODULE_ID: unique symbol;

package/dist/sqb.constants.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_CONNECTION_NAME = exports.SQB_MODULE_ID = exports.SQB_MODULE_OPTIONS = void 0;
-exports.SQB_MODULE_OPTIONS = 'SqbModuleOptions';
-exports.SQB_MODULE_ID = 'SqbModuleId';
-exports.DEFAULT_CONNECTION_NAME = 'default';
+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');

package/dist/sqb.decorators.d.ts

@@ -0,0 +1 @@
+export declare const InjectSQB: (name?: string) => ParameterDecorator;

package/dist/sqb.decorators.js

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

package/dist/sqb.module.d.ts

@@ -1,5 +1,5 @@
 import { DynamicModule } from '@nestjs/common';
-import { SqbModuleAsyncOptions, SqbModuleOptions } from './interfaces/sqb-options.interface';
+import { SqbModuleAsyncOptions, SqbModuleOptions } from './sqb.interface';
 export declare class SqbModule {
     static forRoot(options?: SqbModuleOptions): DynamicModule;
     static forRootAsync(options: SqbModuleAsyncOptions): DynamicModule;

package/dist/sqb.utils.d.ts

@@ -0,0 +1,11 @@
+import { Type } from '@nestjs/common';
+import { Observable } from 'rxjs';
+import { SqbClient } from '@sqb/connect';
+/**
+ * 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.
+ */
+export declare function getSQBToken(name?: string | symbol | Type<SqbClient>): string | symbol | Type<SqbClient>;
+export declare function handleRetry(connectionName?: string | symbol | Type<SqbClient>, retryAttempts?: number, retryDelay?: number, verboseRetryLog?: boolean, toRetry?: (err: any) => boolean): <T>(source: Observable<T>) => Observable<T>;

package/dist/sqb.utils.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleRetry = exports.getSQBToken = void 0;
+const common_1 = require("@nestjs/common");
+const operators_1 = require("rxjs/operators");
+const connect_1 = require("@sqb/connect");
+const logger = new common_1.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) {
+    if (!name)
+        return connect_1.SqbClient;
+    if (typeof name === 'symbol' || typeof name === 'function')
+        return name;
+    return `${name}_SqbConnection`;
+}
+exports.getSQBToken = getSQBToken;
+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) => {
+        if (toRetry && !toRetry(error)) {
+            throw error;
+        }
+        const connectionInfo = !connectionName || connectionName === connect_1.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))));
+}
+exports.handleRetry = handleRetry;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqb/nestjs",
   "description": "Nestjs module for data connection using SQB",
-  "version": "4.0.1",
+  "version": "4.0.5",
   "author": "Panates Ltd.",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>"
@@ -24,21 +24,21 @@
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-    "@nestjs/common": "^8.0.0",
-    "@nestjs/core": "^8.0.0",
-    "@nestjs/testing": "^8.0.0",
-    "@nestjs/platform-express": "^8.0.0",
+    "@nestjs/common": ">=7.4.0",
+    "@nestjs/core": ">=7.4.0",
+    "@nestjs/testing": ">=7.4.0",
+    "@nestjs/platform-express": ">=7.4.0",
     "postgresql-client": "^1.16.7",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.2.0",
     "supertest": "^6.1.3"
   },
   "peerDependencies": {
-    "@sqb/connect": ">=4.0.1",
-    "@sqb/builder": ">=4.0.1",
-    "@nestjs/common": "^7.6.x || >=8.0.0",
-    "@nestjs/core": "^7.6.x || >=8.0.0",
-    "rxjs": "^6.6.x || ^7.0.0"
+    "@sqb/connect": "^4.0.2",
+    "@sqb/builder": "^4.0.2",
+    "@nestjs/common": ">=7.4.0",
+    "@nestjs/core": ">=7.4.0",
+    "rxjs": ">=6.6.0"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/common/sqb.decorators.d.ts

@@ -1,2 +0,0 @@
-import { SqbModuleOptions } from '..';
-export declare const InjectConnection: (connection?: SqbModuleOptions | string) => ParameterDecorator;

package/dist/common/sqb.decorators.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.InjectConnection = void 0;
-const common_1 = require("@nestjs/common");
-const sqb_utils_1 = require("./sqb.utils");
-const InjectConnection = (connection) => (0, common_1.Inject)((0, sqb_utils_1.getConnectionToken)(connection));
-exports.InjectConnection = InjectConnection;

package/dist/common/sqb.utils.d.ts

@@ -1,13 +0,0 @@
-import { Type } from '@nestjs/common';
-import { Observable } from 'rxjs';
-import { SqbClient } from '@sqb/connect';
-import { SqbModuleOptions } from '../interfaces/sqb-options.interface';
-/**
- * This function returns a Connection injection token for the given Connection, ConnectionOptions or connection name.
- * @param {SqbModuleOptions | string} [client='default'] This optional parameter is either
- * a Connection, or a ConnectionOptions or a string.
- * @returns {string | Function} The Connection injection token.
- */
-export declare function getConnectionToken(client?: SqbModuleOptions | string): string | Type<SqbClient>;
-export declare function handleRetry(retryAttempts?: number, retryDelay?: number, connectionName?: string, verboseRetryLog?: boolean, toRetry?: (err: any) => boolean): <T>(source: Observable<T>) => Observable<T>;
-export declare const generateString: () => any;

package/dist/common/sqb.utils.js

@@ -1,44 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateString = exports.handleRetry = exports.getConnectionToken = void 0;
-const common_1 = require("@nestjs/common");
-const operators_1 = require("rxjs/operators");
-const connect_1 = require("@sqb/connect");
-const uuid_1 = require("uuid");
-const sqb_constants_1 = require("../sqb.constants");
-const logger = new common_1.Logger('SqbModule');
-/**
- * This function returns a Connection injection token for the given Connection, ConnectionOptions or connection name.
- * @param {SqbModuleOptions | string} [client='default'] This optional parameter is either
- * a Connection, or a ConnectionOptions or a string.
- * @returns {string | Function} The Connection injection token.
- */
-function getConnectionToken(client = sqb_constants_1.DEFAULT_CONNECTION_NAME) {
-    return sqb_constants_1.DEFAULT_CONNECTION_NAME === client ? connect_1.SqbClient
-        : ('string' === typeof client ? `${client}Connection`
-            : (sqb_constants_1.DEFAULT_CONNECTION_NAME === client.name || !client.name ? connect_1.SqbClient
-                : `${client.name}Connection`));
-}
-exports.getConnectionToken = getConnectionToken;
-function handleRetry(retryAttempts = 9, retryDelay = 3000, connectionName = sqb_constants_1.DEFAULT_CONNECTION_NAME, verboseRetryLog = false, toRetry) {
-    return (source) => source.pipe((0, operators_1.retryWhen)((e) => e.pipe((0, operators_1.scan)((errorCount, error) => {
-        if (toRetry && !toRetry(error)) {
-            throw error;
-        }
-        const connectionInfo = connectionName === sqb_constants_1.DEFAULT_CONNECTION_NAME
-            ? ''
-            : ` (${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))));
-}
-exports.handleRetry = handleRetry;
-const generateString = () => (0, uuid_1.v4)();
-exports.generateString = generateString;