F: Enable Emoji support

M: Fix placeholder text
npm update
2024-09-23 20:33:07 +03:00 · 2024-09-23 14:58:28 +03:00 · 2024-09-23 11:59:24 +03:00 · 2024-09-23 11:53:46 +03:00 · 2024-09-23 11:48:02 +03:00 · 2024-09-23 10:33:47 +03:00
35 changed files with 334 additions and 399 deletions
--- a/rsconcept/backend/apps/library/models/LibraryItem.py
+++ b/rsconcept/backend/apps/library/models/LibraryItem.py
@ -107,6 +107,7 @@ class LibraryItem(Model):
        verbose_name = 'Схема'
        verbose_name_plural = 'Схемы'

+    # pylint: disable=invalid-str-returned
    def __str__(self) -> str:
        return f'{self.alias}'

--- a/rsconcept/backend/apps/oss/models/OperationSchema.py
+++ b/rsconcept/backend/apps/oss/models/OperationSchema.py
@ -400,7 +400,7 @@ class OperationSchema:
            if child_schema.change_cst_type(successor_id, ctype):
                self._cascade_change_cst_type(child_id, successor_id, ctype)

-    # pylint: disable=too-many-arguments
+    # pylint: disable=too-many-arguments, too-many-positional-arguments
    def _cascade_update_cst(
        self,
        operation: int,
--- a/rsconcept/backend/apps/rsform/serializers/init.py
+++ b/rsconcept/backend/apps/rsform/serializers/init.py
@ -2,6 +2,7 @@

 from .basics import (
    ASTNodeSerializer,
+    ConstituentaCheckSerializer,
    ExpressionParseSerializer,
    ExpressionSerializer,
    InheritanceDataSerializer,
--- a/rsconcept/backend/apps/rsform/serializers/basics.py
+++ b/rsconcept/backend/apps/rsform/serializers/basics.py
@ -10,6 +10,13 @@ class ExpressionSerializer(serializers.Serializer):
    expression = serializers.CharField()


+class ConstituentaCheckSerializer(serializers.Serializer):
+    ''' Serializer: RSLang expression. '''
+    alias = serializers.CharField()
+    definition_formal = serializers.CharField(allow_blank=True)
+    cst_type = serializers.CharField()
+
+
 class WordFormSerializer(serializers.Serializer):
    ''' Serializer: inflect request. '''
    text = serializers.CharField()
@ -85,6 +92,7 @@ class ASTNodeSerializer(serializers.Serializer):
 class ExpressionParseSerializer(serializers.Serializer):
    ''' Serializer: RSlang expression parse result. '''
    parseResult = serializers.BooleanField()
+    prefixLen = serializers.IntegerField()
    syntax = serializers.CharField()
    typification = serializers.CharField()
    valueClass = serializers.CharField()
--- a/rsconcept/backend/apps/rsform/tests/s_views/t_rsforms.py
+++ b/rsconcept/backend/apps/rsform/tests/s_views/t_rsforms.py
@ -113,8 +113,8 @@ class TestRSFormViewset(EndpointTester):
        self.executeForbidden(item=self.private_id)


-    @decl_endpoint('/api/rsforms/{item}/check', method='post')
-    def test_check(self):
+    @decl_endpoint('/api/rsforms/{item}/check-expression', method='post')
+    def test_check_expression(self):
        self.owned.insert_new('X1')
        data = {'expression': 'X1=X1'}
        response = self.executeOK(data=data, item=self.owned_id)
@ -127,6 +127,24 @@ class TestRSFormViewset(EndpointTester):
        self.executeOK(data=data, item=self.unowned_id)


+    @decl_endpoint('/api/rsforms/{item}/check-constituenta', method='post')
+    def test_check_constituenta(self):
+        self.owned.insert_new('X1')
+        data = {'definition_formal': 'X1=X1', 'alias': 'A111', 'cst_type': CstType.AXIOM}
+        response = self.executeOK(data=data, item=self.owned_id)
+        self.assertEqual(response.data['parseResult'], True)
+        self.assertEqual(response.data['syntax'], 'math')
+        self.assertEqual(response.data['astText'], '[:==[A111][=[X1][X1]]]')
+        self.assertEqual(response.data['typification'], 'LOGIC')
+        self.assertEqual(response.data['valueClass'], 'value')
+
+    @decl_endpoint('/api/rsforms/{item}/check-constituenta', method='post')
+    def test_check_constituenta_error(self):
+        self.owned.insert_new('X1')
+        data = {'definition_formal': 'X1=X1', 'alias': 'D111', 'cst_type': CstType.TERM}
+        response = self.executeOK(data=data, item=self.owned_id)
+        self.assertEqual(response.data['parseResult'], False)
+
    @decl_endpoint('/api/rsforms/{item}/resolve', method='post')
    def test_resolve(self):
        x1 = self.owned.insert_new(
--- a/rsconcept/backend/apps/rsform/views/rsforms.py
+++ b/rsconcept/backend/apps/rsform/views/rsforms.py
@ -56,7 +56,8 @@ class RSFormViewSet(viewsets.GenericViewSet, generics.ListAPIView, generics.Retr
            'details',
            'export_trs',
            'resolve',
-            'check'
+            'check_expression',
+            'check_constituenta'
        ]:
            permission_list = [permissions.ItemAnyone]
        else:
@ -424,8 +425,8 @@ class RSFormViewSet(viewsets.GenericViewSet, generics.ListAPIView, generics.Retr
            c.HTTP_404_NOT_FOUND: None
        },
    )
-    @action(detail=True, methods=['post'], url_path='check')
-    def check(self, request: Request, pk) -> HttpResponse:
+    @action(detail=True, methods=['post'], url_path='check-expression')
+    def check_expression(self, request: Request, pk) -> HttpResponse:
        ''' Endpoint: Check RSLang expression against schema context. '''
        serializer = s.ExpressionSerializer(data=request.data)
        serializer.is_valid(raise_exception=True)
@ -437,6 +438,31 @@ class RSFormViewSet(viewsets.GenericViewSet, generics.ListAPIView, generics.Retr
            data=json.loads(result)
        )

+    @extend_schema(
+        summary='check expression for specific CstType',
+        tags=['RSForm', 'FormalLanguage'],
+        request=s.ConstituentaCheckSerializer,
+        responses={
+            c.HTTP_200_OK: s.ExpressionParseSerializer,
+            c.HTTP_404_NOT_FOUND: None
+        },
+    )
+    @action(detail=True, methods=['post'], url_path='check-constituenta')
+    def check_constituenta(self, request: Request, pk) -> HttpResponse:
+        ''' Endpoint: Check RSLang expression against schema context. '''
+        serializer = s.ConstituentaCheckSerializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        expression = serializer.validated_data['definition_formal']
+        alias = serializer.validated_data['alias']
+        cst_type = cast(m.CstType, serializer.validated_data['cst_type'])
+
+        pySchema = s.PyConceptAdapter(m.RSForm(self.get_object()))
+        result = pyconcept.check_constituenta(json.dumps(pySchema.data), alias, expression, cst_type)
+        return Response(
+            status=c.HTTP_200_OK,
+            data=json.loads(result)
+        )
+
    @extend_schema(
        summary='resolve text with references',
        tags=['RSForm', 'NaturalLanguage'],
--- a/rsconcept/backend/requirements-dev-lock.txt
+++ b/rsconcept/backend/requirements-dev-lock.txt
@ -8,13 +8,12 @@ drf-spectacular-sidecar==2024.7.1
 coreapi==2.3.3
 django-rest-passwordreset==1.4.1
 cctext==0.1.4
-pyconcept==0.1.6
+pyconcept==0.1.8

 psycopg2-binary==2.9.9
 gunicorn==23.0.0
-
 djangorestframework-stubs==3.15.1
 django-extensions==3.2.3
 mypy==1.11.2
-pylint==3.2.7
+pylint==3.3.0
 coverage==7.6.1
--- a/rsconcept/backend/requirements.txt
+++ b/rsconcept/backend/requirements.txt
@ -8,7 +8,7 @@ drf-spectacular-sidecar==2024.7.1
 coreapi==2.3.3
 django-rest-passwordreset==1.4.1
 cctext==0.1.4
-pyconcept==0.1.6
+pyconcept==0.1.8

 psycopg2-binary==2.9.9
 gunicorn==23.0.0
--- a/rsconcept/frontend/index.html
+++ b/rsconcept/frontend/index.html
@ -15,7 +15,7 @@
    <link rel="preconnect" href="https://fonts.googleapis.com" />
    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
    <link
-      href="https://fonts.googleapis.com/css2?family=Rubik:ital,wght@0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,300;1,400;1,500;1,600;1,700;1,800;1,900&family=Fira+Code:wght@300..700&family=Noto+Sans+Math&family=Noto+Sans+Symbols+2&family=Alegreya+Sans+SC:wght@100;300;400;500;700;800;900"
+      href="https://fonts.googleapis.com/css2?family=Rubik:ital,wght@0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,300;1,400;1,500;1,600;1,700;1,800;1,900&family=Fira+Code:wght@300..700&family=Noto+Sans+Math&family=Noto+Sans+Symbols+2&family=Alegreya+Sans+SC:wght@100;300;400;500;700;800;900&family=Noto+Color+Emoji"
      rel="stylesheet"
    />

--- a/rsconcept/frontend/package-lock.json
+++ b/rsconcept/frontend/package-lock.json
@ -10,21 +10,21 @@
      "dependencies": {
        "@lezer/lr": "^1.4.2",
        "@tanstack/react-table": "^8.20.5",
-        "@uiw/codemirror-themes": "^4.23.2",
-        "@uiw/react-codemirror": "^4.23.2",
+        "@uiw/codemirror-themes": "^4.23.3",
+        "@uiw/react-codemirror": "^4.23.3",
        "axios": "^1.7.7",
        "clsx": "^2.1.1",
-        "framer-motion": "^11.5.4",
+        "framer-motion": "^11.5.6",
        "html-to-image": "^1.11.11",
        "js-file-download": "^0.4.12",
        "react": "^18.3.1",
        "react-dom": "^18.3.1",
        "react-error-boundary": "^4.0.13",
        "react-icons": "^5.3.0",
-        "react-intl": "^6.6.8",
+        "react-intl": "^6.7.0",
        "react-loader-spinner": "^6.1.6",
        "react-router-dom": "^6.26.2",
-        "react-select": "^5.8.0",
+        "react-select": "^5.8.1",
        "react-tabs": "^6.0.2",
        "react-toastify": "^10.0.5",
        "react-tooltip": "^5.28.0",
@ -37,13 +37,13 @@
        "@lezer/generator": "^1.7.1",
        "@types/jest": "^29.5.13",
        "@types/node": "^22.5.5",
-        "@types/react": "^18.3.7",
+        "@types/react": "^18.3.8",
        "@types/react-dom": "^18.3.0",
        "@typescript-eslint/eslint-plugin": "^8.0.1",
        "@typescript-eslint/parser": "^8.0.1",
        "@vitejs/plugin-react": "^4.3.1",
        "autoprefixer": "^10.4.20",
-        "eslint": "^9.10.0",
+        "eslint": "^9.11.0",
        "eslint-plugin-react": "^7.36.1",
        "eslint-plugin-simple-import-sort": "^12.1.1",
        "globals": "^15.9.0",
@ -53,7 +53,7 @@
        "ts-jest": "^29.2.5",
        "typescript": "^5.6.2",
        "typescript-eslint": "^8.6.0",
-        "vite": "^5.4.6"
+        "vite": "^5.4.7"
      }
    },
    "node_modules/@alloc/quick-lru": {
@ -693,9 +693,9 @@
      }
    },
    "node_modules/@codemirror/language": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.2.tgz",
-      "integrity": "sha512-kgbTYTo0Au6dCSc/TFy7fK3fpJmgHDv1sG1KNQKJXVi+xBTEeBPY/M30YXiU6mMXeH+YIDLsbrT4ZwNRdtF+SA==",
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.3.tgz",
+      "integrity": "sha512-kDqEU5sCP55Oabl6E7m5N+vZRoc0iWqgDVhEKifcHzPzjqCegcO4amfrYVL9PmPZpl4G0yjkpTpUO/Ui8CzO8A==",
      "license": "MIT",
      "dependencies": {
        "@codemirror/state": "^6.0.0",
@ -868,15 +868,15 @@
      }
    },
    "node_modules/@emotion/serialize": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.1.tgz",
-      "integrity": "sha512-dEPNKzBPU+vFPGa+z3axPRn8XVDetYORmDC0wAiej+TNcOZE70ZMJa0X7JdeoM6q/nWTMZeLpN/fTnD9o8MQBA==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.2.tgz",
+      "integrity": "sha512-grVnMvVPK9yUVE6rkKfAJlYZgo0cu3l9iMC77V7DW6E1DUIrU68pSEXRmFZFOFB1QFo57TncmOcvcbMDWsL4yA==",
      "license": "MIT",
      "dependencies": {
        "@emotion/hash": "^0.9.2",
        "@emotion/memoize": "^0.9.0",
        "@emotion/unitless": "^0.10.0",
-        "@emotion/utils": "^1.4.0",
+        "@emotion/utils": "^1.4.1",
        "csstype": "^3.0.2"
      }
    },
@ -902,9 +902,9 @@
      }
    },
    "node_modules/@emotion/utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.4.0.tgz",
-      "integrity": "sha512-spEnrA1b6hDR/C68lC2M7m6ALPUHZC0lIY7jAS/B/9DuuO1ZP04eov8SMv/6fwRd8pzmsn2AuJEznRREWlQrlQ==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.4.1.tgz",
+      "integrity": "sha512-BymCXzCG3r72VKJxaYVwOXATqXIZ85cuvg0YOUDxMGNrKc1DJRZk8MgV5wyXRyEayIMd4FuXJIUgTBXvDNW5cA==",
      "license": "MIT"
    },
    "node_modules/@emotion/weak-memoize": {
@ -1431,9 +1431,9 @@
      }
    },
    "node_modules/@eslint/js": {
-      "version": "9.10.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.10.0.tgz",
-      "integrity": "sha512-fuXtbiP5GWIn8Fz+LWoOMVf/Jxm+aajZYkhi6CuEm4SxymFM+eUWzbO9qXT+L0iCkL5+KGYMCSGxo686H19S1g==",
+      "version": "9.11.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.11.0.tgz",
+      "integrity": "sha512-LPkkenkDqyzTFauZLLAPhIb48fj6drrfMvRGSL9tS3AcZBSVTllemLSNyCvHNNL2t797S/6DJNSIwRwXgMO/eQ==",
      "dev": true,
      "license": "MIT",
      "engines": {
@ -1451,9 +1451,9 @@
      }
    },
    "node_modules/@eslint/plugin-kit": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.1.0.tgz",
-      "integrity": "sha512-autAXT203ixhqei9xt+qkYOvY8l6LAFIdT2UXc/RPNeUVfqRF1BV94GTJyVPFKT8nFM6MyVJhjLj9E8JWvf5zQ==",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.0.tgz",
+      "integrity": "sha512-vH9PiIMMwvhCx31Af3HiGzsVNULDbyVkHXwlemn/B0TFj/00ho3y55efXrUZTfQipxoHC5u4xq6zblww1zm1Ig==",
      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
@ -1529,9 +1529,9 @@
      }
    },
    "node_modules/@formatjs/intl": {
-      "version": "2.10.4",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-2.10.4.tgz",
-      "integrity": "sha512-56483O+HVcL0c7VucAS2tyH020mt9XTozZO67cwtGg0a7KWDukS/FzW3OnvaHmTHDuYsoPIzO+ZHVfU6fT/bJw==",
+      "version": "2.10.5",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-2.10.5.tgz",
+      "integrity": "sha512-f9qPNNgLrh2KvoFvHGIfcPTmNGbyy7lyyV4/P6JioDqtTE7Akdmgt+ZzVndr+yMLZnssUShyTMXxM/6aV9eVuQ==",
      "license": "MIT",
      "dependencies": {
        "@formatjs/ecma402-abstract": "2.0.0",
@ -2897,9 +2897,9 @@
      }
    },
    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.3.tgz",
-      "integrity": "sha512-MmKSfaB9GX+zXl6E8z4koOr/xU63AMVleLEa64v7R0QF/ZloMs5vcD1sHgM64GXXS1csaJutG+ddtzcueI/BLg==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz",
+      "integrity": "sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==",
      "cpu": [
        "arm"
      ],
@ -2911,9 +2911,9 @@
      ]
    },
    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.3.tgz",
-      "integrity": "sha512-zrt8ecH07PE3sB4jPOggweBjJMzI1JG5xI2DIsUbkA+7K+Gkjys6eV7i9pOenNSDJH3eOr/jLb/PzqtmdwDq5g==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz",
+      "integrity": "sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==",
      "cpu": [
        "arm64"
      ],
@ -2925,9 +2925,9 @@
      ]
    },
    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.3.tgz",
-      "integrity": "sha512-P0UxIOrKNBFTQaXTxOH4RxuEBVCgEA5UTNV6Yz7z9QHnUJ7eLX9reOd/NYMO3+XZO2cco19mXTxDMXxit4R/eQ==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz",
+      "integrity": "sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==",
      "cpu": [
        "arm64"
      ],
@ -2939,9 +2939,9 @@
      ]
    },
    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.3.tgz",
-      "integrity": "sha512-L1M0vKGO5ASKntqtsFEjTq/fD91vAqnzeaF6sfNAy55aD+Hi2pBI5DKwCO+UNDQHWsDViJLqshxOahXyLSh3EA==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz",
+      "integrity": "sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==",
      "cpu": [
        "x64"
      ],
@ -2953,9 +2953,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.3.tgz",
-      "integrity": "sha512-btVgIsCjuYFKUjopPoWiDqmoUXQDiW2A4C3Mtmp5vACm7/GnyuprqIDPNczeyR5W8rTXEbkmrJux7cJmD99D2g==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz",
+      "integrity": "sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==",
      "cpu": [
        "arm"
      ],
@ -2967,9 +2967,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.3.tgz",
-      "integrity": "sha512-zmjbSphplZlau6ZTkxd3+NMtE4UKVy7U4aVFMmHcgO5CUbw17ZP6QCgyxhzGaU/wFFdTfiojjbLG3/0p9HhAqA==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz",
+      "integrity": "sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==",
      "cpu": [
        "arm"
      ],
@ -2981,9 +2981,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.3.tgz",
-      "integrity": "sha512-nSZfcZtAnQPRZmUkUQwZq2OjQciR6tEoJaZVFvLHsj0MF6QhNMg0fQ6mUOsiCUpTqxTx0/O6gX0V/nYc7LrgPw==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz",
+      "integrity": "sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==",
      "cpu": [
        "arm64"
      ],
@ -2995,9 +2995,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.3.tgz",
-      "integrity": "sha512-MnvSPGO8KJXIMGlQDYfvYS3IosFN2rKsvxRpPO2l2cum+Z3exiExLwVU+GExL96pn8IP+GdH8Tz70EpBhO0sIQ==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz",
+      "integrity": "sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==",
      "cpu": [
        "arm64"
      ],
@ -3009,9 +3009,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.3.tgz",
-      "integrity": "sha512-+W+p/9QNDr2vE2AXU0qIy0qQE75E8RTwTwgqS2G5CRQ11vzq0tbnfBd6brWhS9bCRjAjepJe2fvvkvS3dno+iw==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz",
+      "integrity": "sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==",
      "cpu": [
        "ppc64"
      ],
@ -3023,9 +3023,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.3.tgz",
-      "integrity": "sha512-yXH6K6KfqGXaxHrtr+Uoy+JpNlUlI46BKVyonGiaD74ravdnF9BUNC+vV+SIuB96hUMGShhKV693rF9QDfO6nQ==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz",
+      "integrity": "sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==",
      "cpu": [
        "riscv64"
      ],
@ -3037,9 +3037,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.3.tgz",
-      "integrity": "sha512-R8cwY9wcnApN/KDYWTH4gV/ypvy9yZUHlbJvfaiXSB48JO3KpwSpjOGqO4jnGkLDSk1hgjYkTbTt6Q7uvPf8eg==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz",
+      "integrity": "sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==",
      "cpu": [
        "s390x"
      ],
@ -3051,9 +3051,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.3.tgz",
-      "integrity": "sha512-kZPbX/NOPh0vhS5sI+dR8L1bU2cSO9FgxwM8r7wHzGydzfSjLRCFAT87GR5U9scj2rhzN3JPYVC7NoBbl4FZ0g==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz",
+      "integrity": "sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==",
      "cpu": [
        "x64"
      ],
@ -3065,9 +3065,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.3.tgz",
-      "integrity": "sha512-S0Yq+xA1VEH66uiMNhijsWAafffydd2X5b77eLHfRmfLsRSpbiAWiRHV6DEpz6aOToPsgid7TI9rGd6zB1rhbg==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz",
+      "integrity": "sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==",
      "cpu": [
        "x64"
      ],
@ -3079,9 +3079,9 @@
      ]
    },
    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.3.tgz",
-      "integrity": "sha512-9isNzeL34yquCPyerog+IMCNxKR8XYmGd0tHSV+OVx0TmE0aJOo9uw4fZfUuk2qxobP5sug6vNdZR6u7Mw7Q+Q==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz",
+      "integrity": "sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==",
      "cpu": [
        "arm64"
      ],
@ -3093,9 +3093,9 @@
      ]
    },
    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.3.tgz",
-      "integrity": "sha512-nMIdKnfZfzn1Vsk+RuOvl43ONTZXoAPUUxgcU0tXooqg4YrAqzfKzVenqqk2g5efWh46/D28cKFrOzDSW28gTA==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz",
+      "integrity": "sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==",
      "cpu": [
        "ia32"
      ],
@ -3107,9 +3107,9 @@
      ]
    },
    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.3.tgz",
-      "integrity": "sha512-fOvu7PCQjAj4eWDEuD8Xz5gpzFqXzGlxHZozHP4b9Jxv9APtdxL6STqztDzMLuRXEc4UpXGGhx029Xgm91QBeA==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz",
+      "integrity": "sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==",
      "cpu": [
        "x64"
      ],
@ -3590,9 +3590,9 @@
      "license": "MIT"
    },
    "node_modules/@types/react": {
-      "version": "18.3.7",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.7.tgz",
-      "integrity": "sha512-KUnDCJF5+AiZd8owLIeVHqmW9yM4sqmDVf2JRJiBMFkGvkoZ4/WyV2lL4zVsoinmRS/W3FeEdZLEWFRofnT2FQ==",
+      "version": "18.3.8",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.8.tgz",
+      "integrity": "sha512-syBUrW3/XpnW4WJ41Pft+I+aPoDVbrBVQGEnbD7NijDGlVC+8gV/XKRY+7vMDlfPpbwYt0l1vd/Sj8bJGMbs9Q==",
      "license": "MIT",
      "dependencies": {
        "@types/prop-types": "*",
@ -3875,9 +3875,9 @@
      }
    },
    "node_modules/@uiw/codemirror-extensions-basic-setup": {
-      "version": "4.23.2",
-      "resolved": "https://registry.npmjs.org/@uiw/codemirror-extensions-basic-setup/-/codemirror-extensions-basic-setup-4.23.2.tgz",
-      "integrity": "sha512-eacivkj7wzskl2HBYs4rfN0CbYlsSQh5ADtOYWTpc8Txm4ONw8RTi4/rxF6Ks2vdaovizewU5QaHximbxoNTrw==",
+      "version": "4.23.3",
+      "resolved": "https://registry.npmjs.org/@uiw/codemirror-extensions-basic-setup/-/codemirror-extensions-basic-setup-4.23.3.tgz",
+      "integrity": "sha512-nEMjgbCyeLx+UQgOGAAoUWYFE34z5TlyaKNszuig/BddYFDb0WKcgmC37bDFxR2dZssf3K/lwGWLpXnGKXePbA==",
      "license": "MIT",
      "dependencies": {
        "@codemirror/autocomplete": "^6.0.0",
@ -3902,9 +3902,9 @@
      }
    },
    "node_modules/@uiw/codemirror-themes": {
-      "version": "4.23.2",
-      "resolved": "https://registry.npmjs.org/@uiw/codemirror-themes/-/codemirror-themes-4.23.2.tgz",
-      "integrity": "sha512-g8x+oPqgbzxXSkHhRf7e1AM1mI9/Nl3URReS89pHitRKv8MZNrE+ey+HE8ycfNXRUatrb6zTSRV3M75uoZwNYw==",
+      "version": "4.23.3",
+      "resolved": "https://registry.npmjs.org/@uiw/codemirror-themes/-/codemirror-themes-4.23.3.tgz",
+      "integrity": "sha512-oUq2qoj+hMrR34Xhbp7S1P2elPtySWyzij97IwsZAdGZD/yS+c9+2yRSMYqtaWh7D9M4sJmwgU1lZibmwLZOfQ==",
      "license": "MIT",
      "dependencies": {
        "@codemirror/language": "^6.0.0",
@ -3921,16 +3921,16 @@
      }
    },
    "node_modules/@uiw/react-codemirror": {
-      "version": "4.23.2",
-      "resolved": "https://registry.npmjs.org/@uiw/react-codemirror/-/react-codemirror-4.23.2.tgz",
-      "integrity": "sha512-MmFL6P5V1Mr81JLkJyWNedfxENKdRhsvyU7Izji9wp337m8dqRAz7rCF5XWarGKx+iQ7q2H5ryl07nLqKLSvtQ==",
+      "version": "4.23.3",
+      "resolved": "https://registry.npmjs.org/@uiw/react-codemirror/-/react-codemirror-4.23.3.tgz",
+      "integrity": "sha512-TBBLUbeqXmfQSfO+f3rPNOAb+QXbSm7KPB64FHQWLGg2WJNbpOhjLOWMyL+C4ZP3aSCNc2Y5aftEK1vp3wCKTA==",
      "license": "MIT",
      "dependencies": {
        "@babel/runtime": "^7.18.6",
        "@codemirror/commands": "^6.1.0",
        "@codemirror/state": "^6.1.1",
        "@codemirror/theme-one-dark": "^6.0.0",
-        "@uiw/codemirror-extensions-basic-setup": "4.23.2",
+        "@uiw/codemirror-extensions-basic-setup": "4.23.3",
        "codemirror": "^6.0.0"
      },
      "funding": {
@ -3985,9 +3985,9 @@
      }
    },
    "node_modules/@webgpu/types": {
-      "version": "0.1.45",
-      "resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.45.tgz",
-      "integrity": "sha512-0TBBF/mhakJoK0qUWCZugBnh23x+VwmYA5RLmtNQwvZt1pQ4P2fzIvQUiSe6jxzkBi4GF8R4BejJjro0ZSoSXQ==",
+      "version": "0.1.46",
+      "resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.46.tgz",
+      "integrity": "sha512-2iogO6Zh0pTbKLGZuuGWEmJpF/fTABGs7G9wXxpn7s24XSJchSUIiMqIJHURi5zsMZRRTuXrV/3GLOkmOFjq5w==",
      "license": "BSD-3-Clause",
      "peer": true
    },
@ -4742,9 +4742,9 @@
      }
    },
    "node_modules/caniuse-lite": {
-      "version": "1.0.30001660",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz",
-      "integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==",
+      "version": "1.0.30001663",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001663.tgz",
+      "integrity": "sha512-o9C3X27GLKbLeTYZ6HBOLU1tsAcBZsLis28wrVzddShCS16RujjHp9GDHKZqrB3meE0YjhawvMFsGb/igqiPzA==",
      "dev": true,
      "funding": [
        {
@ -5534,9 +5534,9 @@
      }
    },
    "node_modules/detect-gpu": {
-      "version": "5.0.48",
-      "resolved": "https://registry.npmjs.org/detect-gpu/-/detect-gpu-5.0.48.tgz",
-      "integrity": "sha512-AdG8ur7loIIIzG8XBjNiLk6Seq4jGp7GAL2TEsjq7etgK8ia6ha3rTbBCRCHsnwYiLqYn4uWJfS7hVwZz7DKNQ==",
+      "version": "5.0.49",
+      "resolved": "https://registry.npmjs.org/detect-gpu/-/detect-gpu-5.0.49.tgz",
+      "integrity": "sha512-XXPqzsKJErNcafLnoye+hnSa5GzwMwpoOMz4nCnmhV0wQMy3wJVi2j5/FSMYxxH+elR12N/x7QjGxegd4AmdpQ==",
      "license": "MIT",
      "dependencies": {
        "webgl-constants": "^1.1.1"
@ -5629,9 +5629,9 @@
      }
    },
    "node_modules/electron-to-chromium": {
-      "version": "1.5.25",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.25.tgz",
-      "integrity": "sha512-kMb204zvK3PsSlgvvwzI3wBIcAw15tRkYk+NQdsjdDtcQWTp2RABbMQ9rUBy8KNEOM+/E6ep+XC3AykiWZld4g==",
+      "version": "1.5.27",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.27.tgz",
+      "integrity": "sha512-o37j1vZqCoEgBuWWXLHQgTN/KDKe7zwpiY5CPeq2RvUqOyJw9xnrULzZAEVQ5p4h+zjMk7hgtOoPdnLxr7m/jw==",
      "dev": true,
      "license": "ISC"
    },
@ -5895,9 +5895,9 @@
      }
    },
    "node_modules/eslint": {
-      "version": "9.10.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.10.0.tgz",
-      "integrity": "sha512-Y4D0IgtBZfOcOUAIQTSXBKoNGfY0REGqHJG6+Q81vNippW5YlKjHFj4soMxamKK1NXHUWuBZTLdU3Km+L/pcHw==",
+      "version": "9.11.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.11.0.tgz",
+      "integrity": "sha512-yVS6XODx+tMFMDFcG4+Hlh+qG7RM6cCJXtQhCKLSsr3XkLvWggHjCqjfh0XsPPnt1c56oaT6PMgW9XWQQjdHXA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@ -5905,8 +5905,8 @@
        "@eslint-community/regexpp": "^4.11.0",
        "@eslint/config-array": "^0.18.0",
        "@eslint/eslintrc": "^3.1.0",
-        "@eslint/js": "9.10.0",
-        "@eslint/plugin-kit": "^0.1.0",
+        "@eslint/js": "9.11.0",
+        "@eslint/plugin-kit": "^0.2.0",
        "@humanwhocodes/module-importer": "^1.0.1",
        "@humanwhocodes/retry": "^0.3.0",
        "@nodelib/fs.walk": "^1.2.8",
@ -6596,9 +6596,9 @@
      }
    },
    "node_modules/framer-motion": {
-      "version": "11.5.4",
-      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.5.4.tgz",
-      "integrity": "sha512-E+tb3/G6SO69POkdJT+3EpdMuhmtCh9EWuK4I1DnIC23L7tFPrl8vxP+LSovwaw6uUr73rUbpb4FgK011wbRJQ==",
+      "version": "11.5.6",
+      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.5.6.tgz",
+      "integrity": "sha512-JMwUpAxv/DWgul9vPgX0ElKn0G66sUc6O9tOXsYwn3zxwvhxFljSXC0XT2QCzuTYBshwC8nyDAa1SYcV0Ldbhw==",
      "license": "MIT",
      "dependencies": {
        "tslib": "^2.4.0"
@ -10953,14 +10953,14 @@
      }
    },
    "node_modules/react-intl": {
-      "version": "6.6.8",
-      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-6.6.8.tgz",
-      "integrity": "sha512-M0pkhzcgV31h++2901BiRXWl69hp2zPyLxRrSwRjd1ErXbNoubz/f4M6DrRTd4OiSUrT4ajRQzrmtS5plG4FtA==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-6.7.0.tgz",
+      "integrity": "sha512-f5QhjuKb+WEqiAbL5hDqUs2+sSRkF0vxkTbJ4A8ompt55XTyOHcrDlCXGq4o73ywFFrpgz+78C9IXegSLlya2A==",
      "license": "BSD-3-Clause",
      "dependencies": {
        "@formatjs/ecma402-abstract": "2.0.0",
        "@formatjs/icu-messageformat-parser": "2.7.8",
-        "@formatjs/intl": "2.10.4",
+        "@formatjs/intl": "2.10.5",
        "@formatjs/intl-displaynames": "6.6.8",
        "@formatjs/intl-listformat": "7.5.7",
        "@types/hoist-non-react-statics": "^3.3.1",
@ -11080,9 +11080,9 @@
      }
    },
    "node_modules/react-select": {
-      "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.8.0.tgz",
-      "integrity": "sha512-TfjLDo58XrhP6VG5M/Mi56Us0Yt8X7xD6cDybC7yoRMUNm7BGO7qk8J0TLQOua/prb8vUOtsfnXZwfm30HGsAA==",
+      "version": "5.8.1",
+      "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.8.1.tgz",
+      "integrity": "sha512-RT1CJmuc+ejqm5MPgzyZujqDskdvB9a9ZqrdnVLsvAHjJ3Tj0hELnLeVPQlmYdVKCdCpxanepl6z7R5KhXhWzg==",
      "license": "MIT",
      "dependencies": {
        "@babel/runtime": "^7.12.0",
@ -11442,9 +11442,9 @@
      }
    },
    "node_modules/rollup": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.3.tgz",
-      "integrity": "sha512-7sqRtBNnEbcBtMeRVc6VRsJMmpI+JU1z9VTvW8D4gXIYQFz0aLcsE6rRkyghZkLfEgUZgVvOG7A5CVz/VW5GIA==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.4.tgz",
+      "integrity": "sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@ -11458,22 +11458,22 @@
        "npm": ">=8.0.0"
      },
      "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.21.3",
-        "@rollup/rollup-android-arm64": "4.21.3",
-        "@rollup/rollup-darwin-arm64": "4.21.3",
-        "@rollup/rollup-darwin-x64": "4.21.3",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.21.3",
-        "@rollup/rollup-linux-arm-musleabihf": "4.21.3",
-        "@rollup/rollup-linux-arm64-gnu": "4.21.3",
-        "@rollup/rollup-linux-arm64-musl": "4.21.3",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.21.3",
-        "@rollup/rollup-linux-riscv64-gnu": "4.21.3",
-        "@rollup/rollup-linux-s390x-gnu": "4.21.3",
-        "@rollup/rollup-linux-x64-gnu": "4.21.3",
-        "@rollup/rollup-linux-x64-musl": "4.21.3",
-        "@rollup/rollup-win32-arm64-msvc": "4.21.3",
-        "@rollup/rollup-win32-ia32-msvc": "4.21.3",
-        "@rollup/rollup-win32-x64-msvc": "4.21.3",
+        "@rollup/rollup-android-arm-eabi": "4.22.4",
+        "@rollup/rollup-android-arm64": "4.22.4",
+        "@rollup/rollup-darwin-arm64": "4.22.4",
+        "@rollup/rollup-darwin-x64": "4.22.4",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.22.4",
+        "@rollup/rollup-linux-arm-musleabihf": "4.22.4",
+        "@rollup/rollup-linux-arm64-gnu": "4.22.4",
+        "@rollup/rollup-linux-arm64-musl": "4.22.4",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.22.4",
+        "@rollup/rollup-linux-riscv64-gnu": "4.22.4",
+        "@rollup/rollup-linux-s390x-gnu": "4.22.4",
+        "@rollup/rollup-linux-x64-gnu": "4.22.4",
+        "@rollup/rollup-linux-x64-musl": "4.22.4",
+        "@rollup/rollup-win32-arm64-msvc": "4.22.4",
+        "@rollup/rollup-win32-ia32-msvc": "4.22.4",
+        "@rollup/rollup-win32-x64-msvc": "4.22.4",
        "fsevents": "~2.3.2"
      }
    },
@ -12242,9 +12242,9 @@
      "license": "MIT"
    },
    "node_modules/three-mesh-bvh": {
-      "version": "0.7.8",
-      "resolved": "https://registry.npmjs.org/three-mesh-bvh/-/three-mesh-bvh-0.7.8.tgz",
-      "integrity": "sha512-BGEZTOIC14U0XIRw3tO4jY7IjP7n7v24nv9JXS1CyeVRWOCkcOMhRnmENUjuV39gktAw4Ofhr0OvIAiTspQrrw==",
+      "version": "0.7.6",
+      "resolved": "https://registry.npmjs.org/three-mesh-bvh/-/three-mesh-bvh-0.7.6.tgz",
+      "integrity": "sha512-rCjsnxEqR9r1/C/lCqzGLS67NDty/S/eT6rAJfDvsanrIctTWdNoR4ZOGWewCB13h1QkVo2BpmC0wakj1+0m8A==",
      "license": "MIT",
      "peerDependencies": {
        "three": ">= 0.151.0"
@ -12711,9 +12711,9 @@
      }
    },
    "node_modules/vite": {
-      "version": "5.4.6",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.6.tgz",
-      "integrity": "sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==",
+      "version": "5.4.7",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.7.tgz",
+      "integrity": "sha512-5l2zxqMEPVENgvzTuBpHer2awaetimj2BGkhBPdnwKbPNOlHsODU+oiazEZzLK7KhAnOrO+XGYJYn4ZlUhDtDQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
--- a/rsconcept/frontend/package.json
+++ b/rsconcept/frontend/package.json
@ -14,21 +14,21 @@
  "dependencies": {
    "@lezer/lr": "^1.4.2",
    "@tanstack/react-table": "^8.20.5",
-    "@uiw/codemirror-themes": "^4.23.2",
-    "@uiw/react-codemirror": "^4.23.2",
+    "@uiw/codemirror-themes": "^4.23.3",
+    "@uiw/react-codemirror": "^4.23.3",
    "axios": "^1.7.7",
    "clsx": "^2.1.1",
-    "framer-motion": "^11.5.4",
+    "framer-motion": "^11.5.6",
    "html-to-image": "^1.11.11",
    "js-file-download": "^0.4.12",
    "react": "^18.3.1",
    "react-dom": "^18.3.1",
    "react-error-boundary": "^4.0.13",
    "react-icons": "^5.3.0",
-    "react-intl": "^6.6.8",
+    "react-intl": "^6.7.0",
    "react-loader-spinner": "^6.1.6",
    "react-router-dom": "^6.26.2",
-    "react-select": "^5.8.0",
+    "react-select": "^5.8.1",
    "react-tabs": "^6.0.2",
    "react-toastify": "^10.0.5",
    "react-tooltip": "^5.28.0",
@ -41,13 +41,13 @@
    "@lezer/generator": "^1.7.1",
    "@types/jest": "^29.5.13",
    "@types/node": "^22.5.5",
-    "@types/react": "^18.3.7",
+    "@types/react": "^18.3.8",
    "@types/react-dom": "^18.3.0",
    "@typescript-eslint/eslint-plugin": "^8.0.1",
    "@typescript-eslint/parser": "^8.0.1",
    "@vitejs/plugin-react": "^4.3.1",
    "autoprefixer": "^10.4.20",
-    "eslint": "^9.10.0",
+    "eslint": "^9.11.0",
    "eslint-plugin-react": "^7.36.1",
    "eslint-plugin-simple-import-sort": "^12.1.1",
    "globals": "^15.9.0",
@ -57,7 +57,7 @@
    "ts-jest": "^29.2.5",
    "typescript": "^5.6.2",
    "typescript-eslint": "^8.6.0",
-    "vite": "^5.4.6"
+    "vite": "^5.4.7"
  },
  "jest": {
    "preset": "ts-jest",
--- a/rsconcept/frontend/src/app/ApplicationLayout.tsx
+++ b/rsconcept/frontend/src/app/ApplicationLayout.tsx
@ -11,7 +11,7 @@ function ApplicationLayout() {
  const { viewportHeight, mainHeight, showScroll } = useConceptOptions();
  return (
    <NavigationState>
-      <div className='min-w-[20rem] clr-app antialiased h-full'>
+      <div className='min-w-[20rem] clr-app antialiased h-full max-w-[120rem] mx-auto'>
        <ConceptToaster
          className='mt-[4rem] text-[14px]' // prettier: split lines
          autoClose={3000}
--- a/rsconcept/frontend/src/backend/rsforms.ts
+++ b/rsconcept/frontend/src/backend/rsforms.ts
@ -5,6 +5,7 @@
 import { ILibraryCreateData, ILibraryItem } from '@/models/library';
 import { ICstSubstituteData } from '@/models/oss';
 import {
+  ICheckConstituentaData,
  IConstituentaList,
  IConstituentaMeta,
  ICstCreateData,
@ -18,7 +19,7 @@ import {
  IRSFormUploadData,
  ITargetCst
 } from '@/models/rsform';
-import { IExpressionParse, IRSExpression } from '@/models/rslang';
+import { IExpressionParse } from '@/models/rslang';

 import { AxiosGet, AxiosPatch, AxiosPost, FrontExchange, FrontPull } from './apiTransport';

@ -113,9 +114,12 @@ export function patchMoveConstituenta(schema: string, request: FrontExchange<ICs
  });
 }

-export function postCheckExpression(schema: string, request: FrontExchange<IRSExpression, IExpressionParse>) {
+export function postCheckConstituenta(
+  schema: string,
+  request: FrontExchange<ICheckConstituentaData, IExpressionParse>
+) {
  AxiosPost({
-    endpoint: `/api/rsforms/${schema}/check`,
+    endpoint: `/api/rsforms/${schema}/check-constituenta`,
    request: request
  });
 }
--- a/rsconcept/frontend/src/components/DomainIcons.tsx
+++ b/rsconcept/frontend/src/components/DomainIcons.tsx
@ -96,8 +96,6 @@ export function DependencyIcon({ value, size = '1.25rem', className }: DomIconPr
  switch (value) {
    case DependencyMode.ALL:
      return <IconSettings size={size} className={className} />;
-    case DependencyMode.EXPRESSION:
-      return <IconText size={size} className={className ?? 'clr-text-primary'} />;
    case DependencyMode.OUTPUTS:
      return <IconGraphOutputs size={size} className={className ?? 'clr-text-primary'} />;
    case DependencyMode.INPUTS:
--- a/rsconcept/frontend/src/components/info/BadgeConstituenta.tsx
+++ b/rsconcept/frontend/src/components/info/BadgeConstituenta.tsx
@ -1,7 +1,6 @@
 import clsx from 'clsx';

-import { IConstituenta } from '@/models/rsform';
-import { isMockCst } from '@/models/rsformAPI';
+import { CstClass, IConstituenta } from '@/models/rsform';
 import { colorFgCstStatus, IColorTheme } from '@/styling/color';

 import { CProps } from '../props';
@ -28,7 +27,7 @@ function BadgeConstituenta({ value, prefixID, className, style, theme }: BadgeCo
      style={{
        borderColor: colorFgCstStatus(value.status, theme),
        color: colorFgCstStatus(value.status, theme),
-        backgroundColor: isMockCst(value) ? theme.bgWarning : theme.bgInput,
+        backgroundColor: value.cst_class === CstClass.BASIC ? theme.bgGreen25 : theme.bgInput,
        ...style
      }}
    >
--- a/rsconcept/frontend/src/dialogs/DlgCreateCst/FormCreateCst.tsx
+++ b/rsconcept/frontend/src/dialogs/DlgCreateCst/FormCreateCst.tsx
@ -95,9 +95,7 @@ function FormCreateCst({ schema, state, partialUpdate, setValidated }: FormCreat
              : 'Формальное определение'
          }
          placeholder={
-            state.cst_type !== CstType.STRUCTURED
-              ? 'Родоструктурное выражение'
-              : 'Определение множества, которому принадлежат элементы родовой структуры'
+            state.cst_type !== CstType.STRUCTURED ? 'Родоструктурное выражение' : 'Типизация родовой структуры'
          }
          value={state.definition_formal}
          onChange={value => partialUpdate({ definition_formal: value })}
--- a/rsconcept/frontend/src/hooks/useCheckConstituenta.ts
+++ b/rsconcept/frontend/src/hooks/useCheckConstituenta.ts
@ -0,0 +1,40 @@
+'use client';
+
+import { useCallback, useState } from 'react';
+
+import { DataCallback } from '@/backend/apiTransport';
+import { postCheckConstituenta } from '@/backend/rsforms';
+import { type ErrorData } from '@/components/info/InfoError';
+import { ICheckConstituentaData, IConstituenta, type IRSForm } from '@/models/rsform';
+import { IExpressionParse } from '@/models/rslang';
+
+function useCheckConstituenta({ schema }: { schema?: IRSForm }) {
+  const [processing, setProcessing] = useState(false);
+  const [error, setError] = useState<ErrorData>(undefined);
+  const [parseData, setParseData] = useState<IExpressionParse | undefined>(undefined);
+
+  const resetParse = useCallback(() => setParseData(undefined), []);
+
+  function checkConstituenta(expression: string, activeCst: IConstituenta, onSuccess?: DataCallback<IExpressionParse>) {
+    const data: ICheckConstituentaData = {
+      definition_formal: expression,
+      alias: activeCst.alias,
+      cst_type: activeCst.cst_type
+    };
+    setError(undefined);
+    postCheckConstituenta(String(schema!.id), {
+      data: data,
+      showError: true,
+      setLoading: setProcessing,
+      onError: setError,
+      onSuccess: parse => {
+        setParseData(parse);
+        if (onSuccess) onSuccess(parse);
+      }
+    });
+  }
+
+  return { parseData, checkConstituenta, resetParse, error, setError, processing };
+}
+
+export default useCheckConstituenta;
--- a/rsconcept/frontend/src/hooks/useCheckExpression.ts
+++ b/rsconcept/frontend/src/hooks/useCheckExpression.ts
@ -1,100 +0,0 @@
-'use client';
-
-import { useCallback, useState } from 'react';
-
-import { DataCallback } from '@/backend/apiTransport';
-import { postCheckExpression } from '@/backend/rsforms';
-import { type ErrorData } from '@/components/info/InfoError';
-import { CstType, IConstituenta, type IRSForm } from '@/models/rsform';
-import { getDefinitionPrefix } from '@/models/rsformAPI';
-import { IArgumentInfo, IExpressionParse } from '@/models/rslang';
-import { RSErrorType } from '@/models/rslang';
-import { PARAMETER } from '@/utils/constants';
-
-function useCheckExpression({ schema }: { schema?: IRSForm }) {
-  const [processing, setProcessing] = useState(false);
-  const [error, setError] = useState<ErrorData>(undefined);
-  const [parseData, setParseData] = useState<IExpressionParse | undefined>(undefined);
-
-  const resetParse = useCallback(() => setParseData(undefined), []);
-
-  function checkExpression(expression: string, activeCst?: IConstituenta, onSuccess?: DataCallback<IExpressionParse>) {
-    setError(undefined);
-    postCheckExpression(String(schema!.id), {
-      data: { expression: expression },
-      showError: true,
-      setLoading: setProcessing,
-      onError: setError,
-      onSuccess: parse => {
-        if (activeCst) {
-          adjustResults(parse, expression.trim() === getDefinitionPrefix(activeCst), activeCst.cst_type);
-        }
-        setParseData(parse);
-        if (onSuccess) onSuccess(parse);
-      }
-    });
-  }
-
-  return { parseData, checkExpression, resetParse, error, setError, processing };
-}
-
-export default useCheckExpression;
-
-// ===== Internals ========
-function checkTypeConsistency(type: CstType, typification: string, args: IArgumentInfo[]): boolean {
-  switch (type) {
-    case CstType.BASE:
-    case CstType.CONSTANT:
-    case CstType.STRUCTURED:
-    case CstType.TERM:
-      return typification !== PARAMETER.logicLabel && args.length === 0;
-
-    case CstType.AXIOM:
-    case CstType.THEOREM:
-      return typification === PARAMETER.logicLabel && args.length === 0;
-
-    case CstType.FUNCTION:
-      return typification !== PARAMETER.logicLabel && args.length !== 0;
-
-    case CstType.PREDICATE:
-      return typification === PARAMETER.logicLabel && args.length !== 0;
-  }
-}
-
-function adjustResults(parse: IExpressionParse, emptyExpression: boolean, cstType: CstType) {
-  if (!parse.parseResult && parse.errors.length > 0) {
-    return;
-  }
-  if (cstType === CstType.BASE || cstType === CstType.CONSTANT) {
-    if (!emptyExpression) {
-      parse.parseResult = false;
-      parse.errors.push({
-        errorType: RSErrorType.globalNonemptyBase,
-        isCritical: true,
-        params: [],
-        position: 0
-      });
-      return;
-    }
-  } else {
-    if (emptyExpression) {
-      parse.parseResult = false;
-      parse.errors.push({
-        errorType: RSErrorType.globalEmptyDerived,
-        isCritical: true,
-        params: [],
-        position: 0
-      });
-      return;
-    }
-  }
-  if (!checkTypeConsistency(cstType, parse.typification, parse.args)) {
-    parse.parseResult = false;
-    parse.errors.push({
-      errorType: RSErrorType.globalUnexpectedType,
-      isCritical: true,
-      params: [],
-      position: 0
-    });
-  }
-}
--- a/rsconcept/frontend/src/models/miscellaneous.ts
+++ b/rsconcept/frontend/src/models/miscellaneous.ts
@ -12,7 +12,6 @@ import { IOperation } from './oss';
 */
 export enum DependencyMode {
  ALL = 0,
-  EXPRESSION,
  OUTPUTS,
  INPUTS,
  EXPAND_OUTPUTS,
--- a/rsconcept/frontend/src/models/rsform.ts
+++ b/rsconcept/frontend/src/models/rsform.ts
@ -144,6 +144,11 @@ export interface IConstituentaList {
  items: ConstituentaID[];
 }

+/**
+ * Represents {@link IConstituenta} data, used for checking expression.
+ */
+export interface ICheckConstituentaData extends Pick<IConstituentaMeta, 'alias' | 'cst_type' | 'definition_formal'> {}
+
 /**
 * Represents {@link IConstituenta} data, used in creation process.
 */
--- a/rsconcept/frontend/src/models/rsformAPI.ts
+++ b/rsconcept/frontend/src/models/rsformAPI.ts
@ -6,15 +6,7 @@ import { TextMatcher } from '@/utils/utils';

 import { BASIC_SCHEMAS, ILibraryItem } from './library';
 import { CstMatchMode } from './miscellaneous';
-import {
-  CATEGORY_CST_TYPE,
-  ConstituentaID,
-  CstClass,
-  CstType,
-  ExpressionStatus,
-  IConstituenta,
-  IRSForm
-} from './rsform';
+import { CATEGORY_CST_TYPE, CstClass, CstType, ExpressionStatus, IConstituenta, IRSForm } from './rsform';
 import { ParsingStatus, ValueClass } from './rslang';

 /**
@ -111,49 +103,6 @@ export function inferClass(type: CstType, isTemplate: boolean = false): CstClass
  }
 }

-/**
- * Creates a mock {@link IConstituenta} object with the provided parameters and default values for other properties.
- */
-export function createMockConstituenta(id: ConstituentaID, alias: string, comment: string): IConstituenta {
-  return {
-    id: id,
-    spawner: id,
-    spawn: [],
-    spawn_alias: [],
-    is_simple_expression: false,
-    schema: -1,
-    alias: alias,
-    convention: comment,
-    cst_type: CstType.BASE,
-    term_raw: '',
-    term_resolved: '',
-    term_forms: [],
-    definition_formal: '',
-    definition_raw: '',
-    definition_resolved: '',
-    status: ExpressionStatus.INCORRECT,
-    parent_schema_index: 0,
-    is_template: false,
-    is_inherited: false,
-    has_inherited_children: false,
-    cst_class: CstClass.DERIVED,
-    parse: {
-      status: ParsingStatus.INCORRECT,
-      valueClass: ValueClass.INVALID,
-      typification: 'N/A',
-      syntaxTree: '',
-      args: []
-    }
-  };
-}
-
-/**
- * Checks if given {@link IConstituenta} is mock.
- */
-export function isMockCst(cst: IConstituenta) {
-  return cst.id <= 0;
-}
-
 /**
 * Apply filter based on start {@link IConstituenta} type.
 */
--- a/rsconcept/frontend/src/models/rslang.ts
+++ b/rsconcept/frontend/src/models/rslang.ts
@ -7,13 +7,6 @@
 */
 export type AliasMapping = Record<string, string>;

-/**
- * Represents formal expression.
- */
-export interface IRSExpression {
-  expression: string;
-}
-
 /**
 * Represents syntax type.
 */
@ -91,6 +84,7 @@ export interface IArgumentValue extends IArgumentInfo {
 */
 export interface IExpressionParse {
  parseResult: boolean;
+  prefixLen: number;
  syntax: Syntax;
  typification: string;
  valueClass: ValueClass;
@ -248,16 +242,17 @@ export enum RSErrorType {
  typesNotCompatible = 34853,
  orderingNotSupported = 34854,

-  // !!!! Добавлены по сравнению с ConceptCore !!!!!
-  globalNonemptyBase = 34855,
-  globalUnexpectedType = 34856,
-  globalEmptyDerived = 34857,
-
-  // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  globalNoValue = 34880,
  invalidPropertyUsage = 34881,
  globalMissingAST = 34882,
-  globalFuncNoInterpretation = 34883
+  globalFuncNoInterpretation = 34883,
+
+  cstNonemptyBase = 34912,
+  cstEmptyDerived = 34913,
+  cstCallableNoArgs = 34914,
+  cstNonCallableHasArgs = 34915,
+  cstExpectedLogical = 34916,
+  cstExpectedTyped = 34917
 }

 /**
--- a/rsconcept/frontend/src/pages/ManualsPage/ManualsPage.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/ManualsPage.tsx
@ -26,7 +26,7 @@ function ManualsPage() {
  );

  return (
-    <div className='flex gap-2' style={{ minHeight: mainHeight }}>
+    <div className='flex mx-auto max-w-[80rem]' style={{ minHeight: mainHeight }}>
      <TopicsList activeTopic={activeTopic} onChangeTopic={topic => onSelectTopic(topic)} />
      <ViewTopic topic={activeTopic} />
    </div>
--- a/rsconcept/frontend/src/pages/ManualsPage/ViewTopic.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/ViewTopic.tsx
@ -1,4 +1,7 @@
+'use client';
+
 import AnimateFade from '@/components/wrap/AnimateFade';
+import { useConceptOptions } from '@/context/ConceptOptionsContext';
 import { HelpTopic } from '@/models/miscellaneous';
 import TopicPage from '@/pages/ManualsPage/TopicPage';

@ -7,8 +10,9 @@ interface ViewTopicProps {
 }

 function ViewTopic({ topic }: ViewTopicProps) {
+  const { mainHeight } = useConceptOptions();
  return (
-    <AnimateFade key={topic} className='px-3 py-2 mx-auto'>
+    <AnimateFade key={topic} className='py-2 px-6 sm:px-12 overflow-y-auto' style={{ maxHeight: mainHeight }}>
      <TopicPage topic={topic} />
    </AnimateFade>
  );
--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpRSLang.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpRSLang.tsx
@ -13,7 +13,7 @@ function HelpRSLang() {
  const videoHeight = useMemo(() => {
    const viewH = windowSize.height ?? 0;
    const viewW = windowSize.width ?? 0;
-    const availableWidth = viewW - (windowSize.isSmall ? 35 : 300);
+    const availableWidth = viewW - (windowSize.isSmall ? 35 : 310);
    return Math.min(1080, Math.max(viewH - 450, 300), Math.floor((availableWidth * 9) / 16));
  }, [windowSize]);

--- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpThesaurus.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpThesaurus.tsx
@ -34,7 +34,7 @@ function HelpThesaurus() {
    <div className='text-justify'>
      <h1>Тезаурус</h1>
      <p>
-        Данные раздел содержит основные термины и определения, используемые в работе с Порталом. Термины сгруппированы
+        Данный раздел содержит основные термины и определения, используемые в работе с Порталом. Термины сгруппированы
        по ключевым сущностям. Более подробно описание отношений между терминами даются в отдельных разделах данной
        Справки через гиперссылки. Также указываются графические обозначения (иконки, цвета), используемые для
        обозначения соответствующих сущностей в интерфейсе Портала.
@ -69,26 +69,26 @@ function HelpThesaurus() {
        По <b>отношению к операциям ОСС</b> выделены:
        <li>
          <IconRSForm size='1rem' className='inline-icon' />
-          {'\u2009'}свободная КС – это КС не прикрепленная ни к одной операции в ОСС;
+          {'\u2009'}свободная КС – КС не прикрепленная ни к одной операции в ОСС;
        </li>
        <li>
          <IconRSFormOwned size='1rem' className='inline-icon' />
-          {'\u2009'}собственная КС данной ОСС – это КС, прикрепленная к операции в ОСС, чьи владелец и расположение
+          {'\u2009'}собственная КС данной ОСС – КС, прикрепленная к операции в ОСС, чьи владелец и расположение
          совпадают с соответствующими атрибутами ОСС.
        </li>
        <li>
          <IconRSFormImported size='1rem' className='inline-icon' />
-          {'\u2009'}внешняя КС данной ОСС – это КС, прикрепленная к операции в ОСС, чьи владелец или расположение не
+          {'\u2009'}внешняя КС данной ОСС – КС, прикрепленная к операции в ОСС, чьи владелец или расположение не
          совпадают с соответствующими атрибутами ОСС;
        </li>
      </ul>

      <h2>Конституента</h2>
      <p>
-        Конституента – это выделенная часть КС, являющаяся отдельным понятием, схемой построения понятия, либо
-        утверждением, связывающим введенные понятия.{' '}
-        <LinkTopic text='Аттрибутами конституенты' topic={HelpTopic.CC_CONSTITUENTA} /> в родоструктурной экспликации
-        являются Термин, Конвенция, Типизация (Структура), Формальное определение, Текстовое определение, Комментарий.
+        Конституента – выделенная часть КС, являющаяся отдельным понятием, схемой построения понятия, либо утверждением,
+        связывающим введенные понятия. <LinkTopic text='Аттрибутами конституенты' topic={HelpTopic.CC_CONSTITUENTA} /> в
+        родоструктурной экспликации являются Термин, Конвенция, Типизация (Структура), Формальное определение, Текстовое
+        определение, Комментарий.
      </p>
      <ul>
        По <b>характеру формального определения в рамках КС</b> выделены классы:
@ -231,11 +231,11 @@ function HelpThesaurus() {
        Для описания <b>наследования</b> конституент в рамках ОСС введены:
        <li>
          <IconChild size='1rem' className='inline-icon' />
-          {'\u2009'}наследованная конституента – конституента, перенесенная из другой КС в рамках операции синтеза;
+          {'\u2009'}наследованная конституента – конституента, перенесенная из другой КС в ходе синтеза;
        </li>
        <li>
          <IconPredecessor size='1rem' className='inline-icon' />
-          {'\u2009'}собственная конституента – конституента, не являющаяся наследником других конституент;
+          {'\u2009'}собственная конституента – конституента, не являющаяся наследованной;
        </li>
        <li>
          <IconPredecessor size='1rem' className='inline-icon' />
@ -248,8 +248,8 @@ function HelpThesaurus() {
      <p>
        <IconOSS size='1rem' className='inline-icon' />
        {'\u2009'}
-        <LinkTopic text='Операционная схема синтеза' topic={HelpTopic.CC_OSS} /> (ОСС) – система концептуальных схем,
-        связанных операциями синтеза.
+        <LinkTopic text='Операционная схема синтеза' topic={HelpTopic.CC_OSS} /> (ОСС) – система операций над
+        концептуальными схемами.
      </p>
      <p>
        Граф синтеза – ориентированный граф, вершинами которого являются операции, а ребра указывают на использование
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
@ -180,9 +180,7 @@ function FormConstituenta({
                    : 'Формальное определение'
                }
                placeholder={
-                  state.cst_type !== CstType.STRUCTURED
-                    ? 'Родоструктурное выражение'
-                    : 'Определение множества, которому принадлежат элементы родовой структуры'
+                  state.cst_type !== CstType.STRUCTURED ? 'Родоструктурное выражение' : 'Типизация родовой структуры'
                }
                value={expression}
                activeCst={state}
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx
@ -11,7 +11,7 @@ import { RSTextWrapper } from '@/components/RSInput/textEditing';
 import Overlay from '@/components/ui/Overlay';
 import { useRSForm } from '@/context/RSFormContext';
 import DlgShowAST from '@/dialogs/DlgShowAST';
-import useCheckExpression from '@/hooks/useCheckExpression';
+import useCheckConstituenta from '@/hooks/useCheckConstituenta';
 import useLocalStorage from '@/hooks/useLocalStorage';
 import { HelpTopic } from '@/models/miscellaneous';
 import { ConstituentaID, IConstituenta } from '@/models/rsform';
@ -54,7 +54,7 @@ function EditorRSExpression({
  const model = useRSForm();

  const [isModified, setIsModified] = useState(false);
-  const parser = useCheckExpression({ schema: model.schema });
+  const parser = useCheckConstituenta({ schema: model.schema });
  const { resetParse } = parser;
  const rsInput = useRef<ReactCodeMirrorRef>(null);

@ -74,11 +74,9 @@ function EditorRSExpression({
  }

  function handleCheckExpression(callback?: (parse: IExpressionParse) => void) {
-    const prefix = getDefinitionPrefix(activeCst);
-    const expression = prefix + value;
-    parser.checkExpression(expression, activeCst, parse => {
+    parser.checkConstituenta(value, activeCst, parse => {
      if (parse.errors.length > 0) {
-        onShowError(parse.errors[0]);
+        onShowError(parse.errors[0], parse.prefixLen);
      } else {
        rsInput.current?.view?.focus();
      }
@ -95,12 +93,11 @@ function EditorRSExpression({
  }

  const onShowError = useCallback(
-    (error: IRSErrorDescription) => {
+    (error: IRSErrorDescription, prefixLen: number) => {
      if (!rsInput.current) {
        return;
      }
-      const prefix = getDefinitionPrefix(activeCst);
-      let errorPosition = error.position - prefix.length;
+      let errorPosition = error.position - prefixLen;
      if (errorPosition < 0) errorPosition = 0;
      rsInput.current?.view?.dispatch({
        selection: {
@ -133,6 +130,7 @@ function EditorRSExpression({
        toast.error(errors.astFailed);
      } else {
        setSyntaxTree(parse.ast);
+        // TODO: return prefix from parser API instead of prefixLength
        setExpression(getDefinitionPrefix(activeCst) + value);
        setShowAST(true);
      }
@ -199,7 +197,7 @@ function EditorRSExpression({
        isOpen={!!parser.parseData && parser.parseData.errors.length > 0}
        data={parser.parseData}
        disabled={disabled}
-        onShowError={onShowError}
+        onShowError={error => onShowError(error, parser.parseData?.prefixLen ?? 0)}
      />
    </div>
  );
--- a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/ConstituentsSearch.tsx
@ -11,8 +11,7 @@ import useLocalStorage from '@/hooks/useLocalStorage';
 import { CstMatchMode, DependencyMode } from '@/models/miscellaneous';
 import { applyGraphFilter } from '@/models/miscellaneousAPI';
 import { ConstituentaID, IConstituenta, IRSForm } from '@/models/rsform';
-import { createMockConstituenta, matchConstituenta } from '@/models/rsformAPI';
-import { extractGlobals } from '@/models/rslangAPI';
+import { matchConstituenta } from '@/models/rsformAPI';
 import { storage } from '@/utils/constants';

 interface ConstituentsSearchProps {
@ -35,15 +34,7 @@ function ConstituentsSearch({ schema, activeID, activeExpression, dense, setFilt
      return;
    }
    let result: IConstituenta[] = [];
-    if (filterSource === DependencyMode.EXPRESSION) {
-      const aliases = extractGlobals(activeExpression);
-      result = schema.items.filter(cst => aliases.has(cst.alias));
-      const names = result.map(cst => cst.alias);
-      const diff = Array.from(aliases).filter(name => !names.includes(name));
-      if (diff.length > 0) {
-        diff.forEach((alias, index) => result.push(createMockConstituenta(-index, alias, 'Конституента отсутствует')));
-      }
-    } else if (!activeID) {
+    if (!activeID) {
      result = schema.items;
    } else {
      result = applyGraphFilter(schema, activeID, filterSource);
--- a/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/TableSideConstituents.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/ViewConstituents/TableSideConstituents.tsx
@ -8,7 +8,6 @@ import NoData from '@/components/ui/NoData';
 import TextContent from '@/components/ui/TextContent';
 import { useConceptOptions } from '@/context/ConceptOptionsContext';
 import { ConstituentaID, IConstituenta } from '@/models/rsform';
-import { isMockCst } from '@/models/rsformAPI';
 import { PARAMETER, prefixes } from '@/utils/constants';
 import { describeConstituenta } from '@/utils/labels';

@ -53,9 +52,7 @@ function TableSideConstituents({

  const handleRowClicked = useCallback(
    (cst: IConstituenta) => {
-      if (!isMockCst(cst)) {
      onOpenEdit(cst.id);
-      }
    },
    [onOpenEdit]
  );
@ -90,8 +87,7 @@ function TableSideConstituents({
            maxLength={DESCRIPTION_MAX_SYMBOLS}
            style={{
              textWrap: 'pretty',
-              fontSize: 12,
-              color: isMockCst(props.row.original) ? colors.fgWarning : undefined
+              fontSize: 12
            }}
          />
        )
--- a/rsconcept/frontend/src/styling/color.ts
+++ b/rsconcept/frontend/src/styling/color.ts
@ -36,6 +36,7 @@ export interface IColorTheme {
  bgTeal: string;
  bgOrange: string;

+  bgGreen25: string;
  bgGreen50: string;
  bgOrange50: string;

@ -77,6 +78,7 @@ export const lightT: IColorTheme = {
  bgTeal:     'hsl(192, 089%, 081%)',
  bgOrange:   'hsl(028, 100%, 075%)',

+  bgGreen25:  'hsl(100, 100%, 096%)',
  bgGreen50:  'hsl(100, 100%, 090%)',
  bgOrange50: 'hsl(028, 100%, 090%)',

@ -118,6 +120,7 @@ export const darkT: IColorTheme = {
  bgTeal:     'hsl(192, 080%, 030%)',
  bgOrange:   'hsl(035, 100%, 035%)',

+  bgGreen25:  'hsl(100, 080%, 009%)',
  bgGreen50:  'hsl(100, 080%, 017%)',
  bgOrange50: 'hsl(035, 100%, 016%)',

@ -382,11 +385,11 @@ export function colorBgSyntaxTree(node: ISyntaxTreeNode, colors: IColorTheme): s
 export function colorBgCstStatus(status: ExpressionStatus, colors: IColorTheme): string {
  // prettier-ignore
  switch (status) {
-    case ExpressionStatus.VERIFIED: return colors.bgGreen;
+    case ExpressionStatus.VERIFIED: return colors.bgGreen50;
    case ExpressionStatus.INCORRECT: return colors.bgRed;
    case ExpressionStatus.INCALCULABLE: return colors.bgOrange;
    case ExpressionStatus.PROPERTY: return colors.bgTeal;
-    case ExpressionStatus.UNKNOWN: return colors.bgBlue;
+    case ExpressionStatus.UNKNOWN: return colors.bgSelected;
    case ExpressionStatus.UNDEFINED: return colors.bgBlue;
  }
 }
--- a/rsconcept/frontend/src/styling/constants.css
+++ b/rsconcept/frontend/src/styling/constants.css
@ -4,9 +4,9 @@

 /* prettier-ignore */
 :root {
-  --font-ui:  'Alegreya Sans SC', 'Rubik', 'Segoe UI Symbol', sans-serif;
-  --font-main: 'Rubik', 'Fira Code', 'Noto Sans Math', 'Noto Sans Symbols 2', 'Segoe UI Symbol', sans-serif;
-  --font-math: 'Fira Code', 'Noto Sans Math', 'Noto Sans Symbols 2', 'Rubik', 'Segoe UI Symbol', sans-serif;
+  --font-ui:  'Alegreya Sans SC', 'Rubik', 'Noto Color Emoji', 'Segoe UI Symbol', sans-serif;
+  --font-main: 'Rubik', 'Noto Color Emoji', 'Fira Code', 'Noto Sans Math', 'Noto Sans Symbols 2', 'Segoe UI Symbol', sans-serif;
+  --font-math: 'Fira Code', 'Noto Sans Math', 'Noto Sans Symbols 2', 'Rubik', 'Noto Color Emoji', 'Segoe UI Symbol', sans-serif;

  /* Light Theme */
  --cl-bg-120:      hsl(000, 000%, 100%);
--- a/rsconcept/frontend/src/styling/setup.css
+++ b/rsconcept/frontend/src/styling/setup.css
@ -104,7 +104,7 @@ h6 {
 /* Limit text lines and setup wrapping */
 p,
 li {
-  max-width: 90ch;
+  max-width: 75ch;
  text-wrap: pretty;
 }

--- a/rsconcept/frontend/src/utils/constants.ts
+++ b/rsconcept/frontend/src/utils/constants.ts
@ -34,7 +34,7 @@ export const PARAMETER = {
  statSmallThreshold: 3, // characters - threshold for small labels - small font

  logicLabel: 'LOGIC',
-  exteorVersion: '4.9.4',
+  exteorVersion: '4.9.5',

  TOOLTIP_WIDTH: 'max-w-[29rem]'
 };
--- a/rsconcept/frontend/src/utils/labels.ts
+++ b/rsconcept/frontend/src/utils/labels.ts
@ -244,7 +244,6 @@ export function labelCstSource(mode: DependencyMode): string {
  // prettier-ignore
  switch (mode) {
    case DependencyMode.ALL:            return 'не ограничен';
-    case DependencyMode.EXPRESSION:     return 'выражение';
    case DependencyMode.OUTPUTS:        return 'потребители';
    case DependencyMode.INPUTS:         return 'поставщики';
    case DependencyMode.EXPAND_OUTPUTS: return 'зависимые';
@ -259,7 +258,6 @@ export function describeCstSource(mode: DependencyMode): string {
  // prettier-ignore
  switch (mode) {
    case DependencyMode.ALL:            return 'все конституенты';
-    case DependencyMode.EXPRESSION:     return 'имена из выражения';
    case DependencyMode.OUTPUTS:        return 'прямые исходящие';
    case DependencyMode.INPUTS:         return 'прямые входящие';
    case DependencyMode.EXPAND_OUTPUTS: return 'цепочка исходящих';
@ -787,13 +785,20 @@ export function describeRSError(error: IRSErrorDescription): string {
    case RSErrorType.globalMissingAST:
      return `Не удалось получить дерево разбора для глобального идентификатора: ${error.params[0]}`;
    case RSErrorType.globalFuncNoInterpretation:
-      return `Функция не интерпретируется для данных аргументов`;
-    case RSErrorType.globalNonemptyBase:
-      return `Непустое выражение базисного/константного множества`;
-    case RSErrorType.globalUnexpectedType:
-      return `Типизация выражения не соответствует типу конституенты`;
-    case RSErrorType.globalEmptyDerived:
-      return `Пустое выражение для выводимого понятия или утверждения`;
+      return 'Функция не интерпретируется для данных аргументов';
+      
+    case RSErrorType.cstNonemptyBase:
+      return 'Непустое выражение базисного/константного множества';
+    case RSErrorType.cstEmptyDerived:
+      return 'Пустое выражение для сложного понятия или утверждения';
+    case RSErrorType.cstCallableNoArgs:
+      return 'Отсутствуют аргументы для параметризованной конституенты';
+    case RSErrorType.cstNonCallableHasArgs:
+      return 'Параметризованное выражение не подходит для данного типа конституенты';
+    case RSErrorType.cstExpectedLogical:
+      return 'Данный тип конституенты требует логического выражения';
+    case RSErrorType.cstExpectedTyped:
+      return 'Данный тип конституенты требует теоретико-множественного выражения';
  }
  return 'UNKNOWN ERROR';
 }
Author	SHA1	Message	Date
Ivan	760c4cd659	F: Enable Emoji support Some checks failed Backend CI / build (3.12) (push) Has been cancelled Details Frontend CI / build (22.x) (push) Has been cancelled Details	2024-09-23 20:33:07 +03:00
Ivan	861cb382ee	M: Fix placeholder text	2024-09-23 14:58:28 +03:00
Ivan	ca4ed9b928	npm update	2024-09-23 11:59:24 +03:00
Ivan	e1969b017b	M: Remove MockCst from sideView	2024-09-23 11:53:46 +03:00
Ivan	ff38802cc1	M: Improve coloring of constituents and statuses	2024-09-23 11:48:02 +03:00
Ivan	bfd429e004	M: Improve manuals UI layout	2024-09-23 10:33:47 +03:00
Ivan	df4323d214	F: Update pyconcept and implement improved typechecking	2024-09-22 20:25:10 +03:00