@graphprotocol/graph-cli 0.49.0-alpha-20230503100511-80612fa → 0.49.0-alpha-20230504000723-2c6e265

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @graphprotocol/graph-cli
 
-## 0.49.0-alpha-20230503100511-80612fa
+## 0.49.0-alpha-20230504000723-2c6e265
 
 ### Minor Changes
 

package/dist/commands/init.js

@@ -39,12 +39,10 @@ const scaffold_1 = require("../command-helpers/scaffold");
 const spinner_1 = require("../command-helpers/spinner");
 const studio_1 = require("../command-helpers/studio");
 const subgraph_1 = require("../command-helpers/subgraph");
-const debug_1 = __importDefault(require("../debug"));
 const protocols_1 = __importDefault(require("../protocols"));
 const schema_1 = require("../scaffold/schema");
 const validation_1 = require("../validation");
 const add_1 = __importDefault(require("./add"));
-const initDebug = (0, debug_1.default)('graph-cli:init');
 const protocolChoices = Array.from(protocols_1.default.availableProtocols().keys());
 const availableNetworks = protocols_1.default.availableNetworks();
 const DEFAULT_EXAMPLE_SUBGRAPH = 'ethereum/gravatar';
@@ -265,227 +263,222 @@ InitCommand.flags = {
     }),
 };
 exports.default = InitCommand;
-async function processInitForm({ protocol, product, studio, node, abi, allowSimpleName, directory, contract, indexEvents, fromExample, network, subgraphName, contractName, startBlock, }) {
+async function processInitForm({ protocol: initProtocol, product: initProduct, studio: initStudio, node: initNode, abi: initAbi, directory: initDirectory, contract: initContract, indexEvents: initIndexEvents, fromExample: initFromExample, network: initNetwork, subgraphName: initSubgraphName, contractName: initContractName, startBlock: initStartBlock, allowSimpleName: initAllowSimpleName, }) {
     let abiFromEtherscan = undefined;
-    let abiFromFile = undefined;
-    let protocolInstance;
-    let ProtocolContract;
-    let ABI;
-    const questions = [
-        {
+    try {
+        const { protocol } = await gluegun_1.prompt.ask({
             type: 'select',
             name: 'protocol',
             message: 'Protocol',
             choices: protocolChoices,
-            skip: protocolChoices.includes(String(protocol)),
-            result: (value) => {
-                // eslint-disable-next-line -- prettier has problems with ||=
-                protocol = protocol || value;
-                protocolInstance = new protocols_1.default(protocol);
-                return protocol;
-            },
-        },
-        {
-            type: 'select',
-            name: 'product',
-            message: 'Product for which to initialize',
-            choices: ['subgraph-studio', 'hosted-service'],
-            skip: () => protocol === 'arweave' ||
-                protocol === 'cosmos' ||
-                protocol === 'near' ||
-                product === 'subgraph-studio' ||
-                product === 'hosted-service' ||
-                studio !== undefined ||
-                node !== undefined,
-            result: (value) => {
-                // For now we only support NEAR subgraphs in the Hosted Service
-                if (protocol === 'near') {
-                    // Can be overwritten because the question will be skipped (product === undefined)
-                    product = 'hosted-service';
-                    return product;
-                }
-                if (value == 'subgraph-studio') {
-                    allowSimpleName = true;
-                }
-                product = value;
-                return value;
+            skip: protocolChoices.includes(String(initProtocol)),
+        });
+        const protocolInstance = new protocols_1.default(protocol);
+        const { product } = await gluegun_1.prompt.ask([
+            {
+                type: 'select',
+                name: 'product',
+                message: 'Product for which to initialize',
+                choices: ['subgraph-studio', 'hosted-service'],
+                skip: protocol === 'arweave' ||
+                    protocol === 'cosmos' ||
+                    protocol === 'near' ||
+                    initProduct === 'subgraph-studio' ||
+                    initProduct === 'hosted-service' ||
+                    initStudio !== undefined ||
+                    initNode !== undefined,
+                result: value => {
+                    if (initProduct)
+                        return initProduct;
+                    if (initStudio)
+                        return 'subgraph-studio';
+                    // For now we only support NEAR subgraphs in the Hosted Service
+                    if (protocol === 'near') {
+                        return 'hosted-service';
+                    }
+                    if (value == 'subgraph-studio') {
+                        initAllowSimpleName = true;
+                    }
+                    return value;
+                },
             },
-        },
-        {
-            type: 'input',
-            name: 'subgraphName',
-            message: () => (product == 'subgraph-studio' || studio ? 'Subgraph slug' : 'Subgraph name'),
-            initial: subgraphName,
-            validate: (name) => {
-                try {
-                    (0, subgraph_1.validateSubgraphName)(name, { allowSimpleName });
-                    return true;
-                }
-                catch (e) {
-                    return `${e.message}
+        ]);
+        const { subgraphName } = await gluegun_1.prompt.ask([
+            {
+                type: 'input',
+                name: 'subgraphName',
+                message: () => (product == 'subgraph-studio' ? 'Subgraph slug' : 'Subgraph name'),
+                initial: initSubgraphName,
+                validate: name => {
+                    try {
+                        (0, subgraph_1.validateSubgraphName)(name, { allowSimpleName: initAllowSimpleName });
+                        return true;
+                    }
+                    catch (e) {
+                        return `${e.message}
 
-  Examples:
+    Examples:
 
-    $ graph init ${os_1.default.userInfo().username}/${name}
-    $ graph init ${name} --allow-simple-name`;
-                }
+      $ graph init ${os_1.default.userInfo().username}/${name}
+      $ graph init ${name} --allow-simple-name`;
+                    }
+                },
             },
-            result: (value) => {
-                subgraphName = value;
-                return value;
+        ]);
+        const { directory } = await gluegun_1.prompt.ask([
+            {
+                type: 'input',
+                name: 'directory',
+                message: 'Directory to create the subgraph in',
+                initial: () => initDirectory || (0, subgraph_1.getSubgraphBasename)(subgraphName),
+                validate: value => gluegun_1.filesystem.exists(value || initDirectory || (0, subgraph_1.getSubgraphBasename)(subgraphName))
+                    ? 'Directory already exists'
+                    : true,
             },
-        },
-        {
-            type: 'input',
-            name: 'directory',
-            message: 'Directory to create the subgraph in',
-            initial: () => directory ||
-                (0, subgraph_1.getSubgraphBasename)(
-                // @ts-expect-error will be set by previous question
-                subgraphName),
-            validate: (value) => gluegun_1.filesystem.exists(value ||
-                directory ||
-                (0, subgraph_1.getSubgraphBasename)(
-                // @ts-expect-error will be set by previous question
-                subgraphName))
-                ? 'Directory already exists'
-                : true,
-        },
-        {
-            type: 'select',
-            name: 'network',
-            message: () => `${protocolInstance.displayName()} network`,
-            choices: () => {
-                initDebug('Generating list of available networks for protocol "%s" (%M)', protocol, availableNetworks.get(protocol));
-                return (
-                // @ts-expect-error TODO: wait what?
-                availableNetworks
+        ]);
+        const { network } = await gluegun_1.prompt.ask([
+            {
+                type: 'select',
+                name: 'network',
+                message: () => `${protocolInstance.displayName()} network`,
+                choices: availableNetworks
                     .get(protocol) // Get networks related to the chosen protocol.
-                    .toArray()); // Needed because of gluegun. It can't even receive a JS iterable.
-            },
-            skip: fromExample !== undefined,
-            initial: network || 'mainnet',
-            result: (value) => {
-                network = value;
-                return value;
-            },
-        },
-        // TODO:
-        //
-        // protocols that don't support contract
-        // - arweave
-        // - cosmos
-        {
-            type: 'input',
-            name: 'contract',
-            message: () => {
-                ProtocolContract = protocolInstance.getContract();
-                return `Contract ${ProtocolContract.identifierName()}`;
-            },
-            skip: () => fromExample !== undefined || !protocolInstance.hasContract(),
-            initial: contract,
-            validate: async (value) => {
-                if (fromExample !== undefined || !protocolInstance.hasContract()) {
-                    return true;
-                }
-                // Validate whether the contract is valid
-                const { valid, error } = (0, validation_1.validateContract)(value, ProtocolContract);
-                return valid ? true : error;
-            },
-            result: async (value) => {
-                if (fromExample !== undefined) {
+                    ?.toArray() || ['mainnet'],
+                skip: initFromExample !== undefined,
+                result: value => {
+                    if (initNetwork)
+                        return initNetwork;
                     return value;
-                }
-                ABI = protocolInstance.getABI();
-                // Try loading the ABI from Etherscan, if none was provided
-                if (protocolInstance.hasABIs() && !abi) {
-                    try {
-                        if (network === 'poa-core') {
-                            // TODO: this variable is never used anywhere, what happens?
-                            // abiFromBlockScout = await loadAbiFromBlockScout(ABI, network, value)
+                },
+            },
+        ]);
+        const { contract } = await gluegun_1.prompt.ask([
+            // TODO:
+            // protocols that don't support contract
+            // - arweave
+            // - cosmos
+            {
+                type: 'input',
+                name: 'contract',
+                message: `Contract ${protocolInstance.getContract()?.identifierName()}`,
+                skip: () => initFromExample !== undefined || !protocolInstance.hasContract(),
+                initial: initContract,
+                validate: async (value) => {
+                    if (initFromExample !== undefined || !protocolInstance.hasContract()) {
+                        return true;
+                    }
+                    const protocolContract = protocolInstance.getContract();
+                    if (!protocolContract) {
+                        return 'Contract not found.';
+                    }
+                    // Validate whether the contract is valid
+                    const { valid, error } = (0, validation_1.validateContract)(value, protocolContract);
+                    return valid ? true : error;
+                },
+                result: async (value) => {
+                    if (initFromExample !== undefined) {
+                        return value;
+                    }
+                    const ABI = protocolInstance.getABI();
+                    // Try loading the ABI from Etherscan, if none was provided
+                    if (protocolInstance.hasABIs() && !initAbi) {
+                        try {
+                            if (network === 'poa-core') {
+                                // TODO: this variable is never used anywhere, what happens?
+                                // abiFromBlockScout = await loadAbiFromBlockScout(ABI, network, value)
+                            }
+                            else {
+                                abiFromEtherscan = await (0, abi_1.loadAbiFromEtherscan)(ABI, network, value);
+                            }
                         }
-                        else {
-                            abiFromEtherscan = await (0, abi_1.loadAbiFromEtherscan)(ABI, network, value);
+                        catch (e) {
+                            // noop
                         }
                     }
-                    catch (e) {
-                        // noop
+                    // If startBlock is not set, try to load it.
+                    if (!initStartBlock) {
+                        try {
+                            // Load startBlock for this contract
+                            initStartBlock = Number(await (0, abi_1.loadStartBlockForContract)(network, value)).toString();
+                        }
+                        catch (error) {
+                            // noop
+                        }
                     }
-                }
-                // If startBlock is not set, try to load it.
-                if (!startBlock) {
+                    return value;
+                },
+            },
+        ]);
+        const { abi: abiFromFile } = await gluegun_1.prompt.ask([
+            {
+                type: 'input',
+                name: 'abi',
+                message: 'ABI file (path)',
+                initial: initAbi,
+                skip: () => !protocolInstance.hasABIs() ||
+                    initFromExample !== undefined ||
+                    abiFromEtherscan !== undefined,
+                validate: async (value) => {
+                    if (initFromExample || abiFromEtherscan || !protocolInstance.hasABIs()) {
+                        return true;
+                    }
+                    const ABI = protocolInstance.getABI();
                     try {
-                        // Load startBlock for this contract
-                        startBlock = Number(await (0, abi_1.loadStartBlockForContract)(network, value)).toString();
+                        return loadAbiFromFile(ABI, value);
                     }
-                    catch (error) {
-                        // noop
+                    catch (e) {
+                        return e.message;
                     }
-                }
-                return value;
-            },
-        },
-        {
-            type: 'input',
-            name: 'abi',
-            message: 'ABI file (path)',
-            initial: abi,
-            skip: () => !protocolInstance.hasABIs() || fromExample !== undefined || abiFromEtherscan !== undefined,
-            validate: async (value) => {
-                if (fromExample || abiFromEtherscan || !protocolInstance.hasABIs()) {
-                    return true;
-                }
-                try {
-                    abiFromFile = loadAbiFromFile(ABI, value);
-                    return true;
-                }
-                catch (e) {
-                    return e.message;
-                }
+                },
             },
-        },
-        {
-            type: 'input',
-            name: 'startBlock',
-            message: 'Start Block',
-            initial: () => startBlock || '0',
-            skip: () => fromExample !== undefined,
-            validate: (value) => parseInt(value) >= 0,
-            result: (value) => {
-                startBlock = value;
-                return value;
+        ]);
+        const { startBlock } = await gluegun_1.prompt.ask([
+            {
+                type: 'input',
+                name: 'startBlock',
+                message: 'Start Block',
+                initial: initStartBlock || '0',
+                skip: () => initFromExample !== undefined,
+                validate: value => parseInt(value) >= 0,
+                result(value) {
+                    if (initStartBlock)
+                        return initStartBlock;
+                    return value;
+                },
             },
-        },
-        {
-            type: 'input',
-            name: 'contractName',
-            message: 'Contract Name',
-            initial: contractName || 'Contract',
-            skip: () => fromExample !== undefined || !protocolInstance.hasContract(),
-            validate: (value) => value && value.length > 0,
-            result: (value) => {
-                contractName = value;
-                return value;
+        ]);
+        const { contractName } = await gluegun_1.prompt.ask([
+            {
+                type: 'input',
+                name: 'contractName',
+                message: 'Contract Name',
+                initial: initContractName || 'Contract',
+                skip: () => initFromExample !== undefined || !protocolInstance.hasContract(),
+                validate: value => value && value.length > 0,
             },
-        },
-        {
-            type: 'confirm',
-            name: 'indexEvents',
-            message: 'Index contract events as entities',
-            initial: true,
-            skip: () => !!indexEvents,
-            result: (value) => {
-                indexEvents = value;
-                return value;
+        ]);
+        const { indexEvents } = await gluegun_1.prompt.ask([
+            {
+                type: 'confirm',
+                name: 'indexEvents',
+                message: 'Index contract events as entities',
+                initial: true,
+                skip: () => !!initIndexEvents,
             },
-        },
-    ];
-    try {
-        const answers = await gluegun_1.prompt.ask(questions);
+        ]);
         return {
-            ...answers,
             abi: abiFromEtherscan || abiFromFile,
             protocolInstance,
+            subgraphName,
+            directory,
+            studio: product === 'subgraph-studio',
+            startBlock,
+            fromExample: !!initFromExample,
+            product,
+            network,
+            contractName,
+            contract,
+            indexEvents,
         };
     }
     catch (e) {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.49.0-alpha-20230503100511-80612fa",
+  "version": "0.49.0-alpha-20230504000723-2c6e265",
   "commands": {
     "add": {
       "id": "add",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.49.0-alpha-20230503100511-80612fa",
+  "version": "0.49.0-alpha-20230504000723-2c6e265",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {
@@ -31,7 +31,7 @@
     "dockerode": "2.5.8",
     "fs-extra": "9.1.0",
     "glob": "9.3.5",
-    "gluegun": "https://github.com/edgeandnode/gluegun#v4.3.1-pin-colors-dep",
+    "gluegun": "5.1.2",
     "graphql": "15.5.0",
     "immutable": "4.2.1",
     "ipfs-http-client": "55.0.0",