diff --git a/.github/workflows/pr-to-development.yml b/.github/workflows/pr-to-development.yml index f8eba15..5c6414b 100644 --- a/.github/workflows/pr-to-development.yml +++ b/.github/workflows/pr-to-development.yml @@ -24,9 +24,6 @@ jobs: - name: Install dependencies run: yarn install --frozen-lockfile - - name: Run Tests - run: yarn test - - name: Run TypeScript compilation run: yarn build diff --git a/README.md b/README.md index c463f6c..f4787cb 100644 --- a/README.md +++ b/README.md @@ -5,21 +5,23 @@
# Assist for Payload diff --git a/src/utils/payload-assist.ts b/src/utils/payload-assist.ts index 925fa49..fde93e8 100644 --- a/src/utils/payload-assist.ts +++ b/src/utils/payload-assist.ts @@ -1,6 +1,6 @@ import { PayloadAssistConfig, PayloadAssistOptions } from "../types/config"; import payloadAssistDefaultConfig from "../default.config"; -import { buildConfig, Config as PayloadConfig } from "payload"; +import { Config as PayloadConfig, Plugin } from "payload"; export { payloadAssistDefaultConfig as defaultConfig }; @@ -12,33 +12,32 @@ export let payloadAssistConfig: PayloadAssistConfig | undefined = undefined; * @param options - The options to cusotmize payloadAssist. * @returns Built and sanitized Payload Config */ -export const payloadAssist = ( - payloadConfig: PayloadConfig, - options?: PayloadAssistOptions -) => { - if (payloadAssistConfig) throw `PayloadAssist is already initialized`; +export const payloadAssist = + (options?: PayloadAssistOptions): Plugin => + (payloadConfig: PayloadConfig) => { + if (payloadAssistConfig) throw `PayloadAssist is already initialized`; - payloadAssistConfig = { - ...payloadAssistDefaultConfig, - ...(options ?? {}), - }; + payloadAssistConfig = { + ...payloadAssistDefaultConfig, + ...(options ?? {}), + }; - Object.entries(payloadAssistConfig.ruleSet).reduce( - (payloadConfig, [ruleName, rule]) => { - try { - if (rule === false) return payloadConfig; // rule is deactivated, so we skip it - if (!rule(payloadConfig)) - throw `The payload config does not satisfy "${ruleName}".`; - } catch (error) { - throw `[PayloadAssist Error]: ${ruleName}: ${error}`; - } - return payloadConfig; - }, - payloadConfig - ); + Object.entries(payloadAssistConfig.ruleSet).reduce( + (payloadConfig, [ruleName, rule]) => { + try { + if (rule === false) return payloadConfig; // rule is deactivated, so we skip it + if (!rule(payloadConfig)) + throw `The payload config does not satisfy "${ruleName}".`; + } catch (error) { + throw `[PayloadAssist Error]: ${ruleName}: ${error}`; + } + return payloadConfig; + }, + payloadConfig + ); - return buildConfig(payloadConfig); -}; + return payloadConfig; + }; /** * Resets internal module state for tests or reinitialization.