@jinntec/fore 1.3.0 → 1.5.0

package/src/xpath-evaluation.js

@@ -47,8 +47,21 @@ const xhtmlNamespaceResolver = prefix => {
  * 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) {
-    const allMatchingTargetObjects = fxEvaluateXPathToNodes(
-        'outermost(ancestor-or-self::fx-fore[1]/(descendant::fx-fore|descendant::*[@id = $id]))[not(self::fx-fore)]',
+	let 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
+            // query = 'ancestor-or-self::fx-fore[1]/fx-model/fx-instance[@id = $id]';
+
+            const fore = Fore.getFore(sourceObject);
+            const instances = fore.getModel().instances;
+            const targetInstance = instances.find(i => i.id === id);
+            return targetInstance;
+        return document.getElementById(id);
+	}
+    */
+
+    const allMatchingTargetObjects = fxEvaluateXPathToNodes(query,
         sourceObject,
         null,
         {id},
@@ -749,19 +762,18 @@ const instance = (dynamicContext, string) => {
         {namespaceResolver: xhtmlNamespaceResolver},
     );
 
-    // console.log('fnInstance dynamicContext: ', dynamicContext);
-    // console.log('fnInstance string: ', string);
+    const inst = string
+        ? formElement.querySelector(`#${string}`)
+        : formElement.querySelector(`fx-instance`);
 
+/*
     const inst = string
         ? resolveId(string, formElement, 'fx-instance')
         : formElement.querySelector(`fx-instance`);
+*/
 
-    // const def = instance.getInstanceData();
     if (inst) {
-        const def = inst.getDefaultContext();
-        // console.log('target instance root node: ', def);
-
-        return def;
+        return inst.getDefaultContext();
     }
     return null;
 };

package/src/xpath-util.js

@@ -1,14 +1,12 @@
 import * as fx from 'fontoxpath';
 
-/**
- * Checks wether the specified path expression is an absolute path.
- *
- * @param path the path expression.
- * @return <code>true</code> if specified path expression is an absolute
- * path, otherwise <code>false</code>.
- */
-
 export class XPathUtil {
+
+  /**
+   * returns next bound element upwards in tree
+   * @param start where to start the search
+   * @returns {*|null}
+   */
   static getParentBindingElement(start) {
     /*    if (start.parentNode.host) {
       const { host } = start.parentNode;
@@ -25,6 +23,13 @@ export class XPathUtil {
     return null;
   }
 
+  /**
+   * Checks whether the specified path expression is an absolute path.
+   *
+   * @param path the path expression.
+   * @return <code>true</code> if specified path expression is an absolute
+   * path, otherwise <code>false</code>.
+   */
   static isAbsolutePath(path) {
     return path != null && (path.startsWith('/') || path.startsWith('instance('));
   }
@@ -33,26 +38,6 @@ export class XPathUtil {
     return ref === '.' || ref === './text()' || ref === 'text()' || ref === '' || ref === null;
   }
 
-  static getDefaultInstance(boundElement) {
-    // const fore = boundElement.closest('fx-fore');
-    const fore = XPathUtil.getForeElement(boundElement);
-    const defaultInstance = fore.querySelector('fx-instance');
-    if (!defaultInstance) {
-      throw new Error('no default instance present');
-    }
-    return defaultInstance;
-  }
-
-  static getForeElement(start) {
-    if (start.nodeName === 'FX-FORE') {
-      return start;
-    }
-    if (start.parentNode) {
-      return XPathUtil.getForeElement(start.parentNode);
-    }
-    throw new Error('no Fore element present');
-  }
-
   /**
    * returns the instance id from a complete XPath using `instance()` function.
    *