From eac0ae5a02b191549e9666e89e602ef63d7e3ecb Mon Sep 17 00:00:00 2001
From: Nick Shirokov <nick_4312@mail.ru>
Date: Fri, 22 May 2026 16:00:59 +0300
Subject: [PATCH] =?UTF-8?q?fix(skd-compile):=20DataSetUnion=20inner=20item?=
 =?UTF-8?q?s=20=D0=BE=D0=B1=D0=BE=D1=80=D0=B0=D1=87=D0=B8=D0=B2=D0=B0?=
 =?UTF-8?q?=D1=8E=D1=82=D1=81=D1=8F=20=D0=BA=D0=B0=D0=BA=20<item>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Платформенный 1С пишет вложенные dataSets внутри DataSetUnion как
<item xsi:type="DataSetQuery">, а наш compile эмитил <dataSet xsi:type=...>.
Это вело к двум проблемам:
- сгенерированный XML отличался от платформенного (косметика для bit-perfect)
- skd-decompile симметрично искал <dataSet> и пропускал inner items
  при чтении реальных схем — теряя все вложенные fields/titles

Эталон: upload/erf/ПроверкаЭкранирования/.../Templates/СКД_Объединение
показывает что Designer всегда пишет <item xsi:type="..."> внутри Union.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .claude/skills/skd-compile/scripts/skd-compile.ps1   | 12 ++++++------
 .claude/skills/skd-compile/scripts/skd-compile.py    | 11 ++++++-----
 .../snapshots/dataset-types/Template.xml             |  8 ++++----
 .../structure-nested-and-folder/Template.xml         |  8 ++++----
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/.claude/skills/skd-compile/scripts/skd-compile.ps1 b/.claude/skills/skd-compile/scripts/skd-compile.ps1
index ff40fd6a..c1b4df93 100644
--- a/.claude/skills/skd-compile/scripts/skd-compile.ps1
+++ b/.claude/skills/skd-compile/scripts/skd-compile.ps1
@@ -1,4 +1,4 @@
-# skd-compile v1.38 — Compile 1C DCS from JSON
+# skd-compile v1.39 — Compile 1C DCS from JSON
 # Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
 param(
 	[string]$DefinitionFile,
@@ -989,7 +989,7 @@ function Emit-Field {
 
 # === DataSets ===
 function Emit-DataSet {
-	param($ds, [string]$indent)
+	param($ds, [string]$indent, [string]$tagName = "dataSet")
 
 	# Determine type
 	if ($ds.items) {
@@ -1000,7 +1000,7 @@ function Emit-DataSet {
 		$dsType = "DataSetQuery"
 	}
 
-	X "$indent<dataSet xsi:type=`"$dsType`">"
+	X "$indent<$tagName xsi:type=`"$dsType`">"
 	X "$indent`t<name>$(Esc-Xml "$($ds.name)")</name>"
 
 	# Fields
@@ -1027,12 +1027,12 @@ function Emit-DataSet {
 		X "$indent`t<objectName>$(Esc-Xml "$($ds.objectName)")</objectName>"
 	} elseif ($dsType -eq "DataSetUnion") {
 		foreach ($item in $ds.items) {
-			# Union items are nested dataSets
-			Emit-DataSet -ds $item -indent "$indent`t" | Out-Null
+			# Union inner items are wrapped as <item xsi:type="...">
+			Emit-DataSet -ds $item -indent "$indent`t" -tagName "item" | Out-Null
 		}
 	}
 
-	X "$indent</dataSet>"
+	X "$indent</$tagName>"
 }
 
 function Emit-DataSets {
diff --git a/.claude/skills/skd-compile/scripts/skd-compile.py b/.claude/skills/skd-compile/scripts/skd-compile.py
index 0b99b07e..aa5ee862 100644
--- a/.claude/skills/skd-compile/scripts/skd-compile.py
+++ b/.claude/skills/skd-compile/scripts/skd-compile.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# skd-compile v1.38 — Compile 1C DCS from JSON
+# skd-compile v1.39 — Compile 1C DCS from JSON
 # Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
 import argparse
 import json
@@ -759,7 +759,7 @@ def emit_field(lines, field_def, indent):
 
 # === DataSets ===
 
-def emit_data_set(lines, ds, indent, default_source):
+def emit_data_set(lines, ds, indent, default_source, tag_name='dataSet'):
     # Determine type
     if ds.get('items'):
         ds_type = 'DataSetUnion'
@@ -768,7 +768,7 @@ def emit_data_set(lines, ds, indent, default_source):
     else:
         ds_type = 'DataSetQuery'
 
-    lines.append(f'{indent}<dataSet xsi:type="{ds_type}">')
+    lines.append(f'{indent}<{tag_name} xsi:type="{ds_type}">')
     lines.append(f'{indent}\t<name>{esc_xml(str(ds.get("name", "")))}</name>')
 
     # Fields
@@ -791,9 +791,10 @@ def emit_data_set(lines, ds, indent, default_source):
         lines.append(f'{indent}\t<objectName>{esc_xml(str(ds["objectName"]))}</objectName>')
     elif ds_type == 'DataSetUnion':
         for item in ds['items']:
-            emit_data_set(lines, item, f'{indent}\t', default_source)
+            # Union inner items are wrapped as <item xsi:type="...">
+            emit_data_set(lines, item, f'{indent}\t', default_source, tag_name='item')
 
-    lines.append(f'{indent}</dataSet>')
+    lines.append(f'{indent}</{tag_name}>')
 
 
 def emit_data_sets(lines, defn, default_source):
diff --git a/tests/skills/cases/skd-decompile/snapshots/dataset-types/Template.xml b/tests/skills/cases/skd-decompile/snapshots/dataset-types/Template.xml
index cf140321..bc0e20cc 100644
--- a/tests/skills/cases/skd-decompile/snapshots/dataset-types/Template.xml
+++ b/tests/skills/cases/skd-decompile/snapshots/dataset-types/Template.xml
@@ -56,7 +56,7 @@
 	</dataSet>
 	<dataSet xsi:type="DataSetUnion">
 		<name>Объединение</name>
-		<dataSet xsi:type="DataSetQuery">
+		<item xsi:type="DataSetQuery">
 			<name>Часть1</name>
 			<field xsi:type="DataSetFieldField">
 				<dataPath>Поле</dataPath>
@@ -72,8 +72,8 @@
 			</field>
 			<dataSource>ИсточникДанных1</dataSource>
 			<query>ВЫБРАТЬ 1 КАК Поле</query>
-		</dataSet>
-		<dataSet xsi:type="DataSetQuery">
+		</item>
+		<item xsi:type="DataSetQuery">
 			<name>Часть2</name>
 			<field xsi:type="DataSetFieldField">
 				<dataPath>Поле</dataPath>
@@ -89,7 +89,7 @@
 			</field>
 			<dataSource>ИсточникДанных1</dataSource>
 			<query>ВЫБРАТЬ 2 КАК Поле</query>
-		</dataSet>
+		</item>
 	</dataSet>
 	<settingsVariant>
 		<dcsset:name>Основной</dcsset:name>
diff --git a/tests/skills/cases/skd-decompile/snapshots/structure-nested-and-folder/Template.xml b/tests/skills/cases/skd-decompile/snapshots/structure-nested-and-folder/Template.xml
index 07046a4a..c8d62202 100644
--- a/tests/skills/cases/skd-decompile/snapshots/structure-nested-and-folder/Template.xml
+++ b/tests/skills/cases/skd-decompile/snapshots/structure-nested-and-folder/Template.xml
@@ -49,16 +49,16 @@
 				<v8:Type xmlns:d5p1="http://v8.1c.ru/8.1/data/enterprise/current-config">d5p1:CatalogRef.Подразделения</v8:Type>
 			</valueType>
 		</field>
-		<dataSet xsi:type="DataSetObject">
+		<item xsi:type="DataSetObject">
 			<name>Часть1</name>
 			<dataSource>ИсточникДанных1</dataSource>
 			<objectName>ДанныеЧасть1</objectName>
-		</dataSet>
-		<dataSet xsi:type="DataSetObject">
+		</item>
+		<item xsi:type="DataSetObject">
 			<name>Часть2</name>
 			<dataSource>ИсточникДанных1</dataSource>
 			<objectName>ДанныеЧасть2</objectName>
-		</dataSet>
+		</item>
 	</dataSet>
 	<settingsVariant>
 		<dcsset:name>Основной</dcsset:name>