@graphprotocol/graph-cli 0.20.0 → 0.20.3

package/src/migrations/mapping_api_version_0_0_3.js

@@ -2,6 +2,7 @@ const fs = require('fs-extra')
 const semver = require('semver')
 const toolbox = require('gluegun/toolbox')
 const yaml = require('js-yaml')
+const { loadManifest } = require('./util/load-manifest')
 const { getGraphTsVersion } = require('./util/versions')
 
 // If any of the manifest apiVersions are 0.0.3, replace them with 0.0.4
@@ -18,7 +19,7 @@ module.exports = {
       return 'graph-ts dependency not installed yet'
     }
 
-    let manifest = yaml.safeLoad(fs.readFileSync(manifestFile, 'utf-8'))
+    let manifest = loadManifest(manifestFile)
     return (
       // Only migrate if the graph-ts version is > 0.17.0...
       semver.gt(graphTsVersion, '0.17.0') &&
@@ -26,7 +27,7 @@ module.exports = {
       manifest &&
       typeof manifest === 'object' &&
       Array.isArray(manifest.dataSources) &&
-      manifest.dataSources.reduce(
+      (manifest.dataSources.reduce(
         (hasOldMappings, dataSource) =>
           hasOldMappings ||
           (typeof dataSource === 'object' &&
@@ -34,7 +35,17 @@ module.exports = {
             typeof dataSource.mapping === 'object' &&
             dataSource.mapping.apiVersion === '0.0.3'),
         false,
-      )
+      ) ||
+        (Array.isArray(manifest.templates) &&
+          manifest.templates.reduce(
+            (hasOldMappings, template) =>
+              hasOldMappings ||
+              (typeof template === 'object' &&
+                template.mapping &&
+                typeof template.mapping === 'object' &&
+                template.mapping.apiVersion === '0.0.3'),
+            false,
+          )))
     )
   },
   apply: async ({ manifestFile }) => {

package/src/migrations/spec_version_0_0_2.js

@@ -1,13 +1,14 @@
 const fs = require('fs-extra')
 const toolbox = require('gluegun/toolbox')
 const yaml = require('js-yaml')
+const { loadManifest } = require('./util/load-manifest')
 
 // Spec version to 0.0.2 uses top level templates. graph-cli no longer supports
 // 0.0.1 which used nested templates.
 module.exports = {
   name: 'Bump mapping specVersion from 0.0.1 to 0.0.2',
   predicate: async ({ sourceDir, manifestFile }) => {
-    let manifest = yaml.safeLoad(fs.readFileSync(manifestFile, 'utf-8'))
+    let manifest = loadManifest(manifestFile)
     return (
       manifest &&
       typeof manifest === 'object' &&

package/src/migrations/util/load-manifest.js

@@ -0,0 +1,16 @@
+const fs = require('fs-extra')
+const path = require('path')
+const yaml = require('js-yaml')
+
+function loadManifest(manifestFile) {
+  if(manifestFile.match(/.js$/)) {
+    return require(path.resolve(manifestFile))
+  }
+  else {
+    return yaml.safeLoad(fs.readFileSync(manifestFile, 'utf-8'))
+  }
+}
+
+module.exports = {
+  loadManifest
+}

package/src/subgraph.js

@@ -421,7 +421,14 @@ More than one template named '${name}', template names must be unique.`,
 
   static load(filename, { skipValidation } = { skipValidation: false }) {
     // Load and validate the manifest
-    let data = yaml.parse(fs.readFileSync(filename, 'utf-8'))
+    let data = null
+
+    if(filename.match(/.js$/)) {
+      data = require(path.resolve(filename))
+    }
+    else {
+      data = yaml.parse(fs.readFileSync(filename, 'utf-8'))
+    }
 
     // Helper to resolve files relative to the subgraph manifest
     let resolveFile = maybeRelativeFile =>

package/tests/cli/util.js

@@ -29,15 +29,15 @@ const cliTest = (title, args, testPath, options) => {
         expectedStderr = fs.readFileSync(resolvePath(`./${testPath}.stderr`), 'utf-8')
       } catch (e) {}
 
-      if (expectedStdout !== undefined) {
-        expect(stripAnsi(stdout)).toBe(expectedStdout)
-      }
       if (expectedStderr !== undefined) {
         expect(stripAnsi(stderr)).toBe(expectedStderr)
       }
       if (expectedExitCode !== undefined) {
         expect(exitCode).toBe(expectedExitCode)
       }
+      if (expectedStdout !== undefined) {
+        expect(stripAnsi(stdout)).toBe(expectedStdout)
+      }
     },
     (options !== undefined && options.timeout) || undefined,
   )