@graphprotocol/graph-cli 0.51.1 → 0.51.2-alpha-20230621172007-4f03cf8

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @graphprotocol/graph-cli
 
+## 0.51.2-alpha-20230621172007-4f03cf8
+
+### Patch Changes
+
+- [#1382](https://github.com/graphprotocol/graph-tooling/pull/1382)
+  [`37a1e4d`](https://github.com/graphprotocol/graph-tooling/commit/37a1e4d1beaed7f069d617194f24e5449aa74ded)
+  Thanks [@saihaj](https://github.com/saihaj)! - Only ask directory and subgraph name when using
+  `graph init --from-example ...`
+
 ## 0.51.1
 
 ### Patch Changes

package/dist/commands/init.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -32,7 +9,6 @@ const path_1 = __importDefault(require("path"));
 const core_1 = require("@oclif/core");
 const gluegun_1 = require("gluegun");
 const abi_1 = require("../command-helpers/abi");
-const DataSourcesExtractor = __importStar(require("../command-helpers/data-sources"));
 const network_1 = require("../command-helpers/network");
 const node_1 = require("../command-helpers/node");
 const scaffold_1 = require("../command-helpers/scaffold");
@@ -78,20 +54,18 @@ class InitCommand extends core_1.Command {
         const commands = {
             link: yarn ? 'yarn link @graphprotocol/graph-cli' : 'npm link @graphprotocol/graph-cli',
             install: yarn ? 'yarn' : 'npm install',
-            codegen: yarn ? 'yarn codegen' : 'npm run codegen',
+            // this ensure we run code-generation from our CLI instead of some script in package.json
+            codegen: yarn ? 'yarn graph codegen' : 'npx graph codegen',
             deploy: yarn ? 'yarn deploy' : 'npm run deploy',
         };
         // If all parameters are provided from the command-line,
         // go straight to creating the subgraph from the example
-        if (fromExample && subgraphName && directory && protocol) {
+        if (fromExample && subgraphName && directory) {
             await initSubgraphFromExample.bind(this)({
                 fromExample,
                 allowSimpleName,
                 directory,
                 subgraphName,
-                studio,
-                product,
-                protocolInstance: new protocols_1.default(protocol),
             }, { commands });
             // Exit with success
             return this.exit(0);
@@ -149,40 +123,46 @@ class InitCommand extends core_1.Command {
             // Exit with success
             return this.exit(0);
         }
-        // Otherwise, take the user through the interactive form
-        const answers = await processInitForm.bind(this)({
-            protocol: protocol,
-            product,
-            studio,
-            node,
-            abi,
-            abiPath,
-            allowSimpleName,
-            directory,
-            contract: fromContract,
-            indexEvents,
-            fromExample,
-            network,
-            subgraphName,
-            contractName,
-            startBlock,
-            spkgPath,
-        });
-        if (!answers) {
-            this.exit(1);
-            return;
-        }
         if (fromExample) {
+            const answers = await processFromExampleInitForm.bind(this)({
+                allowSimpleName,
+                subgraphName,
+                directory,
+            });
+            if (!answers) {
+                this.exit(1);
+                return;
+            }
             await initSubgraphFromExample.bind(this)({
                 fromExample,
                 subgraphName: answers.subgraphName,
                 directory: answers.directory,
-                studio: answers.studio,
-                product: answers.product,
-                protocolInstance: answers.protocolInstance,
             }, { commands });
         }
         else {
+            // Otherwise, take the user through the interactive form
+            const answers = await processInitForm.bind(this)({
+                protocol: protocol,
+                product,
+                studio,
+                node,
+                abi,
+                abiPath,
+                allowSimpleName,
+                directory,
+                contract: fromContract,
+                indexEvents,
+                fromExample,
+                network,
+                subgraphName,
+                contractName,
+                startBlock,
+                spkgPath,
+            });
+            if (!answers) {
+                this.exit(1);
+                return;
+            }
             ({ node, allowSimpleName } = (0, node_1.chooseNodeUrl)({
                 product: answers.product,
                 studio: answers.studio,
@@ -285,6 +265,51 @@ InitCommand.flags = {
     }),
 };
 exports.default = InitCommand;
+async function processFromExampleInitForm({ directory: initDirectory, subgraphName: initSubgraphName, allowSimpleName: initAllowSimpleName, }) {
+    try {
+        const { subgraphName } = await gluegun_1.prompt.ask([
+            {
+                type: 'input',
+                name: 'subgraphName',
+                // TODO: is defaulting to studio ok?
+                message: () => 'Subgraph slug',
+                initial: initSubgraphName,
+                validate: name => {
+                    try {
+                        (0, subgraph_1.validateSubgraphName)(name, { allowSimpleName: initAllowSimpleName });
+                        return true;
+                    }
+                    catch (e) {
+                        return `${e.message}
+
+    Examples:
+
+      $ graph init ${os_1.default.userInfo().username}/${name}
+      $ graph init ${name} --allow-simple-name`;
+                    }
+                },
+            },
+        ]);
+        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,
+            },
+        ]);
+        return {
+            subgraphName,
+            directory,
+        };
+    }
+    catch (e) {
+        this.error(e, { exit: 1 });
+    }
+}
 async function processInitForm({ protocol: initProtocol, product: initProduct, studio: initStudio, node: initNode, abi: initAbi, abiPath: initAbiPath, directory: initDirectory, contract: initContract, indexEvents: initIndexEvents, fromExample: initFromExample, network: initNetwork, subgraphName: initSubgraphName, contractName: initContractName, startBlock: initStartBlock, allowSimpleName: initAllowSimpleName, spkgPath: initSpkgPath, }) {
     let abiFromEtherscan = undefined;
     try {
@@ -622,8 +647,7 @@ Subgraph ${subgraphName} created in ${relativeDir}
 
 Make sure to visit the documentation on https://thegraph.com/docs/ for further information.`);
 }
-async function initSubgraphFromExample({ protocolInstance, fromExample, allowSimpleName, subgraphName, directory, studio, product, }, { commands, }) {
-    const isSubstreams = protocolInstance.name === 'substreams';
+async function initSubgraphFromExample({ fromExample, allowSimpleName, subgraphName, directory, }, { commands, }) {
     // Fail if the subgraph name is invalid
     if (!revalidateSubgraphName.bind(this)(subgraphName, { allowSimpleName })) {
         process.exitCode = 1;
@@ -663,17 +687,6 @@ async function initSubgraphFromExample({ protocolInstance, fromExample, allowSim
         this.exit(1);
         return;
     }
-    try {
-        // It doesn't matter if we changed the URL we clone the YAML,
-        // we'll check it's network anyway. If it's a studio subgraph we're dealing with.
-        const dataSourcesAndTemplates = await DataSourcesExtractor.fromFilePath(path_1.default.join(directory, 'subgraph.yaml'));
-        for (const { network } of dataSourcesAndTemplates) {
-            (0, studio_1.validateStudioNetwork)({ studio, product, network });
-        }
-    }
-    catch (e) {
-        this.error(e.message, { exit: 1 });
-    }
     const networkConf = await (0, network_1.initNetworksConfig)(directory, 'address');
     if (networkConf !== true) {
         this.exit(1);
@@ -720,13 +733,11 @@ async function initSubgraphFromExample({ protocolInstance, fromExample, allowSim
         this.exit(1);
         return;
     }
-    if (!isSubstreams) {
-        // Run code-generation
-        const codegen = await runCodegen(directory, commands.codegen);
-        if (codegen !== true) {
-            this.exit(1);
-            return;
-        }
+    // Run code-generation
+    const codegen = await runCodegen(directory, commands.codegen);
+    if (codegen !== true) {
+        this.exit(1);
+        return;
     }
     printNextSteps.bind(this)({ subgraphName, directory }, { commands });
 }

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.51.1",
+  "version": "0.51.2-alpha-20230621172007-4f03cf8",
   "commands": {
     "add": {
       "id": "add",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.51.1",
+  "version": "0.51.2-alpha-20230621172007-4f03cf8",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {