@ng-formworks/core 20.6.4 → 20.6.6

package/fesm2022/ng-formworks-core.mjs

@@ -2488,6 +2488,10 @@ const jsonSchemaFormatTests = {
     // Modified to allow incomplete entries, such as
     // "2000-03-14T01:59:26.535" (needs "Z") or "2000-03-14T01:59" (needs ":00Z")
     'date-time': /^\d\d\d\d-[0-1]\d-[0-3]\d[t\s][0-2]\d:[0-5]\d(?::[0-5]\d)?(?:\.\d+)?(?:z|[+-]\d\d:\d\d)?$/i,
+    // "2000-03-14T01:59:26.535" (doesn't need "Z") or "2000-03-14T01:59" (needs ":00Z")
+    //'iso-date-time':^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(Z|([+-]\d{2}:\d{2}))?$
+    //for now same as 'date-time' until better tested
+    'iso-date-time': /^\d\d\d\d-[0-1]\d-[0-3]\d[t\s][0-2]\d:[0-5]\d(?::[0-5]\d)?(?:\.\d+)?(?:z|[+-]\d\d:\d\d)?$/i,
     // email (sources from jsen validator):
     // http://stackoverflow.com/questions/201323/using-a-regular-expression-to-validate-an-email-address#answer-8829363
     // http://www.w3.org/TR/html5/forms.html#valid-e-mail-address (search for 'willful violation')
@@ -2856,7 +2860,7 @@ class JsonValidators {
             }
             else {
                 // Allow JavaScript Date objects
-                isValid = ['date', 'time', 'date-time'].includes(requiredFormat) &&
+                isValid = ['date', 'time', 'iso-date-time'].includes(requiredFormat) &&
                     Object.prototype.toString.call(currentValue) === '[object Date]';
             }
             return xor(isValid, invert) ?
@@ -4072,7 +4076,10 @@ function getInputType(schema, layoutNode = null) {
             return {
                 'color': 'color',
                 'date': 'date',
-                'date-time': 'datetime-local',
+                //as per ajv date-time requires a timezone but input 
+                //datetime-local doesn't  
+                //'date-time': 'datetime-local',
+                'iso-date-time': 'datetime-local',
                 'email': 'email',
                 'uri': 'url',
             }[schema.format] || 'text';
@@ -6453,7 +6460,8 @@ function buildLayoutFromSchema(jsf, widgetLibrary, nodeValue = null, schemaPoint
                                         '/properties/' + innerItemLevel2.name : innerItemLevel2.name;
                                     //innerItemLevel2.oneOfPointer =  schemaPointer + keySchemaPointer + l2SchemaPointer;
                                     // innerItemLevel2.schemaPointer=innerItemLevel2.schemaPointer; 
-                                    innerItemLevel2.oneOfPointer = innerItemLevel2.schemaPointer;
+                                    const ofPointer = { anyOf: "anyOfPointer", oneOf: "oneOfPointer" }[ofType];
+                                    innerItemLevel2[ofPointer] = ofPointer ? innerItemLevel2.schemaPointer : undefined;
                                 });
                             }
                             //TODO review-will never reach here if forRefLibrary==true
@@ -6463,6 +6471,9 @@ function buildLayoutFromSchema(jsf, widgetLibrary, nodeValue = null, schemaPoint
                                 innerItem.forEach(item => {
                                     const l2SchemaPointer = hasOwn(ofItem, 'properties') ?
                                         '/properties/' + item.name : item.name;
+                                    if (ofType == "anyOf") {
+                                        item.anyOfPointer = item.schemaPointer;
+                                    }
                                     if (outerOneOfItem) {
                                         ////item.oneOfPointer =  schemaPointer + keySchemaPointer + l2SchemaPointer;
                                         //schemaPointer + keySchemaPointer + item.dataPointer;
@@ -6486,7 +6497,8 @@ function buildLayoutFromSchema(jsf, widgetLibrary, nodeValue = null, schemaPoint
                             }
                             else {
                                 if (outerOneOfItem) {
-                                    innerItem.oneOfPointer = schemaPointer + keySchemaPointer; // + innerItem.dataPointer;
+                                    const ofPointer = { anyOf: "anyOfPointer", oneOf: "oneOfPointer" }[ofType];
+                                    innerItem[ofPointer] = ofPointer ? schemaPointer + keySchemaPointer : undefined;
                                     ////innerItem.schemaPointer=innerItem.oneOfPointer; 
                                     outerOneOfItem.items = outerOneOfItem.items || [];
                                     outerOneOfItem.items.push(innerItem);
@@ -7496,7 +7508,8 @@ class JsonSchemaFormService {
         //introduced to check if the node  is part of ITE conditional
         //then change or add the control
         if (layoutNode?.schemaPointer && layoutNode.isITEItem ||
-            (layoutNode?.schemaPointer && layoutNode?.oneOfPointer)) {
+            (layoutNode?.schemaPointer && layoutNode?.oneOfPointer) ||
+            layoutNode?.schemaPointer && layoutNode.anyOfPointer) {
             //before changing control, need to set the new data type for data formatting
             const schemaType = this.dataMap.get(layoutNode?.dataPointer).get("schemaType");
             if (schemaType != layoutNode.dataType) {
@@ -7539,9 +7552,9 @@ class JsonSchemaFormService {
         //set, as the control would only be initialized when the condition is true 
         //TODO-review need to decide which of the data sets between data,formValues and default 
         //to use for the value
-        if (ctx.options?.condition || layoutNode?.oneOfPointer) {
+        if (ctx.options?.condition || layoutNode?.oneOfPointer || layoutNode?.anyOfPointer) {
             const dataPointer = this.getDataPointer(ctx);
-            const controlValue = ctx.formControl.value;
+            const controlValue = ctx.formControl?.value;
             const dataValue = JsonPointer.has(this.data, dataPointer) ?
                 JsonPointer.get(this.data, dataPointer) : undefined;
             const formValue = JsonPointer.has(this.formValues, dataPointer) ?
@@ -7672,7 +7685,8 @@ class JsonSchemaFormService {
         }
         const schemaPointer = ctx.layoutNode()?.isITEItem ? ctx.layoutNode()?.schemaPointer : null;
         const oneOfPointer = ctx.layoutNode()?.oneOfPointer;
-        return getControl(this.formGroup, this.getDataPointer(ctx), false, schemaPointer || oneOfPointer);
+        const anyOfPointer = ctx.layoutNode()?.anyOfPointer;
+        return getControl(this.formGroup, this.getDataPointer(ctx), false, schemaPointer || oneOfPointer || anyOfPointer);
     }
     setFormControl(ctx, control) {
         if (!ctx || !ctx.layoutNode ||
@@ -7690,7 +7704,8 @@ class JsonSchemaFormService {
         }
         const schemaPointer = ctx.layoutNode()?.isITEItem ? ctx.layoutNode()?.schemaPointer : null;
         const oneOfPointer = ctx.layoutNode()?.oneOfPointer;
-        const control = getControl(this.formGroup, this.getDataPointer(ctx), false, schemaPointer || oneOfPointer);
+        const anyOfPointer = ctx.layoutNode()?.anyOfPointer;
+        const control = getControl(this.formGroup, this.getDataPointer(ctx), false, schemaPointer || oneOfPointer || anyOfPointer);
         return control ? control.value : null;
     }
     getFormControlGroup(ctx) {
@@ -7699,7 +7714,8 @@ class JsonSchemaFormService {
         }
         const schemaPointer = ctx.layoutNode()?.isITEItem ? ctx.layoutNode()?.schemaPointer : null;
         const oneOfPointer = ctx.layoutNode()?.oneOfPointer;
-        return getControl(this.formGroup, this.getDataPointer(ctx), true, schemaPointer || oneOfPointer);
+        const anyOfPointer = ctx.layoutNode()?.anyOfPointer;
+        return getControl(this.formGroup, this.getDataPointer(ctx), true, schemaPointer || oneOfPointer || anyOfPointer);
     }
     getFormControlName(ctx) {
         if (!ctx || !ctx.layoutNode ||
@@ -9754,13 +9770,13 @@ class SelectComponent {
         [name]="controlName">
         <ng-template ngFor let-selectItem [ngForOf]="selectList">
           <option *ngIf="!isArray(selectItem?.items)"
-            [value]="selectItem?.value">
+            [ngValue]="selectItem?.value">
             <span [innerHTML]="selectItem?.name"></span>
           </option>
           <optgroup *ngIf="isArray(selectItem?.items)"
             [label]="selectItem?.group">
             <option *ngFor="let subItem of selectItem.items"
-              [value]="subItem?.value">
+              [ngValue]="subItem?.value">
               <span [innerHTML]="subItem?.name"></span>
             </option>
           </optgroup>
@@ -9778,14 +9794,14 @@ class SelectComponent {
         <ng-template ngFor let-selectItem [ngForOf]="selectList">
           <option *ngIf="!isArray(selectItem?.items)"
             [selected]="selectItem?.value === controlValue"
-            [value]="selectItem?.value">
+            [ngValue]="selectItem?.value">
             <span [innerHTML]="selectItem?.name"></span>
           </option>
           <optgroup *ngIf="isArray(selectItem?.items)"
             [label]="selectItem?.group">
             <option *ngFor="let subItem of selectItem.items"
               [attr.selected]="subItem?.value === controlValue"
-              [value]="subItem?.value">
+              [ngValue]="subItem?.value">
               <span [innerHTML]="subItem?.name"></span>
             </option>
           </optgroup>
@@ -9805,14 +9821,14 @@ class SelectComponent {
         <ng-template ngFor let-selectItem [ngForOf]="selectList">
           <option *ngIf="!isArray(selectItem?.items)"
             [selected]="selectItem?.value === controlValue"
-            [value]="selectItem?.value">
+            [ngValue]="selectItem?.value">
             <span [innerHTML]="selectItem?.name"></span>
           </option>
           <optgroup *ngIf="isArray(selectItem?.items)"
             [label]="selectItem?.group">
             <option *ngFor="let subItem of selectItem.items"
               [attr.selected]="subItem?.value === controlValue"
-              [value]="subItem?.value">
+              [ngValue]="subItem?.value">
               <span [innerHTML]="subItem?.name"></span>
             </option>
           </optgroup>
@@ -9843,13 +9859,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImpor
         [name]="controlName">
         <ng-template ngFor let-selectItem [ngForOf]="selectList">
           <option *ngIf="!isArray(selectItem?.items)"
-            [value]="selectItem?.value">
+            [ngValue]="selectItem?.value">
             <span [innerHTML]="selectItem?.name"></span>
           </option>
           <optgroup *ngIf="isArray(selectItem?.items)"
             [label]="selectItem?.group">
             <option *ngFor="let subItem of selectItem.items"
-              [value]="subItem?.value">
+              [ngValue]="subItem?.value">
               <span [innerHTML]="subItem?.name"></span>
             </option>
           </optgroup>
@@ -9867,14 +9883,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImpor
         <ng-template ngFor let-selectItem [ngForOf]="selectList">
           <option *ngIf="!isArray(selectItem?.items)"
             [selected]="selectItem?.value === controlValue"
-            [value]="selectItem?.value">
+            [ngValue]="selectItem?.value">
             <span [innerHTML]="selectItem?.name"></span>
           </option>
           <optgroup *ngIf="isArray(selectItem?.items)"
             [label]="selectItem?.group">
             <option *ngFor="let subItem of selectItem.items"
               [attr.selected]="subItem?.value === controlValue"
-              [value]="subItem?.value">
+              [ngValue]="subItem?.value">
               <span [innerHTML]="subItem?.name"></span>
             </option>
           </optgroup>
@@ -9894,14 +9910,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImpor
         <ng-template ngFor let-selectItem [ngForOf]="selectList">
           <option *ngIf="!isArray(selectItem?.items)"
             [selected]="selectItem?.value === controlValue"
-            [value]="selectItem?.value">
+            [ngValue]="selectItem?.value">
             <span [innerHTML]="selectItem?.name"></span>
           </option>
           <optgroup *ngIf="isArray(selectItem?.items)"
             [label]="selectItem?.group">
             <option *ngFor="let subItem of selectItem.items"
               [attr.selected]="subItem?.value === controlValue"
-              [value]="subItem?.value">
+              [ngValue]="subItem?.value">
               <span [innerHTML]="subItem?.name"></span>
             </option>
           </optgroup>
@@ -10209,7 +10225,10 @@ class WidgetLibraryService {
             // See: http://ulion.github.io/jsonform/playground/?example=fields-checkboxbuttons
             // Widgets included for compatibility with React JSON Schema Form API
             'updown': 'number',
-            'date-time': 'datetime-local',
+            //'date-time': 'datetime-local',
+            //as per ajv date-time requires a timezone but input 
+            //datetime-local doesn't  
+            'iso-date-time': 'datetime-local',
             'alt-datetime': 'datetime-local',
             'alt-date': 'date',
             // Widgets included for compatibility with Angular Schema Form API