@mediusinc/mng-commons 5.5.0 → 6.0.0-rc.3

package/filter/descriptors/filter-lookup.descriptor.d.ts

@@ -1,9 +1,8 @@
-import { ClassType, EnumConstantType, EnumValue, FilterMatchModeExtendedType, ILookupDataProvider, ILookupDescriptor, LookupDataProviderLookupFnType, ServiceClassType } from '@mediusinc/mng-commons/core';
+import { EnumConstantType, EnumValue, ILookupDataProvider, ILookupDescriptor, LookupDataProviderLookupFnType, ServiceClassType } from '@mediusinc/mng-commons/core';
 import { EnumDescriptor } from '@mediusinc/mng-commons/model';
 import { FilterLookupTypeEnum } from '../models/filter.model';
 import { FilterDescriptor } from './filter.descriptor';
 export type FilterLookupDescriptorConstructorOptsType<FilterModel, Service, Sorts = keyof FilterModel, Filters extends keyof any = keyof FilterModel> = FilterLookupDescriptorCreateOptsProviderType<FilterModel, Service, Sorts, Filters> & {
-    type?: ClassType<FilterModel>;
     optionsValueProperty?: string | null;
 };
 export type FilterLookupDescriptorCreateOptsProviderType<FilterModel, Service, Sorts = keyof FilterModel, Filters extends keyof any = keyof FilterModel> = {
@@ -67,14 +66,6 @@ export declare class FilterLookupDescriptor<FilterModel, TableModel, Service = a
      * @param dropdownClassName Class name for dropdown.
      */
     withDropdownClassName(dropdownClassName: string): this;
-    /**
-     * @deprecated use {withMatchModes} if you want to limit match mode options to 'in' and 'notIn'.
-     */
-    withMultiselect(multiselect?: boolean): this;
-    /**
-     * @deprecated Use {withDefaultFilterValue} instead.
-     */
-    withDefaultFilter(value: FilterValue | FilterValue[] | undefined, matchMode: FilterMatchModeExtendedType): this;
     /**
      * Sets lookup as autocomplete instead of dropdown.
      *
@@ -99,22 +90,6 @@ export declare class FilterLookupEnumDescriptor<Enum, TableModel> extends Filter
      * @param opts Additional options.
      */
     asAutocomplete(opts?: FilterLookupAutocompleteOptsType): this;
-    /**
-     * @deprecated use {withMatchModes} if you want to limit match mode options to 'in' and 'notIn'.
-     */
-    withMultiselectEnum(multiselect?: boolean): this;
-    /**
-     * Do not use, use `withDefaultFilterEnum` instead.
-     *
-     * @deprecated Use {withDefaultFilterValue} instead.
-     */
-    withDefaultFilter(): this;
-    /**
-     * Sets default filter value for filter.
-     *
-     * @deprecated Use {withDefaultFilterValue} instead.
-     */
-    withDefaultFilterEnum(value: EnumConstantType | EnumConstantType[] | undefined, matchMode: FilterMatchModeExtendedType): this;
     /**
      * Copies current descriptor to a new instance.
      */

package/filter/descriptors/filter.descriptor.d.ts

@@ -53,6 +53,7 @@ export declare class FilterDescriptor<FilterModel, TableModel> implements IFilte
     protected _columnMinWidth: number | null;
     protected _inputTrim?: InputTrimType;
     protected _title?: string;
+    protected _titleUseModelBase?: boolean;
     protected _isGenericFilter: boolean;
     protected _valueSuggestionProvider?: ILookupDataProvider<string, any, any, 'field'>;
     protected _dropdownClassName: string;
@@ -84,6 +85,7 @@ export declare class FilterDescriptor<FilterModel, TableModel> implements IFilte
     get trimOption(): InputTrimType | undefined;
     get property(): string;
     get title(): string | undefined;
+    get titleUseModelBase(): boolean | undefined;
     get isGenericFilter(): boolean;
     get genericValueProvider(): ILookupDataProvider<string, any, any, "field"> | undefined;
     get dropdownClassName(): string;
@@ -136,15 +138,9 @@ export declare class FilterDescriptor<FilterModel, TableModel> implements IFilte
     /**
      * Sets default filter value for filter.
      *
-     * @param value Value for default filter.
      * @param matchMode Match mode for default filter.
+     * @param value Value for default filter.
      */
-    /**
-     * Sets default filter value for filter.
-     *
-     * @deprecated Use {withDefaultFilterValue} instead.
-     */
-    withDefaultFilter(value: FilterModel | FilterModel[] | undefined, matchMode: FilterMatchModeExtendedType): this;
     withDefaultValue(matchMode: 'exists' | 'doesNotExist'): this;
     withDefaultValue(matchMode: 'between', value: [FilterModel, FilterModel]): this;
     withDefaultValue(matchMode: 'in' | 'notIn', value: FilterModel[]): this;
@@ -197,10 +193,6 @@ export declare class FilterDescriptor<FilterModel, TableModel> implements IFilte
      * @param valueDataProvider Data provider for autocomplete.
      */
     withGenericValueProvider(valueDataProvider: ILookupDataProvider<string, any, any, 'field'>): this;
-    /**
-     * @deprecated Use ${withDatePickerDisplay} instead.
-     */
-    withDateFormat(format?: string, showTime?: boolean, showSeconds?: boolean): this;
     /**
      * Sets date picker display options.
      *
@@ -260,8 +252,9 @@ export declare class FilterDescriptor<FilterModel, TableModel> implements IFilte
      * Filter title. If non provided, the defaults are applied.
      *
      * @param title Title for the field.
+     * @param useModelBase Use model's i18n base key as base path for translation.
      */
-    withTitle(title: string): this;
+    withTitle(title: string, useModelBase?: boolean): this;
     withDropdownClassName(dropdownClassName: string): this;
     /**
      * Copies current descriptor to a new instance.

package/form/api/data-providers/lookup-data-provider.factory.d.ts

@@ -1,22 +1,19 @@
-import { ClassType, ServiceClassType } from '@mediusinc/mng-commons/core';
+import { ServiceClassType } from '@mediusinc/mng-commons/core';
 import { ModelDescriptor, TypeDescriptor } from '@mediusinc/mng-commons/model';
 import { LookupDataProviderInst } from './lookup.data-provider';
-export declare class LookupDataProvider extends LookupDataProviderInst<any> {
-    protected constructor();
-    static create<Model, Sorts = keyof Model, Filters extends keyof any = keyof Model>(): LookupDataProviderInst<Model, undefined, Sorts, Filters, undefined, undefined>;
-    static fromClass<Model, Sorts = keyof Model, Filters extends keyof any = keyof Model>(type: ClassType<Model>): LookupDataProviderInst<Model, undefined, Sorts, Filters, ClassType<Model>, undefined>;
-    static fromClassWithService<Model, Service, Sorts = keyof Model, Filters extends keyof any = keyof Model>(type: ClassType<Model>, serviceType: ServiceClassType<Service>): LookupDataProviderInst<Model, Service, Sorts, Filters, ClassType<Model>, ServiceClassType<Service>>;
-    static fromService<Service, Model, Sorts = keyof Model, Filters extends keyof any = keyof Model>(serviceType: ServiceClassType<Service>): LookupDataProviderInst<Model, Service, Sorts, Filters, undefined, ServiceClassType<Service>>;
-}
-export type LookupDataProviderCreateOptsType<TableModel, Sorts = keyof TableModel, Filters = keyof TableModel> = {
-    filtersType?: TypeDescriptor<Filters>;
-    sortsType?: TypeDescriptor<Sorts>;
-};
-export declare function lookupDataProvider<Model, Sorts = keyof Model, Filters extends keyof any = keyof Model>(): LookupDataProviderInst<Model, undefined, Sorts, Filters, undefined, undefined>;
-export declare function lookupDataProvider<Model, Sorts = keyof Model, Filters extends keyof any = keyof Model>(type: TypeDescriptor<Model>, opts?: LookupDataProviderCreateOptsType<Model, Sorts, Filters>): LookupDataProviderInst<Model, undefined, Sorts, Filters, undefined, undefined>;
-export declare function lookupDataProvider<Model, Service = any, Sorts = keyof Model, Filters extends keyof any = keyof Model>(type: TypeDescriptor<Model>, serviceType: ServiceClassType<Service>, opts?: LookupDataProviderCreateOptsType<Model, Sorts, Filters>): LookupDataProviderInst<Model, Service, Sorts, Filters, undefined, ServiceClassType<Service>>;
-export declare function lookupDataProviderWithService<Service, Model, Sorts = keyof Model, Filters extends keyof any = keyof Model>(serviceType: ServiceClassType<Service>, opts?: LookupDataProviderCreateOptsType<Model, Sorts, Filters>): LookupDataProviderInst<Model, Service, Sorts, Filters, undefined, ServiceClassType<Service>>;
-export declare function lookupDataProviderFromClass<Model, Sorts = keyof Model, Filters extends keyof any = keyof Model>(type: ClassType<Model>): LookupDataProviderInst<Model, undefined, Sorts, Filters, ClassType<Model>, undefined>;
-export declare function lookupDataProviderFromClass<Model, Service = any, Sorts = keyof Model, Filters extends keyof any = keyof Model>(type: ClassType<Model>, serviceType: ServiceClassType<Service>): LookupDataProviderInst<Model, Service, Sorts, Filters, ClassType<Model>, ServiceClassType<Service>>;
-export declare function lookupDataProviderFromModel<Model, Sorts = keyof Model, Filters extends keyof any = keyof Model, ModelClass = ClassType<Model>>(model: ModelDescriptor<Model, ModelClass>, opts?: LookupDataProviderCreateOptsType<Model, Sorts, Filters>): LookupDataProviderInst<Model, undefined, Sorts, Filters, ModelClass, undefined>;
-export declare function lookupDataProviderFromModel<Model, Sorts = keyof Model, Filters extends keyof any = keyof Model, Service = any, ModelClass = ClassType<Model>>(model: ModelDescriptor<Model, ModelClass>, ServiceClass: ServiceClassType<Service>, opts?: LookupDataProviderCreateOptsType<Model, Sorts, Filters>): LookupDataProviderInst<Model, Service, Sorts, Filters, ModelClass, ServiceClassType<Service>>;
+/**
+ * Creates and returns an instance of `LookupDataProviderInst` with the specified options for managing lookup data.
+ *
+ * @param {Object} [opts] - The options object to configure the data provider.
+ * @param {TypeDescriptor<Model> | ModelDescriptor<Model>} [opts.type] - The descriptor defining the type of model.
+ * @param {ServiceClassType<Service>} [opts.service] - The service class type associated with the data provider.
+ * @param {TypeDescriptor<CreateModel> | ModelDescriptor<CreateModel>} [opts.filtersType] - The descriptor defining the filters type.
+ * @param {TypeDescriptor<UpdateModel> | ModelDescriptor<UpdateModel>} [opts.sortsType] - The descriptor defining the sorts type.
+ * @return {LookupDataProviderInst<Model, Service, Sorts, Filters, ServiceClass>} An instance of `LookupDataProviderInst` configured according to the provided options.
+ */
+export declare function lookupDataProvider<Model, Service = any, Sorts = keyof Model, Filters extends keyof any = keyof Model, ServiceClass = Service extends undefined ? undefined : ServiceClassType<Service>>(opts?: {
+    type?: TypeDescriptor<Model> | ModelDescriptor<Model>;
+    service?: ServiceClassType<Service>;
+    filtersType?: TypeDescriptor<Filters> | ModelDescriptor<Filters>;
+    sortsType?: TypeDescriptor<Sorts> | ModelDescriptor<Sorts>;
+}): LookupDataProviderInst<Model, Service, Sorts, Filters, ServiceClass>;

package/form/api/data-providers/lookup.data-provider.d.ts

@@ -1,7 +1,7 @@
-import { ClassOptType, DataProviderInst, ILookupDataProvider, LookupDataProviderLookupFnType, ServiceClassOptType } from '@mediusinc/mng-commons/core';
-export declare class LookupDataProviderInst<Model, Service = any, Sorts = keyof Model, Filters extends keyof any = keyof Model, ModelClass = ClassOptType<Model>, ServiceClass = ServiceClassOptType<Service>> extends DataProviderInst<Model, Service, ModelClass, ServiceClass> implements ILookupDataProvider<Model, Service, Sorts, Filters, ModelClass, ServiceClass> {
+import { DataProviderInst, ILookupDataProvider, LookupDataProviderLookupFnType, ServiceClassOptType } from '@mediusinc/mng-commons/core';
+export declare class LookupDataProviderInst<Model, Service = any, Sorts = keyof Model, Filters extends keyof any = keyof Model, ServiceClass = ServiceClassOptType<Service>> extends DataProviderInst<Model, Service, ServiceClass> implements ILookupDataProvider<Model, Service, Sorts, Filters, ServiceClass> {
     protected _lookup: LookupDataProviderLookupFnType<Model, Service, Sorts, Filters>;
-    constructor(type: ModelClass, serviceType: ServiceClass);
+    constructor(serviceType: ServiceClass);
     get lookup(): LookupDataProviderLookupFnType<Model, Service, Sorts, Filters>;
     withLookup(fn: LookupDataProviderLookupFnType<Model, Service, Sorts, Filters>): this;
 }

package/form/api/descriptors/action-button.descriptor.d.ts

@@ -1,25 +1,23 @@
-import { ButtonStyleBuilder } from './button-style.builder';
-export declare class ActionButtonDescriptor {
+import { IActionButtonDescriptor, IButtonStyleDescriptor } from '../models/button.model';
+export declare class ActionButtonDescriptor implements IActionButtonDescriptor {
     private _label?;
     private _icon?;
-    private _iconPosition;
-    private _styleClass;
+    private _iconPosition?;
+    private _styleClass?;
     private _badge?;
     private _tooltip?;
     private _tooltipPosition?;
     withLabel(label?: string | null): this;
-    withIcon(icon: string | null): this;
-    withIconPosition(iconPosition: 'left' | 'right'): this;
-    withStyleClass(style: ButtonStyleBuilder): this;
+    withIcon(icon: string | null, iconPosition?: 'left' | 'right'): this;
+    withStyle(style?: IButtonStyleDescriptor): this;
     withBadge(badge: string): this;
-    withTooltip(tooltip: string, position?: 'top' | 'bottom' | 'left' | 'right'): this;
-    withTooltipPosition(position: 'top' | 'bottom' | 'left' | 'right'): this;
+    withTooltip(tooltip: string | null, position?: 'top' | 'bottom' | 'left' | 'right'): this;
     get label(): string | null | undefined;
     get icon(): string | null | undefined;
-    get iconPosition(): "left" | "right";
-    get styleClass(): ButtonStyleBuilder;
+    get iconPosition(): "left" | "right" | undefined;
+    get style(): IButtonStyleDescriptor | undefined;
     get badge(): string | undefined;
-    get tooltip(): string | undefined;
-    get tooltipPosition(): "top" | "bottom" | "left" | "right" | undefined;
+    get tooltip(): string | null | undefined;
+    get tooltipPosition(): "left" | "right" | "top" | "bottom" | undefined;
     copy(): ActionButtonDescriptor;
 }

package/form/api/descriptors/button-style.builder.d.ts

@@ -1,29 +1,26 @@
 import { StyleLevelEnum, StyleSizeEnum } from '@mediusinc/mng-commons/core';
-export declare class ButtonStyleBuilder {
-    private _size;
-    private _actionLevel;
-    private _textButton;
-    private _outlineButton;
-    private _raisedButton;
-    private _roundedStyle;
-    private _customClass?;
-    constructor(level?: StyleLevelEnum, customClass?: string);
-    build(hasNoTitle?: boolean): string;
-    /**
-     * creates instance of style builder with custom properties
-     * @param actionLevel ActionLevelEnum
-     * @param size ActionSizeEnum
-     * @param textButton if true, text button will be applied
-     * @param outlineButton if true, outlined button will be applied
-     * @param raisedButton if true, raised button will be applied
-     * @param customClass additional custom classes (will be added at generating)
-     */
-    static create(actionLevel?: StyleLevelEnum, size?: StyleSizeEnum, textButton?: boolean, outlineButton?: boolean, raisedButton?: boolean, roundedButton?: ButtonStyleRoundedEnum, customClass?: string): ButtonStyleBuilder;
+import { IButtonStyleDescriptor } from '../models/button.model';
+export declare class ButtonStyleBuilder implements IButtonStyleDescriptor {
+    private _level?;
+    private _size?;
+    private _textButton?;
+    private _outlined?;
+    private _raised?;
+    private _rounded?;
+    private _class?;
+    static from(opts?: IButtonStyleDescriptor): ButtonStyleBuilder;
+    get level(): StyleLevelEnum | undefined;
+    get size(): StyleSizeEnum | undefined;
+    get textButton(): boolean | undefined;
+    get outlined(): boolean | undefined;
+    get raised(): boolean | undefined;
+    get rounded(): boolean | undefined;
+    get class(): string | undefined;
     /**
      * sets custom action level and returns this object
-     * @param actionLevel
+     * @param level
      */
-    withActionLevel(actionLevel: StyleLevelEnum): ButtonStyleBuilder;
+    withLevel(level: StyleLevelEnum): ButtonStyleBuilder;
     /**
      * sets custom size and return this object
      * @param size
@@ -31,38 +28,27 @@ export declare class ButtonStyleBuilder {
     withSize(size: StyleSizeEnum): ButtonStyleBuilder;
     /**
      * sets text button property
-     * @param withText default true
+     * @param text default true
      */
-    withTextButton(withText?: boolean): ButtonStyleBuilder;
+    withTextButton(text?: boolean): ButtonStyleBuilder;
     /**
      * sets outline button property
-     * @param withOutline default true
+     * @param outlined default true
      */
-    withOutlineButton(withOutline?: boolean): ButtonStyleBuilder;
+    withOutlined(outlined?: boolean): ButtonStyleBuilder;
     /**
      * sets raised button property
-     * @param withRaised default true
+     * @param raised default true
      */
-    withRaisedButton(withRaised?: boolean): ButtonStyleBuilder;
-    withRoundedButton(roundedStyle?: ButtonStyleRoundedEnum): ButtonStyleBuilder;
+    withRaised(raised?: boolean): ButtonStyleBuilder;
+    withRounded(rounded?: boolean): ButtonStyleBuilder;
     /**
      * sets custom style class
      * @param customClass
      */
-    withCustomClass(customClass: string): ButtonStyleBuilder;
-    private convertActionLevelToStyleClass;
-    private convertSizeToStyleClass;
+    withClass(customClass: string): ButtonStyleBuilder;
+    build(hasNoTitle?: boolean): string;
     copy(): ButtonStyleBuilder;
-    get actionLevel(): StyleLevelEnum;
-    get size(): StyleSizeEnum;
-    get textButton(): boolean;
-    get outlineButton(): boolean;
-    get raisedButton(): boolean;
-    get roundedStyle(): ButtonStyleRoundedEnum;
-    get customClass(): string | undefined;
-}
-export declare enum ButtonStyleRoundedEnum {
-    DEFAULT = 0,
-    ROUNDED = 1,
-    SQUARE = 2
+    private levelToStyleClass;
+    private sizeToStyleClass;
 }

package/form/api/index.d.ts

@@ -2,4 +2,5 @@ export * from './data-providers/lookup.data-provider';
 export * from './data-providers/lookup-data-provider.factory';
 export * from './descriptors/action-button.descriptor';
 export * from './descriptors/button-style.builder';
+export * from './models/button.model';
 export * from './models/trim.model';

package/form/api/models/button.model.d.ts

@@ -0,0 +1,19 @@
+import { StyleLevelEnum, StyleSizeEnum } from '@mediusinc/mng-commons/core';
+export interface IActionButtonDescriptor {
+    label?: string | null;
+    icon?: string | null;
+    iconPosition?: 'left' | 'right';
+    style?: IButtonStyleDescriptor;
+    badge?: string;
+    tooltip?: string | null;
+    tooltipPosition?: 'top' | 'bottom' | 'left' | 'right';
+}
+export interface IButtonStyleDescriptor {
+    size?: StyleSizeEnum;
+    level?: StyleLevelEnum;
+    textButton?: boolean;
+    outlined?: boolean;
+    raised?: boolean;
+    rounded?: boolean;
+    class?: string;
+}

package/i18n/sl.json

@@ -18,7 +18,7 @@
     "returnHome": "Pojdi nazaj na začetno stran",
     "confirmation": "Potrditev",
     "success": "Uspešno",
-    "successMessage": "Operacija uspešna.",
+    "successMessage": "Akcija uspešna.",
     "error": "Napaka",
     "errorMessage": "{{errorMessage}}",
     "general": "Splošno",
@@ -248,11 +248,61 @@
     "choose": "Izberi",
     "upload": "Naloži",
     "cancel": "Prekliči",
-    "dayNames": ["Nedelja", "Ponedeljek", "Torek", "Sreda", "Četrtek", "Petek", "Sobota"],
-    "dayNamesShort": ["Ned", "Pon", "Tor", "Sre", "Čet", "Pet", "Sob"],
-    "dayNamesMin": ["Ne", "Po", "To", "Sr", "Če", "Pe", "So"],
-    "monthNames": ["Januar", "Februar", "Marec", "April", "Maj", "Junij", "Julij", "Avgust", "September", "Oktober", "November", "December"],
-    "monthNamesShort": ["Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Avg", "Sep", "Okt", "Nov", "Dec"],
+    "dayNames": [
+      "Nedelja",
+      "Ponedeljek",
+      "Torek",
+      "Sreda",
+      "Četrtek",
+      "Petek",
+      "Sobota"
+    ],
+    "dayNamesShort": [
+      "Ned",
+      "Pon",
+      "Tor",
+      "Sre",
+      "Čet",
+      "Pet",
+      "Sob"
+    ],
+    "dayNamesMin": [
+      "Ne",
+      "Po",
+      "To",
+      "Sr",
+      "Če",
+      "Pe",
+      "So"
+    ],
+    "monthNames": [
+      "Januar",
+      "Februar",
+      "Marec",
+      "April",
+      "Maj",
+      "Junij",
+      "Julij",
+      "Avgust",
+      "September",
+      "Oktober",
+      "November",
+      "December"
+    ],
+    "monthNamesShort": [
+      "Jan",
+      "Feb",
+      "Mar",
+      "Apr",
+      "Maj",
+      "Jun",
+      "Jul",
+      "Avg",
+      "Sep",
+      "Okt",
+      "Nov",
+      "Dec"
+    ],
     "dateFormat": "dd.mm.yy",
     "firstDayOfWeek": 0,
     "today": "Danes",

package/model/class/README.md

@@ -0,0 +1,8 @@
+# @mediusinc/mng-commons/model/class
+
+Secondary entry point of `@mediusinc/mng-commons`. It can be used by importing from `@mediusinc/mng-commons/model/class`.
+
+## Dependencies within commons
+
+- `@mediusinc/mng-commons/core`
+- `@mediusinc/mng-commons/model`

package/model/class/data-providers/base-from-class-data-provider.factory.d.ts

@@ -0,0 +1,3 @@
+import { ClassType, DataProviderInst, ServiceClassType } from '@mediusinc/mng-commons/core';
+export declare function dataProviderFromClass<Model>(type: ClassType<Model>): DataProviderInst<Model, undefined, undefined>;
+export declare function dataProviderFromClass<Model, Service = any>(type: ClassType<Model>, ServiceClass: ServiceClassType<Service>): DataProviderInst<Model, Service, ServiceClassType<Service>>;

package/model/class/descriptors/model-class.descriptor.d.ts

@@ -0,0 +1,12 @@
+import { ClassType, IModelDescriptor } from '@mediusinc/mng-commons/core';
+import { ModelDescriptor, ModelDescriptorCreateOpts } from '@mediusinc/mng-commons/model';
+export declare class ModelClassDescriptor<Model> extends ModelDescriptor<Model> implements IModelDescriptor<Model> {
+    private readonly _classType;
+    constructor(_type: ClassType<Model>, idProperty?: string, titleProperty?: string | ((item: Model) => string), i18nBaseKey?: string);
+    get classType(): ClassType<Model>;
+    copy(): ModelClassDescriptor<Model>;
+}
+export type ModelClassDescriptorCreateOpts<Model> = Omit<ModelDescriptorCreateOpts<Model>, 'i18nBase'> & {
+    i18nBase?: string | ClassType<unknown>;
+};
+export declare function modelClass<Model>(type: ClassType<Model>, opts?: ModelClassDescriptorCreateOpts<Model>): ModelClassDescriptor<Model>;

package/model/class/descriptors/type-class.descriptor.d.ts

@@ -0,0 +1,3 @@
+import { ClassType } from '@mediusinc/mng-commons/core';
+import { TypeDescriptor } from '@mediusinc/mng-commons/model';
+export declare function typeFromClass<Type>(type: ClassType<Type>): TypeDescriptor<Type>;

package/model/{helpers → class/helpers}/model.d.ts

@@ -1,5 +1,4 @@
-import { ClassAttributeDef, ClassType, ILookupDescriptor } from '@mediusinc/mng-commons/core';
+import { ClassAttributeDef, ClassType } from '@mediusinc/mng-commons/core';
 export declare function findClassIdAttribute<T>(classType?: ClassType<T>): string | null;
 export declare function findClassTitleAttribute<T>(classType?: ClassType<T>): string | null;
 export declare function getClassAttributeDef<T>(classType?: ClassType<T>): ClassAttributeDef[] | null;
-export declare function trySetLookupItemsProperties<Model>(lookup: ILookupDescriptor<Model, any, any, any>, idAsTrack?: boolean): void;

package/model/class/index.d.ts

@@ -0,0 +1,4 @@
+export * from './data-providers/base-from-class-data-provider.factory';
+export * from './descriptors/model-class.descriptor';
+export * from './descriptors/type-class.descriptor';
+export * from './helpers/model';

package/model/data-providers/base-from-type-data-provider.factory.d.ts

@@ -1,8 +1,15 @@
-import { ClassType, DataProviderInst, ServiceClassType } from '@mediusinc/mng-commons/core';
+import { DataProviderInst, ServiceClassType } from '@mediusinc/mng-commons/core';
 import { ModelDescriptor } from '../descriptors/model.descriptor';
 import { TypeDescriptor } from '../descriptors/type.descriptor';
-export declare function dataProvider<Model>(): DataProviderInst<Model, undefined, undefined, undefined>;
-export declare function dataProvider<Model>(type: TypeDescriptor<Model>): DataProviderInst<Model, undefined, undefined, undefined>;
-export declare function dataProvider<Model, Service = any>(type: TypeDescriptor<Model>, serviceType: ServiceClassType<Service>): DataProviderInst<Model, Service, undefined, ServiceClassType<Service>>;
-export declare function dataProviderFromModel<Model, ModelClass = ClassType<Model>>(model: ModelDescriptor<Model, ModelClass>): DataProviderInst<Model, undefined, ModelClass, undefined>;
-export declare function dataProviderFromModel<Model, Service = any, ModelClass = ClassType<Model>>(model: ModelDescriptor<Model, ModelClass>, ServiceClass: ServiceClassType<Service>): DataProviderInst<Model, Service, ModelClass, ServiceClassType<Service>>;
+/**
+ * Creates and returns an instance of `DataProviderInst` with the specified options for managing editor data.
+ *
+ * @param {Object} [opts] - The options object to configure the data provider.
+ * @param {TypeDescriptor<Model> | ModelDescriptor<Model>} [opts.type] - The descriptor defining the type of model.
+ * @param {ServiceClassType<Service>} [opts.service] - The service class type associated with the data provider.
+ * @return {DataProviderInst<Model, Service, ServiceClass>} An instance of `EditorDataProviderInst` configured according to the provided options.
+ */
+export declare function dataProvider<Model, Service = undefined, ServiceClass = Service extends undefined ? undefined : ServiceClassType<Service>>(opts?: {
+    type?: TypeDescriptor<Model> | ModelDescriptor<Model>;
+    service?: ServiceClassType<Service>;
+}): DataProviderInst<Model, Service, ServiceClass>;

package/model/descriptors/model.descriptor.d.ts

@@ -1,24 +1,10 @@
-import { ClassOptType, ClassType, IModelDescriptor } from '@mediusinc/mng-commons/core';
+import { IModelDescriptor } from '@mediusinc/mng-commons/core';
 import { TypeDescriptor } from './type.descriptor';
-export declare class ModelDescriptor<Model, ModelClass = ClassOptType<Model>> implements IModelDescriptor<Model, ModelClass> {
-    private readonly _type;
-    private _i18nBaseKey;
-    private _idProperty?;
-    private _titleProperty?;
-    constructor(type: ModelClass, idProperty?: string, titleProperty?: string | ((item: Model) => string), i18nBaseKey?: string | ClassType<any>);
-    /**
-     * @deprecated Use standalone {model()} instead.
-     */
-    static create<Model>(idProperty?: keyof Model, titleProperty?: keyof Model, i18nBaseKey?: string | ClassType<unknown>): ModelDescriptor<Model, undefined>;
-    /**
-     * @deprecated Use standalone {model()} instead.
-     */
-    static fromClass<Model>(type: ClassType<Model>, idProperty?: keyof Model, titleProperty?: keyof Model, i18nBaseKey?: string | ClassType<unknown>): ModelDescriptor<Model, ClassType<Model>>;
-    get type(): ModelClass;
-    /**
-     * @deprecated Use `i18nBaseKey` instead.
-     */
-    get typeName(): string;
+export declare class ModelDescriptor<Model> implements IModelDescriptor<Model> {
+    protected _i18nBaseKey: string;
+    protected _idProperty?: string;
+    protected _titleProperty?: string | ((item: Model) => string);
+    constructor(idProperty?: string, titleProperty?: string | ((item: Model) => string), i18nBaseKey?: string);
     get i18nBaseKey(): string;
     get idProperty(): string | undefined;
     get titleProperty(): string | ((item: Model) => string) | undefined;
@@ -26,15 +12,14 @@ export declare class ModelDescriptor<Model, ModelClass = ClassOptType<Model>> im
     withIdPropertyUnsafe(property: string): this;
     withTitleProperty(property: keyof Model): this;
     withTitlePropertyUnsafe(property: string): this;
-    withI18nBase(base: ClassType<any> | string): this;
-    copy(): ModelDescriptor<Model, ModelClass>;
+    withI18nBase(base: string): this;
+    copy(): ModelDescriptor<Model>;
 }
 export type ModelDescriptorCreateOpts<Model> = {
     id?: keyof Model;
     title?: keyof Model | ((item: Model) => string);
-    i18nBase?: string | ClassType<any>;
+    i18nBase?: string;
 };
-export declare function model<Model>(): ModelDescriptor<Model, undefined>;
-export declare function model<Model>(opts: ModelDescriptorCreateOpts<Model>): ModelDescriptor<Model, undefined>;
-export declare function model<Model>(type: TypeDescriptor<Model>, opts?: ModelDescriptorCreateOpts<Model>): ModelDescriptor<Model, undefined>;
-export declare function model<Model>(clazz: ClassType<Model>, opts?: ModelDescriptorCreateOpts<Model>): ModelDescriptor<Model, ClassType<Model>>;
+export declare function model<Model>(): ModelDescriptor<Model>;
+export declare function model<Model>(opts: ModelDescriptorCreateOpts<Model>): ModelDescriptor<Model>;
+export declare function model<Model>(type: TypeDescriptor<Model>, opts?: ModelDescriptorCreateOpts<Model>): ModelDescriptor<Model>;

package/model/descriptors/type.descriptor.d.ts

@@ -1,8 +1,3 @@
-import { ClassType } from '@mediusinc/mng-commons/core';
 export declare class TypeDescriptor<Type> {
-    private readonly _classType?;
-    constructor(classType?: ClassType<Type>);
-    get classType(): ClassType<Type> | undefined;
 }
 export declare function type<Type>(): TypeDescriptor<Type>;
-export declare function typeClass<Type>(type: ClassType<Type>): TypeDescriptor<Type>;

package/model/helpers/i18n.d.ts

@@ -1,8 +1,13 @@
 import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
-import { KeyOfType } from '@mediusinc/mng-commons/core';
 import { ModelDescriptor } from '../descriptors/model.descriptor';
-export declare function getI18nForModel(translate: TranslateService, model: ModelDescriptor<any>, keyPath: string, customKey?: string, item?: any, fallbackKey?: string, params?: any): string | null;
+type ModelI18nOptsType = {
+    customKey?: string;
+    fallbackKey?: string;
+    item?: any;
+    params?: any;
+};
+export declare function getI18nForModel(translate: TranslateService, model: ModelDescriptor<any>, keyPath: string, opts?: ModelI18nOptsType): string | null;
 export declare function getI18nModelParams(translate: TranslateService, model?: ModelDescriptor<any>, item?: any, params?: any): any;
 export declare function getI18nModelParamsAsync(translate: TranslateService, model?: ModelDescriptor<any>, item?: any, params?: any): Observable<any>;
-export declare function populateI18nModelParams(idProperty?: KeyOfType, titleProperty?: KeyOfType | ((item: any) => string), item?: any, params?: any): any;
+export {};

package/model/index.d.ts

@@ -3,4 +3,3 @@ export * from './descriptors/enum.descriptor';
 export * from './descriptors/model.descriptor';
 export * from './descriptors/type.descriptor';
 export * from './helpers/i18n';
-export * from './helpers/model';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mediusinc/mng-commons",
-  "version": "5.5.0",
+  "version": "6.0.0-rc.3",
   "peerDependencies": {
     "@angular/animations": "^17.3.0 || ^18.0.0",
     "@angular/common": "^17.3.0 || ^18.0.0",
@@ -44,18 +44,18 @@
       "esm": "./esm2022/filter/mediusinc-mng-commons-filter.mjs",
       "default": "./fesm2022/mediusinc-mng-commons-filter.mjs"
     },
-    "./form": {
-      "types": "./form/index.d.ts",
-      "esm2022": "./esm2022/form/mediusinc-mng-commons-form.mjs",
-      "esm": "./esm2022/form/mediusinc-mng-commons-form.mjs",
-      "default": "./fesm2022/mediusinc-mng-commons-form.mjs"
-    },
     "./model": {
       "types": "./model/index.d.ts",
       "esm2022": "./esm2022/model/mediusinc-mng-commons-model.mjs",
       "esm": "./esm2022/model/mediusinc-mng-commons-model.mjs",
       "default": "./fesm2022/mediusinc-mng-commons-model.mjs"
     },
+    "./form": {
+      "types": "./form/index.d.ts",
+      "esm2022": "./esm2022/form/mediusinc-mng-commons-form.mjs",
+      "esm": "./esm2022/form/mediusinc-mng-commons-form.mjs",
+      "default": "./fesm2022/mediusinc-mng-commons-form.mjs"
+    },
     "./table": {
       "types": "./table/index.d.ts",
       "esm2022": "./esm2022/table/mediusinc-mng-commons-table.mjs",
@@ -68,6 +68,12 @@
       "esm": "./esm2022/tableview/mediusinc-mng-commons-tableview.mjs",
       "default": "./fesm2022/mediusinc-mng-commons-tableview.mjs"
     },
+    "./model/class": {
+      "types": "./model/class/index.d.ts",
+      "esm2022": "./esm2022/model/class/mediusinc-mng-commons-model-class.mjs",
+      "esm": "./esm2022/model/class/mediusinc-mng-commons-model-class.mjs",
+      "default": "./fesm2022/mediusinc-mng-commons-model-class.mjs"
+    },
     "./form/api": {
       "types": "./form/api/index.d.ts",
       "esm2022": "./esm2022/form/api/mediusinc-mng-commons-form-api.mjs",
@@ -85,6 +91,18 @@
       "esm2022": "./esm2022/tableview/api/mediusinc-mng-commons-tableview-api.mjs",
       "esm": "./esm2022/tableview/api/mediusinc-mng-commons-tableview-api.mjs",
       "default": "./fesm2022/mediusinc-mng-commons-tableview-api.mjs"
+    },
+    "./table/api/class": {
+      "types": "./table/api/class/index.d.ts",
+      "esm2022": "./esm2022/table/api/class/mediusinc-mng-commons-table-api-class.mjs",
+      "esm": "./esm2022/table/api/class/mediusinc-mng-commons-table-api-class.mjs",
+      "default": "./fesm2022/mediusinc-mng-commons-table-api-class.mjs"
+    },
+    "./tableview/api/class": {
+      "types": "./tableview/api/class/index.d.ts",
+      "esm2022": "./esm2022/tableview/api/class/mediusinc-mng-commons-tableview-api-class.mjs",
+      "esm": "./esm2022/tableview/api/class/mediusinc-mng-commons-tableview-api-class.mjs",
+      "default": "./fesm2022/mediusinc-mng-commons-tableview-api-class.mjs"
     }
   }
 }