@glissandoo/lib 1.115.0 → 1.117.0

package/models/User/index.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = require("lodash");
 const collections_1 = require("../../helpers/collections");
-const externalUrls_1 = require("../../helpers/externalUrls");
+const glissandooAdmin_1 = require("../../helpers/glissandooAdmin");
 const objects_1 = require("../../helpers/objects");
 const utils_1 = require("../../helpers/utils");
 const lang_1 = require("../../lang");
@@ -153,8 +153,8 @@ class User extends extended_1.default {
     get lastWebLoginAt() {
         return this.data.lastWebLoginAt || null;
     }
-    getGlissandooAdminUrl(adminHost) {
-        return (0, externalUrls_1.buildAdminEntityUrl)(adminHost, collections_1.CollectionNames.User, this.id);
+    get glissandooAdminUrl() {
+        return (0, glissandooAdmin_1.getGlissandooAdminEntityURL)(collections_1.CollectionNames.User, this.id);
     }
     get customerIds() {
         return this.data.customerIds || [];

package/models/User/types.d.ts

@@ -130,7 +130,6 @@ export interface UserRatingData {
     hasRatedApp: boolean;
     lastRatePromptAt: Timestamp | null;
 }
-export type UserId = string;
 export interface AUserBasicData extends UserBasicData {
-    id: UserId;
+    id: string;
 }

package/models/User/types.js

@@ -5,13 +5,13 @@ var UserRole;
 (function (UserRole) {
     UserRole["SuperAdmin"] = "admin";
     UserRole["User"] = "user";
-})(UserRole || (exports.UserRole = UserRole = {}));
+})(UserRole = exports.UserRole || (exports.UserRole = {}));
 var UserRegisterVia;
 (function (UserRegisterVia) {
     UserRegisterVia["Web"] = "web";
     UserRegisterVia["App"] = "app";
     UserRegisterVia["Invitation"] = "invitation";
-})(UserRegisterVia || (exports.UserRegisterVia = UserRegisterVia = {}));
+})(UserRegisterVia = exports.UserRegisterVia || (exports.UserRegisterVia = {}));
 var UserAppConfig;
 (function (UserAppConfig) {
     UserAppConfig["DefaultGroupId"] = "default_group_id";
@@ -24,7 +24,7 @@ var UserAppConfig;
     UserAppConfig["OffersFilterCountry"] = "offers_filter_country";
     UserAppConfig["OffersFilterInstrument"] = "offers_filter_instrument";
     UserAppConfig["OffersFilterMusicStyle"] = "offers_filter_music_style";
-})(UserAppConfig || (exports.UserAppConfig = UserAppConfig = {}));
+})(UserAppConfig = exports.UserAppConfig || (exports.UserAppConfig = {}));
 var UserDashboardConfig;
 (function (UserDashboardConfig) {
     UserDashboardConfig["DefaultGroupId"] = "default_group_id";
@@ -32,18 +32,18 @@ var UserDashboardConfig;
     UserDashboardConfig["RepertoireOrderBy"] = "repertoire_order_by";
     UserDashboardConfig["RepertoireOrderDirection"] = "repertoire_order_direction";
     UserDashboardConfig["EventsType"] = "events_type";
-})(UserDashboardConfig || (exports.UserDashboardConfig = UserDashboardConfig = {}));
+})(UserDashboardConfig = exports.UserDashboardConfig || (exports.UserDashboardConfig = {}));
 var UserNotificationSettings;
 (function (UserNotificationSettings) {
     UserNotificationSettings["AttendanceConfirmed"] = "enabled_attendance_confirmed";
     UserNotificationSettings["AttendanceDeclined"] = "enabled_attendance_declined";
     UserNotificationSettings["NewMembers"] = "enabled_new_members";
-})(UserNotificationSettings || (exports.UserNotificationSettings = UserNotificationSettings = {}));
+})(UserNotificationSettings = exports.UserNotificationSettings || (exports.UserNotificationSettings = {}));
 var UserEmailSettings;
 (function (UserEmailSettings) {
     UserEmailSettings["ReminderBiweeklyEvents"] = "enabled_reminder_biweekly_events";
     UserEmailSettings["Newsletter"] = "enabled_newsletter";
-})(UserEmailSettings || (exports.UserEmailSettings = UserEmailSettings = {}));
+})(UserEmailSettings = exports.UserEmailSettings || (exports.UserEmailSettings = {}));
 var UserEventsFilter;
 (function (UserEventsFilter) {
     UserEventsFilter[UserEventsFilter["Month"] = 1] = "Month";
@@ -51,4 +51,4 @@ var UserEventsFilter;
     UserEventsFilter[UserEventsFilter["SemiAnnual"] = 6] = "SemiAnnual";
     UserEventsFilter[UserEventsFilter["Annual"] = 12] = "Annual";
     UserEventsFilter[UserEventsFilter["Always"] = 1000] = "Always";
-})(UserEventsFilter || (exports.UserEventsFilter = UserEventsFilter = {}));
+})(UserEventsFilter = exports.UserEventsFilter || (exports.UserEventsFilter = {}));

package/models/WebhookEvent/types.js

@@ -6,4 +6,4 @@ var WebhookEventSource;
     WebhookEventSource["stripe"] = "stripe";
     WebhookEventSource["messageBird"] = "messageBird";
     WebhookEventSource["gocardless"] = "gocardless";
-})(WebhookEventSource || (exports.WebhookEventSource = WebhookEventSource = {}));
+})(WebhookEventSource = exports.WebhookEventSource || (exports.WebhookEventSource = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@glissandoo/lib",
-	"version": "1.115.0",
+	"version": "1.117.0",
 	"description": "Glissandoo library js",
 	"main": "./index.js",
 	"types": "./index.d.ts",
@@ -14,57 +14,49 @@
 		"lint:single": "eslint",
 		"lint": "eslint --ext .ts ./src",
 		"postversion": "git push && git push --tags",
-		"prepare": "npm run build:link",
+		"prepare": "rm -rf ./lib && npm run build:link",
 		"preversion": "npm run lint",
 		"publish:beta": "npm publish --tag beta",
 		"set-husky": "node scripts/setHusky.js",
-		"supabase:dev:env:update": "firebase --project=dev functions:secrets:set SUPABASE_ENV --data-file supabase/.env.dev",
-		"supabase:dev:env:download": "firebase --project=dev functions:secrets:access SUPABASE_ENV > supabase/.env.dev",
-		"supabase:prod:env:update": "firebase --project=production functions:secrets:set SUPABASE_ENV --data-file supabase/.env.prod",
-		"supabase:prod:env:download": "firebase --project=production functions:secrets:access SUPABASE_ENV > supabase/.env.prod",
+		"supabase:dev:env:update": "firebase --project=dev functions:secrets:set SUPABASE_ENV --data-file supabase/.dev.env",
+		"supabase:dev:env:download": "firebase --project=dev functions:secrets:access SUPABASE_ENV > supabase/.dev.env",
+		"supabase:prod:env:update": "firebase --project=production functions:secrets:set SUPABASE_ENV --data-file supabase/.prod.env",
+		"supabase:prod:env:download": "firebase --project=production functions:secrets:access SUPABASE_ENV > supabase/.prod.env",
 		"runtimeconfig:download": "firebase functions:secrets:access RUNTIMECONFIG > .runtimeconfig.json",
-		"supabase:local": "if [ -f supabase/.env.local ]; then export $(grep -v '^#' supabase/.env.local | xargs); fi; supabase",
-		"supabase:dev:link": "export $(grep -v '^#' supabase/.env.dev | xargs) && supabase link --project-ref=$SUPABASE_PROJECT_REF",
-		"supabase:prod:link": "export $(grep -v '^#' supabase/.env.prod | xargs) && supabase link --project-ref=$SUPABASE_PROJECT_REF",
-		"supabase:dev": "export $(grep -v '^#' supabase/.env.dev | xargs) && LINKED_REF=$(supabase projects list | grep '●' | awk -F '|' '{print $3}' | xargs) && [ \"$LINKED_REF\" != \"$SUPABASE_PROJECT_REF\" ] && npm run supabase:dev:link; supabase",
-		"supabase:prod": "export $(grep -v '^#' supabase/.env.prod | xargs) && LINKED_REF=$(supabase projects list | grep '●' | awk -F '|' '{print $3}' | xargs) && [ \"$LINKED_REF\" != \"$SUPABASE_PROJECT_REF\" ] && npm run supabase:prod:link; supabase",
-		"supabase:local:types": "npm run --silent supabase:local -- gen types typescript --local > src/types/supabase/generated.ts && prettier --write src/types/supabase/generated.ts",
+		"supabase:dev:link": "export $(grep -v '^#' supabase/.dev.env | xargs) && supabase link --project-ref=$SUPABASE_PROJECT_REF",
+		"supabase:prod:link": "export $(grep -v '^#' supabase/.prod.env | xargs) && supabase link --project-ref=$SUPABASE_PROJECT_REF",
+		"supabase:dev": "export $(grep -v '^#' supabase/.dev.env | xargs) && LINKED_REF=$(supabase projects list | grep '●' | awk -F '|' '{print $3}' | xargs) && [ \"$LINKED_REF\" != \"$SUPABASE_PROJECT_REF\" ] && npm run supabase:dev:link; supabase",
+		"supabase:prod": "export $(grep -v '^#' supabase/.prod.env | xargs) && LINKED_REF=$(supabase projects list | grep '●' | awk -F '|' '{print $3}' | xargs) && [ \"$LINKED_REF\" != \"$SUPABASE_PROJECT_REF\" ] && npm run supabase:prod:link; supabase",
+		"supabase:local:types": "supabase gen types typescript --local > src/types/supabase/generated.ts; prettier --write src/types/supabase/generated.ts",
 		"supabase:prod:types": "supabase gen types typescript --project-id fqqdedotyiuyetimcflq > src/types/supabase/generated.ts; prettier --write src/types/supabase/generated.ts",
-		"supabase:local:seed:autosave": "node scripts/autosave_local_db_seed.js",
-		"supabase:local:seed:edit": "npm run supabase:local -- start && npm run supabase:local -- db reset && LOCAL_STATE_SUPABASE_SEED=supabase/seed.edit.sql node scripts/autosave_local_db_seed.js",
-		"supabase:local:seed:save": "node scripts/save_local_db_seed.js",
 		"test": "echo \"Error: no test specified\" && exit 1",
 		"translation:download": "localazy download",
 		"translation:upload": "localazy upload",
-		"tsc": "find ./lib -mindepth 1 -delete 2>/dev/null; mkdir -p ./lib && cp package.json ./lib && tsc",
-		"version": "npm run format && git add -A src && ./publish.sh"
+		"tsc": "cp package.json ./lib && tsc"
 	},
 	"author": "Glissandoo",
 	"license": "ISC",
 	"dependencies": {
-		"@glissandoo/icons": "^1.9.5",
 		"date-fns": "^3.6.0",
 		"date-fns-tz": "^3.1.3",
 		"lodash": "^4.17.21",
-		"type-fest": "4.8.3"
+		"type-fest": "^4.8.3"
 	},
 	"devDependencies": {
-		"@eslint/js": "^9.36.0",
 		"@google-cloud/firestore": "^7.1.0",
 		"@localazy/cli": "^1.6.5",
 		"@types/lodash": "^4.14.168",
 		"@types/node": "^14.18.42",
+		"@typescript-eslint/eslint-plugin": "^5.48.0",
+		"@typescript-eslint/parser": "^5.48.0",
 		"dotenv-cli": "^8.0.0",
-		"eslint": "^9.36.0",
-		"eslint-config-prettier": "^10.1.8",
-		"globals": "^16.4.0",
+		"eslint": "^7.24.0",
+		"eslint-config-prettier": "^8.2.0",
 		"husky": "^8.0.1",
 		"lint-staged": "^12.4.1",
-		"prettier": "^3.6.2",
-		"supabase": "2.102.0",
-		"ts-node": "^10.9.2",
-		"typescript": "^5.9.3",
-		"typescript-eslint": "^8.45.0"
+		"prettier": "^2.2.1",
+		"supabase": "^2.104.0",
+		"typescript": "^4.9.4"
 	},
 	"lint-staged": {
 		"*.{ts,json}": "npm run format:single --"

package/types/firestore.d.ts

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/// <reference types="node" />
 /**
  * Document data (for use with `DocumentReference.set()`) consists of fields
  * mapped to values.

package/types/firestore.js

@@ -54,4 +54,4 @@ var GrpcStatus;
     GrpcStatus[GrpcStatus["UNAVAILABLE"] = 14] = "UNAVAILABLE";
     GrpcStatus[GrpcStatus["DATA_LOSS"] = 15] = "DATA_LOSS";
     GrpcStatus[GrpcStatus["UNAUTHENTICATED"] = 16] = "UNAUTHENTICATED";
-})(GrpcStatus || (exports.GrpcStatus = GrpcStatus = {}));
+})(GrpcStatus = exports.GrpcStatus || (exports.GrpcStatus = {}));

package/types/payoutRule.d.ts

@@ -0,0 +1,126 @@
+import { Timestamp } from '@google-cloud/firestore';
+/**
+ * Shared types for the payout rules engine.
+ * Rules live at two levels:
+ *  - Group level (templates, can be `pinned` to auto-apply to new events)
+ *  - Event level (snapshot copied from the group when payout is initialized)
+ */
+export declare enum PayoutRuleType {
+    EntityShare = "entityShare",
+    DefaultExpense = "defaultExpense",
+    PlayerMultiplier = "playerMultiplier",
+    PlayerBonus = "playerBonus",
+    PlayerFixed = "playerFixed",
+    PlayerExclude = "playerExclude"
+}
+export declare enum PayoutRuleConditionOperator {
+    Eq = "eq",
+    Neq = "neq",
+    Gt = "gt",
+    Gte = "gte",
+    Lt = "lt",
+    Lte = "lte",
+    In = "in",
+    Nin = "nin"
+}
+export type PayoutRuleConditionFieldKind = 'mainInstrument' | 'isGuest' | `custom.${string}`;
+export type PayoutRuleConditionValue = string | number | boolean | string[] | number[] | null;
+export interface PayoutRuleCondition {
+    field: PayoutRuleConditionFieldKind;
+    operator: PayoutRuleConditionOperator;
+    value: PayoutRuleConditionValue;
+}
+export declare enum PayoutRuleEntityShareMode {
+    Fixed = "fixed",
+    Percentage = "percentage"
+}
+export interface PayoutRuleEntityShareEffect {
+    mode: PayoutRuleEntityShareMode;
+    value: number;
+}
+export interface PayoutRuleDefaultExpenseEffect {
+    concept: string;
+    amount: number;
+    /**
+     * `null` = expense remains general (reduces the shared pot).
+     * Future: could materialize per-attendee expenses.
+     */
+    assignTo: null;
+}
+export interface PayoutRulePlayerMultiplierEffect {
+    multiplier: number;
+}
+export interface PayoutRulePlayerBonusEffect {
+    amount: number;
+}
+export interface PayoutRulePlayerFixedEffect {
+    amount: number;
+}
+export type PayoutRulePlayerExcludeEffect = Record<string, never>;
+export type PayoutRuleEffect = {
+    type: PayoutRuleType.EntityShare;
+    data: PayoutRuleEntityShareEffect;
+} | {
+    type: PayoutRuleType.DefaultExpense;
+    data: PayoutRuleDefaultExpenseEffect;
+} | {
+    type: PayoutRuleType.PlayerMultiplier;
+    data: PayoutRulePlayerMultiplierEffect;
+} | {
+    type: PayoutRuleType.PlayerBonus;
+    data: PayoutRulePlayerBonusEffect;
+} | {
+    type: PayoutRuleType.PlayerFixed;
+    data: PayoutRulePlayerFixedEffect;
+} | {
+    type: PayoutRuleType.PlayerExclude;
+    data: PayoutRulePlayerExcludeEffect;
+};
+/**
+ * Common shape stored in both group templates and event snapshots.
+ */
+export interface PayoutRuleBaseData {
+    name: string;
+    description: string | null;
+    order: number;
+    conditions: PayoutRuleCondition[];
+    effect: PayoutRuleEffect;
+    createdAt: Timestamp;
+    createdBy: string;
+    editedAt: Timestamp | null;
+    editedBy: string | null;
+}
+/**
+ * Helper used by the pure rules engine. Holds the minimal data
+ * required to evaluate conditions against a player.
+ */
+export interface PayoutRulePlayerInput {
+    id: string;
+    mainInstrument: string;
+    isGuest: boolean;
+    customFields: Record<string, string | number | boolean | null>;
+}
+export interface GroupPayoutRuleEntry {
+    id: string;
+    name: string;
+    order: number;
+    pinned: boolean;
+    conditions: PayoutRuleCondition[];
+    effect: PayoutRuleEffect;
+    createdAt: Timestamp;
+    createdBy: string;
+    editedAt: Timestamp | null;
+    editedBy: string | null;
+}
+export interface EventoPayoutRuleEntry {
+    id: string;
+    name: string;
+    order: number;
+    sourceGroupRuleId: string | null;
+    conditions: PayoutRuleCondition[];
+    effect: PayoutRuleEffect;
+    createdAt: Timestamp;
+    createdBy: string;
+    editedAt: Timestamp | null;
+    editedBy: string | null;
+}

package/types/payoutRule.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PayoutRuleEntityShareMode = exports.PayoutRuleConditionOperator = exports.PayoutRuleType = void 0;
+/**
+ * Shared types for the payout rules engine.
+ * Rules live at two levels:
+ *  - Group level (templates, can be `pinned` to auto-apply to new events)
+ *  - Event level (snapshot copied from the group when payout is initialized)
+ */
+var PayoutRuleType;
+(function (PayoutRuleType) {
+    PayoutRuleType["EntityShare"] = "entityShare";
+    PayoutRuleType["DefaultExpense"] = "defaultExpense";
+    PayoutRuleType["PlayerMultiplier"] = "playerMultiplier";
+    PayoutRuleType["PlayerBonus"] = "playerBonus";
+    PayoutRuleType["PlayerFixed"] = "playerFixed";
+    PayoutRuleType["PlayerExclude"] = "playerExclude";
+})(PayoutRuleType = exports.PayoutRuleType || (exports.PayoutRuleType = {}));
+var PayoutRuleConditionOperator;
+(function (PayoutRuleConditionOperator) {
+    PayoutRuleConditionOperator["Eq"] = "eq";
+    PayoutRuleConditionOperator["Neq"] = "neq";
+    PayoutRuleConditionOperator["Gt"] = "gt";
+    PayoutRuleConditionOperator["Gte"] = "gte";
+    PayoutRuleConditionOperator["Lt"] = "lt";
+    PayoutRuleConditionOperator["Lte"] = "lte";
+    PayoutRuleConditionOperator["In"] = "in";
+    PayoutRuleConditionOperator["Nin"] = "nin";
+})(PayoutRuleConditionOperator = exports.PayoutRuleConditionOperator || (exports.PayoutRuleConditionOperator = {}));
+var PayoutRuleEntityShareMode;
+(function (PayoutRuleEntityShareMode) {
+    PayoutRuleEntityShareMode["Fixed"] = "fixed";
+    PayoutRuleEntityShareMode["Percentage"] = "percentage";
+})(PayoutRuleEntityShareMode = exports.PayoutRuleEntityShareMode || (exports.PayoutRuleEntityShareMode = {}));

package/types/payoutRule.ts

@@ -0,0 +1,132 @@
+import { Timestamp } from '@google-cloud/firestore';
+
+/**
+ * Shared types for the payout rules engine.
+ * Rules live at two levels:
+ *  - Group level (templates, can be `pinned` to auto-apply to new events)
+ *  - Event level (snapshot copied from the group when payout is initialized)
+ */
+
+export enum PayoutRuleType {
+	EntityShare = 'entityShare',
+	DefaultExpense = 'defaultExpense',
+	PlayerMultiplier = 'playerMultiplier',
+	PlayerBonus = 'playerBonus',
+	PlayerFixed = 'playerFixed',
+	PlayerExclude = 'playerExclude',
+}
+
+export enum PayoutRuleConditionOperator {
+	Eq = 'eq',
+	Neq = 'neq',
+	Gt = 'gt',
+	Gte = 'gte',
+	Lt = 'lt',
+	Lte = 'lte',
+	In = 'in',
+	Nin = 'nin',
+}
+
+export type PayoutRuleConditionFieldKind = 'mainInstrument' | 'isGuest' | `custom.${string}`;
+
+export type PayoutRuleConditionValue = string | number | boolean | string[] | number[] | null;
+
+export interface PayoutRuleCondition {
+	field: PayoutRuleConditionFieldKind;
+	operator: PayoutRuleConditionOperator;
+	value: PayoutRuleConditionValue;
+}
+
+export enum PayoutRuleEntityShareMode {
+	Fixed = 'fixed',
+	Percentage = 'percentage',
+}
+
+export interface PayoutRuleEntityShareEffect {
+	mode: PayoutRuleEntityShareMode;
+	value: number;
+}
+
+export interface PayoutRuleDefaultExpenseEffect {
+	concept: string;
+	amount: number;
+	/**
+	 * `null` = expense remains general (reduces the shared pot).
+	 * Future: could materialize per-attendee expenses.
+	 */
+	assignTo: null;
+}
+
+export interface PayoutRulePlayerMultiplierEffect {
+	multiplier: number;
+}
+
+export interface PayoutRulePlayerBonusEffect {
+	amount: number;
+}
+
+export interface PayoutRulePlayerFixedEffect {
+	amount: number;
+}
+
+export type PayoutRulePlayerExcludeEffect = Record<string, never>;
+
+export type PayoutRuleEffect =
+	| { type: PayoutRuleType.EntityShare; data: PayoutRuleEntityShareEffect }
+	| { type: PayoutRuleType.DefaultExpense; data: PayoutRuleDefaultExpenseEffect }
+	| { type: PayoutRuleType.PlayerMultiplier; data: PayoutRulePlayerMultiplierEffect }
+	| { type: PayoutRuleType.PlayerBonus; data: PayoutRulePlayerBonusEffect }
+	| { type: PayoutRuleType.PlayerFixed; data: PayoutRulePlayerFixedEffect }
+	| { type: PayoutRuleType.PlayerExclude; data: PayoutRulePlayerExcludeEffect };
+
+/**
+ * Common shape stored in both group templates and event snapshots.
+ */
+export interface PayoutRuleBaseData {
+	name: string;
+	description: string | null;
+	order: number;
+	conditions: PayoutRuleCondition[];
+	effect: PayoutRuleEffect;
+	createdAt: Timestamp;
+	createdBy: string;
+	editedAt: Timestamp | null;
+	editedBy: string | null;
+}
+
+/**
+ * Helper used by the pure rules engine. Holds the minimal data
+ * required to evaluate conditions against a player.
+ */
+export interface PayoutRulePlayerInput {
+	id: string;
+	mainInstrument: string;
+	isGuest: boolean;
+	customFields: Record<string, string | number | boolean | null>;
+}
+
+export interface GroupPayoutRuleEntry {
+	id: string;
+	name: string;
+	order: number;
+	pinned: boolean;
+	conditions: PayoutRuleCondition[];
+	effect: PayoutRuleEffect;
+	createdAt: Timestamp;
+	createdBy: string;
+	editedAt: Timestamp | null;
+	editedBy: string | null;
+}
+
+export interface EventoPayoutRuleEntry {
+	id: string;
+	name: string;
+	order: number;
+	sourceGroupRuleId: string | null;
+	conditions: PayoutRuleCondition[];
+	effect: PayoutRuleEffect;
+	createdAt: Timestamp;
+	createdBy: string;
+	editedAt: Timestamp | null;
+	editedBy: string | null;
+}