@nest-omni/core 1.0.17 → 1.0.20

package/{dist/common → common}/abstract.entity.d.ts

@@ -12,6 +12,6 @@ export declare class AbstractEntity<DTO extends AbstractDto = AbstractDto, O = n
 export declare class AbstractTranslationEntity<DTO extends AbstractTranslationDto = AbstractTranslationDto, O = never> extends AbstractEntity<DTO, O> {
     languageCode: LanguageCode;
 }
-export declare class AbstractStringPrimaryEntity<DTO extends AbstractDto = AbstractDto, O = never> extends AbstractBaseEntity<DTO, O> {
+export declare class AbstractUuidPrimaryEntity<DTO extends AbstractDto = AbstractDto, O = never> extends AbstractBaseEntity<DTO, O> {
     id: string;
 }

package/{dist/common → common}/abstract.entity.js

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AbstractStringPrimaryEntity = exports.AbstractTranslationEntity = exports.AbstractEntity = exports.AbstractBaseEntity = void 0;
+exports.AbstractUuidPrimaryEntity = exports.AbstractTranslationEntity = exports.AbstractEntity = exports.AbstractBaseEntity = void 0;
 const typeorm_1 = require("typeorm");
 const decorators_1 = require("../decorators");
 const constants_1 = require("../constants");
@@ -50,9 +50,9 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'enum', enum: constants_1.LanguageCode }),
     __metadata("design:type", String)
 ], AbstractTranslationEntity.prototype, "languageCode", void 0);
-class AbstractStringPrimaryEntity extends AbstractBaseEntity {
+class AbstractUuidPrimaryEntity extends AbstractBaseEntity {
 }
-exports.AbstractStringPrimaryEntity = AbstractStringPrimaryEntity;
+exports.AbstractUuidPrimaryEntity = AbstractUuidPrimaryEntity;
 __decorate([
     (0, typeorm_1.PrimaryGeneratedColumn)('uuid'),
     (0, decorators_1.StringFieldOptional)({
@@ -61,4 +61,4 @@ __decorate([
         example: '23247899-c237-4ab1-9639-3322029d2e1c',
     }),
     __metadata("design:type", String)
-], AbstractStringPrimaryEntity.prototype, "id", void 0);
+], AbstractUuidPrimaryEntity.prototype, "id", void 0);

package/{dist/common → common}/dto/abstract.dto.d.ts

@@ -1,13 +1,13 @@
-import { AbstractEntity, AbstractStringPrimaryEntity } from '../abstract.entity';
+import { AbstractEntity, AbstractUuidPrimaryEntity } from '../abstract.entity';
 export declare class AbstractDto {
     id: number | string;
     createdAt: Date;
     updatedAt: Date;
     translations?: AbstractTranslationDto[];
-    constructor(entity: AbstractEntity | AbstractStringPrimaryEntity, options?: {
+    constructor(entity: AbstractEntity | AbstractUuidPrimaryEntity, options?: {
         excludeFields?: boolean;
     });
 }
 export declare class AbstractTranslationDto extends AbstractDto {
-    constructor(entity: AbstractEntity | AbstractStringPrimaryEntity);
+    constructor(entity: AbstractEntity | AbstractUuidPrimaryEntity);
 }

package/{dist/health-checker → health-checker}/health-checker.controller.d.ts

@@ -1,7 +1,7 @@
 import type { HealthCheckResult } from '@nestjs/terminus';
 import { HealthCheckService, TypeOrmHealthIndicator } from '@nestjs/terminus';
 import { ServiceHealthIndicator } from './health-indicators/service.indicator';
-import { RedisHealthIndicator } from '@liaoliaots/nestjs-redis-health';
+import { RedisHealthIndicator } from '@mvmdev/nestjs-redis-health';
 import { ApiConfigService } from '../shared/services';
 export declare class HealthCheckerController {
     private configService;

package/{dist/health-checker → health-checker}/health-checker.controller.js

@@ -24,7 +24,7 @@ const common_1 = require("@nestjs/common");
 const terminus_1 = require("@nestjs/terminus");
 const service_indicator_1 = require("./health-indicators/service.indicator");
 const swagger_1 = require("@nestjs/swagger");
-const nestjs_redis_health_1 = require("@liaoliaots/nestjs-redis-health");
+const nestjs_redis_health_1 = require("@mvmdev/nestjs-redis-health");
 const services_1 = require("../shared/services");
 let HealthCheckerController = class HealthCheckerController {
     constructor(configService, healthCheckService, ormIndicator, serviceIndicator, redisIndicator) {

package/{dist/health-checker → health-checker}/health-checker.module.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HealthCheckerModule = void 0;
 const common_1 = require("@nestjs/common");
 const terminus_1 = require("@nestjs/terminus");
-const nestjs_redis_health_1 = require("@liaoliaots/nestjs-redis-health");
+const nestjs_redis_health_1 = require("@mvmdev/nestjs-redis-health");
 const health_checker_controller_1 = require("./health-checker.controller");
 const service_indicator_1 = require("./health-indicators/service.indicator");
 const services_1 = require("../shared/services");

package/package.json

@@ -1,25 +1,19 @@
 {
   "name": "@nest-omni/core",
-  "version": "1.0.17",
+  "version": "1.0.20",
   "description": "framework",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "scripts": {
     "build": "tsc -p tsconfig.json",
     "test": "jest --passWithNoTests",
-    "lint": "eslint 'src/**/*.ts' --fix",
-    "prepublish:npm": "npm run build",
-    "publish:npm": "npm publish --access public",
-    "prepare": "npm run build"
+    "lint": "eslint 'src/**/*.ts' --fix"
   },
   "author": "Jinpy",
   "license": "Apache-2.0",
   "devDependencies": {
     "typescript": "^5.4.5"
   },
-  "files": [
-    "dist"
-  ],
   "peerDependencies": {
     "@dataui/crud": "^5.3.0",
     "@dataui/crud-typeorm": "^5.3.0",

package/{dist/setup → setup}/bootstrap.setup.js

@@ -15,6 +15,7 @@ const typeorm_transactional_1 = require("typeorm-transactional");
 const skywalking_backend_js_1 = require("skywalking-backend-js");
 const nestjs_pino_1 = require("nestjs-pino");
 const session = require("express-session");
+const bodyParse = require("body-parser");
 const path_1 = require("path");
 const __1 = require("../");
 const common_1 = require("@nestjs/common");
@@ -64,7 +65,9 @@ function bootstrapSetup(AppModule, SetupSwagger) {
         app.enable('trust proxy');
         const reflector = app.get(core_1.Reflector);
         app.useGlobalFilters(new __1.HttpExceptionFilter(), new __1.QueryFailedFilter(reflector));
-        app.use(new nestjs_cls_1.ClsMiddleware({}).use, (0, __1.RequestIdMiddleware)(), (0, __1.PowerByMiddleware)(), (0, __1.OmniAuthMiddleware)());
+        app.use(bodyParse.json({
+            limit: '50mb',
+        }), new nestjs_cls_1.ClsMiddleware({}).use, (0, __1.RequestIdMiddleware)(), (0, __1.PowerByMiddleware)(), (0, __1.OmniAuthMiddleware)());
         app.useStaticAssets('public', { prefix: '/' });
         app.useGlobalInterceptors(new auth_user_interceptor_1.AuthUserInterceptor(), new __1.TranslationInterceptor(), new nestjs_pino_1.LoggerErrorInterceptor(), new nestjs_sentry_1.SentryInterceptor({
             filters: [
@@ -94,7 +97,7 @@ function bootstrapSetup(AppModule, SetupSwagger) {
             SetupSwagger(app, configService.documentationPath);
         }
         if (configService.viewsEnabled) {
-            app.setBaseViewsDir((0, path_1.join)(__dirname, 'views'));
+            app.setBaseViewsDir((0, path_1.join)(__1.ApiConfigService.rootPath, 'views'));
             app.setViewEngine('ejs');
         }
         if (configService.sessionEnabled) {

package/{dist/shared → shared}/serviceRegistryModule.js

@@ -35,16 +35,22 @@ const fs_1 = require("fs");
 const providers = [
     services_1.ApiConfigService,
     services_1.ValidatorService,
-    services_1.AwsS3Service,
     services_1.GeneratorService,
     services_1.TranslationService,
 ];
-services_1.ApiConfigService.rootPath =
-    process.env.NODE_ENV === 'test' ? process.cwd() : __dirname;
-const envFilePath = path.join(services_1.ApiConfigService.rootPath, 'config', `${process.env.NODE_ENV || ''}.env`);
-if (!(0, fs_1.existsSync)(envFilePath)) {
-    throw new Error(`*.env file not found in ${envFilePath}`);
+function findValidRootPath() {
+    const possibleRootPaths = [process.cwd(), __dirname];
+    const envFile = `${process.env.NODE_ENV || ''}.env`;
+    for (const rootPath of possibleRootPaths) {
+        const envFilePath = path.join(rootPath, 'config', envFile);
+        if ((0, fs_1.existsSync)(envFilePath)) {
+            return { rootPath, envFilePath };
+        }
+    }
+    throw new Error('No valid .env file found in any root path');
 }
+const { envFilePath, rootPath } = findValidRootPath();
+services_1.ApiConfigService.rootPath = rootPath;
 const modules = [
     config_1.ConfigModule.forRoot({
         isGlobal: true,
@@ -61,19 +67,12 @@ const modules = [
         inject: [services_1.ApiConfigService],
         useFactory: (config) => config.pinoConfig,
     }),
-    typeorm_2.TypeOrmModule.forRootAsync({
-        inject: [services_1.ApiConfigService],
-        useFactory: (config) => config.typeormConfig,
-        dataSourceFactory: (options) => __awaiter(void 0, void 0, void 0, function* () {
-            return (0, typeorm_transactional_1.addTransactionalDataSource)(new typeorm_1.DataSource(options));
-        }),
-    }),
     nestjs_i18n_1.I18nModule.forRootAsync({
         inject: [services_1.ApiConfigService],
         useFactory: (config) => ({
             fallbackLanguage: config.fallbackLanguage,
             loaderOptions: {
-                path: path.join(__dirname, '/i18n/'),
+                path: path.join(services_1.ApiConfigService.rootPath, '/i18n/'),
                 watch: config.isDev,
             },
             logging: config.isDev,
@@ -82,6 +81,18 @@ const modules = [
     }),
     health_checker_module_1.HealthCheckerModule,
 ];
+if (services_1.ApiConfigService.toBoolean(process.env.S3_ENABLED, false)) {
+    providers.push(services_1.AwsS3Service);
+}
+if (services_1.ApiConfigService.toBoolean(process.env.DB_ENABLED, true)) {
+    modules.push(typeorm_2.TypeOrmModule.forRootAsync({
+        inject: [services_1.ApiConfigService],
+        useFactory: (config) => config.typeormConfig,
+        dataSourceFactory: (options) => __awaiter(void 0, void 0, void 0, function* () {
+            return (0, typeorm_transactional_1.addTransactionalDataSource)(new typeorm_1.DataSource(options));
+        }),
+    }));
+}
 if (services_1.ApiConfigService.toBoolean(process.env.BULL_ENABLED)) {
     modules.push(bull_1.BullModule.forRootAsync({
         inject: [services_1.ApiConfigService],

package/{dist/shared → shared}/services/api-config.service.d.ts

@@ -18,7 +18,7 @@ export declare class ApiConfigService {
     get isTest(): boolean;
     getNumber(key: string): number;
     getBoolean(key: string): boolean;
-    static toBoolean(value: string): boolean;
+    static toBoolean(value: string, defaultValue?: any): boolean;
     getString(key: string): string;
     get nodeEnv(): string;
     get fallbackLanguage(): string;

package/{dist/shared → shared}/services/api-config.service.js

@@ -65,11 +65,14 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
         const value = this.get(key);
         return ApiConfigService_1.toBoolean(value);
     }
-    static toBoolean(value) {
+    static toBoolean(value, defaultValue = null) {
         try {
             return Boolean(JSON.parse(value));
         }
         catch (_a) {
+            if (!(0, lodash_1.isNil)(defaultValue)) {
+                return defaultValue;
+            }
             throw new Error(value + ' is not a boolean');
         }
     }