@jinntec/fore 1.0.0-4 → 1.1.0

package/src/xpath-util.js

@@ -20,7 +20,7 @@ export class XPathUtil {
       if (start.parentNode.hasAttribute('ref')) {
         return start.parentNode;
       }
-      XPathUtil.getParentBindingElement(start.parentNode);
+      return XPathUtil.getParentBindingElement(start.parentNode);
     }
     return null;
   }
@@ -29,10 +29,6 @@ export class XPathUtil {
     return path != null && (path.startsWith('/') || path.startsWith('instance('));
   }
 
-  static isRepeated(element) {
-    return element.parentElement.closest('fx-repeatitem');
-  }
-
   static isSelfReference(ref) {
     return ref === '.' || ref === './text()' || ref === 'text()' || ref === '' || ref === null;
   }
@@ -57,21 +53,32 @@ export class XPathUtil {
     throw new Error('no Fore element present');
   }
 
-  // todo: this will need more work to look upward for instance() expr.
+  /**
+   * returns the instance id from a complete XPath using `instance()` function.
+   *
+   * Will return 'default' in case no ref is given at all or the `instance()` function is called without arg.
+   *
+   * Otherwise instance id is extracted from function and returned. If all fails null is returned.
+   * @param ref
+   * @returns {string}
+   */
   static getInstanceId(ref) {
     if (!ref) {
       return 'default';
     }
+    if (ref.startsWith('instance()')) {
+      return 'default';
+    }
     if (ref.startsWith('instance(')) {
       const result = ref.substring(ref.indexOf('(') + 1);
       return result.substring(1, result.indexOf(')') - 1);
     }
-    return 'default';
+    return null;
   }
 
   // todo: certainly not ideal to rely on duplicating instance id on instance document - better way later ;)
   static getPath(node) {
-    const path = fx.evaluateXPath('path()', node);
+    const path = fx.evaluateXPathToString('path()', node);
     /*
     const instanceId = node.ownerDocument.firstElementChild.getAttribute('id');
     if (instanceId !== null && instanceId !== 'default') {