Support basic array return types of contract methods in codegen

packages/codegen/README.md

@@ -52,6 +52,10 @@ Steps:
   # Watcher server port (default: 3008).
   port: 3008
 
+  # Solc version to use (optional)
+  # If not defined, uses solc version listed in dependencies
+  solc: v0.8.0+commit.c7dfd78e
+
   # Flatten the input contract file(s) [true | false] (default: true).
   flatten: true
 
@@ -72,6 +76,8 @@ Steps:
 
   * `config-file`(alias: `c`): Watcher generation config file path (yaml) (required).
 
+  * `continue-on-error` (alias: `e`): To continue generation if any unhandled data type is encountered (optional).
+
   Example:
 
   * Generate code using a config file `config.yaml`:
@@ -80,6 +86,12 @@ Steps:
     yarn codegen --config-file ./config.yaml
     ```
 
+  * Generate code ignoring any unhandled data types:
+
+    ```bash
+    yarn codegen --config-file ./config.yaml --continue-on-error
+    ```
+
   This will create a folder containing the generated code at the path provided in config. Follow the steps in [Run Generated Watcher](#run-generated-watcher) to setup and run the generated watcher.
 
 ## Development

packages/codegen/src/assets/.gitignore

@@ -0,0 +1,6 @@
+node_modules/
+dist/
+out/
+
+.vscode
+.idea

packages/codegen/src/client.ts

@@ -10,8 +10,9 @@ import { Writable } from 'stream';
 import _ from 'lodash';
 import { gqlGenerate } from 'gql-generator';
 
-import { getTsForSol } from './utils/type-mappings';
+import { getGqlForSol, getTsForGql } from './utils/type-mappings';
 import { Param } from './utils/types';
+import { getBaseType } from './utils/helpers';
 
 const TEMPLATE_FILE = './templates/client-template.handlebars';
 
@@ -30,12 +31,15 @@ export class Client {
    * @param params Parameters to the query.
    * @param returnType Return type for the query.
    */
-  addQuery (name: string, params: Array<Param>, returnType: string): void {
+  addQuery (name: string, params: Array<Param>, typeName: any): void {
     // Check if the query is already added.
     if (this._queries.some(query => query.name === name)) {
       return;
     }
 
+    const returnType = getBaseType(typeName);
+    assert(returnType);
+
     const queryObject = {
       name,
       getQueryName: '',
@@ -48,13 +52,17 @@ export class Client {
       : `get${name.charAt(0).toUpperCase()}${name.slice(1)}`;
 
     queryObject.params = queryObject.params.map((param) => {
-      const tsParamType = getTsForSol(param.type);
+      const gqlParamType = getGqlForSol(param.type);
+      assert(gqlParamType);
+      const tsParamType = getTsForGql(gqlParamType);
       assert(tsParamType);
       param.type = tsParamType;
       return param;
     });
 
-    const tsReturnType = getTsForSol(returnType);
+    const gqlReturnType = getGqlForSol(returnType);
+    assert(gqlReturnType);
+    const tsReturnType = getTsForGql(gqlReturnType);
     assert(tsReturnType);
     queryObject.returnType = tsReturnType;
 

packages/codegen/src/database.ts

@@ -9,8 +9,9 @@ import Handlebars from 'handlebars';
 import { Writable } from 'stream';
 import _ from 'lodash';
 
-import { getTsForSol } from './utils/type-mappings';
+import { getGqlForSol, getTsForGql } from './utils/type-mappings';
 import { Param } from './utils/types';
+import { getBaseType } from './utils/helpers';
 
 const TEMPLATE_FILE = './templates/database-template.handlebars';
 
@@ -31,12 +32,15 @@ export class Database {
    * @param params Parameters to the query.
    * @param returnType Return type for the query.
    */
-  addQuery (name: string, params: Array<Param>, returnType: string): void {
+  addQuery (name: string, params: Array<Param>, typeName: any): void {
     // Check if the query is already added.
     if (this._queries.some(query => query.name === name)) {
       return;
     }
 
+    const returnType = getBaseType(typeName);
+    assert(returnType);
+
     const queryObject = {
       name,
       entityName: '',
@@ -61,16 +65,20 @@ export class Database {
     }
 
     queryObject.params = queryObject.params.map((param) => {
-      const tsParamType = getTsForSol(param.type);
+      const gqlParamType = getGqlForSol(param.type);
+      assert(gqlParamType);
+      const tsParamType = getTsForGql(gqlParamType);
       assert(tsParamType);
       param.type = tsParamType;
       return param;
     });
 
-    const tsReturnType = getTsForSol(returnType);
+    const gqlReturnType = getGqlForSol(returnType);
+    assert(gqlReturnType);
+    const tsReturnType = getTsForGql(gqlReturnType);
     assert(tsReturnType);
-    queryObject.returnType = tsReturnType;
 
+    queryObject.returnType = tsReturnType;
     this._queries.push(queryObject);
   }
 

packages/codegen/src/entity.ts

@@ -9,9 +9,10 @@ import yaml from 'js-yaml';
 import Handlebars from 'handlebars';
 import { Writable } from 'stream';
 
-import { getTsForSol, getPgForTs, getTsForGql } from './utils/type-mappings';
+import { getPgForTs, getTsForGql, getGqlForSol } from './utils/type-mappings';
 import { Param } from './utils/types';
 import { getFieldType } from './utils/subgraph';
+import { getBaseType } from './utils/helpers';
 
 const TEMPLATE_FILE = './templates/entity-template.handlebars';
 const TABLES_DIR = './data/entities';
@@ -31,7 +32,7 @@ export class Entity {
    * @param params Parameters to the query.
    * @param returnType Return type for the query.
    */
-  addQuery (name: string, params: Array<Param>, returnType: string): void {
+  addQuery (name: string, params: Array<Param>, typeName: any): void {
     // Check if the query is already added.
     if (this._entities.some(entity => entity.className.toLowerCase() === name.toLowerCase())) {
       return;
@@ -109,9 +110,10 @@ export class Entity {
       params.map((param) => {
         const name = param.name;
 
-        const tsType = getTsForSol(param.type);
+        const gqlType = getGqlForSol(param.type);
+        assert(gqlType);
+        const tsType = getTsForGql(gqlType);
         assert(tsType);
-
         const pgType = getPgForTs(tsType);
         assert(pgType);
 
@@ -136,9 +138,13 @@ export class Entity {
       })
     );
 
-    const tsReturnType = getTsForSol(returnType);
-    assert(tsReturnType);
+    const baseType = getBaseType(typeName);
+    assert(baseType);
 
+    const gqlReturnType = getGqlForSol(baseType);
+    assert(gqlReturnType);
+    const tsReturnType = getTsForGql(gqlReturnType);
+    assert(tsReturnType);
     const pgReturnType = getPgForTs(tsReturnType);
     assert(pgReturnType);
 

packages/codegen/src/generate-code.ts

@@ -38,6 +38,9 @@ import { getSubgraphConfig } from './utils/subgraph';
 import { exportIndexBlock } from './index-block';
 import { exportSubscriber } from './subscriber';
 import { exportReset } from './reset';
+import { writeFileToStream } from './utils/helpers';
+
+const ASSET_DIR = path.resolve(__dirname, 'assets');
 
 const main = async (): Promise<void> => {
   const argv = await yargs(hideBin(process.argv))
@@ -234,6 +237,16 @@ function generateWatcher (visitor: Visitor, contracts: any[], config: any) {
     : process.stdout;
   exportReadme(path.basename(outputDir), config.port, outStream);
 
+  outStream = outputDir
+    ? fs.createWriteStream(path.join(outputDir, 'LICENSE'))
+    : process.stdout;
+  writeFileToStream(path.join(ASSET_DIR, 'LICENSE'), outStream);
+
+  outStream = outputDir
+    ? fs.createWriteStream(path.join(outputDir, '.gitignore'))
+    : process.stdout;
+  writeFileToStream(path.join(ASSET_DIR, '.gitignore'), outStream);
+
   outStream = outputDir
     ? fs.createWriteStream(path.join(outputDir, 'src/job-runner.ts'))
     : process.stdout;

packages/codegen/src/indexer.ts

@@ -9,10 +9,11 @@ import Handlebars from 'handlebars';
 import { Writable } from 'stream';
 import _ from 'lodash';
 
-import { getTsForSol } from './utils/type-mappings';
+import { getGqlForSol, getTsForGql } from './utils/type-mappings';
 import { Param } from './utils/types';
 import { MODE_ETH_CALL, MODE_STORAGE } from './utils/constants';
 import { getFieldType } from './utils/subgraph';
+import { getBaseType, isArrayType } from './utils/helpers';
 
 const TEMPLATE_FILE = './templates/indexer-template.handlebars';
 
@@ -37,22 +38,35 @@ export class Indexer {
    * @param returnType Return type for the query.
    * @param stateVariableType Type of the state variable in case of state variable query.
    */
-  addQuery (contract: string, mode: string, name: string, params: Array<Param>, returnType: string, stateVariableType?: string): void {
+  addQuery (contract: string, mode: string, name: string, params: Array<Param>, typeName: any, stateVariableType?: string): void {
     // Check if the query is already added.
     if (this._queries.some(query => query.name === name)) {
       return;
     }
 
+    const baseType = getBaseType(typeName);
+    assert(baseType);
+    const gqlReturnType = getGqlForSol(baseType);
+    assert(gqlReturnType);
+    let tsReturnType = getTsForGql(gqlReturnType);
+    assert(tsReturnType);
+
+    const isArray = isArrayType(typeName);
+    if (isArray) {
+      tsReturnType = tsReturnType.concat('[]');
+    }
+
     const queryObject = {
       name,
       entityName: '',
       getQueryName: '',
       saveQueryName: '',
       params: _.cloneDeep(params),
-      returnType,
+      returnType: tsReturnType,
       mode,
       stateVariableType,
-      contract
+      contract,
+      disableCaching: isArray
     };
 
     if (name.charAt(0) === '_') {
@@ -68,16 +82,14 @@ export class Indexer {
     }
 
     queryObject.params = queryObject.params.map((param) => {
-      const tsParamType = getTsForSol(param.type);
+      const gqlParamType = getGqlForSol(param.type);
+      assert(gqlParamType);
+      const tsParamType = getTsForGql(gqlParamType);
       assert(tsParamType);
       param.type = tsParamType;
       return param;
     });
 
-    const tsReturnType = getTsForSol(returnType);
-    assert(tsReturnType);
-    queryObject.returnType = tsReturnType;
-
     if (stateVariableType) {
       queryObject.stateVariableType = stateVariableType;
     }

packages/codegen/src/resolvers.ts

@@ -9,8 +9,9 @@ import Handlebars from 'handlebars';
 import assert from 'assert';
 import _ from 'lodash';
 
-import { getTsForSol } from './utils/type-mappings';
+import { getGqlForSol, getTsForGql } from './utils/type-mappings';
 import { Param } from './utils/types';
+import { getBaseType } from './utils/helpers';
 
 const TEMPLATE_FILE = './templates/resolvers-template.handlebars';
 
@@ -31,11 +32,13 @@ export class Resolvers {
    * @param params Parameters to the query.
    * @param returnType Return type for the query.
    */
-  addQuery (name: string, params: Array<Param>, returnType: string): void {
+  addQuery (name: string, params: Array<Param>, typeName: any): void {
     // Check if the query is already added.
     if (this._queries.some(query => query.name === name)) {
       return;
     }
+    const returnType = getBaseType(typeName);
+    assert(returnType);
 
     const queryObject = {
       name,
@@ -44,7 +47,9 @@ export class Resolvers {
     };
 
     queryObject.params = queryObject.params.map((param) => {
-      const tsParamType = getTsForSol(param.type);
+      const gqlParamType = getGqlForSol(param.type);
+      assert(gqlParamType);
+      const tsParamType = getTsForGql(gqlParamType);
       assert(tsParamType);
       param.type = tsParamType;
       return param;