Merge branch 'graphprotocol:master' into master

Author: georg-getz

README.md

@@ -53,6 +53,89 @@ The Graph CLI can be used with a local or self-hosted [Graph Node](https://githu
 
 If you are ready to dive into the details of building a subgraph from scratch, there is a [detailed walkthrough](https://thegraph.com/docs/define-a-subgraph) for that as well, along with API documentation for the [AssemblyScript API](https://thegraph.com/docs/assemblyscript-api).
 
+## Release process
+
+The steps to create a new version of the `graph-cli` are:
+
+1. Decide which version number you'll be rolling out. You can check the differences between the current `master` branch and the latest release.
+2. Create a PR with the commit generated by `npm version <VERSION> [<PREID>]`.
+3. Once that's approved and merged to `master`, you can publish it to `npm` and push the git tags as well.
+4. Last but not least, create a Github Release refering to the pushed git tag, linking to the PRs involved.
+
+Helpful links:
+
+- [Semver official docs](https://semver.org/)
+- [`npm version` docs](https://docs.npmjs.com/cli/v7/commands/npm-version)
+- [`npm publish` docs](https://docs.npmjs.com/cli/v7/commands/npm-publish)
+- [`npm unpublish` docs](https://docs.npmjs.com/cli/v7/commands/npm-unpublish)
+- [`npm deprecate` docs](https://docs.npmjs.com/cli/v7/commands/npm-deprecate)
+
+### Stable release example
+
+Current version: `0.34.9`.
+Desired release: `0.35.0`.
+
+To create the PR:
+```
+git checkout -b <BRANCH>
+
+npm version minor
+
+git push --set-upstream <REMOTE> <BRANCH>
+```
+
+Once that's approved and merged, you can update your local `master` and:
+
+```
+npm publish
+
+npm push --tags
+```
+
+### Alpha release example
+
+Current version: `0.29.2`.
+Desired release: `0.30.0-alpha.0`.
+
+To create the PR:
+```
+git checkout -b <BRANCH>
+
+npm version preminor --preid alpha
+
+git push --set-upstream <REMOTE> <BRANCH>
+```
+
+Once that's approved and merged, you can update your local `master` and:
+
+```
+npm publish --tag alpha
+
+npm push --tags
+```
+
+### Alpha pre-release example
+
+Current version: `0.30.0-alpha.0`.
+Desired release: `0.30.0-alpha.1`.
+
+To create the PR:
+```
+git checkout -b <BRANCH>
+
+npm version prerelease --preid alpha
+
+git push --set-upstream <REMOTE> <BRANCH>
+```
+
+Once that's approved and merged, you can update your local `master` and:
+
+```
+npm publish --tag alpha
+
+npm push --tags
+```
+
 ## License
 
 Copyright &copy; 2018-2019 Graph Protocol, Inc. and contributors.

examples/basic-event-handlers/package.json

@@ -9,7 +9,7 @@
     "deploy-test": "../../bin/graph deploy test/basic-event-handlers --version-label v0.0.1 --ipfs http://localhost:15001 --node http://127.0.0.1:18020"
   },
   "devDependencies": {
-    "@graphprotocol/graph-ts": "0.22.1",
+    "@graphprotocol/graph-ts": "0.23.1",
     "apollo-fetch": "^0.7.0"
   },
   "dependencies": {

examples/basic-event-handlers/yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@graphprotocol/graph-ts@0.22.1":
-  version "0.22.1"
-  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.22.1.tgz#3189b2495b33497280f617316cce68074d48e236"
-  integrity sha512-T5xrHN0tHJwd7ZnSTLhk5hAL3rCIp6rJ40kBCrETnv1mfK9hVyoojJK6VtBQXTbLsYtKe4SYjjD0cdOsAR9QiA==
+"@graphprotocol/graph-ts@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.23.1.tgz#76e595d26ec5672f3778b1d3830e4640a57aec1b"
+  integrity sha512-pipofvN1LlwLOXrS7IWy8hSBFZzVyVHdLXDpQskl9nKqdbb3chelj4JoVEzCl7klvomDpP84ngLpW17fBh5vww==
   dependencies:
     assemblyscript "0.19.10"
 

examples/example-subgraph/package.json

@@ -7,7 +7,7 @@
     "build-wast": "../../bin/graph build -t wast subgraph.yaml"
   },
   "devDependencies": {
-    "@graphprotocol/graph-ts": "0.22.1"
+    "@graphprotocol/graph-ts": "0.23.1"
   },
   "resolutions": {
     "assemblyscript": "0.19.10"

examples/example-subgraph/yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@graphprotocol/graph-ts@0.22.1":
-  version "0.22.1"
-  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.22.1.tgz#3189b2495b33497280f617316cce68074d48e236"
-  integrity sha512-T5xrHN0tHJwd7ZnSTLhk5hAL3rCIp6rJ40kBCrETnv1mfK9hVyoojJK6VtBQXTbLsYtKe4SYjjD0cdOsAR9QiA==
+"@graphprotocol/graph-ts@0.23.1":
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.23.1.tgz#76e595d26ec5672f3778b1d3830e4640a57aec1b"
+  integrity sha512-pipofvN1LlwLOXrS7IWy8hSBFZzVyVHdLXDpQskl9nKqdbb3chelj4JoVEzCl7klvomDpP84ngLpW17fBh5vww==
   dependencies:
     assemblyscript "0.19.10"
 

jest.config.js

@@ -49,10 +49,10 @@ module.exports = {
   // forceCoverageMatch: [],
 
   // A path to a module which exports an async function that is triggered once before all test suites
-  // globalSetup: null,
+  globalSetup: './tests/cli/globalSetup',
 
   // A path to a module which exports an async function that is triggered once after all test suites
-  // globalTeardown: null,
+  globalTeardown: './tests/cli/globalTeardown',
 
   // A set of global variables that need to be available in all test environments
   // globals: {},

manifest-schema.graphql

@@ -6,7 +6,10 @@ type Schema {
   file: File!
 }
 
-union DataSource = EthereumContractDataSource
+union DataSource =
+  EthereumContractDataSource |
+  NearContractDataSource
+
 union DataSourceTemplate = EthereumContractDataSourceTemplate
 
 type EthereumContractDataSource {
@@ -17,14 +20,27 @@ type EthereumContractDataSource {
   mapping: EthereumContractMapping!
 }
 
+type NearContractDataSource {
+  kind: String!
+  name: String!
+  network: String
+  source: NearContractSource!
+  mapping: NearContractMapping!
+}
+
 type EthereumContractSource {
   address: String
   abi: String!
   startBlock: BigInt
 }
 
+type NearContractSource {
+  account: String
+  startBlock: BigInt
+}
+
 type EthereumContractMapping {
-  kind: String!
+  kind: String
   apiVersion: String!
   language: String!
   file: File!
@@ -35,6 +51,15 @@ type EthereumContractMapping {
   eventHandlers: [EthereumContractEventHandler!]
 }
 
+type NearContractMapping {
+  apiVersion: String!
+  language: String!
+  file: File!
+  entities: [String!]!
+  blockHandlers: [NearBlockHandler!]
+  receiptHandlers: [NearReceiptHandler!]
+}
+
 type EthereumContractAbi {
   name: String!
   file: File!
@@ -49,11 +74,19 @@ type EthereumBlockFilter {
   kind: String!
 }
 
+type NearBlockHandler {
+  handler: String!
+}
+
 type EthereumCallHandler {
   function: String!
   handler: String!
 }
 
+type NearReceiptHandler {
+  handler: String!
+}
+
 type EthereumContractEventHandler {
   event: String!
   topic0: String

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.22.3",
+  "version": "0.23.1",
   "description": "CLI for building for and deploying to The Graph",
   "dependencies": {
     "assemblyscript": "0.19.10",
@@ -40,10 +40,6 @@
   "scripts": {
     "test": "jest --verbose",
     "test:init": "jest tests/cli/init.test.js --verbose",
-    "test:validation": "jest tests/cli/validation.test.js --verbose",
-    "release:patch": "npm version patch && npm publish && git push origin master && git push --tags",
-    "release:minor": "npm version minor && npm publish && git push origin master && git push --tags",
-    "release:alpha:minor": "npm version preminor --preid alpha && npm publish --tag alpha && git push origin master && git push --tags",
-    "release:alpha:prerelease": "npm version prerelease --preid alpha && npm publish --tag alpha && git push origin master && git push --tags"
+    "test:validation": "jest tests/cli/validation.test.js --verbose"
   }
 }

src/codegen/schema.js

@@ -23,8 +23,7 @@ module.exports = class SchemaCodeGenerator {
           // APIs
           'store',
 
-          // Basic Ethereum types
-          'Address',
+          // Basic Scalar types
           'Bytes',
           'BigInt',
           'BigDecimal',

src/codegen/template.js

@@ -3,14 +3,19 @@ const immutable = require('immutable')
 const tsCodegen = require('./typescript')
 
 module.exports = class DataSourceTemplateCodeGenerator {
-  constructor(template) {
+  constructor(template, protocol) {
     this.template = template
+    this.protocolTemplateCodeGen = protocol.getTemplateCodeGen(template)
   }
 
   generateModuleImports() {
     return [
       tsCodegen.moduleImports(
-        ['Address', 'DataSourceTemplate', 'DataSourceContext'],
+        [
+          ...this.protocolTemplateCodeGen.generateModuleImports(),
+          'DataSourceTemplate',
+          'DataSourceContext',
+        ],
         '@graphprotocol/graph-ts',
       ),
     ]
@@ -24,55 +29,8 @@ module.exports = class DataSourceTemplateCodeGenerator {
     let name = this.template.get('name')
 
     let klass = tsCodegen.klass(name, { export: true, extends: 'DataSourceTemplate' })
-    klass.addMethod(this._generateCreateMethod())
-    klass.addMethod(this._generateCreateWithContextMethod())
+    klass.addMethod(this.protocolTemplateCodeGen.generateCreateMethod())
+    klass.addMethod(this.protocolTemplateCodeGen.generateCreateWithContextMethod())
     return klass
   }
-
-  _generateCreateMethod() {
-    let name = this.template.get('name')
-    let kind = this.template.get('kind')
-
-    switch (kind) {
-      case 'ethereum/contract':
-        return tsCodegen.staticMethod(
-          'create',
-          [tsCodegen.param('address', tsCodegen.namedType('Address'))],
-          tsCodegen.namedType('void'),
-          `
-          DataSourceTemplate.create('${name}', [address.toHex()])
-          `,
-        )
-
-      default:
-        throw new Error(
-          `Data sources with kind != 'ethereum/contract' are not supported yet`,
-        )
-    }
-  }
-
-  _generateCreateWithContextMethod() {
-    let name = this.template.get('name')
-    let kind = this.template.get('kind')
-
-    switch (kind) {
-      case 'ethereum/contract':
-        return tsCodegen.staticMethod(
-          'createWithContext',
-          [
-            tsCodegen.param('address', tsCodegen.namedType('Address')),
-            tsCodegen.param('context', tsCodegen.namedType('DataSourceContext')),
-          ],
-          tsCodegen.namedType('void'),
-          `
-          DataSourceTemplate.createWithContext('${name}', [address.toHex()], context)
-          `,
-        )
-
-      default:
-        throw new Error(
-          `Data sources with kind != 'ethereum/contract' are not supported yet`,
-        )
-    }
-  }
 }