@stemy/ngx-dynamic-form 19.8.9 → 19.8.11

package/ngx-dynamic-form/common-types.d.ts

@@ -9,12 +9,14 @@ export type DynamicFormStatus = "VALID" | "INVALID" | "PENDING" | "DISABLED" | "
 export type DynamicFormUpdateOn = "change" | "blur" | "submit";
 export type FormFieldKey = string | number | (string | number)[];
 export type FormFieldLabelCustomizer = (key: string, label: string, parent: FormFieldConfig, labelPrefix: string) => string;
-export interface FormBuilderOptions {
+export interface FormBuilderOptionsBase {
     labelPrefix?: string;
     labelCustomizer?: FormFieldLabelCustomizer;
+    legacyLabels?: boolean;
     testId?: string;
     context?: any;
 }
+export type FormBuilderOptions = RequireAtLeastOne<FormBuilderOptionsBase>;
 /**
  * This type describes how one of the array actions should react based on an array item
  */
@@ -320,12 +322,16 @@ export type FormGroupData = FormFieldData & Pick<FormFieldProps, "useTabs"> & {
 };
 export type FormArrayData = FormFieldData & Pick<FormFieldProps, "useTabs" | "tabsLabel" | "insertItem" | "cloneItem" | "moveItem" | "removeItem" | "addItem" | "clearItems">;
 export type FormSerializerData = RequireAtLeastOne<Pick<FormFieldData, "serialize" | "serializer">>;
+export type FormFieldSetData = RequireAtLeastOne<Pick<FormFieldData, "classes" | "layout">> & {
+    id: string;
+};
 export type AsyncSubmitMode = "click" | "submit" | "all";
 export type AsyncSubmitMethod = (form: IDynamicForm, context?: any, ev?: MouseEvent) => Promise<IAsyncMessage>;
 export type FormFieldCustomizer = (field: FormFieldConfig, options: FormBuilderOptions, injector: Injector, property: OpenApiSchemaProperty, schema: OpenApiSchema) => MaybePromise<MaybeArray<FormFieldConfig>>;
-export interface ConfigForSchemaOptions extends FormBuilderOptions {
+export interface ConfigForSchemaOptionsBase extends FormBuilderOptionsBase {
     fieldCustomizer?: FormFieldCustomizer;
 }
+export type ConfigForSchemaOptions = RequireAtLeastOne<ConfigForSchemaOptionsBase>;
 export type CustomizerOrSchemaOptions = FormFieldCustomizer | ConfigForSchemaOptions;
 export interface IDynamicFormModuleConfig {
     options?: ConfigOption[];

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

@@ -15,6 +15,7 @@ export declare class DynamicFormComponent implements IDynamicForm {
     readonly labelCustomizer: import("@angular/core").InputSignal<FormFieldLabelCustomizer>;
     readonly testId: import("@angular/core").InputSignal<string>;
     readonly useTabs: import("@angular/core").InputSignal<boolean>;
+    readonly legacyLabels: import("@angular/core").InputSignal<boolean>;
     readonly data: import("@angular/core").InputSignal<any>;
     readonly fields: import("@angular/core").InputSignal<FormFieldConfig<import("../../common-types").FormFieldProps>[]>;
     readonly fieldChanges: Subject<FormFieldChangeEvent>;
@@ -34,5 +35,5 @@ export declare class DynamicFormComponent implements IDynamicForm {
     getField(path: string): FormFieldConfig;
     getControl(path: string): AbstractControl;
     static ɵfac: i0.ɵɵFactoryDeclaration<DynamicFormComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<DynamicFormComponent, "dynamic-form", never, { "labelPrefix": { "alias": "labelPrefix"; "required": false; "isSignal": true; }; "labelCustomizer": { "alias": "labelCustomizer"; "required": false; "isSignal": true; }; "testId": { "alias": "testId"; "required": false; "isSignal": true; }; "useTabs": { "alias": "useTabs"; "required": false; "isSignal": true; }; "data": { "alias": "data"; "required": false; "isSignal": true; }; "fields": { "alias": "fields"; "required": false; "isSignal": true; }; }, { "onSubmit": "onSubmit"; "onChanges": "onChanges"; }, never, ["*"], false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<DynamicFormComponent, "dynamic-form", never, { "labelPrefix": { "alias": "labelPrefix"; "required": false; "isSignal": true; }; "labelCustomizer": { "alias": "labelCustomizer"; "required": false; "isSignal": true; }; "testId": { "alias": "testId"; "required": false; "isSignal": true; }; "useTabs": { "alias": "useTabs"; "required": false; "isSignal": true; }; "legacyLabels": { "alias": "legacyLabels"; "required": false; "isSignal": true; }; "data": { "alias": "data"; "required": false; "isSignal": true; }; "fields": { "alias": "fields"; "required": false; "isSignal": true; }; }, { "onSubmit": "onSubmit"; "onChanges": "onChanges"; }, never, ["*"], false, never>;
 }

package/ngx-dynamic-form/services/dynamic-form-builder.service.d.ts

@@ -1,7 +1,7 @@
 import { Injector, Type } from "@angular/core";
 import { Observable } from "rxjs";
 import { EventsService, IApiService, ILanguageService } from "@stemy/ngx-utils";
-import { FormArrayData, FormBuilderOptions, FormFieldConfig, FormFieldData, FormFieldProps, FormFieldSerializer, FormGroupData, FormInputData, FormSelectData, FormSelectOption, FormSerializerData, FormStaticData, FormUploadData } from "../common-types";
+import { FormArrayData, FormBuilderOptions, FormFieldConfig, FormFieldData, FormFieldProps, FormFieldSerializer, FormFieldSetData, FormGroupData, FormInputData, FormSelectData, FormSelectOption, FormSerializerData, FormStaticData, FormUploadData } from "../common-types";
 import * as i0 from "@angular/core";
 export type FormFieldBuilder = (fb: DynamicFormBuilderService, parent: FormFieldConfig, options: FormBuilderOptions) => Partial<FormFieldConfig>;
 export declare class DynamicFormBuilderService {
@@ -11,22 +11,23 @@ export declare class DynamicFormBuilderService {
     protected readonly languages: ILanguageService;
     readonly language: Observable<string>;
     constructor(injector: Injector, events: EventsService, api: IApiService, languages: ILanguageService);
-    resolveFormFields(target: Type<any>, parent: FormFieldConfig, options: FormBuilderOptions): FormFieldConfig[];
+    resolveFormFields(type: Type<any>, parent: FormFieldConfig, options?: FormBuilderOptions): FormFieldConfig[];
     resolveFormGroup(key: string, target: Type<any>, data: FormGroupData, parent?: FormFieldConfig, options?: FormBuilderOptions): FormFieldConfig;
     resolveFormArray(key: string, itemType: string | FormInputData | Type<any>, data: FormArrayData, parent?: FormFieldConfig, options?: FormBuilderOptions): FormFieldConfig;
-    createFieldSets(fields: FormFieldConfig[], parent: FormFieldConfig, options: FormBuilderOptions): FormFieldConfig[];
-    createFormInput(key: string, data: FormInputData, parent: FormFieldConfig, options: FormBuilderOptions): FormFieldConfig;
-    createFormSelect(key: string, data: FormSelectData, parent: FormFieldConfig, options: FormBuilderOptions): FormFieldConfig;
-    createFormStatic(key: string, data: FormStaticData, parent: FormFieldConfig, options: FormBuilderOptions): FormFieldConfig;
-    createFormUpload(key: string, data: FormUploadData, parent: FormFieldConfig, options: FormBuilderOptions): FormFieldConfig;
-    createFormGroup(key: string, fields: (parent: FormFieldConfig) => FormFieldConfig[], data: FormGroupData, parent: FormFieldConfig, options: FormBuilderOptions): FormFieldConfig;
-    createFormGroup(key: string, fields: (parent: FormFieldConfig) => Promise<FormFieldConfig[]>, data: FormGroupData, parent: FormFieldConfig, options: FormBuilderOptions): Promise<FormFieldConfig>;
-    createFormArray(key: string, fields: (parent: FormFieldConfig) => FormFieldConfig | FormFieldConfig[], data: FormArrayData, parent: FormFieldConfig, options: FormBuilderOptions): FormFieldConfig;
-    createFormArray(key: string, fields: (parent: FormFieldConfig) => Promise<FormFieldConfig | FormFieldConfig[]>, data: FormArrayData, parent: FormFieldConfig, options: FormBuilderOptions): Promise<FormFieldConfig>;
-    createFormSerializer(data: FormFieldSerializer | FormSerializerData): Partial<FormFieldConfig>;
+    createFieldSets(fields: FormFieldConfig[], parent: FormFieldConfig, options?: FormBuilderOptions, sets?: FormFieldSetData[]): FormFieldConfig[];
+    createFormInput(key: string, data: FormInputData, parent: FormFieldConfig, options?: FormBuilderOptions): FormFieldConfig;
+    createFormSelect(key: string, data: FormSelectData, parent: FormFieldConfig, options?: FormBuilderOptions): FormFieldConfig;
+    createFormStatic(key: string, data: FormStaticData, parent: FormFieldConfig, options?: FormBuilderOptions): FormFieldConfig;
+    createFormUpload(key: string, data: FormUploadData, parent: FormFieldConfig, options?: FormBuilderOptions): FormFieldConfig;
+    createFormGroup(key: string, fields: (parent: FormFieldConfig) => FormFieldConfig[], data: FormGroupData, parent: FormFieldConfig, options?: FormBuilderOptions): FormFieldConfig;
+    createFormGroup(key: string, fields: (parent: FormFieldConfig) => Promise<FormFieldConfig[]>, data: FormGroupData, parent: FormFieldConfig, options?: FormBuilderOptions): Promise<FormFieldConfig>;
+    createFormArray(key: string, fields: (parent: FormFieldConfig) => FormFieldConfig | FormFieldConfig[], data: FormArrayData, parent: FormFieldConfig, options?: FormBuilderOptions): FormFieldConfig;
+    createFormArray(key: string, fields: (parent: FormFieldConfig) => Promise<FormFieldConfig | FormFieldConfig[]>, data: FormArrayData, parent: FormFieldConfig, options?: FormBuilderOptions): Promise<FormFieldConfig>;
+    createFormSerializer(key: string, data: FormFieldSerializer | FormSerializerData): Partial<FormFieldConfig>;
     fixSelectOptions(field: FormFieldConfig, options: FormSelectOption[]): Promise<FormSelectOption[]>;
-    protected getLabel(key: string, label: string, parent: FormFieldConfig, options: FormBuilderOptions): string;
-    protected createFormField(key: string, type: string, data: FormFieldData, props: FormFieldProps, parent: FormFieldConfig, options: FormBuilderOptions): FormFieldConfig;
+    protected isFieldset(field: FormFieldConfig): boolean;
+    protected getLabel(key: string, label: string, parent: FormFieldConfig, options: FormBuilderOptions, legacyPrefix?: string): string;
+    protected createFormField(key: string, type: string, data: FormFieldData, props: FormFieldProps, parent: FormFieldConfig, options?: FormBuilderOptions): FormFieldConfig;
     protected shouldDisplay(field: FormFieldConfig): boolean;
     protected isValid(field: FormFieldConfig): boolean;
     protected setExpressions(field: FormFieldConfig, options: FormBuilderOptions): void;

package/ngx-dynamic-form/utils/decorators.d.ts

@@ -1,11 +1,10 @@
-import { FormArrayData, FormFieldSerializer, FormGroupData, FormInputData, FormSelectData, FormSerializerData, FormStaticData, FormUploadData } from "../common-types";
 import { Type } from "@angular/core";
-export declare function FormSerializable(data?: FormFieldSerializer | FormSerializerData): PropertyDecorator;
+import { FormArrayData, FormFieldSerializer, FormFieldSetData, FormGroupData, FormInputData, FormSelectData, FormSerializerData, FormStaticData, FormUploadData } from "../common-types";
 export declare function FormInput(data?: FormInputData): PropertyDecorator;
 export declare function FormSelect(data?: FormSelectData): PropertyDecorator;
 export declare function FormUpload(data?: FormUploadData): PropertyDecorator;
-export declare function FormFile(data?: FormUploadData): PropertyDecorator;
 export declare function FormStatic(data?: FormStaticData): PropertyDecorator;
 export declare function FormGroup(data?: FormGroupData): PropertyDecorator;
 export declare function FormArray(itemType: string | FormInputData | Type<any>, data?: FormArrayData): PropertyDecorator;
-export declare function FormModel(data?: FormGroupData): PropertyDecorator;
+export declare function FormSerializable(data?: FormFieldSerializer | FormSerializerData): PropertyDecorator;
+export declare function FormFieldSet(data: FormFieldSetData): ClassDecorator;

package/ngx-dynamic-form/utils/internal.d.ts

@@ -1,9 +1,9 @@
 import { Injector } from "@angular/core";
 import { KeysOfType, MaybeArray, OpenApiSchema, OpenApiSchemaProperty } from "@stemy/ngx-utils";
-import { AllValidationErrors, CustomizerOrSchemaOptions, FormBuilderOptions, FormFieldArrayItemsAction, FormFieldConfig, FormFieldExpression, FormFieldProps } from "../common-types";
+import { AllValidationErrors, CustomizerOrSchemaOptions, FormBuilderOptionsBase, FormFieldArrayItemsAction, FormFieldConfig, FormFieldExpression, FormFieldProps } from "../common-types";
 import { AbstractControl } from "@angular/forms";
 export type ConfigForSchemaWrapMode = "wrap" | "customizer";
-export interface ConfigForSchemaWrapOptions extends Required<FormBuilderOptions> {
+export interface ConfigForSchemaWrapOptions extends Required<FormBuilderOptionsBase> {
     readonly injector: Injector;
     readonly schema: OpenApiSchema;
     customize(field: FormFieldConfig, property: OpenApiSchemaProperty, schema: OpenApiSchema): Promise<FormFieldConfig[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stemy/ngx-dynamic-form",
-  "version": "19.8.9",
+  "version": "19.8.11",
   "license": "MIT",
   "public": true,
   "repository": "https://github.com/stemyke/ngx-dynamic-form.git",
@@ -22,7 +22,7 @@
     "ngx-device-detector": "^9.0.0",
     "@floating-ui/dom": "^1.7.1",
     "json5": "^2.2.3",
-    "@stemy/ngx-utils": ">=19.8.5",
+    "@stemy/ngx-utils": ">=19.8.10",
     "@ngx-formly/core": "^7.0.0",
     "ngx-mask": "^19.0.7",
     "@angular/material": "^19.2.18"

package/public_api.d.ts

@@ -1,6 +1,6 @@
-export { FORM_ROOT_ID, FormFieldKey, FormFieldLabelCustomizer, FormBuilderOptions, FormFieldArrayItemsAction, FormFieldProps, FormFieldSerializer, FormHookFn, FormHookConfig, FormFieldExpression, FormFieldExpressions, FormFieldConfig, FormFieldType, FormFieldChangeEvent, FormSerializeResult, FormSelectOption, FormSelectOptions, FormSelectOptionsFactory, FormFieldConditionFn, FormFieldCondition, IDynamicForm, ValidationMessageFn, ValidatorFn, ValidatorExpression, Validators, AsyncValidatorFn, AsyncValidatorExpression, AsyncValidators, AllValidationErrors, FormFieldCustom, FormFieldData, FormInputData, FormSelectData, FormStaticData, FormUploadData, FormGroupData, FormArrayData, FormSerializerData, AsyncSubmitMode, AsyncSubmitMethod, FormFieldCustomizer, ConfigForSchemaOptions, DynamicFormStatus, DynamicFormUpdateOn, IDynamicFormModuleConfig, } from "./ngx-dynamic-form/common-types";
+export { FORM_ROOT_ID, FormFieldKey, FormFieldLabelCustomizer, FormBuilderOptions, FormFieldArrayItemsAction, FormFieldProps, FormFieldSerializer, FormHookFn, FormHookConfig, FormFieldExpression, FormFieldExpressions, FormFieldConfig, FormFieldType, FormFieldChangeEvent, FormSerializeResult, FormSelectOption, FormSelectOptions, FormSelectOptionsFactory, FormFieldConditionFn, FormFieldCondition, IDynamicForm, ValidationMessageFn, ValidatorFn, ValidatorExpression, Validators, AsyncValidatorFn, AsyncValidatorExpression, AsyncValidators, AllValidationErrors, FormFieldCustom, FormFieldData, FormInputData, FormSelectData, FormStaticData, FormUploadData, FormGroupData, FormArrayData, FormSerializerData, FormFieldSetData, AsyncSubmitMode, AsyncSubmitMethod, FormFieldCustomizer, ConfigForSchemaOptions, DynamicFormStatus, DynamicFormUpdateOn, IDynamicFormModuleConfig, } from "./ngx-dynamic-form/common-types";
 export { IFormFieldCustomizer, customizeFormField } from "./ngx-dynamic-form/utils/customizer";
-export { FormSerializable, FormInput, FormSelect, FormStatic, FormUpload, FormFile, FormGroup, FormArray, FormModel } from "./ngx-dynamic-form/utils/decorators";
+export { FormInput, FormSelect, FormStatic, FormUpload, FormGroup, FormArray, FormSerializable, FormFieldSet } from "./ngx-dynamic-form/utils/decorators";
 export { addFieldValidators, removeFieldValidators, jsonValidation, requiredValidation, translationValidation, phoneValidation, emailValidation, arrayLengthValidation, minLengthValidation, maxLengthValidation, minValueValidation, maxValueValidation } from "./ngx-dynamic-form/utils/validation";
 export { replaceSpecialChars, controlValues, controlStatus, convertToDateFormat, convertToDate, convertToNumber, getFieldByPath, getFieldsByPredicate, getFieldsByKey, getSelectOptions, replaceFieldArray, clearFieldArray, insertToFieldArray, removeFromFieldArray, setFieldDefault, setFieldValue, setFieldProps, setFieldProp, setFieldHidden, setFieldDisabled, setFieldHooks, MIN_INPUT_NUM, MAX_INPUT_NUM, EDITOR_FORMATS } from "./ngx-dynamic-form/utils/misc";
 export { RichTranslationModel } from "./ngx-dynamic-form/models/rich-translation.model";