@punica/form 1.1.3 → 1.1.5

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.
@@ -55,13 +55,12 @@ class FormController extends common_1.BaseListener {
55
55
  const initialReader = (0, __1.createInitialReader)();
56
56
  __classPrivateFieldSet(instance, _FormController_initialEntity, entity, "f");
57
57
  __classPrivateFieldSet(instance, _FormController_form, {
58
- itemsMap: null,
59
58
  items: null,
60
59
  services: null,
61
60
  starters: null,
62
61
  readers: null
63
62
  }, "f");
64
- await initialReader.read(__classPrivateFieldGet(instance, _FormController_initialEntity, "f"), __classPrivateFieldGet(instance, _FormController_form, "f"));
63
+ await initialReader.read(__classPrivateFieldGet(instance, _FormController_initialEntity, "f"), __classPrivateFieldGet(instance, _FormController_form, "f"), {});
65
64
  resolve(instance);
66
65
  });
67
66
  }
@@ -119,8 +118,8 @@ class FormController extends common_1.BaseListener {
119
118
  * @returns The form item corresponding to the property key
120
119
  */
121
120
  getItem(property) {
122
- const { items, itemsMap } = __classPrivateFieldGet(this, _FormController_form, "f");
123
- const itemIndex = itemsMap[property];
121
+ const { items } = __classPrivateFieldGet(this, _FormController_form, "f");
122
+ const itemIndex = __classPrivateFieldGet(this, _FormController_itemsMap, "f")[property];
124
123
  if (!Number.isInteger(itemIndex)) {
125
124
  return null;
126
125
  }
@@ -132,9 +131,9 @@ class FormController extends common_1.BaseListener {
132
131
  */
133
132
  async writeItems(items) {
134
133
  for await (const item of items) {
135
- const { itemsMap, items } = __classPrivateFieldGet(this, _FormController_form, "f");
134
+ const { items } = __classPrivateFieldGet(this, _FormController_form, "f");
136
135
  const { property } = item;
137
- const index = itemsMap[property];
136
+ const index = __classPrivateFieldGet(this, _FormController_itemsMap, "f")[property];
138
137
  items[index] = item;
139
138
  }
140
139
  }
@@ -192,7 +191,7 @@ class FormController extends common_1.BaseListener {
192
191
  async runReaders() {
193
192
  if (__classPrivateFieldGet(this, _FormController_form, "f").readers) {
194
193
  for await (const reader of __classPrivateFieldGet(this, _FormController_form, "f").readers) {
195
- reader.read(__classPrivateFieldGet(this, _FormController_initialEntity, "f"), __classPrivateFieldGet(this, _FormController_form, "f"));
194
+ reader.read(__classPrivateFieldGet(this, _FormController_initialEntity, "f"), __classPrivateFieldGet(this, _FormController_form, "f"), __classPrivateFieldGet(this, _FormController_itemsMap, "f"));
196
195
  }
197
196
  }
198
197
  }
@@ -1,8 +1,5 @@
1
1
  import { FormItem, IReader, IService, IStarter } from '../..';
2
2
  export type Form<E = any, F extends FormItem<E> = any> = {
3
- itemsMap: {
4
- [key in keyof E]: number;
5
- };
6
3
  items: Array<F>;
7
4
  services?: Array<IService>;
8
5
  readers?: Array<IReader<E, F>>;
@@ -1,4 +1,4 @@
1
1
  import { Form, FormItem } from '..';
2
2
  export interface IReader<E, F extends FormItem<E>> {
3
- read(entity: E, form: Form<E, F>): Promise<void>;
3
+ read(entity: E, form: Form<E, F>, itemsMap?: Record<keyof E, number>): Promise<void>;
4
4
  }
@@ -10,6 +10,10 @@ declare abstract class BaseReader<E, F extends FormItem<E>> implements IReader<E
10
10
  * @param {IReader<E, F>} reader - The reader to be used for reading form data.
11
11
  */
12
12
  constructor(reader: IReader<E, F>);
13
+ /**
14
+ * Maps form items to their properties.
15
+ */
16
+ private mapFormItems;
13
17
  /**
14
18
  * Gets a command item for a form item.
15
19
  * @param {F} item - The form item.
@@ -10,7 +10,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
10
10
  if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
11
11
  return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
12
12
  };
13
- var _BaseReader_form, _BaseReader_entity;
13
+ var _BaseReader_form, _BaseReader_entity, _BaseReader_itemsMap;
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  /**
16
16
  * Abstract base class for reading form data.
@@ -23,8 +23,24 @@ class BaseReader {
23
23
  constructor(reader) {
24
24
  _BaseReader_form.set(this, void 0);
25
25
  _BaseReader_entity.set(this, void 0);
26
+ _BaseReader_itemsMap.set(this, void 0);
26
27
  this.reader = reader;
27
28
  }
29
+ /**
30
+ * Maps form items to their properties.
31
+ */
32
+ mapFormItems() {
33
+ if (__classPrivateFieldGet(this, _BaseReader_itemsMap, "f")) {
34
+ return;
35
+ }
36
+ let index = 0;
37
+ __classPrivateFieldSet(this, _BaseReader_itemsMap, {}, "f");
38
+ if (__classPrivateFieldGet(this, _BaseReader_form, "f").items) {
39
+ for (const item of __classPrivateFieldGet(this, _BaseReader_form, "f").items) {
40
+ __classPrivateFieldGet(this, _BaseReader_itemsMap, "f")[item.property] = index++;
41
+ }
42
+ }
43
+ }
28
44
  /**
29
45
  * Gets a command item for a form item.
30
46
  * @param {F} item - The form item.
@@ -45,7 +61,8 @@ class BaseReader {
45
61
  async read(entity, form) {
46
62
  __classPrivateFieldSet(this, _BaseReader_entity, entity, "f");
47
63
  __classPrivateFieldSet(this, _BaseReader_form, form, "f");
48
- await this.reader.read(entity, form);
64
+ this.mapFormItems();
65
+ await this.reader.read(entity, form, __classPrivateFieldGet(this, _BaseReader_itemsMap, "f"));
49
66
  }
50
67
  /**
51
68
  * Gets a form item by property.
@@ -53,8 +70,8 @@ class BaseReader {
53
70
  * @returns {F} - The form item.
54
71
  */
55
72
  getItem(property) {
56
- const { items, itemsMap } = __classPrivateFieldGet(this, _BaseReader_form, "f");
57
- const index = itemsMap[property];
73
+ const { items } = __classPrivateFieldGet(this, _BaseReader_form, "f");
74
+ const index = __classPrivateFieldGet(this, _BaseReader_itemsMap, "f")[property];
58
75
  const item = items[index];
59
76
  return item;
60
77
  }
@@ -64,12 +81,11 @@ class BaseReader {
64
81
  */
65
82
  async writeItems(items) {
66
83
  for (const item of items) {
67
- const { itemsMap } = __classPrivateFieldGet(this, _BaseReader_form, "f");
68
84
  const { property } = item;
69
- const index = itemsMap[property];
85
+ const index = __classPrivateFieldGet(this, _BaseReader_itemsMap, "f")[property];
70
86
  __classPrivateFieldGet(this, _BaseReader_form, "f").items[index] = item;
71
87
  }
72
88
  }
73
89
  }
74
- _BaseReader_form = new WeakMap(), _BaseReader_entity = new WeakMap();
90
+ _BaseReader_form = new WeakMap(), _BaseReader_entity = new WeakMap(), _BaseReader_itemsMap = new WeakMap();
75
91
  exports.default = BaseReader;
@@ -31,7 +31,7 @@ class Reader extends base_1.default {
31
31
  continue;
32
32
  }
33
33
  formItem.property = key;
34
- items.push(formItem);
34
+ items.push({ ...formItem });
35
35
  }
36
36
  resolve(items);
37
37
  });
@@ -45,11 +45,6 @@ class Reader extends base_1.default {
45
45
  await super.read(entity, form);
46
46
  // Create form items from the entity
47
47
  form.items = await this.createFormItemsFromEntity(entity);
48
- form.itemsMap = {};
49
- // Create a map of form items
50
- form.items.forEach((item, index) => {
51
- form.itemsMap[item.property] = index;
52
- });
53
48
  }
54
49
  }
55
50
  exports.default = Reader;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@punica/form",
3
- "version": "1.1.3",
3
+ "version": "1.1.5",
4
4
  "description": "Form",
5
5
  "author": {
6
6
  "name": "Uryan Sezgin TEKE",
@@ -36,5 +36,5 @@
36
36
  "@punica/common": "^1.0.1",
37
37
  "@punica/util": "^1.0.2"
38
38
  },
39
- "gitHead": "55cc59c672e7132cd3d0f4b7d59b34db1e503d4d"
39
+ "gitHead": "6cf4dff7ccff6a00d9b6f020c7b9eb1ea31be9ca"
40
40
  }