use swc for build (#517)

* use swc for build

* fix sidecar

* bump

.cjsswcrc

@@ -0,0 +1,13 @@
+{
+	"$schema": "https://json.schemastore.org/swcrc",
+	"exclude": [".*\\.test.ts$"],
+	"jsc": {
+		"parser": {
+			"syntax": "typescript"
+		},
+		"target": "es2021"
+	},
+	"module": {
+		"type": "commonjs"
+	}
+}

.eslintignore

@@ -6,3 +6,5 @@ lib/
 dist/
 packages/core/scripts/
 chopsticks.js
+packages/core/src/wasm-executor/browser-wasm-executor.js
+packages/core/src/wasm-executor/node-wasm-executor.js

.eslintrc

@@ -0,0 +1,33 @@
+{
+	"root": true,
+	"parser": "@typescript-eslint/parser",
+	"plugins": ["@typescript-eslint", "import", "sort-imports-es6-autofix"],
+	"extends": [
+		"eslint:recommended",
+		"plugin:@typescript-eslint/recommended",
+		"prettier",
+		"plugin:import/recommended",
+		"plugin:import/typescript"
+	],
+	"rules": {
+		"@typescript-eslint/no-empty-function": "off",
+		"@typescript-eslint/explicit-module-boundary-types": "off",
+		"sort-imports-es6-autofix/sort-imports-es6": "error",
+		"@typescript-eslint/no-explicit-any": "off",
+		"@typescript-eslint/no-unused-vars": [
+			"warn",
+			{
+				"argsIgnorePattern": "^_",
+				"varsIgnorePattern": "^_",
+				"caughtErrorsIgnorePattern": "^_"
+			}
+		]
+	},
+	"settings": {
+		"import/resolver": {
+			"typescript": {
+				"project": "tsconfig.json"
+			}
+		}
+	}
+}

.esmswcrc

@@ -0,0 +1,13 @@
+{
+	"$schema": "https://json.schemastore.org/swcrc",
+	"exclude": [".*\\.test.ts$"],
+	"jsc": {
+		"parser": {
+			"syntax": "typescript"
+		},
+		"target": "esnext"
+	},
+	"module": {
+		"type": "es6"
+	}
+}

executor/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "chopsticks-executor"
-version = "0.9.1-2"
+version = "0.9.1-3"
 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-2",
+	"version": "0.9.1-3",
 	"license": "Apache-2.0",
 	"repository": {
 		"type": "git",

loader.js

@@ -0,0 +1,15 @@
+import * as tsConfigPaths from 'tsconfig-paths'
+import { pathToFileURL } from 'url'
+import { resolve as resolveTs } from 'ts-node/esm'
+
+const { absoluteBaseUrl, paths } = tsConfigPaths.loadConfig()
+const matchPath = tsConfigPaths.createMatchPath(absoluteBaseUrl, paths)
+
+export function resolve(specifier, ctx, defaultResolve) {
+  const match = matchPath(specifier)
+  return match
+    ? resolveTs(pathToFileURL(`${match}`).href, ctx, defaultResolve)
+    : resolveTs(specifier, ctx, defaultResolve)
+}
+
+export { load, transformSource } from 'ts-node/esm'

package.json

@@ -4,6 +4,7 @@
 	"license": "Apache-2.0",
 	"packageManager": "[email protected]",
 	"private": true,
+	"type": "module",
 	"workspaces": [
 		"packages/*",
 		"executor"
@@ -18,15 +19,16 @@
 		"check": "cd executor && cargo check --locked",
 		"test": "vitest run",
 		"test:watch": "vitest",
-		"start": "yarn script:start",
-		"dev": "yarn script:run",
+		"start": "NODE_OPTIONS='--loader ts-node/esm --loader ./loader.js --no-warnings --experimental-specifier-resolution=node' node packages/chopsticks/src/cli.ts",
+		"dev": "NODE_OPTIONS='--loader ts-node/esm --loader ./loader.js --no-warnings --experimental-specifier-resolution=node' LOG_LEVEL=trace node packages/chopsticks/src/cli.ts -- --config=configs/dev.yml",
+		"script:start": "yarn start",
 		"docs:prep": "yarn workspaces foreach -pvit run docs:prep && cp docs/* docs-src",
 		"docs:dev": "yarn docs:prep && vitepress dev",
 		"docs:build": "yarn docs:prep && vitepress build",
 		"docs:preview": "yarn docs:build && vitepress preview"
 	},
 	"engines": {
-		"node": ">=v14"
+		"node": ">=v18"
 	},
 	"prettier": {
 		"tabWidth": 2,
@@ -38,7 +40,7 @@
 		"*.{js,ts,css,md}": "prettier --write"
 	},
 	"devDependencies": {
-		"@swc/core": "^1.3.95",
+		"@swc/core": "^1.3.96",
 		"@types/node": "^20.5.7",
 		"@types/prettier": "^3.0.0",
 		"@typescript-eslint/eslint-plugin": "^6.5.0",
@@ -50,6 +52,7 @@
 		"eslint-plugin-sort-imports-es6-autofix": "^0.6.0",
 		"husky": "^8.0.3",
 		"prettier": "^3.0.2",
+		"ts-node": "^10.9.1",
 		"typedoc": "^0.25.1",
 		"typedoc-plugin-markdown": "^3.16.0",
 		"typescript": "^5.1.6",

packages/chopsticks/package.json

@@ -1,20 +1,16 @@
 {
 	"name": "@acala-network/chopsticks",
-	"version": "0.9.1-2",
+	"version": "0.9.1-3",
 	"author": "Acala Developers <[email protected]>",
 	"license": "Apache-2.0",
-	"bin": "./chopsticks.js",
+	"bin": "./chopsticks.cjs",
+	"type": "module",
 	"scripts": {
 		"clean": "rm -rf dist",
-		"build": "yarn clean && tsc -p ./tsconfig.json && tsc -p ./tsconfig.esm.json && echo '{\"type\": \"module\"}' > ./dist/esm/package.json && yarn copyfiles",
-		"copyfiles": "cp -r src/utils/template dist/cjs/utils/ && cp -r src/utils/template dist/esm/utils/",
-		"script:start": "cd ../..; ts-node --transpile-only -r tsconfig-paths/register packages/chopsticks/src/cli.ts",
-		"script:run": "cd ../..; LOG_LEVEL=trace ts-node-dev --transpile-only -r tsconfig-paths/register --inspect --notify=false packages/chopsticks/src/cli.ts -- --config=configs/dev.yml",
-		"dev:karura": "cd ../..; ts-node-dev --transpile-only --inspect -r tsconfig-paths/register --notify=false packages/chopsticks/src/cli.ts -- --config=configs/karura.yml",
-		"dev:acala": "cd ../..; ts-node-dev --transpile-only --inspect -r tsconfig-paths/register --notify=false packages/chopsticks/src/cli.ts -- --config=configs/acala.yml",
-		"dev:polkadot": "cd ../..; ts-node-dev --transpile-only --inspect -r tsconfig-paths/register --notify=false packages/chopsticks/src/cli.ts -- --config=configs/polkadot.yml",
-		"dev:moonriver": "cd ../..; ts-node-dev --transpile-only --inspect -r tsconfig-paths/register --notify=false packages/chopsticks/src/cli.ts -- --config=configs/moonriver.yml",
-		"dev:moonbeam": "cd ../..; ts-node-dev --transpile-only --inspect -r tsconfig-paths/register --notify=false packages/chopsticks/src/cli.ts -- --config=configs/moonbeam.yml",
+		"build": "yarn clean && yarn build:cjs && yarn build:esm && yarn build:types",
+		"build:cjs": "swc ./src --config-file ../../.cjsswcrc -d dist/cjs --copy-files && echo '{\"type\": \"commonjs\"}' > dist/cjs/package.json",
+		"build:esm": "swc ./src --config-file ../../.esmswcrc -d dist/esm --copy-files",
+		"build:types": "tsc -p tsconfig.json --emitDeclarationOnly --outDir dist/types",
 		"docs:prep": "typedoc"
 	},
 	"dependencies": {
@@ -32,21 +28,21 @@
 		"zod": "^3.22.3"
 	},
 	"devDependencies": {
+		"@swc/cli": "0.1.62",
+		"@swc/core": "^1.3.96",
 		"@types/global-agent": "^2.1.1",
 		"@types/js-yaml": "^4.0.5",
 		"@types/lodash": "^4.14.199",
 		"@types/node": "^20.5.7",
 		"@types/ws": "^8.5.6",
 		"@types/yargs": "^17.0.29",
-		"ts-node": "^10.9.1",
-		"ts-node-dev": "^2.0.0",
 		"typescript": "^5.1.6"
 	},
 	"files": [
 		"dist/esm/**",
 		"dist/cjs/**",
 		"dist/types/**",
-		"chopsticks.js"
+		"chopsticks.cjs"
 	],
 	"main": "./dist/cjs/index.js",
 	"module": "./dist/esm/index.js",
@@ -71,6 +67,6 @@
 			"default": "./dist/esm/plugins/*.js"
 		},
 		"./package.json": "./package.json",
-		"./package.esm.json": "./dist/esm/package.json"
+		"./package.cjs.json": "./dist/cjs/package.json"
 	}
 }

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

@@ -3,11 +3,10 @@ import { HexString } from '@polkadot/util/types'
 import { decodeStorageDiff } from './decoder'
 import { mkdirSync, readFileSync, writeFileSync } from 'node:fs'
 import _ from 'lodash'
-import url from 'node:url'
 
 export const generateHtmlDiff = async (block: Block, diff: [HexString, HexString | null][]) => {
   const { oldState, delta } = await decodeStorageDiff(block, diff)
-  const htmlTemplate = readFileSync(url.resolve(__filename, './template/diff.html'), 'utf-8')
+  const htmlTemplate = readFileSync(new URL('template/diff.html', import.meta.url), 'utf-8')
   return _.template(htmlTemplate)({ left: JSON.stringify(oldState), delta: JSON.stringify(delta) })
 }
 

packages/chopsticks/tsconfig.json

@@ -2,10 +2,16 @@
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
 		"rootDir": "src",
-		"outDir": "dist/cjs",
 		"declarationDir": "dist/types"
 	},
 	"include": ["src/**/*"],
 	"exclude": ["src/**/*.test.ts"],
-	"references": [{ "path": "../core/tsconfig.json" }, { "path": "../db/tsconfig.json" }]
+	"references": [{ "path": "../core/tsconfig.json" }, { "path": "../db/tsconfig.json" }],
+	"ts-node": {
+		"esm": true,
+		"swc": true,
+		"transpileOnly": true,
+		"files": true,
+		"experimentalSpecifierResolution": "node"
+	}
 }

packages/chopsticks/typedoc.json

@@ -1,7 +1,7 @@
 {
 	"entryPoints": ["src/types.ts"],
 	"out": "../../docs-src/chopsticks",
-	"plugin": "typedoc-plugin-markdown",
+	"plugin": ["typedoc-plugin-markdown"],
 	"readme": "none",
-	"tsconfig": "tsconfig.esm.json"
+	"tsconfig": "tsconfig.json"
 }

packages/core/package.json

@@ -1,12 +1,15 @@
 {
 	"name": "@acala-network/chopsticks-core",
-	"version": "0.9.1-2",
+	"version": "0.9.1-3",
 	"author": "Acala Developers <[email protected]>",
 	"license": "Apache-2.0",
+	"type": "module",
 	"scripts": {
 		"clean": "rm -rf dist",
-		"build": "yarn clean && tsc -p ./tsconfig.json && tsc -p ./tsconfig.esm.json && echo '{\"type\": \"module\"}' > ./dist/esm/package.json && yarn copyfiles",
-		"copyfiles": "cp -r src/wasm-executor/*.mjs dist/cjs/wasm-executor/ && cp -r src/wasm-executor/*.mjs dist/esm/wasm-executor/",
+		"build": "yarn clean && yarn build:cjs && yarn build:esm && yarn build:types",
+		"build:cjs": "swc ./src --config-file ../../.cjsswcrc -d dist/cjs && echo '{\"type\": \"commonjs\"}' > dist/cjs/package.json",
+		"build:esm": "swc ./src --config-file ../../.esmswcrc -d dist/esm",
+		"build:types": "tsc -p tsconfig.json --emitDeclarationOnly --outDir dist/types",
 		"docs:prep": "typedoc"
 	},
 	"dependencies": {
@@ -21,6 +24,8 @@
 		"zod": "^3.22.3"
 	},
 	"devDependencies": {
+		"@swc/cli": "0.1.62",
+		"@swc/core": "^1.3.96",
 		"@types/lodash": "^4.14.199",
 		"typescript": "^5.1.6"
 	},
@@ -46,7 +51,7 @@
 			"default": "./dist/esm/index.js"
 		},
 		"./package.json": "./package.json",
-		"./package.esm.json": "./dist/esm/package.json"
+		"./package.cjs.json": "./dist/cjs/package.json"
 	},
 	"browser": {
 		"./dist/cjs/wasm-executor/node-worker.js": "./dist/cjs/wasm-executor/browser-worker.js",

packages/core/src/wasm-executor/browser-wasm-executor.mjs → packages/core/src/wasm-executor/browser-wasm-executor.js

@@ -2,29 +2,29 @@ import * as Comlink from 'comlink'
 import * as pkg from '@acala-network/chopsticks-executor'
 
 const getRuntimeVersion = async (code) => {
-	await pkg.wasmReady
-	return pkg.get_runtime_version(code)
+  await pkg.wasmReady
+  return pkg.get_runtime_version(code)
 }
 
 // trie_version: 0 for old trie, 1 for new trie
 const calculateStateRoot = async (entries, trie_version) => {
-	await pkg.wasmReady
-	return pkg.calculate_state_root(entries, trie_version)
+  await pkg.wasmReady
+  return pkg.calculate_state_root(entries, trie_version)
 }
 
 const decodeProof = async (trieRootHash, keys, nodes) => {
-	await pkg.wasmReady
-	return pkg.decode_proof(trieRootHash, keys, nodes)
+  await pkg.wasmReady
+  return pkg.decode_proof(trieRootHash, keys, nodes)
 }
 
 const createProof = async (nodes, entries) => {
-	await pkg.wasmReady
-	return pkg.create_proof(nodes, entries)
+  await pkg.wasmReady
+  return pkg.create_proof(nodes, entries)
 }
 
 const runTask = async (task, callback) => {
-	await pkg.wasmReady
-	return pkg.run_task(task, callback, 'info')
+  await pkg.wasmReady
+  return pkg.run_task(task, callback, 'info')
 }
 
 const wasmExecutor = { runTask, getRuntimeVersion, calculateStateRoot, createProof, decodeProof }

packages/core/src/wasm-executor/browser-worker.ts

@@ -1,9 +1,7 @@
 import { wrap } from 'comlink'
 
 export const startWorker = async <T>() => {
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
-  const worker = new Worker(new URL('browser-wasm-executor.mjs', import.meta.url), {
+  const worker = new Worker(new URL('browser-wasm-executor.js', import.meta.url), {
     type: 'module',
     name: 'chopsticks-wasm-executor',
   })