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

package/dist/components/blog_template/BlogTemplate.svelte

@@ -5,7 +5,7 @@
 	import BlogTemplateInner from "./BlogTemplateInner.svelte";
 	import type { SimplePageMeta } from "../navigation_component/index";
 	import { enableDialogueOverlay } from "../dialog_manager/DialogManagerStore";
-	import { Card } from "../index";
+	import { default as Card } from "../Card.svelte";
 
 	// grab page meta from the adjacent meta.json
 	interface Props {

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

@@ -4,9 +4,8 @@
 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 implements IDialogManager {
+export declare class DialogManager {
     dialogMessageMap: Map<string, DialogDetail>;
     currentDialogTree: DialogDetail[];
     fullCurrentMessage: string;

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

@@ -1,2 +1,15 @@
-import type { IDialogManager } from "./IDialogManager";
-export declare const getDialogManager: () => Promise<IDialogManager>;
+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;

package/dist/components/dialog_manager/DialogMangerInit.js

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

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

@@ -2,10 +2,7 @@ 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,22 +1,10 @@
 import { BehaviorStatus } from "../../core/BehaviorStatus";
 import { SetVariableNode } from "../SetVariableNode";
 import { btreeUtils } from "../../core/BTreeUtils";
-import { getDialogManager } from "../../../DialogMangerInit";
+import { dialogManager } 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: "",
@@ -35,10 +23,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 = this.dialogManager.dialogMessageMap.get(btreeUtils.simplifyToken(choiceName));
+        const dialogChoice = dialogManager.dialogMessageMap.get(btreeUtils.simplifyToken(choiceName));
         if (dialogChoice !== undefined) {
             // force choice
-            this.dialogManager.setDialogChoice(dialogChoice);
+            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,46 +2,37 @@
 	import AresHappy from "../../assets/characters/ares/ares_happy.webp";
 	import { onMount } from "svelte";
 	import { DialogState } from "../../types/pineapple_fiber/DialogState";
-	import { getDialogManager } from "../dialog_manager/DialogMangerInit";
-	import type { IDialogManager } from "../dialog_manager/IDialogManager";
+	import { dialogManager } from "../dialog_manager/DialogMangerInit";
 
 	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(() => {
-		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.hidePercent.subscribe((value) => {
+			hidePercent = value * 0.4;
+			isHidden = false;
+		});
 
-				dialogManager.update(0);
-			});
+		dialogManager.currentReadableState.subscribe((value) => {
+			isHidden = value === DialogState.Invisible;
+		});
 
+		dialogManager.update(0);
 	});
 
 	const onDialogClick = () => {
-		dialogManager?.skipAnimation();
+		dialogManager.skipAnimation();
 	};
 
 </script>
@@ -98,9 +89,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 { getDialogManager } from "../dialog_manager/DialogMangerInit";
+	import { dialogManager } from "../dialog_manager/DialogMangerInit";
 
 	interface Props {
 		showDialogByDefault?: boolean;
@@ -77,7 +77,7 @@
 
 <!--todo: turn off hidden when it's time-->
 <button class="fab" onclick={()=>{
-	getDialogManager().then(dm => dm.toggleDialogOverlay());
+	dialogManager.toggleDialogOverlay()
 }}>
 	{#if (enableDialogueOverlayValue)}
 		<img class="turnip-icon" src={CloseIcon} alt="interactive floating action button represented as a turnip">

package/dist/index.d.ts

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

package/dist/ui/components/SocialSection.svelte

@@ -5,8 +5,9 @@
 	import MailIcon from "../../assets/icons/mail.svg";
 	import GithubIcon from "../../assets/icons/github-mark.svg";
 	import LinkedinIcon from "../../assets/icons/linkedin.svg";
-	import { ButtonVariant, ImageIcon, PinyaButton } from "../elements/index";
 	import { ItchLogoHotLink } from "../../consts";
+	import { ButtonVariant, PinyaButton } from "../elements/pinya-button/index";
+	import ImageIcon from "../elements/ImageIcon.svelte";
 
 	/** @type {{isSmallVersion?: boolean, email?: string, linkedinSlug?: string, isSlot?: boolean, allowLinkedIn?: boolean}} */
 	let {

package/dist/ui/elements/pinya-button/component.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
-	import { ColorScheme } from '..';
 	import { ButtonVariant, type PinyaButtonProps } from './props';
+	import { ColorScheme } from "../ColorScheme";
 
 	let {
 		children,

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.12",
+  "version": "3.0.0-alpha.14",
   "scripts": {
     "dev": "vite dev",
     "build": "vite build && yarn package",
@@ -27,6 +27,7 @@
     "eslint-config-prettier": "^10.0.1",
     "eslint-plugin-svelte": "^3.0.0",
     "globals": "^16.0.0",
+    "madge": "^8.0.0",
     "prettier": "^3.4.2",
     "prettier-plugin-svelte": "^3.3.3",
     "prettier-plugin-tailwindcss": "^0.6.11",

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

@@ -1,39 +0,0 @@
-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

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