From 8bb9bec9ef75e0ea7737cdd09bc7fa5fe5568726 Mon Sep 17 00:00:00 2001
From: Jay Ji <jiqiang90@hotmail.com>
Date: Tue, 25 Jun 2024 12:09:17 +1200
Subject: [PATCH] strict types (#320)

* strict types

* improve
---
 packages/common-ethereum/src/index.ts |  7 ++++---
 packages/types/src/modular.ts         | 10 ++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/common-ethereum/src/index.ts b/packages/common-ethereum/src/index.ts
index f44c17c8e6..44cda090c4 100644
--- a/packages/common-ethereum/src/index.ts
+++ b/packages/common-ethereum/src/index.ts
@@ -4,12 +4,13 @@
 export * from './codegen';
 export * from './project';
 
-import {INetworkCommonModule} from '@subql/types-core';
-import {SubqlDatasource, SubqlRuntimeDatasource, SubqlCustomDatasource} from '@subql/types-ethereum';
+import {EthereumNetworkModule} from '@subql/types-ethereum';
+import * as c from './codegen';
 import * as p from './project';
 
 // This provides a compiled time check to ensure that the correct exports are provided
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const _ = {
   ...p,
-} satisfies INetworkCommonModule<SubqlDatasource, SubqlRuntimeDatasource, SubqlCustomDatasource>;
+  ...c,
+} satisfies EthereumNetworkModule;
diff --git a/packages/types/src/modular.ts b/packages/types/src/modular.ts
index 460637e380..3c1495ac8b 100644
--- a/packages/types/src/modular.ts
+++ b/packages/types/src/modular.ts
@@ -3,14 +3,16 @@
 
 import {INetworkCommonModule} from '@subql/types-core';
 import {Data} from 'ejs';
-import {SubqlRuntimeDatasource} from './project';
+import {SubqlCustomDatasource, SubqlDatasource, SubqlRuntimeDatasource} from './project';
 
-export interface EthereumNetworkModule extends INetworkCommonModule {
-  generateAbis?(
+export interface EthereumNetworkModule
+  extends INetworkCommonModule<SubqlDatasource, SubqlRuntimeDatasource, SubqlCustomDatasource> {
+  generateAbis(
     datasources: SubqlRuntimeDatasource[],
     projectPath: string,
     prepareDirPath: (path: string, recreate: boolean) => Promise<void>,
+    upperFirst: (input?: string) => string,
     renderTemplate: (templatePath: string, outputPath: string, templateData: Data) => Promise<void>
   ): Promise<void>;
-  parseContractPath?(path: string): {name: string; rawName: string; path: string[]};
+  parseContractPath(path: string): {name: string; rawName: string; path: string[]};
 }