@graphprotocol/graph-cli 0.73.0 → 0.74.0-alpha-20240608081136-69147a6

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @graphprotocol/graph-cli
 
+## 0.74.0-alpha-20240608081136-69147a6
+
+### Minor Changes
+
+- [#1680](https://github.com/graphprotocol/graph-tooling/pull/1680)
+  [`69147a6`](https://github.com/graphprotocol/graph-tooling/commit/69147a64b35622d423936145fc0b2465a2afab17)
+  Thanks [@saihaj](https://github.com/saihaj)! - Breaking changes to the CLI to prepare for the
+  sunset of the hosted service.
+
+  - `graph auth`
+    - Removed `--product` flag
+    - Removed `--studio` flag
+    - Removed `node` argument
+  - `graph deploy`
+    - Removed `--product` flag
+    - Removed `--studio` flag
+    - Removed `--from-hosted-service` flag
+  - `graph init`
+    - Removed `--product` flag
+    - Removed `--studio` flag
+    - Removed `--allow-simple-name` flag
+
 ## 0.73.0
 
 ### Minor Changes

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

@@ -3,19 +3,8 @@ import { URL } from 'url';
 export declare const SUBGRAPH_STUDIO_URL = "https://api.studio.thegraph.com/deploy/";
 export declare const validateNodeUrl: (node: string) => URL;
 export declare const normalizeNodeUrl: (node: string) => string;
-export declare function chooseNodeUrl({ product, studio, node, allowSimpleName, }: {
-    product: string | undefined;
-    studio: boolean | undefined;
+export declare function chooseNodeUrl({ node, }: {
     node?: string;
-    allowSimpleName?: boolean;
 }): {
-    node: string | undefined;
-    allowSimpleName: boolean | undefined;
+    node: string;
 };
-export declare function getHostedServiceSubgraphId({ subgraphName, }: {
-    subgraphName: string;
-}): Promise<{
-    subgraph: string;
-    synced: boolean;
-    health: 'healthy' | 'unhealthy' | 'failed';
-}>;

package/dist/command-helpers/node.js

@@ -1,74 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHostedServiceSubgraphId = exports.chooseNodeUrl = exports.normalizeNodeUrl = exports.validateNodeUrl = exports.SUBGRAPH_STUDIO_URL = void 0;
+exports.chooseNodeUrl = exports.normalizeNodeUrl = exports.validateNodeUrl = exports.SUBGRAPH_STUDIO_URL = void 0;
 const url_1 = require("url");
 const gluegun_1 = require("gluegun");
-const constants_1 = require("../constants");
 exports.SUBGRAPH_STUDIO_URL = 'https://api.studio.thegraph.com/deploy/';
-const HOSTED_SERVICE_URL = 'https://api.thegraph.com/deploy/';
-const HOSTED_SERVICE_INDEX_NODE_URL = 'https://api.thegraph.com/index-node/graphql';
 const validateNodeUrl = (node) => new url_1.URL(node);
 exports.validateNodeUrl = validateNodeUrl;
 const normalizeNodeUrl = (node) => new url_1.URL(node).toString();
 exports.normalizeNodeUrl = normalizeNodeUrl;
-function chooseNodeUrl({ product, studio, node, allowSimpleName, }) {
+function chooseNodeUrl({ node, }) {
     if (node) {
         try {
             (0, exports.validateNodeUrl)(node);
+            return { node };
         }
         catch (e) {
             gluegun_1.print.error(`Graph node "${node}" is invalid: ${e.message}`);
             process.exit(1);
         }
     }
-    else {
-        if (studio) {
-            product = 'subgraph-studio';
-        }
-        switch (product) {
-            case 'subgraph-studio':
-                node = exports.SUBGRAPH_STUDIO_URL;
-                break;
-            case 'hosted-service':
-                node = HOSTED_SERVICE_URL;
-                break;
-        }
-    }
-    if (node?.match(/studio/) || product === 'subgraph-studio') {
-        allowSimpleName = true;
-    }
-    return { node, allowSimpleName };
+    return { node: exports.SUBGRAPH_STUDIO_URL };
 }
 exports.chooseNodeUrl = chooseNodeUrl;
-async function getHostedServiceSubgraphId({ subgraphName, }) {
-    const response = await fetch(HOSTED_SERVICE_INDEX_NODE_URL, {
-        method: 'POST',
-        body: JSON.stringify({
-            query: /* GraphQL */ `
-        query GraphCli_getSubgraphId($subgraphName: String!) {
-          indexingStatusForCurrentVersion(subgraphName: $subgraphName) {
-            subgraph
-            synced
-            health
-          }
-        }
-      `,
-            variables: {
-                subgraphName,
-            },
-        }),
-        headers: {
-            'content-type': 'application/json',
-            ...constants_1.GRAPH_CLI_SHARED_HEADERS,
-        },
-    });
-    const { data, errors } = await response.json();
-    if (errors) {
-        throw new Error(errors[0].message);
-    }
-    if (!data.indexingStatusForCurrentVersion) {
-        throw new Error(`Subgraph "${subgraphName}" not found on the hosted service`);
-    }
-    return data.indexingStatusForCurrentVersion;
-}
-exports.getHostedServiceSubgraphId = getHostedServiceSubgraphId;

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

@@ -1,4 +1 @@
-export declare const validateSubgraphName: (name: string, { allowSimpleName }: {
-    allowSimpleName?: boolean | undefined;
-}) => string | undefined;
 export declare const getSubgraphBasename: (name: string) => string;

package/dist/command-helpers/subgraph.js

@@ -1,20 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSubgraphBasename = exports.validateSubgraphName = void 0;
-const validateSubgraphName = (name, { allowSimpleName }) => {
-    if (allowSimpleName) {
-        return name;
-    }
-    if (name.split('/').length !== 2) {
-        throw new Error(`Subgraph name "${name}" needs to have the format "<PREFIX>/${name}".
-
-When using the Hosted Service at https://thegraph.com, <PREFIX> is the
-name of your GitHub user or organization.
-
-You can bypass this check with --allow-simple-name.`);
-    }
-};
-exports.validateSubgraphName = validateSubgraphName;
+exports.getSubgraphBasename = void 0;
 const getSubgraphBasename = (name) => {
     const segments = name.split('/', 2);
     return segments[segments.length - 1];

package/dist/commands/auth.d.ts

@@ -2,13 +2,10 @@ import { Command } from '@oclif/core';
 export default class AuthCommand extends Command {
     static description: string;
     static args: {
-        node: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
         'deploy-key': import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
     };
     static flags: {
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
-        product: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        studio: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/dist/commands/auth.js

@@ -6,23 +6,8 @@ const auth_1 = require("../command-helpers/auth");
 const node_1 = require("../command-helpers/node");
 class AuthCommand extends core_1.Command {
     async run() {
-        const { args: { node: nodeOrDeployKey, 'deploy-key': deployKeyFlag }, flags: { product, studio }, } = await this.parse(AuthCommand);
-        // if user specifies --product or --studio then deployKey is the first parameter
-        let node;
-        let deployKey = deployKeyFlag;
-        if (product || studio) {
-            ({ node } = (0, node_1.chooseNodeUrl)({ product, studio, node }));
-            deployKey = nodeOrDeployKey;
-        }
-        else {
-            node = nodeOrDeployKey;
-        }
-        // eslint-disable-next-line -- prettier has problems with ||=
-        node =
-            node ||
-                (await core_1.ux.prompt('Which product to initialize?', {
-                    required: true,
-                }));
+        let { args: { 'deploy-key': deployKey }, } = await this.parse(AuthCommand);
+        const { node } = (0, node_1.chooseNodeUrl)({});
         // eslint-disable-next-line -- prettier has problems with ||=
         deployKey =
             deployKey ||
@@ -44,26 +29,11 @@ class AuthCommand extends core_1.Command {
 }
 AuthCommand.description = 'Sets the deploy key to use when deploying to a Graph node.';
 AuthCommand.args = {
-    node: core_1.Args.string(),
     'deploy-key': core_1.Args.string(),
 };
 AuthCommand.flags = {
     help: core_1.Flags.help({
         char: 'h',
     }),
-    product: core_1.Flags.string({
-        summary: 'Select a product for which to authenticate.',
-        options: ['subgraph-studio', 'hosted-service'],
-        deprecated: {
-            message: 'In next major version, this flag will be removed. By default we will deploy to the Graph Studio. Learn more about Sunrise of Decentralized Data https://thegraph.com/blog/unveiling-updated-sunrise-decentralized-data/',
-        },
-    }),
-    studio: core_1.Flags.boolean({
-        summary: 'Shortcut for "--product subgraph-studio".',
-        exclusive: ['product'],
-        deprecated: {
-            message: 'In next major version, this flag will be removed. By default we will deploy to the Graph Studio. Learn more about Sunrise of Decentralized Data https://thegraph.com/blog/unveiling-updated-sunrise-decentralized-data/',
-        },
-    }),
 };
 exports.default = AuthCommand;

package/dist/commands/deploy.d.ts

@@ -7,8 +7,6 @@ export default class DeployCommand extends Command {
     };
     static flags: {
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
-        product: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        studio: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         node: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         'deploy-key': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         'access-token': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
@@ -22,7 +20,6 @@ export default class DeployCommand extends Command {
         watch: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         network: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         'network-file': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'from-hosted-service': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/dist/commands/deploy.js

@@ -48,138 +48,15 @@ const headersFlag = core_1.Flags.custom({
     parse: val => JSON.parse(val),
     default: {},
 });
-const productOptions = ['subgraph-studio', 'hosted-service'];
 const deployDebugger = (0, debug_1.default)('graph-cli:deploy');
 class DeployCommand extends core_1.Command {
     async run() {
-        const { args: { 'subgraph-name': subgraphNameArg, 'subgraph-manifest': manifest }, flags: { product: productFlag, studio, 'deploy-key': deployKeyFlag, 'access-token': accessToken, 'version-label': versionLabelFlag, ipfs, headers, node: nodeFlag, 'output-dir': outputDir, 'skip-migrations': skipMigrations, watch, 'debug-fork': debugFork, network, 'network-file': networkFile, 'ipfs-hash': ipfsHash, 'from-hosted-service': hostedServiceSubgraphName, }, } = await this.parse(DeployCommand);
-        if (hostedServiceSubgraphName) {
-            const { health, subgraph: subgraphIpfsHash } = await (0, node_1.getHostedServiceSubgraphId)({
-                subgraphName: hostedServiceSubgraphName,
-            });
-            const safeToDeployFailedSubgraph = health === 'failed'
-                ? await core_1.ux.confirm('This subgraph has failed indexing on hosted service. Do you wish to continue the deploy?')
-                : true;
-            if (!safeToDeployFailedSubgraph)
-                return;
-            const safeToDeployUnhealthySubgraph = health === 'unhealthy'
-                ? await core_1.ux.confirm('This subgraph is not healthy on hosted service. Do you wish to continue the deploy?')
-                : true;
-            if (!safeToDeployUnhealthySubgraph)
-                return;
-            const { node } = (0, node_1.chooseNodeUrl)({ studio: true, product: undefined });
-            // shouldn't happen, but we need to satisfy the compiler
-            if (!node) {
-                this.error('No node URL available');
-            }
-            const requestUrl = new url_1.URL(node);
-            const client = (0, jsonrpc_1.createJsonRpcClient)(requestUrl);
-            // Exit with an error code if the client couldn't be created
-            if (!client) {
-                this.error('Failed to create RPC client');
-            }
-            // Use the deploy key, if one is set
-            let deployKey = deployKeyFlag;
-            if (!deployKey && accessToken) {
-                deployKey = accessToken; // backwards compatibility
-            }
-            deployKey = await (0, auth_1.identifyDeployKey)(node, deployKey);
-            if (!deployKey) {
-                this.error('No deploy key available');
-            }
-            // @ts-expect-error options property seems to exist
-            client.options.headers = {
-                ...constants_1.GRAPH_CLI_SHARED_HEADERS,
-                Authorization: 'Bearer ' + deployKey,
-            };
-            const subgraphName = await core_1.ux.prompt('What is the name of the subgraph you want to deploy?', {
-                required: true,
-            });
-            // Ask for label if not on hosted service
-            const versionLabel = versionLabelFlag ||
-                (await core_1.ux.prompt('Which version label to use? (e.g. "v0.0.1")', {
-                    required: true,
-                }));
-            const spinner = gluegun_1.print.spin(`Deploying to Graph node ${requestUrl}`);
-            client.request('subgraph_deploy', {
-                name: subgraphName,
-                ipfs_hash: subgraphIpfsHash,
-                version_label: versionLabel,
-                debug_fork: debugFork,
-            }, async (
-            // @ts-expect-error TODO: why are the arguments not typed?
-            requestError, 
-            // @ts-expect-error TODO: why are the arguments not typed?
-            jsonRpcError, 
-            // @ts-expect-error TODO: why are the arguments not typed?
-            res) => {
-                deployDebugger('requestError: %O', requestError);
-                deployDebugger('jsonRpcError: %O', jsonRpcError);
-                if (jsonRpcError) {
-                    const message = jsonRpcError?.message || jsonRpcError?.code?.toString();
-                    deployDebugger('message: %O', message);
-                    let errorMessage = `Failed to deploy to Graph node ${requestUrl}: ${message}`;
-                    // Provide helpful advice when the subgraph has not been created yet
-                    if (message?.match(/subgraph name not found/)) {
-                        errorMessage += `
-        Make sure to create the subgraph first by running the following command:
-        $ graph create --node ${node} ${subgraphName}`;
-                    }
-                    if (message?.match(/auth failure/)) {
-                        errorMessage += '\nYou may need to authenticate first.';
-                    }
-                    spinner.fail(errorMessage);
-                    process.exit(1);
-                }
-                else if (requestError) {
-                    spinner.fail(`HTTP error deploying the subgraph ${requestError.code}`);
-                    process.exit(1);
-                }
-                else {
-                    spinner.stop();
-                    const base = requestUrl.protocol + '//' + requestUrl.hostname;
-                    let playground = res.playground;
-                    let queries = res.queries;
-                    // Add a base URL if graph-node did not return the full URL
-                    if (playground.charAt(0) === ':') {
-                        playground = base + playground;
-                    }
-                    if (queries.charAt(0) === ':') {
-                        queries = base + queries;
-                    }
-                    gluegun_1.print.success(`Deployed to ${playground}`);
-                    gluegun_1.print.info('\nSubgraph endpoints:');
-                    gluegun_1.print.info(`Queries (HTTP):     ${queries}`);
-                    gluegun_1.print.info(``);
-                    process.exit(0);
-                }
-            });
-            return;
-        }
+        const { args: { 'subgraph-name': subgraphNameArg, 'subgraph-manifest': manifest }, flags: { 'deploy-key': deployKeyFlag, 'access-token': accessToken, 'version-label': versionLabelFlag, ipfs, headers, node: nodeFlag, 'output-dir': outputDir, 'skip-migrations': skipMigrations, watch, 'debug-fork': debugFork, network, 'network-file': networkFile, 'ipfs-hash': ipfsHash, }, } = await this.parse(DeployCommand);
         const subgraphName = subgraphNameArg ||
             (await core_1.ux.prompt('What is the subgraph name?', {
                 required: true,
             }));
-        // We are given a node URL, so we prioritize that over the product flag
-        const product = nodeFlag
-            ? productFlag
-            : studio
-                ? 'subgraph-studio'
-                : productFlag ||
-                    (await gluegun_1.prompt
-                        .ask([
-                        {
-                            name: 'product',
-                            message: 'Which product to deploy for?',
-                            required: true,
-                            type: 'select',
-                            choices: productOptions,
-                        },
-                    ])
-                        .then(({ product }) => product));
         const { node } = (0, node_1.chooseNodeUrl)({
-            product,
-            studio,
             node: nodeFlag,
         });
         if (!node) {
@@ -187,7 +64,6 @@ class DeployCommand extends core_1.Command {
             this.error('No Graph node provided');
         }
         const isStudio = node.match(/studio/);
-        const isHostedService = node.match(/thegraph.com/) && !isStudio;
         const requestUrl = new url_1.URL(node);
         const client = (0, jsonrpc_1.createJsonRpcClient)(requestUrl);
         // Exit with an error code if the client couldn't be created
@@ -210,11 +86,9 @@ class DeployCommand extends core_1.Command {
         }
         // Ask for label if not on hosted service
         let versionLabel = versionLabelFlag;
-        if (!versionLabel && !isHostedService) {
-            versionLabel = await core_1.ux.prompt('Which version label to use? (e.g. "v0.0.1")', {
-                required: true,
-            });
-        }
+        versionLabel || (versionLabel = await core_1.ux.prompt('Which version label to use? (e.g. "v0.0.1")', {
+            required: true,
+        }));
         const deploySubgraph = async (ipfsHash) => {
             const spinner = gluegun_1.print.spin(`Deploying to Graph node ${requestUrl}`);
             client.request('subgraph_deploy', {
@@ -235,18 +109,6 @@ class DeployCommand extends core_1.Command {
                     const message = jsonRpcError?.message || jsonRpcError?.code?.toString();
                     deployDebugger('message: %O', message);
                     let errorMessage = `Failed to deploy to Graph node ${requestUrl}: ${message}`;
-                    // Provide helpful advice when the subgraph has not been created yet
-                    if (message?.match(/subgraph name not found/)) {
-                        if (isHostedService) {
-                            errorMessage +=
-                                '\nYou may need to create it at https://thegraph.com/explorer/dashboard.';
-                        }
-                        else {
-                            errorMessage += `
-      Make sure to create the subgraph first by running the following command:
-      $ graph create --node ${node} ${subgraphName}`;
-                        }
-                    }
                     if (message?.match(/auth failure/)) {
                         errorMessage += '\nYou may need to authenticate first.';
                     }
@@ -269,12 +131,7 @@ class DeployCommand extends core_1.Command {
                     if (queries.charAt(0) === ':') {
                         queries = base + queries;
                     }
-                    if (isHostedService) {
-                        gluegun_1.print.success(`Deployed to https://thegraph.com/explorer/subgraph/${subgraphName}`);
-                    }
-                    else {
-                        gluegun_1.print.success(`Deployed to ${playground}`);
-                    }
+                    gluegun_1.print.success(`Deployed to ${playground}`);
                     gluegun_1.print.info('\nSubgraph endpoints:');
                     gluegun_1.print.info(`Queries (HTTP):     ${queries}`);
                     gluegun_1.print.info(``);
@@ -368,14 +225,6 @@ DeployCommand.flags = {
     help: core_1.Flags.help({
         char: 'h',
     }),
-    product: core_1.Flags.string({
-        summary: 'Select a product for which to authenticate.',
-        options: productOptions,
-    }),
-    studio: core_1.Flags.boolean({
-        summary: 'Shortcut for "--product subgraph-studio".',
-        exclusive: ['product'],
-    }),
     node: core_1.Flags.string({
         summary: 'Graph node for which to initialize.',
         char: 'g',
@@ -423,13 +272,9 @@ DeployCommand.flags = {
     network: core_1.Flags.string({
         summary: 'Network configuration to use from the networks config file.',
     }),
-    // TODO: should be networksFile (with an "s"), or?
     'network-file': core_1.Flags.file({
         summary: 'Networks config file path.',
         default: 'networks.json',
     }),
-    'from-hosted-service': core_1.Flags.string({
-        summary: 'Hosted service Subgraph Name to deploy to studio.',
-    }),
 };
 exports.default = DeployCommand;

package/dist/commands/init.d.ts

@@ -8,10 +8,7 @@ export default class InitCommand extends Command {
     static flags: {
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
         protocol: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        product: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        studio: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         node: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'allow-simple-name': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'from-contract': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         'from-example': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         'contract-name': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;

package/dist/commands/init.js

@@ -88,14 +88,10 @@ const DEFAULT_EXAMPLE_SUBGRAPH = 'ethereum-gravatar';
 class InitCommand extends core_1.Command {
     async run() {
         const { args: { subgraphName, directory }, flags, } = await this.parse(InitCommand);
-        const { protocol, product, studio, node: nodeFlag, 'allow-simple-name': allowSimpleNameFlag, 'from-contract': fromContract, 'contract-name': contractName, 'from-example': fromExample, 'index-events': indexEvents, 'skip-install': skipInstall, 'skip-git': skipGit, network, abi: abiPath, 'start-block': startBlock, spkg: spkgPath, } = flags;
+        const { protocol, node: nodeFlag, 'from-contract': fromContract, 'contract-name': contractName, 'from-example': fromExample, 'index-events': indexEvents, 'skip-install': skipInstall, 'skip-git': skipGit, network, abi: abiPath, 'start-block': startBlock, spkg: spkgPath, } = flags;
         initDebugger('Flags: %O', flags);
-        let { node, allowSimpleName } = (0, node_1.chooseNodeUrl)({
-            product,
-            // if we are loading example, we want to ensure we are using studio
-            studio: studio || fromExample !== undefined,
+        let { node } = (0, node_1.chooseNodeUrl)({
             node: nodeFlag,
-            allowSimpleName: allowSimpleNameFlag,
         });
         if (fromContract && fromExample) {
             this.error('Only one of "--from-example" and "--from-contract" can be used at a time.', {
@@ -128,7 +124,6 @@ class InitCommand extends core_1.Command {
         if (fromExample && subgraphName && directory) {
             await initSubgraphFromExample.bind(this)({
                 fromExample,
-                allowSimpleName,
                 directory,
                 subgraphName,
                 skipInstall,
@@ -174,7 +169,6 @@ class InitCommand extends core_1.Command {
             await initSubgraphFromContract.bind(this)({
                 protocolInstance,
                 abi,
-                allowSimpleName,
                 directory,
                 contract: fromContract,
                 indexEvents,
@@ -192,7 +186,6 @@ class InitCommand extends core_1.Command {
         }
         if (fromExample) {
             const answers = await processFromExampleInitForm.bind(this)({
-                allowSimpleName,
                 subgraphName,
                 directory,
             });
@@ -201,7 +194,6 @@ class InitCommand extends core_1.Command {
                 return;
             }
             await initSubgraphFromExample.bind(this)({
-                allowSimpleName,
                 fromExample,
                 subgraphName: answers.subgraphName,
                 directory: answers.directory,
@@ -213,12 +205,8 @@ class InitCommand extends core_1.Command {
             // 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,
@@ -233,15 +221,11 @@ class InitCommand extends core_1.Command {
                 this.exit(1);
                 return;
             }
-            ({ node, allowSimpleName } = (0, node_1.chooseNodeUrl)({
-                product: answers.product,
-                studio: answers.studio,
+            ({ node, } = (0, node_1.chooseNodeUrl)({
                 node,
-                allowSimpleName,
             }));
             await initSubgraphFromContract.bind(this)({
                 protocolInstance: answers.protocolInstance,
-                allowSimpleName,
                 subgraphName: answers.subgraphName,
                 directory: answers.directory,
                 abi: answers.abi,
@@ -272,31 +256,10 @@ InitCommand.flags = {
     protocol: core_1.Flags.string({
         options: protocolChoices,
     }),
-    product: core_1.Flags.string({
-        summary: 'Selects the product for which to initialize.',
-        options: ['subgraph-studio', 'hosted-service'],
-        deprecated: {
-            message: 'In next major version, this flag will be removed. By default we will deploy to the Graph Studio. Learn more about Sunrise of Decentralized Data https://thegraph.com/blog/unveiling-updated-sunrise-decentralized-data/',
-        },
-    }),
-    studio: core_1.Flags.boolean({
-        summary: 'Shortcut for "--product subgraph-studio".',
-        exclusive: ['product'],
-        deprecated: {
-            message: 'In next major version, this flag will be removed. By default we will deploy to the Graph Studio. Learn more about Sunrise of Decentralized Data https://thegraph.com/blog/unveiling-updated-sunrise-decentralized-data/',
-        },
-    }),
     node: core_1.Flags.string({
         summary: 'Graph node for which to initialize.',
         char: 'g',
     }),
-    'allow-simple-name': core_1.Flags.boolean({
-        description: 'Use a subgraph name without a prefix.',
-        default: false,
-        deprecated: {
-            message: 'In next major version, this flag will be removed. By default we will deploy to the Graph Studio. Learn more about Sunrise of Decentralized Data https://thegraph.com/blog/unveiling-updated-sunrise-decentralized-data/',
-        },
-    }),
     'from-contract': core_1.Flags.string({
         description: 'Creates a scaffold based on an existing contract.',
         exclusive: ['from-example'],
@@ -351,31 +314,14 @@ InitCommand.flags = {
     }),
 };
 exports.default = InitCommand;
-async function processFromExampleInitForm({ directory: initDirectory, subgraphName: initSubgraphName, allowSimpleName: initAllowSimpleName, }) {
+async function processFromExampleInitForm({ directory: initDirectory, subgraphName: initSubgraphName, }) {
     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([
@@ -417,7 +363,7 @@ async function retryWithPrompt(func) {
     }
     return undefined;
 }
-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, }) {
+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;
     try {
         const { protocol } = await gluegun_1.prompt.ask({
@@ -438,57 +384,12 @@ async function processInitForm({ protocol: initProtocol, product: initProduct, s
         const protocolInstance = new protocols_1.default(protocol);
         const isSubstreams = protocol === 'substreams';
         initDebugger.extend('processInitForm')('isSubstreams: %O', isSubstreams);
-        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;
-                },
-            },
-        ]);
         const { subgraphName } = await gluegun_1.prompt.ask([
             {
                 type: 'input',
                 name: 'subgraphName',
-                message: () => (product == 'subgraph-studio' ? 'Subgraph slug' : 'Subgraph name'),
+                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([
@@ -502,7 +403,7 @@ async function processInitForm({ protocol: initProtocol, product: initProduct, s
                     : true,
             },
         ]);
-        let choices = (await AVAILABLE_NETWORKS())?.[product === 'subgraph-studio' ? 'studio' : 'hostedService'];
+        let choices = (await AVAILABLE_NETWORKS())?.['studio'];
         if (!choices) {
             this.error('Unable to fetch available networks from API. Please report this issue. As a workaround you can pass `--network` flag from the available networks: https://thegraph.com/docs/en/developing/supported-networks', { exit: 1 });
         }
@@ -690,10 +591,8 @@ async function processInitForm({ protocol: initProtocol, product: initProduct, s
             protocolInstance,
             subgraphName,
             directory,
-            studio: product === 'subgraph-studio',
             startBlock,
             fromExample: !!initFromExample,
-            product,
             network,
             contractName,
             contract,
@@ -720,21 +619,6 @@ const loadAbiFromFile = (ABI, filename) => {
         return ABI.load('Contract', filename);
     }
 };
-function revalidateSubgraphName(subgraphName, { allowSimpleName }) {
-    // Fail if the subgraph name is invalid
-    try {
-        (0, subgraph_1.validateSubgraphName)(subgraphName, { allowSimpleName });
-        return true;
-    }
-    catch (e) {
-        this.error(`${e.message}
-
-  Examples:
-
-    $ graph init ${os_1.default.userInfo().username}/${subgraphName}
-    $ graph init ${subgraphName} --allow-simple-name`);
-    }
-}
 // Inspired from: https://github.com/graphprotocol/graph-tooling/issues/1450#issuecomment-1713992618
 async function isInRepo() {
     try {
@@ -800,12 +684,7 @@ 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, skipInstall, skipGit, }, { commands, }) {
-    // Fail if the subgraph name is invalid
-    if (!revalidateSubgraphName.bind(this)(subgraphName, { allowSimpleName })) {
-        process.exitCode = 1;
-        return;
-    }
+async function initSubgraphFromExample({ fromExample, subgraphName, directory, skipInstall, skipGit, }, { commands, }) {
     // Fail if the output directory already exists
     if (gluegun_1.filesystem.exists(directory)) {
         this.error(`Directory or file "${directory}" already exists`, { exit: 1 });
@@ -898,13 +777,8 @@ async function initSubgraphFromExample({ fromExample, allowSimpleName, subgraphN
     }
     printNextSteps.bind(this)({ subgraphName, directory }, { commands });
 }
-async function initSubgraphFromContract({ protocolInstance, allowSimpleName, subgraphName, directory, abi, network, contract, indexEvents, contractName, node, startBlock, spkgPath, skipInstall, skipGit, }, { commands, addContract, }) {
+async function initSubgraphFromContract({ protocolInstance, subgraphName, directory, abi, network, contract, indexEvents, contractName, node, startBlock, spkgPath, skipInstall, skipGit, }, { commands, addContract, }) {
     const isSubstreams = protocolInstance.name === 'substreams';
-    // Fail if the subgraph name is invalid
-    if (!revalidateSubgraphName.bind(this)(subgraphName, { allowSimpleName })) {
-        this.exit(1);
-        return;
-    }
     // Fail if the output directory already exists
     if (gluegun_1.filesystem.exists(directory)) {
         this.error(`Directory or file "${directory}" already exists`, { exit: 1 });

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.73.0",
+  "version": "0.74.0-alpha-20240608081136-69147a6",
   "commands": {
     "add": {
       "id": "add",
@@ -77,37 +77,9 @@
           "char": "h",
           "description": "Show CLI help.",
           "allowNo": false
-        },
-        "product": {
-          "name": "product",
-          "type": "option",
-          "summary": "Select a product for which to authenticate.",
-          "multiple": false,
-          "options": [
-            "subgraph-studio",
-            "hosted-service"
-          ],
-          "deprecated": {
-            "message": "In next major version, this flag will be removed. By default we will deploy to the Graph Studio. Learn more about Sunrise of Decentralized Data https://thegraph.com/blog/unveiling-updated-sunrise-decentralized-data/"
-          }
-        },
-        "studio": {
-          "name": "studio",
-          "type": "boolean",
-          "summary": "Shortcut for \"--product subgraph-studio\".",
-          "allowNo": false,
-          "exclusive": [
-            "product"
-          ],
-          "deprecated": {
-            "message": "In next major version, this flag will be removed. By default we will deploy to the Graph Studio. Learn more about Sunrise of Decentralized Data https://thegraph.com/blog/unveiling-updated-sunrise-decentralized-data/"
-          }
         }
       },
       "args": {
-        "node": {
-          "name": "node"
-        },
         "deploy-key": {
           "name": "deploy-key"
         }
@@ -345,25 +317,6 @@
           "description": "Show CLI help.",
           "allowNo": false
         },
-        "product": {
-          "name": "product",
-          "type": "option",
-          "summary": "Select a product for which to authenticate.",
-          "multiple": false,
-          "options": [
-            "subgraph-studio",
-            "hosted-service"
-          ]
-        },
-        "studio": {
-          "name": "studio",
-          "type": "boolean",
-          "summary": "Shortcut for \"--product subgraph-studio\".",
-          "allowNo": false,
-          "exclusive": [
-            "product"
-          ]
-        },
         "node": {
           "name": "node",
           "type": "option",
@@ -463,12 +416,6 @@
           "summary": "Networks config file path.",
           "multiple": false,
           "default": "networks.json"
-        },
-        "from-hosted-service": {
-          "name": "from-hosted-service",
-          "type": "option",
-          "summary": "Hosted service Subgraph Name to deploy to studio.",
-          "multiple": false
         }
       },
       "args": {
@@ -509,31 +456,6 @@
             "substreams"
           ]
         },
-        "product": {
-          "name": "product",
-          "type": "option",
-          "summary": "Selects the product for which to initialize.",
-          "multiple": false,
-          "options": [
-            "subgraph-studio",
-            "hosted-service"
-          ],
-          "deprecated": {
-            "message": "In next major version, this flag will be removed. By default we will deploy to the Graph Studio. Learn more about Sunrise of Decentralized Data https://thegraph.com/blog/unveiling-updated-sunrise-decentralized-data/"
-          }
-        },
-        "studio": {
-          "name": "studio",
-          "type": "boolean",
-          "summary": "Shortcut for \"--product subgraph-studio\".",
-          "allowNo": false,
-          "exclusive": [
-            "product"
-          ],
-          "deprecated": {
-            "message": "In next major version, this flag will be removed. By default we will deploy to the Graph Studio. Learn more about Sunrise of Decentralized Data https://thegraph.com/blog/unveiling-updated-sunrise-decentralized-data/"
-          }
-        },
         "node": {
           "name": "node",
           "type": "option",
@@ -541,15 +463,6 @@
           "summary": "Graph node for which to initialize.",
           "multiple": false
         },
-        "allow-simple-name": {
-          "name": "allow-simple-name",
-          "type": "boolean",
-          "description": "Use a subgraph name without a prefix.",
-          "allowNo": false,
-          "deprecated": {
-            "message": "In next major version, this flag will be removed. By default we will deploy to the Graph Studio. Learn more about Sunrise of Decentralized Data https://thegraph.com/blog/unveiling-updated-sunrise-decentralized-data/"
-          }
-        },
         "from-contract": {
           "name": "from-contract",
           "type": "option",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.73.0",
+  "version": "0.74.0-alpha-20240608081136-69147a6",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {