@novely/core 0.52.0-next.2 → 0.53.0-next

package/dist/index.d.ts

@@ -609,15 +609,6 @@ type StateFunction<S extends State> = {
     (value: DeepPartial<S> | ((prev: S) => S)): void;
     (): S;
 };
-/**
- * @deprecated `EngineTypes` should be used instead
- */
-type TypeEssentials<$Lang extends Lang, $State extends State, $Data extends Data, $Characters extends Record<string, Character<$Lang>>> = {
-    readonly l: $Lang | null;
-    readonly s: $State | null;
-    readonly d: $Data | null;
-    readonly c: $Characters | null;
-};
 type EngineTypes<$Lang extends Lang = Lang, $State extends State = State, $Data extends Data = Data, $Characters extends Record<string, Character<$Lang>> = Record<string, Character<$Lang>>> = {
     readonly l: $Lang;
     readonly s: $State;
@@ -648,6 +639,37 @@ type Character<$Lang extends Lang = string> = {
     emotions: Emotions;
 };
 
+type TickHandler = (ticker: Ticker) => void;
+declare class Ticker {
+    listeners: Set<TickHandler>;
+    running: boolean;
+    private _factory;
+    constructor(factory: TickerFactory);
+    get deltaTime(): number;
+    get lastTime(): number;
+    add(cb: (ticker: Ticker) => void): () => void;
+    remove(cb: (ticker: Ticker) => void): void;
+    start: () => void;
+    stop: () => void;
+    detach: () => void;
+}
+declare class TickerFactory {
+    private _children;
+    private _raf;
+    private _running;
+    private _unsubscribe;
+    deltaTime: number;
+    lastTime: number;
+    constructor(paused: Derived<boolean>);
+    start(): void;
+    stop(): void;
+    fork(): Ticker;
+    check(positive: boolean): void;
+    destroy(): void;
+    detach(ticker: Ticker): void;
+    private update;
+}
+
 type ValidAction = ['choice', string | undefined, ...[string, unknown[], (() => boolean)?, (() => boolean)?, string?][]] | ['clear', Set<keyof DefaultActionProxy>?, Set<string>?, {
     music: Set<string>;
     sounds: Set<string>;
@@ -734,7 +756,7 @@ type CustomHandlerFunctionParameters<L extends string, S extends State> = {
      */
     dataAtKey: <T extends Record<string, unknown>>(key: string) => T | null;
     /**
-     * Function to set cleanup functions.
+     * Function to register cleanup callbacks (executed in reverse order of registration).
      *
      * @example
      * ```ts
@@ -793,6 +815,10 @@ type CustomHandlerFunctionParameters<L extends string, S extends State> = {
      * }
      */
     paused: Derived<boolean>;
+    /**
+     * Ticker
+     */
+    ticker: Ticker;
 };
 type CustomHandlerFunction<L extends string, S extends State> = (parameters: CustomHandlerFunctionParameters<L, S>) => Thenable<void>;
 type CustomHandlerCalling = {
@@ -1044,19 +1070,6 @@ declare const novely: <$Language extends string, $Characters extends Record<stri
      * ```
      */
     data: StateFunction<$Data>;
-    /**
-     * Used in combination with type utilities
-     * @deprecated Use `engine.types` instead
-     * @example
-     * ```ts
-     * import type { ConditionParams, StateFunction } from '@novely/core';
-     *
-     * const conditionCheck = (state: StateFunction<ConditionParams<typeof engine.typeEssintials>>) => {
-     *   return state.age >= 18;
-     * }
-     * ```
-     */
-    typeEssentials: TypeEssentials<$Language, $State, $Data, $Characters>;
     /**
      * Used in combination with type utilities
      * @example
@@ -1200,4 +1213,4 @@ declare const pauseOnBlur: (engine: {
     unsubscribe: () => void;
 };
 
-export { type ActionChoiceChoice, type ActionChoiceChoiceObject, type ActionInputOnInputMeta, type ActionInputSetup, type ActionInputSetupCleanup, type ActionProxy, type AllowedContent, type AudioHandle, type BackgroundImage, type BaseTranslationStrings, type Character, type CharacterAssetSizes, type CharacterHandle, type CharactersData, type ChoiceCheckFunction, type ChoiceCheckFunctionProps, type ChoiceOnSelectFunction, type ChoiceOnSelectFunctionProps, type ChoiceParams, type ConditionCheckFunction, type ConditionParams, type Context, type CoreData, type CustomActionHandle, type CustomHandler, type CustomHandlerFunction, type CustomHandlerFunctionGetFn, type CustomHandlerFunctionParameters, type CustomHandlerGetResult, type CustomHandlerGetResultDataFunction, type CustomHandlerInfo, type Data, type DeepPartial, type DefaultActionProxy, type Derived, EN, type Emotions, type EngineTypes, type FunctionParams, type FunctionableValue, type GetActionParameters, type InputHandler, type Lang, type NovelyAsset, type NovelyInit, type NovelyScreen, type Path, type PathItem, type PluralType, type Pluralization, RU, type Renderer, type RendererInit, type RendererInitPreviewReturn, type Save, type Stack, type StackHolder, type State, type StateFunction, type StorageAdapter, type StorageData, type StorageMeta, type Stored, type Story, type TextContent, type Thenable, type TranslationActions, type TypeEssentials, type TypesFromEngine, type TypewriterSpeed, type ValidAction, asset, extendAction, novely, pauseOnBlur, storageAdapterLocal };
+export { type ActionChoiceChoice, type ActionChoiceChoiceObject, type ActionInputOnInputMeta, type ActionInputSetup, type ActionInputSetupCleanup, type ActionProxy, type AllowedContent, type AudioHandle, type BackgroundImage, type BaseTranslationStrings, type Character, type CharacterAssetSizes, type CharacterHandle, type CharactersData, type ChoiceCheckFunction, type ChoiceCheckFunctionProps, type ChoiceOnSelectFunction, type ChoiceOnSelectFunctionProps, type ChoiceParams, type ConditionCheckFunction, type ConditionParams, type Context, type CoreData, type CustomActionHandle, type CustomHandler, type CustomHandlerFunction, type CustomHandlerFunctionGetFn, type CustomHandlerFunctionParameters, type CustomHandlerGetResult, type CustomHandlerGetResultDataFunction, type CustomHandlerInfo, type Data, type DeepPartial, type DefaultActionProxy, type Derived, EN, type Emotions, type EngineTypes, type FunctionParams, type FunctionableValue, type GetActionParameters, type InputHandler, type Lang, type NovelyAsset, type NovelyInit, type NovelyScreen, type Path, type PathItem, type PluralType, type Pluralization, RU, type Renderer, type RendererInit, type RendererInitPreviewReturn, type Save, type Stack, type StackHolder, type State, type StateFunction, type StorageAdapter, type StorageData, type StorageMeta, type Stored, type Story, type TextContent, type Thenable, Ticker, type TranslationActions, type TypesFromEngine, type TypewriterSpeed, type ValidAction, asset, extendAction, novely, pauseOnBlur, storageAdapterLocal };

package/dist/index.js

@@ -1026,6 +1026,15 @@ var getCustomActionCleanupHolder = (ctx) => {
   CUSTOM_ACTION_CLEANUP_MAP.set(ctx.id, holder);
   return holder;
 };
+var cleanCleanupSource = ({ list }) => {
+  while (list.length) {
+    try {
+      list.pop()();
+    } catch (e) {
+      console.error(e);
+    }
+  }
+};
 var handleCustomAction = (ctx, fn, {
   lang,
   state,
@@ -1033,7 +1042,8 @@ var handleCustomAction = (ctx, fn, {
   remove: renderersRemove,
   getStack: getStack2,
   templateReplace,
-  paused
+  paused,
+  ticker
 }) => {
   const holder = getCustomActionHolder(ctx, fn);
   const cleanupHolder = getCustomActionCleanupHolder(ctx);
@@ -1045,15 +1055,13 @@ var handleCustomAction = (ctx, fn, {
   };
   const cleanupSource = {
     fn,
-    list: /* @__PURE__ */ new Set(),
-    dom: cleanupNode
+    list: [ticker.detach],
+    node: cleanupNode
   };
   cleanupHolder.push(cleanupSource);
-  const flags = {
-    ...ctx.meta
-  };
   const getDomNodes = (insert = true) => {
     if (holder.node || !insert) {
+      setMountElement(holder.node);
       return {
         element: holder.node,
         root: ctx.root
@@ -1067,7 +1075,7 @@ var handleCustomAction = (ctx, fn, {
     };
   };
   const clear = (func) => {
-    cleanupSource.list.add(once2(func));
+    cleanupSource.list.push(once2(func));
   };
   const data = (updatedData) => {
     if (updatedData) {
@@ -1076,9 +1084,9 @@ var handleCustomAction = (ctx, fn, {
     return holder.localData;
   };
   const remove = () => {
-    cleanupSource.list.forEach((fn2) => fn2());
-    cleanupSource.list.clear();
-    cleanupSource.dom();
+    cleanCleanupSource(cleanupSource);
+    holder.node = null;
+    setMountElement(null);
     renderersRemove();
   };
   const stack = getStack2(ctx);
@@ -1086,7 +1094,7 @@ var handleCustomAction = (ctx, fn, {
     return stack.value;
   };
   return fn({
-    flags,
+    flags: ctx.meta,
     lang,
     state,
     data,
@@ -1098,7 +1106,8 @@ var handleCustomAction = (ctx, fn, {
     getDomNodes,
     getSave,
     contextKey: ctx.id,
-    paused: flags.preview ? immutable(false) : paused
+    paused: ctx.meta.preview ? immutable(false) : paused,
+    ticker
   });
 };
 
@@ -1376,6 +1385,115 @@ var setDocumentLanguage = (language) => {
   document.documentElement.lang = language;
 };
 
+// src/ticker.ts
+var Ticker = class {
+  listeners = /* @__PURE__ */ new Set();
+  running = false;
+  _factory;
+  constructor(factory) {
+    this._factory = factory;
+  }
+  get deltaTime() {
+    return this._factory.deltaTime;
+  }
+  get lastTime() {
+    return this._factory.lastTime;
+  }
+  add(cb) {
+    this.listeners.add(cb);
+    if (this.listeners.size === 1) {
+      this._factory.check(true);
+    }
+    return () => {
+      this.remove(cb);
+    };
+  }
+  remove(cb) {
+    this.listeners.delete(cb);
+    if (this.listeners.size === 0) {
+      this._factory.check(false);
+    }
+  }
+  start = () => {
+    this.running = true;
+    if (this.listeners.size > 0) {
+      this._factory.check(true);
+    }
+  };
+  stop = () => {
+    this.running = false;
+  };
+  detach = () => {
+    this._factory.detach(this);
+  };
+};
+var TickerFactory = class {
+  _children = /* @__PURE__ */ new Set();
+  _raf = -1;
+  _running = false;
+  _unsubscribe;
+  deltaTime = 0;
+  lastTime = performance.now();
+  constructor(paused) {
+    this._unsubscribe = paused.subscribe((paused2) => {
+      if (paused2) {
+        this.stop();
+      } else if (Array.from(this._children).some((ticker) => ticker.running && ticker.listeners.size > 0)) {
+        this.start();
+      }
+    });
+  }
+  start() {
+    if (this._running) {
+      return;
+    }
+    cancelAnimationFrame(this._raf);
+    this.lastTime = performance.now();
+    this._running = true;
+    this._raf = requestAnimationFrame(this.update);
+  }
+  stop() {
+    cancelAnimationFrame(this._raf);
+    this._running = false;
+    this._raf = -1;
+  }
+  fork() {
+    const ticker = new Ticker(this);
+    this._children.add(ticker);
+    return ticker;
+  }
+  check(positive) {
+    if (positive) {
+      this.start();
+    } else if (Array.from(this._children).every((ticker) => !ticker.running || ticker.listeners.size === 0)) {
+      this.stop();
+    }
+  }
+  destroy() {
+    this._unsubscribe();
+    this._children.forEach((child) => child.detach());
+  }
+  detach(ticker) {
+    this._children.delete(ticker);
+    this.check(false);
+  }
+  update = (currentTime) => {
+    this.deltaTime = currentTime - this.lastTime;
+    this._children.forEach((ticker) => {
+      if (ticker.running) {
+        ticker.listeners.forEach((tick) => {
+          tick(ticker);
+        });
+      }
+    });
+    if (!this._running) {
+      return;
+    }
+    this.lastTime = currentTime;
+    this._raf = requestAnimationFrame(this.update);
+  };
+};
+
 // src/novely.ts
 var novely = ({
   characters,
@@ -1641,20 +1759,19 @@ var novely = ({
         }
       }
       futures.reverse();
-      const dom = /* @__PURE__ */ new Set();
+      const nodeCleanup = /* @__PURE__ */ new Set();
       for (const future of futures) {
         inner: for (let i = cleanupHolder.length - 1; i >= 0; i--) {
           const item = cleanupHolder[i];
           if (future === item.fn) {
-            item.list.forEach((fn) => fn());
-            item.list.clear();
+            cleanCleanupSource(item);
+            nodeCleanup.add(item.node);
             cleanupHolder.splice(i, 1);
-            dom.add(item.dom);
             break inner;
           }
         }
       }
-      dom.forEach((f) => f());
+      nodeCleanup.forEach((f) => f());
     }
     const {
       run,
@@ -1717,6 +1834,7 @@ var novely = ({
       save("auto");
     }
     stack.clear();
+    clearCustomActionsAtContext(ctx);
     ctx.clear(EMPTY_SET, EMPTY_SET, { music: EMPTY_SET, sounds: EMPTY_SET }, noop);
     renderer.ui.showScreen("mainmenu");
     ctx.audio.destroy();
@@ -1818,14 +1936,13 @@ var novely = ({
   };
   const clearCustomActionsAtContext = (ctx) => {
     const cleanupHolder = getCustomActionCleanupHolder(ctx);
-    const dom = /* @__PURE__ */ new Set();
+    const nodeCleanup = /* @__PURE__ */ new Set();
     for (const item of cleanupHolder) {
-      item.list.forEach((fn) => fn());
-      item.list.clear();
-      dom.add(item.dom);
+      cleanCleanupSource(item);
+      nodeCleanup.add(item.node);
     }
     cleanupHolder.length = 0;
-    dom.forEach((fn) => fn());
+    nodeCleanup.forEach((fn) => fn());
   };
   const getResourseTypeWrapper = (url) => {
     return getResourseType({
@@ -1956,6 +2073,7 @@ var novely = ({
       }
     }
   };
+  const ticker = new TickerFactory(paused);
   const { match, nativeActions } = matchAction(matchActionOptions, {
     wait({ ctx, data: data2, push }, [time]) {
       if (ctx.meta.restoring) return;
@@ -2162,6 +2280,7 @@ var novely = ({
         lang,
         getStack: useStack,
         paused,
+        ticker: ticker.fork(),
         templateReplace
       });
       const next2 = () => {
@@ -2387,19 +2506,6 @@ var novely = ({
      * ```
      */
     data,
-    /**
-     * Used in combination with type utilities
-     * @deprecated Use `engine.types` instead
-     * @example
-     * ```ts
-     * import type { ConditionParams, StateFunction } from '@novely/core';
-     *
-     * const conditionCheck = (state: StateFunction<ConditionParams<typeof engine.typeEssintials>>) => {
-     *   return state.age >= 18;
-     * }
-     * ```
-     */
-    typeEssentials: {},
     /**
      * Used in combination with type utilities
      * @example
@@ -2443,6 +2549,7 @@ var novely = ({
       if (destroyed) return;
       dataLoaded.cancel();
       UIInstance.unmount();
+      ticker.destroy();
       removeEventListener("beforeunload", throttledShortOnStorageDataChange);
       destroyed = true;
     },