@nest-omni/core 1.0.31 → 1.0.33

package/.hygen/new/crud/entity.ejs.t

@@ -15,11 +15,12 @@ skip_if: <%= !blocks.includes('Entity') %>
  TranslationEntityName = h.TranslationEntityName(name);
  translationEntityName = h.changeCase.camel(TranslationEntityName);
 %>import { Entity, Column } from 'typeorm';
-
+import { StringField } from '@nest-omni/core';
 import { AbstractEntity } from '@nest-omni/core/common/abstract.entity';
 
 @Entity({ name: '<%= TableName %>' })
 export class <%= EntityName %> extends AbstractEntity {
   @Column({ type: 'varchar', nullable: false })
+  @StringField()
   name: string;
 }

package/.hygen/new/crud/service.ejs.t

@@ -60,7 +60,7 @@ import { <%= EntityName %> } from './<%= entityFileName %>';
 @Injectable()
 export class <%= ServiceName %> extends TypeOrmCrudService<<%= EntityName %>> {
   constructor(
-    @InjectRepository(<%= EntityName %>) repo:Repository<<%= EntityName %>>,
+    @InjectRepository(<%= EntityName %>) repo: Repository<<%= EntityName %>>,
     public i18n: I18nService,
   ) {
     super(repo);

package/cli.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/cli.js

@@ -0,0 +1,54 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const program = require("commander");
+const fs = require("fs");
+const path = require("path");
+program.version('0.1.0').option('-v, --verbose', 'output extra information');
+program
+    .command('init <name>')
+    .description('initialize a new project')
+    .action((name) => {
+    console.log(`Initializing project ${name}`);
+});
+program
+    .command('i18n <locale>')
+    .description('add i18n support to the project')
+    .action((locale) => {
+    console.log(`Adding i18n support for locale: ${locale}`);
+});
+program
+    .command('crud <entity>')
+    .description('generate CRUD operations for an entity')
+    .action((entity) => {
+    console.log(`Generating CRUD operations for ${entity}`);
+});
+program.parse(process.argv);
+function copyRecursiveSync(src, dest) {
+    const exists = fs.existsSync(src);
+    const stats = exists && fs.statSync(src);
+    const isDirectory = exists && stats.isDirectory();
+    if (isDirectory) {
+        fs.mkdirSync(dest, { recursive: true });
+        fs.readdirSync(src).forEach((childItemName) => {
+            copyRecursiveSync(path.join(src, childItemName), path.join(dest, childItemName));
+        });
+    }
+    else {
+        fs.copyFileSync(src, dest);
+    }
+}
+const directoriesToCopy = [
+    { src: './node_modules/@nest-omni/core/i18n', dest: './i18n' },
+    { src: './node_modules/@nest-omni/core/.hygen', dest: './.hygen' },
+    { src: './node_modules/@nest-omni/core/.hygen.js', dest: './.hygen.js' },
+];
+directoriesToCopy.forEach(({ src, dest }) => {
+    try {
+        copyRecursiveSync(src, dest);
+        console.log(`Copied ${src} to ${dest}`);
+    }
+    catch (error) {
+        console.error(`Error copying ${src} to ${dest}:`, error);
+    }
+});

package/common/abstract.entity.js

@@ -39,7 +39,7 @@ class AbstractEntity extends AbstractBaseEntity {
 }
 exports.AbstractEntity = AbstractEntity;
 __decorate([
-    (0, typeorm_1.PrimaryGeneratedColumn)('increment', { type: 'bigint' }),
+    (0, typeorm_1.PrimaryGeneratedColumn)('increment'),
     (0, decorators_1.NumberFieldOptional)({ swagger: false }),
     __metadata("design:type", Number)
 ], AbstractEntity.prototype, "id", void 0);
@@ -59,6 +59,7 @@ __decorate([
         maxLength: 36,
         minLength: 2,
         example: '23247899-c237-4ab1-9639-3322029d2e1c',
+        swagger: false,
     }),
     __metadata("design:type", String)
 ], AbstractUuidPrimaryEntity.prototype, "id", void 0);

package/decorators/field.decorators.d.ts

@@ -30,6 +30,9 @@ interface IEmailFieldOptions {
 interface IIPFieldOptions {
     version?: ValidatorJS.IPVersion;
 }
+interface IURLFieldOptions {
+    urlOptions?: ValidatorJS.IsURLOptions;
+}
 interface IFQDNFieldOptions extends ValidatorJS.IsFQDNOptions {
 }
 type IClassFieldOptions = IFieldOptions;
@@ -58,7 +61,7 @@ export declare function PhoneField(options?: Omit<ApiPropertyOptions, 'type'> &
 export declare function PhoneFieldOptional(options?: Omit<ApiPropertyOptions, 'type' | 'required'> & IFieldOptions): PropertyDecorator;
 export declare function UUIDField(options?: Omit<ApiPropertyOptions, 'type' | 'format' | 'isArray'> & IFieldOptions): PropertyDecorator;
 export declare function UUIDFieldOptional(options?: Omit<ApiPropertyOptions, 'type' | 'required' | 'isArray'> & IFieldOptions): PropertyDecorator;
-export declare function URLField(options?: Omit<ApiPropertyOptions, 'type'> & IStringFieldOptions): PropertyDecorator;
+export declare function URLField(options?: Omit<ApiPropertyOptions, 'type'> & IURLFieldOptions & IStringFieldOptions): PropertyDecorator;
 export declare function URLFieldOptional(options?: Omit<ApiPropertyOptions, 'type'> & IStringFieldOptions): PropertyDecorator;
 export declare function FQDNField(options?: Omit<ApiPropertyOptions, 'type'> & IFQDNFieldOptions & IStringFieldOptions): PropertyDecorator;
 export declare function FQDNFieldOptional(options?: Omit<ApiPropertyOptions, 'type'> & IFQDNFieldOptions & IStringFieldOptions): PropertyDecorator;
@@ -68,4 +71,8 @@ export declare function IpFieldOptional(options?: Omit<ApiPropertyOptions, 'type
 export declare function IpField(options: Omit<ApiPropertyOptions, 'type'> & IStringFieldOptions & IIPFieldOptions): PropertyDecorator;
 export declare function ObjectField(options?: Omit<ApiPropertyOptions, 'type'> & IFieldOptions): PropertyDecorator;
 export declare function ObjectFieldOptional(options?: Omit<ApiPropertyOptions, 'type'> & IFieldOptions): PropertyDecorator;
+export declare function TimeZoneField(options?: Omit<ApiPropertyOptions, 'type'> & IStringFieldOptions): PropertyDecorator;
+export declare function TimeZoneFieldOptional(options?: Omit<ApiPropertyOptions, 'type'> & IStringFieldOptions): PropertyDecorator;
+export declare function LocaleField(options?: Omit<ApiPropertyOptions, 'type'> & IStringFieldOptions): PropertyDecorator;
+export declare function LocaleFieldOptional(options?: Omit<ApiPropertyOptions, 'type'> & IStringFieldOptions): PropertyDecorator;
 export {};

package/decorators/field.decorators.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObjectFieldOptional = exports.ObjectField = exports.IpField = exports.IpFieldOptional = exports.DateFieldOptional = exports.DateField = exports.FQDNFieldOptional = exports.FQDNField = exports.URLFieldOptional = exports.URLField = exports.UUIDFieldOptional = exports.UUIDField = exports.PhoneFieldOptional = exports.PhoneField = exports.EmailFieldOptional = exports.EmailField = exports.ClassFieldOptional = exports.EnumFieldOptional = exports.ClassField = exports.EnumField = exports.getEnumDescription = exports.TmpKeyFieldOptional = exports.TmpKeyField = exports.TranslationsFieldOptional = exports.TranslationsField = exports.BooleanFieldOptional = exports.BooleanField = exports.PasswordFieldOptional = exports.PasswordField = exports.StringFieldOptional = exports.StringField = exports.NumberFieldOptional = exports.NumberField = void 0;
+exports.LocaleFieldOptional = exports.LocaleField = exports.TimeZoneFieldOptional = exports.TimeZoneField = exports.ObjectFieldOptional = exports.ObjectField = exports.IpField = exports.IpFieldOptional = exports.DateFieldOptional = exports.DateField = exports.FQDNFieldOptional = exports.FQDNField = exports.URLFieldOptional = exports.URLField = exports.UUIDFieldOptional = exports.UUIDField = exports.PhoneFieldOptional = exports.PhoneField = exports.EmailFieldOptional = exports.EmailField = exports.ClassFieldOptional = exports.EnumFieldOptional = exports.ClassField = exports.EnumField = exports.getEnumDescription = exports.TmpKeyFieldOptional = exports.TmpKeyField = exports.TranslationsFieldOptional = exports.TranslationsField = exports.BooleanFieldOptional = exports.BooleanField = exports.PasswordFieldOptional = exports.PasswordField = exports.StringFieldOptional = exports.StringField = exports.NumberFieldOptional = exports.NumberField = void 0;
 const common_1 = require("@nestjs/common");
 const swagger_1 = require("@nestjs/swagger");
 const nestjs_i18n_1 = require("nestjs-i18n");
@@ -327,7 +327,7 @@ function UUIDFieldOptional(options = {}) {
 exports.UUIDFieldOptional = UUIDFieldOptional;
 function URLField(options = {}) {
     const decorators = [
-        (0, class_validator_1.IsUrl)({}, {
+        (0, class_validator_1.IsUrl)(options.urlOptions, {
             each: options.each,
             message: (0, nestjs_i18n_1.i18nValidationMessage)('validation.IS_URL'),
         }),
@@ -445,3 +445,48 @@ function ObjectFieldOptional(options = {}) {
     return (0, common_1.applyDecorators)((0, validator_decorators_1.IsEmptyable)(), ObjectField(Object.assign({ required: false }, options)));
 }
 exports.ObjectFieldOptional = ObjectFieldOptional;
+function TimeZoneField(options = {}) {
+    const decorators = [
+        StringField(Object.assign({}, options)),
+        (0, class_validator_1.IsTimeZone)({
+            each: options.each,
+            message: (0, nestjs_i18n_1.i18nValidationMessage)('validation.IS_TIME_ZONE'),
+        }),
+    ];
+    if (options.nullable) {
+        decorators.push((0, validator_decorators_1.IsNullable)({ each: options.each }));
+    }
+    else {
+        decorators.push((0, class_validator_1.NotEquals)(null, { each: options.each }));
+    }
+    return (0, common_1.applyDecorators)(...decorators);
+}
+exports.TimeZoneField = TimeZoneField;
+function TimeZoneFieldOptional(options = {}) {
+    return (0, common_1.applyDecorators)((0, validator_decorators_1.IsEmptyable)(), TimeZoneField(Object.assign({ required: false }, options)));
+}
+exports.TimeZoneFieldOptional = TimeZoneFieldOptional;
+function LocaleField(options = {}) {
+    const decorators = [
+        StringField(Object.assign({}, options)),
+        (0, class_validator_1.IsLocale)({
+            each: options.each,
+            message: (0, nestjs_i18n_1.i18nValidationMessage)('validation.IS_LOCALE'),
+        }),
+    ];
+    if (options.nullable) {
+        decorators.push((0, validator_decorators_1.IsNullable)({ each: options.each }));
+    }
+    else {
+        decorators.push((0, class_validator_1.NotEquals)(null, { each: options.each }));
+    }
+    if (options.swagger !== false) {
+        decorators.push((0, swagger_1.ApiProperty)(Object.assign({ type: String }, options)));
+    }
+    return (0, common_1.applyDecorators)(...decorators);
+}
+exports.LocaleField = LocaleField;
+function LocaleFieldOptional(options = {}) {
+    return (0, common_1.applyDecorators)((0, validator_decorators_1.IsEmptyable)(), LocaleField(Object.assign({ required: false }, options)));
+}
+exports.LocaleFieldOptional = LocaleFieldOptional;

package/decorators/user.decorator.d.ts

@@ -1,8 +1,12 @@
 export interface IUser {
-    uid: number;
+    uid: string;
     username: string;
-    tenantId?: string;
-    appId?: string;
+    tenantId: string;
+    appId: string;
+    admin: boolean;
+    role: string;
 }
-export declare const User: (...dataOrPipes: (string | import("@nestjs/common").PipeTransform<any, any> | import("@nestjs/common").Type<import("@nestjs/common").PipeTransform<any, any>>)[]) => ParameterDecorator;
-export declare function getUserData(req: any, data?: string): IUser;
+export declare const User: (...dataOrPipes: (import("@nestjs/common").PipeTransform<any, any> | import("@nestjs/common").Type<import("@nestjs/common").PipeTransform<any, any>> | keyof IUser)[]) => ParameterDecorator;
+export declare function getOmniAuthData<T extends keyof IUser>(request: {
+    headers: Record<string, string>;
+}, key?: T): IUser[T] | IUser;

package/decorators/user.decorator.js

@@ -1,38 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserData = exports.User = void 0;
+exports.getOmniAuthData = exports.User = void 0;
 const common_1 = require("@nestjs/common");
-const lodash = require("lodash");
+const lodash_1 = require("lodash");
 const config_1 = require("@nestjs/config");
-exports.User = (0, common_1.createParamDecorator)((data, ctx) => {
-    return getUserData(ctx.switchToHttp().getRequest(), data);
+const providers_1 = require("../providers");
+exports.User = (0, common_1.createParamDecorator)((key) => {
+    const authUser = providers_1.ContextProvider.getAuthUser();
+    return key ? authUser[key] : authUser;
 });
-function getUserData(req, data) {
-    const headers = req.headers;
-    let user = {
-        uid: 0,
-        username: '',
-    };
-    const configService = new config_1.ConfigService(req);
-    if (lodash.isEmpty(headers['x-userid']) ||
-        lodash.isEmpty(headers['x-username'])) {
-        if (process.env.NODE_ENV === 'dev') {
+function getOmniAuthData(request, key) {
+    const headers = request.headers;
+    let user;
+    const configService = new config_1.ConfigService(request);
+    if ((0, lodash_1.isEmpty)(headers['x-userid']) || (0, lodash_1.isEmpty)(headers['x-username'])) {
+        if (process.env.NODE_ENV === 'dev' || process.env.NODE_ENV === 'uat') {
             user = {
                 uid: configService.get('MOCK_UID'),
                 username: configService.get('MOCK_USERNAME'),
                 appId: configService.get('MOCK_APP_ID'),
                 tenantId: configService.get('MOCK_TENANT_ID'),
+                admin: configService.get('MOCK_ADMIN', false),
+                role: configService.get('MOCK_ROLE', ''),
             };
         }
     }
     else {
         user = {
-            uid: headers['x-userid'],
-            username: headers['x-username'],
-            appId: headers['x-appid'],
-            tenantId: headers['x-tenantid'],
+            uid: headers['x-userid'] || '',
+            username: headers['x-username'] || '',
+            appId: headers['x-appid'] || '',
+            tenantId: headers['x-tenantid'] || '',
+            admin: headers['x-admin'] === '1',
+            role: headers['x-role'] || '',
         };
-        return data ? user[data] : user;
     }
+    return key ? user[key] : user;
 }
-exports.getUserData = getUserData;
+exports.getOmniAuthData = getOmniAuthData;

package/decorators/user_auth.decorator.js

@@ -8,7 +8,7 @@ function UserFilter(field) {
     const obj = {};
     return (0, common_1.applyDecorators)((0, crud_1.CrudAuth)({
         filter: (req) => {
-            obj[field] = (0, user_decorator_1.getUserData)(req, 'uid');
+            obj[field] = (0, user_decorator_1.getOmniAuthData)(req, 'uid');
             return obj;
         },
     }));

package/i18n/en_US/validation.json

@@ -35,5 +35,7 @@
     "IS_EXISTS": "{property} value `{value}` does not exists",
     "IS_FQDN": "{property} value `{value}` not a valid FQDN",
     "IS_IP": "{property} value `{value}` not a valid IP",
-    "IS_OBJECT": "{property} value `{value}` not a valid Object"
+    "IS_OBJECT": "{property} value `{value}` not a valid Object",
+    "IS_TIME_ZONE": "{property} value `{value}` must be a valid IANA time-zone",
+    "IS_LOCALE": "{property} value `{value}` must be a valid locale"
 }

package/i18n/zh_CN/validation.json

@@ -35,5 +35,7 @@
     "IS_EXISTS": "{property}值`{value}`不存在",
     "IS_FQDN": "{property} 值 `{value}` 必须是有效域名",
     "IS_IP": "{property} 值 `{value}` 必须是有效IP",
-    "IS_OBJECT": "{property} 值 `{value}` 必须是有效对象"
+    "IS_OBJECT": "{property} 值 `{value}` 必须是有效对象",
+    "IS_TIME_ZONE": "{property} 值 `{value}` 必须是有效时区",
+    "IS_LOCALE": "{property} 值 `{value}` 必须是有效语言"
 }

package/interceptors/language-interceptor.service.js

@@ -14,8 +14,7 @@ let LanguageInterceptor = class LanguageInterceptor {
     intercept(context, next) {
         var _a;
         const request = context.switchToHttp().getRequest();
-        const language = request.headers['accept-language'];
-        const lang = (_a = constants_1.LanguageCode[language]) !== null && _a !== void 0 ? _a : constants_1.LanguageCode.en_US;
+        const lang = (_a = request.headers['accept-language']) !== null && _a !== void 0 ? _a : constants_1.LanguageCode.en_US;
         providers_1.ContextProvider.setLanguage(lang);
         return next.handle();
     }

package/middlewares/omni-auth.middleware.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OmniAuthMiddleware = void 0;
-const omni_auth_decorator_1 = require("../decorators/omni-auth.decorator");
+const user_decorator_1 = require("../decorators/user.decorator");
 const providers_1 = require("../providers");
 const OmniAuthMiddleware = () => {
     return (req, res, next) => {
-        req.user = (0, omni_auth_decorator_1.getOmniAuthData)(req);
+        req.user = (0, user_decorator_1.getOmniAuthData)(req);
         providers_1.ContextProvider.setAuthUser(req.user);
         next();
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nest-omni/core",
-  "version": "1.0.31",
+  "version": "1.0.33",
   "description": "framework",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,6 +9,11 @@
     "test": "jest --passWithNoTests",
     "lint": "eslint 'src/**/*.ts' --fix"
   },
+  "bin": {
+    "nest-omni": "nest start",
+    "i18n": "i18n",
+    "gen": "gen"
+  },
   "author": "Jinpy",
   "license": "Apache-2.0",
   "devDependencies": {

package/providers/context.provider.d.ts

@@ -1,4 +1,4 @@
-import { IOmniAuth } from '../decorators/omni-auth.decorator';
+import { IUser } from '../decorators/user.decorator';
 export declare class ContextProvider {
     private static readonly nameSpace;
     private static readonly authUserKey;
@@ -22,11 +22,11 @@ export declare class ContextProvider {
     };
     static setRequestId(id: string): void;
     static getRequestId(): string;
-    static setAuthUser(user: IOmniAuth): void;
+    static setAuthUser(user: IUser): void;
     static setLanguage(language: string): void;
     static getLanguage(): string;
-    static getAuthUserField<T extends keyof IOmniAuth>(field: T): IOmniAuth[T];
-    static getAuthUser(): IOmniAuth;
+    static getAuthUserField<T extends keyof IUser>(field?: T): IUser[T];
+    static getAuthUser(): IUser;
     static getAppId(): string;
     static getRole(): string;
     static getAdmin(): boolean;

package/providers/context.provider.js

@@ -49,15 +49,14 @@ class ContextProvider {
         return ContextProvider.get(ContextProvider.languageKey);
     }
     static getAuthUserField(field) {
-        var _a;
-        const auth = (_a = ContextProvider.get(ContextProvider.authUserKey)) !== null && _a !== void 0 ? _a : {};
+        return ContextProvider.getAuthUser()[field];
+    }
+    static getAuthUser() {
+        const auth = ContextProvider.get(ContextProvider.authUserKey);
         if (!auth) {
             throw new Error('User information not found.');
         }
-        return auth[field];
-    }
-    static getAuthUser() {
-        return ContextProvider.get(ContextProvider.authUserKey);
+        return auth;
     }
     static getAppId() {
         return ContextProvider.getAuthUserField('appId');