@typeberry/lib 0.1.2-dd9b0e2 → 0.1.2

package/index.cjs

@@ -8052,8 +8052,8 @@ function print(level, levelAndName, strings, data) {
         return;
     }
     const lvlText = Level[level].padEnd(5);
-    const val = strings.map((v, idx) => `${v}${idx < data.length ? data[idx] : ""}`);
-    const msg = `${lvlText} [${levelAndName[1]}] ${val.join("")}`;
+    const val = strings.map((v, idx) => `${v}${data[idx]}`);
+    const msg = `${lvlText} [${levelAndName[1]}] ${val}`;
     if (level === Level.WARN) {
         console.warn(msg);
     }
@@ -14125,17 +14125,6 @@ class PageRange {
         }
         return new PageRange(start, length);
     }
-    /** Returns true if the page range is wrapped (`start` >= `end`) and is not empty */
-    isWrapped() {
-        return this.start >= this.end && !this.isEmpty();
-    }
-    /** Checks if given page number is within the range */
-    isInRange(page) {
-        if (this.isWrapped()) {
-            return page >= this.start || page < this.end;
-        }
-        return page >= this.start && page < this.end;
-    }
     /** Checks if a range is empty (`length === 0`) */
     isEmpty() {
         return this.length === 0;
@@ -14476,11 +14465,10 @@ class MemoryBuilder {
       startHeapIndex (${startHeapIndex}) has to be less than or equal to endHeapIndex (${endHeapIndex})
     `;
         this.ensureNotFinalized();
-        const heapRange = MemoryRange.fromStartAndLength(startHeapIndex, endHeapIndex - startHeapIndex);
-        const heapPagesRange = PageRange.fromMemoryRange(heapRange);
-        const initializedPageNumbers = Array.from(this.initialMemory.keys());
-        for (const pageNumber of initializedPageNumbers) {
-            if (heapPagesRange.isInRange(pageNumber)) {
+        const range = MemoryRange.fromStartAndLength(startHeapIndex, endHeapIndex - startHeapIndex);
+        const pages = PageRange.fromMemoryRange(range);
+        for (const pageNumber of pages) {
+            if (this.initialMemory.has(pageNumber)) {
                 throw new IncorrectSbrkIndex();
             }
         }

package/index.d.ts

@@ -14780,12 +14780,11 @@ declare class MemoryBuilder {
     `;
     this.ensureNotFinalized();
 
-    const heapRange = MemoryRange.fromStartAndLength(startHeapIndex, endHeapIndex - startHeapIndex);
-    const heapPagesRange = PageRange.fromMemoryRange(heapRange);
-    const initializedPageNumbers = Array.from(this.initialMemory.keys());
+    const range = MemoryRange.fromStartAndLength(startHeapIndex, endHeapIndex - startHeapIndex);
+    const pages = PageRange.fromMemoryRange(range);
 
-    for (const pageNumber of initializedPageNumbers) {
-      if (heapPagesRange.isInRange(pageNumber)) {
+    for (const pageNumber of pages) {
+      if (this.initialMemory.has(pageNumber)) {
         throw new IncorrectSbrkIndex();
       }
     }

package/index.js

@@ -8049,8 +8049,8 @@ function print(level, levelAndName, strings, data) {
         return;
     }
     const lvlText = Level[level].padEnd(5);
-    const val = strings.map((v, idx) => `${v}${idx < data.length ? data[idx] : ""}`);
-    const msg = `${lvlText} [${levelAndName[1]}] ${val.join("")}`;
+    const val = strings.map((v, idx) => `${v}${data[idx]}`);
+    const msg = `${lvlText} [${levelAndName[1]}] ${val}`;
     if (level === Level.WARN) {
         console.warn(msg);
     }
@@ -14122,17 +14122,6 @@ class PageRange {
         }
         return new PageRange(start, length);
     }
-    /** Returns true if the page range is wrapped (`start` >= `end`) and is not empty */
-    isWrapped() {
-        return this.start >= this.end && !this.isEmpty();
-    }
-    /** Checks if given page number is within the range */
-    isInRange(page) {
-        if (this.isWrapped()) {
-            return page >= this.start || page < this.end;
-        }
-        return page >= this.start && page < this.end;
-    }
     /** Checks if a range is empty (`length === 0`) */
     isEmpty() {
         return this.length === 0;
@@ -14473,11 +14462,10 @@ class MemoryBuilder {
       startHeapIndex (${startHeapIndex}) has to be less than or equal to endHeapIndex (${endHeapIndex})
     `;
         this.ensureNotFinalized();
-        const heapRange = MemoryRange.fromStartAndLength(startHeapIndex, endHeapIndex - startHeapIndex);
-        const heapPagesRange = PageRange.fromMemoryRange(heapRange);
-        const initializedPageNumbers = Array.from(this.initialMemory.keys());
-        for (const pageNumber of initializedPageNumbers) {
-            if (heapPagesRange.isInRange(pageNumber)) {
+        const range = MemoryRange.fromStartAndLength(startHeapIndex, endHeapIndex - startHeapIndex);
+        const pages = PageRange.fromMemoryRange(range);
+        for (const pageNumber of pages) {
+            if (this.initialMemory.has(pageNumber)) {
                 throw new IncorrectSbrkIndex();
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typeberry/lib",
-  "version": "0.1.2-dd9b0e2",
+  "version": "0.1.2",
   "main": "index.js",
   "author": "Fluffy Labs",
   "license": "MPL-2.0",