zotero-plugin-scaffold 0.2.0-beta.21 → 0.2.0-beta.22

package/dist/chunks/github.mjs

@@ -4,7 +4,7 @@ import process from 'node:process';
 import { Octokit } from 'octokit';
 import { globSync, glob } from 'tinyglobby';
 import { isCI } from 'std-env';
-import { B as Base } from '../shared/zotero-plugin-scaffold.BM5qZVo0.mjs';
+import { B as Base } from '../shared/zotero-plugin-scaffold.BHL5XRhZ.mjs';
 import 'c12';
 import 'es-toolkit';
 import 'fs-extra/esm';

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 import process from 'node:process';
 import { Command } from '@commander-js/extra-typings';
-import { E as ExitSignals, l as logger, C as Config, a as Build, S as Serve, T as Test, R as Release } from './shared/zotero-plugin-scaffold.BM5qZVo0.mjs';
+import { E as ExitSignals, l as logger, C as Config, a as Build, S as Serve, T as Test, R as Release } from './shared/zotero-plugin-scaffold.BHL5XRhZ.mjs';
 import { readFile, writeFile } from 'node:fs/promises';
 import { pathExists, ensureFile } from 'fs-extra';
 import tinyUpdateNotifier from 'tiny-update-notifier';
@@ -30,7 +30,7 @@ import 'xvfb-ts';
 
 const name = "zotero-plugin-scaffold";
 const type = "module";
-const version = "0.2.0-beta.21";
+const version = "0.2.0-beta.22";
 const packageManager = "pnpm@9.15.2";
 const description = "A scaffold for Zotero plugin development.";
 const author = "northword";

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { a as Build, C as Config, R as Release, S as Serve, T as Test, d as defineConfig } from './shared/zotero-plugin-scaffold.BM5qZVo0.mjs';
+export { a as Build, C as Config, R as Release, S as Serve, T as Test, d as defineConfig } from './shared/zotero-plugin-scaffold.BHL5XRhZ.mjs';
 import 'c12';
 import 'es-toolkit';
 import 'fs-extra/esm';

package/dist/shared/{zotero-plugin-scaffold.BM5qZVo0.mjs → zotero-plugin-scaffold.BHL5XRhZ.mjs}

@@ -339,7 +339,7 @@ class PrefsManager {
   async write(path) {
     const content = this.render();
     await outputFile(path, content, "utf-8");
-    logger.debug("The <profile>/prefs.js has been modified.");
+    logger.debug("The prefs.js has been modified.");
   }
   setPref(key, value) {
     if (value === null || value === void 0) {
@@ -537,7 +537,7 @@ class Build extends Base {
           await writeFile(ftlPath, ftlContent);
         if (build.fluent.prefixLocaleFiles === true) {
           await move(ftlPath, `${dirname(ftlPath)}/${namespace}-${basename(ftlPath)}`);
-          this.logger.debug(`Prefix filename: ${ftlPath}`);
+          this.logger.debug(`FTL file '${ftlPath}' is renamed to '${namespace}-${basename(ftlPath)}'.`);
         }
       }));
       messagesByLocale.set(localeName, localeMessages);
@@ -553,12 +553,13 @@ class Build extends Base {
       for (const match of matches) {
         const [matched, attrKey, attrVal] = match;
         if (!allMessages.has(attrVal)) {
-          this.logger.debug(`HTML data-i10n-id ${attrVal} do not exist in any FTL message, skip to namespace`);
+          this.logger.warn(`HTML data-i10n-id '${chalk.blue(attrVal)}' in ${chalk.gray(htmlPath)} do not exist in any FTL message, skip to namespace it.`);
           continue;
         }
         messagesInHTML.add(attrVal);
         const namespacedAttr = `${namespace}-${attrVal}`;
         htmlContent = htmlContent.replace(matched, `${attrKey}="${namespacedAttr}"`);
+        this.logger.debug(`HTML data-i10n-id '${chalk.blue(attrVal)}' in ${chalk.gray(htmlPath)} is namespaced to ${chalk.blue(namespacedAttr)}.`);
       }
       if (build.fluent.prefixFluentMessages)
         await writeFile(htmlPath, htmlContent);
@@ -566,7 +567,7 @@ class Build extends Base {
     messagesInHTML.forEach((messageInHTML) => {
       const missingLocales = [...messagesByLocale.entries()].filter(([_, messages]) => !messages.has(messageInHTML)).map(([locale]) => locale);
       if (missingLocales.length > 0) {
-        this.logger.warn(`HTML data-l10n-id "${messageInHTML}" is missing in locales: ${missingLocales.join(", ")}`);
+        this.logger.warn(`HTML data-l10n-id '${chalk.blue(messageInHTML)}' is missing in locales: ${missingLocales.join(", ")}.`);
       }
     });
   }
@@ -592,21 +593,26 @@ class Build extends Base {
       await prefsManager.write(prefsFilePath);
     }
     if (prefixPrefKeys) {
-      const HTML_PREFERENCE_PATTERN = new RegExp(`preference="((?!${prefix})\\S*)"`, "g");
+      const HTML_PREFERENCE_PATTERN = /preference="(\S*)"/g;
       const xhtmlPaths = await glob(`${dist}/addon/**/*.xhtml`);
       await Promise.all(xhtmlPaths.map(async (path) => {
         let content = await readFile(path, "utf-8");
         const matchs = [...content.matchAll(HTML_PREFERENCE_PATTERN)];
         for (const match of matchs) {
           const [matched, key] = match;
-          if (!(key in prefsWithoutPrefix) && !(key in prefsWithoutPrefix)) {
-            this.logger.warn(`preference key '${key}' in ${path.replace(`${dist}/`, "")} not init in prefs.js`);
-            continue;
-          }
           if (key.startsWith(prefix)) {
+            this.logger.debug(`Pref key '${chalk.blue(key)}' is already starts with '${prefix}', skip prefixing it.`);
+            continue;
+          } else if (key.startsWith("extensions.")) {
+            this.logger.warn(`Pref key '${chalk.blue(key)}' in ${chalk.gray(path)} starts with 'extensions.' but not '${chalk.blue(prefix)}', skip prefixing it.`);
+            continue;
+          } else if (!(key in prefsWithPrefix) && !(key in prefsWithoutPrefix)) {
+            this.logger.warn(`Pref key '${chalk.blue(key)}' in ${chalk.gray(path)} is not found in prefs.js, skip prefixing it.`);
             continue;
           } else {
-            content = content.replace(matched, `preference="${prefix}.${key}"`);
+            const prefixed = `${prefix}.${key}`;
+            this.logger.debug(`Pref key '${chalk.blue(key)}' in ${chalk.gray(path)} is prefixed to ${chalk.blue(prefixed)}.`);
+            content = content.replace(matched, `preference="${prefixed}"`);
           }
         }
         await outputFile(path, content, "utf-8");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zotero-plugin-scaffold",
   "type": "module",
-  "version": "0.2.0-beta.21",
+  "version": "0.2.0-beta.22",
   "description": "A scaffold for Zotero plugin development.",
   "author": "northword",
   "license": "AGPL-3.0-or-later",