@rxap/schematic-angular 16.2.0-dev.14 → 16.2.0-dev.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (122) hide show
  1. package/CHANGELOG.md +17 -0
  2. package/package.json +2 -2
  3. package/src/lib/accordion-item.d.ts +13 -6
  4. package/src/lib/accordion-item.js +10 -1
  5. package/src/lib/accordion-item.js.map +1 -1
  6. package/src/lib/coerce-accordion-component.js +1 -1
  7. package/src/lib/coerce-accordion-component.js.map +1 -1
  8. package/src/lib/coerce-accordion-item-table-component.js +1 -1
  9. package/src/lib/coerce-accordion-item-table-component.js.map +1 -1
  10. package/src/lib/data-grid-options.d.ts +3 -0
  11. package/src/lib/data-grid-options.js +2 -0
  12. package/src/lib/data-grid-options.js.map +1 -1
  13. package/src/lib/form-control.d.ts +2 -2
  14. package/src/lib/form-control.js +14 -43
  15. package/src/lib/form-control.js.map +1 -1
  16. package/src/lib/minimum-table-component-options.js +2 -2
  17. package/src/lib/minimum-table-component-options.js.map +1 -1
  18. package/src/lib/table-column.d.ts +9 -5
  19. package/src/lib/table-column.js +37 -59
  20. package/src/lib/table-column.js.map +1 -1
  21. package/src/schema.json +2347 -0
  22. package/src/schematic-input.schema.json +607 -0
  23. package/src/schematics/accordion/accordion-component/index.d.ts +5 -2
  24. package/src/schematics/accordion/accordion-component/index.js +51 -25
  25. package/src/schematics/accordion/accordion-component/index.js.map +1 -1
  26. package/src/schematics/accordion/accordion-component/schema.d.ts +6 -0
  27. package/src/schematics/accordion/accordion-component/schema.json +183 -360
  28. package/src/schematics/accordion/accordion-component/template.schema.json +22 -25
  29. package/src/schematics/accordion/accordion-item-component/index.d.ts +7 -2
  30. package/src/schematics/accordion/accordion-item-component/index.js +70 -49
  31. package/src/schematics/accordion/accordion-item-component/index.js.map +1 -1
  32. package/src/schematics/accordion/accordion-item-component/schema.json +167 -336
  33. package/src/schematics/accordion/accordion-item-component/template.schema.json +8 -15
  34. package/src/schematics/accordion/item/accordion-item-data-grid-component/index.d.ts +1 -1
  35. package/src/schematics/accordion/item/accordion-item-data-grid-component/index.js +21 -25
  36. package/src/schematics/accordion/item/accordion-item-data-grid-component/index.js.map +1 -1
  37. package/src/schematics/accordion/item/accordion-item-data-grid-component/schema.json +321 -429
  38. package/src/schematics/accordion/item/accordion-item-data-grid-component/template.schema.json +9 -15
  39. package/src/schematics/accordion/item/accordion-item-switch-component/index.d.ts +1 -1
  40. package/src/schematics/accordion/item/accordion-item-switch-component/index.js +14 -6
  41. package/src/schematics/accordion/item/accordion-item-switch-component/index.js.map +1 -1
  42. package/src/schematics/accordion/item/accordion-item-switch-component/schema.json +174 -346
  43. package/src/schematics/accordion/item/accordion-item-switch-component/template.schema.json +6 -15
  44. package/src/schematics/accordion/item/accordion-item-table-component/index.d.ts +1 -1
  45. package/src/schematics/accordion/item/accordion-item-table-component/index.js +11 -13
  46. package/src/schematics/accordion/item/accordion-item-table-component/index.js.map +1 -1
  47. package/src/schematics/accordion/item/accordion-item-table-component/schema.json +453 -614
  48. package/src/schematics/accordion/item/accordion-item-table-component/template.schema.json +9 -18
  49. package/src/schematics/accordion/item/accordion-item-tree-table-component/index.d.ts +1 -1
  50. package/src/schematics/accordion/item/accordion-item-tree-table-component/index.js +37 -61
  51. package/src/schematics/accordion/item/accordion-item-tree-table-component/index.js.map +1 -1
  52. package/src/schematics/accordion/item/accordion-item-tree-table-component/schema.json +431 -592
  53. package/src/schematics/accordion/item/accordion-item-tree-table-component/template.schema.json +10 -19
  54. package/src/schematics/accordion-identifier.schema.json +25 -0
  55. package/src/schematics/accordion-item.schema.json +24 -0
  56. package/src/schematics/angular.schema.json +11 -3
  57. package/src/schematics/button.schema.json +1 -1
  58. package/src/schematics/data-grid-component/index.js +17 -16
  59. package/src/schematics/data-grid-component/index.js.map +1 -1
  60. package/src/schematics/data-grid-component/schema.json +212 -378
  61. package/src/schematics/data-grid-component/template.schema.json +6 -15
  62. package/src/schematics/data-grid-item.schema.json +4 -1
  63. package/src/schematics/data-grid.schema.json +10 -4
  64. package/src/schematics/dialog-component/schema.json +72 -158
  65. package/src/schematics/dialog-component/template.schema.json +3 -6
  66. package/src/schematics/form/control/input-form-control/schema.json +108 -306
  67. package/src/schematics/form/control/input-form-control/template.schema.json +6 -9
  68. package/src/schematics/form/control/select-form-control/schema.json +120 -307
  69. package/src/schematics/form/control/select-form-control/template.schema.json +6 -9
  70. package/src/schematics/form/control/table-select-form-control/index.js +1 -1
  71. package/src/schematics/form/control/table-select-form-control/index.js.map +1 -1
  72. package/src/schematics/form/control/table-select-form-control/schema.json +93 -296
  73. package/src/schematics/form/control/table-select-form-control/template.schema.json +3 -6
  74. package/src/schematics/form/form-component/schema.json +136 -238
  75. package/src/schematics/form/form-component/template.schema.json +6 -9
  76. package/src/schematics/form/form-control/schema.json +68 -176
  77. package/src/schematics/form/form-control/template.schema.json +6 -9
  78. package/src/schematics/form/form-definition/schema.json +125 -230
  79. package/src/schematics/form/form-definition/template.schema.json +6 -9
  80. package/src/schematics/form-component.schema.json +3 -3
  81. package/src/schematics/form-definition.schema.json +3 -3
  82. package/src/schematics/general.schema.json +1 -4
  83. package/src/schematics/input-form-control.schema.json +11 -3
  84. package/src/schematics/minimum-table.schema.json +11 -5
  85. package/src/schematics/pipe.schema.json +1 -1
  86. package/src/schematics/select-form-control.schema.json +15 -4
  87. package/src/schematics/table/action/dialog-table-action/schema.json +150 -230
  88. package/src/schematics/table/action/dialog-table-action/template.schema.json +3 -6
  89. package/src/schematics/table/action/form-table-action/schema.json +283 -321
  90. package/src/schematics/table/action/form-table-action/template.schema.json +6 -6
  91. package/src/schematics/table/action/navigation-table-action/schema.json +150 -230
  92. package/src/schematics/table/action/navigation-table-action/template.schema.json +3 -6
  93. package/src/schematics/table/action/open-api-table-action/schema.json +150 -230
  94. package/src/schematics/table/action/open-api-table-action/template.schema.json +3 -6
  95. package/src/schematics/table/action/operation-table-action/schema.json +138 -218
  96. package/src/schematics/table/action/operation-table-action/template.schema.json +3 -6
  97. package/src/schematics/table/header-button/form-table-header-button/schema.json +217 -261
  98. package/src/schematics/table/header-button/form-table-header-button/template.schema.json +6 -6
  99. package/src/schematics/table/header-button/navigation-table-header-button/schema.json +131 -211
  100. package/src/schematics/table/header-button/navigation-table-header-button/template.schema.json +3 -6
  101. package/src/schematics/table/table-action/schema.json +56 -139
  102. package/src/schematics/table/table-action/template.schema.json +6 -6
  103. package/src/schematics/table/table-component/index.d.ts +1 -1
  104. package/src/schematics/table/table-component/index.js +2 -0
  105. package/src/schematics/table/table-component/index.js.map +1 -1
  106. package/src/schematics/table/table-component/schema.json +352 -547
  107. package/src/schematics/table/table-component/template.schema.json +6 -18
  108. package/src/schematics/table/table-header-button/schema.json +56 -139
  109. package/src/schematics/table/table-header-button/template.schema.json +6 -6
  110. package/src/schematics/table/tree-table-component/files/component/__componentName__.component.html.hbs +6 -0
  111. package/src/schematics/table/tree-table-component/index.d.ts +3 -0
  112. package/src/schematics/table/tree-table-component/index.js +11 -3
  113. package/src/schematics/table/tree-table-component/index.js.map +1 -1
  114. package/src/schematics/table/tree-table-component/schema.json +352 -547
  115. package/src/schematics/table/tree-table-component/template.schema.json +6 -18
  116. package/src/schematics/table-column.schema.json +4 -1
  117. package/src/schematics/table.schema.json +4 -1
  118. package/src/schematics/tree-component/schema.json +70 -62
  119. package/src/schematics/tree-component/template.schema.json +7 -2
  120. package/src/schematics/tree-table.schema.json +3 -3
  121. package/src/schematics/value.schema.json +1 -1
  122. package/src/template.schema.json +173 -0
@@ -3,45 +3,17 @@
3
3
  "$id": "data-grid-component-schematic",
4
4
  "allOf": [
5
5
  {
6
+ "$ref": "#/definitions/angular"
7
+ },
8
+ {
9
+ "$ref": "#/definitions/dataGrid"
10
+ }
11
+ ],
12
+ "definitions": {
13
+ "angular": {
6
14
  "allOf": [
7
15
  {
8
- "type": "object",
9
- "properties": {
10
- "project": {
11
- "type": "string",
12
- "description": "Project name where the files should be generated"
13
- },
14
- "feature": {
15
- "type": "string",
16
- "description": "Feature name where the files should be generated"
17
- },
18
- "overwrite": {
19
- "anyOf": [
20
- {
21
- "type": "boolean"
22
- },
23
- {
24
- "type": "array",
25
- "items": {
26
- "type": "string"
27
- }
28
- }
29
- ],
30
- "description": "Overwrite existing files",
31
- "default": false
32
- },
33
- "overwriteHtml": {
34
- "type": "boolean",
35
- "default": false
36
- },
37
- "replace": {
38
- "type": "boolean",
39
- "default": false
40
- }
41
- },
42
- "required": [
43
- "project"
44
- ]
16
+ "$ref": "#/definitions/general"
45
17
  },
46
18
  {
47
19
  "type": "object",
@@ -64,15 +36,7 @@
64
36
  "type": "string"
65
37
  },
66
38
  "backend": {
67
- "type": "string",
68
- "description": "The backend that should be used to handel data",
69
- "enum": [
70
- "none",
71
- "nestjs",
72
- "open-api",
73
- "local"
74
- ],
75
- "default": "none"
39
+ "$ref": "#/definitions/backend"
76
40
  },
77
41
  "directory": {
78
42
  "type": "string",
@@ -97,7 +61,7 @@
97
61
  }
98
62
  ]
99
63
  },
100
- {
64
+ "dataGrid": {
101
65
  "type": "object",
102
66
  "properties": {
103
67
  "mode": {
@@ -124,262 +88,166 @@
124
88
  "alias": "item",
125
89
  "type": "array",
126
90
  "items": {
127
- "type": "object",
128
- "properties": {
129
- "name": {
130
- "type": "string",
131
- "description": "The name of the data grid item"
132
- },
133
- "header": {
134
- "type": "string",
135
- "description": "The name of the control"
136
- },
137
- "pipeList": {
138
- "type": "array",
139
- "items": {
140
- "$ref": "#/definitions/pipe"
141
- }
142
- },
143
- "formControl": {
144
- "type": "object",
145
- "properties": {
146
- "name": {
147
- "type": "string",
148
- "description": "The name of the control"
149
- },
150
- "type": {
151
- "$ref": "#/definitions/type"
152
- },
153
- "isArray": {
154
- "type": "boolean",
155
- "description": "Whether the control value is an array",
156
- "default": false
157
- },
158
- "state": {
159
- "type": "string",
160
- "description": "The initial state of the control"
161
- },
162
- "isRequired": {
163
- "type": "boolean",
164
- "description": "Whether the control value is required",
165
- "default": false
166
- },
167
- "isReadonly": {
168
- "type": "boolean",
169
- "description": "Whether the control value is readonly",
170
- "default": false
171
- },
172
- "isDisabled": {
173
- "type": "boolean",
174
- "description": "Whether the control value is disabled",
175
- "default": false
176
- },
177
- "validatorList": {
178
- "type": "array",
179
- "items": {
180
- "type": "string"
181
- }
182
- },
183
- "kind": {
184
- "type": "string",
185
- "description": "The name of the template",
186
- "enum": [
187
- "default",
188
- "input",
189
- "select",
190
- "checkbox",
191
- "autocomplete-table-select",
192
- "table-select",
193
- "textarea",
194
- "slide-toggle"
195
- ],
196
- "default": "default"
197
- }
198
- },
199
- "required": [
200
- "name"
201
- ],
202
- "additionalProperties": true
203
- },
204
- "template": {
205
- "type": "string"
206
- },
207
- "kind": {
208
- "type": "string",
209
- "enum": [
210
- "default",
211
- "link"
212
- ],
213
- "default": "default"
214
- },
215
- "type": {
216
- "$ref": "#/definitions/type"
217
- },
218
- "isArray": {
219
- "type": "boolean"
220
- }
221
- },
222
- "required": [
223
- "name"
224
- ]
91
+ "$ref": "#/definitions/dataGridItem"
225
92
  }
226
93
  },
227
94
  "inCard": {
228
95
  "type": "boolean",
229
96
  "description": "Whether the data grid is used in a card.",
230
97
  "default": true
231
- }
232
- }
233
- }
234
- ],
235
- "definitions": {
236
- "type": {
237
- "oneOf": [
238
- {
239
- "type": "string"
240
98
  },
241
- {
242
- "type": "object",
243
- "properties": {
244
- "name": {
245
- "type": "string"
246
- },
247
- "isTypeOnly": {
248
- "type": "boolean"
249
- },
250
- "moduleSpecifier": {
251
- "type": "string"
252
- },
253
- "namedImport": {
254
- "type": "string"
255
- },
256
- "namespaceImport": {
257
- "type": "string"
258
- },
259
- "defaultImport": {
260
- "type": "string"
261
- }
262
- },
263
- "required": [
264
- "name"
265
- ]
99
+ "upstream": {
100
+ "$ref": "#/definitions/upstream"
266
101
  }
267
- ]
102
+ }
268
103
  },
269
- "property": {
270
- "oneOf": [
271
- {
272
- "type": "string"
273
- },
274
- {
275
- "type": "object",
276
- "properties": {
277
- "name": {
278
- "type": "string"
279
- },
280
- "type": {
281
- "$ref": "#/definitions/type"
282
- },
283
- "isArray": {
284
- "type": "boolean"
285
- }
286
- },
287
- "required": [
288
- "name"
289
- ]
290
- }
104
+ "backend": {
105
+ "type": "string",
106
+ "description": "The backend that should be used to handel data",
107
+ "enum": [
108
+ "none",
109
+ "nestjs",
110
+ "open-api",
111
+ "local"
291
112
  ],
292
- "definitions": {
293
- "type": {
294
- "oneOf": [
295
- {
296
- "type": "string"
297
- },
298
- {
299
- "type": "object",
300
- "properties": {
301
- "name": {
302
- "type": "string"
303
- },
304
- "isTypeOnly": {
305
- "type": "boolean"
306
- },
307
- "moduleSpecifier": {
308
- "type": "string"
309
- },
310
- "namedImport": {
311
- "type": "string"
312
- },
313
- "namespaceImport": {
314
- "type": "string"
315
- },
316
- "defaultImport": {
317
- "type": "string"
318
- }
319
- },
320
- "required": [
321
- "name"
322
- ]
323
- }
324
- ]
325
- }
326
- }
113
+ "default": "none"
327
114
  },
328
- "button": {
115
+ "dataGridItem": {
329
116
  "type": "object",
330
117
  "properties": {
331
- "svgIcon": {
332
- "type": "string"
118
+ "name": {
119
+ "type": "string",
120
+ "description": "The name of the data grid item"
333
121
  },
334
- "icon": {
335
- "type": "string"
122
+ "header": {
123
+ "type": "string",
124
+ "description": "The name of the control"
336
125
  },
337
- "directiveList": {
126
+ "pipeList": {
338
127
  "type": "array",
339
128
  "items": {
340
- "$ref": "#/definitions/type"
129
+ "$ref": "#/definitions/pipe"
341
130
  }
342
131
  },
343
- "importList": {
132
+ "formControl": {
133
+ "$ref": "#/definitions/formControl"
134
+ },
135
+ "template": {
136
+ "type": "string"
137
+ },
138
+ "kind": {
139
+ "type": "string",
140
+ "enum": [
141
+ "default",
142
+ "link"
143
+ ],
144
+ "default": "default"
145
+ },
146
+ "type": {
147
+ "$ref": "#/definitions/type"
148
+ },
149
+ "isArray": {
150
+ "type": "boolean"
151
+ }
152
+ },
153
+ "required": [
154
+ "name"
155
+ ]
156
+ },
157
+ "formControl": {
158
+ "type": "object",
159
+ "properties": {
160
+ "name": {
161
+ "type": "string",
162
+ "description": "The name of the control"
163
+ },
164
+ "type": {
165
+ "$ref": "#/definitions/type"
166
+ },
167
+ "isArray": {
168
+ "type": "boolean",
169
+ "description": "Whether the control value is an array",
170
+ "default": false
171
+ },
172
+ "state": {
173
+ "type": "string",
174
+ "description": "The initial state of the control"
175
+ },
176
+ "isRequired": {
177
+ "type": "boolean",
178
+ "description": "Whether the control value is required",
179
+ "default": false
180
+ },
181
+ "isReadonly": {
182
+ "type": "boolean",
183
+ "description": "Whether the control value is readonly",
184
+ "default": false
185
+ },
186
+ "isDisabled": {
187
+ "type": "boolean",
188
+ "description": "Whether the control value is disabled",
189
+ "default": false
190
+ },
191
+ "validatorList": {
344
192
  "type": "array",
345
193
  "items": {
346
- "$ref": "#/definitions/type"
194
+ "type": "string"
347
195
  }
196
+ },
197
+ "kind": {
198
+ "type": "string",
199
+ "description": "The name of the template",
200
+ "enum": [
201
+ "default",
202
+ "input",
203
+ "select",
204
+ "checkbox",
205
+ "autocomplete-table-select",
206
+ "table-select",
207
+ "textarea",
208
+ "slide-toggle"
209
+ ],
210
+ "default": "default"
348
211
  }
349
212
  },
350
- "definitions": {
351
- "type": {
352
- "oneOf": [
213
+ "required": [
214
+ "name"
215
+ ],
216
+ "additionalProperties": true
217
+ },
218
+ "general": {
219
+ "type": "object",
220
+ "properties": {
221
+ "project": {
222
+ "type": "string",
223
+ "description": "Project name where the files should be generated"
224
+ },
225
+ "feature": {
226
+ "type": "string",
227
+ "description": "Feature name where the files should be generated"
228
+ },
229
+ "overwrite": {
230
+ "anyOf": [
353
231
  {
354
- "type": "string"
232
+ "type": "boolean"
355
233
  },
356
234
  {
357
- "type": "object",
358
- "properties": {
359
- "name": {
360
- "type": "string"
361
- },
362
- "isTypeOnly": {
363
- "type": "boolean"
364
- },
365
- "moduleSpecifier": {
366
- "type": "string"
367
- },
368
- "namedImport": {
369
- "type": "string"
370
- },
371
- "namespaceImport": {
372
- "type": "string"
373
- },
374
- "defaultImport": {
375
- "type": "string"
376
- }
377
- },
378
- "required": [
379
- "name"
380
- ]
235
+ "type": "array",
236
+ "items": {
237
+ "type": "string"
238
+ }
381
239
  }
382
- ]
240
+ ],
241
+ "description": "Overwrite existing files",
242
+ "default": false
243
+ },
244
+ "overwriteHtml": {
245
+ "type": "boolean",
246
+ "default": false
247
+ },
248
+ "replace": {
249
+ "type": "boolean",
250
+ "default": false
383
251
  }
384
252
  }
385
253
  },
@@ -409,98 +277,99 @@
409
277
  }
410
278
  ]
411
279
  }
412
- ],
413
- "definitions": {
414
- "type": {
415
- "oneOf": [
416
- {
280
+ ]
281
+ },
282
+ "type": {
283
+ "oneOf": [
284
+ {
285
+ "type": "string"
286
+ },
287
+ {
288
+ "type": "object",
289
+ "properties": {
290
+ "name": {
417
291
  "type": "string"
418
292
  },
419
- {
293
+ "isTypeOnly": {
294
+ "type": "boolean"
295
+ },
296
+ "moduleSpecifier": {
297
+ "type": "string"
298
+ },
299
+ "namedImport": {
300
+ "type": "string"
301
+ },
302
+ "namespaceImport": {
303
+ "type": "string"
304
+ },
305
+ "defaultImport": {
306
+ "type": "string"
307
+ }
308
+ },
309
+ "required": [
310
+ "name"
311
+ ]
312
+ }
313
+ ]
314
+ },
315
+ "upstream": {
316
+ "oneOf": [
317
+ {
318
+ "type": "object",
319
+ "properties": {
320
+ "kind": {
321
+ "type": "string",
322
+ "enum": [
323
+ "open-api"
324
+ ]
325
+ },
326
+ "operationId": {
327
+ "type": "string"
328
+ },
329
+ "scope": {
330
+ "type": "string"
331
+ },
332
+ "mapper": {
420
333
  "type": "object",
421
334
  "properties": {
422
- "name": {
335
+ "pageIndex": {
423
336
  "type": "string"
424
337
  },
425
- "isTypeOnly": {
426
- "type": "boolean"
427
- },
428
- "moduleSpecifier": {
338
+ "pageSize": {
429
339
  "type": "string"
430
340
  },
431
- "namedImport": {
341
+ "sortBy": {
432
342
  "type": "string"
433
343
  },
434
- "namespaceImport": {
344
+ "sortDirection": {
435
345
  "type": "string"
436
346
  },
437
- "defaultImport": {
347
+ "list": {
438
348
  "type": "string"
439
- }
440
- },
441
- "required": [
442
- "name"
443
- ]
444
- }
445
- ]
446
- },
447
- "value": {
448
- "oneOf": [
449
- {
450
- "type": "string"
451
- },
452
- {
453
- "type": "object",
454
- "properties": {
455
- "type": {
456
- "$ref": "#/definitions/type"
457
349
  },
458
- "value": {
459
- "type": "string"
460
- }
461
- },
462
- "required": [
463
- "value"
464
- ]
465
- }
466
- ],
467
- "definitions": {
468
- "type": {
469
- "oneOf": [
470
- {
350
+ "total": {
471
351
  "type": "string"
472
352
  },
473
- {
353
+ "filter": {
474
354
  "type": "object",
475
355
  "properties": {
476
- "name": {
477
- "type": "string"
478
- },
479
- "isTypeOnly": {
480
- "type": "boolean"
481
- },
482
- "moduleSpecifier": {
483
- "type": "string"
484
- },
485
- "namedImport": {
356
+ "eq": {
486
357
  "type": "string"
487
358
  },
488
- "namespaceImport": {
489
- "type": "string"
490
- },
491
- "defaultImport": {
359
+ "join": {
492
360
  "type": "string"
493
361
  }
494
- },
495
- "required": [
496
- "name"
497
- ]
362
+ }
498
363
  }
499
- ]
364
+ }
500
365
  }
501
- }
366
+ },
367
+ "required": [
368
+ "kind",
369
+ "operationId"
370
+ ]
502
371
  }
503
- }
372
+ ]
504
373
  },
505
374
  "value": {
506
375
  "oneOf": [
@@ -521,42 +390,7 @@
521
390
  "value"
522
391
  ]
523
392
  }
524
- ],
525
- "definitions": {
526
- "type": {
527
- "oneOf": [
528
- {
529
- "type": "string"
530
- },
531
- {
532
- "type": "object",
533
- "properties": {
534
- "name": {
535
- "type": "string"
536
- },
537
- "isTypeOnly": {
538
- "type": "boolean"
539
- },
540
- "moduleSpecifier": {
541
- "type": "string"
542
- },
543
- "namedImport": {
544
- "type": "string"
545
- },
546
- "namespaceImport": {
547
- "type": "string"
548
- },
549
- "defaultImport": {
550
- "type": "string"
551
- }
552
- },
553
- "required": [
554
- "name"
555
- ]
556
- }
557
- ]
558
- }
559
- }
393
+ ]
560
394
  }
561
395
  }
562
396
  }