@praxisjs/decorators 0.4.3 → 0.6.0

package/src/functions/once.ts

@@ -1,19 +1,16 @@
-import type { StatefulComponent } from "@praxisjs/core";
+import { createMethodDecorator } from "../create-method-decorator";
 
 export function Once() {
-  const called = new WeakMap<object, boolean>();
-  const results = new WeakMap<object, unknown>();
-
-  return function (
-    value: (this: object, ...args: unknown[]) => unknown,
-    _context: ClassMethodDecoratorContext<StatefulComponent>,
-  ): (this: object, ...args: unknown[]) => unknown {
-    return function (this: object, ...args: unknown[]) {
-      if (called.get(this)) return results.get(this);
-      const result = value.apply(this, args);
-      called.set(this, true);
-      results.set(this, result);
-      return result;
-    };
-  };
+  return createMethodDecorator({
+    wrap(original, instance) {
+      let called = false;
+      let result: unknown;
+      return (...args: unknown[]) => {
+        if (called) return result;
+        result = original.apply(instance, args);
+        called = true;
+        return result;
+      };
+    },
+  });
 }

package/src/functions/retry.ts

@@ -1,4 +1,4 @@
-import type { StatefulComponent } from "@praxisjs/core";
+import { createMethodDecorator } from "../create-method-decorator";
 
 export interface RetryOptions {
   delay?: number;
@@ -9,30 +9,29 @@ export interface RetryOptions {
 export function Retry(maxAttempts: number, options: RetryOptions = {}) {
   const { delay = 0, backoff = 1, onRetry } = options;
 
-  return function (
-    value: (this: object, ...args: unknown[]) => Promise<unknown>,
-    _context: ClassMethodDecoratorContext<StatefulComponent>,
-  ): (this: object, ...args: unknown[]) => Promise<unknown> {
-    return async function (this: object, ...args: unknown[]) {
-      let lastError: Error = new Error("Unknown error");
-      let currentDelay = delay;
+  return createMethodDecorator({
+    wrap(original, instance) {
+      return async (...args: unknown[]) => {
+        let lastError: Error = new Error("Unknown error");
+        let currentDelay = delay;
 
-      for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-        try {
-          return await value.apply(this, args);
-        } catch (e: unknown) {
-          lastError = e instanceof Error ? e : new Error(String(e));
-          if (attempt === maxAttempts) break;
-          onRetry?.(lastError, attempt);
+        for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+          try {
+            return await (original.apply(instance, args) as Promise<unknown>);
+          } catch (e: unknown) {
+            lastError = e instanceof Error ? e : new Error(String(e));
+            if (attempt === maxAttempts) break;
+            onRetry?.(lastError, attempt);
 
-          if (currentDelay > 0) {
-            await new Promise((res) => setTimeout(res, currentDelay));
-            currentDelay = Math.round(currentDelay * backoff);
+            if (currentDelay > 0) {
+              await new Promise((res) => setTimeout(res, currentDelay));
+              currentDelay = Math.round(currentDelay * backoff);
+            }
           }
         }
-      }
 
-      throw lastError;
-    };
-  };
+        throw lastError;
+      };
+    },
+  });
 }

package/src/functions/throttle.ts

@@ -1,29 +1,16 @@
-import type { StatefulComponent } from "@praxisjs/core";
+import { createMethodDecorator } from "../create-method-decorator";
 
 export function Throttle(ms: number) {
-  const lastRun = new WeakMap<object, number>();
-
-  return function (
-    value: (this: object, ...args: unknown[]) => unknown,
-    context: ClassMethodDecoratorContext<StatefulComponent>,
-  ): void {
-    context.addInitializer(function (this: unknown) {
-      const instance = this as object;
-      const name = context.name as string;
-      const bound = (...args: unknown[]) => {
+  return createMethodDecorator({
+    wrap(original, instance) {
+      const clampedMs = Math.max(0, ms);
+      let last = 0;
+      return (...args: unknown[]) => {
         const now = Date.now();
-        const last = lastRun.get(instance) ?? 0;
-
-        if (now - last < ms) return;
-
-        lastRun.set(instance, now);
-        return value.apply(instance, args);
+        if (now - last < clampedMs) return;
+        last = now;
+        return original.apply(instance, args);
       };
-      Object.defineProperty(instance, name, {
-        value: bound,
-        configurable: true,
-        writable: true,
-      });
-    });
-  };
+    },
+  });
 }

package/src/functions/until.ts

@@ -0,0 +1,19 @@
+import { until } from "@praxisjs/core/internal";
+import type { Computed, Signal } from "@praxisjs/shared";
+import { isComputed } from "@praxisjs/shared/internal";
+
+import { createMethodDecorator } from "../create-method-decorator";
+
+export function Until(propName: string) {
+  return createMethodDecorator({
+    wrap(_original, instance) {
+      return () => {
+        const raw = (instance as Record<string, unknown>)[propName];
+        const source = isComputed(raw)
+          ? (raw as Computed<unknown>)
+          : (raw as Signal<unknown>);
+        return until(source);
+      };
+    },
+  });
+}

package/src/functions/watch.ts

@@ -3,6 +3,8 @@ import { effect } from "@praxisjs/core/internal";
 import type { Computed } from "@praxisjs/shared";
 import { isComputed } from "@praxisjs/shared/internal";
 
+import { createLifecycleMethodDecorator } from "../create-lifecycle-method-decorator";
+
 type BaseComponentKeys = keyof StatefulComponent;
 
 type WatchableKeys<T> = {
@@ -54,51 +56,33 @@ export function Watch<
   T extends StatefulComponent,
   const Keys extends ReadonlyArray<WatchableKeys<T>>,
 >(...propNames: ValidateKeys<T, Keys>) {
-  return function (
-    value: (this: T, ...args: unknown[]) => void,
-    context: ClassMethodDecoratorContext<T>,
-  ): void {
-    const props = propNames as unknown as string[];
+  const props = propNames as unknown as string[];
 
-    context.addInitializer(function (this: unknown) {
-      const instance = this as T & Record<string, unknown>;
-      // eslint-disable-next-line @typescript-eslint/unbound-method
-      const originalOnMount = instance.onMount;
-      // eslint-disable-next-line @typescript-eslint/unbound-method
-      const originalOnUnmount = instance.onUnmount;
-      let stopEffect: (() => void) | undefined;
+  return createLifecycleMethodDecorator<T>({
+    register(callback, instance) {
+      const inst = instance as T & Record<string, unknown>;
 
-      instance.onMount = function (this: T & Record<string, unknown>) {
-        originalOnMount?.call(this);
+      if (props.length === 1) {
+        let oldVal = readValue(inst, props[0]);
+        return effect(() => {
+          const newVal = readValue(inst, props[0]);
+          if (!Object.is(newVal, oldVal)) {
+            callback(newVal, oldVal);
+            oldVal = newVal;
+          }
+        });
+      }
 
-        if (props.length === 1) {
-          let oldVal = readValue(this, props[0]);
-          stopEffect = effect(() => {
-            const newVal = readValue(this, props[0]);
-            if (!Object.is(newVal, oldVal)) {
-              value.call(this as T, newVal, oldVal);
-              oldVal = newVal;
-            }
-          });
-        } else {
-          const read = () =>
-            Object.fromEntries(props.map((p) => [p, readValue(this, p)]));
-          let oldVals = read();
-          stopEffect = effect(() => {
-            const newVals = read();
-            if (props.some((p) => !Object.is(newVals[p], oldVals[p]))) {
-              value.call(this as T, newVals, oldVals);
-              oldVals = newVals;
-            }
-          });
+      const read = () =>
+        Object.fromEntries(props.map((p) => [p, readValue(inst, p)]));
+      let oldVals = read();
+      return effect(() => {
+        const newVals = read();
+        if (props.some((p) => !Object.is(newVals[p], oldVals[p]))) {
+          callback(newVals, oldVals);
+          oldVals = newVals;
         }
-      };
-
-      instance.onUnmount = function (this: T) {
-        originalOnUnmount?.call(this);
-        stopEffect?.();
-        stopEffect = undefined;
-      };
-    });
-  };
+      });
+    },
+  });
 }

package/src/functions/when.ts

@@ -1,42 +1,17 @@
-import type { StatefulComponent } from "@praxisjs/core";
 import { when } from "@praxisjs/core/internal";
 import type { Computed, Signal } from "@praxisjs/shared";
 import { isComputed } from "@praxisjs/shared/internal";
 
-export function When(propName: string) {
-  return function (
-    value: (this: StatefulComponent, val: unknown) => void,
-    context: ClassMethodDecoratorContext<StatefulComponent>,
-  ): void {
-    const cancels = new WeakMap<object, () => void>();
-
-    context.addInitializer(function (this: unknown) {
-      const instance = this as StatefulComponent;
-      // eslint-disable-next-line @typescript-eslint/unbound-method
-      const originalOnMount = instance.onMount;
-      // eslint-disable-next-line @typescript-eslint/unbound-method
-      const originalOnUnmount = instance.onUnmount;
-
-      instance.onMount = function (this: StatefulComponent) {
-        originalOnMount?.call(this);
-
-        const raw = (this as unknown as Record<string, unknown>)[propName];
-        const source = isComputed(raw)
-          ? (raw as Computed<unknown>)
-          : (raw as Signal<unknown>);
+import { createLifecycleMethodDecorator } from "../create-lifecycle-method-decorator";
 
-        const cancel = when(source, (val) => {
-          value.call(this, val);
-        });
-
-        cancels.set(this, cancel);
-      };
-
-      instance.onUnmount = function (this: StatefulComponent) {
-        originalOnUnmount?.call(this);
-        cancels.get(this)?.();
-        cancels.delete(this);
-      };
-    });
-  };
+export function When(propName: string) {
+  return createLifecycleMethodDecorator({
+    register(callback, instance) {
+      const raw = (instance as unknown as Record<string, unknown>)[propName];
+      const source = isComputed(raw)
+        ? (raw as Computed<unknown>)
+        : (raw as Signal<unknown>);
+      return when(source, (val) => { callback(val); });
+    },
+  });
 }

package/src/index.ts

@@ -8,6 +8,7 @@ export {
   Debounce,
   Throttle,
   When,
+  Until,
   Watch,
   type WatchVal,
   type WatchVals,
@@ -21,5 +22,33 @@ export {
   initSlots,
   History,
   type WithHistory,
+  Compose,
+  Resource,
+  type ResourceInstance,
+  type ResourceOptions,
 } from "./properties";
 export { type Command, createCommand, Emit, OnCommand } from "./events";
+export {
+  createFieldDecorator,
+  type FieldBehavior,
+  type FieldBinding,
+} from "./create-field-decorator";
+export {
+  createClassDecorator,
+  ClassBehavior,
+  type ClassEnhancement,
+} from "./create-class-decorator";
+export {
+  createMethodDecorator,
+  type MethodBehavior,
+} from "./create-method-decorator";
+export {
+  createLifecycleMethodDecorator,
+  type LifecycleMethodBehavior,
+} from "./create-lifecycle-method-decorator";
+export {
+  createGetterDecorator,
+  type GetterBehavior,
+  createGetterObserverDecorator,
+  type GetterObserverBehavior,
+} from "./create-getter-decorator";

package/src/properties/compose.ts

@@ -0,0 +1,53 @@
+import type { StatefulComponent, Composable } from "@praxisjs/core";
+
+import { createFieldDecorator } from "../create-field-decorator";
+
+function isReactive(
+  value: unknown,
+): value is () => unknown {
+  return (
+    typeof value === "function" &&
+    ("__isSignal" in (value as object) || "__isComputed" in (value as object))
+  );
+}
+
+function buildView(bindings: Record<string, unknown>): object {
+  const view: Record<string, unknown> = {};
+  for (const [key, value] of Object.entries(bindings)) {
+    if (isReactive(value)) {
+      Object.defineProperty(view, key, {
+        get: () => (value as () => unknown)(),
+        enumerable: true,
+        configurable: true,
+      });
+    } else {
+      view[key] = value;
+    }
+  }
+  return view;
+}
+
+export function Compose(
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  ComposableClass: new (...args: any[]) => Composable,
+  ...ctorArgs: unknown[]
+) {
+  return createFieldDecorator({
+    bind(instance: StatefulComponent, _name: string, _initialValue: unknown) {
+      const resolvedArgs = ctorArgs.map((arg) =>
+        typeof arg === "string"
+          ? (instance as unknown as Record<string, unknown>)[arg]
+          : arg,
+      );
+
+      const composable = new ComposableClass(...resolvedArgs);
+      const view = buildView(composable.setup());
+
+      return {
+        descriptor: { get: () => view },
+        onMount: composable.onMount?.bind(composable),
+        onUnmount: composable.onUnmount?.bind(composable),
+      };
+    },
+  });
+}

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,
-      });
-    });
-  };
+      };
+    },
+  });
 }