@vidyano-labs/virtual-service 0.1.0 → 0.1.1

package/index.d.ts

@@ -1,5 +1,58 @@
 import { Dto, ServiceHooks, Service, Application } from '@vidyano/core';
 
+/**
+ * VirtualPersistentObjectAttribute combines a PersistentObjectAttributeDto with helper methods
+ * This allows clean syntax like attr.getValue() and attr.setValue() while keeping the underlying DTO unchanged
+ */
+type VirtualPersistentObjectAttribute = Dto.PersistentObjectAttributeDto & {
+    /**
+     * Gets the converted value of this attribute (e.g., Boolean as boolean, Int32 as number)
+     */
+    getValue(): any;
+    /**
+     * Sets the value of this attribute with automatic type conversion
+     */
+    setValue(value: any): void;
+    /**
+     * Sets a validation error on this attribute
+     */
+    setValidationError(error: string): void;
+    /**
+     * Clears the validation error on this attribute
+     */
+    clearValidationError(): void;
+};
+/**
+ * VirtualPersistentObject combines a PersistentObjectDto with helper methods
+ * This allows clean syntax like obj.setAttributeValue() while keeping the underlying DTO unchanged
+ */
+type VirtualPersistentObject = Dto.PersistentObjectDto & {
+    /**
+     * Gets an attribute by name, wrapped with getValue/setValue methods
+     */
+    getAttribute(name: string): VirtualPersistentObjectAttribute | undefined;
+    /**
+     * Gets the value of an attribute by name
+     */
+    getAttributeValue(name: string): any;
+    /**
+     * Sets the value of an attribute by name
+     */
+    setAttributeValue(name: string, value: any): void;
+    /**
+     * Sets a validation error for an attribute
+     */
+    setValidationError(name: string, error: string): void;
+    /**
+     * Clears a validation error for an attribute
+     */
+    clearValidationError(name: string): void;
+    /**
+     * Sets a notification message on the persistent object
+     */
+    setNotification(message: string, type: Dto.NotificationType, duration?: number): void;
+};
+
 /**
  * Simplified attribute configuration - converted to PersistentObjectAttributeDto
  */
@@ -184,6 +237,19 @@ type ActionContext = {
      */
     setNotification: (message: string, type: Dto.NotificationType, duration?: number) => void;
 };
+/**
+ * Context provided to business rule validators for accessing the persistent object
+ */
+type RuleValidationContext = {
+    /**
+     * The persistent object being validated (wrapped with helper methods)
+     */
+    persistentObject: VirtualPersistentObject;
+    /**
+     * The attribute being validated (wrapped with helper methods)
+     */
+    attribute: VirtualPersistentObjectAttribute;
+};
 /**
  * PersistentObject configuration - converted to PersistentObjectDto
  */
@@ -286,60 +352,7 @@ type VirtualQueryConfig = {
 /**
  * Rule validator function that throws an error if invalid, or returns nothing if valid
  */
-type RuleValidatorFn = (value: any, ...params: any[]) => void;
-
-/**
- * VirtualPersistentObjectAttribute combines a PersistentObjectAttributeDto with helper methods
- * This allows clean syntax like attr.getValue() and attr.setValue() while keeping the underlying DTO unchanged
- */
-type VirtualPersistentObjectAttribute = Dto.PersistentObjectAttributeDto & {
-    /**
-     * Gets the converted value of this attribute (e.g., Boolean as boolean, Int32 as number)
-     */
-    getValue(): any;
-    /**
-     * Sets the value of this attribute with automatic type conversion
-     */
-    setValue(value: any): void;
-    /**
-     * Sets a validation error on this attribute
-     */
-    setValidationError(error: string): void;
-    /**
-     * Clears the validation error on this attribute
-     */
-    clearValidationError(): void;
-};
-/**
- * VirtualPersistentObject combines a PersistentObjectDto with helper methods
- * This allows clean syntax like obj.setAttributeValue() while keeping the underlying DTO unchanged
- */
-type VirtualPersistentObject = Dto.PersistentObjectDto & {
-    /**
-     * Gets an attribute by name, wrapped with getValue/setValue methods
-     */
-    getAttribute(name: string): VirtualPersistentObjectAttribute | undefined;
-    /**
-     * Gets the value of an attribute by name
-     */
-    getAttributeValue(name: string): any;
-    /**
-     * Sets the value of an attribute by name
-     */
-    setAttributeValue(name: string, value: any): void;
-    /**
-     * Sets a validation error for an attribute
-     */
-    setValidationError(name: string, error: string): void;
-    /**
-     * Clears a validation error for an attribute
-     */
-    clearValidationError(name: string): void;
-    /**
-     * Sets a notification message on the persistent object
-     */
-    setNotification(message: string, type: Dto.NotificationType, duration?: number): void;
-};
+type RuleValidatorFn = (value: any, context: RuleValidationContext, ...params: any[]) => void;
 
 /**
  * Base class for PersistentObject lifecycle methods
@@ -556,4 +569,4 @@ declare class VirtualService extends Service {
 }
 
 export { VirtualPersistentObjectActions, VirtualService, VirtualServiceHooks };
-export type { ActionArgs, ActionConfig, ActionContext, ActionHandler, RuleValidatorFn, VirtualPersistentObject, VirtualPersistentObjectAttribute, VirtualPersistentObjectAttributeConfig, VirtualPersistentObjectConfig, VirtualQueryConfig, VirtualQueryExecuteResult };
+export type { ActionArgs, ActionConfig, ActionContext, ActionHandler, RuleValidationContext, RuleValidatorFn, VirtualPersistentObject, VirtualPersistentObjectAttribute, VirtualPersistentObjectAttributeConfig, VirtualPersistentObjectConfig, VirtualQueryConfig, VirtualQueryExecuteResult };

package/index.js

@@ -226,7 +226,7 @@ class VirtualPersistentObjectRegistry {
                 isRequired: attrConfig.isRequired || false
             };
             // Validate the attribute
-            const error = this.#validator.validateAttribute(attrWithRules);
+            const error = this.#validator.validateAttribute(attrWithRules, po);
             if (error) {
                 attr.validationError = error;
                 hasErrors = true;
@@ -1234,13 +1234,33 @@ class BusinessRuleValidator {
     }
     /**
      * Validate an attribute against its rules
+     * @param attr - The attribute to validate
+     * @param po - The persistent object containing the attribute
      * @returns Error message if validation fails, null if valid
      */
-    validateAttribute(attr) {
+    validateAttribute(attr, po) {
+        // Create conversion context for wrappers
+        const conversionContext = {
+            getConvertedValue: (attribute) => this.#getConvertedValue(attribute),
+            setConvertedValue: (attribute, value) => {
+                attribute.value = toServiceValue(value, attribute.type);
+                attribute.isValueChanged = true;
+            }
+        };
+        // Create wrapped objects for the validation context
+        const wrappedPo = createVirtualPersistentObject(po, conversionContext);
+        const wrappedAttr = createVirtualPersistentObjectAttribute(attr, conversionContext);
+        // Create validation context
+        const context = {
+            persistentObject: wrappedPo,
+            attribute: wrappedAttr
+        };
+        // Get the converted value (e.g., boolean from "True"/"False", number from string)
+        const convertedValue = this.#getConvertedValue(attr);
         // Check isRequired first
         if (attr.isRequired) {
             try {
-                this.#validateNotEmpty(attr.value);
+                this.#validateNotEmpty(convertedValue, context);
             }
             catch (error) {
                 return error instanceof Error ? error.message : String(error);
@@ -1255,7 +1275,7 @@ class BusinessRuleValidator {
             if (!validator)
                 throw new Error(`Unknown business rule: ${rule.name}`);
             try {
-                validator(attr.value, ...rule.params);
+                validator(convertedValue, context, ...rule.params);
             }
             catch (error) {
                 return error instanceof Error ? error.message : String(error);
@@ -1308,15 +1328,19 @@ class BusinessRuleValidator {
         });
         return { name, params };
     }
+    // Helper to convert attribute values based on type
+    #getConvertedValue(attr) {
+        return fromServiceValue(attr.value, attr.type);
+    }
     // Built-in validators - throw errors instead of returning strings
-    #validateIsBase64(value) {
+    #validateIsBase64(value, context) {
         if (value == null || value === "")
             return;
         const base64Regex = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/;
         if (!base64Regex.test(String(value)))
             throw new Error("Value must be a valid base64 string");
     }
-    #validateIsEmail(value) {
+    #validateIsEmail(value, context) {
         if (value == null || value === "")
             return;
         // Only allow ASCII characters in email addresses
@@ -1324,7 +1348,7 @@ class BusinessRuleValidator {
         if (!emailRegex.test(String(value)))
             throw new Error("Email format is invalid");
     }
-    #validateIsRegex(value) {
+    #validateIsRegex(value, context) {
         if (value == null || value === "")
             return;
         try {
@@ -1334,7 +1358,7 @@ class BusinessRuleValidator {
             throw new Error("Value must be a valid regular expression");
         }
     }
-    #validateIsUrl(value) {
+    #validateIsUrl(value, context) {
         if (value == null || value === "")
             return;
         try {
@@ -1344,21 +1368,21 @@ class BusinessRuleValidator {
             throw new Error("Value must be a valid URL");
         }
     }
-    #validateIsWord(value) {
+    #validateIsWord(value, context) {
         if (value == null || value === "")
             return;
         const wordRegex = /^\w+$/;
         if (!wordRegex.test(String(value)))
             throw new Error("Value must contain only word characters");
     }
-    #validateMaxLength(value, maxLength) {
+    #validateMaxLength(value, context, maxLength) {
         if (value == null || value === "")
             return;
         const length = String(value).length;
         if (length > maxLength)
             throw new Error(`Maximum length is ${maxLength} characters`);
     }
-    #validateMaxValue(value, maximum) {
+    #validateMaxValue(value, context, maximum) {
         if (value == null || value === "")
             return;
         const num = Number(value);
@@ -1367,14 +1391,14 @@ class BusinessRuleValidator {
         if (num > maximum)
             throw new Error(`Maximum value is ${maximum}`);
     }
-    #validateMinLength(value, minLength) {
+    #validateMinLength(value, context, minLength) {
         if (value == null || value === "")
             return;
         const length = String(value).length;
         if (length < minLength)
             throw new Error(`Minimum length is ${minLength} characters`);
     }
-    #validateMinValue(value, minimum) {
+    #validateMinValue(value, context, minimum) {
         if (value == null || value === "")
             return;
         const num = Number(value);
@@ -1383,7 +1407,7 @@ class BusinessRuleValidator {
         if (num < minimum)
             throw new Error(`Minimum value is ${minimum}`);
     }
-    #validateNotEmpty(value) {
+    #validateNotEmpty(value, context) {
         if (value == null || value === "" || (typeof value === "string" && value.trim() === ""))
             throw new Error("This field is required");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vidyano-labs/virtual-service",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Virtual service implementation for testing Vidyano applications",
   "type": "module",
   "main": "index.js",
@@ -20,5 +20,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHash": "d6564e9eb23cc8e31609a91945e4ae852ad0b2d9"
+  "gitHash": "c69d76d2dd9e0289838ca50f1cc89a81fa9a89c3"
 }