@jinntec/fore 1.0.0-4 → 1.1.0

package/src/DependencyNotifyingDomFacade.js

@@ -45,21 +45,14 @@ export class DependencyNotifyingDomFacade {
    * @param  bucket - The bucket that matches the attribute that will be used.
    */
   // eslint-disable-next-line class-methods-use-this
-/*
   getChildNodes(node, bucket) {
     const matchingNodes = Array.from(node.childNodes).filter(
       childNode => !bucket || getBucketsForNode(childNode).includes(bucket),
     );
-    return matchingNodes;
-  }
-*/
-
-  getChildNodes(node, bucket) {
-    const matchingNodes = Array.from(node.childNodes).filter(
-        childNode => !bucket || getBucketsForNode(childNode).includes(bucket));
     matchingNodes.forEach(matchingNode => this._onNodeTouched(matchingNode));
     return matchingNodes;
   }
+
   /**
    * Get the data of this node.
    *
@@ -83,11 +76,11 @@ export class DependencyNotifyingDomFacade {
    * @param  bucket - The bucket that matches the attribute that will be used.
    */
   getFirstChild(node, bucket) {
-    const matchingNode = Array.from(this.getChildNodes()).filter(
-      childNode => !bucket || getBucketsForNode(childNode).includes(bucket),
-    )[0];
-    if (matchingNode) {
-      return matchingNode;
+    for (const child of node.childNodes) {
+      if (!bucket || getBucketsForNode(child).includes(bucket)) {
+        this._onNodeTouched(child);
+        return child;
+      }
     }
     return null;
   }
@@ -120,12 +113,13 @@ export class DependencyNotifyingDomFacade {
    */
   // eslint-disable-next-line class-methods-use-this
   getNextSibling(node, bucket) {
-    for (let { nextSibling } = node; nextSibling; nextSibling = nextSibling.nextSibling) {
-      if (!getBucketsForNode(nextSibling).includes(bucket)) {
+    for (let sibling = node.nextSibling; sibling; sibling = sibling.nextSibling) {
+      if (!getBucketsForNode(sibling).includes(bucket)) {
         // eslint-disable-next-line no-continue
         continue;
       }
-      return nextSibling;
+      this._onNodeTouched(sibling);
+      return sibling;
     }
     return null;
   }

package/src/ForeElementMixin.js

@@ -1,5 +1,6 @@
 import { XPathUtil } from './xpath-util.js';
 import { FxModel } from './fx-model.js';
+import { Fore } from './fore.js';
 import {
   evaluateXPath,
   evaluateXPathToFirstNode,
@@ -7,6 +8,11 @@ import {
 } from './xpath-evaluation.js';
 import getInScopeContext from './getInScopeContext.js';
 
+/**
+ * Mixin containing all general functions that are shared by all Fore element classes.
+ * @param superclass
+ * @returns {{readonly properties: {ref: {type: StringConstructor}, context: {type: ObjectConstructor}, nodeset: {type: ObjectConstructor}, model: {type: ObjectConstructor}, inScopeVariables: {type: MapConstructor}, modelItem: {type: ObjectConstructor}}, new(): ForeElementMixin, context: null, model: null, modelItem: {}, ref: *|string, inScopeVariables: null, nodeset: *, prototype: ForeElementMixin}}
+ */
 export const foreElementMixin = superclass =>
   class ForeElementMixin extends superclass {
     static get properties() {
@@ -94,10 +100,21 @@ export const foreElementMixin = superclass =>
      */
     evalInContext() {
       // const inscopeContext = this.getInScopeContext();
-      const inscopeContext = getInScopeContext(this.getAttributeNode('ref') || this, this.ref);
-      if (!inscopeContext) {
-        console.warn('no in scopeContext for ', this);
-        return;
+      let inscopeContext;
+      if (this.hasAttribute('context')) {
+        inscopeContext = getInScopeContext(this.getAttributeNode('context') || this, this.context);
+      }
+      if (this.hasAttribute('ref')) {
+        inscopeContext = getInScopeContext(this.getAttributeNode('ref') || this, this.ref);
+      }
+      if (!inscopeContext && this.getModel().instances.length !== 0) {
+        // ### always fall back to default context with there's neither a 'context' or 'ref' present
+        inscopeContext = this.getModel()
+          .getDefaultInstance()
+          .getDefaultContext();
+        // console.warn('no in scopeContext for ', this);
+        // console.warn('using default context ', this);
+        // return;
       }
       if (this.ref === '') {
         this.nodeset = inscopeContext;
@@ -120,7 +137,7 @@ export const foreElementMixin = superclass =>
         if (nodeType) {
           this.nodeset = evaluateXPathToFirstNode(this.ref, inscopeContext, this);
         } else {
-          this.nodeset = evaluateXPath(this.ref, inscopeContext, this);
+          [this.nodeset] = evaluateXPath(this.ref, inscopeContext, this);
         }
       }
       // console.log('UiElement evaluated to nodeset: ', this.nodeset);
@@ -139,7 +156,7 @@ export const foreElementMixin = superclass =>
         return this.getAttribute('ref');
       }
       // try to get closest parent bind
-      const parent = this.parentNode.closest('[ref]');
+      const parent = Fore.getClosest('[ref]', this.parentNode);
       if (!parent) {
         return 'instance()'; // the default instance
       }
@@ -178,10 +195,10 @@ export const foreElementMixin = superclass =>
         this.modelItem = mi;
       }
 
-      const repeated = this.closest('fx-repeatitem');
+      const repeated = Fore.getClosest('fx-repeatitem', this);
       let existed;
       if (repeated) {
-        const { index } = this.closest('fx-repeatitem');
+        const { index } = repeated;
         if (Array.isArray(this.nodeset)) {
           existed = this.getModel().getModelItem(this.nodeset[index - 1]);
         } else {
@@ -211,7 +228,7 @@ export const foreElementMixin = superclass =>
           return evaluateXPathToString(valAttr, inscopeContext, this.getOwnerForm());
         } catch (error) {
           console.error(error);
-          this.dispatch('error', { message: error });
+          Fore.dispatch(this, 'error', { message: error });
         }
       }
       if (this.textContent) {
@@ -227,14 +244,4 @@ export const foreElementMixin = superclass =>
     setInScopeVariables(inScopeVariables) {
       this.inScopeVariables = inScopeVariables;
     }
-
-    dispatch(eventName, detail) {
-      const event = new CustomEvent(eventName, {
-        composed: true,
-        bubbles: true,
-        detail,
-      });
-      // console.log('firing', event);
-      this.dispatchEvent(event);
-    }
   };

package/src/actions/abstract-action.js

@@ -1,5 +1,7 @@
 import { foreElementMixin } from '../ForeElementMixin.js';
-import { evaluateXPathToBoolean } from '../xpath-evaluation.js';
+import { evaluateXPathToBoolean, resolveId } from '../xpath-evaluation.js';
+import getInScopeContext from '../getInScopeContext.js';
+import { Fore } from '../fore.js';
 
 async function wait(howLong) {
   return new Promise(resolve => setTimeout(() => resolve(), howLong));
@@ -86,7 +88,7 @@ export class AbstractAction extends foreElementMixin(HTMLElement) {
       } else if (this.target === '#document') {
         document.addEventListener(this.event, e => this.execute(e));
       } else {
-        this.targetElement = document.getElementById(this.target);
+        this.targetElement = resolveId(this.target, this);
         this.targetElement.addEventListener(this.event, e => this.execute(e));
       }
     } else {
@@ -112,9 +114,25 @@ export class AbstractAction extends foreElementMixin(HTMLElement) {
    * @param e
    */
   async execute(e) {
-    console.log('executing', this);
+    // console.log('executing', this);
+    // console.log('executing e', e);
+    // console.log('executing e phase', e.eventPhase);
+    if(e && e.code){
+      const vars = new Map();
+      vars.set('code',e.code);
+      this.setInScopeVariables(vars);
+    }
+
     if (e && e.detail) {
       this.detail = e.detail;
+      const vars = new Map();
+      Object.keys(e.detail).forEach(function(key,index) {
+        // key: the name of the object key
+        // index: the ordinal position of the key within the object
+        vars.set(key,e.detail[key]);
+      });
+      console.log("event detail vars", vars);
+      this.setInScopeVariables(vars);
     }
     this.needsUpdate = false;
 
@@ -124,7 +142,7 @@ export class AbstractAction extends foreElementMixin(HTMLElement) {
     }
 
     // First check if 'if' condition is true - otherwise exist right away
-    if (this.ifExpr && !evaluateXPathToBoolean(this.ifExpr, this.nodeset, this)) {
+    if (this.ifExpr && !evaluateXPathToBoolean(this.ifExpr, getInScopeContext(this), this)) {
       return;
     }
 
@@ -139,7 +157,7 @@ export class AbstractAction extends foreElementMixin(HTMLElement) {
           return;
         }
 
-        if (!evaluateXPathToBoolean(this.whileExpr, this.nodeset, this)) {
+        if (!evaluateXPathToBoolean(this.whileExpr, getInScopeContext(this), this)) {
           // Done with iterating
           return;
         }
@@ -198,13 +216,16 @@ export class AbstractAction extends foreElementMixin(HTMLElement) {
   }
 
   /**
+   * dispathes action-performed event
+   *
+   * @event action-performed - whenever an action has been run
    */
   dispatchActionPerformed() {
     console.log('action-performed ', this);
-    this.dispatchEvent(
-      new CustomEvent('action-performed', { composed: true, bubbles: true, detail: {} }),
-    );
+    Fore.dispatch(this, 'action-performed', {});
   }
 }
 
-window.customElements.define('abstract-action', AbstractAction);
+if (!customElements.get('abstract-action')) {
+  window.customElements.define('abstract-action', AbstractAction);
+}

package/src/actions/fx-action.js

@@ -47,13 +47,15 @@ export class FxAction extends AbstractAction {
         }
         const action = actionOrVar;
         action.detail = this.detail;
-        // action.perform();
-        action.execute();
+        action.perform();
+        // action.execute();
       });
       this.dispatchActionPerformed();
-      // this.needsUpdate = false;
+      this.needsUpdate = true;
     }
   }
 }
 
-window.customElements.define('fx-action', FxAction);
+if (!customElements.get('fx-action')) {
+  window.customElements.define('fx-action', FxAction);
+}

package/src/actions/fx-append.js

@@ -1,5 +1,6 @@
 import { AbstractAction } from './abstract-action.js';
 import { Fore } from '../fore.js';
+import { resolveId } from '../xpath-evaluation.js';
 
 /**
  * `fx-append` appends an entry to a repeat.
@@ -77,7 +78,7 @@ class FxAppend extends AbstractAction {
     super.actionPerformed();
     // const repeat = document.getElementById(this.repeat);
     // repeat.setIndex(repeat.nodeset.length);
-    this.dispatch();
+    this._dispatch();
   }
 
   /**
@@ -117,22 +118,10 @@ class FxAppend extends AbstractAction {
    *
    * The target repeat is a child of the same repeat-item as the append action.
    */
-  dispatch() {
-    let targetRepeat;
-    if (Fore.isRepeated(this)) {
-      console.log('append repeated ', this.repeatContext);
-      targetRepeat = Fore.getRepeatTarget(this, this.repeat);
-    } else {
-      targetRepeat = document.getElementById(this.repeat);
-    }
+  _dispatch() {
+    const targetRepeat = resolveId(this.repeat, this);
     console.log('dispatching index change ', targetRepeat.nodeset.length);
-    targetRepeat.dispatchEvent(
-      new CustomEvent('index-changed', {
-        composed: true,
-        bubbles: true,
-        detail: { index: targetRepeat.nodeset.length },
-      }),
-    );
+    Fore.dispatch(targetRepeat, 'index-changed', { index: targetRepeat.nodeset.length });
   }
 
   /**
@@ -213,4 +202,6 @@ class FxAppend extends AbstractAction {
   */
 }
 
-window.customElements.define('fx-append', FxAppend);
+if (!customElements.get('fx-append')) {
+  window.customElements.define('fx-append', FxAppend);
+}

package/src/actions/fx-confirm.js

@@ -1,4 +1,4 @@
-import { FxAction } from './fx-action.js';
+import {AbstractAction} from "./abstract-action";
 
 /**
  * `fx-confirm`
@@ -7,7 +7,7 @@ import { FxAction } from './fx-action.js';
  * @customElement
  * @demo demo/project.html
  */
-export class FxConfirm extends FxAction {
+export class FxConfirm extends AbstractAction {
   connectedCallback() {
     this.message = this.hasAttribute('message') ? this.getAttribute('message') : null;
   }
@@ -19,4 +19,6 @@ export class FxConfirm extends FxAction {
   }
 }
 
-window.customElements.define('fx-confirm', FxConfirm);
+if (!customElements.get('fx-confirm')) {
+  window.customElements.define('fx-confirm', FxConfirm);
+}

package/src/actions/fx-delete.js

@@ -1,4 +1,5 @@
 import { AbstractAction } from './abstract-action.js';
+import { Fore } from '../fore.js';
 
 /**
  * `fx-delete`
@@ -29,13 +30,13 @@ class FxDelete extends AbstractAction {
     // ### if there's no repeat the delete action is inside of a repeat template
     if (this.repeatId === '') {
       // find the index to delete
-      const rItem = this.parentNode.closest('fx-repeatitem');
+      const rItem = Fore.getClosest('fx-repeatitem', this.parentNode);
       const idx = Array.from(rItem.parentNode.children).indexOf(rItem) + 1;
       // console.log('>>> idx to delete ', idx);
 
       // ### get the model now as it'll be hard once we've deleted ourselves ;)
       this.model = this.getModel();
-      const repeat = this.parentNode.closest('fx-repeat');
+      const repeat = Fore.getClosest('fx-repeat', this.parentNode);
 
       // ### update the nodeset
       let nodeToDelete;
@@ -77,4 +78,6 @@ class FxDelete extends AbstractAction {
   }
 }
 
-window.customElements.define('fx-delete', FxDelete);
+if (!customElements.get('fx-delete')) {
+  window.customElements.define('fx-delete', FxDelete);
+}

package/src/actions/fx-dispatch.js

@@ -1,6 +1,5 @@
 import { AbstractAction } from './abstract-action.js';
 import { evaluateXPath, resolveId } from '../xpath-evaluation.js';
-import { XPathUtil } from '../xpath-util.js';
 
 /**
  * `fx-dispatch`
@@ -68,7 +67,8 @@ export class FxDispatch extends AbstractAction {
         if (value) {
           throw new Error('if "expr" is given there must not be a "value" attribute');
         }
-        const result = evaluateXPath(expr, this.getInScopeContext(), this.getOwnerForm());
+        const [result] = evaluateXPath(expr, this.getInScopeContext(), this.getOwnerForm());
+
         let serialized = null;
         if (result.nodeName) {
           const serializer = new XMLSerializer();
@@ -90,11 +90,10 @@ export class FxDispatch extends AbstractAction {
 
     // ### when targetid is given dispatch to that if present (throw an error if not) - otherwise dispatch to document
     if (this.targetid) {
-      // const target = document.getElementById(this.targetid);
-      let target;
-      if (XPathUtil.isRepeated(this)) {
-        target = resolveId(this.targetid, this.parentNode, null);
-      } else {
+      let target = resolveId(this.targetid, this.parentNode, null);
+      if (!target) {
+        // TODO: essentially, we want to highly prefer the closest target. in the same subcontrol.
+        // However, it may be that our target is elsewhere. Do a global search for that case
         target = document.getElementById(this.targetid);
       }
       console.log('target', target);
@@ -120,4 +119,6 @@ export class FxDispatch extends AbstractAction {
   }
 }
 
-window.customElements.define('fx-dispatch', FxDispatch);
+if (!customElements.get('fx-dispatch')) {
+  window.customElements.define('fx-dispatch', FxDispatch);
+}

package/src/actions/fx-hide.js

@@ -1,4 +1,6 @@
-import { FxAction } from './fx-action.js';
+import { Fore } from '../fore.js';
+import { AbstractAction } from './abstract-action.js';
+import { resolveId } from '../xpath-evaluation.js';
 
 /**
  * `fx-hide`
@@ -7,17 +9,19 @@ import { FxAction } from './fx-action.js';
  * @customElement
  * @demo demo/project.html
  */
-export class FxHide extends FxAction {
+export class FxHide extends AbstractAction {
   connectedCallback() {
     this.dialog = this.getAttribute('dialog');
-    if(!this.dialog){
-      this.dispatch('error',{message:'dialog does not exist'})
+    if (!this.dialog) {
+      Fore.dispatch(this, 'error', { message: 'dialog does not exist' });
     }
   }
 
   perform() {
-    document.getElementById(this.dialog).hide();
+    resolveId(this.dialog, this).hide();
   }
 }
 
-window.customElements.define('fx-hide', FxHide);
+if (!customElements.get('fx-hide')) {
+  window.customElements.define('fx-hide', FxHide);
+}

package/src/actions/fx-insert.js

@@ -1,7 +1,6 @@
 import { AbstractAction } from './abstract-action.js';
 import getInScopeContext from '../getInScopeContext.js';
 import {
-  evaluateXPath,
   evaluateXPathToNodes,
   evaluateXPathToFirstNode,
   evaluateXPathToNumber,
@@ -47,6 +46,12 @@ export class FxInsert extends AbstractAction {
       // ### if there's an origin attribute use it
       let originTarget;
       try {
+        /*
+        todo: discuss where to pass vars from event.detail into function context
+         */
+        // this.setInScopeVariables(this.detail);
+
+        // originTarget = evaluateXPathToFirstNode(this.origin, inscope, this);
         originTarget = evaluateXPathToFirstNode(this.origin, inscope, this.getOwnerForm());
         if (Array.isArray(originTarget) && originTarget.length === 0) {
           console.warn('invalid origin for this insert action - ignoring...', this);
@@ -85,32 +90,26 @@ export class FxInsert extends AbstractAction {
         console.log('this.nodeset', this.nodeset);
         */
 
-    // ### obtaining targetSequence
-    const inscope = getInScopeContext(this.getAttributeNode('ref'), this.ref);
-
-    // @ts-ignore
-    const targetSequence = evaluateXPathToNodes(this.ref, inscope, this.getOwnerForm());
-    // console.log('insert nodeset ', targetSequence);
+    let inscope;
+    // ### 'context' attribute takes precedence over 'ref'
+    let targetSequence;
+    if (this.hasAttribute('context')) {
+      inscope = getInScopeContext(this.getAttributeNode('context'), this.getAttribute('context'));
+      targetSequence = evaluateXPathToNodes(
+        this.getAttribute('context'),
+        inscope,
+        this.getOwnerForm(),
+      );
+    }
 
-    // ### obtaining originSequence
-    /*
-        let originSequence;
-        if (this.origin) {
-            // ### if there's an origin attribute use it
-            const originTarget = evaluateXPathToFirstNode(this.origin, inscope, this.getOwnerForm());
-            if(Array.isArray(originTarget) && originTarget.length === 0){
-                console.warn('invalid origin for this insert action - ignoring...', this);
-                return;
-            }
-            originSequence = originTarget.cloneNode(true);
-        } else if (targetSequence) {
-            // ### use last item of targetSequence
-            originSequence = this._cloneTargetSequence(targetSequence);
-            if(originSequence && !this.keepValues){
-                this._clear(originSequence);
-            }
-        }
-*/
+    if (this.hasAttribute('ref')) {
+      if (inscope) {
+        targetSequence = evaluateXPathToNodes(this.ref, inscope, this.getOwnerForm());
+      } else {
+        inscope = getInScopeContext(this.getAttributeNode('ref'), this.ref);
+        targetSequence = evaluateXPathToNodes(this.ref, inscope, this.getOwnerForm());
+      }
+    }
     const originSequenceClone = this._cloneOriginSequence(inscope, targetSequence);
     if (!originSequenceClone) return; // if no origin back out without effect
 
@@ -127,13 +126,9 @@ export class FxInsert extends AbstractAction {
       index = 1;
       console.log('appended', inscope);
     } else {
-      // todo: eval 'at'
-
-      /*
-            insert at position given by 'at' or use the last item in the targetSequence
-             */
-      // if (this.at) {
+      /* ### insert at position given by 'at' or use the last item in the targetSequence ### */
       if (this.hasAttribute('at')) {
+        // todo: eval 'at'
         // index = this.at;
         // insertLocationNode = targetSequence[this.at - 1];
 
@@ -150,7 +145,11 @@ export class FxInsert extends AbstractAction {
         index = 1;
 
         insertLocationNode = targetSequence;
-        const context = evaluateXPath('count(preceding::*)', targetSequence, this.getOwnerForm());
+        const context = evaluateXPathToNumber(
+          'count(preceding::*)',
+          targetSequence,
+          this.getOwnerForm(),
+        );
         // console.log('context', context);
         index = context + 1;
         // index = targetSequence.findIndex(insertLocationNode);
@@ -165,7 +164,15 @@ export class FxInsert extends AbstractAction {
         // insertLocationNode.parentNode.append(originSequence);
         // const nextSibl = insertLocationNode.nextSibling;
         index += 1;
-        insertLocationNode.insertAdjacentElement('afterend', originSequenceClone);
+        if (this.hasAttribute('context') && this.hasAttribute('ref')) {
+          // index=1;
+          inscope.append(originSequenceClone);
+        } else if (this.hasAttribute('context')) {
+          index = 1;
+          insertLocationNode.prepend(originSequenceClone);
+        } else {
+          insertLocationNode.insertAdjacentElement('afterend', originSequenceClone);
+        }
       }
     }
 
@@ -173,16 +180,17 @@ export class FxInsert extends AbstractAction {
     // console.log('parent ', insertLocationNode.parentNode);
     // console.log('instance ', this.getModel().getDefaultContext());
 
-    // console.log('<<<<<<< at', this.at);
-    // console.log('<<<<<<< index', index);
+    console.log('<<<<<<< at', this.at);
+    console.log('<<<<<<< index', index);
     // todo: this actually should dispatch to respective instance
     document.dispatchEvent(
-      new CustomEvent('insert', {
+      // new CustomEvent('insert', {
+      new CustomEvent('index-changed', {
         composed: true,
         bubbles: true,
         detail: {
           insertedNodes: originSequenceClone,
-          position: index,
+          index,
         },
       }),
     );
@@ -235,4 +243,6 @@ export class FxInsert extends AbstractAction {
   }
 }
 
-window.customElements.define('fx-insert', FxInsert);
+if (!customElements.get('fx-insert')) {
+  window.customElements.define('fx-insert', FxInsert);
+}

package/src/actions/fx-message.js

@@ -61,4 +61,6 @@ class FxMessage extends AbstractAction {
   }
 }
 
-window.customElements.define('fx-message', FxMessage);
+if (!customElements.get('fx-message')) {
+  window.customElements.define('fx-message', FxMessage);
+}

package/src/actions/fx-refresh.js

@@ -1,4 +1,5 @@
 import { AbstractAction } from './abstract-action.js';
+import { Fore } from '../fore.js';
 
 /**
  * `fx-refresh`
@@ -8,8 +9,21 @@ import { AbstractAction } from './abstract-action.js';
  */
 class FxRefresh extends AbstractAction {
   perform() {
+    if (this.hasAttribute('self')) {
+      const control = Fore.getClosest('fx-control', this);
+      if (control) {
+        control.refresh();
+        return;
+      }
+    }
+    if(this.hasAttribute('force')){
+      this.getOwnerForm().forceRefresh();
+      return;
+    }
     this.getOwnerForm().refresh();
   }
 }
 
-window.customElements.define('fx-refresh', FxRefresh);
+if (!customElements.get('fx-refresh')) {
+  window.customElements.define('fx-refresh', FxRefresh);
+}