@sudobility/music_types 0.13.23 → 0.13.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/domain/generation/style-presets.d.ts +21 -2
  2. package/dist/domain/generation/style-presets.d.ts.map +1 -1
  3. package/dist/domain/generation/style-presets.js +103 -33
  4. package/dist/domain/generation/style-presets.js.map +1 -1
  5. package/package.json +1 -1
package/dist/domain/generation/style-presets.d.ts CHANGED
@@ -11,8 +11,27 @@ export declare const GENERATE_SCORE_STYLE_OPTIONS: readonly string[];
11
11
  export type GenerateScoreStylePreset = {
12
12
  /** What the model is told the style is. */
13
13
  prompt: string;
14
- /** Picker values, in ensemble order. */
14
+ /**
15
+ * The style's core instruments as picker values: `essential` then
16
+ * `preferred`, without the singer. Derived; see the three tiers below.
17
+ */
15
18
  instruments: readonly string[];
19
+ /**
20
+ * Always in the roster and not removable while generating: the kit in a
21
+ * style whose rhythm is the kit, the bass where the groove is the bass, the
22
+ * instrument that defines the sound (a reggae guitar chop, a tango bandoneon).
23
+ */
24
+ essential: readonly string[];
25
+ /**
26
+ * Added automatically and removable. The singer is one of these in a song
27
+ * style, and is only added when the model writes the music.
28
+ */
29
+ preferred: readonly string[];
30
+ /**
31
+ * The style's colour instruments. A couple are picked at random each time
32
+ * the style is chosen, so two pieces of one style are not the same band.
33
+ */
34
+ optional: readonly string[];
16
35
  /** Beats per minute, in the middle of the range the genre is played at. */
17
36
  tempo: number;
18
37
  /** Bars the piece runs for, derived from the preset's tempo and meter. */
@@ -26,7 +45,7 @@ export type GenerateScoreStylePreset = {
26
45
  *
27
46
  * Read with `mode` below, so a minor-mode genre's list is minor tonics: 0 is
28
47
  * A minor there and C major elsewhere. One is chosen per generation rather
29
- * than fixed, for the reason `styleInstrumentsWithGuest` picks a guest —
48
+ * than fixed, for the reason `styleRoster` picks optional instruments —
30
49
  * two goes at one genre are otherwise the same piece twice.
31
50
  *
32
51
  * Why the list is short and per-genre rather than "any of the twelve": a key
package/dist/domain/generation/style-presets.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"style-presets.d.ts","sourceRoot":"","sources":["../../../src/domain/generation/style-presets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAMzD;;;;;GAKG;AACH,QAAA,MAAM,yBAAyB,kVAkCrB,CAAC;AAEX,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,yBAAyB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE5E,eAAO,MAAM,4BAA4B,EAAE,SAAS,MAAM,EAC/B,CAAC;AAE5B,MAAM,MAAM,wBAAwB,GAAG;IACrC,2CAA2C;IAC3C,MAAM,EAAE,MAAM,CAAC;IACf,wCAAwC;IACxC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B,2EAA2E;IAC3E,KAAK,EAAE,MAAM,CAAC;IACd,0EAA0E;IAC1E,QAAQ,EAAE,MAAM,CAAC;IACjB,gFAAgF;IAChF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,kDAAkD;IAClD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;;;;;;;;;OAaG;IACH,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,gEAAgE;IAChE,aAAa,EAAE,MAAM,CAAC;IACtB,0EAA0E;IAC1E,IAAI,CAAC,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;CAC7B,CAAC;AAySF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,YAAY,OAAO,CAAC;AAEjC,yEAAyE;AACzE,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAK/E;AAED;;GAEG;AACH,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CACjD,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAczC,CAAC"}
1
+ {"version":3,"file":"style-presets.d.ts","sourceRoot":"","sources":["../../../src/domain/generation/style-presets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAUzD;;;;;GAKG;AACH,QAAA,MAAM,yBAAyB,kVAkCrB,CAAC;AAEX,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,yBAAyB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE5E,eAAO,MAAM,4BAA4B,EAAE,SAAS,MAAM,EAC/B,CAAC;AAE5B,MAAM,MAAM,wBAAwB,GAAG;IACrC,2CAA2C;IAC3C,MAAM,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B;;;;OAIG;IACH,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7B;;;OAGG;IACH,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7B;;;OAGG;IACH,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,2EAA2E;IAC3E,KAAK,EAAE,MAAM,CAAC;IACd,0EAA0E;IAC1E,QAAQ,EAAE,MAAM,CAAC;IACjB,gFAAgF;IAChF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,kDAAkD;IAClD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;;;;;;;;;OAaG;IACH,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,gEAAgE;IAChE,aAAa,EAAE,MAAM,CAAC;IACtB,0EAA0E;IAC1E,IAAI,CAAC,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;CAC7B,CAAC;AA6WF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,YAAY,OAAO,CAAC;AAEjC,yEAAyE;AACzE,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAK/E;AAED;;GAEG;AACH,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CACjD,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAiBzC,CAAC"}
package/dist/domain/generation/style-presets.js CHANGED
@@ -1,3 +1,4 @@
1
+ import { DEFAULT_VOCAL_INSTRUMENT_VALUE, isVocalInstrumentValue, } from "../instruments/instrument-options.js";
1
2
  import { measuresForSeconds, SONG_SECONDS, } from "../notation/music-vocabulary.js";
2
3
  /**
3
4
  * The keyword values the generation prompt parser branches on.
@@ -42,31 +43,41 @@ const GENERATE_SCORE_STYLE_KEYS = [
42
43
  ];
43
44
  export const GENERATE_SCORE_STYLE_OPTIONS = GENERATE_SCORE_STYLE_KEYS;
44
45
  const KIT = "kit:0";
46
+ /** The singer, as a picker value. Only ever preferred or optional, never essential. */
47
+ const VOICE = DEFAULT_VOCAL_INSTRUMENT_VALUE;
45
48
  const STYLE_PRESET_SOURCE = {
46
49
  waltz: {
47
50
  prompt: 'waltz — a lilting three-four with the weight on beat one and a light "oom-pah-pah" accompaniment',
48
- instruments: ["0", "48", "43"],
51
+ essential: ["0"],
52
+ preferred: ["48", "43"],
53
+ optional: ["40", "73", "21", "46"],
49
54
  tempo: 160,
50
55
  keys: [0, 1, -1, 2],
51
56
  timeSignature: "3/4",
52
57
  },
53
58
  jazz: {
54
59
  prompt: "jazz — swung eighth notes, walking bass, extended chords, and a melody that phrases across the barline rather than sitting on the beat",
55
- instruments: ["66", "0", "32", KIT],
60
+ essential: ["32", KIT],
61
+ preferred: ["66", "0"],
62
+ optional: ["56", "11", "26", VOICE],
56
63
  tempo: 132,
57
64
  keys: [-2, -3, -1, 0, 1],
58
65
  timeSignature: "4/4",
59
66
  },
60
67
  pop: {
61
68
  prompt: "pop — a clear singable hook, four-bar phrases, a backbeat on two and four, and space between the phrases",
62
- instruments: ["0", "27", "33", KIT],
69
+ essential: [KIT, "33"],
70
+ preferred: [VOICE, "0", "27"],
71
+ optional: ["89", "48", "25", "61"],
63
72
  tempo: 120,
64
73
  keys: [0, 1, 2, -1, 3],
65
74
  timeSignature: "4/4",
66
75
  },
67
76
  cinematic: {
68
77
  prompt: "cinematic orchestral — long sustained lines that build, a rising dynamic arc, and rhythm that serves the swell rather than a groove",
69
- instruments: ["48", "40", "42", "60", "47"],
78
+ essential: ["48", "47"],
79
+ preferred: ["60", "42", "40"],
80
+ optional: ["46", "52", "0", "73"],
70
81
  tempo: 90,
71
82
  keys: [-1, 0, 1, -2],
72
83
  timeSignature: "4/4",
@@ -74,14 +85,18 @@ const STYLE_PRESET_SOURCE = {
74
85
  },
75
86
  ambient: {
76
87
  prompt: "ambient — slow evolving pads, very long note values, no strong pulse, and silence used as a voice",
77
- instruments: ["89", "0", "48"],
88
+ essential: ["89"],
89
+ preferred: ["0", "48"],
90
+ optional: ["46", "11", "52", "73"],
78
91
  tempo: 70,
79
92
  keys: [0, -1, 1, 2],
80
93
  timeSignature: "4/4",
81
94
  },
82
95
  battle: {
83
96
  prompt: "driving battle music — insistent ostinato, hard accents, brass stabs against a relentless low pulse",
84
- instruments: ["61", "48", "47", KIT],
97
+ essential: ["61", "48", "47"],
98
+ preferred: [KIT],
99
+ optional: ["52", "60", "57"],
85
100
  tempo: 150,
86
101
  keys: [-1, 0, 1, -2],
87
102
  timeSignature: "4/4",
@@ -89,21 +104,27 @@ const STYLE_PRESET_SOURCE = {
89
104
  },
90
105
  rock: {
91
106
  prompt: "rock — a hard backbeat on two and four, power-chord riffing, and a bass locked to the kick",
92
- instruments: ["29", "27", "33", KIT],
107
+ essential: [KIT, "33", "29"],
108
+ preferred: [VOICE, "27"],
109
+ optional: ["18", "0", "30"],
93
110
  tempo: 128,
94
111
  keys: [4, 3, 1, 2, 0],
95
112
  timeSignature: "4/4",
96
113
  },
97
114
  punk: {
98
115
  prompt: "punk — fast straight eighths on downstrokes, three chords, no ornament, and a snare driving every backbeat. The guitar figure repeats unchanged through a section; the energy comes from the tempo and the drive, never from varying the part.",
99
- instruments: ["30", "29", "34", KIT],
116
+ essential: [KIT, "34", "30"],
117
+ preferred: [VOICE, "29"],
118
+ optional: ["18"],
100
119
  tempo: 180,
101
120
  keys: [4, 3, 1, 2],
102
121
  timeSignature: "4/4",
103
122
  },
104
123
  heavyMetal: {
105
124
  prompt: "heavy metal — built on ONE palm-muted galloping low riff, repeated bar after bar through a section rather than rewritten each bar; minor and modal, double-kick drive underneath, and long held high notes over the top. The riff is the song: keep it the same and let the drums and the held lead supply the variation. ONE riff means one FIGURE, not one note - the riff moves between several pitches (root, flat-7, flat-6 and back is the classic shape), and a bar of the same pitch struck eight times is a pedal, not a riff.",
106
- instruments: ["30", "29", "34", KIT],
125
+ essential: [KIT, "34", "30"],
126
+ preferred: [VOICE, "29"],
127
+ optional: ["48", "18", "52"],
107
128
  tempo: 152,
108
129
  keys: [1, -1, 0, 2],
109
130
  timeSignature: "4/4",
@@ -112,35 +133,45 @@ const STYLE_PRESET_SOURCE = {
112
133
  blues: {
113
134
  formBars: 12,
114
135
  prompt: "twelve-bar blues — shuffle feel, blue notes and bends, call-and-response between a voice-like melody and answering fills, dominant seventh chords",
115
- instruments: ["27", "22", "33", KIT],
136
+ essential: [KIT, "33", "27"],
137
+ preferred: [VOICE, "22"],
138
+ optional: ["0", "16", "66"],
116
139
  tempo: 88,
117
140
  keys: [4, 3, 1, -2, 0],
118
141
  timeSignature: "4/4",
119
142
  },
120
143
  country: {
121
144
  prompt: 'country — a two-beat "boom-chick" bass and guitar, bright major harmony, fiddle and steel fills answering the melody',
122
- instruments: ["25", "110", "27", "32", KIT],
145
+ essential: [KIT, "32", "25"],
146
+ preferred: [VOICE, "110"],
147
+ optional: ["27", "105", "22", "0"],
123
148
  tempo: 118,
124
149
  keys: [1, 2, 3, 0, -1],
125
150
  timeSignature: "4/4",
126
151
  },
127
152
  bluegrass: {
128
153
  prompt: "bluegrass — fast acoustic picking, banjo rolls in constant eighths under a syncopated fiddle melody, driving upright bass on one and three",
129
- instruments: ["105", "110", "25", "32"],
154
+ essential: ["105", "25", "32"],
155
+ preferred: [VOICE, "110"],
156
+ optional: ["22", "15"],
130
157
  tempo: 160,
131
158
  keys: [1, 2, 3, 0],
132
159
  timeSignature: "4/4",
133
160
  },
134
161
  funk: {
135
162
  prompt: "funk — heavily syncopated sixteenth-note groove, everything locked to a hard downbeat on the one, staccato stabs and plenty of rests",
136
- instruments: ["36", "28", "61", "4", KIT],
163
+ essential: [KIT, "36", "28"],
164
+ preferred: [VOICE, "61", "4"],
165
+ optional: ["16", "65", "81"],
137
166
  tempo: 104,
138
167
  keys: [-1, -2, 0, 1],
139
168
  timeSignature: "4/4",
140
169
  },
141
170
  soul: {
142
171
  prompt: "soul — a laid-back backbeat sitting slightly behind the beat, gospel-tinged chords, horn stabs answering a vocal-style melody",
143
- instruments: ["16", "4", "33", "61", KIT],
172
+ essential: [KIT, "33", "16"],
173
+ preferred: [VOICE, "4", "61"],
174
+ optional: ["48", "66", "27"],
144
175
  tempo: 96,
145
176
  keys: [-1, -2, -3, 0, 1],
146
177
  timeSignature: "4/4",
@@ -148,35 +179,45 @@ const STYLE_PRESET_SOURCE = {
148
179
  ragtime: {
149
180
  formBars: 16,
150
181
  prompt: "ragtime — a syncopated right-hand melody against a steady striding left-hand bass in two, cheerful and precise",
151
- instruments: ["0"],
182
+ essential: ["0"],
183
+ preferred: [],
184
+ optional: ["105", "71", "56"],
152
185
  tempo: 96,
153
186
  keys: [-1, -2, 0, 1],
154
187
  timeSignature: "2/4",
155
188
  },
156
189
  swing: {
157
190
  prompt: "big-band swing — swung eighth notes, brass and reed sections trading riffs, walking bass, ride-cymbal pulse with accents on two and four",
158
- instruments: ["56", "66", "57", "0", "32", KIT],
191
+ essential: [KIT, "32"],
192
+ preferred: [VOICE, "56", "66", "57", "0"],
193
+ optional: ["71", "26", "11"],
159
194
  tempo: 168,
160
195
  keys: [-2, -3, -1, 0],
161
196
  timeSignature: "4/4",
162
197
  },
163
198
  bossaNova: {
164
199
  prompt: "bossa nova — a gentle syncopated guitar pattern, soft brushed drums, a lyrical melody sitting behind the beat, rich seventh and ninth chords",
165
- instruments: ["24", "0", "32", KIT],
200
+ essential: ["24", "32"],
201
+ preferred: [VOICE, KIT, "0"],
202
+ optional: ["73", "66", "48"],
166
203
  tempo: 132,
167
204
  keys: [-1, -2, 0, 1],
168
205
  timeSignature: "4/4",
169
206
  },
170
207
  samba: {
171
208
  prompt: "samba — fast two-beat percussion-driven groove, heavy syncopation on the offbeats, surdo pulse landing on beat two",
172
- instruments: ["24", "61", "32", KIT],
209
+ essential: [KIT, "32", "24"],
210
+ preferred: [VOICE, "61"],
211
+ optional: ["73", "0", "21"],
173
212
  tempo: 100,
174
213
  keys: [0, 1, -1, -2],
175
214
  timeSignature: "2/4",
176
215
  },
177
216
  salsa: {
178
217
  prompt: "salsa — clave-driven and minor-mode, a montuno piano ostinato, syncopated brass hits, busy percussion, bass playing the tumbao rather than the downbeat",
179
- instruments: ["0", "56", "57", "32", KIT],
218
+ essential: [KIT, "32", "0"],
219
+ preferred: [VOICE, "56", "57"],
220
+ optional: ["73", "66", "11"],
180
221
  tempo: 190,
181
222
  /*
182
223
  Minor, and the keys below are minor tonics: -1 is D minor here.
@@ -194,7 +235,9 @@ const STYLE_PRESET_SOURCE = {
194
235
  },
195
236
  tango: {
196
237
  prompt: "tango — sharp dotted rhythms and dramatic accents, minor key, sudden stops and rubato pulls against a strict pulse",
197
- instruments: ["23", "40", "0", "43"],
238
+ essential: ["23", "43"],
239
+ preferred: ["40", "0", VOICE],
240
+ optional: ["42", "24"],
198
241
  tempo: 120,
199
242
  keys: [0, -1, 1, -2],
200
243
  timeSignature: "4/4",
@@ -202,14 +245,18 @@ const STYLE_PRESET_SOURCE = {
202
245
  },
203
246
  reggae: {
204
247
  prompt: "reggae — one-drop: the kick lands on beat three, not one; guitar and organ chop the offbeat eighths; bass plays a heavy melodic line, low and sparse",
205
- instruments: ["28", "18", "33", KIT],
248
+ essential: [KIT, "33", "28"],
249
+ preferred: [VOICE, "18"],
250
+ optional: ["0", "61", "22", "57"],
206
251
  tempo: 78,
207
252
  keys: [0, 1, -1, 2],
208
253
  timeSignature: "4/4",
209
254
  },
210
255
  hipHop: {
211
256
  prompt: "hip-hop — a hard boom-bap drum pattern with swung sixteenths, a deep sustained sub bass, sparse looping keys, and space left for a vocal",
212
- instruments: ["39", "4", "48", KIT],
257
+ essential: [KIT, "39"],
258
+ preferred: [VOICE, "4"],
259
+ optional: ["48", "11", "89"],
213
260
  tempo: 90,
214
261
  keys: [0, -1, -2, -3, 1],
215
262
  timeSignature: "4/4",
@@ -217,7 +264,9 @@ const STYLE_PRESET_SOURCE = {
217
264
  },
218
265
  trap: {
219
266
  prompt: "trap — half-time: the snare lands on beat three alone, an 808 sub bass slides between long tuned notes, and hi-hats roll in fast subdivisions over large gaps",
220
- instruments: ["38", "11", "89", KIT],
267
+ essential: [KIT, "38"],
268
+ preferred: [VOICE, "89"],
269
+ optional: ["11", "81", "10"],
221
270
  tempo: 140,
222
271
  keys: [-4, -3, -2, 0],
223
272
  timeSignature: "4/4",
@@ -225,7 +274,9 @@ const STYLE_PRESET_SOURCE = {
225
274
  },
226
275
  lofi: {
227
276
  prompt: "lo-fi hip-hop — slow swung drums slightly off the grid, warm jazzy minor seventh chords, a sparse melody, unhurried and repetitive",
228
- instruments: ["4", "33", "89", KIT],
277
+ essential: [KIT, "4"],
278
+ preferred: ["33", "89"],
279
+ optional: ["27", "11", VOICE],
229
280
  tempo: 74,
230
281
  keys: [-1, 0, -2, -3],
231
282
  timeSignature: "4/4",
@@ -233,14 +284,18 @@ const STYLE_PRESET_SOURCE = {
233
284
  },
234
285
  house: {
235
286
  prompt: "house — four-on-the-floor kick, offbeat open hats, a repetitive synth riff, and a bassline locked to the eighths between the kicks",
236
- instruments: ["81", "38", "89", KIT],
287
+ essential: [KIT, "38"],
288
+ preferred: ["81", "89", VOICE],
289
+ optional: ["0", "48", "62"],
237
290
  tempo: 126,
238
291
  keys: [0, -1, 1, -2],
239
292
  timeSignature: "4/4",
240
293
  },
241
294
  techno: {
242
295
  prompt: "techno — machine-like and loop-based: four-on-the-floor kick, sixteenth-note hats, one short synth-bass cell repeated, and timbre rather than chord changes carrying the track",
243
- instruments: ["38", "81", "89", KIT],
296
+ essential: [KIT, "38"],
297
+ preferred: ["81", "89"],
298
+ optional: ["0", "48", "62"],
244
299
  tempo: 132,
245
300
  keys: [0, -1, -2, 1],
246
301
  timeSignature: "4/4",
@@ -248,7 +303,9 @@ const STYLE_PRESET_SOURCE = {
248
303
  },
249
304
  trance: {
250
305
  prompt: "trance — four-on-the-floor with an offbeat synth bass after every kick, supersaw arpeggios, and long builds and releases in sixteen-bar blocks",
251
- instruments: ["81", "38", "89", KIT],
306
+ essential: [KIT, "38"],
307
+ preferred: ["81", "89", VOICE],
308
+ optional: ["0", "48", "62"],
252
309
  tempo: 138,
253
310
  keys: [0, -1, 1, -3],
254
311
  timeSignature: "4/4",
@@ -256,7 +313,9 @@ const STYLE_PRESET_SOURCE = {
256
313
  },
257
314
  edm: {
258
315
  prompt: "edm — electronic dance built on a clear build, drop and breakdown in eight-bar blocks, four-on-the-floor underneath and a big repeated lead hook through the drop",
259
- instruments: ["81", "38", "89", KIT],
316
+ essential: [KIT, "38"],
317
+ preferred: ["81", "89", VOICE],
318
+ optional: ["0", "48", "62"],
260
319
  tempo: 128,
261
320
  keys: [0, -1, -3, -4],
262
321
  timeSignature: "4/4",
@@ -264,7 +323,9 @@ const STYLE_PRESET_SOURCE = {
264
323
  },
265
324
  electroSwing: {
266
325
  prompt: "electro swing — vintage swing horns over a modern four-on-the-floor electronic beat, minor and bluesy in a gypsy-jazz vein; hard-swung eighths, syncopated and playful, with clarinet and trumpet riffs answering each other",
267
- instruments: ["56", "71", "38", KIT],
326
+ essential: [KIT, "38"],
327
+ preferred: [VOICE, "56", "71"],
328
+ optional: ["0", "57", "28"],
268
329
  tempo: 122,
269
330
  keys: [-1, 0, -2, 1],
270
331
  timeSignature: "4/4",
@@ -272,28 +333,36 @@ const STYLE_PRESET_SOURCE = {
272
333
  },
273
334
  disco: {
274
335
  prompt: "disco — four-on-the-floor kick, offbeat hi-hats, an octave-jumping bassline, and string and guitar figures on the sixteenths",
275
- instruments: ["48", "28", "33", KIT],
336
+ essential: [KIT, "33"],
337
+ preferred: [VOICE, "48", "28"],
338
+ optional: ["61", "4", "89"],
276
339
  tempo: 120,
277
340
  keys: [0, -1, 1, -2],
278
341
  timeSignature: "4/4",
279
342
  },
280
343
  classical: {
281
344
  prompt: "classical — balanced four-bar phrases answering each other, an Alberti or broken-chord accompaniment under a clear diatonic melody, and a cadence every four or eight bars",
282
- instruments: ["0", "40", "42"],
345
+ essential: ["40", "42"],
346
+ preferred: ["0"],
347
+ optional: ["41", "73", "68", "71", "60"],
283
348
  tempo: 108,
284
349
  keys: [0, 1, -1, 2, -2],
285
350
  timeSignature: "4/4",
286
351
  },
287
352
  baroque: {
288
353
  prompt: "baroque — a steady walking bass, contrapuntal interweaving voices, sequences and ornamented melodic lines, terraced dynamics",
289
- instruments: ["6", "40", "42"],
354
+ essential: ["6"],
355
+ preferred: ["40", "42"],
356
+ optional: ["68", "73", "56", "70"],
290
357
  tempo: 100,
291
358
  keys: [1, -1, 0, 2, -2],
292
359
  timeSignature: "4/4",
293
360
  },
294
361
  march: {
295
362
  prompt: "march — a firm two-beat pulse, dotted fanfare rhythms, a brass melody over a low oom-pah, crisp snare figures",
296
- instruments: ["56", "57", "58", KIT],
363
+ essential: [KIT, "58"],
364
+ preferred: ["56", "57"],
365
+ optional: ["71", "73", "60", "9"],
297
366
  tempo: 116,
298
367
  keys: [-2, -3, -1, 0],
299
368
  timeSignature: "2/4",
@@ -330,6 +399,7 @@ export const GENERATE_SCORE_STYLE_PRESETS = Object.fromEntries(Object.entries(ST
330
399
  style,
331
400
  {
332
401
  ...preset,
402
+ instruments: [...preset.essential, ...preset.preferred].filter((value) => !isVocalInstrumentValue(value)),
333
403
  measures: measuresForSeconds(preset.seconds ?? SONG_SECONDS.typical, preset.tempo, beatsPerBarOf(preset.timeSignature), preset.formBars),
334
404
  },
335
405
  ]));
package/dist/domain/generation/style-presets.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"style-presets.js","sourceRoot":"","sources":["../../../src/domain/generation/style-presets.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"style-presets.js","sourceRoot":"","sources":["../../../src/domain/generation/style-presets.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sudobility/music_types",
3
- "version": "0.13.23",
3
+ "version": "0.13.24",
4
4
  "description": "TypeScript types and Zod schemas for the ScoreSmith music API - scores, generation contracts, project payloads",
5
5
  "type": "module",
6
6
  "main": "./dist/index.js",