@novely/core 0.32.0 → 0.33.0-beta.1

package/dist/index.d.ts

@@ -256,6 +256,10 @@ type NovelyScreen = 'mainmenu' | 'game' | 'saves' | 'settings';
 type DeepPartial<T> = unknown extends T ? T : T extends object ? {
     [P in keyof T]?: T[P] extends Array<infer U> ? Array<DeepPartial<U>> : T[P] extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : DeepPartial<T[P]>;
 } : T;
+/**
+ *
+ */
+type Assign<A extends object, B extends object> = Pick<A, Exclude<keyof A, keyof B>> & B;
 type NonEmptyRecord<T extends Record<PropertyKey, unknown>> = keyof T extends never ? never : T;
 type CoreData = {
     dataLoaded: boolean;
@@ -740,4 +744,19 @@ declare const novely: <$Language extends string, $Characters extends Record<stri
     getCurrentStorageData: () => StorageData<$Language, $Data> | null;
 };
 
-export { type ActionInputOnInputMeta, type ActionInputSetup, type ActionProxy, type AllowedContent, type AudioHandle, type BackgroundImage, type BaseTranslationStrings, type Character, type CharacterHandle, type ConditionParams, type Context, type CoreData, type CustomHandler, type CustomHandlerFunctionGetFn, type CustomHandlerFunctionParameters, type CustomHandlerGetResult, type CustomHandlerGetResultDataFunction, type Data, type DeepPartial, type DefaultActionProxy, EN, type Emotions, type FunctionableValue, type GetActionParameters, JP, KK, type Lang, type NovelyInit, type NovelyScreen, type Path, type PluralType, type Pluralization, RU, type Renderer, type RendererInit, type Save, type Stack, type StackHolder, type State, type StateFunction, type Storage, type StorageData, type StorageMeta, type Stored, type Story, type TextContent, type Thenable, type TranslationActions, type TypewriterSpeed, type ValidAction, localStorageStorage, novely };
+/**
+ * Extens core action with custom actions
+ * @param base Actions object you will extend, `engine.action`
+ * @param extension Actions object you will extend with
+ * @example
+ * ```ts
+ * const action = extendAction(engine.action, {
+ *   particles: (options: Parameters<typeof particles>[0]) => {
+ *     return ['custom', particles(options)]
+ *   }
+ * })
+ * ```
+ */
+declare const extendAction: <Part0 extends Record<string, (...args: any[]) => ValidAction>, Part1 extends Record<string, (...args: any[]) => ValidAction>>(base: Part0, extension: Part1) => Readonly<Assign<Part0, Part1>>;
+
+export { type ActionInputOnInputMeta, type ActionInputSetup, type ActionProxy, type AllowedContent, type AudioHandle, type BackgroundImage, type BaseTranslationStrings, type Character, type CharacterHandle, type ConditionParams, type Context, type CoreData, type CustomHandler, type CustomHandlerFunctionGetFn, type CustomHandlerFunctionParameters, type CustomHandlerGetResult, type CustomHandlerGetResultDataFunction, type Data, type DeepPartial, type DefaultActionProxy, EN, type Emotions, type FunctionableValue, type GetActionParameters, JP, KK, type Lang, type NovelyInit, type NovelyScreen, type Path, type PluralType, type Pluralization, RU, type Renderer, type RendererInit, type Save, type Stack, type StackHolder, type State, type StateFunction, type Storage, type StorageData, type StorageMeta, type Stored, type Story, type TextContent, type Thenable, type TranslationActions, type TypewriterSpeed, type ValidAction, extendAction, localStorageStorage, novely };

package/dist/index.global.js

@@ -156,6 +156,7 @@ var Novely = (() => {
     JP: () => JP,
     KK: () => KK,
     RU: () => RU,
+    extendAction: () => extendAction,
     localStorageStorage: () => localStorageStorage,
     novely: () => novely
   });
@@ -642,6 +643,90 @@ var Novely = (() => {
       return lang;
     }
   };
+  var createReferFunction = (story) => {
+    const refer = (path) => {
+      let current = story;
+      let precurrent = story;
+      const blocks = [];
+      for (const [type, val] of path) {
+        if (type === "jump") {
+          precurrent = story;
+          current = current[val];
+        } else if (type === null) {
+          precurrent = current;
+          current = current[val];
+        } else if (type === "choice") {
+          blocks.push(precurrent);
+          current = current[val + 1][1];
+        } else if (type === "condition") {
+          blocks.push(precurrent);
+          current = current[2][val];
+        } else if (type === "block") {
+          blocks.push(precurrent);
+          current = story[val];
+        } else if (type === "block:exit" || type === "choice:exit" || type === "condition:exit") {
+          current = blocks.pop();
+        }
+      }
+      return current;
+    };
+    return refer;
+  };
+  var exitPath = ({ path, refer, onExitImpossible }) => {
+    const last = path.at(-1);
+    const ignore = [];
+    let wasExitImpossible = false;
+    if (!isAction(refer(path))) {
+      if (last && isNull(last[0]) && isNumber(last[1])) {
+        last[1]--;
+      } else {
+        path.pop();
+      }
+    }
+    if (isExitImpossible(path)) {
+      const referred = refer(path);
+      if (isAction(referred) && isSkippedDuringRestore(referred[0])) {
+        onExitImpossible();
+      }
+      wasExitImpossible = true;
+      return {
+        exitImpossible: wasExitImpossible
+      };
+    }
+    for (let i = path.length - 1; i > 0; i--) {
+      const [name] = path[i];
+      if (isBlockExitStatement(name)) {
+        ignore.push(name);
+      }
+      if (!isBlockStatement(name))
+        continue;
+      if (ignore.at(-1)?.startsWith(name)) {
+        ignore.pop();
+        continue;
+      }
+      path.push([`${name}:exit`]);
+      const prev = findLastPathItemBeforeItemOfType(path.slice(0, i + 1), name);
+      if (prev)
+        path.push([null, prev[1] + 1]);
+      if (!isAction(refer(path))) {
+        path.pop();
+        continue;
+      }
+      break;
+    }
+    return {
+      exitImpossible: wasExitImpossible
+    };
+  };
+  var nextPath = (path) => {
+    const last = path.at(-1);
+    if (last && (isNull(last[0]) || last[0] === "jump") && isNumber(last[1])) {
+      last[1]++;
+    } else {
+      path.push([null, 0]);
+    }
+    return path;
+  };
 
   // ../../node_modules/.pnpm/dequal@2.0.3/node_modules/dequal/lite/index.mjs
   var has = Object.prototype.hasOwnProperty;
@@ -1169,10 +1254,12 @@ var Novely = (() => {
           }
         }
       }
-      match("clear", [keep, characters2, audio], {
-        ctx: context,
-        data: latest[1]
-      });
+      if (context.meta.goingBack) {
+        match("clear", [keep, characters2, audio], {
+          ctx: context,
+          data: latest[1]
+        });
+      }
       const lastQueueItem = queue.at(-1) || [];
       const lastQueueItemRequiresUserAction = isSkippedDuringRestore(lastQueueItem[0]) || isUserRequiredAction(lastQueueItem);
       await run((item) => {
@@ -1190,32 +1277,7 @@ var Novely = (() => {
       context.meta.restoring = context.meta.goingBack = false;
       render(context);
     };
-    const refer = (path) => {
-      let current = story;
-      let precurrent = story;
-      const blocks = [];
-      for (const [type, val] of path) {
-        if (type === "jump") {
-          precurrent = story;
-          current = current[val];
-        } else if (type === null) {
-          precurrent = current;
-          current = current[val];
-        } else if (type === "choice") {
-          blocks.push(precurrent);
-          current = current[val + 1][1];
-        } else if (type === "condition") {
-          blocks.push(precurrent);
-          current = current[2][val];
-        } else if (type === "block") {
-          blocks.push(precurrent);
-          current = story[val];
-        } else if (type === "block:exit" || type === "choice:exit" || type === "condition:exit") {
-          current = blocks.pop();
-        }
-      }
-      return current;
-    };
+    const refer = createReferFunction(story);
     const exit = (force = false, saving = true) => {
       const ctx = renderer.getContext(MAIN_CONTEXT_KEY);
       const stack = useStack(ctx);
@@ -1340,15 +1402,6 @@ var Novely = (() => {
       stack.push(current);
       save("auto");
     };
-    const nextPath = (path) => {
-      const last = path.at(-1);
-      if (last && (isNull(last[0]) || last[0] === "jump") && isNumber(last[1])) {
-        last[1]++;
-      } else {
-        path.push([null, 0]);
-      }
-      return path;
-    };
     const next = (ctx) => {
       const stack = useStack(ctx);
       const path = stack.value[0];
@@ -1613,49 +1666,19 @@ var Novely = (() => {
       exit({ ctx, data: data2 }) {
         if (ctx.meta.restoring)
           return;
-        const stack = useStack(ctx);
-        const path = stack.value[0];
-        const last = path.at(-1);
-        const ignore = [];
-        if (!isAction(refer(path))) {
-          if (last && isNull(last[0]) && isNumber(last[1])) {
-            last[1]--;
-          } else {
-            path.pop();
-          }
-        }
-        if (isExitImpossible(path)) {
-          const referred = refer(path);
-          if (isAction(referred) && isSkippedDuringRestore(referred[0])) {
+        const { exitImpossible } = exitPath({
+          path: useStack(ctx).value[0],
+          refer,
+          onExitImpossible: () => {
             match("end", [], {
               ctx,
               data: data2
             });
           }
-          return;
-        }
-        for (let i = path.length - 1; i > 0; i--) {
-          const [name] = path[i];
-          if (isBlockExitStatement(name)) {
-            ignore.push(name);
-          }
-          if (!isBlockStatement(name))
-            continue;
-          if (ignore.at(-1)?.startsWith(name)) {
-            ignore.pop();
-            continue;
-          }
-          path.push([`${name}:exit`]);
-          const prev = findLastPathItemBeforeItemOfType(path.slice(0, i + 1), name);
-          if (prev)
-            path.push([null, prev[1] + 1]);
-          if (!isAction(refer(path))) {
-            path.pop();
-            continue;
-          }
-          break;
+        });
+        if (!exitImpossible) {
+          render(ctx);
         }
-        render(ctx);
       },
       preload({ ctx, push }, [source]) {
         if (!ctx.meta.goingBack && !ctx.meta.restoring && !PRELOADED_ASSETS.has(source)) {
@@ -1835,6 +1858,15 @@ var Novely = (() => {
     };
   };
 
+  // src/extend-actions.ts
+  var extendAction = (base, extension) => {
+    return new Proxy({}, {
+      get(_, key, receiver) {
+        return Reflect.get(key in extension ? extension : base, key, receiver);
+      }
+    });
+  };
+
   // src/translations.ts
   var RU = {
     NewGame: "\u041D\u043E\u0432\u0430\u044F \u0438\u0433\u0440\u0430",