@graphprotocol/graph-cli 0.45.0-alpha-20230404035730-507217d → 0.45.0-alpha-20230404094958-e618363

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @graphprotocol/graph-cli
 
-## 0.45.0-alpha-20230404035730-507217d
+## 0.45.0-alpha-20230404094958-e618363
 
 ### Minor Changes
 
@@ -13,12 +13,6 @@
   [`f26398e`](https://github.com/graphprotocol/graph-tooling/commit/f26398e054c556f414a1b45e92b7e4007a9b5a79)
   Thanks [@kalloc](https://github.com/kalloc)! - Support `ts` typing in tests folder
 
-- [#1253](https://github.com/graphprotocol/graph-tooling/pull/1253)
-  [`bfb8437`](https://github.com/graphprotocol/graph-tooling/commit/bfb8437fccdde0630ae2c47735b59a663a63b4ae)
-  Thanks [@saihaj](https://github.com/saihaj)! - Disallow nullable primitive types. In
-  AssemblyScript, nullable primitive types are not allowed. An error will be thrown when it
-  encounters a nullable primitive type in the GraphQL Schema.
-
 ### Patch Changes
 
 - [#1216](https://github.com/graphprotocol/graph-tooling/pull/1216)
@@ -52,6 +46,14 @@
   - Updated dependency [`debug@4.3.4` ↗︎](https://www.npmjs.com/package/debug/v/4.3.4) (from
     `4.3.1`, in `dependencies`)
 
+- [#1227](https://github.com/graphprotocol/graph-tooling/pull/1227)
+  [`7516030`](https://github.com/graphprotocol/graph-tooling/commit/751603045fc5f92d0d4b950f3a0fa263f040c401)
+  Thanks [@renovate](https://github.com/apps/renovate)! - dependencies updates:
+
+  - Updated dependency
+    [`docker-compose@0.23.19` ↗︎](https://www.npmjs.com/package/docker-compose/v/0.23.19) (from
+    `0.23.4`, in `dependencies`)
+
 - [#1228](https://github.com/graphprotocol/graph-tooling/pull/1228)
   [`cefbf3a`](https://github.com/graphprotocol/graph-tooling/commit/cefbf3a0d4601d79c4700eed45f1fc3ede35fbd7)
   Thanks [@renovate](https://github.com/apps/renovate)! - dependencies updates:
@@ -108,6 +110,13 @@
   - Updated dependency [`glob@9.3.4` ↗︎](https://www.npmjs.com/package/glob/v/9.3.4) (from `7.1.6`,
     in `dependencies`)
 
+- [#1255](https://github.com/graphprotocol/graph-tooling/pull/1255)
+  [`e618363`](https://github.com/graphprotocol/graph-tooling/commit/e618363ff2c5fe07989b342ebd8196bd112eff0f)
+  Thanks [@renovate](https://github.com/apps/renovate)! - dependencies updates:
+
+  - Updated dependency [`which@3.0.0` ↗︎](https://www.npmjs.com/package/which/v/3.0.0) (from
+    `2.0.2`, in `dependencies`)
+
 - [#1207](https://github.com/graphprotocol/graph-tooling/pull/1207)
   [`ad275b3`](https://github.com/graphprotocol/graph-tooling/commit/ad275b31e635dab03cfefda00617ef9f612b01c0)
   Thanks [@saihaj](https://github.com/saihaj)! - bring back short hand for version and help

package/dist/codegen/schema.js

@@ -153,11 +153,7 @@ class SchemaCodeGenerator {
         const name = fieldDef.getIn(['name', 'value']);
         const gqlType = fieldDef.get('type');
         const fieldValueType = this._valueTypeFromGraphQl(gqlType);
-        const returnType = this._typeFromGraphQl({
-            gqlType,
-            entityDef: _entityDef,
-            fieldDef,
-        });
+        const returnType = this._typeFromGraphQl(gqlType);
         const isNullable = returnType instanceof tsCodegen.NullableType;
         const getNonNullable = `return ${typesCodegen.valueToAsc('value!', fieldValueType)}`;
         const getNullable = `if (!value || value.kind == ValueKind.NULL) {
@@ -180,7 +176,7 @@ class SchemaCodeGenerator {
             return null;
         const gqlType = fieldDef.get('type');
         const fieldValueType = this._valueTypeFromGraphQl(gqlType);
-        const paramType = this._typeFromGraphQl({ gqlType, entityDef: _entityDef, fieldDef });
+        const paramType = this._typeFromGraphQl(gqlType);
         const isNullable = paramType instanceof tsCodegen.NullableType;
         const paramTypeString = isNullable ? paramType.inner.toString() : paramType.toString();
         const isArray = paramType instanceof tsCodegen.ArrayType;
@@ -240,38 +236,18 @@ Suggestion: add an '!' to the member type of the List, change from '[${baseType}
         }
         return gqlType.getIn(['name', 'value']);
     }
-    _typeFromGraphQl({ gqlType, nullable = true, entityDef, fieldDef, }) {
+    _typeFromGraphQl(gqlType, nullable = true) {
         if (gqlType.get('kind') === 'NonNullType') {
-            return this._typeFromGraphQl({
-                gqlType: gqlType.get('type'),
-                nullable: false,
-                entityDef,
-                fieldDef,
-            });
+            return this._typeFromGraphQl(gqlType.get('type'), false);
         }
         if (gqlType.get('kind') === 'ListType') {
-            const type = tsCodegen.arrayType(this._typeFromGraphQl({ gqlType: gqlType.get('type'), entityDef, fieldDef }));
+            const type = tsCodegen.arrayType(this._typeFromGraphQl(gqlType.get('type')));
             return nullable ? tsCodegen.nullableType(type) : type;
         }
         // NamedType
         const type = tsCodegen.namedType(typesCodegen.ascTypeForValue(this._resolveFieldType(gqlType)));
-        // This is helpful for debugging
-        const schemaCoordinate = `${entityDef.getIn(['name', 'value'])}.${fieldDef.getIn([
-            'name',
-            'value',
-        ])}`;
-        const gqlTypeName = gqlType.get('name').get('value');
-        if (nullable) {
-            // In AssemblyScript, primitives cannot be nullable.
-            if (type.isPrimitive()) {
-                throw Error(`A primitive type cannot be nullable. AssemblyScript does not support nullable primitives.
-Consider changing the type of "${schemaCoordinate}" from "${gqlTypeName}" to "${gqlTypeName}!"`);
-            }
-            else {
-                return tsCodegen.nullableType(type);
-            }
-        }
-        return type;
+        // In AssemblyScript, primitives cannot be nullable.
+        return nullable && !type.isPrimitive() ? tsCodegen.nullableType(type) : type;
     }
 }
 exports.default = SchemaCodeGenerator;

package/dist/codegen/schema.test.js

@@ -43,9 +43,6 @@ const testEntity = (generatedTypes, expectedEntity) => {
     expect(members).toStrictEqual(expectedEntity.members);
     for (const expectedMethod of expectedEntity.methods) {
         const method = methods.find((method) => method.name === expectedMethod.name);
-        if (!method) {
-            throw new Error(`Method ${expectedMethod.name} not found`);
-        }
         // eslint-disable-next-line @typescript-eslint/no-unused-expressions
         expectedMethod.static
             ? expect(method instanceof typescript_1.StaticMethod).toBe(true)
@@ -84,8 +81,8 @@ describe('Schema code generator', () => {
         name: String!
 
         # two primitive types (i32)
+        age: Int
         count: Int!
-        isActive: Boolean!
 
         # derivedFrom
         wallets: [Wallet!] @derivedFrom(field: "account")
@@ -202,20 +199,20 @@ describe('Schema code generator', () => {
             `,
                     },
                     {
-                        name: 'get isActive',
+                        name: 'get age',
                         params: [],
-                        returnType: new typescript_1.NamedType('boolean'),
+                        returnType: new typescript_1.NamedType('i32'),
                         body: `
-              let value = this.get('isActive')
-              return value!.toBoolean()
+              let value = this.get('age')
+              return value!.toI32()
             `,
                     },
                     {
-                        name: 'set isActive',
-                        params: [new typescript_1.Param('value', new typescript_1.NamedType('boolean'))],
+                        name: 'set age',
+                        params: [new typescript_1.Param('value', new typescript_1.NamedType('i32'))],
                         returnType: undefined,
                         body: `
-              this.set('isActive', Value.fromBoolean(value))
+              this.set('age', Value.fromI32(value))
             `,
                     },
                     {
@@ -444,18 +441,4 @@ describe('Schema code generator', () => {
             ],
         });
     });
-    test('throw error when entity has nullable primitives', () => {
-        const codegen = createSchemaCodeGen(`
-      type Account @entity {
-        id: ID!
-        isActive: Boolean
-      }
-    `);
-        try {
-            codegen.generateTypes();
-        }
-        catch (err) {
-            expect(err.message).toBe(`A primitive type cannot be nullable. AssemblyScript does not support nullable primitives.\nConsider changing the type of "Account.isActive" from "Boolean" to "Boolean!"`);
-        }
-    });
 });

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.45.0-alpha-20230404035730-507217d",
+  "version": "0.45.0-alpha-20230404094958-e618363",
   "commands": {
     "add": {
       "id": "add",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.45.0-alpha-20230404035730-507217d",
+  "version": "0.45.0-alpha-20230404094958-e618363",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {
@@ -25,7 +25,7 @@
     "chalk": "3.0.0",
     "chokidar": "3.5.3",
     "debug": "4.3.4",
-    "docker-compose": "0.23.4",
+    "docker-compose": "0.23.19",
     "dockerode": "2.5.8",
     "fs-extra": "9.1.0",
     "glob": "9.3.4",
@@ -41,7 +41,7 @@
     "sync-request": "6.1.0",
     "tmp-promise": "3.0.3",
     "web3-eth-abi": "1.7.0",
-    "which": "2.0.2",
+    "which": "3.0.0",
     "yaml": "1.10.2"
   },
   "devDependencies": {
@@ -50,7 +50,7 @@
     "@types/jest": "^26.0.24",
     "@types/js-yaml": "^3.12.7",
     "@types/semver": "^7.3.13",
-    "@types/which": "^2.0.1",
+    "@types/which": "^3.0.0",
     "copyfiles": "^2.4.1",
     "jest": "26.6.3",
     "oclif": "3.7.3",