fix: numbers parsing; add start of test

src/index.ts

@@ -7,6 +7,7 @@ const version = require("../package.json").version;
 
 // Expose all types
 export * from "./soroban_rpc";
+export * from "./strval";
 
 // stellar-sdk classes to expose
 export { Server } from "./server";

src/strval.ts

@@ -43,13 +43,20 @@ import { Contract } from "..";
 //@ts-ignore Does exist
 import { ScInt, scValToBigInt } from "..";
 
-interface Union<T> {
+export interface Union<T> {
   tag: string;
   value: T;
 }
 
 export class ContractSpec {
-  constructor(public entries: xdr.ScSpecEntry[]) {}
+  public entries: xdr.ScSpecEntry[];
+  constructor(entries: xdr.ScSpecEntry[] | string) {
+    if (typeof entries === "string") {
+      throw new Error("");
+    } else {
+      this.entries = entries;
+    }
+  }
 
   findEntry(name: string): xdr.ScSpecEntry {
     let entry = this.entries.find(
@@ -285,36 +292,26 @@ export class ContractSpec {
       case "number":
       case "bigint": {
         let ty = typeDef ?? xdr.ScSpecTypeDef.scSpecTypeU32();
-        let type_ = undefined;
         switch (ty.switch().name) {
-          case "scSpecTypeU128":
-            type_ = "u128";
-            break;
-          case "scSpecTypeI128":
-            type_ = "i128";
-            break;
-          case "scSpecTypeU256":
-            type_ = "u256";
-            break;
-          case "scSpecTypeI256":
-            type_ = "i256";
-            break;
           case "scSpecTypeU32":
-            type_ = "u32";
-            break;
+            return xdr.ScVal.scvU32(val as number);
           case "scSpecTypeI32":
-            type_ = "i32";
-            break;
+            return xdr.ScVal.scvI32(val as number);
           case "scSpecTypeU64":
-            type_ = "u64";
-            break;
+            return new ScInt(val, { type: "u64" }).toU64();
           case "scSpecTypeI64":
-            type_ = "i64";
-            break;
+            return new ScInt(val, { type: "i64" }).toI64();
+          case "scSpecTypeU128":
+            return new ScInt(val, { type: "u128" }).toU128();
+          case "scSpecTypeI128":
+            return new ScInt(val, { type: "i128" }).toI128();
+          case "scSpecTypeU256":
+            return new ScInt(val, { type: "u256" }).toU256();
+          case "scSpecTypeI256":
+            return new ScInt(val, { type: "i256" }).toI256();
           default:
+            throw new TypeError(`invalid type (${ty}) specified for integer`);
         }
-
-        return new ScInt(val, { type: type_ }).toScVal();
       }
       case "string":
         return stringToScVal(
@@ -528,9 +525,11 @@ export class ContractSpec {
 
       case xdr.ScValType.scvString().value:
       case xdr.ScValType.scvSymbol().value: {
-        const v = scv.value(); 
+        const v = scv.value();
         if (typeof v !== "string") {
-          throw new Error(`Expected a string value from xdr but got ${v}: ${typeof v}`);
+          throw new Error(
+            `Expected a string value from xdr but got ${v}: ${typeof v}`
+          );
         }
         return v as T; // string
       }
@@ -559,18 +558,17 @@ export class ContractSpec {
 
       // in the fallthrough case, just return the underlying value directly
       default:
-        throw new TypeError(`failed to convert ${scv} to native type from type ${typeDef}`);
+        throw new TypeError(
+          `failed to convert ${scv} to native type from type ${typeDef}`
+        );
     }
   }
 
   scValUdtToNative(scv: xdr.ScVal, udt: xdr.ScSpecTypeUdt) {
     let entry = this.findEntry(udt.name() as string);
     switch (entry.switch()) {
       case xdr.ScSpecEntryKind.scSpecEntryUdtEnumV0():
-        return this.enumToNative(
-          scv,
-          entry.value() as xdr.ScSpecUdtEnumV0
-        );
+        return this.enumToNative(scv, entry.value() as xdr.ScSpecUdtEnumV0);
       case xdr.ScSpecEntryKind.scSpecEntryUdtStructV0():
         return this.structToNative(scv, entry.value() as xdr.ScSpecUdtStructV0);
       case xdr.ScSpecEntryKind.scSpecEntryUdtUnionV0():
@@ -591,7 +589,8 @@ export class ContractSpec {
       throw new Error(`Enum must have a u32 value`);
     }
     let num = scv.value() as number;
-    if (udt.cases().some((entry) => entry.value() === num)) {}
+    if (udt.cases().some((entry) => entry.value() === num)) {
+    }
     return num;
   }
 }

test/unit/strval_test.js

@@ -0,0 +1,59 @@
+const xdr = SorobanClient.xdr;
+const ScInt = SorobanClient.ScInt; // shorthand
+const [scValToNative, nativeToScVal] = [
+  SorobanClient.scValToNative,
+  SorobanClient.nativeToScVal
+];
+
+describe('parsing and building ScVals', function () {
+
+
+  it('Can parse entries', function () {
+      CUSTOM_TYPES_XDR.forEach((entry, i) => {
+          console.log(entry)
+          console.log(xdr.ScSpecEntry.fromXDR(entry, 'base64'));
+      });
+
+  });
+
+});
+
+
+function custom_types_spec() {
+  return SorobanClient.ContractSpec(xdr.Sp)
+}
+
+const CUSTOM_TYPES_XDR = ["AAAAAQAAAC9UaGlzIGlzIGZyb20gdGhlIHJ1c3QgZG9jIGFib3ZlIHRoZSBzdHJ1Y3QgVGVzdAAAAAAAAAAABFRlc3QAAAADAAAAAAAAAAFhAAAAAAAABAAAAAAAAAABYgAAAAAAAAEAAAAAAAAAAWMAAAAAAAAR",
+"AAAAAgAAAAAAAAAAAAAAClNpbXBsZUVudW0AAAAAAAMAAAAAAAAAAAAAAAVGaXJzdAAAAAAAAAAAAAAAAAAABlNlY29uZAAAAAAAAAAAAAAAAAAFVGhpcmQAAAA=",
+"AAAAAwAAAAAAAAAAAAAACVJveWFsQ2FyZAAAAAAAAAMAAAAAAAAABEphY2sAAAALAAAAAAAAAAVRdWVlbgAAAAAAAAwAAAAAAAAABEtpbmcAAAAN",
+"AAAAAQAAAAAAAAAAAAAAC1R1cGxlU3RydWN0AAAAAAIAAAAAAAAAATAAAAAAAAfQAAAABFRlc3QAAAAAAAAAATEAAAAAAAfQAAAAClNpbXBsZUVudW0AAA==",
+"AAAAAgAAAAAAAAAAAAAAC0NvbXBsZXhFbnVtAAAAAAUAAAABAAAAAAAAAAZTdHJ1Y3QAAAAAAAEAAAfQAAAABFRlc3QAAAABAAAAAAAAAAVUdXBsZQAAAAAAAAEAAAfQAAAAC1R1cGxlU3RydWN0AAAAAAEAAAAAAAAABEVudW0AAAABAAAH0AAAAApTaW1wbGVFbnVtAAAAAAABAAAAAAAAAAVBc3NldAAAAAAAAAIAAAATAAAACwAAAAAAAAAAAAAABFZvaWQ=",
+"AAAABAAAAAAAAAAAAAAABUVycm9yAAAAAAAAAQAAABpVbmtub3duIGVycm9yIGhhcyBvY2N1cnJlZAAAAAAABE9oTm8AAAAB",
+"AAAAAAAAAAAAAAAFaGVsbG8AAAAAAAABAAAAAAAAAAVoZWxsbwAAAAAAABEAAAABAAAAEQ==",
+"AAAAAAAAAAAAAAAEd29pZAAAAAAAAAAA",
+"AAAAAAAAAAAAAAADdmFsAAAAAAAAAAABAAAAAA==",
+"AAAAAAAAAAAAAAAQdTMyX2ZhaWxfb25fZXZlbgAAAAEAAAAAAAAABHUzMl8AAAAEAAAAAQAAA+kAAAAEAAAAAw==",
+"AAAAAAAAAAAAAAAEdTMyXwAAAAEAAAAAAAAABHUzMl8AAAAEAAAAAQAAAAQ=",
+"AAAAAAAAAAAAAAAEaTMyXwAAAAEAAAAAAAAABGkzMl8AAAAFAAAAAQAAAAU=",
+"AAAAAAAAAAAAAAAEaTY0XwAAAAEAAAAAAAAABGk2NF8AAAAHAAAAAQAAAAc=",
+"AAAAAAAAACxFeGFtcGxlIGNvbnRyYWN0IG1ldGhvZCB3aGljaCB0YWtlcyBhIHN0cnVjdAAAAApzdHJ1a3RfaGVsAAAAAAABAAAAAAAAAAZzdHJ1a3QAAAAAB9AAAAAEVGVzdAAAAAEAAAPqAAAAEQ==",
+"AAAAAAAAAAAAAAAGc3RydWt0AAAAAAABAAAAAAAAAAZzdHJ1a3QAAAAAB9AAAAAEVGVzdAAAAAEAAAfQAAAABFRlc3Q=",
+"AAAAAAAAAAAAAAAGc2ltcGxlAAAAAAABAAAAAAAAAAZzaW1wbGUAAAAAB9AAAAAKU2ltcGxlRW51bQAAAAAAAQAAB9AAAAAKU2ltcGxlRW51bQAA",
+"AAAAAAAAAAAAAAAHY29tcGxleAAAAAABAAAAAAAAAAdjb21wbGV4AAAAB9AAAAALQ29tcGxleEVudW0AAAAAAQAAB9AAAAALQ29tcGxleEVudW0A",
+"AAAAAAAAAAAAAAAIYWRkcmVzc2UAAAABAAAAAAAAAAhhZGRyZXNzZQAAABMAAAABAAAAEw==",
+"AAAAAAAAAAAAAAAFYnl0ZXMAAAAAAAABAAAAAAAAAAVieXRlcwAAAAAAAA4AAAABAAAADg==",
+"AAAAAAAAAAAAAAAHYnl0ZXNfbgAAAAABAAAAAAAAAAdieXRlc19uAAAAA+4AAAAJAAAAAQAAA+4AAAAJ",
+"AAAAAAAAAAAAAAAEY2FyZAAAAAEAAAAAAAAABGNhcmQAAAfQAAAACVJveWFsQ2FyZAAAAAAAAAEAAAfQAAAACVJveWFsQ2FyZAAAAA==",
+"AAAAAAAAAAAAAAAHYm9vbGVhbgAAAAABAAAAAAAAAAdib29sZWFuAAAAAAEAAAABAAAAAQ==",
+"AAAAAAAAABdOZWdhdGVzIGEgYm9vbGVhbiB2YWx1ZQAAAAADbm90AAAAAAEAAAAAAAAAB2Jvb2xlYW4AAAAAAQAAAAEAAAAB",
+"AAAAAAAAAAAAAAAEaTEyOAAAAAEAAAAAAAAABGkxMjgAAAALAAAAAQAAAAs=",
+"AAAAAAAAAAAAAAAEdTEyOAAAAAEAAAAAAAAABHUxMjgAAAAKAAAAAQAAAAo=",
+"AAAAAAAAAAAAAAAKbXVsdGlfYXJncwAAAAAAAgAAAAAAAAABYQAAAAAAAAQAAAAAAAAAAWIAAAAAAAABAAAAAQAAAAQ=",
+"AAAAAAAAAAAAAAADbWFwAAAAAAEAAAAAAAAAA21hcAAAAAPsAAAABAAAAAEAAAABAAAD7AAAAAQAAAAB",
+"AAAAAAAAAAAAAAADdmVjAAAAAAEAAAAAAAAAA3ZlYwAAAAPqAAAABAAAAAEAAAPqAAAABA==",
+"AAAAAAAAAAAAAAAFdHVwbGUAAAAAAAABAAAAAAAAAAV0dXBsZQAAAAAAA+0AAAACAAAAEQAAAAQAAAABAAAD7QAAAAIAAAARAAAABA==",
+"AAAAAAAAAB9FeGFtcGxlIG9mIGFuIG9wdGlvbmFsIGFyZ3VtZW50AAAAAAZvcHRpb24AAAAAAAEAAAAAAAAABm9wdGlvbgAAAAAD6AAAAAQAAAABAAAD6AAAAAQ=",
+"AAAAAAAAAAAAAAAEdTI1NgAAAAEAAAAAAAAABHUyNTYAAAAMAAAAAQAAAAw=",
+"AAAAAAAAAAAAAAAEaTI1NgAAAAEAAAAAAAAABGkyNTYAAAANAAAAAQAAAA0=",
+"AAAAAAAAAAAAAAAGc3RyaW5nAAAAAAABAAAAAAAAAAZzdHJpbmcAAAAAABAAAAABAAAAEA==",
+"AAAAAAAAAAAAAAAMdHVwbGVfc3RydWt0AAAAAQAAAAAAAAAMdHVwbGVfc3RydWt0AAAH0AAAAAtUdXBsZVN0cnVjdAAAAAABAAAH0AAAAAtUdXBsZVN0cnVjdAA="];