From 0ffaf10d4ce5b87d5738722c395143aa27acc1e8 Mon Sep 17 00:00:00 2001 From: adairrr <32375605+adairrr@users.noreply.github.com> Date: Tue, 22 Oct 2024 10:18:21 -0400 Subject: [PATCH] Rename appstract to abstract --- packages/cli/src/plugins/react.ts | 16 ++++++++-------- packages/cli/src/plugins/vanilla.ts | 10 +++++----- turbo.json | 4 ++++ 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/packages/cli/src/plugins/react.ts b/packages/cli/src/plugins/react.ts index 7b4b83e1..1b1ac62d 100644 --- a/packages/cli/src/plugins/react.ts +++ b/packages/cli/src/plugins/react.ts @@ -14,16 +14,16 @@ const codegen = (_codegen as any).default as typeof _codegen type ReactResult = RequiredBy -const DISABLED_APPSTRACT_APP_FOR_NAMESPACES_LIST = ['cw-plus'] +const DISABLED_ABSTRACT_APP_FOR_NAMESPACES_LIST = ['cw-plus'] type ReactOptions = { - disableAppstractAppFor?: string[] + disableAbstractAppFor?: string[] } export function react(options: ReactOptions = {}): ReactResult { - const disableAppstractAppFor = [ - ...(options.disableAppstractAppFor ?? []), - ...DISABLED_APPSTRACT_APP_FOR_NAMESPACES_LIST, + const disableAbstractAppFor = [ + ...(options.disableAbstractAppFor ?? []), + ...DISABLED_ABSTRACT_APP_FOR_NAMESPACES_LIST, ] return { @@ -58,7 +58,7 @@ export function react(options: ReactOptions = {}): ReactResult { // Guard speicfic contracts to not have the abstract app generated const contractsWithoutAbstractApp = contracts.filter(({ namespace }) => - disableAppstractAppFor.includes(namespace), + disableAbstractAppFor.includes(namespace), ) await codegen({ @@ -66,7 +66,7 @@ export function react(options: ReactOptions = {}): ReactResult { contracts: contracts .filter( ({ namespace }) => - !disableAppstractAppFor.includes(namespace) && + !disableAbstractAppFor.includes(namespace) && contractsWithoutAbstractApp.every( (guardedContract) => guardedContract.namespace !== namespace, ), @@ -81,7 +81,7 @@ export function react(options: ReactOptions = {}): ReactResult { contracts: [ ...contractsWithoutAbstractApp, ...contracts.filter(({ namespace }) => - disableAppstractAppFor.includes(namespace), + disableAbstractAppFor.includes(namespace), ), ].map(({ name, path }) => ({ name, dir: path })), outPath: cosmwasmCodegenDirPath, diff --git a/packages/cli/src/plugins/vanilla.ts b/packages/cli/src/plugins/vanilla.ts index 62b2e51a..5708b074 100644 --- a/packages/cli/src/plugins/vanilla.ts +++ b/packages/cli/src/plugins/vanilla.ts @@ -14,7 +14,7 @@ const codegen = (_codegen as any).default as typeof _codegen type VanillaResult = RequiredBy type VanillaOptions = { - enableAppstractAppFor?: string[] + enableAbstractAppFor?: string[] } export function vanilla(options: VanillaOptions = {}): VanillaResult { @@ -36,14 +36,14 @@ export function vanilla(options: VanillaOptions = {}): VanillaResult { await codegen({ options: codegenOptions, contracts: contracts - .filter(({ name }) => !options.enableAppstractAppFor?.includes(name)) + .filter(({ name }) => !options.enableAbstractAppFor?.includes(name)) .map(({ name, path }) => ({ name, dir: path })), outPath: cosmwasmCodegenDirPath, }) - if (options.enableAppstractAppFor?.length !== 0) { + if (options.enableAbstractAppFor?.length !== 0) { const abstractContracts = contracts.filter(({ name }) => - options.enableAppstractAppFor?.includes(name), + options.enableAbstractAppFor?.includes(name), ) for (const abstractContract of abstractContracts) { @@ -140,7 +140,7 @@ export function vanilla(options: VanillaOptions = {}): VanillaResult { ) // TODO: Apps are duplicating the type imports - const isAppEnabled = options.enableAppstractAppFor?.includes( + const isAppEnabled = options.enableAbstractAppFor?.includes( contract.name, ) const importTypesLine = isAppEnabled diff --git a/turbo.json b/turbo.json index 2ad7330f..54ff2816 100644 --- a/turbo.json +++ b/turbo.json @@ -5,6 +5,10 @@ "dependsOn": ["^build"], "outputs": ["dist/**", "lib/**", "esm/**"] }, + "typecheck": { + "dependsOn": ["build"], + "outputs": [] + }, "docgen": { "dependsOn": ["build"], "inputs": ["src/**/*.tsx", "src/**/*.ts"],