Switch to @typeberry/lib (#409)

* Switch to typeberry/lib

* Attempts to reduce bundle size.

* Fix build.

* Update lock.

Author: tomusdrw

package-lock.json

@@ -31,7 +31,7 @@
     "@radix-ui/react-tooltip": "^1.1.7",
     "@reduxjs/toolkit": "^2.9.0",
     "@tanstack/react-virtual": "^3.10.9",
-    "@typeberry/pvm-debugger-adapter": "0.1.0-267e8a5",
+    "@typeberry/lib": "^0.0.5",
     "@typeberry/spectool-wasm": "0.23.0",
     "@uiw/react-codemirror": "^4.25.1",
     "class-variance-authority": "^0.7.1",

package.json

@@ -10,7 +10,7 @@ import { NumeralSystem } from "@/context/NumeralSystem";
 import workersReducer from "@/store/workers/workersSlice";
 import debuggerReducer from "@/store/debugger/debuggerSlice";
 import { TooltipProvider } from "@/components/ui/tooltip";
-import { ArgumentType } from "@typeberry/pvm-debugger-adapter";
+import { pvm } from "@typeberry/lib";
 
 // Mock the utils module to avoid program decoding issues
 vi.mock("../utils", async () => {
@@ -53,7 +53,7 @@ function createMockInstruction(
     instructionCode: 1,
     instructionBytes: new Uint8Array([1, 2, 3]),
     args: {
-      type: ArgumentType.NO_ARGUMENTS,
+      type: pvm.ArgumentType.NO_ARGUMENTS,
       noOfBytesToSkip: 3,
     },
     block: {

src/components/Instructions/BasicBlocks/CollapsibleInstructionsTable.test.tsx

@@ -1,5 +1,5 @@
 import { describe, it, expect } from "vitest";
-import { Args } from "@typeberry/pvm-debugger-adapter";
+import { pvm } from "@typeberry/lib";
 import {
   groupInstructionsByBlocks,
   getVisibleInstructionCount,
@@ -26,7 +26,10 @@ function createMockInstruction(
     gas: 100,
     instructionCode: 1,
     instructionBytes: new Uint8Array([1, 2, 3]),
-    args: {} as Args,
+    args: {
+      type: pvm.ArgumentType.NO_ARGUMENTS,
+      noOfBytesToSkip: 3,
+    },
     block: {
       isStart,
       isEnd,

src/components/Instructions/BasicBlocks/blockUtils.test.ts

@@ -1,5 +1,5 @@
-import { NumeralSystem } from "@/context/NumeralSystem";
-import { ArgumentType, Args, ProgramDecoder, BasicBlocks } from "@typeberry/pvm-debugger-adapter";
+import { NumeralSystem } from "@/context/NumeralSystem.tsx";
+import { pvm } from "@typeberry/lib";
 import { ArgumentBitLengths, ArgsDecoder } from "@/packages/pvm/pvm/args-decoder";
 
 export const valueToNumeralSystem = (
@@ -31,25 +31,25 @@ export enum argType {
 export const getArgumentBitLengths = (
   argsDecoder: ArgsDecoder,
   pc: number,
-  argType: ArgumentType,
+  argType: pvm.ArgumentType,
 ): ArgumentBitLengths => {
   return argsDecoder.calculateArgumentBitLengths(pc, argType);
 };
 
 export const decodeAndGetArgsDecoder = (program: number[]) => {
   // Create an instance of ArgsDecoder to calculate bit lengths
-  const programDecoder = new ProgramDecoder(new Uint8Array(program));
+  const programDecoder = new pvm.ProgramDecoder(new Uint8Array(program));
   const code = programDecoder.getCode();
   const mask = programDecoder.getMask();
-  const blocks = new BasicBlocks();
+  const blocks = new pvm.BasicBlocks();
   blocks.reset(code, mask);
   const argsDecoder = new ArgsDecoder();
   argsDecoder.reset(code, mask);
   return argsDecoder;
 };
 
 export const mapInstructionsArgsByType = (
-  args: Args | null,
+  args: pvm.Args | null,
   numeralSystem: NumeralSystem,
   counter: number,
   argsDecoder: ArgsDecoder,
@@ -68,12 +68,12 @@ export const mapInstructionsArgsByType = (
 
   // Calculate bit lengths for the current instruction
   const bitLengths =
-    args.type !== ArgumentType.NO_ARGUMENTS ? getArgumentBitLengths(argsDecoder, counter, args.type) : undefined;
+    args.type !== pvm.ArgumentType.NO_ARGUMENTS ? getArgumentBitLengths(argsDecoder, counter, args.type) : undefined;
 
   switch (args.type) {
-    case ArgumentType.NO_ARGUMENTS:
+    case pvm.ArgumentType.NO_ARGUMENTS:
       return [];
-    case ArgumentType.ONE_IMMEDIATE:
+    case pvm.ArgumentType.ONE_IMMEDIATE:
       return [
         {
           type: argType.IMMEDIATE,
@@ -83,7 +83,7 @@ export const mapInstructionsArgsByType = (
           hiddenFromDetails: bitLengths?.immediateDecoderBits === 0,
         },
       ];
-    case ArgumentType.TWO_IMMEDIATES:
+    case pvm.ArgumentType.TWO_IMMEDIATES:
       return [
         {
           type: argType.IMMEDIATE_LENGTH,
@@ -107,7 +107,7 @@ export const mapInstructionsArgsByType = (
           hiddenFromDetails: bitLengths?.secondImmediateDecoderBits === 0,
         },
       ];
-    case ArgumentType.ONE_OFFSET:
+    case pvm.ArgumentType.ONE_OFFSET:
       return [
         {
           type: argType.OFFSET,
@@ -117,7 +117,7 @@ export const mapInstructionsArgsByType = (
           hiddenFromDetails: bitLengths?.offsetBits === 0,
         },
       ];
-    case ArgumentType.ONE_REGISTER_ONE_IMMEDIATE:
+    case pvm.ArgumentType.ONE_REGISTER_ONE_IMMEDIATE:
       return [
         {
           type: argType.REGISTER,
@@ -134,7 +134,7 @@ export const mapInstructionsArgsByType = (
           hiddenFromDetails: bitLengths?.immediateDecoderBits === 0,
         },
       ];
-    case ArgumentType.ONE_REGISTER_TWO_IMMEDIATES:
+    case pvm.ArgumentType.ONE_REGISTER_TWO_IMMEDIATES:
       return [
         {
           type: argType.REGISTER,
@@ -165,7 +165,7 @@ export const mapInstructionsArgsByType = (
           hiddenFromDetails: bitLengths?.secondImmediateDecoderBits === 0,
         },
       ];
-    case ArgumentType.ONE_REGISTER_ONE_IMMEDIATE_ONE_OFFSET:
+    case pvm.ArgumentType.ONE_REGISTER_ONE_IMMEDIATE_ONE_OFFSET:
       return [
         {
           type: argType.REGISTER,
@@ -196,7 +196,7 @@ export const mapInstructionsArgsByType = (
           hiddenFromDetails: bitLengths?.offsetBits === 0,
         },
       ];
-    case ArgumentType.ONE_REGISTER_ONE_EXTENDED_WIDTH_IMMEDIATE:
+    case pvm.ArgumentType.ONE_REGISTER_ONE_EXTENDED_WIDTH_IMMEDIATE:
       return [
         {
           type: argType.REGISTER,
@@ -213,7 +213,7 @@ export const mapInstructionsArgsByType = (
           hiddenFromDetails: bitLengths?.immediateDecoderBits === 0,
         },
       ];
-    case ArgumentType.TWO_REGISTERS:
+    case pvm.ArgumentType.TWO_REGISTERS:
       return [
         {
           type: argType.REGISTER,
@@ -230,7 +230,7 @@ export const mapInstructionsArgsByType = (
           argumentBitLength: bitLengths?.secondRegisterIndexBits || 4,
         },
       ];
-    case ArgumentType.TWO_REGISTERS_ONE_IMMEDIATE:
+    case pvm.ArgumentType.TWO_REGISTERS_ONE_IMMEDIATE:
       return [
         {
           type: argType.REGISTER,
@@ -254,7 +254,7 @@ export const mapInstructionsArgsByType = (
           hiddenFromDetails: bitLengths?.immediateDecoderBits === 0,
         },
       ];
-    case ArgumentType.TWO_REGISTERS_ONE_OFFSET:
+    case pvm.ArgumentType.TWO_REGISTERS_ONE_OFFSET:
       return [
         {
           type: argType.REGISTER,
@@ -278,7 +278,7 @@ export const mapInstructionsArgsByType = (
           hiddenFromDetails: bitLengths?.offsetBits === 0,
         },
       ];
-    case ArgumentType.TWO_REGISTERS_TWO_IMMEDIATES:
+    case pvm.ArgumentType.TWO_REGISTERS_TWO_IMMEDIATES:
       return [
         {
           type: argType.REGISTER,
@@ -316,7 +316,7 @@ export const mapInstructionsArgsByType = (
           hiddenFromDetails: bitLengths?.secondImmediateDecoderBits === 0,
         },
       ];
-    case ArgumentType.THREE_REGISTERS:
+    case pvm.ArgumentType.THREE_REGISTERS:
       return [
         {
           type: argType.REGISTER,
@@ -346,7 +346,7 @@ export const mapInstructionsArgsByType = (
 };
 
 export const getASMInstructionValueHtml = (
-  args: Args,
+  args: pvm.Args,
   numeralSystem: number,
   counter: number,
   argsDecoder: ArgsDecoder,

src/components/Instructions/utils.tsx

@@ -1,9 +1,7 @@
 import { NumeralSystem } from "@/context/NumeralSystem";
 import { WorkerState } from "@/store/workers/workersSlice";
 import { valueToNumeralSystem } from "../Instructions/utils";
-import { block } from "@typeberry/pvm-debugger-adapter";
-
-const codec = block.codec;
+import { codec } from "@typeberry/lib";
 
 export type FindMemoryForWorkerType = (
   worker: WorkerState,

src/components/MemoryPreview/utils.ts

@@ -1,7 +1,7 @@
 import { useDropzone } from "react-dropzone";
 import { ProgramUploadFileInput, ProgramUploadFileOutput } from "./types";
 import { mapUploadFileInputToOutput } from "./utils";
-import { bytes, ProgramDecoder } from "@typeberry/pvm-debugger-adapter";
+import { bytes, pvm } from "@typeberry/lib";
 import { ExpectedState, MemoryChunkItem, PageMapItem, RegistersArray } from "@/types/pvm.ts";
 import { SafeParseReturnType, z } from "zod";
 import { useAppSelector } from "@/store/hooks";
@@ -144,7 +144,7 @@ function loadFileFromUint8Array(
   // Finally try to load program as a Generic
   let program = null;
   try {
-    program = new ProgramDecoder(uint8Array);
+    program = new pvm.ProgramDecoder(uint8Array);
   } catch (e) {
     console.warn("not a generic PVM", e);
   }

src/components/ProgramLoader/ProgramFileUpload.tsx

@@ -1,7 +1,7 @@
 import { Textarea } from "@/components/ui/textarea.tsx";
 import React, { useMemo, useState } from "react";
 import classNames from "classnames";
-import { bytes } from "@typeberry/pvm-debugger-adapter";
+import { bytes } from "@typeberry/lib";
 import { logger } from "@/utils/loggerService";
 import { useAppSelector } from "@/store/hooks.ts";
 import { selectIsProgramInvalid } from "@/store/debugger/debuggerSlice.ts";

src/components/ProgramTextLoader/index.tsx

@@ -1,6 +1,6 @@
 import { clsx, type ClassValue } from "clsx";
 import { twMerge } from "tailwind-merge";
-import { MemorySegment, SpiMemory } from "@typeberry/pvm-debugger-adapter";
+import { pvm } from "@typeberry/lib";
 import { MemoryChunkItem, PageMapItem } from "@/types/pvm.ts";
 
 export function cn(...inputs: ClassValue[]) {
@@ -76,7 +76,7 @@ function pageAlignUp(v: number) {
   return (((v + PAGE_SIZE - 1) >> PAGE_SHIFT) << PAGE_SHIFT) >>> 0;
 }
 
-function asChunks(mem: MemorySegment[]): MemoryChunkItem[] {
+function asChunks(mem: pvm.MemorySegment[]): MemoryChunkItem[] {
   const items = [];
   for (const segment of mem) {
     if (segment.data === null) {
@@ -101,7 +101,7 @@ function asChunks(mem: MemorySegment[]): MemoryChunkItem[] {
   return items;
 }
 
-function asPageMap(mem: MemorySegment[], isWriteable: boolean): PageMapItem[] {
+function asPageMap(mem: pvm.MemorySegment[], isWriteable: boolean): PageMapItem[] {
   const items = [];
   for (const segment of mem) {
     const pageOffset = segment.start % PAGE_SIZE;
@@ -118,10 +118,10 @@ function asPageMap(mem: MemorySegment[], isWriteable: boolean): PageMapItem[] {
   return items;
 }
 
-export function getAsPageMap(mem: SpiMemory): PageMapItem[] {
+export function getAsPageMap(mem: pvm.SpiMemory): PageMapItem[] {
   return asPageMap(mem.readable, false).concat(asPageMap(mem.writeable, true));
 }
 
-export function getAsChunks(mem: SpiMemory): MemoryChunkItem[] {
+export function getAsChunks(mem: pvm.SpiMemory): MemoryChunkItem[] {
   return asChunks(mem.readable).concat(asChunks(mem.writeable));
 }