style: 💄 fix linter issues

Author: streamich

src/json-crdt-diff/JsonCrdtDiff.ts

@@ -1,6 +1,6 @@
 import {deepEqual} from '@jsonjoy.com/util/lib/json-equal/deepEqual';
 import {cmpUint8Array} from '@jsonjoy.com/util/lib/buffers/cmpUint8Array';
-import {ITimespanStruct, type ITimestampStruct, Patch, PatchBuilder, Timespan} from '../json-crdt-patch';
+import {type ITimespanStruct, type ITimestampStruct, type Patch, PatchBuilder, Timespan} from '../json-crdt-patch';
 import {ArrNode, BinNode, ConNode, ObjNode, StrNode, ValNode, VecNode, type JsonNode} from '../json-crdt/nodes';
 import * as str from '../util/diff/str';
 import * as bin from '../util/diff/bin';
@@ -26,7 +26,9 @@ export class JsonCrdtDiff {
     const view = src.view();
     if (view === dst) return;
     const builder = this.builder;
-    str.apply(str.diff(view, dst), view.length,
+    str.apply(
+      str.diff(view, dst),
+      view.length,
       (pos, txt) => builder.insStr(src.id, !pos ? src.id : src.find(pos - 1)!, txt),
       (pos, len) => builder.del(src.id, src.findInterval(pos, len)),
     );
@@ -36,15 +38,17 @@ export class JsonCrdtDiff {
     const view = src.view();
     if (cmpUint8Array(view, dst)) return;
     const builder = this.builder;
-    bin.apply(bin.diff(view, dst), view.length,
+    bin.apply(
+      bin.diff(view, dst),
+      view.length,
       (pos, txt) => builder.insBin(src.id, !pos ? src.id : src.find(pos - 1)!, txt),
       (pos, len) => builder.del(src.id, src.findInterval(pos, len)),
     );
   }
 
   protected diffArr(src: ArrNode, dst: unknown[]): void {
     const srcLines: string[] = [];
-    src.children(node => {
+    src.children((node) => {
       srcLines.push(structHashCrdt(node));
     });
     const dstLines: string[] = [];
@@ -93,7 +97,11 @@ export class JsonCrdtDiff {
     const length = inserts.length;
     for (let i = 0; i < length; i++) {
       const [after, views] = inserts[i];
-      builder.insArr(src.id, after, views.map(view => builder.json(view)))
+      builder.insArr(
+        src.id,
+        after,
+        views.map((view) => builder.json(view)),
+      );
     }
     if (deletes.length) builder.del(src.id, deletes);
   }
@@ -102,6 +110,7 @@ export class JsonCrdtDiff {
     const builder = this.builder;
     const inserts: [key: string, value: ITimestampStruct][] = [];
     const srcKeys = new Set<string>();
+    // biome-ignore lint: .forEach is fastest here
     src.forEach((key) => {
       srcKeys.add(key);
       const dstValue = dst[key];
@@ -123,8 +132,7 @@ export class JsonCrdtDiff {
           }
         }
       }
-      inserts.push([key, src.get(key) instanceof ConNode
-        ? builder.const(dstValue) : builder.constOrJson(dstValue)]);
+      inserts.push([key, src.get(key) instanceof ConNode ? builder.const(dstValue) : builder.constOrJson(dstValue)]);
     }
     if (inserts.length) builder.insObj(src.id, inserts);
   }
@@ -177,7 +185,7 @@ export class JsonCrdtDiff {
   public diffAny(src: JsonNode, dst: unknown): void {
     if (src instanceof ConNode) {
       const val = src.val;
-      if ((val !== dst) && !deepEqual(src.val, dst)) throw new DiffError();
+      if (val !== dst && !deepEqual(src.val, dst)) throw new DiffError();
     } else if (src instanceof StrNode) {
       if (typeof dst !== 'string') throw new DiffError();
       this.diffStr(src, dst);

src/json-crdt-diff/__tests__/JsonCrdtDiff.spec.ts

@@ -1,7 +1,7 @@
 import {JsonCrdtDiff} from '../JsonCrdtDiff';
-import {InsStrOp, s} from '../../json-crdt-patch';
+import {type InsStrOp, s} from '../../json-crdt-patch';
 import {Model} from '../../json-crdt/model';
-import {JsonNode, ValNode} from '../../json-crdt/nodes';
+import {type JsonNode, ValNode} from '../../json-crdt/nodes';
 import {b} from '@jsonjoy.com/util/lib/buffers/b';
 
 const assertDiff = (model: Model<any>, src: JsonNode, dst: unknown) => {
@@ -25,9 +25,11 @@ const assertDiff2 = (src: unknown, dst: unknown) => {
 
 describe('con', () => {
   test('binary in "con"', () => {
-    const model = Model.create(s.obj({
-      field: s.con(new Uint8Array([1, 2, 3])),
-    }));
+    const model = Model.create(
+      s.obj({
+        field: s.con(new Uint8Array([1, 2, 3])),
+      }),
+    );
     const dst = {
       field: new Uint8Array([1, 2, 3, 4]),
     };
@@ -376,10 +378,12 @@ describe('arr', () => {
 
 describe('scenarios', () => {
   test('link element annotation', () => {
-    const model = Model.create(s.obj({
-      href: s.str('http://example.com/page?tab=1'),
-      title: s.str('example'),
-    }));
+    const model = Model.create(
+      s.obj({
+        href: s.str('http://example.com/page?tab=1'),
+        title: s.str('example'),
+      }),
+    );
     const dst = {
       href: 'https://example.com/page-2',
       title: 'Example page',

src/json-hash/__tests__/assertStructHash.ts

@@ -2,6 +2,7 @@ import {structHash as structHash_} from '../structHash';
 import {structHashCrdt} from '../structHashCrdt';
 import {Model} from '../../json-crdt';
 
+// biome-ignore lint: \x00 character
 const isASCII = (str: string) => /^[\x00-\x7F]*$/.test(str);
 
 export const assertStructHash = (json: unknown): string => {

src/json-hash/__tests__/structHash.spec.ts

@@ -2,6 +2,7 @@ import {clone} from '@jsonjoy.com/util/lib/json-clone';
 import {structHash as structHash_} from '../structHash';
 import {RandomJson} from '@jsonjoy.com/util/lib/json-random';
 
+// biome-ignore lint: \x00 character
 const isASCII = (str: string) => /^[\x00-\x7F]*$/.test(str);
 
 const structHash = (json: unknown): string => {

src/json-hash/structHash.ts

@@ -1,5 +1,5 @@
 import {sort} from '@jsonjoy.com/util/lib/sort/insertion';
-import {hash} from "./hash";
+import {hash} from './hash';
 
 /**
  * Produces a *structural hash* of a JSON value.
@@ -9,12 +9,13 @@ import {hash} from "./hash";
  *
  * The hash is guaranteed to contain only printable ASCII characters, excluding
  * the newline character.
- * 
+ *
  * @param val A JSON value to hash.
  */
 export const structHash = (val: unknown): string => {
   switch (typeof val) {
-    case 'string': return hash(val).toString(36);
+    case 'string':
+      return hash(val).toString(36);
     case 'number':
     case 'bigint':
       return val.toString(36);

src/json-hash/structHashCrdt.ts

@@ -1,14 +1,14 @@
 import {sort} from '@jsonjoy.com/util/lib/sort/insertion';
-import {ArrNode, BinNode, ConNode, JsonNode, ObjNode, StrNode, ValNode, VecNode} from "../json-crdt";
-import {hash} from "./hash";
-import {structHash} from "./structHash";
+import {ArrNode, BinNode, ConNode, type JsonNode, ObjNode, StrNode, ValNode, VecNode} from '../json-crdt';
+import {hash} from './hash';
+import {structHash} from './structHash';
 
 /**
  * Constructs a structural hash of the view of the node.
  *
  * Produces a *structural hash* of a JSON CRDT node. Works the same as
  * `structHash, but uses the `JsonNode` interface instead of a generic value.
- * 
+ *
  * @todo PERF: instead of constructing a "str" and "bin" view, iterate over
  *     the RGA chunks and hash them directly.
  */

src/json-patch-diff/JsonPatchDiff.ts

@@ -9,13 +9,15 @@ export class JsonPatchDiff {
 
   protected diffVal(path: string, src: unknown, dst: unknown): void {
     if (deepEqual(src, dst)) return;
-    this.patch.push({op: 'replace', path, value: dst})
+    this.patch.push({op: 'replace', path, value: dst});
   }
 
   protected diffStr(path: string, src: string, dst: string): void {
     if (src === dst) return;
     const patch = this.patch;
-    str.apply(str.diff(src, dst), src.length,
+    str.apply(
+      str.diff(src, dst),
+      src.length,
       (pos, str) => patch.push({op: 'str_ins', path, pos, str}),
       (pos, len, str) => patch.push({op: 'str_del', path, pos, len, str}),
     );
@@ -59,11 +61,12 @@ export class JsonPatchDiff {
       switch (type) {
         case line.LINE_PATCH_OP_TYPE.EQL:
           break;
-        case line.LINE_PATCH_OP_TYPE.MIX:
+        case line.LINE_PATCH_OP_TYPE.MIX: {
           const srcValue = src[srcIdx];
           const dstValue = dst[dstIdx];
           this.diff(pfx + srcIdx, srcValue, dstValue);
           break;
+        }
         case line.LINE_PATCH_OP_TYPE.INS:
           patch.push({op: 'add', path: pfx + (srcIdx + 1), value: dst[dstIdx]});
           break;
@@ -77,7 +80,7 @@ export class JsonPatchDiff {
   public diffAny(path: string, src: unknown, dst: unknown): void {
     switch (typeof src) {
       case 'string': {
-        if (typeof dst == 'string') this.diffStr(path, src, dst);
+        if (typeof dst === 'string') this.diffStr(path, src, dst);
         else this.diffVal(path, src, dst);
         break;
       }
@@ -88,7 +91,10 @@ export class JsonPatchDiff {
         break;
       }
       case 'object': {
-        if (!src || !dst || typeof dst !== 'object') return this.diffVal(path, src, dst);
+        if (!src || !dst || typeof dst !== 'object') {
+          this.diffVal(path, src, dst);
+          return;
+        }
         if (Array.isArray(src)) {
           if (Array.isArray(dst)) this.diffArr(path, src, dst);
           else this.diffVal(path, src, dst);

src/json-patch-diff/__tests__/JsonPatchDiff.spec.ts

@@ -92,15 +92,15 @@ describe('obj', () => {
       nested: {
         id: 2,
         name: 'world',
-        description: 'blablabla'
+        description: 'blablabla',
       },
     };
     const dst = {
       id: 3,
       name: 'hello!',
       nested: {
         id: 2,
-        description: 'Please dont use "blablabla"'
+        description: 'Please dont use "blablabla"',
       },
     };
     assertDiff(src, dst);
@@ -192,14 +192,8 @@ describe('arr', () => {
   });
 
   test('fuzzer - 1', () => {
-    const src: unknown[] = [
-      11, 10, 4, 6,
-       3,  1, 5
-    ];
-    const dst: unknown[] = [
-      7, 3, 13, 7, 9,
-      9, 9,  4, 9
-    ];
+    const src: unknown[] = [11, 10, 4, 6, 3, 1, 5];
+    const dst: unknown[] = [7, 3, 13, 7, 9, 9, 9, 4, 9];
     assertDiff(src, dst);
   });
 });
@@ -220,7 +214,7 @@ test('array of objects diff', () => {
       id: 'xxxx',
       name: 'Music',
       description: 'I love music',
-    }
+    },
   ];
   const dst = [
     {
@@ -259,16 +253,16 @@ test('complex case', () => {
         id: 'xxxx',
         name: 'Music',
         description: 'I love music',
-      }
+      },
     ],
     address: {
       city: 'New York',
       state: 'NY',
       zip: '10001',
       location: {
         lat: 40.7128,
-        lng: -74.0060,
-      }
+        lng: -74.006,
+      },
     },
   };
   const dst = {
@@ -296,7 +290,7 @@ test('complex case', () => {
       location: {
         lat: 40.7128,
         lng: 123.4567,
-      }
+      },
     },
   };
   assertDiff(src, dst);

src/json-patch-diff/__tests__/util.ts

@@ -10,7 +10,7 @@ export const assertDiff = (src: unknown, dst: unknown) => {
   const {doc: res} = applyPatch(srcNested, patch1, {mutate: false});
   // console.log(res);
   expect(res).toEqual({src: dst});
-  const patch2 = new JsonPatchDiff().diff('/src', (res as any)['src'], dst);
+  const patch2 = new JsonPatchDiff().diff('/src', (res as any).src, dst);
   // console.log(patch2);
   expect(patch2.length).toBe(0);
 };

src/util/diff/__tests__/bin-fuzz.spec.ts

@@ -3,9 +3,8 @@ import {toBuf} from '@jsonjoy.com/util/lib/buffers/toBuf';
 import {assertPatch} from './util';
 import * as bin from '../bin';
 
-const str = () => Math.random() > .7
-  ? RandomJson.genString(Math.ceil(Math.random() * 200))
-  : Math.random().toString(36).slice(2);
+const str = () =>
+  Math.random() > 0.7 ? RandomJson.genString(Math.ceil(Math.random() * 200)) : Math.random().toString(36).slice(2);
 const iterations = 100;
 
 test('fuzzing diff()', () => {