Merge pull request #9 from jsonjoy-com/equality

Equality support for `Uint8Array`

Author: streamich

src/json-equal/__bench__/bench.deepEqual.ts

@@ -8,7 +8,8 @@ import {deepEqual as deepEqualV2} from '../deepEqual/v2';
 import {deepEqual as deepEqualV3} from '../deepEqual/v3';
 import {deepEqual as deepEqualV4} from '../deepEqual/v4';
 import {deepEqual as deepEqualV5} from '../deepEqual/v5';
-import {$$deepEqual} from '../$$deepEqual';
+import {deepEqual as deepEqualV6} from '../deepEqual/v6';
+import {deepEqualCodegen} from '../deepEqualCodegen';
 
 const json1 = {
   foo: 'bar',
@@ -22,7 +23,7 @@ const json2 = {
 };
 
 // tslint:disable-next-line no-eval eval ban
-const equalGenerated1 = eval($$deepEqual(json1));
+const equalGenerated1 = eval(deepEqualCodegen(json1));
 
 const suite = new Benchmark.Suite();
 
@@ -42,12 +43,15 @@ suite
   .add(`json-joy/json-equal (v5)`, () => {
     deepEqualV5(json1, json2);
   })
+  .add(`json-joy/json-equal (v6)`, () => {
+    deepEqualV6(json1, json2);
+  })
   .add(`json-joy/json-equal/$$deepEqual`, () => {
     equalGenerated1(json2);
   })
   .add(`json-joy/json-equal/$$deepEqual (with codegen)`, () => {
     // tslint:disable-next-line no-eval eval ban
-    const equalGenerated1 = eval($$deepEqual(json1));
+    const equalGenerated1 = eval(deepEqualCodegen(json1));
     equalGenerated1(json2);
   })
   .on('cycle', (event: any) => {

src/json-equal/deepEqual/__tests__/tests.ts

@@ -1,3 +1,5 @@
+import {b} from '../../../buffers/b';
+
 interface Test {
   description: string;
   value1: unknown;
@@ -251,6 +253,42 @@ export const tests: Suite[] = [
     ],
   },
 
+  {
+    description: 'binary',
+    tests: [
+      {
+        description: 'two empty blobs',
+        value1: new Uint8Array(0),
+        value2: new Uint8Array(0),
+        equal: true,
+      },
+      {
+        description: 'two single char blobs',
+        value1: b(0),
+        value2: b(0),
+        equal: true,
+      },
+      {
+        description: 'small blobs',
+        value1: b(1, 2, 3),
+        value2: b(1, 2, 3),
+        equal: true,
+      },
+      {
+        description: 'empty blob not equal to empty array',
+        value1: b(),
+        value2: [],
+        equal: false,
+      },
+      {
+        description: 'empty blob not equal to non-empty blob',
+        value1: b(),
+        value2: b(1),
+        equal: false,
+      },
+    ],
+  },
+
   {
     description: 'sample objects',
     tests: [

src/json-equal/deepEqual/index.ts

@@ -1 +1 @@
-export * from './v5';
+export * from './v6';

src/json-equal/deepEqual/v6.ts

@@ -0,0 +1,44 @@
+const isArray = Array.isArray;
+const OBJ_PROTO = Object.prototype;
+
+export const deepEqual = (a: unknown, b: unknown): boolean => {
+  // Primitives
+  if (a === b) return true;
+
+  let length: number = 0,
+    i: number = 0;
+
+  // Arrays
+  if (isArray(a)) {
+    if (!isArray(b)) return false;
+    length = a.length;
+    if (length !== (b as Array<unknown>).length) return false;
+    for (i = length; i-- !== 0; ) if (!deepEqual(a[i], (b as Array<unknown>)[i])) return false;
+    return true;
+  }
+
+  // Objects
+  if (a && b && typeof a === 'object' && typeof b === 'object') {
+    specific: {
+      if ((<any>a).__proto__ === OBJ_PROTO) break specific;
+      if (a instanceof Uint8Array) {
+        if (!(b instanceof Uint8Array)) return false;
+        const length = a.length;
+        if (length !== b.length) return false;
+        for (let i = 0; i < length; i++) if (a[i] !== b[i]) return false;
+        return true;
+      }
+    }
+    const keys = Object.keys(a);
+    length = keys.length;
+    if (length !== Object.keys(b).length) return false;
+    if (isArray(b)) return false;
+    for (i = length; i-- !== 0; ) {
+      const key = keys[i];
+      if (!deepEqual((a as Record<string, unknown>)[key], (b as Record<string, unknown>)[key])) return false;
+    }
+    return true;
+  }
+
+  return false;
+};

src/json-equal/$$deepEqual/__tests__/deepEqual.fuzzing.spec.ts renamed to src/json-equal/deepEqualCodegen/__tests__/deepEqual.fuzzing.spec.ts

@@ -1,8 +1,8 @@
-import {$$deepEqual} from '..';
+import {deepEqualCodegen} from '..';
 import {RandomJson} from '../../../json-random/RandomJson';
 
 const deepEqual = (a: unknown, b: unknown) => {
-  const js = $$deepEqual(a);
+  const js = deepEqualCodegen(a);
   const fn = eval(js); // tslint:disable-line
   return fn(b);
 };

src/json-equal/$$deepEqual/__tests__/deepEqual.spec.ts renamed to src/json-equal/deepEqualCodegen/__tests__/deepEqual.spec.ts

@@ -1,8 +1,9 @@
-import {$$deepEqual} from '..';
+import {deepEqualCodegen} from '..';
 import {runDeepEqualTestSuite} from '../../deepEqual/__tests__/runDeepEqualTestSuite';
 
 const deepEqual = (a: unknown, b: unknown) => {
-  const js = $$deepEqual(a);
+  const js = deepEqualCodegen(a);
+  // console.log(js);
   const fn = eval(js); // tslint:disable-line
   return fn(b);
 };

src/json-equal/$$deepEqual/__tests__/deepEqualCodegen.spec.ts renamed to src/json-equal/deepEqualCodegen/__tests__/deepEqualCodegen.spec.ts

@@ -1,7 +1,7 @@
-import {$$deepEqual} from '..';
+import {deepEqualCodegen} from '..';
 
 test('generates a deep equal comparator', () => {
-  const js = $$deepEqual([1, true, false, 'sdf', {foo: 123, null: null}, [null, true, 'asdf'], 3, {}]);
+  const js = deepEqualCodegen([1, true, false, 'sdf', {foo: 123, null: null}, [null, true, 'asdf'], 3, {}]);
   const deepEqual = eval(js); // tslint:disable-line
 
   const res1 = deepEqual([1, true, false, 'sdf', {foo: 123, null: null}, [null, true, 'asdf'], 3, {}]);
@@ -17,12 +17,12 @@ test('generates a deep equal comparator', () => {
 
 test('generates a deep equal comparator for primitives', () => {
   /* tslint:disable */
-  const equal1 = eval($$deepEqual('asdf'));
-  const equal2 = eval($$deepEqual(123));
-  const equal3 = eval($$deepEqual(true));
-  const equal4 = eval($$deepEqual(null));
-  const equal5 = eval($$deepEqual(false));
-  const equal6 = eval($$deepEqual(4.4));
+  const equal1 = eval(deepEqualCodegen('asdf'));
+  const equal2 = eval(deepEqualCodegen(123));
+  const equal3 = eval(deepEqualCodegen(true));
+  const equal4 = eval(deepEqualCodegen(null));
+  const equal5 = eval(deepEqualCodegen(false));
+  const equal6 = eval(deepEqualCodegen(4.4));
   /* tslint:enable */
 
   expect(equal1('asdf')).toBe(true);
@@ -48,7 +48,7 @@ test('generates a deep equal comparator for primitives', () => {
 });
 
 test('undefined is not an empty object', () => {
-  const js = $$deepEqual(undefined);
+  const js = deepEqualCodegen(undefined);
   const deepEqual = eval(js); // tslint:disable-line
   const res = deepEqual({});
   expect(res).toBe(false);

src/json-equal/$$deepEqual/index.ts renamed to src/json-equal/deepEqualCodegen/index.ts

@@ -28,6 +28,16 @@ const codegenValue = (doc: unknown, code: string[], r: number): number => {
     return rr;
   }
 
+  // Uint8Array
+  if (doc instanceof Uint8Array) {
+    const length = doc.length;
+    code.push(`if(!(r${r} instanceof Uint8Array) || r${r}.length !== ${length})return false;`);
+    let condition = '';
+    for (let i = 0; i < length; i++) condition += (condition ? '||' : '') + `(r${r}[${i}]!==${doc[i]})`;
+    if (condition) code.push(`if(${condition})return false;`);
+    return rr;
+  }
+
   // Objects
   if (type === 'object' && doc) {
     const obj = doc as Record<string, unknown>;
@@ -40,6 +50,7 @@ const codegenValue = (doc: unknown, code: string[], r: number): number => {
       code.push(`var r${rr}=r${r}[${JSON.stringify(key)}];`);
       rr = codegenValue(obj[key], code, rr);
     }
+    return rr;
   }
 
   // Undefined
@@ -51,7 +62,7 @@ const codegenValue = (doc: unknown, code: string[], r: number): number => {
   return rr;
 };
 
-export const $$deepEqual = (a: unknown): JavaScript<(b: unknown) => boolean> => {
+export const deepEqualCodegen = (a: unknown): JavaScript<(b: unknown) => boolean> => {
   const code: string[] = [];
   codegenValue(a, code, 0);
 

src/json-equal/$$deepEqual/v1.ts renamed to src/json-equal/deepEqualCodegen/v1.ts

@@ -14,6 +14,7 @@
     "no-angle-bracket-type-assertion": false,
     "ban-comma-operator": false,
     "no-unused-expression": false,
-    "no-implicit-dependencies": false
+    "no-implicit-dependencies": false,
+    "label-position": false
   }
 }