Skip to content

Commit ecd664e

Browse files
authored
fix defaults (#29)
1 parent e1c27ec commit ecd664e

6 files changed

Lines changed: 9 additions & 9 deletions

File tree

src/lib/engine.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ async function run<ConsequencePayload, C extends Context,
7575
export const evaluateRules = async <ConsequencePayload, C extends Context,
7676
RF extends RuleFunctionsTable<C, ConsequencePayload, CustomEngineRuleFuncRunOptions>,
7777
F extends FunctionsTable<C, CustomEngineRuleFuncRunOptions>,
78-
Ignore = never, CustomEngineRuleFuncRunOptions = {}>(rules: Rule<ConsequencePayload,
78+
Ignore = never, CustomEngineRuleFuncRunOptions = undefined>(rules: Rule<ConsequencePayload,
7979
RF, C, F, Ignore, CustomEngineRuleFuncRunOptions>[], context: C, functionsTable: F, ruleFunctionsTable: RF,
8080
haltOnFirstMatch: boolean, runOptions: CustomEngineRuleFuncRunOptions)
8181
: Promise<void | ResolvedConsequence<ConsequencePayload>[]> => {
@@ -86,7 +86,7 @@ export const evaluateRules = async <ConsequencePayload, C extends Context,
8686
export const validateRules = async <ConsequencePayload, C extends Context,
8787
RF extends RuleFunctionsTable<C, ConsequencePayload, CustomEngineRuleFuncRunOptions>,
8888
F extends FunctionsTable<C, CustomEngineRuleFuncRunOptions>,
89-
Ignore = never, CustomEngineRuleFuncRunOptions = {}>(
89+
Ignore = never, CustomEngineRuleFuncRunOptions = undefined>(
9090
rules: Rule<ConsequencePayload, RF, C, F, Ignore, CustomEngineRuleFuncRunOptions>[],
9191
validationContext: ValidationContext<C, Ignore>,
9292
functionsTable: F, ruleFunctionsTable: RF, runOptions: CustomEngineRuleFuncRunOptions)

src/lib/evaluator.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ async function run<C extends Context, F extends FunctionsTable<C, CustomEvaluato
220220
}
221221

222222
export const evaluate = async <C extends Context, F extends FunctionsTable<C, CustomEvaluatorFuncRunOptions>,
223-
Ignore = never, CustomEvaluatorFuncRunOptions = {}>(
223+
Ignore = never, CustomEvaluatorFuncRunOptions = undefined>(
224224
expression: Expression<C, F, Ignore, CustomEvaluatorFuncRunOptions>, context: C, functionsTable: F
225225
, runOptions: CustomEvaluatorFuncRunOptions)
226226
: Promise<boolean> => {
@@ -230,7 +230,7 @@ export const evaluate = async <C extends Context, F extends FunctionsTable<C, Cu
230230

231231
// Throws in case of validation error. Does not run functions or compare fields
232232
export const validate = async <C extends Context, F extends FunctionsTable<C, CustomEvaluatorFuncRunOptions>,
233-
Ignore = never, CustomEvaluatorFuncRunOptions = {}>(
233+
Ignore = never, CustomEvaluatorFuncRunOptions = undefined>(
234234
expression: Expression<C, F, Ignore, CustomEvaluatorFuncRunOptions>,
235235
validationContext: ValidationContext<C, Ignore>, functionsTable: F, runOptions: CustomEvaluatorFuncRunOptions)
236236
: Promise<void> => {

src/lib/expressionHandler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
} from '../types';
88

99
export class ExpressionHandler<C extends Context, F extends FunctionsTable<C, CustomEvaluatorFuncRunOptions>,
10-
Ignore = never, CustomEvaluatorFuncRunOptions = {}> {
10+
Ignore = never, CustomEvaluatorFuncRunOptions = undefined> {
1111

1212
constructor(private readonly expression: Expression<C, F, Ignore, CustomEvaluatorFuncRunOptions>,
1313
private readonly functionsTable: F) {

src/lib/rulesEngine.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {evaluateRules, validateRules} from './engine';
88
export class RulesEngine<ConsequencePayload, C extends Context,
99
RF extends RuleFunctionsTable<C, ConsequencePayload, CustomEngineRuleFuncRunOptions>,
1010
F extends FunctionsTable<C, CustomEngineRuleFuncRunOptions>,
11-
Ignore = never, CustomEngineRuleFuncRunOptions = {}> {
11+
Ignore = never, CustomEngineRuleFuncRunOptions = undefined> {
1212

1313
constructor(private readonly functionsTable: F, private readonly ruleFunctionsTable: RF) {
1414
}

src/types/engine.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export interface RuleDefinition<ConsequencePayload, C extends Context,
3030
consequence: RuleConsequence<ConsequencePayload, C, Ignore>;
3131
}
3232

33-
export type EngineRuleFuncRunOptions<CustomEngineRuleFuncRunOptions> = {
33+
export type EngineRuleFuncRunOptions<CustomEngineRuleFuncRunOptions = undefined> = {
3434
custom: CustomEngineRuleFuncRunOptions;
3535
validation: boolean;
3636
}
@@ -54,6 +54,6 @@ export type RuleFunctionsParams<ConsequencePayload, C extends Context,
5454

5555
export type Rule<ConsequencePayload, RF extends RuleFunctionsTable<C, ConsequencePayload,
5656
CustomEngineRuleFuncRunOptions>, C extends Context, F extends FunctionsTable<C, CustomEngineRuleFuncRunOptions>,
57-
Ignore, CustomEngineRuleFuncRunOptions> =
57+
Ignore = never, CustomEngineRuleFuncRunOptions = undefined> =
5858
RuleDefinition<ConsequencePayload, C, F, Ignore, CustomEngineRuleFuncRunOptions> |
5959
RequireOnlyOne<RuleFunctionsParams<ConsequencePayload, C, RF, CustomEngineRuleFuncRunOptions>>;

src/types/evaluator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ export type Expression<C extends Context, F extends FunctionsTable<C, CustomEval
135135
Ignore, CustomEvaluatorFuncRunOptions> =
136136
RequireOnlyOne<FullExpression<C, F, Ignore, CustomEvaluatorFuncRunOptions>>;
137137

138-
export type EvaluatorFuncRunOptions<CustomEvaluatorFuncRunOptions> = {
138+
export type EvaluatorFuncRunOptions<CustomEvaluatorFuncRunOptions = undefined> = {
139139
custom: CustomEvaluatorFuncRunOptions;
140140
validation: boolean;
141141
}

0 commit comments

Comments
 (0)