@kontor/kontor-sdk 1.0.0-alpha.19 → 1.0.0-alpha.21

package/src/wit/wit-parser/core/types/utils.test-d.ts

@@ -46,30 +46,36 @@ test("ParseWitParameter", () => {
   assertType<ParseWitParameter<"ctx: borrow<proc-context>">>({
     name: "ctx",
     type: "borrow<proc-context>",
+    internalType: "borrow<proc-context>",
   });
 
   assertType<ParseWitParameter<"arith-address: contract-address">>({
     name: "arith-address",
     type: "contract-address",
+    internalType: "contract-address",
   });
 
   assertType<ParseWitParameter<"n: u64">>({
     name: "n",
     type: "u64",
+    internalType: "u64",
   });
 
   assertType<ParseWitParameter<"u64">>({
     type: "u64",
+    internalType: "u64",
   });
 
   assertType<ParseWitParameter<"x: string">>({
     name: "x",
     type: "string",
+    internalType: "string",
   });
 
   assertType<ParseWitParameter<"y: string">>({
     name: "y",
     type: "string",
+    internalType: "string",
   });
 
   assertType<ParseWitParameter<"option-string: option<string>">>({
@@ -91,15 +97,18 @@ test("ParseWitParameter", () => {
 
   assertType<ParseWitParameter<"contract-address">>({
     type: "contract-address",
+    internalType: "contract-address",
   });
   assertType<ParseWitParameter<"ctx: borrow<view-context>">>({
     name: "ctx",
     type: "borrow<view-context>",
+    internalType: "borrow<view-context>",
   });
 
   assertType<ParseWitParameter<"arith-address: contract-address">>({
     name: "arith-address",
     type: "contract-address",
+    internalType: "contract-address",
   });
 });
 
@@ -149,12 +158,17 @@ test("Parse Signature", () => {
     name: "fib",
     context: "proc",
     inputs: [
-      { name: "arith-address", type: "contract-address" },
+      {
+        name: "arith-address",
+        type: "contract-address",
+        internalType: "contract-address",
+      },
       { name: "n", type: "list<u64>" },
     ],
     outputs: [
       {
         type: "u64",
+        internalType: "u64",
       },
     ],
   });
@@ -165,12 +179,17 @@ test("Parse Signature", () => {
     name: "fib",
     context: "proc",
     inputs: [
-      { name: "arith-address", type: "contract-address" },
+      {
+        name: "arith-address",
+        type: "contract-address",
+        internalType: "contract-address",
+      },
       { name: "n", type: "list<u64>" },
     ],
     outputs: [
       {
         type: "contract-address",
+        internalType: "contract-address",
       },
     ],
   });
@@ -184,12 +203,14 @@ test("Parse Signature", () => {
       {
         name: "arith-address",
         type: "contract-address",
+        internalType: "contract-address",
       },
       { name: "n", type: "list<u64>" },
     ],
     outputs: [
       {
         type: "contract-address",
+        internalType: "contract-address",
       },
     ],
   });

package/src/wit/wit-parser/core/types/utils.ts

@@ -26,9 +26,13 @@ type GetComponents<T> = T extends { components: infer C }
 type AsTupleFromRecord<T extends string, Opts extends ParseOptions> =
   HasRecords<Opts> extends true
     ? T extends keyof RecordsOf<Opts>
-      ? Readonlyify<{ type: "tuple"; components: RecordsOf<Opts>[T] }>
-      : Readonlyify<{ type: T }>
-    : Readonlyify<{ type: T }>;
+      ? Readonlyify<{
+          type: "tuple";
+          components: RecordsOf<Opts>[T];
+          internalType: T;
+        }>
+      : Readonlyify<{ type: T; internalType: T }>
+    : Readonlyify<{ type: T; internalType: T }>;
 
 type SplitResultInner<S extends string> = S extends `${infer L}, ${infer R}`
   ? [Trim<L>, Trim<R>]
@@ -40,44 +44,6 @@ type MaybeResultComponents<
   _Err extends { type: string },
 > = Ok extends { components: infer _C } ? GetComponents<Ok> : {};
 
-// type MaybeResultComponents<
-//   L extends { type: string },
-//   R extends { type: string },
-// > = L extends { components: infer _LC }
-//   ? R extends { components: infer _RC }
-//     ? {
-//         readonly components: [
-//           {
-//             readonly name: "left";
-//             readonly type: L["type"];
-//           } & GetComponents<L>,
-//           {
-//             readonly name: "right";
-//             readonly type: R["type"];
-//           } & GetComponents<R>,
-//         ];
-//       }
-//     : {
-//         readonly components: [
-//           {
-//             readonly name: "left";
-//             readonly type: L["type"];
-//           } & GetComponents<L>,
-//           { readonly name: "right"; readonly type: R["type"] },
-//         ];
-//       }
-//   : R extends { components: infer _RC }
-//     ? {
-//         readonly components: [
-//           { readonly name: "left"; readonly type: L["type"] },
-//           {
-//             readonly name: "right";
-//             readonly type: R["type"];
-//           } & GetComponents<R>,
-//         ];
-//       }
-//     : {}; // neither side has components → omit components entirely
-
 type MapGenericType<T extends string, Opts extends ParseOptions> =
   // list<...>
   T extends `list<${infer U}>`
@@ -103,6 +69,7 @@ type MapGenericType<T extends string, Opts extends ParseOptions> =
               ? Readonlyify<
                   {
                     type: `result<${LMapped["type"]}, ${RMapped["type"]}>`;
+                    internalType: T;
                   } & MaybeResultComponents<LMapped, RMapped>
                 >
               : never

package/src/wit/wit-parser/core/utils.test.ts

@@ -28,16 +28,19 @@ describe("parseFunctionSignature", () => {
           {
             name: "arith-address",
             type: "contract-address",
+            internalType: "contract-address",
           },
           {
             name: "n",
             type: "u64",
+            internalType: "u64",
           },
         ],
         name: "fib",
         outputs: [
           {
             type: "u64",
+            internalType: "u64",
           },
         ],
         type: "function",
@@ -53,6 +56,7 @@ describe("parseFunctionSignature", () => {
         outputs: [
           {
             type: "list<u64>",
+            internalType: "list<u64>",
           },
         ],
         type: "function",
@@ -70,6 +74,7 @@ describe("parseWitParameter", () => {
       expected: {
         name: "ctx",
         type: "borrow<proc-context>",
+        internalType: "borrow<proc-context>",
       },
     },
     {
@@ -77,6 +82,7 @@ describe("parseWitParameter", () => {
       expected: {
         name: "arith-address",
         type: "tuple",
+        internalType: "contract-address",
         components: [
           { name: "name", type: "string" },
           { name: "height", type: "s64" },
@@ -89,6 +95,7 @@ describe("parseWitParameter", () => {
       expected: {
         name: "n",
         type: "u64",
+        internalType: "u64",
       },
     },
     {
@@ -96,6 +103,7 @@ describe("parseWitParameter", () => {
       expected: {
         name: "y",
         type: "string",
+        internalType: "string",
       },
     },
     {
@@ -103,6 +111,7 @@ describe("parseWitParameter", () => {
       expected: {
         name: "list-of-strings",
         type: "list<string>",
+        internalType: "list<string>",
       },
     },
     {
@@ -110,6 +119,7 @@ describe("parseWitParameter", () => {
       expected: {
         name: "arith-addresses",
         type: "list<tuple>",
+        internalType: "list<contract-address>",
         components: [
           { name: "name", type: "string" },
           { name: "height", type: "s64" },
@@ -121,6 +131,7 @@ describe("parseWitParameter", () => {
       parameter: "list<contract-address>",
       expected: {
         type: "list<tuple>",
+        internalType: "list<contract-address>",
         components: [
           { name: "name", type: "string" },
           { name: "height", type: "s64" },
@@ -132,6 +143,7 @@ describe("parseWitParameter", () => {
       parameter: "option<contract-address>",
       expected: {
         type: "option<tuple>",
+        internalType: "option<contract-address>",
         components: [
           { name: "name", type: "string" },
           { name: "height", type: "s64" },
@@ -143,6 +155,7 @@ describe("parseWitParameter", () => {
       parameter: "result<contract-address, error>",
       expected: {
         type: "result<tuple, error>",
+        internalType: "result<contract-address, error>",
         components: [
           { name: "name", type: "string" },
           { name: "height", type: "s64" },
@@ -154,6 +167,7 @@ describe("parseWitParameter", () => {
       parameter: "result<list<contract-address>, error>",
       expected: {
         type: "result<list<tuple>, error>",
+        internalType: "result<list<contract-address>, error>",
         components: [
           { name: "name", type: "string" },
           { name: "height", type: "s64" },

package/src/wit/wit-parser/core/utils.ts

@@ -152,6 +152,7 @@ export function parseWitParameter(param: string, options?: ParseOptions) {
 
   const witParameter: WitParameter = {
     type: `${type}${match.array ?? ""}`,
+    internalType: match.type,
     ...(name as { name: string }),
     ...components,
   };

package/src/wit/wit-parser/parse-wit-parameter.test.ts

@@ -7,6 +7,7 @@ test("ParseWitParameter", () => {
   expectTypeOf<ParseWitParameter<["arith-address: contract-address"]>>()
     .toEqualTypeOf<{
     name: "arith-address";
+    internalType: "contract-address";
     type: "contract-address";
   }>;
 
@@ -20,18 +21,22 @@ test("ParseWitParameter", () => {
   >().toEqualTypeOf<{
     readonly name: "arith-address";
     readonly type: "tuple";
+    readonly internalType: "contract-address";
     readonly components: readonly [
       {
         readonly name: "name";
         readonly type: "string";
+        readonly internalType: "string";
       },
       {
         readonly name: "height";
         readonly type: "s64";
+        readonly internalType: "s64";
       },
       {
         readonly name: "tx-index";
         readonly type: "s64";
+        readonly internalType: "s64";
       },
     ];
   }>();
@@ -46,18 +51,22 @@ test("ParseWitParameter", () => {
   >().toEqualTypeOf<{
     readonly name: "arith-address";
     readonly type: "result<tuple, error>";
+    readonly internalType: "result<contract-address, error>";
     readonly components: readonly [
       {
         readonly name: "name";
         readonly type: "string";
+        readonly internalType: "string";
       },
       {
         readonly name: "height";
         readonly type: "s64";
+        readonly internalType: "s64";
       },
       {
         readonly name: "tx-index";
         readonly type: "s64";
+        readonly internalType: "s64";
       },
     ];
   }>();
@@ -69,7 +78,7 @@ test("parseWitParameter", () => {
     [InvalidWitParameterError: Failed to parse Wit parameter.
 
     Details: parseWitParameter(" ")
-    Version: kontor-2dk@1.0.0]
+    Version: kontor-sdk@1.0.0]
   `,
   );
 });
@@ -77,11 +86,20 @@ test("parseWitParameter", () => {
 test.each([
   {
     signature: "ctx: borrow<proc-context>",
-    expected: { name: "ctx", type: "borrow<proc-context>" },
+    expected: {
+      name: "ctx",
+      type: "borrow<proc-context>",
+      internalType: "borrow<proc-context>",
+    },
   },
   {
     signature: "arith-address: contract-address",
-    expected: { name: "arith-address", type: "contract-address" },
+    expected: {
+      name: "arith-address",
+      type: "contract-address",
+
+      internalType: "contract-address",
+    },
   },
   {
     signature: [
@@ -90,19 +108,24 @@ test.each([
     ],
     expected: {
       name: "arith-address",
+
       type: "tuple",
+      internalType: "contract-address",
       components: [
         {
           name: "name",
           type: "string",
+          internalType: "string",
         },
         {
           name: "height",
           type: "s64",
+          internalType: "s64",
         },
         {
           name: "tx-index",
           type: "s64",
+          internalType: "s64",
         },
       ],
     },
@@ -115,18 +138,22 @@ test.each([
     expected: {
       name: "arith-address",
       type: "result<tuple, error>",
+      internalType: "result<contract-address, error>",
       components: [
         {
           name: "name",
           type: "string",
+          internalType: "string",
         },
         {
           name: "height",
           type: "s64",
+          internalType: "s64",
         },
         {
           name: "tx-index",
           type: "s64",
+          internalType: "s64",
         },
       ],
     },

package/src/wit/wit-parser/parse-wit.test.ts

@@ -2,6 +2,12 @@ import { expectTypeOf, describe, expect, test } from "vitest";
 
 import type { ParseWit } from "./parse-wit.js";
 import { parseWit } from "./parse-wit.js";
+// import type { nativeToken } from "../../sdk/contracts/wits.js";
+//
+//
+//
+// type t =  ParseWit<typeof nativeToken.raw>;
+//
 
 test("ParseWit (types)", () => {
   // type-level assertions
@@ -11,8 +17,8 @@ test("ParseWit (types)", () => {
       [
         "record contract-address {  name: string, height: s64, tx-index: s64 }",
         "export fib: func(ctx: borrow<proc-context>, arith-address: contract-address, n: u64) -> u64;",
-        "export fib-of-sub: func(ctx: borrow<proc-context>, arith-address: contract-address, x: string, y: string) -> result<u64, error>;",
-        "export cached-values: func(ctx: borrow<view-context>) -> list<u64>;",
+        // "export fib-of-sub: func(ctx: borrow<proc-context>, arith-address: contract-address, x: string, y: string) -> result<u64, error>;",
+        // "export cached-values: func(ctx: borrow<view-context>) -> list<u64>;",
       ]
     >
   >().toEqualTypeOf<
@@ -25,102 +31,90 @@ test("ParseWit (types)", () => {
           {
             readonly name: "arith-address";
             readonly type: "tuple";
+            readonly internalType: "contract-address";
             readonly components: readonly [
-              { readonly name: "name"; readonly type: "string" },
-              { readonly name: "height"; readonly type: "s64" },
-              { readonly name: "tx-index"; readonly type: "s64" },
+              {
+                readonly name: "name";
+                readonly type: "string";
+                readonly internalType: "string";
+              },
+              {
+                readonly name: "height";
+                readonly type: "s64";
+                readonly internalType: "s64";
+              },
+              {
+                readonly name: "tx-index";
+                readonly type: "s64";
+                readonly internalType: "s64";
+              },
             ];
           },
-          { readonly name: "n"; readonly type: "u64" },
-        ];
-        readonly outputs: readonly [{ readonly type: "u64" }];
-      },
-      {
-        readonly name: "fib-of-sub";
-        readonly type: "function";
-        readonly context: "proc";
-        readonly inputs: readonly [
-          {
-            readonly name: "arith-address";
-            readonly type: "tuple";
-
-            readonly components: readonly [
-              { readonly name: "name"; readonly type: "string" },
-              { readonly name: "height"; readonly type: "s64" },
-              { readonly name: "tx-index"; readonly type: "s64" },
-            ];
-          },
-          { readonly name: "x"; readonly type: "string" },
-          { readonly name: "y"; readonly type: "string" },
-        ];
-        readonly outputs: readonly [{ readonly type: "result<u64, error>" }];
-      },
-      {
-        readonly name: "cached-values";
-        readonly type: "function";
-        readonly context: "view";
-        readonly inputs: readonly [];
-        readonly outputs: readonly [{ readonly type: "list<u64>" }];
-      },
-    ]
-  >();
-
-  expectTypeOf<
-    ParseWit<
-      [
-        "record contract-address {  name: string, height: s64, tx-index: s64 }",
-        "export fib: func(ctx: borrow<proc-context>, arith-address: contract-address, n: u64) -> u64;",
-        "export fib-of-sub: func(ctx: borrow<proc-context>, arith-address: contract-address, x: string, y: string) -> result<u64, error>;",
-        "export cached-values: func(ctx: borrow<view-context>) -> list<u64>;",
-      ]
-    >
-  >().toEqualTypeOf<
-    readonly [
-      {
-        readonly name: "fib";
-        readonly type: "function";
-        readonly context: "proc";
-        readonly inputs: readonly [
           {
-            readonly name: "arith-address";
-            readonly type: "tuple";
-            readonly components: readonly [
-              { readonly name: "name"; readonly type: "string" },
-              { readonly name: "height"; readonly type: "s64" },
-              { readonly name: "tx-index"; readonly type: "s64" },
-            ];
+            readonly name: "n";
+            readonly type: "u64";
+            readonly internalType: "u64";
           },
-          { readonly name: "n"; readonly type: "u64" },
         ];
-        readonly outputs: readonly [{ readonly type: "u64" }];
-      },
-      {
-        readonly name: "fib-of-sub";
-        readonly type: "function";
-        readonly context: "proc";
-        readonly inputs: readonly [
-          {
-            readonly name: "arith-address";
-            readonly type: "tuple";
-
-            readonly components: readonly [
-              { readonly name: "name"; readonly type: "string" },
-              { readonly name: "height"; readonly type: "s64" },
-              { readonly name: "tx-index"; readonly type: "s64" },
-            ];
-          },
-          { readonly name: "x"; readonly type: "string" },
-          { readonly name: "y"; readonly type: "string" },
+        readonly outputs: readonly [
+          { readonly type: "u64"; readonly internalType: "u64" },
         ];
-        readonly outputs: readonly [{ readonly type: "result<u64, error>" }];
-      },
-      {
-        readonly name: "cached-values";
-        readonly type: "function";
-        readonly context: "view";
-        readonly inputs: readonly [];
-        readonly outputs: readonly [{ readonly type: "list<u64>" }];
       },
+      // {
+      //   readonly name: "fib-of-sub";
+      //   readonly type: "function";
+      //   readonly context: "proc";
+      //   readonly inputs: readonly [
+      //     {
+      //       readonly name: "arith-address";
+      //       readonly type: "tuple";
+      //       readonly internalType: "contract-address";
+      //
+      //       readonly components: readonly [
+      //         {
+      //           readonly name: "name";
+      //           readonly type: "string";
+      //           readonly internalType: "string";
+      //         },
+      //         {
+      //           readonly name: "height";
+      //           readonly type: "s64";
+      //           readonly internalType: "s64";
+      //         },
+      //         {
+      //           readonly name: "tx-index";
+      //           readonly type: "s64";
+      //           readonly internalType: "s64";
+      //         },
+      //       ];
+      //     },
+      //     {
+      //       readonly name: "x";
+      //       readonly type: "string";
+      //       readonly internalType: "string";
+      //     },
+      //     {
+      //       readonly name: "y";
+      //       readonly type: "string";
+      //       readonly internalType: "string";
+      //     },
+      //   ];
+      //   readonly outputs: readonly [
+      //     {
+      //       readonly type: "result<u64, error>";
+      //       readonly internalType: "result<u64, error>";
+      //     },
+      //   ];
+      // },
+      // {
+      //   readonly name: "cached-values";
+      //   readonly type: "function";
+      //   readonly context: "view";
+      //   readonly inputs: readonly [];
+      //   readonly outputs: readonly [
+      //     { readonly type: "list<u64>"; readonly internalType: "list<u64>" },
+      //   ];
+      // },
     ]
   >();
 });
@@ -147,15 +141,16 @@ describe("parseWit (runtime)", () => {
           {
             name: "arith-address",
             type: "tuple",
+            internalType: "contract-address",
             components: [
-              { name: "name", type: "string" },
-              { name: "height", type: "s64" },
-              { name: "tx-index", type: "s64" },
+              { name: "name", type: "string", internalType: "string" },
+              { name: "height", type: "s64", internalType: "s64" },
+              { name: "tx-index", type: "s64", internalType: "s64" },
             ],
           },
-          { name: "n", type: "u64" },
+          { name: "n", type: "u64", internalType: "u64" },
         ],
-        outputs: [{ type: "u64" }],
+        outputs: [{ type: "u64", internalType: "u64" }],
       },
       {
         name: "fib-of-sub",
@@ -165,19 +160,21 @@ describe("parseWit (runtime)", () => {
           {
             name: "arith-address",
             type: "tuple",
+            internalType: "contract-address",
 
             components: [
-              { name: "name", type: "string" },
-              { name: "height", type: "s64" },
-              { name: "tx-index", type: "s64" },
+              { name: "name", type: "string", internalType: "string" },
+              { name: "height", type: "s64", internalType: "s64" },
+              { name: "tx-index", type: "s64", internalType: "s64" },
             ],
           },
-          { name: "x", type: "string" },
-          { name: "y", type: "string" },
+          { name: "x", type: "string", internalType: "string" },
+          { name: "y", type: "string", internalType: "string" },
         ],
         outputs: [
           {
             type: "result<u64, error>",
+            internalType: "result<u64, error>",
           },
         ],
       },
@@ -186,14 +183,14 @@ describe("parseWit (runtime)", () => {
         type: "function",
         context: "view",
         inputs: [],
-        outputs: [{ type: "list<u64>" }],
+        outputs: [{ type: "list<u64>", internalType: "list<u64>" }],
       },
       {
         name: "return-option",
         type: "function",
         context: "view",
         inputs: [],
-        outputs: [{ type: "option<u64>" }],
+        outputs: [{ type: "option<u64>", internalType: "option<u64>" }],
       },
     ]);
   });