@glissandoo/lib 1.103.6 → 1.103.7

package/models/Group/Repertory/File/Section/index.d.ts

@@ -1,10 +1,12 @@
 import { InstrumentId } from '../../../../../helpers/instruments';
 import { LanguagesTypes } from '../../../../../lang';
+import { GroupInstruments } from '../../../types';
 import { FileSectionId } from './types';
 export default class GroupRepertoryFileSection {
     id: FileSectionId;
+    groupInstruments: GroupInstruments;
     private lang;
-    constructor(id: FileSectionId, lang?: LanguagesTypes);
+    constructor(id: FileSectionId, instruments: GroupInstruments, lang?: LanguagesTypes);
     get name(): string;
     getOrder(instrumentsIds: InstrumentId[]): number;
 }

package/models/Group/Repertory/File/Section/index.js

@@ -5,17 +5,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const orders_1 = require("../../../../../helpers/fileSections/orders");
 const lang_1 = require("../../../../../lang");
-const Instrument_1 = __importDefault(require("../../../../Instrument"));
+const group_1 = __importDefault(require("../../../../Instrument/group"));
 const types_1 = require("./types");
 class GroupRepertoryFileSection {
-    constructor(id, lang = lang_1.defaultLocale) {
+    constructor(id, instruments, lang = lang_1.defaultLocale) {
         this.id = id;
+        this.groupInstruments = instruments;
         this.lang = lang;
     }
     get name() {
         return ((this.id === types_1.FileSectionIdReserved.All
             ? (0, lang_1.getTranslation)(`sections.all`, this.lang)
-            : new Instrument_1.default(this.id, this.lang).name) || this.id);
+            : new group_1.default(this.id, this.lang, this.groupInstruments).name) || this.id);
     }
     getOrder(instrumentsIds) {
         return (0, orders_1.getFileSectionsOrder)(instrumentsIds).indexOf(this.id) + 1 || Infinity;

package/models/Group/Repertory/FilePath/index.d.ts

@@ -1,15 +1,17 @@
 /// <reference types="node" />
-import { FileSectionId } from '../File/Section/types';
-import { GroupRepertoireFilePathItem } from '../types';
+import path from 'path';
+import Group from '../../';
 import { LanguagesTypes } from '../../../../lang';
+import { GroupInstruments } from '../../types';
 import FileSection from '../File/Section';
-import Group from '../../';
-import path from 'path';
+import { FileSectionId } from '../File/Section/types';
+import { GroupRepertoireFilePathItem } from '../types';
 export default class ThemeFilePath {
     sectionId: FileSectionId;
     protected data: GroupRepertoireFilePathItem;
     protected lang: LanguagesTypes;
-    constructor(sectionId: FileSectionId, data: GroupRepertoireFilePathItem, lang?: LanguagesTypes);
+    protected instruments: GroupInstruments;
+    constructor(sectionId: FileSectionId, data: GroupRepertoireFilePathItem, instruments: GroupInstruments, lang?: LanguagesTypes);
     get path(): string;
     get parsedPath(): path.ParsedPath;
     get ext(): string;

package/models/Group/Repertory/FilePath/index.js

@@ -3,13 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const lang_1 = require("../../../../lang");
-const Section_1 = __importDefault(require("../File/Section"));
 const path_1 = __importDefault(require("path"));
 const audios_1 = require("../../../../helpers/audios");
+const lang_1 = require("../../../../lang");
+const Section_1 = __importDefault(require("../File/Section"));
 class ThemeFilePath {
-    constructor(sectionId, data, lang = lang_1.defaultLocale) {
+    constructor(sectionId, data, instruments, lang = lang_1.defaultLocale) {
         this.sectionId = sectionId;
+        this.instruments = instruments;
         this.data = data;
         this.lang = lang;
     }
@@ -29,7 +30,7 @@ class ThemeFilePath {
         return audios_1.audioExtensions.includes(this.ext);
     }
     get section() {
-        return new Section_1.default(this.sectionId, this.lang);
+        return new Section_1.default(this.sectionId, this.instruments, this.lang);
     }
     get tag() {
         return this.data.tag;

package/models/Group/index.d.ts

@@ -82,7 +82,7 @@ export default class Group extends GroupBasic<GroupData> {
     get trialEndAt(): Date;
     get glissandooAdminUrl(): string;
     get createdOn(): import("../../helpers/types").CreatedOn;
-    get instruments(): Partial<Record<import("../../helpers/instruments").DefaultInstrumentId, import("./types").DefaultGroupInstrument>> & Record<`customInstrument-${string}`, CustomGroupInstrument>;
+    get instruments(): import("./types").GroupInstruments;
     get instrumentsList(): Pick<(import("./types").DefaultGroupInstrument & {
         id: import("../../helpers/instruments").DefaultInstrumentId | `customInstrument-${string}`;
     }) | (CustomGroupInstrument & {

package/models/Group/types.d.ts

@@ -130,6 +130,7 @@ export interface AGroupCustomInstrument extends CustomGroupInstrument {
     id: CustomInstrumentId;
 }
 export type AGroupInstrument = AGroupDefaultInstrument | AGroupCustomInstrument;
+export type GroupInstruments = Partial<Record<DefaultInstrumentId, DefaultGroupInstrument>> & Record<CustomInstrumentId, CustomGroupInstrument>;
 export interface GroupData extends GroupBasicData {
     playerIds: string[];
     players: Record<string, PlayerBasicData>;
@@ -160,7 +161,7 @@ export interface GroupData extends GroupBasicData {
     eventCount: Record<EventType, number>;
     communicationCount: number;
     country: string;
-    instruments: Partial<Record<DefaultInstrumentId, DefaultGroupInstrument>> & Record<CustomInstrumentId, CustomGroupInstrument>;
+    instruments: GroupInstruments;
     metadata: Record<string, string>;
     firstAnswerAt: Timestamp | null;
     repertoireTags: Record<string, GroupRepertoireTag>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@glissandoo/lib",
-	"version": "1.103.6",
+	"version": "1.103.7",
 	"description": "Glissandoo library js",
 	"main": "./index.js",
 	"types": "./index.d.ts",