@sumaris-net/ngx-components 18.14.5 → 18.14.6

package/esm2022/src/app/shared/rx-state/rx-state.decorators.mjs

@@ -46,29 +46,21 @@ export function RxStateProperty(statePropertyName, projectValueReducer) {
     return function (target, key) {
         const finalStatePropertyName = statePropertyName || key;
         const stateVarName = target instanceof RxState ? null : target[STATE_VAR_NAME_KEY] || DEFAULT_STATE_VAR_NAME;
-        // Create unique property names to avoid conflicts
-        const privateValueKey = `__${key}_value`;
-        const privateInitializedKey = `__${key}_initialized`;
         // Define property with getter/setter
         Object.defineProperty(target, key, {
             get: function () {
                 const stateObject = stateVarName ? this[stateVarName] : this;
                 DecoratorUtils.validateStateProperty(target, stateObject);
-                if (!this[privateInitializedKey]) {
-                    this[privateValueKey] = stateObject.get(finalStatePropertyName);
-                    this[privateInitializedKey] = true;
-                }
-                return this[privateValueKey];
+                return stateObject.get(finalStatePropertyName);
             },
             set: function (value) {
                 const stateObject = stateVarName ? this[stateVarName] : this;
                 DecoratorUtils.validateStateProperty(target, stateObject);
-                this[privateValueKey] = value;
                 if (projectValueReducer) {
                     stateObject.set(finalStatePropertyName, (state) => projectValueReducer(state, value));
                 }
                 else {
-                    stateObject.set(finalStatePropertyName, () => value);
+                    stateObject.set({ [finalStatePropertyName]: value });
                 }
             },
             enumerable: true,
@@ -94,25 +86,25 @@ export function RxStateSelect(statePropertyName, opts) {
         // Determine state object
         const stateVarName = target instanceof RxState ? null : target[STATE_VAR_NAME_KEY] || opts?.stateName || DEFAULT_STATE_VAR_NAME;
         // Create cache property name
-        const cachePropertyName = `__${key}_cache`;
+        const internalPropertyName = `__${key}`;
         // Define property with getter only
         Object.defineProperty(target, key, {
             get: function () {
                 const stateObject = stateVarName ? this[stateVarName] : this;
                 DecoratorUtils.validateStateProperty(target, stateObject);
-                if (!this[cachePropertyName]) {
+                if (!this[internalPropertyName]) {
                     if (finalStatePropertyName === '$') {
-                        this[cachePropertyName] = stateObject.$;
+                        this[internalPropertyName] = stateObject.$;
                     }
                     else if (finalStatePropertyName.includes('.')) {
                         const path = finalStatePropertyName.split('.');
-                        this[cachePropertyName] = stateObject.select(...path);
+                        this[internalPropertyName] = stateObject.select(...path);
                     }
                     else {
-                        this[cachePropertyName] = stateObject.select(finalStatePropertyName);
+                        this[internalPropertyName] = stateObject.select(finalStatePropertyName);
                     }
                 }
-                return this[cachePropertyName];
+                return this[internalPropertyName];
             },
             enumerable: true,
             configurable: false,
@@ -157,4 +149,4 @@ export function RxStateComputed(dependencies, computeFn, opts) {
         }
     };
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rx-state.decorators.js","sourceRoot":"","sources":["../../../../../../src/app/shared/rx-state/rx-state.decorators.ts"],"names":[],"mappings":"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","sourcesContent":["import { Observable } from 'rxjs';\nimport { ProjectValueReducer, RxState } from '@rx-angular/state';\nimport { map } from 'rxjs/operators';\n\nlet production = false;\nexport function enableRxStateProdMode() {\n  production = true;\n}\n\ndeclare type Constructor<T = any> = new (...args: any[]) => T;\n\ntype ObservablePropertyDecorator<T> = <K extends PropertyKey>(target: any, propertyKey: K) => void;\ntype StatePropertyDecorator<T> = <K extends PropertyKey>(target: any, propertyKey: K) => void;\n\n// Utility for decorators\nclass DecoratorUtils {\n  static capitalize(str: string): string {\n    return str.charAt(0).toUpperCase() + str.slice(1);\n  }\n\n  static createMethodName(prefix: string, propertyKey: string): string {\n    return `${prefix}${this.capitalize(propertyKey)}`;\n  }\n\n  static createPropertyName(prefix: string, propertyKey: string): string {\n    return `${prefix}${this.capitalize(propertyKey)}`;\n  }\n\n  static validateStateProperty(target: any, stateObject: any): void {\n    if (!production && !stateObject) {\n      throw new Error(`Missing state! Please add a RxState in class: ${target.constructor.name}`);\n    }\n  }\n}\n\nconst STATE_VAR_NAME_KEY = '__stateName';\nconst DEFAULT_STATE_VAR_NAME = '_state';\n\n/**\n * Decorator to register the RxState property in a component\n */\nexport function RxStateRegister(): PropertyDecorator {\n  return function (target: Constructor<any>, key: string) {\n    if (target[STATE_VAR_NAME_KEY]) {\n      throw new Error(`Cannot define more than one @RxStateRegister() in class hierarchy. Found: ${target[STATE_VAR_NAME_KEY]} and ${key}`);\n    }\n\n    Object.defineProperty(target, STATE_VAR_NAME_KEY, {\n      value: key,\n      writable: false,\n      enumerable: false,\n      configurable: false,\n    });\n  };\n}\n\n/**\n * Decorator for RxState properties with getter/setter access\n */\nexport function RxStateProperty<T extends object = any, K extends keyof T = any, V extends T[K] = any>(\n  statePropertyName?: string | K,\n  projectValueReducer?: ProjectValueReducer<T, K, V>\n): StatePropertyDecorator<V> {\n  return function <P extends PropertyKey>(target: any, key: P) {\n    const finalStatePropertyName = (statePropertyName as string) || (key as string);\n    const stateVarName = target instanceof RxState ? null : target[STATE_VAR_NAME_KEY] || DEFAULT_STATE_VAR_NAME;\n\n    // Create unique property names to avoid conflicts\n    const privateValueKey = `__${key as string}_value`;\n    const privateInitializedKey = `__${key as string}_initialized`;\n\n    // Define property with getter/setter\n    Object.defineProperty(target, key, {\n      get: function () {\n        const stateObject: RxState<T> = stateVarName ? this[stateVarName] : this;\n        DecoratorUtils.validateStateProperty(target, stateObject);\n\n        if (!this[privateInitializedKey]) {\n          this[privateValueKey] = stateObject.get(finalStatePropertyName as keyof T);\n          this[privateInitializedKey] = true;\n        }\n\n        return this[privateValueKey] as V;\n      },\n      set: function (value: V) {\n        const stateObject: RxState<T> = stateVarName ? this[stateVarName] : this;\n        DecoratorUtils.validateStateProperty(target, stateObject);\n\n        this[privateValueKey] = value;\n\n        if (projectValueReducer) {\n          stateObject.set(finalStatePropertyName as keyof T, (state: T) => projectValueReducer(state, value));\n        } else {\n          stateObject.set(finalStatePropertyName as keyof T, () => value);\n        }\n      },\n      enumerable: true,\n      configurable: true,\n    });\n\n    // Development logging\n    if (!production) {\n      console.debug(`[RxStateProperty] ${target.constructor?.name}.${key as string} -> state.${finalStatePropertyName}`);\n    }\n  };\n}\n\n/**\n * Decorator for RxState observable selectors\n */\nexport function RxStateSelect<T = any, R = T[keyof T]>(\n  statePropertyName?: string | keyof T | '$',\n  opts?: {\n    stateName?: string;\n  }\n): ObservablePropertyDecorator<Observable<R>> {\n  return function <P extends PropertyKey>(target: any, key: P) {\n    // Convention check\n    if (!production && !(key as string).endsWith('$')) {\n      console.warn(\n        `[RxStateSelect] Convention: Property ${target.constructor?.name}.${key as string} should end with '$' to indicate it's an Observable`\n      );\n    }\n\n    // Determine state property name\n    const finalStatePropertyName = (statePropertyName as string) || (key as string).replace(/\\$$/, '');\n\n    // Determine state object\n    const stateVarName = target instanceof RxState ? null : target[STATE_VAR_NAME_KEY] || opts?.stateName || DEFAULT_STATE_VAR_NAME;\n\n    // Create cache property name\n    const cachePropertyName = `__${key as string}_cache`;\n\n    // Define property with getter only\n    Object.defineProperty(target, key, {\n      get: function () {\n        const stateObject = stateVarName ? this[stateVarName] : this;\n        DecoratorUtils.validateStateProperty(target, stateObject);\n\n        if (!this[cachePropertyName]) {\n          if (finalStatePropertyName === '$') {\n            this[cachePropertyName] = stateObject.$;\n          } else if (finalStatePropertyName.includes('.')) {\n            const path = finalStatePropertyName.split('.');\n            this[cachePropertyName] = stateObject.select(...path);\n          } else {\n            this[cachePropertyName] = stateObject.select(finalStatePropertyName);\n          }\n        }\n\n        return this[cachePropertyName];\n      },\n      enumerable: true,\n      configurable: false,\n    });\n\n    // Development logging\n    if (!production) {\n      console.debug(`[RxStateSelect] ${target.constructor?.name}.${key as string} -> state.select('${finalStatePropertyName}')`);\n    }\n  };\n}\n\n/**\n * Utility decorator to create computed observables from state\n */\nexport function RxStateComputed<T = any, K extends keyof T = any, R = any>(\n  dependencies: K[],\n  computeFn?: (slice: Pick<T, K>) => R,\n  opts?: {\n    stateName?: string;\n    keyCompareMap?: any;\n  }\n): ObservablePropertyDecorator<Observable<R>> {\n  return function <P extends PropertyKey>(target: any, key: P) {\n    // Convention check\n    if (!production && !(key as string).endsWith('$')) {\n      console.warn(\n        `[RxStateComputed] Convention: Property ${target.constructor?.name}.${key as string} should end with '$' to indicate it's an Observable`\n      );\n    }\n\n    const stateVarName = target instanceof RxState ? null : target[STATE_VAR_NAME_KEY] || opts?.stateName || DEFAULT_STATE_VAR_NAME;\n    const cachePropertyName = `__${key as string}_cache`;\n\n    // Define property with getter only\n    Object.defineProperty(target, key, {\n      get: function () {\n        const stateObject = stateVarName ? this[stateVarName] : this;\n        DecoratorUtils.validateStateProperty(target, stateObject);\n\n        if (!this[cachePropertyName]) {\n          let observable = stateObject.select(dependencies, opts?.keyCompareMap);\n\n          if (computeFn) {\n            observable = observable.pipe(map(computeFn));\n          }\n\n          this[cachePropertyName] = observable;\n        }\n\n        return this[cachePropertyName];\n      },\n      enumerable: true,\n      configurable: false,\n    });\n\n    // Development logging\n    if (!production) {\n      console.debug(\n        `[RxStateComputed] ${target.constructor?.name}.${key as string} -> state.select([${dependencies.map((d) => `'${d as string}'`).join(', ')}])`\n      );\n    }\n  };\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rx-state.decorators.js","sourceRoot":"","sources":["../../../../../../src/app/shared/rx-state/rx-state.decorators.ts"],"names":[],"mappings":"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","sourcesContent":["import { Observable } from 'rxjs';\nimport { ProjectValueReducer, RxState } from '@rx-angular/state';\nimport { map } from 'rxjs/operators';\n\nlet production = false;\n\nexport function enableRxStateProdMode() {\n  production = true;\n}\n\ndeclare type Constructor<T = any> = new (...args: any[]) => T;\n\ntype ObservablePropertyDecorator<T> = <K extends PropertyKey>(target: any, propertyKey: K) => void;\ntype StatePropertyDecorator<T> = <K extends PropertyKey>(target: any, propertyKey: K) => void;\n\n// Utility for decorators\nclass DecoratorUtils {\n  static capitalize(str: string): string {\n    return str.charAt(0).toUpperCase() + str.slice(1);\n  }\n\n  static createMethodName(prefix: string, propertyKey: string): string {\n    return `${prefix}${this.capitalize(propertyKey)}`;\n  }\n\n  static createPropertyName(prefix: string, propertyKey: string): string {\n    return `${prefix}${this.capitalize(propertyKey)}`;\n  }\n\n  static validateStateProperty(target: any, stateObject: any): void {\n    if (!production && !stateObject) {\n      throw new Error(`Missing state! Please add a RxState in class: ${target.constructor.name}`);\n    }\n  }\n}\n\nconst STATE_VAR_NAME_KEY = '__stateName';\nconst DEFAULT_STATE_VAR_NAME = '_state';\n\n/**\n * Decorator to register the RxState property in a component\n */\nexport function RxStateRegister(): PropertyDecorator {\n  return function (target: Constructor<any>, key: string) {\n    if (target[STATE_VAR_NAME_KEY]) {\n      throw new Error(`Cannot define more than one @RxStateRegister() in class hierarchy. Found: ${target[STATE_VAR_NAME_KEY]} and ${key}`);\n    }\n\n    Object.defineProperty(target, STATE_VAR_NAME_KEY, {\n      value: key,\n      writable: false,\n      enumerable: false,\n      configurable: false,\n    });\n  };\n}\n\n/**\n * Decorator for RxState properties with getter/setter access\n */\nexport function RxStateProperty<T extends object = any, K extends keyof T = any, V extends T[K] = any>(\n  statePropertyName?: string | K,\n  projectValueReducer?: ProjectValueReducer<T, K, V>\n): StatePropertyDecorator<V> {\n  return function <P extends PropertyKey>(target: any, key: P) {\n    const finalStatePropertyName = (statePropertyName as string) || (key as string);\n    const stateVarName = target instanceof RxState ? null : target[STATE_VAR_NAME_KEY] || DEFAULT_STATE_VAR_NAME;\n\n    // Define property with getter/setter\n    Object.defineProperty(target, key, {\n      get: function () {\n        const stateObject: RxState<T> = stateVarName ? this[stateVarName] : this;\n        DecoratorUtils.validateStateProperty(target, stateObject);\n        return stateObject.get(finalStatePropertyName as keyof T);\n      },\n      set: function (value: V) {\n        const stateObject: RxState<T> = stateVarName ? this[stateVarName] : this;\n        DecoratorUtils.validateStateProperty(target, stateObject);\n        if (projectValueReducer) {\n          stateObject.set(finalStatePropertyName as keyof T, (state: T) => projectValueReducer(state, value));\n        } else {\n          stateObject.set(<Partial<T>>{ [finalStatePropertyName as keyof T]: value });\n        }\n      },\n      enumerable: true,\n      configurable: true,\n    });\n\n    // Development logging\n    if (!production) {\n      console.debug(`[RxStateProperty] ${target.constructor?.name}.${key as string} -> state.${finalStatePropertyName}`);\n    }\n  };\n}\n\n/**\n * Decorator for RxState observable selectors\n */\nexport function RxStateSelect<T = any, R = T[keyof T]>(\n  statePropertyName?: string | keyof T | '$',\n  opts?: {\n    stateName?: string;\n  }\n): ObservablePropertyDecorator<Observable<R>> {\n  return function <P extends PropertyKey>(target: any, key: P) {\n    // Convention check\n    if (!production && !(key as string).endsWith('$')) {\n      console.warn(\n        `[RxStateSelect] Convention: Property ${target.constructor?.name}.${key as string} should end with '$' to indicate it's an Observable`\n      );\n    }\n\n    // Determine state property name\n    const finalStatePropertyName = (statePropertyName as string) || (key as string).replace(/\\$$/, '');\n\n    // Determine state object\n    const stateVarName = target instanceof RxState ? null : target[STATE_VAR_NAME_KEY] || opts?.stateName || DEFAULT_STATE_VAR_NAME;\n\n    // Create cache property name\n    const internalPropertyName = `__${key as string}`;\n\n    // Define property with getter only\n    Object.defineProperty(target, key, {\n      get: function () {\n        const stateObject = stateVarName ? this[stateVarName] : this;\n        DecoratorUtils.validateStateProperty(target, stateObject);\n\n        if (!this[internalPropertyName]) {\n          if (finalStatePropertyName === '$') {\n            this[internalPropertyName] = stateObject.$;\n          } else if (finalStatePropertyName.includes('.')) {\n            const path = finalStatePropertyName.split('.');\n            this[internalPropertyName] = stateObject.select(...path);\n          } else {\n            this[internalPropertyName] = stateObject.select(finalStatePropertyName);\n          }\n        }\n\n        return this[internalPropertyName];\n      },\n      enumerable: true,\n      configurable: false,\n    });\n\n    // Development logging\n    if (!production) {\n      console.debug(`[RxStateSelect] ${target.constructor?.name}.${key as string} -> state.select('${finalStatePropertyName}')`);\n    }\n  };\n}\n\n/**\n * Utility decorator to create computed observables from state\n */\nexport function RxStateComputed<T = any, K extends keyof T = any, R = any>(\n  dependencies: K[],\n  computeFn?: (slice: Pick<T, K>) => R,\n  opts?: {\n    stateName?: string;\n    keyCompareMap?: any;\n  }\n): ObservablePropertyDecorator<Observable<R>> {\n  return function <P extends PropertyKey>(target: any, key: P) {\n    // Convention check\n    if (!production && !(key as string).endsWith('$')) {\n      console.warn(\n        `[RxStateComputed] Convention: Property ${target.constructor?.name}.${key as string} should end with '$' to indicate it's an Observable`\n      );\n    }\n\n    const stateVarName = target instanceof RxState ? null : target[STATE_VAR_NAME_KEY] || opts?.stateName || DEFAULT_STATE_VAR_NAME;\n    const cachePropertyName = `__${key as string}_cache`;\n\n    // Define property with getter only\n    Object.defineProperty(target, key, {\n      get: function () {\n        const stateObject = stateVarName ? this[stateVarName] : this;\n        DecoratorUtils.validateStateProperty(target, stateObject);\n\n        if (!this[cachePropertyName]) {\n          let observable = stateObject.select(dependencies, opts?.keyCompareMap);\n\n          if (computeFn) {\n            observable = observable.pipe(map(computeFn));\n          }\n\n          this[cachePropertyName] = observable;\n        }\n\n        return this[cachePropertyName];\n      },\n      enumerable: true,\n      configurable: false,\n    });\n\n    // Development logging\n    if (!production) {\n      console.debug(\n        `[RxStateComputed] ${target.constructor?.name}.${key as string} -> state.select([${dependencies.map((d) => `'${d as string}'`).join(', ')}])`\n      );\n    }\n  };\n}\n"]}

package/fesm2022/sumaris-net.ngx-components.mjs

@@ -26396,29 +26396,21 @@ function RxStateProperty(statePropertyName, projectValueReducer) {
     return function (target, key) {
         const finalStatePropertyName = statePropertyName || key;
         const stateVarName = target instanceof RxState ? null : target[STATE_VAR_NAME_KEY] || DEFAULT_STATE_VAR_NAME;
-        // Create unique property names to avoid conflicts
-        const privateValueKey = `__${key}_value`;
-        const privateInitializedKey = `__${key}_initialized`;
         // Define property with getter/setter
         Object.defineProperty(target, key, {
             get: function () {
                 const stateObject = stateVarName ? this[stateVarName] : this;
                 DecoratorUtils.validateStateProperty(target, stateObject);
-                if (!this[privateInitializedKey]) {
-                    this[privateValueKey] = stateObject.get(finalStatePropertyName);
-                    this[privateInitializedKey] = true;
-                }
-                return this[privateValueKey];
+                return stateObject.get(finalStatePropertyName);
             },
             set: function (value) {
                 const stateObject = stateVarName ? this[stateVarName] : this;
                 DecoratorUtils.validateStateProperty(target, stateObject);
-                this[privateValueKey] = value;
                 if (projectValueReducer) {
                     stateObject.set(finalStatePropertyName, (state) => projectValueReducer(state, value));
                 }
                 else {
-                    stateObject.set(finalStatePropertyName, () => value);
+                    stateObject.set({ [finalStatePropertyName]: value });
                 }
             },
             enumerable: true,
@@ -26444,25 +26436,25 @@ function RxStateSelect(statePropertyName, opts) {
         // Determine state object
         const stateVarName = target instanceof RxState ? null : target[STATE_VAR_NAME_KEY] || opts?.stateName || DEFAULT_STATE_VAR_NAME;
         // Create cache property name
-        const cachePropertyName = `__${key}_cache`;
+        const internalPropertyName = `__${key}`;
         // Define property with getter only
         Object.defineProperty(target, key, {
             get: function () {
                 const stateObject = stateVarName ? this[stateVarName] : this;
                 DecoratorUtils.validateStateProperty(target, stateObject);
-                if (!this[cachePropertyName]) {
+                if (!this[internalPropertyName]) {
                     if (finalStatePropertyName === '$') {
-                        this[cachePropertyName] = stateObject.$;
+                        this[internalPropertyName] = stateObject.$;
                     }
                     else if (finalStatePropertyName.includes('.')) {
                         const path = finalStatePropertyName.split('.');
-                        this[cachePropertyName] = stateObject.select(...path);
+                        this[internalPropertyName] = stateObject.select(...path);
                     }
                     else {
-                        this[cachePropertyName] = stateObject.select(finalStatePropertyName);
+                        this[internalPropertyName] = stateObject.select(finalStatePropertyName);
                     }
                 }
-                return this[cachePropertyName];
+                return this[internalPropertyName];
             },
             enumerable: true,
             configurable: false,