@graphprotocol/graph-cli 0.43.1-alpha-20230321032415-91f97ff → 0.43.1-alpha-20230321033455-a6a309d

package/CHANGELOG.md

@@ -1,23 +1,17 @@
 # @graphprotocol/graph-cli
 
-## 0.43.1-alpha-20230321032415-91f97ff
+## 0.43.1-alpha-20230321033455-a6a309d
 
 ### Patch Changes
 
-- [#1201](https://github.com/graphprotocol/graph-tooling/pull/1201)
-  [`91f97ff`](https://github.com/graphprotocol/graph-tooling/commit/91f97ff8893d20d288e84312062f33060d5f0b4e)
-  Thanks [@saihaj](https://github.com/saihaj)! - read testsFolder from matchstick yaml and set the
-  paths based on that
-
-- [#1201](https://github.com/graphprotocol/graph-tooling/pull/1201)
-  [`95edea6`](https://github.com/graphprotocol/graph-tooling/commit/95edea632dee687d18bcffa19d4108fe5da99a94)
-  Thanks [@saihaj](https://github.com/saihaj)! - make datasource and version optional args for test
-  command
-
 - [`876bc52`](https://github.com/graphprotocol/graph-tooling/commit/876bc523e5a53db162d9b5aa79e9de76a9e92ccf)
   Thanks [@saihaj](https://github.com/saihaj)! - Allow file data sources (with no network) to deploy
   to the studio. File data sources don't have a network specified.
 
+- [#1197](https://github.com/graphprotocol/graph-tooling/pull/1197)
+  [`de852df`](https://github.com/graphprotocol/graph-tooling/commit/de852df94df7bab814aa15b3e506b9b636d2c9b2)
+  Thanks [@saihaj](https://github.com/saihaj)! - make generated list children non-nullable
+
 ## 0.43.0
 
 ### Minor Changes

package/dist/commands/test.js

@@ -15,16 +15,28 @@ const semver_1 = __importDefault(require("semver"));
 class TestCommand extends core_1.Command {
     async run() {
         const { args: { datasource }, flags: { coverage, docker, force, logs, recompile, version }, } = await this.parse(TestCommand);
-        let testsDir = './tests';
+        const testsDir = './tests';
+        const cachePath = path_1.default.resolve(testsDir, '.latest.json');
+        const opts = {
+            testsDir,
+            cachePath,
+            coverage,
+            docker,
+            force,
+            logs,
+            recompile,
+            version,
+            latestVersion: getLatestVersionFromCache(cachePath),
+        };
         // Check if matchstick.yaml config exists
         if (gluegun_1.filesystem.exists('matchstick.yaml')) {
             try {
                 // Load the config
                 const config = await js_yaml_1.default.load(gluegun_1.filesystem.read('matchstick.yaml', 'utf8'));
-                // Check if matchstick.yaml and testsFolder not null
-                if (config?.testsFolder) {
+                // Check if matchstick.yaml and testsDir not null
+                if (config?.testsDir) {
                     // assign test folder from matchstick.yaml if present
-                    testsDir = config.testsFolder;
+                    opts.testsDir = config.testsDir;
                 }
             }
             catch (error) {
@@ -33,18 +45,6 @@ class TestCommand extends core_1.Command {
                 });
             }
         }
-        const cachePath = path_1.default.resolve(testsDir, '.latest.json');
-        const opts = {
-            testsDir,
-            cachePath,
-            coverage,
-            docker,
-            force,
-            logs,
-            recompile,
-            version,
-            latestVersion: getLatestVersionFromCache(cachePath),
-        };
         // Fetch the latest version tag if version is not specified with -v/--version or if the version is not cached
         if (opts.force || (!opts.version && !opts.latestVersion)) {
             this.log('Fetching latest version tag...');
@@ -69,7 +69,9 @@ class TestCommand extends core_1.Command {
 exports.default = TestCommand;
 TestCommand.description = 'Runs rust binary for subgraph testing.';
 TestCommand.args = {
-    datasource: core_1.Args.string(),
+    datasource: core_1.Args.string({
+        required: true,
+    }),
 };
 TestCommand.flags = {
     help: core_1.Flags.help({
@@ -98,6 +100,7 @@ TestCommand.flags = {
     version: core_1.Flags.string({
         summary: 'Choose the version of the rust binary that you want to be downloaded/used.',
         char: 'v',
+        required: true,
     }),
 };
 function getLatestVersionFromCache(cachePath) {
@@ -200,7 +203,7 @@ async function runDocker(datasource, opts) {
     // Get current working directory
     const current_folder = gluegun_1.filesystem.cwd();
     // Declate dockerfilePath with default location
-    const dockerfilePath = path_1.default.join(opts.testsDir, '.docker/Dockerfile');
+    const dockerfilePath = path_1.default.join(opts.testsDir || 'tests', '.docker/Dockerfile');
     // Check if the Dockerfil already exists
     const dockerfileExists = gluegun_1.filesystem.exists(dockerfilePath);
     // Generate the Dockerfile only if it doesn't exists,

package/dist/scaffold/ethereum.test.js

@@ -107,7 +107,7 @@ type ExampleEntity @entity {
   id: Bytes!
   count: BigInt!
   a: BigInt! # uint256
-  b: [Bytes]! # bytes[4]
+  b: [Bytes!]! # bytes[4]
 }
 `);
     });
@@ -116,7 +116,7 @@ type ExampleEntity @entity {
 type ExampleEvent @entity(immutable: true) {
   id: Bytes!
   a: BigInt! # uint256
-  b: [Bytes]! # bytes[4]
+  b: [Bytes!]! # bytes[4]
   param2: String! # string
   c_c1: BigInt! # uint256
   c_value1: Bytes! # bytes32

package/dist/scaffold/schema.js

@@ -39,7 +39,13 @@ function abiEvents(abi) {
 exports.abiEvents = abiEvents;
 const protocolTypeToGraphQL = (protocol, name) => {
     const ascType = (0, types_1.ascTypeForProtocol)(protocol, name);
-    return (0, types_1.valueTypeForAsc)(ascType);
+    // TODO: we need to figure out how to improve types
+    // but for now this always is returning a string
+    const convertedType = (0, types_1.valueTypeForAsc)(ascType);
+    // TODO: this is a hack to make array type non-nullable
+    // We should refactor the way we convert the Values from ASC to GraphQL
+    // For arrays we always want non-nullable children
+    return convertedType.endsWith(']') ? convertedType.replace(']', '!]') : convertedType;
 };
 exports.protocolTypeToGraphQL = protocolTypeToGraphQL;
 const generateField = ({ name, type, protocolName, }) => `${name}: ${(0, exports.protocolTypeToGraphQL)(protocolName, type)}! # ${type}`;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.43.1-alpha-20230321032415-91f97ff",
+  "version": "0.43.1-alpha-20230321033455-a6a309d",
   "commands": {
     "add": {
       "id": "add",
@@ -782,12 +782,14 @@
           "type": "option",
           "char": "v",
           "summary": "Choose the version of the rust binary that you want to be downloaded/used.",
+          "required": true,
           "multiple": false
         }
       },
       "args": {
         "datasource": {
-          "name": "datasource"
+          "name": "datasource",
+          "required": true
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.43.1-alpha-20230321032415-91f97ff",
+  "version": "0.43.1-alpha-20230321033455-a6a309d",
   "description": "CLI for building for and deploying to The Graph",
   "license": "(Apache-2.0 OR MIT)",
   "engines": {