@sentio/cli 2.7.3 → 2.7.4-rc.1

package/lib/commands/build.js

@@ -98,6 +98,8 @@ export async function buildProcessor(onlyGen, options) {
             console.error(chalk.red("Wrong CLI version for sdk, can't find tsup.config.ts"));
             process.exit(1);
         }
+        const tsc = path.resolve(getPackageRoot('typescript'), 'bin', 'tsc');
+        await execStep(['node', tsc, '--noEmit'], 'type checking');
         const tsup = path.resolve(getPackageRoot('tsup'), 'dist', 'cli-default.js');
         // await execStep('yarn tsc -p .', 'Compile')
         await execStep(['node', tsup, '--config', tsupConfig], 'Packaging');

package/lib/commands/build.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"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","sourcesContent":["import chalk from 'chalk'\nimport path from 'path'\nimport fs from 'fs-extra'\nimport * as process from 'process'\nimport { getPackageRoot } from '../utils.js'\nimport commandLineArgs from 'command-line-args'\nimport commandLineUsage from 'command-line-usage'\nimport yaml from 'yaml'\nimport { YamlProjectConfig } from '../config.js'\nimport { getABIFilePath, getABI, writeABIFile } from '../abi.js'\nimport { execStep, execYarn } from '../execution.js'\nimport { createRequire } from 'module'\n\nconst require = createRequire(import.meta.url)\n\nexport const buildOptionDefinitions = [\n  {\n    name: 'help',\n    alias: 'h',\n    type: Boolean,\n    description: 'Display this usage guide.',\n  },\n  {\n    name: 'skip-gen',\n    type: Boolean,\n    description: 'Skip code generation.',\n  },\n  {\n    name: 'skip-deps',\n    type: Boolean,\n    description: 'Skip dependency enforce.',\n  },\n  {\n    name: 'example',\n    type: Boolean,\n    description: 'Generate example usage of the processor.',\n  },\n]\n\nexport const GenOptionDefinitions = [\n  {\n    name: 'help',\n    alias: 'h',\n    type: Boolean,\n    description: 'Display this usage guide.',\n  },\n  {\n    name: 'example',\n    type: Boolean,\n    description: 'Generate example usage of the processor.',\n  },\n]\n\nexport async function buildProcessorWithArgs(argv: string[]) {\n  const options = commandLineArgs(buildOptionDefinitions, { argv, partial: true })\n  const usage = commandLineUsage([\n    {\n      header: 'Build project',\n      content: 'sentio build',\n    },\n    {\n      header: 'Options',\n      optionList: buildOptionDefinitions,\n    },\n  ])\n\n  if (options.help) {\n    console.log(usage)\n    process.exit(0)\n  }\n  await buildProcessor(false, options)\n}\n\nexport async function generate(argv: string[]) {\n  const options = commandLineArgs(GenOptionDefinitions, { argv, partial: true })\n  const usage = commandLineUsage([\n    {\n      header: 'Generate type binding',\n      content: 'sentio gen [--example]',\n    },\n    {\n      header: 'Options',\n      optionList: GenOptionDefinitions,\n    },\n  ])\n\n  if (options.help) {\n    console.log(usage)\n    process.exit(0)\n  }\n  await buildProcessor(true, options)\n}\n\nexport async function buildProcessor(onlyGen: boolean, options: commandLineArgs.CommandLineOptions) {\n  if (!options['skip-deps'] && !onlyGen) {\n    await installDeps()\n  }\n\n  if (!options['skip-gen']) {\n    await codegen(options.example || false)\n  }\n\n  if (!onlyGen) {\n    let tsupConfig: string\n    try {\n      tsupConfig = path.resolve(getPackageRoot('@sentio/sdk'), 'lib', 'tsup.config.ts')\n    } catch (e) {\n      console.error(chalk.red(\"Wrong CLI version for sdk, can't find tsup.config.ts\"))\n      process.exit(1)\n    }\n\n    const tsup = path.resolve(getPackageRoot('tsup'), 'dist', 'cli-default.js')\n    // await execStep('yarn tsc -p .', 'Compile')\n    await execStep(['node', tsup, '--config', tsupConfig], 'Packaging')\n\n    const dir = fs.readdirSync(path.join(process.cwd(), 'dist'))\n    const generated = dir.filter((d) => d.endsWith('.js')).length\n    if (generated < 0) {\n      console.error(chalk.red('No filed generated, please check if your processor.ts file'))\n      process.exit(1)\n    }\n    if (generated > 1) {\n      console.error(\n        chalk.red('Packing failed: '),\n        `Multiple entry point is not allowed. If your processor.ts have multiple file imported, please change:\nimport('mine.js')\nto\nimport 'mine.js'\n`\n      )\n    }\n  }\n}\n\nexport async function codegen(genExample: boolean) {\n  const processorConfig = yaml.parse(fs.readFileSync('sentio.yaml', 'utf8')) as YamlProjectConfig\n  const contractsForUsage = processorConfig.contracts || []\n  let previousChain = ''\n  for (const contract of contractsForUsage) {\n    const outputPath = getABIFilePath(contract.chain, contract.name || contract.address)\n    if (fs.existsSync(outputPath)) {\n      continue\n    }\n    console.log('Download Missing ABI specified in sentio.yaml')\n    if (contract.chain === previousChain) {\n      await new Promise((resolve) => setTimeout(resolve, 5000))\n    } else {\n      previousChain = contract.chain\n    }\n    const res = await getABI(contract.chain, contract.address, contract.name)\n    writeABIFile(res.abi, outputPath)\n  }\n\n  const outputBase = path.resolve('src', 'types')\n\n  try {\n    // @ts-ignore dynamic import\n    const codegen = await import('@sentio/sdk/eth/codegen')\n    let input = path.resolve('abis', 'eth')\n    let output = path.resolve(outputBase, 'eth')\n    if (!fs.existsSync(input)) {\n      input = path.resolve('abis', 'evm')\n      output = path.resolve(outputBase, 'eth')\n    }\n    fs.emptyDirSync(output)\n    // @ts-ignore dynamic import\n    await codegen.codegen(input, output, genExample ? contractsForUsage : [])\n  } catch (e) {\n    console.error('code gen error', e)\n  }\n\n  try {\n    // @ts-ignore dynamic import\n    const codegen = await import('@sentio/sdk/solana/codegen')\n\n    const output = path.resolve(outputBase, 'solana')\n    fs.emptyDirSync(output)\n\n    // @ts-ignore dynamic import\n    await codegen.codegen(path.resolve('abis', 'solana'), output, genExample)\n  } catch (e) {\n    console.error('code gen error', e)\n  }\n\n  try {\n    // @ts-ignore dynamic import\n    const codegen = await import('@sentio/sdk/aptos/codegen')\n\n    const output = path.resolve(outputBase, 'aptos')\n    fs.emptyDirSync(output)\n\n    // @ts-ignore dynamic import\n    await codegen.codegen(path.resolve('abis', 'aptos'), output, genExample)\n  } catch (e) {\n    console.error('code gen error', e)\n  }\n\n  try {\n    // @ts-ignore dynamic import\n    const codegen = await import('@sentio/sdk/sui/codegen')\n\n    const output = path.resolve(outputBase, 'sui')\n    fs.emptyDirSync(output)\n\n    // @ts-ignore dynamic import\n    await codegen.codegen(path.resolve('abis', 'sui'), output, genExample)\n  } catch (e) {\n    console.error('code gen error', e)\n  }\n}\n\nasync function installDeps() {\n  await execYarn(['install', '--ignore-scripts'], 'Yarn Install')\n}\n"]}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"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","sourcesContent":["import chalk from 'chalk'\nimport path from 'path'\nimport fs from 'fs-extra'\nimport * as process from 'process'\nimport { getPackageRoot } from '../utils.js'\nimport commandLineArgs from 'command-line-args'\nimport commandLineUsage from 'command-line-usage'\nimport yaml from 'yaml'\nimport { YamlProjectConfig } from '../config.js'\nimport { getABIFilePath, getABI, writeABIFile } from '../abi.js'\nimport { execStep, execYarn } from '../execution.js'\nimport { createRequire } from 'module'\n\nconst require = createRequire(import.meta.url)\n\nexport const buildOptionDefinitions = [\n  {\n    name: 'help',\n    alias: 'h',\n    type: Boolean,\n    description: 'Display this usage guide.',\n  },\n  {\n    name: 'skip-gen',\n    type: Boolean,\n    description: 'Skip code generation.',\n  },\n  {\n    name: 'skip-deps',\n    type: Boolean,\n    description: 'Skip dependency enforce.',\n  },\n  {\n    name: 'example',\n    type: Boolean,\n    description: 'Generate example usage of the processor.',\n  },\n]\n\nexport const GenOptionDefinitions = [\n  {\n    name: 'help',\n    alias: 'h',\n    type: Boolean,\n    description: 'Display this usage guide.',\n  },\n  {\n    name: 'example',\n    type: Boolean,\n    description: 'Generate example usage of the processor.',\n  },\n]\n\nexport async function buildProcessorWithArgs(argv: string[]) {\n  const options = commandLineArgs(buildOptionDefinitions, { argv, partial: true })\n  const usage = commandLineUsage([\n    {\n      header: 'Build project',\n      content: 'sentio build',\n    },\n    {\n      header: 'Options',\n      optionList: buildOptionDefinitions,\n    },\n  ])\n\n  if (options.help) {\n    console.log(usage)\n    process.exit(0)\n  }\n  await buildProcessor(false, options)\n}\n\nexport async function generate(argv: string[]) {\n  const options = commandLineArgs(GenOptionDefinitions, { argv, partial: true })\n  const usage = commandLineUsage([\n    {\n      header: 'Generate type binding',\n      content: 'sentio gen [--example]',\n    },\n    {\n      header: 'Options',\n      optionList: GenOptionDefinitions,\n    },\n  ])\n\n  if (options.help) {\n    console.log(usage)\n    process.exit(0)\n  }\n  await buildProcessor(true, options)\n}\n\nexport async function buildProcessor(onlyGen: boolean, options: commandLineArgs.CommandLineOptions) {\n  if (!options['skip-deps'] && !onlyGen) {\n    await installDeps()\n  }\n\n  if (!options['skip-gen']) {\n    await codegen(options.example || false)\n  }\n\n  if (!onlyGen) {\n    let tsupConfig: string\n    try {\n      tsupConfig = path.resolve(getPackageRoot('@sentio/sdk'), 'lib', 'tsup.config.ts')\n    } catch (e) {\n      console.error(chalk.red(\"Wrong CLI version for sdk, can't find tsup.config.ts\"))\n      process.exit(1)\n    }\n\n    const tsc = path.resolve(getPackageRoot('typescript'), 'bin', 'tsc')\n    await execStep(['node', tsc, '--noEmit'], 'type checking')\n\n    const tsup = path.resolve(getPackageRoot('tsup'), 'dist', 'cli-default.js')\n    // await execStep('yarn tsc -p .', 'Compile')\n    await execStep(['node', tsup, '--config', tsupConfig], 'Packaging')\n\n    const dir = fs.readdirSync(path.join(process.cwd(), 'dist'))\n    const generated = dir.filter((d) => d.endsWith('.js')).length\n    if (generated < 0) {\n      console.error(chalk.red('No filed generated, please check if your processor.ts file'))\n      process.exit(1)\n    }\n    if (generated > 1) {\n      console.error(\n        chalk.red('Packing failed: '),\n        `Multiple entry point is not allowed. If your processor.ts have multiple file imported, please change:\nimport('mine.js')\nto\nimport 'mine.js'\n`\n      )\n    }\n  }\n}\n\nexport async function codegen(genExample: boolean) {\n  const processorConfig = yaml.parse(fs.readFileSync('sentio.yaml', 'utf8')) as YamlProjectConfig\n  const contractsForUsage = processorConfig.contracts || []\n  let previousChain = ''\n  for (const contract of contractsForUsage) {\n    const outputPath = getABIFilePath(contract.chain, contract.name || contract.address)\n    if (fs.existsSync(outputPath)) {\n      continue\n    }\n    console.log('Download Missing ABI specified in sentio.yaml')\n    if (contract.chain === previousChain) {\n      await new Promise((resolve) => setTimeout(resolve, 5000))\n    } else {\n      previousChain = contract.chain\n    }\n    const res = await getABI(contract.chain, contract.address, contract.name)\n    writeABIFile(res.abi, outputPath)\n  }\n\n  const outputBase = path.resolve('src', 'types')\n\n  try {\n    // @ts-ignore dynamic import\n    const codegen = await import('@sentio/sdk/eth/codegen')\n    let input = path.resolve('abis', 'eth')\n    let output = path.resolve(outputBase, 'eth')\n    if (!fs.existsSync(input)) {\n      input = path.resolve('abis', 'evm')\n      output = path.resolve(outputBase, 'eth')\n    }\n    fs.emptyDirSync(output)\n    // @ts-ignore dynamic import\n    await codegen.codegen(input, output, genExample ? contractsForUsage : [])\n  } catch (e) {\n    console.error('code gen error', e)\n  }\n\n  try {\n    // @ts-ignore dynamic import\n    const codegen = await import('@sentio/sdk/solana/codegen')\n\n    const output = path.resolve(outputBase, 'solana')\n    fs.emptyDirSync(output)\n\n    // @ts-ignore dynamic import\n    await codegen.codegen(path.resolve('abis', 'solana'), output, genExample)\n  } catch (e) {\n    console.error('code gen error', e)\n  }\n\n  try {\n    // @ts-ignore dynamic import\n    const codegen = await import('@sentio/sdk/aptos/codegen')\n\n    const output = path.resolve(outputBase, 'aptos')\n    fs.emptyDirSync(output)\n\n    // @ts-ignore dynamic import\n    await codegen.codegen(path.resolve('abis', 'aptos'), output, genExample)\n  } catch (e) {\n    console.error('code gen error', e)\n  }\n\n  try {\n    // @ts-ignore dynamic import\n    const codegen = await import('@sentio/sdk/sui/codegen')\n\n    const output = path.resolve(outputBase, 'sui')\n    fs.emptyDirSync(output)\n\n    // @ts-ignore dynamic import\n    await codegen.codegen(path.resolve('abis', 'sui'), output, genExample)\n  } catch (e) {\n    console.error('code gen error', e)\n  }\n}\n\nasync function installDeps() {\n  await execYarn(['install', '--ignore-scripts'], 'Yarn Install')\n}\n"]}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@sentio/cli",
   "license": "Apache-2.0",
   "type": "module",
-  "version": "2.7.3",
+  "version": "2.7.4-rc.1",
   "dependencies": {
     "@jest/types": "^29.5.0",
     "@types/jest": "^29.5.0",

package/src/commands/build.ts

@@ -109,6 +109,9 @@ export async function buildProcessor(onlyGen: boolean, options: commandLineArgs.
       process.exit(1)
     }
 
+    const tsc = path.resolve(getPackageRoot('typescript'), 'bin', 'tsc')
+    await execStep(['node', tsc, '--noEmit'], 'type checking')
+
     const tsup = path.resolve(getPackageRoot('tsup'), 'dist', 'cli-default.js')
     // await execStep('yarn tsc -p .', 'Compile')
     await execStep(['node', tsup, '--config', tsupConfig], 'Packaging')