forked from jsdom/jsdom
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement an initial version of DOMParser
It's missing: - <parsererror> elements when parsing XML strings fails - copying the active document's URL Also adds the empty-per-spec XMLDocument interface. Closes jsdom#1341. Part of jsdom#1368.
- Loading branch information
Showing
10 changed files
with
188 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
"use strict"; | ||
const Document = require("../generated/Document"); | ||
const core = require(".."); | ||
const applyDocumentFeatures = require("../../browser/documentfeatures").applyDocumentFeatures; | ||
|
||
exports.implementation = class DOMParserImpl { | ||
parseFromString(string, contentType) { | ||
switch (String(contentType)) { | ||
case "text/html": { | ||
return createScriptingDisabledDocument("html", contentType, string); | ||
} | ||
|
||
case "text/xml": | ||
case "application/xml": | ||
case "application/xhtml+xml": | ||
case "image/svg+xml": { | ||
// TODO: use a strict XML parser (sax's strict mode might work?) and create parsererror elements | ||
return createScriptingDisabledDocument("xml", contentType, string); | ||
} | ||
|
||
default: | ||
throw new TypeError("Invalid contentType"); | ||
} | ||
} | ||
}; | ||
|
||
function createScriptingDisabledDocument(parsingMode, contentType, string) { | ||
const document = Document.createImpl([], { | ||
core, | ||
options: { | ||
parsingMode, | ||
encoding: "UTF-8", | ||
contentType | ||
// TODO: somehow set URL to active document's URL | ||
} | ||
}); | ||
|
||
// "scripting enabled" set to false | ||
applyDocumentFeatures(document, { | ||
FetchExternalResources: [], | ||
ProcessExternalResources: false, | ||
SkipExternalResources: false | ||
}); | ||
|
||
document._htmlToDom.appendHtmlToDocument(string, document); | ||
document.close(); | ||
return document; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
[Constructor] | ||
interface DOMParser { | ||
[NewObject] | ||
Document parseFromString(DOMString str, SupportedType type); | ||
}; | ||
|
||
enum SupportedType { | ||
"text/html", | ||
"text/xml", | ||
"application/xml", | ||
"application/xhtml+xml", | ||
"image/svg+xml" | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
"use strict"; | ||
const DocumentImpl = require("./Document-impl").implementation; | ||
|
||
exports.implementation = class XMLDocumentImpl extends DocumentImpl {}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
interface XMLDocument : Document {}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
114 changes: 114 additions & 0 deletions
114
test/web-platform-tests/to-upstream/domparsing/DOMParser-dont-upstream.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,114 @@ | ||
<!doctype html> | ||
<title>DOMParser tests that we pass so far, despite not passing any of the files</title> | ||
<script src="/resources/testharness.js"></script> | ||
<script src="/resources/testharnessreport.js"></script> | ||
<script> | ||
// |expected| should be an object indicating the expected type of node. | ||
function assert_node(actual, expected) { | ||
assert_true(actual instanceof expected.type, | ||
'Node type mismatch: actual = ' + actual.nodeType + ', expected = ' + expected.nodeType); | ||
if (typeof(expected.id) !== 'undefined') | ||
assert_equals(actual.id, expected.id, expected.idMessage); | ||
if (typeof(expected.nodeValue) !== 'undefined') | ||
assert_equals(actual.nodeValue, expected.nodeValue, expected.nodeValueMessage); | ||
} | ||
|
||
var doc; | ||
setup(function() { | ||
var parser = new DOMParser(); | ||
var input = '<html id="root"><head></head><body></body></html>'; | ||
doc = parser.parseFromString(input, 'text/html'); | ||
}); | ||
|
||
test(function() { | ||
var root = doc.documentElement; | ||
assert_node(root, { type: HTMLHtmlElement, id: 'root', | ||
idMessage: 'documentElement id attribute should be root.' }); | ||
}, 'Parsing of id attribute'); | ||
|
||
test(function() { | ||
assert_equals(doc.contentType, "text/html") | ||
}, 'contentType'); | ||
|
||
test(function() { | ||
assert_equals(doc.characterSet, "UTF-8") | ||
}, 'characterSet'); | ||
|
||
test(function() { | ||
assert_equals(doc.inputEncoding, "UTF-8") | ||
}, 'inputEncoding'); | ||
|
||
test(function() { | ||
assert_equals(doc.charset, "UTF-8") | ||
}, 'charset'); | ||
|
||
// Fail due to our lack of multi-global setup | ||
// test(function() { | ||
// var url = document.URL; | ||
// assert_equals(doc.documentURI, url, | ||
// 'The document must have a URL value equal to the URL of the active document.'); | ||
// assert_equals(doc.URL, url, | ||
// 'The document must have a URL value equal to the URL of the active document.'); | ||
// }, 'URL value'); | ||
|
||
test(function() { | ||
assert_equals(doc.location, null, | ||
'The document must have a location value of null.'); | ||
}, 'Location value'); | ||
|
||
test(function() { | ||
var soup = "<!DOCTYPE foo></><foo></multiple></>"; | ||
var htmldoc = new DOMParser().parseFromString(soup, "text/html"); | ||
assert_equals(htmldoc.documentElement.localName, "html"); | ||
assert_equals(htmldoc.documentElement.namespaceURI, "http://www.w3.org/1999/xhtml"); | ||
}, "DOMParser parses HTML tag soup with no problems"); | ||
|
||
///////////////////////////// | ||
|
||
function checkMetadata(doc, contentType) { | ||
assert_true(doc instanceof Document, "Should be Document"); | ||
// assert_equals(doc.URL, document.URL, "URL"); | ||
// assert_equals(doc.documentURI, document.URL, "documentURI"); | ||
assert_equals(doc.characterSet, "UTF-8", "characterSet"); | ||
assert_equals(doc.charset, "UTF-8", "charset"); | ||
assert_equals(doc.inputEncoding, "UTF-8", "inputEncoding"); | ||
assert_equals(doc.contentType, contentType, "contentType"); | ||
assert_equals(doc.location, null, "location"); | ||
} | ||
|
||
var allowedTypes = ["text/xml", "application/xml", "application/xhtml+xml", "image/svg+xml"]; | ||
|
||
allowedTypes.forEach(function(type) { | ||
test(function() { | ||
var p = new DOMParser(); | ||
var doc = p.parseFromString("<foo/>", type); | ||
assert_true(doc instanceof Document, "Should be Document"); | ||
checkMetadata(doc, type); | ||
assert_equals(doc.documentElement.namespaceURI, null); | ||
assert_equals(doc.documentElement.localName, "foo"); | ||
assert_equals(doc.documentElement.tagName, "foo"); | ||
}, "Should parse correctly in type " + type); | ||
|
||
test(function() { | ||
var p = new DOMParser(); | ||
var doc = p.parseFromString("<foo/>", type); | ||
assert_false(doc instanceof XMLDocument, "Should not be XMLDocument"); | ||
}, "XMLDocument interface for correctly parsed document with type " + type); | ||
|
||
// Fail because we don't have a strict XML parser (?) | ||
// test(function() { | ||
// var p = new DOMParser(); | ||
// var doc = p.parseFromString("<foo>", type); | ||
// checkMetadata(doc, type); | ||
// assert_equals(doc.documentElement.namespaceURI, "http://www.mozilla.org/newlayout/xml/parsererror.xml"); | ||
// assert_equals(doc.documentElement.localName, "parsererror"); | ||
// assert_equals(doc.documentElement.tagName, "parsererror"); | ||
// }, "Should return an error document for XML wellformedness errors in type " + type); | ||
|
||
test(function() { | ||
var p = new DOMParser(); | ||
var doc = p.parseFromString("<foo>", type); | ||
assert_false(doc instanceof XMLDocument, "Should not be XMLDocument"); | ||
}, "XMLDocument interface for incorrectly parsed document with type " + type); | ||
}); | ||
</script> |