@jinntec/fore 1.4.0 → 1.6.0

package/src/xpath-evaluation.js

@@ -10,9 +10,9 @@ import {
     registerCustomXPathFunction,
     registerXQueryModule,
 } from 'fontoxpath';
-import {Fore} from './fore.js';
 
 import {XPathUtil} from './xpath-util.js';
+import {prettifyXml} from './functions/common-function.js';
 
 const XFORMS_NAMESPACE_URI = 'http://www.w3.org/2002/xforms';
 
@@ -42,12 +42,15 @@ const xhtmlNamespaceResolver = prefix => {
     }
     return undefined;
 };
+export function isInShadow(node) {
+    return node.getRootNode() instanceof ShadowRoot;
+}
 
 /**
  * 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) {
-	let query = 'outermost(ancestor-or-self::fx-fore[1]/(descendant::fx-fore|descendant::*[@id = $id]))[not(self::fx-fore)]';
+	const 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
@@ -60,6 +63,25 @@ export function resolveId(id, sourceObject, nodeName = null) {
         return document.getElementById(id);
 	}
     */
+	if (sourceObject.nodeType === Node.TEXT_NODE) {
+		sourceObject = sourceObject.parentNode;
+	}
+	if (sourceObject.nodeType === Node.ATTRIBUTE_NODE) {
+		sourceObject = sourceObject.ownerElement;
+	}
+    if(sourceObject.parentNode.nodeType === Node.DOCUMENT_FRAGMENT_NODE){
+        sourceObject = sourceObject.parentNode.host;
+    }
+	const ownerForm = sourceObject.localName === 'fx-fore' ? sourceObject : sourceObject.closest('fx-fore');
+	const elementsWithId = ownerForm.querySelectorAll(`[id='${id}']`);
+	if (elementsWithId.length === 1) {
+        // A single one is found. Assume no ID reuse.
+        const targetObject = elementsWithId[0];
+        if (nodeName && targetObject.localName !== nodeName) {
+            return null;
+        }
+        return targetObject;
+	}
 
     const allMatchingTargetObjects = fxEvaluateXPathToNodes(query,
         sourceObject,
@@ -116,7 +138,7 @@ export function resolveId(id, sourceObject, nodeName = null) {
         {namespaceResolver: xhtmlNamespaceResolver},
     )) {
         const foundTargetObjects = allMatchingTargetObjects.filter(to =>
-            ancestorRepeatItem.contains(to),
+            XPathUtil.contains(ancestorRepeatItem, to),
         );
         switch (foundTargetObjects.length) {
             case 0:
@@ -159,11 +181,16 @@ export function resolveId(id, sourceObject, nodeName = null) {
 // Make namespace resolving use the `instance` element that is related to here
 const xmlDocument = new DOMParser().parseFromString('<xml />', 'text/xml');
 
+const instanceReferencesByQuery = new Map();
+
 function findInstanceReferences(xpathQuery) {
 	if (!xpathQuery.includes('instance')) {
 		// No call to the instance function anyway: short-circuit and prevent AST processing
 		return [];
 	}
+	if (instanceReferencesByQuery.has(xpathQuery)) {
+	  	return instanceReferencesByQuery.get(xpathQuery);
+	}
     const xpathAST = parseScript(xpathQuery, {}, xmlDocument);
     const instanceReferences = fxEvaluateXPathToStrings(
         `descendant::xqx:functionCallExpr
@@ -180,6 +207,8 @@ function findInstanceReferences(xpathQuery) {
         },
     );
 
+	instanceReferencesByQuery.set(xpathQuery, instanceReferences);
+
 	return instanceReferences;
 }
 
@@ -307,6 +336,7 @@ function functionNameResolver({prefix, localName}, _arity) {
         case 'current':
         case 'depends':
         case 'event':
+        case 'fore-attr':
         case 'index':
         case 'instance':
         case 'log':
@@ -350,10 +380,20 @@ function getVariablesInScope(formElement) {
     const variables = {};
     if (closestActualFormElement.inScopeVariables) {
         for (const key of closestActualFormElement.inScopeVariables.keys()) {
-            const varElement = closestActualFormElement.inScopeVariables.get(key);
-            if(varElement){
-                variables[key] = varElement.value;
-            }
+            const varElementOrValue = closestActualFormElement.inScopeVariables.get(key);
+            if (!varElementOrValue) {
+				continue;
+
+			}
+			if (varElementOrValue.nodeType) {
+				// We are a var element, set the value to the value computed there
+                variables[key] = varElementOrValue.value;
+                // variables[key] = varElementOrValue.inScopeVariables.get(key);
+			} else {
+				// We are a direct value. This is used to leak in event variables
+                variables[key] = varElementOrValue;
+			}
+
         }
     }
     return variables;
@@ -584,6 +624,12 @@ const currentFunction = (dynamicContext, string) => {
     return null;
 };
 
+const elementFunction = (dynamicContext, string) => {
+    const caller = dynamicContext.currentContext.formElement;
+    const newElement = document.createElement(string);
+    return newElement;
+};
+
 /**
  * @param id as string
  * @return instance data for given id serialized to string.
@@ -613,6 +659,13 @@ registerCustomXPathFunction(
     currentFunction,
 );
 
+registerCustomXPathFunction(
+    {namespaceURI: XFORMS_NAMESPACE_URI, localName: 'element'},
+    ['xs:string'],
+    'item()?',
+    elementFunction,
+);
+
 /**
  * @param id as string
  * @return instance data for given id serialized to string.
@@ -630,12 +683,30 @@ registerCustomXPathFunction(
                 // return JSON.stringify(instance.getDefaultContext());
             } else {
                 const def = new XMLSerializer().serializeToString(instance.getDefaultContext());
-                return Fore.prettifyXml(def);
+                return prettifyXml(def);
             }
         }
         return null;
     },
 );
+registerCustomXPathFunction(
+    {namespaceURI: XFORMS_NAMESPACE_URI, localName: 'fore-attr'},
+    ['xs:string?'],
+    'xs:string?',
+    (dynamicContext, string) => {
+        const {formElement} = dynamicContext.currentContext;
+
+        let parent = formElement;
+        if(formElement.nodeType === Node.TEXT_NODE){
+            parent = formElement.parentNode;
+        }
+        const foreElement = parent.closest('fx-fore');
+        if(foreElement.hasAttribute(string)){
+            return foreElement.getAttribute(string);
+        }
+        return null;
+    },
+);
 
 registerCustomXPathFunction(
     {namespaceURI: XFORMS_NAMESPACE_URI, localName: 'parse'},
@@ -827,29 +898,41 @@ registerCustomXPathFunction(
     ['xs:string?'],
     'item()?',
     (dynamicContext, arg) => {
-        if (!arg) return [];
-
-        if (dynamicContext.currentContext.variables) {
-            const payload = dynamicContext.currentContext.variables[arg];
-            if (payload.nodeType) {
-                console.log('got some node as js object');
-            }
-            if (payload) {
-                return dynamicContext.currentContext.variables[arg];
+        if (!arg) return null;
+
+		for (let ancestor = dynamicContext.currentContext.formElement;
+			 ancestor;
+			 ancestor = ancestor.parentNode) {
+			if (!ancestor.currentEvent) {
+				continue;
+			}
+
+			// We have a current event. read the property either from detail, or from the event
+			// itself.
+			// Check detail for custom events! This is how that is passed along
+			if (ancestor.currentEvent.detail && typeof ancestor.currentEvent.detail === 'object' && arg in ancestor.currentEvent.detail) {
+				return ancestor.currentEvent.detail[arg];
+			}
+
+			// arg might be `code`, so currentEvent.code should work
+            if(arg.includes('.')){
+                return _propertyLookup(ancestor.currentEvent, arg);
             }
-        }
-
-        if (dynamicContext.currentContext.formElement.inScopeVariables) {
-            console.log('event()', dynamicContext.currentContext.formElement.inScopeVariables);
-            console.log('event()', dynamicContext.currentContext.formElement.inScopeVariables.get(arg));
-            // dynamicContext.currentContext.variables = dynamicContext.currentContext.formElement.inScopeVariables;
-            return dynamicContext.currentContext.formElement.inScopeVariables.get(arg);
-        }
+			return ancestor.currentEvent[arg] || null;
 
-        return [];
+		}
+        return null;
     },
 );
 
+function _propertyLookup(obj,path){
+    const parts = path.split(".");
+    if (parts.length==1){
+        return obj[parts[0]];
+    }
+    return _propertyLookup(obj[parts[0]], parts.slice(1).join("."));
+}
+
 // Implement the XForms standard functions here.
 registerXQueryModule(`
     module namespace xf="${XFORMS_NAMESPACE_URI}";

package/src/xpath-util.js

@@ -2,6 +2,55 @@ import * as fx from 'fontoxpath';
 
 export class XPathUtil {
 
+	/**
+	 * Alternative to `contains` that respects shadowroots
+	 */
+	static contains(ancestor, descendant) {
+		while (descendant) {
+			if (descendant === ancestor) {
+				return true;
+			}
+
+			if (descendant.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
+				// We are passing a shadow root boundary
+				descendant = descendant.host;
+			} else {
+				descendant = descendant.parentNode;
+			}
+		}
+		return false;
+	}
+
+  /**
+   * Alternative to `closest` that respects subcontrol boundaries
+   */
+  static getClosest(querySelector, start) {
+    while (start && !start.matches || !start.matches(querySelector)) {
+      if (start.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
+        // We are passing a shadow root boundary
+        start = start.host;
+        continue;
+      }
+      if (start.nodeType === Node.ATTRIBUTE_NODE) {
+        // We are passing an attribute
+        start = start.ownerElement;
+        continue;
+      }
+      if (start.nodeType === Node.TEXT_NODE) {
+        start = start.parentNode;
+      }
+      if (start.matches('fx-fore')) {
+        // Subform reached. Bail out
+        return null;
+      }
+      start = start.parentNode;
+      if (!start) {
+        return null;
+      }
+    }
+    return start;
+  }
+
   /**
    * returns next bound element upwards in tree
    * @param start where to start the search
@@ -14,11 +63,16 @@ export class XPathUtil {
         return host;
       }
     } else */
-    if (start.parentNode && start.parentNode.nodeType !== Node.DOCUMENT_NODE) {
+    if (start.parentNode &&
+        (start.parentNode.nodeType !== Node.DOCUMENT_NODE || start.parentNode.nodeType !== Node.DOCUMENT_FRAGMENT_NODE) ) {
+/*
       if (start.parentNode.hasAttribute('ref')) {
         return start.parentNode;
       }
       return XPathUtil.getParentBindingElement(start.parentNode);
+*/
+
+      return start.parentNode.closest('[ref]');
     }
     return null;
   }