@nest-omni/core 1.0.44 → 1.0.46

package/interceptors/language-interceptor.service.js

@@ -6,7 +6,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UseLanguageInterceptor = exports.LanguageInterceptor = void 0;
+exports.LanguageInterceptor = void 0;
+exports.UseLanguageInterceptor = UseLanguageInterceptor;
 const common_1 = require("@nestjs/common");
 const constants_1 = require("../constants");
 const providers_1 = require("../providers");
@@ -26,4 +27,3 @@ exports.LanguageInterceptor = LanguageInterceptor = __decorate([
 function UseLanguageInterceptor() {
     return (0, common_1.UseInterceptors)(LanguageInterceptor);
 }
-exports.UseLanguageInterceptor = UseLanguageInterceptor;

package/interfaces/IFile.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 export interface IFile {
     encoding: string;
     buffer: Buffer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nest-omni/core",
-  "version": "1.0.44",
+  "version": "1.0.46",
   "description": "framework",
   "main": "index.js",
   "types": "index.d.ts",
@@ -26,7 +26,7 @@
     "@nestjs/bull": "^10.0.1",
     "@nestjs/cache-manager": "^2.1.0",
     "@nestjs/common": "10.2.5",
-    "@nestjs/config": "^3.1.1",
+    "@nestjs/config": "^4.0.0",
     "@nestjs/core": "10.2.5",
     "@nestjs/microservices": "^10.2.5",
     "@nestjs/platform-express": "^10.2.5",
@@ -52,7 +52,7 @@
     "moment": "^2.29.4",
     "mysql2": "^3.6.1",
     "nestjs-cls": "^4.3.0",
-    "nestjs-i18n": "^10.3.2",
+    "nestjs-i18n": "^10.5.0",
     "nestjs-pino": "^3.4.0",
     "pino-http": "^8.5.0",
     "pino-pretty": "^10.2.0",

package/setup/bootstrap.setup.d.ts

@@ -1,5 +1,2 @@
-/// <reference types="node" />
-/// <reference types="node/http" />
-/// <reference types="pino-http" />
 import type { NestExpressApplication } from '@nestjs/platform-express';
-export declare function bootstrapSetup(AppModule: any, SetupSwagger: any): Promise<NestExpressApplication<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>>>;
+export declare function bootstrapSetup(AppModule: any, SetupSwagger: any): Promise<NestExpressApplication<import("http").Server>>;

package/setup/bootstrap.setup.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bootstrapSetup = void 0;
+exports.bootstrapSetup = bootstrapSetup;
 const core_1 = require("@nestjs/core");
 const typeorm_transactional_1 = require("typeorm-transactional");
 const skywalking_backend_js_1 = require("skywalking-backend-js");
@@ -111,4 +111,3 @@ function bootstrapSetup(AppModule, SetupSwagger) {
         return app;
     });
 }
-exports.bootstrapSetup = bootstrapSetup;

package/shared/serviceRegistryModule.js

@@ -32,21 +32,38 @@ const nestjs_i18n_1 = require("nestjs-i18n");
 const health_checker_module_1 = require("../health-checker/health-checker.module");
 const services_1 = require("./services");
 const fs_1 = require("fs");
+const path_1 = require("path");
 const providers = [
     services_1.ApiConfigService,
     services_1.ValidatorService,
     services_1.GeneratorService,
     services_1.TranslationService,
 ];
+const isTest = process.env.NODE_ENV === 'test';
 function findValidRootPath() {
     const possibleRootPaths = [process.cwd(), __dirname];
     const envFile = `${process.env.NODE_ENV || ''}.env`;
+    let envFilePath = '';
     for (const rootPath of possibleRootPaths) {
-        const configPath = path.join(rootPath, 'config');
-        const baseEnvFilePath = path.join(configPath, 'base.env');
-        const envFilePath = path.join(configPath, envFile);
-        if ((0, fs_1.existsSync)(envFilePath)) {
-            return { rootPath, baseEnvFilePath, envFilePath };
+        const configPath = (0, path_1.join)(rootPath, 'config');
+        const baseEnvFilePath = (0, path_1.join)(configPath, 'base.env');
+        if (isTest) {
+            envFilePath = (0, path_1.join)(configPath, 'test.env');
+            if ((0, fs_1.existsSync)(envFilePath)) {
+                return { rootPath, baseEnvFilePath, envFilePath };
+            }
+            else {
+                envFilePath = (0, path_1.join)(configPath, 'dev.env');
+                if ((0, fs_1.existsSync)(envFilePath)) {
+                    return { rootPath, baseEnvFilePath, envFilePath };
+                }
+            }
+        }
+        else {
+            envFilePath = (0, path_1.join)(configPath, envFile);
+            if ((0, fs_1.existsSync)(envFilePath)) {
+                return { rootPath, baseEnvFilePath, envFilePath };
+            }
         }
     }
     throw new Error(`No valid .env file: ${envFilePath}`);
@@ -57,7 +74,7 @@ const modules = [
     config_1.ConfigModule.forRoot({
         isGlobal: true,
         cache: true,
-        expandVariables: true,
+        expandVariables: false,
         envFilePath: [envFilePath, baseEnvFilePath],
     }),
     nestjs_sentry_1.SentryModule.forRootAsync({

package/shared/services/api-config.service.js

@@ -104,7 +104,7 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
         return {
             autoLoadEntities: true,
             keepConnectionAlive: !this.isDev,
-            dropSchema: this.isTest,
+            dropSchema: this.isTest ? this.getBoolean('DB_DROP_SCHEMA') : false,
             type: 'mysql',
             host: this.getString('DB_HOST'),
             port: this.getNumber('DB_PORT'),