@flusys/nestjs-storage 1.1.0-beta → 2.0.0

package/cjs/services/folder.service.js

@@ -10,8 +10,9 @@ Object.defineProperty(exports, "FolderService", {
 });
 const _classes = require("@flusys/nestjs-shared/classes");
 const _modules = require("@flusys/nestjs-shared/modules");
+const _utils = require("@flusys/nestjs-shared/utils");
 const _common = require("@nestjs/common");
-const _config = require("../config");
+const _storageconfigservice = require("./storage-config.service");
 const _entities = require("../entities");
 const _storagedatasourceprovider = require("./storage-datasource.provider");
 function _define_property(obj, key, value) {
@@ -48,16 +49,13 @@ let FolderService = class FolderService extends _classes.RequestScopedApiService
     getDataSourceProvider() {
         return this.dataSourceProvider;
     }
-    // Entity Conversion
     async convertSingleDtoToEntity(dto, user) {
         const entity = await super.convertSingleDtoToEntity(dto, user);
-        // Set companyId from user context if company feature enabled
         if (this.storageConfig.isCompanyFeatureEnabled()) {
             entity.companyId = user?.companyId ?? null;
         }
         return entity;
     }
-    // Query Customization
     async getSelectQuery(query, _user, select) {
         if (!select?.length) {
             select = [
@@ -79,11 +77,10 @@ let FolderService = class FolderService extends _classes.RequestScopedApiService
     }
     async getExtraManipulateQuery(query, filterDto, user) {
         const result = await super.getExtraManipulateQuery(query, filterDto, user);
-        if (this.storageConfig.isCompanyFeatureEnabled() && user?.companyId) {
-            query.andWhere('folder.companyId = :companyId', {
-                companyId: user.companyId
-            });
-        }
+        (0, _utils.applyCompanyFilter)(query, {
+            isCompanyFeatureEnabled: this.storageConfig.isCompanyFeatureEnabled(),
+            entityAlias: 'folder'
+        }, user);
         return result;
     }
     constructor(cacheManager, utilsService, storageConfig, dataSourceProvider){
@@ -96,13 +93,13 @@ FolderService = _ts_decorate([
     }),
     _ts_param(0, (0, _common.Inject)('CACHE_INSTANCE')),
     _ts_param(1, (0, _common.Inject)(_modules.UtilsService)),
-    _ts_param(2, (0, _common.Inject)(_config.StorageConfigService)),
+    _ts_param(2, (0, _common.Inject)(_storageconfigservice.StorageConfigService)),
     _ts_param(3, (0, _common.Inject)(_storagedatasourceprovider.StorageDataSourceProvider)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
         typeof _classes.HybridCache === "undefined" ? Object : _classes.HybridCache,
         typeof _modules.UtilsService === "undefined" ? Object : _modules.UtilsService,
-        typeof _config.StorageConfigService === "undefined" ? Object : _config.StorageConfigService,
+        typeof _storageconfigservice.StorageConfigService === "undefined" ? Object : _storageconfigservice.StorageConfigService,
         typeof _storagedatasourceprovider.StorageDataSourceProvider === "undefined" ? Object : _storagedatasourceprovider.StorageDataSourceProvider
     ])
 ], FolderService);

package/cjs/services/index.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 _export_star(require("./file-manager.service"), exports);
 _export_star(require("./folder.service"), exports);
+_export_star(require("./storage-config.service"), exports);
 _export_star(require("./storage-provider-config.service"), exports);
 _export_star(require("./storage-datasource.provider"), exports);
 _export_star(require("./upload.service"), exports);

package/cjs/{config → services}/storage-config.service.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "StorageConfigService", {
 });
 const _common = require("@nestjs/common");
 const _interfaces = require("../interfaces");
-const _storageconstants = require("./storage.constants");
+const _storageconstants = require("../config/storage.constants");
 function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
@@ -38,114 +38,70 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
+const BYTES_PER_MB = 1024 * 1024;
+const DEFAULT_LOCAL_PATH = './uploads';
+const DEFAULT_PORT = '3000';
 let StorageConfigService = class StorageConfigService {
-    /**
-   * Check if company feature is enabled
-   */ isCompanyFeatureEnabled() {
+    // ─── IModuleConfigService Implementation ────────────────────────────────────
+    isCompanyFeatureEnabled() {
         return this.options.bootstrapAppConfig?.enableCompanyFeature ?? false;
     }
-    /**
-   * Get database mode
-   */ getDatabaseMode() {
+    getDatabaseMode() {
         return this.options.bootstrapAppConfig?.databaseMode ?? 'single';
     }
-    /**
-   * Get maximum file size in bytes
-   */ getMaxFileSize() {
+    isMultiTenant() {
+        return this.getDatabaseMode() === 'multi-tenant';
+    }
+    // ─── Config Getters ─────────────────────────────────────────────────────────
+    getMaxFileSize() {
         return this.options.config?.maxFileSize ?? _storageconstants.DEFAULT_MAX_FILE_SIZE;
     }
-    /**
-   * Get allowed file types (MIME types or patterns)
-   */ getAllowedFileTypes() {
+    getAllowedFileTypes() {
         return this.options.config?.allowedFileTypes ?? _storageconstants.DEFAULT_ALLOWED_FILE_TYPES;
     }
-    /**
-   * Check if file type is allowed
-   */ isFileTypeAllowed(mimeType) {
+    getOptions() {
+        return this.options;
+    }
+    getDefaultLocalStoragePath() {
+        return this.options.config?.localStoragePath ?? DEFAULT_LOCAL_PATH;
+    }
+    getAppUrl() {
+        return this.options.config?.appUrl ?? process.env.APP_URL ?? `http://localhost:${process.env.PORT ?? DEFAULT_PORT}`;
+    }
+    // ─── Validation Methods ─────────────────────────────────────────────────────
+    isFileTypeAllowed(mimeType) {
         const allowedTypes = this.getAllowedFileTypes();
-        // If wildcard, allow all
         if (allowedTypes.includes('*/*')) {
             return true;
         }
-        // Check exact match or wildcard pattern
-        return allowedTypes.some((allowedType)=>{
-            if (allowedType.endsWith('/*')) {
-                const prefix = allowedType.slice(0, -2);
-                return mimeType.startsWith(prefix);
-            }
-            return allowedType === mimeType;
-        });
+        return allowedTypes.some((type)=>type.endsWith('/*') ? mimeType.startsWith(type.slice(0, -2)) : type === mimeType);
     }
-    /**
-   * Validate file size
-   */ validateFileSize(fileSize) {
+    validateFileSize(fileSize) {
         const maxSize = this.getMaxFileSize();
         if (fileSize > maxSize) {
-            const maxSizeMB = (maxSize / (1024 * 1024)).toFixed(2);
-            const fileSizeMB = (fileSize / (1024 * 1024)).toFixed(2);
             return {
                 valid: false,
-                message: `File size (${fileSizeMB}MB) exceeds the maximum allowed size of ${maxSizeMB}MB`
+                message: `File size (${this.toMB(fileSize)}MB) exceeds maximum ${this.toMB(maxSize)}MB`
             };
         }
         return {
             valid: true
         };
     }
-    /**
-   * Validate file type
-   */ validateFileType(mimeType) {
+    validateFileType(mimeType) {
         if (!this.isFileTypeAllowed(mimeType)) {
-            const allowedTypes = this.getAllowedFileTypes();
             return {
                 valid: false,
-                message: `File type "${mimeType}" is not allowed. Allowed types: ${allowedTypes.join(', ')}`
+                message: `File type "${mimeType}" not allowed. Allowed: ${this.getAllowedFileTypes().join(', ')}`
             };
         }
         return {
             valid: true
         };
     }
-    /**
-   * Get default database config
-   */ getDefaultDatabaseConfig() {
-        return this.options.config?.defaultDatabaseConfig;
-    }
-    /**
-   * Get all options
-   */ getOptions() {
-        return this.options;
-    }
-    /**
-   * Get default local storage base path
-   * Used for serving local files without database lookup
-   * Falls back to './uploads' if not configured
-   */ getDefaultLocalStoragePath() {
-        // Check if localStoragePath is configured in module options
-        const configuredPath = this.options.config?.localStoragePath;
-        if (configuredPath) {
-            return configuredPath;
-        }
-        // Default to ./uploads in the project root
-        return './uploads';
-    }
-    /**
-   * Get application base URL for generating file URLs
-   * - First tries module config
-   * - Falls back to APP_URL env var
-   * - Finally constructs from PORT env var
-   */ getAppUrl() {
-        // Try from module config first
-        if (this.options.config?.appUrl) {
-            return this.options.config.appUrl;
-        }
-        // Fallback: read directly from environment
-        if (process.env.APP_URL) {
-            return process.env.APP_URL;
-        }
-        // Last resort: construct from PORT
-        const port = process.env.PORT || '3000';
-        return `http://localhost:${port}`;
+    // ─── Private Helpers ────────────────────────────────────────────────────────
+    toMB(bytes) {
+        return (bytes / BYTES_PER_MB).toFixed(2);
     }
     constructor(options){
         _define_property(this, "options", void 0);

package/cjs/services/storage-datasource.provider.js

@@ -12,8 +12,7 @@ const _modules = require("@flusys/nestjs-shared/modules");
 const _common = require("@nestjs/common");
 const _core = require("@nestjs/core");
 const _express = require("express");
-const _interfaces = require("../interfaces");
-const _storageconstants = require("../config/storage.constants");
+const _storageconfigservice = require("./storage-config.service");
 function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
@@ -93,14 +92,11 @@ let StorageDataSourceProvider = class StorageDataSourceProvider extends _modules
         };
     }
     // Feature Flags
-    /** Get global enable company feature flag */ getEnableCompanyFeature() {
-        return this.storageOptions.bootstrapAppConfig?.enableCompanyFeature ?? false;
-    }
     /**
    * Get enable company feature for specific tenant
    * Falls back to global setting if not specified per-tenant
    */ getEnableCompanyFeatureForTenant(tenant) {
-        return tenant?.enableCompanyFeature ?? this.getEnableCompanyFeature();
+        return tenant?.enableCompanyFeature ?? this.configService.isCompanyFeatureEnabled();
     }
     /**
    * Get enable company feature for current request context
@@ -113,22 +109,16 @@ let StorageDataSourceProvider = class StorageDataSourceProvider extends _modules
    * For TypeORM repositories, we always use the base entities (FileManager, etc.)
    * but for migrations, we need the correct entity based on the feature flag.
    */ async getStorageEntities(enableCompanyFeature) {
-        const enable = enableCompanyFeature ?? this.getEnableCompanyFeature();
-        const { FileManager, Folder, StorageConfig } = await Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard(require("../entities")));
-        // For migrations and schema sync, return the appropriate entity
-        // Both versions map to the same table, but with different columns
-        if (enable) {
-            const { FileManagerWithCompany, FolderWithCompany, StorageConfigWithCompany } = await Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard(require("../entities")));
-            return [
-                FileManagerWithCompany,
-                FolderWithCompany,
-                StorageConfigWithCompany
-            ];
-        }
-        return [
-            FileManager,
-            Folder,
-            StorageConfig
+        const enable = enableCompanyFeature ?? this.configService.isCompanyFeatureEnabled();
+        const entities = await Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard(require("../entities")));
+        return enable ? [
+            entities.FileManagerWithCompany,
+            entities.FolderWithCompany,
+            entities.StorageConfigWithCompany
+        ] : [
+            entities.FileManager,
+            entities.Folder,
+            entities.StorageConfig
         ];
     }
     // Overrides
@@ -189,8 +179,8 @@ let StorageDataSourceProvider = class StorageDataSourceProvider extends _modules
             StorageDataSourceProvider.connectionLocks.delete(tenant.id);
         }
     }
-    constructor(storageOptions, request){
-        super(StorageDataSourceProvider.buildParentOptions(storageOptions), request), _define_property(this, "storageOptions", void 0), _define_property(this, "logger", void 0), this.storageOptions = storageOptions, this.logger = new _common.Logger(StorageDataSourceProvider.name);
+    constructor(configService, request){
+        super(StorageDataSourceProvider.buildParentOptions(configService.getOptions()), request), _define_property(this, "configService", void 0), _define_property(this, "logger", void 0), this.configService = configService, this.logger = new _common.Logger(StorageDataSourceProvider.name);
     }
 };
 // Override parent's static properties to have Storage-specific cache
@@ -204,12 +194,12 @@ StorageDataSourceProvider = _ts_decorate([
     (0, _common.Injectable)({
         scope: _common.Scope.REQUEST
     }),
-    _ts_param(0, (0, _common.Inject)(_storageconstants.STORAGE_MODULE_OPTIONS)),
+    _ts_param(0, (0, _common.Inject)(_storageconfigservice.StorageConfigService)),
     _ts_param(1, (0, _common.Optional)()),
     _ts_param(1, (0, _common.Inject)(_core.REQUEST)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
-        typeof _interfaces.StorageModuleOptions === "undefined" ? Object : _interfaces.StorageModuleOptions,
+        typeof _storageconfigservice.StorageConfigService === "undefined" ? Object : _storageconfigservice.StorageConfigService,
         typeof _express.Request === "undefined" ? Object : _express.Request
     ])
 ], StorageDataSourceProvider);

package/cjs/services/storage-provider-config.service.js

@@ -10,8 +10,9 @@ Object.defineProperty(exports, "StorageProviderConfigService", {
 });
 const _classes = require("@flusys/nestjs-shared/classes");
 const _modules = require("@flusys/nestjs-shared/modules");
+const _utils = require("@flusys/nestjs-shared/utils");
 const _common = require("@nestjs/common");
-const _config = require("../config");
+const _storageconfigservice = require("./storage-config.service");
 const _entities = require("../entities");
 const _storagedatasourceprovider = require("./storage-datasource.provider");
 function _define_property(obj, key, value) {
@@ -48,16 +49,13 @@ let StorageProviderConfigService = class StorageProviderConfigService extends _c
     getDataSourceProvider() {
         return this.dataSourceProvider;
     }
-    // Entity Conversion
     async convertSingleDtoToEntity(dto, user) {
         const entity = await super.convertSingleDtoToEntity(dto, user);
-        // Set companyId from user context if company feature enabled
         if (this.storageConfig.isCompanyFeatureEnabled()) {
             entity.companyId = user?.companyId ?? null;
         }
         return entity;
     }
-    // Query Customization
     async getSelectQuery(query, _user, select) {
         if (!select?.length) {
             select = [
@@ -82,19 +80,14 @@ let StorageProviderConfigService = class StorageProviderConfigService extends _c
     }
     async getExtraManipulateQuery(query, filterDto, user) {
         const result = await super.getExtraManipulateQuery(query, filterDto, user);
-        if (this.storageConfig.isCompanyFeatureEnabled() && user?.companyId) {
-            query.andWhere('storageConfig.companyId = :companyId', {
-                companyId: user.companyId
-            });
-        }
+        (0, _utils.applyCompanyFilter)(query, {
+            isCompanyFeatureEnabled: this.storageConfig.isCompanyFeatureEnabled(),
+            entityAlias: 'storageConfig'
+        }, user);
         query.orderBy(`${this.entityName}.createdAt`, 'DESC');
         return result;
     }
-    /**
-   * Find storage config by ID without throwing (returns null if not found)
-   * Uses direct repository query - bypasses company filtering
-   * Use for internal operations like file deletion where config ID is already known
-   */ async findByIdDirect(id) {
+    async findByIdDirect(id) {
         await this.ensureRepositoryInitialized();
         return await this.repository.findOne({
             where: {
@@ -102,19 +95,11 @@ let StorageProviderConfigService = class StorageProviderConfigService extends _c
             }
         });
     }
-    /**
-   * Get default storage configuration (scoped to user's company if enabled)
-   * Priority: isDefault=true > any active config (oldest first)
-   */ async getDefaultConfig(user) {
+    async getDefaultConfig(user) {
         await this.ensureRepositoryInitialized();
-        const baseWhere = {
+        const baseWhere = (0, _utils.buildCompanyWhereCondition)({
             isActive: true
-        };
-        // Filter by company only if company feature is enabled and user is provided
-        if (this.storageConfig.isCompanyFeatureEnabled() && user?.companyId) {
-            baseWhere.companyId = user.companyId;
-        }
-        // First try to find config marked as default
+        }, this.storageConfig.isCompanyFeatureEnabled(), user);
         const defaultConfig = await this.repository.findOne({
             where: {
                 ...baseWhere,
@@ -127,7 +112,6 @@ let StorageProviderConfigService = class StorageProviderConfigService extends _c
         if (defaultConfig) {
             return defaultConfig;
         }
-        // Fall back to any available active config (oldest first for consistency)
         return await this.repository.findOne({
             where: baseWhere,
             order: {
@@ -135,18 +119,12 @@ let StorageProviderConfigService = class StorageProviderConfigService extends _c
             }
         });
     }
-    /**
-   * Get storage configuration by type (scoped to user's company if enabled)
-   */ async getConfigByType(storage, user) {
+    async getConfigByType(storage, user) {
         await this.ensureRepositoryInitialized();
-        const where = {
+        const where = (0, _utils.buildCompanyWhereCondition)({
             storage,
             isActive: true
-        };
-        // Filter by company only if company feature is enabled and user is provided
-        if (this.storageConfig.isCompanyFeatureEnabled() && user?.companyId) {
-            where.companyId = user.companyId;
-        }
+        }, this.storageConfig.isCompanyFeatureEnabled(), user);
         return await this.repository.find({
             where
         });
@@ -161,13 +139,13 @@ StorageProviderConfigService = _ts_decorate([
     }),
     _ts_param(0, (0, _common.Inject)('CACHE_INSTANCE')),
     _ts_param(1, (0, _common.Inject)(_modules.UtilsService)),
-    _ts_param(2, (0, _common.Inject)(_config.StorageConfigService)),
+    _ts_param(2, (0, _common.Inject)(_storageconfigservice.StorageConfigService)),
     _ts_param(3, (0, _common.Inject)(_storagedatasourceprovider.StorageDataSourceProvider)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
         typeof _classes.HybridCache === "undefined" ? Object : _classes.HybridCache,
         typeof _modules.UtilsService === "undefined" ? Object : _modules.UtilsService,
-        typeof _config.StorageConfigService === "undefined" ? Object : _config.StorageConfigService,
+        typeof _storageconfigservice.StorageConfigService === "undefined" ? Object : _storageconfigservice.StorageConfigService,
         typeof _storagedatasourceprovider.StorageDataSourceProvider === "undefined" ? Object : _storagedatasourceprovider.StorageDataSourceProvider
     ])
 ], StorageProviderConfigService);