@graphprotocol/graph-cli 0.45.0-alpha-20230403193800-82c814f → 0.45.0-alpha-20230403195400-e8bdaff

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @graphprotocol/graph-cli
 
-## 0.45.0-alpha-20230403193800-82c814f
+## 0.45.0-alpha-20230403195400-e8bdaff
 
 ### Minor Changes
 
@@ -15,6 +15,13 @@
 
 ### Patch Changes
 
+- [#1216](https://github.com/graphprotocol/graph-tooling/pull/1216)
+  [`f088870`](https://github.com/graphprotocol/graph-tooling/commit/f088870123c03619a17dd07f5bbc8640fc1dba3b)
+  Thanks [@renovate](https://github.com/apps/renovate)! - dependencies updates:
+
+  - Updated dependency [`yaml@1.10.2` ↗︎](https://www.npmjs.com/package/yaml/v/1.10.2) (from
+    `1.9.2`, in `dependencies`)
+
 - [#1218](https://github.com/graphprotocol/graph-tooling/pull/1218)
   [`01046d9`](https://github.com/graphprotocol/graph-tooling/commit/01046d946f42f436fb10d54c5c959012cd6fef67)
   Thanks [@saihaj](https://github.com/saihaj)! - dependencies updates:
@@ -53,13 +60,6 @@
   - Updated dependency [`fs-extra@9.1.0` ↗︎](https://www.npmjs.com/package/fs-extra/v/9.1.0) (from
     `9.0.0`, in `dependencies`)
 
-- [#1239](https://github.com/graphprotocol/graph-tooling/pull/1239)
-  [`82c814f`](https://github.com/graphprotocol/graph-tooling/commit/82c814f7d2a197d206fecca35552f9b30b0aa752)
-  Thanks [@renovate](https://github.com/apps/renovate)! - dependencies updates:
-
-  - Updated dependency [`jayson@3.7.0` ↗︎](https://www.npmjs.com/package/jayson/v/3.7.0) (from
-    `3.6.6`, in `dependencies`)
-
 - [#1240](https://github.com/graphprotocol/graph-tooling/pull/1240)
   [`ef99d62`](https://github.com/graphprotocol/graph-tooling/commit/ef99d6234de249a04e9d5f09d1f0909f9261d413)
   Thanks [@renovate](https://github.com/apps/renovate)! - dependencies updates:
@@ -67,13 +67,6 @@
   - Updated dependency [`js-yaml@3.14.1` ↗︎](https://www.npmjs.com/package/js-yaml/v/3.14.1) (from
     `3.13.1`, in `dependencies`)
 
-- [#1243](https://github.com/graphprotocol/graph-tooling/pull/1243)
-  [`5682ab5`](https://github.com/graphprotocol/graph-tooling/commit/5682ab5aab38013aa68936d70458962f2927db75)
-  Thanks [@renovate](https://github.com/apps/renovate)! - dependencies updates:
-
-  - Updated dependency [`yaml@1.10.2` ↗︎](https://www.npmjs.com/package/yaml/v/1.10.2) (from
-    `1.9.2`, in `dependencies`)
-
 - [#1207](https://github.com/graphprotocol/graph-tooling/pull/1207)
   [`ad275b3`](https://github.com/graphprotocol/graph-tooling/commit/ad275b31e635dab03cfefda00617ef9f612b01c0)
   Thanks [@saihaj](https://github.com/saihaj)! - bring back short hand for version and help

package/dist/codegen/schema.js

@@ -26,6 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable unicorn/no-array-for-each */
 const immutable_1 = __importDefault(require("immutable"));
 const typesCodegen = __importStar(require("./types"));
 const tsCodegen = __importStar(require("./typescript"));

package/dist/codegen/schema.test.js

@@ -43,6 +43,7 @@ const testEntity = (generatedTypes, expectedEntity) => {
     expect(members).toStrictEqual(expectedEntity.members);
     for (const expectedMethod of expectedEntity.methods) {
         const method = methods.find((method) => method.name === expectedMethod.name);
+        // eslint-disable-next-line @typescript-eslint/no-unused-expressions
         expectedMethod.static
             ? expect(method instanceof typescript_1.StaticMethod).toBe(true)
             : expect(method instanceof typescript_1.Method).toBe(true);

package/dist/command-helpers/network.js

@@ -44,10 +44,10 @@ const updateSubgraphNetwork = async (manifest, network, networksFile, identifier
                 ...template,
                 network,
             })));
-        const unsusedSources = networkSources.filter(x => !subgraphSources.includes(x));
-        unsusedSources.forEach(source => {
+        const unusedSources = networkSources.filter(x => !subgraphSources.includes(x));
+        for (const source of unusedSources) {
             (0, spinner_1.step)(spinner, `dataSource '${source}' from '${networksFile}' not found in ${manifest}`);
-        });
+        }
         const yaml_doc = new yaml_1.default.Document();
         yaml_doc.contents = subgraph;
         return yaml_doc.toString();

package/dist/commands/init.js

@@ -622,9 +622,9 @@ async function initSubgraphFromExample({ fromExample, allowSimpleName, subgraphN
             const pkgJsonFilename = gluegun_1.filesystem.path(directory, 'package.json');
             const pkgJson = await gluegun_1.filesystem.read(pkgJsonFilename, 'json');
             pkgJson.name = (0, subgraph_1.getSubgraphBasename)(subgraphName);
-            Object.keys(pkgJson.scripts).forEach(name => {
+            for (const name of Object.keys(pkgJson.scripts)) {
                 pkgJson.scripts[name] = pkgJson.scripts[name].replace('example', subgraphName);
-            });
+            }
             delete pkgJson['license'];
             delete pkgJson['repository'];
             // Remove example's cli in favor of the local one (added via `npm link`)

package/dist/commands/test.js

@@ -125,6 +125,7 @@ async function runBinary(datasource, opts) {
         this.log(`Download link: ${url}`);
     }
     const binary = new binary_install_raw_1.Binary(platform, url, versionOpt || latestVersion);
+    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
     forceOpt ? await binary.install(true) : await binary.install(false);
     const args = [];
     if (coverageOpt)
@@ -133,6 +134,7 @@ async function runBinary(datasource, opts) {
         args.push('-r');
     if (datasource)
         args.push(datasource);
+    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
     args.length > 0 ? binary.run(...args) : binary.run();
 }
 async function getPlatform(logsOpt) {
@@ -179,9 +181,9 @@ async function getLinuxInfo() {
             .split('\n')
             .map(p => p.split('='));
         const linuxInfo = {};
-        infoArray.forEach(val => {
+        for (const val of infoArray) {
             linuxInfo[val[0].toLowerCase()] = val[1];
-        });
+        }
         return linuxInfo;
     }
     catch (error) {

package/dist/compiler/index.js

@@ -385,19 +385,19 @@ class Compiler {
                 }
             }
             // Upload all mappings
-            if (this.protocol.name !== 'substreams') {
+            if (this.protocol.name === 'substreams') {
                 for (const [i, dataSource] of subgraph.get('dataSources').entries()) {
                     updates.push({
-                        keyPath: ['dataSources', i, 'mapping', 'file'],
-                        value: await this._uploadFileToIPFS(dataSource.getIn(['mapping', 'file']), uploadedFiles, spinner),
+                        keyPath: ['dataSources', i, 'source', 'package', 'file'],
+                        value: await this._uploadFileToIPFS(dataSource.getIn(['source', 'package', 'file']), uploadedFiles, spinner),
                     });
                 }
             }
             else {
                 for (const [i, dataSource] of subgraph.get('dataSources').entries()) {
                     updates.push({
-                        keyPath: ['dataSources', i, 'source', 'package', 'file'],
-                        value: await this._uploadFileToIPFS(dataSource.getIn(['source', 'package', 'file']), uploadedFiles, spinner),
+                        keyPath: ['dataSources', i, 'mapping', 'file'],
+                        value: await this._uploadFileToIPFS(dataSource.getIn(['mapping', 'file']), uploadedFiles, spinner),
                     });
                 }
             }

package/dist/protocols/ethereum/abi.js

@@ -29,7 +29,7 @@ const buildSignatureParameter = (input) => {
         return `(${input.get('indexed') ? 'indexed ' : ''}${input
             .get('components')
             .map((component) => buildSignatureParameter(component))
-            .join(',')})[${length ? length : ''}]`;
+            .join(',')})[${length || ''}]`;
     }
     if (input.get('type').match(TUPLE_MATRIX_PATTERN)) {
         const length1 = input.get('type').match(TUPLE_MATRIX_PATTERN)[1];
@@ -37,7 +37,7 @@ const buildSignatureParameter = (input) => {
         return `(${input.get('indexed') ? 'indexed ' : ''}${input
             .get('components')
             .map((component) => buildSignatureParameter(component))
-            .join(',')})[${length1 ? length1 : ''}][${length2 ? length2 : ''}]`;
+            .join(',')})[${length1 || ''}][${length2 || ''}]`;
     }
     return `${input.get('indexed') ? 'indexed ' : ''}${input.get('type')}`;
 };

package/dist/protocols/ethereum/codegen/abi.js

@@ -26,6 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable unicorn/no-array-for-each */
 const fs_1 = __importDefault(require("fs"));
 const immutable_1 = __importDefault(require("immutable"));
 const sync_request_1 = __importDefault(require("sync-request"));
@@ -159,7 +160,7 @@ class AbiCodeGenerator {
                 setName: (input, name) => input.set('name', name),
             });
             const namesAndTypes = [];
-            inputs.forEach((input, index) => {
+            for (const [index, input] of inputs.entries()) {
                 // Generate getters and classes for event params
                 const paramObject = this._generateInputOrOutput(input, index, eventClassName, `event`, `parameters`);
                 paramsClass.addMethod(paramObject.getter);
@@ -172,7 +173,7 @@ class AbiCodeGenerator {
                     namesAndTypes.push({ name: paramObject.getter.name.slice(4), type: ethType });
                 }
                 tupleClasses.push(...paramObject.classes);
-            });
+            }
             // Then, generate the event class itself
             const klass = tsCodegen.klass(eventClassName, {
                 export: true,
@@ -304,7 +305,7 @@ class AbiCodeGenerator {
             // @ts-expect-error improve typings of disambiguateNames to handle iterables
             setName: (fn, name) => fn.set('_alias', name),
         });
-        functions.forEach(member => {
+        for (const member of functions) {
             const fnName = member.get('name');
             const fnAlias = member.get('_alias');
             const fnSignature = this.abi.functionSignature(member);
@@ -436,7 +437,7 @@ class AbiCodeGenerator {
             // Generate method with an without `try_`.
             klass.addMethod(tsCodegen.method(fnAlias, params, returnType, methodCallBody(false)));
             klass.addMethod(tsCodegen.method('try_' + fnAlias, params, 'ethereum.CallResult<' + returnType + '>', methodCallBody(true)));
-        });
+        }
         return [...types, klass];
     }
     _getTupleParamType(inputOrOutput, index, tupleParentType) {

package/dist/protocols/index.js

@@ -135,6 +135,7 @@ class Protocol {
             substreams: ['mainnet'],
         });
         const allNetworks = [];
+        // eslint-disable-next-line unicorn/no-array-for-each
         networks.forEach(value => {
             allNetworks.push(...value);
         });

package/dist/scaffold/tests.js

@@ -64,7 +64,7 @@ const assignValue = (type) => {
         }
         default: {
             const value = VARIABLES_VALUES[type];
-            return value ? value : `"${type} Not implemented"`;
+            return value || `"${type} Not implemented"`;
         }
     }
 };
@@ -95,7 +95,7 @@ const expectedValue = (type) => {
         }
         default: {
             const value = VARIABLES_VALUES[type];
-            return value ? value : `${type} Not implemented`;
+            return value || `${type} Not implemented`;
         }
     }
 };

package/dist/type-generator.js

@@ -102,15 +102,12 @@ class TypeGenerator {
     async loadSubgraph({ quiet } = { quiet: false }) {
         const subgraphLoadOptions = { protocol: this.protocol, skipValidation: false };
         if (quiet) {
-            return this.options.subgraph
-                ? this.options.subgraph
-                : (await subgraph_1.default.load(this.options.subgraphManifest, subgraphLoadOptions)).result;
+            return (this.options.subgraph ||
+                (await subgraph_1.default.load(this.options.subgraphManifest, subgraphLoadOptions)).result);
         }
         const manifestPath = (0, fs_1.displayPath)(this.options.subgraphManifest);
         return await (0, spinner_1.withSpinner)(`Load subgraph from ${manifestPath}`, `Failed to load subgraph from ${manifestPath}`, `Warnings while loading subgraph from ${manifestPath}`, async (_spinner) => {
-            return this.options.subgraph
-                ? this.options.subgraph
-                : subgraph_1.default.load(this.options.subgraphManifest, subgraphLoadOptions);
+            return (this.options.subgraph || subgraph_1.default.load(this.options.subgraphManifest, subgraphLoadOptions));
         });
     }
     async loadSchema(subgraph) {

package/dist/validation/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateSchema = exports.validateManifest = exports.validateContractValues = exports.validateContract = void 0;
-const contract_1 = require("./contract");
+var contract_1 = require("./contract");
 Object.defineProperty(exports, "validateContract", { enumerable: true, get: function () { return contract_1.validateContract; } });
 Object.defineProperty(exports, "validateContractValues", { enumerable: true, get: function () { return contract_1.validateContractValues; } });
-const manifest_1 = require("./manifest");
+var manifest_1 = require("./manifest");
 Object.defineProperty(exports, "validateManifest", { enumerable: true, get: function () { return manifest_1.validateManifest; } });
-const schema_1 = require("./schema");
+var schema_1 = require("./schema");
 Object.defineProperty(exports, "validateSchema", { enumerable: true, get: function () { return schema_1.validateSchema; } });

package/dist/validation/manifest.js

@@ -30,7 +30,9 @@ const getFieldType = (type, fieldName) => {
     const fieldDef = type
         .get('fields')
         .find((field) => field.getIn(['name', 'value']) === fieldName);
-    return fieldDef !== undefined ? fieldDef.get('type') : undefined;
+    if (fieldDef) {
+        return fieldDef.get('type');
+    }
 };
 /**
  * Resolves a type in the GraphQL schema.

package/dist/validation/schema.js

@@ -188,7 +188,10 @@ def.directives
         ? type.fields.find((field) => field.name.value == 'as').value.value
         : undefined)))
     .reduce((flattened, types_args) => flattened.concat(types_args.reduce((flattened, types_arg) => {
-    types_arg.forEach(type => (type ? flattened.push(type) : undefined));
+    for (const type in types_arg) {
+        if (type)
+            flattened.push(type);
+    }
     return flattened;
 }, [])), []);
 const entityTypeByName = (defs, name) => defs
@@ -215,7 +218,7 @@ const validateInnerFieldType = (defs, def, field) => {
                 entity: def.name.value,
                 message: `\
 Field '${field.name.value}': \
-Unknown type '${typeName}'.${suggestion !== undefined ? ` Did you mean '${suggestion}'?` : ''}`,
+Unknown type '${typeName}'.${suggestion === undefined ? '' : ` Did you mean '${suggestion}'?`}`,
             },
         ]);
 };
@@ -352,16 +355,16 @@ const validateFulltextName = (def, directive) => {
         ]);
 };
 const validateFulltextArgumentName = (def, directive, argument) => {
-    return argument.value.kind != 'StringValue'
-        ? List([
+    return argument.value.kind == 'StringValue'
+        ? List([])
+        : List([
             immutable_1.default.fromJS({
                 loc: directive.name.loc,
                 entity: def.name.value,
                 directive: fulltextDirectiveName(directive),
                 message: `@fulltext argument 'name' must be a string`,
             }),
-        ])
-        : List([]);
+        ]);
 };
 const fulltextDirectiveName = (directive) => {
     const arg = directive.arguments.find((argument) => argument.name.value == 'name');
@@ -737,9 +740,9 @@ const typeDefinitionValidators = {
         : List.of(...validateEntityDirective(def), ...validateEntityID(def), ...validateEntityFields(defs, def), ...validateNoImportDirective(def), ...validateNoFulltext(def)),
     ObjectTypeExtension: (_defs, def) => validateAtLeastOneExtensionField(def),
 };
-const validateTypeDefinition = (defs, def) => typeDefinitionValidators[def.kind] !== undefined
-    ? typeDefinitionValidators[def.kind](defs, def)
-    : List();
+const validateTypeDefinition = (defs, def) => typeDefinitionValidators[def.kind] === undefined
+    ? List()
+    : typeDefinitionValidators[def.kind](defs, def);
 const validateTypeDefinitions = (defs) => defs.reduce((errors, def) => errors.concat(validateTypeDefinition(defs, def)), List());
 const validateNamingCollisionsInTypes = (types) => {
     let seen = Set();

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.45.0-alpha-20230403193800-82c814f",
+  "version": "0.45.0-alpha-20230403195400-e8bdaff",
   "commands": {
     "add": {
       "id": "add",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.45.0-alpha-20230403193800-82c814f",
+  "version": "0.45.0-alpha-20230403195400-e8bdaff",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {
@@ -33,7 +33,7 @@
     "graphql": "15.5.0",
     "immutable": "4.2.1",
     "ipfs-http-client": "34.0.0",
-    "jayson": "3.7.0",
+    "jayson": "3.6.6",
     "js-yaml": "3.14.1",
     "prettier": "1.19.1",
     "request": "2.88.2",
@@ -42,7 +42,7 @@
     "tmp-promise": "3.0.2",
     "web3-eth-abi": "1.7.0",
     "which": "2.0.2",
-    "yaml": "1.10.2"
+    "yaml": "1.9.2"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",