@glissandoo/lib 1.114.0 → 1.115.0

package/helpers/currencyConversion.d.ts

@@ -0,0 +1,45 @@
+export declare const MARKETPLACE_CURRENCY_SYMBOL_LOCALES: {
+    readonly EUR: "de-DE";
+    readonly USD: "en-US";
+    readonly GBP: "en-GB";
+    readonly CHF: "de-CH";
+    readonly CAD: "en-CA";
+    readonly AUD: "en-AU";
+    readonly JPY: "ja-JP";
+    readonly SEK: "sv-SE";
+    readonly NOK: "nb-NO";
+    readonly DKK: "da-DK";
+};
+export type MarketplaceCurrencyCode = keyof typeof MARKETPLACE_CURRENCY_SYMBOL_LOCALES;
+export declare const MARKETPLACE_CURRENCY_CODES: MarketplaceCurrencyCode[];
+export interface CurrencyExchangeRateSnapshot {
+    baseCurrency: MarketplaceCurrencyCode;
+    targetCurrency: MarketplaceCurrencyCode;
+    rate: number;
+    rateDate: string;
+    provider: string;
+    fetchedAt: string;
+}
+export interface CurrencyDefaultingInput {
+    savedCurrency?: string | null;
+    country?: string | null;
+    locale?: string | null;
+    fallbackCurrency?: MarketplaceCurrencyCode;
+}
+export interface CurrencyConversionResult {
+    baseAmountCents: number;
+    baseCurrency: MarketplaceCurrencyCode;
+    convertedAmountCents: number;
+    targetCurrency: MarketplaceCurrencyCode;
+    rate: number;
+    rateDate: string;
+    rateProvider: string;
+}
+export declare const MARKETPLACE_CURRENCY_ROUNDING_CENTS: Record<MarketplaceCurrencyCode, number>;
+export declare const isSupportedMarketplaceCurrency: (value: unknown) => value is MarketplaceCurrencyCode;
+export declare const normalizeMarketplaceCurrency: (value: unknown) => MarketplaceCurrencyCode | undefined;
+export declare const getCurrencyForCountry: (country: string | null | undefined) => MarketplaceCurrencyCode | undefined;
+export declare const getDefaultMarketplaceCurrency: ({ savedCurrency, country, locale, fallbackCurrency, }: CurrencyDefaultingInput) => MarketplaceCurrencyCode;
+export declare const roundMarketplaceCurrencyCents: (amountCents: number, currency: MarketplaceCurrencyCode) => number;
+export declare const convertCurrencyCents: (baseAmountCents: number, rate: number, targetCurrency?: MarketplaceCurrencyCode) => number;
+export declare const buildCurrencyConversionResult: (baseAmountCents: number, rateSnapshot: CurrencyExchangeRateSnapshot) => CurrencyConversionResult;

package/helpers/currencyConversion.js

@@ -0,0 +1,119 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildCurrencyConversionResult = exports.convertCurrencyCents = exports.roundMarketplaceCurrencyCents = exports.getDefaultMarketplaceCurrency = exports.getCurrencyForCountry = exports.normalizeMarketplaceCurrency = exports.isSupportedMarketplaceCurrency = exports.MARKETPLACE_CURRENCY_ROUNDING_CENTS = exports.MARKETPLACE_CURRENCY_CODES = exports.MARKETPLACE_CURRENCY_SYMBOL_LOCALES = void 0;
+exports.MARKETPLACE_CURRENCY_SYMBOL_LOCALES = {
+    EUR: 'de-DE',
+    USD: 'en-US',
+    GBP: 'en-GB',
+    CHF: 'de-CH',
+    CAD: 'en-CA',
+    AUD: 'en-AU',
+    JPY: 'ja-JP',
+    SEK: 'sv-SE',
+    NOK: 'nb-NO',
+    DKK: 'da-DK',
+};
+exports.MARKETPLACE_CURRENCY_CODES = Object.keys(exports.MARKETPLACE_CURRENCY_SYMBOL_LOCALES);
+exports.MARKETPLACE_CURRENCY_ROUNDING_CENTS = {
+    EUR: 50,
+    USD: 100,
+    GBP: 100,
+    CHF: 100,
+    CAD: 100,
+    AUD: 100,
+    JPY: 10000,
+    SEK: 100,
+    NOK: 100,
+    DKK: 100,
+};
+const COUNTRY_CURRENCY_MAP = {
+    AD: 'EUR',
+    AT: 'EUR',
+    AU: 'AUD',
+    BE: 'EUR',
+    CA: 'CAD',
+    CH: 'CHF',
+    CY: 'EUR',
+    DE: 'EUR',
+    DK: 'DKK',
+    EE: 'EUR',
+    ES: 'EUR',
+    FI: 'EUR',
+    FR: 'EUR',
+    GB: 'GBP',
+    GR: 'EUR',
+    IE: 'EUR',
+    IT: 'EUR',
+    JP: 'JPY',
+    LT: 'EUR',
+    LU: 'EUR',
+    LV: 'EUR',
+    MT: 'EUR',
+    NL: 'EUR',
+    NO: 'NOK',
+    PT: 'EUR',
+    SE: 'SEK',
+    SI: 'EUR',
+    SK: 'EUR',
+    US: 'USD',
+};
+const isSupportedMarketplaceCurrency = (value) => typeof value === 'string' &&
+    exports.MARKETPLACE_CURRENCY_CODES.includes(value.trim().toUpperCase());
+exports.isSupportedMarketplaceCurrency = isSupportedMarketplaceCurrency;
+const normalizeMarketplaceCurrency = (value) => (0, exports.isSupportedMarketplaceCurrency)(value)
+    ? value.trim().toUpperCase()
+    : undefined;
+exports.normalizeMarketplaceCurrency = normalizeMarketplaceCurrency;
+const getCurrencyForCountry = (country) => {
+    if (!country)
+        return undefined;
+    return COUNTRY_CURRENCY_MAP[country.trim().toUpperCase()];
+};
+exports.getCurrencyForCountry = getCurrencyForCountry;
+const getRegionFromLocale = (locale) => {
+    if (!locale)
+        return undefined;
+    const normalized = locale.replace('_', '-');
+    const parts = normalized.split('-');
+    return parts.find((part) => /^[A-Z]{2}$/.test(part) || /^[a-z]{2}$/.test(part))?.toUpperCase();
+};
+const getDefaultMarketplaceCurrency = ({ savedCurrency, country, locale, fallbackCurrency = 'EUR', }) => {
+    const saved = (0, exports.normalizeMarketplaceCurrency)(savedCurrency);
+    if (saved)
+        return saved;
+    const countryCurrency = (0, exports.getCurrencyForCountry)(country);
+    if (countryCurrency)
+        return countryCurrency;
+    const localeRegionCurrency = (0, exports.getCurrencyForCountry)(getRegionFromLocale(locale));
+    if (localeRegionCurrency)
+        return localeRegionCurrency;
+    return fallbackCurrency;
+};
+exports.getDefaultMarketplaceCurrency = getDefaultMarketplaceCurrency;
+const roundMarketplaceCurrencyCents = (amountCents, currency) => {
+    const roundedCents = Math.round(amountCents);
+    const step = exports.MARKETPLACE_CURRENCY_ROUNDING_CENTS[currency] ?? 1;
+    if (roundedCents <= 0 || step <= 1)
+        return roundedCents;
+    return Math.max(step, Math.round(roundedCents / step) * step);
+};
+exports.roundMarketplaceCurrencyCents = roundMarketplaceCurrencyCents;
+const convertCurrencyCents = (baseAmountCents, rate, targetCurrency) => {
+    const converted = baseAmountCents * rate;
+    return targetCurrency
+        ? (0, exports.roundMarketplaceCurrencyCents)(converted, targetCurrency)
+        : Math.round(converted);
+};
+exports.convertCurrencyCents = convertCurrencyCents;
+const buildCurrencyConversionResult = (baseAmountCents, rateSnapshot) => ({
+    baseAmountCents,
+    baseCurrency: rateSnapshot.baseCurrency,
+    convertedAmountCents: rateSnapshot.baseCurrency === rateSnapshot.targetCurrency
+        ? baseAmountCents
+        : (0, exports.convertCurrencyCents)(baseAmountCents, rateSnapshot.rate, rateSnapshot.targetCurrency),
+    targetCurrency: rateSnapshot.targetCurrency,
+    rate: rateSnapshot.rate,
+    rateDate: rateSnapshot.rateDate,
+    rateProvider: rateSnapshot.provider,
+});
+exports.buildCurrencyConversionResult = buildCurrencyConversionResult;

package/helpers/dataStructures/trees/index.d.ts

@@ -0,0 +1,12 @@
+import { NodeRow, Table } from './types';
+export declare const roots: <IdType extends string, TableType extends Table<IdType>>(tbl: TableType) => IdType[];
+export declare const childrenOf: <IdType extends string, TableType extends Table<IdType>>(tbl: TableType, parentId: IdType) => IdType[];
+export declare const ancestors: <IdType extends string, TableType extends Table<IdType>>(tbl: TableType, id: IdType) => IdType[];
+export declare const descendants: <IdType extends string, TableType extends Table<IdType>>(tbl: TableType, id: IdType) => IdType[];
+export declare const leafIds: <IdType extends string, TableType extends Table<IdType>>(table: TableType) => IdType[];
+export declare const pathOf: <IdType extends string, TableType extends Table<IdType>>(tbl: TableType, id: IdType) => IdType[];
+export declare function normalizeSelection<IdType extends string, TableType extends Table<IdType>>(tbl: TableType, selectedIds: IdType[] | undefined, options?: {
+    includeDescendants?: boolean;
+}): Set<IdType>;
+export declare function makePredicateForProperty<IdType extends string>(key: keyof NodeRow<IdType>, allowed: Set<IdType>): (row: NodeRow<IdType>) => boolean;
+export declare const breadcrumb: <IdType extends string, TableType extends Table<IdType>>(tbl: TableType, id: IdType, resolve: (k: string) => string, sep?: string) => string;

package/helpers/dataStructures/trees/index.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.breadcrumb = exports.pathOf = exports.leafIds = exports.descendants = exports.ancestors = exports.childrenOf = exports.roots = void 0;
+exports.normalizeSelection = normalizeSelection;
+exports.makePredicateForProperty = makePredicateForProperty;
+const roots = (tbl) => Object.values(tbl)
+    .filter((n) => !n.parentId)
+    .map((n) => n.id);
+exports.roots = roots;
+const childrenOf = (tbl, parentId) => Object.values(tbl)
+    .filter((n) => n.parentId === parentId)
+    .sort((a, b) => (a.order ?? 0) - (b.order ?? 0))
+    .map((n) => n.id);
+exports.childrenOf = childrenOf;
+const ancestors = (tbl, id) => {
+    const out = [];
+    let cur = tbl[id];
+    while (cur?.parentId) {
+        out.unshift(cur.parentId);
+        cur = tbl[cur.parentId];
+    }
+    return out;
+};
+exports.ancestors = ancestors;
+const descendants = (tbl, id) => {
+    const out = [];
+    const stack = [...(0, exports.childrenOf)(tbl, id)];
+    while (stack.length) {
+        const x = stack.pop();
+        out.push(x);
+        stack.push(...(0, exports.childrenOf)(tbl, x));
+    }
+    return out;
+};
+exports.descendants = descendants;
+const leafIds = (table) => {
+    const rows = Object.values(table);
+    const parentIds = new Set(rows.map((row) => row.parentId).filter((pid) => !!pid));
+    return rows.filter((row) => !parentIds.has(row.id)).map((row) => row.id);
+};
+exports.leafIds = leafIds;
+const pathOf = (tbl, id) => [...(0, exports.ancestors)(tbl, id), id];
+exports.pathOf = pathOf;
+// Expand selection (optionally include descendants)
+function normalizeSelection(tbl, selectedIds, options) {
+    const ids = new Set();
+    (selectedIds ?? []).forEach((id) => {
+        ids.add(id);
+        if (options?.includeDescendants) {
+            (0, exports.descendants)(tbl, id).forEach((d) => ids.add(d));
+        }
+    });
+    return ids;
+}
+// Predicate to filter array of entities by property
+function makePredicateForProperty(key, allowed) {
+    return (row) => {
+        if (allowed.size === 0)
+            return true;
+        const val = row[key];
+        if (Array.isArray(val)) {
+            return val.some((x) => typeof x === 'string' && allowed.has(x));
+        }
+        return typeof val === 'string' && allowed.has(val);
+    };
+}
+// Build breadcrumb text (resolved labels joined by separator)
+const breadcrumb = (tbl, id, resolve, sep = ' › ') => (0, exports.pathOf)(tbl, id)
+    .map((x) => resolve(tbl[x].labelKey))
+    .join(sep);
+exports.breadcrumb = breadcrumb;

package/helpers/dataStructures/trees/types.d.ts

@@ -0,0 +1,14 @@
+export interface NodeRow<IdType extends string> {
+    id: IdType;
+    labelKey: string;
+    parentId?: IdType;
+    order?: number;
+    meta?: Record<string, unknown>;
+}
+export type LeafIds<T> = Exclude<keyof T, {
+    [K in keyof T]: T[K] extends {
+        parentId: infer P;
+    } ? P : never;
+}[keyof T]>;
+export declare const defineTable: <IdType extends string, const T extends Record<IdType, NodeRow<IdType>>>(table: T) => T;
+export type Table<IdType extends string, T = NodeRow<IdType>> = Record<IdType, T>;

package/helpers/dataStructures/trees/types.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defineTable = void 0;
+const defineTable = (table) => table;
+exports.defineTable = defineTable;

package/helpers/dlinks.js

@@ -9,4 +9,4 @@ var DLinkActions;
     DLinkActions["Event"] = "event";
     DLinkActions["RollCall"] = "rollcall";
     DLinkActions["Offer"] = "offer";
-})(DLinkActions = exports.DLinkActions || (exports.DLinkActions = {}));
+})(DLinkActions || (exports.DLinkActions = DLinkActions = {}));

package/helpers/errors.d.ts

@@ -29,6 +29,7 @@ export declare enum HttpsErrorMessages {
     InvalidPartnership = "error.partnership.noValid",
     InvalidAdminPartnership = "error.partnership.noAdmin",
     InvalidPartnershipLastAdmin = "error.partnership.lastAdmin",
+    InvalidComposer = "error.composer.noValid",
     PartnershipSepaCreditorInfoMissing = "error.partnership.sepaCreditorInfoMissing",
     InvalidPartnershipPartner = "error.partnershipPartner.noValid",
     PartnershipPartnerNotSelf = "error.partnershipPartner.notSelf",

package/helpers/errors.js

@@ -30,6 +30,7 @@ var HttpsErrorMessages;
     HttpsErrorMessages["InvalidPartnership"] = "error.partnership.noValid";
     HttpsErrorMessages["InvalidAdminPartnership"] = "error.partnership.noAdmin";
     HttpsErrorMessages["InvalidPartnershipLastAdmin"] = "error.partnership.lastAdmin";
+    HttpsErrorMessages["InvalidComposer"] = "error.composer.noValid";
     HttpsErrorMessages["PartnershipSepaCreditorInfoMissing"] = "error.partnership.sepaCreditorInfoMissing";
     HttpsErrorMessages["InvalidPartnershipPartner"] = "error.partnershipPartner.noValid";
     HttpsErrorMessages["PartnershipPartnerNotSelf"] = "error.partnershipPartner.notSelf";
@@ -71,4 +72,4 @@ var HttpsErrorMessages;
     HttpsErrorMessages["CustomerHasGroups"] = "error.customer.hasGroups";
     HttpsErrorMessages["GroupPlayerEditInstumentsNotAllowed"] = "error.groupPlayer.editInstrumentsNotAllowed";
     HttpsErrorMessages["InvalidEmail"] = "error.email.noValid";
-})(HttpsErrorMessages = exports.HttpsErrorMessages || (exports.HttpsErrorMessages = {}));
+})(HttpsErrorMessages || (exports.HttpsErrorMessages = HttpsErrorMessages = {}));

package/helpers/externalUrls.d.ts

@@ -0,0 +1,12 @@
+import { CollectionNames } from './collections';
+export type ExternalUrlParams = Record<string, string | undefined>;
+export declare const normalizeExternalHost: (host: string) => string;
+export declare const buildExternalUrl: (host: string, path?: string) => string;
+export declare const buildExternalUrlWithParams: (host: string, path?: string, params?: ExternalUrlParams) => string;
+export declare const buildAdminEntityUrl: (adminHost: string, entity: CollectionNames, id: string) => string;
+export declare const buildGroupInvitationUrl: (landingHost: string, groupId: string) => string;
+export declare const buildGroupUrl: (landingHost: string, groupId: string) => string;
+export declare const buildGroupShortDynamicUrl: (appHost: string, username: string) => string;
+export declare const buildRollcallUrl: (landingHost: string, groupId: string) => string;
+export declare const buildEventInvitationUrl: (landingHost: string, eventId: string) => string;
+export declare const buildEventUrl: (landingHost: string, eventId: string) => string;

package/helpers/externalUrls.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildEventUrl = exports.buildEventInvitationUrl = exports.buildRollcallUrl = exports.buildGroupShortDynamicUrl = exports.buildGroupUrl = exports.buildGroupInvitationUrl = exports.buildAdminEntityUrl = exports.buildExternalUrlWithParams = exports.buildExternalUrl = exports.normalizeExternalHost = void 0;
+const dlinks_1 = require("./dlinks");
+const normalizeExternalHost = (host) => host.trim().replace(/\/+$/, '');
+exports.normalizeExternalHost = normalizeExternalHost;
+const buildExternalUrl = (host, path = '') => {
+    const normalizedHost = (0, exports.normalizeExternalHost)(host);
+    if (!path)
+        return normalizedHost;
+    if (path.startsWith('?') || path.startsWith('#')) {
+        return `${normalizedHost}${path}`;
+    }
+    return `${normalizedHost}/${path.replace(/^\/+/, '')}`;
+};
+exports.buildExternalUrl = buildExternalUrl;
+const buildExternalUrlWithParams = (host, path = '', params = {}) => {
+    const url = new URL((0, exports.buildExternalUrl)(host, path));
+    Object.entries(params).forEach(([key, value]) => {
+        if (value) {
+            url.searchParams.set(key, value);
+        }
+    });
+    return url.href;
+};
+exports.buildExternalUrlWithParams = buildExternalUrlWithParams;
+const buildAdminEntityUrl = (adminHost, entity, id) => new URL(`/${entity}s/${id}`, `${(0, exports.normalizeExternalHost)(adminHost)}/`).href;
+exports.buildAdminEntityUrl = buildAdminEntityUrl;
+const buildGroupInvitationUrl = (landingHost, groupId) => (0, exports.buildExternalUrl)(landingHost, `/${dlinks_1.DLinkActions.JoinGroup}/${groupId}`);
+exports.buildGroupInvitationUrl = buildGroupInvitationUrl;
+const buildGroupUrl = (landingHost, groupId) => (0, exports.buildExternalUrl)(landingHost, `/${dlinks_1.DLinkActions.Group}/${groupId}`);
+exports.buildGroupUrl = buildGroupUrl;
+const buildGroupShortDynamicUrl = (appHost, username) => (0, exports.buildExternalUrl)(appHost, `/group/${username}`);
+exports.buildGroupShortDynamicUrl = buildGroupShortDynamicUrl;
+const buildRollcallUrl = (landingHost, groupId) => (0, exports.buildExternalUrl)(landingHost, `/${dlinks_1.DLinkActions.RollCall}/${groupId}`);
+exports.buildRollcallUrl = buildRollcallUrl;
+const buildEventInvitationUrl = (landingHost, eventId) => (0, exports.buildExternalUrl)(landingHost, `/${dlinks_1.DLinkActions.JoinEvent}/${eventId}`);
+exports.buildEventInvitationUrl = buildEventInvitationUrl;
+const buildEventUrl = (landingHost, eventId) => (0, exports.buildExternalUrl)(landingHost, `/${dlinks_1.DLinkActions.Event}/${eventId}`);
+exports.buildEventUrl = buildEventUrl;

package/helpers/instruments/index.d.ts

@@ -1,3 +1,4 @@
+import { Ordered } from '../objects';
 export declare enum DefaultInstrumentId {
     Accordion = "accordion",
     Agogo = "agogo",
@@ -44,6 +45,7 @@ export declare enum DefaultInstrumentId {
     DrumSet = "drumSet",
     Dulzaina = "dulzaina",
     DulzainaFa = "dulzaina-fa",
+    Electronics = "electronics",
     ElectricGuitar = "electricGuitar",
     EnglishHorn = "englishHorn",
     Escort = "escort",
@@ -83,6 +85,7 @@ export declare enum DefaultInstrumentId {
     MezzoSoprano = "mezzosoproano",
     Multipercussion = "multipercussion",
     MusicConductor = "musicConductor",
+    Narrator = "narrator",
     Oboe = "oboe",
     Oboe1 = "oboe-1",
     Oboe2 = "oboe-2",
@@ -145,3 +148,17 @@ export declare const getVoicesOf: (id: DefaultInstrumentId) => DefaultInstrument
 export declare const InstrumentIcons: Record<DefaultInstrumentId, string>;
 export type CustomInstrumentId = `customInstrument-${string}`;
 export type InstrumentId = CustomInstrumentId | DefaultInstrumentId;
+export interface CustomInstrument extends Ordered {
+    icon: string;
+    name: string;
+    basedOnInstrument: DefaultInstrumentId;
+}
+export interface ACustomInstrument extends CustomInstrument {
+    id: CustomInstrumentId;
+}
+export type DefaultInstrument = Ordered;
+export interface ADefaultInstrument extends DefaultInstrument {
+    id: DefaultInstrumentId;
+}
+export type AInstrument = ADefaultInstrument | ACustomInstrument;
+export type InstrumentsRecord = Partial<Record<DefaultInstrumentId, DefaultInstrument>> & Record<CustomInstrumentId, CustomInstrument>;

package/helpers/instruments/index.js

@@ -48,6 +48,7 @@ var DefaultInstrumentId;
     DefaultInstrumentId["DrumSet"] = "drumSet";
     DefaultInstrumentId["Dulzaina"] = "dulzaina";
     DefaultInstrumentId["DulzainaFa"] = "dulzaina-fa";
+    DefaultInstrumentId["Electronics"] = "electronics";
     DefaultInstrumentId["ElectricGuitar"] = "electricGuitar";
     DefaultInstrumentId["EnglishHorn"] = "englishHorn";
     DefaultInstrumentId["Escort"] = "escort";
@@ -87,6 +88,7 @@ var DefaultInstrumentId;
     DefaultInstrumentId["MezzoSoprano"] = "mezzosoproano";
     DefaultInstrumentId["Multipercussion"] = "multipercussion";
     DefaultInstrumentId["MusicConductor"] = "musicConductor";
+    DefaultInstrumentId["Narrator"] = "narrator";
     DefaultInstrumentId["Oboe"] = "oboe";
     DefaultInstrumentId["Oboe1"] = "oboe-1";
     DefaultInstrumentId["Oboe2"] = "oboe-2";
@@ -143,7 +145,7 @@ var DefaultInstrumentId;
     DefaultInstrumentId["Violin1"] = "violin-1";
     DefaultInstrumentId["Violin2"] = "violin-2";
     DefaultInstrumentId["Xylophone"] = "xylophone";
-})(DefaultInstrumentId = exports.DefaultInstrumentId || (exports.DefaultInstrumentId = {}));
+})(DefaultInstrumentId || (exports.DefaultInstrumentId = DefaultInstrumentId = {}));
 exports.voicesByInstrument = {
     [DefaultInstrumentId.Bassoon]: [DefaultInstrumentId.Bassoon1, DefaultInstrumentId.Bassoon2],
     [DefaultInstrumentId.Cello]: [DefaultInstrumentId.Cello1, DefaultInstrumentId.Cello2],
@@ -242,6 +244,7 @@ exports.InstrumentIcons = {
     [DefaultInstrumentId.DrumSet]: 'drumSet',
     [DefaultInstrumentId.Dulzaina]: 'dulzaina',
     [DefaultInstrumentId.DulzainaFa]: 'dulzaina',
+    [DefaultInstrumentId.Electronics]: 'electronics',
     [DefaultInstrumentId.ElectricGuitar]: 'guitarElectric',
     [DefaultInstrumentId.EnglishHorn]: 'clarinet',
     [DefaultInstrumentId.Escort]: 'auxiliar',
@@ -281,6 +284,7 @@ exports.InstrumentIcons = {
     [DefaultInstrumentId.Mellophone2]: 'frenchHorn',
     [DefaultInstrumentId.Multipercussion]: 'drumSnare',
     [DefaultInstrumentId.MusicConductor]: 'bandmastersMace',
+    [DefaultInstrumentId.Narrator]: 'narrator',
     [DefaultInstrumentId.Oboe]: 'oboe',
     [DefaultInstrumentId.Oboe1]: 'oboe',
     [DefaultInstrumentId.Oboe2]: 'oboe',

package/helpers/instruments/lists.d.ts

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

package/helpers/instruments/lists.js

@@ -6,16 +6,16 @@ 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 fromRecord_1 = __importDefault(require("../../models/Instrument/fromRecord"));
 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));
+const listWithCustom = (instrumentsRecord, lang) => {
+    const instrumentsIds = (0, objects_1.orderedMapToArray)(instrumentsRecord).map(({ id }) => id);
+    const others = Object.values(_1.DefaultInstrumentId).filter((id) => !instrumentsIds.includes(id) && !hideInstruments.includes(id));
+    return [...instrumentsIds, ...others].map((id) => new fromRecord_1.default(id, lang, instrumentsRecord));
 };
 exports.listWithCustom = listWithCustom;

package/helpers/musicStyles/index.d.ts

@@ -5,15 +5,33 @@ export declare enum MusicStyleId {
     Orchestra = "orquesta-sinfonica",
     Band = "banda-de-musica",
     MarchingBand = "marching-band",
+    Choir = "coro",
+    BrassBand = "brass-band",
     BigBand = "big-band",
-    JazzBand = "jazz-band",
+    PipeBand = "banda-de-gaitas",
+    BandaCornetasYTambores = "banda-cornetas-y-tambores",
+    AgrupacionMusical = "agrupacion-musical",
+    StringQuartet = "cuarteto-cuerda",
+    StringQuintet = "quinteto-cuerda",
+    WoodwindQuintet = "quinteto-viento",
+    SaxophoneQuartet = "cuarteto-saxofones",
+    ClarinetQuartet = "cuarteto-clarinetes",
+    BrassQuintet = "quinteto-metales",
+    StringEnsemble = "ensemble-cuerda",
+    WoodwindEnsemble = "ensemble-madera",
+    BrassEnsemble = "ensemble-metales",
+    PercussionEnsemble = "ensemble-percusion",
+    ChamberGroup = "grupo-de-camara",
     Colla = "colla",
     TxistularisBand = "txistularis",
-    BandaCornetasYTambores = "banda-cornetas-y-tambores",
+    Cobla = "cobla",
+    Rondalla = "rondalla",
     Charanga = "charanga",
-    Choir = "coro",
     Batucada = "batucada",
-    AgrupacionMusical = "agrupacion-musical"
+    JazzCombo = "jazz-combo",
+    JazzBand = "jazz-band",
+    RockPopBand = "grupo-rock-pop",
+    FlexBand = "flex-band"
 }
 export declare const musicStylesIcon: Record<MusicStyleId, DefaultInstrumentId>;
 export declare const MusicStylesCover: Record<MusicStyleId, string>;