@glissandoo/lib 1.3.21 → 1.3.22

package/models/Evento/tiny.d.ts

@@ -3,7 +3,8 @@ import { EventTinyData, EventType } from './types';
 export default class EventoTiny {
     protected lang: LanguagesTypes;
     protected data: EventTinyData;
-    constructor(data: EventTinyData, lang: LanguagesTypes);
+    id: string;
+    constructor(id: string, data: EventTinyData, lang: LanguagesTypes);
     get displayName(): string | null;
     get title(): string;
     get type(): EventType;

package/models/Evento/tiny.js

@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const lang_1 = require("../../lang");
 const types_1 = require("./types");
 class EventoTiny {
-    constructor(data, lang) {
-        this.lang = lang;
+    constructor(id, data, lang) {
+        this.id = id;
         this.data = data;
+        this.lang = lang;
     }
     get displayName() {
         return this.data.displayName;

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

@@ -1,9 +1,12 @@
 import * as firestore from '@google-cloud/firestore';
 import { InstrumentId } from '../../../helpers/instruments';
+import { LanguagesTypes } from '../../../lang';
+import EventoTiny from '../../Evento/tiny';
 import Theme from '../../Repertory/basic';
 import { AGroupRepertoryClaim, GroupRepertoryData } from './types';
 export default class GroupRepertory extends Theme<GroupRepertoryData> {
-    constructor(doc: firestore.DocumentSnapshot);
+    private lang;
+    constructor(doc: firestore.DocumentSnapshot, lang?: LanguagesTypes);
     get groupId(): string;
     get tagsAlgolia(): import("./types").GroupRepertoryTagAlgoliaData[];
     get instruments(): {
@@ -14,17 +17,11 @@ export default class GroupRepertory extends Theme<GroupRepertoryData> {
     get mainFilePath(): string | null;
     get events(): string[];
     get eventsTL(): Record<string, import("../../Evento/types").EventTinyData>;
-    get eventsList(): (import("../../Evento/types").EventTinyData & {
-        id: string;
-    })[];
+    get eventsList(): EventoTiny[];
     /** @deprecated use getNextEvents */
-    get nextEvents(): (import("../../Evento/types").EventTinyData & {
-        id: string;
-    })[];
+    get nextEvents(): EventoTiny[];
     /** @deprecated use getNextEvent */
-    get nextEvent(): (import("../../Evento/types").EventTinyData & {
-        id: string;
-    }) | null;
+    get nextEvent(): EventoTiny | null;
     get scoresByInstruments(): boolean;
     get editedAt(): firestore.Timestamp | null;
     get createdAt(): firestore.Timestamp;
@@ -55,13 +52,7 @@ export default class GroupRepertory extends Theme<GroupRepertoryData> {
         id: InstrumentId;
         pages: number[];
     } | undefined;
-    getNextEvents(endDay?: boolean): (import("../../Evento/types").EventTinyData & {
-        id: string;
-    })[];
-    getNextEvent(endDay?: boolean): (import("../../Evento/types").EventTinyData & {
-        id: string;
-    }) | null;
-    getEventsByOrder(order?: 'asc' | 'desc'): (import("../../Evento/types").EventTinyData & {
-        id: string;
-    })[];
+    getEventsByOrder(order?: 'asc' | 'desc'): EventoTiny[];
+    getNextEvents(endDay?: boolean): EventoTiny[];
+    getNextEvent(endDay?: boolean): EventoTiny | null;
 }

package/models/Group/Repertory/index.js

@@ -7,10 +7,14 @@ const endOfDay_1 = __importDefault(require("date-fns/endOfDay"));
 const isFuture_1 = __importDefault(require("date-fns/isFuture"));
 const get_1 = __importDefault(require("lodash/get"));
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
+const lang_1 = require("../../../lang");
+const tiny_1 = __importDefault(require("../../Evento/tiny"));
 const basic_1 = __importDefault(require("../../Repertory/basic"));
 class GroupRepertory extends basic_1.default {
-    constructor(doc) {
+    constructor(doc, lang = lang_1.defaultLocale) {
         super(doc);
+        this.lang = lang_1.defaultLocale;
+        this.lang = lang;
     }
     get groupId() {
         return get_1.default(this.ref, 'parent.parent.id');
@@ -32,7 +36,7 @@ class GroupRepertory extends basic_1.default {
         return this.data.eventsTL || {};
     }
     get eventsList() {
-        return Object.keys(this.eventsTL).map((id) => Object.assign(this.eventsTL[id], { id }));
+        return Object.keys(this.eventsTL).map((id) => new tiny_1.default(id, this.eventsTL[id], this.lang));
     }
     /** @deprecated use getNextEvents */
     get nextEvents() {
@@ -127,13 +131,11 @@ class GroupRepertory extends basic_1.default {
     getInstrument(id) {
         return this.instruments.find((i) => i.id === id);
     }
+    getEventsByOrder(order = 'desc') {
+        return orderBy_1.default(this.eventsList, (e) => e.datetime.toDate(), [order]);
+    }
     getNextEvents(endDay = false) {
-        return this.getEventsByOrder().filter((ev) => {
-            if (endDay) {
-                return isFuture_1.default(endOfDay_1.default(ev.datetime.toDate()));
-            }
-            return isFuture_1.default(ev.datetime.toDate());
-        });
+        return this.getEventsByOrder().filter((ev) => endDay ? isFuture_1.default(endOfDay_1.default(ev.datetime.toDate())) : isFuture_1.default(ev.datetime.toDate()));
     }
     getNextEvent(endDay = false) {
         const events = this.getNextEvents(endDay);
@@ -142,8 +144,5 @@ class GroupRepertory extends basic_1.default {
         }
         return events[events.length - 1];
     }
-    getEventsByOrder(order = 'desc') {
-        return orderBy_1.default(this.eventsList, (e) => e.datetime.toDate(), [order]);
-    }
 }
 exports.default = GroupRepertory;

package/package.json

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