@graphprotocol/graph-cli 0.25.3 → 0.28.0

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

@@ -16,6 +16,17 @@ export enum ValueKind {
   BIGINT = 7,
 }
 
+const VALUE_KIND_NAMES = [
+  'String',
+  'Int',
+  'BigDecimal',
+  'bool',
+  'Array',
+  'null',
+  'Bytes',
+  'BigInt',
+]
+
 /**
  * Pointer type for Value data.
  *
@@ -129,6 +140,42 @@ export class Value {
     return output
   }
 
+  /** Return a string that indicates the kind of value `this` contains for
+   * logging and error messages */
+  displayKind(): string {
+    if (this.kind >= VALUE_KIND_NAMES.length) {
+      return `Unknown (${this.kind})`
+    } else {
+      return VALUE_KIND_NAMES[this.kind]
+    }
+  }
+
+  /** Return a string representation of the value of `this` for logging and
+   * error messages */
+  displayData(): string {
+    switch (this.kind) {
+      case ValueKind.STRING:
+        return this.toString()
+      case ValueKind.INT:
+        return this.toI32().toString()
+      case ValueKind.BIGDECIMAL:
+        return this.toBigDecimal().toString()
+      case ValueKind.BOOL:
+        return this.toBoolean().toString()
+      case ValueKind.ARRAY:
+        let arr = this.toArray()
+        return '[' + arr.map<string>((elt) => elt.displayData()).join(', ') + ']'
+      case ValueKind.NULL:
+        return 'null'
+      case ValueKind.BYTES:
+        return this.toBytes().toHexString()
+      case ValueKind.BIGINT:
+        return this.toBigInt().toString()
+      default:
+        return `Unknown data (kind = ${this.kind})`
+    }
+  }
+
   static fromBooleanArray(input: Array<boolean>): Value {
     let output = new Array<Value>(input.length)
     for (let i: i32 = 0; i < input.length; i++) {

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

@@ -1,8 +1,16 @@
 import { BigDecimal } from '../common/numbers'
-import { TypedMapEntry, Entity, TypedMap, Result, Wrapped } from '../common/collections'
+import {
+  Bytes,
+  TypedMapEntry,
+  Entity,
+  TypedMap,
+  Result,
+  Wrapped,
+} from '../common/collections'
 import { JSONValue, Value } from '../common/value'
 import { ethereum } from '../chain/ethereum'
 import { near } from '../chain/near'
+import { tendermint } from '../chain/tendermint'
 
 export enum TypeId {
   String = 0,
@@ -92,6 +100,53 @@ export enum TypeId {
   NearChunkHeader = 84,
   NearBlock = 85,
   NearReceiptWithOutcome = 86,
+  TendermintArrayEventTx = 87,
+  TendermintArrayEvent = 88,
+  TendermintArrayCommitSig = 89,
+  TendermintArrayBytes = 90,
+  TendermintArrayEvidence = 91,
+  TendermintArrayEventAttribute = 92,
+  TendermintBlockIDFlagEnum = 93,
+  TendermintSignedMsgTypeEnum = 94,
+  TendermintEventList = 95,
+  TendermintEventBlock = 96,
+  TendermintResponseBeginBlock = 97,
+  TendermintResponseEndBlock = 98,
+  TendermintValidatorUpdate = 99,
+  TendermintArrayValidatorUpdate = 100,
+  TendermintConsensusParams = 101,
+  TendermintBlockParams = 102,
+  TendermintEvidenceParams = 103,
+  TendermintValidatorParams = 104,
+  TendermintVersionParams = 105,
+  TendermintBlock = 106,
+  TendermintCommit = 107,
+  TendermintCommitSig = 108,
+  TendermintHeader = 109,
+  TendermintConsensus = 110,
+  TendermintBlockID = 111,
+  TendermintPartSetHeader = 112,
+  TendermintData = 113,
+  TendermintEvidence = 114,
+  TendermintDuplicateVoteEvidence = 115,
+  TendermintEventTx = 116,
+  TendermintEventVote = 117,
+  TendermintLightClientAttackEvidence = 118,
+  TendermintLightBlock = 119,
+  TendermintValidatorSet = 120,
+  TendermintSignedHeader = 121,
+  TendermintEvidenceList = 122,
+  TendermintValidator = 123,
+  TendermintArrayValidator = 124,
+  TendermintPublicKey = 125,
+  TendermintTxResult = 126,
+  TendermintResponseDeliverTx = 127,
+  TendermintEvent = 128,
+  TendermintEventAttribute = 129,
+  TendermintEventValidatorSetUpdates = 130,
+  TendermintDuration = 131,
+  TendermintTimestamp = 132,
+  TendermintEventData = 133,
 }
 
 export function id_of_type(typeId: TypeId): usize {
@@ -271,6 +326,100 @@ export function id_of_type(typeId: TypeId): usize {
       return idof<near.Block>()
     case TypeId.NearReceiptWithOutcome:
       return idof<near.ReceiptWithOutcome>()
+    case TypeId.TendermintArrayEventTx:
+      return idof<Array<tendermint.EventTx>>()
+    case TypeId.TendermintArrayEvent:
+      return idof<Array<tendermint.Event>>()
+    case TypeId.TendermintArrayCommitSig:
+      return idof<Array<tendermint.CommitSig>>()
+    case TypeId.TendermintArrayBytes:
+      return idof<Array<Bytes>>()
+    case TypeId.TendermintArrayEvidence:
+      return idof<Array<tendermint.Evidence>>()
+    case TypeId.TendermintArrayEventAttribute:
+      return idof<Array<tendermint.EventAttribute>>()
+    case TypeId.TendermintBlockIDFlagEnum:
+      return idof<Array<tendermint.BlockIDFlag>>()
+    case TypeId.TendermintSignedMsgTypeEnum:
+      return idof<Array<tendermint.SignedMsgType>>()
+    case TypeId.TendermintEventList:
+      return idof<tendermint.EventList>()
+    case TypeId.TendermintEventBlock:
+      return idof<tendermint.EventBlock>()
+    case TypeId.TendermintResponseBeginBlock:
+      return idof<tendermint.ResponseBeginBlock>()
+    case TypeId.TendermintResponseEndBlock:
+      return idof<tendermint.ResponseEndBlock>()
+    case TypeId.TendermintValidatorUpdate:
+      return idof<tendermint.ValidatorUpdate>()
+    case TypeId.TendermintArrayValidatorUpdate:
+      return idof<Array<tendermint.ValidatorUpdate>>()
+    case TypeId.TendermintConsensusParams:
+      return idof<tendermint.ConsensusParams>()
+    case TypeId.TendermintBlockParams:
+      return idof<tendermint.BlockParams>()
+    case TypeId.TendermintEvidenceParams:
+      return idof<tendermint.EvidenceParams>()
+    case TypeId.TendermintValidatorParams:
+      return idof<tendermint.ValidatorParams>()
+    case TypeId.TendermintVersionParams:
+      return idof<tendermint.VersionParams>()
+    case TypeId.TendermintBlock:
+      return idof<tendermint.Block>()
+    case TypeId.TendermintCommit:
+      return idof<tendermint.Commit>()
+    case TypeId.TendermintCommitSig:
+      return idof<tendermint.CommitSig>()
+    case TypeId.TendermintHeader:
+      return idof<tendermint.Header>()
+    case TypeId.TendermintConsensus:
+      return idof<tendermint.Consensus>()
+    case TypeId.TendermintBlockID:
+      return idof<tendermint.BlockID>()
+    case TypeId.TendermintPartSetHeader:
+      return idof<tendermint.PartSetHeader>()
+    case TypeId.TendermintData:
+      return idof<tendermint.Data>()
+    case TypeId.TendermintEvidence:
+      return idof<tendermint.Evidence>()
+    case TypeId.TendermintDuplicateVoteEvidence:
+      return idof<tendermint.DuplicateVoteEvidence>()
+    case TypeId.TendermintEventTx:
+      return idof<tendermint.EventTx>()
+    case TypeId.TendermintEventVote:
+      return idof<tendermint.EventVote>()
+    case TypeId.TendermintLightClientAttackEvidence:
+      return idof<tendermint.LightClientAttackEvidence>()
+    case TypeId.TendermintLightBlock:
+      return idof<tendermint.LightBlock>()
+    case TypeId.TendermintValidatorSet:
+      return idof<tendermint.ValidatorSet>()
+    case TypeId.TendermintSignedHeader:
+      return idof<tendermint.SignedHeader>()
+    case TypeId.TendermintEvidenceList:
+      return idof<tendermint.EvidenceList>()
+    case TypeId.TendermintValidator:
+      return idof<tendermint.Validator>()
+    case TypeId.TendermintArrayValidator:
+      return idof<Array<tendermint.Validator>>()
+    case TypeId.TendermintPublicKey:
+      return idof<tendermint.PublicKey>()
+    case TypeId.TendermintTxResult:
+      return idof<tendermint.TxResult>()
+    case TypeId.TendermintResponseDeliverTx:
+      return idof<tendermint.ResponseDeliverTx>()
+    case TypeId.TendermintEvent:
+      return idof<tendermint.Event>()
+    case TypeId.TendermintEventAttribute:
+      return idof<tendermint.EventAttribute>()
+    case TypeId.TendermintEventValidatorSetUpdates:
+      return idof<tendermint.EventValidatorSetUpdates>()
+    case TypeId.TendermintDuration:
+      return idof<tendermint.Duration>()
+    case TypeId.TendermintTimestamp:
+      return idof<tendermint.Timestamp>()
+    case TypeId.TendermintEventData:
+      return idof<tendermint.EventData>()
     default:
       return 0
   }

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

@@ -4,6 +4,8 @@ import './common/eager_offset'
 export * from './chain/ethereum'
 // NEAR support
 export * from './chain/near'
+// Tendermint support
+export * from './chain/tendermint'
 // Regular re-exports
 export * from './common/numbers'
 export * from './common/collections'

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.24.0",
+  "version": "0.26.0",
   "module": "index.ts",
   "types": "index.ts",
   "main": "index.ts",
@@ -13,6 +13,7 @@
   },
   "scripts": {
     "lint": "prettier -c **/*.{js,ts}",
+    "format": "prettier --write -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"
   }

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

@@ -31,6 +31,7 @@ async function main() {
   fs.copyFileSync('common/value.ts', 'test/temp_lib/common/value.ts')
   fs.copyFileSync('chain/ethereum.ts', 'test/temp_lib/chain/ethereum.ts')
   fs.copyFileSync('chain/near.ts', 'test/temp_lib/chain/near.ts')
+  fs.copyFileSync('chain/tendermint.ts', 'test/temp_lib/chain/tendermint.ts')
   fs.copyFileSync('index.ts', 'test/temp_lib/index.ts')
 
   try {
@@ -63,6 +64,7 @@ async function main() {
     fs.rmdirSync('test/temp_lib/common')
     fs.unlinkSync('test/temp_lib/chain/ethereum.ts')
     fs.unlinkSync('test/temp_lib/chain/near.ts')
+    fs.unlinkSync('test/temp_lib/chain/tendermint.ts')
     fs.rmdirSync('test/temp_lib/chain')
     fs.unlinkSync('test/temp_lib/index.ts')
     fs.rmdirSync('test/temp_lib')

package/examples/basic-event-handlers/package.json

@@ -9,14 +9,14 @@
     "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.1",
+    "@graphprotocol/graph-ts": "0.26.0",
     "apollo-fetch": "^0.7.0"
   },
   "dependencies": {
-    "babel-polyfill": "^6.26.0",
-    "babel-register": "^6.26.0",
-    "truffle": "^5.0.4",
-    "truffle-hdwallet-provider": "^1.0.4"
+    "babel-polyfill": "6.26.0",
+    "babel-register": "6.26.0",
+    "truffle": "5.0.12",
+    "truffle-hdwallet-provider": "1.0.6"
   },
   "resolutions": {
     "assemblyscript": "0.19.10"

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

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@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==
+"@graphprotocol/graph-ts@0.26.0":
+  version "0.26.0"
+  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.26.0.tgz#576f995531eebaca4374901aeaff499219e382e8"
+  integrity sha512-GW/emOJl+35MXgmIxTnUK7dJtPCaB9u5aAwoLVqJ8swogC794O92UrXMVrAJsherUriu+yI9bLMGmNPOIi60jw==
   dependencies:
     assemblyscript "0.19.10"
 
@@ -112,18 +112,18 @@ babel-messages@^6.23.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-polyfill@^6.26.0:
+babel-polyfill@6.26.0:
   version "6.26.0"
-  resolved "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
+  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
   integrity sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=
   dependencies:
     babel-runtime "^6.26.0"
     core-js "^2.5.0"
     regenerator-runtime "^0.10.5"
 
-babel-register@^6.26.0:
+babel-register@6.26.0, babel-register@^6.26.0:
   version "6.26.0"
-  resolved "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
   integrity sha1-btAhFz4vy0htestFxgCahW9kcHE=
   dependencies:
     babel-core "^6.26.0"
@@ -920,18 +920,18 @@ trim-right@^1.0.1:
   resolved "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
   integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
 
-truffle-hdwallet-provider@^1.0.4:
+truffle-hdwallet-provider@1.0.6:
   version "1.0.6"
-  resolved "https://registry.npmjs.org/truffle-hdwallet-provider/-/truffle-hdwallet-provider-1.0.6.tgz#7cda437c9a25bda6bbc5f4ed018e932254ecc867"
+  resolved "https://registry.yarnpkg.com/truffle-hdwallet-provider/-/truffle-hdwallet-provider-1.0.6.tgz#7cda437c9a25bda6bbc5f4ed018e932254ecc867"
   integrity sha512-cYTG0t9XouLLEBLMjkfHe3s2JO9wrFFVeXEgpW5Ay+8S56isf3LkrAUh0ws9bcYCJ0l7jho9xkaNnakeDqq//Q==
   dependencies:
     any-promise "^1.3.0"
     bindings "^1.3.1"
     websocket "^1.0.28"
 
-truffle@^5.0.4:
+truffle@5.0.12:
   version "5.0.12"
-  resolved "https://registry.npmjs.org/truffle/-/truffle-5.0.12.tgz#05ab7d2561a3ee4fd5e026dcc4b91b8f3c6e3795"
+  resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.0.12.tgz#05ab7d2561a3ee4fd5e026dcc4b91b8f3c6e3795"
   integrity sha512-dqnDmtTGNcnL29PHQwPE/CVmFFeGLuTFeb4TS3VY/vbASefu118IKXcadOWzkCPPwktv/njwylHSPhwoS00F2A==
   dependencies:
     app-module-path "^2.2.0"

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.1"
+    "@graphprotocol/graph-ts": "0.26.0"
   },
   "resolutions": {
     "assemblyscript": "0.19.10"

package/examples/example-subgraph/yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@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==
+"@graphprotocol/graph-ts@0.26.0":
+  version "0.26.0"
+  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.26.0.tgz#576f995531eebaca4374901aeaff499219e382e8"
+  integrity sha512-GW/emOJl+35MXgmIxTnUK7dJtPCaB9u5aAwoLVqJ8swogC794O92UrXMVrAJsherUriu+yI9bLMGmNPOIi60jw==
   dependencies:
     assemblyscript "0.19.10"
 

package/package.json

@@ -1,41 +1,44 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.25.3",
+  "version": "0.28.0",
+  "license": "(Apache-2.0 OR MIT)",
   "description": "CLI for building for and deploying to The Graph",
   "dependencies": {
     "assemblyscript": "0.19.10",
     "binary-install-raw": "0.0.13",
-    "chalk": "^3.0.0",
-    "chokidar": "^3.0.2",
-    "debug": "^4.1.1",
-    "docker-compose": "^0.23.2",
-    "dockerode": "^2.5.8",
-    "fs-extra": "^9.0.0",
-    "glob": "^7.1.2",
+    "chalk": "3.0.0",
+    "chokidar": "3.5.1",
+    "debug": "4.1.1",
+    "docker-compose": "0.23.4",
+    "dockerode": "2.5.8",
+    "fs-extra": "9.0.0",
+    "glob": "7.1.6",
     "gluegun": "https://github.com/edgeandnode/gluegun#v4.3.1-pin-colors-dep",
-    "graphql": "^15.5.0",
-    "immutable": "^3.8.2",
-    "ipfs-http-client": "^34.0.0",
-    "jayson": "^3.0.2",
-    "js-yaml": "^3.13.1",
-    "node-fetch": "^2.3.0",
-    "pkginfo": "^0.4.1",
-    "prettier": "^1.13.5",
-    "request": "^2.88.0",
+    "graphql": "15.5.0",
+    "immutable": "3.8.2",
+    "ipfs-http-client": "34.0.0",
+    "jayson": "3.2.0",
+    "js-yaml": "3.13.1",
+    "node-fetch": "2.6.0",
+    "pkginfo": "0.4.1",
+    "prettier": "1.19.1",
+    "request": "2.88.2",
     "semver": "7.3.5",
-    "tmp-promise": "^3.0.2",
+    "sync-request": "6.1.0",
+    "tmp-promise": "3.0.2",
+    "web3-eth-abi": "1.7.0",
     "which": "2.0.2",
-    "yaml": "^1.5.1"
+    "yaml": "1.9.2"
   },
   "bin": {
     "graph": "bin/graph"
   },
   "devDependencies": {
-    "eslint": "^6.0.1",
-    "jest": "^26.0.0",
-    "spawn-command": "^0.0.2-1",
-    "strip-ansi": "^6.0.0",
-    "tern": "^0.24.0"
+    "eslint": "6.8.0",
+    "jest": "26.0.0",
+    "spawn-command": "0.0.2-1",
+    "strip-ansi": "6.0.0",
+    "tern": "0.24.3"
   },
   "scripts": {
     "test": "jest --verbose",

package/src/codegen/schema.js

@@ -5,6 +5,53 @@ const typesCodegen = require('./types')
 
 const List = immutable.List
 
+class IdField {
+  static BYTES = Symbol("Bytes")
+  static STRING = Symbol("String")
+
+  constructor(idField) {
+    const typeName = idField.getIn(['type', 'type', 'name', 'value'])
+    this.kind = typeName === "Bytes" ? IdField.BYTES : IdField.STRING
+  }
+
+  typeName() {
+    return this.kind === IdField.BYTES ? "Bytes" : "string"
+  }
+
+  gqlTypeName() {
+    return this.kind === IdField.BYTES ? "Bytes" : "String"
+  }
+
+  tsNamedType() {
+    return tsCodegen.namedType(this.typeName())
+  }
+
+  tsValueFrom() {
+    return this.kind === IdField.BYTES ? "Value.fromBytes(id)" : "Value.fromString(id)"
+  }
+
+  tsValueKind() {
+    return this.kind === IdField.BYTES ? "ValueKind.BYTES" : "ValueKind.STRING"
+  }
+
+  tsValueToString() {
+    return this.kind == IdField.BYTES ? "id.toBytes().toHexString()" : "id.toString()"
+  }
+
+  tsToString() {
+    return this.kind == IdField.BYTES ? "id.toHexString()" : "id"
+  }
+
+  static fromFields(fields) {
+    const idField = fields.find(field => field.getIn(['name', 'value']) === 'id')
+    return new IdField(idField)
+  }
+
+  static fromTypeDef(def) {
+    return IdField.fromFields(def.get("fields"))
+  }
+}
+
 module.exports = class SchemaCodeGenerator {
   constructor(schema) {
     this.schema = schema
@@ -52,12 +99,14 @@ module.exports = class SchemaCodeGenerator {
   _generateEntityType(def) {
     let name = def.getIn(['name', 'value'])
     let klass = tsCodegen.klass(name, { export: true, extends: 'Entity' })
+    const fields = def.get('fields')
+    const idField = IdField.fromFields(fields)
 
     // Generate and add a constructor
-    klass.addMethod(this._generateConstructor(name, def.get('fields')))
+    klass.addMethod(this._generateConstructor(name, fields))
 
     // Generate and add save() and getById() methods
-    this._generateStoreMethods(name).forEach(method => klass.addMethod(method))
+    this._generateStoreMethods(name, idField).forEach(method => klass.addMethod(method))
 
     // Generate and add entity field getters and setters
     def
@@ -107,19 +156,20 @@ module.exports = class SchemaCodeGenerator {
   }
 
   _generateConstructor(entityName, fields) {
+    const idField = IdField.fromFields(fields)
     return tsCodegen.method(
       'constructor',
-      [tsCodegen.param('id', tsCodegen.namedType('string'))],
+      [tsCodegen.param('id', idField.tsNamedType())],
       undefined,
       `
       super()
-      this.set('id', Value.fromString(id))
+      this.set('id', ${idField.tsValueFrom()})
       ${this._generateDefaultFieldValues(fields)}
       `,
     )
   }
 
-  _generateStoreMethods(entityName) {
+  _generateStoreMethods(entityName, idField) {
     return List.of(
       tsCodegen.method(
         'save',
@@ -127,23 +177,21 @@ module.exports = class SchemaCodeGenerator {
         tsCodegen.namedType('void'),
         `
         let id = this.get('id')
-        assert(id != null, 'Cannot save ${entityName} entity without an ID')
+        assert(id != null,
+               'Cannot save ${entityName} entity without an ID')
         if (id) {
-          assert(
-            id.kind == ValueKind.STRING,
-            'Cannot save ${entityName} entity with non-string ID. ' +
-            'Considering using .toHex() to convert the "id" to a string.'
-          )
-          store.set('${entityName}', id.toString(), this)
+          assert(id.kind == ${idField.tsValueKind()},
+                 \`Entities of type ${entityName} must have an ID of type ${idField.gqlTypeName()} but the id '\${id.displayData()}' is of type \${id.displayKind()}\`)
+          store.set('${entityName}', ${idField.tsValueToString()}, this)
         }`,
       ),
 
       tsCodegen.staticMethod(
         'load',
-        [tsCodegen.param('id', tsCodegen.namedType('string'))],
+        [tsCodegen.param('id', tsCodegen.namedType(idField.typeName()))],
         tsCodegen.nullableType(tsCodegen.namedType(entityName)),
         `
-        return changetype<${entityName} | null>(store.get('${entityName}', id))
+        return changetype<${entityName} | null>(store.get('${entityName}', ${idField.tsToString()}))
         `,
       ),
     )
@@ -194,13 +242,12 @@ module.exports = class SchemaCodeGenerator {
       isArray &&
       paramType.inner instanceof tsCodegen.NullableType
     ) {
-      let arrayTypeWithoutClosingBracked = fieldValueType.slice(0, -1)
-      let suggestedType = `${arrayTypeWithoutClosingBracked}!]`
+      let baseType = this._baseType(gqlType)
 
       throw new Error(`
 GraphQL schema can't have List's with Nullable members.
-Error in '${name}' field of type '${fieldValueType}'.
-Suggestion: add an '!' to the member type of the List, change from '${fieldValueType}' to '${suggestedType}'`
+Error in '${name}' field of type '[${baseType}]'.
+Suggestion: add an '!' to the member type of the List, change from '[${baseType}]' to '[${baseType}!]'`
       )
     }
 
@@ -212,7 +259,7 @@ Suggestion: add an '!' to the member type of the List, change from '${fieldValue
         this.unset('${name}')
       } else {
         this.set('${name}', ${typesCodegen.valueFromAsc(
-        `<${paramTypeString}>value`,
+      `<${paramTypeString}>value`,
       fieldValueType,
     )})
       }
@@ -226,12 +273,44 @@ Suggestion: add an '!' to the member type of the List, change from '${fieldValue
     )
   }
 
+  _resolveFieldType(gqlType) {
+    let typeName = gqlType.getIn(['name', 'value'])
+
+    // If this is a reference to another type, the field has the type of
+    // the referred type's id field
+    const typeDef = this.schema.ast.get("definitions").
+      find(def => this._isEntityTypeDefinition(def) && def.getIn(["name", "value"]) === typeName)
+    if (typeDef) {
+      return IdField.fromTypeDef(typeDef).typeName()
+    } else {
+      return typeName
+    }
+  }
+
+  /** Return the type that values for this field must have. For scalar
+   * types, that's the type from the subgraph schema. For references to
+   * other entity types, this is the same as the type of the id of the
+   * referred type, i.e., `string` or `Bytes`*/
   _valueTypeFromGraphQl(gqlType) {
-    return gqlType.get('kind') === 'NonNullType'
-      ? this._valueTypeFromGraphQl(gqlType.get('type'), false)
-      : gqlType.get('kind') === 'ListType'
-      ? '[' + this._valueTypeFromGraphQl(gqlType.get('type')) + ']'
-      : gqlType.getIn(['name', 'value'])
+    if (gqlType.get('kind') === 'NonNullType') {
+      return this._valueTypeFromGraphQl(gqlType.get('type'), false)
+    } else if (gqlType.get('kind') === 'ListType') {
+      return '[' + this._valueTypeFromGraphQl(gqlType.get('type')) + ']'
+    } else {
+      return this._resolveFieldType(gqlType)
+    }
+  }
+
+  /** Determine the base type of `gqlType` by removing any non-null
+   * constraints and using the type of elements of lists */
+  _baseType(gqlType) {
+    if (gqlType.get('kind') === 'NonNullType') {
+      return this._baseType(gqlType.get('type'))
+    } else if (gqlType.get('kind') === 'ListType') {
+      return this._baseType(gqlType.get('type'))
+    } else {
+      return gqlType.getIn(['name', 'value'])
+    }
   }
 
   _typeFromGraphQl(gqlType, nullable = true, nullablePrimitive = false) {
@@ -243,7 +322,7 @@ Suggestion: add an '!' to the member type of the List, change from '${fieldValue
     } else {
       // NamedType
       let type = tsCodegen.namedType(
-        typesCodegen.ascTypeForValue(gqlType.getIn(['name', 'value'])),
+        typesCodegen.ascTypeForValue(this._resolveFieldType(gqlType)),
       )
 
       // Will not wrap primitives into NullableType by default.