@turnipxenon/pineapple 3.0.0-alpha.11 → 3.0.0-alpha.12

package/dist/components/dialog_manager/DialogManager.d.ts

@@ -4,8 +4,9 @@
 import type { DialogDetail } from "../../types/pineapple_fiber/DialogDetail";
 import { DialogState } from "../../types/pineapple_fiber/DialogState";
 import { DialogProcessor } from "./DialogProcessor";
+import type { IDialogManager } from "./IDialogManager";
 export type OnSetDialogChoiceCallback = (newMessage: DialogDetail) => void;
-export declare class DialogManager {
+export declare class DialogManager implements IDialogManager {
     dialogMessageMap: Map<string, DialogDetail>;
     currentDialogTree: DialogDetail[];
     fullCurrentMessage: string;

package/dist/components/dialog_manager/DialogMangerInit.d.ts

@@ -1,15 +1,2 @@
-import { DialogManager } from "./DialogManager";
-/**
- * strictly must be declared last! or you might receive a weird error that looks like:
- *
- * 2:04:21 AM [vite] Error when evaluating SSR module /src/lib/components/dialog_manager/DialogManagerStore.ts:
- * |- TypeError: Cannot read properties of undefined (reading '0')
- *     at <instance_members_initializer> (/src/lib/components/dialog_manager/DialogManager.ts:38:67)
- *     at new DialogManager (/src/lib/components/dialog_manager/DialogManager.ts:53:14)
- *     at eval (/src/lib/components/dialog_manager/DialogManagerStore.ts:15:23)
- *     at async instantiateModule (file:///C:/Users/Pumpkin/Projects/Web/pineapple/node_modules/vite/dist/node/chunks/dep-934dbc7c.js:54360:9)
- *
- * what this means is that one member of dialogManager cannot be initialized. in our case, it was the
- * defaultDialogMessage not yet being initialized
- */
-export declare const dialogManager: DialogManager;
+import type { IDialogManager } from "./IDialogManager";
+export declare const getDialogManager: () => Promise<IDialogManager>;

package/dist/components/dialog_manager/DialogMangerInit.js

@@ -1,4 +1,3 @@
-import { DialogManager } from "./DialogManager";
 /**
  * strictly must be declared last! or you might receive a weird error that looks like:
  *
@@ -12,4 +11,11 @@ import { DialogManager } from "./DialogManager";
  * what this means is that one member of dialogManager cannot be initialized. in our case, it was the
  * defaultDialogMessage not yet being initialized
  */
-export const dialogManager = new DialogManager();
+let _dialogManager = undefined;
+export const getDialogManager = async () => {
+    if (_dialogManager === undefined) {
+        const dm = await import('./DialogManager');
+        _dialogManager = new dm.DialogManager();
+    }
+    return _dialogManager;
+};

package/dist/components/dialog_manager/IDialogManager.d.ts

@@ -0,0 +1,39 @@
+import type { DialogDetail } from "../../types/pineapple_fiber/DialogDetail";
+import { type Writable } from "svelte/store";
+import { DialogState } from "../../types/pineapple_fiber/DialogState";
+import { type Tweened } from "svelte/motion";
+import { DialogProcessor } from "./DialogProcessor";
+import type { OnSetDialogChoiceCallback } from "./DialogManager";
+export interface IDialogManager {
+    dialogMessageMap: Map<string, DialogDetail>;
+    currentDialogTree: DialogDetail[];
+    fullCurrentMessage: string;
+    currentMessageMeta: DialogDetail;
+    currentMessage: Writable<string>;
+    currentIndex: number;
+    previousTimestamp: number;
+    isDoneTransition: boolean;
+    currentPortrait: Writable<unknown>;
+    portraitMap: Map<string, any>;
+    currentState: DialogState;
+    currentReadableState: Writable<DialogState>;
+    hidePercent: Tweened<number>;
+    skipNextActiveTime: number;
+    dialogProcessor: DialogProcessor;
+    _setDialogChoiceQueue: DialogDetail[];
+    _setDialogChoiceMutex: boolean;
+    onSetDialogListeners: OnSetDialogChoiceCallback[];
+    enableDialogueOverlayCache: boolean;
+    skipAnimation: () => void;
+    enableDialog: (shouldEnable: boolean) => void;
+    setDialogTree: (newDialogTree: DialogDetail[]) => void;
+    subscribeToSetDialogChoice: (callback: OnSetDialogChoiceCallback) => void;
+    unsubscribeToSetDialogChoice: (callback: OnSetDialogChoiceCallback) => void;
+    setDialogChoice: (newMessage: (DialogDetail | undefined)) => void;
+    _setDialogChoice: () => void;
+    setDialogToDefault: () => void;
+    update: (timestamp: number) => void;
+    enableDialogOverlay(enable: boolean): void;
+    toggleDialogOverlay(): void;
+    parseAndSetDialogTree(dialogYarn: string): Promise<DialogDetail[]>;
+}

package/dist/components/dialog_manager/IDialogManager.js

@@ -0,0 +1,4 @@
+import {} from "svelte/store";
+import { DialogState } from "../../types/pineapple_fiber/DialogState";
+import {} from "svelte/motion";
+import { DialogProcessor } from "./DialogProcessor";

package/dist/components/dialog_manager/behavior_tree/line_processors/commands/JumpCommand.d.ts

@@ -2,7 +2,10 @@ import type { LineBehaviorNode } from "../../line_core/LineBehaviorNode";
 import type { LineNodeArguments } from "../../line_core/LineNodeArguments";
 import type { LineBehaviorResult } from "../../line_core/LineBehaviorResult";
 import { SetVariableNode } from "../SetVariableNode";
+import type { IDialogManager } from "../../../../..";
 export declare class JumpCommand implements LineBehaviorNode {
     setVariableNode: SetVariableNode;
+    dialogManager: undefined | IDialogManager;
+    constructor();
     process(nodeArgs: LineNodeArguments): LineBehaviorResult;
 }

package/dist/components/dialog_manager/behavior_tree/line_processors/commands/JumpCommand.js

@@ -1,10 +1,22 @@
 import { BehaviorStatus } from "../../core/BehaviorStatus";
 import { SetVariableNode } from "../SetVariableNode";
 import { btreeUtils } from "../../core/BTreeUtils";
-import { dialogManager } from "../../../DialogMangerInit";
+import { getDialogManager } from "../../../DialogMangerInit";
 export class JumpCommand {
     setVariableNode = new SetVariableNode();
+    dialogManager = undefined;
+    constructor() {
+        getDialogManager().then(dm => this.dialogManager = dm);
+    }
     process(nodeArgs) {
+        if (this.dialogManager === undefined) {
+            console.error('Dialog Manger not yet initialized');
+            return {
+                renderedLine: "",
+                nextState: nodeArgs.initState,
+                status: BehaviorStatus.Failure
+            };
+        }
         if (!nodeArgs.line.startsWith("<<jump")) {
             return {
                 renderedLine: "",
@@ -23,10 +35,10 @@ export class JumpCommand {
             .slice("<<jump ".length, nodeArgs.line.length - ">>".length)
             .replace(/^\{/, "") // remove possible " at the start: https://stackoverflow.com/a/2182602
             .replace(/}$/, ""); // remove possible " at the end: https://stackoverflow.com/a/12249011;
-        const dialogChoice = dialogManager.dialogMessageMap.get(btreeUtils.simplifyToken(choiceName));
+        const dialogChoice = this.dialogManager.dialogMessageMap.get(btreeUtils.simplifyToken(choiceName));
         if (dialogChoice !== undefined) {
             // force choice
-            dialogManager.setDialogChoice(dialogChoice);
+            this.dialogManager.setDialogChoice(dialogChoice);
         }
         else {
             console.error(`Unknown jump node at line ${nodeArgs.lineIndex + 1}: ${choiceName} or ${btreeUtils.simplifyToken(choiceName)}`);

package/dist/components/dialog_overlay/DialogOverlay.svelte

@@ -2,37 +2,46 @@
 	import AresHappy from "../../assets/characters/ares/ares_happy.webp";
 	import { onMount } from "svelte";
 	import { DialogState } from "../../types/pineapple_fiber/DialogState";
-	import { dialogManager } from "../dialog_manager/DialogMangerInit";
+	import { getDialogManager } from "../dialog_manager/DialogMangerInit";
+	import type { IDialogManager } from "../dialog_manager/IDialogManager";
 
 	let currentMessage = $state("");
-	dialogManager.currentMessage.subscribe((value) => {
-		currentMessage = value;
-	});
-
 	let currentPortrait = $state(AresHappy);
-	dialogManager.currentPortrait.subscribe((value) => {
-		if (value) {
-			currentPortrait = value;
-		}
-	});
 
 	let hidePercent = $state(100);
 	let isHidden = $state(true);
+	let dialogManager: IDialogManager | undefined = $state(undefined);
 	onMount(() => {
-		dialogManager.hidePercent.subscribe((value) => {
-			hidePercent = value * 0.4;
-			isHidden = false;
-		});
+		getDialogManager()
+			.then(dm => {
+				dialogManager = dm;
+
+				dialogManager.currentMessage.subscribe((value) => {
+					currentMessage = value;
+				});
+
+				dialogManager.currentPortrait.subscribe((value) => {
+					if (value) {
+						currentPortrait = value;
+					}
+				});
+
+				dialogManager.hidePercent.subscribe((value) => {
+					hidePercent = value * 0.4;
+					isHidden = false;
+				});
+
+				dialogManager.currentReadableState.subscribe((value) => {
+					isHidden = value === DialogState.Invisible;
+				});
 
-		dialogManager.currentReadableState.subscribe((value) => {
-			isHidden = value === DialogState.Invisible;
-		});
+				dialogManager.update(0);
+			});
 
-		dialogManager.update(0);
 	});
 
 	const onDialogClick = () => {
-		dialogManager.skipAnimation();
+		dialogManager?.skipAnimation();
 	};
 
 </script>
@@ -89,9 +98,9 @@
     }
 
     .dialog-name {
-		    padding-top: 2rem;
-		    padding-left: 4rem;
-		    padding-right: 4rem;
+        padding-top: 2rem;
+        padding-left: 4rem;
+        padding-right: 4rem;
         position: fixed;
     }
 

package/dist/components/pineapple/PineappleBaseLayout.svelte

@@ -20,7 +20,7 @@
 	import Toast from "./toast/Toast.svelte";
 	import DialogOverlay from "../dialog_overlay/DialogOverlay.svelte";
 	import { fade } from "svelte/transition";
-	import { dialogManager } from "../dialog_manager/DialogMangerInit";
+	import { getDialogManager } from "../dialog_manager/DialogMangerInit";
 
 	interface Props {
 		showDialogByDefault?: boolean;
@@ -77,7 +77,7 @@
 
 <!--todo: turn off hidden when it's time-->
 <button class="fab" onclick={()=>{
-	dialogManager.toggleDialogOverlay()
+	getDialogManager().then(dm => dm.toggleDialogOverlay());
 }}>
 	{#if (enableDialogueOverlayValue)}
 		<img class="turnip-icon" src={CloseIcon} alt="interactive floating action button represented as a turnip">

package/dist/index.d.ts

@@ -11,4 +11,5 @@ export * from "./types/pineapple_fiber/DialogDetail";
 export * from "./util/util";
 export * from "./api/index";
 export * from "./template/seaweed/index";
-export { dialogManager } from "./components/dialog_manager/DialogMangerInit";
+export type { IDialogManager } from "./components/dialog_manager/IDialogManager";
+export { getDialogManager } from "./components/dialog_manager/DialogMangerInit";

package/dist/index.js

@@ -12,4 +12,4 @@ export * from "./types/pineapple_fiber/DialogDetail";
 export * from "./util/util";
 export * from "./api/index";
 export * from "./template/seaweed/index";
-export { dialogManager } from "./components/dialog_manager/DialogMangerInit";
+export { getDialogManager } from "./components/dialog_manager/DialogMangerInit";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@turnipxenon/pineapple",
   "description": "personal package for base styling for other personal projects",
-  "version": "3.0.0-alpha.11",
+  "version": "3.0.0-alpha.12",
   "scripts": {
     "dev": "vite dev",
     "build": "vite build && yarn package",
@@ -21,7 +21,6 @@
     "@eslint/compat": "^1.2.5",
     "@eslint/js": "^9.18.0",
     "@sveltejs/adapter-auto": "^4.0.0",
-    "@sveltejs/kit": "^2.5.27",
     "@sveltejs/package": "^2.3.7",
     "@sveltejs/vite-plugin-svelte": "^4.0.0",
     "eslint": "^9.18.0",
@@ -44,6 +43,7 @@
     "@prisma/client": "^5.12.1",
     "@skeletonlabs/skeleton": "^3.1.0",
     "@skeletonlabs/skeleton-svelte": "^1.0.0",
+    "@sveltejs/kit": "^2.5.27",
     "@sveltejs/vite-plugin-svelte": "^4.0.0",
     "@tailwindcss/vite": "^4.0.14",
     "@types/htmlparser2": "^3.10.7",