Use document instead of bundled map in browsers

Closes GH-14.

Reviewed-by: Titus Wormer <[email protected]>

Co-authored-by: Titus Wormer <[email protected]>

Author: rexxars

.travis.yml

@@ -1,7 +1,18 @@
 language: node_js
 node_js:
-- lts/boron
-- node
+  - lts/boron
+  - node
+addons:
+  apt:
+    packages:
+      - xvfb
+install:
+  - export DISPLAY=':99.0'
+  - Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
+  - npm install
+script:
+  - npm test
+  - npm run test-browser -- --browser=firefox
 after_script: bash <(curl -s https://codecov.io/bash)
 deploy:
   provider: releases

decode-entity.browser.js

@@ -0,0 +1,29 @@
+'use strict'
+
+/* eslint-env browser */
+
+var el
+
+module.exports = decodeEntity
+
+function decodeEntity(characters) {
+  var char
+  var entity
+
+  el = el || document.createElement('i')
+  entity = '&' + characters + ';'
+  el.innerHTML = entity
+  char = el.textContent
+
+  // Some entities do not require the closing semicolon (&not - for instance),
+  // which leads to situations where parsing the assumed entity of &notit; will
+  // result in the string `¬it;`.  When we encounter a trailing semicolon after
+  // parsing and the entity to decode was not a semicolon (;), we can
+  // assume that the matching was incomplete
+  if (char.slice(-1) === ';' && characters !== 'semi') {
+    return false
+  }
+
+  // If the decoded string is equal to the input, the entity was not valid
+  return char === entity ? false : char
+}

decode-entity.js

@@ -0,0 +1,13 @@
+'use strict'
+
+var characterEntities = require('character-entities')
+
+module.exports = decodeEntity
+
+var own = {}.hasOwnProperty
+
+function decodeEntity(characters) {
+  return own.call(characterEntities, characters)
+    ? characterEntities[characters]
+    : false
+}

index.js

@@ -1,11 +1,11 @@
 'use strict'
 
-var characterEntities = require('character-entities')
 var legacy = require('character-entities-legacy')
 var invalid = require('character-reference-invalid')
 var decimal = require('is-decimal')
 var hexadecimal = require('is-hexadecimal')
 var alphanumerical = require('is-alphanumerical')
+var decodeEntity = require('./decode-entity')
 
 module.exports = parseEntities
 
@@ -115,6 +115,7 @@ function parse(value, settings) {
   var queue = ''
   var result = []
   var entityCharacters
+  var namedEntity
   var terminated
   var characters
   var character
@@ -246,9 +247,11 @@ function parse(value, settings) {
       if (terminated) {
         end++
 
-        if (type === NAMED && own.call(characterEntities, characters)) {
+        namedEntity = type === NAMED ? decodeEntity(characters) : false
+
+        if (namedEntity) {
           entityCharacters = characters
-          entity = characterEntities[characters]
+          entity = namedEntity
         }
       }
 

package.json

@@ -17,8 +17,13 @@
   "contributors": [
     "Titus Wormer <[email protected]> (http://wooorm.com)"
   ],
+  "browser": {
+    "./decode-entity.js": "./decode-entity.browser.js"
+  },
   "files": [
-    "index.js"
+    "index.js",
+    "decode-entity.js",
+    "decode-entity.browser.js"
   ],
   "dependencies": {
     "character-entities": "^1.0.0",
@@ -36,6 +41,7 @@
     "remark-cli": "^5.0.0",
     "remark-preset-wooorm": "^4.0.0",
     "tape": "^4.2.0",
+    "tape-run": "^4.0.0",
     "xo": "^0.20.0"
   },
   "scripts": {
@@ -45,7 +51,8 @@
     "build": "npm run build-bundle && npm run build-mangle",
     "test-api": "node test",
     "test-coverage": "nyc --reporter lcov tape test.js",
-    "test": "npm run format && npm run build && npm run test-coverage"
+    "test-browser": "browserify test.js | tape-run",
+    "test": "npm run format && npm run build && npm run test-coverage && npm run test-browser"
   },
   "nyc": {
     "check-coverage": true,