template LABEL should not be inherited #4349

package.json

@@ -72,7 +72,7 @@
     "jimp": "0.22.10",
     "joplin-turndown-plugin-gfm": "1.0.12",
     "jsdom": "22.1.0",
-    "marked": "9.1.2",
+    "marked": "9.1.6",
     "mime-types": "2.1.35",
     "multer": "1.4.5-lts.1",
     "node-abi": "3.50.0",
@@ -101,7 +101,7 @@
   },
   "devDependencies": {
     "cross-env": "7.0.3",
-    "electron": "25.9.2",
+    "electron": "25.9.5",
     "electron-builder": "24.6.4",
     "electron-packager": "17.1.2",
     "electron-rebuild": "3.2.9",

src/services/search/expressions/attribute_exists.js

@@ -10,6 +10,8 @@ class AttributeExistsExp extends Expression {
 
         this.attributeType = attributeType;
         this.attributeName = attributeName;
+        // template attr is used as a marker for templates, but it's not meant to be inherited
+        this.isTemplateLabel = this.attributeType === 'label' && (this.attributeName === 'template' || this.attributeName === 'workspacetemplate');
         this.prefixMatch = prefixMatch;
     }
 
@@ -23,12 +25,10 @@ class AttributeExistsExp extends Expression {
         for (const attr of attrs) {
             const note = attr.note;
 
-            if (attr.isInheritable) {
+            if (attr.isInheritable && !this.isTemplateLabel) {
                 resultNoteSet.addAll(note.getSubtreeNotesIncludingTemplated());
             }
-            else if (note.isInherited() &&
-                // template attr is used as a marker for templates, but it's not meant to be inherited
-                !(this.attributeType === 'label' && (this.attributeName === 'template' || this.attributeName === 'workspacetemplate'))) {
+            else if (note.isInherited() && !this.isTemplateLabel) {
                 resultNoteSet.addAll(note.getInheritingNotes());
             }
             else {