@jinntec/fore 1.7.1 → 1.8.0

package/index.js

@@ -30,7 +30,7 @@ import './src/tools/fx-devtools.js';
 import './src/tools/fx-dom-inspector.js';
 import './src/lab/fore-component.js';
 import './src/tools/fx-json-instance.js';
-import './src/tools/fx-minimap.js';
+// import './src/tools/fx-minimap.js';
 
 
 // import './src/ui/fx-checkbox-group.js';
@@ -56,6 +56,7 @@ import './src/actions/fx-reload.js';
 import './src/actions/fx-reset.js';
 import './src/actions/fx-load.js';
 import './src/actions/fx-toggleboolean.js';
+import './src/actions/fx-call.js';
 
 import './src/functions/fx-function.js';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jinntec/fore",
-  "version": "1.7.1",
+  "version": "1.8.0",
   "description": "Fore - declarative user interfaces in plain HTML",
   "module": "./index.js",
   "publishConfig": {
@@ -60,6 +60,7 @@
     "rollup": "^2.75.4",
     "rollup-plugin-babel": "^4.4.0",
     "rollup-plugin-minify-html-literals": "^1.2.6",
+    "rollup-plugin-version-injector": "^1.3.3",
     "typescript": "^4.7.2",
     "web-component-analyzer": "^1.1.6",
     "xmlserializer": "^0.6.1"
@@ -81,7 +82,7 @@
     "start:build": "cd dist && es-dev-server --open",
     "build": "rimraf dist && rollup -c rollup.config.js",
     "start": "es-dev-server --app-index doc/index.html --node-resolve --watch --open",
-    "postinstall": "cd demo && npm i"
+    "install-demos": "cd demo && npm i"
   },
   "keywords": [
     "Fore",

package/src/actions/abstract-action.js

@@ -187,7 +187,7 @@ export class AbstractAction extends foreElementMixin(HTMLElement) {
         // console.log('execute', this.event);
 
 
-        if (e && e.target.nodeType !== Node.DOCUMENT_NODE ){
+        if (e && e.target.nodeType !== Node.DOCUMENT_NODE && e.target !== window ){
             /*
              ### ignore event if there's a parent fore and the current element is NOT part of it. This avoids
              ### an event to fire twice on an inner one and the surrounding one(s).

package/src/actions/fx-call.js

@@ -0,0 +1,74 @@
+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";
+
+/**
+ * `fx-call`
+ *
+ * @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 = '';
+    }
+
+    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();
+        }
+    }
+
+    /**
+     * find action and execute it
+      */
+    async _callAction(){
+        const action = document.querySelector(`#${this.action}`);
+        if(action){
+            await action.perform();
+        }
+    }
+
+    _callFunction(){
+        const inscope = getInScopeContext(this, 'instance()',this);
+        evaluateXPath(this.fn, inscope, this);
+    }
+}
+
+if (!customElements.get('fx-call')) {
+    window.customElements.define('fx-call', FxCall);
+}

package/src/actions/fx-load.js

@@ -122,7 +122,7 @@ class FxLoad extends AbstractAction {
             );
             return;
         }
-        this.url = this.evaluateAttributeTemplateExpression(this.url,this);
+        const resolvedUrl = this.evaluateAttributeTemplateExpression(this.url,this);
         if (this.attachTo === '_blank') {
             window.open(this.url);
         }
@@ -132,7 +132,7 @@ class FxLoad extends AbstractAction {
         }
 
         try {
-            const response = await fetch(this.url, {
+            const response = await fetch(resolvedUrl,  {
                 method: 'GET',
                 mode: 'cors',
                 credentials: 'same-origin',

package/src/fx-fore.js

@@ -55,6 +55,9 @@ export class FxFore extends HTMLElement {
              */
             validateOn: {
                 type: String
+            },
+            version: {
+                type: String
             }
         };
     }
@@ -69,6 +72,8 @@ export class FxFore extends HTMLElement {
      */
     constructor() {
         super();
+        this.version = '[VI]Version: {version} - built on {date}[/VI]';
+
         this.model = {};
         this.inited=false;
         // this.addEventListener('model-construct-done', this._handleModelConstructDone);

package/src/fx-instance.js

@@ -20,8 +20,7 @@ async function handleResponse(response) {
     );
   }
   if (
-    responseContentType.startsWith('text/plain') ||
-    responseContentType.startsWith('text/markdown')
+    responseContentType.startsWith('text/')
   ) {
     // console.log("********** inside  res plain *********");
     return response.text();
@@ -207,6 +206,10 @@ export class FxInstance extends HTMLElement {
       this.instanceData = {};
       this.originalInstance = [...this.instanceData];
     }
+    if(this.type === 'text'){
+      this.instanceData = '';
+      this.originalInstance = '';
+    }
   }
 
   async _loadData() {

package/src/fx-submission.js

@@ -242,6 +242,9 @@ export class FxSubmission extends foreElementMixin(HTMLElement) {
         if (serialized && instance.getAttribute('type') === 'json') {
             data = JSON.parse(serialized);
         }
+        if (serialized && instance.getAttribute('type') === 'text') {
+            data = serialized;
+        }
         return data;
     }
 
@@ -263,6 +266,9 @@ export class FxSubmission extends foreElementMixin(HTMLElement) {
             // console.warn('JSON serialization is not yet supported')
             return JSON.stringify(relevantNodes);
         }
+        if (instanceType === 'text') {
+            return relevantNodes;
+        }
         throw new Error('unknown instance type ', instanceType);
     }
 
@@ -394,10 +400,17 @@ export class FxSubmission extends foreElementMixin(HTMLElement) {
         }
 
         if (this.replace === 'all') {
-            document.open();
-            document.write(data);
-            document.close();
-            window.location.href = resolvedUrl;
+            const target = this._getProperty('target');
+            if(target && target === '_blank'){
+                const win = window.open("", "_blank");
+                win.document.write(data);
+                win.document.close();
+            }else{
+                document.open();
+                document.write(data);
+                document.close();
+                window.location.href = resolvedUrl;
+            }
             // document.getElementsByTagName('html')[0].innerHTML = data;
         }
         if (this.replace === 'target' && contentType.startsWith('text/html')) {

package/src/tools/fx-action-log.js

@@ -459,10 +459,9 @@ export class FxActionLog extends HTMLElement {
      */
     _logDetails(e) {
         const eventType = e.type;
-        // console.log('>>>> event type', type)
         const path = XPathUtil.getPath(e.target);
+        // console.log('>>>> _logDetails', path);
         const cut = path.substring(path.indexOf('/fx-fore'), path.length);
-        ;
         const xpath = `/${cut}`;
         const short = cut.replaceAll('fx-', '');