@sumaris-net/ngx-components 18.14.1 → 18.14.3

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

@@ -26365,22 +26365,16 @@ class DecoratorUtils {
     static createPropertyName(prefix, propertyKey) {
         return `${prefix}${this.capitalize(propertyKey)}`;
     }
-    static validateStateProperty(target, stateVarName) {
-        if (!production && stateVarName !== 'this') {
-            return `
-        if (!${stateVarName}) {
-          throw new Error('Missing state! Please add a RxState in class: ' + this.constructor.name);
+    static validateStateProperty(target, stateObject) {
+        if (!production && !stateObject) {
+            throw new Error(`Missing state! Please add a RxState in class: ${target.constructor.name}`);
         }
-      `;
-        }
-        return '';
     }
 }
 const STATE_VAR_NAME_KEY = '__stateName';
 const DEFAULT_STATE_VAR_NAME = '_state';
 /**
  * Decorator to register the RxState property in a component
- * Must be used once per class hierarchy
  */
 function RxStateRegister() {
     return function (target, key) {
@@ -26397,49 +26391,36 @@ function RxStateRegister() {
 }
 /**
  * Decorator for RxState properties with getter/setter access
- * Creates reactive properties that sync with RxState
  */
 function RxStateProperty(statePropertyName, projectValueReducer) {
     return function (target, key) {
-        // Vérification de type au runtime (optionnelle)
-        const descriptor = Object.getOwnPropertyDescriptor(target, key);
-        if (descriptor && typeof descriptor.value !== 'undefined') {
-            // On peut ajouter ici des vérifications de type runtime si nécessaire
-        }
         const finalStatePropertyName = statePropertyName || key;
         const stateVarName = target instanceof RxState ? null : target[STATE_VAR_NAME_KEY] || DEFAULT_STATE_VAR_NAME;
-        const stateObject = stateVarName ? `this.${stateVarName}` : 'this';
-        // Generate method names
-        const getMethodName = DecoratorUtils.createMethodName('_get', key);
-        const setMethodName = DecoratorUtils.createMethodName('_set', key);
-        const reducerMethodName = DecoratorUtils.createMethodName('_reduce', key);
-        // State validation (only in development)
-        const stateValidation = DecoratorUtils.validateStateProperty(target, stateObject);
-        // Create reducer logic
-        const reducerLogic = projectValueReducer ? `(state) => this.${reducerMethodName}(state, value)` : '() => value';
-        // Create dynamic methods using Function constructor for better performance
-        const getter = new Function(`
-      return function ${getMethodName}() {
-        ${stateValidation}
-        return ${stateObject}.get('${finalStatePropertyName}');
-      }
-    `)();
-        const setter = new Function(`
-      return function ${setMethodName}(value) {
-        ${stateValidation}
-        ${stateObject}.set('${finalStatePropertyName}', ${reducerLogic});
-      }
-    `)();
-        // Attach methods to prototype
-        target[getMethodName] = getter;
-        target[setMethodName] = setter;
-        if (projectValueReducer) {
-            target[reducerMethodName] = projectValueReducer;
-        }
+        // 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: getter,
-            set: setter,
+            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];
+            },
+            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);
+                }
+            },
             enumerable: true,
             configurable: true,
         });
@@ -26451,117 +26432,79 @@ function RxStateProperty(statePropertyName, projectValueReducer) {
 }
 /**
  * Decorator for RxState observable selectors
- * Creates observable properties that select from RxState
- *
- * ⚠️ IMPORTANT: La propriété décorée DOIT être typée comme Observable<T>
- *
- * @example
- * ```typescript
- * @RxStateSelect()
- * protected pmfms$: Observable<IPmfm[]>; // ✅ Correct
- *
- * @RxStateSelect()
- * protected badProperty: boolean; // ❌ TypeScript Error
- * ```
  */
 function RxStateSelect(statePropertyName, opts) {
     return function (target, key) {
-        // Vérification simple basée sur la convention (optionnelle)
+        // Convention check
         if (!production && !key.endsWith('$')) {
             console.warn(`[RxStateSelect] Convention: Property ${target.constructor?.name}.${key} should end with '$' to indicate it's an Observable`);
         }
-        // Determine state property name (remove trailing $ if present)
+        // Determine state property name
         const finalStatePropertyName = statePropertyName || key.replace(/\$$/, '');
         // Determine state object
         const stateVarName = target instanceof RxState ? null : target[STATE_VAR_NAME_KEY] || opts?.stateName || DEFAULT_STATE_VAR_NAME;
-        const stateObject = stateVarName ? `this.${stateVarName}` : 'this';
         // Create cache property name
-        const cachePropertyName = `_${key}`;
-        // Generate method name
-        const getMethodName = DecoratorUtils.createMethodName('_get', key.replace(/\$$/, '') + '$');
-        // Create observable selector logic
-        const observableSelector = finalStatePropertyName === '$'
-            ? `${stateObject}.$`
-            : finalStatePropertyName.includes('.')
-                ? `${stateObject}.select('${finalStatePropertyName.split('.').join("', '")}')`
-                : `${stateObject}.select('${finalStatePropertyName}')`;
-        // State validation
-        const stateValidation = DecoratorUtils.validateStateProperty(target, stateObject);
-        // Create getter with caching
-        const getter = new Function(`
-      return function ${getMethodName}() {
-        ${stateValidation}
-        if (!this.${cachePropertyName}) {
-          this.${cachePropertyName} = ${observableSelector};
-        }
-        return this.${cachePropertyName};
-      }
-    `)();
-        // Attach method to prototype
-        target[getMethodName] = getter;
+        const cachePropertyName = `__${key}_cache`;
         // Define property with getter only
         Object.defineProperty(target, key, {
-            get: getter,
+            get: function () {
+                const stateObject = stateVarName ? this[stateVarName] : this;
+                DecoratorUtils.validateStateProperty(target, stateObject);
+                if (!this[cachePropertyName]) {
+                    if (finalStatePropertyName === '$') {
+                        this[cachePropertyName] = stateObject.$;
+                    }
+                    else if (finalStatePropertyName.includes('.')) {
+                        const path = finalStatePropertyName.split('.');
+                        this[cachePropertyName] = stateObject.select(...path);
+                    }
+                    else {
+                        this[cachePropertyName] = stateObject.select(finalStatePropertyName);
+                    }
+                }
+                return this[cachePropertyName];
+            },
             enumerable: true,
             configurable: false,
         });
         // Development logging
         if (!production) {
-            console.debug(`[RxStateSelect] ${target.constructor?.name}.${key} -> ${observableSelector}`);
+            console.debug(`[RxStateSelect] ${target.constructor?.name}.${key} -> state.select('${finalStatePropertyName}')`);
         }
     };
 }
 /**
  * Utility decorator to create computed observables from state
- *
- * ⚠️ IMPORTANT: La propriété décorée DOIT être typée comme Observable<T>
  */
 function RxStateComputed(dependencies, computeFn, opts) {
     return function (target, key) {
-        // Vérification simple basée sur la convention (optionnelle)
+        // Convention check
         if (!production && !key.endsWith('$')) {
             console.warn(`[RxStateComputed] Convention: Property ${target.constructor?.name}.${key} should end with '$' to indicate it's an Observable`);
         }
         const stateVarName = target instanceof RxState ? null : target[STATE_VAR_NAME_KEY] || opts?.stateName || DEFAULT_STATE_VAR_NAME;
-        const stateObject = stateVarName ? `this.${stateVarName}` : 'this';
-        const cachePropertyName = `_${key}`;
-        const getMethodName = DecoratorUtils.createMethodName('_get', key.replace(/\$$/, '') + '$');
-        const computeMethodName = DecoratorUtils.createMethodName('_compute', key);
-        const keyCompareMapPropertyName = DecoratorUtils.createPropertyName(`_compareMap`, key);
-        // State validation
-        const stateValidation = DecoratorUtils.validateStateProperty(target, stateObject);
-        // Create dependencies array as string for code generation
-        const dependenciesStr = dependencies.map((dep) => `'${dep}'`).join(', ');
-        // Create the compute method as string, for code generation
-        const computeMethodNameStr = computeFn ? `, (slice) => this.${computeMethodName}(slice)` : '';
-        // Create the comparator map function as string, for code generation
-        const keyCompareMapStr = opts?.keyCompareMap ? `, this.${keyCompareMapPropertyName}` : '';
-        // Create getter with caching using RxState's native multi-select + pipe(map())
-        const getter = new Function(`
-      return function ${getMethodName}() {
-        ${stateValidation}
-        if (!this.${cachePropertyName}) {
-          const { map } = require('rxjs/operators');
-          this.${cachePropertyName} = ${stateObject}.select([${dependenciesStr}]${computeMethodNameStr}${keyCompareMapStr});
-        }
-        return this.${cachePropertyName};
-      }
-    `)();
-        // Attach compute method, optional keyCompareMap with unique name, and getter to prototype
-        if (computeFn)
-            target[computeMethodName] = computeFn;
-        if (opts?.keyCompareMap)
-            target[keyCompareMapPropertyName] = opts.keyCompareMap;
-        target[getMethodName] = getter;
+        const cachePropertyName = `__${key}_cache`;
         // Define property with getter only
         Object.defineProperty(target, key, {
-            get: getter,
+            get: function () {
+                const stateObject = stateVarName ? this[stateVarName] : this;
+                DecoratorUtils.validateStateProperty(target, stateObject);
+                if (!this[cachePropertyName]) {
+                    let observable = stateObject.select(dependencies, opts?.keyCompareMap);
+                    if (computeFn) {
+                        const { map } = require('rxjs/operators');
+                        observable = observable.pipe(map(computeFn));
+                    }
+                    this[cachePropertyName] = observable;
+                }
+                return this[cachePropertyName];
+            },
             enumerable: true,
             configurable: false,
         });
         // Development logging
         if (!production) {
-            console.debug(`[RxStateComputed] ${target.constructor?.name}.${key} -> ${stateObject}.select([${dependenciesStr}]).pipe(map(computeFn))`);
+            console.debug(`[RxStateComputed] ${target.constructor?.name}.${key} -> state.select([${dependencies.map((d) => `'${d}'`).join(', ')}])`);
         }
     };
 }
@@ -44815,10 +44758,14 @@ class DiscourseFeedService extends StartableService {
     _logPrefix = '[discourse-feed-service] ';
     _state = new RxState();
     network = inject(NetworkService);
-    locale$;
-    feedUrls$;
-    locale;
-    feedUrls;
+    locale$ = this._state.select('locale');
+    feedUrls$ = this._state.select('feedUrls');
+    get feedUrls() {
+        return this._state.get('feedUrls');
+    }
+    set feedUrls(urls) {
+        this._state.set('feedUrls', () => urls);
+    }
     constructor(settings, environment) {
         super(settings);
         this.settings = settings;
@@ -44831,10 +44778,8 @@ class DiscourseFeedService extends StartableService {
     }
     async ngOnStart() {
         await this.settings.ready();
-        console.debug(`${this._logPrefix}Service started`, this.settings.locale, this.feedUrls);
         return {
             locale: this.settings.locale,
-            feedUrls: this.feedUrls,
         };
     }
     watchAll(opts) {
@@ -44947,18 +44892,6 @@ class DiscourseFeedService extends StartableService {
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DiscourseFeedService, deps: [{ token: LocalSettingsService }, { token: ENVIRONMENT, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DiscourseFeedService, providedIn: 'root' });
 }
-__decorate([
-    RxStateSelect()
-], DiscourseFeedService.prototype, "locale$", void 0);
-__decorate([
-    RxStateSelect()
-], DiscourseFeedService.prototype, "feedUrls$", void 0);
-__decorate([
-    RxStateProperty()
-], DiscourseFeedService.prototype, "locale", void 0);
-__decorate([
-    RxStateProperty()
-], DiscourseFeedService.prototype, "feedUrls", void 0);
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DiscourseFeedService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
@@ -44967,7 +44900,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
                 }, {
                     type: Inject,
                     args: [ENVIRONMENT]
-                }] }], propDecorators: { locale$: [], feedUrls$: [], locale: [], feedUrls: [] } });
+                }] }] });
 
 const PersonFragments = {
     person: gql$1 `