creator/cc-1c-skills
1
0
Fork 0
mirror of https://github.com/Nikolay-Shirokov/cc-1c-skills.git synced 2026-08-27 21:49:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(skd-compile): identity totalField shorthand treated as aggregation function

Browse Source 
When totalField shorthand right-hand side is not a known aggregate function
(e.g. "Проверка: Проверка"), emit expression as-is instead of wrapping it
as Проверка(Проверка). Known aggregates (Сумма, Количество, etc.) still wrap.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Nick Shirokov
2026-04-07 17:33:36 +03:00
co-authored by Claude Opus 4.6
parent e2924c4ae0
commit 73242ee60e
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.claude/skills/skd-compile/scripts/skd-compile.ps1
+10 -2
View File
@@ -1,4 +1,4 @@
# skd-compile v1.8 — Compile 1C DCS from JSON # skd-compile v1.9 — Compile 1C DCS from JSON
# Source: https://github.com/Nikolay-Shirokov/cc-1c-skills # Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
param( param(
[string]$DefinitionFile, [string]$DefinitionFile,
@@ -300,12 +300,20 @@ function Parse-TotalShorthand {
$dataPath = $parts[0].Trim() $dataPath = $parts[0].Trim()
$funcPart = $parts[1].Trim() $funcPart = $parts[1].Trim()
# Known DCS aggregate functions (ru + en)
$aggFuncs = @('Сумма','Количество','Минимум','Максимум','Среднее',
'Sum','Count','Min','Max','Avg',
'Minimum','Maximum','Average')
if ($funcPart -match '^\w+\(') { if ($funcPart -match '^\w+\(') {
# Already has expression form: Func(expr) # Already has expression form: Func(expr)
return @{ dataPath = $dataPath; expression = $funcPart } return @{ dataPath = $dataPath; expression = $funcPart }
} else { } elseif ($funcPart -in $aggFuncs) {
# Short: Func → Func(DataPath) # Short: Func → Func(DataPath)
return @{ dataPath = $dataPath; expression = "$funcPart($dataPath)" } return @{ dataPath = $dataPath; expression = "$funcPart($dataPath)" }
} else {
# Identity or custom expression — use as-is
return @{ dataPath = $dataPath; expression = $funcPart }
} }
} }
.claude/skills/skd-compile/scripts/skd-compile.py
+10 -2
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# skd-compile v1.8 — Compile 1C DCS from JSON # skd-compile v1.9 — Compile 1C DCS from JSON
# Source: https://github.com/Nikolay-Shirokov/cc-1c-skills # Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
import argparse import argparse
import json import json
@@ -221,10 +221,18 @@ def parse_total_shorthand(s):
data_path = parts[0].strip() data_path = parts[0].strip()
func_part = parts[1].strip() func_part = parts[1].strip()
# Known DCS aggregate functions (ru + en)
_agg_funcs = {'Сумма','Количество','Минимум','Максимум','Среднее',
'Sum','Count','Min','Max','Avg',
'Minimum','Maximum','Average'}
if re.match(r'^\w+\(', func_part): if re.match(r'^\w+\(', func_part):
return {'dataPath': data_path, 'expression': func_part} return {'dataPath': data_path, 'expression': func_part}
else: elif func_part in _agg_funcs:
return {'dataPath': data_path, 'expression': f'{func_part}({data_path})'} return {'dataPath': data_path, 'expression': f'{func_part}({data_path})'}
else:
# Identity or custom expression — use as-is
return {'dataPath': data_path, 'expression': func_part}
# --- Parameter shorthand parser --- # --- Parameter shorthand parser ---