@graphprotocol/graph-cli 0.37.3-alpha-20230113140726-64762bb → 0.37.3

package/CHANGELOG.md

@@ -1,15 +1,19 @@
 # @graphprotocol/graph-cli
 
-## 0.37.3-alpha-20230113140726-64762bb
+## 0.37.3
 
 ### Patch Changes
 
 - [#1020](https://github.com/graphprotocol/graph-cli/pull/1020)
   [`4c5e452`](https://github.com/graphprotocol/graph-cli/commit/4c5e452cbc2eceb75db29019fb3b4c769c9618f4)
   Thanks [@saihaj](https://github.com/saihaj)! - dependencies updates:
+
   - Updated dependency [`immutable@4.2.1` ↗︎](https://www.npmjs.com/package/immutable/v/4.2.1) (from
     `3.8.2`, in `dependencies`)
 
+- [`d42f199`](https://github.com/graphprotocol/graph-cli/commit/d42f199502df7bac79e8cafc667d5c712f5a3599)
+  Thanks [@darienmh](https://github.com/darienmh)! - fix `chapel` network etherscan URL
+
 ## 0.37.2
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.37.3-alpha-20230113140726-64762bb",
+  "version": "0.37.3",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "bin": {

package/src/cli.ts

@@ -1,4 +1,4 @@
-import path from 'node:path';
+import path from 'path';
 import { build, system } from 'gluegun';
 
 const run = async (argv: string[]) => {

package/src/command-helpers/abi.ts

@@ -63,6 +63,8 @@ const getEtherscanLikeAPIUrl = (network: string) => {
       return `https://api.arbiscan.io/api`;
     case 'bsc':
       return `https://api.bscscan.com/api`;
+    case 'chapel':
+      return `https://api-testnet.bscscan.com/api`;
     case 'matic':
       return `https://api.polygonscan.com/api`;
     case 'mumbai':

package/src/command-helpers/auth.ts

@@ -1,6 +1,6 @@
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
 import * as toolbox from 'gluegun';
 import { normalizeNodeUrl } from './node';
 

package/src/command-helpers/compiler.ts

@@ -1,4 +1,4 @@
-import { URL } from 'node:url';
+import { URL } from 'url';
 import * as toolbox from 'gluegun';
 import ipfsHttpClient from 'ipfs-http-client';
 import Compiler from '../compiler';

package/src/command-helpers/fs.ts

@@ -1,4 +1,4 @@
-import path from 'node:path';
+import path from 'path';
 
 const displayPath = (p: string) => path.relative(process.cwd(), p);
 

package/src/command-helpers/network.test.ts

@@ -1,4 +1,4 @@
-import path from 'node:path';
+import path from 'path';
 import * as toolbox from 'gluegun';
 import yaml from 'yaml';
 import { initNetworksConfig, updateSubgraphNetwork } from './network';

package/src/command-helpers/network.ts

@@ -1,4 +1,4 @@
-import path from 'node:path';
+import path from 'path';
 import { GluegunFilesystem, GluegunPatching } from 'gluegun';
 import yaml from 'yaml';
 import { step, withSpinner } from './spinner';

package/src/command-helpers/node.ts

@@ -1,4 +1,4 @@
-import { URL } from 'node:url';
+import { URL } from 'url';
 import { print } from 'gluegun';
 
 const SUBGRAPH_STUDIO_URL = 'https://api.studio.thegraph.com/deploy/';

package/src/command-helpers/scaffold.ts

@@ -1,4 +1,4 @@
-import path from 'node:path';
+import path from 'path';
 import fs from 'fs-extra';
 import { strings } from 'gluegun';
 import { Map } from 'immutable';

package/src/commands/codegen.ts

@@ -1,4 +1,4 @@
-import path from 'node:path';
+import path from 'path';
 import chalk from 'chalk';
 import { GluegunToolbox } from 'gluegun';
 import * as DataSourcesExtractor from '../command-helpers/data-sources';

package/src/commands/create.ts

@@ -1,4 +1,4 @@
-import { URL } from 'node:url';
+import { URL } from 'url';
 import chalk from 'chalk';
 import { GluegunToolbox } from 'gluegun';
 import { identifyDeployKey as identifyAccessToken } from '../command-helpers/auth';

package/src/commands/deploy.ts

@@ -1,5 +1,5 @@
-import path from 'node:path';
-import { URL } from 'node:url';
+import path from 'path';
+import { URL } from 'url';
 import chalk from 'chalk';
 import { GluegunToolbox } from 'gluegun';
 import { identifyDeployKey } from '../command-helpers/auth';

package/src/commands/init.ts

@@ -1,6 +1,6 @@
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
 import chalk from 'chalk';
 import { GluegunToolbox } from 'gluegun';
 import * as graphCli from '../cli';

package/src/commands/local.ts

@@ -1,7 +1,7 @@
-import { ChildProcess, spawn } from 'node:child_process';
-import http from 'node:http';
-import net from 'node:net';
-import path from 'node:path';
+import { ChildProcess, spawn } from 'child_process';
+import http from 'http';
+import net from 'net';
+import path from 'path';
 import chalk from 'chalk';
 import compose from 'docker-compose';
 import { GluegunToolbox } from 'gluegun';

package/src/commands/remove.ts

@@ -1,4 +1,4 @@
-import { URL } from 'node:url';
+import { URL } from 'url';
 import chalk from 'chalk';
 import { GluegunToolbox } from 'gluegun';
 import { identifyDeployKey as identifyAccessToken } from '../command-helpers/auth';

package/src/commands/test.ts

@@ -1,6 +1,6 @@
-import { exec, spawn } from 'node:child_process';
-import os from 'node:os';
-import path from 'node:path';
+import { exec, spawn } from 'child_process';
+import os from 'os';
+import path from 'path';
 import { Binary } from 'binary-install-raw';
 import chalk from 'chalk';
 import { filesystem, GluegunToolbox, patching, print, system } from 'gluegun';

package/src/compiler/index.ts

@@ -1,5 +1,5 @@
-import crypto from 'node:crypto';
-import path from 'node:path';
+import crypto from 'crypto';
+import path from 'path';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import * as toolbox from 'gluegun';

package/src/migrations/util/load-manifest.ts

@@ -1,4 +1,4 @@
-import path from 'node:path';
+import path from 'path';
 import fs from 'fs-extra';
 import yaml from 'js-yaml';
 

package/src/migrations/util/versions.ts

@@ -1,4 +1,4 @@
-import path from 'node:path';
+import path from 'path';
 import fs from 'fs-extra';
 
 export async function getGraphTsVersion(sourceDir: string) {

package/src/protocols/ethereum/abi.ts

@@ -1,4 +1,4 @@
-import path from 'node:path';
+import path from 'path';
 import fs from 'fs-extra';
 import immutable from 'immutable';
 import AbiCodeGenerator from './codegen/abi';

package/src/protocols/ethereum/codegen/abi.test.ts

@@ -1,4 +1,4 @@
-import path from 'node:path';
+import path from 'path';
 import fs from 'fs-extra';
 import immutable from 'immutable';
 import * as ts from '../../../codegen/typescript';

package/src/protocols/ethereum/codegen/abi.ts

@@ -1,4 +1,4 @@
-import fs from 'node:fs';
+import fs from 'fs';
 import immutable from 'immutable';
 import request from 'sync-request';
 import Web3EthAbi from 'web3-eth-abi';

package/src/protocols/ethereum/type-generator.ts

@@ -1,4 +1,4 @@
-import path from 'node:path';
+import path from 'path';
 import fs from 'fs-extra';
 import immutable from 'immutable';
 import prettier from 'prettier';

package/src/subgraph.ts

@@ -1,4 +1,4 @@
-import path from 'node:path';
+import path from 'path';
 import fs from 'fs-extra';
 import * as graphql from 'graphql/language';
 import immutable from 'immutable';

package/src/type-generator.ts

@@ -1,4 +1,4 @@
-import path from 'node:path';
+import path from 'path';
 // @ts-expect-error TODO: type out if necessary
 import uncrashable from '@float-capital/float-subgraph-uncrashable/src/Index.bs.js';
 import fs from 'fs-extra';

package/src/validation/manifest.ts

@@ -1,5 +1,5 @@
-import fs from 'node:fs';
-import path from 'node:path';
+import fs from 'fs';
+import path from 'path';
 import immutable from 'immutable';
 import yaml from 'js-yaml';
 import Protocol from '../protocols';

package/src/validation/schema.ts

@@ -1,4 +1,4 @@
-import fs from 'node:fs';
+import fs from 'fs';
 import * as graphql from 'graphql/language';
 import immutable from 'immutable';
 

package/src/watcher.ts

@@ -1,4 +1,4 @@
-import path from 'node:path';
+import path from 'path';
 import chokidar from 'chokidar';
 
 export default class Watcher {

package/tests/cli/init.test.ts

@@ -1,4 +1,4 @@
-import path from 'node:path';
+import path from 'path';
 import { cliTest } from './util';
 
 describe('Init', () => {

package/tests/cli/spawn-command.d.ts

@@ -1,5 +1,5 @@
 declare module 'spawn-command' {
-  import { spawn, SpawnOptions, ChildProcessByStdio } from 'node:child_process';
+  import { spawn, SpawnOptions, ChildProcessByStdio } from 'child_process';
 
   type SpawnResult = ChildProcessByStdio<Writable, Readable, Readable>;
   export { SpawnOptions, SpawnResult };

package/tests/cli/util.ts

@@ -1,4 +1,4 @@
-import path from 'node:path';
+import path from 'path';
 import fs from 'fs-extra';
 import spawn from 'spawn-command';
 import stripAnsi from 'strip-ansi';

package/dist/bin.js

@@ -1,6 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-// run the CLI with the current process arguments
-const cli_1 = require("./cli");
-(0, cli_1.run)(process.argv);

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 node_path_1 = __importDefault(require("node: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(node_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/codegen/schema.js

@@ -1,244 +0,0 @@
-"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 };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const immutable_1 = __importDefault(require("immutable"));
-const typesCodegen = __importStar(require("./types"));
-const tsCodegen = __importStar(require("./typescript"));
-class IdField {
-    static BYTES = Symbol('Bytes');
-    static STRING = Symbol('String');
-    kind;
-    constructor(idField) {
-        const typeName = idField.getIn(['type', 'type', 'name', 'value']);
-        this.kind = typeName === 'Bytes' ? IdField.BYTES : IdField.STRING;
-    }
-    typeName() {
-        return this.kind === IdField.BYTES ? 'Bytes' : 'string';
-    }
-    gqlTypeName() {
-        return this.kind === IdField.BYTES ? 'Bytes' : 'String';
-    }
-    tsNamedType() {
-        return tsCodegen.namedType(this.typeName());
-    }
-    tsValueFrom() {
-        return this.kind === IdField.BYTES ? 'Value.fromBytes(id)' : 'Value.fromString(id)';
-    }
-    tsValueKind() {
-        return this.kind === IdField.BYTES ? 'ValueKind.BYTES' : 'ValueKind.STRING';
-    }
-    tsValueToString() {
-        return this.kind == IdField.BYTES ? 'id.toBytes().toHexString()' : 'id.toString()';
-    }
-    tsToString() {
-        return this.kind == IdField.BYTES ? 'id.toHexString()' : 'id';
-    }
-    static fromFields(fields) {
-        const idField = fields.find(field => field.getIn(['name', 'value']) === 'id');
-        return new IdField(idField);
-    }
-    static fromTypeDef(def) {
-        return IdField.fromFields(def.get('fields'));
-    }
-}
-class SchemaCodeGenerator {
-    schema;
-    constructor(schema) {
-        this.schema = schema;
-        this.schema = schema;
-    }
-    generateModuleImports() {
-        return [
-            tsCodegen.moduleImports([
-                // Base classes
-                'TypedMap',
-                'Entity',
-                'Value',
-                'ValueKind',
-                // APIs
-                'store',
-                // Basic Scalar types
-                'Bytes',
-                'BigInt',
-                'BigDecimal',
-            ], '@graphprotocol/graph-ts'),
-        ];
-    }
-    generateTypes() {
-        return this.schema.ast
-            .get('definitions')
-            .filter((def) => this._isEntityTypeDefinition(def))
-            .map((def) => this._generateEntityType(def));
-    }
-    _isEntityTypeDefinition(def) {
-        return (def.get('kind') === 'ObjectTypeDefinition' &&
-            def
-                .get('directives')
-                .find((directive) => directive.getIn(['name', 'value']) === 'entity') !== undefined);
-    }
-    _isInterfaceDefinition(def) {
-        return def.get('kind') === 'InterfaceTypeDefinition';
-    }
-    _generateEntityType(def) {
-        const name = def.getIn(['name', 'value']);
-        const klass = tsCodegen.klass(name, { export: true, extends: 'Entity' });
-        const fields = def.get('fields');
-        const idField = IdField.fromFields(fields);
-        // Generate and add a constructor
-        klass.addMethod(this._generateConstructor(name, fields));
-        // Generate and add save() and getById() methods
-        this._generateStoreMethods(name, idField).forEach(method => klass.addMethod(method));
-        // Generate and add entity field getters and setters
-        def
-            .get('fields')
-            .reduce((methods, field) => methods.concat(this._generateEntityFieldMethods(def, field)), immutable_1.default.List())
-            .forEach((method) => klass.addMethod(method));
-        return klass;
-    }
-    _generateConstructor(_entityName, fields) {
-        const idField = IdField.fromFields(fields);
-        return tsCodegen.method('constructor', [tsCodegen.param('id', idField.tsNamedType())], undefined, `
-      super()
-      this.set('id', ${idField.tsValueFrom()})
-      `);
-    }
-    _generateStoreMethods(entityName, idField) {
-        return immutable_1.default.List.of(tsCodegen.method('save', [], tsCodegen.namedType('void'), `
-        let id = this.get('id')
-        assert(id != null,
-               'Cannot save ${entityName} entity without an ID')
-        if (id) {
-          assert(id.kind == ${idField.tsValueKind()},
-                 \`Entities of type ${entityName} must have an ID of type ${idField.gqlTypeName()} but the id '\${id.displayData()}' is of type \${id.displayKind()}\`)
-          store.set('${entityName}', ${idField.tsValueToString()}, this)
-        }`), tsCodegen.staticMethod('load', [tsCodegen.param('id', tsCodegen.namedType(idField.typeName()))], tsCodegen.nullableType(tsCodegen.namedType(entityName)), `
-        return changetype<${entityName} | null>(store.get('${entityName}', ${idField.tsToString()}))
-        `));
-    }
-    _generateEntityFieldMethods(entityDef, fieldDef) {
-        return immutable_1.default.List([
-            this._generateEntityFieldGetter(entityDef, fieldDef),
-            this._generateEntityFieldSetter(entityDef, fieldDef),
-        ]);
-    }
-    _generateEntityFieldGetter(_entityDef, fieldDef) {
-        const name = fieldDef.getIn(['name', 'value']);
-        const gqlType = fieldDef.get('type');
-        const fieldValueType = this._valueTypeFromGraphQl(gqlType);
-        const returnType = this._typeFromGraphQl(gqlType);
-        const isNullable = returnType instanceof tsCodegen.NullableType;
-        const getNonNullable = `return ${typesCodegen.valueToAsc('value!', fieldValueType)}`;
-        const getNullable = `if (!value || value.kind == ValueKind.NULL) {
-                          return null
-                        } else {
-                          return ${typesCodegen.valueToAsc('value', fieldValueType)}
-                        }`;
-        return tsCodegen.method(`get ${name}`, [], returnType, `
-       let value = this.get('${name}')
-       ${isNullable ? getNullable : getNonNullable}
-      `);
-    }
-    _generateEntityFieldSetter(_entityDef, fieldDef) {
-        const name = fieldDef.getIn(['name', 'value']);
-        const gqlType = fieldDef.get('type');
-        const fieldValueType = this._valueTypeFromGraphQl(gqlType);
-        const paramType = this._typeFromGraphQl(gqlType);
-        const isNullable = paramType instanceof tsCodegen.NullableType;
-        const paramTypeString = isNullable ? paramType.inner.toString() : paramType.toString();
-        const isArray = paramType instanceof tsCodegen.ArrayType;
-        if (isArray && paramType.inner instanceof tsCodegen.NullableType) {
-            const baseType = this._baseType(gqlType);
-            throw new Error(`
-GraphQL schema can't have List's with Nullable members.
-Error in '${name}' field of type '[${baseType}]'.
-Suggestion: add an '!' to the member type of the List, change from '[${baseType}]' to '[${baseType}!]'`);
-        }
-        const setNonNullable = `
-      this.set('${name}', ${typesCodegen.valueFromAsc(`value`, fieldValueType)})
-    `;
-        const setNullable = `
-      if (!value) {
-        this.unset('${name}')
-      } else {
-        this.set('${name}', ${typesCodegen.valueFromAsc(`<${paramTypeString}>value`, fieldValueType)})
-      }
-    `;
-        return tsCodegen.method(`set ${name}`, [tsCodegen.param('value', paramType)], undefined, isNullable ? setNullable : setNonNullable);
-    }
-    _resolveFieldType(gqlType) {
-        const typeName = gqlType.getIn(['name', 'value']);
-        // If this is a reference to another type, the field has the type of
-        // the referred type's id field
-        const typeDef = this.schema.ast
-            .get('definitions')
-            .find((def) => (this._isEntityTypeDefinition(def) || this._isInterfaceDefinition(def)) &&
-            def.getIn(['name', 'value']) === typeName);
-        if (typeDef) {
-            return IdField.fromTypeDef(typeDef).typeName();
-        }
-        return typeName;
-    }
-    /** Return the type that values for this field must have. For scalar
-     * types, that's the type from the subgraph schema. For references to
-     * other entity types, this is the same as the type of the id of the
-     * referred type, i.e., `string` or `Bytes`*/
-    _valueTypeFromGraphQl(gqlType) {
-        if (gqlType.get('kind') === 'NonNullType') {
-            return this._valueTypeFromGraphQl(gqlType.get('type'));
-        }
-        if (gqlType.get('kind') === 'ListType') {
-            return '[' + this._valueTypeFromGraphQl(gqlType.get('type')) + ']';
-        }
-        return this._resolveFieldType(gqlType);
-    }
-    /** Determine the base type of `gqlType` by removing any non-null
-     * constraints and using the type of elements of lists */
-    _baseType(gqlType) {
-        if (gqlType.get('kind') === 'NonNullType') {
-            return this._baseType(gqlType.get('type'));
-        }
-        if (gqlType.get('kind') === 'ListType') {
-            return this._baseType(gqlType.get('type'));
-        }
-        return gqlType.getIn(['name', 'value']);
-    }
-    _typeFromGraphQl(gqlType, nullable = true) {
-        if (gqlType.get('kind') === 'NonNullType') {
-            return this._typeFromGraphQl(gqlType.get('type'), false);
-        }
-        if (gqlType.get('kind') === 'ListType') {
-            const type = tsCodegen.arrayType(this._typeFromGraphQl(gqlType.get('type')));
-            return nullable ? tsCodegen.nullableType(type) : type;
-        }
-        // NamedType
-        const type = tsCodegen.namedType(typesCodegen.ascTypeForValue(this._resolveFieldType(gqlType)));
-        // In AssemblyScript, primitives cannot be nullable.
-        return nullable && !type.isPrimitive() ? tsCodegen.nullableType(type) : type;
-    }
-}
-exports.default = SchemaCodeGenerator;