@graphprotocol/graph-cli 0.30.0-alpha.0 → 0.30.1

package/examples/basic-event-handlers/node_modules/websocket/build/config.gypi

@@ -5,11 +5,12 @@
     "default_configuration": "Release",
     "defines": [],
     "include_dirs": [],
-    "libraries": []
+    "libraries": [],
+    "msvs_configuration_platform": "ARM64",
+    "xcode_configuration_platform": "arm64"
   },
   "variables": {
     "asan": 0,
-    "build_v8_with_gn": "false",
     "coverage": "false",
     "dcheck_always_on": 0,
     "debug_nghttp2": "false",
@@ -19,23 +20,296 @@
     "enable_pgo_use": "false",
     "error_on_warn": "false",
     "force_dynamic_crt": 0,
-    "host_arch": "x64",
-    "icu_data_in": "../../deps/icu-tmp/icudt67l.dat",
+    "host_arch": "arm64",
+    "icu_data_in": "../../deps/icu-tmp/icudt70l.dat",
     "icu_endianness": "l",
     "icu_gyp_path": "tools/icu/icu-generic.gyp",
     "icu_path": "deps/icu-small",
     "icu_small": "false",
-    "icu_ver_major": "67",
+    "icu_ver_major": "70",
     "is_debug": 0,
-    "llvm_version": "11.0",
-    "napi_build_version": "7",
+    "llvm_version": "12.0",
+    "napi_build_version": "8",
     "node_byteorder": "little",
     "node_debug_lib": "false",
     "node_enable_d8": "false",
+    "node_fipsinstall": "false",
+    "node_install_corepack": "true",
     "node_install_npm": "true",
-    "node_module_version": 83,
+    "node_library_files": [
+      "lib/constants.js",
+      "lib/net.js",
+      "lib/trace_events.js",
+      "lib/events.js",
+      "lib/repl.js",
+      "lib/util.js",
+      "lib/dgram.js",
+      "lib/vm.js",
+      "lib/stream.js",
+      "lib/child_process.js",
+      "lib/assert.js",
+      "lib/_tls_wrap.js",
+      "lib/http2.js",
+      "lib/inspector.js",
+      "lib/os.js",
+      "lib/_http_server.js",
+      "lib/console.js",
+      "lib/perf_hooks.js",
+      "lib/readline.js",
+      "lib/punycode.js",
+      "lib/_http_incoming.js",
+      "lib/https.js",
+      "lib/_stream_wrap.js",
+      "lib/domain.js",
+      "lib/dns.js",
+      "lib/_http_client.js",
+      "lib/diagnostics_channel.js",
+      "lib/tty.js",
+      "lib/_http_agent.js",
+      "lib/timers.js",
+      "lib/_http_outgoing.js",
+      "lib/querystring.js",
+      "lib/_tls_common.js",
+      "lib/module.js",
+      "lib/_stream_passthrough.js",
+      "lib/_stream_transform.js",
+      "lib/worker_threads.js",
+      "lib/sys.js",
+      "lib/_stream_duplex.js",
+      "lib/path.js",
+      "lib/_http_common.js",
+      "lib/string_decoder.js",
+      "lib/cluster.js",
+      "lib/v8.js",
+      "lib/crypto.js",
+      "lib/wasi.js",
+      "lib/_stream_readable.js",
+      "lib/zlib.js",
+      "lib/url.js",
+      "lib/tls.js",
+      "lib/_stream_writable.js",
+      "lib/async_hooks.js",
+      "lib/process.js",
+      "lib/http.js",
+      "lib/buffer.js",
+      "lib/fs.js",
+      "lib/util/types.js",
+      "lib/timers/promises.js",
+      "lib/path/win32.js",
+      "lib/path/posix.js",
+      "lib/stream/consumers.js",
+      "lib/stream/promises.js",
+      "lib/stream/web.js",
+      "lib/readline/promises.js",
+      "lib/internal/constants.js",
+      "lib/internal/abort_controller.js",
+      "lib/internal/net.js",
+      "lib/internal/v8_prof_processor.js",
+      "lib/internal/event_target.js",
+      "lib/internal/inspector_async_hook.js",
+      "lib/internal/validators.js",
+      "lib/internal/linkedlist.js",
+      "lib/internal/cli_table.js",
+      "lib/internal/repl.js",
+      "lib/internal/util.js",
+      "lib/internal/histogram.js",
+      "lib/internal/error_serdes.js",
+      "lib/internal/dgram.js",
+      "lib/internal/structured_clone.js",
+      "lib/internal/child_process.js",
+      "lib/internal/assert.js",
+      "lib/internal/fixed_queue.js",
+      "lib/internal/blocklist.js",
+      "lib/internal/v8_prof_polyfill.js",
+      "lib/internal/options.js",
+      "lib/internal/worker.js",
+      "lib/internal/dtrace.js",
+      "lib/internal/idna.js",
+      "lib/internal/watchdog.js",
+      "lib/internal/encoding.js",
+      "lib/internal/tty.js",
+      "lib/internal/freeze_intrinsics.js",
+      "lib/internal/timers.js",
+      "lib/internal/heap_utils.js",
+      "lib/internal/querystring.js",
+      "lib/internal/js_stream_socket.js",
+      "lib/internal/errors.js",
+      "lib/internal/priority_queue.js",
+      "lib/internal/freelist.js",
+      "lib/internal/blob.js",
+      "lib/internal/socket_list.js",
+      "lib/internal/socketaddress.js",
+      "lib/internal/promise_hooks.js",
+      "lib/internal/stream_base_commons.js",
+      "lib/internal/url.js",
+      "lib/internal/async_hooks.js",
+      "lib/internal/http.js",
+      "lib/internal/buffer.js",
+      "lib/internal/trace_events_async_hooks.js",
+      "lib/internal/crypto/sig.js",
+      "lib/internal/crypto/rsa.js",
+      "lib/internal/crypto/aes.js",
+      "lib/internal/crypto/util.js",
+      "lib/internal/crypto/scrypt.js",
+      "lib/internal/crypto/random.js",
+      "lib/internal/crypto/keys.js",
+      "lib/internal/crypto/x509.js",
+      "lib/internal/crypto/certificate.js",
+      "lib/internal/crypto/ec.js",
+      "lib/internal/crypto/keygen.js",
+      "lib/internal/crypto/mac.js",
+      "lib/internal/crypto/diffiehellman.js",
+      "lib/internal/crypto/hkdf.js",
+      "lib/internal/crypto/cipher.js",
+      "lib/internal/crypto/hash.js",
+      "lib/internal/crypto/pbkdf2.js",
+      "lib/internal/crypto/webcrypto.js",
+      "lib/internal/crypto/dsa.js",
+      "lib/internal/crypto/hashnames.js",
+      "lib/internal/cluster/shared_handle.js",
+      "lib/internal/cluster/round_robin_handle.js",
+      "lib/internal/cluster/worker.js",
+      "lib/internal/cluster/primary.js",
+      "lib/internal/cluster/utils.js",
+      "lib/internal/cluster/child.js",
+      "lib/internal/webstreams/compression.js",
+      "lib/internal/webstreams/util.js",
+      "lib/internal/webstreams/writablestream.js",
+      "lib/internal/webstreams/readablestream.js",
+      "lib/internal/webstreams/queuingstrategies.js",
+      "lib/internal/webstreams/encoding.js",
+      "lib/internal/webstreams/transformstream.js",
+      "lib/internal/webstreams/adapters.js",
+      "lib/internal/webstreams/transfer.js",
+      "lib/internal/bootstrap/loaders.js",
+      "lib/internal/bootstrap/pre_execution.js",
+      "lib/internal/bootstrap/node.js",
+      "lib/internal/bootstrap/environment.js",
+      "lib/internal/bootstrap/switches/does_not_own_process_state.js",
+      "lib/internal/bootstrap/switches/is_not_main_thread.js",
+      "lib/internal/bootstrap/switches/does_own_process_state.js",
+      "lib/internal/bootstrap/switches/is_main_thread.js",
+      "lib/internal/test/binding.js",
+      "lib/internal/test/transfer.js",
+      "lib/internal/util/types.js",
+      "lib/internal/util/inspector.js",
+      "lib/internal/util/comparisons.js",
+      "lib/internal/util/debuglog.js",
+      "lib/internal/util/inspect.js",
+      "lib/internal/util/iterable_weak_map.js",
+      "lib/internal/streams/add-abort-signal.js",
+      "lib/internal/streams/compose.js",
+      "lib/internal/streams/duplexify.js",
+      "lib/internal/streams/destroy.js",
+      "lib/internal/streams/legacy.js",
+      "lib/internal/streams/passthrough.js",
+      "lib/internal/streams/readable.js",
+      "lib/internal/streams/from.js",
+      "lib/internal/streams/writable.js",
+      "lib/internal/streams/state.js",
+      "lib/internal/streams/buffer_list.js",
+      "lib/internal/streams/end-of-stream.js",
+      "lib/internal/streams/utils.js",
+      "lib/internal/streams/transform.js",
+      "lib/internal/streams/lazy_transform.js",
+      "lib/internal/streams/duplex.js",
+      "lib/internal/streams/pipeline.js",
+      "lib/internal/readline/interface.js",
+      "lib/internal/readline/promises.js",
+      "lib/internal/readline/utils.js",
+      "lib/internal/readline/emitKeypressEvents.js",
+      "lib/internal/readline/callbacks.js",
+      "lib/internal/repl/history.js",
+      "lib/internal/repl/utils.js",
+      "lib/internal/repl/await.js",
+      "lib/internal/legacy/processbinding.js",
+      "lib/internal/assert/calltracker.js",
+      "lib/internal/assert/assertion_error.js",
+      "lib/internal/http2/util.js",
+      "lib/internal/http2/core.js",
+      "lib/internal/http2/compat.js",
+      "lib/internal/per_context/messageport.js",
+      "lib/internal/per_context/primordials.js",
+      "lib/internal/per_context/domexception.js",
+      "lib/internal/vm/module.js",
+      "lib/internal/tls/secure-pair.js",
+      "lib/internal/tls/parse-cert-string.js",
+      "lib/internal/tls/secure-context.js",
+      "lib/internal/child_process/serialization.js",
+      "lib/internal/debugger/inspect_repl.js",
+      "lib/internal/debugger/inspect_client.js",
+      "lib/internal/debugger/inspect.js",
+      "lib/internal/worker/io.js",
+      "lib/internal/worker/js_transferable.js",
+      "lib/internal/main/repl.js",
+      "lib/internal/main/print_help.js",
+      "lib/internal/main/eval_string.js",
+      "lib/internal/main/check_syntax.js",
+      "lib/internal/main/prof_process.js",
+      "lib/internal/main/worker_thread.js",
+      "lib/internal/main/inspect.js",
+      "lib/internal/main/eval_stdin.js",
+      "lib/internal/main/run_main_module.js",
+      "lib/internal/modules/run_main.js",
+      "lib/internal/modules/package_json_reader.js",
+      "lib/internal/modules/esm/module_job.js",
+      "lib/internal/modules/esm/assert.js",
+      "lib/internal/modules/esm/get_source.js",
+      "lib/internal/modules/esm/translators.js",
+      "lib/internal/modules/esm/resolve.js",
+      "lib/internal/modules/esm/create_dynamic_module.js",
+      "lib/internal/modules/esm/load.js",
+      "lib/internal/modules/esm/initialize_import_meta.js",
+      "lib/internal/modules/esm/module_map.js",
+      "lib/internal/modules/esm/get_format.js",
+      "lib/internal/modules/esm/loader.js",
+      "lib/internal/modules/cjs/helpers.js",
+      "lib/internal/modules/cjs/loader.js",
+      "lib/internal/source_map/source_map.js",
+      "lib/internal/source_map/prepare_stack_trace.js",
+      "lib/internal/source_map/source_map_cache.js",
+      "lib/internal/dns/promises.js",
+      "lib/internal/dns/utils.js",
+      "lib/internal/fs/watchers.js",
+      "lib/internal/fs/promises.js",
+      "lib/internal/fs/read_file_context.js",
+      "lib/internal/fs/rimraf.js",
+      "lib/internal/fs/sync_write_stream.js",
+      "lib/internal/fs/dir.js",
+      "lib/internal/fs/streams.js",
+      "lib/internal/fs/utils.js",
+      "lib/internal/fs/cp/cp.js",
+      "lib/internal/fs/cp/cp-sync.js",
+      "lib/internal/perf/nodetiming.js",
+      "lib/internal/perf/usertiming.js",
+      "lib/internal/perf/performance_entry.js",
+      "lib/internal/perf/performance.js",
+      "lib/internal/perf/timerify.js",
+      "lib/internal/perf/utils.js",
+      "lib/internal/perf/observe.js",
+      "lib/internal/perf/event_loop_delay.js",
+      "lib/internal/perf/event_loop_utilization.js",
+      "lib/internal/policy/manifest.js",
+      "lib/internal/policy/sri.js",
+      "lib/internal/process/task_queues.js",
+      "lib/internal/process/per_thread.js",
+      "lib/internal/process/warning.js",
+      "lib/internal/process/policy.js",
+      "lib/internal/process/promises.js",
+      "lib/internal/process/signal.js",
+      "lib/internal/process/execution.js",
+      "lib/internal/process/esm_loader.js",
+      "lib/internal/process/report.js",
+      "lib/internal/process/worker_thread_only.js",
+      "lib/internal/console/constructor.js",
+      "lib/internal/console/global.js",
+      "lib/assert/strict.js",
+      "lib/dns/promises.js",
+      "lib/fs/promises.js"
+    ],
+    "node_module_version": 102,
     "node_no_browser_globals": "false",
-    "node_prefix": "/usr/local",
+    "node_prefix": "/",
     "node_release_urlbase": "https://nodejs.org/download/release/",
     "node_shared": "false",
     "node_shared_brotli": "false",
@@ -43,6 +317,8 @@
     "node_shared_http_parser": "false",
     "node_shared_libuv": "false",
     "node_shared_nghttp2": "false",
+    "node_shared_nghttp3": "false",
+    "node_shared_ngtcp2": "false",
     "node_shared_openssl": "false",
     "node_shared_zlib": "false",
     "node_tag": "",
@@ -56,11 +332,11 @@
     "node_use_v8_platform": "true",
     "node_with_ltcg": "false",
     "node_without_node_options": "false",
-    "openssl_fips": "",
     "openssl_is_fips": "false",
+    "openssl_quic": "true",
     "ossfuzz": "false",
-    "shlib_suffix": "83.dylib",
-    "target_arch": "x64",
+    "shlib_suffix": "102.dylib",
+    "target_arch": "arm64",
     "v8_enable_31bit_smis_on_64bit_arch": 0,
     "v8_enable_gdbjit": 0,
     "v8_enable_i18n_support": 1,
@@ -68,6 +344,7 @@
     "v8_enable_lite_mode": 0,
     "v8_enable_object_print": 1,
     "v8_enable_pointer_compression": 0,
+    "v8_enable_webassembly": 1,
     "v8_no_strict_aliasing": 1,
     "v8_optimized_debug": 1,
     "v8_promise_internal_field_count": 1,
@@ -75,8 +352,8 @@
     "v8_trace_maps": 0,
     "v8_use_siphash": 1,
     "want_separate_host_toolset": 0,
-    "xcode_version": "11.0",
-    "nodedir": "/Users/eva/Library/Caches/node-gyp/14.16.0",
+    "xcode_version": "12.0",
+    "nodedir": "/Users/eva/Library/Caches/node-gyp/17.3.1",
     "standalone_static_library": 1,
     "version_git_tag": "true",
     "init_license": "MIT",
@@ -86,7 +363,7 @@
     "strict_ssl": "true",
     "save_prefix": "^",
     "version_git_message": "v%s",
-    "user_agent": "yarn/1.22.10 npm/? node/v14.16.0 darwin x64",
+    "user_agent": "yarn/1.22.10 npm/? node/v17.3.1 darwin arm64",
     "ignore_scripts": "",
     "version_git_sign": "",
     "ignore_optional": "",

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

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

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@graphprotocol/graph-ts@0.27.0-alpha.0":
-  version "0.27.0-alpha.0"
-  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.27.0-alpha.0.tgz#1d50fc3fe7e574b09f206d60a5d9889d5e95beba"
-  integrity sha512-aS1VQUgj3dSvodDMJSBoyYfHjBA8UsUc/JUIrz+R5DjpxFx7wq5yzzB6GGlwEhuBV93UEh4UdmRDPWT/SKD5sg==
+"@graphprotocol/graph-ts@0.27.0":
+  version "0.27.0"
+  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.27.0.tgz#948fe1716f6082964a01a63a19bcbf9ac44e06ff"
+  integrity sha512-r1SPDIZVQiGMxcY8rhFSM0y7d/xAbQf5vHMWUf59js1KgoyWpM6P3tczZqmQd7JTmeyNsDGIPzd9FeaxllsU4w==
   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.27.0-alpha.0"
+    "@graphprotocol/graph-ts": "0.27.0"
   },
   "resolutions": {
     "assemblyscript": "0.19.10"

package/examples/example-subgraph/yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@graphprotocol/graph-ts@0.27.0-alpha.0":
-  version "0.27.0-alpha.0"
-  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.27.0-alpha.0.tgz#1d50fc3fe7e574b09f206d60a5d9889d5e95beba"
-  integrity sha512-aS1VQUgj3dSvodDMJSBoyYfHjBA8UsUc/JUIrz+R5DjpxFx7wq5yzzB6GGlwEhuBV93UEh4UdmRDPWT/SKD5sg==
+"@graphprotocol/graph-ts@0.27.0":
+  version "0.27.0"
+  resolved "https://registry.yarnpkg.com/@graphprotocol/graph-ts/-/graph-ts-0.27.0.tgz#948fe1716f6082964a01a63a19bcbf9ac44e06ff"
+  integrity sha512-r1SPDIZVQiGMxcY8rhFSM0y7d/xAbQf5vHMWUf59js1KgoyWpM6P3tczZqmQd7JTmeyNsDGIPzd9FeaxllsU4w==
   dependencies:
     assemblyscript "0.19.10"
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.30.0-alpha.0",
+  "version": "0.30.1",
   "license": "(Apache-2.0 OR MIT)",
   "description": "CLI for building for and deploying to The Graph",
   "dependencies": {

package/resources/test/docker-compose.yml

@@ -1,7 +1,8 @@
 version: '3'
 services:
   graph-node:
-    image: graphprotocol/graph-node:2e0dc0b # TODO: change to latest once it has 0.0.5
+    # TODO: change to "latest" once it supports apiVersion 0.0.5 and specVersion 0.0.7
+    image: graphprotocol/graph-node:4a8e819
     ports:
       - '18000:8000'
       - '18001:8001'
@@ -20,7 +21,8 @@ services:
       ipfs: 'ipfs:5001'
       ethereum: 'test:http://ethereum:8545'
       GRAPH_LOG: trace
-      GRAPH_MAX_API_VERSION: '0.0.5' # TODO: remove once latest has 0.0.5 by default
+      GRAPH_MAX_API_VERSION: '0.0.7' # TODO: remove once "latest" supports apiVersion 0.0.7 by default
+      GRAPH_MAX_SPEC_VERSION: '0.0.5' # TODO: remove once "latest" supports specVersion 0.0.5 by default
   ethereum:
     image: trufflesuite/ganache-cli:latest
     ports:

package/src/codegen/schema.js

@@ -96,6 +96,10 @@ module.exports = class SchemaCodeGenerator {
     )
   }
 
+  _isInterfaceDefinition(def) {
+    return def.get('kind') === 'InterfaceTypeDefinition'
+  }
+
   _generateEntityType(def) {
     let name = def.getIn(['name', 'value'])
     let klass = tsCodegen.klass(name, { export: true, extends: 'Entity' })
@@ -120,41 +124,6 @@ module.exports = class SchemaCodeGenerator {
     return klass
   }
 
-  // Fields that are non-nullable get an empty/zero value set in the class constructor.
-  _generateDefaultFieldValues(fields) {
-    const indexOfIdField = fields.findIndex(field => field.getIn(['name', 'value']) === 'id')
-    const fieldsWithoutId = fields.remove(indexOfIdField)
-
-    const fieldsSetCalls = fieldsWithoutId
-      .map(field => {
-        const name = field.getIn(['name', 'value'])
-        const type = this._typeFromGraphQl(field.get('type'), true, true)
-
-        const isNullable = type instanceof tsCodegen.NullableType
-
-        const directives = field.get('directives')
-        const isDerivedFrom = directives.some(directive => directive.getIn(['name', 'value']) === 'derivedFrom')
-
-        return { name, type, isNullable, isDerivedFrom }
-      })
-      // We only call the setter with the default value in the constructor for fields that are:
-      // - Not nullable, so that AS doesn't break when subgraph developers try to access them before a `set`
-      //   - It doesn't matter if it's primitive or not
-      // - Not tagged as `derivedFrom`, because they only exist in query time
-      .filter(({
-        isNullable,
-        isDerivedFrom,
-      }) => !isNullable && !isDerivedFrom)
-      .map(({ name, type, isNullable }) => {
-        const fieldTypeString = isNullable ? type.inner.toString() : type.toString()
-
-        return `
-        this.set('${name}', ${typesCodegen.initializedValueFromAsc(fieldTypeString)})`
-      })
-
-    return fieldsSetCalls.join('')
-  }
-
   _generateConstructor(entityName, fields) {
     const idField = IdField.fromFields(fields)
     return tsCodegen.method(
@@ -164,7 +133,6 @@ module.exports = class SchemaCodeGenerator {
       `
       super()
       this.set('id', ${idField.tsValueFrom()})
-      ${this._generateDefaultFieldValues(fields)}
       `,
     )
   }
@@ -279,7 +247,7 @@ Suggestion: add an '!' to the member type of the List, change from '[${baseType}
     // 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)
+      find(def => (this._isEntityTypeDefinition(def) || this._isInterfaceDefinition(def)) && def.getIn(["name", "value"]) === typeName)
     if (typeDef) {
       return IdField.fromTypeDef(typeDef).typeName()
     } else {
@@ -313,7 +281,7 @@ Suggestion: add an '!' to the member type of the List, change from '[${baseType}
     }
   }
 
-  _typeFromGraphQl(gqlType, nullable = true, nullablePrimitive = false) {
+  _typeFromGraphQl(gqlType, nullable = true) {
     if (gqlType.get('kind') === 'NonNullType') {
       return this._typeFromGraphQl(gqlType.get('type'), false)
     } else if (gqlType.get('kind') === 'ListType') {
@@ -324,13 +292,8 @@ Suggestion: add an '!' to the member type of the List, change from '[${baseType}
       let type = tsCodegen.namedType(
         typesCodegen.ascTypeForValue(this._resolveFieldType(gqlType)),
       )
-
-      // Will not wrap primitives into NullableType by default.
-      if (!nullablePrimitive && type.isPrimitive()) {
-        return type
-      }
-
-      return nullable ? tsCodegen.nullableType(type) : type
+      // In AssemblyScript, primitives cannot be nullable.
+      return nullable && !type.isPrimitive() ? tsCodegen.nullableType(type) : type
     }
   }
 }

package/src/codegen/schema.test.js

@@ -114,9 +114,6 @@ describe('Schema code generator', () => {
             body: `
               super()
               this.set('id', Value.fromString(id))
-
-              this.set('name', Value.fromString(''))
-              this.set('count', Value.fromI32(0))
             `,
           },
           {
@@ -277,9 +274,6 @@ describe('Schema code generator', () => {
             body: `
               super()
               this.set('id', Value.fromString(id))
-
-              this.set('amount', Value.fromBigInt(BigInt.zero()))
-              this.set('account', Value.fromString(''))
             `,
           },
           {
@@ -361,4 +355,106 @@ describe('Schema code generator', () => {
       })
     })
   })
+
+  test('Should handle references with Bytes id types', () => {
+    const codegen = createSchemaCodeGen(`
+    interface Employee {
+      id: Bytes!
+      name: String!
+     }
+
+    type Worker implements Employee @entity {
+      id: Bytes!
+      name: String!
+   }
+
+    type Task @entity {
+      id: Bytes!
+      employee: Employee!
+      worker: Worker!
+   }
+`)
+
+    const generatedTypes = codegen.generateTypes()
+    testEntity(generatedTypes, {
+      name: "Task",
+      members: [],
+      methods: [
+        {
+          name: 'constructor',
+          params: [new Param('id', new NamedType('Bytes'))],
+          returnType: undefined,
+          body: "\n      super()\n      this.set('id', Value.fromBytes(id))\n      "
+        },
+        {
+          name: 'save',
+          params: [],
+          returnType: new NamedType('void'),
+          body: '\n' +
+            "        let id = this.get('id')\n" +
+            '        assert(id != null,\n' +
+            "               'Cannot save Task entity without an ID')\n" +
+            '        if (id) {\n' +
+            '          assert(id.kind == ValueKind.BYTES,\n' +
+            "                 `Entities of type Task must have an ID of type Bytes but the id '${id.displayData()}' is of type ${id.displayKind()}`)\n" +
+            "          store.set('Task', id.toBytes().toHexString(), this)\n" +
+            '        }'
+        },
+        {
+          name: 'load',
+          static: true,
+          params: [new Param('id', new NamedType('Bytes'))],
+          returnType: new NullableType(new NamedType('Task')),
+          body: '\n' +
+            "        return changetype<Task | null>(store.get('Task', id.toHexString()))\n" +
+            '        '
+        },
+        {
+          name: 'get id',
+          params: [],
+          returnType: new NamedType('Bytes'),
+          body: '\n' +
+            "       let value = this.get('id')\n" +
+            '       return value!.toBytes()\n' +
+            '      '
+        },
+        {
+          name: 'set id',
+          params: [new Param('value', new NamedType('Bytes'))],
+          returnType: undefined,
+          body: "\n      this.set('id', Value.fromBytes(value))\n    "
+        },
+        {
+          name: 'get employee',
+          params: [],
+          returnType: new NamedType('Bytes'),
+          body: '\n' +
+            "       let value = this.get('employee')\n" +
+            '       return value!.toBytes()\n' +
+            '      '
+        },
+        {
+          name: 'set employee',
+          params: [new Param('value', new NamedType('Bytes'))],
+          returnType: undefined,
+          body: "\n      this.set('employee', Value.fromBytes(value))\n    "
+        },
+        {
+          name: 'get worker',
+          params: [],
+          returnType: new NamedType('Bytes'),
+          body: '\n' +
+            "       let value = this.get('worker')\n" +
+            '       return value!.toBytes()\n' +
+            '      '
+        },
+        {
+          name: 'set worker',
+          params: [new Param('value', new NamedType('Bytes'))],
+          returnType: undefined,
+          body: "\n      this.set('worker', Value.fromBytes(value))\n    "
+        }
+      ]
+    })
+  })
 })