@graphprotocol/graph-cli 0.60.0 → 0.60.1-alpha-20231103131654-82a8eec

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @graphprotocol/graph-cli
 
+## 0.60.1-alpha-20231103131654-82a8eec
+
+### Patch Changes
+
+- [#1490](https://github.com/graphprotocol/graph-tooling/pull/1490)
+  [`82a8eec`](https://github.com/graphprotocol/graph-tooling/commit/82a8eec03c25ce5c1e9edeb97ecf08a6e3a1b9cb)
+  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`)
+
 ## 0.60.0
 
 ### Minor Changes
@@ -657,7 +667,7 @@
 
 - [#1132](https://github.com/graphprotocol/graph-tooling/pull/1132)
   [`719c8f5`](https://github.com/graphprotocol/graph-tooling/commit/719c8f5e890cc2392fb15cdb318b8f55570f9419)
-  Thanks [@cmwhited](https://github.com/cmwhited)! - enable deployment of celo, avalance and
+  Thanks [@cmwhited](https://github.com/cmwhited)! - enable deployment of celo, avalanche and
   arbitrum-one in studio
 
 ## 0.42.1

package/dist/codegen/types/conversions.js

@@ -192,7 +192,7 @@ const ASSEMBLYSCRIPT_TO_ETHEREUM_VALUE = [
         /^tuple\[([0-9]+)?\]$/,
         (code) => `ethereum.Value.fromTupleArray(${code})`,
     ],
-    // Multi dimentional arrays
+    // Multi dimensional arrays
     [
         'Array<Array<Address>>',
         /^address\[([0-9]+)?\]\[([0-9]+)?\]$/,

package/dist/compiler/asc.js

@@ -77,7 +77,7 @@ const compile = ({ inputFile, global, baseDir, libs, outputFile }) => {
         '--debug',
     ];
     assemblyScriptCompiler(compilerArgs, compilerDefaults);
-    // only if compiler succeded, that is, when the line above doesn't throw
+    // only if compiler succeeded, that is, when the line above doesn't throw
     removeExitHandler(exitHandler);
 };
 exports.compile = compile;

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') {
+        if (protocol.name == 'substreams' && !dataSource.getIn(["mapping", "file"])) {
             return;
         }
         try {
@@ -382,6 +382,9 @@ 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
@@ -441,6 +444,16 @@ class Compiler {
                         keyPath: ['dataSources', i, 'source', 'package', 'file'],
                         value: await this._uploadFileToIPFS(dataSource.getIn(['source', 'package', 'file']), uploadedFiles, spinner),
                     });
+                    console.log("####11");
+                    console.log(dataSource.getIn(["mapping", "file"]));
+                    console.log(dataSource.toJS());
+                    if (dataSource.getIn(["mapping", "file"])) {
+                        console.log("####10");
+                        updates.push({
+                            keyPath: ['dataSources', i, 'mapping', 'file'],
+                            value: await this._uploadFileToIPFS(dataSource.getIn(['mapping', 'file']), uploadedFiles, spinner),
+                        });
+                    }
                 }
             }
             else {
@@ -493,11 +506,14 @@ class Compiler {
         return immutable_1.default.fromJS({ '/': `/ipfs/${hash}` });
     }
     async _uploadSubgraphDefinitionToIPFS(subgraph) {
+        console.log("####1");
         const str = js_yaml_1.default.safeDump(subgraph.toJS(), { noRefs: true, sortKeys: true });
+        console.log("####2");
         const file = { path: 'subgraph.yaml', content: Buffer.from(str, 'utf-8') };
         return await this._uploadToIPFS(file);
     }
     async _uploadToIPFS(file) {
+        console.log("####4");
         try {
             const files = this.ipfs.addAll([file]);
             // We get back async iterable
@@ -507,6 +523,7 @@ class Compiler {
             // we grab the file and pin it
             const uploadedFile = value;
             await this.ipfs.pin.add(uploadedFile.cid);
+            console.log("####5");
             return uploadedFile.cid.toString();
         }
         catch (e) {

package/dist/protocols/substreams/manifest.graphql

@@ -32,14 +32,18 @@ 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.0",
+  "version": "0.60.1-alpha-20231103131654-82a8eec",
   "commands": {
     "add": {
       "id": "add",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.60.0",
+  "version": "0.60.1-alpha-20231103131654-82a8eec",
   "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": "1.19.1",
+    "prettier": "3.0.3",
     "request": "2.88.2",
     "semver": "7.4.0",
     "sync-request": "6.1.0",