@graphprotocol/graph-cli 0.37.3-alpha-20230110163550-d64bef6 → 0.37.3-alpha-20230111112917-acbc0ae

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @graphprotocol/graph-cli
 
-## 0.37.3-alpha-20230110163550-d64bef6
+## 0.37.3-alpha-20230111112917-acbc0ae
 
 ### Patch Changes
 

package/dist/subgraph.js

@@ -83,7 +83,10 @@ class Subgraph {
             let msg = errors.reduce((msg, errors, entity) => {
                 errors = errors.groupBy((error) => error.get('directive'));
                 let inner_msgs = errors.reduce((msg, errors, directive) => {
-                    return `${msg}${directive ? `${directive}:` : ''}
+                    return `${msg}${directive
+                        ? `
+    ${directive}:`
+                        : ''}
   ${errors
                         .map(error => error
                         .get('message')

package/dist/type-generator.js

@@ -31,8 +31,7 @@ const immutable_1 = __importDefault(require("immutable"));
 const path_1 = __importDefault(require("path"));
 const prettier_1 = __importDefault(require("prettier"));
 const graphql = __importStar(require("graphql/language"));
-const chalk_1 = __importDefault(require("chalk"));
-const toolbox = __importStar(require("gluegun/toolbox"));
+const toolbox = __importStar(require("gluegun"));
 const schema_1 = __importDefault(require("./schema"));
 const subgraph_1 = __importDefault(require("./subgraph"));
 const template_1 = __importDefault(require("./codegen/template"));
@@ -41,15 +40,20 @@ const spinner_1 = require("./command-helpers/spinner");
 const migrations_1 = require("./migrations");
 const typescript_1 = require("./codegen/typescript");
 const fs_1 = require("./command-helpers/fs");
+// @ts-expect-error TODO: type out if necessary
 const Index_bs_js_1 = __importDefault(require("@float-capital/float-subgraph-uncrashable/src/Index.bs.js"));
 class TypeGenerator {
+    sourceDir;
+    options;
+    protocol;
+    protocolTypeGenerator;
     constructor(options) {
-        this.options = options || {};
+        this.options = options;
         this.sourceDir =
             this.options.sourceDir ||
                 (this.options.subgraphManifest && path_1.default.dirname(this.options.subgraphManifest));
         this.protocol = this.options.protocol;
-        this.protocolTypeGenerator = this.protocol.getTypeGenerator({
+        this.protocolTypeGenerator = this.protocol?.getTypeGenerator?.({
             sourceDir: this.sourceDir,
             outputDir: this.options.outputDir,
         });
@@ -104,11 +108,11 @@ class TypeGenerator {
         if (quiet) {
             return this.options.subgraph
                 ? this.options.subgraph
-                : subgraph_1.default.load(this.options.subgraphManifest, subgraphLoadOptions).result;
+                : (await subgraph_1.default.load(this.options.subgraphManifest, subgraphLoadOptions)).result;
         }
         else {
             const manifestPath = (0, fs_1.displayPath)(this.options.subgraphManifest);
-            return await (0, spinner_1.withSpinner)(`Load subgraph from ${manifestPath}`, `Failed to load subgraph from ${manifestPath}`, `Warnings while loading subgraph from ${manifestPath}`, async (spinner) => {
+            return await (0, spinner_1.withSpinner)(`Load subgraph from ${manifestPath}`, `Failed to load subgraph from ${manifestPath}`, `Warnings while loading subgraph from ${manifestPath}`, async (_spinner) => {
                 return this.options.subgraph
                     ? this.options.subgraph
                     : subgraph_1.default.load(this.options.subgraphManifest, subgraphLoadOptions);
@@ -118,8 +122,7 @@ class TypeGenerator {
     async loadSchema(subgraph) {
         let maybeRelativePath = subgraph.getIn(['schema', 'file']);
         let absolutePath = path_1.default.resolve(this.sourceDir, maybeRelativePath);
-        return await (0, spinner_1.withSpinner)(`Load GraphQL schema from ${(0, fs_1.displayPath)(absolutePath)}`, `Failed to load GraphQL schema from ${(0, fs_1.displayPath)(absolutePath)}`, `Warnings while loading GraphQL schema from ${(0, fs_1.displayPath)(absolutePath)}`, async (spinner) => {
-            let maybeRelativePath = subgraph.getIn(['schema', 'file']);
+        return await (0, spinner_1.withSpinner)(`Load GraphQL schema from ${(0, fs_1.displayPath)(absolutePath)}`, `Failed to load GraphQL schema from ${(0, fs_1.displayPath)(absolutePath)}`, `Warnings while loading GraphQL schema from ${(0, fs_1.displayPath)(absolutePath)}`, async (_spinner) => {
             let absolutePath = path_1.default.resolve(this.sourceDir, maybeRelativePath);
             return schema_1.default.load(absolutePath);
         });
@@ -176,8 +179,8 @@ class TypeGenerator {
             // Add the GraphQL schema to the watched files
             files.push(subgraph.getIn(['schema', 'file']));
             // Add all file paths specified in manifest
-            subgraph.get('dataSources').map(dataSource => {
-                dataSource.getIn(['mapping', 'abis']).map(abi => {
+            subgraph.get('dataSources').map((dataSource) => {
+                dataSource.getIn(['mapping', 'abis']).map((abi) => {
                     files.push(abi.get('file'));
                 });
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/graph-cli",
-  "version": "0.37.3-alpha-20230110163550-d64bef6",
+  "version": "0.37.3-alpha-20230111112917-acbc0ae",
   "license": "(Apache-2.0 OR MIT)",
   "description": "CLI for building for and deploying to The Graph",
   "main": "dist/cli.js",

package/src/protocols/index.ts

@@ -205,9 +205,9 @@ export default class Protocol {
   }
 }
 
-type ProtocolName = 'arweave' | 'ethereum' | 'near' | 'cosmos' | 'substreams'
+export type ProtocolName = 'arweave' | 'ethereum' | 'near' | 'cosmos' | 'substreams'
 
-interface ProtocolConfig {
+export interface ProtocolConfig {
   displayName: string
   abi?: any
   contract?: any

package/src/subgraph.ts

@@ -88,7 +88,12 @@ export default class Subgraph {
         errors = errors.groupBy((error: any) => error.get('directive'))
         let inner_msgs = errors.reduce(
           (msg: string, errors: any[], directive: string) => {
-            return `${msg}${directive ? `${directive}:` : ''}
+            return `${msg}${
+              directive
+                ? `
+    ${directive}:`
+                : ''
+            }
   ${errors
     .map(error =>
       error

package/src/{type-generator.js → type-generator.ts}

@@ -3,33 +3,51 @@ import immutable from 'immutable'
 import path from 'path'
 import prettier from 'prettier'
 import * as graphql from 'graphql/language'
-import chalk from 'chalk'
-import * as toolbox from 'gluegun/toolbox'
+import * as toolbox from 'gluegun'
 
 import Schema from './schema'
 import Subgraph from './subgraph'
 import DataSourceTemplateCodeGenerator from './codegen/template'
 import Watcher from './watcher'
-import { step, withSpinner } from './command-helpers/spinner'
+import { Spinner, step, withSpinner } from './command-helpers/spinner'
 import { applyMigrations } from './migrations'
 import { GENERATED_FILE_NOTE } from './codegen/typescript'
 import { displayPath } from './command-helpers/fs'
+import Protocol from './protocols'
+
+// @ts-expect-error TODO: type out if necessary
 import uncrashable from '@float-capital/float-subgraph-uncrashable/src/Index.bs.js'
 
+interface TypeGeneratorOptions {
+  sourceDir?: string
+  subgraphManifest: string
+  subgraph?: string
+  protocol: Protocol
+  outputDir: string
+  skipMigrations?: boolean
+  uncrashable: any
+  uncrashableConfig: boolean
+}
+
 export default class TypeGenerator {
-  constructor(options) {
-    this.options = options || {}
+  private sourceDir: string
+  private options: TypeGeneratorOptions
+  private protocol: Protocol
+  private protocolTypeGenerator: any
+
+  constructor(options: TypeGeneratorOptions) {
+    this.options = options
     this.sourceDir =
       this.options.sourceDir ||
       (this.options.subgraphManifest && path.dirname(this.options.subgraphManifest))
 
     this.protocol = this.options.protocol
-    this.protocolTypeGenerator = this.protocol.getTypeGenerator({
+    this.protocolTypeGenerator = this.protocol?.getTypeGenerator?.({
       sourceDir: this.sourceDir,
       outputDir: this.options.outputDir,
     })
 
-    process.on('uncaughtException', function (e) {
+    process.on('uncaughtException', function(e) {
       toolbox.print.error(`UNCAUGHT EXCEPTION: ${e}`)
     })
   }
@@ -77,7 +95,7 @@ export default class TypeGenerator {
     }
   }
 
-  async generateUncrashableEntities(graphSchema) {
+  async generateUncrashableEntities(graphSchema: any) {
     let ast = graphql.parse(graphSchema.document)
     let entityDefinitions = ast['definitions']
     return await withSpinner(
@@ -102,7 +120,7 @@ export default class TypeGenerator {
     if (quiet) {
       return this.options.subgraph
         ? this.options.subgraph
-        : Subgraph.load(this.options.subgraphManifest, subgraphLoadOptions).result
+        : (await Subgraph.load(this.options.subgraphManifest, subgraphLoadOptions)).result
     } else {
       const manifestPath = displayPath(this.options.subgraphManifest)
 
@@ -110,7 +128,7 @@ export default class TypeGenerator {
         `Load subgraph from ${manifestPath}`,
         `Failed to load subgraph from ${manifestPath}`,
         `Warnings while loading subgraph from ${manifestPath}`,
-        async spinner => {
+        async _spinner => {
           return this.options.subgraph
             ? this.options.subgraph
             : Subgraph.load(this.options.subgraphManifest, subgraphLoadOptions)
@@ -119,22 +137,21 @@ export default class TypeGenerator {
     }
   }
 
-  async loadSchema(subgraph) {
-    let maybeRelativePath = subgraph.getIn(['schema', 'file'])
+  async loadSchema(subgraph: immutable.Map<any, any>) {
+    let maybeRelativePath = subgraph.getIn(['schema', 'file']) as string
     let absolutePath = path.resolve(this.sourceDir, maybeRelativePath)
     return await withSpinner(
       `Load GraphQL schema from ${displayPath(absolutePath)}`,
       `Failed to load GraphQL schema from ${displayPath(absolutePath)}`,
       `Warnings while loading GraphQL schema from ${displayPath(absolutePath)}`,
-      async spinner => {
-        let maybeRelativePath = subgraph.getIn(['schema', 'file'])
+      async _spinner => {
         let absolutePath = path.resolve(this.sourceDir, maybeRelativePath)
         return Schema.load(absolutePath)
       },
     )
   }
 
-  async generateTypesForSchema(schema) {
+  async generateTypesForSchema(schema: any) {
     return await withSpinner(
       `Generate types for GraphQL schema`,
       `Failed to generate types for GraphQL schema`,
@@ -161,7 +178,7 @@ export default class TypeGenerator {
     )
   }
 
-  async generateTypesForDataSourceTemplates(subgraph) {
+  async generateTypesForDataSourceTemplates(subgraph: immutable.Map<any, any>) {
     return await withSpinner(
       `Generate types for data source templates`,
       `Failed to generate types for data source templates`,
@@ -170,7 +187,7 @@ export default class TypeGenerator {
         // Combine the generated code for all templates
         let codeSegments = subgraph
           .get('templates', immutable.List())
-          .reduce((codeSegments, template) => {
+          .reduce((codeSegments: any, template: any) => {
             step(
               spinner,
               'Generate types for data source template',
@@ -217,8 +234,8 @@ export default class TypeGenerator {
       files.push(subgraph.getIn(['schema', 'file']))
 
       // Add all file paths specified in manifest
-      subgraph.get('dataSources').map(dataSource => {
-        dataSource.getIn(['mapping', 'abis']).map(abi => {
+      subgraph.get('dataSources').map((dataSource: any) => {
+        dataSource.getIn(['mapping', 'abis']).map((abi: any) => {
           files.push(abi.get('file'))
         })
       })
@@ -232,7 +249,7 @@ export default class TypeGenerator {
 
   async watchAndGenerateTypes() {
     let generator = this
-    let spinner
+    let spinner: Spinner
 
     // Create watcher and generate types once and then on every change to a watched file
     let watcher = new Watcher({