Node next (#522)

* switch moduleResolver nodenext

* fix type

* bump

executor/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "chopsticks-executor"
-version = "0.9.1-3"
+version = "0.9.1-4"
 description = "Chopsticks executor"
 repository = "https://github.com/AcalaNetwork/chopsticks"
 license = "Apache-2.0"

executor/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@acala-network/chopsticks-executor",
 	"description": "Chopsticks executor",
-	"version": "0.9.1-3",
+	"version": "0.9.1-4",
 	"license": "Apache-2.0",
 	"repository": {
 		"type": "git",

executor/src/lib.rs

@@ -18,7 +18,7 @@ fn setup_console(level: Option<String>) {
 
 #[wasm_bindgen(typescript_custom_section)]
 const _: &'static str = r#"
-import { HexString } from '@polkadot/util/types';
+type HexString = `0x${string}`;
 export interface JsCallback {
 	getStorage: (key: HexString) => Promise<string | undefined>
 	getStateRoot: () => Promise<string>

packages/chopsticks/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@acala-network/chopsticks",
-	"version": "0.9.1-3",
+	"version": "0.9.1-4",
 	"author": "Acala Developers <hello@acala.network>",
 	"license": "Apache-2.0",
 	"bin": "./chopsticks.cjs",
@@ -55,10 +55,10 @@
 			"default": "./dist/esm/index.js"
 		},
 		"./*": {
-			"types": "./dist/types/index.d.ts",
-			"require": "./dist/cjs/index.js",
-			"import": "./dist/esm/index.js",
-			"default": "./dist/esm/index.js"
+			"types": "./dist/types/*.d.ts",
+			"require": "./dist/cjs/*.js",
+			"import": "./dist/esm/*.js",
+			"default": "./dist/esm/*.js"
 		},
 		"./plugins/*": {
 			"types": "./dist/types/plugins/*.d.ts",

packages/chopsticks/src/cli.ts

@@ -5,10 +5,10 @@ import yargs from 'yargs'
 import type { MiddlewareFunction } from 'yargs'
 
 import { Blockchain, BuildBlockMode, connectParachains, connectVertical } from '@acala-network/chopsticks-core'
-import { Config, fetchConfig } from './schema'
-import { defaultOptions, mockOptions } from './cli-options'
-import { pluginExtendCli } from './plugins'
-import { setupWithServer } from '.'
+import { Config, fetchConfig } from './schema/index.js'
+import { defaultOptions, mockOptions } from './cli-options.js'
+import { pluginExtendCli } from './plugins/index.js'
+import { setupWithServer } from './index.js'
 
 dotenvConfig()
 

packages/chopsticks/src/context.ts

@@ -1,9 +1,9 @@
-import './utils/tunnel'
+import './utils/tunnel.js'
 import { BlockEntry, GenesisProvider, defaultLogger, isUrl, setup, timeTravel } from '@acala-network/chopsticks-core'
-import { Config } from './schema'
+import { Config } from './schema/index.js'
 import { HexString } from '@polkadot/util/types'
 import { SqliteDatabase } from '@acala-network/chopsticks-db'
-import { overrideStorage, overrideWasm } from './utils/override'
+import { overrideStorage, overrideWasm } from './utils/override.js'
 import axios from 'axios'
 
 const logger = defaultLogger.child({ name: 'setup-context' })

packages/chopsticks/src/index.ts

@@ -1,5 +1,5 @@
 import '@polkadot/api-augment'
 
 export * from '@acala-network/chopsticks-core'
-export { setupWithServer } from './setup-with-server'
-export { fetchConfig } from './schema'
+export { setupWithServer } from './setup-with-server.js'
+export { fetchConfig } from './schema/index.js'

packages/chopsticks/src/plugins/decode-key/index.ts

@@ -1,8 +1,8 @@
-import { Config } from '../../schema'
+import { Config } from '../../schema/index.js'
 import { HexString } from '@polkadot/util/types'
 import { decodeKey } from '@acala-network/chopsticks-core'
-import { defaultOptions } from '../../cli-options'
-import { setupContext } from '../../context'
+import { defaultOptions } from '../../cli-options.js'
+import { setupContext } from '../../context.js'
 import type { Argv } from 'yargs'
 
 export const cli = (y: Argv) => {

packages/chopsticks/src/plugins/dry-run/cli.ts

@@ -1,7 +1,7 @@
-import { Config } from '../../schema'
-import { defaultOptions, mockOptions } from '../../cli-options'
-import { dryRunExtrinsic } from './dry-run-extrinsic'
-import { dryRunPreimage } from './dry-run-preimage'
+import { Config } from '../../schema/index.js'
+import { defaultOptions, mockOptions } from '../../cli-options.js'
+import { dryRunExtrinsic } from './dry-run-extrinsic.js'
+import { dryRunPreimage } from './dry-run-preimage.js'
 import type { Argv } from 'yargs'
 
 export const cli = (y: Argv) => {

packages/chopsticks/src/plugins/dry-run/dry-run-extrinsic.ts

@@ -1,11 +1,11 @@
 import { blake2AsHex } from '@polkadot/util-crypto'
 import { writeFileSync } from 'node:fs'
 
-import { Config } from '../../schema'
-import { defaultLogger } from '../../logger'
-import { generateHtmlDiffPreviewFile } from '../../utils/generate-html-diff'
-import { openHtml } from '../../utils/open-html'
-import { setupContext } from '../../context'
+import { Config } from '../../schema/index.js'
+import { defaultLogger } from '../../logger.js'
+import { generateHtmlDiffPreviewFile } from '../../utils/generate-html-diff.js'
+import { openHtml } from '../../utils/open-html.js'
+import { setupContext } from '../../context.js'
 
 export const dryRunExtrinsic = async (argv: Config) => {
   const context = await setupContext(argv)

packages/chopsticks/src/plugins/dry-run/dry-run-preimage.ts

@@ -2,12 +2,12 @@ import { HexString } from '@polkadot/util/types'
 import { blake2AsHex } from '@polkadot/util-crypto'
 import { hexToU8a } from '@polkadot/util'
 
-import { Config } from '../../schema'
-import { defaultLogger } from '../../logger'
-import { generateHtmlDiffPreviewFile } from '../../utils/generate-html-diff'
+import { Config } from '../../schema/index.js'
+import { defaultLogger } from '../../logger.js'
+import { generateHtmlDiffPreviewFile } from '../../utils/generate-html-diff.js'
 import { newHeader, printRuntimeLogs, runTask, setStorage, taskHandler } from '@acala-network/chopsticks-core'
-import { openHtml } from '../../utils/open-html'
-import { setupContext } from '../../context'
+import { openHtml } from '../../utils/open-html.js'
+import { setupContext } from '../../context.js'
 
 export const dryRunPreimage = async (argv: Config) => {
   const context = await setupContext(argv)

packages/chopsticks/src/plugins/dry-run/index.ts

@@ -1,2 +1,2 @@
-export * from './cli'
-export * from './rpc'
+export * from './cli.js'
+export * from './rpc.js'

packages/chopsticks/src/plugins/dry-run/rpc.ts

@@ -2,8 +2,8 @@ import { HexString } from '@polkadot/util/types'
 import { z } from 'zod'
 
 import { Context, ResponseError } from '@acala-network/chopsticks-core'
-import { decodeStorageDiff } from '../../utils/decoder'
-import { generateHtmlDiff } from '../../utils/generate-html-diff'
+import { decodeStorageDiff } from '../../utils/decoder.js'
+import { generateHtmlDiff } from '../../utils/generate-html-diff.js'
 
 const zHex = z.custom<HexString>((val: any) => /^0x\w+$/.test(val))
 const zHash = z.string().length(66).and(zHex)

packages/chopsticks/src/plugins/follow-chain/index.ts

@@ -4,11 +4,11 @@ import { HexString } from '@polkadot/util/types'
 import _ from 'lodash'
 import type { Argv } from 'yargs'
 
-import { createServer } from '../../server'
-import { defaultOptions } from '../../cli-options'
-import { handler } from '../../rpc'
-import { setupContext } from '../../context'
-import type { Config } from '../../schema'
+import { createServer } from '../../server.js'
+import { defaultOptions } from '../../cli-options.js'
+import { handler } from '../../rpc/index.js'
+import { setupContext } from '../../context.js'
+import type { Config } from '../../schema/index.js'
 
 const logger = defaultLogger.child({ name: 'follow-chain' })
 const options = _.pick(defaultOptions, ['endpoint', 'wasm-override', 'runtime-log-level', 'offchain-worker'])

packages/chopsticks/src/plugins/index.ts

@@ -2,7 +2,7 @@ import { Handlers } from '@acala-network/chopsticks-core'
 import _ from 'lodash'
 import type { Argv } from 'yargs'
 
-import { defaultLogger } from '../logger'
+import { defaultLogger } from '../logger.js'
 
 const logger = defaultLogger.child({ name: 'plugin' })
 

packages/chopsticks/src/plugins/new-block/index.ts

@@ -1,6 +1,6 @@
 import { Context, DownwardMessage, HorizontalMessage, ResponseError } from '@acala-network/chopsticks-core'
 import { HexString } from '@polkadot/util/types'
-import { defaultLogger } from '../../logger'
+import { defaultLogger } from '../../logger.js'
 
 export interface NewBlockParams {
   /**

packages/chopsticks/src/plugins/run-block/index.test.ts

@@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest'
 
 import { setup } from '@acala-network/chopsticks-core'
 
-import { rpc } from '.'
+import { rpc } from './index.js'
 
 describe('run-block', () => {
   it('should work', async () => {

packages/chopsticks/src/plugins/run-block/index.ts

@@ -18,11 +18,11 @@ import {
   taskHandler,
 } from '@acala-network/chopsticks-core'
 
-import { Config } from '../../schema'
-import { defaultOptions, mockOptions } from '../../cli-options'
-import { generateHtmlDiffPreviewFile } from '../../utils/generate-html-diff'
-import { openHtml } from '../../utils/open-html'
-import { setupContext } from '../../context'
+import { Config } from '../../schema/index.js'
+import { defaultOptions, mockOptions } from '../../cli-options.js'
+import { generateHtmlDiffPreviewFile } from '../../utils/generate-html-diff.js'
+import { openHtml } from '../../utils/open-html.js'
+import { setupContext } from '../../context.js'
 
 export const cli = (y: Argv) => {
   y.command(

packages/chopsticks/src/plugins/set-block-build-mode/index.ts

@@ -1,5 +1,5 @@
 import { BuildBlockMode, Context, ResponseError } from '@acala-network/chopsticks-core'
-import { defaultLogger } from '../../logger'
+import { defaultLogger } from '../../logger.js'
 
 /**
  * Set a build block mode. See [BuildBlockMode](../core/enums/BuildBlockMode).

packages/chopsticks/src/plugins/set-runtime-log-level/index.ts

@@ -1,5 +1,5 @@
 import { Context, ResponseError } from '@acala-network/chopsticks-core'
-import { defaultLogger } from '../../logger'
+import { defaultLogger } from '../../logger.js'
 
 /**
  * Set runtime log level.

packages/chopsticks/src/plugins/set-storage/index.ts

@@ -1,7 +1,7 @@
 import { Context, ResponseError, StorageValues, setStorage } from '@acala-network/chopsticks-core'
 import { HexString } from '@polkadot/util/types'
 
-import { defaultLogger } from '../../logger'
+import { defaultLogger } from '../../logger.js'
 
 /**
  * Set storage values.

packages/chopsticks/src/plugins/try-runtime/index.ts

@@ -1,11 +1,11 @@
 import { writeFileSync } from 'node:fs'
 import type { Argv } from 'yargs'
 
-import { Config } from '../../schema'
-import { defaultOptions } from '../../cli-options'
-import { generateHtmlDiffPreviewFile } from '../../utils/generate-html-diff'
-import { openHtml } from '../../utils/open-html'
-import { setupContext } from '../../context'
+import { Config } from '../../schema/index.js'
+import { defaultOptions } from '../../cli-options.js'
+import { generateHtmlDiffPreviewFile } from '../../utils/generate-html-diff.js'
+import { openHtml } from '../../utils/open-html.js'
+import { setupContext } from '../../context.js'
 
 export const cli = (y: Argv) => {
   y.command(

packages/chopsticks/src/plugins/types.ts

@@ -1,12 +1,12 @@
-export { rpc as newBlock } from './new-block'
-export { rpc as dryRun } from './dry-run'
-export { rpc as setBlockBuildMode } from './set-block-build-mode'
-export { rpc as setHead } from './set-head'
-export { rpc as setRuntimeLogLevel } from './set-runtime-log-level'
-export { rpc as setStorage } from './set-storage'
-export { rpc as timeTravel } from './time-travel'
-export { rpc as runBlock } from './run-block'
+export { rpc as newBlock } from './new-block/index.js'
+export { rpc as dryRun } from './dry-run/index.js'
+export { rpc as setBlockBuildMode } from './set-block-build-mode/index.js'
+export { rpc as setHead } from './set-head/index.js'
+export { rpc as setRuntimeLogLevel } from './set-runtime-log-level/index.js'
+export { rpc as setStorage } from './set-storage/index.js'
+export { rpc as timeTravel } from './time-travel/index.js'
+export { rpc as runBlock } from './run-block/index.js'
 
-export type { NewBlockParams } from './new-block'
-export type { DryRunParams } from './dry-run'
-export type { RunBlockParams } from './run-block'
+export type { NewBlockParams } from './new-block/index.js'
+export type { DryRunParams } from './dry-run/index.js'
+export type { RunBlockParams } from './run-block/index.js'

packages/chopsticks/src/rpc/index.ts

@@ -7,7 +7,7 @@ import {
   substrate,
 } from '@acala-network/chopsticks-core'
 
-import { pluginHandlers } from '../plugins'
+import { pluginHandlers } from '../plugins/index.js'
 
 const allHandlers: Handlers = {
   ...substrate,

packages/chopsticks/src/server.ts

@@ -2,7 +2,7 @@ import { AddressInfo, WebSocket, WebSocketServer } from 'ws'
 import { ResponseError, SubscriptionManager } from '@acala-network/chopsticks-core'
 import { z } from 'zod'
 
-import { defaultLogger, truncate } from './logger'
+import { defaultLogger, truncate } from './logger.js'
 
 const logger = defaultLogger.child({ name: 'ws' })
 

packages/chopsticks/src/setup-with-server.ts

@@ -1,8 +1,8 @@
-import { Config } from './schema'
-import { createServer } from './server'
-import { handler } from './rpc'
+import { Config } from './schema/index.js'
+import { createServer } from './server.js'
+import { handler } from './rpc/index.js'
 import { logger } from '@acala-network/chopsticks-core'
-import { setupContext } from './context'
+import { setupContext } from './context.js'
 
 export const setupWithServer = async (argv: Config) => {
   const context = await setupContext(argv)

packages/chopsticks/src/types.ts

@@ -17,5 +17,5 @@ export type {
   SubscriptionManager,
   Handler,
 } from '@acala-network/chopsticks-core'
-export * from '@acala-network/chopsticks-core/src/rpc/substrate'
-export * from './plugins/types'
+export * from '@acala-network/chopsticks-core/rpc/substrate/index.js'
+export * from './plugins/types.js'

packages/chopsticks/src/utils/generate-html-diff.ts

@@ -1,6 +1,6 @@
 import { Block } from '@acala-network/chopsticks-core'
 import { HexString } from '@polkadot/util/types'
-import { decodeStorageDiff } from './decoder'
+import { decodeStorageDiff } from './decoder.js'
 import { mkdirSync, readFileSync, writeFileSync } from 'node:fs'
 import _ from 'lodash'
 

packages/chopsticks/src/utils/index.ts

@@ -1,4 +1,4 @@
-export * from './decoder'
-export * from './generate-html-diff'
-export * from './open-html'
-export * from './override'
+export * from './decoder.js'
+export * from './generate-html-diff.js'
+export * from './open-html.js'
+export * from './override.js'

packages/chopsticks/src/utils/override.ts

@@ -3,7 +3,7 @@ import { HexString } from '@polkadot/util/types'
 import { existsSync, readFileSync } from 'node:fs'
 import yaml from 'js-yaml'
 
-import { defaultLogger } from '../logger'
+import { defaultLogger } from '../logger.js'
 
 export const overrideStorage = async (chain: Blockchain, storage?: string | StorageValues, at?: HexString) => {
   if (storage == null) {

packages/core/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@acala-network/chopsticks-core",
-	"version": "0.9.1-3",
+	"version": "0.9.1-4",
 	"author": "Acala Developers <hello@acala.network>",
 	"license": "Apache-2.0",
 	"type": "module",
@@ -45,10 +45,10 @@
 			"default": "./dist/esm/index.js"
 		},
 		"./*": {
-			"types": "./dist/esm/index.d.ts",
-			"require": "./dist/cjs/index.js",
-			"import": "./dist/esm/index.js",
-			"default": "./dist/esm/index.js"
+			"types": "./dist/types/*.d.ts",
+			"require": "./dist/cjs/*.js",
+			"import": "./dist/esm/*.js",
+			"default": "./dist/esm/*.js"
 		},
 		"./package.json": "./package.json",
 		"./package.cjs.json": "./dist/cjs/package.json"

packages/core/src/api.test.ts

@@ -1,4 +1,4 @@
-import { Api } from './api'
+import { Api } from './api.js'
 import { WsProvider } from '@polkadot/rpc-provider'
 import { expect, test } from 'vitest'
 

packages/core/src/api.ts

@@ -1,7 +1,7 @@
 import { ExtDef } from '@polkadot/types/extrinsic/signedExtensions/types'
 import { HexString } from '@polkadot/util/types'
 import { ProviderInterface, ProviderInterfaceCallback } from '@polkadot/rpc-provider/types'
-import { prefixedChildKey, splitChildKey, stripChildPrefix } from './utils'
+import { prefixedChildKey, splitChildKey, stripChildPrefix } from './utils/index.js'
 
 export type ChainProperties = {
   ss58Format?: number