@roxyapi/ui 0.21.0 → 0.22.0

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.
@@ -44,11 +44,6 @@ export const ENDPOINT_BINDINGS: Record<string, EndpointBinding[]> = {
44
44
  },
45
45
  ],
46
46
  'roxy-aspects-table': [
47
- {
48
- operationId: 'detectAspectPatterns',
49
- method: 'POST',
50
- path: '/astrology/aspect-patterns',
51
- },
52
47
  {
53
48
  operationId: 'calculateAspects',
54
49
  method: 'POST',
@@ -59,6 +54,11 @@ export const ENDPOINT_BINDINGS: Record<string, EndpointBinding[]> = {
59
54
  method: 'POST',
60
55
  path: '/astrology/transit-aspects',
61
56
  },
57
+ {
58
+ operationId: 'detectAspectPatterns',
59
+ method: 'POST',
60
+ path: '/astrology/aspect-patterns',
61
+ },
62
62
  ],
63
63
  'roxy-astrocartography-map': [
64
64
  {
@@ -82,14 +82,6 @@ export const ENDPOINT_BINDINGS: Record<string, EndpointBinding[]> = {
82
82
  },
83
83
  ],
84
84
  'roxy-biorhythm-chart': [
85
- {
86
- operationId: 'getCriticalDays',
87
- method: 'POST',
88
- path: '/biorhythm/critical-days',
89
- attrs: {
90
- mode: 'critical-days',
91
- },
92
- },
93
85
  {
94
86
  operationId: 'getDailyBiorhythm',
95
87
  method: 'POST',
@@ -106,6 +98,14 @@ export const ENDPOINT_BINDINGS: Record<string, EndpointBinding[]> = {
106
98
  mode: 'forecast',
107
99
  },
108
100
  },
101
+ {
102
+ operationId: 'getCriticalDays',
103
+ method: 'POST',
104
+ path: '/biorhythm/critical-days',
105
+ attrs: {
106
+ mode: 'critical-days',
107
+ },
108
+ },
109
109
  ],
110
110
  'roxy-bodygraph': [
111
111
  {
@@ -138,19 +138,19 @@ export const ENDPOINT_BINDINGS: Record<string, EndpointBinding[]> = {
138
138
  },
139
139
  },
140
140
  {
141
- operationId: 'calculateBioCompatibility',
141
+ operationId: 'calculateNumCompatibility',
142
142
  method: 'POST',
143
- path: '/biorhythm/compatibility',
143
+ path: '/numerology/compatibility',
144
144
  attrs: {
145
- mode: 'biorhythm',
145
+ mode: 'numerology',
146
146
  },
147
147
  },
148
148
  {
149
- operationId: 'calculateNumCompatibility',
149
+ operationId: 'calculateBioCompatibility',
150
150
  method: 'POST',
151
- path: '/numerology/compatibility',
151
+ path: '/biorhythm/compatibility',
152
152
  attrs: {
153
- mode: 'numerology',
153
+ mode: 'biorhythm',
154
154
  },
155
155
  },
156
156
  ],
@@ -180,19 +180,19 @@ export const ENDPOINT_BINDINGS: Record<string, EndpointBinding[]> = {
180
180
  ],
181
181
  'roxy-dasha-timeline': [
182
182
  {
183
- operationId: 'getCurrentDasha',
183
+ operationId: 'getMajorDashas',
184
184
  method: 'POST',
185
- path: '/vedic-astrology/dasha/current',
185
+ path: '/vedic-astrology/dasha/major',
186
186
  attrs: {
187
- period: 'current',
187
+ period: 'major',
188
188
  },
189
189
  },
190
190
  {
191
- operationId: 'getMajorDashas',
191
+ operationId: 'getCurrentDasha',
192
192
  method: 'POST',
193
- path: '/vedic-astrology/dasha/major',
193
+ path: '/vedic-astrology/dasha/current',
194
194
  attrs: {
195
- period: 'major',
195
+ period: 'current',
196
196
  },
197
197
  },
198
198
  {
@@ -242,19 +242,19 @@ export const ENDPOINT_BINDINGS: Record<string, EndpointBinding[]> = {
242
242
  ],
243
243
  'roxy-dosha-card': [
244
244
  {
245
- operationId: 'checkKalsarpaDosha',
245
+ operationId: 'checkManglikDosha',
246
246
  method: 'POST',
247
- path: '/vedic-astrology/dosha/kalsarpa',
247
+ path: '/vedic-astrology/dosha/manglik',
248
248
  attrs: {
249
- type: 'kalsarpa',
249
+ type: 'manglik',
250
250
  },
251
251
  },
252
252
  {
253
- operationId: 'checkManglikDosha',
253
+ operationId: 'checkKalsarpaDosha',
254
254
  method: 'POST',
255
- path: '/vedic-astrology/dosha/manglik',
255
+ path: '/vedic-astrology/dosha/kalsarpa',
256
256
  attrs: {
257
- type: 'manglik',
257
+ type: 'kalsarpa',
258
258
  },
259
259
  },
260
260
  {
@@ -296,14 +296,14 @@ export const ENDPOINT_BINDINGS: Record<string, EndpointBinding[]> = {
296
296
  ],
297
297
  'roxy-forecast-timeline': [
298
298
  {
299
- operationId: 'findSignificantDates',
299
+ operationId: 'generateTimeline',
300
300
  method: 'POST',
301
- path: '/forecast/significant-dates',
301
+ path: '/forecast/timeline',
302
302
  },
303
303
  {
304
- operationId: 'generateTimeline',
304
+ operationId: 'findSignificantDates',
305
305
  method: 'POST',
306
- path: '/forecast/timeline',
306
+ path: '/forecast/significant-dates',
307
307
  },
308
308
  {
309
309
  operationId: 'forecastTransits',
@@ -341,14 +341,14 @@ export const ENDPOINT_BINDINGS: Record<string, EndpointBinding[]> = {
341
341
  ],
342
342
  'roxy-hd-type-card': [
343
343
  {
344
- operationId: 'calculateProfile',
344
+ operationId: 'calculateType',
345
345
  method: 'POST',
346
- path: '/human-design/profile',
346
+ path: '/human-design/type',
347
347
  },
348
348
  {
349
- operationId: 'calculateType',
349
+ operationId: 'calculateProfile',
350
350
  method: 'POST',
351
- path: '/human-design/type',
351
+ path: '/human-design/profile',
352
352
  },
353
353
  ],
354
354
  'roxy-hd-variables': [
@@ -389,19 +389,19 @@ export const ENDPOINT_BINDINGS: Record<string, EndpointBinding[]> = {
389
389
  },
390
390
  },
391
391
  {
392
- operationId: 'getMonthlyHoroscope',
392
+ operationId: 'getWeeklyHoroscope',
393
393
  method: 'GET',
394
- path: '/astrology/horoscope/{sign}/monthly',
394
+ path: '/astrology/horoscope/{sign}/weekly',
395
395
  attrs: {
396
- period: 'monthly',
396
+ period: 'weekly',
397
397
  },
398
398
  },
399
399
  {
400
- operationId: 'getWeeklyHoroscope',
400
+ operationId: 'getMonthlyHoroscope',
401
401
  method: 'GET',
402
- path: '/astrology/horoscope/{sign}/weekly',
402
+ path: '/astrology/horoscope/{sign}/monthly',
403
403
  attrs: {
404
- period: 'weekly',
404
+ period: 'monthly',
405
405
  },
406
406
  },
407
407
  ],
@@ -434,14 +434,6 @@ export const ENDPOINT_BINDINGS: Record<string, EndpointBinding[]> = {
434
434
  },
435
435
  ],
436
436
  'roxy-moon-phase': [
437
- {
438
- operationId: 'getMoonCalendar',
439
- method: 'GET',
440
- path: '/astrology/moon-phase/calendar/{year}/{month}',
441
- attrs: {
442
- mode: 'calendar',
443
- },
444
- },
445
437
  {
446
438
  operationId: 'getCurrentMoonPhase',
447
439
  method: 'GET',
@@ -458,6 +450,14 @@ export const ENDPOINT_BINDINGS: Record<string, EndpointBinding[]> = {
458
450
  mode: 'upcoming',
459
451
  },
460
452
  },
453
+ {
454
+ operationId: 'getMoonCalendar',
455
+ method: 'GET',
456
+ path: '/astrology/moon-phase/calendar/{year}/{month}',
457
+ attrs: {
458
+ mode: 'calendar',
459
+ },
460
+ },
461
461
  ],
462
462
  'roxy-nakshatra-card': [
463
463
  {
@@ -475,43 +475,43 @@ export const ENDPOINT_BINDINGS: Record<string, EndpointBinding[]> = {
475
475
  ],
476
476
  'roxy-numerology-card': [
477
477
  {
478
- operationId: 'calculateBirthDay',
478
+ operationId: 'calculateLifePath',
479
479
  method: 'POST',
480
- path: '/numerology/birth-day',
480
+ path: '/numerology/life-path',
481
481
  attrs: {
482
- type: 'birth-day',
482
+ type: 'life-path',
483
483
  },
484
484
  },
485
485
  {
486
- operationId: 'generateNumerologyChart',
486
+ operationId: 'calculateExpression',
487
487
  method: 'POST',
488
- path: '/numerology/chart',
488
+ path: '/numerology/expression',
489
489
  attrs: {
490
- type: 'chart',
490
+ type: 'expression',
491
491
  },
492
492
  },
493
493
  {
494
- operationId: 'getDailyNumber',
494
+ operationId: 'calculateSoulUrge',
495
495
  method: 'POST',
496
- path: '/numerology/daily',
496
+ path: '/numerology/soul-urge',
497
497
  attrs: {
498
- type: 'daily',
498
+ type: 'soul-urge',
499
499
  },
500
500
  },
501
501
  {
502
- operationId: 'calculateExpression',
502
+ operationId: 'calculatePersonality',
503
503
  method: 'POST',
504
- path: '/numerology/expression',
504
+ path: '/numerology/personality',
505
505
  attrs: {
506
- type: 'expression',
506
+ type: 'personality',
507
507
  },
508
508
  },
509
509
  {
510
- operationId: 'calculateLifePath',
510
+ operationId: 'calculateBirthDay',
511
511
  method: 'POST',
512
- path: '/numerology/life-path',
512
+ path: '/numerology/birth-day',
513
513
  attrs: {
514
- type: 'life-path',
514
+ type: 'birth-day',
515
515
  },
516
516
  },
517
517
  {
@@ -522,6 +522,14 @@ export const ENDPOINT_BINDINGS: Record<string, EndpointBinding[]> = {
522
522
  type: 'maturity',
523
523
  },
524
524
  },
525
+ {
526
+ operationId: 'getDailyNumber',
527
+ method: 'POST',
528
+ path: '/numerology/daily',
529
+ attrs: {
530
+ type: 'daily',
531
+ },
532
+ },
525
533
  {
526
534
  operationId: 'calculatePersonalDay',
527
535
  method: 'POST',
@@ -547,23 +555,23 @@ export const ENDPOINT_BINDINGS: Record<string, EndpointBinding[]> = {
547
555
  },
548
556
  },
549
557
  {
550
- operationId: 'calculatePersonality',
558
+ operationId: 'generateNumerologyChart',
551
559
  method: 'POST',
552
- path: '/numerology/personality',
560
+ path: '/numerology/chart',
553
561
  attrs: {
554
- type: 'personality',
562
+ type: 'chart',
555
563
  },
556
564
  },
565
+ ],
566
+ 'roxy-panchang-table': [
557
567
  {
558
- operationId: 'calculateSoulUrge',
568
+ operationId: 'getDetailedPanchang',
559
569
  method: 'POST',
560
- path: '/numerology/soul-urge',
570
+ path: '/vedic-astrology/panchang/detailed',
561
571
  attrs: {
562
- type: 'soul-urge',
572
+ detail: 'detailed',
563
573
  },
564
574
  },
565
- ],
566
- 'roxy-panchang-table': [
567
575
  {
568
576
  operationId: 'getBasicPanchang',
569
577
  method: 'POST',
@@ -572,21 +580,8 @@ export const ENDPOINT_BINDINGS: Record<string, EndpointBinding[]> = {
572
580
  detail: 'basic',
573
581
  },
574
582
  },
575
- {
576
- operationId: 'getDetailedPanchang',
577
- method: 'POST',
578
- path: '/vedic-astrology/panchang/detailed',
579
- attrs: {
580
- detail: 'detailed',
581
- },
582
- },
583
583
  ],
584
584
  'roxy-positions-table': [
585
- {
586
- operationId: 'calculateArabicLots',
587
- method: 'POST',
588
- path: '/astrology/arabic-lots',
589
- },
590
585
  {
591
586
  operationId: 'generateAsteroids',
592
587
  method: 'POST',
@@ -607,6 +602,11 @@ export const ENDPOINT_BINDINGS: Record<string, EndpointBinding[]> = {
607
602
  method: 'POST',
608
603
  path: '/astrology/solar-arc',
609
604
  },
605
+ {
606
+ operationId: 'calculateArabicLots',
607
+ method: 'POST',
608
+ path: '/astrology/arabic-lots',
609
+ },
610
610
  ],
611
611
  'roxy-profection-card': [
612
612
  {
@@ -616,25 +616,20 @@ export const ENDPOINT_BINDINGS: Record<string, EndpointBinding[]> = {
616
616
  },
617
617
  ],
618
618
  'roxy-reference-card': [
619
- {
620
- operationId: 'getPlanetMeaning',
621
- method: 'GET',
622
- path: '/astrology/planet-meanings/{id}',
623
- },
624
619
  {
625
620
  operationId: 'getZodiacSign',
626
621
  method: 'GET',
627
622
  path: '/astrology/signs/{id}',
628
623
  },
629
624
  {
630
- operationId: 'getCenter',
625
+ operationId: 'getPlanetMeaning',
631
626
  method: 'GET',
632
- path: '/human-design/centers/{id}',
627
+ path: '/astrology/planet-meanings/{id}',
633
628
  },
634
629
  {
635
- operationId: 'getGate',
630
+ operationId: 'getRashi',
636
631
  method: 'GET',
637
- path: '/human-design/gates/{number}',
632
+ path: '/vedic-astrology/rashis/{id}',
638
633
  },
639
634
  {
640
635
  operationId: 'getTrigram',
@@ -642,9 +637,14 @@ export const ENDPOINT_BINDINGS: Record<string, EndpointBinding[]> = {
642
637
  path: '/iching/trigrams/{id}',
643
638
  },
644
639
  {
645
- operationId: 'getCompoundNumber',
640
+ operationId: 'getGate',
646
641
  method: 'GET',
647
- path: '/numerology/compound-number/{number}',
642
+ path: '/human-design/gates/{number}',
643
+ },
644
+ {
645
+ operationId: 'getCenter',
646
+ method: 'GET',
647
+ path: '/human-design/centers/{id}',
648
648
  },
649
649
  {
650
650
  operationId: 'getNumberMeaning',
@@ -652,14 +652,14 @@ export const ENDPOINT_BINDINGS: Record<string, EndpointBinding[]> = {
652
652
  path: '/numerology/meanings/{number}',
653
653
  },
654
654
  {
655
- operationId: 'getAvastha',
655
+ operationId: 'getCompoundNumber',
656
656
  method: 'GET',
657
- path: '/vedic-astrology/avasthas/{id}',
657
+ path: '/numerology/compound-number/{number}',
658
658
  },
659
659
  {
660
- operationId: 'getRashi',
660
+ operationId: 'getAvastha',
661
661
  method: 'GET',
662
- path: '/vedic-astrology/rashis/{id}',
662
+ path: '/vedic-astrology/avasthas/{id}',
663
663
  },
664
664
  ],
665
665
  'roxy-relocation-wheel': [
@@ -699,19 +699,11 @@ export const ENDPOINT_BINDINGS: Record<string, EndpointBinding[]> = {
699
699
  ],
700
700
  'roxy-tarot-spread': [
701
701
  {
702
- operationId: 'drawCards',
703
- method: 'POST',
704
- path: '/tarot/draw',
705
- attrs: {
706
- spread: 'draw',
707
- },
708
- },
709
- {
710
- operationId: 'castCareerSpread',
702
+ operationId: 'castThreeCard',
711
703
  method: 'POST',
712
- path: '/tarot/spreads/career',
704
+ path: '/tarot/spreads/three-card',
713
705
  attrs: {
714
- spread: 'career',
706
+ spread: 'three-card',
715
707
  },
716
708
  },
717
709
  {
@@ -723,27 +715,27 @@ export const ENDPOINT_BINDINGS: Record<string, EndpointBinding[]> = {
723
715
  },
724
716
  },
725
717
  {
726
- operationId: 'castCustomSpread',
718
+ operationId: 'castLoveSpread',
727
719
  method: 'POST',
728
- path: '/tarot/spreads/custom',
720
+ path: '/tarot/spreads/love',
729
721
  attrs: {
730
- spread: 'custom',
722
+ spread: 'love',
731
723
  },
732
724
  },
733
725
  {
734
- operationId: 'castLoveSpread',
726
+ operationId: 'castCareerSpread',
735
727
  method: 'POST',
736
- path: '/tarot/spreads/love',
728
+ path: '/tarot/spreads/career',
737
729
  attrs: {
738
- spread: 'love',
730
+ spread: 'career',
739
731
  },
740
732
  },
741
733
  {
742
- operationId: 'castThreeCard',
734
+ operationId: 'castCustomSpread',
743
735
  method: 'POST',
744
- path: '/tarot/spreads/three-card',
736
+ path: '/tarot/spreads/custom',
745
737
  attrs: {
746
- spread: 'three-card',
738
+ spread: 'custom',
747
739
  },
748
740
  },
749
741
  {
@@ -754,6 +746,14 @@ export const ENDPOINT_BINDINGS: Record<string, EndpointBinding[]> = {
754
746
  spread: 'yes-no',
755
747
  },
756
748
  },
749
+ {
750
+ operationId: 'drawCards',
751
+ method: 'POST',
752
+ path: '/tarot/draw',
753
+ attrs: {
754
+ spread: 'draw',
755
+ },
756
+ },
757
757
  ],
758
758
  'roxy-transits-table': [
759
759
  {
@@ -2967,7 +2967,7 @@ export type BirthChartResponse = {
2967
2967
  */
2968
2968
  yogas?: Array<{
2969
2969
  /**
2970
- * Glossary id (lowercase, kebab-case) matching an entry in the 300-entry planetary-yoga catalog. Use with GET /yoga/{id} to retrieve the full glossary text.
2970
+ * Glossary id (lowercase, kebab-case) matching an entry in the 301-entry planetary-yoga catalog. Use with GET /yoga/{id} to retrieve the full glossary text.
2971
2971
  */
2972
2972
  id: string;
2973
2973
  /**
@@ -4017,7 +4017,7 @@ export type SadhesatiRequest = {
4017
4017
 
4018
4018
  export type YogaDetail = {
4019
4019
  /**
4020
- * Glossary id (lowercase, kebab-case) matching an entry in the 300-entry planetary-yoga catalog. Use with GET /yoga/{id} to retrieve the full glossary text.
4020
+ * Glossary id (lowercase, kebab-case) matching an entry in the 301-entry planetary-yoga catalog. Use with GET /yoga/{id} to retrieve the full glossary text.
4021
4021
  */
4022
4022
  id: string;
4023
4023
  /**
@@ -4048,7 +4048,7 @@ export type YogaDetectResponse = {
4048
4048
  */
4049
4049
  yogas: Array<{
4050
4050
  /**
4051
- * Glossary id (lowercase, kebab-case) matching an entry in the 300-entry planetary-yoga catalog. Use with GET /yoga/{id} to retrieve the full glossary text.
4051
+ * Glossary id (lowercase, kebab-case) matching an entry in the 301-entry planetary-yoga catalog. Use with GET /yoga/{id} to retrieve the full glossary text.
4052
4052
  */
4053
4053
  id: string;
4054
4054
  /**
@@ -35055,11 +35055,11 @@ export type CastLoveSpreadResponse = CastLoveSpreadResponses[keyof CastLoveSprea
35055
35055
  export type CastCareerSpreadData = {
35056
35056
  body: {
35057
35057
  /**
35058
- * Optional querent question to focus the career spread. It is echoed back on the reading and gives the five career positions their context. Omit for general work and vocation guidance.
35058
+ * Optional querent question to focus the career spread. It is echoed back on the reading and gives the seven career positions their context. Omit for general work and vocation guidance.
35059
35059
  */
35060
35060
  question?: string;
35061
35061
  /**
35062
- * Optional seed for reproducible results. The same seed always draws the same five cards into the same career positions, which is what lets a reading be shared or re-rendered. Omit for a random draw.
35062
+ * Optional seed for reproducible results. The same seed always draws the same seven cards into the same career positions, which is what lets a reading be shared or re-rendered. Omit for a random draw.
35063
35063
  */
35064
35064
  seed?: string;
35065
35065
  };
@@ -109,6 +109,47 @@ export const TILE_MAX = 12;
109
109
  /** The latitude+longitude+timezone trio the form suppresses in favour of a city search. Centralised so the render path and tests agree. */
110
110
  export const LOCATION_TRIO = ['latitude', 'longitude', 'timezone'] as const;
111
111
 
112
+ /**
113
+ * The coordinate pair that DEFINES a location group. `timezone` is deliberately absent.
114
+ *
115
+ * @remarks
116
+ * A group qualifies for a city search on latitude+longitude alone, because a timezone is not always
117
+ * part of the group that owns the coordinates: `generateRelocationChart` carries two coordinate
118
+ * pairs and exactly ONE top-level `timezone`, which is the BIRTH timezone (relocating does not move
119
+ * the birth moment), so the relocation pair correctly has no timezone of its own. Requiring all
120
+ * three would leave that operation rendering raw number inputs, which is the bug this exists to
121
+ * prevent.
122
+ */
123
+ export const LOCATION_PAIR = ['latitude', 'longitude'] as const;
124
+
125
+ /**
126
+ * Split a flat coordinate property into its group prefix and canonical leaf name, or `null` when the
127
+ * name is not a prefixed coordinate.
128
+ *
129
+ * @remarks
130
+ * **Two shapes carry two locations in one request and this handles the second one.** Most
131
+ * multi-location operations nest per person (`person1`/`person2`, `personA`/`personB`), so object
132
+ * nesting alone already groups them. `generateRelocationChart` is the only operation in the spec
133
+ * that instead puts both pairs at the TOP level and distinguishes them by a name prefix
134
+ * (`birthLatitude` / `relocationLatitude`). Keying the grouping off the prefix as well as off the
135
+ * nesting means both shapes converge on the same group machinery, and a future `partnerLatitude`
136
+ * needs no code change.
137
+ *
138
+ * Matching is deliberately restricted to the coordinate pair. A prefix is NOT harvested from any
139
+ * other field name, so `birthDate` stays an ordinary field in the flat group and does not invent a
140
+ * phantom `birth` group with a lone date in it.
141
+ */
142
+ export function splitCoordinateName(
143
+ name: string,
144
+ ): { group: string; leaf: (typeof LOCATION_PAIR)[number] } | null {
145
+ const m = name.match(/^(.+?)(Latitude|Longitude)$/);
146
+ if (!m) return null;
147
+ return {
148
+ group: m[1],
149
+ leaf: m[2].toLowerCase() as (typeof LOCATION_PAIR)[number],
150
+ };
151
+ }
152
+
112
153
  /** Canonical lowercase zodiac set, derived from {@link SIGNS_ORDER} so sign detection and the glyph map can never disagree. */
113
154
  const ZODIAC_LOWER = SIGNS_ORDER.map((s) => s.toLowerCase());
114
155
 
@@ -232,8 +273,23 @@ export function buildFormModel(
232
273
  );
233
274
  }
234
275
  } else {
276
+ // A prefixed coordinate joins a group named after its prefix and reports the
277
+ // canonical leaf name, so the trio logic and the city search match it unchanged.
278
+ // `key` stays the ORIGINAL property name because it is the storage and wire
279
+ // identity: rewriting it to `birth.latitude` would serialise a body the API
280
+ // rejects.
281
+ const coord = splitCoordinateName(name);
235
282
  fields.push(
236
- toField(name, resolved, { key: name, required: required.has(name) }),
283
+ coord
284
+ ? toField(coord.leaf, resolved, {
285
+ key: name,
286
+ group: coord.group,
287
+ required: required.has(name),
288
+ })
289
+ : toField(name, resolved, {
290
+ key: name,
291
+ required: required.has(name),
292
+ }),
237
293
  );
238
294
  }
239
295
  }
package/src/version.ts CHANGED
@@ -1,2 +1,2 @@
1
1
  // Generated by scripts/sync-version.ts. Do not edit.
2
- export const ROXY_UI_VERSION = '0.21.0';
2
+ export const ROXY_UI_VERSION = '0.22.0';