@turnipxenon/pineapple 4.5.0-alpha.5 → 4.5.1

package/dist/{paraglide/messages/example_message.d.ts → external/paraglide/messages/_index.d.ts}

@@ -3,3 +3,6 @@ export function example_message(inputs: {
 }, options?: {
     locale?: "en" | "fr" | "tl";
 }): string;
+export function settings(inputs?: {}, options?: {
+    locale?: "en" | "fr" | "tl";
+}): string;

package/dist/external/paraglide/messages/_index.js

@@ -0,0 +1,53 @@
+// eslint-disable
+import { getLocale, trackMessageCall, experimentalMiddlewareLocaleSplitting, isServer } from "../runtime.js"
+import * as en from "./en.js"
+import * as fr from "./fr.js"
+import * as tl from "./tl.js"
+/**
+* This function has been compiled by [Paraglide JS](https://inlang.com/m/gerre34r).
+*
+* - Changing this function will be over-written by the next build.
+*
+* - If you want to change the translations, you can either edit the source files e.g. `en.json`, or
+* use another inlang app like [Fink](https://inlang.com/m/tdozzpar) or the [VSCode extension Sherlock](https://inlang.com/m/r7kp499g).
+* 
+* @param {{ username: NonNullable<unknown> }} inputs
+* @param {{ locale?: "en" | "fr" | "tl" }} options
+* @returns {string}
+*/
+/* @__NO_SIDE_EFFECTS__ */
+export const example_message = (inputs, options = {}) => {
+	if (experimentalMiddlewareLocaleSplitting && isServer === false) {
+		return /** @type {any} */ (globalThis).__paraglide_ssr.example_message(inputs) 
+	}
+	const locale = options.locale ?? getLocale()
+	trackMessageCall("example_message", locale)
+	if (locale === "en") return en.example_message(inputs)
+	if (locale === "fr") return fr.example_message(inputs)
+	if (locale === "tl") return tl.example_message(inputs)
+	return "example_message"
+};
+/**
+* This function has been compiled by [Paraglide JS](https://inlang.com/m/gerre34r).
+*
+* - Changing this function will be over-written by the next build.
+*
+* - If you want to change the translations, you can either edit the source files e.g. `en.json`, or
+* use another inlang app like [Fink](https://inlang.com/m/tdozzpar) or the [VSCode extension Sherlock](https://inlang.com/m/r7kp499g).
+* 
+* @param {{}} inputs
+* @param {{ locale?: "en" | "fr" | "tl" }} options
+* @returns {string}
+*/
+/* @__NO_SIDE_EFFECTS__ */
+export const settings = (inputs = {}, options = {}) => {
+	if (experimentalMiddlewareLocaleSplitting && isServer === false) {
+		return /** @type {any} */ (globalThis).__paraglide_ssr.settings(inputs) 
+	}
+	const locale = options.locale ?? getLocale()
+	trackMessageCall("settings", locale)
+	if (locale === "en") return en.settings(inputs)
+	if (locale === "fr") return fr.settings(inputs)
+	if (locale === "tl") return tl.settings(inputs)
+	return "settings"
+};

package/dist/external/paraglide/messages/en.d.ts

@@ -0,0 +1,4 @@
+export const example_message: (inputs: {
+    username: NonNullable<unknown>;
+}) => string;
+export const settings: (inputs: {}) => string;

package/dist/external/paraglide/messages/en.js

@@ -0,0 +1,10 @@
+// eslint-disable
+
+
+export const example_message = /** @type {(inputs: { username: NonNullable<unknown> }) => string} */ (i) => {
+	return `Hello world ${i.username}`
+};
+
+export const settings = /** @type {(inputs: {}) => string} */ () => {
+	return `Settings`
+};

package/dist/external/paraglide/messages/fr.d.ts

@@ -0,0 +1,4 @@
+export const example_message: (inputs: {
+    username: NonNullable<unknown>;
+}) => string;
+export const settings: (inputs: {}) => string;

package/dist/external/paraglide/messages/fr.js

@@ -0,0 +1,10 @@
+// eslint-disable
+
+
+export const example_message = /** @type {(inputs: { username: NonNullable<unknown> }) => string} */ (i) => {
+	return `Bonjour ${i.username}`
+};
+
+export const settings = /** @type {(inputs: {}) => string} */ () => {
+	return `Paramètres`
+};

package/dist/external/paraglide/messages/tl.d.ts

@@ -0,0 +1,4 @@
+export const example_message: (inputs: {
+    username: NonNullable<unknown>;
+}) => string;
+export { settings } from "./en.js";

package/dist/external/paraglide/messages/tl.js

@@ -0,0 +1,7 @@
+// eslint-disable
+
+
+export const example_message = /** @type {(inputs: { username: NonNullable<unknown> }) => string} */ (i) => {
+	return `Kamusta ${i.username}`
+};
+export { settings } from "./en.js"

package/dist/{paraglide → external/paraglide}/runtime.d.ts

@@ -260,6 +260,8 @@ export const baseLocale: "en";
 export const locales: readonly ["en", "fr", "tl"];
 /** @type {string} */
 export const cookieName: string;
+/** @type {number} */
+export const cookieMaxAge: number;
 /** @type {string} */
 export const localStorageKey: string;
 /**
@@ -332,7 +334,7 @@ export const overwriteGetLocale: (fn: () => Locale) => void;
  *
  * Set locale reloads the site by default on the client. Reloading
  * can be disabled by passing \`reload: false\` as an option. If
- * reloading is disbaled, you need to ensure that the UI is updated
+ * reloading is disabled, you need to ensure that the UI is updated
  * to reflect the new locale.
  *
  * @example

package/dist/{paraglide → external/paraglide}/runtime.js

@@ -23,6 +23,8 @@ export const baseLocale = "en";
 export const locales = /** @type {const} */ (["en", "fr", "tl"]);
 /** @type {string} */
 export const cookieName = "PARAGLIDE_LOCALE";
+/** @type {number} */
+export const cookieMaxAge = 34560000;
 /** @type {string} */
 export const localStorageKey = "PARAGLIDE_LOCALE";
 /**
@@ -143,7 +145,10 @@ export let getLocale = () => {
         else if (strat === "baseLocale") {
             locale = baseLocale;
         }
-        else if (TREE_SHAKE_URL_STRATEGY_USED && strat === "url" && !isServer) {
+        else if (TREE_SHAKE_URL_STRATEGY_USED &&
+            strat === "url" &&
+            !isServer &&
+            typeof window !== "undefined") {
             locale = extractLocaleFromUrl(window.location.href);
         }
         else if (TREE_SHAKE_GLOBAL_VARIABLE_STRATEGY_USED &&
@@ -215,14 +220,14 @@ function negotiatePreferredLanguageFromNavigator() {
  */
 export const overwriteGetLocale = (fn) => {
     getLocale = fn;
-}; 
+};
 
 /**
  * Set the locale.
  *
  * Set locale reloads the site by default on the client. Reloading
  * can be disabled by passing \`reload: false\` as an option. If
- * reloading is disbaled, you need to ensure that the UI is updated
+ * reloading is disabled, you need to ensure that the UI is updated
  * to reflect the new locale.
  *
  * @example
@@ -257,11 +262,11 @@ export let setLocale = (newLocale, options) => {
             _locale = newLocale;
         }
         else if (TREE_SHAKE_COOKIE_STRATEGY_USED && strat === "cookie") {
-            if (isServer) {
+            if (isServer || typeof document === "undefined") {
                 continue;
             }
             // set the cookie
-            document.cookie = `${cookieName}=${newLocale}; path=/`;
+            document.cookie = `${cookieName}=${newLocale}; path=/; max-age=${cookieMaxAge}`;
         }
         else if (strat === "baseLocale") {
             // nothing to be set here. baseLocale is only a fallback
@@ -409,11 +414,7 @@ export const extractLocaleFromRequest = (request) => {
                 .find((c) => c.startsWith(cookieName + "="))
                 ?.split("=")[1];
         }
-        else if (TREE_SHAKE_URL_STRATEGY_USED &&
-            strat === "url" &&
-            // only process url strategy if request is a document
-            // else it's api requests, etc.
-            request.headers.get("Sec-Fetch-Dest") === "document") {
+        else if (TREE_SHAKE_URL_STRATEGY_USED && strat === "url") {
             locale = extractLocaleFromUrl(request.url);
         }
         else if (TREE_SHAKE_PREFERRED_LANGUAGE_STRATEGY_USED &&
@@ -783,8 +784,15 @@ function fillMissingUrlParts(url, match) {
  * @returns {URL} - The constructed URL with named groups filled.
  */
 function fillPattern(pattern, values, origin) {
+    // Pre-process the pattern to handle explicit port numbers
+    // This detects patterns like "http://localhost:5173" and protects the port number
+    // from being interpreted as a parameter
+    let processedPattern = pattern.replace(/(https?:\/\/[^:/]+):(\d+)(\/|$)/g, (_, protocol, port, slash) => {
+        // Replace ":5173" with "#PORT-5173#" to protect it from parameter replacement
+        return `${protocol}#PORT-${port}#${slash}`;
+    });
     // First, handle group delimiters with curly braces
-    let processedGroupDelimiters = pattern.replace(/\{([^{}]*)\}([?+*]?)/g, (_, content, modifier) => {
+    let processedGroupDelimiters = processedPattern.replace(/\{([^{}]*)\}([?+*]?)/g, (_, content, modifier) => {
         // For optional group delimiters
         if (modifier === "?") {
             // For optional groups, we'll include the content
@@ -794,7 +802,7 @@ function fillPattern(pattern, values, origin) {
         return content;
     });
     // Then handle named groups
-    const filled = processedGroupDelimiters.replace(/(\/?):([a-zA-Z0-9_]+)(\([^)]*\))?([?+*]?)/g, (_, slash, name, __, modifier) => {
+    let filled = processedGroupDelimiters.replace(/(\/?):([a-zA-Z0-9_]+)(\([^)]*\))?([?+*]?)/g, (_, slash, name, __, modifier) => {
         const value = values[name];
         if (value === null) {
             // If value is null, remove the entire segment including the preceding slash
@@ -817,6 +825,8 @@ function fillPattern(pattern, values, origin) {
         }
         return `${slash}${value}`;
     });
+    // Restore port numbers
+    filled = filled.replace(/#PORT-(\d+)#/g, ":$1");
     return new URL(filled, origin);
 }
 /**

package/dist/{paraglide → external/paraglide}/server.d.ts

@@ -4,12 +4,13 @@
  * This middleware performs several key functions:
  *
  * 1. Determines the locale for the incoming request using configured strategies
- * 2. Handles URL localization and redirects
+ * 2. Handles URL localization and redirects (only for document requests)
  * 3. Maintains locale state using AsyncLocalStorage to prevent request interference
  *
  * When URL strategy is used:
  *
- * - If URL doesn't match the determined locale, redirects to localized URL
+ * - The locale is extracted from the URL for all request types
+ * - If URL doesn't match the determined locale, redirects to localized URL (only for document requests)
  * - De-localizes URLs before passing to server (e.g., `/fr/about` → `/about`)
  *
  * @template T - The return type of the resolve function

package/dist/{paraglide → external/paraglide}/server.js

@@ -8,12 +8,13 @@ import * as runtime from "./runtime.js";
  * This middleware performs several key functions:
  *
  * 1. Determines the locale for the incoming request using configured strategies
- * 2. Handles URL localization and redirects
+ * 2. Handles URL localization and redirects (only for document requests)
  * 3. Maintains locale state using AsyncLocalStorage to prevent request interference
  *
  * When URL strategy is used:
  *
- * - If URL doesn't match the determined locale, redirects to localized URL
+ * - The locale is extracted from the URL for all request types
+ * - If URL doesn't match the determined locale, redirects to localized URL (only for document requests)
  * - De-localizes URLs before passing to server (e.g., `/fr/about` → `/about`)
  *
  * @template T - The return type of the resolve function
@@ -77,7 +78,7 @@ export async function paraglideMiddleware(request, resolve) {
     if (request.headers.get("Sec-Fetch-Dest") === "document" &&
         runtime.strategy.includes("url")) {
         const localizedUrl = runtime.localizeUrl(request.url, { locale });
-        if (localizedUrl.href !== request.url) {
+        if (normalizeURL(localizedUrl.href) !== normalizeURL(request.url)) {
             return Response.redirect(localizedUrl, 307);
         }
     }
@@ -123,6 +124,18 @@ export async function paraglideMiddleware(request, resolve) {
     }
     return response;
 }
+/**
+ * Normalize url for comparison.
+ * Strips trailing slash
+ * @param {string} url
+ * @returns {string} normalized url string
+ */
+function normalizeURL(url) {
+    const urlObj = new URL(url);
+    // // strip trailing slash from pathname
+    urlObj.pathname = urlObj.pathname.replace(/\/$/, "");
+    return urlObj.href;
+}
 /**
  * Creates a mock AsyncLocalStorage implementation for environments where
  * native AsyncLocalStorage is not available or disabled.

package/dist/ui/elements/pinya-combobox/PinyaCombobox.svelte

@@ -1,10 +1,9 @@
 <script lang="ts" generics="T extends string">
-	import { Combobox } from '@skeletonlabs/skeleton-svelte';
-	import { getLocale, localizeHref } from '../../../paraglide/runtime';
 	import type { PinyaComboboxProps, ValueChangeDetails } from "./PinyaComboboxProps";
+	import { Combobox } from "@skeletonlabs/skeleton-svelte";
 
 	let {
-		contentZIndex = 'auto',
+		contentZIndex = "auto",
 		value = $bindable(),
 		onValueChange = () => {},
 		onValueChangeBase = undefined,
@@ -32,4 +31,4 @@
 	onValueChange={onValueChangeBase ?? onValueChangeBaseImpl}
 	{value}
 	{...props}
-/>
+/>

package/dist/ui/modules/NavigationMenu/NavigationMenu.svelte

@@ -8,7 +8,7 @@
 		type ParsePageMetaCompareFn
 	} from "./PageMeta";
 	import { PinyaCard } from "../../elements/index";
-	import { localizeHref } from "../../../paraglide/runtime.js";
+	import { localizeHref } from "../../../external/paraglide/runtime.js";
 
 	interface Props {
 		fileList: Record<string, unknown>;

package/dist/ui/modules/modals/general-settings/GeneralSettingsModal.svelte

@@ -2,7 +2,7 @@
 	import type { ModalProps } from 'svelte-modals';
 	import { setMode, userPrefersMode } from 'mode-watcher';
 
-	import { m } from '../../../../paraglide/messages';
+	import { m } from '../../../../external/paraglide/messages';
 	import ModalBase from '../../../components/ModalBase.svelte';
 	import DarkIcon from '../../../../assets/icons/icon-dark-mode.svg';
 	import LightIcon from '../../../../assets/icons/icon-light-mode.svg';
@@ -107,4 +107,4 @@
         text-align: start;
         gap: 1lh;
     }
-</style>
+</style>

package/dist/ui/modules/modals/general-settings/LanguagePicker.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { deLocalizeHref, getLocale, localizeHref } from "../../../../paraglide/runtime";
+	import { deLocalizeHref, getLocale, localizeHref } from "../../../../external/paraglide/runtime";
 	import PinyaCombobox from "../../../elements/pinya-combobox/PinyaCombobox.svelte";
 	import { appState } from "../../../templates/PinyaPageLayout/runes.svelte";
 
@@ -40,4 +40,4 @@
 	placeholder="Select Language"
 	{onValueChange}
 	{disabled}
-/>
+/>

package/dist/ui/modules/projects/Soulwork.svelte

@@ -24,7 +24,7 @@
 		{/snippet}
 
 		{#snippet header()}
-			<h1>Soulwork</h1>
+			<h3>Soulwork</h3>
 		{/snippet}
 
 		<p>
@@ -54,4 +54,4 @@
 			</PinyaButton>
 		</section>
 	</FourPartCard>
-{/snippet}
+{/snippet}

package/dist/ui/modules/projects/ThisWebpage.svelte

@@ -29,7 +29,7 @@
 		{/snippet}
 
 		{#snippet header()}
-			<h2>This webpage!</h2>
+			<h3>This webpage!</h3>
 		{/snippet}
 
 		<p>
@@ -62,4 +62,4 @@
 			</PinyaButton>
 		</section>
 	</FourPartCard>
-{/snippet}
+{/snippet}

package/dist/ui/templates/PinyaBase.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { page } from "$app/state";
-	import { locales, localizeHref } from "../../paraglide/runtime";
+	import { locales, localizeHref } from "../../external/paraglide/runtime";
 	import "../../styles/global.css";
 	import WebThumbnailImage from "../../assets/placeholder/placeholder_circle.png";
 	import type { PinyaHead } from "./runes.svelte";

package/dist/ui/templates/PinyaPageLayout/PinyaPageLayout.svelte

@@ -1,8 +1,8 @@
 <script lang="ts">
 	import type { Snippet } from "svelte";
 	import { modals } from "svelte-modals";
-	import { m } from "../../../paraglide/messages";
-	import { localizeHref } from "../../../paraglide/runtime";
+	import { m } from "../../../external/paraglide/messages";
+	import { localizeHref } from "../../../external/paraglide/runtime";
 
 	import AresLogo from "../../../assets/characters/ares/ares_logo.webp";
 	import SettingsLogo from "../../../assets/icons/icon-settings.svg";
@@ -121,4 +121,4 @@
         width: 100%;
         height: calc(var(--dialog-box-height) + 3.5lh);
     }
-</style>
+</style>

package/package.json

@@ -1,7 +1,24 @@
 {
   "name": "@turnipxenon/pineapple",
   "description": "personal package for base styling for other personal projects",
-  "version": "4.5.0-alpha.5",
+  "version": "4.5.1",
+  "scripts": {
+    "dev": "vite dev",
+    "build": "vite build",
+    "package": "svelte-kit sync && svelte-package && publint",
+    "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
+    "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
+    "lint": "eslint .",
+    "format": "prettier --plugin-search-dir . --write .",
+    "generate": "npx vite-node src/routes/blogs/blog_list_data_generator.ts && npx vite-node src/routes/toyay/toya_files_generator.ts && npm run generate-yarn",
+    "generate-yarn": "npx vite-node src/lib/scripts/pineapple_fiber/PineappleWeaver.ts",
+    "custom-check": "npx vite-node src/lib/scripts/util/ManualCheckRun.ts",
+    "preview": "pnpm run build && wrangler dev",
+    "prepublishOnly": "pnpm package",
+    "prepare": "husky",
+    "deploy": "pnpm run build && wrangler deploy",
+    "cf-typegen": "wrangler types ./src/worker-configuration.d.ts"
+  },
   "devDependencies": {
     "@commitlint/cli": "^19.8.0",
     "@commitlint/config-conventional": "^19.8.0",
@@ -88,20 +105,5 @@
   "license": "MIT",
   "svelte": "./dist/index.js",
   "types": "./dist/index.d.ts",
-  "type": "module",
-  "scripts": {
-    "dev": "vite dev",
-    "build": "vite build",
-    "package": "svelte-kit sync && svelte-package && publint",
-    "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
-    "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
-    "lint": "eslint .",
-    "format": "prettier --plugin-search-dir . --write .",
-    "generate": "npx vite-node src/routes/blogs/blog_list_data_generator.ts && npx vite-node src/routes/toyay/toya_files_generator.ts && npm run generate-yarn",
-    "generate-yarn": "npx vite-node src/lib/scripts/pineapple_fiber/PineappleWeaver.ts",
-    "custom-check": "npx vite-node src/lib/scripts/util/ManualCheckRun.ts",
-    "preview": "pnpm run build && wrangler dev",
-    "deploy": "pnpm run build && wrangler deploy",
-    "cf-typegen": "wrangler types ./src/worker-configuration.d.ts"
-  }
-}
+  "type": "module"
+}

package/dist/paraglide/messages/_index.d.ts

@@ -1,2 +0,0 @@
-export * from "./example_message.js";
-export * from "./settings.js";

package/dist/paraglide/messages/_index.js

@@ -1,3 +0,0 @@
-// eslint-disable
-export * from './example_message.js'
-export * from './settings.js'

package/dist/paraglide/messages/example_message.js

@@ -1,39 +0,0 @@
-// eslint-disable
-import { getLocale, trackMessageCall, experimentalMiddlewareLocaleSplitting, isServer } from '../runtime.js';
-
-const en_example_message = /** @type {(inputs: { username: NonNullable<unknown> }) => string} */ (i) => {
-	return `Hello world ${i.username}`
-};
-
-const fr_example_message = /** @type {(inputs: { username: NonNullable<unknown> }) => string} */ (i) => {
-	return `Bonjour ${i.username}`
-};
-
-const tl_example_message = /** @type {(inputs: { username: NonNullable<unknown> }) => string} */ (i) => {
-	return `Kamusta ${i.username}`
-};
-
-/**
-* This function has been compiled by [Paraglide JS](https://inlang.com/m/gerre34r).
-*
-* - Changing this function will be over-written by the next build.
-*
-* - If you want to change the translations, you can either edit the source files e.g. `en.json`, or
-* use another inlang app like [Fink](https://inlang.com/m/tdozzpar) or the [VSCode extension Sherlock](https://inlang.com/m/r7kp499g).
-* 
-* @param {{ username: NonNullable<unknown> }} inputs
-* @param {{ locale?: "en" | "fr" | "tl" }} options
-* @returns {string}
-*/
-/* @__NO_SIDE_EFFECTS__ */
-export const example_message = (inputs, options = {}) => {
-	if (experimentalMiddlewareLocaleSplitting && isServer === false) {
-		return /** @type {any} */ (globalThis).__paraglide_ssr.example_message(inputs) 
-	}
-	const locale = options.locale ?? getLocale()
-	trackMessageCall("example_message", locale)
-	if (locale === "en") return en_example_message(inputs)
-	if (locale === "fr") return fr_example_message(inputs)
-	if (locale === "tl") return tl_example_message(inputs)
-	return "example_message"
-};

package/dist/paraglide/messages/settings.d.ts

@@ -1,3 +0,0 @@
-export function settings(inputs?: {}, options?: {
-    locale?: "en" | "fr" | "tl";
-}): string;

package/dist/paraglide/messages/settings.js

@@ -1,38 +0,0 @@
-// eslint-disable
-import { getLocale, trackMessageCall, experimentalMiddlewareLocaleSplitting, isServer } from '../runtime.js';
-
-const en_settings = /** @type {(inputs: {}) => string} */ () => {
-	return `Settings`
-};
-
-const fr_settings = /** @type {(inputs: {}) => string} */ () => {
-	return `Paramètres`
-};
-
-/** @type {(inputs: {}) => string} */
-const tl_settings = en_settings;
-
-/**
-* This function has been compiled by [Paraglide JS](https://inlang.com/m/gerre34r).
-*
-* - Changing this function will be over-written by the next build.
-*
-* - If you want to change the translations, you can either edit the source files e.g. `en.json`, or
-* use another inlang app like [Fink](https://inlang.com/m/tdozzpar) or the [VSCode extension Sherlock](https://inlang.com/m/r7kp499g).
-* 
-* @param {{}} inputs
-* @param {{ locale?: "en" | "fr" | "tl" }} options
-* @returns {string}
-*/
-/* @__NO_SIDE_EFFECTS__ */
-export const settings = (inputs = {}, options = {}) => {
-	if (experimentalMiddlewareLocaleSplitting && isServer === false) {
-		return /** @type {any} */ (globalThis).__paraglide_ssr.settings(inputs) 
-	}
-	const locale = options.locale ?? getLocale()
-	trackMessageCall("settings", locale)
-	if (locale === "en") return en_settings(inputs)
-	if (locale === "fr") return fr_settings(inputs)
-	if (locale === "tl") return tl_settings(inputs)
-	return "settings"
-};