fix: Remove circular dependency

Author: iglosiggio

src/awst_build/eb/storage/box/box-map.ts

@@ -7,10 +7,9 @@ import { wtypes } from '../../../../awst/wtypes'
 import { invariant } from '../../../../util'
 import type { PType } from '../../../ptypes'
 import { BoxMapPType, BoxPType, bytesPType, stringPType } from '../../../ptypes'
-import { assertCanBeUsedForStorage } from '../../../ptypes/util'
 import { FunctionBuilder, type NodeBuilder } from '../../index'
 import { parseFunctionArgs } from '../../util/arg-parsing'
-import { extractKey } from '../util'
+import { assertCanBeUsedForStorage, extractKey } from '../util'
 import { BoxProxyExpressionBuilder } from './base'
 import { BoxExpressionBuilder } from './box'
 

src/awst_build/eb/storage/box/box.ts

@@ -6,11 +6,10 @@ import { wtypes } from '../../../../awst/wtypes'
 import { invariant } from '../../../../util'
 import type { PType } from '../../../ptypes'
 import { boolPType, BoxPType, bytesPType, ReadonlyTuplePType, stringPType, uint64PType, voidPType } from '../../../ptypes'
-import { assertCanBeUsedForStorage } from '../../../ptypes/util'
 import { instanceEb } from '../../../type-registry'
 import { FunctionBuilder, type NodeBuilder } from '../../index'
 import { parseFunctionArgs } from '../../util/arg-parsing'
-import { extractKey } from '../util'
+import { assertCanBeUsedForStorage, extractKey } from '../util'
 import { boxExists, boxLength, BoxProxyExpressionBuilder, boxValue, BoxValueExpressionBuilder } from './base'
 
 export class BoxFunctionBuilder extends FunctionBuilder {

src/awst_build/eb/storage/global-state.ts

@@ -10,14 +10,13 @@ import { codeInvariant, invariant } from '../../../util'
 import { AppStorageDeclaration } from '../../models/app-storage-declaration'
 import type { ContractClassPType, PType } from '../../ptypes'
 import { boolPType, bytesPType, GlobalStateGeneric, GlobalStateType, numberPType, stringPType } from '../../ptypes'
-import { assertCanBeUsedForStorage } from '../../ptypes/util'
 import { typeRegistry } from '../../type-registry'
 import { BooleanExpressionBuilder } from '../boolean-expression-builder'
 import type { NodeBuilder } from '../index'
 import { FunctionBuilder, InstanceExpressionBuilder } from '../index'
 import { parseFunctionArgs } from '../util/arg-parsing'
 import { VoidExpressionBuilder } from '../void-expression-builder'
-import { extractKey } from './util'
+import { assertCanBeUsedForStorage, extractKey } from './util'
 
 export class GlobalStateFunctionBuilder extends FunctionBuilder {
   constructor(sourceLocation: SourceLocation) {

src/awst_build/eb/storage/local-state.ts

@@ -10,12 +10,11 @@ import { AppStorageDeclaration } from '../../models/app-storage-declaration'
 
 import type { ContractClassPType, PType } from '../../ptypes'
 import { accountPType, boolPType, bytesPType, LocalStateType, stringPType } from '../../ptypes'
-import { assertCanBeUsedForStorage } from '../../ptypes/util'
 import { instanceEb } from '../../type-registry'
 import { FunctionBuilder, InstanceBuilder, InstanceExpressionBuilder, NodeBuilder } from '../index'
 import { parseFunctionArgs } from '../util/arg-parsing'
 import { VoidExpressionBuilder } from '../void-expression-builder'
-import { extractKey } from './util'
+import { assertCanBeUsedForStorage, extractKey } from './util'
 
 export class LocalStateFunctionBuilder extends FunctionBuilder {
   constructor(sourceLocation: SourceLocation) {

src/awst_build/eb/storage/util.ts

@@ -3,6 +3,9 @@ import type { Expression } from '../../../awst/nodes'
 import { BytesConstant } from '../../../awst/nodes'
 import type { SourceLocation } from '../../../awst/source-location'
 import type { wtypes } from '../../../awst/wtypes'
+import { CodeError } from '../../../errors'
+import type { PType } from '../../ptypes'
+import { ImmutableObjectPType, MutableObjectPType, TransientType, UnsupportedType } from '../../ptypes'
 import type { InstanceBuilder } from '../index'
 
 export function extractKey(key: InstanceBuilder, keyWType: wtypes.WType, sourceLocation: SourceLocation): Expression
@@ -29,3 +32,13 @@ export function extractKey(
     })
   }
 }
+
+export function assertCanBeUsedForStorage(ptype: PType, sourceLocation?: SourceLocation) {
+  if (ptype instanceof UnsupportedType || ptype instanceof TransientType) {
+    throw new CodeError(`Type ${ptype} cannot be used for storage`, { sourceLocation })
+  }
+  if ((ptype instanceof MutableObjectPType || ptype instanceof ImmutableObjectPType) && !ptype.abiSafe) {
+    const ptypeName = ptype.alias?.fullName || ptype.toString()
+    throw new CodeError(`Type ${ptypeName} cannot be used for storage`, { sourceLocation })
+  }
+}

src/awst_build/ptypes/util.ts

@@ -1,7 +1,4 @@
 import * as crypto from 'node:crypto'
-import { ImmutableObjectPType, MutableObjectPType, TransientType, UnsupportedType } from '.'
-import type { SourceLocation } from '../../awst/source-location'
-import { CodeError } from '../../errors'
 import type { PType } from './base'
 
 export const ptypeIn = (target: PType, ...ptypes: [PType, ...PType[]]): boolean => {
@@ -16,13 +13,3 @@ export function generateObjectHash(objectProperties: Record<string, PType>) {
   hash.update(signature, 'utf8')
   return hash.digest('hex').substring(0, 8).toUpperCase()
 }
-
-export function assertCanBeUsedForStorage(ptype: PType, sourceLocation?: SourceLocation) {
-  if (ptype instanceof UnsupportedType || ptype instanceof TransientType) {
-    throw new CodeError(`Type ${ptype} cannot be used for storage`, { sourceLocation })
-  }
-  if ((ptype instanceof MutableObjectPType || ptype instanceof ImmutableObjectPType) && !ptype.abiSafe) {
-    const ptypeName = ptype.alias?.fullName || ptype.toString()
-    throw new CodeError(`Type ${ptypeName} cannot be used for storage`, { sourceLocation })
-  }
-}