@baasix/baasix 0.1.15 → 0.1.17

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.
@@ -25,9 +25,6 @@ declare class MailService {
25
25
  } | null>;
26
26
  /**
27
27
  * Wrap body content in a minimal HTML document structure if it's not already a complete document.
28
- * Also inlines CSS for Gmail compatibility using juice.
29
- *
30
- * Gmail strips <style> tags, so we must inline all CSS onto elements.
31
28
  */
32
29
  private wrapInHtmlDocument;
33
30
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"MailService.d.ts","sourceRoot":"","sources":["../../baasix/services/MailService.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAgB,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAGtF,cAAM,WAAW;IACf,OAAO,CAAC,OAAO,CAAoC;IACnD,OAAO,CAAC,kBAAkB,CAAsD;IAChF,OAAO,CAAC,aAAa,CAAuB;IAC5C,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,qBAAqB,CAAc;IAC3C,OAAO,CAAC,yBAAyB,CAAS;IAC1C,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,WAAW,CAAkB;;IAY/B,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA0BjC,iBAAiB,IAAI,MAAM,EAAE;IAevB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BrD,yBAAyB,IAAI,IAAI;IAUjC,QAAQ,IAAI,IAAI;IAehB;;OAEG;IACG,iBAAiB,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAqD5H;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IAiG1B;;OAEG;IACH,OAAO,CAAC,UAAU;IASlB;;;;;;OAMG;IACG,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IA0ChJ,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IASzF;;;OAGG;IACH,yBAAyB,CAAC,YAAY,EAAE,MAAM,GAAG;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAyG9G;;OAEG;IACH,uBAAuB,IAAI,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAqD3G;;OAEG;IACH,kBAAkB,IAAI,MAAM,EAAE;IAW9B;;OAEG;IACG,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IA0CxF;;OAEG;IACH,2BAA2B,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAWvD,QAAQ,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC;IAqIlD;;OAEG;IACH,OAAO,CAAC,QAAQ;CA+BjB;AAGD,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,oBAAoB,EAAE,WAAW,GAAG,SAAS,CAAC;CACnD;AAOD,QAAA,MAAM,WAAW,aAAkC,CAAC;AAEpD,eAAe,WAAW,CAAC"}
1
+ {"version":3,"file":"MailService.d.ts","sourceRoot":"","sources":["../../baasix/services/MailService.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAgB,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAGtF,cAAM,WAAW;IACf,OAAO,CAAC,OAAO,CAAoC;IACnD,OAAO,CAAC,kBAAkB,CAAsD;IAChF,OAAO,CAAC,aAAa,CAAuB;IAC5C,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,qBAAqB,CAAc;IAC3C,OAAO,CAAC,yBAAyB,CAAS;IAC1C,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,WAAW,CAAkB;;IAY/B,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA0BjC,iBAAiB,IAAI,MAAM,EAAE;IAevB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BrD,yBAAyB,IAAI,IAAI;IAUjC,QAAQ,IAAI,IAAI;IAehB;;OAEG;IACG,iBAAiB,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAqD5H;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAkD1B;;OAEG;IACH,OAAO,CAAC,UAAU;IASlB;;;;;;OAMG;IACG,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IA0ChJ,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IASzF;;;OAGG;IACH,yBAAyB,CAAC,YAAY,EAAE,MAAM,GAAG;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAyG9G;;OAEG;IACH,uBAAuB,IAAI,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAqD3G;;OAEG;IACH,kBAAkB,IAAI,MAAM,EAAE;IAW9B;;OAEG;IACG,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IA0CxF;;OAEG;IACH,2BAA2B,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAWvD,QAAQ,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC;IAqIlD;;OAEG;IACH,OAAO,CAAC,QAAQ;CA+BjB;AAGD,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,oBAAoB,EAAE,WAAW,GAAG,SAAS,CAAC;CACnD;AAOD,QAAA,MAAM,WAAW,aAAkC,CAAC;AAEpD,eAAe,WAAW,CAAC"}
@@ -2,7 +2,6 @@ import env from "../utils/env.js";
2
2
  import nodemailer from "nodemailer";
3
3
  import { Liquid } from "liquidjs";
4
4
  import fs from "fs";
5
- import juice from "juice";
6
5
  import settingsService from "./SettingsService.js";
7
6
  import { getBaasixPath, getProjectPath } from "../utils/dirname.js";
8
7
  class MailService {
@@ -158,31 +157,26 @@ class MailService {
158
157
  }
159
158
  /**
160
159
  * Wrap body content in a minimal HTML document structure if it's not already a complete document.
161
- * Also inlines CSS for Gmail compatibility using juice.
162
- *
163
- * Gmail strips <style> tags, so we must inline all CSS onto elements.
164
160
  */
165
161
  wrapInHtmlDocument(body, subject) {
166
162
  const trimmedBody = body.trim();
167
163
  // Check if already a complete HTML document
168
164
  const hasDoctype = trimmedBody.toLowerCase().startsWith('<!doctype');
169
165
  const hasHtmlTag = /<html[\s>]/i.test(trimmedBody);
170
- let fullHtml;
171
166
  if (hasDoctype || hasHtmlTag) {
172
- // Already a complete document, just inline the CSS
173
- fullHtml = body;
167
+ // Already a complete document
168
+ return body;
174
169
  }
175
- else {
176
- // Extract <style> tags to put in <head>
177
- const styleRegex = /<style[^>]*>[\s\S]*?<\/style>/gi;
178
- const styleMatches = trimmedBody.match(styleRegex) || [];
179
- const stylesForHead = styleMatches.join('\n');
180
- const contentWithoutStyles = trimmedBody.replace(styleRegex, '').trim();
181
- // Check if content has <body> tag anywhere
182
- const hasBodyTag = /<body[\s>]/i.test(contentWithoutStyles);
183
- if (hasBodyTag) {
184
- // Has body tag - wrap with html structure, put styles in head
185
- fullHtml = `<!DOCTYPE html>
170
+ // Extract <style> tags to put in <head>
171
+ const styleRegex = /<style[^>]*>[\s\S]*?<\/style>/gi;
172
+ const styleMatches = trimmedBody.match(styleRegex) || [];
173
+ const stylesForHead = styleMatches.join('\n');
174
+ const contentWithoutStyles = trimmedBody.replace(styleRegex, '').trim();
175
+ // Check if content has <body> tag anywhere
176
+ const hasBodyTag = /<body[\s>]/i.test(contentWithoutStyles);
177
+ if (hasBodyTag) {
178
+ // Has body tag - wrap with html structure, put styles in head
179
+ return `<!DOCTYPE html>
186
180
  <html>
187
181
  <head>
188
182
  <meta charset="utf-8">
@@ -192,10 +186,9 @@ class MailService {
192
186
  </head>
193
187
  ${contentWithoutStyles}
194
188
  </html>`;
195
- }
196
- else {
197
- // No body tag - wrap content in body, put styles in head
198
- fullHtml = `<!DOCTYPE html>
189
+ }
190
+ // No body tag - wrap content in body, put styles in head
191
+ return `<!DOCTYPE html>
199
192
  <html>
200
193
  <head>
201
194
  <meta charset="utf-8">
@@ -207,52 +200,6 @@ ${contentWithoutStyles}
207
200
  ${contentWithoutStyles}
208
201
  </body>
209
202
  </html>`;
210
- }
211
- }
212
- // Use juice to inline CSS for Gmail compatibility
213
- // This converts <style> rules to inline style attributes
214
- try {
215
- // Sanitize HTML/CSS - fix problematic patterns that juice can't handle
216
- let sanitizedHtml = fullHtml
217
- // Fix GrapesJS malformed style pattern: style="text-align:" center";" -> style="text-align: center;"
218
- // This handles the specific pattern where quotes are broken around the value
219
- .replace(/style="([^":]*):\s*"\s*([^"]+)\s*";\s*"/gi, 'style="$1: $2;"')
220
- // Fix another variant: style="property:" value";"" (double ending quotes)
221
- .replace(/style="([^":]*):\s*"\s*([^"]+)\s*";"\s*"/gi, 'style="$1: $2;"')
222
- // Generic fix for any remaining broken style quotes - multiple quote issues
223
- .replace(/style="([^"]*)"([^"]*)"([^"]*)"/gi, (match, p1, p2, p3) => {
224
- // Reconstruct: remove the middle quotes
225
- return `style="${p1}${p2}${p3}"`;
226
- })
227
- // Remove CSS comments that might cause issues
228
- .replace(/\/\*[\s\S]*?\*\//g, '')
229
- // Remove @charset declarations
230
- .replace(/@charset[^;]+;/gi, '')
231
- // Remove @import declarations (not supported in email anyway)
232
- .replace(/@import[^;]+;/gi, '')
233
- // Remove empty style declarations like "property: ;"
234
- .replace(/[a-z-]+\s*:\s*;/gi, '')
235
- // Remove empty rule blocks
236
- .replace(/[^{}]+\{\s*\}/g, '')
237
- // Fix double semicolons
238
- .replace(/;;+/g, ';')
239
- // Move misplaced <style> tags that are between </head> and <body> into the head
240
- .replace(/<\/head>\s*(<style[^>]*>[\s\S]*?<\/style>)\s*<body/gi, '$1</head><body');
241
- return juice(sanitizedHtml, {
242
- preserveImportant: true,
243
- preserveMediaQueries: true,
244
- preserveFontFaces: true,
245
- applyStyleTags: true,
246
- removeStyleTags: false, // Keep style tags for clients that support them
247
- insertPreservedExtraCss: true,
248
- extraCss: '', // Ensure no extra CSS that could cause issues
249
- });
250
- }
251
- catch (error) {
252
- console.warn('Warning: Could not inline CSS with juice, email may not display correctly in Gmail:', error.message);
253
- // Return without inlining - still functional, just won't work in Gmail
254
- return fullHtml;
255
- }
256
203
  }
257
204
  /**
258
205
  * Escape HTML special characters for safe insertion into HTML attributes/content
@@ -1 +1 @@
1
- {"version":3,"file":"MailService.js","sourceRoot":"","sources":["../../baasix/services/MailService.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,iBAAiB,CAAC;AAClC,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,eAAe,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEpE,MAAM,WAAW;IACP,OAAO,GAAiC,EAAE,CAAC;IAC3C,kBAAkB,GAA4C,IAAI,GAAG,EAAE,CAAC;IACxE,aAAa,GAAkB,IAAI,CAAC;IACpC,MAAM,CAAS;IACf,qBAAqB,GAAW,EAAE,CAAC;IACnC,yBAAyB,CAAS;IAClC,eAAe,CAAS;IACxB,cAAc,CAAS;IACvB,WAAW,GAAkB,IAAI,CAAC;IAClC,WAAW,GAAY,KAAK,CAAC;IAErC;QACE,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QAC3B,+CAA+C;QAC/C,IAAI,CAAC,yBAAyB,GAAG,aAAa,CAAC,gCAAgC,CAAC,CAAC;QACjF,IAAI,CAAC,eAAe,GAAG,aAAa,CAAC,yBAAyB,CAAC,CAAC;QAChE,0CAA0C;QAC1C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC,2CAA2C,CAAC,CAAC;QAClF,8EAA8E;IAChF,CAAC;IAED,KAAK,CAAC,UAAU;QACd,gCAAgC;QAChC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAEhD,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChC,OAAO,CAAC,IAAI,CAAC,gFAAgF,CAAC,CAAC;YAC/F,OAAO;QACT,CAAC;QAED,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE,CAAC;YACpC,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC;QAED,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC,GAAG,CAAC,qBAAqB,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC;QAEzE,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACjC,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChB,OAAO,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;QACrD,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QACpD,OAAO,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;IACjD,CAAC;IAED,iBAAiB;QACf,MAAM,oBAAoB,GAAG,GAAG,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;QAE7D,OAAO,CAAC,IAAI,CAAC,kBAAkB,EAAE,oBAAoB,CAAC,CAAC;QAEvD,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC1B,OAAO,CAAC,IAAI,CAAC,mEAAmE,CAAC,CAAC;YAClF,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO,oBAAoB;aACxB,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aACpB,MAAM,CAAC,OAAO,CAAC,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,MAAc;QACnC,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;QACzC,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,WAAW,YAAY,CAAC,CAAC;QACjD,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,WAAW,YAAY,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,WAAW,cAAc,CAAC,KAAK,MAAM,CAAC;QAChE,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,WAAW,YAAY,CAAC,CAAC;QACjD,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,WAAW,YAAY,CAAC,CAAC;QACjD,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,WAAW,eAAe,CAAC,CAAC;QAEpD,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAC9C,OAAO,CAAC,IAAI,CAAC,uCAAuC,MAAM,aAAa,CAAC,CAAC;YACzE,OAAO;QACT,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG;YACrB,WAAW,EAAE,UAAU,CAAC,eAAe,CAAC;gBACtC,IAAI;gBACJ,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC;gBACpB,MAAM;gBACN,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;aACrB,CAAC;YACF,IAAI;SACL,CAAC;QAEF,OAAO,CAAC,IAAI,CAAC,4BAA4B,MAAM,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,yBAAyB;QACvB,IAAI,CAAC;YACH,IAAI,CAAC,qBAAqB,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,yBAAyB,EAAE,MAAM,CAAC,CAAC;YACrF,OAAO,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC;QAC7D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAAC;YAC/D,IAAI,CAAC,qBAAqB,GAAG,uCAAuC,CAAC,CAAC,oBAAoB;QAC5F,CAAC;IACH,CAAC;IAED,QAAQ;QACN,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC;YACjG,MAAM,UAAU,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAC7C,+DAA+D;YAC/D,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC7C,IAAI,CAAC,WAAW,GAAG,yBAAyB,MAAM,EAAE,CAAC;YAErD,OAAO,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;QACvD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;YAC5C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QAC1B,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,iBAAiB,CAAC,YAAoB,EAAE,QAA0B;QACtE,IAAI,CAAC;YACH,+DAA+D;YAC/D,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC;YACpE,MAAM,eAAe,GAAG,IAAI,YAAY,CAAC,iBAAiB,EAAE;gBAC1D,cAAc,EAAE,SAAS,EAAE,uCAAuC;aACnE,CAAC,CAAC;YAEH,4CAA4C;YAC5C,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,WAAW,CAAC;oBACrD,MAAM,EAAE;wBACN,IAAI,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE;wBAC1B,SAAS,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE;wBAC3B,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;qBACvB;oBACD,KAAK,EAAE,CAAC;iBACT,EAAE,IAAI,CAAC,CAAC,CAAC,2BAA2B;gBAErC,MAAM,eAAe,GAAG,YAAY,CAAC,IAAI,IAAI,EAAE,CAAC;gBAChD,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC/B,OAAO;wBACL,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO;wBACnC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI;qBAC9B,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,oDAAoD;YACpD,MAAM,aAAa,GAAG,MAAM,eAAe,CAAC,WAAW,CAAC;gBACtD,MAAM,EAAE;oBACN,IAAI,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE;oBAC1B,SAAS,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;oBAC3B,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;iBACvB;gBACD,KAAK,EAAE,CAAC;aACT,EAAE,IAAI,CAAC,CAAC,CAAC,2BAA2B;YAErC,MAAM,gBAAgB,GAAG,aAAa,CAAC,IAAI,IAAI,EAAE,CAAC;YAClD,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAChC,OAAO;oBACL,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,OAAO;oBACpC,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI;iBAC/B,CAAC;YACJ,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,0CAA0C,YAAY,EAAE,EAAE,KAAK,CAAC,CAAC;YAC/E,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACK,kBAAkB,CAAC,IAAY,EAAE,OAAe;QACtD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAEhC,4CAA4C;QAC5C,MAAM,UAAU,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QACrE,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEnD,IAAI,QAAgB,CAAC;QAErB,IAAI,UAAU,IAAI,UAAU,EAAE,CAAC;YAC7B,mDAAmD;YACnD,QAAQ,GAAG,IAAI,CAAC;QAClB,CAAC;aAAM,CAAC;YACN,wCAAwC;YACxC,MAAM,UAAU,GAAG,iCAAiC,CAAC;YACrD,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;YACzD,MAAM,aAAa,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9C,MAAM,oBAAoB,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YAExE,2CAA2C;YAC3C,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YAE5D,IAAI,UAAU,EAAE,CAAC;gBACf,8DAA8D;gBAC9D,QAAQ,GAAG;;;;;aAKN,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;MAC/B,aAAa;;EAEjB,oBAAoB;QACd,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,yDAAyD;gBACzD,QAAQ,GAAG;;;;;aAKN,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;MAC/B,aAAa;;;EAGjB,oBAAoB;;QAEd,CAAC;YACH,CAAC;QACH,CAAC;QAED,kDAAkD;QAClD,yDAAyD;QACzD,IAAI,CAAC;YACH,uEAAuE;YACvE,IAAI,aAAa,GAAG,QAAQ;gBAC1B,qGAAqG;gBACrG,6EAA6E;iBAC5E,OAAO,CAAC,2CAA2C,EAAE,iBAAiB,CAAC;gBACxE,0EAA0E;iBACzE,OAAO,CAAC,4CAA4C,EAAE,iBAAiB,CAAC;gBACzE,4EAA4E;iBAC3E,OAAO,CAAC,mCAAmC,EAAE,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE;gBAClE,wCAAwC;gBACxC,OAAO,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;YACnC,CAAC,CAAC;gBACF,8CAA8C;iBAC7C,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC;gBACjC,+BAA+B;iBAC9B,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC;gBAChC,8DAA8D;iBAC7D,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC;gBAC/B,qDAAqD;iBACpD,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC;gBACjC,2BAA2B;iBAC1B,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC;gBAC9B,wBAAwB;iBACvB,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;gBACrB,gFAAgF;iBAC/E,OAAO,CAAC,sDAAsD,EAAE,gBAAgB,CAAC,CAAC;YAErF,OAAO,KAAK,CAAC,aAAa,EAAE;gBAC1B,iBAAiB,EAAE,IAAI;gBACvB,oBAAoB,EAAE,IAAI;gBAC1B,iBAAiB,EAAE,IAAI;gBACvB,cAAc,EAAE,IAAI;gBACpB,eAAe,EAAE,KAAK,EAAE,gDAAgD;gBACxE,uBAAuB,EAAE,IAAI;gBAC7B,QAAQ,EAAE,EAAE,EAAE,8CAA8C;aAC7D,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CAAC,qFAAqF,EAAG,KAAe,CAAC,OAAO,CAAC,CAAC;YAC9H,uEAAuE;YACvE,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC;IAED;;OAEG;IACK,UAAU,CAAC,IAAY;QAC7B,OAAO,IAAI;aACR,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;aACtB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;aACrB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;aACrB,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC;aACvB,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC7B,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,oBAAoB,CAAC,YAAoB,EAAE,OAA4B,EAAE,QAA0B;QACvG,0CAA0C;QAC1C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAExE,IAAI,UAAU,EAAE,CAAC;YACf,2CAA2C;YAC3C,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACtF,uEAAuE;YACvE,4EAA4E;YAC5E,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAChF,kEAAkE;YAClE,MAAM,IAAI,GAAG,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;YAEpE,OAAO;gBACL,OAAO,EAAE,eAAe;gBACxB,IAAI;aACL,CAAC;QACJ,CAAC;QAED,2CAA2C;QAC3C,MAAM,eAAe,GAAG,IAAI,CAAC,yBAAyB,CAAC,YAAY,CAAC,CAAC;QACrE,IAAI,eAAe,EAAE,CAAC;YACpB,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC3F,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACrF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC;YAEjH,OAAO;gBACL,OAAO,EAAE,eAAe;gBACxB,IAAI;aACL,CAAC;QACJ,CAAC;QAED,uBAAuB;QACvB,OAAO,CAAC,IAAI,CAAC,0BAA0B,YAAY,wBAAwB,CAAC,CAAC;QAC7E,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC,CAAC;QAE1H,OAAO;YACL,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,EAAE;YAC9B,IAAI;SACL,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,YAAoB,EAAE,OAA4B;QACrE,MAAM,eAAe,GAAG,IAAI,CAAC,yBAAyB,CAAC,YAAY,CAAC,CAAC;QACrE,IAAI,eAAe,EAAE,CAAC;YACpB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACrF,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC;QACvG,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;IACzE,CAAC;IAED;;;OAGG;IACH,yBAAyB,CAAC,YAAoB;QAC5C,MAAM,gBAAgB,GAA2E;YAC/F,aAAa,EAAE;gBACb,OAAO,EAAE,0CAA0C;gBACnD,IAAI,EAAE;;;;;;;;+EAQiE;gBACvE,WAAW,EAAE,gEAAgE;aAC9E;YACD,kBAAkB,EAAE;gBAClB,OAAO,EAAE,0CAA0C;gBACnD,IAAI,EAAE;;;;;;;;+EAQiE;gBACvE,WAAW,EAAE,sDAAsD;aACpE;YACD,YAAY,EAAE;gBACZ,OAAO,EAAE,+BAA+B;gBACxC,IAAI,EAAE;;;;;;;kFAOoE;gBAC1E,WAAW,EAAE,4CAA4C;aAC1D;YACD,aAAa,EAAE;gBACb,OAAO,EAAE,0CAA0C;gBACnD,IAAI,EAAE;;;;;;;0EAO4D;gBAClE,WAAW,EAAE,6CAA6C;aAC3D;YACD,aAAa,EAAE;gBACb,OAAO,EAAE,4CAA4C;gBACrD,IAAI,EAAE;;;;;;;sHAOwG;gBAC9G,WAAW,EAAE,oCAAoC;aAClD;YACD,iBAAiB,EAAE;gBACjB,OAAO,EAAE,0CAA0C;gBACnD,IAAI,EAAE;;;;;;;0EAO4D;gBAClE,WAAW,EAAE,iCAAiC;aAC/C;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,gCAAgC;gBACzC,IAAI,EAAE;;;;;;;8EAOgE;gBACtE,WAAW,EAAE,0CAA0C;aACxD;YACD,YAAY,EAAE;gBACZ,OAAO,EAAE,0BAA0B;gBACnC,IAAI,EAAE;;;;;;;YAOF;gBACJ,WAAW,EAAE,+BAA+B;aAC7C;SACF,CAAC;QAEF,OAAO,gBAAgB,CAAC,YAAY,CAAC,IAAI,IAAI,CAAC;IAChD,CAAC;IAED;;OAEG;IACH,uBAAuB;QACrB,OAAO;YACL;gBACE,IAAI,EAAE,eAAe;gBACrB,KAAK,EAAE,iBAAiB;gBACxB,WAAW,EAAE,gEAAgE;gBAC7E,SAAS,EAAE,CAAC,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,gBAAgB,CAAC;aACrE;YACD;gBACE,IAAI,EAAE,oBAAoB;gBAC1B,KAAK,EAAE,sBAAsB;gBAC7B,WAAW,EAAE,sDAAsD;gBACnE,SAAS,EAAE,CAAC,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,gBAAgB,CAAC;aACrE;YACD;gBACE,IAAI,EAAE,cAAc;gBACpB,KAAK,EAAE,kBAAkB;gBACzB,WAAW,EAAE,4CAA4C;gBACzD,SAAS,EAAE,CAAC,MAAM,EAAE,cAAc,EAAE,cAAc,CAAC;aACpD;YACD;gBACE,IAAI,EAAE,eAAe;gBACrB,KAAK,EAAE,mBAAmB;gBAC1B,WAAW,EAAE,6CAA6C;gBAC1D,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,CAAC;aAC5C;YACD;gBACE,IAAI,EAAE,eAAe;gBACrB,KAAK,EAAE,gBAAgB;gBACvB,WAAW,EAAE,oCAAoC;gBACjD,SAAS,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,cAAc,CAAC;aAC7D;YACD;gBACE,IAAI,EAAE,mBAAmB;gBACzB,KAAK,EAAE,oBAAoB;gBAC3B,WAAW,EAAE,iCAAiC;gBAC9C,SAAS,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,cAAc,CAAC;aACjD;YACD;gBACE,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,eAAe;gBACtB,WAAW,EAAE,0CAA0C;gBACvD,SAAS,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,cAAc,CAAC;aAChD;YACD;gBACE,IAAI,EAAE,cAAc;gBACpB,KAAK,EAAE,cAAc;gBACrB,WAAW,EAAE,+BAA+B;gBAC5C,SAAS,EAAE,CAAC,MAAM,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,YAAY,EAAE,aAAa,CAAC;aAC/F;SACF,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,kBAAkB;QAChB,OAAO;YACL,cAAc;YACd,eAAe;YACf,aAAa;YACb,SAAS;YACT,iBAAiB;YACjB,UAAU;SACX,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,oBAAoB,CAAC,QAAyB;QAClD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,IAAI,CAAC;QACd,CAAC;QAED,oBAAoB;QACpB,IAAI,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1C,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAC;QAChD,CAAC;QAED,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;YAEvE,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,8CAA8C;gBAC9C,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,WAAW,GAAG,UAAU,CAAC,eAAe,CAAC;gBAC7C,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,MAAM,EAAE,UAAU,CAAC,MAAM;gBACzB,IAAI,EAAE,UAAU,CAAC,IAAI;aACtB,CAAC,CAAC;YAEH,MAAM,iBAAiB,GAAsB;gBAC3C,WAAW;gBACX,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,QAAQ,EAAE,UAAU,CAAC,QAAQ;aAC9B,CAAC;YAEF,wBAAwB;YACxB,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;YAEzD,OAAO,CAAC,IAAI,CAAC,mDAAmD,QAAQ,EAAE,CAAC,CAAC;YAC5E,OAAO,iBAAiB,CAAC;QAC3B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,yCAAyC,QAAQ,GAAG,EAAE,KAAK,CAAC,CAAC;YAC3E,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED;;OAEG;IACH,2BAA2B,CAAC,QAA0B;QACpD,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACzC,OAAO,CAAC,IAAI,CAAC,6CAA6C,QAAQ,EAAE,CAAC,CAAC;QACxE,CAAC;aAAM,CAAC;YACN,gCAAgC;YAChC,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC;YAChC,OAAO,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAoB;QACjC,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAEjH,IAAI,WAAW,GAAkC,IAAI,CAAC;QACtD,IAAI,WAAW,GAAW,EAAE,CAAC;QAC7B,IAAI,WAAW,GAAW,EAAE,CAAC;QAE7B,+CAA+C;QAC/C,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;YACpE,IAAI,iBAAiB,EAAE,CAAC;gBACtB,WAAW,GAAG,iBAAiB,CAAC,WAAW,CAAC;gBAC5C,WAAW,GAAG,iBAAiB,CAAC,IAAI,CAAC;gBACrC,WAAW,GAAG,UAAU,QAAQ,EAAE,CAAC;gBACnC,OAAO,CAAC,IAAI,CAAC,0CAA0C,QAAQ,EAAE,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;QAED,2DAA2D;QAC3D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBACrC,MAAM,IAAI,KAAK,CAAC,gBAAgB,MAAM,mBAAmB,CAAC,CAAC;YAC7D,CAAC;YACD,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC1C,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC;YACvC,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC;YAChC,WAAW,GAAG,MAAM,CAAC;QACvB,CAAC;QAED,IAAI,CAAC;YACH,MAAM,aAAa,GAAwB,EAAE,CAAC;YAC9C,IAAI,iBAAiB,GAAG,KAAK,CAAC;YAE9B,uDAAuD;YACvD,IAAI,QAAQ,EAAE,CAAC;gBACb,IAAI,CAAC;oBACH,MAAM,cAAc,GAAG,MAAM,eAAe,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;oBAE9E,aAAa,CAAC,eAAe,GAAG,cAAc,CAAC,eAAe,CAAC;oBAC/D,aAAa,CAAC,YAAY,GAAG,cAAc,CAAC,YAAY,CAAC;oBACzD,aAAa,CAAC,aAAa,GAAG,cAAc,CAAC,aAAa,CAAC;oBAC3D,aAAa,CAAC,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC;oBAC/C,aAAa,CAAC,WAAW,GAAG,cAAc,CAAC,WAAW,CAAC;oBAEvD,IAAI,cAAc,CAAC,QAAQ,EAAE,CAAC;wBAC5B,aAAa,CAAC,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAC;oBACnD,CAAC;yBAAM,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;wBAC5B,aAAa,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC;oBAC5C,CAAC;oBACD,iBAAiB,GAAG,IAAI,CAAC;gBAC3B,CAAC;gBAAC,OAAO,KAAU,EAAE,CAAC;oBACpB,OAAO,CAAC,IAAI,CAAC,qCAAqC,QAAQ,oCAAoC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;gBACjH,CAAC;YACH,CAAC;YAED,mDAAmD;YACnD,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACvB,MAAM,QAAQ,GAAG,eAAe,CAAC,WAAW,EAAE,CAAC;gBAC/C,IAAI,QAAQ,EAAE,eAAe,EAAE,CAAC;oBAC9B,aAAa,CAAC,eAAe,GAAG,QAAQ,CAAC,eAAe,CAAC;gBAC3D,CAAC;gBAED,IAAI,QAAQ,EAAE,YAAY,EAAE,CAAC;oBAC3B,aAAa,CAAC,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;gBACrD,CAAC;gBAED,IAAI,QAAQ,EAAE,UAAU,IAAI,QAAQ,EAAE,WAAW,EAAE,CAAC;oBAClD,aAAa,CAAC,QAAQ,GAAG,QAAQ,CAAC,WAAW,GAAG,oBAAoB,CAAC;gBACvE,CAAC;qBAAM,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;oBAC5B,aAAa,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC;gBAC5C,CAAC;gBAED,IAAI,QAAQ,EAAE,aAAa,EAAE,CAAC;oBAC5B,aAAa,CAAC,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;gBACvD,CAAC;gBAED,IAAI,QAAQ,EAAE,OAAO,EAAE,CAAC;oBACtB,aAAa,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;gBAC3C,CAAC;gBAED,IAAI,QAAQ,EAAE,WAAW,EAAE,CAAC;oBAC1B,aAAa,CAAC,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;gBACnD,CAAC;YACH,CAAC;YAED,4EAA4E;YAC5E,kDAAkD;YAClD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,YAAY,EAAE,EAAE,GAAG,aAAa,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,EAAE,QAAQ,CAAC,CAAC;YACpH,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YAC3B,0FAA0F;YAC1F,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,IAAI,OAAO,CAAC;YAEjD,MAAM,WAAW,GAA+B;gBAC9C,IAAI,EAAE,IAAI,IAAI,WAAW;gBACzB,EAAE;gBACF,OAAO,EAAE,YAAY;gBACrB,IAAI;gBACJ,WAAW,EAAE,WAAW,IAAI,EAAE;aAC/B,CAAC;YAEF,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YACrD,OAAO,CAAC,GAAG,CAAC,oBAAoB,WAAW,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;YAElE,uBAAuB;YACvB,IAAI,CAAC,QAAQ,CAAC;gBACZ,KAAK,EAAE,EAAE;gBACT,OAAO;gBACP,YAAY;gBACZ,MAAM,EAAE,WAAW;gBACnB,QAAQ,EAAE,QAAQ,IAAI,IAAI;gBAC1B,MAAM,EAAE,MAAM;gBACd,SAAS,EAAE,IAAI,CAAC,SAAS;aAC1B,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;YAE7C,wBAAwB;YACxB,IAAI,CAAC,QAAQ,CAAC;gBACZ,KAAK,EAAE,EAAE;gBACT,OAAO;gBACP,YAAY;gBACZ,MAAM,EAAE,WAAW,IAAI,MAAM,IAAI,EAAE;gBACnC,QAAQ,EAAE,QAAQ,IAAI,IAAI;gBAC1B,MAAM,EAAE,OAAO;gBACf,YAAY,EAAE,KAAK,CAAC,OAAO;aAC5B,CAAC,CAAC;YAEH,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED;;OAEG;IACK,QAAQ,CAAC,OAShB;QACC,+DAA+D;QAC/D,MAAM,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE;YAC7D,MAAM,eAAe,GAAG,IAAI,YAAY,CAAC,iBAAiB,EAAE;gBAC1D,cAAc,EAAE,SAAS,EAAE,uCAAuC;aACnE,CAAC,CAAC;YAEH,eAAe,CAAC,SAAS,CAAC;gBACxB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,IAAI;gBACpC,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,IAAI;aAC3C,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,KAAU,EAAE,EAAE;gBACnD,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YACnE,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAU,EAAE,EAAE;YACtB,OAAO,CAAC,KAAK,CAAC,iDAAiD,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAClF,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAOD,qDAAqD;AACrD,IAAI,CAAC,UAAU,CAAC,oBAAoB,EAAE,CAAC;IACrC,UAAU,CAAC,oBAAoB,GAAG,IAAI,WAAW,EAAE,CAAC;AACtD,CAAC;AAED,MAAM,WAAW,GAAG,UAAU,CAAC,oBAAoB,CAAC;AAEpD,eAAe,WAAW,CAAC"}
1
+ {"version":3,"file":"MailService.js","sourceRoot":"","sources":["../../baasix/services/MailService.ts"],"names":[],"mappings":"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"}
@@ -74,7 +74,10 @@ export declare function createSession(user: any, expiresInSeconds: number, sessi
74
74
  /**
75
75
  * Validate a session token
76
76
  */
77
- export declare function validateSession(token: string, expectedTenantId?: string | null): Promise<any>;
77
+ export declare function validateSession(token: string, expectedTenantId?: string | null): Promise<{
78
+ session: any;
79
+ user: any;
80
+ } | null>;
78
81
  /**
79
82
  * Validate session limits for a user
80
83
  */
@@ -1 +1 @@
1
- {"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../baasix/utils/auth.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../baasix/utils/auth.ts"],"names":[],"mappings":"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"}
@@ -13,6 +13,7 @@ import { getCache } from "./cache.js";
13
13
  import { eq, and } from "drizzle-orm";
14
14
  import { schemaManager } from "./schemaManager.js";
15
15
  import { permissionService } from '../services/PermissionService.js';
16
+ import fieldUtils from "./fieldUtils.js";
16
17
  /**
17
18
  * Lazy getter for ItemsService to avoid circular dependency
18
19
  */
@@ -282,9 +283,9 @@ export const authMiddleware = async (req, res, next) => {
282
283
  }
283
284
  // Verify JWT token
284
285
  const payload = jwt.verify(token, env.get("SECRET_KEY"));
285
- // Validate session
286
- const session = await validateSession(payload.sessionToken, payload.tenant_Id?.toString() || null);
287
- if (!session) {
286
+ // Validate session and get user in one query
287
+ const sessionResult = await validateSession(payload.sessionToken, payload.tenant_Id?.toString() || null);
288
+ if (!sessionResult) {
288
289
  // Session invalid/expired - fall back to public access instead of returning error
289
290
  // This allows public routes to work even with expired cookies
290
291
  const publicRole = await getPublicRole();
@@ -297,60 +298,39 @@ export const authMiddleware = async (req, res, next) => {
297
298
  };
298
299
  return next();
299
300
  }
301
+ const { user } = sessionResult;
300
302
  // Get dynamically created tables from schema manager
301
- const userTable = schemaManager.getTable("baasix_User");
302
303
  const userRoleTable = schemaManager.getTable("baasix_UserRole");
303
304
  const permissionTable = schemaManager.getTable("baasix_Permission");
304
- // Get user details with role
305
- let users;
305
+ // Get user's role assignment
306
+ let userRoles;
306
307
  if (payload.tenant_Id !== undefined && payload.tenant_Id !== null) {
307
- users = await db
308
+ userRoles = await db
308
309
  .select({
309
- id: userTable.id,
310
- email: userTable.email,
311
- firstName: userTable.firstName,
312
- lastName: userTable.lastName,
313
310
  role_Id: userRoleTable.role_Id,
314
311
  tenant_Id: userRoleTable.tenant_Id,
315
312
  })
316
- .from(userTable)
317
- .leftJoin(userRoleTable, eq(userTable.id, userRoleTable.user_Id))
318
- .where(and(eq(userTable.id, payload.id), eq(userRoleTable.tenant_Id, payload.tenant_Id)))
313
+ .from(userRoleTable)
314
+ .where(and(eq(userRoleTable.user_Id, user.id), eq(userRoleTable.tenant_Id, payload.tenant_Id)))
319
315
  .limit(1);
320
316
  }
321
317
  else {
322
- users = await db
318
+ userRoles = await db
323
319
  .select({
324
- id: userTable.id,
325
- email: userTable.email,
326
- firstName: userTable.firstName,
327
- lastName: userTable.lastName,
328
320
  role_Id: userRoleTable.role_Id,
329
321
  tenant_Id: userRoleTable.tenant_Id,
330
322
  })
331
- .from(userTable)
332
- .leftJoin(userRoleTable, eq(userTable.id, userRoleTable.user_Id))
333
- .where(eq(userTable.id, payload.id))
323
+ .from(userRoleTable)
324
+ .where(eq(userRoleTable.user_Id, user.id))
334
325
  .limit(1);
335
326
  }
336
- if (!users || users.length === 0) {
337
- const publicRole = await getPublicRole();
338
- req.accountability = {
339
- user: null,
340
- role: publicRole,
341
- tenant: null,
342
- permissions: [],
343
- ipaddress: req.ip || req.connection?.remoteAddress,
344
- };
345
- return next();
346
- }
347
- const user = users[0];
327
+ const userRole = userRoles?.[0];
348
328
  // Get role and permissions from cache or database
349
329
  let role = { id: null, name: "user", isTenantSpecific: false };
350
330
  let permissions = [];
351
- if (user.role_Id) {
331
+ if (userRole?.role_Id) {
352
332
  try {
353
- const roleData = await getRolesAndPermissions(user.role_Id);
333
+ const roleData = await getRolesAndPermissions(userRole.role_Id);
354
334
  role = {
355
335
  id: roleData.id,
356
336
  name: roleData.name,
@@ -360,7 +340,7 @@ export const authMiddleware = async (req, res, next) => {
360
340
  }
361
341
  catch {
362
342
  // Fallback: use PermissionService hybrid cache for role
363
- const cachedRole = await permissionService.getRoleByIdAsync(user.role_Id);
343
+ const cachedRole = await permissionService.getRoleByIdAsync(userRole.role_Id);
364
344
  if (cachedRole) {
365
345
  role = {
366
346
  id: cachedRole.id,
@@ -372,23 +352,22 @@ export const authMiddleware = async (req, res, next) => {
372
352
  permissions = await db
373
353
  .select()
374
354
  .from(permissionTable)
375
- .where(eq(permissionTable.role_Id, user.role_Id));
355
+ .where(eq(permissionTable.role_Id, userRole.role_Id));
376
356
  }
377
357
  }
378
358
  // Calculate isAdmin based on role name
379
359
  const isAdmin = role.name === 'administrator';
380
- // Set accountability object
360
+ // Strip hidden fields (like password) from user object
361
+ const sanitizedUser = fieldUtils.stripHiddenFields('baasix_User', user);
362
+ // Set accountability object with all user fields
381
363
  req.accountability = {
382
364
  user: {
383
- id: user.id,
384
- email: user.email,
385
- firstName: user.firstName,
386
- lastName: user.lastName,
365
+ ...sanitizedUser,
387
366
  isAdmin: isAdmin,
388
367
  role: role.name,
389
368
  },
390
369
  role: role,
391
- tenant: user.tenant_Id || null,
370
+ tenant: userRole?.tenant_Id || null,
392
371
  permissions: permissions || [],
393
372
  ipaddress: req.ip || req.connection?.remoteAddress,
394
373
  };
@@ -452,8 +431,10 @@ export async function createSession(user, expiresInSeconds, sessionType = "defau
452
431
  export async function validateSession(token, expectedTenantId = null) {
453
432
  const ItemsService = await getItemsService();
454
433
  const sessionService = new ItemsService('baasix_Sessions');
434
+ // Fetch session with user relation to get all user fields in one query
455
435
  const sessions = await sessionService.readByQuery({
456
436
  filter: { token: { eq: token } },
437
+ fields: ['*', 'user.*'],
457
438
  limit: 1,
458
439
  });
459
440
  if (!sessions.data || sessions.data.length === 0) {
@@ -470,7 +451,16 @@ export async function validateSession(token, expectedTenantId = null) {
470
451
  if (isMultiTenant && expectedTenantId !== null && expectedTenantId !== undefined && session.tenant_Id !== expectedTenantId) {
471
452
  console.warn(`Session tenant mismatch: expected ${expectedTenantId}, got ${session.tenant_Id}`);
472
453
  }
473
- return session;
454
+ // Get user - either from populated relation or fetch separately
455
+ let user = session.user;
456
+ if (!user || typeof user === 'string') {
457
+ const userService = new ItemsService('baasix_User');
458
+ user = await userService.readOne(session.user_Id);
459
+ }
460
+ if (!user) {
461
+ return null;
462
+ }
463
+ return { session, user };
474
464
  }
475
465
  /**
476
466
  * Validate session limits for a user
@@ -1 +1 @@
1
- {"version":3,"file":"auth.js","sourceRoot":"","sources":["../../baasix/utils/auth.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auth.js","sourceRoot":"","sources":["../../baasix/utils/auth.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@baasix/baasix",
3
- "version": "0.1.15",
3
+ "version": "0.1.17",
4
4
  "description": "Baasix - Backend-as-a-Service with 40+ tools for schema management, CRUD operations with 50+ filter operators, relationships, permissions, files, workflows, and more",
5
5
  "main": "dist/index.js",
6
6
  "type": "module",
@@ -65,7 +65,6 @@
65
65
  "ioredis": "^5.4.1",
66
66
  "joi": "^17.13.3",
67
67
  "jsonwebtoken": "^9.0.2",
68
- "juice": "^11.1.0",
69
68
  "liquidjs": "^10.16.3",
70
69
  "lodash": "^4.17.21",
71
70
  "mime-types": "^2.1.35",