@researchdatabox/sails-ng-common 0.0.1-beta.9474 → 0.0.1-beta.9604

package/dist/src/validation/validators-support.d.ts

@@ -1,4 +1,4 @@
-import { FormValidationGroups, FormValidatorComponentErrors, FormValidatorConfig, FormValidatorDefinition, FormValidatorErrors, FormValidatorFn } from "./form.model";
+import { FormValidationGroups, FormValidatorComponentErrors, FormValidatorConfig, FormValidatorDefinition, FormValidatorErrors, FormValidatorFns } from "./form.model";
 export declare class ValidatorsSupport {
     /**
      * Create validator definition mapping from the validator definitions.
@@ -10,14 +10,7 @@ export declare class ValidatorsSupport {
      * @param defMap The validator definition mapping.
      * @param config The form validator config blocks.
      */
-    createFormValidatorInstancesFromMapping(defMap: Map<string, FormValidatorDefinition>, config: FormValidatorConfig[] | null | undefined): FormValidatorFn[];
-    /**
-     * Create instances of the given form validators.
-     *
-     * @param definition The form validator definitions.
-     * @param config The form validator config blocks.
-     */
-    createFormValidatorInstances(definition: FormValidatorDefinition[] | null | undefined, config: FormValidatorConfig[] | null | undefined): FormValidatorFn[];
+    createFormValidatorInstancesFromMapping(defMap: Map<string, FormValidatorDefinition>, config: FormValidatorConfig[] | null | undefined): FormValidatorFns;
     /**
      * Get the form validator errors for a component's control.
      * @param errors The control's errors.
@@ -31,6 +24,13 @@ export declare class ValidatorsSupport {
      * @param validator The validator config for a component's model.
      */
     isValidatorEnabled(availableGroups: FormValidationGroups, enabledGroupNames: string[], validator: FormValidatorConfig): boolean;
+    /**
+     * Assign the jsonata evaluator to each 'jsonata-expression' validator.
+     * This must be done before filtering the validators on the client, as the compiled templates are referenced by index.
+     * @param validators The validator configurations from the model config.
+     * @param callback The callback for each validator config with the index.
+     */
+    assignJsonataEvaluators(validators: FormValidatorConfig[], callback: (validator: FormValidatorConfig, index: number) => unknown): void;
     /**
      * Get the enabled validators.
      * @param availableGroups All available validation groups in this form.

package/dist/src/validation/validators-support.js

@@ -30,7 +30,7 @@ class ValidatorsSupport {
      * @param config The form validator config blocks.
      */
     createFormValidatorInstancesFromMapping(defMap, config) {
-        const result = [];
+        const result = { syncDefs: [], asyncDefs: [] };
         for (const validatorConfigItem of (config ?? [])) {
             const validatorClass = validatorConfigItem?.class;
             const def = defMap.get(validatorClass);
@@ -39,30 +39,23 @@ class ValidatorsSupport {
                     + `the available validators are: '${Array.from(defMap.keys()).sort().join(", ")}'.`);
             }
             const message = validatorConfigItem?.message ?? def.message;
-            const item = def.create({ class: validatorClass, message: message, ...(validatorConfigItem?.config ?? {}) });
-            // for debugging:
-            // const getter = function (path: string | LineagePath) {
-            //     return path as any
-            // };
-            // const examples = {
-            //     'empty': item({value: null, get: getter}),
-            //     'filled': item({value: "some-value", get: getter})
-            // };
-            // console.log(`createFormValidatorInstancesFromMapping validatorClass ${validatorClass} validatorConfigItem ${JSON.stringify(validatorConfigItem)} examples ${JSON.stringify(examples)}`);
-            result.push(item);
+            const createConfig = {
+                ...validatorConfigItem?.config ?? {},
+                class: validatorClass,
+                message: message,
+            };
+            if ('create' in def) {
+                result.syncDefs.push(def.create(createConfig));
+            }
+            else if ('createAsync' in def) {
+                result.asyncDefs.push(def.createAsync(createConfig));
+            }
+            else {
+                throw new Error(`Invalid validator definition: must specify 'create' or 'createAsync' function. Definition is ${JSON.stringify(validatorConfigItem)}.`);
+            }
         }
         return result;
     }
-    /**
-     * Create instances of the given form validators.
-     *
-     * @param definition The form validator definitions.
-     * @param config The form validator config blocks.
-     */
-    createFormValidatorInstances(definition, config) {
-        const defMap = this.createValidatorDefinitionMapping(definition);
-        return this.createFormValidatorInstancesFromMapping(defMap, config);
-    }
     /**
      * Get the form validator errors for a component's control.
      * @param errors The control's errors.
@@ -127,6 +120,26 @@ class ValidatorsSupport {
         // Validator was not included in any group, so it is disabled.
         return false;
     }
+    /**
+     * Assign the jsonata evaluator to each 'jsonata-expression' validator.
+     * This must be done before filtering the validators on the client, as the compiled templates are referenced by index.
+     * @param validators The validator configurations from the model config.
+     * @param callback The callback for each validator config with the index.
+     */
+    assignJsonataEvaluators(validators, callback) {
+        validators.forEach((validator, index) => {
+            if (validator.class === "jsonata-expression") {
+                if (!validator.config) {
+                    validator.config = {};
+                }
+                const expr = validator?.config?.['expression']?.toString() ?? "";
+                const evaluator = validator.config?.['evaluator'];
+                if (validator.config && expr && !evaluator) {
+                    validator.config['evaluator'] = callback(validator, index);
+                }
+            }
+        });
+    }
     /**
      * Get the enabled validators.
      * @param availableGroups All available validation groups in this form.
@@ -138,4 +151,4 @@ class ValidatorsSupport {
     }
 }
 exports.ValidatorsSupport = ValidatorsSupport;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9ycy1zdXBwb3J0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3ZhbGlkYXRpb24vdmFsaWRhdG9ycy1zdXBwb3J0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQU1BLGlFQUF5RTtBQUV6RSxNQUFhLGlCQUFpQjtJQUMxQjs7O09BR0c7SUFDSSxnQ0FBZ0MsQ0FDbkMsVUFBd0Q7UUFFeEQsTUFBTSxNQUFNLEdBQUcsSUFBSSxHQUFHLEVBQW1DLENBQUM7UUFDMUQsS0FBSyxNQUFNLGNBQWMsSUFBSSxDQUFDLFVBQVUsSUFBSSxFQUFFLENBQUMsRUFBRSxDQUFDO1lBQzlDLElBQUksQ0FBQyxJQUFBLGdEQUE2QixFQUFDLGNBQWMsQ0FBQyxFQUFFLENBQUM7Z0JBQ2pELE1BQU0sSUFBSSxLQUFLLENBQUMseUZBQXlGLElBQUksQ0FBQyxTQUFTLENBQUMsY0FBYyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBQy9JLENBQUM7WUFDRCxNQUFNLGNBQWMsR0FBRyxjQUFjLEVBQUUsS0FBSyxDQUFDO1lBQzdDLE1BQU0sT0FBTyxHQUFHLGNBQWMsRUFBRSxPQUFPLENBQUM7WUFDeEMsSUFBSSxNQUFNLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxFQUFFLENBQUM7Z0JBQzdCLE1BQU0sUUFBUSxHQUFHLENBQUMsT0FBTyxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUM7Z0JBQ2hFLE1BQU0sSUFBSSxLQUFLLENBQUMsOEJBQThCLGNBQWMsNENBQTRDO3NCQUNsRywrRUFBK0UsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDbEgsQ0FBQztZQUNELE1BQU0sQ0FBQyxHQUFHLENBQUMsY0FBYyxFQUFFLGNBQWMsQ0FBQyxDQUFDO1FBQy9DLENBQUM7UUFDRCxPQUFPLE1BQU0sQ0FBQztJQUNsQixDQUFDO0lBRUQ7Ozs7T0FJRztJ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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9ycy1zdXBwb3J0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3ZhbGlkYXRpb24vdmFsaWRhdG9ycy1zdXBwb3J0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQU1BLGlFQUEyRTtBQUczRSxNQUFhLGlCQUFpQjtJQUM1Qjs7O09BR0c7SUFDSSxnQ0FBZ0MsQ0FDckMsVUFBd0Q7UUFFeEQsTUFBTSxNQUFNLEdBQUcsSUFBSSxHQUFHLEVBQW1DLENBQUM7UUFDMUQsS0FBSyxNQUFNLGNBQWMsSUFBSSxDQUFDLFVBQVUsSUFBSSxFQUFFLENBQUMsRUFBRSxDQUFDO1lBQ2hELElBQUksQ0FBQyxJQUFBLGdEQUE2QixFQUFDLGNBQWMsQ0FBQyxFQUFFLENBQUM7Z0JBQ25ELE1BQU0sSUFBSSxLQUFLLENBQUMseUZBQXlGLElBQUksQ0FBQyxTQUFTLENBQUMsY0FBYyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBQzdJLENBQUM7WUFDRCxNQUFNLGNBQWMsR0FBRyxjQUFjLEVBQUUsS0FBSyxDQUFDO1lBQzdDLE1BQU0sT0FBTyxHQUFHLGNBQWMsRUFBRSxPQUFPLENBQUM7WUFDeEMsSUFBSSxNQUFNLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxFQUFFLENBQUM7Z0JBQy9CLE1BQU0sUUFBUSxHQUFHLENBQUMsT0FBTyxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUM7Z0JBQ2hFLE1BQU0sSUFBSSxLQUFLLENBQUMsOEJBQThCLGNBQWMsNENBQTRDO3NCQUNwRywrRUFBK0UsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDOUcsQ0FBQztZQUNELE1BQU0sQ0FBQyxHQUFHLENBQUMsY0FBYyxFQUFFLGNBQWMsQ0FBQyxDQUFDO1FBQzdDLENBQUM7UUFDRCxPQUFPLE1BQU0sQ0FBQztJQUNoQixDQUFDO0lBRUQ7Ozs7T0FJRztJ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

package/dist/src/validation/validators.d.ts

@@ -6,18 +6,16 @@ import { FormValidatorDefinition } from "./form.model";
  */
 export declare const FORM_VALIDATOR_EMAIL_REGEXP: RegExp;
 /**
- * Definitions of shared form validators.
+ * Definitions of form validators.
  *
- * These can be used on both server-side and client-side. The server provides them to the client.
- * These are the shared / common definitions.
- * ReDBox implementations can modify these validation definitions or add more.
+ * These can be used on both server-side and client-side.
+ * The server provides them to the client.
  *
- * The validators are based on:
- * angular built-in validators: https://github.com/angular/angular/blob/5105fd6f05f01f04873ab1c87d64079fd8519ad4/packages/forms/src/validators.ts
- * formly schema: https://github.com/ngx-formly/ngx-formly/blob/a2f7901b6c0895aee63b4b5fe748fc5ec0ad5475/src/core/src/lib/models/fieldconfig.ts
+ * Sails hooks can use these validators functions, but cannot extend or override them.
+ * Use the 'jsonata-expression' validator to create custom validator functions.
  *
- * These validation definitions need to be on the server-side, and provided to the client-side from the server.
- * There are two sets of validator definitions - 1) shared / common definitions in the core; 2) definitions specific to a client.
- *    These two set of definitions need to be merged and provided by the server to the client.
+ * The validators are based on:
+ * - angular built-in validators: https://github.com/angular/angular/blob/5105fd6f05f01f04873ab1c87d64079fd8519ad4/packages/forms/src/validators.ts
+ * - formly schema: https://github.com/ngx-formly/ngx-formly/blob/a2f7901b6c0895aee63b4b5fe748fc5ec0ad5475/src/core/src/lib/models/fieldconfig.ts
  */
 export declare const formValidatorsSharedDefinitions: FormValidatorDefinition[];

package/dist/src/validation/validators.js

@@ -9,19 +9,17 @@ const helpers_1 = require("./helpers");
  */
 exports.FORM_VALIDATOR_EMAIL_REGEXP = /^(?=.{1,254}$)(?=.{1,64}@)[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/;
 /**
- * Definitions of shared form validators.
+ * Definitions of form validators.
  *
- * These can be used on both server-side and client-side. The server provides them to the client.
- * These are the shared / common definitions.
- * ReDBox implementations can modify these validation definitions or add more.
+ * These can be used on both server-side and client-side.
+ * The server provides them to the client.
  *
- * The validators are based on:
- * angular built-in validators: https://github.com/angular/angular/blob/5105fd6f05f01f04873ab1c87d64079fd8519ad4/packages/forms/src/validators.ts
- * formly schema: https://github.com/ngx-formly/ngx-formly/blob/a2f7901b6c0895aee63b4b5fe748fc5ec0ad5475/src/core/src/lib/models/fieldconfig.ts
+ * Sails hooks can use these validators functions, but cannot extend or override them.
+ * Use the 'jsonata-expression' validator to create custom validator functions.
  *
- * These validation definitions need to be on the server-side, and provided to the client-side from the server.
- * There are two sets of validator definitions - 1) shared / common definitions in the core; 2) definitions specific to a client.
- *    These two set of definitions need to be merged and provided by the server to the client.
+ * The validators are based on:
+ * - angular built-in validators: https://github.com/angular/angular/blob/5105fd6f05f01f04873ab1c87d64079fd8519ad4/packages/forms/src/validators.ts
+ * - formly schema: https://github.com/ngx-formly/ngx-formly/blob/a2f7901b6c0895aee63b4b5fe748fc5ec0ad5475/src/core/src/lib/models/fieldconfig.ts
  */
 exports.formValidatorsSharedDefinitions = [
     {
@@ -323,32 +321,46 @@ exports.formValidatorsSharedDefinitions = [
     {
         class: "jsonata-expression",
         message: "@validator-error-jsonata-expression",
-        create: (config) => {
+        createAsync: (config) => {
             const optionNameKey = "class";
             const optionNameValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionNameKey, "jsonata-expression");
             const optionMessageKey = "message";
             const optionMessageValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionMessageKey, "@validator-error-jsonata-expression");
             const optionDescriptionKey = "description";
-            let optionDescriptionValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionDescriptionKey);
+            const optionDescriptionValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionDescriptionKey, "");
             const optionExpressionKey = "expression";
             const expression = (0, helpers_1.formValidatorGetDefinitionItem)(config, optionExpressionKey);
-            const evaluator = config?.["evaluator"];
-            return (control) => {
-                if (control.value == null || (0, helpers_1.formValidatorLengthOrSize)(control.value) === 0) {
-                    return null; // don't validate empty values to allow optional controls
-                }
-                const value = control.value?.toString();
-                let success;
+            const optionEvaluatorKey = "evaluator";
+            const evaluator = (0, helpers_1.formValidatorGetDefinitionItem)(config, optionEvaluatorKey);
+            return async (control) => {
+                // Notes:
+                // 1. For the jsonata-expression validator, always validate the control value.
+                //    This enables the expression to decide whether empty values are valid or not.
+                //    If empty values were not validated, then the expression would not have the option to treat empty values as invalid.
+                // 2. jsonata tries to define a 'keepSingleton' property on the input value.
+                //    Must clone the value because control values cannot be extended.
+                //    See: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Errors/Cant_define_property_object_not_extensible
+                let success = null;
+                let value;
                 try {
-                    if (typeof evaluator !== "function") {
-                        throw new Error("Missing evaluator");
-                    }
-                    success = evaluator(control);
+                    value = structuredClone(control.value);
                 }
                 catch (err) {
                     success = false;
-                    optionDescriptionValue = "the validator is not configured correctly";
-                    console.error(`Validator 'jsonata-expression' could not run due to error: ${err}`);
+                    console.error(`Validator 'jsonata-expression' with description '${optionDescriptionValue}' could not run due to error: control value cannot be cloned`);
+                }
+                if (success === null && typeof evaluator !== "function") {
+                    success = false;
+                    console.error(`Validator 'jsonata-expression' with description '${optionDescriptionValue}' could not run due to error: evaluator is not a function`);
+                }
+                if (success === null) {
+                    try {
+                        success = await evaluator(value) === true;
+                    }
+                    catch (err) {
+                        success = false;
+                        console.error(`Validator 'jsonata-expression' with description '${optionDescriptionValue}' could not run due to error: ${err}`);
+                    }
                 }
                 return success
                     ? null
@@ -426,4 +438,4 @@ exports.formValidatorsSharedDefinitions = [
         },
     },
 ];
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/validation/validators.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/validation/validators.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@researchdatabox/sails-ng-common",
-  "version": "0.0.1-beta.9474",
+  "version": "0.0.1-beta.9604",
   "description": "Common models shared between Sails API endpoints and client-side Angular code",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -72,7 +72,7 @@
     ]
   },
   "dependencies": {
-    "@jsonjoy.com/json-pointer": "18.15.0",
+    "@jsonjoy.com/json-pointer": "18.21.0",
     "lodash": "4.18.1",
     "lodash-es": "4.18.1",
     "luxon": "3.7.2",