@graphprotocol/graph-cli 0.45.0-alpha-20230404031827-a04a9e9 → 0.45.0-alpha-20230404035238-bfb8437

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @graphprotocol/graph-cli
 
-## 0.45.0-alpha-20230404031827-a04a9e9
+## 0.45.0-alpha-20230404035238-bfb8437
 
 ### Minor Changes
 
@@ -13,6 +13,12 @@
   [`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)
@@ -46,14 +52,6 @@
   - 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:
@@ -110,13 +108,6 @@
   - Updated dependency [`glob@9.3.4` ↗︎](https://www.npmjs.com/package/glob/v/9.3.4) (from `7.1.6`,
     in `dependencies`)
 
-- [#1251](https://github.com/graphprotocol/graph-tooling/pull/1251)
-  [`a04a9e9`](https://github.com/graphprotocol/graph-tooling/commit/a04a9e9455a2f6575b6bc6e1a8867f78dd46ba09)
-  Thanks [@renovate](https://github.com/apps/renovate)! - dependencies updates:
-
-  - Updated dependency [`jayson@4.0.0` ↗︎](https://www.npmjs.com/package/jayson/v/4.0.0) (from
-    `3.7.0`, 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,7 +153,11 @@ class SchemaCodeGenerator {
         const name = fieldDef.getIn(['name', 'value']);
         const gqlType = fieldDef.get('type');
         const fieldValueType = this._valueTypeFromGraphQl(gqlType);
-        const returnType = this._typeFromGraphQl(gqlType);
+        const returnType = this._typeFromGraphQl({
+            gqlType,
+            entityDef: _entityDef,
+            fieldDef: fieldDef,
+        });
         const isNullable = returnType instanceof tsCodegen.NullableType;
         const getNonNullable = `return ${typesCodegen.valueToAsc('value!', fieldValueType)}`;
         const getNullable = `if (!value || value.kind == ValueKind.NULL) {
@@ -176,7 +180,7 @@ class SchemaCodeGenerator {
             return null;
         const gqlType = fieldDef.get('type');
         const fieldValueType = this._valueTypeFromGraphQl(gqlType);
-        const paramType = this._typeFromGraphQl(gqlType);
+        const paramType = this._typeFromGraphQl({ gqlType, entityDef: _entityDef, fieldDef });
         const isNullable = paramType instanceof tsCodegen.NullableType;
         const paramTypeString = isNullable ? paramType.inner.toString() : paramType.toString();
         const isArray = paramType instanceof tsCodegen.ArrayType;
@@ -236,18 +240,38 @@ Suggestion: add an '!' to the member type of the List, change from '[${baseType}
         }
         return gqlType.getIn(['name', 'value']);
     }
-    _typeFromGraphQl(gqlType, nullable = true) {
+    _typeFromGraphQl({ gqlType, nullable = true, entityDef, fieldDef, }) {
         if (gqlType.get('kind') === 'NonNullType') {
-            return this._typeFromGraphQl(gqlType.get('type'), false);
+            return this._typeFromGraphQl({
+                gqlType: gqlType.get('type'),
+                nullable: false,
+                entityDef,
+                fieldDef,
+            });
         }
         if (gqlType.get('kind') === 'ListType') {
-            const type = tsCodegen.arrayType(this._typeFromGraphQl(gqlType.get('type')));
+            const type = tsCodegen.arrayType(this._typeFromGraphQl({ gqlType: gqlType.get('type'), entityDef, fieldDef }));
             return nullable ? tsCodegen.nullableType(type) : type;
         }
         // NamedType
         const type = tsCodegen.namedType(typesCodegen.ascTypeForValue(this._resolveFieldType(gqlType)));
-        // In AssemblyScript, primitives cannot be nullable.
-        return nullable && !type.isPrimitive() ? tsCodegen.nullableType(type) : type;
+        // 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;
     }
 }
 exports.default = SchemaCodeGenerator;

package/dist/codegen/schema.test.js

@@ -43,6 +43,9 @@ 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)
@@ -81,8 +84,8 @@ describe('Schema code generator', () => {
         name: String!
 
         # two primitive types (i32)
-        age: Int
         count: Int!
+        isActive: Boolean!
 
         # derivedFrom
         wallets: [Wallet!] @derivedFrom(field: "account")
@@ -199,20 +202,20 @@ describe('Schema code generator', () => {
             `,
                     },
                     {
-                        name: 'get age',
+                        name: 'get isActive',
                         params: [],
-                        returnType: new typescript_1.NamedType('i32'),
+                        returnType: new typescript_1.NamedType('boolean'),
                         body: `
-              let value = this.get('age')
-              return value!.toI32()
+              let value = this.get('isActive')
+              return value!.toBoolean()
             `,
                     },
                     {
-                        name: 'set age',
-                        params: [new typescript_1.Param('value', new typescript_1.NamedType('i32'))],
+                        name: 'set isActive',
+                        params: [new typescript_1.Param('value', new typescript_1.NamedType('boolean'))],
                         returnType: undefined,
                         body: `
-              this.set('age', Value.fromI32(value))
+              this.set('isActive', Value.fromBoolean(value))
             `,
                     },
                     {
@@ -441,4 +444,18 @@ 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-20230404031827-a04a9e9",
+  "version": "0.45.0-alpha-20230404035238-bfb8437",
   "commands": {
     "add": {
       "id": "add",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.45.0-alpha-20230404031827-a04a9e9",
+  "version": "0.45.0-alpha-20230404035238-bfb8437",
   "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.19",
+    "docker-compose": "0.23.4",
     "dockerode": "2.5.8",
     "fs-extra": "9.1.0",
     "glob": "9.3.4",
@@ -33,7 +33,7 @@
     "graphql": "15.5.0",
     "immutable": "4.2.1",
     "ipfs-http-client": "34.0.0",
-    "jayson": "4.0.0",
+    "jayson": "3.7.0",
     "js-yaml": "3.14.1",
     "prettier": "1.19.1",
     "request": "2.88.2",