@graphprotocol/graph-cli 0.40.0 → 0.40.1-alpha-20230216174117-760a195

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.40.0",
+  "version": "0.40.1-alpha-20230216174117-760a195",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {
@@ -9,14 +9,16 @@
   "bin": {
     "graph": "dist/bin.js"
   },
-  "main": "dist/cli.js",
+  "main": "dist/index.js",
   "files": [
     "CHANGELOG.md",
     "dist",
+    "oclif.manifest.json",
     "README.md"
   ],
   "dependencies": {
     "@float-capital/float-subgraph-uncrashable": "^0.0.0-alpha.4",
+    "@oclif/core": "2.0.7",
     "assemblyscript": "0.19.23",
     "binary-install-raw": "0.0.13",
     "chalk": "3.0.0",
@@ -52,6 +54,7 @@
     "@types/which": "^2.0.1",
     "copyfiles": "^2.4.1",
     "jest": "26.0.0",
+    "oclif": "3.6.1",
     "spawn-command": "0.0.2-1",
     "strip-ansi": "6.0.0",
     "tern": "0.24.3",
@@ -60,8 +63,12 @@
   "publishConfig": {
     "access": "public"
   },
+  "oclif": {
+    "bin": "graph",
+    "commands": "./dist/commands"
+  },
   "scripts": {
-    "build": "tsc -b tsconfig.build.json && copyfiles -u 1 src/**/*.graphql dist/ && chmod +x ./dist/bin.js",
+    "build": "tsc -b tsconfig.build.json && oclif manifest && copyfiles -u 1 src/**/*.graphql dist/ && chmod +x ./dist/bin.js",
     "test": "jest --verbose",
     "test:init": "jest tests/cli/init.test.ts --verbose",
     "test:validation": "jest tests/cli/validation.test.ts --verbose",

package/dist/cli.js

@@ -1,26 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.run = void 0;
-const path_1 = __importDefault(require("path"));
-const gluegun_1 = require("gluegun");
-const run = async (argv) => {
-    let builder = (0, gluegun_1.build)().brand('graph').src(__dirname);
-    const pluginDirs = [];
-    await Promise.all(['npm root -g', 'npm root', 'yarn global dir'].map(async (cmd) => {
-        try {
-            const dir = await gluegun_1.system.run(cmd, { trim: true });
-            pluginDirs.push(dir);
-        }
-        catch (_) {
-            // noop
-        }
-    }));
-    // Inject potential plugin directories
-    builder = pluginDirs.reduce((cli, dir) => cli.plugin(path_1.default.join(dir, '@graphprotocol', 'indexer-cli', 'dist')), builder);
-    const cli = builder.help().version().defaultCommand().create();
-    return await cli.run(argv);
-};
-exports.run = run;

package/dist/command-helpers/gluegun.js

@@ -1,48 +0,0 @@
-"use strict";
-// Workaround for https://github.com/infinitered/gluegun/pull/464.
-//
-// There is currently no way in Gluegun to define command-line options
-// that take no arguments (like `--watch`). As a consequence, boolean
-// options like `--watch` will consume the immediately following argument,
-// leading to confusing behavior.
-//
-// E.g. `graph deploy --watch subgraph/name
-//
-// Will result in
-// ```
-// toolbox.parameters.options === { watch: 'subgraph/name' }
-// toolbox.parameters.first === undefined
-// toolbox.parameters.array === []
-// ```
-// where what we really want is
-// ```
-// toolbox.parameters.options === { watch: true }
-// toolbox.parameters.first = 'subgraph/name'
-// toolbox.parameters.array = ['subgraph/name']
-// ```
-//
-// The `fixParameters` function checks if any of the provided boolean
-// options has a string value; if so, it pushes it to the front of the
-// parameters array and returns the result of that.
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fixParameters = void 0;
-const fixParameters = (parameters, booleanOptions) => {
-    const unexpectedStringOptions = Object.keys(booleanOptions)
-        .filter(key => typeof booleanOptions[key] === 'string')
-        .map(key => ({ key, value: booleanOptions[key] }));
-    const optionNames = unexpectedStringOptions
-        .map(({ key }) => `--` + key.replace(/([A-Z])/, '-$1').toLowerCase())
-        .join(', ');
-    if (unexpectedStringOptions.length > 1) {
-        throw new Error(`Unexpected value provided for one or more of ${optionNames}. See --help for more information.`);
-    }
-    else if (unexpectedStringOptions.length == 1) {
-        const params = parameters.array;
-        params.unshift(unexpectedStringOptions[0].value);
-        return params;
-    }
-    else {
-        return parameters.array;
-    }
-};
-exports.fixParameters = fixParameters;