add preferFloat32: boolean option to encode()

gfx · gfx · commit d932bbcb6ac4 · 2019-07-17T23:51:01.000+09:00
diff --git a/src/Encoder.ts b/src/Encoder.ts
@@ -18,6 +18,7 @@ export class Encoder {
     readonly maxDepth = DEFAULT_MAX_DEPTH,
     readonly initialBufferSize = DEFAULT_INITIAL_BUFFER_SIZE,
     readonly sortKeys = false,
+    readonly preferFloat32 = false,
   ) {}
 
   encode(object: unknown, depth: number): void {
@@ -118,8 +119,16 @@ export class Encoder {
         }
       }
     } else {
-      this.writeU8(0xcb);
-      this.writeF64(object);
+      // non-integer numbers
+      if (this.preferFloat32) {
+        // float 32
+        this.writeU8(0xca);
+        this.writeF32(object);
+      } else {
+        // float 64
+        this.writeU8(0xcb);
+        this.writeF64(object);
+      }
     }
   }
 
@@ -345,9 +354,14 @@ export class Encoder {
     this.pos += 4;
   }
 
+  writeF32(value: number) {
+    this.ensureBufferSizeToWrite(4);
+    this.view.setFloat32(this.pos, value);
+    this.pos += 4;
+  }
+
   writeF64(value: number) {
     this.ensureBufferSizeToWrite(8);
-
     this.view.setFloat64(this.pos, value);
     this.pos += 8;
   }
diff --git a/src/encode.ts b/src/encode.ts
@@ -7,6 +7,11 @@ export type EncodeOptions = Partial<
     maxDepth: number;
     initialBufferSize: number;
     sortKeys: boolean;
+
+    /**
+     * If `true`, float32 is preferred in encoding non-integer numbers, insted of float64.
+     */
+    preferFloat32: boolean;
   }>
 >;
 
@@ -19,7 +24,13 @@ const defaultEncodeOptions = {};
  * The returned buffer is a slice of a larger `ArrayBuffer`, so you have to use its `#byteOffset` and `#byteLength` in order to convert it to another typed arrays including NodeJS `Buffer`.
  */
 export function encode(value: unknown, options: EncodeOptions = defaultEncodeOptions): Uint8Array {
-  const encoder = new Encoder(options.extensionCodec, options.maxDepth, options.initialBufferSize, options.sortKeys);
+  const encoder = new Encoder(
+    options.extensionCodec,
+    options.maxDepth,
+    options.initialBufferSize,
+    options.sortKeys,
+    options.preferFloat32,
+  );
   encoder.encode(value, 1);
   return encoder.getUint8Array();
 }
diff --git a/test/encode.test.ts b/test/encode.test.ts
@@ -3,11 +3,28 @@ import { encode, decode } from "@msgpack/msgpack";
 
 describe("encode", () => {
   context("sortKeys", () => {
-    it("canonicalize encoded binaries", () => {
+    it("canonicalizes encoded binaries", () => {
       assert.deepStrictEqual(encode({ a: 1, b: 2 }, { sortKeys: true }), encode({ b: 2, a: 1 }, { sortKeys: true }));
     });
   });
 
+  context("preferFloat32", () => {
+    it("encodes numbers in float64 wihout preferFloat32", () => {
+      assert.deepStrictEqual(encode(3.14), Uint8Array.from([0xcb, 0x40, 0x9, 0x1e, 0xb8, 0x51, 0xeb, 0x85, 0x1f]));
+    });
+
+    it("encodes numbers in float32 when preferFloate32=true", () => {
+      assert.deepStrictEqual(encode(3.14, { preferFloat32: true }), Uint8Array.from([0xca, 0x40, 0x48, 0xf5, 0xc3]));
+    });
+
+    it("encodes numbers in float64 with preferFloat32=false", () => {
+      assert.deepStrictEqual(
+        encode(3.14, { preferFloat32: false }),
+        Uint8Array.from([0xcb, 0x40, 0x9, 0x1e, 0xb8, 0x51, 0xeb, 0x85, 0x1f]),
+      );
+    });
+  });
+
   context("ArrayBuffer as buffer", () => {
     const buffer = encode([1, 2, 3]);
     const arrayBuffer = buffer.buffer.slice(buffer.byteOffset, buffer.byteLength);
