@clarigen/test 1.0.0-next.21 → 1.0.0-next.25

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { CoreNodeEvent, ResultAssets, Contracts, ContractFactory, AllContracts, ContractCall, Response, ContractCalls, ContractInstances } from '@clarigen/core';
+import { CoreNodeEvent, ResultAssets, Contracts, ContractFactory, AllContracts, ContractCall, Response, ContractCalls, ContractInstances, ResponseOk, ResponseErr } from '@clarigen/core';
 import { Costs, NativeClarityBinProvider, ClarinetAccounts } from '@clarigen/native-bin';
 export { Allocation, createClarityBin, evalJson, executeJson } from '@clarigen/native-bin';
 import { ClarityValue, ResponseCV } from 'micro-stacks/clarity';
@@ -29,7 +29,7 @@ interface PublicResultOk<T> extends PublicResultBase<T> {
     assets: ResultAssets;
     prints: any[];
 }
-declare type PublicResult<Ok, Err> = PublicResultOk<Ok> | PublicResultErr<Err>;
+declare type PublicResult<R> = PublicResultOk<R> | PublicResultErr<R>;
 
 declare type Provider = NativeClarityBinProvider | {
     clarityBin: NativeClarityBinProvider;
@@ -47,11 +47,14 @@ interface FromContractsOptions {
     accounts?: ClarinetAccounts;
     clarityBin?: NativeClarityBinProvider;
     coverageFolder?: string;
+    clarinetPath?: string;
 }
 interface FromContracts<T extends Contracts<any>> {
     deployed: ContractInstances<T>;
     provider: TestProvider;
 }
+declare type OkType<T> = T extends ResponseOk<infer Ok, unknown> ? Ok : never;
+declare type ErrType<T> = T extends ResponseErr<unknown, infer Err> ? Err : never;
 declare class TestProvider {
     clarityBin: NativeClarityBinProvider;
     coverageFolder?: string;
@@ -60,13 +63,13 @@ declare class TestProvider {
     static fromFactory(contracts: ContractFactory<AllContracts>, options?: FromContractsOptions): Promise<TestProvider>;
     ro<T>(tx: ContractCall<T>): Promise<ReadOnlyResult<T>>;
     rov<T>(tx: ContractCall<T>): Promise<T>;
-    roOk<Ok, Err>(tx: ContractCall<Response<Ok, Err>>): Promise<ReadOnlyResult<Ok>>;
-    roErr<Ok, Err>(tx: ContractCall<Response<Ok, Err>>): Promise<ReadOnlyResult<Err>>;
-    rovOk<Ok, Err>(tx: ContractCall<Response<Ok, Err>>): Promise<Ok>;
-    rovErr<Ok, Err>(tx: ContractCall<Response<Ok, Err>>): Promise<Err>;
-    tx<Ok, Err>(tx: ContractCalls.Public<Ok, Err>, senderAddress: string): Promise<PublicResult<Ok, Err>>;
-    txOk<Ok, Err>(tx: ContractCalls.Public<Ok, Err>, senderAddress: string): Promise<PublicResultOk<Ok>>;
-    txErr<Ok, Err>(tx: ContractCalls.Public<Ok, Err>, senderAddress: string): Promise<PublicResultErr<Err>>;
+    roOk<R extends Response<unknown, unknown>>(tx: ContractCall<R>): Promise<ReadOnlyResult<OkType<R>>>;
+    roErr<R extends Response<unknown, unknown>>(tx: ContractCall<R>): Promise<ReadOnlyResult<ErrType<R>>>;
+    rovOk<R extends Response<unknown, unknown>>(tx: ContractCall<R>): Promise<OkType<R>>;
+    rovErr<R extends Response<unknown, unknown>>(tx: ContractCall<R>): Promise<ErrType<R>>;
+    tx<R extends Response<unknown, unknown>>(tx: ContractCall<R>, senderAddress: string): Promise<PublicResult<R>>;
+    txOk<R extends Response<unknown, unknown>>(tx: ContractCall<R>, senderAddress: string): Promise<PublicResultOk<OkType<R>>>;
+    txErr<R extends Response<unknown, unknown>>(tx: ContractCall<R>, senderAddress: string): Promise<PublicResultErr<ErrType<R>>>;
     evalCode<T>(code: string, contractAddress?: string): Promise<ReadOnlyResult<T>>;
     eval<T>(code: string, contractAddress?: string): Promise<T>;
     mapGet<T extends ContractCalls.Map<any, Val>, Val>(map: T): Promise<Val | null>;

package/dist/index.js

@@ -141,6 +141,8 @@ function makeRandomAddress(version = _crypto.StacksNetworkVersion.testnetP2PKH)
 
 
 
+
+
 function getPrints(events) {
   return _core.filterEvents.call(void 0, events, _core.CoreNodeEventType.ContractEvent).map((e) => {
     const hex = e.contract_event.raw_value;
@@ -213,10 +215,11 @@ async function tx({
   });
   const resultCV = _clarity.hexToCV.call(void 0, result.output_serialized);
   const value = _core.cvToValue.call(void 0, resultCV);
+  const resp = result.success ? _core.ok.call(void 0, value) : _core.err.call(void 0, value);
   const baseReturn = {
-    value,
     logs: getLogs(result.stderr),
-    costs: result.costs
+    costs: result.costs,
+    value: resp
   };
   if (result.success) {
     return __spreadProps(__spreadValues({}, baseReturn), {
@@ -298,7 +301,10 @@ var TestProvider = class {
     for (const k in contracts) {
       if (Object.prototype.hasOwnProperty.call(contracts, k)) {
         const contract = contracts[k];
-        const contractFilePath = contract.contractFile;
+        let contractFilePath = contract.contractFile;
+        if (options.clarinetPath) {
+          contractFilePath = _path.resolve.call(void 0, process.cwd(), options.clarinetPath, contractFilePath);
+        }
         if (typeof contractFilePath === "undefined") {
           throw new Error("Cannot setup @clarigen/test - missing contract file.");
         }
@@ -351,15 +357,21 @@ var TestProvider = class {
   }
   async txOk(tx2, senderAddress) {
     const result = await this.tx(tx2, senderAddress);
+    const value = _core.expectOk.call(void 0, result.value);
     if (!result.isOk)
       throw new Error(`Expected OK, received error: ${String(result.value)}`);
-    return result;
+    return __spreadProps(__spreadValues({}, result), {
+      value
+    });
   }
   async txErr(tx2, senderAddress) {
     const result = await this.tx(tx2, senderAddress);
+    const value = _core.expectErr.call(void 0, result.value);
     if (result.isOk)
       throw new Error(`Expected Err, received ok: ${String(result.value)}`);
-    return result;
+    return __spreadProps(__spreadValues({}, result), {
+      value
+    });
   }
   evalCode(code, contractAddress = UTIL_CONTRACT_ID) {
     return evalCode({

package/dist/index.mjs

@@ -129,7 +129,9 @@ import {
   cvToString,
   cvToValue as cvToValue2,
   filterEvents,
-  CoreNodeEventType
+  CoreNodeEventType,
+  ok,
+  err
 } from "@clarigen/core";
 import {
   evalRaw,
@@ -213,10 +215,11 @@ async function tx({
   });
   const resultCV = hexToCV2(result.output_serialized);
   const value = cvToValue2(resultCV);
+  const resp = result.success ? ok(value) : err(value);
   const baseReturn = {
-    value,
     logs: getLogs(result.stderr),
-    costs: result.costs
+    costs: result.costs,
+    value: resp
   };
   if (result.success) {
     return __spreadProps(__spreadValues({}, baseReturn), {
@@ -298,7 +301,10 @@ var TestProvider = class {
     for (const k in contracts) {
       if (Object.prototype.hasOwnProperty.call(contracts, k)) {
         const contract = contracts[k];
-        const contractFilePath = contract.contractFile;
+        let contractFilePath = contract.contractFile;
+        if (options.clarinetPath) {
+          contractFilePath = resolve2(process.cwd(), options.clarinetPath, contractFilePath);
+        }
         if (typeof contractFilePath === "undefined") {
           throw new Error("Cannot setup @clarigen/test - missing contract file.");
         }
@@ -351,15 +357,21 @@ var TestProvider = class {
   }
   async txOk(tx2, senderAddress) {
     const result = await this.tx(tx2, senderAddress);
+    const value = expectOk(result.value);
     if (!result.isOk)
       throw new Error(`Expected OK, received error: ${String(result.value)}`);
-    return result;
+    return __spreadProps(__spreadValues({}, result), {
+      value
+    });
   }
   async txErr(tx2, senderAddress) {
     const result = await this.tx(tx2, senderAddress);
+    const value = expectErr(result.value);
     if (result.isOk)
       throw new Error(`Expected Err, received ok: ${String(result.value)}`);
-    return result;
+    return __spreadProps(__spreadValues({}, result), {
+      value
+    });
   }
   evalCode(code, contractAddress = UTIL_CONTRACT_ID) {
     return evalCode({

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-next.21",
+  "version": "1.0.0-next.25",
   "license": "MIT",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -16,12 +16,13 @@
   "name": "@clarigen/test",
   "author": "Hank Stoever",
   "devDependencies": {
-    "jest-environment-node": "28.1.1"
+    "jest-environment-node": "28.1.1",
+    "@clarigen/cli": "1.0.0-next.25"
   },
   "dependencies": {
-    "@clarigen/core": "1.0.0-next.21",
-    "@clarigen/native-bin": "1.0.0-next.21",
-    "micro-stacks": "^0.2.0"
+    "@clarigen/core": "1.0.0-next.25",
+    "@clarigen/native-bin": "1.0.0-next.25",
+    "micro-stacks": "^0.5.2"
   },
   "publishConfig": {
     "access": "public"
@@ -34,6 +35,6 @@
     "lint": "eslint \"src/**/*.{ts,tsx}\" && prettier  --check src/**/*.ts",
     "typecheck": "tsc --noEmit",
     "build-test-types": "cd test/clarinet-project && pnpm clarigen && cd ../..",
-    "publish:dev": "yalc publish --push"
+    "publish:dev": "pnpm build && yalc publish --push"
   }
 }