npm - @sumaris-net/ngx-components - Versions diffs - 18.18.30 → 18.18.32 - Mend

@sumaris-net/ngx-components 18.18.30 → 18.18.32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/esm2022/src/app/shared/rx-state/rx-state.decorators.mjs +23 -11
package/fesm2022/sumaris-net.ngx-components.mjs +22 -10
package/fesm2022/sumaris-net.ngx-components.mjs.map +1 -1
package/package.json +1 -1
package/src/app/shared/rx-state/rx-state.decorators.d.ts +4 -4
package/src/assets/manifest.json +1 -1

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

@@ -45,7 +45,7 @@ export function RxStateRegister() {
  */
 export function RxStateProperty(statePropertyName, projectValueReducer) {
     return function (target, key) {
-        const finalStatePropertyName = statePropertyName || key;
+        const finalStatePropertyName = String(statePropertyName || key);
         const stateVarName = target instanceof RxState ? null : target[STATE_VAR_NAME_KEY] || DEFAULT_STATE_VAR_NAME;
         // Define property with getter/setter
         Object.defineProperty(target, key, {
@@ -69,7 +69,7 @@ export function RxStateProperty(statePropertyName, projectValueReducer) {
         });
         // Development logging
         if (!production) {
-            console.debug(`[RxStateProperty] ${target.constructor?.name}.${key} -> state.${finalStatePropertyName}`);
+            console.debug(`[RxStateProperty] ${target.constructor?.name}.${key} -> state.${String(finalStatePropertyName)}`);
         }
     };
 }
@@ -93,13 +93,15 @@ export function RxStateSelect(statePropertyName, opts) {
             get: function () {
                 const stateObject = stateVarName ? this[stateVarName] : this;
                 DecoratorUtils.validateStateProperty(target, stateObject);
+                // Create observable if not exists
                 if (!this[internalPropertyName]) {
                     if (finalStatePropertyName === '$') {
                         this[internalPropertyName] = stateObject.$;
                     }
                     else if (finalStatePropertyName.includes('.')) {
-                        const path = finalStatePropertyName.split('.');
-                        this[internalPropertyName] = stateObject.select(...path);
+                        const args = finalStatePropertyName.split('.');
+                        // @ts-ignore
+                        this[internalPropertyName] = stateObject.select(...args);
                     }
                     else {
                         this[internalPropertyName] = stateObject.select(finalStatePropertyName);
@@ -132,8 +134,10 @@ export function RxStateComputed(dependencies, computeFn, opts) {
             get: function () {
                 const stateObject = stateVarName ? this[stateVarName] : this;
                 DecoratorUtils.validateStateProperty(target, stateObject);
+                // Create observable if not exists
                 if (!this[cachePropertyName]) {
                     let observable = stateObject.select(dependencies, opts?.keyCompareMap);
+                    // Apply computeFn if provided
                     if (computeFn) {
                         observable = observable.pipe(map(computeFn));
                     }
@@ -146,7 +150,7 @@ export function RxStateComputed(dependencies, computeFn, opts) {
         });
         // Development logging
         if (!production) {
-            console.debug(`[RxStateComputed] ${target.constructor?.name}.${key} -> state.select([${dependencies.map((d) => `'${d}'`).join(', ')}])`);
+            console.debug(`[RxStateComputed] ${target.constructor?.name}.${key} -> state.select([${dependencies.map((dep) => `'${dep}'`).join(', ')}])`);
         }
     };
 }
@@ -160,21 +164,29 @@ export function RxStateOutput(statePropertyName, opts) {
             console.warn(`[RxStateOutput] Convention: Property ${target.constructor?.name}.${key} should end with 'Changes' to indicate it's an Output`);
         }
         // Determine state property name
-        const finalStatePropertyName = statePropertyName || String(key).replace(/\$$/, '');
+        const finalStatePropertyName = statePropertyName || key.replace(/Changes$/, '');
         // Determine state object
         const stateVarName = target instanceof RxState ? null : target[STATE_VAR_NAME_KEY] || opts?.stateName || DEFAULT_STATE_VAR_NAME;
+        const cachePropertyName = `__${key}_cache`;
         // Define property with getter only
-        const stateObject = stateVarName ? target[stateVarName] : target;
-        const observable = finalStatePropertyName === '$' ? stateObject.$ : stateObject.$.pipe(select(finalStatePropertyName));
         Object.defineProperty(target, key, {
-            value: observable,
+            get: function () {
+                const stateObject = stateVarName ? this[stateVarName] : this;
+                DecoratorUtils.validateStateProperty(target, stateObject);
+                // Create observable if not exists
+                // See https://www.rx-angular.io/docs/state/getting-started#output-property-bindings
+                if (!this[cachePropertyName]) {
+                    this[cachePropertyName] = finalStatePropertyName === '$' ? stateObject.$ : stateObject.$.pipe(select(finalStatePropertyName));
+                }
+                return this[cachePropertyName];
+            },
             enumerable: true,
             configurable: false,
         });
         // Development logging
         if (!production) {
-            console.debug(`[RxStateOutput] ${target.constructor?.name}.${key} -> state.$.pipe(select('${finalStatePropertyName}'))`);
+            console.debug(`[RxStateOutput] ${target.constructor?.name}.${key} -> state.$.pipe(select('${String(finalStatePropertyName)}'))`);
         }
     };
 }
-//# 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';\nimport { select } from '@rx-angular/state/selections';\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, K extends keyof T, R extends T[K]>(\n  statePropertyName?: string | K,\n  projectValueReducer?: ProjectValueReducer<T, K, R>\n): StatePropertyDecorator<R> {\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: R) {\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 extends Object, K extends keyof T, R extends T[K]>(\n  statePropertyName?: string | K | '$',\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 extends Object, K extends keyof T, R extends T[K]>(\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\n/**\n * Decorator for RxState observable as output\n */\nexport function RxStateOutput<T extends Object, K extends keyof T, R extends T[K]>(\n  statePropertyName?: string | K | '$',\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('Changes')) {\n      console.warn(\n        `[RxStateOutput] Convention: Property ${target.constructor?.name}.${key as string} should end with 'Changes' to indicate it's an Output`\n      );\n    }\n\n    // Determine state property name\n    const finalStatePropertyName = (statePropertyName as string) || String(key).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    // Define property with getter only\n    const stateObject: RxState<T> = stateVarName ? target[stateVarName] : target;\n    const observable = finalStatePropertyName === '$' ? stateObject.$ : stateObject.$.pipe(select<T, K>(finalStatePropertyName as K));\n    Object.defineProperty(target, key, {\n      value: observable,\n      enumerable: true,\n      configurable: false,\n    });\n\n    // Development logging\n    if (!production) {\n      console.debug(`[RxStateOutput] ${target.constructor?.name}.${key as string} -> state.$.pipe(select('${finalStatePropertyName}'))`);\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';\nimport { select } from '@rx-angular/state/selections';\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: RxState<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, K extends keyof T, R extends T[K]>(\n  statePropertyName?: string | K,\n  projectValueReducer?: ProjectValueReducer<T, K, R>\n): StatePropertyDecorator<R> {\n  return function <P extends PropertyKey>(target: any, key: P) {\n    const finalStatePropertyName = String(statePropertyName || key) as K;\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);\n      },\n      set: function (value: R) {\n        const stateObject: RxState<T> = stateVarName ? this[stateVarName] : this;\n        DecoratorUtils.validateStateProperty(target, stateObject);\n        if (projectValueReducer) {\n          stateObject.set(finalStatePropertyName, (state: T) => projectValueReducer(state, value));\n        } else {\n          stateObject.set(<Partial<T>>{ [finalStatePropertyName]: 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.${String(finalStatePropertyName)}`);\n    }\n  };\n}\n\n/**\n * Decorator for RxState observable selectors\n */\nexport function RxStateSelect<T extends object, K extends keyof T, R extends T[K] = T[K]>(\n  statePropertyName?: string | K | '$',\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: RxState<T> = stateVarName ? this[stateVarName] : this;\n        DecoratorUtils.validateStateProperty(target, stateObject);\n\n        // Create observable if not exists\n        if (!this[internalPropertyName]) {\n          if (finalStatePropertyName === '$') {\n            this[internalPropertyName] = stateObject.$;\n          } else if (finalStatePropertyName.includes('.')) {\n            const args = finalStatePropertyName.split('.');\n            // @ts-ignore\n            this[internalPropertyName] = stateObject.select(...args);\n          } else {\n            this[internalPropertyName] = stateObject.select(finalStatePropertyName as K);\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 extends object, K extends keyof T, R extends T[K] = T[K]>(\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: RxState<T> = stateVarName ? this[stateVarName] : this;\n        DecoratorUtils.validateStateProperty(target, stateObject);\n\n        // Create observable if not exists\n        if (!this[cachePropertyName]) {\n          let observable = stateObject.select(dependencies, opts?.keyCompareMap);\n\n          // Apply computeFn if provided\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((dep) => `'${dep as string}'`).join(', ')}])`\n      );\n    }\n  };\n}\n\n/**\n * Decorator for RxState observable as output\n */\nexport function RxStateOutput<T extends object, K extends keyof T, R extends T[K] = T[K]>(\n  statePropertyName?: string | K | '$',\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('Changes')) {\n      console.warn(\n        `[RxStateOutput] Convention: Property ${target.constructor?.name}.${key as string} should end with 'Changes' to indicate it's an Output`\n      );\n    }\n\n    // Determine state property name\n    const finalStatePropertyName = (statePropertyName as K) || ((key as string).replace(/Changes$/, '') as K);\n\n    // Determine state object\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: RxState<T> = stateVarName ? this[stateVarName] : this;\n        DecoratorUtils.validateStateProperty(target, stateObject);\n\n        // Create observable if not exists\n        // See https://www.rx-angular.io/docs/state/getting-started#output-property-bindings\n        if (!this[cachePropertyName]) {\n          this[cachePropertyName] = finalStatePropertyName === '$' ? stateObject.$ : stateObject.$.pipe(select<T, K>(finalStatePropertyName));\n        }\n\n        return this[cachePropertyName];\n      },\n      enumerable: true,\n      configurable: false,\n    });\n\n    // Development logging\n    if (!production) {\n      console.debug(`[RxStateOutput] ${target.constructor?.name}.${key as string} -> state.$.pipe(select('${String(finalStatePropertyName)}'))`);\n    }\n  };\n}\n"]}

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

@@ -26808,7 +26808,7 @@ function RxStateRegister() {
  */
 function RxStateProperty(statePropertyName, projectValueReducer) {
     return function (target, key) {
-        const finalStatePropertyName = statePropertyName || key;
+        const finalStatePropertyName = String(statePropertyName || key);
         const stateVarName = target instanceof RxState ? null : target[STATE_VAR_NAME_KEY] || DEFAULT_STATE_VAR_NAME;
         // Define property with getter/setter
         Object.defineProperty(target, key, {
@@ -26832,7 +26832,7 @@ function RxStateProperty(statePropertyName, projectValueReducer) {
         });
         // Development logging
         if (!production) {
-            console.debug(`[RxStateProperty] ${target.constructor?.name}.${key} -> state.${finalStatePropertyName}`);
+            console.debug(`[RxStateProperty] ${target.constructor?.name}.${key} -> state.${String(finalStatePropertyName)}`);
         }
     };
 }
@@ -26856,13 +26856,15 @@ function RxStateSelect(statePropertyName, opts) {
             get: function () {
                 const stateObject = stateVarName ? this[stateVarName] : this;
                 DecoratorUtils.validateStateProperty(target, stateObject);
+                // Create observable if not exists
                 if (!this[internalPropertyName]) {
                     if (finalStatePropertyName === '$') {
                         this[internalPropertyName] = stateObject.$;
                     }
                     else if (finalStatePropertyName.includes('.')) {
-                        const path = finalStatePropertyName.split('.');
-                        this[internalPropertyName] = stateObject.select(...path);
+                        const args = finalStatePropertyName.split('.');
+                        // @ts-ignore
+                        this[internalPropertyName] = stateObject.select(...args);
                     }
                     else {
                         this[internalPropertyName] = stateObject.select(finalStatePropertyName);
@@ -26895,8 +26897,10 @@ function RxStateComputed(dependencies, computeFn, opts) {
             get: function () {
                 const stateObject = stateVarName ? this[stateVarName] : this;
                 DecoratorUtils.validateStateProperty(target, stateObject);
+                // Create observable if not exists
                 if (!this[cachePropertyName]) {
                     let observable = stateObject.select(dependencies, opts?.keyCompareMap);
+                    // Apply computeFn if provided
                     if (computeFn) {
                         observable = observable.pipe(map(computeFn));
                     }
@@ -26909,7 +26913,7 @@ function RxStateComputed(dependencies, computeFn, opts) {
         });
         // Development logging
         if (!production) {
-            console.debug(`[RxStateComputed] ${target.constructor?.name}.${key} -> state.select([${dependencies.map((d) => `'${d}'`).join(', ')}])`);
+            console.debug(`[RxStateComputed] ${target.constructor?.name}.${key} -> state.select([${dependencies.map((dep) => `'${dep}'`).join(', ')}])`);
         }
     };
 }
@@ -26923,20 +26927,28 @@ function RxStateOutput(statePropertyName, opts) {
             console.warn(`[RxStateOutput] Convention: Property ${target.constructor?.name}.${key} should end with 'Changes' to indicate it's an Output`);
         }
         // Determine state property name
-        const finalStatePropertyName = statePropertyName || String(key).replace(/\$$/, '');
+        const finalStatePropertyName = statePropertyName || key.replace(/Changes$/, '');
         // Determine state object
         const stateVarName = target instanceof RxState ? null : target[STATE_VAR_NAME_KEY] || opts?.stateName || DEFAULT_STATE_VAR_NAME;
+        const cachePropertyName = `__${key}_cache`;
         // Define property with getter only
-        const stateObject = stateVarName ? target[stateVarName] : target;
-        const observable = finalStatePropertyName === '$' ? stateObject.$ : stateObject.$.pipe(select(finalStatePropertyName));
         Object.defineProperty(target, key, {
-            value: observable,
+            get: function () {
+                const stateObject = stateVarName ? this[stateVarName] : this;
+                DecoratorUtils.validateStateProperty(target, stateObject);
+                // Create observable if not exists
+                // See https://www.rx-angular.io/docs/state/getting-started#output-property-bindings
+                if (!this[cachePropertyName]) {
+                    this[cachePropertyName] = finalStatePropertyName === '$' ? stateObject.$ : stateObject.$.pipe(select(finalStatePropertyName));
+                }
+                return this[cachePropertyName];
+            },
             enumerable: true,
             configurable: false,
         });
         // Development logging
         if (!production) {
-            console.debug(`[RxStateOutput] ${target.constructor?.name}.${key} -> state.$.pipe(select('${finalStatePropertyName}'))`);
+            console.debug(`[RxStateOutput] ${target.constructor?.name}.${key} -> state.$.pipe(select('${String(finalStatePropertyName)}'))`);
         }
     };
 }