@kontor/kontor-sdk 1.0.0-alpha.24 → 1.0.0-alpha.27

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

@@ -81,11 +81,13 @@ test("ParseWitParameter", () => {
   assertType<ParseWitParameter<"option-string: option<string>">>({
     name: "option-string",
     type: "option<string>",
+    internalType: "option<string>",
   });
 
   assertType<ParseWitParameter<"option-list-string: option<list<string>>">>({
     name: "option-list-string",
     type: "option<list<string>>",
+    internalType: "option<list<string>>",
   });
 
   assertType<
@@ -93,6 +95,7 @@ test("ParseWitParameter", () => {
   >({
     name: "option-list-result-string-contract-address",
     type: "option<list<result<string, contract-address>>>",
+    internalType: "option<list<result<string, contract-address>>>",
   });
 
   assertType<ParseWitParameter<"contract-address">>({
@@ -163,7 +166,7 @@ test("Parse Signature", () => {
         type: "contract-address",
         internalType: "contract-address",
       },
-      { name: "n", type: "list<u64>" },
+      { name: "n", type: "list<u64>", internalType: "list<u64>" },
     ],
     outputs: [
       {
@@ -184,7 +187,7 @@ test("Parse Signature", () => {
         type: "contract-address",
         internalType: "contract-address",
       },
-      { name: "n", type: "list<u64>" },
+      { name: "n", type: "list<u64>", internalType: "list<u64>" },
     ],
     outputs: [
       {
@@ -205,7 +208,7 @@ test("Parse Signature", () => {
         type: "contract-address",
         internalType: "contract-address",
       },
-      { name: "n", type: "list<u64>" },
+      { name: "n", type: "list<u64>", internalType: "list<u64>" },
     ],
     outputs: [
       {
@@ -227,6 +230,7 @@ test("Parse Signature", () => {
     outputs: [
       {
         type: "list<tuple>",
+        internalType: "list<dog>",
         components: [
           { type: "string", name: "name" },
           { type: "string", name: "breed" },

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

@@ -48,11 +48,15 @@ type MapGenericType<T extends string, Opts extends ParseOptions> =
   // list<...>
   T extends `list<${infer U}>`
     ? MapGenericType<Trim<U>, Opts> extends infer M extends { type: string }
-      ? Readonlyify<{ type: `list<${M["type"]}>` } & GetComponents<M>>
+      ? Readonlyify<
+          { type: `list<${M["type"]}>`; internalType: T } & GetComponents<M>
+        >
       : never
     : T extends `option<${infer U}>`
       ? MapGenericType<Trim<U>, Opts> extends infer M extends { type: string }
-        ? Readonlyify<{ type: `option<${M["type"]}>` } & GetComponents<M>>
+        ? Readonlyify<
+            { type: `option<${M["type"]}>`; internalType: T } & GetComponents<M>
+          >
         : never
       : // result<L, R>
         T extends `result<${infer Inner}>`

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

@@ -16,10 +16,7 @@ export type ParseOptions = {
   records?: RecordLookup;
   type?: WitItemType | "record";
 };
-//
-// export const witParameterRegex =
-//   /^(?:(?<name>[a-z][a-z0-9-]*)\s*:\s*)?(?<type>(?:borrow|list|option|result|tuple)\s*<[\s\S]+>|[a-z][a-z0-9-]*|(?:record|variant|flags|enum)\s*\{[\s\S]*\})$/;
-//
+
 export const witParameterRegex =
   /^(?:(?<name>[a-z][a-z0-9-]*)\s*:\s*)?(?<type>_|(?:borrow|list|option|result|tuple)\s*<[\s\S]+>|[a-z][a-z0-9-]*|(?:record|variant|flags|enum)\s*\{[\s\S]*\})$/;
 
@@ -60,7 +57,6 @@ export function parseWitParameter(param: string, options?: ParseOptions) {
   if (match.name && isWitKeyword(match.name))
     throw new WitProtectedKeywordError({ param, name: match.name });
 
-  // TODO: smell
   const name = match.name ? { name: match.name } : {};
   const records = options?.records ?? {};
   let type: string;