chore: move type files up and cleanup exports

src/common/ar-io.ts

@@ -22,8 +22,8 @@ import {
   EvaluationParameters,
   Gateway,
   SmartWeaveContract,
-} from '../types/index.js';
-import { RemoteContract } from './index.js';
+} from '../types.js';
+import { RemoteContract } from './contracts/remote-contract.js';
 
 // TODO: append this with other configuration options (e.g. local vs. remote evaluation)
 export type ContractConfiguration =

src/common/contracts/remote-contract.ts

@@ -19,7 +19,7 @@ import {
   HTTPClient,
   Logger,
   SmartWeaveContract,
-} from '../../types/index.js';
+} from '../../types.js';
 import { AxiosHTTPService } from '../http.js';
 import { DefaultLogger } from '../logger.js';
 

src/common/contracts/warp-contract.ts

@@ -21,14 +21,9 @@ import {
   defaultCacheOptions,
 } from 'warp-contracts';
 
-import { EvaluationParameters, SmartWeaveContract } from '../../types/index.js';
+import { EvaluationParameters, SmartWeaveContract } from '../../types.js';
 import { FailedRequestError } from '../error.js';
 
-export const defaultWarpClient = WarpFactory.forMainnet({
-  ...defaultCacheOptions,
-  inMemory: true, // default to in memory for now, a custom warp implementation can be provided
-});
-
 export class WarpContract<T> implements SmartWeaveContract<T> {
   private contract: Contract<T>;
   private contractTxId: string;
@@ -37,18 +32,21 @@ export class WarpContract<T> implements SmartWeaveContract<T> {
   constructor({
     contractTxId,
     cacheUrl,
-    warp = defaultWarpClient,
+    warp = WarpFactory.forMainnet({
+      ...defaultCacheOptions,
+      inMemory: true, // default to in memory for now, a custom warp implementation can be provided
+    }),
   }: {
+    contractTxId: string;
     cacheUrl?: string;
     warp: Warp;
-    contractTxId: string;
   }) {
-    // sync state
     this.contract = warp.contract<T>(contractTxId);
     this.cacheUrl = cacheUrl;
   }
 
   private async syncState() {
+    // TODO: get contract manifest and set it before evaluating
     if (this.cacheUrl !== undefined) {
       await this.contract.syncState(
         `${this.cacheUrl}/v1/contract/${this.contractTxId}`,

src/common/http.ts

@@ -16,7 +16,7 @@
  */
 import { AxiosInstance } from 'axios';
 
-import { HTTPClient, Logger } from '../types/index.js';
+import { HTTPClient, Logger } from '../types.js';
 import { createAxiosInstance } from '../utils/index.js';
 import { FailedRequestError, NotFound, UnknownError } from './error.js';
 import { DefaultLogger } from './logger.js';

src/common/index.ts

@@ -15,6 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 export * from './ar-io.js';
-export * from './contracts/index.js';
 export * from './error.js';
 export * from './logger.js';
+
+// contracts
+export * from './contracts/remote-contract.js';
+export * from './contracts/warp-contract.js';

src/common/logger.ts

@@ -18,7 +18,7 @@
 import 'setimmediate';
 import winston, { createLogger, format, transports } from 'winston';
 
-import { Logger } from '../types/index.js';
+import { Logger } from '../types.js';
 import { version } from '../version.js';
 
 export class DefaultLogger implements Logger {

src/node/index.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-export * from '../types/index.js';
+export * from '../types.js';
 export * from '../common/index.js';
 export * from '../constants.js';
 export * from '../utils/index.js';

src/types/index.ts → src/types.ts

@@ -14,7 +14,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 export * from './arns-service.js';
 export * from './contract-state.js';
 export * from './common.js';

src/utils/arweave.ts

@@ -14,8 +14,8 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+import { BlockHeight } from '../common.js';
 import { ARWEAVE_TX_REGEX } from '../constants.js';
-import { BlockHeight } from '../types/common.js';
 
 export const validateArweaveId = (id: string): boolean => {
   return ARWEAVE_TX_REGEX.test(id);

src/utils/smartweave.ts

@@ -14,8 +14,8 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+import { SortKey } from '../common.js';
 import { SORT_KEY_REGEX } from '../constants.js';
-import { SortKey } from '../types/common.js';
 
 export function isSortKey(sortKey: string): sortKey is SortKey {
   return SmartWeaveSortKey.validate(sortKey);

src/web/index.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-export * from '../types/index.js';
+export * from '../types.js';
 export * from '../common/index.js';
 export * from '../constants.js';
 export * from '../utils/index.js';

tests/ar-io.test.ts

@@ -1,7 +1,7 @@
 import { ArIO } from '../src/common/ar-io.js';
-import { RemoteContract } from '../src/common/index.js';
+import { RemoteContract } from '../src/common/contracts/remote-contract.js';
 import { ARNS_DEVNET_REGISTRY_TX } from '../src/constants.js';
-import { ArIOState } from '../src/types/contract-state.js';
+import { ArIOState } from '../src/contract-state.js';
 import { SmartWeaveSortKey } from '../src/utils/smartweave.js';
 
 const gatewayAddress = '1H7WZIWhzwTH9FIcnuMqYkTsoyv1OTfGa_amvuYwrgo';

tsconfig.json

@@ -24,6 +24,6 @@
     "skipLibCheck": true,
     "strictNullChecks": true
   },
-  "include": ["src", "tests/utils/arweave.test.ts"],
-  "exclude": ["lib", "node_modules", "bundles"]
+  "include": ["src"],
+  "exclude": ["lib", "node_modules", "bundles", "tests"]
 }