@bash-app/bash-common 30.452.0 → 30.454.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.
|
@@ -34,5 +34,10 @@ export declare function countBashEventPendingTopLevelChanges(changes: DeepPartia
|
|
|
34
34
|
export declare const BASH_EVENT_HIGH_IMPACT_SAVE_KEYS: readonly ["startDateTime", "endDateTime", "timezone", "location", "street", "city", "state", "zipCode", "country", "coordinates", "capacity", "ticketTiers"];
|
|
35
35
|
export declare function bashEventPendingHasHighImpactChanges(changes: DeepPartial<BashEventExt>): boolean;
|
|
36
36
|
export declare function pendingEditLocalStorageKey(bashEventId: string, userId: string): string;
|
|
37
|
+
/** Compare persisted JSON and hydrated values without date-format or key-order noise. */
|
|
37
38
|
export declare function valuesEqualForPendingConflict(a: unknown, b: unknown): boolean;
|
|
39
|
+
/** Remove unchanged fields from a complete pending draft, retaining explicit clears. */
|
|
40
|
+
export declare function pruneBashEventPendingChanges(base: BashEventExt | Record<string, unknown>, changes: DeepPartial<BashEventExt>): DeepPartial<BashEventExt>;
|
|
41
|
+
/** High-impact Save confirm copy for published bash wizards. */
|
|
42
|
+
export declare function buildBashEventHighImpactConfirmMessage(committed: BashEventExt, pending: DeepPartial<BashEventExt>): string;
|
|
38
43
|
//# sourceMappingURL=bashEventWizardSave.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bashEventWizardSave.d.ts","sourceRoot":"","sources":["../src/bashEventWizardSave.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"bashEventWizardSave.d.ts","sourceRoot":"","sources":["../src/bashEventWizardSave.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,wEAAwE;AACxE,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,UAAU,GAAG,IAAI,GAAG,SAAS,GACpC,OAAO,CAGT;AAED,eAAO,MAAM,8BAA8B,QAA2B,CAAC;AAEvE,MAAM,MAAM,wBAAwB,GAAG;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,OAAO,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,oEAAoE;AACpE,MAAM,MAAM,yBAAyB,GAAG;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,8EAA8E;AAC9E,eAAO,MAAM,kCAAkC,QAAgB,CAAC;AAEhE,MAAM,MAAM,2BAA2B,GAAG;IACxC,OAAO,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC;IACnC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,YAAY,CAAC;CACzB,CAAC;AAEF,mFAAmF;AACnF,eAAO,MAAM,qCAAqC,oRAsBxC,CAAC;AAEX,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,YAAY,GACjB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAQzB;AAED,wBAAgB,oCAAoC,CAClD,OAAO,EAAE,WAAW,CAAC,YAAY,CAAC,GACjC,MAAM,CAGR;AAED,eAAO,MAAM,gCAAgC,8JAanC,CAAC;AAEX,wBAAgB,oCAAoC,CAClD,OAAO,EAAE,WAAW,CAAC,YAAY,CAAC,GACjC,OAAO,CAET;AAED,wBAAgB,0BAA0B,CACxC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,GACb,MAAM,CAER;AAED,yFAAyF;AACzF,wBAAgB,6BAA6B,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,OAAO,CAe7E;AAED,wFAAwF;AACxF,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5C,OAAO,EAAE,WAAW,CAAC,YAAY,CAAC,GACjC,WAAW,CAAC,YAAY,CAAC,CAc3B;AA8CD,gEAAgE;AAChE,wBAAgB,sCAAsC,CACpD,SAAS,EAAE,YAAY,EACvB,OAAO,EAAE,WAAW,CAAC,YAAY,CAAC,GACjC,MAAM,CA0BR"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { BashStatus } from "@prisma/client";
|
|
2
|
+
import { databaseAddressStringToDisplayString } from "./utils/addressUtils.js";
|
|
2
3
|
/** Drafts and ideas autosave; live bashes use explicit Save changes. */
|
|
3
4
|
export function bashEventWizardUsesExplicitSave(status) {
|
|
4
5
|
if (status == null)
|
|
@@ -65,16 +66,98 @@ export function bashEventPendingHasHighImpactChanges(changes) {
|
|
|
65
66
|
export function pendingEditLocalStorageKey(bashEventId, userId) {
|
|
66
67
|
return `bashPendingEdit:${bashEventId}:${userId}`;
|
|
67
68
|
}
|
|
69
|
+
/** Compare persisted JSON and hydrated values without date-format or key-order noise. */
|
|
68
70
|
export function valuesEqualForPendingConflict(a, b) {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
71
|
+
const canonical = (value) => {
|
|
72
|
+
if (value instanceof Date)
|
|
73
|
+
return value.toISOString();
|
|
74
|
+
if (typeof value === "string" && /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}/.test(value)) {
|
|
75
|
+
const millis = Date.parse(value);
|
|
76
|
+
if (Number.isFinite(millis))
|
|
77
|
+
return new Date(millis).toISOString();
|
|
78
|
+
}
|
|
79
|
+
if (Array.isArray(value))
|
|
80
|
+
return value.map(canonical);
|
|
81
|
+
if (value && typeof value === "object")
|
|
82
|
+
return Object.fromEntries(Object.entries(value).filter(([, item]) => item !== undefined).sort(([a], [b]) => a.localeCompare(b)).map(([key, item]) => [key, canonical(item)]));
|
|
83
|
+
return value ?? null;
|
|
84
|
+
};
|
|
73
85
|
try {
|
|
74
|
-
return JSON.stringify(a) === JSON.stringify(b);
|
|
86
|
+
return JSON.stringify(canonical(a)) === JSON.stringify(canonical(b));
|
|
75
87
|
}
|
|
76
88
|
catch {
|
|
77
|
-
return
|
|
89
|
+
return a === b;
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
/** Remove unchanged fields from a complete pending draft, retaining explicit clears. */
|
|
93
|
+
export function pruneBashEventPendingChanges(base, changes) {
|
|
94
|
+
const diff = (previous, incoming, top = false) => {
|
|
95
|
+
const result = {};
|
|
96
|
+
for (const [key, value] of Object.entries(incoming)) {
|
|
97
|
+
if ((top && (key === "id" || key === "creatorId")) || value === undefined)
|
|
98
|
+
continue;
|
|
99
|
+
const before = previous[key];
|
|
100
|
+
if (value && before && typeof value === "object" && typeof before === "object" && !Array.isArray(value) && !Array.isArray(before) && !(value instanceof Date) && !(before instanceof Date)) {
|
|
101
|
+
const nested = diff(before, value);
|
|
102
|
+
if (Object.keys(nested).length)
|
|
103
|
+
result[key] = nested;
|
|
104
|
+
}
|
|
105
|
+
else if (!valuesEqualForPendingConflict(before, value))
|
|
106
|
+
result[key] = value;
|
|
107
|
+
}
|
|
108
|
+
return result;
|
|
109
|
+
};
|
|
110
|
+
return diff(base, changes, true);
|
|
111
|
+
}
|
|
112
|
+
const BASH_EVENT_HIGH_IMPACT_FIELD_LABELS = {
|
|
113
|
+
startDateTime: "Start time",
|
|
114
|
+
endDateTime: "End time",
|
|
115
|
+
timezone: "Time zone",
|
|
116
|
+
location: "Location",
|
|
117
|
+
street: "Street",
|
|
118
|
+
city: "City",
|
|
119
|
+
state: "State",
|
|
120
|
+
zipCode: "ZIP code",
|
|
121
|
+
country: "Country",
|
|
122
|
+
coordinates: "Map pin",
|
|
123
|
+
capacity: "Capacity",
|
|
124
|
+
ticketTiers: "Ticket tiers",
|
|
125
|
+
};
|
|
126
|
+
function formatBashHighImpactFieldValue(key, value, committed) {
|
|
127
|
+
if (value == null)
|
|
128
|
+
return "—";
|
|
129
|
+
if (key === "startDateTime" || key === "endDateTime") {
|
|
130
|
+
const date = new Date(value);
|
|
131
|
+
if (Number.isFinite(date.getTime())) {
|
|
132
|
+
return date.toLocaleString(undefined, {
|
|
133
|
+
dateStyle: "medium",
|
|
134
|
+
timeStyle: "short",
|
|
135
|
+
timeZone: committed.timezone || undefined,
|
|
136
|
+
});
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
if (key === "location" && typeof value === "string") {
|
|
140
|
+
return databaseAddressStringToDisplayString(value);
|
|
78
141
|
}
|
|
142
|
+
if (key === "ticketTiers" && Array.isArray(value)) {
|
|
143
|
+
return `${value.length} tier${value.length === 1 ? "" : "s"}`;
|
|
144
|
+
}
|
|
145
|
+
if (typeof value === "object")
|
|
146
|
+
return "Updated";
|
|
147
|
+
return String(value);
|
|
148
|
+
}
|
|
149
|
+
/** High-impact Save confirm copy for published bash wizards. */
|
|
150
|
+
export function buildBashEventHighImpactConfirmMessage(committed, pending) {
|
|
151
|
+
const lines = BASH_EVENT_HIGH_IMPACT_SAVE_KEYS.filter((key) => key in pending &&
|
|
152
|
+
!valuesEqualForPendingConflict(Reflect.get(committed, key), Reflect.get(pending, key))).map((key) => {
|
|
153
|
+
const label = BASH_EVENT_HIGH_IMPACT_FIELD_LABELS[key];
|
|
154
|
+
const before = formatBashHighImpactFieldValue(key, Reflect.get(committed, key), committed);
|
|
155
|
+
const after = formatBashHighImpactFieldValue(key, Reflect.get(pending, key), committed);
|
|
156
|
+
return `${label}: ${before} → ${after}`;
|
|
157
|
+
});
|
|
158
|
+
return [
|
|
159
|
+
"These updates affect people who already have tickets.",
|
|
160
|
+
...lines,
|
|
161
|
+
].join("\n");
|
|
79
162
|
}
|
|
80
163
|
//# sourceMappingURL=bashEventWizardSave.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bashEventWizardSave.js","sourceRoot":"","sources":["../src/bashEventWizardSave.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"bashEventWizardSave.js","sourceRoot":"","sources":["../src/bashEventWizardSave.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { BashStatus } from "@prisma/client";
|
|
2
2
|
|
|
3
3
|
import type { BashEventExt } from "./extendedSchemas.js";
|
|
4
|
+
import { databaseAddressStringToDisplayString } from "./utils/addressUtils.js";
|
|
4
5
|
import type { DeepPartial } from "./utils/typeUtils.js";
|
|
5
6
|
|
|
6
7
|
/** Drafts and ideas autosave; live bashes use explicit Save changes. */
|
|
@@ -112,15 +113,116 @@ export function pendingEditLocalStorageKey(
|
|
|
112
113
|
return `bashPendingEdit:${bashEventId}:${userId}`;
|
|
113
114
|
}
|
|
114
115
|
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
)
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
return
|
|
116
|
+
/** Compare persisted JSON and hydrated values without date-format or key-order noise. */
|
|
117
|
+
export function valuesEqualForPendingConflict(a: unknown, b: unknown): boolean {
|
|
118
|
+
const canonical = (value: unknown): unknown => {
|
|
119
|
+
if (value instanceof Date) return value.toISOString();
|
|
120
|
+
if (typeof value === "string" && /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}/.test(value)) {
|
|
121
|
+
const millis = Date.parse(value);
|
|
122
|
+
if (Number.isFinite(millis)) return new Date(millis).toISOString();
|
|
123
|
+
}
|
|
124
|
+
if (Array.isArray(value)) return value.map(canonical);
|
|
125
|
+
if (value && typeof value === "object") return Object.fromEntries(
|
|
126
|
+
Object.entries(value).filter(([, item]) => item !== undefined).sort(([a], [b]) => a.localeCompare(b)).map(([key, item]) => [key, canonical(item)])
|
|
127
|
+
);
|
|
128
|
+
return value ?? null;
|
|
129
|
+
};
|
|
130
|
+
try { return JSON.stringify(canonical(a)) === JSON.stringify(canonical(b)); }
|
|
131
|
+
catch { return a === b; }
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
/** Remove unchanged fields from a complete pending draft, retaining explicit clears. */
|
|
135
|
+
export function pruneBashEventPendingChanges(
|
|
136
|
+
base: BashEventExt | Record<string, unknown>,
|
|
137
|
+
changes: DeepPartial<BashEventExt>
|
|
138
|
+
): DeepPartial<BashEventExt> {
|
|
139
|
+
const diff = (previous: Record<string, unknown>, incoming: Record<string, unknown>, top = false): Record<string, unknown> => {
|
|
140
|
+
const result: Record<string, unknown> = {};
|
|
141
|
+
for (const [key, value] of Object.entries(incoming)) {
|
|
142
|
+
if ((top && (key === "id" || key === "creatorId")) || value === undefined) continue;
|
|
143
|
+
const before = previous[key];
|
|
144
|
+
if (value && before && typeof value === "object" && typeof before === "object" && !Array.isArray(value) && !Array.isArray(before) && !(value instanceof Date) && !(before instanceof Date)) {
|
|
145
|
+
const nested = diff(before as Record<string, unknown>, value as Record<string, unknown>);
|
|
146
|
+
if (Object.keys(nested).length) result[key] = nested;
|
|
147
|
+
} else if (!valuesEqualForPendingConflict(before, value)) result[key] = value;
|
|
148
|
+
}
|
|
149
|
+
return result;
|
|
150
|
+
};
|
|
151
|
+
return diff(base as Record<string, unknown>, changes as Record<string, unknown>, true) as DeepPartial<BashEventExt>;
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
const BASH_EVENT_HIGH_IMPACT_FIELD_LABELS: Record<
|
|
155
|
+
(typeof BASH_EVENT_HIGH_IMPACT_SAVE_KEYS)[number],
|
|
156
|
+
string
|
|
157
|
+
> = {
|
|
158
|
+
startDateTime: "Start time",
|
|
159
|
+
endDateTime: "End time",
|
|
160
|
+
timezone: "Time zone",
|
|
161
|
+
location: "Location",
|
|
162
|
+
street: "Street",
|
|
163
|
+
city: "City",
|
|
164
|
+
state: "State",
|
|
165
|
+
zipCode: "ZIP code",
|
|
166
|
+
country: "Country",
|
|
167
|
+
coordinates: "Map pin",
|
|
168
|
+
capacity: "Capacity",
|
|
169
|
+
ticketTiers: "Ticket tiers",
|
|
170
|
+
};
|
|
171
|
+
|
|
172
|
+
function formatBashHighImpactFieldValue(
|
|
173
|
+
key: (typeof BASH_EVENT_HIGH_IMPACT_SAVE_KEYS)[number],
|
|
174
|
+
value: unknown,
|
|
175
|
+
committed: BashEventExt
|
|
176
|
+
): string {
|
|
177
|
+
if (value == null) return "—";
|
|
178
|
+
if (key === "startDateTime" || key === "endDateTime") {
|
|
179
|
+
const date = new Date(value as string | Date);
|
|
180
|
+
if (Number.isFinite(date.getTime())) {
|
|
181
|
+
return date.toLocaleString(undefined, {
|
|
182
|
+
dateStyle: "medium",
|
|
183
|
+
timeStyle: "short",
|
|
184
|
+
timeZone: committed.timezone || undefined,
|
|
185
|
+
});
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
if (key === "location" && typeof value === "string") {
|
|
189
|
+
return databaseAddressStringToDisplayString(value);
|
|
125
190
|
}
|
|
191
|
+
if (key === "ticketTiers" && Array.isArray(value)) {
|
|
192
|
+
return `${value.length} tier${value.length === 1 ? "" : "s"}`;
|
|
193
|
+
}
|
|
194
|
+
if (typeof value === "object") return "Updated";
|
|
195
|
+
return String(value);
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
/** High-impact Save confirm copy for published bash wizards. */
|
|
199
|
+
export function buildBashEventHighImpactConfirmMessage(
|
|
200
|
+
committed: BashEventExt,
|
|
201
|
+
pending: DeepPartial<BashEventExt>
|
|
202
|
+
): string {
|
|
203
|
+
const lines = BASH_EVENT_HIGH_IMPACT_SAVE_KEYS.filter(
|
|
204
|
+
(key) =>
|
|
205
|
+
key in pending &&
|
|
206
|
+
!valuesEqualForPendingConflict(
|
|
207
|
+
Reflect.get(committed, key),
|
|
208
|
+
Reflect.get(pending, key)
|
|
209
|
+
)
|
|
210
|
+
).map((key) => {
|
|
211
|
+
const label = BASH_EVENT_HIGH_IMPACT_FIELD_LABELS[key];
|
|
212
|
+
const before = formatBashHighImpactFieldValue(
|
|
213
|
+
key,
|
|
214
|
+
Reflect.get(committed, key),
|
|
215
|
+
committed
|
|
216
|
+
);
|
|
217
|
+
const after = formatBashHighImpactFieldValue(
|
|
218
|
+
key,
|
|
219
|
+
Reflect.get(pending, key),
|
|
220
|
+
committed
|
|
221
|
+
);
|
|
222
|
+
return `${label}: ${before} → ${after}`;
|
|
223
|
+
});
|
|
224
|
+
return [
|
|
225
|
+
"These updates affect people who already have tickets.",
|
|
226
|
+
...lines,
|
|
227
|
+
].join("\n");
|
|
126
228
|
}
|