extended-buffer 7.1.1 → 7.2.0

package/dist/ExtendedBuffer.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import type { ExtendedBufferOptions } from './ExtendedBufferOptions';
-export declare class ExtendedBuffer {
+export declare class ExtendedBuffer<EBO extends ExtendedBufferOptions = ExtendedBufferOptions> {
     protected _pointer: number;
     protected _pointerEnd: number;
     protected _pointerStart: number;
@@ -10,7 +10,8 @@ export declare class ExtendedBuffer {
     protected readonly _nativeAllocSlow?: boolean;
     protected readonly _nativeReallocSlow?: boolean;
     constructor(options?: ExtendedBufferOptions);
-    protected createInstance(options?: ExtendedBufferOptions): this;
+    protected createInstanceOptions(options?: EBO): ExtendedBufferOptions;
+    protected createInstance(options?: EBO): this;
     get length(): number;
     get capacity(): number;
     get pointer(): number;
@@ -33,7 +34,7 @@ export declare class ExtendedBuffer {
     getPointer(): number;
     offset(offset: number): this;
     isReadable(size: number): boolean;
-    writeBuffer(value: Buffer | ExtendedBuffer, unshift?: boolean): this;
+    writeBuffer(value: Buffer | ExtendedBuffer<ExtendedBufferOptions>, unshift?: boolean): this;
     writeString(string: string, encoding?: BufferEncoding, unshift?: boolean): this;
     writeIntBE(value: number, size: number, unshift?: boolean): this;
     writeIntLE(value: number, size: number, unshift?: boolean): this;
@@ -55,7 +56,7 @@ export declare class ExtendedBuffer {
     writeDoubleLE(value: number, unshift?: boolean): this;
     readBuffer(size: number): this;
     readBuffer(size: number, asNative: true): Buffer;
-    readBuffer(size: number, asNative: false, bufferOptions?: ExtendedBufferOptions): this;
+    readBuffer(size: number, asNative: false, bufferOptions?: EBO): this;
     readString(size: number, encoding?: BufferEncoding): string;
     readIntBE(size: number): number;
     readIntLE(size: number): number;

package/dist/ExtendedBuffer.js

@@ -27,22 +27,30 @@ exports.ExtendedBuffer = void 0;
 const buffer_1 = require("buffer");
 const utils = __importStar(require("./utils"));
 const errors_1 = require("./errors");
-const defaultCapacity = 16 * 1024;
-const defaultCapacityStep = defaultCapacity;
+const DEFAULT_CAPACITY = 16 * 1024;
+const DEFAULT_CAPACITY_STEP = DEFAULT_CAPACITY;
 class ExtendedBuffer {
     constructor(options) {
         var _a, _b;
         this._nativeAllocSlow = options === null || options === void 0 ? void 0 : options.nativeAllocSlow;
         this._nativeReallocSlow = options === null || options === void 0 ? void 0 : options.nativeReallocSlow;
-        this._capacity = (_a = options === null || options === void 0 ? void 0 : options.capacity) !== null && _a !== void 0 ? _a : defaultCapacity;
-        this._capacityStep = (_b = options === null || options === void 0 ? void 0 : options.capacityStep) !== null && _b !== void 0 ? _b : defaultCapacityStep;
+        this._capacity = (_a = options === null || options === void 0 ? void 0 : options.capacity) !== null && _a !== void 0 ? _a : DEFAULT_CAPACITY;
+        this._capacityStep = (_b = options === null || options === void 0 ? void 0 : options.capacityStep) !== null && _b !== void 0 ? _b : DEFAULT_CAPACITY_STEP;
         utils.assertUnsignedInteger(this._capacity);
         utils.assertUnsignedInteger(this._capacityStep);
         this.initExtendedBuffer();
     }
+    createInstanceOptions(options) {
+        return Object.assign({
+            capacity: this._capacity,
+            capacityStep: this._capacityStep,
+            nativeAllocSlow: this._nativeAllocSlow,
+            nativeReallocSlow: this._nativeReallocSlow
+        }, options !== null && options !== void 0 ? options : {});
+    }
     createInstance(options) {
         const ThisClass = this.constructor;
-        return new ThisClass(options);
+        return new ThisClass(this.createInstanceOptions(options));
     }
     get length() {
         return this._pointerEnd - this._pointerStart;
@@ -189,10 +197,10 @@ class ExtendedBuffer {
         return this.getReadableSize() >= size;
     }
     writeBuffer(value, unshift) {
-        if (value instanceof buffer_1.Buffer) {
-            return this.writeNativeBuffer(value, unshift);
+        if (value instanceof ExtendedBuffer) {
+            return this.writeNativeBuffer(value.nativeBufferView, unshift);
         }
-        return this.writeNativeBuffer(value.nativeBufferView, unshift);
+        return this.writeNativeBuffer(value, unshift);
     }
     writeString(string, encoding, unshift) {
         const bytes = buffer_1.Buffer.from(string, encoding);
@@ -345,20 +353,8 @@ class ExtendedBuffer {
         if (!this.isReadable(size)) {
             throw new errors_1.ExtendedBufferRangeError('SIZE_OUT_OF_RANGE');
         }
-        let result;
-        const buffer = utils.nativeBufferSubarray(this._nativeBuffer, this.nativePointer(), this.nativePointer() + size);
-        if (asNative) {
-            result = buffer_1.Buffer.from(buffer);
-        }
-        else {
-            bufferOptions = Object.assign({
-                capacity: this._capacity,
-                capacityStep: this._capacityStep,
-                nativeAllocSlow: this._nativeAllocSlow,
-                nativeReallocSlow: this._nativeReallocSlow
-            }, bufferOptions !== null && bufferOptions !== void 0 ? bufferOptions : {});
-            result = this.createInstance(bufferOptions).writeNativeBuffer(buffer);
-        }
+        const nativeBuffer = utils.nativeBufferSubarray(this._nativeBuffer, this.nativePointer(), this.nativePointer() + size);
+        const result = asNative ? buffer_1.Buffer.from(nativeBuffer) : this.createInstance(bufferOptions).writeNativeBuffer(nativeBuffer);
         this.offset(size);
         return result;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extended-buffer",
-  "version": "7.1.1",
+  "version": "7.2.0",
   "description": "Node JS extended Buffer",
   "type": "commonjs",
   "main": "./dist/index.js",