@sentio/cli 2.0.0-rc.1 → 2.0.0-rc.2

package/lib/key.js

@@ -1,36 +1,31 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReadKey = exports.WriteKey = void 0;
-const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
-const fs_1 = tslib_1.__importDefault(require("fs"));
-const os_1 = tslib_1.__importDefault(require("os"));
-const homeDir = os_1.default.homedir();
-const sentioDir = path_1.default.join(homeDir, '.sentio');
-const configFile = path_1.default.join(sentioDir, 'config.json');
-function WriteKey(host, api_key) {
-    const sentioDir = path_1.default.join(homeDir, '.sentio');
-    if (!fs_1.default.existsSync(sentioDir)) {
-        fs_1.default.mkdirSync(sentioDir, { recursive: true });
+import path from 'path';
+import fs from 'fs';
+import os from 'os';
+const homeDir = os.homedir();
+const sentioDir = path.join(homeDir, '.sentio');
+const configFile = path.join(sentioDir, 'config.json');
+export function WriteKey(host, api_key) {
+    const sentioDir = path.join(homeDir, '.sentio');
+    if (!fs.existsSync(sentioDir)) {
+        fs.mkdirSync(sentioDir, { recursive: true });
     }
     let config = {};
-    if (fs_1.default.existsSync(configFile)) {
-        const content = fs_1.default.readFileSync(configFile, 'utf8');
+    if (fs.existsSync(configFile)) {
+        const content = fs.readFileSync(configFile, 'utf8');
         config = JSON.parse(content);
     }
     const hostConfig = config[host] || { api_keys: {} };
     hostConfig.api_keys = api_key;
     config[host] = hostConfig;
-    fs_1.default.writeFileSync(configFile, JSON.stringify(config, null, 2));
+    fs.writeFileSync(configFile, JSON.stringify(config, null, 2));
 }
-exports.WriteKey = WriteKey;
-function ReadKey(host) {
-    if (!fs_1.default.existsSync(sentioDir)) {
+export function ReadKey(host) {
+    if (!fs.existsSync(sentioDir)) {
         return undefined;
     }
-    const configFile = path_1.default.join(sentioDir, 'config.json');
-    if (fs_1.default.existsSync(configFile)) {
-        const content = fs_1.default.readFileSync(configFile, 'utf8');
+    const configFile = path.join(sentioDir, 'config.json');
+    if (fs.existsSync(configFile)) {
+        const content = fs.readFileSync(configFile, 'utf8');
         const config = JSON.parse(content);
         return config[host]?.api_keys;
     }
@@ -38,5 +33,4 @@ function ReadKey(host) {
         return undefined;
     }
 }
-exports.ReadKey = ReadKey;
 //# sourceMappingURL=key.js.map

package/lib/key.js.map

@@ -1 +1 @@
-{"version":3,"file":"key.js","sourceRoot":"","sources":["../src/key.ts"],"names":[],"mappings":";;;;AAAA,wDAAuB;AACvB,oDAAmB;AACnB,oDAAmB;AAEnB,MAAM,OAAO,GAAG,YAAE,CAAC,OAAO,EAAE,CAAA;AAC5B,MAAM,SAAS,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;AAC/C,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;AAQtD,SAAgB,QAAQ,CAAC,IAAY,EAAE,OAAe;IACpD,MAAM,SAAS,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;IAC/C,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;QAC7B,YAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;KAC7C;IACD,IAAI,MAAM,GAAoB,EAAE,CAAA;IAChC,IAAI,YAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QAC7B,MAAM,OAAO,GAAG,YAAE,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;QACnD,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;KAC7B;IACD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAA;IACnD,UAAU,CAAC,QAAQ,GAAG,OAAO,CAAA;IAC7B,MAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAA;IACzB,YAAE,CAAC,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;AAC/D,CAAC;AAdD,4BAcC;AAED,SAAgB,OAAO,CAAC,IAAY;IAClC,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;QAC7B,OAAO,SAAS,CAAA;KACjB;IACD,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;IACtD,IAAI,YAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QAC7B,MAAM,OAAO,GAAG,YAAE,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;QACnD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAClC,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAA;KAC9B;SAAM;QACL,OAAO,SAAS,CAAA;KACjB;AACH,CAAC;AAZD,0BAYC","sourcesContent":["import path from 'path'\nimport fs from 'fs'\nimport os from 'os'\n\nconst homeDir = os.homedir()\nconst sentioDir = path.join(homeDir, '.sentio')\nconst configFile = path.join(sentioDir, 'config.json')\n\ninterface SentioKeyConfig {\n  [key: string]: {\n    api_keys: string\n  }\n}\n\nexport function WriteKey(host: string, api_key: string) {\n  const sentioDir = path.join(homeDir, '.sentio')\n  if (!fs.existsSync(sentioDir)) {\n    fs.mkdirSync(sentioDir, { recursive: true })\n  }\n  let config: SentioKeyConfig = {}\n  if (fs.existsSync(configFile)) {\n    const content = fs.readFileSync(configFile, 'utf8')\n    config = JSON.parse(content)\n  }\n  const hostConfig = config[host] || { api_keys: {} }\n  hostConfig.api_keys = api_key\n  config[host] = hostConfig\n  fs.writeFileSync(configFile, JSON.stringify(config, null, 2))\n}\n\nexport function ReadKey(host: string): string | undefined {\n  if (!fs.existsSync(sentioDir)) {\n    return undefined\n  }\n  const configFile = path.join(sentioDir, 'config.json')\n  if (fs.existsSync(configFile)) {\n    const content = fs.readFileSync(configFile, 'utf8')\n    const config = JSON.parse(content)\n    return config[host]?.api_keys\n  } else {\n    return undefined\n  }\n}\n"]}
+{"version":3,"file":"key.js","sourceRoot":"","sources":["../src/key.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,EAAE,CAAA;AAC5B,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;AAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;AAQtD,MAAM,UAAU,QAAQ,CAAC,IAAY,EAAE,OAAe;IACpD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;IAC/C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;QAC7B,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;KAC7C;IACD,IAAI,MAAM,GAAoB,EAAE,CAAA;IAChC,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QAC7B,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;QACnD,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;KAC7B;IACD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAA;IACnD,UAAU,CAAC,QAAQ,GAAG,OAAO,CAAA;IAC7B,MAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAA;IACzB,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;AAC/D,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,IAAY;IAClC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;QAC7B,OAAO,SAAS,CAAA;KACjB;IACD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;IACtD,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QAC7B,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;QACnD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAClC,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAA;KAC9B;SAAM;QACL,OAAO,SAAS,CAAA;KACjB;AACH,CAAC","sourcesContent":["import path from 'path'\nimport fs from 'fs'\nimport os from 'os'\n\nconst homeDir = os.homedir()\nconst sentioDir = path.join(homeDir, '.sentio')\nconst configFile = path.join(sentioDir, 'config.json')\n\ninterface SentioKeyConfig {\n  [key: string]: {\n    api_keys: string\n  }\n}\n\nexport function WriteKey(host: string, api_key: string) {\n  const sentioDir = path.join(homeDir, '.sentio')\n  if (!fs.existsSync(sentioDir)) {\n    fs.mkdirSync(sentioDir, { recursive: true })\n  }\n  let config: SentioKeyConfig = {}\n  if (fs.existsSync(configFile)) {\n    const content = fs.readFileSync(configFile, 'utf8')\n    config = JSON.parse(content)\n  }\n  const hostConfig = config[host] || { api_keys: {} }\n  hostConfig.api_keys = api_key\n  config[host] = hostConfig\n  fs.writeFileSync(configFile, JSON.stringify(config, null, 2))\n}\n\nexport function ReadKey(host: string): string | undefined {\n  if (!fs.existsSync(sentioDir)) {\n    return undefined\n  }\n  const configFile = path.join(sentioDir, 'config.json')\n  if (fs.existsSync(configFile)) {\n    const content = fs.readFileSync(configFile, 'utf8')\n    const config = JSON.parse(content)\n    return config[host]?.api_keys\n  } else {\n    return undefined\n  }\n}\n"]}

package/lib/utils.js

@@ -1,20 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSdkVersion = exports.getCliVersion = void 0;
-const tslib_1 = require("tslib");
-const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const path_1 = tslib_1.__importDefault(require("path"));
-function getCliVersion() {
-    const packageJsonPath = path_1.default.resolve(__dirname, '../package.json');
-    const packageJsonContent = fs_extra_1.default.readFileSync(packageJsonPath, 'utf-8');
+import fs from 'fs-extra';
+import path from 'path';
+export function getCliVersion() {
+    const packageJsonPath = path.resolve(__dirname, '../package.json');
+    const packageJsonContent = fs.readFileSync(packageJsonPath, 'utf-8');
     const packageJson = JSON.parse(packageJsonContent);
     return packageJson.version;
 }
-exports.getCliVersion = getCliVersion;
-function getSdkVersion() {
+export function getSdkVersion() {
     try {
         const packageJsonPath = require.resolve('@sentio/sdk/package.json');
-        const packageJsonContent = fs_extra_1.default.readFileSync(packageJsonPath, 'utf-8');
+        const packageJsonContent = fs.readFileSync(packageJsonPath, 'utf-8');
         const packageJson = JSON.parse(packageJsonContent);
         return packageJson.version;
     }
@@ -22,5 +17,4 @@ function getSdkVersion() {
         return undefined;
     }
 }
-exports.getSdkVersion = getSdkVersion;
 //# sourceMappingURL=utils.js.map

package/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;AAAA,gEAAyB;AACzB,wDAAuB;AAEvB,SAAgB,aAAa;IAC3B,MAAM,eAAe,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAA;IAClE,MAAM,kBAAkB,GAAG,kBAAE,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAA;IACpE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;IAElD,OAAO,WAAW,CAAC,OAAO,CAAA;AAC5B,CAAC;AAND,sCAMC;AAED,SAAgB,aAAa;IAC3B,IAAI;QACF,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAA;QACnE,MAAM,kBAAkB,GAAG,kBAAE,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAA;QACpE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;QAClD,OAAO,WAAW,CAAC,OAAO,CAAA;KAC3B;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,SAAS,CAAA;KACjB;AACH,CAAC;AATD,sCASC","sourcesContent":["import fs from 'fs-extra'\nimport path from 'path'\n\nexport function getCliVersion() {\n  const packageJsonPath = path.resolve(__dirname, '../package.json')\n  const packageJsonContent = fs.readFileSync(packageJsonPath, 'utf-8')\n  const packageJson = JSON.parse(packageJsonContent)\n\n  return packageJson.version\n}\n\nexport function getSdkVersion() {\n  try {\n    const packageJsonPath = require.resolve('@sentio/sdk/package.json')\n    const packageJsonContent = fs.readFileSync(packageJsonPath, 'utf-8')\n    const packageJson = JSON.parse(packageJsonContent)\n    return packageJson.version\n  } catch (e) {\n    return undefined\n  }\n}\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,UAAU,CAAA;AACzB,OAAO,IAAI,MAAM,MAAM,CAAA;AAEvB,MAAM,UAAU,aAAa;IAC3B,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAA;IAClE,MAAM,kBAAkB,GAAG,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAA;IACpE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;IAElD,OAAO,WAAW,CAAC,OAAO,CAAA;AAC5B,CAAC;AAED,MAAM,UAAU,aAAa;IAC3B,IAAI;QACF,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAA;QACnE,MAAM,kBAAkB,GAAG,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAA;QACpE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;QAClD,OAAO,WAAW,CAAC,OAAO,CAAA;KAC3B;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,SAAS,CAAA;KACjB;AACH,CAAC","sourcesContent":["import fs from 'fs-extra'\nimport path from 'path'\n\nexport function getCliVersion() {\n  const packageJsonPath = path.resolve(__dirname, '../package.json')\n  const packageJsonContent = fs.readFileSync(packageJsonPath, 'utf-8')\n  const packageJson = JSON.parse(packageJsonContent)\n\n  return packageJson.version\n}\n\nexport function getSdkVersion() {\n  try {\n    const packageJsonPath = require.resolve('@sentio/sdk/package.json')\n    const packageJsonContent = fs.readFileSync(packageJsonPath, 'utf-8')\n    const packageJson = JSON.parse(packageJsonContent)\n    return packageJson.version\n  } catch (e) {\n    return undefined\n  }\n}\n"]}

package/package.json

@@ -2,12 +2,13 @@
   "name": "@sentio/cli",
   "license": "Apache-2.0",
   "private": false,
-  "version": "2.0.0-rc.1",
+  "type": "module",
+  "version": "2.0.0-rc.2",
   "scripts": {
-    "compile": "tsc -p . && cp src/webpack.config.js lib/",
+    "compile": "tsc -p .",
     "build": "yarn compile",
     "postbuild": "../../scripts/link-bin.sh",
-    "cli": "ts-node src/cli.ts",
+    "cli": "ts-node-esm src/cli.ts",
     "test": "jest",
     "pub": "yarn build && yarn publish --no-git-tag-version"
   },
@@ -18,13 +19,11 @@
     "form-data": "^4.0.0",
     "fs-extra": "^11.0.0",
     "js-yaml": "^4.1.0",
-    "latest-version": "^5.1.0",
-    "node-fetch": "2",
+    "latest-version": "^7.0.0",
+    "node-fetch": "^3.3.0",
     "open": "^8.4.0",
-    "ts-loader": "^9.3.0",
-    "webpack": "^5.72.1",
-    "webpack-cli": "^5.0.0",
-    "chalk": "^4.1.0"
+    "tsup": "^6.5.0",
+    "chalk": "^5.2.0"
   },
   "devDependencies": {
     "@types/command-line-args": "^5.2.0",

package/src/build.ts

@@ -2,6 +2,20 @@ import chalk from 'chalk'
 import path from 'path'
 import fs from 'fs'
 import { exec } from 'child_process'
+import * as process from 'process'
+import { createRequire } from 'module'
+const require = createRequire(import.meta.url)
+
+function getPackageRoot(pkgId: string): string {
+  const m = require.resolve(pkgId)
+
+  let dir = path.dirname(m)
+  while (!fs.existsSync(path.join(dir, 'package.json'))) {
+    dir = path.dirname(dir)
+  }
+
+  return dir
+}
 
 export async function buildProcessor(onlyGen: boolean) {
   if (!onlyGen) {
@@ -16,13 +30,13 @@ export async function buildProcessor(onlyGen: boolean) {
   if (!onlyGen) {
     let WEBPACK_CONFIG: string
     try {
-      WEBPACK_CONFIG = require.resolve('@sentio/sdk/lib/webpack.config.js')
+      WEBPACK_CONFIG = path.resolve(getPackageRoot('@sentio/sdk'), 'lib/tsup.config.ts')
     } catch (e) {
-      // In the future this should not need unless using very old sdk
-      WEBPACK_CONFIG = path.join(__dirname, 'webpack.config.js')
+      console.error(chalk.red("Wrong CLI version for sdk, can't find tsup.config.ts"))
+      process.exit(1)
     }
     await execStep('yarn tsc -p .', 'Compile')
-    await execStep('yarn webpack --config=' + WEBPACK_CONFIG, 'Packaging')
+    await execStep('yarn tsup --config=' + WEBPACK_CONFIG, 'Packaging')
   }
 }
 
@@ -30,15 +44,15 @@ async function buildProcessorForTarget(onlyGen: boolean) {
   await codeGenEthersProcessor(path.join('abis', 'evm'))
 
   try {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const solanaModule = require('@sentio/sdk-solana/lib/codegen/codegen')
-    solanaModule.codeGenSolanaProcessor(path.join('abis', 'solana'))
+    // @ts-ignore dynamic import
+    const codegen = await import('@sentio/sdk-solana/codegen')
+    codegen.codeGenSolanaProcessor(path.join('abis', 'solana'))
   } catch (e) {}
 
   try {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const aptosModuole = require('@sentio/sdk-aptos/lib/codegen/codegen')
-    aptosModuole.codeGenAptosProcessor(path.join('abis', 'aptos'))
+    // @ts-ignore dynamic import
+    const codegen = await import('@sentio/sdk-aptos/codegen')
+    codegen.codeGenAptosProcessor(path.join('abis', 'aptos'))
   } catch (e) {}
 
   if (onlyGen) {
@@ -52,7 +66,7 @@ async function installDeps() {
 
 export async function codeGenEthersProcessor(
   abisDir: string,
-  ETHERS_TARGET = path.dirname(require.resolve('@sentio/sdk/lib/target-ethers-sentio')),
+  ETHERS_TARGET = path.resolve(getPackageRoot('@sentio/sdk'), 'lib/target-ethers-sentio/index.cjs'),
   outDir = 'src/types/internal'
 ) {
   if (!fs.existsSync(abisDir)) {

package/src/cli.ts

@@ -6,13 +6,13 @@ import fs from 'fs'
 import path from 'path'
 
 import yaml from 'js-yaml'
-import { SentioProjectConfig } from './config'
+import { SentioProjectConfig } from './config.js'
 import chalk from 'chalk'
-import { buildProcessor } from './build'
-import { runCreate } from './commands/run-create'
-import { runVersion } from './commands/run-version'
-import { runLogin } from './commands/run-login'
-import { runUpload } from './commands/run-upload'
+import { buildProcessor } from './build.js'
+import { runCreate } from './commands/run-create.js'
+import { runVersion } from './commands/run-version.js'
+import { runLogin } from './commands/run-login.js'
+import { runUpload } from './commands/run-upload.js'
 
 const mainDefinitions = [{ name: 'command', defaultOption: true }]
 const mainOptions = commandLineArgs(mainDefinitions, {

package/src/commands/login-server.ts

@@ -1,9 +1,9 @@
 import express from 'express'
-import { getAuthConfig, getFinalizedHost } from '../config'
+import { getAuthConfig, getFinalizedHost } from '../config.js'
 import url, { URL } from 'url'
 import fetch from 'node-fetch'
-import { getCliVersion } from '../utils'
-import { WriteKey } from '../key'
+import { getCliVersion } from '../utils.js'
+import { WriteKey } from '../key.js'
 import chalk from 'chalk'
 import http from 'http'
 import os from 'os'
@@ -26,7 +26,7 @@ export function startServer(params: AuthParams) {
 }
 
 app.get('/callback', async (req, res) => {
-  const fail = function(...args: any[]) {
+  const fail = function (...args: any[]) {
     console.error(chalk.red(args))
     res.end(args.toString())
     server.close()
@@ -45,8 +45,8 @@ app.get('/callback', async (req, res) => {
     fail(`Failed to get access token: ${tokenResRaw.status} ${tokenResRaw.statusText}`)
     return
   }
-  const tokenRes = await tokenResRaw.json()
-  const accessToken = tokenRes['access_token']
+  const tokenRes = (await tokenResRaw.json()) as { access_token: string }
+  const accessToken = tokenRes.access_token
 
   // check if the account is ready
   const userResRaw = await getUser(host, accessToken)
@@ -58,7 +58,7 @@ app.get('/callback', async (req, res) => {
     }
     return
   }
-  const userRes = await userResRaw.json()
+  const userRes = (await userResRaw.json()) as { emailVerified: boolean }
   if (!userRes.emailVerified) {
     fail('Your account is not verified, please verify your email first')
     return
@@ -71,11 +71,11 @@ app.get('/callback', async (req, res) => {
     fail(`Failed to create API key: ${createApiKeyResRaw.status} ${createApiKeyResRaw.statusText}`)
     return
   }
-  const createApiKeyRes = await createApiKeyResRaw.json()
-  const apiKey = createApiKeyRes['key']
+  const createApiKeyRes = (await createApiKeyResRaw.json()) as { key: string }
+  const apiKey = createApiKeyRes.key
   WriteKey(host, apiKey)
 
-  res.end("Login success, please go back to CLI to continue")
+  res.end('Login success, please go back to CLI to continue')
   console.log(chalk.green('Login success, new API key: ' + apiKey))
 
   server.close()
@@ -101,7 +101,7 @@ async function getToken(host: string, code: string) {
 
 async function createApiKey(host: string, name: string, source: string, accessToken: string) {
   const createApiKeyUrl = new URL('/api/v1/keys', host)
-  return fetch(createApiKeyUrl, {
+  return fetch(createApiKeyUrl.href, {
     method: 'POST',
     headers: {
       Authorization: 'Bearer ' + accessToken,
@@ -117,7 +117,7 @@ async function createApiKey(host: string, name: string, source: string, accessTo
 
 async function getUser(host: string, accessToken: string) {
   const getUserUrl = new URL('/api/v1/users', host)
-  return fetch(getUserUrl, {
+  return fetch(getUserUrl.href, {
     method: 'GET',
     headers: {
       Authorization: 'Bearer ' + accessToken,

package/src/commands/run-login.ts

@@ -1,11 +1,11 @@
 import commandLineArgs from 'command-line-args'
 import commandLineUsage from 'command-line-usage'
-import { getAuthConfig, getFinalizedHost } from '../config'
-import { startServer } from './login-server'
+import { getAuthConfig, getFinalizedHost } from '../config.js'
+import { startServer } from './login-server.js'
 import url, { URL } from 'url'
 import * as crypto from 'crypto'
 import chalk from 'chalk'
-import { WriteKey } from '../key'
+import { WriteKey } from '../key.js'
 import fetch from 'node-fetch'
 import open from 'open'
 
@@ -102,7 +102,7 @@ function sha256(str: string) {
 
 async function checkKey(host: string, apiKey: string) {
   const checkApiKeyUrl = new URL('/api/v1/processors/check_key', host)
-  return fetch(checkApiKeyUrl, {
+  return fetch(checkApiKeyUrl.href, {
     method: 'GET',
     headers: {
       'api-key': apiKey,

package/src/commands/run-upload.ts

@@ -1,16 +1,16 @@
 import commandLineArgs from 'command-line-args'
 import commandLineUsage from 'command-line-usage'
-import { finalizeHost, FinalizeProjectName, SentioProjectConfig } from '../config'
+import { finalizeHost, FinalizeProjectName, SentioProjectConfig } from '../config.js'
 import { URL } from 'url'
 import fetch from 'node-fetch'
-import { buildProcessor } from '../build'
+import { buildProcessor } from '../build.js'
 import chalk from 'chalk'
 import path from 'path'
-import { ReadKey } from '../key'
+import { ReadKey } from '../key.js'
 import fs from 'fs'
 import { createHash } from 'crypto'
 import { execSync } from 'child_process'
-import { getSdkVersion } from '../utils'
+import { getSdkVersion } from '../utils.js'
 import readline from 'readline'
 
 export async function runUpload(processorConfig: SentioProjectConfig, argv: string[]) {
@@ -85,7 +85,7 @@ export async function runUpload(processorConfig: SentioProjectConfig, argv: stri
 async function createProject(options: SentioProjectConfig, apiKey: string) {
   const url = new URL('/api/v1/projects', options.host)
   const [ownerName, slug] = options.project.includes('/') ? options.project.split('/') : [undefined, options.project]
-  return fetch(url, {
+  return fetch(url.href, {
     method: 'POST',
     headers: {
       'api-key': apiKey,
@@ -144,8 +144,8 @@ export async function uploadFile(options: SentioProjectConfig, apiKeyOverride: s
     // get gcs upload url
     const initUploadResRaw = await initUpload(options.host, apiKey, options.project, getSdkVersion())
     if (!initUploadResRaw.ok) {
-      console.error(chalk.red('Failed to get upload url'))
-      console.error(chalk.red((await initUploadResRaw.json()).message))
+      // console.error(chalk.red('Failed to get upload url'))
+      console.error(chalk.red(((await initUploadResRaw.json()) as { message: string }).message))
 
       if (initUploadResRaw.status === 404) {
         // create project if not exist
@@ -162,7 +162,7 @@ export async function uploadFile(options: SentioProjectConfig, apiKeyOverride: s
             const res = await createProject(options, apiKey)
             if (!res.ok) {
               console.error(chalk.red('Create Project Failed'))
-              console.error(chalk.red((await res.json()).message))
+              console.error(chalk.red(((await res.json()) as { message: string }).message))
               return
             }
             console.log(chalk.green('Project created'))
@@ -177,8 +177,8 @@ export async function uploadFile(options: SentioProjectConfig, apiKeyOverride: s
       }
       return
     }
-    const initUploadRes = await initUploadResRaw.json()
-    const uploadUrl = initUploadRes['url'] as string
+    const initUploadRes = (await initUploadResRaw.json()) as { url: string }
+    const uploadUrl = initUploadRes.url
 
     // do actual uploading
     const file = fs.createReadStream(PROCESSOR_FILE)
@@ -217,7 +217,10 @@ export async function uploadFile(options: SentioProjectConfig, apiKeyOverride: s
     if (commitSha) {
       console.log('\t', chalk.blue('Git commit SHA:'), commitSha)
     }
-    const { projectFullSlug, version } = await finishUploadResRaw.json()
+    const { projectFullSlug, version } = (await finishUploadResRaw.json()) as {
+      projectFullSlug: string
+      version: string
+    }
     console.log('\t', chalk.blue('Check status:'), `${options.host}/${projectFullSlug}/datasource`)
     console.log('\t', chalk.blue('Version:'), version)
   }
@@ -246,7 +249,7 @@ export async function uploadFile(options: SentioProjectConfig, apiKeyOverride: s
 
 async function initUpload(host: string, apiKey: string, projectSlug: string, sdkVersion: string) {
   const initUploadUrl = new URL(`/api/v1/processors/init_upload`, host)
-  return fetch(initUploadUrl, {
+  return fetch(initUploadUrl.href, {
     method: 'POST',
     headers: {
       'api-key': apiKey,
@@ -269,7 +272,7 @@ async function finishUpload(
   debug: boolean
 ) {
   const finishUploadUrl = new URL(`/api/v1/processors/finish_upload`, host)
-  return fetch(finishUploadUrl, {
+  return fetch(finishUploadUrl.href, {
     method: 'POST',
     headers: {
       'api-key': apiKey,

package/src/commands/run-version.ts

@@ -1,6 +1,6 @@
 import commandLineArgs from 'command-line-args'
 import commandLineUsage from 'command-line-usage'
-import { getCliVersion, getSdkVersion } from '../utils'
+import { getCliVersion, getSdkVersion } from '../utils.js'
 import * as console from 'console'
 
 export function runVersion(argv: string[]) {

package/templates/aptos/jest.config.ts

@@ -0,0 +1,8 @@
+/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
+export default {
+  preset: 'ts-jest/presets/default-esm',
+  modulePathIgnorePatterns: ['<rootDir>/dist/'],
+  moduleNameMapper: {
+    '^(\\.{1,2}/.*)\\.js$': '$1',
+  },
+}

package/templates/aptos/package.json

@@ -2,6 +2,7 @@
   "name": "template-aptos",
   "private": true,
   "version": "1.0.0",
+  "type": "module",
   "scripts": {
     "test": "jest",
     "gen": "sentio gen",

package/templates/aptos/src/processor.ts

@@ -1,13 +1,13 @@
-import { SouffleChefCampaign, CandyMachine } from './types/aptos/souffle'
+import { SouffleChefCampaign, CandyMachine } from './types/aptos/souffle.js'
 
 SouffleChefCampaign.bind()
   .onEntryPullTokenV2((call, ctx) => {
-    ctx.meter.Counter('pulled').add(call.arguments_typed[3])
+    ctx.meter.Counter('pulled').add(call.arguments_decoded[3])
   })
   .onEventBurnEnjoyEvent((evt, ctx) => {
     ctx.meter.Counter('burned').add(1)
   })
 
 CandyMachine.bind().onEntryPullToken((call, ctx) => {
-  ctx.meter.Counter('pulled').add(call.arguments_typed[2], { coin: call.type_arguments[0] })
+  ctx.meter.Counter('pulled').add(call.arguments_decoded[2], { coin: call.type_arguments[0] })
 })

package/templates/aptos/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "importHelpers": true,
     "alwaysStrict": true,
     "sourceMap": true,
     "target": "esnext",
@@ -7,7 +8,7 @@
     "noImplicitReturns": true,
     "noImplicitAny": true,
     "module": "esnext",
-    "moduleResolution": "node16",
+    "moduleResolution": "nodenext",
     "strictNullChecks": true,
     "stripInternal": true,
     "noFallthroughCasesInSwitch": true,
@@ -16,5 +17,5 @@
     "rootDir": "./src",
     "skipLibCheck": true
   },
-  "exclude": ["dist"]
+  "exclude": ["dist", "jest.config.ts"]
 }

package/templates/evm/jest.config.ts

@@ -0,0 +1,8 @@
+/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
+export default {
+  preset: 'ts-jest/presets/default-esm',
+  modulePathIgnorePatterns: ['<rootDir>/dist/'],
+  moduleNameMapper: {
+    '^(\\.{1,2}/.*)\\.js$': '$1',
+  },
+}

package/templates/evm/package.json

@@ -2,6 +2,7 @@
   "name": "template-evm",
   "private": true,
   "version": "1.0.0",
+  "type": "module",
   "scripts": {
     "test": "jest",
     "gen": "sentio gen",

package/templates/evm/src/processor.ts

@@ -1,7 +1,7 @@
 import { Counter, Gauge } from '@sentio/sdk'
-import { token } from '@sentio/sdk/lib/utils'
-import { ERC20Processor } from '@sentio/sdk/lib/builtin/erc20'
-import { X2y2Processor } from './types/x2y2'
+import { token } from '@sentio/sdk/utils'
+import { ERC20Processor } from '@sentio/sdk/builtin'
+import { X2y2Processor } from './types/x2y2/index.js'
 
 const rewardPerBlock = Gauge.register('reward_per_block', {
   description: 'rewards for each block grouped by phase',

package/templates/evm/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "importHelpers": true,
     "alwaysStrict": true,
     "sourceMap": true,
     "target": "esnext",
@@ -7,7 +8,7 @@
     "noImplicitReturns": true,
     "noImplicitAny": true,
     "module": "esnext",
-    "moduleResolution": "node16",
+    "moduleResolution": "nodenext",
     "strictNullChecks": true,
     "stripInternal": true,
     "noFallthroughCasesInSwitch": true,
@@ -16,5 +17,5 @@
     "rootDir": "./src",
     "skipLibCheck": true
   },
-  "exclude": ["dist"]
+  "exclude": ["dist", "jest.config.ts"]
 }

package/templates/raw/jest.config.ts

@@ -0,0 +1,8 @@
+/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
+export default {
+  preset: 'ts-jest/presets/default-esm',
+  modulePathIgnorePatterns: ['<rootDir>/dist/'],
+  moduleNameMapper: {
+    '^(\\.{1,2}/.*)\\.js$': '$1',
+  },
+}

package/templates/raw/package.json

@@ -2,6 +2,7 @@
   "name": "template-raw",
   "private": true,
   "version": "1.0.0",
+  "type": "module",
   "scripts": {
     "test": "jest",
     "gen": "sentio gen",

package/templates/raw/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "importHelpers": true,
     "alwaysStrict": true,
     "sourceMap": true,
     "target": "esnext",
@@ -7,7 +8,7 @@
     "noImplicitReturns": true,
     "noImplicitAny": true,
     "module": "esnext",
-    "moduleResolution": "node16",
+    "moduleResolution": "nodenext",
     "strictNullChecks": true,
     "stripInternal": true,
     "noFallthroughCasesInSwitch": true,
@@ -16,5 +17,5 @@
     "rootDir": "./src",
     "skipLibCheck": true
   },
-  "exclude": ["dist"]
+  "exclude": ["dist", "jest.config.ts"]
 }

package/templates/solana/jest.config.ts

@@ -0,0 +1,8 @@
+/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
+export default {
+  preset: 'ts-jest/presets/default-esm',
+  modulePathIgnorePatterns: ['<rootDir>/dist/'],
+  moduleNameMapper: {
+    '^(\\.{1,2}/.*)\\.js$': '$1',
+  },
+}

package/templates/solana/package.json

@@ -2,6 +2,7 @@
   "name": "template-solana",
   "private": true,
   "version": "1.0.0",
+  "type": "module",
   "scripts": {
     "test": "jest",
     "gen": "sentio gen",

package/templates/solana/src/processor.ts

@@ -1,4 +1,4 @@
-import { SPLTokenProcessor } from '@sentio/sdk-solana/lib/builtin'
+import { SPLTokenProcessor } from '@sentio/sdk-solana/builtin'
 
 SPLTokenProcessor.bind({
   address: 'wormDTUJ6AWPNvk59vGQbDvGJmqbDTdgWgAqcLBCgUb',