@graphprotocol/graph-cli 0.49.0-alpha-20230505152117-ef48fdf → 0.49.0-alpha-20230505181403-af18bf2

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @graphprotocol/graph-cli
 
-## 0.49.0-alpha-20230505152117-ef48fdf
+## 0.49.0-alpha-20230505181403-af18bf2
 
 ### Minor Changes
 
@@ -9,23 +9,48 @@
   Thanks [@saihaj](https://github.com/saihaj)! - do not generate types, instead show a message to
   user to use substreams CLI for codegen.
 
+- [#1335](https://github.com/graphprotocol/graph-tooling/pull/1335)
+  [`6bd042b`](https://github.com/graphprotocol/graph-tooling/commit/6bd042bb5dd8facff02450c874e8811aebc83fcc)
+  Thanks [@saihaj](https://github.com/saihaj)! - For substreams generate the directory tree as
+  follows
+
+  ```
+  .
+  ├── package.json
+  ├── schema.graphql
+  └── subgraph.yaml
+  ```
+
+  In the `package.json` we only depend on the CLI since that is what developer will use to deploy
+  the subgraph. The `schema.graphql` is the schema of the subgraph and the `subgraph.yaml` is the
+  manifest file for the subgraph.
+
+- [#1335](https://github.com/graphprotocol/graph-tooling/pull/1335)
+  [`affcb14`](https://github.com/graphprotocol/graph-tooling/commit/affcb1492f29affdb2426e57a154f132362f24ef)
+  Thanks [@saihaj](https://github.com/saihaj)! - respect --abi flag instead of loading from
+  etherscan
+
+- [#1335](https://github.com/graphprotocol/graph-tooling/pull/1335)
+  [`f90dd75`](https://github.com/graphprotocol/graph-tooling/commit/f90dd757a558f4e66cc46780f13612309f45646a)
+  Thanks [@saihaj](https://github.com/saihaj)! - remove index events as entities for substreams
+
 - [#1306](https://github.com/graphprotocol/graph-tooling/pull/1306)
   [`f5e4b58`](https://github.com/graphprotocol/graph-tooling/commit/f5e4b58989edc5f3bb8211f1b912449e77832de8)
   Thanks [@saihaj](https://github.com/saihaj)! - Add loadInBlock function for entities as part of
   codegen
 
-- [#1339](https://github.com/graphprotocol/graph-tooling/pull/1339)
-  [`214cd71`](https://github.com/graphprotocol/graph-tooling/commit/214cd7153aabd427b52c87f5f3643212cb615913)
-  Thanks [@saihaj](https://github.com/saihaj)! - allow deploy optimism and optimism-goerli on studio
+- [#1335](https://github.com/graphprotocol/graph-tooling/pull/1335)
+  [`f90dd75`](https://github.com/graphprotocol/graph-tooling/commit/f90dd757a558f4e66cc46780f13612309f45646a)
+  Thanks [@saihaj](https://github.com/saihaj)! - remove start block selection for substreams
 
 ### Patch Changes
 
-- [#1328](https://github.com/graphprotocol/graph-tooling/pull/1328)
-  [`4963215`](https://github.com/graphprotocol/graph-tooling/commit/4963215564797393424c563ea0b51aabbfd8e33e)
-  Thanks [@renovate](https://github.com/apps/renovate)! - dependencies updates:
+- [#1335](https://github.com/graphprotocol/graph-tooling/pull/1335)
+  [`aac26c9`](https://github.com/graphprotocol/graph-tooling/commit/aac26c97b5427156f8d61311924bac215155b4cb)
+  Thanks [@saihaj](https://github.com/saihaj)! - dependencies updates:
 
-  - Updated dependency [`@oclif/core@2.8.4` ↗︎](https://www.npmjs.com/package/@oclif/core/v/2.8.4)
-    (from `2.8.2`, in `dependencies`)
+  - Updated dependency [`gluegun@5.1.2` ↗︎](https://www.npmjs.com/package/gluegun/v/5.1.2) (from
+    `https://github.com/edgeandnode/gluegun#v4.3.1-pin-colors-dep`, in `dependencies`)
 
 - [#1331](https://github.com/graphprotocol/graph-tooling/pull/1331)
   [`b2c8dec`](https://github.com/graphprotocol/graph-tooling/commit/b2c8decb7806d25df6ca4e07f6dfdf7941516435)

package/dist/command-helpers/scaffold.d.ts

@@ -14,6 +14,14 @@ export declare const generateScaffold: ({ protocolInstance, abi, contract, netwo
     startBlock?: string | undefined;
     node?: string | undefined;
 }, spinner: Spinner) => Promise<{
+    'subgraph.yaml': string;
+    'schema.graphql': string;
+    'package.json': string;
+    'tsconfig.json'?: undefined;
+    src?: undefined;
+    abis?: undefined;
+    tests?: undefined;
+} | {
     'package.json': string;
     'subgraph.yaml': string;
     'schema.graphql': string;

package/dist/command-helpers/studio.d.ts

@@ -1,4 +1,4 @@
-export declare const allowedStudioNetworks: readonly ["mainnet", "rinkeby", "goerli", "gnosis", "chapel", "optimism-goerli", "clover", "fantom", "matic", "fantom-testnet", "arbitrum-goerli", "fuji", "celo-alfajores", "mumbai", "aurora-testnet", "near-testnet", "optimism", "optimism-goerli", "theta-testnet-001", "osmo-test-4", "base-testnet", "celo", "arbitrum-one", "avalanche", "zksync-era", "sepolia", "polygon-zkevm-testnet", "polygon-zkevm"];
+export declare const allowedStudioNetworks: readonly ["mainnet", "rinkeby", "goerli", "gnosis", "chapel", "optimism-goerli", "clover", "fantom", "matic", "fantom-testnet", "arbitrum-goerli", "fuji", "celo-alfajores", "mumbai", "aurora-testnet", "near-testnet", "theta-testnet-001", "osmo-test-4", "base-testnet", "celo", "arbitrum-one", "avalanche", "zksync-era", "sepolia", "polygon-zkevm-testnet", "polygon-zkevm"];
 export declare const validateStudioNetwork: ({ studio, product, network, }: {
     studio?: string | boolean | undefined;
     product?: string | undefined;

package/dist/command-helpers/studio.js

@@ -18,8 +18,6 @@ exports.allowedStudioNetworks = [
     'mumbai',
     'aurora-testnet',
     'near-testnet',
-    'optimism',
-    'optimism-goerli',
     'theta-testnet-001',
     'osmo-test-4',
     'base-testnet',

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';
@@ -85,8 +83,18 @@ class InitCommand extends core_1.Command {
         };
         // If all parameters are provided from the command-line,
         // go straight to creating the subgraph from the example
-        if (fromExample && subgraphName && directory) {
-            return await initSubgraphFromExample.bind(this)({ fromExample, allowSimpleName, directory, subgraphName, studio, product }, { commands });
+        if (fromExample && subgraphName && directory && protocol) {
+            await initSubgraphFromExample.bind(this)({
+                fromExample,
+                allowSimpleName,
+                directory,
+                subgraphName,
+                studio,
+                product,
+                protocolInstance: new protocols_1.default(protocol),
+            }, { commands });
+            // Exit with success
+            return this.exit(0);
         }
         // Will be assigned below if ethereum
         let abi;
@@ -122,7 +130,7 @@ class InitCommand extends core_1.Command {
                     }
                 }
             }
-            return await initSubgraphFromContract.bind(this)({
+            await initSubgraphFromContract.bind(this)({
                 protocolInstance,
                 abi,
                 allowSimpleName,
@@ -137,6 +145,8 @@ class InitCommand extends core_1.Command {
                 product,
                 startBlock,
             }, { commands, addContract: false });
+            // Exit with success
+            return this.exit(0);
         }
         // Otherwise, take the user through the interactive form
         const answers = await processInitForm.bind(this)({
@@ -145,6 +155,7 @@ class InitCommand extends core_1.Command {
             studio,
             node,
             abi,
+            abiPath,
             allowSimpleName,
             directory,
             contract: fromContract,
@@ -166,6 +177,7 @@ class InitCommand extends core_1.Command {
                 directory: answers.directory,
                 studio: answers.studio,
                 product: answers.product,
+                protocolInstance: answers.protocolInstance,
             }, { commands });
         }
         else {
@@ -191,6 +203,8 @@ class InitCommand extends core_1.Command {
                 startBlock: answers.startBlock,
             }, { commands, addContract: true });
         }
+        // Exit with success
+        this.exit(0);
     }
 }
 InitCommand.description = 'Creates a new subgraph with basic scaffolding.';
@@ -265,227 +279,255 @@ 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, abiPath: initAbiPath, 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 isSubstreams = protocol === 'substreams';
+        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;
+                    ?.toArray() || ['mainnet'],
+                skip: initFromExample !== undefined,
+                result: value => {
+                    if (initNetwork)
+                        return initNetwork;
+                    return value;
+                },
             },
-            result: async (value) => {
-                if (fromExample !== undefined) {
+        ]);
+        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() || isSubstreams,
+                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 || isSubstreams || initAbiPath) {
+                        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);
+                            }
+                        }
+                        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
+                        }
+                    }
                     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 { abi: abiFromFile } = await gluegun_1.prompt.ask([
+            {
+                type: 'input',
+                name: 'abi',
+                message: 'ABI file (path)',
+                initial: initAbi,
+                skip: () => !protocolInstance.hasABIs() ||
+                    initFromExample !== undefined ||
+                    abiFromEtherscan !== undefined ||
+                    isSubstreams ||
+                    !!initAbiPath,
+                validate: async (value) => {
+                    if (initFromExample || abiFromEtherscan || !protocolInstance.hasABIs()) {
+                        return true;
+                    }
+                    const ABI = protocolInstance.getABI();
+                    if (initAbiPath) {
+                        try {
+                            loadAbiFromFile(ABI, initAbiPath);
+                            return true;
                         }
-                        else {
-                            abiFromEtherscan = await (0, abi_1.loadAbiFromEtherscan)(ABI, network, value);
+                        catch (e) {
+                            this.error(e.message);
                         }
                     }
+                    try {
+                        loadAbiFromFile(ABI, value);
+                        return true;
+                    }
                     catch (e) {
-                        // noop
+                        this.error(e.message);
+                    }
+                },
+                result: async (value) => {
+                    if (initFromExample || abiFromEtherscan || !protocolInstance.hasABIs()) {
+                        return null;
+                    }
+                    const ABI = protocolInstance.getABI();
+                    if (initAbiPath) {
+                        try {
+                            return loadAbiFromFile(ABI, initAbiPath);
+                        }
+                        catch (e) {
+                            return e.message;
+                        }
                     }
-                }
-                // If startBlock is not set, try to load it.
-                if (!startBlock) {
                     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 || isSubstreams,
+                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' || isSubstreams,
+                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 || isSubstreams,
             },
-        },
-    ];
-    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) {
@@ -563,7 +605,8 @@ Subgraph ${subgraphName} created in ${relativeDir}
 
 Make sure to visit the documentation on https://thegraph.com/docs/ for further information.`);
 }
-async function initSubgraphFromExample({ fromExample, allowSimpleName, subgraphName, directory, studio, product, }, { commands, }) {
+async function initSubgraphFromExample({ protocolInstance, fromExample, allowSimpleName, subgraphName, directory, studio, product, }, { commands, }) {
+    const isSubstreams = protocolInstance.name === 'substreams';
     // Fail if the subgraph name is invalid
     if (!revalidateSubgraphName.bind(this)(subgraphName, { allowSimpleName })) {
         process.exitCode = 1;
@@ -656,15 +699,18 @@ async function initSubgraphFromExample({ fromExample, allowSimpleName, subgraphN
         this.exit(1);
         return;
     }
-    // Run code-generation
-    const codegen = await runCodegen(directory, commands.codegen);
-    if (codegen !== true) {
-        this.exit(1);
-        return;
+    if (!isSubstreams) {
+        // Run code-generation
+        const codegen = await runCodegen(directory, commands.codegen);
+        if (codegen !== true) {
+            this.exit(1);
+            return;
+        }
     }
     printNextSteps.bind(this)({ subgraphName, directory }, { commands });
 }
 async function initSubgraphFromContract({ protocolInstance, allowSimpleName, subgraphName, directory, abi, network, contract, indexEvents, contractName, node, studio, product, startBlock, }, { commands, addContract, }) {
+    const isSubstreams = protocolInstance.name === 'substreams';
     // Fail if the subgraph name is invalid
     if (!revalidateSubgraphName.bind(this)(subgraphName, { allowSimpleName })) {
         this.exit(1);
@@ -730,14 +776,17 @@ async function initSubgraphFromContract({ protocolInstance, allowSimpleName, sub
         this.exit(1);
         return;
     }
-    // Run code-generation
-    const codegen = await runCodegen(directory, commands.codegen);
-    if (codegen !== true) {
-        this.exit(1);
-        return;
-    }
-    while (addContract) {
-        addContract = await addAnotherContract.bind(this)({ protocolInstance, directory });
+    // Substreams we have nothing to install or generate
+    if (!isSubstreams) {
+        // Run code-generation
+        const codegen = await runCodegen(directory, commands.codegen);
+        if (codegen !== true) {
+            this.exit(1);
+            return;
+        }
+        while (addContract) {
+            addContract = await addAnotherContract.bind(this)({ protocolInstance, directory });
+        }
     }
     printNextSteps.bind(this)({ subgraphName, directory }, { commands });
 }

package/dist/scaffold/index.d.ts

@@ -23,6 +23,7 @@ export default class Scaffold {
     startBlock?: string;
     constructor(options: ScaffoldOptions);
     generatePackageJson(): string;
+    generatePackageJsonForSubstreams(): string;
     generateManifest(): string;
     generateSchema(): string;
     generateTsConfig(): string;
@@ -37,6 +38,14 @@ export default class Scaffold {
         [x: string]: string;
     } | undefined;
     generate(): {
+        'subgraph.yaml': string;
+        'schema.graphql': string;
+        'package.json': string;
+        'tsconfig.json'?: undefined;
+        src?: undefined;
+        abis?: undefined;
+        tests?: undefined;
+    } | {
         'package.json': string;
         'subgraph.yaml': string;
         'schema.graphql': string;

package/dist/scaffold/index.js

@@ -51,6 +51,26 @@ class Scaffold {
             devDependencies: this.protocol.hasEvents() ? { 'matchstick-as': `0.5.0` } : undefined,
         }), { parser: 'json' });
     }
+    generatePackageJsonForSubstreams() {
+        return prettier_1.default.format(JSON.stringify({
+            name: (0, subgraph_1.getSubgraphBasename)(String(this.subgraphName)),
+            license: 'UNLICENSED',
+            scripts: {
+                build: 'graph build',
+                deploy: `graph deploy ` + `--node ${this.node} ` + this.subgraphName,
+                'create-local': `graph create --node http://localhost:8020/ ${this.subgraphName}`,
+                'remove-local': `graph remove --node http://localhost:8020/ ${this.subgraphName}`,
+                'deploy-local': `graph deploy ` +
+                    `--node http://localhost:8020/ ` +
+                    `--ipfs http://localhost:5001 ` +
+                    this.subgraphName,
+                test: 'graph test',
+            },
+            dependencies: {
+                '@graphprotocol/graph-cli': GRAPH_CLI_VERSION,
+            },
+        }), { parser: 'json' });
+    }
     generateManifest() {
         const protocolManifest = this.protocol.getManifestScaffold();
         return prettier_1.default.format(`
@@ -115,6 +135,13 @@ dataSources:
             : undefined;
     }
     generate() {
+        if (this.protocol.name === 'substreams') {
+            return {
+                'subgraph.yaml': this.generateManifest(),
+                'schema.graphql': this.generateSchema(),
+                'package.json': this.generatePackageJsonForSubstreams(),
+            };
+        }
         return {
             'package.json': this.generatePackageJson(),
             'subgraph.yaml': this.generateManifest(),

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.49.0-alpha-20230505152117-ef48fdf",
+  "version": "0.49.0-alpha-20230505181403-af18bf2",
   "commands": {
     "add": {
       "id": "add",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.49.0-alpha-20230505152117-ef48fdf",
+  "version": "0.49.0-alpha-20230505181403-af18bf2",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {
@@ -20,7 +20,7 @@
   ],
   "dependencies": {
     "@float-capital/float-subgraph-uncrashable": "^0.0.0-alpha.4",
-    "@oclif/core": "2.8.4",
+    "@oclif/core": "2.8.2",
     "@whatwg-node/fetch": "^0.8.4",
     "assemblyscript": "0.19.23",
     "binary-install-raw": "0.0.13",
@@ -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",