zotero-plugin-scaffold 0.2.0-beta.16 → 0.2.0-beta.18

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.BhavR4LH.mjs';
+import { B as Base } from '../shared/zotero-plugin-scaffold.BRIcU6PR.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.BhavR4LH.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.BRIcU6PR.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.16";
+const version = "0.2.0-beta.18";
 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.BhavR4LH.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.BRIcU6PR.mjs';
 import 'c12';
 import 'es-toolkit';
 import 'fs-extra/esm';

package/dist/shared/{zotero-plugin-scaffold.BhavR4LH.mjs → zotero-plugin-scaffold.BRIcU6PR.mjs}

@@ -1,5 +1,5 @@
 import { loadConfig as loadConfig$1 } from 'c12';
-import { isPlainObject, kebabCase, mapValues, isNotNil, toMerged, escapeRegExp, delay, debounce } from 'es-toolkit';
+import { isPlainObject, kebabCase, mapValues, toMerged, escapeRegExp, delay, debounce } from 'es-toolkit';
 import { readJsonSync, outputFile, emptyDir, copy, readJSON, outputJSON, move, writeJson, pathExists, ensureDir, remove } from 'fs-extra/esm';
 import { createHooks } from 'hookable';
 import process from 'node:process';
@@ -146,7 +146,7 @@ function resolveConfig(config) {
   config.id ||= config.name;
   config.namespace ||= config.name;
   config.xpiName ||= kebabCase(config.name);
-  config.build.prefs.prefix ||= `extensions.${config.namespace}`;
+  config.build.prefs.prefix ||= pkgUser.config.prefsPrefix || `extensions.${config.namespace}`;
   const isPreRelease = version.includes("-");
   const templateData = {
     owner,
@@ -303,32 +303,38 @@ class PrefsManager {
     this.namespace = namespace;
   }
   parse(content) {
+    const _map = {};
     const prefPattern = /^(pref|user_pref)\s*\(\s*["']([^"']+)["']\s*,\s*(.+)\s*\)\s*;$/gm;
     const matches = content.matchAll(prefPattern);
     for (const match of matches) {
       const key = match[2].trim();
       const value = match[3].trim();
-      this.prefs[key] = value;
+      _map[key] = this.cleanValue(value);
     }
+    return _map;
+  }
+  cleanValue(value) {
+    if (value === "true")
+      return true;
+    else if (value === "false")
+      return false;
+    else if (!Number.isNaN(Number(value)))
+      return Number(value);
+    else if (value.match(/^["'](.*)["']$/))
+      return value.replace(/^["'](.*)["']$/, "$1");
+    else
+      return value;
   }
   render() {
     return Object.entries(this.prefs).map(([key, value]) => {
-      if (!isNotNil(value))
-        return "";
-      let cleanValue = "";
-      if (typeof value === "boolean") {
-        cleanValue = `${value}`;
-      } else if (typeof value === "string") {
-        cleanValue = value;
-      } else if (typeof value === "number") {
-        cleanValue = value.toString();
-      }
-      return `${this.namespace}("${key}", ${cleanValue});`;
-    }).filter((c) => !!c).join("\n");
+      const _v = typeof value === "string" ? `"${value}"` : value;
+      return `${this.namespace}("${key}", ${_v});`;
+    }).join("\n");
   }
   async read(path) {
     const content = await readFile(path, "utf-8");
-    this.parse(content);
+    const map = this.parse(content);
+    this.setPrefs(map);
   }
   async write(path) {
     const content = this.render();
@@ -336,6 +342,12 @@ class PrefsManager {
     logger.debug("The <profile>/prefs.js has been modified.");
   }
   setPref(key, value) {
+    if (value === null || value === void 0) {
+      if (key in this.prefs)
+        delete this.prefs[key];
+      else
+        return;
+    }
     this.prefs[key] = value;
   }
   setPrefs(prefs) {
@@ -376,24 +388,20 @@ function renderPluginPrefsDts(prefs, prefix) {
 /* eslint-disable */
 // @ts-nocheck
 
+// prettier-ignore
 type _PluginPrefsMap = {
   ${Object.entries(prefs).map(([key, value]) => {
     return `"${key}": ${typeof value};`;
   }).join("\n  ")}
 };
 
+// prettier-ignore
 type PluginPrefKey<K extends keyof _PluginPrefsMap> = \`${prefix}.\${K}\`;
 
+// prettier-ignore
 type PluginPrefsMap = {
   [K in keyof _PluginPrefsMap as PluginPrefKey<K>]: _PluginPrefsMap[K]
 };
-
-declare namespace _ZoteroTypes {
-  interface Prefs {
-    get: <K extends keyof PluginPrefsMap>(key: K, global?: boolean) => PluginPrefsMap[K];
-    set: <K extends keyof PluginPrefsMap>(key: K, value: PluginPrefsMap[K], global?: boolean) => any;
-  }
-}
 `;
   return dtsContent;
 }
@@ -524,12 +532,11 @@ class Build extends Base {
         let ftlContent = await readFile(ftlPath, "utf-8");
         const matches = [...ftlContent.matchAll(FTL_MESSAGE_PATTERN)];
         for (const match of matches) {
-          const message = match.groups?.message;
+          const [matched, message, _pattern] = match;
           if (message) {
-            const namespacedMessage = `${namespace}-${message}`;
             localeMessages.add(message);
             allMessages.add(message);
-            ftlContent = ftlContent.replace(message, namespacedMessage);
+            ftlContent = ftlContent.replace(new RegExp(`^${escapeRegExp(matched)}`, "gm"), `${namespace}-${matched}`);
           }
         }
         if (build.fluent.prefixFluentMessages)
@@ -598,14 +605,15 @@ class Build extends Base {
         const matchs = [...content.matchAll(HTML_PREFERENCE_PATTERN)];
         for (const match of matchs) {
           const [matched, key] = match;
-          if (!prefsWithoutPrefix[key] && !prefsWithoutPrefix[key]) {
-            this.logger.warn(`preference key '${key}' in ${path} not init in prefs.js`);
+          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))
+          if (key.startsWith(prefix)) {
             continue;
-          else
+          } else {
             content = content.replace(matched, `preference="${prefix}.${key}"`);
+          }
         }
         await outputFile(path, content, "utf-8");
       }));

package/package.json

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