@axi-engine/expressions 0.2.2 → 0.2.3

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { ScalarType, PathType, DataSource } from '@axi-engine/utils';
+import { ScalarType, PathType, DataSource, Registry } from '@axi-engine/utils';
 
 /**
  * Represents an operand that is a direct, static value.
@@ -317,7 +317,7 @@ interface ExpressionEvaluatorContext {
  */
 declare class ExpressionEvaluator {
     /** @internal A map of registered expression handlers. */
-    handlers: Map<keyof ExpressionDefinitions, ExpressionHandler<Expression>>;
+    handlers: Registry<keyof ExpressionDefinitions, ExpressionHandler<Expression>>;
     /**
      * Registers a new `ExpressionHandler` with the evaluator.
      * This is the primary mechanism for extending the expression language with

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ScalarType, PathType, DataSource } from '@axi-engine/utils';
+import { ScalarType, PathType, DataSource, Registry } from '@axi-engine/utils';
 
 /**
  * Represents an operand that is a direct, static value.
@@ -317,7 +317,7 @@ interface ExpressionEvaluatorContext {
  */
 declare class ExpressionEvaluator {
     /** @internal A map of registered expression handlers. */
-    handlers: Map<keyof ExpressionDefinitions, ExpressionHandler<Expression>>;
+    handlers: Registry<keyof ExpressionDefinitions, ExpressionHandler<Expression>>;
     /**
      * Registers a new `ExpressionHandler` with the evaluator.
      * This is the primary mechanism for extending the expression language with

package/dist/index.js

@@ -105,7 +105,7 @@ function resolveOperandAsScalar(op, source) {
 var import_utils4 = require("@axi-engine/utils");
 var ExpressionEvaluator = class {
   /** @internal A map of registered expression handlers. */
-  handlers = /* @__PURE__ */ new Map();
+  handlers = new import_utils4.Registry();
   /**
    * Registers a new `ExpressionHandler` with the evaluator.
    * This is the primary mechanism for extending the expression language with
@@ -116,8 +116,7 @@ var ExpressionEvaluator = class {
    * is already registered.
    */
   register(handler) {
-    (0, import_utils4.throwIf)(this.handlers.has(handler.type), `Expression handler for: '${handler.type}' expression already registered`);
-    this.handlers.set(handler.type, handler);
+    this.handlers.register(handler.type, handler);
   }
   /**
    * Resolves a given expression against a data source.
@@ -134,8 +133,7 @@ var ExpressionEvaluator = class {
    */
   async resolve(expression, data) {
     const key = (0, import_utils4.firstKeyOf)(expression);
-    const handler = this.handlers.get(key);
-    (0, import_utils4.throwIfEmpty)(handler, `Can't find expression handler for: '${key}' expression`);
+    const handler = this.handlers.getOrThrow(key);
     const context = {
       resolve: (expression2) => this.resolve(expression2, data),
       source: () => data

package/dist/index.mjs

@@ -61,13 +61,12 @@ function resolveOperandAsScalar(op, source) {
 
 // src/expression-evaluator.ts
 import {
-  throwIf as throwIf3,
-  throwIfEmpty,
-  firstKeyOf
+  firstKeyOf,
+  Registry
 } from "@axi-engine/utils";
 var ExpressionEvaluator = class {
   /** @internal A map of registered expression handlers. */
-  handlers = /* @__PURE__ */ new Map();
+  handlers = new Registry();
   /**
    * Registers a new `ExpressionHandler` with the evaluator.
    * This is the primary mechanism for extending the expression language with
@@ -78,8 +77,7 @@ var ExpressionEvaluator = class {
    * is already registered.
    */
   register(handler) {
-    throwIf3(this.handlers.has(handler.type), `Expression handler for: '${handler.type}' expression already registered`);
-    this.handlers.set(handler.type, handler);
+    this.handlers.register(handler.type, handler);
   }
   /**
    * Resolves a given expression against a data source.
@@ -96,8 +94,7 @@ var ExpressionEvaluator = class {
    */
   async resolve(expression, data) {
     const key = firstKeyOf(expression);
-    const handler = this.handlers.get(key);
-    throwIfEmpty(handler, `Can't find expression handler for: '${key}' expression`);
+    const handler = this.handlers.getOrThrow(key);
     const context = {
       resolve: (expression2) => this.resolve(expression2, data),
       source: () => data
@@ -119,7 +116,7 @@ var AndExpressionHandler = class {
 };
 
 // src/handlers/chance-expression-handler.ts
-import { isNumber as isNumber2, isString, randInt, throwError as throwError3, throwIf as throwIf4 } from "@axi-engine/utils";
+import { isNumber as isNumber2, isString, randInt, throwError as throwError3, throwIf as throwIf3 } from "@axi-engine/utils";
 var ChanceExpressionHandler = class {
   type = "chance";
   /**
@@ -144,7 +141,7 @@ var ChanceExpressionHandler = class {
       numericValue = resolvedValue;
     } else if (isString(resolvedValue)) {
       const parsed = parseFloat(resolvedValue.replace("%", "").trim());
-      throwIf4(isNaN(parsed), `Chance value as a string must be a valid number, but got '${resolvedValue}'.`);
+      throwIf3(isNaN(parsed), `Chance value as a string must be a valid number, but got '${resolvedValue}'.`);
       numericValue = parsed;
     } else {
       throwError3(`Chance value must be a number or a string, but got a boolean.`);
@@ -186,7 +183,7 @@ var ExistsExpressionHandler = class {
 };
 
 // src/handlers/in-expression-handler.ts
-import { isScalar as isScalar2, throwIf as throwIf5 } from "@axi-engine/utils";
+import { isScalar as isScalar2, throwIf as throwIf4 } from "@axi-engine/utils";
 var InExpressionHandler = class {
   type = "in";
   /**
@@ -210,7 +207,7 @@ var InExpressionHandler = class {
   async resolve(exp, context) {
     const value = resolveOperandAsScalar(exp.in.value, context.source());
     const rawArray = Array.isArray(exp.in.array) ? exp.in.array : resolveOperand(exp.in.array, context.source());
-    throwIf5(
+    throwIf4(
       !Array.isArray(rawArray),
       `The 'in' expression requires an array, but the provided source resolved to ${typeof rawArray}.`
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axi-engine/expressions",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "",
   "license": "MIT",
   "repository": {
@@ -33,9 +33,9 @@
     "dist"
   ],
   "devDependencies": {
-    "@axi-engine/utils": "^0.2.5"
+    "@axi-engine/utils": "^0.2.6"
   },
   "peerDependencies": {
-    "@axi-engine/utils": "^0.2.5"
+    "@axi-engine/utils": "^0.2.6"
   }
 }