feat: improve clarity abi types

mechanismHQ · Mar 10, 2023 · 868684c · 868684c
1 parent 09e87d4
commit 868684c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 18 deletions.
diff --git a/.changeset/thin-hounds-bake.md b/.changeset/thin-hounds-bake.md
@@ -0,0 +1,5 @@
+---
+"clarigen-deno": patch
+---
+
+Fixes issues with ABI types when using conditionals to infer Clarity type
diff --git a/artifacts/clarigen/index.ts b/artifacts/clarigen/index.ts
@@ -6,7 +6,7 @@ export type ClarityAbiTypeResponse = {
 };
 export type ClarityAbiTypeOptional = { optional: ClarityAbiType };
 export type ClarityAbiTypeTuple = {
-  tuple: { name: string; type: ClarityAbiType }[];
+  tuple: readonly { name: string; type: ClarityAbiType }[];
 };
 export type ClarityAbiTypeList = {
   list: { type: ClarityAbiType; length: number };
@@ -97,7 +97,7 @@ export interface ClarityAbi {
   variables: ClarityAbiVariable[];
   maps: ClarityAbiMap[];
   fungible_tokens: ClarityAbiTypeFungibleToken[];
-  non_fungible_tokens: ClarityAbiTypeNonFungibleToken<unknown>[];
+  non_fungible_tokens: readonly ClarityAbiTypeNonFungibleToken<unknown>[];
 }
 
 export type TypedAbi = Readonly<{
@@ -378,10 +378,7 @@ export const contracts = {
             { 'name': 'namespace', 'type': { 'buffer': { 'length': 20 } } },
           ],
         },
-      } as ClarityAbiTypeNonFungibleToken<{
-        'name': Uint8Array;
-        'namespace': Uint8Array;
-      }>,
+      },
     ],
     'fungible_tokens': [],
     'epoch': 'Epoch20',

diff --git a/src/cli/files/base.ts b/src/cli/files/base.ts
@@ -40,10 +40,7 @@ export function generateContractMeta(
   const variableLines = encodeVariables(variables);
 
   const nftLines = non_fungible_tokens.map((nft) => {
-    const keyType = jsTypeFromAbiType(nft.type);
-    return `${
-      JSON.stringify(nft)
-    } as ClarityAbiTypeNonFungibleToken<${keyType}>`;
+    return JSON.stringify(nft);
   });
 
   return `{

diff --git a/src/cli/type-stub.ts b/src/cli/type-stub.ts
@@ -7,7 +7,7 @@ export type ClarityAbiTypeResponse = {
 };
 export type ClarityAbiTypeOptional = { optional: ClarityAbiType };
 export type ClarityAbiTypeTuple = {
-  tuple: { name: string; type: ClarityAbiType }[];
+  tuple: readonly { name: string; type: ClarityAbiType }[];
 };
 export type ClarityAbiTypeList = {
   list: { type: ClarityAbiType; length: number };
@@ -98,7 +98,7 @@ export interface ClarityAbi {
   variables: ClarityAbiVariable[];
   maps: ClarityAbiMap[];
   fungible_tokens: ClarityAbiTypeFungibleToken[];
-  non_fungible_tokens: ClarityAbiTypeNonFungibleToken<unknown>[];
+  non_fungible_tokens: readonly ClarityAbiTypeNonFungibleToken<unknown>[];
 }
 
 export type TypedAbi = Readonly<{

diff --git a/src/types.ts b/src/types.ts
@@ -6,7 +6,7 @@ export type ClarityAbiTypeResponse = {
 };
 export type ClarityAbiTypeOptional = { optional: ClarityAbiType };
 export type ClarityAbiTypeTuple = {
-  tuple: { name: string; type: ClarityAbiType }[];
+  tuple: readonly { name: string; type: ClarityAbiType }[];
 };
 export type ClarityAbiTypeList = {
   list: { type: ClarityAbiType; length: number };
@@ -97,7 +97,7 @@ export interface ClarityAbi {
   variables: ClarityAbiVariable[];
   maps: ClarityAbiMap[];
   fungible_tokens: ClarityAbiTypeFungibleToken[];
-  non_fungible_tokens: ClarityAbiTypeNonFungibleToken<unknown>[];
+  non_fungible_tokens: readonly ClarityAbiTypeNonFungibleToken<unknown>[];
 }
 
 export type TypedAbi = Readonly<{

diff --git a/tests/helper.ts b/tests/helper.ts
@@ -1,14 +1,13 @@
-
 // This file is automatically generated by Clarigen.
 // Don't make changes to this file, or they'll
 // be overwritten.
-import { factory } from "https://deno.land/x/clarigen@v0.5.0/mod.ts";
-import { simnet } from "./../artifacts/clarigen/index.ts";
+import { factory } from '../src/index.ts';
+import { simnet } from './../artifacts/clarigen/index.ts';
 
 export const { test, contracts, accounts } = factory(simnet);
 
 export const {
   counter,
   ftTrait,
-  tester
+  tester,
 } = contracts;