@graphprotocol/graph-cli 0.45.0-alpha-20230403202002-10dfa2c → 0.45.0-alpha-20230404035238-bfb8437

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @graphprotocol/graph-cli
 
-## 0.45.0-alpha-20230403202002-10dfa2c
+## 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)
@@ -74,13 +80,6 @@
   - Updated dependency [`fs-extra@9.1.0` ↗︎](https://www.npmjs.com/package/fs-extra/v/9.1.0) (from
     `9.0.0`, in `dependencies`)
 
-- [#1237](https://github.com/graphprotocol/graph-tooling/pull/1237)
-  [`10dfa2c`](https://github.com/graphprotocol/graph-tooling/commit/10dfa2cd1a4165f9c792d76cbdd3e2483453cc7e)
-  Thanks [@renovate](https://github.com/apps/renovate)! - dependencies updates:
-
-  - Updated dependency [`graphql@15.8.0` ↗︎](https://www.npmjs.com/package/graphql/v/15.8.0) (from
-    `15.5.0`, in `dependencies`)
-
 - [#1239](https://github.com/graphprotocol/graph-tooling/pull/1239)
   [`b331905`](https://github.com/graphprotocol/graph-tooling/commit/b331905790c193183fb9cad834f488027cb3fd91)
   Thanks [@renovate](https://github.com/apps/renovate)! - dependencies updates:

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/dist/commands/add.js

@@ -102,7 +102,6 @@ class AddCommand extends core_1.Command {
         await (0, spinner_1.withSpinner)('Running codegen', 'Failed to run codegen', 'Warning during codegen', () => gluegun_1.system.run(yarn ? 'yarn codegen' : 'npm run codegen'));
     }
 }
-exports.default = AddCommand;
 AddCommand.description = 'Adds a new datasource to a subgraph.';
 AddCommand.args = {
     address: core_1.Args.string({
@@ -137,6 +136,7 @@ AddCommand.flags = {
         default: 'networks.json',
     }),
 };
+exports.default = AddCommand;
 const getEntities = (manifest) => {
     const dataSources = manifest.result.get('dataSources', immutable_1.default.List());
     const templates = manifest.result.get('templates', immutable_1.default.List());

package/dist/commands/auth.js

@@ -42,7 +42,6 @@ class AuthCommand extends core_1.Command {
         }
     }
 }
-exports.default = AuthCommand;
 AuthCommand.description = 'Sets the deploy key to use when deploying to a Graph node.';
 AuthCommand.args = {
     node: core_1.Args.string(),
@@ -61,3 +60,4 @@ AuthCommand.flags = {
         exclusive: ['product'],
     }),
 };
+exports.default = AuthCommand;

package/dist/commands/build.js

@@ -78,7 +78,6 @@ class BuildCommand extends core_1.Command {
         }
     }
 }
-exports.default = BuildCommand;
 BuildCommand.description = 'Builds a subgraph and (optionally) uploads it to IPFS.';
 BuildCommand.args = {
     'subgraph-manifest': core_1.Args.string({
@@ -120,3 +119,4 @@ BuildCommand.flags = {
         default: 'networks.json',
     }),
 };
+exports.default = BuildCommand;

package/dist/commands/codegen.js

@@ -72,7 +72,6 @@ class CodegenCommand extends core_1.Command {
         }
     }
 }
-exports.default = CodegenCommand;
 CodegenCommand.description = 'Generates AssemblyScript types for a subgraph.';
 CodegenCommand.args = {
     'subgraph-manifest': core_1.Args.string({
@@ -107,3 +106,4 @@ CodegenCommand.flags = {
         dependsOn: ['uncrashable'],
     }),
 };
+exports.default = CodegenCommand;

package/dist/commands/create.js

@@ -52,7 +52,6 @@ class CreateCommand extends core_1.Command {
         });
     }
 }
-exports.default = CreateCommand;
 CreateCommand.description = 'Registers a subgraph name';
 CreateCommand.args = {
     'subgraph-name': core_1.Args.string({
@@ -72,3 +71,4 @@ CreateCommand.flags = {
         summary: 'Graph access token.',
     }),
 };
+exports.default = CreateCommand;

package/dist/commands/deploy.js

@@ -214,7 +214,6 @@ $ graph create --node ${node} ${subgraphName}`;
         }
     }
 }
-exports.default = DeployCommand;
 DeployCommand.description = 'Deploys a subgraph to a Graph node.';
 DeployCommand.args = {
     'subgraph-name': core_1.Args.string({
@@ -283,3 +282,4 @@ DeployCommand.flags = {
         default: 'networks.json',
     }),
 };
+exports.default = DeployCommand;

package/dist/commands/init.js

@@ -193,7 +193,6 @@ class InitCommand extends core_1.Command {
         }
     }
 }
-exports.default = InitCommand;
 InitCommand.description = 'Creates a new subgraph with basic scaffolding.';
 InitCommand.args = {
     subgraphName: core_1.Args.string(),
@@ -265,6 +264,7 @@ InitCommand.flags = {
         ],
     }),
 };
+exports.default = InitCommand;
 async function processInitForm({ protocol, product, studio, node, abi, allowSimpleName, directory, contract, indexEvents, fromExample, network, subgraphName, contractName, startBlock, }) {
     let abiFromEtherscan = undefined;
     let abiFromFile = undefined;

package/dist/commands/local.js

@@ -137,7 +137,6 @@ class LocalCommand extends core_1.Command {
         this.exit(result.exitCode);
     }
 }
-exports.default = LocalCommand;
 LocalCommand.description = 'Runs local tests against a Graph Node environment (using Ganache by default).';
 LocalCommand.args = {
     'local-command': core_1.Args.string({
@@ -182,6 +181,7 @@ LocalCommand.flags = {
         default: 120000,
     }),
 };
+exports.default = LocalCommand;
 /**
  * Indents all lines of a string
  */

package/dist/commands/remove.js

@@ -53,7 +53,6 @@ class RemoveCommand extends core_1.Command {
         });
     }
 }
-exports.default = RemoveCommand;
 RemoveCommand.description = 'Unregisters a subgraph name';
 RemoveCommand.args = {
     'subgraph-name': core_1.Args.string({
@@ -73,3 +72,4 @@ RemoveCommand.flags = {
         summary: 'Graph access token.',
     }),
 };
+exports.default = RemoveCommand;

package/dist/commands/test.js

@@ -66,7 +66,6 @@ class TestCommand extends core_1.Command {
         }
     }
 }
-exports.default = TestCommand;
 TestCommand.description = 'Runs rust binary for subgraph testing.';
 TestCommand.args = {
     datasource: core_1.Args.string(),
@@ -100,6 +99,7 @@ TestCommand.flags = {
         char: 'v',
     }),
 };
+exports.default = TestCommand;
 function getLatestVersionFromCache(cachePath) {
     if (gluegun_1.filesystem.exists(cachePath) == 'file') {
         const cached = gluegun_1.filesystem.read(cachePath, 'json');

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.45.0-alpha-20230403202002-10dfa2c",
+  "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-20230403202002-10dfa2c",
+  "version": "0.45.0-alpha-20230404035238-bfb8437",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {
@@ -30,7 +30,7 @@
     "fs-extra": "9.1.0",
     "glob": "9.3.4",
     "gluegun": "https://github.com/edgeandnode/gluegun#v4.3.1-pin-colors-dep",
-    "graphql": "15.8.0",
+    "graphql": "15.5.0",
     "immutable": "4.2.1",
     "ipfs-http-client": "34.0.0",
     "jayson": "3.7.0",
@@ -57,7 +57,7 @@
     "spawn-command": "0.0.2-1",
     "strip-ansi": "6.0.1",
     "tern": "0.24.3",
-    "typescript": "^4.9.4"
+    "typescript": "^5.0.0"
   },
   "publishConfig": {
     "access": "public"