@nest-omni/core 1.0.33 → 1.0.34

package/cli.js

@@ -4,30 +4,42 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const program = require("commander");
 const fs = require("fs");
 const path = require("path");
+const hygen_1 = require("hygen");
+const logger_1 = require("hygen/dist/logger");
+const process = require("node:process");
+const _hygen_1 = require(".hygen");
 program.version('0.1.0').option('-v, --verbose', 'output extra information');
 program
-    .command('init <name>')
+    .command('create <project>')
     .description('initialize a new project')
-    .action((name) => {
-    console.log(`Initializing project ${name}`);
+    .action((project) => {
+    console.log(`Initializing project ${project}`);
 });
 program
-    .command('i18n <locale>')
-    .description('add i18n support to the project')
-    .action((locale) => {
-    console.log(`Adding i18n support for locale: ${locale}`);
+    .command('i18n')
+    .description('add class-validator i18n support to the project')
+    .action(() => {
+    copyRecursiveSync(path.join(__dirname, 'i18n'), './i18n');
 });
 program
-    .command('crud <entity>')
-    .description('generate CRUD operations for an entity')
-    .action((entity) => {
-    console.log(`Generating CRUD operations for ${entity}`);
+    .command('crud')
+    .description('generate CRUD operations for a module')
+    .action(() => {
+    console.log(`Generating CRUD operations for module`);
+    (0, hygen_1.runner)(['new', 'crud'], {
+        templates: _hygen_1.templates,
+        helpers: _hygen_1.helpers,
+        cwd: process.cwd(),
+        logger: new logger_1.default(console.log.bind(console)),
+        debug: !!process.env.DEBUG,
+    });
 });
 program.parse(process.argv);
 function copyRecursiveSync(src, dest) {
     const exists = fs.existsSync(src);
     const stats = exists && fs.statSync(src);
     const isDirectory = exists && stats.isDirectory();
+    console.log(`Copied ${src} to ${dest}`);
     if (isDirectory) {
         fs.mkdirSync(dest, { recursive: true });
         fs.readdirSync(src).forEach((childItemName) => {
@@ -38,17 +50,3 @@ function copyRecursiveSync(src, dest) {
         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/decorators/field.decorators.d.ts

@@ -32,6 +32,7 @@ interface IIPFieldOptions {
 }
 interface IURLFieldOptions {
     urlOptions?: ValidatorJS.IsURLOptions;
+    simpleUrl?: boolean;
 }
 interface IFQDNFieldOptions extends ValidatorJS.IsFQDNOptions {
 }
@@ -62,7 +63,7 @@ export declare function PhoneFieldOptional(options?: Omit<ApiPropertyOptions, 't
 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'> & IURLFieldOptions & IStringFieldOptions): PropertyDecorator;
-export declare function URLFieldOptional(options?: Omit<ApiPropertyOptions, 'type'> & IStringFieldOptions): PropertyDecorator;
+export declare function URLFieldOptional(options?: Omit<ApiPropertyOptions, 'type'> & IURLFieldOptions & IStringFieldOptions): PropertyDecorator;
 export declare function FQDNField(options?: Omit<ApiPropertyOptions, 'type'> & IFQDNFieldOptions & IStringFieldOptions): PropertyDecorator;
 export declare function FQDNFieldOptional(options?: Omit<ApiPropertyOptions, 'type'> & IFQDNFieldOptions & IStringFieldOptions): PropertyDecorator;
 export declare function DateField(options?: Omit<ApiPropertyOptions, 'type'> & IDateFieldOptions): PropertyDecorator;

package/decorators/field.decorators.js

@@ -326,13 +326,19 @@ function UUIDFieldOptional(options = {}) {
 }
 exports.UUIDFieldOptional = UUIDFieldOptional;
 function URLField(options = {}) {
-    const decorators = [
-        (0, class_validator_1.IsUrl)(options.urlOptions, {
+    const decorators = [StringField(Object.assign({}, options))];
+    if (options.simpleUrl) {
+        decorators.push((0, validator_decorators_1.IsHttpUrl)({
             each: options.each,
             message: (0, nestjs_i18n_1.i18nValidationMessage)('validation.IS_URL'),
-        }),
-        StringField(Object.assign({}, options)),
-    ];
+        }));
+    }
+    else {
+        decorators.push((0, class_validator_1.IsUrl)(options.urlOptions, {
+            each: options.each,
+            message: (0, nestjs_i18n_1.i18nValidationMessage)('validation.IS_URL'),
+        }));
+    }
     if (options.nullable) {
         decorators.push((0, validator_decorators_1.IsNullable)({ each: options.each }));
     }

package/decorators/validator.decorators.d.ts

@@ -8,3 +8,4 @@ export declare function IsTmpKey(validationOptions?: ValidationOptions): Propert
 export declare function IsUndefinable(options?: ValidationOptions): PropertyDecorator;
 export declare function IsEmptyable(options?: ValidationOptions): PropertyDecorator;
 export declare function IsNullable(options?: ValidationOptions): PropertyDecorator;
+export declare function IsHttpUrl(validationOptions?: ValidationOptions): (object: any, propertyName: string) => void;

package/decorators/validator.decorators.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IsNullable = exports.IsEmptyable = exports.IsUndefinable = exports.IsTmpKey = exports.IsPhoneNumber = exports.IsPassword = void 0;
+exports.IsHttpUrl = exports.IsNullable = exports.IsEmptyable = exports.IsUndefinable = exports.IsTmpKey = exports.IsPhoneNumber = exports.IsPassword = void 0;
 const class_validator_1 = require("class-validator");
 const lodash_1 = require("lodash");
 function IsPassword(validationOptions) {
@@ -57,3 +57,23 @@ function IsNullable(options) {
     return (0, class_validator_1.ValidateIf)((obj, value) => value !== null, options);
 }
 exports.IsNullable = IsNullable;
+function IsHttpUrl(validationOptions) {
+    return function (object, propertyName) {
+        (0, class_validator_1.registerDecorator)({
+            name: 'isHttpUrl',
+            target: object.constructor,
+            propertyName: propertyName,
+            options: validationOptions,
+            validator: {
+                validate(value) {
+                    const httpUrlPattern = /^(https?:\/\/)/i;
+                    return typeof value === 'string' && httpUrlPattern.test(value);
+                },
+                defaultMessage() {
+                    return 'URL must start with http:// or https://';
+                },
+            },
+        });
+    };
+}
+exports.IsHttpUrl = IsHttpUrl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nest-omni/core",
-  "version": "1.0.33",
+  "version": "1.0.34",
   "description": "framework",
   "main": "index.js",
   "types": "index.d.ts",
@@ -64,5 +64,8 @@
     "typeorm": "^0.3.17",
     "typeorm-transactional": "~0.4.1",
     "uuid": "^9.0.1"
+  },
+  "dependencies": {
+    "hygen": "^6.2.11"
   }
 }

package/shared/serviceRegistryModule.js

@@ -43,11 +43,12 @@ function findValidRootPath() {
     const envFile = `${process.env.NODE_ENV || ''}.env`;
     for (const rootPath of possibleRootPaths) {
         const envFilePath = path.join(rootPath, 'config', envFile);
+        console.log('Checking for env file:', envFilePath);
         if ((0, fs_1.existsSync)(envFilePath)) {
             return { rootPath, envFilePath };
         }
     }
-    throw new Error('No valid .env file found in any root path');
+    throw new Error(`No valid .env file: ${envFilePath}`);
 }
 const { envFilePath, rootPath } = findValidRootPath();
 services_1.ApiConfigService.rootPath = rootPath;

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

@@ -58,7 +58,7 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
             return Number(value);
         }
         catch (_a) {
-            throw new Error(key + ' environment variable is not a number');
+            throw new Error(`key:${key}, value:${value} - is not a number`);
         }
     }
     getBoolean(key) {
@@ -73,7 +73,7 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
             if (!(0, lodash_1.isNil)(defaultValue)) {
                 return defaultValue;
             }
-            throw new Error(value + ' is not a boolean');
+            throw new Error(`value:${value} - is not a boolean`);
         }
     }
     getString(key) {
@@ -261,12 +261,14 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
                     }
                     return 'error';
                 },
-                customProps: (req) => {
+                wrapSerializers: true,
+                customProps: (req, res) => {
                     return {
                         env: this.nodeEnv,
                         appName: this.getString('NAME'),
                         user: req === null || req === void 0 ? void 0 : req.user,
-                        body: req === null || req === void 0 ? void 0 : req.body,
+                        'req.body': req === null || req === void 0 ? void 0 : req.body,
+                        'res.body': res === null || res === void 0 ? void 0 : res.body,
                     };
                 },
                 redact: {
@@ -288,7 +290,7 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
     get(key) {
         const value = this.configService.get(key);
         if ((0, lodash_1.isNil)(value)) {
-            throw new Error(key + ' environment variable does not set');
+            throw new Error(`key:'${key}' - environment does not set`);
         }
         return value;
     }