From 760a47c6a1136ca8167c5cda46042c663c030788 Mon Sep 17 00:00:00 2001 From: Dennis Won Date: Fri, 5 Jan 2024 13:28:47 -0800 Subject: [PATCH] feat: msca plugingen to generate subfolders for each plugin (#350) --- packages/accounts/scripts/plugingen.ts | 4 ++-- packages/accounts/src/index.ts | 6 +++--- packages/accounts/src/msca/multi-owner-account.ts | 4 ++-- .../msca/plugins/{multi-owner.ts => multi-owner/plugin.ts} | 4 ++-- .../msca/plugins/{session-key.ts => session-key/plugin.ts} | 4 ++-- .../plugins/{token-receiver.ts => token-receiver/plugin.ts} | 4 ++-- packages/accounts/wagmi.config.ts | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) rename packages/accounts/src/msca/plugins/{multi-owner.ts => multi-owner/plugin.ts} (98%) rename packages/accounts/src/msca/plugins/{session-key.ts => session-key/plugin.ts} (98%) rename packages/accounts/src/msca/plugins/{token-receiver.ts => token-receiver/plugin.ts} (98%) diff --git a/packages/accounts/scripts/plugingen.ts b/packages/accounts/scripts/plugingen.ts index e4ad28a1a..7413e7452 100644 --- 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 index dc06f7071..b35bcade5 100644 --- 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 index e32e5d100..bbd0df732 100644 --- 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/packages/accounts/src/msca/plugins/multi-owner.ts b/packages/accounts/src/msca/plugins/multi-owner/plugin.ts similarity index 98% rename from packages/accounts/src/msca/plugins/multi-owner.ts rename to packages/accounts/src/msca/plugins/multi-owner/plugin.ts index 01b6671a6..2cfd9ddff 100644 --- a/packages/accounts/src/msca/plugins/multi-owner.ts +++ b/packages/accounts/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/packages/accounts/src/msca/plugins/session-key.ts b/packages/accounts/src/msca/plugins/session-key/plugin.ts similarity index 98% rename from packages/accounts/src/msca/plugins/session-key.ts rename to packages/accounts/src/msca/plugins/session-key/plugin.ts index 1b35df019..1fb4b9275 100644 --- a/packages/accounts/src/msca/plugins/session-key.ts +++ b/packages/accounts/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/packages/accounts/src/msca/plugins/token-receiver.ts b/packages/accounts/src/msca/plugins/token-receiver/plugin.ts similarity index 98% rename from packages/accounts/src/msca/plugins/token-receiver.ts rename to packages/accounts/src/msca/plugins/token-receiver/plugin.ts index 03c5f7e35..2cda10c30 100644 --- a/packages/accounts/src/msca/plugins/token-receiver.ts +++ b/packages/accounts/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 index 0f28b7537..ad03f64ab 100644 --- 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,