From dece0586e37c960e60a2c1433d4b710d71461731 Mon Sep 17 00:00:00 2001 From: James Rishe Date: Sat, 25 Nov 2017 13:28:43 +0900 Subject: [PATCH] Add .allowAnyNamespaceForNoPrefix option. Fixes #27 --- test.js | 38 ++++++++++++++++++++++++++++++++++++++ xpath.js | 28 ++++++++++++++-------------- 2 files changed, 52 insertions(+), 14 deletions(-) diff --git a/test.js b/test.js index f225b8e..945d422 100644 --- a/test.js +++ b/test.js @@ -991,6 +991,44 @@ module.exports = { assert.equal("The burrow", lastChapter[0].textContent); + test.done(); + } + + ,'should allow null namespaces for null prefixes': function (test) { + var doc = new dom().parseFromString('

Hi Ron!

Hi Draco!

Hi Hermione!

', 'text/html'); + + var noPrefixPath = xpath.parse('/html/body/p[2]'); + + var greetings1 = noPrefixPath.select({ node: doc }); + + assert.equal(0, greetings1.length); + + var allowAnyNamespaceOptions = { node: doc, allowAnyNamespaceForNoPrefix: true }; + + // if allowAnyNamespaceForNoPrefix specified, allow using prefix-less node tests to match nodes with no prefix + var greetings2 = noPrefixPath.select(allowAnyNamespaceOptions); + + assert.equal(1, greetings2.length); + assert.equal('Hi Hermione!', greetings2[0].textContent); + + var allGreetings = xpath.parse('/html/body/p').select(allowAnyNamespaceOptions); + + assert.equal(2, allGreetings.length); + + var nsm = { html: 'http://www.w3.org/1999/xhtml', other: 'http://www.example.com/other' }; + + var prefixPath = xpath.parse('/html:html/body/html:p'); + var optionsWithNamespaces = { node: doc, allowAnyNamespaceForNoPrefix: true, namespaces: nsm }; + + // if the path uses prefixes, they have to match + var greetings3 = prefixPath.select(optionsWithNamespaces); + + assert.equal(2, greetings3.length); + + var badPrefixPath = xpath.parse('/html:html/other:body/html:p'); + + var greetings4 = badPrefixPath.select(optionsWithNamespaces); + test.done(); } } diff --git a/xpath.js b/xpath.js index 479b464..e5a4712 100644 --- a/xpath.js +++ b/xpath.js @@ -2081,16 +2081,8 @@ PathExpr.applyLocationPath = function (locationPath, xpc, nodes) { }; PathExpr.prototype.evaluate = function(c) { - var nodes; - var xpc = new XPathContext(); + var xpc = assign(new XPathContext(), c); - xpc.variableResolver = c.variableResolver; - xpc.functionResolver = c.functionResolver; - xpc.namespaceResolver = c.namespaceResolver; - xpc.expressionContextNode = c.expressionContextNode; - xpc.virtualRoot = c.virtualRoot; - xpc.caseInsensitive = c.caseInsensitive; - var filterResult = this.applyFilter(c, xpc); if ('nonNodes' in filterResult) { @@ -2104,10 +2096,10 @@ PathExpr.prototype.evaluate = function(c) { PathExpr.predicateMatches = function(pred, c) { var res = pred.evaluate(c); - if (Utilities.instance_of(res, XNumber)) { - return c.contextPosition == res.numberValue(); - } - return res.booleanValue(); + + return Utilities.instance_of(res, XNumber) + ? c.contextPosition == res.numberValue() + : res.booleanValue(); }; PathExpr.predicateString = compose(wrap('[', ']'), toString); @@ -2132,6 +2124,7 @@ PathExpr.prototype.toString = function() { return filterStr; } + return toString(this.locationPath); }; @@ -2302,11 +2295,17 @@ NodeTest.makeNodeTypeTest = function (type, nodeTypes, stringVal) { }))(); }; +NodeTest.hasPrefix = function (node) { + return node.prefix || (node.nodeName || node.tagName).indexOf(':') !== -1; +}; + NodeTest.isElementOrAttribute = NodeTest.isNodeType([1, 2]); NodeTest.nameSpaceMatches = function (prefix, xpc, n) { var nNamespace = (n.namespaceURI || ''); - if (!prefix) { return !nNamespace; } + if (!prefix) { + return !nNamespace || (xpc.allowAnyNamespaceForNoPrefix && !NodeTest.hasPrefix(n)); + } var ns = xpc.namespaceResolver.getNamespace(prefix, xpc.expressionContextNode); @@ -4617,6 +4616,7 @@ installDOM3XPathSupport(exports, new XPathParser()); context.functionResolver = makeFunctionResolver(options.functions); context.variableResolver = makeVariableResolver(options.variables); context.expressionContextNode = options.node; + context.allowAnyNamespaceForNoPrefix = options.allowAnyNamespaceForNoPrefix; } else { context.namespaceResolver = defaultNSResolver; }