Updated PR with comments

Author: maoueh

schemas/ethereum.graphql renamed to src/protocols/ethereum/manifest.graphql

@@ -1,3 +1,9 @@
+# Each referenced type's in any of the types below must be listed
+# here either as `scalar` or `type` for the validation code to work
+# properly.
+#
+# That's why `String` is listed as a scalar even though it's built-in
+# GraphQL basic types.
 scalar String
 scalar File
 scalar BigInt

src/protocols/index.js

@@ -1,7 +1,6 @@
 const immutable = require('immutable')
 const EthereumTypeGenerator = require('./ethereum/type-generator')
 const EthereumTemplateCodeGen = require('./ethereum/codegen/template')
-const NearTemplateCodeGen = require('./near/codegen/template')
 const EthereumABI = require('./ethereum/abi')
 const EthereumSubgraph = require('./ethereum/subgraph')
 const NearSubgraph = require('./near/subgraph')

schemas/near.graphql renamed to src/protocols/near/manifest.graphql

@@ -1,3 +1,9 @@
+# Each referenced type's in any of the types below must be listed
+# here either as `scalar` or `type` for the validation code to work
+# properly.
+#
+# That's why `String` is listed as a scalar even though it's built-in
+# GraphQL basic types.
 scalar String
 scalar File
 scalar BigInt

src/subgraph.js

@@ -51,7 +51,7 @@ module.exports = class Subgraph {
     // Parse the default subgraph schema
     let schema = graphql.parse(
       await fs.readFile(
-        path.join(__dirname, '..', 'schemas', `${protocol.name}.graphql`),
+        path.join(__dirname, 'protocols', protocol.name, `manifest.graphql`),
         'utf-8',
       ),
     )

tests/cli/validation.test.js

@@ -9,6 +9,14 @@ describe('Validation', () => {
       exitCode: 1,
     },
   )
+  cliTest(
+    'Invalid subgraph manifest (cannot infer protocol)',
+    ['codegen', '--skip-migrations'],
+    'validation/invalid-manifest-cannot-infer-protocol',
+    {
+      exitCode: 1,
+    },
+  )
   cliTest(
     'ABI not found in data source',
     ['codegen', '--skip-migrations'],

tests/cli/validation/invalid-manifest-cannot-infer-protocol.stderr

@@ -0,0 +1,5 @@
+- Load subgraph from subgraph.yaml
+✖ Failed to load subgraph from subgraph.yaml: Error in subgraph.yaml:
+
+  Path: /
+  Unable to determine for which protocol manifest file is built for. Ensure you have at least one 'dataSources' and/or 'templates' elements defined in your subgraph.

tests/cli/validation/invalid-manifest-cannot-infer-protocol/subgraph.yaml

@@ -0,0 +1,12 @@
+schema:
+  file: ./non-existent.grapqhl
+dataSources:
+  - name: 5
+    abis:
+      name: Foo
+    mapping:
+      - 12
+      - 13
+      - 14
+templates:
+  field: foo

tests/cli/validation/invalid-manifest.stderr

@@ -1,5 +1,28 @@
 - Load subgraph from subgraph.yaml
 ✖ Failed to load subgraph from subgraph.yaml: Error in subgraph.yaml:
 
-  Path: /
-  Unable to determine for which protocol manifest file is built for. Ensure you have at least one 'dataSources' and/or 'templates' elements defined in your subgraph.
+  Path: specVersion
+  No value provided
+
+  Path: schema > file
+  File does not exist: non-existent.grapqhl
+
+  Path: dataSources > 0 > name
+  Expected string, found number:
+  5
+
+  Path: dataSources > 0 > source
+  No value provided
+
+  Path: dataSources > 0 > mapping
+  Expected map, found list:
+  - 12
+  - 13
+  - 14
+
+  Path: dataSources > 0
+  Unexpected key in map: abis
+
+  Path: templates
+  Expected list, found map:
+  field: foo

tests/cli/validation/invalid-manifest/subgraph.yaml

@@ -1,7 +1,8 @@
 schema:
   file: ./non-existent.grapqhl
 dataSources:
-  - name: 5
+  - kind: ethereum/contract
+    name: 5
     abis:
       name: Foo
     mapping: