@bnaya/objectbuffer - npm Package Compare versions

Comparing version 0.0.0-96df3bb to 0.0.0-9dd1a9f

dist/index.js

@@ -11,4 +11,3 @@ /**
 /** */
-export { createObjectBuffer, resizeObjectBuffer, getUnderlyingArrayBuffer, loadObjectBuffer, replaceUnderlyingArrayBuffer // eslint-disable-next-line @typescript-eslint/camelcase
-, sizeOf as unreliable_sizeOf, memoryStats, disposeWrapperObject, updateExternalArgs } from "./internal/api";
+export { createObjectBuffer, resizeObjectBuffer, getUnderlyingArrayBuffer, loadObjectBuffer, replaceUnderlyingArrayBuffer, sizeOf as unreliable_sizeOf, memoryStats, disposeWrapperObject, updateExternalArgs } from "./internal/api";
 export { acquireLock, acquireLockWait, releaseLock } from "./internal/locks";

dist/internal/api.js

 import { initializeArrayBuffer } from "./store";
-import { objectSaver } from "./objectSaver";
 import { createObjectWrapper } from "./objectWrapper";
@@ -9,2 +8,5 @@ import { arrayBufferCopyTo, externalArgsApiToExternalArgsApi, getInternalAPI, isPrimitive } from "./utils";
 import { UnsupportedOperationError } from "./exceptions";
+import { createHeap } from "../structsGenerator/consts";
+import { saveValueIterative } from "./saveValue";
+import { allocationsTransaction } from "./allocationsTransaction";
 
@@ -17,3 +19,3 @@ /**
 export function createObjectBuffer(externalArgs, size, initialValue, options = {}) {
-  if (Array.isArray(initialValue) || initialValue instanceof Date || initialValue instanceof Map || initialValue instanceof Set || isPrimitive(initialValue)) {
+  if (Array.isArray(initialValue) || initialValue instanceof Date || initialValue instanceof Map || initialValue instanceof Set || isPrimitive(initialValue) || typeof initialValue === "symbol") {
     throw new UnsupportedOperationError();
@@ -36,7 +38,9 @@ }
     float64: new Float64Array(arrayBuffer),
-    bigUint64: new BigUint64Array(arrayBuffer)
+    bigUint64: new BigUint64Array(arrayBuffer),
+    heap: createHeap(arrayBuffer)
   };
-  const start = objectSaver(externalArgsApiToExternalArgsApi(externalArgs), carrier, [], initialValue);
-  carrier.uint32[INITIAL_ENTRY_POINTER_TO_POINTER / Uint32Array.BYTES_PER_ELEMENT] = start;
-  return createObjectWrapper(externalArgsApiToExternalArgsApi(externalArgs), carrier, start);
+  allocationsTransaction(() => {
+    saveValueIterative(externalArgsApiToExternalArgsApi(externalArgs), carrier, [], INITIAL_ENTRY_POINTER_TO_POINTER, initialValue);
+  }, allocator);
+  return createObjectWrapper(externalArgsApiToExternalArgsApi(externalArgs), carrier, carrier.heap.Uint32Array[INITIAL_ENTRY_POINTER_TO_POINTER / Uint32Array.BYTES_PER_ELEMENT]);
 }
@@ -85,3 +89,4 @@ /**
     float64: new Float64Array(arrayBuffer),
-    bigUint64: new BigUint64Array(arrayBuffer)
+    bigUint64: new BigUint64Array(arrayBuffer),
+    heap: createHeap(arrayBuffer)
   };
@@ -124,5 +129,6 @@ return createObjectWrapper(externalArgsApiToExternalArgsApi(externalArgs), carrier, carrier.uint32[INITIAL_ENTRY_POINTER_TO_POINTER / Uint32Array.BYTES_PER_ELEMENT]);
     float64: new Float64Array(newArrayBuffer),
-    bigUint64: new BigUint64Array(newArrayBuffer)
-  }; // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-  // @ts-ignore
+    bigUint64: new BigUint64Array(newArrayBuffer),
+    heap: createHeap(newArrayBuffer)
+  }; // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-expect-error
 
@@ -129,0 +135,0 @@ allocator.end = newArrayBuffer.byteLength;

dist/internal/arrayHelpers.d.ts

@@ -1,3 +0,3 @@
-import { ArrayEntry, ExternalArgs, GlobalCarrier } from "./interfaces";
-export declare function arrayGetMetadata(carrier: GlobalCarrier, pointerToArrayEntry: number): ArrayEntry;
+import { ExternalArgs, GlobalCarrier } from "./interfaces";
+import { Heap } from "../structsGenerator/consts";
 export declare function arrayGetPointersToValueInIndex(carrier: GlobalCarrier, pointerToArrayEntry: number, indexToGet: number): {
@@ -17,5 +17,5 @@ pointer: number;
  */
-export declare function shrinkArray(externalArgs: ExternalArgs, carrier: GlobalCarrier, pointerToArrayEntry: number, wishedLength: number): void;
-export declare function arraySort(externalArgs: ExternalArgs, globalCarrier: GlobalCarrier, pointerToArrayEntry: number, sortComparator?: (a: any, b: any) => 1 | -1 | 0): void;
-export declare function arrayReverse(externalArgs: ExternalArgs, carrier: GlobalCarrier, pointerToArrayEntry: number): void;
+export declare function shrinkArray(heap: Heap, pointerToArrayEntry: number, wishedLength: number): void;
+export declare function arraySort(externalArgs: ExternalArgs, carrier: GlobalCarrier, pointerToArrayEntry: number, sortComparator?: (a: any, b: any) => 1 | -1 | 0): void;
+export declare function arrayReverse(carrier: GlobalCarrier, pointerToArrayEntry: number): void;
 //# sourceMappingURL=arrayHelpers.d.ts.map

dist/internal/arrayHelpers.js

@@ -1,17 +0,13 @@
-import { readEntry, writeEntry, writeValueInPtrToPtrAndHandleMemory } from "./store";
+import { writeValueInPtrToPtrAndHandleMemory } from "./store";
 import { entryToFinalJavaScriptValue } from "./entryToFinalJavaScriptValue";
 import { ENTRY_TYPE } from "./entry-types";
 import { assertNonNull } from "./assertNonNull";
-export function arrayGetMetadata(carrier, pointerToArrayEntry) {
-  const arrayEntry = readEntry(carrier, pointerToArrayEntry);
-  return arrayEntry;
-}
+import { array_length_get, array_dataspacePointer_get, array_allocatedLength_get, array_length_set, array_set_all, array_refsCount_get } from "./generatedStructs";
 export function arrayGetPointersToValueInIndex(carrier, pointerToArrayEntry, indexToGet) {
-  const metadata = arrayGetMetadata(carrier, pointerToArrayEntry); // out of bound
-
-  if (indexToGet >= metadata.length) {
+  // out of bound
+  if (indexToGet >= array_length_get(carrier.heap, pointerToArrayEntry)) {
     return undefined;
   }
 
-  const pointerToThePointer = metadata.value + indexToGet * Uint32Array.BYTES_PER_ELEMENT;
+  const pointerToThePointer = array_dataspacePointer_get(carrier.heap, pointerToArrayEntry) + indexToGet * Uint32Array.BYTES_PER_ELEMENT;
   const pointer = carrier.uint32[pointerToThePointer / Uint32Array.BYTES_PER_ELEMENT];
@@ -47,16 +43,8 @@ return {
 export function extendArrayIfNeeded(externalArgs, carrier, pointerToArrayEntry, wishedLength) {
-  const metadata = arrayGetMetadata(carrier, pointerToArrayEntry);
-
-  if (wishedLength > metadata.length) {
-    if (wishedLength > metadata.allocatedLength) {
-      reallocateArray(externalArgs, carrier, pointerToArrayEntry, wishedLength + externalArgs.arrayAdditionalAllocation, wishedLength);
+  if (wishedLength > array_length_get(carrier.heap, pointerToArrayEntry)) {
+    if (wishedLength > array_allocatedLength_get(carrier.heap, pointerToArrayEntry)) {
+      reallocateArray(carrier, pointerToArrayEntry, wishedLength + externalArgs.arrayAdditionalAllocation, wishedLength);
     } else {
       // no need to re-allocated, just push the length forward
-      writeEntry(carrier, pointerToArrayEntry, {
-        type: ENTRY_TYPE.ARRAY,
-        refsCount: metadata.refsCount,
-        value: metadata.value,
-        allocatedLength: metadata.allocatedLength,
-        length: wishedLength
-      });
+      array_length_set(carrier.heap, pointerToArrayEntry, wishedLength);
     }
@@ -69,42 +57,16 @@ }
 
-export function shrinkArray(externalArgs, carrier, pointerToArrayEntry, wishedLength) {
-  const metadata = arrayGetMetadata(carrier, pointerToArrayEntry);
-  writeEntry(carrier, pointerToArrayEntry, {
-    type: ENTRY_TYPE.ARRAY,
-    refsCount: metadata.refsCount,
-    value: metadata.value,
-    allocatedLength: metadata.allocatedLength,
-    length: wishedLength
-  });
+export function shrinkArray(heap, pointerToArrayEntry, wishedLength) {
+  array_length_set(heap, pointerToArrayEntry, wishedLength);
 }
 
-function reallocateArray(externalArgs, carrier, pointerToArrayEntry, newAllocatedLength, newLength) {
-  const metadata = arrayGetMetadata(carrier, pointerToArrayEntry);
-  const newArrayValueLocation = carrier.allocator.realloc(metadata.value, newAllocatedLength * Uint32Array.BYTES_PER_ELEMENT); // for (
-  //   let memoryToCopyIndex = 0;
-  //   memoryToCopyIndex < metadata.length;
-  //   memoryToCopyIndex += 1
-  // ) {
-  //   carrier.dataView.setUint32(
-  //     newArrayValueLocation + memoryToCopyIndex * Uint32Array.BYTES_PER_ELEMENT,
-  //     carrier.dataView.getUint32(
-  //       metadata.value + memoryToCopyIndex * Uint32Array.BYTES_PER_ELEMENT
-  //     )
-  //   );
-  // }
-
-  writeEntry(carrier, pointerToArrayEntry, {
-    type: ENTRY_TYPE.ARRAY,
-    refsCount: metadata.refsCount,
-    value: newArrayValueLocation,
-    allocatedLength: newAllocatedLength,
-    length: newLength
-  });
+function reallocateArray(carrier, pointerToArrayEntry, newAllocatedLength, newLength) {
+  const newArrayValueLocation = carrier.allocator.realloc(array_dataspacePointer_get(carrier.heap, pointerToArrayEntry), newAllocatedLength * Uint32Array.BYTES_PER_ELEMENT);
+  array_set_all(carrier.heap, pointerToArrayEntry, ENTRY_TYPE.ARRAY, array_refsCount_get(carrier.heap, pointerToArrayEntry), newArrayValueLocation, newLength, newAllocatedLength);
 }
 
-export function arraySort(externalArgs, globalCarrier, pointerToArrayEntry, sortComparator = defaultCompareFunction) {
-  const metadata = arrayGetMetadata(globalCarrier, pointerToArrayEntry);
-  const pointersToValues = [...new Array(metadata.length).keys()].map(index => metadata.value + index * Uint32Array.BYTES_PER_ELEMENT).map(pointerToPointer => globalCarrier.uint32[pointerToPointer / Uint32Array.BYTES_PER_ELEMENT]);
+export function arraySort(externalArgs, carrier, pointerToArrayEntry, sortComparator = defaultCompareFunction) {
+  const arrayDataSpace = array_dataspacePointer_get(carrier.heap, pointerToArrayEntry);
+  const pointersToValues = [...new Array(array_length_get(carrier.heap, pointerToArrayEntry)).keys()].map(index => arrayDataSpace + index * Uint32Array.BYTES_PER_ELEMENT).map(pointerToPointer => carrier.heap.Uint32Array[pointerToPointer / Uint32Array.BYTES_PER_ELEMENT]);
   const sortMe = pointersToValues.map(pointer => {
-    return [pointer, entryToFinalJavaScriptValue(externalArgs, globalCarrier, pointer)];
+    return [pointer, entryToFinalJavaScriptValue(externalArgs, carrier, pointer)];
   });
@@ -116,3 +78,3 @@ sortMe.sort((a, b) => {
   for (let i = 0; i < sortMe.length; i += 1) {
-    globalCarrier.uint32[(metadata.value + i * Uint32Array.BYTES_PER_ELEMENT) / Uint32Array.BYTES_PER_ELEMENT] = sortMe[i][0];
+    carrier.heap.Uint32Array[(arrayDataSpace + i * Uint32Array.BYTES_PER_ELEMENT) / Uint32Array.BYTES_PER_ELEMENT] = sortMe[i][0];
   }
@@ -144,8 +106,6 @@ } // https://stackoverflow.com/a/47349064/711152
 
-export function arrayReverse(externalArgs, carrier, pointerToArrayEntry) {
-  const metadata = arrayGetMetadata(carrier, pointerToArrayEntry);
+export function arrayReverse(carrier, pointerToArrayEntry) {
+  for (let i = 0; i < Math.floor(array_length_get(carrier.heap, pointerToArrayEntry) / 2); i += 1) {
+    const theOtherIndex = array_length_get(carrier.heap, pointerToArrayEntry) - i - 1; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 
-  for (let i = 0; i < Math.floor(metadata.length / 2); i += 1) {
-    const theOtherIndex = metadata.length - i - 1; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-
     const a = arrayGetPointersToValueInIndex(carrier, pointerToArrayEntry, i); // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -152,0 +112,0 @@

dist/internal/arraySplice.d.ts

 import { ExternalArgs, GlobalCarrier } from "./interfaces";
-export declare function arraySplice(externalArgs: ExternalArgs, globalCarrier: GlobalCarrier, pointerToArrayEntry: number, startArg: number, deleteCountArg?: number, ...itemsToAddArg: Array<any>): any[];
+export declare function arraySplice(externalArgs: ExternalArgs, carrier: GlobalCarrier, pointerToArrayEntry: number, startArg: number, deleteCountArg?: number, ...itemsToAddArg: Array<any>): any[];
 //# sourceMappingURL=arraySplice.d.ts.map

dist/internal/arraySplice.js

@@ -1,17 +0,18 @@
-import { arrayGetMetadata, getFinalValueAtArrayIndex, shrinkArray, extendArrayIfNeeded, arrayGetPointersToValueInIndex, setValuePointerAtArrayIndex } from "./arrayHelpers";
+import { getFinalValueAtArrayIndex, shrinkArray, extendArrayIfNeeded, arrayGetPointersToValueInIndex, setValuePointerAtArrayIndex } from "./arrayHelpers";
 import { assertNonNull } from "./assertNonNull";
-import { writeValueInPtrToPtr } from "./store"; // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/splice#Syntax
+import { writeValueInPtrToPtr } from "./store";
+import { array_length_get } from "./generatedStructs"; // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/splice#Syntax
 
-export function arraySplice(externalArgs, globalCarrier, pointerToArrayEntry, startArg, deleteCountArg, ...itemsToAddArg) {
-  const metadata = arrayGetMetadata(globalCarrier, pointerToArrayEntry);
-  const calcedStart = calculateSpliceStart(metadata.length, startArg);
-  const calcedDeleteCount = calculateDeleteCount(metadata.length, calcedStart, deleteCountArg);
-  const newLength = metadata.length + itemsToAddArg.length - calcedDeleteCount;
-  extendArrayIfNeeded(externalArgs, globalCarrier, pointerToArrayEntry, newLength);
+export function arraySplice(externalArgs, carrier, pointerToArrayEntry, startArg, deleteCountArg, ...itemsToAddArg) {
+  const arrayLength = array_length_get(carrier.heap, pointerToArrayEntry);
+  const calcedStart = calculateSpliceStart(arrayLength, startArg);
+  const calcedDeleteCount = calculateDeleteCount(arrayLength, calcedStart, deleteCountArg);
+  const newLength = arrayLength + itemsToAddArg.length - calcedDeleteCount;
+  extendArrayIfNeeded(externalArgs, carrier, pointerToArrayEntry, newLength);
   const deletedItemsToReturn = []; // can be negative
 
-  const itemCountChange = newLength - metadata.length;
+  const itemCountChange = newLength - arrayLength;
 
   for (let deletedItemIndexToSave = calcedStart; deletedItemIndexToSave < calcedStart + calcedDeleteCount; deletedItemIndexToSave += 1) {
-    deletedItemsToReturn.push(getFinalValueAtArrayIndex(externalArgs, globalCarrier, pointerToArrayEntry, deletedItemIndexToSave));
+    deletedItemsToReturn.push(getFinalValueAtArrayIndex(externalArgs, carrier, pointerToArrayEntry, deletedItemIndexToSave));
   } // copy-up items
@@ -28,6 +29,6 @@
     for (let writeValueToIndex = newLength - 1; writeValueToIndex >= calcedStart + itemCountChange; writeValueToIndex -= 1) {
-      const valueToCopyPointers = arrayGetPointersToValueInIndex(globalCarrier, pointerToArrayEntry, writeValueToIndex - itemCountChange);
+      const valueToCopyPointers = arrayGetPointersToValueInIndex(carrier, pointerToArrayEntry, writeValueToIndex - itemCountChange);
       assertNonNull(valueToCopyPointers);
-      setValuePointerAtArrayIndex(globalCarrier, pointerToArrayEntry, writeValueToIndex, valueToCopyPointers.pointer);
-      globalCarrier.uint32[valueToCopyPointers.pointerToThePointer / Uint32Array.BYTES_PER_ELEMENT] = 0;
+      setValuePointerAtArrayIndex(carrier, pointerToArrayEntry, writeValueToIndex, valueToCopyPointers.pointer);
+      carrier.heap.Uint32Array[valueToCopyPointers.pointerToThePointer / Uint32Array.BYTES_PER_ELEMENT] = 0;
     }
@@ -42,8 +43,10 @@ } // copy-down items
   else if (itemCountChange < 0) {
-      for (let writeValueToIndex = calcedStart + itemsToAddArg.length; writeValueToIndex < metadata.length + itemCountChange; writeValueToIndex += 1) {
-        const valueToCopyPointers = arrayGetPointersToValueInIndex(globalCarrier, pointerToArrayEntry, writeValueToIndex - itemCountChange);
-        assertNonNull(valueToCopyPointers);
-        setValuePointerAtArrayIndex(globalCarrier, pointerToArrayEntry, writeValueToIndex, valueToCopyPointers.pointer); // empty old array index, its still allocated!
+      for (let writeValueToIndex = calcedStart + itemsToAddArg.length; writeValueToIndex < arrayLength + itemCountChange; writeValueToIndex += 1) {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const valueToCopyPointers = arrayGetPointersToValueInIndex(carrier, pointerToArrayEntry, writeValueToIndex - itemCountChange); // assertNonNull(valueToCopyPointers);
 
-        globalCarrier.uint32[valueToCopyPointers.pointerToThePointer / Uint32Array.BYTES_PER_ELEMENT] = 0; // using that is wastefull
+        setValuePointerAtArrayIndex(carrier, pointerToArrayEntry, writeValueToIndex, valueToCopyPointers.pointer); // empty old array index, its still allocated!
+        // handleArcForDeletedValuePointer(carrier, valueToCopyPointers.pointer);
+
+        carrier.heap.Uint32Array[valueToCopyPointers.pointer] = 0; // using that is wastefull
         // setValueAtArrayIndex(
@@ -62,9 +65,9 @@ //   dataView,
   for (let i = 0; i < itemsToAddArg.length; i += 1) {
-    const valueToSetPointers = arrayGetPointersToValueInIndex(globalCarrier, pointerToArrayEntry, calcedStart + i);
+    const valueToSetPointers = arrayGetPointersToValueInIndex(carrier, pointerToArrayEntry, calcedStart + i);
     assertNonNull(valueToSetPointers);
-    writeValueInPtrToPtr(externalArgs, globalCarrier, valueToSetPointers.pointerToThePointer, itemsToAddArg[i]);
+    writeValueInPtrToPtr(externalArgs, carrier, valueToSetPointers.pointerToThePointer, itemsToAddArg[i]);
   }
 
-  if (newLength < metadata.length) {
-    shrinkArray(externalArgs, globalCarrier, pointerToArrayEntry, newLength);
+  if (newLength < arrayLength) {
+    shrinkArray(carrier.heap, pointerToArrayEntry, newLength);
   }
@@ -71,0 +74,0 @@

dist/internal/arrayWrapper.d.ts

@@ -1,9 +0,9 @@
-import { ExternalArgs, GlobalCarrier, ArrayEntry } from "./interfaces";
+import { ExternalArgs, GlobalCarrier } from "./interfaces";
 import { BaseProxyTrap } from "./BaseProxyTrap";
-export declare class ArrayWrapper extends BaseProxyTrap<ArrayEntry> implements ProxyHandler<{}> {
-    get(target: {}, p: PropertyKey): any;
-    deleteProperty(target: {}, p: PropertyKey): boolean;
+export declare class ArrayWrapper extends BaseProxyTrap implements ProxyHandler<Record<string, unknown>> {
+    get(target: Record<string, unknown>, p: PropertyKey): any;
+    deleteProperty(target: Record<string, unknown>, p: PropertyKey): boolean;
     enumerate(): PropertyKey[];
     ownKeys(): PropertyKey[];
-    getOwnPropertyDescriptor(target: {}, prop: any): {
+    getOwnPropertyDescriptor(target: Record<string, unknown>, prop: any): {
         configurable: boolean;
@@ -17,4 +17,4 @@ enumerable: boolean;
     } | undefined;
-    has(target: {}, p: PropertyKey): boolean;
-    set(target: {}, accessedProp: PropertyKey, value: any): boolean;
+    has(target: Record<string, unknown>, p: PropertyKey): boolean;
+    set(target: Record<string, unknown>, accessedProp: PropertyKey, value: any): boolean;
     entries(): Iterable<[number, any]>;
@@ -21,0 +21,0 @@ keys(): Iterable<number>;

dist/internal/arrayWrapper.js

@@ -1,2 +0,2 @@
-import { getFinalValueAtArrayIndex, arrayGetMetadata, setValueAtArrayIndex, arraySort, extendArrayIfNeeded, arrayReverse } from "./arrayHelpers";
+import { getFinalValueAtArrayIndex, setValueAtArrayIndex, arraySort, extendArrayIfNeeded, arrayReverse } from "./arrayHelpers";
 import { INTERNAL_API_SYMBOL } from "./symbols";
@@ -7,2 +7,3 @@ import { arraySplice } from "./arraySplice";
 import { BaseProxyTrap } from "./BaseProxyTrap";
+import { array_length_get } from "./generatedStructs";
 export class ArrayWrapper extends BaseProxyTrap {
@@ -15,4 +16,4 @@ get(target, p) {
     if (p in this && p !== "constructor") {
-      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-      // @ts-ignore
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-expect-error
       return this[p];
@@ -22,3 +23,3 @@ }
     if (p === "length") {
-      return arrayGetMetadata(this.carrier, this.entryPointer).length;
+      return array_length_get(this.carrier.heap, this.entryPointer);
     }
@@ -32,4 +33,4 @@
       }
-    } // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-    // @ts-ignore
+    } // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-expect-error
 
@@ -50,3 +51,3 @@
   ownKeys() {
-    const length = arrayGetMetadata(this.carrier, this.entryPointer).length;
+    const length = array_length_get(this.carrier.heap, this.entryPointer);
     return [...new Array(length).keys(), "length"];
@@ -79,3 +80,3 @@ }
 
-    const length = arrayGetMetadata(this.carrier, this.entryPointer).length;
+    const length = array_length_get(this.carrier.heap, this.entryPointer);
 
@@ -101,3 +102,3 @@ if (typeof p === "number") {
 
-      const currentLength = arrayGetMetadata(this.carrier, this.entryPointer).length;
+      const currentLength = array_length_get(this.carrier.heap, this.entryPointer);
 
@@ -139,3 +140,3 @@ if (currentLength === value) {
       index += 1;
-      length = arrayGetMetadata(this.carrier, this.entryPointer).length;
+      length = array_length_get(this.carrier.heap, this.entryPointer);
     } while (index < length);
@@ -151,3 +152,3 @@ }
       index += 1;
-      length = arrayGetMetadata(this.carrier, this.entryPointer).length;
+      length = array_length_get(this.carrier.heap, this.entryPointer);
     } while (index < length);
@@ -163,3 +164,3 @@ }
       index += 1;
-      length = arrayGetMetadata(this.carrier, this.entryPointer).length;
+      length = array_length_get(this.carrier.heap, this.entryPointer);
     } while (index < length);
@@ -181,3 +182,3 @@ }
   reverse() {
-    arrayReverse(this.externalArgs, this.carrier, this.entryPointer);
+    arrayReverse(this.carrier, this.entryPointer);
     return this;
@@ -196,3 +197,3 @@ } // no copy inside array is needed, so we can live with the built-in impl
     this.splice(0, 0, ...elements);
-    return arrayGetMetadata(this.carrier, this.entryPointer).length;
+    return array_length_get(this.carrier.heap, this.entryPointer);
   } // public getDataView() {
@@ -233,3 +234,5 @@ //   return this.carrier.dataView;
 export function createArrayWrapper(externalArgs, globalCarrier, entryPointer) {
-  return new Proxy([], new ArrayWrapper(externalArgs, globalCarrier, entryPointer));
+  return new Proxy( // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-expect-error
+  [], new ArrayWrapper(externalArgs, globalCarrier, entryPointer));
 }

dist/internal/BaseProxyTrap.d.ts

@@ -1,3 +0,3 @@
-import { ExternalArgs, GlobalCarrier, InternalAPI, DateEntry, ArrayEntry, ObjectEntry, MapEntry, SetEntry } from "./interfaces";
-export declare class BaseProxyTrap<T extends ObjectEntry | DateEntry | ArrayEntry | MapEntry | SetEntry> implements InternalAPI {
+import { ExternalArgs, GlobalCarrier, InternalAPI } from "./interfaces";
+export declare abstract class BaseProxyTrap implements InternalAPI {
     protected externalArgs: ExternalArgs;
@@ -15,8 +15,5 @@ protected carrier: GlobalCarrier;
         arrayAdditionalAllocation: number;
-        textDecoder: import("./textEncoderDecoderTypes").TextDecoder;
-        textEncoder: import("./textEncoderDecoderTypes").TextEncoder;
     }>;
     protected get entryPointer(): number;
-    protected get entry(): T;
 }
 //# sourceMappingURL=BaseProxyTrap.d.ts.map

dist/internal/BaseProxyTrap.js

@@ -1,2 +0,2 @@
-import { incrementRefCount, decrementRefCount, readEntry } from "./store";
+import { incrementRefCount, decrementRefCount } from "./store";
 import { WrapperDestroyed } from "./exceptions";
@@ -8,7 +8,7 @@ export class BaseProxyTrap {
     this._entryPointer = _entryPointer;
-    incrementRefCount(this.externalArgs, this.carrier, this.entryPointer);
+    incrementRefCount(this.carrier.heap, this.entryPointer);
   }
 
   destroy() {
-    const newRefCount = decrementRefCount(this.externalArgs, this.carrier, this.entryPointer);
+    const newRefCount = decrementRefCount(this.carrier.heap, this.entryPointer);
     this._entryPointer = 0;
@@ -42,6 +42,2 @@ return newRefCount;
 
-  get entry() {
-    return readEntry(this.carrier, this.entryPointer);
-  }
-
 }

dist/internal/consts.d.ts

@@ -9,2 +9,3 @@ export declare const LOCK_OFFSET = 0;
 export declare const FALSE_KNOWN_ADDRESS = 3;
+export declare const MAX_64_BIG_INT: bigint;
 //# sourceMappingURL=consts.d.ts.map

dist/internal/consts.js

@@ -8,2 +8,3 @@ export const LOCK_OFFSET = 0;
 export const TRUE_KNOWN_ADDRESS = 2;
-export const FALSE_KNOWN_ADDRESS = 3;
+export const FALSE_KNOWN_ADDRESS = 3;
+export const MAX_64_BIG_INT = BigInt("0xFFFFFFFFFFFFFFFF");

dist/internal/dateWrapper.d.ts

@@ -1,4 +0,4 @@
-import { ExternalArgs, GlobalCarrier, DateEntry } from "./interfaces";
+import { ExternalArgs, GlobalCarrier } from "./interfaces";
 import { BaseProxyTrap } from "./BaseProxyTrap";
-export declare class DateWrapper extends BaseProxyTrap<DateEntry> implements ProxyHandler<Date> {
+export declare class DateWrapper extends BaseProxyTrap implements ProxyHandler<Date> {
     private dateObjectForReuse;
@@ -5,0 +5,0 @@ private useMeToGiveNamesToFunctionsAndCacheThem;

dist/internal/dateWrapper.js

@@ -1,2 +0,1 @@
-import { readEntry, writeEntry } from "./store";
 import { ENTRY_TYPE } from "./entry-types";
@@ -6,2 +5,3 @@ import { INTERNAL_API_SYMBOL } from "./symbols";
 import { BaseProxyTrap } from "./BaseProxyTrap";
+import { date_set_all, date_refsCount_get, date_timestamp_get } from "./generatedStructs";
 const getFunctions = ["toString", "toDateString", "toTimeString", "toISOString", "toUTCString", // "toGMTString",
@@ -50,12 +50,8 @@ "getDate", "getDay", "getFullYear", "getHours", "getMilliseconds", "getMinutes", "getMonth", "getSeconds", "getTime", "getTimezoneOffset", "getUTCDate", "getUTCDay", "getUTCFullYear", "getUTCHours", "getUTCMilliseconds", "getUTCMinutes", "getUTCMonth", "getUTCSeconds", // "getYear",
   updateDateObjectForReuse() {
-    const entry = readEntry(this.carrier, this.entryPointer);
-    this.dateObjectForReuse.setTime(entry.value);
+    this.dateObjectForReuse.setTime(date_timestamp_get(this.carrier.heap, this.entryPointer));
   }
 
   persistDateObject() {
-    writeEntry(this.carrier, this.entryPointer, {
-      type: ENTRY_TYPE.DATE,
-      refsCount: this.entry.refsCount,
-      value: this.dateObjectForReuse.getTime()
-    });
+    date_set_all(this.carrier.heap, this.entryPointer, ENTRY_TYPE.DATE, date_refsCount_get(this.carrier.heap, this.entryPointer), // padding
+    0, this.dateObjectForReuse.getTime());
   }
@@ -62,0 +58,0 @@

dist/internal/disposeWrapperObject.js

@@ -18,9 +18,13 @@ import { getInternalAPI } from "./utils";
     const addressesToFree = getAllLinkedAddresses(internalApi.getCarrier(), false, entryPointer);
+    const {
+      allocator,
+      heap
+    } = internalApi.getCarrier();
 
     for (const address of addressesToFree.leafAddresses) {
-      internalApi.getCarrier().allocator.free(address);
+      allocator.free(address);
     }
 
     for (const address of addressesToFree.arcAddresses) {
-      decrementRefCount(internalApi.getExternalArgs(), internalApi.getCarrier(), address);
+      decrementRefCount(heap, address);
     }
@@ -27,0 +31,0 @@

dist/internal/entryToFinalJavaScriptValue.js

@@ -1,2 +0,2 @@
-import { ENTRY_TYPE, isPrimitiveEntryType } from "./entry-types";
+import { ENTRY_TYPE } from "./entry-types";
 import { createObjectWrapper } from "./objectWrapper";
@@ -6,9 +6,9 @@ import { createArrayWrapper } from "./arrayWrapper";
 import { getCacheFor } from "./externalObjectsCache";
-import { decrementRefCount, readEntry } from "./store";
+import { decrementRefCount } from "./store";
 import { getAllLinkedAddresses } from "./getAllLinkedAddresses";
 import { createMapWrapper } from "./mapWrapper";
 import { createSetWrapper } from "./setWrapper";
-import { UNDEFINED_KNOWN_ADDRESS, NULL_KNOWN_ADDRESS, TRUE_KNOWN_ADDRESS, FALSE_KNOWN_ADDRESS } from "./consts"; // declare const FinalizationGroup: any;
-// declare const WeakRef: any;
-
+import { UNDEFINED_KNOWN_ADDRESS, NULL_KNOWN_ADDRESS, TRUE_KNOWN_ADDRESS, FALSE_KNOWN_ADDRESS } from "./consts";
+import { typeOnly_type_get, number_value_get, bigint_value_get } from "./generatedStructs";
+import { readString } from "./readString";
 const TYPE_TO_FACTORY = {
@@ -38,29 +38,44 @@ [ENTRY_TYPE.OBJECT]: createObjectWrapper,
 
-  const valueEntry = readEntry(carrier, pointerToEntry);
+  const entryType = typeOnly_type_get(carrier.heap, pointerToEntry);
 
-  if (isPrimitiveEntryType(valueEntry.type)) {
-    return valueEntry.value;
-  }
+  switch (entryType) {
+    case ENTRY_TYPE.NUMBER:
+      return number_value_get(carrier.heap, pointerToEntry);
+      break;
 
-  if (valueEntry.type === ENTRY_TYPE.OBJECT || valueEntry.type === ENTRY_TYPE.DATE || valueEntry.type === ENTRY_TYPE.ARRAY || valueEntry.type === ENTRY_TYPE.MAP || valueEntry.type === ENTRY_TYPE.SET) {
-    const cache = getCacheFor(carrier, key => {
-      finalizer(key, carrier, externalArgs);
-    });
-    let ret = cache.get(pointerToEntry);
+    case ENTRY_TYPE.STRING:
+      return readString(carrier.heap, pointerToEntry);
+      break;
 
-    if (!ret) {
-      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-      // @ts-ignore
-      ret = TYPE_TO_FACTORY[valueEntry.type](externalArgs, carrier, pointerToEntry);
-      cache.set(pointerToEntry, ret);
-    }
+    case ENTRY_TYPE.BIGINT_POSITIVE:
+      return bigint_value_get(carrier.heap, pointerToEntry);
+      break;
 
-    return ret;
+    case ENTRY_TYPE.BIGINT_NEGATIVE:
+      return bigint_value_get(carrier.heap, pointerToEntry) * BigInt("-1");
+      break;
+  } // this is an invariant
+
+
+  if (!(entryType === ENTRY_TYPE.OBJECT || entryType === ENTRY_TYPE.DATE || entryType === ENTRY_TYPE.ARRAY || entryType === ENTRY_TYPE.MAP || entryType === ENTRY_TYPE.SET)) {
+    throw new Error("Nope Nope Nope");
   }
 
-  throw new Error("unsupported yet");
+  const cache = getCacheFor(carrier, key => {
+    finalizer(key, carrier);
+  });
+  let ret = cache.get(pointerToEntry);
+
+  if (!ret) {
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-expect-error
+    ret = TYPE_TO_FACTORY[entryType](externalArgs, carrier, pointerToEntry);
+    cache.set(pointerToEntry, ret);
+  }
+
+  return ret;
 }
 
-function finalizer(memoryAddress, carrier, externalArgs) {
-  const newRefsCount = decrementRefCount(externalArgs, carrier, memoryAddress);
+function finalizer(memoryAddress, carrier) {
+  const newRefsCount = decrementRefCount(carrier.heap, memoryAddress);
 
@@ -75,5 +90,5 @@ if (newRefsCount === 0) {
     for (const address of freeUs.arcAddresses) {
-      decrementRefCount(externalArgs, carrier, address);
+      decrementRefCount(carrier.heap, address);
     }
   }
 }

dist/internal/externalObjectsCache.js

@@ -1,4 +0,6 @@
-import { WeakValueMap } from "./WeakValueMap";
+import { WeakValueMap } from "./WeakValueMap"; // eslint-disable-next-line @typescript-eslint/ban-types
+
 const externalObjectsCache = new WeakMap();
-export function getCacheFor(obj, externalFinalizer) {
+export function getCacheFor( // eslint-disable-next-line @typescript-eslint/ban-types
+obj, externalFinalizer) {
   let map = externalObjectsCache.get(obj);
@@ -16,3 +18,3 @@
 function supportWeakRef() {
-  return typeof WeakRef !== "undefined";
+  return typeof WeakRef !== "undefined" && (typeof FinalizationGroup !== "undefined" || typeof "FinalizationRegistry" !== "undefined");
 }

dist/internal/getAllLinkedAddresses.d.ts

 import { GlobalCarrier } from "./interfaces";
 export declare function getAllLinkedAddresses(carrier: GlobalCarrier, ignoreRefCount: boolean, entryPointer: number): {
-    leafAddresses: number[];
-    arcAddresses: number[];
+    leafAddresses: Set<number>;
+    arcAddresses: Set<number>;
 };
-export declare function getObjectOrMapOrSetAddresses(carrier: GlobalCarrier, ignoreRefCount: boolean, internalHashmapPointer: number, leafAddresses: number[], arcAddresses: number[]): void;
+export declare function getObjectOrMapOrSetAddresses(carrier: GlobalCarrier, internalHashmapPointer: number, leafAddresses: Set<number>, addressesToProcessQueue: number[]): void;
 //# sourceMappingURL=getAllLinkedAddresses.d.ts.map

dist/internal/getAllLinkedAddresses.js

@@ -1,9 +0,21 @@
-import { readEntry } from "./store";
 import { ENTRY_TYPE } from "./entry-types";
 import { hashMapGetPointersToFree } from "./hashmap/hashmap";
 import { isKnownAddressValuePointer } from "./utils";
+import { typeOnly_type_get, string_charsPointer_get, typeAndRc_refsCount_get, object_pointerToHashMap_get, array_dataspacePointer_get, array_length_get } from "./generatedStructs";
 export function getAllLinkedAddresses(carrier, ignoreRefCount, entryPointer) {
-  const leafAddresses = [];
-  const arcAddresses = [];
-  getAllLinkedAddressesStep(carrier, ignoreRefCount, entryPointer, leafAddresses, arcAddresses);
+  const leafAddresses = new Set();
+  const arcAddresses = new Set();
+  const addressesToProcessQueue = [entryPointer];
+  let addressToProcess = undefined; // const diffs = [];
+
+  while ((addressToProcess = addressesToProcessQueue.shift()) !== undefined) {
+    // const before = addressesToProcessQueue.slice();
+    if (addressToProcess === 0) {
+      continue;
+    }
+
+    getAllLinkedAddressesStep(carrier, ignoreRefCount, addressToProcess, leafAddresses, arcAddresses, addressesToProcessQueue); // diffs.push(addressesToProcessQueue.filter((p) => !before.includes(p)));
+  } // console.log(diffs);
+
+
   return {
@@ -15,25 +27,35 @@ leafAddresses,
 
-function getAllLinkedAddressesStep(carrier, ignoreRefCount, entryPointer, leafAddresses, arcAddresses) {
-  if (isKnownAddressValuePointer(entryPointer)) {
+function getAllLinkedAddressesStep(carrier, ignoreRefCount, entryPointer, leafAddresses, arcAddresses, addressesToProcessQueue) {
+  const {
+    heap
+  } = carrier;
+
+  if (isKnownAddressValuePointer(entryPointer) || leafAddresses.has(entryPointer) || arcAddresses.has(entryPointer)) {
     return;
   }
 
-  const entry = readEntry(carrier, entryPointer);
+  const entryType = typeOnly_type_get(heap, entryPointer); // to be used ONLY if the type has ref counter
 
-  switch (entry.type) {
+  const refsCount = typeAndRc_refsCount_get(heap, entryPointer);
+
+  switch (entryType) {
     case ENTRY_TYPE.NUMBER:
-    case ENTRY_TYPE.STRING:
     case ENTRY_TYPE.BIGINT_NEGATIVE:
     case ENTRY_TYPE.BIGINT_POSITIVE:
-      leafAddresses.push(entryPointer);
+      leafAddresses.add(entryPointer);
       break;
 
+    case ENTRY_TYPE.STRING:
+      leafAddresses.add(string_charsPointer_get(heap, entryPointer));
+      leafAddresses.add(entryPointer);
+      break;
+
     case ENTRY_TYPE.OBJECT:
     case ENTRY_TYPE.MAP:
     case ENTRY_TYPE.SET:
-      if (entry.refsCount <= 1 || ignoreRefCount) {
-        leafAddresses.push(entryPointer);
-        getObjectOrMapOrSetAddresses(carrier, ignoreRefCount, entry.value, leafAddresses, arcAddresses);
+      if (refsCount <= 1 || ignoreRefCount) {
+        leafAddresses.add(entryPointer);
+        getObjectOrMapOrSetAddresses(carrier, object_pointerToHashMap_get(heap, entryPointer), leafAddresses, addressesToProcessQueue);
       } else {
-        arcAddresses.push(entryPointer);
+        arcAddresses.add(entryPointer);
       }
@@ -44,12 +66,13 @@
     case ENTRY_TYPE.ARRAY:
-      if (entry.refsCount <= 1 || ignoreRefCount) {
-        leafAddresses.push(entryPointer);
-        leafAddresses.push(entry.value);
+      if (refsCount <= 1 || ignoreRefCount) {
+        leafAddresses.add(entryPointer);
+        leafAddresses.add(array_dataspacePointer_get(heap, entryPointer));
+        const arrayLength = array_length_get(heap, entryPointer);
 
-        for (let i = 0; i < entry.allocatedLength; i += 1) {
-          const valuePointer = carrier.uint32[(entry.value + i * Uint32Array.BYTES_PER_ELEMENT) / Uint32Array.BYTES_PER_ELEMENT];
-          getAllLinkedAddressesStep(carrier, ignoreRefCount, valuePointer, leafAddresses, arcAddresses);
+        for (let i = 0; i < arrayLength; i += 1) {
+          const valuePointer = carrier.uint32[(array_dataspacePointer_get(heap, entryPointer) + i * Uint32Array.BYTES_PER_ELEMENT) / Uint32Array.BYTES_PER_ELEMENT];
+          addressesToProcessQueue.push(valuePointer);
         }
       } else {
-        arcAddresses.push(entryPointer);
+        arcAddresses.add(entryPointer);
       }
@@ -60,6 +83,6 @@
     case ENTRY_TYPE.DATE:
-      if (entry.refsCount <= 1 || ignoreRefCount) {
-        leafAddresses.push(entryPointer);
+      if (refsCount <= 1 || ignoreRefCount) {
+        leafAddresses.add(entryPointer);
       } else {
-        arcAddresses.push(entryPointer);
+        arcAddresses.add(entryPointer);
       }
@@ -70,9 +93,7 @@
     default:
-      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-      // @ts-ignore
-      throw new Error(ENTRY_TYPE[entry.type] + " Not implemented yet");
+      throw new Error(ENTRY_TYPE[entryType] + " Not implemented yet");
   }
 }
 
-export function getObjectOrMapOrSetAddresses(carrier, ignoreRefCount, internalHashmapPointer, leafAddresses, arcAddresses) {
+export function getObjectOrMapOrSetAddresses(carrier, internalHashmapPointer, leafAddresses, addressesToProcessQueue) {
   const {
@@ -82,7 +103,10 @@ pointersToValuePointers,
   } = hashMapGetPointersToFree(carrier, internalHashmapPointer);
-  leafAddresses.push(...pointers);
 
+  for (const leafPointer of pointers) {
+    leafAddresses.add(leafPointer);
+  }
+
   for (const pointer of pointersToValuePointers) {
-    getAllLinkedAddressesStep(carrier, ignoreRefCount, carrier.uint32[pointer / Uint32Array.BYTES_PER_ELEMENT], leafAddresses, arcAddresses);
+    addressesToProcessQueue.push(carrier.uint32[pointer / Uint32Array.BYTES_PER_ELEMENT]);
   }
 }

dist/internal/hashmap/hashmap.js

 import { MAP_MACHINE, NODE_MACHINE } from "./memoryLayout";
 import { hashCodeInPlace, hashCodeExternalValue, getKeyStartLength } from "./hashmapUtils";
-import { primitiveValueToEntry } from "../utils";
-import { sizeOfEntry, writeEntry, readEntry, compareStringOrNumberEntriesInPlace } from "../store";
+import { strByteLength } from "../utils";
+import { stringEncodeInto } from "../stringEncodeInto";
+import { compareStringOrNumberEntriesInPlace, readNumberOrString } from "../store";
 import { ENTRY_TYPE } from "../entry-types";
 import { initLinkedList, linkedListItemInsert, linkedListItemRemove, linkedListLowLevelIterator, linkedListGetValue, linkedListGetPointersToFree } from "../linkedList/linkedList";
+import { number_size, string_size, number_set_all, string_set_all, number_value_place, number_value_ctor, typeOnly_type_get, string_charsPointer_get } from "../generatedStructs";
 export function createHashMap(carrier,
@@ -28,19 +30,31 @@ /**
 export function hashMapInsertUpdate(externalArgs, carrier, mapPointer, externalKeyValue) {
-  const mapOperator = MAP_MACHINE.createOperator(carrier, mapPointer);
-  const keyEntry = primitiveValueToEntry(externalKeyValue); // allocate all possible needed memory upfront, so we won't oom in the middle of something
+  const mapOperator = MAP_MACHINE.createOperator(carrier, mapPointer); // const keyEntry = primitiveValueToEntry(externalKeyValue) as
+  //   | NumberEntry
+  //   | StringEntry;
+  // allocate all possible needed memory upfront, so we won't oom in the middle of something
   // in case of overwrite, we will not need this memory
 
   const memoryForNewNode = carrier.allocator.calloc(NODE_MACHINE.map.SIZE_OF);
-  const memorySizeOfKey = sizeOfEntry(keyEntry);
-  const keyEntryMemory = carrier.allocator.calloc(memorySizeOfKey);
-  writeEntry(carrier, keyEntryMemory, keyEntry);
-  const keyHeaderOverhead = keyEntry.type === ENTRY_TYPE.STRING ? // type + string length
-  8 + 4 : // type
-  8;
-  const keyHashCode = hashCodeInPlace(carrier.uint8, mapOperator.get("CAPACITY"), // + 1 for the type of key
-  keyEntryMemory + keyHeaderOverhead, memorySizeOfKey - keyHeaderOverhead);
+  let keyMemoryEntryPointer;
+  let keyDataMemoryStart;
+  let keyDataMemoryLength;
+
+  if (typeof externalKeyValue === "number") {
+    keyMemoryEntryPointer = carrier.allocator.calloc(number_size);
+    number_set_all(carrier.heap, keyMemoryEntryPointer, ENTRY_TYPE.NUMBER, externalKeyValue);
+    keyDataMemoryStart = keyMemoryEntryPointer + number_value_place;
+    keyDataMemoryLength = number_value_ctor.BYTES_PER_ELEMENT;
+  } else {
+    keyMemoryEntryPointer = carrier.allocator.calloc(string_size);
+    keyDataMemoryLength = strByteLength(externalKeyValue);
+    keyDataMemoryStart = carrier.allocator.calloc(keyDataMemoryLength);
+    stringEncodeInto(carrier.heap.Uint8Array, keyDataMemoryStart, externalKeyValue);
+    string_set_all(carrier.heap, keyMemoryEntryPointer, ENTRY_TYPE.STRING, keyDataMemoryLength, keyDataMemoryStart);
+  }
+
+  const keyHashCode = hashCodeInPlace(carrier.uint8, mapOperator.get("CAPACITY"), keyDataMemoryStart, keyDataMemoryLength);
   let ptrToPtrToSaveTheNodeTo = mapOperator.get("ARRAY_POINTER") + keyHashCode * Uint32Array.BYTES_PER_ELEMENT;
   const commonNodeOperator = NODE_MACHINE.createOperator(carrier, carrier.uint32[ptrToPtrToSaveTheNodeTo / Uint32Array.BYTES_PER_ELEMENT]); // todo: share code with hashMapNodeLookup?
 
-  while (commonNodeOperator.startAddress !== 0 && !compareStringOrNumberEntriesInPlace(carrier, commonNodeOperator.get("KEY_POINTER"), keyEntryMemory)) {
+  while (commonNodeOperator.startAddress !== 0 && !compareStringOrNumberEntriesInPlace(carrier.heap, commonNodeOperator.get("KEY_POINTER"), keyMemoryEntryPointer)) {
     ptrToPtrToSaveTheNodeTo = commonNodeOperator.pointerTo("NEXT_NODE_POINTER");
@@ -58,3 +72,4 @@ commonNodeOperator.startAddress = commonNodeOperator.get("NEXT_NODE_POINTER");
     // we don't need the new memory
-    carrier.allocator.free(keyEntryMemory);
+    // @todo Free here also the string data
+    carrier.allocator.free(keyMemoryEntryPointer);
     carrier.allocator.free(memoryForNewNode);
@@ -64,3 +79,3 @@ return commonNodeOperator.pointerTo("VALUE_POINTER");
     commonNodeOperator.startAddress = memoryForNewNode;
-    commonNodeOperator.set("KEY_POINTER", keyEntryMemory);
+    commonNodeOperator.set("KEY_POINTER", keyMemoryEntryPointer);
     commonNodeOperator.set("LINKED_LIST_ITEM_POINTER", linkedListItemInsert(carrier, mapOperator.get("LINKED_LIST_POINTER"), memoryForNewNode));
@@ -70,3 +85,3 @@ carrier.uint32[ptrToPtrToSaveTheNodeTo / Uint32Array.BYTES_PER_ELEMENT] = memoryForNewNode;
 
-    if (shouldRehash(mapOperator.get("LINKED_LIST_SIZE"), mapOperator.get("CAPACITY"), mapOperator.get("USED_CAPACITY"), externalArgs.hashMapLoadFactor)) {
+    if (shouldRehash(mapOperator.get("CAPACITY"), mapOperator.get("USED_CAPACITY"), externalArgs.hashMapLoadFactor)) {
       // console.log("rehash", {
@@ -92,5 +107,5 @@ //   USED_CAPACITY: mapOperator.get("USED_CAPACITY")
   while (node.startAddress !== 0) {
-    const keyEntry = readEntry(carrier, node.get("KEY_POINTER"));
+    const keyValue = readNumberOrString(carrier.heap, node.get("KEY_POINTER"));
 
-    if (keyEntry.value === externalKeyValue) {
+    if (keyValue === externalKeyValue) {
       return ptrToPtr;
@@ -132,2 +147,7 @@ }
   carrier.uint32[foundNodePtrToPtr / Uint32Array.BYTES_PER_ELEMENT] = nodeOperator.get("NEXT_NODE_POINTER");
+
+  if (typeOnly_type_get(carrier.heap, nodeOperator.get("KEY_POINTER")) === ENTRY_TYPE.STRING) {
+    carrier.allocator.free(string_charsPointer_get(carrier.heap, nodeOperator.get("KEY_POINTER")));
+  }
+
   carrier.allocator.free(nodeOperator.get("KEY_POINTER"));
@@ -180,2 +200,7 @@ carrier.allocator.free(nodeOperator.startAddress);
     pointersToValuePointers.push(nodeOperator.pointerTo("VALUE_POINTER"));
+
+    if (typeOnly_type_get(carrier.heap, nodeOperator.get("KEY_POINTER")) === ENTRY_TYPE.STRING) {
+      pointers.push(string_charsPointer_get(carrier.heap, nodeOperator.get("KEY_POINTER")));
+    }
+
     pointers.push(nodePointer, nodeOperator.get("KEY_POINTER"));
@@ -237,3 +262,3 @@ }
 
-function shouldRehash(nodesCount, buckets, fullBuckets, loadFactor) {
+function shouldRehash(buckets, fullBuckets, loadFactor) {
   // add proportion check?
@@ -240,0 +265,0 @@ // nodesCount

dist/internal/interfaces.d.ts

 import { ENTRY_TYPE } from "./entry-types";
-import { TextDecoder, TextEncoder } from "./textEncoderDecoderTypes";
+import { Heap } from "../structsGenerator/consts";
 export declare type primitive = string | number | bigint | boolean | undefined | null;
@@ -68,2 +68,3 @@ export declare type Entry = StringEntry | NumberEntry | BigIntPositiveEntry | BigIntNegativeEntry | ObjectEntry | ArrayEntry | DateEntry | MapEntry | SetEntry;
     allocator: import("@thi.ng/malloc").IMemPool;
+    heap: Heap;
 }
@@ -73,5 +74,7 @@ export declare type ExternalArgs = Readonly<{
     hashMapMinInitialCapacity: number;
+    /**
+     * Allocate additional memory for array pointers,
+     * will prevent the reallocation and copy when array is getting bigger
+     */
     arrayAdditionalAllocation: number;
-    textDecoder: TextDecoder;
-    textEncoder: TextEncoder;
 }>;
@@ -82,4 +85,2 @@ export declare type ExternalArgsApi = Readonly<{
     arrayAdditionalAllocation?: number;
-    textDecoder: TextDecoder;
-    textEncoder: TextEncoder;
 }>;
@@ -86,0 +87,0 @@ export interface InternalAPI {

dist/internal/locks.js

@@ -0,1 +1,3 @@
+/* istanbul ignore file */
+// I'm not sure how to test that yet
 import { invariant } from "./utils";
@@ -2,0 +4,0 @@ import { getUnderlyingArrayBuffer } from "./api";

dist/internal/mapWrapper.d.ts

@@ -1,5 +0,5 @@
-import { ExternalArgs, GlobalCarrier, MapEntry, InternalAPI } from "./interfaces";
+import { ExternalArgs, GlobalCarrier, InternalAPI } from "./interfaces";
 import { INTERNAL_API_SYMBOL } from "./symbols";
 import { BaseProxyTrap } from "./BaseProxyTrap";
-export declare class MapWrapper<K extends string | number, V> extends BaseProxyTrap<MapEntry> implements Map<K, V> {
+export declare class MapWrapper<K extends string | number, V> extends BaseProxyTrap implements Map<K, V> {
     clear(): void;
@@ -6,0 +6,0 @@ forEach(callbackfn: (value: V, key: K, map: Map<K, V>) => void, thisArg?: any): void;

dist/internal/mapWrapper.js

@@ -7,2 +7,3 @@ import { deleteObjectPropertyEntryByKey, objectGet, objectSet, mapOrSetClear } from "./objectWrapperHelpers";
 import { entryToFinalJavaScriptValue } from "./entryToFinalJavaScriptValue";
+import { object_pointerToHashMap_get } from "./generatedStructs";
 export class MapWrapper extends BaseProxyTrap {
@@ -20,3 +21,3 @@ clear() {
   get size() {
-    return hashMapSize(this.carrier, this.entry.value);
+    return hashMapSize(this.carrier, object_pointerToHashMap_get(this.carrier.heap, this.entryPointer));
   }
@@ -29,3 +30,3 @@
   *entries() {
-    for (const nodePointer of hashmapNodesPointerIterator(this.carrier, this.entry.value)) {
+    for (const nodePointer of hashmapNodesPointerIterator(this.carrier, object_pointerToHashMap_get(this.carrier.heap, this.entryPointer))) {
       const {
@@ -40,3 +41,3 @@ valuePointer,
   *keys() {
-    for (const nodePointer of hashmapNodesPointerIterator(this.carrier, this.entry.value)) {
+    for (const nodePointer of hashmapNodesPointerIterator(this.carrier, object_pointerToHashMap_get(this.carrier.heap, this.entryPointer))) {
       const t = hashMapNodePointerToKeyValue(this.carrier, nodePointer);
@@ -48,3 +49,3 @@ yield entryToFinalJavaScriptValue(this.externalArgs, this.carrier, t.keyPointer);
   *values() {
-    for (const nodePointer of hashmapNodesPointerIterator(this.carrier, this.entry.value)) {
+    for (const nodePointer of hashmapNodesPointerIterator(this.carrier, object_pointerToHashMap_get(this.carrier.heap, this.entryPointer))) {
       const {
@@ -74,3 +75,3 @@ valuePointer
 
-    return objectGet(this.externalArgs, this.carrier, this.entry.value, p);
+    return objectGet(this.externalArgs, this.carrier, object_pointerToHashMap_get(this.carrier.heap, this.entryPointer), p);
   }
@@ -83,3 +84,3 @@
 
-    return deleteObjectPropertyEntryByKey(this.externalArgs, this.carrier, this.entry.value, p);
+    return deleteObjectPropertyEntryByKey(this.carrier, object_pointerToHashMap_get(this.carrier.heap, this.entryPointer), p);
   }
@@ -92,3 +93,3 @@
 
-    return hashMapNodeLookup(this.carrier, this.entry.value, p) !== 0;
+    return hashMapNodeLookup(this.carrier, object_pointerToHashMap_get(this.carrier.heap, this.entryPointer), p) !== 0;
   }
@@ -102,3 +103,3 @@
     allocationsTransaction(() => {
-      objectSet(this.externalArgs, this.carrier, this.entry.value, p, value);
+      objectSet(this.externalArgs, this.carrier, object_pointerToHashMap_get(this.carrier.heap, this.entryPointer), p, value);
     }, this.carrier.allocator);
@@ -105,0 +106,0 @@ return this;

dist/internal/memoryMachinery.js

@@ -12,5 +12,3 @@ const ALLOWS_TYPED_ARRAYS_CTORS = [Uint8Array, Uint32Array, // BigUint64Array,
 const READ_WRITE_MAPS_V2 = [[Uint8Array, "uint8"], [Uint32Array, "uint32"], // [BigUint64Array, dataViewInstance.getBigUint64, dataViewInstance.setBigUint64],
-[Uint16Array, "uint16"]]; // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-// @ts-ignore
-// dataViewInstance = undefined;
+[Uint16Array, "uint16"]]; // dataViewInstance = undefined;
 // const READ_MAP = new Map(READ_WRITE_MAPS.map(e => [e[0], e[1]]));
@@ -89,6 +87,6 @@ // const WRITE_MAP = new Map(READ_WRITE_MAPS.map(e => [e[0], e[2]]));
 
-  newObjectEntries.push(["TOTAL_SIZE", newObjectEntries[newObjectEntries.length - 1][1] + oldEntries[newObjectEntries.length - 1][1]]); // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-  // @ts-ignore
+  newObjectEntries.push(["TOTAL_SIZE", newObjectEntries[newObjectEntries.length - 1][1] + oldEntries[newObjectEntries.length - 1][1]]); // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-expect-error
 
   return Object.fromEntries(newObjectEntries);
 }

dist/internal/objectWrapper.d.ts

@@ -1,14 +0,14 @@
-import { ObjectEntry, ExternalArgs, GlobalCarrier } from "./interfaces";
+import { ExternalArgs, GlobalCarrier } from "./interfaces";
 import { BaseProxyTrap } from "./BaseProxyTrap";
-export declare class ObjectWrapper extends BaseProxyTrap<ObjectEntry> implements ProxyHandler<{}> {
-    get(target: {}, p: PropertyKey): any;
-    deleteProperty(target: {}, p: PropertyKey): boolean;
+export declare class ObjectWrapper extends BaseProxyTrap implements ProxyHandler<Record<string, unknown>> {
+    get(target: Record<string, unknown>, p: PropertyKey): any;
+    deleteProperty(target: Record<string, unknown>, p: PropertyKey): boolean;
     enumerate(): PropertyKey[];
     ownKeys(): PropertyKey[];
-    getOwnPropertyDescriptor(target: {}, p: PropertyKey): {
+    getOwnPropertyDescriptor(target: Record<string, unknown>, p: PropertyKey): {
         configurable: boolean;
         enumerable: boolean;
     } | undefined;
-    has(target: {}, p: PropertyKey): boolean;
-    set(target: {}, p: PropertyKey, value: any): boolean;
+    has(target: Record<string, unknown>, p: PropertyKey): boolean;
+    set(target: Record<string, unknown>, p: PropertyKey, value: any): boolean;
     isExtensible(): boolean;
@@ -15,0 +15,0 @@ preventExtensions(): boolean;

dist/internal/objectWrapper.js

@@ -7,2 +7,3 @@ import { getObjectPropertiesEntries, deleteObjectPropertyEntryByKey, objectGet, objectSet } from "./objectWrapperHelpers";
 import { hashMapNodeLookup } from "./hashmap/hashmap";
+import { object_pointerToHashMap_get } from "./generatedStructs";
 export class ObjectWrapper extends BaseProxyTrap {
@@ -18,3 +19,3 @@ get(target, p) {
 
-    return objectGet(this.externalArgs, this.carrier, this.entry.value, p);
+    return objectGet(this.externalArgs, this.carrier, object_pointerToHashMap_get(this.carrier.heap, this.entryPointer), p);
   }
@@ -27,7 +28,7 @@
 
-    return deleteObjectPropertyEntryByKey(this.externalArgs, this.carrier, this.entry.value, p);
+    return deleteObjectPropertyEntryByKey(this.carrier, object_pointerToHashMap_get(this.carrier.heap, this.entryPointer), p);
   }
 
   enumerate() {
-    const gotEntries = getObjectPropertiesEntries(this.carrier, this.entry.value);
+    const gotEntries = getObjectPropertiesEntries(this.carrier, object_pointerToHashMap_get(this.carrier.heap, this.entryPointer));
     return gotEntries.map(e => e.key);
@@ -37,3 +38,3 @@ }
   ownKeys() {
-    const gotEntries = getObjectPropertiesEntries(this.carrier, this.entry.value);
+    const gotEntries = getObjectPropertiesEntries(this.carrier, object_pointerToHashMap_get(this.carrier.heap, this.entryPointer));
     return gotEntries.map(e => e.key);
@@ -62,3 +63,3 @@ }
 
-    return hashMapNodeLookup(this.carrier, this.entry.value, p) !== 0;
+    return hashMapNodeLookup(this.carrier, object_pointerToHashMap_get(this.carrier.heap, this.entryPointer), p) !== 0;
   }
@@ -72,3 +73,3 @@
     allocationsTransaction(() => {
-      objectSet(this.externalArgs, this.carrier, this.entry.value, p, value);
+      objectSet(this.externalArgs, this.carrier, object_pointerToHashMap_get(this.carrier.heap, this.entryPointer), p, value);
     }, this.carrier.allocator);
@@ -75,0 +76,0 @@ return true;

dist/internal/objectWrapperHelpers.d.ts

 import { ExternalArgs, GlobalCarrier } from "./interfaces";
-export declare function deleteObjectPropertyEntryByKey(externalArgs: ExternalArgs, carrier: GlobalCarrier, hashmapPointer: number, keyToDeleteBy: string | number): boolean;
+export declare function deleteObjectPropertyEntryByKey(carrier: GlobalCarrier, hashmapPointer: number, keyToDeleteBy: string | number): boolean;
 export declare function getObjectPropertiesEntries(carrier: GlobalCarrier, hashmapPointer: number): Array<{
@@ -7,6 +7,5 @@ key: string | number;
 }>;
-export declare function objectSet(externalArgs: ExternalArgs, carrier: GlobalCarrier, hashMapPointer: number, p: string | number, value: any): void;
+export declare function objectSet(externalArgs: ExternalArgs, carrier: GlobalCarrier, hashMapPointer: number, p: string | number, value: unknown): void;
 export declare function objectGet(externalArgs: ExternalArgs, carrier: GlobalCarrier, entryPointer: number, key: string | number): any;
-export declare function hashmapClearFree(externalArgs: ExternalArgs, carrier: GlobalCarrier, hashmapPointer: number): void;
 export declare function mapOrSetClear(externalArgs: ExternalArgs, carrier: GlobalCarrier, mapOrSetPtr: number): void;
 //# sourceMappingURL=objectWrapperHelpers.d.ts.map

dist/internal/objectWrapperHelpers.js

@@ -1,6 +0,9 @@
-import { readEntry, writeValueInPtrToPtrAndHandleMemory, handleArcForDeletedValuePointer, decrementRefCount, writeEntry } from "./store";
+import { writeValueInPtrToPtrAndHandleMemory, handleArcForDeletedValuePointer, decrementRefCount } from "./store";
 import { entryToFinalJavaScriptValue } from "./entryToFinalJavaScriptValue";
 import { hashMapDelete, hashMapLowLevelIterator, hashMapNodePointerToKeyValue, hashMapInsertUpdate, hashMapValueLookup, createHashMap } from "./hashmap/hashmap";
-import { getObjectOrMapOrSetAddresses } from "./getAllLinkedAddresses";
-export function deleteObjectPropertyEntryByKey(externalArgs, carrier, hashmapPointer, keyToDeleteBy) {
+import { getAllLinkedAddresses } from "./getAllLinkedAddresses";
+import { typeOnly_type_get, number_value_get, typeAndRc_refsCount_get, typeAndRc_refsCount_set, object_pointerToHashMap_set } from "./generatedStructs";
+import { ENTRY_TYPE } from "./entry-types";
+import { readString } from "./readString";
+export function deleteObjectPropertyEntryByKey(carrier, hashmapPointer, keyToDeleteBy) {
   const deletedValuePointerToPointer = hashMapDelete(carrier, hashmapPointer, keyToDeleteBy); // no such key
@@ -12,4 +15,4 @@
 
-  const deletedValuePointer = carrier.uint32[deletedValuePointerToPointer / Uint32Array.BYTES_PER_ELEMENT];
-  handleArcForDeletedValuePointer(externalArgs, carrier, deletedValuePointer);
+  const deletedValuePointer = carrier.heap.Uint32Array[deletedValuePointerToPointer / Uint32Array.BYTES_PER_ELEMENT];
+  handleArcForDeletedValuePointer(carrier, deletedValuePointer);
   return true;
@@ -26,6 +29,7 @@ }
     } = hashMapNodePointerToKeyValue(carrier, iterator);
-    const keyEntry = readEntry(carrier, keyPointer);
+    const typeOfKeyEntry = typeOnly_type_get(carrier.heap, keyPointer);
+    const key = typeOfKeyEntry === ENTRY_TYPE.NUMBER ? number_value_get(carrier.heap, keyPointer) : readString(carrier.heap, keyPointer);
     foundValues.push({
       valuePointer: carrier.uint32[valuePointer / Uint32Array.BYTES_PER_ELEMENT],
-      key: keyEntry.value
+      key
     });
@@ -42,15 +46,39 @@ }
   const valuePointer = hashMapValueLookup(carrier, entryPointer, key);
+  return entryToFinalJavaScriptValue(externalArgs, carrier, carrier.uint32[valuePointer / Uint32Array.BYTES_PER_ELEMENT]);
+} // export function hashmapClearFree(
+//   externalArgs: ExternalArgs,
+//   carrier: GlobalCarrier,
+//   hashmapPointer: number
+// ) {
+//   const leafAddresses = new Set<number>();
+//   const addressesToProcessQueue: number[] = [];
+//   getObjectOrMapOrSetAddresses(
+//     carrier,
+//     hashmapPointer,
+//     leafAddresses,
+//     addressesToProcessQueue
+//   );
+//   for (const address of leafAddresses) {
+//     carrier.allocator.free(address);
+//   }
+//   for (const address of arcAddresses) {
+//     decrementRefCount(externalArgs, carrier, address);
+//   }
+// }
 
-  if (valuePointer === 0) {
-    return undefined;
-  }
+export function mapOrSetClear(externalArgs, carrier, mapOrSetPtr) {
+  // we fake the entry refCount as zero so getAllLinkedAddresses will visit what's needed
+  const prevCount = typeAndRc_refsCount_get(carrier.heap, mapOrSetPtr);
+  typeAndRc_refsCount_set(carrier.heap, mapOrSetPtr, 0);
+  const {
+    leafAddresses,
+    arcAddresses
+  } = getAllLinkedAddresses(carrier, false, mapOrSetPtr);
 
-  return entryToFinalJavaScriptValue(externalArgs, carrier, carrier.uint32[valuePointer / Uint32Array.BYTES_PER_ELEMENT]);
-}
-export function hashmapClearFree(externalArgs, carrier, hashmapPointer) {
-  const leafAddresses = [];
-  const arcAddresses = [];
-  getObjectOrMapOrSetAddresses(carrier, false, hashmapPointer, leafAddresses, arcAddresses);
+  for (const address of leafAddresses) {
+    // don't dispose the address we need to reuse
+    if (address === mapOrSetPtr) {
+      continue;
+    }
 
-  for (const address of leafAddresses) {
     carrier.allocator.free(address);
@@ -60,10 +88,13 @@ }
   for (const address of arcAddresses) {
-    decrementRefCount(externalArgs, carrier, address);
-  }
-}
-export function mapOrSetClear(externalArgs, carrier, mapOrSetPtr) {
-  const entry = readEntry(carrier, mapOrSetPtr);
-  hashmapClearFree(externalArgs, carrier, entry.value);
-  entry.value = createHashMap(carrier, externalArgs.hashMapMinInitialCapacity);
-  writeEntry(carrier, mapOrSetPtr, entry);
+    // don't dispose the address we need to reuse
+    if (address === mapOrSetPtr) {
+      continue;
+    }
+
+    decrementRefCount(carrier.heap, address);
+  } // Restore real ref count
+
+
+  typeAndRc_refsCount_set(carrier.heap, mapOrSetPtr, prevCount);
+  object_pointerToHashMap_set(carrier.heap, mapOrSetPtr, createHashMap(carrier, externalArgs.hashMapMinInitialCapacity));
 }

dist/internal/saveValue.d.ts

 import { ExternalArgs, GlobalCarrier } from "./interfaces";
-/**
- * Returns pointer for the value
- */
-export declare function saveValue(externalArgs: ExternalArgs, carrier: GlobalCarrier, referencedPointers: number[], value: any): number;
+export declare function saveValueIterative(externalArgs: ExternalArgs, carrier: GlobalCarrier, referencedExistingPointers: number[], initialValuePtrToPtr: number, initialValue: unknown): void;
 //# sourceMappingURL=saveValue.d.ts.map

dist/internal/saveValue.js

@@ -1,56 +0,130 @@
-import { primitiveValueToEntry, isPrimitive, getOurPointerIfApplicable } from "./utils";
-import { appendEntry } from "./store";
-import { objectSaver, mapSaver, setSaver } from "./objectSaver";
-import { arraySaver } from "./arraySaver";
+import { getOurPointerIfApplicable, strByteLength } from "./utils";
 import { ENTRY_TYPE } from "./entry-types";
-import { UNDEFINED_KNOWN_ADDRESS, NULL_KNOWN_ADDRESS, TRUE_KNOWN_ADDRESS, FALSE_KNOWN_ADDRESS } from "./consts";
-/**
- * Returns pointer for the value
- */
+import { number_size, number_set_all, bigint_size, bigint_set_all, string_size, string_set_all, date_size, date_set_all } from "./generatedStructs";
+import { UNDEFINED_KNOWN_ADDRESS, NULL_KNOWN_ADDRESS, TRUE_KNOWN_ADDRESS, FALSE_KNOWN_ADDRESS, MAX_64_BIG_INT } from "./consts";
+import { arraySaverIterative } from "./arraySaverIterative";
+import { objectSaverIterative, mapSaverIterative, setSaverIterative } from "./objectSaverIterative";
+import { stringEncodeInto } from "./stringEncodeInto";
+export function saveValueIterative(externalArgs, carrier, referencedExistingPointers, initialValuePtrToPtr, initialValue) {
+  const valuesToSave = [initialValue];
+  const pointersToSaveTo = [initialValuePtrToPtr];
+  const {
+    heap: {
+      Uint32Array: uint32
+    },
+    allocator,
+    heap
+  } = carrier;
 
-export function saveValue(externalArgs, carrier, referencedPointers, value) {
-  let valuePointer = 0;
-  let maybeOurPointer;
+  while (valuesToSave.length !== 0) {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const valueToSave = valuesToSave.pop(); // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 
-  if (value === undefined) {
-    return UNDEFINED_KNOWN_ADDRESS;
-  }
+    const ptrToPtrToSaveTo = pointersToSaveTo.pop(); // Handler well-known values
 
-  if (value === null) {
-    return NULL_KNOWN_ADDRESS;
-  }
+    if (valueToSave === undefined) {
+      uint32[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT] = UNDEFINED_KNOWN_ADDRESS;
+      continue;
+    }
 
-  if (value === true) {
-    return TRUE_KNOWN_ADDRESS;
-  }
+    if (valueToSave === null) {
+      uint32[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT] = NULL_KNOWN_ADDRESS;
+      continue;
+    }
 
-  if (value === false) {
-    return FALSE_KNOWN_ADDRESS;
-  }
+    if (valueToSave === true) {
+      uint32[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT] = TRUE_KNOWN_ADDRESS;
+      continue;
+    }
 
-  if (isPrimitive(value)) {
-    const entry = primitiveValueToEntry(value);
-    valuePointer = appendEntry(externalArgs, carrier, entry);
-  } else if (maybeOurPointer = getOurPointerIfApplicable(value, carrier.allocator)) {
-    valuePointer = maybeOurPointer;
-    referencedPointers.push(valuePointer);
-  } else if (Array.isArray(value)) {
-    valuePointer = arraySaver(externalArgs, carrier, referencedPointers, value);
-  } else if (value instanceof Date) {
-    valuePointer = appendEntry(externalArgs, carrier, {
-      type: ENTRY_TYPE.DATE,
-      refsCount: 1,
-      value: value.getTime()
-    });
-  } else if (value instanceof Map) {
-    valuePointer = mapSaver(externalArgs, carrier, referencedPointers, value);
-  } else if (value instanceof Set) {
-    valuePointer = setSaver(externalArgs, carrier, value);
-  } else if (typeof value === "object") {
-    valuePointer = objectSaver(externalArgs, carrier, referencedPointers, value);
-  } else {
-    throw new Error("unsupported yet");
+    if (valueToSave === false) {
+      uint32[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT] = FALSE_KNOWN_ADDRESS;
+      continue;
+    }
+
+    switch (typeof valueToSave) {
+      case "number":
+        uint32[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT] = allocator.calloc(number_size);
+        number_set_all(heap, uint32[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT], ENTRY_TYPE.NUMBER, valueToSave);
+        continue;
+        break;
+
+      case "string":
+        // eslint-disable-next-line no-case-declarations
+        const stringBytesLength = strByteLength(valueToSave); // eslint-disable-next-line no-case-declarations
+
+        const stringDataPointer = allocator.calloc(stringBytesLength);
+        uint32[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT] = allocator.calloc(string_size);
+        stringEncodeInto(heap.Uint8Array, stringDataPointer, valueToSave);
+        string_set_all(heap, uint32[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT], ENTRY_TYPE.STRING, stringBytesLength, stringDataPointer);
+        continue;
+        break;
+
+      case "bigint":
+        if (valueToSave > MAX_64_BIG_INT || valueToSave < -MAX_64_BIG_INT) {
+          uint32[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT] = UNDEFINED_KNOWN_ADDRESS;
+          continue; // Maybe don't make undefined but throw, or clamp
+          // throw new Error("MAX_64_BIG_INT");
+        }
+
+        uint32[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT] = allocator.calloc(bigint_size);
+        bigint_set_all(heap, uint32[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT], valueToSave > 0 ? ENTRY_TYPE.BIGINT_POSITIVE : ENTRY_TYPE.BIGINT_NEGATIVE, valueToSave * (valueToSave > 0 ? BigInt("1") : BigInt("-1")));
+        continue;
+        break;
+
+      case "function":
+        // Nope Nope Nope
+        uint32[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT] = UNDEFINED_KNOWN_ADDRESS;
+        continue;
+        break;
+
+      case "symbol":
+        // not supported, write undefined
+        uint32[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT] = UNDEFINED_KNOWN_ADDRESS;
+        continue;
+        break;
+      // we will never get here
+
+      case "undefined":
+        continue;
+        break;
+      // we will never get here
+
+      case "boolean":
+        continue;
+        break;
+    }
+
+    const maybeOurPointerFromSymbol = getOurPointerIfApplicable(valueToSave, carrier.allocator);
+
+    if (maybeOurPointerFromSymbol) {
+      referencedExistingPointers.push(maybeOurPointerFromSymbol);
+      heap.Uint32Array[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT] = maybeOurPointerFromSymbol;
+      continue;
+    }
+
+    if (Array.isArray(valueToSave)) {
+      heap.Uint32Array[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT] = arraySaverIterative(externalArgs.arrayAdditionalAllocation, carrier, valuesToSave, pointersToSaveTo, valueToSave);
+      continue;
+    }
+
+    if (valueToSave instanceof Date) {
+      heap.Uint32Array[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT] = allocator.calloc(date_size);
+      date_set_all(heap, heap.Uint32Array[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT], ENTRY_TYPE.DATE, 1, 0, valueToSave.getTime());
+      continue;
+    }
+
+    if (valueToSave instanceof Map) {
+      heap.Uint32Array[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT] = mapSaverIterative(externalArgs, carrier, valuesToSave, pointersToSaveTo, valueToSave);
+      continue;
+    }
+
+    if (valueToSave instanceof Set) {
+      heap.Uint32Array[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT] = setSaverIterative(externalArgs, carrier, valueToSave);
+      continue;
+    } // Plain object? I hope so
+
+
+    heap.Uint32Array[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT] = objectSaverIterative(externalArgs, carrier, valuesToSave, pointersToSaveTo, valueToSave);
   }
-
-  return valuePointer;
 }

dist/internal/setWrapper.d.ts

@@ -1,5 +0,5 @@
-import { ExternalArgs, GlobalCarrier, MapEntry, InternalAPI } from "./interfaces";
+import { ExternalArgs, GlobalCarrier, InternalAPI } from "./interfaces";
 import { INTERNAL_API_SYMBOL } from "./symbols";
 import { BaseProxyTrap } from "./BaseProxyTrap";
-export declare class SetWrapper<K extends string | number> extends BaseProxyTrap<MapEntry> implements Set<K> {
+export declare class SetWrapper<K extends string | number> extends BaseProxyTrap implements Set<K> {
     clear(): void;
@@ -6,0 +6,0 @@ forEach(callbackfn: (key: K, key2: K, map: Set<K>) => void, thisArg?: any): void;

dist/internal/setWrapper.js

@@ -7,2 +7,3 @@ import { deleteObjectPropertyEntryByKey, objectSet, mapOrSetClear } from "./objectWrapperHelpers";
 import { entryToFinalJavaScriptValue } from "./entryToFinalJavaScriptValue";
+import { object_pointerToHashMap_get } from "./generatedStructs";
 export class SetWrapper extends BaseProxyTrap {
@@ -20,3 +21,3 @@ clear() {
   get size() {
-    return hashMapSize(this.carrier, this.entry.value);
+    return hashMapSize(this.carrier, object_pointerToHashMap_get(this.carrier.heap, this.entryPointer));
   }
@@ -29,3 +30,3 @@
   *entries() {
-    for (const nodePointer of hashmapNodesPointerIterator(this.carrier, this.entry.value)) {
+    for (const nodePointer of hashmapNodesPointerIterator(this.carrier, object_pointerToHashMap_get(this.carrier.heap, this.entryPointer))) {
       const t = hashMapNodePointerToKeyValue(this.carrier, nodePointer);
@@ -38,3 +39,3 @@ const key = entryToFinalJavaScriptValue(this.externalArgs, this.carrier, t.keyPointer);
   *keys() {
-    for (const nodePointer of hashmapNodesPointerIterator(this.carrier, this.entry.value)) {
+    for (const nodePointer of hashmapNodesPointerIterator(this.carrier, object_pointerToHashMap_get(this.carrier.heap, this.entryPointer))) {
       const t = hashMapNodePointerToKeyValue(this.carrier, nodePointer);
@@ -46,3 +47,3 @@ yield entryToFinalJavaScriptValue(this.externalArgs, this.carrier, t.keyPointer);
   *values() {
-    for (const nodePointer of hashmapNodesPointerIterator(this.carrier, this.entry.value)) {
+    for (const nodePointer of hashmapNodesPointerIterator(this.carrier, object_pointerToHashMap_get(this.carrier.heap, this.entryPointer))) {
       const t = hashMapNodePointerToKeyValue(this.carrier, nodePointer);
@@ -70,3 +71,3 @@ yield entryToFinalJavaScriptValue(this.externalArgs, this.carrier, t.keyPointer);
 
-    return hashMapNodeLookup(this.carrier, this.entry.value, p) !== 0;
+    return hashMapNodeLookup(this.carrier, object_pointerToHashMap_get(this.carrier.heap, this.entryPointer), p) !== 0;
   }
@@ -80,3 +81,3 @@
     allocationsTransaction(() => {
-      objectSet(this.externalArgs, this.carrier, this.entry.value, p, undefined);
+      objectSet(this.externalArgs, this.carrier, object_pointerToHashMap_get(this.carrier.heap, this.entryPointer), p, undefined);
     }, this.carrier.allocator);
@@ -91,3 +92,3 @@ return this;
 
-    return deleteObjectPropertyEntryByKey(this.externalArgs, this.carrier, this.entry.value, p);
+    return deleteObjectPropertyEntryByKey(this.carrier, object_pointerToHashMap_get(this.carrier.heap, this.entryPointer), p);
   }
@@ -94,0 +95,0 @@

dist/internal/sizeOf.js

@@ -0,1 +1,2 @@
+/* istanbul ignore file */
 import { externalArgsApiToExternalArgsApi, isPrimitive, primitiveValueToEntry, align } from "./utils";
@@ -2,0 +3,0 @@ import { ENTRY_TYPE } from "./entry-types";

dist/internal/store.d.ts

@@ -1,21 +0,16 @@
-import { Entry, primitive, GlobalCarrier } from "./interfaces";
+import { Entry, GlobalCarrier } from "./interfaces";
 import { ExternalArgs } from "./interfaces";
+import { Heap } from "../structsGenerator/consts";
 export declare function initializeArrayBuffer(arrayBuffer: ArrayBuffer): void;
 export declare function sizeOfEntry(entry: Entry): number;
-export declare function writeEntry(carrier: GlobalCarrier, startingCursor: number, entry: Entry): void;
-export declare function appendEntry(externalArgs: ExternalArgs, carrier: GlobalCarrier, entry: Entry): number;
-export declare function readEntry(carrier: GlobalCarrier, startingCursor: number): Entry;
-export declare function canReuseMemoryOfEntry(entryA: Entry, value: primitive): boolean;
-export declare function writeValueInPtrToPtr(externalArgs: ExternalArgs, carrier: GlobalCarrier, ptrToPtr: number, value: any): {
-    referencedPointers: number[];
-    existingEntryPointer: number;
-    existingValueEntry: import("./interfaces").StringEntry | import("./interfaces").NumberEntry | import("./interfaces").BigIntPositiveEntry | import("./interfaces").BigIntNegativeEntry | import("./interfaces").ObjectEntry | import("./interfaces").ArrayEntry | import("./interfaces").DateEntry | import("./interfaces").MapEntry | import("./interfaces").SetEntry | undefined;
-} | undefined;
-export declare function writeValueInPtrToPtrAndHandleMemory(externalArgs: ExternalArgs, carrier: GlobalCarrier, ptrToPtr: number, value: any): void;
-export declare function handleArcForDeletedValuePointer(externalArgs: ExternalArgs, carrier: GlobalCarrier, deletedValuePointer: number): void;
-export declare function incrementRefCount(externalArgs: ExternalArgs, carrier: GlobalCarrier, entryPointer: number): number;
-export declare function decrementRefCount(externalArgs: ExternalArgs, carrier: GlobalCarrier, entryPointer: number): number;
+export declare function writeValueInPtrToPtr(externalArgs: ExternalArgs, carrier: GlobalCarrier, ptrToPtr: number, value: unknown): number[];
+export declare function writeValueInPtrToPtrAndHandleMemory(externalArgs: ExternalArgs, carrier: GlobalCarrier, ptrToPtr: number, value: unknown): void;
+export declare function handleArcForDeletedValuePointer(carrier: GlobalCarrier, deletedValuePointer: number): void;
+export declare function incrementRefCount(heap: Heap, entryPointer: number): number;
+export declare function decrementRefCount(heap: Heap, entryPointer: number): number;
 export declare function getObjectValuePtrToPtr(pointerToEntry: number): number;
 export declare function memComp(uint8: Uint8Array, aStart: number, bStart: number, length: number): boolean;
-export declare function compareStringOrNumberEntriesInPlace(carrier: GlobalCarrier, entryAPointer: number, entryBPointer: number): boolean;
+export declare function compareStringOrNumberEntriesInPlace(heap: Heap, entryAPointer: number, entryBPointer: number): boolean;
+export declare function compareStringOrNumberEntriesInPlaceOld(carrier: GlobalCarrier, entryAPointer: number, entryBPointer: number): boolean;
+export declare function readNumberOrString(heap: Heap, pointer: number): string | number;
 //# sourceMappingURL=store.d.ts.map

dist/internal/store.js

@@ -1,9 +0,9 @@
-import { ENTRY_TYPE, isPrimitiveEntryType } from "./entry-types";
-import { isPrimitive, primitiveValueToEntry, isKnownAddressValuePointer } from "./utils";
+import { ENTRY_TYPE } from "./entry-types";
+import { isKnownAddressValuePointer, isTypeWithRC } from "./utils";
 import { BigInt64OverflowError } from "./exceptions";
 import { INITIAL_ENTRY_POINTER_TO_POINTER, INITIAL_ENTRY_POINTER_VALUE } from "./consts";
-import { saveValue } from "./saveValue";
 import { getAllLinkedAddresses } from "./getAllLinkedAddresses";
-import { stringEncodeInto } from "./stringEncodeInto";
-import { stringDecode } from "./stringDecode";
+import { typeAndRc_refsCount_get, typeAndRc_refsCount_set, typeOnly_type_get, number_value_get, string_bytesLength_get, string_charsPointer_get } from "./generatedStructs";
+import { readString } from "./readString";
+import { saveValueIterative } from "./saveValue";
 const MAX_64_BIG_INT = BigInt("0xFFFFFFFFFFFFFFFF");
@@ -71,4 +71,4 @@ export function initializeArrayBuffer(arrayBuffer) {
     default:
-      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-      // @ts-ignore
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-expect-error
       throw new Error(ENTRY_TYPE[entry.type] + " Not implemented yet");
@@ -79,246 +79,28 @@ }
 }
-export function writeEntry(carrier, startingCursor, entry) {
-  let cursor = startingCursor; // let writtenDataSizeInBytes = 0;
-  // write type
-  // undo on throw ?
-
-  carrier.float64[cursor / Float64Array.BYTES_PER_ELEMENT] = entry.type;
-  cursor += Float64Array.BYTES_PER_ELEMENT;
-
-  switch (entry.type) {
-    case ENTRY_TYPE.NUMBER:
-      carrier.float64[cursor / Float64Array.BYTES_PER_ELEMENT] = entry.value;
-      cursor += Float64Array.BYTES_PER_ELEMENT;
-      break;
-
-    case ENTRY_TYPE.STRING:
-      carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT] = entry.allocatedBytes;
-      cursor += Uint32Array.BYTES_PER_ELEMENT; // eslint-disable-next-line no-case-declarations
-
-      const writtenBytes = stringEncodeInto(carrier.uint8, cursor, entry.value);
-
-      if (writtenBytes !== entry.allocatedBytes) {
-        // eslint-disable-next-line no-undef
-        console.warn({
-          value: entry.value,
-          writtenBytes,
-          allocatedBytes: entry.allocatedBytes
-        }, true);
-        throw new Error("WTF???");
-      }
-
-      cursor += entry.allocatedBytes;
-      break;
-
-    case ENTRY_TYPE.BIGINT_NEGATIVE:
-    case ENTRY_TYPE.BIGINT_POSITIVE:
-      if (entry.value > MAX_64_BIG_INT || entry.value < -MAX_64_BIG_INT) {
-        throw new BigInt64OverflowError();
-      }
-
-      carrier.bigUint64[cursor / BigUint64Array.BYTES_PER_ELEMENT] = entry.type === ENTRY_TYPE.BIGINT_NEGATIVE ? -entry.value : entry.value;
-      cursor += BigUint64Array.BYTES_PER_ELEMENT;
-      break;
-
-    case ENTRY_TYPE.OBJECT:
-    case ENTRY_TYPE.SET:
-    case ENTRY_TYPE.MAP:
-      carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT] = entry.refsCount;
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT] = entry.value;
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      break;
-
-    case ENTRY_TYPE.ARRAY:
-      carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT] = entry.refsCount;
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT] = entry.value;
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT] = entry.length;
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT] = entry.allocatedLength;
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      break;
-
-    case ENTRY_TYPE.DATE:
-      carrier.float64[cursor / Float64Array.BYTES_PER_ELEMENT] = entry.value;
-      cursor += Float64Array.BYTES_PER_ELEMENT;
-      carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT] = entry.refsCount;
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      break;
-
-    default:
-      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-      // @ts-ignore
-      throw new Error(ENTRY_TYPE[entry.type] + " Not implemented yet");
-  }
-}
-export function appendEntry(externalArgs, carrier, entry) {
-  const size = sizeOfEntry(entry);
-  const memoryAddress = carrier.allocator.calloc(size);
-  writeEntry(carrier, memoryAddress, entry);
-  return memoryAddress;
-}
-export function readEntry(carrier, startingCursor) {
-  let cursor = startingCursor;
-  const entryType = carrier.float64[cursor / Float64Array.BYTES_PER_ELEMENT];
-  cursor += Float64Array.BYTES_PER_ELEMENT;
-  const entry = {
-    type: entryType,
-    value: undefined
-  }; // let writtenDataSizeInBytes = 0;
-
-  switch (entryType) {
-    // handled by well-known addresses
-    // case ENTRY_TYPE.UNDEFINED:
-    //   break;
-    // case ENTRY_TYPE.NULL:
-    //   break;
-    // case ENTRY_TYPE.BOOLEAN:
-    //   entry.value = carrier.dataView.getUint8(cursor) !== 0;
-    //   cursor += Uint8Array.BYTES_PER_ELEMENT;
-    //   break;
-    case ENTRY_TYPE.NUMBER:
-      entry.value = carrier.float64[cursor / Float64Array.BYTES_PER_ELEMENT];
-      cursor += Float64Array.BYTES_PER_ELEMENT;
-      break;
-
-    case ENTRY_TYPE.STRING:
-      // eslint-disable-next-line no-case-declarations
-      const stringLength = carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT];
-      entry.allocatedBytes = stringLength;
-      cursor += Uint32Array.BYTES_PER_ELEMENT; // decode fails with zero length array
-
-      if (stringLength > 0) {
-        // this wrapping is needed until:
-        // https://github.com/whatwg/encoding/issues/172
-        // eslint-disable-next-line no-case-declarations
-        // const tempAB = new ArrayBuffer(stringLength, true);
-        // arrayBufferCopyTo(dataView.buffer, cursor, stringLength, tempAB, 0, true);
-        entry.value = stringDecode(carrier.uint8, cursor, stringLength);
-      } else {
-        entry.value = "";
-      }
-
-      cursor += stringLength;
-      break;
-
-    case ENTRY_TYPE.BIGINT_POSITIVE:
-      entry.value = carrier.bigUint64[cursor / BigUint64Array.BYTES_PER_ELEMENT];
-      cursor += BigUint64Array.BYTES_PER_ELEMENT;
-      break;
-
-    case ENTRY_TYPE.BIGINT_NEGATIVE:
-      entry.value = -carrier.bigUint64[cursor / BigUint64Array.BYTES_PER_ELEMENT];
-      cursor += BigUint64Array.BYTES_PER_ELEMENT;
-      break;
-
-    case ENTRY_TYPE.OBJECT:
-    case ENTRY_TYPE.MAP:
-    case ENTRY_TYPE.SET:
-      entry.refsCount = carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT];
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      entry.value = carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT];
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      break;
-
-    case ENTRY_TYPE.ARRAY:
-      entry.refsCount = carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT];
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      entry.value = carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT];
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      entry.length = carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT];
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      entry.allocatedLength = carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT];
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      break;
-
-    case ENTRY_TYPE.DATE:
-      entry.value = carrier.float64[cursor / Float64Array.BYTES_PER_ELEMENT];
-      cursor += Float64Array.BYTES_PER_ELEMENT;
-      entry.refsCount = carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT];
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      break;
-
-    default:
-      throw new Error(ENTRY_TYPE[entryType] + " Not implemented yet");
-  }
-
-  return entry;
-}
-export function canReuseMemoryOfEntry(entryA, value) {
-  const typeofTheValue = typeof value; // number & bigint 64 are the same size
-
-  if ((entryA.type === ENTRY_TYPE.BIGINT_NEGATIVE || entryA.type === ENTRY_TYPE.BIGINT_POSITIVE || entryA.type === ENTRY_TYPE.NUMBER) && (typeofTheValue === "bigint" || typeofTheValue === "number")) {
-    return true;
-  } // kill for strings for now
-  // if (
-  //   entryA.type === ENTRY_TYPE.STRING &&
-  //   typeofTheValue === "string" &&
-  //   entryA.allocatedBytes >= strByteLength(value as string)
-  // ) {
-  //   return true;
-  // }
-
-
-  return false;
-}
 export function writeValueInPtrToPtr(externalArgs, carrier, ptrToPtr, value) {
-  const existingEntryPointer = carrier.uint32[ptrToPtr / Uint32Array.BYTES_PER_ELEMENT];
-  let reuse = false;
-  let existingValueEntry;
+  const referencedPointers = []; // Might oom here
 
-  if (!isKnownAddressValuePointer(existingEntryPointer)) {
-    existingValueEntry = readEntry(carrier, existingEntryPointer);
-    reuse = isPrimitive(value) && isPrimitiveEntryType(existingValueEntry.type) && canReuseMemoryOfEntry(existingValueEntry, value);
-  } // try to re use memory
-
-
-  if (reuse) {
-    const newEntry = primitiveValueToEntry(value);
-    writeEntry(carrier, existingEntryPointer, newEntry);
-  } else {
-    const referencedPointers = [];
-    const newEntryPointer = saveValue(externalArgs, carrier, referencedPointers, value);
-    carrier.uint32[ptrToPtr / Uint32Array.BYTES_PER_ELEMENT] = newEntryPointer;
-    return {
-      referencedPointers,
-      existingEntryPointer,
-      existingValueEntry
-    };
-  }
+  saveValueIterative(externalArgs, carrier, referencedPointers, ptrToPtr, value);
+  return referencedPointers;
 }
 export function writeValueInPtrToPtrAndHandleMemory(externalArgs, carrier, ptrToPtr, value) {
-  const {
-    existingValueEntry = false,
-    existingEntryPointer = 0,
-    referencedPointers = []
-  } = writeValueInPtrToPtr(externalArgs, carrier, ptrToPtr, value) || {};
+  const existingEntryPointer = carrier.heap.Uint32Array[ptrToPtr / Uint32Array.BYTES_PER_ELEMENT]; // Might oom here
 
+  const referencedPointers = writeValueInPtrToPtr(externalArgs, carrier, ptrToPtr, value); // -- end of might oom
+  // commit ref count changes of existing objects
+
   if (referencedPointers.length > 0) {
     for (const ptr of referencedPointers) {
-      incrementRefCount(externalArgs, carrier, ptr);
+      incrementRefCount(carrier.heap, ptr);
     }
   }
 
-  if (existingValueEntry && "refsCount" in existingValueEntry) {
-    const newRefCount = decrementRefCount(externalArgs, carrier, existingEntryPointer);
+  handleArcForDeletedValuePointer(carrier, existingEntryPointer);
+}
+export function handleArcForDeletedValuePointer(carrier, deletedValuePointer) {
+  const {
+    heap,
+    allocator
+  } = carrier; // No memory to free/ARC
 
-    if (newRefCount === 0) {
-      const addressesToFree = getAllLinkedAddresses(carrier, false, existingEntryPointer);
-
-      for (const address of addressesToFree.leafAddresses) {
-        carrier.allocator.free(address);
-      }
-
-      for (const address of addressesToFree.arcAddresses) {
-        decrementRefCount(externalArgs, carrier, address);
-      }
-    }
-  } else {
-    carrier.allocator.free(existingEntryPointer);
-  }
-}
-export function handleArcForDeletedValuePointer(externalArgs, carrier, deletedValuePointer) {
-  // No memory to free/ARC
   if (isKnownAddressValuePointer(deletedValuePointer)) {
@@ -328,57 +110,39 @@ return;
 
-  const existingValueEntry = readEntry(carrier, deletedValuePointer);
+  const entryType = typeOnly_type_get(heap, deletedValuePointer);
 
-  if (existingValueEntry && "refsCount" in existingValueEntry) {
-    const newRefCount = decrementRefCount(externalArgs, carrier, deletedValuePointer);
+  if (!isTypeWithRC(entryType)) {
+    if (entryType === ENTRY_TYPE.STRING) {
+      allocator.free(string_charsPointer_get(carrier.heap, deletedValuePointer));
+    }
 
-    if (newRefCount === 0) {
-      const addressesToFree = getAllLinkedAddresses(carrier, false, deletedValuePointer);
-
-      for (const address of addressesToFree.leafAddresses) {
-        carrier.allocator.free(address);
-      }
-
-      for (const address of addressesToFree.arcAddresses) {
-        decrementRefCount(externalArgs, carrier, address);
-      }
-    }
-  } else {
-    carrier.allocator.free(deletedValuePointer);
+    allocator.free(deletedValuePointer);
+    return;
   }
-}
-export function incrementRefCount(externalArgs, carrier, entryPointer) {
-  const entry = readEntry(carrier, entryPointer);
 
-  if ("refsCount" in entry) {
-    entry.refsCount += 1;
-    writeEntry(carrier, entryPointer, entry);
-    return entry.refsCount;
+  if (decrementRefCount(heap, deletedValuePointer) > 0) {
+    allocator.free(deletedValuePointer);
+    return;
   }
 
-  throw new Error("unexpected");
-}
-export function decrementRefCount(externalArgs, carrier, entryPointer) {
-  const entry = readEntry(carrier, entryPointer);
+  const {
+    leafAddresses,
+    arcAddresses
+  } = getAllLinkedAddresses(carrier, false, deletedValuePointer);
 
-  if ("refsCount" in entry) {
-    entry.refsCount -= 1;
-    writeEntry(carrier, entryPointer, entry);
-    return entry.refsCount;
+  for (const address of leafAddresses) {
+    allocator.free(address);
   }
 
-  throw new Error("unexpected");
-} // export function getObjectPropPtrToPtr(
-//   { dataView }: GlobalCarrier,
-//   pointerToEntry: number
-// ) {
-//   const keyStringLength = dataView.getUint16(pointerToEntry + 1);
-//   const valuePtrToPtr =
-//     Uint16Array.BYTES_PER_ELEMENT + pointerToEntry + 1 + keyStringLength;
-//   const nextPtrToPtr = valuePtrToPtr + Uint32Array.BYTES_PER_ELEMENT;
-//   return {
-//     valuePtrToPtr,
-//     nextPtrToPtr
-//   };
-// }
-
+  for (const address of arcAddresses) {
+    decrementRefCount(heap, address);
+  }
+}
+export function incrementRefCount(heap, entryPointer) {
+  typeAndRc_refsCount_set(heap, entryPointer, typeAndRc_refsCount_get(heap, entryPointer) + 1);
+  return typeAndRc_refsCount_get(heap, entryPointer);
+}
+export function decrementRefCount(heap, entryPointer) {
+  typeAndRc_refsCount_set(heap, entryPointer, typeAndRc_refsCount_get(heap, entryPointer) - 1);
+  return typeAndRc_refsCount_get(heap, entryPointer);
+}
 export function getObjectValuePtrToPtr(pointerToEntry) {
@@ -401,3 +165,26 @@ return pointerToEntry + 1 + 1;
 }
-export function compareStringOrNumberEntriesInPlace(carrier, entryAPointer, entryBPointer) {
+export function compareStringOrNumberEntriesInPlace(heap, entryAPointer, entryBPointer) {
+  typeOnly_type_get(heap, entryAPointer);
+  const entryAType = typeOnly_type_get(heap, entryAPointer);
+  const entryBType = typeOnly_type_get(heap, entryBPointer);
+
+  if (entryAType !== entryBType) {
+    return false;
+  }
+
+  if (entryAType === ENTRY_TYPE.STRING) {
+    const aLength = string_bytesLength_get(heap, entryAPointer);
+    const bLength = string_bytesLength_get(heap, entryBPointer);
+
+    if (aLength !== bLength) {
+      return false;
+    }
+
+    return memComp(heap.Uint8Array, string_charsPointer_get(heap, entryAPointer), string_charsPointer_get(heap, entryBPointer), aLength);
+  } // numbers
+
+
+  return number_value_get(heap, entryAPointer) === number_value_get(heap, entryBPointer);
+}
+export function compareStringOrNumberEntriesInPlaceOld(carrier, entryAPointer, entryBPointer) {
   let cursor = 0;
@@ -426,2 +213,11 @@ const entryAType = carrier.float64[(entryAPointer + cursor) / Float64Array.BYTES_PER_ELEMENT];
   return carrier.float64[(entryAPointer + cursor) / Float64Array.BYTES_PER_ELEMENT] === carrier.float64[(entryBPointer + cursor) / Float64Array.BYTES_PER_ELEMENT];
+}
+export function readNumberOrString(heap, pointer) {
+  const type = typeOnly_type_get(heap, pointer);
+
+  if (type === ENTRY_TYPE.NUMBER) {
+    return number_value_get(heap, pointer);
+  } else {
+    return readString(heap, pointer);
+  }
 }

dist/internal/testUtils.js

@@ -16,3 +16,4 @@ export function arrayBuffer2HexArray(buffer, withByteNumber = false) {
 import { OutOfMemoryError } from "./exceptions";
-import { MEM_POOL_START } from "./consts"; // extend pool and not monkey patch? need to think about it
+import { MEM_POOL_START } from "./consts";
+import { createHeap } from "../structsGenerator/consts"; // extend pool and not monkey patch? need to think about it
 
@@ -65,4 +66,4 @@ export function recordAllocations(operation, pool) {
     return allocation;
-  }; // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-  // @ts-ignore
+  }; // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-expect-error
 
@@ -98,5 +99,6 @@
     float64: new Float64Array(arrayBuffer),
-    bigUint64: new BigUint64Array(arrayBuffer)
+    bigUint64: new BigUint64Array(arrayBuffer),
+    heap: createHeap(arrayBuffer)
   };
   return carrier;
 }

dist/internal/utils.d.ts

 import { primitive, Entry, ExternalArgs, InternalAPI, ExternalArgsApi } from "./interfaces";
+import { ENTRY_TYPE } from "./entry-types";
 import { IMemPool } from "@thi.ng/malloc";
@@ -11,5 +12,10 @@ export declare function isPrimitive(value: unknown): value is primitive;
 export declare function getInternalAPI(value: any): InternalAPI;
+/**
+ * Incorrect length (too big) for emojis
+ * @param str
+ */
 export declare function strByteLength(str: string): number;
 export declare function align(value: number, alignTo?: number): number;
 export declare function isKnownAddressValuePointer(entryPointer: number): boolean;
+export declare function isTypeWithRC(type: ENTRY_TYPE): boolean;
 //# sourceMappingURL=utils.d.ts.map

dist/internal/utils.js

@@ -79,2 +79,7 @@ import { ENTRY_TYPE } from "./entry-types";
 }
+/**
+ * Incorrect length (too big) for emojis
+ * @param str
+ */
+
 export function strByteLength(str) {
@@ -95,2 +100,5 @@ let s = str.length;
   return entryPointer === UNDEFINED_KNOWN_ADDRESS || entryPointer === NULL_KNOWN_ADDRESS || entryPointer === TRUE_KNOWN_ADDRESS || entryPointer === FALSE_KNOWN_ADDRESS;
+}
+export function isTypeWithRC(type) {
+  return type === ENTRY_TYPE.OBJECT || type === ENTRY_TYPE.ARRAY || type === ENTRY_TYPE.DATE || type === ENTRY_TYPE.MAP || type === ENTRY_TYPE.SET;
 }

dist/internal/WeakValueMap.js

@@ -0,1 +1,3 @@
+/* istanbul ignore file */
+// We can't run test with weakrefs yet
 const KEYS = 1;
@@ -15,3 +17,4 @@ const VALUES = 2;
     this.map = new Map();
-    this.group = new FinalizationGroup(iterator => {
+    const FinalizationSomething = typeof FinalizationRegistry !== "undefined" ? FinalizationRegistry : FinalizationGroup;
+    this.group = new FinalizationSomething(iterator => {
       for (const key of iterator) {
@@ -18,0 +21,0 @@ this.map.delete(key);

package.json

 {
   "name": "@bnaya/objectbuffer",
   "description": "Object-like api, backed by an array buffer",
-  "version": "0.0.0-96df3bb",
+  "version": "0.0.0-9dd1a9f",
   "main": "dist/objectbuffer.cjs.js",
@@ -36,37 +36,41 @@ "module": "dist/index.js",
     "webpack-playground": "webpack-dev-server --mode=development --config playground/webpack.config.js --open",
-    "generate-docs": "rimraf -f docs/generated/ && typedoc --out docs/generated/ --includes . --name objectbuffer --readme none --entryPoint \"\\\"index\\\"\" --excludeNotExported --ignoreCompilerErrors --mode modules src/index.ts"
+    "generate-docs": "rimraf -f docs/generated/ && typedoc --mode library --readme none --out docs/generated/ --excludeNotExported --ignoreCompilerErrors src/index.ts",
+    "generate-structs": "npx ts-node src/structsGenerator/run.ts"
   },
   "devDependencies": {
     "@babel/cli": "^7.8.4",
-    "@babel/core": "^7.9.0",
-    "@babel/preset-env": "^7.9.5",
+    "@babel/core": "^7.9.6",
+    "@babel/node": "^7.8.7",
+    "@babel/preset-env": "^7.9.6",
     "@babel/preset-typescript": "^7.9.0",
-    "@types/benchmark": "^1.0.31",
-    "@types/jest": "^25.2.1",
+    "@types/benchmark": "^1.0.32",
+    "@types/jest": "^25.2.3",
     "@types/node": "^12.12.21",
-    "@typescript-eslint/eslint-plugin": "^2.27.0",
-    "@typescript-eslint/parser": "^2.27.0",
+    "@typescript-eslint/eslint-plugin": "^3.0.0",
+    "@typescript-eslint/parser": "^3.0.0",
     "babel-loader": "^8.1.0",
     "benchmark": "^2.1.4",
-    "concurrently": "^5.1.0",
+    "concurrently": "^5.2.0",
     "core-js": "^3.6.5",
-    "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.10.1",
-    "eslint-plugin-prettier": "^3.1.2",
+    "eslint": "^7.1.0",
+    "eslint-config-prettier": "^6.11.0",
+    "eslint-plugin-prettier": "^3.1.3",
     "gh-pages": "^2.2.0",
-    "html-webpack-plugin": "^4.2.0",
+    "html-webpack-plugin": "^4.3.0",
     "husky": "^4.2.5",
-    "jest": "^25.3.0",
-    "prettier": "^2.0.4",
-    "prettier-eslint": "^9.0.1",
+    "jest": "^26.0.1",
+    "kind-of": "^6.0.3",
+    "prettier": "^2.0.5",
+    "prettier-eslint": "^10.1.0",
     "rimraf": "^3.0.2",
-    "rollup": "^2.4.0",
+    "rollup": "^2.10.8",
     "rollup-plugin-babel": "^4.4.0",
     "rollup-plugin-node-resolve": "^5.2.0",
-    "typedoc": "^0.17.4",
+    "rollup-plugin-terser": "^6.0.1",
+    "typedoc": "^0.17.7",
     "typedoc-plugin-markdown": "^2.2.17",
-    "typescript": "^3.8.3",
-    "webpack": "^4.42.1",
+    "typescript": "^3.9.3",
+    "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11",
-    "webpack-dev-server": "^3.10.3",
+    "webpack-dev-server": "^3.11.0",
     "worker-loader": "^2.0.0",
@@ -88,4 +92,4 @@ "yarn-deduplicate": "^2.0.0"
   "dependencies": {
-    "@thi.ng/malloc": "^4.1.10"
+    "@thi.ng/malloc": "^4.1.14"
   }
 }

README.md

@@ -1,2 +0,2 @@
-# ObjectBuffer: object-like API, backed by a [shared]arraybuffer
+# ObjectBuffer: object-like API, backed by a [shared]arraybuffer 👀
 
@@ -6,14 +6,17 @@ [![npm version](https://badge.fury.io/js/%40bnaya%2Fobjectbuffer.svg)](https://badge.fury.io/js/%40bnaya%2Fobjectbuffer)
 
-## The readme is for latest release `v0.10.0`.big refactor ongoing (allocator, hashmap)
+For Modern browsers and node.
 
-For Modern browsers and node. Zero direct dependencies.
+Save, read and update plain javascript objects into `ArrayBuffer` (And not only TypedArrays),  using regular javascript object api, without serialization/deserialization, or pre-defined schema.  
+In other words, It's an implementation of javascript objects in user-land.
 
-Save, read and update plain javascript objects into `ArrayBuffer` (And not only TypedArrays),  using regular javascript object api, without serialization/deserialization.  
-Look at it as a simple implementation of javascript objects in user-land.
-
 That's enables us to `transfer` or share objects in-memory with `WebWorker` without additional memory or serialization
+While the library is not `1.0`, it is usable. 
 
-The library is still not `1.0`, but already usable, and will never offer full compatibility with plain js (`Symbol` and such)
+A core part of the library is an allocator, that allocates & free memory on the `ArrayBuffer` for us!  
+The allocator in use is [@thi.ng/malloc](https://www.npmjs.com/package/@thi.ng/malloc), part of the amazing [thi.ng/umbrella](https://github.com/thi-ng/umbrella) project
 
-For in-depth overview of how things are implemented, see [implementation details document](docs/implementationDetails.md)
+## 🐉🐉🐉 Adventurers Beware 🐉🐉🐉
+Using this library, and workers in general, will not necessarily make you code faster.  
+First be sure where are your bottlenecks and if you don't have a better and more simple workaround.  
+I personally also really like what's going on around the [main thread scheduling proposal](https://github.com/WICG/main-thread-scheduling) and [react userland scheduler](https://www.npmjs.com/package/scheduler) that powers concurrent react
 
@@ -30,7 +33,3 @@ ## Quick example
 const myObject = createObjectBuffer(
-  {
-    // available globally in the browser, or inside `util` in node
-    textEncoder: new TextEncoder(),
-    textDecoder: new TextDecoder()
-  },
+  {},
   // size in bytes
@@ -84,15 +83,18 @@ 1024,
 * Date
-* Internal references (`foo.bar2 = foo.bar` will not create a copy)
+* BigInt
+* Internal references (`foo.bar2 = foo.bar` will not create a copy, but a reference)
+* Automatic reference counting, to dispose a value you need to use the `disposeWrapperObject` or to have WeakRef support
 * Internal equality between objects (`foo.bar === foo.bar` will be true)
-* global lock for shared memory using [Atomics](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Atomics) (i hope its really working)
+* global lock for shared memory using [Atomics](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Atomics) (I hope its really working)
 
 ## Caveats & Limitations
 
-* Need to specify size for the `ArrayBuffer`. When exceed that size, exception will be thrown. (Can be extended with a utility function, but not automatically)
-* Not memory re-use. memory allocation is append based, or overwrite when possible [#21](https://github.com/Bnaya/objectbuffer/issues/21)
-* Object are implemented using simple linked list [#26](https://github.com/Bnaya/objectbuffer/issues/26)
-* Maps & Sets are not supported yet [#15](https://github.com/Bnaya/objectbuffer/issues/15) & [#24](https://github.com/Bnaya/objectbuffer/issues/24)
-* No prototype chain. objects props will simply be copied
-* Additional props on Array, Date, primitives will not be saved.
-* getters, setters, will not work/break the library
+* Need to specify size for the `ArrayBuffer`. When exceed that size, exception will be thrown. (Can be extended later with a utility function, but not automatically)
+* Size must be multiplication of 8
+* Set, Map, Object keys can be only string or numbers. no symbols or other things
+* You can't save objects with circularities (But you can create them on objectbuffer)
+* No prototype chain. no methods on the objects
+* Adding getters, setters, will not work/break the library
+* deleting/removing the current key of Map/Set while iteration will make you skip the next key [#60](https://github.com/Bnaya/objectbuffer/issues/60)
+* unreliable_sizeOf is unreliable due to hashmap array side depends on actual keys, Also It's an expensive operation
 
@@ -103,3 +105,3 @@ ### What's not working yet, but can be
 
-### What's probably never going to work (convince me otherwise )
+### What's probably never going to work
 
@@ -112,2 +114,10 @@ * Anything that cannot go into `JSON.stringify`
 There's a huge place for optimizations, code hygiene, and features!  
-Feel free to open issues and maybe implementing missing parts
+Feel free to open issues and maybe implementing missing parts.  
+The code is Written in TypeScript 🦾, but the semantics are more like `C` 🥵   
+Have a look on the [issues](https://github.com/Bnaya/objectbuffer/issues) and see if you find something interesting
+
+
+## If you came this far, you better also look at:
+* [GoogleChromeLabs/buffer-backed-object](https://github.com/GoogleChromeLabs/buffer-backed-object#readme) 
+* [FlatBuffers](https://google.github.io/flatbuffers/flatbuffers_guide_use_javascript.html)
+

src/apiTests/array.test.ts

 /* eslint-env jest */
 
-import * as util from "util";
-
 import { createObjectBuffer } from "../";
@@ -12,4 +10,2 @@ import { memoryStats } from "../internal/api";
   const externalArgs = externalArgsApiToExternalArgsApi({
-    textEncoder: new util.TextEncoder(),
-    textDecoder: new util.TextDecoder(),
     arrayAdditionalAllocation: 0,
@@ -40,4 +36,4 @@ });
 
-    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`592`);
+    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`560`);
   });
 });

src/apiTests/date.test.ts

 /* eslint-env jest */
 
-import * as util from "util";
-
 import { createObjectBuffer } from "../";
@@ -11,4 +9,2 @@ import { memoryStats } from "../internal/api";
   const externalArgs = externalArgsApiToExternalArgsApi({
-    textEncoder: new util.TextEncoder(),
-    textDecoder: new util.TextDecoder(),
     arrayAdditionalAllocation: 0,
@@ -49,4 +45,4 @@ });
 
-    expect(memoryStats(objectBuffer).used).toMatchInlineSnapshot(`264`);
+    expect(memoryStats(objectBuffer).used).toMatchInlineSnapshot(`272`);
   });
 });

src/apiTests/equality.test.ts

 /* eslint-env jest */
 
-import * as util from "util";
-
 import { createObjectBuffer } from "../";
@@ -11,4 +9,2 @@ import { memoryStats } from "../internal/api";
   const externalArgs = externalArgsApiToExternalArgsApi({
-    textEncoder: new util.TextEncoder(),
-    textDecoder: new util.TextDecoder(),
     arrayAdditionalAllocation: 0,
@@ -28,2 +24,25 @@ });
 
+    expect(objectBuffer).toMatchInlineSnapshot(`
+    Object {
+      "arr": Array [
+        1,
+        2,
+        3,
+        4,
+      ],
+      "arr2": Array [
+        1,
+        2,
+        3,
+        4,
+      ],
+      "obj": Object {
+        "a": 1,
+      },
+      "obj2": Object {
+        "a": 1,
+      },
+    }
+  `);
+
     expect(objectBuffer.arr2).toBe(objectBuffer.arr2);
@@ -35,27 +54,4 @@ expect(objectBuffer.arr2).toBe(objectBuffer.arr);
 
-    expect(objectBuffer).toMatchInlineSnapshot(`
-      Object {
-        "arr": Array [
-          1,
-          2,
-          3,
-          4,
-        ],
-        "arr2": Array [
-          1,
-          2,
-          3,
-          4,
-        ],
-        "obj": Object {
-          "a": 1,
-        },
-        "obj2": Object {
-          "a": 1,
-        },
-      }
-    `);
-
-    expect(memoryStats(objectBuffer).used).toMatchInlineSnapshot(`776`);
+    expect(memoryStats(objectBuffer).used).toMatchInlineSnapshot(`856`);
   });
 });

src/apiTests/Map.test.ts

 /* eslint-env jest */
 
-import * as util from "util";
-
 import { createObjectBuffer } from "../";
@@ -10,6 +8,3 @@ import { memoryStats } from "../internal/api";
 describe("Map", () => {
-  const externalArgs = externalArgsApiToExternalArgsApi({
-    textEncoder: new util.TextEncoder(),
-    textDecoder: new util.TextDecoder(),
-  });
+  const externalArgs = externalArgsApiToExternalArgsApi({});
 
@@ -21,3 +16,3 @@ test("creation", () => {
     objectBuffer.foo = new Map([[1, "a"]]);
-    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`592`);
+    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`560`);
     expect(objectBuffer.foo).toMatchInlineSnapshot(`
@@ -36,3 +31,3 @@ Map {
     objectBuffer.foo.set("2", "b");
-    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`504`);
+    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`440`);
     expect(objectBuffer.foo).toMatchInlineSnapshot(`
@@ -60,7 +55,7 @@ Map {
     objectBuffer.foo.set("2", "b");
-    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`504`);
+    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`440`);
 
     objectBuffer.foo.delete(1);
 
-    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`592`);
+    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`544`);
 
@@ -78,9 +73,13 @@ expect(objectBuffer.foo).toMatchInlineSnapshot(`
 
-    objectBuffer.foo = new Map([[1, "a"]]);
+    objectBuffer.foo = new Map();
+    const availSizeAfterCreation = memoryStats(objectBuffer).available;
+    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`664`);
+    objectBuffer.foo.set(1, "a");
+    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`560`);
     objectBuffer.foo.set("2", "b");
-    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`504`);
+    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`440`);
 
     objectBuffer.foo.clear();
 
-    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`680`);
+    expect(memoryStats(objectBuffer).available).toBe(availSizeAfterCreation);
 
@@ -97,3 +96,3 @@ expect(objectBuffer.foo).toMatchInlineSnapshot(`Map {}`);
 
-    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`504`);
+    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`440`);
 
@@ -100,0 +99,0 @@ expect(objectBuffer.foo).toMatchInlineSnapshot(`

src/apiTests/memoryStats.test.ts

 /* eslint-env jest */
 
-import * as util from "util";
-
 import { createObjectBuffer } from "../";
@@ -11,4 +9,2 @@ import { resizeObjectBuffer, memoryStats } from "../internal/api";
   const externalArgs = externalArgsApiToExternalArgsApi({
-    textEncoder: new util.TextEncoder(),
-    textDecoder: new util.TextDecoder(),
     arrayAdditionalAllocation: 0,
@@ -25,4 +21,4 @@ });
       Object {
-        "available": 376,
-        "used": 648,
+        "available": 328,
+        "used": 696,
       }
@@ -40,4 +36,4 @@ `);
       Object {
-        "available": 1400,
-        "used": 648,
+        "available": 1352,
+        "used": 696,
       }
@@ -49,4 +45,4 @@ `);
       Object {
-        "available": 376,
-        "used": 648,
+        "available": 328,
+        "used": 696,
       }
@@ -58,4 +54,4 @@ `);
       Object {
-        "available": 120,
-        "used": 648,
+        "available": 72,
+        "used": 696,
       }
@@ -66,8 +62,8 @@ `);
     expect(memoryStats(objectBuffer)).toMatchInlineSnapshot(`
-Object {
-  "available": 1400,
-  "used": 648,
-}
-`);
+      Object {
+        "available": 1352,
+        "used": 696,
+      }
+    `);
   });
 });

src/apiTests/object.test.ts

 /* eslint-env jest */
 
-import * as util from "util";
-
 import { createObjectBuffer } from "../";
@@ -10,17 +8,15 @@ import { memoryStats } from "../internal/api";
 describe("object tests", () => {
-  const externalArgs = externalArgsApiToExternalArgsApi({
-    textEncoder: new util.TextEncoder(),
-    textDecoder: new util.TextDecoder(),
-  });
+  const externalArgs = externalArgsApiToExternalArgsApi({});
 
   test("delete object prop", () => {
     const objectBuffer = createObjectBuffer<any>(externalArgs, 1024, {});
-    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`864`);
+    const sizeBeforeSet = memoryStats(objectBuffer).available;
+    expect(sizeBeforeSet).toMatchInlineSnapshot(`864`);
 
     objectBuffer.foo = "a";
-    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`776`);
+    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`744`);
 
     delete objectBuffer.foo;
 
-    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`864`);
+    expect(memoryStats(objectBuffer).available).toBe(sizeBeforeSet);
     expect(objectBuffer).toMatchInlineSnapshot(`Object {}`);
@@ -40,3 +36,3 @@ });
     const objectBuffer = createObjectBuffer<any>(externalArgs, 2048, input);
-    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`1016`);
+    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`840`);
     expect(input).toEqual(objectBuffer);
@@ -60,2 +56,28 @@ expect(objectBuffer).toMatchInlineSnapshot(`
   });
+
+  // Not working. will make infinite loop
+  test.skip("With circular", () => {
+    const input: any = {
+      a: 1,
+      b: true,
+      c: false,
+      d: null,
+      e: undefined,
+      foo: { a: 1, b: true, c: false, d: null, e: undefined },
+    };
+
+    // Create circularity
+    input.foo.circular = input.foo;
+
+    const objectBuffer = createObjectBuffer<any>(externalArgs, 2048, input);
+    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`1016`);
+    expect(input).toEqual(objectBuffer);
+
+    expect(objectBuffer.foo.circular).toEqual(objectBuffer.foo);
+    expect(objectBuffer.foo.circular.d).toMatchInlineSnapshot();
+
+    objectBuffer.foo.circular = "severe the circularity";
+
+    expect(objectBuffer).toMatchInlineSnapshot();
+  });
 });

src/apiTests/replaceArrayBufferFlow.test.ts

 /* eslint-env jest */
 
-import * as util from "util";
-
 import { createObjectBuffer, resizeObjectBuffer } from "../";
@@ -18,4 +16,2 @@ import {
   const externalArgs = externalArgsApiToExternalArgsApi({
-    textEncoder: new util.TextEncoder(),
-    textDecoder: new util.TextDecoder(),
     arrayAdditionalAllocation: 0,
@@ -40,3 +36,3 @@ });
 
-    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`776`);
+    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`760`);
     expect(objectBuffer).toMatchInlineSnapshot(`
@@ -43,0 +39,0 @@ Object {

src/apiTests/runtime-errors.test.ts

 /* eslint-env jest */
 
-import * as util from "util";
-
 import { createObjectBuffer } from "../";
@@ -12,4 +10,2 @@ import { memoryStats } from "../internal/api";
   const externalArgs = externalArgsApiToExternalArgsApi({
-    textEncoder: new util.TextEncoder(),
-    textDecoder: new util.TextDecoder(),
     arrayAdditionalAllocation: 0,
@@ -35,3 +31,3 @@ });
     expect(memoryStats(objectBuffer).available).toEqual(freeSpaceLeft);
-    expect(freeSpaceLeft).toMatchInlineSnapshot(`40`);
+    expect(freeSpaceLeft).toMatchInlineSnapshot(`24`);
 
@@ -38,0 +34,0 @@ expect(objectBuffer).toMatchInlineSnapshot(`

src/apiTests/Set.test.ts

 /* eslint-env jest */
 
-import * as util from "util";
-
 import { createObjectBuffer } from "../";
@@ -10,6 +8,3 @@ import { memoryStats } from "../internal/api";
 describe("Set tests", () => {
-  const externalArgs = externalArgsApiToExternalArgsApi({
-    textEncoder: new util.TextEncoder(),
-    textDecoder: new util.TextDecoder(),
-  });
+  const externalArgs = externalArgsApiToExternalArgsApi({});
 
@@ -21,3 +16,3 @@ test("creation", () => {
     objectBuffer.foo = new Set(["a"]);
-    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`616`);
+    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`584`);
     expect(objectBuffer.foo).toMatchInlineSnapshot(`
@@ -36,3 +31,3 @@ Set {
     objectBuffer.foo.add("b");
-    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`552`);
+    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`504`);
     expect(objectBuffer.foo).toMatchInlineSnapshot(`
@@ -60,7 +55,7 @@ Set {
     objectBuffer.foo.add("b");
-    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`552`);
+    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`504`);
 
     objectBuffer.foo.delete(1);
 
-    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`552`);
+    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`504`);
 
@@ -81,7 +76,7 @@ expect(objectBuffer.foo).toMatchInlineSnapshot(`
     objectBuffer.foo.add("b");
-    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`552`);
+    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`504`);
 
     objectBuffer.foo.clear();
 
-    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`680`);
+    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`664`);
 
@@ -98,3 +93,3 @@ expect(objectBuffer.foo).toMatchInlineSnapshot(`Set {}`);
 
-    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`552`);
+    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`504`);
 
@@ -101,0 +96,0 @@ expect(objectBuffer.foo).toMatchInlineSnapshot(`

src/apiTests/sharedArrayBuffer.test.ts

 /* eslint-env jest */
 
-import * as util from "util";
-
 import { createObjectBuffer } from "../";
@@ -12,4 +10,2 @@ import { memoryStats, disposeWrapperObject } from "../internal/api";
   const externalArgs = externalArgsApiToExternalArgsApi({
-    textEncoder: new util.TextEncoder(),
-    textDecoder: new util.TextDecoder(),
     arrayAdditionalAllocation: 0,
@@ -26,2 +22,15 @@ });
 
+    // expect(objectBuffer).toMatchInlineSnapshot(`
+    //   Object {
+    //     "arr": Array [
+    //       Object {
+    //         "a": 1,
+    //       },
+    //     ],
+    //   }
+    // `);
+
+    // disposeWrapperObject(objectBuffer.arr[0]);
+    // disposeWrapperObject(objectBuffer.arr);
+
     objectBuffer.arr = [{ bar: 666 }];
@@ -39,3 +48,9 @@
 
-    expect(memoryStats(objectBuffer).used).toMatchInlineSnapshot(`480`);
+    expect(memoryStats(objectBuffer).used).toMatchInlineSnapshot(`528`);
+
+    disposeWrapperObject(objectBuffer.arr[0]);
+    disposeWrapperObject(objectBuffer.arr);
+
+    delete objectBuffer.arr;
+    expect(memoryStats(objectBuffer).used).toMatchInlineSnapshot(`176`);
   });
@@ -89,4 +104,4 @@
 
-    expect(memoryStats(objectBuffer).used).toMatchInlineSnapshot(`664`);
+    expect(memoryStats(objectBuffer).used).toMatchInlineSnapshot(`744`);
   });
 });

src/externalPerspectiveTests/memoryGCTest.test.ts

 /* eslint-disable */
 import { ExternalArgs } from "../internal/interfaces";
-import * as util from "util";
+
 import { createObjectBuffer } from "..";
@@ -27,6 +27,6 @@ import { memoryStats } from "../internal/api";
   const externalArgs = externalArgsApiToExternalArgsApi({
-    textEncoder: new util.TextEncoder(),
-    textDecoder: new util.TextDecoder(),
+
+
     arrayAdditionalAllocation: 0,
-    
+
   });
@@ -33,0 +33,0 @@

src/externalPerspectiveTests/memoryRollbackOnOOM.test.ts

@@ -1,2 +0,1 @@
-import * as util from "util";
 import { createObjectBuffer } from "..";
@@ -10,4 +9,2 @@ import { memoryStats } from "../internal/api";
   const externalArgs = externalArgsApiToExternalArgsApi({
-    textEncoder: new util.TextEncoder(),
-    textDecoder: new util.TextDecoder(),
     arrayAdditionalAllocation: 0,
@@ -23,3 +20,3 @@ });
 
-    expect(initialFreeSpace).toMatchInlineSnapshot(`32`);
+    expect(initialFreeSpace).toMatchInlineSnapshot(`16`);
 
@@ -34,3 +31,3 @@ expect(() => {
 
-    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`32`);
+    expect(memoryStats(objectBuffer).available).toMatchInlineSnapshot(`16`);
 
@@ -37,0 +34,0 @@ expect(objectBuffer).toMatchInlineSnapshot(`

src/externalPerspectiveTests/primitivesMemoryReuse.test.ts

@@ -1,2 +0,1 @@
-import * as util from "util";
 import { createObjectBuffer } from "..";
@@ -10,4 +9,2 @@ import { memoryStats } from "../internal/api";
   const externalArgs = externalArgsApiToExternalArgsApi({
-    textEncoder: new util.TextEncoder(),
-    textDecoder: new util.TextDecoder(),
     arrayAdditionalAllocation: 0,
@@ -14,0 +11,0 @@ });

src/index.test.ts

 /* eslint-env jest */
-import * as util from "util";
 
@@ -14,4 +13,2 @@ import {
   const externalArgs = externalArgsApiToExternalArgsApi({
-    textEncoder: new util.TextEncoder(),
-    textDecoder: new util.TextDecoder(),
     arrayAdditionalAllocation: 0,
@@ -41,4 +38,2 @@ });
   const externalArgs = externalArgsApiToExternalArgsApi({
-    textEncoder: new util.TextEncoder(),
-    textDecoder: new util.TextDecoder(),
     arrayAdditionalAllocation: 0,
@@ -63,4 +58,2 @@ });
   const externalArgs = externalArgsApiToExternalArgsApi({
-    textEncoder: new util.TextEncoder(),
-    textDecoder: new util.TextDecoder(),
     arrayAdditionalAllocation: 0,
@@ -67,0 +60,0 @@ });

src/index.ts

@@ -16,3 +16,2 @@ /**
   replaceUnderlyingArrayBuffer,
-  // eslint-disable-next-line @typescript-eslint/camelcase
   sizeOf as unreliable_sizeOf,
@@ -19,0 +18,0 @@ memoryStats,

src/internal/api.ts

 import { initializeArrayBuffer } from "./store";
-import { objectSaver } from "./objectSaver";
 import { createObjectWrapper } from "./objectWrapper";
@@ -15,2 +14,5 @@ import { ExternalArgsApi, GlobalCarrier } from "./interfaces";
 import { UnsupportedOperationError } from "./exceptions";
+import { createHeap } from "../structsGenerator/consts";
+import { saveValueIterative } from "./saveValue";
+import { allocationsTransaction } from "./allocationsTransaction";
 
@@ -43,3 +45,4 @@ export interface CreateObjectBufferOptions {
     initialValue instanceof Set ||
-    isPrimitive(initialValue)
+    isPrimitive(initialValue) ||
+    typeof initialValue === "symbol"
   ) {
@@ -68,19 +71,21 @@ throw new UnsupportedOperationError();
     bigUint64: new BigUint64Array(arrayBuffer),
+    heap: createHeap(arrayBuffer),
   };
 
-  const start = objectSaver(
-    externalArgsApiToExternalArgsApi(externalArgs),
-    carrier,
-    [],
-    initialValue
-  );
+  allocationsTransaction(() => {
+    saveValueIterative(
+      externalArgsApiToExternalArgsApi(externalArgs),
+      carrier,
+      [],
+      INITIAL_ENTRY_POINTER_TO_POINTER,
+      initialValue
+    );
+  }, allocator);
 
-  carrier.uint32[
-    INITIAL_ENTRY_POINTER_TO_POINTER / Uint32Array.BYTES_PER_ELEMENT
-  ] = start;
-
   return createObjectWrapper(
     externalArgsApiToExternalArgsApi(externalArgs),
     carrier,
-    start
+    carrier.heap.Uint32Array[
+      INITIAL_ENTRY_POINTER_TO_POINTER / Uint32Array.BYTES_PER_ELEMENT
+    ]
   );
@@ -147,2 +152,3 @@ }
     bigUint64: new BigUint64Array(arrayBuffer),
+    heap: createHeap(arrayBuffer),
   };
@@ -198,6 +204,7 @@
     bigUint64: new BigUint64Array(newArrayBuffer),
+    heap: createHeap(newArrayBuffer),
   };
 
-  // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-  // @ts-ignore
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-expect-error
   allocator.end = newArrayBuffer.byteLength;
@@ -204,0 +211,0 @@

src/internal/arrayHelpers.ts

@@ -1,20 +0,16 @@
-import {
-  readEntry,
-  writeEntry,
-  writeValueInPtrToPtrAndHandleMemory,
-} from "./store";
-import { ArrayEntry, ExternalArgs, GlobalCarrier } from "./interfaces";
+import { writeValueInPtrToPtrAndHandleMemory } from "./store";
+import { ExternalArgs, GlobalCarrier } from "./interfaces";
 import { entryToFinalJavaScriptValue } from "./entryToFinalJavaScriptValue";
 import { ENTRY_TYPE } from "./entry-types";
 import { assertNonNull } from "./assertNonNull";
+import {
+  array_length_get,
+  array_dataspacePointer_get,
+  array_allocatedLength_get,
+  array_length_set,
+  array_set_all,
+  array_refsCount_get,
+} from "./generatedStructs";
+import { Heap } from "../structsGenerator/consts";
 
-export function arrayGetMetadata(
-  carrier: GlobalCarrier,
-  pointerToArrayEntry: number
-) {
-  const arrayEntry = readEntry(carrier, pointerToArrayEntry) as ArrayEntry;
-
-  return arrayEntry;
-}
-
 export function arrayGetPointersToValueInIndex(
@@ -25,6 +21,4 @@ carrier: GlobalCarrier,
 ) {
-  const metadata = arrayGetMetadata(carrier, pointerToArrayEntry);
-
   // out of bound
-  if (indexToGet >= metadata.length) {
+  if (indexToGet >= array_length_get(carrier.heap, pointerToArrayEntry)) {
     return undefined;
@@ -34,3 +28,4 @@ }
   const pointerToThePointer =
-    metadata.value + indexToGet * Uint32Array.BYTES_PER_ELEMENT;
+    array_dataspacePointer_get(carrier.heap, pointerToArrayEntry) +
+    indexToGet * Uint32Array.BYTES_PER_ELEMENT;
 
@@ -118,8 +113,8 @@ const pointer =
 ) {
-  const metadata = arrayGetMetadata(carrier, pointerToArrayEntry);
-
-  if (wishedLength > metadata.length) {
-    if (wishedLength > metadata.allocatedLength) {
+  if (wishedLength > array_length_get(carrier.heap, pointerToArrayEntry)) {
+    if (
+      wishedLength >
+      array_allocatedLength_get(carrier.heap, pointerToArrayEntry)
+    ) {
       reallocateArray(
-        externalArgs,
         carrier,
@@ -132,9 +127,3 @@ pointerToArrayEntry,
       // no need to re-allocated, just push the length forward
-      writeEntry(carrier, pointerToArrayEntry, {
-        type: ENTRY_TYPE.ARRAY,
-        refsCount: metadata.refsCount,
-        value: metadata.value,
-        allocatedLength: metadata.allocatedLength,
-        length: wishedLength,
-      });
+      array_length_set(carrier.heap, pointerToArrayEntry, wishedLength);
     }
@@ -148,20 +137,10 @@ }
 export function shrinkArray(
-  externalArgs: ExternalArgs,
-  carrier: GlobalCarrier,
+  heap: Heap,
   pointerToArrayEntry: number,
   wishedLength: number
 ) {
-  const metadata = arrayGetMetadata(carrier, pointerToArrayEntry);
-
-  writeEntry(carrier, pointerToArrayEntry, {
-    type: ENTRY_TYPE.ARRAY,
-    refsCount: metadata.refsCount,
-    value: metadata.value,
-    allocatedLength: metadata.allocatedLength,
-    length: wishedLength,
-  });
+  array_length_set(heap, pointerToArrayEntry, wishedLength);
 }
 
 function reallocateArray(
-  externalArgs: ExternalArgs,
   carrier: GlobalCarrier,
@@ -171,30 +150,17 @@ pointerToArrayEntry: number,
   newLength: number
-) {
-  const metadata = arrayGetMetadata(carrier, pointerToArrayEntry);
-
+): void {
   const newArrayValueLocation = carrier.allocator.realloc(
-    metadata.value,
+    array_dataspacePointer_get(carrier.heap, pointerToArrayEntry),
     newAllocatedLength * Uint32Array.BYTES_PER_ELEMENT
   );
 
-  // for (
-  //   let memoryToCopyIndex = 0;
-  //   memoryToCopyIndex < metadata.length;
-  //   memoryToCopyIndex += 1
-  // ) {
-  //   carrier.dataView.setUint32(
-  //     newArrayValueLocation + memoryToCopyIndex * Uint32Array.BYTES_PER_ELEMENT,
-  //     carrier.dataView.getUint32(
-  //       metadata.value + memoryToCopyIndex * Uint32Array.BYTES_PER_ELEMENT
-  //     )
-  //   );
-  // }
-
-  writeEntry(carrier, pointerToArrayEntry, {
-    type: ENTRY_TYPE.ARRAY,
-    refsCount: metadata.refsCount,
-    value: newArrayValueLocation,
-    allocatedLength: newAllocatedLength,
-    length: newLength,
-  });
+  array_set_all(
+    carrier.heap,
+    pointerToArrayEntry,
+    ENTRY_TYPE.ARRAY,
+    array_refsCount_get(carrier.heap, pointerToArrayEntry),
+    newArrayValueLocation,
+    newLength,
+    newAllocatedLength
+  );
 }
@@ -204,12 +170,19 @@
   externalArgs: ExternalArgs,
-  globalCarrier: GlobalCarrier,
+  carrier: GlobalCarrier,
   pointerToArrayEntry: number,
   sortComparator: (a: any, b: any) => 1 | -1 | 0 = defaultCompareFunction
 ) {
-  const metadata = arrayGetMetadata(globalCarrier, pointerToArrayEntry);
-  const pointersToValues = [...new Array(metadata.length).keys()]
-    .map((index) => metadata.value + index * Uint32Array.BYTES_PER_ELEMENT)
+  const arrayDataSpace = array_dataspacePointer_get(
+    carrier.heap,
+    pointerToArrayEntry
+  );
+  const pointersToValues = [
+    ...new Array(array_length_get(carrier.heap, pointerToArrayEntry)).keys(),
+  ]
+    .map((index) => arrayDataSpace + index * Uint32Array.BYTES_PER_ELEMENT)
     .map(
       (pointerToPointer) =>
-        globalCarrier.uint32[pointerToPointer / Uint32Array.BYTES_PER_ELEMENT]
+        carrier.heap.Uint32Array[
+          pointerToPointer / Uint32Array.BYTES_PER_ELEMENT
+        ]
     );
@@ -220,3 +193,3 @@
       pointer,
-      entryToFinalJavaScriptValue(externalArgs, globalCarrier, pointer),
+      entryToFinalJavaScriptValue(externalArgs, carrier, pointer),
     ] as const;
@@ -230,4 +203,4 @@ });
   for (let i = 0; i < sortMe.length; i += 1) {
-    globalCarrier.uint32[
-      (metadata.value + i * Uint32Array.BYTES_PER_ELEMENT) /
+    carrier.heap.Uint32Array[
+      (arrayDataSpace + i * Uint32Array.BYTES_PER_ELEMENT) /
         Uint32Array.BYTES_PER_ELEMENT
@@ -276,11 +249,13 @@ ] = sortMe[i][0];
 export function arrayReverse(
-  externalArgs: ExternalArgs,
   carrier: GlobalCarrier,
   pointerToArrayEntry: number
 ) {
-  const metadata = arrayGetMetadata(carrier, pointerToArrayEntry);
+  for (
+    let i = 0;
+    i < Math.floor(array_length_get(carrier.heap, pointerToArrayEntry) / 2);
+    i += 1
+  ) {
+    const theOtherIndex =
+      array_length_get(carrier.heap, pointerToArrayEntry) - i - 1;
 
-  for (let i = 0; i < Math.floor(metadata.length / 2); i += 1) {
-    const theOtherIndex = metadata.length - i - 1;
-
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -287,0 +262,0 @@ const a = arrayGetPointersToValueInIndex(carrier, pointerToArrayEntry, i)!;

src/internal/arraySplice.test.ts

 /* eslint-env jest */
 
-import { initializeArrayBuffer } from "./store";
-import * as util from "util";
-import { createArrayWrapper } from "./arrayWrapper";
-import { arraySaver } from "./arraySaver";
-import { MemPool } from "@thi.ng/malloc";
-import { MEM_POOL_START } from "./consts";
-import { externalArgsApiToExternalArgsApi } from "./utils";
-import { makeCarrier } from "./testUtils";
+import { createObjectBuffer } from "..";
+import { memoryStats } from "./api";
 
 describe("arraySplice tests", () => {
-  const externalArgs = externalArgsApiToExternalArgsApi({
-    textEncoder: new util.TextEncoder(),
-    textDecoder: new util.TextDecoder(),
-    arrayAdditionalAllocation: 20,
-  });
-
   test("arrayWrapper splice - add + delete - array stay in same length", () => {
-    const arrayBuffer = new ArrayBuffer(512);
-    const carrier = makeCarrier(arrayBuffer);
-    initializeArrayBuffer(arrayBuffer);
-    const allocator = new MemPool({
-      buf: arrayBuffer,
-      start: MEM_POOL_START,
+    const plainJSArray: any[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+    const ob = createObjectBuffer({ arrayAdditionalAllocation: 20 }, 1024, {
+      arr: plainJSArray,
     });
 
-    const plainJSArray: any[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+    const arrayWrapper = ob.arr;
 
-    const saverOutput = arraySaver(externalArgs, carrier, [], plainJSArray);
-
-    const arrayWrapper = createArrayWrapper(
-      { ...externalArgs, arrayAdditionalAllocation: 3 },
-      carrier,
-      saverOutput
-    );
-
     const removed = arrayWrapper.splice(2, 3, "a", "b", "c");
@@ -88,25 +65,12 @@ const removedFromPlain = plainJSArray.splice(2, 3, "a", "b", "c");
     expect(removedFromPlain).toEqual([...removed]);
-
-    expect(allocator.stats().available).toMatchInlineSnapshot(`0`);
   });
 
   test("arrayWrapper splice - Just delete items from the middle", () => {
-    const arrayBuffer = new ArrayBuffer(512);
-    const carrier = makeCarrier(arrayBuffer);
-    initializeArrayBuffer(arrayBuffer);
-    const allocator = new MemPool({
-      buf: arrayBuffer,
-      start: MEM_POOL_START,
+    const plainJSArray: any[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+    const ob = createObjectBuffer({ arrayAdditionalAllocation: 20 }, 1024, {
+      arr: plainJSArray,
     });
 
-    const plainJSArray: any[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+    const arrayWrapper = ob.arr;
 
-    const saverOutput = arraySaver(externalArgs, carrier, [], plainJSArray);
-
-    const arrayWrapper = createArrayWrapper(
-      { ...externalArgs, arrayAdditionalAllocation: 3 },
-      carrier,
-      saverOutput
-    );
-
     arrayWrapper.splice(2, 3);
@@ -139,25 +103,12 @@ plainJSArray.splice(2, 3);
     expect(plainJSArray).toEqual([...arrayWrapper]);
-
-    expect(allocator.stats().available).toMatchInlineSnapshot(`72`);
   });
 
   test("arrayWrapper splice - Just add items in the middle", () => {
-    const arrayBuffer = new ArrayBuffer(512);
-    const carrier = makeCarrier(arrayBuffer);
-    initializeArrayBuffer(arrayBuffer);
-    const allocator = new MemPool({
-      buf: arrayBuffer,
-      start: MEM_POOL_START,
+    const plainJSArray: any[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+    const ob = createObjectBuffer({ arrayAdditionalAllocation: 20 }, 1024, {
+      arr: plainJSArray,
     });
 
-    const plainJSArray: any[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+    const arrayWrapper = ob.arr;
 
-    const saverOutput = arraySaver(externalArgs, carrier, [], plainJSArray);
-
-    const arrayWrapper = createArrayWrapper(
-      { ...externalArgs, arrayAdditionalAllocation: 3 },
-      carrier,
-      saverOutput
-    );
-
     arrayWrapper.splice(4, 0, "a", "b");
@@ -200,26 +151,12 @@ plainJSArray.splice(4, 0, "a", "b");
     expect(plainJSArray).toEqual([...arrayWrapper]);
-    expect(allocator.stats().available).toMatchInlineSnapshot(`24`);
   });
 
   test("arrayWrapper splice - add + delete - array will get longer", () => {
-    const arrayBuffer = new ArrayBuffer(1024);
-    const carrier = makeCarrier(arrayBuffer);
-    initializeArrayBuffer(arrayBuffer);
-    const allocator = new MemPool({
-      buf: arrayBuffer,
-      start: MEM_POOL_START,
+    const plainJSArray: any[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+    const ob = createObjectBuffer({ arrayAdditionalAllocation: 3 }, 1024, {
+      arr: plainJSArray,
     });
 
-    const plainJSArray: any[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+    const arrayWrapper = ob.arr;
 
-    const saverOutput = arraySaver(externalArgs, carrier, [], plainJSArray);
-
-    const arrayWrapper = createArrayWrapper(
-      { ...externalArgs, arrayAdditionalAllocation: 3 },
-      carrier,
-      saverOutput
-    );
-
-    const availableCheckpoint = allocator.stats().available;
-
     const removed = arrayWrapper.splice(2, 2, "a", "b", "c", "d");
@@ -279,29 +216,14 @@ const removedFromPlain = plainJSArray.splice(2, 2, "a", "b", "c", "d");
     expect(removedFromPlain).toEqual([...removed]);
-
-    expect(
-      availableCheckpoint - allocator.stats().available
-    ).toMatchInlineSnapshot(`96`);
   });
 
   test("arrayWrapper splice - add + delete - array will get shorter", () => {
-    const arrayBuffer = new ArrayBuffer(1024);
-    const carrier = makeCarrier(arrayBuffer);
-    initializeArrayBuffer(arrayBuffer);
-    const allocator = new MemPool({
-      buf: arrayBuffer,
-      start: MEM_POOL_START,
+    const plainJSArray: any[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+    const ob = createObjectBuffer({ arrayAdditionalAllocation: 20 }, 1024, {
+      arr: plainJSArray,
     });
 
-    const plainJSArray: any[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+    const availableCheckpoint = memoryStats(ob).available;
 
-    const saverOutput = arraySaver(externalArgs, carrier, [], plainJSArray);
+    const arrayWrapper = ob.arr;
 
-    const arrayWrapper = createArrayWrapper(
-      { ...externalArgs, arrayAdditionalAllocation: 3 },
-      carrier,
-      saverOutput
-    );
-
-    const availableCheckpoint = allocator.stats().available;
-
     const removed = arrayWrapper.splice(2, 6, "a", "b", "c", "d");
@@ -364,3 +286,3 @@ const removedFromPlain = plainJSArray.splice(2, 6, "a", "b", "c", "d");
     expect(
-      availableCheckpoint - allocator.stats().available
+      availableCheckpoint - memoryStats(ob).available
     ).toMatchInlineSnapshot(`96`);
@@ -370,20 +292,9 @@ });
   test("arrayWrapper splice - start bigger than array", () => {
-    const arrayBuffer = new ArrayBuffer(512);
-    const carrier = makeCarrier(arrayBuffer);
-    initializeArrayBuffer(arrayBuffer);
-    const allocator = new MemPool({
-      buf: arrayBuffer,
-      start: MEM_POOL_START,
+    const plainJSArray: any[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+    const ob = createObjectBuffer({ arrayAdditionalAllocation: 20 }, 1024, {
+      arr: plainJSArray,
     });
 
-    const plainJSArray: any[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+    const arrayWrapper = ob.arr;
 
-    const saverOutput = arraySaver(externalArgs, carrier, [], plainJSArray);
-
-    const arrayWrapper = createArrayWrapper(
-      { ...externalArgs, arrayAdditionalAllocation: 3 },
-      carrier,
-      saverOutput
-    );
-
     const removed = arrayWrapper.splice(12, 3, "a", "b");
@@ -434,25 +345,12 @@ const removedFromPlain = plainJSArray.splice(12, 3, "a", "b");
     expect(removedFromPlain).toEqual([...removed]);
-
-    expect(allocator.stats().available).toMatchInlineSnapshot(`24`);
   });
 
   test("arrayWrapper splice - delete bigger than array", () => {
-    const arrayBuffer = new ArrayBuffer(512);
-    const carrier = makeCarrier(arrayBuffer);
-    initializeArrayBuffer(arrayBuffer);
-    const allocator = new MemPool({
-      buf: arrayBuffer,
-      start: MEM_POOL_START,
+    const plainJSArray: any[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+    const ob = createObjectBuffer({ arrayAdditionalAllocation: 20 }, 1024, {
+      arr: plainJSArray,
     });
 
-    const plainJSArray: any[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+    const arrayWrapper = ob.arr;
 
-    const saverOutput = arraySaver(externalArgs, carrier, [], plainJSArray);
-
-    const arrayWrapper = createArrayWrapper(
-      { ...externalArgs, arrayAdditionalAllocation: 3 },
-      carrier,
-      saverOutput
-    );
-
     const removed = arrayWrapper.splice(2, 20, "a", "b");
@@ -509,25 +407,12 @@ const removedFromPlain = plainJSArray.splice(2, 20, "a", "b");
     expect(removedFromPlain).toEqual([...removed]);
-
-    expect(allocator.stats().available).toMatchInlineSnapshot(`24`);
   });
 
   test("arrayWrapper splice - negative start", () => {
-    const arrayBuffer = new ArrayBuffer(512);
-    const carrier = makeCarrier(arrayBuffer);
-    initializeArrayBuffer(arrayBuffer);
-    const allocator = new MemPool({
-      buf: arrayBuffer,
-      start: MEM_POOL_START,
+    const plainJSArray: any[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+    const ob = createObjectBuffer({ arrayAdditionalAllocation: 20 }, 1024, {
+      arr: plainJSArray,
     });
 
-    const plainJSArray: any[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+    const arrayWrapper = ob.arr;
 
-    const saverOutput = arraySaver(externalArgs, carrier, [], plainJSArray);
-
-    const arrayWrapper = createArrayWrapper(
-      { ...externalArgs, arrayAdditionalAllocation: 3 },
-      carrier,
-      saverOutput
-    );
-
     const removed = arrayWrapper.splice(-4, 1, "a", "b");
@@ -584,25 +469,12 @@ const removedFromPlain = plainJSArray.splice(-4, 1, "a", "b");
     expect(removedFromPlain).toEqual([...removed]);
-
-    expect(allocator.stats().available).toMatchInlineSnapshot(`24`);
   });
 
   test("arrayWrapper splice - negative delete", () => {
-    const arrayBuffer = new ArrayBuffer(512);
-    const carrier = makeCarrier(arrayBuffer);
-    initializeArrayBuffer(arrayBuffer);
-    const allocator = new MemPool({
-      buf: arrayBuffer,
-      start: MEM_POOL_START,
+    const plainJSArray: any[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+    const ob = createObjectBuffer({ arrayAdditionalAllocation: 3 }, 1024, {
+      arr: plainJSArray,
     });
 
-    const plainJSArray = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+    const arrayWrapper = ob.arr;
 
-    const saverOutput = arraySaver(externalArgs, carrier, [], plainJSArray);
-
-    const arrayWrapper = createArrayWrapper(
-      { ...externalArgs, arrayAdditionalAllocation: 3 },
-      carrier,
-      saverOutput
-    );
-
     const removed = arrayWrapper.splice(4, -1, 50, 51);
@@ -653,5 +525,3 @@ const removedFromPlain = plainJSArray.splice(4, -1, 50, 51);
     expect(removedFromPlain).toEqual([...removed]);
-
-    expect(allocator.stats().available).toMatchInlineSnapshot(`24`);
   });
 });

src/internal/arraySplice.ts

 import {
-  arrayGetMetadata,
   getFinalValueAtArrayIndex,
@@ -11,3 +10,4 @@ shrinkArray,
 import { ExternalArgs, GlobalCarrier } from "./interfaces";
-import { writeValueInPtrToPtr } from "./store";
+import { writeValueInPtrToPtr, handleArcForDeletedValuePointer } from "./store";
+import { array_length_get } from "./generatedStructs";
 
@@ -17,3 +17,3 @@ // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/splice#Syntax
   externalArgs: ExternalArgs,
-  globalCarrier: GlobalCarrier,
+  carrier: GlobalCarrier,
   pointerToArrayEntry: number,
@@ -24,8 +24,8 @@ startArg: number,
 ) {
-  const metadata = arrayGetMetadata(globalCarrier, pointerToArrayEntry);
+  const arrayLength = array_length_get(carrier.heap, pointerToArrayEntry);
 
-  const calcedStart = calculateSpliceStart(metadata.length, startArg);
+  const calcedStart = calculateSpliceStart(arrayLength, startArg);
 
   const calcedDeleteCount = calculateDeleteCount(
-    metadata.length,
+    arrayLength,
     calcedStart,
@@ -35,14 +35,9 @@ deleteCountArg
 
-  const newLength = metadata.length + itemsToAddArg.length - calcedDeleteCount;
+  const newLength = arrayLength + itemsToAddArg.length - calcedDeleteCount;
 
-  extendArrayIfNeeded(
-    externalArgs,
-    globalCarrier,
-    pointerToArrayEntry,
-    newLength
-  );
+  extendArrayIfNeeded(externalArgs, carrier, pointerToArrayEntry, newLength);
 
   const deletedItemsToReturn = [];
   // can be negative
-  const itemCountChange = newLength - metadata.length;
+  const itemCountChange = newLength - arrayLength;
 
@@ -57,3 +52,3 @@ for (
         externalArgs,
-        globalCarrier,
+        carrier,
         pointerToArrayEntry,
@@ -78,3 +73,3 @@ deletedItemIndexToSave
       const valueToCopyPointers = arrayGetPointersToValueInIndex(
-        globalCarrier,
+        carrier,
         pointerToArrayEntry,
@@ -87,3 +82,3 @@ writeValueToIndex - itemCountChange
       setValuePointerAtArrayIndex(
-        globalCarrier,
+        carrier,
         pointerToArrayEntry,
@@ -94,3 +89,3 @@ writeValueToIndex,
 
-      globalCarrier.uint32[
+      carrier.heap.Uint32Array[
         valueToCopyPointers.pointerToThePointer / Uint32Array.BYTES_PER_ELEMENT
@@ -109,15 +104,16 @@ ] = 0;
       let writeValueToIndex = calcedStart + itemsToAddArg.length;
-      writeValueToIndex < metadata.length + itemCountChange;
+      writeValueToIndex < arrayLength + itemCountChange;
       writeValueToIndex += 1
     ) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       const valueToCopyPointers = arrayGetPointersToValueInIndex(
-        globalCarrier,
+        carrier,
         pointerToArrayEntry,
         writeValueToIndex - itemCountChange
-      );
+      )!;
 
-      assertNonNull(valueToCopyPointers);
+      // assertNonNull(valueToCopyPointers);
 
       setValuePointerAtArrayIndex(
-        globalCarrier,
+        carrier,
         pointerToArrayEntry,
@@ -129,7 +125,5 @@ writeValueToIndex,
       // empty old array index, its still allocated!
+      // handleArcForDeletedValuePointer(carrier, valueToCopyPointers.pointer);
+      carrier.heap.Uint32Array[valueToCopyPointers.pointer] = 0;
 
-      globalCarrier.uint32[
-        valueToCopyPointers.pointerToThePointer / Uint32Array.BYTES_PER_ELEMENT
-      ] = 0;
-
       // using that is wastefull
@@ -150,3 +144,3 @@ // setValueAtArrayIndex(
     const valueToSetPointers = arrayGetPointersToValueInIndex(
-      globalCarrier,
+      carrier,
       pointerToArrayEntry,
@@ -160,3 +154,3 @@ calcedStart + i
       externalArgs,
-      globalCarrier,
+      carrier,
       valueToSetPointers.pointerToThePointer,
@@ -167,4 +161,4 @@ itemsToAddArg[i]
 
-  if (newLength < metadata.length) {
-    shrinkArray(externalArgs, globalCarrier, pointerToArrayEntry, newLength);
+  if (newLength < arrayLength) {
+    shrinkArray(carrier.heap, pointerToArrayEntry, newLength);
   }
@@ -171,0 +165,0 @@

src/internal/arrayWrapper.test.ts

 /* eslint-env jest */
 
-import { initializeArrayBuffer } from "./store";
-import * as util from "util";
-import { createArrayWrapper } from "./arrayWrapper";
-import { arraySaver } from "./arraySaver";
-import { MemPool } from "@thi.ng/malloc";
-import { MEM_POOL_START } from "./consts";
-import { externalArgsApiToExternalArgsApi } from "./utils";
-import { makeCarrier } from "./testUtils";
+import { createObjectBuffer, memoryStats } from "./api";
 
 describe("arrayWrapper tests", () => {
-  const externalArgs = externalArgsApiToExternalArgsApi({
-    textEncoder: new util.TextEncoder(),
-    textDecoder: new util.TextDecoder(),
-    arrayAdditionalAllocation: 20,
-  });
-
   describe("arrayWrapper - general", () => {
     test("arrayWrapper class 1", () => {
-      const arrayBuffer = new ArrayBuffer(512);
-      const carrier = makeCarrier(arrayBuffer);
-      initializeArrayBuffer(arrayBuffer);
-      const allocator = new MemPool({
-        buf: arrayBuffer,
-        start: MEM_POOL_START,
-      });
-
       const arrayToSave = ["a", "b", 1];
 
-      const saverOutput = arraySaver(externalArgs, carrier, [], arrayToSave);
+      const arrayWrapper = createObjectBuffer(
+        { arrayAdditionalAllocation: 20 },
+        512,
+        { arrayToSave }
+      ).arrayToSave;
 
-      const arrayWrapper: any = createArrayWrapper(
-        externalArgs,
-        carrier,
-        saverOutput
-      );
-
       expect(arrayWrapper).toMatchInlineSnapshot(`
@@ -47,46 +24,28 @@ Array [
 
-      expect(allocator.stats().available).toMatchInlineSnapshot(`264`);
+      expect(memoryStats(arrayWrapper).available).toMatchInlineSnapshot(`24`);
     });
 
     test("arrayWrapper array.keys()", () => {
-      const arrayBuffer = new ArrayBuffer(512);
-      const carrier = makeCarrier(arrayBuffer);
-      initializeArrayBuffer(arrayBuffer);
-      const allocator = new MemPool({
-        buf: arrayBuffer,
-        start: MEM_POOL_START,
-      });
       const arrayToSave = ["a", "b", 1];
 
-      const saverOutput = arraySaver(externalArgs, carrier, [], arrayToSave);
+      const arrayWrapper = createObjectBuffer(
+        { arrayAdditionalAllocation: 20 },
+        512,
+        { arrayToSave }
+      ).arrayToSave;
 
-      const arrayWrapper = createArrayWrapper(
-        externalArgs,
-        carrier,
-        saverOutput
-      );
-
       expect([...arrayWrapper.keys()]).toEqual([0, 1, 2]);
 
-      expect(allocator.stats().available).toMatchInlineSnapshot(`264`);
+      expect(memoryStats(arrayWrapper).available).toMatchInlineSnapshot(`24`);
     });
 
     test("arrayWrapper array.entries()", () => {
-      const arrayBuffer = new ArrayBuffer(512);
-      const carrier = makeCarrier(arrayBuffer);
-      initializeArrayBuffer(arrayBuffer);
-      const allocator = new MemPool({
-        buf: arrayBuffer,
-        start: MEM_POOL_START,
-      });
       const arrayToSave = ["a", "b", 1];
 
-      const saverOutput = arraySaver(externalArgs, carrier, [], arrayToSave);
+      const arrayWrapper = createObjectBuffer(
+        { arrayAdditionalAllocation: 20 },
+        512,
+        { arrayToSave }
+      ).arrayToSave;
 
-      const arrayWrapper = createArrayWrapper(
-        externalArgs,
-        carrier,
-        saverOutput
-      );
-
       expect([...arrayWrapper.entries()]).toMatchInlineSnapshot(`
@@ -109,23 +68,14 @@ Array [
 
-      expect(allocator.stats().available).toMatchInlineSnapshot(`264`);
+      expect(memoryStats(arrayWrapper).available).toMatchInlineSnapshot(`24`);
     });
 
     test("arrayWrapper array.values() & iterator", () => {
-      const arrayBuffer = new ArrayBuffer(512);
-      const carrier = makeCarrier(arrayBuffer);
-      initializeArrayBuffer(arrayBuffer);
-      const allocator = new MemPool({
-        buf: arrayBuffer,
-        start: MEM_POOL_START,
-      });
       const arrayToSave = ["a", "b", 1];
 
-      const saverOutput = arraySaver(externalArgs, carrier, [], arrayToSave);
+      const arrayWrapper = createObjectBuffer(
+        { arrayAdditionalAllocation: 20 },
+        512,
+        { arrayToSave }
+      ).arrayToSave;
 
-      const arrayWrapper = createArrayWrapper(
-        externalArgs,
-        carrier,
-        saverOutput
-      );
-
       expect([...arrayWrapper.values()]).toMatchInlineSnapshot(`
@@ -146,19 +96,14 @@ Array [
 
-      expect(allocator.stats().available).toMatchInlineSnapshot(`264`);
+      expect(memoryStats(arrayWrapper).available).toMatchInlineSnapshot(`24`);
     });
 
     test("arrayWrapper set value in bound", () => {
-      const arrayBuffer = new ArrayBuffer(512);
-      const carrier = makeCarrier(arrayBuffer);
-      initializeArrayBuffer(arrayBuffer);
       const arrayToSave = ["a", "b", 1];
 
-      const saverOutput = arraySaver(externalArgs, carrier, [], arrayToSave);
+      const arrayWrapper = createObjectBuffer(
+        { arrayAdditionalAllocation: 20 },
+        1024,
+        { arrayToSave }
+      ).arrayToSave;
 
-      const arrayWrapper: any = createArrayWrapper(
-        externalArgs,
-        carrier,
-        saverOutput
-      );
-
       arrayWrapper[1] = "new value";
@@ -176,20 +121,10 @@
     test("arrayWrapper set value out of bound, but inside allocated space", () => {
-      const arrayBuffer = new ArrayBuffer(512);
-      const carrier = makeCarrier(arrayBuffer);
-      initializeArrayBuffer(arrayBuffer);
       const arrayToSave = ["a", "b", 1];
 
-      const saverOutput = arraySaver(
-        { ...externalArgs, arrayAdditionalAllocation: 15 },
-        carrier,
-        [],
-        arrayToSave
-      );
+      const arrayWrapper = createObjectBuffer(
+        { arrayAdditionalAllocation: 15 },
+        512,
+        { arrayToSave }
+      ).arrayToSave;
 
-      const arrayWrapper: any = createArrayWrapper(
-        { ...externalArgs, arrayAdditionalAllocation: 15 },
-        carrier,
-        saverOutput
-      );
-
       arrayWrapper[10] = "new value";
@@ -215,19 +150,10 @@
     test("arrayWrapper set value out of bound, but outside allocated space", () => {
-      const arrayBuffer = new ArrayBuffer(512);
-      const carrier = makeCarrier(arrayBuffer);
-      initializeArrayBuffer(arrayBuffer);
-      const allocator = new MemPool({
-        buf: arrayBuffer,
-        start: MEM_POOL_START,
-      });
       const arrayToSave = ["a", "b", 1];
 
-      const saverOutput = arraySaver(externalArgs, carrier, [], arrayToSave);
+      const arrayWrapper = createObjectBuffer(
+        { arrayAdditionalAllocation: 3 },
+        1024,
+        { arrayToSave }
+      ).arrayToSave;
 
-      const arrayWrapper: any = createArrayWrapper(
-        { ...externalArgs, arrayAdditionalAllocation: 3 },
-        carrier,
-        saverOutput
-      );
-
       arrayWrapper[10] = "new value";
@@ -250,3 +176,3 @@
       `);
-      expect(allocator.stats().available).toMatchInlineSnapshot(`232`);
+      expect(memoryStats(arrayWrapper).available).toMatchInlineSnapshot(`496`);
     });
@@ -256,20 +182,10 @@ });
   test("arrayWrapper sort - no comparator", () => {
-    const arrayBuffer = new ArrayBuffer(512);
-    const carrier = makeCarrier(arrayBuffer);
-    initializeArrayBuffer(arrayBuffer);
-    const allocator = new MemPool({
-      buf: arrayBuffer,
-      start: MEM_POOL_START,
-    });
-
     const arrayToSave = [2, 1, null, 3, 10, undefined, 6, 77];
 
-    const saverOutput = arraySaver(externalArgs, carrier, [], arrayToSave);
+    const arrayWrapper = createObjectBuffer(
+      { arrayAdditionalAllocation: 3 },
+      512,
+      { arrayToSave }
+    ).arrayToSave;
 
-    const arrayWrapper = createArrayWrapper(
-      { ...externalArgs, arrayAdditionalAllocation: 3 },
-      carrier,
-      saverOutput
-    );
-
     arrayWrapper.sort();
@@ -290,14 +206,6 @@
 
-    expect(allocator.stats().available).toMatchInlineSnapshot(`176`);
+    expect(memoryStats(arrayWrapper).available).toMatchInlineSnapshot(`32`);
   });
 
   test("arrayWrapper sort - with comparator", () => {
-    const arrayBuffer = new ArrayBuffer(2048);
-    const carrier = makeCarrier(arrayBuffer);
-    initializeArrayBuffer(arrayBuffer);
-    const allocator = new MemPool({
-      buf: arrayBuffer,
-      start: MEM_POOL_START,
-    });
-
     const arrayToSave = [2, 1, 3, 10, 6, 77].map((value) => ({
@@ -307,10 +215,8 @@ value,
 
-    const saverOutput = arraySaver(externalArgs, carrier, [], arrayToSave);
+    const arrayWrapper = createObjectBuffer(
+      { arrayAdditionalAllocation: 3 },
+      1024 * 2,
+      { arrayToSave }
+    ).arrayToSave;
 
-    const arrayWrapper = createArrayWrapper(
-      { ...externalArgs, arrayAdditionalAllocation: 3 },
-      carrier,
-      saverOutput
-    );
-
     arrayWrapper.sort((a, b) => {
@@ -349,24 +255,14 @@ if (a.value > b.value) {
 
-    expect(allocator.stats().available).toMatchInlineSnapshot(`568`);
+    expect(memoryStats(arrayWrapper).available).toMatchInlineSnapshot(`376`);
   });
 
   test("arrayWrapper - reverse", () => {
-    const arrayBuffer = new ArrayBuffer(512);
-    const carrier = makeCarrier(arrayBuffer);
-    initializeArrayBuffer(arrayBuffer);
-    const allocator = new MemPool({
-      buf: arrayBuffer,
-      start: MEM_POOL_START,
-    });
-
     const arrayToSave = [1, 2, 3, 4, 5, 6, 7];
 
-    const saverOutput = arraySaver(externalArgs, carrier, [], arrayToSave);
+    const arrayWrapper = createObjectBuffer(
+      { arrayAdditionalAllocation: 3 },
+      512,
+      { arrayToSave }
+    ).arrayToSave;
 
-    const arrayWrapper = createArrayWrapper(
-      { ...externalArgs, arrayAdditionalAllocation: 3 },
-      carrier,
-      saverOutput
-    );
-
     arrayWrapper.reverse();
@@ -390,24 +286,14 @@ arrayWrapper.reverse();
 
-    expect(allocator.stats().available).toMatchInlineSnapshot(`152`);
+    expect(memoryStats(arrayWrapper).available).toMatchInlineSnapshot(`16`);
   });
 
   test("arrayWrapper - set length", () => {
-    const arrayBuffer = new ArrayBuffer(512);
-    const carrier = makeCarrier(arrayBuffer);
-    initializeArrayBuffer(arrayBuffer);
-    const allocator = new MemPool({
-      buf: arrayBuffer,
-      start: MEM_POOL_START,
-    });
-
     const arrayToSave = [1, 2, 3, 4, 5, 6, 7];
 
-    const saverOutput = arraySaver(externalArgs, carrier, [], arrayToSave);
+    const arrayWrapper = createObjectBuffer(
+      { arrayAdditionalAllocation: 3 },
+      512,
+      { arrayToSave }
+    ).arrayToSave;
 
-    const arrayWrapper = createArrayWrapper(
-      { ...externalArgs, arrayAdditionalAllocation: 3 },
-      carrier,
-      saverOutput
-    );
-
     arrayWrapper.length = 10;
@@ -448,4 +334,4 @@ expect(arrayWrapper).toMatchInlineSnapshot(`
 
-    expect(allocator.stats().available).toMatchInlineSnapshot(`152`);
+    expect(memoryStats(arrayWrapper).available).toMatchInlineSnapshot(`16`);
   });
 });

src/internal/arrayWrapper.ts

 import {
   getFinalValueAtArrayIndex,
-  arrayGetMetadata,
   setValueAtArrayIndex,
@@ -11,3 +10,3 @@ arraySort,
 import { arraySplice } from "./arraySplice";
-import { ExternalArgs, GlobalCarrier, ArrayEntry } from "./interfaces";
+import { ExternalArgs, GlobalCarrier } from "./interfaces";
 import {
@@ -19,6 +18,7 @@ IllegalArrayIndexError,
 import { BaseProxyTrap } from "./BaseProxyTrap";
+import { array_length_get } from "./generatedStructs";
 
-export class ArrayWrapper extends BaseProxyTrap<ArrayEntry>
-  implements ProxyHandler<{}> {
-  public get(target: {}, p: PropertyKey): any {
+export class ArrayWrapper extends BaseProxyTrap
+  implements ProxyHandler<Record<string, unknown>> {
+  public get(target: Record<string, unknown>, p: PropertyKey): any {
     if (p === INTERNAL_API_SYMBOL) {
@@ -29,4 +29,4 @@ return this;
     if (p in this && p !== "constructor") {
-      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-      // @ts-ignore
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-expect-error
       return this[p];
@@ -36,3 +36,3 @@ }
     if (p === "length") {
-      return arrayGetMetadata(this.carrier, this.entryPointer).length;
+      return array_length_get(this.carrier.heap, this.entryPointer);
     }
@@ -53,8 +53,11 @@
 
-    // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-    // @ts-ignore
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-expect-error
     return target[p];
   }
 
-  public deleteProperty(target: {}, p: PropertyKey): boolean {
+  public deleteProperty(
+    target: Record<string, unknown>,
+    p: PropertyKey
+  ): boolean {
     const index = typeof p === "number" ? p : Number.parseInt(p as string, 10);
@@ -70,3 +73,3 @@
   public ownKeys(): PropertyKey[] {
-    const length = arrayGetMetadata(this.carrier, this.entryPointer).length;
+    const length = array_length_get(this.carrier.heap, this.entryPointer);
 
@@ -76,3 +79,3 @@ return [...new Array(length).keys(), "length"];
 
-  public getOwnPropertyDescriptor(target: {}, prop: any) {
+  public getOwnPropertyDescriptor(target: Record<string, unknown>, prop: any) {
     if (prop === "length") {
@@ -89,3 +92,3 @@ return { configurable: false, enumerable: false, writable: true };
 
-  public has(target: {}, p: PropertyKey): boolean {
+  public has(target: Record<string, unknown>, p: PropertyKey): boolean {
     if (p === INTERNAL_API_SYMBOL) {
@@ -95,3 +98,3 @@ return true;
 
-    const length = arrayGetMetadata(this.carrier, this.entryPointer).length;
+    const length = array_length_get(this.carrier.heap, this.entryPointer);
 
@@ -107,3 +110,7 @@ if (typeof p === "number") {
 
-  public set(target: {}, accessedProp: PropertyKey, value: any): boolean {
+  public set(
+    target: Record<string, unknown>,
+    accessedProp: PropertyKey,
+    value: any
+  ): boolean {
     if (typeof accessedProp === "symbol") {
@@ -118,4 +125,6 @@ throw new IllegalArrayIndexError();
 
-      const currentLength = arrayGetMetadata(this.carrier, this.entryPointer)
-        .length;
+      const currentLength = array_length_get(
+        this.carrier.heap,
+        this.entryPointer
+      );
 
@@ -187,3 +196,3 @@ if (currentLength === value) {
 
-      length = arrayGetMetadata(this.carrier, this.entryPointer).length;
+      length = array_length_get(this.carrier.heap, this.entryPointer);
     } while (index < length);
@@ -201,3 +210,3 @@ }
 
-      length = arrayGetMetadata(this.carrier, this.entryPointer).length;
+      length = array_length_get(this.carrier.heap, this.entryPointer);
     } while (index < length);
@@ -220,3 +229,3 @@ }
 
-      length = arrayGetMetadata(this.carrier, this.entryPointer).length;
+      length = array_length_get(this.carrier.heap, this.entryPointer);
     } while (index < length);
@@ -245,3 +254,3 @@ }
   public reverse() {
-    arrayReverse(this.externalArgs, this.carrier, this.entryPointer);
+    arrayReverse(this.carrier, this.entryPointer);
     return this;
@@ -263,3 +272,3 @@ }
 
-    return arrayGetMetadata(this.carrier, this.entryPointer).length;
+    return array_length_get(this.carrier.heap, this.entryPointer);
   }
@@ -287,3 +296,3 @@
 
-  public defineProperty(): // target: {},
+  public defineProperty(): // target: Record<string, unknown>,
   // p: PropertyKey,
@@ -312,2 +321,4 @@ // attributes: PropertyDescriptor
   return new Proxy(
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-expect-error
     [],
@@ -314,0 +325,0 @@ new ArrayWrapper(externalArgs, globalCarrier, entryPointer)

src/internal/BaseProxyTrap.ts

@@ -1,17 +0,6 @@
-import {
-  ExternalArgs,
-  GlobalCarrier,
-  InternalAPI,
-  DateEntry,
-  ArrayEntry,
-  ObjectEntry,
-  MapEntry,
-  SetEntry,
-} from "./interfaces";
-import { incrementRefCount, decrementRefCount, readEntry } from "./store";
+import { ExternalArgs, GlobalCarrier, InternalAPI } from "./interfaces";
+import { incrementRefCount, decrementRefCount } from "./store";
 import { WrapperDestroyed } from "./exceptions";
 
-export class BaseProxyTrap<
-  T extends ObjectEntry | DateEntry | ArrayEntry | MapEntry | SetEntry
-> implements InternalAPI {
+export abstract class BaseProxyTrap implements InternalAPI {
   constructor(
@@ -22,11 +11,7 @@ protected externalArgs: ExternalArgs,
   ) {
-    incrementRefCount(this.externalArgs, this.carrier, this.entryPointer);
+    incrementRefCount(this.carrier.heap, this.entryPointer);
   }
 
   public destroy() {
-    const newRefCount = decrementRefCount(
-      this.externalArgs,
-      this.carrier,
-      this.entryPointer
-    );
+    const newRefCount = decrementRefCount(this.carrier.heap, this.entryPointer);
     this._entryPointer = 0;
@@ -60,6 +45,2 @@
   }
-
-  protected get entry(): T {
-    return readEntry(this.carrier, this.entryPointer) as T;
-  }
 }

src/internal/consts.ts

@@ -15,1 +15,2 @@ export const LOCK_OFFSET = 0;
 export const FALSE_KNOWN_ADDRESS = 3;
+export const MAX_64_BIG_INT = BigInt("0xFFFFFFFFFFFFFFFF");

src/internal/dateWrapper.ts

@@ -1,4 +0,3 @@
-import { ExternalArgs, GlobalCarrier, DateEntry } from "./interfaces";
+import { ExternalArgs, GlobalCarrier } from "./interfaces";
 
-import { readEntry, writeEntry } from "./store";
 import { ENTRY_TYPE } from "./entry-types";
@@ -8,2 +7,7 @@ import { INTERNAL_API_SYMBOL } from "./symbols";
 import { BaseProxyTrap } from "./BaseProxyTrap";
+import {
+  date_set_all,
+  date_refsCount_get,
+  date_timestamp_get,
+} from "./generatedStructs";
 
@@ -62,4 +66,3 @@ const getFunctions: Array<keyof Date> = [
 
-export class DateWrapper extends BaseProxyTrap<DateEntry>
-  implements ProxyHandler<Date> {
+export class DateWrapper extends BaseProxyTrap implements ProxyHandler<Date> {
   private dateObjectForReuse: Date;
@@ -109,13 +112,17 @@ private useMeToGiveNamesToFunctionsAndCacheThem: any;
   private updateDateObjectForReuse() {
-    const entry = readEntry(this.carrier, this.entryPointer) as DateEntry;
-
-    this.dateObjectForReuse.setTime(entry.value);
+    this.dateObjectForReuse.setTime(
+      date_timestamp_get(this.carrier.heap, this.entryPointer)
+    );
   }
 
   private persistDateObject() {
-    writeEntry(this.carrier, this.entryPointer, {
-      type: ENTRY_TYPE.DATE,
-      refsCount: this.entry.refsCount,
-      value: this.dateObjectForReuse.getTime(),
-    });
+    date_set_all(
+      this.carrier.heap,
+      this.entryPointer,
+      ENTRY_TYPE.DATE,
+      date_refsCount_get(this.carrier.heap, this.entryPointer),
+      // padding
+      0,
+      this.dateObjectForReuse.getTime()
+    );
   }
@@ -122,0 +129,0 @@

src/internal/defensiveErrors.test.ts

@@ -1,2 +0,1 @@
-import * as util from "util";
 import { createObjectBuffer } from "..";
@@ -9,4 +8,2 @@ import { externalArgsApiToExternalArgsApi } from "./utils";
   const externalArgs = externalArgsApiToExternalArgsApi({
-    textEncoder: new util.TextEncoder(),
-    textDecoder: new util.TextDecoder(),
     arrayAdditionalAllocation: 20,
@@ -13,0 +10,0 @@ });

src/internal/disposeWrapperObject.ts

@@ -25,12 +25,10 @@ import { getInternalAPI } from "./utils";
 
+    const { allocator, heap } = internalApi.getCarrier();
+
     for (const address of addressesToFree.leafAddresses) {
-      internalApi.getCarrier().allocator.free(address);
+      allocator.free(address);
     }
 
     for (const address of addressesToFree.arcAddresses) {
-      decrementRefCount(
-        internalApi.getExternalArgs(),
-        internalApi.getCarrier(),
-        address
-      );
+      decrementRefCount(heap, address);
     }
@@ -37,0 +35,0 @@

src/internal/entryToFinalJavaScriptValue.ts

 import { ExternalArgs, GlobalCarrier } from "./interfaces";
-import { ENTRY_TYPE, isPrimitiveEntryType } from "./entry-types";
+import { ENTRY_TYPE } from "./entry-types";
 import { createObjectWrapper } from "./objectWrapper";
@@ -7,3 +7,3 @@ import { createArrayWrapper } from "./arrayWrapper";
 import { getCacheFor } from "./externalObjectsCache";
-import { decrementRefCount, readEntry } from "./store";
+import { decrementRefCount } from "./store";
 import { getAllLinkedAddresses } from "./getAllLinkedAddresses";
@@ -18,6 +18,9 @@ import { createMapWrapper } from "./mapWrapper";
 } from "./consts";
+import {
+  typeOnly_type_get,
+  number_value_get,
+  bigint_value_get,
+} from "./generatedStructs";
+import { readString } from "./readString";
 
-// declare const FinalizationGroup: any;
-// declare const WeakRef: any;
-
 const TYPE_TO_FACTORY = {
@@ -52,44 +55,53 @@ [ENTRY_TYPE.OBJECT]: createObjectWrapper,
 
-  const valueEntry = readEntry(carrier, pointerToEntry);
+  const entryType: ENTRY_TYPE = typeOnly_type_get(carrier.heap, pointerToEntry);
 
-  if (isPrimitiveEntryType(valueEntry.type)) {
-    return valueEntry.value;
+  switch (entryType) {
+    case ENTRY_TYPE.NUMBER:
+      return number_value_get(carrier.heap, pointerToEntry);
+      break;
+
+    case ENTRY_TYPE.STRING:
+      return readString(carrier.heap, pointerToEntry);
+      break;
+
+    case ENTRY_TYPE.BIGINT_POSITIVE:
+      return bigint_value_get(carrier.heap, pointerToEntry);
+      break;
+
+    case ENTRY_TYPE.BIGINT_NEGATIVE:
+      return bigint_value_get(carrier.heap, pointerToEntry) * BigInt("-1");
+      break;
   }
 
+  // this is an invariant
   if (
-    valueEntry.type === ENTRY_TYPE.OBJECT ||
-    valueEntry.type === ENTRY_TYPE.DATE ||
-    valueEntry.type === ENTRY_TYPE.ARRAY ||
-    valueEntry.type === ENTRY_TYPE.MAP ||
-    valueEntry.type === ENTRY_TYPE.SET
+    !(
+      entryType === ENTRY_TYPE.OBJECT ||
+      entryType === ENTRY_TYPE.DATE ||
+      entryType === ENTRY_TYPE.ARRAY ||
+      entryType === ENTRY_TYPE.MAP ||
+      entryType === ENTRY_TYPE.SET
+    )
   ) {
-    const cache = getCacheFor(carrier, (key) => {
-      finalizer(key, carrier, externalArgs);
-    });
+    throw new Error("Nope Nope Nope");
+  }
 
-    let ret = cache.get(pointerToEntry);
+  const cache = getCacheFor(carrier, (key) => {
+    finalizer(key, carrier);
+  });
 
-    if (!ret) {
-      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-      // @ts-ignore
-      ret = TYPE_TO_FACTORY[valueEntry.type](
-        externalArgs,
-        carrier,
-        pointerToEntry
-      );
-      cache.set(pointerToEntry, ret);
-    }
+  let ret = cache.get(pointerToEntry);
 
-    return ret;
+  if (!ret) {
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-expect-error
+    ret = TYPE_TO_FACTORY[entryType](externalArgs, carrier, pointerToEntry);
+    cache.set(pointerToEntry, ret);
   }
 
-  throw new Error("unsupported yet");
+  return ret;
 }
 
-function finalizer(
-  memoryAddress: number,
-  carrier: GlobalCarrier,
-  externalArgs: ExternalArgs
-) {
-  const newRefsCount = decrementRefCount(externalArgs, carrier, memoryAddress);
+function finalizer(memoryAddress: number, carrier: GlobalCarrier) {
+  const newRefsCount = decrementRefCount(carrier.heap, memoryAddress);
 
@@ -104,5 +116,5 @@ if (newRefsCount === 0) {
     for (const address of freeUs.arcAddresses) {
-      decrementRefCount(externalArgs, carrier, address);
+      decrementRefCount(carrier.heap, address);
     }
   }
 }

src/internal/externalObjectsCache.ts

 import { WeakValueMap } from "./WeakValueMap";
 
+// eslint-disable-next-line @typescript-eslint/ban-types
 const externalObjectsCache = new WeakMap<object, Map<number, any>>();
@@ -9,2 +10,3 @@
 export function getCacheFor(
+  // eslint-disable-next-line @typescript-eslint/ban-types
   obj: object,
@@ -27,3 +29,7 @@ externalFinalizer?: (key: number) => void
 function supportWeakRef() {
-  return typeof WeakRef !== "undefined";
+  return (
+    typeof WeakRef !== "undefined" &&
+    (typeof FinalizationGroup !== "undefined" ||
+      typeof "FinalizationRegistry" !== "undefined")
+  );
 }

src/internal/getAllLinkedAddresses.test.ts

 /* eslint-env jest */
 
-import * as util from "util";
 import { MemPool } from "@thi.ng/malloc";
@@ -11,9 +10,7 @@ import { createObjectBuffer, memoryStats } from "./api";
   const externalArgs = externalArgsApiToExternalArgsApi({
-    textEncoder: new util.TextEncoder(),
-    textDecoder: new util.TextDecoder(),
     arrayAdditionalAllocation: 20,
   });
 
-  describe("getAllLinkedAddresses no reference counting", () => {
-    test("getAllLinkedAddresses", () => {
+  describe("Make sure all allocated are discovered", () => {
+    test("Small object", () => {
       const allocatedAddresses: number[] = [];
@@ -30,2 +27,69 @@ const origMalloc = MemPool.prototype.malloc;
       const objectBuffer = createObjectBuffer(externalArgs, 2048, {
+        smallObject: [{ a: "6" }],
+      });
+
+      const carrier = getInternalAPI(objectBuffer).getCarrier();
+
+      const entryPointer = getInternalAPI(objectBuffer).getEntryPointer();
+      getInternalAPI(objectBuffer).destroy();
+
+      const linkedAddresses = getAllLinkedAddresses(
+        carrier,
+        false,
+        // allocatedAddresses[allocatedAddresses.length - 1]
+        entryPointer
+      );
+
+      expect([...linkedAddresses.leafAddresses].slice().sort()).toEqual(
+        allocatedAddresses.slice().sort()
+      );
+    });
+
+    test("With Map & Set", () => {
+      const allocatedAddresses: number[] = [];
+      const origMalloc = MemPool.prototype.malloc;
+      MemPool.prototype.malloc = function malloc(dataSize: number) {
+        const address = origMalloc.call(this, dataSize);
+
+        allocatedAddresses.push(address);
+
+        return address;
+      };
+
+      const objectBuffer = createObjectBuffer(externalArgs, 2048, {
+        m: new Map([
+          ["a", 1],
+          ["b", 2],
+        ]),
+        s: new Set(["a", "b", "c"]),
+      });
+
+      const carrier = getInternalAPI(objectBuffer).getCarrier();
+
+      const entryPointer = getInternalAPI(objectBuffer).getEntryPointer();
+      getInternalAPI(objectBuffer).destroy();
+
+      const linkedAddresses = getAllLinkedAddresses(
+        carrier,
+        false,
+        entryPointer
+      );
+
+      expect([...linkedAddresses.leafAddresses].slice().sort()).toEqual(
+        allocatedAddresses.slice().sort()
+      );
+    });
+
+    test("object with more stuff", () => {
+      const allocatedAddresses: number[] = [];
+      const origMalloc = MemPool.prototype.malloc;
+      MemPool.prototype.malloc = function malloc(dataSize: number) {
+        const address = origMalloc.call(this, dataSize);
+
+        allocatedAddresses.push(address);
+
+        return address;
+      };
+
+      const objectBuffer = createObjectBuffer(externalArgs, 2048, {
         nestedObject: { a: 1, b: null, c: "string", bigint: BigInt("100") },
@@ -35,8 +99,5 @@ arr: [new Date(0), "somestring", { a: "6", h: null }],
 
-      // const a = objectBuffer.nestedObject;
-      // getInternalAPI(a).destroy();
-      // // a.toString();
-
       const carrier = getInternalAPI(objectBuffer).getCarrier();
 
+      const entryPointer = getInternalAPI(objectBuffer).getEntryPointer();
       getInternalAPI(objectBuffer).destroy();
@@ -47,61 +108,8 @@
         false,
-        allocatedAddresses[allocatedAddresses.length - 1]
+        entryPointer
       );
 
-      expect(linkedAddresses.leafAddresses.slice().sort()).toEqual(
+      expect([...linkedAddresses.leafAddresses].slice().sort()).toEqual(
         allocatedAddresses.slice().sort()
       );
-
-      expect(linkedAddresses.leafAddresses.slice().sort())
-        .toMatchInlineSnapshot(`
-        Array [
-          1008,
-          1032,
-          1056,
-          1072,
-          1096,
-          112,
-          1120,
-          1144,
-          1160,
-          1184,
-          1216,
-          128,
-          144,
-          168,
-          200,
-          216,
-          240,
-          280,
-          296,
-          312,
-          336,
-          360,
-          376,
-          400,
-          424,
-          448,
-          464,
-          48,
-          488,
-          512,
-          528,
-          560,
-          584,
-          616,
-          632,
-          656,
-          680,
-          704,
-          72,
-          728,
-          744,
-          848,
-          880,
-          912,
-          936,
-          976,
-          992,
-        ]
-      `);
     });
@@ -128,8 +136,9 @@
       expect(memoryStats(objectBuffer)).toMatchInlineSnapshot(`
-Object {
-  "available": 816,
-  "used": 1232,
-}
-`);
+        Object {
+          "available": 656,
+          "used": 1392,
+        }
+      `);
 
+      const entryPointer = getInternalAPI(objectBuffer).getEntryPointer();
       const carrier = getInternalAPI(objectBuffer).getCarrier();
@@ -142,3 +151,3 @@
         false,
-        allocatedAddresses[allocatedAddresses.length - 1]
+        entryPointer
       );
@@ -145,0 +154,0 @@

src/internal/getAllLinkedAddresses.ts

@@ -1,2 +0,1 @@
-import { readEntry } from "./store";
 import { GlobalCarrier } from "./interfaces";
@@ -6,2 +5,10 @@ import { ENTRY_TYPE } from "./entry-types";
 import { isKnownAddressValuePointer } from "./utils";
+import {
+  typeOnly_type_get,
+  string_charsPointer_get,
+  typeAndRc_refsCount_get,
+  object_pointerToHashMap_get,
+  array_dataspacePointer_get,
+  array_length_get,
+} from "./generatedStructs";
 
@@ -13,13 +20,31 @@ export function getAllLinkedAddresses(
 ) {
-  const leafAddresses: number[] = [];
-  const arcAddresses: number[] = [];
+  const leafAddresses: Set<number> = new Set<number>();
+  const arcAddresses: Set<number> = new Set<number>();
+  const addressesToProcessQueue: number[] = [entryPointer];
 
-  getAllLinkedAddressesStep(
-    carrier,
-    ignoreRefCount,
-    entryPointer,
-    leafAddresses,
-    arcAddresses
-  );
+  let addressToProcess: number | undefined = undefined;
 
+  // const diffs = [];
+
+  while ((addressToProcess = addressesToProcessQueue.shift()) !== undefined) {
+    // const before = addressesToProcessQueue.slice();
+
+    if (addressToProcess === 0) {
+      continue;
+    }
+
+    getAllLinkedAddressesStep(
+      carrier,
+      ignoreRefCount,
+      addressToProcess,
+      leafAddresses,
+      arcAddresses,
+      addressesToProcessQueue
+    );
+
+    // diffs.push(addressesToProcessQueue.filter((p) => !before.includes(p)));
+  }
+
+  // console.log(diffs);
+
   return { leafAddresses, arcAddresses };
@@ -32,59 +57,64 @@ }
   entryPointer: number,
-  leafAddresses: number[],
-  arcAddresses: number[]
+  leafAddresses: Set<number>,
+  arcAddresses: Set<number>,
+  addressesToProcessQueue: number[]
 ) {
-  if (isKnownAddressValuePointer(entryPointer)) {
+  const { heap } = carrier;
+  if (
+    isKnownAddressValuePointer(entryPointer) ||
+    leafAddresses.has(entryPointer) ||
+    arcAddresses.has(entryPointer)
+  ) {
     return;
   }
 
-  const entry = readEntry(carrier, entryPointer);
+  const entryType = typeOnly_type_get(heap, entryPointer);
+  // to be used ONLY if the type has ref counter
+  const refsCount = typeAndRc_refsCount_get(heap, entryPointer);
 
-  switch (entry.type) {
+  switch (entryType) {
     case ENTRY_TYPE.NUMBER:
-    case ENTRY_TYPE.STRING:
     case ENTRY_TYPE.BIGINT_NEGATIVE:
     case ENTRY_TYPE.BIGINT_POSITIVE:
-      leafAddresses.push(entryPointer);
+      leafAddresses.add(entryPointer);
       break;
 
+    case ENTRY_TYPE.STRING:
+      leafAddresses.add(string_charsPointer_get(heap, entryPointer));
+      leafAddresses.add(entryPointer);
+      break;
+
     case ENTRY_TYPE.OBJECT:
     case ENTRY_TYPE.MAP:
     case ENTRY_TYPE.SET:
-      if (entry.refsCount <= 1 || ignoreRefCount) {
-        leafAddresses.push(entryPointer);
+      if (refsCount <= 1 || ignoreRefCount) {
+        leafAddresses.add(entryPointer);
         getObjectOrMapOrSetAddresses(
           carrier,
-          ignoreRefCount,
-          entry.value,
+          object_pointerToHashMap_get(heap, entryPointer),
           leafAddresses,
-          arcAddresses
+          addressesToProcessQueue
         );
       } else {
-        arcAddresses.push(entryPointer);
+        arcAddresses.add(entryPointer);
       }
-
       break;
 
     case ENTRY_TYPE.ARRAY:
-      if (entry.refsCount <= 1 || ignoreRefCount) {
-        leafAddresses.push(entryPointer);
-        leafAddresses.push(entry.value);
-
-        for (let i = 0; i < entry.allocatedLength; i += 1) {
+      if (refsCount <= 1 || ignoreRefCount) {
+        leafAddresses.add(entryPointer);
+        leafAddresses.add(array_dataspacePointer_get(heap, entryPointer));
+        const arrayLength = array_length_get(heap, entryPointer);
+        for (let i = 0; i < arrayLength; i += 1) {
           const valuePointer =
             carrier.uint32[
-              (entry.value + i * Uint32Array.BYTES_PER_ELEMENT) /
+              (array_dataspacePointer_get(heap, entryPointer) +
+                i * Uint32Array.BYTES_PER_ELEMENT) /
                 Uint32Array.BYTES_PER_ELEMENT
             ];
 
-          getAllLinkedAddressesStep(
-            carrier,
-            ignoreRefCount,
-            valuePointer,
-            leafAddresses,
-            arcAddresses
-          );
+          addressesToProcessQueue.push(valuePointer);
         }
       } else {
-        arcAddresses.push(entryPointer);
+        arcAddresses.add(entryPointer);
       }
@@ -94,6 +124,6 @@ break;
     case ENTRY_TYPE.DATE:
-      if (entry.refsCount <= 1 || ignoreRefCount) {
-        leafAddresses.push(entryPointer);
+      if (refsCount <= 1 || ignoreRefCount) {
+        leafAddresses.add(entryPointer);
       } else {
-        arcAddresses.push(entryPointer);
+        arcAddresses.add(entryPointer);
       }
@@ -103,5 +133,3 @@ break;
     default:
-      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-      // @ts-ignore
-      throw new Error(ENTRY_TYPE[entry.type] + " Not implemented yet");
+      throw new Error(ENTRY_TYPE[entryType] + " Not implemented yet");
   }
@@ -112,6 +140,5 @@ }
   carrier: GlobalCarrier,
-  ignoreRefCount: boolean,
   internalHashmapPointer: number,
-  leafAddresses: number[],
-  arcAddresses: number[]
+  leafAddresses: Set<number>,
+  addressesToProcessQueue: number[]
 ) {
@@ -123,13 +150,11 @@ const { pointersToValuePointers, pointers } = hashMapGetPointersToFree(
 
-  leafAddresses.push(...pointers);
+  for (const leafPointer of pointers) {
+    leafAddresses.add(leafPointer);
+  }
 
   for (const pointer of pointersToValuePointers) {
-    getAllLinkedAddressesStep(
-      carrier,
-      ignoreRefCount,
-      carrier.uint32[pointer / Uint32Array.BYTES_PER_ELEMENT],
-      leafAddresses,
-      arcAddresses
+    addressesToProcessQueue.push(
+      carrier.uint32[pointer / Uint32Array.BYTES_PER_ELEMENT]
     );
   }
 }

src/internal/hashmap/hashmap.test.ts

 /* eslint-env jest */
-import * as util from "util";
+
 import {
@@ -18,10 +18,8 @@ arrayBuffer2HexArray,
 } from "./hashmap";
-import { GlobalCarrier, StringEntry } from "../interfaces";
-import { readEntry } from "../store";
+import { GlobalCarrier } from "../interfaces";
 import { externalArgsApiToExternalArgsApi } from "../utils";
+import { readString } from "../readString";
 
 describe("hashmap", () => {
   const externalArgs = externalArgsApiToExternalArgsApi({
-    textEncoder: new util.TextEncoder(),
-    textDecoder: new util.TextDecoder(),
     arrayAdditionalAllocation: 20,
@@ -184,5 +182,4 @@ });
     }
-    expect(
-      values.map((v) => (readEntry(carrier, v.keyPointer) as StringEntry).value)
-    ).toMatchInlineSnapshot(`
+    expect(values.map((v) => readString(carrier.heap, v.keyPointer)))
+      .toMatchInlineSnapshot(`
       Array [
@@ -211,6 +208,2 @@ "a",
         "v",
-        "w",
-        "x",
-        "y",
-        "z",
       ]
@@ -249,33 +242,33 @@ `);
     expect(memAvailableAfterEachStep).toMatchInlineSnapshot(`
-Array [
-  1904,
-  1840,
-  1776,
-  1712,
-  1648,
-  1584,
-  1520,
-  1456,
-  1352,
-  1288,
-  1224,
-  1160,
-  1096,
-  1032,
-  968,
-  904,
-  760,
-  696,
-  632,
-  568,
-  504,
-  440,
-  376,
-  312,
-  248,
-  184,
-  120,
-  120,
-]
-`);
+      Array [
+        1904,
+        1824,
+        1744,
+        1664,
+        1584,
+        1504,
+        1424,
+        1344,
+        1224,
+        1144,
+        1064,
+        984,
+        904,
+        824,
+        744,
+        664,
+        504,
+        416,
+        336,
+        256,
+        176,
+        96,
+        16,
+        0,
+        0,
+        0,
+        0,
+        0,
+      ]
+    `);
   });
@@ -311,53 +304,63 @@
     expect(r).toMatchInlineSnapshot(`
-Object {
-  "pointers": Array [
-    48,
-    664,
-    120,
-    136,
-    200,
-    264,
-    328,
-    392,
-    456,
-    520,
-    584,
-    648,
-    752,
-    816,
-    152,
-    176,
-    216,
-    240,
-    280,
-    304,
-    344,
-    368,
-    408,
-    432,
-    472,
-    496,
-    536,
-    560,
-    600,
-    624,
-    72,
-    96,
-    768,
-    792,
-  ],
-  "pointersToValuePointers": Array [
-    152,
-    216,
-    280,
-    344,
-    408,
-    472,
-    536,
-    600,
-    72,
-    768,
-  ],
-}
-`);
+      Object {
+        "pointers": Array [
+          48,
+          792,
+          120,
+          136,
+          216,
+          296,
+          376,
+          456,
+          536,
+          616,
+          696,
+          776,
+          896,
+          976,
+          200,
+          152,
+          176,
+          280,
+          232,
+          256,
+          360,
+          312,
+          336,
+          440,
+          392,
+          416,
+          520,
+          472,
+          496,
+          600,
+          552,
+          576,
+          680,
+          632,
+          656,
+          760,
+          712,
+          736,
+          880,
+          72,
+          96,
+          960,
+          912,
+          936,
+        ],
+        "pointersToValuePointers": Array [
+          152,
+          232,
+          312,
+          392,
+          472,
+          552,
+          632,
+          712,
+          72,
+          912,
+        ],
+      }
+    `);
 
@@ -364,0 +367,0 @@ expect(r.pointers.sort()).toEqual(allocations.sort());

src/internal/hashmap/hashmap.ts

 import { MAP_MACHINE, NODE_MACHINE } from "./memoryLayout";
+import { GlobalCarrier, ExternalArgs } from "../interfaces";
 import {
-  GlobalCarrier,
-  ExternalArgs,
-  NumberEntry,
-  StringEntry,
-} from "../interfaces";
-import {
   hashCodeInPlace,
@@ -13,8 +8,7 @@ hashCodeExternalValue,
 } from "./hashmapUtils";
-import { primitiveValueToEntry } from "../utils";
+import { strByteLength } from "../utils";
+import { stringEncodeInto } from "../stringEncodeInto";
 import {
-  sizeOfEntry,
-  writeEntry,
-  readEntry,
   compareStringOrNumberEntriesInPlace,
+  readNumberOrString,
 } from "../store";
@@ -32,2 +26,12 @@ import { ENTRY_TYPE } from "../entry-types";
 import { MemoryOperator } from "../memoryMachinery";
+import {
+  number_size,
+  string_size,
+  number_set_all,
+  string_set_all,
+  number_value_place,
+  number_value_ctor,
+  typeOnly_type_get,
+  string_charsPointer_get,
+} from "../generatedStructs";
 
@@ -69,5 +73,5 @@ export function createHashMap(
   const mapOperator = MAP_MACHINE.createOperator(carrier, mapPointer);
-  const keyEntry = primitiveValueToEntry(externalKeyValue) as
-    | NumberEntry
-    | StringEntry;
+  // const keyEntry = primitiveValueToEntry(externalKeyValue) as
+  //   | NumberEntry
+  //   | StringEntry;
 
@@ -77,19 +81,41 @@ // allocate all possible needed memory upfront, so we won't oom in the middle of something
   const memoryForNewNode = carrier.allocator.calloc(NODE_MACHINE.map.SIZE_OF);
-  const memorySizeOfKey = sizeOfEntry(keyEntry);
-  const keyEntryMemory = carrier.allocator.calloc(memorySizeOfKey);
+  let keyMemoryEntryPointer;
+  let keyDataMemoryStart: number;
+  let keyDataMemoryLength: number;
 
-  writeEntry(carrier, keyEntryMemory, keyEntry);
+  if (typeof externalKeyValue === "number") {
+    keyMemoryEntryPointer = carrier.allocator.calloc(number_size);
+    number_set_all(
+      carrier.heap,
+      keyMemoryEntryPointer,
+      ENTRY_TYPE.NUMBER,
+      externalKeyValue
+    );
 
-  const keyHeaderOverhead =
-    keyEntry.type === ENTRY_TYPE.STRING
-      ? // type + string length
-        8 + 4
-      : // type
-        8;
+    keyDataMemoryStart = keyMemoryEntryPointer + number_value_place;
+    keyDataMemoryLength = number_value_ctor.BYTES_PER_ELEMENT;
+  } else {
+    keyMemoryEntryPointer = carrier.allocator.calloc(string_size);
+    keyDataMemoryLength = strByteLength(externalKeyValue);
+    keyDataMemoryStart = carrier.allocator.calloc(keyDataMemoryLength);
+    stringEncodeInto(
+      carrier.heap.Uint8Array,
+      keyDataMemoryStart,
+      externalKeyValue
+    );
+
+    string_set_all(
+      carrier.heap,
+      keyMemoryEntryPointer,
+      ENTRY_TYPE.STRING,
+      keyDataMemoryLength,
+      keyDataMemoryStart
+    );
+  }
+
   const keyHashCode = hashCodeInPlace(
     carrier.uint8,
     mapOperator.get("CAPACITY"),
-    // + 1 for the type of key
-    keyEntryMemory + keyHeaderOverhead,
-    memorySizeOfKey - keyHeaderOverhead
+    keyDataMemoryStart,
+    keyDataMemoryLength
   );
@@ -110,5 +136,5 @@
     !compareStringOrNumberEntriesInPlace(
-      carrier,
+      carrier.heap,
       commonNodeOperator.get("KEY_POINTER"),
-      keyEntryMemory
+      keyMemoryEntryPointer
     )
@@ -134,3 +160,4 @@ ) {
     // we don't need the new memory
-    carrier.allocator.free(keyEntryMemory);
+    // @todo Free here also the string data
+    carrier.allocator.free(keyMemoryEntryPointer);
     carrier.allocator.free(memoryForNewNode);
@@ -141,3 +168,3 @@
     commonNodeOperator.startAddress = memoryForNewNode;
-    commonNodeOperator.set("KEY_POINTER", keyEntryMemory);
+    commonNodeOperator.set("KEY_POINTER", keyMemoryEntryPointer);
     commonNodeOperator.set(
@@ -163,3 +190,2 @@ "LINKED_LIST_ITEM_POINTER",
       shouldRehash(
-        mapOperator.get("LINKED_LIST_SIZE"),
         mapOperator.get("CAPACITY"),
@@ -205,7 +231,5 @@ mapOperator.get("USED_CAPACITY"),
   while (node.startAddress !== 0) {
-    const keyEntry = readEntry(carrier, node.get("KEY_POINTER")) as
-      | NumberEntry
-      | StringEntry;
+    const keyValue = readNumberOrString(carrier.heap, node.get("KEY_POINTER"));
 
-    if (keyEntry.value === externalKeyValue) {
+    if (keyValue === externalKeyValue) {
       return ptrToPtr;
@@ -275,2 +299,11 @@ }
 
+  if (
+    typeOnly_type_get(carrier.heap, nodeOperator.get("KEY_POINTER")) ===
+    ENTRY_TYPE.STRING
+  ) {
+    carrier.allocator.free(
+      string_charsPointer_get(carrier.heap, nodeOperator.get("KEY_POINTER"))
+    );
+  }
+
   carrier.allocator.free(nodeOperator.get("KEY_POINTER"));
@@ -357,2 +390,10 @@ carrier.allocator.free(nodeOperator.startAddress);
     pointersToValuePointers.push(nodeOperator.pointerTo("VALUE_POINTER"));
+    if (
+      typeOnly_type_get(carrier.heap, nodeOperator.get("KEY_POINTER")) ===
+      ENTRY_TYPE.STRING
+    ) {
+      pointers.push(
+        string_charsPointer_get(carrier.heap, nodeOperator.get("KEY_POINTER"))
+      );
+    }
     pointers.push(nodePointer, nodeOperator.get("KEY_POINTER"));
@@ -460,3 +501,2 @@ }
 function shouldRehash(
-  nodesCount: number,
   buckets: number,
@@ -463,0 +503,0 @@ fullBuckets: number,

src/internal/interfaces.ts

 import { ENTRY_TYPE } from "./entry-types";
-import { TextDecoder, TextEncoder } from "./textEncoderDecoderTypes";
+import { Heap } from "../structsGenerator/consts";
 
@@ -92,2 +92,3 @@ export type primitive = string | number | bigint | boolean | undefined | null;
   allocator: import("@thi.ng/malloc").IMemPool;
+  heap: Heap;
 }
@@ -98,5 +99,7 @@
   hashMapMinInitialCapacity: number;
+  /**
+   * Allocate additional memory for array pointers,
+   * will prevent the reallocation and copy when array is getting bigger
+   */
   arrayAdditionalAllocation: number;
-  textDecoder: TextDecoder;
-  textEncoder: TextEncoder;
 }>;
@@ -108,4 +111,2 @@
   arrayAdditionalAllocation?: number;
-  textDecoder: TextDecoder;
-  textEncoder: TextEncoder;
 }>;
@@ -112,0 +113,0 @@

src/internal/linkedList/linkedList.test.ts

@@ -9,6 +9,2 @@ /* eslint-env jest */
 
-// eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-// @ts-ignore
-// import jestDiff from "jest-diff";
-
 import {
@@ -15,0 +11,0 @@ linkedListItemInsert,

src/internal/locks.ts

@@ -0,1 +1,5 @@
+/* istanbul ignore file */
+
+// I'm not sure how to test that yet
+
 import { invariant } from "./utils";
@@ -2,0 +6,0 @@ import { getUnderlyingArrayBuffer } from "./api";

src/internal/mapWrapper.ts

@@ -0,8 +1,3 @@
+import { ExternalArgs, GlobalCarrier, InternalAPI } from "./interfaces";
 import {
-  ExternalArgs,
-  GlobalCarrier,
-  MapEntry,
-  InternalAPI,
-} from "./interfaces";
-import {
   deleteObjectPropertyEntryByKey,
@@ -25,5 +20,5 @@ objectGet,
 import { entryToFinalJavaScriptValue } from "./entryToFinalJavaScriptValue";
+import { object_pointerToHashMap_get } from "./generatedStructs";
 
-export class MapWrapper<K extends string | number, V>
-  extends BaseProxyTrap<MapEntry>
+export class MapWrapper<K extends string | number, V> extends BaseProxyTrap
   implements Map<K, V> {
@@ -44,3 +39,6 @@ clear(): void {
   get size(): number {
-    return hashMapSize(this.carrier, this.entry.value);
+    return hashMapSize(
+      this.carrier,
+      object_pointerToHashMap_get(this.carrier.heap, this.entryPointer)
+    );
   }
@@ -55,3 +53,3 @@
       this.carrier,
-      this.entry.value
+      object_pointerToHashMap_get(this.carrier.heap, this.entryPointer)
     )) {
@@ -81,3 +79,3 @@ const { valuePointer, keyPointer } = hashMapNodePointerToKeyValue(
       this.carrier,
-      this.entry.value
+      object_pointerToHashMap_get(this.carrier.heap, this.entryPointer)
     )) {
@@ -97,3 +95,3 @@ const t = hashMapNodePointerToKeyValue(this.carrier, nodePointer);
       this.carrier,
-      this.entry.value
+      object_pointerToHashMap_get(this.carrier.heap, this.entryPointer)
     )) {
@@ -130,3 +128,8 @@ const { valuePointer } = hashMapNodePointerToKeyValue(
 
-    return objectGet(this.externalArgs, this.carrier, this.entry.value, p);
+    return objectGet(
+      this.externalArgs,
+      this.carrier,
+      object_pointerToHashMap_get(this.carrier.heap, this.entryPointer),
+      p
+    );
   }
@@ -140,5 +143,4 @@
     return deleteObjectPropertyEntryByKey(
-      this.externalArgs,
       this.carrier,
-      this.entry.value,
+      object_pointerToHashMap_get(this.carrier.heap, this.entryPointer),
       p
@@ -153,3 +155,9 @@ );
 
-    return hashMapNodeLookup(this.carrier, this.entry.value, p) !== 0;
+    return (
+      hashMapNodeLookup(
+        this.carrier,
+        object_pointerToHashMap_get(this.carrier.heap, this.entryPointer),
+        p
+      ) !== 0
+    );
   }
@@ -163,3 +171,9 @@
     allocationsTransaction(() => {
-      objectSet(this.externalArgs, this.carrier, this.entry.value, p, value);
+      objectSet(
+        this.externalArgs,
+        this.carrier,
+        object_pointerToHashMap_get(this.carrier.heap, this.entryPointer),
+        p,
+        value
+      );
     }, this.carrier.allocator);
@@ -166,0 +180,0 @@

src/internal/memoryMachinery.test.ts

@@ -41,4 +41,4 @@ /* eslint-env jest */
           entry[0],
-          // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-          // @ts-ignore
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+          // @ts-expect-error
           entry[1].type,
@@ -45,0 +45,0 @@ ])

src/internal/memoryMachinery.ts

@@ -40,4 +40,2 @@ import { GlobalCarrier } from "./interfaces";
 
-// eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-// @ts-ignore
 // dataViewInstance = undefined;
@@ -167,5 +165,5 @@
 
-  // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-  // @ts-ignore
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-expect-error
   return Object.fromEntries(newObjectEntries);
 }

src/internal/objectWrapper.ts

@@ -1,2 +0,2 @@
-import { ObjectEntry, ExternalArgs, GlobalCarrier } from "./interfaces";
+import { ExternalArgs, GlobalCarrier } from "./interfaces";
 import {
@@ -17,6 +17,7 @@ getObjectPropertiesEntries,
 import { hashMapNodeLookup } from "./hashmap/hashmap";
+import { object_pointerToHashMap_get } from "./generatedStructs";
 
-export class ObjectWrapper extends BaseProxyTrap<ObjectEntry>
-  implements ProxyHandler<{}> {
-  public get(target: {}, p: PropertyKey): any {
+export class ObjectWrapper extends BaseProxyTrap
+  implements ProxyHandler<Record<string, unknown>> {
+  public get(target: Record<string, unknown>, p: PropertyKey): any {
     if (p === INTERNAL_API_SYMBOL) {
@@ -30,6 +31,14 @@ return this;
 
-    return objectGet(this.externalArgs, this.carrier, this.entry.value, p);
+    return objectGet(
+      this.externalArgs,
+      this.carrier,
+      object_pointerToHashMap_get(this.carrier.heap, this.entryPointer),
+      p
+    );
   }
 
-  public deleteProperty(target: {}, p: PropertyKey): boolean {
+  public deleteProperty(
+    target: Record<string, unknown>,
+    p: PropertyKey
+  ): boolean {
     if (typeof p === "symbol") {
@@ -40,5 +49,4 @@ return false;
     return deleteObjectPropertyEntryByKey(
-      this.externalArgs,
       this.carrier,
-      this.entry.value,
+      object_pointerToHashMap_get(this.carrier.heap, this.entryPointer),
       p
@@ -51,3 +59,3 @@ );
       this.carrier,
-      this.entry.value
+      object_pointerToHashMap_get(this.carrier.heap, this.entryPointer)
     );
@@ -61,3 +69,3 @@
       this.carrier,
-      this.entry.value
+      object_pointerToHashMap_get(this.carrier.heap, this.entryPointer)
     );
@@ -68,3 +76,6 @@
 
-  public getOwnPropertyDescriptor(target: {}, p: PropertyKey) {
+  public getOwnPropertyDescriptor(
+    target: Record<string, unknown>,
+    p: PropertyKey
+  ) {
     if (this.has(target, p)) {
@@ -77,3 +88,3 @@ return { configurable: true, enumerable: true };
 
-  public has(target: {}, p: PropertyKey) {
+  public has(target: Record<string, unknown>, p: PropertyKey) {
     if (p === INTERNAL_API_SYMBOL) {
@@ -87,6 +98,16 @@ return true;
 
-    return hashMapNodeLookup(this.carrier, this.entry.value, p) !== 0;
+    return (
+      hashMapNodeLookup(
+        this.carrier,
+        object_pointerToHashMap_get(this.carrier.heap, this.entryPointer),
+        p
+      ) !== 0
+    );
   }
 
-  public set(target: {}, p: PropertyKey, value: any): boolean {
+  public set(
+    target: Record<string, unknown>,
+    p: PropertyKey,
+    value: any
+  ): boolean {
     if (typeof p === "symbol") {
@@ -97,3 +118,9 @@ throw new IllegalObjectPropConfigError();
     allocationsTransaction(() => {
-      objectSet(this.externalArgs, this.carrier, this.entry.value, p, value);
+      objectSet(
+        this.externalArgs,
+        this.carrier,
+        object_pointerToHashMap_get(this.carrier.heap, this.entryPointer),
+        p,
+        value
+      );
     }, this.carrier.allocator);
@@ -116,3 +143,3 @@
 
-  public defineProperty(): // target: {},
+  public defineProperty(): // target: Record<string, unknown>,
   // p: PropertyKey,
@@ -119,0 +146,0 @@ // attributes: PropertyDescriptor

src/internal/objectWrapperHelpers.ts

@@ -0,15 +1,6 @@
+import { ExternalArgs, GlobalCarrier } from "./interfaces";
 import {
-  ExternalArgs,
-  GlobalCarrier,
-  StringEntry,
-  NumberEntry,
-  MapEntry,
-  SetEntry,
-} from "./interfaces";
-import {
-  readEntry,
   writeValueInPtrToPtrAndHandleMemory,
   handleArcForDeletedValuePointer,
   decrementRefCount,
-  writeEntry,
 } from "./store";
@@ -25,6 +16,14 @@ import { entryToFinalJavaScriptValue } from "./entryToFinalJavaScriptValue";
 } from "./hashmap/hashmap";
-import { getObjectOrMapOrSetAddresses } from "./getAllLinkedAddresses";
+import { getAllLinkedAddresses } from "./getAllLinkedAddresses";
+import {
+  typeOnly_type_get,
+  number_value_get,
+  typeAndRc_refsCount_get,
+  typeAndRc_refsCount_set,
+  object_pointerToHashMap_set,
+} from "./generatedStructs";
+import { ENTRY_TYPE } from "./entry-types";
+import { readString } from "./readString";
 
 export function deleteObjectPropertyEntryByKey(
-  externalArgs: ExternalArgs,
   carrier: GlobalCarrier,
@@ -46,7 +45,7 @@ hashmapPointer: number,
   const deletedValuePointer =
-    carrier.uint32[
+    carrier.heap.Uint32Array[
       deletedValuePointerToPointer / Uint32Array.BYTES_PER_ELEMENT
     ];
 
-  handleArcForDeletedValuePointer(externalArgs, carrier, deletedValuePointer);
+  handleArcForDeletedValuePointer(carrier, deletedValuePointer);
 
@@ -71,10 +70,15 @@ return true;
 
-    const keyEntry = readEntry(carrier, keyPointer) as
-      | StringEntry
-      | NumberEntry;
+    const typeOfKeyEntry:
+      | ENTRY_TYPE.NUMBER
+      | ENTRY_TYPE.STRING = typeOnly_type_get(carrier.heap, keyPointer);
 
+    const key =
+      typeOfKeyEntry === ENTRY_TYPE.NUMBER
+        ? number_value_get(carrier.heap, keyPointer)
+        : readString(carrier.heap, keyPointer);
+
     foundValues.push({
       valuePointer:
         carrier.uint32[valuePointer / Uint32Array.BYTES_PER_ELEMENT],
-      key: keyEntry.value,
+      key,
     });
@@ -91,3 +95,3 @@ }
   p: string | number,
-  value: any
+  value: unknown
 ) {
@@ -112,6 +116,2 @@ const ptrToPtr = hashMapInsertUpdate(
 
-  if (valuePointer === 0) {
-    return undefined;
-  }
-
   return entryToFinalJavaScriptValue(
@@ -124,19 +124,48 @@ externalArgs,
 
-export function hashmapClearFree(
+// export function hashmapClearFree(
+//   externalArgs: ExternalArgs,
+//   carrier: GlobalCarrier,
+//   hashmapPointer: number
+// ) {
+//   const leafAddresses = new Set<number>();
+
+//   const addressesToProcessQueue: number[] = [];
+
+//   getObjectOrMapOrSetAddresses(
+//     carrier,
+//     hashmapPointer,
+//     leafAddresses,
+//     addressesToProcessQueue
+//   );
+
+//   for (const address of leafAddresses) {
+//     carrier.allocator.free(address);
+//   }
+
+//   for (const address of arcAddresses) {
+//     decrementRefCount(externalArgs, carrier, address);
+//   }
+// }
+
+export function mapOrSetClear(
   externalArgs: ExternalArgs,
   carrier: GlobalCarrier,
-  hashmapPointer: number
+  mapOrSetPtr: number
 ) {
-  const leafAddresses: number[] = [];
-  const arcAddresses: number[] = [];
+  // we fake the entry refCount as zero so getAllLinkedAddresses will visit what's needed
+  const prevCount = typeAndRc_refsCount_get(carrier.heap, mapOrSetPtr);
+  typeAndRc_refsCount_set(carrier.heap, mapOrSetPtr, 0);
 
-  getObjectOrMapOrSetAddresses(
+  const { leafAddresses, arcAddresses } = getAllLinkedAddresses(
     carrier,
     false,
-    hashmapPointer,
-    leafAddresses,
-    arcAddresses
+    mapOrSetPtr
   );
 
   for (const address of leafAddresses) {
+    // don't dispose the address we need to reuse
+    if (address === mapOrSetPtr) {
+      continue;
+    }
+
     carrier.allocator.free(address);
@@ -146,18 +175,17 @@ }
   for (const address of arcAddresses) {
-    decrementRefCount(externalArgs, carrier, address);
+    // don't dispose the address we need to reuse
+    if (address === mapOrSetPtr) {
+      continue;
+    }
+
+    decrementRefCount(carrier.heap, address);
   }
-}
 
-export function mapOrSetClear(
-  externalArgs: ExternalArgs,
-  carrier: GlobalCarrier,
-  mapOrSetPtr: number
-) {
-  const entry = readEntry(carrier, mapOrSetPtr) as MapEntry | SetEntry;
-
-  hashmapClearFree(externalArgs, carrier, entry.value);
-
-  entry.value = createHashMap(carrier, externalArgs.hashMapMinInitialCapacity);
-
-  writeEntry(carrier, mapOrSetPtr, entry);
+  // Restore real ref count
+  typeAndRc_refsCount_set(carrier.heap, mapOrSetPtr, prevCount);
+  object_pointerToHashMap_set(
+    carrier.heap,
+    mapOrSetPtr,
+    createHashMap(carrier, externalArgs.hashMapMinInitialCapacity)
+  );
 }

src/internal/profileStringDecodeInto.js

@@ -0,1 +1,2 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 // @ts-nocheck
@@ -2,0 +3,0 @@

src/internal/saveValue.ts

@@ -1,12 +0,15 @@
-import {
-  primitiveValueToEntry,
-  isPrimitive,
-  getOurPointerIfApplicable,
-} from "./utils";
-import { appendEntry } from "./store";
-import { objectSaver, mapSaver, setSaver } from "./objectSaver";
-import { arraySaver } from "./arraySaver";
+import { getOurPointerIfApplicable, strByteLength } from "./utils";
 import { ExternalArgs, GlobalCarrier } from "./interfaces";
 import { ENTRY_TYPE } from "./entry-types";
 import {
+  number_size,
+  number_set_all,
+  bigint_size,
+  bigint_set_all,
+  string_size,
+  string_set_all,
+  date_size,
+  date_set_all,
+} from "./generatedStructs";
+import {
   UNDEFINED_KNOWN_ADDRESS,
@@ -16,64 +19,220 @@ NULL_KNOWN_ADDRESS,
   FALSE_KNOWN_ADDRESS,
+  MAX_64_BIG_INT,
 } from "./consts";
+import { arraySaverIterative } from "./arraySaverIterative";
+import {
+  objectSaverIterative,
+  mapSaverIterative,
+  setSaverIterative,
+} from "./objectSaverIterative";
+import { stringEncodeInto } from "./stringEncodeInto";
 
-/**
- * Returns pointer for the value
- */
-export function saveValue(
+export function saveValueIterative(
   externalArgs: ExternalArgs,
   carrier: GlobalCarrier,
-  referencedPointers: number[],
-  value: any
+  referencedExistingPointers: number[],
+  initialValuePtrToPtr: number,
+  initialValue: unknown
 ) {
-  let valuePointer = 0;
-  let maybeOurPointer: number | undefined;
+  const valuesToSave = [initialValue];
+  const pointersToSaveTo = [initialValuePtrToPtr];
+  const {
+    heap: { Uint32Array: uint32 },
+    allocator,
+    heap,
+  } = carrier;
 
-  if (value === undefined) {
-    return UNDEFINED_KNOWN_ADDRESS;
-  }
+  while (valuesToSave.length !== 0) {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const valueToSave = valuesToSave.pop()!;
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const ptrToPtrToSaveTo = pointersToSaveTo.pop()!;
 
-  if (value === null) {
-    return NULL_KNOWN_ADDRESS;
-  }
+    // Handler well-known values
+    if (valueToSave === undefined) {
+      uint32[
+        ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT
+      ] = UNDEFINED_KNOWN_ADDRESS;
+      continue;
+    }
 
-  if (value === true) {
-    return TRUE_KNOWN_ADDRESS;
-  }
+    if (valueToSave === null) {
+      uint32[
+        ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT
+      ] = NULL_KNOWN_ADDRESS;
+      continue;
+    }
 
-  if (value === false) {
-    return FALSE_KNOWN_ADDRESS;
-  }
+    if (valueToSave === true) {
+      uint32[
+        ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT
+      ] = TRUE_KNOWN_ADDRESS;
+      continue;
+    }
 
-  if (isPrimitive(value)) {
-    const entry = primitiveValueToEntry(value);
-    valuePointer = appendEntry(externalArgs, carrier, entry);
-  } else if (
-    (maybeOurPointer = getOurPointerIfApplicable(value, carrier.allocator))
-  ) {
-    valuePointer = maybeOurPointer;
-    referencedPointers.push(valuePointer);
-  } else if (Array.isArray(value)) {
-    valuePointer = arraySaver(externalArgs, carrier, referencedPointers, value);
-  } else if (value instanceof Date) {
-    valuePointer = appendEntry(externalArgs, carrier, {
-      type: ENTRY_TYPE.DATE,
-      refsCount: 1,
-      value: value.getTime(),
-    });
-  } else if (value instanceof Map) {
-    valuePointer = mapSaver(externalArgs, carrier, referencedPointers, value);
-  } else if (value instanceof Set) {
-    valuePointer = setSaver(externalArgs, carrier, value);
-  } else if (typeof value === "object") {
-    valuePointer = objectSaver(
+    if (valueToSave === false) {
+      uint32[
+        ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT
+      ] = FALSE_KNOWN_ADDRESS;
+      continue;
+    }
+
+    switch (typeof valueToSave) {
+      case "number":
+        uint32[
+          ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT
+        ] = allocator.calloc(number_size);
+        number_set_all(
+          heap,
+          uint32[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT],
+          ENTRY_TYPE.NUMBER,
+          valueToSave
+        );
+        continue;
+        break;
+
+      case "string":
+        // eslint-disable-next-line no-case-declarations
+        const stringBytesLength = strByteLength(valueToSave);
+        // eslint-disable-next-line no-case-declarations
+        const stringDataPointer = allocator.calloc(stringBytesLength);
+        uint32[
+          ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT
+        ] = allocator.calloc(string_size);
+
+        stringEncodeInto(heap.Uint8Array, stringDataPointer, valueToSave);
+
+        string_set_all(
+          heap,
+          uint32[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT],
+          ENTRY_TYPE.STRING,
+          stringBytesLength,
+          stringDataPointer
+        );
+        continue;
+        break;
+
+      case "bigint":
+        if (valueToSave > MAX_64_BIG_INT || valueToSave < -MAX_64_BIG_INT) {
+          uint32[
+            ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT
+          ] = UNDEFINED_KNOWN_ADDRESS;
+          continue;
+          // Maybe don't make undefined but throw, or clamp
+          // throw new Error("MAX_64_BIG_INT");
+        }
+
+        uint32[
+          ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT
+        ] = allocator.calloc(bigint_size);
+        bigint_set_all(
+          heap,
+          uint32[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT],
+          valueToSave > 0
+            ? ENTRY_TYPE.BIGINT_POSITIVE
+            : ENTRY_TYPE.BIGINT_NEGATIVE,
+          valueToSave * (valueToSave > 0 ? BigInt("1") : BigInt("-1"))
+        );
+
+        continue;
+        break;
+
+      case "function":
+        // Nope Nope Nope
+        uint32[
+          ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT
+        ] = UNDEFINED_KNOWN_ADDRESS;
+        continue;
+        break;
+
+      case "symbol":
+        // not supported, write undefined
+        uint32[
+          ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT
+        ] = UNDEFINED_KNOWN_ADDRESS;
+        continue;
+        break;
+
+      // we will never get here
+      case "undefined":
+        continue;
+        break;
+      // we will never get here
+      case "boolean":
+        continue;
+        break;
+    }
+
+    const maybeOurPointerFromSymbol = getOurPointerIfApplicable(
+      valueToSave,
+      carrier.allocator
+    );
+
+    if (maybeOurPointerFromSymbol) {
+      referencedExistingPointers.push(maybeOurPointerFromSymbol);
+      heap.Uint32Array[
+        ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT
+      ] = maybeOurPointerFromSymbol;
+      continue;
+    }
+
+    if (Array.isArray(valueToSave)) {
+      heap.Uint32Array[
+        ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT
+      ] = arraySaverIterative(
+        externalArgs.arrayAdditionalAllocation,
+        carrier,
+        valuesToSave,
+        pointersToSaveTo,
+        valueToSave
+      );
+      continue;
+    }
+
+    if (valueToSave instanceof Date) {
+      heap.Uint32Array[
+        ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT
+      ] = allocator.calloc(date_size);
+      date_set_all(
+        heap,
+        heap.Uint32Array[ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT],
+        ENTRY_TYPE.DATE,
+        1,
+        0,
+        valueToSave.getTime()
+      );
+      continue;
+    }
+
+    if (valueToSave instanceof Map) {
+      heap.Uint32Array[
+        ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT
+      ] = mapSaverIterative(
+        externalArgs,
+        carrier,
+        valuesToSave,
+        pointersToSaveTo,
+        valueToSave
+      );
+      continue;
+    }
+
+    if (valueToSave instanceof Set) {
+      heap.Uint32Array[
+        ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT
+      ] = setSaverIterative(externalArgs, carrier, valueToSave);
+      continue;
+    }
+
+    // Plain object? I hope so
+    heap.Uint32Array[
+      ptrToPtrToSaveTo / Uint32Array.BYTES_PER_ELEMENT
+    ] = objectSaverIterative(
       externalArgs,
       carrier,
-      referencedPointers,
-      value
+      valuesToSave,
+      pointersToSaveTo,
+      valueToSave
     );
-  } else {
-    throw new Error("unsupported yet");
   }
-
-  return valuePointer;
 }

src/internal/setWrapper.ts

@@ -0,8 +1,3 @@
+import { ExternalArgs, GlobalCarrier, InternalAPI } from "./interfaces";
 import {
-  ExternalArgs,
-  GlobalCarrier,
-  MapEntry,
-  InternalAPI,
-} from "./interfaces";
-import {
   deleteObjectPropertyEntryByKey,
@@ -24,5 +19,5 @@ objectSet,
 import { entryToFinalJavaScriptValue } from "./entryToFinalJavaScriptValue";
+import { object_pointerToHashMap_get } from "./generatedStructs";
 
-export class SetWrapper<K extends string | number>
-  extends BaseProxyTrap<MapEntry>
+export class SetWrapper<K extends string | number> extends BaseProxyTrap
   implements Set<K> {
@@ -43,3 +38,6 @@ clear(): void {
   get size(): number {
-    return hashMapSize(this.carrier, this.entry.value);
+    return hashMapSize(
+      this.carrier,
+      object_pointerToHashMap_get(this.carrier.heap, this.entryPointer)
+    );
   }
@@ -54,3 +52,3 @@
       this.carrier,
-      this.entry.value
+      object_pointerToHashMap_get(this.carrier.heap, this.entryPointer)
     )) {
@@ -72,3 +70,3 @@ const t = hashMapNodePointerToKeyValue(this.carrier, nodePointer);
       this.carrier,
-      this.entry.value
+      object_pointerToHashMap_get(this.carrier.heap, this.entryPointer)
     )) {
@@ -87,3 +85,3 @@ const t = hashMapNodePointerToKeyValue(this.carrier, nodePointer);
       this.carrier,
-      this.entry.value
+      object_pointerToHashMap_get(this.carrier.heap, this.entryPointer)
     )) {
@@ -117,3 +115,9 @@ const t = hashMapNodePointerToKeyValue(this.carrier, nodePointer);
 
-    return hashMapNodeLookup(this.carrier, this.entry.value, p) !== 0;
+    return (
+      hashMapNodeLookup(
+        this.carrier,
+        object_pointerToHashMap_get(this.carrier.heap, this.entryPointer),
+        p
+      ) !== 0
+    );
   }
@@ -130,3 +134,3 @@
         this.carrier,
-        this.entry.value,
+        object_pointerToHashMap_get(this.carrier.heap, this.entryPointer),
         p,
@@ -146,5 +150,4 @@ undefined
     return deleteObjectPropertyEntryByKey(
-      this.externalArgs,
       this.carrier,
-      this.entry.value,
+      object_pointerToHashMap_get(this.carrier.heap, this.entryPointer),
       p
@@ -151,0 +154,0 @@ );

src/internal/sizeOf.test.ts

 /* eslint-env jest */
 
-import * as util from "util";
 import { sizeOf } from "./sizeOf";
@@ -8,6 +7,4 @@ import { externalArgsApiToExternalArgsApi } from "./utils";
 
-describe("sizeOf tests", () => {
+describe.skip("sizeOf tests", () => {
   const externalArgs = externalArgsApiToExternalArgsApi({
-    textEncoder: new util.TextEncoder(),
-    textDecoder: new util.TextDecoder(),
     arrayAdditionalAllocation: 20,
@@ -38,3 +35,3 @@ });
         "calcedSize": 72,
-        "realSize": 72,
+        "realSize": 104,
       }
@@ -41,0 +38,0 @@ `);

src/internal/sizeOf.ts

@@ -0,1 +1,2 @@
+/* istanbul ignore file */
 import {
@@ -2,0 +3,0 @@ ExternalArgsApi,

src/internal/store.test.ts

 /* eslint-env jest */
 
-import {
-  writeEntry,
-  initializeArrayBuffer,
-  readEntry,
-  appendEntry,
-} from "./store";
-import { ENTRY_TYPE } from "./entry-types";
-import * as util from "util";
-import { arrayBuffer2HexArray, makeCarrier } from "./testUtils";
-import { ObjectEntry } from "./interfaces";
-import { externalArgsApiToExternalArgsApi } from "./utils";
+import { initializeArrayBuffer } from "./store";
 
+import { arrayBuffer2HexArray } from "./testUtils";
+
 describe("Store tests - Misc", () => {
@@ -47,500 +39,1 @@ test("initializeArrayBuffer", () => {
 });
-
-describe("Store tests writeEntry", () => {
-  test("writeEntry max number", () => {
-    const arrayBuffer = new ArrayBuffer(64);
-    const carrier = makeCarrier(arrayBuffer);
-
-    writeEntry(carrier, 8, {
-      type: ENTRY_TYPE.NUMBER,
-      value: Number.MAX_VALUE,
-    });
-
-    expect(arrayBuffer2HexArray(arrayBuffer.slice(0, 17)))
-      .toMatchInlineSnapshot(`
-      Array [
-        "0x00",
-        "0x00",
-        "0x00",
-        "0x00",
-        "0x00",
-        "0x00",
-        "0x00",
-        "0x00",
-        "0x00",
-        "0x00",
-        "0x00",
-        "0x00",
-        "0x00",
-        "0x00",
-        "0x00",
-        "0x40",
-        "0xff",
-      ]
-    `);
-  });
-  test("writeEntry min number", () => {
-    const arrayBuffer = new ArrayBuffer(64);
-    const carrier = makeCarrier(arrayBuffer);
-
-    writeEntry(carrier, 8, {
-      type: ENTRY_TYPE.NUMBER,
-      value: Number.MIN_VALUE,
-    });
-
-    expect(arrayBuffer2HexArray(arrayBuffer.slice(0, 17)))
-      .toMatchInlineSnapshot(`
-Array [
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x40",
-  "0x01",
-]
-`);
-  });
-
-  test("writeEntry string", () => {
-    const arrayBuffer = new ArrayBuffer(64);
-    const carrier = makeCarrier(arrayBuffer);
-
-    writeEntry(carrier, 8, {
-      type: ENTRY_TYPE.STRING,
-      value: "aא弟",
-      allocatedBytes: 6,
-    });
-
-    expect(arrayBuffer2HexArray(arrayBuffer.slice(0, 19)))
-      .toMatchInlineSnapshot(`
-Array [
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x00",
-  "0x14",
-  "0x40",
-  "0x06",
-  "0x00",
-  "0x00",
-]
-`);
-  });
-});
-
-describe("Store tests readEntry", () => {
-  const externalArgs = externalArgsApiToExternalArgsApi({
-    textEncoder: new util.TextEncoder(),
-    textDecoder: new util.TextDecoder(),
-    arrayAdditionalAllocation: 20,
-  });
-
-  test("readEntry max number", () => {
-    const arrayBuffer = new ArrayBuffer(64);
-    const carrier = makeCarrier(arrayBuffer);
-
-    writeEntry(carrier, 8, {
-      type: ENTRY_TYPE.NUMBER,
-      value: Number.MAX_VALUE,
-    });
-
-    const redEntry = readEntry(carrier, 8);
-
-    // expect(redBytesLength).toBe(writtenLength);
-
-    expect(redEntry).toMatchInlineSnapshot(`
-      Object {
-        "type": 2,
-        "value": 1.7976931348623157e+308,
-      }
-    `);
-  });
-
-  test("readEntry min number", () => {
-    const arrayBuffer = new ArrayBuffer(64);
-    const carrier = makeCarrier(arrayBuffer);
-
-    writeEntry(carrier, 8, {
-      type: ENTRY_TYPE.NUMBER,
-      value: Number.MIN_VALUE,
-    });
-
-    const redEntry = readEntry(carrier, 8);
-
-    expect(redEntry).toMatchInlineSnapshot(`
-      Object {
-        "type": 2,
-        "value": 5e-324,
-      }
-    `);
-  });
-
-  test("readEntry string", () => {
-    const arrayBuffer = new ArrayBuffer(64);
-    const carrier = makeCarrier(arrayBuffer);
-
-    writeEntry(carrier, 0, {
-      type: ENTRY_TYPE.STRING,
-      value: "aא弟",
-      allocatedBytes: 6,
-    });
-
-    const entry = readEntry(carrier, 0);
-
-    expect(entry).toMatchInlineSnapshot(`
-      Object {
-        "allocatedBytes": 6,
-        "type": 5,
-        "value": "aא弟",
-      }
-    `);
-  });
-
-  test("readEntry BigInt", () => {
-    const arrayBuffer = new ArrayBuffer(64);
-    const carrier = makeCarrier(arrayBuffer);
-
-    writeEntry(carrier, 0, {
-      type: ENTRY_TYPE.BIGINT_POSITIVE,
-      value: BigInt("0b0" + "1".repeat(63)),
-    });
-
-    const entry = readEntry(carrier, 0);
-
-    expect(entry).toMatchInlineSnapshot(`
-      Object {
-        "type": 3,
-        "value": 9223372036854775807n,
-      }
-    `);
-  });
-
-  test("readEntry UBigInt", () => {
-    const arrayBuffer = new ArrayBuffer(64);
-    const carrier = makeCarrier(arrayBuffer);
-
-    writeEntry(carrier, 0, {
-      type: ENTRY_TYPE.BIGINT_POSITIVE,
-      value: BigInt("0b" + "1".repeat(64)),
-    });
-
-    const entry = readEntry(carrier, 0);
-
-    expect(entry).toMatchInlineSnapshot(`
-      Object {
-        "type": 3,
-        "value": 18446744073709551615n,
-      }
-    `);
-  });
-  test("ENTRY_TYPE.BIGINT_POSITIVE max value", () => {
-    const arrayBuffer = new ArrayBuffer(64);
-    const carrier = makeCarrier(arrayBuffer);
-
-    writeEntry(carrier, 0, {
-      type: ENTRY_TYPE.BIGINT_POSITIVE,
-      value: BigInt("0b" + "1".repeat(64)),
-    });
-
-    expect(readEntry(carrier, 0)).toMatchInlineSnapshot(`
-      Object {
-        "type": 3,
-        "value": 18446744073709551615n,
-      }
-    `);
-  });
-
-  test("ENTRY_TYPE.BIGINT_NEGATIVE min value", () => {
-    const arrayBuffer = new ArrayBuffer(64);
-    const carrier = makeCarrier(arrayBuffer);
-
-    writeEntry(carrier, 0, {
-      type: ENTRY_TYPE.BIGINT_NEGATIVE,
-      value: -BigInt("0b" + "1".repeat(64)),
-    });
-
-    expect(readEntry(carrier, 0)).toMatchInlineSnapshot(`
-      Object {
-        "type": 4,
-        "value": -18446744073709551615n,
-      }
-    `);
-  });
-
-  test("BigInt64 overflow error", () => {
-    const arrayBuffer = new ArrayBuffer(64);
-    const carrier = makeCarrier(arrayBuffer);
-
-    expect(() => {
-      writeEntry(carrier, 0, {
-        type: ENTRY_TYPE.BIGINT_POSITIVE,
-        value: BigInt("0b" + "1".repeat(65)),
-      });
-    }).toThrowErrorMatchingInlineSnapshot(`"BigInt64OverflowError"`);
-  });
-
-  describe("Store tests write/read entry", () => {
-    test("object entry", () => {
-      const arrayBuffer = new ArrayBuffer(64);
-      const carrier = makeCarrier(arrayBuffer);
-
-      const entryToWrite: ObjectEntry = {
-        type: ENTRY_TYPE.OBJECT,
-        refsCount: 0,
-        value: 10,
-      };
-
-      writeEntry(carrier, 0, entryToWrite);
-
-      const entry = readEntry(carrier, 0);
-
-      expect(entry).toMatchInlineSnapshot(`
-        Object {
-          "refsCount": 0,
-          "type": 7,
-          "value": 10,
-        }
-      `);
-    });
-  });
-
-  describe("appendEntry - general", () => {
-    test("appendEntry", () => {
-      const arrayBuffer = new ArrayBuffer(96);
-      initializeArrayBuffer(arrayBuffer);
-
-      const carrier = makeCarrier(arrayBuffer);
-
-      const r1 = appendEntry(externalArgs, carrier, {
-        type: ENTRY_TYPE.STRING,
-        value: "im a string",
-        allocatedBytes: 11,
-      });
-
-      expect(r1).toMatchInlineSnapshot(`48`);
-
-      expect(arrayBuffer2HexArray(arrayBuffer, true)).toMatchInlineSnapshot(`
-Array [
-  "0:0x00",
-  "1:0x00",
-  "2:0x00",
-  "3:0x00",
-  "4:0x08",
-  "5:0x00",
-  "6:0x00",
-  "7:0x00",
-  "8:0x00",
-  "9:0x00",
-  "10:0x00",
-  "11:0x00",
-  "12:0x00",
-  "13:0x00",
-  "14:0x00",
-  "15:0x00",
-  "16:0x28",
-  "17:0x00",
-  "18:0x00",
-  "19:0x00",
-  "20:0x48",
-  "21:0x00",
-  "22:0x00",
-  "23:0x00",
-  "24:0x60",
-  "25:0x00",
-  "26:0x00",
-  "27:0x00",
-  "28:0x08",
-  "29:0x00",
-  "30:0x00",
-  "31:0x00",
-  "32:0x03",
-  "33:0x00",
-  "34:0x00",
-  "35:0x00",
-  "36:0x10",
-  "37:0x00",
-  "38:0x00",
-  "39:0x00",
-  "40:0x20",
-  "41:0x00",
-  "42:0x00",
-  "43:0x00",
-  "44:0x00",
-  "45:0x00",
-  "46:0x00",
-  "47:0x00",
-  "48:0x00",
-  "49:0x00",
-  "50:0x00",
-  "51:0x00",
-  "52:0x00",
-  "53:0x00",
-  "54:0x14",
-  "55:0x40",
-  "56:0x0b",
-  "57:0x00",
-  "58:0x00",
-  "59:0x00",
-  "60:0x69",
-  "61:0x6d",
-  "62:0x20",
-  "63:0x61",
-  "64:0x20",
-  "65:0x73",
-  "66:0x74",
-  "67:0x72",
-  "68:0x69",
-  "69:0x6e",
-  "70:0x67",
-  "71:0x00",
-  "72:0x00",
-  "73:0x00",
-  "74:0x00",
-  "75:0x00",
-  "76:0x00",
-  "77:0x00",
-  "78:0x00",
-  "79:0x00",
-  "80:0x00",
-  "81:0x00",
-  "82:0x00",
-  "83:0x00",
-  "84:0x00",
-  "85:0x00",
-  "86:0x00",
-  "87:0x00",
-  "88:0x00",
-  "89:0x00",
-  "90:0x00",
-  "91:0x00",
-  "92:0x00",
-  "93:0x00",
-  "94:0x00",
-  "95:0x00",
-]
-`);
-
-      expect(arrayBuffer2HexArray(arrayBuffer, true)).toMatchInlineSnapshot(`
-Array [
-  "0:0x00",
-  "1:0x00",
-  "2:0x00",
-  "3:0x00",
-  "4:0x08",
-  "5:0x00",
-  "6:0x00",
-  "7:0x00",
-  "8:0x00",
-  "9:0x00",
-  "10:0x00",
-  "11:0x00",
-  "12:0x00",
-  "13:0x00",
-  "14:0x00",
-  "15:0x00",
-  "16:0x28",
-  "17:0x00",
-  "18:0x00",
-  "19:0x00",
-  "20:0x48",
-  "21:0x00",
-  "22:0x00",
-  "23:0x00",
-  "24:0x60",
-  "25:0x00",
-  "26:0x00",
-  "27:0x00",
-  "28:0x08",
-  "29:0x00",
-  "30:0x00",
-  "31:0x00",
-  "32:0x03",
-  "33:0x00",
-  "34:0x00",
-  "35:0x00",
-  "36:0x10",
-  "37:0x00",
-  "38:0x00",
-  "39:0x00",
-  "40:0x20",
-  "41:0x00",
-  "42:0x00",
-  "43:0x00",
-  "44:0x00",
-  "45:0x00",
-  "46:0x00",
-  "47:0x00",
-  "48:0x00",
-  "49:0x00",
-  "50:0x00",
-  "51:0x00",
-  "52:0x00",
-  "53:0x00",
-  "54:0x14",
-  "55:0x40",
-  "56:0x0b",
-  "57:0x00",
-  "58:0x00",
-  "59:0x00",
-  "60:0x69",
-  "61:0x6d",
-  "62:0x20",
-  "63:0x61",
-  "64:0x20",
-  "65:0x73",
-  "66:0x74",
-  "67:0x72",
-  "68:0x69",
-  "69:0x6e",
-  "70:0x67",
-  "71:0x00",
-  "72:0x00",
-  "73:0x00",
-  "74:0x00",
-  "75:0x00",
-  "76:0x00",
-  "77:0x00",
-  "78:0x00",
-  "79:0x00",
-  "80:0x00",
-  "81:0x00",
-  "82:0x00",
-  "83:0x00",
-  "84:0x00",
-  "85:0x00",
-  "86:0x00",
-  "87:0x00",
-  "88:0x00",
-  "89:0x00",
-  "90:0x00",
-  "91:0x00",
-  "92:0x00",
-  "93:0x00",
-  "94:0x00",
-  "95:0x00",
-]
-`);
-    });
-  });
-});

src/internal/store.ts

@@ -1,8 +0,4 @@
-import { ENTRY_TYPE, isPrimitiveEntryType } from "./entry-types";
-import { Entry, primitive, GlobalCarrier } from "./interfaces";
-import {
-  isPrimitive,
-  primitiveValueToEntry,
-  isKnownAddressValuePointer,
-} from "./utils";
+import { ENTRY_TYPE } from "./entry-types";
+import { Entry, GlobalCarrier } from "./interfaces";
+import { isKnownAddressValuePointer, isTypeWithRC } from "./utils";
 import { ExternalArgs } from "./interfaces";
@@ -14,6 +10,14 @@ import { BigInt64OverflowError } from "./exceptions";
 } from "./consts";
-import { saveValue } from "./saveValue";
 import { getAllLinkedAddresses } from "./getAllLinkedAddresses";
-import { stringEncodeInto } from "./stringEncodeInto";
-import { stringDecode } from "./stringDecode";
+import {
+  typeAndRc_refsCount_get,
+  typeAndRc_refsCount_set,
+  typeOnly_type_get,
+  number_value_get,
+  string_bytesLength_get,
+  string_charsPointer_get,
+} from "./generatedStructs";
+import { Heap } from "../structsGenerator/consts";
+import { readString } from "./readString";
+import { saveValueIterative } from "./saveValue";
 
@@ -91,4 +95,4 @@ const MAX_64_BIG_INT = BigInt("0xFFFFFFFFFFFFFFFF");
     default:
-      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-      // @ts-ignore
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-expect-error
       throw new Error(ENTRY_TYPE[entry.type] + " Not implemented yet");
@@ -100,238 +104,2 @@ }
 
-export function writeEntry(
-  carrier: GlobalCarrier,
-  startingCursor: number,
-  entry: Entry
-) {
-  let cursor = startingCursor;
-
-  // let writtenDataSizeInBytes = 0;
-
-  // write type
-  // undo on throw ?
-  carrier.float64[cursor / Float64Array.BYTES_PER_ELEMENT] = entry.type;
-  cursor += Float64Array.BYTES_PER_ELEMENT;
-
-  switch (entry.type) {
-    case ENTRY_TYPE.NUMBER:
-      carrier.float64[cursor / Float64Array.BYTES_PER_ELEMENT] = entry.value;
-      cursor += Float64Array.BYTES_PER_ELEMENT;
-      break;
-
-    case ENTRY_TYPE.STRING:
-      carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT] =
-        entry.allocatedBytes;
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-
-      // eslint-disable-next-line no-case-declarations
-      const writtenBytes = stringEncodeInto(carrier.uint8, cursor, entry.value);
-
-      if (writtenBytes !== entry.allocatedBytes) {
-        // eslint-disable-next-line no-undef
-        console.warn(
-          {
-            value: entry.value,
-            writtenBytes,
-            allocatedBytes: entry.allocatedBytes,
-          },
-          true
-        );
-        throw new Error("WTF???");
-      }
-
-      cursor += entry.allocatedBytes;
-
-      break;
-
-    case ENTRY_TYPE.BIGINT_NEGATIVE:
-    case ENTRY_TYPE.BIGINT_POSITIVE:
-      if (entry.value > MAX_64_BIG_INT || entry.value < -MAX_64_BIG_INT) {
-        throw new BigInt64OverflowError();
-      }
-      carrier.bigUint64[cursor / BigUint64Array.BYTES_PER_ELEMENT] =
-        entry.type === ENTRY_TYPE.BIGINT_NEGATIVE ? -entry.value : entry.value;
-
-      cursor += BigUint64Array.BYTES_PER_ELEMENT;
-      break;
-
-    case ENTRY_TYPE.OBJECT:
-    case ENTRY_TYPE.SET:
-    case ENTRY_TYPE.MAP:
-      carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT] = entry.refsCount;
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT] = entry.value;
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      break;
-
-    case ENTRY_TYPE.ARRAY:
-      carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT] = entry.refsCount;
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT] = entry.value;
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT] = entry.length;
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT] =
-        entry.allocatedLength;
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      break;
-
-    case ENTRY_TYPE.DATE:
-      carrier.float64[cursor / Float64Array.BYTES_PER_ELEMENT] = entry.value;
-      cursor += Float64Array.BYTES_PER_ELEMENT;
-      carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT] = entry.refsCount;
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      break;
-
-    default:
-      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-      // @ts-ignore
-      throw new Error(ENTRY_TYPE[entry.type] + " Not implemented yet");
-  }
-}
-
-export function appendEntry(
-  externalArgs: ExternalArgs,
-  carrier: GlobalCarrier,
-  entry: Entry
-) {
-  const size = sizeOfEntry(entry);
-
-  const memoryAddress = carrier.allocator.calloc(size);
-
-  writeEntry(carrier, memoryAddress, entry);
-
-  return memoryAddress;
-}
-
-export function readEntry(
-  carrier: GlobalCarrier,
-  startingCursor: number
-): Entry {
-  let cursor = startingCursor;
-
-  const entryType: ENTRY_TYPE =
-    carrier.float64[cursor / Float64Array.BYTES_PER_ELEMENT];
-  cursor += Float64Array.BYTES_PER_ELEMENT;
-
-  const entry: any = {
-    type: entryType,
-    value: undefined as any,
-  };
-
-  // let writtenDataSizeInBytes = 0;
-
-  switch (entryType) {
-    // handled by well-known addresses
-    // case ENTRY_TYPE.UNDEFINED:
-    //   break;
-
-    // case ENTRY_TYPE.NULL:
-    //   break;
-
-    // case ENTRY_TYPE.BOOLEAN:
-    //   entry.value = carrier.dataView.getUint8(cursor) !== 0;
-    //   cursor += Uint8Array.BYTES_PER_ELEMENT;
-    //   break;
-
-    case ENTRY_TYPE.NUMBER:
-      entry.value = carrier.float64[cursor / Float64Array.BYTES_PER_ELEMENT];
-      cursor += Float64Array.BYTES_PER_ELEMENT;
-      break;
-
-    case ENTRY_TYPE.STRING:
-      // eslint-disable-next-line no-case-declarations
-      const stringLength =
-        carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT];
-      entry.allocatedBytes = stringLength;
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-
-      // decode fails with zero length array
-      if (stringLength > 0) {
-        // this wrapping is needed until:
-        // https://github.com/whatwg/encoding/issues/172
-        // eslint-disable-next-line no-case-declarations
-        // const tempAB = new ArrayBuffer(stringLength, true);
-        // arrayBufferCopyTo(dataView.buffer, cursor, stringLength, tempAB, 0, true);
-
-        entry.value = stringDecode(carrier.uint8, cursor, stringLength);
-      } else {
-        entry.value = "";
-      }
-
-      cursor += stringLength;
-
-      break;
-
-    case ENTRY_TYPE.BIGINT_POSITIVE:
-      entry.value =
-        carrier.bigUint64[cursor / BigUint64Array.BYTES_PER_ELEMENT];
-      cursor += BigUint64Array.BYTES_PER_ELEMENT;
-      break;
-
-    case ENTRY_TYPE.BIGINT_NEGATIVE:
-      entry.value = -carrier.bigUint64[
-        cursor / BigUint64Array.BYTES_PER_ELEMENT
-      ];
-      cursor += BigUint64Array.BYTES_PER_ELEMENT;
-      break;
-
-    case ENTRY_TYPE.OBJECT:
-    case ENTRY_TYPE.MAP:
-    case ENTRY_TYPE.SET:
-      entry.refsCount = carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT];
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      entry.value = carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT];
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      break;
-
-    case ENTRY_TYPE.ARRAY:
-      entry.refsCount = carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT];
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      entry.value = carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT];
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      entry.length = carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT];
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      entry.allocatedLength =
-        carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT];
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      break;
-
-    case ENTRY_TYPE.DATE:
-      entry.value = carrier.float64[cursor / Float64Array.BYTES_PER_ELEMENT];
-      cursor += Float64Array.BYTES_PER_ELEMENT;
-      entry.refsCount = carrier.uint32[cursor / Uint32Array.BYTES_PER_ELEMENT];
-      cursor += Uint32Array.BYTES_PER_ELEMENT;
-      break;
-
-    default:
-      throw new Error(ENTRY_TYPE[entryType] + " Not implemented yet");
-  }
-
-  return entry;
-}
-
-export function canReuseMemoryOfEntry(entryA: Entry, value: primitive) {
-  const typeofTheValue = typeof value;
-  // number & bigint 64 are the same size
-  if (
-    (entryA.type === ENTRY_TYPE.BIGINT_NEGATIVE ||
-      entryA.type === ENTRY_TYPE.BIGINT_POSITIVE ||
-      entryA.type === ENTRY_TYPE.NUMBER) &&
-    (typeofTheValue === "bigint" || typeofTheValue === "number")
-  ) {
-    return true;
-  }
-
-  // kill for strings for now
-  // if (
-  //   entryA.type === ENTRY_TYPE.STRING &&
-  //   typeofTheValue === "string" &&
-  //   entryA.allocatedBytes >= strByteLength(value as string)
-  // ) {
-  //   return true;
-  // }
-
-  return false;
-}
-
 export function writeValueInPtrToPtr(
@@ -341,40 +109,15 @@ externalArgs: ExternalArgs,
   ptrToPtr: number,
-  value: any
+  value: unknown
 ) {
-  const existingEntryPointer =
-    carrier.uint32[ptrToPtr / Uint32Array.BYTES_PER_ELEMENT];
+  const referencedPointers: number[] = [];
+  // Might oom here
+  saveValueIterative(
+    externalArgs,
+    carrier,
+    referencedPointers,
+    ptrToPtr,
+    value
+  );
 
-  let reuse = false;
-  let existingValueEntry: Entry | undefined;
-
-  if (!isKnownAddressValuePointer(existingEntryPointer)) {
-    existingValueEntry = readEntry(carrier, existingEntryPointer);
-    reuse =
-      isPrimitive(value) &&
-      isPrimitiveEntryType(existingValueEntry.type) &&
-      canReuseMemoryOfEntry(existingValueEntry, value);
-  }
-
-  // try to re use memory
-  if (reuse) {
-    const newEntry = primitiveValueToEntry(value);
-
-    writeEntry(carrier, existingEntryPointer, newEntry);
-  } else {
-    const referencedPointers: number[] = [];
-    const newEntryPointer = saveValue(
-      externalArgs,
-      carrier,
-      referencedPointers,
-      value
-    );
-
-    carrier.uint32[ptrToPtr / Uint32Array.BYTES_PER_ELEMENT] = newEntryPointer;
-
-    return {
-      referencedPointers,
-      existingEntryPointer,
-      existingValueEntry,
-    };
-  }
+  return referencedPointers;
 }
@@ -386,48 +129,30 @@
   ptrToPtr: number,
-  value: any
+  value: unknown
 ) {
-  const {
-    existingValueEntry = false,
-    existingEntryPointer = 0,
-    referencedPointers = [],
-  } = writeValueInPtrToPtr(externalArgs, carrier, ptrToPtr, value) || {};
+  const existingEntryPointer =
+    carrier.heap.Uint32Array[ptrToPtr / Uint32Array.BYTES_PER_ELEMENT];
+  // Might oom here
+  const referencedPointers = writeValueInPtrToPtr(
+    externalArgs,
+    carrier,
+    ptrToPtr,
+    value
+  );
+  // -- end of might oom
 
+  // commit ref count changes of existing objects
   if (referencedPointers.length > 0) {
     for (const ptr of referencedPointers) {
-      incrementRefCount(externalArgs, carrier, ptr);
+      incrementRefCount(carrier.heap, ptr);
     }
   }
 
-  if (existingValueEntry && "refsCount" in existingValueEntry) {
-    const newRefCount = decrementRefCount(
-      externalArgs,
-      carrier,
-      existingEntryPointer
-    );
-
-    if (newRefCount === 0) {
-      const addressesToFree = getAllLinkedAddresses(
-        carrier,
-        false,
-        existingEntryPointer
-      );
-
-      for (const address of addressesToFree.leafAddresses) {
-        carrier.allocator.free(address);
-      }
-
-      for (const address of addressesToFree.arcAddresses) {
-        decrementRefCount(externalArgs, carrier, address);
-      }
-    }
-  } else {
-    carrier.allocator.free(existingEntryPointer);
-  }
+  handleArcForDeletedValuePointer(carrier, existingEntryPointer);
 }
 
 export function handleArcForDeletedValuePointer(
-  externalArgs: ExternalArgs,
   carrier: GlobalCarrier,
   deletedValuePointer: number
 ): void {
+  const { heap, allocator } = carrier;
   // No memory to free/ARC
@@ -438,79 +163,53 @@ if (isKnownAddressValuePointer(deletedValuePointer)) {
 
-  const existingValueEntry = readEntry(carrier, deletedValuePointer);
-  if (existingValueEntry && "refsCount" in existingValueEntry) {
-    const newRefCount = decrementRefCount(
-      externalArgs,
-      carrier,
-      deletedValuePointer
-    );
-
-    if (newRefCount === 0) {
-      const addressesToFree = getAllLinkedAddresses(
-        carrier,
-        false,
-        deletedValuePointer
+  const entryType = typeOnly_type_get(heap, deletedValuePointer);
+  if (!isTypeWithRC(entryType)) {
+    if (entryType === ENTRY_TYPE.STRING) {
+      allocator.free(
+        string_charsPointer_get(carrier.heap, deletedValuePointer)
       );
-
-      for (const address of addressesToFree.leafAddresses) {
-        carrier.allocator.free(address);
-      }
-
-      for (const address of addressesToFree.arcAddresses) {
-        decrementRefCount(externalArgs, carrier, address);
-      }
     }
-  } else {
-    carrier.allocator.free(deletedValuePointer);
+    allocator.free(deletedValuePointer);
+    return;
   }
-}
 
-export function incrementRefCount(
-  externalArgs: ExternalArgs,
-  carrier: GlobalCarrier,
-  entryPointer: number
-) {
-  const entry = readEntry(carrier, entryPointer);
+  if (decrementRefCount(heap, deletedValuePointer) > 0) {
+    allocator.free(deletedValuePointer);
+    return;
+  }
 
-  if ("refsCount" in entry) {
-    entry.refsCount += 1;
-    writeEntry(carrier, entryPointer, entry);
+  const { leafAddresses, arcAddresses } = getAllLinkedAddresses(
+    carrier,
+    false,
+    deletedValuePointer
+  );
 
-    return entry.refsCount;
+  for (const address of leafAddresses) {
+    allocator.free(address);
   }
 
-  throw new Error("unexpected");
+  for (const address of arcAddresses) {
+    decrementRefCount(heap, address);
+  }
 }
 
-export function decrementRefCount(
-  externalArgs: ExternalArgs,
-  carrier: GlobalCarrier,
-  entryPointer: number
-) {
-  const entry = readEntry(carrier, entryPointer);
+export function incrementRefCount(heap: Heap, entryPointer: number) {
+  typeAndRc_refsCount_set(
+    heap,
+    entryPointer,
+    typeAndRc_refsCount_get(heap, entryPointer) + 1
+  );
 
-  if ("refsCount" in entry) {
-    entry.refsCount -= 1;
-    writeEntry(carrier, entryPointer, entry);
+  return typeAndRc_refsCount_get(heap, entryPointer);
+}
 
-    return entry.refsCount;
-  }
+export function decrementRefCount(heap: Heap, entryPointer: number) {
+  typeAndRc_refsCount_set(
+    heap,
+    entryPointer,
+    typeAndRc_refsCount_get(heap, entryPointer) - 1
+  );
 
-  throw new Error("unexpected");
+  return typeAndRc_refsCount_get(heap, entryPointer);
 }
 
-// export function getObjectPropPtrToPtr(
-//   { dataView }: GlobalCarrier,
-//   pointerToEntry: number
-// ) {
-//   const keyStringLength = dataView.getUint16(pointerToEntry + 1);
-//   const valuePtrToPtr =
-//     Uint16Array.BYTES_PER_ELEMENT + pointerToEntry + 1 + keyStringLength;
-//   const nextPtrToPtr = valuePtrToPtr + Uint32Array.BYTES_PER_ELEMENT;
-
-//   return {
-//     valuePtrToPtr,
-//     nextPtrToPtr
-//   };
-// }
-
 export function getObjectValuePtrToPtr(pointerToEntry: number) {
@@ -543,2 +242,45 @@ return pointerToEntry + 1 + 1;
 export function compareStringOrNumberEntriesInPlace(
+  heap: Heap,
+  entryAPointer: number,
+  entryBPointer: number
+) {
+  typeOnly_type_get(heap, entryAPointer);
+  const entryAType: ENTRY_TYPE.STRING | ENTRY_TYPE.NUMBER = typeOnly_type_get(
+    heap,
+    entryAPointer
+  );
+
+  const entryBType: ENTRY_TYPE.STRING | ENTRY_TYPE.NUMBER = typeOnly_type_get(
+    heap,
+    entryBPointer
+  );
+
+  if (entryAType !== entryBType) {
+    return false;
+  }
+
+  if (entryAType === ENTRY_TYPE.STRING) {
+    const aLength = string_bytesLength_get(heap, entryAPointer);
+    const bLength = string_bytesLength_get(heap, entryBPointer);
+
+    if (aLength !== bLength) {
+      return false;
+    }
+
+    return memComp(
+      heap.Uint8Array,
+      string_charsPointer_get(heap, entryAPointer),
+      string_charsPointer_get(heap, entryBPointer),
+      aLength
+    );
+  }
+
+  // numbers
+  return (
+    number_value_get(heap, entryAPointer) ===
+    number_value_get(heap, entryBPointer)
+  );
+}
+
+export function compareStringOrNumberEntriesInPlaceOld(
   carrier: GlobalCarrier,
@@ -587,1 +329,14 @@ entryAPointer: number,
 }
+
+export function readNumberOrString(heap: Heap, pointer: number) {
+  const type: ENTRY_TYPE.NUMBER | ENTRY_TYPE.STRING = typeOnly_type_get(
+    heap,
+    pointer
+  );
+
+  if (type === ENTRY_TYPE.NUMBER) {
+    return number_value_get(heap, pointer);
+  } else {
+    return readString(heap, pointer);
+  }
+}

src/internal/testUtils.ts

@@ -27,2 +27,3 @@ export function arrayBuffer2HexArray(
 import { MEM_POOL_START } from "./consts";
+import { createHeap } from "../structsGenerator/consts";
 
@@ -81,4 +82,4 @@ // extend pool and not monkey patch? need to think about it
 
-  // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-  // @ts-ignore
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-expect-error
   pool.free = function free(ptr: number) {
@@ -114,2 +115,3 @@ deallocations.add(ptr);
     bigUint64: new BigUint64Array(arrayBuffer),
+    heap: createHeap(arrayBuffer),
   };
@@ -116,0 +118,0 @@

src/internal/utils.ts

@@ -124,2 +124,6 @@ import {
 
+/**
+ * Incorrect length (too big) for emojis
+ * @param str
+ */
 export function strByteLength(str: string) {
@@ -148,1 +152,11 @@ let s = str.length;
 }
+
+export function isTypeWithRC(type: ENTRY_TYPE) {
+  return (
+    type === ENTRY_TYPE.OBJECT ||
+    type === ENTRY_TYPE.ARRAY ||
+    type === ENTRY_TYPE.DATE ||
+    type === ENTRY_TYPE.MAP ||
+    type === ENTRY_TYPE.SET
+  );
+}

src/internal/WeakValueMap.ts

@@ -0,1 +1,5 @@
+/* istanbul ignore file */
+
+// We can't run test with weakrefs yet
+
 const KEYS = 1;
@@ -6,2 +10,3 @@ const VALUES = 2;
 declare const FinalizationGroup: any;
+declare const FinalizationRegistry: any;
 declare const WeakRef: any;
@@ -25,3 +30,8 @@
 
-    this.group = new FinalizationGroup((iterator: Iterable<any>) => {
+    const FinalizationSomething =
+      typeof FinalizationRegistry !== "undefined"
+        ? FinalizationRegistry
+        : FinalizationGroup;
+
+    this.group = new FinalizationSomething((iterator: Iterable<any>) => {
       for (const key of iterator) {
@@ -28,0 +38,0 @@ this.map.delete(key);

New alerts

Filesystem access

Supply chain risk

Accesses the file system, and could potentially read sensitive data.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1313080

increased by63.39%

Number of package files

212

increased by4.95%

Number of lines in readme file

119

increased by9.17%

Worsened metrics

Dev dependency count

37

increased by8.82%

Lines of code

16557

decreased by-20.58%

Number of low supply chain risk alerts

1

increased byInfinity%

Dependency changes

• [e-mail]/malloc@^4.1.14