@graphprotocol/graph-cli 0.38.1-alpha-20230208031159-e8f0545 → 0.38.1-alpha-20230208031649-b554fda

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @graphprotocol/graph-cli
 
-## 0.38.1-alpha-20230208031159-e8f0545
+## 0.38.1-alpha-20230208031649-b554fda
 
 ### Patch Changes
 

package/dist/commands/create.js

@@ -45,7 +45,7 @@ class CreateCommand extends core_1.Command {
                 this.exit(1);
             }
             else {
-                core_1.ux.action.stop();
+                core_1.ux.action.stop('Subgraph created');
                 this.exit(1);
             }
         });

package/dist/commands/remove.js

@@ -1,74 +1,33 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const url_1 = require("url");
-const chalk_1 = __importDefault(require("chalk"));
+const core_1 = require("@oclif/core");
 const auth_1 = require("../command-helpers/auth");
 const jsonrpc_1 = require("../command-helpers/jsonrpc");
 const node_1 = require("../command-helpers/node");
-const HELP = `
-${chalk_1.default.bold('graph remove')} ${chalk_1.default.dim('[options]')} ${chalk_1.default.bold('<subgraph-name>')}
-
-${chalk_1.default.dim('Options:')}
-
-      --access-token <token>    Graph access token
-  -h, --help                    Show usage information
-  -g, --node <url>              Graph node to create the subgraph in
-`;
-exports.default = {
-    description: 'Unregisters a subgraph name',
-    run: async (toolbox) => {
-        // Obtain tools
-        const { print } = toolbox;
-        // Read CLI parameters
-        let { accessToken, g, h, help, node } = toolbox.parameters.options;
-        const subgraphName = toolbox.parameters.first;
-        // Support both long and short option variants
-        help || (help = h);
-        node || (node = g);
-        // Show help text if requested
-        if (help) {
-            print.info(HELP);
-            return;
-        }
-        // Validate the subgraph name
-        if (!subgraphName) {
-            print.error('No subgraph name provided');
-            print.info(HELP);
-            process.exitCode = 1;
-            return;
-        }
-        // Validate node
-        if (!node) {
-            print.error(`No Graph node provided`);
-            print.info(HELP);
-            process.exitCode = 1;
-            return;
-        }
+class RemoveCommand extends core_1.Command {
+    async run() {
+        const { args: { 'subgraph-name': subgraphName }, flags: { 'access-token': accessTokenFlag, node }, } = await this.parse(RemoveCommand);
         try {
             (0, node_1.validateNodeUrl)(node);
         }
         catch (e) {
-            print.error(`Graph node "${node}" is invalid: ${e.message}`);
-            process.exitCode = 1;
-            return;
+            this.error(`Graph node "${node}" is invalid: ${e.message}`, { exit: 1 });
         }
         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) {
-            process.exitCode = 1;
+            this.exit(1);
             return;
         }
         // Use the access token, if one is set
-        accessToken = await (0, auth_1.identifyDeployKey)(node, accessToken);
+        const accessToken = await (0, auth_1.identifyDeployKey)(node, accessTokenFlag);
         if (accessToken !== undefined && accessToken !== null) {
             // @ts-expect-error options property seems to exist
             client.options.headers = { Authorization: `Bearer ${accessToken}` };
         }
-        const spinner = print.spin(`Creating subgraph in Graph node: ${requestUrl}`);
+        core_1.ux.action.start(`Removing subgraph in Graph node: ${requestUrl}`);
         client.request('subgraph_remove', { name: subgraphName }, (
         // @ts-expect-error TODO: why are the arguments not typed?
         requestError, 
@@ -79,17 +38,34 @@ exports.default = {
         // @ts-expect-error TODO: why are the arguments not typed?
         _res) => {
             if (jsonRpcError) {
-                spinner.fail(`Error removing the subgraph: ${jsonRpcError.message}`);
-                process.exitCode = 1;
+                core_1.ux.action.stop(`✖ Error removed the subgraph: ${jsonRpcError.message}`);
+                this.exit(1);
             }
             else if (requestError) {
-                spinner.fail(`HTTP error removing the subgraph: ${requestError.code}`);
-                process.exitCode = 1;
+                core_1.ux.action.stop(`✖ HTTP error removed the subgraph: ${requestError.code}`);
+                this.exit(1);
             }
             else {
-                spinner.stop();
-                print.success(`Removed subgraph: ${subgraphName}`);
+                core_1.ux.action.stop('Subgraph removed');
+                this.exit(1);
             }
         });
-    },
+    }
+}
+exports.default = RemoveCommand;
+RemoveCommand.description = 'Unregisters a subgraph name';
+RemoveCommand.args = {
+    'subgraph-name': core_1.Args.string({
+        required: true,
+    }),
+};
+RemoveCommand.flags = {
+    node: core_1.Flags.string({
+        summary: 'Graph node to delete the subgraph from.',
+        char: 'g',
+        required: true,
+    }),
+    'access-token': core_1.Flags.string({
+        summary: 'Graph access token.',
+    }),
 };

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.38.1-alpha-20230208031159-e8f0545",
+  "version": "0.38.1-alpha-20230208031649-b554fda",
   "commands": {
     "add": {
       "id": "add",
@@ -327,12 +327,33 @@
     "remove": {
       "id": "remove",
       "description": "Unregisters a subgraph name",
+      "strict": true,
       "pluginName": "@graphprotocol/graph-cli",
       "pluginAlias": "@graphprotocol/graph-cli",
       "pluginType": "core",
       "aliases": [],
-      "flags": {},
-      "args": {}
+      "flags": {
+        "node": {
+          "name": "node",
+          "type": "option",
+          "char": "g",
+          "summary": "Graph node to delete the subgraph from.",
+          "required": true,
+          "multiple": false
+        },
+        "access-token": {
+          "name": "access-token",
+          "type": "option",
+          "summary": "Graph access token.",
+          "multiple": false
+        }
+      },
+      "args": {
+        "subgraph-name": {
+          "name": "subgraph-name",
+          "required": true
+        }
+      }
     },
     "test": {
       "id": "test",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.38.1-alpha-20230208031159-e8f0545",
+  "version": "0.38.1-alpha-20230208031649-b554fda",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {