addonova 1.0.0 → 1.0.1

package/{template → workspace}/tasks/bundle-css.js

@@ -1,11 +1,10 @@
 import path from 'node:path';
 import { build } from 'esbuild';
-import { sassPlugin } from 'esbuild-sass-plugin';
 import {getDestDir} from './paths.js';
 import {readFile, writeFile, getConfig, getAllFiles, log, fileExistsInConfig} from './utils.js';
 import {createTask} from './task.js';
 
-const srcSCSSDir = 'src/scss';
+const srcCSSDir = 'src/css';
 
 async function removeTopSourceComment(filePath) {
     const code = await readFile(filePath, 'utf8');
@@ -14,24 +13,17 @@ async function removeTopSourceComment(filePath) {
 }
 
 async function esbuildCSS(config, isDebug, platform) {
-    let buildResult;
-    let outputs;
+    let buildResult, outputs;
     const dir = getDestDir({isDebug, platform});
-    
+
     for (const [dest, src] of Object.entries(config.entry)) {
         buildResult = await build({
             entryPoints: src,
             outdir: path.join(dir, dest),
             entryNames: config.filename,
             loader: {
-                '.scss': 'css'
+                '.css': 'css'
             },
-            plugins: [
-            sassPlugin({
-                    type: 'css',
-                    sourceMap: config.sourcemap,
-                })
-            ],
             minify: config.minify,
             sourcemap: config.sourcemap,
             metafile: true,
@@ -49,60 +41,61 @@ async function esbuildCSS(config, isDebug, platform) {
     }
 }
 
-export function createBundleCSSTask(srcSCSSDir){
+function createBundleCSSTask(srcCSSDir) {
     let currentWatchFiles;
+
     const bundleCSS = async ({platforms, isDebug, logInfo, logWarn}) => {
-        for(const platform of platforms){
-            const config = (await getConfig(platform));
-            const scssConfig = config.scss;
-            if (scssConfig){
-                await esbuildCSS(scssConfig, isDebug, platform);
+        for (const platform of platforms) {
+            const config = await getConfig(platform);
+            const cssConfig = config.css;
+            if (cssConfig) {
+                await esbuildCSS(cssConfig, isDebug, platform);
                 if (logInfo) log.ok(`Bundling CSS for ${platform}...`);
             } else {
-                if(logWarn) log.warn(`No SCSS config found for ${platform}, skipping CSS bundling.`);
-            } 
+                if (logWarn) log.warn(`No CSS config found for ${platform}, skipping CSS bundling.`);
+            }
         }
     }
 
     const onChange = async (changedFiles, watcher, platforms, isDebug) => {
-        for(const platform of platforms){
+        for (const platform of platforms) {
             const config = await getConfig(platform);
-            if (config.scss){
+            if (config.css) {
                 const exists = await fileExistsInConfig(
-                    config.scss.entry,
+                    config.css.entry,
                     changedFiles[0]
                 );
-                if (exists){
+                if (exists) {
                     const newConfig = {
-                        scss: {
+                        css: {
                             entry: exists,
-                            filename: config.scss.filename,
-                            minify: config.scss.minify,
-                            sourcemap: config.scss.sourcemap
+                            filename: config.css.filename,
+                            minify: config.css.minify,
+                            sourcemap: config.css.sourcemap
                         }
                     }
-                    await esbuildCSS(newConfig.scss, isDebug, platform);
+                    await esbuildCSS(newConfig.css, isDebug, platform);
                 }
-                
             }
         }
 
-        const newWatchFiles = await getAllFiles(srcSCSSDir);
+        const newWatchFiles = await getAllFiles(srcCSSDir);
         watcher.unwatch(
             currentWatchFiles.filter((oldFile) => !newWatchFiles.includes(oldFile))
         );
         watcher.add(
-            newWatchFiles.filter((newFile) => currentWatchFiles.includes(newFile))
+            newWatchFiles.filter((newFile) => !currentWatchFiles.includes(newFile))
         );
     }
+
     return createTask(
         'bundle CSS',
         bundleCSS,
     ).addWatcher(
         async () => {
-            currentWatchFiles = await getAllFiles(srcSCSSDir);
+            currentWatchFiles = await getAllFiles(srcCSSDir);
             return currentWatchFiles;
         }, onChange);
 }
 
-export default createBundleCSSTask(srcSCSSDir);
+export default createBundleCSSTask(srcCSSDir);

package/{template → workspace}/tasks/bundle-js.js

@@ -13,7 +13,6 @@ async function removeTopSourceComment(filePath) {
 }
 
 async function esbuildJS(config, isDebug, platform){
-    // console.log(`Starting JS build for ${config}...`);
     let buildResult, outputs;
     const dir = getDestDir({isDebug, platform});
     for (const [dest, src] of Object.entries(config.entry)) {

package/{template → workspace}/tasks/cli.js

@@ -1,4 +1,4 @@
-import {join} from 'node:path';
+import {join, dirname} from 'node:path';
 import {fileURLToPath} from 'node:url';
 import process from 'node:process';
 import {fork} from 'node:child_process';
@@ -6,7 +6,7 @@ import {log} from './utils.js';
 
 function printHelp() {
     console.log([
-        'Volume booster build utility',
+        'WebExtension build utility',
         'Usage: npm run build -- [options]',
         '',
         'To narrow down the list of build targets (for efficiency):',
@@ -30,7 +30,7 @@ function printHelp() {
     ].join('\n'));
 }
 
-const __filename = join(fileURLToPath(import.meta.url), '../build.js');
+const __filename = join(dirname(fileURLToPath(import.meta.url)), 'build.js');
 
 async function executeChildProcess(args) {
     const child = fork(__filename, args);
@@ -61,14 +61,20 @@ function validateArguments(args) {
         '--help',
         '-h'
     ];
-    const invalidFlags = args.filter((flag) => !validFlags.includes(flag));
+    const invalidFlags = args.filter((flag) => !validFlags.includes(flag) && !flag.startsWith('--version='));
     invalidFlags.forEach((flag) => validationErrors.push(`Invalid flag ${flag}`));
     return validationErrors;
 }
 
 async function run() {
-    const args = process.argv.slice(3);
-    const shouldPrintHelp = args.length === 0 || process.argv[2] !== 'build' || args.includes('-h') || args.includes('--help');
+    const subcommand = process.argv[2];
+    let args = process.argv.slice(3);
+
+    if (subcommand === 'zip') {
+        args = ['--all', '--release'];
+    }
+
+    const shouldPrintHelp = args.length === 0 || (subcommand !== 'build' && subcommand !== 'zip') || args.includes('-h') || args.includes('--help');
     if (shouldPrintHelp) {
       printHelp();
       process.exit(0);

package/{template → workspace}/tasks/copy.js

@@ -6,7 +6,6 @@ import path from 'node:path';
 import { mkdir } from 'node:fs/promises';
 
 export function createCopyTask() {
-    const paths = [];
     const assetsCopy = async ({platforms, isDebug, logInfo, logWarn}) => {
         for(const platform of platforms){
             const config = await getConfig(platform);
@@ -40,7 +39,7 @@ export function createCopyTask() {
         'assets copy',
         assetsCopy,
     ).addWatcher(
-        paths,
+        [],
         onChange,
     );
 }

package/{template → workspace}/tasks/paths.js

@@ -1,7 +1,6 @@
-import {createRequire} from 'node:module';
 import {dirname, join} from 'node:path';
 
-let rootDir = dirname(createRequire(import.meta.url).resolve('../../package.json'));
+let rootDir = process.cwd();
 
 export const absolutePath = (path) => {
     return join(rootDir, path);
@@ -10,7 +9,7 @@ export function setRootDir(dir) {
     rootDir = dir;
 }
 export function getDestDir({isDebug, platform}) {
-    const buildTypeDir = `build/${isDebug ? 'debug':'release'}`;
+    const buildTypeDir = `.output/${isDebug ? 'debug':'release'}`;
     return `${buildTypeDir}/${platform}`;
 }
 export default {

package/{template → workspace}/tasks/zip.js

@@ -41,7 +41,7 @@ async function zip({platforms, isDebug, version}) {
         throw new Error('zip task does not support debug builds');
     }
     version = version ? `-${version}` : '';
-    const releaseDir = 'build/release';
+    const releaseDir = '.output/release';
     const promises = [];
     const date = await getLastCommitTime();
     const xpiPlatforms = ["firefox", "thunderbird"];

package/{template → workspace}/tools/json2i18n.js

@@ -1,8 +1,12 @@
 import { mkdirSync, readdirSync, existsSync, readFileSync, writeFileSync } from "fs";
-import { join } from "path";
+import { join, dirname } from "path";
+import { fileURLToPath } from "url";
 
-const localesDir = join(__dirname, "_locales");
-const outputDir = join(__dirname, "output", "_locales");
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const localesDir = join(__dirname, "../", "_locales");
+const outputDir = join(__dirname, "../", "output", "_locales");
 
 mkdirSync(outputDir, { recursive: true });
 

package/template/tasks/translate.js

@@ -1,255 +0,0 @@
-import fs from 'node:fs/promises';
-import * as readline from 'node:readline/promises';
-import { stdin as input, stdout as output } from 'node:process';
-import {readFile, writeFile, httpsRequest, timeout} from './utils.js';
-
-
-const LOCALES_ROOT = 'src/_locales';
-
-function toMessageId(message) {
-  if (typeof message !== 'string') return '';
-
-  return message
-    .trim()
-    .split(/\s+/)      // split by any whitespace
-    .slice(0, 3)       // only first 3 words
-    .map(word =>
-      word
-        .replace(/[^\w]/g, '') // remove special characters
-        .toLowerCase()
-    )
-    .filter(Boolean)   // remove empty results
-    .join('_');
-}
-
-async function getSupportedLocales() {
-    const fileList = await fs.readdir(LOCALES_ROOT);
-
-    const locales = [];
-
-    for (const file of fileList) {
-        if (file.endsWith('.i18n')) {
-            const locale = file.substring(0, file.lastIndexOf('.i18n'));
-            locales.push(locale);
-        }
-    }
-
-    return locales;
-}
-
-function stringifyLocale(messages) {
-    const lines = [];
-    messages.forEach((message, id) => {
-        lines.push(`@${id}`);
-        const hasDoubleNewLines = /\n\n/.test(message);
-        message.split('\n')
-            .filter((line) => line.trim())
-            .forEach((line, index, filtered) => {
-                lines.push(line);
-                if (hasDoubleNewLines && index < filtered.length - 1) {
-                    lines.push('');
-                }
-            });
-        lines.push('');
-    });
-    return lines.join('\n');
-}
-
-function parseLocale(content) {
-    const messages = new Map();
-    const lines = content.split('\n');
-    let id = '';
-    for (let i = 0; i < lines.length; i++) {
-        const line = lines[i];
-        if (line.startsWith('@')) {
-            id = line.substring(1);
-        } else if (line.startsWith('#')) {
-            // Ignore
-        } else if (messages.has(id)) {
-            const message = messages.get(id);
-            messages.set(id, `${message}\n${line}`);
-        } else {
-            messages.set(id, line);
-        }
-    }
-    messages.forEach((value, id) => {
-        messages.set(id, value.trim());
-    });
-    return messages;
-}
-
-async function translate(text, lang) {
-    const url = new URL('https://translate.googleapis.com/translate_a/single');
-    url.search = (new URLSearchParams({
-        client: 'gtx',
-        sl: 'en-US',
-        tl: lang,
-        dt: 't',
-        dj: '1',
-        q: text,
-    })).toString();
-    const response = await httpsRequest(url.toString());
-    const translation = JSON.parse(response.text());
-    return translation.sentences.map((s) => s.trans).join('\n').replaceAll(/\n+/g, '\n');
-}
-
-async function deleteMessage(messageId) {
-  const supportedLocales = await getSupportedLocales();
-
-  if (!messageId || !messageId.trim()) {
-    console.log('⚠ Message key cannot be empty.');
-    return;
-  }
-
-  const id = messageId.trim();
-  let foundAnywhere = false;
-
-  for (const locale of supportedLocales) {
-    const locFile = `${LOCALES_ROOT}/${locale}.i18n`;
-    const locContent = await readFile(locFile);
-    const locMessages = parseLocale(locContent);
-
-    if (!locMessages.has(id)) {
-      continue;
-    }
-
-    locMessages.delete(id);
-    const output = stringifyLocale(locMessages);
-    await writeFile(locFile, output);
-
-    console.log(`✔ Removed from ${locale}.i18n`);
-    foundAnywhere = true;
-  }
-
-  if (!foundAnywhere) {
-    console.log('⚠ Message key not found in any locale.');
-  } else {
-    console.log('🗑 Deletion completed.');
-  }
-}
-
-
-async function translateEnMessage(message, customId) {
-  console.log(`Translating message: ${message}`);
-
-  const supportedLocales = await getSupportedLocales();
-  const messageId = customId && customId.trim()
-    ? customId.trim()
-    : toMessageId(message);
-
-  // 1️⃣ Update English first
-  const enFile = `${LOCALES_ROOT}/en.i18n`;
-  const enContent = await readFile(enFile);
-  const enMessages = parseLocale(enContent);
-
-  if (!enMessages.has(messageId)) {
-    enMessages.set(messageId, message);
-    const output = stringifyLocale(enMessages);
-    await writeFile(enFile, output);
-    console.log(`en: ${message}`);
-  } else {
-    console.log('Message already exists in en.i18n');
-  }
-
-  // 2️⃣ Translate other locales
-  for (const locale of supportedLocales) {
-    if (locale === 'en') continue;
-
-    await timeout(1000);
-
-    const locFile = `${LOCALES_ROOT}/${locale}.i18n`;
-    const locContent = await readFile(locFile);
-    const locMessages = parseLocale(locContent);
-
-    if (locMessages.has(messageId)) {
-      console.log(`Already exists in: ${locFile}`);
-      continue;
-    }
-
-    const translated = await translate(message, locale);
-    locMessages.set(messageId, translated);
-
-    const output = stringifyLocale(locMessages);
-    await writeFile(locFile, output);
-
-    console.log(`${locale}: ${translated}`);
-  }
-}
-
-async function main() {
-  const rl = readline.createInterface({ input, output });
-
-  try {
-    while (true) {
-      console.log('\n=== Message Manager ===');
-      console.log('[1] Add new message');
-      console.log('[2] Delete message');
-      console.log('[0] Exit');
-
-      const choice = (await rl.question('Select option: '))
-        .trim()
-        .toLowerCase();
-
-      switch (choice) {
-        case '1': {
-          const newMessage = (await rl.question('Enter new message: '))
-            .trim();
-
-          if (!newMessage) {
-            console.log('⚠ Message cannot be empty.');
-            break;
-          }
-
-          const newMessageId = (await rl.question(
-            'Enter new message key (leave empty for auto-generation): '
-          )).trim();
-
-          await translateEnMessage(
-            newMessage,
-            newMessageId || undefined
-          );
-
-          console.log('✔ Message processed successfully.');
-          break;
-        }
-
-        case '2': {
-            const messageId = (await rl.question(
-                'Enter message key to delete: '
-            )).trim();
-
-            if (!messageId) {
-                console.log('⚠ Message key cannot be empty.');
-                break;
-            }
-
-            const confirm = (await rl.question(
-                `Are you sure you want to delete "${messageId}" from all locales? (y/n): `
-            ))
-                .trim()
-                .toLowerCase();
-
-            if (confirm !== 'y') {
-                console.log('Deletion cancelled.');
-                break;
-            }
-
-            await deleteMessage(messageId);
-            break;
-        }
-
-        case '0':
-        case 'exit': {
-          console.log('Exiting...');
-          return;
-        }
-
-        default: {
-          console.log('Invalid selection. Please try again.');
-        }
-      }
-    }
-  } finally {
-    rl.close();
-  }
-}main();