@spicetify/kit 0.4.1 → 0.4.3

package/dist/create.js

@@ -206,7 +206,7 @@ test("nowPlaying returns the track name, or a fallback when idle", () => {
 function writeThemeModule(dir, name, description, author, bare, cwd) {
     writeFileSync(path.join(dir, "metadata.json"), `${JSON.stringify({
         name,
-        tags: ["theme"],
+        kind: "theme",
         version: "0.1.0",
         authors: [author],
         description,
@@ -315,13 +315,13 @@ export async function runCreate(argv, cwd = process.cwd()) {
         writeThemeModule(dir, name, description, author, bare, cwd);
         return;
     }
-    const tag = template === "app" ? "app" : "extension";
+    const kind = template === "app" ? "app" : "extension";
     // Extensions are behavior-only; templates that render a page ship css.
     const hasCss = template !== "extension";
     const entries = hasCss ? { js: "index.js", css: "index.css" } : { js: "index.js" };
     writeFileSync(path.join(dir, "metadata.json"), `${JSON.stringify({
         name,
-        tags: [tag],
+        kind,
         version: "0.1.0",
         authors: [author],
         description,

package/dist/from-theme.js

@@ -58,7 +58,7 @@ export async function runFromTheme(argv, cwd = process.cwd()) {
     }
     writeFileSync(path.join(dir, "metadata.json"), `${JSON.stringify({
         name,
-        tags: ["theme"],
+        kind: "theme",
         version: "0.1.0",
         authors: [author],
         description: `${path.basename(themeDir)} theme, migrated from the classic format`,

package/dist/push.js

@@ -234,9 +234,15 @@ export function push(rec, id, port) {
     // Refuse an oversized install before opening the socket (U7), so the failure
     // is a named cause here rather than an opaque client-side quota error.
     checkQuota(rec);
-    // The whole exchange runs in the client: disable the old instance, install
-    // the fresh content, and re-enable anything the unload cascade took down.
-    const expr = `(async () => {
+    return evaluate(port, pushExpression(rec, id, nonce, stamped));
+}
+/**
+ * The expression push evaluates in the client: it installs the record, then
+ * re-enables anything the unload cascade took down, except other themes when
+ * the pushed module is one.
+ */
+export function pushExpression(rec, id, nonce, stamped) {
+    return `(async () => {
 		${AWAIT_LOADER}
 		if (!M) return JSON.stringify({ error: "loader not ready" });
 		const rec = ${JSON.stringify(rec)};
@@ -251,8 +257,10 @@ export function push(rec, id, port) {
 		if (reenabled) await (M.reload ?? M.enable)(id);
 		// Re-enabling a theme the loader just unloaded would fight the
 		// single-active-theme invariant and knock the pushed theme back off.
-		const pushedIsTheme = (rec.metadata.tags ?? []).includes("theme");
-		const isTheme = (mid) => ((M.manifest?.modules?.find((m) => m.identifier === mid)?.tags) ?? []).includes("theme");
+		// metadata.json says "kind"; modules published before it carry "tags".
+		const themed = (meta) => meta?.kind === "theme" || (meta?.tags ?? []).includes("theme");
+		const pushedIsTheme = themed(rec.metadata);
+		const isTheme = (mid) => themed(M.manifest?.modules?.find((m) => m.identifier === mid));
 		for (const other of before) {
 			if (pushedIsTheme && isTheme(other)) continue;
 			const s = M.list().find((m) => m.identifier === other);
@@ -268,7 +276,6 @@ export function push(rec, id, port) {
 			reenabled,
 		});
 	})()`;
-    return evaluate(port, expr);
 }
 // removeLocal drops a hot-pushed override so the client falls back to the
 // staged or store-installed copy.

package/dist/version.js

@@ -4,5 +4,5 @@
  */
 // Kept in lockstep with package.json by release-please. Scaffolds must depend
 // on the kit version that generated them, especially across pre-1.0 minors.
-export const KIT_VERSION = "0.4.1"; // x-release-please-version
+export const KIT_VERSION = "0.4.3"; // x-release-please-version
 export const KIT_DEPENDENCY_RANGE = `^${KIT_VERSION}`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@spicetify/kit",
-	"version": "0.4.1",
+	"version": "0.4.3",
 	"description": "Developer kit for spicetify v3 modules: scaffold, build, hot-push, and pack",
 	"license": "GPL-3.0-or-later",
 	"homepage": "https://github.com/spicetify/modules#readme",
@@ -40,7 +40,7 @@
 		"access": "public"
 	},
 	"spicetify": {
-		"stdlibVersion": "1.13.0"
+		"stdlibVersion": "1.13.1"
 	},
 	"scripts": {
 		"build": "tsc -p tsconfig.build.json",

package/vendor/classmaps/{1030000/classmap-19f856aefd5.json → 1030001/classmap.json}

@@ -1,13 +1,31 @@
 {
+  "context_menu": {
+    "menu_item": "fmmygDM45MTS7I35OyLh"
+  },
   "main": {
+    "navbar": {
+      "link": {
+        "container": "xlH6FJnBzFT4l3TgUBre",
+        "container__active": "ajKYUZPcNmFVzcAzzlwe",
+        "wrapper": "xlH6FJnBzFT4l3TgUBre"
+      }
+    },
+    "playbar": {
+      "buttons": {
+        "button": {
+          "wrapper": "e-10860-legacy-button e-10860-button-tertiary--icon-only-small",
+          "wrapper__active": "e-10860-legacy-button e-10860-legacy-button-primary",
+          "wrapper__indicator": "e-10860-button-primary__inner"
+        }
+      }
+    },
     "topbar": {
-      "wrapper": "bQetA_KiP9n0DQVcGa7m",
       "left": {
         "button": {
-          "wrapper": "e-10860-legacy-button e-10860-button-tertiary--icon-only-medium",
           "icon": {
             "wrapper": "e-10860-icon e-10860-icon--auto-mirror"
-          }
+          },
+          "wrapper": "e-10860-legacy-button e-10860-button-tertiary--icon-only-medium"
         },
         "button_t": {
           "wrapper": "e-10860-legacy-button e-10860-button-tertiary--icon-only-medium"
@@ -23,87 +41,64 @@
         "upgrade_button": {
           "wrapper": "e-10860-legacy-button e-10860-legacy-button-primary"
         }
-      }
-    },
-    "playbar": {
-      "widget": {},
-      "controls": {},
-      "buttons": {
-        "button": {
-          "wrapper": "e-10860-legacy-button e-10860-button-tertiary--icon-only-small",
-          "wrapper__active": "e-10860-legacy-button e-10860-legacy-button-primary",
-          "wrapper__indicator": "e-10860-button-primary__inner"
-        }
-      }
-    },
-    "navbar": {
-      "link": {
-        "wrapper": "xlH6FJnBzFT4l3TgUBre",
-        "container": "xlH6FJnBzFT4l3TgUBre",
-        "container__active": "ajKYUZPcNmFVzcAzzlwe"
-      }
-    },
-    "global_navbar": {},
-    "sidebar": {},
-    "panel": {}
-  },
-  "tracklist": {
-    "column_header": "e-10860-legacy-list-row__header"
-  },
-  "search_chips": {
-    "wrapper_wrapper": "e-10860-chip-group",
-    "wrapper": "e-10860-chip-group__component",
-    "container": "e-10860-chip-group__component",
-    "chip": "e-10860-legacy-chip"
+      },
+      "wrapper": "bQetA_KiP9n0DQVcGa7m"
+    }
   },
   "modal": {
+    "track_credits": {
+      "container": "gtXQasDkhtg93wGk6yNG",
+      "content": {
+        "container": "wYQNBdH2rNMGe_B4oumf"
+      },
+      "header": {
+        "close": "CaHvWv36mAu4x5QTKlb1",
+        "container": "nQ_c7yoZ2XOD6fWtmv18"
+      }
+    },
     "widget_generator": {
       "container": "_XeAt3IgtZQepOYqU2g4",
-      "header": {
-        "container": "mnU1hqlaF5JIcrTxLnZF",
-        "close": "AslPcD0TRZBBGZofe58g"
-      },
       "content": {
         "container": "Xu_Z4l6TIOF1f5kDB9dt"
-      }
-    },
-    "track_credits": {
-      "container": "gtXQasDkhtg93wGk6yNG",
-      "header": {
-        "container": "nQ_c7yoZ2XOD6fWtmv18",
-        "close": "CaHvWv36mAu4x5QTKlb1"
       },
-      "content": {
-        "container": "wYQNBdH2rNMGe_B4oumf"
+      "header": {
+        "close": "AslPcD0TRZBBGZofe58g",
+        "container": "mnU1hqlaF5JIcrTxLnZF"
       }
     }
   },
+  "scrollable_text": {
+    "container": "e-10860-legacy-box e-10860-legacy-box--naked",
+    "wrapper": "e-10860-legacy-box"
+  },
+  "search_box": {
+    "container": "mlx0CgXAnGz0dADVsCdS",
+    "expand_button": "e-10860-legacy-button e-10860-button-tertiary--icon-only-medium aslJk0YypwKvyKXaBJcG"
+  },
+  "search_chips": {
+    "chip": "e-10860-legacy-chip",
+    "container": "e-10860-chip-group__component",
+    "wrapper": "e-10860-chip-group__component",
+    "wrapper_wrapper": "e-10860-chip-group"
+  },
   "settings": {
+    "button": {
+      "wrapper": "e-10860-legacy-button e-10860-legacy-button--small e-10860-legacy-button-secondary"
+    },
     "header": {
       "container": "Hwax_pfCzrntLhnYXiqL"
     },
     "section": {
       "container": "HdwEUcX8xijMdU7doYPt"
     },
-    "button": {
-      "wrapper": "e-10860-legacy-button e-10860-legacy-button--small e-10860-legacy-button-secondary"
-    },
     "text_input": "e-10860-form-input e-10860-form-control encore-text-body-medium"
   },
-  "scrollable_text": {
-    "container": "e-10860-legacy-box e-10860-legacy-box--naked",
-    "wrapper": "e-10860-legacy-box"
-  },
   "sort_box": {
     "list": {
       "button": "MYWr4UY4pKAAscUXvqrB"
     }
   },
-  "search_box": {
-    "container": "mlx0CgXAnGz0dADVsCdS",
-    "expand_button": "e-10860-legacy-button e-10860-button-tertiary--icon-only-medium aslJk0YypwKvyKXaBJcG"
-  },
-  "context_menu": {
-    "menu_item": "fmmygDM45MTS7I35OyLh"
+  "tracklist": {
+    "column_header": "e-10860-legacy-list-row__header"
   }
 }

package/vendor/stdlib/metadata.json

@@ -3,7 +3,7 @@
 	"kind": "lib",
 	"hidden": true,
 	"preview": "./assets/PREVIEW.png",
-	"version": "1.13.0",
+	"version": "1.13.1",
 	"compat": ["0.3.0"],
 	"authors": ["spicetify", "Delusoire"],
 	"description": "The standard library",

package/vendor/stdlib/src/playbar-compat.tsx

@@ -10,6 +10,7 @@
 // Button/Widget with the v3 playbarButton register so classic extensions and
 // muscle memory keep working, and the typed API never hands you a dead helper.
 
+import { client } from "./client.ts";
 import { React } from "./expose/React.ts";
 import playbarButtons, { PlaybarButton } from "./registers/playbarButton.tsx";
 
@@ -21,6 +22,8 @@ const innerSvg = (icon: string): string => {
 	return match ? match[1] : icon;
 };
 
+const toInnerSvg = (icon: string): string => client.icons?.[icon as Spicetify.Icon] ?? innerSvg(icon);
+
 class PlaybarCompat {
 	onClick: (self: PlaybarCompat) => void;
 	private _label: string;
@@ -102,7 +105,7 @@ class PlaybarCompat {
 			return (
 				<PlaybarButton
 					label={self._label}
-					icon={innerSvg(self._icon)}
+					icon={toInnerSvg(self._icon)}
 					isActive={self._active}
 					disabled={self._disabled}
 					onClick={() => self.onClick(self)}