@graphprotocol/graph-cli 0.60.1-alpha-20231103131932-a02eb0c → 0.61.0-alpha-20231106135106-bbe3519

package/CHANGELOG.md

@@ -1,14 +1,13 @@
 # @graphprotocol/graph-cli
 
-## 0.60.1-alpha-20231103131932-a02eb0c
+## 0.61.0-alpha-20231106135106-bbe3519
 
-### Patch Changes
+### Minor Changes
 
-- [#1490](https://github.com/graphprotocol/graph-tooling/pull/1490)
-  [`a02eb0c`](https://github.com/graphprotocol/graph-tooling/commit/a02eb0c4070500e5c8d018741c4f4c16bbd0c6c6)
-  Thanks [@mangas](https://github.com/mangas)! - dependencies updates:
-  - Updated dependency [`prettier@3.0.3` ↗︎](https://www.npmjs.com/package/prettier/v/3.0.3) (from
-    `1.19.1`, in `dependencies`)
+- [#1493](https://github.com/graphprotocol/graph-tooling/pull/1493)
+  [`bbe3519`](https://github.com/graphprotocol/graph-tooling/commit/bbe3519799a3b848af22f6f118e9a5b1e7da115f)
+  Thanks [@incrypto32](https://github.com/incrypto32)! - Fix codegen issues when using derived
+  loaders with Bytes as ID's
 
 ## 0.60.0
 

package/dist/codegen/schema.js

@@ -267,7 +267,7 @@ class SchemaCodeGenerator {
             return null;
         }
         schemaCodeGeneratorDebug.extend('_generateDerivedFieldGetter')("Found object type definition for derived field's base type: %M", obj);
-        const idf = IdField.fromTypeDef(obj);
+        const idf = IdField.fromTypeDef(entityDef);
         const idIsBytes = idf.typeName() == 'Bytes';
         const toValueString = idIsBytes ? '.toBytes().toHexString()' : '.toString()';
         return tsCodegen.method(`get ${name}`, [], returnType, `

package/dist/codegen/schema.test.js

@@ -542,6 +542,86 @@ describe('Schema code generator', () => {
             ],
         });
     });
+    test('get related method for WithBytes entity', () => {
+        const codegen = createSchemaCodeGen(`
+      type WithBytes @entity {
+        id: Bytes!
+        related: [RelatedBytes!]! @derivedFrom(field: "related")
+      }
+      
+      type RelatedBytes @entity {
+        id: ID!
+        related: WithBytes!
+      }
+    `);
+        const generatedTypes = codegen.generateTypes();
+        testEntity(generatedTypes, {
+            name: 'WithBytes',
+            members: [],
+            methods: [
+                {
+                    name: 'constructor',
+                    params: [new typescript_1.Param('id', new typescript_1.NamedType('Bytes'))],
+                    returnType: undefined,
+                    body: `
+          super()
+          this.set('id', Value.fromBytes(id));`,
+                },
+                {
+                    name: 'save',
+                    params: [],
+                    returnType: new typescript_1.NamedType('void'),
+                    body: `
+            let id = this.get('id');
+            assert(id != null, 'Cannot save WithBytes entity without an ID');
+            if (id) {
+              assert(id.kind == ValueKind.BYTES, \`Entities of type WithBytes must have an ID of type Bytes but the id '\${id.displayData()}' is of type \${id.displayKind()}\`);
+              store.set('WithBytes', id.toBytes().toHexString(), this);
+            }
+          `,
+                },
+                {
+                    name: 'load',
+                    static: true,
+                    params: [new typescript_1.Param('id', new typescript_1.NamedType('Bytes'))],
+                    returnType: new typescript_1.NullableType(new typescript_1.NamedType('WithBytes')),
+                    body: `return changetype<WithBytes | null>(store.get('WithBytes', id.toHexString()));`,
+                },
+                {
+                    name: 'loadInBlock',
+                    static: true,
+                    params: [new typescript_1.Param('id', new typescript_1.NamedType('Bytes'))],
+                    returnType: new typescript_1.NullableType(new typescript_1.NamedType('WithBytes')),
+                    body: `return changetype<WithBytes | null>(store.get_in_block('WithBytes', id.toHexString()));`,
+                },
+                {
+                    name: 'get id',
+                    params: [],
+                    returnType: new typescript_1.NamedType('Bytes'),
+                    body: `let value = this.get("id")
+          if (!value || value.kind == ValueKind.NULL) {
+            throw new Error("Cannot return null for a required field.")
+          } else {
+            return value.toBytes()
+          }
+          `,
+                },
+                {
+                    name: 'set id',
+                    params: [new typescript_1.Param('value', new typescript_1.NamedType('Bytes'))],
+                    returnType: undefined,
+                    body: `this.set('id', Value.fromBytes(value));`,
+                },
+                {
+                    name: 'get related',
+                    params: [],
+                    returnType: new typescript_1.NamedType('RelatedBytesLoader'),
+                    body: `return new RelatedBytesLoader('WithBytes', this.get('id')!.toBytes().toHexString(), 'related');`,
+                },
+                // Add any additional getters and setters for other fields if necessary
+            ],
+        });
+    });
     test('no derived loader for interface', () => {
         const codegen = createSchemaCodeGen(`
     interface IExample {

package/dist/compiler/index.js

@@ -50,9 +50,9 @@ class Compiler {
         this.libsDirs = [];
         this.protocol = this.options.protocol;
         this.ABI = this.protocol.getABI();
-        // if (options.protocol.name === 'substreams') {
-        //   return;
-        // }
+        if (options.protocol.name === 'substreams') {
+            return;
+        }
         for (let dir = path_1.default.resolve(this.sourceDir); 
         // Terminate after the root dir or when we have found node_modules
         dir !== undefined; 
@@ -245,7 +245,7 @@ class Compiler {
         return missingHandlers;
     }
     _compileDataSourceMapping(protocol, dataSource, mappingPath, compiledFiles, spinner, validate = false) {
-        if (protocol.name == 'substreams' && !dataSource.getIn(["mapping", "file"])) {
+        if (protocol.name == 'substreams') {
             return;
         }
         try {
@@ -382,9 +382,6 @@ class Compiler {
                         const packageContent = fs_extra_1.default.readFileSync(packageFile);
                         return path_1.default.relative(this.options.outputDir, this._writeSubgraphFile(packageFile, packageContent, this.sourceDir, this.subgraphDir(this.options.outputDir, dataSource), spinner));
                     }));
-                    if (updatedDataSource.getIn(["mapping", "file"])) {
-                        updatedDataSource = updatedDataSource.updateIn(['mapping', 'file'], (mappingFile) => path_1.default.relative(this.options.outputDir, path_1.default.resolve(this.sourceDir, mappingFile)));
-                    }
                     return updatedDataSource;
                 }
                 // The mapping file is already being written to the output
@@ -444,14 +441,6 @@ class Compiler {
                         keyPath: ['dataSources', i, 'source', 'package', 'file'],
                         value: await this._uploadFileToIPFS(dataSource.getIn(['source', 'package', 'file']), uploadedFiles, spinner),
                     });
-                    console.log(dataSource.getIn(["mapping", "file"]));
-                    console.log(dataSource.toJS());
-                    if (dataSource.getIn(["mapping", "file"])) {
-                        updates.push({
-                            keyPath: ['dataSources', i, 'mapping', 'file'],
-                            value: await this._uploadFileToIPFS(dataSource.getIn(['mapping', 'file']), uploadedFiles, spinner),
-                        });
-                    }
                 }
             }
             else {

package/dist/protocols/substreams/manifest.graphql

@@ -32,18 +32,14 @@ type DataSource {
 
 type SubstreamsSource {
   package: SubstreamsPackage!
-  startBlock: BigInt
 }
 
 type SubstreamsPackage {
   moduleName: String!
   file: String!
-  params: String
 }
 
 type SubstreamMapping {
   apiVersion: String!
   kind: String!
-  file: File
-  handler: String
 }

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.60.1-alpha-20231103131932-a02eb0c",
+  "version": "0.61.0-alpha-20231106135106-bbe3519",
   "commands": {
     "add": {
       "id": "add",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.60.1-alpha-20231103131932-a02eb0c",
+  "version": "0.61.0-alpha-20231106135106-bbe3519",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {
@@ -39,7 +39,7 @@
     "ipfs-http-client": "55.0.0",
     "jayson": "4.0.0",
     "js-yaml": "3.14.1",
-    "prettier": "3.0.3",
+    "prettier": "1.19.1",
     "request": "2.88.2",
     "semver": "7.4.0",
     "sync-request": "6.1.0",