@rsconcept/rstool 1.3.0 → 1.4.1

package/dist/mappers/types.js

@@ -1,23 +1,19 @@
+import { r as expressionDiagnostic } from "../diagnostic-assembly-DRunIcKQ.js";
 //#region src/mappers/types.ts
 /** Map a domain parser/semantic error to the public diagnostic shape. */
-function toPublicError(error) {
-	return {
-		code: error.code,
-		from: error.from,
-		to: error.to,
-		params: error.params
-	};
+function toDiagnostic(error, expression, target) {
+	return expressionDiagnostic(error, expression, target);
 }
 /** Map a domain analysis result to the public {@link AnalysisResult} shape. */
-function toPublicAnalysis(analysis) {
+function toPublicAnalysis(analysis, expression, target) {
 	return {
 		success: analysis.success,
 		type: analysis.type,
 		valueClass: analysis.valueClass,
-		diagnostics: analysis.errors.map(toPublicError)
+		diagnostics: analysis.errors.map((error) => expressionDiagnostic(error, expression, target))
 	};
 }
 //#endregion
-export { toPublicAnalysis, toPublicError };
+export { toDiagnostic, toPublicAnalysis };
 
 //# sourceMappingURL=types.js.map

package/dist/mappers/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../src/mappers/types.ts"],"sourcesContent":["import { type ValueClass } from '@rsconcept/domain/rslang';\n\nimport { type AnalysisResult, type RSToolErrorDescription } from '../models';\n\n/** Minimal domain error shape before mapping to {@link RSToolErrorDescription}. */\nexport interface DomainErrorLike {\n  code: number;\n  from: number;\n  to: number;\n  params?: readonly string[];\n}\n\n/** Minimal domain analysis shape before mapping to {@link AnalysisResult}. */\nexport interface DomainAnalysisLike {\n  success: boolean;\n  type: Record<string, unknown> | null;\n  valueClass: ValueClass | null;\n  errors: DomainErrorLike[];\n}\n\n/** Map a domain parser/semantic error to the public diagnostic shape. */\nexport function toPublicError(error: DomainErrorLike): RSToolErrorDescription {\n  return {\n    code: error.code,\n    from: error.from,\n    to: error.to,\n    params: error.params\n  };\n}\n\n/** Map a domain analysis result to the public {@link AnalysisResult} shape. */\nexport function toPublicAnalysis(analysis: DomainAnalysisLike): AnalysisResult {\n  return {\n    success: analysis.success,\n    type: analysis.type,\n    valueClass: analysis.valueClass,\n    diagnostics: analysis.errors.map(toPublicError)\n  };\n}\n"],"mappings":";;AAqBA,SAAgB,cAAc,OAAgD;CAC5E,OAAO;EACL,MAAM,MAAM;EACZ,MAAM,MAAM;EACZ,IAAI,MAAM;EACV,QAAQ,MAAM;CAChB;AACF;;AAGA,SAAgB,iBAAiB,UAA8C;CAC7E,OAAO;EACL,SAAS,SAAS;EAClB,MAAM,SAAS;EACf,YAAY,SAAS;EACrB,aAAa,SAAS,OAAO,IAAI,aAAa;CAChD;AACF"}
+{"version":3,"file":"types.js","names":[],"sources":["../../src/mappers/types.ts"],"sourcesContent":["import { DiagnosticKind, type DiagnosticTarget, expressionDiagnostic } from './diagnostic-assembly';\nimport { type RSErrorDescription, type ValueClass } from '@rsconcept/domain/rslang';\n\nimport { type AnalysisResult, type Diagnostic } from '../models';\n\n/** Minimal domain error shape before mapping to {@link Diagnostic}. */\nexport interface DomainErrorLike {\n  code: number;\n  from: number;\n  to: number;\n  params?: readonly string[];\n}\n\n/** Minimal domain analysis shape before mapping to {@link AnalysisResult}. */\nexport interface DomainAnalysisLike {\n  success: boolean;\n  type: Record<string, unknown> | null;\n  valueClass: ValueClass | null;\n  errors: DomainErrorLike[];\n}\n\n/** Map a domain parser/semantic error to the public diagnostic shape. */\nexport function toDiagnostic(error: DomainErrorLike, expression: string, target?: DiagnosticTarget): Diagnostic {\n  return expressionDiagnostic(error as RSErrorDescription, expression, target);\n}\n\n/** Map a domain analysis result to the public {@link AnalysisResult} shape. */\nexport function toPublicAnalysis(\n  analysis: DomainAnalysisLike,\n  expression: string,\n  target?: DiagnosticTarget\n): AnalysisResult {\n  return {\n    success: analysis.success,\n    type: analysis.type,\n    valueClass: analysis.valueClass,\n    diagnostics: analysis.errors.map(error => expressionDiagnostic(error as RSErrorDescription, expression, target))\n  };\n}\n"],"mappings":";;;AAsBA,SAAgB,aAAa,OAAwB,YAAoB,QAAuC;CAC9G,OAAO,qBAAqB,OAA6B,YAAY,MAAM;AAC7E;;AAGA,SAAgB,iBACd,UACA,YACA,QACgB;CAChB,OAAO;EACL,SAAS,SAAS;EAClB,MAAM,SAAS;EACf,YAAY,SAAS;EACrB,aAAa,SAAS,OAAO,KAAI,UAAS,qBAAqB,OAA6B,YAAY,MAAM,CAAC;CACjH;AACF"}

package/dist/model-adapter-D-YmIvQW.js

@@ -0,0 +1,225 @@
+import { r as expressionDiagnostic, t as DiagnosticKind } from "./diagnostic-assembly-DRunIcKQ.js";
+import { assignSchemaDiagnostics } from "@rsconcept/domain/library";
+import { CstType } from "@rsconcept/domain/library/rsform";
+import { EvalStatus } from "@rsconcept/domain/library/rsmodel";
+import { RSLangAnalyzer } from "@rsconcept/domain/rslang";
+import { isInferrable, isInterpretable, toBasicBinding, validateBasicBindingData, validateValueData } from "@rsconcept/domain/library/rsmodel-api";
+import { isBaseSet, normalizeExpression } from "@rsconcept/domain/library/rsform-api";
+import { RSEngine } from "@rsconcept/domain/library/rsengine";
+import { Graph } from "@rsconcept/domain/graph/graph";
+import { extractGlobals } from "@rsconcept/domain/rslang/api";
+//#region src/mappers/rsform-builder.ts
+/** Build a domain {@link RSForm} view from session state (same shape as Portal loader output). */
+function buildRSFormFromSession(session) {
+	const graph = new Graph();
+	const cstByAlias = /* @__PURE__ */ new Map();
+	const cstByID = /* @__PURE__ */ new Map();
+	const analyzer = new RSLangAnalyzer();
+	const items = session.items.map((item) => {
+		const cst = toFrontendConstituenta(item);
+		cstByAlias.set(cst.alias, cst);
+		cstByID.set(cst.id, cst);
+		graph.addNode(cst.id);
+		if (item.cstType === CstType.BASE) analyzer.addBase(cst.alias);
+		if (cst.effectiveType) analyzer.setGlobal(cst.alias, cst.effectiveType, cst.analysis.valueClass);
+		return cst;
+	});
+	for (const cst of items) for (const alias of extractGlobals(cst.definition_formal)) {
+		const source = cstByAlias.get(alias);
+		if (source) graph.addEdge(source.id, cst.id);
+	}
+	return {
+		id: 0,
+		items,
+		cstByAlias,
+		cstByID,
+		graph,
+		analyzer,
+		inheritance: [],
+		attribution: [],
+		attribution_graph: graph.clone(),
+		oss: [],
+		models: [],
+		editors: [],
+		versions: [],
+		is_produced: false,
+		is_attributive: false,
+		version: "latest"
+	};
+}
+/** Enrich session constituents with Portal-style schema metadata used for diagnostics. */
+function enrichSessionConstituents(session) {
+	const schema = buildRSFormFromSession(session);
+	const normalizedDefinitions = /* @__PURE__ */ new Map();
+	const resolveAlias = (id) => schema.cstByID.get(id)?.alias ?? String(id);
+	for (const item of session.items) {
+		const normalized = normalizeExpression(item.definitionFormal, item.cstType);
+		if (normalized) normalizedDefinitions.set(item.id, normalized);
+	}
+	assignSchemaDiagnostics(schema.items, resolveAlias, normalizedDefinitions);
+	return session.items.map((item) => ({
+		item,
+		cst: schema.cstByID.get(item.id)
+	}));
+}
+function toFrontendConstituenta(item) {
+	const effectiveType = item.analysis.type ?? null;
+	return {
+		id: item.id,
+		alias: item.alias,
+		cst_type: item.cstType,
+		definition_formal: item.definitionFormal,
+		definition_raw: item.definitionFormal,
+		definition_resolved: item.definitionFormal,
+		term_raw: item.term,
+		term_resolved: item.term,
+		term_forms: [],
+		convention: item.convention,
+		typification_manual: "",
+		value_is_property: false,
+		crucial: false,
+		attributes: [],
+		diagnostics: [],
+		analysis: {
+			success: item.analysis.success,
+			type: effectiveType,
+			valueClass: item.analysis.valueClass
+		},
+		effectiveType,
+		is_type_mismatch: false,
+		schema: 0,
+		cst_class: "derived",
+		status: item.analysis.success ? "verified" : "incorrect",
+		is_template: false,
+		is_simple_expression: true,
+		parent_schema_index: 0,
+		parent_schema: null,
+		is_inherited: false,
+		has_inherited_children: false,
+		spawn: [],
+		spawn_alias: []
+	};
+}
+//#endregion
+//#region src/mappers/model-adapter.ts
+const SESSION_MODEL_ID = 0;
+var ModelAdapter = class {
+	async setConstituentaValue(session, input) {
+		this.validateSetInput(session, input);
+		const engine = this.createEngine(session);
+		const frontendType = session.items.find((item) => item.id === input.target).cstType;
+		if (isBaseSet(frontendType)) {
+			const binding = toBasicBinding(input.value);
+			await engine.setBasicValue(input.target, binding);
+		} else await engine.setStructureValue(input.target, input.value);
+		session.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+		return structuredClone(session.model);
+	}
+	async setConstituentaValues(session, input) {
+		for (const item of input.items) await this.setConstituentaValue(session, item);
+		return structuredClone(session.model);
+	}
+	async clearConstituentaValues(session, ids) {
+		const engine = this.createEngine(session);
+		for (const id of ids) {
+			await engine.resetValue(id);
+			session.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+		}
+		return structuredClone(session.model);
+	}
+	evaluateExpression(session, expression, cstType) {
+		const result = this.createEngine(session).evaluateExpression(expression, cstType);
+		const status = result.value === null ? result.errors.length > 0 ? EvalStatus.EVAL_FAIL : EvalStatus.EMPTY : EvalStatus.HAS_DATA;
+		return toPublicEvaluationResult(result.value, result.errors, result.iterations, result.cacheHits, status, expression);
+	}
+	evaluateConstituenta(session, constituentId) {
+		const cst = session.items.find((item) => item.id === constituentId);
+		if (!cst) throw new Error(`Unknown constituent: ${constituentId}`);
+		const engine = this.createEngine(session);
+		const result = engine.calculateCst(constituentId);
+		const status = engine.getCstStatus(constituentId);
+		return toPublicEvaluationResult(result.value, result.errors, result.iterations, result.cacheHits, status, cst.definitionFormal, {
+			constituentId: cst.id,
+			alias: cst.alias
+		});
+	}
+	recalculateModel(session) {
+		const engine = this.createEngine(session);
+		engine.recalculateAll();
+		return { items: session.items.map((item) => ({
+			id: item.id,
+			alias: item.alias,
+			value: engine.getCstValue(item.id),
+			status: engine.getCstStatus(item.id)
+		})) };
+	}
+	createEngine(session) {
+		const schema = buildRSFormFromSession(session);
+		const model = buildRSModelFromSession(session);
+		const engine = new RSEngine(SESSION_MODEL_ID, createInMemoryServices(session));
+		engine.loadData(schema, model);
+		return engine;
+	}
+	validateSetInput(session, input) {
+		const cst = session.items.find((item) => item.id === input.target);
+		if (!cst) throw new Error(`Unknown constituent: ${input.target}`);
+		const frontendType = cst.cstType;
+		if (!isInterpretable(frontendType)) throw new Error(`Constituent ${cst.alias} is not interpretable`);
+		if (isInferrable(frontendType)) throw new Error(`Constituent ${cst.alias} is inferrable and cannot be set directly`);
+		if (isBaseSet(frontendType)) {
+			if (!validateBasicBindingData(input.value)) throw new Error(`Invalid basic binding for ${cst.alias}`);
+			return;
+		}
+		if (!validateValueData(input.value)) throw new Error(`Invalid structured value for ${cst.alias}`);
+	}
+};
+function createInMemoryServices(session) {
+	return {
+		setCstValue: async ({ data }) => {
+			for (const item of data) {
+				const entry = {
+					id: item.target,
+					type: item.type,
+					value: item.data
+				};
+				const index = session.model.items.findIndex((existing) => existing.id === item.target);
+				if (index === -1) session.model.items.push(entry);
+				else session.model.items[index] = entry;
+			}
+		},
+		clearValues: async ({ data }) => {
+			const ids = new Set(data.items);
+			session.model.items = session.model.items.filter((item) => !ids.has(item.id));
+		}
+	};
+}
+function buildRSModelFromSession(session) {
+	return {
+		id: SESSION_MODEL_ID,
+		schema: 0,
+		editors: [],
+		items: session.model.items.map((item) => ({
+			id: item.id,
+			type: item.type,
+			value: item.value
+		}))
+	};
+}
+function toPublicEvaluationResult(value, errors, iterations, cacheHits, status, expression, target) {
+	const diagnostics = errors.map((error) => ({
+		...expressionDiagnostic(error, expression, target),
+		kind: DiagnosticKind.MODEL
+	}));
+	return {
+		success: diagnostics.length === 0 && value !== null,
+		value,
+		status,
+		iterations,
+		cacheHits,
+		diagnostics
+	};
+}
+//#endregion
+export { enrichSessionConstituents as n, ModelAdapter as t };
+
+//# sourceMappingURL=model-adapter-D-YmIvQW.js.map

package/dist/model-adapter-D-YmIvQW.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-adapter-D-YmIvQW.js","names":[],"sources":["../src/mappers/rsform-builder.ts","../src/mappers/model-adapter.ts"],"sourcesContent":["import { Graph } from '@rsconcept/domain/graph/graph';\nimport { extractGlobals } from '@rsconcept/domain/rslang/api';\nimport { type ExpressionType, RSLangAnalyzer, type ValueClass } from '@rsconcept/domain/rslang';\nimport { assignSchemaDiagnostics } from '@rsconcept/domain/library';\nimport { isBasicConcept, isLogical, normalizeExpression } from '@rsconcept/domain/library/rsform-api';\nimport { type Constituenta, CstType, type RSForm } from '@rsconcept/domain/library/rsform';\n\nimport { type ConstituentaState, type SessionState } from '../models';\n\nexport interface EnrichedConstituenta {\n  item: ConstituentaState;\n  cst: Constituenta;\n}\n\n/** Build a domain {@link RSForm} view from session state (same shape as Portal loader output). */\nexport function buildRSFormFromSession(session: SessionState): RSForm {\n  const graph = new Graph<number>();\n  const cstByAlias = new Map<string, Constituenta>();\n  const cstByID = new Map<number, Constituenta>();\n  const analyzer = new RSLangAnalyzer();\n\n  const items = session.items.map(item => {\n    const cst = toFrontendConstituenta(item);\n    cstByAlias.set(cst.alias, cst);\n    cstByID.set(cst.id, cst);\n    graph.addNode(cst.id);\n    if (item.cstType === CstType.BASE) {\n      analyzer.addBase(cst.alias);\n    }\n    if (cst.effectiveType) {\n      analyzer.setGlobal(cst.alias, cst.effectiveType, cst.analysis.valueClass as ValueClass | null);\n    }\n    return cst;\n  });\n\n  for (const cst of items) {\n    for (const alias of extractGlobals(cst.definition_formal)) {\n      const source = cstByAlias.get(alias);\n      if (source) {\n        graph.addEdge(source.id, cst.id);\n      }\n    }\n  }\n\n  return {\n    id: 0,\n    items,\n    cstByAlias,\n    cstByID,\n    graph,\n    analyzer,\n    inheritance: [],\n    attribution: [],\n    attribution_graph: graph.clone(),\n    oss: [],\n    models: [],\n    editors: [],\n    versions: [],\n    is_produced: false,\n    is_attributive: false,\n    version: 'latest'\n  } as unknown as RSForm;\n}\n\n/** Enrich session constituents with Portal-style schema metadata used for diagnostics. */\nexport function enrichSessionConstituents(session: SessionState): EnrichedConstituenta[] {\n  const schema = buildRSFormFromSession(session);\n  const normalizedDefinitions = new Map<number, string>();\n  const resolveAlias = (id: number) => schema.cstByID.get(id)?.alias ?? String(id);\n\n  for (const item of session.items) {\n    const normalized = normalizeExpression(item.definitionFormal, item.cstType);\n    if (normalized) {\n      normalizedDefinitions.set(item.id, normalized);\n    }\n  }\n\n  assignSchemaDiagnostics(schema.items, resolveAlias, normalizedDefinitions);\n\n  return session.items.map(item => ({\n    item,\n    cst: schema.cstByID.get(item.id)!\n  }));\n}\n\nfunction toFrontendConstituenta(item: ConstituentaState): Constituenta {\n  const effectiveType = (item.analysis.type ?? null) as ExpressionType | null;\n  return {\n    id: item.id,\n    alias: item.alias,\n    cst_type: item.cstType,\n    definition_formal: item.definitionFormal,\n    definition_raw: item.definitionFormal,\n    definition_resolved: item.definitionFormal,\n    term_raw: item.term,\n    term_resolved: item.term,\n    term_forms: [],\n    convention: item.convention,\n    typification_manual: '',\n    value_is_property: false,\n    crucial: false,\n    attributes: [],\n    diagnostics: [],\n    analysis: {\n      success: item.analysis.success,\n      type: effectiveType,\n      valueClass: item.analysis.valueClass\n    },\n    effectiveType,\n    is_type_mismatch: false,\n    schema: 0,\n    cst_class: 'derived',\n    status: item.analysis.success ? 'verified' : 'incorrect',\n    is_template: false,\n    is_simple_expression: true,\n    parent_schema_index: 0,\n    parent_schema: null,\n    is_inherited: false,\n    has_inherited_children: false,\n    spawn: [],\n    spawn_alias: []\n  } as unknown as Constituenta;\n}\n\nexport function needsBasicMetadata(item: ConstituentaState): boolean {\n  return isBasicConcept(item.cstType) && !isLogical(item.cstType);\n}\n","import { DiagnosticKind, expressionDiagnostic } from './diagnostic-assembly';\nimport { type RSErrorDescription, type Value } from '@rsconcept/domain/rslang';\nimport { isBaseSet } from '@rsconcept/domain/library/rsform-api';\nimport { CstType, type RSForm } from '@rsconcept/domain/library/rsform';\nimport { RSEngine, type RSEngineServices } from '@rsconcept/domain/library/rsengine';\nimport { type BasicBinding, EvalStatus, type RSModel } from '@rsconcept/domain/library/rsmodel';\nimport {\n  isInferrable,\n  isInterpretable,\n  toBasicBinding,\n  validateBasicBindingData,\n  validateValueData\n} from '@rsconcept/domain/library/rsmodel-api';\n\nimport {\n  type EvaluationResult,\n  type RecalculateModelResult,\n  type SessionModelState,\n  type SessionState,\n  type SetConstituentaValueInput\n} from '../models';\nimport { buildRSFormFromSession } from './rsform-builder';\n\nconst SESSION_MODEL_ID = 0;\n\nexport class ModelAdapter {\n  public async setConstituentaValue(\n    session: SessionState,\n    input: SetConstituentaValueInput\n  ): Promise<SessionModelState> {\n    this.validateSetInput(session, input);\n    const engine = this.createEngine(session);\n    const cst = session.items.find(item => item.id === input.target)!;\n    const frontendType = cst.cstType;\n\n    if (isBaseSet(frontendType)) {\n      const binding = toBasicBinding(input.value as Record<string | number, string>);\n      await engine.setBasicValue(input.target, binding);\n    } else {\n      await engine.setStructureValue(input.target, input.value as Value);\n    }\n    session.updatedAt = new Date().toISOString();\n    return structuredClone(session.model);\n  }\n\n  public async setConstituentaValues(\n    session: SessionState,\n    input: { items: SetConstituentaValueInput[] }\n  ): Promise<SessionModelState> {\n    for (const item of input.items) {\n      await this.setConstituentaValue(session, item);\n    }\n    return structuredClone(session.model);\n  }\n\n  public async clearConstituentaValues(session: SessionState, ids: number[]): Promise<SessionModelState> {\n    const engine = this.createEngine(session);\n    for (const id of ids) {\n      await engine.resetValue(id);\n      session.updatedAt = new Date().toISOString();\n    }\n    return structuredClone(session.model);\n  }\n\n  public evaluateExpression(session: SessionState, expression: string, cstType: CstType): EvaluationResult {\n    const engine = this.createEngine(session);\n    const result = engine.evaluateExpression(expression, cstType);\n    const status =\n      result.value === null\n        ? result.errors.length > 0\n          ? EvalStatus.EVAL_FAIL\n          : EvalStatus.EMPTY\n        : EvalStatus.HAS_DATA;\n    return toPublicEvaluationResult(\n      result.value,\n      result.errors,\n      result.iterations,\n      result.cacheHits,\n      status,\n      expression\n    );\n  }\n\n  public evaluateConstituenta(session: SessionState, constituentId: number): EvaluationResult {\n    const cst = session.items.find(item => item.id === constituentId);\n    if (!cst) {\n      throw new Error(`Unknown constituent: ${constituentId}`);\n    }\n    const engine = this.createEngine(session);\n    const result = engine.calculateCst(constituentId);\n    const status = engine.getCstStatus(constituentId);\n    return toPublicEvaluationResult(\n      result.value,\n      result.errors,\n      result.iterations,\n      result.cacheHits,\n      status,\n      cst.definitionFormal,\n      { constituentId: cst.id, alias: cst.alias }\n    );\n  }\n\n  public recalculateModel(session: SessionState): RecalculateModelResult {\n    const engine = this.createEngine(session);\n    engine.recalculateAll();\n    const items = session.items.map(item => ({\n      id: item.id,\n      alias: item.alias,\n      value: engine.getCstValue(item.id) as number | number[] | null,\n      status: engine.getCstStatus(item.id)\n    }));\n    return { items };\n  }\n\n  public createEngine(session: SessionState): RSEngine {\n    const schema = buildRSFormFromSession(session);\n    const model = buildRSModelFromSession(session);\n    const engine = new RSEngine(SESSION_MODEL_ID, createInMemoryServices(session));\n    engine.loadData(schema, model);\n    return engine;\n  }\n\n  private validateSetInput(session: SessionState, input: SetConstituentaValueInput): void {\n    const cst = session.items.find(item => item.id === input.target);\n    if (!cst) {\n      throw new Error(`Unknown constituent: ${input.target}`);\n    }\n    const frontendType = cst.cstType;\n    if (!isInterpretable(frontendType)) {\n      throw new Error(`Constituent ${cst.alias} is not interpretable`);\n    }\n    if (isInferrable(frontendType)) {\n      throw new Error(`Constituent ${cst.alias} is inferrable and cannot be set directly`);\n    }\n    if (isBaseSet(frontendType)) {\n      if (!validateBasicBindingData(input.value)) {\n        throw new Error(`Invalid basic binding for ${cst.alias}`);\n      }\n      return;\n    }\n    if (!validateValueData(input.value)) {\n      throw new Error(`Invalid structured value for ${cst.alias}`);\n    }\n  }\n}\n\nfunction createInMemoryServices(session: SessionState): RSEngineServices {\n  return {\n    setCstValue: async ({ data }) => {\n      for (const item of data) {\n        const entry = {\n          id: item.target,\n          type: item.type,\n          value: item.data as Value | BasicBinding\n        };\n        const index = session.model.items.findIndex(existing => existing.id === item.target);\n        if (index === -1) {\n          session.model.items.push(entry);\n        } else {\n          session.model.items[index] = entry;\n        }\n      }\n    },\n    clearValues: async ({ data }) => {\n      const ids = new Set(data.items);\n      session.model.items = session.model.items.filter(item => !ids.has(item.id));\n    }\n  };\n}\n\nfunction buildRSModelFromSession(session: SessionState): RSModel {\n  return {\n    id: SESSION_MODEL_ID,\n    schema: 0,\n    editors: [],\n    items: session.model.items.map(item => ({\n      id: item.id,\n      type: item.type,\n      value: item.value as Value | BasicBinding\n    }))\n  } as unknown as RSModel;\n}\n\nfunction toPublicEvaluationResult(\n  value: Value | null,\n  errors: RSErrorDescription[],\n  iterations: number,\n  cacheHits: number,\n  status: EvalStatus,\n  expression: string,\n  target?: { constituentId?: number; alias?: string }\n): EvaluationResult {\n  const diagnostics = errors.map(error => ({\n    ...expressionDiagnostic(error, expression, target),\n    kind: DiagnosticKind.MODEL\n  }));\n  return {\n    success: diagnostics.length === 0 && value !== null,\n    value: value as EvaluationResult['value'],\n    status,\n    iterations,\n    cacheHits,\n    diagnostics\n  };\n}\n"],"mappings":";;;;;;;;;;;;AAeA,SAAgB,uBAAuB,SAA+B;CACpE,MAAM,QAAQ,IAAI,MAAc;CAChC,MAAM,6BAAa,IAAI,IAA0B;CACjD,MAAM,0BAAU,IAAI,IAA0B;CAC9C,MAAM,WAAW,IAAI,eAAe;CAEpC,MAAM,QAAQ,QAAQ,MAAM,KAAI,SAAQ;EACtC,MAAM,MAAM,uBAAuB,IAAI;EACvC,WAAW,IAAI,IAAI,OAAO,GAAG;EAC7B,QAAQ,IAAI,IAAI,IAAI,GAAG;EACvB,MAAM,QAAQ,IAAI,EAAE;EACpB,IAAI,KAAK,YAAY,QAAQ,MAC3B,SAAS,QAAQ,IAAI,KAAK;EAE5B,IAAI,IAAI,eACN,SAAS,UAAU,IAAI,OAAO,IAAI,eAAe,IAAI,SAAS,UAA+B;EAE/F,OAAO;CACT,CAAC;CAED,KAAK,MAAM,OAAO,OAChB,KAAK,MAAM,SAAS,eAAe,IAAI,iBAAiB,GAAG;EACzD,MAAM,SAAS,WAAW,IAAI,KAAK;EACnC,IAAI,QACF,MAAM,QAAQ,OAAO,IAAI,IAAI,EAAE;CAEnC;CAGF,OAAO;EACL,IAAI;EACJ;EACA;EACA;EACA;EACA;EACA,aAAa,CAAC;EACd,aAAa,CAAC;EACd,mBAAmB,MAAM,MAAM;EAC/B,KAAK,CAAC;EACN,QAAQ,CAAC;EACT,SAAS,CAAC;EACV,UAAU,CAAC;EACX,aAAa;EACb,gBAAgB;EAChB,SAAS;CACX;AACF;;AAGA,SAAgB,0BAA0B,SAA+C;CACvF,MAAM,SAAS,uBAAuB,OAAO;CAC7C,MAAM,wCAAwB,IAAI,IAAoB;CACtD,MAAM,gBAAgB,OAAe,OAAO,QAAQ,IAAI,EAAE,CAAC,EAAE,SAAS,OAAO,EAAE;CAE/E,KAAK,MAAM,QAAQ,QAAQ,OAAO;EAChC,MAAM,aAAa,oBAAoB,KAAK,kBAAkB,KAAK,OAAO;EAC1E,IAAI,YACF,sBAAsB,IAAI,KAAK,IAAI,UAAU;CAEjD;CAEA,wBAAwB,OAAO,OAAO,cAAc,qBAAqB;CAEzE,OAAO,QAAQ,MAAM,KAAI,UAAS;EAChC;EACA,KAAK,OAAO,QAAQ,IAAI,KAAK,EAAE;CACjC,EAAE;AACJ;AAEA,SAAS,uBAAuB,MAAuC;CACrE,MAAM,gBAAiB,KAAK,SAAS,QAAQ;CAC7C,OAAO;EACL,IAAI,KAAK;EACT,OAAO,KAAK;EACZ,UAAU,KAAK;EACf,mBAAmB,KAAK;EACxB,gBAAgB,KAAK;EACrB,qBAAqB,KAAK;EAC1B,UAAU,KAAK;EACf,eAAe,KAAK;EACpB,YAAY,CAAC;EACb,YAAY,KAAK;EACjB,qBAAqB;EACrB,mBAAmB;EACnB,SAAS;EACT,YAAY,CAAC;EACb,aAAa,CAAC;EACd,UAAU;GACR,SAAS,KAAK,SAAS;GACvB,MAAM;GACN,YAAY,KAAK,SAAS;EAC5B;EACA;EACA,kBAAkB;EAClB,QAAQ;EACR,WAAW;EACX,QAAQ,KAAK,SAAS,UAAU,aAAa;EAC7C,aAAa;EACb,sBAAsB;EACtB,qBAAqB;EACrB,eAAe;EACf,cAAc;EACd,wBAAwB;EACxB,OAAO,CAAC;EACR,aAAa,CAAC;CAChB;AACF;;;ACnGA,MAAM,mBAAmB;AAEzB,IAAa,eAAb,MAA0B;CACxB,MAAa,qBACX,SACA,OAC4B;EAC5B,KAAK,iBAAiB,SAAS,KAAK;EACpC,MAAM,SAAS,KAAK,aAAa,OAAO;EAExC,MAAM,eADM,QAAQ,MAAM,MAAK,SAAQ,KAAK,OAAO,MAAM,MACpC,CAAA,CAAI;EAEzB,IAAI,UAAU,YAAY,GAAG;GAC3B,MAAM,UAAU,eAAe,MAAM,KAAwC;GAC7E,MAAM,OAAO,cAAc,MAAM,QAAQ,OAAO;EAClD,OACE,MAAM,OAAO,kBAAkB,MAAM,QAAQ,MAAM,KAAc;EAEnE,QAAQ,6BAAY,IAAI,KAAK,EAAC,CAAC,YAAY;EAC3C,OAAO,gBAAgB,QAAQ,KAAK;CACtC;CAEA,MAAa,sBACX,SACA,OAC4B;EAC5B,KAAK,MAAM,QAAQ,MAAM,OACvB,MAAM,KAAK,qBAAqB,SAAS,IAAI;EAE/C,OAAO,gBAAgB,QAAQ,KAAK;CACtC;CAEA,MAAa,wBAAwB,SAAuB,KAA2C;EACrG,MAAM,SAAS,KAAK,aAAa,OAAO;EACxC,KAAK,MAAM,MAAM,KAAK;GACpB,MAAM,OAAO,WAAW,EAAE;GAC1B,QAAQ,6BAAY,IAAI,KAAK,EAAC,CAAC,YAAY;EAC7C;EACA,OAAO,gBAAgB,QAAQ,KAAK;CACtC;CAEA,mBAA0B,SAAuB,YAAoB,SAAoC;EAEvG,MAAM,SADS,KAAK,aAAa,OAClB,CAAA,CAAO,mBAAmB,YAAY,OAAO;EAC5D,MAAM,SACJ,OAAO,UAAU,OACb,OAAO,OAAO,SAAS,IACrB,WAAW,YACX,WAAW,QACb,WAAW;EACjB,OAAO,yBACL,OAAO,OACP,OAAO,QACP,OAAO,YACP,OAAO,WACP,QACA,UACF;CACF;CAEA,qBAA4B,SAAuB,eAAyC;EAC1F,MAAM,MAAM,QAAQ,MAAM,MAAK,SAAQ,KAAK,OAAO,aAAa;EAChE,IAAI,CAAC,KACH,MAAM,IAAI,MAAM,wBAAwB,eAAe;EAEzD,MAAM,SAAS,KAAK,aAAa,OAAO;EACxC,MAAM,SAAS,OAAO,aAAa,aAAa;EAChD,MAAM,SAAS,OAAO,aAAa,aAAa;EAChD,OAAO,yBACL,OAAO,OACP,OAAO,QACP,OAAO,YACP,OAAO,WACP,QACA,IAAI,kBACJ;GAAE,eAAe,IAAI;GAAI,OAAO,IAAI;EAAM,CAC5C;CACF;CAEA,iBAAwB,SAA+C;EACrE,MAAM,SAAS,KAAK,aAAa,OAAO;EACxC,OAAO,eAAe;EAOtB,OAAO,EAAE,OANK,QAAQ,MAAM,KAAI,UAAS;GACvC,IAAI,KAAK;GACT,OAAO,KAAK;GACZ,OAAO,OAAO,YAAY,KAAK,EAAE;GACjC,QAAQ,OAAO,aAAa,KAAK,EAAE;EACrC,EACS,EAAM;CACjB;CAEA,aAAoB,SAAiC;EACnD,MAAM,SAAS,uBAAuB,OAAO;EAC7C,MAAM,QAAQ,wBAAwB,OAAO;EAC7C,MAAM,SAAS,IAAI,SAAS,kBAAkB,uBAAuB,OAAO,CAAC;EAC7E,OAAO,SAAS,QAAQ,KAAK;EAC7B,OAAO;CACT;CAEA,iBAAyB,SAAuB,OAAwC;EACtF,MAAM,MAAM,QAAQ,MAAM,MAAK,SAAQ,KAAK,OAAO,MAAM,MAAM;EAC/D,IAAI,CAAC,KACH,MAAM,IAAI,MAAM,wBAAwB,MAAM,QAAQ;EAExD,MAAM,eAAe,IAAI;EACzB,IAAI,CAAC,gBAAgB,YAAY,GAC/B,MAAM,IAAI,MAAM,eAAe,IAAI,MAAM,sBAAsB;EAEjE,IAAI,aAAa,YAAY,GAC3B,MAAM,IAAI,MAAM,eAAe,IAAI,MAAM,0CAA0C;EAErF,IAAI,UAAU,YAAY,GAAG;GAC3B,IAAI,CAAC,yBAAyB,MAAM,KAAK,GACvC,MAAM,IAAI,MAAM,6BAA6B,IAAI,OAAO;GAE1D;EACF;EACA,IAAI,CAAC,kBAAkB,MAAM,KAAK,GAChC,MAAM,IAAI,MAAM,gCAAgC,IAAI,OAAO;CAE/D;AACF;AAEA,SAAS,uBAAuB,SAAyC;CACvE,OAAO;EACL,aAAa,OAAO,EAAE,WAAW;GAC/B,KAAK,MAAM,QAAQ,MAAM;IACvB,MAAM,QAAQ;KACZ,IAAI,KAAK;KACT,MAAM,KAAK;KACX,OAAO,KAAK;IACd;IACA,MAAM,QAAQ,QAAQ,MAAM,MAAM,WAAU,aAAY,SAAS,OAAO,KAAK,MAAM;IACnF,IAAI,UAAU,IACZ,QAAQ,MAAM,MAAM,KAAK,KAAK;SAE9B,QAAQ,MAAM,MAAM,SAAS;GAEjC;EACF;EACA,aAAa,OAAO,EAAE,WAAW;GAC/B,MAAM,MAAM,IAAI,IAAI,KAAK,KAAK;GAC9B,QAAQ,MAAM,QAAQ,QAAQ,MAAM,MAAM,QAAO,SAAQ,CAAC,IAAI,IAAI,KAAK,EAAE,CAAC;EAC5E;CACF;AACF;AAEA,SAAS,wBAAwB,SAAgC;CAC/D,OAAO;EACL,IAAI;EACJ,QAAQ;EACR,SAAS,CAAC;EACV,OAAO,QAAQ,MAAM,MAAM,KAAI,UAAS;GACtC,IAAI,KAAK;GACT,MAAM,KAAK;GACX,OAAO,KAAK;EACd,EAAE;CACJ;AACF;AAEA,SAAS,yBACP,OACA,QACA,YACA,WACA,QACA,YACA,QACkB;CAClB,MAAM,cAAc,OAAO,KAAI,WAAU;EACvC,GAAG,qBAAqB,OAAO,YAAY,MAAM;EACjD,MAAM,eAAe;CACvB,EAAE;CACF,OAAO;EACL,SAAS,YAAY,WAAW,KAAK,UAAU;EACxC;EACP;EACA;EACA;EACA;CACF;AACF"}

package/dist/{model-value-BbonPzMz.d.ts → model-value-BUhr2IjA.d.ts}

@@ -1,4 +1,4 @@
-import { o as RSToolValue, r as EvalStatus, t as BasicBinding } from "./common-DHJalS-Q.js";
+import { a as RSToolValue, r as EvalStatus, t as BasicBinding } from "./common-D6TFl6l_.js";
 
 //#region src/models/model-value.d.ts
 /** Model value for one constituent. */
@@ -43,4 +43,4 @@ interface RecalculateModelResult {
 }
 //#endregion
 export { SetConstituentaValueInput as a, SessionModelState as i, ModelValueState as n, SetConstituentaValuesInput as o, RecalculateModelResult as r, SetModelValuesInput as s, ClearConstituentaValuesInput as t };
-//# sourceMappingURL=model-value-BbonPzMz.d.ts.map
+//# sourceMappingURL=model-value-BUhr2IjA.d.ts.map

package/dist/models/agent-workflow.d.ts

@@ -1,2 +1,2 @@
-import { a as SessionStateResult, i as SessionStateDetail, n as ApplySchemaPatchInput, o as SessionSummary, r as ApplySchemaPatchResult, s as SessionSummaryItem, t as AgentConstituentaPatch } from "../agent-workflow-Gk0Vfnv1.js";
+import { a as SessionStateResult, i as SessionStateDetail, n as ApplySchemaPatchInput, o as SessionSummary, r as ApplySchemaPatchResult, s as SessionSummaryItem, t as AgentConstituentaPatch } from "../agent-workflow-D22FeODL.js";
 export { AgentConstituentaPatch, ApplySchemaPatchInput, ApplySchemaPatchResult, SessionStateDetail, SessionStateResult, SessionSummary, SessionSummaryItem };

package/dist/models/analysis.d.ts

@@ -1,2 +1,2 @@
-import { n as AnalyzeExpressionInput, t as AnalysisResult } from "../analysis-LLnPhmGa.js";
+import { n as AnalyzeExpressionInput, t as AnalysisResult } from "../analysis-DA44pfgA.js";
 export { AnalysisResult, AnalyzeExpressionInput };

package/dist/models/common.d.ts

@@ -1,2 +1,2 @@
-import { a as RSToolErrorDescription, i as RSErrorCode, n as CstType, o as RSToolValue, r as EvalStatus, s as ValueClass, t as BasicBinding } from "../common-DHJalS-Q.js";
-export { type BasicBinding, CstType, EvalStatus, RSErrorCode, RSToolErrorDescription, RSToolValue, ValueClass };
+import { a as RSToolValue, i as RSErrorCode, n as CstType, o as ValueClass, r as EvalStatus, t as BasicBinding } from "../common-D6TFl6l_.js";
+export { type BasicBinding, CstType, EvalStatus, RSErrorCode, RSToolValue, ValueClass };

package/dist/models/common.js

@@ -1,5 +1,5 @@
+import { RSErrorCode } from "@rsconcept/domain/rslang/error";
 import { CstType } from "@rsconcept/domain/library/rsform";
 import { EvalStatus } from "@rsconcept/domain/library/rsmodel";
 import { ValueClass } from "@rsconcept/domain/rslang";
-import { RSErrorCode } from "@rsconcept/domain/rslang/error";
 export { CstType, EvalStatus, RSErrorCode, ValueClass };

package/dist/models/constituenta.d.ts

@@ -1,2 +1,2 @@
-import { a as ApplyConstituentsResult, i as ApplyConstituentsMode, n as AddOrUpdateConstituentaResult, o as ConstituentaDraft, r as ApplyConstituentsInput, s as ConstituentaState, t as AddOrUpdateConstituentaInput } from "../constituenta-DnGR6bnM.js";
+import { a as ApplyConstituentsResult, i as ApplyConstituentsMode, n as AddOrUpdateConstituentaResult, o as ConstituentaDraft, r as ApplyConstituentsInput, s as ConstituentaState, t as AddOrUpdateConstituentaInput } from "../constituenta-QY5w1x91.js";
 export { AddOrUpdateConstituentaInput, AddOrUpdateConstituentaResult, ApplyConstituentsInput, ApplyConstituentsMode, ApplyConstituentsResult, ConstituentaDraft, ConstituentaState };

package/dist/models/diagnostic.d.ts

@@ -1,2 +1,2 @@
-import { n as ListDiagnosticsFilters, t as DiagnosticRecord } from "../diagnostic-D9yl_mEL.js";
-export { DiagnosticRecord, ListDiagnosticsFilters };
+import { a as Diagnostic, c as expandCstDiagnostic, d as getDiagnosticSeverity, f as modelStatusDiagnostic, i as RSDiagnosticCode, l as expressionDiagnostic, n as DiagnosticKind, o as DiagnosticSeverity, r as ListDiagnosticsFilters, s as DiagnosticTarget, t as CstDiagnostic, u as getDiagnosticName } from "../diagnostic-C6TRoBgt.js";
+export { type CstDiagnostic, type Diagnostic, DiagnosticKind, type DiagnosticSeverity, type DiagnosticTarget, ListDiagnosticsFilters, RSDiagnosticCode, expandCstDiagnostic, expressionDiagnostic, getDiagnosticName, getDiagnosticSeverity, modelStatusDiagnostic };

package/dist/models/diagnostic.js

@@ -1 +1,3 @@
-export {};
+import { a as getDiagnosticSeverity, i as getDiagnosticName, n as expandCstDiagnostic, o as modelStatusDiagnostic, r as expressionDiagnostic } from "../diagnostic-assembly-DRunIcKQ.js";
+import { DiagnosticKind, RSDiagnosticCode } from "@rsconcept/domain/library";
+export { DiagnosticKind, RSDiagnosticCode, expandCstDiagnostic, expressionDiagnostic, getDiagnosticName, getDiagnosticSeverity, modelStatusDiagnostic };

package/dist/models/evaluation.d.ts

@@ -1,2 +1,2 @@
-import { i as EvaluationResult, n as EvaluateExpressionInput, r as EvaluateInput, t as EvaluateConstituentaInput } from "../evaluation-Cns8BFm4.js";
+import { i as EvaluationResult, n as EvaluateExpressionInput, r as EvaluateInput, t as EvaluateConstituentaInput } from "../evaluation-Cd4S7-3t.js";
 export { EvaluateConstituentaInput, EvaluateExpressionInput, EvaluateInput, EvaluationResult };

package/dist/models/index.d.ts

@@ -1,11 +1,11 @@
-import { a as RSToolErrorDescription, i as RSErrorCode, n as CstType, o as RSToolValue, r as EvalStatus, s as ValueClass, t as BasicBinding } from "../common-DHJalS-Q.js";
-import { n as AnalyzeExpressionInput, t as AnalysisResult } from "../analysis-LLnPhmGa.js";
-import { n as ListDiagnosticsFilters, t as DiagnosticRecord } from "../diagnostic-D9yl_mEL.js";
-import { i as ApplyConstituentsMode, o as ConstituentaDraft, s as ConstituentaState } from "../constituenta-DnGR6bnM.js";
-import { a as SetConstituentaValueInput, i as SessionModelState, n as ModelValueState, r as RecalculateModelResult, s as SetModelValuesInput } from "../model-value-BbonPzMz.js";
-import { n as SessionRevision, r as SessionState, t as SessionHandle } from "../session-ChexW8i7.js";
-import { a as SessionStateResult, i as SessionStateDetail, n as ApplySchemaPatchInput, o as SessionSummary, r as ApplySchemaPatchResult, s as SessionSummaryItem, t as AgentConstituentaPatch } from "../agent-workflow-Gk0Vfnv1.js";
-import { i as EvaluationResult, r as EvaluateInput } from "../evaluation-Cns8BFm4.js";
-import { a as ExportPortalInput, c as PortalExportKind, d as PortalModelImportData, f as PortalRsformDetails, g as portalItemToDraft, h as PortalTermForm, i as ExportFormat, l as PORTAL_JSON_CONTRACT_VERSION, m as PortalSchemaImportData, n as RSToolAgentContract, o as ExportPortalResult, p as PortalSchemaConstituenta, r as RSToolAgentOptions, s as ImportDataKind, t as CONTRACT_VERSION, u as PortalImportMetadata } from "../tool-contract-0uRGhEfW.js";
-import { t as RSToolAgent } from "../rstool-agent-D2cQze_b.js";
-export { type AgentConstituentaPatch, type AnalysisResult, type AnalyzeExpressionInput, type ApplyConstituentsMode, type ApplySchemaPatchInput, type ApplySchemaPatchResult, type BasicBinding, CONTRACT_VERSION, type ConstituentaDraft, type ConstituentaState, CstType, type DiagnosticRecord, EvalStatus, type EvaluateInput, type EvaluationResult, type ExportFormat, type ExportPortalInput, type ExportPortalResult, type ImportDataKind, type ListDiagnosticsFilters, type ModelValueState, PORTAL_JSON_CONTRACT_VERSION, type PortalExportKind, type PortalImportMetadata, type PortalModelImportData, type PortalRsformDetails, type PortalSchemaConstituenta, type PortalSchemaImportData, type PortalTermForm, RSErrorCode, RSToolAgent, type RSToolAgentContract, type RSToolAgentOptions, type RSToolErrorDescription, type RSToolValue, type RecalculateModelResult, type SessionHandle, type SessionModelState, type SessionRevision, type SessionState, type SessionStateDetail, type SessionStateResult, type SessionSummary, type SessionSummaryItem, type SetConstituentaValueInput, type SetModelValuesInput, ValueClass, portalItemToDraft };
+import { a as Diagnostic, i as RSDiagnosticCode, n as DiagnosticKind, o as DiagnosticSeverity, r as ListDiagnosticsFilters, t as CstDiagnostic } from "../diagnostic-C6TRoBgt.js";
+import { a as RSToolValue, i as RSErrorCode, n as CstType, o as ValueClass, r as EvalStatus, t as BasicBinding } from "../common-D6TFl6l_.js";
+import { n as AnalyzeExpressionInput, t as AnalysisResult } from "../analysis-DA44pfgA.js";
+import { i as ApplyConstituentsMode, o as ConstituentaDraft, s as ConstituentaState } from "../constituenta-QY5w1x91.js";
+import { a as SetConstituentaValueInput, i as SessionModelState, n as ModelValueState, r as RecalculateModelResult, s as SetModelValuesInput } from "../model-value-BUhr2IjA.js";
+import { n as SessionRevision, r as SessionState, t as SessionHandle } from "../session-CI4rLYby.js";
+import { a as SessionStateResult, i as SessionStateDetail, n as ApplySchemaPatchInput, o as SessionSummary, r as ApplySchemaPatchResult, s as SessionSummaryItem, t as AgentConstituentaPatch } from "../agent-workflow-D22FeODL.js";
+import { i as EvaluationResult, r as EvaluateInput } from "../evaluation-Cd4S7-3t.js";
+import { a as ExportPortalInput, c as PortalExportKind, d as PortalModelImportData, f as PortalRsformDetails, g as portalItemToDraft, h as PortalTermForm, i as ExportFormat, l as PORTAL_JSON_CONTRACT_VERSION, m as PortalSchemaImportData, n as RSToolAgentContract, o as ExportPortalResult, p as PortalSchemaConstituenta, r as RSToolAgentOptions, s as ImportDataKind, t as CONTRACT_VERSION, u as PortalImportMetadata } from "../tool-contract-sQfr-DYD.js";
+import { t as RSToolAgent } from "../rstool-agent-BGQAzFly.js";
+export { type AgentConstituentaPatch, type AnalysisResult, type AnalyzeExpressionInput, type ApplyConstituentsMode, type ApplySchemaPatchInput, type ApplySchemaPatchResult, type BasicBinding, CONTRACT_VERSION, type ConstituentaDraft, type ConstituentaState, type CstDiagnostic, CstType, type Diagnostic, DiagnosticKind, type DiagnosticSeverity, EvalStatus, type EvaluateInput, type EvaluationResult, type ExportFormat, type ExportPortalInput, type ExportPortalResult, type ImportDataKind, type ListDiagnosticsFilters, type ModelValueState, PORTAL_JSON_CONTRACT_VERSION, type PortalExportKind, type PortalImportMetadata, type PortalModelImportData, type PortalRsformDetails, type PortalSchemaConstituenta, type PortalSchemaImportData, type PortalTermForm, RSDiagnosticCode, RSErrorCode, RSToolAgent, type RSToolAgentContract, type RSToolAgentOptions, type RSToolValue, type RecalculateModelResult, type SessionHandle, type SessionModelState, type SessionRevision, type SessionState, type SessionStateDetail, type SessionStateResult, type SessionSummary, type SessionSummaryItem, type SetConstituentaValueInput, type SetModelValuesInput, ValueClass, portalItemToDraft };

package/dist/models/index.js

@@ -1,4 +1,5 @@
 import { CstType, EvalStatus, RSErrorCode, ValueClass } from "./common.js";
-import { i as portalItemToDraft, r as PORTAL_JSON_CONTRACT_VERSION, t as RSToolAgent } from "../models-9G6ur_pg.js";
+import { DiagnosticKind, RSDiagnosticCode } from "./diagnostic.js";
+import { i as portalItemToDraft, r as PORTAL_JSON_CONTRACT_VERSION, t as RSToolAgent } from "../models-B255GaEC.js";
 import { CONTRACT_VERSION } from "./tool-contract.js";
-export { CONTRACT_VERSION, CstType, EvalStatus, PORTAL_JSON_CONTRACT_VERSION, RSErrorCode, RSToolAgent, ValueClass, portalItemToDraft };
+export { CONTRACT_VERSION, CstType, DiagnosticKind, EvalStatus, PORTAL_JSON_CONTRACT_VERSION, RSDiagnosticCode, RSErrorCode, RSToolAgent, ValueClass, portalItemToDraft };

package/dist/models/model-value.d.ts

@@ -1,2 +1,2 @@
-import { a as SetConstituentaValueInput, i as SessionModelState, n as ModelValueState, o as SetConstituentaValuesInput, r as RecalculateModelResult, s as SetModelValuesInput, t as ClearConstituentaValuesInput } from "../model-value-BbonPzMz.js";
+import { a as SetConstituentaValueInput, i as SessionModelState, n as ModelValueState, o as SetConstituentaValuesInput, r as RecalculateModelResult, s as SetModelValuesInput, t as ClearConstituentaValuesInput } from "../model-value-BUhr2IjA.js";
 export { ClearConstituentaValuesInput, ModelValueState, RecalculateModelResult, SessionModelState, SetConstituentaValueInput, SetConstituentaValuesInput, SetModelValuesInput };

package/dist/models/rstool-agent.d.ts

@@ -1,2 +1,2 @@
-import { t as RSToolAgent } from "../rstool-agent-D2cQze_b.js";
+import { t as RSToolAgent } from "../rstool-agent-BGQAzFly.js";
 export { RSToolAgent };

package/dist/models/rstool-agent.js

@@ -1,2 +1,2 @@
-import { t as RSToolAgent } from "../models-9G6ur_pg.js";
+import { t as RSToolAgent } from "../models-B255GaEC.js";
 export { RSToolAgent };

package/dist/models/session.d.ts

@@ -1,2 +1,2 @@
-import { n as SessionRevision, r as SessionState, t as SessionHandle } from "../session-ChexW8i7.js";
+import { n as SessionRevision, r as SessionState, t as SessionHandle } from "../session-CI4rLYby.js";
 export { SessionHandle, SessionRevision, SessionState };

package/dist/models/tool-contract.d.ts

@@ -1,2 +1,2 @@
-import { n as RSToolAgentContract, r as RSToolAgentOptions, t as CONTRACT_VERSION } from "../tool-contract-0uRGhEfW.js";
+import { n as RSToolAgentContract, r as RSToolAgentOptions, t as CONTRACT_VERSION } from "../tool-contract-sQfr-DYD.js";
 export { CONTRACT_VERSION, RSToolAgentContract, RSToolAgentOptions };

package/dist/models/tool-contract.js

@@ -1,6 +1,6 @@
 //#region src/models/tool-contract.ts
 /** Agent-visible contract version; bump on breaking API changes. */
-const CONTRACT_VERSION = "2.0.0";
+const CONTRACT_VERSION = "3.0.0";
 //#endregion
 export { CONTRACT_VERSION };
 

package/dist/models/tool-contract.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-contract.js","names":[],"sources":["../../src/models/tool-contract.ts"],"sourcesContent":["import {\n  type ApplySchemaPatchInput,\n  type ApplySchemaPatchResult,\n  type SessionStateDetail,\n  type SessionStateResult\n} from './agent-workflow';\nimport { type AnalysisResult, type AnalyzeExpressionInput } from './analysis';\nimport { type DiagnosticRecord, type ListDiagnosticsFilters } from './diagnostic';\nimport { type EvaluateInput, type EvaluationResult } from './evaluation';\nimport { type ExportPortalInput, type ExportPortalResult, type ImportDataKind } from './import-export';\nimport { type RecalculateModelResult, type SessionModelState, type SetModelValuesInput } from './model-value';\nimport { type SessionHandle, type SessionRevision, type SessionState } from './session';\n\n/** Agent-visible contract version; bump on breaking API changes. */\nexport const CONTRACT_VERSION = '2.0.0';\n\n/** Options for constructing an {@link RSToolAgent}. */\nexport interface RSToolAgentOptions {\n  /** When set, sessions are persisted to this directory and survive process restarts. */\n  persistenceDir?: string;\n}\n\n/**\n * Public method surface of {@link RSToolAgent}.\n *\n * Each method accepts an optional `sessionId`; when omitted, the current session is used\n * (or a new one is created where noted).\n */\nexport interface RSToolAgentContract {\n  /** Current contract version string (same as {@link CONTRACT_VERSION}). */\n  readonly contractVersion: string;\n\n  /** Return the current session, or create one with optional `initial` metadata. */\n  ensureSession(initial?: Partial<SessionState>): SessionHandle;\n\n  /** Create a new session and make it current. */\n  createSession(initial?: Partial<SessionState>): SessionHandle;\n\n  /** Return the current session handle, or `null` when none is active. */\n  getCurrentSession(): SessionHandle | null;\n\n  /** Switch the active session; throws when `sessionId` is unknown. */\n  setCurrentSession(sessionId: string): SessionHandle;\n\n  /** Apply constituent patches to the schema (analyze, merge, optionally commit). */\n  applySchemaPatch(input: ApplySchemaPatchInput, sessionId?: string): ApplySchemaPatchResult;\n\n  /** Return session summary (default) or full cloned state when `detail` is `'full'`. */\n  getSessionState(detail?: SessionStateDetail, sessionId?: string): SessionStateResult;\n\n  /** List diagnostics for the session, optionally filtered by constituent. */\n  listDiagnostics(filters?: ListDiagnosticsFilters, sessionId?: string): DiagnosticRecord[];\n\n  /** Parse and type-check an RSLang expression against the current schema context. */\n  analyzeExpression(input: AnalyzeExpressionInput, sessionId?: string): AnalysisResult;\n\n  /** Record a revision checkpoint with an optional message. */\n  commitStep(message?: string, sessionId?: string): SessionRevision;\n\n  /** Export the session as a JSON string (state + diagnostics). */\n  exportSession(sessionId?: string): string;\n\n  /** Export schema or model payload in Portal JSON format. */\n  exportPortal(input: ExportPortalInput, sessionId?: string): ExportPortalResult;\n\n  /**\n   * Import a session export or Portal JSON payload and make the new session current.\n   *\n   * When `kind` is `'auto'`, the payload shape is detected automatically.\n   */\n  importData(payload: string | object, kind?: ImportDataKind): SessionHandle;\n\n  /** Set or clear model values for constituents; returns the updated model state. */\n  setModelValues(input: SetModelValuesInput, sessionId?: string): Promise<SessionModelState>;\n\n  /** Return a deep clone of the session model state. */\n  getModelState(sessionId?: string): SessionModelState;\n\n  /**\n   * Evaluate a stored constituent or a scratch expression.\n   *\n   * Provide `constituentId`, or both `expression` and `cstType`.\n   */\n  evaluate(input: EvaluateInput, sessionId?: string): EvaluationResult;\n\n  /** Recompute derived model values for all constituents. */\n  recalculateModel(sessionId?: string): RecalculateModelResult;\n}\n"],"mappings":";;AAcA,MAAa,mBAAmB"}
+{"version":3,"file":"tool-contract.js","names":[],"sources":["../../src/models/tool-contract.ts"],"sourcesContent":["import {\n  type ApplySchemaPatchInput,\n  type ApplySchemaPatchResult,\n  type SessionStateDetail,\n  type SessionStateResult\n} from './agent-workflow';\nimport { type AnalysisResult, type AnalyzeExpressionInput } from './analysis';\nimport { type Diagnostic, type ListDiagnosticsFilters } from './diagnostic';\nimport { type EvaluateInput, type EvaluationResult } from './evaluation';\nimport { type ExportPortalInput, type ExportPortalResult, type ImportDataKind } from './import-export';\nimport { type RecalculateModelResult, type SessionModelState, type SetModelValuesInput } from './model-value';\nimport { type SessionHandle, type SessionRevision, type SessionState } from './session';\n\n/** Agent-visible contract version; bump on breaking API changes. */\nexport const CONTRACT_VERSION = '3.0.0';\n\n/** Options for constructing an {@link RSToolAgent}. */\nexport interface RSToolAgentOptions {\n  /** When set, sessions are persisted to this directory and survive process restarts. */\n  persistenceDir?: string;\n}\n\n/**\n * Public method surface of {@link RSToolAgent}.\n *\n * Each method accepts an optional `sessionId`; when omitted, the current session is used\n * (or a new one is created where noted).\n */\nexport interface RSToolAgentContract {\n  /** Current contract version string (same as {@link CONTRACT_VERSION}). */\n  readonly contractVersion: string;\n\n  /** Return the current session, or create one with optional `initial` metadata. */\n  ensureSession(initial?: Partial<SessionState>): SessionHandle;\n\n  /** Create a new session and make it current. */\n  createSession(initial?: Partial<SessionState>): SessionHandle;\n\n  /** Return the current session handle, or `null` when none is active. */\n  getCurrentSession(): SessionHandle | null;\n\n  /** Switch the active session; throws when `sessionId` is unknown. */\n  setCurrentSession(sessionId: string): SessionHandle;\n\n  /** Apply constituent patches to the schema (analyze, merge, optionally commit). */\n  applySchemaPatch(input: ApplySchemaPatchInput, sessionId?: string): ApplySchemaPatchResult;\n\n  /** Return session summary (default) or full cloned state when `detail` is `'full'`. */\n  getSessionState(detail?: SessionStateDetail, sessionId?: string): SessionStateResult;\n\n  /** List diagnostics for the session, optionally filtered by constituent or kind. */\n  listDiagnostics(filters?: ListDiagnosticsFilters, sessionId?: string): Diagnostic[];\n\n  /** Parse and type-check an RSLang expression against the current schema context. */\n  analyzeExpression(input: AnalyzeExpressionInput, sessionId?: string): AnalysisResult;\n\n  /** Record a revision checkpoint with an optional message. */\n  commitStep(message?: string, sessionId?: string): SessionRevision;\n\n  /** Export the session as a JSON string (state + diagnostics). */\n  exportSession(sessionId?: string): string;\n\n  /** Export schema or model payload in Portal JSON format. */\n  exportPortal(input: ExportPortalInput, sessionId?: string): ExportPortalResult;\n\n  /**\n   * Import a session export or Portal JSON payload and make the new session current.\n   *\n   * When `kind` is `'auto'`, the payload shape is detected automatically.\n   */\n  importData(payload: string | object, kind?: ImportDataKind): SessionHandle;\n\n  /** Set or clear model values for constituents; returns the updated model state. */\n  setModelValues(input: SetModelValuesInput, sessionId?: string): Promise<SessionModelState>;\n\n  /** Return a deep clone of the session model state. */\n  getModelState(sessionId?: string): SessionModelState;\n\n  /**\n   * Evaluate a stored constituent or a scratch expression.\n   *\n   * Provide `constituentId`, or both `expression` and `cstType`.\n   */\n  evaluate(input: EvaluateInput, sessionId?: string): EvaluationResult;\n\n  /** Recompute derived model values for all constituents. */\n  recalculateModel(sessionId?: string): RecalculateModelResult;\n}\n"],"mappings":";;AAcA,MAAa,mBAAmB"}

package/dist/{models-9G6ur_pg.js → models-B255GaEC.js}

@@ -1,7 +1,11 @@
+import { n as expandCstDiagnostic, o as modelStatusDiagnostic, t as DiagnosticKind } from "./diagnostic-assembly-DRunIcKQ.js";
+import { toDiagnostic } from "./mappers/types.js";
 import { CstType } from "./models/common.js";
-import { ModelAdapter } from "./mappers/model-adapter.js";
+import "./models/diagnostic.js";
+import { n as enrichSessionConstituents, t as ModelAdapter } from "./model-adapter-D-YmIvQW.js";
 import { SchemaAdapter } from "./mappers/schema-adapter.js";
 import { CONTRACT_VERSION } from "./models/tool-contract.js";
+import { isModelIssue } from "@rsconcept/domain/library/rsmodel-api";
 import { Graph } from "@rsconcept/domain/graph/graph";
 import { extractGlobals } from "@rsconcept/domain/rslang/api";
 import { randomUUID } from "node:crypto";
@@ -53,6 +57,45 @@ function portalDetailsToDrafts(data) {
 	return portalItemsToDrafts(data.items);
 }
 //#endregion
+//#region src/mappers/diagnostics-collector.ts
+const modelAdapter = new ModelAdapter();
+/** Collect expression and schema diagnostics for a session. */
+function collectSchemaDiagnostics(session) {
+	const records = [];
+	for (const item of session.items) for (const diagnostic of item.analysis.diagnostics) {
+		const base = diagnostic.name ? diagnostic : toDiagnostic(diagnostic, item.definitionFormal, {
+			constituentId: item.id,
+			alias: item.alias
+		});
+		records.push({
+			...base,
+			kind: DiagnosticKind.EXPRESSION,
+			constituentId: base.constituentId ?? item.id,
+			alias: base.alias ?? item.alias
+		});
+	}
+	const enriched = enrichSessionConstituents(session);
+	for (const { cst } of enriched) for (const diagnostic of cst.diagnostics) {
+		if (diagnostic.kind !== DiagnosticKind.SCHEMA) continue;
+		records.push(expandCstDiagnostic(cst, diagnostic));
+	}
+	return records;
+}
+/** Collect model diagnostics for a session (requires schema items). */
+function collectModelDiagnostics(session) {
+	if (session.items.length === 0) return [];
+	const records = [];
+	const schema = enrichSessionConstituents(session).map((entry) => entry.cst);
+	const engine = modelAdapter.createEngine(session);
+	engine.recalculateAll();
+	for (const cst of schema) {
+		if (!isModelIssue(engine, cst)) continue;
+		const diagnostic = modelStatusDiagnostic(engine.getCstStatus(cst.id), cst);
+		if (diagnostic) records.push(diagnostic);
+	}
+	return records;
+}
+//#endregion
 //#region src/session/batch-apply.ts
 /** Order drafts so suppliers are applied before dependents. */
 function orderDrafts(sessionItems, drafts) {
@@ -174,7 +217,7 @@ var SessionStore = class {
 		this.persist(sessionId, envelope);
 		return {
 			sessionId,
-			contractVersion: contractVersion ?? "2.0.0"
+			contractVersion: contractVersion ?? "3.0.0"
 		};
 	}
 	get(sessionId) {
@@ -222,9 +265,11 @@ var SessionStore = class {
 		this.persist(sessionId, found);
 	}
 	listDiagnostics(sessionId, filters) {
-		const found = this.get(sessionId);
-		if (filters?.constituentId === void 0) return [...found.diagnostics];
-		return found.diagnostics.filter((record) => record.constituentId === filters.constituentId);
+		let records = this.get(sessionId).diagnostics;
+		if (filters?.kind !== void 0) records = records.filter((record) => record.kind === filters.kind);
+		if (filters?.severity !== void 0) records = records.filter((record) => record.severity === filters.severity);
+		if (filters?.constituentId === void 0) return [...records];
+		return records.filter((record) => record.constituentId === filters.constituentId);
 	}
 	snapshot(sessionId) {
 		const found = this.get(sessionId);
@@ -405,11 +450,15 @@ var RSToolAgent = class {
 			cstType: input.cstType,
 			definitionFormal: input.expression
 		});
-		if (input.recordDiagnostics) this.sessions.replaceDiagnosticsForConstituent(id, void 0, diagnostics.map((item) => ({
+		const sanitizedDiagnostics = diagnostics.map((item) => ({
 			...item,
 			constituentId: void 0
-		})));
-		return result;
+		}));
+		if (input.recordDiagnostics) this.sessions.setDiagnostics(id, [...collectSchemaDiagnostics(envelope.state), ...sanitizedDiagnostics]);
+		return {
+			...result,
+			diagnostics: sanitizedDiagnostics
+		};
 	}
 	/** @inheritdoc */
 	commitStep(message, sessionId) {
@@ -463,8 +512,10 @@ var RSToolAgent = class {
 					model
 				};
 				this.sessions.replaceState(id, state);
+				this.refreshModelDiagnostics(id);
 				return model;
 			}
+			this.refreshModelDiagnostics(id);
 			return structuredClone(this.sessions.get(id).state.model);
 		} catch (error) {
 			this.sessions.restore(id, snapshot);
@@ -485,17 +536,18 @@ var RSToolAgent = class {
 	}
 	/** @inheritdoc */
 	recalculateModel(sessionId) {
-		const envelope = this.sessions.get(this.resolveSessionId(sessionId));
-		return this.evaluation.recalculateModel(envelope.state);
+		const id = this.resolveSessionId(sessionId);
+		const envelope = this.sessions.get(id);
+		const result = this.evaluation.recalculateModel(envelope.state);
+		this.refreshModelDiagnostics(id);
+		return result;
 	}
 	addOrUpdateConstituenta(input, sessionId) {
 		const id = this.resolveSessionId(sessionId);
 		const envelope = this.sessions.get(id);
 		const { result, diagnostics } = this.adapter.analyzeAgainstSession(envelope.state, input.draft);
-		const state = this.adapter.mergeStateWithDraft(envelope.state, input.draft, result);
-		this.sessions.replaceDiagnosticsForConstituent(id, input.draft.id, diagnostics);
 		return {
-			state,
+			state: this.adapter.mergeStateWithDraft(envelope.state, input.draft, result),
 			diagnostics
 		};
 	}
@@ -530,6 +582,7 @@ var RSToolAgent = class {
 		const envelope = this.sessions.get(id);
 		reorderSessionItemsByDrafts(envelope.state.items, input.drafts, preBatchItemIds);
 		this.sessions.replaceState(id, envelope.state);
+		this.refreshDiagnostics(id);
 		return {
 			success: failed.length === 0,
 			applied,
@@ -600,6 +653,7 @@ var RSToolAgent = class {
 		const data = parsed;
 		const handle = this.sessions.create(normalizeImportedState(data.state), this.contractVersion);
 		if (data.diagnostics?.length) this.sessions.setDiagnostics(handle.sessionId, data.diagnostics);
+		else this.refreshDiagnostics(handle.sessionId);
 		return this.trackSession(handle);
 	}
 	importPortalSchemaData(data) {
@@ -677,8 +731,16 @@ var RSToolAgent = class {
 		this.sessions.saveCurrentSessionId(handle.sessionId);
 		return handle;
 	}
+	refreshDiagnostics(sessionId) {
+		const envelope = this.sessions.get(sessionId);
+		this.sessions.setDiagnostics(sessionId, collectSchemaDiagnostics(envelope.state));
+	}
+	refreshModelDiagnostics(sessionId) {
+		const envelope = this.sessions.get(sessionId);
+		this.sessions.setDiagnostics(sessionId, [...collectSchemaDiagnostics(envelope.state), ...collectModelDiagnostics(envelope.state)]);
+	}
 };
 //#endregion
 export { portalItemToDraft as i, SessionStore as n, PORTAL_JSON_CONTRACT_VERSION as r, RSToolAgent as t };
 
-//# sourceMappingURL=models-9G6ur_pg.js.map
+//# sourceMappingURL=models-B255GaEC.js.map