Merge

Author: schmidt-sebastian

packages/firestore/src/index/ordered_code_writer.ts

@@ -77,7 +77,7 @@ export function numberOfLeadingZerosInByte(x: number): number {
 /** Counts the number of leading zeros in the given byte array. */
 function numberOfLeadingZeros(bytes: Uint8Array): number {
   debugAssert(
-    bytes.length == 8,
+    bytes.length === 8,
     'Can only count leading zeros in 64-bit numbers'
   );
   let leadingZeros = 0;

packages/firestore/test/unit/index/ordered_code_writer.test.ts

@@ -24,211 +24,87 @@ import {
 class ValueTestCase<T> {
   constructor(
     readonly val: T,
-    readonly ascEncoding: Uint8Array,
-    readonly descEncoding: Uint8Array
+    readonly ascString: string,
+    readonly descString: string
   ) {}
 }
 
 const NUMBER_TEST_CASES: Array<ValueTestCase<number>> = [
   new ValueTestCase(
     Number.NEGATIVE_INFINITY,
     // Note: This values are taken from the Android reference implementation
-    new Uint8Array([0x07, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]),
-    new Uint8Array([0xf8, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00])
+    '070fffffffffffff',
+    'f8f0000000000000'
   ),
   new ValueTestCase(
     Number.MIN_SAFE_INTEGER,
-    new Uint8Array([0x08, 0x3c, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]),
-    new Uint8Array([0xf7, 0xc3, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])
-  ),
-  new ValueTestCase(
-    -2,
-    new Uint8Array([0x08, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]),
-    new Uint8Array([0xf7, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00])
-  ),
-  new ValueTestCase(
-    -1,
-    new Uint8Array([0x08, 0x40, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]),
-    new Uint8Array([0xf7, 0xbf, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00])
-  ),
-  new ValueTestCase(
-    -0.1,
-    new Uint8Array([0x08, 0x40, 0x46, 0x66, 0x66, 0x66, 0x66, 0x66, 0x65]),
-    new Uint8Array([0xf7, 0xbf, 0xb9, 0x99, 0x99, 0x99, 0x99, 0x99, 0x9a])
-  ),
-  new ValueTestCase(
-    -0.0,
-    new Uint8Array([0x08, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]),
-    new Uint8Array([0xf7, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00])
-  ),
-  new ValueTestCase(
-    0,
-    new Uint8Array([0x08, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]),
-    new Uint8Array([0xf7, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])
+    '083cc0000000000000',
+    'f7c33fffffffffffff'
   ),
+  new ValueTestCase(-2, '083fffffffffffffff', 'f7c000000000000000'),
+  new ValueTestCase(-1, '08400fffffffffffff', 'f7bff0000000000000'),
+  new ValueTestCase(-0.1, '084046666666666665', 'f7bfb999999999999a'),
+  new ValueTestCase(-0.0, '087fffffffffffffff', 'f78000000000000000'),
+  new ValueTestCase(0, '088000000000000000', 'f77fffffffffffffff'),
   new ValueTestCase(
     Number.MIN_VALUE,
-    new Uint8Array([0x08, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01]),
-    new Uint8Array([0xf7, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe])
-  ),
-  new ValueTestCase(
-    0.1,
-    new Uint8Array([0x08, 0xbf, 0xb9, 0x99, 0x99, 0x99, 0x99, 0x99, 0x9a]),
-    new Uint8Array([0xf7, 0x40, 0x46, 0x66, 0x66, 0x66, 0x66, 0x66, 0x65])
-  ),
-  new ValueTestCase(
-    1,
-    new Uint8Array([0x08, 0xbf, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]),
-    new Uint8Array([0xf7, 0x40, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])
-  ),
-  new ValueTestCase(
-    2,
-    new Uint8Array([0x08, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]),
-    new Uint8Array([0xf7, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])
-  ),
-  new ValueTestCase(
-    4,
-    new Uint8Array([0x08, 0xc0, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]),
-    new Uint8Array([0xf7, 0x3f, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])
-  ),
-  new ValueTestCase(
-    8,
-    new Uint8Array([0x08, 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]),
-    new Uint8Array([0xf7, 0x3f, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])
-  ),
-  new ValueTestCase(
-    16,
-    new Uint8Array([0x08, 0xc0, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]),
-    new Uint8Array([0xf7, 0x3f, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])
-  ),
-  new ValueTestCase(
-    32,
-    new Uint8Array([0x08, 0xc0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]),
-    new Uint8Array([0xf7, 0x3f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])
-  ),
-  new ValueTestCase(
-    64,
-    new Uint8Array([0x08, 0xc0, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]),
-    new Uint8Array([0xf7, 0x3f, 0xaf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])
-  ),
-  new ValueTestCase(
-    128,
-    new Uint8Array([0x08, 0xc0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]),
-    new Uint8Array([0xf7, 0x3f, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])
-  ),
-  new ValueTestCase(
-    255,
-    new Uint8Array([0x08, 0xc0, 0x6f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00]),
-    new Uint8Array([0xf7, 0x3f, 0x90, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff])
-  ),
-  new ValueTestCase(
-    256,
-    new Uint8Array([0x08, 0xc0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]),
-    new Uint8Array([0xf7, 0x3f, 0x8f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])
-  ),
-  new ValueTestCase(
-    257,
-    new Uint8Array([0x08, 0xc0, 0x70, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00]),
-    new Uint8Array([0xf7, 0x3f, 0x8f, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff])
-  ),
+    '088000000000000001',
+    'f77ffffffffffffffe'
+  ),
+  new ValueTestCase(0.1, '08bfb999999999999a', 'f74046666666666665'),
+  new ValueTestCase(1, '08bff0000000000000', 'f7400fffffffffffff'),
+  new ValueTestCase(2, '08c000000000000000', 'f73fffffffffffffff'),
+  new ValueTestCase(4, '08c010000000000000', 'f73fefffffffffffff'),
+  new ValueTestCase(8, '08c020000000000000', 'f73fdfffffffffffff'),
+  new ValueTestCase(16, '08c030000000000000', 'f73fcfffffffffffff'),
+  new ValueTestCase(32, '08c040000000000000', 'f73fbfffffffffffff'),
+  new ValueTestCase(64, '08c050000000000000', 'f73fafffffffffffff'),
+  new ValueTestCase(128, '08c060000000000000', 'f73f9fffffffffffff'),
+  new ValueTestCase(255, '08c06fe00000000000', 'f73f901fffffffffff'),
+  new ValueTestCase(256, '08c070000000000000', 'f73f8fffffffffffff'),
+  new ValueTestCase(257, '08c070100000000000', 'f73f8fefffffffffff'),
   new ValueTestCase(
     Number.MAX_SAFE_INTEGER,
-    new Uint8Array([0x08, 0xc3, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]),
-    new Uint8Array([0xf7, 0x3c, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00])
+    '08c33fffffffffffff',
+    'f73cc0000000000000'
   ),
   new ValueTestCase(
     Number.POSITIVE_INFINITY,
-    new Uint8Array([0x08, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]),
-    new Uint8Array([0xf7, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])
+    '08fff0000000000000',
+    'f7000fffffffffffff'
   ),
-  new ValueTestCase(
-    Number.NaN,
-    new Uint8Array([0x08, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]),
-    new Uint8Array([0xf7, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])
-  )
+  new ValueTestCase(Number.NaN, '08fff8000000000000', 'f70007ffffffffffff')
 ];
 
 const STRING_TEST_CASES: Array<ValueTestCase<string>> = [
-  new ValueTestCase(
-    '',
-    new Uint8Array([0x00, 0x01]),
-    new Uint8Array([0xff, 0xfe])
-  ),
-  new ValueTestCase(
-    '\u0000',
-    new Uint8Array([0x00, 0xff, 0x00, 0x01]),
-    new Uint8Array([0xff, 0x00, 0xff, 0xfe])
-  ),
-  new ValueTestCase(
-    '\u0000\u0000',
-    new Uint8Array([0x00, 0xff, 0x00, 0xff, 0x00, 0x01]),
-    new Uint8Array([0xff, 0x00, 0xff, 0x00, 0xff, 0xfe])
-  ),
-  new ValueTestCase(
-    'abc',
-    new Uint8Array([0x61, 0x62, 0x63, 0x00, 0x01]),
-    new Uint8Array([0x9e, 0x9d, 0x9c, 0xff, 0xfe])
-  ),
+  new ValueTestCase('', '0001', 'fffe'),
+  new ValueTestCase('\u0000', '00ff0001', 'ff00fffe'),
+  new ValueTestCase('\u0000\u0000', '00ff00ff0001', 'ff00ff00fffe'),
+  new ValueTestCase('abc', '6162630001', '9e9d9cfffe'),
   new ValueTestCase(
     'xy¢z𠜎€𠜱あ𠝹',
-    new Uint8Array([
-      0x78, 0x79, 0xc2, 0xa2, 0x7a, 0xf0, 0xa0, 0x9c, 0x8e, 0xe2, 0x82, 0xac,
-      0xf0, 0xa0, 0x9c, 0xb1, 0xe3, 0x81, 0x82, 0xf0, 0xa0, 0x9d, 0xb9, 0x00,
-      0x01
-    ]),
-    new Uint8Array([
-      0x87, 0x86, 0x3d, 0x5d, 0x85, 0x0f, 0x5f, 0x63, 0x71, 0x1d, 0x7d, 0x53,
-      0x0f, 0x5f, 0x63, 0x4e, 0x1c, 0x7e, 0x7d, 0x0f, 0x5f, 0x62, 0x46, 0xff,
-      0xfe
-    ])
+    '7879c2a27af0a09c8ee282acf0a09cb1e38182f0a09db90001',
+    '87863d5d850f5f63711d7d530f5f634e1c7e7d0f5f6246fffe'
   ),
   new ValueTestCase(
     '¬˚ß∂∆ç',
-    new Uint8Array([
-      0xc2, 0xac, 0xcb, 0x9a, 0xc3, 0x9f, 0xe2, 0x88, 0x82, 0xe2, 0x88, 0x86,
-      0xc3, 0xa7, 0x00, 0x01
-    ]),
-    new Uint8Array([
-      0x3d, 0x53, 0x34, 0x65, 0x3c, 0x60, 0x1d, 0x77, 0x7d, 0x1d, 0x77, 0x79,
-      0x3c, 0x58, 0xff, 0xfe
-    ])
+    'c2accb9ac39fe28882e28886c3a70001',
+    '3d5334653c601d777d1d77793c58fffe'
   ),
   new ValueTestCase(
     'œ∑´´ß™£',
-    new Uint8Array([
-      0xc5, 0x93, 0xe2, 0x88, 0x91, 0xc2, 0xb4, 0xc2, 0xb4, 0xc3, 0x9f, 0xe2,
-      0x84, 0xa2, 0xc2, 0xa3, 0x00, 0x01
-    ]),
-    new Uint8Array([
-      0x3a, 0x6c, 0x1d, 0x77, 0x6e, 0x3d, 0x4b, 0x3d, 0x4b, 0x3c, 0x60, 0x1d,
-      0x7b, 0x5d, 0x3d, 0x5c, 0xff, 0xfe
-    ])
+    'c593e28891c2b4c2b4c39fe284a2c2a30001',
+    '3a6c1d776e3d4b3d4b3c601d7b5d3d5cfffe'
   ),
   new ValueTestCase(
     'πåçasdl߬µœ∑âsldalskdåßµ∂π',
-    new Uint8Array([
-      0xcf, 0x80, 0xc3, 0xa5, 0xc3, 0xa7, 0x61, 0x73, 0x64, 0x6c, 0xc3, 0x9f,
-      0xc2, 0xac, 0xc2, 0xb5, 0xc5, 0x93, 0xe2, 0x88, 0x91, 0xc3, 0xa2, 0x73,
-      0x6c, 0x64, 0x61, 0x6c, 0x73, 0x6b, 0x64, 0xc3, 0xa5, 0xc3, 0x9f, 0xc2,
-      0xb5, 0xe2, 0x88, 0x82, 0xcf, 0x80, 0x00, 0x01
-    ]),
-    new Uint8Array([
-      0x30, 0x7f, 0x3c, 0x5a, 0x3c, 0x58, 0x9e, 0x8c, 0x9b, 0x93, 0x3c, 0x60,
-      0x3d, 0x53, 0x3d, 0x4a, 0x3a, 0x6c, 0x1d, 0x77, 0x6e, 0x3c, 0x5d, 0x8c,
-      0x93, 0x9b, 0x9e, 0x93, 0x8c, 0x94, 0x9b, 0x3c, 0x5a, 0x3c, 0x60, 0x3d,
-      0x4a, 0x1d, 0x77, 0x7d, 0x30, 0x7f, 0xff, 0xfe
-    ])
+    'cf80c3a5c3a76173646cc39fc2acc2b5c593e28891c3a2736c64616c736b64c3a5c39fc2b5e28882cf800001',
+    '307f3c5a3c589e8c9b933c603d533d4a3a6c1d776e3c5d8c939b9e938c949b3c5a3c603d4a1d777d307ffffe'
   ),
   new ValueTestCase(
     '†¥¬´´`',
-    new Uint8Array([
-      0xe2, 0x80, 0xa0, 0xc2, 0xa5, 0xc2, 0xac, 0xc2, 0xb4, 0xc2, 0xb4, 0x60,
-      0x00, 0x01
-    ]),
-    new Uint8Array([
-      0x1d, 0x7f, 0x5f, 0x3d, 0x5a, 0x3d, 0x53, 0x3d, 0x4b, 0x3d, 0x4b, 0x9f,
-      0xff, 0xfe
-    ])
+    'e280a0c2a5c2acc2b4c2b4600001',
+    '1d7f5f3d5a3d533d4b3d4b9ffffe'
   )
 ];
 
@@ -267,11 +143,11 @@ describe('Ordered Code Writer', () => {
     for (let i = 0; i < testCases.length; ++i) {
       const bytes = getBytes(testCases[i].val);
       expect(bytes.asc).to.deep.equal(
-        testCases[i].ascEncoding,
+        fromHex(testCases[i].ascString),
         'Ascending for ' + testCases[i].val
       );
       expect(bytes.desc).to.deep.equal(
-        testCases[i].descEncoding,
+        fromHex(testCases[i].descString),
         'Descending for ' + testCases[i].val
       );
     }
@@ -297,6 +173,14 @@ describe('Ordered Code Writer', () => {
   }
 });
 
+function fromHex(hexString: string): Uint8Array {
+  const bytes = new Uint8Array(hexString.length / 2);
+  for (let c = 0; c < hexString.length; c += 2) {
+    bytes[c / 2] = parseInt(hexString.substr(c, 2), 16);
+  }
+  return bytes;
+}
+
 function compare(left: Uint8Array, right: Uint8Array): number {
   for (let i = 0; i < Math.min(left.length, right.length); ++i) {
     if (left[i] < right[i]) {