Типы значений в пропущенных на первом этапе местах. Добавление двухязычного хранения значений перечислений (#524)

1. использование новой версии common library
2. доработано хранение типов значений, часть классов уехала в common lib
3. все перечисления переведены на хранение двух языков имени
4. для catalog добавлено хранение владельцев

Author: theshadowco

build.gradle.kts

@@ -58,7 +58,7 @@ dependencies {
 
     // прочее
     implementation("commons-io", "commons-io", "2.18.0")
-    implementation("io.github.1c-syntax", "bsl-common-library", "0.9.0.9-SNAPSHOT")
+    implementation("io.github.1c-syntax", "bsl-common-library", "0.9.0.16-SNAPSHOT")
     implementation("io.github.1c-syntax", "utils", "0.6.3")
     implementation("io.github.1c-syntax", "supportconf", "0.14.3") {
         exclude("io.github.1c-syntax", "bsl-common-library")

docs/ru/examples.md

@@ -9,7 +9,7 @@
 - [Работа с метаданными](#работа-с-метаданными)
 - [Работа с формами](#работа-с-формами)
 - [Работа с модулями](#работа-с-модулями)
-- [Анализ описания типов данных](#анализ-типов-данных)
+- [Анализ типов данных](#анализ-типов-данных)
 - [Поиск и фильтрация объектов](#поиск-и-фильтрация-объектов)
 - [Практические сценарии](#практические-сценарии)
 
@@ -317,11 +317,11 @@ if (childMDO.isPresent() && childMDO.get() instanceof Catalog catalog) {
         // проверим наименование 
         assertThat(objectAttribute.getName()).isEqualTo("Реквизит2");
 
-        // описание типа `getValueType`
+        // описание типа доступно через getValueType()
         assertThat(objectAttribute.getValueType()).isNotNull();
-        // убеимся в наличии примитивного типа СТРОКА в составе описания
+        // убедимся в наличии примитивного типа СТРОКА в составе описания
         assertThat(objectAttribute.getValueType().contains(PrimitiveValueType.NUMBER)).isTrue();
-        // убедимся, что тип не составно
+        // убедимся, что тип не составной
         assertThat(objectAttribute.getValueType().isComposite()).isFalse();
         // убедимся, что квалификаторы прочитаны
         assertThat(objectAttribute.getValueType().getQualifiers()).hasSize(1);
@@ -330,7 +330,7 @@ if (childMDO.isPresent() && childMDO.get() instanceof Catalog catalog) {
         var qualifier = objectAttribute.getValueType().getQualifiers().get(0);
         assertThat(qualifier).isInstanceOf(NumberQualifiers.class);
 
-        // убаимся, что квалификатор числа содожержит верную информацию
+        // убедимся, что квалификатор числа содежржит верную информацию
         var numberQualifiers = (NumberQualifiers) qualifier;
         assertThat(numberQualifiers.getPrecision()).isEqualTo(10); // длина 10
         assertThat(numberQualifiers.getScale()).isEqualTo(0);      // точность 0
@@ -380,11 +380,11 @@ if (childMDO.isPresent() && childMDO.get() instanceof DefinedType definedType) {
     // квалификаторов нет
     assertThat(definedType.getValueType().getQualifiers()).isEmpty();
 
-    // создадим типа по имени
+    // создадим тип по имени
     var typeContains = MetadataValueType.fromString("EnumRef.ДополнительныеЗначенияДоступа");
 
     assertThat(typeContains).isNotNull();
-    // полученый тип относится к перечислению
+    // полученный тип относится к перечислению
     assertThat(typeContains.getKind()).isEqualTo(MDOType.ENUM);
     // тип не составной
     assertThat(typeContains.isComposite()).isFalse();
@@ -398,7 +398,7 @@ if (childMDO.isPresent() && childMDO.get() instanceof DefinedType definedType) {
     assertThat(typeNotContains).isNotNull();
     // убедимся, что первый тип входит в состав описания
     assertThat(definedType.getValueType().contains(typeContains)).isTrue();
-    // убедимся, что второй тип нпе входит в состав
+    // убедимся, что второй тип не входит в состав
     assertThat(definedType.getValueType().contains(typeNotContains)).isFalse();
 }
 ```

src/main/java/com/github/_1c_syntax/bsl/mdclasses/CF.java

@@ -28,11 +28,11 @@
 import com.github._1c_syntax.bsl.mdo.Subsystem;
 import com.github._1c_syntax.bsl.mdo.support.ApplicationRunMode;
 import com.github._1c_syntax.bsl.mdo.support.InterfaceCompatibilityMode;
-import com.github._1c_syntax.bsl.mdo.support.ScriptVariant;
 import com.github._1c_syntax.bsl.mdo.support.UsePurposes;
 import com.github._1c_syntax.bsl.support.CompatibilityMode;
 import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.bsl.types.ModuleType;
+import com.github._1c_syntax.bsl.types.ScriptVariant;
 
 import java.net.URI;
 import java.util.Collections;
@@ -162,7 +162,9 @@ default List<Subsystem> includedSubsystems(MdoReference mdoReference, boolean ad
   }
 
   /**
-   * Возвращает локализованное представление ссылки на объект метаданных с учетом используемого варианта языка разработки
+   * Возвращает локализованное представление ссылки на объект метаданных с учетом используемого варианта языка
+   * разработки
+   *
    * @param md Объект метаданных, принадлежащий MDClasses
    * @return Строковое представление ссылки
    */

src/main/java/com/github/_1c_syntax/bsl/mdclasses/Configuration.java

@@ -74,10 +74,8 @@
 import com.github._1c_syntax.bsl.mdo.support.ApplicationRunMode;
 import com.github._1c_syntax.bsl.mdo.support.DataLockControlMode;
 import com.github._1c_syntax.bsl.mdo.support.InterfaceCompatibilityMode;
-import com.github._1c_syntax.bsl.mdo.support.MultiLanguageString;
 import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
 import com.github._1c_syntax.bsl.mdo.support.RoleRight;
-import com.github._1c_syntax.bsl.mdo.support.ScriptVariant;
 import com.github._1c_syntax.bsl.mdo.support.UseMode;
 import com.github._1c_syntax.bsl.mdo.support.UsePurposes;
 import com.github._1c_syntax.bsl.mdo.utils.LazyLoader;
@@ -86,6 +84,8 @@
 import com.github._1c_syntax.bsl.types.ConfigurationSource;
 import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.bsl.types.ModuleType;
+import com.github._1c_syntax.bsl.types.MultiLanguageString;
+import com.github._1c_syntax.bsl.types.ScriptVariant;
 import com.github._1c_syntax.utils.Lazy;
 import lombok.Builder;
 import lombok.Builder.Default;

src/main/java/com/github/_1c_syntax/bsl/mdclasses/ConfigurationExtension.java

@@ -74,17 +74,17 @@
 import com.github._1c_syntax.bsl.mdo.support.ApplicationRunMode;
 import com.github._1c_syntax.bsl.mdo.support.ConfigurationExtensionPurpose;
 import com.github._1c_syntax.bsl.mdo.support.InterfaceCompatibilityMode;
-import com.github._1c_syntax.bsl.mdo.support.MultiLanguageString;
 import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
 import com.github._1c_syntax.bsl.mdo.support.RoleRight;
-import com.github._1c_syntax.bsl.mdo.support.ScriptVariant;
 import com.github._1c_syntax.bsl.mdo.support.UsePurposes;
 import com.github._1c_syntax.bsl.mdo.utils.LazyLoader;
 import com.github._1c_syntax.bsl.support.CompatibilityMode;
 import com.github._1c_syntax.bsl.support.SupportVariant;
 import com.github._1c_syntax.bsl.types.ConfigurationSource;
 import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.bsl.types.ModuleType;
+import com.github._1c_syntax.bsl.types.MultiLanguageString;
+import com.github._1c_syntax.bsl.types.ScriptVariant;
 import com.github._1c_syntax.utils.Lazy;
 import lombok.Builder;
 import lombok.Builder.Default;

src/main/java/com/github/_1c_syntax/bsl/mdclasses/ExternalDataProcessor.java

@@ -28,10 +28,10 @@
 import com.github._1c_syntax.bsl.mdo.children.ObjectCommand;
 import com.github._1c_syntax.bsl.mdo.children.ObjectForm;
 import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate;
-import com.github._1c_syntax.bsl.mdo.support.MultiLanguageString;
 import com.github._1c_syntax.bsl.mdo.utils.LazyLoader;
 import com.github._1c_syntax.bsl.types.ConfigurationSource;
 import com.github._1c_syntax.bsl.types.MdoReference;
+import com.github._1c_syntax.bsl.types.MultiLanguageString;
 import com.github._1c_syntax.utils.Lazy;
 import lombok.Builder;
 import lombok.Builder.Default;

src/main/java/com/github/_1c_syntax/bsl/mdclasses/ExternalReport.java

@@ -28,10 +28,10 @@
 import com.github._1c_syntax.bsl.mdo.children.ObjectCommand;
 import com.github._1c_syntax.bsl.mdo.children.ObjectForm;
 import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate;
-import com.github._1c_syntax.bsl.mdo.support.MultiLanguageString;
 import com.github._1c_syntax.bsl.mdo.utils.LazyLoader;
 import com.github._1c_syntax.bsl.types.ConfigurationSource;
 import com.github._1c_syntax.bsl.types.MdoReference;
+import com.github._1c_syntax.bsl.types.MultiLanguageString;
 import com.github._1c_syntax.utils.Lazy;
 import lombok.Builder;
 import lombok.Builder.Default;

src/main/java/com/github/_1c_syntax/bsl/mdclasses/MDClasses.java

@@ -1,25 +1,25 @@
-/*
- * This file is a part of MDClasses.
- *
- * Copyright (c) 2019 - 2025
- * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
- *
- * SPDX-License-Identifier: LGPL-3.0-or-later
- *
- * MDClasses is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3.0 of the License, or (at your option) any later version.
- *
- * MDClasses is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with MDClasses.
- */
-package com.github._1c_syntax.bsl.mdclasses;
+/*
+ * This file is a part of MDClasses.
+ *
+ * Copyright (c) 2019 - 2025
+ * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * MDClasses is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * MDClasses is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with MDClasses.
+ */
+package com.github._1c_syntax.bsl.mdclasses;
 
 import com.github._1c_syntax.bsl.reader.MDOReader;
 import com.github._1c_syntax.bsl.types.MDOType;
@@ -196,7 +196,7 @@ private Set<String> mdoTypeGroupNames() {
         && type != MDOType.EXTERNAL_DATA_PROCESSOR
         && type != MDOType.UNKNOWN
       )
-      .map(MDOType::getGroupName)
+      .map(MDOType::groupName)
       .collect(Collectors.toSet());
   }
 }

src/main/java/com/github/_1c_syntax/bsl/mdo/AccountingRegister.java

@@ -1,37 +1,37 @@
-/*
- * This file is a part of MDClasses.
- *
- * Copyright (c) 2019 - 2025
- * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
- *
- * SPDX-License-Identifier: LGPL-3.0-or-later
- *
- * MDClasses is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3.0 of the License, or (at your option) any later version.
- *
- * MDClasses is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with MDClasses.
- */
-package com.github._1c_syntax.bsl.mdo;
+/*
+ * This file is a part of MDClasses.
+ *
+ * Copyright (c) 2019 - 2025
+ * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * MDClasses is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * MDClasses is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with MDClasses.
+ */
+package com.github._1c_syntax.bsl.mdo;
 
 import com.github._1c_syntax.bsl.mdo.children.Dimension;
 import com.github._1c_syntax.bsl.mdo.children.ObjectCommand;
 import com.github._1c_syntax.bsl.mdo.children.ObjectForm;
 import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate;
 import com.github._1c_syntax.bsl.mdo.children.Resource;
-import com.github._1c_syntax.bsl.mdo.support.MultiLanguageString;
 import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
 import com.github._1c_syntax.bsl.mdo.support.RoleRight;
 import com.github._1c_syntax.bsl.mdo.utils.LazyLoader;
 import com.github._1c_syntax.bsl.support.SupportVariant;
 import com.github._1c_syntax.bsl.types.MdoReference;
+import com.github._1c_syntax.bsl.types.MultiLanguageString;
 import com.github._1c_syntax.utils.Lazy;
 import lombok.Builder;
 import lombok.Builder.Default;

src/main/java/com/github/_1c_syntax/bsl/mdo/AccumulationRegister.java

@@ -26,12 +26,12 @@
 import com.github._1c_syntax.bsl.mdo.children.ObjectForm;
 import com.github._1c_syntax.bsl.mdo.children.ObjectTemplate;
 import com.github._1c_syntax.bsl.mdo.children.Resource;
-import com.github._1c_syntax.bsl.mdo.support.MultiLanguageString;
 import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging;
 import com.github._1c_syntax.bsl.mdo.support.RoleRight;
 import com.github._1c_syntax.bsl.mdo.utils.LazyLoader;
 import com.github._1c_syntax.bsl.support.SupportVariant;
 import com.github._1c_syntax.bsl.types.MdoReference;
+import com.github._1c_syntax.bsl.types.MultiLanguageString;
 import com.github._1c_syntax.utils.Lazy;
 import lombok.Builder;
 import lombok.Builder.Default;