Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add convenience overloads to isValid() #55

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add convenience overloads to isValid() #55

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d40c383
Add overloads
jonaskello Jan 30, 2023
9a4ced0
Use correct comparer param
jonaskello Jan 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 48 additions & 1 deletion packages/property/src/property-filter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable @typescript-eslint/unified-signatures */
import { UnitMap } from "uom";
import * as PropertyValueSet from "./property-value-set";
import * as PropertyValue from "./property-value";
Expand Down Expand Up @@ -81,12 +82,58 @@ export function isSyntaxValid(
return true;
}

export const isValidFromString = (
properties: PropertyValueSet.PropertyValueSet | string,
filter: PropertyFilter | string,
unitLookup: UnitMap.UnitLookup,
comparer: PropertyValue.Comparer = PropertyValue.defaultComparer
): boolean => {
const pvs = typeof properties === "string" ? PropertyValueSet.fromString(properties, unitLookup) : properties;
const pf = typeof filter === "string" ? fromString(filter, unitLookup)! : filter;
return pf._evaluate(pvs, comparer);
};

export function isValid(
properties: PropertyValueSet.PropertyValueSet,
filter: PropertyFilter,
comparer?: PropertyValue.Comparer
): boolean;
export function isValid(
properties: string,
filter: PropertyFilter,
unitLookup: UnitMap.UnitLookup,
comparer?: PropertyValue.Comparer
): boolean;
export function isValid(
properties: PropertyValueSet.PropertyValueSet,
filter: string,
unitLookup: UnitMap.UnitLookup,
comparer?: PropertyValue.Comparer
): boolean;
export function isValid(
properties: string,
filter: string,
unitLookup: UnitMap.UnitLookup,
comparer?: PropertyValue.Comparer
): boolean;
export function isValid(
properties: PropertyValueSet.PropertyValueSet | string,
filter: PropertyFilter | string,
unitLookupOrComparer: UnitMap.UnitLookup | PropertyValue.Comparer = PropertyValue.defaultComparer,
comparer: PropertyValue.Comparer = PropertyValue.defaultComparer
): boolean {
return filter._evaluate(properties, comparer);
// All overloads that pass strings will also pass unitLookupOrComparer as a UnitLookup function
const pvs =
typeof properties === "string"
? PropertyValueSet.fromString(properties, unitLookupOrComparer as UnitMap.UnitLookup)
: properties;
const pf =
typeof filter === "string" ? fromStringOrEmpty(filter, unitLookupOrComparer as UnitMap.UnitLookup) : filter;
const cmp =
typeof properties === "string" || typeof filter === "string"
? comparer
: (unitLookupOrComparer as PropertyValue.Comparer);
return pf._evaluate(pvs, cmp);
}

export function isValidMatchMissing(
Expand Down