@comunica/actor-function-factory-term-lesser-than-equal 4.4.1 → 4.4.2-alpha.49.0

package/lib/TermFunctionLesserThanEqual.js

@@ -9,15 +9,32 @@ class TermFunctionLesserThanEqual extends bus_function_factory_1.TermFunctionBas
             arity: 2,
             operator: utils_expression_evaluator_1.SparqlOperator.LTE,
             overloads: (0, utils_expression_evaluator_1.declare)(utils_expression_evaluator_1.SparqlOperator.LTE)
-                .set(['term', 'term'], exprEval => ([first, second]) => 
-            // X <= Y -> X < Y || X = Y
-            // First check if the first is lesser than the second, then check if they are equal.
-            // Doing this, the correct error will be thrown,
-            // each type that has a lesserThanEqual has a matching lesserThan.
-            (0, utils_expression_evaluator_1.bool)(this.lessThanFunction.applyOnTerms([first, second], exprEval)
-                .typedValue ||
-                this.equalityFunction.applyOnTerms([first, second], exprEval)
-                    .typedValue))
+                .set(['term', 'term'], exprEval => ([first, second]) => {
+                // X <= Y -> X = Y || X < Y
+                // We must ensure correct handling of errors following logical-or semantics.
+                // First check if the first is lesser than the second.
+                let lessThanError;
+                try {
+                    if (this.lessThanFunction.applyOnTerms([first, second], exprEval).typedValue) {
+                        return (0, utils_expression_evaluator_1.bool)(true);
+                    }
+                }
+                catch (error) {
+                    // If an error occurs, store it for later.
+                    lessThanError = error;
+                }
+                // Then check if they are equal, and return if so.
+                if (this.equalityFunction.applyOnTerms([first, second], exprEval)
+                    .typedValue) {
+                    return (0, utils_expression_evaluator_1.bool)(true);
+                }
+                // If less than produced an error and equals was false, throw the error.
+                if (lessThanError) {
+                    throw lessThanError;
+                }
+                // In all other cases, return false
+                return (0, utils_expression_evaluator_1.bool)(false);
+            })
                 .collect(),
         });
         this.equalityFunction = equalityFunction;

package/lib/TermFunctionLesserThanEqual.js.map

@@ -1 +1 @@
-{"version":3,"file":"TermFunctionLesserThanEqual.js","sourceRoot":"","sources":["TermFunctionLesserThanEqual.ts"],"names":[],"mappings":";;;AACA,yEAAkE;AAIlE,qFAI8C;AAE9C,MAAa,2BAA4B,SAAQ,uCAAgB;IAC/D,YACmB,gBAA+B,EAC/B,gBAA+B;QAEhD,KAAK,CAAC;YACJ,KAAK,EAAE,CAAC;YACR,QAAQ,EAAE,2CAAc,CAAC,GAAG;YAC5B,SAAS,EAAE,IAAA,oCAAO,EAAC,2CAAc,CAAC,GAAG,CAAC;iBACnC,GAAG,CAAC,CAAE,MAAM,EAAE,MAAM,CAAE,EAAE,QAAQ,CAAC,EAAE,CAClC,CAAC,CAAE,KAAK,EAAE,MAAM,CAAE,EAAE,EAAE;YACpB,2BAA2B;YAC3B,oFAAoF;YACpF,gDAAgD;YAChD,kEAAkE;YAClE,IAAA,iCAAI,EACgB,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAE,KAAK,EAAE,MAAM,CAAE,EAAE,QAAQ,CAAE;iBAC/E,UAAU;gBACK,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAE,KAAK,EAAE,MAAM,CAAE,EAAE,QAAQ,CAAE;qBAC/E,UAAU,CACd,CAAC;iBACL,OAAO,EAAE;SACb,CAAC,CAAC;QApBc,qBAAgB,GAAhB,gBAAgB,CAAe;QAC/B,qBAAgB,GAAhB,gBAAgB,CAAe;IAoBlD,CAAC;CACF;AAxBD,kEAwBC","sourcesContent":["import type { ITermFunction } from '@comunica/bus-function-factory';\nimport { TermFunctionBase } from '@comunica/bus-function-factory';\nimport type {\n  BooleanLiteral,\n} from '@comunica/utils-expression-evaluator';\nimport {\n  bool,\n  declare,\n  SparqlOperator,\n} from '@comunica/utils-expression-evaluator';\n\nexport class TermFunctionLesserThanEqual extends TermFunctionBase {\n  public constructor(\n    private readonly equalityFunction: ITermFunction,\n    private readonly lessThanFunction: ITermFunction,\n  ) {\n    super({\n      arity: 2,\n      operator: SparqlOperator.LTE,\n      overloads: declare(SparqlOperator.LTE)\n        .set([ 'term', 'term' ], exprEval =>\n          ([ first, second ]) =>\n            // X <= Y -> X < Y || X = Y\n            // First check if the first is lesser than the second, then check if they are equal.\n            // Doing this, the correct error will be thrown,\n            // each type that has a lesserThanEqual has a matching lesserThan.\n            bool(\n              (<BooleanLiteral> this.lessThanFunction.applyOnTerms([ first, second ], exprEval))\n                .typedValue ||\n              (<BooleanLiteral> this.equalityFunction.applyOnTerms([ first, second ], exprEval))\n                .typedValue,\n            ))\n        .collect(),\n    });\n  }\n}\n"]}
+{"version":3,"file":"TermFunctionLesserThanEqual.js","sourceRoot":"","sources":["TermFunctionLesserThanEqual.ts"],"names":[],"mappings":";;;AACA,yEAAkE;AAIlE,qFAI8C;AAE9C,MAAa,2BAA4B,SAAQ,uCAAgB;IAC/D,YACmB,gBAA+B,EAC/B,gBAA+B;QAEhD,KAAK,CAAC;YACJ,KAAK,EAAE,CAAC;YACR,QAAQ,EAAE,2CAAc,CAAC,GAAG;YAC5B,SAAS,EAAE,IAAA,oCAAO,EAAC,2CAAc,CAAC,GAAG,CAAC;iBACnC,GAAG,CAAC,CAAE,MAAM,EAAE,MAAM,CAAE,EAAE,QAAQ,CAAC,EAAE,CAClC,CAAC,CAAE,KAAK,EAAE,MAAM,CAAE,EAAE,EAAE;gBACpB,2BAA2B;gBAC3B,4EAA4E;gBAE5E,sDAAsD;gBACtD,IAAI,aAAgC,CAAC;gBACrC,IAAI,CAAC;oBACH,IAAsB,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAE,KAAK,EAAE,MAAM,CAAE,EAAE,QAAQ,CAAE,CAAC,UAAU,EAAE,CAAC;wBAClG,OAAO,IAAA,iCAAI,EAAC,IAAI,CAAC,CAAC;oBACpB,CAAC;gBACH,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,0CAA0C;oBAC1C,aAAa,GAAW,KAAK,CAAC;gBAChC,CAAC;gBAED,kDAAkD;gBAClD,IAAsB,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAE,KAAK,EAAE,MAAM,CAAE,EAAE,QAAQ,CAAE;qBACnF,UAAU,EAAE,CAAC;oBACd,OAAO,IAAA,iCAAI,EAAC,IAAI,CAAC,CAAC;gBACpB,CAAC;gBAED,wEAAwE;gBACxE,IAAI,aAAa,EAAE,CAAC;oBAClB,MAAM,aAAa,CAAC;gBACtB,CAAC;gBAED,mCAAmC;gBACnC,OAAO,IAAA,iCAAI,EAAC,KAAK,CAAC,CAAC;YACrB,CAAC,CAAC;iBACH,OAAO,EAAE;SACb,CAAC,CAAC;QAtCc,qBAAgB,GAAhB,gBAAgB,CAAe;QAC/B,qBAAgB,GAAhB,gBAAgB,CAAe;IAsClD,CAAC;CACF;AA1CD,kEA0CC","sourcesContent":["import type { ITermFunction } from '@comunica/bus-function-factory';\nimport { TermFunctionBase } from '@comunica/bus-function-factory';\nimport type {\n  BooleanLiteral,\n} from '@comunica/utils-expression-evaluator';\nimport {\n  bool,\n  declare,\n  SparqlOperator,\n} from '@comunica/utils-expression-evaluator';\n\nexport class TermFunctionLesserThanEqual extends TermFunctionBase {\n  public constructor(\n    private readonly equalityFunction: ITermFunction,\n    private readonly lessThanFunction: ITermFunction,\n  ) {\n    super({\n      arity: 2,\n      operator: SparqlOperator.LTE,\n      overloads: declare(SparqlOperator.LTE)\n        .set([ 'term', 'term' ], exprEval =>\n          ([ first, second ]) => {\n            // X <= Y -> X = Y || X < Y\n            // We must ensure correct handling of errors following logical-or semantics.\n\n            // First check if the first is lesser than the second.\n            let lessThanError: Error | undefined;\n            try {\n              if ((<BooleanLiteral> this.lessThanFunction.applyOnTerms([ first, second ], exprEval)).typedValue) {\n                return bool(true);\n              }\n            } catch (error) {\n              // If an error occurs, store it for later.\n              lessThanError = <Error> error;\n            }\n\n            // Then check if they are equal, and return if so.\n            if ((<BooleanLiteral> this.equalityFunction.applyOnTerms([ first, second ], exprEval))\n              .typedValue) {\n              return bool(true);\n            }\n\n            // If less than produced an error and equals was false, throw the error.\n            if (lessThanError) {\n              throw lessThanError;\n            }\n\n            // In all other cases, return false\n            return bool(false);\n          })\n        .collect(),\n    });\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comunica/actor-function-factory-term-lesser-than-equal",
-  "version": "4.4.1",
+  "version": "4.4.2-alpha.49.0",
   "description": "A term-lesser-than-equal function-factory actor",
   "lsd:module": true,
   "license": "MIT",
@@ -37,8 +37,8 @@
     "build:components": "componentsjs-generator"
   },
   "dependencies": {
-    "@comunica/bus-function-factory": "^4.4.1",
-    "@comunica/utils-expression-evaluator": "^4.4.1"
+    "@comunica/bus-function-factory": "4.4.2-alpha.49.0",
+    "@comunica/utils-expression-evaluator": "4.4.2-alpha.49.0"
   },
-  "gitHead": "c5cc36caf88da31173a0969a7da88cadb7f469ac"
+  "gitHead": "ef6f96cfd8faf7c37955bb7e0fe9f6fc6a994bdf"
 }