@finos/legend-application-query 5.0.0

package/src/stores/filterOperators/QueryBuilderFilterOperator_GreaterThanEqual.ts

@@ -0,0 +1,164 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  QueryBuilderFilterOperator,
+  type QueryBuilderFilterState,
+  type FilterConditionState,
+} from '../QueryBuilderFilterState.js';
+import {
+  PRIMITIVE_TYPE,
+  type ValueSpecification,
+  type SimpleFunctionExpression,
+  type AbstractPropertyExpression,
+  isSuperType,
+  SUPPORTED_FUNCTIONS,
+  buildPrimitiveInstanceValue,
+} from '@finos/legend-graph';
+import { UnsupportedOperationError } from '@finos/legend-shared';
+import {
+  buildFilterConditionState,
+  buildFilterConditionExpression,
+} from './QueryBuilderFilterOperatorHelper.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
+import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationBuilderHelper.js';
+import { getNonCollectionValueSpecificationType } from '../QueryBuilderOperatorsHelper.js';
+
+export class QueryBuilderFilterOperator_GreaterThanEqual extends QueryBuilderFilterOperator {
+  getLabel(filterConditionState: FilterConditionState): string {
+    return '>=';
+  }
+
+  isCompatibleWithFilterConditionProperty(
+    filterConditionState: FilterConditionState,
+  ): boolean {
+    const propertyType =
+      filterConditionState.propertyExpressionState.propertyExpression.func
+        .genericType.value.rawType;
+    return (
+      [
+        PRIMITIVE_TYPE.NUMBER,
+        PRIMITIVE_TYPE.INTEGER,
+        PRIMITIVE_TYPE.DECIMAL,
+        PRIMITIVE_TYPE.FLOAT,
+        PRIMITIVE_TYPE.DATE,
+        PRIMITIVE_TYPE.STRICTDATE,
+        PRIMITIVE_TYPE.DATETIME,
+      ] as string[]
+    ).includes(propertyType.path);
+  }
+
+  isCompatibleWithFilterConditionValue(
+    filterConditionState: FilterConditionState,
+  ): boolean {
+    const propertyType =
+      filterConditionState.propertyExpressionState.propertyExpression.func
+        .genericType.value.rawType;
+    const type = filterConditionState.value
+      ? getNonCollectionValueSpecificationType(filterConditionState.value)
+      : undefined;
+    const NUMERIC_PRIMITIVE_TYPES = [
+      PRIMITIVE_TYPE.NUMBER,
+      PRIMITIVE_TYPE.INTEGER,
+      PRIMITIVE_TYPE.DECIMAL,
+      PRIMITIVE_TYPE.FLOAT,
+    ] as string[];
+
+    const DATE_PRIMITIVE_TYPES = [
+      PRIMITIVE_TYPE.DATE,
+      PRIMITIVE_TYPE.DATETIME,
+      PRIMITIVE_TYPE.STRICTDATE,
+      PRIMITIVE_TYPE.LATESTDATE,
+    ] as string[];
+
+    // When changing the return type for LHS, the RHS value should be adjusted accordingly.
+    return (
+      type !== undefined &&
+      // Numeric value is handled loosely because of autoboxing
+      // e.g. LHS (integer) = RHS (float) is acceptable
+      ((NUMERIC_PRIMITIVE_TYPES.includes(type.path) &&
+        NUMERIC_PRIMITIVE_TYPES.includes(propertyType.path)) ||
+        // Date value is handled loosely as well if the LHS is of type DateTime
+        // This is because we would simulate auto-boxing for date by altering the
+        // Pure function used for the operation
+        // e.g. LHS(DateTime) = RHS(Date) -> we use isOnDay() instead of is()
+        DATE_PRIMITIVE_TYPES.includes(type.path) ||
+        type === propertyType ||
+        isSuperType(propertyType, type))
+    );
+  }
+
+  getDefaultFilterConditionValue(
+    filterConditionState: FilterConditionState,
+  ): ValueSpecification | undefined {
+    const propertyType =
+      filterConditionState.propertyExpressionState.propertyExpression.func
+        .genericType.value.rawType;
+    switch (propertyType.path) {
+      case PRIMITIVE_TYPE.NUMBER:
+      case PRIMITIVE_TYPE.DECIMAL:
+      case PRIMITIVE_TYPE.FLOAT:
+      case PRIMITIVE_TYPE.INTEGER:
+      case PRIMITIVE_TYPE.DATE:
+      case PRIMITIVE_TYPE.STRICTDATE:
+      case PRIMITIVE_TYPE.DATETIME: {
+        return buildPrimitiveInstanceValue(
+          filterConditionState.filterState.queryBuilderState.graphManagerState
+            .graph,
+          propertyType.path,
+          generateDefaultValueForPrimitiveType(propertyType.path),
+        );
+      }
+      default:
+        throw new UnsupportedOperationError(
+          `Can't get default value for filter operator '${this.getLabel(
+            filterConditionState,
+          )}' when the LHS property is of type '${propertyType.path}'`,
+        );
+    }
+  }
+
+  buildFilterConditionExpression(
+    filterConditionState: FilterConditionState,
+  ): ValueSpecification {
+    return buildFilterConditionExpression(
+      filterConditionState,
+      filterConditionState.propertyExpressionState.propertyExpression.func
+        .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+        filterConditionState.value?.genericType?.value.rawType.path !==
+          PRIMITIVE_TYPE.DATETIME
+        ? SUPPORTED_FUNCTIONS.IS_ON_OR_AFTER_DAY
+        : QUERY_BUILDER_SUPPORTED_FUNCTIONS.GREATER_THAN_EQUAL,
+    );
+  }
+
+  buildFilterConditionState(
+    filterState: QueryBuilderFilterState,
+    expression: SimpleFunctionExpression,
+  ): FilterConditionState | undefined {
+    return buildFilterConditionState(
+      filterState,
+      expression,
+      (expression.parametersValues[0] as AbstractPropertyExpression).func
+        .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+        expression.parametersValues[1]?.genericType?.value.rawType.path !==
+          PRIMITIVE_TYPE.DATETIME
+        ? SUPPORTED_FUNCTIONS.IS_ON_OR_AFTER_DAY
+        : QUERY_BUILDER_SUPPORTED_FUNCTIONS.GREATER_THAN_EQUAL,
+      this,
+    );
+  }
+}

package/src/stores/filterOperators/QueryBuilderFilterOperator_In.ts

@@ -0,0 +1,181 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  QueryBuilderFilterOperator,
+  type QueryBuilderFilterState,
+  type FilterConditionState,
+} from '../QueryBuilderFilterState.js';
+import {
+  type ValueSpecification,
+  type SimpleFunctionExpression,
+  VariableExpression,
+  CollectionInstanceValue,
+  GenericTypeExplicitReference,
+  GenericType,
+  TYPICAL_MULTIPLICITY_TYPE,
+  Enumeration,
+  PRIMITIVE_TYPE,
+} from '@finos/legend-graph';
+import {
+  buildFilterConditionState,
+  buildFilterConditionExpression,
+} from './QueryBuilderFilterOperatorHelper.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
+import {
+  buildNotExpression,
+  unwrapNotExpression,
+  getCollectionValueSpecificationType,
+} from '../QueryBuilderOperatorsHelper.js';
+
+export class QueryBuilderFilterOperator_In extends QueryBuilderFilterOperator {
+  getLabel(filterConditionState: FilterConditionState): string {
+    return 'is in';
+  }
+
+  isCompatibleWithFilterConditionProperty(
+    filterConditionState: FilterConditionState,
+  ): boolean {
+    const propertyType =
+      filterConditionState.propertyExpressionState.propertyExpression.func
+        .genericType.value.rawType;
+    return (
+      (
+        [
+          PRIMITIVE_TYPE.STRING,
+          PRIMITIVE_TYPE.NUMBER,
+          PRIMITIVE_TYPE.INTEGER,
+          PRIMITIVE_TYPE.DECIMAL,
+          PRIMITIVE_TYPE.FLOAT,
+        ] as string[]
+      ).includes(propertyType.path) ||
+      // TODO: do we care if the enumeration type has no value (like in the case of `==` operator)?
+      propertyType instanceof Enumeration
+    );
+  }
+
+  isCompatibleWithFilterConditionValue(
+    filterConditionState: FilterConditionState,
+  ): boolean {
+    const propertyType =
+      filterConditionState.propertyExpressionState.propertyExpression.func
+        .genericType.value.rawType;
+    const valueSpec = filterConditionState.value;
+    if (valueSpec instanceof CollectionInstanceValue) {
+      if (valueSpec.values.length === 0) {
+        return true;
+      }
+      const collectionType = getCollectionValueSpecificationType(
+        filterConditionState.filterState.queryBuilderState.graphManagerState
+          .graph,
+        valueSpec.values,
+      );
+      if (!collectionType) {
+        return false;
+      }
+      if (
+        (
+          [
+            PRIMITIVE_TYPE.NUMBER,
+            PRIMITIVE_TYPE.INTEGER,
+            PRIMITIVE_TYPE.DECIMAL,
+            PRIMITIVE_TYPE.FLOAT,
+          ] as string[]
+        ).includes(propertyType.path)
+      ) {
+        return (
+          [
+            PRIMITIVE_TYPE.NUMBER,
+            PRIMITIVE_TYPE.INTEGER,
+            PRIMITIVE_TYPE.DECIMAL,
+            PRIMITIVE_TYPE.FLOAT,
+          ] as string[]
+        ).includes(collectionType.path);
+      }
+      return collectionType === propertyType;
+    } else if (valueSpec instanceof VariableExpression) {
+      // check if not a single value
+      if (valueSpec.multiplicity.upperBound === 1) {
+        return false;
+      }
+      return propertyType === valueSpec.genericType?.value.rawType;
+    }
+    return false;
+  }
+
+  getDefaultFilterConditionValue(
+    filterConditionState: FilterConditionState,
+  ): ValueSpecification | undefined {
+    const multiplicityOne =
+      filterConditionState.filterState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
+        TYPICAL_MULTIPLICITY_TYPE.ONE,
+      );
+    const propertyType =
+      filterConditionState.propertyExpressionState.propertyExpression.func
+        .genericType.value.rawType;
+    return new CollectionInstanceValue(
+      multiplicityOne,
+      GenericTypeExplicitReference.create(new GenericType(propertyType)),
+    );
+  }
+
+  buildFilterConditionExpression(
+    filterConditionState: FilterConditionState,
+  ): ValueSpecification {
+    return buildFilterConditionExpression(
+      filterConditionState,
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.IN,
+    );
+  }
+
+  buildFilterConditionState(
+    filterState: QueryBuilderFilterState,
+    expression: SimpleFunctionExpression,
+  ): FilterConditionState | undefined {
+    return buildFilterConditionState(
+      filterState,
+      expression,
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.IN,
+      this,
+    );
+  }
+}
+
+export class QueryBuilderFilterOperator_NotIn extends QueryBuilderFilterOperator_In {
+  override getLabel(filterConditionState: FilterConditionState): string {
+    return `is not in`;
+  }
+
+  override buildFilterConditionExpression(
+    filterConditionState: FilterConditionState,
+  ): ValueSpecification {
+    return buildNotExpression(
+      filterConditionState.filterState.queryBuilderState.graphManagerState
+        .graph,
+      super.buildFilterConditionExpression(filterConditionState),
+    );
+  }
+
+  override buildFilterConditionState(
+    filterState: QueryBuilderFilterState,
+    expression: SimpleFunctionExpression,
+  ): FilterConditionState | undefined {
+    const innerExpression = unwrapNotExpression(expression);
+    return innerExpression
+      ? super.buildFilterConditionState(filterState, innerExpression)
+      : undefined;
+  }
+}

package/src/stores/filterOperators/QueryBuilderFilterOperator_IsEmpty.ts

@@ -0,0 +1,125 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  QueryBuilderFilterOperator,
+  type QueryBuilderFilterState,
+  type FilterConditionState,
+} from '../QueryBuilderFilterState.js';
+import {
+  type ValueSpecification,
+  type SimpleFunctionExpression,
+  PRIMITIVE_TYPE,
+  Enumeration,
+} from '@finos/legend-graph';
+import {
+  buildFilterConditionState,
+  buildFilterConditionExpression,
+} from './QueryBuilderFilterOperatorHelper.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
+import {
+  buildNotExpression,
+  isPropertyExpressionChainOptional,
+  unwrapNotExpression,
+} from '../QueryBuilderOperatorsHelper.js';
+
+export class QueryBuilderFilterOperator_IsEmpty extends QueryBuilderFilterOperator {
+  getLabel(filterConditionState: FilterConditionState): string {
+    return 'is empty';
+  }
+
+  isCompatibleWithFilterConditionProperty(
+    filterConditionState: FilterConditionState,
+  ): boolean {
+    const propertyType =
+      filterConditionState.propertyExpressionState.propertyExpression.func
+        .genericType.value.rawType;
+    // First check if property is optional
+    if (
+      !isPropertyExpressionChainOptional(
+        filterConditionState.propertyExpressionState.propertyExpression,
+      )
+    ) {
+      return false;
+    }
+    if (propertyType instanceof Enumeration) {
+      return true;
+    }
+    return (Object.values(PRIMITIVE_TYPE) as string[]).includes(
+      propertyType.path,
+    );
+  }
+
+  isCompatibleWithFilterConditionValue(
+    filterConditionState: FilterConditionState,
+  ): boolean {
+    return filterConditionState.value === undefined;
+  }
+
+  getDefaultFilterConditionValue(
+    filterConditionState: FilterConditionState,
+  ): ValueSpecification | undefined {
+    return undefined;
+  }
+
+  buildFilterConditionExpression(
+    filterConditionState: FilterConditionState,
+  ): ValueSpecification {
+    return buildFilterConditionExpression(
+      filterConditionState,
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_EMPTY,
+    );
+  }
+
+  buildFilterConditionState(
+    filterState: QueryBuilderFilterState,
+    expression: SimpleFunctionExpression,
+  ): FilterConditionState | undefined {
+    return buildFilterConditionState(
+      filterState,
+      expression,
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_EMPTY,
+      this,
+      true,
+    );
+  }
+}
+
+export class QueryBuilderFilterOperator_IsNotEmpty extends QueryBuilderFilterOperator_IsEmpty {
+  override getLabel(filterConditionState: FilterConditionState): string {
+    return `is not empty`;
+  }
+
+  override buildFilterConditionExpression(
+    filterConditionState: FilterConditionState,
+  ): ValueSpecification {
+    return buildNotExpression(
+      filterConditionState.filterState.queryBuilderState.graphManagerState
+        .graph,
+      super.buildFilterConditionExpression(filterConditionState),
+    );
+  }
+
+  override buildFilterConditionState(
+    filterState: QueryBuilderFilterState,
+    expression: SimpleFunctionExpression,
+  ): FilterConditionState | undefined {
+    const innerExpression = unwrapNotExpression(expression);
+    return innerExpression
+      ? super.buildFilterConditionState(filterState, innerExpression)
+      : undefined;
+  }
+}

package/src/stores/filterOperators/QueryBuilderFilterOperator_LessThan.ts

@@ -0,0 +1,165 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  QueryBuilderFilterOperator,
+  type QueryBuilderFilterState,
+  type FilterConditionState,
+} from '../QueryBuilderFilterState.js';
+import {
+  PRIMITIVE_TYPE,
+  type ValueSpecification,
+  type SimpleFunctionExpression,
+  type AbstractPropertyExpression,
+  isSuperType,
+  SUPPORTED_FUNCTIONS,
+  buildPrimitiveInstanceValue,
+} from '@finos/legend-graph';
+import { UnsupportedOperationError } from '@finos/legend-shared';
+import {
+  buildFilterConditionState,
+  buildFilterConditionExpression,
+} from './QueryBuilderFilterOperatorHelper.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
+import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationBuilderHelper.js';
+import { getNonCollectionValueSpecificationType } from '../QueryBuilderOperatorsHelper.js';
+
+export class QueryBuilderFilterOperator_LessThan extends QueryBuilderFilterOperator {
+  getLabel(filterConditionState: FilterConditionState): string {
+    return '<';
+  }
+
+  isCompatibleWithFilterConditionProperty(
+    filterConditionState: FilterConditionState,
+  ): boolean {
+    const propertyType =
+      filterConditionState.propertyExpressionState.propertyExpression.func
+        .genericType.value.rawType;
+    return (
+      [
+        PRIMITIVE_TYPE.NUMBER,
+        PRIMITIVE_TYPE.INTEGER,
+        PRIMITIVE_TYPE.DECIMAL,
+        PRIMITIVE_TYPE.FLOAT,
+        PRIMITIVE_TYPE.DATE,
+        PRIMITIVE_TYPE.STRICTDATE,
+        PRIMITIVE_TYPE.DATETIME,
+      ] as string[]
+    ).includes(propertyType.path);
+  }
+
+  isCompatibleWithFilterConditionValue(
+    filterConditionState: FilterConditionState,
+  ): boolean {
+    const propertyType =
+      filterConditionState.propertyExpressionState.propertyExpression.func
+        .genericType.value.rawType;
+    const type = filterConditionState.value
+      ? getNonCollectionValueSpecificationType(filterConditionState.value)
+      : undefined;
+    const NUMERIC_PRIMITIVE_TYPES = [
+      PRIMITIVE_TYPE.NUMBER,
+      PRIMITIVE_TYPE.INTEGER,
+      PRIMITIVE_TYPE.DECIMAL,
+      PRIMITIVE_TYPE.FLOAT,
+    ] as string[];
+
+    const DATE_PRIMITIVE_TYPES = [
+      PRIMITIVE_TYPE.DATE,
+      PRIMITIVE_TYPE.DATETIME,
+      PRIMITIVE_TYPE.STRICTDATE,
+      PRIMITIVE_TYPE.LATESTDATE,
+    ] as string[];
+
+    // When changing the return type for LHS, the RHS value should be adjusted accordingly.
+    return (
+      type !== undefined &&
+      // Numeric value is handled loosely because of autoboxing
+      // e.g. LHS (integer) = RHS (float) is acceptable
+      ((NUMERIC_PRIMITIVE_TYPES.includes(type.path) &&
+        NUMERIC_PRIMITIVE_TYPES.includes(propertyType.path)) ||
+        // Date value is handled loosely as well if the LHS is of type DateTime
+        // This is because we would simulate auto-boxing for date by altering the
+        // Pure function used for the operation
+        // e.g. LHS(DateTime) = RHS(Date) -> we use isOnDay() instead of is()
+        (propertyType.path === PRIMITIVE_TYPE.DATETIME &&
+          DATE_PRIMITIVE_TYPES.includes(type.path)) ||
+        type === propertyType ||
+        isSuperType(propertyType, type))
+    );
+  }
+
+  getDefaultFilterConditionValue(
+    filterConditionState: FilterConditionState,
+  ): ValueSpecification | undefined {
+    const propertyType =
+      filterConditionState.propertyExpressionState.propertyExpression.func
+        .genericType.value.rawType;
+    switch (propertyType.path) {
+      case PRIMITIVE_TYPE.NUMBER:
+      case PRIMITIVE_TYPE.DECIMAL:
+      case PRIMITIVE_TYPE.FLOAT:
+      case PRIMITIVE_TYPE.INTEGER:
+      case PRIMITIVE_TYPE.DATE:
+      case PRIMITIVE_TYPE.STRICTDATE:
+      case PRIMITIVE_TYPE.DATETIME: {
+        return buildPrimitiveInstanceValue(
+          filterConditionState.filterState.queryBuilderState.graphManagerState
+            .graph,
+          propertyType.path,
+          generateDefaultValueForPrimitiveType(propertyType.path),
+        );
+      }
+      default:
+        throw new UnsupportedOperationError(
+          `Can't get default value for filter operator '${this.getLabel(
+            filterConditionState,
+          )}' when the LHS property is of type '${propertyType.path}'`,
+        );
+    }
+  }
+
+  buildFilterConditionExpression(
+    filterConditionState: FilterConditionState,
+  ): ValueSpecification {
+    return buildFilterConditionExpression(
+      filterConditionState,
+      filterConditionState.propertyExpressionState.propertyExpression.func
+        .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+        filterConditionState.value?.genericType?.value.rawType.path !==
+          PRIMITIVE_TYPE.DATETIME
+        ? SUPPORTED_FUNCTIONS.IS_BEFORE_DAY
+        : QUERY_BUILDER_SUPPORTED_FUNCTIONS.LESS_THAN,
+    );
+  }
+
+  buildFilterConditionState(
+    filterState: QueryBuilderFilterState,
+    expression: SimpleFunctionExpression,
+  ): FilterConditionState | undefined {
+    return buildFilterConditionState(
+      filterState,
+      expression,
+      (expression.parametersValues[0] as AbstractPropertyExpression).func
+        .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+        expression.parametersValues[1]?.genericType?.value.rawType.path !==
+          PRIMITIVE_TYPE.DATETIME
+        ? SUPPORTED_FUNCTIONS.IS_BEFORE_DAY
+        : QUERY_BUILDER_SUPPORTED_FUNCTIONS.LESS_THAN,
+      this,
+    );
+  }
+}