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

package/CHANGELOG.md

@@ -1,20 +1,27 @@
 # @graphprotocol/graph-cli
 
-## 0.37.3-alpha-20230113132704-4100b25
+## 0.37.3-alpha-20230113140726-64762bb
 
 ### Patch Changes
 
-- [#1020](https://github.com/graphprotocol/graph-cli/pull/1020) [`6184688`](https://github.com/graphprotocol/graph-cli/commit/6184688d7e6efaae49a722410befd28da0af87b0) 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`)
+- [#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`)
 
 ## 0.37.2
 
 ### Patch Changes
 
-- [#1023](https://github.com/graphprotocol/graph-cli/pull/1023) [`bf5ab6d`](https://github.com/graphprotocol/graph-cli/commit/bf5ab6dc0f19fcb5b8e599b7d9b1c2b6efcbe005) Thanks [@evaporei](https://github.com/evaporei)! - update graph-ts to 0.29.1
+- [#1023](https://github.com/graphprotocol/graph-cli/pull/1023)
+  [`bf5ab6d`](https://github.com/graphprotocol/graph-cli/commit/bf5ab6dc0f19fcb5b8e599b7d9b1c2b6efcbe005)
+  Thanks [@evaporei](https://github.com/evaporei)! - update graph-ts to 0.29.1
 
 ## 0.37.1
 
 ### Patch Changes
 
-- [#1015](https://github.com/graphprotocol/graph-cli/pull/1015) [`5df304c`](https://github.com/graphprotocol/graph-cli/commit/5df304c75ecc339f681eeae858325a7859183dda) Thanks [@saihaj](https://github.com/saihaj)! - fix fantom network init URLs
+- [#1015](https://github.com/graphprotocol/graph-cli/pull/1015)
+  [`5df304c`](https://github.com/graphprotocol/graph-cli/commit/5df304c75ecc339f681eeae858325a7859183dda)
+  Thanks [@saihaj](https://github.com/saihaj)! - fix fantom network init URLs

package/babel.config.js

@@ -1,3 +1,3 @@
 module.exports = {
   presets: [['@babel/env', { targets: { node: 'current' } }], '@babel/typescript'],
-}
+};

package/dist/cli.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
-const path_1 = __importDefault(require("path"));
+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);
@@ -19,7 +19,7 @@ const run = async (argv) => {
         }
     }));
     // Inject potential plugin directories
-    builder = pluginDirs.reduce((cli, dir) => cli.plugin(path_1.default.join(dir, '@graphprotocol', 'indexer-cli', 'dist')), builder);
+    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);
 };

package/dist/codegen/schema.js

@@ -27,8 +27,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const immutable_1 = __importDefault(require("immutable"));
-const tsCodegen = __importStar(require("./typescript"));
 const typesCodegen = __importStar(require("./types"));
+const tsCodegen = __importStar(require("./typescript"));
 class IdField {
     static BYTES = Symbol('Bytes');
     static STRING = Symbol('String');
@@ -99,15 +99,14 @@ class SchemaCodeGenerator {
         return (def.get('kind') === 'ObjectTypeDefinition' &&
             def
                 .get('directives')
-                .find((directive) => directive.getIn(['name', 'value']) === 'entity') !==
-                undefined);
+                .find((directive) => directive.getIn(['name', 'value']) === 'entity') !== undefined);
     }
     _isInterfaceDefinition(def) {
         return def.get('kind') === 'InterfaceTypeDefinition';
     }
     _generateEntityType(def) {
-        let name = def.getIn(['name', 'value']);
-        let klass = tsCodegen.klass(name, { export: true, extends: 'Entity' });
+        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
@@ -148,13 +147,13 @@ class SchemaCodeGenerator {
         ]);
     }
     _generateEntityFieldGetter(_entityDef, fieldDef) {
-        let name = fieldDef.getIn(['name', 'value']);
-        let gqlType = fieldDef.get('type');
-        let fieldValueType = this._valueTypeFromGraphQl(gqlType);
-        let returnType = this._typeFromGraphQl(gqlType);
-        let isNullable = returnType instanceof tsCodegen.NullableType;
-        let getNonNullable = `return ${typesCodegen.valueToAsc('value!', fieldValueType)}`;
-        let getNullable = `if (!value || value.kind == ValueKind.NULL) {
+        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)}
@@ -165,24 +164,24 @@ class SchemaCodeGenerator {
       `);
     }
     _generateEntityFieldSetter(_entityDef, fieldDef) {
-        let name = fieldDef.getIn(['name', 'value']);
-        let gqlType = fieldDef.get('type');
-        let fieldValueType = this._valueTypeFromGraphQl(gqlType);
-        let paramType = this._typeFromGraphQl(gqlType);
-        let isNullable = paramType instanceof tsCodegen.NullableType;
-        let paramTypeString = isNullable ? paramType.inner.toString() : paramType.toString();
-        let isArray = paramType instanceof tsCodegen.ArrayType;
+        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) {
-            let baseType = this._baseType(gqlType);
+            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}!]'`);
         }
-        let setNonNullable = `
+        const setNonNullable = `
       this.set('${name}', ${typesCodegen.valueFromAsc(`value`, fieldValueType)})
     `;
-        let setNullable = `
+        const setNullable = `
       if (!value) {
         this.unset('${name}')
       } else {
@@ -192,7 +191,7 @@ Suggestion: add an '!' to the member type of the List, change from '[${baseType}
         return tsCodegen.method(`set ${name}`, [tsCodegen.param('value', paramType)], undefined, isNullable ? setNullable : setNonNullable);
     }
     _resolveFieldType(gqlType) {
-        let typeName = gqlType.getIn(['name', 'value']);
+        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
@@ -202,9 +201,7 @@ Suggestion: add an '!' to the member type of the List, change from '[${baseType}
         if (typeDef) {
             return IdField.fromTypeDef(typeDef).typeName();
         }
-        else {
-            return 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
@@ -214,12 +211,10 @@ Suggestion: add an '!' to the member type of the List, change from '[${baseType}
         if (gqlType.get('kind') === 'NonNullType') {
             return this._valueTypeFromGraphQl(gqlType.get('type'));
         }
-        else if (gqlType.get('kind') === 'ListType') {
+        if (gqlType.get('kind') === 'ListType') {
             return '[' + this._valueTypeFromGraphQl(gqlType.get('type')) + ']';
         }
-        else {
-            return this._resolveFieldType(gqlType);
-        }
+        return this._resolveFieldType(gqlType);
     }
     /** Determine the base type of `gqlType` by removing any non-null
      * constraints and using the type of elements of lists */
@@ -227,27 +222,23 @@ Suggestion: add an '!' to the member type of the List, change from '[${baseType}
         if (gqlType.get('kind') === 'NonNullType') {
             return this._baseType(gqlType.get('type'));
         }
-        else if (gqlType.get('kind') === 'ListType') {
+        if (gqlType.get('kind') === 'ListType') {
             return this._baseType(gqlType.get('type'));
         }
-        else {
-            return gqlType.getIn(['name', 'value']);
-        }
+        return gqlType.getIn(['name', 'value']);
     }
     _typeFromGraphQl(gqlType, nullable = true) {
         if (gqlType.get('kind') === 'NonNullType') {
             return this._typeFromGraphQl(gqlType.get('type'), false);
         }
-        else if (gqlType.get('kind') === 'ListType') {
-            let type = tsCodegen.arrayType(this._typeFromGraphQl(gqlType.get('type')));
+        if (gqlType.get('kind') === 'ListType') {
+            const type = tsCodegen.arrayType(this._typeFromGraphQl(gqlType.get('type')));
             return nullable ? tsCodegen.nullableType(type) : type;
         }
-        else {
-            // NamedType
-            let type = tsCodegen.namedType(typesCodegen.ascTypeForValue(this._resolveFieldType(gqlType)));
-            // In AssemblyScript, primitives cannot be nullable.
-            return nullable && !type.isPrimitive() ? 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;

package/dist/codegen/schema.test.js

@@ -26,9 +26,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const prettier_1 = __importDefault(require("prettier"));
 const graphql = __importStar(require("graphql/language"));
 const immutable_1 = __importDefault(require("immutable"));
+const prettier_1 = __importDefault(require("prettier"));
 const schema_1 = __importDefault(require("../schema"));
 const schema_2 = __importDefault(require("./schema"));
 const typescript_1 = require("./typescript");
@@ -246,9 +246,7 @@ describe('Schema code generator', () => {
                     },
                     {
                         name: 'set wallets',
-                        params: [
-                            new typescript_1.Param('value', new typescript_1.NullableType(new typescript_1.ArrayType(new typescript_1.NamedType('string')))),
-                        ],
+                        params: [new typescript_1.Param('value', new typescript_1.NullableType(new typescript_1.ArrayType(new typescript_1.NamedType('string'))))],
                         returnType: undefined,
                         body: `
               if (!value) {

package/dist/codegen/template.js

@@ -35,7 +35,7 @@ class DataSourceTemplateCodeGenerator {
     constructor(template, protocol) {
         this.template = template;
         this.template = template;
-        let kind = template.get('kind');
+        const kind = template.get('kind');
         if (kind.split('/')[0] == protocol.name) {
             this.protocolTemplateCodeGen = protocol.getTemplateCodeGen(template);
         }
@@ -56,8 +56,8 @@ class DataSourceTemplateCodeGenerator {
         return immutable_1.default.List([this._generateTemplateType()]);
     }
     _generateTemplateType() {
-        let name = this.template.get('name');
-        let klass = tsCodegen.klass(name, { export: true, extends: 'DataSourceTemplate' });
+        const name = this.template.get('name');
+        const klass = tsCodegen.klass(name, { export: true, extends: 'DataSourceTemplate' });
         klass.addMethod(this.protocolTemplateCodeGen.generateCreateMethod());
         klass.addMethod(this.protocolTemplateCodeGen.generateCreateWithContextMethod());
         return klass;

package/dist/codegen/types/conversions.js

@@ -154,11 +154,7 @@ const ASSEMBLYSCRIPT_TO_ETHEREUM_VALUE = [
         /^byte\[([0-9]+)?\]$/,
         (code) => `ethereum.Value.fromFixedBytesArray(${code})`,
     ],
-    [
-        'Array<Bytes>',
-        /bytes\[([0-9]+)?\]$/,
-        (code) => `ethereum.Value.fromBytesArray(${code})`,
-    ],
+    ['Array<Bytes>', /bytes\[([0-9]+)?\]$/, (code) => `ethereum.Value.fromBytesArray(${code})`],
     [
         'Array<Bytes>',
         /^bytes(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32)\[([0-9]+)?\]$/,
@@ -287,33 +283,17 @@ const ASSEMBLYSCRIPT_TO_VALUE = [
     // Matrices
     ['Array<Array<Address>>', '[[Bytes]]', (code) => `Value.fromBytesMatrix(${code})`],
     ['Array<Array<Bytes>>', '[[Bytes]]', (code) => `Value.fromBytesMatrix(${code})`],
-    [
-        'Array<Array<boolean>>',
-        '[[Boolean]]',
-        (code) => `Value.fromBooleanMatrix(${code})`,
-    ],
+    ['Array<Array<boolean>>', '[[Boolean]]', (code) => `Value.fromBooleanMatrix(${code})`],
     ['Array<Array<i32>>', '[[Int]]', (code) => `Value.fromI32Matrix(${code})`],
-    [
-        'Array<Array<BigInt>>',
-        '[[BigInt]]',
-        (code) => `Value.fromBigIntMatrix(${code})`,
-    ],
-    [
-        'Array<Array<string>>',
-        '[[String]]',
-        (code) => `Value.fromStringMatrix(${code})`,
-    ],
+    ['Array<Array<BigInt>>', '[[BigInt]]', (code) => `Value.fromBigIntMatrix(${code})`],
+    ['Array<Array<string>>', '[[String]]', (code) => `Value.fromStringMatrix(${code})`],
     ['Array<Array<string>>', '[[ID]]', (code) => `Value.fromStringMatrix(${code})`],
     [
         'Array<Array<BigDecimal>>',
         '[[BigDecimal]]',
         (code) => `Value.fromBigDecimalMatrix(${code})`,
     ],
-    [
-        'Array<Array<string>>',
-        /\[\[.*\]\]/,
-        (code) => `Value.fromStringMatrix(${code})`,
-    ],
+    ['Array<Array<string>>', /\[\[.*\]\]/, (code) => `Value.fromStringMatrix(${code})`],
     ['Array<Array<string | null>>', null, (code) => `Value.fromStringMatrix(${code})`],
     // Arrays
     ['Array<Address>', '[Bytes]', (code) => `Value.fromBytesArray(${code})`],
@@ -323,11 +303,7 @@ const ASSEMBLYSCRIPT_TO_VALUE = [
     ['Array<BigInt>', '[BigInt]', (code) => `Value.fromBigIntArray(${code})`],
     ['Array<string>', '[String]', (code) => `Value.fromStringArray(${code})`],
     ['Array<string>', '[ID]', (code) => `Value.fromStringArray(${code})`],
-    [
-        'Array<BigDecimal>',
-        '[BigDecimal]',
-        (code) => `Value.fromBigDecimalArray(${code})`,
-    ],
+    ['Array<BigDecimal>', '[BigDecimal]', (code) => `Value.fromBigDecimalArray(${code})`],
     ['Array<string>', /\[.*\]/, (code) => `Value.fromStringArray(${code})`],
     ['Array<string | null>', null, (code) => `Value.fromStringArray(${code})`],
     // Scalar values

package/dist/codegen/types/index.js

@@ -8,7 +8,7 @@ const immutable_1 = __importDefault(require("immutable"));
 const conversions_1 = __importDefault(require("./conversions"));
 // Conversion utilities
 const conversionsForTypeSystems = (fromTypeSystem, toTypeSystem) => {
-    let conversions = conversions_1.default.getIn([fromTypeSystem, toTypeSystem]);
+    const conversions = conversions_1.default.getIn([fromTypeSystem, toTypeSystem]);
     if (conversions === undefined) {
         throw new Error(`Conversions from '${fromTypeSystem}' to '${toTypeSystem}' are not supported`);
     }
@@ -28,10 +28,10 @@ const objectifyConversion = (fromTypeSystem, toTypeSystem, conversion) => {
     });
 };
 const findConversionFromType = (fromTypeSystem, toTypeSystem, fromType) => {
-    let conversions = conversionsForTypeSystems(fromTypeSystem, toTypeSystem);
-    let conversion = conversions.find(conversion => typeof conversion.get(0) === 'string'
+    const conversions = conversionsForTypeSystems(fromTypeSystem, toTypeSystem);
+    const conversion = conversions.find(conversion => typeof conversion.get(0) === 'string'
         ? conversion.get(0) === fromType
-        : Boolean(fromType.match(conversion.get(0))));
+        : !!fromType.match(conversion.get(0)));
     if (conversion === undefined) {
         throw new Error(`Conversion from '${fromTypeSystem}' to '${toTypeSystem}' for ` +
             `source type '${fromType}' is not supported`);
@@ -39,10 +39,10 @@ const findConversionFromType = (fromTypeSystem, toTypeSystem, fromType) => {
     return objectifyConversion(fromTypeSystem, toTypeSystem, conversion);
 };
 const findConversionToType = (fromTypeSystem, toTypeSystem, toType) => {
-    let conversions = conversionsForTypeSystems(fromTypeSystem, toTypeSystem);
-    let conversion = conversions.find(conversion => typeof conversion.get(1) === 'string'
+    const conversions = conversionsForTypeSystems(fromTypeSystem, toTypeSystem);
+    const conversion = conversions.find(conversion => typeof conversion.get(1) === 'string'
         ? conversion.get(1) === toType
-        : Boolean(toType.match(conversion.get(1))));
+        : !!toType.match(conversion.get(1)));
     if (conversion === undefined) {
         throw new Error(`Conversion from '${fromTypeSystem}' to '${toTypeSystem}' for ` +
             `target type '${toType}' is not supported`);
@@ -50,10 +50,7 @@ const findConversionToType = (fromTypeSystem, toTypeSystem, toType) => {
     return objectifyConversion(fromTypeSystem, toTypeSystem, conversion);
 };
 // High-level type system API
-const ascTypeForProtocol = (protocol, protocolType) => findConversionFromType(protocol, 'AssemblyScript', protocolType).getIn([
-    'to',
-    'type',
-]);
+const ascTypeForProtocol = (protocol, protocolType) => findConversionFromType(protocol, 'AssemblyScript', protocolType).getIn(['to', 'type']);
 exports.ascTypeForProtocol = ascTypeForProtocol;
 // TODO: this can be removed/replaced by the function above
 const ascTypeForEthereum = (ethereumType) => (0, exports.ascTypeForProtocol)('ethereum', ethereumType);

package/dist/codegen/typescript.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GENERATED_FILE_NOTE = exports.moduleImports = exports.nullableType = exports.param = exports.staticMethod = exports.method = exports.klassMember = exports.klass = exports.arrayType = exports.namedType = exports.ModuleImports = exports.ArrayType = exports.NullableType = exports.NamedType = exports.ClassMember = exports.Class = exports.StaticMethod = exports.Method = exports.Param = void 0;
+exports.staticMethod = exports.StaticMethod = exports.param = exports.Param = exports.nullableType = exports.NullableType = exports.namedType = exports.NamedType = exports.moduleImports = exports.ModuleImports = exports.method = exports.Method = exports.klassMember = exports.klass = exports.GENERATED_FILE_NOTE = exports.ClassMember = exports.Class = exports.arrayType = exports.ArrayType = void 0;
 class Param {
     name;
     type;
@@ -119,7 +119,7 @@ class NamedType {
         return this;
     }
     isPrimitive() {
-        let primitives = [
+        const primitives = [
             'boolean',
             'u8',
             'i8',

package/dist/codegen/util.js

@@ -2,18 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unrollTuple = exports.isTupleMatrixType = exports.isTupleArrayType = exports.containsTupleType = exports.isTupleType = exports.disambiguateNames = void 0;
 function disambiguateNames({ values, getName, setName, }) {
-    let collisionCounter = new Map();
+    const collisionCounter = new Map();
     return values.map((value, index) => {
-        let name = getName(value, index);
-        let counter = collisionCounter.get(name);
+        const name = getName(value, index);
+        const counter = collisionCounter.get(name);
         if (counter === undefined) {
             collisionCounter.set(name, 1);
             return setName(value, name);
         }
-        else {
-            collisionCounter.set(name, counter + 1);
-            return setName(value, `${name}${counter}`);
-        }
+        collisionCounter.set(name, counter + 1);
+        return setName(value, `${name}${counter}`);
     });
 }
 exports.disambiguateNames = disambiguateNames;
@@ -34,7 +32,7 @@ function isTupleMatrixType(t) {
 }
 exports.isTupleMatrixType = isTupleMatrixType;
 const unrollTuple = ({ path, value, }) => value.components.reduce((acc, component, index) => {
-    let name = component.name || `value${index}`;
+    const name = component.name || `value${index}`;
     return acc.concat(component.type === 'tuple'
         ? (0, exports.unrollTuple)({ path: [...path, name], index, value: component })
         : [{ path: [...path, name], type: component.type }]);

package/dist/command-helpers/abi.js

@@ -4,36 +4,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadAbiFromBlockScout = exports.loadAbiFromEtherscan = void 0;
-const spinner_1 = require("./spinner");
-const node_fetch_1 = __importDefault(require("node-fetch"));
 const immutable_1 = __importDefault(require("immutable"));
+const node_fetch_1 = __importDefault(require("node-fetch"));
+const spinner_1 = require("./spinner");
 const loadAbiFromEtherscan = async (ABICtor, network, address) => await (0, spinner_1.withSpinner)(`Fetching ABI from Etherscan`, `Failed to fetch ABI from Etherscan`, `Warnings while fetching ABI from Etherscan`, async () => {
     const scanApiUrl = getEtherscanLikeAPIUrl(network);
-    let result = await (0, node_fetch_1.default)(`${scanApiUrl}?module=contract&action=getabi&address=${address}`);
-    let json = await result.json();
+    const result = await (0, node_fetch_1.default)(`${scanApiUrl}?module=contract&action=getabi&address=${address}`);
+    const json = await result.json();
     // Etherscan returns a JSON object that has a `status`, a `message` and
     // a `result` field. The `status` is '0' in case of errors and '1' in
     // case of success
     if (json.status === '1') {
         return new ABICtor('Contract', undefined, immutable_1.default.fromJS(JSON.parse(json.result)));
     }
-    else {
-        throw new Error('ABI not found, try loading it from a local file');
-    }
+    throw new Error('ABI not found, try loading it from a local file');
 });
 exports.loadAbiFromEtherscan = loadAbiFromEtherscan;
 const loadAbiFromBlockScout = async (ABICtor, network, address) => await (0, spinner_1.withSpinner)(`Fetching ABI from BlockScout`, `Failed to fetch ABI from BlockScout`, `Warnings while fetching ABI from BlockScout`, async () => {
-    let result = await (0, node_fetch_1.default)(`https://blockscout.com/${network.replace('-', '/')}/api?module=contract&action=getabi&address=${address}`);
-    let json = await result.json();
+    const result = await (0, node_fetch_1.default)(`https://blockscout.com/${network.replace('-', '/')}/api?module=contract&action=getabi&address=${address}`);
+    const json = await result.json();
     // BlockScout returns a JSON object that has a `status`, a `message` and
     // a `result` field. The `status` is '0' in case of errors and '1' in
     // case of success
     if (json.status === '1') {
         return new ABICtor('Contract', undefined, immutable_1.default.fromJS(JSON.parse(json.result)));
     }
-    else {
-        throw new Error('ABI not found, try loading it from a local file');
-    }
+    throw new Error('ABI not found, try loading it from a local file');
 });
 exports.loadAbiFromBlockScout = loadAbiFromBlockScout;
 const getEtherscanLikeAPIUrl = (network) => {

package/dist/command-helpers/auth.js

@@ -27,17 +27,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.saveDeployKey = exports.identifyDeployKey = void 0;
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_os_1 = __importDefault(require("node:os"));
+const node_path_1 = __importDefault(require("node:path"));
 const toolbox = __importStar(require("gluegun"));
 const node_1 = require("./node");
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const os_1 = __importDefault(require("os"));
-const homedir = os_1.default.homedir();
-const CONFIG_PATH = path_1.default.join(homedir, '/.graph-cli.json');
+const homedir = node_os_1.default.homedir();
+const CONFIG_PATH = node_path_1.default.join(homedir, '/.graph-cli.json');
 const getConfig = () => {
     let config;
     try {
-        config = JSON.parse(fs_1.default.readFileSync(CONFIG_PATH).toString());
+        config = JSON.parse(node_fs_1.default.readFileSync(CONFIG_PATH).toString());
     }
     catch {
         config = {};
@@ -51,16 +51,14 @@ const identifyDeployKey = async (node, deployKey) => {
     if (deployKey !== undefined) {
         return deployKey;
     }
-    else {
-        try {
-            node = (0, node_1.normalizeNodeUrl)(node);
-            const config = getConfig();
-            return config[node];
-        }
-        catch (e) {
-            toolbox.print.warning(`Could not get deploy key: ${e.message}`);
-            toolbox.print.info(`Continuing without a deploy key\n`);
-        }
+    try {
+        node = (0, node_1.normalizeNodeUrl)(node);
+        const config = getConfig();
+        return config[node];
+    }
+    catch (e) {
+        toolbox.print.warning(`Could not get deploy key: ${e.message}`);
+        toolbox.print.info(`Continuing without a deploy key\n`);
     }
 };
 exports.identifyDeployKey = identifyDeployKey;
@@ -69,7 +67,7 @@ const saveDeployKey = async (node, deployKey) => {
         node = (0, node_1.normalizeNodeUrl)(node);
         const config = getConfig();
         config[node] = deployKey;
-        fs_1.default.writeFileSync(CONFIG_PATH, JSON.stringify(config));
+        node_fs_1.default.writeFileSync(CONFIG_PATH, JSON.stringify(config));
     }
     catch (e) {
         throw new Error(`Error storing deploy key: ${e.message}`);

package/dist/command-helpers/compiler.js

@@ -27,16 +27,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCompiler = void 0;
-const URL = require('url').URL;
-const ipfs_http_client_1 = __importDefault(require("ipfs-http-client"));
+const node_url_1 = require("node:url");
 const toolbox = __importStar(require("gluegun"));
+const ipfs_http_client_1 = __importDefault(require("ipfs-http-client"));
 const compiler_1 = __importDefault(require("../compiler"));
 // Helper function to construct a subgraph compiler
 function createCompiler(manifest, { ipfs, headers, outputDir, outputFormat, skipMigrations, blockIpfsMethods, protocol, }) {
     // Parse the IPFS URL
     let url;
     try {
-        url = ipfs ? new URL(ipfs) : undefined;
+        url = ipfs ? new node_url_1.URL(ipfs) : undefined;
     }
     catch (e) {
         toolbox.print.error(`Invalid IPFS URL: ${ipfs}
@@ -46,18 +46,18 @@ The IPFS URL must be of the following format: http(s)://host[:port]/[path]`);
     // Connect to the IPFS node (if a node address was provided)
     ipfs = ipfs
         ? (0, ipfs_http_client_1.default)({
-            protocol: url.protocol.replace(/[:]+$/, ''),
-            host: url.hostname,
-            port: url.port,
-            'api-path': url.pathname.replace(/\/$/, '') + '/api/v0/',
+            protocol: url?.protocol.replace(/[:]+$/, ''),
+            host: url?.hostname,
+            port: url?.port,
+            'api-path': url?.pathname.replace(/\/$/, '') + '/api/v0/',
             headers,
         })
         : undefined;
     return new compiler_1.default({
         ipfs,
         subgraphManifest: manifest,
-        outputDir: outputDir,
-        outputFormat: outputFormat,
+        outputDir,
+        outputFormat,
         skipMigrations,
         blockIpfsMethods,
         protocol,

package/dist/command-helpers/fs.js

@@ -4,6 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.displayPath = void 0;
-const path_1 = __importDefault(require("path"));
-const displayPath = (p) => path_1.default.relative(process.cwd(), p);
+const node_path_1 = __importDefault(require("node:path"));
+const displayPath = (p) => node_path_1.default.relative(process.cwd(), p);
 exports.displayPath = displayPath;

package/dist/command-helpers/gluegun.js

@@ -27,17 +27,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fixParameters = void 0;
 const fixParameters = (parameters, booleanOptions) => {
-    let unexpectedStringOptions = Object.keys(booleanOptions)
+    const unexpectedStringOptions = Object.keys(booleanOptions)
         .filter(key => typeof booleanOptions[key] === 'string')
         .map(key => ({ key, value: booleanOptions[key] }));
-    let optionNames = unexpectedStringOptions
+    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) {
-        let params = parameters.array;
+        const params = parameters.array;
         params.unshift(unexpectedStringOptions[0].value);
         return params;
     }

package/dist/command-helpers/jsonrpc.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createJsonRpcClient = void 0;
-const jayson_1 = __importDefault(require("jayson"));
 const gluegun_1 = require("gluegun");
+const jayson_1 = __importDefault(require("jayson"));
 function createJsonRpcClient(url) {
     const params = {
         host: url.hostname,
@@ -17,13 +17,11 @@ function createJsonRpcClient(url) {
     if (url.protocol === 'https:') {
         return jayson_1.default.Client.https(params);
     }
-    else if (url.protocol === 'http:') {
+    if (url.protocol === 'http:') {
         return jayson_1.default.Client.http(params);
     }
-    else {
-        gluegun_1.print.error(`Unsupported protocol: ${url.protocol.substring(0, url.protocol.length - 1)}`);
-        gluegun_1.print.error('The Graph Node URL must be of the following format: http(s)://host[:port]/[path]');
-        return null;
-    }
+    gluegun_1.print.error(`Unsupported protocol: ${url.protocol.substring(0, url.protocol.length - 1)}`);
+    gluegun_1.print.error('The Graph Node URL must be of the following format: http(s)://host[:port]/[path]');
+    return null;
 }
 exports.createJsonRpcClient = createJsonRpcClient;