jscrewit 2.36.0 → 2.38.0

package/lib/jscrewit.js

@@ -1,4 +1,4 @@
-// JScrewIt 2.36.0 – https://jscrew.it
+// JScrewIt 2.38.0 – https://jscrew.it
 
 (function () {
     'use strict';
@@ -281,36 +281,35 @@
     // ~feature-hub – https://github.com/fasttime/JScrewIt/tree/master/packages/~feature-hub
 
 
-    var BIN_POW_31 = 2147483648;
-    var BIN_POW_32 = 4294967296;
-    var BIN_POW_51 = 2251799813685248;
-    var BIT_MASK_31 = 2147483647;
-    var EMPTY_MASK = 0;
+    var LO_INDEX = 0;
+    var HI_INDEX = 1;
+    var freezeMask = function (_LoHi) { return Object.freeze(_LoHi); };
+    /** An empty mask. */
+    var MASK_EMPTY = freezeMask([0, 0]);
     /** Determines whether two specified masks are equal. */
     function maskAreEqual(mask1, mask2) {
-        return mask1 === mask2;
+        var _LoHi1 = mask1;
+        var _LoHi2 = mask2;
+        return _LoHi1[LO_INDEX] === _LoHi2[LO_INDEX] && _LoHi1[HI_INDEX] === _LoHi2[HI_INDEX];
     }
     /** Determines whether a specified mask includes another one. */
     function maskIncludes(includingMask, includedMask) {
+        var includingLoHi = includingMask;
+        var includedLoHi = includedMask;
         var includedLoValue;
         var includedHiValue;
-        var returnValue = (includingMask &
-            (includedLoValue = includedMask | 0)) ===
-            includedLoValue &&
-            (includingMask / BIN_POW_32 &
-                (includedHiValue = includedMask / BIN_POW_32 | 0)) ===
-                includedHiValue;
+        var returnValue = (includedLoValue = includedLoHi[LO_INDEX]) === (includedLoValue & includingLoHi[LO_INDEX]) &&
+            (includedHiValue = includedLoHi[HI_INDEX]) === (includedHiValue & includingLoHi[HI_INDEX]);
         return returnValue;
     }
     /** Returns a new mask that is the intersection of two specified masks. */
     function maskIntersection(mask1, mask2) {
-        var intersectionMask = ((mask1 & mask2 & BIT_MASK_31) +
-            (mask1 / BIN_POW_31 & mask2 / BIN_POW_31) * BIN_POW_31);
-        return intersectionMask;
-    }
-    /** Returns a new empty mask. */
-    function maskNew() {
-        return EMPTY_MASK;
+        var _LoHi1 = mask1;
+        var _LoHi2 = mask2;
+        var intersectionLo = _LoHi1[LO_INDEX] & _LoHi2[LO_INDEX];
+        var intersectionHi = _LoHi1[HI_INDEX] & _LoHi2[HI_INDEX];
+        var intersectionLoHi = [intersectionLo, intersectionHi];
+        return freezeMask(intersectionLoHi);
     }
     /**
      * Returns a new non-empty mask that does not intersect the specified mask.
@@ -318,18 +317,24 @@
      * @throws If the specified mask is full, a `RangeError` is thrown.
      */
     function maskNext(mask) {
-        var nextValue = 1;
-        for (var checkValue = mask; checkValue & 1; checkValue /= 2)
-            nextValue *= 2;
-        if (nextValue > BIN_POW_51)
-            throw RangeError('Mask full');
-        return nextValue;
+        var _LoHi = mask;
+        var bitIndex = 0;
+        for (; _LoHi[bitIndex >> 5] & 1 << (bitIndex & 0x1F); bitIndex++) {
+            if (bitIndex === 63)
+                throw RangeError('Mask full');
+        }
+        var nextLoHi = [0, 0];
+        nextLoHi[bitIndex >> 5] = 1 << (bitIndex & 0x1F);
+        return freezeMask(nextLoHi);
     }
     /** Returns a new mask that is the union of two specified masks. */
     function maskUnion(mask1, mask2) {
-        var unionMask = (((mask1 | mask2) & BIT_MASK_31) +
-            (mask1 / BIN_POW_31 | mask2 / BIN_POW_31) * BIN_POW_31);
-        return unionMask;
+        var _LoHi1 = mask1;
+        var _LoHi2 = mask2;
+        var unionLo = _LoHi1[LO_INDEX] | _LoHi2[LO_INDEX];
+        var unionHi = _LoHi1[HI_INDEX] | _LoHi2[HI_INDEX];
+        var unionLoHi = [unionLo, unionHi];
+        return freezeMask(unionLoHi);
     }
 
     var keyFor = function (mask) { return "_".concat(mask); };
@@ -430,7 +435,7 @@
             for (var _i = 0; _i < arguments.length; _i++) {
                 features[_i] = arguments[_i];
             }
-            var mask = maskNew();
+            var mask = MASK_EMPTY;
             for (var _a = 0, features_1 = features; _a < features_1.length; _a++) {
                 var feature = features_1[_a];
                 var otherMask = validMaskFromArrayOrStringOrFeature(feature);
@@ -444,7 +449,7 @@
         }
         function _fromMask(mask) {
             if (isMaskCompatible(mask)) {
-                var includedMask = maskNew();
+                var includedMask = MASK_EMPTY;
                 for (var _i = 0, ELEMENTARY_1 = ELEMENTARY; _i < ELEMENTARY_1.length; _i++) {
                     var featureMask = ELEMENTARY_1[_i].mask;
                     if (maskIncludes(mask, featureMask))
@@ -458,7 +463,7 @@
             return null;
         }
         function _getMask(feature) {
-            var mask = feature !== undefined ? validMaskFromArrayOrStringOrFeature(feature) : maskNew();
+            var mask = feature !== undefined ? validMaskFromArrayOrStringOrFeature(feature) : MASK_EMPTY;
             return mask;
         }
         function areCompatible() {
@@ -528,7 +533,7 @@
             return description;
         }
         function featureArrayLikeToMask(features) {
-            var mask = maskNew();
+            var mask = MASK_EMPTY;
             var length = features.length;
             for (var index = 0; index < length; ++index) {
                 var feature = features[index];
@@ -608,7 +613,9 @@
         }
         var utilInspect;
         try {
+            /* eslint-disable @typescript-eslint/no-require-imports */
             utilInspect = require('util').inspect;
+            /* eslint-enable @typescript-eslint/no-require-imports */
         }
         catch (_a) { }
         {
@@ -616,7 +623,7 @@
                 get canonicalNames() {
                     var mask = this.mask;
                     var names = [];
-                    var includedMask = maskNew();
+                    var includedMask = MASK_EMPTY;
                     for (var index = PRISTINE_ELEMENTARY.length; index--;) {
                         var featureObj = PRISTINE_ELEMENTARY[index];
                         var featureMask = featureObj.mask;
@@ -719,7 +726,7 @@
                             wrappedCheck = wrapCheck(check);
                         }
                         else {
-                            mask = maskNew();
+                            mask = MASK_EMPTY;
                             wrappedCheck = null;
                         }
                         {
@@ -841,7 +848,7 @@
             var featureNames = _Object_keys(featureInfos);
             var includeSetMap = createMap();
             var familiesMap = createMap();
-            var unionMask = maskNew();
+            var unionMask = MASK_EMPTY;
             featureNames.forEach(completeFeature);
             completeExclusions();
             PRISTINE_ELEMENTARY = ELEMENTARY.slice();
@@ -864,7 +871,7 @@
         return str;
     }
     function featuresToMask(featureObjs) {
-        var mask = featureObjs.reduce(function (mask, featureObj) { return maskUnion(mask, featureObj.mask); }, maskNew());
+        var mask = featureObjs.reduce(function (mask, featureObj) { return maskUnion(mask, featureObj.mask); }, MASK_EMPTY);
         return mask;
     }
     function indent(text) {
@@ -915,21 +922,6 @@
         return returnValue;
     }
 
-    function checkSelfFeature()
-    {
-        // self + '' throws an error inside a web worker in Safari 8 and 9.
-        try
-        {
-            var str = self + '';
-        }
-        catch (error)
-        {
-            return false;
-        }
-        var available = this(str);
-        return available;
-    }
-
     function describeEngine(engine)
     {
         var description = 'Features available in ' + engine + '.';
@@ -955,6 +947,26 @@
         return returnValue;
     }
 
+    function makeSelfFeatureCheck(regExp)
+    {
+        function check()
+        {
+            // self + '' throws an error inside a web worker in Safari 8 and 9.
+            try
+            {
+                var str = self + '';
+            }
+            catch (error)
+            {
+                return false;
+            }
+            var available = regExp.test(str);
+            return available;
+        }
+
+        return check;
+    }
+
     function restrict(environment, engineFeatureObjs)
     {
         var restrictionCache = createEmpty();
@@ -1006,15 +1018,7 @@
             description:
             'Existence of the global object self whose string representation starts with "[object " ' +
             'and ends with "Window]".',
-            check:
-            checkSelfFeature.bind
-            (
-                function (str)
-                {
-                    var available = /^\[object [\S\s]*Window]$/.test(str);
-                    return available;
-                }
-            ),
+            check:      makeSelfFeatureCheck(/^\[object [\S\s]*Window]$/),
             includes:   ['SELF_OBJ'],
             attributes: { 'web-worker': 'web-worker-restriction' },
         },
@@ -1031,6 +1035,21 @@
                 return available;
             },
         },
+        ASYNC_FUNCTION:
+        {
+            description: 'Support for async functions, which return Promise object.',
+            check:
+            function ()
+            {
+                try
+                {
+                    Function('return async function(){}');
+                    return true;
+                }
+                catch (error)
+                { }
+            },
+        },
         ARROW:
         {
             description: 'Support for arrow functions.',
@@ -1080,6 +1099,23 @@
             },
             attributes: { 'web-worker': 'web-worker-restriction' },
         },
+        CALL_ON_GLOBAL:
+        {
+            description:
+            'The ability to call a function on the global object when invoking ' +
+            'Function.prototype.call without binding.',
+            check:
+            function ()
+            {
+                try
+                {
+                    if ([].concat.call()[0])
+                        return true;
+                }
+                catch (error)
+                { }
+            },
+        },
         CAPITAL_HTML:
         {
             description:
@@ -1127,7 +1163,6 @@
                 return available;
             },
             includes:   ['ANY_DOCUMENT'],
-            excludes:   ['HTMLDOCUMENT'],
             attributes: { 'web-worker': 'web-worker-restriction' },
         },
         DOMWINDOW:
@@ -1135,17 +1170,9 @@
             description:
             'Existence of the global object self having the string representation "[object ' +
             'DOMWindow]".',
-            check:
-            checkSelfFeature.bind
-            (
-                function (str)
-                {
-                    var available = str === '[object DOMWindow]';
-                    return available;
-                }
-            ),
+            check:      makeSelfFeatureCheck(/^\[object DOMWindow]$/),
             includes:   ['ANY_WINDOW'],
-            excludes:   ['WINDOW'],
+            excludes:   ['OBJECT_W_SELF'],
             attributes: { 'web-worker': 'web-worker-restriction' },
         },
         ESC_HTML_ALL:
@@ -1349,22 +1376,6 @@
             includes:   ['NO_IE_SRC'],
             attributes: { 'web-worker': 'web-worker-restriction' },
         },
-        HTMLDOCUMENT:
-        {
-            description:
-            'Existence of the global object document having the string representation "[object ' +
-            'HTMLDocument]".',
-            check:
-            function ()
-            {
-                var available =
-                typeof document === 'object' && document + '' === '[object HTMLDocument]';
-                return available;
-            },
-            includes:   ['ANY_DOCUMENT'],
-            excludes:   ['DOCUMENT'],
-            attributes: { 'web-worker': 'web-worker-restriction' },
-        },
         IE_SRC:
         {
             description:
@@ -1398,6 +1409,26 @@
                 return available;
             },
         },
+        ITERATOR_HELPER:
+        {
+            description: 'Availability of iterator helpers.',
+            check:
+            function ()
+            {
+                var available = typeof Iterator === 'function';
+                return available;
+            },
+        },
+        JAPANESE_INFINITY:
+        {
+            description: 'Japanese string representation of Infinity ending with "∞".',
+            check:
+            function ()
+            {
+                var available = /∞$/.test(Infinity.toLocaleString('ja'));
+                return available;
+            },
+        },
         LOCALE_INFINITY:
         {
             description: 'Language sensitive string representation of Infinity as "∞".',
@@ -1419,7 +1450,6 @@
             function ()
             {
                 var available =
-                Number.prototype.toLocaleString &&
                 checkLocaleNumeral('ar', NaN, /^ليس/) &&
                 checkLocaleNumeral('ar-td', 234567890.1, /^٢٣٤٬?٥٦٧٬?٨٩٠٫١/) &&
                 checkLocaleNumeral('fa', 1234567890, /^۱٬۲۳۴٬۵۶۷٬۸۹۰/);
@@ -1438,7 +1468,6 @@
             function ()
             {
                 var available =
-                Number.prototype.toLocaleString &&
                 checkLocaleNumeral('ar', NaN, /^ليس.رقم/) &&
                 checkLocaleNumeral('ar-td', 234567890.1, /^٢٣٤٬?٥٦٧٬?٨٩٠٫١/) &&
                 checkLocaleNumeral('bn', 1234567890, /^১,২৩,৪৫,৬৭,৮৯০/) &&
@@ -1464,6 +1493,18 @@
                 return available;
             },
         },
+        MOZILLA:
+        {
+            description:
+            'Existence of user agent string navigator.userAgent that starts with "Mozilla".',
+            check:
+            function ()
+            {
+                var available =
+                typeof navigator === 'object' && /^Mozilla/.test(navigator.userAgent);
+                return available;
+            },
+        },
         NAME:
         {
             description: 'Existence of the name property for functions.',
@@ -1585,18 +1626,15 @@
             },
             includes: ['UNDEFINED'],
         },
-        OBJECT_W_CTOR:
+        OBJECT_W_SELF:
         {
             description:
-            'The property that the string representation of the global object constructor starts ' +
+            'The property that the string representation of the global object self starts ' +
             'with "[object W".',
-            check:
-            function ()
-            {
-                var available = /^\[object W/.test(constructor);
-                return available;
-            },
-            attributes: { 'web-worker': 'old-safari-restriction' },
+            check:      makeSelfFeatureCheck(/^\[object W/),
+            includes:   ['SELF_OBJ'],
+            excludes:   ['DOMWINDOW'],
+            attributes: { 'web-worker': 'non-ie-restriction' },
         },
         OLD_SAFARI_LOCATION_CTOR:
         {
@@ -1643,15 +1681,7 @@
         {
             description:
             'Existence of the global object self whose string representation starts with "[object ".',
-            check:
-            checkSelfFeature.bind
-            (
-                function (str)
-                {
-                    var available = /^\[object /.test(str);
-                    return available;
-                }
-            ),
+            check:      makeSelfFeatureCheck(/^\[object /),
             attributes: { 'web-worker': 'safari-bug-21820506' },
         },
         SHORT_LOCALES:
@@ -1709,17 +1739,8 @@
         {
             description:
             'Existence of the global object self having the string representation "[object Window]".',
-            check:
-            checkSelfFeature.bind
-            (
-                function (str)
-                {
-                    var available = str === '[object Window]';
-                    return available;
-                }
-            ),
-            includes:   ['ANY_WINDOW'],
-            excludes:   ['DOMWINDOW'],
+            check:      makeSelfFeatureCheck(/^\[object Window]$/),
+            includes:   ['ANY_WINDOW', 'OBJECT_W_SELF'],
             attributes: { 'web-worker': 'web-worker-restriction' },
         },
 
@@ -1733,7 +1754,7 @@
             description:
             'Features available in all browsers.\n' +
             'No support for Node.js.',
-            includes: ['ANY_DOCUMENT', 'ANY_WINDOW', 'HISTORY', 'INCR_CHAR', 'STATUS'],
+            includes: ['ANY_DOCUMENT', 'ANY_WINDOW', 'HISTORY', 'INCR_CHAR', 'MOZILLA', 'STATUS'],
             attributes:
             {
                 'char-increment-restriction':   null,
@@ -1745,11 +1766,13 @@
         {
             description:
             'All new browsers\' features.\n' +
-            'No support for Node.js and older browsers like Internet Explorer, Safari 9 or Android ' +
-            'Browser.',
+            'No support for Node.js and older browsers like Internet Explorer, Safari 17.3 or ' +
+            'Android Browser.',
             includes:
             [
+                'ANY_DOCUMENT',
                 'ARROW',
+                'ASYNC_FUNCTION',
                 'AT',
                 'ATOB',
                 'BARPROP',
@@ -1764,12 +1787,13 @@
                 'GLOBAL_UNDEFINED',
                 'GMT',
                 'HISTORY',
-                'HTMLDOCUMENT',
                 'INCR_CHAR',
                 'INTL',
+                'JAPANESE_INFINITY',
                 'LOCALE_INFINITY',
                 'LOCALE_NUMERALS_EXT',
                 'LOCATION',
+                'MOZILLA',
                 'NAME',
                 'NO_IE_SRC',
                 'NO_OLD_SAFARI_ARRAY_ITERATOR',
@@ -1777,7 +1801,12 @@
                 'STATUS',
                 'WINDOW',
             ],
-            attributes: { 'char-increment-restriction': null, 'web-worker-restriction': null },
+            attributes:
+            {
+                'char-increment-restriction':   null,
+                'non-ie-restriction':           null,
+                'web-worker-restriction':       null,
+            },
         },
         ANDRO_4_0:
         {
@@ -1785,16 +1814,18 @@
             versions: ['4.0'],
             includes:
             [
+                'ANY_DOCUMENT',
                 'ATOB',
+                'CALL_ON_GLOBAL',
                 'CONSOLE',
                 'DOMWINDOW',
                 'ESC_HTML_ALL',
                 'FUNCTION_22_LF',
                 'GMT',
                 'HISTORY',
-                'HTMLDOCUMENT',
                 'INCR_CHAR',
                 'LOCATION',
+                'MOZILLA',
                 'NAME',
                 'STATUS',
                 'V8_SRC',
@@ -1804,7 +1835,7 @@
         {
             inherits: 'ANDRO_4_0',
             versions: [['4.1',, '4.3']],
-            includes: { GENERIC_ARRAY_TO_STRING: true, OBJECT_UNDEFINED: true },
+            includes: { CALL_ON_GLOBAL: false, GENERIC_ARRAY_TO_STRING: true, OBJECT_UNDEFINED: true },
         },
         ANDRO_4_4:
         {
@@ -1815,13 +1846,19 @@
                 BARPROP:                true,
                 DOMWINDOW:              false,
                 HTMLAUDIOELEMENT:       true,
+                JAPANESE_INFINITY:      true,
                 LOCALE_INFINITY:        true,
                 LOCALE_NUMERALS_EXT:    true,
                 PLAIN_INTL:             true,
                 SHORT_LOCALES:          true,
                 WINDOW:                 true,
             },
-            attributes: { 'no-console-in-web-worker': null, 'web-worker-restriction': null },
+            attributes:
+            {
+                'no-console-in-web-worker': null,
+                'non-ie-restriction':       null,
+                'web-worker-restriction':   null,
+            },
         },
         CHROME_PREV:
         {
@@ -1839,7 +1876,9 @@
             versions: [['122'], ['122'], ['108']],
             includes:
             [
+                'ANY_DOCUMENT',
                 'ARROW',
+                'ASYNC_FUNCTION',
                 'AT',
                 'ATOB',
                 'BARPROP',
@@ -1854,12 +1893,14 @@
                 'GLOBAL_UNDEFINED',
                 'GMT',
                 'HISTORY',
-                'HTMLDOCUMENT',
                 'INCR_CHAR',
                 'INTL',
+                'ITERATOR_HELPER',
+                'JAPANESE_INFINITY',
                 'LOCALE_INFINITY',
                 'LOCALE_NUMERALS_EXT',
                 'LOCATION',
+                'MOZILLA',
                 'NAME',
                 'NO_OLD_SAFARI_ARRAY_ITERATOR',
                 'REGEXP_STRING_ITERATOR',
@@ -1868,7 +1909,12 @@
                 'WINDOW',
             ],
             attributes:
-            { 'char-increment-restriction': null, 'unstable': null, 'web-worker-restriction': null },
+            {
+                'char-increment-restriction':   null,
+                'non-ie-restriction':           null,
+                'unstable':                     null,
+                'web-worker-restriction':       null,
+            },
         },
         FF_ESR:
         {
@@ -1883,15 +1929,17 @@
         FF:
         {
             description:    describeEngine('the current stable version of Firefox'),
-            aliasFor:       'FF_90',
+            aliasFor:       'FF_131',
         },
         FF_90:
         {
             families: ['Firefox'],
-            versions: [['90']],
+            versions: [['90',, '130']],
             includes:
             [
+                'ANY_DOCUMENT',
                 'ARROW',
+                'ASYNC_FUNCTION',
                 'AT',
                 'ATOB',
                 'BARPROP',
@@ -1907,12 +1955,13 @@
                 'GLOBAL_UNDEFINED',
                 'GMT',
                 'HISTORY',
-                'HTMLDOCUMENT',
                 'INCR_CHAR',
                 'INTL',
+                'JAPANESE_INFINITY',
                 'LOCALE_INFINITY',
                 'LOCALE_NUMERALS_EXT',
                 'LOCATION',
+                'MOZILLA',
                 'NAME',
                 'NO_OLD_SAFARI_ARRAY_ITERATOR',
                 'OBJECT_ARRAY_ENTRIES_CTOR',
@@ -1922,7 +1971,18 @@
                 'WINDOW',
             ],
             attributes:
-            { 'char-increment-restriction': null, 'unstable': null, 'web-worker-restriction': null },
+            {
+                'char-increment-restriction':   null,
+                'non-ie-restriction':           null,
+                'unstable':                     null,
+                'web-worker-restriction':       null,
+            },
+        },
+        FF_131:
+        {
+            inherits:   'FF_90',
+            versions:   [['131']],
+            includes:   { ITERATOR_HELPER: true, OBJECT_ARRAY_ENTRIES_CTOR: false },
         },
         IE_9:
         {
@@ -1939,8 +1999,8 @@
                 'HISTORY',
                 'IE_SRC',
                 'INCR_CHAR',
+                'MOZILLA',
                 'OBJECT_L_LOCATION_CTOR',
-                'OBJECT_W_CTOR',
                 'STATUS',
                 'UNDEFINED',
                 'WINDOW',
@@ -1959,9 +2019,10 @@
             versions: ['11'],
             includes:
             {
+                ANY_DOCUMENT:       true,
                 DOCUMENT:           false,
                 GMT:                true,
-                HTMLDOCUMENT:       true,
+                JAPANESE_INFINITY:  true,
                 LOCALE_NUMERALS:    true,
                 PLAIN_INTL:         true,
                 SHORT_LOCALES:      true,
@@ -2000,6 +2061,7 @@
             {
                 ESC_HTML_ALL:                   false,
                 ESC_HTML_QUOT_ONLY:             true,
+                JAPANESE_INFINITY:              true,
                 LOCALE_INFINITY:                true,
                 NO_OLD_SAFARI_ARRAY_ITERATOR:   true,
                 OBJECT_ARRAY_ENTRIES_CTOR:      true,
@@ -2015,12 +2077,18 @@
         NODE_5:
         {
             inherits:   'NODE_4',
-            versions:   [['5',, '9']],
+            versions:   [['5',, '7.5']],
             attributes: { 'char-increment-restriction': null },
         },
-        NODE_10:
+        NODE_7_6:
         {
             inherits: 'NODE_5',
+            versions: [['7.6',, '9']],
+            includes: { ASYNC_FUNCTION: true },
+        },
+        NODE_10:
+        {
+            inherits: 'NODE_7_6',
             versions: ['10'],
             includes: { FUNCTION_19_LF: true, FUNCTION_22_LF: false },
         },
@@ -2057,15 +2125,22 @@
         NODE_16_6:
         {
             inherits: 'NODE_16_0',
-            versions: [['16.6']],
+            versions: [['16.6',, '21']],
             includes: { AT: true },
         },
+        NODE_22:
+        {
+            inherits: 'NODE_16_6',
+            versions: [['22']],
+            includes: { ITERATOR_HELPER: true, OBJECT_ARRAY_ENTRIES_CTOR: false },
+        },
         SAFARI_7_0:
         {
             families: ['Safari'],
             versions: ['7.0'],
             includes:
             [
+                'ANY_DOCUMENT',
                 'ATOB',
                 'BARPROP',
                 'CONSOLE',
@@ -2077,13 +2152,12 @@
                 'GLOBAL_UNDEFINED',
                 'GMT',
                 'HISTORY',
-                'HTMLDOCUMENT',
                 'INCR_CHAR',
                 'LOCATION',
+                'MOZILLA',
                 'NAME',
                 'NODECONSTRUCTOR',
                 'OBJECT_L_LOCATION_CTOR',
-                'OBJECT_W_CTOR',
                 'OLD_SAFARI_LOCATION_CTOR',
                 'STATUS',
                 'WINDOW',
@@ -2092,6 +2166,7 @@
             {
                 'char-increment-restriction':   null,
                 'no-console-in-web-worker':     null,
+                'non-ie-restriction':           null,
                 'old-safari-restriction':       null,
                 'web-worker-restriction':       null,
             },
@@ -2116,27 +2191,33 @@
                 OBJECT_ARRAY_ENTRIES_CTOR:      true,
             },
         },
-        SAFARI_10:
+        SAFARI_10_0:
         {
             inherits:   'SAFARI_9',
-            versions:   [['10', '11']],
+            versions:   ['10.0'],
             includes:
             {
                 ARROW:                      true,
+                JAPANESE_INFINITY:          true,
                 LOCALE_INFINITY:            true,
                 LOCALE_NUMERALS_EXT:        true,
                 NODECONSTRUCTOR:            false,
                 OBJECT_L_LOCATION_CTOR:     false,
-                OBJECT_W_CTOR:              false,
                 OLD_SAFARI_LOCATION_CTOR:   false,
                 PLAIN_INTL:                 true,
                 SHORT_LOCALES:              true,
             },
             attributes: { 'old-safari-restriction': undefined, 'safari-bug-21820506': undefined },
         },
+        SAFARI_10_1:
+        {
+            inherits: 'SAFARI_10_0',
+            versions: [['10.1', '11']],
+            includes: { ASYNC_FUNCTION: true },
+        },
         SAFARI_12:
         {
-            inherits: 'SAFARI_10',
+            inherits: 'SAFARI_10_1',
             versions: ['12'],
             includes: { FLAT: true },
         },
@@ -2164,16 +2245,22 @@
             versions: [['15.4',, '17.3']],
             includes: { AT: true },
         },
+        SAFARI_17_4:
+        {
+            inherits: 'SAFARI_15_4',
+            versions: [['17.4',, '17.6']],
+            includes: { FUNCTION_19_LF: true, FUNCTION_22_LF: false },
+        },
         SAFARI:
         {
             description:    describeEngine('the current stable version of Safari'),
-            aliasFor:       'SAFARI_17_4',
+            aliasFor:       'SAFARI_18',
         },
-        SAFARI_17_4:
+        SAFARI_18:
         {
-            inherits: 'SAFARI_15_4',
-            versions: [['17.4']],
-            includes: { FUNCTION_19_LF: true, FUNCTION_22_LF: false },
+            inherits: 'SAFARI_17_4',
+            versions: [['18']],
+            includes: { SHORT_LOCALES: false },
         },
     };
     (function ()
@@ -3091,9 +3178,11 @@
         var ANY_WINDOW                      = Feature.ANY_WINDOW;
         var ARRAY_ITERATOR                  = Feature.ARRAY_ITERATOR;
         var ARROW                           = Feature.ARROW;
+        var ASYNC_FUNCTION                  = Feature.ASYNC_FUNCTION;
         var AT                              = Feature.AT;
         var ATOB                            = Feature.ATOB;
         var BARPROP                         = Feature.BARPROP;
+        var CALL_ON_GLOBAL                  = Feature.CALL_ON_GLOBAL;
         var CAPITAL_HTML                    = Feature.CAPITAL_HTML;
         var CONSOLE                         = Feature.CONSOLE;
         var DOCUMENT                        = Feature.DOCUMENT;
@@ -3114,14 +3203,16 @@
         var GMT                             = Feature.GMT;
         var HISTORY                         = Feature.HISTORY;
         var HTMLAUDIOELEMENT                = Feature.HTMLAUDIOELEMENT;
-        var HTMLDOCUMENT                    = Feature.HTMLDOCUMENT;
         var IE_SRC                          = Feature.IE_SRC;
         var INCR_CHAR                       = Feature.INCR_CHAR;
         var INTL                            = Feature.INTL;
+        var ITERATOR_HELPER                 = Feature.ITERATOR_HELPER;
+        var JAPANESE_INFINITY               = Feature.JAPANESE_INFINITY;
         var LOCALE_INFINITY                 = Feature.LOCALE_INFINITY;
         var LOCALE_NUMERALS                 = Feature.LOCALE_NUMERALS;
         var LOCALE_NUMERALS_EXT             = Feature.LOCALE_NUMERALS_EXT;
         var LOCATION                        = Feature.LOCATION;
+        var MOZILLA                         = Feature.MOZILLA;
         var NAME                            = Feature.NAME;
         var NODECONSTRUCTOR                 = Feature.NODECONSTRUCTOR;
         var NO_FF_SRC                       = Feature.NO_FF_SRC;
@@ -3131,7 +3222,7 @@
         var OBJECT_ARRAY_ENTRIES_CTOR       = Feature.OBJECT_ARRAY_ENTRIES_CTOR;
         var OBJECT_L_LOCATION_CTOR          = Feature.OBJECT_L_LOCATION_CTOR;
         var OBJECT_UNDEFINED                = Feature.OBJECT_UNDEFINED;
-        var OBJECT_W_CTOR                   = Feature.OBJECT_W_CTOR;
+        var OBJECT_W_SELF                   = Feature.OBJECT_W_SELF;
         var OLD_SAFARI_LOCATION_CTOR        = Feature.OLD_SAFARI_LOCATION_CTOR;
         var PLAIN_INTL                      = Feature.PLAIN_INTL;
         var REGEXP_STRING_ITERATOR          = Feature.REGEXP_STRING_ITERATOR;
@@ -3313,12 +3404,29 @@
 
         BASE64_ALPHABET_HI_4 =
         [
-            [define('A'), define('C', CAPITAL_HTML), define('A', ARRAY_ITERATOR)],
-            'F',
+            [
+                define('A'),
+                define('D', CALL_ON_GLOBAL, DOMWINDOW),
+                define('C', CAPITAL_HTML),
+                define('A', ARRAY_ITERATOR, CAPITAL_HTML),
+                define('A', ARRAY_ITERATOR, CALL_ON_GLOBAL, DOMWINDOW),
+            ],
+            [
+                define('F'),
+                define('H', ITERATOR_HELPER),
+                define('F', AT, CAPITAL_HTML, IE_SRC),
+                define('F', AT, CAPITAL_HTML, NO_IE_SRC),
+            ],
             'Infinity',
             'NaNfalse',
             [define('S'), define('R', CAPITAL_HTML), define('S', ARRAY_ITERATOR)],
-            [define('W'), define('U', CAPITAL_HTML)],
+            [
+                define('W'),
+                define('U', CAPITAL_HTML),
+                define('W', CALL_ON_GLOBAL, DOMWINDOW),
+                define('W', CALL_ON_GLOBAL, OBJECT_W_SELF),
+                define('U', ARRAY_ITERATOR, CAPITAL_HTML),
+            ],
             'a',
             'false',
             'i',
@@ -3603,7 +3711,6 @@
                 ('escape((NaN + [+("10" + [(RP_6_S + FILL)[40]] + "000")] + FILL)[40])[2]', FILL),
                 define // *
                 ('escape((NaN + [+("10" + [(RP_6_S + FLAT)[40]] + "000")] + FLAT)[40])[2]', FLAT),
-                define('(RP_0_S + document)[12]', HTMLDOCUMENT),
                 define('escape(ARRAY_ITERATOR)[30]', NO_OLD_SAFARI_ARRAY_ITERATOR),
                 define('escape(FILTER)[50]', V8_SRC),
                 define('(document + [RP_1_WA]).at("-10")', ANY_DOCUMENT, AT),
@@ -3641,7 +3748,8 @@
                 define
                 ({ expr: '(RP_3_WA + Function("return history")())[11]', optimize: true }, HISTORY),
                 define('(RP_1_WA + Audio)[10]', HTMLAUDIOELEMENT),
-                define('(RP_3_WA + document)[11]', HTMLDOCUMENT),
+                define('(RP_4_A + [].entries().filter(ANY_FUNCTION))[21]', ITERATOR_HELPER),
+                define({ expr: '(RP_3_WA + self.history)[11]', optimize: true }, HISTORY, SELF_OBJ),
             ],
             'I': '"Infinity"[0]',
             'J':
@@ -3661,7 +3769,6 @@
                 define('btoa(".")[0]', ATOB),
                 define('(RP_3_WA + "".fontcolor())[11]', CAPITAL_HTML),
                 define('(RP_0_S + Audio)[12]', HTMLAUDIOELEMENT),
-                define('(RP_0_S + document)[11]', HTMLDOCUMENT),
                 define
                 (
                     {
@@ -3695,12 +3802,15 @@
                     LOCATION
                 ),
                 define
+                ('self[TO_STRING].call(location)[SLICE_OR_SUBSTR]("-10")[1]', LOCATION, SELF_OBJ),
+                define
                 (
                     '([][TO_STRING].call(location) + RP_1_WA).at("-10")',
                     AT,
                     GENERIC_ARRAY_TO_STRING,
                     LOCATION
                 ),
+                define('(self[TO_STRING].call(location) + RP_1_WA).at("-10")', AT, LOCATION, SELF_OBJ),
             ],
             'M':
             [
@@ -3710,7 +3820,7 @@
                 define('(RP_0_S + self)[10]', DOMWINDOW),
                 define('(RP_4_A + Date())[30]', GMT),
                 define('(RP_0_S + Audio)[11]', HTMLAUDIOELEMENT),
-                define('(RP_0_S + document)[10]', HTMLDOCUMENT),
+                define('USER_AGENT[0]', MOZILLA),
             ],
             'N': '"NaN"[0]',
             'O':
@@ -3725,10 +3835,12 @@
             'P':
             [
                 define('String.fromCharCode("80")'),
+                define('(RP_3_WA + Function("return async function(){}")()())[11]', ASYNC_FUNCTION),
                 define('atob("01A")[1]', ATOB),
                 define('btoa("".italics())[0]', ATOB),
                 define('(RP_0_S + Function("return statusbar")())[11]', BARPROP),
                 define('"0".sup()[10]', CAPITAL_HTML),
+                define('(RP_0_S + self.statusbar)[11]', BARPROP, SELF_OBJ),
                 defineCharDefault({ atob: false, charCode: false }),
             ],
             'Q':
@@ -3764,7 +3876,6 @@
                 define('"".fontcolor([])[20]', CAPITAL_HTML),
                 define('(RP_3_WA + Date())[30]', GMT),
                 define('(RP_0_S + Audio)[10]', HTMLAUDIOELEMENT),
-                define('(RP_1_WA + document)[10]', HTMLDOCUMENT),
                 defineCharDefault({ atob: false }),
             ],
             'U':
@@ -3804,8 +3915,7 @@
                 define('(self + RP_4_A)[SLICE_OR_SUBSTR]("-11")[0]', ANY_WINDOW),
                 define('btoa(undefined)[1]', ATOB),
                 define('(RP_0_S + self)[11]', DOMWINDOW),
-                define('(RP_3_WA + Function("return constructor")())[11]', OBJECT_W_CTOR),
-                define('(RP_3_WA + self)[11]', WINDOW),
+                define('(RP_3_WA + self)[11]', OBJECT_W_SELF),
                 define('(self + RP_4_A).at("-11")', ANY_WINDOW, AT),
                 defineCharDefault({ atob: false }),
             ],
@@ -3901,6 +4011,7 @@
             [
                 define('211[TO_STRING]("31")[1]'),
                 define('(RP_3_WA + btoa(undefined))[10]', ATOB),
+                define('(RP_0_S + [].entries().filter(ANY_FUNCTION))[20]', ITERATOR_HELPER),
             ],
             'q':
             [
@@ -4033,6 +4144,8 @@
             '∞':
             [
                 define('Infinity[TO_LOCALE_STRING]()', LOCALE_INFINITY),
+                define('Infinity[TO_LOCALE_STRING]("ja")[SLICE_OR_SUBSTR]("-1")', JAPANESE_INFINITY),
+                define('Infinity[TO_LOCALE_STRING]("ja").at("-1")', JAPANESE_INFINITY, AT),
                 defineCharDefault(),
             ],
         });
@@ -4061,6 +4174,7 @@
             Audio:
             [
                 define('Function("return Audio")()', HTMLAUDIOELEMENT),
+                define('self.Audio', HTMLAUDIOELEMENT, SELF_OBJ),
             ],
             Boolean:
             [
@@ -4069,6 +4183,7 @@
             Date:
             [
                 define('Function("return Date")()'),
+                define('self.Date', SELF_OBJ),
             ],
             Function:
             [
@@ -4077,10 +4192,12 @@
             Intl:
             [
                 define('Function("return Intl")()', INTL),
+                define('self.Intl', INTL, SELF_OBJ),
             ],
             Node:
             [
                 define('Function("return Node")()', NODECONSTRUCTOR),
+                define('self.Node', NODECONSTRUCTOR, SELF_OBJ),
             ],
             Number:
             [
@@ -4103,30 +4220,37 @@
             atob:
             [
                 define('Function("return atob")()', ATOB),
+                define('self.atob', ATOB, SELF_OBJ),
             ],
             btoa:
             [
                 define('Function("return btoa")()', ATOB),
+                define('self.btoa', ATOB, SELF_OBJ),
             ],
             document:
             [
                 define({ expr: 'Function("return document")()', optimize: true }, ANY_DOCUMENT),
+                define({ expr: 'self.document', optimize: true }, ANY_DOCUMENT, SELF_OBJ),
             ],
             escape:
             [
                 define({ expr: 'Function("return escape")()', optimize: true }),
+                define({ expr: 'self.escape', optimize: true }, SELF_OBJ),
             ],
             location:
             [
                 define('Function("return location")()', LOCATION),
+                define('self.location', LOCATION, SELF_OBJ),
             ],
             self:
             [
                 define('Function("return self")()', SELF_OBJ),
+                define('[].concat.call()[0]', CALL_ON_GLOBAL, SELF_OBJ),
             ],
             unescape:
             [
                 define({ expr: 'Function("return unescape")()', optimize: true }),
+                define({ expr: 'self.unescape', optimize: true }, SELF_OBJ),
             ],
 
             // Custom definitions
@@ -4275,6 +4399,8 @@
             [
                 define('Function("return location")().constructor', OBJECT_L_LOCATION_CTOR),
                 define('Function("return location")().constructor', OLD_SAFARI_LOCATION_CTOR),
+                define('self.location.constructor', OBJECT_L_LOCATION_CTOR, SELF_OBJ),
+                define('self.location.constructor', OLD_SAFARI_LOCATION_CTOR, SELF_OBJ),
             ],
             PLAIN_OBJECT:
             [
@@ -4321,6 +4447,23 @@
                 define
                 ({ expr: '"toUpperCase"', optimize: true, solutionType: SolutionType.COMBINED_STRING }),
             ],
+            USER_AGENT:
+            [
+                define
+                (
+                    {
+                        expr:           'Function("return navigator")().userAgent',
+                        solutionType:   SolutionType.STRING,
+                    },
+                    MOZILLA
+                ),
+                define
+                (
+                    { expr: 'self.navigator.userAgent', solutionType: SolutionType.STRING },
+                    MOZILLA,
+                    SELF_OBJ
+                ),
+            ],
 
             // Function body extra padding blocks: prepended to a function to align the function's body
             // at the same position in different engines, assuming that the function header is aligned.
@@ -4545,10 +4688,558 @@
             [define('fromCharCode'), define('fromCodePoint', FROM_CODE_POINT)],
             [
                 define(0),
+                define(1, ASYNC_FUNCTION),
                 define(1, ATOB),
-                define(1, BARPROP),
+                define
+                (
+                    0,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FROM_CODE_POINT,
+                    INCR_CHAR,
+                    NAME,
+                    NODECONSTRUCTOR,
+                    SELF_OBJ
+                ),
+                define(1, ASYNC_FUNCTION, NO_FF_SRC),
+                define(1, ASYNC_FUNCTION, NO_V8_SRC),
+                define(0, ARRAY_ITERATOR, ASYNC_FUNCTION, FROM_CODE_POINT, NAME),
+                define(1, ARRAY_ITERATOR, ASYNC_FUNCTION, AT, NAME),
+                define(1, ARRAY_ITERATOR, ASYNC_FUNCTION, FILL, NAME),
+                define(1, ARRAY_ITERATOR, ASYNC_FUNCTION, FLAT, NAME),
+                define(1, ARRAY_ITERATOR, ASYNC_FUNCTION, NAME, NO_IE_SRC),
+                define(1, ARRAY_ITERATOR, ASYNC_FUNCTION, NAME, NO_V8_SRC),
+                define(0, ARRAY_ITERATOR, ATOB, FROM_CODE_POINT, IE_SRC, ITERATOR_HELPER),
+                define
+                (
+                    0,
+                    ASYNC_FUNCTION,
+                    AT,
+                    CALL_ON_GLOBAL,
+                    FROM_CODE_POINT,
+                    NAME,
+                    NODECONSTRUCTOR,
+                    SELF_OBJ
+                ),
+                define(1, ARRAY_ITERATOR, AT, ATOB, IE_SRC, ITERATOR_HELPER),
+                define
+                (
+                    0,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FLAT,
+                    FROM_CODE_POINT,
+                    NAME,
+                    NODECONSTRUCTOR,
+                    SELF_OBJ
+                ),
+                define
+                (1, ASYNC_FUNCTION, AT, CALL_ON_GLOBAL, NAME, NODECONSTRUCTOR, NO_FF_SRC, SELF_OBJ),
+                define
+                (1, ASYNC_FUNCTION, AT, CALL_ON_GLOBAL, NAME, NODECONSTRUCTOR, NO_V8_SRC, SELF_OBJ),
+                define
+                (1, ASYNC_FUNCTION, CALL_ON_GLOBAL, FLAT, NAME, NODECONSTRUCTOR, NO_FF_SRC, SELF_OBJ),
+                define
+                (1, ASYNC_FUNCTION, CALL_ON_GLOBAL, FLAT, NAME, NODECONSTRUCTOR, NO_V8_SRC, SELF_OBJ),
+                define(0, ATOB, FROM_CODE_POINT, INTL, ITERATOR_HELPER),
+                define(1, ATOB, FILL, INTL, ITERATOR_HELPER),
+                define(1, ATOB, IE_SRC, INTL, ITERATOR_HELPER),
+                define(1, ATOB, INTL, ITERATOR_HELPER, NO_IE_SRC),
+                define
+                (0, ASYNC_FUNCTION, CALL_ON_GLOBAL, FROM_CODE_POINT, IE_SRC, NODECONSTRUCTOR, SELF_OBJ),
+                define(1, ASYNC_FUNCTION, AT, CALL_ON_GLOBAL, IE_SRC, NODECONSTRUCTOR, SELF_OBJ),
+                define(1, ASYNC_FUNCTION, CALL_ON_GLOBAL, FILL, IE_SRC, NODECONSTRUCTOR, SELF_OBJ),
+                define(1, ASYNC_FUNCTION, CALL_ON_GLOBAL, FLAT, IE_SRC, NODECONSTRUCTOR, SELF_OBJ),
+                define(0, ARRAY_ITERATOR, ATOB, FROM_CODE_POINT, ITERATOR_HELPER, NO_IE_SRC),
+                define
+                (
+                    0,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FLAT,
+                    FROM_CODE_POINT,
+                    IE_SRC,
+                    NAME,
+                    NODECONSTRUCTOR,
+                    SELF_OBJ
+                ),
+                define(1, ARRAY_ITERATOR, AT, ATOB, ITERATOR_HELPER, NO_IE_SRC),
+                define
+                (
+                    0,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FILL,
+                    FROM_CODE_POINT,
+                    NAME,
+                    NODECONSTRUCTOR,
+                    SELF_OBJ
+                ),
+                define
+                (1, ASYNC_FUNCTION, CALL_ON_GLOBAL, FILL, NAME, NODECONSTRUCTOR, NO_FF_SRC, SELF_OBJ),
+                define
+                (1, ASYNC_FUNCTION, CALL_ON_GLOBAL, FILL, NAME, NODECONSTRUCTOR, NO_V8_SRC, SELF_OBJ),
+                define
+                (
+                    0,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FILL,
+                    FROM_CODE_POINT,
+                    IE_SRC,
+                    NAME,
+                    NODECONSTRUCTOR,
+                    SELF_OBJ
+                ),
+                define(1, AT, ATOB, INTL, ITERATOR_HELPER),
+                define(0, ATOB, FROM_CODE_POINT, ITERATOR_HELPER, SELF_OBJ),
+                define(1, ARRAY_ITERATOR, ATOB, ITERATOR_HELPER, SELF_OBJ),
+                define(1, ATOB, FILL, ITERATOR_HELPER, SELF_OBJ),
+                define(1, ATOB, FLAT, INTL, ITERATOR_HELPER),
+                define(1, ATOB, FLAT, ITERATOR_HELPER, SELF_OBJ),
+                define
+                (
+                    0,
+                    ARRAY_ITERATOR,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FROM_CODE_POINT,
+                    NODECONSTRUCTOR,
+                    SELF_OBJ
+                ),
+                define
+                (1, ARRAY_ITERATOR, ASYNC_FUNCTION, AT, CALL_ON_GLOBAL, NODECONSTRUCTOR, SELF_OBJ),
+                define
+                (1, ARRAY_ITERATOR, ASYNC_FUNCTION, CALL_ON_GLOBAL, FLAT, NODECONSTRUCTOR, SELF_OBJ),
+                define
+                (
+                    1,
+                    ARRAY_ITERATOR,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FILL,
+                    INCR_CHAR,
+                    NODECONSTRUCTOR,
+                    SELF_OBJ
+                ),
+                define
+                (
+                    1,
+                    ARRAY_ITERATOR,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FILL,
+                    NODECONSTRUCTOR,
+                    NO_FF_SRC,
+                    SELF_OBJ
+                ),
+                define
+                (
+                    0,
+                    ARRAY_ITERATOR,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FROM_CODE_POINT,
+                    NAME,
+                    NODECONSTRUCTOR,
+                    SELF_OBJ
+                ),
+                define
+                (
+                    1,
+                    ARRAY_ITERATOR,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FLAT,
+                    NAME,
+                    NODECONSTRUCTOR,
+                    NO_FF_SRC,
+                    SELF_OBJ
+                ),
+                define
+                (
+                    1,
+                    ARRAY_ITERATOR,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FLAT,
+                    NAME,
+                    NODECONSTRUCTOR,
+                    NO_V8_SRC,
+                    SELF_OBJ
+                ),
+                define
+                (
+                    0,
+                    ARRAY_ITERATOR,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FLAT,
+                    FROM_CODE_POINT,
+                    IE_SRC,
+                    NAME,
+                    NODECONSTRUCTOR,
+                    SELF_OBJ
+                ),
+                define
+                (
+                    1,
+                    ARRAY_ITERATOR,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FILL,
+                    NODECONSTRUCTOR,
+                    NO_V8_SRC,
+                    SELF_OBJ
+                ),
+                define
+                (
+                    0,
+                    ARRAY_ITERATOR,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FILL,
+                    FROM_CODE_POINT,
+                    IE_SRC,
+                    NAME,
+                    NODECONSTRUCTOR,
+                    SELF_OBJ
+                ),
+                define
+                (
+                    1,
+                    ARRAY_ITERATOR,
+                    ASYNC_FUNCTION,
+                    AT,
+                    CALL_ON_GLOBAL,
+                    NAME,
+                    NODECONSTRUCTOR,
+                    NO_FF_SRC,
+                    SELF_OBJ
+                ),
+                define
+                (
+                    1,
+                    ARRAY_ITERATOR,
+                    ASYNC_FUNCTION,
+                    AT,
+                    CALL_ON_GLOBAL,
+                    NAME,
+                    NODECONSTRUCTOR,
+                    NO_V8_SRC,
+                    SELF_OBJ
+                ),
+                define(0, ASYNC_FUNCTION, FROM_CODE_POINT, ITERATOR_HELPER),
+                define(1, ASYNC_FUNCTION, FLAT, ITERATOR_HELPER),
+                define(1, ASYNC_FUNCTION, ITERATOR_HELPER, NO_V8_SRC),
+                define(0, ASYNC_FUNCTION, FROM_CODE_POINT, INTL, ITERATOR_HELPER),
+                define(1, ASYNC_FUNCTION, IE_SRC, INTL, ITERATOR_HELPER),
+                define(1, ASYNC_FUNCTION, FLAT, INTL, ITERATOR_HELPER, NO_V8_SRC),
+                define(0, ASYNC_FUNCTION, FROM_CODE_POINT, ITERATOR_HELPER, NODECONSTRUCTOR, NO_V8_SRC),
+                define(1, ASYNC_FUNCTION, FILL, ITERATOR_HELPER, NODECONSTRUCTOR, NO_V8_SRC),
+                define
+                (0, ASYNC_FUNCTION, FROM_CODE_POINT, INTL, ITERATOR_HELPER, NODECONSTRUCTOR, NO_V8_SRC),
+                define(1, ASYNC_FUNCTION, IE_SRC, ITERATOR_HELPER, NODECONSTRUCTOR),
+                define(1, ASYNC_FUNCTION, FLAT, ITERATOR_HELPER, NODECONSTRUCTOR, NO_V8_SRC),
+                define(0, ASYNC_FUNCTION, FLAT, FROM_CODE_POINT, ITERATOR_HELPER, SELF_OBJ),
+                define(0, ASYNC_FUNCTION, FROM_CODE_POINT, ITERATOR_HELPER, NO_V8_SRC, SELF_OBJ),
+                define(1, ASYNC_FUNCTION, IE_SRC, ITERATOR_HELPER, SELF_OBJ),
+                define(1, ASYNC_FUNCTION, FLAT, ITERATOR_HELPER, NO_V8_SRC, SELF_OBJ),
+                define
+                (
+                    0,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FROM_CODE_POINT,
+                    ITERATOR_HELPER,
+                    NO_V8_SRC,
+                    SELF_OBJ
+                ),
+                define(1, ASYNC_FUNCTION, ITERATOR_HELPER, NO_IE_SRC),
+                define(0, ASYNC_FUNCTION, FROM_CODE_POINT, INTL, ITERATOR_HELPER, NO_IE_SRC),
+                define(0, ASYNC_FUNCTION, FROM_CODE_POINT, ITERATOR_HELPER, NO_IE_SRC, SELF_OBJ),
+                define(1, ASYNC_FUNCTION, ITERATOR_HELPER, V8_SRC),
+                define(1, ASYNC_FUNCTION, FF_SRC, INTL, ITERATOR_HELPER),
+                define(1, ASYNC_FUNCTION, FILL, INTL, ITERATOR_HELPER, NO_IE_SRC),
+                define(1, ASYNC_FUNCTION, FLAT, INTL, ITERATOR_HELPER, NO_IE_SRC),
+                define
+                (0, ASYNC_FUNCTION, FROM_CODE_POINT, ITERATOR_HELPER, NAME, NODECONSTRUCTOR, NO_IE_SRC),
+                define(1, ASYNC_FUNCTION, FF_SRC, ITERATOR_HELPER, SELF_OBJ),
+                define(1, ASYNC_FUNCTION, FILL, ITERATOR_HELPER, NO_IE_SRC, SELF_OBJ),
+                define(1, ASYNC_FUNCTION, FLAT, ITERATOR_HELPER, NO_IE_SRC, SELF_OBJ),
+                define(1, ASYNC_FUNCTION, ITERATOR_HELPER, NAME, NODECONSTRUCTOR, V8_SRC),
+                define(1, ASYNC_FUNCTION, FILL, ITERATOR_HELPER, NAME, NODECONSTRUCTOR, NO_IE_SRC),
+                define(0, ASYNC_FUNCTION, FLAT, FROM_CODE_POINT, ITERATOR_HELPER, NAME),
+                define
+                (0, ASYNC_FUNCTION, CALL_ON_GLOBAL, FF_SRC, FROM_CODE_POINT, ITERATOR_HELPER, SELF_OBJ),
+                define
+                (0, ASYNC_FUNCTION, CALL_ON_GLOBAL, FROM_CODE_POINT, ITERATOR_HELPER, SELF_OBJ, V8_SRC),
+                define
+                (
+                    0,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FILL,
+                    FROM_CODE_POINT,
+                    ITERATOR_HELPER,
+                    NO_IE_SRC,
+                    SELF_OBJ
+                ),
+                define
+                (
+                    0,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FLAT,
+                    FROM_CODE_POINT,
+                    ITERATOR_HELPER,
+                    NO_IE_SRC,
+                    SELF_OBJ
+                ),
+                define(1, ASYNC_FUNCTION, FLAT, ITERATOR_HELPER, NAME, NO_IE_SRC),
+                define(0, ATOB, FROM_CODE_POINT, ITERATOR_HELPER, NAME),
+                define
+                (
+                    0,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FLAT,
+                    FROM_CODE_POINT,
+                    ITERATOR_HELPER,
+                    NAME,
+                    SELF_OBJ
+                ),
+                define(1, ATOB, ITERATOR_HELPER, NAME, NO_V8_SRC),
+                define(0, ATOB, FROM_CODE_POINT, ITERATOR_HELPER, NAME, NODECONSTRUCTOR),
+                define(1, ATOB, INCR_CHAR, ITERATOR_HELPER, NAME),
+                define(0, ATOB, FROM_CODE_POINT, INCR_CHAR, INTL, ITERATOR_HELPER, NAME),
+                define(0, ATOB, FROM_CODE_POINT, INCR_CHAR, ITERATOR_HELPER, NAME, NODECONSTRUCTOR),
+                define(0, ATOB, FROM_CODE_POINT, INCR_CHAR, ITERATOR_HELPER, NAME, NO_FF_SRC),
+                define(0, ATOB, FROM_CODE_POINT, INCR_CHAR, ITERATOR_HELPER, NAME, SELF_OBJ),
+                define(0, ATOB, FROM_CODE_POINT, INTL, ITERATOR_HELPER, NAME, NO_V8_SRC),
+                define(1, ATOB, FILL, ITERATOR_HELPER, NAME),
+                define(1, ATOB, IE_SRC, INTL, ITERATOR_HELPER, NAME),
+                define(0, ATOB, FILL, FROM_CODE_POINT, INTL, ITERATOR_HELPER, NAME),
+                define(1, ATOB, FILL, IE_SRC, ITERATOR_HELPER, NAME),
+                define(0, ARRAY_ITERATOR, ATOB, FROM_CODE_POINT, INCR_CHAR, ITERATOR_HELPER, NAME),
+                define(0, ATOB, FILL, FROM_CODE_POINT, ITERATOR_HELPER, NAME, SELF_OBJ),
+                define(0, ATOB, FROM_CODE_POINT, ITERATOR_HELPER, NAME, NO_V8_SRC, SELF_OBJ),
+                define(1, ATOB, IE_SRC, ITERATOR_HELPER, NAME, NODECONSTRUCTOR),
+                define(0, ARRAY_ITERATOR, ATOB, FROM_CODE_POINT, ITERATOR_HELPER, NAME, NO_V8_SRC),
+                define(1, ATOB, FLAT, ITERATOR_HELPER, NAME),
+                define(0, ARRAY_ITERATOR, ATOB, FILL, FROM_CODE_POINT, ITERATOR_HELPER),
+                define(1, ARRAY_ITERATOR, ATOB, FILL, ITERATOR_HELPER, NO_V8_SRC),
+                define(1, ARRAY_ITERATOR, ATOB, CALL_ON_GLOBAL, FILL, ITERATOR_HELPER, SELF_OBJ),
+                define
+                (0, ARRAY_ITERATOR, ATOB, FILL, FROM_CODE_POINT, ITERATOR_HELPER, NAME, NO_V8_SRC),
+                define(1, ARRAY_ITERATOR, ATOB, FILL, IE_SRC, ITERATOR_HELPER),
+                define
+                (
+                    0,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FROM_CODE_POINT,
+                    NODECONSTRUCTOR,
+                    NO_IE_SRC,
+                    SELF_OBJ
+                ),
+                define(1, ASYNC_FUNCTION, CALL_ON_GLOBAL, FF_SRC, FLAT, NODECONSTRUCTOR, SELF_OBJ),
+                define(1, ASYNC_FUNCTION, CALL_ON_GLOBAL, FLAT, NODECONSTRUCTOR, SELF_OBJ, V8_SRC),
+                define
+                (
+                    0,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FROM_CODE_POINT,
+                    ITERATOR_HELPER,
+                    NODECONSTRUCTOR,
+                    NO_IE_SRC,
+                    SELF_OBJ
+                ),
+                define
+                (
+                    0,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FROM_CODE_POINT,
+                    NAME,
+                    NODECONSTRUCTOR,
+                    NO_IE_SRC,
+                    SELF_OBJ
+                ),
+                define(1, ASYNC_FUNCTION, AT, CALL_ON_GLOBAL, FF_SRC, NODECONSTRUCTOR, SELF_OBJ),
+                define(1, ASYNC_FUNCTION, AT, CALL_ON_GLOBAL, NODECONSTRUCTOR, SELF_OBJ, V8_SRC),
+                define(0, ARRAY_ITERATOR, ASYNC_FUNCTION, FLAT, FROM_CODE_POINT, ITERATOR_HELPER),
+                define(0, ATOB, CALL_ON_GLOBAL, FLAT, FROM_CODE_POINT, ITERATOR_HELPER, NAME, SELF_OBJ),
+                define(1, ATOB, IE_SRC, ITERATOR_HELPER, SELF_OBJ),
+                define(0, ARRAY_ITERATOR, ATOB, FROM_CODE_POINT, IE_SRC, ITERATOR_HELPER, SELF_OBJ),
+                define(1, ASYNC_FUNCTION, AT, ITERATOR_HELPER),
+                define(1, ARRAY_ITERATOR, AT, ATOB, FILL, ITERATOR_HELPER),
+                define(1, ARRAY_ITERATOR, ATOB, FILL, ITERATOR_HELPER, NO_IE_SRC),
+                define(1, ATOB, CALL_ON_GLOBAL, IE_SRC, ITERATOR_HELPER, SELF_OBJ),
+                define(1, ATOB, FILL, IE_SRC, ITERATOR_HELPER, SELF_OBJ),
+                define
+                (0, ASYNC_FUNCTION, AT, CALL_ON_GLOBAL, FROM_CODE_POINT, ITERATOR_HELPER, SELF_OBJ),
+                define(1, ASYNC_FUNCTION, AT, IE_SRC, ITERATOR_HELPER),
+                define(1, ASYNC_FUNCTION, AT, ITERATOR_HELPER, NO_IE_SRC),
+                define
+                (
+                    0,
+                    ASYNC_FUNCTION,
+                    AT,
+                    CALL_ON_GLOBAL,
+                    FROM_CODE_POINT,
+                    ITERATOR_HELPER,
+                    NODECONSTRUCTOR,
+                    NO_IE_SRC,
+                    SELF_OBJ
+                ),
+                define(1, ASYNC_FUNCTION, AT, CALL_ON_GLOBAL, FF_SRC, ITERATOR_HELPER, SELF_OBJ),
+                define(1, ASYNC_FUNCTION, AT, CALL_ON_GLOBAL, ITERATOR_HELPER, SELF_OBJ, V8_SRC),
+                define(0, ARRAY_ITERATOR, ASYNC_FUNCTION, FROM_CODE_POINT, ITERATOR_HELPER, NO_IE_SRC),
+                define(0, ASYNC_FUNCTION, FROM_CODE_POINT, ITERATOR_HELPER, NAME, NO_V8_SRC),
+                define(1, ASYNC_FUNCTION, FILL, INCR_CHAR, ITERATOR_HELPER, NAME, NO_V8_SRC),
+                define(0, ASYNC_FUNCTION, FROM_CODE_POINT, INTL, ITERATOR_HELPER, NAME, NO_V8_SRC),
+                define(1, ASYNC_FUNCTION, FLAT, ITERATOR_HELPER, NAME, NO_V8_SRC),
+                define
+                (0, ASYNC_FUNCTION, FLAT, FROM_CODE_POINT, INTL, ITERATOR_HELPER, NAME, NO_V8_SRC),
+                define
+                (
+                    0,
+                    ASYNC_FUNCTION,
+                    FILL,
+                    FROM_CODE_POINT,
+                    INCR_CHAR,
+                    ITERATOR_HELPER,
+                    NAME,
+                    NODECONSTRUCTOR,
+                    NO_V8_SRC
+                ),
+                define
+                (
+                    0,
+                    ASYNC_FUNCTION,
+                    FILL,
+                    FROM_CODE_POINT,
+                    INCR_CHAR,
+                    ITERATOR_HELPER,
+                    NAME,
+                    NO_V8_SRC,
+                    SELF_OBJ
+                ),
+                define(1, ASYNC_FUNCTION, IE_SRC, ITERATOR_HELPER, NAME),
+                define(1, ASYNC_FUNCTION, AT, ITERATOR_HELPER, NAME, NO_V8_SRC),
+                define
+                (
+                    0,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FROM_CODE_POINT,
+                    IE_SRC,
+                    ITERATOR_HELPER,
+                    NAME,
+                    SELF_OBJ
+                ),
+                define(1, ASYNC_FUNCTION, FF_SRC, ITERATOR_HELPER, NAME),
+                define
+                (
+                    0,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FF_SRC,
+                    FROM_CODE_POINT,
+                    ITERATOR_HELPER,
+                    NAME,
+                    SELF_OBJ
+                ),
+                define
+                (0, ASYNC_FUNCTION, FLAT, FROM_CODE_POINT, ITERATOR_HELPER, NAME, NO_V8_SRC, SELF_OBJ),
+                define(1, ASYNC_FUNCTION, FLAT, IE_SRC, ITERATOR_HELPER, NAME, SELF_OBJ),
+                define(1, ASYNC_FUNCTION, AT, FLAT, ITERATOR_HELPER, NAME, NO_V8_SRC, SELF_OBJ),
+                define
+                (
+                    0,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FLAT,
+                    FROM_CODE_POINT,
+                    IE_SRC,
+                    ITERATOR_HELPER,
+                    NAME,
+                    SELF_OBJ
+                ),
+                define(1, ASYNC_FUNCTION, FF_SRC, FLAT, ITERATOR_HELPER, NAME, SELF_OBJ),
+                define
+                (
+                    0,
+                    ASYNC_FUNCTION,
+                    AT,
+                    CALL_ON_GLOBAL,
+                    FROM_CODE_POINT,
+                    ITERATOR_HELPER,
+                    NAME,
+                    NO_V8_SRC,
+                    SELF_OBJ
+                ),
+                define
+                (
+                    0,
+                    ASYNC_FUNCTION,
+                    CALL_ON_GLOBAL,
+                    FF_SRC,
+                    FLAT,
+                    FROM_CODE_POINT,
+                    ITERATOR_HELPER,
+                    NAME,
+                    SELF_OBJ
+                ),
+                define(1, ASYNC_FUNCTION, AT, CALL_ON_GLOBAL, FF_SRC, ITERATOR_HELPER, NAME, SELF_OBJ),
+                define(1, ASYNC_FUNCTION, AT, CALL_ON_GLOBAL, IE_SRC, ITERATOR_HELPER, NAME, SELF_OBJ),
+                define(0, ARRAY_ITERATOR, ATOB, FLAT, FROM_CODE_POINT, ITERATOR_HELPER),
+                define(1, ARRAY_ITERATOR, ATOB, FLAT, ITERATOR_HELPER, NO_V8_SRC),
+                define
+                (1, ARRAY_ITERATOR, ATOB, CALL_ON_GLOBAL, FLAT, INCR_CHAR, ITERATOR_HELPER, SELF_OBJ),
+                define
+                (0, ARRAY_ITERATOR, ATOB, FLAT, FROM_CODE_POINT, ITERATOR_HELPER, NAME, NO_V8_SRC),
+                define(1, ATOB, ITERATOR_HELPER, NO_IE_SRC, SELF_OBJ),
+                define(1, ARRAY_ITERATOR, AT, ATOB, FLAT, ITERATOR_HELPER),
+                define(1, ARRAY_ITERATOR, ATOB, FLAT, IE_SRC, ITERATOR_HELPER),
+                define(0, ARRAY_ITERATOR, ATOB, FROM_CODE_POINT, ITERATOR_HELPER, NO_IE_SRC, SELF_OBJ),
+                define(1, ARRAY_ITERATOR, ATOB, FLAT, ITERATOR_HELPER, NO_IE_SRC),
+                define(1, ATOB, CALL_ON_GLOBAL, ITERATOR_HELPER, NO_IE_SRC, SELF_OBJ),
+                define(1, ATOB, FILL, ITERATOR_HELPER, NO_IE_SRC, SELF_OBJ),
+                define(0, ARRAY_ITERATOR, ASYNC_FUNCTION, AT, FROM_CODE_POINT, ITERATOR_HELPER),
+                define(1, ATOB, ITERATOR_HELPER, NAME, NO_IE_SRC),
+                define(0, ARRAY_ITERATOR, ATOB, FROM_CODE_POINT, ITERATOR_HELPER, NAME, NO_IE_SRC),
+                define(1, ATOB, FILL, ITERATOR_HELPER, NAME, NO_IE_SRC),
+                define(1, ATOB, FLAT, ITERATOR_HELPER, NAME, NO_IE_SRC),
+                define(1, ARRAY_ITERATOR, ATOB, CALL_ON_GLOBAL, ITERATOR_HELPER, NAME, SELF_OBJ),
+                define
+                (
+                    0,
+                    ARRAY_ITERATOR,
+                    ATOB,
+                    CALL_ON_GLOBAL,
+                    FLAT,
+                    FROM_CODE_POINT,
+                    ITERATOR_HELPER,
+                    NAME,
+                    SELF_OBJ
+                ),
+                define
+                (1, ARRAY_ITERATOR, ATOB, CALL_ON_GLOBAL, IE_SRC, ITERATOR_HELPER, NAME, SELF_OBJ),
+                define
+                (1, ARRAY_ITERATOR, ATOB, CALL_ON_GLOBAL, INCR_CHAR, ITERATOR_HELPER, NAME, SELF_OBJ),
+                define
+                (1, ARRAY_ITERATOR, ATOB, CALL_ON_GLOBAL, ITERATOR_HELPER, NAME, NO_IE_SRC, SELF_OBJ),
+                define(0, ARRAY_ITERATOR, ASYNC_FUNCTION, FROM_CODE_POINT, ITERATOR_HELPER, NO_V8_SRC),
                 define(1, CAPITAL_HTML),
+                define(1, AT, ATOB, ITERATOR_HELPER, SELF_OBJ),
                 define(0, ARRAY_ITERATOR, ATOB, CAPITAL_HTML, FROM_CODE_POINT),
+                define(1, BARPROP),
+                define(1, CAPITAL_HTML, ITERATOR_HELPER),
+                define(1, AT, ATOB, ITERATOR_HELPER, NAME),
+                define(0, ARRAY_ITERATOR, ATOB, BARPROP, CAPITAL_HTML, FROM_CODE_POINT),
             ]
         );
 
@@ -4679,15 +5370,24 @@
                 define(0, NO_FF_SRC),
                 define(0, NO_V8_SRC),
                 define(1, ARRAY_ITERATOR, CAPITAL_HTML),
-                define(0, ARRAY_ITERATOR, AT, ATOB),
-                define(0, ARRAY_ITERATOR, AT, CAPITAL_HTML),
+                define(1, ARRAY_ITERATOR, ATOB, CALL_ON_GLOBAL, SELF_OBJ),
                 define(0, ARRAY_ITERATOR, ATOB, FILL),
-                define(0, ARRAY_ITERATOR, ATOB, FLAT),
-                define(0, ARRAY_ITERATOR, ATOB, NO_IE_SRC),
                 define(0, ARRAY_ITERATOR, CAPITAL_HTML, FILL),
-                define(0, ARRAY_ITERATOR, CAPITAL_HTML, FLAT),
                 define(0, ARRAY_ITERATOR, CAPITAL_HTML, IE_SRC),
+                define(0, ARRAY_ITERATOR, ATOB, CALL_ON_GLOBAL, IE_SRC, SELF_OBJ),
+                define(1, ARRAY_ITERATOR, ATOB, CALL_ON_GLOBAL, FILL, SELF_OBJ),
+                define(0, ARRAY_ITERATOR, ATOB, NO_IE_SRC),
                 define(0, ARRAY_ITERATOR, CAPITAL_HTML, NO_IE_SRC),
+                define(0, ARRAY_ITERATOR, ATOB, FILL, IE_SRC),
+                define(0, ARRAY_ITERATOR, ATOB, FILL, INCR_CHAR, NO_V8_SRC),
+                define(1, ARRAY_ITERATOR, ATOB, CALL_ON_GLOBAL, NO_IE_SRC, SELF_OBJ),
+                define(0, ARRAY_ITERATOR, AT, ATOB),
+                define(0, ARRAY_ITERATOR, AT, CAPITAL_HTML),
+                define(0, ARRAY_ITERATOR, ATOB, FF_SRC),
+                define(0, ARRAY_ITERATOR, ATOB, FLAT),
+                define(0, ARRAY_ITERATOR, ATOB, V8_SRC),
+                define(0, ARRAY_ITERATOR, CAPITAL_HTML, FLAT),
+                define(0, ARRAY_ITERATOR, ATOB, FILL, NO_IE_SRC),
                 define(2),
             ]
         );
@@ -4707,9 +5407,11 @@
             [
                 define(0),
                 define(1, AT),
+                define(0, FLAT),
                 define(1, FILL, IE_SRC),
                 define(1, FILL, NO_IE_SRC),
-                define(0, FLAT),
+                define(0, FILL, FLAT, IE_SRC),
+                define(0, FILL, FLAT, NO_IE_SRC),
             ]
         );
 
@@ -5827,7 +6529,7 @@
 
     var STATIC_CHAR_CACHE   = createEmpty();
     var STATIC_CONST_CACHE  = createEmpty();
-    var STATIC_ENCODER      = new Encoder(maskNew());
+    var STATIC_ENCODER      = new Encoder(MASK_EMPTY);
 
     var BOND_STRENGTH_NONE      = 0;
     var BOND_STRENGTH_WEAK      = 1;
@@ -6101,7 +6803,9 @@
             function (str, index)
             {
                 regExp.lastIndex = index;
-                var match = str.match(regExp);
+                // String.prototype.match doesn't work well with sticky regular expressions in Node.js <
+                // 6.5.
+                var match = regExp.exec(str);
                 if (match)
                     return match[0];
             };
@@ -7232,7 +7936,7 @@
                     var output = this._encodeByCodePoints(inputData, 4, maxLength);
                     return output;
                 },
-                38,
+                30,
                 undefined,
                 Feature.FROM_CODE_POINT
             ),
@@ -7311,7 +8015,7 @@
                     var output = this._encodeByDict(inputData, 3, 1, maxLength);
                     return output;
                 },
-                153
+                136
             ),
 
             /* -------------------------------------------------------------------------------------- *\
@@ -7407,7 +8111,7 @@
                     var output = this._encodeByDict(inputData, 4, 2, maxLength);
                     return output;
                 },
-                279
+                263
             ),
 
             /* -------------------------------------------------------------------------------------- *\
@@ -7476,7 +8180,7 @@
                     var output = this._encodeByDict(inputData, 5, 3, maxLength);
                     return output;
                 },
-                602
+                570
             ),
 
             /* -------------------------------------------------------------------------------------- *\
@@ -8826,13 +9530,19 @@
                 if (inputEntries)
                 {
                     if (_Array_isArray$1(inputEntries))
-                        outputEntries = inputEntries.map(clone);
+                        outputEntries = inputEntries.map(cloneEntry);
                     else
-                        outputEntries = [createEntryClone(inputEntries, EMPTY_MASK)];
+                        outputEntries = [createEntryClone(inputEntries, MASK_EMPTY)];
                 }
                 return outputEntries;
             }
 
+            function cloneEntry(inputEntry)
+            {
+                var outputEntry = createEntryClone(inputEntry.definition, inputEntry.mask);
+                return outputEntry;
+            }
+
             function createEncoder(features)
             {
                 var mask = getFeatureMask(features);
@@ -8879,7 +9589,7 @@
 
             function getComplexEntry(complex)
             {
-                var entry = clone(COMPLEX[complex]);
+                var entry = cloneEntry(COMPLEX[complex]);
                 return entry;
             }
 
@@ -8913,15 +9623,15 @@
                 return STRATEGIES;
             }
 
-            var EMPTY_MASK = maskNew();
-
             // Miscellaneous entries
             var ENTRIES = createEmpty();
-            ENTRIES['BASE64_ALPHABET_HI_4:0']                       = BASE64_ALPHABET_HI_4[0];
-            ENTRIES['BASE64_ALPHABET_HI_4:4']                       = BASE64_ALPHABET_HI_4[4];
-            ENTRIES['BASE64_ALPHABET_HI_4:5']                       = BASE64_ALPHABET_HI_4[5];
-            ENTRIES['BASE64_ALPHABET_LO_4:1']                       = BASE64_ALPHABET_LO_4[1];
-            ENTRIES['BASE64_ALPHABET_LO_4:3']                       = BASE64_ALPHABET_LO_4[3];
+
+            ENTRIES['BASE64_ALPHABET_HI_4:0'] = BASE64_ALPHABET_HI_4[0];
+            ENTRIES['BASE64_ALPHABET_HI_4:1'] = BASE64_ALPHABET_HI_4[1];
+            ENTRIES['BASE64_ALPHABET_HI_4:4'] = BASE64_ALPHABET_HI_4[4];
+            ENTRIES['BASE64_ALPHABET_HI_4:5'] = BASE64_ALPHABET_HI_4[5];
+            ENTRIES['BASE64_ALPHABET_LO_4:1'] = BASE64_ALPHABET_LO_4[1];
+            ENTRIES['BASE64_ALPHABET_LO_4:3'] = BASE64_ALPHABET_LO_4[3];
 
             var featureFromMask = Feature._fromMask;
             var getFeatureMask = Feature._getMask;