@praxisjs/decorators 0.4.0 → 0.4.2

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.
@@ -0,0 +1,381 @@
1
+ import { describe, it, expect, vi } from "vitest";
2
+ import { StatefulComponent } from "@praxisjs/core";
3
+ import { signal } from "@praxisjs/core/internal";
4
+ import { Watch } from "../functions/watch";
5
+ import { When } from "../functions/when";
6
+ import { Computed } from "../properties/computed";
7
+ import { History } from "../properties/history";
8
+ import { Prop } from "../properties/prop";
9
+ import { State } from "../properties/state";
10
+ // Helper: creates a ClassFieldDecoratorContext mock
11
+ function fieldCtx(name) {
12
+ const initializers = [];
13
+ return {
14
+ ctx: {
15
+ name,
16
+ kind: "field",
17
+ addInitializer(fn) {
18
+ initializers.push(fn);
19
+ },
20
+ },
21
+ run(instance) {
22
+ initializers.forEach((fn) => { fn.call(instance); });
23
+ },
24
+ };
25
+ }
26
+ function methodCtx(name) {
27
+ const initializers = [];
28
+ return {
29
+ ctx: {
30
+ name,
31
+ kind: "method",
32
+ addInitializer(fn) {
33
+ initializers.push(fn);
34
+ },
35
+ },
36
+ run(instance) {
37
+ initializers.forEach((fn) => { fn.call(instance); });
38
+ },
39
+ };
40
+ }
41
+ // Minimal concrete component
42
+ class TestComponent extends StatefulComponent {
43
+ render() { return null; }
44
+ }
45
+ // ── State ─────────────────────────────────────────────────────────────────────
46
+ describe("State decorator", () => {
47
+ it("converts a field to a reactive getter/setter", () => {
48
+ const { ctx, run } = fieldCtx("count");
49
+ State()(undefined, ctx);
50
+ const instance = new TestComponent();
51
+ instance.count = 10;
52
+ run(instance);
53
+ expect(instance.count).toBe(10);
54
+ instance.count = 20;
55
+ expect(instance.count).toBe(20);
56
+ });
57
+ it("sets _stateDirty on write", () => {
58
+ const { ctx, run } = fieldCtx("value");
59
+ State()(undefined, ctx);
60
+ const instance = new TestComponent();
61
+ instance.value = "hello";
62
+ run(instance);
63
+ instance._stateDirty = false;
64
+ instance.value = "world";
65
+ expect(instance._stateDirty).toBe(true);
66
+ });
67
+ });
68
+ // ── Prop ──────────────────────────────────────────────────────────────────────
69
+ describe("Prop decorator", () => {
70
+ it("reads from _rawProps when set by parent", () => {
71
+ const { ctx, run } = fieldCtx("label");
72
+ Prop()(undefined, ctx);
73
+ const instance = new TestComponent({ label: "hello" });
74
+ run(instance);
75
+ expect(instance.label).toBe("hello");
76
+ });
77
+ it("falls back to default value when not in _rawProps", () => {
78
+ const { ctx, run } = fieldCtx("size");
79
+ Prop()(undefined, ctx);
80
+ const instance = new TestComponent();
81
+ instance.size = "md"; // set before initializer runs
82
+ run(instance);
83
+ expect(instance.size).toBe("md");
84
+ });
85
+ it("unwraps a function prop (reactive prop)", () => {
86
+ const { ctx, run } = fieldCtx("text");
87
+ Prop()(undefined, ctx);
88
+ const s = signal("reactive");
89
+ const instance = new TestComponent({ text: () => s() });
90
+ run(instance);
91
+ expect(instance.text).toBe("reactive");
92
+ s.set("updated");
93
+ expect(instance.text).toBe("updated");
94
+ });
95
+ });
96
+ // ── Computed ──────────────────────────────────────────────────────────────────
97
+ describe("Computed decorator", () => {
98
+ it("wraps a getter in a computed — result is memoized", () => {
99
+ const fn = vi.fn(function () {
100
+ return this.base * 2;
101
+ });
102
+ const wrappedGetter = Computed()(fn, {});
103
+ const instance = { base: 5 };
104
+ const result1 = wrappedGetter.call(instance);
105
+ const result2 = wrappedGetter.call(instance);
106
+ expect(result1).toBe(10);
107
+ expect(result2).toBe(10);
108
+ expect(fn).toHaveBeenCalledTimes(1); // lazy caching
109
+ });
110
+ it("recomputes when underlying signal changes", () => {
111
+ const s = signal(3);
112
+ const getter = function () { return s() * 2; };
113
+ const wrapped = Computed()(getter, {});
114
+ const obj = {};
115
+ expect(wrapped.call(obj)).toBe(6);
116
+ s.set(5);
117
+ expect(wrapped.call(obj)).toBe(10);
118
+ });
119
+ it("is per-instance — separate computed per object", () => {
120
+ const s = signal(1);
121
+ const getter = function () { return s(); };
122
+ const wrapped = Computed()(getter, {});
123
+ const a = {};
124
+ const b = {};
125
+ expect(wrapped.call(a)).toBe(1);
126
+ expect(wrapped.call(b)).toBe(1);
127
+ // Both share the same signal but have independent computed instances
128
+ });
129
+ });
130
+ // ── Watch ─────────────────────────────────────────────────────────────────────
131
+ describe("Watch decorator", () => {
132
+ it("calls handler when a single watched property changes", () => {
133
+ const { ctx, run } = methodCtx("onChange");
134
+ Watch("count")(function (newVal) {
135
+ this.__lastVal = newVal;
136
+ }, ctx);
137
+ const s = signal(0);
138
+ const instance = new TestComponent();
139
+ Object.defineProperty(instance, "count", {
140
+ get: () => s(),
141
+ configurable: true,
142
+ });
143
+ run(instance);
144
+ // Simulate onMount
145
+ instance.onMount?.();
146
+ s.set(5);
147
+ expect(instance.__lastVal).toBe(5);
148
+ });
149
+ it("does not fire if value hasn't changed", () => {
150
+ const { ctx, run } = methodCtx("onNotChange");
151
+ const handler = vi.fn();
152
+ Watch("x")(handler, ctx);
153
+ const s = signal(1);
154
+ const instance = new TestComponent();
155
+ Object.defineProperty(instance, "x", {
156
+ get: () => s(),
157
+ configurable: true,
158
+ });
159
+ run(instance);
160
+ instance.onMount?.();
161
+ s.set(1); // same value
162
+ expect(handler).not.toHaveBeenCalled();
163
+ });
164
+ it("multi-prop watch fires when any watched prop changes", () => {
165
+ const { ctx, run } = methodCtx("onMulti");
166
+ const handler = vi.fn();
167
+ Watch("a", "b")(handler, ctx);
168
+ const sa = signal(0);
169
+ const sb = signal(0);
170
+ const instance = new TestComponent();
171
+ Object.defineProperty(instance, "a", { get: () => sa(), configurable: true });
172
+ Object.defineProperty(instance, "b", { get: () => sb(), configurable: true });
173
+ run(instance);
174
+ instance.onMount?.();
175
+ sa.set(1);
176
+ expect(handler).toHaveBeenCalledTimes(1);
177
+ sb.set(1);
178
+ expect(handler).toHaveBeenCalledTimes(2);
179
+ });
180
+ });
181
+ // ── History ───────────────────────────────────────────────────────────────────
182
+ describe("History decorator", () => {
183
+ it("creates a {name}History property on the instance", () => {
184
+ const { ctx, run } = fieldCtx("score");
185
+ History()(undefined, ctx);
186
+ const instance = new TestComponent();
187
+ run(instance);
188
+ expect(instance.scoreHistory).toBeDefined();
189
+ });
190
+ it("history tracks changes to the property", () => {
191
+ const { ctx, run } = fieldCtx("score");
192
+ History()(undefined, ctx);
193
+ const s = signal(0);
194
+ const instance = new TestComponent();
195
+ Object.defineProperty(instance, "score", {
196
+ get: () => s(),
197
+ set: (v) => { s.set(v); },
198
+ configurable: true,
199
+ });
200
+ run(instance);
201
+ const h = instance.scoreHistory;
202
+ s.set(10);
203
+ expect(h.canUndo()).toBe(true);
204
+ expect(h.values()).toContain(10);
205
+ });
206
+ it("canUndo becomes true after a value change", () => {
207
+ const { ctx, run } = fieldCtx("num");
208
+ History()(undefined, ctx);
209
+ const s = signal(0);
210
+ const instance = new TestComponent();
211
+ Object.defineProperty(instance, "num", {
212
+ get: () => s(),
213
+ set: (v) => { s.set(v); },
214
+ configurable: true,
215
+ });
216
+ run(instance);
217
+ const h = instance.numHistory;
218
+ expect(h.canUndo()).toBe(false);
219
+ s.set(5);
220
+ expect(h.canUndo()).toBe(true);
221
+ });
222
+ it("values() contains the current value", () => {
223
+ const { ctx, run } = fieldCtx("x");
224
+ History()(undefined, ctx);
225
+ const s = signal(42);
226
+ const instance = new TestComponent();
227
+ Object.defineProperty(instance, "x", {
228
+ get: () => s(),
229
+ set: (v) => { s.set(v); },
230
+ configurable: true,
231
+ });
232
+ run(instance);
233
+ const h = instance.xHistory;
234
+ expect(h.current()).toBe(42);
235
+ expect(h.values()).toContain(42);
236
+ });
237
+ it("undo() reverts the property to the previous value", () => {
238
+ const { ctx, run } = fieldCtx("score2");
239
+ History()(undefined, ctx);
240
+ const s = signal(0);
241
+ const instance = new TestComponent();
242
+ Object.defineProperty(instance, "score2", {
243
+ get: () => s(),
244
+ set: (v) => { s.set(v); },
245
+ configurable: true,
246
+ });
247
+ run(instance);
248
+ const h = instance.score2History;
249
+ s.set(5);
250
+ s.set(10);
251
+ h.undo();
252
+ expect(s()).toBe(5);
253
+ });
254
+ it("redo() moves forward after undo", () => {
255
+ const { ctx, run } = fieldCtx("score3");
256
+ History()(undefined, ctx);
257
+ const s = signal(0);
258
+ const instance = new TestComponent();
259
+ Object.defineProperty(instance, "score3", {
260
+ get: () => s(),
261
+ set: (v) => { s.set(v); },
262
+ configurable: true,
263
+ });
264
+ run(instance);
265
+ const h = instance.score3History;
266
+ s.set(1);
267
+ s.set(2);
268
+ h.undo();
269
+ expect(h.canRedo()).toBe(true);
270
+ h.redo();
271
+ expect(s()).toBe(2);
272
+ });
273
+ it("respects a custom history limit", () => {
274
+ const { ctx, run } = fieldCtx("v");
275
+ History(3)(undefined, ctx);
276
+ const s = signal(0);
277
+ const instance = new TestComponent();
278
+ Object.defineProperty(instance, "v", {
279
+ get: () => s(),
280
+ set: (v) => { s.set(v); },
281
+ configurable: true,
282
+ });
283
+ run(instance);
284
+ const h = instance.vHistory;
285
+ s.set(1);
286
+ s.set(2);
287
+ s.set(3);
288
+ s.set(4);
289
+ s.set(5);
290
+ // values includes current + up to 3 past items → max 4 items
291
+ expect(h.values().length).toBeLessThanOrEqual(4);
292
+ });
293
+ it("returns the same history instance on repeated access", () => {
294
+ const { ctx, run } = fieldCtx("z");
295
+ History()(undefined, ctx);
296
+ const instance = new TestComponent();
297
+ run(instance);
298
+ const h1 = instance.zHistory;
299
+ const h2 = instance.zHistory;
300
+ expect(h1).toBe(h2);
301
+ });
302
+ });
303
+ // ── When ──────────────────────────────────────────────────────────────────────
304
+ describe("When decorator", () => {
305
+ function methodCtxFor(name) {
306
+ const initializers = [];
307
+ return {
308
+ ctx: {
309
+ name,
310
+ kind: "method",
311
+ addInitializer(fn) {
312
+ initializers.push(fn);
313
+ },
314
+ },
315
+ run(instance) {
316
+ initializers.forEach((fn) => { fn.call(instance); });
317
+ },
318
+ };
319
+ }
320
+ it("calls the method when a truthy value is emitted from the watched prop", () => {
321
+ const { ctx, run } = methodCtxFor("onReady");
322
+ const handler = vi.fn();
323
+ When("flag")(handler, ctx);
324
+ // @When accesses instance[propName] and expects a Signal/Computed object
325
+ const s = signal(null);
326
+ const instance = new TestComponent();
327
+ instance.flag = s;
328
+ run(instance);
329
+ instance.onMount?.();
330
+ s.set("go");
331
+ expect(handler).toHaveBeenCalledTimes(1);
332
+ });
333
+ it("does not call the method for falsy values", () => {
334
+ const { ctx, run } = methodCtxFor("onData");
335
+ const handler = vi.fn();
336
+ When("item")(handler, ctx);
337
+ const s = signal(0);
338
+ const instance = new TestComponent();
339
+ instance.item = s;
340
+ run(instance);
341
+ instance.onMount?.();
342
+ // 0 is falsy — handler should NOT be called
343
+ expect(handler).not.toHaveBeenCalled();
344
+ });
345
+ it("calls onUnmount cleanup without throwing", () => {
346
+ const { ctx, run } = methodCtxFor("onVal");
347
+ When("val")(vi.fn(), ctx);
348
+ const s = signal(0);
349
+ const instance = new TestComponent();
350
+ instance.val = s;
351
+ run(instance);
352
+ instance.onMount?.();
353
+ expect(() => { instance.onUnmount?.(); }).not.toThrow();
354
+ });
355
+ it("preserves existing onMount/onUnmount implementations", () => {
356
+ const { ctx, run } = methodCtxFor("onV");
357
+ When("v")(vi.fn(), ctx);
358
+ const mountSpy = vi.fn();
359
+ const unmountSpy = vi.fn();
360
+ const s = signal(0);
361
+ const instance = new TestComponent();
362
+ instance.v = s;
363
+ run(instance);
364
+ // Manually set callbacks after initializer ran
365
+ const prevMount = instance.onMount?.bind(instance);
366
+ instance.onMount = function () {
367
+ mountSpy();
368
+ prevMount?.();
369
+ };
370
+ const prevUnmount = instance.onUnmount?.bind(instance);
371
+ instance.onUnmount = function () {
372
+ unmountSpy();
373
+ prevUnmount?.();
374
+ };
375
+ instance.onMount?.();
376
+ instance.onUnmount?.();
377
+ expect(mountSpy).toHaveBeenCalled();
378
+ expect(unmountSpy).toHaveBeenCalled();
379
+ });
380
+ });
381
+ //# sourceMappingURL=properties.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"properties.test.js","sourceRoot":"","sources":["../../src/__tests__/properties.test.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,3 @@
1
1
  import type { StatefulComponent } from "@praxisjs/core";
2
- export declare function Emit(propName: string): (value: (this: StatefulComponent, ...args: unknown[]) => unknown, context: ClassMethodDecoratorContext<StatefulComponent>) => void;
2
+ export declare function Emit(propName: string): (value: (this: StatefulComponent, ...args: any[]) => any, context: ClassMethodDecoratorContext<StatefulComponent>) => void;
3
3
  //# sourceMappingURL=emit.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"emit.d.ts","sourceRoot":"","sources":["../../src/events/emit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAIxD,wBAAgB,IAAI,CAAC,QAAQ,EAAE,MAAM,IAEjC,OAAO,CAAC,IAAI,EAAE,iBAAiB,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,EAC/D,SAAS,2BAA2B,CAAC,iBAAiB,CAAC,KACtD,IAAI,CA+BR"}
1
+ {"version":3,"file":"emit.d.ts","sourceRoot":"","sources":["../../src/events/emit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAIxD,wBAAgB,IAAI,CAAC,QAAQ,EAAE,MAAM,IAGjC,OAAO,CAAC,IAAI,EAAE,iBAAiB,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EACvD,SAAS,2BAA2B,CAAC,iBAAiB,CAAC,KACtD,IAAI,CAgCR"}
@@ -1,7 +1,10 @@
1
1
  import { readProp } from "./helper";
2
2
  export function Emit(propName) {
3
- return function (value, context) {
3
+ return function (
4
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
5
+ value, context) {
4
6
  const wrapped = function (...args) {
7
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
5
8
  const result = value.apply(this, args);
6
9
  const callback = readProp(this, propName);
7
10
  if (typeof callback !== "function")
@@ -1 +1 @@
1
- {"version":3,"file":"emit.js","sourceRoot":"","sources":["../../src/events/emit.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,MAAM,UAAU,IAAI,CAAC,QAAgB;IACnC,OAAO,UACL,KAA+D,EAC/D,OAAuD;QAEvD,MAAM,OAAO,GAAG,UAEd,GAAG,IAAe;YAElB,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAEvC,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC1C,IAAI,OAAO,QAAQ,KAAK,UAAU;gBAAE,OAAO,MAAM,CAAC;YAElD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACxB,QAAiC,CAAC,MAAM,CAAC,CAAC;YAC7C,CAAC;iBAAM,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1B,QAAsC,CAAC,GAAG,IAAI,CAAC,CAAC;YACnD,CAAC;iBAAM,CAAC;gBACL,QAAuB,EAAE,CAAC;YAC7B,CAAC;YAED,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;QAEF,OAAO,CAAC,cAAc,CAAC;YACrB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAc,CAAC;YACpC,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,IAAyB,CAAC,CAAC;YACtD,MAAM,CAAC,cAAc,CAAC,IAAc,EAAE,IAAI,EAAE;gBAC1C,KAAK,EAAE,KAAK;gBACZ,YAAY,EAAE,IAAI;gBAClB,QAAQ,EAAE,IAAI;aACf,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"emit.js","sourceRoot":"","sources":["../../src/events/emit.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,MAAM,UAAU,IAAI,CAAC,QAAgB;IACnC,OAAO;IACL,8DAA8D;IAC9D,KAAuD,EACvD,OAAuD;QAEvD,MAAM,OAAO,GAAG,UAEd,GAAG,IAAe;YAElB,mEAAmE;YACnE,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAEvC,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC1C,IAAI,OAAO,QAAQ,KAAK,UAAU;gBAAE,OAAO,MAAM,CAAC;YAElD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACxB,QAAiC,CAAC,MAAM,CAAC,CAAC;YAC7C,CAAC;iBAAM,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1B,QAAsC,CAAC,GAAG,IAAI,CAAC,CAAC;YACnD,CAAC;iBAAM,CAAC;gBACL,QAAuB,EAAE,CAAC;YAC7B,CAAC;YAED,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;QAEF,OAAO,CAAC,cAAc,CAAC;YACrB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAc,CAAC;YACpC,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,IAAyB,CAAC,CAAC;YACtD,MAAM,CAAC,cAAc,CAAC,IAAc,EAAE,IAAI,EAAE;gBAC1C,KAAK,EAAE,KAAK;gBACZ,YAAY,EAAE,IAAI;gBAClB,QAAQ,EAAE,IAAI;aACf,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"history.d.ts","sourceRoot":"","sources":["../../src/properties/history.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,KAAK,cAAc,EAAW,MAAM,yBAAyB,CAAC;AAGvE,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,MAAM,CACpD,GAAG,MAAM,GAAG,CAAC,SAAS,EACtB,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACrB,CAAC;AAEF,wBAAgB,OAAO,CAAC,KAAK,SAAK,IAE9B,QAAQ,SAAS,EACjB,SAAS,0BAA0B,CAAC,iBAAiB,CAAC,KACrD,IAAI,CA2CR"}
1
+ {"version":3,"file":"history.d.ts","sourceRoot":"","sources":["../../src/properties/history.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,KAAK,cAAc,EAAW,MAAM,yBAAyB,CAAC;AAGvE,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,MAAM,CACpD,GAAG,MAAM,GAAG,CAAC,SAAS,EACtB,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACrB,CAAC;AAEF,wBAAgB,OAAO,CAAC,KAAK,SAAK,IAE9B,QAAQ,SAAS,EACjB,SAAS,0BAA0B,CAAC,iBAAiB,CAAC,KACrD,IAAI,CAuCR"}
@@ -11,21 +11,17 @@ export function History(limit = 50) {
11
11
  if (!histories.has(this)) {
12
12
  const source = () => this[propertyKey];
13
13
  const h = history(source, limit);
14
- const originalUndo = () => {
15
- h.undo();
16
- };
17
- const originalRedo = () => {
18
- h.redo();
19
- };
14
+ const _undo = h.undo.bind(h);
15
+ const _redo = h.redo.bind(h);
20
16
  h.undo = () => {
21
17
  const prev = h.values()[h.values().length - 2];
22
18
  if (prev === undefined)
23
19
  return;
24
- originalUndo();
20
+ _undo();
25
21
  this[propertyKey] = prev;
26
22
  };
27
23
  h.redo = () => {
28
- originalRedo();
24
+ _redo();
29
25
  this[propertyKey] = h.current();
30
26
  };
31
27
  histories.set(this, h);
@@ -1 +1 @@
1
- {"version":3,"file":"history.js","sourceRoot":"","sources":["../../src/properties/history.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAQvE,MAAM,UAAU,OAAO,CAAC,KAAK,GAAG,EAAE;IAChC,OAAO,UACL,MAAiB,EACjB,OAAsD;QAEtD,MAAM,SAAS,GAAG,IAAI,OAAO,EAAmC,CAAC;QAEjE,OAAO,CAAC,cAAc,CAAC;YACrB,MAAM,QAAQ,GAAG,IAA+B,CAAC;YACjD,MAAM,WAAW,GAAG,OAAO,CAAC,IAAc,CAAC;YAC3C,MAAM,UAAU,GAAG,GAAG,WAAW,SAAS,CAAC;YAE3C,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,EAAE;gBAC1C,GAAG;oBACD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;wBACzB,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;wBAEvC,MAAM,CAAC,GAAG,OAAO,CAAC,MAAyB,EAAE,KAAK,CAAC,CAAC;wBAEpD,MAAM,YAAY,GAAG,GAAG,EAAE;4BACxB,CAAC,CAAC,IAAI,EAAE,CAAC;wBACX,CAAC,CAAC;wBACF,MAAM,YAAY,GAAG,GAAG,EAAE;4BACxB,CAAC,CAAC,IAAI,EAAE,CAAC;wBACX,CAAC,CAAC;wBAEF,CAAC,CAAC,IAAI,GAAG,GAAG,EAAE;4BACZ,MAAM,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;4BAC/C,IAAI,IAAI,KAAK,SAAS;gCAAE,OAAO;4BAC/B,YAAY,EAAE,CAAC;4BACf,IAAI,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC;wBAC3B,CAAC,CAAC;wBAEF,CAAC,CAAC,IAAI,GAAG,GAAG,EAAE;4BACZ,YAAY,EAAE,CAAC;4BACf,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;wBAClC,CAAC,CAAC;wBAEF,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;oBACzB,CAAC;oBACD,OAAO,SAAS,CAAC,GAAG,CAAC,IAAI,CAA4B,CAAC;gBACxD,CAAC;gBACD,UAAU,EAAE,KAAK;gBACjB,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"history.js","sourceRoot":"","sources":["../../src/properties/history.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAQvE,MAAM,UAAU,OAAO,CAAC,KAAK,GAAG,EAAE;IAChC,OAAO,UACL,MAAiB,EACjB,OAAsD;QAEtD,MAAM,SAAS,GAAG,IAAI,OAAO,EAAmC,CAAC;QAEjE,OAAO,CAAC,cAAc,CAAC;YACrB,MAAM,QAAQ,GAAG,IAA+B,CAAC;YACjD,MAAM,WAAW,GAAG,OAAO,CAAC,IAAc,CAAC;YAC3C,MAAM,UAAU,GAAG,GAAG,WAAW,SAAS,CAAC;YAE3C,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,EAAE;gBAC1C,GAAG;oBACD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;wBACzB,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;wBAEvC,MAAM,CAAC,GAAG,OAAO,CAAC,MAAyB,EAAE,KAAK,CAAC,CAAC;wBAEpD,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBAC7B,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBAE7B,CAAC,CAAC,IAAI,GAAG,GAAG,EAAE;4BACZ,MAAM,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;4BAC/C,IAAI,IAAI,KAAK,SAAS;gCAAE,OAAO;4BAC/B,KAAK,EAAE,CAAC;4BACR,IAAI,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC;wBAC3B,CAAC,CAAC;wBAEF,CAAC,CAAC,IAAI,GAAG,GAAG,EAAE;4BACZ,KAAK,EAAE,CAAC;4BACR,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;wBAClC,CAAC,CAAC;wBAEF,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;oBACzB,CAAC;oBACD,OAAO,SAAS,CAAC,GAAG,CAAC,IAAI,CAA4B,CAAC;gBACxD,CAAC;gBACD,UAAU,EAAE,KAAK;gBACjB,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@praxisjs/decorators",
3
- "version": "0.4.0",
3
+ "version": "0.4.2",
4
4
  "type": "module",
5
5
  "main": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",
@@ -15,7 +15,7 @@
15
15
  "typescript": "^5.9.3"
16
16
  },
17
17
  "dependencies": {
18
- "@praxisjs/core": "0.4.0",
18
+ "@praxisjs/core": "0.4.1",
19
19
  "@praxisjs/shared": "0.2.0"
20
20
  },
21
21
  "scripts": {