@jinntec/fore 1.10.2 → 1.10.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jinntec/fore",
-  "version": "1.10.2",
+  "version": "1.10.3",
   "description": "Fore - declarative user interfaces in plain HTML",
   "module": "./index.js",
   "publishConfig": {

package/src/fx-bind.js

@@ -63,7 +63,7 @@ export class FxBind extends foreElementMixin(HTMLElement) {
   init(model) {
     this.model = model;
     // console.log('init binding ', this);
-    this.instanceId = this._getInstanceId();
+    this._getInstanceId();
     this.bindType = this.getModel().getInstance(this.instanceId).type;
     // console.log('binding type ', this.bindType);
 
@@ -399,20 +399,40 @@ export class FxBind extends foreElementMixin(HTMLElement) {
     return result;
   }
 
-  // todo: more elaborated implementation ;)
+  /**
+   * return the instance id this bind is associated with. Resolves upwards in binds to either find an expr containing
+   * and instance() function or if not found return 'default'.
+   * @private
+   */
   _getInstanceId() {
     const bindExpr = this.getBindingExpr();
     // console.log('_getInstanceId bindExpr ', bindExpr);
     if (bindExpr.startsWith('instance(')) {
       this.instanceId = XPathUtil.getInstanceId(bindExpr);
-      return this.instanceId;
+      return;
     }
-    if (this.instanceId) {
-      return this.instanceId;
+    if(!this.instanceId && this.parentNode.nodeName === 'FX-BIND'){
+      let parent = this.parentNode;
+      while(parent && !this.instanceId){
+        const ref = parent.getBindingExpr();
+        if (ref.startsWith('instance(')) {
+          this.instanceId = XPathUtil.getInstanceId(ref);
+          return;
+        }
+        if(parent.parentNode.nodeName !== 'FX-BIND'){
+          this.instanceId = 'default';
+          break;
+        }
+        parent = parent.parentNode;
+      }
     }
-    return 'default';
+    this.instanceId = 'default';
   }
+
+
+
 }
+
 if (!customElements.get('fx-bind')) {
   customElements.define('fx-bind', FxBind);
 }

package/src/fx-model.js

@@ -402,7 +402,7 @@ export class FxModel extends HTMLElement {
                         modelItem.required = compute;
                         this.formElement.addToRefresh(modelItem); // let fore know that modelItem needs refresh
                         if (!modelItem.node.textContent) {
-                            console.log('validation failed on modelitem ', modelItem);
+                            console.log('node is required but has no value ', XPathUtil.getDocPath(modelItem.node));
                             valid = false;
                         }
                         // if (!compute) valid = false;

package/src/ui/fx-container.js

@@ -42,7 +42,6 @@ export class FxContainer extends foreElementMixin(HTMLElement) {
     } );
 */
 
-    this.setAttribute('tabindex','0');
   }
 
   /**

package/src/xpath-evaluation.js

@@ -444,11 +444,10 @@ export function evaluateXPath(xpath, contextNode, formElement, variables = {}, o
 */
 export function evaluateXPath(xpath, contextNode, formElement, variables = {}, options={}) {
     try{
-        console.log('evaluateXPath',xpath);
         const namespaceResolver = createNamespaceResolverForNode(xpath, contextNode, formElement);
         const variablesInScope = getVariablesInScope(formElement);
 
-        return fxEvaluateXPath(
+        const result = fxEvaluateXPath(
             xpath,
             contextNode,
             null,
@@ -465,6 +464,8 @@ export function evaluateXPath(xpath, contextNode, formElement, variables = {}, o
                 language: options.language || evaluateXPath.XPATH_3_1
             },
         );
+        // console.log('evaluateXPath',xpath, result);
+        return result;
     }catch (e){
         formElement.dispatchEvent(new CustomEvent('error', {
             composed: false,
@@ -506,7 +507,7 @@ export function evaluateXPathToFirstNode(xpath, contextNode, formElement) {
     try{
         const namespaceResolver = createNamespaceResolverForNode(xpath, contextNode, formElement);
         const variablesInScope = getVariablesInScope(formElement);
-        return fxEvaluateXPathToFirstNode(xpath, contextNode, null, variablesInScope, {
+        const result = fxEvaluateXPathToFirstNode(xpath, contextNode, null, variablesInScope, {
             defaultFunctionNamespaceURI: XFORMS_NAMESPACE_URI,
             moduleImports: {
                 xf: XFORMS_NAMESPACE_URI,
@@ -515,6 +516,8 @@ export function evaluateXPathToFirstNode(xpath, contextNode, formElement) {
             functionNameResolver,
             namespaceResolver,
         });
+        // console.log('evaluateXPathToFirstNode',xpath, result);
+        return result;
     } catch (e){
         formElement.dispatchEvent(new CustomEvent('error', {
             composed: false,
@@ -542,7 +545,7 @@ export function evaluateXPathToNodes(xpath, contextNode, formElement) {
         const namespaceResolver = createNamespaceResolverForNode(xpath, contextNode, formElement);
         const variablesInScope = getVariablesInScope(formElement);
 
-        return fxEvaluateXPathToNodes(xpath, contextNode, null, variablesInScope, {
+        const result = fxEvaluateXPathToNodes(xpath, contextNode, null, variablesInScope, {
             currentContext: {formElement},
             functionNameResolver,
             moduleImports: {
@@ -550,6 +553,8 @@ export function evaluateXPathToNodes(xpath, contextNode, formElement) {
             },
             namespaceResolver,
         });
+        // console.log('evaluateXPathToNodes',xpath, result);
+        return result;
     }catch (e){
         formElement.dispatchEvent(new CustomEvent('error', {
             composed: false,