@graphprotocol/graph-cli 0.52.1-alpha-20230719201219-dde01c9 → 0.53.0-alpha-20230721161547-13ba32e

package/CHANGELOG.md

@@ -1,6 +1,13 @@
 # @graphprotocol/graph-cli
 
-## 0.52.1-alpha-20230719201219-dde01c9
+## 0.53.0-alpha-20230721161547-13ba32e
+
+### Minor Changes
+
+- [#1406](https://github.com/graphprotocol/graph-tooling/pull/1406)
+  [`34030b5`](https://github.com/graphprotocol/graph-tooling/commit/34030b5808f0f3996d8ea2133eedf19a0b3d9548)
+  Thanks [@incrypto32](https://github.com/incrypto32)! - Fix derived loaders not working failing for
+  entities with Bytes as ID's
 
 ### Patch Changes
 
@@ -9,8 +16,13 @@
   Thanks [@saihaj](https://github.com/saihaj)! - only update `network.json` file during `graph add`
   if it exists
 
+- [#1402](https://github.com/graphprotocol/graph-tooling/pull/1402)
+  [`f0ce6c0`](https://github.com/graphprotocol/graph-tooling/commit/f0ce6c00e8adab94847ee3f9fde187513583b86c)
+  Thanks [@saihaj](https://github.com/saihaj)! - show a descriptive error message and do not hang if
+  there is a deploy key issue
+
 - [#1403](https://github.com/graphprotocol/graph-tooling/pull/1403)
-  [`dde01c9`](https://github.com/graphprotocol/graph-tooling/commit/dde01c95527b6473e0eda6a533aa524d83f41e7c)
+  [`dfa9ee1`](https://github.com/graphprotocol/graph-tooling/commit/dfa9ee1184bb1af499289baa92eb8c3b3cf37f85)
   Thanks [@saihaj](https://github.com/saihaj)! - do not ask for local path when trying to add more
   contracts during init
 

package/dist/codegen/schema.js

@@ -244,8 +244,18 @@ class SchemaCodeGenerator {
         const name = fieldDef.name.value;
         const gqlType = fieldDef.type;
         const returnType = this._returnTypeForDervied(gqlType);
+        const obj = this.schema.ast.definitions.find(def => {
+            if (def.kind == 'ObjectTypeDefinition') {
+                const defobj = def;
+                return defobj.name.value == this._baseType(gqlType);
+            }
+            return false;
+        });
+        const idf = IdField.fromTypeDef(obj);
+        const idIsBytes = idf.typeName() == 'Bytes';
+        const toValueString = idIsBytes ? '.toBytes().toHexString()' : '.toString()';
         return tsCodegen.method(`get ${name}`, [], returnType, `
-        return new ${returnType}('${entityName}', this.get('id')!.toString(), '${name}')
+        return new ${returnType}('${entityName}', this.get('id')!${toValueString}, '${name}')
       `);
     }
     _returnTypeForDervied(gqlType) {

package/dist/codegen/schema.test.js

@@ -428,11 +428,13 @@ describe('Schema code generator', () => {
     type Worker implements Employee @entity {
       id: Bytes!
       name: String!
+      tasks: [Task!]
    }
 
     type Task @entity {
       id: Bytes!
       employee: Employee!
+      workers: [Worker!] @derivedFrom(field: "tasks")
       worker: Worker!
    }
 `);
@@ -530,6 +532,12 @@ describe('Schema code generator', () => {
                     returnType: undefined,
                     body: "\n      this.set('worker', Value.fromBytes(value))\n    ",
                 },
+                {
+                    name: 'get workers',
+                    params: [],
+                    returnType: new typescript_1.NamedType('WorkerLoader'),
+                    body: "\n      return new WorkerLoader('Task', this.get('id')!.toBytes().toHexString(), 'workers')\n    ",
+                },
             ],
         });
     });

package/dist/commands/deploy.js

@@ -107,8 +107,6 @@ class DeployCommand extends core_1.Command {
                 required: true,
             });
         }
-        // eslint-disable-next-line @typescript-eslint/no-this-alias -- request needs it
-        const self = this;
         const deploySubgraph = async (ipfsHash) => {
             const spinner = gluegun_1.print.spin(`Deploying to Graph node ${requestUrl}`);
             client.request('subgraph_deploy', {
@@ -137,7 +135,11 @@ class DeployCommand extends core_1.Command {
       $ graph create --node ${node} ${subgraphName}`;
                         }
                     }
-                    self.error(errorMessage, { exit: 1 });
+                    if (jsonRpcError.message.match(/auth failure/)) {
+                        errorMessage += '\nYou may need to authenticate first.';
+                    }
+                    spinner.fail(errorMessage);
+                    this.exit(1);
                 }
                 else if (requestError) {
                     spinner.fail(`HTTP error deploying the subgraph ${requestError.code}`);
@@ -171,7 +173,10 @@ class DeployCommand extends core_1.Command {
         // we are provided the IPFS hash, so we deploy directly
         if (ipfsHash) {
             // Connect to the IPFS node (if a node address was provided)
-            const ipfsClient = (0, ipfs_http_client_1.create)({ url: (0, compiler_1.appendApiVersionForGraph)(ipfs.toString()), headers });
+            const ipfsClient = (0, ipfs_http_client_1.create)({
+                url: (0, compiler_1.appendApiVersionForGraph)(ipfs.toString()),
+                headers,
+            });
             // Fetch the manifest from IPFS
             const manifestBuffer = ipfsClient.cat(ipfsHash);
             let manifestFile = '';

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.52.1-alpha-20230719201219-dde01c9",
+  "version": "0.53.0-alpha-20230721161547-13ba32e",
   "commands": {
     "add": {
       "id": "add",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.52.1-alpha-20230719201219-dde01c9",
+  "version": "0.53.0-alpha-20230721161547-13ba32e",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {