@graphprotocol/graph-cli 0.24.0-alpha.0 → 0.25.1

package/examples/basic-event-handlers/node_modules/@graphprotocol/graph-ts/README.md

@@ -69,6 +69,89 @@ For examples of `graph-ts` in use take a look at one of the following subgraphs:
 * https://github.com/graphprotocol/aragon-subgraph
 * https://github.com/graphprotocol/dharma-subgraph  
 
+## Release process
+
+The steps to create a new version of the `graph-ts` 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 Graph Protocol, Inc. and contributors.

package/examples/basic-event-handlers/node_modules/@graphprotocol/graph-ts/chain/ethereum.ts

@@ -339,6 +339,7 @@ export namespace ethereum {
       public difficulty: BigInt,
       public totalDifficulty: BigInt,
       public size: BigInt | null,
+      public baseFeePerGas: BigInt | null,
     ) {}
   }
 
@@ -355,6 +356,7 @@ export namespace ethereum {
       public gasLimit: BigInt,
       public gasPrice: BigInt,
       public input: Bytes,
+      public nonce: Bytes,
     ) {}
   }
 

package/examples/basic-event-handlers/node_modules/@graphprotocol/graph-ts/common/json.ts

@@ -14,13 +14,13 @@ export declare namespace json {
 }
 
 export namespace json {
-  function fromString(data: string): JSONValue {
+  export function fromString(data: string): JSONValue {
     let bytes = Bytes.fromUTF8(data)
 
     return json.fromBytes(bytes)
   }
 
-  function try_fromString(data: string): Result<JSONValue, boolean> {
+  export function try_fromString(data: string): Result<JSONValue, boolean> {
     let bytes = Bytes.fromUTF8(data)
 
     return json.try_fromBytes(bytes)

package/examples/basic-event-handlers/node_modules/@graphprotocol/graph-ts/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@graphprotocol/graph-ts",
   "description": "TypeScript/AssemblyScript library for writing subgraph mappings for The Graph",
-  "version": "0.23.1",
+  "version": "0.24.0",
   "module": "index.ts",
   "types": "index.ts",
   "main": "index.ts",
@@ -9,16 +9,11 @@
     "assemblyscript": "0.19.10"
   },
   "devDependencies": {
-    "glob": "^7.1.2",
     "prettier": "^2.4.1"
   },
   "scripts": {
     "lint": "prettier -c **/*.{js,ts}",
     "build": "asc --explicitStart --exportRuntime --runtime stub index.ts helper-functions.ts --lib graph-ts -b index.wasm",
-    "test": "node test/test.js",
-    "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": "node test/test.js"
   }
 }

package/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.24.0-alpha.0",
+    "@graphprotocol/graph-ts": "0.24.1",
     "apollo-fetch": "^0.7.0"
   },
   "dependencies": {

package/examples/basic-event-handlers/yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@graphprotocol/graph-ts@0.24.0-alpha.0":
-  version "0.24.0-alpha.0"
-  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.24.0-alpha.0.tgz#8fe2b09a123adc5a65c82b823a1cb2d99f3cce2b"
-  integrity sha512-PLhTMlFMoLZpTqJlKH5f+5VRN3yWmXfssVwWk7uauVeY8IuAWjWB3RNubS574q9uf0QjPKOacekXY5EKRWOzEA==
+"@graphprotocol/graph-ts@0.24.1":
+  version "0.24.1"
+  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.24.1.tgz#50961b52b5383f9c5cf5e6e23fa039f24e729ddf"
+  integrity sha512-2vU4m5ZPQIqMlMce/z5vmOtGHRlRmcRhMfemS3NIwxCSxSBGVnX2zb7QBTzzdQKGwsAZdbz6V0okkOtvohELfQ==
   dependencies:
     assemblyscript "0.19.10"
 

package/examples/example-subgraph/package.json

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

package/examples/example-subgraph/yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@graphprotocol/graph-ts@0.24.0-alpha.0":
-  version "0.24.0-alpha.0"
-  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.24.0-alpha.0.tgz#8fe2b09a123adc5a65c82b823a1cb2d99f3cce2b"
-  integrity sha512-PLhTMlFMoLZpTqJlKH5f+5VRN3yWmXfssVwWk7uauVeY8IuAWjWB3RNubS574q9uf0QjPKOacekXY5EKRWOzEA==
+"@graphprotocol/graph-ts@0.24.1":
+  version "0.24.1"
+  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.24.1.tgz#50961b52b5383f9c5cf5e6e23fa039f24e729ddf"
+  integrity sha512-2vU4m5ZPQIqMlMce/z5vmOtGHRlRmcRhMfemS3NIwxCSxSBGVnX2zb7QBTzzdQKGwsAZdbz6V0okkOtvohELfQ==
   dependencies:
     assemblyscript "0.19.10"
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.24.0-alpha.0",
+  "version": "0.25.1",
   "description": "CLI for building for and deploying to The Graph",
   "dependencies": {
     "assemblyscript": "0.19.10",

package/src/codegen/schema.js

@@ -80,17 +80,24 @@ module.exports = class SchemaCodeGenerator {
       .map(field => {
         const name = field.getIn(['name', 'value'])
         const type = this._typeFromGraphQl(field.get('type'))
+
         const isNullable = type instanceof tsCodegen.NullableType
+        const isPrimitive = type.isPrimitive && type.isPrimitive()
 
         const directives = field.get('directives')
         const isDerivedFrom = directives.some(directive => directive.getIn(['name', 'value']) === 'derivedFrom')
 
-        return { name, type, isNullable, isDerivedFrom }
+        return { name, type, isNullable, isPrimitive, isDerivedFrom }
       })
       // We only call the setter with the default value in the constructor for fields that are:
+      // - Not primitive (such as Int/i32)
       // - Not nullable, so that AS doesn't break when subgraph developers try to access them before a `set`
       // - Not tagged as `derivedFrom`, because they only exist in query time
-      .filter(({ isNullable, isDerivedFrom }) => !isNullable && !isDerivedFrom)
+      .filter(({
+        isNullable,
+        isPrimitive,
+        isDerivedFrom,
+      }) => !(isNullable || isPrimitive || isDerivedFrom))
       .map(({ name, type, isNullable }) => {
         const fieldTypeString = isNullable ? type.inner.toString() : type.toString()
 

package/src/codegen/types/index.js

@@ -89,8 +89,12 @@ const findInitializationForType = (fromTypeSystem, toTypeSystem, ascType) => {
 
 // High-level type system API
 
+const ascTypeForProtocol = (protocol, protocolType) =>
+  findConversionFromType(protocol, 'AssemblyScript', protocolType).getIn(['to', 'type'])
+
+// TODO: this can be removed/replaced by the function above
 const ascTypeForEthereum = ethereumType =>
-  findConversionFromType('ethereum', 'AssemblyScript', ethereumType).getIn(['to', 'type'])
+  ascTypeForProtocol('ethereum', ethereumType)
 
 const ethereumTypeForAsc = ascType =>
   findConversionFromType('AssemblyScript', 'ethereum', ascType).getIn(['to', 'type'])
@@ -120,6 +124,9 @@ const initializedValueFromAsc = ascType =>
   findInitializationForType('AssemblyScript', 'Value', ascType)
 
 module.exports = {
+  // protocol <-> AssemblyScript
+  ascTypeForProtocol,
+
   // ethereum <-> AssemblyScript
   ascTypeForEthereum,
   ethereumTypeForAsc,

package/src/command-helpers/scaffold.js

@@ -0,0 +1,66 @@
+const fs = require('fs-extra')
+const path = require('path')
+
+const { step } = require('./spinner')
+const Scaffold = require('../scaffold')
+
+const generateScaffold = async (
+  {
+    protocolInstance,
+    abi,
+    contract,
+    network,
+    subgraphName,
+    indexEvents,
+    contractName = 'Contract',
+    node,
+  },
+  spinner,
+) => {
+  step(spinner, 'Generate subgraph')
+
+  const scaffold = new Scaffold({
+    protocol: protocolInstance,
+    abi,
+    indexEvents,
+    contract,
+    network,
+    contractName,
+    subgraphName,
+    node,
+  })
+
+  return scaffold.generate()
+}
+
+const writeScaffoldDirectory = async (scaffold, directory, spinner) => {
+  // Create directory itself
+  await fs.mkdirs(directory)
+
+  let promises = Object.keys(scaffold).map(async basename => {
+    let content = scaffold[basename]
+    let filename = path.join(directory, basename)
+
+    // Write file or recurse into subdirectory
+    if (typeof content === 'string') {
+      await fs.writeFile(filename, content, { encoding: 'utf-8' })
+    } else if (content == null) {
+      return // continue loop
+    } else {
+      writeScaffoldDirectory(content, path.join(directory, basename), spinner)
+    }
+  })
+
+  await Promise.all(promises)
+}
+
+const writeScaffold = async (scaffold, directory, spinner) => {
+  step(spinner, `Write subgraph to directory`)
+  await writeScaffoldDirectory(scaffold, directory, spinner)
+}
+
+module.exports = {
+  ...module.exports,
+  generateScaffold,
+  writeScaffold,
+}

package/src/command-helpers/version.js

@@ -57,7 +57,7 @@ const assertGraphTsVersion = async (sourceDir, minimumGraphTsVersion) => {
   if (graphTsVersion && semver.lt(semver.coerce(graphTsVersion), minimumGraphTsVersion)) {
     throw new Error(
       `To use this version of the graph-cli you must upgrade the graph-ts dependency to a version greater than or equal to ${minimumGraphTsVersion}
-Also, you'll probably need to take a look at our AssemblyScript migration guide because of language breaking changes: https://gist.github.com/otaviopace/8406cb39644d2e7678570d1e7f50dac4`
+Also, you'll probably need to take a look at our AssemblyScript migration guide because of language breaking changes: https://thegraph.com/docs/developer/assemblyscript-migration-guide`
     )
   }
 }

package/src/command-helpers/version.test.js

@@ -197,7 +197,7 @@ describe('Version Command Helpers', () => {
         .rejects
         .toThrow(new Error(
           `To use this version of the graph-cli you must upgrade the graph-ts dependency to a version greater than or equal to ${minimumGraphTsVersion}
-Also, you'll probably need to take a look at our AssemblyScript migration guide because of language breaking changes: https://gist.github.com/otaviopace/8406cb39644d2e7678570d1e7f50dac4`
+Also, you'll probably need to take a look at our AssemblyScript migration guide because of language breaking changes: https://thegraph.com/docs/developer/assemblyscript-migration-guide`
         ))
     })
     test('When the installed graph-ts version is a supported one', async () => {