StyAndCo/zappyzep
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: counter types

Browse source
This commit is contained in:
Dragory 2024-01-15 22:38:48 +00:00
parent 82d720d308
commit 5a5be89573
No known key found for this signature in database
1 changed files with 34 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
backend/src/plugins/Counters/types.ts
View file

@ -10,7 +10,7 @@ const MAX_COUNTERS = 5;
const MAX_TRIGGERS_PER_COUNTER = 5; const MAX_TRIGGERS_PER_COUNTER = 5;
export const zTrigger = z.strictObject({ export const zTrigger = z.strictObject({
// Dummy type because name gets replaced by the property key in zTriggerInput // Dummy type because name gets replaced by the property key in transform()
name: z.never().optional().transform(() => ""), name: z.never().optional().transform(() => ""),
pretty_name: zBoundedCharacters(0, 100).nullable().default(null), pretty_name: zBoundedCharacters(0, 100).nullable().default(null),
condition: zBoundedCharacters(1, 64).refine( condition: zBoundedCharacters(1, 64).refine(
@ -20,34 +20,45 @@ export const zTrigger = z.strictObject({
reverse_condition: zBoundedCharacters(1, 64).refine( reverse_condition: zBoundedCharacters(1, 64).refine(
(str) => parseCounterConditionString(str) !== null, (str) => parseCounterConditionString(str) !== null,
{ message: "Invalid counter trigger reverse condition" }, { message: "Invalid counter trigger reverse condition" },
), ).optional(),
}); })
const zTriggerInput = z.union([zBoundedCharacters(0, 100), zTrigger])
.transform((val, ctx) => { .transform((val, ctx) => {
const ruleName = String(ctx.path[ctx.path.length - 2]).trim(); const ruleName = String(ctx.path[ctx.path.length - 2]).trim();
if (typeof val === "string") {
const parsedCondition = parseCounterConditionString(val); let reverseCondition = val.reverse_condition;
if (!parsedCondition) { if (! reverseCondition) {
ctx.addIssue({ const parsedCondition = parseCounterConditionString(val.condition)!;
code: z.ZodIssueCode.custom, reverseCondition = buildCounterConditionString(getReverseCounterComparisonOp(parsedCondition[0]), parsedCondition[1]);
message: "Invalid counter trigger condition",
});
return z.NEVER;
}
return {
name: ruleName,
pretty_name: null,
condition: buildCounterConditionString(parsedCondition[0], parsedCondition[1]),
reverse_condition: buildCounterConditionString(getReverseCounterComparisonOp(parsedCondition[0]), parsedCondition[1]),
};
} }
return { return {
...val, ...val,
name: ruleName, name: ruleName,
reverse_condition: reverseCondition,
}; };
}); });
const zTriggerFromString = zBoundedCharacters(0, 100)
.transform((val, ctx) => {
const ruleName = String(ctx.path[ctx.path.length - 2]).trim();
const parsedCondition = parseCounterConditionString(val);
if (!parsedCondition) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: "Invalid counter trigger condition",
});
return z.NEVER;
}
return {
name: ruleName,
pretty_name: null,
condition: buildCounterConditionString(parsedCondition[0], parsedCondition[1]),
reverse_condition: buildCounterConditionString(getReverseCounterComparisonOp(parsedCondition[0]), parsedCondition[1]),
};
});
const zTriggerInput = z.union([zTrigger, zTriggerFromString]);
export const zCounter = z.strictObject({ export const zCounter = z.strictObject({
// Typed as "never" because you are not expected to supply this directly. // Typed as "never" because you are not expected to supply this directly.
// The transform instead picks it up from the property key and the output type is a string. // The transform instead picks it up from the property key and the output type is a string.
@ -78,9 +89,9 @@ export const zCounter = z.strictObject({
amount: z.number(), amount: z.number(),
every: zDelayString, every: zDelayString,
}).nullable().default(null), }).nullable().default(null),
can_view: z.boolean(), can_view: z.boolean().default(false),
can_edit: z.boolean(), can_edit: z.boolean().default(false),
can_reset_all: z.boolean(), can_reset_all: z.boolean().default(false),
}); });
export const zCountersConfig = z.strictObject({ export const zCountersConfig = z.strictObject({