@andrew_l/tl-pack 0.1.2 → 0.1.4

package/README.md

@@ -113,16 +113,17 @@ import { BinaryWriter, BinaryReader, createExtension } from '@andrew_l/tl-pack';
 const ObjectId = mongoose.Types.ObjectId;
 
 const extensions = [
-  // Reserving token for ObjectId type
+  // Reserve token for ObjectId type
   createExtension(100, {
     encode(value) {
-      if (value?._bsontype === 'ObjectID') {
-        return value.toJSON(); // (string)
+      if (value instanceof ObjectId) {
+        this.writeBytes(value.id);
       }
     },
-    // on client side, you possibly need a decoding as a plain string.
-    decode(value) {
-      return new ObjectId(value);
+    // in the browser you possibly need to decode as a plain string
+    decode() {
+      const bytes = this.readBytes();
+      return new ObjectId(bytes);
     },
   }),
 ];

package/dist/BinaryReader.js

@@ -209,8 +209,7 @@ export class BinaryReader {
         const ext = this.extensions.get(constructorId);
         let value;
         if (ext) {
-            value = this.readObject();
-            value = ext.decode(value);
+            value = ext.decode.call(this);
         }
         else {
             value = this._lastObject = this.readCore(constructorId);
@@ -365,8 +364,7 @@ export class BinaryReader {
             const ext = this.extensions.get(constructorId);
             let value;
             if (ext) {
-                value = this.readObject();
-                value = ext.decode(value);
+                value = ext.decode.call(this);
             }
             else {
                 value = this.readCore(constructorId);

package/dist/BinaryWriter.js

@@ -221,6 +221,7 @@ export class BinaryWriter {
         for (const key in object) {
             if (object[key] === undefined)
                 continue;
+            this._last = noop;
             this.wireDictionary(key);
             this.writeObject(object[key]);
         }
@@ -261,20 +262,21 @@ export class BinaryWriter {
         this.writeByte(CORE_TYPES.None);
     }
     _writeCustom(value) {
+        const start = this.offset;
+        this.allocate(1);
+        this.offset++;
         for (const ext of this.extensions.values()) {
-            const result = ext.encode(value);
-            if (result !== undefined) {
-                const constructorId = coreType(result);
-                if (constructorId === CORE_TYPES.None) {
-                    throw new TypeError(`Invalid encode extension = ${ext.token} type of ${value}`);
-                }
-                if (ext.token !== -1) {
-                    this.writeByte(ext.token);
-                }
-                this.writeCore(constructorId, result);
+            ext.encode.call(this, value);
+            const processed = start < this.offset;
+            if (processed) {
+                const end = this.offset;
+                this.offset = start;
+                this.writeByte(ext.token);
+                this.offset = end;
                 return true;
             }
         }
+        this.offset = start;
         return false;
     }
     writeObject(value) {
@@ -381,7 +383,6 @@ export class BinaryWriter {
         }
         this.offset = this._repeat.offset;
         this._repeat.count++;
-        // console.log('repeat', { value: this.lastWrite, offset: this.offset });
         this.writeLength(this._repeat.count);
     }
 }

package/dist/extension.d.ts

@@ -1,5 +1,7 @@
-export type EncodeHandler = (value: any) => string | number | undefined;
-export type DecodeHandler = (value: string | number) => any;
+import type { BinaryReader } from './BinaryReader.js';
+import type { BinaryWriter } from './BinaryWriter.js';
+export type EncodeHandler = (this: BinaryWriter, value: any) => void;
+export type DecodeHandler = (this: BinaryReader) => any;
 export interface TLExtension {
     token: number;
     encode: EncodeHandler;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@andrew_l/tl-pack",
-	"version": "0.1.2",
+	"version": "0.1.4",
   "description": "Binary serialization library",
 	"type": "module",
 	"scripts": {