@musodojo/music-theory-data 14.0.2 → 15.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@musodojo/music-theory-data",
-  "version": "14.0.2",
+  "version": "15.0.0",
   "description": "The musician-friendly TypeScript library for modes, scales, chords, and more.",
   "keywords": [
     "music",
@@ -10,4 +10,4 @@
   "author": "Conor Dowdall",
   "type": "module",
   "main": "src/mod.ts"
-}
+}

package/src/data/note-collections/augmented.ts

@@ -0,0 +1,82 @@
+import type { NoteCollection } from "../../types/note-collections.d.ts";
+
+const augmentedTriad: NoteCollection = {
+  primaryName: "aug",
+  names: ["aug", "+", "Augmented Triad"],
+  intervals: ["1", "3", "♯5"],
+  integers: [0, 4, 8],
+  type: ["augmented", "chord", "arpeggio", "triad", "symmetrical"],
+  characteristics: ["tense", "unstable", "dreamy", "dissonant"],
+  pattern: ["major third", "major third"],
+  patternShort: ["M3", "M3"],
+} as const;
+
+const italian6: NoteCollection = {
+  primaryName: "It+6",
+  names: ["It+6", "Italian 6th"],
+  intervals: ["1", "3", "♭6"],
+  integers: [0, 4, 8],
+  type: ["augmented", "chord", "arpeggio", "triad", "classical"],
+  characteristics: [
+    "classical harmony",
+    "pre-dominant function",
+    "chromatic",
+  ],
+  pattern: ["major third", "diminished fourth"],
+  patternShort: ["M3", "d4"],
+} as const;
+
+const french6: NoteCollection = {
+  primaryName: "Fr+6",
+  names: ["Fr+6", "French 6th"],
+  intervals: ["1", "3", "♯4", "♭6"],
+  integers: [0, 4, 6, 8],
+  type: ["augmented", "chord", "arpeggio", "tetrad", "classical"],
+  characteristics: [
+    "classical harmony",
+    "pre-dominant function",
+    "chromatic",
+    "contains a tritone",
+  ],
+  pattern: ["major third", "minor second", "major second"],
+  patternShort: ["M3", "m2", "M2"],
+} as const;
+
+const german6: NoteCollection = {
+  primaryName: "Ger+6",
+  names: ["Ger+6", "German 6th"],
+  intervals: ["1", "3", "5", "♭6"],
+  integers: [0, 4, 7, 8],
+  type: ["augmented", "chord", "arpeggio", "tetrad", "classical"],
+  characteristics: [
+    "classical harmony",
+    "pre-dominant function",
+    "chromatic",
+    "enharmonically equivalent to a dominant 7th",
+  ],
+  pattern: ["major third", "minor third", "augmented unison"],
+  patternShort: ["M3", "m3", "A1"],
+} as const;
+
+const augmented7: NoteCollection = {
+  primaryName: "aug7",
+  names: ["aug7", "+7", "7♯5", "Augmented Seventh"],
+  intervals: ["1", "3", "♯5", "♭7"],
+  integers: [0, 4, 8, 10],
+  type: ["augmented", "dominant", "chord", "arpeggio", "tetrad"],
+  characteristics: ["tense", "unstable", "dissonant", "dominant function"],
+  pattern: ["major third", "major third", "minor second"],
+  patternShort: ["M3", "M3", "m2"],
+} as const;
+
+export const _augmented = {
+  augmentedTriad,
+  italian6,
+  french6,
+  german6,
+  augmented7,
+} as const;
+
+export type AugmentedKey = keyof typeof _augmented;
+
+export const augmented: Record<AugmentedKey, NoteCollection> = _augmented;

package/src/data/note-collections/diminished.ts

@@ -0,0 +1,73 @@
+import type { NoteCollection } from "../../types/note-collections.d.ts";
+
+const diminishedTriad: NoteCollection = {
+  primaryName: "dim",
+  names: ["dim", "°", "Diminished Triad"],
+  intervals: ["1", "♭3", "♭5"],
+  integers: [0, 3, 6],
+  type: ["diminished", "chord", "arpeggio", "triad"],
+  characteristics: ["tense", "unstable", "dissonant"],
+  pattern: ["minor third", "minor third"],
+  patternShort: ["m3", "m3"],
+} as const;
+
+const diminished7: NoteCollection = {
+  primaryName: "dim7",
+  names: ["dim7", "°7", "Diminished 7th"],
+  intervals: ["1", "♭3", "♭5", "𝄫7"],
+  integers: [0, 3, 6, 9],
+  type: ["diminished", "chord", "arpeggio", "tetrad", "symmetrical"],
+  characteristics: ["very tense", "unstable", "symmetrical", "passing chord"],
+  pattern: ["minor third", "minor third", "minor third"],
+  patternShort: ["m3", "m3", "m3"],
+} as const;
+
+const halfDiminished7: NoteCollection = {
+  primaryName: "m7♭5",
+  names: ["m7♭5", "ø7", "Half Diminished 7th"],
+  intervals: ["1", "♭3", "♭5", "♭7"],
+  integers: [0, 3, 6, 10],
+  type: ["diminished", "minor", "chord", "arpeggio", "tetrad"],
+  characteristics: ["tense", "jazzy", "leading to minor"],
+  pattern: ["minor third", "minor third", "major third"],
+  patternShort: ["m3", "m3", "M3"],
+} as const;
+
+const wholeHalfDiminished: NoteCollection = {
+  primaryName: "Whole Half Diminished",
+  names: ["Whole Half Diminished"],
+  intervals: ["1", "2", "♭3", "4", "♭5", "♭6", "6", "7"],
+  integers: [0, 2, 3, 5, 6, 8, 9, 11],
+  type: ["diminished", "scale", "symmetrical", "octatonic"],
+  characteristics: ["tense", "jazzy", "symmetrical", "alternating tones"],
+  pattern: ["whole", "half", "whole", "half", "whole", "half", "whole", "half"],
+  patternShort: ["W", "H", "W", "H", "W", "H", "W", "H"],
+} as const;
+
+const halfWholeDiminished: NoteCollection = {
+  primaryName: "Half Whole Diminished",
+  names: ["Half Whole Diminished", "Dominant Diminished"],
+  intervals: ["1", "♭2", "♭3", "3", "♯4", "5", "6", "♭7"],
+  integers: [0, 1, 3, 4, 6, 7, 9, 10],
+  type: ["diminished", "dominant", "scale", "symmetrical", "octatonic"],
+  characteristics: [
+    "tense",
+    "jazzy",
+    "symmetrical",
+    "used over dominant 7th chords",
+  ],
+  pattern: ["half", "whole", "half", "whole", "half", "whole", "half", "whole"],
+  patternShort: ["H", "W", "H", "W", "H", "W", "H", "W"],
+} as const;
+
+export const _diminished = {
+  diminishedTriad,
+  diminished7,
+  halfDiminished7,
+  wholeHalfDiminished,
+  halfWholeDiminished,
+} as const;
+
+export type DiminishedKey = keyof typeof _diminished;
+
+export const diminished: Record<DiminishedKey, NoteCollection> = _diminished;

package/src/data/note-collections/minor-variants.ts

@@ -0,0 +1,101 @@
+import type { NoteCollection } from "../../types/note-collections.d.ts";
+
+const minor: NoteCollection = {
+  primaryName: "m",
+  names: ["m", "min", "Minor", "Minor Triad"],
+  intervals: ["1", "♭3", "5"],
+  integers: [0, 3, 7],
+  type: ["minor", "chord", "arpeggio", "triad"],
+  characteristics: [
+    "sad",
+    "melancholic",
+    "dark",
+    "the most basic minor chord",
+  ],
+  pattern: ["minor third", "major third"],
+  patternShort: ["m3", "M3"],
+} as const;
+
+const minor6: NoteCollection = {
+  primaryName: "m6",
+  names: ["m6", "min6", "Minor 6th", "Minor Sixth"],
+  intervals: ["1", "♭3", "5", "6"],
+  integers: [0, 3, 7, 9],
+  type: ["minor", "chord", "arpeggio", "tetrad"],
+  characteristics: [
+    "jazzy",
+    "soulful",
+    "less dissonant than m7",
+    "dorian feel",
+  ],
+  pattern: ["minor third", "major third", "major second"],
+  patternShort: ["m3", "M3", "M2"],
+} as const;
+
+const minor7: NoteCollection = {
+  primaryName: "m7",
+  names: ["m7", "min7", "Minor 7th", "Minor Seventh"],
+  intervals: ["1", "♭3", "5", "♭7"],
+  integers: [0, 3, 7, 10],
+  type: ["minor", "chord", "arpeggio", "tetrad"],
+  characteristics: ["smooth", "jazzy", "versatile", "foundational minor chord"],
+  pattern: ["minor third", "major third", "minor third"],
+  patternShort: ["m3", "M3", "m3"],
+} as const;
+
+const minor9: NoteCollection = {
+  primaryName: "m9",
+  names: ["m9", "min9", "Minor 9th", "Minor Ninth"],
+  intervals: ["1", "♭3", "5", "♭7", "9"],
+  integers: [0, 2, 3, 7, 10],
+  type: ["minor", "chord", "arpeggio", "pentad"],
+  characteristics: ["rich", "lush", "sophisticated", "common in jazz"],
+  pattern: ["minor third", "major third", "minor third", "major third"],
+  patternShort: ["m3", "M3", "m3", "M3"],
+} as const;
+
+const minorAdd9: NoteCollection = {
+  primaryName: "m(add9)",
+  names: ["m(add9)", "min(add9)", "Minor add 9"],
+  intervals: ["1", "♭3", "5", "9"],
+  integers: [0, 2, 3, 7],
+  type: ["minor", "chord", "arpeggio", "tetrad"],
+  characteristics: [
+    "open",
+    "modern",
+    "adds color without the 7th",
+    "pop and rock music",
+  ],
+  pattern: ["minor third", "major third", "perfect fifth"],
+  patternShort: ["m3", "M3", "P5"],
+} as const;
+
+const minor6Add9: NoteCollection = {
+  primaryName: "m6/9",
+  names: ["m6/9", "min6/9", "Minor 6/9"],
+  intervals: ["1", "♭3", "5", "6", "9"],
+  integers: [0, 2, 3, 7, 9],
+  type: ["minor", "chord", "arpeggio", "pentad"],
+  characteristics: [
+    "rich",
+    "jazzy",
+    "dorian flavor",
+    "sophisticated minor sound",
+  ],
+  pattern: ["minor third", "major third", "major second", "perfect fourth"],
+  patternShort: ["m3", "M3", "M2", "P4"],
+} as const;
+
+export const _minorVariants = {
+  minor,
+  minor6,
+  minor7,
+  minor9,
+  minorAdd9,
+  minor6Add9,
+} as const;
+
+export type MinorVariantKey = keyof typeof _minorVariants;
+
+export const minorVariants: Record<MinorVariantKey, NoteCollection> =
+  _minorVariants;

package/src/data/note-collections/mod.ts

@@ -1,23 +1,35 @@
 import { diatonicModes } from "./diatonic-modes.ts";
 import { harmonicMinorModes } from "./harmonic-minor-modes.ts";
 import { melodicMinorModes } from "./melodic-minor-modes.ts";
+import { minorVariants } from "./minor-variants.ts";
 import { dominantVariants } from "./dominant-variants.ts";
 import { majorVariants } from "./major-variants.ts";
+import { pentatonics } from "./pentatonics.ts";
+import { diminished } from "./diminished.ts";
+import { augmented } from "./augmented.ts";
 import { otherNoteCollections } from "./other-collections.ts";
 
 export { diatonicModes } from "./diatonic-modes.ts";
 export { dominantVariants } from "./dominant-variants.ts";
 export { harmonicMinorModes } from "./harmonic-minor-modes.ts";
 export { majorVariants } from "./major-variants.ts";
+export { minorVariants } from "./minor-variants.ts";
 export { melodicMinorModes } from "./melodic-minor-modes.ts";
+export { pentatonics } from "./pentatonics.ts";
+export { diminished } from "./diminished.ts";
+export { augmented } from "./augmented.ts";
 export { otherNoteCollections } from "./other-collections.ts";
 
 export const noteCollections = {
   ...diatonicModes,
   ...harmonicMinorModes,
   ...melodicMinorModes,
-  ...dominantVariants,
   ...majorVariants,
+  ...minorVariants,
+  ...dominantVariants,
+  ...pentatonics,
+  ...diminished,
+  ...augmented,
   ...otherNoteCollections,
 } as const;
 
@@ -27,8 +39,12 @@ export const groupedNoteCollections = {
   diatonicModes,
   harmonicMinorModes,
   melodicMinorModes,
-  dominantVariants,
   majorVariants,
+  minorVariants,
+  dominantVariants,
+  pentatonics,
+  diminished,
+  augmented,
   otherNoteCollections,
 } as const;
 
@@ -56,15 +72,33 @@ export const noteCollectionGroupsMetadata: Record<
     description:
       "Seven-note scales derived from the melodic minor scale, each starting on a different scale degree.",
   },
+  majorVariants: {
+    displayName: "Major Variants",
+    description:
+      "Chord structures based on the major triad, including sixth and major seventh harmonies.",
+  },
+  minorVariants: {
+    displayName: "Minor Variants",
+    description:
+      "Chord structures based on the minor triad, including sixth and seventh harmonies.",
+  },
   dominantVariants: {
     displayName: "Dominant Variants",
     description:
       "Chord structures based on the dominant seventh chord, including extended harmonies (9ths, 11ths, 13ths).",
   },
-  majorVariants: {
-    displayName: "Major Variants",
+  pentatonics: {
+    displayName: "Pentatonic Scales",
+    description: "Five-note scales used widely in folk, blues, and rock music.",
+  },
+  diminished: {
+    displayName: "Diminished",
+    description: "Tense and dissonant chords and scales built on minor thirds.",
+  },
+  augmented: {
+    displayName: "Augmented",
     description:
-      "Chord structures based on the major triad, including sixth and major seventh harmonies.",
+      "Unstable and dreamy chords and scales, including classical augmented sixth chords.",
   },
   otherNoteCollections: {
     displayName: "Other",

package/src/data/note-collections/pentatonics.ts

@@ -0,0 +1,93 @@
+import type { NoteCollection } from "../../types/note-collections.d.ts";
+
+const majorPentatonic: NoteCollection = {
+  primaryName: "Major Pentatonic",
+  names: ["Major Pentatonic"],
+  intervals: ["1", "2", "3", "5", "6"],
+  integers: [0, 2, 4, 7, 9],
+  type: ["major", "pentatonic", "scale", "gapped scale"],
+  characteristics: [
+    "open",
+    "positive",
+    "simple",
+    "found in many cultures",
+    "folk music",
+    "country music",
+  ],
+  pattern: ["whole", "whole", "minor third", "whole"],
+  patternShort: ["W", "W", "m3", "W"],
+} as const;
+
+const suspendedPentatonic: NoteCollection = {
+  primaryName: "Suspended Pentatonic",
+  names: ["Suspended Pentatonic", "Egyptian Pentatonic"],
+  intervals: ["1", "2", "4", "5", "♭7"],
+  integers: [0, 2, 5, 7, 10],
+  type: ["suspended", "pentatonic", "scale", "gapped scale"],
+  characteristics: ["open", "stable", "neutral", "neither major nor minor"],
+  pattern: ["whole", "minor third", "whole", "minor third"],
+  patternShort: ["W", "m3", "W", "m3"],
+} as const;
+
+const bluesMinorPentatonic: NoteCollection = {
+  primaryName: "Blues Minor Pentatonic",
+  names: ["Blues Minor Pentatonic"],
+  intervals: ["1", "♭3", "4", "♭5", "♭7"],
+  integers: [0, 3, 5, 6, 10],
+  type: ["minor", "pentatonic", "scale", "gapped scale", "blues"],
+  characteristics: ["bluesy", "tense", "minor with a blue note"],
+  pattern: ["minor third", "whole", "half", "minor third"],
+  patternShort: ["m3", "W", "H", "m3"],
+} as const;
+
+const bluesMajorPentatonic: NoteCollection = {
+  primaryName: "Blues Major Pentatonic",
+  names: ["Blues Major Pentatonic"],
+  intervals: ["1", "2", "♭3", "5", "6"],
+  integers: [0, 2, 3, 7, 9],
+  type: ["major", "pentatonic", "scale", "gapped scale", "blues"],
+  characteristics: ["bluesy", "country", "major with a blue note"],
+  pattern: ["whole", "half", "major third", "whole"],
+  patternShort: ["W", "H", "M3", "W"],
+} as const;
+
+const minorPentatonic: NoteCollection = {
+  primaryName: "Minor Pentatonic",
+  names: ["Minor Pentatonic"],
+  intervals: ["1", "♭3", "4", "5", "♭7"],
+  integers: [0, 3, 5, 7, 10],
+  type: ["minor", "pentatonic", "scale", "gapped scale"],
+  characteristics: [
+    "bluesy",
+    "rock",
+    "versatile",
+    "found in many cultures",
+    "relative of major pentatonic",
+  ],
+  pattern: ["minor third", "whole", "whole", "minor third"],
+  patternShort: ["m3", "W", "W", "m3"],
+} as const;
+
+const dominantPentatonic: NoteCollection = {
+  primaryName: "Dominant Pentatonic",
+  names: ["Dominant Pentatonic"],
+  intervals: ["1", "2", "3", "5", "♭7"],
+  integers: [0, 2, 4, 7, 10],
+  type: ["dominant", "pentatonic", "scale", "gapped scale"],
+  characteristics: ["bluesy", "dominant feel", "mixolydian flavor"],
+  pattern: ["whole", "whole", "minor third", "minor third"],
+  patternShort: ["W", "W", "m3", "m3"],
+} as const;
+
+export const _pentatonics = {
+  majorPentatonic,
+  suspendedPentatonic,
+  bluesMinorPentatonic,
+  bluesMajorPentatonic,
+  minorPentatonic,
+  dominantPentatonic,
+} as const;
+
+export type PentatonicKey = keyof typeof _pentatonics;
+
+export const pentatonics: Record<PentatonicKey, NoteCollection> = _pentatonics;

package/src/data/note-collections/todo.txt

@@ -2,45 +2,27 @@
 export default [
   {
     name: "m / Minor",
-    category: "Minor",
     sequence: [0, 3, 7],
   },
   {
     name: "m6 / Minor  Major 6th",
-    category: "Minor",
     sequence: [0, 3, 7, 9],
   },
   {
     name: "m7 / Minor 7th",
-    category: "Minor",
     sequence: [0, 3, 7, 10],
   },
   {
     name: "m9 / Minor 9th",
-    category: "Minor",
     sequence: [0, 2, 3, 7, 10],
-    labels: {
-      Quality: { 2: "M9" },
-      Relative: { 2: "9" },
-    },
   },
   {
     name: "m(add9) / Minor add 9",
-    category: "Minor",
     sequence: [0, 2, 3, 7],
-    labels: {
-      Quality: { 2: "M9" },
-      Relative: { 2: "9" },
-    },
   },
   {
     name: "m6/9 / Minor 6/9",
-    category: "Minor",
     sequence: [0, 2, 3, 7, 9],
-    labels: {
-      Quality: { 2: "M9" },
-      Relative: { 2: "9" },
-    },
   },
 ];
 
@@ -49,188 +31,75 @@ export default [
 export default [
   {
     name: "Major Pentatonic",
-    category: "Pentatonic",
     sequence: [0, 2, 4, 7, 9],
   },
   {
     name: "Suspended Pentatonic",
-    category: "Pentatonic",
     sequence: [0, 2, 5, 7, 10],
   },
   {
     name: "Blues Minor Pentatonic",
-    category: "Pentatonic",
     sequence: [0, 3, 5, 8, 10],
   },
   {
     name: "Blues Major Pentatonic",
-    category: "Pentatonic",
     sequence: [0, 2, 5, 7, 9],
   },
   {
     name: "Minor Pentatonic",
-    category: "Pentatonic",
     sequence: [0, 3, 5, 7, 10],
   },
   {
     name: "Dominant Pentatonic",
-    category: "Pentatonic",
     sequence: [0, 2, 4, 7, 10],
   },
 ];
 
 
-// OTHER
-export default [
   // Diminished
   {
     name: "dim / o / Diminished Triad",
-    category: "Diminished",
     sequence: [0, 3, 6],
   },
   {
     name: "dim7 / o7 / Diminished 7th",
-    category: "Diminished",
     sequence: [0, 3, 6, 9],
-    labels: {
-      Quality: { 9: "d7" },
-      Relative: { 9: "♭♭7" },
-      Extension: { 9: "♭♭7" },
-    },
   },
   {
     name: "m7♭5 / ø7 / Half Diminished 7th",
-    category: "Diminished",
     sequence: [0, 3, 6, 10],
   },
   {
     name: "Whole Half Diminished",
-    category: "Diminished",
     sequence: [0, 2, 3, 5, 6, 8, 9, 11],
-    labels: {
-      Quality: { 8: "A5" },
-      Relative: { 8: "♯5" },
-      Extension: { 8: "♯5" },
-    },
   },
   {
     name: "Half Whole / Dominant Diminished",
-    category: "Diminished",
     sequence: [0, 1, 3, 4, 6, 7, 9, 10],
-    labels: {
-      Quality: { 3: "A2", 6: "A4" },
-      Relative: { 3: "♯2", 6: "♯4" },
-      Extension: { 3: "♯9", 6: "♯11" },
-    },
   },
+
   // Augmented
   {
     name: "aug / + / Augmented Triad",
-    category: "Augmented",
     sequence: [0, 4, 8],
-    labels: {
-      Quality: { 8: "A5" },
-      Relative: { 8: "♯5" },
-      Extension: { 8: "♯5" },
-    },
   },
   {
     name: "It+6 / Italian 6th",
-    category: "Augmented",
     sequence: [0, 4, 10],
-    labels: {
-      Quality: { 10: "A6" },
-      Relative: { 10: "♯6" },
-      Extension: { 10: "♯13" },
-    },
   },
   {
     name: "Fr+6 / French 6th",
-    category: "Augmented",
     sequence: [0, 4, 6, 10],
-    labels: {
-      Quality: { 10: "A6" },
-      Relative: { 10: "♯6" },
-      Extension: { 10: "♯13" },
-    },
   },
   {
     name: "Ger+6 / German 6th",
-    category: "Augmented",
     sequence: [0, 4, 7, 10],
-    labels: {
-      Quality: { 10: "A6" },
-      Relative: { 10: "♯6" },
-      Extension: { 10: "♯13" },
-    },
   },
   {
     name: "aug7 / +7 / 7♯5 / Augmented Seventh",
-    category: "Augmented",
     sequence: [0, 4, 8, 10],
-    labels: {
-      Quality: { 8: "A5" },
-      Relative: { 8: "♯5" },
-      Extension: { 8: "♯5" },
-    },
   },
 
-  // Harmonic Minor
-  {
-    name: "Harmonic Minor",
-    category: "Harmonic Minor",
-    sequence: [0, 2, 3, 5, 7, 8, 11],
-  },
-  {
-    name: "Locrian ♯6",
-    category: "Harmonic Minor",
-    sequence: [0, 1, 3, 5, 6, 9, 10],
-  },
-  {
-    name: "Ionian ♯5",
-    category: "Harmonic Minor",
-    sequence: [0, 2, 4, 5, 8, 9, 11],
-    labels: {
-      Quality: { 8: "A5" },
-      Relative: { 8: "♯5" },
-      Extension: { 8: "♯5" },
-    },
-  },
-  {
-    name: "Dorian ♯4",
-    category: "Harmonic Minor",
-    sequence: [0, 2, 3, 6, 7, 9, 10],
-    labels: {
-      Quality: { 6: "A4" },
-      Relative: { 6: "♯4" },
-      Extension: { 6: "♯11" },
-    },
-  },
-  {
-    name: "Phrygian Dominant",
-    category: "Harmonic Minor",
-    sequence: [0, 1, 4, 5, 7, 8, 10],
-  },
-  {
-    name: "Lydian ♯2",
-    category: "Harmonic Minor",
-    sequence: [0, 3, 4, 6, 7, 9, 11],
-    labels: {
-      Quality: { 3: "A2", 6: "A4" },
-      Relative: { 3: "♯2", 6: "♯4" },
-      Extension: { 3: "♯9", 6: "♯11" },
-    },
-  },
-  {
-    name: "Super Locrian ♭♭7",
-    category: "Harmonic Minor",
-    sequence: [0, 1, 3, 4, 6, 8, 9],
-    labels: {
-      Quality: { 4: "d4", 9: "d7" },
-      Relative: { 4: "♭4", 9: "♭♭7" },
-      Extension: { 4: "♭11", 9: "♭♭7" },
-    },
-  },
   // Other
   {
     name: "R / Root",

package/src/utils/note-collections.ts

@@ -109,18 +109,37 @@ export function searchNoteCollections(
   }
 
   // 2. Apply prioritized text search on the filtered candidates
-  const prioritizedResults = new Set<NoteCollection>();
   const normalizedQuery = normalizeSearchTerm(query);
 
   if (!normalizedQuery) {
     return candidates;
   }
 
-  // Use case-sensitive search for "M" and "m" to avoid incorrect matches.
-  const isCaseSensitiveQuery = normalizedQuery === "M" ||
-    normalizedQuery === "m";
-  const regexFlags = isCaseSensitiveQuery ? "" : "i";
-  const searchRegex = new RegExp(`\\b${normalizedQuery}\\b`, regexFlags);
+  const searchWords = normalizedQuery.split(" ");
+
+  // Filter candidates to those that contain all search words
+  const textFilteredCandidates = candidates.filter((theme) => {
+    const searchableText = [
+      theme.primaryName,
+      ...theme.names,
+      ...theme.type,
+      ...theme.characteristics,
+    ]
+      .map(normalizeSearchTerm)
+      .join(" ");
+
+    return searchWords.every((word) => {
+      const isCaseSensitiveWord = word === "M" || word === "m";
+      const regex = new RegExp(
+        `\\b${word}\\b`,
+        isCaseSensitiveWord ? "" : "i",
+      );
+      return regex.test(searchableText);
+    });
+  });
+
+  // 3. Prioritize the filtered results
+  const prioritizedResults = new Set<NoteCollection>();
 
   const passes = [
     // Pass 1: Exact match on primaryName
@@ -129,30 +148,29 @@ export function searchNoteCollections(
     // Pass 2: Exact match on any name
     (theme: NoteCollection) =>
       theme.names.some((name) => normalizeSearchTerm(name) === normalizedQuery),
-    // Pass 3: Whole word match on primaryName
+    // Pass 3: Primary name starts with the query
     (theme: NoteCollection) =>
-      searchRegex.test(normalizeSearchTerm(theme.primaryName)),
-    // Pass 4: Whole word match on any name
+      normalizeSearchTerm(theme.primaryName).startsWith(normalizedQuery),
+    // Pass 4: Any name starts with the query
     (theme: NoteCollection) =>
-      theme.names.some((name) => searchRegex.test(normalizeSearchTerm(name))),
-    // Pass 7: Whole word match on any type
-    (theme: NoteCollection) =>
-      theme.type.some((t) => searchRegex.test(normalizeSearchTerm(t))),
-    // Pass 8: Whole word match on any characteristic
-    (theme: NoteCollection) =>
-      theme.characteristics.some((c) =>
-        searchRegex.test(normalizeSearchTerm(c))
+      theme.names.some((name) =>
+        normalizeSearchTerm(name).startsWith(normalizedQuery)
       ),
   ];
 
   for (const pass of passes) {
-    for (const theme of candidates) {
+    for (const theme of textFilteredCandidates) {
       if (pass(theme)) {
         prioritizedResults.add(theme);
       }
     }
   }
 
+  // Add the remaining text-filtered candidates that didn't match a priority pass
+  for (const theme of textFilteredCandidates) {
+    prioritizedResults.add(theme);
+  }
+
   return Array.from(prioritizedResults);
 }