@glissandoo/lib 1.53.7 → 1.54.0

package/functions/group.d.ts

@@ -1,4 +1,4 @@
-import { GroupBasicData, GroupCreatedOn, GroupStatus } from '../models/Group/types';
+import { GroupBasicData, GroupCreatedOn, GroupData, GroupStatus } from '../models/Group/types';
 export declare namespace GroupFbFunctionsTypes {
     interface PublishParams {
         displayName: string;
@@ -15,6 +15,7 @@ export declare namespace GroupFbFunctionsTypes {
         id: string;
         username: string;
         invitationLink: string | null;
+        instruments: GroupData['instruments'];
     }
     interface EditParams {
         displayName: string;
@@ -27,6 +28,12 @@ export declare namespace GroupFbFunctionsTypes {
         longitude: number;
     }
     type EditResult = void;
+    interface EditInstrumentsParams {
+        groupId: string;
+        instruments: GroupData['instruments'];
+        ignoreRepertoryRules: boolean;
+    }
+    type EditInstrumentsResult = void;
     interface RemoveParams {
         groupId: string;
     }
@@ -41,6 +48,7 @@ export declare namespace GroupFbFunctionsTypes {
     }
     interface GetByIdResult extends GroupBasicData {
         id: string;
+        instruments: GroupData['instruments'];
     }
     interface SendInvitationEmailParams {
         emails: string[];

package/functions/groupRepertory.d.ts

@@ -26,7 +26,7 @@ export declare namespace GroupRepertoryFbFunctionsTypes {
     export interface ClaimMusicSheetParams {
         themeId: string;
         groupId: string;
-        instrumentId: string;
+        instrumentId: InstrumentId;
     }
     export type ClaimMusicSheetResult = void;
     export interface DownloadThemeFilesParams {

package/functions/index.d.ts

@@ -60,6 +60,7 @@ export declare enum FbFunctionName {
     GroupChangeStatus = "group-changeStatus",
     GroupCronSatistactionIndexWeekly = "group-cronSatistactionIndexWeekly",
     GroupEdit = "group-edit",
+    GroupEditInstruments = "group-editInstruments",
     GroupGetById = "group-getById",
     GroupOnboardingMessages = "group-onboardingMessages",
     GroupOnCreate = "group-onCreate",

package/functions/index.js

@@ -64,6 +64,7 @@ var FbFunctionName;
     FbFunctionName["GroupChangeStatus"] = "group-changeStatus";
     FbFunctionName["GroupCronSatistactionIndexWeekly"] = "group-cronSatistactionIndexWeekly";
     FbFunctionName["GroupEdit"] = "group-edit";
+    FbFunctionName["GroupEditInstruments"] = "group-editInstruments";
     FbFunctionName["GroupGetById"] = "group-getById";
     FbFunctionName["GroupOnboardingMessages"] = "group-onboardingMessages";
     FbFunctionName["GroupOnCreate"] = "group-onCreate";

package/functions/regions.js

@@ -34,6 +34,7 @@ const regionByFunctions = {
     [index_1.FbFunctionName.JWTGenerate]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.GroupPublish]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.GroupEdit]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.GroupEditInstruments]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.GroupRemove]: GCloudRegions.UsCentral1,
     [index_1.FbFunctionName.GroupChangeStatus]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.GroupOnboardingMessages]: GCloudRegions.EuropeWest6,

package/helpers/errors.d.ts

@@ -54,5 +54,7 @@ export declare enum HttpsErrorMessages {
     EventSelectionModeStillOpen = "error.event.selectionModeStillOpen",
     EventSelectionModeClosedOrNotActive = "error.event.selectionModeClosedOrNotActive",
     EventPlayerNotSelected = "error.event.playerNotSelected",
-    CustomerGroupNoSubscriptionFound = "error.customerGroup.noSubscriptionFound"
+    CustomerGroupNoSubscriptionFound = "error.customerGroup.noSubscriptionFound",
+    PlayersWithCustomInstrumentsToBeDeleted = "error.group.playersWithCustomInstrumentsToBeDeleted",
+    ThemesWithCustomInstrumentsToBeDeleted = "error.group.themesWithCustomInstrumentsToBeDeleted"
 }

package/helpers/errors.js

@@ -59,4 +59,6 @@ var HttpsErrorMessages;
     HttpsErrorMessages["EventSelectionModeClosedOrNotActive"] = "error.event.selectionModeClosedOrNotActive";
     HttpsErrorMessages["EventPlayerNotSelected"] = "error.event.playerNotSelected";
     HttpsErrorMessages["CustomerGroupNoSubscriptionFound"] = "error.customerGroup.noSubscriptionFound";
+    HttpsErrorMessages["PlayersWithCustomInstrumentsToBeDeleted"] = "error.group.playersWithCustomInstrumentsToBeDeleted";
+    HttpsErrorMessages["ThemesWithCustomInstrumentsToBeDeleted"] = "error.group.themesWithCustomInstrumentsToBeDeleted";
 })(HttpsErrorMessages = exports.HttpsErrorMessages || (exports.HttpsErrorMessages = {}));

package/helpers/fileSections/index.js

@@ -4,6 +4,6 @@ exports.fileSectionIdList = void 0;
 const types_1 = require("../../models/Group/Repertory/File/Section/types");
 const instruments_1 = require("../instruments");
 exports.fileSectionIdList = [
-    ...Object.values(instruments_1.InstrumentId),
+    ...Object.values(instruments_1.DefaultInstrumentId),
     ...Object.values(types_1.FileSectionIdReserved),
 ];

package/helpers/instruments/index.d.ts

@@ -1,8 +1,7 @@
-import { LanguagesTypes } from '../../lang';
-import Instrument from '../../models/Instrument';
-export declare enum InstrumentId {
+export declare enum DefaultInstrumentId {
     Accordion = "accordion",
     Agogo = "agogo",
+    Auxiliar = "auxiliar",
     Bandurria = "bandurria",
     Bagpipes = "bagpipes",
     Banjo = "banjo",
@@ -35,6 +34,7 @@ export declare enum InstrumentId {
     EnglishHorn = "englishHorn",
     Euphonium = "euphonium",
     Flabiol = "flabiol",
+    FlagBearer = "flagBearer",
     FlugeHorn = "flugelhorn",
     Flute = "flute",
     FluteLow = "low-flute",
@@ -88,5 +88,6 @@ export declare enum InstrumentId {
     Viola = "viola",
     Violin = "violin"
 }
-export declare const InstrumentIcons: Record<InstrumentId, string>;
-export declare const list: (lang: LanguagesTypes) => Instrument[];
+export declare const InstrumentIcons: Record<DefaultInstrumentId, string>;
+export type CustomInstrumentId = `customInstrument-${string}`;
+export type InstrumentId = CustomInstrumentId | DefaultInstrumentId;

package/helpers/instruments/index.js

@@ -1,189 +1,184 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.list = exports.InstrumentIcons = exports.InstrumentId = void 0;
-const Instrument_1 = __importDefault(require("../../models/Instrument"));
-var InstrumentId;
-(function (InstrumentId) {
-    InstrumentId["Accordion"] = "accordion";
-    InstrumentId["Agogo"] = "agogo";
-    InstrumentId["Bandurria"] = "bandurria";
-    InstrumentId["Bagpipes"] = "bagpipes";
-    InstrumentId["Banjo"] = "banjo";
-    InstrumentId["Baritone"] = "baritone";
-    InstrumentId["Bass"] = "bass";
-    InstrumentId["BassChoir"] = "bass-choir";
-    InstrumentId["BassDrum"] = "bass-drum";
-    InstrumentId["Bassoon"] = "bassoon";
-    InstrumentId["BassoonContra"] = "contraBass";
-    InstrumentId["Cajon"] = "cajon";
-    InstrumentId["Castanets"] = "castanets";
-    InstrumentId["Cello"] = "cello";
-    InstrumentId["Choir"] = "choir";
-    InstrumentId["Chocalho"] = "chocalho";
-    InstrumentId["Clarinet"] = "clarinet";
-    InstrumentId["ClarinetAlto"] = "altoClarinet";
-    InstrumentId["ClarinetBass"] = "bassClarinet";
-    InstrumentId["ClarinetContrabass"] = "contrabassClarinet";
-    InstrumentId["ClarinetLittle"] = "littleClarinet";
-    InstrumentId["ContraAlto"] = "contraAlto";
-    InstrumentId["Cornet"] = "cornet";
-    InstrumentId["CounterTenor"] = "counterTenor";
-    InstrumentId["Cymbals"] = "cymbals";
-    InstrumentId["DJ"] = "dj";
-    InstrumentId["DoubleBass"] = "doubleBass";
-    InstrumentId["DrumSet"] = "drumSet";
-    InstrumentId["Dulzaina"] = "dulzaina";
-    InstrumentId["DulzainaFa"] = "dulzaina-fa";
-    InstrumentId["ElectricGuitar"] = "electricGuitar";
-    InstrumentId["EnglishHorn"] = "englishHorn";
-    InstrumentId["Euphonium"] = "euphonium";
-    InstrumentId["Flabiol"] = "flabiol";
-    InstrumentId["FlugeHorn"] = "flugelhorn";
-    InstrumentId["Flute"] = "flute";
-    InstrumentId["FluteLow"] = "low-flute";
-    InstrumentId["FlutePeak"] = "peak-flute";
-    InstrumentId["FrenchHorn"] = "frenchHorn";
-    InstrumentId["Guitar"] = "guitar";
-    InstrumentId["Harmonica"] = "harmonica";
-    InstrumentId["Harpsichord"] = "harpsichord";
-    InstrumentId["Harp"] = "harp";
-    InstrumentId["Keyboard"] = "keyboard";
-    InstrumentId["Lute"] = "lute";
-    InstrumentId["Maracas"] = "maracas";
-    InstrumentId["MarchingToms"] = "marchingToms";
-    InstrumentId["Mallets"] = "mallets";
-    InstrumentId["Mandoline"] = "mandoline";
-    InstrumentId["Melodica"] = "melodica";
-    InstrumentId["MezzoSoprano"] = "mezzosoproano";
-    InstrumentId["MusicConductor"] = "musicConductor";
-    InstrumentId["Oboe"] = "oboe";
-    InstrumentId["Percussion"] = "percussion";
-    InstrumentId["Piano"] = "piano";
-    InstrumentId["Piccolo"] = "piccolo";
-    InstrumentId["Repique"] = "repique";
-    InstrumentId["SaxAlto"] = "altoSaxophone";
-    InstrumentId["SaxBaritone"] = "baritoneSax";
-    InstrumentId["SaxLow"] = "lowSaxophone";
-    InstrumentId["SaxSoprano"] = "sopranoSaxophone";
-    InstrumentId["SaxTenor"] = "tenorSax";
-    InstrumentId["Silbote"] = "silbote";
-    InstrumentId["Singer"] = "singer";
-    InstrumentId["SnareDrum"] = "snareDrum";
-    InstrumentId["Soprano"] = "soprano";
-    InstrumentId["Surdo"] = "surdo";
-    InstrumentId["Tabal"] = "tabal";
-    InstrumentId["Tambourine"] = "tambourine";
-    InstrumentId["TambourineBrazilian"] = "tambourineBrazilian";
-    InstrumentId["Tarota"] = "tarota";
-    InstrumentId["Tenor"] = "tenor";
-    InstrumentId["TimbalBrazilian"] = "timbalBrazilian";
-    InstrumentId["Timpani"] = "timpani";
-    InstrumentId["Trombone"] = "trombone";
-    InstrumentId["TromboneHigh"] = "highTrombone";
-    InstrumentId["TromboneLow"] = "lowTrombone";
-    InstrumentId["Trumpet"] = "trumpet";
-    InstrumentId["TrumpetLow"] = "lowTrumpet";
-    InstrumentId["TrumpetPiccolo"] = "piccoloTrumpet";
-    InstrumentId["Tuba"] = "tuba";
-    InstrumentId["TubaWagnerian"] = "tuba-wagnerian";
-    InstrumentId["Txistu"] = "txistu";
-    InstrumentId["Ukelele"] = "ukelele";
-    InstrumentId["Viola"] = "viola";
-    InstrumentId["Violin"] = "violin";
-})(InstrumentId = exports.InstrumentId || (exports.InstrumentId = {}));
+exports.InstrumentIcons = exports.DefaultInstrumentId = void 0;
+var DefaultInstrumentId;
+(function (DefaultInstrumentId) {
+    DefaultInstrumentId["Accordion"] = "accordion";
+    DefaultInstrumentId["Agogo"] = "agogo";
+    DefaultInstrumentId["Auxiliar"] = "auxiliar";
+    DefaultInstrumentId["Bandurria"] = "bandurria";
+    DefaultInstrumentId["Bagpipes"] = "bagpipes";
+    DefaultInstrumentId["Banjo"] = "banjo";
+    DefaultInstrumentId["Baritone"] = "baritone";
+    DefaultInstrumentId["Bass"] = "bass";
+    DefaultInstrumentId["BassChoir"] = "bass-choir";
+    DefaultInstrumentId["BassDrum"] = "bass-drum";
+    DefaultInstrumentId["Bassoon"] = "bassoon";
+    DefaultInstrumentId["BassoonContra"] = "contraBass";
+    DefaultInstrumentId["Cajon"] = "cajon";
+    DefaultInstrumentId["Castanets"] = "castanets";
+    DefaultInstrumentId["Cello"] = "cello";
+    DefaultInstrumentId["Choir"] = "choir";
+    DefaultInstrumentId["Chocalho"] = "chocalho";
+    DefaultInstrumentId["Clarinet"] = "clarinet";
+    DefaultInstrumentId["ClarinetAlto"] = "altoClarinet";
+    DefaultInstrumentId["ClarinetBass"] = "bassClarinet";
+    DefaultInstrumentId["ClarinetContrabass"] = "contrabassClarinet";
+    DefaultInstrumentId["ClarinetLittle"] = "littleClarinet";
+    DefaultInstrumentId["ContraAlto"] = "contraAlto";
+    DefaultInstrumentId["Cornet"] = "cornet";
+    DefaultInstrumentId["CounterTenor"] = "counterTenor";
+    DefaultInstrumentId["Cymbals"] = "cymbals";
+    DefaultInstrumentId["DJ"] = "dj";
+    DefaultInstrumentId["DoubleBass"] = "doubleBass";
+    DefaultInstrumentId["DrumSet"] = "drumSet";
+    DefaultInstrumentId["Dulzaina"] = "dulzaina";
+    DefaultInstrumentId["DulzainaFa"] = "dulzaina-fa";
+    DefaultInstrumentId["ElectricGuitar"] = "electricGuitar";
+    DefaultInstrumentId["EnglishHorn"] = "englishHorn";
+    DefaultInstrumentId["Euphonium"] = "euphonium";
+    DefaultInstrumentId["Flabiol"] = "flabiol";
+    DefaultInstrumentId["FlagBearer"] = "flagBearer";
+    DefaultInstrumentId["FlugeHorn"] = "flugelhorn";
+    DefaultInstrumentId["Flute"] = "flute";
+    DefaultInstrumentId["FluteLow"] = "low-flute";
+    DefaultInstrumentId["FlutePeak"] = "peak-flute";
+    DefaultInstrumentId["FrenchHorn"] = "frenchHorn";
+    DefaultInstrumentId["Guitar"] = "guitar";
+    DefaultInstrumentId["Harmonica"] = "harmonica";
+    DefaultInstrumentId["Harpsichord"] = "harpsichord";
+    DefaultInstrumentId["Harp"] = "harp";
+    DefaultInstrumentId["Keyboard"] = "keyboard";
+    DefaultInstrumentId["Lute"] = "lute";
+    DefaultInstrumentId["Maracas"] = "maracas";
+    DefaultInstrumentId["MarchingToms"] = "marchingToms";
+    DefaultInstrumentId["Mallets"] = "mallets";
+    DefaultInstrumentId["Mandoline"] = "mandoline";
+    DefaultInstrumentId["Melodica"] = "melodica";
+    DefaultInstrumentId["MezzoSoprano"] = "mezzosoproano";
+    DefaultInstrumentId["MusicConductor"] = "musicConductor";
+    DefaultInstrumentId["Oboe"] = "oboe";
+    DefaultInstrumentId["Percussion"] = "percussion";
+    DefaultInstrumentId["Piano"] = "piano";
+    DefaultInstrumentId["Piccolo"] = "piccolo";
+    DefaultInstrumentId["Repique"] = "repique";
+    DefaultInstrumentId["SaxAlto"] = "altoSaxophone";
+    DefaultInstrumentId["SaxBaritone"] = "baritoneSax";
+    DefaultInstrumentId["SaxLow"] = "lowSaxophone";
+    DefaultInstrumentId["SaxSoprano"] = "sopranoSaxophone";
+    DefaultInstrumentId["SaxTenor"] = "tenorSax";
+    DefaultInstrumentId["Silbote"] = "silbote";
+    DefaultInstrumentId["Singer"] = "singer";
+    DefaultInstrumentId["SnareDrum"] = "snareDrum";
+    DefaultInstrumentId["Soprano"] = "soprano";
+    DefaultInstrumentId["Surdo"] = "surdo";
+    DefaultInstrumentId["Tabal"] = "tabal";
+    DefaultInstrumentId["Tambourine"] = "tambourine";
+    DefaultInstrumentId["TambourineBrazilian"] = "tambourineBrazilian";
+    DefaultInstrumentId["Tarota"] = "tarota";
+    DefaultInstrumentId["Tenor"] = "tenor";
+    DefaultInstrumentId["TimbalBrazilian"] = "timbalBrazilian";
+    DefaultInstrumentId["Timpani"] = "timpani";
+    DefaultInstrumentId["Trombone"] = "trombone";
+    DefaultInstrumentId["TromboneHigh"] = "highTrombone";
+    DefaultInstrumentId["TromboneLow"] = "lowTrombone";
+    DefaultInstrumentId["Trumpet"] = "trumpet";
+    DefaultInstrumentId["TrumpetLow"] = "lowTrumpet";
+    DefaultInstrumentId["TrumpetPiccolo"] = "piccoloTrumpet";
+    DefaultInstrumentId["Tuba"] = "tuba";
+    DefaultInstrumentId["TubaWagnerian"] = "tuba-wagnerian";
+    DefaultInstrumentId["Txistu"] = "txistu";
+    DefaultInstrumentId["Ukelele"] = "ukelele";
+    DefaultInstrumentId["Viola"] = "viola";
+    DefaultInstrumentId["Violin"] = "violin";
+})(DefaultInstrumentId = exports.DefaultInstrumentId || (exports.DefaultInstrumentId = {}));
 exports.InstrumentIcons = {
-    [InstrumentId.Accordion]: 'accordion',
-    [InstrumentId.Agogo]: 'agogo',
-    [InstrumentId.Bandurria]: 'bandurria',
-    [InstrumentId.Bagpipes]: 'bagpipes',
-    [InstrumentId.Banjo]: 'banjo',
-    [InstrumentId.Baritone]: 'choirMen',
-    [InstrumentId.BassChoir]: 'choirMen',
-    [InstrumentId.Bass]: 'guitarBass',
-    [InstrumentId.BassDrum]: 'drumBass',
-    [InstrumentId.Bassoon]: 'bassoon',
-    [InstrumentId.BassoonContra]: 'bassoon',
-    [InstrumentId.Castanets]: 'castanets',
-    [InstrumentId.Cajon]: 'cajon',
-    [InstrumentId.Cello]: 'cello',
-    [InstrumentId.Choir]: 'choirMen',
-    [InstrumentId.Chocalho]: 'chocalho',
-    [InstrumentId.ClarinetBass]: 'bassClarinet',
-    [InstrumentId.ClarinetAlto]: 'bassClarinet',
-    [InstrumentId.ClarinetContrabass]: 'contrabassClarinet',
-    [InstrumentId.ClarinetLittle]: 'clarinet',
-    [InstrumentId.Clarinet]: 'clarinet',
-    [InstrumentId.ContraAlto]: 'choirWomen',
-    [InstrumentId.Cornet]: 'cornet',
-    [InstrumentId.CounterTenor]: 'choirMen',
-    [InstrumentId.Cymbals]: 'cymbals',
-    [InstrumentId.DJ]: 'dj',
-    [InstrumentId.DoubleBass]: 'cello',
-    [InstrumentId.DrumSet]: 'drumSet',
-    [InstrumentId.Dulzaina]: 'dulzaina',
-    [InstrumentId.DulzainaFa]: 'dulzaina',
-    [InstrumentId.ElectricGuitar]: 'guitarElectric',
-    [InstrumentId.EnglishHorn]: 'clarinet',
-    [InstrumentId.Euphonium]: 'tuba',
-    [InstrumentId.Flabiol]: 'flabiol',
-    [InstrumentId.FlugeHorn]: 'trumpet',
-    [InstrumentId.FluteLow]: 'flute',
-    [InstrumentId.Flute]: 'flute',
-    [InstrumentId.FlutePeak]: 'fluteWood',
-    [InstrumentId.FrenchHorn]: 'frenchHorn',
-    [InstrumentId.Guitar]: 'guitar',
-    [InstrumentId.Harmonica]: 'harmonica',
-    [InstrumentId.Harp]: 'harp',
-    [InstrumentId.Harpsichord]: 'harpsichord',
-    [InstrumentId.Keyboard]: 'piano',
-    [InstrumentId.Lute]: 'lute',
-    [InstrumentId.Mallets]: 'xylophone',
-    [InstrumentId.Maracas]: 'maracas',
-    [InstrumentId.MarchingToms]: 'marchingDrums',
-    [InstrumentId.Mandoline]: 'mandoline',
-    [InstrumentId.MezzoSoprano]: 'choirWomen',
-    [InstrumentId.Melodica]: 'melodica',
-    [InstrumentId.MusicConductor]: 'bandmastersMace',
-    [InstrumentId.Oboe]: 'oboe',
-    [InstrumentId.Percussion]: 'drumSnare',
-    [InstrumentId.Piano]: 'pianoClassic',
-    [InstrumentId.Piccolo]: 'piccolo',
-    [InstrumentId.Repique]: 'repique',
-    [InstrumentId.SaxAlto]: 'saxophone',
-    [InstrumentId.SaxBaritone]: 'saxophoneHigh',
-    [InstrumentId.SaxLow]: 'saxophoneHigh',
-    [InstrumentId.SaxSoprano]: 'saxophoneSoprano',
-    [InstrumentId.SaxTenor]: 'saxophone',
-    [InstrumentId.Silbote]: 'silbote',
-    [InstrumentId.Singer]: 'microphone',
-    [InstrumentId.SnareDrum]: 'drumSnare',
-    [InstrumentId.Soprano]: 'choirWomen',
-    [InstrumentId.Surdo]: 'surdo',
-    [InstrumentId.Tabal]: 'tabal',
-    [InstrumentId.Tambourine]: 'tambourine',
-    [InstrumentId.TambourineBrazilian]: 'tambourineBrazilian',
-    [InstrumentId.Tarota]: 'dulzaina',
-    [InstrumentId.Tenor]: 'choirMen',
-    [InstrumentId.TimbalBrazilian]: 'timbalBrazilian',
-    [InstrumentId.TromboneHigh]: 'trombone',
-    [InstrumentId.TromboneLow]: 'trombone',
-    [InstrumentId.Trombone]: 'trombone',
-    [InstrumentId.Trumpet]: 'trumpet',
-    [InstrumentId.TrumpetLow]: 'trumpet',
-    [InstrumentId.TrumpetPiccolo]: 'trumpet',
-    [InstrumentId.TubaWagnerian]: 'tuba',
-    [InstrumentId.Tuba]: 'tuba',
-    [InstrumentId.Timpani]: 'timpani',
-    [InstrumentId.Txistu]: 'txistu',
-    [InstrumentId.Ukelele]: 'guitar',
-    [InstrumentId.Viola]: 'violin',
-    [InstrumentId.Violin]: 'violin',
+    [DefaultInstrumentId.Accordion]: 'accordion',
+    [DefaultInstrumentId.Agogo]: 'agogo',
+    [DefaultInstrumentId.Auxiliar]: 'auxiliar',
+    [DefaultInstrumentId.Bandurria]: 'bandurria',
+    [DefaultInstrumentId.Bagpipes]: 'bagpipes',
+    [DefaultInstrumentId.Banjo]: 'banjo',
+    [DefaultInstrumentId.Baritone]: 'choirMen',
+    [DefaultInstrumentId.BassChoir]: 'choirMen',
+    [DefaultInstrumentId.Bass]: 'guitarBass',
+    [DefaultInstrumentId.BassDrum]: 'drumBass',
+    [DefaultInstrumentId.Bassoon]: 'bassoon',
+    [DefaultInstrumentId.BassoonContra]: 'bassoon',
+    [DefaultInstrumentId.Castanets]: 'castanets',
+    [DefaultInstrumentId.Cajon]: 'cajon',
+    [DefaultInstrumentId.Cello]: 'cello',
+    [DefaultInstrumentId.Choir]: 'choirMen',
+    [DefaultInstrumentId.Chocalho]: 'chocalho',
+    [DefaultInstrumentId.ClarinetBass]: 'bassClarinet',
+    [DefaultInstrumentId.ClarinetAlto]: 'bassClarinet',
+    [DefaultInstrumentId.ClarinetContrabass]: 'contrabassClarinet',
+    [DefaultInstrumentId.ClarinetLittle]: 'clarinet',
+    [DefaultInstrumentId.Clarinet]: 'clarinet',
+    [DefaultInstrumentId.ContraAlto]: 'choirWomen',
+    [DefaultInstrumentId.Cornet]: 'cornet',
+    [DefaultInstrumentId.CounterTenor]: 'choirMen',
+    [DefaultInstrumentId.Cymbals]: 'cymbals',
+    [DefaultInstrumentId.DJ]: 'dj',
+    [DefaultInstrumentId.DoubleBass]: 'cello',
+    [DefaultInstrumentId.DrumSet]: 'drumSet',
+    [DefaultInstrumentId.Dulzaina]: 'dulzaina',
+    [DefaultInstrumentId.DulzainaFa]: 'dulzaina',
+    [DefaultInstrumentId.ElectricGuitar]: 'guitarElectric',
+    [DefaultInstrumentId.EnglishHorn]: 'clarinet',
+    [DefaultInstrumentId.Euphonium]: 'tuba',
+    [DefaultInstrumentId.Flabiol]: 'flabiol',
+    [DefaultInstrumentId.FlagBearer]: 'flagBearer',
+    [DefaultInstrumentId.FlugeHorn]: 'trumpet',
+    [DefaultInstrumentId.FluteLow]: 'flute',
+    [DefaultInstrumentId.Flute]: 'flute',
+    [DefaultInstrumentId.FlutePeak]: 'fluteWood',
+    [DefaultInstrumentId.FrenchHorn]: 'frenchHorn',
+    [DefaultInstrumentId.Guitar]: 'guitar',
+    [DefaultInstrumentId.Harmonica]: 'harmonica',
+    [DefaultInstrumentId.Harp]: 'harp',
+    [DefaultInstrumentId.Harpsichord]: 'harpsichord',
+    [DefaultInstrumentId.Keyboard]: 'piano',
+    [DefaultInstrumentId.Lute]: 'lute',
+    [DefaultInstrumentId.Mallets]: 'xylophone',
+    [DefaultInstrumentId.Maracas]: 'maracas',
+    [DefaultInstrumentId.MarchingToms]: 'marchingDrums',
+    [DefaultInstrumentId.Mandoline]: 'mandoline',
+    [DefaultInstrumentId.MezzoSoprano]: 'choirWomen',
+    [DefaultInstrumentId.Melodica]: 'melodica',
+    [DefaultInstrumentId.MusicConductor]: 'bandmastersMace',
+    [DefaultInstrumentId.Oboe]: 'oboe',
+    [DefaultInstrumentId.Percussion]: 'drumSnare',
+    [DefaultInstrumentId.Piano]: 'pianoClassic',
+    [DefaultInstrumentId.Piccolo]: 'piccolo',
+    [DefaultInstrumentId.Repique]: 'repique',
+    [DefaultInstrumentId.SaxAlto]: 'saxophone',
+    [DefaultInstrumentId.SaxBaritone]: 'saxophoneHigh',
+    [DefaultInstrumentId.SaxLow]: 'saxophoneHigh',
+    [DefaultInstrumentId.SaxSoprano]: 'saxophoneSoprano',
+    [DefaultInstrumentId.SaxTenor]: 'saxophone',
+    [DefaultInstrumentId.Silbote]: 'silbote',
+    [DefaultInstrumentId.Singer]: 'microphone',
+    [DefaultInstrumentId.SnareDrum]: 'drumSnare',
+    [DefaultInstrumentId.Soprano]: 'choirWomen',
+    [DefaultInstrumentId.Surdo]: 'surdo',
+    [DefaultInstrumentId.Tabal]: 'tabal',
+    [DefaultInstrumentId.Tambourine]: 'tambourine',
+    [DefaultInstrumentId.TambourineBrazilian]: 'tambourineBrazilian',
+    [DefaultInstrumentId.Tarota]: 'dulzaina',
+    [DefaultInstrumentId.Tenor]: 'choirMen',
+    [DefaultInstrumentId.TimbalBrazilian]: 'timbalBrazilian',
+    [DefaultInstrumentId.TromboneHigh]: 'trombone',
+    [DefaultInstrumentId.TromboneLow]: 'trombone',
+    [DefaultInstrumentId.Trombone]: 'trombone',
+    [DefaultInstrumentId.Trumpet]: 'trumpet',
+    [DefaultInstrumentId.TrumpetLow]: 'trumpet',
+    [DefaultInstrumentId.TrumpetPiccolo]: 'trumpet',
+    [DefaultInstrumentId.TubaWagnerian]: 'tuba',
+    [DefaultInstrumentId.Tuba]: 'tuba',
+    [DefaultInstrumentId.Timpani]: 'timpani',
+    [DefaultInstrumentId.Txistu]: 'txistu',
+    [DefaultInstrumentId.Ukelele]: 'guitar',
+    [DefaultInstrumentId.Viola]: 'violin',
+    [DefaultInstrumentId.Violin]: 'violin',
 };
-const hideInstruments = [InstrumentId.DJ, InstrumentId.Choir];
-const list = (lang) => Object.values(InstrumentId)
-    .filter((id) => !hideInstruments.includes(id))
-    .map((key) => new Instrument_1.default(key, lang));
-exports.list = list;

package/helpers/instruments/lists.d.ts

@@ -0,0 +1,6 @@
+import { LanguagesTypes } from '../../lang';
+import Group from '../../models/Group';
+import Instrument from '../../models/Instrument';
+import GroupInstrument from '../../models/Instrument/group';
+export declare const list: (lang: LanguagesTypes) => Instrument[];
+export declare const listWithCustom: (groupInstruments: Group['instruments'], lang: LanguagesTypes) => GroupInstrument[];

package/helpers/instruments/lists.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.listWithCustom = exports.list = void 0;
+const _1 = require(".");
+const Instrument_1 = __importDefault(require("../../models/Instrument"));
+const group_1 = __importDefault(require("../../models/Instrument/group"));
+const objects_1 = require("../objects");
+const hideInstruments = [_1.DefaultInstrumentId.DJ, _1.DefaultInstrumentId.Choir];
+const list = (lang) => Object.values(_1.DefaultInstrumentId)
+    .filter((id) => !hideInstruments.includes(id))
+    .map((id) => new Instrument_1.default(id, lang));
+exports.list = list;
+const listWithCustom = (groupInstruments, lang) => {
+    const groupInstrumentsIds = (0, objects_1.orderedMapToArray)(groupInstruments).map(({ id }) => id);
+    const others = Object.values(_1.DefaultInstrumentId).filter((id) => !groupInstrumentsIds.includes(id) && !hideInstruments.includes(id));
+    return [...groupInstrumentsIds, ...others].map((id) => new group_1.default(id, lang, groupInstruments));
+};
+exports.listWithCustom = listWithCustom;

package/helpers/musicStyles/index.d.ts

@@ -1,6 +1,6 @@
 import { LanguagesTypes } from '../../lang';
 import MusicStyle from '../../models/MusicStyle';
-import { InstrumentId } from '../instruments';
+import { DefaultInstrumentId } from '../instruments';
 export declare enum MusicStyleId {
     Orchestra = "orquesta-sinfonica",
     Band = "banda-de-musica",
@@ -14,7 +14,7 @@ export declare enum MusicStyleId {
     Choir = "coro",
     Batucada = "batucada"
 }
-export declare const musicStylesIcon: Record<MusicStyleId, InstrumentId>;
+export declare const musicStylesIcon: Record<MusicStyleId, DefaultInstrumentId>;
 export declare const MusicStylesCover: Record<MusicStyleId, string>;
 export type MusicStyleType = MusicStyleId | string;
 export declare const musicStyleByCountry: Record<LanguagesTypes, MusicStyleId[]>;

package/helpers/musicStyles/index.js

@@ -22,17 +22,17 @@ var MusicStyleId;
     MusicStyleId["Batucada"] = "batucada";
 })(MusicStyleId = exports.MusicStyleId || (exports.MusicStyleId = {}));
 exports.musicStylesIcon = {
-    [MusicStyleId.Orchestra]: instruments_1.InstrumentId.Violin,
-    [MusicStyleId.Band]: instruments_1.InstrumentId.Clarinet,
-    [MusicStyleId.MarchingBand]: instruments_1.InstrumentId.MarchingToms,
-    [MusicStyleId.BigBand]: instruments_1.InstrumentId.Trombone,
-    [MusicStyleId.JazzBand]: instruments_1.InstrumentId.SaxTenor,
-    [MusicStyleId.Colla]: instruments_1.InstrumentId.Dulzaina,
-    [MusicStyleId.TxistularisBand]: instruments_1.InstrumentId.Txistu,
-    [MusicStyleId.BandaCornetasYTambores]: instruments_1.InstrumentId.Cornet,
-    [MusicStyleId.Charanga]: instruments_1.InstrumentId.BassDrum,
-    [MusicStyleId.Choir]: instruments_1.InstrumentId.Tenor,
-    [MusicStyleId.Batucada]: instruments_1.InstrumentId.Repique,
+    [MusicStyleId.Orchestra]: instruments_1.DefaultInstrumentId.Violin,
+    [MusicStyleId.Band]: instruments_1.DefaultInstrumentId.Clarinet,
+    [MusicStyleId.MarchingBand]: instruments_1.DefaultInstrumentId.MarchingToms,
+    [MusicStyleId.BigBand]: instruments_1.DefaultInstrumentId.Trombone,
+    [MusicStyleId.JazzBand]: instruments_1.DefaultInstrumentId.SaxTenor,
+    [MusicStyleId.Colla]: instruments_1.DefaultInstrumentId.Dulzaina,
+    [MusicStyleId.TxistularisBand]: instruments_1.DefaultInstrumentId.Txistu,
+    [MusicStyleId.BandaCornetasYTambores]: instruments_1.DefaultInstrumentId.Cornet,
+    [MusicStyleId.Charanga]: instruments_1.DefaultInstrumentId.BassDrum,
+    [MusicStyleId.Choir]: instruments_1.DefaultInstrumentId.Tenor,
+    [MusicStyleId.Batucada]: instruments_1.DefaultInstrumentId.Repique,
 };
 exports.MusicStylesCover = {
     [MusicStyleId.Orchestra]: 'orquestra',

package/helpers/musicStyles/orders.d.ts

@@ -1,5 +1,5 @@
-import { InstrumentId } from '../instruments';
+import { DefaultInstrumentId } from '../instruments';
 import { MusicStyleType } from './index';
-export declare const orders: Record<MusicStyleType, InstrumentId[]>;
-export declare const getInstrumentsOrderByMusicStyle: (musicStyle: MusicStyleType) => InstrumentId[];
+export declare const orders: Record<MusicStyleType, DefaultInstrumentId[]>;
+export declare const getInstrumentsOrderByMusicStyle: (musicStyle: MusicStyleType) => DefaultInstrumentId[];
 export declare const orderByMusicStyle: <T>(list: T[], field: keyof T, musicStyle: MusicStyleType) => T[];