@seljs/runtime 1.3.0-beta.14 → 1.3.0-beta.17

package/dist/environment/environment.cjs

@@ -13,7 +13,6 @@ const require_dependency_analyzer = require("../analysis/dependency-analyzer.cjs
 const require_round_planner = require("../analysis/round-planner.cjs");
 const require_multi_round_executor = require("../execution/multi-round-executor.cjs");
 let _seljs_checker = require("@seljs/checker");
-let _seljs_common = require("@seljs/common");
 //#region src/environment/environment.ts
 /**
 * Core SEL runtime that bridges CEL expression evaluation with EVM contract reads.
@@ -106,7 +105,7 @@ var SELRuntime = class {
 	*
 	* @param expression - A CEL expression string to type-check
 	* @returns The type-check result containing validity, inferred type, and any errors
-	* @throws {@link SELTypeError} If the expression contains unrecoverable type errors
+	* @throws {@link SELEvaluationError} If the expression contains unrecoverable type errors
 	*/
 	check(expression) {
 		try {
@@ -130,8 +129,7 @@ var SELRuntime = class {
 	* @param context Variable bindings for evaluation
 	* @param options Optional client override
 	* @returns An {@link EvaluateResult} containing the value and optional execution metadata
-	* @throws {@link SELParseError} If the expression has invalid syntax
-	* @throws {@link SELTypeError} If type-checking fails
+	* @throws {@link SELLintError} If the expression fails parse, type-check, or lint rules
 	* @throws {@link SELContractError} If a contract call fails or no client is available
 	* @throws {@link SELEvaluationError} If CEL evaluation fails
 	*/
@@ -149,23 +147,21 @@ var SELRuntime = class {
 		}
 	}
 	planExecution(expression, evaluationContext) {
+		const checkResult = this.checker.check(expression);
+		if (!checkResult.valid) throw new require_errors.SELLintError(checkResult.diagnostics.filter((d) => d.severity === "error"));
 		const parseResult = this.env.parse(expression);
 		const collectedCalls = require_call_collector.collectCalls(parseResult.ast, { get: (name) => this.findContract(name) });
 		debug("evaluate: collected %d calls", collectedCalls.length);
 		const normalizedContext = Object.keys(evaluationContext).length ? require_context.normalizeContextForEvaluation(evaluationContext, this.variableTypes, this.codecRegistry) : void 0;
 		const executionVariables = Object.keys(evaluationContext).length ? evaluationContext : {};
-		const typeCheckResult = parseResult.check();
-		if (!typeCheckResult.valid) throw new _seljs_common.SELTypeError(typeCheckResult.error?.message ?? "Type check failed", { cause: typeCheckResult.error });
-		const lintResult = this.checker.check(expression);
-		const lintErrors = lintResult.diagnostics.filter((d) => d.severity === "error");
-		if (lintErrors.length > 0) throw new require_errors.SELLintError(lintErrors);
+		const diagnostics = checkResult.diagnostics.filter((d) => d.severity !== "error");
 		return {
 			parseResult,
 			collectedCalls,
 			normalizedContext,
 			executionVariables,
-			typeCheckResult,
-			diagnostics: lintResult.diagnostics.filter((d) => d.severity !== "error")
+			resolvedType: checkResult.type,
+			diagnostics
 		};
 	}
 	async executeContractCalls(collectedCalls, executionVariables, resolvedClient) {
@@ -216,7 +212,7 @@ var SELRuntime = class {
 		const resolvedClient = options?.client ?? this.client;
 		if (resolvedClient && resolvedClient !== this.client) require_client.validateClient(resolvedClient);
 		try {
-			const { parseResult, collectedCalls, normalizedContext, executionVariables, typeCheckResult, diagnostics } = this.planExecution(expression, context ?? {});
+			const { parseResult, collectedCalls, normalizedContext, executionVariables, resolvedType, diagnostics } = this.planExecution(expression, context ?? {});
 			let executionMeta;
 			let executionCache;
 			if (collectedCalls.length > 0) {
@@ -240,13 +236,13 @@ var SELRuntime = class {
 				this.currentClient = void 0;
 				this.currentCallCounter = void 0;
 			}
-			const value = typeCheckResult.type ? this.codecRegistry.encode(typeCheckResult.type, result) : result;
+			const value = resolvedType ? this.codecRegistry.encode(resolvedType, result) : result;
 			debug("evaluate: result type=%s", typeof value);
 			const evalResult = executionMeta ? {
 				value,
 				meta: executionMeta
 			} : { value };
-			if (typeCheckResult.type) evalResult.type = typeCheckResult.type;
+			if (resolvedType) evalResult.type = resolvedType;
 			if (diagnostics.length > 0) evalResult.diagnostics = diagnostics;
 			return evalResult;
 		} catch (error) {

package/dist/environment/environment.d.cts

@@ -52,7 +52,7 @@ declare class SELRuntime {
    *
    * @param expression - A CEL expression string to type-check
    * @returns The type-check result containing validity, inferred type, and any errors
-   * @throws {@link SELTypeError} If the expression contains unrecoverable type errors
+   * @throws {@link SELEvaluationError} If the expression contains unrecoverable type errors
    */
   check(expression: string): TypeCheckResult;
   /**
@@ -70,8 +70,7 @@ declare class SELRuntime {
    * @param context Variable bindings for evaluation
    * @param options Optional client override
    * @returns An {@link EvaluateResult} containing the value and optional execution metadata
-   * @throws {@link SELParseError} If the expression has invalid syntax
-   * @throws {@link SELTypeError} If type-checking fails
+   * @throws {@link SELLintError} If the expression fails parse, type-check, or lint rules
    * @throws {@link SELContractError} If a contract call fails or no client is available
    * @throws {@link SELEvaluationError} If CEL evaluation fails
    */

package/dist/environment/environment.d.mts

@@ -52,7 +52,7 @@ declare class SELRuntime {
    *
    * @param expression - A CEL expression string to type-check
    * @returns The type-check result containing validity, inferred type, and any errors
-   * @throws {@link SELTypeError} If the expression contains unrecoverable type errors
+   * @throws {@link SELEvaluationError} If the expression contains unrecoverable type errors
    */
   check(expression: string): TypeCheckResult;
   /**
@@ -70,8 +70,7 @@ declare class SELRuntime {
    * @param context Variable bindings for evaluation
    * @param options Optional client override
    * @returns An {@link EvaluateResult} containing the value and optional execution metadata
-   * @throws {@link SELParseError} If the expression has invalid syntax
-   * @throws {@link SELTypeError} If type-checking fails
+   * @throws {@link SELLintError} If the expression fails parse, type-check, or lint rules
    * @throws {@link SELContractError} If a contract call fails or no client is available
    * @throws {@link SELEvaluationError} If CEL evaluation fails
    */

package/dist/environment/environment.mjs

@@ -1,5 +1,5 @@
 import { getBuiltinContracts } from "./builtin-contracts.mjs";
-import { MulticallBatchError, SELContractError, SELLintError, SELTypeError } from "../errors/errors.mjs";
+import { MulticallBatchError, SELContractError, SELLintError } from "../errors/errors.mjs";
 import "../errors/index.mjs";
 import { validateClient } from "./client.mjs";
 import { normalizeContextForEvaluation } from "./context.mjs";
@@ -104,7 +104,7 @@ var SELRuntime = class {
 	*
 	* @param expression - A CEL expression string to type-check
 	* @returns The type-check result containing validity, inferred type, and any errors
-	* @throws {@link SELTypeError} If the expression contains unrecoverable type errors
+	* @throws {@link SELEvaluationError} If the expression contains unrecoverable type errors
 	*/
 	check(expression) {
 		try {
@@ -128,8 +128,7 @@ var SELRuntime = class {
 	* @param context Variable bindings for evaluation
 	* @param options Optional client override
 	* @returns An {@link EvaluateResult} containing the value and optional execution metadata
-	* @throws {@link SELParseError} If the expression has invalid syntax
-	* @throws {@link SELTypeError} If type-checking fails
+	* @throws {@link SELLintError} If the expression fails parse, type-check, or lint rules
 	* @throws {@link SELContractError} If a contract call fails or no client is available
 	* @throws {@link SELEvaluationError} If CEL evaluation fails
 	*/
@@ -147,23 +146,21 @@ var SELRuntime = class {
 		}
 	}
 	planExecution(expression, evaluationContext) {
+		const checkResult = this.checker.check(expression);
+		if (!checkResult.valid) throw new SELLintError(checkResult.diagnostics.filter((d) => d.severity === "error"));
 		const parseResult = this.env.parse(expression);
 		const collectedCalls = collectCalls(parseResult.ast, { get: (name) => this.findContract(name) });
 		debug("evaluate: collected %d calls", collectedCalls.length);
 		const normalizedContext = Object.keys(evaluationContext).length ? normalizeContextForEvaluation(evaluationContext, this.variableTypes, this.codecRegistry) : void 0;
 		const executionVariables = Object.keys(evaluationContext).length ? evaluationContext : {};
-		const typeCheckResult = parseResult.check();
-		if (!typeCheckResult.valid) throw new SELTypeError(typeCheckResult.error?.message ?? "Type check failed", { cause: typeCheckResult.error });
-		const lintResult = this.checker.check(expression);
-		const lintErrors = lintResult.diagnostics.filter((d) => d.severity === "error");
-		if (lintErrors.length > 0) throw new SELLintError(lintErrors);
+		const diagnostics = checkResult.diagnostics.filter((d) => d.severity !== "error");
 		return {
 			parseResult,
 			collectedCalls,
 			normalizedContext,
 			executionVariables,
-			typeCheckResult,
-			diagnostics: lintResult.diagnostics.filter((d) => d.severity !== "error")
+			resolvedType: checkResult.type,
+			diagnostics
 		};
 	}
 	async executeContractCalls(collectedCalls, executionVariables, resolvedClient) {
@@ -214,7 +211,7 @@ var SELRuntime = class {
 		const resolvedClient = options?.client ?? this.client;
 		if (resolvedClient && resolvedClient !== this.client) validateClient(resolvedClient);
 		try {
-			const { parseResult, collectedCalls, normalizedContext, executionVariables, typeCheckResult, diagnostics } = this.planExecution(expression, context ?? {});
+			const { parseResult, collectedCalls, normalizedContext, executionVariables, resolvedType, diagnostics } = this.planExecution(expression, context ?? {});
 			let executionMeta;
 			let executionCache;
 			if (collectedCalls.length > 0) {
@@ -238,13 +235,13 @@ var SELRuntime = class {
 				this.currentClient = void 0;
 				this.currentCallCounter = void 0;
 			}
-			const value = typeCheckResult.type ? this.codecRegistry.encode(typeCheckResult.type, result) : result;
+			const value = resolvedType ? this.codecRegistry.encode(resolvedType, result) : result;
 			debug("evaluate: result type=%s", typeof value);
 			const evalResult = executionMeta ? {
 				value,
 				meta: executionMeta
 			} : { value };
-			if (typeCheckResult.type) evalResult.type = typeCheckResult.type;
+			if (resolvedType) evalResult.type = resolvedType;
 			if (diagnostics.length > 0) evalResult.diagnostics = diagnostics;
 			return evalResult;
 		} catch (error) {

package/dist/environment/error-wrapper.cjs

@@ -2,7 +2,6 @@ require("../_virtual/_rolldown/runtime.cjs");
 const require_errors = require("../errors/errors.cjs");
 require("../errors/index.cjs");
 let _marcbachmann_cel_js = require("@marcbachmann/cel-js");
-let _seljs_common = require("@seljs/common");
 //#region src/environment/error-wrapper.ts
 /**
 * Wraps an unknown error into a known SEL error type.
@@ -15,13 +14,13 @@ let _seljs_common = require("@seljs/common");
 */
 const wrapError = (error) => {
 	if (error instanceof require_errors.SELContractError) return error;
-	if (error instanceof _marcbachmann_cel_js.ParseError) return new _seljs_common.SELParseError(error.message, { cause: error });
 	if (error instanceof _marcbachmann_cel_js.EvaluationError) {
 		const cause = error.cause;
 		if (cause instanceof require_errors.SELContractError) return cause;
 		return new require_errors.SELEvaluationError(error.message, { cause: error });
 	}
-	if (error instanceof _marcbachmann_cel_js.TypeError) return new _seljs_common.SELTypeError(error.message, { cause: error });
+	if (error instanceof _marcbachmann_cel_js.ParseError) return new require_errors.SELEvaluationError(error.message, { cause: error });
+	if (error instanceof _marcbachmann_cel_js.TypeError) return new require_errors.SELEvaluationError(error.message, { cause: error });
 	if (error instanceof Error) return error;
 	return new Error(String(error));
 };

package/dist/environment/error-wrapper.mjs

@@ -1,4 +1,4 @@
-import { SELContractError, SELEvaluationError, SELParseError, SELTypeError } from "../errors/errors.mjs";
+import { SELContractError, SELEvaluationError } from "../errors/errors.mjs";
 import "../errors/index.mjs";
 import { EvaluationError, ParseError, TypeError } from "@marcbachmann/cel-js";
 //#region src/environment/error-wrapper.ts
@@ -13,13 +13,13 @@ import { EvaluationError, ParseError, TypeError } from "@marcbachmann/cel-js";
 */
 const wrapError = (error) => {
 	if (error instanceof SELContractError) return error;
-	if (error instanceof ParseError) return new SELParseError(error.message, { cause: error });
 	if (error instanceof EvaluationError) {
 		const cause = error.cause;
 		if (cause instanceof SELContractError) return cause;
 		return new SELEvaluationError(error.message, { cause: error });
 	}
-	if (error instanceof TypeError) return new SELTypeError(error.message, { cause: error });
+	if (error instanceof ParseError) return new SELEvaluationError(error.message, { cause: error });
+	if (error instanceof TypeError) return new SELEvaluationError(error.message, { cause: error });
 	if (error instanceof Error) return error;
 	return new Error(String(error));
 };

package/dist/errors/errors.d.cts

@@ -1,5 +1,5 @@
 import { SELDiagnostic } from "@seljs/checker";
-import { SELError, SELParseError, SELTypeError } from "@seljs/common";
+import { SELError } from "@seljs/common";
 
 //#region src/errors/errors.d.ts
 /**
@@ -78,4 +78,4 @@ declare class SELLintError extends SELError {
   });
 }
 //#endregion
-export { CircularDependencyError, ExecutionLimitError, MulticallBatchError, SELClientError, SELContractError, SELError, SELEvaluationError, SELLintError, SELParseError, SELTypeError };
+export { CircularDependencyError, ExecutionLimitError, MulticallBatchError, SELClientError, SELContractError, SELError, SELEvaluationError, SELLintError };

package/dist/errors/errors.d.mts

@@ -1,5 +1,5 @@
 import { SELDiagnostic } from "@seljs/checker";
-import { SELError, SELParseError, SELTypeError } from "@seljs/common";
+import { SELError } from "@seljs/common";
 
 //#region src/errors/errors.d.ts
 /**
@@ -78,4 +78,4 @@ declare class SELLintError extends SELError {
   });
 }
 //#endregion
-export { CircularDependencyError, ExecutionLimitError, MulticallBatchError, SELClientError, SELContractError, SELError, SELEvaluationError, SELLintError, SELParseError, SELTypeError };
+export { CircularDependencyError, ExecutionLimitError, MulticallBatchError, SELClientError, SELContractError, SELError, SELEvaluationError, SELLintError };

package/dist/errors/errors.mjs

@@ -1,4 +1,4 @@
-import { SELError, SELParseError, SELTypeError } from "@seljs/common";
+import { SELError } from "@seljs/common";
 //#region src/errors/errors.ts
 /**
 * Thrown when CEL expression evaluation fails.
@@ -78,4 +78,4 @@ var SELLintError = class extends SELError {
 	}
 };
 //#endregion
-export { CircularDependencyError, ExecutionLimitError, MulticallBatchError, SELClientError, SELContractError, SELError, SELEvaluationError, SELLintError, SELParseError, SELTypeError };
+export { CircularDependencyError, ExecutionLimitError, MulticallBatchError, SELClientError, SELContractError, SELError, SELEvaluationError, SELLintError };

package/dist/errors/index.d.mts

@@ -1 +1 @@
-import { CircularDependencyError, ExecutionLimitError, MulticallBatchError, SELClientError, SELContractError, SELError, SELEvaluationError, SELLintError, SELParseError, SELTypeError } from "./errors.mjs";
+import { CircularDependencyError, ExecutionLimitError, MulticallBatchError, SELClientError, SELContractError, SELError, SELEvaluationError, SELLintError } from "./errors.mjs";

package/dist/index.cjs

@@ -15,8 +15,6 @@ exports.SELContractError = require_errors.SELContractError;
 exports.SELError = _seljs_common.SELError;
 exports.SELEvaluationError = require_errors.SELEvaluationError;
 exports.SELLintError = require_errors.SELLintError;
-exports.SELParseError = _seljs_common.SELParseError;
 exports.SELRuntime = require_environment.SELRuntime;
-exports.SELTypeError = _seljs_common.SELTypeError;
 exports.createSEL = require_factory.createSEL;
 exports.validateClient = require_client.validateClient;

package/dist/index.d.cts

@@ -2,7 +2,7 @@ import { SELClient, validateClient } from "./environment/client.cjs";
 import { MulticallOptions, SELLimits, SELRuntimeConfig } from "./environment/types.cjs";
 import { EvaluateOptions, EvaluateResult, ExecutionContext, ExecutionMeta, ExecutionResult } from "./execution/types.cjs";
 import { SELRuntime } from "./environment/environment.cjs";
-import { CircularDependencyError, ExecutionLimitError, MulticallBatchError, SELClientError, SELContractError, SELError, SELEvaluationError, SELLintError, SELParseError, SELTypeError } from "./errors/errors.cjs";
+import { CircularDependencyError, ExecutionLimitError, MulticallBatchError, SELClientError, SELContractError, SELError, SELEvaluationError, SELLintError } from "./errors/errors.cjs";
 import { createSEL } from "./factory.cjs";
 import { CallArgument, CollectedCall, DependencyGraph, ExecutionPlan, ExecutionRound, GraphNode } from "./analysis/types.cjs";
-export { CallArgument, CircularDependencyError, CollectedCall, DependencyGraph, EvaluateOptions, EvaluateResult, ExecutionContext, ExecutionLimitError, ExecutionMeta, ExecutionPlan, ExecutionResult, ExecutionRound, GraphNode, MulticallBatchError, MulticallOptions, SELClient, SELClientError, SELContractError, SELError, SELEvaluationError, SELLimits, SELLintError, SELParseError, SELRuntime, SELRuntimeConfig, SELTypeError, createSEL, validateClient };
+export { CallArgument, CircularDependencyError, CollectedCall, DependencyGraph, EvaluateOptions, EvaluateResult, ExecutionContext, ExecutionLimitError, ExecutionMeta, ExecutionPlan, ExecutionResult, ExecutionRound, GraphNode, MulticallBatchError, MulticallOptions, SELClient, SELClientError, SELContractError, SELError, SELEvaluationError, SELLimits, SELLintError, SELRuntime, SELRuntimeConfig, createSEL, validateClient };

package/dist/index.d.mts

@@ -2,7 +2,7 @@ import { SELClient, validateClient } from "./environment/client.mjs";
 import { MulticallOptions, SELLimits, SELRuntimeConfig } from "./environment/types.mjs";
 import { EvaluateOptions, EvaluateResult, ExecutionContext, ExecutionMeta, ExecutionResult } from "./execution/types.mjs";
 import { SELRuntime } from "./environment/environment.mjs";
-import { CircularDependencyError, ExecutionLimitError, MulticallBatchError, SELClientError, SELContractError, SELError, SELEvaluationError, SELLintError, SELParseError, SELTypeError } from "./errors/errors.mjs";
+import { CircularDependencyError, ExecutionLimitError, MulticallBatchError, SELClientError, SELContractError, SELError, SELEvaluationError, SELLintError } from "./errors/errors.mjs";
 import { createSEL } from "./factory.mjs";
 import { CallArgument, CollectedCall, DependencyGraph, ExecutionPlan, ExecutionRound, GraphNode } from "./analysis/types.mjs";
-export { CallArgument, CircularDependencyError, CollectedCall, DependencyGraph, EvaluateOptions, EvaluateResult, ExecutionContext, ExecutionLimitError, ExecutionMeta, ExecutionPlan, ExecutionResult, ExecutionRound, GraphNode, MulticallBatchError, MulticallOptions, SELClient, SELClientError, SELContractError, SELError, SELEvaluationError, SELLimits, SELLintError, SELParseError, SELRuntime, SELRuntimeConfig, SELTypeError, createSEL, validateClient };
+export { CallArgument, CircularDependencyError, CollectedCall, DependencyGraph, EvaluateOptions, EvaluateResult, ExecutionContext, ExecutionLimitError, ExecutionMeta, ExecutionPlan, ExecutionResult, ExecutionRound, GraphNode, MulticallBatchError, MulticallOptions, SELClient, SELClientError, SELContractError, SELError, SELEvaluationError, SELLimits, SELLintError, SELRuntime, SELRuntimeConfig, createSEL, validateClient };

package/dist/index.mjs

@@ -1,7 +1,7 @@
-import { CircularDependencyError, ExecutionLimitError, MulticallBatchError, SELClientError, SELContractError, SELError, SELEvaluationError, SELLintError, SELParseError, SELTypeError } from "./errors/errors.mjs";
+import { CircularDependencyError, ExecutionLimitError, MulticallBatchError, SELClientError, SELContractError, SELError, SELEvaluationError, SELLintError } from "./errors/errors.mjs";
 import "./errors/index.mjs";
 import { validateClient } from "./environment/client.mjs";
 import { SELRuntime } from "./environment/environment.mjs";
 import "./environment/index.mjs";
 import { createSEL } from "./factory.mjs";
-export { CircularDependencyError, ExecutionLimitError, MulticallBatchError, SELClientError, SELContractError, SELError, SELEvaluationError, SELLintError, SELParseError, SELRuntime, SELTypeError, createSEL, validateClient };
+export { CircularDependencyError, ExecutionLimitError, MulticallBatchError, SELClientError, SELContractError, SELError, SELEvaluationError, SELLintError, SELRuntime, createSEL, validateClient };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seljs/runtime",
-  "version": "1.3.0-beta.14",
+  "version": "1.3.0-beta.17",
   "repository": {
     "url": "https://github.com/abinnovision/seljs"
   },
@@ -50,13 +50,13 @@
   },
   "dependencies": {
     "@marcbachmann/cel-js": "^7.5.3",
-    "@seljs/checker": "1.3.0-beta.14",
-    "@seljs/common": "1.3.0-beta.14",
-    "@seljs/env": "1.3.0-beta.14",
+    "@seljs/checker": "1.3.0-beta.17",
+    "@seljs/common": "1.3.0-beta.17",
+    "@seljs/env": "1.3.0-beta.17",
     "@seljs/schema": "1.2.0",
-    "@seljs/types": "1.3.0-beta.14",
+    "@seljs/types": "1.3.0-beta.17",
     "debug": "^4.4.3",
-    "ox": "^0.14.8"
+    "ox": "^0.14.10"
   },
   "devDependencies": {
     "@abinnovision/eslint-config-base": "^3.2.2",