Skip to content

Load html #347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gkellogg wants to merge 18 commits into
base: main
Choose a base branch
from
Open

Load html #347

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d25c882
Load JSON-LD from HTML documents.
gkellogg Dec 28, 2019
7730b10
Set default for expandAllScripts to true for flatten and toRdf.
gkellogg Dec 28, 2019
59da13f
Fix lint errors.
gkellogg Dec 28, 2019
bdc9343
Don't extract all scripts if there is a fragment identifier.
gkellogg Dec 28, 2019
7b29cb3
Update changelog
gkellogg Dec 28, 2019
a41f081
Add contentType check to XHR documentLoader link header test.
gkellogg Dec 31, 2019
03c4834
Test for DOMParser slightly more complicated.
gkellogg Jan 5, 2020
5fa1b2a
Fix CHANGELOG.
gkellogg Jan 6, 2020
5315d67
Apply suggestions from @dlongley code review
gkellogg Jan 6, 2020
31f192d
More changes suggested by @dlongley.
gkellogg Jan 6, 2020
9d5ec19
Fix changelog.
davidlehn Jan 29, 2020
2664ac7
Use content-type package, instead of purpose-defined parseContentType…
gkellogg Feb 17, 2020
868dae6
Update lib/documentLoaders/xhr.js
gkellogg Mar 3, 2020
e38ba63
Update lib/documentLoaders/node.js
gkellogg Mar 3, 2020
9a9bbdb
Update lib/jsonld.js
gkellogg Mar 3, 2020
7cc3d1c
Fix lint issues.
davidlehn Mar 6, 2020
66a2092
Update error code.
davidlehn Mar 6, 2020
11b68b9
Error when loading HTML and no script element exists.
gkellogg Apr 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Test for DOMParser slightly more complicated. 
Skip HTML tests if there is  no DOMParser, or loading the module raises an exception.
Allows Karma tests to pass.
  • Loading branch information
@gkellogg
gkellogg committed Apr 9, 2020
commit 03c4834467f335ebdedb92b469bdb26e4fa678b2
9 changes: 8 additions & 1 deletion lib/jsonld.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1005,7 +1005,14 @@ jsonld.documentLoaders.xhr = require('./documentLoaders/xhr');

// Optional DOM parser
try {
jsonld.domParser = require('xmldom').DOMParser;
jsonld.domParser = require('xmldom').DOMParser || class NoDOMParser {
Copy link
Member

@dlongley dlongley Jan 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@davidlehn -- can you comment here? I don't think we can easily support this pattern with webpack. Can you suggest an alternative path forward? Instead of a require here, the user may need to have installed another package themselves that registered a DOM parser with jsonld in a similar way we do with RDF parsers. If so -- we should copy that pattern since it's already used.

Copy link
Contributor

@dmitrizagidulin dmitrizagidulin Feb 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update: PR #341 removes xmldom as a dependency.

This PR here (#347) should be updated to take that into account (specifically line 1022 here).

parseFromString() {
throw new JsonLdError(
'Could not parse HTML document. ' +
'HTML parsing not implemented.', 'jsonld.LoadDocumentError',
{code: 'loading document failed'});
}
};
} catch(e) {
jsonld.domParser = class NoDOMParser {
parseFromString() {
Expand Down
16 changes: 16 additions & 0 deletions tests/test-common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ const manifest = options.manifest || {
filename: '/'
};

let htmlSupport;
try {
// xmldom may load but not have a DOMParser
htmlSupport = !!require('xmldom').DOMParser;
} catch(e) {
htmlSupport = false;
}
console.log("HTML Support: " + htmlSupport);

const TEST_TYPES = {
'jld:CompactTest': {
skip: {
Expand Down Expand Up @@ -385,6 +394,13 @@ function addTest(manifest, test, tests) {
self.skip();
}

// if xmldom not loaded, skip HTML tests
if(isJsonLdType(test, 'jld:HtmlTest') && !htmlSupport) {
console.log('Skipping test due to lack of HTML support:',
{id: test['@id'], name: test.name});
self.skip();
}

// skip based on test type
if(isJsonLdType(test, SKIP_TESTS)) {
if(options.verboseSkip) {
Expand Down