@graphprotocol/graph-cli 0.37.2 → 0.37.3-alpha-20230110163550-d64bef6

package/src/commands/add.js

@@ -1,15 +1,21 @@
-const chalk = require('chalk')
-const toolbox = require('gluegun/toolbox')
-const immutable = require('immutable')
-const { withSpinner } = require('../command-helpers/spinner')
-const Subgraph = require('../subgraph')
-const Protocol = require('../protocols')
-const DataSourcesExtractor = require('../command-helpers/data-sources')
-const { generateDataSource, writeABI, writeSchema, writeMapping, writeTestsFiles } = require('../command-helpers/scaffold')
-const { loadAbiFromEtherscan, loadAbiFromBlockScout } = require('../command-helpers/abi')
-const EthereumABI = require('../protocols/ethereum/abi')
-const { fixParameters } = require('../command-helpers/gluegun')
-const { updateNetworksFile } = require('../command-helpers/network')
+import chalk from 'chalk'
+import * as toolbox from 'gluegun/toolbox'
+import immutable from 'immutable'
+import { withSpinner } from '../command-helpers/spinner'
+import Subgraph from '../subgraph'
+import Protocol from '../protocols'
+import * as DataSourcesExtractor from '../command-helpers/data-sources'
+import {
+  generateDataSource,
+  writeABI,
+  writeSchema,
+  writeMapping,
+  writeTestsFiles,
+} from '../command-helpers/scaffold'
+import { loadAbiFromEtherscan, loadAbiFromBlockScout } from '../command-helpers/abi'
+import EthereumABI from '../protocols/ethereum/abi'
+import { fixParameters } from '../command-helpers/gluegun'
+import { updateNetworksFile } from '../command-helpers/network'
 
 const HELP = `
 ${chalk.bold('graph add')} <address> [<subgraph-manifest default: "./subgraph.yaml">]
@@ -23,21 +29,15 @@ ${chalk.dim('Options:')}
   -h, --help                    Show usage information
 `
 
-module.exports = {
+export default {
   description: 'Adds a new datasource to a subgraph',
   run: async toolbox => {
     // Obtain tools
     let { print, system } = toolbox
 
     // Read CLI parameters
-    let {
-      abi,
-      contractName,
-      h,
-      help,
-      mergeEntities,
-      networkFile
-    } = toolbox.parameters.options
+    let { abi, contractName, h, help, mergeEntities, networkFile } =
+      toolbox.parameters.options
 
     contractName = contractName || 'Contract'
 
@@ -54,7 +54,8 @@ module.exports = {
     }
 
     let address = toolbox.parameters.first || toolbox.parameters.array[0]
-    let manifestPath = toolbox.parameters.second || toolbox.parameters.array[1] || './subgraph.yaml'
+    let manifestPath =
+      toolbox.parameters.second || toolbox.parameters.array[1] || './subgraph.yaml'
 
     // Show help text if requested
     if (help || h) {
@@ -96,17 +97,32 @@ module.exports = {
       }
     }
 
-    let { collisionEntities, onlyCollisions, abiData } = updateEventNamesOnCollision(ethabi, entities, contractName, mergeEntities)
+    let { collisionEntities, onlyCollisions, abiData } = updateEventNamesOnCollision(
+      ethabi,
+      entities,
+      contractName,
+      mergeEntities,
+    )
     ethabi.data = abiData
 
     await writeABI(ethabi, contractName)
-    await writeSchema(ethabi, protocol, result.getIn(['schema', 'file']), collisionEntities)
+    await writeSchema(
+      ethabi,
+      protocol,
+      result.getIn(['schema', 'file']),
+      collisionEntities,
+    )
     await writeMapping(ethabi, protocol, contractName, collisionEntities)
     await writeTestsFiles(ethabi, protocol, contractName)
 
     let dataSources = result.get('dataSources')
-    let dataSource = await generateDataSource(protocol,
-      contractName, network, address, ethabi)
+    let dataSource = await generateDataSource(
+      protocol,
+      contractName,
+      network,
+      address,
+      ethabi,
+    )
 
     // Handle the collisions edge case by copying another data source yaml data
     if (mergeEntities && onlyCollisions) {
@@ -126,7 +142,7 @@ module.exports = {
     await Subgraph.write(result, manifestPath)
 
     // Update networks.json
-    const networksFile = networkFile || "./networks.json"
+    const networksFile = networkFile || './networks.json'
     await updateNetworksFile(toolbox, network, contractName, address, networksFile)
 
     // Detect Yarn and/or NPM
@@ -146,12 +162,12 @@ module.exports = {
       'Warning during codegen',
       async spinner => {
         await system.run(yarn ? 'yarn codegen' : 'npm run codegen')
-      }
+      },
     )
-  }
+  },
 }
 
-const getEntities = (manifest) => {
+const getEntities = manifest => {
   let dataSources = manifest.result.get('dataSources', immutable.List())
   let templates = manifest.result.get('templates', immutable.List())
 
@@ -161,13 +177,11 @@ const getEntities = (manifest) => {
     .flatten()
 }
 
-const getContractNames = (manifest) => {
+const getContractNames = manifest => {
   let dataSources = manifest.result.get('dataSources', immutable.List())
   let templates = manifest.result.get('templates', immutable.List())
 
-  return dataSources
-    .concat(templates)
-    .map(dataSource => dataSource.get('name'))
+  return dataSources.concat(templates).map(dataSource => dataSource.get('name'))
 }
 
 const updateEventNamesOnCollision = (ethabi, entities, contractName, mergeEntities) => {
@@ -179,7 +193,7 @@ const updateEventNamesOnCollision = (ethabi, entities, contractName, mergeEntiti
   for (let i = 0; i < abiData.size; i++) {
     let dataRow = abiData.get(i).asMutable()
 
-    if (dataRow.get('type') === 'event'){
+    if (dataRow.get('type') === 'event') {
       if (entities.indexOf(dataRow.get('name')) !== -1) {
         if (entities.indexOf(`${contractName}${dataRow.get('name')}`) !== -1) {
           print.error(`Contract name ('${contractName}')

package/src/commands/auth.js

@@ -1,11 +1,11 @@
-const chalk = require('chalk')
-const { saveDeployKey } = require('../command-helpers/auth')
-const { chooseNodeUrl } = require('../command-helpers/node')
-const { fixParameters } = require('../command-helpers/gluegun')
+import chalk from 'chalk'
+import { saveDeployKey } from '../command-helpers/auth'
+import { chooseNodeUrl } from '../command-helpers/node'
+import { fixParameters } from '../command-helpers/gluegun'
 
 const HELP = `
 ${chalk.bold('graph auth')} [options] ${chalk.bold('<node>')} ${chalk.bold(
-  '<deploy-key>'
+  '<deploy-key>',
 )}
 
 ${chalk.dim('Options:')}
@@ -16,25 +16,18 @@ ${chalk.dim('Options:')}
   -h, --help                    Show usage information
 `
 
-const processForm = async (
-  toolbox,
-  {
-    product,
-    studio,
-    node,
-    deployKey,
-  },
-) => {
+const processForm = async (toolbox, { product, studio, node, deployKey }) => {
   const questions = [
     {
       type: 'select',
       name: 'product',
       message: 'Product for which to initialize',
       choices: ['subgraph-studio', 'hosted-service'],
-      skip: 
+      skip:
         product === 'subgraph-studio' ||
         product === 'hosted-service' ||
-        studio !== undefined || node !== undefined,
+        studio !== undefined ||
+        node !== undefined,
     },
     {
       type: 'password',
@@ -52,19 +45,14 @@ const processForm = async (
   }
 }
 
-module.exports = {
+export default {
   description: 'Sets the deploy key to use when deploying to a Graph node',
   run: async toolbox => {
     // Obtain tools
     let { filesystem, print, system } = toolbox
 
     // Read CLI parameters
-    let {
-      product,
-      studio,
-      h,
-      help,
-    } = toolbox.parameters.options
+    let { product, studio, h, help } = toolbox.parameters.options
 
     // Show help text if requested
     if (help || h) {
@@ -77,7 +65,7 @@ module.exports = {
       ;[firstParam, secondParam] = fixParameters(toolbox.parameters, {
         h,
         help,
-        studio
+        studio,
       })
     } catch (e) {
       print.error(e.message)
@@ -101,7 +89,7 @@ module.exports = {
         product,
         studio,
         node,
-        deployKey
+        deployKey,
       })
       if (inputs === undefined) {
         process.exit(1)

package/src/commands/build.js

@@ -1,12 +1,12 @@
-const chalk = require('chalk')
+import chalk from 'chalk'
+import { createCompiler } from '../command-helpers/compiler'
+import { fixParameters } from '../command-helpers/gluegun'
+import { updateSubgraphNetwork } from '../command-helpers/network'
+import * as DataSourcesExtractor from '../command-helpers/data-sources'
+import Protocol from '../protocols'
+import debug from '../debug'
 
-const { createCompiler } = require('../command-helpers/compiler')
-const { fixParameters } = require('../command-helpers/gluegun')
-const { updateSubgraphNetwork } = require('../command-helpers/network')
-const DataSourcesExtractor = require('../command-helpers/data-sources')
-const Protocol = require('../protocols')
-
-let buildDebug = require('../debug')('graph-cli:build')
+let buildDebug = debug('graph-cli:build')
 
 const HELP = `
 ${chalk.bold('graph build')} [options] ${chalk.bold('[<subgraph-manifest>]')}
@@ -23,7 +23,7 @@ Options:
       --network-file <path>     Networks config file path (default: "./networks.json")
 `
 
-module.exports = {
+export default {
   description: 'Builds a subgraph and (optionally) uploads it to IPFS',
   run: async toolbox => {
     // Obtain tools

package/src/commands/codegen.js

@@ -1,14 +1,14 @@
-const chalk = require('chalk')
-const path = require('path')
-
-const TypeGenerator = require('../type-generator')
-const Protocol = require('../protocols')
-const { fixParameters } = require('../command-helpers/gluegun')
-const DataSourcesExtractor = require('../command-helpers/data-sources')
-const {
+import chalk from 'chalk'
+import path from 'path'
+import TypeGenerator from '../type-generator'
+import Protocol from '../protocols'
+import { fixParameters } from '../command-helpers/gluegun'
+import * as DataSourcesExtractor from '../command-helpers/data-sources'
+import debug from '../debug'
+import {
   assertManifestApiVersion,
   assertGraphTsVersion,
-} = require('../command-helpers/version')
+} from '../command-helpers/version'
 
 const HELP = `
 ${chalk.bold('graph codegen')} [options] ${chalk.bold('[<subgraph-manifest>]')}
@@ -21,9 +21,9 @@ Options:
   -uc, --uncrashable-config <path>  Directory for uncrashable config (default: ./uncrashable-config.yaml)
   `
 
-let codegenDebug = require('../debug')('graph-cli:codegen')
+let codegenDebug = debug('graph-cli:codegen')
 
-module.exports = {
+export default {
   description: 'Generates AssemblyScript types for a subgraph',
   run: async toolbox => {
     // Obtain tools
@@ -49,7 +49,7 @@ module.exports = {
     outputDir = outputDir || o
     watch = watch || w
     uncrashable = uncrashable || u
-    uncrashable_config = uncrashableConfig || uc
+    let uncrashable_config = uncrashableConfig || uc
 
     let manifest
     try {

package/src/commands/create.js

@@ -1,8 +1,8 @@
-const URL = require('url').URL
-const chalk = require('chalk')
-const { validateNodeUrl } = require('../command-helpers/node')
-const { identifyDeployKey: identifyAccessToken } = require('../command-helpers/auth')
-const { createJsonRpcClient } = require('../command-helpers/jsonrpc')
+import { URL } from 'url'
+import chalk from 'chalk'
+import { validateNodeUrl } from '../command-helpers/node'
+import { identifyDeployKey as identifyAccessToken } from '../command-helpers/auth'
+import { createJsonRpcClient } from '../command-helpers/jsonrpc'
 
 const HELP = `
 ${chalk.bold('graph create')} ${chalk.dim('[options]')} ${chalk.bold('<subgraph-name>')}
@@ -14,7 +14,7 @@ ${chalk.dim('Options:')}
   -g, --node <url>              Graph node to create the subgraph in
 `
 
-module.exports = {
+export default {
   description: 'Registers a subgraph name',
   run: async toolbox => {
     // Obtain tools
@@ -73,21 +73,21 @@ module.exports = {
     }
 
     let spinner = print.spin(`Creating subgraph in Graph node: ${requestUrl}`)
-    client.request('subgraph_create', { name: subgraphName }, function(
-      requestError,
-      jsonRpcError,
-      res
-    ) {
-      if (jsonRpcError) {
-        spinner.fail(`Error creating the subgraph: ${jsonRpcError.message}`)
-        process.exitCode = 1
-      } else if (requestError) {
-        spinner.fail(`HTTP error creating the subgraph: ${requestError.code}`)
-        process.exitCode = 1
-      } else {
-        spinner.stop()
-        print.success(`Created subgraph: ${subgraphName}`)
-      }
-    })
+    client.request(
+      'subgraph_create',
+      { name: subgraphName },
+      function (requestError, jsonRpcError, res) {
+        if (jsonRpcError) {
+          spinner.fail(`Error creating the subgraph: ${jsonRpcError.message}`)
+          process.exitCode = 1
+        } else if (requestError) {
+          spinner.fail(`HTTP error creating the subgraph: ${requestError.code}`)
+          process.exitCode = 1
+        } else {
+          spinner.stop()
+          print.success(`Created subgraph: ${subgraphName}`)
+        }
+      },
+    )
   },
 }

package/src/commands/deploy.js

@@ -1,20 +1,23 @@
 const URL = require('url').URL
-const chalk = require('chalk')
-const path = require('path')
-
-const { identifyDeployKey } = require('../command-helpers/auth')
-const { createCompiler } = require('../command-helpers/compiler')
-const { fixParameters } = require('../command-helpers/gluegun')
-const { createJsonRpcClient } = require('../command-helpers/jsonrpc')
-const { chooseNodeUrl } = require('../command-helpers/node')
-const { withSpinner } = require('../command-helpers/spinner')
-const { validateSubgraphName } = require('../command-helpers/subgraph')
-const { DEFAULT_IPFS_URL } = require('../command-helpers/ipfs')
-const { assertManifestApiVersion, assertGraphTsVersion } = require('../command-helpers/version')
-const DataSourcesExtractor = require('../command-helpers/data-sources')
-const { validateStudioNetwork } = require('../command-helpers/studio')
-const Protocol = require('../protocols')
-const { updateSubgraphNetwork } = require('../command-helpers/network')
+import chalk from 'chalk'
+import path from 'path'
+
+import { identifyDeployKey } from '../command-helpers/auth'
+import { createCompiler } from '../command-helpers/compiler'
+import { fixParameters } from '../command-helpers/gluegun'
+import { createJsonRpcClient } from '../command-helpers/jsonrpc'
+import { chooseNodeUrl } from '../command-helpers/node'
+import { withSpinner } from '../command-helpers/spinner'
+import { validateSubgraphName } from '../command-helpers/subgraph'
+import { DEFAULT_IPFS_URL } from '../command-helpers/ipfs'
+import {
+  assertManifestApiVersion,
+  assertGraphTsVersion,
+} from '../command-helpers/version'
+import * as DataSourcesExtractor from '../command-helpers/data-sources'
+import { validateStudioNetwork } from '../command-helpers/studio'
+import Protocol from '../protocols'
+import { updateSubgraphNetwork } from '../command-helpers/network'
 
 const HELP = `
 ${chalk.bold('graph deploy')} [options] ${chalk.bold('<subgraph-name>')} ${chalk.bold(
@@ -40,15 +43,7 @@ Options:
         --network-file <path>     Networks config file path (default: "./networks.json")
 `
 
-const processForm = async (
-  toolbox,
-  {
-    product,
-    studio,
-    node,
-    versionLabel,
-  },
-) => {
+const processForm = async (toolbox, { product, studio, node, versionLabel }) => {
   const questions = [
     {
       type: 'select',
@@ -58,7 +53,8 @@ const processForm = async (
       skip:
         product === 'subgraph-studio' ||
         product === 'hosted-service' ||
-        studio !== undefined || node !== undefined,
+        studio !== undefined ||
+        node !== undefined,
     },
     {
       type: 'input',
@@ -76,7 +72,7 @@ const processForm = async (
   }
 }
 
-module.exports = {
+export default {
   description: 'Deploys the subgraph to a Graph node',
   run: async toolbox => {
     // Obtain tools
@@ -111,7 +107,7 @@ module.exports = {
     // Support both long and short option variants
     help = help || h
     ipfs = ipfs || i || DEFAULT_IPFS_URL
-    headers = headers || hdr || "{}"
+    headers = headers || hdr || '{}'
     node = node || g
     outputDir = outputDir || o
     watch = watch || w
@@ -120,7 +116,7 @@ module.exports = {
     try {
       headers = JSON.parse(headers)
     } catch (e) {
-      print.error("Please make sure headers is a valid JSON value")
+      print.error('Please make sure headers is a valid JSON value')
       process.exitCode = 1
       return
     }
@@ -132,7 +128,7 @@ module.exports = {
         help,
         w,
         watch,
-        studio
+        studio,
       })
     } catch (e) {
       print.error(e.message)
@@ -149,7 +145,7 @@ module.exports = {
     networkFile =
       networkFile !== undefined && networkFile !== ''
         ? networkFile
-        : filesystem.resolve("networks.json")
+        : filesystem.resolve('networks.json')
 
     try {
       const dataSourcesAndTemplates = await DataSourcesExtractor.fromFilePath(manifest)
@@ -190,7 +186,11 @@ module.exports = {
 
     // Validate the subgraph name
     if (!subgraphName) {
-      print.error(`No subgraph ${product == 'subgraph-studio' || studio ? 'slug' : 'name'} provided`)
+      print.error(
+        `No subgraph ${
+          product == 'subgraph-studio' || studio ? 'slug' : 'name'
+        } provided`,
+      )
       print.info(HELP)
       process.exitCode = 1
       return
@@ -246,7 +246,7 @@ module.exports = {
       outputDir,
       outputFormat: 'wasm',
       skipMigrations,
-      blockIpfsMethods: isStudio,  // Network does not support publishing subgraphs with IPFS methods
+      blockIpfsMethods: isStudio, // Network does not support publishing subgraphs with IPFS methods
       protocol,
     })
 
@@ -293,7 +293,12 @@ module.exports = {
       //       `Failed to deploy to Graph node ${requestUrl}`,
       client.request(
         'subgraph_deploy',
-        { name: subgraphName, ipfs_hash: ipfsHash, version_label: versionLabel, debug_fork: debugFork },
+        {
+          name: subgraphName,
+          ipfs_hash: ipfsHash,
+          version_label: versionLabel,
+          debug_fork: debugFork,
+        },
         async (requestError, jsonRpcError, res) => {
           if (jsonRpcError) {
             spinner.fail(

package/src/commands/init.js

@@ -1,32 +1,29 @@
-const chalk = require('chalk')
-const os = require('os')
-const path = require('path')
-const toolbox = require('gluegun/toolbox')
-const fs = require('fs')
-const graphCli = require('../cli')
-
-const {
-  getSubgraphBasename,
-  validateSubgraphName,
-} = require('../command-helpers/subgraph')
-const DataSourcesExtractor = require('../command-helpers/data-sources')
-const { validateStudioNetwork } = require('../command-helpers/studio')
-const { initNetworksConfig } = require('../command-helpers/network')
-const { withSpinner, step } = require('../command-helpers/spinner')
-const { fixParameters } = require('../command-helpers/gluegun')
-const { chooseNodeUrl } = require('../command-helpers/node')
-const { loadAbiFromEtherscan, loadAbiFromBlockScout } = require('../command-helpers/abi')
-const { generateScaffold, writeScaffold } = require('../command-helpers/scaffold')
-const { abiEvents } = require('../scaffold/schema')
-const { validateContract } = require('../validation')
-const Protocol = require('../protocols')
+import chalk from 'chalk'
+import os from 'os'
+import path from 'path'
+import * as toolbox from 'gluegun/toolbox'
+import fs from 'fs'
+import graphCli from '../cli'
+import { getSubgraphBasename, validateSubgraphName } from '../command-helpers/subgraph'
+import * as DataSourcesExtractor from '../command-helpers/data-sources'
+import { validateStudioNetwork } from '../command-helpers/studio'
+import { initNetworksConfig } from '../command-helpers/network'
+import { withSpinner, step } from '../command-helpers/spinner'
+import { fixParameters } from '../command-helpers/gluegun'
+import { chooseNodeUrl } from '../command-helpers/node'
+import { loadAbiFromEtherscan, loadAbiFromBlockScout } from '../command-helpers/abi'
+import { generateScaffold, writeScaffold } from '../command-helpers/scaffold'
+import { abiEvents } from '../scaffold/schema'
+import { validateContract } from '../validation'
+import Protocol from '../protocols'
+import debug from '../debug'
 
 const protocolChoices = Array.from(Protocol.availableProtocols().keys())
 const availableNetworks = Protocol.availableNetworks()
 
 const DEFAULT_EXAMPLE_SUBGRAPH = 'ethereum/gravatar'
 
-let initDebug = require('../debug')('graph-cli:init')
+let initDebug = debug('graph-cli:init')
 
 const HELP = `
 ${chalk.bold('graph init')} [options] [subgraph-name] [directory]
@@ -303,7 +300,7 @@ const loadAbiFromFile = async (ABI, filename) => {
   }
 }
 
-module.exports = {
+export default {
   description: 'Creates a new subgraph with basic scaffolding',
   run: async toolbox => {
     // Obtain tools

package/src/commands/local.js

@@ -1,15 +1,15 @@
-const chalk = require('chalk')
-const compose = require('docker-compose')
-const http = require('http')
-const net = require('net')
-const tmp = require('tmp-promise')
-const Docker = require('dockerode')
-const path = require('path')
-const stripAnsi = require('strip-ansi')
+import chalk from 'chalk'
+import compose from 'docker-compose'
+import http from 'http'
+import net from 'net'
+import tmp from 'tmp-promise'
+import Docker from 'dockerode'
+import path from 'path'
+import stripAnsi from 'strip-ansi'
 const spawn = require('child_process').spawn
 
-const { fixParameters } = require('../command-helpers/gluegun')
-const { step, withSpinner } = require('../command-helpers/spinner')
+import { fixParameters } from '../command-helpers/gluegun'
+import { step, withSpinner } from '../command-helpers/spinner'
 
 // Clean up temporary files even when an uncaught exception occurs
 tmp.setGracefulCleanup()
@@ -32,8 +32,9 @@ Options:
       --timeout                 Time to wait for service containers. (optional, defaults to 120000 milliseconds)
 `
 
-module.exports = {
-  description: 'Runs local tests against a Graph Node environment (using Ganache by default)',
+export default {
+  description:
+    'Runs local tests against a Graph Node environment (using Ganache by default)',
   run: async toolbox => {
     // Obtain tools
     let { filesystem, print } = toolbox
@@ -130,7 +131,7 @@ module.exports = {
         skipWaitForEthereum,
         skipWaitForIpfs,
         skipWaitForPostgres,
-	timeout,
+        timeout,
       })
     } catch (e) {
       await stopTestEnvironment(tempdir)
@@ -454,7 +455,7 @@ const startGraphNode = async (standaloneNode, standaloneNodeArgs, nodeOutputChun
     },
   )
 
-const waitForGraphNode = async ( timeout ) =>
+const waitForGraphNode = async timeout =>
   await withSpinner(
     `Wait for Graph node`,
     `Failed to wait for Graph node`,