From e6a226c1be0c7dce8d9bb57d30efae88135d8bc9 Mon Sep 17 00:00:00 2001
From: Delusoire <deluso7re@outlook.com>
Date: Sat, 17 Aug 2024 17:53:36 +0100
Subject: [PATCH] fix

---
 deno.lock                                     |  78 +++++++++++++
 .../stdlib/src/registers/topbarLeftButton.tsx |  16 +--
 modules/stdlib/src/utils/index.ts             |   3 +-
 modules/stdlib/src/webpack/CODEGEN.ts         | 108 +++++++++---------
 modules/stdlib/src/webpack/CustomHooks.gen.ts |   2 -
 .../stdlib/src/webpack/CustomHooks.xpui.ts    |   2 -
 modules/stdlib/src/webpack/ReactRouter.gen.ts |   2 +
 .../stdlib/src/webpack/ReactRouter.xpui.ts    |  11 +-
 8 files changed, 151 insertions(+), 71 deletions(-)
 create mode 100644 deno.lock

diff --git a/deno.lock b/deno.lock
new file mode 100644
index 0000000..8f4f2e8
--- /dev/null
+++ b/deno.lock
@@ -0,0 +1,78 @@
+{
+  "version": "3",
+  "packages": {
+    "specifiers": {
+      "npm:@swc/core": "npm:@swc/core@1.7.3"
+    },
+    "npm": {
+      "@swc/core-darwin-arm64@1.7.3": {
+        "integrity": "sha512-CTkHa6MJdov9t41vuV2kmQIMu+Q19LrEHGIR/UiJYH06SC/sOu35ZZH8DyfLp9ZoaCn21gwgWd61ixOGQlwzTw==",
+        "dependencies": {}
+      },
+      "@swc/core-darwin-x64@1.7.3": {
+        "integrity": "sha512-mun623y6rCoZ2EFIYfIRqXYRFufJOopoYSJcxYhZUrfTpAvQ1zLngjQpWCUU1krggXR2U0PQj+ls0DfXUTraNg==",
+        "dependencies": {}
+      },
+      "@swc/core-linux-arm-gnueabihf@1.7.3": {
+        "integrity": "sha512-4Jz4UcIcvZNMp9qoHbBx35bo3rjt8hpYLPqnR4FFq6gkAsJIMFC56UhRZwdEQoDuYiOFMBnnrsg31Fyo6YQypA==",
+        "dependencies": {}
+      },
+      "@swc/core-linux-arm64-gnu@1.7.3": {
+        "integrity": "sha512-p+U/M/oqV7HC4erQ5TVWHhJU1984QD+wQBPxslAYq751bOQGm0R/mXK42GjugqjnR6yYrAiwKKbpq4iWVXNePA==",
+        "dependencies": {}
+      },
+      "@swc/core-linux-arm64-musl@1.7.3": {
+        "integrity": "sha512-s6VzyaJwaRGTi2mz2h6Ywxfmgpkc69IxhuMzl+sl34plH0V0RgnZDm14HoCGIKIzRk4+a2EcBV1ZLAfWmPACQg==",
+        "dependencies": {}
+      },
+      "@swc/core-linux-x64-gnu@1.7.3": {
+        "integrity": "sha512-IrFY48C356Z2dU2pjYg080yvMXzmSV3Lmm/Wna4cfcB1nkVLjWsuYwwRAk9CY7E19c+q8N1sMNggubAUDYoX2g==",
+        "dependencies": {}
+      },
+      "@swc/core-linux-x64-musl@1.7.3": {
+        "integrity": "sha512-qoLgxBlBnnyUEDu5vmRQqX90h9jldU1JXI96e6eh2d1gJyKRA0oSK7xXmTzorv1fGHiHulv9qiJOUG+g6uzJWg==",
+        "dependencies": {}
+      },
+      "@swc/core-win32-arm64-msvc@1.7.3": {
+        "integrity": "sha512-OAd7jVVJ7nb0Ev80VAa1aeK+FldPeC4eZ35H4Qn6EICzIz0iqJo2T33qLKkSZiZEBKSoF4KcwrqYfkjLOp5qWg==",
+        "dependencies": {}
+      },
+      "@swc/core-win32-ia32-msvc@1.7.3": {
+        "integrity": "sha512-31+Le1NyfSnILFV9+AhxfFOG0DK0272MNhbIlbcv4w/iqpjkhaOnNQnLsYJD1Ow7lTX1MtIZzTjOhRlzSviRWg==",
+        "dependencies": {}
+      },
+      "@swc/core-win32-x64-msvc@1.7.3": {
+        "integrity": "sha512-jVQPbYrwcuueI4QB0fHC29SVrkFOBcfIspYDlgSoHnEz6tmLMqUy+txZUypY/ZH/KaK0HEY74JkzgbRC1S6LFQ==",
+        "dependencies": {}
+      },
+      "@swc/core@1.7.3": {
+        "integrity": "sha512-HHAlbXjWI6Kl9JmmUW1LSygT1YbblXgj2UvvDzMkTBPRzYMhW6xchxdO8HbtMPtFYRt/EQq9u1z7j4ttRSrFsA==",
+        "dependencies": {
+          "@swc/core-darwin-arm64": "@swc/core-darwin-arm64@1.7.3",
+          "@swc/core-darwin-x64": "@swc/core-darwin-x64@1.7.3",
+          "@swc/core-linux-arm-gnueabihf": "@swc/core-linux-arm-gnueabihf@1.7.3",
+          "@swc/core-linux-arm64-gnu": "@swc/core-linux-arm64-gnu@1.7.3",
+          "@swc/core-linux-arm64-musl": "@swc/core-linux-arm64-musl@1.7.3",
+          "@swc/core-linux-x64-gnu": "@swc/core-linux-x64-gnu@1.7.3",
+          "@swc/core-linux-x64-musl": "@swc/core-linux-x64-musl@1.7.3",
+          "@swc/core-win32-arm64-msvc": "@swc/core-win32-arm64-msvc@1.7.3",
+          "@swc/core-win32-ia32-msvc": "@swc/core-win32-ia32-msvc@1.7.3",
+          "@swc/core-win32-x64-msvc": "@swc/core-win32-x64-msvc@1.7.3",
+          "@swc/counter": "@swc/counter@0.1.3",
+          "@swc/types": "@swc/types@0.1.12"
+        }
+      },
+      "@swc/counter@0.1.3": {
+        "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==",
+        "dependencies": {}
+      },
+      "@swc/types@0.1.12": {
+        "integrity": "sha512-wBJA+SdtkbFhHjTMYH+dEH1y4VpfGdAc2Kw/LK09i9bXd/K6j6PkDcFCEzb6iVfZMkPRrl/q0e3toqTAJdkIVA==",
+        "dependencies": {
+          "@swc/counter": "@swc/counter@0.1.3"
+        }
+      }
+    }
+  },
+  "remote": {}
+}
diff --git a/modules/stdlib/src/registers/topbarLeftButton.tsx b/modules/stdlib/src/registers/topbarLeftButton.tsx
index c4f092f..66de7c7 100644
--- a/modules/stdlib/src/registers/topbarLeftButton.tsx
+++ b/modules/stdlib/src/registers/topbarLeftButton.tsx
@@ -33,12 +33,13 @@ declare global {
 let topbarLeftButtonFactoryCtx: React.Context<TopbarLeftButtonFactory>;
 globalThis.__renderTopbarLeftButtons = () =>
 	React.createElement(() => {
-		[, refresh] = React.useReducer(n => n + 1, 0);
+		[, refresh] = React.useReducer((n) => n + 1, 0);
 
-		const topbarLeftButtonFactory = isGlobalNavBarEnabled() ? _TopbarLeftButtonT : _TopbarLeftButton;
+		const topbarLeftButtonFactory = isGlobalNavBarEnabled() ? _TopbarLeftButtonB : _TopbarLeftButtonA;
 
-		if (!topbarLeftButtonFactoryCtx)
+		if (!topbarLeftButtonFactoryCtx) {
 			topbarLeftButtonFactoryCtx = React.createContext<TopbarLeftButtonFactory>(null!);
+		}
 
 		return (
 			<topbarLeftButtonFactoryCtx.Provider value={topbarLeftButtonFactory}>
@@ -47,7 +48,7 @@ globalThis.__renderTopbarLeftButtons = () =>
 		);
 	});
 transformer(
-	emit => str => {
+	(emit) => (str) => {
 		str = str.replace(/("top-bar-forward-button"[^\]]*)/g, "$1,__renderTopbarLeftButtons()");
 		emit();
 		return str;
@@ -70,13 +71,12 @@ export const TopbarLeftButton = (props: TopbarLeftButtonProps) => {
 
 type TopbarLeftButtonFactory = React.FC<TopbarLeftButtonProps>;
 
-const _TopbarLeftButtonT: TopbarLeftButtonFactory = props => (
+const _TopbarLeftButtonB: TopbarLeftButtonFactory = (props) => (
 	<Tooltip label={props.label}>
 		<UI.ButtonTertiary
 			size="medium"
 			iconOnly={() =>
-				props.icon && createIconComponent({ icon: props.icon, iconSize: 16, realIconSize: 24 })
-			}
+				props.icon && createIconComponent({ icon: props.icon, iconSize: 16, realIconSize: 24 })}
 			condensed
 			aria-label={props.label}
 			disabled={props.disabled}
@@ -86,7 +86,7 @@ const _TopbarLeftButtonT: TopbarLeftButtonFactory = props => (
 	</Tooltip>
 );
 
-const _TopbarLeftButton: TopbarLeftButtonFactory = props => (
+const _TopbarLeftButtonA: TopbarLeftButtonFactory = (props) => (
 	<Tooltip label={props.label}>
 		<button
 			aria-label={props.label}
diff --git a/modules/stdlib/src/utils/index.ts b/modules/stdlib/src/utils/index.ts
index fbfd1f2..e3c5423 100644
--- a/modules/stdlib/src/utils/index.ts
+++ b/modules/stdlib/src/utils/index.ts
@@ -9,7 +9,8 @@ export const isGlobalNavBarEnabled = () => {
 	if (!Platform) {
 		return undefined;
 	}
-	const { enableGlobalNavBar } = Platform.getLocalStorageAPI().getItem("remote-config-overrides");
+	const RemoteConfiguration = Platform.getRemoteConfiguration();
+	const enableGlobalNavBar = RemoteConfiguration.getValue("enableGlobalNavBar");
 	return (
 		enableGlobalNavBar === "home-next-to-navigation" || enableGlobalNavBar === "home-next-to-search"
 	);
diff --git a/modules/stdlib/src/webpack/CODEGEN.ts b/modules/stdlib/src/webpack/CODEGEN.ts
index 5d258e0..b7de1ba 100644
--- a/modules/stdlib/src/webpack/CODEGEN.ts
+++ b/modules/stdlib/src/webpack/CODEGEN.ts
@@ -1,3 +1,5 @@
+#!/usr/bin/env -S deno run -A
+
 /*
  * Copyright (C) 2024 Delusoire
  * SPDX-License-Identifier: GPL-3.0-or-later
@@ -8,32 +10,32 @@
 import swc from "npm:@swc/core";
 
 async function* getFileExports(path: string) {
-   const module = await swc.parseFile(path, {
-      syntax: "typescript",
-      tsx: false,
-      decorators: true,
-      comments: false,
-      script: false,
-      target: "esnext",
-   });
+	const module = await swc.parseFile(path, {
+		syntax: "typescript",
+		tsx: false,
+		decorators: true,
+		comments: false,
+		script: false,
+		target: "esnext",
+	});
 
-   for (const node of module.body) {
-      switch (node.type) {
-         case "ExportDeclaration": {
-            switch (node.declaration.type) {
-               case "VariableDeclaration": {
-                  for (const decl of node.declaration.declarations) {
-                     switch (decl.id.type) {
-                        case "Identifier":
-                           yield decl.id.value;
-                           break;
-                     }
-                  }
-               }
-            }
-         }
-      }
-   }
+	for (const node of module.body) {
+		switch (node.type) {
+			case "ExportDeclaration": {
+				switch (node.declaration.type) {
+					case "VariableDeclaration": {
+						for (const decl of node.declaration.declarations) {
+							switch (decl.id.type) {
+								case "Identifier":
+									yield decl.id.value;
+									break;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 const header = `/*
@@ -44,42 +46,42 @@ const header = `/*
 `;
 
 async function generateBarrelContent(filenames: string[]) {
-   const content = await Promise.all(filenames.map(async (file) => {
-      const toImport = `./${file}`;
-      const importAs = file.replaceAll(".", "_");
-      const exports = await Array.fromAsync(getFileExports(file));
-      const importType = `import type * as ${importAs} from "${toImport}";\n`;
-      const exportLets = exports.map((exp) => `export let ${exp}: typeof ${importAs}.${exp};\n`).join("");
-      const initializer = `import("${toImport}").then(m => {\n` +
-         exports.map((exp) => `	${exp} = m.${exp};\n`).join("") +
-         `});\n`;
+	const content = await Promise.all(filenames.map(async (file) => {
+		const toImport = `./${file}`;
+		const importAs = file.replaceAll(".", "_");
+		const exports = await Array.fromAsync(getFileExports(file));
+		const importType = `import type * as ${importAs} from "${toImport}";\n`;
+		const exportLets = exports.map((exp) => `export let ${exp}: typeof ${importAs}.${exp};\n`).join("");
+		const initializer = `import("${toImport}").then(m => {\n` +
+			exports.map((exp) => `	${exp} = m.${exp};\n`).join("") +
+			`});\n`;
 
-      return importType + exportLets + initializer;
-   }));
-   return header + content.join("\n");
+		return importType + exportLets + initializer;
+	}));
+	return header + content.join("\n");
 }
 
 async function main() {
-   const nameToFilenames: Record<string, string[]> = {};
+	const nameToFilenames: Record<string, string[]> = {};
 
-   for await (const sibling of Deno.readDir(".")) {
-      if (!sibling.isFile) {
-         continue;
-      }
+	for await (const sibling of Deno.readDir(".")) {
+		if (!sibling.isFile) {
+			continue;
+		}
 
-      const [name, type, ext] = sibling.name.split(".");
-      if (ext !== "ts" || type === "gen") {
-         continue;
-      }
+		const [name, type, ext] = sibling.name.split(".");
+		if (ext !== "ts" || type === "gen") {
+			continue;
+		}
 
-      nameToFilenames[name] ??= [];
-      nameToFilenames[name].push(sibling.name);
-   }
+		nameToFilenames[name] ??= [];
+		nameToFilenames[name].push(sibling.name);
+	}
 
-   for (const [name, filenames] of Object.entries(nameToFilenames)) {
-      const content = await generateBarrelContent(filenames);
-      await Deno.writeTextFile(`${name}.gen.ts`, content);
-   }
+	for (const [name, filenames] of Object.entries(nameToFilenames)) {
+		const content = await generateBarrelContent(filenames);
+		await Deno.writeTextFile(`${name}.gen.ts`, content);
+	}
 }
 
 await main();
diff --git a/modules/stdlib/src/webpack/CustomHooks.gen.ts b/modules/stdlib/src/webpack/CustomHooks.gen.ts
index 644088f..8cb2266 100644
--- a/modules/stdlib/src/webpack/CustomHooks.gen.ts
+++ b/modules/stdlib/src/webpack/CustomHooks.gen.ts
@@ -11,7 +11,6 @@ export let useContextMenuState: typeof CustomHooks_xpui_ts.useContextMenuState;
 export let imageAnalysis: typeof CustomHooks_xpui_ts.imageAnalysis;
 export let fallbackPreset: typeof CustomHooks_xpui_ts.fallbackPreset;
 export let getPlayContext: typeof CustomHooks_xpui_ts.getPlayContext;
-export let useLocation: typeof CustomHooks_xpui_ts.useLocation;
 export let useTrackListColumns: typeof CustomHooks_xpui_ts.useTrackListColumns;
 export let usePanelStateMachine: typeof CustomHooks_xpui_ts.usePanelStateMachine;
 export let extractColorPreset: typeof CustomHooks_xpui_ts.extractColorPreset;
@@ -23,7 +22,6 @@ import("./CustomHooks.xpui.ts").then(m => {
 	imageAnalysis = m.imageAnalysis;
 	fallbackPreset = m.fallbackPreset;
 	getPlayContext = m.getPlayContext;
-	useLocation = m.useLocation;
 	useTrackListColumns = m.useTrackListColumns;
 	usePanelStateMachine = m.usePanelStateMachine;
 	extractColorPreset = m.extractColorPreset;
diff --git a/modules/stdlib/src/webpack/CustomHooks.xpui.ts b/modules/stdlib/src/webpack/CustomHooks.xpui.ts
index 9e99ce0..1b71259 100644
--- a/modules/stdlib/src/webpack/CustomHooks.xpui.ts
+++ b/modules/stdlib/src/webpack/CustomHooks.xpui.ts
@@ -28,8 +28,6 @@ export const fallbackPreset: any = exports.find((m) => m.colorDark);
 
 export const getPlayContext: Function = findBy("referrerIdentifier", "usePlayContextItem")(exportedFunctions);
 
-export const useLocation: Function = findBy("location", "useContext")(exportedFunctions);
-
 export const useTrackListColumns: Function = findBy("useTrackListColumns")(exportedFunctions);
 
 export const usePanelStateMachine: () => [state: any, actor: any, machine: any] = findBy(
diff --git a/modules/stdlib/src/webpack/ReactRouter.gen.ts b/modules/stdlib/src/webpack/ReactRouter.gen.ts
index fb3589a..f24f0f5 100644
--- a/modules/stdlib/src/webpack/ReactRouter.gen.ts
+++ b/modules/stdlib/src/webpack/ReactRouter.gen.ts
@@ -5,6 +5,8 @@
 
 import type * as ReactRouter_xpui_ts from "./ReactRouter.xpui.ts";
 export let useMatch: typeof ReactRouter_xpui_ts.useMatch;
+export let useLocation: typeof ReactRouter_xpui_ts.useLocation;
 import("./ReactRouter.xpui.ts").then(m => {
 	useMatch = m.useMatch;
+	useLocation = m.useLocation;
 });
diff --git a/modules/stdlib/src/webpack/ReactRouter.xpui.ts b/modules/stdlib/src/webpack/ReactRouter.xpui.ts
index 0910715..2e096e9 100644
--- a/modules/stdlib/src/webpack/ReactRouter.xpui.ts
+++ b/modules/stdlib/src/webpack/ReactRouter.xpui.ts
@@ -3,15 +3,14 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { chunks, require } from "./index.ts";
+import { findBy } from "/hooks/util.ts";
+import { chunks, exportedFunctions, require } from "./index.ts";
 
-import type { useMatch as useMatchT } from "npm:react-router";
+import type { useLocation as useLocationT, useMatch as useMatchT } from "npm:react-router";
 
 await CHUNKS.xpui.promise;
 
-const [ReactRouterModuleID] = chunks.find(([_, v]) =>
-	v.toString().includes("React Router")
-)!;
+const [ReactRouterModuleID] = chunks.find(([_, v]) => v.toString().includes("React Router"))!;
 const ReactRouterModule = Object.values(require(ReactRouterModuleID));
 
 // https://github.com/remix-run/react-router/blob/main/packages/react-router/lib/hooks.tsx#L131
@@ -19,3 +18,5 @@ export const useMatch: typeof useMatchT = ReactRouterModule.find((f) =>
 	f.toString().includes("let{pathname:") &&
 	!f.toString().includes(".createElement(")
 );
+
+export const useLocation: typeof useLocationT = findBy("location", "useContext")(exportedFunctions);