build succeeds

Author: dOrgJelli

packages/js/client/scripts/extractPluginConfigs.ts

@@ -5,11 +5,13 @@ import path from "path";
 interface PluginConfigSource {
   name: string;
   module: string;
-  file: string;
   uri: string;
   config: string;
-  interfaces?: string[];
-  types?: string[];
+  files: {
+    name: string;
+    interfaces?: string[];
+    types?: string[];
+  }[];
   externals?: {
     type: string;
     module: string;
@@ -20,19 +22,29 @@ const plugins: PluginConfigSource[] = [
   {
     name: "Ipfs",
     module: "@web3api/ipfs-plugin-js",
-    file: "build/index.d.ts",
     uri: "w3://ens/ipfs.web3api.eth",
     config: "IpfsConfig",
-    interfaces: ["IpfsConfig"]
+    files: [{
+      name: "build/index.d.ts",
+      interfaces: ["IpfsConfig"]
+    }]
   },
   {
     name: "Ethereum",
     module: "@web3api/ethereum-plugin-js",
-    file: "build/index.d.ts",
     uri: "w3://ens/ethereum.web3api.eth",
     config: "EthereumConfig",
-    interfaces: ["ConnectionConfig", "ConnectionConfigs"],
-    types: ["EthereumConfig", "EthereumProvider", "EthereumSigner", "AccountIndex", "Address"],
+    files: [
+      {
+        name: "build/index.d.ts",
+        types: ["EthereumConfig"],
+      },
+      {
+        name: "build/Connection.d.ts",
+        interfaces: ["ConnectionConfig", "ConnectionConfigs"],
+        types: ["EthereumProvider", "EthereumSigner", "AccountIndex", "Address"],
+      },
+    ],
     externals: [
       {
         type: "Signer",
@@ -51,11 +63,13 @@ const plugins: PluginConfigSource[] = [
   {
     name: "Ens",
     module: "@web3api/ens-plugin-js",
-    file: "build/index.d.ts",
     uri: "w3://ens/ens.web3api.eth",
     config: "EnsConfig",
-    interfaces: ["EnsConfig", "Addresses"],
-    types: ["Address"]
+    files: [{
+      name: "build/index.d.ts",
+      interfaces: ["EnsConfig", "Addresses"],
+      types: ["Address"]
+    }]
   }
 ];
 
@@ -71,20 +85,25 @@ function main(): void {
   for (const plugin of plugins) {
     let output = header;
 
-    output += `\n\n/// Types generated from ${plugin.file}`
+    output += `\n\n/// Types generated from ${plugin.module} build files:\n/// ${
+      plugin.files.map(({ name }) => name).join(', ')
+    }`
 
     const project = new TsProject();
-    const filePath = require.resolve(path.join(plugin.module, plugin.file));
-    const sourceFile = project.addSourceFileAtPath(filePath);
 
-    for (const pluginInterface of plugin.interfaces || []) {
-      const int = sourceFile.getInterfaceOrThrow(pluginInterface);
-      output += `\n\n${int.print().replace(/    /g, "  ")}`;
-    }
+    for (const file of plugin.files) {
+      const filePath = require.resolve(path.join(plugin.module, file.name));
+      const sourceFile = project.addSourceFileAtPath(filePath);
+
+      for (const pluginInterface of file.interfaces || []) {
+        const int = sourceFile.getInterfaceOrThrow(pluginInterface);
+        output += `\n\n${int.print().replace(/    /g, "  ")}`;
+      }
 
-    for (const pluginType of plugin.types || []) {
-      const typ = sourceFile.getTypeAliasOrThrow(pluginType);
-      output += `\n\n${typ.print().replace("declare ", "")}`;
+      for (const pluginType of file.types || []) {
+        const typ = sourceFile.getTypeAliasOrThrow(pluginType);
+        output += `\n\n${typ.print().replace("declare ", "")}`;
+      }
     }
 
     for (const pluginExternal of plugin.externals || []) {

packages/js/client/src/pluginConfigs/Ens.ts

@@ -1,10 +1,15 @@
 /// NOTE: This is an auto-generated file. See scripts/extractPluginConfigs.ts
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-/// Types generated from build/index.d.ts
+/// Types generated from @web3api/ens-plugin-js build files:
+/// build/index.d.ts
 
 export interface EnsConfig {
-  address?: Address;
+  addresses?: Addresses;
+}
+
+export interface Addresses {
+  [network: string]: Address;
 }
 
 export type Address = string;

packages/js/client/src/pluginConfigs/Ethereum.ts

@@ -1,14 +1,23 @@
 /// NOTE: This is an auto-generated file. See scripts/extractPluginConfigs.ts
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-/// Types generated from build/index.d.ts
+/// Types generated from @web3api/ethereum-plugin-js build files:
+/// build/index.d.ts, build/Connection.d.ts
 
-export interface EthereumConfig {
+export type EthereumConfig = ConnectionConfigs & {
+    defaultNetwork?: string;
+};
+
+export interface ConnectionConfig {
   provider: EthereumProvider;
   signer?: EthereumSigner;
 }
 
-export type EthereumProvider = string | ExternalProvider;
+export interface ConnectionConfigs {
+  [network: string]: ConnectionConfig;
+}
+
+export type EthereumProvider = string | ExternalProvider | JsonRpcProvider;
 
 export type EthereumSigner = Signer | Address | AccountIndex;
 
@@ -21,3 +30,6 @@ export type Signer = any;
 
 // import { ExternalProvider } from "@ethersproject/providers"
 export type ExternalProvider = any;
+
+// import { JsonRpcProvider } from "@ethersproject/providers"
+export type JsonRpcProvider = any;

packages/js/client/src/pluginConfigs/Ipfs.ts

@@ -1,7 +1,8 @@
 /// NOTE: This is an auto-generated file. See scripts/extractPluginConfigs.ts
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-/// Types generated from build/index.d.ts
+/// Types generated from @web3api/ipfs-plugin-js build files:
+/// build/index.d.ts
 
 export interface IpfsConfig {
   provider: string;