@st-gr/sail-proxy 0.9.2 → 0.9.3

package/bundled/ollama/node_modules/qs/lib/parse.js

@@ -67,10 +67,10 @@ var parseValues = function parseQueryStringValues(str, options) {
     var limit = options.parameterLimit === Infinity ? void undefined : options.parameterLimit;
     var parts = cleanStr.split(
         options.delimiter,
-        options.throwOnLimitExceeded && typeof limit !== 'undefined' ? limit + 1 : limit
+        options.throwOnLimitExceeded ? limit + 1 : limit
     );
 
-    if (options.throwOnLimitExceeded && typeof limit !== 'undefined' && parts.length > limit) {
+    if (options.throwOnLimitExceeded && parts.length > limit) {
         throw new RangeError('Parameter limit exceeded. Only ' + limit + ' parameter' + (limit === 1 ? '' : 's') + ' allowed.');
     }
 
@@ -214,12 +214,9 @@ var parseObject = function (chain, val, options, valuesParsed) {
     return leaf;
 };
 
-// Split a key like "a[b][c[]]" into ['a', '[b]', '[c[]]'] while preserving
-// qs parse semantics for depth/prototype guards.
-var splitKeyIntoSegments = function splitKeyIntoSegments(originalKey, options) {
-    var key = options.allowDots ? originalKey.replace(/\.([^.[]+)/g, '[$1]') : originalKey;
+var splitKeyIntoSegments = function splitKeyIntoSegments(givenKey, options) {
+    var key = options.allowDots ? givenKey.replace(/\.([^.[]+)/g, '[$1]') : givenKey;
 
-    // depth <= 0 keeps the whole key as one segment
     if (options.depth <= 0) {
         if (!options.plainObjects && has.call(Object.prototype, key)) {
             if (!options.allowPrototypes) {
@@ -230,11 +227,14 @@ var splitKeyIntoSegments = function splitKeyIntoSegments(originalKey, options) {
         return [key];
     }
 
-    var segments = [];
+    var brackets = /(\[[^[\]]*])/;
+    var child = /(\[[^[\]]*])/g;
+
+    var segment = brackets.exec(key);
+    var parent = segment ? key.slice(0, segment.index) : key;
+
+    var keys = [];
 
-    // parent before the first '[' (may be empty if key starts with '[')
-    var first = key.indexOf('[');
-    var parent = first >= 0 ? key.slice(0, first) : key;
     if (parent) {
         if (!options.plainObjects && has.call(Object.prototype, parent)) {
             if (!options.allowPrototypes) {
@@ -242,62 +242,32 @@ var splitKeyIntoSegments = function splitKeyIntoSegments(originalKey, options) {
             }
         }
 
-        segments[segments.length] = parent;
+        keys[keys.length] = parent;
     }
 
-    var n = key.length;
-    var open = first;
-    var collected = 0;
-
-    while (open >= 0 && collected < options.depth) {
-        var level = 1;
-        var i = open + 1;
-        var close = -1;
-
-        // balance nested '[' and ']' inside this bracket group using a nesting level counter
-        while (i < n && close < 0) {
-            var cu = key.charCodeAt(i);
-            if (cu === 0x5B) { // '['
-                level += 1;
-            } else if (cu === 0x5D) { // ']'
-                level -= 1;
-                if (level === 0) {
-                    close = i; // found matching close; loop will exit by condition
-                }
-            }
-            i += 1;
-        }
+    var i = 0;
+    while ((segment = child.exec(key)) !== null && i < options.depth) {
+        i += 1;
 
-        if (close < 0) {
-            // Unterminated group: wrap the raw remainder in one bracket pair so it stays
-            // a single literal segment (e.g. "[[]b" -> "[[]b]"); we do not infer missing ']'.
-            segments[segments.length] = '[' + key.slice(open) + ']';
-            return segments;
-        }
-
-        var seg = key.slice(open, close + 1);
-        // prototype guard for the content of this group
-        var content = seg.slice(1, -1);
-        if (!options.plainObjects && has.call(Object.prototype, content) && !options.allowPrototypes) {
-            return;
+        var segmentContent = segment[1].slice(1, -1);
+        if (!options.plainObjects && has.call(Object.prototype, segmentContent)) {
+            if (!options.allowPrototypes) {
+                return;
+            }
         }
 
-        segments[segments.length] = seg;
-        collected += 1;
-
-        // find the next '[' after this balanced group
-        open = key.indexOf('[', close + 1);
+        keys[keys.length] = segment[1];
     }
 
-    if (open >= 0) {
+    if (segment) {
         if (options.strictDepth === true) {
             throw new RangeError('Input depth exceeded depth option of ' + options.depth + ' and strictDepth is true');
         }
 
-        segments[segments.length] = '[' + key.slice(open) + ']';
+        keys[keys.length] = '[' + key.slice(segment.index) + ']';
     }
 
-    return segments;
+    return keys;
 };
 
 var parseKeys = function parseQueryStringKeys(givenKey, val, options, valuesParsed) {

package/bundled/ollama/node_modules/qs/lib/stringify.js

@@ -118,7 +118,7 @@ var stringify = function stringify(
 
     if (obj === null) {
         if (strictNullHandling) {
-            return formatter(encoder && !encodeValuesOnly ? encoder(prefix, defaults.encoder, charset, 'key', format) : prefix);
+            return encoder && !encodeValuesOnly ? encoder(prefix, defaults.encoder, charset, 'key', format) : prefix;
         }
 
         obj = '';
@@ -142,9 +142,7 @@ var stringify = function stringify(
     if (generateArrayPrefix === 'comma' && isArray(obj)) {
         // we need to join elements in
         if (encodeValuesOnly && encoder) {
-            obj = utils.maybeMap(obj, function (v) {
-                return v == null ? v : encoder(v);
-            });
+            obj = utils.maybeMap(obj, encoder);
         }
         objKeys = [{ value: obj.length > 0 ? obj.join(',') || null : void undefined }];
     } else if (isArray(filter)) {
@@ -314,11 +312,6 @@ module.exports = function (object, opts) {
     var sideChannel = getSideChannel();
     for (var i = 0; i < objKeys.length; ++i) {
         var key = objKeys[i];
-
-        if (typeof key === 'undefined' || key === null) {
-            continue;
-        }
-
         var value = obj[key];
 
         if (options.skipNulls && value === null) {
@@ -352,10 +345,10 @@ module.exports = function (object, opts) {
     if (options.charsetSentinel) {
         if (options.charset === 'iso-8859-1') {
             // encodeURIComponent('&#10003;'), the "numeric entity" representation of a checkmark
-            prefix += 'utf8=%26%2310003%3B' + options.delimiter;
+            prefix += 'utf8=%26%2310003%3B&';
         } else {
             // encodeURIComponent('✓')
-            prefix += 'utf8=%E2%9C%93' + options.delimiter;
+            prefix += 'utf8=%E2%9C%93&';
         }
     }
 

package/bundled/ollama/node_modules/qs/package.json

@@ -2,7 +2,7 @@
     "name": "qs",
     "description": "A querystring parser that supports nesting and arrays, with a depth limit",
     "homepage": "https://github.com/ljharb/qs",
-    "version": "6.15.2",
+    "version": "6.15.0",
     "repository": {
         "type": "git",
         "url": "https://github.com/ljharb/qs.git"
@@ -36,7 +36,7 @@
     "devDependencies": {
         "@browserify/envify": "^6.0.0",
         "@browserify/uglifyify": "^6.0.0",
-        "@ljharb/eslint-config": "^22.2.3",
+        "@ljharb/eslint-config": "^22.1.3",
         "browserify": "^16.5.2",
         "bundle-collapser": "^1.4.0",
         "common-shakeify": "~1.0.0",
@@ -51,7 +51,7 @@
         "has-property-descriptors": "^1.0.2",
         "has-proto": "^1.2.0",
         "has-symbols": "^1.1.0",
-        "iconv-lite": "^0.5.2",
+        "iconv-lite": "^0.5.1",
         "in-publish": "^2.0.1",
         "jackspeak": "=2.1.1",
         "jiti": "^0.0.0",

package/bundled/ollama/node_modules/qs/test/parse.js

@@ -210,21 +210,6 @@ test('parse()', function (t) {
     t.test('uses original key when depth = 0', function (st) {
         st.deepEqual(qs.parse('a[0]=b&a[1]=c', { depth: 0 }), { 'a[0]': 'b', 'a[1]': 'c' });
         st.deepEqual(qs.parse('a[0][0]=b&a[0][1]=c&a[1]=d&e=2', { depth: 0 }), { 'a[0][0]': 'b', 'a[0][1]': 'c', 'a[1]': 'd', e: '2' });
-        st.deepEqual(qs.parse('a.b=c', { depth: 0, allowDots: true }), { 'a[b]': 'c' }, 'normalizes dots before applying depth-0 behavior');
-        st.deepEqual(qs.parse('toString=foo', { depth: 0 }), {}, 'respects prototype guard at depth 0');
-        st.deepEqual(qs.parse('toString=foo', { depth: 0, allowPrototypes: true }), { toString: 'foo' }, 'allows prototypes at depth 0 when enabled');
-        st.end();
-    });
-
-    t.test('ignores prototype keys when depth = 0 and allowPrototypes is false', function (st) {
-        st.deepEqual(qs.parse('toString=foo', { depth: 0 }), {});
-        st.deepEqual(qs.parse('hasOwnProperty=bar', { depth: 0 }), {});
-        st.deepEqual(qs.parse('toString=foo&a=b', { depth: 0 }), { a: 'b' });
-        st.end();
-    });
-
-    t.test('allows prototype keys when depth = 0 and allowPrototypes is true', function (st) {
-        st.deepEqual(qs.parse('toString=foo', { depth: 0, allowPrototypes: true }), { toString: 'foo' });
         st.end();
     });
 
@@ -266,52 +251,6 @@ test('parse()', function (t) {
         st.end();
     });
 
-    t.test('parses keys with literal [] inside a bracket group (#493)', function (st) {
-        // A bracket pair inside a bracket group should be treated literally as part of the key
-        st.deepEqual(
-            qs.parse('search[withbracket[]]=foobar'),
-            { search: { 'withbracket[]': 'foobar' } },
-            'treats inner [] literally when inside a bracket group'
-        );
-
-        // Single-level variant
-        st.deepEqual(
-            qs.parse('a[b[]]=c'),
-            { a: { 'b[]': 'c' } },
-            'keeps "b[]" as a literal key'
-        );
-
-        // Nested with an array push on the outer level
-        st.deepEqual(
-            qs.parse('list[][x[]]=y'),
-            { list: [{ 'x[]': 'y' }] },
-            'preserves inner [] while still treating outer [] as array push'
-        );
-
-        // Multiple nested bracket pairs: inner [] remains literal as part of the key
-        st.deepEqual(
-            qs.parse('a[b[c[]]]=d'),
-            { a: { 'b[c[]]': 'd' } },
-            'treats "b[c[]]" as a literal key inside the bracket group'
-        );
-
-        // Depth limits with literal brackets: preserve inner [] while limiting bracket-group parsing
-        st.deepEqual(
-            qs.parse('a[b[c[]]][d]=e', { depth: 1 }),
-            { a: { 'b[c[]]': { '[d]': 'e' } } },
-            'respects depth: 1 and preserves literal inner [] in the parsed key'
-        );
-
-        // Unterminated inner bracket group is wrapped as a literal remainder segment
-        st.deepEqual(
-            qs.parse('a[[]b=c'),
-            { a: { '[[]b': 'c' } },
-            'handles unterminated inner bracket groups without throwing'
-        );
-
-        st.end();
-    });
-
     t.test('allows to specify array indices', function (st) {
         st.deepEqual(qs.parse('a[1]=c&a[0]=b&a[2]=d'), { a: ['b', 'c', 'd'] });
         st.deepEqual(qs.parse('a[1]=c&a[0]=b'), { a: ['b', 'c'] });
@@ -1135,15 +1074,6 @@ test('parse()', function (t) {
         };
 
         st.deepEqual(qs.parse('KeY=vAlUe', { decoder: decoder }), { key: 'VALUE' });
-
-        var noopDecoder = function () { return 'x'; };
-        noopDecoder();
-        st['throws'](
-            function () { decoder('x', noopDecoder, 'utf-8', 'unknown'); },
-            'this should never happen! type: unknown',
-            'decoder throws for unexpected type'
-        );
-
         st.end();
     });
 
@@ -1173,14 +1103,6 @@ test('parse()', function (t) {
                 new RangeError('Parameter limit exceeded. Only 3 parameters allowed.'),
                 'throws error when parameter limit is exceeded'
             );
-
-            sst['throws'](
-                function () {
-                    qs.parse('a=1&b=2', { parameterLimit: 1, throwOnLimitExceeded: true });
-                },
-                new RangeError('Parameter limit exceeded. Only 1 parameter allowed.'),
-                'throws error with singular "parameter" when parameterLimit is 1'
-            );
             sst.end();
         });
 
@@ -1202,12 +1124,6 @@ test('parse()', function (t) {
             sst.end();
         });
 
-        st.test('allows unlimited parameters when parameterLimit is Infinity and throwOnLimitExceeded is true', function (sst) {
-            var result = qs.parse('a=1&b=2&c=3&d=4&e=5&f=6', { parameterLimit: Infinity, throwOnLimitExceeded: true });
-            sst.deepEqual(result, { a: '1', b: '2', c: '3', d: '4', e: '5', f: '6' }, 'parses all parameters without truncation or throwing');
-            sst.end();
-        });
-
         st.end();
     });
 
@@ -1273,14 +1189,6 @@ test('parse()', function (t) {
                 'throws error when a sparse index exceeds arrayLimit'
             );
 
-            sst['throws'](
-                function () {
-                    qs.parse('a[2]=b', { arrayLimit: 1, throwOnLimitExceeded: true });
-                },
-                new RangeError('Array limit exceeded. Only 1 element allowed in an array.'),
-                'throws error with singular "element" when arrayLimit is 1'
-            );
-
             sst.end();
         });
 
@@ -1298,17 +1206,6 @@ test('parse()', function (t) {
             sst.end();
         });
 
-        st.test('throws when duplicate bracket keys exceed arrayLimit with throwOnLimitExceeded', function (sst) {
-            sst['throws'](
-                function () {
-                    qs.parse('a[]=1&a[]=2&a[]=3&a[]=4&a[]=5&a[]=6', { arrayLimit: 5, throwOnLimitExceeded: true });
-                },
-                new RangeError('Array limit exceeded. Only 5 elements allowed in an array.'),
-                'throws error when duplicate bracket notation exceeds array limit'
-            );
-            sst.end();
-        });
-
         st.end();
     });
 
@@ -1565,14 +1462,6 @@ test('comma + arrayLimit', function (t) {
             new RangeError('Array limit exceeded. Only 3 elements allowed in an array.'),
             'throws error when comma-split exceeds array limit'
         );
-
-        st['throws'](
-            function () {
-                qs.parse('a=1,2,3', { comma: true, arrayLimit: 1, throwOnLimitExceeded: true });
-            },
-            new RangeError('Array limit exceeded. Only 1 element allowed in an array.'),
-            'throws error with singular "element" when arrayLimit is 1'
-        );
         st.end();
     });
 
@@ -1675,29 +1564,5 @@ test('mixed array and object notation', function (t) {
         st.end();
     });
 
-    t.test('uses existing array length for currentArrayLength when parsing object input with bracket keys', function (st) {
-        var input = {};
-        var arr = ['x', 'y'];
-        arr.a = ['z', 'w'];
-        input['a[]'] = arr;
-        st.deepEqual(qs.parse(input), { a: ['x', 'y'] }, 'parses object input with bracket keys using existing array values');
-        st.end();
-    });
-
-    t.test('throws with singular message when object input bracket key exceeds arrayLimit of 1', function (st) {
-        var input = {};
-        var arr = ['x'];
-        arr.a = ['z', 'w'];
-        input['a[]'] = arr;
-        st['throws'](
-            function () {
-                qs.parse(input, { throwOnLimitExceeded: true, arrayLimit: 1 });
-            },
-            new RangeError('Array limit exceeded. Only 1 element allowed in an array.'),
-            'throws singular error for object input exceeding arrayLimit 1'
-        );
-        st.end();
-    });
-
     t.end();
 });

package/bundled/ollama/node_modules/qs/test/stringify.js

@@ -651,49 +651,6 @@ test('stringify()', function (t) {
         st.end();
     });
 
-    t.test('does not crash on null/undefined entries in arrayFormat=comma with encodeValuesOnly', function (st) {
-        st.doesNotThrow(
-            function () { qs.stringify({ a: [null, 'b'] }, { arrayFormat: 'comma', encodeValuesOnly: true }); },
-            'does not pass a raw null array entry to the encoder'
-        );
-        st.doesNotThrow(
-            function () { qs.stringify({ a: [undefined, 'b'] }, { arrayFormat: 'comma', encodeValuesOnly: true }); },
-            'does not pass a raw undefined array entry to the encoder'
-        );
-        st.doesNotThrow(
-            function () { qs.stringify({ a: [null] }, { arrayFormat: 'comma', encodeValuesOnly: true }); },
-            'does not crash on a single-null array'
-        );
-
-        st.equal(
-            qs.stringify({ a: [null, 'b'] }, { arrayFormat: 'comma', encodeValuesOnly: true }),
-            'a=,b',
-            'null entry joins as empty, comma stays unencoded under encodeValuesOnly'
-        );
-        st.equal(
-            qs.stringify({ a: [undefined, 'b'] }, { arrayFormat: 'comma', encodeValuesOnly: true }),
-            'a=,b',
-            'undefined entry joins as empty, comma stays unencoded under encodeValuesOnly'
-        );
-        st.equal(
-            qs.stringify({ a: [null] }, { arrayFormat: 'comma', encodeValuesOnly: true }),
-            'a=',
-            'single-null array stringifies as empty value'
-        );
-        st.equal(
-            qs.stringify({ a: [null] }, { arrayFormat: 'comma', encodeValuesOnly: true, strictNullHandling: true }),
-            'a',
-            'strictNullHandling drops the equals sign for a single-null array'
-        );
-        st.equal(
-            qs.stringify({ a: [null] }, { arrayFormat: 'comma', encodeValuesOnly: true, skipNulls: true }),
-            '',
-            'skipNulls drops a single-null array entirely'
-        );
-
-        st.end();
-    });
-
     t.test('stringifies a null object', { skip: !hasProto }, function (st) {
         st.equal(qs.stringify({ __proto__: null, a: 'b' }), 'a=b');
         st.end();
@@ -868,35 +825,6 @@ test('stringify()', function (t) {
         st.end();
     });
 
-    t.test('skips null/undefined entries in filter=array', function (st) {
-        st.doesNotThrow(
-            function () { qs.stringify({ a: 'b', undefined: 'x' }, { filter: ['a', undefined] }); },
-            'does not pass a raw undefined filter entry to the encoder'
-        );
-        st.doesNotThrow(
-            function () { qs.stringify({ a: 'b', 'null': 'x' }, { filter: ['a', null] }); },
-            'does not pass a raw null filter entry to the encoder'
-        );
-
-        st.equal(
-            qs.stringify({ a: 'b', undefined: 'x', c: 'd' }, { filter: ['a', undefined, 'c'] }),
-            'a=b&c=d',
-            'undefined filter entry is skipped, remaining keys are kept'
-        );
-        st.equal(
-            qs.stringify({ a: 'b', 'null': 'x', c: 'd' }, { filter: ['a', null, 'c'] }),
-            'a=b&c=d',
-            'null filter entry is skipped, remaining keys are kept'
-        );
-        st.equal(
-            qs.stringify({ a: 'b', 'null': 'x' }, { filter: [null] }),
-            '',
-            'filter array containing only null yields empty string'
-        );
-
-        st.end();
-    });
-
     t.test('supports custom representations when filter=function', function (st) {
         var calls = 0;
         var obj = { a: 'b', c: 'd', e: { f: new Date(1257894000000) } };
@@ -1183,28 +1111,6 @@ test('stringify()', function (t) {
         st.end();
     });
 
-    t.test('strictNullHandling: applies the formatter to the encoded key (RFC1738)', function (st) {
-        st.equal(
-            qs.stringify(
-                { 'a b': null, 'c d': 'e f' },
-                { strictNullHandling: false, format: 'RFC1738' }
-            ),
-            'a+b=&c+d=e+f',
-            'without: as expected'
-        );
-
-        st.equal(
-            qs.stringify(
-                { 'a b': null, 'c d': 'e f' },
-                { strictNullHandling: true, format: 'RFC1738' }
-            ),
-            'a+b&c+d=e+f',
-            'with: as expected'
-        );
-
-        st.end();
-    });
-
     t.test('throws if an invalid charset is specified', function (st) {
         st['throws'](function () {
             qs.stringify({ a: 'b' }, { charset: 'foobar' });
@@ -1240,12 +1146,6 @@ test('stringify()', function (t) {
             'adds the right sentinel when instructed to and the charset is iso-8859-1'
         );
 
-        st.equal(
-            qs.stringify({ a: 1, b: 2 }, { charsetSentinel: true, delimiter: ';' }),
-            'utf8=%E2%9C%93;a=1;b=2',
-            'uses the configured delimiter after the sentinel'
-        );
-
         st.end();
     });
 
@@ -1288,15 +1188,6 @@ test('stringify()', function (t) {
         };
 
         st.deepEqual(qs.stringify({ KeY: 'vAlUe' }, { encoder: encoder }), 'key=VALUE');
-
-        var noopEncoder = function () { return 'x'; };
-        noopEncoder();
-        st['throws'](
-            function () { encoder('x', noopEncoder, 'utf-8', 'unknown'); },
-            'this should never happen! type: unknown',
-            'encoder throws for unexpected type'
-        );
-
         st.end();
     });
 
@@ -1416,33 +1307,4 @@ test('stringifies empty keys', function (t) {
 
         st.end();
     });
-
-    t.test('round-trips keys containing percent-encoded bracket text', function (st) {
-        var cases = [
-            { 'a%5Bb': 'c' },
-            { 'a%5Db': 'c' },
-            { 'a%255Bb': 'c' },
-            { 'a%255Db': 'c' },
-            { a: { 'b%5Bc': 'd' } },
-            { a: { 'b%255Bc': 'd' } },
-            { 'a%5B%255Bb': 'c' }
-        ];
-        for (var i = 0; i < cases.length; i++) {
-            st.deepEqual(
-                qs.parse(qs.stringify(cases[i])),
-                cases[i],
-                'round-trips ' + JSON.stringify(cases[i])
-            );
-        }
-
-        st.end();
-    });
-
-    t.test('parses input containing percent-encoded bracket text without mangling', function (st) {
-        st.deepEqual(qs.parse('a%25255Bb=c'), { 'a%255Bb': 'c' }, 'a%25255Bb decodes to a%255Bb, not a%5Bb');
-        st.deepEqual(qs.parse('a%25255Db=c'), { 'a%255Db': 'c' }, 'a%25255Db decodes to a%255Db, not a%5Db');
-        st.deepEqual(qs.parse('a%5Bb%25255Bc%5D=d'), { a: { 'b%255Bc': 'd' } }, 'nested %25255B decodes to %255B inside segment, not %5B');
-
-        st.end();
-    });
 });

package/bundled/ollama/node_modules/qs/test/utils.js

@@ -31,7 +31,6 @@ test('merge()', function (t) {
     t.deepEqual(noOptionsNonObjectSource, { foo: 'baz', bar: true });
 
     var func = function f() {};
-    func();
     t.deepEqual(
         utils.merge(func, { foo: 'bar' }),
         [func, { foo: 'bar' }],
@@ -113,15 +112,6 @@ test('merge()', function (t) {
             s2t.end();
         });
 
-        st.test('merges overflow object into primitive with plainObjects', function (s2t) {
-            var overflow = utils.combine(['a'], 'b', 0, false);
-            s2t.ok(utils.isOverflow(overflow), 'overflow object is marked');
-            var merged = utils.merge('c', overflow, { plainObjects: true });
-            s2t.ok(utils.isOverflow(merged), 'result is also marked as overflow');
-            s2t.deepEqual(merged, { __proto__: null, 0: 'c', 1: 'a', 2: 'b' }, 'creates null-proto object with primitive at 0');
-            s2t.end();
-        });
-
         st.test('merges overflow object with multiple values into primitive', function (s2t) {
             // Create an overflow object via combine: 3 elements (indices 0-2) with limit 0
             var overflow = utils.combine(['b', 'c'], 'd', 0, false);
@@ -138,21 +128,6 @@ test('merge()', function (t) {
             s2t.end();
         });
 
-        st.test('merges primitive into array that exceeds arrayLimit', function (s2t) {
-            var arr = ['a', 'b', 'c'];
-            var merged = utils.merge(arr, 'd', { arrayLimit: 1 });
-            s2t.ok(utils.isOverflow(merged), 'result is marked as overflow');
-            s2t.deepEqual(merged, { 0: 'a', 1: 'b', 2: 'c', 3: 'd' }, 'converts to overflow object with primitive appended');
-            s2t.end();
-        });
-
-        st.test('merges array into primitive that exceeds arrayLimit', function (s2t) {
-            var merged = utils.merge('a', ['b', 'c'], { arrayLimit: 1 });
-            s2t.ok(utils.isOverflow(merged), 'result is marked as overflow');
-            s2t.deepEqual(merged, { 0: 'a', 1: 'b', 2: 'c' }, 'converts to overflow object');
-            s2t.end();
-        });
-
         st.end();
     });
 
@@ -401,9 +376,7 @@ test('encode', function (t) {
 });
 
 test('isBuffer()', function (t) {
-    var fn = function () {};
-    fn();
-    forEach([null, undefined, true, false, '', 'abc', 42, 0, NaN, {}, [], fn, /a/g], function (x) {
+    forEach([null, undefined, true, false, '', 'abc', 42, 0, NaN, {}, [], function () {}, /a/g], function (x) {
         t.equal(utils.isBuffer(x), false, inspect(x) + ' is not a buffer');
     });
 
@@ -413,9 +386,8 @@ test('isBuffer()', function (t) {
     var saferBuffer = SaferBuffer.from('abc');
     t.equal(utils.isBuffer(saferBuffer), true, 'SaferBuffer instance is a buffer');
 
-    var buffer = SaferBuffer.from('abc');
-    t.notEqual(saferBuffer, buffer, 'different buffer instances');
-    t.equal(utils.isBuffer(buffer), true, 'another Buffer instance is a buffer');
+    var buffer = Buffer.from && Buffer.alloc ? Buffer.from('abc') : new Buffer('abc');
+    t.equal(utils.isBuffer(buffer), true, 'real Buffer instance is a buffer');
     t.end();
 });