@jinntec/fore 1.3.0 → 1.4.0

package/src/getInScopeContext.js

@@ -52,10 +52,8 @@ function _getInitialContext(node, ref) {
         }
         return model.getDefaultInstance().getDefaultContext();
     }
-    if (model.getDefaultInstance() !== null && model.inited) {
-        return model.getDefaultInstance().getDefaultContext();
-    }
-    return [];
+    // should always return default context if all other fails
+    return model.getDefaultInstance().getDefaultContext();
 }
 
 export default function getInScopeContext(node, ref) {

package/src/modelitem.js

@@ -67,7 +67,9 @@ export class ModelItem {
   }
 
   addAlert(alert) {
-    this.alerts.push(alert);
+    if(!this.alerts.includes(alert)){
+      this.alerts.push(alert);
+    }
   }
 
   cleanAlerts() {

package/src/ui/abstract-control.js

@@ -257,7 +257,7 @@ export default class AbstractControl extends foreElementMixin(HTMLElement) {
     const alert = this.querySelector('fx-alert');
 
     const mi = this.getModelItem();
-    console.log('late modelItem', mi);
+    // console.log('late modelItem', mi);
     if (this.isValid() !== this.modelItem.constraint) {
       if (this.modelItem.constraint) {
         // if (alert) alert.style.display = 'none';

package/src/ui/fx-control.js

@@ -482,7 +482,7 @@ export default class FxControl extends XfAbstractControl {
         if (nodeset.length) {
           // console.log('nodeset', nodeset);
           const fragment = document.createDocumentFragment();
-          console.time('offscreen');
+          // console.time('offscreen');
 /*
           Array.from(nodeset).forEach(node => {
             // console.log('#### node', node);
@@ -504,7 +504,7 @@ export default class FxControl extends XfAbstractControl {
             this.updateEntry(newEntry, node);
           });
           this.template.parentNode.appendChild(fragment);
-          console.timeEnd('offscreen');
+          // console.timeEnd('offscreen');
         } else {
           const newEntry = this.createEntry();
           this.template.parentNode.appendChild(newEntry);

package/src/ui/fx-switch.js

@@ -5,7 +5,6 @@ import { FxContainer } from './fx-container.js';
  * `fx-switch`
  * a container allowing to switch between fx-case elements
  *
- *  * todo: implement
  * @customElement
  */
 class FxSwitch extends FxContainer {
@@ -45,9 +44,13 @@ class FxSwitch extends FxContainer {
       Array.from(cases).forEach(caseElem => {
         const name = caseElem.getAttribute('name');
         if (name === this.modelItem.value) {
+          Fore.dispatch(caseElem,'select',{});
           caseElem.classList.add('selected-case');
           selectedCase = caseElem;
         } else {
+          if(caseElem.classList.contains('selected-case')){
+            Fore.dispatch(caseElem,'deselect',{});
+          }
           caseElem.classList.remove('selected-case');
         }
       });
@@ -56,6 +59,7 @@ class FxSwitch extends FxContainer {
       // if none is selected select the first as default
       if (!selectedCase) {
         selectedCase = cases[0];
+        Fore.dispatch(selectedCase,'select',{});
         selectedCase.classList.add('selected-case');
       }
     }
@@ -69,9 +73,13 @@ class FxSwitch extends FxContainer {
       if (caseElement === c) {
         // eslint-disable-next-line no-param-reassign
         c.classList.add('selected-case');
+        Fore.dispatch(c,'select',{});
         this.refresh();
       } else {
         // eslint-disable-next-line no-param-reassign
+        if(c.classList.contains('selected-case')){
+          Fore.dispatch(c,'deselect',{});
+        }
         c.classList.remove('selected-case');
       }
     });

package/src/ui/fx-trigger.js

@@ -1,5 +1,5 @@
 import XfAbstractControl from './abstract-control.js';
-import {leadingDebounce} from "../events.js";
+import { leadingDebounce } from '../events.js';
 
 export class FxTrigger extends XfAbstractControl {
   connectedCallback() {
@@ -28,14 +28,18 @@ export class FxTrigger extends XfAbstractControl {
 
       const element = elements[0];
 
-      if(this.debounceDelay){
+      if (this.debounceDelay) {
         this.addEventListener(
-            'click',
-            leadingDebounce(this,(e) => {
-              this.performActions(e)
-            }, this.debounceDelay),
+          'click',
+          leadingDebounce(
+            this,
+            e => {
+              this.performActions(e);
+            },
+            this.debounceDelay,
+          ),
         );
-      }else{
+      } else {
         element.addEventListener('click', e => this.performActions(e));
       }
       this.widget = element;
@@ -63,7 +67,7 @@ export class FxTrigger extends XfAbstractControl {
   }
 
   async updateWidgetValue() {
-    console.log('trigger update', this);
+    // console.log('trigger update', this);
     return null;
   }
 
@@ -88,17 +92,14 @@ export class FxTrigger extends XfAbstractControl {
     // Update all child variables, but only once
     this.querySelectorAll('fx-var').forEach(variableElement => variableElement.refresh());
 
-    const forLoop = async () => {
-      for (let i = 0; i < this.children.length; i += 1) {
-        const child = this.children[i];
-        if (typeof child.execute === 'function') {
-          // eslint-disable-next-line no-await-in-loop
-          await child.execute(e);
-          // child.execute(e);
-        }
+    for (let i = 0; i < this.children.length; i += 1) {
+      const child = this.children[i];
+      if (typeof child.execute === 'function') {
+        // eslint-disable-next-line no-await-in-loop
+        await child.execute(e);
+        // child.execute(e);
       }
-    };
-    forLoop();
+    }
   }
 
   /*

package/src/xpath-evaluation.js

@@ -47,8 +47,21 @@ const xhtmlNamespaceResolver = prefix => {
  * Resolve an id in scope. Behaves like the algorithm defined on https://www.w3.org/community/xformsusers/wiki/XForms_2.0#idref-resolve
  */
 export function resolveId(id, sourceObject, nodeName = null) {
-    const allMatchingTargetObjects = fxEvaluateXPathToNodes(
-        'outermost(ancestor-or-self::fx-fore[1]/(descendant::fx-fore|descendant::*[@id = $id]))[not(self::fx-fore)]',
+	let query = 'outermost(ancestor-or-self::fx-fore[1]/(descendant::fx-fore|descendant::*[@id = $id]))[not(self::fx-fore)]';
+    /*
+        if (nodeName === 'fx-instance') {
+            // Instance elements can only be in the `model` element
+            // query = 'ancestor-or-self::fx-fore[1]/fx-model/fx-instance[@id = $id]';
+
+            const fore = Fore.getFore(sourceObject);
+            const instances = fore.getModel().instances;
+            const targetInstance = instances.find(i => i.id === id);
+            return targetInstance;
+        return document.getElementById(id);
+	}
+    */
+
+    const allMatchingTargetObjects = fxEvaluateXPathToNodes(query,
         sourceObject,
         null,
         {id},
@@ -749,19 +762,18 @@ const instance = (dynamicContext, string) => {
         {namespaceResolver: xhtmlNamespaceResolver},
     );
 
-    // console.log('fnInstance dynamicContext: ', dynamicContext);
-    // console.log('fnInstance string: ', string);
+    const inst = string
+        ? formElement.querySelector(`#${string}`)
+        : formElement.querySelector(`fx-instance`);
 
+/*
     const inst = string
         ? resolveId(string, formElement, 'fx-instance')
         : formElement.querySelector(`fx-instance`);
+*/
 
-    // const def = instance.getInstanceData();
     if (inst) {
-        const def = inst.getDefaultContext();
-        // console.log('target instance root node: ', def);
-
-        return def;
+        return inst.getDefaultContext();
     }
     return null;
 };

package/src/xpath-util.js

@@ -1,14 +1,12 @@
 import * as fx from 'fontoxpath';
 
-/**
- * Checks wether the specified path expression is an absolute path.
- *
- * @param path the path expression.
- * @return <code>true</code> if specified path expression is an absolute
- * path, otherwise <code>false</code>.
- */
-
 export class XPathUtil {
+
+  /**
+   * returns next bound element upwards in tree
+   * @param start where to start the search
+   * @returns {*|null}
+   */
   static getParentBindingElement(start) {
     /*    if (start.parentNode.host) {
       const { host } = start.parentNode;
@@ -25,6 +23,13 @@ export class XPathUtil {
     return null;
   }
 
+  /**
+   * Checks whether the specified path expression is an absolute path.
+   *
+   * @param path the path expression.
+   * @return <code>true</code> if specified path expression is an absolute
+   * path, otherwise <code>false</code>.
+   */
   static isAbsolutePath(path) {
     return path != null && (path.startsWith('/') || path.startsWith('instance('));
   }
@@ -33,26 +38,6 @@ export class XPathUtil {
     return ref === '.' || ref === './text()' || ref === 'text()' || ref === '' || ref === null;
   }
 
-  static getDefaultInstance(boundElement) {
-    // const fore = boundElement.closest('fx-fore');
-    const fore = XPathUtil.getForeElement(boundElement);
-    const defaultInstance = fore.querySelector('fx-instance');
-    if (!defaultInstance) {
-      throw new Error('no default instance present');
-    }
-    return defaultInstance;
-  }
-
-  static getForeElement(start) {
-    if (start.nodeName === 'FX-FORE') {
-      return start;
-    }
-    if (start.parentNode) {
-      return XPathUtil.getForeElement(start.parentNode);
-    }
-    throw new Error('no Fore element present');
-  }
-
   /**
    * returns the instance id from a complete XPath using `instance()` function.
    *