Loosen-IT/WP-LIT-MCP
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

fix: S40 - short form and attrs on the same path refused for new nodes too

Browse Source 
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01At3V6SjwbMe6eMzVGW3Hs7
This commit is contained in:
janniclas.loosen
2026-09-26 15:17:42 +02:00
co-authored by Claude Opus 5.5
parent 110beb7698
commit 22bb1528db
3 changed files with 95 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Integrations/Divi/Compose/Composer.php
+48 -14
View File
@@ -44,6 +44,11 @@ final class Composer
private const LABEL_PATH = 'module.meta.adminLabel';
private const BACKGROUND = 'module.decoration.background';
/** Advice of the S40 overlap error for new nodes. */
private const ONE_FORM = 'für diesen Pfad nur Kurzform oder attrs angeben';
/** @var array<string, string> */
private array $errors = [];
@@ -116,7 +121,13 @@ final class Composer
}
}
$this->overlaps($block->shortName(), $change, $field);
$set = $change['set'] ?? null;
$this->overlaps(
is_array($set) ? $this->shortPaths($block->shortName(), $set, 'set.') : [],
$change['attrs'] ?? null,
$field,
'bitte als zwei Änderungen senden'
);
$attrs = $this->presetAndAttrs($block->name(), $attrs, $change, $field);
if (array_key_exists('label', $change)) {
$attrs = $change['label'] === null || $change['label'] === ''
@@ -128,21 +139,20 @@ final class Composer
}
/**
* Ruling S38: one change may not reach the same attribute path through "set" and "attrs" –
* composite values are replaced whole per breakpoint, so combining them would silently lose
* sub-keys. Paths overlap when equal or when one lies below the other.
* Rulings S38/S40: one change or new node may not reach the same attribute path through the
* short form and "attrs" – composite values are replaced whole per breakpoint, so combining
* them would silently lose sub-keys. Paths overlap when equal or when one lies below the other.
*
* @param array<array-key, mixed> $change
* @param array<string, string> $short Input name of the short-form value ("set.text", "text") => its path.
* @param mixed $full The "attrs" input.
* @param string $advice How to resolve it, for the error message.
*/
private function overlaps(string $type, array $change, string $field): void
private function overlaps(array $short, mixed $full, string $field, string $advice): void
{
$set = $change['set'] ?? null;
$full = $change['attrs'] ?? null;
if (! is_array($set) || ! is_array($full) || $set === [] || $full === []) {
if ($short === [] || ! is_array($full)) {
return;
}
$short = $this->shortform->paths($type, array_map('strval', array_keys($set)));
foreach (array_keys($full) as $path) {
$path = (string) $path;
foreach ($short as $name => $shortPath) {
@@ -151,8 +161,9 @@ final class Composer
|| str_starts_with($shortPath, $path . '.')
) {
$this->errors[$field . '.attrs.' . $path] = sprintf(
'derselbe Attributpfad wird auch über set.%s geändert; bitte als zwei Änderungen senden',
$name
'derselbe Attributpfad wird auch über %s geändert; %s',
$name,
$advice
);
break;
}
@@ -160,6 +171,22 @@ final class Composer
}
}
/**
* Paths of the short-form fields a client gave, keyed by their input name ($prefix . field).
*
* @param array<array-key, mixed> $values Field => value.
* @return array<string, string>
*/
private function shortPaths(string $type, array $values, string $prefix): array
{
$paths = [];
foreach ($this->shortform->paths($type, array_map('strval', array_keys($values))) as $name => $path) {
$paths[$prefix . $name] = $path;
}
return $paths;
}
/** Admin label for a new module: "<Abschnitt> – <Modultitel>" or the title alone. */
public function autoLabel(string $name, string $context): string
{
@@ -227,6 +254,12 @@ final class Composer
if (array_key_exists('background_color', $spec)) {
$attrs = $this->backgroundColor($attrs, $spec['background_color'], $path . '.background_color');
$this->overlaps(
['background_color' => self::BACKGROUND],
$spec['attrs'] ?? null,
$path,
self::ONE_FORM
);
}
$attrs = $this->common('divi/section', $attrs, $spec, $path, null);
@@ -312,6 +345,7 @@ final class Composer
// "type" and "label" of a node are its module type and admin label; the short-form fields
// of the same name (contact-field type, social network label) go through lit-divi-update "set".
$values = array_intersect_key($spec, array_flip(array_diff($fields, self::COMMON)));
$this->overlaps($this->shortPaths($short, $values, ''), $spec['attrs'] ?? null, $path, self::ONE_FORM);
if ($name === 'divi/heading' && ! array_key_exists('level', $values)) {
$values['level'] = 'h2';
}
@@ -471,14 +505,14 @@ final class Composer
private function backgroundColor(array $attrs, mixed $color, string $path): array
{
try {
$clean = $this->shortform->color('divi/section', 'module.decoration.background', $color, 'color');
$clean = $this->shortform->color('divi/section', self::BACKGROUND, $color, 'color');
} catch (InvalidArgumentException $e) {
$this->errors[$path] = $e->getMessage();
return $attrs;
}
return AttrMap::set($attrs, 'module.decoration.background', ['desktop' => ['value' => ['color' => $clean]]]);
return AttrMap::set($attrs, self::BACKGROUND, ['desktop' => ['value' => ['color' => $clean]]]);
}
private function children(Block $parent, mixed $specs, string $path, string $context): void