@glissandoo/lib 1.16.5 → 1.16.6

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

@@ -20,11 +20,13 @@ export default class GroupRepertory extends Theme<GroupRepertoryData> {
     get fileList(): (import("./types").GroupRepertoireFile & {
         id: string;
     })[];
-    get filesPath(): Record<FileSectionId, import("./types").GroupRepertoireFilePathItem[]>;
-    get filesPathList(): (import("./types").GroupRepertoireFilePathItem[] & {
-        id: string;
-    })[];
-    get sections(): FileSectionId[];
+    get sectionIds(): FileSectionId[];
+    get filesPath(): Partial<Record<FileSectionId, import("./types").GroupRepertoireFilePathItem[]>>;
+    get filesPathList(): {
+        path: string;
+        tag: string | null;
+        sectionId: FileSectionId;
+    }[];
     /** @deprecated use sections */
     get mainFilePath(): string | null;
     get visibility(): GroupRepertoireVisibility;

package/models/Group/Repertory/index.js

@@ -39,14 +39,16 @@ class GroupRepertory extends basic_1.default {
     get fileList() {
         return utils_1.objToArray(this.files);
     }
+    get sectionIds() {
+        return lodash_1.uniq(this.fileList.map((file) => Object.keys(file.sections)).flat());
+    }
     get filesPath() {
         return this.data.filesPath || {};
     }
     get filesPathList() {
-        return utils_1.objToArray(this.filesPath);
-    }
-    get sections() {
-        return lodash_1.uniq(lodash_1.flatten(this.fileList.map((file) => Object.keys(file.sections))));
+        return Object.entries(this.filesPath)
+            .map(([sectionId, files]) => (files || []).map((file) => ({ sectionId: sectionId, ...file })))
+            .flat();
     }
     /** @deprecated use sections */
     get mainFilePath() {

package/models/Group/Repertory/types.d.ts

@@ -68,7 +68,7 @@ export interface GroupRepertoryData extends ThemeBasicData {
     /** @deprecated  */
     identifyAt: Timestamp | null;
     files: Record<string, GroupRepertoireFile>;
-    filesPath: Record<FileSectionId, GroupRepertoireFilePathItem[]>;
+    filesPath: Partial<Record<FileSectionId, GroupRepertoireFilePathItem[]>>;
     votes: Record<string, number>;
     thumbnailURL: string | null;
     editedAt: Timestamp | null;

package/package.json

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

package/helpers/sections/index.d.ts

@@ -1,78 +0,0 @@
-import { InstrumentId } from "../instruments";
-export declare const SectionId: {
-    All: "all";
-    Accordion: InstrumentId.Accordion;
-    Bandurria: InstrumentId.Bandurria;
-    Bagpipes: InstrumentId.Bagpipes;
-    Banjo: InstrumentId.Banjo;
-    Baritone: InstrumentId.Baritone;
-    Bass: InstrumentId.Bass;
-    BassChoir: InstrumentId.BassChoir;
-    BassDrum: InstrumentId.BassDrum;
-    Bassoon: InstrumentId.Bassoon;
-    BassoonContra: InstrumentId.BassoonContra;
-    Cajon: InstrumentId.Cajon;
-    Castanets: InstrumentId.Castanets;
-    Cello: InstrumentId.Cello;
-    Choir: InstrumentId.Choir;
-    Clarinet: InstrumentId.Clarinet;
-    ClarinetAlto: InstrumentId.ClarinetAlto;
-    ClarinetBass: InstrumentId.ClarinetBass;
-    ClarinetContrabass: InstrumentId.ClarinetContrabass;
-    ClarinetLittle: InstrumentId.ClarinetLittle;
-    ContraAlto: InstrumentId.ContraAlto;
-    Cornet: InstrumentId.Cornet;
-    CounterTenor: InstrumentId.CounterTenor;
-    Cymbals: InstrumentId.Cymbals;
-    DJ: InstrumentId.DJ;
-    DoubleBass: InstrumentId.DoubleBass;
-    DrumSet: InstrumentId.DrumSet;
-    Dulzaina: InstrumentId.Dulzaina;
-    DulzainaFa: InstrumentId.DulzainaFa;
-    ElectricGuitar: InstrumentId.ElectricGuitar;
-    EnglishHorn: InstrumentId.EnglishHorn;
-    Euphonium: InstrumentId.Euphonium;
-    FlugeHorn: InstrumentId.FlugeHorn;
-    Flute: InstrumentId.Flute;
-    FluteLow: InstrumentId.FluteLow;
-    FrenchHorn: InstrumentId.FrenchHorn;
-    Guitar: InstrumentId.Guitar;
-    Harmonica: InstrumentId.Harmonica;
-    Harp: InstrumentId.Harp;
-    Keyboard: InstrumentId.Keyboard;
-    Lute: InstrumentId.Lute;
-    Mallets: InstrumentId.Mallets;
-    Mandoline: InstrumentId.Mandoline;
-    MezzoSoprano: InstrumentId.MezzoSoprano;
-    MusicConductor: InstrumentId.MusicConductor;
-    Oboe: InstrumentId.Oboe;
-    Percussion: InstrumentId.Percussion;
-    Piano: InstrumentId.Piano;
-    Piccolo: InstrumentId.Piccolo;
-    SaxAlto: InstrumentId.SaxAlto;
-    SaxBaritone: InstrumentId.SaxBaritone;
-    SaxLow: InstrumentId.SaxLow;
-    SaxSoprano: InstrumentId.SaxSoprano;
-    SaxTenor: InstrumentId.SaxTenor;
-    Silbote: InstrumentId.Silbote;
-    Singer: InstrumentId.Singer;
-    SnareDrum: InstrumentId.SnareDrum;
-    Soprano: InstrumentId.Soprano;
-    Tabal: InstrumentId.Tabal;
-    Tarota: InstrumentId.Tarota;
-    Tenor: InstrumentId.Tenor;
-    Timpani: InstrumentId.Timpani;
-    Trombone: InstrumentId.Trombone;
-    TromboneHigh: InstrumentId.TromboneHigh;
-    TromboneLow: InstrumentId.TromboneLow;
-    Trumpet: InstrumentId.Trumpet;
-    TrumpetLow: InstrumentId.TrumpetLow;
-    TrumpetPiccolo: InstrumentId.TrumpetPiccolo;
-    Tuba: InstrumentId.Tuba;
-    TubaWagnerian: InstrumentId.TubaWagnerian;
-    Txistu: InstrumentId.Txistu;
-    Ukelele: InstrumentId.Ukelele;
-    Viola: InstrumentId.Viola;
-    Violin: InstrumentId.Violin;
-};
-export declare type SectionIdType = typeof SectionId[keyof typeof SectionId];

package/helpers/sections/index.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SectionId = void 0;
-const instruments_1 = require("../instruments");
-exports.SectionId = {
-    ...instruments_1.InstrumentId,
-    All: "all",
-};

package/models/FileSection/index.d.ts

@@ -1,8 +0,0 @@
-import { SectionIdType } from '../../helpers/fileSections';
-import { LanguagesTypes } from '../../lang';
-export default class Section {
-    id: SectionIdType;
-    private lang;
-    constructor(id: SectionIdType, lang?: LanguagesTypes);
-    get name(): string;
-}

package/models/FileSection/index.js

@@ -1,19 +0,0 @@
-"use strict";
-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 Instrument_1 = __importDefault(require("../Instrument"));
-class Section {
-    constructor(id, lang = lang_1.defaultLocale) {
-        this.id = id;
-        this.lang = lang;
-    }
-    get name() {
-        return ((this.id === 'all'
-            ? lang_1.getTranslation(`sections.all`, this.lang)
-            : new Instrument_1.default(this.id).name) || this.id);
-    }
-}
-exports.default = Section;

package/models/Section/index.d.ts

@@ -1,8 +0,0 @@
-import { SectionIdType } from '../../helpers/sections';
-import { LanguagesTypes } from '../../lang';
-export default class Section {
-    id: SectionIdType;
-    private lang;
-    constructor(id: SectionIdType, lang?: LanguagesTypes);
-    get name(): string;
-}

package/models/Section/index.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const lang_1 = require("../../lang");
-class Section {
-    constructor(id, lang = lang_1.defaultLocale) {
-        this.id = id;
-        this.lang = lang;
-    }
-    get name() {
-        const translation = lang_1.getTranslation(this.id === 'all' ? `sections.all` : `instruments.${this.id}`, this.lang);
-        return translation || this.id;
-    }
-}
-exports.default = Section;