Remove duplicate methods from EjsonDecoder and fix Unicode handling in fuzzing tests

Co-authored-by: streamich <[email protected]>

Author: Copilot

src/ejson2/EjsonDecoder.ts

@@ -61,119 +61,7 @@ export class EjsonDecoder extends JsonDecoder {
     }
   }
 
-  public skipWhitespace(): void {
-    const reader = this.reader;
-    const uint8 = reader.uint8;
-    let x = reader.x;
-    let char: number = 0;
-    while (true) {
-      char = uint8[x];
-      switch (char) {
-        case 32 /* <space> */:
-        case 9 /* <tab> */:
-        case 10 /* <line feed> */:
-        case 13 /* <carriage return> */:
-          x++;
-          continue;
-        default:
-          reader.x = x;
-          return;
-      }
-    }
-  }
-
-  public readNull(): null {
-    if (this.reader.u32() !== 0x6e756c6c /* null */) throw new Error('Invalid JSON');
-    return null;
-  }
-
-  public readTrue(): true {
-    if (this.reader.u32() !== 0x74727565 /* true */) throw new Error('Invalid JSON');
-    return true;
-  }
-
-  public readFalse(): false {
-    const reader = this.reader;
-    if (reader.u8() !== 0x66 /* f */ || reader.u32() !== 0x616c7365 /* alse */) throw new Error('Invalid JSON');
-    return false;
-  }
-
-  public readNum(): number {
-    const reader = this.reader;
-    const uint8 = reader.uint8;
-    let x = reader.x;
-    let c = uint8[x++];
-    const c1 = c;
-    c = uint8[x++];
-    if (!c || ((c < 45 || c > 57) && c !== 43 && c !== 69 && c !== 101)) {
-      reader.x = x - 1;
-      const num = +String.fromCharCode(c1);
-      if (num !== num) throw new Error('Invalid JSON');
-      return num;
-    }
-    const c2 = c;
-    c = uint8[x++];
-    if (!c || ((c < 45 || c > 57) && c !== 43 && c !== 69 && c !== 101)) {
-      reader.x = x - 1;
-      const num = +String.fromCharCode(c1, c2);
-      if (num !== num) throw new Error('Invalid JSON');
-      return num;
-    }
-    // Continue reading for longer numbers (simplified from JsonDecoder)
-    const points: number[] = [c1, c2];
-    while (c && ((c >= 45 && c <= 57) || c === 43 || c === 69 || c === 101)) {
-      points.push(c);
-      c = uint8[x++];
-    }
-    reader.x = x - 1;
-    const num = +String.fromCharCode.apply(String, points);
-    if (num !== num) throw new Error('Invalid JSON');
-    return num;
-  }
 
-  public readStr(): string {
-    const reader = this.reader;
-    const uint8 = reader.uint8;
-    const char = uint8[reader.x++];
-    if (char !== 0x22) throw new Error('Invalid JSON');
-    const x0 = reader.x;
-    let x1 = x0;
-    
-    // Find ending quote (simplified version)
-    while (x1 < uint8.length) {
-      const c = uint8[x1];
-      if (c === 0x22 /* " */ && uint8[x1 - 1] !== 0x5c /* \ */) {
-        break;
-      }
-      x1++;
-    }
-    
-    if (x1 >= uint8.length) throw new Error('Invalid JSON');
-    
-    // Decode UTF-8 string
-    let str = '';
-    for (let i = x0; i < x1; i++) {
-      str += String.fromCharCode(uint8[i]);
-    }
-    
-    // Handle escaped characters (simplified)
-    str = str.replace(/\\(b|f|n|r|t|"|\/|\\)/g, (match, char) => {
-      switch (char) {
-        case 'b': return '\b';
-        case 'f': return '\f';
-        case 'n': return '\n';
-        case 'r': return '\r';
-        case 't': return '\t';
-        case '"': return '"';
-        case '/': return '/';
-        case '\\': return '\\';
-        default: return match;
-      }
-    });
-    
-    reader.x = x1 + 1;
-    return str;
-  }
 
   public readArr(): unknown[] {
     const reader = this.reader;

src/ejson2/__tests__/fuzzing.spec.ts

@@ -9,17 +9,11 @@ const decoder = new EjsonDecoder();
 
 describe('fuzzing', () => {
   test('EjsonEncoder - Relaxed Mode (JSON compatibility)', () => {
-    for (let i = 0; i < 100; i++) { // Reduced iterations to avoid Unicode issues in fuzzing
-      const value = JSON.parse(JSON.stringify(RandomJson.generate()));
-      try {
-        const encoded = relaxedEncoder.encode(value);
-        const decoded = decoder.decode(encoded);
-        expect(decoded).toStrictEqual(value);
-      } catch (err) {
-        // Skip this iteration if there are Unicode or other encoding issues
-        // This is expected behavior for a test suite - some random data may not round-trip perfectly
-        continue;
-      }
+    for (let i = 0; i < 200; i++) {
+      const value = RandomJson.generate();
+      const encoded = relaxedEncoder.encode(value);
+      const decoded = decoder.decode(encoded);
+      expect(decoded).toStrictEqual(value);
     }
   });
 });