@twick/2d 0.14.18 → 0.14.20

package/src/lib/code/CodeSignal.ts

@@ -1,327 +1,327 @@
-import type {
-  Signal,
-  SignalValue,
-  ThreadGenerator,
-  TimingFunction,
-} from '@twick/core';
-import {
-  createSignal,
-  deepLerp,
-  DependencyContext,
-  SignalContext,
-  unwrap,
-} from '@twick/core';
-import {addInitializer, getPropertyMetaOrCreate} from '../decorators';
-import {defaultDiffer} from './CodeDiffer';
-import {insert, replace} from './CodeFragment';
-import type {CodeHighlighter} from './CodeHighlighter';
-import type {CodePoint, CodeRange} from './CodeRange';
-import type {CodeScope, CodeTag, PossibleCodeScope} from './CodeScope';
-import {CODE, parseCodeScope, resolveCodeTag} from './CodeScope';
-import {defaultTokenize} from './CodeTokenizer';
-import {extractRange} from './extractRange';
-
-interface CodeModifier<TOwner> {
-  (code: string): TOwner;
-  (code: string, duration: number): ThreadGenerator;
-  (duration?: number): TagGenerator;
-}
-
-interface CodeInsert<TOwner> {
-  (point: CodePoint, code: string): TOwner;
-  (point: CodePoint, code: string, duration: number): ThreadGenerator;
-}
-
-interface CodeRemove<TOwner> {
-  (range: CodeRange): TOwner;
-  (range: CodeRange, duration: number): ThreadGenerator;
-}
-
-interface CodeReplace<TOwner> {
-  (range: CodeRange, code: string): TOwner;
-  (range: CodeRange, code: string, duration: number): ThreadGenerator;
-}
-
-type TagGenerator = (
-  strings: TemplateStringsArray,
-  ...tags: CodeTag[]
-) => ThreadGenerator;
-
-export interface CodeSignalHelpers<TOwner> {
-  edit(duration?: number): TagGenerator;
-  append: CodeModifier<TOwner>;
-  prepend: CodeModifier<TOwner>;
-  insert: CodeInsert<TOwner>;
-  remove: CodeRemove<TOwner>;
-  replace: CodeReplace<TOwner>;
-}
-
-export type CodeSignal<TOwner> = Signal<
-  PossibleCodeScope,
-  CodeScope,
-  TOwner,
-  CodeSignalContext<TOwner>
-> &
-  CodeSignalHelpers<TOwner>;
-
-export class CodeSignalContext<TOwner>
-  extends SignalContext<PossibleCodeScope, CodeScope, TOwner>
-  implements CodeSignalHelpers<TOwner>
-{
-  private readonly progress = createSignal(0);
-
-  public constructor(
-    initial: PossibleCodeScope,
-    owner: TOwner,
-    private readonly highlighter?: SignalValue<CodeHighlighter | null>,
-  ) {
-    super(initial, deepLerp, owner);
-    Object.defineProperty(this.invokable, 'edit', {
-      value: this.edit.bind(this),
-    });
-    Object.defineProperty(this.invokable, 'append', {
-      value: this.append.bind(this),
-    });
-    Object.defineProperty(this.invokable, 'prepend', {
-      value: this.prepend.bind(this),
-    });
-    Object.defineProperty(this.invokable, 'insert', {
-      value: this.insert.bind(this),
-    });
-    Object.defineProperty(this.invokable, 'remove', {
-      value: this.remove.bind(this),
-    });
-    Object.defineProperty(this.invokable, 'replace', {
-      value: this.replace.bind(this),
-    });
-  }
-
-  public override *tweener(
-    value: SignalValue<PossibleCodeScope>,
-    duration: number,
-    timingFunction: TimingFunction,
-  ): ThreadGenerator {
-    let tokenize = defaultTokenize;
-    const highlighter = unwrap(this.highlighter);
-    if (highlighter) {
-      yield (async () => {
-        do {
-          await DependencyContext.consumePromises();
-          highlighter.initialize();
-        } while (DependencyContext.hasPromises());
-      })();
-      tokenize = (input: string) => highlighter.tokenize(input);
-    }
-
-    this.progress(0);
-    this.set({
-      progress: this.progress,
-      fragments: defaultDiffer(this.get(), this.parse(unwrap(value)), tokenize),
-    });
-    yield* this.progress(1, duration, timingFunction);
-    this.set(value);
-  }
-
-  public edit(duration: number = 0.6): TagGenerator {
-    return (strings, ...tags) =>
-      this.editTween(CODE(strings, ...tags), duration);
-  }
-
-  public append(code: string): TOwner;
-  public append(code: string, duration: number): ThreadGenerator;
-  public append(duration?: number): TagGenerator;
-  public append(
-    first: string | number = 0.6,
-    duration?: number,
-  ): TOwner | ThreadGenerator | TagGenerator {
-    if (typeof first === 'string') {
-      if (duration === undefined) {
-        const current = this.get();
-        return this.set({
-          progress: 0,
-          fragments: [...current.fragments, first],
-        });
-      } else {
-        return this.appendTween(first, duration);
-      }
-    }
-
-    const savedDuration = first;
-    return (strings, ...tags) =>
-      this.append(resolveCodeTag(CODE(strings, ...tags), true), savedDuration);
-  }
-
-  public prepend(code: string): TOwner;
-  public prepend(code: string, duration: number): ThreadGenerator;
-  public prepend(duration?: number): TagGenerator;
-  public prepend(
-    first: string | number = 0.6,
-    duration?: number,
-  ): TOwner | ThreadGenerator | TagGenerator {
-    if (typeof first === 'string') {
-      if (duration === undefined) {
-        const current = this.get();
-        return this.set({
-          progress: 0,
-          fragments: [first, ...current.fragments],
-        });
-      } else {
-        return this.prependTween(first, duration);
-      }
-    }
-
-    const savedDuration = first;
-    return (strings, ...tags) =>
-      this.prepend(resolveCodeTag(CODE(strings, ...tags), true), savedDuration);
-  }
-
-  public insert(point: CodePoint, code: string): TOwner;
-  public insert(
-    point: CodePoint,
-    code: string,
-    duration: number,
-  ): ThreadGenerator;
-  public insert(
-    point: CodePoint,
-    code: string,
-    duration?: number,
-  ): TOwner | ThreadGenerator {
-    return this.replace([point, point], code, duration!);
-  }
-
-  public remove(range: CodeRange): TOwner;
-  public remove(range: CodeRange, duration: number): ThreadGenerator;
-  public remove(range: CodeRange, duration?: number): TOwner | ThreadGenerator {
-    return this.replace(range, '', duration!);
-  }
-
-  public replace(range: CodeRange, code: string): TOwner;
-  public replace(
-    range: CodeRange,
-    code: string,
-    duration: number,
-  ): ThreadGenerator;
-  public replace(
-    range: CodeRange,
-    code: string,
-    duration?: number,
-  ): TOwner | ThreadGenerator {
-    if (duration === undefined) {
-      const current = this.get();
-      const [fragments, index] = extractRange(range, current.fragments);
-      fragments[index] = code;
-      return this.set({
-        progress: current.progress,
-        fragments,
-      });
-    } else {
-      return this.replaceTween(range, code, duration);
-    }
-  }
-
-  private *replaceTween(range: CodeRange, code: string, duration: number) {
-    let current = this.get();
-    const [fragments, index] = extractRange(range, current.fragments);
-    const progress = createSignal(0);
-    const scope = {
-      progress,
-      fragments: [replace(fragments[index] as string, code)],
-    };
-    fragments[index] = scope;
-    this.set({
-      progress: current.progress,
-      fragments,
-    });
-
-    yield* progress(1, duration);
-
-    current = this.get();
-    this.set({
-      progress: current.progress,
-      fragments: current.fragments.map(fragment =>
-        fragment === scope ? code : fragment,
-      ),
-    });
-    progress.context.dispose();
-  }
-
-  private *editTween(value: CodeTag[], duration: number) {
-    this.progress(0);
-    this.set({
-      progress: this.progress,
-      fragments: value,
-    });
-    yield* this.progress(1, duration);
-    const current = this.get();
-    this.set({
-      progress: 0,
-      fragments: current.fragments.map(fragment =>
-        value.includes(fragment) ? resolveCodeTag(fragment, true) : fragment,
-      ),
-    });
-  }
-
-  private *appendTween(value: string, duration: number) {
-    let current = this.get();
-    const progress = createSignal(0);
-    const scope = {
-      progress,
-      fragments: [insert(value)],
-    };
-    this.set({
-      progress: current.progress,
-      fragments: [...current.fragments, scope],
-    });
-    yield* progress(1, duration);
-    current = this.get();
-    this.set({
-      progress: current.progress,
-      fragments: current.fragments.map(fragment =>
-        fragment === scope ? value : fragment,
-      ),
-    });
-    progress.context.dispose();
-  }
-
-  private *prependTween(value: string, duration: number) {
-    let current = this.get();
-    const progress = createSignal(0);
-    const scope = {
-      progress,
-      fragments: [insert(value)],
-    };
-    this.set({
-      progress: current.progress,
-      fragments: [scope, ...current.fragments],
-    });
-    yield* progress(1, duration);
-    current = this.get();
-    this.set({
-      progress: current.progress,
-      fragments: current.fragments.map(fragment =>
-        fragment === scope ? value : fragment,
-      ),
-    });
-    progress.context.dispose();
-  }
-
-  public override parse(value: PossibleCodeScope): CodeScope {
-    return parseCodeScope(value);
-  }
-
-  public override toSignal(): CodeSignal<TOwner> {
-    return this.invokable;
-  }
-}
-
-export function codeSignal(): PropertyDecorator {
-  return (target: any, key) => {
-    const meta = getPropertyMetaOrCreate<PossibleCodeScope>(target, key);
-    addInitializer(target, (instance: any) => {
-      instance[key] = new CodeSignalContext(
-        meta.default ?? [],
-        instance,
-      ).toSignal();
-    });
-  };
-}
+import type {
+  Signal,
+  SignalValue,
+  ThreadGenerator,
+  TimingFunction,
+} from '@twick/core';
+import {
+  createSignal,
+  deepLerp,
+  DependencyContext,
+  SignalContext,
+  unwrap,
+} from '@twick/core';
+import {addInitializer, getPropertyMetaOrCreate} from '../decorators';
+import {defaultDiffer} from './CodeDiffer';
+import {insert, replace} from './CodeFragment';
+import type {CodeHighlighter} from './CodeHighlighter';
+import type {CodePoint, CodeRange} from './CodeRange';
+import type {CodeScope, CodeTag, PossibleCodeScope} from './CodeScope';
+import {CODE, parseCodeScope, resolveCodeTag} from './CodeScope';
+import {defaultTokenize} from './CodeTokenizer';
+import {extractRange} from './extractRange';
+
+interface CodeModifier<TOwner> {
+  (code: string): TOwner;
+  (code: string, duration: number): ThreadGenerator;
+  (duration?: number): TagGenerator;
+}
+
+interface CodeInsert<TOwner> {
+  (point: CodePoint, code: string): TOwner;
+  (point: CodePoint, code: string, duration: number): ThreadGenerator;
+}
+
+interface CodeRemove<TOwner> {
+  (range: CodeRange): TOwner;
+  (range: CodeRange, duration: number): ThreadGenerator;
+}
+
+interface CodeReplace<TOwner> {
+  (range: CodeRange, code: string): TOwner;
+  (range: CodeRange, code: string, duration: number): ThreadGenerator;
+}
+
+type TagGenerator = (
+  strings: TemplateStringsArray,
+  ...tags: CodeTag[]
+) => ThreadGenerator;
+
+export interface CodeSignalHelpers<TOwner> {
+  edit(duration?: number): TagGenerator;
+  append: CodeModifier<TOwner>;
+  prepend: CodeModifier<TOwner>;
+  insert: CodeInsert<TOwner>;
+  remove: CodeRemove<TOwner>;
+  replace: CodeReplace<TOwner>;
+}
+
+export type CodeSignal<TOwner> = Signal<
+  PossibleCodeScope,
+  CodeScope,
+  TOwner,
+  CodeSignalContext<TOwner>
+> &
+  CodeSignalHelpers<TOwner>;
+
+export class CodeSignalContext<TOwner>
+  extends SignalContext<PossibleCodeScope, CodeScope, TOwner>
+  implements CodeSignalHelpers<TOwner>
+{
+  private readonly progress = createSignal(0);
+
+  public constructor(
+    initial: PossibleCodeScope,
+    owner: TOwner,
+    private readonly highlighter?: SignalValue<CodeHighlighter | null>,
+  ) {
+    super(initial, deepLerp, owner);
+    Object.defineProperty(this.invokable, 'edit', {
+      value: this.edit.bind(this),
+    });
+    Object.defineProperty(this.invokable, 'append', {
+      value: this.append.bind(this),
+    });
+    Object.defineProperty(this.invokable, 'prepend', {
+      value: this.prepend.bind(this),
+    });
+    Object.defineProperty(this.invokable, 'insert', {
+      value: this.insert.bind(this),
+    });
+    Object.defineProperty(this.invokable, 'remove', {
+      value: this.remove.bind(this),
+    });
+    Object.defineProperty(this.invokable, 'replace', {
+      value: this.replace.bind(this),
+    });
+  }
+
+  public override *tweener(
+    value: SignalValue<PossibleCodeScope>,
+    duration: number,
+    timingFunction: TimingFunction,
+  ): ThreadGenerator {
+    let tokenize = defaultTokenize;
+    const highlighter = unwrap(this.highlighter);
+    if (highlighter) {
+      yield (async () => {
+        do {
+          await DependencyContext.consumePromises();
+          highlighter.initialize();
+        } while (DependencyContext.hasPromises());
+      })();
+      tokenize = (input: string) => highlighter.tokenize(input);
+    }
+
+    this.progress(0);
+    this.set({
+      progress: this.progress,
+      fragments: defaultDiffer(this.get(), this.parse(unwrap(value)), tokenize),
+    });
+    yield* this.progress(1, duration, timingFunction);
+    this.set(value);
+  }
+
+  public edit(duration: number = 0.6): TagGenerator {
+    return (strings, ...tags) =>
+      this.editTween(CODE(strings, ...tags), duration);
+  }
+
+  public append(code: string): TOwner;
+  public append(code: string, duration: number): ThreadGenerator;
+  public append(duration?: number): TagGenerator;
+  public append(
+    first: string | number = 0.6,
+    duration?: number,
+  ): TOwner | ThreadGenerator | TagGenerator {
+    if (typeof first === 'string') {
+      if (duration === undefined) {
+        const current = this.get();
+        return this.set({
+          progress: 0,
+          fragments: [...current.fragments, first],
+        });
+      } else {
+        return this.appendTween(first, duration);
+      }
+    }
+
+    const savedDuration = first;
+    return (strings, ...tags) =>
+      this.append(resolveCodeTag(CODE(strings, ...tags), true), savedDuration);
+  }
+
+  public prepend(code: string): TOwner;
+  public prepend(code: string, duration: number): ThreadGenerator;
+  public prepend(duration?: number): TagGenerator;
+  public prepend(
+    first: string | number = 0.6,
+    duration?: number,
+  ): TOwner | ThreadGenerator | TagGenerator {
+    if (typeof first === 'string') {
+      if (duration === undefined) {
+        const current = this.get();
+        return this.set({
+          progress: 0,
+          fragments: [first, ...current.fragments],
+        });
+      } else {
+        return this.prependTween(first, duration);
+      }
+    }
+
+    const savedDuration = first;
+    return (strings, ...tags) =>
+      this.prepend(resolveCodeTag(CODE(strings, ...tags), true), savedDuration);
+  }
+
+  public insert(point: CodePoint, code: string): TOwner;
+  public insert(
+    point: CodePoint,
+    code: string,
+    duration: number,
+  ): ThreadGenerator;
+  public insert(
+    point: CodePoint,
+    code: string,
+    duration?: number,
+  ): TOwner | ThreadGenerator {
+    return this.replace([point, point], code, duration!);
+  }
+
+  public remove(range: CodeRange): TOwner;
+  public remove(range: CodeRange, duration: number): ThreadGenerator;
+  public remove(range: CodeRange, duration?: number): TOwner | ThreadGenerator {
+    return this.replace(range, '', duration!);
+  }
+
+  public replace(range: CodeRange, code: string): TOwner;
+  public replace(
+    range: CodeRange,
+    code: string,
+    duration: number,
+  ): ThreadGenerator;
+  public replace(
+    range: CodeRange,
+    code: string,
+    duration?: number,
+  ): TOwner | ThreadGenerator {
+    if (duration === undefined) {
+      const current = this.get();
+      const [fragments, index] = extractRange(range, current.fragments);
+      fragments[index] = code;
+      return this.set({
+        progress: current.progress,
+        fragments,
+      });
+    } else {
+      return this.replaceTween(range, code, duration);
+    }
+  }
+
+  private *replaceTween(range: CodeRange, code: string, duration: number) {
+    let current = this.get();
+    const [fragments, index] = extractRange(range, current.fragments);
+    const progress = createSignal(0);
+    const scope = {
+      progress,
+      fragments: [replace(fragments[index] as string, code)],
+    };
+    fragments[index] = scope;
+    this.set({
+      progress: current.progress,
+      fragments,
+    });
+
+    yield* progress(1, duration);
+
+    current = this.get();
+    this.set({
+      progress: current.progress,
+      fragments: current.fragments.map(fragment =>
+        fragment === scope ? code : fragment,
+      ),
+    });
+    progress.context.dispose();
+  }
+
+  private *editTween(value: CodeTag[], duration: number) {
+    this.progress(0);
+    this.set({
+      progress: this.progress,
+      fragments: value,
+    });
+    yield* this.progress(1, duration);
+    const current = this.get();
+    this.set({
+      progress: 0,
+      fragments: current.fragments.map(fragment =>
+        value.includes(fragment) ? resolveCodeTag(fragment, true) : fragment,
+      ),
+    });
+  }
+
+  private *appendTween(value: string, duration: number) {
+    let current = this.get();
+    const progress = createSignal(0);
+    const scope = {
+      progress,
+      fragments: [insert(value)],
+    };
+    this.set({
+      progress: current.progress,
+      fragments: [...current.fragments, scope],
+    });
+    yield* progress(1, duration);
+    current = this.get();
+    this.set({
+      progress: current.progress,
+      fragments: current.fragments.map(fragment =>
+        fragment === scope ? value : fragment,
+      ),
+    });
+    progress.context.dispose();
+  }
+
+  private *prependTween(value: string, duration: number) {
+    let current = this.get();
+    const progress = createSignal(0);
+    const scope = {
+      progress,
+      fragments: [insert(value)],
+    };
+    this.set({
+      progress: current.progress,
+      fragments: [scope, ...current.fragments],
+    });
+    yield* progress(1, duration);
+    current = this.get();
+    this.set({
+      progress: current.progress,
+      fragments: current.fragments.map(fragment =>
+        fragment === scope ? value : fragment,
+      ),
+    });
+    progress.context.dispose();
+  }
+
+  public override parse(value: PossibleCodeScope): CodeScope {
+    return parseCodeScope(value);
+  }
+
+  public override toSignal(): CodeSignal<TOwner> {
+    return this.invokable;
+  }
+}
+
+export function codeSignal(): PropertyDecorator {
+  return (target: any, key) => {
+    const meta = getPropertyMetaOrCreate<PossibleCodeScope>(target, key);
+    addInitializer(target, (instance: any) => {
+      instance[key] = new CodeSignalContext(
+        meta.default ?? [],
+        instance,
+      ).toSignal();
+    });
+  };
+}