@neonwilderness/moveskins 1.3.0 → 1.4.1

package/CHANGELOG.md

@@ -1,8 +1,17 @@
 # Changelog
 
+## 1.4.1 (11.05.2026)
+
+- Integrate .oxlint and .oxfmt configs into vite.config.js file
+- Run vp check:fix to finally apply formatting rules
+
+## 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 
+- Add --toolbar CLI switch to additionally download 3 related modToolbar skins
 
 ## 1.2.0 (25.04.2026)
 

package/dist/index.js

@@ -61354,7 +61354,10 @@ var E_ = A(process.cwd(), "skins"), D_ = A(process.cwd(), "backup"), O_ = A(E_,
 	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 = 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 t of i) {
@@ -61406,7 +61409,10 @@ var E_ = A(process.cwd(), "skins"), D_ = A(process.cwd(), "backup"), O_ = A(E_,
 	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);
@@ -61576,6 +61582,12 @@ 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",
@@ -61621,6 +61633,7 @@ else {
 	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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neonwilderness/moveskins",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "description": "Download/Upload/Compare modified skins for selected aliases on Twoday",
   "keywords": [
     "antville",

package/src/_compare.js

@@ -1,18 +1,20 @@
+import { readFileSync, writeFileSync } from 'node:fs';
+import { resolve } from 'node:path';
+
 /**
  * Compare
  * =======
  *
  */
-import chalk from "chalk";
-import { readFileSync, writeFileSync } from "node:fs";
-import { resolve } from "node:path";
-import { aliasSkinFolder, getLocalSkins, skinRegister, splitAliases } from "./_utils.js";
+import chalk from 'chalk';
+
+import { aliasSkinFolder, getLocalSkins, skinRegister, splitAliases } from './_utils.js';
 
 const classToColor = {
-  different: "cyan",
-  identical: "grey",
-  new: "green",
-  untouched: "grey",
+  different: 'cyan',
+  identical: 'grey',
+  new: 'green',
+  untouched: 'grey'
 };
 
 /**
@@ -36,28 +38,24 @@ const skinsByName = (skinA, skinB) => {
 const compareLocalToRemoteSkins = async (td, aliases) => {
   const alpineView = { aliases: [] };
   try {
-    if (typeof aliases === "string") aliases = [aliases];
+    if (typeof aliases === 'string') aliases = [aliases];
 
     await td.login();
 
     for (let alias of aliases) {
-      let aliasView = { header: "", skins: [] };
+      let aliasView = { header: '', skins: [] };
       let localAlias = alias;
       let remoteAlias = alias;
-      if (alias.includes(":")) [localAlias, remoteAlias] = splitAliases(alias, ":");
+      if (alias.includes(':')) [localAlias, remoteAlias] = splitAliases(alias, ':');
       aliasView.header = `Now comparing local alias "${localAlias}" to remote ${td.platform.toUpperCase()} alias "${remoteAlias}@${td.fullDomain}" [${new Date().toLocaleString()}] ...`;
       console.log(chalk.green(`\n${aliasView.header}`));
-      aliasView.header = aliasView.header
-        .replace("local", "<ins>local</ins>")
-        .replace("remote", "<del>remote</del>");
+      aliasView.header = aliasView.header.replace('local', '<ins>local</ins>').replace('remote', '<del>remote</del>');
 
       const aliasSkinDir = aliasSkinFolder(localAlias, false);
       const localSkinData = getLocalSkins(localAlias, false)
         .map((skinFile) => {
           const localSkin = skinRegister.getData(skinFile);
-          localSkin.skin = readFileSync(resolve(aliasSkinDir, skinFile))
-            .toString()
-            .replace(/\r\n/g, "\n");
+          localSkin.skin = readFileSync(resolve(aliasSkinDir, skinFile)).toString().replace(/\r\n/g, '\n');
           return localSkin;
         })
         .sort(skinsByName);
@@ -85,7 +83,7 @@ const compareLocalToRemoteSkins = async (td, aliases) => {
         if (lName === rName) {
           console.log(chalk.white(`Processing skin ${chalk.italic(lName)}`));
           let skinDiff = td.diffSkin(lName, remoteSkinData[r], localSkinData[l]);
-          skinView.class = skinDiff.skinChanged ? "different" : "identical";
+          skinView.class = skinDiff.skinChanged ? 'different' : 'identical';
           skinView.open = skinDiff.skinChanged;
           skinView.text = `${skinDiff.skinName} is ${skinView.class}.`;
           skinView.results = skinDiff.results;
@@ -94,12 +92,12 @@ const compareLocalToRemoteSkins = async (td, aliases) => {
         } else {
           if (lName < rName) {
             skinView.text = `Local skin ${lName} missing on remote. Will be created upon update!`;
-            skinView.class = "new";
+            skinView.class = 'new';
             l++;
           } else {
             // lName > rName
             skinView.text = `Remote skin ${rName} without local counterpart. Will remain untouched upon update!`;
-            skinView.class = "untouched";
+            skinView.class = 'untouched';
             r++;
           }
           console.log(chalk[classToColor[skinView.class]](skinView.text));
@@ -109,21 +107,16 @@ const compareLocalToRemoteSkins = async (td, aliases) => {
       alpineView.aliases.push(aliasView);
     }
 
+    writeFileSync(resolve(process.cwd(), './src/template.json'), JSON.stringify(alpineView, null, 2));
+    const alpineTemplate = readFileSync(resolve(process.cwd(), './src/template.html')).toString().trim();
     writeFileSync(
-      resolve(process.cwd(), "./src/template.json"),
-      JSON.stringify(alpineView, null, 2),
-    );
-    const alpineTemplate = readFileSync(resolve(process.cwd(), "./src/template.html"))
-      .toString()
-      .trim();
-    writeFileSync(
-      resolve(process.cwd(), "./report.html"),
-      alpineTemplate.replace("$$templateJSON", `(${JSON.stringify(alpineView, null, 2)})`),
+      resolve(process.cwd(), './report.html'),
+      alpineTemplate.replace('$$templateJSON', `(${JSON.stringify(alpineView, null, 2)})`)
     );
 
-    console.log(chalk.green("Local/Remote comparison completed."));
+    console.log(chalk.green('Local/Remote comparison completed.'));
   } catch (e) {
-    console.log(chalk.red(`Error while comparing skins: ${e}`));
+    console.log(chalk.red(`Error while comparing skins: ${e.toString()}`));
   }
 };
 

package/src/_download.js

@@ -1,12 +1,14 @@
+import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
+import { resolve } from 'node:path';
+
 /**
  * Download
  * ========
  *
  */
-import chalk from "chalk";
-import { existsSync, mkdirSync, writeFileSync } from "node:fs";
-import { resolve } from "node:path";
-import { aliasSkinFolder, skinRegister } from "./_utils.js";
+import chalk from 'chalk';
+
+import { aliasSkinFolder, skinRegister } from './_utils.js';
 
 const capitalize = (text) => text.charAt(0).toUpperCase() + text.slice(1);
 
@@ -21,7 +23,7 @@ const findEmbeddedSkinMacros = async (td, alias, skinContent, skinContainer) =>
       const layoutUrl = await td.getActiveLayoutUrl(alias);
       const { skin } = await td.getSkin({
         name: skinName,
-        url: `${layoutUrl}/skins/edit?key=${skinName}`,
+        url: `${layoutUrl}/skins/edit?key=${skinName}`
       });
       skinContainer[skinName] = skin;
       skinContainer = await findEmbeddedSkinMacros(td, alias, skin, skinContainer);
@@ -42,15 +44,19 @@ 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 = {};
 
       if (modifiedSkins.length && !existsSync(aliasSkinDir)) mkdirSync(aliasSkinDir);
       console.log(
-        chalk.yellow(
-          `${alias} has ${modifiedSkins.length} modified skin${modifiedSkins.length !== 1 ? "s" : ""}`,
-        ),
+        chalk.yellow(`${alias} has ${modifiedSkins.length} modified skin${modifiedSkins.length !== 1 ? 's' : ''}`)
       );
       if (options.skin) console.log(chalk.yellow(`Filtering skins for ${options.skin}.`));
 
@@ -86,12 +92,12 @@ const downloadModifiedSkins = async (td, aliases, options) => {
 
       if (options.toolbar) {
         const layoutUrl = await td.getActiveLayoutUrl(alias);
-        for (const s of ["Main", "DropDowns", "Closed"]) {
+        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}`,
+            url: `${layoutUrl}/skins/edit?key=${name}`
           });
           skinRegister.setData(name, title, description);
           skinContainer[name] = skin;
@@ -102,9 +108,9 @@ const downloadModifiedSkins = async (td, aliases, options) => {
         writeFileSync(resolve(aliasSkinDir, `${name}.skin`), content);
       }
     }
-    console.log(chalk.green("Download completed."));
+    console.log(chalk.green('Download completed.'));
   } catch (e) {
-    console.log(chalk.red(`Error while downloading skins: ${e}`));
+    console.log(chalk.red(`Error while downloading skins: ${e.toString()}`));
   } finally {
     skinRegister.store();
   }

package/src/_upload.js

@@ -1,12 +1,14 @@
+import { readFileSync } from 'node:fs';
+import { resolve } from 'node:path';
+
 /**
  * Upload
  * ======
  *
  */
-import chalk from "chalk";
-import { readFileSync } from "node:fs";
-import { resolve } from "node:path";
-import { aliasSkinFolder, getLocalSkins, skinRegister } from "./_utils.js";
+import chalk from 'chalk';
+
+import { aliasSkinFolder, getLocalSkins, skinRegister } from './_utils.js';
 
 /**
  * Uploads all local skins of selected aliases to the target platform
@@ -20,10 +22,16 @@ 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. `) +
-          chalk.red(`${localSkinFiles.length === 0 ? "Got nothing to do!" : ""}`),
+          chalk.red(`${localSkinFiles.length === 0 ? 'Got nothing to do!' : ''}`)
       );
       if (options.skin) console.log(chalk.yellow(`Filtering skins for ${options.skin}.`));
 
@@ -32,15 +40,13 @@ const uploadModifiedSkins = async (td, aliases, options) => {
       const aliasSkinDir = aliasSkinFolder(alias, options.backup);
 
       for (let skinFile of localSkinFiles) {
-        if (!skinFile.endsWith(".skin")) continue;
+        if (!skinFile.endsWith('.skin')) continue;
         if (options.skin && !options.skin.test(skinFile)) continue;
 
-        const [hoptype, name] = skinFile.split(".");
-        if (hoptype === "Sidebar") {
-          const module = readFileSync(resolve(aliasSkinDir, skinFile))
-            .toString()
-            .replace(/\r\n/g, "\n");
-          let splitAt = module.indexOf("\n");
+        const [hoptype, name] = skinFile.split('.');
+        if (hoptype === 'Sidebar') {
+          const module = readFileSync(resolve(aliasSkinDir, skinFile)).toString().replace(/\r\n/g, '\n');
+          let splitAt = module.indexOf('\n');
           const heading = module.slice(0, splitAt);
           const content = module.slice(++splitAt);
           console.log(chalk.blue(`Now updating sidebar module ${name} (len=${content.length}).`));
@@ -49,24 +55,18 @@ const uploadModifiedSkins = async (td, aliases, options) => {
         } else {
           const { isValid, prototype } = td.isValidHoptype(skinFile.slice(0, -5));
           if (!isValid) {
-            console.log(
-              chalk.red(
-                `Skipping upload for invalid skin hoptype "${prototype}" (Skin file ${skinFile}).`,
-              ),
-            );
+            console.log(chalk.red(`Skipping upload for invalid skin hoptype "${prototype}" (Skin file ${skinFile}).`));
             continue;
           }
           const skin = skinRegister.getData(skinFile);
-          skin.content = readFileSync(resolve(aliasSkinDir, skinFile))
-            .toString()
-            .replace(/\r\n/g, "\n");
+          skin.content = readFileSync(resolve(aliasSkinDir, skinFile)).toString().replace(/\r\n/g, '\n');
 
           console.log(chalk.blue(`Now updating skin ${skin.name} (len=${skin.content.length}).`));
           await td.updateSkin(alias, skin.name, {
             title: skin.title,
             description: skin.description,
             skin: skin.content,
-            diff: options.debug,
+            diff: options.debug
           });
           console.log(chalk.green(`Update request completed for skin: ${skin.name}`));
         }
@@ -75,15 +75,13 @@ const uploadModifiedSkins = async (td, aliases, options) => {
       }
 
       if (currentSkins.size > 0) {
-        console.log(
-          chalk.blue(`\nFollowing skins exist on "${alias}" and were not touched by this upload:`),
-        );
+        console.log(chalk.blue(`\nFollowing skins exist on "${alias}" and were not touched by this upload:`));
         currentSkins.forEach((skinName) => console.log(`--> ${chalk.blue(skinName)}`));
       }
     }
-    console.log(chalk.green("Upload completed."));
+    console.log(chalk.green('Upload completed.'));
   } catch (e) {
-    console.log(chalk.red(`Error while uploading skins: ${e}`));
+    console.log(chalk.red(`Error while uploading skins: ${e.toString()}`));
   }
 };
 

package/src/_utils.js

@@ -1,23 +1,22 @@
+import { existsSync, readFileSync, writeFileSync, readdirSync } from 'node:fs';
+import { resolve } from 'node:path';
+
 /**
  * Utility functions
  * =================
  *
  */
-import { deleteSync } from "del";
-import { existsSync, readFileSync, writeFileSync, readdirSync } from "node:fs";
-import { resolve } from "node:path";
+import { deleteSync } from 'del';
 
 // Read centrally stored skin header data (name => title, description)
-const skinsFolder = resolve(process.cwd(), "skins");
-const backupFolder = resolve(process.cwd(), "backup");
-const pathToRegister = resolve(skinsFolder, "skinRegister.json");
+const skinsFolder = resolve(process.cwd(), 'skins');
+const backupFolder = resolve(process.cwd(), 'backup');
+const pathToRegister = resolve(skinsFolder, 'skinRegister.json');
 const skinRegister = {
   data: undefined,
   hasChanged: false,
   load() {
-    this.data = existsSync(pathToRegister)
-      ? JSON.parse(readFileSync(pathToRegister).toString())
-      : {};
+    this.data = existsSync(pathToRegister) ? JSON.parse(readFileSync(pathToRegister).toString()) : {};
     return this.data;
   },
   store() {
@@ -27,17 +26,17 @@ const skinRegister = {
     }
   },
   hasData(skinName) {
-    if (typeof this.data === "undefined") this.load();
+    if (typeof this.data === 'undefined') this.load();
     return this.data.hasOwnProperty(skinName);
   },
   getData(skinFileOrName) {
-    const name = skinFileOrName.endsWith(".skin")
+    const name = skinFileOrName.endsWith('.skin')
       ? skinFileOrName.substr(0, skinFileOrName.length - 5)
       : skinFileOrName;
     if (this.hasData(name)) {
       const { title, description } = this.data[name];
       return { name, title, description };
-    } else return { name, title: name, description: "" };
+    } else return { name, title: name, description: '' };
   },
   setData(skinName, title, description) {
     if (!this.hasData(skinName)) {
@@ -47,7 +46,7 @@ const skinRegister = {
   },
   deleteData(skinName) {
     if (this.hasData(skinName)) delete this.data[skinName];
-  },
+  }
 };
 
 /**
@@ -65,7 +64,7 @@ const aliasSkinFolder = (alias, isBackup) => resolve(isBackup ? backupFolder : s
  */
 const cleanupAliasFolder = (aliases, isBackup) => {
   try {
-    deleteSync(aliases.map((alias) => resolve(aliasSkinFolder(alias, isBackup), "*.skin")));
+    deleteSync(aliases.map((alias) => resolve(aliasSkinFolder(alias, isBackup), '*.skin')));
   } catch (err) {
     console.log(`cleanupAliasFolder ended with error: ${err.toString()}.`);
     process.exit(1);
@@ -79,9 +78,7 @@ const cleanupAliasFolder = (aliases, isBackup) => {
  */
 const getLocalSkins = (alias, isBackup) => {
   const aliasSkinDir = aliasSkinFolder(alias, isBackup);
-  return existsSync(aliasSkinDir)
-    ? readdirSync(aliasSkinDir).filter((file) => file.endsWith(".skin"))
-    : [];
+  return existsSync(aliasSkinDir) ? readdirSync(aliasSkinDir).filter((file) => file.endsWith('.skin')) : [];
 };
 
 /**
@@ -97,11 +94,4 @@ const splitAliases = (aliases, delimiter) => {
     .map((alias) => alias.toLowerCase());
 };
 
-export {
-  pathToRegister,
-  skinRegister,
-  aliasSkinFolder,
-  cleanupAliasFolder,
-  getLocalSkins,
-  splitAliases,
-};
+export { pathToRegister, skinRegister, aliasSkinFolder, cleanupAliasFolder, getLocalSkins, splitAliases };

package/src/create.js

@@ -1,65 +1,63 @@
+import fs from 'node:fs';
+import path from 'node:path';
+
+import * as Twoday from '@neonwilderness/twoday';
+import chalk from 'chalk';
 /**
  * Creates a new skin locally
  */
-import yargs from "yargs/yargs";
-import chalk from "chalk";
-import fs from "node:fs";
-import path from "node:path";
-import * as Twoday from "@neonwilderness/twoday";
-import { skinRegister } from "./_utils.js";
+import yargs from 'yargs/yargs';
+
+import { skinRegister } from './_utils.js';
 const argv = yargs(process.argv.slice(2)).argv;
 
 // Validates script param --alias (blog name/alias)
 if (!argv.alias) {
-  console.log(chalk.red("Error: You must specify a blogname alias with --alias={alias} !!"));
+  console.log(chalk.red('Error: You must specify a blogname alias with --alias={alias} !!'));
   process.exit(1);
 }
 const alias = argv.alias.trim().toLowerCase();
 
 // Validates script param --skin (skin name to be created)
 if (!argv.skin) {
-  console.log(
-    chalk.red("Error: You must specify a skin name to be created with --skin={skinname} !!"),
-  );
-  console.log(chalk.blue("Example: node ./src/create --alias=info --skin=Site.mynewskin"));
+  console.log(chalk.red('Error: You must specify a skin name to be created with --skin={skinname} !!'));
+  console.log(chalk.blue('Example: node ./src/create --alias=info --skin=Site.mynewskin'));
   process.exit(1);
 }
 const skinName = argv.skin;
 
 // Validates skin name syntax (must have 2 strings around a dot)
-const nameParts = skinName.split(".").reduce((all, part) => {
+const nameParts = skinName.split('.').reduce((all, part) => {
   if (part.trim().length) all.push(part);
   return all;
 }, []);
 if (nameParts.length !== 2) {
   console.log(chalk.red(`Error: Wrong skin name syntax "${skinName}" !!`));
-  console.log(chalk.blue("Use skin name syntax: --skin={hoptype}.{name}"));
+  console.log(chalk.blue('Use skin name syntax: --skin={hoptype}.{name}'));
   process.exit(1);
 }
 
 // Main async function to validate hoptype, register the skin and create the physical skin file
 (async () => {
   try {
-    const td = new Twoday.Twoday("prod");
+    const td = new Twoday.Twoday('prod');
     const { valid, prototype, _name } = await td.isValidHoptype(skinName);
 
     if (!valid) {
-      console.log(
-        chalk.red(`Error: Sorry, there is no Hoptype "${prototype}" in the Twoday code base!!`),
-      );
+      console.log(chalk.red(`Error: Sorry, there is no Hoptype "${prototype}" in the Twoday code base!!`));
       process.exit(1);
     }
 
     skinRegister.load();
-    const newSkin = "(new skin)";
+    const newSkin = '(new skin)';
     skinRegister.setData(skinName, `${skinName} ${newSkin}`, `${newSkin}`);
     skinRegister.store();
 
-    const dir = path.resolve(process.cwd(), "skins", alias);
+    const dir = path.resolve(process.cwd(), 'skins', alias);
     if (!fs.existsSync(dir)) fs.mkdirSync(dir);
     fs.writeFileSync(path.resolve(dir, `${skinName}.skin`), `<p><!-- ${newSkin} --></p>\n`);
     console.log(chalk.green(`New skin "${skinName}" successfully established in /skins/${alias}.`));
   } catch (e) {
-    console.log(chalk.red(`An error occured while creating the new skin "${skinName}": ${e}`));
+    console.log(chalk.red(`An error occured while creating the new skin "${skinName}": ${e.toString()}`));
   }
 })();

package/src/images.js

@@ -1,24 +1,25 @@
+import fs from 'node:fs';
+import path from 'node:path';
+
+import * as Twoday from '@neonwilderness/twoday';
+import chalk from 'chalk';
+import { config } from 'dotenv-safe';
 /**
  * Upload /skins/{alias}/images items to create layout images
  */
-import yargs from "yargs/yargs";
-import chalk from "chalk";
-import fs from "node:fs";
-import path from "node:path";
-import * as Twoday from "@neonwilderness/twoday";
-import { config } from "dotenv-safe";
+import yargs from 'yargs/yargs';
 config();
 const argv = yargs(process.argv.slice(2)).argv;
 
 // Validates script param --alias (blog name/alias)
 if (!argv.alias) {
-  console.log(chalk.red("Error: You must specify a blogname alias with --alias={alias} !!"));
+  console.log(chalk.red('Error: You must specify a blogname alias with --alias={alias} !!'));
   process.exit(1);
 }
 const alias = argv.alias.trim().toLowerCase();
 
-if (!argv.to || (argv.to !== "dev" && argv.to !== "prod")) {
-  console.log("Error: You must specify a target platform with --to=dev|prod");
+if (!argv.to || (argv.to !== 'dev' && argv.to !== 'prod')) {
+  console.log('Error: You must specify a target platform with --to=dev|prod');
   process.exit(1);
 }
 const platform = argv.to.toLowerCase();
@@ -28,7 +29,7 @@ const platform = argv.to.toLowerCase();
     const td = new Twoday.Twoday(platform);
     await td.login();
 
-    const imageFolder = path.resolve(process.cwd(), "skins", alias, "images");
+    const imageFolder = path.resolve(process.cwd(), 'skins', alias, 'images');
     if (!fs.existsSync(imageFolder)) {
       console.log(chalk.red(`Error: image folder for alias ${alias} does not exist!!`));
       process.exit(1);
@@ -37,18 +38,18 @@ const platform = argv.to.toLowerCase();
     const images = fs.readdirSync(imageFolder);
     let uploaded = 0;
     for (const image of images) {
-      const [name, _ext] = image.split(".");
-      if (name.startsWith("_")) continue;
+      const [name, _ext] = image.split('.');
+      if (name.startsWith('_')) continue;
       const imgID = await td.createImage(alias, {
         alias: name,
-        path: path.resolve(imageFolder, image),
+        path: path.resolve(imageFolder, image)
       });
       uploaded++;
       console.log(chalk.green(`New image "${image}" =>${imgID} saved.`));
     }
     console.log(chalk.blue(`${uploaded} images uploaded to alias "${alias}".`));
   } catch (e) {
-    console.log(chalk.red(`Error while creating images for alias "${alias}": ${e}`));
+    console.log(chalk.red(`Error while creating images for alias "${alias}": ${e.toString()}`));
   } finally {
     await td.logout();
   }

package/src/index.js

@@ -11,120 +11,127 @@
  *   An Alias of * is equal to the core Twoday blogs: www,info,help,top
  *   User/Psw in .env file needs to have admin rights on the selected alias(es) or it won't work!
  */
-import yargs from "yargs/yargs";
+import yargs from 'yargs/yargs';
 const argv = yargs(process.argv.slice(2)).options({
   from: {
-    alias: "f",
+    alias: 'f',
     description: 'Platform where to download the skins from: "dev" or "prod"',
-    type: "string",
+    type: 'string'
   },
   to: {
-    alias: "t",
+    alias: 't',
     description: 'Platform where to compare or upload the skins to: "dev" or "prod"',
-    type: "string",
+    type: 'string'
   },
   alias: {
-    alias: "a",
-    description: "One or more alias blog name/s delimited by comma (no space)",
-    type: "string",
+    alias: 'a',
+    description: 'One or more alias blog name/s delimited by comma (no space)',
+    type: 'string'
   },
   skin: {
-    alias: "s",
-    description: "Skin selection string (regex) to filter the skins to upload",
-    type: "string",
+    alias: 's',
+    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",
+    alias: 'm',
+    description: 'Download sidebar module skins/freetext as well',
     default: false,
-    type: "boolean",
+    type: 'boolean'
   },
   toolbar: {
-    description: "Download modToolbar skins, too",
+    description: 'Download modToolbar skins, too',
     default: false,
-    type: "boolean",
+    type: 'boolean'
   },
   backup: {
-    alias: "b",
-    description: "Backup skins to the local /backup folder to preserve their former status",
-    type: "boolean",
+    alias: 'b',
+    description: 'Backup skins to the local /backup folder to preserve their former status',
+    type: 'boolean'
   },
   clean: {
     default: false,
-    description:
-      "Cleanup (delete) the alias local skin directory to remove potential old files before new download",
-    type: "boolean",
+    description: 'Cleanup (delete) the alias local skin directory to remove potential old files before new download',
+    type: 'boolean'
   },
   compare: {
     default: false,
-    description: "Compare the local alias skin directory to a remote location (prod/dev)",
-    type: "boolean",
+    description: 'Compare the local alias skin directory to a remote location (prod/dev)',
+    type: 'boolean'
   },
   debug: {
     default: false,
-    description: "Issue more logging messages and diff analysis (for upload function)",
-    type: "boolean",
-  },
+    description: 'Issue more logging messages and diff analysis (for upload function)',
+    type: 'boolean'
+  }
 }).argv;
-import chalk from "chalk";
-import * as Twoday from "@neonwilderness/twoday";
-import { cleanupAliasFolder, splitAliases } from "./_utils.js";
-import { downloadModifiedSkins } from "./_download.js";
-import { uploadModifiedSkins } from "./_upload.js";
-import { compareLocalToRemoteSkins } from "./_compare.js";
-import { config } from "dotenv-safe";
+import * as Twoday from '@neonwilderness/twoday';
+import chalk from 'chalk';
+import { config } from 'dotenv-safe';
+
+import { compareLocalToRemoteSkins } from './_compare.js';
+import { downloadModifiedSkins } from './_download.js';
+import { uploadModifiedSkins } from './_upload.js';
+import { cleanupAliasFolder, splitAliases } from './_utils.js';
 config();
 
 if (!argv.from && !argv.to) {
-  console.log("Desired action must be specified with --from=dev|prod or --to=dev|prod");
+  console.log('Desired action must be specified with --from=dev|prod or --to=dev|prod');
   process.exit(1);
 }
 if (argv.from && argv.to) {
-  console.log("You cannot specify --from=dev|prod AND --to=dev|prod in one run");
+  console.log('You cannot specify --from=dev|prod AND --to=dev|prod in one run');
   process.exit(1);
 }
 if (argv.compare && !argv.to) {
-  console.log("You must specify a target platform with --to=dev|prod when comparing skins");
+  console.log('You must specify a target platform with --to=dev|prod when comparing skins');
   process.exit(1);
 }
 if (!argv.alias) {
-  console.log("You must specify the desired alias(es) with --alias=name1[,name2,...] OR --alias=*");
+  console.log('You must specify the desired alias(es) with --alias=name1[,name2,...] OR --alias=*');
   process.exit(1);
 }
 const platform = (argv.from || argv.to).toLowerCase();
 const td = new Twoday.Twoday(platform, { delay: 100 });
 
-const core = ["www", "info", "help", "top"];
-const aliases = argv.alias === "*" ? core : splitAliases(argv.alias, ",");
+const core = ['www', 'info', 'help', 'top'];
+const aliases = argv.alias === '*' ? core : splitAliases(argv.alias, ',');
 
 if (argv.compare) {
-  if (aliases.length === 1 && aliases[0].includes(":"))
+  if (aliases.length === 1 && aliases[0].includes(':'))
     console.log(
-      `Start comparing local skin files of alias${aliases.length > 1 ? "es" : ""} ${chalk.yellow(
-        aliases.join(", "),
-      )} to ${chalk.green(td.fullDomain)}...`,
+      `Start comparing local skin files of alias${aliases.length > 1 ? 'es' : ''} ${chalk.yellow(
+        aliases.join(', ')
+      )} to ${chalk.green(td.fullDomain)}...`
     );
-  compareLocalToRemoteSkins(td, aliases);
+  await compareLocalToRemoteSkins(td, aliases);
 } else {
-  const action = argv.from ? "down" : "up";
-  const direction = argv.from ? "from" : "to";
+  const action = argv.from ? 'down' : 'up';
+  const direction = argv.from ? 'from' : 'to';
   const execTask = argv.from ? downloadModifiedSkins : uploadModifiedSkins;
 
-  if (action === "down" && argv.clean) {
+  if (action === 'down' && argv.clean) {
     cleanupAliasFolder(aliases, argv.backup);
-    console.log(chalk.yellow(`Cleaning target download folder/s for "${aliases}".`));
+    console.log(chalk.yellow(`Cleaning target download folder/s for "${aliases.join(', ')}".`));
   }
 
   console.log(
-    `Start ${action}loading modified skins of alias${aliases.length > 1 ? "es" : ""} ${chalk.yellow(
-      aliases.join(", "),
-    )} ${direction} remote ${chalk.green(td.fullDomain)}...`,
+    `Start ${action}loading modified skins of alias${aliases.length > 1 ? 'es' : ''} ${chalk.yellow(
+      aliases.join(', ')
+    )} ${direction} remote ${chalk.green(td.fullDomain)}...`
   );
-  execTask(td, aliases, {
+  await 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,
+    toolbar: argv.toolbar
   });
 }

package/src/template.html

@@ -28,11 +28,11 @@
         text-align: center;
       }
       del::before {
-        content: "–";
+        content: '–';
         background: #fdb9c1;
       }
       ins::before {
-        content: "+";
+        content: '+';
         background: #abf2bc;
       }
       h3 {
@@ -50,7 +50,7 @@
         display: inline-block;
         background: #ddd;
         font-size: 11px;
-        content: "Skin";
+        content: 'Skin';
         margin-right: 0.5rem;
         padding: 2px 4px;
         line-height: 1rem;
@@ -109,10 +109,7 @@
             <div class="resultbox" x-show="skin.open && skin.results.length">
               <template x-for="(result, ir) in skin.results" :key="ir">
                 <div class="result">
-                  <div
-                    :style="{ color: result.itemChanged ? '#e53935' : '#bdbdbd' }"
-                    x-text="result.text"
-                  ></div>
+                  <div :style="{ color: result.itemChanged ? '#e53935' : '#bdbdbd' }" x-text="result.text"></div>
                   <div class="diffs" x-html="result.diffs.replace(/\n/g, '<br>')"></div>
                 </div>
               </template>
@@ -123,8 +120,8 @@
     </template>
 
     <script>
-      document.addEventListener("alpine:init", () => {
-        Alpine.data("diffResults", () => $$templateJSON);
+      document.addEventListener('alpine:init', () => {
+        Alpine.data('diffResults', () => $$templateJSON);
       });
     </script>
     <script defer src="https://unpkg.com/alpinejs@latest"></script>