entities 3.0.0 → 3.0.1

package/lib/decode.d.ts

@@ -1,18 +1,6 @@
 import htmlDecodeTree from "./generated/decode-data-html";
 import xmlDecodeTree from "./generated/decode-data-xml";
 export { htmlDecodeTree, xmlDecodeTree };
-export declare enum CharCodes {
-    NUM,
-    SEMI,
-    ZERO,
-    NINE,
-    LOWER_A,
-    UPPER_A,
-    LOWER_F,
-    UPPER_F,
-    LOWER_X,
-    UPPER_X
-}
 export declare enum BinTrieFlags {
     HAS_VALUE = 32768,
     BRANCH_LENGTH = 32512,

package/lib/decode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decode.d.ts","sourceRoot":"","sources":["../src/decode.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAC1D,OAAO,aAAa,MAAM,6BAA6B,CAAC;AAIxD,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,CAAC;AAEzC,oBAAY,SAAS;IACjB,GAAuB;IACvB,IAAwB;IACxB,IAAwB;IACxB,IAAwB;IACxB,OAA2B;IAC3B,OAA2B;IAC3B,OAA2B;IAC3B,OAA2B;IAC3B,OAA2B;IAC3B,OAA2B;CAC9B;AAED,oBAAY,YAAY;IACpB,SAAS,QAAwB;IACjC,aAAa,QAAwB;IACrC,UAAU,MAAwB;IAClC,UAAU,MAAwB;CACrC;AAED,eAAO,MAAM,gBAAgB,QAAqB,CAAC;AAoGnD,wBAAgB,eAAe,CAC3B,UAAU,EAAE,WAAW,EACvB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GACb,MAAM,CA0CR;AAKD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C"}
+{"version":3,"file":"decode.d.ts","sourceRoot":"","sources":["../src/decode.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAC1D,OAAO,aAAa,MAAM,6BAA6B,CAAC;AAIxD,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,CAAC;AAczC,oBAAY,YAAY;IACpB,SAAS,QAAwB;IACjC,aAAa,QAAwB;IACrC,UAAU,MAAwB;IAClC,UAAU,MAAwB;CACrC;AAED,eAAO,MAAM,gBAAgB,QAAqB,CAAC;AAmGnD,wBAAgB,eAAe,CAC3B,UAAU,EAAE,WAAW,EACvB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GACb,MAAM,CA0CR;AAKD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C"}

package/lib/decode.js

@@ -3,25 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeXML = exports.decodeHTMLStrict = exports.decodeHTML = exports.determineBranch = exports.JUMP_OFFSET_BASE = exports.BinTrieFlags = exports.CharCodes = exports.xmlDecodeTree = exports.htmlDecodeTree = void 0;
+exports.decodeXML = exports.decodeHTMLStrict = exports.decodeHTML = exports.determineBranch = exports.JUMP_OFFSET_BASE = exports.BinTrieFlags = exports.xmlDecodeTree = exports.htmlDecodeTree = void 0;
 var decode_data_html_1 = __importDefault(require("./generated/decode-data-html"));
 exports.htmlDecodeTree = decode_data_html_1.default;
 var decode_data_xml_1 = __importDefault(require("./generated/decode-data-xml"));
 exports.xmlDecodeTree = decode_data_xml_1.default;
 var decode_codepoint_1 = __importDefault(require("./decode_codepoint"));
-var CharCodes;
-(function (CharCodes) {
-    CharCodes[CharCodes["NUM"] = "#".charCodeAt(0)] = "NUM";
-    CharCodes[CharCodes["SEMI"] = ";".charCodeAt(0)] = "SEMI";
-    CharCodes[CharCodes["ZERO"] = "0".charCodeAt(0)] = "ZERO";
-    CharCodes[CharCodes["NINE"] = "9".charCodeAt(0)] = "NINE";
-    CharCodes[CharCodes["LOWER_A"] = "a".charCodeAt(0)] = "LOWER_A";
-    CharCodes[CharCodes["UPPER_A"] = "A".charCodeAt(0)] = "UPPER_A";
-    CharCodes[CharCodes["LOWER_F"] = "f".charCodeAt(0)] = "LOWER_F";
-    CharCodes[CharCodes["UPPER_F"] = "F".charCodeAt(0)] = "UPPER_F";
-    CharCodes[CharCodes["LOWER_X"] = "x".charCodeAt(0)] = "LOWER_X";
-    CharCodes[CharCodes["UPPER_X"] = "X".charCodeAt(0)] = "UPPER_X";
-})(CharCodes = exports.CharCodes || (exports.CharCodes = {}));
 var BinTrieFlags;
 (function (BinTrieFlags) {
     BinTrieFlags[BinTrieFlags["HAS_VALUE"] = 32768] = "HAS_VALUE";
@@ -29,7 +16,7 @@ var BinTrieFlags;
     BinTrieFlags[BinTrieFlags["MULTI_BYTE"] = 128] = "MULTI_BYTE";
     BinTrieFlags[BinTrieFlags["JUMP_TABLE"] = 127] = "JUMP_TABLE";
 })(BinTrieFlags = exports.BinTrieFlags || (exports.BinTrieFlags = {}));
-exports.JUMP_OFFSET_BASE = CharCodes.ZERO - 1;
+exports.JUMP_OFFSET_BASE = 48 /* ZERO */ - 1;
 function getDecoder(decodeTree) {
     return function decodeHTMLBinary(str, strict) {
         var ret = "";
@@ -41,27 +28,26 @@ function getDecoder(decodeTree) {
             // Skip the "&"
             strIdx += 1;
             // If we have a numeric entity, handle this separately.
-            if (str.charCodeAt(strIdx) === CharCodes.NUM) {
+            if (str.charCodeAt(strIdx) === 35 /* NUM */) {
                 // Skip the leading "&#". For hex entities, also skip the leading "x".
                 var start = strIdx + 1;
                 var base = 10;
                 var cp = str.charCodeAt(start);
-                if (cp === CharCodes.LOWER_X || cp === CharCodes.UPPER_X) {
+                if ((cp | 32 /* To_LOWER_BIT */) === 120 /* LOWER_X */) {
                     base = 16;
                     strIdx += 1;
                     start += 1;
                 }
-                while (((cp = str.charCodeAt(++strIdx)) >= CharCodes.ZERO &&
-                    cp <= CharCodes.NINE) ||
+                while (((cp = str.charCodeAt(++strIdx)) >= 48 /* ZERO */ &&
+                    cp <= 57 /* NINE */) ||
                     (base === 16 &&
-                        ((cp >= CharCodes.LOWER_A && cp <= CharCodes.LOWER_F) ||
-                            (cp >= CharCodes.UPPER_A &&
-                                cp <= CharCodes.UPPER_F))))
+                        (cp | 32 /* To_LOWER_BIT */) >= 97 /* LOWER_A */ &&
+                        (cp | 32 /* To_LOWER_BIT */) <= 102 /* LOWER_F */))
                     ;
                 if (start !== strIdx) {
                     var entity = str.substring(start, strIdx);
                     var parsed = parseInt(entity, base);
-                    if (str.charCodeAt(strIdx) === CharCodes.SEMI) {
+                    if (str.charCodeAt(strIdx) === 59 /* SEMI */) {
                         strIdx += 1;
                     }
                     else if (strict) {
@@ -84,7 +70,7 @@ function getDecoder(decodeTree) {
                 // If the branch is a value, store it and continue
                 if (current & BinTrieFlags.HAS_VALUE) {
                     // If we have a legacy entity while parsing strictly, just skip the number of bytes
-                    if (strict && str.charCodeAt(strIdx) !== CharCodes.SEMI) {
+                    if (strict && str.charCodeAt(strIdx) !== 59 /* SEMI */) {
                         // No need to consider multi-byte values, as the legacy entity is always a single byte
                         treeIdx += 1;
                     }

package/lib/encode-trie.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encode-trie.d.ts","sourceRoot":"","sources":["../src/encode-trie.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY,QAGT,MAAM,SAAS,MAAM,KAAG,MAQD,CAAC;AAIxC,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAkCpE;AAED,MAAM,WAAW,QAAQ;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;CAChC;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAmB1E"}
+{"version":3,"file":"encode-trie.d.ts","sourceRoot":"","sources":["../src/encode-trie.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,YAAY,QAGT,MAAM,SAAS,MAAM,KAAG,MAQD,CAAC;AAIxC,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAkCpE;AAED,MAAM,WAAW,QAAQ;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;CAChC;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAmB1E"}

package/lib/encode-trie.js

@@ -5,6 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTrie = exports.encodeHTMLTrieRe = exports.getCodePoint = void 0;
 var entities_json_1 = __importDefault(require("./maps/entities.json"));
+function isHighSurrugate(c) {
+    return (c & 64512 /* Mask */) === 55296 /* High */;
+}
 // For compatibility with node < 4, we wrap `codePointAt`
 exports.getCodePoint = 
 // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
@@ -12,8 +15,8 @@ String.prototype.codePointAt != null
     ? function (str, index) { return str.codePointAt(index); }
     : // http://mathiasbynens.be/notes/javascript-encoding#surrogate-formulae
         function (c, index) {
-            return (c.charCodeAt(index) & 0xd800) === 0xd800
-                ? (c.charCodeAt(index) - 0xd800) * 0x400 +
+            return isHighSurrugate(c.charCodeAt(index))
+                ? (c.charCodeAt(index) - 55296 /* High */) * 0x400 +
                     c.charCodeAt(index + 1) -
                     0xdc00 +
                     0x10000
@@ -45,7 +48,7 @@ function encodeHTMLTrieRe(regExp, str) {
         else {
             ret += str.substring(lastIdx, i) + "&#x" + exports.getCodePoint(str, i).toString(16) + ";";
             // Increase by 1 if we have a surrogate pair
-            lastIdx = regExp.lastIndex += Number((char & 0xd800) === 0xd800);
+            lastIdx = regExp.lastIndex += Number(isHighSurrugate(char));
         }
     }
     return ret + str.substr(lastIdx);

package/lib/encode.js

@@ -36,7 +36,7 @@ function encodeXML(str) {
         else {
             ret += str.substring(lastIdx, i) + "&#x" + encode_trie_1.getCodePoint(str, i).toString(16) + ";";
             // Increase by 1 if we have a surrogate pair
-            lastIdx = xmlReplacer.lastIndex += Number((char & 0xd800) === 0xd800);
+            lastIdx = xmlReplacer.lastIndex += Number((char & 65408) === 0xd800);
         }
     }
     return ret + str.substr(lastIdx);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "entities",
-    "version": "3.0.0",
+    "version": "3.0.1",
     "description": "Encode & decode XML and HTML entities with ease",
     "author": "Felix Boehm <me@feedic.com>",
     "funding": "https://github.com/fb55/entities?sponsor=1",