zotero-plugin-scaffold 0.2.2 → 0.2.4

package/dist/cli.d.mts

@@ -1,3 +1,3 @@
-declare function run(): Promise<void>;
+declare function mainWithErrorHandler(): Promise<void>;
 
-export { run as default };
+export { mainWithErrorHandler as default };

package/dist/cli.d.ts

@@ -1,3 +1,3 @@
-declare function run(): Promise<void>;
+declare function mainWithErrorHandler(): Promise<void>;
 
-export { run as default };
+export { mainWithErrorHandler as default };

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, B as Build, S as Serve, T as Test, R as Release } from './shared/zotero-plugin-scaffold.V3TH4au2.mjs';
+import { Command } from 'commander';
+import { E as ExitSignals, l as logger, C as Config, B as Build, S as Serve, T as Test, R as Release } from './shared/zotero-plugin-scaffold.D7j478bu.mjs';
 import { readFile, writeFile } from 'node:fs/promises';
 import { pathExists, ensureFile } from 'fs-extra';
 import tinyUpdateNotifier from 'tiny-update-notifier';
@@ -32,8 +32,8 @@ import 'xvfb-ts';
 
 const name = "zotero-plugin-scaffold";
 const type = "module";
-const version = "0.2.2";
-const packageManager = "pnpm@9.15.4";
+const version = "0.2.4";
+const packageManager = "pnpm@10.2.0";
 const description = "A scaffold for Zotero plugin development.";
 const author = "northword";
 const license = "AGPL-3.0-or-later";
@@ -100,8 +100,7 @@ const peerDependenciesMeta = {
 	}
 };
 const dependencies = {
-	"@commander-js/extra-typings": "^13.1.0",
-	"@swc/core": "^1.10.12",
+	"@swc/core": "^1.10.14",
 	"adm-zip": "^0.5.16",
 	bumpp: "^10.0.1",
 	c12: "^2.0.1",
@@ -119,6 +118,7 @@ const dependencies = {
 	"xvfb-ts": "^1.1.0"
 };
 const devDependencies = {
+	"@commander-js/extra-typings": "^13.1.0",
 	"@types/adm-zip": "^0.5.7",
 	"@types/fs-extra": "^11.0.4"
 };
@@ -225,7 +225,7 @@ async function main() {
   });
   cli.parse();
 }
-async function run() {
+async function mainWithErrorHandler() {
   main().then(() => {
     checkGitIgnore();
   }).catch(onError);
@@ -233,7 +233,10 @@ async function run() {
 }
 function onError(err) {
   logger.error(err);
+  if (err.output) {
+    logger.log(err.output.stderr);
+  }
   process.exit(1);
 }
 
-export { run as default };
+export { mainWithErrorHandler as default };

package/dist/index.mjs

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

package/dist/shared/{zotero-plugin-scaffold.V3TH4au2.mjs → zotero-plugin-scaffold.D7j478bu.mjs}

@@ -298,49 +298,74 @@ class PrefsManager {
   /**
    * Parse Method 3 - Using AST
    */
-  parse(content2) {
-    const _map2 = {};
-    const ast = parseSync(content2, { syntax: "ecmascript" });
+  parse(content) {
+    const _map = {};
+    const ast = parseSync(content, { syntax: "ecmascript" });
     for (const node of ast.body) {
       if (node.type !== "ExpressionStatement" || node.expression.type !== "CallExpression" || node.expression.callee.type !== "Identifier" || node.expression.callee.value !== this.namespace || node.expression.arguments.length !== 2) {
         throw new Error("Invalid prefs.js file.");
       }
-      if (node.expression.arguments[0].expression.type !== "StringLiteral") {
+      const [arg1, arg2] = node.expression.arguments;
+      if (arg1.expression.type !== "StringLiteral") {
         throw new Error("Invalid prefs.js file - unsupported key type.");
       }
-      if (node.expression.arguments[1].expression.type !== "StringLiteral" && node.expression.arguments[1].expression.type !== "NumericLiteral" && node.expression.arguments[1].expression.type !== "BooleanLiteral") {
-        throw new Error("Invalid prefs.js file - unsupported value type.");
+      const key = arg1.expression.value.trim();
+      let value;
+      switch (arg2.expression.type) {
+        // https://babeljs.io/docs/babel-parser#output
+        case "StringLiteral":
+        case "NumericLiteral":
+        case "BooleanLiteral":
+          value = arg2.expression.value;
+          break;
+        // https://github.com/estree/estree/blob/master/es5.md#unaryexpression
+        // https://github.com/northword/zotero-plugin-scaffold/issues/98
+        case "UnaryExpression":
+          if (arg2.expression.argument.type !== "NumericLiteral")
+            throw new Error("Invalid prefs.js file - unsupported value type.");
+          if (arg2.expression.operator === "-")
+            value = -arg2.expression.argument.value;
+          else if (arg2.expression.operator === "+")
+            value = arg2.expression.argument.value;
+          else
+            throw new Error("Invalid prefs.js file - unsupported value type.");
+          break;
+        default:
+          throw new Error("Invalid prefs.js file - unsupported value type.");
       }
-      const key = node.expression.arguments[0].expression.value.trim();
-      const value = node.expression.arguments[1].expression.value;
-      _map2[key] = value;
+      _map[key] = value;
     }
-    return _map2;
+    return _map;
   }
   /**
    * Parse Method 1 - Using RegExp
    * @deprecated
    */
-  parseByRegExp(content2) {
-    const _map2 = {};
+  parseByRegExp(content) {
+    const _map = {};
     const prefPattern = /^(pref|user_pref)\s*\(\s*["']([^"']+)["']\s*,\s*(.+)\s*,?\s*\)\s*;?$/gm;
-    const matches = content2.matchAll(prefPattern);
+    const matches = content.matchAll(prefPattern);
     for (const match of matches) {
       const key = match[2].trim();
       const value = match[3].trim();
-      _map2[key] = this.cleanValue(value);
+      _map[key] = this.cleanValue(value);
     }
-    return _map2;
+    return _map;
   }
   /**
    * Parse Method 2 - Using eval
    * @deprecated
    */
-  parseByEval(content) {
-    const _map = {};
-    eval(content);
-    return _map;
-  }
+  // private parseByEval(content: string) {
+  //   const _map: Prefs = {};
+  //   // eslint-disable-next-line unused-imports/no-unused-vars
+  //   const pref = (key: any, value: any) => {
+  //     _map[key.trim()] = this.cleanValue(value.trim());
+  //   };
+  //   // eslint-disable-next-line no-eval
+  //   eval(content);
+  //   return _map;
+  // }
   cleanValue(value) {
     if (value === "true")
       return true;
@@ -360,13 +385,13 @@ class PrefsManager {
     }).join("\n");
   }
   async read(path) {
-    const content2 = await readFile(path, "utf-8");
-    const map = this.parse(content2);
+    const content = await readFile(path, "utf-8");
+    const map = this.parse(content);
     this.setPrefs(map);
   }
   async write(path) {
-    const content2 = this.render();
-    await outputFile(path, content2, "utf-8");
+    const content = this.render();
+    await outputFile(path, content, "utf-8");
     logger.debug("The prefs.js has been modified.");
   }
   setPref(key, value) {
@@ -393,18 +418,18 @@ class PrefsManager {
   }
   getPrefsWithPrefix(prefix) {
     const _prefs = {};
-    for (const pref2 in this.prefs) {
-      if (pref2.startsWith(prefix))
-        _prefs[pref2] = this.prefs[pref2];
+    for (const pref in this.prefs) {
+      if (pref.startsWith(prefix))
+        _prefs[pref] = this.prefs[pref];
       else
-        _prefs[`${prefix}.${pref2}`] = this.prefs[pref2];
+        _prefs[`${prefix}.${pref}`] = this.prefs[pref];
     }
     return _prefs;
   }
   getPrefsWithoutPrefix(prefix) {
     const _prefs = {};
-    for (const pref2 in this.prefs) {
-      _prefs[pref2.replace(`${prefix}.`, "")] = this.prefs[pref2];
+    for (const pref in this.prefs) {
+      _prefs[pref.replace(`${prefix}.`, "")] = this.prefs[pref];
     }
     return _prefs;
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zotero-plugin-scaffold",
   "type": "module",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "A scaffold for Zotero plugin development.",
   "author": "northword",
   "license": "AGPL-3.0-or-later",
@@ -63,8 +63,7 @@
     }
   },
   "dependencies": {
-    "@commander-js/extra-typings": "^13.1.0",
-    "@swc/core": "^1.10.12",
+    "@swc/core": "^1.10.14",
     "adm-zip": "^0.5.16",
     "bumpp": "^10.0.1",
     "c12": "^2.0.1",
@@ -82,6 +81,7 @@
     "xvfb-ts": "^1.1.0"
   },
   "devDependencies": {
+    "@commander-js/extra-typings": "^13.1.0",
     "@types/adm-zip": "^0.5.7",
     "@types/fs-extra": "^11.0.4"
   },