refactor: further tweaks to make things work with jest

Author: boblat

.tstoolkitrc.ts

@@ -10,9 +10,9 @@ const config: TsToolkitConfig = {
     exports: {
       '.': 'index.ts',
       './runtime-helpers': 'runtime-helpers.ts',
-      './internal': 'internal.ts',
-      './internal/arc4': 'internal-arc4.ts',
-      './internal/op': 'internal-op.ts',
+      './internal': 'internal/index.ts',
+      './internal/arc4': 'internal/arc4.ts',
+      './internal/op': 'internal/op.ts',
       './vitest-transformer': 'test-transformer/vitest-transformer.ts',
       './jest-transformer': 'test-transformer/jest-transformer.ts',
     },

examples/marketplace/contract.spec.ts

@@ -1,8 +1,7 @@
 import { arc4, Bytes } from '@algorandfoundation/algorand-typescript'
 import { TestExecutionContext } from '@algorandfoundation/algorand-typescript-testing'
 import { interpretAsArc4 } from '@algorandfoundation/algorand-typescript/arc4'
-import { afterEach } from 'node:test'
-import { describe, expect, test } from 'vitest'
+import { afterEach, describe, expect, test } from 'vitest'
 import DigitalMarketplace, { ListingKey, ListingValue } from './contract.algo'
 
 const TEST_DECIMALS = 6

examples/zk-whitelist/contract.spec.ts

@@ -1,9 +1,10 @@
 import { arc4, Bytes } from '@algorandfoundation/algorand-typescript'
 import { TestExecutionContext } from '@algorandfoundation/algorand-typescript-testing'
 import { afterEach, describe, expect, it } from 'vitest'
-import { ABI_RETURN_VALUE_LOG_PREFIX } from '../../src/constants'
 import ZkWhitelistContract from './contract.algo'
 
+const ABI_RETURN_VALUE_LOG_PREFIX = Bytes.fromHex('151F7C75')
+
 describe('ZK Whitelist', () => {
   const ctx = new TestExecutionContext()
 

rollup.config.ts

@@ -8,9 +8,9 @@ const config: RollupOptions = {
   input: {
     index: 'src/index.ts',
     'runtime-helpers': 'src/runtime-helpers.ts',
-    'internal': 'src/internal.ts',
-    'internal/arc4': 'src/internal-arc4.ts',
-    'internal/op': 'src/internal-op.ts',
+    'internal/index': 'src/internal/index.ts',
+    'internal/arc4': 'src/internal/arc4.ts',
+    'internal/op': 'src/internal/op.ts',
     'test-transformer/vitest-transformer': 'src/test-transformer/vitest-transformer.ts',
     'test-transformer/jest-transformer': 'src/test-transformer/jest-transformer.ts',
   },

src/context-helpers/context-manager.ts

@@ -1,20 +1,17 @@
-import { AsyncLocalStorage } from 'node:async_hooks'
 import type { TestExecutionContext } from '../test-execution-context'
 
 export class ContextManager {
-  private static asyncStore = new AsyncLocalStorage<TestExecutionContext>()
+  private static _instance: TestExecutionContext | undefined
 
   static set instance(ctx: TestExecutionContext) {
-    const instance = this.asyncStore.getStore()
-    if (instance !== undefined) throw new Error('Execution context has already been set')
-    this.asyncStore.enterWith(ctx)
+    if (this._instance !== undefined) throw new Error('Execution context has already been set')
+    this._instance = ctx
   }
   static get instance() {
-    const instance = this.asyncStore.getStore()
-    if (instance === undefined) throw new Error('No execution context has been set')
-    return instance
+    if (this._instance === undefined) throw new Error('No execution context has been set')
+    return this._instance
   }
   static reset() {
-    this.asyncStore.disable()
+    this._instance = undefined
   }
 }

src/internal-arc4.ts

@@ -0,0 +1,2 @@
+export * from '@algorandfoundation/algorand-typescript/arc4'
+export { abimethod, Contract, methodSelector } from '../impl/contract'

src/internal-op.ts

@@ -0,0 +1,38 @@
+export * from '@algorandfoundation/algorand-typescript'
+export { BaseContract, contract } from '../impl/base-contract'
+export { compileImpl as compile } from '../impl/compiled'
+export { abimethod, Contract } from '../impl/contract'
+export { ensureBudgetImpl as ensureBudget } from '../impl/ensure-budget'
+export { Global } from '../impl/global'
+export { log } from '../impl/log'
+export { assertMatchImpl as assertMatch, matchImpl as match } from '../impl/match'
+export { BigUint, Bytes, Uint64 } from '../impl/primitives'
+export { Account, Application, Asset } from '../impl/reference'
+export { Box, BoxMap, BoxRef, GlobalState, LocalState } from '../impl/state'
+export { TemplateVarImpl as TemplateVar } from '../impl/template-var'
+export { Txn } from '../impl/txn'
+export { urangeImpl as urange } from '../impl/urange'
+export { assert, err } from '../util'
+export * as arc4 from './arc4'
+export * as op from './op'
+import { ApplicationTxn, AssetConfigTxn, AssetFreezeTxn, AssetTransferTxn, KeyRegistrationTxn, PaymentTxn, Transaction } from '../impl/gtxn'
+export const gtxn = {
+  Transaction,
+  PaymentTxn,
+  KeyRegistrationTxn,
+  AssetConfigTxn,
+  AssetTransferTxn,
+  AssetFreezeTxn,
+  ApplicationTxn,
+}
+
+import { applicationCall, assetConfig, assetFreeze, assetTransfer, keyRegistration, payment, submitGroup } from '../impl/inner-transactions'
+export const itxn = {
+  submitGroup,
+  payment,
+  keyRegistration,
+  assetConfig,
+  assetTransfer,
+  assetFreeze,
+  applicationCall,
+}