@graphprotocol/graph-cli 0.89.0 → 0.89.1-alpha-20241120083236-1915251

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @graphprotocol/graph-cli
 
+## 0.89.1-alpha-20241120083236-1915251
+
+### Patch Changes
+
+- [#1767](https://github.com/graphprotocol/graph-tooling/pull/1767)
+  [`6f2cb45`](https://github.com/graphprotocol/graph-tooling/commit/6f2cb45e5a07d8de2946a485763feb0b1bcfd4f0)
+  Thanks [@0237h](https://github.com/0237h)! - Fix CLI validation for `startBlock` and
+  `contractName` fetched from external APIs
+
 ## 0.89.0
 
 ### Minor Changes

package/dist/commands/init.js

@@ -362,6 +362,8 @@ async function retryWithPrompt(func) {
 }
 async function processInitForm({ protocol: initProtocol, abi: initAbi, abiPath: initAbiPath, directory: initDirectory, contract: initContract, indexEvents: initIndexEvents, fromExample: initFromExample, network: initNetwork, subgraphName: initSubgraphName, contractName: initContractName, startBlock: initStartBlock, spkgPath: initSpkgPath, }) {
     let abiFromEtherscan = undefined;
+    let startBlockFromEtherscan = undefined;
+    let contractNameFromEtherscan = undefined;
     try {
         const { protocol } = await gluegun_1.prompt.ask({
             type: 'select',
@@ -461,7 +463,7 @@ async function processInitForm({ protocol: initProtocol, abi: initAbi, abiPath:
                         // Load startBlock for this contract
                         const startBlock = await retryWithPrompt(() => (0, abi_1.loadStartBlockForContract)(network, value));
                         if (startBlock) {
-                            initStartBlock = Number(startBlock).toString();
+                            startBlockFromEtherscan = Number(startBlock).toString();
                         }
                     }
                     // If contract name is not set, try to load it.
@@ -469,7 +471,7 @@ async function processInitForm({ protocol: initProtocol, abi: initAbi, abiPath:
                         // Load contract name for this contract
                         const contractName = await retryWithPrompt(() => (0, abi_1.loadContractNameForAddress)(network, value));
                         if (contractName) {
-                            initContractName = contractName;
+                            contractNameFromEtherscan = contractName;
                         }
                     }
                     return value;
@@ -532,14 +534,9 @@ async function processInitForm({ protocol: initProtocol, abi: initAbi, abiPath:
                 type: 'input',
                 name: 'startBlock',
                 message: 'Start Block',
-                initial: initStartBlock || '0',
+                initial: initStartBlock || startBlockFromEtherscan || '0',
                 skip: () => initFromExample !== undefined || isSubstreams,
                 validate: value => parseInt(value) >= 0,
-                result(value) {
-                    if (initStartBlock)
-                        return initStartBlock;
-                    return value;
-                },
             },
         ]);
         const { contractName } = await gluegun_1.prompt.ask([
@@ -547,14 +544,9 @@ async function processInitForm({ protocol: initProtocol, abi: initAbi, abiPath:
                 type: 'input',
                 name: 'contractName',
                 message: 'Contract Name',
-                initial: initContractName || 'Contract' || isSubstreams,
+                initial: initContractName || contractNameFromEtherscan || 'Contract' || isSubstreams,
                 skip: () => initFromExample !== undefined || !protocolInstance.hasContract(),
                 validate: value => value && value.length > 0,
-                result(value) {
-                    if (initContractName)
-                        return initContractName;
-                    return value;
-                },
             },
         ]);
         const { indexEvents } = await gluegun_1.prompt.ask([

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.89.0",
+  "version": "0.89.1-alpha-20241120083236-1915251",
   "commands": {
     "add": {
       "id": "add",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.89.0",
+  "version": "0.89.1-alpha-20241120083236-1915251",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {