Solve boolean pref issue

Author: daeh

.github/dependabot.yml

@@ -9,3 +9,8 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
+    groups:
+      all-non-major:
+        update-types:
+          - "minor"
+          - "patch"

.github/renovate.json

@@ -1,10 +1,23 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["config:recommended", ":semanticPrefixChore", ":prHourlyLimitNone", ":prConcurrentLimitNone", ":enableVulnerabilityAlerts", ":dependencyDashboard", "group:allNonMajor", "schedule:weekly"],
+  "extends": [
+    "config:recommended",
+    ":semanticPrefixChore",
+    ":prHourlyLimitNone",
+    ":prConcurrentLimitNone",
+    ":enableVulnerabilityAlerts",
+    ":dependencyDashboard",
+    "group:allNonMajor",
+    "schedule:weekly"
+  ],
   "labels": ["dependencies"],
   "packageRules": [
     {
-      "matchPackageNames": ["zotero-plugin-toolkit", "zotero-types", "zotero-plugin-scaffold"],
+      "matchPackageNames": [
+        "zotero-plugin-toolkit",
+        "zotero-types",
+        "zotero-plugin-scaffold"
+      ],
       "schedule": ["at any time"],
       "automerge": true
     }

.gitignore

@@ -1,11 +1,14 @@
 ### Local config files ###
-.env
+
+
+# dot files
+.DS_Store
 
 ### Runtime ###
 node_modules/
-build/
+
 dist/
-logs/
+
 yarn.lock
 .DS_Store
 
@@ -14,7 +17,18 @@ yarn.lock
 # .idea/
 
 ### Generated files ###
+eslint.config.js
 
-
+# Node.js
 node_modules
-.scaffold
+pnpm-lock.yaml
+yarn.lock
+
+# TSC
+tsconfig.tsbuildinfo
+
+# Scaffold
+.env
+.scaffold/
+build/
+logs/

.prettierignore

@@ -8,5 +8,8 @@
 **/*.lock
 logs
 **/node_modules
+package-lock.json
+yarn.lock
+pnpm-lock.yaml
 **/*_lintignore*
 **/*-lintignore*

README.md

@@ -2,9 +2,9 @@
 
 <!-- [![GitHub Downloads release (by tag)](https://img.shields.io/github/downloads/daeh/zotero-markdb-connect/v0.0.25/total?style=for-the-badge)](https://github.com/daeh/zotero-markdb-connect/releases/tag/v0.0.27) -->
 
-<!-- [![GitHub release (with filter)](https://img.shields.io/github/v/release/daeh/zotero-markdb-connect?style=for-the-badge&filter=*v0.1.5*)](https://github.com/daeh/zotero-markdb-connect/releases/tag/v0.1.3) [![GitHub all releases](https://img.shields.io/github/downloads/daeh/zotero-markdb-connect/total?style=for-the-badge&color=forestgreen)](https://github.com/daeh/zotero-markdb-connect/releases/tag/v0.1.3) -->
+<!-- [![GitHub release (with filter)](https://img.shields.io/github/v/release/daeh/zotero-markdb-connect?style=for-the-badge&filter=*v0.1.6*)](https://github.com/daeh/zotero-markdb-connect/releases/tag/v0.1.3) [![GitHub all releases](https://img.shields.io/github/downloads/daeh/zotero-markdb-connect/total?style=for-the-badge&color=forestgreen)](https://github.com/daeh/zotero-markdb-connect/releases/tag/v0.1.3) -->
 
-<!-- [![GitHub release (latest by SemVer including pre-releases)](https://img.shields.io/github/downloads-pre/daeh/zotero-markdb-connect/latest/total?style=for-the-badge&label=downloads@prerelease)](https://github.com/daeh/zotero-markdb-connect/releases/tag/v0.1.5) [![GitHub release (by tag)](https://img.shields.io/github/downloads/daeh/zotero-markdb-connect/v0.0.25/total?style=for-the-badge)](https://github.com/daeh/zotero-markdb-connect/releases/tag/v0.0.27) -->
+<!-- [![GitHub release (latest by SemVer including pre-releases)](https://img.shields.io/github/downloads-pre/daeh/zotero-markdb-connect/latest/total?style=for-the-badge&label=downloads@prerelease)](https://github.com/daeh/zotero-markdb-connect/releases/tag/v0.1.6) [![GitHub release (by tag)](https://img.shields.io/github/downloads/daeh/zotero-markdb-connect/v0.0.25/total?style=for-the-badge)](https://github.com/daeh/zotero-markdb-connect/releases/tag/v0.0.27) -->
 
 <!-- [![GitHub release (latest by date)](https://img.shields.io/github/v/release/daeh/zotero-markdb-connect?style=for-the-badge)](https://github.com/daeh/zotero-markdb-connect/releases/latest) [![GitHub all releases](https://img.shields.io/github/downloads/daeh/zotero-markdb-connect/total?style=for-the-badge&color=forestgreen)](https://github.com/daeh/zotero-markdb-connect/releases/latest) -->
 

addon/bootstrap.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-undef */
+
 /**
  * Most of this code is from Zotero team's official Make It Red example[1]
  * or the Zotero 7 documentation[2].
@@ -21,7 +23,7 @@ async function startup({ id, version, resourceURI, rootURI }, reason) {
     Components.interfaces.amIAddonManagerStartup,
   )
   var manifestURI = Services.io.newURI(rootURI + 'manifest.json')
-  chromeHandle = aomStartup.registerChrome(manifestURI, [['content', '__addonRef__', rootURI + 'chrome/content/']])
+  chromeHandle = aomStartup.registerChrome(manifestURI, [['content', '__addonRef__', rootURI + 'content/']])
 
   /**
    * Global variables for plugin code.
@@ -34,7 +36,7 @@ async function startup({ id, version, resourceURI, rootURI }, reason) {
   }
   ctx._globalThis = ctx
 
-  Services.scriptloader.loadSubScript(`${rootURI}/chrome/content/scripts/__addonRef__.js`, ctx)
+  Services.scriptloader.loadSubScript(`${rootURI}/content/scripts/__addonRef__.js`, ctx)
   Zotero.__addonInstance__.hooks.onStartup()
 }
 
@@ -58,7 +60,7 @@ function shutdown({ id, version, resourceURI, rootURI }, reason) {
 
   Cc['@mozilla.org/intl/stringbundle;1'].getService(Components.interfaces.nsIStringBundleService).flushBundles()
 
-  Cu.unload(`${rootURI}/chrome/content/scripts/__addonRef__.js`)
+  Cu.unload(`${rootURI}/content/scripts/__addonRef__.js`)
 
   if (chromeHandle) {
     chromeHandle.destruct()

addon/chrome/content/icons/favicon.png renamed to addon/content/icons/favicon.png

@@ -15,7 +15,7 @@
 </linkset>
 <vbox
   id="zotero-prefpane-__addonRef__"
-  onload="Zotero.__addonInstance__.hooks.onPrefsEvent('load', {window})">
+  onload="Zotero.__addonInstance__.hooks.onPrefsEvent('load', { window });">
   <groupbox>
     <!--<label class="mdbc-pref-text-center"><html:h1 data-l10n-id="pref-title"> </html:h1></label>-->
     <!--<caption-->
@@ -42,7 +42,7 @@
         <html:input
           type="text"
           id="zotero-prefpane-__addonRef__-sourcedir"
-          preference="__prefsPrefix__.sourcedir"
+          preference="sourcedir"
           readonly="true"
           class="mdbc-pref-textbox-flex1" />
         <button
@@ -57,7 +57,7 @@
 
     <radiogroup
       id="zotero-prefpane-__addonRef__-filefilterstrategy"
-      preference="__prefsPrefix__.filefilterstrategy">
+      preference="filefilterstrategy">
       <radio
         id="zotero-prefpane-__addonRef__-filefilterstrategy-default"
         value="default"
@@ -98,7 +98,7 @@
           ><html:input
             type="text"
             id="zotero-prefpane-__addonRef__-filepattern"
-            preference="__prefsPrefix__.filepattern"
+            preference="filepattern"
             class="mdbc-pref-textbox-partialwidth"
             onchange="return Zotero.__addonInstance__.hooks.onPrefsEvent('checkRegExpValid', {value: this.value})" /><html:span class="mdbc-pref-options-span-right mdbc-pref-options-code-span"
             ><html:code>/i</html:code></html:span
@@ -124,7 +124,7 @@
 
     <radiogroup
       id="zotero-prefpane-__addonRef__-matchstrategy"
-      preference="__prefsPrefix__.matchstrategy">
+      preference="matchstrategy">
       <groupbox>
         <radio
           id="zotero-prefpane-__addonRef__-matchstrategy-bbtcitekeyyaml"
@@ -147,7 +147,7 @@
             ><html:input
               type="text"
               id="zotero-prefpane-__addonRef__-bbtyamlkeyword"
-              preference="__prefsPrefix__.bbtyamlkeyword"
+              preference="bbtyamlkeyword"
               class="mdbc-pref-textbox-partialwidth"
               onchange="Zotero.__addonInstance__.hooks.onPrefsEvent('checkMetadataFormat', {value: this.value})" /><html:span class="mdbc-pref-options-span-right"> </html:span>
           </hbox>
@@ -182,7 +182,7 @@
             ><html:input
               type="text"
               id="zotero-prefpane-__addonRef__-bbtregexp"
-              preference="__prefsPrefix__.bbtregexp"
+              preference="bbtregexp"
               class="mdbc-pref-textbox-partialwidth"
               onchange="return Zotero.__addonInstance__.hooks.onPrefsEvent('checkRegExpValid', {value: this.value})" /><html:span class="mdbc-pref-options-span-right mdbc-pref-options-code-span"
               ><html:code>/m</html:code></html:span
@@ -221,7 +221,7 @@
             ><html:input
               type="text"
               id="zotero-prefpane-__addonRef__-zotkeyregexp"
-              preference="__prefsPrefix__.zotkeyregexp"
+              preference="zotkeyregexp"
               class="mdbc-pref-textbox-partialwidth"
               onchange="return Zotero.__addonInstance__.hooks.onPrefsEvent('checkRegExpValid', {value: this.value})" /><html:span class="mdbc-pref-options-span-right mdbc-pref-options-code-span"
               ><html:code>/m</html:code></html:span
@@ -247,7 +247,7 @@
 
     <radiogroup
       id="zotero-prefpane-__addonRef__-mdeditor"
-      preference="__prefsPrefix__.mdeditor">
+      preference="mdeditor">
       <!-- obsidian file resolution -->
       <groupbox>
         <radio
@@ -267,7 +267,7 @@
               ><html:input
                 type="text"
                 id="zotero-prefpane-__addonRef__-obsidianvaultname"
-                preference="__prefsPrefix__.obsidianvaultname"
+                preference="obsidianvaultname"
                 class="mdbc-pref-textbox-partialwidth" /><html:span class="mdbc-pref-options-span-right"> </html:span>
             </hbox>
             <label class="mdbc-pref-explication-minor"
@@ -278,14 +278,27 @@
           <separator />
 
           <groupbox>
-            <!-- filename or file path -->
-            <checkbox
-              label="Use filename instead of filepath in URI"
-              id="zotero-prefpane-__addonRef__-obsidianresolvewithfile"
-              preference="__prefsPrefix__.obsidianresolvewithfile" />
             <description class="mdbc-pref-explication-minor mdbc-pref-description-indent"
               >Use only the filename in the URI rather than using the full file path. This is only advised if the default is not working.</description
             >
+            <hbox>
+              <hbox align="center">
+                <label value="URI param" />
+                <menulist
+                  id="zotero-prefpane-__addonRef__-obsidianresolvespec"
+                  preference="obsidianresolvespec"
+                  native="true">
+                  <menupopup>
+                    <menuitem
+                      label="Path (recommended)"
+                      value="path" />
+                    <menuitem
+                      label="File"
+                      value="file" />
+                  </menupopup>
+                </menulist>
+              </hbox>
+            </hbox>
           </groupbox>
         </html:div>
       </groupbox>
@@ -310,7 +323,7 @@
               ><html:input
                 type="text"
                 id="zotero-prefpane-__addonRef__-logseqgraph"
-                preference="__prefsPrefix__.logseqgraph"
+                preference="logseqgraph"
                 class="mdbc-pref-textbox-partialwidth" /><html:span class="mdbc-pref-options-span-right"> </html:span>
             </hbox>
             <label
@@ -324,7 +337,7 @@
               ><html:input
                 type="text"
                 id="zotero-prefpane-__addonRef__-logseqprefix"
-                preference="__prefsPrefix__.logseqprefix"
+                preference="logseqprefix"
                 class="mdbc-pref-textbox-partialwidth" /><html:span class="mdbc-pref-options-span-right"> </html:span>
             </hbox>
             <label
@@ -378,7 +391,7 @@
           ><html:input
             type="text"
             id="zotero-prefpane-__addonRef__-tagstr"
-            preference="__prefsPrefix__.tagstr"
+            preference="tagstr"
             class="mdbc-pref-textbox-partialwidth"
             onchange="Zotero.__addonInstance__.hooks.onPrefsEvent('checkTagStr', {value: this.value})" /><html:span class="mdbc-pref-options-span-right"> </html:span>
         </hbox>
@@ -394,7 +407,7 @@
         <description>Whether to include items in Group Libraries when matching MD files, or only search for matches in the User Library.</description>
         <radiogroup
           id="zotero-prefpane-__addonRef__-grouplibraries"
-          preference="__prefsPrefix__.grouplibraries">
+          preference="grouplibraries">
           <radio
             label="Only match items in User Library."
             value="user" />
@@ -415,7 +428,7 @@
         <description>Whether to remove tags from Zotero items when no Markdown file is found.</description>
         <radiogroup
           id="zotero-prefpane-__addonRef__-removetags"
-          preference="__prefsPrefix__.removetags">
+          preference="removetags">
           <radio
             label="Keep Zotero tags synced with Markdown Database (recommended)."
             value="keepsynced" />
@@ -480,7 +493,7 @@
               <label value="Debug Log Level" />
               <menulist
                 id="zotero-prefpane-__addonRef__-debugmode"
-                preference="__prefsPrefix__.debugmode"
+                preference="debugmode"
                 native="true">
                 <menupopup>
                   <menuitem
@@ -501,7 +514,6 @@
   <!--<separator />-->
 </vbox>
 
-
 <vbox>
   <html:label
     data-l10n-id="pref-help"

addon/chrome/content/icons/favicon@0.5x.png renamed to addon/content/icons/favicon@0.5x.png

@@ -22,6 +22,9 @@ pref-filefilterstrategy-custom-desc2 = Default pattern is: ^@.+\.md$. NB optiona
 pref-matchstrategy-bbt-title = Match notes based on BetterBibTeX citekey
 pref-matchstrategy-bbt-desc = MarkDB-Connect will search for a BetterBibTeX citekey in the filename and/or metadata.
 
+pref-dbapp-obsidian-resolve-with-file-checkbox =
+    .label = Use filename instead of filepath in URI
+
 calendar-view-toggle-day = Day
     .title = Switch to day view
 

addon/chrome/content/preferences.css renamed to addon/content/preferences.css

@@ -6,15 +6,15 @@
   "homepage_url": "__homepage__",
   "author": "__author__",
   "icons": {
-    "48": "chrome/content/icons/favicon@0.5x.png",
-    "96": "chrome/content/icons/favicon.png"
+    "48": "content/icons/favicon@0.5x.png",
+    "96": "content/icons/favicon.png"
   },
   "applications": {
     "zotero": {
       "id": "__addonID__",
       "update_url": "__updateURL__",
       "strict_min_version": "6.999",
-      "strict_max_version": "7.1.*"
+      "strict_max_version": "7.*"
     }
   }
 }

addon/chrome/content/preferences.xhtml renamed to addon/content/preferences.xhtml

@@ -1,28 +1,29 @@
 /* eslint-disable no-undef */
-pref('__prefsPrefix__.enable', true)
+pref('enable', true)
 
 //
 
-pref('__prefsPrefix__.configuration', '0.0.0')
-pref('__prefsPrefix__.debugmode', 'minimal')
+pref('configuration', '0.0.0')
+pref('debugmode', 'minimal')
 
-pref('__prefsPrefix__.sourcedir', '')
+pref('sourcedir', '')
 
-pref('__prefsPrefix__.filefilterstrategy', ['default', 'customfileregexp'][0])
-pref('__prefsPrefix__.filepattern', '^@.+\\.md$')
+pref('filefilterstrategy', 'default') // ['default', 'customfileregexp'][0]
+pref('filepattern', '^@.+\\.md$')
 
-pref('__prefsPrefix__.matchstrategy', ['bbtcitekeyyaml', 'bbtcitekeyregexp', 'zotitemkey'][0])
-pref('__prefsPrefix__.bbtyamlkeyword', '')
-pref('__prefsPrefix__.bbtregexp', '')
-pref('__prefsPrefix__.zotkeyregexp', '')
+pref('matchstrategy', 'bbtcitekeyyaml') // ['bbtcitekeyyaml', 'bbtcitekeyregexp', 'zotitemkey'][0]
+pref('bbtyamlkeyword', '')
+pref('bbtregexp', '')
+pref('zotkeyregexp', '')
 
-pref('__prefsPrefix__.mdeditor', ['obsidian', 'logseq', 'system'][0])
-pref('__prefsPrefix__.obsidianvaultname', '')
-pref('__prefsPrefix__.obsidianresolvewithfile', [false, true][0])
+pref('mdeditor', 'obsidian') // ['obsidian', 'logseq', 'system'][0]
+pref('obsidianvaultname', '')
+// pref('obsidianresolvewithfile', false) // [false, true][0]
+pref('obsidianresolvespec', 'path') // ['path', 'file'][0]
 
-pref('__prefsPrefix__.logseqgraph', '')
-pref('__prefsPrefix__.logseqprefix', '')
+pref('logseqgraph', '')
+pref('logseqprefix', '')
 
-pref('__prefsPrefix__.grouplibraries', ['user', 'group'][0])
-pref('__prefsPrefix__.removetags', ['keepsynced', 'addonly'][0])
-pref('__prefsPrefix__.tagstr', 'ObsCite')
+pref('grouplibraries', 'user') // ['user', 'group'][0]
+pref('removetags', 'keepsynced') // ['keepsynced', 'addonly'][0]
+pref('tagstr', 'ObsCite')