@jayesol/jayeson.model 2.1.0-beta.1205v2 → 2.1.1-beta2

package/lib/filter.js

@@ -1,832 +1 @@
-/**@author nt-quang
- * 
- * This file is used by DataFront to build a IDataFilter for an arbitrary connection.
- * It'll get the input from client and construct to a special class that DF can create an IDataFilter object.
- * 
- */
-
-var SportType = require("@jayesol/jayeson.lib.record").SportType;
-var LBType = require("@jayesol/jayeson.lib.record").LBType;
-var PivotType = require("@jayesol/jayeson.lib.record").PivotType;
-var OddType = require("@jayesol/jayeson.lib.record").OddType;
-var TargetType = require("@jayesol/jayeson.lib.record").TargetType;
-var PivotBias = require("@jayesol/jayeson.lib.record").PivotBias;
-
-/**
- * AbstractRule is equivalent to GeneralFilterRule in jayeson.model library
- * @param isNegated	negated		true: only accept established rule.
- * 							false: only accept the opposite of established rule.
- * @param nType	ruleType	the integer represents filter rule class in server.
- */
-function AbstractRule(isNegated, nType) {
-	var obj = {
-		negated: isNegated,
-		ruleType: nType
-	};
-	return obj;
-}
-
-
-/**
- * DurationRangeRule is the input for FilterRuleDeserializer 
- * in jayeson.model s an instance of DurationRangeFilterRule.
- * @param isNegated	
- * @param durationLower	int
- * @param durationUpper	int
- */
-function DurationRangeRule(isNegated, durationLower, durationUpper) {
-	var obj = AbstractRule(isNegated, 1);
-	obj.durationLower = durationLower;
-	obj.durationUpper = durationUpper;
-	return obj;
-}
-
-/**
- * LayBackFilterRule is the input for FilterRuleDeserializer 
- * in jayeson.model s an instance of LayBackFilterRule.
- * member variables : types is an array that contains LBType
- * @param isNegated	
- */
-function LayBackFilterRule(isNegated) {
-	var obj = AbstractRule(isNegated, 2);
-	obj.types = new Array();
-	obj.addType = function (type) {
-		this.types[this.types.length] = LBType[type];
-	};
-	obj.removeType = function (index) {
-		this.types.splice(index, 1);
-	};
-	return obj;
-}
-
-/**
- * LeagueKeywordFilterRule is the input for FilterRuleDeserializer 
- * in jayeson.model s an instance of LeagueKeywordFilterRule.
- * member variables : includeKeywords, excludeKeywords is an array that contains String
- * @param isNegated	
- */
-function LeagueKeywordFilterRule(isNegated) {
-	var obj = AbstractRule(isNegated, 3);
-	obj.includeKeywords = new Array();
-	obj.excludeKeywords = new Array();
-
-	obj.addIncludeKeyword = function (keyword) {
-		this.includeKeywords[this.includeKeywords.length] = keyword.toLowerCase();
-	};
-	obj.removeIncludeKeyword = function (index) {
-		this.includeKeywords.splice(index, 1);
-	};
-
-	obj.addExcludeKeyword = function (keyword) {
-		this.excludeKeywords[this.excludeKeywords.length] = keyword.toLowerCase();
-	};
-	obj.removeExcludeKeyword = function (index) {
-		this.excludeKeywords.splice(index, 1);
-	};
-	return obj;
-}
-
-/**
- * MarketFilterRule is the input for FilterRuleDeserializer 
- * in jayeson.model s an instance of MarketFilterRule.
- * member variables : monitorMarketType is an OddType
- * @param isNegated	
- * @param oddType	OddType
- */
-function MarketFilterRule(isNegated, oddType) {
-	var obj = AbstractRule(isNegated, 4);
-	obj.monitorMarketType = OddType[oddType];
-	return obj;
-}
-
-/**
- * PivotTypeFilterRule is the input for FilterRuleDeserializer 
- * in jayeson.model s an instance of PivotTypeFilterRule.
- * member variables : types is an array that contains PivotType
- * @param isNegated	
- */
-function PivotTypeFilterRule(isNegated) {
-	var obj = AbstractRule(isNegated, 5);
-	obj.types = new Array();
-	obj.addType = function (type) {
-		this.types[this.types.length] = PivotType[type];
-	};
-	obj.removeType = function (index) {
-		this.types.splice(index, 1);
-	};
-
-	return obj;
-}
-
-/**
- * RedcardFilterRule is the input for FilterRuleDeserializer 
- * in jayeson.model s an instance of RedcardFilterRule.
- * @param isNegated			
- * @param operator	FilterOperator
- * @param subject	OperatorSubject
- * @param expelled	int
- */
-function RedcardFilterRule(isNegated, operator, subject, expelled) {
-	var obj = AbstractRule(isNegated, 6);
-	obj.operator = FilterOperator[operator];
-	obj.subject = OperatorSubject[subject];
-	obj.expelled = expelled;
-	return obj;
-}
-
-/**
- * ScoreFilterRule is the input for FilterRuleDeserializer 
- * in jayeson.model s an instance of ScoreFilterRule.
- * @param isNegated	
- * @param operator	FilterOperator
- * @param subject	OperatorSubject
- * @param score		int
- */
-function ScoreFilterRule(isNegated, operator, subject, score) {
-	var obj = AbstractRule(isNegated, 7);
-	obj.operator = FilterOperator[operator];
-	obj.subject = OperatorSubject[subject];
-	obj.score = score;
-	return obj;
-}
-
-/**
- * TargetFilterRule is the input for FilterRuleDeserializer 
- * in jayeson.model s an instance of TargetFilterRule.
- * member variables : targetType is an TargetType
- * @param isNegated	
- * @param targetType TargetType
- */
-function TargetFilterRule(isNegated, targetType) {
-	var obj = AbstractRule(isNegated, 8);
-	obj.targetType = TargetType[targetType];
-	return obj;
-}
-
-/**
- * TeamKeywordFilterRule is the input for FilterRuleDeserializer 
- * in jayeson.model s an instance of TeamKeywordFilterRule.
- * member variables : includeKeywords, excludeKeywords is an array that contains String
- * @param isNegated	
- */
-function TeamKeywordFilterRule(isNegated) {
-	var obj = AbstractRule(isNegated, 9);
-	obj.includeKeywords = new Array();
-	obj.excludeKeywords = new Array();
-
-	obj.addIncludeKeyword = function (keyword) {
-		this.includeKeywords[this.includeKeywords.length] = keyword.toLowerCase();
-	};
-	obj.removeIncludeKeyword = function (index) {
-		this.includeKeywords.splice(index, 1);
-	};
-
-	obj.addExcludeKeyword = function (keyword) {
-		this.excludeKeywords[this.excludeKeywords.length] = keyword.toLowerCase();
-	};
-	obj.removeExcludeKeyword = function (index) {
-		this.excludeKeywords.splice(index, 1);
-	};
-	return obj;
-}
-
-/**
- * CompanyKeywordFilterRule is the input for FilterRuleDeserializer 
- * in jayeson.model s an instance of CompanyKeywordFilterRule.
- * member variables : includeKeywords, excludeKeywords is an array that contains String
- * @param isNegated	
- * @returns 
- */
-function CompanyFilterRule(isNegated) {
-	var obj = AbstractRule(isNegated, 10);
-	obj.includeCompanies = new Array();
-	obj.excludeCompanies = new Array();
-
-	obj.addIncludeCompany = function (company) {
-		this.includeCompanies[this.includeCompanies.length] = company.toLowerCase();
-	};
-	obj.removeIncludeCompany = function (index) {
-		this.includeCompanies.splice(index, 1);
-	};
-
-	obj.addExcludeCompany = function (company) {
-		this.excludeCompanies[this.excludeCompanies.length] = company.toLowerCase();
-	};
-	obj.removeExcludeCompany = function (index) {
-		this.excludeCompanies.splice(index, 1);
-	};
-	return obj;
-}
-
-/**
- * RecordSelectorFilterRule is the input for FilterRuleDeserializer 
- * in jayeson.model s an instance of RecordSelectorFilterRule.
- * @param isNegated	
- * @param eventId		
- * @param recordId			
- * @param companyId	
- */
-function RecordSelectorFilterRule(isNegated, matchId, eventId, recordId, companyId) {
-	var obj = AbstractRule(isNegated, 11);
-	obj.matchId = matchId;
-	obj.eventId = eventId;
-	obj.recordId = recordId;
-	obj.companyId = companyId;
-	return obj;
-}
-
-/**
- * TimeTypeFilterRule is the input for FilterRuleDeserializer 
- * in jayeson.model s an instance of TimeTypeFilterRule.
- * member variables : types is an array that contains TimeType
- * @param isNegated	
- */
-function TimeTypeFilterRule(isNegated) {
-	var obj = AbstractRule(isNegated, 12);
-	obj.types = new Array();
-	obj.addType = function (type) {
-		this.types[this.types.length] = type;
-	};
-	obj.removeType = function (index) {
-		this.types.splice(index, 1);
-	};
-
-	return obj;
-}
-
-/**
- * OddAvailabilityFilterRule is the input for FilterRuleDeserializer 
- * in jayeson.model s an instance of OddAvailabilityFilterRule.
- * @param isNegated	negated
- * @param oddTypes
- * @param timeTypes	
- * @param pivotTypes
- */
-function OddAvailabilityFilterRule(isNegated) {
-	var obj = AbstractRule(isNegated, 13);
-
-	obj.oddTypes = new Array();
-	obj.addOddType = function (type) {
-		this.oddTypes[this.oddTypes.length] = OddType[type];
-	};
-	obj.removeOddType = function (index) {
-		this.oddTypes.splice(index, 1);
-	};
-
-	obj.timeTypes = new Array();
-	obj.addTimeType = function (type) {
-		this.timeTypes[this.timeTypes.length] = type;
-	};
-	obj.removeTimeType = function (index) {
-		this.timeTypes.splice(index, 1);
-	};
-
-	obj.pivotTypes = new Array();
-	obj.addPivotType = function (type) {
-		this.pivotTypes[this.pivotTypes.length] = PivotType[type];
-	};
-	obj.removePivotType = function (index) {
-		this.pivotTypes.splice(index, 1);
-	};
-
-	obj.companies = new Array();
-	obj.addCompany = function (company) {
-		var upperCase = company.toUpperCase();
-		if (this.companies.indexOf(upperCase) < 0) {
-			obj.companies.push(upperCase);
-		}
-	}
-
-	obj.removeCompany = function (index) {
-		obj.companies.splice(index, 1);
-	}
-
-	return obj;
-}
-
-/**
- * EventIdFilterRule is the input for FilterRuleDeserializer 
- * in jayeson.model s an instance of EventIdFilterRule.
- * @param isNegated	
- * @param eventId		
- */
-function EventIdFilterRule(isNegated, eventId) {
-	var obj = AbstractRule(isNegated, 14);
-	obj.eventId = eventId;
-	return obj;
-}
-
-/**
- * OddTypeFilterRule is the input for FilterRuleDeserializer 
- * in jayeson.model s an instance of OddTypeFilterRule.
- * member variables : oddTypes is a list of OddType
- * @param isNegated	
- * @param oddTypes
- */
-function OddTypeFilterRule(isNegated) {
-	var obj = AbstractRule(isNegated, 15);
-	obj.oddTypes = new Array();
-	obj.addType = function (type) {
-		this.oddTypes[this.oddTypes.length] = OddType[type];
-	};
-	obj.removeType = function (index) {
-		this.oddTypes.splice(index, 1);
-	};
-
-	return obj;
-}
-
-/**
- * StartTimeRangeFilterRule is the input for FilterRuleDeserializer 
- * in jayeson.model s an instance of StartTimeRangeFilterRule.
- * @param isNegated	
- * @param startTimeLower in second
- * @param startTimeUpper in second
- */
-
-function StartTimeRangeFilterRule(isNegated, startTimeLower, startTimeUpper) {
-	var obj = AbstractRule(isNegated, 16);
-	obj.startTimeLower = startTimeLower;
-	obj.startTimeUpper = startTimeUpper;
-	return obj;
-}
-
-/**
- * RelativeStartTimeRangeFilterRule is the input for FilterRuleDeserializer 
- * in jayeson.model s an instance of RelativeStartTimeRangeFilterRule.
- * 
- * It will not have a baseTime field as the base time will be the next 12pm
- * set in the relayer based on the relayer host's time.
- * @param isNegated	
- * @param startTimeLower in second
- * @param startTimeUpper in second
- */
-
-function RelativeStartTimeRangeFilterRule(isNegated, startTimeLower, startTimeUpper) {
-	var obj = AbstractRule(isNegated, 17);
-	obj.startTimeLower = startTimeLower;
-	obj.startTimeUpper = startTimeUpper;
-	return obj;
-}
-
-
-/**
- * Group all available rules in a namespace
- */
-function RuleCombination(ns) {
-	var obj = {
-		namespace: ns,
-		filterRules: new Array(),
-		addRule: function (rule) {
-			this.filterRules[this.filterRules.length] = rule;
-		},
-		removeRule: function (index) {
-			this.filterRules.splice(index, 1);
-		}
-	};
-	return obj;
-}
-
-/**
- * @properties 	namespace 	specify which namespace of filter.
- * 				filterRules	a list of integer that represent for ruleType.
- * @usage		use the class to build a message sent to DF so that DF remove the 
- * 				corresponding filterRule.
- */
-function RemoveFilterRulesMessage(ns) {
-	var obj = {
-		namespace: ns,
-		filterRules: new Array(),
-
-		addRule: function (rule) {
-			this.filterRules[this.filterRules.length] = rule;
-		},
-		removeRule: function (index) {
-			this.filterRules.splice(index, 1);
-		},
-		getRule: function (index) {
-			return this.filterRules[index];
-		}
-	};
-	return obj;
-};
-
-
-/**
- * ExactLeagueFilterRule is the input for FilterRuleDeserializer 
- * in jayeson.model s an instance of ExactLeagueFilterRule.
- * member variables : includeLeagues is a set of unique league names that we want to include. If the set is empty, it means we want to include all leagues
- * @param isNegated	
- */
-function ExactLeagueFilterRule(isNegated) {
-	var obj = AbstractRule(isNegated, 18);
-	obj.includeLeagues = new Array();
-
-
-	obj.addLeague = function (league) {
-		if (this.includeLeagues.indexOf(league) < 0) {
-			this.includeLeagues.push(league);
-		}
-	};
-	obj.removeLeague = function (league) {
-		var index = this.includeLeagues.indexOf(league);
-		if (index >= 0) {
-			this.includeLeagues.splice(index, 1);
-		}
-	};
-
-	return obj;
-};
-
-/**
- * EventTypeFilterRule is the input for FilterRuleDeserializer 
- * in jayeson.model it is an instance of EventTypeFilterRule.
- * member variables : eventTypes is a set of unique EventTypes. If the set is empty, it means we want to include all event types.
- * @param isNegated	
- */
-function EventTypeFilterRule(isNegated) {
-	var obj = AbstractRule(isNegated, 19);
-	obj.eventTypes = new Array();
-	obj.addEventType = function (eventType) {
-		if (this.eventTypes.indexOf(eventType) < 0) {
-			this.eventTypes.push(eventType);
-		}
-	};
-	obj.removeEventType = function (eventType) {
-		var index = this.eventTypes.indexOf(eventType);
-		if (index >= 0) {
-			this.eventTypes.splice(index, 1);
-		}
-	};
-
-	return obj;
-};
-
-/**
- * TimePivotTypeFilterRule the input for FilterRuleDeserializer 
- * in jayeson.model it is an instance of TimePivotTypeFilterRule.
- * member variables : timePivotTypes is a set of unique object {timeType: <timeType>, pivotType: <pivotType>}. If the set is timePivotTypes, it means we want to include all time_ pivot_type combination
- * @param isNegated	
- */
-function TimePivotTypeFilterRule(isNegated) {
-	var obj = AbstractRule(isNegated, 20);
-	obj.timePivotTypes = new Array();
-	obj.addTimePivotType = function (timeType, pivotType) {
-		pivotType = PivotType[pivotType];
-		if (this.findIndex(timeType, pivotType) < 0) {
-			this.timePivotTypes.push({
-				timeType: timeType,
-				pivotType: pivotType
-			});
-		}
-	};
-
-	obj.removeTimePivotType = function (timeType, pivotType) {
-		var index = this.findIndex(timeType, pivotType);
-		if (index >= 0) {
-			this.timePivotTypes.splice(index, 1);
-		}
-	};
-
-	obj.findIndex = function (timeType, pivotType) {
-		var foundIndex = -1;
-		pivotType = PivotType[pivotType];
-		sportType = timeType.sportType();
-		name = timeType.name();
-		this.timePivotTypes.forEach(function (value, index) {
-			if (value.timeType.sportType() === sportType && value.timeType.name() === name && value.pivotType === pivotType) {
-				foundIndex = index;
-			}
-		})
-		return foundIndex;
-	}
-
-	return obj;
-};
-
-
-/**
- * EventAutoInclusionFilterRule the input for FilterRuleDeserializer 
- * in jayeson.model it is an instance of EventAutoInclusionFilterRule
- *
- * @param isNegated	
- */
-function EventAutoInclusionFilterRule(isNegated) {
-	var obj = AbstractRule(isNegated, 21);
-	obj.leagues = new Array();//store league id, currently we use league name's hash code
-	obj.matchEventIds = new Array();
-
-	obj.addLeague = function (leagueCode) {
-		if (this.leagues.indexOf(leagueCode) < 0) {
-			this.leagues.push(leagueCode);
-		}
-	};
-
-	obj.removeLeague = function (leagueCode) {
-		var index = this.leagues.indexOf(leagueCode)
-		if (index >= 0) {
-			this.leagues.splice(index, 1);
-		}
-	};
-
-	obj.addMatchEventId = function (matchId, eventId) {
-		if (this.findIndex(matchId, eventId) < 0) {
-			this.matchEventIds.push({
-				matchId: matchId,
-				eventId: eventId
-			});
-		}
-	};
-
-	obj.removeMatchEventId = function (matchId, eventId) {
-		var index = this.findIndex(matchId, eventId);
-		if (index >= 0) {
-			this.matchEventIds.splice(index, 1);
-		}
-	};
-
-	obj.findIndex = function (matchId, eventId) {
-		var foundIndex = -1;
-		this.matchEventIds.forEach(function (value, index) {
-			if (value.matchId === matchId && value.eventId === eventId) {
-				foundIndex = index;
-			}
-		})
-		return foundIndex;
-	}
-
-	return obj;
-}
-
-
-/**
- * SportFilterRule the input for FilterRuleDeserializer 
- * in jayeson.model it is an instance of SportFilterRule
- *
- * @param isNegated	
- */
-function SportFilterRule(isNegated) {
-	var obj = AbstractRule(isNegated, 22);
-
-	obj.sportTypes = new Array();
-
-	obj.addSport = function(sportType) {
-		this.sportTypes.push(SportType[sportType]);
-	};
-
-	obj.removeSport = function (index) {
-		this.sportTypes.splice(index, 1);
-	};
-
-	return obj;
-}
-
-
-/**
- * LeagueTeamRegexFilterRule will have a property call includeRegex. It will
- * pass all matches that have league or team name that satisfied the regex. if
- * the regex is null or empty, return true (consider passed)
- * 
- * @param isNegated
- * @param regex
- */
-function LeagueTeamRegexFilterRule(isNegated, regex){
-	var obj = AbstractRule(isNegated, 23);
-
-	obj.includeRegex = regex;
-
-	return obj;
-}
-
-/**
- * MatchSelectorFilterRule filters for a specific record using matchId, eventId
- * and recordId.
- *
- * @param isNegated
- * @param matchId
- * @param eventId
- * @param recordId
- */
-function MatchSelectorFilterRule(isNegated, matchId, eventId, recordId) {
-	var obj = AbstractRule(isNegated, 24);
-
-	obj.matchId = matchId;
-	obj.eventId = eventId;
-	obj.recordId = recordId;
-
-	return obj;
-}
-
-
-/**
- * PivotBiasFilterRule filters based on the pivot bias of the record.
- *
- * @param isNegated
- */
-function PivotBiasFilterRule(isNegated) {
-	var obj = AbstractRule(isNegated, 25);
-
-	obj.pivotBiases = new Array();
-
-	obj.addPivotBias = function(pivotBias) {
-		this.pivotBiases.push(PivotBias[pivotBias]);
-	};
-
-	obj.removePivotBias = function (index) {
-		this.pivotBiases.splice(index, 1);
-	};
-
-	return obj;
-}
-
-/**
- * MatchIdFilterRule is the input for FilterRuleDeserializer 
- * in jayeson.model s an instance of MatchIdFilterRule.
- * @param isNegated	
- * @param matchId		
- */
-function MatchIdFilterRule(isNegated, matchId) {
-	var obj = AbstractRule(isNegated, 26);
-	obj.matchId = matchId;
-	return obj;
-}
-
-/**
- * LeagueHashCodeFilterRule filters matches using the hashcode of their
- * league names.
- *
- * @param isNegated	
- */
-function LeagueHashCodeFilterRule(isNegated) {
-	var obj = AbstractRule(isNegated, 27);
-	obj.leagueHashCodes = new Array();//store league id, currently we use league name's hash code string
-
-	obj.addLeagueCode = function (leagueCode) {
-		if (this.leagueHashCodes.indexOf(leagueCode) < 0) {
-			this.leagueHashCodes.push(leagueCode);
-		}
-	};
-
-	obj.removeLeagueCode = function (leagueCode) {
-		var index = this.leagueHashCodes.indexOf(leagueCode)
-		if (index >= 0) {
-			this.leagueHashCodes.splice(index, 1);
-		}
-	};
-
-	return obj;
-}
-
-/**
- * MatchEventIdFilterRule filters events by testing their
- * event ids and match ids against those defined in this rule.
- *
- * @param isNegated	
- */
-function MatchEventIdFilterRule(isNegated) {
-	var obj = AbstractRule(isNegated, 28);
-	obj.ids = new Array();
-
-	obj.addMatchEventId = function (matchId, eventId) {
-		if (this.findIndex(matchId, eventId) < 0) {
-			this.ids.push({
-				matchId: matchId,
-				eventId: eventId
-			});
-		}
-	};
-
-	obj.removeMatchEventId = function (matchId, eventId) {
-		var index = this.findIndex(matchId, eventId);
-		if (index >= 0) {
-			this.ids.splice(index, 1);
-		}
-	};
-
-	obj.findIndex = function (matchId, eventId) {
-		var foundIndex = -1;
-		this.ids.forEach(function (value, index) {
-			if (value.matchId === matchId && value.eventId === eventId) {
-				foundIndex = index;
-			}
-		})
-		return foundIndex;
-	}
-
-
-	return obj;
-}
-
-/**
- * MatchAutoInclusionFilterRule filters for matches with specific match ids
- * or belonging to specific leagues.
- *
- * @param isNegated	
- */
-function MatchAutoInclusionFilterRule(isNegated) {
-	var obj = AbstractRule(isNegated, 29);
-	obj.leagues = new Array();//store league id, currently we use league name's hash code
-	obj.matchIds = new Array();
-
-	obj.addLeague = function (leagueCode) {
-		if (this.leagues.indexOf(leagueCode) < 0) {
-			this.leagues.push(leagueCode);
-		}
-	};
-
-	obj.removeLeague = function (leagueCode) {
-		var index = this.leagues.indexOf(leagueCode)
-		if (index >= 0) {
-			this.leagues.splice(index, 1);
-		}
-	};
-
-	obj.addMatchId = function (matchId) {
-		if (this.findIndex(matchId) < 0) {
-			this.matchIds.push(matchId);
-		}
-	};
-
-	obj.removeMatchId = function (matchId) {
-		var index = this.findIndex(matchId);
-		if (index >= 0) {
-			this.matchIds.splice(index, 1);
-		}
-	};
-
-	obj.findIndex = function (matchId) {
-		var foundIndex = -1;
-
-		var len = this.matchIds.length;
-		for (var i = 0; i < len; i++) {
-			if (this.matchIds[i] === matchId) {
-				return i;
-			}
-		}
-
-		return foundIndex;
-	}
-
-	return obj;
-}
-
-var FilterOperator;
-(function (FilterOperator) {
-    FilterOperator[FilterOperator["FILTER_IGNORED"] = 0] = "FILTER_IGNORED";
-    FilterOperator[FilterOperator["FILTER_LARGER"] = 1] = "FILTER_LARGER";
-    FilterOperator[FilterOperator["FILTER_LARGER_EQUAL"] = 2] = "FILTER_LARGER_EQUAL";
-    FilterOperator[FilterOperator["FILTER_EQUAL"] = 3] = "FILTER_EQUAL";
-    FilterOperator[FilterOperator["FILTER_SMALLER_EQUAL"] = 4] = "FILTER_SMALLER_EQUAL";
-    FilterOperator[FilterOperator["FILTER_SMALLER"] = 5] = "FILTER_SMALLER";
-})(FilterOperator = exports.FilterOperator || (exports.FilterOperator = {}));
-
-var OperatorSubject;
-(function (OperatorSubject) {
-    OperatorSubject[OperatorSubject["HOST"] = 0] = "HOST";
-    OperatorSubject[OperatorSubject["GUEST"] = 1] = "GUEST";
-    OperatorSubject[OperatorSubject["FAVORED"] = 2] = "FAVORED";
-    OperatorSubject[OperatorSubject["UNDERDOG"] = 3] = "UNDERDOG";
-    OperatorSubject[OperatorSubject["DIFFERENCE"] = 4] = "DIFFERENCE";
-    OperatorSubject[OperatorSubject["HOST_LEADING"] = 5] = "HOST_LEADING";
-    OperatorSubject[OperatorSubject["GUEST_LEADING"] = 6] = "GUEST_LEADING";
-    OperatorSubject[OperatorSubject["FAVORED_LEADING"] = 7] = "FAVORED_LEADING";
-    OperatorSubject[OperatorSubject["UNDERDOG_LEADING"] = 8] = "UNDERDOG_LEADING";
-    OperatorSubject[OperatorSubject["TOTAL"] = 9] = "TOTAL";
-})(OperatorSubject = exports.OperatorSubject || (exports.OperatorSubject = {}));
-
-module.exports = {
-	AbstractRule: AbstractRule,
-	DurationRangeRule: DurationRangeRule,
-	LayBackFilterRule: LayBackFilterRule,
-	LeagueKeywordFilterRule: LeagueKeywordFilterRule,
-	MarketFilterRule: MarketFilterRule,
-	PivotTypeFilterRule: PivotTypeFilterRule,
-	RedcardFilterRule: RedcardFilterRule,
-	ScoreFilterRule: ScoreFilterRule,
-	TargetFilterRule: TargetFilterRule,
-	TeamKeywordFilterRule: TeamKeywordFilterRule,
-	CompanyFilterRule: CompanyFilterRule,
-	TimeTypeFilterRule: TimeTypeFilterRule,
-	RecordSelectorFilterRule: RecordSelectorFilterRule,
-	OddAvailabilityFilterRule: OddAvailabilityFilterRule,
-	EventIdFilterRule: EventIdFilterRule,
-	OddTypeFilterRule: OddTypeFilterRule,
-	StartTimeRangeFilterRule: StartTimeRangeFilterRule,
-	RelativeStartTimeRangeFilterRule: RelativeStartTimeRangeFilterRule,
-	RuleCombination: RuleCombination,
-	RemoveFilterRulesMessage: RemoveFilterRulesMessage,
-	ExactLeagueFilterRule: ExactLeagueFilterRule,
-	EventTypeFilterRule: EventTypeFilterRule,
-	TimePivotTypeFilterRule: TimePivotTypeFilterRule,
-	EventAutoInclusionFilterRule: EventAutoInclusionFilterRule,
-	SportFilterRule: SportFilterRule,
-	LeagueTeamRegexFilterRule: LeagueTeamRegexFilterRule,
-	MatchSelectorFilterRule: MatchSelectorFilterRule,
-	PivotBiasFilterRule: PivotBiasFilterRule,
-	MatchIdFilterRule: MatchIdFilterRule,
-	LeagueHashCodeFilterRule: LeagueHashCodeFilterRule,
-	MatchEventIdFilterRule: MatchEventIdFilterRule,
-	MatchAutoInclusionFilterRule: MatchAutoInclusionFilterRule,
-	FilterOperator: FilterOperator,
-	OperatorSubject: OperatorSubject
-};
+var FilterOperator,OperatorSubject,SportType=require("@jayesol/jayeson.lib.record").SportType,LBType=require("@jayesol/jayeson.lib.record").LBType,PivotType=require("@jayesol/jayeson.lib.record").PivotType,OddType=require("@jayesol/jayeson.lib.record").OddType,TargetType=require("@jayesol/jayeson.lib.record").TargetType,PivotBias=require("@jayesol/jayeson.lib.record").PivotBias;function AbstractRule(e,t){return{negated:e,ruleType:t}}function DurationRangeRule(e,t,r){var i=AbstractRule(e,1);return i.durationLower=t,i.durationUpper=r,i}function LayBackFilterRule(e){var t=AbstractRule(e,2);return t.types=new Array,t.addType=function(e){this.types[this.types.length]=LBType[e]},t.removeType=function(e){this.types.splice(e,1)},t}function LeagueKeywordFilterRule(e){var t=AbstractRule(e,3);return t.includeKeywords=new Array,t.excludeKeywords=new Array,t.addIncludeKeyword=function(e){this.includeKeywords[this.includeKeywords.length]=e.toLowerCase()},t.removeIncludeKeyword=function(e){this.includeKeywords.splice(e,1)},t.addExcludeKeyword=function(e){this.excludeKeywords[this.excludeKeywords.length]=e.toLowerCase()},t.removeExcludeKeyword=function(e){this.excludeKeywords.splice(e,1)},t}function MarketFilterRule(e,t){var r=AbstractRule(e,4);return r.monitorMarketType=OddType[t],r}function PivotTypeFilterRule(e){var t=AbstractRule(e,5);return t.types=new Array,t.addType=function(e){this.types[this.types.length]=PivotType[e]},t.removeType=function(e){this.types.splice(e,1)},t}function RedcardFilterRule(e,t,r,i){var n=AbstractRule(e,6);return n.operator=FilterOperator[t],n.subject=OperatorSubject[r],n.expelled=i,n}function ScoreFilterRule(e,t,r,i){var n=AbstractRule(e,7);return n.operator=FilterOperator[t],n.subject=OperatorSubject[r],n.score=i,n}function TargetFilterRule(e,t){var r=AbstractRule(e,8);return r.targetType=TargetType[t],r}function TeamKeywordFilterRule(e){var t=AbstractRule(e,9);return t.includeKeywords=new Array,t.excludeKeywords=new Array,t.addIncludeKeyword=function(e){this.includeKeywords[this.includeKeywords.length]=e.toLowerCase()},t.removeIncludeKeyword=function(e){this.includeKeywords.splice(e,1)},t.addExcludeKeyword=function(e){this.excludeKeywords[this.excludeKeywords.length]=e.toLowerCase()},t.removeExcludeKeyword=function(e){this.excludeKeywords.splice(e,1)},t}function CompanyFilterRule(e){var t=AbstractRule(e,10);return t.includeCompanies=new Array,t.excludeCompanies=new Array,t.addIncludeCompany=function(e){this.includeCompanies[this.includeCompanies.length]=e.toLowerCase()},t.removeIncludeCompany=function(e){this.includeCompanies.splice(e,1)},t.addExcludeCompany=function(e){this.excludeCompanies[this.excludeCompanies.length]=e.toLowerCase()},t.removeExcludeCompany=function(e){this.excludeCompanies.splice(e,1)},t}function RecordSelectorFilterRule(e,t,r,i,n){var u=AbstractRule(e,11);return u.matchId=t,u.eventId=r,u.recordId=i,u.companyId=n,u}function TimeTypeFilterRule(e){var t=AbstractRule(e,12);return t.types=new Array,t.addType=function(e){this.types[this.types.length]=e},t.removeType=function(e){this.types.splice(e,1)},t}function OddAvailabilityFilterRule(e){var t=AbstractRule(e,13);return t.oddTypes=new Array,t.addOddType=function(e){this.oddTypes[this.oddTypes.length]=OddType[e]},t.removeOddType=function(e){this.oddTypes.splice(e,1)},t.timeTypes=new Array,t.addTimeType=function(e){this.timeTypes[this.timeTypes.length]=e},t.removeTimeType=function(e){this.timeTypes.splice(e,1)},t.pivotTypes=new Array,t.addPivotType=function(e){this.pivotTypes[this.pivotTypes.length]=PivotType[e]},t.removePivotType=function(e){this.pivotTypes.splice(e,1)},t.companies=new Array,t.addCompany=function(e){var r=e.toUpperCase();this.companies.indexOf(r)<0&&t.companies.push(r)},t.removeCompany=function(e){t.companies.splice(e,1)},t}function EventIdFilterRule(e,t){var r=AbstractRule(e,14);return r.eventId=t,r}function OddTypeFilterRule(e){var t=AbstractRule(e,15);return t.oddTypes=new Array,t.addType=function(e){this.oddTypes[this.oddTypes.length]=OddType[e]},t.removeType=function(e){this.oddTypes.splice(e,1)},t}function StartTimeRangeFilterRule(e,t,r){var i=AbstractRule(e,16);return i.startTimeLower=t,i.startTimeUpper=r,i}function RelativeStartTimeRangeFilterRule(e,t,r){var i=AbstractRule(e,17);return i.startTimeLower=t,i.startTimeUpper=r,i}function RuleCombination(e){return{namespace:e,filterRules:new Array,addRule:function(e){this.filterRules[this.filterRules.length]=e},removeRule:function(e){this.filterRules.splice(e,1)}}}function RemoveFilterRulesMessage(e){return{namespace:e,filterRules:new Array,addRule:function(e){this.filterRules[this.filterRules.length]=e},removeRule:function(e){this.filterRules.splice(e,1)},getRule:function(e){return this.filterRules[e]}}}function ExactLeagueFilterRule(e){var t=AbstractRule(e,18);return t.includeLeagues=new Array,t.addLeague=function(e){this.includeLeagues.indexOf(e)<0&&this.includeLeagues.push(e)},t.removeLeague=function(e){var t=this.includeLeagues.indexOf(e);t>=0&&this.includeLeagues.splice(t,1)},t}function EventTypeFilterRule(e){var t=AbstractRule(e,19);return t.eventTypes=new Array,t.addEventType=function(e){this.eventTypes.indexOf(e)<0&&this.eventTypes.push(e)},t.removeEventType=function(e){var t=this.eventTypes.indexOf(e);t>=0&&this.eventTypes.splice(t,1)},t}function TimePivotTypeFilterRule(e){var t=AbstractRule(e,20);return t.timePivotTypes=new Array,t.addTimePivotType=function(e,t){t=PivotType[t],this.findIndex(e,t)<0&&this.timePivotTypes.push({timeType:e,pivotType:t})},t.removeTimePivotType=function(e,t){var r=this.findIndex(e,t);r>=0&&this.timePivotTypes.splice(r,1)},t.findIndex=function(e,t){var r=-1;return t=PivotType[t],sportType=e.sportType(),name=e.name(),this.timePivotTypes.forEach(function(e,i){e.timeType.sportType()===sportType&&e.timeType.name()===name&&e.pivotType===t&&(r=i)}),r},t}function EventAutoInclusionFilterRule(e){var t=AbstractRule(e,21);return t.leagues=new Array,t.matchEventIds=new Array,t.addLeague=function(e){this.leagues.indexOf(e)<0&&this.leagues.push(e)},t.removeLeague=function(e){var t=this.leagues.indexOf(e);t>=0&&this.leagues.splice(t,1)},t.addMatchEventId=function(e,t){this.findIndex(e,t)<0&&this.matchEventIds.push({matchId:e,eventId:t})},t.removeMatchEventId=function(e,t){var r=this.findIndex(e,t);r>=0&&this.matchEventIds.splice(r,1)},t.findIndex=function(e,t){var r=-1;return this.matchEventIds.forEach(function(i,n){i.matchId===e&&i.eventId===t&&(r=n)}),r},t}function SportFilterRule(e){var t=AbstractRule(e,22);return t.sportTypes=new Array,t.addSport=function(e){this.sportTypes.push(SportType[e])},t.removeSport=function(e){this.sportTypes.splice(e,1)},t}function LeagueTeamRegexFilterRule(e,t){var r=AbstractRule(e,23);return r.includeRegex=t,r}function MatchSelectorFilterRule(e,t,r,i){var n=AbstractRule(e,24);return n.matchId=t,n.eventId=r,n.recordId=i,n}function PivotBiasFilterRule(e){var t=AbstractRule(e,25);return t.pivotBiases=new Array,t.addPivotBias=function(e){this.pivotBiases.push(PivotBias[e])},t.removePivotBias=function(e){this.pivotBiases.splice(e,1)},t}function MatchIdFilterRule(e,t){var r=AbstractRule(e,26);return r.matchId=t,r}function LeagueHashCodeFilterRule(e){var t=AbstractRule(e,27);return t.leagueHashCodes=new Array,t.addLeagueCode=function(e){this.leagueHashCodes.indexOf(e)<0&&this.leagueHashCodes.push(e)},t.removeLeagueCode=function(e){var t=this.leagueHashCodes.indexOf(e);t>=0&&this.leagueHashCodes.splice(t,1)},t}function MatchEventIdFilterRule(e){var t=AbstractRule(e,28);return t.ids=new Array,t.addMatchEventId=function(e,t){this.findIndex(e,t)<0&&this.ids.push({matchId:e,eventId:t})},t.removeMatchEventId=function(e,t){var r=this.findIndex(e,t);r>=0&&this.ids.splice(r,1)},t.findIndex=function(e,t){var r=-1;return this.ids.forEach(function(i,n){i.matchId===e&&i.eventId===t&&(r=n)}),r},t}function MatchAutoInclusionFilterRule(e){var t=AbstractRule(e,29);return t.leagues=new Array,t.matchIds=new Array,t.addLeague=function(e){this.leagues.indexOf(e)<0&&this.leagues.push(e)},t.removeLeague=function(e){var t=this.leagues.indexOf(e);t>=0&&this.leagues.splice(t,1)},t.addMatchId=function(e){this.findIndex(e)<0&&this.matchIds.push(e)},t.removeMatchId=function(e){var t=this.findIndex(e);t>=0&&this.matchIds.splice(t,1)},t.findIndex=function(e){for(var t=this.matchIds.length,r=0;r<t;r++)if(this.matchIds[r]===e)return r;return-1},t}!function(e){e[e.FILTER_IGNORED=0]="FILTER_IGNORED",e[e.FILTER_LARGER=1]="FILTER_LARGER",e[e.FILTER_LARGER_EQUAL=2]="FILTER_LARGER_EQUAL",e[e.FILTER_EQUAL=3]="FILTER_EQUAL",e[e.FILTER_SMALLER_EQUAL=4]="FILTER_SMALLER_EQUAL",e[e.FILTER_SMALLER=5]="FILTER_SMALLER"}(FilterOperator=exports.FilterOperator||(exports.FilterOperator={})),function(e){e[e.HOST=0]="HOST",e[e.GUEST=1]="GUEST",e[e.FAVORED=2]="FAVORED",e[e.UNDERDOG=3]="UNDERDOG",e[e.DIFFERENCE=4]="DIFFERENCE",e[e.HOST_LEADING=5]="HOST_LEADING",e[e.GUEST_LEADING=6]="GUEST_LEADING",e[e.FAVORED_LEADING=7]="FAVORED_LEADING",e[e.UNDERDOG_LEADING=8]="UNDERDOG_LEADING",e[e.TOTAL=9]="TOTAL"}(OperatorSubject=exports.OperatorSubject||(exports.OperatorSubject={})),module.exports={AbstractRule:AbstractRule,DurationRangeRule:DurationRangeRule,LayBackFilterRule:LayBackFilterRule,LeagueKeywordFilterRule:LeagueKeywordFilterRule,MarketFilterRule:MarketFilterRule,PivotTypeFilterRule:PivotTypeFilterRule,RedcardFilterRule:RedcardFilterRule,ScoreFilterRule:ScoreFilterRule,TargetFilterRule:TargetFilterRule,TeamKeywordFilterRule:TeamKeywordFilterRule,CompanyFilterRule:CompanyFilterRule,TimeTypeFilterRule:TimeTypeFilterRule,RecordSelectorFilterRule:RecordSelectorFilterRule,OddAvailabilityFilterRule:OddAvailabilityFilterRule,EventIdFilterRule:EventIdFilterRule,OddTypeFilterRule:OddTypeFilterRule,StartTimeRangeFilterRule:StartTimeRangeFilterRule,RelativeStartTimeRangeFilterRule:RelativeStartTimeRangeFilterRule,RuleCombination:RuleCombination,RemoveFilterRulesMessage:RemoveFilterRulesMessage,ExactLeagueFilterRule:ExactLeagueFilterRule,EventTypeFilterRule:EventTypeFilterRule,TimePivotTypeFilterRule:TimePivotTypeFilterRule,EventAutoInclusionFilterRule:EventAutoInclusionFilterRule,SportFilterRule:SportFilterRule,LeagueTeamRegexFilterRule:LeagueTeamRegexFilterRule,MatchSelectorFilterRule:MatchSelectorFilterRule,PivotBiasFilterRule:PivotBiasFilterRule,MatchIdFilterRule:MatchIdFilterRule,LeagueHashCodeFilterRule:LeagueHashCodeFilterRule,MatchEventIdFilterRule:MatchEventIdFilterRule,MatchAutoInclusionFilterRule:MatchAutoInclusionFilterRule,FilterOperator:FilterOperator,OperatorSubject:OperatorSubject};

package/lib/index.js

@@ -1,4 +1 @@
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-__export(require("./filter"));
+function __export(r){for(var e in r)exports.hasOwnProperty(e)||(exports[e]=r[e])}__export(require("./filter"));

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "@jayesol/jayeson.model",
-  "version": "2.1.0-beta.1205v2",
+  "version": "2.1.1-beta2",
   "description": "Javascript implementation for jayeson.model library",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
     "test": "gulp test",
-    "prepare": "gulp dist"
+    "build": "gulp dist",
+    "prepack": "npx gulp compile",
+    "prepare": "npx gulp compile"
   },
   "repository": {
     "type": "git"
@@ -17,18 +19,25 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@jayesol/jayeson.lib.record": "^2.1.0-beta.1202",
-    "gulp-uglify": "^3.0.0",
-    "typescript": "^2.3.3"
+    "@jayesol/jayeson.lib.record": "^2.1.3"
   },
   "devDependencies": {
-    "@types/jasmine": "^2.5.52",
-    "del": "^3.0.0",
-    "glob": "^7.1.2",
+    "typescript": "^5.3.3",
+    "@types/jasmine": "^5.1.4",
+    "@types/node": "^20.10.5",
+    "chai": "^4.3.10",
+    "del": "^7.1.0",
+    "glob": "^10.3.10",
     "gulp": "^4.0.2",
     "gulp-install": "^1.1.0",
-    "gulp-jasmine": "^2.4.2",
-    "gulp-typescript": "^3.1.6",
-    "jasmine": "^2.6.0"
+    "gulp-jasmine": "^4.0.0",
+    "gulp-typescript": "^6.0.0-alpha.1",
+    "gulp-terser": "^2.1.0",
+    "terser": "^5.44.1",
+    "semver": "^7.5.4",
+    "jasmine": "^5.1.0"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
-}
+}