Packaging: export tokens in conditional export (#457)

Author: barnjamin

connect/package.json

@@ -30,6 +30,13 @@
       }
     }
   },
+  "typesVersions": {
+    "*": {
+      "*": [
+        "./dist/cjs/index.d.ts"
+      ]
+    }
+  },
   "files": [
     "dist/esm",
     "dist/cjs"

connect/src/index.ts

@@ -16,5 +16,7 @@ export * as routes from "./routes/index.js";
 
 // Re-export from core packages
 export * from "@wormhole-foundation/sdk-base";
+export * as tokens from "@wormhole-foundation/sdk-base/tokens";
+
 export * from "@wormhole-foundation/sdk-definitions";
 export * as testing from "@wormhole-foundation/sdk-definitions/testing";

connect/src/routes/portico/automatic.ts

@@ -1,3 +1,13 @@
+import type { StaticRouteMethods } from "../route.js";
+import { AutomaticRoute } from "../route.js";
+import type {
+  Quote,
+  QuoteResult,
+  Receipt,
+  TransferParams,
+  ValidatedTransferParams,
+  ValidationResult,
+} from "../types.js";
 import type {
   AttestationReceipt,
   Chain,
@@ -13,6 +23,7 @@ import {
   TokenTransfer,
   TransferState,
   Wormhole,
+  amount,
   canonicalAddress,
   chainToPlatform,
   contracts,
@@ -22,18 +33,7 @@ import {
   resolveWrappedToken,
   signSendWait,
   tokens,
-  amount,
 } from "./../../index.js";
-import type { StaticRouteMethods } from "../route.js";
-import { AutomaticRoute } from "../route.js";
-import type {
-  Quote,
-  QuoteResult,
-  Receipt,
-  TransferParams,
-  ValidatedTransferParams,
-  ValidationResult,
-} from "../types.js";
 
 export const SLIPPAGE_BPS = 15n; // 0.15%
 export const BPS_PER_HUNDRED_PERCENT = 10000n;

connect/src/routes/token.ts

@@ -1,13 +1,14 @@
 import type { Chain, Network } from "@wormhole-foundation/sdk-base";
-import { tokens } from "@wormhole-foundation/sdk-base";
+import { filters } from "@wormhole-foundation/sdk-base/tokens";
+import { type TokenSymbol } from "@wormhole-foundation/sdk-base/tokens";
 import type { ChainContext, TokenId } from "@wormhole-foundation/sdk-definitions";
 import { canonicalAddress, isNative } from "@wormhole-foundation/sdk-definitions";
 import { Wormhole } from "../wormhole.js";
 
 export interface TokenDetails {
   id: TokenId;
   decimals: number;
-  symbol?: tokens.TokenSymbol;
+  symbol?: TokenSymbol;
   wrapped?: TokenId;
 }
 
@@ -34,7 +35,7 @@ export async function getTokenDetails<N extends Network>(
   const address = canonicalAddress(token);
 
   const details = chain.config.tokenMap
-    ? tokens.filters.byAddress(chain.config.tokenMap!, address)
+    ? filters.byAddress(chain.config.tokenMap!, address)
     : undefined;
 
   const symbol = details ? details.symbol : undefined;

core/base/package.json

@@ -26,6 +26,43 @@
         "types": "./dist/cjs/index.d.ts",
         "default": "./dist/cjs/index.js"
       }
+    },
+    "./constants":{
+      "import": {
+        "types": "./dist/esm/constants/index.d.ts",
+        "default": "./dist/esm/constants/index.js"
+      },
+      "require": {
+        "types": "./dist/cjs/constants/index.d.ts",
+        "default": "./dist/cjs/constants/index.js"
+      }
+    },
+    "./tokens":{
+      "import": {
+        "types": "./dist/esm/constants/tokens/index.d.ts",
+        "default": "./dist/esm/constants/tokens/index.js"
+      },
+      "require": {
+        "types": "./dist/cjs/constants/tokens/index.d.ts",
+        "default": "./dist/cjs/constants/tokens/index.js"
+      }
+    },
+    "./contracts":{
+      "import": {
+        "types": "./dist/esm/constants/contracts/index.d.ts",
+        "default": "./dist/esm/constants/contracts/index.js"
+      },
+      "require": {
+        "types": "./dist/cjs/constants/contracts/index.d.ts",
+        "default": "./dist/cjs/constants/contracts/index.js"
+      }
+    }
+  },
+  "typesVersions": {
+    "*": {
+      "*": [
+        "./dist/cjs/index.d.ts"
+      ]
     }
   },
   "files": [

core/base/src/constants/index.ts

@@ -2,8 +2,6 @@ export * from "./networks.js";
 export * from "./chains.js";
 export * from "./platforms.js";
 
-export * as tokens from "./tokens/index.js";
-
 export * as platform from "./platforms.js";
 export * as chain from "./chains.js";
 export * as network from "./networks.js";

core/base/src/constants/tokens/index.ts

@@ -1,14 +1,18 @@
-import type { Chain } from '../chains.js';
-import type { Network } from '../networks.js';
-
-//import { mainnetTokenDetails } from './mainnetTokenDetails.js';
-//import { testnetTokenDetails } from './testnetTokenDetails.js';
-
-import { mainnetChainTokens } from './mainnet.js';
-import { testnetChainTokens } from './testnet.js';
-import type { TokenSymbol, TokenKey, ChainTokens, Token } from './types.js';
-
-export type {TokenKey, TokenSymbol, ChainTokens, Token, TokenConst, TokenExtraDetails} from './types.js';
+import type { Chain } from "../chains.js";
+import type { Network } from "../networks.js";
+
+import { mainnetChainTokens } from "./mainnet.js";
+import { testnetChainTokens } from "./testnet.js";
+import type { TokenSymbol, TokenKey, ChainTokens, Token } from "./types.js";
+
+export type {
+  TokenKey,
+  TokenSymbol,
+  ChainTokens,
+  Token,
+  TokenConst,
+  TokenExtraDetails,
+} from "./types.js";
 
 export function getTokenMap<N extends Network, C extends Chain>(
   network: N,