@sumaris-net/ngx-components 18.18.9 → 18.18.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sumaris-net/ngx-components",
   "description": "SUMARiS Angular components",
-  "version": "18.18.9",
+  "version": "18.18.10",
   "author": "contact@e-is.pro",
   "license": "AGPL-3.0",
   "readmeFilename": "README.md",

package/public_api.d.ts

@@ -32,8 +32,8 @@ export * from './src/app/shared/material/swipe/swipe.module';
 export * from './src/app/shared/material/swipe/material.swipe';
 export * from './src/app/shared/material/badge/badge.module';
 export * from './src/app/shared/material/badge/badge.directive';
-export * from './src/app/shared/material/text/text-form.component';
-export * from './src/app/shared/material/text/text-form.module';
+export * from './src/app/core/form/text/text-form.component';
+export * from './src/app/core/form/text/text-form.module';
 export * from './src/app/shared/inputs';
 export { AppFormField } from './src/app/shared/form/field.component';
 export * from './src/app/shared/form/loading-spinner';
@@ -309,7 +309,6 @@ export * from './src/app/shared/material/datetime/testing/mat-date-time.test';
 export * from './src/app/shared/material/datetime/testing/mat-date.test';
 export * from './src/app/shared/material/datetime/testing/mat-dateshort.test';
 export * from './src/app/shared/material/chips/testing/chips.test';
-export * from './src/app/shared/material/text/testing/text-form.testing';
 export * from './src/app/shared/testing/observable.test';
 export * from './src/app/shared/material/badge/badge.test';
 export * from './src/app/shared/material/testing/common.test';
@@ -336,6 +335,8 @@ export * from './src/app/core/services/testing/referential.validator';
 export * from './src/app/core/table/testing/table.testing.module';
 export * from './src/app/core/table/testing/table.testing';
 export * from './src/app/core/table/testing/table2.testing';
+export * from './src/app/core/form/text/testing/text-form.testing';
+export * from './src/app/core/form/text/testing/text-form.testing.module';
 export * from './src/app/core/form/text-popover/testing/text-popover.testing.module';
 export * from './src/app/core/form/text-popover/testing/text-popover.testing';
 export * from './src/app/core/form/properties/testing/properties-form.test';

package/src/app/core/core.testing.module.d.ts

@@ -4,12 +4,13 @@ import * as i1 from "@angular/common";
 import * as i2 from "@ngx-translate/core";
 import * as i3 from "@angular/router";
 import * as i4 from "./table/testing/table.testing.module";
-import * as i5 from "./form/text-popover/testing/text-popover.testing.module";
-import * as i6 from "./form/properties/testing/properties-form.testing.module";
-import * as i7 from "./form/array/testing/form-array-test.module";
+import * as i5 from "./form/text/testing/text-form.testing.module";
+import * as i6 from "./form/text-popover/testing/text-popover.testing.module";
+import * as i7 from "./form/properties/testing/properties-form.testing.module";
+import * as i8 from "./form/array/testing/form-array-test.module";
 export declare const CORE_TESTING_PAGES: TestingPage[];
 export declare class CoreTestingModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<CoreTestingModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<CoreTestingModule, never, [typeof i1.CommonModule, typeof i2.TranslateModule, typeof i3.RouterModule, typeof i4.TableTestingModule, typeof i5.TextPopoverTestingModule, typeof i6.PropertiesFormTestingModule, typeof i7.FormArrayTestModule], [typeof i3.RouterModule, typeof i4.TableTestingModule, typeof i5.TextPopoverTestingModule, typeof i6.PropertiesFormTestingModule, typeof i7.FormArrayTestModule]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<CoreTestingModule, never, [typeof i1.CommonModule, typeof i2.TranslateModule, typeof i3.RouterModule, typeof i4.TableTestingModule, typeof i5.TextFormTestingModule, typeof i6.TextPopoverTestingModule, typeof i7.PropertiesFormTestingModule, typeof i8.FormArrayTestModule], [typeof i3.RouterModule, typeof i4.TableTestingModule, typeof i5.TextFormTestingModule, typeof i6.TextPopoverTestingModule, typeof i7.PropertiesFormTestingModule, typeof i8.FormArrayTestModule]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<CoreTestingModule>;
 }

package/src/app/core/form/entity/entity-editor.class.d.ts

@@ -7,7 +7,7 @@ import { UsageMode } from '../../services/model/settings.model';
 import { FormGroup } from '@angular/forms';
 import { AppTabEditor, AppTabEditorOptions, IAppTabEditor } from './tab-editor.class';
 import { AppErrorWithDetails } from '../../services/errors';
-import { EntityServiceLoadOptions, IEntityService } from '../../../shared/services/entity-service.class';
+import { EntityServiceDeleteOptions, EntityServiceLoadOptions, EntityServiceSaveOptions, IEntityService } from '../../../shared/services/entity-service.class';
 import { DateFormatService } from '../../../shared/pipes/date-format.pipe';
 import { Environment } from '../../../../environments/environment.class';
 import { HistoryPageReference } from '../../services/model/history.model';
@@ -34,7 +34,7 @@ export declare class AppEditorOptions extends AppTabEditorOptions {
     autoOpenNextTab?: boolean;
     i18nPrefix?: string;
 }
-export declare abstract class AppEntityEditor<T extends Entity<T, ID>, S extends IEntityService<T, ID> = IEntityService<T, any>, ID = number, LO extends EntityServiceLoadOptions = EntityServiceLoadOptions> extends AppTabEditor<T, ID, LO> implements OnInit, OnDestroy, AfterViewInit, IAppEntityEditor<T> {
+export declare abstract class AppEntityEditor<T extends Entity<T, ID>, S extends IEntityService<T, ID> = IEntityService<T, any>, ID = number, LO extends EntityServiceLoadOptions = EntityServiceLoadOptions, SO extends EntityServiceSaveOptions = EntityServiceSaveOptions, DO extends EntityServiceDeleteOptions = EntityServiceDeleteOptions> extends AppTabEditor<T, ID, LO> implements OnInit, OnDestroy, AfterViewInit, IAppEntityEditor<T> {
     protected dataType: new () => T;
     protected dataService?: S;
     data: T;
@@ -84,7 +84,7 @@ export declare abstract class AppEntityEditor<T extends Entity<T, ID>, S extends
      * @param id
      * @param opts
      */
-    load(id?: ID, opts?: EntityServiceLoadOptions & {
+    load(id?: ID, opts?: LO & {
         emitEvent?: boolean;
         openTabIndex?: number;
         updateRoute?: boolean;
@@ -116,7 +116,7 @@ export declare abstract class AppEntityEditor<T extends Entity<T, ID>, S extends
      * Update the route location, and open the next tab
      */
     updateTabIndex(tabIndex?: number): void;
-    saveAndClose(event: Event, options?: any): Promise<boolean>;
+    saveAndClose(event: Event, options?: SO): Promise<boolean>;
     close(event: Event): Promise<boolean | void>;
     /**
      * Save the editor, by calling the dataService.save().
@@ -125,12 +125,12 @@ export declare abstract class AppEntityEditor<T extends Entity<T, ID>, S extends
      * @param event
      * @param opts
      */
-    save(event?: Event, opts?: any): Promise<boolean>;
+    save(event?: Event, opts?: SO): Promise<boolean>;
     /**
      * Save data (if dirty and valid), and return it. Otherwise, return nil value.
      */
     saveAndGetDataIfValid(): Promise<T | undefined>;
-    delete(event?: Event): Promise<boolean>;
+    delete(event?: Event, opts?: DO): Promise<boolean>;
     reload(): Promise<void>;
     unload(opts?: {
         emitEvent?: boolean;
@@ -156,10 +156,10 @@ export declare abstract class AppEntityEditor<T extends Entity<T, ID>, S extends
      */
     protected computeNextTabIndex(): number | undefined;
     protected onBeforeEntityLoad(): Promise<void>;
-    protected onNewEntity(data: T, options?: EntityServiceLoadOptions): Promise<void>;
-    protected onEntityLoaded(data: T, options?: EntityServiceLoadOptions): Promise<void>;
-    protected onEntitySaved(data: T): Promise<void>;
-    protected onEntityDeleted(data: T): Promise<void>;
+    protected onNewEntity(data: T, options?: LO): Promise<void>;
+    protected onEntityLoaded(data: T, options?: LO): Promise<void>;
+    protected onEntitySaved(data: T, options?: SO): Promise<void>;
+    protected onEntityDeleted(data: T, options?: DO): Promise<void>;
     protected computeUsageMode(data: T): UsageMode;
     protected waitWhilePending(opts?: WaitForOptions): Promise<void>;
     getValue(): Promise<T>;
@@ -199,6 +199,6 @@ export declare abstract class AppEntityEditor<T extends Entity<T, ID>, S extends
         onlySelf?: boolean;
         emitEvent?: boolean;
     }): Promise<void> | void;
-    static ɵfac: i0.ɵɵFactoryDeclaration<AppEntityEditor<any, any, any, any>, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<AppEntityEditor<any, any, any, any>, never, never, {}, {}, never, never, false, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<AppEntityEditor<any, any, any, any, any, any>, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<AppEntityEditor<any, any, any, any, any, any>, never, never, {}, {}, never, never, false, never>;
 }

package/src/app/core/form/text/testing/text-form.testing.module.d.ts

@@ -0,0 +1,14 @@
+import * as i0 from "@angular/core";
+import * as i1 from "./text-form.testing";
+import * as i2 from "@angular/common";
+import * as i3 from "@ionic/angular";
+import * as i4 from "../../../../shared/shared.module";
+import * as i5 from "../../../core.module";
+import * as i6 from "@ngx-translate/core";
+import * as i7 from "../text-form.module";
+import * as i8 from "@angular/router";
+export declare class TextFormTestingModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<TextFormTestingModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<TextFormTestingModule, [typeof i1.TextFormTestingPage], [typeof i2.CommonModule, typeof i3.IonicModule, typeof i4.SharedModule, typeof i5.CoreModule, typeof i6.TranslateModule, typeof i7.AppTextFormModule], [typeof i8.RouterModule, typeof i1.TextFormTestingPage]>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<TextFormTestingModule>;
+}

package/src/app/{shared/material → core/form}/text/text-form.component.d.ts

@@ -1,9 +1,9 @@
 import { ChangeDetectorRef, ElementRef, EventEmitter, Injector, OnInit } from '@angular/core';
 import { ControlValueAccessor, FormGroupDirective, UntypedFormBuilder, UntypedFormControl, ValidatorFn } from '@angular/forms';
 import { CdkTextareaAutosize } from '@angular/cdk/text-field';
-import { AppForm } from '../../../core/form/form.class';
-import { AppFloatLabelType } from '../../form/field.model';
+import { AppForm } from '../form.class';
 import { MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-field';
+import { AppFloatLabelType } from '../../../shared/types';
 import * as i0 from "@angular/core";
 export declare class TextForm extends AppForm<{
     text: string;

package/src/app/core/form/text/text-form.module.d.ts

@@ -0,0 +1,9 @@
+import * as i0 from "@angular/core";
+import * as i1 from "./text-form.component";
+import * as i2 from "../../../shared/shared.module";
+import * as i3 from "@ngx-translate/core";
+export declare class AppTextFormModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<AppTextFormModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AppTextFormModule, [typeof i1.TextForm], [typeof i2.SharedModule, typeof i3.TranslateModule], [typeof i3.TranslateModule, typeof i1.TextForm]>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<AppTextFormModule>;
+}

package/src/app/core/form/text-popover/testing/text-popover.testing.module.d.ts

@@ -6,6 +6,6 @@ import * as i4 from "@ngx-translate/core";
 import * as i5 from "@angular/router";
 export declare class TextPopoverTestingModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<TextPopoverTestingModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<TextPopoverTestingModule, [typeof i1.TextPopoverTestingPage], [typeof i2.CommonModule, typeof i3.IonicModule, typeof i4.TranslateModule, typeof i5.RouterModule], [typeof i5.RouterModule, typeof i1.TextPopoverTestingPage]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<TextPopoverTestingModule, [typeof i1.TextPopoverTestingPage], [typeof i2.CommonModule, typeof i3.IonicModule, typeof i4.TranslateModule], [typeof i5.RouterModule, typeof i1.TextPopoverTestingPage]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<TextPopoverTestingModule>;
 }

package/src/app/core/form/text-popover/text-popover.component.d.ts

@@ -2,7 +2,7 @@ import { AfterViewInit, OnDestroy, OnInit } from '@angular/core';
 import { PopoverController, PopoverOptions } from '@ionic/angular';
 import { Subscription } from 'rxjs';
 import { TranslateService } from '@ngx-translate/core';
-import { TextForm } from '../../../shared/material/text/text-form.component';
+import { TextForm } from '../text/text-form.component';
 import { ValidatorFn } from '@angular/forms';
 import { Color, OverlayEventDetail } from '@ionic/core';
 import * as i0 from "@angular/core";

package/src/app/core/form/text-popover/text-popover.module.d.ts

@@ -1,9 +1,10 @@
 import * as i0 from "@angular/core";
 import * as i1 from "./text-popover.component";
 import * as i2 from "../../../shared/shared.module";
-import * as i3 from "@ngx-translate/core";
+import * as i3 from "../text/text-form.module";
+import * as i4 from "@ngx-translate/core";
 export declare class AppTextPopoverModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<AppTextPopoverModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<AppTextPopoverModule, [typeof i1.TextPopover], [typeof i2.SharedModule, typeof i3.TranslateModule], [typeof i3.TranslateModule, typeof i1.TextPopover]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AppTextPopoverModule, [typeof i1.TextPopover], [typeof i2.SharedModule, typeof i3.AppTextFormModule, typeof i4.TranslateModule], [typeof i4.TranslateModule, typeof i1.TextPopover]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<AppTextPopoverModule>;
 }

package/src/app/core/services/base-entity-service.class.d.ts

@@ -1,8 +1,8 @@
 import { Observable } from 'rxjs';
-import { ApolloCache, InternalRefetchQueriesInclude, MutationUpdaterFn, MutationUpdaterFunction, WatchQueryFetchPolicy } from '@apollo/client/core';
+import { InternalRefetchQueriesInclude, MutationUpdaterFn, WatchQueryFetchPolicy } from '@apollo/client/core';
 import { SortDirection } from '@angular/material/sort';
 import { BaseGraphqlService } from './base-graphql-service.class';
-import { EntitiesServiceLoadOptions, EntitiesServiceWatchOptions, EntityServiceListenChangesOptions, IEntitiesService, IEntityService, LoadResult } from '../../shared/services/entity-service.class';
+import { EntitiesServiceLoadOptions, EntitiesServiceWatchOptions, EntityServiceListenChangesOptions, EntityServiceSaveOptions, IEntitiesService, IEntityService, LoadResult } from '../../shared/services/entity-service.class';
 import { GraphqlService } from '../graphql/graphql.service';
 import { PlatformService } from './platform.service';
 import { Entity, EntityAsObjectOptions } from './model/entity.model';
@@ -11,6 +11,11 @@ import { EntityFilter } from './model/filter.model';
 import { DocumentNode } from 'graphql';
 import * as i0 from "@angular/core";
 export type MutableWatchQueriesUpdatePolicy = 'update-cache' | 'refetch-queries';
+/**
+ * @deprecated Use EntityServiceSaveOptions
+ */
+export interface EntitySaveOptions<T = any, V = any> extends EntityServiceSaveOptions<T, V> {
+}
 export interface BaseEntityGraphqlQueries {
     load?: any;
     loadAll: any;
@@ -44,19 +49,6 @@ export interface BaseEntityServiceOptions<T extends Entity<any, ID>, ID = number
     defaultSortDirection?: SortDirection;
     watchQueriesUpdatePolicy?: MutableWatchQueriesUpdatePolicy;
 }
-export interface EntitySaveOptions<T = any, V = any> {
-    refetchQueries?: ((result: FetchResult<{
-        data: T;
-    }>) => InternalRefetchQueriesInclude) | InternalRefetchQueriesInclude;
-    awaitRefetchQueries?: boolean;
-    update?: MutationUpdaterFn<{
-        data: any;
-    }> | MutationUpdaterFunction<{
-        data: any;
-    }, V, any, ApolloCache<{
-        data: any;
-    }>>;
-}
 export declare abstract class BaseEntityService<T extends Entity<T, ID>, F extends EntityFilter<F, T, ID>, ID = number, WO extends EntitiesServiceWatchOptions = EntitiesServiceWatchOptions<T>, LO extends EntitiesServiceLoadOptions = EntitiesServiceLoadOptions<T>, Q extends BaseEntityGraphqlQueries = BaseEntityGraphqlQueries, M extends BaseEntityGraphqlMutations = BaseEntityGraphqlMutations, S extends BaseEntityGraphqlSubscriptions = BaseEntityGraphqlSubscriptions> extends BaseGraphqlService<T, F, ID> implements IEntitiesService<T, F, WO>, IEntityService<T, ID, LO> {
     protected graphql: GraphqlService;
     protected platform: PlatformService;
@@ -82,14 +74,14 @@ export declare abstract class BaseEntityService<T extends Entity<T, ID>, F exten
     }): Promise<LoadResult<T>>;
     countAll(filter?: Partial<F>, opts?: LO): Promise<number>;
     canUserWrite(data: T, opts?: any): boolean;
-    saveAll(entities: T[], opts?: EntitySaveOptions): Promise<T[]>;
+    saveAll(entities: T[], opts?: EntityServiceSaveOptions | EntitySaveOptions): Promise<T[]>;
     /**
      * Save a referential entity
      *
      * @param entity
      * @param opts
      */
-    save(entity: T, opts?: EntitySaveOptions): Promise<T>;
+    save(entity: T, opts?: EntityServiceSaveOptions): Promise<T>;
     /**
      * Delete referential entities
      */
@@ -99,7 +91,7 @@ export declare abstract class BaseEntityService<T extends Entity<T, ID>, F exten
     /**
      * Delete a referential entity
      */
-    delete(entity: T, opts?: EntitySaveOptions | any): Promise<any>;
+    delete(entity: T, opts?: EntityServiceSaveOptions | any): Promise<any>;
     listenChanges(id: ID, opts?: EntityServiceListenChangesOptions<T>): Observable<T>;
     copyIdAndUpdateDate(source: T, target: T): void;
     fromObject(source: any, opts?: {
@@ -125,7 +117,7 @@ export declare abstract class BaseEntityService<T extends Entity<T, ID>, F exten
         [key: string]: any;
     }): T[];
     protected asObject(source: T, opts?: EntityAsObjectOptions): any;
-    protected getRefetchQueriesForMutation(opts?: EntitySaveOptions): ((result: FetchResult<{
+    protected getRefetchQueriesForMutation(opts?: EntityServiceSaveOptions): ((result: FetchResult<{
         data: any;
     }>) => InternalRefetchQueriesInclude) | InternalRefetchQueriesInclude;
     protected getLoadQueries(): DocumentNode[];

package/src/app/core/table/column/row-field.component.d.ts

@@ -2,9 +2,10 @@ import { ChangeDetectorRef, OnDestroy, OnInit } from '@angular/core';
 import { ThemePalette } from '@angular/material/core';
 import { PredefinedColors } from '@ionic/core';
 import { MatFormFieldAppearance } from '@angular/material/form-field';
-import { AppFloatLabelType, FormFieldDefinition } from '../../../shared/form/field.model';
+import { FormFieldDefinition } from '../../../shared/form/field.model';
 import { MatColumnDef, MatTable } from '@angular/material/table';
 import { AsyncTableElement, TableElement } from '@e-is/ngx-material-table';
+import { AppFloatLabelType } from '../../../shared/types';
 import * as i0 from "@angular/core";
 export declare class AppRowField implements OnInit, OnDestroy {
     protected cd: ChangeDetectorRef;

package/src/app/shared/file/csv.utils.d.ts

@@ -1,7 +1,7 @@
 import { Observable } from 'rxjs';
 import { FileEvent } from '../upload-file/upload-file.model';
 import { TranslateService } from '@ngx-translate/core';
-import { DisplayFn } from '../form/field.model';
+import { DisplayFn } from '../types';
 export declare class CsvUtils {
     static DEFAULT_SEPARATOR: string;
     static DEFAULT_ENCODING: string;

package/src/app/shared/form/field.component.d.ts

@@ -1,9 +1,9 @@
 import { ChangeDetectorRef, ElementRef, EventEmitter, Injector, OnInit } from '@angular/core';
 import { ControlValueAccessor, FormGroupDirective, UntypedFormControl } from '@angular/forms';
-import { AppFloatLabelType, DisplayFn, FormFieldDefinition, FormFieldType } from './field.model';
+import { FormFieldDefinition, FormFieldType } from './field.model';
 import { TranslateService } from '@ngx-translate/core';
 import { filterNumberInput, selectInputContentFromEvent } from '../inputs';
-import { Property } from '../types';
+import { AppFloatLabelType, DisplayFn, Property } from '../types';
 import { ThemePalette } from '@angular/material/core';
 import { PredefinedColors } from '@ionic/core';
 import { MatAutocompleteField } from '../material/autocomplete/material.autocomplete';

package/src/app/shared/form/field.model.d.ts

@@ -1,13 +1,8 @@
-import { ObjectMap, Property } from '../types';
+import { DisplayFn, ObjectMap, Property } from '../types';
 import { InjectionToken, Injector } from '@angular/core';
 import { MatAutocompleteFieldConfig } from '../material/autocomplete/material.autocomplete.config';
 import { UserProfileLabel } from '../../core/services/model/person.model';
-import { FloatLabelType } from '@angular/material/form-field';
-export declare type DisplayFn = (obj: any) => string;
-export declare type EqualsFn = (o1: any, o2: any) => boolean;
-export declare type CompareFn = (o1: any, o2: any) => number;
 export declare type FormFieldType = 'integer' | 'double' | 'boolean' | 'string' | 'enum' | 'enums' | 'color' | 'peer' | 'entity' | 'entities' | 'date' | 'dateTime';
-export declare type AppFloatLabelType = FloatLabelType | 'never';
 export declare interface FormFieldDefinition<K = string, T = FormFieldType, E = any> {
     key: K;
     type: T;

package/src/app/shared/material/autocomplete/material.autocomplete.config.d.ts

@@ -1,6 +1,6 @@
 import { SuggestFn, SuggestService } from '../../services/entity-service.class';
 import { Observable } from 'rxjs';
-import { DisplayFn, EqualsFn } from '../../form/field.model';
+import { DisplayFn, EqualsFn } from '../../types';
 export declare interface MatAutocompleteFieldConfig<T = any, F = any> {
     attributes?: string[];
     suggestFn?: SuggestFn<T, F>;

package/src/app/shared/material/autocomplete/material.autocomplete.d.ts

@@ -3,12 +3,12 @@ import { ControlValueAccessor, FormGroupDirective, UntypedFormControl } from '@a
 import { BehaviorSubject, Observable } from 'rxjs';
 import { SuggestFn } from '../../services/entity-service.class';
 import { InputElement } from '../../inputs';
-import { AppFloatLabelType, DisplayFn, EqualsFn } from '../../form/field.model';
 import { MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-field';
 import { MatSelect, MatSelectChange } from '@angular/material/select';
 import { MatAutocomplete, MatAutocompleteSelectedEvent, MatAutocompleteTrigger } from '@angular/material/autocomplete';
 import { IonSearchbar, ModalController } from '@ionic/angular';
 import { MatAutocompleteFieldConfig } from './material.autocomplete.config';
+import { AppFloatLabelType, DisplayFn, EqualsFn } from '../../types';
 import * as i0 from "@angular/core";
 export interface MatAutocompleteFieldSelectChange {
     source: MatSelect | MatAutocomplete;

package/src/app/shared/material/autocomplete/material.autocomplete.utils.d.ts

@@ -1,4 +1,4 @@
-import { DisplayFn } from '../../form/field.model';
+import { DisplayFn } from '../../types';
 export declare class MatAutocompleteFieldUtils {
     static createDisplayFn(displayAttributes: string[], multiple?: boolean, propertySeparator?: string, itemSeparator?: string): DisplayFn;
     static defaultEquals(o1: any, o2: any): boolean;

package/src/app/shared/material/boolean/material.boolean.d.ts

@@ -4,7 +4,7 @@ import { ControlValueAccessor, FormGroupDirective, UntypedFormControl } from '@a
 import { MatRadioButton, MatRadioChange } from '@angular/material/radio';
 import { MatCheckbox, MatCheckboxChange } from '@angular/material/checkbox';
 import { InputElement } from '../../inputs';
-import { AppFloatLabelType } from '../../form/field.model';
+import { AppFloatLabelType } from '../../types';
 import * as i0 from "@angular/core";
 export declare class MatBooleanField implements OnInit, ControlValueAccessor, InputElement, OnDestroy {
     private cd;

package/src/app/shared/material/boolean/testing/boolean.test.page.d.ts

@@ -1,7 +1,7 @@
 import { AfterViewInit, ChangeDetectorRef, Injector, OnInit } from '@angular/core';
 import { AppForm } from '../../../../core/form/form.class';
 import { UntypedFormBuilder } from '@angular/forms';
-import { AppFloatLabelType } from '../../../form/field.model';
+import { AppFloatLabelType } from '../../../types';
 import * as i0 from "@angular/core";
 export declare class BooleanTestPage extends AppForm<any> implements OnInit, AfterViewInit {
     protected injector: Injector;

package/src/app/shared/material/chips/material.chips.d.ts

@@ -3,11 +3,11 @@ import { ControlValueAccessor, FormGroupDirective, UntypedFormControl } from '@a
 import { BehaviorSubject, Observable } from 'rxjs';
 import { InputElement } from '../../inputs';
 import { SuggestFn } from '../../services/entity-service.class';
-import { AppFloatLabelType, DisplayFn, EqualsFn } from '../../form/field.model';
 import { ErrorStateMatcher, ThemePalette } from '@angular/material/core';
 import { MatAutocompleteFieldConfig } from '../autocomplete/material.autocomplete.config';
 import { MatFormFieldAppearance, MatFormFieldDefaultOptions, SubscriptSizing } from '@angular/material/form-field';
 import { MatAutocomplete, MatAutocompleteTrigger } from '@angular/material/autocomplete';
+import { AppFloatLabelType, DisplayFn, EqualsFn } from '../../types';
 import * as i0 from "@angular/core";
 export declare class MatChipsField implements OnInit, OnDestroy, InputElement, ControlValueAccessor {
     protected cd: ChangeDetectorRef;

package/src/app/shared/material/datetime/material.date.d.ts

@@ -6,8 +6,8 @@ import { InputElement } from '../../inputs';
 import { MatFormFieldAppearance, MatFormFieldDefaultOptions, SubscriptSizing } from '@angular/material/form-field';
 import { DateFilterFn, MatDatepicker, MatDatepickerInputEvent } from '@angular/material/datepicker';
 import { MomentDateAdapter } from '@angular/material-moment-adapter';
-import { AppFloatLabelType } from '../../form/field.model';
 import { MaskitoOptions } from '@maskito/core';
+import { AppFloatLabelType } from '../../types';
 import * as i0 from "@angular/core";
 export declare class MatDate implements OnInit, AfterViewInit, OnDestroy, ControlValueAccessor, InputElement {
     private dateAdapter;

package/src/app/shared/material/datetime/material.dateshort.d.ts

@@ -6,8 +6,8 @@ import { InputElement } from '../../inputs';
 import { MatFormFieldAppearance, MatFormFieldDefaultOptions, SubscriptSizing } from '@angular/material/form-field';
 import { DateFilterFn, MatDatepicker, MatDatepickerInputEvent } from '@angular/material/datepicker';
 import { MomentDateAdapter } from '@angular/material-moment-adapter';
-import { AppFloatLabelType } from '../../form/field.model';
 import { MaskitoOptions } from '@maskito/core';
+import { AppFloatLabelType } from '../../types';
 import * as i0 from "@angular/core";
 export declare class MatDateShort implements OnInit, ControlValueAccessor, InputElement, AfterViewInit, OnDestroy {
     private dateAdapter;

package/src/app/shared/material/datetime/material.datetime.d.ts

@@ -6,8 +6,8 @@ import { Moment } from 'moment';
 import { InputElement } from '../../inputs';
 import { DateFilterFn, MatDatepicker, MatDatepickerInputEvent } from '@angular/material/datepicker';
 import { MomentDateAdapter } from '@angular/material-moment-adapter';
-import { AppFloatLabelType } from '../../form/field.model';
 import { MaskitoOptions } from '@maskito/core';
+import { AppFloatLabelType } from '../../types';
 import * as i0 from "@angular/core";
 declare interface NgxTimePicker {
     open(): any;

package/src/app/shared/material/duration/material.duration.d.ts

@@ -6,7 +6,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { Moment } from 'moment';
 import { InputElement } from '../../inputs';
 import { MatFormFieldAppearance } from '@angular/material/form-field';
-import { AppFloatLabelType } from '../../form/field.model';
+import { AppFloatLabelType } from '../../types';
 import * as i0 from "@angular/core";
 export declare class MatDuration implements OnInit, OnDestroy, ControlValueAccessor, InputElement {
     private dateAdapter;

package/src/app/shared/material/latlong/material.latlong.d.ts

@@ -1,9 +1,9 @@
 import { AfterViewInit, ChangeDetectorRef, OnDestroy, OnInit } from '@angular/core';
 import { ControlValueAccessor, FormGroupDirective, UntypedFormControl } from '@angular/forms';
 import { MatFormFieldAppearance, MatFormFieldDefaultOptions, SubscriptSizing } from '@angular/material/form-field';
-import { AppFloatLabelType } from '../../form/field.model';
 import { LatLongPattern, LatLongSign, LatLongType } from './latlong.utils';
 import { MatLatLongFieldInput } from './material.latlong-input';
+import { AppFloatLabelType } from '../../types';
 import * as i0 from "@angular/core";
 export declare class MatLatLongField implements ControlValueAccessor, OnInit, AfterViewInit, OnDestroy {
     private cd;

package/src/app/shared/material/material.module.d.ts

@@ -37,9 +37,8 @@ import * as i35 from "./boolean/boolean.module";
 import * as i36 from "./swipe/swipe.module";
 import * as i37 from "./chips/chips.module";
 import * as i38 from "./badge/badge.module";
-import * as i39 from "./text/text-form.module";
 export declare class SharedMaterialModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<SharedMaterialModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<SharedMaterialModule, never, [typeof i1.MatCommonModule, typeof i2.MatTableModule, typeof i3.MatSortModule, typeof i4.MatPaginatorModule, typeof i5.MatFormFieldModule, typeof i6.MatInputModule, typeof i7.CdkTableModule, typeof i8.MatCheckboxModule, typeof i9.MatExpansionModule, typeof i10.MatToolbarModule, typeof i11.MatDialogModule, typeof i12.MatIconModule, typeof i13.MatButtonModule, typeof i14.MatMenuModule, typeof i15.MatSelectModule, typeof i16.MatCardModule, typeof i17.MatTabsModule, typeof i18.MatListModule, typeof i19.MatStepperModule, typeof i20.MatButtonToggleModule, typeof i21.MatProgressSpinnerModule, typeof i22.MatProgressBarModule, typeof i23.MatRadioModule, typeof i24.MatBadgeModule, typeof i25.MatSlideToggleModule, typeof i26.A11yModule, typeof i27.OverlayModule, typeof i28.ScrollingModule, typeof i1.MatRippleModule, typeof i29.MatDividerModule, typeof i30.MatTooltipModule, typeof i31.SharedMatAutocompleteModule, typeof i32.SharedMatLatLongModule, typeof i33.SharedMatDateTimeModule, typeof i34.SharedMatDurationModule, typeof i35.SharedMatBooleanModule, typeof i36.SharedMatSwipeModule, typeof i37.SharedMatChipsModule, typeof i38.SharedBadgeModule, typeof i39.SharedTextFormModule], [typeof i1.MatCommonModule, typeof i2.MatTableModule, typeof i3.MatSortModule, typeof i4.MatPaginatorModule, typeof i5.MatFormFieldModule, typeof i6.MatInputModule, typeof i7.CdkTableModule, typeof i8.MatCheckboxModule, typeof i9.MatExpansionModule, typeof i10.MatToolbarModule, typeof i11.MatDialogModule, typeof i12.MatIconModule, typeof i13.MatButtonModule, typeof i14.MatMenuModule, typeof i15.MatSelectModule, typeof i16.MatCardModule, typeof i17.MatTabsModule, typeof i18.MatListModule, typeof i19.MatStepperModule, typeof i20.MatButtonToggleModule, typeof i21.MatProgressSpinnerModule, typeof i22.MatProgressBarModule, typeof i23.MatRadioModule, typeof i24.MatBadgeModule, typeof i25.MatSlideToggleModule, typeof i26.A11yModule, typeof i27.OverlayModule, typeof i28.ScrollingModule, typeof i1.MatRippleModule, typeof i29.MatDividerModule, typeof i30.MatTooltipModule, typeof i31.SharedMatAutocompleteModule, typeof i32.SharedMatLatLongModule, typeof i33.SharedMatDateTimeModule, typeof i34.SharedMatDurationModule, typeof i35.SharedMatBooleanModule, typeof i36.SharedMatSwipeModule, typeof i37.SharedMatChipsModule, typeof i38.SharedBadgeModule, typeof i39.SharedTextFormModule]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<SharedMaterialModule, never, [typeof i1.MatCommonModule, typeof i2.MatTableModule, typeof i3.MatSortModule, typeof i4.MatPaginatorModule, typeof i5.MatFormFieldModule, typeof i6.MatInputModule, typeof i7.CdkTableModule, typeof i8.MatCheckboxModule, typeof i9.MatExpansionModule, typeof i10.MatToolbarModule, typeof i11.MatDialogModule, typeof i12.MatIconModule, typeof i13.MatButtonModule, typeof i14.MatMenuModule, typeof i15.MatSelectModule, typeof i16.MatCardModule, typeof i17.MatTabsModule, typeof i18.MatListModule, typeof i19.MatStepperModule, typeof i20.MatButtonToggleModule, typeof i21.MatProgressSpinnerModule, typeof i22.MatProgressBarModule, typeof i23.MatRadioModule, typeof i24.MatBadgeModule, typeof i25.MatSlideToggleModule, typeof i26.A11yModule, typeof i27.OverlayModule, typeof i28.ScrollingModule, typeof i1.MatRippleModule, typeof i29.MatDividerModule, typeof i30.MatTooltipModule, typeof i31.SharedMatAutocompleteModule, typeof i32.SharedMatLatLongModule, typeof i33.SharedMatDateTimeModule, typeof i34.SharedMatDurationModule, typeof i35.SharedMatBooleanModule, typeof i36.SharedMatSwipeModule, typeof i37.SharedMatChipsModule, typeof i38.SharedBadgeModule], [typeof i1.MatCommonModule, typeof i2.MatTableModule, typeof i3.MatSortModule, typeof i4.MatPaginatorModule, typeof i5.MatFormFieldModule, typeof i6.MatInputModule, typeof i7.CdkTableModule, typeof i8.MatCheckboxModule, typeof i9.MatExpansionModule, typeof i10.MatToolbarModule, typeof i11.MatDialogModule, typeof i12.MatIconModule, typeof i13.MatButtonModule, typeof i14.MatMenuModule, typeof i15.MatSelectModule, typeof i16.MatCardModule, typeof i17.MatTabsModule, typeof i18.MatListModule, typeof i19.MatStepperModule, typeof i20.MatButtonToggleModule, typeof i21.MatProgressSpinnerModule, typeof i22.MatProgressBarModule, typeof i23.MatRadioModule, typeof i24.MatBadgeModule, typeof i25.MatSlideToggleModule, typeof i26.A11yModule, typeof i27.OverlayModule, typeof i28.ScrollingModule, typeof i1.MatRippleModule, typeof i29.MatDividerModule, typeof i30.MatTooltipModule, typeof i31.SharedMatAutocompleteModule, typeof i32.SharedMatLatLongModule, typeof i33.SharedMatDateTimeModule, typeof i34.SharedMatDurationModule, typeof i35.SharedMatBooleanModule, typeof i36.SharedMatSwipeModule, typeof i37.SharedMatChipsModule, typeof i38.SharedBadgeModule]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<SharedMaterialModule>;
 }

package/src/app/shared/material/material.testing.module.d.ts

@@ -8,25 +8,24 @@ import * as i5 from "./duration/testing/mat-duration.test";
 import * as i6 from "./autocomplete/testing/autocomplete.test";
 import * as i7 from "./boolean/testing/boolean.test.page";
 import * as i8 from "./latlong/testing/latlong.test";
-import * as i9 from "./text/testing/text-form.testing";
-import * as i10 from "./swipe/testing/swipe.test";
-import * as i11 from "./chips/testing/chips.test";
-import * as i12 from "./badge/badge.test";
-import * as i13 from "../testing/observable.test";
-import * as i14 from "../testing/maskito.test";
-import * as i15 from "@angular/common";
-import * as i16 from "@ionic/angular";
-import * as i17 from "@angular/forms";
-import * as i18 from "./material.module";
-import * as i19 from "@ngx-translate/core";
-import * as i20 from "@angular/router";
-import * as i21 from "../pipes/pipes.module";
-import * as i22 from "./badge/badge.module";
-import * as i23 from "@maskito/angular";
-import * as i24 from "./latlong/material.latlong.module";
+import * as i9 from "./swipe/testing/swipe.test";
+import * as i10 from "./chips/testing/chips.test";
+import * as i11 from "./badge/badge.test";
+import * as i12 from "../testing/observable.test";
+import * as i13 from "../testing/maskito.test";
+import * as i14 from "@angular/common";
+import * as i15 from "@ionic/angular";
+import * as i16 from "@angular/forms";
+import * as i17 from "./material.module";
+import * as i18 from "@ngx-translate/core";
+import * as i19 from "@angular/router";
+import * as i20 from "../pipes/pipes.module";
+import * as i21 from "./badge/badge.module";
+import * as i22 from "@maskito/angular";
+import * as i23 from "./latlong/material.latlong.module";
 export declare const SHARED_MATERIAL_TESTING_PAGES: TestingPage[];
 export declare class MaterialTestingModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<MaterialTestingModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MaterialTestingModule, [typeof i1.MatCommonTestPage, typeof i2.DateTimeTestPage, typeof i3.DateTestPage, typeof i4.DateShortTestPage, typeof i5.DurationTestPage, typeof i6.AutocompleteTestPage, typeof i7.BooleanTestPage, typeof i8.LatLongTestPage, typeof i9.TextFormTestingPage, typeof i10.SwipeTestPage, typeof i11.ChipsTestPage, typeof i12.MatBadgeTestPage, typeof i13.ObservableTestPage, typeof i14.MaskitoTestPage], [typeof i15.CommonModule, typeof i16.IonicModule, typeof i17.ReactiveFormsModule, typeof i18.SharedMaterialModule, typeof i19.TranslateModule, typeof i20.RouterModule, typeof i21.SharedPipesModule, typeof i22.SharedBadgeModule, typeof i17.FormsModule, typeof i23.MaskitoDirective, typeof i24.SharedMatLatLongModule], [typeof i18.SharedMaterialModule, typeof i20.RouterModule, typeof i1.MatCommonTestPage, typeof i2.DateTimeTestPage, typeof i3.DateTestPage, typeof i4.DateShortTestPage, typeof i5.DurationTestPage, typeof i6.AutocompleteTestPage, typeof i7.BooleanTestPage, typeof i8.LatLongTestPage, typeof i9.TextFormTestingPage, typeof i10.SwipeTestPage, typeof i11.ChipsTestPage, typeof i12.MatBadgeTestPage, typeof i13.ObservableTestPage, typeof i14.MaskitoTestPage]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MaterialTestingModule, [typeof i1.MatCommonTestPage, typeof i2.DateTimeTestPage, typeof i3.DateTestPage, typeof i4.DateShortTestPage, typeof i5.DurationTestPage, typeof i6.AutocompleteTestPage, typeof i7.BooleanTestPage, typeof i8.LatLongTestPage, typeof i9.SwipeTestPage, typeof i10.ChipsTestPage, typeof i11.MatBadgeTestPage, typeof i12.ObservableTestPage, typeof i13.MaskitoTestPage], [typeof i14.CommonModule, typeof i15.IonicModule, typeof i16.ReactiveFormsModule, typeof i17.SharedMaterialModule, typeof i18.TranslateModule, typeof i19.RouterModule, typeof i20.SharedPipesModule, typeof i21.SharedBadgeModule, typeof i16.FormsModule, typeof i22.MaskitoDirective, typeof i23.SharedMatLatLongModule], [typeof i17.SharedMaterialModule, typeof i19.RouterModule, typeof i1.MatCommonTestPage, typeof i2.DateTimeTestPage, typeof i3.DateTestPage, typeof i4.DateShortTestPage, typeof i5.DurationTestPage, typeof i6.AutocompleteTestPage, typeof i7.BooleanTestPage, typeof i8.LatLongTestPage, typeof i9.SwipeTestPage, typeof i10.ChipsTestPage, typeof i11.MatBadgeTestPage, typeof i12.ObservableTestPage, typeof i13.MaskitoTestPage]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<MaterialTestingModule>;
 }

package/src/app/shared/material/swipe/material.swipe.d.ts

@@ -2,10 +2,10 @@ import { ChangeDetectorRef, ElementRef, EventEmitter, OnDestroy, OnInit } from '
 import { ControlValueAccessor, FormGroupDirective, UntypedFormControl } from '@angular/forms';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { InputElement } from '../../inputs';
-import { AppFloatLabelType, DisplayFn, EqualsFn } from '../../form/field.model';
 import { Swiper } from 'swiper/types';
 import { MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-field';
 import { MatButton } from '@angular/material/button';
+import { AppFloatLabelType, DisplayFn, EqualsFn } from '../../types';
 import * as i0 from "@angular/core";
 export declare class MatSwipeField implements OnInit, InputElement, OnDestroy, ControlValueAccessor {
     protected cd: ChangeDetectorRef;

package/src/app/shared/material/swipe/testing/swipe.test.d.ts

@@ -3,7 +3,7 @@ import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { BehaviorSubject } from 'rxjs';
 import { Moment } from 'moment';
 import { DateFormatService } from '../../../pipes/date-format.pipe';
-import { DisplayFn } from '../../../form/field.model';
+import { DisplayFn } from '../../../types';
 import * as i0 from "@angular/core";
 export declare class SwipeTestPage implements OnInit {
     protected formBuilder: UntypedFormBuilder;

package/src/app/shared/pipes/string.pipes.d.ts

@@ -1,5 +1,4 @@
 import { PipeTransform } from '@angular/core';
-import { DisplayFn } from '../form/field.model';
 import * as i0 from "@angular/core";
 export declare class IsNotNilOrBlankPipe implements PipeTransform {
     transform(value: string): boolean;
@@ -32,7 +31,7 @@ export declare class IsNilPipe implements PipeTransform {
     static ɵpipe: i0.ɵɵPipeDeclaration<IsNilPipe, "isNil", false>;
 }
 export declare class ToStringPipe implements PipeTransform {
-    transform(value: number | object, displayWith?: DisplayFn): string;
+    transform(value: number | object, displayWith?: (obj: any) => string): string;
     static ɵfac: i0.ɵɵFactoryDeclaration<ToStringPipe, never>;
     static ɵpipe: i0.ɵɵPipeDeclaration<ToStringPipe, "toString", false>;
 }

package/src/app/shared/pipes/types.pipes.d.ts

@@ -1,7 +1,7 @@
 import { PipeTransform } from '@angular/core';
 import { Observable } from 'rxjs';
 import { FloatLabelType } from '@angular/material/form-field';
-import { AppFloatLabelType } from '../form/field.model';
+import { AppFloatLabelType } from '../types';
 import * as i0 from "@angular/core";
 export declare class AsAnyPipe implements PipeTransform {
     transform<T = any>(value: unknown | any): T | null;