ui-core-abv 0.6.76 → 0.7.0

package/lib/components/dynamic-form/form/dynamic-form.component.d.ts

@@ -1,5 +1,5 @@
 import { NgZone, OnDestroy } from '@angular/core';
-import { AbstractControl, FormGroup } from '@angular/forms';
+import { AbstractControl, FormArray, FormGroup } from '@angular/forms';
 import { Observable } from 'rxjs';
 import { ButtonColor } from '../../button/button.component';
 import { FormField, SelectOptionsResolver } from '../form.models';
@@ -26,6 +26,7 @@ export declare class UicDynamicFormComponent implements OnDestroy {
     private voiceStopTimer;
     set fields(value: FormField[]);
     get fields(): FormField[];
+    isSubForm: boolean;
     set form(value: FormGroup);
     get form(): FormGroup;
     set disabled(value: boolean);
@@ -37,6 +38,7 @@ export declare class UicDynamicFormComponent implements OnDestroy {
     listeningField: string | null;
     readonly fieldStates: import("@angular/core").Signal<DynamicFieldState[]>;
     readonly visibleFieldStates: import("@angular/core").Signal<DynamicFieldState[]>;
+    private readonly formSyncEffect;
     private readonly fieldStateSyncEffect;
     readonly colorToIcon: Record<string, string>;
     constructor(ngZone: NgZone);
@@ -46,8 +48,15 @@ export declare class UicDynamicFormComponent implements OnDestroy {
     private syncFieldEnabledState;
     private getClearValue;
     private matchesVisibilityRule;
+    private findFieldByName;
+    private isEmptyValue;
+    private compareVisibilityValues;
+    private toComparableVisibilityValue;
+    private getPhoneComparableValue;
+    private arrayIncludesVisibilityValue;
     private parseBooleanLike;
     getControlErrorMessages(control: AbstractControl | null, field: FormField): string[];
+    asFormArray(control: AbstractControl | null): FormArray;
     isListening(fieldName: string): boolean;
     private readonly errorMessages;
     getInputColor(field: FormField, value: string | number): ButtonColor;
@@ -65,6 +74,6 @@ export declare class UicDynamicFormComponent implements OnDestroy {
     private scheduleVoiceStop;
     voiceToText(target: HTMLTextAreaElement, fieldName: string): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<UicDynamicFormComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<UicDynamicFormComponent, "ui-dynamic-form", never, { "fields": { "alias": "fields"; "required": false; }; "form": { "alias": "form"; "required": true; }; "disabled": { "alias": "disabled"; "required": false; }; "voiceToTextSilenceMs": { "alias": "voiceToTextSilenceMs"; "required": false; }; "cols": { "alias": "cols"; "required": false; }; "fileUidResolverFn": { "alias": "fileUidResolverFn"; "required": false; }; "selectOptionsResolver": { "alias": "selectOptionsResolver"; "required": false; }; }, {}, never, never, true, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<UicDynamicFormComponent, "ui-dynamic-form", never, { "fields": { "alias": "fields"; "required": false; }; "isSubForm": { "alias": "isSubForm"; "required": false; }; "form": { "alias": "form"; "required": true; }; "disabled": { "alias": "disabled"; "required": false; }; "voiceToTextSilenceMs": { "alias": "voiceToTextSilenceMs"; "required": false; }; "cols": { "alias": "cols"; "required": false; }; "fileUidResolverFn": { "alias": "fileUidResolverFn"; "required": false; }; "selectOptionsResolver": { "alias": "selectOptionsResolver"; "required": false; }; }, {}, never, never, true, never>;
 }
 export {};

package/lib/components/dynamic-form/form-wrapper/form-wrapper.component.d.ts

@@ -36,6 +36,8 @@ export declare class UicFormWrapperComponent implements OnInit, OnChanges, OnDes
     ngOnChanges(changes: SimpleChanges): void;
     ngOnDestroy(): void;
     private buildForm;
+    private buildRepeaterGroup;
+    private repeaterArrayValidator;
     private focusConfiguredField;
     private findFocusableFieldElement;
     private updateDisabledState;
@@ -45,6 +47,9 @@ export declare class UicFormWrapperComponent implements OnInit, OnChanges, OnDes
     private handleFormChange;
     private updateFieldOptions;
     private updateOptionsSources;
+    private updateRepeaterSubFieldOptionsSources;
+    private resolveRepeaterSubFieldOptionsSource;
+    private updateRepeaterSubFieldOptionsState;
     private updateDependentOptionsSources;
     private resolveOptionsSourceField;
     private handleOptionsSourceError;

package/lib/components/dynamic-form/form.models.d.ts

@@ -85,6 +85,12 @@ export interface FormField {
     visibilityRules?: FieldVisibilityRule[] | null;
     iaValidation?: boolean;
     iaValidationPrompt?: string;
+    repeaterFields?: FormField[];
+    repeaterMinItems?: number;
+    repeaterMaxItems?: number;
+    repeaterAddLabel?: string;
+    repeaterRemoveLabel?: string;
+    repeaterItemTitle?: string;
 }
 export interface FieldVisibilityRule {
     fieldName: string;
@@ -92,16 +98,25 @@ export interface FieldVisibilityRule {
     operator: VisibilityOperators;
     value: any;
 }
-export type VisibilityOperators = 'equals' | 'notEquals' | 'greaterThan' | 'lessThan' | 'includes' | 'notIncludes';
+export type VisibilityOperators = 'equals' | 'notEquals' | 'greaterThan' | 'lessThan' | 'includes' | 'notIncludes' | 'isEmpty' | 'isNotEmpty';
+export interface FieldVisibilityConfig {
+    outputType: string;
+    operators: VisibilityOperators[];
+}
 export interface FieldConfig {
     value: FieldType;
     icon: string;
     detail: string;
     label: string;
     properties: string[];
+    visibility: FieldVisibilityConfig;
 }
+export declare const VISIBILITY_OPERATOR_OPTIONS: {
+    id: VisibilityOperators;
+    text: string;
+}[];
 export declare const FIELDS_CONFIG: FieldConfig[];
-export type FieldType = 'text' | 'number' | 'phone' | 'date' | 'time' | 'select' | 'radio' | 'checkbox' | 'switch' | 'textarea' | 'pool' | 'file' | 'multyselect' | 'searcher' | 'slider';
+export type FieldType = 'text' | 'number' | 'phone' | 'date' | 'time' | 'select' | 'radio' | 'checkbox' | 'switch' | 'textarea' | 'pool' | 'file' | 'multyselect' | 'searcher' | 'slider' | 'repeater';
 export interface FormResult {
     result: boolean;
     form: uicFormValuesRecord | null;

package/lib/components/dynamic-form/repeater/repeater.component.d.ts

@@ -0,0 +1,21 @@
+import { OnInit } from '@angular/core';
+import { FormArray, FormGroup } from '@angular/forms';
+import { FormField } from '../form.models';
+import * as i0 from "@angular/core";
+export declare class UicRepeaterComponent implements OnInit {
+    private readonly fb;
+    formArray: FormArray;
+    field: FormField;
+    cols: number;
+    error?: string;
+    ngOnInit(): void;
+    getGroup(index: number): FormGroup;
+    addGroup(): void;
+    removeGroup(index: number): void;
+    get canAdd(): boolean;
+    get canRemove(): boolean;
+    private mapValidatorsFromField;
+    private getBlankValue;
+    static ɵfac: i0.ɵɵFactoryDeclaration<UicRepeaterComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<UicRepeaterComponent, "ui-repeater", never, { "formArray": { "alias": "formArray"; "required": true; }; "field": { "alias": "field"; "required": true; }; "cols": { "alias": "cols"; "required": false; }; "error": { "alias": "error"; "required": false; }; }, {}, never, never, true, never>;
+}

package/lib/components/user-formbuilder/block-editor/block-editor.component.d.ts

@@ -1,6 +1,6 @@
 import { CdkDragDrop } from '@angular/cdk/drag-drop';
 import { EditableBlock, EditableField } from '../user-formbuilder.component';
-import { FieldConfig } from '../../dynamic-form/form.models';
+import { FieldConfig, FieldType } from '../../dynamic-form/form.models';
 import * as i0 from "@angular/core";
 export declare class BlockEditorComponent {
     block: import("@angular/core").InputSignal<EditableBlock>;
@@ -8,13 +8,33 @@ export declare class BlockEditorComponent {
     addFieldRequest: import("@angular/core").OutputEmitterRef<FieldConfig>;
     deleteBlock: import("@angular/core").OutputEmitterRef<string>;
     notifySelectedField: import("@angular/core").OutputEmitterRef<EditableField | null>;
+    notifySelectedSubField: import("@angular/core").OutputEmitterRef<{
+        parentCode: string;
+        subField: EditableField;
+    } | null>;
     selectedFieldId: string | null;
+    selectedSubFieldCode: string | null;
+    visibilityParentFieldCodes: Set<string>;
+    excludeSubFieldTypes: FieldType[];
+    private expandedRepeaters;
+    isRepeaterExpanded(code: string): boolean;
+    toggleRepeater(code: string, event: Event): void;
+    isRepeaterParentSelected(field: EditableField): boolean;
     selectField(field: EditableField): void;
+    onSelectSubField(parentCode: string, subField: EditableField, event: Event): void;
+    addSubField(parentCode: string, type: FieldConfig): void;
+    deleteSubField(parentCode: string, sfCode: string, event: Event): void;
+    reorderSubFields(parentCode: string, event: CdkDragDrop<EditableField[]>): void;
+    private updateSubFields;
+    private generateSubFieldCode;
     changeTitle(newTitle: string): void;
     changeSubtitle(newSubtitle: string): void;
     addField(newFieldType: FieldConfig): void;
+    requestDeleteBlock(e: Event): void;
     deleteField(fieldCode: string, e: Event): void;
+    isVisibilityParent(fieldCode: string): boolean;
+    isBlockVisibilityParent(): boolean;
     reorderFields(event: CdkDragDrop<EditableField[]>): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<BlockEditorComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<BlockEditorComponent, "lib-block-editor", never, { "block": { "alias": "block"; "required": false; "isSignal": true; }; "selectedFieldId": { "alias": "selectedFieldId"; "required": false; }; }, { "blockChange": "blockChange"; "addFieldRequest": "addFieldRequest"; "deleteBlock": "deleteBlock"; "notifySelectedField": "notifySelectedField"; }, never, never, true, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<BlockEditorComponent, "lib-block-editor", never, { "block": { "alias": "block"; "required": false; "isSignal": true; }; "selectedFieldId": { "alias": "selectedFieldId"; "required": false; }; "selectedSubFieldCode": { "alias": "selectedSubFieldCode"; "required": false; }; "visibilityParentFieldCodes": { "alias": "visibilityParentFieldCodes"; "required": false; }; }, { "blockChange": "blockChange"; "addFieldRequest": "addFieldRequest"; "deleteBlock": "deleteBlock"; "notifySelectedField": "notifySelectedField"; "notifySelectedSubField": "notifySelectedSubField"; }, never, never, true, never>;
 }

package/lib/components/user-formbuilder/block-editor/field-editor/field-editor.component.d.ts

@@ -9,8 +9,10 @@ export declare class FieldEditorComponent {
     hasOptions: import("@angular/core").Signal<boolean>;
     hasOptionsSourceConfig: import("@angular/core").Signal<boolean>;
     hasExternalOptionsSource: import("@angular/core").Signal<boolean>;
+    isRepeater: import("@angular/core").Signal<boolean>;
     config: import("@angular/core").InputSignal<EditableField>;
     focusRequiredField: import("@angular/core").InputSignal<boolean>;
+    isSubField: import("@angular/core").InputSignal<boolean>;
     options: import("@angular/core").InputSignal<Record<string, AppSelectOption[]>>;
     hiddenSections: import("@angular/core").WritableSignal<string[]>;
     fieldChange: import("@angular/core").OutputEmitterRef<FormField>;
@@ -19,7 +21,8 @@ export declare class FieldEditorComponent {
     optionsSourceFields: import("@angular/core").Signal<FormField[]>;
     advancedFields: import("@angular/core").Signal<FormField[]>;
     styleFields: import("@angular/core").Signal<FormField[]>;
-    branchFields: FormField[];
+    branchDraftValues: import("@angular/core").WritableSignal<uicFormValuesRecord>;
+    branchFields: import("@angular/core").Signal<FormField[]>;
     initialValues: import("@angular/core").Signal<FormField>;
     branchInitialValues: import("@angular/core").Signal<uicFormValuesRecord>;
     fieldType: import("@angular/core").Signal<import("ui-core-abv").FieldConfig | undefined>;
@@ -38,6 +41,13 @@ export declare class FieldEditorComponent {
     private buildOptionsSourceFields;
     private prepareOptionsSourceField;
     private buildBranchFields;
+    private prepareBranchField;
+    private getAllowedVisibilityOperators;
+    private getDependencyFieldType;
+    private getBranchValueFieldType;
+    private ruleToBranchValues;
+    private clearCurrentVisibilityRule;
+    private isValueLessVisibilityOperator;
     static ɵfac: i0.ɵɵFactoryDeclaration<FieldEditorComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<FieldEditorComponent, "lib-field-editor", never, { "config": { "alias": "config"; "required": true; "isSignal": true; }; "focusRequiredField": { "alias": "focusRequiredField"; "required": false; "isSignal": true; }; "options": { "alias": "options"; "required": false; "isSignal": true; }; }, { "fieldChange": "fieldChange"; }, never, never, true, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<FieldEditorComponent, "lib-field-editor", never, { "config": { "alias": "config"; "required": true; "isSignal": true; }; "focusRequiredField": { "alias": "focusRequiredField"; "required": false; "isSignal": true; }; "isSubField": { "alias": "isSubField"; "required": false; "isSignal": true; }; "options": { "alias": "options"; "required": false; "isSignal": true; }; }, { "fieldChange": "fieldChange"; }, never, never, true, never>;
 }

package/lib/components/user-formbuilder/block-editor/field-type-selector/field-type-selector.component.d.ts

@@ -1,9 +1,10 @@
-import { FieldConfig } from '../../../dynamic-form/form.models';
+import { FieldConfig, FieldType } from '../../../dynamic-form/form.models';
 import * as i0 from "@angular/core";
 export declare class FieldTypeSelectorComponent {
-    types: FieldConfig[];
+    excludeTypes: import("@angular/core").InputSignal<FieldType[]>;
+    types: import("@angular/core").Signal<FieldConfig[]>;
     selectType: import("@angular/core").OutputEmitterRef<FieldConfig>;
     addField(type: FieldConfig): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<FieldTypeSelectorComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<FieldTypeSelectorComponent, "lib-field-type-selector", never, {}, { "selectType": "selectType"; }, never, never, true, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<FieldTypeSelectorComponent, "lib-field-type-selector", never, { "excludeTypes": { "alias": "excludeTypes"; "required": false; "isSignal": true; }; }, { "selectType": "selectType"; }, never, never, true, never>;
 }

package/lib/components/user-formbuilder/user-formbuilder.component.d.ts

@@ -8,6 +8,7 @@ export type EditableField = {
     type?: string;
     field?: FieldConfig;
     fieldData: FormField;
+    repeaterSubFields?: EditableField[];
 };
 export type EditableBlock = {
     id?: number | null;
@@ -39,9 +40,14 @@ export declare class UicUserFormbuilderComponent {
     editingSnapshot: import("@angular/core").WritableSignal<EditableForm | null>;
     isReadOnly: import("@angular/core").WritableSignal<boolean>;
     selectedField: import("@angular/core").WritableSignal<EditableField | null>;
+    editingSubField: import("@angular/core").WritableSignal<{
+        parentCode: string;
+        subField: EditableField;
+    } | null>;
     focusNewFieldCode: import("@angular/core").WritableSignal<string | null>;
     propertiesWidth: import("@angular/core").WritableSignal<number>;
     previewSchema: import("@angular/core").Signal<FormSchema>;
+    visibilityParentFieldCodes: import("@angular/core").Signal<Set<string>>;
     private isResizingProperties;
     private resizeStartX;
     private resizeStartWidth;
@@ -51,6 +57,11 @@ export declare class UicUserFormbuilderComponent {
     deleteBlock(code: string): void;
     addField(blockCode: string, newFieldType: FieldConfig): void;
     selectField(field: EditableField | null): void;
+    onSelectSubField(event: {
+        parentCode: string;
+        subField: EditableField;
+    } | null): void;
+    onSubFieldChange(updatedFieldData: FormField): void;
     startPropertiesResize(event: MouseEvent): void;
     onPropertiesResize(event: MouseEvent): void;
     stopPropertiesResize(): void;

package/lib/translate/dictionary.en.d.ts

@@ -158,6 +158,8 @@ export declare const DICTIONARY_EN: {
         readonly block_subtitle: "Subtitle";
         readonly add_block: "Add block";
         readonly delete_block: "Delete block";
+        readonly delete_block_dependency_blocked: "This block cannot be deleted because it contains fields that other fields depend on";
+        readonly delete_field_dependency_blocked: "This field cannot be deleted because another field depends on its value";
         readonly preview_form: "Preview";
         readonly submit_form: "Submit";
         readonly select_field_to_edit: "Select a field to edit its properties";
@@ -256,6 +258,13 @@ export declare const DICTIONARY_EN: {
             readonly selectSearchEnabled_tip: "Enables search among options";
             readonly selectNullable: "Allow empty option";
             readonly selectSearchEnabled: "Enable search";
+            readonly repeaterMinItems: "Minimum items";
+            readonly repeaterMinItems_tip: "Minimum number of required items";
+            readonly repeaterMaxItems: "Maximum items";
+            readonly repeaterMaxItems_tip: "Maximum number of allowed items";
+            readonly repeaterAddLabel: "Add button label";
+            readonly repeaterRemoveLabel: "Remove button label";
+            readonly repeaterItemTitle: "Item title";
         };
         readonly options_editor: {
             readonly title: "Options";
@@ -281,11 +290,26 @@ export declare const DICTIONARY_EN: {
             readonly delete: "Delete";
             readonly show_advanced: "Show advanced";
             readonly hide_advanced: "Hide advanced";
+            readonly subfields: "Sub-fields";
+        };
+        readonly visibility_operators: {
+            readonly equals: "Equals";
+            readonly notEquals: "Does not equal";
+            readonly greaterThan: "Is greater than";
+            readonly lessThan: "Is less than";
+            readonly includes: "Includes";
+            readonly notIncludes: "Does not include";
+            readonly isEmpty: "Is empty";
+            readonly isNotEmpty: "Is not empty";
         };
         readonly validation: {
             readonly duplicate_identifier: "The identifier \"{{identifier}}\" is used more than once.";
             readonly duplicate_identifier_title: "Validation error";
         };
+        readonly repeater: {
+            readonly no_subfields: "No sub-fields yet. Add one below.";
+            readonly add_subfield: "Add sub-field";
+        };
     };
     readonly validation: {
         readonly invalid: "{{field}} is invalid.";

package/lib/translate/dictionary.es.d.ts

@@ -158,6 +158,8 @@ export declare const DICTIONARY_ES: {
         readonly block_subtitle: "Subtítulo";
         readonly add_block: "Agregar bloque";
         readonly delete_block: "Eliminar bloque";
+        readonly delete_block_dependency_blocked: "Este bloque no se puede eliminar porque contiene campos de los que dependen otros campos";
+        readonly delete_field_dependency_blocked: "Este campo no se puede eliminar porque otro campo depende de su valor";
         readonly preview_form: "Vista previa";
         readonly submit_form: "Guardar";
         readonly select_field_to_edit: "Selecciona un campo para editar sus propiedades";
@@ -240,22 +242,29 @@ export declare const DICTIONARY_ES: {
             readonly iaValidation: "Validación IA";
             readonly iaValidationPrompt: "Prompt de validación IA";
             readonly searchApi_tip: "URL para obtener opciones de búsqueda";
-            readonly optionsSourceKey: "Fuente de opciones";
-            readonly optionsSourceKey_tip: "Clave lógica registrada por la aplicación consumidora";
-            readonly optionsSourceIdField: "Campo ID de opción";
-            readonly optionsSourceIdField_tip: "Ruta del valor usado como id. Ejemplo: id";
-            readonly optionsSourceTextField: "Campo texto de opción";
-            readonly optionsSourceTextField_tip: "Ruta del valor usado como texto. Ejemplo: name";
+            readonly optionsSourceKey: "Origen de opciones";
+            readonly optionsSourceKey_tip: "Opciones manuales o API externa";
+            readonly optionsSourceIdField: "Nombre de campo ID";
+            readonly optionsSourceIdField_tip: "Propiedad del objeto para usar como ID";
+            readonly optionsSourceTextField: "Nombre de campo de texto";
+            readonly optionsSourceTextField_tip: "Propiedad del objeto para mostrar";
             readonly optionsSourceTextTemplate: "Plantilla de texto";
             readonly optionsSourceTextTemplate_tip: "Ejemplo: {{name}} ({{id}})";
             readonly optionsSourceDependsOn: "Depende de";
-            readonly optionsSourceDependsOn_tip: "Identificador del campo padre que dispara la recarga";
+            readonly optionsSourceDependsOn_tip: "Campo para filtrar opciones según valor";
             readonly optionsSourceParamName: "Nombre del parámetro";
             readonly optionsSourceParamName_tip: "Nombre con el que se envía el valor dependiente";
             readonly selectNullable_tip: "Permite seleccionar una opción vacía";
             readonly selectSearchEnabled_tip: "Habilita búsqueda entre opciones";
             readonly selectNullable: "Permitir opción vacía";
             readonly selectSearchEnabled: "Habilitar búsqueda";
+            readonly repeaterMinItems: "Mínimo de ítems";
+            readonly repeaterMinItems_tip: "Cantidad mínima de ítems requerida";
+            readonly repeaterMaxItems: "Máximo de ítems";
+            readonly repeaterMaxItems_tip: "Cantidad máxima de ítems permitida";
+            readonly repeaterAddLabel: "Etiqueta del botón agregar";
+            readonly repeaterRemoveLabel: "Etiqueta del botón eliminar";
+            readonly repeaterItemTitle: "Título de ítem";
         };
         readonly options_editor: {
             readonly title: "Opciones";
@@ -281,11 +290,26 @@ export declare const DICTIONARY_ES: {
             readonly delete: "Eliminar";
             readonly show_advanced: "Mostrar avanzado";
             readonly hide_advanced: "Ocultar avanzado";
+            readonly subfields: "Sub-campos";
+        };
+        readonly visibility_operators: {
+            readonly equals: "Es igual a";
+            readonly notEquals: "No es igual a";
+            readonly greaterThan: "Es mayor que";
+            readonly lessThan: "Es menor que";
+            readonly includes: "Incluye";
+            readonly notIncludes: "No incluye";
+            readonly isEmpty: "Está vacío";
+            readonly isNotEmpty: "No está vacío";
         };
         readonly validation: {
             readonly duplicate_identifier: "El identificador \"{{identifier}}\" se está usando más de una vez.";
             readonly duplicate_identifier_title: "Error de validación";
         };
+        readonly repeater: {
+            readonly no_subfields: "Sin sub-campos. Añade uno abajo.";
+            readonly add_subfield: "Agregar sub-campo";
+        };
     };
     readonly validation: {
         readonly invalid: "{{field}} es invalido.";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui-core-abv",
-  "version": "0.6.76",
+  "version": "0.7.0",
   "peerDependencies": {
     "@angular/common": ">=19.2.0 <21.0.0",
     "@angular/core": ">=19.2.0  <21.0.0",

package/public-api.d.ts

@@ -40,6 +40,7 @@ export * from './lib/components/tag-selector/tag-selector.component';
 export * from './lib/components/progress-bar/progress-bar.component';
 export * from './lib/animations/animatios.index';
 export * from './lib/components/dynamic-form/form.models';
+export * from './lib/components/dynamic-form/repeater/repeater.component';
 export * from './lib/components/user-formbuilder/user-formbuilder.component';
 export * from './lib/components/rule-builder/rule-builder.component';
 export * from './lib/services/modal.service';