@rsconcept/rstool 1.5.0 → 1.7.0

package/README.md

@@ -2,7 +2,7 @@
 
 Agent-facing library for **incremental RSForm construction**, **RSLang expression analysis**, **diagnostics**, **modeling**, and **evaluation**. It wraps [`@rsconcept/domain`](https://www.npmjs.com/package/@rsconcept/domain) with a deterministic session contract and a stdio JSON wrapper for LLM agents. MCP hosts can use it through [`@rsconcept/rstool-mcp`](https://www.npmjs.com/package/@rsconcept/rstool-mcp).
 
-**Contract version:** `3.0.0` — see [skills/rstool-helper/REFERENCE.md](./skills/rstool-helper/REFERENCE.md) for the full v3 API.
+**Contract version:** `3.2.0` — see [skills/rstool-helper/REFERENCE.md](./skills/rstool-helper/REFERENCE.md) for the full v3 API.
 
 ## Agent skill
 
@@ -77,7 +77,7 @@ Maintainers: see [PUBLISHING.md](./PUBLISHING.md) for npm release steps.
 - If a session method is called without an active session, rstool creates one lazily.
 - On startup, a ready handshake is printed.
 
-Supported methods (contract `3.0.0`):
+Supported methods (contract `3.2.0`):
 
 - `ping`
 - `methods`
@@ -97,6 +97,8 @@ Supported methods (contract `3.0.0`):
 - `getModelState`
 - `evaluate`
 - `recalculateModel`
+- `restoreOrder`
+- `synthesize`
 
 Params are **flat** at the top level (no `params.input` wrapper). Optional `sessionId` sits alongside method fields.
 
@@ -111,7 +113,7 @@ Request:
 Response:
 
 ```json
-{ "id": "1", "ok": true, "result": { "sessionId": "...", "contractVersion": "3.0.0" } }
+{ "id": "1", "ok": true, "result": { "sessionId": "...", "contractVersion": "3.2.0" } }
 ```
 
 Example `applySchemaPatch`:
@@ -140,7 +142,7 @@ Response:
   "ok": true,
   "result": {
     "success": true,
-    "session": { "sessionId": "...", "contractVersion": "3.0.0" },
+    "session": { "sessionId": "...", "contractVersion": "3.2.0" },
     "summary": { "itemCount": 3 }
   }
 }

package/dist/agent-workflow-DY-hfAap.d.ts

@@ -0,0 +1,116 @@
+import { a as Diagnostic } from "./diagnostic-CODFUU-Q.js";
+import { n as CstType } from "./common-D6TFl6l_.js";
+import { a as ApplyConstituentsResult, i as ApplyConstituentsMode, o as ConstituentaDraft } from "./constituenta-HTnFtmxt.js";
+import { n as SessionRevision, r as SessionState, t as SessionHandle } from "./session-Uc_vHrq9.js";
+
+//#region src/models/agent-workflow.d.ts
+/** Level of detail returned by {@link RSToolAgent.getSessionState}. */
+type SessionStateDetail = 'summary' | 'full';
+/** Result of `getSessionState`: compact summary or full cloned session state. */
+type SessionStateResult = SessionSummary | SessionState;
+/**
+ * Partial constituent update used in {@link ApplySchemaPatchInput}.
+ *
+ * `alias` is required; other fields are merged with any existing constituent
+ * or inferred from the alias prefix when omitted.
+ */
+interface AgentConstituentaPatch extends Omit<Partial<ConstituentaDraft>, 'alias'> {
+  alias: string;
+}
+/** Input for {@link RSToolAgent.applySchemaPatch}. */
+interface ApplySchemaPatchInput {
+  /** Metadata used only when a new session is created for this patch. */
+  initial?: {
+    alias?: string;
+    title?: string;
+    comment?: string;
+  };
+  /** Constituent patches to apply in dependency order. */
+  items: AgentConstituentaPatch[];
+  /** atomic: rollback on first failure; best_effort applies valid drafts. Default: atomic. */
+  mode?: ApplyConstituentsMode;
+  /** When set, a revision is recorded after a successful patch. */
+  commitMessage?: string;
+}
+/** Result of {@link RSToolAgent.restoreOrder}. */
+interface RestoreOrderResult {
+  /** Constituent ids in the restored declaration order. */
+  orderedIds: number[];
+  /** Aliases in the same order as {@link orderedIds}. */
+  orderedAliases: string[];
+}
+/** One row of an identification (substitution) table, by alias. */
+interface SynthesisSubstitution {
+  /** Alias of the constituenta being replaced (deleted). */
+  original: string;
+  /** Alias of the surviving constituenta. */
+  substitution: string;
+}
+/** Input for {@link RSToolAgent.synthesize}. */
+interface SynthesizeInput {
+  /** Session whose constituents are merged into the receiver. */
+  sourceSessionId: string;
+  /**
+   * Optional subset of source aliases to import.
+   * Omit or pass an empty array to import all source constituents.
+   */
+  items?: string[];
+  /**
+   * Identification table: one endpoint is a source alias, the other a receiver alias
+   * (same rules as Portal schema embedding / «Встраивание схемы»).
+   */
+  substitutions?: SynthesisSubstitution[];
+  /** When set, a revision is recorded after a successful synthesis. */
+  commitMessage?: string;
+}
+/** Result of {@link RSToolAgent.synthesize}. */
+interface SynthesizeResult {
+  session: SessionHandle;
+  summary: SessionSummary;
+  /** False when some constituents failed re-analysis after embedding (best-effort). */
+  success: boolean;
+  /** Drafts that failed analysis after embedding; empty when {@link success} is true. */
+  failed: Array<{
+    draft: ConstituentaDraft;
+    diagnostics: Diagnostic[];
+  }>;
+  /** Source constituent id → inserted id in the receiver (before substitutions). */
+  idMap: Record<number, number>;
+  /** Alias remapping applied to imported constituents. */
+  aliasMapping: Record<string, string>;
+  /** Ids removed by substitutions. */
+  deletedIds: number[];
+  /** Ids of constituents inserted from the source (may include later-deleted ones). */
+  insertedIds: number[];
+  revision?: SessionRevision;
+}
+/** Compact view of one constituent in a session summary. */
+interface SessionSummaryItem {
+  id: number;
+  alias: string;
+  cstType: CstType;
+  analysisSuccess: boolean;
+}
+/** Compact session overview returned by default from `getSessionState`. */
+interface SessionSummary {
+  sessionId: string;
+  contractVersion: string;
+  alias: string;
+  title: string;
+  comment: string;
+  itemCount: number;
+  modelItemCount: number;
+  diagnosticsCount: number;
+  items: SessionSummaryItem[];
+  diagnostics: Diagnostic[];
+  lastRevision?: SessionRevision;
+}
+/** Result of {@link RSToolAgent.applySchemaPatch}. */
+interface ApplySchemaPatchResult extends ApplyConstituentsResult {
+  session: SessionHandle;
+  summary: SessionSummary;
+  revision?: SessionRevision;
+}
+//#endregion
+export { SessionStateDetail as a, SessionSummaryItem as c, SynthesizeResult as d, RestoreOrderResult as i, SynthesisSubstitution as l, ApplySchemaPatchInput as n, SessionStateResult as o, ApplySchemaPatchResult as r, SessionSummary as s, AgentConstituentaPatch as t, SynthesizeInput as u };
+//# sourceMappingURL=agent-workflow-DY-hfAap.d.ts.map

package/dist/{analysis-DA44pfgA.d.ts → analysis-ktWFu4BY.d.ts}

@@ -1,4 +1,4 @@
-import { a as Diagnostic } from "./diagnostic-C6TRoBgt.js";
+import { a as Diagnostic } from "./diagnostic-CODFUU-Q.js";
 import { n as CstType, o as ValueClass } from "./common-D6TFl6l_.js";
 
 //#region src/models/analysis.d.ts
@@ -21,4 +21,4 @@ interface AnalysisResult {
 }
 //#endregion
 export { AnalyzeExpressionInput as n, AnalysisResult as t };
-//# sourceMappingURL=analysis-DA44pfgA.d.ts.map
+//# sourceMappingURL=analysis-ktWFu4BY.d.ts.map

package/dist/{constituenta-QY5w1x91.d.ts → constituenta-HTnFtmxt.d.ts}

@@ -1,6 +1,6 @@
-import { a as Diagnostic } from "./diagnostic-C6TRoBgt.js";
+import { a as Diagnostic } from "./diagnostic-CODFUU-Q.js";
 import { n as CstType } from "./common-D6TFl6l_.js";
-import { t as AnalysisResult } from "./analysis-DA44pfgA.js";
+import { t as AnalysisResult } from "./analysis-ktWFu4BY.js";
 
 //#region src/models/constituenta.d.ts
 /** Constituent payload before analysis and merge into session state. */
@@ -51,4 +51,4 @@ interface ApplyConstituentsResult {
 }
 //#endregion
 export { ApplyConstituentsResult as a, ApplyConstituentsMode as i, AddOrUpdateConstituentaResult as n, ConstituentaDraft as o, ApplyConstituentsInput as r, ConstituentaState as s, AddOrUpdateConstituentaInput as t };
-//# sourceMappingURL=constituenta-QY5w1x91.d.ts.map
+//# sourceMappingURL=constituenta-HTnFtmxt.d.ts.map

package/dist/{diagnostic-C6TRoBgt.d.ts → diagnostic-CODFUU-Q.d.ts}

@@ -1,6 +1,7 @@
-import { Constituenta, CstDiagnostic, CstDiagnostic as CstDiagnostic$1, DiagnosticKind, DiagnosticKind as DiagnosticKind$1, RSDiagnosticCode, RSDiagnosticCode as RSDiagnosticCode$1 } from "@rsconcept/domain/library";
+import { CstDiagnostic, CstDiagnostic as CstDiagnostic$1, DiagnosticKind, DiagnosticKind as DiagnosticKind$1, RSDiagnosticCode, RSDiagnosticCode as RSDiagnosticCode$1 } from "@rsconcept/domain/library";
 import { RSErrorDescription } from "@rsconcept/domain/rslang/error";
 import { EvalStatus } from "@rsconcept/domain/library/rsmodel";
+import { DiagnosticSourceFields } from "@rsconcept/domain/library/rsform-api";
 
 //#region src/mappers/diagnostic-assembly.d.ts
 /** Severity of a {@link Diagnostic}. */
@@ -22,9 +23,9 @@ interface DiagnosticTarget {
 }
 declare function getDiagnosticName(code: number): string;
 declare function getDiagnosticSeverity(code: number): DiagnosticSeverity;
-declare function expandCstDiagnostic(cst: Constituenta, diagnostic: CstDiagnostic): Diagnostic;
+declare function expandCstDiagnostic(cst: DiagnosticSourceFields, diagnostic: CstDiagnostic): Diagnostic;
 declare function expressionDiagnostic(error: RSErrorDescription, expression: string, target?: DiagnosticTarget): Diagnostic;
-declare function modelStatusDiagnostic(status: EvalStatus, cst: Constituenta): Diagnostic | null;
+declare function modelStatusDiagnostic(status: EvalStatus, cst: DiagnosticSourceFields): Diagnostic | null;
 //#endregion
 //#region src/models/diagnostic.d.ts
 /** Filters for {@link RSToolAgent.listDiagnostics}. */
@@ -35,4 +36,4 @@ interface ListDiagnosticsFilters {
 }
 //#endregion
 export { Diagnostic as a, expandCstDiagnostic as c, getDiagnosticSeverity as d, modelStatusDiagnostic as f, RSDiagnosticCode as i, expressionDiagnostic as l, DiagnosticKind as n, DiagnosticSeverity as o, ListDiagnosticsFilters as r, DiagnosticTarget as s, CstDiagnostic$1 as t, getDiagnosticName as u };
-//# sourceMappingURL=diagnostic-C6TRoBgt.d.ts.map
+//# sourceMappingURL=diagnostic-CODFUU-Q.d.ts.map

package/dist/{diagnostic-assembly-DRunIcKQ.js → diagnostic-assembly-B-6vIA5I.js}

@@ -45,10 +45,12 @@ function expressionForCstDiagnostic(cst, diagnostic) {
 		case RSDiagnosticCode.schemaMissingTerm: return cst.term_resolved;
 		case RSDiagnosticCode.schemaMissingConvention: return cst.convention;
 		case RSDiagnosticCode.schemaTypeMismatch: return cst.typification_manual;
+		case RSDiagnosticCode.schemaDependencyCycle:
+		case RSDiagnosticCode.schemaFormalDuplicate: return cst.definition_formal;
 		default: return cst.definition_formal;
 	}
 }
 //#endregion
 export { getDiagnosticSeverity as a, getDiagnosticName as i, expandCstDiagnostic as n, modelStatusDiagnostic as o, expressionDiagnostic as r, DiagnosticKind as t };
 
-//# sourceMappingURL=diagnostic-assembly-DRunIcKQ.js.map
+//# sourceMappingURL=diagnostic-assembly-B-6vIA5I.js.map

package/dist/diagnostic-assembly-B-6vIA5I.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"diagnostic-assembly-B-6vIA5I.js","names":[],"sources":["../src/mappers/diagnostic-assembly.ts"],"sourcesContent":["import {\n  type CstDiagnostic,\n  DiagnosticKind,\n  modelStatusCstDiagnostic,\n  RSDiagnosticCode\n} from '@rsconcept/domain/library';\nimport { type DiagnosticSourceFields } from '@rsconcept/domain/library/rsform-api';\nimport { EvalStatus } from '@rsconcept/domain/library/rsmodel';\nimport { isCritical, RSErrorCode, type RSErrorDescription } from '@rsconcept/domain/rslang/error';\n\nexport { DiagnosticKind, RSDiagnosticCode };\n\n/** Severity of a {@link Diagnostic}. */\nexport type DiagnosticSeverity = 'error' | 'warning';\n\n/** Agent-facing diagnostic with redundant fields for autonomous repair. */\nexport interface Diagnostic extends CstDiagnostic {\n  name: string;\n  severity: DiagnosticSeverity;\n  constituentId?: number;\n  alias?: string;\n  expression: string;\n  from: number;\n  to: number;\n}\n\n/** Context for attributing a {@link Diagnostic} to a constituent. */\nexport interface DiagnosticTarget {\n  constituentId?: number;\n  alias?: string;\n}\n\nconst DIAGNOSTIC_NAMES: ReadonlyMap<number, string> = new Map([\n  ...Object.entries(RSErrorCode).map(([name, code]) => [code, name] as const),\n  ...Object.entries(RSDiagnosticCode).map(([name, code]) => [code, name] as const)\n]);\n\nexport function getDiagnosticName(code: number): string {\n  return DIAGNOSTIC_NAMES.get(code) ?? `0x${code.toString(16).toUpperCase()}`;\n}\n\nexport function getDiagnosticSeverity(code: number): DiagnosticSeverity {\n  return isCritical(code as RSErrorCode) ? 'error' : 'warning';\n}\n\nexport function expandCstDiagnostic(cst: DiagnosticSourceFields, diagnostic: CstDiagnostic): Diagnostic {\n  const expression = expressionForCstDiagnostic(cst, diagnostic);\n  return {\n    ...diagnostic,\n    name: getDiagnosticName(diagnostic.code),\n    severity: getDiagnosticSeverity(diagnostic.code),\n    constituentId: cst.id,\n    alias: cst.alias,\n    expression,\n    from: 0,\n    to: diagnostic.kind === DiagnosticKind.MODEL ? 0 : Math.max(expression.length, 1)\n  };\n}\n\nexport function expressionDiagnostic(\n  error: RSErrorDescription,\n  expression: string,\n  target?: DiagnosticTarget\n): Diagnostic {\n  return {\n    kind: DiagnosticKind.EXPRESSION,\n    code: error.code,\n    name: getDiagnosticName(error.code),\n    severity: getDiagnosticSeverity(error.code),\n    constituentId: target?.constituentId,\n    alias: target?.alias,\n    expression,\n    from: error.from,\n    to: error.to,\n    ...(error.params ? { params: error.params } : {})\n  };\n}\n\nexport function modelStatusDiagnostic(status: EvalStatus, cst: DiagnosticSourceFields): Diagnostic | null {\n  const base = modelStatusCstDiagnostic(status, cst.cst_type);\n  return base ? expandCstDiagnostic(cst, base) : null;\n}\n\nfunction expressionForCstDiagnostic(cst: DiagnosticSourceFields, diagnostic: CstDiagnostic): string {\n  switch (diagnostic.code) {\n    case RSDiagnosticCode.schemaHomonym:\n    case RSDiagnosticCode.schemaMissingTerm:\n      return cst.term_resolved;\n    case RSDiagnosticCode.schemaMissingConvention:\n      return cst.convention;\n    case RSDiagnosticCode.schemaTypeMismatch:\n      return cst.typification_manual;\n    case RSDiagnosticCode.schemaDependencyCycle:\n    case RSDiagnosticCode.schemaFormalDuplicate:\n      return cst.definition_formal;\n    default:\n      return cst.definition_formal;\n  }\n}\n"],"mappings":";;;AAgCA,MAAM,mBAAgD,IAAI,IAAI,CAC5D,GAAG,OAAO,QAAQ,WAAW,CAAC,CAAC,KAAK,CAAC,MAAM,UAAU,CAAC,MAAM,IAAI,CAAU,GAC1E,GAAG,OAAO,QAAQ,gBAAgB,CAAC,CAAC,KAAK,CAAC,MAAM,UAAU,CAAC,MAAM,IAAI,CAAU,CACjF,CAAC;AAED,SAAgB,kBAAkB,MAAsB;CACtD,OAAO,iBAAiB,IAAI,IAAI,KAAK,KAAK,KAAK,SAAS,EAAE,CAAC,CAAC,YAAY;AAC1E;AAEA,SAAgB,sBAAsB,MAAkC;CACtE,OAAO,WAAW,IAAmB,IAAI,UAAU;AACrD;AAEA,SAAgB,oBAAoB,KAA6B,YAAuC;CACtG,MAAM,aAAa,2BAA2B,KAAK,UAAU;CAC7D,OAAO;EACL,GAAG;EACH,MAAM,kBAAkB,WAAW,IAAI;EACvC,UAAU,sBAAsB,WAAW,IAAI;EAC/C,eAAe,IAAI;EACnB,OAAO,IAAI;EACX;EACA,MAAM;EACN,IAAI,WAAW,SAAS,eAAe,QAAQ,IAAI,KAAK,IAAI,WAAW,QAAQ,CAAC;CAClF;AACF;AAEA,SAAgB,qBACd,OACA,YACA,QACY;CACZ,OAAO;EACL,MAAM,eAAe;EACrB,MAAM,MAAM;EACZ,MAAM,kBAAkB,MAAM,IAAI;EAClC,UAAU,sBAAsB,MAAM,IAAI;EAC1C,eAAe,QAAQ;EACvB,OAAO,QAAQ;EACf;EACA,MAAM,MAAM;EACZ,IAAI,MAAM;EACV,GAAI,MAAM,SAAS,EAAE,QAAQ,MAAM,OAAO,IAAI,CAAC;CACjD;AACF;AAEA,SAAgB,sBAAsB,QAAoB,KAAgD;CACxG,MAAM,OAAO,yBAAyB,QAAQ,IAAI,QAAQ;CAC1D,OAAO,OAAO,oBAAoB,KAAK,IAAI,IAAI;AACjD;AAEA,SAAS,2BAA2B,KAA6B,YAAmC;CAClG,QAAQ,WAAW,MAAnB;EACE,KAAK,iBAAiB;EACtB,KAAK,iBAAiB,mBACpB,OAAO,IAAI;EACb,KAAK,iBAAiB,yBACpB,OAAO,IAAI;EACb,KAAK,iBAAiB,oBACpB,OAAO,IAAI;EACb,KAAK,iBAAiB;EACtB,KAAK,iBAAiB,uBACpB,OAAO,IAAI;EACb,SACE,OAAO,IAAI;CACf;AACF"}

package/dist/{evaluation-Cd4S7-3t.d.ts → evaluation-6A7rK4t7.d.ts}

@@ -1,4 +1,4 @@
-import { a as Diagnostic } from "./diagnostic-C6TRoBgt.js";
+import { a as Diagnostic } from "./diagnostic-CODFUU-Q.js";
 import { a as RSToolValue, n as CstType, r as EvalStatus, t as BasicBinding } from "./common-D6TFl6l_.js";
 
 //#region src/models/evaluation.d.ts
@@ -29,4 +29,4 @@ interface EvaluationResult {
 }
 //#endregion
 export { EvaluationResult as i, EvaluateExpressionInput as n, EvaluateInput as r, EvaluateConstituentaInput as t };
-//# sourceMappingURL=evaluation-Cd4S7-3t.d.ts.map
+//# sourceMappingURL=evaluation-6A7rK4t7.d.ts.map

package/dist/index.d.ts

@@ -1,13 +1,13 @@
-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 Diagnostic, i as RSDiagnosticCode, n as DiagnosticKind, o as DiagnosticSeverity, r as ListDiagnosticsFilters, t as CstDiagnostic } from "./diagnostic-CODFUU-Q.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 { o as ConstituentaDraft, s as ConstituentaState } from "./constituenta-QY5w1x91.js";
+import { n as AnalyzeExpressionInput, t as AnalysisResult } from "./analysis-ktWFu4BY.js";
+import { o as ConstituentaDraft, s as ConstituentaState } from "./constituenta-HTnFtmxt.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, 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";
+import { n as SessionRevision, r as SessionState, t as SessionHandle } from "./session-Uc_vHrq9.js";
+import { a as SessionStateDetail, c as SessionSummaryItem, d as SynthesizeResult, l as SynthesisSubstitution, n as ApplySchemaPatchInput, o as SessionStateResult, r as ApplySchemaPatchResult, s as SessionSummary, t as AgentConstituentaPatch, u as SynthesizeInput } from "./agent-workflow-DY-hfAap.js";
+import { i as EvaluationResult, r as EvaluateInput } from "./evaluation-6A7rK4t7.js";
+import { a as ExportPortalInput, c as PortalExportKind, d as PortalModelImportData, f as PortalRsformDetails, 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-i0v2gbWs.js";
+import { t as RSToolAgent } from "./rstool-agent-D-w4DlEo.js";
 import { DomainAnalysisLike, DomainErrorLike, toDiagnostic, toPublicAnalysis } from "./mappers/types.js";
 import { RSToolWrapperClient, RSToolWrapperClientOptions, WrapperResponse } from "./wrapper/client.js";
-export { type AgentConstituentaPatch, type AnalysisResult, type AnalyzeExpressionInput, type ApplySchemaPatchInput, type ApplySchemaPatchResult, type BasicBinding, CONTRACT_VERSION, type ConstituentaDraft, type ConstituentaState, type CstDiagnostic, CstType, type Diagnostic, DiagnosticKind, type DiagnosticSeverity, type DomainAnalysisLike, type DomainErrorLike, 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, RSToolWrapperClient, type RSToolWrapperClientOptions, type RecalculateModelResult, type SessionHandle, type SessionModelState, type SessionRevision, type SessionState, type SessionStateDetail, type SessionStateResult, type SessionSummary, type SessionSummaryItem, type SetConstituentaValueInput, type SetModelValuesInput, ValueClass, type WrapperResponse, toDiagnostic, toPublicAnalysis };
+export { type AgentConstituentaPatch, type AnalysisResult, type AnalyzeExpressionInput, type ApplySchemaPatchInput, type ApplySchemaPatchResult, type BasicBinding, CONTRACT_VERSION, type ConstituentaDraft, type ConstituentaState, type CstDiagnostic, CstType, type Diagnostic, DiagnosticKind, type DiagnosticSeverity, type DomainAnalysisLike, type DomainErrorLike, 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, RSToolWrapperClient, type RSToolWrapperClientOptions, type RecalculateModelResult, type SessionHandle, type SessionModelState, type SessionRevision, type SessionState, type SessionStateDetail, type SessionStateResult, type SessionSummary, type SessionSummaryItem, type SetConstituentaValueInput, type SetModelValuesInput, type SynthesisSubstitution, type SynthesizeInput, type SynthesizeResult, ValueClass, type WrapperResponse, toDiagnostic, toPublicAnalysis };

package/dist/index.js

@@ -1,7 +1,7 @@
 import { toDiagnostic, toPublicAnalysis } from "./mappers/types.js";
 import { CstType, EvalStatus, RSErrorCode, ValueClass } from "./models/common.js";
 import { DiagnosticKind, RSDiagnosticCode } from "./models/diagnostic.js";
-import { r as PORTAL_JSON_CONTRACT_VERSION, t as RSToolAgent } from "./models-B255GaEC.js";
+import { r as PORTAL_JSON_CONTRACT_VERSION, t as RSToolAgent } from "./models-BKmWx92e.js";
 import { CONTRACT_VERSION } from "./models/tool-contract.js";
 import { RSToolWrapperClient } from "./wrapper/client.js";
 export { CONTRACT_VERSION, CstType, DiagnosticKind, EvalStatus, PORTAL_JSON_CONTRACT_VERSION, RSDiagnosticCode, RSErrorCode, RSToolAgent, RSToolWrapperClient, ValueClass, toDiagnostic, toPublicAnalysis };

package/dist/mappers/model-adapter.d.ts

@@ -1,6 +1,6 @@
 import { a as SetConstituentaValueInput, i as SessionModelState, r as RecalculateModelResult } from "../model-value-BUhr2IjA.js";
-import { r as SessionState } from "../session-CI4rLYby.js";
-import { i as EvaluationResult } from "../evaluation-Cd4S7-3t.js";
+import { r as SessionState } from "../session-Uc_vHrq9.js";
+import { i as EvaluationResult } from "../evaluation-6A7rK4t7.js";
 import { CstType } from "@rsconcept/domain/library/rsform";
 import { RSEngine } from "@rsconcept/domain/library/rsengine";
 

package/dist/mappers/model-adapter.js

@@ -1,2 +1,128 @@
-import { t as ModelAdapter } from "../model-adapter-D-YmIvQW.js";
+import { r as expressionDiagnostic, t as DiagnosticKind } from "../diagnostic-assembly-B-6vIA5I.js";
+import { t as buildRSFormFromSession } from "../rsform-builder-DKwZfJvN.js";
+import { EvalStatus } from "@rsconcept/domain/library/rsmodel";
+import { isBaseSet } from "@rsconcept/domain/library/rsform-api";
+import { isInferrable, isInterpretable, toBasicBinding, validateBasicBindingData, validateValueData } from "@rsconcept/domain/library/rsmodel-api";
+import { RSEngine } from "@rsconcept/domain/library/rsengine";
+//#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 { ModelAdapter };
+
+//# sourceMappingURL=model-adapter.js.map

package/dist/mappers/model-adapter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-adapter.js","names":[],"sources":["../../src/mappers/model-adapter.ts"],"sourcesContent":["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":"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"}

package/dist/mappers/schema-adapter.d.ts

@@ -1,7 +1,7 @@
-import { a as Diagnostic } from "../diagnostic-C6TRoBgt.js";
-import { t as AnalysisResult } from "../analysis-DA44pfgA.js";
-import { o as ConstituentaDraft, s as ConstituentaState } from "../constituenta-QY5w1x91.js";
-import { r as SessionState } from "../session-CI4rLYby.js";
+import { a as Diagnostic } from "../diagnostic-CODFUU-Q.js";
+import { t as AnalysisResult } from "../analysis-ktWFu4BY.js";
+import { o as ConstituentaDraft, s as ConstituentaState } from "../constituenta-HTnFtmxt.js";
+import { r as SessionState } from "../session-Uc_vHrq9.js";
 import { RSForm } from "@rsconcept/domain/library/rsform";
 import { RSLangAnalyzer } from "@rsconcept/domain/rslang";
 
@@ -13,7 +13,11 @@ declare class SchemaAdapter {
   };
   mergeStateWithDraft(session: SessionState, draft: ConstituentaDraft, analysis: AnalysisResult): ConstituentaState;
   toPseudoRSFormState(session: SessionState, analyzer: RSLangAnalyzer): Pick<RSForm, 'items' | 'cstByAlias' | 'analyzer'>;
-  private buildAnalyzer;
+  /**
+   * Schema view for analysis: session items with the draft expression merged in so the
+   * dependency graph (and cycle diagnostics) reflect the expression under check.
+   */
+  private toAnalysisSchema;
 }
 //#endregion
 export { SchemaAdapter };

package/dist/mappers/schema-adapter.js

@@ -1,12 +1,10 @@
 import { toPublicAnalysis } from "./types.js";
-import { CstType } from "@rsconcept/domain/library/rsform";
-import { RSLangAnalyzer } from "@rsconcept/domain/rslang";
+import { t as buildRSFormFromSession } from "../rsform-builder-DKwZfJvN.js";
 import { getAnalysisFor } from "@rsconcept/domain/library/rsform-api";
 //#region src/mappers/schema-adapter.ts
 var SchemaAdapter = class {
 	analyzeAgainstSession(session, draft) {
-		const analyzer = this.buildAnalyzer(session);
-		const schema = this.toPseudoRSFormState(session, analyzer);
+		const schema = this.toAnalysisSchema(session, draft);
 		const analysis = getAnalysisFor(draft.definitionFormal, draft.cstType, schema, draft.alias);
 		const target = {
 			constituentId: draft.id,
@@ -45,13 +43,48 @@ var SchemaAdapter = class {
 			analyzer
 		};
 	}
-	buildAnalyzer(session) {
-		const analyzer = new RSLangAnalyzer();
-		for (const item of session.items) {
-			if (item.cstType === CstType.BASE) analyzer.addBase(item.alias);
-			analyzer.setGlobal(item.alias, item.analysis.type, item.analysis.valueClass);
-		}
-		return analyzer;
+	/**
+	* Schema view for analysis: session items with the draft expression merged in so the
+	* dependency graph (and cycle diagnostics) reflect the expression under check.
+	*/
+	toAnalysisSchema(session, draft) {
+		const items = session.items.map((item) => {
+			if (item.id !== draft.id) return item;
+			return {
+				...item,
+				alias: draft.alias,
+				cstType: draft.cstType,
+				definitionFormal: draft.definitionFormal,
+				term: draft.term ?? item.term,
+				definitionText: draft.definitionText ?? item.definitionText,
+				convention: draft.convention ?? item.convention,
+				analysis: {
+					...item.analysis,
+					success: false,
+					type: null,
+					valueClass: null
+				}
+			};
+		});
+		if (!items.some((item) => item.id === draft.id)) items.push({
+			id: draft.id,
+			alias: draft.alias,
+			cstType: draft.cstType,
+			definitionFormal: draft.definitionFormal,
+			term: draft.term ?? "",
+			definitionText: draft.definitionText ?? "",
+			convention: draft.convention ?? "",
+			analysis: {
+				success: false,
+				type: null,
+				valueClass: null,
+				diagnostics: []
+			}
+		});
+		return buildRSFormFromSession({
+			...session,
+			items
+		});
 	}
 };
 //#endregion

package/dist/mappers/schema-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema-adapter.js","names":[],"sources":["../../src/mappers/schema-adapter.ts"],"sourcesContent":["import { RSLangAnalyzer, type AnalysisFull, type ValueClass } from '@rsconcept/domain/rslang';\nimport { getAnalysisFor } from '@rsconcept/domain/library/rsform-api';\nimport { CstType, type RSForm } from '@rsconcept/domain/library/rsform';\n\nimport {\n  type AnalysisResult,\n  type ConstituentaDraft,\n  type ConstituentaState,\n  type Diagnostic,\n  type SessionState\n} from '../models';\nimport { toPublicAnalysis } from './types';\n\nexport class SchemaAdapter {\n  public analyzeAgainstSession(\n    session: SessionState,\n    draft: ConstituentaDraft\n  ): { result: AnalysisResult; diagnostics: Diagnostic[] } {\n    const analyzer = this.buildAnalyzer(session);\n    const schema = this.toPseudoRSFormState(session, analyzer);\n    const analysis = getAnalysisFor(draft.definitionFormal, draft.cstType, schema as unknown as RSForm, draft.alias);\n    const target = { constituentId: draft.id, alias: draft.alias };\n    const result = toPublicAnalysis(\n      {\n        success: analysis.success,\n        type: analysis.type as Record<string, unknown> | null,\n        valueClass: analysis.valueClass,\n        errors: analysis.errors\n      },\n      draft.definitionFormal,\n      target\n    );\n    return {\n      result,\n      diagnostics: result.diagnostics\n    };\n  }\n\n  public mergeStateWithDraft(\n    session: SessionState,\n    draft: ConstituentaDraft,\n    analysis: AnalysisResult\n  ): ConstituentaState {\n    const state: ConstituentaState = {\n      ...draft,\n      term: draft.term ?? '',\n      definitionText: draft.definitionText ?? '',\n      convention: draft.convention ?? '',\n      analysis\n    };\n    const index = session.items.findIndex(item => item.id === draft.id);\n    if (index === -1) {\n      session.items.push(state);\n    } else {\n      session.items[index] = state;\n    }\n    session.updatedAt = new Date().toISOString();\n    return state;\n  }\n\n  public toPseudoRSFormState(\n    session: SessionState,\n    analyzer: RSLangAnalyzer\n  ): Pick<RSForm, 'items' | 'cstByAlias' | 'analyzer'> {\n    const cstByAlias = new Map(session.items.map(item => [item.alias, item]));\n    return {\n      items: session.items as unknown as RSForm['items'],\n      cstByAlias: cstByAlias as unknown as RSForm['cstByAlias'],\n      analyzer\n    };\n  }\n\n  private buildAnalyzer(session: SessionState): RSLangAnalyzer {\n    const analyzer = new RSLangAnalyzer();\n    for (const item of session.items) {\n      if (item.cstType === CstType.BASE) {\n        analyzer.addBase(item.alias);\n      }\n      analyzer.setGlobal(\n        item.alias,\n        item.analysis.type as AnalysisFull['type'],\n        item.analysis.valueClass as ValueClass | null\n      );\n    }\n    return analyzer;\n  }\n}\n"],"mappings":";;;;;AAaA,IAAa,gBAAb,MAA2B;CACzB,sBACE,SACA,OACuD;EACvD,MAAM,WAAW,KAAK,cAAc,OAAO;EAC3C,MAAM,SAAS,KAAK,oBAAoB,SAAS,QAAQ;EACzD,MAAM,WAAW,eAAe,MAAM,kBAAkB,MAAM,SAAS,QAA6B,MAAM,KAAK;EAC/G,MAAM,SAAS;GAAE,eAAe,MAAM;GAAI,OAAO,MAAM;EAAM;EAC7D,MAAM,SAAS,iBACb;GACE,SAAS,SAAS;GAClB,MAAM,SAAS;GACf,YAAY,SAAS;GACrB,QAAQ,SAAS;EACnB,GACA,MAAM,kBACN,MACF;EACA,OAAO;GACL;GACA,aAAa,OAAO;EACtB;CACF;CAEA,oBACE,SACA,OACA,UACmB;EACnB,MAAM,QAA2B;GAC/B,GAAG;GACH,MAAM,MAAM,QAAQ;GACpB,gBAAgB,MAAM,kBAAkB;GACxC,YAAY,MAAM,cAAc;GAChC;EACF;EACA,MAAM,QAAQ,QAAQ,MAAM,WAAU,SAAQ,KAAK,OAAO,MAAM,EAAE;EAClE,IAAI,UAAU,IACZ,QAAQ,MAAM,KAAK,KAAK;OAExB,QAAQ,MAAM,SAAS;EAEzB,QAAQ,6BAAY,IAAI,KAAK,EAAC,CAAC,YAAY;EAC3C,OAAO;CACT;CAEA,oBACE,SACA,UACmD;EACnD,MAAM,aAAa,IAAI,IAAI,QAAQ,MAAM,KAAI,SAAQ,CAAC,KAAK,OAAO,IAAI,CAAC,CAAC;EACxE,OAAO;GACL,OAAO,QAAQ;GACH;GACZ;EACF;CACF;CAEA,cAAsB,SAAuC;EAC3D,MAAM,WAAW,IAAI,eAAe;EACpC,KAAK,MAAM,QAAQ,QAAQ,OAAO;GAChC,IAAI,KAAK,YAAY,QAAQ,MAC3B,SAAS,QAAQ,KAAK,KAAK;GAE7B,SAAS,UACP,KAAK,OACL,KAAK,SAAS,MACd,KAAK,SAAS,UAChB;EACF;EACA,OAAO;CACT;AACF"}
+{"version":3,"file":"schema-adapter.js","names":[],"sources":["../../src/mappers/schema-adapter.ts"],"sourcesContent":["import { getAnalysisFor } from '@rsconcept/domain/library/rsform-api';\nimport { type RSForm } from '@rsconcept/domain/library/rsform';\nimport { RSLangAnalyzer } from '@rsconcept/domain/rslang';\n\nimport {\n  type AnalysisResult,\n  type ConstituentaDraft,\n  type ConstituentaState,\n  type Diagnostic,\n  type SessionState\n} from '../models';\nimport { buildRSFormFromSession } from './rsform-builder';\nimport { toPublicAnalysis } from './types';\n\nexport class SchemaAdapter {\n  public analyzeAgainstSession(\n    session: SessionState,\n    draft: ConstituentaDraft\n  ): { result: AnalysisResult; diagnostics: Diagnostic[] } {\n    const schema = this.toAnalysisSchema(session, draft);\n    const analysis = getAnalysisFor(draft.definitionFormal, draft.cstType, schema, draft.alias);\n    const target = { constituentId: draft.id, alias: draft.alias };\n    const result = toPublicAnalysis(\n      {\n        success: analysis.success,\n        type: analysis.type as Record<string, unknown> | null,\n        valueClass: analysis.valueClass,\n        errors: analysis.errors\n      },\n      draft.definitionFormal,\n      target\n    );\n    return {\n      result,\n      diagnostics: result.diagnostics\n    };\n  }\n\n  public mergeStateWithDraft(\n    session: SessionState,\n    draft: ConstituentaDraft,\n    analysis: AnalysisResult\n  ): ConstituentaState {\n    const state: ConstituentaState = {\n      ...draft,\n      term: draft.term ?? '',\n      definitionText: draft.definitionText ?? '',\n      convention: draft.convention ?? '',\n      analysis\n    };\n    const index = session.items.findIndex(item => item.id === draft.id);\n    if (index === -1) {\n      session.items.push(state);\n    } else {\n      session.items[index] = state;\n    }\n    session.updatedAt = new Date().toISOString();\n    return state;\n  }\n\n  public toPseudoRSFormState(\n    session: SessionState,\n    analyzer: RSLangAnalyzer\n  ): Pick<RSForm, 'items' | 'cstByAlias' | 'analyzer'> {\n    const cstByAlias = new Map(session.items.map(item => [item.alias, item]));\n    return {\n      items: session.items as unknown as RSForm['items'],\n      cstByAlias: cstByAlias as unknown as RSForm['cstByAlias'],\n      analyzer\n    };\n  }\n\n  /**\n   * Schema view for analysis: session items with the draft expression merged in so the\n   * dependency graph (and cycle diagnostics) reflect the expression under check.\n   */\n  private toAnalysisSchema(session: SessionState, draft: ConstituentaDraft): RSForm {\n    const items = session.items.map(item => {\n      if (item.id !== draft.id) {\n        return item;\n      }\n      return {\n        ...item,\n        alias: draft.alias,\n        cstType: draft.cstType,\n        definitionFormal: draft.definitionFormal,\n        term: draft.term ?? item.term,\n        definitionText: draft.definitionText ?? item.definitionText,\n        convention: draft.convention ?? item.convention,\n        // Drop cached type so mutual references surface as untyped → cycle.\n        analysis: {\n          ...item.analysis,\n          success: false,\n          type: null,\n          valueClass: null\n        }\n      };\n    });\n    if (!items.some(item => item.id === draft.id)) {\n      items.push({\n        id: draft.id,\n        alias: draft.alias,\n        cstType: draft.cstType,\n        definitionFormal: draft.definitionFormal,\n        term: draft.term ?? '',\n        definitionText: draft.definitionText ?? '',\n        convention: draft.convention ?? '',\n        analysis: {\n          success: false,\n          type: null,\n          valueClass: null,\n          diagnostics: []\n        }\n      });\n    }\n\n    return buildRSFormFromSession({ ...session, items });\n  }\n}\n"],"mappings":";;;;AAcA,IAAa,gBAAb,MAA2B;CACzB,sBACE,SACA,OACuD;EACvD,MAAM,SAAS,KAAK,iBAAiB,SAAS,KAAK;EACnD,MAAM,WAAW,eAAe,MAAM,kBAAkB,MAAM,SAAS,QAAQ,MAAM,KAAK;EAC1F,MAAM,SAAS;GAAE,eAAe,MAAM;GAAI,OAAO,MAAM;EAAM;EAC7D,MAAM,SAAS,iBACb;GACE,SAAS,SAAS;GAClB,MAAM,SAAS;GACf,YAAY,SAAS;GACrB,QAAQ,SAAS;EACnB,GACA,MAAM,kBACN,MACF;EACA,OAAO;GACL;GACA,aAAa,OAAO;EACtB;CACF;CAEA,oBACE,SACA,OACA,UACmB;EACnB,MAAM,QAA2B;GAC/B,GAAG;GACH,MAAM,MAAM,QAAQ;GACpB,gBAAgB,MAAM,kBAAkB;GACxC,YAAY,MAAM,cAAc;GAChC;EACF;EACA,MAAM,QAAQ,QAAQ,MAAM,WAAU,SAAQ,KAAK,OAAO,MAAM,EAAE;EAClE,IAAI,UAAU,IACZ,QAAQ,MAAM,KAAK,KAAK;OAExB,QAAQ,MAAM,SAAS;EAEzB,QAAQ,6BAAY,IAAI,KAAK,EAAC,CAAC,YAAY;EAC3C,OAAO;CACT;CAEA,oBACE,SACA,UACmD;EACnD,MAAM,aAAa,IAAI,IAAI,QAAQ,MAAM,KAAI,SAAQ,CAAC,KAAK,OAAO,IAAI,CAAC,CAAC;EACxE,OAAO;GACL,OAAO,QAAQ;GACH;GACZ;EACF;CACF;;;;;CAMA,iBAAyB,SAAuB,OAAkC;EAChF,MAAM,QAAQ,QAAQ,MAAM,KAAI,SAAQ;GACtC,IAAI,KAAK,OAAO,MAAM,IACpB,OAAO;GAET,OAAO;IACL,GAAG;IACH,OAAO,MAAM;IACb,SAAS,MAAM;IACf,kBAAkB,MAAM;IACxB,MAAM,MAAM,QAAQ,KAAK;IACzB,gBAAgB,MAAM,kBAAkB,KAAK;IAC7C,YAAY,MAAM,cAAc,KAAK;IAErC,UAAU;KACR,GAAG,KAAK;KACR,SAAS;KACT,MAAM;KACN,YAAY;IACd;GACF;EACF,CAAC;EACD,IAAI,CAAC,MAAM,MAAK,SAAQ,KAAK,OAAO,MAAM,EAAE,GAC1C,MAAM,KAAK;GACT,IAAI,MAAM;GACV,OAAO,MAAM;GACb,SAAS,MAAM;GACf,kBAAkB,MAAM;GACxB,MAAM,MAAM,QAAQ;GACpB,gBAAgB,MAAM,kBAAkB;GACxC,YAAY,MAAM,cAAc;GAChC,UAAU;IACR,SAAS;IACT,MAAM;IACN,YAAY;IACZ,aAAa,CAAC;GAChB;EACF,CAAC;EAGH,OAAO,uBAAuB;GAAE,GAAG;GAAS;EAAM,CAAC;CACrD;AACF"}

package/dist/mappers/types.d.ts

@@ -1,5 +1,5 @@
-import { a as Diagnostic, s as DiagnosticTarget } from "../diagnostic-C6TRoBgt.js";
-import { t as AnalysisResult } from "../analysis-DA44pfgA.js";
+import { a as Diagnostic, s as DiagnosticTarget } from "../diagnostic-CODFUU-Q.js";
+import { t as AnalysisResult } from "../analysis-ktWFu4BY.js";
 import { ValueClass } from "@rsconcept/domain/rslang";
 
 //#region src/mappers/types.d.ts

package/dist/mappers/types.js

@@ -1,4 +1,4 @@
-import { r as expressionDiagnostic } from "../diagnostic-assembly-DRunIcKQ.js";
+import { r as expressionDiagnostic } from "../diagnostic-assembly-B-6vIA5I.js";
 //#region src/mappers/types.ts
 /** Map a domain parser/semantic error to the public diagnostic shape. */
 function toDiagnostic(error, expression, target) {

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-D22FeODL.js";
-export { AgentConstituentaPatch, ApplySchemaPatchInput, ApplySchemaPatchResult, SessionStateDetail, SessionStateResult, SessionSummary, SessionSummaryItem };
+import { a as SessionStateDetail, c as SessionSummaryItem, d as SynthesizeResult, i as RestoreOrderResult, l as SynthesisSubstitution, n as ApplySchemaPatchInput, o as SessionStateResult, r as ApplySchemaPatchResult, s as SessionSummary, t as AgentConstituentaPatch, u as SynthesizeInput } from "../agent-workflow-DY-hfAap.js";
+export { AgentConstituentaPatch, ApplySchemaPatchInput, ApplySchemaPatchResult, RestoreOrderResult, SessionStateDetail, SessionStateResult, SessionSummary, SessionSummaryItem, SynthesisSubstitution, SynthesizeInput, SynthesizeResult };

package/dist/models/analysis.d.ts

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

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-QY5w1x91.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-HTnFtmxt.js";
 export { AddOrUpdateConstituentaInput, AddOrUpdateConstituentaResult, ApplyConstituentsInput, ApplyConstituentsMode, ApplyConstituentsResult, ConstituentaDraft, ConstituentaState };

package/dist/models/diagnostic.d.ts

@@ -1,2 +1,2 @@
-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";
+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-CODFUU-Q.js";
 export { type CstDiagnostic, type Diagnostic, DiagnosticKind, type DiagnosticSeverity, type DiagnosticTarget, ListDiagnosticsFilters, RSDiagnosticCode, expandCstDiagnostic, expressionDiagnostic, getDiagnosticName, getDiagnosticSeverity, modelStatusDiagnostic };