mirror of
https://github.com/Nikolay-Shirokov/cc-1c-skills.git
synced 2026-09-15 22:35:23 +03:00
fix(cfe-borrow): ChildObjects и InternalInfo у контейнерных типов (#56)
Заимствованные DataProcessor, Report, DocumentJournal, HTTPService, WebService, Subsystem и др. выводились без <ChildObjects/> — платформа отвергала расширение при загрузке исходников («ожидаемое ChildObjects»). Признак теперь берётся у объекта-источника, список типов остаётся страховкой и дополнен недостающими. Следом всплывал второй отказ — «Отсутствует внутренняя информация (узел InternalInfo)» для Sequence, FilterCriterion, SettingsStorage: этих типов не было в карте генерируемых типов. Добавлены они, а также IntegrationService и WSReference. Проверено реальной загрузкой на 8.3.24 и 8.3.27: синтетический стенд (9 типов) и заимствование из acc/ut в BP_DEMO и UT_DEMO. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Nick Shirokov
co-authored by
Claude Opus 5
Claude Opus 5
parent
f552def817
commit
8925bd5875
@@ -1,4 +1,4 @@
|
||||
# cfe-borrow v1.10 — Borrow objects from configuration into extension (CFE)
|
||||
# cfe-borrow v1.11 — Borrow objects from configuration into extension (CFE)
|
||||
# Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
|
||||
param(
|
||||
[Parameter(Mandatory)][string]$ExtensionPath,
|
||||
@@ -285,14 +285,36 @@ $script:generatedTypes = @{
|
||||
"DefinedType" = @(
|
||||
@{ prefix = "DefinedType"; category = "DefinedType" }
|
||||
)
|
||||
"Sequence" = @(
|
||||
@{ prefix = "SequenceRecord"; category = "Record" }
|
||||
@{ prefix = "SequenceManager"; category = "Manager" }
|
||||
@{ prefix = "SequenceRecordSet"; category = "RecordSet" }
|
||||
)
|
||||
"FilterCriterion" = @(
|
||||
@{ prefix = "FilterCriterionManager"; category = "Manager" }
|
||||
@{ prefix = "FilterCriterionList"; category = "List" }
|
||||
)
|
||||
"SettingsStorage" = @(
|
||||
@{ prefix = "SettingsStorageManager"; category = "Manager" }
|
||||
)
|
||||
"IntegrationService" = @(
|
||||
@{ prefix = "IntegrationServiceManager"; category = "Manager" }
|
||||
)
|
||||
"WSReference" = @(
|
||||
@{ prefix = "WSReferenceManager"; category = "Manager" }
|
||||
)
|
||||
}
|
||||
|
||||
# Types that need ChildObjects element
|
||||
# Types that need ChildObjects element — fallback when the source object cannot be probed.
|
||||
# The platform emits <ChildObjects> for every container type even when empty, and rejects
|
||||
# the file without it ("ожидаемое ChildObjects"); primary signal is the source object itself.
|
||||
$typesWithChildObjects = @(
|
||||
"Catalog","Document","ExchangePlan","ChartOfAccounts",
|
||||
"ChartOfCharacteristicTypes","ChartOfCalculationTypes",
|
||||
"BusinessProcess","Task","Enum",
|
||||
"InformationRegister","AccumulationRegister","AccountingRegister","CalculationRegister"
|
||||
"InformationRegister","AccumulationRegister","AccountingRegister","CalculationRegister",
|
||||
"DataProcessor","Report","DocumentJournal","FilterCriterion","SettingsStorage",
|
||||
"Sequence","HTTPService","WebService","IntegrationService","Subsystem"
|
||||
)
|
||||
|
||||
# CommonModule properties to copy from source
|
||||
@@ -457,6 +479,9 @@ function Read-SourceObject {
|
||||
}
|
||||
}
|
||||
|
||||
# Whether the platform emits <ChildObjects> for this type — the source object is the ground truth
|
||||
$srcProps["__HasChildObjects"] = ($srcEl.SelectSingleNode("md:ChildObjects", $srcNs) -ne $null)
|
||||
|
||||
return @{
|
||||
Uuid = $srcUuid
|
||||
Properties = $srcProps
|
||||
@@ -1672,7 +1697,7 @@ function Build-BorrowedObjectXml {
|
||||
$sb.AppendLine("`t`t</Properties>") | Out-Null
|
||||
|
||||
# ChildObjects (for types that need it)
|
||||
if ($typesWithChildObjects -contains $typeName) {
|
||||
if ($sourceProps["__HasChildObjects"] -or ($typesWithChildObjects -contains $typeName)) {
|
||||
$sb.AppendLine("`t`t<ChildObjects/>") | Out-Null
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env python3
|
||||
# cfe-borrow v1.10 — Borrow objects from configuration into extension (CFE)
|
||||
# cfe-borrow v1.11 — Borrow objects from configuration into extension (CFE)
|
||||
# Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
|
||||
|
||||
import argparse
|
||||
@@ -254,13 +254,36 @@ GENERATED_TYPES = {
|
||||
"DefinedType": [
|
||||
{"prefix": "DefinedType", "category": "DefinedType"},
|
||||
],
|
||||
"Sequence": [
|
||||
{"prefix": "SequenceRecord", "category": "Record"},
|
||||
{"prefix": "SequenceManager", "category": "Manager"},
|
||||
{"prefix": "SequenceRecordSet", "category": "RecordSet"},
|
||||
],
|
||||
"FilterCriterion": [
|
||||
{"prefix": "FilterCriterionManager", "category": "Manager"},
|
||||
{"prefix": "FilterCriterionList", "category": "List"},
|
||||
],
|
||||
"SettingsStorage": [
|
||||
{"prefix": "SettingsStorageManager", "category": "Manager"},
|
||||
],
|
||||
"IntegrationService": [
|
||||
{"prefix": "IntegrationServiceManager", "category": "Manager"},
|
||||
],
|
||||
"WSReference": [
|
||||
{"prefix": "WSReferenceManager", "category": "Manager"},
|
||||
],
|
||||
}
|
||||
|
||||
# Types that need ChildObjects element — fallback when the source object cannot be probed.
|
||||
# The platform emits <ChildObjects> for every container type even when empty, and rejects
|
||||
# the file without it ("expected ChildObjects"); primary signal is the source object itself.
|
||||
TYPES_WITH_CHILD_OBJECTS = [
|
||||
"Catalog", "Document", "ExchangePlan", "ChartOfAccounts",
|
||||
"ChartOfCharacteristicTypes", "ChartOfCalculationTypes",
|
||||
"BusinessProcess", "Task", "Enum",
|
||||
"InformationRegister", "AccumulationRegister", "AccountingRegister", "CalculationRegister",
|
||||
"DataProcessor", "Report", "DocumentJournal", "FilterCriterion", "SettingsStorage",
|
||||
"Sequence", "HTTPService", "WebService", "IntegrationService", "Subsystem",
|
||||
]
|
||||
|
||||
COMMON_MODULE_PROPS = ["Global", "ClientManagedApplication", "Server", "ExternalConnection", "ClientOrdinaryApplication", "ServerCall"]
|
||||
@@ -536,6 +559,9 @@ def main():
|
||||
type_xml = etree.tostring(type_node, encoding="unicode")
|
||||
src_props["__TypeXml"] = re.sub(r'\s+xmlns(?::\w+)?="[^"]*"', '', type_xml)
|
||||
|
||||
# Whether the platform emits <ChildObjects> for this type — the source object is the ground truth
|
||||
src_props["__HasChildObjects"] = src_el.find(f"{{{MD_NS}}}ChildObjects") is not None
|
||||
|
||||
return {"Uuid": src_uuid, "Properties": src_props, "Element": src_el}
|
||||
|
||||
def read_source_form_uuid(type_name, obj_name, form_name):
|
||||
@@ -612,7 +638,7 @@ def main():
|
||||
|
||||
lines.append("\t\t</Properties>")
|
||||
|
||||
if type_name in TYPES_WITH_CHILD_OBJECTS:
|
||||
if source_props.get("__HasChildObjects") or type_name in TYPES_WITH_CHILD_OBJECTS:
|
||||
lines.append("\t\t<ChildObjects/>")
|
||||
|
||||
lines.append(f"\t</{type_name}>")
|
||||
|
||||
Reference in New Issue
Block a user