@neonwilderness/moveskins 1.2.0 → 1.4.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.4.0 (07.05.2026)
+
+- Add --layout CLI param string to address different Twoday layouts for up-/downloads
+
+## 1.3.0 (02.05.2026)
+
+- Add --toolbar CLI switch to additionally download 3 related modToolbar skins 
+
 ## 1.2.0 (25.04.2026)
 
 - Implement recursive expansion of <% xxx.skin name="yyy" %> macros

package/dist/index.js

@@ -1213,7 +1213,7 @@ var ft, pt = class {
 		let y = [], b = Object.assign(Object.create(null), { _: [] }), x = {};
 		for (let e = 0; e < r.length; e++) {
 			let t = r[e], n = t.replace(/^-{3,}/, "---"), i, a, s, c, l, u;
-			if (t !== "--" && t.startsWith('-') && V(t)) S(t);
+			if (t !== "--" && /^-/.test(t) && V(t)) S(t);
 			else if (n.match(/^---+(=|$)/)) {
 				S(t);
 				continue;
@@ -1281,14 +1281,14 @@ var ft, pt = class {
 		function w(e, t, n, r) {
 			let a = [], c = r || n[e + 1], l = R(t, h.nargs);
 			if (R(t, h.bools) && !/^(true|false)$/.test(c)) a.push(!0);
-			else if (re(c) || re(r) && c.startsWith('-') && !g.test(c) && !V(c)) {
+			else if (re(c) || re(r) && /^-/.test(c) && !g.test(c) && !V(c)) {
 				if (s[t] !== void 0) {
 					let e = s[t];
 					a = Array.isArray(e) ? e : [e];
 				}
 			} else {
 				re(r) || a.push(D(t, r, !0));
-				for (let r = e + 1; r < n.length && !(!o["greedy-arrays"] && a.length > 0 || l && typeof l == "number" && a.length >= l || (c = n[r], c.startsWith('-') && !g.test(c) && !V(c))); r++) e = r, a.push(D(t, c, i));
+				for (let r = e + 1; r < n.length && !(!o["greedy-arrays"] && a.length > 0 || l && typeof l == "number" && a.length >= l || (c = n[r], /^-/.test(c) && !g.test(c) && !V(c))); r++) e = r, a.push(D(t, c, i));
 			}
 			return typeof l == "number" && (l && a.length < l || isNaN(l) && a.length === 0) && (v = Error(m("Not enough arguments following: %s", t))), T(t, a), e;
 		}
@@ -1780,7 +1780,7 @@ function qt(e) {
 	};
 	return t.forEach((e, r) => {
 		let a = !1;
-		e = e.replace(/\s/g, ""), /\.+[\]>]/.test(e) && r === t.length - 1 && (a = !0), e.startsWith('[') ? i.optional.push({
+		e = e.replace(/\s/g, ""), /\.+[\]>]/.test(e) && r === t.length - 1 && (a = !0), /^\[/.test(e) ? i.optional.push({
 			cmd: e.replace(n, "").split("|"),
 			variadic: a
 		}) : i.demanded.push({
@@ -2312,7 +2312,7 @@ function mn(e, t) {
 		g = g.filter((t) => !e.parsed.newAliases[t] && E.every((e) => (h.alias[e] || []).indexOf(t) === -1));
 		let D = n("Options:");
 		c[D] || (c[D] = []), x(g, h.alias, c, D);
-		let O = (e) => vn(e).startsWith('--'), k = Object.keys(c).filter((e) => c[e].length > 0).map((e) => ({
+		let O = (e) => /^--/.test(vn(e)), k = Object.keys(c).filter((e) => c[e].length > 0).map((e) => ({
 			groupName: e,
 			normalizedKeys: c[e].filter(S).map((e) => {
 				if (E.includes(e)) return e;
@@ -2583,7 +2583,7 @@ var yn = "###-begin-{{app_name}}-completions-###\n#\n# yargs command completion
 			}), r = n ? t[n] : void 0, a = t[e] ?? r ?? "";
 			i = `${e.replace(/:/g, "\\:")}:${a.replace("__yargsString__:", "").replace(/(\r\n|\n|\r)/gm, " ")}`;
 		}
-		let a = !((e) => e.startsWith('--'))(n) && ((e) => /^[^0-9]$/.test(e))(e) ? "-" : "--";
+		let a = !((e) => /^--/.test(e))(n) && ((e) => /^[^0-9]$/.test(e))(e) ? "-" : "--";
 		t.push(a + i), r && t.push(a + "no-" + i);
 	}
 	customCompletion(e, t, n, r) {
@@ -10263,7 +10263,7 @@ var Ya, Xa, Za, Qa, $a, eo = L((() => {
 		element: function(e, t, r) {
 			var a = r.adapter, s = t.name, c = t.value;
 			if (/\s/.test(c)) return n.default.falseFunc;
-			var l = RegExp(`(?:^|\\s)${i(c)}(?:$|\\s)`, o(t, r) ? "i" : "");
+			var l = RegExp(`(?:^|\\s)${i(c)}(?:\$|\\s)`, o(t, r) ? "i" : "");
 			return function(t) {
 				var n = a.getAttributeValue(t, s);
 				return n != null && n.length >= c.length && l.test(n) && e(t);
@@ -17147,7 +17147,7 @@ var Ya, Xa, Za, Qa, $a, eo = L((() => {
 		this.iconv = t;
 	}
 	n.prototype.encoder = i, n.prototype.decoder = a, n.prototype.bomAware = !0;
-	var r = /[^A-Za-z0-9'(),-./:? \n\r\t]+/g;
+	var r = /[^A-Za-z0-9'\(\),-\.\/:\? \n\r\t]+/g;
 	function i(e, t) {
 		this.iconv = t.iconv;
 	}
@@ -17159,7 +17159,7 @@ var Ya, Xa, Za, Qa, $a, eo = L((() => {
 	function a(e, t) {
 		this.iconv = t.iconv, this.inBase64 = !1, this.base64Accum = "";
 	}
-	for (var o = /[A-Za-z0-9/+]/, s = [], c = 0; c < 256; c++) s[c] = o.test(String.fromCharCode(c));
+	for (var o = /[A-Za-z0-9\/+]/, s = [], c = 0; c < 256; c++) s[c] = o.test(String.fromCharCode(c));
 	var l = 43, u = 45, d = 38;
 	a.prototype.write = function(e) {
 		for (var n = "", r = 0, i = this.inBase64, a = this.base64Accum, o = 0; o < e.length; o++) if (!i) e[o] == l && (n += this.iconv.decode(e.slice(r, o), "ascii"), r = o + 1, i = !0);
@@ -25183,7 +25183,7 @@ Content-Type: ${s.type || "application/octet-stream"}\r\n\r\n`);
 							a.protocol === "https:" && (i ||= H("node:tls"), m("upgrading to TLS"), l = i.connect({
 								socket: c,
 								servername: o,
-								...e.tls
+								...e.tls || {}
 							}), await new Promise((e, t) => {
 								l.once("secureConnect", e), l.once("error", t);
 							})), t(null, l);
@@ -33522,7 +33522,7 @@ Content-Type: ${s.type || "application/octet-stream"}\r\n\r\n`);
 	function t(e) {
 		let t = e.split(/\n/), n = [], r = 0;
 		function i(e) {
-			return e.startsWith('diff --git ');
+			return /^diff --git /.test(e);
 		}
 		function a(e) {
 			return i(e) || /^Index:\s/.test(e) || /^diff(?: -r \w+)+\s/.test(e);
@@ -33562,7 +33562,7 @@ Content-Type: ${s.type || "application/octet-stream"}\r\n\r\n`);
 						let m = /^old mode (\d+)/.exec(n);
 						m && (e.oldMode = m[1]);
 						let h = /^new mode (\d+)/.exec(n);
-						h && (e.newMode = h[1]), n.startsWith('Binary files ') && (e.isBinary = !0), r++;
+						h && (e.newMode = h[1]), /^Binary files /.test(n) && (e.isBinary = !0), r++;
 					}
 					continue;
 				} else if (a(n)) {
@@ -33576,7 +33576,7 @@ Content-Type: ${s.type || "application/octet-stream"}\r\n\r\n`);
 			if (f(e), f(e), e.oldFileName === void 0 != (e.newFileName === void 0)) throw Error("Missing " + (e.oldFileName === void 0 ? "\"--- ...\"" : "\"+++ ...\"") + " file header for " + (e.oldFileName ?? e.newFileName));
 			for (; r < t.length;) {
 				let n = t[r];
-				if (a(n) || o(n) || n.startsWith('===================================================================')) break;
+				if (a(n) || o(n) || /^===================================================================/.test(n)) break;
 				s(n) ? e.hunks.push(p()) : r++;
 			}
 		}
@@ -42590,10 +42590,10 @@ Content-Type: ${s.type || "application/octet-stream"}\r\n\r\n`);
 		s = t ? "" : s;
 		let l = !1;
 		c[c.length - 1] === "base64" && (c.pop(), l = !0);
-		let u = (c.shift() || "").toLowerCase(), d = c.map((e) => {
+		let u = (c.shift() || "").toLowerCase(), d = [...c.map((e) => {
 			let [t, n = ""] = e.split("=").map((e) => e.trim());
 			return t === "charset" && (n = n.toLowerCase(), n === r) ? "" : `${t}${n ? `=${n}` : ""}`;
-		}).filter(Boolean);
+		}).filter(Boolean)];
 		return l && d.push("base64"), (d.length !== 0 || u && u !== n) && d.unshift(u), `data:${d.join(";")},${l ? o.trim() : o}${s ? `#${s}` : ""}`;
 	};
 	t.exports = (e, t) => {
@@ -43096,12 +43096,12 @@ Content-Type: ${s.type || "application/octet-stream"}\r\n\r\n`);
 				Object.hasOwnProperty.call(t, a) && !o && (i || (n += ","), i = !1, r ? t[a] == null ? n += "null" : n += e(t[a]) : t[a] !== void 0 && (n += e(a) + ":" + e(t[a])));
 			}
 			return n += r ? "]" : "}", n;
-		} else if (typeof t == "string") return JSON.stringify(t.startsWith(':') ? ":" + t : t);
+		} else if (typeof t == "string") return JSON.stringify(/^:/.test(t) ? ":" + t : t);
 		else if (t === void 0) return "null";
 		else return JSON.stringify(t);
 	}, e.parse = function(e) {
 		return JSON.parse(e, function(e, t) {
-			return typeof t == "string" ? t.startsWith(':base64:') ? Buffer.from(t.substring(8), "base64") : t.startsWith(':') ? t.substring(1) : t : t;
+			return typeof t == "string" ? /^:base64:/.test(t) ? Buffer.from(t.substring(8), "base64") : /^:/.test(t) ? t.substring(1) : t : t;
 		});
 	};
 })), Dp = /* @__PURE__ */ R(((e, t) => {
@@ -45324,7 +45324,7 @@ Content-Type: ${s.type || "application/octet-stream"}\r\n\r\n`);
 	types: () => _m,
 	version: () => mm
 }), pm, mm, hm, gm, _m, vm, ym, bm, xm, Sm, Cm, wm, Tm, Em, Dm, Om = L((() => {
-	pm = "@neonwilderness/twoday", mm = "0.7.1", hm = "Module to help interact with the most relevant functions of the Twoday blogger platform", gm = "./src/index.js", _m = "./types/index.d.ts", vm = [
+	pm = "@neonwilderness/twoday", mm = "0.8.0", hm = "Module to help interact with the most relevant functions of the Twoday blogger platform", gm = "./src/index.js", _m = "./types/index.d.ts", vm = [
 		"src",
 		"docs",
 		"types",
@@ -57716,6 +57716,9 @@ var gh, _h = L((() => {
 				this.#r(`Error while reading sidebar modules of "${e}"`, t, f);
 			}
 		}
+		isValidFreeTextModule(e) {
+			return [...Array.from({ length: 5 }, (e, t) => `modFreeText${(++t).toString().padStart(2, "0")}`), ...Array.from({ length: 3 }, (e, t) => `modMacroFreeText${(++t).toString().padStart(2, "0")}`)].includes(e);
+		}
 		async getFreeTextModule(e, t) {
 			try {
 				this.#e();
@@ -57728,6 +57731,20 @@ var gh, _h = L((() => {
 				this.#r(`Error while reading freetext module "${t}" of "${e}"`, n, f);
 			}
 		}
+		async updateFreeTextModule(e, t, n = {}) {
+			try {
+				if (this.#e(), !this.isValidFreeTextModule(t)) throw Error(`Cannot update "${t}" as it is no FreeText module!`);
+				let r = `${this.getAliasDomain(e)}/modules/preferences?mod=${t}`, i = await this.delayed(this.got.get(r)), a = `${t.toLowerCase()}header`, o = `${t}Text`, s = {
+					secretKey: this.#n(i.body),
+					mod: t,
+					preferencesform: 1,
+					submit: "Sichern"
+				};
+				return s[a] = n.heading || " ", s[o] = n.content || "", await this.delayed(this.got.post(r, { form: s }));
+			} catch (n) {
+				this.#r(`Error while updating freetext module "${t}" of "${e}"`, n, f);
+			}
+		}
 		async getModuleSkins(e, t) {
 			try {
 				this.#e();
@@ -57743,20 +57760,6 @@ var gh, _h = L((() => {
 				this.#r(`Error while reading freetext module "${t}" of "${e}"`, n, f);
 			}
 		}
-		async updateFreeTextModule(e, t, n = {}) {
-			try {
-				if (this.#e(), !/FreeText\d{2}/.test(t)) throw Error(`Cannot update "${t}" as it is no FreeText module!`);
-				let r = `${this.getAliasDomain(e)}/modules/preferences?mod=${t}`, i = await this.delayed(this.got.get(r)), a = `${t.toLowerCase()}header`, o = `${t}Text`, s = {
-					secretKey: this.#n(i.body),
-					mod: t,
-					preferencesform: 1,
-					submit: "Sichern"
-				};
-				return s[a] = n.heading || " ", s[o] = n.content || "", await this.delayed(this.got.post(r, { form: s }));
-			} catch (n) {
-				this.#r(`Error while updating freetext module "${t}" of "${e}"`, n, f);
-			}
-		}
 	};
 })))(), 1), bh = /* @__PURE__ */ R(((e) => {
 	Object.defineProperty(e, "__esModule", { value: !0 }), e.splitWhen = e.flatten = void 0;
@@ -57876,7 +57879,7 @@ var gh, _h = L((() => {
 		return t && t.strict === !1 && (r = a), r(e);
 	};
 })), Eh = /* @__PURE__ */ R(((e, t) => {
-	var n = Th(), r = H("path").posix.dirname, i = H("os").platform() === "win32", a = "/", o = /\\/g, s = /[{[].*[}\]]$/, c = /(^|[^\\])([{[]|\([^)]+$)/, l = /\\([!*?|[\](){}])/g;
+	var n = Th(), r = H("path").posix.dirname, i = H("os").platform() === "win32", a = "/", o = /\\/g, s = /[\{\[].*[\}\]]$/, c = /(^|[^\\])([\{\[]|\([^\)]+$)/, l = /\\([\!\*\?\|\[\]\(\)\{\}])/g;
 	t.exports = function(e, t) {
 		Object.assign({ flipBackslashes: !0 }, t).flipBackslashes && i && e.indexOf(a) < 0 && (e = e.replace(o, a)), s.test(e) && (e += a), e += "a";
 		do
@@ -61009,7 +61012,7 @@ var Ug = /* @__PURE__ */ B((/* @__PURE__ */ R(((e, t) => {
 		[/\\\\\\(?=[$.|*+(){^])/g, () => o],
 		[/\\\\/g, () => o],
 		[/(\\)?\[([^\]/]*?)(\\*)($|\])/g, (e, t, n, r, i) => t === o ? `\\[${n}${x(r)}${i}` : i === "]" && r.length % 2 == 0 ? `[${b(n)}${r}]` : "[]"],
-		[/(?:[^*])$/, (e) => e.endsWith('/') ? `${e}$` : `${e}(?=$|\\/$)`]
+		[/(?:[^*])$/, (e) => /\/$/.test(e) ? `${e}$` : `${e}(?=$|\\/$)`]
 	], C = /(^|\\\/)?\\\*$/, w = "regex", T = "checkRegex", E = "_", D = {
 		[w](e, t) {
 			return `${t ? `${t}[^/]+` : "[^/]*"}(?=$|\\/$)`;
@@ -61117,7 +61120,7 @@ var Ug = /* @__PURE__ */ B((/* @__PURE__ */ R(((e, t) => {
 			return this._test(e, this._testCache, !0);
 		}
 	}, R = (e) => new L(e), z = (e) => F(e && F.convert(e), e, y), te = () => {
-		F.convert = (e) => e.startsWith('\\\\?\\') || /["<>|\u0000-\u001F]+/u.test(e) ? e : e.replace(/\\/g, "/");
+		F.convert = (e) => /^\\\\\?\\/.test(e) || /["<>|\u0000-\u001F]+/u.test(e) ? e : e.replace(/\\/g, "/");
 		let e = /^[a-z]:\//i;
 		F.isNotRelative = (t) => e.test(t) || I(t);
 	};
@@ -61335,19 +61338,66 @@ var E_ = A(process.cwd(), "skins"), D_ = A(process.cwd(), "backup"), O_ = A(E_,
 }, M_ = (e, t) => {
 	let n = A_(e, t);
 	return v(n) ? x(n).filter((e) => e.endsWith(".skin")) : [];
-}, N_ = (e, t) => e.split(t).filter((e) => e.trim().length).map((e) => e.toLowerCase()), P_ = async (e, t, n) => {
+}, N_ = (e, t) => e.split(t).filter((e) => e.trim().length).map((e) => e.toLowerCase()), P_ = (e) => e.charAt(0).toUpperCase() + e.slice(1), F_ = async (e, t, n, r) => {
+	let i = n.match(/<%\s.*?\.skin name=".*?"\s%>/g);
+	if (i) for (let n of i) {
+		let i = n.match(/(\w+)\.skin name="(\w+)"/);
+		if (!i) continue;
+		let a = `${P_(i[1])}.${i[2]}`, o = await e.getActiveLayoutUrl(t), { skin: s } = await e.getSkin({
+			name: a,
+			url: `${o}/skins/edit?key=${a}`
+		});
+		r[a] = s, r = await F_(e, t, s, r);
+	}
+	return r;
+}, I_ = async (e, t, n) => {
 	try {
 		await e.login();
 		for (let r of t) {
-			console.log(Fi.green(`\nNow processing alias "${r}"...`));
-			let t = A_(r, n.backup), i = await e.getModifiedSkins(r);
+			if (console.log(Fi.green(`\nNow processing alias "${r}"...`)), n.layout) {
+				let t = await e.useLayout(r, n.layout);
+				console.log(Fi.green(`Switching to layout "${t.activeLayoutName} of alias "${r}".`));
+			}
+			let t = A_(r, n.backup), i = await e.getModifiedSkins(r), a = {};
 			i.length && !v(t) && y(t), console.log(Fi.yellow(`${r} has ${i.length} modified skin${i.length === 1 ? "" : "s"}`)), n.skin && console.log(Fi.yellow(`Filtering skins for ${n.skin}.`));
-			for (let r of i) {
-				if (n.skin && !n.skin.test(r.name)) continue;
-				console.log(Fi.gray(`Reading "${r.name}".`));
-				let { title: i, description: a, skin: o } = await e.getSkin(r);
-				k_.setData(r.name, i, a), S(A(t, `${r.name}.skin`), o);
+			for (let t of i) {
+				if (n.skin && !n.skin.test(t.name)) continue;
+				console.log(Fi.gray(`Reading "${t.name}".`));
+				let { title: i, description: o, skin: s } = await e.getSkin(t);
+				k_.setData(t.name, i, o), a[t.name] = s, a = await F_(e, r, s, a);
+			}
+			if (n.modules) {
+				console.log(Fi.yellow("Exporting sidebar freetext modules as requested."));
+				let t = await e.getSidebarModules(r), n = [...t.sidebar01, ...t.sidebar02];
+				for (let t of n) if (e.isValidFreeTextModule(t)) {
+					console.log(Fi.gray(`Reading sidebar module "${t}".`));
+					let { heading: n, content: i } = await e.getFreeTextModule(r, t);
+					a[`Sidebar.${t}`] = `${n}\n${i}`;
+				} else {
+					let { skins: n } = await e.getModuleSkins(r, t);
+					for (let t of n) {
+						let { title: n, description: r, skin: i } = await e.getSkin(t);
+						k_.setData(t.name, n, r), a[t.name] = i;
+					}
+				}
+			}
+			if (n.toolbar) {
+				let t = await e.getActiveLayoutUrl(r);
+				for (let n of [
+					"Main",
+					"DropDowns",
+					"Closed"
+				]) {
+					let r = `Site.modToolbar${n}`;
+					console.log(Fi.gray(`Reading "${r}".`));
+					let { title: i, description: o, skin: s } = await e.getSkin({
+						name: r,
+						url: `${t}/skins/edit?key=${r}`
+					});
+					k_.setData(r, i, o), a[r] = s;
+				}
 			}
+			for (let [e, n] of Object.entries(a)) S(A(t, `${e}.skin`), n);
 		}
 		console.log(Fi.green("Download completed."));
 	} catch (e) {
@@ -61355,23 +61405,41 @@ var E_ = A(process.cwd(), "skins"), D_ = A(process.cwd(), "backup"), O_ = A(E_,
 	} finally {
 		k_.store();
 	}
-}, F_ = async (e, t, n) => {
+}, L_ = async (e, t, n) => {
 	try {
 		await e.login();
 		for (let r of t) {
-			console.log(Fi.green(`\nNow processing alias "${r}"...`));
+			if (console.log(Fi.green(`\nNow processing alias "${r}"...`)), n.layout) {
+				let t = await e.useLayout(r, n.layout);
+				console.log(Fi.green(`Switching to layout "${t.activeLayoutName} of alias "${r}".`));
+			}
 			let t = M_(r, n.backup);
 			console.log(Fi.yellow(`${r} has ${t.length} local skins. `) + Fi.red(`${t.length === 0 ? "Got nothing to do!" : ""}`)), n.skin && console.log(Fi.yellow(`Filtering skins for ${n.skin}.`));
 			let i = await e.getModifiedSkins(r), a = new Set(i.map((e) => e.name)), o = A_(r, n.backup);
 			for (let i of t) {
 				if (!i.endsWith(".skin") || n.skin && !n.skin.test(i)) continue;
-				let t = k_.getData(i);
-				t.content = b(A(o, i)).toString().replace(/\r\n/g, "\n"), console.log(Fi.blue(`Now updating skin ${t.name} (len=${t.content.length}).`)), await e.updateSkin(r, t.name, {
-					title: t.title,
-					description: t.description,
-					skin: t.content,
-					diff: n.debug
-				}), console.log(Fi.green(`Update request completed for skin: ${t.name}`)), a.has(t.name) && a.delete(t.name);
+				let [t, s] = i.split(".");
+				if (t === "Sidebar") {
+					let t = b(A(o, i)).toString().replace(/\r\n/g, "\n"), n = t.indexOf("\n"), a = t.slice(0, n), c = t.slice(++n);
+					console.log(Fi.blue(`Now updating sidebar module ${s} (len=${c.length}).`)), await e.updateFreeTextModule(r, s, {
+						heading: a,
+						content: c
+					}), console.log(Fi.green(`Update request completed for module: ${s}`));
+				} else {
+					let { isValid: t, prototype: a } = e.isValidHoptype(i.slice(0, -5));
+					if (!t) {
+						console.log(Fi.red(`Skipping upload for invalid skin hoptype "${a}" (Skin file ${i}).`));
+						continue;
+					}
+					let s = k_.getData(i);
+					s.content = b(A(o, i)).toString().replace(/\r\n/g, "\n"), console.log(Fi.blue(`Now updating skin ${s.name} (len=${s.content.length}).`)), await e.updateSkin(r, s.name, {
+						title: s.title,
+						description: s.description,
+						skin: s.content,
+						diff: n.debug
+					}), console.log(Fi.green(`Update request completed for skin: ${s.name}`));
+				}
+				a.has(skin.name) && a.delete(skin.name);
 			}
 			a.size > 0 && (console.log(Fi.blue(`\nFollowing skins exist on "${r}" and were not touched by this upload:`)), a.forEach((e) => console.log(`--> ${Fi.blue(e)}`)));
 		}
@@ -61379,12 +61447,12 @@ var E_ = A(process.cwd(), "skins"), D_ = A(process.cwd(), "backup"), O_ = A(E_,
 	} catch (e) {
 		console.log(Fi.red(`Error while uploading skins: ${e}`));
 	}
-}, I_ = {
+}, R_ = {
 	different: "cyan",
 	identical: "grey",
 	new: "green",
 	untouched: "grey"
-}, L_ = (e, t) => e.name < t.name ? -1 : +(e.name > t.name), R_ = async (e, t) => {
+}, z_ = (e, t) => e.name < t.name ? -1 : +(e.name > t.name), B_ = async (e, t) => {
 	let n = { aliases: [] };
 	try {
 		typeof t == "string" && (t = [t]), await e.login();
@@ -61397,7 +61465,7 @@ var E_ = A(process.cwd(), "skins"), D_ = A(process.cwd(), "backup"), O_ = A(E_,
 			let o = A_(i, !1), s = M_(i, !1).map((e) => {
 				let t = k_.getData(e);
 				return t.skin = b(A(o, e)).toString().replace(/\r\n/g, "\n"), t;
-			}).sort(L_), c = await e.getModifiedSkins(a), l = [];
+			}).sort(z_), c = await e.getModifiedSkins(a), l = [];
 			for (let t of c) l.push(e.getSkin(t));
 			let u = (await Promise.all(l)).map((e) => {
 				let { name: t, title: n, description: r, skin: i } = e;
@@ -61407,7 +61475,7 @@ var E_ = A(process.cwd(), "skins"), D_ = A(process.cwd(), "backup"), O_ = A(E_,
 					description: r,
 					skin: i
 				};
-			}).sort(L_), d = 0, f = 0;
+			}).sort(z_), d = 0, f = 0;
 			for (; d < s.length && f < u.length;) {
 				let n = d < s.length ? s[d].name : "￿", r = f < u.length ? u[f].name : "￿", i = {
 					open: !1,
@@ -61417,7 +61485,7 @@ var E_ = A(process.cwd(), "skins"), D_ = A(process.cwd(), "backup"), O_ = A(E_,
 					console.log(Fi.white(`Processing skin ${Fi.italic(n)}`));
 					let t = e.diffSkin(n, u[f], s[d]);
 					i.class = t.skinChanged ? "different" : "identical", i.open = t.skinChanged, i.text = `${t.skinName} is ${i.class}.`, i.results = t.results, d++, f++;
-				} else n < r ? (i.text = `Local skin ${n} missing on remote. Will be created upon update!`, i.class = "new", d++) : (i.text = `Remote skin ${r} without local counterpart. Will remain untouched upon update!`, i.class = "untouched", f++), console.log(Fi[I_[i.class]](i.text));
+				} else n < r ? (i.text = `Local skin ${n} missing on remote. Will be created upon update!`, i.class = "new", d++) : (i.text = `Remote skin ${r} without local counterpart. Will remain untouched upon update!`, i.class = "untouched", f++), console.log(Fi[R_[i.class]](i.text));
 				t.skins.push(i);
 			}
 			n.aliases.push(t);
@@ -61428,7 +61496,7 @@ var E_ = A(process.cwd(), "skins"), D_ = A(process.cwd(), "backup"), O_ = A(E_,
 	} catch (e) {
 		console.log(Fi.red(`Error while comparing skins: ${e}`));
 	}
-}, z_ = /* @__PURE__ */ R(((e, t) => {
+}, V_ = /* @__PURE__ */ R(((e, t) => {
 	var n = H("fs"), r = H("path");
 	function i(e) {
 		console.log(`[dotenv][DEBUG] ${e}`);
@@ -61457,7 +61525,7 @@ var E_ = A(process.cwd(), "skins"), D_ = A(process.cwd(), "backup"), O_ = A(E_,
 		}
 	}
 	t.exports.config = u, t.exports.parse = l;
-})), B_ = /* @__PURE__ */ R(((e, t) => {
+})), H_ = /* @__PURE__ */ R(((e, t) => {
 	var n = H("util");
 	function r(e, t, n, r, i) {
 		let a = `The following variables were defined in ${n} but are not present in the environment:\n  ${r.join(", ")}
@@ -61469,8 +61537,8 @@ Make sure to add them to ${t} or directly to the environment.`, o = e ? "" : "If
 		].filter(Boolean).join("\n\n"), Error.captureStackTrace(this, this.constructor);
 	}
 	n.inherits(r, Error), t.exports = r;
-})), V_ = (/* @__PURE__ */ R(((e, t) => {
-	var n = z_(), r = H("fs"), i = B_();
+})), U_ = (/* @__PURE__ */ R(((e, t) => {
+	var n = V_(), r = H("fs"), i = H_();
 	function a(e, t) {
 		return e.filter((e) => t.indexOf(e) < 0);
 	}
@@ -61493,7 +61561,7 @@ Make sure to add them to ${t} or directly to the environment.`, o = e ? "" : "If
 		parse: n.parse,
 		MissingEnvVarsError: i
 	}, t.exports.MissingEnvVarsError = i;
-})))(), H_ = ei(process.argv.slice(2)).options({
+})))(), W_ = ei(process.argv.slice(2)).options({
 	from: {
 		alias: "f",
 		description: "Platform where to download the skins from: \"dev\" or \"prod\"",
@@ -61514,6 +61582,23 @@ Make sure to add them to ${t} or directly to the environment.`, o = e ? "" : "If
 		description: "Skin selection string (regex) to filter the skins to upload",
 		type: "string"
 	},
+	layout: {
+		alias: "l",
+		description: "Uses this layout name for all subsequent actions",
+		default: "",
+		type: "string"
+	},
+	modules: {
+		alias: "m",
+		description: "Download sidebar module skins/freetext as well",
+		default: !1,
+		type: "boolean"
+	},
+	toolbar: {
+		description: "Download modToolbar skins, too",
+		default: !1,
+		type: "boolean"
+	},
 	backup: {
 		alias: "b",
 		description: "Backup skins to the local /backup folder to preserve their former status",
@@ -61535,20 +61620,23 @@ Make sure to add them to ${t} or directly to the environment.`, o = e ? "" : "If
 		type: "boolean"
 	}
 }).argv;
-(0, V_.config)(), !H_.from && !H_.to && (console.log("Desired action must be specified with --from=dev|prod or --to=dev|prod"), process.exit(1)), H_.from && H_.to && (console.log("You cannot specify --from=dev|prod AND --to=dev|prod in one run"), process.exit(1)), H_.compare && !H_.to && (console.log("You must specify a target platform with --to=dev|prod when comparing skins"), process.exit(1)), H_.alias || (console.log("You must specify the desired alias(es) with --alias=name1[,name2,...] OR --alias=*"), process.exit(1));
-var U_ = (H_.from || H_.to).toLowerCase(), W_ = new yh.Twoday(U_, { delay: 100 }), G_ = H_.alias === "*" ? [
+(0, U_.config)(), !W_.from && !W_.to && (console.log("Desired action must be specified with --from=dev|prod or --to=dev|prod"), process.exit(1)), W_.from && W_.to && (console.log("You cannot specify --from=dev|prod AND --to=dev|prod in one run"), process.exit(1)), W_.compare && !W_.to && (console.log("You must specify a target platform with --to=dev|prod when comparing skins"), process.exit(1)), W_.alias || (console.log("You must specify the desired alias(es) with --alias=name1[,name2,...] OR --alias=*"), process.exit(1));
+var G_ = (W_.from || W_.to).toLowerCase(), K_ = new yh.Twoday(G_, { delay: 100 }), q_ = W_.alias === "*" ? [
 	"www",
 	"info",
 	"help",
 	"top"
-] : N_(H_.alias, ",");
-if (H_.compare) G_.length === 1 && G_[0].includes(":") && console.log(`Start comparing local skin files of alias${G_.length > 1 ? "es" : ""} ${Fi.yellow(G_.join(", "))} to ${Fi.green(W_.fullDomain)}...`), R_(W_, G_);
+] : N_(W_.alias, ",");
+if (W_.compare) q_.length === 1 && q_[0].includes(":") && console.log(`Start comparing local skin files of alias${q_.length > 1 ? "es" : ""} ${Fi.yellow(q_.join(", "))} to ${Fi.green(K_.fullDomain)}...`), B_(K_, q_);
 else {
-	let e = H_.from ? "down" : "up", t = H_.from ? "from" : "to", n = H_.from ? P_ : F_;
-	e === "down" && H_.clean && j_(G_, H_.backup), console.log(`Start ${e}loading modified skins of alias${G_.length > 1 ? "es" : ""} ${Fi.yellow(G_.join(", "))} ${t} remote ${Fi.green(W_.fullDomain)}...`), n(W_, G_, {
-		backup: H_.backup,
-		debug: H_.debug,
-		skin: H_.skin ? new RegExp(H_.skin) : null
+	let e = W_.from ? "down" : "up", t = W_.from ? "from" : "to", n = W_.from ? I_ : L_;
+	e === "down" && W_.clean && (j_(q_, W_.backup), console.log(Fi.yellow(`Cleaning target download folder/s for "${q_}".`))), console.log(`Start ${e}loading modified skins of alias${q_.length > 1 ? "es" : ""} ${Fi.yellow(q_.join(", "))} ${t} remote ${Fi.green(K_.fullDomain)}...`), n(K_, q_, {
+		backup: W_.backup,
+		debug: W_.debug,
+		layout: W_.layout,
+		modules: W_.modules,
+		skin: W_.skin ? new RegExp(W_.skin) : null,
+		toolbar: W_.toolbar
 	});
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neonwilderness/moveskins",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "description": "Download/Upload/Compare modified skins for selected aliases on Twoday",
   "keywords": [
     "antville",
@@ -38,6 +38,7 @@
     "compare:blogs": "node ./src/index --compare --alias=foundation:info --to=prod && npm run report",
     "download": "node ./src/index --alias=www --from=prod --modules",
     "download2": "node ./src/index --alias=info,help --from=prod",
+    "download:toolbar": "node ./src/index --alias=www --from=prod --toolbar --skin=modToolbar",
     "download:clean": "node ./src/index --alias=www --from=prod --clean --modules",
     "download:core": "node ./src/index --alias=* --from=prod --modules",
     "download:core:clean": "node ./src/index --alias=* --from=prod --clean --modules",
@@ -61,7 +62,7 @@
   "devDependencies": {
     "@vitest/ui": "4.1.5",
     "slash": "^5.1.0",
-    "vite-plus": "^0.1.19"
+    "vite-plus": "^0.1.20"
   },
   "engines": {
     "node": ">=20"

package/skins/skinRegister.json

@@ -222,5 +222,13 @@
   "Site.adminnavigation": {
     "title": "Navigationsleiste für Site Administratoren",
     "description": "Dieses Skin beinhaltet die zusätzlichen Navigationselemente für Site Administratoren. (z.B. »Einstellungen bearbeiten«, »Skins bearbeiten«, ...)"
+  },
+  "Site.modToolbarMain": {
+    "title": "Toolbar HTML-Code",
+    "description": "HTML-Code der toolbar Zeile, jedoch ohne die Dropdowns."
+  },
+  "Site.modToolbarClosed": {
+    "title": "Closed Toolbar",
+    "description": "Geschlossene Version der Toolbar."
   }
 }

package/src/_download.js

@@ -42,6 +42,12 @@ const downloadModifiedSkins = async (td, aliases, options) => {
 
     for (let alias of aliases) {
       console.log(chalk.green(`\nNow processing alias "${alias}"...`));
+
+      if (options.layout) {
+        const layout = await td.useLayout(alias, options.layout);
+        console.log(chalk.green(`Switching to layout "${layout.activeLayoutName} of alias "${alias}".`));
+      }
+
       const aliasSkinDir = aliasSkinFolder(alias, options.backup);
       const modifiedSkins = await td.getModifiedSkins(alias);
       let skinContainer = {};
@@ -69,7 +75,7 @@ const downloadModifiedSkins = async (td, aliases, options) => {
         const sidebar = await td.getSidebarModules(alias);
         const moduleNames = [...sidebar.sidebar01, ...sidebar.sidebar02];
         for (let module of moduleNames) {
-          if (/FreeText\d{2}/.test(module)) {
+          if (td.isValidFreeTextModule(module)) {
             console.log(chalk.gray(`Reading sidebar module "${module}".`));
             const { heading, content } = await td.getFreeTextModule(alias, module);
             skinContainer[`Sidebar.${module}`] = `${heading}\n${content}`;
@@ -84,6 +90,20 @@ const downloadModifiedSkins = async (td, aliases, options) => {
         }
       }
 
+      if (options.toolbar) {
+        const layoutUrl = await td.getActiveLayoutUrl(alias);
+        for (const s of ["Main", "DropDowns", "Closed"]) {
+          const name = `Site.modToolbar${s}`;
+          console.log(chalk.gray(`Reading "${name}".`));
+          const { title, description, skin } = await td.getSkin({
+            name,
+            url: `${layoutUrl}/skins/edit?key=${name}`,
+          });
+          skinRegister.setData(name, title, description);
+          skinContainer[name] = skin;
+        }
+      }
+
       for (const [name, content] of Object.entries(skinContainer)) {
         writeFileSync(resolve(aliasSkinDir, `${name}.skin`), content);
       }

package/src/_upload.js

@@ -20,6 +20,12 @@ const uploadModifiedSkins = async (td, aliases, options) => {
 
     for (let alias of aliases) {
       console.log(chalk.green(`\nNow processing alias "${alias}"...`));
+
+      if (options.layout) {
+        const layout = await td.useLayout(alias, options.layout);
+        console.log(chalk.green(`Switching to layout "${layout.activeLayoutName} of alias "${alias}".`));
+      }
+
       const localSkinFiles = getLocalSkins(alias, options.backup);
       console.log(
         chalk.yellow(`${alias} has ${localSkinFiles.length} local skins. `) +

package/src/index.js

@@ -33,12 +33,23 @@ const argv = yargs(process.argv.slice(2)).options({
     description: "Skin selection string (regex) to filter the skins to upload",
     type: "string",
   },
+  layout: {
+    alias: "l",
+    description: "Uses this layout name for all subsequent actions",
+    default: '',
+    type: "string",
+  },
   modules: {
     alias: "m",
     description: "Download sidebar module skins/freetext as well",
     default: false,
     type: "boolean",
   },
+  toolbar: {
+    description: "Download modToolbar skins, too",
+    default: false,
+    type: "boolean",
+  },
   backup: {
     alias: "b",
     description: "Backup skins to the local /backup folder to preserve their former status",
@@ -118,7 +129,9 @@ if (argv.compare) {
   execTask(td, aliases, {
     backup: argv.backup,
     debug: argv.debug,
+    layout: argv.layout,
     modules: argv.modules,
     skin: argv.skin ? new RegExp(argv.skin) : null,
+    toolbar: argv.toolbar,
   });
 }