@jinntec/fore 1.0.0-1 → 1.0.0-4

package/index.js

@@ -5,6 +5,7 @@ import './src/fx-instance.js';
 import './src/fx-model.js';
 import './src/fx-submission.js';
 import './src/fx-header.js';
+import './src/fx-var.js';
 
 // ui classes
 import './src/ui/fx-alert.js';
@@ -17,6 +18,11 @@ import './src/ui/fx-repeat.js';
 import './src/ui/fx-switch.js';
 import './src/ui/fx-trigger.js';
 import './src/ui/fx-case.js';
+import './src/ui/fx-inspector.js';
+import './src/ui/fx-dialog.js';
+import './src/ui/fx-items.js';
+
+// import './src/ui/fx-checkbox-group.js';
 
 // action classes
 import './src/actions/fx-append.js';
@@ -30,5 +36,7 @@ import './src/actions/fx-dispatch.js';
 import './src/actions/fx-update.js';
 import './src/actions/fx-refresh.js';
 import './src/actions/fx-confirm.js';
+import './src/actions/fx-show.js';
+import './src/actions/fx-hide.js';
 
 import './src/functions/fx-function.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jinntec/fore",
-  "version": "1.0.0-1",
+  "version": "1.0.0-4",
   "description": "Fore - Forms for the Web",
   "module": "./index.js",
   "publishConfig": {
@@ -19,12 +19,10 @@
   },
   "files": [
     "index.js",
-    "resources/fore.css",
-    "resources/vars.css",
-    "resources/toastify.css",
+    "resources/fore-styles.css",
     "src/**/*",
-    "dist/fore.js",
-    "dist/fore-all.js"
+    "dist/fore-all.js",
+    "dist/fore-debug.js"
   ],
   "dependencies": {
     "@jinntec/jinn-toast": "^1.0.2",
@@ -32,6 +30,8 @@
     "@polymer/iron-demo-helpers": "^3.1.0",
     "@polymer/paper-button": "^3.0.1",
     "@polymer/paper-checkbox": "^3.1.0",
+    "@polymer/paper-dialog": "^3.0.1",
+    "@polymer/paper-dialog-scrollable": "^3.0.1",
     "@polymer/paper-input": "^3.2.1",
     "fontoxpath": "^3.20.4",
     "web-component-analyzer": "^1.1.6"
@@ -54,6 +54,7 @@
     "es-dev-server": "^1.57.8",
     "eslint": "^6.1.0",
     "husky": "^1.0.0",
+    "jsdoc": "^3.6.7",
     "lint-staged": "^8.0.0",
     "lit-html": "^1.1.2",
     "mocha": "^7.0.1",

package/resources/{vars.css → fore-styles.css}

@@ -1,5 +1,15 @@
 /* Material Design color palette for Google products */
+/* Material Design color palette for Google products */
+/* Material Design color palette for Google products */
+/* Material Design color palette for Google products */
+
 html {
+
+    --inspector-bg:var(--paper-grey-500);
+    --inspector-pre-bg:var(--paper-grey-100);
+    --inspector-color:var(--paper-grey-800);
+    --inspector-instance-height:200px;
+
     --google-red-100: #f4c7c3;
     --google-red-300: #e67c73;
     --google-red-500: #db4437;
@@ -318,3 +328,285 @@ html {
     --model-element-margin:10px;
 }
 
+/*!
+ * Toastify js 1.11.0
+ * https://github.com/apvarun/toastify-js
+ * @license MIT licensed
+ *
+ * Copyright (C) 2018 Varun A P
+ */
+
+.toastify {
+    padding: 12px 20px;
+    color: #ffffff;
+    display: inline-block;
+    box-shadow: 0 3px 6px -1px rgba(0, 0, 0, 0.12), 0 10px 36px -4px rgba(77, 96, 232, 0.3);
+    background: -webkit-linear-gradient(315deg, #73a5ff, #5477f5);
+    background: linear-gradient(135deg, #f8f8f9, #cfcfcf);
+    position: fixed;
+    opacity: 0;
+    transition: all 0.4s cubic-bezier(0.215, 0.61, 0.355, 1);
+    border-radius: 2px;
+    cursor: pointer;
+    text-decoration: none;
+    max-width: calc(50% - 20px);
+    z-index: 2147483647;
+    font-weight: 300;
+    color:black;
+}
+
+.toastify.on {
+    opacity: 1;
+}
+
+.toast-close {
+    opacity: 0.8;
+    padding: 0 5px;
+}
+
+.toastify-right {
+    right: 15px;
+}
+.toastify-right .toast-close {
+    margin-right:-10px;
+}
+
+.toastify-left {
+    left: 15px;
+}
+.toastify-left .toast-close{
+    margin-left:-10px;
+}
+
+.toastify-top {
+    top: -150px;
+}
+
+.toastify-bottom {
+    bottom: -150px;
+}
+
+.toastify-rounded {
+    border-radius: 25px;
+}
+
+.toastify-avatar {
+    width: 1.5em;
+    height: 1.5em;
+    margin: -7px 5px;
+    border-radius: 2px;
+}
+
+.toastify-center {
+    margin-left: auto;
+    margin-right: auto;
+    left: 0;
+    right: 0;
+    max-width: fit-content;
+    max-width: -moz-fit-content;
+}
+
+@media only screen and (max-width: 360px) {
+    .toastify-right, .toastify-left {
+        margin-left: auto;
+        margin-right: auto;
+        left: 0;
+        right: 0;
+        max-width: fit-content;
+    }
+}
+
+/*!
+ * Fore js 1.0.0-2
+ * @license MIT licensed
+ *
+ * Copyright (C) 2012 Joern Turner
+ */
+
+[unresolved]{
+    display: none;
+}
+[disabled] {
+    pointer-events: none;
+    cursor: default;
+}
+[refresh-on-view]{
+    /*opacity: 0;*/
+}
+[required]:after {
+    content: "*";
+    display: inline;
+    color: red;
+}
+
+.error{
+    background: var(--paper-red-500);
+}
+
+fx-alert{
+    color:darkred;
+    font-size: 0.9rem;
+}
+
+fx-control, fx-trigger{
+    white-space: nowrap;
+    position: relative;
+}
+
+.fx-checkbox{
+    white-space: nowrap;
+}
+fx-dialog{
+    display: none;
+}
+fx-dialog.show{
+    display: block;
+    min-height: 200px;
+    border-radius: 0.5rem;
+    /*opacity: 0.3;*/
+    background:rgba(0,0,0,0.5);
+    z-index: 10;
+}
+fx-dialog.show .dialog-content{
+    padding: 1rem;
+    width:fit-content;
+    height:fit-content;
+    border:thin solid;
+    border-radius: 0.3rem;
+    position: absolute;
+    left:50%;
+    top:50%;
+    transform:translateX(-50%) translateY(-50%);
+    background: white;
+
+}
+fx-dialog a.close-dialog{
+    position: absolute;
+    right: 0.4rem;
+    top:0.2rem;
+    color:var(--paper-grey-900);
+    text-decoration: none;
+    font-size:1.2rem;
+}
+fx-dialog .action{
+    width: 100%;
+    text-align: center;
+    display: block;
+}
+
+fx-hint{
+    display: none;
+}
+
+/* fx-inspector styles */
+fx-inspector{
+    position:fixed;
+    left:0;
+    right:0;
+    bottom:0;
+    width: 100%;
+    background: var(--inspector-bg);
+    color: white;
+    max-height: 33%;
+    overflow: scroll;
+    border-top:3px solid black;
+    opacity: 0.9;
+}
+fx-inspector::before{
+    content:'Instance Inspector';
+    font-style:italic;
+    position:absolute;
+    top:0;
+    right: 0.3rem;
+    z-index: 10;
+    font-size: 0.8rem;
+}
+fx-inspector details{
+    padding: 1rem;
+}
+fx-inspector pre{
+    background: var(--inspector-pre-bg);
+    border-radius: 0.5rem;
+    padding: 0.3rem;
+    max-height: var(--inspector-instance-height);
+    /*overflow: scroll;*/
+}
+fx-inspector details{
+    overflow: auto;
+    margin:0;
+}
+fx-inspector summary{
+    padding: 0;
+}
+
+fx-model, fx-model *, fx-model ::slotted(fx-instance), fx-instance{
+    display:none;
+}
+
+fx-trigger a[disabled] {
+    color:lightgrey;
+}
+fx-trigger img[disabled]{
+    filter:blur(2px);
+}
+
+fx-repeatitem{
+    position:relative;
+    /*
+    opacity:1;
+    -webkit-transition: opacity 3s;
+    -moz-transition: opacity 3s;
+    transition: opacity 3s;
+    */
+}
+.hidden {
+    visibility: hidden;
+    opacity: 0;
+    transition: visibility 0s 2s, opacity 2s linear;
+}
+
+.loaded{
+    animation: fadein 0.3s forwards;
+}
+/* avoid flicker from nested lazily loaded elements */
+.loaded .loaded{
+    animation: none;
+    opacity: 1;
+}
+
+.logtree details{
+    padding:0.1rem 1rem;
+    margin:0;
+}
+.logtree details summary{
+
+}
+
+.non-relevant{
+    opacity: 0;
+    height: 0;
+    transition: opacity 1s;
+}
+.required:after {
+    content: '*';
+    color: red;
+    padding-left: 4px;
+    right:3px;
+    top:3px;
+    z-index: 1;
+}
+
+.vertical label{
+    display: block;
+}
+@keyframes fadein {
+    0% {
+        opacity:0;
+    }
+    100% {
+        opacity:1;
+    }
+}
+
+
+

package/src/DependencyNotifyingDomFacade.js

@@ -9,7 +9,7 @@ import { getBucketsForNode } from 'fontoxpath';
  */
 export class DependencyNotifyingDomFacade {
   /**
-   * @param  {function(touchedNode: Node): void)} onNodeTouched A function what will be executed whenever a node is 'touched' by the XPath
+   * @param  onNodeTouched - onNodeTouched A function what will be executed whenever a node is 'touched' by the XPath
    */
   constructor(onNodeTouched) {
     this._onNodeTouched = onNodeTouched;
@@ -45,13 +45,21 @@ 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.
    *

package/src/ForeElementMixin.js

@@ -23,12 +23,6 @@ export const foreElementMixin = superclass =>
         model: {
           type: Object,
         },
-        /**
-         * XPath binding expression pointing to bound node
-         */
-        ref: {
-          type: String,
-        },
         /**
          * The modelitem object associated to the bound node holding the evaluated state.
          */
@@ -41,6 +35,15 @@ export const foreElementMixin = superclass =>
         nodeset: {
           type: Object,
         },
+        /**
+         * XPath binding expression pointing to bound node
+         */
+        ref: {
+          type: String,
+        },
+        inScopeVariables: {
+          type: Map,
+        },
       };
     }
 
@@ -50,6 +53,7 @@ export const foreElementMixin = superclass =>
       this.model = null;
       this.modelItem = {};
       this.ref = this.hasAttribute('ref') ? this.getAttribute('ref') : '';
+      this.inScopeVariables = null;
     }
 
     getModel() {
@@ -90,7 +94,7 @@ export const foreElementMixin = superclass =>
      */
     evalInContext() {
       // const inscopeContext = this.getInScopeContext();
-      const inscopeContext = getInScopeContext(this, this.ref);
+      const inscopeContext = getInScopeContext(this.getAttributeNode('ref') || this, this.ref);
       if (!inscopeContext) {
         console.warn('no in scopeContext for ', this);
         return;
@@ -98,26 +102,26 @@ export const foreElementMixin = superclass =>
       if (this.ref === '') {
         this.nodeset = inscopeContext;
       } else if (Array.isArray(inscopeContext)) {
+        /*
         inscopeContext.forEach(n => {
           if (XPathUtil.isSelfReference(this.ref)) {
             this.nodeset = inscopeContext;
           } else {
-            const localResult = evaluateXPathToFirstNode(this.ref, n, null);
+            const localResult = evaluateXPathToFirstNode(this.ref, n, this);
             // console.log('local result: ', localResult);
             this.nodeset.push(localResult);
           }
         });
+*/
+        this.nodeset = evaluateXPathToFirstNode(this.ref, inscopeContext[0], this);
       } else {
         // this.nodeset = fx.evaluateXPathToFirstNode(this.ref, inscopeContext, null, {namespaceResolver: this.namespaceResolver});
-
-        // todo: code below fails - why?
-        const formElement = this.getOwnerForm();
-        if (inscopeContext.nodeType) {
-          this.nodeset = evaluateXPathToFirstNode(this.ref, inscopeContext, formElement);
+        const { nodeType } = inscopeContext;
+        if (nodeType) {
+          this.nodeset = evaluateXPathToFirstNode(this.ref, inscopeContext, this);
         } else {
-          this.nodeset = evaluateXPath(this.ref, inscopeContext, formElement);
+          this.nodeset = evaluateXPath(this.ref, inscopeContext, this);
         }
-        // this.nodeset = evaluateXPath(this.ref,inscopeContext,formElement)
       }
       // console.log('UiElement evaluated to nodeset: ', this.nodeset);
     }
@@ -217,7 +221,11 @@ export const foreElementMixin = superclass =>
     }
 
     getInScopeContext() {
-      return getInScopeContext(this, this.ref);
+      return getInScopeContext(this.getAttributeNode('ref') || this, this.ref);
+    }
+
+    setInScopeVariables(inScopeVariables) {
+      this.inScopeVariables = inScopeVariables;
     }
 
     dispatch(eventName, detail) {
@@ -226,7 +234,7 @@ export const foreElementMixin = superclass =>
         bubbles: true,
         detail,
       });
-      console.log('firing', event);
+      // console.log('firing', event);
       this.dispatchEvent(event);
     }
   };

package/src/actions/abstract-action.js

@@ -81,7 +81,9 @@ export class AbstractAction extends foreElementMixin(HTMLElement) {
 
     this.target = this.getAttribute('target');
     if (this.target) {
-      if (this.target === '#document') {
+      if (this.target === '#window') {
+        window.addEventListener(this.event, e => this.execute(e));
+      } else if (this.target === '#document') {
         document.addEventListener(this.event, e => this.execute(e));
       } else {
         this.targetElement = document.getElementById(this.target);
@@ -122,7 +124,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.getOwnerForm())) {
+    if (this.ifExpr && !evaluateXPathToBoolean(this.ifExpr, this.nodeset, this)) {
       return;
     }
 
@@ -137,7 +139,7 @@ export class AbstractAction extends foreElementMixin(HTMLElement) {
           return;
         }
 
-        if (!evaluateXPathToBoolean(this.whileExpr, this.nodeset, this.getOwnerForm())) {
+        if (!evaluateXPathToBoolean(this.whileExpr, this.nodeset, this)) {
           // Done with iterating
           return;
         }
@@ -190,15 +192,14 @@ export class AbstractAction extends foreElementMixin(HTMLElement) {
       const model = this.getModel();
       model.recalculate();
       model.revalidate();
-      model.parentNode.refresh();
-      this._dispatchActionPerformed();
+      model.parentNode.refresh(true);
+      this.dispatchActionPerformed();
     }
   }
 
   /**
-   * @private
    */
-  _dispatchActionPerformed() {
+  dispatchActionPerformed() {
     console.log('action-performed ', this);
     this.dispatchEvent(
       new CustomEvent('action-performed', { composed: true, bubbles: true, detail: {} }),

package/src/actions/fx-action.js

@@ -41,11 +41,16 @@ export class FxAction extends AbstractAction {
       script.src = this.src;
       this.appendChild(script);
     } else {
-      Array.from(children).forEach(action => {
+      Array.from(children).forEach(actionOrVar => {
+        if (actionOrVar.localName === 'fx-var') {
+          return;
+        }
+        const action = actionOrVar;
         action.detail = this.detail;
         // action.perform();
         action.execute();
       });
+      this.dispatchActionPerformed();
       // this.needsUpdate = false;
     }
   }

package/src/actions/fx-dispatch.js

@@ -1,5 +1,6 @@
 import { AbstractAction } from './abstract-action.js';
-import { evaluateXPath } from '../xpath-evaluation.js';
+import { evaluateXPath, resolveId } from '../xpath-evaluation.js';
+import { XPathUtil } from '../xpath-util.js';
 
 /**
  * `fx-dispatch`
@@ -89,7 +90,14 @@ 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);
+      // const target = document.getElementById(this.targetid);
+      let target;
+      if (XPathUtil.isRepeated(this)) {
+        target = resolveId(this.targetid, this.parentNode, null);
+      } else {
+        target = document.getElementById(this.targetid);
+      }
+      console.log('target', target);
       if (!target) {
         throw new Error(`targetid ${this.targetid} does not exist in document`);
       }

package/src/actions/fx-hide.js

@@ -0,0 +1,23 @@
+import { FxAction } from './fx-action.js';
+
+/**
+ * `fx-hide`
+ * hides a dialog
+ *
+ * @customElement
+ * @demo demo/project.html
+ */
+export class FxHide extends FxAction {
+  connectedCallback() {
+    this.dialog = this.getAttribute('dialog');
+    if(!this.dialog){
+      this.dispatch('error',{message:'dialog does not exist'})
+    }
+  }
+
+  perform() {
+    document.getElementById(this.dialog).hide();
+  }
+}
+
+window.customElements.define('fx-hide', FxHide);

package/src/actions/fx-insert.js

@@ -77,7 +77,7 @@ export class FxInsert extends AbstractAction {
   }
 
   perform() {
-    super.perform();
+    // super.perform();
 
     /*
          todo: !!! calling super here does not correctly give the nodeset - it's likely still a bug in ForeElementMixin !!!
@@ -86,11 +86,11 @@ export class FxInsert extends AbstractAction {
         */
 
     // ### obtaining targetSequence
-    const inscope = getInScopeContext(this, this.ref);
+    const inscope = getInScopeContext(this.getAttributeNode('ref'), this.ref);
 
     // @ts-ignore
     const targetSequence = evaluateXPathToNodes(this.ref, inscope, this.getOwnerForm());
-    console.log('insert nodeset ', targetSequence);
+    // console.log('insert nodeset ', targetSequence);
 
     // ### obtaining originSequence
     /*
@@ -117,8 +117,8 @@ export class FxInsert extends AbstractAction {
     let insertLocationNode;
     let index;
 
-    const idx = this._getInsertIndex(inscope, targetSequence);
-    console.log('insert index', idx);
+    // const idx = this._getInsertIndex(inscope, targetSequence);
+    // console.log('insert index', idx);
 
     // if the targetSequence is empty but we got an originSequence use inscope as context and ignore 'at' and 'position'
     if (targetSequence.length === 0) {
@@ -151,7 +151,7 @@ export class FxInsert extends AbstractAction {
 
         insertLocationNode = targetSequence;
         const context = evaluateXPath('count(preceding::*)', targetSequence, this.getOwnerForm());
-        console.log('context', context);
+        // console.log('context', context);
         index = context + 1;
         // index = targetSequence.findIndex(insertLocationNode);
       }
@@ -171,10 +171,10 @@ export class FxInsert extends AbstractAction {
 
     // console.log('insert context item ', insertLocationNode);
     // console.log('parent ', insertLocationNode.parentNode);
-    console.log('instance ', this.getModel().getDefaultContext());
+    // 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', {

package/src/actions/fx-send.js

@@ -17,7 +17,7 @@ class FxSend extends AbstractAction {
   connectedCallback() {
     // eslint-disable-next-line wc/guard-super-call
     super.connectedCallback();
-    console.log('connectedCallback ', this);
+    // console.log('connectedCallback ', this);
     this.submission = this.getAttribute('submission');
   }