definition-generator-framework 1.12.9 → 1.12.11

package/dist/framework/kernel.d.ts

@@ -3,6 +3,7 @@ export declare class Kernel {
     static process(components: DefinitionComponentClassType<any>[], indexFilePretext: string, outputIndexFile: string): Promise<void>;
     private static readFiles;
     private static writeFiles;
+    private static cleanPath;
     private static removeEmptyFolders;
     private static generateOutputFiles;
     private static iterateOnKeyNames;

package/dist/framework/kernel.js

@@ -85,12 +85,11 @@ class Kernel {
             helpers_lib_1.ConsoleHelper.log(`Changes:`, 'gray');
             helpers_lib_1.ConsoleHelper.newLine();
         }
-        let startPathsFrom = context_1.Context.config.projectRoot.length;
         let erasedFileCount = 0;
         if (context_1.Context.successful) {
             filesInOutputFolder.forEach(filePath => {
                 erasedFileCount++;
-                console.info(`${helpers_lib_1.ConsoleHelper.red}Erasing file:${helpers_lib_1.ConsoleHelper.gray} "${filePath.substring(startPathsFrom).replace(/\//g, '\\')}"${helpers_lib_1.ConsoleHelper.default}`);
+                console.info(`${helpers_lib_1.ConsoleHelper.red}Erasing file:${helpers_lib_1.ConsoleHelper.gray} "${this.cleanPath(filePath)}"${helpers_lib_1.ConsoleHelper.default}`);
                 fs.unlinkSync(filePath);
             });
         }
@@ -104,11 +103,11 @@ class Kernel {
             if (content !== outputFile.content) {
                 if (exists) {
                     modifiedFileCount++;
-                    console.info(`${helpers_lib_1.ConsoleHelper.blue}Modifying file:${helpers_lib_1.ConsoleHelper.gray} "${outputFile.path.substring(startPathsFrom).replace(/\//g, '\\')}"${helpers_lib_1.ConsoleHelper.default}`);
+                    console.info(`${helpers_lib_1.ConsoleHelper.blue}Modifying file:${helpers_lib_1.ConsoleHelper.gray} "${this.cleanPath(outputFile.path)}"${helpers_lib_1.ConsoleHelper.default}`);
                 }
                 else {
                     createdFileCount++;
-                    console.info(`${helpers_lib_1.ConsoleHelper.cyan}Creating file:${helpers_lib_1.ConsoleHelper.gray} "${outputFile.path.substring(startPathsFrom).replace(/\//g, '\\')}"${helpers_lib_1.ConsoleHelper.default}`);
+                    console.info(`${helpers_lib_1.ConsoleHelper.cyan}Creating file:${helpers_lib_1.ConsoleHelper.gray} "${this.cleanPath(outputFile.path)}"${helpers_lib_1.ConsoleHelper.default}`);
                 }
                 fs.writeFileSync(outputFile.path, outputFile.content);
             }
@@ -128,6 +127,10 @@ class Kernel {
             helpers_lib_1.ConsoleHelper.log(`Compilation encountered errors!`, 'red');
         }
     }
+    static cleanPath(path) {
+        let startPathsFrom = context_1.Context.compilerExecutionPath.length;
+        return path.substring(startPathsFrom); // .replace(/\//g, '\\');
+    }
     static removeEmptyFolders(dir) {
         let files = fs.readdirSync(dir);
         let isEmpty = true;

package/dist/helpers/validator/custom-validators/reference.custom-validator.js

@@ -12,18 +12,10 @@ class ReferenceCustomValidatorBase {
         this.regex = /^[a-z]+([a-zA-Z0-9]+)*$/;
     }
     validatePropertyExistence(referencedComponent, definitionName, options) {
-        if (options?.propertyShouldExist) {
-            let properties = helpers_lib_1.Comparator.isArray(options?.propertyShouldExist)
-                ? options?.propertyShouldExist
-                : [options?.propertyShouldExist];
+        if (options?.additionalValidation) {
             let rawDefinition = definition_store_1.DefinitionStore['getRawDefinition'](referencedComponent, definitionName);
-            properties.forEach(propertyPath => {
-                let flattenedRawDefinition = rawDefinition ? raw_definition_helper_1.RawDefinitionHelper.flatten(rawDefinition) : undefined;
-                let property = helpers_lib_1.JsonHelper.deepFind(flattenedRawDefinition, propertyPath);
-                if (!property || (helpers_lib_1.Comparator.isArray(property) && property.length === 0)) {
-                    throw new Error(`Property "${propertyPath}" does not exist in definition "${definitionName}"`);
-                }
-            });
+            let flattenedRawDefinition = rawDefinition ? raw_definition_helper_1.RawDefinitionHelper.flatten(rawDefinition) : undefined;
+            options.additionalValidation.validate(flattenedRawDefinition);
         }
     }
 }

package/dist/helpers/validator/joi-custom-validators.d.ts

@@ -10,7 +10,7 @@ export interface CustomObjectValidator {
     readonly validate: Joi.CustomValidator<any, any>;
 }
 export interface ReferenceCustomValidatorOptions {
-    propertyShouldExist?: string | string[];
+    additionalValidation?: Joi.Schema;
 }
 declare module 'joi' {
     interface StringSchema {

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "definition-generator-framework",
-  "version": "1.12.9",
+  "version": "1.12.11",
   "description": "Definition Generator Framework",
   "main": "dist/index.js",
-  "types": "dist/index.d.ts",
   "files": [
     "dist/**/*.js",
     "dist/**/*.d.ts"
   ],
   "publishConfig": {
-    "main": "dist/index.js"
+    "main": "dist/index.js",
+    "types": "dist/index.d.ts"
   },
   "repository": {
     "type": "git",
@@ -56,5 +56,6 @@
     "ts-node": "10.9.2",
     "typescript": "5.3.3",
     "vitest": "1.6.0"
-  }
+  },
+  "types": "dist/index.d.ts"
 }