@turnipxenon/pineapple 2.4.35 → 2.4.37

package/.idea/workspace.xml

@@ -4,9 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="accb6ba2-c343-4f84-ad30-6e2d71eceee5" name="Changes" comment="Add default sorter for NavigationComponent">
-      <change beforePath="$PROJECT_DIR$/src/lib/components/navigation_component/NavigationComponent.svelte" beforeDir="false" afterPath="$PROJECT_DIR$/src/lib/components/navigation_component/NavigationComponent.svelte" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/routes/(pineapple)/pineapple/(extra-pages)/page1/meta.json" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/(pineapple)/pineapple/(extra-pages)/page1/meta.json" afterDir="false" />
+    <list default="true" id="accb6ba2-c343-4f84-ad30-6e2d71eceee5" name="Changes" comment="Fix default page sorting">
+      <change beforePath="$PROJECT_DIR$/src/lib/components/navigation_component/PageMeta.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/lib/components/navigation_component/PageMeta.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/routes/(pineapple)/pineapple/+page.svelte" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/(pineapple)/pineapple/(pineapple)/+page.svelte" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/routes/(pineapple)/pineapple/+page.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/(pineapple)/pineapple/(pineapple)/+page.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/routes/(pineapple)/pineapple/TestDialog.yarn" beforeDir="false" afterPath="$PROJECT_DIR$/src/routes/(pineapple)/pineapple/(pineapple)/TestDialog.yarn" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -93,7 +95,7 @@
     &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
     &quot;git-widget-placeholder&quot;: &quot;turnip/navigation&quot;,
     &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;C:/Users/Pumpkin/Projects/Web/pineapple/src/routes/(pineapple)/pineapple/(extra-pages)/page2&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/Users/Pumpkin/Projects/Web/pineapple/src/routes/(pineapple)/pineapple/(extra-pages)/page3/page7/(test_layout)/page8&quot;,
     &quot;list.type.of.created.stylesheet&quot;: &quot;CSS&quot;,
     &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
     &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
@@ -114,18 +116,18 @@
 }</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\Pumpkin\Projects\Web\pineapple\src\routes\(pineapple)\pineapple\(extra-pages)\page3\page7\(test_layout)\page8" />
+      <recent name="C:\Users\Pumpkin\Projects\Web\pineapple\src\routes\(pineapple)\pineapple\(extra-pages)\page3\page5" />
       <recent name="C:\Users\Pumpkin\Projects\Web\pineapple\src\routes\(pineapple)\pineapple\(extra-pages)\page2" />
       <recent name="C:\Users\Pumpkin\Projects\Web\pineapple\src\lib\components\navigation_component" />
       <recent name="C:\Users\Pumpkin\Projects\Web\pineapple\src\routes\(pineapple)\pineapple\page3\page7\(test_layout)\page8" />
-      <recent name="C:\Users\Pumpkin\Projects\Web\pineapple\src\routes\(pineapple)\pineapple\page3\page7" />
-      <recent name="C:\Users\Pumpkin\Projects\Web\pineapple\src\routes\(pineapple)\pineapple\page3" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="C:\Users\Pumpkin\Projects\Web\pineapple\src\routes\(pineapple)\pineapple\(nested)" />
+      <recent name="C:\Users\Pumpkin\Projects\Web\pineapple\src\routes\(pineapple)\pineapple\(extra-pages)" />
       <recent name="C:\Users\Pumpkin\Projects\Web\pineapple\src\routes\(pineapple)\pineapple\(extra-pages)\page1" />
       <recent name="C:\Users\Pumpkin\Projects\Web\pineapple\src\routes\(pineapple)\pineapple\(extra-pages)\page2" />
       <recent name="C:\Users\Pumpkin\Projects\Web\pineapple\src\routes\(pineapple)\pineapple\(extra-pages)\page3" />
-      <recent name="C:\Users\Pumpkin\Projects\Web\pineapple\src\routes\(pineapple)\pineapple\(extra-pages)" />
-      <recent name="C:\Users\Pumpkin\Projects\Web\pineapple\src\routes\(pineapple)\pineapple\page3\page7\(test_layout)" />
     </key>
     <key name="es6.move.members.recent.items">
       <recent name="C:\Users\Pumpkin\Projects\Web\pineapple\src\routes\types\RootLayoutProps.ts" />
@@ -247,23 +249,12 @@
       <workItem from="1711492999560" duration="85000" />
       <workItem from="1711493260312" duration="1518000" />
       <workItem from="1711494820779" duration="11000" />
-      <workItem from="1711495822479" duration="2498000" />
-    </task>
-    <task id="LOCAL-00063" summary="Add animation to dynamically added button in social section">
-      <option name="closed" value="true" />
-      <created>1710403640565</created>
-      <option name="number" value="00063" />
-      <option name="presentableId" value="LOCAL-00063" />
-      <option name="project" value="LOCAL" />
-      <updated>1710403640566</updated>
-    </task>
-    <task id="LOCAL-00064" summary="Implement normal state for PineappleBaseLayout">
-      <option name="closed" value="true" />
-      <created>1710473020513</created>
-      <option name="number" value="00064" />
-      <option name="presentableId" value="LOCAL-00064" />
-      <option name="project" value="LOCAL" />
-      <updated>1710473020514</updated>
+      <workItem from="1711495822479" duration="2695000" />
+      <workItem from="1711499095557" duration="919000" />
+      <workItem from="1711501054028" duration="138000" />
+      <workItem from="1711501365165" duration="661000" />
+      <workItem from="1711503193901" duration="146000" />
+      <workItem from="1711587392130" duration="266000" />
     </task>
     <task id="LOCAL-00065" summary="Add custom toast">
       <option name="closed" value="true" />
@@ -641,7 +632,23 @@
       <option name="project" value="LOCAL" />
       <updated>1711494655396</updated>
     </task>
-    <option name="localTasksCounter" value="112" />
+    <task id="LOCAL-00112" summary="Fix NavigationComponent styling">
+      <option name="closed" value="true" />
+      <created>1711498416272</created>
+      <option name="number" value="00112" />
+      <option name="presentableId" value="LOCAL-00112" />
+      <option name="project" value="LOCAL" />
+      <updated>1711498416272</updated>
+    </task>
+    <task id="LOCAL-00113" summary="Fix default page sorting">
+      <option name="closed" value="true" />
+      <created>1711499848251</created>
+      <option name="number" value="00113" />
+      <option name="presentableId" value="LOCAL-00113" />
+      <option name="project" value="LOCAL" />
+      <updated>1711499848251</updated>
+    </task>
+    <option name="localTasksCounter" value="114" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -699,8 +706,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Refactor Game Section to separate component" />
-    <MESSAGE value="Refactor GameSection out of SeaweedTemplate" />
     <MESSAGE value="Remove unnecessary imports and variables in SeaweedTemplate" />
     <MESSAGE value="Add page query param creator" />
     <MESSAGE value="Hide advanced settings when letChaos is true" />
@@ -724,6 +729,8 @@
     <MESSAGE value="Add a way to hide an entry in NavigationComponent" />
     <MESSAGE value="Migrate from relying on json instead of comments for meta" />
     <MESSAGE value="Add default sorter for NavigationComponent" />
-    <option name="LAST_COMMIT_MESSAGE" value="Add default sorter for NavigationComponent" />
+    <MESSAGE value="Fix NavigationComponent styling" />
+    <MESSAGE value="Fix default page sorting" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fix default page sorting" />
   </component>
 </project>

package/.svelte-kit/__package__/components/navigation_component/PageMeta.d.ts

@@ -49,7 +49,7 @@ export declare const findPageMetaParent: (parentList: PageMeta[], child: PageMet
 export type ParsePageMetaCompareFn = ((a: PageMeta, b: PageMeta) => number);
 export declare const parsePageMeta: (fileList: Record<string, unknown>, jsonList: Record<string, unknown>, imageMap: Map<string, string>, compareFn?: ParsePageMetaCompareFn) => PageMeta[];
 /**
- * Prioritizes, in order, lastUpdated, datePublished, has description, then title
+ * Prioritizes, in order, recently lastUpdated or datePublished, has description, then title
  *
  * @param a
  * @param b

package/.svelte-kit/__package__/components/navigation_component/PageMeta.js

@@ -24,10 +24,9 @@ export const parsePageMeta = (fileList, jsonList, imageMap, compareFn) => {
     // let pageGroupedList: PageMeta[] = [];
     const jsonMap = new Map();
     Object.keys(jsonList).forEach(path => {
-        const pathParts = path.split("/");
+        const pathEnd = path.split("../").pop();
+        const pathParts = pathEnd.split("/");
         pathParts.pop();
-        // get title
-        // const title = pathParts[pathParts.length - 1].replaceAll("-", " ");
         // get url path
         const subPath = pathParts.filter(s => {
             return s !== "." && s.indexOf("(") !== 0;
@@ -40,7 +39,8 @@ export const parsePageMeta = (fileList, jsonList, imageMap, compareFn) => {
         }
     });
     for (const path in fileList) {
-        const pathParts = path.split("/");
+        const pathEnd = path.split("../").pop();
+        const pathParts = pathEnd.split("/");
         pathParts.pop();
         // get title
         const title = pathParts[pathParts.length - 1].replaceAll("-", " ");
@@ -100,30 +100,24 @@ export const parsePageMeta = (fileList, jsonList, imageMap, compareFn) => {
 const AWins = -1;
 const BWins = 1;
 /**
- * Prioritizes, in order, lastUpdated, datePublished, has description, then title
+ * Prioritizes, in order, recently lastUpdated or datePublished, has description, then title
  *
  * @param a
  * @param b
  * @constructor
  */
 export const DefaultPageMetaSorter = (a, b) => {
-    if (a.lastUpdated && !b.lastUpdated) {
-        return AWins;
-    }
-    else if (!a.lastUpdated && b.lastUpdated) {
-        return BWins;
-    }
-    else if (a.lastUpdated && b.lastUpdated) {
-        return a.lastUpdated.localeCompare(b.lastUpdated);
-    }
-    if (a.datePublished && !b.datePublished) {
+    const aDate = a.lastUpdated || a.datePublished;
+    const bDate = b.lastUpdated || b.datePublished;
+    if (aDate && !bDate) {
         return AWins;
     }
-    else if (!a.lastUpdated && b.datePublished) {
+    else if (!aDate && bDate) {
         return BWins;
     }
-    else if (a.datePublished && b.datePublished) {
-        return a.datePublished.localeCompare(b.datePublished);
+    else if (aDate && bDate) {
+        // we invert the value because we want the dates to be in descending order
+        return -aDate.localeCompare(bDate);
     }
     if (a.description && !b.description) {
         return AWins;

package/.svelte-kit/ambient.d.ts

@@ -46,6 +46,7 @@ declare module '$env/static/private' {
 	export const HOMEDRIVE: string;
 	export const HOMEPATH: string;
 	export const IDEA_INITIAL_DIRECTORY: string;
+	export const IJ_RESTARTER_LOG: string;
 	export const INIT_CWD: string;
 	export const JAVA_HOME: string;
 	export const LOCALAPPDATA: string;
@@ -239,6 +240,7 @@ declare module '$env/dynamic/private' {
 		HOMEDRIVE: string;
 		HOMEPATH: string;
 		IDEA_INITIAL_DIRECTORY: string;
+		IJ_RESTARTER_LOG: string;
 		INIT_CWD: string;
 		JAVA_HOME: string;
 		LOCALAPPDATA: string;

package/.svelte-kit/generated/client/app.js

@@ -23,15 +23,15 @@ export const server_loads = [];
 
 export const dictionary = {
 		"/(pineapple)": [4,[2]],
-		"/(pineapple)/pineapple": [5,[2]],
-		"/(pineapple)/pineapple/(extra-pages)/page1": [6,[2]],
-		"/(pineapple)/pineapple/(extra-pages)/page2": [7,[2]],
-		"/(pineapple)/pineapple/(extra-pages)/page3": [8,[2]],
-		"/(pineapple)/pineapple/(extra-pages)/page3/page5": [9,[2]],
-		"/(pineapple)/pineapple/(extra-pages)/page3/page6": [10,[2]],
-		"/(pineapple)/pineapple/(extra-pages)/page3/page7": [11,[2]],
-		"/(pineapple)/pineapple/(extra-pages)/page3/page7/(test_layout)/page8": [12,[2]],
-		"/(pineapple)/pineapple/(extra-pages)/page4": [13,[2]],
+		"/(pineapple)/pineapple/(pineapple)": [13,[2]],
+		"/(pineapple)/pineapple/(extra-pages)/page1": [5,[2]],
+		"/(pineapple)/pineapple/(extra-pages)/page2": [6,[2]],
+		"/(pineapple)/pineapple/(extra-pages)/page3": [7,[2]],
+		"/(pineapple)/pineapple/(extra-pages)/page3/page5": [8,[2]],
+		"/(pineapple)/pineapple/(extra-pages)/page3/page6": [9,[2]],
+		"/(pineapple)/pineapple/(extra-pages)/page3/page7": [10,[2]],
+		"/(pineapple)/pineapple/(extra-pages)/page3/page7/(test_layout)/page8": [11,[2]],
+		"/(pineapple)/pineapple/(extra-pages)/page4": [12,[2]],
 		"/(seaweed)/portfolio": [~14,[3]],
 		"/(seaweed)/portfolio/actual": [15,[3]]
 	};

package/.svelte-kit/generated/client/nodes/10.js

@@ -1 +1 @@
-export { default as component } from "../../../../src/routes/(pineapple)/pineapple/(extra-pages)/page3/page6/+page.svelte";
+export { default as component } from "../../../../src/routes/(pineapple)/pineapple/(extra-pages)/page3/page7/+page.svelte";

package/.svelte-kit/generated/client/nodes/11.js

@@ -1 +1 @@
-export { default as component } from "../../../../src/routes/(pineapple)/pineapple/(extra-pages)/page3/page7/+page.svelte";
+export { default as component } from "../../../../src/routes/(pineapple)/pineapple/(extra-pages)/page3/page7/(test_layout)/page8/+page.svelte";

package/.svelte-kit/generated/client/nodes/12.js

@@ -1 +1 @@
-export { default as component } from "../../../../src/routes/(pineapple)/pineapple/(extra-pages)/page3/page7/(test_layout)/page8/+page.svelte";
+export { default as component } from "../../../../src/routes/(pineapple)/pineapple/(extra-pages)/page4/+page.svelte";

package/.svelte-kit/generated/client/nodes/13.js

@@ -1 +1,3 @@
-export { default as component } from "../../../../src/routes/(pineapple)/pineapple/(extra-pages)/page4/+page.svelte";
+import * as universal from "../../../../src/routes/(pineapple)/pineapple/(pineapple)/+page.ts";
+export { universal };
+export { default as component } from "../../../../src/routes/(pineapple)/pineapple/(pineapple)/+page.svelte";

package/.svelte-kit/generated/client/nodes/5.js

@@ -1,3 +1 @@
-import * as universal from "../../../../src/routes/(pineapple)/pineapple/+page.ts";
-export { universal };
-export { default as component } from "../../../../src/routes/(pineapple)/pineapple/+page.svelte";
+export { default as component } from "../../../../src/routes/(pineapple)/pineapple/(extra-pages)/page1/+page.svelte";

package/.svelte-kit/generated/client/nodes/6.js

@@ -1 +1 @@
-export { default as component } from "../../../../src/routes/(pineapple)/pineapple/(extra-pages)/page1/+page.svelte";
+export { default as component } from "../../../../src/routes/(pineapple)/pineapple/(extra-pages)/page2/+page.svelte";

package/.svelte-kit/generated/client/nodes/7.js

@@ -1 +1 @@
-export { default as component } from "../../../../src/routes/(pineapple)/pineapple/(extra-pages)/page2/+page.svelte";
+export { default as component } from "../../../../src/routes/(pineapple)/pineapple/(extra-pages)/page3/+page.svelte";

package/.svelte-kit/generated/client/nodes/8.js

@@ -1 +1 @@
-export { default as component } from "../../../../src/routes/(pineapple)/pineapple/(extra-pages)/page3/+page.svelte";
+export { default as component } from "../../../../src/routes/(pineapple)/pineapple/(extra-pages)/page3/page5/+page.svelte";

package/.svelte-kit/generated/client/nodes/9.js

@@ -1 +1 @@
-export { default as component } from "../../../../src/routes/(pineapple)/pineapple/(extra-pages)/page3/page5/+page.svelte";
+export { default as component } from "../../../../src/routes/(pineapple)/pineapple/(extra-pages)/page3/page6/+page.svelte";

package/.svelte-kit/generated/server/internal.js

@@ -21,7 +21,7 @@ export const options = {
 		app: ({ head, body, assets, nonce, env }) => "<!DOCTYPE html>\n<html lang=\"en\">\n\t<head>\n\t\t<meta charset=\"utf-8\" />\n\t\t<link rel=\"icon\" href=\"" + assets + "/favicon.png\" />\n\t\t<meta name=\"viewport\" content=\"width=device-width\" />\n\t\t" + head + "\n\t</head>\n\n\t<body data-sveltekit-preload-data=\"hover\" data-theme=\"crimson\">\n\t\t<div style=\"display: contents\" class=\"h-full overflow-hidden\">" + body + "</div>\n\t</body>\n</html>\n",
 		error: ({ status, message }) => "<!doctype html>\n<html lang=\"en\">\n\t<head>\n\t\t<meta charset=\"utf-8\" />\n\t\t<title>" + message + "</title>\n\n\t\t<style>\n\t\t\tbody {\n\t\t\t\t--bg: white;\n\t\t\t\t--fg: #222;\n\t\t\t\t--divider: #ccc;\n\t\t\t\tbackground: var(--bg);\n\t\t\t\tcolor: var(--fg);\n\t\t\t\tfont-family:\n\t\t\t\t\tsystem-ui,\n\t\t\t\t\t-apple-system,\n\t\t\t\t\tBlinkMacSystemFont,\n\t\t\t\t\t'Segoe UI',\n\t\t\t\t\tRoboto,\n\t\t\t\t\tOxygen,\n\t\t\t\t\tUbuntu,\n\t\t\t\t\tCantarell,\n\t\t\t\t\t'Open Sans',\n\t\t\t\t\t'Helvetica Neue',\n\t\t\t\t\tsans-serif;\n\t\t\t\tdisplay: flex;\n\t\t\t\talign-items: center;\n\t\t\t\tjustify-content: center;\n\t\t\t\theight: 100vh;\n\t\t\t\tmargin: 0;\n\t\t\t}\n\n\t\t\t.error {\n\t\t\t\tdisplay: flex;\n\t\t\t\talign-items: center;\n\t\t\t\tmax-width: 32rem;\n\t\t\t\tmargin: 0 1rem;\n\t\t\t}\n\n\t\t\t.status {\n\t\t\t\tfont-weight: 200;\n\t\t\t\tfont-size: 3rem;\n\t\t\t\tline-height: 1;\n\t\t\t\tposition: relative;\n\t\t\t\ttop: -0.05rem;\n\t\t\t}\n\n\t\t\t.message {\n\t\t\t\tborder-left: 1px solid var(--divider);\n\t\t\t\tpadding: 0 0 0 1rem;\n\t\t\t\tmargin: 0 0 0 1rem;\n\t\t\t\tmin-height: 2.5rem;\n\t\t\t\tdisplay: flex;\n\t\t\t\talign-items: center;\n\t\t\t}\n\n\t\t\t.message h1 {\n\t\t\t\tfont-weight: 400;\n\t\t\t\tfont-size: 1em;\n\t\t\t\tmargin: 0;\n\t\t\t}\n\n\t\t\t@media (prefers-color-scheme: dark) {\n\t\t\t\tbody {\n\t\t\t\t\t--bg: #222;\n\t\t\t\t\t--fg: #ddd;\n\t\t\t\t\t--divider: #666;\n\t\t\t\t}\n\t\t\t}\n\t\t</style>\n\t</head>\n\t<body>\n\t\t<div class=\"error\">\n\t\t\t<span class=\"status\">" + status + "</span>\n\t\t\t<div class=\"message\">\n\t\t\t\t<h1>" + message + "</h1>\n\t\t\t</div>\n\t\t</div>\n\t</body>\n</html>\n"
 	},
-	version_hash: "73g83g"
+	version_hash: "4tclde"
 };
 
 export async function get_hooks() {

package/.svelte-kit/types/route_meta_data.json

@@ -2,8 +2,8 @@
 	"/(seaweed)": [],
 	"/(pineapple)": [],
 	"/": [],
-	"/(pineapple)/pineapple": [
-		"src/routes/(pineapple)/pineapple/+page.ts"
+	"/(pineapple)/pineapple/(pineapple)": [
+		"src/routes/(pineapple)/pineapple/(pineapple)/+page.ts"
 	],
 	"/(pineapple)/pineapple/(extra-pages)/page1": [],
 	"/(pineapple)/pineapple/(extra-pages)/page2": [],

package/.svelte-kit/types/src/routes/$types.d.ts

@@ -11,7 +11,7 @@ type OutputDataShape<T> = MaybeWithVoid<Omit<App.PageData, RequiredKeys<T>> & Pa
 type EnsureDefined<T> = T extends null | undefined ? {} : T;
 type OptionalUnion<U extends Record<string, any>, A extends keyof U = U extends U ? keyof U : never> = U extends unknown ? { [P in Exclude<A, keyof U>]?: never } & U : never;
 export type Snapshot<T = any> = Kit.Snapshot<T>;
-type LayoutRouteId = RouteId | "/(pineapple)" | "/(pineapple)/pineapple" | "/(pineapple)/pineapple/(extra-pages)/page1" | "/(pineapple)/pineapple/(extra-pages)/page2" | "/(pineapple)/pineapple/(extra-pages)/page3" | "/(pineapple)/pineapple/(extra-pages)/page3/page5" | "/(pineapple)/pineapple/(extra-pages)/page3/page6" | "/(pineapple)/pineapple/(extra-pages)/page3/page7" | "/(pineapple)/pineapple/(extra-pages)/page3/page7/(test_layout)/page8" | "/(pineapple)/pineapple/(extra-pages)/page4" | "/(seaweed)/portfolio" | "/(seaweed)/portfolio/actual" | null
+type LayoutRouteId = RouteId | "/(pineapple)" | "/(pineapple)/pineapple/(extra-pages)/page1" | "/(pineapple)/pineapple/(extra-pages)/page2" | "/(pineapple)/pineapple/(extra-pages)/page3" | "/(pineapple)/pineapple/(extra-pages)/page3/page5" | "/(pineapple)/pineapple/(extra-pages)/page3/page6" | "/(pineapple)/pineapple/(extra-pages)/page3/page7" | "/(pineapple)/pineapple/(extra-pages)/page3/page7/(test_layout)/page8" | "/(pineapple)/pineapple/(extra-pages)/page4" | "/(pineapple)/pineapple/(pineapple)" | "/(seaweed)/portfolio" | "/(seaweed)/portfolio/actual" | null
 type LayoutParams = RouteParams & {  }
 type LayoutParentData = EnsureDefined<{}>;
 

package/.svelte-kit/types/src/routes/(pineapple)/$types.d.ts

@@ -12,7 +12,7 @@ type EnsureDefined<T> = T extends null | undefined ? {} : T;
 type OptionalUnion<U extends Record<string, any>, A extends keyof U = U extends U ? keyof U : never> = U extends unknown ? { [P in Exclude<A, keyof U>]?: never } & U : never;
 export type Snapshot<T = any> = Kit.Snapshot<T>;
 type PageParentData = Omit<EnsureDefined<import('../$types.js').LayoutData>, keyof LayoutData> & EnsureDefined<LayoutData>;
-type LayoutRouteId = RouteId | "/(pineapple)" | "/(pineapple)/pineapple" | "/(pineapple)/pineapple/(extra-pages)/page1" | "/(pineapple)/pineapple/(extra-pages)/page2" | "/(pineapple)/pineapple/(extra-pages)/page3" | "/(pineapple)/pineapple/(extra-pages)/page3/page5" | "/(pineapple)/pineapple/(extra-pages)/page3/page6" | "/(pineapple)/pineapple/(extra-pages)/page3/page7" | "/(pineapple)/pineapple/(extra-pages)/page3/page7/(test_layout)/page8" | "/(pineapple)/pineapple/(extra-pages)/page4"
+type LayoutRouteId = RouteId | "/(pineapple)" | "/(pineapple)/pineapple/(extra-pages)/page1" | "/(pineapple)/pineapple/(extra-pages)/page2" | "/(pineapple)/pineapple/(extra-pages)/page3" | "/(pineapple)/pineapple/(extra-pages)/page3/page5" | "/(pineapple)/pineapple/(extra-pages)/page3/page6" | "/(pineapple)/pineapple/(extra-pages)/page3/page7" | "/(pineapple)/pineapple/(extra-pages)/page3/page7/(test_layout)/page8" | "/(pineapple)/pineapple/(extra-pages)/page4" | "/(pineapple)/pineapple/(pineapple)"
 type LayoutParams = RouteParams & {  }
 type LayoutParentData = EnsureDefined<import('../$types.js').LayoutData>;
 

package/.svelte-kit/types/src/routes/(pineapple)/pineapple/(pineapple)/$types.d.ts

@@ -0,0 +1,19 @@
+import type * as Kit from '@sveltejs/kit';
+
+type Expand<T> = T extends infer O ? { [K in keyof O]: O[K] } : never;
+// @ts-ignore
+type MatcherParam<M> = M extends (param : string) => param is infer U ? U extends string ? U : string : string;
+type RouteParams = {  };
+type RouteId = '/(pineapple)/pineapple/(pineapple)';
+type MaybeWithVoid<T> = {} extends T ? T | void : T;
+export type RequiredKeys<T> = { [K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K; }[keyof T];
+type OutputDataShape<T> = MaybeWithVoid<Omit<App.PageData, RequiredKeys<T>> & Partial<Pick<App.PageData, keyof T & keyof App.PageData>> & Record<string, any>>
+type EnsureDefined<T> = T extends null | undefined ? {} : T;
+type OptionalUnion<U extends Record<string, any>, A extends keyof U = U extends U ? keyof U : never> = U extends unknown ? { [P in Exclude<A, keyof U>]?: never } & U : never;
+export type Snapshot<T = any> = Kit.Snapshot<T>;
+type PageParentData = Omit<EnsureDefined<import('../../../$types.js').LayoutData>, keyof import('../../$types.js').LayoutData> & EnsureDefined<import('../../$types.js').LayoutData>;
+
+export type PageServerData = null;
+export type PageLoad<OutputData extends OutputDataShape<PageParentData> = OutputDataShape<PageParentData>> = Kit.Load<RouteParams, PageServerData, PageParentData, OutputData, RouteId>;
+export type PageLoadEvent = Parameters<PageLoad>[0];
+export type PageData = Expand<Omit<PageParentData, keyof Kit.LoadProperties<Awaited<ReturnType<typeof import('../../../../../../../src/routes/(pineapple)/pineapple/(pineapple)/+page.js').load>>>> & OptionalUnion<EnsureDefined<Kit.LoadProperties<Awaited<ReturnType<typeof import('../../../../../../../src/routes/(pineapple)/pineapple/(pineapple)/+page.js').load>>>>>>;

package/dist/components/navigation_component/PageMeta.d.ts

@@ -49,7 +49,7 @@ export declare const findPageMetaParent: (parentList: PageMeta[], child: PageMet
 export type ParsePageMetaCompareFn = ((a: PageMeta, b: PageMeta) => number);
 export declare const parsePageMeta: (fileList: Record<string, unknown>, jsonList: Record<string, unknown>, imageMap: Map<string, string>, compareFn?: ParsePageMetaCompareFn) => PageMeta[];
 /**
- * Prioritizes, in order, lastUpdated, datePublished, has description, then title
+ * Prioritizes, in order, recently lastUpdated or datePublished, has description, then title
  *
  * @param a
  * @param b

package/dist/components/navigation_component/PageMeta.js

@@ -24,10 +24,9 @@ export const parsePageMeta = (fileList, jsonList, imageMap, compareFn) => {
     // let pageGroupedList: PageMeta[] = [];
     const jsonMap = new Map();
     Object.keys(jsonList).forEach(path => {
-        const pathParts = path.split("/");
+        const pathEnd = path.split("../").pop();
+        const pathParts = pathEnd.split("/");
         pathParts.pop();
-        // get title
-        // const title = pathParts[pathParts.length - 1].replaceAll("-", " ");
         // get url path
         const subPath = pathParts.filter(s => {
             return s !== "." && s.indexOf("(") !== 0;
@@ -40,7 +39,8 @@ export const parsePageMeta = (fileList, jsonList, imageMap, compareFn) => {
         }
     });
     for (const path in fileList) {
-        const pathParts = path.split("/");
+        const pathEnd = path.split("../").pop();
+        const pathParts = pathEnd.split("/");
         pathParts.pop();
         // get title
         const title = pathParts[pathParts.length - 1].replaceAll("-", " ");
@@ -100,30 +100,24 @@ export const parsePageMeta = (fileList, jsonList, imageMap, compareFn) => {
 const AWins = -1;
 const BWins = 1;
 /**
- * Prioritizes, in order, lastUpdated, datePublished, has description, then title
+ * Prioritizes, in order, recently lastUpdated or datePublished, has description, then title
  *
  * @param a
  * @param b
  * @constructor
  */
 export const DefaultPageMetaSorter = (a, b) => {
-    if (a.lastUpdated && !b.lastUpdated) {
-        return AWins;
-    }
-    else if (!a.lastUpdated && b.lastUpdated) {
-        return BWins;
-    }
-    else if (a.lastUpdated && b.lastUpdated) {
-        return a.lastUpdated.localeCompare(b.lastUpdated);
-    }
-    if (a.datePublished && !b.datePublished) {
+    const aDate = a.lastUpdated || a.datePublished;
+    const bDate = b.lastUpdated || b.datePublished;
+    if (aDate && !bDate) {
         return AWins;
     }
-    else if (!a.lastUpdated && b.datePublished) {
+    else if (!aDate && bDate) {
         return BWins;
     }
-    else if (a.datePublished && b.datePublished) {
-        return a.datePublished.localeCompare(b.datePublished);
+    else if (aDate && bDate) {
+        // we invert the value because we want the dates to be in descending order
+        return -aDate.localeCompare(bDate);
     }
     if (a.description && !b.description) {
         return AWins;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@turnipxenon/pineapple",
   "description": "personal package for base styling for other personal projects",
-  "version": "2.4.35",
+  "version": "2.4.37",
   "scripts": {
     "dev": "vite dev",
     "build": "npm run check-requirements && vite build && yarn package",

package/src/lib/components/navigation_component/PageMeta.ts

@@ -83,12 +83,10 @@ export const parsePageMeta = (fileList: Record<string, unknown>,
 	// let pageGroupedList: PageMeta[] = [];
 	const jsonMap = new Map<string, { [k: string]: unknown }>();
 	Object.keys(jsonList).forEach(path => {
-		const pathParts = path.split("/");
+		const pathEnd = path.split("../").pop() as string;
+		const pathParts = pathEnd.split("/");
 		pathParts.pop();
 
-		// get title
-		// const title = pathParts[pathParts.length - 1].replaceAll("-", " ");
-
 		// get url path
 		const subPath = pathParts.filter(s => {
 			return s !== "." && s.indexOf("(") !== 0;
@@ -103,7 +101,8 @@ export const parsePageMeta = (fileList: Record<string, unknown>,
 	});
 
 	for (const path in fileList) {
-		const pathParts = path.split("/");
+		const pathEnd = path.split("../").pop() as string;
+		const pathParts = pathEnd.split("/");
 		pathParts.pop();
 
 		// get title
@@ -178,27 +177,23 @@ const AWins = -1;
 const BWins = 1;
 
 /**
- * Prioritizes, in order, lastUpdated, datePublished, has description, then title
+ * Prioritizes, in order, recently lastUpdated or datePublished, has description, then title
  *
  * @param a
  * @param b
  * @constructor
  */
 export const DefaultPageMetaSorter: ParsePageMetaCompareFn = (a, b) => {
-	if (a.lastUpdated && !b.lastUpdated) {
-		return AWins;
-	} else if (!a.lastUpdated && b.lastUpdated) {
-		return BWins;
-	} else if (a.lastUpdated && b.lastUpdated) {
-		return a.lastUpdated.localeCompare(b.lastUpdated);
-	}
+	const aDate = a.lastUpdated || a.datePublished;
+	const bDate = b.lastUpdated || b.datePublished;
 
-	if (a.datePublished && !b.datePublished) {
+	if (aDate && !bDate) {
 		return AWins;
-	} else if (!a.lastUpdated && b.datePublished) {
+	} else if (!aDate && bDate) {
 		return BWins;
-	} else if (a.datePublished && b.datePublished) {
-		return a.datePublished.localeCompare(b.datePublished);
+	} else if (aDate && bDate) {
+		// we invert the value because we want the dates to be in descending order
+		return -aDate.localeCompare(bDate);
 	}
 
 	if (a.description && !b.description) {

package/src/routes/(pineapple)/pineapple/(extra-pages)/page1/meta.json

@@ -1,10 +1,10 @@
 {
-  "datePublished": "23-01-01",
+  "datePublished": "2023-01-01",
   "description": "random description but look at Ares! Let's try out a long-ish text to see how things would wrap and all that. I don't know what else to say. Please stream Umpah Umpah.",
   "imageAlt": "Image of Ares being excited",
   "imageID": "testImageID",
   "imageURL": "./favicon.png/?q=imageIDTakesPrecedence",
-  "lastUpdated": "23-02-02",
+  "lastUpdated": "2023-02-02",
   "shouldGroup": false,
   "shouldHide": false,
   "tags": [

package/src/routes/(pineapple)/pineapple/(extra-pages)/page3/page5/meta.json

@@ -0,0 +1,7 @@
+{
+  "datePublished": "2024-03-03",
+  "title": "555",
+  "tags": [
+    "random"
+  ]
+}

package/src/routes/(pineapple)/pineapple/(extra-pages)/page3/page7/(test_layout)/page8/meta.json

@@ -0,0 +1,7 @@
+{
+  "title": "801 yay",
+  "description": "something",
+  "tags": [
+    "random"
+  ]
+}

package/src/routes/(pineapple)/pineapple/{+page.svelte → (pineapple)/+page.svelte}

@@ -3,8 +3,8 @@
 	import TestCard from "$pkg/components/pineapple/toast/custom-toast/TestCustomToast.svelte";
 	import TestDialogYarn from "./TestDialog.yarn?raw";
 	import { Card, dialogManager } from "$pkg";
-	import NavigationComponent from "$pkg/components/navigation_component/NavigationComponent.svelte";
-	import { ImageMap } from "./(extra-pages)/ImageMap";
+	import NavigationComponent from "../../../../lib/components/navigation_component/NavigationComponent.svelte";
+	import { ImageMap } from "../(extra-pages)/ImageMap";
 
 	// region Toast test scripts
 	let testingQueueNumber = 1;
@@ -30,8 +30,8 @@
 
 
 	// todo: fix fragile relative reference to the root
-	const fileList = import.meta.glob("./**/+page.svelte", { query: "?raw" });
-	const jsonList = import.meta.glob("./**/meta.json", { query: "?raw", eager: true });
+	const fileList = import.meta.glob("./../**/+page.svelte", { query: "?raw" });
+	const jsonList = import.meta.glob("./../**/meta.json", { query: "?raw", eager: true });
 </script>
 
 <div class="pineapple-container">

package/src/routes/(pineapple)/pineapple/{TestDialog.yarn → (pineapple)/TestDialog.yarn}

@@ -2,6 +2,6 @@ title: ErrorStart
 position: 0,0
 ---
 Portrait: AresDisappointed
-<p>Huh... We didn't find that page. Sorry about that. You can go back to our <a href="/">homepage.</a><br>
+<p>Huh... We didn't find that page. Sorry about that. You can go back to our <a href="/static">homepage.</a><br>
 Gomen oomf chan o(TヘTo)</p>
 ===