doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support for property groups in variant elements, in TDFs

Browse Source
This commit is contained in:
Nav
2024-10-12 16:25:11 +01:00
parent 22cca07242
commit 5c896bb2ca
7 changed files with 158 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/scripts/Targets/TargetDescriptionFiles/Services/AtdfService.php
View File

@@ -1046,7 +1046,8 @@ class AtdfService
strtolower($attributes['ordercode'] ?? $attributes['name'] ?? '')
),
$attributes['ordercode'] ?? $attributes['name'] ?? null,
isset($attributes['pinout']) ? strtolower($attributes['pinout']) : null
isset($attributes['pinout']) ? strtolower($attributes['pinout']) : null,
[]
);
}
}

11
build/scripts/Targets/TargetDescriptionFiles/Services/ValidationService.php
View File

@@ -1039,6 +1039,17 @@ class ValidationService
. '" - check pinout key';
}
$processedPropertyGroupKeys = [];
foreach ($variant->propertyGroups as $propertyGroup) {
$failures = array_merge($failures, $this->validatePropertyGroup($propertyGroup));
if ($propertyGroup->key !== null && in_array($propertyGroup->key, $processedPropertyGroupKeys)) {
$failures[] = 'Duplicate property group key ("' . $propertyGroup->key . '") detected';
}
$processedPropertyGroupKeys[] = $propertyGroup->key;
}
return array_map(
fn (string $failure): string => 'Variant "' . $variant->name . '" validation failure: ' . $failure,
$failures

26
build/scripts/Targets/TargetDescriptionFiles/Services/Xml/FromXmlService.php
View File

@@ -450,10 +450,32 @@ class FromXmlService
{
$attributes = $this->getNodeAttributesByName($element);
return new Variant(
$output = new Variant(
$attributes['key'] ?? null,
$attributes['name'] ?? null,
$attributes['pinout-key'] ?? null
$attributes['pinout-key'] ?? null,
[]
);
$propertyGroupsElements = $element->getElementsByTagName('property-groups');
if (
$propertyGroupsElements->count() === 1
&& ($propertyGroupsElement = $propertyGroupsElements->item(0)) instanceof DOMElement
) {
foreach ($propertyGroupsElement->childNodes as $childNode) {
if (!$childNode instanceof DOMElement) {
continue;
}
if ($childNode->nodeName === 'property-group') {
$output->propertyGroups[] = $this->propertyGroupFromElement($childNode);
}
}
} elseif ($propertyGroupsElements->count() > 1) {
throw new XmlParsingException('Unexpected number of "property-groups" elements');
}
return $output;
}
}

9
build/scripts/Targets/TargetDescriptionFiles/Services/Xml/ToXmlService.php
View File

@@ -406,6 +406,15 @@ class ToXmlService
$element->setAttribute('name', $variant->name);
$element->setAttribute('pinout-key', $variant->pinoutKey);
if (!empty($variant->propertyGroups)) {
$propertyGroupsElement = $document->createElement('signals');
foreach ($variant->propertyGroups as $propertyGroup) {
$propertyGroupsElement->append($this->propertyGroupToXml($propertyGroup, $document));
}
$element->append($propertyGroupsElement);
}
return $element;
}
}