@degenerate/rules 0.0.9 → 0.1.0

package/dist/evaluation/conditions/starts-end-with-conditions.js

@@ -14,7 +14,7 @@ const generic_1 = require("@degenerate/generic");
  *
  * @returns
  */
-const isValidStartEndWithValue = (dataValue, conditionValue, conditionType) => {
+const isValidStartEndWithValue = (dataValue, conditionValue, conditionType, conditionTypeQualifier) => {
     // Make sure the data type is correct
     if (!(typeof dataValue === 'string' || typeof dataValue === 'number' || (0, generic_1.validateArray)(dataValue, 1))) {
         throw new generic_1.SafeRuleEvaluationConditionDataValueError(dataValue, conditionValue, conditionType);
@@ -22,12 +22,14 @@ const isValidStartEndWithValue = (dataValue, conditionValue, conditionType) => {
     if (!(typeof conditionValue === 'string' || typeof conditionValue === 'number' || (0, generic_1.validateArray)(conditionValue, 1))) {
         throw new generic_1.SafeRuleEvaluationConditionValueError(dataValue, conditionValue, conditionType);
     }
+    let result = false;
     if ((typeof dataValue === 'string' || typeof dataValue === 'number') && (typeof conditionValue === 'string' || typeof conditionValue === 'number')) {
-        return isValidStartEndWithStringNumberValue(dataValue, conditionValue, conditionType);
+        result = isValidStartEndWithStringNumberValue(dataValue, conditionValue, conditionType);
     }
     else {
-        return isValidStartEndWithArrayValue(dataValue, conditionValue, conditionType);
+        result = isValidStartEndWithArrayValue(dataValue, conditionValue, conditionType);
     }
+    return (conditionTypeQualifier === generic_1.ConditionTypeQualifier.IS) ? result : !result;
 };
 exports.isValidStartEndWithValue = isValidStartEndWithValue;
 //#region internal functions

package/dist/evaluation/conditions/{typeof-rule-conditions.d.ts → typeof-conditions.d.ts}

@@ -1,7 +1,7 @@
 /**
  * This file contains the functions for checking that the data is the proper type of data.
  */
-import { ConditionTypeOf, ConditionTypeTypeOf } from '@degenerate/generic';
+import { ConditionTypeOf, ConditionTypeQualifier } from '@degenerate/generic';
 /**
  * This takes a value and checks if it is the proper type of value.
  *
@@ -11,6 +11,6 @@ import { ConditionTypeOf, ConditionTypeTypeOf } from '@degenerate/generic';
  *
  * @returns
  */
-declare const isValidTypeOfValue: (dataValue: unknown, typeofValue: ConditionTypeOf, conditionType: ConditionTypeTypeOf) => boolean;
+declare const isValidTypeOfValue: (dataValue: unknown, typeofValue: ConditionTypeOf, conditionTypeQualifier: ConditionTypeQualifier) => boolean;
 export { isValidTypeOfValue };
-//# sourceMappingURL=typeof-rule-conditions.d.ts.map
+//# sourceMappingURL=typeof-conditions.d.ts.map

package/dist/evaluation/conditions/typeof-conditions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"typeof-conditions.d.ts","sourceRoot":"","sources":["../../../src/evaluation/conditions/typeof-conditions.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE9E;;;;;;;;GAQG;AACH,QAAA,MAAM,kBAAkB,cAAe,OAAO,eAAe,eAAe,0BAChD,sBAAsB,KAAG,OAGpD,CAAC;AAsCF,OAAO,EAAE,kBAAkB,EAAE,CAAC"}

package/dist/evaluation/conditions/{typeof-rule-conditions.js → typeof-conditions.js}

@@ -14,9 +14,9 @@ const generic_1 = require("@degenerate/generic");
  *
  * @returns
  */
-const isValidTypeOfValue = (dataValue, typeofValue, conditionType) => {
+const isValidTypeOfValue = (dataValue, typeofValue, conditionTypeQualifier) => {
     const initialResult = checkType(dataValue, typeofValue);
-    return (conditionType === generic_1.ConditionTypeTypeOf.IS_TYPEOF) ? initialResult : !initialResult;
+    return (conditionTypeQualifier === generic_1.ConditionTypeQualifier.IS) ? initialResult : !initialResult;
 };
 exports.isValidTypeOfValue = isValidTypeOfValue;
 /**

package/dist/evaluation/evaluate-rule-conditions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"evaluate-rule-conditions.d.ts","sourceRoot":"","sources":["../../src/evaluation/evaluate-rule-conditions.ts"],"names":[],"mappings":"AAAA,OAAO,EAUH,UAAU,EACV,aAAa,EAChB,MAAM,qBAAqB,CAAC;AAW7B;;;;;GAKG;AACH,QAAA,MAAM,sBAAsB,iBAAkB,aAAa,aAAa,UAAU,KAAG,OAkCpF,CAAC;AAGF,OAAO,EAAE,sBAAsB,EAAE,CAAC"}
+{"version":3,"file":"evaluate-rule-conditions.d.ts","sourceRoot":"","sources":["../../src/evaluation/evaluate-rule-conditions.ts"],"names":[],"mappings":"AACA,OAAO,EAMH,UAAU,EACV,aAAa,EAChB,MAAM,qBAAqB,CAAC;AAW7B;;;;;GAKG;AACH,QAAA,MAAM,sBAAsB,iBAAkB,aAAa,aAAa,UAAU,KAAG,OA+BpF,CAAC;AAGF,OAAO,EAAE,sBAAsB,EAAE,CAAC"}

package/dist/evaluation/evaluate-rule-conditions.js

@@ -10,7 +10,7 @@ const null_conditions_1 = require("./conditions/null-conditions");
 const range_conditions_1 = require("./conditions/range-conditions");
 const special_conditions_1 = require("./conditions/special-conditions");
 const starts_end_with_conditions_1 = require("./conditions/starts-end-with-conditions");
-const typeof_rule_conditions_1 = require("./conditions/typeof-rule-conditions");
+const typeof_conditions_1 = require("./conditions/typeof-conditions");
 /**
  * This evaluates the conditions for the rule.
  *
@@ -21,34 +21,31 @@ const evaluateRuleConditions = (targetObject, condition) => {
     const splitProperties = condition.targettedProperty.split('.');
     const targetValue = getNestedProperty(targetObject, splitProperties);
     switch (condition.conditionType) {
-        case generic_1.ConditionTypeTypeOf.IS_TYPEOF:
-        case generic_1.ConditionTypeTypeOf.IS_NOT_TYPEOF:
-            return (0, typeof_rule_conditions_1.isValidTypeOfValue)(targetValue, condition.conditionValue, condition.conditionType);
-        case generic_1.ConditionTypeEquality.EQUAL:
-        case generic_1.ConditionTypeEquality.NOT_EQUAL:
-            return (0, equality_conditions_1.isValidEqualityValue)(targetValue, condition.conditionValue, condition.conditionType);
+        case generic_1.ConditionTypeSingle.TYPEOF:
+            return (0, typeof_conditions_1.isValidTypeOfValue)(targetValue, condition.conditionValue, condition.conditionTypeQualifier);
+        case generic_1.ConditionTypeSingle.EQUAL:
+            return (0, equality_conditions_1.isValidEqualityValue)(targetValue, condition.conditionValue, condition.conditionTypeQualifier);
         case generic_1.ConditionTypeRange.GREATER_THAN:
         case generic_1.ConditionTypeRange.LESS_THAN:
         case generic_1.ConditionTypeRange.GREATER_THAN_OR_EQUAL:
         case generic_1.ConditionTypeRange.LESS_THAN_OR_EQUAL:
-            return (0, range_conditions_1.isValidRangeValue)(targetValue, condition.conditionValue, condition.conditionType);
-        case generic_1.ConditionTypeContains.CONTAINS:
-        case generic_1.ConditionTypeContains.NOT_CONTAINS:
-            return (0, contains_conditions_1.isValidContainsValue)(targetValue, condition.conditionValue, condition.conditionType);
+            return (0, range_conditions_1.isValidRangeValue)(targetValue, condition.conditionValue, condition.conditionType, condition.conditionTypeQualifier);
+        case generic_1.ConditionTypeSingle.CONTAINS:
+            return (0, contains_conditions_1.isValidContainsValue)(targetValue, condition.conditionValue, condition.conditionTypeQualifier);
         case generic_1.ConditionTypeStartsEndsWith.STARTS_WITH:
         case generic_1.ConditionTypeStartsEndsWith.ENDS_WITH:
-            return (0, starts_end_with_conditions_1.isValidStartEndWithValue)(targetValue, condition.conditionValue, condition.conditionType);
-        case generic_1.ConditionTypeNull.IS_NULL:
-        case generic_1.ConditionTypeNull.IS_NOT_NULL:
-            return (0, null_conditions_1.isValidNullValue)(targetValue, condition.conditionType);
-        case generic_1.ConditionTypeBoolean.IS_TRUE:
-        case generic_1.ConditionTypeBoolean.IS_FALSE:
-            return (0, boolean_conditions_1.isValidBooleanValue)(targetValue, condition.conditionType);
-        case generic_1.ConditionTypeEmpty.IS_EMPTY:
-        case generic_1.ConditionTypeEmpty.IS_NOT_EMPTY:
-            return (0, empty_conditions_1.isValidEmptyValue)(targetValue, condition.conditionType);
+            return (0, starts_end_with_conditions_1.isValidStartEndWithValue)(targetValue, condition.conditionValue, condition.conditionType, condition.conditionTypeQualifier);
+        case generic_1.ConditionTypeSingle.NULL:
+            return (0, null_conditions_1.isValidNullValue)(targetValue, condition.conditionTypeQualifier);
+        case generic_1.ConditionTypeBoolean.TRUE:
+        case generic_1.ConditionTypeBoolean.FALSE:
+            return (0, boolean_conditions_1.isValidBooleanValue)(targetValue, condition.conditionType, condition.conditionTypeQualifier);
+        case generic_1.ConditionTypeSingle.EMPTY:
+            return (0, empty_conditions_1.isValidEmptyValue)(targetValue, condition.conditionTypeQualifier);
         case generic_1.ConditionTypeSpecial.PATTERN:
-            return (0, special_conditions_1.isValidSpecialValue)(targetObject, condition.conditionValue, condition.conditionType);
+            return (0, special_conditions_1.isValidSpecialValue)(targetValue, condition.conditionValue, condition.conditionType, condition.conditionTypeQualifier);
+        default:
+            return false;
     }
     // return false;
 };

package/dist/evaluation/evaluate-rules.js

@@ -24,17 +24,15 @@ const evaluateRules = (rootParam, appliedRules, shareDataCurrent, shareDataPropo
         const ruleEvaluationResult = (0, evaluate_rule_1.evaluateRule)(rule, shareDataCurrent, shareDataProposed, logInfo);
         // check if the rule passed
         const passedRuleCheck = checkIfPassedRules(ruleEvaluationResult);
+        if (logInfo) { // add in the logging information if it's been  requested
+            shareRulesEvaluationResults.shareRuleEvalutionResults.push(ruleEvaluationResult);
+        }
         if (passedRuleCheck) {
             shareRulesEvaluationResults.passedRuleCheck = true;
             shareRulesEvaluationResults.passedRuleId = rule.ruleId;
             if (!logInfo)
                 break;
         }
-        else {
-            if (logInfo) {
-                shareRulesEvaluationResults.shareRuleEvalutionResults.push(ruleEvaluationResult);
-            }
-        }
     }
     return shareRulesEvaluationResults;
 };

package/dist/evaluation/index.d.ts

@@ -6,7 +6,7 @@ export * from './conditions/null-conditions';
 export * from './conditions/range-conditions';
 export * from './conditions/special-conditions';
 export * from './conditions/starts-end-with-conditions';
-export * from './conditions/typeof-rule-conditions';
+export * from './conditions/typeof-conditions';
 export * from './check-function-integrity';
 export * from './check-if-proposal-is-valid';
 export * from './determine-if-data-has-changed';

package/dist/evaluation/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/evaluation/index.ts"],"names":[],"mappings":"AAEA,cAAc,iCAAiC,CAAC;AAChD,cAAc,kCAAkC,CAAC;AACjD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kCAAkC,CAAC;AACjD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,yCAAyC,CAAC;AACxD,cAAc,qCAAqC,CAAC;AAIpD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iCAAiC,CAAC;AAChD,cAAc,iBAAiB,CAAC;AAChC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC;AACjC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/evaluation/index.ts"],"names":[],"mappings":"AAEA,cAAc,iCAAiC,CAAC;AAChD,cAAc,kCAAkC,CAAC;AACjD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kCAAkC,CAAC;AACjD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,yCAAyC,CAAC;AACxD,cAAc,gCAAgC,CAAC;AAI/C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iCAAiC,CAAC;AAChD,cAAc,iBAAiB,CAAC;AAChC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC;AACjC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC"}

package/dist/evaluation/index.js

@@ -23,7 +23,7 @@ __exportStar(require("./conditions/null-conditions"), exports);
 __exportStar(require("./conditions/range-conditions"), exports);
 __exportStar(require("./conditions/special-conditions"), exports);
 __exportStar(require("./conditions/starts-end-with-conditions"), exports);
-__exportStar(require("./conditions/typeof-rule-conditions"), exports);
+__exportStar(require("./conditions/typeof-conditions"), exports);
 //#endregion Conditional Functions
 __exportStar(require("./check-function-integrity"), exports);
 __exportStar(require("./check-if-proposal-is-valid"), exports);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@degenerate/rules",
   "description": "This contains the rules information needed for the ShareData Adaptive Framework Ecosystem (SAFE) network.",
-  "version": "0.0.9",
+  "version": "0.1.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "devDependencies": {
@@ -35,8 +35,8 @@
   "homepage": "https://github.com/syncrude/safe#readme",
   "author": "Degenerate Inc.",
   "license": "ISC",
+  "gitHead": "608fbf8b2b80f30464af3898f08f7ad8db9b543c",
   "dependencies": {
-    "@degenerate/generic": "^0.0.14"
-  },
-  "gitHead": "0e8f76c14364f6d23ab66cdb9547d4e486fad9a4"
+    "@degenerate/generic": "^0.1.0"
+  }
 }

package/dist/evaluation/conditions/typeof-rule-conditions.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"typeof-rule-conditions.d.ts","sourceRoot":"","sources":["../../../src/evaluation/conditions/typeof-rule-conditions.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE3E;;;;;;;;GAQG;AACH,QAAA,MAAM,kBAAkB,cAAe,OAAO,eAAe,eAAe,iBAAiB,mBAAmB,KAAG,OAGlH,CAAC;AAsCF,OAAO,EAAE,kBAAkB,EAAE,CAAC"}