@digipair/skill-mongodb 0.136.3 → 0.136.5

package/dist/index.esm.js

@@ -15,7 +15,7 @@ import require$$0$a from 'fs/promises';
 import require$$3 from 'tls';
 import require$$1$3 from 'child_process';
 
-function _mergeNamespaces$1(n, m) {
+function _mergeNamespaces(n, m) {
     m.forEach(function(e) {
         e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function(k) {
             if (k !== 'default' && !(k in n)) {
@@ -35,7 +35,7 @@ var commonjsGlobal$1 = typeof globalThis !== 'undefined' ? globalThis : typeof w
 function getDefaultExportFromCjs(x) {
     return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 }
-var handlebars_min = {
+var handlebars_min$1 = {
     exports: {}
 };
 /**!
@@ -63,7 +63,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
-*/ handlebars_min.exports;
+*/ handlebars_min$1.exports;
 (function(module1, exports1) {
     function _instanceof(left, right) {
         if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
@@ -8144,12 +8144,12 @@ THE SOFTWARE.
             }
         ]);
     });
-})(handlebars_min, handlebars_min.exports);
-var handlebars_minExports = handlebars_min.exports;
-var handlebars_min_default = /*@__PURE__*/ getDefaultExportFromCjs(handlebars_minExports);
-var HandlebarsNamespace = /*#__PURE__*/ _mergeNamespaces$1({
+})(handlebars_min$1, handlebars_min$1.exports);
+var handlebars_minExports = handlebars_min$1.exports;
+var handlebars_min = /*@__PURE__*/ getDefaultExportFromCjs(handlebars_minExports);
+var HandlebarsNamespace = /*#__PURE__*/ _mergeNamespaces({
     __proto__: null,
-    default: handlebars_min_default
+    default: handlebars_min
 }, [
     handlebars_minExports
 ]);
@@ -17312,7 +17312,6 @@ class represent prop names.
         this.deserialize = config.deserialize || function() {
             throw new Error("This node type doesn't define a deserialize function");
         };
-        this.combine = config.combine || null;
     }
     _create_class$u$1(NodeProp, [
         {
@@ -17425,16 +17424,10 @@ represented by another tree.
     */ overlay, /**
     The parser used to create this subtree.
     */ parser) {
-        var /**
-    [Indicates](#common.IterMode.EnterBracketed) that the nested
-    content is delineated with some kind
-    of bracket token.
-    */ bracketed = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : false;
         _class_call_check$z$1(this, MountedTree);
         this.tree = tree;
         this.overlay = overlay;
         this.parser = parser;
-        this.bracketed = bracketed;
     }
     _create_class$u$1(MountedTree, null, [
         {
@@ -17650,9 +17643,7 @@ types in it, so that the ids fit into 16-bit typed array slots.
                                 var add = source(type);
                                 if (add) {
                                     if (!newProps) newProps = Object.assign({}, type.props);
-                                    var value = add[1], prop = add[0];
-                                    if (prop.combine && prop.id in newProps) value = prop.combine(newProps[prop.id], value);
-                                    newProps[prop.id] = value;
+                                    newProps[add[0].id] = add[1];
                                 }
                             }
                         } catch (err) {
@@ -17718,12 +17709,6 @@ operator to enable multiple ones.
     library to not enter mounted overlays if one covers the given
     position.
     */ IterMode[IterMode["IgnoreOverlays"] = 8] = "IgnoreOverlays";
-    /**
-    When set, positions on the boundary of a mounted overlay tree
-    that has its [`bracketed`](#common.NestedParse.bracketed) flag
-    set will enter that tree regardless of side. Only supported in
-    [`enter`](#common.SyntaxNode.enter), not in cursors.
-    */ IterMode[IterMode["EnterBracketed"] = 16] = "EnterBracketed";
 })(IterMode || (IterMode = {}));
 /**
 A piece of syntax tree. There are two ways to approach these
@@ -18282,17 +18267,17 @@ var TreeNode = /*#__PURE__*/ function(BaseNode) {
                 var mode = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : 0;
                 for(var parent = this;;){
                     for(var _parent__tree = parent._tree, children = _parent__tree.children, positions = _parent__tree.positions, e = dir > 0 ? children.length : -1; i != e; i += dir){
-                        var next = children[i], start = positions[i] + parent.from, mounted = void 0;
-                        if (!(mode & IterMode.EnterBracketed && _instanceof$i(next, Tree) && (mounted = MountedTree.get(next)) && !mounted.overlay && mounted.bracketed && pos >= start && pos <= start + next.length) && !checkSide(side, pos, start, start + next.length)) continue;
+                        var next = children[i], start = positions[i] + parent.from;
+                        if (!checkSide(side, pos, start, start + next.length)) continue;
                         if (_instanceof$i(next, TreeBuffer)) {
                             if (mode & IterMode.ExcludeBuffers) continue;
                             var index = next.findChild(0, next.buffer.length, dir, pos - start, side);
                             if (index > -1) return new BufferNode(new BufferContext(parent, next, i, start), null, index);
                         } else if (mode & IterMode.IncludeAnonymous || !next.type.isAnonymous || hasChild(next)) {
-                            var mounted1 = void 0;
-                            if (!(mode & IterMode.IgnoreMounts) && (mounted1 = MountedTree.get(next)) && !mounted1.overlay) return new TreeNode(mounted1.tree, start, i, parent);
+                            var mounted = void 0;
+                            if (!(mode & IterMode.IgnoreMounts) && (mounted = MountedTree.get(next)) && !mounted.overlay) return new TreeNode(mounted.tree, start, i, parent);
                             var inner = new TreeNode(next, start, i, parent);
-                            return mode & IterMode.IncludeAnonymous || !inner.type.isAnonymous ? inner : inner.nextChild(dir < 0 ? next.children.length - 1 : 0, dir, pos, side, mode);
+                            return mode & IterMode.IncludeAnonymous || !inner.type.isAnonymous ? inner : inner.nextChild(dir < 0 ? next.children.length - 1 : 0, dir, pos, side);
                         }
                     }
                     if (mode & IterMode.IncludeAnonymous || !parent.type.isAnonymous) return null;
@@ -18327,24 +18312,18 @@ var TreeNode = /*#__PURE__*/ function(BaseNode) {
                 return this.nextChild(this._tree.children.length - 1, -1, pos, -2 /* Side.Before */ );
             }
         },
-        {
-            key: "prop",
-            value: function prop(prop) {
-                return this._tree.prop(prop);
-            }
-        },
         {
             key: "enter",
             value: function enter(pos, side) {
                 var mode = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : 0;
                 var mounted;
                 if (!(mode & IterMode.IgnoreOverlays) && (mounted = MountedTree.get(this._tree)) && mounted.overlay) {
-                    var rPos = pos - this.from, enterBracketed = mode & IterMode.EnterBracketed && mounted.bracketed;
+                    var rPos = pos - this.from;
                     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                     try {
                         for(var _iterator = mounted.overlay[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
                             var _step_value = _step.value, from = _step_value.from, to = _step_value.to;
-                            if ((side > 0 || enterBracketed ? from <= rPos : from < rPos) && (side < 0 || enterBracketed ? to >= rPos : to > rPos)) return new TreeNode(mounted.tree, mounted.overlay[0].from + this.from, -1, this);
+                            if ((side > 0 ? from <= rPos : from < rPos) && (side < 0 ? to >= rPos : to > rPos)) return new TreeNode(mounted.tree, mounted.overlay[0].from + this.from, -1, this);
                         }
                     } catch (err) {
                         _didIteratorError = true;
@@ -18508,12 +18487,6 @@ var BufferNode = /*#__PURE__*/ function(BaseNode) {
                 return this.child(-1, pos, -2 /* Side.Before */ );
             }
         },
-        {
-            key: "prop",
-            value: function prop(prop) {
-                return this.type.prop(prop);
-            }
-        },
         {
             key: "enter",
             value: function enter(pos, side) {
@@ -18644,8 +18617,11 @@ A tree cursor object focuses on a given node in a syntax tree, and
 allows you to move to adjacent nodes.
 */ var TreeCursor = /*#__PURE__*/ function() {
     function TreeCursor(node) {
-        var mode = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 0;
+        var /**
+    @internal
+    */ mode = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 0;
         _class_call_check$z$1(this, TreeCursor);
+        this.mode = mode;
         /**
         @internal
         */ this.buffer = null;
@@ -18654,7 +18630,6 @@ allows you to move to adjacent nodes.
         @internal
         */ this.index = 0;
         this.bufferNode = null;
-        this.mode = mode & ~IterMode.EnterBracketed;
         if (_instanceof$i(node, TreeNode)) {
             this.yieldNode(node);
         } else {
@@ -18998,7 +18973,7 @@ function buildTree(data) {
     function takeNode(parentStart, minPos, children, positions, inRepeat, depth) {
         var id = cursor.id, start = cursor.start, end = cursor.end, size = cursor.size;
         var lookAheadAtStart = lookAhead, contextAtStart = contextHash;
-        if (size < 0) {
+        while(size < 0){
             cursor.next();
             if (size == -1 /* SpecialRecord.Reuse */ ) {
                 var node = reused[id];
@@ -19165,7 +19140,7 @@ function buildTree(data) {
             fork.next();
             while(fork.pos > startPos){
                 if (fork.size < 0) {
-                    if (fork.size == -3 /* SpecialRecord.ContextChange */  || fork.size == -4 /* SpecialRecord.LookAhead */ ) localSkipped += 4;
+                    if (fork.size == -3 /* SpecialRecord.ContextChange */ ) localSkipped += 4;
                     else break scan;
                 } else if (fork.id >= minRepeatType) {
                     localSkipped += 4;
@@ -19604,11 +19579,11 @@ about the parse state.
                 var _a;
                 var depth = action >> 19 /* Action.ReduceDepthShift */ , type = action & 65535 /* Action.ValueMask */ ;
                 var parser = this.p.parser;
-                var lookaheadRecord = this.reducePos < this.pos - 25 /* Lookahead.Margin */  && this.setLookAhead(this.pos);
+                var lookaheadRecord = this.reducePos < this.pos - 25 /* Lookahead.Margin */ ;
+                if (lookaheadRecord) this.setLookAhead(this.pos);
                 var dPrec = parser.dynamicPrecedence(type);
                 if (dPrec) this.score += dPrec;
                 if (depth == 0) {
-                    if (type < parser.minRepeatTerm && this.reducePos < this.pos) this.reducePos = this.pos;
                     this.pushState(parser.getGoto(this.state, type, true), this.reducePos);
                     // Zero-depth reductions are a special case—they add stuff to
                     // the stack without popping anything off.
@@ -19622,9 +19597,7 @@ about the parse state.
                 // expression and the state that we'll be staying in, which should
                 // be moved to `this.state`).
                 var base = this.stack.length - (depth - 1) * 3 - (action & 262144 /* Action.StayFlag */  ? 6 : 0);
-                var start = base ? this.stack[base - 2] : this.p.ranges[0].from;
-                if (type < parser.minRepeatTerm && start == this.reducePos && this.reducePos < this.pos) this.reducePos = this.pos;
-                var size = this.reducePos - start;
+                var start = base ? this.stack[base - 2] : this.p.ranges[0].from, size = this.reducePos - start;
                 // This is a kludge to try and detect overly deep left-associative
                 // trees, which will not increase the parse stack depth and thus
                 // won't be caught by the regular stack-depth limit check.
@@ -19663,11 +19636,15 @@ about the parse state.
                 var size = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : 4, mustSink = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : false;
                 if (term == 0 /* Term.Err */  && (!this.stack.length || this.stack[this.stack.length - 1] < this.buffer.length + this.bufferBase)) {
                     // Try to omit/merge adjacent error nodes
-                    var top = this.buffer.length;
-                    if (top > 0 && this.buffer[top - 4] == 0 /* Term.Err */  && this.buffer[top - 1] > -1) {
+                    var cur = this, top = this.buffer.length;
+                    if (top == 0 && cur.parent) {
+                        top = cur.bufferBase - cur.parent.bufferBase;
+                        cur = cur.parent;
+                    }
+                    if (top > 0 && cur.buffer[top - 4] == 0 /* Term.Err */  && cur.buffer[top - 1] > -1) {
                         if (start == end) return;
-                        if (this.buffer[top - 2] >= start) {
-                            this.buffer[top - 2] = end;
+                        if (cur.buffer[top - 2] >= start) {
+                            cur.buffer[top - 2] = end;
                             return;
                         }
                     }
@@ -19676,7 +19653,7 @@ about the parse state.
                     this.buffer.push(term, start, end, size);
                 } else {
                     var index = this.buffer.length;
-                    if (index > 0 && (this.buffer[index - 4] != 0 /* Term.Err */  || this.buffer[index - 1] < 0)) {
+                    if (index > 0 && this.buffer[index - 4] != 0 /* Term.Err */ ) {
                         var mustMove = false;
                         for(var scan = index; scan > 0 && this.buffer[scan - 2] > end; scan -= 4){
                             if (this.buffer[scan - 1] >= 0) {
@@ -19711,11 +19688,11 @@ about the parse state.
                     this.pushState(action & 65535 /* Action.ValueMask */ , this.pos);
                 } else if ((action & 262144 /* Action.StayFlag */ ) == 0) {
                     var nextState = action, parser = this.p.parser;
-                    this.pos = end;
-                    var skipped = parser.stateFlag(nextState, 1 /* StateFlag.Skipped */ );
-                    // Skipped or zero-length non-tree tokens don't move reducePos
-                    if (!skipped && (end > start || type <= parser.maxNode)) this.reducePos = end;
-                    this.pushState(nextState, skipped ? start : Math.min(start, this.reducePos));
+                    if (end > this.pos || type <= parser.maxNode) {
+                        this.pos = end;
+                        if (!parser.stateFlag(nextState, 1 /* StateFlag.Skipped */ )) this.reducePos = end;
+                    }
+                    this.pushState(nextState, start);
                     this.shiftContext(type, start);
                     if (type <= parser.maxNode) this.buffer.push(type, start, end, 4);
                 } else {
@@ -19763,9 +19740,6 @@ about the parse state.
             value: function split() {
                 var parent = this;
                 var off = parent.buffer.length;
-                // Leave off top error node, if there, because that might be
-                // merged with other nodes.
-                if (off && parent.buffer[off - 4] == 0 /* Term.Err */ ) off -= 4;
                 // Because the top of the buffer (after this.pos) may be mutated
                 // to reorder reductions and skipped tokens, and shared buffers
                 // should be immutable, this copies any outstanding skipped tokens
@@ -20009,10 +19983,10 @@ about the parse state.
     @internal
     */ key: "setLookAhead",
             value: function setLookAhead(lookAhead) {
-                if (lookAhead <= this.lookAhead) return false;
-                this.emitLookAhead();
-                this.lookAhead = lookAhead;
-                return true;
+                if (lookAhead > this.lookAhead) {
+                    this.emitLookAhead();
+                    this.lookAhead = lookAhead;
+                }
             }
         },
         {
@@ -20905,12 +20879,7 @@ var Parse = /*#__PURE__*/ function() {
                             }
                         }
                     }
-                    if (newStacks.length > 12 /* Rec.MaxStackCount */ ) {
-                        newStacks.sort(function(a, b) {
-                            return b.score - a.score;
-                        });
-                        newStacks.splice(12 /* Rec.MaxStackCount */ , newStacks.length - 12 /* Rec.MaxStackCount */ );
-                    }
+                    if (newStacks.length > 12 /* Rec.MaxStackCount */ ) newStacks.splice(12 /* Rec.MaxStackCount */ , newStacks.length - 12 /* Rec.MaxStackCount */ );
                 }
                 this.minStackPos = newStacks[0].pos;
                 for(var i2 = 1; i2 < newStacks.length; i2++)if (newStacks[i2].pos < this.minStackPos) this.minStackPos = newStacks[i2].pos;
@@ -21005,7 +20974,7 @@ var Parse = /*#__PURE__*/ function() {
                         if (done) continue;
                     }
                     var force = stack.split(), forceBase = base;
-                    for(var j = 0; j < 10 /* Rec.ForceReduceLimit */  && force.forceReduce(); j++){
+                    for(var j = 0; force.forceReduce() && j < 10 /* Rec.ForceReduceLimit */ ; j++){
                         if (verbose) console.log(forceBase + this.stackID(force) + " (via force-reduce)");
                         var done1 = this.advanceFully(force, newStacks);
                         if (done1) break;
@@ -21040,8 +21009,8 @@ var Parse = /*#__PURE__*/ function() {
                         stack.recoverByDelete(token, tokenEnd);
                         if (verbose) console.log(base + this.stackID(stack) + " (via recover-delete ".concat(this.parser.getName(token), ")"));
                         pushStackDedup(stack, newStacks);
-                    } else if (!finished || finished.score < force.score) {
-                        finished = force;
+                    } else if (!finished || finished.score < stack.score) {
+                        finished = stack;
                     }
                 }
                 return finished;
@@ -21890,7 +21859,7 @@ must be quoted as JSON strings.
 For example:
 
 ```javascript
-parser.configure({props: [
+parser.withProps(
   styleTags({
     // Style Number and BigNumber nodes
     "Number BigNumber": tags.number,
@@ -21905,7 +21874,7 @@ parser.configure({props: [
     // Style the node named "/" as punctuation
     '"/"': tags.punctuation
   })
-]})
+)
 ```
 */ function styleTags(spec) {
     var byName = Object.create(null);
@@ -21961,26 +21930,7 @@ parser.configure({props: [
     }
     return ruleNodeProp.add(byName);
 }
-var ruleNodeProp = new NodeProp({
-    combine: function combine(a, b) {
-        var cur, root, take;
-        while(a || b){
-            if (!a || b && a.depth >= b.depth) {
-                take = b;
-                b = b.next;
-            } else {
-                take = a;
-                a = a.next;
-            }
-            if (cur && cur.mode == take.mode && !take.context && !cur.context) continue;
-            var copy = new Rule$1(take.tags, take.mode, take.context);
-            if (cur) cur.next = copy;
-            else root = copy;
-            cur = copy;
-        }
-        return root;
-    }
-});
+var ruleNodeProp = new NodeProp();
 var Rule$1 = /*#__PURE__*/ function() {
     function Rule(tags, mode, context, next) {
         _class_call_check$x$1(this, Rule);
@@ -22905,14 +22855,14 @@ function indent(str, spaces) {
         var match = parseIdentifier(input, i1, namePart) || namePart && parseAdditionalSymbol(input, i1) || maybeSpace && parseSpaces(input, i1);
         // match is required
         if (!match) {
-            return i = i1, nextMatch = nextMatch1, tokens = tokens1, {
+            return tokens = tokens1, i = i1, nextMatch = nextMatch1, {
                 v: nextMatch1
             };
         }
         var token = match.token, offset = match.offset;
         i1 += offset;
         if (token === ' ') {
-            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
+            return tokens = tokens1, i = i1, nextMatch = nextMatch1, "continue";
         }
         tokens1 = _to_consumable_array$4(tokens1).concat([
             token
@@ -22931,7 +22881,7 @@ function indent(str, spaces) {
         if (contextKeys.some(function(el) {
             return el.startsWith(name);
         })) {
-            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
+            return tokens = tokens1, i = i1, nextMatch = nextMatch1, "continue";
         }
         if (dateTimeIdentifiers.some(function(el) {
             return el === name;
@@ -22950,9 +22900,9 @@ function indent(str, spaces) {
         if (dateTimeIdentifiers.some(function(el) {
             return el.startsWith(name);
         })) {
-            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
+            return tokens = tokens1, i = i1, nextMatch = nextMatch1, "continue";
         }
-        return i = i1, nextMatch = nextMatch1, tokens = tokens1, {
+        return tokens = tokens1, i = i1, nextMatch = nextMatch1, {
             v: nextMatch1
         };
     };
@@ -44456,7 +44406,7 @@ function _object_spread_props$p(target, source) {
         prefix: '_'
     })).join('').toLowerCase();
 }
-const Handlebars = handlebars_min_default || HandlebarsNamespace;
+const Handlebars = handlebars_min || HandlebarsNamespace;
 Handlebars.registerHelper('JSONstringify', function(value) {
     return JSON.stringify(value);
 });
@@ -50542,7 +50492,7 @@ bson$1.setInternalBufferSize = setInternalBufferSize;
 	Object.defineProperty(exports, "__esModule", {
 	    value: true
 	});
-	exports.setUint32LE = exports.readUint8 = exports.readInt32LE = exports.UUID = exports.Timestamp = exports.serialize = exports.ObjectId = exports.NumberUtils = exports.MinKey = exports.MaxKey = exports.Long = exports.Int32 = exports.EJSON = exports.Double = exports.deserialize = exports.Decimal128 = exports.DBRef = exports.Code = exports.calculateObjectSize = exports.ByteUtils = exports.BSONType = exports.BSONSymbol = exports.BSONRegExp = exports.BSONError = exports.BSON = exports.Binary = void 0;
+	exports.setUint32LE = exports.readInt32LE = exports.UUID = exports.Timestamp = exports.serialize = exports.ObjectId = exports.NumberUtils = exports.MinKey = exports.MaxKey = exports.Long = exports.Int32 = exports.EJSON = exports.Double = exports.deserialize = exports.Decimal128 = exports.DBRef = exports.Code = exports.calculateObjectSize = exports.ByteUtils = exports.BSONType = exports.BSONSymbol = exports.BSONRegExp = exports.BSONError = exports.BSON = exports.Binary = void 0;
 	exports.parseToElementsToArray = parseToElementsToArray;
 	exports.pluckBSONSerializeOptions = pluckBSONSerializeOptions;
 	exports.resolveBSONOptions = resolveBSONOptions;
@@ -50704,12 +50654,6 @@ bson$1.setInternalBufferSize = setInternalBufferSize;
 	    return bson_1.NumberUtils.getInt32LE(buffer, offset);
 	};
 	exports.readInt32LE = readInt32LE;
-	// readUint8, reads a single unsigned byte from buffer at given offset
-	var readUint8 = function(buffer, offset) {
-	    validateBufferInputs(buffer, offset, 1);
-	    return buffer[offset];
-	};
-	exports.readUint8 = readUint8;
 	var setUint32LE = function(destination, offset, value) {
 	    destination[offset] = value;
 	    value >>>= 8;
@@ -50781,11 +50725,11 @@ Object.defineProperty(constants$4, "__esModule", {
 });
 constants$4.OP_MSG = constants$4.OP_COMPRESSED = constants$4.OP_DELETE = constants$4.OP_QUERY = constants$4.OP_INSERT = constants$4.OP_UPDATE = constants$4.OP_REPLY = constants$4.MIN_SUPPORTED_RAW_DATA_SERVER_VERSION = constants$4.MIN_SUPPORTED_RAW_DATA_WIRE_VERSION = constants$4.MIN_SUPPORTED_QE_SERVER_VERSION = constants$4.MIN_SUPPORTED_QE_WIRE_VERSION = constants$4.MAX_SUPPORTED_WIRE_VERSION = constants$4.MIN_SUPPORTED_WIRE_VERSION = constants$4.MIN_SUPPORTED_SNAPSHOT_READS_SERVER_VERSION = constants$4.MIN_SUPPORTED_SNAPSHOT_READS_WIRE_VERSION = constants$4.MAX_SUPPORTED_SERVER_VERSION = constants$4.MIN_SUPPORTED_SERVER_VERSION = void 0;
 constants$4.MIN_SUPPORTED_SERVER_VERSION = '4.2';
-constants$4.MAX_SUPPORTED_SERVER_VERSION = '9.0';
+constants$4.MAX_SUPPORTED_SERVER_VERSION = '8.2';
 constants$4.MIN_SUPPORTED_SNAPSHOT_READS_WIRE_VERSION = 13;
 constants$4.MIN_SUPPORTED_SNAPSHOT_READS_SERVER_VERSION = '5.0';
 constants$4.MIN_SUPPORTED_WIRE_VERSION = 8;
-constants$4.MAX_SUPPORTED_WIRE_VERSION = 29;
+constants$4.MAX_SUPPORTED_WIRE_VERSION = 27;
 constants$4.MIN_SUPPORTED_QE_WIRE_VERSION = 21;
 constants$4.MIN_SUPPORTED_QE_SERVER_VERSION = '7.0';
 constants$4.MIN_SUPPORTED_RAW_DATA_WIRE_VERSION = 27;
@@ -79342,6 +79286,77 @@ var ipv4 = {};
 
 var common = {};
 
+var hasRequiredCommon;
+
+function requireCommon () {
+	if (hasRequiredCommon) return common;
+	hasRequiredCommon = 1;
+	Object.defineProperty(common, "__esModule", {
+	    value: true
+	});
+	common.isInSubnet = isInSubnet;
+	common.isCorrect = isCorrect;
+	common.numberToPaddedHex = numberToPaddedHex;
+	common.stringToPaddedHex = stringToPaddedHex;
+	common.testBit = testBit;
+	function isInSubnet(address) {
+	    if (this.subnetMask < address.subnetMask) {
+	        return false;
+	    }
+	    if (this.mask(address.subnetMask) === address.mask()) {
+	        return true;
+	    }
+	    return false;
+	}
+	function isCorrect(defaultBits) {
+	    return function() {
+	        if (this.addressMinusSuffix !== this.correctForm()) {
+	            return false;
+	        }
+	        if (this.subnetMask === defaultBits && !this.parsedSubnet) {
+	            return true;
+	        }
+	        return this.parsedSubnet === String(this.subnetMask);
+	    };
+	}
+	function numberToPaddedHex(number) {
+	    return number.toString(16).padStart(2, '0');
+	}
+	function stringToPaddedHex(numberString) {
+	    return numberToPaddedHex(parseInt(numberString, 10));
+	}
+	/**
+	 * @param binaryValue Binary representation of a value (e.g. `10`)
+	 * @param position Byte position, where 0 is the least significant bit
+	 */ function testBit(binaryValue, position) {
+	    var length = binaryValue.length;
+	    if (position > length) {
+	        return false;
+	    }
+	    var positionInString = length - position;
+	    return binaryValue.substring(positionInString, positionInString + 1) === '1';
+	} 
+	return common;
+}
+
+var constants$1 = {};
+
+var hasRequiredConstants$1;
+
+function requireConstants$1 () {
+	if (hasRequiredConstants$1) return constants$1;
+	hasRequiredConstants$1 = 1;
+	Object.defineProperty(constants$1, "__esModule", {
+	    value: true
+	});
+	constants$1.RE_SUBNET_STRING = constants$1.RE_ADDRESS = constants$1.GROUPS = constants$1.BITS = void 0;
+	constants$1.BITS = 32;
+	constants$1.GROUPS = 4;
+	constants$1.RE_ADDRESS = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/g;
+	constants$1.RE_SUBNET_STRING = /\/\d{1,2}$/; 
+	return constants$1;
+}
+
 var addressError = {};
 
 var hasRequiredAddressError;
@@ -79487,97 +79502,6 @@ function requireAddressError () {
 	return addressError;
 }
 
-var hasRequiredCommon;
-
-function requireCommon () {
-	if (hasRequiredCommon) return common;
-	hasRequiredCommon = 1;
-	Object.defineProperty(common, "__esModule", {
-	    value: true
-	});
-	common.isInSubnet = isInSubnet;
-	common.isCorrect = isCorrect;
-	common.prefixLengthFromMask = prefixLengthFromMask;
-	common.numberToPaddedHex = numberToPaddedHex;
-	common.stringToPaddedHex = stringToPaddedHex;
-	common.testBit = testBit;
-	var address_error_1 = requireAddressError();
-	function isInSubnet(address) {
-	    if (this.subnetMask < address.subnetMask) {
-	        return false;
-	    }
-	    if (this.mask(address.subnetMask) === address.mask()) {
-	        return true;
-	    }
-	    return false;
-	}
-	function isCorrect(defaultBits) {
-	    return function() {
-	        if (this.addressMinusSuffix !== this.correctForm()) {
-	            return false;
-	        }
-	        if (this.subnetMask === defaultBits && !this.parsedSubnet) {
-	            return true;
-	        }
-	        return this.parsedSubnet === String(this.subnetMask);
-	    };
-	}
-	/**
-	 * Returns the prefix length (number of leading 1 bits) of a contiguous
-	 * subnet mask. Throws `AddressError` if the mask is non-contiguous (e.g.
-	 * `255.0.255.0`).
-	 */ function prefixLengthFromMask(value, totalBits) {
-	    var binary = value.toString(2).padStart(totalBits, '0');
-	    if (binary.length > totalBits) {
-	        throw new address_error_1.AddressError('Invalid subnet mask.');
-	    }
-	    var firstZero = binary.indexOf('0');
-	    if (firstZero === -1) {
-	        return totalBits;
-	    }
-	    if (binary.slice(firstZero).includes('1')) {
-	        throw new address_error_1.AddressError('Invalid subnet mask.');
-	    }
-	    return firstZero;
-	}
-	function numberToPaddedHex(number) {
-	    return number.toString(16).padStart(2, '0');
-	}
-	function stringToPaddedHex(numberString) {
-	    return numberToPaddedHex(parseInt(numberString, 10));
-	}
-	/**
-	 * @param binaryValue Binary representation of a value (e.g. `10`)
-	 * @param position Byte position, where 0 is the least significant bit
-	 */ function testBit(binaryValue, position) {
-	    var length = binaryValue.length;
-	    if (position > length) {
-	        return false;
-	    }
-	    var positionInString = length - position;
-	    return binaryValue.substring(positionInString, positionInString + 1) === '1';
-	} 
-	return common;
-}
-
-var constants$1 = {};
-
-var hasRequiredConstants$1;
-
-function requireConstants$1 () {
-	if (hasRequiredConstants$1) return constants$1;
-	hasRequiredConstants$1 = 1;
-	Object.defineProperty(constants$1, "__esModule", {
-	    value: true
-	});
-	constants$1.RE_SUBNET_STRING = constants$1.RE_ADDRESS = constants$1.GROUPS = constants$1.BITS = void 0;
-	constants$1.BITS = 32;
-	constants$1.GROUPS = 4;
-	constants$1.RE_ADDRESS = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/g;
-	constants$1.RE_SUBNET_STRING = /\/\d{1,2}$/; 
-	return constants$1;
-}
-
 var hasRequiredIpv4;
 
 function requireIpv4 () {
@@ -79642,9 +79566,9 @@ function requireIpv4 () {
 	var common = __importStar(requireCommon());
 	var constants = __importStar(requireConstants$1());
 	var address_error_1 = requireAddressError();
-	var isCorrect4 = common.isCorrect(constants.BITS);
 	/**
 	 * Represents an IPv4 address
+	 * @class Address4
 	 * @param {string} address - An IPv4 address string
 	 */ var Address4 = /*#__PURE__*/ function() {
 	    function Address4(address) {
@@ -79657,10 +79581,14 @@ function requireIpv4 () {
 	        this.v4 = true;
 	        /**
 	         * Returns true if the address is correct, false otherwise
+	         * @memberof Address4
+	         * @instance
 	         * @returns {Boolean}
-	         */ this.isCorrect = isCorrect4;
+	         */ this.isCorrect = common.isCorrect(constants.BITS);
 	        /**
 	         * Returns true if the given address is in the subnet of the current address
+	         * @memberof Address4
+	         * @instance
 	         * @returns {boolean}
 	         */ this.isInSubnet = common.isInSubnet;
 	        this.address = address;
@@ -79679,11 +79607,8 @@ function requireIpv4 () {
 	    }
 	    _create_class(Address4, [
 	        {
-	            /**
-	     * Parses an IPv4 address string into its four octet groups and stores the
-	     * result on `this.parsedAddress`. Called automatically by the constructor;
-	     * you typically don't need to call it directly. Throws `AddressError` if
-	     * the input is not a valid IPv4 address.
+	            /*
+	     * Parses a v4 address
 	     */ key: "parse",
 	            value: function parse(address) {
 	                var groups = address.split('.');
@@ -79695,9 +79620,10 @@ function requireIpv4 () {
 	        },
 	        {
 	            /**
-	     * Returns the address in correct form: octets joined with `.` and any
-	     * leading zeros stripped (e.g. `192.168.1.1`). For IPv4 this matches the
-	     * canonical dotted-decimal representation.
+	     * Returns the correct form of an address
+	     * @memberof Address4
+	     * @instance
+	     * @returns {String}
 	     */ key: "correctForm",
 	            value: function correctForm() {
 	                return this.parsedAddress.map(function(part) {
@@ -79708,6 +79634,8 @@ function requireIpv4 () {
 	        {
 	            /**
 	     * Converts an IPv4 address object to a hex string
+	     * @memberof Address4
+	     * @instance
 	     * @returns {String}
 	     */ key: "toHex",
 	            value: function toHex() {
@@ -79718,9 +79646,9 @@ function requireIpv4 () {
 	        },
 	        {
 	            /**
-	     * Converts an IPv4 address object to an array of bytes.
-	     *
-	     * To get a Node.js `Buffer`, wrap the result: `Buffer.from(address.toArray())`.
+	     * Converts an IPv4 address object to an array of bytes
+	     * @memberof Address4
+	     * @instance
 	     * @returns {Array}
 	     */ key: "toArray",
 	            value: function toArray() {
@@ -79732,6 +79660,8 @@ function requireIpv4 () {
 	        {
 	            /**
 	     * Converts an IPv4 address object to an IPv6 address group
+	     * @memberof Address4
+	     * @instance
 	     * @returns {String}
 	     */ key: "toGroup6",
 	            value: function toGroup6() {
@@ -79746,6 +79676,8 @@ function requireIpv4 () {
 	        {
 	            /**
 	     * Returns the address as a `bigint`
+	     * @memberof Address4
+	     * @instance
 	     * @returns {bigint}
 	     */ key: "bigInt",
 	            value: function bigInt() {
@@ -79757,6 +79689,8 @@ function requireIpv4 () {
 	        {
 	            /**
 	     * Helper function getting start address.
+	     * @memberof Address4
+	     * @instance
 	     * @returns {bigint}
 	     */ key: "_startAddress",
 	            value: function _startAddress() {
@@ -79767,6 +79701,8 @@ function requireIpv4 () {
 	            /**
 	     * The first address in the range given by this address' subnet.
 	     * Often referred to as the Network Address.
+	     * @memberof Address4
+	     * @instance
 	     * @returns {Address4}
 	     */ key: "startAddress",
 	            value: function startAddress() {
@@ -79777,6 +79713,8 @@ function requireIpv4 () {
 	            /**
 	     * The first host address in the range given by this address's subnet ie
 	     * the first address after the Network Address
+	     * @memberof Address4
+	     * @instance
 	     * @returns {Address4}
 	     */ key: "startAddressExclusive",
 	            value: function startAddressExclusive() {
@@ -79787,6 +79725,8 @@ function requireIpv4 () {
 	        {
 	            /**
 	     * Helper function getting end address.
+	     * @memberof Address4
+	     * @instance
 	     * @returns {bigint}
 	     */ key: "_endAddress",
 	            value: function _endAddress() {
@@ -79797,6 +79737,8 @@ function requireIpv4 () {
 	            /**
 	     * The last address in the range given by this address' subnet
 	     * Often referred to as the Broadcast
+	     * @memberof Address4
+	     * @instance
 	     * @returns {Address4}
 	     */ key: "endAddress",
 	            value: function endAddress() {
@@ -79807,6 +79749,8 @@ function requireIpv4 () {
 	            /**
 	     * The last host address in the range given by this address's subnet ie
 	     * the last address prior to the Broadcast Address
+	     * @memberof Address4
+	     * @instance
 	     * @returns {Address4}
 	     */ key: "endAddressExclusive",
 	            value: function endAddressExclusive() {
@@ -79816,40 +79760,10 @@ function requireIpv4 () {
 	        },
 	        {
 	            /**
-	     * The dotted-decimal form of the subnet mask, e.g. `255.255.240.0` for
-	     * a `/20`. Returns an `Address4`; call `.correctForm()` for the string.
-	     * @returns {Address4}
-	     */ key: "subnetMaskAddress",
-	            value: function subnetMaskAddress() {
-	                return Address4.fromBigInt(BigInt("0b".concat('1'.repeat(this.subnetMask)).concat('0'.repeat(constants.BITS - this.subnetMask))));
-	            }
-	        },
-	        {
-	            /**
-	     * The Cisco-style wildcard mask, e.g. `0.0.0.255` for a `/24`. This is
-	     * the bitwise inverse of `subnetMaskAddress()`. Returns an `Address4`;
-	     * call `.correctForm()` for the string.
-	     * @returns {Address4}
-	     */ key: "wildcardMask",
-	            value: function wildcardMask() {
-	                return Address4.fromBigInt(BigInt("0b".concat('0'.repeat(this.subnetMask)).concat('1'.repeat(constants.BITS - this.subnetMask))));
-	            }
-	        },
-	        {
-	            /**
-	     * The network address in CIDR string form, e.g. `192.168.1.0/24` for
-	     * `192.168.1.5/24`. For an address with no explicit subnet the prefix is
-	     * `/32`, e.g. `networkForm()` on `192.168.1.5` returns `192.168.1.5/32`.
-	     * @returns {string}
-	     */ key: "networkForm",
-	            value: function networkForm() {
-	                return "".concat(this.startAddress().correctForm(), "/").concat(this.subnetMask);
-	            }
-	        },
-	        {
-	            /**
 	     * Returns the first n bits of the address, defaulting to the
 	     * subnet mask
+	     * @memberof Address4
+	     * @instance
 	     * @returns {String}
 	     */ key: "mask",
 	            value: function mask(mask) {
@@ -79862,6 +79776,8 @@ function requireIpv4 () {
 	        {
 	            /**
 	     * Returns the bits in the given range as a base-2 string
+	     * @memberof Address4
+	     * @instance
 	     * @returns {string}
 	     */ key: "getBitsBase2",
 	            value: function getBitsBase2(start, end) {
@@ -79871,8 +79787,10 @@ function requireIpv4 () {
 	        {
 	            /**
 	     * Return the reversed ip6.arpa form of the address
+	     * @memberof Address4
 	     * @param {Object} options
 	     * @param {boolean} options.omitSuffix - omit the "in-addr.arpa" suffix
+	     * @instance
 	     * @returns {String}
 	     */ key: "reverseForm",
 	            value: function reverseForm(options) {
@@ -79889,79 +79807,23 @@ function requireIpv4 () {
 	        {
 	            /**
 	     * Returns true if the given address is a multicast address
+	     * @memberof Address4
+	     * @instance
 	     * @returns {boolean}
 	     */ key: "isMulticast",
 	            value: function isMulticast() {
-	                return this.isInSubnet(MULTICAST_V4);
-	            }
-	        },
-	        {
-	            /**
-	     * Returns true if the address is in one of the [RFC 1918](https://datatracker.ietf.org/doc/html/rfc1918) private address ranges (`10.0.0.0/8`, `172.16.0.0/12`, `192.168.0.0/16`).
-	     * @returns {boolean}
-	     */ key: "isPrivate",
-	            value: function isPrivate() {
-	                var _this = this;
-	                return PRIVATE_V4.some(function(subnet) {
-	                    return _this.isInSubnet(subnet);
-	                });
-	            }
-	        },
-	        {
-	            /**
-	     * Returns true if the address is in the loopback range `127.0.0.0/8` ([RFC 1122](https://datatracker.ietf.org/doc/html/rfc1122)).
-	     * @returns {boolean}
-	     */ key: "isLoopback",
-	            value: function isLoopback() {
-	                return this.isInSubnet(LOOPBACK_V4);
-	            }
-	        },
-	        {
-	            /**
-	     * Returns true if the address is in the link-local range `169.254.0.0/16` ([RFC 3927](https://datatracker.ietf.org/doc/html/rfc3927)).
-	     * @returns {boolean}
-	     */ key: "isLinkLocal",
-	            value: function isLinkLocal() {
-	                return this.isInSubnet(LINK_LOCAL_V4);
-	            }
-	        },
-	        {
-	            /**
-	     * Returns true if the address is the unspecified address `0.0.0.0`.
-	     * @returns {boolean}
-	     */ key: "isUnspecified",
-	            value: function isUnspecified() {
-	                return this.isInSubnet(UNSPECIFIED_V4);
-	            }
-	        },
-	        {
-	            /**
-	     * Returns true if the address is the limited broadcast address `255.255.255.255` ([RFC 919](https://datatracker.ietf.org/doc/html/rfc919)).
-	     * @returns {boolean}
-	     */ key: "isBroadcast",
-	            value: function isBroadcast() {
-	                return this.isInSubnet(BROADCAST_V4);
-	            }
-	        },
-	        {
-	            /**
-	     * Returns true if the address is in the carrier-grade NAT range `100.64.0.0/10` ([RFC 6598](https://datatracker.ietf.org/doc/html/rfc6598)).
-	     * @returns {boolean}
-	     */ key: "isCGNAT",
-	            value: function isCGNAT() {
-	                return this.isInSubnet(CGNAT_V4);
+	                return this.isInSubnet(new Address4('224.0.0.0/4'));
 	            }
 	        },
 	        {
 	            /**
 	     * Returns a zero-padded base-2 string representation of the address
+	     * @memberof Address4
+	     * @instance
 	     * @returns {string}
 	     */ key: "binaryZeroPad",
 	            value: function binaryZeroPad() {
-	                if (this._binaryZeroPad === undefined) {
-	                    this._binaryZeroPad = this.bigInt().toString(2).padStart(constants.BITS, '0');
-	                }
-	                return this._binaryZeroPad;
+	                return this.bigInt().toString(2).padStart(constants.BITS, '0');
 	            }
 	        },
 	        {
@@ -79977,13 +79839,7 @@ function requireIpv4 () {
 	    ], [
 	        {
 	            key: "isValid",
-	            value: /**
-	     * Returns true if the given string is a valid IPv4 address (with optional
-	     * CIDR subnet), false otherwise. Host bits in the subnet portion are
-	     * allowed (e.g. `192.168.1.5/24` is valid); for strict network-address
-	     * validation compare `correctForm()` to `startAddress().correctForm()`,
-	     * or use `networkForm()`.
-	     */ function isValid(address) {
+	            value: function isValid(address) {
 	                try {
 	                    // eslint-disable-next-line no-new
 	                    new Address4(address);
@@ -79993,93 +79849,21 @@ function requireIpv4 () {
 	                }
 	            }
 	        },
-	        {
-	            key: "fromAddressAndMask",
-	            value: /**
-	     * Construct an `Address4` from an address and a dotted-decimal subnet
-	     * mask given as separate strings (e.g. as returned by Node's
-	     * `os.networkInterfaces()`). Throws `AddressError` if the mask is
-	     * non-contiguous (e.g. `255.0.255.0`).
-	     * @example
-	     * var address = Address4.fromAddressAndMask('192.168.1.1', '255.255.255.0');
-	     * address.subnetMask; // 24
-	     */ function fromAddressAndMask(address, mask) {
-	                var bits = common.prefixLengthFromMask(new Address4(mask).bigInt(), constants.BITS);
-	                return new Address4("".concat(address, "/").concat(bits));
-	            }
-	        },
-	        {
-	            key: "fromAddressAndWildcardMask",
-	            value: /**
-	     * Construct an `Address4` from an address and a Cisco-style wildcard mask
-	     * given as separate strings (e.g. `0.0.0.255` for a `/24`). The wildcard
-	     * mask is the bitwise inverse of the subnet mask. Throws `AddressError`
-	     * if the mask is non-contiguous (e.g. `0.255.0.255`).
-	     * @example
-	     * var address = Address4.fromAddressAndWildcardMask('10.0.0.1', '0.0.0.255');
-	     * address.subnetMask; // 24
-	     */ function fromAddressAndWildcardMask(address, wildcardMask) {
-	                var wildcard = new Address4(wildcardMask).bigInt();
-	                var allOnes = (BigInt(1) << BigInt(constants.BITS)) - BigInt(1);
-	                // eslint-disable-next-line no-bitwise
-	                var mask = wildcard ^ allOnes;
-	                var bits = common.prefixLengthFromMask(mask, constants.BITS);
-	                return new Address4("".concat(address, "/").concat(bits));
-	            }
-	        },
-	        {
-	            key: "fromWildcard",
-	            value: /**
-	     * Construct an `Address4` from a wildcard pattern with trailing `*`
-	     * octets. The number of trailing wildcards determines the prefix
-	     * length: each `*` represents 8 bits.
-	     *
-	     * Only trailing whole-octet wildcards are supported. Partial-octet
-	     * wildcards (e.g. `192.168.0.1*`) and interior wildcards (e.g.
-	     * `192.*.0.1`) throw `AddressError`.
-	     * @example
-	     * Address4.fromWildcard('192.168.0.*').subnet;   // '/24'
-	     * Address4.fromWildcard('192.168.*.*').subnet;   // '/16'
-	     * Address4.fromWildcard('*.*.*.*').subnet;       // '/0'
-	     */ function fromWildcard(input) {
-	                var groups = input.split('.');
-	                if (groups.length !== constants.GROUPS) {
-	                    throw new address_error_1.AddressError('Wildcard pattern must have 4 octets');
-	                }
-	                var firstWildcard = -1;
-	                for(var i = 0; i < groups.length; i++){
-	                    if (groups[i] === '*') {
-	                        if (firstWildcard === -1) {
-	                            firstWildcard = i;
-	                        }
-	                    } else if (firstWildcard !== -1) {
-	                        throw new address_error_1.AddressError('Wildcard `*` must only appear in trailing octets (e.g. `192.168.0.*`)');
-	                    }
-	                }
-	                var trailing = firstWildcard === -1 ? 0 : groups.length - firstWildcard;
-	                var replaced = groups.map(function(g) {
-	                    return g === '*' ? '0' : g;
-	                });
-	                var subnetBits = constants.BITS - trailing * 8;
-	                return new Address4("".concat(replaced.join('.'), "/").concat(subnetBits));
-	            }
-	        },
 	        {
 	            key: "fromHex",
 	            value: /**
-	     * Converts a hex string to an IPv4 address object. Accepts 8 hex digits
-	     * with optional `:` separators (e.g. `'7f000001'` or `'7f:00:00:01'`).
-	     * Throws `AddressError` for any other length or for non-hex characters.
+	     * Converts a hex string to an IPv4 address object
+	     * @memberof Address4
+	     * @static
 	     * @param {string} hex - a hex string to convert
 	     * @returns {Address4}
 	     */ function fromHex(hex) {
-	                var stripped = hex.replace(/:/g, '');
-	                if (!/^[0-9a-fA-F]{8}$/.test(stripped)) {
-	                    throw new address_error_1.AddressError('IPv4 hex must be exactly 8 hex digits');
-	                }
+	                var padded = hex.replace(/:/g, '').padStart(8, '0');
 	                var groups = [];
-	                for(var i = 0; i < 8; i += 2){
-	                    groups.push(parseInt(stripped.slice(i, i + 2), 16));
+	                var i;
+	                for(i = 0; i < 8; i += 2){
+	                    var h = padded.slice(i, i + 2);
+	                    groups.push(parseInt(h, 16));
 	                }
 	                return new Address4(groups.join('.'));
 	            }
@@ -80087,22 +79871,21 @@ function requireIpv4 () {
 	        {
 	            key: "fromInteger",
 	            value: /**
-	     * Converts an integer into a IPv4 address object. The integer must be a
-	     * non-negative safe integer in the range `[0, 2**32 - 1]`; otherwise
-	     * `AddressError` is thrown.
+	     * Converts an integer into a IPv4 address object
+	     * @memberof Address4
+	     * @static
 	     * @param {integer} integer - a number to convert
 	     * @returns {Address4}
 	     */ function fromInteger(integer) {
-	                if (!Number.isInteger(integer) || integer < 0 || integer > 0xffffffff) {
-	                    throw new address_error_1.AddressError('IPv4 integer must be in the range 0 to 2**32 - 1');
-	                }
-	                return Address4.fromHex(integer.toString(16).padStart(8, '0'));
+	                return Address4.fromHex(integer.toString(16));
 	            }
 	        },
 	        {
 	            key: "fromArpa",
 	            value: /**
 	     * Return an address from in-addr.arpa form
+	     * @memberof Address4
+	     * @static
 	     * @param {string} arpaFormAddress - an 'in-addr.arpa' form ipv4 address
 	     * @returns {Adress4}
 	     * @example
@@ -80118,67 +79901,19 @@ function requireIpv4 () {
 	        {
 	            key: "fromBigInt",
 	            value: /**
-	     * Converts a BigInt to a v4 address object. The value must be in the
-	     * range `[0, 2**32 - 1]`; otherwise `AddressError` is thrown.
+	     * Converts a BigInt to a v4 address object
+	     * @memberof Address4
+	     * @static
 	     * @param {bigint} bigInt - a BigInt to convert
 	     * @returns {Address4}
 	     */ function fromBigInt(bigInt) {
-	                if (bigInt < 0n || bigInt > 0xffffffffn) {
-	                    throw new address_error_1.AddressError('IPv4 BigInt must be in the range 0 to 2**32 - 1');
-	                }
-	                return Address4.fromHex(bigInt.toString(16).padStart(8, '0'));
-	            }
-	        },
-	        {
-	            key: "fromByteArray",
-	            value: /**
-	     * Convert a byte array to an Address4 object.
-	     *
-	     * To convert from a Node.js `Buffer`, spread it: `Address4.fromByteArray([...buf])`.
-	     * @param {Array<number>} bytes - an array of 4 bytes (0-255)
-	     * @returns {Address4}
-	     */ function fromByteArray(bytes) {
-	                if (bytes.length !== 4) {
-	                    throw new address_error_1.AddressError('IPv4 addresses require exactly 4 bytes');
-	                }
-	                // Validate that all bytes are within valid range (0-255)
-	                for(var i = 0; i < bytes.length; i++){
-	                    if (!Number.isInteger(bytes[i]) || bytes[i] < 0 || bytes[i] > 255) {
-	                        throw new address_error_1.AddressError('All bytes must be integers between 0 and 255');
-	                    }
-	                }
-	                return this.fromUnsignedByteArray(bytes);
-	            }
-	        },
-	        {
-	            key: "fromUnsignedByteArray",
-	            value: /**
-	     * Convert an unsigned byte array to an Address4 object
-	     * @param {Array<number>} bytes - an array of 4 unsigned bytes (0-255)
-	     * @returns {Address4}
-	     */ function fromUnsignedByteArray(bytes) {
-	                if (bytes.length !== 4) {
-	                    throw new address_error_1.AddressError('IPv4 addresses require exactly 4 bytes');
-	                }
-	                var address = bytes.join('.');
-	                return new Address4(address);
+	                return Address4.fromHex(bigInt.toString(16));
 	            }
 	        }
 	    ]);
 	    return Address4;
 	}();
-	ipv4.Address4 = Address4;
-	var MULTICAST_V4 = new Address4('224.0.0.0/4');
-	var PRIVATE_V4 = [
-	    new Address4('10.0.0.0/8'),
-	    new Address4('172.16.0.0/12'),
-	    new Address4('192.168.0.0/16')
-	];
-	var LOOPBACK_V4 = new Address4('127.0.0.0/8');
-	var LINK_LOCAL_V4 = new Address4('169.254.0.0/16');
-	var UNSPECIFIED_V4 = new Address4('0.0.0.0/32');
-	var BROADCAST_V4 = new Address4('255.255.255.255/32');
-	var CGNAT_V4 = new Address4('100.64.0.0/10'); 
+	ipv4.Address4 = Address4; 
 	return ipv4;
 }
 
@@ -80237,12 +79972,7 @@ function requireConstants () {
 	    '::/128': 'Unspecified',
 	    '::1/128': 'Loopback',
 	    'ff00::/8': 'Multicast',
-	    'fe80::/10': 'Link-local unicast',
-	    'fc00::/7': 'Unique local',
-	    '2002::/16': '6to4',
-	    '2001:db8::/32': 'Documentation',
-	    '64:ff9b::/96': 'NAT64 (well-known)',
-	    '64:ff9b:1::/48': 'NAT64 (local-use)'
+	    'fe80::/10': 'Link-local unicast'
 	};
 	/**
 	 * A regular expression that matches bad characters in an IPv6 address
@@ -80279,18 +80009,14 @@ function requireHelpers$1 () {
 	Object.defineProperty(helpers, "__esModule", {
 	    value: true
 	});
-	helpers.escapeHtml = escapeHtml;
 	helpers.spanAllZeroes = spanAllZeroes;
 	helpers.spanAll = spanAll;
 	helpers.spanLeadingZeroes = spanLeadingZeroes;
 	helpers.simpleGroup = simpleGroup;
-	function escapeHtml(s) {
-	    return s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#39;');
-	}
 	/**
 	 * @returns {String} the string with all zeroes contained in a <span>
 	 */ function spanAllZeroes(s) {
-	    return escapeHtml(s).replace(/(0+)/g, '<span class="zero">$1</span>');
+	    return s.replace(/(0+)/g, '<span class="zero">$1</span>');
 	}
 	/**
 	 * @returns {String} the string with each character contained in a <span>
@@ -80298,11 +80024,11 @@ function requireHelpers$1 () {
 	    var offset = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 0;
 	    var letters = s.split('');
 	    return letters.map(function(n, i) {
-	        return '<span class="digit value-'.concat(escapeHtml(n), " position-").concat(i + offset, '">').concat(spanAllZeroes(n), "</span>");
+	        return '<span class="digit value-'.concat(n, " position-").concat(i + offset, '">').concat(spanAllZeroes(n), "</span>");
 	    }).join('');
 	}
 	function spanLeadingZeroesSimple(group) {
-	    return escapeHtml(group).replace(/^(0+)/, '<span class="zero">$1</span>');
+	    return group.replace(/^(0+)/, '<span class="zero">$1</span>');
 	}
 	/**
 	 * @returns {String} the string with leading zeroes contained in a <span>
@@ -80580,7 +80306,6 @@ function requireIpv6 () {
 	var regular_expressions_1 = requireRegularExpressions();
 	var address_error_1 = requireAddressError();
 	var common_1 = requireCommon();
-	var isCorrect6 = common.isCorrect(constants6.BITS);
 	function assert(condition) {
 	    if (!condition) {
 	        throw new Error('Assertion failed.');
@@ -80624,6 +80349,7 @@ function requireIpv6 () {
 	}
 	/**
 	 * Represents an IPv6 address
+	 * @class Address6
 	 * @param {string} address - An IPv6 address string
 	 * @param {number} [groups=8] - How many octets to parse
 	 * @example
@@ -80640,12 +80366,16 @@ function requireIpv6 () {
 	        // #region Attributes
 	        /**
 	         * Returns true if the given address is in the subnet of the current address
+	         * @memberof Address6
+	         * @instance
 	         * @returns {boolean}
 	         */ this.isInSubnet = common.isInSubnet;
 	        /**
 	         * Returns true if the address is correct, false otherwise
+	         * @memberof Address6
+	         * @instance
 	         * @returns {boolean}
-	         */ this.isCorrect = isCorrect6;
+	         */ this.isCorrect = common.isCorrect(constants6.BITS);
 	        if (optionalGroups === undefined) {
 	            this.groups = constants6.GROUPS;
 	        } else {
@@ -80676,6 +80406,8 @@ function requireIpv6 () {
 	        {
 	            /**
 	     * Return the Microsoft UNC transcription of the address
+	     * @memberof Address6
+	     * @instance
 	     * @returns {String} the Microsoft UNC transcription of the address
 	     */ key: "microsoftTranscription",
 	            value: function microsoftTranscription() {
@@ -80685,6 +80417,8 @@ function requireIpv6 () {
 	        {
 	            /**
 	     * Return the first n bits of the address, defaulting to the subnet mask
+	     * @memberof Address6
+	     * @instance
 	     * @param {number} [mask=subnet] - the number of bits to mask
 	     * @returns {String} the first n bits of the address as a string
 	     */ key: "mask",
@@ -80696,6 +80430,8 @@ function requireIpv6 () {
 	        {
 	            /**
 	     * Return the number of possible subnets of a given size in the address
+	     * @memberof Address6
+	     * @instance
 	     * @param {number} [subnetSize=128] - the subnet size
 	     * @returns {String}
 	     */ // TODO: probably useful to have a numeric version of this too
@@ -80714,6 +80450,8 @@ function requireIpv6 () {
 	        {
 	            /**
 	     * Helper function getting start address.
+	     * @memberof Address6
+	     * @instance
 	     * @returns {bigint}
 	     */ key: "_startAddress",
 	            value: function _startAddress() {
@@ -80724,6 +80462,8 @@ function requireIpv6 () {
 	            /**
 	     * The first address in the range given by this address' subnet
 	     * Often referred to as the Network Address.
+	     * @memberof Address6
+	     * @instance
 	     * @returns {Address6}
 	     */ key: "startAddress",
 	            value: function startAddress() {
@@ -80734,6 +80474,8 @@ function requireIpv6 () {
 	            /**
 	     * The first host address in the range given by this address's subnet ie
 	     * the first address after the Network Address
+	     * @memberof Address6
+	     * @instance
 	     * @returns {Address6}
 	     */ key: "startAddressExclusive",
 	            value: function startAddressExclusive() {
@@ -80744,6 +80486,8 @@ function requireIpv6 () {
 	        {
 	            /**
 	     * Helper function getting end address.
+	     * @memberof Address6
+	     * @instance
 	     * @returns {bigint}
 	     */ key: "_endAddress",
 	            value: function _endAddress() {
@@ -80754,6 +80498,8 @@ function requireIpv6 () {
 	            /**
 	     * The last address in the range given by this address' subnet
 	     * Often referred to as the Broadcast
+	     * @memberof Address6
+	     * @instance
 	     * @returns {Address6}
 	     */ key: "endAddress",
 	            value: function endAddress() {
@@ -80764,6 +80510,8 @@ function requireIpv6 () {
 	            /**
 	     * The last host address in the range given by this address's subnet ie
 	     * the last address prior to the Broadcast Address
+	     * @memberof Address6
+	     * @instance
 	     * @returns {Address6}
 	     */ key: "endAddressExclusive",
 	            value: function endAddressExclusive() {
@@ -80773,75 +80521,47 @@ function requireIpv6 () {
 	        },
 	        {
 	            /**
-	     * The hex form of the subnet mask, e.g. `ffff:ffff:ffff:ffff::` for a
-	     * `/64`. Returns an `Address6`; call `.correctForm()` for the string.
-	     * @returns {Address6}
-	     */ key: "subnetMaskAddress",
-	            value: function subnetMaskAddress() {
-	                return Address6.fromBigInt(BigInt("0b".concat('1'.repeat(this.subnetMask)).concat('0'.repeat(constants6.BITS - this.subnetMask))));
-	            }
-	        },
-	        {
-	            /**
-	     * The Cisco-style wildcard mask, e.g. `::ffff:ffff:ffff:ffff` for a
-	     * `/64`. This is the bitwise inverse of `subnetMaskAddress()`. Returns
-	     * an `Address6`; call `.correctForm()` for the string.
-	     * @returns {Address6}
-	     */ key: "wildcardMask",
-	            value: function wildcardMask() {
-	                return Address6.fromBigInt(BigInt("0b".concat('0'.repeat(this.subnetMask)).concat('1'.repeat(constants6.BITS - this.subnetMask))));
-	            }
-	        },
-	        {
-	            /**
-	     * The network address in CIDR string form, e.g. `2001:db8::/32` for
-	     * `2001:db8::1/32`. For an address with no explicit subnet the prefix
-	     * is `/128`, e.g. `networkForm()` on `2001:db8::1` returns
-	     * `2001:db8::1/128`.
-	     * @returns {string}
-	     */ key: "networkForm",
-	            value: function networkForm() {
-	                return "".concat(this.startAddress().correctForm(), "/").concat(this.subnetMask);
-	            }
-	        },
-	        {
-	            /**
-	     * Return the scope of the address. The 4-bit scope field
-	     * ([RFC 4291 §2.7](https://datatracker.ietf.org/doc/html/rfc4291#section-2.7))
-	     * is only defined for multicast addresses; for unicast addresses the scope
-	     * is derived from the address type per
-	     * [RFC 4007 §6](https://datatracker.ietf.org/doc/html/rfc4007#section-6).
+	     * Return the scope of the address
+	     * @memberof Address6
+	     * @instance
 	     * @returns {String}
 	     */ key: "getScope",
 	            value: function getScope() {
-	                var type = this.getType();
-	                if (type === 'Multicast' || type.startsWith('Multicast ')) {
-	                    var scope = constants6.SCOPES[parseInt(this.getBits(12, 16).toString(10), 10)];
-	                    return scope || 'Unknown';
-	                }
-	                // RFC 4291 §2.5.3: the loopback address is treated as having Link-Local
-	                // scope. (Multicast scope 1, "Interface-Local", is a different concept
-	                // used only for loopback transmission of multicast.)
-	                if (type === 'Link-local unicast' || type === 'Loopback') {
-	                    return 'Link local';
-	                }
-	                // RFC 4007 §6: the unspecified address has no scope.
-	                if (type === 'Unspecified') {
-	                    return 'Unknown';
+	                var scope = constants6.SCOPES[parseInt(this.getBits(12, 16).toString(10), 10)];
+	                if (this.getType() === 'Global unicast' && scope !== 'Link local') {
+	                    scope = 'Global';
 	                }
-	                return 'Global';
+	                return scope || 'Unknown';
 	            }
 	        },
 	        {
 	            /**
 	     * Return the type of the address
+	     * @memberof Address6
+	     * @instance
 	     * @returns {String}
 	     */ key: "getType",
 	            value: function getType() {
-	                for(var i = 0; i < TYPE_SUBNETS.length; i++){
-	                    var entry = TYPE_SUBNETS[i];
-	                    if (this.isInSubnet(entry[0])) {
-	                        return entry[1];
+	                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+	                try {
+	                    for(var _iterator = Object.keys(constants6.TYPES)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+	                        var subnet = _step.value;
+	                        if (this.isInSubnet(new Address6(subnet))) {
+	                            return constants6.TYPES[subnet];
+	                        }
+	                    }
+	                } catch (err) {
+	                    _didIteratorError = true;
+	                    _iteratorError = err;
+	                } finally{
+	                    try {
+	                        if (!_iteratorNormalCompletion && _iterator.return != null) {
+	                            _iterator.return();
+	                        }
+	                    } finally{
+	                        if (_didIteratorError) {
+	                            throw _iteratorError;
+	                        }
 	                    }
 	                }
 	                return 'Global unicast';
@@ -80850,6 +80570,8 @@ function requireIpv6 () {
 	        {
 	            /**
 	     * Return the bits in the given range as a BigInt
+	     * @memberof Address6
+	     * @instance
 	     * @returns {bigint}
 	     */ key: "getBits",
 	            value: function getBits(start, end) {
@@ -80859,6 +80581,8 @@ function requireIpv6 () {
 	        {
 	            /**
 	     * Return the bits in the given range as a base-2 string
+	     * @memberof Address6
+	     * @instance
 	     * @returns {String}
 	     */ key: "getBitsBase2",
 	            value: function getBitsBase2(start, end) {
@@ -80868,6 +80592,8 @@ function requireIpv6 () {
 	        {
 	            /**
 	     * Return the bits in the given range as a base-16 string
+	     * @memberof Address6
+	     * @instance
 	     * @returns {String}
 	     */ key: "getBitsBase16",
 	            value: function getBitsBase16(start, end) {
@@ -80881,6 +80607,8 @@ function requireIpv6 () {
 	        {
 	            /**
 	     * Return the bits that are set past the subnet mask length
+	     * @memberof Address6
+	     * @instance
 	     * @returns {String}
 	     */ key: "getBitsPastSubnet",
 	            value: function getBitsPastSubnet() {
@@ -80890,8 +80618,10 @@ function requireIpv6 () {
 	        {
 	            /**
 	     * Return the reversed ip6.arpa form of the address
+	     * @memberof Address6
 	     * @param {Object} options
 	     * @param {boolean} options.omitSuffix - omit the "ip6.arpa" suffix
+	     * @instance
 	     * @returns {String}
 	     */ key: "reverseForm",
 	            value: function reverseForm(options) {
@@ -80914,10 +80644,10 @@ function requireIpv6 () {
 	        },
 	        {
 	            /**
-	     * Returns the address in correct form, per
-	     * [RFC 5952](https://datatracker.ietf.org/doc/html/rfc5952): leading zeros
-	     * stripped, the longest run of zero groups collapsed to `::`, and hex digits
-	     * lowercased (e.g. `2001:db8::1`). This is the recommended form for display.
+	     * Return the correct form of the address
+	     * @memberof Address6
+	     * @instance
+	     * @returns {String}
 	     */ key: "correctForm",
 	            value: function correctForm() {
 	                var i;
@@ -80971,6 +80701,8 @@ function requireIpv6 () {
 	        {
 	            /**
 	     * Return a zero-padded base-2 string representation of the address
+	     * @memberof Address6
+	     * @instance
 	     * @returns {String}
 	     * @example
 	     * var address = new Address6('2001:4860:4001:803::1011');
@@ -80979,24 +80711,13 @@ function requireIpv6 () {
 	     * //  0000000000000000000000000000000000000000000000000001000000010001'
 	     */ key: "binaryZeroPad",
 	            value: function binaryZeroPad() {
-	                if (this._binaryZeroPad === undefined) {
-	                    this._binaryZeroPad = this.bigInt().toString(2).padStart(constants6.BITS, '0');
-	                }
-	                return this._binaryZeroPad;
+	                return this.bigInt().toString(2).padStart(constants6.BITS, '0');
 	            }
 	        },
 	        {
-	            /**
-	     * Parses a v4-in-v6 string (e.g. `::ffff:192.168.0.1`) by extracting the
-	     * trailing IPv4 address into `this.address4` / `this.parsedAddress4` and
-	     * returning the address with the v4 portion converted to two v6 groups.
-	     * Used internally by `parse()`.
-	     */ // TODO: Improve the semantics of this helper function
+	            // TODO: Improve the semantics of this helper function
 	            key: "parse4in6",
 	            value: function parse4in6(address) {
-	                if (address.indexOf('.') === -1) {
-	                    return address;
-	                }
 	                var groups = address.split(':');
 	                var lastGroup = groups.slice(-1)[0];
 	                var address4 = lastGroup.match(constants4.RE_ADDRESS);
@@ -81005,12 +80726,7 @@ function requireIpv6 () {
 	                    this.address4 = new ipv4_1.Address4(this.parsedAddress4);
 	                    for(var i = 0; i < this.address4.groups; i++){
 	                        if (/^0[0-9]+/.test(this.address4.parsedAddress[i])) {
-	                            // The prefix groups haven't been through the bad-character check
-	                            // yet, so escape them before including in the error HTML.
-	                            var highlighted = this.address4.parsedAddress.map(spanLeadingZeroes4).join('.');
-	                            var prefix = groups.slice(0, -1).map(helpers.escapeHtml).join(':');
-	                            var separator = groups.length > 1 ? ':' : '';
-	                            throw new address_error_1.AddressError("IPv4 addresses can't have leading zeroes.", "".concat(prefix).concat(separator).concat(highlighted));
+	                            throw new address_error_1.AddressError("IPv4 addresses can't have leading zeroes.", address.replace(constants4.RE_ADDRESS, this.address4.parsedAddress.map(spanLeadingZeroes4).join('.')));
 	                        }
 	                    }
 	                    this.v4 = true;
@@ -81021,13 +80737,7 @@ function requireIpv6 () {
 	            }
 	        },
 	        {
-	            /**
-	     * Parses an IPv6 address string into its 8 hexadecimal groups (expanding
-	     * any `::` elision and any trailing v4-in-v6 portion) and stores the result
-	     * on `this.parsedAddress`. Called automatically by the constructor; you
-	     * typically don't need to call it directly. Throws `AddressError` if the
-	     * input is malformed.
-	     */ // TODO: Make private?
+	            // TODO: Make private?
 	            key: "parse",
 	            value: function parse(address) {
 	                address = this.parse4in6(address);
@@ -81079,10 +80789,10 @@ function requireIpv6 () {
 	        },
 	        {
 	            /**
-	     * Returns the canonical (fully expanded) form of the address: all 8 groups,
-	     * each padded to 4 hex digits, with no `::` collapsing
-	     * (e.g. `2001:0db8:0000:0000:0000:0000:0000:0001`). Useful for sorting and
-	     * byte-exact comparison.
+	     * Return the canonical form of the address
+	     * @memberof Address6
+	     * @instance
+	     * @returns {String}
 	     */ key: "canonicalForm",
 	            value: function canonicalForm() {
 	                return this.parsedAddress.map(paddedHex).join(':');
@@ -81091,6 +80801,8 @@ function requireIpv6 () {
 	        {
 	            /**
 	     * Return the decimal form of the address
+	     * @memberof Address6
+	     * @instance
 	     * @returns {String}
 	     */ key: "decimal",
 	            value: function decimal() {
@@ -81102,6 +80814,8 @@ function requireIpv6 () {
 	        {
 	            /**
 	     * Return the address as a BigInt
+	     * @memberof Address6
+	     * @instance
 	     * @returns {bigint}
 	     */ key: "bigInt",
 	            value: function bigInt() {
@@ -81111,6 +80825,8 @@ function requireIpv6 () {
 	        {
 	            /**
 	     * Return the last two groups of this address as an IPv4 address string
+	     * @memberof Address6
+	     * @instance
 	     * @returns {Address4}
 	     * @example
 	     * var address = new Address6('2001:4860:4001::1825:bf11');
@@ -81118,12 +80834,14 @@ function requireIpv6 () {
 	     */ key: "to4",
 	            value: function to4() {
 	                var binary = this.binaryZeroPad().split('');
-	                return ipv4_1.Address4.fromHex(BigInt("0b".concat(binary.slice(96, 128).join(''))).toString(16).padStart(8, '0'));
+	                return ipv4_1.Address4.fromHex(BigInt("0b".concat(binary.slice(96, 128).join(''))).toString(16));
 	            }
 	        },
 	        {
 	            /**
 	     * Return the v4-in-v6 form of the address
+	     * @memberof Address6
+	     * @instance
 	     * @returns {String}
 	     */ key: "to4in6",
 	            value: function to4in6() {
@@ -81139,10 +80857,10 @@ function requireIpv6 () {
 	        },
 	        {
 	            /**
-	     * Decodes the Teredo tunneling fields embedded in this address. Returns the
-	     * Teredo prefix, server IPv4, client IPv4, raw flag bits, cone-NAT flag,
-	     * UDP port, and Microsoft-format flag breakdown (reserved, universal/local,
-	     * group/individual, nonce). Only meaningful for addresses in `2001::/32`.
+	     * Return an object containing the Teredo properties of the address
+	     * @memberof Address6
+	     * @instance
+	     * @returns {Object}
 	     */ key: "inspectTeredo",
 	            value: function inspectTeredo() {
 	                /*
@@ -81172,7 +80890,7 @@ function requireIpv6 () {
 	                var server4 = ipv4_1.Address4.fromHex(this.getBitsBase16(32, 64));
 	                var bitsForClient4 = this.getBits(96, 128);
 	                // eslint-disable-next-line no-bitwise
-	                var client4 = ipv4_1.Address4.fromHex((bitsForClient4 ^ BigInt('0xffffffff')).toString(16).padStart(8, '0'));
+	                var client4 = ipv4_1.Address4.fromHex((bitsForClient4 ^ BigInt('0xffffffff')).toString(16));
 	                var flagsBase2 = this.getBitsBase2(64, 80);
 	                var coneNat = (0, common_1.testBit)(flagsBase2, 15);
 	                var reserved = (0, common_1.testBit)(flagsBase2, 14);
@@ -81197,9 +80915,10 @@ function requireIpv6 () {
 	        },
 	        {
 	            /**
-	     * Decodes the 6to4 tunneling fields embedded in this address. Returns the
-	     * 6to4 prefix and the embedded IPv4 gateway address. Only meaningful for
-	     * addresses in `2002::/16`.
+	     * Return an object containing the 6to4 properties of the address
+	     * @memberof Address6
+	     * @instance
+	     * @returns {Object}
 	     */ key: "inspect6to4",
 	            value: function inspect6to4() {
 	                /*
@@ -81216,6 +80935,8 @@ function requireIpv6 () {
 	        {
 	            /**
 	     * Return a v6 6to4 address from a v6 v4inv6 address
+	     * @memberof Address6
+	     * @instance
 	     * @returns {Address6}
 	     */ key: "to6to4",
 	            value: function to6to4() {
@@ -81234,43 +80955,9 @@ function requireIpv6 () {
 	        },
 	        {
 	            /**
-	     * Extract the embedded IPv4 address from a NAT64 IPv6 address using the
-	     * encoding defined by [RFC 6052](https://datatracker.ietf.org/doc/html/rfc6052).
-	     * The default prefix is the well-known prefix `64:ff9b::/96`. Returns
-	     * `null` if this address is not contained within the given prefix.
-	     * @example
-	     * new Address6('64:ff9b::c000:221').toAddress4Nat64()!.correctForm(); // '192.0.2.33'
-	     */ key: "toAddress4Nat64",
-	            value: function toAddress4Nat64() {
-	                var prefix = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : '64:ff9b::/96';
-	                var prefix6 = new Address6(prefix);
-	                var pl = prefix6.subnetMask;
-	                if (pl !== 32 && pl !== 40 && pl !== 48 && pl !== 56 && pl !== 64 && pl !== 96) {
-	                    throw new address_error_1.AddressError('NAT64 prefix length must be 32, 40, 48, 56, 64, or 96');
-	                }
-	                if (!this.isInSubnet(prefix6)) {
-	                    return null;
-	                }
-	                var bits = this.binaryZeroPad();
-	                var v4Bits;
-	                if (pl === 96) {
-	                    v4Bits = bits.slice(96, 128);
-	                } else {
-	                    var beforeU = 64 - pl;
-	                    v4Bits = bits.slice(pl, pl + beforeU) + bits.slice(72, 72 + (32 - beforeU));
-	                }
-	                var octets = [];
-	                for(var i = 0; i < 4; i++){
-	                    octets.push(parseInt(v4Bits.slice(i * 8, (i + 1) * 8), 2).toString());
-	                }
-	                return new ipv4_1.Address4(octets.join('.'));
-	            }
-	        },
-	        {
-	            /**
-	     * Return a byte array.
-	     *
-	     * To get a Node.js `Buffer`, wrap the result: `Buffer.from(address.toByteArray())`.
+	     * Return a byte array
+	     * @memberof Address6
+	     * @instance
 	     * @returns {Array}
 	     */ key: "toByteArray",
 	            value: function toByteArray() {
@@ -81286,9 +80973,9 @@ function requireIpv6 () {
 	        },
 	        {
 	            /**
-	     * Return an unsigned byte array.
-	     *
-	     * To get a Node.js `Buffer`, wrap the result: `Buffer.from(address.toUnsignedByteArray())`.
+	     * Return an unsigned byte array
+	     * @memberof Address6
+	     * @instance
 	     * @returns {Array}
 	     */ key: "toUnsignedByteArray",
 	            value: function toUnsignedByteArray() {
@@ -81298,6 +80985,8 @@ function requireIpv6 () {
 	        {
 	            /**
 	     * Returns true if the address is in the canonical form, false otherwise
+	     * @memberof Address6
+	     * @instance
 	     * @returns {boolean}
 	     */ key: "isCanonical",
 	            value: function isCanonical() {
@@ -81307,6 +80996,8 @@ function requireIpv6 () {
 	        {
 	            /**
 	     * Returns true if the address is a link local address, false otherwise
+	     * @memberof Address6
+	     * @instance
 	     * @returns {boolean}
 	     */ key: "isLinkLocal",
 	            value: function isLinkLocal() {
@@ -81320,19 +81011,19 @@ function requireIpv6 () {
 	        {
 	            /**
 	     * Returns true if the address is a multicast address, false otherwise
+	     * @memberof Address6
+	     * @instance
 	     * @returns {boolean}
 	     */ key: "isMulticast",
 	            value: function isMulticast() {
-	                var type = this.getType();
-	                return type === 'Multicast' || type.startsWith('Multicast ');
+	                return this.getType() === 'Multicast';
 	            }
 	        },
 	        {
 	            /**
-	     * Returns true if the address was written in v4-in-v6 dotted-quad notation
-	     * (e.g. `::ffff:127.0.0.1`), false otherwise. This is a notation-level flag
-	     * and does not reflect whether the address bits lie in the IPv4-mapped
-	     * (`::ffff:0:0/96`) subnet — for that, see {@link isMapped4}.
+	     * Returns true if the address is a v4-in-v6 address, false otherwise
+	     * @memberof Address6
+	     * @instance
 	     * @returns {boolean}
 	     */ key: "is4",
 	            value: function is4() {
@@ -81341,78 +81032,42 @@ function requireIpv6 () {
 	        },
 	        {
 	            /**
-	     * Returns true if the address is an IPv4-mapped IPv6 address in
-	     * `::ffff:0:0/96` ([RFC 4291 §2.5.5.2](https://datatracker.ietf.org/doc/html/rfc4291#section-2.5.5.2)),
-	     * false otherwise. Unlike {@link is4}, this checks the underlying address
-	     * bits rather than the textual notation, so `::ffff:127.0.0.1` and
-	     * `::ffff:7f00:1` both return true.
-	     * @returns {boolean}
-	     */ key: "isMapped4",
-	            value: function isMapped4() {
-	                return this.isInSubnet(IPV4_MAPPED_SUBNET);
-	            }
-	        },
-	        {
-	            /**
 	     * Returns true if the address is a Teredo address, false otherwise
+	     * @memberof Address6
+	     * @instance
 	     * @returns {boolean}
 	     */ key: "isTeredo",
 	            value: function isTeredo() {
-	                return this.isInSubnet(TEREDO_SUBNET);
+	                return this.isInSubnet(new Address6('2001::/32'));
 	            }
 	        },
 	        {
 	            /**
 	     * Returns true if the address is a 6to4 address, false otherwise
+	     * @memberof Address6
+	     * @instance
 	     * @returns {boolean}
 	     */ key: "is6to4",
 	            value: function is6to4() {
-	                return this.isInSubnet(SIX_TO_FOUR_SUBNET);
+	                return this.isInSubnet(new Address6('2002::/16'));
 	            }
 	        },
 	        {
 	            /**
 	     * Returns true if the address is a loopback address, false otherwise
+	     * @memberof Address6
+	     * @instance
 	     * @returns {boolean}
 	     */ key: "isLoopback",
 	            value: function isLoopback() {
 	                return this.getType() === 'Loopback';
 	            }
 	        },
-	        {
-	            /**
-	     * Returns true if the address is a Unique Local Address in `fc00::/7` ([RFC 4193](https://datatracker.ietf.org/doc/html/rfc4193)). ULAs are the IPv6 equivalent of IPv4 [RFC 1918](https://datatracker.ietf.org/doc/html/rfc1918) private addresses.
-	     * @returns {boolean}
-	     */ key: "isULA",
-	            value: function isULA() {
-	                return this.isInSubnet(ULA_SUBNET);
-	            }
-	        },
-	        {
-	            /**
-	     * Returns true if the address is the unspecified address `::`.
-	     * @returns {boolean}
-	     */ key: "isUnspecified",
-	            value: function isUnspecified() {
-	                return this.getType() === 'Unspecified';
-	            }
-	        },
-	        {
-	            /**
-	     * Returns true if the address is in the documentation prefix `2001:db8::/32` ([RFC 3849](https://datatracker.ietf.org/doc/html/rfc3849)).
-	     * @returns {boolean}
-	     */ key: "isDocumentation",
-	            value: function isDocumentation() {
-	                return this.isInSubnet(DOCUMENTATION_SUBNET);
-	            }
-	        },
 	        {
 	            // #endregion
 	            // #region HTML
 	            /**
-	     * Returns the address as an HTTP URL with the host bracketed, e.g.
-	     * `http://[2001:db8::1]/`. If `optionalPort` is provided it is appended,
-	     * e.g. `http://[2001:db8::1]:8080/`.
+	     * @returns {String} the address in link form with a default port of 80
 	     */ key: "href",
 	            value: function href(optionalPort) {
 	                if (optionalPort === undefined) {
@@ -81425,12 +81080,7 @@ function requireIpv6 () {
 	        },
 	        {
 	            /**
-	     * Returns an HTML `<a>` element whose `href` encodes the address in a URL
-	     * hash fragment (default prefix `/#address=`). Useful for linking between
-	     * pages of an address-inspector UI.
-	     * @param options.className - CSS class for the rendered `<a>` element
-	     * @param options.prefix - hash prefix prepended to the address (default `/#address=`)
-	     * @param options.v4 - when true, render the address in v4-in-v6 form
+	     * @returns {String} a link suitable for conveying the address via a URL hash
 	     */ key: "link",
 	            value: function link(options) {
 	                if (!options) {
@@ -81450,13 +81100,10 @@ function requireIpv6 () {
 	                    formFunction = this.to4in6;
 	                }
 	                var form = formFunction.call(this);
-	                var safeHref = helpers.escapeHtml("".concat(options.prefix).concat(form));
-	                var safeForm = helpers.escapeHtml(form);
 	                if (options.className) {
-	                    var safeClass = helpers.escapeHtml(options.className);
-	                    return '<a href="'.concat(safeHref, '" class="').concat(safeClass, '">').concat(safeForm, "</a>");
+	                    return '<a href="'.concat(options.prefix).concat(form, '" class="').concat(options.className, '">').concat(form, "</a>");
 	                }
-	                return '<a href="'.concat(safeHref, '">').concat(safeForm, "</a>");
+	                return '<a href="'.concat(options.prefix).concat(form, '">').concat(form, "</a>");
 	            }
 	        },
 	        {
@@ -81467,13 +81114,13 @@ function requireIpv6 () {
 	            value: function group() {
 	                if (this.elidedGroups === 0) {
 	                    // The simple case
-	                    return helpers.simpleGroup(this.addressMinusSuffix).join(':');
+	                    return helpers.simpleGroup(this.address).join(':');
 	                }
 	                assert(typeof this.elidedGroups === 'number');
 	                assert(typeof this.elisionBegin === 'number');
 	                // The elided case
 	                var output = [];
-	                var _this_addressMinusSuffix_split = _sliced_to_array(this.addressMinusSuffix.split('::'), 2), left = _this_addressMinusSuffix_split[0], right = _this_addressMinusSuffix_split[1];
+	                var _this_address_split = _sliced_to_array(this.address.split('::'), 2), left = _this_address_split[0], right = _this_address_split[1];
 	                if (left.length) {
 	                    var _output;
 	                    (_output = output).push.apply(_output, _to_consumable_array(helpers.simpleGroup(left)));
@@ -81507,6 +81154,8 @@ function requireIpv6 () {
 	            /**
 	     * Generate a regular expression string that can be used to find or validate
 	     * all variations of this address
+	     * @memberof Address6
+	     * @instance
 	     * @param {boolean} substringSearch
 	     * @returns {string}
 	     */ key: "regularExpressionString",
@@ -81554,6 +81203,8 @@ function requireIpv6 () {
 	            /**
 	     * Generate a regular expression that can be used to find or validate all
 	     * variations of this address.
+	     * @memberof Address6
+	     * @instance
 	     * @param {boolean} substringSearch
 	     * @returns {RegExp}
 	     */ key: "regularExpression",
@@ -81565,13 +81216,7 @@ function requireIpv6 () {
 	    ], [
 	        {
 	            key: "isValid",
-	            value: /**
-	     * Returns true if the given string is a valid IPv6 address (with optional
-	     * CIDR subnet and zone identifier), false otherwise. Host bits in the
-	     * subnet portion are allowed (e.g. `2001:db8::1/32` is valid); for strict
-	     * network-address validation compare `correctForm()` to
-	     * `startAddress().correctForm()`, or use `networkForm()`.
-	     */ function isValid(address) {
+	            value: function isValid(address) {
 	                try {
 	                    // eslint-disable-next-line no-new
 	                    new Address6(address);
@@ -81584,8 +81229,9 @@ function requireIpv6 () {
 	        {
 	            key: "fromBigInt",
 	            value: /**
-	     * Convert a BigInt to a v6 address object. The value must be in the
-	     * range `[0, 2**128 - 1]`; otherwise `AddressError` is thrown.
+	     * Convert a BigInt to a v6 address object
+	     * @memberof Address6
+	     * @static
 	     * @param {bigint} bigInt - a BigInt to convert
 	     * @returns {Address6}
 	     * @example
@@ -81593,12 +81239,10 @@ function requireIpv6 () {
 	     * var address = Address6.fromBigInt(bigInt);
 	     * address.correctForm(); // '::e8:d4a5:1000'
 	     */ function fromBigInt(bigInt) {
-	                if (bigInt < 0n || bigInt > (1n << BigInt(constants6.BITS)) - 1n) {
-	                    throw new address_error_1.AddressError('IPv6 BigInt must be in the range 0 to 2**128 - 1');
-	                }
 	                var hex = bigInt.toString(16).padStart(32, '0');
 	                var groups = [];
-	                for(var i = 0; i < constants6.GROUPS; i++){
+	                var i;
+	                for(i = 0; i < constants6.GROUPS; i++){
 	                    groups.push(hex.slice(i * 4, (i + 1) * 4));
 	                }
 	                return new Address6(groups.join(':'));
@@ -81607,10 +81251,10 @@ function requireIpv6 () {
 	        {
 	            key: "fromURL",
 	            value: /**
-	     * Parse a URL (with optional bracketed host and port) into an address and
-	     * port. Returns either `{ address, port }` on success or
-	     * `{ error, address: null, port: null }` if the URL could not be parsed.
-	     * Ports are returned as numbers (or `null` if absent or out of range).
+	     * Convert a URL (with optional port number) to an address object
+	     * @memberof Address6
+	     * @static
+	     * @param {string} url - a URL with optional port number
 	     * @example
 	     * var addressAndPort = Address6.fromURL('http://[ffff::]:8080/foo/');
 	     * addressAndPort.address.correctForm(); // 'ffff::'
@@ -81666,100 +81310,12 @@ function requireIpv6 () {
 	                };
 	            }
 	        },
-	        {
-	            key: "fromAddressAndMask",
-	            value: /**
-	     * Construct an `Address6` from an address and a hex subnet mask given as
-	     * separate strings (e.g. as returned by Node's `os.networkInterfaces()`).
-	     * Throws `AddressError` if the mask is non-contiguous (e.g.
-	     * `ffff::ffff`).
-	     * @example
-	     * var address = Address6.fromAddressAndMask('fe80::1', 'ffff:ffff:ffff:ffff::');
-	     * address.subnetMask; // 64
-	     */ function fromAddressAndMask(address, mask) {
-	                var bits = common.prefixLengthFromMask(new Address6(mask).bigInt(), constants6.BITS);
-	                return new Address6("".concat(address, "/").concat(bits));
-	            }
-	        },
-	        {
-	            key: "fromAddressAndWildcardMask",
-	            value: /**
-	     * Construct an `Address6` from an address and a Cisco-style wildcard mask
-	     * given as separate strings (e.g. `::ffff:ffff:ffff:ffff` for a `/64`).
-	     * The wildcard mask is the bitwise inverse of the subnet mask. Throws
-	     * `AddressError` if the mask is non-contiguous.
-	     * @example
-	     * var address = Address6.fromAddressAndWildcardMask('fe80::1', '::ffff:ffff:ffff:ffff');
-	     * address.subnetMask; // 64
-	     */ function fromAddressAndWildcardMask(address, wildcardMask) {
-	                var wildcard = new Address6(wildcardMask).bigInt();
-	                var allOnes = (BigInt(1) << BigInt(constants6.BITS)) - BigInt(1);
-	                // eslint-disable-next-line no-bitwise
-	                var mask = wildcard ^ allOnes;
-	                var bits = common.prefixLengthFromMask(mask, constants6.BITS);
-	                return new Address6("".concat(address, "/").concat(bits));
-	            }
-	        },
-	        {
-	            key: "fromWildcard",
-	            value: /**
-	     * Construct an `Address6` from a wildcard pattern with trailing `*`
-	     * groups. The number of trailing wildcards determines the prefix
-	     * length: each `*` represents 16 bits. `::` is expanded to zero groups
-	     * (not wildcards) before evaluating trailing wildcards.
-	     *
-	     * Only trailing whole-group wildcards are supported. Partial-group
-	     * wildcards (e.g. `2001:db8::0*`) and interior wildcards (e.g.
-	     * `*::1`) throw `AddressError`.
-	     * @example
-	     * Address6.fromWildcard('2001:db8:*:*:*:*:*:*').subnet;  // '/32'
-	     * Address6.fromWildcard('2001:db8::*').subnet;           // '/112'
-	     * Address6.fromWildcard('*:*:*:*:*:*:*:*').subnet;       // '/0'
-	     */ function fromWildcard(input) {
-	                if (input.includes('%') || input.includes('/')) {
-	                    throw new address_error_1.AddressError('Wildcard pattern must not include a zone or CIDR suffix');
-	                }
-	                var halves = input.split('::');
-	                if (halves.length > 2) {
-	                    throw new address_error_1.AddressError("Wildcard pattern cannot contain more than one '::'");
-	                }
-	                var groups;
-	                if (halves.length === 2) {
-	                    var left = halves[0] === '' ? [] : halves[0].split(':');
-	                    var right = halves[1] === '' ? [] : halves[1].split(':');
-	                    var remaining = constants6.GROUPS - left.length - right.length;
-	                    if (remaining < 1) {
-	                        throw new address_error_1.AddressError("Wildcard pattern with '::' has too many groups");
-	                    }
-	                    groups = _to_consumable_array(left).concat(_to_consumable_array(new Array(remaining).fill('0')), _to_consumable_array(right));
-	                } else {
-	                    groups = input.split(':');
-	                }
-	                if (groups.length !== constants6.GROUPS) {
-	                    throw new address_error_1.AddressError('Wildcard pattern must have 8 groups');
-	                }
-	                var firstWildcard = -1;
-	                for(var i = 0; i < groups.length; i++){
-	                    if (groups[i] === '*') {
-	                        if (firstWildcard === -1) {
-	                            firstWildcard = i;
-	                        }
-	                    } else if (firstWildcard !== -1) {
-	                        throw new address_error_1.AddressError('Wildcard `*` must only appear in trailing groups (e.g. `2001:db8:*:*:*:*:*:*`)');
-	                    }
-	                }
-	                var trailing = firstWildcard === -1 ? 0 : groups.length - firstWildcard;
-	                var replaced = groups.map(function(g) {
-	                    return g === '*' ? '0' : g;
-	                });
-	                var subnetBits = constants6.BITS - trailing * 16;
-	                return new Address6("".concat(replaced.join(':'), "/").concat(subnetBits));
-	            }
-	        },
 	        {
 	            key: "fromAddress4",
 	            value: /**
 	     * Create an IPv6-mapped address given an IPv4 address
+	     * @memberof Address6
+	     * @static
 	     * @param {string} address - An IPv4 address string
 	     * @returns {Address6}
 	     * @example
@@ -81776,6 +81332,8 @@ function requireIpv6 () {
 	            key: "fromArpa",
 	            value: /**
 	     * Return an address from ip6.arpa form
+	     * @memberof Address6
+	     * @static
 	     * @param {string} arpaFormAddress - an 'ip6.arpa' form address
 	     * @returns {Adress6}
 	     * @example
@@ -81798,48 +81356,12 @@ function requireIpv6 () {
 	                return new Address6(address);
 	            }
 	        },
-	        {
-	            key: "fromAddress4Nat64",
-	            value: /**
-	     * Embed an IPv4 address into a NAT64 IPv6 address using the encoding
-	     * defined by [RFC 6052](https://datatracker.ietf.org/doc/html/rfc6052).
-	     * The default prefix is the well-known prefix `64:ff9b::/96`. The prefix
-	     * length must be one of 32, 40, 48, 56, 64, or 96; for prefixes shorter
-	     * than /64 the IPv4 octets are split around the reserved bits 64–71.
-	     * @example
-	     * Address6.fromAddress4Nat64('192.0.2.33').correctForm(); // '64:ff9b::c000:221'
-	     * Address6.fromAddress4Nat64('192.0.2.33', '2001:db8::/32').correctForm(); // '2001:db8:c000:221::'
-	     */ function fromAddress4Nat64(address) {
-	                var prefix = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : '64:ff9b::/96';
-	                var v4 = new ipv4_1.Address4(address);
-	                var prefix6 = new Address6(prefix);
-	                var pl = prefix6.subnetMask;
-	                if (pl !== 32 && pl !== 40 && pl !== 48 && pl !== 56 && pl !== 64 && pl !== 96) {
-	                    throw new address_error_1.AddressError('NAT64 prefix length must be 32, 40, 48, 56, 64, or 96');
-	                }
-	                var prefixBits = prefix6.binaryZeroPad();
-	                var v4Bits = v4.binaryZeroPad();
-	                var bits;
-	                if (pl === 96) {
-	                    bits = prefixBits.slice(0, 96) + v4Bits;
-	                } else {
-	                    var beforeU = 64 - pl;
-	                    bits = prefixBits.slice(0, pl) + v4Bits.slice(0, beforeU) + '00000000' + v4Bits.slice(beforeU) + '0'.repeat(128 - 72 - (32 - beforeU));
-	                }
-	                var hex = BigInt("0b".concat(bits)).toString(16).padStart(32, '0');
-	                var groups = [];
-	                for(var i = 0; i < 8; i++){
-	                    groups.push(hex.slice(i * 4, (i + 1) * 4));
-	                }
-	                return new Address6(groups.join(':'));
-	            }
-	        },
 	        {
 	            key: "fromByteArray",
 	            value: /**
-	     * Convert a byte array to an Address6 object.
-	     *
-	     * To convert from a Node.js `Buffer`, spread it: `Address6.fromByteArray([...buf])`.
+	     * Convert a byte array to an Address6 object
+	     * @memberof Address6
+	     * @static
 	     * @returns {Address6}
 	     */ function fromByteArray(bytes) {
 	                return this.fromUnsignedByteArray(bytes.map(unsignByte));
@@ -81848,9 +81370,9 @@ function requireIpv6 () {
 	        {
 	            key: "fromUnsignedByteArray",
 	            value: /**
-	     * Convert an unsigned byte array to an Address6 object.
-	     *
-	     * To convert from a Node.js `Buffer`, spread it: `Address6.fromUnsignedByteArray([...buf])`.
+	     * Convert an unsigned byte array to an Address6 object
+	     * @memberof Address6
+	     * @static
 	     * @returns {Address6}
 	     */ function fromUnsignedByteArray(bytes) {
 	                var BYTE_MAX = BigInt('256');
@@ -81866,18 +81388,7 @@ function requireIpv6 () {
 	    ]);
 	    return Address6;
 	}();
-	ipv6.Address6 = Address6;
-	var TYPE_SUBNETS = Object.keys(constants6.TYPES).map(function(subnet) {
-	    return [
-	        new Address6(subnet),
-	        constants6.TYPES[subnet]
-	    ];
-	});
-	var TEREDO_SUBNET = new Address6('2001::/32');
-	var SIX_TO_FOUR_SUBNET = new Address6('2002::/16');
-	var ULA_SUBNET = new Address6('fc00::/7');
-	var DOCUMENTATION_SUBNET = new Address6('2001:db8::/32');
-	var IPV4_MAPPED_SUBNET = new Address6('::ffff:0:0/96'); 
+	ipv6.Address6 = Address6; 
 	return ipv6;
 }
 
@@ -84727,7 +84238,7 @@ var providers$1 = {};
 
 var client_metadata = {};
 
-var version = "7.3.0";
+var version = "7.2.0";
 var require$$4 = {
     version: version};
 
@@ -160795,7 +160306,7 @@ function continueScramConversation(cryptoMethod, response, authContext) {
 }
 function _continueScramConversation() {
     _continueScramConversation = _async_to_generator$6(function(cryptoMethod, response, authContext) {
-        var connection, credentials, nonce, db, username, password, processedPassword, payload, dict, iterations, salt, rnonce, withoutProof, saltedPassword, clientKey, serverKey, storedKey, firstMessageBytes, firstMessage, payloadString, authMessage, clientSignature, clientProof, clientFinal, serverSignature, saslContinueCmd, r, parsedResponse, retrySaslContinueCmd;
+        var connection, credentials, nonce, db, username, password, processedPassword, payload, dict, iterations, salt, rnonce, withoutProof, saltedPassword, clientKey, serverKey, storedKey, authMessage, clientSignature, clientProof, clientFinal, serverSignature, saslContinueCmd, r, parsedResponse, retrySaslContinueCmd;
         return _ts_generator$6(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -160851,12 +160362,9 @@ function _continueScramConversation() {
                     ];
                 case 4:
                     storedKey = _state.sent();
-                    firstMessageBytes = clientFirstMessageBare(username, nonce);
-                    firstMessage = bson_1$2.ByteUtils.toUTF8(firstMessageBytes, 0, firstMessageBytes.length, false);
-                    payloadString = bson_1$2.ByteUtils.toUTF8(payload.buffer, 0, payload.position, false);
                     authMessage = [
-                        firstMessage,
-                        payloadString,
+                        clientFirstMessageBare(username, nonce),
+                        payload.toString('utf8'),
                         withoutProof
                     ].join(',');
                     return [
@@ -160917,7 +160425,7 @@ function _continueScramConversation() {
     return _continueScramConversation.apply(this, arguments);
 }
 function parsePayload(payload) {
-    var payloadStr = bson_1$2.ByteUtils.toUTF8(payload.buffer, 0, payload.position, false);
+    var payloadStr = payload.toString('utf8');
     var dict = {};
     var parts = payloadStr.split(',');
     for(var i = 0; i < parts.length; i++){