@sumaris-net/ngx-components 18.14.4 → 18.14.6

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 (5) hide show
  1. package/esm2022/src/app/shared/rx-state/rx-state.decorators.mjs +10 -18
  2. package/fesm2022/sumaris-net.ngx-components.mjs +8 -17
  3. package/fesm2022/sumaris-net.ngx-components.mjs.map +1 -1
  4. package/package.json +1 -1
  5. package/src/app/shared/inputs.d.ts +1 -1
package/esm2022/src/app/shared/rx-state/rx-state.decorators.mjs CHANGED
@@ -1,4 +1,5 @@
1
1
  import { RxState } from '@rx-angular/state';
2
+ import { map } from 'rxjs/operators';
2
3
  let production = false;
3
4
  export function enableRxStateProdMode() {
4
5
  production = true;
@@ -45,29 +46,21 @@ export function RxStateProperty(statePropertyName, projectValueReducer) {
45
46
  return function (target, key) {
46
47
  const finalStatePropertyName = statePropertyName || key;
47
48
  const stateVarName = target instanceof RxState ? null : target[STATE_VAR_NAME_KEY] || DEFAULT_STATE_VAR_NAME;
48
- // Create unique property names to avoid conflicts
49
- const privateValueKey = `__${key}_value`;
50
- const privateInitializedKey = `__${key}_initialized`;
51
49
  // Define property with getter/setter
52
50
  Object.defineProperty(target, key, {
53
51
  get: function () {
54
52
  const stateObject = stateVarName ? this[stateVarName] : this;
55
53
  DecoratorUtils.validateStateProperty(target, stateObject);
56
- if (!this[privateInitializedKey]) {
57
- this[privateValueKey] = stateObject.get(finalStatePropertyName);
58
- this[privateInitializedKey] = true;
59
- }
60
- return this[privateValueKey];
54
+ return stateObject.get(finalStatePropertyName);
61
55
  },
62
56
  set: function (value) {
63
57
  const stateObject = stateVarName ? this[stateVarName] : this;
64
58
  DecoratorUtils.validateStateProperty(target, stateObject);
65
- this[privateValueKey] = value;
66
59
  if (projectValueReducer) {
67
60
  stateObject.set(finalStatePropertyName, (state) => projectValueReducer(state, value));
68
61
  }
69
62
  else {
70
- stateObject.set(finalStatePropertyName, () => value);
63
+ stateObject.set({ [finalStatePropertyName]: value });
71
64
  }
72
65
  },
73
66
  enumerable: true,
@@ -93,25 +86,25 @@ export function RxStateSelect(statePropertyName, opts) {
93
86
  // Determine state object
94
87
  const stateVarName = target instanceof RxState ? null : target[STATE_VAR_NAME_KEY] || opts?.stateName || DEFAULT_STATE_VAR_NAME;
95
88
  // Create cache property name
96
- const cachePropertyName = `__${key}_cache`;
89
+ const internalPropertyName = `__${key}`;
97
90
  // Define property with getter only
98
91
  Object.defineProperty(target, key, {
99
92
  get: function () {
100
93
  const stateObject = stateVarName ? this[stateVarName] : this;
101
94
  DecoratorUtils.validateStateProperty(target, stateObject);
102
- if (!this[cachePropertyName]) {
95
+ if (!this[internalPropertyName]) {
103
96
  if (finalStatePropertyName === '$') {
104
- this[cachePropertyName] = stateObject.$;
97
+ this[internalPropertyName] = stateObject.$;
105
98
  }
106
99
  else if (finalStatePropertyName.includes('.')) {
107
100
  const path = finalStatePropertyName.split('.');
108
- this[cachePropertyName] = stateObject.select(...path);
101
+ this[internalPropertyName] = stateObject.select(...path);
109
102
  }
110
103
  else {
111
- this[cachePropertyName] = stateObject.select(finalStatePropertyName);
104
+ this[internalPropertyName] = stateObject.select(finalStatePropertyName);
112
105
  }
113
106
  }
114
- return this[cachePropertyName];
107
+ return this[internalPropertyName];
115
108
  },
116
109
  enumerable: true,
117
110
  configurable: false,
@@ -141,7 +134,6 @@ export function RxStateComputed(dependencies, computeFn, opts) {
141
134
  if (!this[cachePropertyName]) {
142
135
  let observable = stateObject.select(dependencies, opts?.keyCompareMap);
143
136
  if (computeFn) {
144
- const { map } = require('rxjs/operators');
145
137
  observable = observable.pipe(map(computeFn));
146
138
  }
147
139
  this[cachePropertyName] = observable;
@@ -157,4 +149,4 @@ export function RxStateComputed(dependencies, computeFn, opts) {
157
149
  }
158
150
  };
159
151
  }
160
- //# 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';\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            const { map } = require('rxjs/operators');\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"]}
152
+ //# 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 CHANGED
@@ -26396,29 +26396,21 @@ function RxStateProperty(statePropertyName, projectValueReducer) {
26396
26396
  return function (target, key) {
26397
26397
  const finalStatePropertyName = statePropertyName || key;
26398
26398
  const stateVarName = target instanceof RxState ? null : target[STATE_VAR_NAME_KEY] || DEFAULT_STATE_VAR_NAME;
26399
- // Create unique property names to avoid conflicts
26400
- const privateValueKey = `__${key}_value`;
26401
- const privateInitializedKey = `__${key}_initialized`;
26402
26399
  // Define property with getter/setter
26403
26400
  Object.defineProperty(target, key, {
26404
26401
  get: function () {
26405
26402
  const stateObject = stateVarName ? this[stateVarName] : this;
26406
26403
  DecoratorUtils.validateStateProperty(target, stateObject);
26407
- if (!this[privateInitializedKey]) {
26408
- this[privateValueKey] = stateObject.get(finalStatePropertyName);
26409
- this[privateInitializedKey] = true;
26410
- }
26411
- return this[privateValueKey];
26404
+ return stateObject.get(finalStatePropertyName);
26412
26405
  },
26413
26406
  set: function (value) {
26414
26407
  const stateObject = stateVarName ? this[stateVarName] : this;
26415
26408
  DecoratorUtils.validateStateProperty(target, stateObject);
26416
- this[privateValueKey] = value;
26417
26409
  if (projectValueReducer) {
26418
26410
  stateObject.set(finalStatePropertyName, (state) => projectValueReducer(state, value));
26419
26411
  }
26420
26412
  else {
26421
- stateObject.set(finalStatePropertyName, () => value);
26413
+ stateObject.set({ [finalStatePropertyName]: value });
26422
26414
  }
26423
26415
  },
26424
26416
  enumerable: true,
@@ -26444,25 +26436,25 @@ function RxStateSelect(statePropertyName, opts) {
26444
26436
  // Determine state object
26445
26437
  const stateVarName = target instanceof RxState ? null : target[STATE_VAR_NAME_KEY] || opts?.stateName || DEFAULT_STATE_VAR_NAME;
26446
26438
  // Create cache property name
26447
- const cachePropertyName = `__${key}_cache`;
26439
+ const internalPropertyName = `__${key}`;
26448
26440
  // Define property with getter only
26449
26441
  Object.defineProperty(target, key, {
26450
26442
  get: function () {
26451
26443
  const stateObject = stateVarName ? this[stateVarName] : this;
26452
26444
  DecoratorUtils.validateStateProperty(target, stateObject);
26453
- if (!this[cachePropertyName]) {
26445
+ if (!this[internalPropertyName]) {
26454
26446
  if (finalStatePropertyName === '$') {
26455
- this[cachePropertyName] = stateObject.$;
26447
+ this[internalPropertyName] = stateObject.$;
26456
26448
  }
26457
26449
  else if (finalStatePropertyName.includes('.')) {
26458
26450
  const path = finalStatePropertyName.split('.');
26459
- this[cachePropertyName] = stateObject.select(...path);
26451
+ this[internalPropertyName] = stateObject.select(...path);
26460
26452
  }
26461
26453
  else {
26462
- this[cachePropertyName] = stateObject.select(finalStatePropertyName);
26454
+ this[internalPropertyName] = stateObject.select(finalStatePropertyName);
26463
26455
  }
26464
26456
  }
26465
- return this[cachePropertyName];
26457
+ return this[internalPropertyName];
26466
26458
  },
26467
26459
  enumerable: true,
26468
26460
  configurable: false,
@@ -26492,7 +26484,6 @@ function RxStateComputed(dependencies, computeFn, opts) {
26492
26484
  if (!this[cachePropertyName]) {
26493
26485
  let observable = stateObject.select(dependencies, opts?.keyCompareMap);
26494
26486
  if (computeFn) {
26495
- const { map } = require('rxjs/operators');
26496
26487
  observable = observable.pipe(map(computeFn));
26497
26488
  }
26498
26489
  this[cachePropertyName] = observable;