@xnestjs/storage 1.5.2 → 1.5.3

package/cjs/get-connection-options.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getConnectionOptions = getConnectionOptions;
+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 getConnectionOptions(moduleOptions, prefix = 'STORAGE_') {
+    const options = (0, objects_1.clone)(moduleOptions);
+    const env = node_process_1.default.env;
+    options.provider = options.provider || env[prefix + 'PROVIDER'];
+    if (!options.provider)
+        throw new Error(`You must provide a Storage provider or "${prefix + 'PROVIDER'}" env variable`);
+    if (options.provider === 's3') {
+        options.s3 = options.s3 || {};
+        options.s3.endPoint = options.s3.endPoint ?? env[prefix + 'S3_ENDPOINT'];
+        options.s3.accessKey = options.s3.secretKey ?? env[prefix + 'S3_ACCESS_KEY'];
+        options.s3.secretKey = options.s3.secretKey ?? env[prefix + 'S3_SECRET_KEY'];
+        options.s3.useSSL = options.s3.useSSL ?? (0, putil_varhelpers_1.toBoolean)(env[prefix + 'S3_SSL']);
+        options.s3.port = options.s3.port ?? (0, putil_varhelpers_1.toInt)(env[prefix + 'S3_PORT']);
+        options.s3.sessionToken = options.s3.sessionToken ?? env[prefix + 'S3_SESSION_TOKEN'];
+        options.s3.partSize = options.s3.partSize ?? (0, putil_varhelpers_1.toInt)(env[prefix + 'S3_PART_SIZE']);
+        options.s3.pathStyle = options.s3.pathStyle ?? (0, putil_varhelpers_1.toBoolean)(env[prefix + 'S3_PATH_STYLE']);
+        options.s3.s3AccelerateEndpoint = options.s3.s3AccelerateEndpoint ?? env[prefix + 'S3_ACC_ENDPOINT'];
+    }
+    else
+        throw new Error(`Unknown Storage provider (${options.provider})`);
+    return options;
+}

package/cjs/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./constants.js"), exports);
+tslib_1.__exportStar(require("./get-connection-options.js"), exports);
 tslib_1.__exportStar(require("./services/storage-bucket.js"), exports);
 tslib_1.__exportStar(require("./services/storage-connection.js"), exports);
 tslib_1.__exportStar(require("./storage.module.js"), exports);

package/cjs/storage-core.module.js

@@ -3,12 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StorageCoreModule = void 0;
 const tslib_1 = require("tslib");
 const node_assert_1 = tslib_1.__importDefault(require("node:assert"));
-const node_process_1 = tslib_1.__importDefault(require("node:process"));
-const objects_1 = require("@jsopen/objects");
 const common_1 = require("@nestjs/common");
 const crypto_1 = tslib_1.__importDefault(require("crypto"));
-const putil_varhelpers_1 = require("putil-varhelpers");
 const constants_js_1 = require("./constants.js");
+const get_connection_options_js_1 = require("./get-connection-options.js");
 const s3_storage_connection_js_1 = require("./providers/s3-storage-connection.js");
 const storage_connection_js_1 = require("./services/storage-connection.js");
 const CLIENT_TOKEN = Symbol('CLIENT_TOKEN');
@@ -17,7 +15,7 @@ class StorageCoreModule {
      * Configures and returns a dynamic module
      */
     static forRoot(moduleOptions) {
-        const connectionOptions = this._readConnectionOptions(moduleOptions.useValue || {}, moduleOptions.envPrefix);
+        const connectionOptions = (0, get_connection_options_js_1.getConnectionOptions)(moduleOptions.useValue || {}, moduleOptions.envPrefix);
         return this._createDynamicModule(moduleOptions, {
             global: moduleOptions.global,
             providers: [
@@ -41,34 +39,12 @@ class StorageCoreModule {
                     inject: asyncOptions.inject,
                     useFactory: async (...args) => {
                         const opts = await asyncOptions.useFactory(...args);
-                        return this._readConnectionOptions(opts, asyncOptions.envPrefix);
+                        return (0, get_connection_options_js_1.getConnectionOptions)(opts, asyncOptions.envPrefix);
                     },
                 },
             ],
         });
     }
-    static _readConnectionOptions(moduleOptions, prefix = 'STORAGE_') {
-        const options = (0, objects_1.clone)(moduleOptions);
-        const env = node_process_1.default.env;
-        options.provider = options.provider || env[prefix + 'PROVIDER'];
-        if (!options.provider)
-            throw new Error(`You must provide a Storage provider or "${prefix + 'PROVIDER'}" env variable`);
-        if (options.provider === 's3') {
-            options.s3 = options.s3 || {};
-            options.s3.endPoint = options.s3.endPoint ?? env[prefix + 'S3_ENDPOINT'];
-            options.s3.accessKey = options.s3.secretKey ?? env[prefix + 'S3_ACCESS_KEY'];
-            options.s3.secretKey = options.s3.secretKey ?? env[prefix + 'S3_SECRET_KEY'];
-            options.s3.useSSL = options.s3.useSSL ?? (0, putil_varhelpers_1.toBoolean)(env[prefix + 'S3_SSL']);
-            options.s3.port = options.s3.port ?? (0, putil_varhelpers_1.toInt)(env[prefix + 'S3_PORT']);
-            options.s3.sessionToken = options.s3.sessionToken ?? env[prefix + 'S3_SESSION_TOKEN'];
-            options.s3.partSize = options.s3.partSize ?? (0, putil_varhelpers_1.toInt)(env[prefix + 'S3_PART_SIZE']);
-            options.s3.pathStyle = options.s3.pathStyle ?? (0, putil_varhelpers_1.toBoolean)(env[prefix + 'S3_PATH_STYLE']);
-            options.s3.s3AccelerateEndpoint = options.s3.s3AccelerateEndpoint ?? env[prefix + 'S3_ACC_ENDPOINT'];
-        }
-        else
-            throw new Error(`Unknown Storage provider (${options.provider})`);
-        return options;
-    }
     static _createDynamicModule(opts, metadata) {
         const token = opts.token ?? storage_connection_js_1.StorageConnection;
         const providers = [

package/esm/get-connection-options.js

@@ -0,0 +1,25 @@
+import process from 'node:process';
+import { clone } from '@jsopen/objects';
+import { toBoolean, toInt } from 'putil-varhelpers';
+export function getConnectionOptions(moduleOptions, prefix = 'STORAGE_') {
+    const options = clone(moduleOptions);
+    const env = process.env;
+    options.provider = options.provider || env[prefix + 'PROVIDER'];
+    if (!options.provider)
+        throw new Error(`You must provide a Storage provider or "${prefix + 'PROVIDER'}" env variable`);
+    if (options.provider === 's3') {
+        options.s3 = options.s3 || {};
+        options.s3.endPoint = options.s3.endPoint ?? env[prefix + 'S3_ENDPOINT'];
+        options.s3.accessKey = options.s3.secretKey ?? env[prefix + 'S3_ACCESS_KEY'];
+        options.s3.secretKey = options.s3.secretKey ?? env[prefix + 'S3_SECRET_KEY'];
+        options.s3.useSSL = options.s3.useSSL ?? toBoolean(env[prefix + 'S3_SSL']);
+        options.s3.port = options.s3.port ?? toInt(env[prefix + 'S3_PORT']);
+        options.s3.sessionToken = options.s3.sessionToken ?? env[prefix + 'S3_SESSION_TOKEN'];
+        options.s3.partSize = options.s3.partSize ?? toInt(env[prefix + 'S3_PART_SIZE']);
+        options.s3.pathStyle = options.s3.pathStyle ?? toBoolean(env[prefix + 'S3_PATH_STYLE']);
+        options.s3.s3AccelerateEndpoint = options.s3.s3AccelerateEndpoint ?? env[prefix + 'S3_ACC_ENDPOINT'];
+    }
+    else
+        throw new Error(`Unknown Storage provider (${options.provider})`);
+    return options;
+}

package/esm/index.js

@@ -1,4 +1,5 @@
 export * from './constants.js';
+export * from './get-connection-options.js';
 export * from './services/storage-bucket.js';
 export * from './services/storage-connection.js';
 export * from './storage.module.js';

package/esm/storage-core.module.js

@@ -1,10 +1,8 @@
 import assert from 'node:assert';
-import process from 'node:process';
-import { clone } from '@jsopen/objects';
 import { Logger } from '@nestjs/common';
 import crypto from 'crypto';
-import { toBoolean, toInt } from 'putil-varhelpers';
 import { STORAGE_MODULE_ID, STORAGE_OPTIONS } from './constants.js';
+import { getConnectionOptions } from './get-connection-options.js';
 import { S3StorageConnection } from './providers/s3-storage-connection.js';
 import { StorageConnection } from './services/storage-connection.js';
 const CLIENT_TOKEN = Symbol('CLIENT_TOKEN');
@@ -13,7 +11,7 @@ export class StorageCoreModule {
      * Configures and returns a dynamic module
      */
     static forRoot(moduleOptions) {
-        const connectionOptions = this._readConnectionOptions(moduleOptions.useValue || {}, moduleOptions.envPrefix);
+        const connectionOptions = getConnectionOptions(moduleOptions.useValue || {}, moduleOptions.envPrefix);
         return this._createDynamicModule(moduleOptions, {
             global: moduleOptions.global,
             providers: [
@@ -37,34 +35,12 @@ export class StorageCoreModule {
                     inject: asyncOptions.inject,
                     useFactory: async (...args) => {
                         const opts = await asyncOptions.useFactory(...args);
-                        return this._readConnectionOptions(opts, asyncOptions.envPrefix);
+                        return getConnectionOptions(opts, asyncOptions.envPrefix);
                     },
                 },
             ],
         });
     }
-    static _readConnectionOptions(moduleOptions, prefix = 'STORAGE_') {
-        const options = clone(moduleOptions);
-        const env = process.env;
-        options.provider = options.provider || env[prefix + 'PROVIDER'];
-        if (!options.provider)
-            throw new Error(`You must provide a Storage provider or "${prefix + 'PROVIDER'}" env variable`);
-        if (options.provider === 's3') {
-            options.s3 = options.s3 || {};
-            options.s3.endPoint = options.s3.endPoint ?? env[prefix + 'S3_ENDPOINT'];
-            options.s3.accessKey = options.s3.secretKey ?? env[prefix + 'S3_ACCESS_KEY'];
-            options.s3.secretKey = options.s3.secretKey ?? env[prefix + 'S3_SECRET_KEY'];
-            options.s3.useSSL = options.s3.useSSL ?? toBoolean(env[prefix + 'S3_SSL']);
-            options.s3.port = options.s3.port ?? toInt(env[prefix + 'S3_PORT']);
-            options.s3.sessionToken = options.s3.sessionToken ?? env[prefix + 'S3_SESSION_TOKEN'];
-            options.s3.partSize = options.s3.partSize ?? toInt(env[prefix + 'S3_PART_SIZE']);
-            options.s3.pathStyle = options.s3.pathStyle ?? toBoolean(env[prefix + 'S3_PATH_STYLE']);
-            options.s3.s3AccelerateEndpoint = options.s3.s3AccelerateEndpoint ?? env[prefix + 'S3_ACC_ENDPOINT'];
-        }
-        else
-            throw new Error(`Unknown Storage provider (${options.provider})`);
-        return options;
-    }
     static _createDynamicModule(opts, metadata) {
         const token = opts.token ?? StorageConnection;
         const providers = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xnestjs/storage",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "NestJS extension library for Storage solutions (S3,GS)",
   "author": "Panates",
   "license": "MIT",

package/types/get-connection-options.d.ts

@@ -0,0 +1,2 @@
+import type { StorageOptions } from './types.js';
+export declare function getConnectionOptions(moduleOptions: Partial<StorageOptions>, prefix?: string): StorageOptions;

package/types/index.d.cts

@@ -1,4 +1,5 @@
 export * from './constants.js';
+export * from './get-connection-options.js';
 export * from './services/storage-bucket.js';
 export * from './services/storage-connection.js';
 export * from './storage.module.js';

package/types/index.d.ts

@@ -1,4 +1,5 @@
 export * from './constants.js';
+export * from './get-connection-options.js';
 export * from './services/storage-bucket.js';
 export * from './services/storage-connection.js';
 export * from './storage.module.js';

package/types/storage-core.module.d.ts

@@ -9,6 +9,5 @@ export declare class StorageCoreModule {
      * Configures and returns an async dynamic module
      */
     static forRootAsync(asyncOptions: StorageModuleAsyncOptions): DynamicModule;
-    private static _readConnectionOptions;
     private static _createDynamicModule;
 }