Skip to content

Commit fe44be8

Browse files
squrioussqurious
committed
Simplifies mapping and fix some edge cases
1 parent 51ff911 commit fe44be8

File tree

11 files changed

+104
-45
lines changed

11 files changed

+104
-45
lines changed

‎src/LiveComponent/assets/dist/Component/plugins/QueryStringPlugin.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ export default class implements PluginInterface {
99
[p: string]: QueryMapping;
1010
});
1111
attachToComponent(component: Component): void;
12+
private isEmpty;
1213
}
1314
export {};

‎src/LiveComponent/assets/dist/live_controller.js

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2737,11 +2737,14 @@ function toQueryString(data) {
27372737
Object.entries(data).forEach(([iKey, iValue]) => {
27382738
const key = baseKey === '' ? iKey : `${baseKey}[${iKey}]`;
27392739
if (!isObject(iValue)) {
2740-
if (iValue !== null) {
2740+
if (null !== iValue) {
27412741
entries[key] = encodeURIComponent(iValue)
27422742
.replace(/%20/g, '+')
27432743
.replace(/%2C/g, ',');
27442744
}
2745+
else if ('' === baseKey) {
2746+
entries[key] = '';
2747+
}
27452748
}
27462749
else {
27472750
entries = Object.assign(Object.assign({}, entries), buildQueryStringEntries(iValue, entries, key));
@@ -2761,22 +2764,22 @@ function fromQueryString(search) {
27612764
const insertDotNotatedValueIntoData = (key, value, data) => {
27622765
const [first, second, ...rest] = key.split('.');
27632766
if (!second)
2764-
return (data[key] = value);
2767+
return data[key] = value;
27652768
if (data[first] === undefined) {
2766-
data[first] = Number.isNaN(second) ? {} : [];
2769+
data[first] = Number.isNaN(Number.parseInt(second)) ? {} : [];
27672770
}
27682771
insertDotNotatedValueIntoData([second, ...rest].join('.'), value, data[first]);
27692772
};
27702773
const entries = search.split('&').map((i) => i.split('='));
27712774
const data = {};
27722775
entries.forEach(([key, value]) => {
2773-
if (!value)
2774-
return;
27752776
value = decodeURIComponent(value.replace(/\+/g, '%20'));
27762777
if (!key.includes('[')) {
27772778
data[key] = value;
27782779
}
27792780
else {
2781+
if ('' === value)
2782+
return;
27802783
const dotNotatedKey = key.replace(/\[/g, '.').replace(/]/g, '');
27812784
insertDotNotatedValueIntoData(dotNotatedKey, value, data);
27822785
}
@@ -2826,13 +2829,33 @@ class QueryStringPlugin {
28262829
const urlUtils = new UrlUtils(window.location.href);
28272830
const currentUrl = urlUtils.toString();
28282831
Object.entries(this.mapping).forEach(([prop, mapping]) => {
2829-
urlUtils.set(mapping.name, component.valueStore.get(prop));
2832+
const value = component.valueStore.get(prop);
2833+
if (this.isEmpty(value)) {
2834+
urlUtils.remove(mapping.name);
2835+
}
2836+
else {
2837+
urlUtils.set(mapping.name, value);
2838+
}
28302839
});
28312840
if (currentUrl !== urlUtils.toString()) {
28322841
HistoryStrategy.replace(urlUtils);
28332842
}
28342843
});
28352844
}
2845+
isEmpty(value) {
2846+
if (null === value || value === '' || value === undefined || Array.isArray(value) && value.length === 0) {
2847+
return true;
2848+
}
2849+
if (typeof value !== 'object') {
2850+
return false;
2851+
}
2852+
for (let key of Object.keys(value)) {
2853+
if (!this.isEmpty(value[key])) {
2854+
return false;
2855+
}
2856+
}
2857+
return true;
2858+
}
28362859
}
28372860

28382861
const getComponent = (element) => LiveControllerDefault.componentRegistry.getComponent(element);

‎src/LiveComponent/assets/src/Component/plugins/QueryStringPlugin.ts

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ export default class implements PluginInterface {
1818
const currentUrl = urlUtils.toString();
1919

2020
Object.entries(this.mapping).forEach(([prop, mapping]) => {
21-
urlUtils.set(mapping.name, component.valueStore.get(prop));
21+
const value = component.valueStore.get(prop);
22+
if (this.isEmpty(value)) {
23+
urlUtils.remove(mapping.name);
24+
} else {
25+
urlUtils.set(mapping.name, value);
26+
}
2227
});
2328

2429
// Only update URL if it has changed
@@ -27,4 +32,22 @@ export default class implements PluginInterface {
2732
}
2833
});
2934
}
35+
36+
private isEmpty(value: any): boolean
37+
{
38+
if (null === value || value === '' || value === undefined || Array.isArray(value) && value.length === 0) {
39+
return true;
40+
}
41+
42+
if (typeof value !== 'object') {
43+
return false;
44+
}
45+
46+
for (let key of Object.keys(value)) {
47+
if (!this.isEmpty(value[key])) {
48+
return false;
49+
}
50+
}
51+
return true;
52+
}
3053
}

‎src/LiveComponent/assets/src/url_utils.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@ function toQueryString(data: any) {
1515
const key = baseKey === '' ? iKey : `${baseKey}[${iKey}]`;
1616

1717
if (!isObject(iValue)) {
18-
if (iValue !== null) {
18+
if (null !== iValue) {
1919
entries[key] = encodeURIComponent(iValue)
2020
.replace(/%20/g, '+') // Conform to RFC1738
2121
.replace(/%2C/g, ',');
22+
} else if ('' === baseKey) {
23+
// Keep empty values for top level data
24+
entries[key] = '';
2225
}
2326
} else {
2427
entries = { ...entries, ...buildQueryStringEntries(iValue, entries, key) };
@@ -51,11 +54,11 @@ function fromQueryString(search: string) {
5154
const [first, second, ...rest] = key.split('.');
5255

5356
// We're at a leaf node, let's make the assigment...
54-
if (!second) return (data[key] = value);
57+
if (!second) return data[key] = value;
5558

5659
// This is where we fill in empty arrays/objects along the way to the assigment...
5760
if (data[first] === undefined) {
58-
data[first] = Number.isNaN(second) ? {} : [];
61+
data[first] = Number.isNaN(Number.parseInt(second)) ? {} : [];
5962
}
6063

6164
// Keep deferring assignment until the full key is built up...
@@ -67,14 +70,14 @@ function fromQueryString(search: string) {
6770
const data: any = {};
6871

6972
entries.forEach(([key, value]) => {
70-
// Query string params don't always have values... (`?foo=`)
71-
if (!value) return;
72-
7373
value = decodeURIComponent(value.replace(/\+/g, '%20'));
7474

7575
if (!key.includes('[')) {
7676
data[key] = value;
7777
} else {
78+
// Skip empty nested data
79+
if ('' === value) return;
80+
7881
// Convert to dot notation because it's easier...
7982
const dotNotatedKey = key.replace(/\[/g, '.').replace(/]/g, '');
8083

‎src/LiveComponent/assets/test/url_utils.test.ts

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,24 @@ describe('url_utils', () => {
3535
expect(urlUtils.search).toEqual('?param=bar');
3636
});
3737

38+
it('preserve empty values if the param is scalar', () => {
39+
urlUtils.set('param', '');
40+
41+
expect(urlUtils.search).toEqual('?param=');
42+
});
43+
3844
it('expand arrays in the URL', () => {
3945
urlUtils.set('param', ['foo', 'bar']);
4046

4147
expect(urlUtils.search).toEqual('?param[0]=foo&param[1]=bar');
4248
});
4349

50+
it('prevent empty values if the param is array', () => {
51+
urlUtils.set('param', []);
52+
53+
expect(urlUtils.search).toEqual('');
54+
});
55+
4456
it('expand objects in the URL', () => {
4557
urlUtils.set('param', {
4658
foo: 1,
@@ -49,6 +61,21 @@ describe('url_utils', () => {
4961

5062
expect(urlUtils.search).toEqual('?param[foo]=1&param[bar]=baz');
5163
});
64+
65+
it('remove empty values in nested object properties', () => {
66+
urlUtils.set('param', {
67+
foo: null,
68+
bar: 'baz',
69+
});
70+
71+
expect(urlUtils.search).toEqual('?param[bar]=baz');
72+
});
73+
74+
it('prevent empty values if the param is an empty object', () => {
75+
urlUtils.set('param', {});
76+
77+
expect(urlUtils.search).toEqual('');
78+
});
5279
});
5380

5481
describe('remove', () => {

‎src/LiveComponent/src/EventListener/QueryStringInitializeSubscriber.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@
2727
*/
2828
class QueryStringInitializeSubscriber implements EventSubscriberInterface
2929
{
30-
/**
31-
* @var array<class-string,LiveComponentMetadata>
32-
*/
33-
private array $registered = [];
34-
3530
public function __construct(
3631
private readonly RequestStack $requestStack,
3732
private readonly LiveComponentMetadataFactory $metadataFactory,

‎src/LiveComponent/src/Metadata/LiveComponentMetadataFactory.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,9 @@ private function createQueryStringMapping(string $propertyName, LiveProp $livePr
136136
return [];
137137
}
138138

139-
$queryStringMapping = [];
140-
141-
$queryStringMapping['parameters'] = [
142-
$propertyName => [
143-
'property' => $propertyName,
144-
],
139+
return [
140+
'name' => $propertyName,
145141
];
146-
147-
return $queryStringMapping;
148142
}
149143

150144
public function reset(): void

‎src/LiveComponent/src/Metadata/LivePropMetadata.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function allowsNull(): bool
5555
}
5656

5757
/**
58-
* @return array{'parameters': array<string,array{'property': string}>}
58+
* @return array{'name': string}
5959
*/
6060
public function getQueryStringMapping(): array
6161
{

‎src/LiveComponent/src/Util/LiveControllerAttributesCreator.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,7 @@ public function attributesForRendering(MountedComponent $mounted, ComponentMetad
126126
$queryMapping = [];
127127
foreach ($liveMetadata->getAllLivePropsMetadata() as $livePropMetadata) {
128128
if ($mapping = $livePropMetadata->getQueryStringMapping()) {
129-
foreach ($mapping['parameters'] as $parameter => $config) {
130-
$queryMapping[$config['property']] = [
131-
'name' => $parameter,
132-
];
133-
}
129+
$queryMapping[$livePropMetadata->getName()] = $mapping;
134130
}
135131
}
136132
$attributesCollection->setQueryUrlMapping($queryMapping);

‎src/LiveComponent/src/Util/QueryStringPropsExtractor.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,12 @@ public function extract(Request $request, LiveComponentMetadata $metadata, objec
3838
$data = [];
3939

4040
foreach ($metadata->getAllLivePropsMetadata() as $livePropMetadata) {
41-
$queryStringBinding = $livePropMetadata->getQueryStringMapping();
42-
foreach ($queryStringBinding['parameters'] ?? [] as $parameterName => $paramConfig) {
43-
if (null !== ($value = $query[$parameterName] ?? null)) {
41+
if ($queryStringMapping = $livePropMetadata->getQueryStringMapping()) {
42+
if (null !== ($value = $query[$queryStringMapping['name']] ?? null)) {
4443
if (\is_array($value) && $this->isNumericIndexedArray($value)) {
4544
ksort($value);
4645
}
47-
$data[$paramConfig['property']] = $this->hydrator->hydrateValue($value, $livePropMetadata, $component);
46+
$data[$livePropMetadata->getName()] = $this->hydrator->hydrateValue($value, $livePropMetadata, $component);
4847
}
4948
}
5049
}

‎src/LiveComponent/tests/Functional/Metadata/LiveComponentMetadataFactoryTest.php

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,21 @@ public function testQueryStringMapping()
3131
}
3232

3333
$this->assertEquals([
34-
'parameters' => [
35-
'prop1' => ['property' => 'prop1'],
36-
],
34+
'name' => 'prop1',
3735
], $propsMetadataByName['prop1']->getQueryStringMapping());
3836

3937
$this->assertEquals([
40-
'parameters' => [
41-
'prop2' => ['property' => 'prop2'],
42-
],
38+
'name' => 'prop2',
4339
], $propsMetadataByName['prop2']->getQueryStringMapping());
4440

4541
$this->assertEquals([
46-
'parameters' => [
47-
'prop3' => ['property' => 'prop3'],
48-
],
42+
'name' => 'prop3',
4943
], $propsMetadataByName['prop3']->getQueryStringMapping());
5044

5145
$this->assertEquals([], $propsMetadataByName['prop4']->getQueryStringMapping());
46+
47+
$this->assertEquals([
48+
'name' => 'prop5',
49+
], $propsMetadataByName['prop5']->getQueryStringMapping());
5250
}
5351
}

0 commit comments

Comments
 (0)