-
Notifications
You must be signed in to change notification settings - Fork 19
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.
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
Move xmldom parsing to internal interface #19
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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,33 @@ | ||
import { DOMParser } from 'xmldom'; | ||
|
||
export const ERR_INVALID_XML = 'XMLToReact: Unable to parse invalid XML input. Please input valid XML.'; | ||
|
||
const throwError = (m) => { throw new Error(m); }; | ||
|
||
const parser = new DOMParser({ | ||
errorHandler: throwError, | ||
fatalError: throwError, | ||
warning: throwError, | ||
}); | ||
|
||
|
||
/** | ||
* Parse an xml string | ||
* | ||
* @param {string} xml - xml to convert | ||
* @returns {Object} - xml tree | ||
* @public | ||
*/ | ||
export function parse(xml) { | ||
if (typeof xml !== 'string') { | ||
return null; | ||
} | ||
|
||
try { | ||
return parser.parseFromString(xml, 'text/xml'); | ||
} catch (e) { | ||
console.warn(ERR_INVALID_XML); | ||
} | ||
|
||
return null; | ||
} |
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,51 @@ | ||
import { DOMParser } from 'xmldom'; | ||
import { expect } from 'chai'; | ||
import sinon from 'sinon'; | ||
|
||
import { parse, ERR_INVALID_XML } from '../src/parser'; | ||
|
||
describe('XML parser', () => { | ||
let sandbox; | ||
|
||
before(() => { | ||
sandbox = sinon.sandbox.create(); | ||
}); | ||
|
||
afterEach(() => { | ||
sandbox.restore(); | ||
}); | ||
|
||
describe('parse', () => { | ||
it('should export a function', () => { | ||
expect(parse).to.be.a('function'); | ||
}); | ||
|
||
it('should return `null` when no text is passed', () => { | ||
expect(parse()).to.equal(null); | ||
expect(parse('foo')).not.to.equal(null); | ||
}); | ||
|
||
it('should parse XML from a string', () => { | ||
const mockXMLTree = {}; | ||
sandbox.stub(DOMParser.prototype, 'parseFromString').returns(mockXMLTree); | ||
expect(parse('foo')).to.equal(mockXMLTree); | ||
sinon.assert.calledWith(DOMParser.prototype.parseFromString, 'foo', 'text/xml'); | ||
}); | ||
|
||
describe('When an invalid XML string is passed', () => { | ||
beforeEach(() => { | ||
sandbox.stub(console, 'warn'); | ||
sandbox.stub(DOMParser.prototype, 'parseFromString').throws(new Error('boom')); | ||
}); | ||
|
||
it('should return `null`', () => { | ||
expect(parse('foo')).to.equal(null); | ||
}); | ||
|
||
it('should log a warning', () => { | ||
parse('foo'); | ||
sinon.assert.calledWith(console.warn, ERR_INVALID_XML); | ||
}); | ||
}); | ||
}); | ||
}); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I notice now that we're not logging the exception raised by the parser. However, I think this is better addressed in #14