feat: msca plugingen to generate subfolders for each plugin (#350)

alchemyplatform · Jan 8, 2024 · 760a47c · 760a47c
1 parent b254d8a
commit 760a47c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/packages/accounts/scripts/plugingen.ts b/packages/accounts/scripts/plugingen.ts
@@ -191,8 +191,8 @@ export function plugingen({
 
       const imports = dedent`
         import { type Address, type GetFunctionArgs, encodeFunctionData } from "viem";
-        import type { Plugin } from "./types";
-        import type { IMSCA } from "../builder";
+        import type { Plugin } from "../types";
+        import type { IMSCA } from "../../builder";
         import type { ISmartAccountProvider, SupportedTransports, UserOperationOverrides } from "@alchemy/aa-core";
       `;
 

diff --git a/packages/accounts/src/index.ts b/packages/accounts/src/index.ts
@@ -76,12 +76,12 @@ export { type Plugin } from "./msca/plugins/types.js";
 export {
   MultiOwnerPlugin,
   MultiOwnerPluginExecutionFunctionAbi,
-} from "./msca/plugins/multi-owner.js";
+} from "./msca/plugins/multi-owner/plugin.js";
 export {
   SessionKeyPlugin,
   SessionKeyPluginExecutionFunctionAbi,
-} from "./msca/plugins/session-key.js";
+} from "./msca/plugins/session-key/plugin.js";
 export {
   TokenReceiverPlugin,
   TokenReceiverPluginExecutionFunctionAbi,
-} from "./msca/plugins/token-receiver.js";
+} from "./msca/plugins/token-receiver/plugin.js";
diff --git a/packages/accounts/src/msca/multi-owner-account.ts b/packages/accounts/src/msca/multi-owner-account.ts
@@ -20,8 +20,8 @@ import { MultiOwnerMSCAFactoryAbi } from "./abis/MultiOwnerMSCAFactory.js";
 import { MultiOwnerTokenReceiverMSCAFactoryAbi } from "./abis/MultiOwnerTokenReceiverMSCAFactory.js";
 import { accountLoupeDecorators } from "./account-loupe/decorator.js";
 import { MSCABuilder, StandardExecutor } from "./builder.js";
-import { MultiOwnerPlugin } from "./plugins/multi-owner.js";
-import { TokenReceiverPlugin } from "./plugins/token-receiver.js";
+import { MultiOwnerPlugin } from "./plugins/multi-owner/plugin.js";
+import { TokenReceiverPlugin } from "./plugins/token-receiver/plugin.js";
 
 export const createMultiOwnerMSCASchema = <
   TTransport extends SupportedTransports = Transport

diff --git a/.../accounts/src/msca/plugins/multi-owner.ts → ...ts/src/msca/plugins/multi-owner/plugin.ts b/.../accounts/src/msca/plugins/multi-owner.ts → ...ts/src/msca/plugins/multi-owner/plugin.ts
@@ -1,6 +1,6 @@
 import { type Address, type GetFunctionArgs, encodeFunctionData } from "viem";
-import type { Plugin } from "./types";
-import type { IMSCA } from "../builder";
+import type { Plugin } from "../types";
+import type { IMSCA } from "../../builder";
 import type {
   ISmartAccountProvider,
   SupportedTransports,

diff --git a/.../accounts/src/msca/plugins/session-key.ts → ...ts/src/msca/plugins/session-key/plugin.ts b/.../accounts/src/msca/plugins/session-key.ts → ...ts/src/msca/plugins/session-key/plugin.ts
@@ -1,6 +1,6 @@
 import { type Address, type GetFunctionArgs, encodeFunctionData } from "viem";
-import type { Plugin } from "./types";
-import type { IMSCA } from "../builder";
+import type { Plugin } from "../types";
+import type { IMSCA } from "../../builder";
 import type {
   ISmartAccountProvider,
   SupportedTransports,

diff --git a/...counts/src/msca/plugins/token-receiver.ts → ...src/msca/plugins/token-receiver/plugin.ts b/...counts/src/msca/plugins/token-receiver.ts → ...src/msca/plugins/token-receiver/plugin.ts
@@ -1,6 +1,6 @@
 import { type Address, type GetFunctionArgs, encodeFunctionData } from "viem";
-import type { Plugin } from "./types";
-import type { IMSCA } from "../builder";
+import type { Plugin } from "../types";
+import type { IMSCA } from "../../builder";
 import type {
   ISmartAccountProvider,
   SupportedTransports,

diff --git a/packages/accounts/wagmi.config.ts b/packages/accounts/wagmi.config.ts
@@ -12,7 +12,7 @@ export default defineConfig(
   pluginConfigs.map((config) => ({
     out: `./src/msca/plugins/${kebabCase(
       config.name.replaceAll(pluginRegEx, "")
-    )}.ts`,
+    )}/plugin.ts`,
     contracts: [
       {
         name: config.name,