@rsconcept/domain 2.3.0 → 3.0.1

package/dist/rslang/eval/value.d.ts

@@ -1,2 +1,2 @@
-import { a as SET_INFINITY, c as VALUE_TRUE, d as ValuePath, f as compare, h as tuple, i as INVALID_ELEMENT, l as Value, m as set, n as CalcInvalidDataError, o as TUPLE_ID, p as makeValuePath, r as EmptySetV, s as VALUE_FALSE, t as BOOL_INFINITY, u as ValueContext } from "../../value-BduA_ZGp.js";
+import { a as SET_INFINITY, c as VALUE_TRUE, d as ValuePath, f as compare, h as tuple, i as INVALID_ELEMENT, l as Value, m as set, n as CalcInvalidDataError, o as TUPLE_ID, p as makeValuePath, r as EmptySetV, s as VALUE_FALSE, t as BOOL_INFINITY, u as ValueContext } from "../../value-XpJOVzMP.js";
 export { BOOL_INFINITY, CalcInvalidDataError, EmptySetV, INVALID_ELEMENT, SET_INFINITY, TUPLE_ID, VALUE_FALSE, VALUE_TRUE, Value, ValueContext, ValuePath, compare, makeValuePath, set, tuple };

package/dist/rslang/index.d.ts

@@ -1,14 +1,15 @@
-import { A as makeTypePath, b as Typification, d as EmptySetT, f as ExpressionType, g as TypeClass, m as LogicT, t as AnyTypificationT, v as TypeID, y as TypePath } from "../typification-9lNu9R4k.js";
+import { A as makeTypePath, b as Typification, d as EmptySetT, f as ExpressionType, g as TypeClass, m as LogicT, t as AnyTypificationT, v as TypeID, y as TypePath } from "../typification-hWUoWCba.js";
 import { i as RSErrorDescription, r as RSErrorCode } from "../error-B0EkIx4K.js";
-import { i as readTypeAnnotation, r as readErrorAnnotation } from "../ast-annotations-CiIx8qBM.js";
-import { d as ValuePath, l as Value, p as makeValuePath } from "../value-BduA_ZGp.js";
-import { n as CalculatorResult, r as RSCalculator, t as CalculatorEvaluateOptions } from "../calculator-DE89LtIM.js";
-import { d as printValue } from "../value-api-CXLl_zg0.js";
-import { t as parser } from "../parser-Bwd8LxJ1.js";
+import { i as readTypeAnnotation, r as readErrorAnnotation } from "../ast-annotations-x4PJ_Lhc.js";
+import { d as ValuePath, l as Value, p as makeValuePath } from "../value-XpJOVzMP.js";
+import { n as CalculatorResult, r as RSCalculator, t as CalculatorEvaluateOptions } from "../calculator-uPaTV3hc.js";
+import { d as printValue } from "../value-api-Dw8UkwCD.js";
+import { t as parser } from "../parser-DkejtiOR.js";
 import { t as TokenID } from "../token-DeXAmzwr.js";
 import { t as ValueClass } from "../value-class-CNI-lqXJ.js";
-import { a as RSLangAnalyzer, n as AnalysisFast, r as AnalysisFull, t as AnalysisBase } from "../analyzer-fNhkwO-6.js";
-import { n as ArgumentsType } from "../arguments-extractor-ngatANBI.js";
-import { n as applyAsciiTypeSubstitutions, r as parseTypeText } from "../typification-parser-Dytsv9CI.js";
-import { n as TypificationNodeData, t as TypificationGraph } from "../typification-graph-BY_oGT82.js";
+import { a as RSLangAnalyzer, n as AnalysisFast, r as AnalysisFull, t as AnalysisBase } from "../analyzer-CzFaWR7w.js";
+import { n as ArgumentsType } from "../arguments-extractor-CXWRT5Ou.js";
+import { n as applyAsciiTypeSubstitutions, r as parseTypeText } from "../typification-parser-DFxj4JiQ.js";
+import { n as TypificationNodeData, t as TypificationGraph } from "../typification-graph-CSxDt18X.js";
+import "../index-CnuO4w8e.js";
 export { type AnalysisBase, type AnalysisFast, type AnalysisFull, AnyTypificationT, type ArgumentsType, type CalculatorEvaluateOptions, type CalculatorResult, EmptySetT, type ExpressionType, LogicT, RSCalculator, RSErrorCode, type RSErrorDescription, RSLangAnalyzer, TokenID, TypeClass, TypeID, type TypePath, type Typification, TypificationGraph, type TypificationNodeData, type Value, ValueClass, type ValuePath, applyAsciiTypeSubstitutions, makeTypePath, makeValuePath, parseTypeText, printValue, readErrorAnnotation, readTypeAnnotation, parser as rslangParser };

package/dist/rslang/labels.d.ts

@@ -1,7 +1,7 @@
-import { n as AstNodeBase } from "../ast-C8sIpKdL.js";
-import { f as ExpressionType } from "../typification-9lNu9R4k.js";
+import { n as AstNodeBase } from "../ast-D-D6Rq3T.js";
+import "../index-D5RahF1K.js";
+import { f as ExpressionType } from "../typification-hWUoWCba.js";
 import { t as TokenID } from "../token-DeXAmzwr.js";
-
 //#region src/rslang/labels.d.ts
 /** Retrieves label for {@link TokenID}. */
 declare function labelToken(id: TokenID): string;

package/dist/rslang/parser/expression-generator.d.ts

@@ -1,2 +1,2 @@
-import { t as generateExpressionFromAst } from "../../expression-generator-CoucLIkE.js";
+import { t as generateExpressionFromAst } from "../../expression-generator-CADzBw-C.js";
 export { generateExpressionFromAst };

package/dist/rslang/parser/normalize.d.ts

@@ -1,4 +1,5 @@
-import { t as AstNode } from "../../ast-C8sIpKdL.js";
+import { t as AstNode } from "../../ast-D-D6Rq3T.js";
+import "../../index-D5RahF1K.js";
 //#region src/rslang/parser/normalize.d.ts
 /** Normalizes AST to a simple form. */
 declare function normalizeAST(ast: AstNode, input: string): void;

package/dist/rslang/parser/parser.d.ts

@@ -1,2 +1,2 @@
-import { t as parser } from "../../parser-Bwd8LxJ1.js";
+import { t as parser } from "../../parser-DkejtiOR.js";
 export { parser };

package/dist/rslang/parser/parser.terms.d.ts

@@ -1,44 +1,5 @@
 //#region src/rslang/parser/parser.terms.d.ts
-declare const Expression = 1,
-  Logic = 2,
-  Logic_predicates = 3,
-  Variable = 4,
-  Local = 5,
-  Tuple = 8,
-  Expr_enum_min2 = 9,
-  Logic_unary = 24,
-  Predicate = 26,
-  Logic_quantor = 29,
-  Variable_pack = 31,
-  Logic_binary = 33,
-  Setexpr = 38,
-  Integer = 39,
-  EmptySet = 40,
-  IntegerSet = 41,
-  Global = 42,
-  Radical = 43,
-  Setexpr_binary = 44,
-  Enumeration = 55,
-  Boolean = 56,
-  Filter_expression = 58,
-  Filter = 59,
-  Declarative = 60,
-  PrefixD = 62,
-  PrefixI = 63,
-  Imperative = 64,
-  Imp_blocks = 65,
-  PrefixR = 67,
-  Recursion = 68,
-  Function = 69,
-  BigPr = 70,
-  SmallPr = 71,
-  Card = 72,
-  Bool = 73,
-  Debool = 74,
-  Red = 75,
-  Function_decl = 76,
-  Arguments = 77,
-  Declaration = 78;
+declare const Expression = 1, Logic = 2, Logic_predicates = 3, Variable = 4, Local = 5, Tuple = 8, Expr_enum_min2 = 9, Logic_unary = 24, Predicate = 26, Logic_quantor = 29, Variable_pack = 31, Logic_binary = 33, Setexpr = 38, Integer = 39, EmptySet = 40, IntegerSet = 41, Global = 42, Radical = 43, Setexpr_binary = 44, Enumeration = 55, Boolean = 56, Filter_expression = 58, Filter = 59, Declarative = 60, PrefixD = 62, PrefixI = 63, Imperative = 64, Imp_blocks = 65, PrefixR = 67, Recursion = 68, Function = 69, BigPr = 70, SmallPr = 71, Card = 72, Bool = 73, Debool = 74, Red = 75, Function_decl = 76, Arguments = 77, Declaration = 78;
 //#endregion
 export { Arguments, BigPr, Bool, Boolean, Card, Debool, Declaration, Declarative, EmptySet, Enumeration, Expr_enum_min2, Expression, Filter, Filter_expression, Function, Function_decl, Global, Imp_blocks, Imperative, Integer, IntegerSet, Local, Logic, Logic_binary, Logic_predicates, Logic_quantor, Logic_unary, Predicate, PrefixD, PrefixI, PrefixR, Radical, Recursion, Red, Setexpr, Setexpr_binary, SmallPr, Tuple, Variable, Variable_pack };
 //# sourceMappingURL=parser.terms.d.ts.map

package/dist/rslang/parser/syntax-errors/index.d.ts

@@ -1,7 +1,7 @@
-import { t as AstNode } from "../../../ast-C8sIpKdL.js";
-import { g as TypeClass } from "../../../typification-9lNu9R4k.js";
+import { t as AstNode } from "../../../ast-D-D6Rq3T.js";
+import "../../../index-D5RahF1K.js";
+import { g as TypeClass } from "../../../typification-hWUoWCba.js";
 import { t as ErrorReporter } from "../../../error-B0EkIx4K.js";
-
 //#region src/rslang/parser/syntax-errors/index.d.ts
 /** When set, refines incomplete formal headers (`[α∈…]`, quantifiers). */
 interface SyntaxErrorOptions {

package/dist/rslang/semantic/analyzer.d.ts

@@ -1,2 +1,2 @@
-import { a as RSLangAnalyzer, i as AnalysisOptions, n as AnalysisFast, r as AnalysisFull, t as AnalysisBase } from "../../analyzer-fNhkwO-6.js";
+import { a as RSLangAnalyzer, i as AnalysisOptions, n as AnalysisFast, r as AnalysisFull, t as AnalysisBase } from "../../analyzer-CzFaWR7w.js";
 export { AnalysisBase, AnalysisFast, AnalysisFull, AnalysisOptions, RSLangAnalyzer };

package/dist/rslang/semantic/arguments-extractor.d.ts

@@ -1,2 +1,2 @@
-import { n as ArgumentsType, t as ArgumentsExtractor } from "../../arguments-extractor-ngatANBI.js";
+import { n as ArgumentsType, t as ArgumentsExtractor } from "../../arguments-extractor-CXWRT5Ou.js";
 export { ArgumentsExtractor, ArgumentsType };

package/dist/rslang/semantic/type-auditor.d.ts

@@ -1,7 +1,7 @@
-import { t as AstNode } from "../../ast-C8sIpKdL.js";
-import { _ as TypeContext, f as ExpressionType } from "../../typification-9lNu9R4k.js";
+import { t as AstNode } from "../../ast-D-D6Rq3T.js";
+import "../../index-D5RahF1K.js";
+import { _ as TypeContext, f as ExpressionType } from "../../typification-hWUoWCba.js";
 import { t as ErrorReporter } from "../../error-B0EkIx4K.js";
-
 //#region src/rslang/semantic/type-auditor.d.ts
 /** Type auditor for AST type checking. */
 declare class TypeAuditor {

package/dist/rslang/semantic/typification-api.d.ts

@@ -1,5 +1,4 @@
-import { b as Typification, f as ExpressionType, g as TypeClass, v as TypeID, y as TypePath } from "../../typification-9lNu9R4k.js";
-
+import { b as Typification, f as ExpressionType, g as TypeClass, v as TypeID, y as TypePath } from "../../typification-hWUoWCba.js";
 //#region src/rslang/semantic/typification-api.d.ts
 /** Returns the TypeClass associated with the given TypeID. */
 declare function getTypeClass(typeID: TypeID): TypeClass;

package/dist/rslang/semantic/typification-parser.d.ts

@@ -1,2 +1,2 @@
-import { n as applyAsciiTypeSubstitutions, r as parseTypeText, t as TypificationParseResult } from "../../typification-parser-Dytsv9CI.js";
+import { n as applyAsciiTypeSubstitutions, r as parseTypeText, t as TypificationParseResult } from "../../typification-parser-DFxj4JiQ.js";
 export { TypificationParseResult, applyAsciiTypeSubstitutions, parseTypeText };

package/dist/rslang/semantic/typification.d.ts

@@ -1,2 +1,2 @@
-import { A as makeTypePath, C as component, D as isRadical, E as isMangledRadical, M as mangleRadicalId, N as tuple, O as isTemplateRadical, S as bool, T as debool, _ as TypeContext, a as EchelonCollection, b as Typification, c as EchelonLogic, d as EmptySetT, f as ExpressionType, g as TypeClass, h as Parametrized, i as EchelonBase, j as mangleParamAlias, k as isTypification, l as EchelonPredicate, m as LogicT, n as Argument, o as EchelonFunctional, p as IntegerT, r as EchelonAnyTyped, s as EchelonInteger, t as AnyTypificationT, u as EchelonTuple, v as TypeID, w as constant, x as basic, y as TypePath } from "../../typification-9lNu9R4k.js";
+import { A as makeTypePath, C as component, D as isRadical, E as isMangledRadical, M as mangleRadicalId, N as tuple, O as isTemplateRadical, S as bool, T as debool, _ as TypeContext, a as EchelonCollection, b as Typification, c as EchelonLogic, d as EmptySetT, f as ExpressionType, g as TypeClass, h as Parametrized, i as EchelonBase, j as mangleParamAlias, k as isTypification, l as EchelonPredicate, m as LogicT, n as Argument, o as EchelonFunctional, p as IntegerT, r as EchelonAnyTyped, s as EchelonInteger, t as AnyTypificationT, u as EchelonTuple, v as TypeID, w as constant, x as basic, y as TypePath } from "../../typification-hWUoWCba.js";
 export { AnyTypificationT, Argument, EchelonAnyTyped, EchelonBase, EchelonCollection, EchelonFunctional, EchelonInteger, EchelonLogic, EchelonPredicate, EchelonTuple, EmptySetT, ExpressionType, IntegerT, LogicT, Parametrized, TypeClass, TypeContext, TypeID, TypePath, Typification, basic, bool, component, constant, debool, isMangledRadical, isRadical, isTemplateRadical, isTypification, makeTypePath, mangleParamAlias, mangleRadicalId, tuple };

package/dist/rslang/semantic/value-auditor.d.ts

@@ -1,7 +1,7 @@
-import { t as AstNode } from "../../ast-C8sIpKdL.js";
+import { t as AstNode } from "../../ast-D-D6Rq3T.js";
+import "../../index-D5RahF1K.js";
 import { t as ErrorReporter } from "../../error-B0EkIx4K.js";
 import { n as ValueClassContext, t as ValueClass } from "../../value-class-CNI-lqXJ.js";
-
 //#region src/rslang/semantic/value-auditor.d.ts
 /** Value auditor for AST value class checking. */
 declare class ValueAuditor {

package/dist/rslang/typification-graph.d.ts

@@ -1,2 +1,2 @@
-import { n as TypificationNodeData, t as TypificationGraph } from "../typification-graph-BY_oGT82.js";
+import { n as TypificationNodeData, t as TypificationGraph } from "../typification-graph-CSxDt18X.js";
 export { TypificationGraph, TypificationNodeData };

package/dist/shared/index.d.ts

@@ -1,3 +1,4 @@
 import { t as Branded } from "../branded-ZlzIcxzu.js";
 import { n as generateStub, t as applyHash_fnv1a } from "../hash-Y8I4c6Al.js";
+import "../index-x0_Y5uPV.js";
 export { type Branded, applyHash_fnv1a, generateStub };

package/dist/{typification-graph-BY_oGT82.d.ts → typification-graph-CSxDt18X.d.ts}

@@ -1,5 +1,4 @@
-import { f as ExpressionType } from "./typification-9lNu9R4k.js";
-
+import { f as ExpressionType } from "./typification-hWUoWCba.js";
 //#region src/rslang/typification-graph.d.ts
 /** Represents a single node of a {@link TypificationGraph}. */
 interface TypificationNodeData extends Record<string, unknown> {
@@ -27,4 +26,4 @@ declare class TypificationGraph {
 }
 //#endregion
 export { TypificationNodeData as n, TypificationGraph as t };
-//# sourceMappingURL=typification-graph-BY_oGT82.d.ts.map
+//# sourceMappingURL=typification-graph-CSxDt18X.d.ts.map

package/dist/{typification-9lNu9R4k.d.ts → typification-hWUoWCba.d.ts}

@@ -1,4 +1,5 @@
 import { t as Branded } from "./branded-ZlzIcxzu.js";
+import "./index-x0_Y5uPV.js";
 //#region src/rslang/semantic/typification.d.ts
 /** Typification structure enumeration. */
 declare const TypeID: {
@@ -125,4 +126,4 @@ declare function mangleRadicalId(radical: string, funcName: string): string;
 declare function mangleParamAlias(alias: string, funcName: string): string;
 //#endregion
 export { makeTypePath as A, component as C, isRadical as D, isMangledRadical as E, mangleRadicalId as M, tuple as N, isTemplateRadical as O, bool as S, debool as T, TypeContext as _, EchelonCollection as a, Typification as b, EchelonLogic as c, EmptySetT as d, ExpressionType as f, TypeClass as g, Parametrized as h, EchelonBase as i, mangleParamAlias as j, isTypification as k, EchelonPredicate as l, LogicT as m, Argument as n, EchelonFunctional as o, IntegerT as p, EchelonAnyTyped as r, EchelonInteger as s, AnyTypificationT as t, EchelonTuple as u, TypeID as v, constant as w, basic as x, TypePath as y };
-//# sourceMappingURL=typification-9lNu9R4k.d.ts.map
+//# sourceMappingURL=typification-hWUoWCba.d.ts.map

package/dist/{typification-parser-Dytsv9CI.d.ts → typification-parser-DFxj4JiQ.d.ts}

@@ -1,5 +1,4 @@
-import { f as ExpressionType } from "./typification-9lNu9R4k.js";
-
+import { f as ExpressionType } from "./typification-hWUoWCba.js";
 //#region src/rslang/semantic/typification-parser.d.ts
 interface TypificationParseResult {
   type: ExpressionType | null;
@@ -10,4 +9,4 @@ declare function parseTypeText(input: string): TypificationParseResult;
 declare function applyAsciiTypeSubstitutions(raw: string): string;
 //#endregion
 export { applyAsciiTypeSubstitutions as n, parseTypeText as r, TypificationParseResult as t };
-//# sourceMappingURL=typification-parser-Dytsv9CI.d.ts.map
+//# sourceMappingURL=typification-parser-DFxj4JiQ.d.ts.map

package/dist/{value-BduA_ZGp.d.ts → value-XpJOVzMP.d.ts}

@@ -1,4 +1,5 @@
 import { t as Branded } from "./branded-ZlzIcxzu.js";
+import "./index-x0_Y5uPV.js";
 //#region src/rslang/eval/value.d.ts
 /** Tuple ID for array distinction. */
 declare const TUPLE_ID = -111;
@@ -36,4 +37,4 @@ declare function tuple(components: Value[]): Value;
 declare function set(elements: Value[]): Value[];
 //#endregion
 export { SET_INFINITY as a, VALUE_TRUE as c, ValuePath as d, compare as f, tuple as h, INVALID_ELEMENT as i, Value as l, set as m, CalcInvalidDataError as n, TUPLE_ID as o, makeValuePath as p, EmptySetV as r, VALUE_FALSE as s, BOOL_INFINITY as t, ValueContext as u };
-//# sourceMappingURL=value-BduA_ZGp.d.ts.map
+//# sourceMappingURL=value-XpJOVzMP.d.ts.map

package/dist/{value-api-CXLl_zg0.d.ts → value-api-Dw8UkwCD.d.ts}

@@ -1,6 +1,5 @@
-import { b as Typification, f as ExpressionType, y as TypePath } from "./typification-9lNu9R4k.js";
-import { d as ValuePath, l as Value, u as ValueContext } from "./value-BduA_ZGp.js";
-
+import { b as Typification, f as ExpressionType, y as TypePath } from "./typification-hWUoWCba.js";
+import { d as ValuePath, l as Value, u as ValueContext } from "./value-XpJOVzMP.js";
 //#region src/rslang/eval/value-api.d.ts
 /** Cartesian product of factor sets. */
 declare function cartesianProduct(factors: Value[][]): Value[] | null;
@@ -46,4 +45,4 @@ declare function setNestedValue(target: Value | null, path: ValuePath, newVal: V
 declare function testInvalid(value: Value): boolean;
 //#endregion
 export { setSymDiff as _, extractValue as a, validateValue as b, isTupleValue as c, printValue as d, projection as f, setNestedValue as g, setIntersection as h, convertPathToType as i, makeDefaultValue as l, setDiff as m, cartesianProduct as n, isSetValue as o, reduce as p, contains as r, isSubsetOrEq as s, boolean as t, normalizeValue as u, setUnion as v, valueStub as x, testInvalid as y };
-//# sourceMappingURL=value-api-CXLl_zg0.d.ts.map
+//# sourceMappingURL=value-api-Dw8UkwCD.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsconcept/domain",
-  "version": "2.3.0",
+  "version": "3.0.1",
   "description": "Shared TypeScript domain for RS language, RSForm, RSModel, RSEngine, OSS, and concept-text helpers.",
   "license": "MIT",
   "author": "IRBorisov",
@@ -172,17 +172,17 @@
   },
   "devDependencies": {
     "@lezer/generator": "^1.8.0",
-    "@types/node": "^26.1.0",
-    "@typescript-eslint/parser": "^8.0.1",
-    "eslint": "^9.39.4",
+    "@types/node": "^26.1.1",
+    "@typescript-eslint/parser": "^8.63.0",
+    "eslint": "^9.39.5",
     "eslint-plugin-simple-import-sort": "^13.0.0",
     "globals": "^17.7.0",
-    "prettier": "^3.9.4",
-    "tsdown": "^0.22.3",
+    "prettier": "^3.9.5",
+    "tsdown": "^0.22.4",
     "typescript": "^6.0.3",
-    "typescript-eslint": "^8.62.1",
+    "typescript-eslint": "^8.63.0",
     "unrun": "^0.3.1",
-    "vitest": "^4.1.9"
+    "vitest": "^4.1.10"
   },
   "publishConfig": {
     "access": "public"

package/src/library/diagnostics.ts

@@ -3,8 +3,10 @@
  */
 
 import { type Graph } from '../graph';
+import { type ExpressionType } from '../rslang';
 import { labelType } from '../rslang/labels';
 
+import { type BasicTextCheckFields } from './rsform-api/types';
 import { type Constituenta, type CstType } from './rsform';
 import { isBasicConcept, isLogical } from './rsform-api';
 import { EvalStatus } from './rsmodel';
@@ -17,7 +19,7 @@ export const DiagnosticKind = {
 } as const;
 export type DiagnosticKind = (typeof DiagnosticKind)[keyof typeof DiagnosticKind];
 
-/** Schema and model diagnostic codes (same numeric format as {@link RSErrorCode}). */
+/** Schema, model, and substitution-table diagnostic codes (same numeric format as {@link RSErrorCode}). */
 export const RSDiagnosticCode = {
   schemaHomonym: 0x8901,
   schemaFormalDuplicate: 0x8902,
@@ -29,7 +31,21 @@ export const RSDiagnosticCode = {
   modelEmpty: 0x8910,
   modelAxiomFalse: 0x8911,
   modelInvalidData: 0x8912,
-  modelEvalFail: 0x8913
+  modelEvalFail: 0x8913,
+
+  substitutionInvalidIDs: 0x8920,
+  substitutionIncorrectCst: 0x8921,
+  substitutionInvalidClasses: 0x8922,
+  substitutionInvalidBasic: 0x8923,
+  substitutionInvalidConstant: 0x8924,
+  substitutionTypificationCycle: 0x8925,
+  substitutionBaseNotSet: 0x8926,
+  substitutionUnequalTypification: 0x8927,
+  /** Non-blocking warning: formal definitions differ after mapping. */
+  substitutionUnequalExpressions: 0x2928,
+  substitutionUnequalArgsCount: 0x8929,
+  substitutionUnequalArgs: 0x892a,
+  substitutionInvalidNominal: 0x892b
 } as const;
 export type RSDiagnosticCode = (typeof RSDiagnosticCode)[keyof typeof RSDiagnosticCode];
 
@@ -41,8 +57,11 @@ export interface CstDiagnostic {
   params?: readonly string[];
 }
 
-/** Whether a constituent has a schema/model diagnostic with the given code. */
-export function hasCstDiagnostic(cst: Constituenta, code: RSDiagnosticCode): boolean {
+/** Whether an item has a schema/model diagnostic with the given code. */
+export function hasCstDiagnostic(
+  cst: { diagnostics?: readonly CstDiagnostic[] | null },
+  code: RSDiagnosticCode
+): boolean {
   return cst.diagnostics?.some(item => item.code === code) ?? false;
 }
 
@@ -160,7 +179,13 @@ export function modelStatusCstDiagnostic(status: EvalStatus, cstType: CstType):
   return { kind: DiagnosticKind.MODEL, code, params: [String(status)] };
 }
 
-function collectLocalSchemaDiagnostics(cst: Constituenta): CstDiagnostic[] {
+function collectLocalSchemaDiagnostics(
+  cst: BasicTextCheckFields & {
+    is_type_mismatch: boolean;
+    typification_manual: string;
+    analysis: { type: ExpressionType | null };
+  }
+): CstDiagnostic[] {
   const result: CstDiagnostic[] = [];
   if (cst.is_type_mismatch) {
     result.push({
@@ -180,13 +205,13 @@ function collectLocalSchemaDiagnostics(cst: Constituenta): CstDiagnostic[] {
   return result;
 }
 
-function detectGroupedAliasDiagnostics(
-  items: Constituenta[],
+function detectGroupedAliasDiagnostics<T extends { id: number }>(
+  items: readonly T[],
   resolveAlias: (id: number) => string,
-  groupKey: (cst: Constituenta) => string | undefined,
+  groupKey: (cst: T) => string | undefined,
   code: RSDiagnosticCode
 ): Map<number, CstDiagnostic> {
-  const groups = new Map<string, Constituenta[]>();
+  const groups = new Map<string, T[]>();
   for (const cst of items) {
     const key = groupKey(cst);
     if (!key) {
@@ -218,7 +243,7 @@ function detectGroupedAliasDiagnostics(
 }
 
 function detectHomonymDiagnostics(
-  items: Constituenta[],
+  items: readonly { id: number; term_resolved: string }[],
   resolveAlias: (id: number) => string
 ): Map<number, CstDiagnostic> {
   return detectGroupedAliasDiagnostics(
@@ -233,7 +258,7 @@ function detectHomonymDiagnostics(
 }
 
 function detectFormalDuplicateDiagnostics(
-  items: Constituenta[],
+  items: readonly { id: number }[],
   resolveAlias: (id: number) => string,
   normalizedDefinitions: ReadonlyMap<number, string>
 ): Map<number, CstDiagnostic> {

package/src/library/oss-api.test.ts

@@ -2,14 +2,16 @@ import { describe, expect, it } from 'vitest';
 
 import { Graph } from '../graph';
 
+import { SubstitutionErrorType } from './oss';
 import { SubstitutionValidator } from './oss-api';
 import { type Constituenta, CstClass, CstType, type RSForm } from './rsform';
 
 function mockConstituenta(
-  partial: Pick<Constituenta, 'id' | 'alias' | 'definition_formal' | 'cst_class' | 'cst_type'>
+  partial: Pick<Constituenta, 'id' | 'alias' | 'definition_formal' | 'cst_class' | 'cst_type'> &
+    Partial<Pick<Constituenta, 'schema'>>
 ): Constituenta {
   return {
-    schema: 790,
+    schema: partial.schema ?? 790,
     crucial: false,
     convention: '',
     definition_raw: '',
@@ -37,11 +39,16 @@ function mockConstituenta(
   };
 }
 
-function mockSchema(items: Constituenta[]): RSForm {
+function mockSchema(items: Constituenta[], edges: number[][] = [], id = 790, alias = 'S1'): RSForm {
   const graph = new Graph(items.map(item => [item.id]));
+  for (const edge of edges) {
+    if (edge.length === 2) {
+      graph.addEdge(edge[0], edge[1]);
+    }
+  }
   return {
-    id: 790,
-    alias: 'S1',
+    id,
+    alias,
     items,
     graph,
     cstByAlias: new Map(items.map(item => [item.alias, item]))
@@ -72,4 +79,92 @@ describe('SubstitutionValidator', () => {
     expect(() => validator.validate()).not.toThrow();
     expect(validator.validate()).toBe(true);
   });
+
+  it('reports definitionCycle when identification closes a formal dependency loop', () => {
+    // D16 := F2[D15]  ⇒ edge D15 → D16; identifying D15 → D16 yields D16 := F2[D16]
+    const schema = mockSchema(
+      [
+        mockConstituenta({
+          id: 1,
+          alias: 'X1',
+          cst_class: CstClass.BASIC,
+          cst_type: CstType.BASE,
+          definition_formal: ''
+        }),
+        mockConstituenta({
+          id: 2,
+          alias: 'F2',
+          cst_class: CstClass.DERIVED,
+          cst_type: CstType.FUNCTION,
+          definition_formal: '[α∈X1] α'
+        }),
+        mockConstituenta({
+          id: 3,
+          alias: 'D15',
+          cst_class: CstClass.DERIVED,
+          cst_type: CstType.TERM,
+          definition_formal: 'X1'
+        }),
+        mockConstituenta({
+          id: 4,
+          alias: 'D16',
+          cst_class: CstClass.DERIVED,
+          cst_type: CstType.TERM,
+          definition_formal: 'F2[D15]'
+        })
+      ],
+      [
+        [2, 4],
+        [3, 4]
+      ]
+    );
+
+    const validator = new SubstitutionValidator([schema], [{ original: 3, substitution: 4 }]);
+
+    expect(validator.validate()).toBe(false);
+    expect(validator.errors).toEqual([
+      {
+        code: SubstitutionErrorType.definitionCycle,
+        params: ['D16 → D16']
+      }
+    ]);
+    expect(SubstitutionErrorType.definitionCycle).toBe(0x8906);
+  });
+
+  it('allows identification that does not create a definition cycle', () => {
+    const schema = mockSchema(
+      [
+        mockConstituenta({
+          id: 1,
+          alias: 'X1',
+          cst_class: CstClass.BASIC,
+          cst_type: CstType.BASE,
+          definition_formal: ''
+        }),
+        mockConstituenta({
+          id: 2,
+          alias: 'D1',
+          cst_class: CstClass.DERIVED,
+          cst_type: CstType.TERM,
+          definition_formal: 'X1'
+        }),
+        mockConstituenta({
+          id: 3,
+          alias: 'D2',
+          cst_class: CstClass.DERIVED,
+          cst_type: CstType.TERM,
+          definition_formal: 'X1'
+        })
+      ],
+      [
+        [1, 2],
+        [1, 3]
+      ]
+    );
+
+    const validator = new SubstitutionValidator([schema], [{ original: 2, substitution: 3 }]);
+
+    expect(validator.validate()).toBe(true);
+    expect(validator.errors.every(error => error.code !== SubstitutionErrorType.definitionCycle)).toBe(true);
+  });
 });