@jinntec/fore 2.0.0 → 2.1.1

package/src/fx-model.js

@@ -447,7 +447,10 @@ export class FxModel extends HTMLElement {
     }
 
     getDefaultInstance() {
-        return this.instances[0];
+        if (this.instances.length) {
+			return this.instances[0];
+		}
+		return this.getInstance('default');
     }
 
     getDefaultInstanceData() {
@@ -461,11 +464,11 @@ export class FxModel extends HTMLElement {
 
         let found;
         if(id === 'default'){
-            found = this.getDefaultInstance();
+            found = this.instances[0];
         }
         // ### lookup in local instances first
         if(!found) {
-        const instArray = Array.from(this.instances);
+			const instArray = Array.from(this.instances);
             found = instArray.find(inst => inst.id === id);
             const parentFore = this.fore.parentNode.nodeType === Node.DOCUMENT_FRAGMENT_NODE
                     ? this.fore.parentNode.host.closest('fx-fore')

package/src/fx-submission.js

@@ -48,14 +48,16 @@ export class FxSubmission extends foreElementMixin(HTMLElement) {
             ? this.getAttribute('serialization')
             : 'xml';
 
-        this.url = this.hasAttribute('url') ? this.getAttribute('url'):null;
-
-        this.targetref = this.hasAttribute('targetref') ? this.getAttribute('targetref') : null;
-
         this.mediatype = this.hasAttribute('mediatype')
             ? this.getAttribute('mediatype')
             : 'application/xml';
 
+        this.responseMediatype = this.hasAttribute('response-mediatype') ? this.getAttribute('response-mediatype') : this.mediatype;
+        this.url = this.hasAttribute('url') ? this.getAttribute('url') : null;
+
+        this.targetref = this.hasAttribute('targetref') ? this.getAttribute('targetref') : null;
+
+
         this.validate = this.getAttribute('validate') ? this.getAttribute('validate') : 'true';
         this.credentials = this.hasAttribute('credentials')
             ? this.getAttribute('credentials')
@@ -134,6 +136,23 @@ export class FxSubmission extends foreElementMixin(HTMLElement) {
 
         // let serialized = serializer.serializeToString(relevant);
         if (this.method.toLowerCase() === 'get') {
+/*
+             todo: serialize the bound instance element names as get parameters and using their text values
+             as param values. leave out empty params and create querystring from the result.Elements may
+             have exactly level deep or are otherwise ignored.
+             <data>
+                <id>1234</id>
+                <name>john</name>
+                <zip></zip>
+                <!-- ignored as no direct text value -->
+                <phone>
+                    <mobile></mobile>
+                <phone>
+              </data>
+              results in: ?id=1234&name=john to be appended to this.url on fetch
+
+*/
+
             serialized = undefined;
         }
         // console.log('data being send', serialized);
@@ -182,6 +201,7 @@ export class FxSubmission extends foreElementMixin(HTMLElement) {
                 const key = resolvedUrl.substring(resolvedUrl.indexOf(':') + 1);
                 localStorage.removeItem(key);
                 const newInst = new DOMParser().parseFromString('<data></data>', 'application/xml');
+                this.replace = 'instance';
                 this._handleResponse(newInst);
                 console.log('### <<<<< submit-done >>>>>');
                 Fore.dispatch(this, 'submit-done', {});

package/src/fx-var.js

@@ -25,8 +25,13 @@ export class FxVariable extends foreElementMixin(HTMLElement) {
   refresh() {
     const inscope = getInScopeContext(this, this.valueQuery);
 
-    const values = evaluateXPath(this.valueQuery, inscope, this, this.precedingVariables);
-    [this.value] = values;
+      const values = evaluateXPath(this.valueQuery, inscope, this, this.precedingVariables);
+	  if (values.length) {
+		  [this.value] = values;
+	  } else {
+		  // There is no value: set to null so it's interpreted as empty-sequence later on
+		  this.value = null;
+	  }
   }
 
   setInScopeVariables(inScopeVariables) {

package/src/getInScopeContext.js

@@ -62,13 +62,23 @@ export default function getInScopeContext(node, ref) {
     // console.log('getInScopeContext parent', parentElement);
 
     if(parentElement.nodeName === 'FX-FORE'){
-        return parentElement.getModel().getDefaultInstance().getDefaultContext();
+        const context = parentElement.getModel().getDefaultInstance()?.getDefaultContext();
+		if (!context) {
+			// Edge-case, we are in an inner fore. Use the outer fore's default context
+			return getInScopeContext(parentElement.parentNode, ref);
+		}
+		return context;
     }
     const parentBind = XPathUtil.getClosest('[ref]', parentElement.parentNode);
     if (parentBind && (parentBind.nodeName === 'FX-GROUP' || parentBind.nodeName === 'FX-CONTROL')) {
         return parentBind.nodeset;
     }
 
+	const parentActionWithIterateExpr = parentElement.matches('[iterate]') ? parentElement : XPathUtil.getClosest('[iterate]', parentElement.parentNode);
+	if (parentActionWithIterateExpr && parentActionWithIterateExpr.currentContext) {
+		return parentActionWithIterateExpr.currentContext;
+	}
+
     const repeatItem = XPathUtil.getClosest('fx-repeatitem', parentElement);
     if (repeatItem) {
         if (node.nodeName === 'context') {

package/src/json-util.js

@@ -0,0 +1,27 @@
+const jsonToXml = (json) => {
+    const convert = (obj) => {
+        let xml = '';
+        for (const key in obj) {
+            if (obj.hasOwnProperty(key)) {
+                xml += `<${key}`;
+                if (typeof obj[key] === 'object') {
+                    if (Array.isArray(obj[key])) {
+                        xml += ' type="array">';
+                        obj[key].forEach((item) => {
+                            xml += `<_>${convert(item)}</_>`;
+                        });
+                    } else {
+                        xml += ' type="object">';
+                        xml += convert(obj[key]);
+                    }
+                } else {
+                    xml += ` type="${typeof obj[key]}">${obj[key]}</${key}>`;
+                }
+                xml += `</${key}>`;
+            }
+        }
+        return xml;
+    };
+
+    return `<json>${convert(json)}</json>`;
+};

package/src/relevance.js

@@ -1,4 +1,22 @@
+import {Fore} from "./fore.js";
+
 export class Relevance {
+
+  static handleRelevance(boundElement){
+    const modelItem = boundElement.getModelItem();
+
+    if (modelItem && modelItem.relevant) {
+      boundElement.removeAttribute('nonrelevant');
+      boundElement.setAttribute('relevant','');
+      Fore.dispatch(this,'relevant',{});
+
+    } else {
+      boundElement.removeAttribute('relevant');
+      boundElement.setAttribute('nonrelevant','');
+      Fore.dispatch(this,'nonrelevant',{});
+    }
+  }
+
   static selectRelevant(element, type) {
     // console.log('selectRelevant', type);
     switch (type) {

package/src/ui/abstract-control.js

@@ -5,6 +5,7 @@ import { Fore } from '../fore.js';
 import { XPathUtil } from '../xpath-util.js';
 import getInScopeContext from '../getInScopeContext.js';
 import { evaluateXPathToFirstNode} from '../xpath-evaluation.js';
+import {Relevance} from "../relevance.js";
 
 /**
  * `AbstractControl` -
@@ -172,6 +173,7 @@ export default class AbstractControl extends foreElementMixin(HTMLElement) {
       this.handleValid();
     }
     this.handleRelevant();
+    // Relevance.handleRelevance(this);
     // todo: handleType()
   }
 

package/src/ui/fx-droptarget.js

@@ -0,0 +1,9 @@
+import { foreElementMixin } from '../ForeElementMixin.js';
+import { withDraggability } from '../withDraggability.js';
+
+class FxDroptarget extends withDraggability(foreElementMixin(HTMLElement)) {
+}
+
+if (!customElements.get('fx-droptarget')) {
+    window.customElements.define('fx-droptarget', FxDroptarget);
+}

package/src/ui/fx-repeat-attributes.js

@@ -3,6 +3,7 @@ import { evaluateXPath } from '../xpath-evaluation.js';
 import getInScopeContext from '../getInScopeContext.js';
 import { XPathUtil } from '../xpath-util.js';
 import {foreElementMixin} from "../ForeElementMixin.js";
+import {withDraggability} from "../withDraggability.js";
 
 /**
  * `fx-repeat`
@@ -19,7 +20,7 @@ import {foreElementMixin} from "../ForeElementMixin.js";
  *
  * todo: it should be seriously be considered to extend FxContainer instead but needs refactoring first.
  */
-export class FxRepeatAttributes extends foreElementMixin(HTMLElement) {
+export class FxRepeatAttributes extends withDraggability(foreElementMixin(HTMLElement), false) {
   static get properties() {
     return {
       ...super.properties,
@@ -51,6 +52,7 @@ export class FxRepeatAttributes extends foreElementMixin(HTMLElement) {
     super();
     this.ref = '';
     this.dataTemplate = [];
+    this.isDraggable=null;
     this.focusOnCreate = '';
     this.initDone = false;
     this.repeatIndex = 1;
@@ -87,7 +89,7 @@ export class FxRepeatAttributes extends foreElementMixin(HTMLElement) {
   }
 
   get index() {
-    return this.getAttribute('index');
+        return parseInt(this.getAttribute('index'), 10);
   }
 
   set index(idx) {