@glissandoo/lib 1.60.0 → 1.61.0
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.
- package/functions/auth.js +1 -2
- package/functions/communication.js +1 -2
- package/functions/communicationComment.js +1 -2
- package/functions/customer.js +1 -2
- package/functions/customerGroup.js +1 -2
- package/functions/event.js +2 -5
- package/functions/eventPlayer.js +2 -5
- package/functions/eventRepertory.js +1 -2
- package/functions/federation.js +1 -2
- package/functions/federationPartnership.js +1 -2
- package/functions/group.js +1 -2
- package/functions/groupPlayer.js +1 -2
- package/functions/groupRepertory.js +1 -2
- package/functions/index.js +2 -5
- package/functions/jwt.js +1 -2
- package/functions/misc.js +1 -2
- package/functions/notification.js +1 -2
- package/functions/partner.js +1 -2
- package/functions/partnership.js +1 -2
- package/functions/partnershipGroup.js +1 -2
- package/functions/partnershipPlan.js +1 -2
- package/functions/regions.js +124 -128
- package/functions/subscription.js +1 -2
- package/functions/user.js +1 -2
- package/helpers/appScenes.js +2 -5
- package/helpers/audios.js +5 -9
- package/helpers/auth.js +5 -9
- package/helpers/badges.js +10 -19
- package/helpers/collections.js +2 -5
- package/helpers/countries.js +1 -4
- package/helpers/dlinks.js +2 -5
- package/helpers/errors.js +2 -5
- package/helpers/fileSections/index.js +5 -8
- package/helpers/fileSections/orders.js +11 -16
- package/helpers/glissandooAdmin.js +2 -6
- package/helpers/instruments/index.js +3 -6
- package/helpers/instruments/lists.js +11 -19
- package/helpers/musicStyles/index.js +29 -36
- package/helpers/musicStyles/orders.js +174 -179
- package/helpers/notifications/index.js +119 -122
- package/helpers/notifications/placeholders.js +18 -26
- package/helpers/objects.js +15 -23
- package/helpers/payments.js +5 -8
- package/helpers/plans.js +6 -9
- package/helpers/rates.js +2 -6
- package/helpers/reasons.js +17 -21
- package/helpers/slate.js +5 -12
- package/helpers/styles.js +1 -4
- package/helpers/ts-extras/array-includes.js +1 -5
- package/helpers/ts-extras/as-mutable.js +1 -5
- package/helpers/ts-extras/assert-error.js +1 -5
- package/helpers/ts-extras/index.js +15 -33
- package/helpers/ts-extras/is-defined.js +1 -5
- package/helpers/ts-extras/is-empty.js +1 -5
- package/helpers/ts-extras/is-finite.js +1 -4
- package/helpers/ts-extras/is-infinite.js +1 -5
- package/helpers/ts-extras/is-integer.js +1 -4
- package/helpers/ts-extras/is-present.js +1 -5
- package/helpers/ts-extras/is-safe-integer.js +1 -4
- package/helpers/ts-extras/object-entries.js +1 -4
- package/helpers/ts-extras/object-from-entries.js +1 -4
- package/helpers/ts-extras/object-has-own.js +1 -5
- package/helpers/ts-extras/object-keys.js +1 -4
- package/helpers/ts-extras/set-has.js +1 -5
- package/helpers/types.js +2 -5
- package/helpers/utils.js +8 -16
- package/lang/index.js +42 -51
- package/models/Communication/Comment/index.d.ts +4 -4
- package/models/Communication/Comment/index.js +5 -12
- package/models/Communication/Comment/types.js +1 -2
- package/models/Communication/index.d.ts +3 -2
- package/models/Communication/index.js +15 -21
- package/models/Communication/types.js +4 -7
- package/models/Counters/Group/Analytics/index.d.ts +2 -3
- package/models/Counters/Group/Analytics/index.js +5 -12
- package/models/Counters/Group/Analytics/types.js +2 -5
- package/models/Counters/Group/index.d.ts +2 -3
- package/models/Counters/Group/index.js +2 -8
- package/models/Counters/Group/types.js +1 -2
- package/models/Counters/event.d.ts +2 -2
- package/models/Counters/event.js +2 -8
- package/models/Counters/index.d.ts +2 -3
- package/models/Counters/index.js +2 -8
- package/models/Counters/types.js +1 -2
- package/models/Customer/Group/index.d.ts +2 -2
- package/models/Customer/Group/index.js +7 -14
- package/models/Customer/Group/types.js +1 -2
- package/models/Customer/basic.d.ts +2 -3
- package/models/Customer/basic.js +4 -10
- package/models/Customer/index.d.ts +2 -2
- package/models/Customer/index.js +5 -11
- package/models/Customer/types.js +2 -5
- package/models/Evento/Player/basic.js +10 -11
- package/models/Evento/Player/index.d.ts +4 -4
- package/models/Evento/Player/index.js +12 -18
- package/models/Evento/Player/types.js +4 -7
- package/models/Evento/Repertory/index.d.ts +3 -3
- package/models/Evento/Repertory/index.js +3 -10
- package/models/Evento/Repertory/types.js +1 -2
- package/models/Evento/basic.d.ts +2 -2
- package/models/Evento/basic.js +12 -18
- package/models/Evento/index.d.ts +3 -2
- package/models/Evento/index.js +32 -38
- package/models/Evento/promoter.d.ts +3 -2
- package/models/Evento/promoter.js +2 -8
- package/models/Evento/tiny.js +9 -9
- package/models/Evento/types.js +14 -17
- package/models/Federation/Partnership/index.d.ts +2 -2
- package/models/Federation/Partnership/index.js +3 -10
- package/models/Federation/Partnership/types.js +1 -2
- package/models/Federation/index.d.ts +2 -3
- package/models/Federation/index.js +7 -13
- package/models/Federation/types.js +1 -2
- package/models/Group/Analytics/index.d.ts +3 -4
- package/models/Group/Analytics/index.js +5 -12
- package/models/Group/Analytics/types.js +2 -5
- package/models/Group/Event/index.d.ts +2 -2
- package/models/Group/Event/index.js +6 -12
- package/models/Group/Event/types.js +1 -2
- package/models/Group/Player/Event/index.d.ts +2 -2
- package/models/Group/Player/Event/index.js +11 -18
- package/models/Group/Player/Event/types.js +1 -2
- package/models/Group/Player/Log/index.d.ts +2 -3
- package/models/Group/Player/Log/index.js +2 -8
- package/models/Group/Player/Log/types.js +1 -2
- package/models/Group/Player/index.d.ts +5 -5
- package/models/Group/Player/index.js +18 -24
- package/models/Group/Player/types.js +2 -5
- package/models/Group/Repertory/File/Section/index.js +12 -16
- package/models/Group/Repertory/File/Section/types.js +2 -5
- package/models/Group/Repertory/File/index.js +11 -12
- package/models/Group/Repertory/File/types.js +1 -2
- package/models/Group/Repertory/FilePath/index.js +12 -15
- package/models/Group/Repertory/index.d.ts +8 -8
- package/models/Group/Repertory/index.js +25 -32
- package/models/Group/Repertory/types.js +2 -5
- package/models/Group/StageTemplate/index.d.ts +2 -3
- package/models/Group/StageTemplate/index.js +2 -8
- package/models/Group/StageTemplate/types.js +1 -2
- package/models/Group/basic.d.ts +2 -2
- package/models/Group/basic.js +5 -11
- package/models/Group/index.d.ts +3 -2
- package/models/Group/index.js +41 -47
- package/models/Group/types.js +14 -17
- package/models/Instrument/group.js +6 -11
- package/models/Instrument/index.js +8 -9
- package/models/Metrics/index.d.ts +4 -5
- package/models/Metrics/index.js +10 -16
- package/models/Metrics/types.js +1 -2
- package/models/Model/index.d.ts +15 -3
- package/models/Model/index.js +8 -7
- package/models/Model/lang.d.ts +2 -3
- package/models/Model/lang.js +5 -10
- package/models/MusicStyle/index.js +9 -10
- package/models/Notification/index.d.ts +4 -5
- package/models/Notification/index.js +2 -8
- package/models/Notification/types.js +2 -5
- package/models/Partner/basic.d.ts +2 -2
- package/models/Partner/basic.js +6 -12
- package/models/Partner/index.d.ts +2 -2
- package/models/Partner/index.js +4 -10
- package/models/Partner/tiny.d.ts +2 -3
- package/models/Partner/tiny.js +2 -8
- package/models/Partner/types.js +2 -5
- package/models/Partnership/Group/index.d.ts +2 -2
- package/models/Partnership/Group/index.js +5 -12
- package/models/Partnership/Group/types.js +1 -2
- package/models/Partnership/Partner/Subscription/index.d.ts +2 -2
- package/models/Partnership/Partner/Subscription/index.js +8 -15
- package/models/Partnership/Partner/Subscription/types.js +2 -5
- package/models/Partnership/Partner/index.d.ts +2 -2
- package/models/Partnership/Partner/index.js +3 -10
- package/models/Partnership/Partner/types.js +1 -2
- package/models/Partnership/Payment/index.d.ts +2 -2
- package/models/Partnership/Payment/index.js +2 -8
- package/models/Partnership/Payment/types.js +1 -2
- package/models/Partnership/Plan/basic.d.ts +2 -3
- package/models/Partnership/Plan/basic.js +12 -18
- package/models/Partnership/Plan/index.d.ts +2 -2
- package/models/Partnership/Plan/index.js +3 -10
- package/models/Partnership/Plan/types.js +2 -5
- package/models/Partnership/basic.d.ts +2 -3
- package/models/Partnership/basic.js +4 -10
- package/models/Partnership/index.d.ts +2 -2
- package/models/Partnership/index.js +5 -11
- package/models/Partnership/types.js +4 -7
- package/models/Payment/basic.d.ts +3 -4
- package/models/Payment/basic.js +7 -13
- package/models/Payment/index.d.ts +2 -2
- package/models/Payment/index.js +2 -8
- package/models/Payment/types.js +4 -7
- package/models/Player/basic.d.ts +2 -2
- package/models/Player/basic.js +4 -10
- package/models/Player/types.js +1 -2
- package/models/Repertory/basic.d.ts +2 -3
- package/models/Repertory/basic.js +2 -8
- package/models/Repertory/types.js +1 -2
- package/models/User/Group/index.d.ts +2 -2
- package/models/User/Group/index.js +8 -15
- package/models/User/Group/types.js +1 -2
- package/models/User/Notification/index.d.ts +6 -6
- package/models/User/Notification/index.js +18 -20
- package/models/User/Notification/types.js +1 -2
- package/models/User/basic.d.ts +2 -2
- package/models/User/basic.js +4 -10
- package/models/User/index.d.ts +2 -2
- package/models/User/index.js +18 -24
- package/models/User/types.js +12 -15
- package/models/WebhookEvent/index.d.ts +2 -3
- package/models/WebhookEvent/index.js +2 -8
- package/models/WebhookEvent/types.js +2 -5
- package/package.json +1 -1
- package/types/firestore.js +2 -5
- package/types/messagebirdChatWidget.js +1 -2
|
@@ -1,20 +1,15 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const
|
|
6
|
-
const orders_1 = require("../musicStyles/orders");
|
|
7
|
-
const utils_1 = require("../utils");
|
|
8
|
-
exports.orders = Object.fromEntries(Object.entries(orders_1.orders).map(([musicStyle, instruments]) => [
|
|
1
|
+
import { FileSectionIdReserved, } from '../../models/Group/Repertory/File/Section/types';
|
|
2
|
+
import { fileSectionIdList } from '../fileSections';
|
|
3
|
+
import { orders as instrumentsOrder } from '../musicStyles/orders';
|
|
4
|
+
import { sortByMatch } from '../utils';
|
|
5
|
+
export const orders = Object.fromEntries(Object.entries(instrumentsOrder).map(([musicStyle, instruments]) => [
|
|
9
6
|
musicStyle,
|
|
10
|
-
[
|
|
7
|
+
[FileSectionIdReserved.All, ...instruments],
|
|
11
8
|
]));
|
|
12
|
-
const getOrderByMusicStyle = (musicStyle) => {
|
|
13
|
-
return musicStyle in
|
|
9
|
+
export const getOrderByMusicStyle = (musicStyle) => {
|
|
10
|
+
return musicStyle in orders ? orders[musicStyle] : fileSectionIdList;
|
|
14
11
|
};
|
|
15
|
-
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
return (0, utils_1.sortByMatch)(list, field, order);
|
|
12
|
+
export const orderByMusicStyle = (list, field, musicStyle) => {
|
|
13
|
+
const order = getOrderByMusicStyle(musicStyle);
|
|
14
|
+
return sortByMatch(list, field, order);
|
|
19
15
|
};
|
|
20
|
-
exports.orderByMusicStyle = orderByMusicStyle;
|
|
@@ -1,6 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.getGlissandooAdminEntityURL = exports.GLISSANDOO_ADMIN_URL = void 0;
|
|
4
|
-
exports.GLISSANDOO_ADMIN_URL = 'https://admin.glissandoo.com/';
|
|
5
|
-
const getGlissandooAdminEntityURL = (entity, id) => new URL(`/${entity}s/${id}`, exports.GLISSANDOO_ADMIN_URL).href;
|
|
6
|
-
exports.getGlissandooAdminEntityURL = getGlissandooAdminEntityURL;
|
|
1
|
+
export const GLISSANDOO_ADMIN_URL = 'https://admin.glissandoo.com/';
|
|
2
|
+
export const getGlissandooAdminEntityURL = (entity, id) => new URL(`/${entity}s/${id}`, GLISSANDOO_ADMIN_URL).href;
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.InstrumentIcons = exports.DefaultInstrumentId = void 0;
|
|
4
|
-
var DefaultInstrumentId;
|
|
1
|
+
export var DefaultInstrumentId;
|
|
5
2
|
(function (DefaultInstrumentId) {
|
|
6
3
|
DefaultInstrumentId["Accordion"] = "accordion";
|
|
7
4
|
DefaultInstrumentId["Agogo"] = "agogo";
|
|
@@ -91,8 +88,8 @@ var DefaultInstrumentId;
|
|
|
91
88
|
DefaultInstrumentId["Ukelele"] = "ukelele";
|
|
92
89
|
DefaultInstrumentId["Viola"] = "viola";
|
|
93
90
|
DefaultInstrumentId["Violin"] = "violin";
|
|
94
|
-
})(DefaultInstrumentId
|
|
95
|
-
|
|
91
|
+
})(DefaultInstrumentId || (DefaultInstrumentId = {}));
|
|
92
|
+
export const InstrumentIcons = {
|
|
96
93
|
[DefaultInstrumentId.Accordion]: 'accordion',
|
|
97
94
|
[DefaultInstrumentId.Agogo]: 'agogo',
|
|
98
95
|
[DefaultInstrumentId.Auxiliar]: 'auxiliar',
|
|
@@ -1,21 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const _1 = require(".");
|
|
8
|
-
const Instrument_1 = __importDefault(require("../../models/Instrument"));
|
|
9
|
-
const group_1 = __importDefault(require("../../models/Instrument/group"));
|
|
10
|
-
const objects_1 = require("../objects");
|
|
11
|
-
const hideInstruments = [_1.DefaultInstrumentId.DJ, _1.DefaultInstrumentId.Choir];
|
|
12
|
-
const list = (lang) => Object.values(_1.DefaultInstrumentId)
|
|
1
|
+
import { DefaultInstrumentId } from '.';
|
|
2
|
+
import Instrument from '../../models/Instrument';
|
|
3
|
+
import GroupInstrument from '../../models/Instrument/group';
|
|
4
|
+
import { orderedMapToArray } from '../objects';
|
|
5
|
+
const hideInstruments = [DefaultInstrumentId.DJ, DefaultInstrumentId.Choir];
|
|
6
|
+
export const list = (lang) => Object.values(DefaultInstrumentId)
|
|
13
7
|
.filter((id) => !hideInstruments.includes(id))
|
|
14
|
-
.map((id) => new
|
|
15
|
-
|
|
16
|
-
const
|
|
17
|
-
const
|
|
18
|
-
|
|
19
|
-
return [...groupInstrumentsIds, ...others].map((id) => new group_1.default(id, lang, groupInstruments));
|
|
8
|
+
.map((id) => new Instrument(id, lang));
|
|
9
|
+
export const listWithCustom = (groupInstruments, lang) => {
|
|
10
|
+
const groupInstrumentsIds = orderedMapToArray(groupInstruments).map(({ id }) => id);
|
|
11
|
+
const others = Object.values(DefaultInstrumentId).filter((id) => !groupInstrumentsIds.includes(id) && !hideInstruments.includes(id));
|
|
12
|
+
return [...groupInstrumentsIds, ...others].map((id) => new GroupInstrument(id, lang, groupInstruments));
|
|
20
13
|
};
|
|
21
|
-
exports.listWithCustom = listWithCustom;
|
|
@@ -1,13 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.list = exports.musicStyleByCountry = exports.MusicStylesCover = exports.musicStylesIcon = exports.MusicStyleId = void 0;
|
|
7
|
-
const lang_1 = require("../../lang");
|
|
8
|
-
const MusicStyle_1 = __importDefault(require("../../models/MusicStyle"));
|
|
9
|
-
const instruments_1 = require("../instruments");
|
|
10
|
-
var MusicStyleId;
|
|
1
|
+
import { LanguagesTypes } from '../../lang';
|
|
2
|
+
import MusicStyle from '../../models/MusicStyle';
|
|
3
|
+
import { DefaultInstrumentId } from '../instruments';
|
|
4
|
+
export var MusicStyleId;
|
|
11
5
|
(function (MusicStyleId) {
|
|
12
6
|
MusicStyleId["Orchestra"] = "orquesta-sinfonica";
|
|
13
7
|
MusicStyleId["Band"] = "banda-de-musica";
|
|
@@ -20,21 +14,21 @@ var MusicStyleId;
|
|
|
20
14
|
MusicStyleId["Charanga"] = "charanga";
|
|
21
15
|
MusicStyleId["Choir"] = "coro";
|
|
22
16
|
MusicStyleId["Batucada"] = "batucada";
|
|
23
|
-
})(MusicStyleId
|
|
24
|
-
|
|
25
|
-
[MusicStyleId.Orchestra]:
|
|
26
|
-
[MusicStyleId.Band]:
|
|
27
|
-
[MusicStyleId.MarchingBand]:
|
|
28
|
-
[MusicStyleId.BigBand]:
|
|
29
|
-
[MusicStyleId.JazzBand]:
|
|
30
|
-
[MusicStyleId.Colla]:
|
|
31
|
-
[MusicStyleId.TxistularisBand]:
|
|
32
|
-
[MusicStyleId.BandaCornetasYTambores]:
|
|
33
|
-
[MusicStyleId.Charanga]:
|
|
34
|
-
[MusicStyleId.Choir]:
|
|
35
|
-
[MusicStyleId.Batucada]:
|
|
17
|
+
})(MusicStyleId || (MusicStyleId = {}));
|
|
18
|
+
export const musicStylesIcon = {
|
|
19
|
+
[MusicStyleId.Orchestra]: DefaultInstrumentId.Violin,
|
|
20
|
+
[MusicStyleId.Band]: DefaultInstrumentId.Clarinet,
|
|
21
|
+
[MusicStyleId.MarchingBand]: DefaultInstrumentId.MarchingToms,
|
|
22
|
+
[MusicStyleId.BigBand]: DefaultInstrumentId.Trombone,
|
|
23
|
+
[MusicStyleId.JazzBand]: DefaultInstrumentId.SaxTenor,
|
|
24
|
+
[MusicStyleId.Colla]: DefaultInstrumentId.Dulzaina,
|
|
25
|
+
[MusicStyleId.TxistularisBand]: DefaultInstrumentId.Txistu,
|
|
26
|
+
[MusicStyleId.BandaCornetasYTambores]: DefaultInstrumentId.Cornet,
|
|
27
|
+
[MusicStyleId.Charanga]: DefaultInstrumentId.BassDrum,
|
|
28
|
+
[MusicStyleId.Choir]: DefaultInstrumentId.Tenor,
|
|
29
|
+
[MusicStyleId.Batucada]: DefaultInstrumentId.Repique,
|
|
36
30
|
};
|
|
37
|
-
|
|
31
|
+
export const MusicStylesCover = {
|
|
38
32
|
[MusicStyleId.Orchestra]: 'orquestra',
|
|
39
33
|
[MusicStyleId.Band]: 'bandaDeMusica',
|
|
40
34
|
[MusicStyleId.MarchingBand]: 'marchingBand',
|
|
@@ -47,8 +41,8 @@ exports.MusicStylesCover = {
|
|
|
47
41
|
[MusicStyleId.Choir]: 'choir',
|
|
48
42
|
[MusicStyleId.Batucada]: 'batucada',
|
|
49
43
|
};
|
|
50
|
-
|
|
51
|
-
[
|
|
44
|
+
export const musicStyleByCountry = {
|
|
45
|
+
[LanguagesTypes.EN]: [
|
|
52
46
|
MusicStyleId.Orchestra,
|
|
53
47
|
MusicStyleId.MarchingBand,
|
|
54
48
|
MusicStyleId.Band,
|
|
@@ -57,7 +51,7 @@ exports.musicStyleByCountry = {
|
|
|
57
51
|
MusicStyleId.Choir,
|
|
58
52
|
MusicStyleId.Batucada,
|
|
59
53
|
],
|
|
60
|
-
[
|
|
54
|
+
[LanguagesTypes.DE]: [
|
|
61
55
|
MusicStyleId.Orchestra,
|
|
62
56
|
MusicStyleId.MarchingBand,
|
|
63
57
|
MusicStyleId.Band,
|
|
@@ -66,7 +60,7 @@ exports.musicStyleByCountry = {
|
|
|
66
60
|
MusicStyleId.Choir,
|
|
67
61
|
MusicStyleId.Batucada,
|
|
68
62
|
],
|
|
69
|
-
[
|
|
63
|
+
[LanguagesTypes.ES]: [
|
|
70
64
|
MusicStyleId.Orchestra,
|
|
71
65
|
MusicStyleId.Band,
|
|
72
66
|
MusicStyleId.BigBand,
|
|
@@ -78,7 +72,7 @@ exports.musicStyleByCountry = {
|
|
|
78
72
|
MusicStyleId.Choir,
|
|
79
73
|
MusicStyleId.Batucada,
|
|
80
74
|
],
|
|
81
|
-
[
|
|
75
|
+
[LanguagesTypes.EU]: [
|
|
82
76
|
MusicStyleId.Choir,
|
|
83
77
|
MusicStyleId.Orchestra,
|
|
84
78
|
MusicStyleId.TxistularisBand,
|
|
@@ -88,7 +82,7 @@ exports.musicStyleByCountry = {
|
|
|
88
82
|
MusicStyleId.JazzBand,
|
|
89
83
|
MusicStyleId.Batucada,
|
|
90
84
|
],
|
|
91
|
-
[
|
|
85
|
+
[LanguagesTypes.GL]: [
|
|
92
86
|
MusicStyleId.Orchestra,
|
|
93
87
|
MusicStyleId.Band,
|
|
94
88
|
MusicStyleId.BigBand,
|
|
@@ -99,7 +93,7 @@ exports.musicStyleByCountry = {
|
|
|
99
93
|
MusicStyleId.Choir,
|
|
100
94
|
MusicStyleId.Batucada,
|
|
101
95
|
],
|
|
102
|
-
[
|
|
96
|
+
[LanguagesTypes.CA]: [
|
|
103
97
|
MusicStyleId.Orchestra,
|
|
104
98
|
MusicStyleId.Band,
|
|
105
99
|
MusicStyleId.BigBand,
|
|
@@ -110,7 +104,7 @@ exports.musicStyleByCountry = {
|
|
|
110
104
|
MusicStyleId.Choir,
|
|
111
105
|
MusicStyleId.Batucada,
|
|
112
106
|
],
|
|
113
|
-
[
|
|
107
|
+
[LanguagesTypes.PT]: [
|
|
114
108
|
MusicStyleId.Orchestra,
|
|
115
109
|
MusicStyleId.Band,
|
|
116
110
|
MusicStyleId.BigBand,
|
|
@@ -119,8 +113,7 @@ exports.musicStyleByCountry = {
|
|
|
119
113
|
MusicStyleId.Batucada,
|
|
120
114
|
],
|
|
121
115
|
};
|
|
122
|
-
const list = (lang, filteredByCountry = false) => {
|
|
123
|
-
const musicStyles = filteredByCountry ?
|
|
124
|
-
return musicStyles.map((key) => new
|
|
116
|
+
export const list = (lang, filteredByCountry = false) => {
|
|
117
|
+
const musicStyles = filteredByCountry ? musicStyleByCountry[lang] : Object.values(MusicStyleId);
|
|
118
|
+
return musicStyles.map((key) => new MusicStyle(key, lang));
|
|
125
119
|
};
|
|
126
|
-
exports.list = list;
|
|
@@ -1,193 +1,188 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
instruments_1.DefaultInstrumentId.Timpani,
|
|
37
|
-
instruments_1.DefaultInstrumentId.Mallets,
|
|
38
|
-
instruments_1.DefaultInstrumentId.DrumSet,
|
|
1
|
+
import { DefaultInstrumentId } from '../instruments';
|
|
2
|
+
import { sortByMatch } from '../utils';
|
|
3
|
+
import { MusicStyleId } from './index';
|
|
4
|
+
export const orders = {
|
|
5
|
+
[MusicStyleId.Band]: [
|
|
6
|
+
DefaultInstrumentId.MusicConductor,
|
|
7
|
+
DefaultInstrumentId.Piccolo,
|
|
8
|
+
DefaultInstrumentId.Flute,
|
|
9
|
+
DefaultInstrumentId.Oboe,
|
|
10
|
+
DefaultInstrumentId.EnglishHorn,
|
|
11
|
+
DefaultInstrumentId.Bassoon,
|
|
12
|
+
DefaultInstrumentId.BassoonContra,
|
|
13
|
+
DefaultInstrumentId.ClarinetLittle,
|
|
14
|
+
DefaultInstrumentId.Clarinet,
|
|
15
|
+
DefaultInstrumentId.ClarinetBass,
|
|
16
|
+
DefaultInstrumentId.SaxSoprano,
|
|
17
|
+
DefaultInstrumentId.SaxAlto,
|
|
18
|
+
DefaultInstrumentId.SaxTenor,
|
|
19
|
+
DefaultInstrumentId.SaxBaritone,
|
|
20
|
+
DefaultInstrumentId.FrenchHorn,
|
|
21
|
+
DefaultInstrumentId.FlugeHorn,
|
|
22
|
+
DefaultInstrumentId.Trumpet,
|
|
23
|
+
DefaultInstrumentId.Trombone,
|
|
24
|
+
DefaultInstrumentId.TromboneLow,
|
|
25
|
+
DefaultInstrumentId.Euphonium,
|
|
26
|
+
DefaultInstrumentId.Tuba,
|
|
27
|
+
DefaultInstrumentId.Cello,
|
|
28
|
+
DefaultInstrumentId.DoubleBass,
|
|
29
|
+
DefaultInstrumentId.SnareDrum,
|
|
30
|
+
DefaultInstrumentId.Percussion,
|
|
31
|
+
DefaultInstrumentId.BassDrum,
|
|
32
|
+
DefaultInstrumentId.Cymbals,
|
|
33
|
+
DefaultInstrumentId.Timpani,
|
|
34
|
+
DefaultInstrumentId.Mallets,
|
|
35
|
+
DefaultInstrumentId.DrumSet,
|
|
39
36
|
],
|
|
40
|
-
[
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
37
|
+
[MusicStyleId.MarchingBand]: [
|
|
38
|
+
DefaultInstrumentId.MusicConductor,
|
|
39
|
+
DefaultInstrumentId.Piccolo,
|
|
40
|
+
DefaultInstrumentId.Flute,
|
|
41
|
+
DefaultInstrumentId.Clarinet,
|
|
42
|
+
DefaultInstrumentId.ClarinetBass,
|
|
43
|
+
DefaultInstrumentId.SaxAlto,
|
|
44
|
+
DefaultInstrumentId.SaxTenor,
|
|
45
|
+
DefaultInstrumentId.SaxBaritone,
|
|
46
|
+
DefaultInstrumentId.Trumpet,
|
|
47
|
+
DefaultInstrumentId.Trombone,
|
|
48
|
+
DefaultInstrumentId.TromboneLow,
|
|
49
|
+
DefaultInstrumentId.Euphonium,
|
|
50
|
+
DefaultInstrumentId.Tuba,
|
|
51
|
+
DefaultInstrumentId.SnareDrum,
|
|
52
|
+
DefaultInstrumentId.MarchingToms,
|
|
53
|
+
DefaultInstrumentId.BassDrum,
|
|
54
|
+
DefaultInstrumentId.Cymbals,
|
|
55
|
+
DefaultInstrumentId.Timpani,
|
|
56
|
+
DefaultInstrumentId.Mallets,
|
|
57
|
+
DefaultInstrumentId.DrumSet,
|
|
61
58
|
],
|
|
62
|
-
[
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
59
|
+
[MusicStyleId.Orchestra]: [
|
|
60
|
+
DefaultInstrumentId.MusicConductor,
|
|
61
|
+
DefaultInstrumentId.Violin,
|
|
62
|
+
DefaultInstrumentId.Viola,
|
|
63
|
+
DefaultInstrumentId.Cello,
|
|
64
|
+
DefaultInstrumentId.DoubleBass,
|
|
65
|
+
DefaultInstrumentId.Piccolo,
|
|
66
|
+
DefaultInstrumentId.Flute,
|
|
67
|
+
DefaultInstrumentId.FluteLow,
|
|
68
|
+
DefaultInstrumentId.Oboe,
|
|
69
|
+
DefaultInstrumentId.EnglishHorn,
|
|
70
|
+
DefaultInstrumentId.Clarinet,
|
|
71
|
+
DefaultInstrumentId.ClarinetBass,
|
|
72
|
+
DefaultInstrumentId.Bassoon,
|
|
73
|
+
DefaultInstrumentId.BassoonContra,
|
|
74
|
+
DefaultInstrumentId.FrenchHorn,
|
|
75
|
+
DefaultInstrumentId.FlugeHorn,
|
|
76
|
+
DefaultInstrumentId.Trumpet,
|
|
77
|
+
DefaultInstrumentId.TrumpetLow,
|
|
78
|
+
DefaultInstrumentId.TrumpetPiccolo,
|
|
79
|
+
DefaultInstrumentId.Trombone,
|
|
80
|
+
DefaultInstrumentId.TromboneHigh,
|
|
81
|
+
DefaultInstrumentId.TromboneLow,
|
|
82
|
+
DefaultInstrumentId.Euphonium,
|
|
83
|
+
DefaultInstrumentId.Tuba,
|
|
84
|
+
DefaultInstrumentId.Percussion,
|
|
85
|
+
DefaultInstrumentId.SnareDrum,
|
|
86
|
+
DefaultInstrumentId.BassDrum,
|
|
87
|
+
DefaultInstrumentId.Cymbals,
|
|
88
|
+
DefaultInstrumentId.Timpani,
|
|
89
|
+
DefaultInstrumentId.Mallets,
|
|
93
90
|
],
|
|
94
|
-
[
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
91
|
+
[MusicStyleId.Choir]: [
|
|
92
|
+
DefaultInstrumentId.MusicConductor,
|
|
93
|
+
DefaultInstrumentId.Soprano,
|
|
94
|
+
DefaultInstrumentId.MezzoSoprano,
|
|
95
|
+
DefaultInstrumentId.ContraAlto,
|
|
96
|
+
DefaultInstrumentId.CounterTenor,
|
|
97
|
+
DefaultInstrumentId.BassChoir,
|
|
98
|
+
DefaultInstrumentId.Tenor,
|
|
99
|
+
DefaultInstrumentId.Baritone,
|
|
100
|
+
DefaultInstrumentId.Choir,
|
|
104
101
|
],
|
|
105
|
-
[
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
102
|
+
[MusicStyleId.BigBand]: [
|
|
103
|
+
DefaultInstrumentId.MusicConductor,
|
|
104
|
+
DefaultInstrumentId.Flute,
|
|
105
|
+
DefaultInstrumentId.Oboe,
|
|
106
|
+
DefaultInstrumentId.Clarinet,
|
|
107
|
+
DefaultInstrumentId.SaxSoprano,
|
|
108
|
+
DefaultInstrumentId.SaxAlto,
|
|
109
|
+
DefaultInstrumentId.SaxTenor,
|
|
110
|
+
DefaultInstrumentId.SaxBaritone,
|
|
111
|
+
DefaultInstrumentId.FrenchHorn,
|
|
112
|
+
DefaultInstrumentId.FlugeHorn,
|
|
113
|
+
DefaultInstrumentId.Trumpet,
|
|
114
|
+
DefaultInstrumentId.Trombone,
|
|
115
|
+
DefaultInstrumentId.Euphonium,
|
|
116
|
+
DefaultInstrumentId.Tuba,
|
|
117
|
+
DefaultInstrumentId.Percussion,
|
|
118
|
+
DefaultInstrumentId.DrumSet,
|
|
122
119
|
],
|
|
123
|
-
[
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
120
|
+
[MusicStyleId.TxistularisBand]: [
|
|
121
|
+
DefaultInstrumentId.Txistu,
|
|
122
|
+
DefaultInstrumentId.Silbote,
|
|
123
|
+
DefaultInstrumentId.Tabal,
|
|
127
124
|
],
|
|
128
|
-
[
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
125
|
+
[MusicStyleId.Colla]: [
|
|
126
|
+
DefaultInstrumentId.MusicConductor,
|
|
127
|
+
DefaultInstrumentId.Dulzaina,
|
|
128
|
+
DefaultInstrumentId.DulzainaFa,
|
|
129
|
+
DefaultInstrumentId.Tarota,
|
|
130
|
+
DefaultInstrumentId.Bagpipes,
|
|
131
|
+
DefaultInstrumentId.Tabal,
|
|
132
|
+
DefaultInstrumentId.Percussion,
|
|
133
|
+
DefaultInstrumentId.BassDrum,
|
|
134
|
+
DefaultInstrumentId.Cymbals,
|
|
135
|
+
DefaultInstrumentId.Timpani,
|
|
139
136
|
],
|
|
140
|
-
[
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
137
|
+
[MusicStyleId.Charanga]: [
|
|
138
|
+
DefaultInstrumentId.Clarinet,
|
|
139
|
+
DefaultInstrumentId.SaxAlto,
|
|
140
|
+
DefaultInstrumentId.SaxTenor,
|
|
141
|
+
DefaultInstrumentId.Trumpet,
|
|
142
|
+
DefaultInstrumentId.Trombone,
|
|
143
|
+
DefaultInstrumentId.Euphonium,
|
|
144
|
+
DefaultInstrumentId.Tuba,
|
|
145
|
+
DefaultInstrumentId.Percussion,
|
|
146
|
+
DefaultInstrumentId.SnareDrum,
|
|
147
|
+
DefaultInstrumentId.BassDrum,
|
|
148
|
+
DefaultInstrumentId.MarchingToms,
|
|
149
|
+
DefaultInstrumentId.Cymbals,
|
|
153
150
|
],
|
|
154
|
-
[
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
151
|
+
[MusicStyleId.BandaCornetasYTambores]: [
|
|
152
|
+
DefaultInstrumentId.MusicConductor,
|
|
153
|
+
DefaultInstrumentId.Cornet,
|
|
154
|
+
DefaultInstrumentId.Percussion,
|
|
155
|
+
DefaultInstrumentId.SnareDrum,
|
|
156
|
+
DefaultInstrumentId.BassDrum,
|
|
160
157
|
],
|
|
161
|
-
[
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
158
|
+
[MusicStyleId.JazzBand]: [
|
|
159
|
+
DefaultInstrumentId.Flute,
|
|
160
|
+
DefaultInstrumentId.Clarinet,
|
|
161
|
+
DefaultInstrumentId.SaxSoprano,
|
|
162
|
+
DefaultInstrumentId.SaxAlto,
|
|
163
|
+
DefaultInstrumentId.SaxTenor,
|
|
164
|
+
DefaultInstrumentId.SaxBaritone,
|
|
165
|
+
DefaultInstrumentId.Trumpet,
|
|
166
|
+
DefaultInstrumentId.Trombone,
|
|
167
|
+
DefaultInstrumentId.Tuba,
|
|
168
|
+
DefaultInstrumentId.DoubleBass,
|
|
169
|
+
DefaultInstrumentId.Percussion,
|
|
170
|
+
DefaultInstrumentId.DrumSet,
|
|
174
171
|
],
|
|
175
|
-
[
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
172
|
+
[MusicStyleId.Batucada]: [
|
|
173
|
+
DefaultInstrumentId.Repique,
|
|
174
|
+
DefaultInstrumentId.TambourineBrazilian,
|
|
175
|
+
DefaultInstrumentId.TimbalBrazilian,
|
|
176
|
+
DefaultInstrumentId.SnareDrum,
|
|
177
|
+
DefaultInstrumentId.Surdo,
|
|
178
|
+
DefaultInstrumentId.Agogo,
|
|
179
|
+
DefaultInstrumentId.Chocalho,
|
|
183
180
|
],
|
|
184
181
|
};
|
|
185
|
-
const getInstrumentsOrderByMusicStyle = (musicStyle) => {
|
|
186
|
-
return musicStyle in
|
|
182
|
+
export const getInstrumentsOrderByMusicStyle = (musicStyle) => {
|
|
183
|
+
return musicStyle in orders ? orders[musicStyle] : Object.values(DefaultInstrumentId);
|
|
187
184
|
};
|
|
188
|
-
|
|
189
|
-
const
|
|
190
|
-
|
|
191
|
-
return (0, utils_1.sortByMatch)(list, field, order);
|
|
185
|
+
export const orderByMusicStyle = (list, field, musicStyle) => {
|
|
186
|
+
const order = getInstrumentsOrderByMusicStyle(musicStyle);
|
|
187
|
+
return sortByMatch(list, field, order);
|
|
192
188
|
};
|
|
193
|
-
exports.orderByMusicStyle = orderByMusicStyle;
|