@ulb-darmstadt/shacl-form 1.6.6 → 1.7.0

package/dist/form.d.ts

@@ -19,7 +19,7 @@ export declare class ShaclForm extends HTMLElement {
     setTheme(theme: Theme): void;
     setSharedShapesGraph(graph: Store): void;
     setClassInstanceProvider(provider: ClassInstanceProvider): void;
-    validate(ignoreEmptyValues?: boolean): Promise<boolean>;
+    validate(ignoreEmptyValues?: boolean): Promise<any>;
     private createValidationErrorDisplay;
     private findRootShaclShapeSubject;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ulb-darmstadt/shacl-form",
-    "version": "1.6.6",
+    "version": "1.7.0",
     "description": "SHACL form generator",
     "main": "dist/form-default.js",
     "module": "dist/form-default.js",

package/src/form.ts

@@ -25,8 +25,8 @@ export class ShaclForm extends HTMLElement {
         this.form.addEventListener('change', ev => {
             ev.stopPropagation()
             if (this.config.editMode) {
-                this.validate(true).then(valid => {
-                    this.dispatchEvent(new CustomEvent('change', { bubbles: true, cancelable: false, composed: true, detail: { 'valid': valid } }))
+                this.validate(true).then(report => {
+                    this.dispatchEvent(new CustomEvent('change', { bubbles: true, cancelable: false, composed: true, detail: { 'valid': report.conforms, 'report': report } }))
                 }).catch(e => { console.warn(e) })
             }
         })
@@ -82,8 +82,8 @@ export class ShaclForm extends HTMLElement {
                                 // let browser check form validity first
                                 if (this.form.reportValidity()) {
                                     // now validate data graph
-                                    this.validate().then(valid => {
-                                        if (valid) {
+                                    this.validate().then(report => {
+                                        if (report?.conforms) {
                                             // form and data graph are valid, so fire submit event
                                             this.dispatchEvent(new Event('submit', { bubbles: true, cancelable: true }))
                                         } else {
@@ -140,7 +140,8 @@ export class ShaclForm extends HTMLElement {
         this.initialize()
     }
 
-    public async validate(ignoreEmptyValues = false): Promise<boolean> {
+    /* Returns the validation report */
+    public async validate(ignoreEmptyValues = false): Promise<any> {
         for (const elem of this.form.querySelectorAll(':scope .validation-error')) {
             elem.remove()
         }
@@ -201,7 +202,7 @@ export class ShaclForm extends HTMLElement {
                     }
                 }
             }
-            return report.conforms
+            return report
         } catch(e) {
             console.error(e)
             return false

package/src/property.ts

@@ -126,10 +126,11 @@ export class ShaclProperty extends HTMLElement {
                 const shapeSubject = instance.firstChild.toRDF(graph)
                 graph.addQuad(subject, pathNode, shapeSubject, this.template.config.valuesGraph)
             } else {
-                const editor = instance.querySelector('.editor') as Editor
-                const value = toRDF(editor)
-                if (value) {
-                    graph.addQuad(subject, pathNode, value, this.template.config.valuesGraph)
+                for (const editor of instance.querySelectorAll<Editor>(':scope > .editor')) {
+                    const value = toRDF(editor)
+                    if (value) {
+                        graph.addQuad(subject, pathNode, value, this.template.config.valuesGraph)
+                    }
                 }
             }
         }