@taqueria/plugin-contract-types 0.0.0-pr-726-e060c010 → 0.0.0-pr-575-850bfda7

package/{Readme.md → README.md}

@@ -1,3 +1,5 @@
+# Taqueria Contract Types Plugin
+
 This plugin provides a `taq generate types` command which will generate and export TypeScript types from compiled Michelson smart contracts. These generated types then work with your IDE and Taquito, providing type safety and an improved code authoring experience
 
 Benefits of using generated types:
@@ -57,6 +59,71 @@ The `generate types` command will accept the following optional parameters:
 |:-----:|:--------------|----------------------------------------------|
 |  -t   | typeAliasMode | Use type aliases in the generated types      |
  
+
+## Taquito Workflow Improvements
+
+The generated TS types can be used in a Taquito project which provides an improved developing experience, and simplifies the way types are provided to Taquito method calls. Some examples of how these changes are put into use are detailed below  
+
+> ### :page_with_curl: Note
+> You can view the full example in the `example-usage.ts` file on Github: [taqueria/taqueria-plugin-contract-types/example](https://github.com/ecadlabs/taqueria/blob/main/taqueria-plugin-contract-types/example/example-usage.ts)
+
+### Calling the `.at` Method of a Contract
+
+Traditionally, calling the `.at` method of a contract with Taquito required the developer to pass the parameter's type via a utility method:
+```ts Utility Method
+const contract = await Tezos.contract.at(`tz123`, contractAbstractionComposer<TestContractType>());
+```
+or a cast:
+```ts Cast
+const contract = await Tezos.contract.at(`tz123`) as ContractProviderFromContractType<TestContractType>;
+```
+
+When using generated types, the developer can now directly use the type in the call to `.at`:
+```ts 
+const contract = await Tezos.contract.at<TestContract>(`tz123`);
+```
+
+### Using a Wallet
+
+Using a wallet is simplified in a similar way:
+```ts 
+const contract = await Tezos.wallet.at(`tz123`, walletAbstractionComposer<TestContractType>());
+```
+
+Becomes:
+```ts 
+const contract = await Tezos.wallet.at<TestWalletContract>(`tz123`);
+```
+
+### Contract Origination
+
+The Taquito contract origination did not have any way to provide a type, so this used to require a cast:
+```ts
+const originationResult = await Tezos.contract.originate({...});
+const contract = await originationResult.contract(5) as ContractProviderFromContractType<TestContractType2>;
+```
+
+Now, it can directly accept a type:
+```ts
+const originationResult = await Tezos.contract.originate({...});
+const contract = await originationResult.contract<TestContract2>(5);
+```
+
+
+### Storage
+
+When accessing storage, there was no way to pass the type through the contract class. This required providing the type a second time:
+```ts
+const contract = await Tezos.contract.at(`tz123`) as ContractProviderFromContractType<TestContractType>;
+const storage = await contract.storage<StorageFromContractType<TestContractType>>();
+```
+
+Now, the contract type provides the default storage type:
+```ts
+const contract = await Tezos.contract.at<TestContract>(`tz123`);
+const storage = await contract.storage();
+```
+
 ## Examples
 
 ### Example Usage (based on an nft auction contract from open minter sdk)
@@ -187,6 +254,7 @@ type Methods = {
 
 See [example-usage.ts](example/example-usage.ts) for full example
 
+
 ### Before
 
 Using taquito with the generated contract types:
@@ -256,4 +324,3 @@ The contract type now also provides the default storage type:
 const contract = await Tezos.contract.at<TestContract>(`tz123`);
 const storage = await contract.storage();
 ```
-

package/_readme.eta

@@ -0,0 +1,333 @@
+<% if (it.output == "github") { %>
+# Taqueria Contract Types Plugin
+<% } %>
+
+This plugin provides a `taq generate types` command which will generate and export TypeScript types from compiled Michelson smart contracts. These generated types then work with your IDE and Taquito, providing type safety and an improved code authoring experience
+
+Benefits of using generated types:
+- Static types used to call smart contract methods are checked at compile time, improving code reliability
+- Generated types enable auto-completion and syntax highlighting in your IDE
+- Developing apps with Taquito is faster and more reliable
+- The VS Code Extension provides tooltip hints for parameter types used to call a smart contract method
+- Calling smart contract methods with types is done directly, removing the need for utility methods 
+- Simplifies your code and improves readability
+
+## Requirements
+
+- Node JS v16 or later
+- Taquito v11.2 or later (optional)
+
+## Installation
+
+To install the Contract Types plugin on a Taqueria project, navigate to the project folder and run:
+```shell
+taq install @taqueria/plugin-contract-types
+```
+
+## Configuration
+
+This plugin will look for Michelson files according to the `artifactsDir` configured in `./.taq/config.json`. By default, this value is `/artifacts` but can be changed as needed
+
+## Usage
+
+The plugin provides a single command to Taqueria: `taq generate types`
+
+This will look for `.tz` files in the `/artifacts` directory and will generate a series of related `.ts` files in the `/types` directory. These files export type definitions for each method which can then be used by Taquito and your IDE
+
+### The `generate types` Command
+
+#### Syntax
+```shell
+taq generate types [typeOutputDir]
+```
+
+#### Parameters
+
+| parameter     |  required  | description                                        |       
+|:-------------:|:-----------|----------------------------------------------------|
+| typeOutputDir | no         | The output directory for the `.ts` files generated |
+
+#### CLI Aliases
+
+The following aliases are interchangable with `generate types`
+- `gen`
+- `gentypes`
+
+#### Options
+
+The `generate types` command will accept the following optional parameters:
+
+| flag  |  name         | description                                  |       
+|:-----:|:--------------|----------------------------------------------|
+|  -t   | typeAliasMode | Use type aliases in the generated types      |
+ 
+
+## Taquito Workflow Improvements
+
+The generated TS types can be used in a Taquito project which provides an improved developing experience, and simplifies the way types are provided to Taquito method calls. Some examples of how these changes are put into use are detailed below  
+
+<%~ it.noteOpenAdmonition %>
+You can view the full example in the `example-usage.ts` file on Github: [taqueria/taqueria-plugin-contract-types/example](https://github.com/ecadlabs/taqueria/blob/main/taqueria-plugin-contract-types/example/example-usage.ts)
+<%= it.closeAdmonition %>
+
+### Calling the `.at` Method of a Contract
+
+Traditionally, calling the `.at` method of a contract with Taquito required the developer to pass the parameter's type via a utility method:
+```ts Utility Method
+const contract = await Tezos.contract.at(`tz123`, contractAbstractionComposer<TestContractType>());
+```
+or a cast:
+```ts Cast
+const contract = await Tezos.contract.at(`tz123`) as ContractProviderFromContractType<TestContractType>;
+```
+
+When using generated types, the developer can now directly use the type in the call to `.at`:
+```ts 
+const contract = await Tezos.contract.at<TestContract>(`tz123`);
+```
+
+### Using a Wallet
+
+Using a wallet is simplified in a similar way:
+```ts 
+const contract = await Tezos.wallet.at(`tz123`, walletAbstractionComposer<TestContractType>());
+```
+
+Becomes:
+```ts 
+const contract = await Tezos.wallet.at<TestWalletContract>(`tz123`);
+```
+
+### Contract Origination
+
+The Taquito contract origination did not have any way to provide a type, so this used to require a cast:
+```ts
+const originationResult = await Tezos.contract.originate({...});
+const contract = await originationResult.contract(5) as ContractProviderFromContractType<TestContractType2>;
+```
+
+Now, it can directly accept a type:
+```ts
+const originationResult = await Tezos.contract.originate({...});
+const contract = await originationResult.contract<TestContract2>(5);
+```
+
+
+### Storage
+
+When accessing storage, there was no way to pass the type through the contract class. This required providing the type a second time:
+```ts
+const contract = await Tezos.contract.at(`tz123`) as ContractProviderFromContractType<TestContractType>;
+const storage = await contract.storage<StorageFromContractType<TestContractType>>();
+```
+
+Now, the contract type provides the default storage type:
+```ts
+const contract = await Tezos.contract.at<TestContract>(`tz123`);
+const storage = await contract.storage();
+```
+
+## Examples
+
+### Example Usage (based on an nft auction contract from open minter sdk)
+
+```ts
+export const exampleContractMethods1 = async () => {
+
+    const Tezos = new TezosToolkit(`https://YOUR_PREFERRED_RPC_URL`)
+
+    const contract = await Tezos.contract.at<TestContract>(`tz123`);
+
+    contract.methods.bid(tas.nat(0));
+    contract.methods.configure(
+        /*opening_price:*/ tas.mutez(10),
+        /*min_raise_percent:*/ tas.nat(10),
+        /*min_raise:*/ tas.mutez(10),
+        /*round_time:*/ tas.nat(10),
+        /*extend_time:*/ tas.nat(10),
+        /*asset:*/ [{
+            fa2_address: tas.address(`tz123`),
+            fa2_batch: [{
+                amount: tas.nat(100),
+                token_id: tas.nat(`100000000000000`),
+            }],
+        }],
+        /*start_time:*/ tas.timestamp(new Date()),
+        /*end_time:*/ tas.timestamp(`2020-01-01`),
+    );
+
+    // methodsObject
+    contract.methodsObject.bid(tas.nat(0));
+    contract.methodsObject.configure({
+        asset: [{
+            fa2_address: tas.address(`tz123`),
+            fa2_batch: [{
+                amount: tas.nat(100),
+                token_id: tas.nat(`100000000000000`),
+            }],
+        }],
+        start_time: tas.timestamp(new Date()),
+        end_time: tas.timestamp(`2020-01-01`),
+        extend_time: tas.nat(10),
+        min_raise: tas.mutez(10),
+        min_raise_percent: tas.nat(10),
+        opening_price: tas.mutez(10),
+        round_time: tas.nat(10),
+    });
+
+};
+```
+
+### Example typegen task
+
+```console
+$ taqueria typegen --typescriptDir ./types
+generateTypes
+{
+  "typescriptDir": "./types"
+}
+Generating Types: /home/rick/projects/crypto/taqueria/example/artifacts => /home/rick/projects/crypto/taqueria/example/types
+Contracts Found:
+        - /home/rick/projects/crypto/taqueria/example/artifacts/example-contract-1.tz
+Processing /example-contract-1.tz...example-contract-1.tz: Types generated
+```
+
+
+### Example type output
+
+```ts
+type Storage = {
+    pauseable_admin?: {
+        admin: address;
+        paused: boolean;
+        pending_admin?: address;
+    };
+    current_id: nat;
+    max_auction_time: nat;
+    max_config_to_start_time: nat;
+    auctions: BigMap<nat, {
+        seller: address;
+        current_bid: mutez;
+        start_time: timestamp;
+        last_bid_time: timestamp;
+        round_time: int;
+        extend_time: int;
+        asset: Array<{
+            fa2_address: address;
+            fa2_batch: Array<{
+                token_id: nat;
+                amount: nat;
+            }>;
+        }>;
+        min_raise_percent: nat;
+        min_raise: mutez;
+        end_time: timestamp;
+        highest_bidder: address;
+    }>;
+};
+
+type Methods = {
+    confirm_admin: () => Promise<void>;
+    pause: (param: boolean) => Promise<void>;
+    set_admin: (param: address) => Promise<void>;
+    bid: (param: nat) => Promise<void>;
+    cancel: (param: nat) => Promise<void>;
+    configure: (
+        opening_price: mutez,
+        min_raise_percent: nat,
+        min_raise: mutez,
+        round_time: nat,
+        extend_time: nat,
+        asset: Array<{
+            fa2_address: address;
+            fa2_batch: Array<{
+                token_id: nat;
+                amount: nat;
+            }>;
+        }>,
+        start_time: timestamp,
+        end_time: timestamp,
+    ) => Promise<void>;
+    resolve: (param: nat) => Promise<void>;
+};
+```
+
+
+## Taquito library changes
+
+<% if (it.output == "github") { %>
+See [example-usage.ts](example/example-usage.ts) for full example
+<% } else { %>
+See [example-usage.ts](https://github.com/ecadlabs/taqueria/blob/main/taqueria-plugin-contract-types/example/example-usage.ts) for full example
+<% } %>
+
+
+### Before
+
+Using taquito with the generated contract types:
+
+The at method can be called providing a type with a utility method that can be provided:
+```ts 
+const contract = await Tezos.contract.at(`tz123`, contractAbstractionComposer<TestContractType>());
+
+// methods can now use typed parameters
+// methodsObject will be able to use type parameters
+```
+
+This can work the same with a wallet
+```ts 
+const contract = await Tezos.wallet.at(`tz123`, walletAbstractionComposer<TestContractType>());
+```
+
+Alternatively, this can be done with a cast:
+```ts
+const contract = await Tezos.contract.at(`tz123`) as ContractProviderFromContractType<TestContractType>;
+```
+
+
+The originate contract does not have any way to provide a type, so this requires a cast:
+```ts
+const originationResult = await Tezos.contract.originate({...});
+const contract = await originationResult.contract(5) as ContractProviderFromContractType<TestContractType2>;
+```
+
+
+For accessing storage, there is no way to pass the type through the contract class, 
+so it requires providing the type again:
+```ts
+const contract = await Tezos.contract.at(`tz123`) as ContractProviderFromContractType<TestContractType>;
+const storage = await contract.storage<StorageFromContractType<TestContractType>>();
+```
+
+
+### After
+
+Extending ContractAbstraction with additional generic types:
+
+The at method can be called with the contract type provided:
+```ts 
+const contract = await Tezos.contract.at<TestContract>(`tz123`);
+
+// methods can now use typed parameters
+// methodsObject will be able to use type parameters
+// storage will be able to use type parameters
+
+```
+
+This can work the same with a wallet
+```ts 
+const contract = await Tezos.wallet.at<TestWalletContract>(`tz123`);
+```
+
+The originate contract now accepts a type:
+```ts
+const originationResult = await Tezos.contract.originate({...});
+const contract = await originationResult.contract<TestContract2>(5);
+```
+
+
+The contract type now also provides the default storage type:
+```ts
+const contract = await Tezos.contract.at<TestContract>(`tz123`);
+const storage = await contract.storage();
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taqueria/plugin-contract-types",
-  "version": "0.0.0-pr-726-e060c010",
+  "version": "0.0.0-pr-575-850bfda7",
   "description": "",
   "targets": {
     "default": {