@twick/2d 0.13.0 → 0.14.2

package/src/lib/decorators/filtersSignal.ts

@@ -1,136 +1,136 @@
-import type {
-  Signal,
-  SignalValue,
-  SimpleSignal,
-  ThreadGenerator,
-  TimingFunction,
-} from '@twick/core';
-import {
-  SignalContext,
-  all,
-  deepLerp,
-  easeInOutCubic,
-  unwrap,
-} from '@twick/core';
-import type {FilterName} from '../partials';
-import {FILTERS, Filter} from '../partials';
-import {addInitializer} from './initializers';
-import {getPropertyMetaOrCreate} from './signal';
-
-export type FiltersSignal<TOwner> = Signal<
-  Filter[],
-  Filter[],
-  TOwner,
-  FiltersSignalContext<TOwner>
-> & {
-  [K in FilterName]: SimpleSignal<number, TOwner>;
-};
-
-export class FiltersSignalContext<TOwner> extends SignalContext<
-  Filter[],
-  Filter[],
-  TOwner
-> {
-  public constructor(initial: Filter[], owner: TOwner) {
-    super(initial, deepLerp, owner);
-
-    for (const filter in FILTERS) {
-      const props = FILTERS[filter];
-      Object.defineProperty(this.invokable, filter, {
-        value: (
-          newValue?: SignalValue<number>,
-          duration?: number,
-          timingFunction: TimingFunction = easeInOutCubic,
-        ) => {
-          if (newValue === undefined) {
-            return (
-              this.get()
-                ?.find(filter => filter.name === props.name)
-                ?.value() ??
-              props.default ??
-              0
-            );
-          }
-
-          let instance = this.get()?.find(filter => filter.name === props.name);
-          if (!instance) {
-            instance = new Filter(props);
-            this.set([...this.get(), instance]);
-          }
-
-          if (duration === undefined) {
-            instance.value(newValue);
-            return this.owner;
-          }
-
-          return instance.value(newValue, duration, timingFunction);
-        },
-      });
-    }
-  }
-
-  public override *tweener(
-    value: SignalValue<Filter[]>,
-    duration: number,
-    timingFunction: TimingFunction,
-  ): ThreadGenerator {
-    const from = this.get();
-    const to = unwrap(value);
-
-    if (areFiltersCompatible(from, to)) {
-      yield* all(
-        ...from.map((filter, i) =>
-          filter.value(to[i].value(), duration, timingFunction),
-        ),
-      );
-      this.set(to);
-      return;
-    }
-
-    for (const filter of to) {
-      filter.value(filter.default);
-    }
-
-    const toValues = to.map(filter => filter.value.context.raw());
-    const partialDuration =
-      from.length > 0 && to.length > 0 ? duration / 2 : duration;
-    if (from.length > 0) {
-      yield* all(
-        ...from.map(filter =>
-          filter.value(filter.default, partialDuration, timingFunction),
-        ),
-      );
-    }
-    this.set(to);
-    if (to.length > 0) {
-      yield* all(
-        ...to.map((filter, index) =>
-          filter.value(toValues[index]!, partialDuration, timingFunction),
-        ),
-      );
-    }
-  }
-}
-
-export function filtersSignal(): PropertyDecorator {
-  return (target: any, key) => {
-    const meta = getPropertyMetaOrCreate<Filter[]>(target, key);
-    addInitializer(target, (instance: any) => {
-      instance[key] = new FiltersSignalContext(
-        meta.default ?? [],
-        instance,
-      ).toSignal();
-    });
-  };
-}
-
-function areFiltersCompatible(a: Filter[], b: Filter[]) {
-  if (a.length !== b.length) return false;
-  for (let i = 0; i < a.length; i++) {
-    if (a[i].name !== b[i].name) {
-      return false;
-    }
-  }
-
-  return true;
-}
+import type {
+  Signal,
+  SignalValue,
+  SimpleSignal,
+  ThreadGenerator,
+  TimingFunction,
+} from '@twick/core';
+import {
+  SignalContext,
+  all,
+  deepLerp,
+  easeInOutCubic,
+  unwrap,
+} from '@twick/core';
+import type {FilterName} from '../partials';
+import {FILTERS, Filter} from '../partials';
+import {addInitializer} from './initializers';
+import {getPropertyMetaOrCreate} from './signal';
+
+export type FiltersSignal<TOwner> = Signal<
+  Filter[],
+  Filter[],
+  TOwner,
+  FiltersSignalContext<TOwner>
+> & {
+  [K in FilterName]: SimpleSignal<number, TOwner>;
+};
+
+export class FiltersSignalContext<TOwner> extends SignalContext<
+  Filter[],
+  Filter[],
+  TOwner
+> {
+  public constructor(initial: Filter[], owner: TOwner) {
+    super(initial, deepLerp, owner);
+
+    for (const filter in FILTERS) {
+      const props = FILTERS[filter];
+      Object.defineProperty(this.invokable, filter, {
+        value: (
+          newValue?: SignalValue<number>,
+          duration?: number,
+          timingFunction: TimingFunction = easeInOutCubic,
+        ) => {
+          if (newValue === undefined) {
+            return (
+              this.get()
+                ?.find(filter => filter.name === props.name)
+                ?.value() ??
+              props.default ??
+              0
+            );
+          }
+
+          let instance = this.get()?.find(filter => filter.name === props.name);
+          if (!instance) {
+            instance = new Filter(props);
+            this.set([...this.get(), instance]);
+          }
+
+          if (duration === undefined) {
+            instance.value(newValue);
+            return this.owner;
+          }
+
+          return instance.value(newValue, duration, timingFunction);
+        },
+      });
+    }
+  }
+
+  public override *tweener(
+    value: SignalValue<Filter[]>,
+    duration: number,
+    timingFunction: TimingFunction,
+  ): ThreadGenerator {
+    const from = this.get();
+    const to = unwrap(value);
+
+    if (areFiltersCompatible(from, to)) {
+      yield* all(
+        ...from.map((filter, i) =>
+          filter.value(to[i].value(), duration, timingFunction),
+        ),
+      );
+      this.set(to);
+      return;
+    }
+
+    for (const filter of to) {
+      filter.value(filter.default);
+    }
+
+    const toValues = to.map(filter => filter.value.context.raw());
+    const partialDuration =
+      from.length > 0 && to.length > 0 ? duration / 2 : duration;
+    if (from.length > 0) {
+      yield* all(
+        ...from.map(filter =>
+          filter.value(filter.default, partialDuration, timingFunction),
+        ),
+      );
+    }
+    this.set(to);
+    if (to.length > 0) {
+      yield* all(
+        ...to.map((filter, index) =>
+          filter.value(toValues[index]!, partialDuration, timingFunction),
+        ),
+      );
+    }
+  }
+}
+
+export function filtersSignal(): PropertyDecorator {
+  return (target: any, key) => {
+    const meta = getPropertyMetaOrCreate<Filter[]>(target, key);
+    addInitializer(target, (instance: any) => {
+      instance[key] = new FiltersSignalContext(
+        meta.default ?? [],
+        instance,
+      ).toSignal();
+    });
+  };
+}
+
+function areFiltersCompatible(a: Filter[], b: Filter[]) {
+  if (a.length !== b.length) return false;
+  for (let i = 0; i < a.length; i++) {
+    if (a[i].name !== b[i].name) {
+      return false;
+    }
+  }
+
+  return true;
+}

package/src/lib/decorators/index.ts

@@ -1,10 +1,10 @@
-export * from './canvasStyleSignal';
-export * from './colorSignal';
-export * from './compound';
-export * from './computed';
-export * from './defaultStyle';
-export * from './filtersSignal';
-export * from './initializers';
-export * from './nodeName';
-export * from './signal';
-export * from './vector2Signal';
+export * from './canvasStyleSignal';
+export * from './colorSignal';
+export * from './compound';
+export * from './computed';
+export * from './defaultStyle';
+export * from './filtersSignal';
+export * from './initializers';
+export * from './nodeName';
+export * from './signal';
+export * from './vector2Signal';

package/src/lib/decorators/initializers.ts

@@ -1,32 +1,32 @@
-const INITIALIZERS = Symbol.for('@twick/2d/decorators/initializers');
-
-export type Initializer<T> = (instance: T, context?: any) => void;
-
-export function addInitializer<T>(target: any, initializer: Initializer<T>) {
-  if (!target[INITIALIZERS]) {
-    target[INITIALIZERS] = [];
-  } else if (
-    // if one of the prototypes has initializers
-    target[INITIALIZERS] &&
-    // and it's not the target object itself
-    !Object.prototype.hasOwnProperty.call(target, INITIALIZERS)
-  ) {
-    const base = Object.getPrototypeOf(target);
-    target[INITIALIZERS] = [...base[INITIALIZERS]];
-  }
-
-  target[INITIALIZERS].push(initializer);
-}
-
-export function initialize(target: any, context?: any) {
-  if (target[INITIALIZERS]) {
-    try {
-      target[INITIALIZERS].forEach((initializer: Initializer<any>) =>
-        initializer(target, context),
-      );
-    } catch (e: any) {
-      e.inspect ??= target.key;
-      throw e;
-    }
-  }
-}
+const INITIALIZERS = Symbol.for('@twick/2d/decorators/initializers');
+
+export type Initializer<T> = (instance: T, context?: any) => void;
+
+export function addInitializer<T>(target: any, initializer: Initializer<T>) {
+  if (!target[INITIALIZERS]) {
+    target[INITIALIZERS] = [];
+  } else if (
+    // if one of the prototypes has initializers
+    target[INITIALIZERS] &&
+    // and it's not the target object itself
+    !Object.prototype.hasOwnProperty.call(target, INITIALIZERS)
+  ) {
+    const base = Object.getPrototypeOf(target);
+    target[INITIALIZERS] = [...base[INITIALIZERS]];
+  }
+
+  target[INITIALIZERS].push(initializer);
+}
+
+export function initialize(target: any, context?: any) {
+  if (target[INITIALIZERS]) {
+    try {
+      target[INITIALIZERS].forEach((initializer: Initializer<any>) =>
+        initializer(target, context),
+      );
+    } catch (e: any) {
+      e.inspect ??= target.key;
+      throw e;
+    }
+  }
+}

package/src/lib/decorators/nodeName.ts

@@ -1,13 +1,13 @@
-/**
- * @internal
- */
-export const NODE_NAME = Symbol.for('@twick/2d/nodeName');
-
-/**
- * @internal
- */
-export function nodeName(name: string) {
-  return function (target: any) {
-    target.prototype[NODE_NAME] = name;
-  };
-}
+/**
+ * @internal
+ */
+export const NODE_NAME = Symbol.for('@twick/2d/nodeName');
+
+/**
+ * @internal
+ */
+export function nodeName(name: string) {
+  return function (target: any) {
+    target.prototype[NODE_NAME] = name;
+  };
+}

package/src/lib/decorators/signal.test.ts

@@ -1,90 +1,90 @@
-import type {SimpleSignal} from '@twick/core';
-import {DEFAULT} from '@twick/core';
-import {beforeEach, describe, expect, test, vi} from 'vitest';
-import {initial, initializeSignals, parser, signal} from './signal';
-
-interface OwnerProps {
-  integer?: number;
-  custom?: number;
-}
-
-class Owner {
-  @initial(2.2)
-  @parser((value: number) => Math.round(value))
-  @signal()
-  public declare readonly integer: SimpleSignal<number>;
-
-  @initial(0)
-  @signal()
-  public declare readonly custom: SimpleSignal<number>;
-  public getCustom() {
-    return 4;
-  }
-  public setCustom() {
-    // do nothing
-  }
-
-  public constructor(props: OwnerProps = {}) {
-    initializeSignals(this, props);
-  }
-}
-
-const GetterMock = vi.spyOn(Owner.prototype, 'getCustom');
-const SetterMock = vi.spyOn(Owner.prototype, 'setCustom');
-
-describe('signal', () => {
-  beforeEach(() => {
-    GetterMock.mockClear();
-    SetterMock.mockClear();
-  });
-
-  test('Has initial value', () => {
-    const instance = new Owner();
-
-    expect(instance.integer()).toBe(2);
-    expect(instance.integer.isInitial()).toBe(true);
-  });
-
-  test('Overrides the value', () => {
-    const instance = new Owner({integer: 4});
-
-    expect(instance.integer()).toBe(4);
-    expect(instance.integer.isInitial()).toBe(false);
-  });
-
-  test('Resets the value to default', () => {
-    const instance = new Owner({integer: 4});
-    instance.integer(DEFAULT);
-
-    expect(instance.integer()).toBe(2);
-    expect(instance.integer.isInitial()).toBe(true);
-  });
-
-  test('Parses the value', () => {
-    const instance = new Owner();
-    instance.integer(2.7);
-
-    expect(instance.integer()).toBe(3);
-  });
-
-  test('Uses the custom getter', () => {
-    const instance = new Owner();
-    const value = instance.custom();
-
-    expect(value).toBe(4);
-    expect(GetterMock).toBeCalledTimes(1);
-  });
-
-  test('Calls the setter with the initial value', () => {
-    new Owner();
-
-    expect(SetterMock).toBeCalledWith(0);
-  });
-
-  test('Uses the setter', () => {
-    const instance = new Owner({custom: 1});
-    instance.custom(2);
-
-    expect(SetterMock).toBeCalledTimes(3);
-  });
-});
+import type {SimpleSignal} from '@twick/core';
+import {DEFAULT} from '@twick/core';
+import {beforeEach, describe, expect, test, vi} from 'vitest';
+import {initial, initializeSignals, parser, signal} from './signal';
+
+interface OwnerProps {
+  integer?: number;
+  custom?: number;
+}
+
+class Owner {
+  @initial(2.2)
+  @parser((value: number) => Math.round(value))
+  @signal()
+  public declare readonly integer: SimpleSignal<number>;
+
+  @initial(0)
+  @signal()
+  public declare readonly custom: SimpleSignal<number>;
+  public getCustom() {
+    return 4;
+  }
+  public setCustom() {
+    // do nothing
+  }
+
+  public constructor(props: OwnerProps = {}) {
+    initializeSignals(this, props);
+  }
+}
+
+const GetterMock = vi.spyOn(Owner.prototype, 'getCustom');
+const SetterMock = vi.spyOn(Owner.prototype, 'setCustom');
+
+describe('signal', () => {
+  beforeEach(() => {
+    GetterMock.mockClear();
+    SetterMock.mockClear();
+  });
+
+  test('Has initial value', () => {
+    const instance = new Owner();
+
+    expect(instance.integer()).toBe(2);
+    expect(instance.integer.isInitial()).toBe(true);
+  });
+
+  test('Overrides the value', () => {
+    const instance = new Owner({integer: 4});
+
+    expect(instance.integer()).toBe(4);
+    expect(instance.integer.isInitial()).toBe(false);
+  });
+
+  test('Resets the value to default', () => {
+    const instance = new Owner({integer: 4});
+    instance.integer(DEFAULT);
+
+    expect(instance.integer()).toBe(2);
+    expect(instance.integer.isInitial()).toBe(true);
+  });
+
+  test('Parses the value', () => {
+    const instance = new Owner();
+    instance.integer(2.7);
+
+    expect(instance.integer()).toBe(3);
+  });
+
+  test('Uses the custom getter', () => {
+    const instance = new Owner();
+    const value = instance.custom();
+
+    expect(value).toBe(4);
+    expect(GetterMock).toBeCalledTimes(1);
+  });
+
+  test('Calls the setter with the initial value', () => {
+    new Owner();
+
+    expect(SetterMock).toBeCalledWith(0);
+  });
+
+  test('Uses the setter', () => {
+    const instance = new Owner({custom: 1});
+    instance.custom(2);
+
+    expect(SetterMock).toBeCalledTimes(3);
+  });
+});