creator/cc-1c-skills
1
0
Fork 0
mirror of https://github.com/Nikolay-Shirokov/cc-1c-skills.git synced 2026-06-10 16:14:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat(skd-compile): filter right поддерживает массив и пустой ValueListType

Browse Source 
DSL: value на filter item может быть массив:
- value: []           — пустой ValueListType placeholder (для InList с
                        пользовательскими настройками — пользователь
                        заполнит значения через UI)
- value: [3, 4, 5]    — InList с несколькими конкретными значениями
                        (compile эмитит несколько <right> подряд)
- value: 3            — single value (как раньше)

Compile автоопределяет тип каждого значения (bool/decimal/dateTime/string).

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
Nick Shirokov
2026-05-22 18:19:20 +03:00
parent a7d5c46176
commit 540af9655d
2 changed files with 55 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.claude/skills/skd-compile/scripts/skd-compile.ps1
+25 -3
View File
@@ -1,4 +1,4 @@
# skd-compile v1.46 — Compile 1C DCS from JSON
# skd-compile v1.47 — Compile 1C DCS from JSON
# Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
param(
[string]$DefinitionFile,
@@ -1994,8 +1994,30 @@ function Emit-FilterItem {
if (-not $compType) { $compType = "$($item.op)" }
X "$indent`t<dcsset:comparisonType>$(Esc-Xml $compType)</dcsset:comparisonType>"
# Right value
if ($null -ne $item.value) {
# Right value: один, несколько (InList) или ValueListType (пустой list-placeholder)
$valIsArray = ($item.value -is [array]) -or ($item.value -is [System.Collections.IList] -and $item.value -isnot [string])
if ($valIsArray) {
# Пустой массив → пустой ValueListType placeholder
if (@($item.value).Count -eq 0) {
X "$indent`t<dcsset:right xsi:type=`"v8:ValueListType`">"
X "$indent`t`t<v8:valueType/>"
X "$indent`t`t<v8:lastId xsi:type=`"xs:decimal`">-1</v8:lastId>"
X "$indent`t</dcsset:right>"
} else {
# Несколько <right> подряд (multi-value InList)
foreach ($v in $item.value) {
$vt = if ($item.valueType) { "$($item.valueType)" } else { "" }
if (-not $vt) {
if ($v -is [bool]) { $vt = 'xs:boolean' }
elseif ($v -is [int] -or $v -is [long] -or $v -is [double]) { $vt = 'xs:decimal' }
elseif ("$v" -match '^\d{4}-\d{2}-\d{2}T') { $vt = 'xs:dateTime' }
else { $vt = 'xs:string' }
}
$vStr = if ($v -is [bool]) { "$v".ToLower() } else { Esc-Xml "$v" }
X "$indent`t<dcsset:right xsi:type=`"$vt`">$vStr</dcsset:right>"
}
}
} elseif ($null -ne $item.value) {
$vt = if ($item.valueType) { "$($item.valueType)" } else { "" }
if (-not $vt) {
$v = $item.value
.claude/skills/skd-compile/scripts/skd-compile.py
+30 -7
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
# skd-compile v1.46 — Compile 1C DCS from JSON
# skd-compile v1.47 — Compile 1C DCS from JSON
# Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
import argparse
import json
@@ -1658,11 +1658,34 @@ def emit_filter_item(lines, item, indent):
comp_type = COMPARISON_TYPES.get(str(item.get('op', '')), str(item.get('op', '')))
lines.append(f'{indent}\t<dcsset:comparisonType>{esc_xml(comp_type)}</dcsset:comparisonType>')
# Right value
if item.get('value') is not None:
# Right value: один, несколько (InList) или ValueListType (пустой list-placeholder)
val = item.get('value')
val_is_array = isinstance(val, list)
if val_is_array:
if len(val) == 0:
# Пустой массив → пустой ValueListType placeholder
lines.append(f'{indent}\t<dcsset:right xsi:type="v8:ValueListType">')
lines.append(f'{indent}\t\t<v8:valueType/>')
lines.append(f'{indent}\t\t<v8:lastId xsi:type="xs:decimal">-1</v8:lastId>')
lines.append(f'{indent}\t</dcsset:right>')
else:
for v in val:
vt = str(item.get('valueType', '')) if item.get('valueType') else ''
if not vt:
if isinstance(v, bool):
vt = 'xs:boolean'
elif isinstance(v, (int, float)):
vt = 'xs:decimal'
elif re.match(r'^\d{4}-\d{2}-\d{2}T', str(v)):
vt = 'xs:dateTime'
else:
vt = 'xs:string'
v_str = str(v).lower() if isinstance(v, bool) else esc_xml(str(v))
lines.append(f'{indent}\t<dcsset:right xsi:type="{vt}">{v_str}</dcsset:right>')
elif val is not None:
vt = str(item.get('valueType', '')) if item.get('valueType') else ''
if not vt:
v = item['value']
v = val
if isinstance(v, bool):
vt = 'xs:boolean'
elif isinstance(v, (int, float)):
@@ -1671,10 +1694,10 @@ def emit_filter_item(lines, item, indent):
vt = 'xs:dateTime'
else:
vt = 'xs:string'
if isinstance(item['value'], bool):
v_str = str(item['value']).lower()
if isinstance(val, bool):
v_str = str(val).lower()
else:
v_str = esc_xml(str(item['value']))
v_str = esc_xml(str(val))
lines.append(f'{indent}\t<dcsset:right xsi:type="{vt}">{v_str}</dcsset:right>')
if item.get('presentation'):