@decaf-ts/ui-decorators 0.5.31 → 0.6.0

package/lib/esm/ui/Rendering.js

@@ -1,9 +1,9 @@
-import { InternalError } from "@decaf-ts/db-decorators";
-import { Model, ReservedModels, ValidationKeys, } from "@decaf-ts/decorator-validation";
+import { InternalError, NotFoundError } from "@decaf-ts/db-decorators";
 import { HTML5DateFormat, HTML5InputTypes, UIKeys, ValidatableByAttribute, ValidatableByType, } from "./constants.js";
 import { RenderingError } from "./errors.js";
-import { Reflection } from "@decaf-ts/reflection";
 import { formatByType, generateUIModelID } from "./utils.js";
+import { Metadata } from "@decaf-ts/decoration";
+import { Model, ReservedModels, ValidationKeys, } from "@decaf-ts/decorator-validation";
 /**
  * @description Abstract class for rendering UI components based on model metadata.
  * @summary The RenderingEngine class provides a framework for converting model metadata into UI field definitions.
@@ -44,14 +44,14 @@ export class RenderingEngine {
     translate(key, toView = true) {
         if (toView) {
             switch (key) {
-                case ReservedModels.STRING:
+                case ReservedModels.STRING.name.toLowerCase():
                     return HTML5InputTypes.TEXT;
-                case ReservedModels.NUMBER:
-                case ReservedModels.BIGINT:
+                case ReservedModels.NUMBER.name.toLowerCase():
+                case ReservedModels.BIGINT.name.toLowerCase():
                     return HTML5InputTypes.NUMBER;
-                case ReservedModels.BOOLEAN:
+                case ReservedModels.BOOLEAN.name.toLowerCase():
                     return HTML5InputTypes.CHECKBOX;
-                case ReservedModels.DATE:
+                case ReservedModels.DATE.name.toLowerCase():
                     return HTML5InputTypes.DATE;
             }
         }
@@ -68,15 +68,15 @@ export class RenderingEngine {
                 case HTML5InputTypes.HIDDEN:
                 case HTML5InputTypes.TEXTAREA:
                 case HTML5InputTypes.RADIO:
-                    return ReservedModels.STRING;
+                    return ReservedModels.STRING.name.toLowerCase();
                 case HTML5InputTypes.NUMBER:
-                    return ReservedModels.NUMBER;
+                    return ReservedModels.NUMBER.name.toLowerCase();
                 case HTML5InputTypes.CHECKBOX:
-                    return ReservedModels.BOOLEAN;
+                    return ReservedModels.BOOLEAN.name.toLowerCase();
                 case HTML5InputTypes.DATE:
                 case HTML5InputTypes.DATETIME_LOCAL:
                 case HTML5InputTypes.TIME:
-                    return ReservedModels.DATE;
+                    return ReservedModels.DATE.name.toLowerCase();
             }
         }
         return key;
@@ -95,14 +95,10 @@ export class RenderingEngine {
      */
     getClassDecoratorsMetadata(model) {
         return [
-            Reflect.getMetadata(RenderingEngine.key(UIKeys.UIMODEL), model.constructor) ||
-                Reflect.getMetadata(RenderingEngine.key(UIKeys.UIMODEL), Model.get(model.constructor.name)),
-            Reflect.getMetadata(RenderingEngine.key(UIKeys.UILISTMODEL), model.constructor) ||
-                Reflect.getMetadata(RenderingEngine.key(UIKeys.UILISTMODEL), Model.get(model.constructor.name)),
-            Reflect.getMetadata(RenderingEngine.key(UIKeys.HANDLERS), model.constructor) ||
-                Reflect.getMetadata(RenderingEngine.key(UIKeys.HANDLERS), Model.get(model.constructor.name)),
-            Reflect.getMetadata(RenderingEngine.key(UIKeys.UILAYOUT), model.constructor) ||
-                Reflect.getMetadata(RenderingEngine.key(UIKeys.UILAYOUT), Model.get(model.constructor.name)),
+            Model.uiModelOf(model.constructor),
+            Model.uiListModelOf(model.constructor),
+            Model.uiHandlersFor(model.constructor),
+            Model.uiLayoutOf(model.constructor),
         ].filter(Boolean);
     }
     /**
@@ -179,7 +175,12 @@ export class RenderingEngine {
         const classDecorator = Object.assign({}, ...classDecorators, inheritProps ? inheritProps : {} // override tag and properties when it is a component that should inherit properties from its parent.
         );
         const { tag, props, item, handlers } = classDecorator;
-        const uiDecorators = Reflection.getAllPropertyDecorators(model, UIKeys.REFLECT);
+        const uiDecorators = Model.uiPropertiesOf(model.constructor);
+        // const uiDecorators: Record<string, DecoratorMetadata[]> =
+        //   Reflection.getAllPropertyDecorators(model, UIKeys.REFLECT) as Record<
+        //     string,
+        //     DecoratorMetadata[]
+        //   >;
         let children;
         let childProps = item?.props || {};
         let mapper = {};
@@ -187,20 +188,44 @@ export class RenderingEngine {
             return parent ? [parent, prop].join(".") : prop;
         };
         if (uiDecorators) {
-            const validationDecorators = Reflection.getAllPropertyDecorators(model, ValidationKeys.REFLECT);
-            for (const key in uiDecorators) {
-                const decs = uiDecorators[key];
-                const types = Object.values(decs).filter(({ key }) => [UIKeys.PROP, UIKeys.ELEMENT, UIKeys.CHILD].includes(key));
-                if (types?.length > 1)
-                    throw new RenderingError(`Only one type of decoration is allowed. Please choose between @uiprop, @uichild or @uielement`);
-                const hasHideOnDecorator = decs.find(({ key }) => key === UIKeys.HIDDEN);
+            const validationDecorators = Metadata.get(model.constructor, ValidationKeys.REFLECT) || {};
+            // const validationDecorators: Record<
+            //   string,
+            //   DecoratorMetadata<ValidationMetadata>[]
+            // > = Reflection.getAllPropertyDecorators(
+            //   model,
+            //   ValidationKeys.REFLECT
+            // ) as Record<string, DecoratorMetadata<ValidationMetadata>[]>;
+            for (const key of uiDecorators) {
+                const decs = Model.uiDecorationOf(model.constructor, key);
+                let type;
+                try {
+                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                    type = Model.uiTypeOf(model.constructor, key);
+                }
+                catch (e) {
+                    if (!(e instanceof NotFoundError))
+                        throw e;
+                }
+                // const types = Object.values(decs).filter(({ key }) =>
+                //   [UIKeys.PROP, UIKeys.ELEMENT, UIKeys.CHILD].includes(key)
+                // );
+                // if (!type)
+                //   throw new RenderingError(
+                //     `Only one type of decoration is allowed. Please choose between @uiprop, @uichild or @uielement`
+                //   );
+                const hasHideOnDecorator = Model.uiIsHidden(model.constructor, key);
                 if (hasHideOnDecorator) {
-                    const hasUiElementDecorator = decs.find(({ key }) => key === UIKeys.ELEMENT);
+                    const hasUiElementDecorator = Model.uiElementOf(model.constructor, key);
                     if (!hasUiElementDecorator)
                         throw new RenderingError(`@uielement no found in "${key}". It is required to use hiddenOn decorator.`);
                 }
-                decs.shift();
-                const sorted = decs.sort((a) => {
+                const sorted = Object.entries(decs)
+                    .map(([k, v]) => ({
+                    key: k,
+                    props: v,
+                }))
+                    .sort((a) => {
                     return [UIKeys.ELEMENT, UIKeys.CHILD].includes(a.key) ? -1 : 1;
                 });
                 sorted.forEach((dec) => {
@@ -221,12 +246,11 @@ export class RenderingEngine {
                                 !Array.isArray(submodel);
                             // create instance if undefined
                             if (!constructable) {
-                                const clazzName = dec.props.props
-                                    ?.name;
+                                const clazzName = dec.props.props?.name;
                                 Clazz = new (Model.get(clazzName))();
                             }
                             children = children || [];
-                            const childrenGlobalProps = Object.assign({}, globalProps || {}, { "model": Clazz }, {
+                            const childrenGlobalProps = Object.assign({}, globalProps || {}, { model: Clazz }, {
                                 inheritProps: dec.props,
                                 childOf: getPath(globalProps?.childOf, key),
                             });
@@ -237,9 +261,9 @@ export class RenderingEngine {
                         }
                         case UIKeys.UILISTPROP: {
                             mapper = mapper || {};
-                            if (dec.props?.name)
-                                mapper[dec.props?.name] = key;
-                            const props = Object.assign({}, classDecorator.props?.item || {}, item?.props || {}, dec.props?.props || {}, globalProps);
+                            if (dec.props.name)
+                                mapper[dec.props.name] = key;
+                            const props = Object.assign({}, classDecorator.props?.item || {}, item?.props || {}, dec.props.props || {}, globalProps);
                             childProps = {
                                 tag: item?.tag || props.render || "",
                                 props: Object.assign({}, childProps?.props, { mapper }, props),
@@ -253,42 +277,51 @@ export class RenderingEngine {
                         case UIKeys.ELEMENT: {
                             children = children || [];
                             const uiProps = dec.props;
-                            const props = Object.assign({}, childProps?.props, uiProps.props || {}, (uiProps?.props?.name ? {
-                                path: getPath(globalProps?.childOf, uiProps.props.name),
-                                childOf: undefined, // The childOf prop is passed by globalProps when it is a nested prop
-                            } : {}), globalProps);
+                            const props = Object.assign({}, childProps?.props, uiProps.props || {}, uiProps?.props?.name
+                                ? {
+                                    path: getPath(globalProps?.childOf, uiProps.props.name),
+                                    childOf: undefined, // The childOf prop is passed by globalProps when it is a nested prop
+                                }
+                                : {}, globalProps);
                             if (dec.key === UIKeys.ELEMENT) {
                                 const childDefinition = {
                                     tag: uiProps.tag || childProps?.tag || tag || "",
                                     props,
                                 };
                                 const validationDecs = validationDecorators[key];
-                                const typeDec = validationDecs.shift();
-                                for (const dec of validationDecs) {
-                                    if (this.isValidatableByAttribute(dec.key)) {
-                                        childDefinition.props[this.translate(dec.key)] = this.toAttributeValue(dec.key, dec.props);
-                                        continue;
-                                    }
-                                    if (this.isValidatableByType(dec.key)) {
-                                        if (dec.key === HTML5InputTypes.DATE) {
-                                            childDefinition.props[UIKeys.FORMAT] = dec.props.format || HTML5DateFormat;
+                                if (validationDecs) {
+                                    for (const dec of Object.entries(validationDecs).map(([k, v]) => ({ key: k, props: v }))) {
+                                        if (this.isValidatableByAttribute(dec.key)) {
+                                            childDefinition.props[this.translate(dec.key)] =
+                                                this.toAttributeValue(dec.key, dec.props);
+                                            continue;
+                                        }
+                                        if (this.isValidatableByType(dec.key)) {
+                                            if (dec.key === HTML5InputTypes.DATE) {
+                                                childDefinition.props[UIKeys.FORMAT] =
+                                                    dec.props.format || HTML5DateFormat;
+                                            }
+                                            childDefinition.props[UIKeys.TYPE] = dec.key;
+                                            continue;
                                         }
-                                        childDefinition.props[UIKeys.TYPE] = dec.key;
-                                        continue;
                                     }
                                 }
                                 if (!childDefinition.props[UIKeys.TYPE]) {
-                                    const basicType = typeDec.props.name;
+                                    const basicType = Metadata.type(model.constructor, key).name;
                                     childDefinition.props[UIKeys.TYPE] = this.translate(basicType.toLowerCase(), true);
                                 }
                                 childDefinition.props.value = formatByType(childDefinition.props[UIKeys.TYPE], model[key], childDefinition.props[UIKeys.FORMAT]);
                                 children.push(childDefinition);
                             }
                             else {
-                                const child = children.find(c => c.props?.name === key || [UIKeys.UILAYOUTPROP, UIKeys.PAGE].includes(dec.key) && c?.props?.childOf === key);
+                                const child = children.find((c) => c.props?.name === key ||
+                                    ([UIKeys.UILAYOUTPROP, UIKeys.PAGE].includes(dec.key) &&
+                                        c?.props?.childOf === key));
                                 if (child) {
                                     if (dec.key !== UIKeys.UILAYOUTPROP) {
-                                        child.props = Object.assign({}, child.props, { [dec.key]: uiProps });
+                                        child.props = Object.assign({}, child.props, {
+                                            [dec.key]: uiProps,
+                                        });
                                     }
                                     else {
                                         const { row, col, props } = dec.props;
@@ -308,9 +341,10 @@ export class RenderingEngine {
             handlers: handlers || {},
         });
         const operation = globalProps?.operation;
-        children = children?.sort((a, b) => ((a?.props?.order ?? 0) - (b?.props?.order ?? 0)))
+        children = children
+            ?.sort((a, b) => (a?.props?.order ?? 0) - (b?.props?.order ?? 0))
             .filter((item) => {
-            const hiddenOn = (item?.props?.hidden || []);
+            const hiddenOn = item?.props?.hidden || [];
             if (!hiddenOn?.length)
                 return item;
             if (!hiddenOn.includes(operation))
@@ -393,21 +427,55 @@ export class RenderingEngine {
         const constructor = Model.get(model.constructor.name) || Model.fromObject(model);
         if (!constructor)
             throw new InternalError("No model registered found");
-        const flavour = Reflect.getMetadata(RenderingEngine.key(UIKeys.RENDERED_BY), constructor);
+        const flavour = Model.renderedBy(model.constructor);
         // @ts-expect-error for the var args type check
         return RenderingEngine.get(flavour).render(model, ...args);
     }
-    /**
-     * @description Generates a metadata key for UI-related properties.
-     * @summary Prefixes a given key with the UI reflection prefix.
-     *
-     * @param {string} key - The key to prefix.
-     * @returns {string} The prefixed key.
-     *
-     * @static
-     */
-    static key(key) {
-        return `${UIKeys.REFLECT}${key}`;
-    }
 }
+//
+// Decoration.for(DBKeys.ID)
+//   .extend({
+//     decorator: function pk(options: { generated: boolean }) {
+//       return function innerPk(target: object, propertyKey?: any) {
+//         if (options.generated)
+//           hideOn(OperationKeys.CREATE, OperationKeys.UPDATE)(
+//             target,
+//             propertyKey
+//           );
+//       };
+//     },
+//   })
+//   .apply();
+//
+// Decoration.for(DBKeys.TIMESTAMP)
+//   .extend({
+//     decorator: function timestamp(ops: OperationKeys[]) {
+//       return hideOn(...(ops as any[]));
+//     },
+//   })
+//   .apply();
+//
+// Decoration.for(DBKeys.COMPOSED)
+//   .extend({
+//     decorator: function composed() {
+//       return hideOn(OperationKeys.CREATE, OperationKeys.UPDATE);
+//     },
+//   })
+//   .apply();
+//
+// Decoration.for("createdBy")
+//   .extend({
+//     decorator: function createdBy() {
+//       return hideOn(OperationKeys.CREATE, OperationKeys.UPDATE);
+//     },
+//   })
+//   .apply();
+//
+// Decoration.for("updatedBy")
+//   .extend({
+//     decorator: function createdBy() {
+//       return hideOn(OperationKeys.CREATE, OperationKeys.UPDATE);
+//     },
+//   })
+//   .apply();
 //# sourceMappingURL=Rendering.js.map

package/lib/esm/ui/Rendering.js.map

@@ -1 +1 @@
-{"version":3,"file":"Rendering.js","sourceRoot":"","sources":["../../../src/ui/Rendering.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Rendering.js","sourceRoot":"","sources":["../../../src/ui/Rendering.ts"],"names":[],"mappings":"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"}

package/lib/esm/ui/constants.d.ts

@@ -6,12 +6,13 @@
  * @module ui/constants
  * @memberOf module:ui-decorators
  */
-import { Constructor, Validator } from "@decaf-ts/decorator-validation";
+import { Validator } from "@decaf-ts/decorator-validation";
+import { Constructor } from "@decaf-ts/decoration";
 export declare enum UIMediaBreakPoints {
-    SMALL = "s",
-    MEDIUM = "m",
-    LARGE = "l",
-    XLARGE = "xl"
+    SMALL = "small",
+    MEDIUM = "medium",
+    LARGE = "large",
+    XLARGE = "xlarge"
 }
 /**
  * @description Key constants used for UI metadata and rendering

package/lib/esm/ui/constants.js

@@ -6,15 +6,14 @@
  * @module ui/constants
  * @memberOf module:ui-decorators
  */
-import { DateValidator, DiffValidator, EmailValidator, EqualsValidator, GreaterThanOrEqualValidator, GreaterThanValidator, LessThanOrEqualValidator, LessThanValidator, MaxLengthValidator, MaxValidator, MinLengthValidator, MinValidator, ModelKeys, PasswordValidator, PatternValidator, RequiredValidator, StepValidator, URLValidator, ValidationKeys, } from "@decaf-ts/decorator-validation";
+import { DateValidator, DiffValidator, EmailValidator, EqualsValidator, GreaterThanOrEqualValidator, GreaterThanValidator, LessThanOrEqualValidator, LessThanValidator, MaxLengthValidator, MaxValidator, MinLengthValidator, MinValidator, PasswordValidator, PatternValidator, RequiredValidator, StepValidator, URLValidator, ValidationKeys, } from "@decaf-ts/decorator-validation";
 export var UIMediaBreakPoints;
 (function (UIMediaBreakPoints) {
-    UIMediaBreakPoints["SMALL"] = "s";
-    UIMediaBreakPoints["MEDIUM"] = "m";
-    UIMediaBreakPoints["LARGE"] = "l";
-    UIMediaBreakPoints["XLARGE"] = "xl";
+    UIMediaBreakPoints["SMALL"] = "small";
+    UIMediaBreakPoints["MEDIUM"] = "medium";
+    UIMediaBreakPoints["LARGE"] = "large";
+    UIMediaBreakPoints["XLARGE"] = "xlarge";
 })(UIMediaBreakPoints || (UIMediaBreakPoints = {}));
-;
 /**
  * @description Key constants used for UI metadata and rendering
  * @summary Collection of string constants used as keys for UI-related metadata
@@ -61,20 +60,20 @@ export var UIMediaBreakPoints;
  * @memberOf module:ui-decorators
  */
 export const UIKeys = {
-    REFLECT: `${ModelKeys.REFLECT}.ui.`,
+    REFLECT: `ui`,
     UIMODEL: "uimodel",
     RENDERED_BY: "rendered-by",
-    ELEMENT: "element",
-    PROP: "prop",
-    CHILD: "child",
+    ELEMENT: "uielement",
+    PROP: "uiprop",
+    CHILD: "uichild",
     NAME: "name",
     NAME_PREFIX: "input-",
     CUSTOM_PROPS: "customValidationProps",
     UILISTMODEL: "uilistmodel",
-    UILISTPROP: "listprop",
+    UILISTPROP: "uilistprop",
     UILAYOUT: "uilayout",
     UILAYOUTPROP: "uilayoutprop",
-    HANDLERS: "handlers",
+    HANDLERS: "uihandlers",
     TYPE: "type",
     SUB_TYPE: "subtype",
     HIDDEN: "hidden",
@@ -230,8 +229,8 @@ export const HTML5InputTypes = {
     SUBMIT: "submit",
     TEL: "tel",
     TEXT: "text",
-    TEXTAREA: 'textarea',
-    SELECT: 'select',
+    TEXTAREA: "textarea",
+    SELECT: "select",
     TIME: "time",
     URL: UIKeys.URL,
     WEEK: "week",

package/lib/esm/ui/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/ui/constants.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/ui/constants.ts"],"names":[],"mappings":"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"}

package/lib/esm/ui/decorators.d.ts

@@ -1,4 +1,3 @@
-import "reflect-metadata";
 import { CrudOperationKeys, UILayoutCol } from "./types";
 /**
  * @description Decorator that hides a property during specific CRUD operations
@@ -35,7 +34,7 @@ import { CrudOperationKeys, UILayoutCol } from "./types";
  *   Model->>RenderingEngine: Return hidden operations
  *   RenderingEngine->>UI: Render or hide based on current operation
  */
-export declare function hideOn(...operations: CrudOperationKeys[]): (target: object, propertyKey?: string | symbol | unknown, descriptor?: PropertyDescriptor) => void;
+export declare function hideOn(...operations: CrudOperationKeys[]): (object: any, propertyKey?: any) => void;
 /**
  * @description Decorator that sets the order of a UI element
  * @summary Specifies the rendering order for UI components
@@ -65,7 +64,7 @@ export declare function hideOn(...operations: CrudOperationKeys[]): (target: obj
  *   uiorder->>property: sets order metadata
  *   uiorder->>System: returns decorated property
  */
-export declare function uiorder(order?: number): (target: object, propertyKey?: string | symbol | unknown, descriptor?: PropertyDescriptor) => void;
+export declare function uiorder(order?: number): (object: any, propertyKey?: any) => void;
 /**
  * @description Decorator that completely hides a property in all UI operations
  * @summary Makes a property invisible in all CRUD operations
@@ -101,7 +100,7 @@ export declare function uiorder(order?: number): (target: object, propertyKey?:
  *   Model->>RenderingEngine: Return all operations
  *   RenderingEngine->>UI: Always hide property
  */
-export declare function hidden(): (target: object, propertyKey?: string | symbol | unknown, descriptor?: PropertyDescriptor) => void;
+export declare function hidden(): (object: any, propertyKey?: any) => void;
 /**
  * @description Decorator that specifies how a property should be rendered as a UI element
  * @summary Maps a model property to a specific UI element with custom properties
@@ -188,7 +187,7 @@ export declare function uielement(tag: string, props?: Record<string, any>, seri
  *   Model->>RenderingEngine: Return prop name and stringify flag
  *   RenderingEngine->>Component: Pass property with specified name
  */
-export declare function uiprop(propName?: string | undefined, stringify?: boolean): (target: any, propertyKey: string) => void;
+export declare function uiprop(propName?: string | undefined, stringify?: boolean): (target: any, propertyKey?: any) => void;
 /**
  * @description Decorator that maps a nested model property to a UI component property.
  * @summary Defines how a parent component should render the child model when nested.
@@ -242,7 +241,7 @@ export declare function uiprop(propName?: string | undefined, stringify?: boolea
  *   Model->>RenderingEngine: Return prop name, stringify flag, and child tag override
  *   RenderingEngine->>Component: Pass property with specified name and render with overridden tag if nested
  */
-export declare function uichild(clazz: string, tag: string, props?: Record<string, any>, isArray?: boolean, serialize?: boolean): (target: any, propertyKey: string) => void;
+export declare function uichild(clazz: string, tag: string, props?: Record<string, any>, isArray?: boolean, serialize?: boolean): (target: any, propertyKey?: any) => void;
 /**
  * @description Decorator that maps a model property to a list item component
  * @summary Specifies how a property should be rendered in a list context
@@ -292,7 +291,7 @@ export declare function uichild(clazz: string, tag: string, props?: Record<strin
  *   RenderingEngine->>ListItems: Render each item using @uilistmodel
  *   ListContainer->>RenderingEngine: Return rendered list
  */
-export declare function uilistprop(propName?: string | undefined, props?: Record<string, any>): (target: any, propertyKey: string) => void;
+export declare function uilistprop(propName?: string | undefined, props?: Record<string, any>): (target: any, propertyKey?: any) => void;
 /**
  * @description Decorator that positions a property in a specific grid layout position
  * @summary Specifies the column and row position for a property in a UI layout grid
@@ -343,7 +342,7 @@ export declare function uilistprop(propName?: string | undefined, props?: Record
  *   RenderingEngine->>LayoutContainer: Position element at grid coordinates
  *   LayoutContainer->>RenderingEngine: Return positioned element
  */
-export declare function uilayoutprop(col?: UILayoutCol, row?: number): (target: any, propertyKey: string) => void;
+export declare function uilayoutprop(col?: UILayoutCol, row?: number): (target: any, propertyKey?: any) => void;
 /**
  * @description Decorator that assigns a property to a specific page in multi-page forms
  * @summary Specifies which page a property should appear on in paginated UI layouts
@@ -405,4 +404,4 @@ export declare function uilayoutprop(col?: UILayoutCol, row?: number): (target:
  *   RenderingEngine->>PaginationController: Group properties by page
  *   PaginationController->>UI: Render current page properties
  */
-export declare function uipageprop(page?: number): (target: object, propertyKey?: string | symbol | unknown, descriptor?: PropertyDescriptor) => void;
+export declare function uipageprop(page?: number): (original: any, propertyKey?: any) => void;

package/lib/esm/ui/decorators.js

@@ -1,8 +1,7 @@
-import "reflect-metadata";
 import { UIKeys } from "./constants.js";
-import { propMetadata } from "@decaf-ts/decorator-validation";
-import { RenderingEngine } from "./Rendering.js";
+import { propMetadata } from "@decaf-ts/decoration";
 import { OperationKeys } from "@decaf-ts/db-decorators";
+import { getUIAttributeKey } from "./utils.js";
 /**
  * @description Decorator that hides a property during specific CRUD operations
  * @summary Controls property visibility based on operation type
@@ -39,7 +38,9 @@ import { OperationKeys } from "@decaf-ts/db-decorators";
  *   RenderingEngine->>UI: Render or hide based on current operation
  */
 export function hideOn(...operations) {
-    return propMetadata(RenderingEngine.key(UIKeys.HIDDEN), operations);
+    return function hideOn(object, propertyKey) {
+        return propMetadata(getUIAttributeKey(propertyKey, UIKeys.HIDDEN), operations)(object, propertyKey);
+    };
 }
 /**
  * @description Decorator that sets the order of a UI element
@@ -71,7 +72,9 @@ export function hideOn(...operations) {
  *   uiorder->>System: returns decorated property
  */
 export function uiorder(order = 1) {
-    return propMetadata(RenderingEngine.key(UIKeys.ORDER), order);
+    return function uiorder(object, propertyKey) {
+        return propMetadata(getUIAttributeKey(propertyKey, UIKeys.ORDER), order)(object, propertyKey);
+    };
 }
 /**
  * @description Decorator that completely hides a property in all UI operations
@@ -162,7 +165,7 @@ export function uielement(tag, props, serialize = false) {
                 name: propertyKey,
             }),
         };
-        return propMetadata(RenderingEngine.key(UIKeys.ELEMENT), metadata)(original, propertyKey);
+        return propMetadata(getUIAttributeKey(propertyKey, UIKeys.ELEMENT), metadata)(original, propertyKey);
     };
 }
 /**
@@ -214,7 +217,7 @@ export function uiprop(propName = undefined, stringify = false) {
             name: propName || propertyKey,
             stringify: stringify,
         };
-        propMetadata(RenderingEngine.key(UIKeys.PROP), metadata)(target, propertyKey);
+        propMetadata(getUIAttributeKey(propertyKey, UIKeys.PROP), metadata)(target, propertyKey);
     };
 }
 /**
@@ -277,9 +280,11 @@ export function uichild(clazz, tag, props = {}, isArray = false, serialize = fal
             serialize: serialize,
             props: Object.assign({}, props || {}, {
                 name: clazz || propertyKey,
-            }, isArray ? { customTypes: [Array.name], multiple: true } : { multiple: props?.multiple || false }),
+            }, isArray
+                ? { customTypes: [Array.name], multiple: true }
+                : { multiple: props?.multiple || false }),
         };
-        propMetadata(RenderingEngine.key(UIKeys.CHILD), metadata)(target, propertyKey);
+        propMetadata(getUIAttributeKey(propertyKey, UIKeys.CHILD), metadata)(target, propertyKey);
     };
 }
 /**
@@ -337,7 +342,7 @@ export function uilistprop(propName = undefined, props) {
             name: propName || propertyKey,
             props: props || {},
         };
-        propMetadata(RenderingEngine.key(UIKeys.UILISTPROP), metadata)(target, propertyKey);
+        propMetadata(getUIAttributeKey(propertyKey, UIKeys.UILISTPROP), metadata)(target, propertyKey);
     };
 }
 /**
@@ -398,7 +403,7 @@ export function uilayoutprop(col = 1, row = 1) {
             // row,
             props: Object.assign({}, { row, col }),
         };
-        propMetadata(RenderingEngine.key(UIKeys.UILAYOUTPROP), metadata)(target, propertyKey);
+        propMetadata(getUIAttributeKey(propertyKey, UIKeys.UILAYOUTPROP), metadata)(target, propertyKey);
     };
 }
 /**
@@ -463,6 +468,8 @@ export function uilayoutprop(col = 1, row = 1) {
  *   PaginationController->>UI: Render current page properties
  */
 export function uipageprop(page = 1) {
-    return propMetadata(RenderingEngine.key(UIKeys.PAGE), page);
+    return function uipageprop(original, propertyKey) {
+        return propMetadata(getUIAttributeKey(propertyKey, UIKeys.PAGE), page)(original, propertyKey);
+    };
 }
 //# sourceMappingURL=decorators.js.map