Skip to content

Commit ee2a67d

Browse files
leungwensenleungwensen
committed
code style, etc.
1 parent cbe97f1 commit ee2a67d

File tree

12 files changed

+87
-102
lines changed

12 files changed

+87
-102
lines changed

‎index.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ const xmldom = require('xmldom')
33
const dom2js = require('./lib/dom2js')
44
const dom2json = require('./lib/dom2json')
55
const escape = require('./lib/escape')
6-
const getInnerXML = require('./lib/get-inner-xml')
6+
const getInnerXML = require('./lib/getInnerXml')
77
const js2xml = require('./lib/js2xml')
88
const json2xml = require('./lib/json2xml')
99
const sanitize = require('./lib/sanitize')
1010
const unescape = require('./lib/unescape')
11-
const xml = require('./lib/xml-lite')
11+
const xml = require('./lib/xml')
1212
const xml2js = require('./lib/xml2js')
1313
const xml2json = require('./lib/xml2json')
1414

@@ -19,7 +19,7 @@ assignIn(xml, {
1919
domParser: new xmldom.DOMParser({
2020
errorHandler: (err) => {
2121
throw err
22-
},
22+
}
2323
}),
2424
escape,
2525
getInnerXML,
@@ -30,7 +30,7 @@ assignIn(xml, {
3030
unescape,
3131
xml2js,
3232
xml2json,
33-
xmlSerializer: new xmldom.XMLSerializer(),
33+
xmlSerializer: new xmldom.XMLSerializer()
3434
})
3535

36-
module.exports = xml
36+
module.exports = xml

‎indexBrowser.js

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/* eslint-env browser */
2+
const assignIn = require('lodash/assignIn')
3+
const dom2js = require('./lib/dom2js')
4+
const dom2json = require('./lib/dom2json')
5+
const escape = require('./lib/escape')
6+
const getInnerXML = require('./lib/getInnerXml')
7+
const js2xml = require('./lib/js2xml')
8+
const json2xml = require('./lib/json2xml')
9+
const sanitize = require('./lib/sanitize')
10+
const unescape = require('./lib/unescape')
11+
const xml = require('./lib/xml')
12+
const xml2js = require('./lib/xml2js')
13+
const xml2json = require('./lib/xml2json')
14+
15+
assignIn(xml, {
16+
ENV: 'browser',
17+
dom2js,
18+
dom2json,
19+
domParser: new DOMParser(),
20+
escape,
21+
getInnerXML,
22+
getOuterXML: xml.serialize,
23+
js2xml,
24+
json2xml,
25+
sanitize,
26+
unescape,
27+
xml2js,
28+
xml2json,
29+
xmlSerializer: new XMLSerializer()
30+
})
31+
32+
module.exports = xml

‎lib/dom2js.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@ const map = require('lodash/map')
33
const each = require('lodash/each')
44
const sanitize = require('./sanitize')
55

6-
function unescapeQuotes(value) {
6+
function unescapeQuotes (value) {
77
return value
88
.replace(/&quot/g, '"')
99
.replace(/&apos/g, "'")
1010
}
1111

12-
function filterNodes(nodes) {
12+
function filterNodes (nodes) {
1313
// FIXME the browser version does not deal with ProcessingInstruction of <?xml version="1.0" encoding="UTF-8"?>
1414
nodes = nodes || []
1515
return filter(nodes, (node) => !(node.nodeType === 7 && node.target === 'xml'))
1616
}
1717

18-
function dom2js(doc) {
18+
function dom2js (doc) {
1919
const obj = {
2020
// NOTICE: for HTML, tagName is always UPPERCASE.
21-
type: doc.nodeType,
21+
type: doc.nodeType
2222
}
2323

2424
// special types
@@ -51,4 +51,4 @@ function dom2js(doc) {
5151
return obj
5252
}
5353

54-
module.exports = dom2js
54+
module.exports = dom2js

‎lib/dom-utils.js renamed to ‎lib/domUtils.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ const keys = require('lodash/keys')
55
const forIn = require('lodash/forIn')
66
const assignIn = require('lodash/assignIn')
77

8-
function noop() {
8+
function noop () {
99
}
1010

1111
const domUtils = {
12-
attributesAsObject(doc) {
12+
attributesAsObject (doc) {
1313
const result = {}
1414
const attributes = doc.attributes || []
1515
each(attributes, (attr) => {
@@ -18,21 +18,21 @@ const domUtils = {
1818
return result
1919
},
2020

21-
findChildNode(doc, query) {
21+
findChildNode (doc, query) {
2222
query = query || {}
2323
if (!doc) {
2424
return null
2525
}
2626
return domUtils.findChildNodes(doc, query)[0]
2727
},
2828

29-
findChildNodes(doc, query) {
29+
findChildNodes (doc, query) {
3030
const FILTER_QUERY_PROPS = [
3131
'localName',
3232
'namespaceURI',
3333
'nodeName',
3434
'nodeType',
35-
'tagName',
35+
'tagName'
3636
]
3737
if (!doc) {
3838
return []
@@ -49,10 +49,10 @@ const domUtils = {
4949
))
5050
},
5151

52-
findAllNodes(doc, query) {
52+
findAllNodes (doc, query) {
5353
let nodes = []
5454

55-
function findAllChildNodes(parentDoc) {
55+
function findAllChildNodes (parentDoc) {
5656
nodes = nodes.concat(domUtils.findChildNodes(parentDoc, query))
5757
each(parentDoc.childNodes || [], (node) => {
5858
findAllChildNodes(node)
@@ -65,7 +65,7 @@ const domUtils = {
6565

6666
findNode: (doc, query) => domUtils.findAllNodes(doc, query)[0],
6767

68-
createChildNode(doc, query) {
68+
createChildNode (doc, query) {
6969
// FIXME: support more NodeTypes
7070
if (!doc) {
7171
return null
@@ -88,7 +88,7 @@ const domUtils = {
8888
return resultNode
8989
},
9090

91-
findOrCreateChildNode(doc, query) {
91+
findOrCreateChildNode (doc, query) {
9292
if (!doc) {
9393
return null
9494
}
@@ -99,27 +99,27 @@ const domUtils = {
9999
return resultNode
100100
},
101101

102-
eachChildNode(doc, query, callback) {
102+
eachChildNode (doc, query, callback) {
103103
callback = callback || noop
104104
each(domUtils.findChildNodes(doc, query), (node) => {
105105
callback(node)
106106
})
107107
},
108108

109-
eachNode(doc, query, callback) {
109+
eachNode (doc, query, callback) {
110110
callback = callback || noop
111111
each(domUtils.findAllNodes(doc, query), (node) => {
112112
callback(node)
113113
})
114114
},
115115

116-
removeChildNode(doc, query) {
116+
removeChildNode (doc, query) {
117117
const resultNode = domUtils.findChildNode(doc, query)
118118
if (resultNode) {
119119
doc.removeChild(resultNode)
120120
}
121121
return resultNode
122-
},
122+
}
123123
}
124124

125125
// NodeTypes
@@ -135,12 +135,12 @@ const NODE_TYPES = {
135135
DOCUMENT_NODE: 9,
136136
DOCUMENT_TYPE_NODE: 10,
137137
DOCUMENT_FRAGMENT_NODE: 11,
138-
NOTATION_NODE: 12,
138+
NOTATION_NODE: 12
139139
}
140140

141141
assignIn(domUtils, {
142142
findNodes: domUtils.findAllNodes,
143-
NODE_TYPES,
143+
NODE_TYPES
144144
}, NODE_TYPES)
145145

146-
module.exports = domUtils
146+
module.exports = domUtils

‎lib/get-inner-xml.js renamed to ‎lib/getInnerXml.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const map = require('lodash/map')
2-
const xml = require('./xml-lite')
2+
const xml = require('./xml')
33

44
module.exports = node => {
55
const children = node.childNodes
66
return map(children, child => xml.serialize(child)).join('')
7-
};
7+
}

‎lib/js2dom.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
const js2xml = require('./js2xml')
2-
const xml = require('./xml-lite')
2+
const xml = require('./xml')
33

44
module.exports = (obj) => xml.parse(js2xml(obj))

‎lib/js2xml.js

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
const map = require('lodash/map')
22
const keys = require('lodash/keys')
3-
const xml = require('./xml-lite')
4-
const xmlFormat = require('./xml-format')
3+
const xml = require('./xml')
4+
const xmlFormat = require('./xmlFormat')
55

6-
function escapeDoubleQuotes(value) {
6+
function escapeDoubleQuotes (value) {
77
return value.replace(/"/g, '&quot;')
88
}
9-
function escapeSingleQuotes(value) {
9+
function escapeSingleQuotes (value) {
1010
return value.replace(/'/g, '&apos;')
1111
}
1212

13-
function stringifyAttribute(attrs, key, keepDoubleQuotes) {
13+
function stringifyAttribute (attrs, key, keepDoubleQuotes) {
1414
const value = attrs[key]
1515
try {
1616
if (keepDoubleQuotes) {
@@ -19,21 +19,20 @@ function stringifyAttribute(attrs, key, keepDoubleQuotes) {
1919
return `${key}="${escapeSingleQuotes(escapeDoubleQuotes(value))}"`
2020
} catch (e) {
2121
console.error('invalid attribute:', attrs, key)
22-
throw `invalid attribute: ${key}: ${JSON.stringify(value, null, '\t')}`
22+
throw new TypeError(`invalid attribute: ${key}: ${JSON.stringify(value, null, '\t')}`)
2323
}
2424
}
2525

26-
function stringifyAttributes(attrs) {
26+
function stringifyAttributes (attrs) {
2727
const keepDoubleQuotes = xml.keepDoubleQuotes
28-
const keys = keys(attrs)
29-
if (keys.length) {
30-
return ` ${map(keys, (key) => `${stringifyAttribute(attrs, key, keepDoubleQuotes)}`).join(' ')}`
28+
const attrKeys = keys(attrs)
29+
if (attrKeys.length) {
30+
return ` ${map(attrKeys, (key) => `${stringifyAttribute(attrs, key, keepDoubleQuotes)}`).join(' ')}`
3131
}
3232
return ''
3333
}
3434

35-
36-
function js2xml(obj) {
35+
function js2xml (obj) {
3736
/* 'Comment' */
3837
if (obj.type === xml.COMMENT_NODE) {
3938
return `<!--${obj.data}-->`
@@ -51,9 +50,9 @@ function js2xml(obj) {
5150
if (obj.type === xml.DOCUMENT_NODE) {
5251
return content
5352
}
54-
const stringifyAttributes = stringifyAttributes(obj.attributes || {})
53+
const stringifyAttrs = stringifyAttributes(obj.attributes || {})
5554
const tag = obj.tag || ''
56-
return `<${tag}${stringifyAttributes}>${content}</${tag}>`
55+
return `<${tag}${stringifyAttrs}>${content}</${tag}>`
5756
}
5857

5958
module.exports = (obj, options) => {

‎lib/repeat-string.js

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎lib/sanitize.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ const isString = require('lodash/isString')
44
const chars = {
55
'&': '&amp;',
66
'<': '&lt;',
7-
'>': '&gt;',
7+
'>': '&gt;'
88
}
9-
function escapeRegExp(string) {
9+
function escapeRegExp (string) {
1010
return string.replace(/([.*+?^=!:${}()|[\]/\\])/g, '\\$1')
1111
}
1212

‎lib/xml-lite.js renamed to ‎lib/xml.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const assignIn = require('lodash/assignIn')
2-
const xmlFormat = require('./xml-format')
3-
const domUtils = require('./dom-utils')
2+
const xmlFormat = require('./xmlFormat')
3+
const domUtils = require('./domUtils')
44

55
const PARSER_ERROR_TAG = 'parsererror'
66
const XML_DOCTYPE = 'text/xml'
@@ -22,7 +22,7 @@ const xml = {
2222
const msgTag = xml.findOrCreateChildNode(parserErrorTag, {
2323
tagName: 'div'
2424
})
25-
return msgTag.textContent; // DOM level 3
25+
return msgTag.textContent // DOM level 3
2626
},
2727

2828
getParserError: (parsedDom, str) => {
@@ -67,12 +67,12 @@ const xml = {
6767
serializeToString: (doc, prettyPrint) => {
6868
const result = xml.xmlSerializer.serializeToString(doc)
6969
return prettyPrint ? xmlFormat.beautify(result) : result
70-
},
70+
}
7171
}
7272

7373
assignIn(xml, {
7474
parse: xml.parseFromString,
75-
serialize: xml.serializeToString,
75+
serialize: xml.serializeToString
7676
}, xmlFormat, domUtils)
7777

7878
module.exports = xml

‎lib/xml2js.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const xml = require('./xml-lite')
1+
const xml = require('./xml')
22
const dom2js = require('./dom2js')
33

44
module.exports = (text) => dom2js(xml.parse(text))

0 commit comments

Comments
 (0)