Browse Source

rename Operation to DataConditionOperation

pull/6419/head
mohamedsalem401 2 years ago
parent
commit
174b11b02c
  1. 6
      packages/core/src/data_sources/model/conditional_variables/ConditionStatement.ts
  2. 4
      packages/core/src/data_sources/model/conditional_variables/DataConditionEvaluator.ts
  3. 4
      packages/core/src/data_sources/model/conditional_variables/operators/BaseOperator.ts
  4. 2
      packages/core/src/data_sources/model/conditional_variables/operators/types.ts

6
packages/core/src/data_sources/model/conditional_variables/ConditionStatement.ts

@ -1,12 +1,12 @@
import { Operator } from './operators/BaseOperator'; import { Operator } from './operators/BaseOperator';
import { Operation } from './operators/types'; import { DataConditionOperation } from './operators/types';
export class ConditionStatement { export class ConditionStatement {
constructor( constructor(
private leftValue: any, private leftValue: any,
private operator: Operator<Operation>, private operator: Operator<DataConditionOperation>,
private rightValue: any, private rightValue: any,
) {} ) { }
evaluate(): boolean { evaluate(): boolean {
return this.operator.evaluate(this.leftValue, this.rightValue); return this.operator.evaluate(this.leftValue, this.rightValue);

4
packages/core/src/data_sources/model/conditional_variables/DataConditionEvaluator.ts

@ -9,7 +9,7 @@ import { BooleanOperator } from './operators/BooleanOperator';
import { NumberOperator, NumberOperation } from './operators/NumberOperator'; import { NumberOperator, NumberOperation } from './operators/NumberOperator';
import { StringOperator, StringOperation } from './operators/StringOperator'; import { StringOperator, StringOperation } from './operators/StringOperator';
import { Model } from '../../../common'; import { Model } from '../../../common';
import { Operation } from './operators/types'; import { DataConditionOperation } from './operators/types';
export type ConditionProps = ExpressionProps | LogicGroupProps | boolean; export type ConditionProps = ExpressionProps | LogicGroupProps | boolean;
@ -54,7 +54,7 @@ export class DataConditionEvaluator extends Model<DataConditionEvaluatorProps> {
/** /**
* Factory method for creating operators based on the data type. * Factory method for creating operators based on the data type.
*/ */
private getOperator(left: any, operator: string): Operator<Operation> { private getOperator(left: any, operator: string): Operator<DataConditionOperation> {
const em = this.em; const em = this.em;
if (this.isOperatorInEnum(operator, AnyTypeOperation)) { if (this.isOperatorInEnum(operator, AnyTypeOperation)) {

4
packages/core/src/data_sources/model/conditional_variables/operators/BaseOperator.ts

@ -1,7 +1,7 @@
import EditorModel from '../../../../editor/model/Editor'; import EditorModel from '../../../../editor/model/Editor';
import { Operation } from './types'; import { DataConditionOperation } from './types';
export abstract class Operator<OperationType extends Operation> { export abstract class Operator<OperationType extends DataConditionOperation> {
protected em: EditorModel; protected em: EditorModel;
protected operation: OperationType; protected operation: OperationType;

2
packages/core/src/data_sources/model/conditional_variables/operators/types.ts

@ -3,4 +3,4 @@ import { BooleanOperation } from './BooleanOperator';
import { NumberOperation } from './NumberOperator'; import { NumberOperation } from './NumberOperator';
import { StringOperation } from './StringOperator'; import { StringOperation } from './StringOperator';
export type Operation = AnyTypeOperation | StringOperation | NumberOperation | BooleanOperation; export type DataConditionOperation = AnyTypeOperation | StringOperation | NumberOperation | BooleanOperation;

Loading…
Cancel
Save