@jinntec/fore 2.1.1 → 2.3.0

package/src/actions/fx-action.js

@@ -41,12 +41,12 @@ export class FxAction extends AbstractAction {
       script.src = this.src;
       this.appendChild(script);
     } else {
-		for (const actionOrVar of children) {
-			if (actionOrVar.localName === 'fx-var') {
-				continue;
-			}
-			const action = actionOrVar;
-			action.detail = this.detail;
+      for (const actionOrVar of children) {
+        if (actionOrVar.localName === 'fx-var') {
+          continue;
+        }
+        const action = actionOrVar;
+        action.detail = this.detail;
         await action.execute();
       }
       this.dispatchActionPerformed();

package/src/actions/fx-append.js

@@ -15,7 +15,7 @@ import { resolveId } from '../xpath-evaluation.js';
 class FxAppend extends AbstractAction {
   static get properties() {
     return {
-	  ...AbstractAction.properties,
+      ...AbstractAction.properties,
       ref: {
         type: String,
       },

package/src/actions/fx-call.js

@@ -1,9 +1,9 @@
 import '../fx-model.js';
-import {AbstractAction} from './abstract-action.js';
-import {evaluateXPath, evaluateXPathToString} from "../xpath-evaluation.js";
-import {Fore} from "../fore";
-import getInScopeContext from "../getInScopeContext";
-import {XPathUtil} from "../xpath-util.js";
+import { AbstractAction } from './abstract-action.js';
+import { evaluateXPath } from '../xpath-evaluation.js';
+import { Fore } from '../fore.js';
+import getInScopeContext from '../getInScopeContext.js';
+import { XPathUtil } from '../xpath-util.js';
 
 /**
  * `fx-call`
@@ -11,73 +11,74 @@ import {XPathUtil} from "../xpath-util.js";
  * @customElement
  */
 export default class FxCall extends AbstractAction {
-    static get properties() {
-        return {
-            ...super.properties,
-            action: {
-                type: String,
-            },
-            fn: {
-                type: String,
-            },
-        };
-    }
-
-    constructor() {
-        super();
-        this.action = '';
-        this.fn = '';
-    }
+  static get properties() {
+    return {
+      ...super.properties,
+      action: {
+        type: String,
+      },
+      fn: {
+        type: String,
+      },
+    };
+  }
 
-    connectedCallback() {
-        if (super.connectedCallback) {
-            super.connectedCallback();
-        }
-        if (this.hasAttribute('action')) {
-            this.action = this.getAttribute('action');
-        } else if(this.hasAttribute('function')){
-            this.fn = this.getAttribute('function');
+  constructor() {
+    super();
+    this.action = '';
+    this.fn = '';
+  }
 
-        }else{
-            throw new Error('fx-call must specify an "action" or "function" attribute');
-        }
+  connectedCallback() {
+    if (super.connectedCallback) {
+      super.connectedCallback();
+    }
+    if (this.hasAttribute('action')) {
+      this.action = this.getAttribute('action');
+    } else if (this.hasAttribute('function')) {
+      this.fn = this.getAttribute('function');
+    } else {
+      throw new Error('fx-call must specify an "action" or "function" attribute');
     }
+  }
 
-    async perform() {
-        super.perform();
-        if(this.action){
-            await this._callAction();
-        }
-        // execute function
-        if(this.fn){
-            this._callFunction();
-        }
+  async perform() {
+    super.perform();
+    if (this.action) {
+      await this._callAction();
     }
+    // execute function
+    if (this.fn) {
+      this._callFunction();
+    }
+  }
 
+  /**
+   * find action and execute it
+   */
+  async _callAction() {
     /**
-     * find action and execute it
-      */
-    async _callAction(){
-        const action = document.querySelector(`#${this.action}`);
-        if(action){
-            await action.perform();
-        }else{
-            Fore.dispatch(this, 'error', {
-                origin: this,
-                message: `Action '${this.action}' not found`,
-                expr:XPathUtil.getDocPath(this),
-                level:'Error'
-            });
-        }
-
+     * @type {import('./fx-action.js').FxAction}
+     */
+    const action = document.querySelector(`#${this.action}`);
+    if (action) {
+      await action.perform();
+    } else {
+      Fore.dispatch(this, 'error', {
+        origin: this,
+        message: `Action '${this.action}' not found`,
+        expr: XPathUtil.getDocPath(this),
+        level: 'Error',
+      });
     }
+  }
 
-    _callFunction(){
-        const inscope = getInScopeContext(this, 'instance()',this);
-        evaluateXPath(this.fn, inscope, this);
-    }
+  _callFunction() {
+    const inscope = getInScopeContext(this, 'instance()', this);
+    evaluateXPath(this.fn, inscope, this);
+  }
 }
 
 if (!customElements.get('fx-call')) {
-    window.customElements.define('fx-call', FxCall);
+  window.customElements.define('fx-call', FxCall);
 }

package/src/actions/fx-confirm.js

@@ -1,4 +1,4 @@
-import {FxAction} from "./fx-action.js";
+import { FxAction } from './fx-action.js';
 
 /**
  * `fx-confirm`
@@ -8,18 +8,18 @@ import {FxAction} from "./fx-action.js";
  * @demo demo/project.html
  */
 export class FxConfirm extends FxAction {
-	static get properties () {
-		return {
-			...FxAction.properties,
-			message: {
-				type:String
-			}
-		};
-	}
+  static get properties() {
+    return {
+      ...FxAction.properties,
+      message: {
+        type: String,
+      },
+    };
+  }
 
   connectedCallback() {
-    if (super.connectedCallback){
-		super.connectedCallback();
+    if (super.connectedCallback) {
+      super.connectedCallback();
     }
     this.message = this.hasAttribute('message') ? this.getAttribute('message') : null;
   }

package/src/actions/fx-construct-done.js

@@ -1,6 +1,6 @@
 import { AbstractAction } from './abstract-action.js';
-import {FxAction} from "./fx-action.js";
-import {Fore} from "../fore.js";
+import { FxAction } from './fx-action.js';
+import { Fore } from '../fore.js';
 
 /**
  * `fx-action`
@@ -14,8 +14,8 @@ export class FxConstructDone extends FxAction {
     // eslint-disable-next-line wc/guard-super-call
     super.connectedCallback();
     console.log('parentNode', this.parentNode);
-    if(this.parentNode.nodeName !== 'FX-MODEL'){
-      Fore.dispatch(this, 'error', {message:'parent is not a model'})
+    if (this.parentNode.nodeName !== 'FX-MODEL') {
+      Fore.dispatch(this, 'error', { message: 'parent is not a model' });
       return;
     }
     this.parentNode.addEventListener('model-construct-done', e => {

package/src/actions/fx-copy.js

@@ -1,5 +1,5 @@
 import '../fx-model.js';
-import {AbstractAction} from './abstract-action.js';
+import { AbstractAction } from './abstract-action.js';
 
 /**
  * `fx-copy`
@@ -7,48 +7,48 @@ import {AbstractAction} from './abstract-action.js';
  * @customElement
  */
 export default class FxCopy extends AbstractAction {
-    static get properties() {
-        return {
-            ...super.properties,
-            ref: {
-                type: String,
-            },
-            to: {
-                type: String,
-            },
-        };
-    }
+  static get properties() {
+    return {
+      ...super.properties,
+      ref: {
+        type: String,
+      },
+      to: {
+        type: String,
+      },
+    };
+  }
 
-    constructor() {
-        super();
-        this.ref = '';
-        this.to = '';
-    }
+  constructor() {
+    super();
+    this.ref = '';
+    this.to = '';
+  }
 
-    connectedCallback() {
-        if (super.connectedCallback) {
-            super.connectedCallback();
-        }
+  connectedCallback() {
+    if (super.connectedCallback) {
+      super.connectedCallback();
+    }
 
-        if (this.hasAttribute('ref')) {
-            this.ref = this.getAttribute('ref');
-        } else {
-            throw new Error('fx-copy must specify a "ref" attribute');
-        }
-        this.to = this.getAttribute('to');
+    if (this.hasAttribute('ref')) {
+      this.ref = this.getAttribute('ref');
+    } else {
+      throw new Error('fx-copy must specify a "ref" attribute');
     }
+    this.to = this.getAttribute('to');
+  }
 
-    perform() {
-        super.perform();
+  perform() {
+    super.perform();
 
-        if(this.nodeset.nodeType === Node.ATTRIBUTE_NODE){
-            navigator.clipboard.writeText(this.nodeset.nodeValue);
-        }else{
-            navigator.clipboard.writeText(this.nodeset);
-        }
+    if (this.nodeset.nodeType === Node.ATTRIBUTE_NODE) {
+      navigator.clipboard.writeText(this.nodeset.nodeValue);
+    } else {
+      navigator.clipboard.writeText(this.nodeset);
     }
+  }
 
-/*
+  /*
     setValue(modelItem, newVal) {
         const item = modelItem;
         if (!item) return;
@@ -63,5 +63,5 @@ export default class FxCopy extends AbstractAction {
 }
 
 if (!customElements.get('fx-copy')) {
-    window.customElements.define('fx-copy', FxCopy);
+  window.customElements.define('fx-copy', FxCopy);
 }

package/src/actions/fx-delete.js

@@ -1,8 +1,8 @@
-import * as fx from "fontoxpath";
-import {AbstractAction} from './abstract-action.js';
-import {Fore} from '../fore.js';
-import {evaluateXPathToNodes, evaluateXPathToString} from "../xpath-evaluation.js";
-import {XPathUtil} from "../xpath-util.js";
+import * as fx from 'fontoxpath';
+import { AbstractAction } from './abstract-action.js';
+import { Fore } from '../fore.js';
+import { evaluateXPathToNodes, evaluateXPathToString } from '../xpath-evaluation.js';
+import { XPathUtil } from '../xpath-util.js';
 import getInScopeContext from '../getInScopeContext.js';
 
 /**
@@ -14,83 +14,81 @@ import getInScopeContext from '../getInScopeContext.js';
  * @demo demo/todo.html
  */
 class FxDelete extends AbstractAction {
-    static get properties() {
-        return {
-            ...super.properties,
-            ref: {
-                type: String,
-            },
-        };
+  static get properties() {
+    return {
+      ...super.properties,
+      ref: {
+        type: String,
+      },
+    };
+  }
+
+  /**
+   * deletes nodes from instance data.
+   *
+   * Will NOT perform delete if nodeset is pointing to document node, document fragment, root node or being readonly.
+   */
+  async perform() {
+    const inscopeContext = getInScopeContext(this.getAttributeNode('ref') || this, this.ref);
+    this.nodeset = evaluateXPathToNodes(this.ref, inscopeContext, this);
+
+    // console.log('delete nodeset ', this.nodeset);
+
+    const instanceId = XPathUtil.resolveInstance(this, this.ref);
+    const instance = this.getModel().getInstance(instanceId);
+
+    // const path = instance && this.nodeset.length !== 0 ? evaluateXPathToString('path()', this.nodeset[0], instance) : '';
+
+    const path = Fore.getDomNodeIndexString(this.nodeset);
+
+    const nodesToDelete = this.nodeset;
+
+    this.dispatchEvent(
+      new CustomEvent('execute-action', {
+        composed: true,
+        bubbles: true,
+        cancelable: true,
+        detail: { action: this, event: this.event, path },
+      }),
+    );
+
+    let parent;
+    if (Array.isArray(nodesToDelete)) {
+      if (nodesToDelete.length === 0) return;
+      parent = nodesToDelete[0].parentNode;
+      nodesToDelete.forEach(item => {
+        this._deleteNode(parent, item);
+      });
+    } else {
+      parent = nodesToDelete.parentNode;
+      this._deleteNode(parent, nodesToDelete);
     }
 
-    /**
-     * deletes nodes from instance data.
-     *
-     * Will NOT perform delete if nodeset is pointing to document node, document fragment, root node or being readonly.
-     */
-    async perform() {
-
-        const inscopeContext = getInScopeContext(this.getAttributeNode('ref') || this, this.ref);
-        this.nodeset = evaluateXPathToNodes(this.ref, inscopeContext, this);
-
-        // console.log('delete nodeset ', this.nodeset);
-
-        const instanceId = XPathUtil.resolveInstance(this, this.ref);
-        const instance = this.getModel().getInstance(instanceId);
-
-        // const path = instance && this.nodeset.length !== 0 ? evaluateXPathToString('path()', this.nodeset[0], instance) : '';
-
-        const path = Fore.getDomNodeIndexString(this.nodeset);
-
-        const nodesToDelete = this.nodeset;
-
-        this.dispatchEvent(
-            new CustomEvent('execute-action', {
-                composed: true,
-                bubbles: true,
-                cancelable:true,
-                detail: { action: this, event:this.event, path:path},
-            }),
-        );
-
-        let parent;
-        if (Array.isArray(nodesToDelete)) {
-            if(nodesToDelete.length === 0) return;
-            parent = nodesToDelete[0].parentNode;
-            nodesToDelete.forEach(item => {
-                this._deleteNode(parent, item);
-            });
-        } else {
-            parent = nodesToDelete.parentNode;
-            this._deleteNode(parent, nodesToDelete);
-        }
-
-
-        await Fore.dispatch(instance, 'deleted', {ref:path,deletedNodes:nodesToDelete});
-        this.needsUpdate = true;
-    }
-
-    _deleteNode(parent, node) {
-        if (parent.nodeType === Node.DOCUMENT_NODE) return;
-        if (node.nodeType === Node.DOCUMENT_NODE) return;
-        if (node.nodeType === Node.DOCUMENT_FRAGMENT_NODE) return;
-        if (node.parentNode === null) return;
-
-        const mi = this.getModelItem();
-        if (mi.readonly) return;
-
-        parent.removeChild(node);
-    }
-
-    /**
-     * overwriting as we need to perform additional rebuild()
-     */
-    actionPerformed() {
-        this.getModel().rebuild();
-        super.actionPerformed();
-    }
+    await Fore.dispatch(instance, 'deleted', { ref: path, deletedNodes: nodesToDelete });
+    this.needsUpdate = true;
+  }
+
+  _deleteNode(parent, node) {
+    if (parent.nodeType === Node.DOCUMENT_NODE) return;
+    if (node.nodeType === Node.DOCUMENT_NODE) return;
+    if (node.nodeType === Node.DOCUMENT_FRAGMENT_NODE) return;
+    if (node.parentNode === null) return;
+
+    const mi = this.getModelItem();
+    if (mi.readonly) return;
+
+    parent.removeChild(node);
+  }
+
+  /**
+   * overwriting as we need to perform additional rebuild()
+   */
+  actionPerformed() {
+    this.getModel().rebuild();
+    super.actionPerformed();
+  }
 }
 
 if (!customElements.get('fx-delete')) {
-    window.customElements.define('fx-delete', FxDelete);
+  window.customElements.define('fx-delete', FxDelete);
 }

package/src/actions/fx-dispatch.js

@@ -10,20 +10,20 @@ import { evaluateXPath, resolveId } from '../xpath-evaluation.js';
  * can be accessed in usual JavaScript way.
  */
 export class FxDispatch extends AbstractAction {
-    static get properties() {
-        return {
-            ...super.properties,
-            name: {
-                type: String,
-            },
-            targetid: {
-                type: String,
-            },
-            details: {
-                type: String,
-            },
-        };
-    }
+  static get properties() {
+    return {
+      ...super.properties,
+      name: {
+        type: String,
+      },
+      targetid: {
+        type: String,
+      },
+      details: {
+        type: String,
+      },
+    };
+  }
 
   constructor() {
     super();

package/src/actions/fx-hide.js

@@ -10,14 +10,14 @@ import { resolveId } from '../xpath-evaluation.js';
  * @demo demo/project.html
  */
 export class FxHide extends AbstractAction {
-    static get properties() {
-        return {
-            ...super.properties,
-            dialog: {
-                type: String,
-            },
-        };
-    }
+  static get properties() {
+    return {
+      ...super.properties,
+      dialog: {
+        type: String,
+      },
+    };
+  }
 
   connectedCallback() {
     super.connectedCallback();
@@ -29,17 +29,17 @@ export class FxHide extends AbstractAction {
 
   async perform() {
     this.dispatchEvent(
-        new CustomEvent('execute-action', {
-          composed: true,
-          bubbles: true,
-          cancelable:true,
-          detail: { action: this, event:this.event},
-        }),
+      new CustomEvent('execute-action', {
+        composed: true,
+        bubbles: true,
+        cancelable: true,
+        detail: { action: this, event: this.event },
+      }),
     );
 
     const dialog = resolveId(this.dialog, this);
     dialog.hide();
-    Fore.dispatch(dialog,'dialog-hidden',{})
+    Fore.dispatch(dialog, 'dialog-hidden', {});
   }
 }
 

package/src/actions/fx-insert.js

@@ -5,8 +5,8 @@ import {
   evaluateXPathToFirstNode,
   evaluateXPathToNumber,
 } from '../xpath-evaluation.js';
-import {XPathUtil} from "../xpath-util";
-import {Fore} from '../fore.js';
+import { XPathUtil } from '../xpath-util';
+import { Fore } from '../fore.js';
 
 /**
  * `fx-insert`
@@ -60,7 +60,7 @@ export class FxInsert extends AbstractAction {
     this.keepValues = !!this.hasAttribute('keep-values');
   }
 
-  _getOriginSequence(inscope, targetSequence){
+  _getOriginSequence(inscope, targetSequence) {
     let originSequence;
     if (this.origin) {
       // ### if there's an origin attribute use it
@@ -143,7 +143,7 @@ export class FxInsert extends AbstractAction {
         inscopeContext,
         this.getOwnerForm(),
       );
-		inscope = inscopeContext;
+      inscope = inscopeContext;
     }
 
     if (this.hasAttribute('ref')) {
@@ -171,7 +171,6 @@ export class FxInsert extends AbstractAction {
         insertLocationNode = inscope;
         inscope.appendChild(originSequenceClone);
         index = 1;
-
       }
     } else {
       /* ### insert at position given by 'at' or use the last item in the targetSequence ### */
@@ -238,22 +237,20 @@ export class FxInsert extends AbstractAction {
     // const xpath = XPathUtil.getPath(originSequenceClone.parentNode, instanceId);
     const xpath = XPathUtil.getPath(insertLocationNode.parentNode, instanceId);
 
-
-
     const path = Fore.getDomNodeIndexString(originSequenceClone);
     this.dispatchEvent(
       new CustomEvent('execute-action', {
         composed: true,
         bubbles: true,
-        cancelable:true,
-        detail: { action: this, event:this.event, path },
+        cancelable: true,
+        detail: { action: this, event: this.event, path },
       }),
     );
 
-    Fore.dispatch(inst,'insert',{
+    Fore.dispatch(inst, 'insert', {
       'inserted-nodes': originSequenceClone,
       'insert-location-node': insertLocationNode,
-      'position': this.position
+      position: this.position,
     });
 
     // todo: this actually should dispatch to respective instance
@@ -270,7 +267,7 @@ export class FxInsert extends AbstractAction {
     );
 
     this.needsUpdate = true;
-    console.log('Changed!', xpath)
+    console.log('Changed!', xpath);
     return [xpath];
   }