@praxisjs/decorators 0.4.2 → 0.5.0

package/src/properties/computed.ts

@@ -1,20 +1,18 @@
-import type { StatefulComponent } from "@praxisjs/core";
 import { computed } from "@praxisjs/core/internal";
 
+import { createGetterDecorator } from "../create-getter-decorator";
+
 export function Computed() {
-  return function <This extends StatefulComponent, T>(
-    target: (this: This) => T,
-    _context: ClassGetterDecoratorContext<This, T>,
-  ): (this: This) => T {
-    const computedMap = new WeakMap<object, () => T>();
+  const cache = new WeakMap<object, () => unknown>();
 
-    return function (this: This): T {
-      let c = computedMap.get(this);
+  return createGetterDecorator({
+    wrap(original, instance) {
+      let c = cache.get(instance);
       if (!c) {
-        c = computed(() => target.call(this));
-        computedMap.set(this, c);
+        c = computed(() => original.call(instance));
+        cache.set(instance, c);
       }
-      return c();
-    };
-  };
+      return c;
+    },
+  });
 }

package/src/properties/history.ts

@@ -2,52 +2,53 @@ import type { StatefulComponent } from "@praxisjs/core";
 import { type HistoryElement, history } from "@praxisjs/core/internal";
 import type { Signal } from "@praxisjs/shared";
 
+import { createFieldDecorator } from "../create-field-decorator";
+
 export type WithHistory<T, K extends keyof T> = Record<
   `${string & K}History`,
   HistoryElement<T[K]>
 >;
 
 export function History(limit = 50) {
-  return function (
-    _value: undefined,
-    context: ClassFieldDecoratorContext<StatefulComponent>,
-  ): void {
-    const histories = new WeakMap<object, HistoryElement<unknown>>();
-
-    context.addInitializer(function (this: unknown) {
-      const instance = this as Record<string, unknown>;
-      const propertyKey = context.name as string;
-      const historyKey = `${propertyKey}History`;
-
-      Object.defineProperty(instance, historyKey, {
-        get(this: Record<string, unknown>): HistoryElement<unknown> {
-          if (!histories.has(this)) {
-            const source = () => this[propertyKey];
-
-            const h = history(source as Signal<unknown>, limit);
-
-            const _undo = h.undo.bind(h);
-            const _redo = h.redo.bind(h);
-
-            h.undo = () => {
-              const prev = h.values()[h.values().length - 2];
-              if (prev === undefined) return;
-              _undo();
-              this[propertyKey] = prev;
-            };
-
-            h.redo = () => {
-              _redo();
-              this[propertyKey] = h.current();
-            };
-
-            histories.set(this, h);
-          }
-          return histories.get(this) as HistoryElement<unknown>;
+  return createFieldDecorator({
+    bind(instance: StatefulComponent, name: string, _initialValue: unknown) {
+      const historyKey = `${name}History`;
+      const inst = instance as unknown as Record<string, unknown>;
+      let h: HistoryElement<unknown> | undefined;
+
+      return {
+        // descriptor omitted — @History does not replace the original field
+        additional: {
+          [historyKey]: {
+            get(): HistoryElement<unknown> {
+              if (!h) {
+                const source = () => inst[name];
+                const hInst = history(source as Signal<unknown>, limit);
+
+                const _undo = hInst.undo.bind(hInst);
+                const _redo = hInst.redo.bind(hInst);
+
+                hInst.undo = () => {
+                  const prev = hInst.values()[hInst.values().length - 2];
+                  if (prev === undefined) return;
+                  _undo();
+                  inst[name] = prev;
+                };
+
+                hInst.redo = () => {
+                  _redo();
+                  inst[name] = hInst.current();
+                };
+
+                h = hInst;
+              }
+              return h;
+            },
+            enumerable: false,
+            configurable: true,
+          },
         },
-        enumerable: false,
-        configurable: true,
-      });
-    });
-  };
+      };
+    },
+  });
 }

package/src/properties/index.ts

@@ -4,3 +4,5 @@ export { Computed } from "./computed";
 export { Persisted } from "./persisted";
 export { Slot, initSlots } from "./slot";
 export { History, type WithHistory } from "./history";
+export { Compose } from "./compose";
+export { Resource, type ResourceInstance, type ResourceOptions } from "./resource";

package/src/properties/persisted.ts

@@ -1,19 +1,9 @@
-import type { StatefulComponent } from "@praxisjs/core";
-import {
-  persistedSignal,
-  type PersistedSignalOptions,
-} from "@praxisjs/core/internal";
+import { persistedSignal, type PersistedSignalOptions } from "@praxisjs/core/internal";
 import type { Signal } from "@praxisjs/shared";
 
-const signalMap = new WeakMap<object, Map<string, Signal<unknown>>>();
-const initMap = new WeakMap<object, Set<string>>();
+import { createFieldDecorator } from "../create-field-decorator";
 
-function markInitialized(instance: object, propKey: string): void {
-  if (!initMap.has(instance)) {
-    initMap.set(instance, new Set());
-  }
-  (initMap.get(instance) as Set<string>).add(propKey);
-}
+const signalMap = new WeakMap<object, Map<string, Signal<unknown>>>();
 
 function getOrCreateSignal<T>(
   instance: object,
@@ -21,18 +11,14 @@ function getOrCreateSignal<T>(
   initialValue: T,
   options: PersistedSignalOptions<T>,
 ): Signal<T> {
-  if (!signalMap.has(instance)) {
-    signalMap.set(instance, new Map());
-  }
+  if (!signalMap.has(instance)) signalMap.set(instance, new Map());
   const map = signalMap.get(instance) as Map<string, Signal<unknown>>;
-
   if (!map.has(storageKey)) {
     map.set(
       storageKey,
       persistedSignal(storageKey, initialValue, options) as Signal<unknown>,
     );
   }
-
   return map.get(storageKey) as Signal<T>;
 }
 
@@ -40,45 +26,18 @@ export function Persisted<T>(
   key?: string,
   options: PersistedSignalOptions<T> = {},
 ) {
-  return function (
-    _value: undefined,
-    context: ClassFieldDecoratorContext<StatefulComponent>,
-  ): void {
-    context.addInitializer(function (this: unknown) {
-      const instance = this as object;
-      const propertyKey = context.name as string;
-      const storageKey = key ?? propertyKey;
-      const initialValue = (instance as Record<string, unknown>)[
-        propertyKey
-      ] as T;
-
-      Reflect.deleteProperty(instance, propertyKey);
-
-      markInitialized(instance, propertyKey);
-      getOrCreateSignal(instance, storageKey, initialValue, options);
-
-      Object.defineProperty(instance, propertyKey, {
-        get(): T {
-          return getOrCreateSignal<T>(
-            instance,
-            storageKey,
-            undefined as T,
-            options,
-          )();
+  return createFieldDecorator({
+    bind(instance, name, initialValue) {
+      const storageKey = key ?? name;
+      getOrCreateSignal(instance, storageKey, initialValue as T, options);
+      return {
+        descriptor: {
+          get: () =>
+            getOrCreateSignal<T>(instance, storageKey, undefined as T, options)(),
+          set: (value: T) =>
+            { getOrCreateSignal<T>(instance, storageKey, undefined as T, options).set(value); },
         },
-
-        set(value: T): void {
-          getOrCreateSignal<T>(
-            instance,
-            storageKey,
-            undefined as T,
-            options,
-          ).set(value);
-        },
-
-        enumerable: true,
-        configurable: true,
-      });
-    });
-  };
+      };
+    },
+  });
 }

package/src/properties/prop.ts

@@ -1,35 +1,25 @@
-import type { StatefulComponent } from "@praxisjs/core";
+import { createFieldDecorator } from "../create-field-decorator";
 
 export function Prop() {
-  return function (
-    _value: undefined,
-    context: ClassFieldDecoratorContext<StatefulComponent>,
-  ): void {
-    context.addInitializer(function (this: unknown) {
-      const instance = this as StatefulComponent;
-      const name = context.name as string;
-      const raw = instance as unknown as Record<string, unknown>;
-      const defaultValue = raw[name];
-      Reflect.deleteProperty(raw, name);
-
-      instance._defaults[name] = defaultValue;
-
-      Object.defineProperty(instance, name, {
-        get(this: StatefulComponent) {
-          const fromParent = this._rawProps[name];
-          if (fromParent !== undefined) {
-            return typeof fromParent === "function"
-              ? (fromParent as () => unknown)()
-              : fromParent;
-          }
-          return this._defaults[name];
-        },
-        set(this: StatefulComponent, value: unknown) {
-          this._defaults[name] = value;
+  return createFieldDecorator({
+    bind(instance, name, initialValue) {
+      instance._defaults[name] = initialValue;
+      return {
+        descriptor: {
+          get() {
+            const fromParent = (instance._rawProps)[name];
+            if (fromParent !== undefined) {
+              return typeof fromParent === "function"
+                ? (fromParent as () => unknown)()
+                : fromParent;
+            }
+            return instance._defaults[name];
+          },
+          set(value: unknown) {
+            instance._defaults[name] = value;
+          },
         },
-        enumerable: true,
-        configurable: true,
-      });
-    });
-  };
+      };
+    },
+  });
 }

package/src/properties/resource.ts

@@ -0,0 +1,34 @@
+import {
+  resource,
+  type Resource as ResourceInstance,
+  type ResourceOptions,
+} from "@praxisjs/core/internal";
+
+import { createFieldDecorator, type FieldBinding } from "../create-field-decorator";
+
+export type { ResourceInstance, ResourceOptions };
+
+/**
+ * Binds an async resource to the field. The field holds a Resource<T> object
+ * with reactive data, pending, error, and status signals, plus refetch/cancel/mutate methods.
+ *
+ * class MyComponent extends StatefulComponent {
+ *   @Resource(() => api.getUsers())
+ *   users!: ResourceInstance<User[]>;
+ *   // access: this.users.data(), this.users.pending(), this.users.refetch()
+ * }
+ */
+export function Resource<T>(fetcher: () => Promise<T>, options: ResourceOptions<T> = {}) {
+  return createFieldDecorator({
+    bind(_instance, _name, _initialValue): FieldBinding {
+      const r = resource(fetcher, options);
+      return {
+        descriptor: {
+          get(): ResourceInstance<T> { return r; },
+          // eslint-disable-next-line @typescript-eslint/no-empty-function
+          set(): void {},
+        },
+      };
+    },
+  });
+}

package/src/properties/slot.ts

@@ -1,4 +1,4 @@
-import type { StatefulComponent } from "@praxisjs/core";
+import { createFieldDecorator } from "../create-field-decorator";
 
 const slotsMap = new WeakMap<object, Map<string, unknown[]>>();
 
@@ -14,7 +14,6 @@ function resolveSlots(children: unknown): Map<string, unknown[]> {
     : [children];
 
   for (const child of arr) {
-    // Named slots via `slot` attribute on DOM elements
     if (child instanceof Element) {
       const slotName = child.getAttribute("slot");
       if (slotName) {
@@ -39,33 +38,21 @@ export function getSlot(instance: object, name: string): unknown[] {
 }
 
 export function Slot(name?: string) {
-  return function (
-    _value: undefined,
-    context: ClassFieldDecoratorContext<StatefulComponent>,
-  ): void {
-    context.addInitializer(function (this: unknown) {
-      const instance = this as StatefulComponent;
-      const propKey = context.name as string;
-      const slotName = name ?? (propKey === "default" ? "default" : propKey);
-
-      Reflect.deleteProperty(instance, propKey);
-
-      Object.defineProperty(instance, propKey, {
-        get(this: StatefulComponent): unknown[] {
-          return getSlot(this, slotName);
+  return createFieldDecorator({
+    bind(instance, propName, _initialValue) {
+      const slotName = name ?? (propName === "default" ? "default" : propName);
+      return {
+        descriptor: {
+          get: () => getSlot(instance, slotName),
+          set: (_value: unknown) => {
+            if (process.env.NODE_ENV !== "production") {
+              console.warn(
+                `[Slot] "${propName}" is a slot and cannot be assigned directly. Slots are filled by the parent component.`,
+              );
+            }
+          },
         },
-
-        set(_value: unknown): void {
-          if (process.env.NODE_ENV !== "production") {
-            console.warn(
-              `[Slot] "${propKey}" is a slot and cannot be assigned directly. Slots are filled by the parent component.`,
-            );
-          }
-        },
-
-        enumerable: true,
-        configurable: true,
-      });
-    });
-  };
+      };
+    },
+  });
 }

package/src/properties/state.ts

@@ -1,30 +1,20 @@
-import type { StatefulComponent } from "@praxisjs/core";
 import { signal } from "@praxisjs/core/internal";
 
-export function State() {
-  return function (
-    _value: undefined,
-    context: ClassFieldDecoratorContext<StatefulComponent>,
-  ): void {
-    context.addInitializer(function (this: unknown) {
-      const instance = this as StatefulComponent & Record<string, unknown>;
-      const name = context.name as string;
-      const initialValue = instance[name];
-      Reflect.deleteProperty(instance, name);
+import { createFieldDecorator } from "../create-field-decorator";
 
+export function State() {
+  return createFieldDecorator({
+    bind(instance, _name, initialValue) {
       const sig = signal(initialValue);
-
-      Object.defineProperty(instance, name, {
-        get() {
-          return sig();
-        },
-        set(value: unknown) {
-          instance._stateDirty = true;
-          sig.set(value);
+      return {
+        descriptor: {
+          get: () => sig(),
+          set: (value: unknown) => {
+            instance._stateDirty = true;
+            sig.set(value);
+          },
         },
-        enumerable: true,
-        configurable: true,
-      });
-    });
-  };
+      };
+    },
+  });
 }